From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 2F8A81381F3 for ; Fri, 26 Jul 2013 16:14:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 413BFE0A6A; Fri, 26 Jul 2013 16:14:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5D136E0A69 for ; Fri, 26 Jul 2013 16:14:04 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4D54933EA66 for ; Fri, 26 Jul 2013 16:14:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 58C69E5468 for ; Fri, 26 Jul 2013 16:14:01 +0000 (UTC) From: "Nicolas Bock" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nicolas Bock" Message-ID: <1374781948.febd5efaa3f7ce640ee03a7f34058a294d57acfb.nicolasbock@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/p4est/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/p4est/metadata.xml sci-libs/p4est/p4est-0.3.4.1.ebuild X-VCS-Directories: sci-libs/p4est/ X-VCS-Committer: nicolasbock X-VCS-Committer-Name: Nicolas Bock X-VCS-Revision: febd5efaa3f7ce640ee03a7f34058a294d57acfb X-VCS-Branch: master Date: Fri, 26 Jul 2013 16:14:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1d49a44a-4a74-4935-a5ad-3465ae1ee15d X-Archives-Hash: 07a9f3118f7e136e6df535004d468554 commit: febd5efaa3f7ce640ee03a7f34058a294d57acfb Author: Matthias Maier kyomu 43-1 org> AuthorDate: Thu Jul 25 19:48:12 2013 +0000 Commit: Nicolas Bock gmail com> CommitDate: Thu Jul 25 19:52:28 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=febd5efa Cleanup as discussed --- sci-libs/p4est/metadata.xml | 2 -- sci-libs/p4est/p4est-0.3.4.1.ebuild | 31 +++++++++++-------------------- 2 files changed, 11 insertions(+), 22 deletions(-) diff --git a/sci-libs/p4est/metadata.xml b/sci-libs/p4est/metadata.xml index f4d5bcb..592c6fc 100644 --- a/sci-libs/p4est/metadata.xml +++ b/sci-libs/p4est/metadata.xml @@ -12,6 +12,4 @@ designed to work in parallel and scale to hundreds of thousands of processor cores. - - diff --git a/sci-libs/p4est/p4est-0.3.4.1.ebuild b/sci-libs/p4est/p4est-0.3.4.1.ebuild index c4ed5f3..7e61af7 100644 --- a/sci-libs/p4est/p4est-0.3.4.1.ebuild +++ b/sci-libs/p4est/p4est-0.3.4.1.ebuild @@ -31,13 +31,11 @@ RDEPEND=" ${DEPEND} virtual/pkgconfig" -DOCS=(AUTHORS ChangeLog COPYING NEWS README) +DOCS=(AUTHORS ChangeLog NEWS README) src_configure() { local myeconfargs=( $(use_enable debug) - --enable-shared - $(use_enable static-libs static) --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" ) @@ -47,30 +45,23 @@ src_configure() { src_install() { autotools-utils_src_install - if use doc - then - cp -r "${S}"/doc/* "${D}${EPREFIX}"/usr/share/doc/${PF}/ - fi + use doc && dodoc -r "${S}"/doc/* if use examples then - mkdir -p "${D}${EPREFIX}"/usr/share/${PN}/examples - cp -r "${S}"/example/* "${D}${EPREFIX}"/usr/share/${PN}/examples + insinto /usr/share/${PN}/examples + doins -r "${S}"/example/* else # Remove the compiled example binaries in case of -examples: - rm -r "${D}${EPREFIX}"/usr/bin + rm -r "${ED}"/usr/bin fi - if ! use static-libs - then - # *sigh* The build system apparently ignores --enable/disable-static - rm "${D}${EPREFIX}"/$(get_libdir)/*.a - fi + # *sigh* The build system apparently ignores --disable-static + use static-libs || rm "${ED}"/usr/$(get_libdir)/*.a # Fix up some wrong installation pathes: - mkdir -p "${D}${EPREFIX}"/usr/share/p4est - mv "${D}${EPREFIX}"/usr/share/data "${D}${EPREFIX}"/usr/share/p4est/data - mv "${D}${EPREFIX}"/etc/* "${D}${EPREFIX}"/usr/share/p4est - rmdir "${D}${EPREFIX}"/etc/ + dodir /usr/share/p4est + mv "${ED}"/usr/share/data "${ED}"/usr/share/p4est/data + mv "${ED}"/etc/* "${ED}"/usr/share/p4est + rmdir "${ED}"/etc/ } -