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

Package-Manager: portage-2.2.0_alpha141/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

5 files changed, 28 insertions, 31 deletions

diff --git a/sci-libs/hdf5/ChangeLog b/sci-libs/hdf5/ChangeLog
index 9a45aa50979d..9dff28c611b2 100644
--- a/sci-libs/hdf5/ChangeLog
+++ b/sci-libs/hdf5/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/hdf5
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/ChangeLog,v 1.94 2012/10/15 11:36:52 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/ChangeLog,v 1.95 2012/10/18 21:30:05 jlec Exp $
+
+  18 Oct 2012; Justin Lecher <jlec@gentoo.org> hdf5-1.8.8-r1.ebuild,
+  hdf5-1.8.9-r2.ebuild, metadata.xml:
+  Remove virtual/fortran and always call fortran-2_pkg_setup as intend by the
+  updated fortran-2.eclass
 
   15 Oct 2012;  <naota@gentoo.org> hdf5-1.8.9-r2.ebuild:
   Add ~x86-fbsd
diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest
index f3972741a149..57ac1273106c 100644
--- a/sci-libs/hdf5/Manifest
+++ b/sci-libs/hdf5/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX hdf5-1.8.8-array_bounds.patch 624 SHA256 849df1a9fed1d6225b0032507294fbd4eec13f7514e1175907f2c9c00aafb48c SHA512 611816451d8afb284e06082c15527aa71fbf67fd1c48c64257df751e4005ff038485f2a604289f92af106d44abda7537070fc7721e6a555724645b07058dfbde WHIRLPOOL b88a7e82e5e8b99ea76a823514b395a1bb432a019b1ccd7a052c350bb11c22ed8a6bbffab38e152de5d95cb7d2572e3e6fd195fb4ce049b66a7d0e38fef87684
 AUX hdf5-1.8.8-buildsystem.patch 1410 SHA256 a97a7a82197eb4f3c9d43836f24c2c2ae14962970a0b680e5305a977b8c611a5 SHA512 610264a578d292daef20e0b796ccdb899823ca9284321b67aede261717e2bb094116f7775ce9b7ed5d176c61ff187e1cad0ff3c1800c33662c411171b87c4391 WHIRLPOOL a7b58c1a2f08dc9291a7dc84a376135bf307749f27f323a627c6072f89ec44f6cab25a2219106b98b622ac7bcd5949c8915f345ad135d8117f15a28e63d37ae5
@@ -10,24 +10,14 @@ AUX hdf5-1.8.9-static_libgfortran.patch 429 SHA256 7802a4535f456c951fb4162850edd
 AUX mpd.conf 48 SHA256 ae740cacaf2cb798921cb2092f5af98de67445e27af3f88858f3e6d2bbb127f4 SHA512 82eafba82e93066ee2faea52b08f59c2231a5bb1a5e64551d399dceb7e48cdb5edda51c264a2e2b6016826613dff50aa2b7d4e946eb0732e2a260332b87f2ec7 WHIRLPOOL 3fc71bb16abbc090549af95912e0945e15abf3c303d6e89bad77d6064acf30fb26067fe95f26f707cd13274f30a8ab090f9b1bf1fc26dd018e652c280dbecb54
 DIST hdf5-1.8.8.tar.bz2 5827394 SHA256 b0ebb0b5478c6c0427631d4ad08f96e39f1b09fde615aa98d2a1b8fb7f6dced3 SHA512 cfa5b31e06a42308519d440a6c5792f26fea6ce27cc3624658acf4499930ac45e596c5b61c9e59d7f4d610a3a04851966929cb8da1f1d12a94b73a1f2562ed17 WHIRLPOOL 8ad9d2b79c0adf3c31db2d13e0e4df4c532e8ff583501df61af7e8bbcdcfd9d503d6816a40fc747ce61482caa8f913a6ed1550dafdb0efab4a42933f5b2933f5
 DIST hdf5-1.8.9.tar.bz2 6006715 SHA256 fafe54856b00f0d6531629f66e2c476ab6ee03458803088f270bbfc4a60966c7 SHA512 08d916c37baa14896f51492559b298bf94e8ba9a6b19ac16ff63ec5814cfc788b522386c2392abbc9d24839aac7fb4585246bd1ff57e6030a2c6d5377f719eee WHIRLPOOL 424f6e2052a8b6beaa9f37865904849419ec1155a7adf4d19aa87633315061775ca970723d8c2284456b8b4972590ce8581fac7efe687160001903afe53a9903
-EBUILD hdf5-1.8.8-r1.ebuild 2864 SHA256 0f0bb6944996ea39f7472d47f34665a46250e50e305e2003eba03db76bef2e0d SHA512 fe003abe87a44e1413c8301b1751294861cb8786f0cb5e2a2eed242bdf70c3c2fc4376aa4de4b1600977c6dcc9b83247fb882d4491143e1fb87fdb8784cc80d6 WHIRLPOOL 2f3a3515d1ffaac3562ddbe47201e1137d05c0842f1d1b0d9ec7ee6365b825241c8314b9ee7a7f8dcbe313f8ce671b1707f5ad51a249eedc7d12600d41697f3c
-EBUILD hdf5-1.8.9-r2.ebuild 3146 SHA256 30be7d0ab9b7a72b59027c3fbad70a2a8dcb5491c6918f715a57f875ca212491 SHA512 4332bb123eb6dccf810faf592caca8e6c1194f9457fd28422d14e3fdd1f51fad17b2573b41a2f929f5cf2cffdf25f94fa25bcc478d5a21fefe3e0d550e82c6e7 WHIRLPOOL 356f9b07e09f7e51db21fda90bc1b02c6c205849fff6b7a8e15596acffdfa3520905a442906ddabcbeb695bf004eb4509987b44821698fbf3996973f1715cd98
-MISC ChangeLog 18530 SHA256 0cefac55fe67912a9c27833206f8e58f9e6c7d35fee19ff14f37d5a5365b221b SHA512 49d124f4d65c46d2c753eb6ba785057ef3a38240fe320b093942f8db67b5f1351c0a168e6a5bcdff39e445a193c940273d34901aff7ea1235b8b947c306d263a WHIRLPOOL f25c58a6f1381d273ac2fbf1cc2738539cf770dbb245d0361e6c0daa34a79f626b2b021e5607d0b61307e5ed1f5b6fa74067679e504b9e16a28c959df9a3de4d
-MISC metadata.xml 728 SHA256 1a503997c6e2248b43a36eccd2c09337a0e02b498926b4430b9d8df059e638ba SHA512 9077cb30cbb9bfb124d39d9eed42fec8da03d614953516b4d86564cdda129bb9c65a7ed7d6eb8f24702647809225ea2e4debc8777de2df5f82ed393b5795a269 WHIRLPOOL 5afcf399f70a5a20d175994b4a3bce61dca632fda1f19768ae0eff12faaf2a628152c71e24563887317da192297b14508b678d486e95d8556b9fe64002cb8c6c
+EBUILD hdf5-1.8.8-r1.ebuild 2834 SHA256 f28d79faf3ccdfb132a9a1e719982b41eba7036641ff1d688fac042e4dfbaddd SHA512 6ddf7979f5dbf9800bad67b7f0cca1218d94fd67465e414fb70fe3204ddff0158729bc9a6ebe4beac3d7099db3d97b5bb49166516f84aa578dd2f1d948f63922 WHIRLPOOL bf93d43a72e59c0659479380a653bd72ea5c0a8decd6744eea551ba82e4394cdac1927a6117f41e722d33b20f396fbae64340b0e273dfbfd0a9842ad6b058c82
+EBUILD hdf5-1.8.9-r2.ebuild 3115 SHA256 505b0979d6381ee934750c5deb9455c962a2adb89f2d6a9643a1fe525a1534a0 SHA512 51f840bf06cc986e55a5fecf898642dc8d4d399b1e29bf498c718b20028ce9b08ea73ddfc0b35d469cc0b6ce520cfb20779c87ec289ef39a630a0876c55b4e53 WHIRLPOOL a233de38de3e946e5e2900b12e45932debfa350d2e4f63cdaf54b60c564a8ebe46a751f7391644e4d74298acd60e970020ea0d0ee1c9f87403e9280a10bb24ed
+MISC ChangeLog 18742 SHA256 f365f142ca34ab11d41d69edf95f9f807341871faabe282ae3b90ba1951275ae SHA512 3f594f342f9a4c38a60df7c61e9466ef84eb6639acd479205247a7558c9c6913e1ef23950ee627e7581e70b1c2abbdb7560485d63879b0731c20cc007ed71c28 WHIRLPOOL 8f7e56b251cb6d88f4de1dbb796737eb802739b0d43777cd38eeebb0f49a1a79118ef1e79b08b8e365e62a40a159f3caf1262a889f41612bc7b24f75383fa2df
+MISC metadata.xml 710 SHA256 7b7f18e0b3b2975d97477a9155f7b5d1c79aeca7afa5ed03d6bd241a36a603e7 SHA512 4280f9a13672bef49ad95176d999a2d3214e2469f1cd7a50f9883755543ab74caafc53624322b6050dd066ac7d4af45f1559180d63b9d654cd1cc546f2882fd6 WHIRLPOOL e4a5effb8546579f44eaec2597d3c176ce144f099b85315d1635ffcd8598ef8035211268f898c3f72a84b8b70c6583ed11a4f35924f62c95f469f149f1277711
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQe/VVAAoJEDYO1FT4VRUUE2gP/jCkRjMPB9IM41OTlsNF/fxr
-q9C841FGvpdZ+syuiPgcxL5/8HuzXMVO5rT3tV/PUPmxlr7xO3WhgYyOC2UFlj+g
-u6tFHFeYeCZKefq9UZnEYBZYLApHojLWvvDGQiGIly2EXfnA8PGZggn0rB2d335q
-3pwClVQYxfpSL8OXeBRe9CWvYl5K1uFYOAXlaN70Gu3qTHuNtxeXlgINsRig3Gj9
-Mqf9HnwyuYDleE2h6WHpMX9UgrWDbNIdRoK22BRsn6MdUO31tHeeZTK0E+0e9qIE
-q50hAeguAPrGkFPatuvfNqhuBXhel/g4x/6Uc9WguHETVqZrscPUbW8kkl6TB2g8
-NCaB6jwkInpoV2C2xzf1roe/qB56jb0oiAY9o/kMEtCqr094Dmom+ieZEnWKjU2w
-QveNI1LObBFc45AUcfnGztU7QFfVNDXzL6CzIhUTrnaoDuGfc0AZ5sFxzNHQroSU
-nib6DszWRZwsbXCep81D7jlFfgYrgje1QNYOYoDCTHvmpL/K04ZP6Ld9XJ4zg3Lv
-9oUOmc7QdJt040P/z/09W06jTsAi41YTorFXIcMtBLUHc0G5+NqkoNYGkBqjW/cz
-THip3bbsU2eL5ZTg9U9ObDrTD8y8gHcAEYQms28Ltrw8zzQ+geQmqGfOpbMQ17+X
-nY3Io5tCHWo+9TIUvMvO
-=AcA/
+iEYEAREKAAYFAlCAdN4ACgkQgAnW8HDreRZ/XQCgmECE47KeVfneOgAGuxwGsvn2
+Qr0AoKUEbhVvDImcdpwDjZGIqn66j2rf
+=sMiu
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/hdf5/hdf5-1.8.8-r1.ebuild b/sci-libs/hdf5/hdf5-1.8.8-r1.ebuild
index b47b1447f65b..c26a7afd9b9a 100644
--- a/sci-libs/hdf5/hdf5-1.8.8-r1.ebuild
+++ b/sci-libs/hdf5/hdf5-1.8.8-r1.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/hdf5/hdf5-1.8.8-r1.ebuild,v 1.7 2012/10/14 19:03:20 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.8.8-r1.ebuild,v 1.8 2012/10/18 21:30:05 jlec Exp $
 
 EAPI=4
 
@@ -16,12 +16,13 @@ LICENSE="NCSA-HDF"
 SLOT="0"
 KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cxx debug examples fortran fortran2003 mpi static-libs szip threads zlib"
-REQUIRED_USE="cxx? ( !mpi ) mpi? ( !cxx )
+
+REQUIRED_USE="
+	cxx? ( !mpi ) mpi? ( !cxx )
 	threads? ( !cxx !mpi !fortran )
 	fortran2003? ( fortran )"
 
 RDEPEND="
-	fortran? ( virtual/fortran )
 	mpi? ( virtual/mpi[romio] )
 	szip? ( >=sci-libs/szip-2.1 )
 	zlib? ( sys-libs/zlib )"
@@ -30,7 +31,7 @@ DEPEND="${RDEPEND}
 	sys-devel/libtool:2"
 
 pkg_setup() {
-	tc-export CXX CC FC # workaround for bug 285148
+	tc-export CXX CC # workaround for bug 285148
 	if use fortran; then
 		use fortran2003 && FORTRAN_STANDARD=2003
 		fortran-2_pkg_setup
diff --git a/sci-libs/hdf5/hdf5-1.8.9-r2.ebuild b/sci-libs/hdf5/hdf5-1.8.9-r2.ebuild
index a868804f95b9..c4ab468ee4e1 100644
--- a/sci-libs/hdf5/hdf5-1.8.9-r2.ebuild
+++ b/sci-libs/hdf5/hdf5-1.8.9-r2.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/hdf5/hdf5-1.8.9-r2.ebuild,v 1.4 2012/10/15 11:36:52 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.8.9-r2.ebuild,v 1.5 2012/10/18 21:30:05 jlec Exp $
 
 EAPI=4
 
@@ -16,12 +16,13 @@ LICENSE="NCSA-HDF"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="cxx debug examples fortran fortran2003 mpi static-libs szip threads zlib"
-REQUIRED_USE="cxx? ( !mpi ) mpi? ( !cxx )
+
+REQUIRED_USE="
+	cxx? ( !mpi ) mpi? ( !cxx )
 	threads? ( !cxx !mpi !fortran )
 	fortran2003? ( fortran )"
 
 RDEPEND="
-	fortran? ( virtual/fortran )
 	mpi? ( virtual/mpi[romio] )
 	szip? ( >=sci-libs/szip-2.1 )
 	zlib? ( sys-libs/zlib )"
@@ -30,7 +31,7 @@ DEPEND="${RDEPEND}
 	sys-devel/libtool:2"
 
 pkg_setup() {
-	tc-export CXX CC FC # workaround for bug 285148
+	tc-export CXX CC # workaround for bug 285148
 	if use fortran; then
 		use fortran2003 && FORTRAN_STANDARD=2003
 		fortran-2_pkg_setup
diff --git a/sci-libs/hdf5/metadata.xml b/sci-libs/hdf5/metadata.xml
index 6b6f68735c02..0267d6039ebe 100644
--- a/sci-libs/hdf5/metadata.xml
+++ b/sci-libs/hdf5/metadata.xml
@@ -2,10 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>sci</herd>
-    <maintainer>
-        <email>xarthisius@gentoo.org</email>
-        <name>Kacper Kowalik</name>
-    </maintainer>
+	<maintainer>
+		<email>xarthisius@gentoo.org</email>
+		<name>Kacper Kowalik</name>
+	</maintainer>
 	<longdescription>
 		HDF5 is a file format and library for storing scientific data. HDF5
 		was designed and implemented to address the deficiencies of HDF4.x. It