sci-libs/punc: Remove virtual/fortran and always call fortran-2_pkg_setup as intend by the updated fortran-2.eclass

Package-Manager: portage-2.2.0_alpha138/cvs/Linux x86_64
Manifest-Sign-Key: 0x70EB7916

5 files changed, 18 insertions, 189 deletions

diff --git a/sci-libs/punc/ChangeLog b/sci-libs/punc/ChangeLog
index 6924f765faf5..bb5d6c97d47c 100644
--- a/sci-libs/punc/ChangeLog
+++ b/sci-libs/punc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/punc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/punc/ChangeLog,v 1.16 2012/05/21 19:22:54 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/punc/ChangeLog,v 1.17 2012/10/16 20:08:39 jlec Exp $
+
+  16 Oct 2012; Justin Lecher <jlec@gentoo.org> -punc-0.2_p1.ebuild,
+  -punc-1.4-r1.ebuild, punc-1.5.ebuild:
+  Remove virtual/fortran and always call fortran-2_pkg_setup as intend by the
+  updated fortran-2.eclass
 
   21 May 2012; Kacper Kowalik <xarthisius@gentoo.org> punc-0.2_p1.ebuild,
   punc-1.4-r1.ebuild:
diff --git a/sci-libs/punc/Manifest b/sci-libs/punc/Manifest
index e039e80c494c..7668887ca782 100644
--- a/sci-libs/punc/Manifest
+++ b/sci-libs/punc/Manifest
@@ -1,35 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX 0.2_p1-configure.patch 2119 RMD160 6cc11262aff3e8fc976c0bb23216fb1367ac59d6 SHA1 c24928f41d87a502629e87a16e8515e640951e28 SHA256 3591f2f8cdeb1582b12d04f7c66420e6581a70a66e3f9cc735f156cd02739e26
-AUX 0.2_p1-underlinking.patch 5390 RMD160 a7b54e8bda912e5b1d6f51d4d5242a6c31a7c9bf SHA1 82f77e70dd48cb7522e5866e916e07d47df77ed0 SHA256 f5fa9af72c719d8f346fb2e49aa3d690087bf66dfcfeabbd7de53600f1df2911
-AUX 1.4-doc.patch 534 RMD160 1ad6b3124686b4f64c3265855ed54b28eb38cbee SHA1 1a5f91fe46b619810c7f171c0953eeb0d1696a55 SHA256 625da0650f17e89b7be3fff73a10e47a6d9ead1ba7e25644c5c4f54a53c79c40
-AUX 1.4-header.patch 588 RMD160 e04c772f207931957acf1d949831f691853789e3 SHA1 c939c04e150ccc16e5173a4f1344156297251c54 SHA256 6a108de531ac5bb5725874ecd8da5728ef9bec5beca4fefda763fa899cde51b5
-AUX 1.4-linking.patch 5885 RMD160 c9ec7898c770187244a79402ee9245e44be2f23f SHA1 22bc29068cd058591a4cefecab7ba6b447dbc136 SHA256 fc9c93ce34e86f8c1f62a047e332b3a90f95cf426aa357a04b4cd3a577c0328c
-AUX 1.5-linking.patch 6247 RMD160 77641fe96c22ca6c3cbb4560aa3dcfcf3e434b9a SHA1 3660fcc5f7876b635b6130381b66615baf56f73e SHA256 7739c434d7c497c6c01e2b79f5c8f13598fd40f06371ad0137538a1c3b2abf60
-AUX punc-0.2_p1-libdir.patch 602 RMD160 045d2cca71835a4288d4a599231d508f8f41629a SHA1 456de24ccdf603eb40ffdaf9ee59a412ce6967ff SHA256 04303cfbe7655a9fdfc4e56c94652cdab6a0a1e6635585cd7451a046685e2c1c
-DIST punc-0.2-1.tar.gz 6645934 RMD160 c00936f26f7096cb66e0a323f7dc22ea40fdc0d4 SHA1 e7211c9a6067d73a56081df0a5f56021ac16b464 SHA256 05dcbc75191b73d3df5b108308b96c6c557ed9b1bd0611a0cc1956edc5541c5d
-DIST punc-1.4.tar.gz 7036966 RMD160 0f3f690a2a95dddeda21c6d4865c5ec08a451d07 SHA1 59adbba5c40f30e5cccbb26731e8a7d47b0a3087 SHA256 3f85b736924ed691a3452a3bf66e3455e73a200f8d67ae9f0f18eb25a51af181
-DIST punc-1.5.tar.gz 7036275 RMD160 83f6beb75a124360013af3b28323ba1fe20646cc SHA1 19eae43fbed3c25d9006c1901294f626289446e4 SHA256 6a63e4caf5dcd0529c09cd429cc94b4443ca4ba893b98b68962c0549c2a8246f
-EBUILD punc-0.2_p1.ebuild 1623 RMD160 12a09c27c89070a04e87f9c420f2c16539e025a4 SHA1 728d83856238672268f433e4f82b05f5461b4a4c SHA256 0005b57631e9f2add50a35bf4b962ca7933351919382eb92dd925b4b7feaf98e
-EBUILD punc-1.4-r1.ebuild 2075 RMD160 c849eb5debd13b2d24579713087e31fd78f6daa9 SHA1 3e5fe7ca2b6b3b5421a003fbd7b0fe98d8ec60ae SHA256 ddbfc90d4b2fb0840f5af521222e3abca7d1cf70cd2bd33cea810ec86d1f83a3
-EBUILD punc-1.5.ebuild 2230 RMD160 f8b4e8512c4cf03ddc5f078eeeb52c962db13a71 SHA1 6b9bd7d65b3f6d80cafa5bd155556bb0c217bf9a SHA256 76ee0816a35b960d5d51f3de4f9405dbf9a1d2c96d4586f410cc27fa60916719
-MISC ChangeLog 2343 RMD160 5f29a3d1e63a05b47a356546cbd22b886077d4c3 SHA1 c8ab737807d714f086a00399826dc26312b84113 SHA256 d6ffcaa21c04a3f5b2cbb274b6360fcaefa9f1dc04c1c48209837609800650dd
-MISC metadata.xml 1272 RMD160 31db6bd5fed32098ab05c05fd61420bce807beba SHA1 9a966300b00f7de7323ca54269ad7fd87d656e6c SHA256 52ea9bab5f4124de96f68fbbcbf21ffe2260c6057891226725429da22fc3f7f9
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCAAGBQJPupYUAAoJEF0huFKJUZL5yQkP+wb0kdglmM36FZYFrmi9JbVM
-MEpm9YQQlpQ/6VLFZ5yQxlkBRFdA3jL6TyueVOyL2JLWx49PchXTJmDLgaPbluCa
-6Nq8MZEOwCA5phHzLjTIXhcj2SYby2g9Csz7o9ciuA/vbZ/3fhXQ+n/Dg7tsqfZ2
-c2EDMc8hHT+e8kDrJt65DEh672sNlfqvVNQ6TFvebluntnubdaBvbLgbF90f1eqo
-suQOdnYzsna9cDrtqhxxR8HqMfwxlmAP/CUNXnbwD+exjOAYU3u8kecFhmcTzvOh
-MnvuE/3mRy5CjhP7jkgLdcZKibMxsu7y9uD9XnRFLWD2Q1uvwsPkX9S95aF42pSa
-L81FedlwVzVg8ppCyzj7GU6CqrXof8D5MFEPydQA0RKX5tfINEpeNC5cM/dM+aBC
-erzexSMzvxLXa7du3CaGyk06KQ/2b8l9lsRBhm1wR+sH2Z9Ov07JLYAu5kwZrvPx
-/CGQKZkJssWXtgXcGsAAJwLp1buSTUSqIyUCPV90l36wBPZBiGq21f1y1sRqyvnb
-joZvznwvcftClunUIu97nOngW/40S0cbIbw6MPZR3jNXZlVnMftWFqHcRD+Eia5V
-KquzkC2AXyROFVPtMCla8bEWs3Hc/2BWeqP2r5ApKnOyZ8TO4I2ryUGtkZuOlmE+
-D5WswIoOh7a4jeMopbZk
-=l3JV
------END PGP SIGNATURE-----
+AUX 0.2_p1-configure.patch 2119 SHA256 3591f2f8cdeb1582b12d04f7c66420e6581a70a66e3f9cc735f156cd02739e26 SHA512 b1b1f1d86314b3d046f7bf392caa2e3642758f97bf5f38cec10f5c8783c2756ddadd8d49e3c2b1025ef1b193727ac508bff0b7d44a437b95c2c5c110947e50f5 WHIRLPOOL d45b39094c458c06c3a2df691236aa7172bb3f6e5b4c8f2158d4abc4c261cbc0409f48b7da6f0ec12027e1320b10c1a5854438adb43d6b915d90f98a2a7bb463
+AUX 0.2_p1-underlinking.patch 5390 SHA256 f5fa9af72c719d8f346fb2e49aa3d690087bf66dfcfeabbd7de53600f1df2911 SHA512 f19c7da81c9426c50d18580f8dbf7e1d39a414429e68ca1bf6540aa7024ddffa337af8c80395c50e29e5038e3d567c7c4f9e542b664adb53b9f2b5cb7aef05fe WHIRLPOOL dcfb2fde2b6b25069a859fb3fee97b2f26e862c3c440464c58a0f6235e5765094483fa3d39a66f023a35e77dc183e3ac9317e56b91526e5569ee2e3b5bd6c410
+AUX 1.4-doc.patch 534 SHA256 625da0650f17e89b7be3fff73a10e47a6d9ead1ba7e25644c5c4f54a53c79c40 SHA512 388855f15bd17f5bc42ea3dc1d76d338a5586ed6cdb005442d46d158d36a1ffd32c2b08f10f992de30c44c1f160c005ef7499b6c2a629a0e7fab93f59d15bf65 WHIRLPOOL b18c5fe670e181a2c2012c46631bb4f1b305f2f9802ffd5b434d60242e4c121e038e57eebb8fd892d5fa89d3e3f256c1b45846cde064f87596783e90e54dba08
+AUX 1.4-header.patch 588 SHA256 6a108de531ac5bb5725874ecd8da5728ef9bec5beca4fefda763fa899cde51b5 SHA512 069d4a4c0bbb6c1ae3f76a8c14c5a678af765eddddd34b6e49b063bba4de8c783d838576df982bf05bf8fa0c4530f3007090e9158a5e537025191af86dfacbbe WHIRLPOOL c65aba6dc8965f2eaf1a8efb138d840a48a5dedbdd9e311dd0f0d38e746bc79794459776652e138df3930ab9ed5823b098a6796a8840f6392f56cc7f36bc9709
+AUX 1.4-linking.patch 5885 SHA256 fc9c93ce34e86f8c1f62a047e332b3a90f95cf426aa357a04b4cd3a577c0328c SHA512 8f93a17a08d6ac942159bcb0abd6090ec8de4ae347b9f773f00b5a0630908c42de1e87351545b792de24c8b4f1c055524017e1464665c6872c53117494fb2527 WHIRLPOOL 2e1b0773df3bf558f67539e5380039003506f547ea845c4f867ea9a664338d6b61956e04b229ab9ba853802f5224bd74f6431e60a4537af9e73215ea2fff82c0
+AUX 1.5-linking.patch 6247 SHA256 7739c434d7c497c6c01e2b79f5c8f13598fd40f06371ad0137538a1c3b2abf60 SHA512 d7b8f8f99a2d26cb3e0cace7f31c72eff997786fcdca4a80e81493f7e255df0975743870543881348814d777507a96f328bacb1115fdc118c848a3a0be4c833f WHIRLPOOL da189480e20561acc5c1113337ed86137c63d035def2cfbadced2fcdbbf03831a853adea76e332ff6def6b5e5121e1621fb87ea98e74fe8d5da371cb264a893d
+AUX punc-0.2_p1-libdir.patch 602 SHA256 04303cfbe7655a9fdfc4e56c94652cdab6a0a1e6635585cd7451a046685e2c1c SHA512 caff78196e7dab7edff4f2cf4bd87632a600a76daf5282d556f45ea7d173f1bec6b8352a5caea99ab54372ae89515ca82747b970830440f37d1b3c71cc79fe67 WHIRLPOOL 7128f418029b20fe30b782a340e35b6fb6f2378204604d3f06f24286fc724470ff549c6b8eee794b7d9b2cf3a5da96fb0a2b03e60a4444838057c7dff5cdec7a
+DIST punc-1.5.tar.gz 7036275 SHA256 6a63e4caf5dcd0529c09cd429cc94b4443ca4ba893b98b68962c0549c2a8246f SHA512 8b454f5de9cd01e87a30083f975ce8901c5d5a2cac7256cb535c8698221ce6d1ddb93a3663b2e903e5cae93ef76b48932ff7f13a816ba7da6bb07ea25490503b WHIRLPOOL 09af2ae6ae32014b5f946fcaa8035853aae93cd78b948bf934e817b6cb82bfa1fde6be2f6c970070ae870b494f64b4769203b773434f215dab0cafe420950ba6
+EBUILD punc-1.5.ebuild 2213 SHA256 390492f259d49ec7d3f2b5e12e3c4111a084857aeeadf5f3148b3179218e2ae4 SHA512 3be52d3d6f64cdad55ff3d89d081c89cf69c34913a597fbb9724b20a4de00b2e1007387a4cdafcfd30b539abf5d2084e59d9d1fab1bb36365444c5221f11f80b WHIRLPOOL c6cc2c9c2640d2994445e69c6b2ec8607146c0569ccc8b12f0d104e83eb830c511d2733a229d61ce5034c691b7a7a92f1d7ce0e4276d10982ae68f65e2151864
+MISC ChangeLog 2551 SHA256 110c02a4297f5c2b501175c0e1f9f8815a7d87a95c6f44dbb28d7371ad40a561 SHA512 f107f151d128598dc20330ddc983070f5edff909d2c0221b96fcbfabd0c04cdbb1025f9aeacf50b60214033aa3116702255f0d612006cd13058ab39a3d42665d WHIRLPOOL ed565613d14b6a166da903b65e84e79840981338d91ffc0b880d524e165be4bc8321725fde49e626dd03236c84113e4fd9e5a736fc2c0304f2083ee5618d6570
+MISC metadata.xml 1272 SHA256 52ea9bab5f4124de96f68fbbcbf21ffe2260c6057891226725429da22fc3f7f9 SHA512 ea4fc83721e99f053c1d54ee889d6b2cf2d44671a0fc1611b1b0e21920ad453b47b77ed5e78e25ec43f07a12b3029db97e8aa5d7fd6f82d6d16ea472ca468c7b WHIRLPOOL 669d082f7f470872dce10f3b003b184615449024bc48a00af6370954cfe864e0e47e94d73d240bfaffeb34f51e4020d565eb3867dfbe1756fe4466ac212d2f95
diff --git a/sci-libs/punc/punc-0.2_p1.ebuild b/sci-libs/punc/punc-0.2_p1.ebuild
deleted file mode 100644
index b1c089074eac..000000000000
--- a/sci-libs/punc/punc-0.2_p1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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-0.2_p1.ebuild,v 1.7 2012/05/21 19:22:54 xarthisius Exp $
-
-EAPI="3"
-
-inherit autotools eutils fortran-2 multilib
-
-MY_PV="${PV}"
-MY_P="${PN}-${MY_PV/_p/-}"
-
-DESCRIPTION="Portable Understructure for Numerical Computing"
-HOMEPAGE="http://fetk.org/codes/punc/index.html"
-SRC_URI="http://www.fetk.org/codes/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug mpi static-libs"
-
-DEPEND="
-	dev-libs/maloc[mpi=]
-	sci-libs/arpack[mpi=]
-	sci-libs/superlu
-	virtual/blas
-	virtual/mpi"
-RDEPEND="
-	virtual/fortran
-	${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	rm -rf src/{blas,lapack,arpack,superlu}
-	epatch "${FILESDIR}"/${PV}-underlinking.patch
-	epatch "${FILESDIR}"/${P}-libdir.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
-
-	eautoreconf
-}
-
-src_configure() {
-	export FETK_INCLUDE="${EPREFIX}/usr/include"
-	export FETK_LIBRARY="${EPREFIX}/usr/$(get_libdir)"
-	export FETK_LAPACK_LIBRARY="$(pkg-config --libs lapack)"
-	export FETK_BLAS_LIBRARY="${FETK_LIBRARY}"
-	export FETK_SUPERLU_LIBRARY="-lsuperlu"
-	export FETK_ARPACK_LIBRARY="${EPREFIX}/usr/$(get_libdir)"
-
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable debug vdebug) \
-		--enable-shared \
-		--enable-pmgforce \
-		--enable-cgcodeforce \
-		--enable-vf2cforce
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dohtml doc/index.html || die "failed to install html docs"
-}
diff --git a/sci-libs/punc/punc-1.4-r1.ebuild b/sci-libs/punc/punc-1.4-r1.ebuild
deleted file mode 100644
index 2a4600a7c890..000000000000
--- a/sci-libs/punc/punc-1.4-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# 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.4-r1.ebuild,v 1.6 2012/05/21 19:22:54 xarthisius Exp $
-
-EAPI="3"
-
-inherit autotools eutils fortran-2 multilib
-
-DESCRIPTION="Portable Understructure for Numerical Computing"
-HOMEPAGE="http://fetk.org/codes/punc/index.html"
-SRC_URI="http://www.fetk.org/codes/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-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
-	sci-libs/cgcode
-	sci-libs/arpack[mpi=]
-	sci-libs/superlu
-	sci-libs/umfpack
-	virtual/blas
-	virtual/lapack
-	mpi? ( virtual/mpi )"
-DEPEND="
-	${RDEPEND}
-	doc? (
-		media-gfx/graphviz
-		app-doc/doxygen )"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	rm -rf src/{amd,blas,lapack,arpack,superlu,umfpack}
-	epatch \
-		"${FILESDIR}"/${PV}-linking.patch \
-		"${FILESDIR}"/${PV}-doc.patch \
-		"${FILESDIR}"/${PV}-header.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
-
-	eautoreconf
-}
-
-src_configure() {
-	local fetk_include
-	local fetk_lib
-	local myconf
-
-	use doc || myconf="${myconf} --with-doxygen= --with-dot="
-
-	fetk_include="${EPREFIX}"/usr/include
-	fetk_lib="${EPREFIX}"/usr/$(get_libdir)
-	export FETK_INCLUDE="${fetk_include}"
-	export FETK_LIBRARY="${fetk_lib}"
-	export FETK_LAPACK_LIBRARY="$(pkg-config --libs lapack)"
-	export FETK_BLAS_LIBRARY="${fetk_lib}"
-	export FETK_SUPERLU_LIBRARY="-lsuperlu"
-	export FETK_ARPACK_LIBRARY="${fetk_lib}"
-	export FETK_UMFPACK_LIBRARY="${fetk_lib}"
-	export FETK_CGCODE_LIBRARY="${fetk_lib}"
-	export FETK_AMD_LIBRARY="${fetk_lib}"
-
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable debug vdebug) \
-		--enable-shared \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--disable-triplet \
-		${myconf}
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dohtml doc/index.html || die "failed to install html docs"
-}
diff --git a/sci-libs/punc/punc-1.5.ebuild b/sci-libs/punc/punc-1.5.ebuild
index 3ef84c19b039..d7c1eb5b2055 100644
--- a/sci-libs/punc/punc-1.5.ebuild
+++ b/sci-libs/punc/punc-1.5.ebuild
@@ -1,6 +1,6 @@
 # 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.6 2012/04/30 17:40:09 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/punc/punc-1.5.ebuild,v 1.7 2012/10/16 20:08:39 jlec Exp $
 
 EAPI=4
 
@@ -26,7 +26,6 @@ RDEPEND="
 	sci-libs/superlu
 	sci-libs/umfpack
 	virtual/blas
-	virtual/fortran
 	virtual/lapack
 	mpi? ( virtual/mpi )"
 DEPEND="