Removed destdir patch, now done with sed's. This also solves bug #286492

Package-Manager: portage-2.2_rc56/cvs/Linux x86_64

4 files changed, 18 insertions, 21 deletions

diff --git a/sci-libs/hdf5/ChangeLog b/sci-libs/hdf5/ChangeLog
index a8bedbf54c88..02af2a492230 100644
--- a/sci-libs/hdf5/ChangeLog
+++ b/sci-libs/hdf5/ChangeLog
@@ -1,6 +1,10 @@
 B1;1704;0c# ChangeLog for sci-libs/hdf5
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/ChangeLog,v 1.45 2009/12/03 21:12:09 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/ChangeLog,v 1.46 2009/12/11 23:03:51 bicatali Exp $
+
+  11 Dec 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  files/hdf5-1.8.3-destdir.patch, hdf5-1.8.4-r1.ebuild:
+  Removed destdir patch, now done with sed's. This also solves bug #286492
 
 *hdf5-1.8.4-r1 (03 Dec 2009)
 
diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest
index c38d5aa68ae3..2a8ae7d09925 100644
--- a/sci-libs/hdf5/Manifest
+++ b/sci-libs/hdf5/Manifest
@@ -3,7 +3,7 @@ Hash: SHA1
 
 AUX hdf5-1.6.6-gcc4.3.patch 355 RMD160 109811c4e4d434bfa09ea156e67623e50b0f89a5 SHA1 c0fe43c262723e117572b687d9f3c94910e4fddc SHA256 ca1a16f1df4c58410001ca4b06886f9df47b475100078c5e9208ff7a21ca22c1
 AUX hdf5-1.8.3-as-needed.patch 1909 RMD160 86c153a302d2730d94ab2c741fb71eb66de6b271 SHA1 aafc558d4a5bf58d78ff807f79a81b0f2ef8f8f3 SHA256 11d4fba2970b68666d65e31178f2a07630c0c1f46ef7b18bfa16d49de776a649
-AUX hdf5-1.8.3-destdir.patch 1758 RMD160 3e8992fa473603d72189b2309ae1be9a66bbdc18 SHA1 a37816332fb9f4b7556435fefcc3b2dade4a4c69 SHA256 d28654fddf341969e2a3ba9878c68d6ca868bae07ff2ff2fa75c636119f9a8d7
+AUX hdf5-1.8.3-destdir.patch 1475 RMD160 78bc020b5b8aaef070bafd4a99a2e57f41e5e06b SHA1 7ddfa5d47759d1f7637d0c558cead7a7af63f23d SHA256 866a431b36a5998c1930af6384ff8cd11241af1f488ac5910d247b724eedd309
 AUX hdf5-1.8.3-gnutools.patch 1352 RMD160 a0a51a484f1ab926f13618093c809b6582da8e7f SHA1 e4121383f2876dea4ba09356ca7d233fe6ac5b2e SHA256 0e6720e736d7103f39edcf8d3fb4a14f40bbee67363e8f167d9b594ef348f197
 AUX hdf5-1.8.3-includes.patch 398 RMD160 5112dd05bebbc702f24fa22aeebc67209a4e6611 SHA1 339137d04a803e25a0cafaa4f4d167a4cbc9a7ae SHA256 cd82d8b3817d83d59054a2a32ce44aca060157095875f6e91c560ab830b32561
 AUX hdf5-1.8.3-noreturn.patch 3222 RMD160 39285ba18447b0f8db22a5f8e9d51a3cd8a8e91e SHA1 c5d8f7528fbe5c0bde0cb0ac5c1dd189559ac140 SHA256 d902cfbda0382b8998506ea765d0795937485c44d8824051275ad668bcbd6565
@@ -26,13 +26,13 @@ EBUILD hdf5-1.6.5-r1.ebuild 6638 RMD160 b19d0ec9f56fa0ba1423a494798ab79bccc1380d
 EBUILD hdf5-1.6.6.ebuild 7782 RMD160 2ee70cea539827f28e08f18638703d9a0a87a40e SHA1 cbe8ba966c6435269a84bc120189fb63ac559f8a SHA256 ab6325efffbf410230cf8df6391e33d925c6b0ed9f7b0fcaddf57c8d174ed8fd
 EBUILD hdf5-1.6.7.ebuild 7799 RMD160 992a00257e2e94d2933d61950b1a85155ce995f3 SHA1 1d51c88dc85b13f658bbfde4676de013b23da2d5 SHA256 a3cacbfed63bd26c0f9346d3e0e424b0444ce1dc6e38e2fd4fa5a87f2c9f403b
 EBUILD hdf5-1.8.3-r1.ebuild 2435 RMD160 ee9b11586a1515abfd0d3182cf119b8f6b1a4011 SHA1 41e03d5c7ee325af7843e701930d216517845f3b SHA256 eb220cc4691c19ba0ade57d30f619013440d11c6be50194d15c8c9027481e09e
-EBUILD hdf5-1.8.4-r1.ebuild 2606 RMD160 d1949f75c930aaf7a72731d6941d2a9b03601801 SHA1 2cbf8bad5653f91f2a23b9b3ab4243a2b3160b8e SHA256 aa1920351f5493ae36e6f68ba77b36be7953e42623cf4b6ea12100c51159375a
-MISC ChangeLog 10769 RMD160 c7226460c41eac3c58baaa195a78fa3ac8b6ce02 SHA1 f31fe0dbdd132ecd188cd852f99cb3b414bfc6e5 SHA256 64ed67e3c34148bef0279a56e1314e74df6b51c7184c7946d3380854e4f33290
+EBUILD hdf5-1.8.4-r1.ebuild 2634 RMD160 0b2ea88808d24873b6a561791c039d3e390b191a SHA1 c54dd72204186d5080ab8b925f440346680c16d8 SHA256 1f3f6afc48bc4a8ec8f8674c1b0a6e2316839fc8a05370496890f1717b0b2f4f
+MISC ChangeLog 10956 RMD160 d51392869208b75c6ef91487c557b26d696a5eb8 SHA1 4d0a45135142bff23d91649f205e64cbad44ca4a SHA256 9ae591dea75a37073b0c04f590eae3c014d3693a4bcda21f6b244720f9fc5d83
 MISC metadata.xml 649 RMD160 1b9a1fca35d2d3f57bd4295590a195d2e185ac7b SHA1 3f660a0e5cbad641be13c544a3ef115121c590fb SHA256 108e74754b00646a4e0196b4c305711e210beb91f64ab3ef188369037bc2eea2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAksYMxUACgkQ1ycZbhPLE2CTowCglgLN8MTTjhscuAn+g+6nANrW
-nBwAoIbH9enpB0cKrvs4jzZaIhXbMcQI
-=qxY6
+iEUEARECAAYFAksi2RsACgkQ1ycZbhPLE2BCDwCgoWr3fg5b1mwGu6uGKWzqSBFi
+uXgAlioAOcibTQsApF+bMTo/KIaRdkc=
+=JT1J
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/hdf5/files/hdf5-1.8.3-destdir.patch b/sci-libs/hdf5/files/hdf5-1.8.3-destdir.patch
index 82aa2120875c..81243557d834 100644
--- a/sci-libs/hdf5/files/hdf5-1.8.3-destdir.patch
+++ b/sci-libs/hdf5/files/hdf5-1.8.3-destdir.patch
@@ -1,16 +1,7 @@
 --- hdf5-1.8.3.orig/config/examples.am	2009-04-15 19:10:01.037732972 +0100
 +++ hdf5-1.8.3/config/examples.am	2009-04-16 15:02:45.983768491 +0100
-@@ -51,7 +51,7 @@
- 
- # How to create EXAMPLEDIR if it doesn't already exist
- $(EXAMPLEDIR):
--	-$(top_srcdir)/bin/mkdirs $@
-+	-$(top_srcdir)/bin/mkdirs $(DESTDIR)/$@
- 
- # Install and uninstall rules.  We install the source files, not the
- # example programs themselves.
 @@ -63,13 +63,13 @@
- install-examples: $(EXAMPLEDIR) $(INSTALL_FILES)
+ install-examples: $(INSTALL_FILES)
  	@for f in X $(INSTALL_FILES); do                                     \
  	  if test $$f != X; then                                             \
 -	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1);\
diff --git a/sci-libs/hdf5/hdf5-1.8.4-r1.ebuild b/sci-libs/hdf5/hdf5-1.8.4-r1.ebuild
index 74b93bace361..5466c2c85676 100644
--- a/sci-libs/hdf5/hdf5-1.8.4-r1.ebuild
+++ b/sci-libs/hdf5/hdf5-1.8.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.1 2009/12/03 21:12:09 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.8.4-r1.ebuild,v 1.2 2009/12/11 23:03:51 bicatali Exp $
 
 EAPI=2
 inherit eutils autotools
@@ -43,14 +43,16 @@ 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}"/${PN}-1.8.3-destdir.patch
 	epatch "${FILESDIR}"/${P}-gnutools.patch
 	epatch "${FILESDIR}"/${P}-scaleoffset.patch
 
-	# gentoo examples directory
+	# respect gentoo examples directory
 	sed -i \
-		-e 's:$(docdir)/hdf5:$(docdir):' \
+		-e 's:$(docdir)/hdf5:$(DESTDIR)/$(docdir):' \
 		$(find . -name Makefile.am) || die
+	sed -i \
+		-e '/docdir/d' \
+		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 \