Enable hdf5-1.6 legacy API when building against hdf5-1.8 (fixed #282183).

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

3 files changed, 16 insertions, 19 deletions

diff --git a/sci-physics/mpb/ChangeLog b/sci-physics/mpb/ChangeLog
index 11765c22bd51..d9ccf3c357bd 100644
--- a/sci-physics/mpb/ChangeLog
+++ b/sci-physics/mpb/ChangeLog
@@ -1,10 +1,14 @@
 # ChangeLog for sci-physics/mpb
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/mpb/ChangeLog,v 1.10 2008/11/25 18:45:52 bicatali Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/mpb/ChangeLog,v 1.11 2009/08/25 01:25:28 markusle Exp $
+
+  25 Aug 2009; Markus Dittrich <markusle@gentoo.org> mpb-1.4.2-r2.ebuild:
+  Enable hdf5-1.6 legacy API when building against hdf5-1.8 
+  (fixes #282183)
 
 *mpb-1.4.2-r2 (25 Nov 2008)
 
-  25 Nov 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  25 Nov 2008; Sébastien Fabbro <bicatali@gentoo.org>
   +files/mpb-1.4.2-autotools.patch, +files/mpb-1.4.2-headers.patch,
   metadata.xml, -mpb-1.4.2.ebuild, +mpb-1.4.2-r2.ebuild:
   Added hdf5, doc and examples flags. Many autotools and QA fixes: quotes,
@@ -19,7 +23,7 @@
   21 Aug 2007; <pbienst@gentoo.org> mpb-1.4.2.ebuild:
   Added ~amd64.
 
-  10 Jan 2007; Piotr Jaroszyński <peper@gentoo.org> Manifest:
+  10 Jan 2007; Piotr Jaroszyński <peper@gentoo.org> Manifest:
   Fix Manifest.
 
   10 Jan 2007; <marijn@gentoo.org> mpb-1.4.2.ebuild:
diff --git a/sci-physics/mpb/Manifest b/sci-physics/mpb/Manifest
index 859db85b1475..23cd151cf2b7 100644
--- a/sci-physics/mpb/Manifest
+++ b/sci-physics/mpb/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX mpb-1.4.2-autotools.patch 8563 RMD160 878928323396336911f6a317bbe9884c038c583b SHA1 76e25aa64a3f962f6c7e4b972e14585ee366cbe1 SHA256 112a37123c2d9151b120824111c9ce8a66c15e958fd51b64a45d6b3a6a98388f
 AUX mpb-1.4.2-gcc4.patch 1133 RMD160 f314858cd4154a12c2bdca5dc23ec4e3f7cefc91 SHA1 fde1483b2715aae12ba93d592011c540fa977b53 SHA256 5a58dd77d8b7d068f11496a61aa9001d657383b3f18274568de717e07d46ac3d
 AUX mpb-1.4.2-headers.patch 340 RMD160 b3c0f06657a9b67439d27a21ff1ed79ccb022aeb SHA1 8a647ae414dc51f7744a4bc5499c931d3a8e5377 SHA256 ffa8e166e8da83fd4b573d564de9c4f533b0b0903f7768547eeb7d662ea96416
 DIST mpb-1.4.2.tar.gz 686488 RMD160 6440f0e19d4b5b8354c135034429ea2031c4301d SHA1 2d4052566cff6c6befd31183253a908654b534f8 SHA256 e44c0720a5969a879fb93e48f6098d4d87e2f99d6ef49711d822f4c2249ccd61
-EBUILD mpb-1.4.2-r2.ebuild 2868 RMD160 922ecfc3b585ca94d7558bd10be1a0e970172a14 SHA1 5c650057c306a9c5d9e6498a055dd36ef9b812bb SHA256 4ae0a61b44e32f5c1ee13b20ea1e143fcf03e0b8584d002046afa666621a8f33
-MISC ChangeLog 1562 RMD160 522202ab39757a0db147452b2fea9bf0f2fcd8d8 SHA1 cb1a58d3e68ef4be4a2d91a16c751326d2221de7 SHA256 9f0cba2570ec98975d912c2b0b34834a055786e2333376517c6dfae80f904bb5
+EBUILD mpb-1.4.2-r2.ebuild 2958 RMD160 0e87ef0da3d5ce49239c12a7be16b64a356d6be7 SHA1 747e35148c4882fdba8e262aeb47d246deb07c3c SHA256 c92d63b546a8688ffb476d87407cdf3fab68dd9b36bbc15aa9238f9958561a19
+MISC ChangeLog 1720 RMD160 ea9fcacc6ae064de388a2d5ada1683b0759a3695 SHA1 29b8c31d5b038cc62f5e488722921830f3182af6 SHA256 a6abd4da467d43306ba540778f88bc07e529216ed020a7039329a6ac47d8bb67
 MISC metadata.xml 1010 RMD160 28b3ab1d9a4b0b36801c7d6adccd90a6bdfcddcc SHA1 638d1564111f138b6c7609fb31fbb57349e092f0 SHA256 56808d2ceabecc68e966a1e82a2c2480c05e3c353db67753bd8382c0279c5ae8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkk7oEIACgkQ1ycZbhPLE2D79wCfWN1VcLR1NNyouCec+AiPgNaz
-iToAnjW5HeRSpnBLLzMGDvb2yWexU/wX
-=Ey7i
------END PGP SIGNATURE-----
diff --git a/sci-physics/mpb/mpb-1.4.2-r2.ebuild b/sci-physics/mpb/mpb-1.4.2-r2.ebuild
index 31473d4275b3..2a49af273ebd 100644
--- a/sci-physics/mpb/mpb-1.4.2-r2.ebuild
+++ b/sci-physics/mpb/mpb-1.4.2-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/mpb/mpb-1.4.2-r2.ebuild,v 1.1 2008/11/25 18:45:52 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/mpb/mpb-1.4.2-r2.ebuild,v 1.2 2009/08/25 01:25:28 markusle Exp $
 
 EAPI=2
-inherit eutils autotools
+inherit eutils autotools flag-o-matic
 
 DESCRIPTION="Photonic band structure program"
 SRC_URI="http://ab-initio.mit.edu/mpb/${P}.tar.gz"
@@ -45,6 +45,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# enable legacy API for hdf-1.8
+	use hdf5 && append-cflags -DH5_USE_16_API
+
 	local myconf="$(use_with hdf5)"
 	export BLAS_LIBS="$(pkg-config --libs blas)"
 	export LAPACK_LIBS="$(pkg-config --libs lapack)"