diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2012-03-18 19:42:44 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2012-03-18 19:42:44 +0000 |
| commit | 2becbab0ab245bdcfc0d5f11bb3c308bfdfc08c2 (patch) | |
| tree | 3b997dd825bda444f9ea04d3b5c259d06341492e /dev-haskell | |
| parent | Drop sparc keywords (diff) | |
| download | gentoo-2-2becbab0ab245bdcfc0d5f11bb3c308bfdfc08c2.tar.gz gentoo-2-2becbab0ab245bdcfc0d5f11bb3c308bfdfc08c2.tar.bz2 gentoo-2-2becbab0ab245bdcfc0d5f11bb3c308bfdfc08c2.zip | |
dev-haskell/haddock: restrict haddock down to cabal-1.10 (fails with 1.14)
(Portage version: 2.2.0_alpha91/cvs/Linux x86_64)
Diffstat (limited to 'dev-haskell')
| -rw-r--r-- | dev-haskell/haddock/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-haskell/haddock/files/haddock-2.9.2-cabal-1.10.patch | 13 | ||||
| -rw-r--r-- | dev-haskell/haddock/haddock-2.9.2.ebuild | 5 |
3 files changed, 21 insertions, 3 deletions
diff --git a/dev-haskell/haddock/ChangeLog b/dev-haskell/haddock/ChangeLog index 1fba593ebe93..a34d0b6db92c 100644 --- a/dev-haskell/haddock/ChangeLog +++ b/dev-haskell/haddock/ChangeLog @@ -1,6 +1,10 @@ # 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.88 2012/03/09 21:55:22 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.89 2012/03/18 19:42:44 slyfox Exp $ + + 18 Mar 2012; Sergei Trofimovich <slyfox@gentoo.org> + +files/haddock-2.9.2-cabal-1.10.patch, haddock-2.9.2.ebuild: + dev-haskell/haddock: restrict haddock down to cabal-1.10 (fails with 1.14) 09 Mar 2012; Sergei Trofimovich <slyfox@gentoo.org> +files/haddock-2.6.1-cabal-1.8.patch, haddock-2.6.1.ebuild: diff --git a/dev-haskell/haddock/files/haddock-2.9.2-cabal-1.10.patch b/dev-haskell/haddock/files/haddock-2.9.2-cabal-1.10.patch new file mode 100644 index 000000000000..8da5ceb044d5 --- /dev/null +++ b/dev-haskell/haddock/files/haddock-2.9.2-cabal-1.10.patch @@ -0,0 +1,13 @@ +diff --git a/haddock.cabal b/haddock.cabal +index 2f36187..0c2aeb4 100644 +--- a/haddock.cabal ++++ b/haddock.cabal +@@ -142,7 +142,7 @@ library + containers, + array, + xhtml >= 3000.2 && < 3000.3, +- Cabal >= 1.10, ++ Cabal >= 1.10 && < 1.14, + ghc >= 7.0 && < 7.2 + + if flag(in-ghc-tree) diff --git a/dev-haskell/haddock/haddock-2.9.2.ebuild b/dev-haskell/haddock/haddock-2.9.2.ebuild index 2beabcb79657..accf9a5fceed 100644 --- a/dev-haskell/haddock/haddock-2.9.2.ebuild +++ b/dev-haskell/haddock/haddock-2.9.2.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/haddock/haddock-2.9.2.ebuild,v 1.2 2012/03/04 03:24:53 gienah Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.9.2.ebuild,v 1.3 2012/03/18 19:42:44 slyfox Exp $ # ebuild generated by hackport 0.2.9 @@ -27,7 +27,7 @@ RDEPEND="dev-haskell/ghc-paths =dev-haskell/xhtml-3000.2* >=dev-lang/ghc-7" DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.10" + >=dev-haskell/cabal-1.10 <dev-haskell/cabal-1.14" CABAL_EXTRA_BUILD_FLAGS="--ghc-options=-rtsopts" @@ -43,6 +43,7 @@ CABAL_EXTRA_BUILD_FLAGS="--ghc-options=-rtsopts" # to fix this we move those preprocessed files back to the source tree. src_prepare() { + epatch "${FILESDIR}"/${P}-cabal-1.10.patch for f in Lex Parse; do rm "src/Haddock/$f."* mv "dist/build/haddock/haddock-tmp/Haddock/$f.hs" src/Haddock/ |