sci-chemistry/mpqc: Handle static-libs

Package-Manager: portage-2.2.0_alpha136/cvs/Linux x86_64

3 files changed, 42 insertions, 23 deletions

diff --git a/sci-chemistry/mpqc/ChangeLog b/sci-chemistry/mpqc/ChangeLog
index 4f25fc0e7635..fe23eb55ea92 100644
--- a/sci-chemistry/mpqc/ChangeLog
+++ b/sci-chemistry/mpqc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-chemistry/mpqc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mpqc/ChangeLog,v 1.25 2012/10/10 15:21:28 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mpqc/ChangeLog,v 1.26 2012/10/10 16:43:40 jlec Exp $
+
+  10 Oct 2012; Justin Lecher <jlec@gentoo.org> mpqc-2.3.1-r3.ebuild:
+  Handle static-libs
 
   10 Oct 2012; Brent Baude <ranger@gentoo.org> mpqc-2.3.1-r3.ebuild:
   Marking mpqc-2.3.1-r3 ppc for bug 436886
diff --git a/sci-chemistry/mpqc/Manifest b/sci-chemistry/mpqc/Manifest
index b2c1e98304f1..137c23ee366f 100644
--- a/sci-chemistry/mpqc/Manifest
+++ b/sci-chemistry/mpqc/Manifest
@@ -1,10 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX mpqc-2.3.1-as-needed.patch 6101 SHA256 5ed64fad86561612bf03678f6f3e780099f5bd393f0b5c20622fa7789ac23845 SHA512 b5e0398ebd3528059eff4c477a39cb8f76933cb0ab3ed3a4a054ab595d8fb171f9962e49601588eb880c4b418b0e91bfd25341a075f6e36328277a9ca9a68142 WHIRLPOOL fbb6a0264edfeb8828b4b37ae9bd4584a3bc183da10c6f71f72f33d0c79154d4a236189f061c28eaf4fe599d37ce49b66a6902909500dbb72eea32b7ea8641d6
 AUX mpqc-2.3.1-blas.patch 1917 SHA256 aa378d4baf693fa28260ade19a0ec6b583692b9735ac43f4357168a2c9f18c52 SHA512 33000fbd0d9ea2ddbfcfee997f27e71c43fb4128c5e9f5ae79cb7c5fc9ed3bd787a86b0e9efbb1842d6f962b643deadb8fa8498b870bef6268cddc5455d8fb07 WHIRLPOOL dac2f253a6742f0ddddac32fc0478229f7e6e43a916373823499b22d0d830315992dd2ed1a16bd664b4ba90f2c37bf28015e44ae7db60af766b37a928eef9438
 AUX mpqc-2.3.1-respect-ldflags.patch 666 SHA256 3f50b2e3a0038b7d4fc8f98eb375f794f37164a69edf6d7a767b0146e20481ca SHA512 84618392ab07884a09ec197a86c6ca26c298bb73d9c5a8a4f641a875d61f77a7d05494a7d0f4c8eef8cac742e5e4f1ebef99c333066a2fe8bd23e467f7918b56 WHIRLPOOL 4eb8cbbee7f77d438c0fe411030d04fbf55b266619154c3028810bd4daa27389f84a535a1ec0eeffeb8f7bc826b6e7346a899c561c2f42092b266764a3f2d613
 AUX mpqc-2.3.1-test-failure-hack.patch 543 SHA256 af5ae5f76916cbfe1a94981f94a30b373188de60ea19cc3d677d82c71412e503 SHA512 ae626fd6b723f6089b4cf6c2866863ab622aded5636735475cc2d85450b3753bc1cd3168ae1dcb49a579c4a15103cc64256c96eb12b52fcf0599e12bbdacfbc9 WHIRLPOOL 805f603220dd5a1fb8b2a59fe3fe543bbee028503e218e9be031b06657825e103ec19514681803e2a9945547190b4903d8fb6b683fa79858ec93bb751a51dae7
-DIST mpqc-2.3.1.tar.bz2 2521392 RMD160 0e3b395e9ed663b9c3de120fb4f5a00bc40c7e0f SHA1 f89fcbe6e07e90abe02fc21dbce045a2a749f65d SHA256 18f162ca9cb8b3b05372b0ec3d02b4b8a4a7aabfc7b2abead350ddef8f048ecc
+DIST mpqc-2.3.1.tar.bz2 2521392 SHA256 18f162ca9cb8b3b05372b0ec3d02b4b8a4a7aabfc7b2abead350ddef8f048ecc SHA512 34f24f72c6c0024e72d47c7fd17927ca2a88020b30d22a791954fbc933f67ed6dd6741ee8a80ddd4fdb007f1a357b5f5ea7fc284cab85474bf60e9f29aaaa747 WHIRLPOOL 504e5be36673b85494866b8a09588964dd9b352208c4d08a1365cbc06b39dfe91dc6050a0e16cbd713b43b3e92d86cbe40f53a44a644f224e84340dd065e54ab
 EBUILD mpqc-2.3.1-r1.ebuild 2360 SHA256 9fd2bb43f83e006733b9b239b0b4ae7a76154db2a61d53a7f81976dffe4faf21 SHA512 7664c3d69df8ef31245b438342b71acc1b8ebffc7449f92631f0de9c4f1aca7413224b2edc2209d25f2b8fbdb4d31b8f894eb6906ffd86971ea2bd720786f56a WHIRLPOOL c5b2914ef14e11e59314678ee3c76704b3c8f599878c973a29be74c3935e695ac7ea20aa683f9ee9baacf4e9616b32a9c9b1b9c15e6437ef37073cdc82bf0255
 EBUILD mpqc-2.3.1-r2.ebuild 2564 SHA256 ff4f9ce6e3514caba0d36a96f0fdade623aae1b1d845d91adbde5351d8301b7e SHA512 a8b45e86d4bdc809c62a98820e6f57929d1fdb3b3dabefaa5f5616eac5f46d7b1b7339b825f27eb9e28870b67e389e24b8573b1500c6fd68a3b9a592d700135e WHIRLPOOL 09d268fa864831fe15a906e3f957d150f980a2fc6f174ab691cc2245a0bf1dd16c080d12538d2759f3eb93e643ecbc7769ff2c38e0bf4eae9b43f0393029118f
-EBUILD mpqc-2.3.1-r3.ebuild 2432 SHA256 c17083fd2391bed2218cc75da1ce12228fc48096d7da6b85bdf2d82024dae0ef SHA512 b32ca7857f21943b3b1d500d9d445469d77c65457825b09fb920d4a374039e60ad68eb27083fffab99c040c7dafe262311b62e7369956abb6734d3d1029fd4de WHIRLPOOL 2243c91a32ea99f75a7e0e0c1cfa0c725a81ce59ca25fd55eba53840791ee0a538c9d199ab0452bdaeeef79acf6d8bf921c68d95b82bbb0668a922783461bcee
-MISC ChangeLog 5652 SHA256 f7e9718d94242c4edf75f0215ed85128404f6027882477911ad666a4b5450f8a SHA512 8d7432f281e7579dcab413617bdb33655464d2ead171c09109e0cbd146e22dcad3dd7ef5edd8a235c63e71bf6934db3f5f742048c1ccab64e58d27c7f442f1e0 WHIRLPOOL 6d34b2700f2f3346930ac65311544d00eb83a47860fcf6b0f4d3a4aaf539c2f3cb307da8edf9e25147677b66896498174c366efe0d3a230f1d627036069e82d3
+EBUILD mpqc-2.3.1-r3.ebuild 2577 SHA256 e51577e7169dae8177997f759ce8d02da477107f64ada18b45f3690b08932acd SHA512 122712f48261386611f25143cebc144b5fa09995e76e160f667af31d6de60a069b7492c88f71667ac7035a759f7b51f098c68f8b23b0c35100821c4ac5efdaff WHIRLPOOL 4e7cf2b27e4e841539ca584f937942b50f126b1dad6bcf8bbd4eecba88bc710fe726a74fa9c9017dd8cd55e45df549af765d0a3eca1b41bdeb0d5955fcd99a74
+MISC ChangeLog 5741 SHA256 794a75c49902b6d7d1063be0ee11bac9f83a7b90f6921087ef5d28687882e151 SHA512 ded2dc8991353e1a4882756f212840b11362b8afcae646fa6c58a1d049f615d948a263b2abeba643b730c5d129a2272b9ceec4fec194f1896f432b874828c616 WHIRLPOOL ef0f1c522065c49937687b05d3b79e334227ca0fe3a8fbc0bec67b7fe888a483fb7b281fe368c9d0eabd537ae9073abd5779256c9f9deca994fed3a2474eb72c
 MISC metadata.xml 167 SHA256 f313eeec4ebffac500b57a98a225e32c77489fc826a50494749b6cdeec28e3e8 SHA512 0f65f650c91edb15011884892b3e2447ec2342f207b6b71541ec25939fed33cd219b1fcd85dd06008b56a50622973febeb63c9c6158f62435c63c4fbd3ab93bd WHIRLPOOL 0823fd1d22e4aea50bcf78c359303d804128475e21e39514505ee6528c9c46376ceafc1f13bb1cc4e1143d434397fb4ef65dc028e924fdc831521947534fd93f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
+
+iEYEAREIAAYFAlB1pb0ACgkQgAnW8HDreRZNnQCgpocWRqRVfCKHoE9r+bcU/hsf
+l8QAoIM9v9UW8pGC3UY25AtNW7tLmDkQ
+=ik/W
+-----END PGP SIGNATURE-----
diff --git a/sci-chemistry/mpqc/mpqc-2.3.1-r3.ebuild b/sci-chemistry/mpqc/mpqc-2.3.1-r3.ebuild
index a7ab55f5488b..651db08c3bd6 100644
--- a/sci-chemistry/mpqc/mpqc-2.3.1-r3.ebuild
+++ b/sci-chemistry/mpqc/mpqc-2.3.1-r3.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mpqc/mpqc-2.3.1-r3.ebuild,v 1.2 2012/10/10 15:21:28 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mpqc/mpqc-2.3.1-r3.ebuild,v 1.3 2012/10/10 16:43:40 jlec Exp $
 
 EAPI=4
 
-inherit autotools eutils toolchain-funcs
+AUTOTOOLS_AUTORECONF=yes
+
+inherit autotools-utils toolchain-funcs
 
 DESCRIPTION="The Massively Parallel Quantum Chemistry Program"
 HOMEPAGE="http://www.mpqc.org/"
@@ -13,7 +15,7 @@ SRC_URI="mirror://sourceforge/mpqc/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ppc ~ppc64 ~x86"
-IUSE="doc mpi threads tk"
+IUSE="doc mpi threads static-libs tk"
 
 RDEPEND="
 	virtual/blas
@@ -28,12 +30,18 @@ DEPEND="${RDEPEND}
 		app-doc/doxygen
 		media-gfx/graphviz )"
 
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-as-needed.patch \
-		"${FILESDIR}"/${P}-respect-ldflags.patch \
-		"${FILESDIR}"/${P}-test-failure-hack.patch \
+PATCHES=(
+		"${FILESDIR}"/${P}-as-needed.patch
+		"${FILESDIR}"/${P}-respect-ldflags.patch
+		"${FILESDIR}"/${P}-test-failure-hack.patch
 		"${FILESDIR}"/${P}-blas.patch
+	)
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+DOCS=(CHANGES CITATION README)
+
+src_prepare() {
 	# do not install tkmolrender if not requested
 	if ! use tk; then
 		sed \
@@ -43,7 +51,7 @@ src_prepare() {
 			-i "./src/bin/molrender/Makefile" \
 			|| die "failed to disable tkmolrender"
 	fi
-	eautoreconf
+	autotools-utils_src_prepare
 }
 
 src_configure() {
@@ -52,12 +60,11 @@ src_configure() {
 		export CC=mpicc
 		export CXX=mpicxx
 	fi
-	econf \
-		$(use_enable threads) \
-		$(use_enable mpi parallel) \
-		--enable-shared \
-		${myconf}
+	local myeconfargs=(
+		$(use_enable threads)
+		$(use_enable mpi parallel) )
 
+	autotools-utils_src_configure
 	sed \
 		-e "s:^CFLAGS =.*$:CFLAGS=${CFLAGS}:" \
 		-e "s:^FFLAGS =.*$:FFLAGS=${FFLAGS:- -O2}:" \
@@ -66,7 +73,7 @@ src_configure() {
 }
 
 src_test() {
-	cd "${S}"/src/bin/mpqc/validate
+	cd "${AUTOTOOLS_BUILD_DIR}"/src/bin/mpqc/validate
 
 	# we'll only run the small test set, since the
 	# medium and large ones take >10h and >24h on my
@@ -75,13 +82,11 @@ src_test() {
 }
 
 src_install() {
-	emake installroot="${D}" install install_devel install_inc
-
-	dodoc CHANGES CITATION README
+	autotools-utils_src_install installroot="${D}" install install_devel install_inc
 
 	# make extended docs
 	if use doc; then
-		cd "${S}"/doc
+		cd "${AUTOTOOLS_BUILD_DIR}"/doc
 		emake -j1 all
 		doman man/man1/* man/man3/*
 		dohtml -r html