Conditionally check for fortran support, #372557

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

5 files changed, 51 insertions, 41 deletions

diff --git a/sci-libs/hdf5/ChangeLog b/sci-libs/hdf5/ChangeLog
index 8d17f3814eb8..6741f9888b1c 100644
--- a/sci-libs/hdf5/ChangeLog
+++ b/sci-libs/hdf5/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/hdf5
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/ChangeLog,v 1.69 2011/06/21 15:18:04 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/ChangeLog,v 1.70 2011/06/22 18:05:24 jlec Exp $
+
+  22 Jun 2011; Justin Lecher <jlec@gentoo.org> hdf5-1.8.4-r1.ebuild,
+  hdf5-1.8.6.ebuild, hdf5-1.8.7.ebuild:
+  Conditionally check for fortran support, #372557
 
   21 Jun 2011; Justin Lecher <jlec@gentoo.org> hdf5-1.8.4-r1.ebuild,
   hdf5-1.8.6.ebuild, hdf5-1.8.7.ebuild:
diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest
index f85c109f043a..130852f3ddc7 100644
--- a/sci-libs/hdf5/Manifest
+++ b/sci-libs/hdf5/Manifest
@@ -13,15 +13,15 @@ AUX mpd.conf 48 RMD160 289de9bb40759e3f71229cf47e4d2af83703a85f SHA1 244eee76dbf
 DIST hdf5-1.8.4.tar.gz 7181176 RMD160 e448e2326b55aa89ff0bd7488cd4291d6c5485ee SHA1 37877e29c49a6af3e23aa9ad798ef12b8ba1c05c SHA256 a992fce9387a17f175b3b188dc2a42f545a3057aeb141beb3fc3361c7521f465
 DIST hdf5-1.8.6.tar.bz2 5521674 RMD160 e0feec256e61e4947367a2144d9835f569035577 SHA1 348bd881c03a9568ac4ea9071833d6119c733757 SHA256 585ddb775a2aa752ebf673f972b90fb14f3732f5f1806255d101d7adc9a53004
 DIST hdf5-1.8.7.tar.bz2 5710170 RMD160 34641bf8e664c3b3382d1346a65e2f5c3eb485ee SHA1 be1daff26f066aca0b5be52d86dada6757fc4b95 SHA256 771761c9bec30b9a4137fa59ef88fdafdb0f4f35d1db0fd655f2591d19570fec
-EBUILD hdf5-1.8.4-r1.ebuild 3133 RMD160 0b201ca7f534a9f291aaa3f953c01eb56f7cb2d5 SHA1 7dc38059074e8a2872b141cf4669220516f1b793 SHA256 f45be7c58d688f4ddf8570a5e85941758b3f4ace586d53d786d1ed834274f31c
-EBUILD hdf5-1.8.6.ebuild 3087 RMD160 7807cad4168b7a40705ada7db0cf0c43b824860e SHA1 029f74abfbec0d62f46f0874100998e7aa68e592 SHA256 35748b3e3a012cf02730674b27bd57f994b3415d4bdfc546ac3a9d3843770df3
-EBUILD hdf5-1.8.7.ebuild 3048 RMD160 e1472078b9847eec227477c8c7e1e64b8db0f95e SHA1 fe46d9cb0f733d452b23c31d94eebdd1bfb24258 SHA256 f3f778f4f6dd2525944760b62f18f6b19baade81b92469fd3c66a93a1adbcbb8
-MISC ChangeLog 14250 RMD160 fdbd66d6e838446b3d36d9f1dba14e168243f94b SHA1 89bf66f4851f2d4569dcc1561bd52fd8fb45e2ae SHA256 47b65a2e07de22ea06e6eec45f5f0e80d5e7d494f83fa2882b3bf9f285b74421
+EBUILD hdf5-1.8.4-r1.ebuild 3129 RMD160 0993fe39271ccfaf2cff72ab2086b05c24b2e2c3 SHA1 f3f958d377280b3d349b4d377143dbc804106ea4 SHA256 451988f54db9b141b7596aa798d8f1c5387606d222edcd8f56fe9a927caf1be1
+EBUILD hdf5-1.8.6.ebuild 3096 RMD160 663083212f2d03a831ac84e32e0a27042221a20f SHA1 a4a83c27a1cf244db4cd0a131650dc4adb72669a SHA256 0e32008f648ab60e90b7ebbac6d47c4537472eb822ffc1e1ed3f10c51b8c57d1
+EBUILD hdf5-1.8.7.ebuild 3057 RMD160 b53c11122c3b0c9a7a282d3cedbf260464121425 SHA1 13989e9af39e83aa52b8171ed9545fea435da257 SHA256 95626ac61847c9d8f96432bbf8563ec4c4a3301e85a8380c532e49f552811b5d
+MISC ChangeLog 14411 RMD160 c52406675c2a20a816575c9d2f2763c130796d3f SHA1 ab702838d82f916aefb8ced843d2c36bc0c0f8cf SHA256 f2763a487446089688356d2888ca23dbcfb699ecac8e054cf393a8ee2817b5bc
 MISC metadata.xml 445 RMD160 2df0c2fd89c734fbe2efbf51563ddad59bea4814 SHA1 4ae41352074e7b3fff16e5d1de312ffb00df2251 SHA256 e1dfcebd355f246f7f4b0d644e2914cebe3cf16cad2c135fe58a6985eefb61eb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4AtjEACgkQgAnW8HDreRatZwCfVyv08N247UXucMrZitZOYwKZ
-hbIAn1n1QOCkJcbht4ezE84IsyNJ6mBe
-=IzN9
+iEYEARECAAYFAk4CLuoACgkQgAnW8HDreRawSgCfRwFtmevWaxviECO2GwwXNJyK
+lgAAnRk7X6J7f4VolxOYwpnbLd9TkkEK
+=tkM3
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/hdf5/hdf5-1.8.4-r1.ebuild b/sci-libs/hdf5/hdf5-1.8.4-r1.ebuild
index ab9c9360a830..10717107b159 100644
--- a/sci-libs/hdf5/hdf5-1.8.4-r1.ebuild
+++ b/sci-libs/hdf5/hdf5-1.8.4-r1.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.8.4-r1.ebuild,v 1.15 2011/06/21 15:18:04 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.8.4-r1.ebuild,v 1.16 2011/06/22 18:05:24 jlec Exp $
 
 EAPI=2
-inherit eutils fortran-2 autotools
+
+inherit autotools eutils fortran-2
 
 DESCRIPTION="General purpose library and file format for storing scientific data"
 HOMEPAGE="http://www.hdfgroup.org/HDF5/"
@@ -28,7 +29,7 @@ DEPEND="${RDEPEND}
 	sys-process/time"
 
 pkg_setup() {
-	fortran-2_pkg_setup
+	fortran && fortran-2_pkg_setup
 	if use mpi; then
 		if has_version 'sci-libs/hdf5[-mpi]'; then
 			ewarn "Installing hdf5 with mpi enabled with a previous hdf5 with mpi disabled may fail."
@@ -49,20 +50,21 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.8.3-as-needed.patch
-	epatch "${FILESDIR}"/${PN}-1.8.3-includes.patch
-	epatch "${FILESDIR}"/${PN}-1.8.3-noreturn.patch
-	epatch "${FILESDIR}"/${P}-gnutools.patch
-	epatch "${FILESDIR}"/${P}-scaleoffset.patch
-	epatch "${FILESDIR}"/${P}-sigbus.patch
+	epatch \
+		"${FILESDIR}"/${PN}-1.8.3-as-needed.patch \
+		"${FILESDIR}"/${PN}-1.8.3-includes.patch \
+		"${FILESDIR}"/${PN}-1.8.3-noreturn.patch \
+		"${FILESDIR}"/${P}-gnutools.patch \
+		"${FILESDIR}"/${P}-scaleoffset.patch \
+		"${FILESDIR}"/${P}-sigbus.patch
 
 	# respect gentoo examples directory
-	sed -i \
+	sed \
 		-e 's:$(docdir)/hdf5:$(DESTDIR)/$(docdir):' \
-		$(find . -name Makefile.am) || die
-	sed -i \
+		-i $(find . -name Makefile.am) || die
+	sed \
 		-e '/docdir/d' \
-		config/commence.am || die
+		-i config/commence.am || die
 	eautoreconf
 	# enable shared libs by default for h5cc config utility
 	sed -i -e "s/SHLIB:-no/SHLIB:-yes/g" tools/misc/h5cc.in \
diff --git a/sci-libs/hdf5/hdf5-1.8.6.ebuild b/sci-libs/hdf5/hdf5-1.8.6.ebuild
index 8bd004b51d65..da4617039069 100644
--- a/sci-libs/hdf5/hdf5-1.8.6.ebuild
+++ b/sci-libs/hdf5/hdf5-1.8.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.8.6.ebuild,v 1.4 2011/06/21 15:18:04 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.8.6.ebuild,v 1.5 2011/06/22 18:05:24 jlec Exp $
 
 EAPI=2
 
@@ -27,7 +27,7 @@ DEPEND="${RDEPEND}
 	sys-process/time"
 
 pkg_setup() {
-	fortran-2_pkg_setup
+	fortran && fortran-2_pkg_setup
 	if use mpi; then
 		if has_version 'sci-libs/hdf5[-mpi]'; then
 			ewarn "Installing hdf5 with mpi enabled with a previous hdf5 with mpi disabled may fail."
@@ -48,17 +48,19 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.8.3-as-needed.patch
-	epatch "${FILESDIR}"/${PN}-1.8.5-implicits.patch
-	epatch "${FILESDIR}"/${PN}-1.8.5-noreturn.patch
-	epatch "${FILESDIR}"/${PN}-1.8.4-scaleoffset.patch
+	epatch \
+		"${FILESDIR}"/${PN}-1.8.3-as-needed.patch \
+		"${FILESDIR}"/${PN}-1.8.5-implicits.patch \
+		"${FILESDIR}"/${PN}-1.8.5-noreturn.patch \
+		"${FILESDIR}"/${PN}-1.8.4-scaleoffset.patch \
 
 	# respect gentoo examples directory
-	sed -i -e "s:hdf5_examples:doc/${PF}/examples:g" \
-		$(find . -name Makefile.am) $(find . -name "run*.sh.in") || die
-	sed -i \
+	sed \
+		-e "s:hdf5_examples:doc/${PF}/examples:g" \
+		-i $(find . -name Makefile.am) $(find . -name "run*.sh.in") || die
+	sed \
 		-e '/docdir/d' \
-		config/commence.am || die
+		-i config/commence.am || die
 	eautoreconf
 	# enable shared libs by default for h5cc config utility
 	sed -i -e "s/SHLIB:-no/SHLIB:-yes/g" tools/misc/h5cc.in \
diff --git a/sci-libs/hdf5/hdf5-1.8.7.ebuild b/sci-libs/hdf5/hdf5-1.8.7.ebuild
index b4047eee3452..66628bec344c 100644
--- a/sci-libs/hdf5/hdf5-1.8.7.ebuild
+++ b/sci-libs/hdf5/hdf5-1.8.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.8.7.ebuild,v 1.4 2011/06/21 15:18:04 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.8.7.ebuild,v 1.5 2011/06/22 18:05:24 jlec Exp $
 
 EAPI=2
 
@@ -27,7 +27,7 @@ DEPEND="${RDEPEND}
 	sys-process/time"
 
 pkg_setup() {
-	fortran-2_pkg_setup
+	fortran && fortran-2_pkg_setup
 	if use mpi; then
 		if has_version 'sci-libs/hdf5[-mpi]'; then
 			ewarn "Installing hdf5 with mpi enabled with a previous hdf5 with mpi disabled may fail."
@@ -44,17 +44,19 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.8.3-as-needed.patch
-	epatch "${FILESDIR}"/${PN}-1.8.5-implicits.patch
-	epatch "${FILESDIR}"/${PN}-1.8.5-noreturn.patch
-	epatch "${FILESDIR}"/${PN}-1.8.4-scaleoffset.patch
+	epatch \
+		"${FILESDIR}"/${PN}-1.8.3-as-needed.patch \
+		"${FILESDIR}"/${PN}-1.8.5-implicits.patch \
+		"${FILESDIR}"/${PN}-1.8.5-noreturn.patch \
+		"${FILESDIR}"/${PN}-1.8.4-scaleoffset.patch \
 
 	# respect gentoo examples directory
-	sed -i -e "s:hdf5_examples:doc/${PF}/examples:g" \
-		$(find . -name Makefile.am) $(find . -name "run*.sh.in") || die
-	sed -i \
+	sed \
+		-e "s:hdf5_examples:doc/${PF}/examples:g" \
+		-i $(find . -name Makefile.am) $(find . -name "run*.sh.in") || die
+	sed \
 		-e '/docdir/d' \
-		config/commence.am || die
+		-i config/commence.am || die
 	eautoreconf
 	# enable shared libs by default for h5cc config utility
 	sed -i -e "s/SHLIB:-no/SHLIB:-yes/g" tools/misc/h5cc.in \