Remove old revision and make current ones block on ghc-6.6

(Portage version: 2.1.1-r1)
 (Signed Manifest commit)

3 files changed, 22 insertions, 92 deletions

diff --git a/dev-haskell/cabal/Manifest b/dev-haskell/cabal/Manifest
index 04e36d4fa1de..1454cdeeb763 100644
--- a/dev-haskell/cabal/Manifest
+++ b/dev-haskell/cabal/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX cabal-1.1.3-ghc622.patch 678 RMD160 ed7decfd967a12476ad83892015767a37c5ce5ae SHA1 138db22abd979e08f4ff02060a30bc63d575a257 SHA256 d3524545844724687cf3377708d8cc381c06dbe71e618af884bac86361ea5479
 MD5 2e6b8d49e5fcb76309d8d67b08c53039 files/cabal-1.1.3-ghc622.patch 678
 RMD160 ed7decfd967a12476ad83892015767a37c5ce5ae files/cabal-1.1.3-ghc622.patch 678
@@ -8,32 +11,32 @@ RMD160 390e17aab566eadb0acda9777b6e2d36cc3bcef5 files/cabal-1.1.4-make.patch 197
 SHA256 cee8833ac195f6da00bcdfdac0afe1805b44a4568b8f202f6e5f1cf591618d84 files/cabal-1.1.4-make.patch 1972
 DIST cabal-1.1.3.tar.gz 382024 RMD160 e361b676184d2f553cf5761c544ac4c32eefcb69 SHA1 e86f41403ea2d02b5d409195647ff97dec7557da SHA256 5c45f0c5f58ba2c16140b72221798a604242f59a155a75111b4cfd31092f836c
 DIST cabal-1.1.4.tar.gz 406169 RMD160 0c2b1a33af4512174cc6df6645662046427e9135 SHA1 e1091bd40d40f85b6836a17417f1a907fec20bad SHA256 1740abf0db8a6d18703e315a30ff81c51a06ec4a5f3a6c1927fa1530a0835b66
-EBUILD cabal-1.1.3-r1.ebuild 2126 RMD160 08fafa763deb6e8b48aea4f039a80bc1031ff6db SHA1 88cf04970c52d047333b2699a03a611380685401 SHA256 6ffc183b0cc2a4746ebe8323ba1d643e4df69ce7e0cdf167b0fcf63e075991ce
-MD5 1d54ed7ee44634702da3ef3beb084d0c cabal-1.1.3-r1.ebuild 2126
-RMD160 08fafa763deb6e8b48aea4f039a80bc1031ff6db cabal-1.1.3-r1.ebuild 2126
-SHA256 6ffc183b0cc2a4746ebe8323ba1d643e4df69ce7e0cdf167b0fcf63e075991ce cabal-1.1.3-r1.ebuild 2126
-EBUILD cabal-1.1.3.ebuild 1941 RMD160 cc6f2fab93325e300c85a703e0806ab9504793b6 SHA1 00b03955c13846a7f218a1ea1809bd881d74eb2e SHA256 96b131c14851b0959e706109b64a4f310b8bd5c566e40911e573c0c3bc34be3e
-MD5 6ebe79534e69fa74ebcb67629b65195a cabal-1.1.3.ebuild 1941
-RMD160 cc6f2fab93325e300c85a703e0806ab9504793b6 cabal-1.1.3.ebuild 1941
-SHA256 96b131c14851b0959e706109b64a4f310b8bd5c566e40911e573c0c3bc34be3e cabal-1.1.3.ebuild 1941
-EBUILD cabal-1.1.4.ebuild 1369 RMD160 840433870d069736f41de310c92929590a991322 SHA1 e2cf6492b81e0019f2940ee00a9ce905637d88b7 SHA256 9ed3eeab553630eeb14cf62d1e89d055e19cee573f101b0ccb4ac46316573c1f
-MD5 4a8ea9133837532f56460b5f9623b262 cabal-1.1.4.ebuild 1369
-RMD160 840433870d069736f41de310c92929590a991322 cabal-1.1.4.ebuild 1369
-SHA256 9ed3eeab553630eeb14cf62d1e89d055e19cee573f101b0ccb4ac46316573c1f cabal-1.1.4.ebuild 1369
-MISC ChangeLog 2853 RMD160 feb73f1b30146857ed4edf38d245c594479edfb8 SHA1 afd5234b448fe80f83b058a9c6408992f67a1ca7 SHA256 e6edd058e1096bc5c2f088e01ebe668ea89f4011a54883016fba79f979a1320a
-MD5 c369c890a0872ac701a8d18321ed380e ChangeLog 2853
-RMD160 feb73f1b30146857ed4edf38d245c594479edfb8 ChangeLog 2853
-SHA256 e6edd058e1096bc5c2f088e01ebe668ea89f4011a54883016fba79f979a1320a ChangeLog 2853
+EBUILD cabal-1.1.3-r1.ebuild 2147 RMD160 0843fd598c540cc184448b30c8ffc63c8519631d SHA1 26f69f18436f7858b7b9a1adf8743a77638fa12b SHA256 21f14b4aa8346d9d41f2298de931b54fee958589d8fb39c4fcb622cce3e949ca
+MD5 06fb67baca08f76bddbb1f364f5e70ed cabal-1.1.3-r1.ebuild 2147
+RMD160 0843fd598c540cc184448b30c8ffc63c8519631d cabal-1.1.3-r1.ebuild 2147
+SHA256 21f14b4aa8346d9d41f2298de931b54fee958589d8fb39c4fcb622cce3e949ca cabal-1.1.3-r1.ebuild 2147
+EBUILD cabal-1.1.4.ebuild 1394 RMD160 dcde18664cf0b2293b3814c68c35b426cdd664d2 SHA1 d694c4c72ddecc2a1718a01fc67f7fdf7f4cfce4 SHA256 2310d968c0f93ce7ac23d74413c5c3893221f57bafc27c62090b657b7e9e418d
+MD5 d2839c642ffc9f41dbcc2d8d2b28ccaf cabal-1.1.4.ebuild 1394
+RMD160 dcde18664cf0b2293b3814c68c35b426cdd664d2 cabal-1.1.4.ebuild 1394
+SHA256 2310d968c0f93ce7ac23d74413c5c3893221f57bafc27c62090b657b7e9e418d cabal-1.1.4.ebuild 1394
+MISC ChangeLog 3085 RMD160 ee8d4fb9aa5d53ecc93d7db3243c43754a40e2d8 SHA1 a445b7df9918e08b5eef76b33fe49b23be62c351 SHA256 85b7891b02830d552eaf4f03783e8085b0a36d02cf9bfe7be7e4ecd89603bd6d
+MD5 08f5783c4868c864bcb75709ebbfe319 ChangeLog 3085
+RMD160 ee8d4fb9aa5d53ecc93d7db3243c43754a40e2d8 ChangeLog 3085
+SHA256 85b7891b02830d552eaf4f03783e8085b0a36d02cf9bfe7be7e4ecd89603bd6d ChangeLog 3085
 MISC metadata.xml 231 RMD160 8b37a8901d230433c69ffa03eeed903bca89249b SHA1 b77d396c72fd66ec7c09ae8de996a5ba50d9e482 SHA256 b1bacb51e08eb7f067d6a30020b5c45e4f4e48b5ec4640402ecaa34b78e2ae34
 MD5 36536d30381275b652c4a0b5590cf628 metadata.xml 231
 RMD160 8b37a8901d230433c69ffa03eeed903bca89249b metadata.xml 231
 SHA256 b1bacb51e08eb7f067d6a30020b5c45e4f4e48b5ec4640402ecaa34b78e2ae34 metadata.xml 231
-MD5 1f8a58f0553f1d82dccd9d3f242faa3e files/digest-cabal-1.1.3 235
-RMD160 8544999d6a0a11b5dfdc338852250e3aaef6c80a files/digest-cabal-1.1.3 235
-SHA256 70df1f4fffe6febc4a1312823fe2961feeedcc65f2835147a545583cd79840ab files/digest-cabal-1.1.3 235
 MD5 1f8a58f0553f1d82dccd9d3f242faa3e files/digest-cabal-1.1.3-r1 235
 RMD160 8544999d6a0a11b5dfdc338852250e3aaef6c80a files/digest-cabal-1.1.3-r1 235
 SHA256 70df1f4fffe6febc4a1312823fe2961feeedcc65f2835147a545583cd79840ab files/digest-cabal-1.1.3-r1 235
 MD5 aada010179ae8865c61e0e14b969678e files/digest-cabal-1.1.4 235
 RMD160 32b736425341278f9af33a5de591fa56df86f751 files/digest-cabal-1.1.4 235
 SHA256 ca9a0feaf46da7cd7c8835e62188b2bb9cb641b54c1bda41579d85a17c680717 files/digest-cabal-1.1.4 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFLpHSnUVyUObPUL4RAvVlAKCIYJ8SU0p3vP2yTwj9mmFHtMqItQCgkR6W
+//zPFD5RwpHZJspL/9PbrY0=
+=9FVd
+-----END PGP SIGNATURE-----
diff --git a/dev-haskell/cabal/cabal-1.1.3.ebuild b/dev-haskell/cabal/cabal-1.1.3.ebuild
deleted file mode 100644
index 8d21298fafe0..000000000000
--- a/dev-haskell/cabal/cabal-1.1.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/cabal-1.1.3.ebuild,v 1.6 2006/03/01 16:12:34 corsair Exp $
-
-CABAL_FEATURES="bootstrap lib"
-inherit haskell-cabal eutils base
-
-DESCRIPTION="Haskell Common Architecture for Building Applications and Libraries"
-HOMEPAGE="http://haskell.org/cabal"
-SRC_URI="http://haskell.org/cabal/release/rc/${P}.tar.gz"
-LICENSE="as-is"
-SLOT="0"
-
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="doc"
-
-DEPEND=">=virtual/ghc-6.2"
-
-MY_PV="${PV/_pre*/}"
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	base_src_unpack
-
-	# Grrr, Cabal build-depends on the util package which is one of the old
-	# hslibs packages. Exposing util breaks lots of things. Fortunately cabal
-	# doesn't actually use anything fro util so we can remove it. A patch has
-	# been sent upstream so remove this hack on the next cabal iteration.
-	# Update: Seems that solving this upstream causes problems on Windows, so
-	# this hack will remain for now.
-	if $(ghc-cabal); then
-		sed -i 's/Build-Depends: base, util/Build-Depends: base/' ${S}/Cabal.cabal
-	else
-		sed -i 's/Build-Depends: base, util/Build-Depends: base, unix/' ${S}/Cabal.cabal
-	fi
-}
-
-src_compile() {
-	if ghc-cabal; then
-		make setup HC="$(ghc-getghc) -ignore-package Cabal"
-	else
-		make setup HC="$(ghc-getghc)"
-	fi
-	cabal-configure
-	cabal-build
-}
-
-src_install() {
-	cabal_src_install
-
-	# documentation (install directly; generation seems broken to me atm)
-	dohtml -r doc/users-guide
-	if use doc; then
-		dohtml -r doc/API
-		dohtml -r doc/pkg-spec-html
-		dodoc doc/pkg-spec.pdf
-	fi
-	dodoc changelog copyright README releaseNotes TODO
-}
-
-pkg_postinst () {
-	if ghc-cabal && ghc-package-exists "Cabal-1.0"; then
-	        ebegin "Unregistering ghc's built-in cabal "
-	        $(ghc-getghcpkg) unregister "Cabal-1.0" > /dev/null
-	        eend $?
-	fi
-	ghc-package_pkg_postinst
-}
-
diff --git a/dev-haskell/cabal/files/digest-cabal-1.1.3 b/dev-haskell/cabal/files/digest-cabal-1.1.3
deleted file mode 100644
index b32826824fc8..000000000000
--- a/dev-haskell/cabal/files/digest-cabal-1.1.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9cf10b6067a7cedf0559bf4a3dabef3c cabal-1.1.3.tar.gz 382024
-RMD160 e361b676184d2f553cf5761c544ac4c32eefcb69 cabal-1.1.3.tar.gz 382024
-SHA256 5c45f0c5f58ba2c16140b72221798a604242f59a155a75111b4cfd31092f836c cabal-1.1.3.tar.gz 382024