Path fix for arches which use lib64 such as amd64 and ppc64.

Package-Manager: portage-2.1_pre4-r1

4 files changed, 32 insertions, 16 deletions

diff --git a/dev-lang/ghc-bin/ChangeLog b/dev-lang/ghc-bin/ChangeLog
index b0b1bc2e5ecc..c3c1ec87efe8 100644
--- a/dev-lang/ghc-bin/ChangeLog
+++ b/dev-lang/ghc-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/ghc-bin
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc-bin/ChangeLog,v 1.37 2006/02/18 13:57:37 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc-bin/ChangeLog,v 1.38 2006/02/24 10:10:13 dcoutts Exp $
+
+  24 Feb 2006; <duncan@gentoo.org> ghc-bin-6.4.1.ebuild:
+  Path fix for arches which use lib64 such as amd64 and ppc64.
+  (Thanks to cparrott for diagnosing the problem, see also bug #88362)
 
   18 Feb 2006; Luca Barbato <lu_zero@gentoo.org> ghc-bin-6.4.1.ebuild:
   Added ppc binary
diff --git a/dev-lang/ghc-bin/Manifest b/dev-lang/ghc-bin/Manifest
index 49c10417630d..a5a5ae2d2331 100644
--- a/dev-lang/ghc-bin/Manifest
+++ b/dev-lang/ghc-bin/Manifest
@@ -1,6 +1,9 @@
-MD5 193a36bbd19e40e3ff3c2e34066d7c23 ChangeLog 5972
-RMD160 37b2871240367f40b20db99e23a1ebd0e60e1485 ChangeLog 5972
-SHA256 d330446dd45e6d53237e31523bcaa0a80d4615ac44781fb0e3f79e6eceea8dca ChangeLog 5972
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 bd067c41be2bf22f735246f5dd162800 ChangeLog 6164
+RMD160 75397f368557f3ebe16ab2a60bcc284daa4f474b ChangeLog 6164
+SHA256 4917a845e51c42988120d2749bf6437c7f65295efe9e03e8e8ff3f365f7f8779 ChangeLog 6164
 MD5 a82ba08a8abb4ae38bcc8d467c665e7b files/10ghc 40
 RMD160 1c9e367fa4ea2fa2d3a046986b066b157964390a files/10ghc 40
 SHA256 86c80e876343456b1a1407365bfc2a441bf4c6ca23d3549d67bd800abd617e2f files/10ghc 40
@@ -10,18 +13,25 @@ SHA256 27da3cb3e1e5829050642fa2570133da844326acaece3d7d4b01f6aea339adb0 files/di
 MD5 3919aa4d517b8bc37bc59b8e7dc4a334 files/digest-ghc-bin-6.4 356
 RMD160 13ea1e427826db4d10d4d9e96b88bfe2506e0884 files/digest-ghc-bin-6.4 356
 SHA256 5e83dc0703f66384d8b2a45993ef6b4ffc2bbd2bd01c8d4ffd8234a25e984bd8 files/digest-ghc-bin-6.4 356
-MD5 900e65b77fd8394e2c5b794c7cae1253 files/digest-ghc-bin-6.4.1 723
-RMD160 292df769fd9f8b3a434e758d0e47f19b255735ae files/digest-ghc-bin-6.4.1 723
-SHA256 28e003f886a8dd901bf50c72b7e8400aca4379d0bbedfb64130c861c6de63147 files/digest-ghc-bin-6.4.1 723
+MD5 1c2880abc165c3f25fdeedae7c37c9ed files/digest-ghc-bin-6.4.1 723
+RMD160 d21a26fb6df5b577503fcc640271c9cf10269343 files/digest-ghc-bin-6.4.1 723
+SHA256 a36a4258f76f51084746fc8b653a1bcac298f89efbc149416184556aa8820b44 files/digest-ghc-bin-6.4.1 723
 MD5 d4c41357e843c4af8ce3e6a4c1596627 ghc-bin-6.2.2-r1.ebuild 1032
 RMD160 461f55af3bb3f3476e728c13dd74218b92e7f3f5 ghc-bin-6.2.2-r1.ebuild 1032
 SHA256 c9ab4aff68caa9f4aba1dd53d170d462546fce28edd78435595666ad60e9332b ghc-bin-6.2.2-r1.ebuild 1032
-MD5 946e6bdcf1ff8982b4608b20457a99d0 ghc-bin-6.4.1.ebuild 1203
-RMD160 51caf7c939f3219bcd801bffe99167a0f4da6db1 ghc-bin-6.4.1.ebuild 1203
-SHA256 d5ded02ca59c62a502eeae520ccede26a176e68bb30e818c993e8f88fac35e62 ghc-bin-6.4.1.ebuild 1203
+MD5 a59312e18d72ccd6f9fc7d11266dffb4 ghc-bin-6.4.1.ebuild 1237
+RMD160 8329b9c7e93fc642301ab4884ff3606210c32407 ghc-bin-6.4.1.ebuild 1237
+SHA256 4cf5d88e6917cde08452b4648f278349b6ea534ddb60ec7e35f306618fd30abc ghc-bin-6.4.1.ebuild 1237
 MD5 9e5e3b68f1863c338a231811b31c00f1 ghc-bin-6.4.ebuild 1137
 RMD160 4b91634424e684abe68dbfbc5556cf62614329a3 ghc-bin-6.4.ebuild 1137
 SHA256 a6bcd36a94ce3232d6351e08415ebf591ff011f3604e6183d24da7f6728b4847 ghc-bin-6.4.ebuild 1137
 MD5 c694674dcbef799cd4fdb6914683ebff metadata.xml 223
 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 metadata.xml 223
 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508 metadata.xml 223
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.1 (GNU/Linux)
+
+iD8DBQFD/tuT/B0cxt+cq+wRAj5LAJ9KQUycrQArDah/9jMD+AW0M/HsggCeKPGO
+59gKOrbV24NivgxA+3hm9Wo=
+=/vpw
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/ghc-bin/files/digest-ghc-bin-6.4.1 b/dev-lang/ghc-bin/files/digest-ghc-bin-6.4.1
index 826aee77a4a3..58d9fbd31e3a 100644
--- a/dev-lang/ghc-bin/files/digest-ghc-bin-6.4.1
+++ b/dev-lang/ghc-bin/files/digest-ghc-bin-6.4.1
@@ -1,9 +1,9 @@
 MD5 1d0a0e281fd057d1332d4268da49801a ghc-bin-6.4.1-alpha.tbz2 37043978
+MD5 d7f170508b4c7b5cd40b0d5e92685c1e ghc-bin-6.4.1-amd64.tbz2 17639473
 RMD160 8853c7314b8bf55018c26b5bdda7791347bed7ef ghc-bin-6.4.1-amd64.tbz2 17639473
 SHA256 3204824f51b8a0aa9b91dea58f702f905ba0e77a6d8706bb8e3396e4931bfe17 ghc-bin-6.4.1-amd64.tbz2 17639473
-MD5 d7f170508b4c7b5cd40b0d5e92685c1e ghc-bin-6.4.1-amd64.tbz2 17639473
-MD5 1b54055eaf0c4916da963481fa8b43e7 ghc-bin-6.4.1-ppc.tbz2 25575569
 RMD160 efabde19967193323ed11894930e46554affe14f ghc-bin-6.4.1-ppc.tbz2 25575569
 SHA256 6b212f71d5e466d609c66380b76bd3efdb6bf3bfb13fd781ecea3b5757694787 ghc-bin-6.4.1-ppc.tbz2 25575569
+MD5 1b54055eaf0c4916da963481fa8b43e7 ghc-bin-6.4.1-ppc.tbz2 25575569
 MD5 cd0f80c503e5b4c956d7725c3764718e ghc-bin-6.4.1-sparc.tbz2 31121002
 MD5 a8c95e84f15acf1cf741a50a773eb626 ghc-bin-6.4.1-x86.tbz2 23234832
diff --git a/dev-lang/ghc-bin/ghc-bin-6.4.1.ebuild b/dev-lang/ghc-bin/ghc-bin-6.4.1.ebuild
index ba4435696f1b..50fa50e036ab 100644
--- a/dev-lang/ghc-bin/ghc-bin-6.4.1.ebuild
+++ b/dev-lang/ghc-bin/ghc-bin-6.4.1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc-bin/ghc-bin-6.4.1.ebuild,v 1.4 2006/02/18 13:57:37 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc-bin/ghc-bin-6.4.1.ebuild,v 1.5 2006/02/24 10:10:13 dcoutts Exp $
+
+inherit multilib
 
 IUSE="" # use the non-binary version if you want to have more choice
 
@@ -34,13 +36,13 @@ PROVIDE="virtual/ghc"
 S="${WORKDIR}"
 
 src_compile() {
-	sed -i "s|/usr|${LOC}|g" usr/bin/* usr/lib/ghc-${PV}/package.conf
+	sed -i "s|/usr|${LOC}|g" usr/bin/* "usr/$(get_libdir)/ghc-${PV}/package.conf"
 	mkdir -p ./${LOC}
 	mv usr/* ./${LOC}
 }
 
 src_install () {
-	cp -pr * ${D}
+	cp -pr * "${D}"
 	insinto /etc/env.d
-	doins ${FILESDIR}/10ghc
+	doins "${FILESDIR}/10ghc"
 }