Version bump, this version is able to restore from many breakages possible with major ghc-package / haskell-cabal eclass change done 1 Jan 2015.

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

4 files changed, 63 insertions, 11 deletions

diff --git a/app-admin/haskell-updater/ChangeLog b/app-admin/haskell-updater/ChangeLog
index 7a98d0689754..b57eaec145d9 100644
--- a/app-admin/haskell-updater/ChangeLog
+++ b/app-admin/haskell-updater/ChangeLog
@@ -1,6 +1,13 @@
 # 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.73 2014/08/01 13:46:54 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/haskell-updater/ChangeLog,v 1.74 2015/01/01 21:26:11 slyfox Exp $
+
+*haskell-updater-1.2.6 (01 Jan 2015)
+
+  01 Jan 2015; Sergei Trofimovich <slyfox@gentoo.org>
+  +haskell-updater-1.2.6.ebuild, metadata.xml:
+  Version bump, this version is able to restore from many breakages possible
+  with major ghc-package / haskell-cabal eclass change done 1 Jan 2015.
 
 *haskell-updater-1.2.3 (01 Aug 2014)
 
diff --git a/app-admin/haskell-updater/Manifest b/app-admin/haskell-updater/Manifest
index d328f77fb59d..c82e382fd4f9 100644
--- a/app-admin/haskell-updater/Manifest
+++ b/app-admin/haskell-updater/Manifest
@@ -3,14 +3,16 @@ Hash: SHA256
 
 DIST haskell-updater-1.2.1.tar.gz 23932 SHA256 f43e7de3b4dca950d6c9cbcb10507f314813bb4c59bd912f9e7772fdb60c0a2b SHA512 20939e4afb3870b0220c1a814b0f9f9ec0bea1fc2e59891323bdbea41adf8e84bdff15014746d0ab0983ce2a34becf7b5f078a38edf63748c23fe08dcadbcf66 WHIRLPOOL 78b1bfcf4d208c26f163938a2e0ea2810f238cbca07664692175ef7388f4a9c81d49803b2a27c1405c46bc75fcb13430caa00b877a118d28295d1af4d74a0f52
 DIST haskell-updater-1.2.3.tar.gz 24126 SHA256 ceeb713a817fddc0e6e7423f8e15c59f217ec28a79c300433942dc0b88555ad7 SHA512 7913d122e90efc431de9b9c494484a820209f436a72bbfa9288c87dd6fa142c39eb0a90efadf6a1e7e90e7e8b889a5f31eba867dee7eaeca17aaef0fe06abcc2 WHIRLPOOL 9b2f9a7e283956d9bdabcf33fca0bb0c2380a8dee9b8e8fc6b5139665e63845fdf7be3d1a172d128e41444d23a1573d09071911a26edc577fd88e67f29730c16
+DIST haskell-updater-1.2.6.tar.gz 24857 SHA256 74fa71b530e3c88f944d3f4013a4c41c95af5e42ac0ec2ac25716578e1965a9e SHA512 1be777b40fcad2cfdfe461c8bce8ffed0449dbd6bfb665881da1cf763699626d9183a5affbdaba0e8243cf4ce956caab1d54a9c4637d10d1642e8da3764bcedf WHIRLPOOL 0af59cbd5a937cbf7261fd02e6a39bf6006e484532883381fdb6818fe993bb3ae0fd0993b9d32620341872f7e02d9e40e5816f4c97928508128f72dbfc6cc38e
 EBUILD haskell-updater-1.2.1.ebuild 1398 SHA256 ba53c86087ceff104e99374ec27523ab3878efbcb9a3c81b5ec0fa569cba645a SHA512 c5899ffae5513a59a4611597e1d401cf330fe695bda60d46e3e6ef3dcc35f58ca77e005d15f3089629efd7db5ff9cf286b02f777d9692e0293479de4aab7f931 WHIRLPOOL 1f038e1ad2094ff5cf69817d891a4f1d3b82cccddc3ce1499ad121ae6c2597561d1e325581af5130153ca4906318644299c873d1ea8b62dfd90f4d81fa532723
 EBUILD haskell-updater-1.2.3.ebuild 1231 SHA256 e2684326b848f1ecf7e64c003f62c1e45e411831a963000f592a27e657c4fdd2 SHA512 0ffea8234e2d83fdcd8c4ef3e8ca112d7a6386a31f6a0690cc42b4eddfa4c4f48d3d84891bb032f9962231d9212df99f524bd09f1645204f634f704899d27d9d WHIRLPOOL 8b22edcb88d26fcebbcb6d6bbd58120e2f691abeb7b6e5896d9a72a88ea04c49e44074057633519e9676a8b19014b95bf7ecfc9096349835f977560ebb1e8cc9
-MISC ChangeLog 11048 SHA256 09bb86d2e5da7d3740d4e9ad71193ddb056f47ce5c419190090f662f99904f8a SHA512 88e18100542e79407048bd96f2cab7dcb1c260e539a7c2761b212f9b3122b26d6fb4f8c505c833f70950697768f870ca827f538ac21aff6cb4095d29019acb6a WHIRLPOOL 539a246b4454268e0ef870bfa0c437b3c4b208577e40350c86b79a3ea94cd6f4cf1d9732728c5595162b03e36b198356a21a1af7c601271a726bc1b4aaf14c04
-MISC metadata.xml 223 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508 SHA512 24765bbf1cb187cd262aa7fb3824c1cec65e2bf3f2198099de688916d96401a26458265b15408f22b1fbd6d6a2842df814a57ceda80dfa00d130b24423b7544f WHIRLPOOL 8fd6700f6198db6540eb51edf11372faeb6eb8a542a692e515badf236f62444f2c180f7d08e0f98e9fdfa23de14631b31af50543469aaa27084d6b637e2644c7
+EBUILD haskell-updater-1.2.6.ebuild 1231 SHA256 1cea8566a35506a776be653f6c68e4958afae0a0c0a3bb80325cf6a5f460b666 SHA512 01da2f2ac62037150ea12d28bf16e2d35753e507bfea9a21888b7b17b6f6ef9a79ffe181f41f4dd3a4014f05615877111accb855ec151538c057d63e757dc4b7 WHIRLPOOL 5b65462f778735ee111846c76f66224ce844d14d52ac4b7068a7549a52183152d4ed008ae184a15890e68e9287d3d264674597ba30798d24b9db99e69ed692be
+MISC ChangeLog 11337 SHA256 a841a3ab6646643077ac3efda1102afe3e1364154dcc477e88004fd9274234db SHA512 6d622c1788393f504f8d455431a46111aa04bad1ad68be13758464fbbda6e115d3e74a8c4aab50d389407acac5798d71f99e0368d53045befa2ebc2008cdfaab WHIRLPOOL d1d3c2eab3488fadaa59c1174cd5bcb52bae6343076174960da0746a4507b17fb653d28b93ad923649a3ab776de0e05fd0ad6d9310f368e41623c693eb78be39
+MISC metadata.xml 161 SHA256 f560c0c2c8a2f2ca3c0c03e1836e16da7085b32ea60e03d9add5e405dac9f004 SHA512 e55e2a33dd7916f4379b273ccd6b1781ddf60411a4ac67abac0e2cf4f547d91f8de3efeaf41da43a323b40b078f5ba1be6cb58dfbf8d0c6c97f4016f1eb38fa2 WHIRLPOOL adc22babb9d923d4533b228c7ad25ffc5b50497c779d2016857eb68f5c23f549066cf56f78dd7465960e723732369cf1943e7c460de81177d636d0c17b3e1944
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPbmlUACgkQcaHudmEf86pJ6gCfc4v6h9Tg7qt3rODofFvMf+6a
-KHkAnieY+zu1VyGZSlZBjnr7ZwOFsVtM
-=TfqG
+iEYEAREIAAYFAlSlu3YACgkQcaHudmEf86qt2ACeJkNPhVk8C9yJLCKgDqxPhAKD
+XkAAn2U3EnM+4EZ46WY2+E52hPo35GCC
+=Y4Ue
 -----END PGP SIGNATURE-----
diff --git a/app-admin/haskell-updater/haskell-updater-1.2.6.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.6.ebuild
new file mode 100644
index 000000000000..ab9988fb979e
--- /dev/null
+++ b/app-admin/haskell-updater/haskell-updater-1.2.6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 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.6.ebuild,v 1.1 2015/01/01 21:26:11 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
+}
+
+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/metadata.xml b/app-admin/haskell-updater/metadata.xml
index 8c66906af531..ddb2b453cd1f 100644
--- a/app-admin/haskell-updater/metadata.xml
+++ b/app-admin/haskell-updater/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>haskell</herd>
-<maintainer>
-  <email>haskell@gentoo.org</email>
-</maintainer>
+	<herd>haskell</herd>
 </pkgmetadata>