Force linkage against ghc's Cabal library. That way we make sure h-u will not fail to build when Cabal is already installed, but broken.

Package-Manager: portage-2.2.0_alpha96_p5/cvs/Linux x86_64

3 files changed, 17 insertions, 9 deletions

diff --git a/app-admin/haskell-updater/ChangeLog b/app-admin/haskell-updater/ChangeLog
index 1109b7c1b88e..b89e58be3dd3 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/haskell-updater/ChangeLog,v 1.28 2012/04/04 18:19:34 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/haskell-updater/ChangeLog,v 1.29 2012/04/09 18:32:24 slyfox Exp $
+
+*haskell-updater-1.2.0.5-r1 (09 Apr 2012)
+
+  09 Apr 2012; Sergei Trofimovich <slyfox@gentoo.org>
+  +haskell-updater-1.2.0.5-r1.ebuild, -haskell-updater-1.2.0.3.ebuild:
+  Force linkage against ghc's Cabal library. That way we make sure h-u will not
+  fail to build when Cabal is already installed, but broken.
 
   04 Apr 2012; Sergei Trofimovich <slyfox@gentoo.org>
   haskell-updater-1.2.0.5.ebuild:
diff --git a/app-admin/haskell-updater/Manifest b/app-admin/haskell-updater/Manifest
index cad86c0a59c1..6905c1e33430 100644
--- a/app-admin/haskell-updater/Manifest
+++ b/app-admin/haskell-updater/Manifest
@@ -4,19 +4,18 @@ Hash: SHA1
 DIST haskell-updater-0.9.1.0.tar.gz 20643 RMD160 03b0c14394828a101fb4114f5e1bf8669ef74ee7 SHA1 cefa26f0ecba6e6cbed22752eb33e13b81165570 SHA256 6c545ebf2a8cefbc93a6cafa65e139b3d73aa6561f40905364daccc43c559461
 DIST haskell-updater-1.1.0.0.tar.gz 22691 RMD160 8db8459cdb5fbbc87920b42900c6b078897be883 SHA1 c1cbad81d25cc76ee8acac257ecf50f6b6cd542f SHA256 c22e8adca980f9f91a2b28771e830165ceef2f43cc9036c8ffe9f5c3f505f3fc
 DIST haskell-updater-1.1.3.0.tar.gz 22981 RMD160 07f18a193ae11c069f11d10408fd4cb81af6a5a6 SHA1 4ef474a9460917348bb2fff02b52540f50206ee6 SHA256 5bd2f931c490c114f655204d671feb677a9abdc472bbfe554cbf448cc216fd3a
-DIST haskell-updater-1.2.0.3.tar.gz 23338 RMD160 455630ce4068e9a95b89fa099038440c0e559d2a SHA1 b58ed0d4f2a9ce72a37cb339924b3ca3454a7fc2 SHA256 9142daaf1e8dff5ff060f95abe0f82189e04c8ee94753afb9fa00102391dc244
 DIST haskell-updater-1.2.0.5.tar.gz 23026 RMD160 8c53cd820b47388fa18a7f2b453c5611e6c93024 SHA1 4065743cbe4a4d76a4d0dc5034a618a9220407ba SHA256 360ce9e37286e090d635d0ccae7b25238be24c61e5eec3787988b1fc9762e024
 EBUILD haskell-updater-0.9.1.0.ebuild 913 RMD160 c8e98b705a13b9202fb913c878f1d45048a36a5b SHA1 56182b7e0841700b2de4efa367d1a42114735ccb SHA256 fe6bcf733392298f5b2ccbee7b546762ec88883549e76f56ce9e0c0f57e492c0
 EBUILD haskell-updater-1.1.0.0.ebuild 937 RMD160 4e60614d96e8ea77840c6f6828751bad687e370a SHA1 ba7bfe702a9884683c81e40a13a9e6cdcf7e36bc SHA256 6ecbc42aef8f9e26e50f476d848213a1e6fd6506570e1c942596fc9f71b14ac7
 EBUILD haskell-updater-1.1.3.0.ebuild 939 RMD160 82ca1f3267c423728d65ed8e85dc015e0eb0c695 SHA1 45d0afc0c7ba394e5edb22fa0b8d28aa42a2e762 SHA256 59bc2678e94613bb26ec5c1d31f9fdc7d613320c9bb9475027678a7a5a07ceb8
-EBUILD haskell-updater-1.2.0.3.ebuild 1221 RMD160 131479eb2848e62fc90dee6c83f3254849dced5e SHA1 eda551a7bacea484dbb599e3c054ef73f9730bd6 SHA256 30b4c3a9c7d398ac2fffc2973c01ea161261b3b62db3f8b8e67696a7047b7724
+EBUILD haskell-updater-1.2.0.5-r1.ebuild 1273 RMD160 87e2b8045a3b225fb0f9e08ab6e644673967790e SHA1 69290b920901656ae3a96ed6aa08727a8c20bc13 SHA256 e65ced6361c5f1a2641720dec6e8881640b89138cefa9a006f1da7df1e7ca1fa
 EBUILD haskell-updater-1.2.0.5.ebuild 1214 RMD160 a85c017d8f65d4d05ee5285f083ed96eb1ae6bfe SHA1 72c83057e819b79ee414007f211b51acec4257d2 SHA256 9ac7c3cec3c2718aa474601b3d451017d41cdaddff1812ba8596855cee989999
-MISC ChangeLog 4455 RMD160 c61237fd82da3a1478125ef221fce355e3544346 SHA1 db3b989bd59756d6ff784564b3a826f26577a417 SHA256 bfdbe348379de3fe2ed4b4ef80d67c152e44b6ab9b51daf857581da1d2f75d21
+MISC ChangeLog 4765 RMD160 39f5552a1cf797e624fbe321cad4d20ed4a9a98b SHA1 d55ea18fac49b4d186404852108b5e6e5c509b6c SHA256 c8e7346ba0d8cc982fc1d96bf1b6dba2f72715edef3153f915fb814f40f178d4
 MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk98keUACgkQcaHudmEf86q9uQCfS1EL5sc6tI+SYjoI4r2l+DBq
-/9EAmgI7CJwGfYW3w/3uOe1b7nvcsGDE
-=+GRt
+iEYEARECAAYFAk+DLF8ACgkQcaHudmEf86r3XQCfQjeI3Ae4wyA9ZM8UoJk1ZHN3
+MJkAn0UJ2CMfH/akIvlL8dut84z/Fn78
+=qIer
 -----END PGP SIGNATURE-----
diff --git a/app-admin/haskell-updater/haskell-updater-1.2.0.3.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.0.5-r1.ebuild
index 7df937a9e41c..24af23e13f89 100644
--- a/app-admin/haskell-updater/haskell-updater-1.2.0.3.ebuild
+++ b/app-admin/haskell-updater/haskell-updater-1.2.0.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.3.ebuild,v 1.1 2012/01/02 15:50:42 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/haskell-updater/haskell-updater-1.2.0.5-r1.ebuild,v 1.1 2012/04/09 18:32:24 slyfox Exp $
 
 EAPI="3"
 
@@ -34,7 +34,9 @@ src_prepare() {
 }
 
 src_configure() {
-	cabal_src_configure --bindir="${EPREFIX}/usr/sbin"
+	cabal_src_configure \
+		--bindir="${EPREFIX}/usr/sbin" \
+		--constraint="Cabal == $(cabal-version)"
 }
 
 src_install() {