Remove old dev-lang/ghc packages

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

5 files changed, 11 insertions, 660 deletions

diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog
index 8b462799dcd2..2db0547a2842 100644
--- a/dev-lang/ghc/ChangeLog
+++ b/dev-lang/ghc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/ghc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.170 2009/09/16 06:50:28 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.171 2009/10/31 13:29:17 kolmodin Exp $
+
+  31 Oct 2009; <kolmodin@gentoo.org> -ghc-6.10.2.ebuild, -ghc-6.10.3.ebuild,
+  metadata.xml:
+  Remove previous ghc versions 6.10.2 and 6.10.3 as 6.10.4 now is unmasked.
+  Remove ghcmakebinary USE flag from metadata, it was unused.
 
   16 Sep 2009; Lennart Kolmodin <kolmodin@gentoo.org> ghc-6.10.4.ebuild,
   +files/ghc-6.10.4-ppc64-always-minimal-toc.patch,
diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index 54af772a2ed0..ab804feb188e 100644
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -12,8 +12,6 @@ AUX ghc-6.5-norelax.patch 613 RMD160 71012d8615e164c72d0db75c8cc606ccf8e3ddd9 SH
 AUX ghc-6.6-nothreadedrts.patch 665 RMD160 402c8eb78dc648e55d1d7e00c695b49abe0f293d SHA1 8d0bc56096ebe781371dffa668de48a97173cd32 SHA256 bdfb000a70d97bb7341dda5a2ec48bb7f688532ade830eb2d73c7fa6ef1eead1
 AUX ghc-bash-completion 6496 RMD160 61574aab2f8ed4ae906df5ac291f528384b79b87 SHA1 a0d7c264cc8ff3d235511e151dc82f9e16691bac SHA256 82a862bea2c9248e06fcf74d307de07b05a55f9eb95f412762bd02e53fece822
 AUX ghc-updater 9262 RMD160 10332a0dd2fd2f09e28b250fb74655e67305e2d7 SHA1 c297589995aa6c310bcf61db6fec1df57d5f0eb8 SHA256 e6277b2731c6be5159d28a450ccf9dfe701601f86552096ef8d8c5daedc5929a
-DIST ghc-6.10.2-src.tar.bz2 7987298 RMD160 a943a30c6ee91d4c4f92dd5d14e4fe80eb78567e SHA1 55a7bae8f9f114b3dddd19cba87479ddfb91c804 SHA256 d59447c16b92207db5c43004f4ff2ed1b261e00caa94ebef2485baadd17d7c60
-DIST ghc-6.10.3-src.tar.bz2 8059285 RMD160 90b01fefd474a64cf6b6b507f224abf6250745d3 SHA1 598bef94c99011a4f6791b8fbb7153ba7dffaf92 SHA256 82d104ab8b24f27c3566b5693316c779427794a137237b3df925c55e20905893
 DIST ghc-6.10.4-src.tar.bz2 8060565 RMD160 5f83baf2549f1f4bea140c6a80728c2a76f60ab6 SHA1 0566858b409066d98da70de5adb9a7030d0df5dc SHA256 d66a8e52572f4ff819fe5c4e34c6dd1e84a7763e25c3fadcc222453c0bd8534d
 DIST ghc-6.2.2-libraries.tar.gz 524182 RMD160 f4ce0df2040f91a5a56cc618e68f1aa2e4bf0185 SHA1 64af9e782f7eeae9f7f47445811f50cf3210f093 SHA256 ebcf8c1fd31c9a33ff64ca888f01e9911464469f59e5432c626b8c686c2d9142
 DIST ghc-6.2.2-src.tar.bz2 5406427 RMD160 7afa370c148f2b9c3d53d662da996f5d7c05282d SHA1 9ca5bfed02210d3731a76fab5e25a8c690067fde SHA256 a0fe7eb8d447f25fbc616cdbce2bb4e03961a884c2c37969d1e23588b588a852
@@ -27,10 +25,6 @@ DIST ghc-6.6-src.tar.bz2 4345587 RMD160 0d8d5cdde21e5ad86fba1023872be316316d14e7
 DIST ghc-6.6-users_guide.tar.gz 255475 RMD160 ecbdff8f0501780641408204fe60946cde392c95 SHA1 13c8e0e5922a8598a7b8c0eb05dbef9c8e1b661c SHA256 7242a6ccf3df6f141f4e493f9dd37def9d036239b819aa5a5d6f3a58489799ef
 DIST ghc-6.6.1-src.tar.bz2 4339970 RMD160 6b82a74559425fe5fe1fa1b67a83433457bae0ad SHA1 cc1846b4ad607e270721371ce4043b1a017cd10e SHA256 489126ceeb2dbb6a85ef8d87d6792e61e1bc0d5882e4b33a7725410d796132c6
 DIST ghc-6.8.2-src.tar.bz2 7072545 RMD160 dc555c3137d9314a6ee6a0b7ad62c0ba16d9d52c SHA1 1f40b0ee2e51be1208fdb579ce4998181ec36a40 SHA256 2d10f973c35e8d7d9f62b53e26fef90177a9a15105cda4b917340ba7696a22d9
-DIST ghc-bin-6.10.2-amd64.tbz2 52998594 RMD160 0871c4471b01e94c7fee4fd7a44e26cec4527734 SHA1 7f6e80b4cc5d6bf992494b33f9b104d9ffac0800 SHA256 27903f862c9e783a993fa328a0bb4e28c405415482f25ba39a20c702844dc554
-DIST ghc-bin-6.10.2-x86.tbz2 53456281 RMD160 78134bc179638c8b9b88c849d6d714efcfe94d41 SHA1 54060864531274047d030d34288a26d5137a9b62 SHA256 ae9acc8294a747cad17134ffccf1b21a3c9f60a2fcfdc075a778f4b755132888
-DIST ghc-bin-6.10.3-amd64.tbz2 52224187 RMD160 a4cdb7cf8dc3df2a8c2e983ff8edc45ada2403a7 SHA1 9e8855bb64f77dd901ad3ba3502e78030f360c40 SHA256 237719cef511b02511150709ecaa7cc21ed677e788b98221241c2c57c32266e2
-DIST ghc-bin-6.10.3-x86.tbz2 52602522 RMD160 f93d88ac5cabe083249804cfbbe21a80aeb2b124 SHA1 5b8d0ea6479e95d1073794437bb109786277328e SHA256 fc131854e9f1a9f4a3a222b3ba615ae33f6b5d5ae1fec831470ed3fe662da589
 DIST ghc-bin-6.10.4-amd64.tbz2 51566179 RMD160 68b261b4bbef89021a2c92e99c70db45ed85d9e7 SHA1 27e542cc49fa47566c59407fad1c9254d46a8d03 SHA256 2ced87862603a44a59744459a8231f587c0f225f70eb4861ad2db5098c2433a1
 DIST ghc-bin-6.10.4-ppc64.tbz2 67637446 RMD160 ff0bed846e91dcf094142fc6b75f29c9d8521424 SHA1 858406875ade2f1aad8b2ae731bf9ce3fa613f1c SHA256 1ef7d4daf50cc0998651d498d029a5455fb6c410c0abb6a2b23b118ae69e9c54
 DIST ghc-bin-6.10.4-sparc.tbz2 65780774 RMD160 60a431055ce065d2489f2258111e2fb322cd90ec SHA1 bf591efa07e6be805285a800e3832377e303b4f8 SHA256 6ee4d05fb68e622bac960355d928881a2ddd7ce82a10763333e0a8daa93f6d89
@@ -69,9 +63,6 @@ DIST ghc-bin-6.8.2-x86.tbz2 30872949 RMD160 ce2f9f6fe88440ba3574d85c219e96210d35
 DIST ghc-bundled-readline-5.2_p13-amd64.tbz2 976677 RMD160 f0543aa3f404d45aad4360cc07b777c3aaafc5fb SHA1 1737eae6fe00c4924577e6eb8fa5d2c7eb0b24ca SHA256 f67250899590a551278695bcb7f143c5a6423ea47e5e6966615072cc0f9b51f0
 DIST ghc-bundled-readline-5.2_p13-x86.tbz2 940742 RMD160 5f9470a99047f004bd0917c62253bff9b663c9a5 SHA1 f5463a8929d2ba792b91085f78d6763cb50ef14e SHA256 bb9766235ed0d6e3c2f3ffe1625ecbe8e4d2e0254f7060e845be3a404835cd2a
 DIST ghc-testsuite-6.4.2.tar.gz 1181389 RMD160 1eea6a19a9fca6b3d56a6f29b69289cb88af8173 SHA1 7ada60fe2abb9208d841787781d522d5a1110dc2 SHA256 1a864243e922c233049585fa3bf4a86a0ca3e7b3ffebf26245eb037f15dd4d12
-DIST readline-1.0.1.0.tar.gz 52394 RMD160 6554e24718cc1469e4c19b3e9c7244b527252a7a SHA1 ffcb2569194037c28c6288dbcec75c169c7fa89c SHA256 07f2f039f32bf18838a4875d0f3caa3ed9436dd52b962b2061f0bb8a3316fa1d
-EBUILD ghc-6.10.2.ebuild 11776 RMD160 97c82f512663c2d19e2878b8ba4713a487775def SHA1 ae848ebf3fea760699195ceb5030343fa1117d6a SHA256 6dfe5599d96e81a76053560832ac679b0689c4b4c4d9544393da90312622b351
-EBUILD ghc-6.10.3.ebuild 10580 RMD160 a9483fd501319fda6f373934acc99431858e8de1 SHA1 cce068cdc500b0da08d4381acd992a52847681aa SHA256 f71ac0e5ead8bc620ddb13d5e4fd805e7bb85ee4734b578f14d22708bfbd1fc0
 EBUILD ghc-6.10.4.ebuild 11015 RMD160 f736ea1117fb62db038f1d4b3370ee36d803c32f SHA1 71f35920921887e010d7a83156a75f0c56372207 SHA256 2a97d8c63a6868c4756cad8d644ab96dd8a9fa6a233cfbcb59e83af0b6f9e601
 EBUILD ghc-6.2.2.ebuild 10387 RMD160 3f30eb547a048ae8a911831d6b6ac04528f7bbcf SHA1 c08282a3a2e60cfb8f742fbb8607ae1819ca3be8 SHA256 201ce669c29ee075e24f03e9abd0510aa172e000e240fadcf89c096004789935
 EBUILD ghc-6.4.2.ebuild 13550 RMD160 54b1dc7fe619e62e168c42ef0135c6554c893834 SHA1 17e5ccc5479c5e387b45379960dd60d5ddbe8774 SHA256 650cc001ea76d20fe6d9deed696491a158ba1144cbb4930b501984c1bc8ab494
@@ -79,12 +70,12 @@ EBUILD ghc-6.6.1.ebuild 12238 RMD160 389782acd6d8ae37e6ffd72fb71667f3c1f04ccb SH
 EBUILD ghc-6.6.ebuild 10777 RMD160 141e86d9cf0525a8aff69b9a70ab1522b078ec62 SHA1 c432175362c80acbea221137d50467c8f065985b SHA256 28e0f78ed977d31ee301c726fd0be830b161c8830e6344d55d4c51113c50acb1
 EBUILD ghc-6.8.2-r1.ebuild 8952 RMD160 5c4832a7ca6dc41d217c0d5ebb677afd2ae5b174 SHA1 0b321957d4f9ddccf1614a6c5d901649125c6a8e SHA256 8699169558e85a23675058d9b70a0017c3207b6637db6f352b389e076cbe5baf
 EBUILD ghc-6.8.2.ebuild 9063 RMD160 d2842f4e26583fa1befecc0ad01a54983830a48a SHA1 8d52f906227815f0049d1403c302415bbd828c20 SHA256 c5ac2c32efce96ac677851ed85d6c0504a5bbbbaaba63ef383225795ab126bba
-MISC ChangeLog 28803 RMD160 da8ae5d48a0a07e2bb7c0ce5452b95c5a372613a SHA1 9a8366dcae6c584d103358d15501996e78e92797 SHA256 bbb916b2fb9c51236c45a91f1fd6ea8d593570068a324c3bae68afa21dde9ef9
-MISC metadata.xml 558 RMD160 a6e079bce4a2ff91763d7077e300720ca3d4db2a SHA1 0b52871b0f12c318bed9e7fe7dc994c974096647 SHA256 5e25a5d2ef0e322f55bfbb37955ce388e2ebbaee387b97847ceb844ea3b120fd
+MISC ChangeLog 29035 RMD160 77f801172974bc2694abde686cbc50932180a854 SHA1 2216c25b07d95fa6d9368bcf70803be817ce4cf0 SHA256 d3934ea966bb076a042a3f04cab94b7d4a02b8b5651224d6e88a17e279856681
+MISC metadata.xml 442 RMD160 9cfa0af9084477c8a70ecf0ac3fb3093ae0cd602 SHA1 be2833090f093ac1c8fc2f5c6f3f253bdbdd6b96 SHA256 2bacbdfcaea11289949a687626f59f99af8fda9ec495b2c349ce5898d9f0dcd4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkqwisAACgkQ1n/CYbXjntJlSACfSVaM0Q9yaG/XxuOktG16eo+8
-KRoAnRZ/Jpov4bp1FXcCalV5qFKO1dyE
-=JTzW
+iEYEARECAAYFAkrsO9QACgkQ1n/CYbXjntI1TACgoSrHOlAWwo/dFHA/3u6Dsequ
+pwQAn3dspxZeJfonfWaTC4E67knaaosE
+=hxX5
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ghc/ghc-6.10.2.ebuild b/dev-lang/ghc/ghc-6.10.2.ebuild
deleted file mode 100644
index 902ee6169701..000000000000
--- a/dev-lang/ghc/ghc-6.10.2.ebuild
+++ /dev/null
@@ -1,336 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.10.2.ebuild,v 1.3 2009/04/19 16:37:29 mr_bones_ Exp $
-
-# Brief explanation of the bootstrap logic:
-#
-# Previous ghc ebuilds have been split into two: ghc and ghc-bin,
-# where ghc-bin was primarily used for bootstrapping purposes.
-# From now on, these two ebuilds have been combined, with the
-# binary USE flag used to determine whether or not the pre-built
-# binary package should be emerged or whether ghc should be compiled
-# from source.  If the latter, then the relevant ghc-bin for the
-# arch in question will be used in the working directory to compile
-# ghc from source.
-#
-# This solution has the advantage of allowing us to retain the one
-# ebuild for both packages, and thus phase out virtual/ghc.
-
-# Note to users of hardened gcc-3.x:
-#
-# If you emerge ghc with hardened gcc it should work fine (because we
-# turn off the hardened features that would otherwise break ghc).
-# However, emerging ghc while using a vanilla gcc and then switching to
-# hardened gcc (using gcc-config) will leave you with a broken ghc. To
-# fix it you would need to either switch back to vanilla gcc or re-emerge
-# ghc (or ghc-bin). Note that also if you are using hardened gcc-3.x and
-# you switch to gcc-4.x that this will also break ghc and you'll need to
-# re-emerge ghc (or ghc-bin). People using vanilla gcc can switch between
-# gcc-3.x and 4.x with no problems.
-
-inherit base autotools bash-completion eutils flag-o-matic toolchain-funcs ghc-package versionator
-
-DESCRIPTION="The Glasgow Haskell Compiler"
-HOMEPAGE="http://www.haskell.org/ghc/"
-
-# discover if this is a snapshot release
-IS_SNAPSHOT="$(get_version_component_range 4)" # non-empty if snapshot
-EXTRA_SRC_URI="${PV}"
-[[ "${IS_SNAPSHOT}" ]] && EXTRA_SRC_URI="stable/dist"
-
-READLINE_PV="1.0.1.0"
-READLINE_P="readline-${READLINE_PV}"
-
-arch_binaries=""
-
-arch_binaries="$arch_binaries x86?   ( http://code.haskell.org/~ivanm/ghc-bin-${PV}-x86.tbz2 )"
-arch_binaries="$arch_binaries amd64? ( http://haskell.org/~kolmodin/ghc-bin-${PV}-amd64.tbz2 )"
-
-#arch_binaries="$arch_binaries alpha?   ( mirror://gentoo/ghc-bin-${PV}-alpha.tbz2 )"
-#arch_binaries="$arch_binaries amd64?   ( mirror://gentoo/ghc-bin-${PV}-amd64.tbz2 )"
-#arch_binaries="$arch_binaries hppa?    ( mirror://gentoo/ghc-bin-${PV}-hppa.tbz2 )"
-#arch_binaries="$arch_binaries ia64?    ( mirror://gentoo/ghc-bin-${PV}-ia64.tbz2 )"
-#arch_binaries="$arch_binaries sparc?   ( mirror://gentoo/ghc-bin-${PV}-sparc.tbz2 )"
-#arch_binaries="$arch_binaries x86? ( mirror://gentoo/ghc-bin-${PV}-x86.tbz2 )"
-
-SRC_URI="!binary? ( http://haskell.org/ghc/dist/${EXTRA_SRC_URI}/${P}-src.tar.bz2
-					http://hackage.haskell.org/packages/archive/readline/${READLINE_PV}/${READLINE_P}.tar.gz
-				  )
-		 !ghcbootstrap? ( $arch_binaries )"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="binary doc ghcbootstrap ghcmakebinary"
-
-RDEPEND="
-	>=sys-devel/gcc-2.95.3
-	>=sys-devel/binutils-2.17
-	>=dev-lang/perl-5.6.1
-	>=dev-libs/gmp-4.1
-	!binary? ( >=sys-libs/readline-5 )"
-
-DEPEND="${RDEPEND}
-	ghcbootstrap? (	doc? (	~app-text/docbook-xml-dtd-4.2
-							app-text/docbook-xsl-stylesheets
-							>=dev-libs/libxslt-1.1.2 ) )"
-# In the ghcbootstrap case we rely on the developer having
-# >=ghc-5.04.3 on their $PATH already
-
-append-ghc-cflags() {
-	local flag compile assemble link
-	for flag in $*; do
-		case ${flag} in
-			compile)	compile="yes";;
-			assemble)	assemble="yes";;
-			link)		link="yes";;
-			*)
-				[[ ${compile}  ]] && GHC_CFLAGS="${GHC_CFLAGS} -optc${flag}"
-				[[ ${assemble} ]] && GHC_CFLAGS="${GHC_CFLAGS} -opta${flag}"
-				[[ ${link}     ]] && GHC_CFLAGS="${GHC_CFLAGS} -optl${flag}";;
-		esac
-	done
-}
-
-ghc_setup_cflags() {
-	# We need to be very careful with the CFLAGS we ask ghc to pass through to
-	# gcc. There are plenty of flags which will make gcc produce output that
-	# breaks ghc in various ways. The main ones we want to pass through are
-	# -mcpu / -march flags. These are important for arches like alpha & sparc.
-	# We also use these CFLAGS for building the C parts of ghc, ie the rts.
-	strip-flags
-	strip-unsupported-flags
-	filter-flags -fPIC
-
-	GHC_CFLAGS=""
-	for flag in ${CFLAGS}; do
-		case ${flag} in
-
-			# Ignore extra optimisation (ghc passes -O to gcc anyway)
-			# -O2 and above break on too many systems
-			-O*) ;;
-
-			# Arch and ABI flags are what we're really after
-			-m*) append-ghc-cflags compile assemble ${flag};;
-
-			# Debugging flags don't help either. You can't debug Haskell code
-			# at the C source level and the mangler discards the debug info.
-			-g*) ;;
-
-			# Ignore all other flags, including all -f* flags
-		esac
-	done
-
-	# hardened-gcc needs to be disabled, because the mangler doesn't accept
-	# its output.
-	gcc-specs-pie && append-ghc-cflags compile link	-nopie
-	gcc-specs-ssp && append-ghc-cflags compile		-fno-stack-protector
-
-	# We also add -Wa,--noexecstack to get ghc to generate .o files with
-	# non-exectable stack. This it a hack until ghc does it itself properly.
-	append-ghc-cflags assemble		"-Wa,--noexecstack"
-}
-
-pkg_setup() {
-	if use ghcbootstrap; then
-		ewarn "You requested ghc bootstrapping, this is usually only used"
-		ewarn "by Gentoo developers to make binary .tbz2 packages for"
-		ewarn "use with the ghc ebuild's USE=\"binary\" feature."
-		use binary && \
-			die "USE=\"ghcbootstrap binary\" is not a valid combination."
-		[[ -z $(type -P ghc) ]] && \
-			die "Could not find a ghc to bootstrap with."
-	fi
-}
-
-src_unpack() {
-	# Create the ${S} dir if we're using the binary version
-	use binary && mkdir "${S}"
-
-	base_src_unpack
-	ghc_setup_cflags
-
-	if use binary; then
-
-		# Move unpacked files to the expected place
-		mv "${WORKDIR}/usr" "${S}"
-	else
-
-		# move readline into the ghc libraries dir
-		mv "${WORKDIR}/readline-${READLINE_PV}" \
-		   "${S}/libraries/readline"
-
-		# use sys-libs/readline instead of dev-libs/editline
-		epatch "${FILESDIR}/${P}-readline.patch"
-
-		if ! use ghcbootstrap; then
-			# Relocate from /usr to ${WORKDIR}/usr
-			sed -i -e "s|/usr|${WORKDIR}/usr|g" \
-				"${WORKDIR}/usr/bin/ghc-${PV}" \
-				"${WORKDIR}/usr/bin/ghci-${PV}" \
-				"${WORKDIR}/usr/bin/ghc-pkg-${PV}" \
-				"${WORKDIR}/usr/bin/hsc2hs" \
-				"${WORKDIR}/usr/$(get_libdir)/${P}/package.conf" \
-				|| die "Relocating ghc from /usr to workdir failed"
-		fi
-
-		# Hack to prevent haddock being installed, remove when ./configure
-		# supports something better to not build docs or haddock.
-		sed -i -e 's/DO_NOT_INSTALL =/DO_NOT_INSTALL = haddock/' \
-			"${S}/utils/Makefile"
-
-		# as we have changed the build system with the readline patch
-		eautoreconf
-	fi
-}
-
-src_compile() {
-	if ! use binary; then
-
-		# initialize build.mk
-		echo '# Gentoo changes' > mk/build.mk
-
-		# Put docs into the right place, ie /usr/share/doc/ghc-${PV}
-		echo "docdir = /usr/share/doc/${P}" >> mk/build.mk
-		echo "htmldir = /usr/share/doc/${P}" >> mk/build.mk
-
-		# We also need to use the GHC_CFLAGS flags when building ghc itself
-		echo "SRC_HC_OPTS+=${GHC_CFLAGS}" >> mk/build.mk
-		echo "SRC_CC_OPTS+=${CFLAGS} -Wa,--noexecstack" >> mk/build.mk
-
-		# The settings that give you the fastest complete GHC build are these:
-		if use ghcquickbuild; then
-			echo "SRC_HC_OPTS     = -H64m -Onot -fasm" >> mk/build.mk
-			echo "GhcStage1HcOpts = -O -fasm" >> mk/build.mk
-			echo "GhcStage2HcOpts = -Onot -fasm" >> mk/build.mk
-			echo "GhcLibHcOpts    = -Onot -fasm" >> mk/build.mk
-			echo "GhcLibWays      =" >> mk/build.mk
-			echo "SplitObjs       = NO" >> mk/build.mk
-		fi
-		# However, note that the libraries are built without optimisation, so
-		# this build isn't very useful. The resulting compiler will be very
-		# slow. On a 4-core x86 machine using MAKEOPTS="-j10", this build was
-		# timed at less than 8 minutes.
-
-		# We can't depend on haddock except when bootstrapping when we
-		# must build docs and include them into the binary .tbz2 package
-		if use ghcbootstrap && use doc; then
-			echo XMLDocWays="html" >> mk/build.mk
-			echo HADDOCK_DOCS=YES >> mk/build.mk
-		else
-			echo XMLDocWays="" >> mk/build.mk
-			echo HADDOCK_DOCS=NO >> mk/build.mk
-		fi
-
-		# circumvent a very strange bug that seems related with ghc producing
-		# too much output while being filtered through tee (e.g. due to
-		# portage logging) reported as bug #111183
-		echo "SRC_HC_OPTS+=-w" >> mk/build.mk
-
-		# GHC build system knows to build unregisterised on alpha and hppa,
-		# but we have to tell it to build unregisterised on some arches
-		if use alpha || use hppa || use ppc64 || use sparc; then
-			echo "GhcUnregisterised=YES" >> mk/build.mk
-			echo "GhcWithInterpreter=NO" >> mk/build.mk
-			echo "GhcWithNativeCodeGen=NO" >> mk/build.mk
-			echo "SplitObjs=NO" >> mk/build.mk
-			echo "GhcRTSWays := debug" >> mk/build.mk
-			echo "GhcNotThreaded=YES" >> mk/build.mk
-		fi
-
-		# When making a binary to be used for bootstrapping we want as few
-		# dependencies as possible in the resulting binary. Depending on
-		# packages that might be upgraded will result in a broken bootstrapping
-		# binary, see bug #259867 comment #4.
-		# Here we disable using readline in ghci, for two reasons:
-		#   1. Building ghci with sys-libs/readline or dev-libs/libedit
-		#      will make the resulting binary fragile to upgrades in the
-		#      host environment.
-		#   2. We've patched ghc to use the GPL library sys-libs/readline.
-		#      The licence prohibits us from distributing binaries linked to it.
-		if use ghcmakebinary; then
-			sed -i compiler/Makefile \
-			    -e 's,CONFIGURE_FLAGS_STAGE2 += --flags=readline,CONFIGURE_FLAGS_STAGE2 += --flags=-readline,'
-		fi
-
-		# Get ghc from the unpacked binary .tbz2
-		# except when bootstrapping we just pick ghc up off the path
-		if ! use ghcbootstrap; then
-			export PATH="${WORKDIR}/usr/bin:${PATH}"
-		fi
-
-		econf || die "econf failed"
-
-		emake all || die "make failed"
-
-	fi # ! use binary
-}
-
-src_install() {
-	if use binary; then
-		mv "${S}/usr" "${D}"
-
-		# Remove the docs if not requested
-		if ! use doc; then
-			rm -rf "${D}/usr/share/doc/${P}/*/" \
-				"${D}/usr/share/doc/${P}/*.html" \
-				|| die "could not remove docs (P vs PF revision mismatch?)"
-		fi
-	else
-		local insttarget="install"
-
-		# We only built docs if we were bootstrapping, otherwise
-		# we copy them out of the unpacked binary .tbz2
-		if use doc; then
-			if use ghcbootstrap; then
-				insttarget="${insttarget} install-docs"
-			else
-				mkdir -p "${D}/usr/share/doc"
-				mv "${WORKDIR}/usr/share/doc/${P}" "${D}/usr/share/doc" \
-					|| die "failed to copy docs"
-			fi
-		fi
-
-		emake -j1 ${insttarget} \
-			DESTDIR="${D}" \
-			|| die "make ${insttarget} failed"
-
-		dodoc "${S}/README" "${S}/ANNOUNCE" "${S}/LICENSE" "${S}/VERSION"
-
-		dosbin "${FILESDIR}/ghc-updater"
-
-		dobashcompletion "${FILESDIR}/ghc-bash-completion"
-
-		cp -p "${D}/usr/$(get_libdir)/${P}/package.conf"{,.shipped} \
-			|| die "failed to copy package.conf"
-	fi
-}
-
-pkg_postinst() {
-	# 'ghc-pkg check' fails in ghc 6.10.2, with the error message:
-	# There are problems in package rts-1.0:
-	#    include-dirs: PAPI_INCLUDE_DIR doesn't exist or isn't a directory
-	# Upstream suggests this solution to fix it:
-	export PATH="/usr/bin:${PATH}"
-	$(ghc-getghcpkg) describe rts | sed 's/PAPI_INCLUDE_DIR//' | $(ghc-getghcpkg) update -
-
-	ghc-reregister
-
-	ewarn "IMPORTANT:"
-	ewarn "If you have upgraded from another version of ghc, please run:"
-	ewarn "      /usr/sbin/ghc-updater"
-	ewarn "to re-merge all ghc-based Haskell libraries."
-
-	bash-completion_pkg_postinst
-}
-
-pkg_prerm() {
-	# Overwrite the (potentially) modified package.conf with a copy of the
-	# original one, so that it will be removed during uninstall.
-
-	PKG="${ROOT}/usr/$(get_libdir)/${P}/package.conf"
-
-	cp -p "${PKG}"{.shipped,}
-
-	[[ -f ${PKG}.old ]] && rm "${PKG}.old"
-}
diff --git a/dev-lang/ghc/ghc-6.10.3.ebuild b/dev-lang/ghc/ghc-6.10.3.ebuild
deleted file mode 100644
index af0c16202e0e..000000000000
--- a/dev-lang/ghc/ghc-6.10.3.ebuild
+++ /dev/null
@@ -1,308 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.10.3.ebuild,v 1.1 2009/05/10 21:03:06 kolmodin Exp $
-
-# Brief explanation of the bootstrap logic:
-#
-# Previous ghc ebuilds have been split into two: ghc and ghc-bin,
-# where ghc-bin was primarily used for bootstrapping purposes.
-# From now on, these two ebuilds have been combined, with the
-# binary USE flag used to determine whether or not the pre-built
-# binary package should be emerged or whether ghc should be compiled
-# from source.  If the latter, then the relevant ghc-bin for the
-# arch in question will be used in the working directory to compile
-# ghc from source.
-#
-# This solution has the advantage of allowing us to retain the one
-# ebuild for both packages, and thus phase out virtual/ghc.
-
-# Note to users of hardened gcc-3.x:
-#
-# If you emerge ghc with hardened gcc it should work fine (because we
-# turn off the hardened features that would otherwise break ghc).
-# However, emerging ghc while using a vanilla gcc and then switching to
-# hardened gcc (using gcc-config) will leave you with a broken ghc. To
-# fix it you would need to either switch back to vanilla gcc or re-emerge
-# ghc (or ghc-bin). Note that also if you are using hardened gcc-3.x and
-# you switch to gcc-4.x that this will also break ghc and you'll need to
-# re-emerge ghc (or ghc-bin). People using vanilla gcc can switch between
-# gcc-3.x and 4.x with no problems.
-
-inherit base autotools bash-completion eutils flag-o-matic toolchain-funcs ghc-package versionator
-
-DESCRIPTION="The Glasgow Haskell Compiler"
-HOMEPAGE="http://www.haskell.org/ghc/"
-
-# discover if this is a snapshot release
-IS_SNAPSHOT="$(get_version_component_range 4)" # non-empty if snapshot
-EXTRA_SRC_URI="${PV}"
-[[ "${IS_SNAPSHOT}" ]] && EXTRA_SRC_URI="stable/dist"
-
-arch_binaries=""
-
-arch_binaries="$arch_binaries x86?   ( http://code.haskell.org/~ivanm/ghc-bin-${PV}-x86.tbz2 )"
-arch_binaries="$arch_binaries amd64? ( http://haskell.org/~kolmodin/ghc-bin-${PV}-amd64.tbz2 )"
-
-#arch_binaries="$arch_binaries alpha?   ( mirror://gentoo/ghc-bin-${PV}-alpha.tbz2 )"
-#arch_binaries="$arch_binaries amd64?   ( mirror://gentoo/ghc-bin-${PV}-amd64.tbz2 )"
-#arch_binaries="$arch_binaries hppa?    ( mirror://gentoo/ghc-bin-${PV}-hppa.tbz2 )"
-#arch_binaries="$arch_binaries ia64?    ( mirror://gentoo/ghc-bin-${PV}-ia64.tbz2 )"
-#arch_binaries="$arch_binaries sparc?   ( mirror://gentoo/ghc-bin-${PV}-sparc.tbz2 )"
-#arch_binaries="$arch_binaries x86? ( mirror://gentoo/ghc-bin-${PV}-x86.tbz2 )"
-
-SRC_URI="!binary? ( http://haskell.org/ghc/dist/${EXTRA_SRC_URI}/${P}-src.tar.bz2 )
-		!ghcbootstrap? ( $arch_binaries )"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="binary doc ghcbootstrap"
-
-RDEPEND="
-	!dev-lang/ghc-bin
-	>=sys-devel/gcc-2.95.3
-	>=sys-devel/binutils-2.17
-	>=dev-lang/perl-5.6.1
-	>=dev-libs/gmp-4.1"
-
-DEPEND="${RDEPEND}
-	ghcbootstrap? (	doc? (	~app-text/docbook-xml-dtd-4.2
-							app-text/docbook-xsl-stylesheets
-							>=dev-libs/libxslt-1.1.2 ) )"
-# In the ghcbootstrap case we rely on the developer having
-# >=ghc-5.04.3 on their $PATH already
-
-append-ghc-cflags() {
-	local flag compile assemble link
-	for flag in $*; do
-		case ${flag} in
-			compile)	compile="yes";;
-			assemble)	assemble="yes";;
-			link)		link="yes";;
-			*)
-				[[ ${compile}  ]] && GHC_CFLAGS="${GHC_CFLAGS} -optc${flag}"
-				[[ ${assemble} ]] && GHC_CFLAGS="${GHC_CFLAGS} -opta${flag}"
-				[[ ${link}     ]] && GHC_CFLAGS="${GHC_CFLAGS} -optl${flag}";;
-		esac
-	done
-}
-
-ghc_setup_cflags() {
-	# We need to be very careful with the CFLAGS we ask ghc to pass through to
-	# gcc. There are plenty of flags which will make gcc produce output that
-	# breaks ghc in various ways. The main ones we want to pass through are
-	# -mcpu / -march flags. These are important for arches like alpha & sparc.
-	# We also use these CFLAGS for building the C parts of ghc, ie the rts.
-	strip-flags
-	strip-unsupported-flags
-	filter-flags -fPIC
-
-	GHC_CFLAGS=""
-	for flag in ${CFLAGS}; do
-		case ${flag} in
-
-			# Ignore extra optimisation (ghc passes -O to gcc anyway)
-			# -O2 and above break on too many systems
-			-O*) ;;
-
-			# Arch and ABI flags are what we're really after
-			-m*) append-ghc-cflags compile assemble ${flag};;
-
-			# Debugging flags don't help either. You can't debug Haskell code
-			# at the C source level and the mangler discards the debug info.
-			-g*) ;;
-
-			# Ignore all other flags, including all -f* flags
-		esac
-	done
-
-	# hardened-gcc needs to be disabled, because the mangler doesn't accept
-	# its output.
-	gcc-specs-pie && append-ghc-cflags compile link	-nopie
-	gcc-specs-ssp && append-ghc-cflags compile		-fno-stack-protector
-
-	# We also add -Wa,--noexecstack to get ghc to generate .o files with
-	# non-exectable stack. This it a hack until ghc does it itself properly.
-	append-ghc-cflags assemble		"-Wa,--noexecstack"
-}
-
-pkg_setup() {
-	if use ghcbootstrap; then
-		ewarn "You requested ghc bootstrapping, this is usually only used"
-		ewarn "by Gentoo developers to make binary .tbz2 packages for"
-		ewarn "use with the ghc ebuild's USE=\"binary\" feature."
-		use binary && \
-			die "USE=\"ghcbootstrap binary\" is not a valid combination."
-		[[ -z $(type -P ghc) ]] && \
-			die "Could not find a ghc to bootstrap with."
-	fi
-}
-
-src_unpack() {
-	# Create the ${S} dir if we're using the binary version
-	use binary && mkdir "${S}"
-
-	base_src_unpack
-	ghc_setup_cflags
-
-	if use binary; then
-
-		# Move unpacked files to the expected place
-		mv "${WORKDIR}/usr" "${S}"
-	else
-		if ! use ghcbootstrap; then
-			# Relocate from /usr to ${WORKDIR}/usr
-			sed -i -e "s|/usr|${WORKDIR}/usr|g" \
-				"${WORKDIR}/usr/bin/ghc-${PV}" \
-				"${WORKDIR}/usr/bin/ghci-${PV}" \
-				"${WORKDIR}/usr/bin/ghc-pkg-${PV}" \
-				"${WORKDIR}/usr/bin/hsc2hs" \
-				"${WORKDIR}/usr/$(get_libdir)/${P}/package.conf" \
-				|| die "Relocating ghc from /usr to workdir failed"
-		fi
-
-		# Hack to prevent haddock being installed, remove when ./configure
-		# supports something better to not build docs or haddock.
-		sed -i -e 's/DO_NOT_INSTALL =/DO_NOT_INSTALL = haddock/' \
-			"${S}/utils/Makefile"
-
-		# as we have changed the build system with the readline patch
-		eautoreconf
-	fi
-}
-
-src_compile() {
-	if ! use binary; then
-
-		# initialize build.mk
-		echo '# Gentoo changes' > mk/build.mk
-
-		# Put docs into the right place, ie /usr/share/doc/ghc-${PV}
-		echo "docdir = /usr/share/doc/${P}" >> mk/build.mk
-		echo "htmldir = /usr/share/doc/${P}" >> mk/build.mk
-
-		# We also need to use the GHC_CFLAGS flags when building ghc itself
-		echo "SRC_HC_OPTS+=${GHC_CFLAGS}" >> mk/build.mk
-		echo "SRC_CC_OPTS+=${CFLAGS} -Wa,--noexecstack" >> mk/build.mk
-
-		# The settings that give you the fastest complete GHC build are these:
-		if use ghcquickbuild; then
-			echo "SRC_HC_OPTS     = -H64m -Onot -fasm" >> mk/build.mk
-			echo "GhcStage1HcOpts = -O -fasm" >> mk/build.mk
-			echo "GhcStage2HcOpts = -Onot -fasm" >> mk/build.mk
-			echo "GhcLibHcOpts    = -Onot -fasm" >> mk/build.mk
-			echo "GhcLibWays      =" >> mk/build.mk
-			echo "SplitObjs       = NO" >> mk/build.mk
-		fi
-		# However, note that the libraries are built without optimisation, so
-		# this build isn't very useful. The resulting compiler will be very
-		# slow. On a 4-core x86 machine using MAKEOPTS="-j10", this build was
-		# timed at less than 8 minutes.
-
-		# We can't depend on haddock except when bootstrapping when we
-		# must build docs and include them into the binary .tbz2 package
-		if use ghcbootstrap && use doc; then
-			echo XMLDocWays="html" >> mk/build.mk
-			echo HADDOCK_DOCS=YES >> mk/build.mk
-		else
-			echo XMLDocWays="" >> mk/build.mk
-			echo HADDOCK_DOCS=NO >> mk/build.mk
-		fi
-
-		# circumvent a very strange bug that seems related with ghc producing
-		# too much output while being filtered through tee (e.g. due to
-		# portage logging) reported as bug #111183
-		echo "SRC_HC_OPTS+=-w" >> mk/build.mk
-
-		# GHC build system knows to build unregisterised on alpha and hppa,
-		# but we have to tell it to build unregisterised on some arches
-		if use alpha || use hppa || use ppc64 || use sparc; then
-			echo "GhcUnregisterised=YES" >> mk/build.mk
-			echo "GhcWithInterpreter=NO" >> mk/build.mk
-			echo "GhcWithNativeCodeGen=NO" >> mk/build.mk
-			echo "SplitObjs=NO" >> mk/build.mk
-			echo "GhcRTSWays := debug" >> mk/build.mk
-			echo "GhcNotThreaded=YES" >> mk/build.mk
-		fi
-
-		# Get ghc from the unpacked binary .tbz2
-		# except when bootstrapping we just pick ghc up off the path
-		if ! use ghcbootstrap; then
-			export PATH="${WORKDIR}/usr/bin:${PATH}"
-		fi
-
-		econf || die "econf failed"
-
-		emake all || die "make failed"
-
-	fi # ! use binary
-}
-
-src_install() {
-	if use binary; then
-		mv "${S}/usr" "${D}"
-
-		# Remove the docs if not requested
-		if ! use doc; then
-			rm -rf "${D}/usr/share/doc/${P}/*/" \
-				"${D}/usr/share/doc/${P}/*.html" \
-				|| die "could not remove docs (P vs PF revision mismatch?)"
-		fi
-	else
-		local insttarget="install"
-
-		# We only built docs if we were bootstrapping, otherwise
-		# we copy them out of the unpacked binary .tbz2
-		if use doc; then
-			if use ghcbootstrap; then
-				insttarget="${insttarget} install-docs"
-			else
-				mkdir -p "${D}/usr/share/doc"
-				mv "${WORKDIR}/usr/share/doc/${P}" "${D}/usr/share/doc" \
-					|| die "failed to copy docs"
-			fi
-		fi
-
-		emake -j1 ${insttarget} \
-			DESTDIR="${D}" \
-			|| die "make ${insttarget} failed"
-
-		dodoc "${S}/README" "${S}/ANNOUNCE" "${S}/LICENSE" "${S}/VERSION"
-
-		dosbin "${FILESDIR}/ghc-updater"
-
-		dobashcompletion "${FILESDIR}/ghc-bash-completion"
-
-		cp -p "${D}/usr/$(get_libdir)/${P}/package.conf"{,.shipped} \
-			|| die "failed to copy package.conf"
-	fi
-}
-
-pkg_postinst() {
-	# 'ghc-pkg check' fails in ghc 6.10.2, with the error message:
-	# There are problems in package rts-1.0:
-	#    include-dirs: PAPI_INCLUDE_DIR doesn't exist or isn't a directory
-	# Upstream suggests this solution to fix it:
-	export PATH="/usr/bin:${PATH}"
-	$(ghc-getghcpkg) describe rts | sed 's/PAPI_INCLUDE_DIR//' | $(ghc-getghcpkg) update -
-
-	ghc-reregister
-
-	ewarn "IMPORTANT:"
-	ewarn "If you have upgraded from another version of ghc, please run:"
-	ewarn "      /usr/sbin/ghc-updater"
-	ewarn "to re-merge all ghc-based Haskell libraries."
-
-	bash-completion_pkg_postinst
-}
-
-pkg_prerm() {
-	# Overwrite the (potentially) modified package.conf with a copy of the
-	# original one, so that it will be removed during uninstall.
-
-	PKG="${ROOT}/usr/$(get_libdir)/${P}/package.conf"
-
-	cp -p "${PKG}"{.shipped,}
-
-	[[ -f ${PKG}.old ]] && rm "${PKG}.old"
-}
diff --git a/dev-lang/ghc/metadata.xml b/dev-lang/ghc/metadata.xml
index a09c23af8401..a482746639df 100644
--- a/dev-lang/ghc/metadata.xml
+++ b/dev-lang/ghc/metadata.xml
@@ -8,6 +8,5 @@
 <use>
 <flag name='binary'>Install the binary version directly, rather than using it to build the source version.</flag>
 <flag name='ghcbootstrap'>Internal: Bootstrap GHC from an existing GHC installation.</flag>
-<flag name='ghcmakebinary'>Internal: Used while bootstrapping for making binaries, license related tweaking.</flag>
 </use>
 </pkgmetadata>