(#132711) Symlink binaries to LINUX64 directory on 64-bit systems (Bryan Green). Also noticed that it symlinked pvm3d rather than pvmd3 -- fix that.

Package-Manager: portage-2.1.2_pre1-r1

4 files changed, 42 insertions, 50 deletions

diff --git a/sys-cluster/mpich/Manifest b/sys-cluster/mpich/Manifest
index 4bf51de6beab..6068436ac3ab 100644
--- a/sys-cluster/mpich/Manifest
+++ b/sys-cluster/mpich/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.2.6-fix-romio-sandbox-breakage.patch 690 RMD160 72f4b6bdf21493c31d2ec1c56c914e848f483760 SHA1 ab0f6a2348b299c704feb9957cc1ad267efbe54e SHA256 a9f3e790f365a8e2d02d1cf7a0e5a4bc662abf5c1780d6b5ad93d57a48a78112
 MD5 e878381a3b6165630ef1a8b3989076c8 files/1.2.6-fix-romio-sandbox-breakage.patch 690
 RMD160 72f4b6bdf21493c31d2ec1c56c914e848f483760 files/1.2.6-fix-romio-sandbox-breakage.patch 690
@@ -12,22 +9,22 @@ SHA256 6ac74ea6bd141657fde78c93be79618d9c34f84e55b068a98f348ee52e308927 files/1.
 DIST mpich-1.2.5.2.tar.gz 12383519
 DIST mpich-1.2.6.tar.gz 15248688
 DIST mpich-1.2.7p1.tar.gz 15978525 RMD160 1f42f10c0942f3a20fc2a3853ce825ba0885bb87 SHA1 7668b71c604f00aadc2db7d10f8fc031b3def9e1 SHA256 6deb6b3b0815d4874a39878f136cbcddbdb57fd57ff7ef3df6e3414a397f6171
-EBUILD mpich-1.2.5.2.ebuild 3154 RMD160 d77d0f8e6118df0fe60e3f8b7b249c58301a8503 SHA1 50e50e0aa56c0f30e992783d7a9a8bab07e09216 SHA256 a133746be175ef2b4c7074e60edb971fed927a17576baa4c29372cb73551dd87
-MD5 358fe1438ac916cfeacede63504e7aaa mpich-1.2.5.2.ebuild 3154
-RMD160 d77d0f8e6118df0fe60e3f8b7b249c58301a8503 mpich-1.2.5.2.ebuild 3154
-SHA256 a133746be175ef2b4c7074e60edb971fed927a17576baa4c29372cb73551dd87 mpich-1.2.5.2.ebuild 3154
-EBUILD mpich-1.2.6-r4.ebuild 4044 RMD160 634bcd38c8b61f379aec65a215139ed9e816f4dc SHA1 63db2cf53c374d3a4d26fcb50a7aa8435f11d4e3 SHA256 da0a9c570118a9d75a5c21aff82ca05aa10a286f1bbbb8c5cc0a2ad4e3b6f04b
-MD5 c0c0e111fc17be01bb245f331520cf51 mpich-1.2.6-r4.ebuild 4044
-RMD160 634bcd38c8b61f379aec65a215139ed9e816f4dc mpich-1.2.6-r4.ebuild 4044
-SHA256 da0a9c570118a9d75a5c21aff82ca05aa10a286f1bbbb8c5cc0a2ad4e3b6f04b mpich-1.2.6-r4.ebuild 4044
-EBUILD mpich-1.2.7_p1.ebuild 4095 RMD160 23bc88997a1716f61b65e689c47864982f3bd284 SHA1 aa0ff39aaebfb747a4679b6785dc61edf0312f46 SHA256 d662cf0eefb099de47482827f183d821a8bacb378390930e1119008d9ef1f83a
-MD5 123877e8d0c618fb8b4d560899858bb4 mpich-1.2.7_p1.ebuild 4095
-RMD160 23bc88997a1716f61b65e689c47864982f3bd284 mpich-1.2.7_p1.ebuild 4095
-SHA256 d662cf0eefb099de47482827f183d821a8bacb378390930e1119008d9ef1f83a mpich-1.2.7_p1.ebuild 4095
-MISC ChangeLog 4130 RMD160 942affa3dea87201ac72798562217fa1c3836ac7 SHA1 8e64ea3974dc82bf652fd94cb971869e7c7979bc SHA256 0f5c9377dbb72b5033fdf9603d7b0806769b5a91d3735eaf5392e75615a3c619
-MD5 f85eb7bdbe2c218ee17fa437149923e0 ChangeLog 4130
-RMD160 942affa3dea87201ac72798562217fa1c3836ac7 ChangeLog 4130
-SHA256 0f5c9377dbb72b5033fdf9603d7b0806769b5a91d3735eaf5392e75615a3c619 ChangeLog 4130
+EBUILD mpich-1.2.5.2.ebuild 3157 RMD160 10f832590c5f61180703594594cddef2ef49ae2d SHA1 ac6272d3a87f82f81599ee037e6661e298c13009 SHA256 41e6e573bb9fa8479b49b903356238a34ae2721887343cb28ef94f0b98cdf42b
+MD5 90131acb83e5b6194dd12b6ee456c2e5 mpich-1.2.5.2.ebuild 3157
+RMD160 10f832590c5f61180703594594cddef2ef49ae2d mpich-1.2.5.2.ebuild 3157
+SHA256 41e6e573bb9fa8479b49b903356238a34ae2721887343cb28ef94f0b98cdf42b mpich-1.2.5.2.ebuild 3157
+EBUILD mpich-1.2.6-r4.ebuild 4047 RMD160 34352149a4d218ecd48df8adb63ed00d32fb6654 SHA1 a675df0ed9af37f5011159703ea2d68fed82a93c SHA256 768d73e2fc849238c5c843febb493237e791c1fdc251f6042a6ffa4b18ab0cda
+MD5 b5ee11c1c54dc5f309210def20249348 mpich-1.2.6-r4.ebuild 4047
+RMD160 34352149a4d218ecd48df8adb63ed00d32fb6654 mpich-1.2.6-r4.ebuild 4047
+SHA256 768d73e2fc849238c5c843febb493237e791c1fdc251f6042a6ffa4b18ab0cda mpich-1.2.6-r4.ebuild 4047
+EBUILD mpich-1.2.7_p1.ebuild 4098 RMD160 1c1ba5e5f0337f5a1e08e8ca73878706543c88ab SHA1 6d3cf18a4240987cf8a63d4ec8a27fa4db5a4631 SHA256 1fb06f8d80765947be2fac845d4b1a26804f500b8758a6df3d83bf607af03e4a
+MD5 de0f6c693945a28a3d591516a9cc2e5e mpich-1.2.7_p1.ebuild 4098
+RMD160 1c1ba5e5f0337f5a1e08e8ca73878706543c88ab mpich-1.2.7_p1.ebuild 4098
+SHA256 1fb06f8d80765947be2fac845d4b1a26804f500b8758a6df3d83bf607af03e4a mpich-1.2.7_p1.ebuild 4098
+MISC ChangeLog 4335 RMD160 91b730f35a1aa92754ffab19d35ce401eb652a33 SHA1 c5574654ad5d0abccd63d0e6713facba6ecc4d2f SHA256 5be87714e0b859c3c087b24eacff63a667b2223be66f57f006f21ed39474dee1
+MD5 772f19c69a8eeee46c04ee1386a44b85 ChangeLog 4335
+RMD160 91b730f35a1aa92754ffab19d35ce401eb652a33 ChangeLog 4335
+SHA256 5be87714e0b859c3c087b24eacff63a667b2223be66f57f006f21ed39474dee1 ChangeLog 4335
 MISC metadata.xml 312 RMD160 6cfe7222819f902eed7dfdb6fa48a19b7c37172e SHA1 d9e2361eabc2098c0fa0b2fe45ba7cf317ad00a2 SHA256 7cd6722fa6245eccb8afde378bb57d0ac955b778512b3bef8789f2c463884e52
 MD5 41664043c4624dedcfeeb07950f08d13 metadata.xml 312
 RMD160 6cfe7222819f902eed7dfdb6fa48a19b7c37172e metadata.xml 312
@@ -41,10 +38,3 @@ SHA256 376d47428bc061bb609189d1a6cc70415b7f1ab7cd3030c8be54b93ec932c076 files/di
 MD5 c1a3f274191f11f137d9094737034c8e files/digest-mpich-1.2.7_p1 247
 RMD160 0ddbea56a013988ebfeb46fa09c8b42fd865a320 files/digest-mpich-1.2.7_p1 247
 SHA256 4618da3a5753df970e71955795330bd787e71f198c86e404c80e70a5ab7190b2 files/digest-mpich-1.2.7_p1 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEuq8YKtJO8LeSoosRAgBMAJ0TQehRQyHgzAppqZuoGM7ImpGU2gCfdV43
-Fq6kVjqV1A6cD0MC0sUQA1I=
-=PDHT
------END PGP SIGNATURE-----
diff --git a/sys-cluster/pvm/ChangeLog b/sys-cluster/pvm/ChangeLog
index 825c336f3fb5..ec8de00aa19c 100644
--- a/sys-cluster/pvm/ChangeLog
+++ b/sys-cluster/pvm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/pvm
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pvm/ChangeLog,v 1.31 2006/07/16 21:32:31 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pvm/ChangeLog,v 1.32 2006/09/25 03:32:06 dberkholz Exp $
+
+  25 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>; pvm-3.4.5-r2.ebuild:
+  (#132711) Symlink binaries to LINUX64 directory on 64-bit systems (Bryan
+  Green). Also noticed that it symlinked pvm3d rather than pvmd3 -- fix that.
 
   16 Jul 2006; Michael Imhof <tantive@gentoo.org> pvm-3.4.4-r1.ebuild,
   pvm-3.4.4-r2.ebuild, pvm-3.4.4-r3.ebuild, -pvm-3.4.5.ebuild,
diff --git a/sys-cluster/pvm/Manifest b/sys-cluster/pvm/Manifest
index 25f63386c8d5..36d151eabd0a 100644
--- a/sys-cluster/pvm/Manifest
+++ b/sys-cluster/pvm/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX pvm-3.4.4-gentoo.diff 608 RMD160 f1feb78bbe0ed61edd6be711f707ee170fd5b975 SHA1 c91e16676e8e408d932a4f387bcb416f573d03a3 SHA256 5f5d997f58be78e1d12bb0b9db4376bc8cf3113078c00a0eaa890a60e63bb382
 MD5 726a6a69ba5fb9e140e8f7e1a85c9c9d files/pvm-3.4.4-gentoo.diff 608
 RMD160 f1feb78bbe0ed61edd6be711f707ee170fd5b975 files/pvm-3.4.4-gentoo.diff 608
@@ -51,14 +48,14 @@ EBUILD pvm-3.4.4-r3.ebuild 1977 RMD160 f29f51036bbb3935b2e49199517f5f97c288bcb9
 MD5 6d0e73270cf22c002d2706f4abb59fe0 pvm-3.4.4-r3.ebuild 1977
 RMD160 f29f51036bbb3935b2e49199517f5f97c288bcb9 pvm-3.4.4-r3.ebuild 1977
 SHA256 37840ab2d980a50ed277865209c6d641c56621f1e906b52f0a479d344b1e5a8a pvm-3.4.4-r3.ebuild 1977
-EBUILD pvm-3.4.5-r2.ebuild 2347 RMD160 070e287a857dfe7d8006862b6d42d8a433b2f839 SHA1 6f1a172558c721a953e19739c78ac2ebe0c10ea8 SHA256 7cc48b703cdf46d5cbbd81ec9a133a5526184cf07aaef47e4479361a61cf468f
-MD5 469e0b72469bc92232e488e8b73616ae pvm-3.4.5-r2.ebuild 2347
-RMD160 070e287a857dfe7d8006862b6d42d8a433b2f839 pvm-3.4.5-r2.ebuild 2347
-SHA256 7cc48b703cdf46d5cbbd81ec9a133a5526184cf07aaef47e4479361a61cf468f pvm-3.4.5-r2.ebuild 2347
-MISC ChangeLog 4328 RMD160 982ff4232a1dc77f4fd913479d0dec6e1dd9302e SHA1 8d986aa11809ab1a0d6296f2f669812795e660e0 SHA256 2e3c265c18bc19c65fc7141e3069306facb03a70192e090f95ae4ba9eb09978f
-MD5 f7177e4cbcb99db41f66dfee6e849dc3 ChangeLog 4328
-RMD160 982ff4232a1dc77f4fd913479d0dec6e1dd9302e ChangeLog 4328
-SHA256 2e3c265c18bc19c65fc7141e3069306facb03a70192e090f95ae4ba9eb09978f ChangeLog 4328
+EBUILD pvm-3.4.5-r2.ebuild 2540 RMD160 3766b867973dbbf5715523415636fda682baebcf SHA1 3f239ec3b57601d298ddd7abb782f51c699f4f2a SHA256 00626a34da90e6b4363a731609b9aff78f1400ff1ae76cfaee57dcffa7e59276
+MD5 8b6af96318ff116c8e08a3f2c14c3225 pvm-3.4.5-r2.ebuild 2540
+RMD160 3766b867973dbbf5715523415636fda682baebcf pvm-3.4.5-r2.ebuild 2540
+SHA256 00626a34da90e6b4363a731609b9aff78f1400ff1ae76cfaee57dcffa7e59276 pvm-3.4.5-r2.ebuild 2540
+MISC ChangeLog 4560 RMD160 169e924b17138a5114190fcf5645586068037d4b SHA1 990cfbd142c497d19f801cbfd470e249d0e87a90 SHA256 3afaba567f02c3b78e42d8ee92796fa55b22412a35d7fb4b0f3956c152d3c8ad
+MD5 dd7da5c425f8973107d5044fd81f0b2e ChangeLog 4560
+RMD160 169e924b17138a5114190fcf5645586068037d4b ChangeLog 4560
+SHA256 3afaba567f02c3b78e42d8ee92796fa55b22412a35d7fb4b0f3956c152d3c8ad ChangeLog 4560
 MISC metadata.xml 312 RMD160 6cfe7222819f902eed7dfdb6fa48a19b7c37172e SHA1 d9e2361eabc2098c0fa0b2fe45ba7cf317ad00a2 SHA256 7cd6722fa6245eccb8afde378bb57d0ac955b778512b3bef8789f2c463884e52
 MD5 41664043c4624dedcfeeb07950f08d13 metadata.xml 312
 RMD160 6cfe7222819f902eed7dfdb6fa48a19b7c37172e metadata.xml 312
@@ -75,10 +72,3 @@ SHA256 bdfcc639ce238ca6d1bee4bdf1ec2f481f0632249a5f2fd9a66a0621f72122a5 files/di
 MD5 baaf0d4bc784fce2385c585969bcad4d files/digest-pvm-3.4.5-r2 217
 RMD160 f161c2479dba64cf897f126085f1d2437c7af0e8 files/digest-pvm-3.4.5-r2 217
 SHA256 e1f2f412bbcf7978766d61b8c2717fc2169562b14c35f343710e9c34e8f412ad files/digest-pvm-3.4.5-r2 217
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEurB/KtJO8LeSoosRAl0xAKCSB/siYrR6dKYTFMhn5YfOa1O99gCgqQ2e
-maHA/Y02TJU33se3I8d3t/Y=
-=QdT6
------END PGP SIGNATURE-----
diff --git a/sys-cluster/pvm/pvm-3.4.5-r2.ebuild b/sys-cluster/pvm/pvm-3.4.5-r2.ebuild
index bdb96e12b23d..94794364a4e3 100644
--- a/sys-cluster/pvm/pvm-3.4.5-r2.ebuild
+++ b/sys-cluster/pvm/pvm-3.4.5-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pvm/pvm-3.4.5-r2.ebuild,v 1.7 2006/07/16 21:32:31 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pvm/pvm-3.4.5-r2.ebuild,v 1.8 2006/09/25 03:32:06 dberkholz Exp $
 
-inherit eutils
+inherit eutils multilib
 
 MY_P="${P/-}"
 DESCRIPTION="PVM: Parallel Virtual Machine"
@@ -66,9 +66,17 @@ src_install() {
 	dodir /usr/share/pvm3
 	cp -r * ${D}/usr/share/pvm3
 	dodir /usr/bin
-	ln -s /usr/share/pvm3/lib/LINUX/pvm ${D}/usr/bin/pvm
-	ln -s /usr/share/pvm3/lib/LINUX/pvm3d ${D}/usr/bin/pvm3d
-	ln -s /usr/share/pvm3/lib/LINUX/pvmgs ${D}/usr/bin/pvmgs
+
+	# (#132711) Symlink to the right spot on multilib systems
+	local linuxdir
+	if [[ $(get_libdir) = lib64 ]]; then
+		linuxdir="LINUX64"
+	else
+		linuxdir="LINUX"
+	fi
+	ln -s /usr/share/pvm3/lib/${linuxdir}/pvm ${D}/usr/bin/pvm
+	ln -s /usr/share/pvm3/lib/${linuxdir}/pvmd3 ${D}/usr/bin/pvmd3
+	ln -s /usr/share/pvm3/lib/${linuxdir}/pvmgs ${D}/usr/bin/pvmgs
 
 
 	#environment variables: