reverted to original (and standard) library location

Package-Manager: portage-2.1.1_pre1-r2

3 files changed, 17 insertions, 17 deletions

diff --git a/sci-libs/hdf5/ChangeLog b/sci-libs/hdf5/ChangeLog
index 58248dd2bc84..3376d1355df2 100644
--- a/sci-libs/hdf5/ChangeLog
+++ b/sci-libs/hdf5/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/hdf5
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/ChangeLog,v 1.14 2006/06/24 16:13:48 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/ChangeLog,v 1.15 2006/06/28 07:29:31 nerdboy Exp $
+
+  28 Jun 2006; Steve Arnold <nerdboy@gentoo.org> hdf5-1.6.5-r1.ebuild:
+  Reverted to original (and standard) library location; even though it
+  was much tidier, it was causing linkage issues...
 
 *hdf5-1.6.5-r1 (24 Jun 2006)
 
diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest
index 545d26caead6..9c3fd79c4b1b 100644
--- a/sci-libs/hdf5/Manifest
+++ b/sci-libs/hdf5/Manifest
@@ -13,18 +13,18 @@ EBUILD hdf5-1.6.4.ebuild 2107 RMD160 b563d55acd098d4aae60bb9ae92d72c9c9d87b16 SH
 MD5 a6909692f068dc005572cfa342757ab0 hdf5-1.6.4.ebuild 2107
 RMD160 b563d55acd098d4aae60bb9ae92d72c9c9d87b16 hdf5-1.6.4.ebuild 2107
 SHA256 26cd2c352ef2ff1586bbdbcd74eaf02b25b0828d1f57dccf209ab83acaaed14b hdf5-1.6.4.ebuild 2107
-EBUILD hdf5-1.6.5-r1.ebuild 6915 RMD160 c7d56fda55269be93d1b84b4651cd251f853d6c9 SHA1 379bbfa22b28db03bd00d059a734bf6e31367f13 SHA256 8b901ea960c162656d32d6dc069b0297ae444c3df231b7eaed9da14e2002066d
-MD5 6125aee2c28d26ce30cc94a5827a0d75 hdf5-1.6.5-r1.ebuild 6915
-RMD160 c7d56fda55269be93d1b84b4651cd251f853d6c9 hdf5-1.6.5-r1.ebuild 6915
-SHA256 8b901ea960c162656d32d6dc069b0297ae444c3df231b7eaed9da14e2002066d hdf5-1.6.5-r1.ebuild 6915
+EBUILD hdf5-1.6.5-r1.ebuild 6766 RMD160 397f19f3fe91dfeb7adec111918eb09a1d5b92ff SHA1 8d7ae2b12e472cadb36cba5f04cbb6aaadf0a05b SHA256 7536f6029a3b85e27c9ed75b532fee8ee8150aa53abd2565052115691366addf
+MD5 0bb6736879aba68a9751dc96ff449200 hdf5-1.6.5-r1.ebuild 6766
+RMD160 397f19f3fe91dfeb7adec111918eb09a1d5b92ff hdf5-1.6.5-r1.ebuild 6766
+SHA256 7536f6029a3b85e27c9ed75b532fee8ee8150aa53abd2565052115691366addf hdf5-1.6.5-r1.ebuild 6766
 EBUILD hdf5-1.6.5.ebuild 2698 RMD160 7ca8f3454bafc54c65764a09f367860c3c940471 SHA1 61f0b5df781bc151a5c5fedc8992293498c3706e SHA256 5fe7ca91b17a45146f6757a2ed0b0efcdbffc28ce2d9982e224b9898555e4f6d
 MD5 8764309057359f4eda768482f52dccf4 hdf5-1.6.5.ebuild 2698
 RMD160 7ca8f3454bafc54c65764a09f367860c3c940471 hdf5-1.6.5.ebuild 2698
 SHA256 5fe7ca91b17a45146f6757a2ed0b0efcdbffc28ce2d9982e224b9898555e4f6d hdf5-1.6.5.ebuild 2698
-MISC ChangeLog 5054 RMD160 6339c351951e91b7ad334758dba86de6d67500f9 SHA1 4df122332ede4519b5b1a28c41e5c7a1d183d1c2 SHA256 db4aebe2b730d2380758184f3ce66f5993d8f694d7e27fb98879358e2908622f
-MD5 b54d87c80d34bac9da441dd7c42b23db ChangeLog 5054
-RMD160 6339c351951e91b7ad334758dba86de6d67500f9 ChangeLog 5054
-SHA256 db4aebe2b730d2380758184f3ce66f5993d8f694d7e27fb98879358e2908622f ChangeLog 5054
+MISC ChangeLog 5249 RMD160 16fafcc3a47f2529fffe40cafb51c81135a6ddbd SHA1 70fbee52adaea87c3f3d02aac757a3990e993b21 SHA256 12a72667417730c7ad7a1162454eb4f6bf268f646ce446ad09fb0dfcb9700c52
+MD5 f86ce464b25801f45467715be3e38271 ChangeLog 5249
+RMD160 16fafcc3a47f2529fffe40cafb51c81135a6ddbd ChangeLog 5249
+SHA256 12a72667417730c7ad7a1162454eb4f6bf268f646ce446ad09fb0dfcb9700c52 ChangeLog 5249
 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 metadata.xml 156
diff --git a/sci-libs/hdf5/hdf5-1.6.5-r1.ebuild b/sci-libs/hdf5/hdf5-1.6.5-r1.ebuild
index 4ed6e1b88885..063494ee3610 100644
--- a/sci-libs/hdf5/hdf5-1.6.5-r1.ebuild
+++ b/sci-libs/hdf5/hdf5-1.6.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.6.5-r1.ebuild,v 1.1 2006/06/24 16:13:48 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.6.5-r1.ebuild,v 1.2 2006/06/28 07:29:31 nerdboy Exp $
 
 inherit fortran eutils toolchain-funcs
 
@@ -126,7 +126,7 @@ src_compile() {
 		--enable-linux-lfs  \
 		--sysconfdir=/etc \
 		--infodir=/usr/share/info \
-		--libdir=/usr/$(get_libdir)/${PN} \
+		--libdir=/usr/$(get_libdir) \
 		--mandir=/usr/share/man || die "configure failed"
 
 	# restore the ARCH environment variable
@@ -134,7 +134,6 @@ src_compile() {
 
 	# emake has occasional segfaults
 	make || die "make failed"
-	echo "LDPATH=\"/usr/$(get_libdir)/${PN}\"" > 50hdf5
 }
 
 src_test() {
@@ -152,7 +151,7 @@ src_install() {
 		prefix=${D}usr \
 		mandir=${D}usr/share/man \
 		docdir=${D}usr/share/doc/${PF} \
-		libdir=${D}usr/$(get_libdir)/${PN} \
+		libdir=${D}usr/$(get_libdir) \
 		infodir=${D}usr/share/info \
 		install || die "make install failed"
 
@@ -161,11 +160,10 @@ src_install() {
 	if use static ; then
 	    dolib.a ${S}/tools/lib/.libs/libh5tools.a \
 		${S}/test/.libs/libh5test.a || die "dolib.a failed"
-	    insinto /usr/$(get_libdir)/${PN}
+	    insinto /usr/$(get_libdir)
 	    doins ${S}/tools/lib/libh5tools.la \
 		 ${S}/test/libh5test.la || die "doins failed"
 	fi
-	mv ${D}usr/$(get_libdir)/libh5* ${D}usr/$(get_libdir)/${PN}/
 
 	dobin ${S}/bin/iostats || die "dobin failed"
 	dodoc README.txt COPYING MANIFEST
@@ -181,8 +179,6 @@ src_install() {
 	if ! use static ; then
 	    dosed "s/SHLIB:-no/SHLIB:-yes/g" ${D}usr/bin/h5cc || die "dosed failed"
 	fi
-
-	doenvd 50hdf5
 }
 
 pkg_postinst() {