Restore RDEPENDs and prefix support.

Package-Manager: portage-2.2.0_alpha194_p2/cvs/Linux x86_64
Manifest-Sign-Key: 0x611FF3AA

4 files changed, 64 insertions, 38 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/Manifest b/app-admin/haskell-updater/Manifest
index d49a7d4ab549..80c185434a9e 100644
--- a/app-admin/haskell-updater/Manifest
+++ b/app-admin/haskell-updater/Manifest
@@ -3,20 +3,14 @@ Hash: SHA256
 
 DIST haskell-updater-1.2.0.10.tar.gz 23893 SHA256 2e2ec89d8b02c74aa539c7aae39ac18ac30e737615deca32742fb2568f49e72f SHA512 0f588740bd0f62198c70f8974e40a8942f19a9d93d63ee7f846beacba9ca56d5bfc0c2716d1ba9ad2da499e25d17d4dc80b78153d8dcc705840779ce2b78b8f9 WHIRLPOOL 8e18cca44c624243abf2b2eb6fbfe9c52aa215d022af55a5baf7d41809a3766f1e36f044fb13f79e9c25cd778305c1d95ca23db8c4fc66e93f765afc27c97684
 DIST haskell-updater-1.2.0.9.tar.gz 23522 SHA256 f5aeea6034222a4c4387bede5510aa6d6aad782d0a5be0bd03f65d474f5a8245 SHA512 600a05d468dc74ce3a1282ac1b991267602bd7715e7d13aaa2558c9241d167894209790c34fe330d86b24814e959046a22ffff79a197e644da2f18284a785eea WHIRLPOOL 22e060ccd076d66a5425592a49568e52015ccb5e5116894a2ccdb54da4b2b6e2288952cd6c257bdefaa401d06f2fc5c10eda9289c11654166b4ac8119584ae0f
-EBUILD haskell-updater-1.2.0.10.ebuild 799 SHA256 7cde1a1eda3ad76f2ce9fa53c40c8c573071168997a6f2dc93e6021ddf31aa2d SHA512 142c94d5c69b5f5c4dc63dbaa1b56771dcb5c9a29573b5269d639652dbdba347243c92abfcb67e8f3cae9076b974b3c341f103644ba6c7d549d81fcb80f19444 WHIRLPOOL 71532f769edaed3420ea7d21a5988f01003cbde71e4f068df66f95854bf630a08436e3989040ea6947c04604728c82737756560a9ef477ea9775c50cec175406
+EBUILD haskell-updater-1.2.0.10-r1.ebuild 1414 SHA256 a2efad5f083cc4fe350b9cec41ad46d55e949476173b546b2666d7ccb9709ba3 SHA512 080c34bdf19e1cdba8efcef8c562156cdd9d91d1ecfb6d4af3e785bb23eeab3f152026c19de7e3780372445814910e44ae453f412f956763a075bbcf4e348616 WHIRLPOOL 99354f39f364a157c60d9453ecd8611db254e09d27c5eaef49795d4490d79f7f024ce42bc7f0b501c4300093e9f9f46f474bbc463a818d499cc7e756e63eb1b6
 EBUILD haskell-updater-1.2.0.9.ebuild 1404 SHA256 c47c103f2e9f602c88a6a8d132eb9226b96eb4c0255f4a9ef8b8068461630ad4 SHA512 d2ca737c5b600dfb9b2d2d31616abe1f358a2dcd97a59f8374622ecb9a9e5190fd725107b1f009c77fa908f70b3c9795a5842ac981e707be96af08ca0cbb503a WHIRLPOOL 2ac2b19a929041dbcdfb5da1b903a4043c3672145b06a7a3ad0be7cfc6e86c95ce118d1012282821d5b96b97fdd414242ddffdf9beb18affdd79b0c8b11037a6
-MISC ChangeLog 9195 SHA256 0a79bc277d644fd073aee31b474f2473ed1317735e6339159e5456882b6328f7 SHA512 156550531dbc28cf82b628c8304e1520b14ba625c37ad1cad20420a43625fc69504322fc5d8ac56f1388076bf4dba4501c95a97b88f26319312a703f121d33c5 WHIRLPOOL 8f8fdd930862f7c8a0f740a3ca5d87704b3aaea5049ef2eb2ede81140f849d310952b16637b23d4557ce67c0dd33a80af4820e2b7078837e814de8bf4301e8e4
+MISC ChangeLog 9406 SHA256 b71d099b1efb73f6a275f22a434dc421a5120ee8e1c67477a67b5ea6d2c53cd6 SHA512 afcbf7fa1b6208c9ae032037bbe4ea834add6cbd8626a8877854a115fb653959d4d4d208028f89aca3100864652e563d3c284305ec4291ea7d2e7a5225aa96ec WHIRLPOOL 0f639053f31c50128ff0070b03c944f3502bf20138fe7c0963dc8f77273ac723b154541f179518313935b91000793522bcfb3e339fed300751e02e7bb7eef12a
 MISC metadata.xml 223 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508 SHA512 24765bbf1cb187cd262aa7fb3824c1cec65e2bf3f2198099de688916d96401a26458265b15408f22b1fbd6d6a2842df814a57ceda80dfa00d130b24423b7544f WHIRLPOOL 8fd6700f6198db6540eb51edf11372faeb6eb8a542a692e515badf236f62444f2c180f7d08e0f98e9fdfa23de14631b31af50543469aaa27084d6b637e2644c7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQF8BAEBCABmBQJSJbRHXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwMTlGQTEwRTVCMUJCNjdFRDM5Qzg3RjdF
-QUQ1MEQ2NEQ4RDM1NzFBAAoJEOrVDWTY01calXAH+wbQDmEPRR5Wo3PFf3sCYzji
-FornCass5wgS9heewL0bbA1nZet8gM+XWIrQthk8XJmiUXKlIGHA2GNNTA/x+I/H
-acdNlqEPkuK3thwOWHlSIjt4B9ip5eZlGax10lFokb+wvcXy54e0Hah4gzZBN33g
-k7b2FBaCem4cQPXBDcxWD+oS18/XdcMHtj7Ton2BfMYxSxdGxj267yeEwvyFQ5VA
-PZ+v4Vim5xLsSOi1vIyywGrt//8cbIRtMfWNJutY46vyWiPQvWmeiPc+tv8/JN5j
-UqyW6Nufi1d6mFnqYbWdP3zpV/xrX6t6YFoKzHZJE2PL9xatDAG02IfBoWCtDqs=
-=QtJs
+iEYEAREIAAYFAlImQTQACgkQcaHudmEf86rvEgCfVGdO4u1BmO1Eo62q2MWXIE2q
+EPoAnRmCWioZ7HNU8cVQoGZoqrpfYnaS
+=dEej
 -----END PGP SIGNATURE-----
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
-"