diff options
| author |   Duncan Coutts <dcoutts@gentoo.org> | 2007-12-13 05:49:14 +0000 |
|---|---|---|
| committer | Duncan Coutts <dcoutts@gentoo.org> | 2007-12-13 05:49:14 +0000 |
| commit | b288b95922c4f18781f8c3ee7f59998a09b2e9ea (patch) | |
| tree | 2ae097aee34a6a3467c88d0ac4164c62428ec466 | |
| parent | Updates for upward compatability with cabal-1.2 and ghc-6.8 (diff) | |
| download | gentoo-2-b288b95922c4f18781f8c3ee7f59998a09b2e9ea.tar.gz gentoo-2-b288b95922c4f18781f8c3ee7f59998a09b2e9ea.tar.bz2 gentoo-2-b288b95922c4f18781f8c3ee7f59998a09b2e9ea.zip | |
Updates for upward compatability with cabal-1.2 and ghc-6.8
(Portage version: 2.1.3.19)
| -rw-r--r-- | dev-haskell/quickcheck/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-haskell/quickcheck/quickcheck-1.0-r1.ebuild | 7 | ||||
| -rw-r--r-- | dev-haskell/quickcheck/quickcheck-1.0.1.ebuild | 5 |
3 files changed, 13 insertions, 5 deletions
diff --git a/dev-haskell/quickcheck/ChangeLog b/dev-haskell/quickcheck/ChangeLog index 2d1dcdbdde6d..ce86f8315f43 100644 --- a/dev-haskell/quickcheck/ChangeLog +++ b/dev-haskell/quickcheck/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-haskell/quickcheck # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/quickcheck/ChangeLog,v 1.23 2007/12/13 00:51:30 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/quickcheck/ChangeLog,v 1.24 2007/12/13 05:49:14 dcoutts Exp $ + + 13 Dec 2007; Duncan Coutts <dcoutts@gentoo.org> quickcheck-1.0-r1.ebuild, + quickcheck-1.0.1.ebuild: + Updates for upward compatability with cabal-1.2 and ghc-6.8 13 Dec 2007; Duncan Coutts <dcoutts@gentoo.org> quickcheck-1.0.ebuild: Remove unnecessary blocker. diff --git a/dev-haskell/quickcheck/quickcheck-1.0-r1.ebuild b/dev-haskell/quickcheck/quickcheck-1.0-r1.ebuild index 761238a2e8a3..aab73b1a4c77 100644 --- a/dev-haskell/quickcheck/quickcheck-1.0-r1.ebuild +++ b/dev-haskell/quickcheck/quickcheck-1.0-r1.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/quickcheck/quickcheck-1.0-r1.ebuild,v 1.4 2007/07/08 15:49:29 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/quickcheck/quickcheck-1.0-r1.ebuild,v 1.5 2007/12/13 05:49:14 dcoutts Exp $ CABAL_FEATURES="lib profile haddock" inherit base haskell-cabal @@ -20,3 +20,8 @@ IUSE="" DEPEND=">=dev-lang/ghc-6.6" S="${WORKDIR}/ghc-${GHC_PV}/libraries/${MY_PN}" + +src_unpack() { + unpack "${A}" + cabal-mksetup +} diff --git a/dev-haskell/quickcheck/quickcheck-1.0.1.ebuild b/dev-haskell/quickcheck/quickcheck-1.0.1.ebuild index 7ff2ccf14cc9..1352979991ea 100644 --- a/dev-haskell/quickcheck/quickcheck-1.0.1.ebuild +++ b/dev-haskell/quickcheck/quickcheck-1.0.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/quickcheck/quickcheck-1.0.1.ebuild,v 1.5 2007/12/12 14:01:52 fmccor Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/quickcheck/quickcheck-1.0.1.ebuild,v 1.6 2007/12/13 05:49:14 dcoutts Exp $ CABAL_FEATURES="lib profile haddock" inherit base haskell-cabal @@ -21,8 +21,7 @@ DEPEND=">=dev-lang/ghc-6.6" S="${WORKDIR}/ghc-${GHC_PV}/libraries/${MY_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 } |