summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDuncan Coutts <dcoutts@gentoo.org>2007-12-13 17:58:29 +0000
committerDuncan Coutts <dcoutts@gentoo.org>2007-12-13 17:58:29 +0000
commit32ccd55f0813228bdddb5ae6641598d39976f424 (patch)
treeb707dab9b6bd1f9499db7e97ca74de349afd1338 /dev-haskell/arrows
parentprune unused versions (diff)
downloadhistorical-32ccd55f0813228bdddb5ae6641598d39976f424.tar.gz
historical-32ccd55f0813228bdddb5ae6641598d39976f424.tar.bz2
historical-32ccd55f0813228bdddb5ae6641598d39976f424.zip
Fixes for compatability with cabal-1.2 and ghc-6.8.
Package-Manager: portage-2.1.3.19
Diffstat (limited to 'dev-haskell/arrows')
-rw-r--r--dev-haskell/arrows/ChangeLog6
-rw-r--r--dev-haskell/arrows/arrows-0.2.1.ebuild5
-rw-r--r--dev-haskell/arrows/arrows-0.2.ebuild7
3 files changed, 13 insertions, 5 deletions
diff --git a/dev-haskell/arrows/ChangeLog b/dev-haskell/arrows/ChangeLog
index a7aca6b4afe1..e3ad6d37c7af 100644
--- a/dev-haskell/arrows/ChangeLog
+++ b/dev-haskell/arrows/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-haskell/arrows
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/arrows/ChangeLog,v 1.10 2007/12/12 13:09:24 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/arrows/ChangeLog,v 1.11 2007/12/13 17:58:29 dcoutts Exp $
+
+ 13 Dec 2007; Duncan Coutts <dcoutts@gentoo.org> arrows-0.2.ebuild,
+ arrows-0.2.1.ebuild:
+ Fixes for compatability with cabal-1.2 and ghc-6.8.
12 Dec 2007; Ferris McCormick <fmccor@gentoo.org> arrows-0.2.1.ebuild:
Sparc stable --- part of Bug #201984.
diff --git a/dev-haskell/arrows/arrows-0.2.1.ebuild b/dev-haskell/arrows/arrows-0.2.1.ebuild
index 0db20a9cf93d..7d17b8f105f3 100644
--- a/dev-haskell/arrows/arrows-0.2.1.ebuild
+++ b/dev-haskell/arrows/arrows-0.2.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/arrows/arrows-0.2.1.ebuild,v 1.6 2007/12/12 13:09:24 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/arrows/arrows-0.2.1.ebuild,v 1.7 2007/12/13 17:58:29 dcoutts Exp $
CABAL_FEATURES="lib profile haddock"
inherit haskell-cabal
@@ -20,8 +20,7 @@ DEPEND=">=dev-lang/ghc-6.6"
S="${WORKDIR}/ghc-${GHC_PV}/libraries/${PN}"
-# Sadly Setup.hs in the ghc-6.6.1 extralibs was not tested with Cabal-1.1.6.x
src_unpack() {
unpack "${A}"
- sed -i -e "/type Hook/ s/UserHooks/Maybe UserHooks/" "${S}/Setup.hs"
+ cabal-mksetup
}
diff --git a/dev-haskell/arrows/arrows-0.2.ebuild b/dev-haskell/arrows/arrows-0.2.ebuild
index f801fedcfc85..77acab57ee0d 100644
--- a/dev-haskell/arrows/arrows-0.2.ebuild
+++ b/dev-haskell/arrows/arrows-0.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/arrows/arrows-0.2.ebuild,v 1.1 2007/07/08 15:33:22 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/arrows/arrows-0.2.ebuild,v 1.2 2007/12/13 17:58:29 dcoutts Exp $
CABAL_FEATURES="lib profile haddock"
inherit base haskell-cabal
@@ -19,3 +19,8 @@ IUSE=""
DEPEND=">=dev-lang/ghc-6.6"
S="${WORKDIR}/ghc-${GHC_PV}/libraries/${PN}"
+
+src_unpack() {
+ unpack "${A}"
+ cabal-mksetup
+}