Fix building on systems where libdir differs from the one we have built GHC (it case of bug #476998 it was an amd64-linux). Thanks to tamiko and Christoph Junghans.

Package-Manager: portage-2.2.0_alpha182_p1/cvs/Linux x86_64
Manifest-Sign-Key: 0x611FF3AA

3 files changed, 46 insertions, 14 deletions

diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog
index 32a2a4a8199b..1885244b56c0 100644
--- a/dev-lang/ghc/ChangeLog
+++ b/dev-lang/ghc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/ghc
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.243 2013/06/01 14:16:25 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.244 2013/07/19 10:21:35 slyfox Exp $
+
+  19 Jul 2013; Sergei Trofimovich <slyfox@gentoo.org> ghc-7.6.3.ebuild:
+  Fix building on systems where libdir differs from the one we have built GHC
+  (it case of bug #476998 it was an amd64-linux). Thanks to tamiko and Christoph
+  Junghans.
 
 *ghc-7.6.3 (01 Jun 2013)
 
diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index 591f41157cbc..42a87f5a38a5 100644
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -85,7 +85,9 @@ DIST ghc-bin-7.4.2-x86-stable-glibc.tbz2 92394017 SHA256 2c42257a60aec03ae622c1a
 DIST ghc-bin-7.6.2-amd64.tbz2 94464851 SHA256 82ba625dc5ff58db6e085155b2c1d708c490ac6ac84dba85763b74ec1cabda13 SHA512 b6ef3ed764a3a325dc2cbcfb5fa2f416d240ca70f33791bc6535b2d3416cfa281ad6c343b72c8ffd59be92cfcc3c5dcddb1a7c6d57128ab16b89d341880b022f WHIRLPOOL a5412e0df5105e1c1de0af71a5bb0671d27c869bd74a271b07bf4a8985c30f8e6aff69aa89e7801b2c49623f4cb0b9ec34ad3eb96af5d9bc2de106652b7bf4a0
 DIST ghc-bin-7.6.2-ia64.tbz2 158914515 SHA256 fac170050bfeb7c20ac62525bf169ad252d0598f2790db2027b04c4c70df58f1 SHA512 a79fa35aadf65ca60d1b0ae98bdd9151c3cce13eac1fa6c525cd29c5ea2359da8ff78549a138db876bceaa4ffcdbb621d87cde053be0fa282f8891251eb78e21 WHIRLPOOL 7753255c9f4a7b5fb7434157df7821bce3c3c2a36e8a781e5e6939aeb0c5721ce62d4710ebd4c377393dea3c51ed8300a3f8c8adb4d0c16ca8c7a8ce86f8e853
 DIST ghc-bin-7.6.2-x86.tbz2 93746314 SHA256 d5d50ae425cfa2cb7e476e0829fae61623fc6d728413ffa27cb7ecfc925633f1 SHA512 cd56331b8855539671e1b9463960413c84665da3aa7d6e7fcd1cf4425f003582f524d3385c97e7fe9707989712bf487cd7cc75a1096918abd057cc6021badde5 WHIRLPOOL d5dffb0e970c16f168d5d6b5057b42afa8704a156a5521eca01aa522248cd9cdb8fa29e0ae5c368e11fbd87c39b89569c4ccbde7d8ba1660801cf593f328266c
+DIST ghc-bin-7.6.3-alpha.tbz2 132175518 SHA256 c0a16219d1e270cb73e68d6d0b0fae08264fa308acceb876d2c4e7dea302e13d SHA512 944f8dfea78e54068bfeb8773e9b15d7e5e307c5cdef5d928e011ceaef3a9449950afc2b033508c496497e4f97d6acafc005ba097ed9fd18b978eae601cce6a7 WHIRLPOOL 16dfdc97b310038daced86f7ea93632e9f6e1879cfabd7e8a4f662358fe17074c060df1c864dca944a79d60c98f134cc31b335bfce3d89b8537001783803e7a9
 DIST ghc-bin-7.6.3-amd64.tbz2 94441516 SHA256 3ef747e96a40c9d5021e88b8afee0a97838c27b00619d9187783d95279c31779 SHA512 89f6c693d83d6309a0e44fcc68e30279c858adb0a0ea9317dd168b2e632c22a8507da78ed953523f5d7156db98e06c6df56d6edc19c0c50b3941ea578263dc64 WHIRLPOOL 891dfbfc9d88fa579b6a837651f7cc6d9aecef8b8752ec7bcebbdfef2a6d8929d0edaceff27ec61d6160d36d1b0e8406b7829a04a858ed64210b5c57b9c98940
+DIST ghc-bin-7.6.3-ia64.tbz2 158762376 SHA256 07234585032a319d769bdf2c748904e2a1ce170413f6f24e2a62b4ef9be6a05c SHA512 86b439432f446034a54af6e177a5dcbf32a523b004d41c22243be2acb412f5df2645f0adff6aa80ca3efffb905ffd4e70e6753c4735bc74ca8545ea00791699a WHIRLPOOL bddcf1ab380bdfcf4cccd2afe6248503199abfba127a2c97ca148d71a6a558607f7e3324d1ac3f2b7aeb812468bc76cef870e201642fb8298f2da15d3ebe200e
 DIST ghc-bin-7.6.3-x86.tbz2 93718672 SHA256 a55024f66a048437fcd6ef0f33cdb994a43628998a2f0fe4d094cc9ba83d1615 SHA512 624f2a3238dee15853018d45632d1363e42d34099a77e5e9ce5c8da976cb4c33578144f7c39dbf25ee68c17d8d42910db2347186849eeeda6bc20053ce2be990 WHIRLPOOL bc646fc19906b59416358fb7558b6e2c3f7ad069c2fcf443be36b621894cfcecb0844acf5b5f9c383e034dfff3e24d312a7da0d7a629836134ec5dc1ecd6f139
 EBUILD ghc-6.12.3-r2.ebuild 20570 SHA256 d1bac3b88691bc27eefde9a04580a97e76e41d11b30c32b7f0dc92de4a367613 SHA512 0946a8205db0f1f139bff75ea52b77b3e1c9ce2dc42b5a49c042a653853c401543f1d829397ed7c59a957e9919feec7b171c92aaa166ee109fa8540c53a42aea WHIRLPOOL 96f57ace2e729748827d411c4fb1a7b6638bb04e1797a4c14d548ba731b7dea7ab959daaf5f03a6a5dc9ce304fd597266b6ea5522a518c2e661fa96a9c4e6ef3
 EBUILD ghc-7.0.4.ebuild 20030 SHA256 d9f8198f0c214bcd6b5c75380b401d73d8b153b772c36aa18cbc0b6a4898a507 SHA512 d4a9717c45bd6f7b009ee82508c677e06c8a99c3be16cca136518e6ec77aa9a95f4a13f833aab629995b7185ac5a20066849d1284a639ab3d79934e406f48e7e WHIRLPOOL b2d7e20da2e94463b69e8183a28e4f96d928757ed07cfe2cfd432d46353744c70e27f789307f58d8e62610950d8f89041aea782c6e2c63a70be144267be46bd2
@@ -93,13 +95,13 @@ EBUILD ghc-7.4.1-r1.ebuild 21255 SHA256 bd888b9945bed390b0c672dca385360df9326d84
 EBUILD ghc-7.4.1.ebuild 20450 SHA256 8a0a3b104ddbb23c2de1128b60f194108739330d35bafc4c8349f62113a759c9 SHA512 cc9d7089457d89f405e35fd11dc991d8d3f8494b8bbb871bbbddab32c0bee2f12eb5f679b494053947228fd11d07c41a0d876f33eab4d7138feb4626b0293b1a WHIRLPOOL bff6571901c923e161667aaf9c63f027e33967372e4d86711774c33dfcb26adf0f75a9995a9dd20ce0996bf984ed43c4825a395a65cba7a615aadce86bbaa5da
 EBUILD ghc-7.4.2.ebuild 22001 SHA256 15b549a62e8d7ca1d47602cb3f528b5aa30cfc5a809827d7b4c5b79cdcd9d5bf SHA512 d0a5340fea4ba407f44114f985619c966f2d2a1887f8030ef1dd62cfd8920e486bbc6003d7f466280b314f34005ec75154b590e6071d1fd5165f68326bb5fdce WHIRLPOOL 3baccfff4a0fcf09e39e37d2c7f233c739007ba1c6dba746418df2fc3b75e9b2a1530d3dc12e831bfd2cccb76eb76f7932bdeef252046daf7e16007071cebc6c
 EBUILD ghc-7.6.2.ebuild 25247 SHA256 5a4b1fed20453edf0e09af3c9c5eac979e76b99b64e60d94e5704cbc4949440c SHA512 d22b5e8e67f4fb4003d2b008c21bab276bf872d7f806745132c957bf0227412d783953a16dbd5697fc28f0f83f3a7c9e55a59cd2825de21ce07e937bf4580577 WHIRLPOOL 994841dbdfdb212ad5a8594c62c7c5679ff58bfb421bde5567f0f025ee4fc0fdc5846262d40bb4506f5665d26278dca8e5a7ba3c6325809c665198233c847b7b
-EBUILD ghc-7.6.3.ebuild 25151 SHA256 4b4011e3ccf3b6536869282f3ef354b505717a2dff9389a01d6b10390b4746be SHA512 22c9c9f0c543d356587b3db92f56a977dbf5307c41b18ab5828a2bf11d3287d8a1fc7adf78ee70011cea76840bd90d9c6a671d4a66040c6d25c8cce91810b724 WHIRLPOOL 841ed92986eed308a847198feea762d4e066fa86b5c3a5363513daea338e82c7cb00eb3a59b59c08f609595c92dcbb7a5d78577d5000c53bc7c767401f2abb21
-MISC ChangeLog 44067 SHA256 2f74f6bb3ee007e66e65ea3825ec9f43b91603fa02c9946bc2279468f3a7c38d SHA512 5f83f6fa66fc98bdac8aa7251df06f86a7d4ae97635bc846422d58e7916365a35ae9f1071df15324505245529a74e6c83b8d802bab2f88db807e22fd77874fb5 WHIRLPOOL bbe4020b432ae0f4029baeeb4727491b48f1d40343cbf5f79a91ec33bf00ee110a91bd01bdc252f6174b97c68e4a6d9c310e758b3628bcc29080ac9eb2f2e9cc
+EBUILD ghc-7.6.3.ebuild 26135 SHA256 15b0b4d9f7bb21507cdbad648811e3cc3cf2fe8d92b94e1a78f6f7c007c88a06 SHA512 8e02d5251b96bd3eed6c2a5bd24d85badf7d3b427c42c7309061aec64b7588a674901fbcae59441a9c814eb2d6e2e0993b511354dbbbbe3c0221617ca804e736 WHIRLPOOL 5e688fe4971bc486b79250c03fcc71c54353505ac93861ef514238af7519032db3f30f7e95237b1eca6baf80f71f8c2d69f5dde9a7b21965a6fe83df7fff9b4a
+MISC ChangeLog 44311 SHA256 6c05ccd0ee4b7154e51d108c02b7821ccc67f107820fff05378bfd2f2fc133e8 SHA512 8dfc334e69d19b2bd4fbc75f84cfa15b847d87b11f7a14684a81bae9f3e001985e200ec01bd6f652ec537447107e17d6af5bf0e96dc5fd3c7716daa07715e456 WHIRLPOOL ef388bf5bfb640fccf8b12a0926de37cb983f0c2d173ddaf07d9fcce99059bc8ebc75cb4a8bb3b13a4e80319573004637b04eae3a9def2acafabc0e3fb843c58
 MISC metadata.xml 626 SHA256 ef2d6b7e65453f0a6df403c25925250c8308741aa82b5991cfe18f5c1d8ab406 SHA512 9647b53b295e2f586c46450c068e3d0b5ebf2790b091121df7e177e7155f8ef4124df1fedc805465c24d9d32703398e1761de407b5bc494ba05fb76de2c7069a WHIRLPOOL 55afff88759648d2c47293046ddc2a10f92e2986bfb2d83d31046b824c6bab432038fe3298d29be434bfd1f13b368e5cc9b99eebc295443d53400e0eca4070b7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlGqAewACgkQcaHudmEf86r72QCfafWPR3O8HPWMHXAAkCjHX+WU
-5S0An2G3UjOqbWgneqR/4Pye+npiGXqF
-=0K7c
+iEYEAREIAAYFAlHpEqMACgkQcaHudmEf86qwywCeIvFniVH3L+nncNqADd5ZNhRg
+/GUAn1PmSq20xNlvIl0HlRuPuZrHIsnm
+=jyF+
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ghc/ghc-7.6.3.ebuild b/dev-lang/ghc/ghc-7.6.3.ebuild
index 7dfc47445cc8..0b3196b4c33b 100644
--- a/dev-lang/ghc/ghc-7.6.3.ebuild
+++ b/dev-lang/ghc/ghc-7.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.6.3.ebuild,v 1.1 2013/06/01 14:16:25 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.6.3.ebuild,v 1.2 2013/07/19 10:21:35 slyfox Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -50,10 +50,10 @@ HOMEPAGE="http://www.haskell.org/ghc/"
 arch_binaries=""
 
 # sorted!
-#arch_binaries="$arch_binaries alpha? ( http://code.haskell.org/~slyfox/ghc-alpha/ghc-bin-${PV}-alpha.tbz2 )"
+arch_binaries="$arch_binaries alpha? ( http://code.haskell.org/~slyfox/ghc-alpha/ghc-bin-${PV}-alpha.tbz2 )"
 #arch_binaries="$arch_binaries arm? ( http://code.haskell.org/~slyfox/ghc-arm/ghc-bin-${PV}-arm.tbz2 )"
 arch_binaries="$arch_binaries amd64? ( http://code.haskell.org/~slyfox/ghc-amd64/ghc-bin-${PV}-amd64.tbz2 )"
-#arch_binaries="$arch_binaries ia64?  ( http://code.haskell.org/~slyfox/ghc-ia64/ghc-bin-${PV}-ia64.tbz2 )"
+arch_binaries="$arch_binaries ia64?  ( http://code.haskell.org/~slyfox/ghc-ia64/ghc-bin-${PV}-ia64.tbz2 )"
 #arch_binaries="$arch_binaries ppc? ( http://code.haskell.org/~slyfox/ghc-ppc/ghc-bin-${PV}-ppc.tbz2 )"
 #arch_binaries="$arch_binaries ppc64? ( http://code.haskell.org/~slyfox/ghc-ppc64/ghc-bin-${PV}-ppc64.tbz2 )"
 #arch_binaries="$arch_binaries sparc? ( http://code.haskell.org/~slyfox/ghc-sparc/ghc-bin-${PV}-sparc.tbz2 )"
@@ -65,13 +65,13 @@ arch_binaries="$arch_binaries x86? ( http://code.haskell.org/~slyfox/ghc-x86/ghc
 # 0 - yet
 yet_binary() {
 	case "${ARCH}" in
-		#alpha) return 0 ;;
+		alpha) return 0 ;;
 		#arm)
 		#	ewarn "ARM binary is built on armv5tel-eabi toolchain. Use with caution."
 		#	return 0
 		#;;
 		amd64) return 0 ;;
-		#ia64) return 0 ;;
+		ia64) return 0 ;;
 		#ppc) return 0 ;;
 		#ppc64) return 0 ;;
 		#sparc) return 0 ;;
@@ -233,20 +233,44 @@ relocate_path() {
 relocate_ghc() {
 	local to=$1
 
+	# libdir for prebuilt binary and for current system may mismatch
+	# It does for prefix installation for example: bug #476998
+	local bin_ghc_prefix=${WORKDIR}/usr
+	local bin_libpath=$(echo "${bin_ghc_prefix}"/lib*)
+	local bin_libdir=${bin_libpath#${bin_ghc_prefix}/}
+
 	# backup original script to use it later after relocation
 	local gp_back="${T}/ghc-pkg-${PV}-orig"
 	cp "${WORKDIR}/usr/bin/ghc-pkg-${PV}" "$gp_back" || die "unable to backup ghc-pkg wrapper"
 
+	if [[ ${bin_libdir} != $(get_libdir) ]]; then
+		einfo "Relocating '${bin_libdir}' to '$(get_libdir)' (bug #476998)"
+		# moving the dir itself is not strictly needed
+		# but then USE=binary would result in installing
+		# in '${bin_libdir}'
+		mv "${bin_ghc_prefix}/${bin_libdir}" "${bin_ghc_prefix}/$(get_libdir)" || die
+
+		relocate_path "/usr/${bin_libdir}" "/usr/$(get_libdir)" \
+			"${WORKDIR}/usr/bin/ghc-${PV}" \
+			"${WORKDIR}/usr/bin/ghci-${PV}" \
+			"${WORKDIR}/usr/bin/ghc-pkg-${PV}" \
+			"${WORKDIR}/usr/bin/hsc2hs" \
+			"${WORKDIR}/usr/bin/runghc-${PV}" \
+			"$gp_back" \
+			"${WORKDIR}/usr/$(get_libdir)/${P}/package.conf.d/"*
+	fi
+
 	# Relocate from /usr to ${EPREFIX}/usr
 	relocate_path "/usr" "${to}/usr" \
 		"${WORKDIR}/usr/bin/ghc-${PV}" \
 		"${WORKDIR}/usr/bin/ghci-${PV}" \
 		"${WORKDIR}/usr/bin/ghc-pkg-${PV}" \
 		"${WORKDIR}/usr/bin/hsc2hs" \
+		"${WORKDIR}/usr/bin/runghc-${PV}" \
 		"${WORKDIR}/usr/$(get_libdir)/${P}/package.conf.d/"*
 
 	# this one we will use to regenerate cache
-	# so it shoult point to current tree location
+	# so it should point to current tree location
 	relocate_path "/usr" "${WORKDIR}/usr" "$gp_back"
 
 	if use prefix; then
@@ -257,8 +281,9 @@ relocate_ghc() {
 			"${WORKDIR}/usr/bin/ghc-${PV}" \
 			"${WORKDIR}/usr/bin/ghci-${PV}" \
 			"${WORKDIR}/usr/bin/ghc-pkg-${PV}" \
-			"$gp_back" \
 			"${WORKDIR}/usr/bin/hsc2hs" \
+			"${WORKDIR}/usr/bin/runghc-${PV}" \
+			"$gp_back" \
 			|| die "Adding LD_LIBRARY_PATH for wrappers failed"
 	fi