diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2012-03-09 21:55:22 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2012-03-09 21:55:22 +0000 |
| commit | 88353314068a0dfbbaa900aff2d2959bec942570 (patch) | |
| tree | c3888c3b1d9488fb941ffd8322f5a0e775429550 /dev-haskell/haddock | |
| parent | old (diff) | |
| download | gentoo-2-88353314068a0dfbbaa900aff2d2959bec942570.tar.gz gentoo-2-88353314068a0dfbbaa900aff2d2959bec942570.tar.bz2 gentoo-2-88353314068a0dfbbaa900aff2d2959bec942570.zip | |
Fix build failure against system's cabal-1.10 (use cabal bundled with ghc). Fixes bug #383707 by Niklas Johansson and others.
(Portage version: 2.2.0_alpha90_p1/cvs/Linux x86_64)
Diffstat (limited to 'dev-haskell/haddock')
| -rw-r--r-- | dev-haskell/haddock/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-haskell/haddock/files/haddock-2.6.1-cabal-1.8.patch | 13 | ||||
| -rw-r--r-- | dev-haskell/haddock/haddock-2.6.1.ebuild | 9 |
3 files changed, 25 insertions, 4 deletions
diff --git a/dev-haskell/haddock/ChangeLog b/dev-haskell/haddock/ChangeLog index 4439df9be94e..1fba593ebe93 100644 --- a/dev-haskell/haddock/ChangeLog +++ b/dev-haskell/haddock/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-haskell/haddock # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.87 2012/03/06 05:31:21 gienah Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.88 2012/03/09 21:55:22 slyfox Exp $ + + 09 Mar 2012; Sergei Trofimovich <slyfox@gentoo.org> + +files/haddock-2.6.1-cabal-1.8.patch, haddock-2.6.1.ebuild: + Fix build failure against system's cabal-1.10 (use cabal bundled with ghc). + Fixes bug #383707 by Niklas Johansson and others. *haddock-2.10.0 (06 Mar 2012) diff --git a/dev-haskell/haddock/files/haddock-2.6.1-cabal-1.8.patch b/dev-haskell/haddock/files/haddock-2.6.1-cabal-1.8.patch new file mode 100644 index 000000000000..d23cd2508df5 --- /dev/null +++ b/dev-haskell/haddock/files/haddock-2.6.1-cabal-1.8.patch @@ -0,0 +1,13 @@ +diff --git a/haddock.cabal b/haddock.cabal +index 4a00ce1..5323628 100644 +--- a/haddock.cabal ++++ b/haddock.cabal +@@ -71,7 +71,7 @@ executable haddock + pretty, + containers, + array, +- Cabal >= 1.5, ++ Cabal >= 1.5 && <1.10, + ghc >= 6.12 && < 6.14 + + if flag(in-ghc-tree) diff --git a/dev-haskell/haddock/haddock-2.6.1.ebuild b/dev-haskell/haddock/haddock-2.6.1.ebuild index f3f618cd386e..2c509e86079c 100644 --- a/dev-haskell/haddock/haddock-2.6.1.ebuild +++ b/dev-haskell/haddock/haddock-2.6.1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.6.1.ebuild,v 1.13 2011/06/05 12:19:18 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.6.1.ebuild,v 1.14 2012/03/09 21:55:22 slyfox Exp $ CABAL_FEATURES="bin lib" # don't enable profiling as the 'ghc' package is not built with profiling -inherit haskell-cabal autotools pax-utils +inherit eutils haskell-cabal autotools pax-utils DESCRIPTION="A documentation-generation tool for Haskell libraries" HOMEPAGE="http://www.haskell.org/haddock/" @@ -33,6 +33,9 @@ src_unpack() { sed -e "s|build-depends: ghc-paths|build-depends:|" \ -i "${S}/${PN}.cabal" + cd "${S}" + epatch "${FILESDIR}"/${P}-cabal-1.8.patch + # copy of slightly modified version of GHC.Paths mkdir "${S}/src/GHC" cp "${FILESDIR}/ghc-paths-1.0.5.0-GHC-Paths.hs" "${S}/src/GHC/Paths.hs" |