12 files changed, 37 insertions, 30 deletions
diff --git a/dev-haskell/cabal/ChangeLog b/dev-haskell/cabal/ChangeLog
index 2dabd1470f4a..14926414acef 100644
--- a/dev-haskell/cabal/ChangeLog
+++ b/dev-haskell/cabal/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-haskell/cabal
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/ChangeLog,v 1.57 2010/06/20 12:51:22 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/ChangeLog,v 1.58 2010/07/01 19:20:29 jer Exp $
+
+  01 Jul 2010; Jeroen Roovers <jer@gentoo.org> cabal-1.1.3-r1.ebuild,
+  cabal-1.1.4.ebuild, cabal-1.1.6.1.ebuild, cabal-1.1.6.2.ebuild,
+  cabal-1.2.3.0.ebuild, cabal-1.6.0.1.ebuild, cabal-1.6.0.2.ebuild,
+  cabal-1.6.0.3.ebuild, cabal-1.8.0.2.ebuild, cabal-1.8.0.6.ebuild,
+  cabal-1.8.0.6-r1.ebuild:
+  Drop support for ghc and darcs.
 
 *cabal-1.8.0.6-r1 (18 Jun 2010)
 
diff --git a/dev-haskell/cabal/cabal-1.1.3-r1.ebuild b/dev-haskell/cabal/cabal-1.1.3-r1.ebuild
index 45efb3ef6671..3c3f6a6c115f 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-2007 Gentoo Foundation
+# Copyright 1999-2010 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.13 2007/12/13 00:42:07 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/cabal-1.1.3-r1.ebuild,v 1.14 2010/07/01 19:20:29 jer Exp $
 
 CABAL_FEATURES="bootstrap lib"
 inherit haskell-cabal eutils base
@@ -11,7 +11,7 @@ SRC_URI="http://haskell.org/cabal/release/rc/${P}.tar.gz"
 LICENSE="as-is"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
 
 IUSE="doc"
 
diff --git a/dev-haskell/cabal/cabal-1.1.4.ebuild b/dev-haskell/cabal/cabal-1.1.4.ebuild
index 28c1fdc640d4..9e7350812057 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-2007 Gentoo Foundation
+# Copyright 1999-2010 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.12 2007/12/13 00:42:07 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/cabal-1.1.4.ebuild,v 1.13 2010/07/01 19:20:29 jer Exp $
 
 CABAL_FEATURES="bootstrap profile lib"
 inherit haskell-cabal eutils base
@@ -11,7 +11,7 @@ SRC_URI="http://haskell.org/cabal/release/${P}/${P}.tar.gz"
 LICENSE="as-is"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 
 IUSE="doc"
 
diff --git a/dev-haskell/cabal/cabal-1.1.6.1.ebuild b/dev-haskell/cabal/cabal-1.1.6.1.ebuild
index 0455a16e1efe..9e9782ac78c7 100644
--- a/dev-haskell/cabal/cabal-1.1.6.1.ebuild
+++ b/dev-haskell/cabal/cabal-1.1.6.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/cabal-1.1.6.1.ebuild,v 1.6 2008/07/15 05:43:51 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/cabal-1.1.6.1.ebuild,v 1.7 2010/07/01 19:20:29 jer Exp $
 
 CABAL_FEATURES="bootstrap profile lib"
 inherit haskell-cabal eutils
@@ -11,7 +11,7 @@ SRC_URI="http://haskell.org/cabal/release/${P}/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="doc"
 
 DEPEND=">=dev-lang/ghc-6.2"
diff --git a/dev-haskell/cabal/cabal-1.1.6.2.ebuild b/dev-haskell/cabal/cabal-1.1.6.2.ebuild
index 34c9049201a0..0b7afac28eef 100644
--- a/dev-haskell/cabal/cabal-1.1.6.2.ebuild
+++ b/dev-haskell/cabal/cabal-1.1.6.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/cabal-1.1.6.2.ebuild,v 1.12 2008/07/15 05:43:51 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/cabal-1.1.6.2.ebuild,v 1.13 2010/07/01 19:20:29 jer Exp $
 
 CABAL_FEATURES="bootstrap profile lib"
 inherit haskell-cabal eutils
@@ -11,7 +11,7 @@ SRC_URI="http://haskell.org/cabal/release/${P}/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="doc"
 
 RESTRICT="test"
diff --git a/dev-haskell/cabal/cabal-1.2.3.0.ebuild b/dev-haskell/cabal/cabal-1.2.3.0.ebuild
index 4a7c308a7ce5..fe869eba0fac 100644
--- a/dev-haskell/cabal/cabal-1.2.3.0.ebuild
+++ b/dev-haskell/cabal/cabal-1.2.3.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/cabal-1.2.3.0.ebuild,v 1.8 2008/10/18 18:01:34 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/cabal-1.2.3.0.ebuild,v 1.9 2010/07/01 19:20:29 jer Exp $
 
 CABAL_FEATURES="bootstrap profile lib"
 inherit base haskell-cabal
@@ -18,7 +18,7 @@ SRC_URI="http://haskell.org/cabal/release/${P}/${P}.tar.gz
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 ia64 ppc ~ppc64 sparc x86"
 IUSE="doc"
 
 RESTRICT="test"
diff --git a/dev-haskell/cabal/cabal-1.6.0.1.ebuild b/dev-haskell/cabal/cabal-1.6.0.1.ebuild
index 04a3ff20cd0a..0fba2d8a61ea 100644
--- a/dev-haskell/cabal/cabal-1.6.0.1.ebuild
+++ b/dev-haskell/cabal/cabal-1.6.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/cabal-1.6.0.1.ebuild,v 1.3 2009/03/08 19:26:34 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/cabal-1.6.0.1.ebuild,v 1.4 2010/07/01 19:20:29 jer Exp $
 
 CABAL_FEATURES="bootstrap lib profile"
 inherit haskell-cabal eutils
@@ -21,7 +21,7 @@ SRC_URI="http://hackage.haskell.org/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc"
 
 DEPEND=">=dev-lang/ghc-6.4"
diff --git a/dev-haskell/cabal/cabal-1.6.0.2.ebuild b/dev-haskell/cabal/cabal-1.6.0.2.ebuild
index 7251998a56ef..928cbd8a7b18 100644
--- a/dev-haskell/cabal/cabal-1.6.0.2.ebuild
+++ b/dev-haskell/cabal/cabal-1.6.0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/cabal-1.6.0.2.ebuild,v 1.2 2009/03/09 04:21:20 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/cabal-1.6.0.2.ebuild,v 1.3 2010/07/01 19:20:29 jer Exp $
 
 CABAL_FEATURES="bootstrap lib profile"
 inherit haskell-cabal eutils
@@ -21,7 +21,7 @@ SRC_URI="http://hackage.haskell.org/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc"
 
 DEPEND=">=dev-lang/ghc-6.4"
diff --git a/dev-haskell/cabal/cabal-1.6.0.3.ebuild b/dev-haskell/cabal/cabal-1.6.0.3.ebuild
index 1be32b37be98..92db3ba52b51 100644
--- a/dev-haskell/cabal/cabal-1.6.0.3.ebuild
+++ b/dev-haskell/cabal/cabal-1.6.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/cabal-1.6.0.3.ebuild,v 1.9 2010/06/01 13:09:01 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/cabal-1.6.0.3.ebuild,v 1.10 2010/07/01 19:20:29 jer Exp $
 
 CABAL_FEATURES="bootstrap lib profile"
 inherit haskell-cabal eutils
@@ -21,7 +21,7 @@ SRC_URI="http://hackage.haskell.org/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="doc"
 
 DEPEND=">=dev-lang/ghc-6.4"
diff --git a/dev-haskell/cabal/cabal-1.8.0.2.ebuild b/dev-haskell/cabal/cabal-1.8.0.2.ebuild
index 1ae022d69a81..fe2ad5e7d63a 100644
--- a/dev-haskell/cabal/cabal-1.8.0.2.ebuild
+++ b/dev-haskell/cabal/cabal-1.8.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/cabal-1.8.0.2.ebuild,v 1.1 2010/01/26 20:22:33 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/cabal-1.8.0.2.ebuild,v 1.2 2010/07/01 19:20:29 jer Exp $
 
 CABAL_FEATURES="bootstrap lib profile"
 inherit haskell-cabal eutils
@@ -14,7 +14,7 @@ SRC_URI="http://hackage.haskell.org/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="doc"
 
 # Cabal.cabal only depends on base>=1&&<5 and filepath>=1&&<1.2
diff --git a/dev-haskell/cabal/cabal-1.8.0.6-r1.ebuild b/dev-haskell/cabal/cabal-1.8.0.6-r1.ebuild
index 1314450f1809..2658a9389f27 100644
--- a/dev-haskell/cabal/cabal-1.8.0.6-r1.ebuild
+++ b/dev-haskell/cabal/cabal-1.8.0.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/cabal-1.8.0.6-r1.ebuild,v 1.1 2010/06/20 12:51:22 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/cabal-1.8.0.6-r1.ebuild,v 1.2 2010/07/01 19:20:29 jer Exp $
 
 CABAL_FEATURES="bootstrap lib profile"
 inherit haskell-cabal eutils
@@ -14,7 +14,7 @@ SRC_URI="http://hackage.haskell.org/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="doc"
 
 # Cabal.cabal only depends on base>=1&&<5 and filepath>=1&&<1.2
diff --git a/dev-haskell/cabal/cabal-1.8.0.6.ebuild b/dev-haskell/cabal/cabal-1.8.0.6.ebuild
index e9af88f53fbc..f2bbc3197e19 100644
--- a/dev-haskell/cabal/cabal-1.8.0.6.ebuild
+++ b/dev-haskell/cabal/cabal-1.8.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/cabal-1.8.0.6.ebuild,v 1.1 2010/06/15 21:16:41 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/cabal-1.8.0.6.ebuild,v 1.2 2010/07/01 19:20:29 jer Exp $
 
 CABAL_FEATURES="bootstrap lib profile"
 inherit haskell-cabal eutils
@@ -14,7 +14,7 @@ SRC_URI="http://hackage.haskell.org/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="doc"
 
 # Cabal.cabal only depends on base>=1&&<5 and filepath>=1&&<1.2