diff options
Diffstat (limited to 'dev-haskell/network')
| -rw-r--r-- | dev-haskell/network/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-haskell/network/network-2.0.1.ebuild | 7 | ||||
| -rw-r--r-- | dev-haskell/network/network-2.0.ebuild | 7 |
3 files changed, 13 insertions, 7 deletions
diff --git a/dev-haskell/network/ChangeLog b/dev-haskell/network/ChangeLog index 45f10ecd7963..2dcb3edeefb8 100644 --- a/dev-haskell/network/ChangeLog +++ b/dev-haskell/network/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-haskell/network # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/network/ChangeLog,v 1.23 2007/12/13 00:50:53 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/network/ChangeLog,v 1.24 2007/12/13 05:48:45 dcoutts Exp $ + + 13 Dec 2007; Duncan Coutts <dcoutts@gentoo.org> network-2.0.ebuild, + network-2.0.1.ebuild: + Updates for upward compatability with cabal-1.2 and ghc-6.8 13 Dec 2007; Duncan Coutts <dcoutts@gentoo.org> network-1.0.ebuild: Remove unnecessary blocker. diff --git a/dev-haskell/network/network-2.0.1.ebuild b/dev-haskell/network/network-2.0.1.ebuild index 8cfa34e5b2fb..32c37abe2629 100644 --- a/dev-haskell/network/network-2.0.1.ebuild +++ b/dev-haskell/network/network-2.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/network/network-2.0.1.ebuild,v 1.5 2007/12/12 13:16:06 fmccor Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/network/network-2.0.1.ebuild,v 1.6 2007/12/13 05:48:45 dcoutts Exp $ CABAL_FEATURES="lib profile haddock" inherit haskell-cabal @@ -20,10 +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 -e "/type Hook/ s/UserHooks/Maybe UserHooks/" \ - -e "/^add_configure_options ::/ d" \ - -i "${S}/Setup.hs" + cabal-mksetup } diff --git a/dev-haskell/network/network-2.0.ebuild b/dev-haskell/network/network-2.0.ebuild index 4879eba18993..2e26bd4139ee 100644 --- a/dev-haskell/network/network-2.0.ebuild +++ b/dev-haskell/network/network-2.0.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/network/network-2.0.ebuild,v 1.4 2007/07/08 15:49:01 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/network/network-2.0.ebuild,v 1.5 2007/12/13 05:48:45 dcoutts Exp $ CABAL_FEATURES="lib profile haddock" inherit 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 +} |