Drop ppc-macos keyword, upstream dropped support for building on 10.5. Up the bootstrap binaries to >6.12.3, as requested by configure.

Package-Manager: portage-2.2.01.20430-prefix/cvs/Darwin i386

3 files changed, 22 insertions, 29 deletions

diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog
index d5a67827776d..342b72cffd61 100644
--- a/dev-lang/ghc/ChangeLog
+++ b/dev-lang/ghc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/ghc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.221 2012/05/01 06:17:02 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.222 2012/05/03 19:48:41 grobian Exp $
+
+  03 May 2012; Fabian Groffen <grobian@gentoo.org> ghc-7.4.1-r1.ebuild:
+  Drop ppc-macos keyword, upstream dropped support for building on 10.5.  Up the
+  bootstrap binaries to >6.12.3, as requested by configure.
 
   01 May 2012; Fabian Groffen <grobian@gentoo.org>
   +files/ghc-7.4.1-darwin-CHOST.patch, ghc-7.4.1-r1.ebuild:
diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index 6db8c691bb8b..61235ff0e427 100644
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -43,7 +43,9 @@ DIST ghc-6.10.4-i386-unknown-solaris2.tar.bz2 78409258 RMD160 8595f81eb215437155
 DIST ghc-6.10.4-sparc-sun-solaris2.tar.bz2 87371847 RMD160 6028d2224524c6dfeb7b9b352eeee1b59f077df2 SHA1 dc48c475bce414545b734e27e50433f43a3a1b0c SHA256 bc6fa54fcb66d3d5f14c4bb32bb932a9168040e3e7eb4ef410de7fc18ecd3a38
 DIST ghc-6.10.4-src.tar.bz2 8060565 RMD160 5f83baf2549f1f4bea140c6a80728c2a76f60ab6 SHA1 0566858b409066d98da70de5adb9a7030d0df5dc SHA256 d66a8e52572f4ff819fe5c4e34c6dd1e84a7763e25c3fadcc222453c0bd8534d
 DIST ghc-6.12.3-src.tar.bz2 26592939 RMD160 021619aec4c820009e77745657bfdf0d9705f3e7 SHA1 d811be2131d4403ea452aa94fe71edd1b6bd0a79 SHA256 6cbdbe415011f2c7d15e4d850758d8d393f70617b88cb3237d2c602bb60e5e68
+DIST ghc-7.0.3-i386-unknown-solaris2.tar.bz2 85219039 RMD160 abe2eda96a9f2a5f02d08809bfaf599d1ad1024a SHA1 2b06d57fc72c0bfbeed25c7f9f28d19aa6a0b306 SHA256 d1e6fb322e8ea2f74b9826686f477a0838c0bf06a6128bfa0d05ff7c7afb1356
 DIST ghc-7.0.4-src.tar.bz2 24205070 RMD160 80727043c2141a0472f9e2fffcdf5a8eb9fb55ec SHA1 469a7ed626e53bf02f1e73713dea61e172106fd5 SHA256 1a9b78d9d66c9c21de6c0932e36bb87406a4856f1611bf83bd44539bdc6ed0ed
+DIST ghc-7.4.1-i386-apple-darwin.tar.bz2 154932146 RMD160 2b10b37ae2cf948a69213086496907fed4f43376 SHA1 9d96a85b8ca7113a40d0d702d0822bf822d718bb SHA256 0dc5a8eec085e816c234e3fb5db5b90e0bb014e140e2fcacbcd4de24c753542c
 DIST ghc-7.4.1-src.tar.bz2 25272609 RMD160 00c6a4df54e55559812b0e289dbc6fe8523d18da SHA1 66c5a027fef1ed01c35c3493e964fb3657efc936 SHA256 721c09a49e519b7459b67b451b5103252ba3833906a7a24c3a3679ff94669a79
 DIST ghc-7.4.1-x86_64-apple-darwin.tar.bz2 148037332 RMD160 e22cfa7c4b895b5f5001a2e97899b9e7c18d0a91 SHA1 1acdb6aba3172b28cea55037e58edb2aff4b656d SHA256 52eb17e513f9eb2e221b2183ebe6e8aa4358275128ea416788d2deb7e0a751bd
 DIST ghc-bin-6.10.4-alpha.tbz2 84499083 RMD160 5f68a5592663d7c6abf3617ccab9aa35cbfc2d63 SHA1 88fb6020bf1fab2e0914c223087af94e926a1dda SHA256 cfe28ea83e000f1ba0853b78dd27b35fa5d823c4cb94699f901aec5e2705c315
@@ -78,14 +80,14 @@ EBUILD ghc-6.10.4-r1.ebuild 13015 RMD160 540f5f7ea1ee0b37c4ffaf7db5dfad398fce071
 EBUILD ghc-6.12.3-r2.ebuild 20570 RMD160 ddaee5c9812d1a68994c47d2fb2b7f7c97cb5142 SHA1 dbdb74959cb125d873638661ffcaeae0b151d6da SHA256 d1bac3b88691bc27eefde9a04580a97e76e41d11b30c32b7f0dc92de4a367613
 EBUILD ghc-6.12.3.ebuild 15067 RMD160 d2085cb62d3d1f02ae1aeece6f5d7eedc043d8bb SHA1 1d42ba8dd60f239af8ecfda0d7c24b73050d2ac9 SHA256 85d10ae535a35d5b2a78852f380fe1dd66a06572f605ffbd472c47ff402ec102
 EBUILD ghc-7.0.4.ebuild 20079 RMD160 46666d45829791995f06034ccc3479c55ab7ed99 SHA1 920d5debdbee58aeb36b614e855d6dcfaf2eb974 SHA256 0f9e20b908d61685e5725fbefc9ae4d65c4a3ae53179054492902dd8638d5d5f
-EBUILD ghc-7.4.1-r1.ebuild 21925 RMD160 666137f5e5cd1df9330cf5f02c9a7a1f21c41f4f SHA1 46b0ca3d5c5c86e37aaab9d01c216edaa09dffec SHA256 6832c2f6162b82aeacb427b58e8e91ce7d235cbf719fb690002f5e27f2ee0e47
+EBUILD ghc-7.4.1-r1.ebuild 21255 RMD160 07f4f609de59735fc2d9a7f40f36d76ece2e6678 SHA1 7e4cc47bd95e2cfad72ef0708062ce4a52009881 SHA256 bd888b9945bed390b0c672dca385360df9326d8424386a68d658b6b8a69dbc33
 EBUILD ghc-7.4.1.ebuild 20450 RMD160 e85827638c46e85e35b9537a89525e62f60b2890 SHA1 42205ce6d5971ded7057ee43e9dad1df8077734f SHA256 8a0a3b104ddbb23c2de1128b60f194108739330d35bafc4c8349f62113a759c9
-MISC ChangeLog 40861 RMD160 ddfb45c97bcf3cab7ca97ff087d692dd53cfd26f SHA1 96c99a4a60f72852c2dcb9dd7f09ff7940245967 SHA256 bd38225adf3c7397b5d5aad69b6c60d96300732b3236cf7ca7eebe3d2a855d71
+MISC ChangeLog 41075 RMD160 d407843be883857e20940917def6a5d56e79c86e SHA1 9773678545b96ff4a65d1d1d77581aeabb9fa674 SHA256 015cead21414f1183c4e28134fecfd7389e9275194ad829b2f171c5b96f704d6
 MISC metadata.xml 511 RMD160 79a995fb7989ead0e2a1aaae42a015a34864e2ff SHA1 a7222153de1350459b28c0be825beeb13c0aa16e SHA256 4474d6b9638e6b78e16025c88b5455fa353ca723c05ce80aa3f8b426149ec1dd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (Darwin)
 
-iEYEARECAAYFAk+fgBAACgkQX3X2B8XHTomdlACfT7RhmvaNFN46RQtZYlwwZrO+
-YukAn05HF1PkAAfc6hfN3vdyXX7zFSrU
-=ZncV
+iEYEARECAAYFAk+i4R4ACgkQX3X2B8XHTonKsgCfd40QnDhoepN3g5XTznCKVy88
+gEEAnR55WL/FzbNj6nLwi0+u2Y9IIJ9y
+=Y8Jz
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ghc/ghc-7.4.1-r1.ebuild b/dev-lang/ghc/ghc-7.4.1-r1.ebuild
index b3caeb372c43..63aa03128c2b 100644
--- a/dev-lang/ghc/ghc-7.4.1-r1.ebuild
+++ b/dev-lang/ghc/ghc-7.4.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.4.1-r1.ebuild,v 1.2 2012/05/01 06:17:02 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.4.1-r1.ebuild,v 1.3 2012/05/03 19:48:41 grobian Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -52,11 +52,11 @@ arch_binaries="$arch_binaries x86? ( http://code.haskell.org/~slyfox/ghc-x86/ghc
 #arch_binaries="$arch_binaries x86-fbsd? ( http://code.haskell.org/~slyfox/ghc-x86-fbsd/ghc-bin-${PV}-x86-fbsd.tbz2 )"
 
 # prefix ports:
-arch_binaries="$arch_binaries x86-macos? ( http://www.haskell.org/ghc/dist/6.10.1/maeder/ghc-6.10.1-i386-apple-darwin.tar.bz2 )"
+arch_binaries="$arch_binaries x86-macos? ( http://www.haskell.org/ghc/dist/7.4.1/ghc-7.4.1-i386-apple-darwin.tar.bz2 )"
 arch_binaries="$arch_binaries x64-macos? ( http://www.haskell.org/ghc/dist/7.4.1/ghc-7.4.1-x86_64-apple-darwin.tar.bz2 )"
-arch_binaries="$arch_binaries ppc-macos? ( http://www.haskell.org/ghc/dist/6.10.1/maeder/ghc-6.10.1-powerpc-apple-darwin.tar.bz2 )"
-arch_binaries="$arch_binaries x86-solaris? ( http://www.haskell.org/ghc/dist/6.10.4/maeder/ghc-6.10.4-i386-unknown-solaris2.tar.bz2 )"
-arch_binaries="$arch_binaries sparc-solaris? ( http://www.haskell.org/ghc/dist/6.10.4/maeder/ghc-6.10.4-sparc-sun-solaris2.tar.bz2 )"
+arch_binaries="$arch_binaries x86-solaris? ( http://www.haskell.org/ghc/dist/7.0.3/maeder/ghc-7.0.3-i386-unknown-solaris2.tar.bz2 )"
+# need 6.12.3 to bootstrap this
+#arch_binaries="$arch_binaries sparc-solaris? ( http://www.haskell.org/ghc/dist/6.10.4/maeder/ghc-6.10.4-sparc-sun-solaris2.tar.bz2 )"
 
 # 0 - yet
 yet_binary() {
@@ -73,9 +73,7 @@ yet_binary() {
 		x86) return 0 ;;
 		x86-macos) return 0 ;;
 		x64-macos) return 0 ;;
-		ppc-macos) return 0 ;;
 		x86-solaris) return 0 ;;
-		sparc-solaris) return 0 ;;
 		*) return 1 ;;
 	esac
 }
@@ -85,7 +83,7 @@ SRC_URI="!binary? ( http://www.haskell.org/ghc/dist/${PV}/${P}-src.tar.bz2 )"
 LICENSE="BSD"
 SLOT="0"
 # ghc on ia64 needs gcc to support -mcmodel=medium (or some dark hackery) to avoid TOC overflow
-KEYWORDS="~alpha ~amd64 -ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 -ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc ghcbootstrap llvm"
 IUSE+=" binary" # don't forget about me later!
 
@@ -310,9 +308,8 @@ src_prepare() {
 				mkdir "${WORKDIR}"/ghc-bin-installer || die
 				pushd "${WORKDIR}"/ghc-bin-installer > /dev/null || die
 				use sparc-solaris && unpack ghc-6.10.4-sparc-sun-solaris2.tar.bz2
-				use x86-solaris && unpack ghc-6.10.4-i386-unknown-solaris2.tar.bz2
-				use ppc-macos && unpack ghc-6.10.1-powerpc-apple-darwin.tar.bz2
-				use x86-macos && unpack ghc-6.10.1-i386-apple-darwin.tar.bz2
+				use x86-solaris && unpack ghc-7.0.3-i386-unknown-solaris2.tar.bz2
+				use x86-macos && unpack ghc-7.4.1-i386-apple-darwin.tar.bz2
 				use x64-macos && unpack ghc-7.4.1-x86_64-apple-darwin.tar.bz2
 				popd > /dev/null
 
@@ -325,13 +322,8 @@ src_prepare() {
 				if [[ ${CHOST} == *-solaris* ]] ; then
 					export LD_LIBRARY_PATH="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir):${LD_LIBRARY_PATH}"
 				elif [[ ${CHOST} == *-darwin* ]] ; then
-					# http://hackage.haskell.org/trac/ghc/ticket/2942
-					cd utils/haddock/dist-install/build &> /dev/null && \
-						ln -s Haddock haddock >& /dev/null # fails on IN-sensitive
-
 					local readline_framework=GNUreadline.framework/GNUreadline
-					local gmp_framework6101=/opt/local/lib/libgmp.3.dylib
-					local gmp_framework741=/opt/local/lib/libgmp.10.dylib
+					local gmp_framework=/opt/local/lib/libgmp.10.dylib
 					local ncurses_file=/opt/local/lib/libncurses.5.dylib
 					for binary in $(scanmacho -BRE MH_EXECUTE -F '%F' .) ; do
 						install_name_tool -change \
@@ -339,11 +331,7 @@ src_prepare() {
 							"${EPREFIX}"/lib/libreadline.dylib \
 							${binary} || die
 						install_name_tool -change \
-							${gmp_framework6101} \
-							"${EPREFIX}"/usr/lib/libgmp.dylib \
-							${binary} || die
-						install_name_tool -change \
-							${gmp_framework741} \
+							${gmp_framework} \
 							"${EPREFIX}"/usr/lib/libgmp.dylib \
 							${binary} || die
 						install_name_tool -change \
@@ -376,7 +364,6 @@ src_prepare() {
 		cd "${S}" # otherwise epatch will break
 
 		epatch "${FILESDIR}"/${PN}-7.0.4-CHOST-prefix.patch
-		epatch "${FILESDIR}"/${PN}-7.0.4-darwin8.patch
 		epatch "${FILESDIR}"/${PN}-7.4-rc2-macos-prefix-respect-gcc.patch
 		epatch "${FILESDIR}"/${PN}-7.4.1-darwin-CHOST.patch
 		epatch "${FILESDIR}"/${PN}-7.2.1-freebsd-CHOST.patch