diff options
author | Mark Wright <gienah@gentoo.org> | 2012-11-18 13:42:07 +0000 |
---|---|---|
committer | Mark Wright <gienah@gentoo.org> | 2012-11-18 13:42:07 +0000 |
commit | c4c1d823ee1323034b1552990ad44d0075cfc07e (patch) | |
tree | b5adc509bb95ecdfe218557b8a0a18cb74ff9183 /dev-haskell | |
parent | Version bump, remove old. (diff) | |
download | gentoo-2-c4c1d823ee1323034b1552990ad44d0075cfc07e.tar.gz gentoo-2-c4c1d823ee1323034b1552990ad44d0075cfc07e.tar.bz2 gentoo-2-c4c1d823ee1323034b1552990ad44d0075cfc07e.zip |
Bump haddock to 2.13.1 with no keywords, as depends on ghc 7.6.1 which is not yet in portage
(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 618E971F)
Diffstat (limited to 'dev-haskell')
-rw-r--r-- | dev-haskell/haddock/ChangeLog | 9 | ||||
-rw-r--r-- | dev-haskell/haddock/files/haddock-2.13.1-drop-tools.patch | 13 | ||||
-rw-r--r-- | dev-haskell/haddock/haddock-2.13.1.ebuild | 65 |
3 files changed, 86 insertions, 1 deletions
diff --git a/dev-haskell/haddock/ChangeLog b/dev-haskell/haddock/ChangeLog index 814409c7a82f..86b7f39667c1 100644 --- a/dev-haskell/haddock/ChangeLog +++ b/dev-haskell/haddock/ChangeLog @@ -1,6 +1,13 @@ # 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.94 2012/10/21 08:04:50 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.95 2012/11/18 13:42:07 gienah Exp $ + +*haddock-2.13.1 (18 Nov 2012) + + 18 Nov 2012; Mark Wright <gienah@gentoo.org> + +files/haddock-2.13.1-drop-tools.patch, +haddock-2.13.1.ebuild: + Bump haddock to 2.13.1 with no keywords, as depends on ghc 7.6.1 which is not + yet in portage *haddock-2.10.0-r2 (21 Oct 2012) diff --git a/dev-haskell/haddock/files/haddock-2.13.1-drop-tools.patch b/dev-haskell/haddock/files/haddock-2.13.1-drop-tools.patch new file mode 100644 index 000000000000..f8e4365674c4 --- /dev/null +++ b/dev-haskell/haddock/files/haddock-2.13.1-drop-tools.patch @@ -0,0 +1,13 @@ +--- haddock-2.13.1-orig/haddock.cabal 2012-10-11 21:56:14.000000000 +1100 ++++ haddock-2.13.1/haddock.cabal 2012-10-11 22:21:37.594323046 +1100 +@@ -108,10 +108,6 @@ + + library + default-language: Haskell2010 +- -- In a GHC tree - in particular, in a source tarball - we don't +- -- require alex or happy +- if !flag(in-ghc-tree) +- build-tools: alex >= 2.3, happy >= 1.18 + build-depends: + base >= 4.3 && < 4.7, + filepath, diff --git a/dev-haskell/haddock/haddock-2.13.1.ebuild b/dev-haskell/haddock/haddock-2.13.1.ebuild new file mode 100644 index 000000000000..a38b833e3613 --- /dev/null +++ b/dev-haskell/haddock/haddock-2.13.1.ebuild @@ -0,0 +1,65 @@ +# 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.13.1.ebuild,v 1.1 2012/11/18 13:42:07 gienah Exp $ + +EAPI="4" + +CABAL_FEATURES="bin lib profile haddock hscolour nocabaldep" +inherit eutils haskell-cabal pax-utils + +DESCRIPTION="A documentation-generation tool for Haskell libraries" +HOMEPAGE="http://www.haskell.org/haddock/" +SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +# ia64 lost as we don't have ghc-7 there yet +# ppc64 needs to be rekeyworded due to xhtml not being keyworded +KEYWORDS="" +IUSE="" + +RDEPEND="dev-haskell/ghc-paths[profile?] + =dev-haskell/xhtml-3000.2*[profile?] + >=dev-lang/ghc-7.6.1" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-1.14" + +RESTRICT="test" # avoid depends on QC + +CABAL_EXTRA_BUILD_FLAGS="--ghc-options=-rtsopts" + +src_prepare() { + # we would like to avoid happy and alex depends + epatch "${FILESDIR}"/${PN}-2.13.1-drop-tools.patch +} + +src_configure() { + # create a fake haddock executable. it'll set the right version to cabal + # configure, but will eventually get overwritten in src_compile by + # the real executable. + local exe="${S}/dist/build/haddock/haddock" + mkdir -p $(dirname "${exe}") + echo -e "#!/bin/sh\necho Haddock version ${PV}" > "${exe}" + chmod +x "${exe}" + + # we use 'nocabaldep' to use ghc's bundled Cabal + # as external one is likely to break our haddock + # (known to work on 1.16.0 and breaks on 1.16.0.1!) + haskell-cabal_src_configure \ + --with-haddock="${exe}" \ + --constraint="Cabal == $(cabal-version)" +} + +src_compile() { + # when building the (recursive..) haddock docs, change the datadir to the + # current directory, as we're using haddock inplace even if it's built to be + # installed into the system first. + haddock_datadir="${S}" haskell-cabal_src_compile +} + +src_install() { + cabal_src_install + # haddock uses GHC-api to process TH source. + # TH requires GHCi which needs mmap('rwx') (bug #299709) + pax-mark -m "${D}/usr/bin/${PN}" +} |