Fix cabal deps so that you actually can install the packages once ghc-6.6 gets stable.

Package-Manager: portage-2.1.2.3

4 files changed, 28 insertions, 24 deletions

diff --git a/dev-haskell/cabal/ChangeLog b/dev-haskell/cabal/ChangeLog
index b9a7cedfb014..21d1f84e582f 100644
--- a/dev-haskell/cabal/ChangeLog
+++ b/dev-haskell/cabal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-haskell/cabal
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/ChangeLog,v 1.25 2007/03/07 17:55:10 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/ChangeLog,v 1.26 2007/04/29 18:02:20 kolmodin Exp $
+
+  29 Apr 2007; Lennart Kolmodin <kolmodin@gentoo.org> cabal-1.1.3-r1.ebuild,
+  cabal-1.1.4.ebuild:
+  Change evil (borked) deps so that the packages actually can be installed.
 
 *cabal-1.1.6.1 (07 Mar 2007)
 
diff --git a/dev-haskell/cabal/Manifest b/dev-haskell/cabal/Manifest
index b08091bc08b5..57d7131b2e7a 100644
--- a/dev-haskell/cabal/Manifest
+++ b/dev-haskell/cabal/Manifest
@@ -12,22 +12,22 @@ SHA256 cee8833ac195f6da00bcdfdac0afe1805b44a4568b8f202f6e5f1cf591618d84 files/ca
 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
 DIST cabal-1.1.6.1.tar.gz 440851 RMD160 82e85e57f2747f7b38f68e6d11883252e83838e8 SHA1 7a0d052a2d3d7c56fb728798f9bc1c1063ba6010 SHA256 b59ce863c31bee561ca5d5ab2aa996856f8fc1b6297848868fc4f635d716b04e
-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
+EBUILD cabal-1.1.3-r1.ebuild 2147 RMD160 3b101883bf366e7e44c183813976c7c8e866d996 SHA1 60088d38c8914ed001c4d060d89a45bf52ebec94 SHA256 2eb069512f67c336afac74655666b1c27bc5bc9ee0dda16fbcc909325c590c40
+MD5 f35c308b32098c631ced34d012e7eb76 cabal-1.1.3-r1.ebuild 2147
+RMD160 3b101883bf366e7e44c183813976c7c8e866d996 cabal-1.1.3-r1.ebuild 2147
+SHA256 2eb069512f67c336afac74655666b1c27bc5bc9ee0dda16fbcc909325c590c40 cabal-1.1.3-r1.ebuild 2147
+EBUILD cabal-1.1.4.ebuild 1393 RMD160 45b868fab3f81003bf87d528fa5b615597a8c67e SHA1 e14fa800363a9c9b2b89602fe4dbfe2df5e0e4b8 SHA256 17597acae47afb763a7b16907791416b207dc9d24a101077cd221d9e2038822f
+MD5 2223f5637d1470f38501f152a70b4740 cabal-1.1.4.ebuild 1393
+RMD160 45b868fab3f81003bf87d528fa5b615597a8c67e cabal-1.1.4.ebuild 1393
+SHA256 17597acae47afb763a7b16907791416b207dc9d24a101077cd221d9e2038822f cabal-1.1.4.ebuild 1393
 EBUILD cabal-1.1.6.1.ebuild 1168 RMD160 edb4a57809d2248d65b79c9a8badbd216126f78f SHA1 baac71ccaf5a55b127ed20f26a5aadd93d8ecf04 SHA256 3df4009bff34679138bb13163556527bf173ee45f6177a9ff122a0c087ccd4c3
 MD5 cea26347aeaf15ba84243ee6dee6b535 cabal-1.1.6.1.ebuild 1168
 RMD160 edb4a57809d2248d65b79c9a8badbd216126f78f cabal-1.1.6.1.ebuild 1168
 SHA256 3df4009bff34679138bb13163556527bf173ee45f6177a9ff122a0c087ccd4c3 cabal-1.1.6.1.ebuild 1168
-MISC ChangeLog 3232 RMD160 8b54209187649bbb5d2131e957c4b26bf0b18d4f SHA1 80ae537180bfb61e5bfffcf677c7947fe7b5401d SHA256 a8762440c801b2e4aa311d2318e083d46774beb2fb03d98e6fdb7c7cad3b2533
-MD5 faf313b3f15805b8189032c7140a6008 ChangeLog 3232
-RMD160 8b54209187649bbb5d2131e957c4b26bf0b18d4f ChangeLog 3232
-SHA256 a8762440c801b2e4aa311d2318e083d46774beb2fb03d98e6fdb7c7cad3b2533 ChangeLog 3232
+MISC ChangeLog 3408 RMD160 1fa2c285d862bf1f4997419360efaa9612b1f494 SHA1 a4441b3d6570e6cc51d3f3948be0ce9f4a43a299 SHA256 5e7f0a1d3569fdee1f6f60271edbc0f7ec252dfd4c066cb9b21a09d68496bd12
+MD5 f991af10d0824dd229f28da3c7c283f7 ChangeLog 3408
+RMD160 1fa2c285d862bf1f4997419360efaa9612b1f494 ChangeLog 3408
+SHA256 5e7f0a1d3569fdee1f6f60271edbc0f7ec252dfd4c066cb9b21a09d68496bd12 ChangeLog 3408
 MISC metadata.xml 231 RMD160 8b37a8901d230433c69ffa03eeed903bca89249b SHA1 b77d396c72fd66ec7c09ae8de996a5ba50d9e482 SHA256 b1bacb51e08eb7f067d6a30020b5c45e4f4e48b5ec4640402ecaa34b78e2ae34
 MD5 36536d30381275b652c4a0b5590cf628 metadata.xml 231
 RMD160 8b37a8901d230433c69ffa03eeed903bca89249b metadata.xml 231
@@ -44,7 +44,7 @@ SHA256 b0ba450d8fbef52fc24c21f96171e0e9699e59600ecae98fc7082e0ab7b6994e files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFF7vyJ1n/CYbXjntIRAjMKAJoDH0mTpM1YpkuYmBjweG2DWlbLugCfeIwe
-x3lh94a5vrer+vvnHi7c77s=
-=J83G
+iD8DBQFGNN281n/CYbXjntIRAq7FAJ4kGZVvrjH0mEBqAX/pHB3vx3VESACfSZjp
+t9QTBH78b4S8kFaLn8tcX64=
+=+0mt
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/cabal/cabal-1.1.3-r1.ebuild b/dev-haskell/cabal/cabal-1.1.3-r1.ebuild
index 325d23ae1ce0..2e81281d86cb 100644
--- a/dev-haskell/cabal/cabal-1.1.3-r1.ebuild
+++ b/dev-haskell/cabal/cabal-1.1.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 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-r1.ebuild,v 1.9 2006/10/12 19:06:05 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/cabal-1.1.3-r1.ebuild,v 1.10 2007/04/29 18:02:20 kolmodin Exp $
 
 CABAL_FEATURES="bootstrap lib"
 inherit haskell-cabal eutils base
@@ -15,8 +15,8 @@ KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
 
 IUSE="doc"
 
-DEPEND=">=virtual/ghc-6.2
-		!>=virtual/ghc-6.6"
+DEPEND="<virtual/ghc-6.6
+	!>=virtual/ghc-6.6"
 
 MY_PV="${PV/_pre*/}"
 S="${WORKDIR}/${PN}"
diff --git a/dev-haskell/cabal/cabal-1.1.4.ebuild b/dev-haskell/cabal/cabal-1.1.4.ebuild
index 1344476b5a3a..857dc1b1409d 100644
--- a/dev-haskell/cabal/cabal-1.1.4.ebuild
+++ b/dev-haskell/cabal/cabal-1.1.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/cabal-1.1.4.ebuild,v 1.8 2006/10/12 19:06:05 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/cabal-1.1.4.ebuild,v 1.9 2007/04/29 18:02:20 kolmodin Exp $
 
 CABAL_FEATURES="bootstrap profile lib"
 inherit haskell-cabal eutils base
@@ -15,8 +15,8 @@ KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 
 IUSE="doc"
 
-DEPEND=">=virtual/ghc-6.2
-		!>=virtual/ghc-6.6"
+DEPEND="<virtual/ghc-6.6
+	!>=virtual/ghc-6.6"
 
 src_unpack() {
 	unpack ${A}