reverted to original (and standard) library location

Package-Manager: portage-2.1.1_pre1-r2

3 files changed, 15 insertions, 14 deletions

diff --git a/sys-cluster/mpich2/ChangeLog b/sys-cluster/mpich2/ChangeLog
index 4bab456a6279..a4193d90a3d4 100644
--- a/sys-cluster/mpich2/ChangeLog
+++ b/sys-cluster/mpich2/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-cluster/mpich2
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/ChangeLog,v 1.7 2006/06/26 06:15:00 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/ChangeLog,v 1.8 2006/06/28 07:32:39 nerdboy Exp $
+
+  28 Jun 2006; Steve Arnold <nerdboy@gentoo.org> mpich2-1.0.3-r1.ebuild:
+  reverted to original (and standard) library location
 
 *mpich2-1.0.3-r1 (26 Jun 2006)
 
diff --git a/sys-cluster/mpich2/Manifest b/sys-cluster/mpich2/Manifest
index f6030c655b14..368f5304258b 100644
--- a/sys-cluster/mpich2/Manifest
+++ b/sys-cluster/mpich2/Manifest
@@ -24,18 +24,18 @@ EBUILD mpich2-1.0.2_p1.ebuild 2263 RMD160 dee1bd34be34353cc20cae4947eb6f39557008
 MD5 b83990c4eb0fb190b6048ae8e273b683 mpich2-1.0.2_p1.ebuild 2263
 RMD160 dee1bd34be34353cc20cae4947eb6f395570088b mpich2-1.0.2_p1.ebuild 2263
 SHA256 a8926154b49112f779c5e04f44068242e02de6b27962b2ff7271d3311dc47b47 mpich2-1.0.2_p1.ebuild 2263
-EBUILD mpich2-1.0.3-r1.ebuild 5769 RMD160 61effb8d6c3f6aa23da774f86870f14423dda380 SHA1 7acf854674ebf927bac9a4e3166ea35fefe2ac7c SHA256 210e61114ced9e89b5f0035615d15f2b61edbee04758fbc23d99b1ab218a5205
-MD5 54dafb2b3f8ae3e5700c3ffa411afd67 mpich2-1.0.3-r1.ebuild 5769
-RMD160 61effb8d6c3f6aa23da774f86870f14423dda380 mpich2-1.0.3-r1.ebuild 5769
-SHA256 210e61114ced9e89b5f0035615d15f2b61edbee04758fbc23d99b1ab218a5205 mpich2-1.0.3-r1.ebuild 5769
+EBUILD mpich2-1.0.3-r1.ebuild 5685 RMD160 1736c094e81bda4b0de58e923ce628052fd38cfb SHA1 e378762c4d650fa4f2b25d52104a56ea8ea0a2c8 SHA256 5a37d85759f6f95f3af043fb54780371612685250851c757623d3621ad931005
+MD5 55da5810b3436cf68561127a4e377654 mpich2-1.0.3-r1.ebuild 5685
+RMD160 1736c094e81bda4b0de58e923ce628052fd38cfb mpich2-1.0.3-r1.ebuild 5685
+SHA256 5a37d85759f6f95f3af043fb54780371612685250851c757623d3621ad931005 mpich2-1.0.3-r1.ebuild 5685
 EBUILD mpich2-1.0.3.ebuild 2279 RMD160 1d892c7220acd4070eec18e3df02ecad73e73a66 SHA1 26eccb977c91f4305a9518ba9e03d403c7af6f8e SHA256 c4cf2761822360502c2d61613ac83f984dd98e0c129785d339ed3ca76941a4c9
 MD5 ae9b4916057da52de4e2b4242d795ec3 mpich2-1.0.3.ebuild 2279
 RMD160 1d892c7220acd4070eec18e3df02ecad73e73a66 mpich2-1.0.3.ebuild 2279
 SHA256 c4cf2761822360502c2d61613ac83f984dd98e0c129785d339ed3ca76941a4c9 mpich2-1.0.3.ebuild 2279
-MISC ChangeLog 1654 RMD160 2e0d8be22a7a6b812f8d6c98add714b672fdaa86 SHA1 8bcff6abf7a6eaab83a43f446d9883d31678d1d1 SHA256 935f103633a30a08ff5524492b13dba3b0e5e7d5b2c5f3d7df1518ec6b4d1c0d
-MD5 f200f4d27e65abe01835f534886c4d2a ChangeLog 1654
-RMD160 2e0d8be22a7a6b812f8d6c98add714b672fdaa86 ChangeLog 1654
-SHA256 935f103633a30a08ff5524492b13dba3b0e5e7d5b2c5f3d7df1518ec6b4d1c0d ChangeLog 1654
+MISC ChangeLog 1783 RMD160 3cbbb1f681253767f10c7b103915c5fa793c0d85 SHA1 444e93be220653ec6f921c8b1850beb83a03c301 SHA256 26101463cfb8097da7bfb9f27798adfea845d2b4a3a07e40633034bc9e7fbff3
+MD5 41915aa1996c72c63a1dd81c38c9993a ChangeLog 1783
+RMD160 3cbbb1f681253767f10c7b103915c5fa793c0d85 ChangeLog 1783
+SHA256 26101463cfb8097da7bfb9f27798adfea845d2b4a3a07e40633034bc9e7fbff3 ChangeLog 1783
 MISC metadata.xml 249 RMD160 ba772efa333aad616b4054716659b5e34044f687 SHA1 79e5907109f7f689902f20eb05d91ef83459e4d9 SHA256 a433de87cf1259d53fc0ab354e109539269c46d9260c7d4eef7ce33a735e6c6f
 MD5 8030c8b7656ad8112a5f870431e95932 metadata.xml 249
 RMD160 ba772efa333aad616b4054716659b5e34044f687 metadata.xml 249
diff --git a/sys-cluster/mpich2/mpich2-1.0.3-r1.ebuild b/sys-cluster/mpich2/mpich2-1.0.3-r1.ebuild
index 1f2c56ede32f..8e470db74074 100644
--- a/sys-cluster/mpich2/mpich2-1.0.3-r1.ebuild
+++ b/sys-cluster/mpich2/mpich2-1.0.3-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/sys-cluster/mpich2/mpich2-1.0.3-r1.ebuild,v 1.1 2006/06/26 06:15:00 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/mpich2-1.0.3-r1.ebuild,v 1.2 2006/06/28 07:32:39 nerdboy Exp $
 
 inherit fortran distutils eutils autotools kde-functions toolchain-funcs
 
@@ -63,7 +63,6 @@ src_unpack() {
 	eend
 	epatch ${FILESDIR}/${P}-make.patch || die "make patch failed"
 	#epatch ${FILESDIR}/${P}-make-test.patch || die "make test patch failed"
-	echo "LDPATH=\"/usr/$(get_libdir)/${PN}\"" > 42mpich2
 }
 
 src_compile() {
@@ -98,7 +97,7 @@ src_compile() {
 		$(use_enable mpe) \
 		$(use_enable threads) \
 		--includedir=/usr/include \
-		--libdir=/usr/$(get_libdir)/${PN} \
+		--libdir=/usr/$(get_libdir) \
 		--mandir=/usr/share/man \
 		--with-docdir=/usr/share/doc/${PF} \
 		--with-htmldir=/usr/share/doc/${PF}/html \
@@ -163,7 +162,7 @@ src_install() {
 	dodir /etc/${PN}
 	rm -rf src/mpe2/etc/*.in
 	make install DESTDIR=${D} \
-	    LIBDIR=${D}usr/$(get_libdir)/${PN} || die "make install failed"
+	    LIBDIR=${D}usr/$(get_libdir) || die "make install failed"
 
 	dodir /usr/share/${PN}
 	mv ${D}usr/examples/cpi ${D}usr/share/${PN}/cpi
@@ -180,7 +179,6 @@ src_install() {
 		rm -rf ${D}usr/share/man/
 		dodoc README CHANGES COPYRIGHT RELEASE_NOTES
 	fi
-	doenvd 42mpich2
 }
 
 pkg_postinst() {