summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2012-04-09 18:32:24 +0000
committerSergei Trofimovich <slyfox@gentoo.org>2012-04-09 18:32:24 +0000
commit278b871ee9e882fa57e20d97b856b4326875cf0f (patch)
tree3ac2185dc963afa8ce66932f2d87fa989f94708f /app-admin
parentInstall to libdir instead of libexecdir. (diff)
downloadgentoo-2-278b871ee9e882fa57e20d97b856b4326875cf0f.tar.gz
gentoo-2-278b871ee9e882fa57e20d97b856b4326875cf0f.tar.bz2
gentoo-2-278b871ee9e882fa57e20d97b856b4326875cf0f.zip
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.
(Portage version: 2.2.0_alpha96_p5/cvs/Linux x86_64)
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/haskell-updater/ChangeLog9
-rw-r--r--app-admin/haskell-updater/haskell-updater-1.2.0.5-r1.ebuild (renamed from app-admin/haskell-updater/haskell-updater-1.2.0.3.ebuild)6
2 files changed, 12 insertions, 3 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/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() {