Restore RDEPENDs and prefix support.

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

3 files changed, 58 insertions, 26 deletions

diff --git a/app-admin/haskell-updater/ChangeLog b/app-admin/haskell-updater/ChangeLog
index 1fcd44123442..a470c98cfb35 100644
--- a/app-admin/haskell-updater/ChangeLog
+++ b/app-admin/haskell-updater/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/haskell-updater
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/haskell-updater/ChangeLog,v 1.60 2013/09/03 10:04:50 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/haskell-updater/ChangeLog,v 1.61 2013/09/03 20:09:18 slyfox Exp $
+
+*haskell-updater-1.2.0.10-r1 (03 Sep 2013)
+
+  03 Sep 2013; Sergei Trofimovich <slyfox@gentoo.org>
+  +haskell-updater-1.2.0.10-r1.ebuild, -haskell-updater-1.2.0.10.ebuild:
+  Restore RDEPENDs and prefix support.
 
 *haskell-updater-1.2.0.10 (03 Sep 2013)
 
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
new file mode 100644
index 000000000000..a9d689c52e64
--- /dev/null
+++ b/app-admin/haskell-updater/haskell-updater-1.2.0.10-r1.ebuild
@@ -0,0 +1,51 @@
+# 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.10.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.0.10.ebuild
deleted file mode 100644
index de8b7c7d58ed..000000000000
--- a/app-admin/haskell-updater/haskell-updater-1.2.0.10.ebuild
+++ /dev/null
@@ -1,25 +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.ebuild,v 1.1 2013/09/03 10:04:50 qnikst Exp $
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="bin"
-inherit 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=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8 <dev-haskell/cabal-1.17
-	>=dev-lang/ghc-6.10.4
-"