summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2012-11-14 14:29:55 +0000
committerSergei Trofimovich <slyfox@gentoo.org>2012-11-14 14:29:55 +0000
commit494e4a0373368ba9af3fae045416b718fd057cf0 (patch)
treece5b1c2ac2908d4904be79aab5d4554cc1e9f888 /dev-haskell
parentPrefix fix for temporary installation directory (diff)
downloadgentoo-2-494e4a0373368ba9af3fae045416b718fd057cf0.tar.gz
gentoo-2-494e4a0373368ba9af3fae045416b718fd057cf0.tar.bz2
gentoo-2-494e4a0373368ba9af3fae045416b718fd057cf0.zip
Mark cabal-1.16 as bundled with ghc-7.4.2 (reported by DemonWitch).
(Portage version: 2.2.0_alpha142_p5/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)
Diffstat (limited to 'dev-haskell')
-rw-r--r--dev-haskell/cabal/ChangeLog5
-rw-r--r--dev-haskell/cabal/cabal-1.14.0.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/dev-haskell/cabal/ChangeLog b/dev-haskell/cabal/ChangeLog
index 31e2580c88a0..e5c8705c2d6a 100644
--- a/dev-haskell/cabal/ChangeLog
+++ b/dev-haskell/cabal/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-haskell/cabal
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/ChangeLog,v 1.79 2012/09/12 15:13:07 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/ChangeLog,v 1.80 2012/11/14 14:29:55 slyfox Exp $
+
+ 14 Nov 2012; Sergei Trofimovich <slyfox@gentoo.org> cabal-1.14.0.ebuild:
+ Mark cabal-1.16 as bundled with ghc-7.4.2 (reported by DemonWitch).
12 Sep 2012; Alexander Vershilov <qnikst@gentoo.org> cabal-1.10.2.0.ebuild,
cabal-1.14.0.ebuild, cabal-1.8.0.6-r1.ebuild:
diff --git a/dev-haskell/cabal/cabal-1.14.0.ebuild b/dev-haskell/cabal/cabal-1.14.0.ebuild
index 9a1e80b9cd77..5733d326ce22 100644
--- a/dev-haskell/cabal/cabal-1.14.0.ebuild
+++ b/dev-haskell/cabal/cabal-1.14.0.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/dev-haskell/cabal/cabal-1.14.0.ebuild,v 1.8 2012/09/12 15:13:07 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/cabal-1.14.0.ebuild,v 1.9 2012/11/14 14:29:55 slyfox Exp $
# ebuild generated by hackport 0.2.12
@@ -32,7 +32,7 @@ RDEPEND="${DEPEND}
S="${WORKDIR}/${MY_PN}-${MY_PV}"
-CABAL_CORE_LIB_GHC_PV="7.4.0.20111219 7.4.0.20120126 7.4.1"
+CABAL_CORE_LIB_GHC_PV="7.4.0.20111219 7.4.0.20120126 7.4.1 7.4.2"
src_configure() {
if ! cabal-is-dummy-lib; then