sci-libs/hdf: 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

7 files changed, 23 insertions, 126 deletions

diff --git a/sci-libs/hdf/ChangeLog b/sci-libs/hdf/ChangeLog
index 70eb4ed7fbca..3ac720bca0d9 100644
--- a/sci-libs/hdf/ChangeLog
+++ b/sci-libs/hdf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/hdf
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf/ChangeLog,v 1.28 2012/10/14 19:02:33 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf/ChangeLog,v 1.29 2012/10/18 21:24:27 jlec Exp $
+
+  18 Oct 2012; Justin Lecher <jlec@gentoo.org> hdf-4.2_p4.ebuild,
+  -hdf-4.2.6.ebuild, -hdf-4.2.7_p1.ebuild, hdf-4.2.8.ebuild, metadata.xml:
+  Remove virtual/fortran and always call fortran-2_pkg_setup as intend by the
+  updated fortran-2.eclass
 
   14 Oct 2012; Justin Lecher <jlec@gentoo.org> hdf-4.2_p4.ebuild:
   Prepare for fortran2.eclass update
diff --git a/sci-libs/hdf/Manifest b/sci-libs/hdf/Manifest
index 2442fca72105..48aeabaf32ce 100644
--- a/sci-libs/hdf/Manifest
+++ b/sci-libs/hdf/Manifest
@@ -1,24 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 4.2.6-autotools.patch 4178 SHA256 75474d558d62214167b4690fa6a0d1f9826a64332e81e1bdd4fbe4788facad3b SHA512 456ef76f86a16f399443a3ba4b080f02fa8ec734aa602fc273f8bde7befc2a9e13caf2275f32e87d94df11169f80aa2aa8e1b0f2f503ab73964be265794fb353 WHIRLPOOL 834581f8cf04056c9320a36c1fc7816ad527f5a6675d0a968dafdc9bec3ae2c9d79036b619d24ee11d514dc8b31b0c58574b05f48d62e081879b2d0f3abf1048
 AUX 4.2.7_p1-autotools.patch 4375 SHA256 af9581450d6695c98fae755d62a4f58eda95b43a379179d58d3b7884702379a6 SHA512 5a45900bf4286dfede6b87914144821bc6fcb1458687a7add764ac0b2e17719e24afc0f96d555294824948f43a10d30cef9e51660850b8f2589e0a0ceb7869ff WHIRLPOOL 6afc4e1004cc9831c8ef62cd63ca41d6a56a9484d9604888ba506291716bb9117752f30c855beb5fe13b77de3030b62ee71f8e8dbfa1dfdd96a04766f1232852
 DIST HDF4.2r4.tar.gz 3914118 SHA256 39695c85e15c391e589cfdcb98ecc9a72fbb7447f0575bff4d030d53a62e689d
-DIST hdf-4.2.6.tar.bz2 3088411 SHA256 9ddfc10f8703dda17f7ccf942c50f56ffd0c7b1066dd5b34ca493a799577a05f
-DIST hdf-4.2.7-patch1.tar.bz2 3027309 SHA256 3a7b5ba0ac47e5283bee3ec365e8027e88937cd1632d001ceec33af80947d1bd SHA512 93ef83e7b2d8e16f5d53c85155e56eee95342bfce1dfaef9959fd429da4d662667cff6db17ac8415df103f00e69879f0cc473fda875c02a10afeb068c8f3835f WHIRLPOOL 92de72ab87fc291ab9f68fc7ea64ad132261b8ed2ff8c72ab79e09d4304852c3074433de75418ddcb7de02b994d2f017a6d991a809a59779ca47b25d4a8f4b49
 DIST hdf-4.2.8.tar.bz2 3027253 SHA256 e8a94ae2c838007ccdd55bb3cd9684adba3ded367c09803ffc84a2704f83c00f SHA512 d033007eff74d957572db8433f66e9df6fec44f67b28ddbad6e9a2d832b5504a29e9ecc5565d861b8308bab8d0dbfce19ae1e2ade0dd758d370a333819364c8e WHIRLPOOL 89ac6a092024fe2fac61bff918c14bf90e80db0b77f48e2ffe7cbf05610a3687e214c684f49e909b985c09b6baacf3dc730a15141fb44a3d59c191777c538299
 DIST hdf-4.2_p4-patches.tar.bz2 6914 SHA256 e04ece17fab9739f145099ee78e926ca790177033bfa102f12b328b66bbac390
-EBUILD hdf-4.2.6.ebuild 1280 SHA256 752906b275c360abab0b553113d1bf2dde87f5823a1cdba9928c1bbf153a3e08 SHA512 42a2ff6da91279b207b03df6f8ad4f8fc7457eeab01b32a8ab1e8a7015b81084dadfb8d9f5622448675ed34a23327b3d6d083dd0fa92aa30cd30a7f9ca983f19 WHIRLPOOL f657dd3ccdd1a9bea911d71bcb809fd47153b99bf74de0bbe661b1f490c2a36b4355c578603fdac0763217972f92834bc64debc3e5f2b1a4c92ed897a40b14bb
-EBUILD hdf-4.2.7_p1.ebuild 1355 SHA256 d3a622e1703ef7f845866a188a1ebd0dc2f09763e30f5b5a5b9db85207ae163d SHA512 77fc3d59d3b038947c52396b61a5f8ff141c82414fd912d030f9c582de4c115ca188eec1e8b5260e9b508bce1aef2e32c38e437c754838a2a863d0eff5c9814b WHIRLPOOL f95bae1c038c8263ce2c4c754408eb5bb3a8884983431bbc1cec14fa460906a74b2c1e85f8556d39f2bafb33a65687085d888bce822c62bb942f586e21722d06
-EBUILD hdf-4.2.8.ebuild 1410 SHA256 9de4a43197af9221639cc7f88dc37831df56e747bbe58b74ff1aa6897f47ac8a SHA512 11350568ec0d7ac5eb91ce34db3bab0e5e6869fdc8d2577f1d8aeca049cf8a399fee00885a9e67d17294675b18e19d2d82436fc5bc65ae15228dec3774573172 WHIRLPOOL a566f8fe08ffeab42cb05a52845b7ee9a623bffccecc673b44287f3cd7663aa46593e866b7ffe1b582763f1d9af60291f871102221af1330d94eb18cb77a5ec5
-EBUILD hdf-4.2_p4.ebuild 2209 SHA256 ef46bfb81d77b621499fa71fa5c304ac4dc7093768d1c2355a9f0869fe2219ef SHA512 4dddcefcbbc88dd33de162d2ec7c0d8b34e588b7e7266b6ce17013656b70eb912d388e0660fae8c9fd2f03e6eb6ab66d44d0d6b042d54dd8fbe6ccea0259c1bc WHIRLPOOL 0d98a249f8469c8d0a25c9489ed6dded857fb1df1bea9dba951d968892a5fedeccf676bf2ad81996944bfb88f937d6b4ff279f3d8735bd318d12d427523569c4
-MISC ChangeLog 5500 SHA256 4cf440896bad449c59a1f43df3bec8ee6d314579c02cedf07e541042506e35e2 SHA512 7398e699eb0a439aaac773d7b189b5a3970eb09f2f7108fd778d2285c41ed811dcb1e926c8cc6e02a1541259b92abb1286821279fc2cac8337fab5c2d99999cf WHIRLPOOL 1c7d75381b26a01beb4417b2f3ebcee6b052e8d8285ae36ebea808c230bc5e8347a1ce25563c25f938ec0b03e0411e4eb102487c236a97cc6e8738425d0169d3
-MISC metadata.xml 760 SHA256 a753e7be3b3935681d6aa925d90c6eff98d764b8a8dbf30ed0dfc4046df39def SHA512 08a1bf0c6e07ca7220ec1bb01b5f70948dc2ad4b3b293b0cafa10549f4ffeedcce2792066e4c967c93ddcb3661b56205e2efd13d638941119fb7618f792cb56a WHIRLPOOL 02c9e45e0d23d987ebffed284ec71b34e9d2d5ec4653809d87cdb53d1b5eafe3413f3b2f41aeb90f5a0025b81c0a8233c430a205778eb632f725a90d256e25d5
+EBUILD hdf-4.2.8.ebuild 1380 SHA256 7a5b85139228556ee8d65409d20079f6c6ec4deecb42ce9c4537566b64d8ddb2 SHA512 25202353bb477a709c91c516fb24a31f40ab41a05954ee0c4199b9f166a1219eacc83a6e0369c921e82b9d3104dba05fdebe1a19a95d625d21c8a5b6cbedef27 WHIRLPOOL 72bbbff0487a0e14c4a1a98da64d8444782430e817d04f7c006a455685387684154b47a250e55f0e049d399ff55a9d6baafdaa690c9bfb9126c12f4989e4dd39
+EBUILD hdf-4.2_p4.ebuild 2178 SHA256 11ca458f55c398fe562f79cba2e4f5c85250a6173b62805bf33f0814759a9780 SHA512 d4e61a96854d77a4827ea337e2d2df5ab45334ee091f294c50e774d8dcbea9b1e4172839782579b225d89c293599aee1750417a7b743254be4de2e9e31a33c73 WHIRLPOOL 120a8702c231c5cc18a3a657bf34fb97cbcd897f13c463790513096b080f026a871c47a5364d5d01f11085ec2338c259b2048cbf9a5c650c5dc3040fc735cbfe
+MISC ChangeLog 5747 SHA256 6814be07a610225980799009367d7cce4e03036e1e55548dd206a430601cbb0d SHA512 978e5a011662af41d4da9b7e61dd56d55ec9ad9b2ca4888a86420acec5eccc68c2c2d1245dd8e48095c948b3bd68bf4c3662765e407365c50b2d4f5d72b9b1f2 WHIRLPOOL 50bbbd65dd2498dfb089765c94b0b7a94278e4f06420d0eff397da419a63b1732bdff746ede114fc7c87b232ffebbd7a66f1f355572b4aa7320d1c7ea6558c13
+MISC metadata.xml 762 SHA256 2a3f47728f208bb059411efc4c8ea5fcba18dc6504b79ca5bb4155c2dfe87eab SHA512 23961dc14add2e7375da79e39caec4a61f20e16314cd88a278c3c887dec828a354ad48f49694ba9b699d80398d40d71b396b6017f0d4c01682b318f3157b845e WHIRLPOOL 9e797341edaea73c417221b812670a6092d6057f4934fbd624e27a12dcf864884bdd2ec61279e5bcd11f3507568ab2a65c98cbfea340130591b31834ee764213
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
-Comment: GPGTools - http://gpgtools.org
 
-iEYEAREIAAYFAlB7DEoACgkQgAnW8HDreRb4IgCeOgbO5N5fOQ89t2yLMKBk+o6v
-xkYAoIRd7NlDdnUK7NMd/nzHPPoewc1K
-=ngQd
+iEYEAREKAAYFAlCAc4wACgkQgAnW8HDreRbWZgCgwfeMn2Y2fECsLVfLzTr7KvbB
+2wkAnjtm2P6IkKksPZYzcgiX0qvBUBSG
+=9c7/
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/hdf/hdf-4.2.6.ebuild b/sci-libs/hdf/hdf-4.2.6.ebuild
deleted file mode 100644
index 2940e2d4b45a..000000000000
--- a/sci-libs/hdf/hdf-4.2.6.ebuild
+++ /dev/null
@@ -1,49 +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/hdf/hdf-4.2.6.ebuild,v 1.2 2012/01/21 11:41:00 xarthisius Exp $
-
-EAPI=4
-inherit eutils fortran-2 toolchain-funcs autotools flag-o-matic
-
-DESCRIPTION="General purpose library and format for storing scientific data"
-HOMEPAGE="http://www.hdfgroup.org/hdf4.html"
-SRC_URI="ftp://ftp.hdfgroup.org/HDF/HDF_Current/src/${P}.tar.bz2"
-
-LICENSE="NCSA-HDF"
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-IUSE="fortran szip static-libs"
-
-RDEPEND="virtual/jpeg
-	sys-libs/zlib
-	fortran? ( virtual/jpeg )
-	szip? ( >=sci-libs/szip-2 )"
-
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-autotools.patch
-	eautoreconf
-	[[ $(tc-getFC) = *gfortran ]] && append-fflags -fno-range-check
-}
-
-src_configure() {
-	econf \
-		--enable-shared \
-		--enable-production=gentoo \
-		--disable-netcdf \
-		$(use_enable fortran) \
-		$(use_enable static-libs static) \
-		$(use_with szip szlib) \
-		CC="$(tc-getCC)"
-}
-
-src_install() {
-	default
-	dodoc release_notes/{RELEASE,HISTORY,bugs_fixed,misc_docs}.txt
-	cd "${ED}"usr
-	mv bin/ncgen{,-hdf} || die
-	mv bin/ncdump{,-hdf} || die
-	mv share/man/man1/ncgen{,-hdf}.1 || die
-	mv share/man/man1/ncdump{,-hdf}.1 || die
-}
diff --git a/sci-libs/hdf/hdf-4.2.7_p1.ebuild b/sci-libs/hdf/hdf-4.2.7_p1.ebuild
deleted file mode 100644
index b2ad02191020..000000000000
--- a/sci-libs/hdf/hdf-4.2.7_p1.ebuild
+++ /dev/null
@@ -1,53 +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/hdf/hdf-4.2.7_p1.ebuild,v 1.2 2012/08/03 19:12:55 bicatali Exp $
-
-EAPI=4
-inherit eutils fortran-2 toolchain-funcs autotools flag-o-matic
-
-MYP=${P/_p/-patch}
-
-DESCRIPTION="General purpose library and format for storing scientific data"
-HOMEPAGE="http://www.hdfgroup.org/hdf4.html"
-SRC_URI="http://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2"
-
-LICENSE="NCSA-HDF"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="fortran szip static-libs"
-
-RDEPEND="virtual/jpeg
-	sys-libs/zlib
-	fortran? ( virtual/jpeg )
-	szip? ( >=sci-libs/szip-2 )"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MYP}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-autotools.patch
-	eautoreconf
-	[[ $(tc-getFC) = *gfortran ]] && append-fflags -fno-range-check
-}
-
-src_configure() {
-	econf \
-		--enable-shared \
-		--enable-production=gentoo \
-		--disable-netcdf \
-		$(use_enable fortran) \
-		$(use_enable static-libs static) \
-		$(use_with szip szlib) \
-		CC="$(tc-getCC)"
-}
-
-src_install() {
-	default
-	dodoc release_notes/{RELEASE,HISTORY,bugs_fixed,misc_docs}.txt
-	cd "${ED}"usr
-	mv bin/ncgen{,-hdf} || die
-	mv bin/ncdump{,-hdf} || die
-	mv share/man/man1/ncgen{,-hdf}.1 || die
-	mv share/man/man1/ncdump{,-hdf}.1 || die
-}
diff --git a/sci-libs/hdf/hdf-4.2.8.ebuild b/sci-libs/hdf/hdf-4.2.8.ebuild
index 672209739617..cf0afd986b94 100644
--- a/sci-libs/hdf/hdf-4.2.8.ebuild
+++ b/sci-libs/hdf/hdf-4.2.8.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf/hdf-4.2.8.ebuild,v 1.1 2012/08/15 16:09:09 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf/hdf-4.2.8.ebuild,v 1.2 2012/10/18 21:24:27 jlec Exp $
 
 EAPI=4
+
 inherit eutils fortran-2 toolchain-funcs autotools flag-o-matic
 
 MYP=${P/_p/-patch}
@@ -11,14 +12,14 @@ DESCRIPTION="General purpose library and format for storing scientific data"
 HOMEPAGE="http://www.hdfgroup.org/hdf4.html"
 SRC_URI="http://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2"
 
+SLOT="0"
 LICENSE="NCSA-HDF"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
 IUSE="fortran szip static-libs"
 
-RDEPEND="virtual/jpeg
+RDEPEND="
 	sys-libs/zlib
-	fortran? ( virtual/jpeg )
+	virtual/jpeg
 	szip? ( >=sci-libs/szip-2 )"
 DEPEND="${RDEPEND}"
 
diff --git a/sci-libs/hdf/hdf-4.2_p4.ebuild b/sci-libs/hdf/hdf-4.2_p4.ebuild
index 688a5aa63817..60602e051537 100644
--- a/sci-libs/hdf/hdf-4.2_p4.ebuild
+++ b/sci-libs/hdf/hdf-4.2_p4.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/hdf/hdf-4.2_p4.ebuild,v 1.10 2012/10/14 19:02:33 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf/hdf-4.2_p4.ebuild,v 1.11 2012/10/18 21:24:27 jlec Exp $
 
 EAPI=2
 
@@ -15,17 +15,15 @@ HOMEPAGE="http://www.hdfgroup.org/hdf4.html"
 SRC_URI="ftp://ftp.hdfgroup.org/HDF/HDF_Current/src/${MYP}.tar.gz
 	mirror://gentoo/${P}-patches.tar.bz2"
 
+SLOT="0"
 LICENSE="NCSA-HDF"
 KEYWORDS="amd64 ppc x86"
-SLOT="0"
 IUSE="fortran netcdf szip"
 
 RDEPEND="
-	fortran? ( virtual/fortran )
 	sys-libs/zlib
 	virtual/jpeg
 	szip? ( >=sci-libs/szip-2 )"
-
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MYP}"
diff --git a/sci-libs/hdf/metadata.xml b/sci-libs/hdf/metadata.xml
index dc9a4a81fd04..40b295a48396 100644
--- a/sci-libs/hdf/metadata.xml
+++ b/sci-libs/hdf/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
+	<herd>sci</herd>
+	<longdescription lang="en">
   The Hierarchical Data Format is a general purpose library and
   file format for storing scientific data.
   HDF can store two primary objects: datasets and groups. A dataset is