Fix paths in hsc2hs and ghcprof wrapper scripts.

Package-Manager: portage-2.1_pre5-r4

diff --git a/dev-lang/ghc-bin/ChangeLog b/dev-lang/ghc-bin/ChangeLog
index 6b54b32328ba7adc8f712aad9b3176953134ebe0..0242085dbc1754f6f731bed3bd17865ae1012c59 100644 (file)
--- a/dev-lang/ghc-bin/ChangeLog
+++ b/dev-lang/ghc-bin/ChangeLog
@@ -1,6 +1,9 @@
 # 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.40 2006/03/11 17:38:47 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc-bin/ChangeLog,v 1.41 2006/03/11 21:59:11 dcoutts Exp $
+
+  11 Mar 2006; Duncan Coutts <dcoutts@gentoo.org> ghc-bin-6.4.1.ebuild:
+  Fix paths in hsc2hs and ghcprof wrapper scripts.
 
   11 Mar 2006; Duncan Coutts <dcoutts@gentoo.org> ghc-bin-6.4.1.ebuild:
   Relocate paths only in the scripts that need relocating. Use /bin/bash

diff --git a/dev-lang/ghc-bin/Manifest b/dev-lang/ghc-bin/Manifest
index 1d0c1b3066df8df912c8c864314bdb5aad440c87..f457f54b5a7998502fb57f5c06232b1f3c0e53f0 100644 (file)
--- a/dev-lang/ghc-bin/Manifest
+++ b/dev-lang/ghc-bin/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 8584d227f3c66d9ca2291349986a7731 ChangeLog 6543
-RMD160 7d209eadecd8f398f8e4f60b07dfa145544c2a82 ChangeLog 6543
-SHA256 ad9a7f90b6e4e72d85bcf7eaad00bbd1cd3c4e25faec6a4f8fd206c459f78c1d ChangeLog 6543
+MD5 eabe728a25b66b3ce727d1e920dc4b43 ChangeLog 6667
+RMD160 9d85ad0857a904152b954d492b219aa3421231a6 ChangeLog 6667
+SHA256 767b0ae2a9b89651b8a85f9fa7317565caa78c0f069376a9efdfd4335e5a4c61 ChangeLog 6667
 MD5 a82ba08a8abb4ae38bcc8d467c665e7b files/10ghc 40
 RMD160 1c9e367fa4ea2fa2d3a046986b066b157964390a files/10ghc 40
 SHA256 86c80e876343456b1a1407365bfc2a441bf4c6ca23d3549d67bd800abd617e2f files/10ghc 40
@@ -19,9 +19,9 @@ SHA256 ea67fa2e4d05db11a2d343098a3595d5d5a4293146584a9f4de9c2a60ed92fe2 files/di
 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 545061675c0a32bd49470dbc5a7678c5 ghc-bin-6.4.1.ebuild 2663
-RMD160 5d27cc0d2b90ccd6ae16191f5dbdef3dba30a7fd ghc-bin-6.4.1.ebuild 2663
-SHA256 2fda54b1401a44dbb41aa6b9b3a7ed3e7601204192e0a2c3f757fc22ef7fd4cc ghc-bin-6.4.1.ebuild 2663
+MD5 89ddd7c5f7416901e4899c26cf783e34 ghc-bin-6.4.1.ebuild 2755
+RMD160 82c93eddde0d5b7c15759682bb86a56b429d7142 ghc-bin-6.4.1.ebuild 2755
+SHA256 0ed2658f02b9a9b670d3fd45bab39e235e463a7929fe652a008814411b963dba ghc-bin-6.4.1.ebuild 2755
 MD5 9e5e3b68f1863c338a231811b31c00f1 ghc-bin-6.4.ebuild 1137
 RMD160 4b91634424e684abe68dbfbc5556cf62614329a3 ghc-bin-6.4.ebuild 1137
 SHA256 a6bcd36a94ce3232d6351e08415ebf591ff011f3604e6183d24da7f6728b4847 ghc-bin-6.4.ebuild 1137
@@ -31,7 +31,7 @@ SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508 metadata
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.1 (GNU/Linux)
 
-iD8DBQFEEwsc/B0cxt+cq+wRAihJAKCaWKfv/6ExgTK5lW0ykFRlmTdOWACggqAR
-B1GqcBs4VySD+1rAjUrR6hU=
-=7IUd
+iD8DBQFEE0gf/B0cxt+cq+wRAhX9AJ9M4rFzbjBHv6PsncMXE1NiPGRLgQCfQNEJ
+e1MIuQ/wPZ67m/AjlAjGaVY=
+=90kS
 -----END PGP SIGNATURE-----

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 0f4826166ea972a5cb359a026d7f33ea025c8e09..9622cf07f6216bdd9654e4aafc261d117f3dcdff 100644 (file)
--- 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,6 @@
 # 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.7 2006/03/11 17:38:47 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc-bin/ghc-bin-6.4.1.ebuild,v 1.8 2006/03/11 21:59:12 dcoutts Exp $
 
 inherit base multilib
 
@@ -40,7 +40,10 @@ src_unpack() {
        # relocate from /usr to /opt/ghc
        sed -i -e "s|/usr|${LOC}|g" \
                usr/bin/ghc-${PV} usr/bin/ghci-${PV} usr/bin/ghc-pkg-${PV} \
-               usr/$(get_libdir)/ghc-${PV}/package.conf
+               usr/bin/hsc2hs usr/$(get_libdir)/ghc-${PV}/package.conf
+
+       sed -i -e "s|/usr/$(get_libdir)|${LOC}/$(get_libdir)|" \
+               usr/bin/ghcprof
 
        # fix hardened gcc flags in the ghc driver script
        if grep -q GHC_CFLAGS usr/bin/ghc; then