Version bump dev-haskell/haddock.

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

3 files changed, 92 insertions, 5 deletions

diff --git a/dev-haskell/haddock/ChangeLog b/dev-haskell/haddock/ChangeLog
index 6154c0880c84..eb4574608a52 100644
--- a/dev-haskell/haddock/ChangeLog
+++ b/dev-haskell/haddock/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-haskell/haddock
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.61 2009/07/23 06:21:39 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.62 2009/07/23 20:15:07 kolmodin Exp $
+
+*haddock-2.4.1 (23 Jul 2009)
+
+  23 Jul 2009; Lennart Kolmodin <kolmodin@gentoo.org> +haddock-2.4.1.ebuild:
+  Version bump.
 
   23 Jul 2009; Lennart Kolmodin <kolmodin@gentoo.org> haddock-2.4.2.ebuild:
   Relax deps, haddock works with dev-lang/ghc-6.10.4 too.
diff --git a/dev-haskell/haddock/Manifest b/dev-haskell/haddock/Manifest
index d8ac1020032b..b3e2ae271d1c 100644
--- a/dev-haskell/haddock/Manifest
+++ b/dev-haskell/haddock/Manifest
@@ -5,16 +5,18 @@ AUX haddock-2.4.2-Setup.hs 2888 RMD160 6c2a45c69cc4f36cd379a7e94e135b602429ac55
 DIST ghc-paths-0.1.0.5.tar.gz 2304 RMD160 098804e5a48ce9381174245601b3896304464219 SHA1 f9a70a8564be268e4aa88436ea18fc84a1ce303a SHA256 ea9e97425894e3dbd7915e00e107e2e7fc07b6e8293fd2dd66a813f0673cba10
 DIST haddock-0.8-src.tar.gz 162872 RMD160 80b7a582ea91fb36b97675d7ea8a027221a28b8e SHA1 e171d4446ac6fcef526cad4c688892fe587fe90e SHA256 d54078dd9dc75aa589cb05fbe1136c1fb41d4a346e30b71de948425ea7c05a55
 DIST haddock-0.9.tar.gz 163380 RMD160 27685313184e70270d7e4f043c7d671b84acfb23 SHA1 f3c5299b657b170e7a44b66ebd60d3e0947a35aa SHA256 beefd4a6da577978e7a79cabba60970accc5cd48fbb04c424a6b36ace3a9f8d0
+DIST haddock-2.4.1.tar.gz 100122 RMD160 f950b5b719ad655cdd3bd6878d99163cfcd04097 SHA1 452f80bf274c14ace5d6e0fd05af34c2980a1cfb SHA256 59418f086fc3726d50130137dcab20c32d50392991c35d74df8ce11c16ce39a3
 DIST haddock-2.4.2.tar.gz 103033 RMD160 18317b3ffd60f2b0925d635ce1ea2ab35825860c SHA1 cd1de409029bcabdf79b05b4c00c7702c836c765 SHA256 dbf0a7d0103a3ce6a91b2a3b96148c1b9c13ea7f8bd74260c21fe98df7839547
 EBUILD haddock-0.8.ebuild 1691 RMD160 2275082d63a82cdf2e50b3b35ad3f4b8cc93adee SHA1 3feb6d51b114e201d48f185af86532ce859725fd SHA256 c311f887dff9e748689f969524d8e923735d1026282e95fbe5fe20c8dae2522e
 EBUILD haddock-0.9.ebuild 1160 RMD160 afbaecefe7e2e5259cb932b1057a254d6ac07ae1 SHA1 18d8b08c71a9de4be90cef743905a783221a37c7 SHA256 3a36527c9f8f772eeb65757e4574c344af79025599edf68cadde0eed6ec4203e
+EBUILD haddock-2.4.1.ebuild 2336 RMD160 a618cf98ee2b9e407273ce67c0c2224a51084684 SHA1 3a827d0e871f40e0521a60d1de39210dc16c312f SHA256 883520c51cb97d838ada2a5b03dcac66c5695c6ab7b298b713ed4605484d07a9
 EBUILD haddock-2.4.2.ebuild 2258 RMD160 f078944a1260370fbbdd42a0bff3b5c45abb7a25 SHA1 543b415df531b9920188fae5e3d9fb13757b9353 SHA256 d14af2455b0e92f5495e0a19d22687d9cbebd6cf8df5c3f8be55db2a837f5a45
-MISC ChangeLog 8247 RMD160 13dcccd25b6bad8836193b7e856c4eaddd7647f8 SHA1 119c6f188c48565897769757057ef8e1adc72e4b SHA256 08278f25bc0892cf7845865e3caf799536eec832ab8b37c78e3a091ed9fc0d93
+MISC ChangeLog 8371 RMD160 a54133e2f154c646973d66c707548f4921f776fb SHA1 c2e9ed4a52dc7e2c01f2629052e7bbfb2274787c SHA256 d48396b35e650b721f3661191b01d93ea7b3fafa96af1fbf8ea5ae67d084e02e
 MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkpoAXYACgkQ1n/CYbXjntLD0wCfQNh16B1Nx7EaxgNw00AKi2Zk
-1TUAn0i1FokzZZfXtwOczyy34LeZ9TZY
-=ZGAl
+iEYEARECAAYFAkpoxMcACgkQ1n/CYbXjntLIVACfRZoAHY2tYhguASk5dreaayT/
+u2gAnjQY1sgF3qXUY/EBKmFVDrfaqTMR
+=hBdA
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/haddock/haddock-2.4.1.ebuild b/dev-haskell/haddock/haddock-2.4.1.ebuild
new file mode 100644
index 000000000000..eef439cbc85e
--- /dev/null
+++ b/dev-haskell/haddock/haddock-2.4.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.4.1.ebuild,v 1.1 2009/07/23 20:15:07 kolmodin Exp $
+
+CABAL_FEATURES="bin lib"
+# don't enable profiling as the 'ghc' package is not built with profiling
+inherit haskell-cabal autotools
+
+GHCPATHS_PN="ghc-paths"
+GHCPATHS_PV="0.1.0.5"
+GHCPATHS_P="${GHCPATHS_PN}-${GHCPATHS_PV}"
+
+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
+	http://hackage.haskell.org/packages/archive/${GHCPATHS_PN}/${GHCPATHS_PV}/${GHCPATHS_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~sparc ~x86"
+IUSE="doc"
+
+# we bundle the dep on ghc-paths to reduce the dependencies on this critical
+# package. ghc-paths would like to be compiled with USE=doc, which pulls in
+# haddock, which requires ghc-paths, which pulls in haddock...
+
+RDEPEND=">=dev-lang/ghc-6.8.2"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.2
+		dev-haskell/filepath
+		doc? (  ~app-text/docbook-xml-dtd-4.2
+				app-text/docbook-xsl-stylesheets
+				>=dev-libs/libxslt-1.1.2 )"
+
+src_unpack() {
+	unpack ${A}
+
+	# use ghc-paths directly, not as a library
+	sed -e "s|build-depends: ghc-paths|hs-source-dirs: ../${GHCPATHS_P}|" \
+		-e "s|Simple|Custom|" \
+		-i "${S}/${PN}.cabal"
+
+	# ghc-paths has a custom Setup.hs, haddock has the default Setup.lhs.
+	# we use a somewhat modified ghc-paths Setup.hs that works better for our
+	# purposes.
+	rm "${S}/Setup.lhs"
+	cp "${FILESDIR}/${PN}-2.4.2-Setup.hs" "${S}/Setup.hs"
+
+	# -O2 is not needed and just prolongs compile time
+	# missing module in other-modules declaration
+	sed -e "s/-O2//" \
+		-e 's/other-modules:/other-modules:\n    Haddock.DocName/' \
+		-e 's/other-modules:/other-modules:\n    Haddock.GHC.Utils/' \
+	    -i "${S}/${PN}.cabal"
+
+	if use doc; then
+	  cd "${S}/doc"
+	  eautoreconf
+	fi
+
+}
+
+src_compile () {
+	cabal_src_compile
+	if use doc; then
+		cd "${S}/doc"
+		./configure --prefix="${D}/usr/" \
+			|| die 'error configuring documentation.'
+		emake html || die 'error building documentation.'
+	fi
+}
+
+src_install () {
+	cabal_src_install
+	if use doc; then
+		dohtml -r "${S}/doc/haddock/"*
+	fi
+	dodoc CHANGES README
+}
+