Added more prefix rpath to link with szip

Package-Manager: portage-2.2.01.20430-prefix/cvs/Linux x86_64

3 files changed, 17 insertions, 20 deletions

diff --git a/sci-libs/hdf5/ChangeLog b/sci-libs/hdf5/ChangeLog
index a9f37cb5359a..ba18a396fe6d 100644
--- a/sci-libs/hdf5/ChangeLog
+++ b/sci-libs/hdf5/ChangeLog
@@ -1,6 +1,9 @@
 # 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.91 2012/06/17 20:23:04 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/ChangeLog,v 1.92 2012/07/05 16:45:27 bicatali Exp $
+
+  05 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org> hdf5-1.8.9-r2.ebuild:
+  Added more prefix rpath to link with szip
 
   17 Jun 2012; Kacper Kowalik <xarthisius@gentoo.org>
   -files/hdf5-1.8.3-as-needed.patch, -files/hdf5-1.8.3-includes.patch,
diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest
index 5e124ce636d2..90be1c706b7f 100644
--- a/sci-libs/hdf5/Manifest
+++ b/sci-libs/hdf5/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX hdf5-1.8.8-array_bounds.patch 624 RMD160 cdbda024424e3eb6a08fd6bc226a28a1da5b9c8e SHA1 0b818c8aa78b54a82e9089ed22b77cec1653d628 SHA256 849df1a9fed1d6225b0032507294fbd4eec13f7514e1175907f2c9c00aafb48c
 AUX hdf5-1.8.8-buildsystem.patch 1410 RMD160 a88c63145bf088b018d4dcf327415938d467914e SHA1 f8a48e3602967ef15ceabab9ad499a8f6b3aa009 SHA256 a97a7a82197eb4f3c9d43836f24c2c2ae14962970a0b680e5305a977b8c611a5
@@ -11,23 +11,13 @@ AUX mpd.conf 48 RMD160 289de9bb40759e3f71229cf47e4d2af83703a85f SHA1 244eee76dbf
 DIST hdf5-1.8.8.tar.bz2 5827394 RMD160 077580c9828747473836cc39f8cb3fd4e5e045d9 SHA1 1bc16883ecd631840b70857bea637a06eb0155da SHA256 b0ebb0b5478c6c0427631d4ad08f96e39f1b09fde615aa98d2a1b8fb7f6dced3
 DIST hdf5-1.8.9.tar.bz2 6006715 RMD160 4c1a4160fbac6befa15b2dc039f20858c31db37d SHA1 7d5e5e8caa5970c65e70a5b4ad6787efe0bf70bb SHA256 fafe54856b00f0d6531629f66e2c476ab6ee03458803088f270bbfc4a60966c7
 EBUILD hdf5-1.8.8-r1.ebuild 2843 RMD160 d0240e8a0b7a5d4cf158a50a5a96526a0918bd5a SHA1 c7d6d436211a63d520e86f5251514b6ce102ed5c SHA256 8323598270bc0a641dfe2d85c76ddbf6fe5d84565577c401f011574b6fdcbaff
-EBUILD hdf5-1.8.9-r2.ebuild 3000 RMD160 87ea4d6654b685e2b55cbabc81141ea3ed7283e4 SHA1 96f1ccab50166d7fb07bac88eb5a81d7d3ff5535 SHA256 e85018cc354a95405801ab07ae049041867bdc2ad9025c259847824db60f1602
-MISC ChangeLog 18208 RMD160 4887fd411da3a0c762ab70801a414d5acec997f7 SHA1 abf2cb6f2659baddc91f3274fdcd7c7ee248f435 SHA256 6c2dc08d30ca33eb4bd88c951af9834d9b927f2aa8609d984d45718250072d9b
+EBUILD hdf5-1.8.9-r2.ebuild 3115 RMD160 ddfe936a1f8808d6f62bc207c7fc21cde65cae00 SHA1 4be6b09d07a092dc6c36433c17257f5bbf21903e SHA256 69c2ca474386c0d75acb1cc82339d61492ebfdaa8a595405dd1e7b36c48bb777
+MISC ChangeLog 18328 RMD160 87811948b871132ddcb380b61862a9938896851c SHA1 e07645ad296e40ebb0fc196118ce155c6dbab748 SHA256 4f8f48d7309c9ea9db0cecfd9dfb2f590b59dc00b2f8e71492d55dfbd941100d
 MISC metadata.xml 728 RMD160 3863f8962e54ddbd28c78256e03feedc571148a7 SHA1 f4ac101d9b30cca655a89a87185364dd4a24816b SHA256 1a503997c6e2248b43a36eccd2c09337a0e02b498926b4430b9d8df059e638ba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJP3jyxAAoJEF0huFKJUZL5D2MQAIOrCbPAA7TcE8Bxk73DXcxy
-6rtn6n63UdKkie0fxkY9kQoBr5iS3MO8jg9OBHJNs/Y9/dKfZuAIJUEizsfspJno
-dsgoiyADnbTQ0rp3pCys3V9Mjnhbu1AVwe9WAKCF+WvpdBk24Ijm/xSsZSfT9ofI
-C3nO8PWeF1DHV0xwnvCH2EjFJv7q7xdhsLxB4f0OmjwztOCI9IRo9lnhiF+Po+hd
-HGBMx0KzH6R3hwE32ll/3E/+MsgpzagDwcUclGffOXdZt+/t5sxozOmxbv1hy4/8
-ky5UY172YKgZPnY8sTkjiqO0k514O1kbxM/Nh7JJ2ENwNs2kpS8JB+t8vPvhuJ3j
-2ornfVhqdAPBPEX4WqW3klXaXX4n/hYfW5EvLMfx6kO7dx9cDqb3u056weoKPcHC
-NfmhMXEVxdNK1U78KNCbmd/KQ2xR0gMv6HdGClZNRveTVy/VE7InMzZ0Yg3O4oMy
-gHhZrPsdGWpRD4bmCTSPNC01fc0Ld2p48bZuREqN6EQoqVnHqQPMQHRZVfCg4WUa
-CA5XWD/x2v7kmOLad8oicZvH5xMCBNLnKbnGY1ebjQCWovm+WFDbDBgDD+oCbXrk
-IL3HOSgAM/Y3NuI/FQa8Wbuofmcu7hKXTJHOBjqUqXke9NAujzSu2wunzxxrpZRX
-9GDrzMn0fUkApf48q1jP
-=6lBH
+iEYEARECAAYFAk/1xK0ACgkQ1ycZbhPLE2ALHACgoiG43PAHpftzVIvfxarqw0O1
+lFcAn3Hutd1MK9Xz7QEuod74NoGo4oLu
+=1Jts
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/hdf5/hdf5-1.8.9-r2.ebuild b/sci-libs/hdf5/hdf5-1.8.9-r2.ebuild
index be6c21732733..1a670f556836 100644
--- a/sci-libs/hdf5/hdf5-1.8.9-r2.ebuild
+++ b/sci-libs/hdf5/hdf5-1.8.9-r2.ebuild
@@ -1,10 +1,10 @@
 # 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.1 2012/06/13 18:59:33 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.8.9-r2.ebuild,v 1.2 2012/07/05 16:45:27 bicatali Exp $
 
 EAPI=4
 
-inherit autotools eutils fortran-2 flag-o-matic toolchain-funcs
+inherit autotools eutils fortran-2 flag-o-matic toolchain-funcs multilib
 
 DESCRIPTION="General purpose library and file format for storing scientific data"
 HOMEPAGE="http://www.hdfgroup.org/HDF5/"
@@ -66,7 +66,10 @@ src_prepare() {
 	eautoreconf
 	# enable shared libs by default for h5cc config utility
 	sed -i -e "s/SHLIB:-no/SHLIB:-yes/g" tools/misc/h5cc.in	|| die
-	use prefix && append-ldflags -Wl,-rpath,"${EPREFIX}"/lib #419677
+	# bug #419677
+	use prefix && \
+		append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir) \
+		-Wl,-rpath,"${EPREFIX}"/$(get_libdir)
 }
 
 src_configure() {
@@ -76,6 +79,7 @@ src_configure() {
 		--enable-deprecated-symbols \
 		--enable-shared \
 		--disable-silent-rules \
+		$(use_enable prefix sharedlib-rpath) \
 		$(use_enable static-libs static) \
 		$(use_enable debug debug all) \
 		$(use_enable debug codestack) \