Version bump: ghc-7.8 support.

(Portage version: 2.2.10_p40/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)

5 files changed, 13 insertions, 164 deletions

diff --git a/app-admin/haskell-updater/ChangeLog b/app-admin/haskell-updater/ChangeLog
index 07507dd32863..7a98d0689754 100644
--- a/app-admin/haskell-updater/ChangeLog
+++ b/app-admin/haskell-updater/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/haskell-updater
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/haskell-updater/ChangeLog,v 1.72 2014/05/17 13:58:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/haskell-updater/ChangeLog,v 1.73 2014/08/01 13:46:54 slyfox Exp $
+
+*haskell-updater-1.2.3 (01 Aug 2014)
+
+  01 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org>
+  +haskell-updater-1.2.3.ebuild, -haskell-updater-1.2.0.10-r1.ebuild,
+  -haskell-updater-1.2.0.11.ebuild, -haskell-updater-1.2.0.12.ebuild,
+  -haskell-updater-1.2.0.9.ebuild:
+  Version bump: ghc-7.8 support.
 
   17 May 2014; Agostino Sarubbo <ago@gentoo.org> haskell-updater-1.2.1.ebuild:
   Stable for alpha, wrt bug #502602
diff --git a/app-admin/haskell-updater/haskell-updater-1.2.0.10-r1.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.0.10-r1.ebuild
deleted file mode 100644
index a9d689c52e64..000000000000
--- a/app-admin/haskell-updater/haskell-updater-1.2.0.10-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/haskell-updater/haskell-updater-1.2.0.10-r1.ebuild,v 1.1 2013/09/03 20:09:18 slyfox Exp $
-
-EAPI=5
-
-CABAL_FEATURES="bin nocabaldep"
-inherit eutils haskell-cabal
-
-DESCRIPTION="Rebuild Haskell dependencies in Gentoo"
-HOMEPAGE="http://haskell.org/haskellwiki/Gentoo#haskell-updater"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=dev-lang/ghc-6.12.1"
-
-# Need a lower version for portage to get --keep-going
-RDEPEND="|| ( >=sys-apps/portage-2.1.6
-			  sys-apps/pkgcore
-			  sys-apps/paludis )"
-
-src_prepare() {
-	if use prefix; then
-		sed -i -e "s,/var/db/pkg,${EPREFIX}&,g" \
-			"${S}/Distribution/Gentoo/Packages.hs" || die
-
-		sed -i -e 's,"/","'"${EPREFIX}"'/",g' \
-			"${S}/Distribution/Gentoo/GHC.hs" || die
-	fi
-
-	# for ghc snapshots (usually come with unstable Cabal API)
-	cabal_chdeps \
-		'Cabal >= 1.8 && < 1.17' 'Cabal >= 1.8 && < 1.18' \
-		'process    < 1.2' 'process    < 1.3'
-}
-
-src_configure() {
-	cabal_src_configure \
-		--bindir="${EPREFIX}/usr/sbin" \
-		--constraint="Cabal == $(cabal-version)"
-}
-
-src_install() {
-	cabal_src_install
-
-	dodoc TODO
-}
diff --git a/app-admin/haskell-updater/haskell-updater-1.2.0.11.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.0.11.ebuild
deleted file mode 100644
index 2f725e61222f..000000000000
--- a/app-admin/haskell-updater/haskell-updater-1.2.0.11.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/haskell-updater/haskell-updater-1.2.0.11.ebuild,v 1.1 2013/11/14 09:55:09 slyfox Exp $
-
-EAPI=5
-
-CABAL_FEATURES="bin nocabaldep"
-inherit eutils haskell-cabal
-
-DESCRIPTION="Rebuild Haskell dependencies in Gentoo"
-HOMEPAGE="http://haskell.org/haskellwiki/Gentoo#haskell-updater"
-#SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-SRC_URI="http://code.haskell.org/~slyfox/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=dev-lang/ghc-6.12.1"
-
-# Need a lower version for portage to get --keep-going
-RDEPEND="|| ( >=sys-apps/portage-2.1.6
-			  sys-apps/pkgcore
-			  sys-apps/paludis )"
-
-src_prepare() {
-	if use prefix; then
-		sed -i -e "s,/var/db/pkg,${EPREFIX}&,g" \
-			"${S}/Distribution/Gentoo/Packages.hs" || die
-
-		sed -i -e 's,"/","'"${EPREFIX}"'/",g' \
-			"${S}/Distribution/Gentoo/GHC.hs" || die
-	fi
-
-	# for ghc snapshots (usually come with unstable Cabal API)
-	cabal_chdeps \
-		'Cabal >= 1.8 && < 1.19' 'Cabal >= 1.8 && < 1.20' \
-		'process    < 1.2' 'process    < 1.3'
-}
-
-src_configure() {
-	cabal_src_configure \
-		--bindir="${EPREFIX}/usr/sbin" \
-		--constraint="Cabal == $(cabal-version)"
-}
-
-src_install() {
-	cabal_src_install
-
-	dodoc TODO
-}
diff --git a/app-admin/haskell-updater/haskell-updater-1.2.0.9.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.0.9.ebuild
deleted file mode 100644
index 971853c71812..000000000000
--- a/app-admin/haskell-updater/haskell-updater-1.2.0.9.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/haskell-updater/haskell-updater-1.2.0.9.ebuild,v 1.10 2013/07/25 15:57:07 slyfox Exp $
-
-EAPI=4
-
-CABAL_FEATURES="bin nocabaldep"
-inherit eutils haskell-cabal
-
-DESCRIPTION="Rebuild Haskell dependencies in Gentoo"
-HOMEPAGE="http://haskell.org/haskellwiki/Gentoo#haskell-updater"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=dev-lang/ghc-6.12.1"
-
-# Need a lower version for portage to get --keep-going
-RDEPEND="|| ( >=sys-apps/portage-2.1.6
-			  sys-apps/pkgcore
-			  sys-apps/paludis )"
-
-src_prepare() {
-	if use prefix; then
-		sed -i -e "s,/var/db/pkg,${EPREFIX}&,g" \
-			"${S}/Distribution/Gentoo/Packages.hs" || die
-
-		sed -i -e 's,"/","'"${EPREFIX}"'/",g' \
-			"${S}/Distribution/Gentoo/GHC.hs" || die
-	fi
-
-	# for ghc snapshots (usually come with unstable Cabal API)
-	cabal_chdeps \
-		'Cabal >= 1.8 && < 1.17' 'Cabal >= 1.8 && < 1.18' \
-		'process    < 1.2' 'process    < 1.3'
-}
-
-src_configure() {
-	cabal_src_configure \
-		--bindir="${EPREFIX}/usr/sbin" \
-		--constraint="Cabal == $(cabal-version)"
-}
-
-src_install() {
-	cabal_src_install
-
-	dodoc TODO
-}
diff --git a/app-admin/haskell-updater/haskell-updater-1.2.0.12.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.3.ebuild
index e1b2ab609b5b..b07b295c0783 100644
--- a/app-admin/haskell-updater/haskell-updater-1.2.0.12.ebuild
+++ b/app-admin/haskell-updater/haskell-updater-1.2.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/haskell-updater/haskell-updater-1.2.0.12.ebuild,v 1.1 2013/12/22 18:50:08 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/haskell-updater/haskell-updater-1.2.3.ebuild,v 1.1 2014/08/01 13:46:54 slyfox Exp $
 
 EAPI=5
 
@@ -20,8 +20,8 @@ DEPEND=">=dev-lang/ghc-6.12.1"
 
 # Need a lower version for portage to get --keep-going
 RDEPEND="|| ( >=sys-apps/portage-2.1.6
-			  sys-apps/pkgcore
-			  sys-apps/paludis )"
+		sys-apps/pkgcore
+		sys-apps/paludis )"
 
 src_prepare() {
 	if use prefix; then
@@ -31,11 +31,6 @@ src_prepare() {
 		sed -i -e 's,"/","'"${EPREFIX}"'/",g' \
 			"${S}/Distribution/Gentoo/GHC.hs" || die
 	fi
-
-	# for ghc snapshots (usually come with unstable Cabal API)
-	cabal_chdeps \
-		'Cabal >= 1.8 && < 1.19' 'Cabal >= 1.8 && < 1.20' \
-		'process    < 1.2' 'process    < 1.3'
 }
 
 src_configure() {