Version bump (ghc-7 compatible).

Package-Manager: portage-2.1.10.10/cvs/Linux x86_64

diff --git a/dev-haskell/haddock/ChangeLog b/dev-haskell/haddock/ChangeLog
index 623308ea81c88849a816114457de5235461ba7e8..5385d959098198684f8a99c800a44f44424f4883 100644 (file)
--- a/dev-haskell/haddock/ChangeLog
+++ b/dev-haskell/haddock/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-haskell/haddock
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.84 2011/06/05 12:20:59 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.85 2011/08/03 13:14:54 slyfox Exp $
+
+*haddock-2.9.2 (03 Aug 2011)
+
+  03 Aug 2011; Sergei Trofimovich <slyfox@gentoo.org> +haddock-2.9.2.ebuild:
+  Version bump (ghc-7 compatible).
 
   05 Jun 2011; Sergei Trofimovich <slyfox@gentoo.org> -haddock-0.8.ebuild,
   -haddock-0.9.ebuild, -haddock-2.4.1.ebuild:

diff --git a/dev-haskell/haddock/Manifest b/dev-haskell/haddock/Manifest
index 108045bd9c63b82e59f05c89633cc544f0c32a41..7907f0d0803d5bdf490b0faa07cb978d0203c49e 100644 (file)
--- a/dev-haskell/haddock/Manifest
+++ b/dev-haskell/haddock/Manifest
@@ -6,14 +6,16 @@ AUX haddock-2.4.2-Setup.hs 3200 RMD160 11c340505daf3a7bf7bbac1abbebc279dabb1744
 DIST ghc-paths-0.1.0.5.tar.gz 2304 RMD160 098804e5a48ce9381174245601b3896304464219 SHA1 f9a70a8564be268e4aa88436ea18fc84a1ce303a SHA256 ea9e97425894e3dbd7915e00e107e2e7fc07b6e8293fd2dd66a813f0673cba10
 DIST haddock-2.4.2.tar.gz 103033 RMD160 18317b3ffd60f2b0925d635ce1ea2ab35825860c SHA1 cd1de409029bcabdf79b05b4c00c7702c836c765 SHA256 dbf0a7d0103a3ce6a91b2a3b96148c1b9c13ea7f8bd74260c21fe98df7839547
 DIST haddock-2.6.1.tar.gz 128158 RMD160 32be5206f0caab3e6aa7582b9ad23a22581082ab SHA1 f088795826a155f0a207219a45ad643dcaeccf65 SHA256 626bfbc51f33ada003fbbfe1b40f3147039369e9898f8e8d2f5c1c863436ea6a
+DIST haddock-2.9.2.tar.gz 154040 RMD160 5d7fe09d61bf089794e753969db4a259117df41b SHA1 2a61f178a0ce9e126442821ab95052e748b865b0 SHA256 e8498520a4b8c8a03330141ba4c31d81e90dfd361de3ff7e320cdf71c2dd3ba1
 EBUILD haddock-2.4.2.ebuild 2425 RMD160 4bc2d79fe5a71cba14c06cf1c5a9d9e467db1379 SHA1 a65439584d366164200a16ab485841b4d12d7579 SHA256 d77ea400a62ccead9e4060c70b2c63d51ed04598d3c4c36ce861c1addc0b05d2
 EBUILD haddock-2.6.1.ebuild 2493 RMD160 a9bbabaa61c2accd4c5212849b5fc4a309ca8888 SHA1 4975c694400b02363ba845aea035b22886f86cc3 SHA256 c430761c0b3e1109c320b7227d9d629da76c6ba8354744e72b1288a83e6d3c18
-MISC ChangeLog 11614 RMD160 d6a80d200bb6ccc0e6f2cbfa61d1f5c9ef42c654 SHA1 7456823c2fe036d2bd25793eb19364a78c0802e6 SHA256 217cf47692604fa223695f8a880b7e222c89bc99383aa16f5d054134022ab752
+EBUILD haddock-2.9.2.ebuild 2613 RMD160 67304aa955aeb766e7e9c7fe5d1df2a529195d15 SHA1 729b487ec0fd8950a0afcaf335a1ed0be40b6fba SHA256 82e302e14236b332982a101681deb67ef1b3f1f0a56d82b5b1a28f1798b3f735
+MISC ChangeLog 11757 RMD160 4a2f66be615551d0ffe7c83abac571aca282abce SHA1 4ac18e4e3b1e84a54f28f9a710f5b63faa72569e SHA256 d965b705a9ce32f8e5edbf0583340a80faf18e68230f8e5da66677b26f281379
 MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3rdWIACgkQcaHudmEf86oJiACfecrS255YjzTIqEVs1g8oiGVl
-jaIAn0v/yHYvOJ4ywLCenUCI3aQ7R5RY
-=MRi2
+iEYEARECAAYFAk45Sp4ACgkQcaHudmEf86rE8wCffk5/PlERMlU5g2E3uhmTjZBG
+dSsAoIBq7J3x5zBCnGOnv1D/+Tb4wZUr
+=J87q
 -----END PGP SIGNATURE-----

diff --git a/dev-haskell/haddock/haddock-2.9.2.ebuild b/dev-haskell/haddock/haddock-2.9.2.ebuild
new file mode 100644 (file)
index 0000000..4fe67d4
--- /dev/null
+++ b/dev-haskell/haddock/haddock-2.9.2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2011 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.1 2011/08/03 13:14:54 slyfox Exp $
+
+# ebuild generated by hackport 0.2.9
+
+# haddock-2.8.{0,1} on hackage does not work with ghc-7.
+# this ebuild uses a tarball of what's distributed with ghc-7.
+
+EAPI="3"
+
+CABAL_FEATURES="bin lib profile haddock hscolour"
+inherit haskell-cabal pax-utils
+
+DESCRIPTION="A documentation-generation tool for Haskell libraries"
+HOMEPAGE="http://www.haskell.org/haddock/"
+SRC_URI="http://hackage.haskell.org/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="~alpha ~amd64 -ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="dev-haskell/ghc-paths
+               =dev-haskell/xhtml-3000.2*
+               >=dev-lang/ghc-7"
+DEPEND="${RDEPEND}
+               >=dev-haskell/cabal-1.10"
+
+# although haddock depends on alex and happy to build from scratch, we don't
+# want this ebuild to depend on those packages.
+# we use haddock to build the documentation enabled by USE="doc".
+# alex and happy only build executables, which does not require haddock.
+# however, happy depends on mtl which can be build with USE="doc", which would
+# create a circular dependency.
+# haddock upstream solved this by bundling preprocessed files.
+# unfortunately cabal has recently changed which directory it uses for these
+# intermediate files and thus the solution does not work anymore.
+# to fix this we move those preprocessed files back to the source tree.
+
+src_prepare() {
+       for f in Lex Parse; do
+               rm "src/Haddock/$f."*
+               mv "dist/build/haddock/haddock-tmp/Haddock/$f.hs" src/Haddock/
+       done
+}
+
+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}"
+
+       haskell-cabal_src_configure --with-haddock="${exe}"
+}
+
+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}"
+}