sci-libs/punc: Handle static libs

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64
RepoMan-Options: --force

3 files changed, 39 insertions, 34 deletions

diff --git a/sci-libs/punc/ChangeLog b/sci-libs/punc/ChangeLog
index aff3ed598753..df5589a3d31e 100644
--- a/sci-libs/punc/ChangeLog
+++ b/sci-libs/punc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-libs/punc
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/punc/ChangeLog,v 1.14 2011/11/24 11:01:47 jlec Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/punc/ChangeLog,v 1.15 2012/04/30 17:40:09 jlec Exp $
+
+  30 Apr 2012; Justin Lecher <jlec@gentoo.org> punc-1.5.ebuild:
+  Handle static libs
 
   24 Nov 2011; Justin Lecher <jlec@gentoo.org> files/1.5-linking.patch,
   punc-1.5.ebuild, metadata.xml:
diff --git a/sci-libs/punc/Manifest b/sci-libs/punc/Manifest
index 202e40694462..ba115743c7ee 100644
--- a/sci-libs/punc/Manifest
+++ b/sci-libs/punc/Manifest
@@ -13,13 +13,13 @@ DIST punc-1.4.tar.gz 7036966 RMD160 0f3f690a2a95dddeda21c6d4865c5ec08a451d07 SHA
 DIST punc-1.5.tar.gz 7036275 RMD160 83f6beb75a124360013af3b28323ba1fe20646cc SHA1 19eae43fbed3c25d9006c1901294f626289446e4 SHA256 6a63e4caf5dcd0529c09cd429cc94b4443ca4ba893b98b68962c0549c2a8246f
 EBUILD punc-0.2_p1.ebuild 1610 RMD160 6edbee60359f7d1ffd9010e8c2535144eee778d2 SHA1 38fa5c339e49f5484c0f44f8c2a044813ffea4d7 SHA256 48b5e6de51025e6bcf9dd7f74b36321cc12ee72571139a509edbf074808f1b43
 EBUILD punc-1.4-r1.ebuild 2062 RMD160 e1fc4c37d4b31944802e59a5baaae4c273501743 SHA1 6e4d067a7fca552cab160ec2079403d606d6dbc0 SHA256 cc26025bc252c40f434442aef3f4e3c053c57cc2338c607e3f30616758ddbec6
-EBUILD punc-1.5.ebuild 2270 RMD160 c9c118ffff2fbe7bf1a445962d10b18363b72f6b SHA1 5e94706413d1908dae7a2957a6c446dd3e8e1fa7 SHA256 b4f2726f77aff6dae881017ef6dd4e8cc979669299f5405de3984f62948a8059
-MISC ChangeLog 2111 RMD160 1e4fb7537322eff6fcf9539f8c701ecad41eba06 SHA1 07655210bdb5757c328c80f7335232c8dfc7401d SHA256 d1ff002c7f7796f4ed16af381c65b3e0eae29905b02474f694fa2169c48ee0b7
+EBUILD punc-1.5.ebuild 2230 RMD160 f8b4e8512c4cf03ddc5f078eeeb52c962db13a71 SHA1 6b9bd7d65b3f6d80cafa5bd155556bb0c217bf9a SHA256 76ee0816a35b960d5d51f3de4f9405dbf9a1d2c96d4586f410cc27fa60916719
+MISC ChangeLog 2197 RMD160 e66481ad2ee430e706f73ebfa262ab6f6635dae2 SHA1 0ac08e5ae16768d92c232e5ca9affc85b7aa1a7b SHA256 ba3d6dd3ad86af8e3fc59bd16a340cb9aa51b035935cd7cbb7d928936c5f592c
 MISC metadata.xml 1272 RMD160 31db6bd5fed32098ab05c05fd61420bce807beba SHA1 9a966300b00f7de7323ca54269ad7fd87d656e6c SHA256 52ea9bab5f4124de96f68fbbcbf21ffe2260c6057891226725429da22fc3f7f9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAk7OJCAACgkQgAnW8HDreRZu9ACgvLsGLagpYdg7E3xVpi4RMnrH
-XlIAnR5Rrczt4+hIEFgd47+Ou4VyYUsL
-=4gB/
+iEYEAREKAAYFAk+ezn4ACgkQgAnW8HDreRbtQQCgxGi/rqq4Id4dwIpvKz3u5oxB
+1y8AoKYYzTXxmMnuG2AkMvgSSZhyTyBk
+=3XcM
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/punc/punc-1.5.ebuild b/sci-libs/punc/punc-1.5.ebuild
index 61eb3aea945c..3ef84c19b039 100644
--- a/sci-libs/punc/punc-1.5.ebuild
+++ b/sci-libs/punc/punc-1.5.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/punc/punc-1.5.ebuild,v 1.5 2011/11/24 11:01:47 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/punc/punc-1.5.ebuild,v 1.6 2012/04/30 17:40:09 jlec Exp $
 
-EAPI="3"
+EAPI=4
 
-inherit autotools fortran-2 multilib
+AUTOTOOLS_AUTORECONF=yes
+
+inherit autotools-utils fortran-2 multilib
 
 DESCRIPTION="Portable Understructure for Numerical Computing"
 HOMEPAGE="http://fetk.org/codes/punc/index.html"
@@ -16,8 +18,6 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc mpi static-libs"
 
 RDEPEND="
-	virtual/fortran
-
 	dev-libs/maloc[mpi=]
 	dev-libs/libf2c
 	sci-libs/amd
@@ -26,6 +26,7 @@ RDEPEND="
 	sci-libs/superlu
 	sci-libs/umfpack
 	virtual/blas
+	virtual/fortran
 	virtual/lapack
 	mpi? ( virtual/mpi )"
 DEPEND="
@@ -36,27 +37,28 @@ DEPEND="
 
 S="${WORKDIR}/${PN}"
 
+PATCHES=(
+	"${FILESDIR}"/${PV}-linking.patch
+	"${FILESDIR}"/1.4-doc.patch )
+
 src_prepare() {
 	sed 's:punc/slu_ddefs.h:superlu/slu_ddefs.h:g' src/superlu/punc/vsuperlu.h > vsuperlu.h || die
 	sed 's:punc/umfpack.h:umfpack.h:g' src/umfpack/punc/vumfpack.h > vumfpack.h || die
 	rm -rf src/{amd,blas,lapack,arpack,superlu,umfpack}
-	epatch \
-		"${FILESDIR}"/${PV}-linking.patch \
-		"${FILESDIR}"/1.4-doc.patch
 
-	cp tools/tests/pmg/*.f src/pmg/ -f
-	cp tools/tests/pmg/*.c src/pmg/ -f
-	cp src/pmg/vpmg.h src/vf2c/punc/vpmg.h
+	cp tools/tests/pmg/*.f src/pmg/ -f || die
+	cp tools/tests/pmg/*.c src/pmg/ -f || die
+	cp src/pmg/vpmg.h src/vf2c/punc/vpmg.h || die
 
-	eautoreconf
+	autotools-utils_src_prepare
 }
 
 src_configure() {
 	local fetk_include
 	local fetk_lib
-	local myconf
+	local myeconfargs
 
-	use doc || myconf="${myconf} --with-doxygen= --with-dot="
+	use doc || myeconfargs+=( --with-doxygen= --with-dot= )
 
 	fetk_include="${EPREFIX}"/usr/include
 	fetk_lib="${EPREFIX}"/usr/$(get_libdir)
@@ -70,20 +72,20 @@ src_configure() {
 	export FETK_CGCODE_LIBRARY="${fetk_lib}"
 	export FETK_AMD_LIBRARY="${fetk_lib}"
 
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable debug vdebug) \
-		--enable-vf2cforce \
-		--enable-shared \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--disable-triplet \
-		${myconf}
+	myeconfargs+=(
+		$(use_enable debug vdebug)
+		--enable-vf2cforce
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		--disable-triplet
+		)
+	autotools-utils_src_configure
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
+	autotools-utils_src_install
+
 	insinto /usr/include/punc
-	doins v*.h || die
+	doins v*.h
 
-	dohtml doc/index.html || die "failed to install html docs"
+	dohtml doc/index.html
 }