Version bump dev-haskell/haddock-2.6, the version used by ghc-6.12.1.

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

4 files changed, 105 insertions, 6 deletions

diff --git a/dev-haskell/haddock/ChangeLog b/dev-haskell/haddock/ChangeLog
index 1320e0a394d1..6d345f956e1e 100644
--- a/dev-haskell/haddock/ChangeLog
+++ b/dev-haskell/haddock/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-haskell/haddock
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.66 2009/10/31 13:14:49 kolmodin Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.67 2010/01/26 19:59:00 kolmodin Exp $
+
+*haddock-2.6.0 (26 Jan 2010)
+
+  26 Jan 2010; <kolmodin@gentoo.org> +haddock-2.6.0.ebuild:
+  Version bump the haddock version used by ghc 6.12.1.
 
   31 Oct 2009; Lennart Kolmodin <kolmodin@gentoo.org> haddock-2.4.2.ebuild:
   Add keywords tested in the overlay.
diff --git a/dev-haskell/haddock/Manifest b/dev-haskell/haddock/Manifest
index 008d95c9ca0d..0184bba9684e 100644
--- a/dev-haskell/haddock/Manifest
+++ b/dev-haskell/haddock/Manifest
@@ -1,22 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX ghc-paths-1.0.5.0-GHC-Paths.hs 238 RMD160 e00a3771dc7e9b2b4dbf3e77cd12fa424f635198 SHA1 a147a60f803f63cf475e7ba5e7d24bbbe50feae3 SHA256 a86c668fba73a97e14aa58e7dbf9c9bdbcee0c4782bff185b4d905d048c47a9e
 AUX haddock-2.4.2-Setup.hs 2888 RMD160 6c2a45c69cc4f36cd379a7e94e135b602429ac55 SHA1 4c67796d23bdc72fe829a5cc4a07a2da26ec3c74 SHA256 0b91b924c87a7cd1f430deb47a651af830959fcc7bdae5ee5da6e42a84bade6b
 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
+DIST haddock-2.6.0.tar.gz 118432 RMD160 c05c79aa20661d1b97d0a0aa26bea344d58ea3bf SHA1 23ec1ecc5199c0de06f7c95fecc6f901cc807a50 SHA256 36110f1b7465ebef860b3e9c8a3ab94b877d45b9f5bc521af52c1ac7bc75eedc
 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 2652 RMD160 d702a4eee93de8ad23bb02230d541f54db380239 SHA1 ee64c80934280be02e055f7fcbfdb8cffcc7cbc7 SHA256 7b66c532f55af8f63000af79c31b95d295729884a8046ee9141d55b54b83efd2
 EBUILD haddock-2.4.2.ebuild 2272 RMD160 434d3bf24e9601840d61230c2a457ba4f50f5bbc SHA1 f455f0506465df8860e4d8c68ea39a3a1fdb9dc4 SHA256 8afe12ea57c191567cc13c1c6d6818c6c3f0d28d21af48c0a03020fcadade34b
-MISC ChangeLog 9030 RMD160 aa02f437b7c4e1ad82142ba57364b254faa2b69c SHA1 0b3a43bed4cc3fe8ae437b427500ab1677fc69ea SHA256 4aa0d8315b376789f71146bc3929c33caeb4e89bd42f023295f7f04c3d550e75
+EBUILD haddock-2.6.0.ebuild 2325 RMD160 655a5ee1c126fc538c41c8b856bfc414de41cdd3 SHA1 54e6470fe3ed2437dfe1c1b20119a24076778c5a SHA256 688c8aa288bff6bc6899dcb4344e983505641eac7aa7e4edca2d64a75fac0ad3
+MISC ChangeLog 9176 RMD160 3aa77960275ab68167009a41c00b71a6ff349f45 SHA1 ff7d27f169c92d8653fb002b34b78f4d5c052a3c SHA256 f7ddbbc6cbd366b576d5fa6d9050e720d88a3c5081278a5d139843d2b32fa9e7
 MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkrsOGYACgkQ1n/CYbXjntKatgCfW5KYknIxVUt9+Lfsi3E14U6e
-efIAnjy0hT+aw4CCisyvcqIwWKI+uQOt
-=/Fnc
+iEYEARECAAYFAktfSYwACgkQ1n/CYbXjntImHgCginuQyXV4MjgFqYbobYKEK9qS
+tt8AnizUaF1zZMVg6geQN0iz4yfG1D3j
+=6HaT
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/haddock/files/ghc-paths-1.0.5.0-GHC-Paths.hs b/dev-haskell/haddock/files/ghc-paths-1.0.5.0-GHC-Paths.hs
new file mode 100644
index 000000000000..c87565d9cd4a
--- /dev/null
+++ b/dev-haskell/haddock/files/ghc-paths-1.0.5.0-GHC-Paths.hs
@@ -0,0 +1,13 @@
+{-# LANGUAGE CPP #-}
+
+module GHC.Paths (
+        ghc, ghc_pkg, libdir, docdir
+  ) where
+
+libdir, docdir, ghc, ghc_pkg :: FilePath
+
+libdir  = GHC_PATHS_LIBDIR
+docdir  = GHC_PATHS_DOCDIR
+
+ghc     = GHC_PATHS_GHC
+ghc_pkg = GHC_PATHS_GHC_PKG
diff --git a/dev-haskell/haddock/haddock-2.6.0.ebuild b/dev-haskell/haddock/haddock-2.6.0.ebuild
new file mode 100644
index 000000000000..ce10c1eef607
--- /dev/null
+++ b/dev-haskell/haddock/haddock-2.6.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.6.0.ebuild,v 1.1 2010/01/26 19:59:00 kolmodin Exp $
+
+CABAL_FEATURES="bin lib"
+# don't enable profiling as the 'ghc' package is not built with profiling
+inherit haskell-cabal autotools
+
+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"
+KEYWORDS="~amd64 ~ppc64 ~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.12"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.6
+		doc? (  ~app-text/docbook-xml-dtd-4.2
+				app-text/docbook-xsl-stylesheets
+				>=dev-libs/libxslt-1.1.2 )"
+
+src_unpack() {
+	unpack ${A}
+
+	# remove dependency on ghc-paths, we include it right into haddock instead
+	sed -e "s|build-depends: ghc-paths|build-depends:|" \
+		-i "${S}/${PN}.cabal"
+
+	# 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"
+
+	# a few things we need to replace, and example values
+	# GHC_PATHS_LIBDIR /usr/lib64/ghc-6.12.0.20091010
+	# GHC_PATHS_DOCDIR /usr/share/doc/ghc-6.12.0.20091010/html
+	# GHC_PATHS_GHC_PKG /usr/bin/ghc-pkg
+	# GHC_PATHS_GHC /usr/bin/ghc (be careful: GHC_PATHS_GHC is a substring of GHC_PATHS_GHC_PKG)
+
+	# hardcode stuff above:
+	sed \
+	    -e "s|GHC_PATHS_LIBDIR|\"$(ghc-libdir)\"|" \
+	    -e "s|GHC_PATHS_DOCDIR|\"/usr/share/doc/ghc-$(ghc-version)/html\"|" \
+	    -e "s|GHC_PATHS_GHC_PKG|\"$(ghc-getghcpkg)\"|" \
+	    -e "s|GHC_PATHS_GHC|\"$(ghc-getghc)\"|" \
+	  -i "${S}/src/GHC/Paths.hs"
+
+	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
+}