New version.

(Portage version: 2.0.51.22-r2)

4 files changed, 82 insertions, 11 deletions

diff --git a/dev-haskell/haddock/ChangeLog b/dev-haskell/haddock/ChangeLog
index c55eec5f545b..efd04a698e0c 100644
--- a/dev-haskell/haddock/ChangeLog
+++ b/dev-haskell/haddock/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-haskell/haddock
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.23 2005/05/20 15:01:56 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.24 2005/08/05 12:48:21 kosmikus Exp $
+
+*haddock-0.7 (05 Aug 2005)
+
+  05 Aug 2005; Andres Loeh <kosmikus@gentoo.org> +haddock-0.7.ebuild:
+  New version.
 
   20 May 2005; <duncan@gentoo.org> haddock-0.6-r3.ebuild:
   Added ~sparc to KEYWORDS.
diff --git a/dev-haskell/haddock/Manifest b/dev-haskell/haddock/Manifest
index a450d969747b..f811fa3c2a1b 100644
--- a/dev-haskell/haddock/Manifest
+++ b/dev-haskell/haddock/Manifest
@@ -1,6 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 f8f0149b076590f6b2d4700f6c5f0413 haddock-0.7.ebuild 2070
 MD5 128b9a894439f7226495b06aa0ea7b3c haddock-0.6-r2.ebuild 1981
 MD5 c41bbbc2a84938335fa0654c832abc4d haddock-0.6-r3.ebuild 2222
 MD5 40667d822880075c4e001b6b2de98ed2 ChangeLog 3611
@@ -8,10 +6,4 @@ MD5 a769ecfcd1cdd2d40986627df7dfb249 metadata.xml 224
 MD5 6c35081e22594c96591797459c28da01 files/digest-haddock-0.6-r2 67
 MD5 6c35081e22594c96591797459c28da01 files/digest-haddock-0.6-r3 67
 MD5 bd211a7c5442dadeee6975dbb15f2e45 files/haddock-0.6-gcc3.4.patch 1967
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCjfxhkyZuKN4EQ6YRAnuaAJ4tdBtyMGdphOA71mFvsykJSlUtNACggBst
-Qf8rXfMgRoC3F5uFXiMwgqM=
-=9ivJ
------END PGP SIGNATURE-----
+MD5 574da10760a87f23fa635f37265b7c0c files/digest-haddock-0.7 67
diff --git a/dev-haskell/haddock/files/digest-haddock-0.7 b/dev-haskell/haddock/files/digest-haddock-0.7
new file mode 100644
index 000000000000..53425decd33c
--- /dev/null
+++ b/dev-haskell/haddock/files/digest-haddock-0.7
@@ -0,0 +1 @@
+MD5 759419e78416d5f093190968a4dc18f5 haddock-0.7-src.tar.gz 424745
diff --git a/dev-haskell/haddock/haddock-0.7.ebuild b/dev-haskell/haddock/haddock-0.7.ebuild
new file mode 100644
index 000000000000..8691f0fe7dc0
--- /dev/null
+++ b/dev-haskell/haddock/haddock-0.7.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-0.7.ebuild,v 1.1 2005/08/05 12:48:21 kosmikus Exp $
+#
+# USE variable summary:
+#   doc    - Build extra documenation from DocBook sources,
+#               in HTML format.
+#   tetex  - Build the above docs as PostScript as well.
+
+
+inherit ghc-package
+IUSE="doc java"
+
+DESCRIPTION="A documentation tool for Haskell"
+SRC_URI="http://www.haskell.org/haddock/${P}-src.tar.gz"
+HOMEPAGE="http://www.haskell.org/haddock"
+
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
+LICENSE="as-is"
+
+DEPEND="virtual/ghc
+	doc? (  ~app-text/docbook-xml-dtd-4.2
+		app-text/docbook-xsl-stylesheets
+		>=dev-libs/libxslt-1.1.2
+		>=dev-haskell/haddock-0.6-r2
+		java? ( >=dev-java/fop-0.20.5 ) )"
+RDEPEND=""
+
+src_compile() {
+	local myconf
+	local mydoc
+
+	# initialize build.mk
+	echo '# Gentoo changes' > mk/build.mk
+	# determine what to do with documentation
+	if use doc; then
+		mydoc="html"
+		if use java; then
+			mydoc="${mydoc} ps"
+		fi
+	else
+		mydoc=""
+		# needed to prevent haddock from being called
+		echo NO_HADDOCK_DOCS=YES >> mk/build.mk
+	fi
+	echo XMLDocWays="${mydoc}" >> mk/build.mk
+
+	econf || die "econf failed"
+
+	# using -j1 because -j2 behaved strangely on my machine
+	emake -j1 || die "make failed"
+}
+
+src_install() {
+	local insttarget
+
+	insttarget="install"
+	use doc && insttarget="${insttarget} install-docs"
+
+	# the libdir0 setting is needed for amd64, and does not
+	# harm for other arches
+	emake -j1 ${insttarget} \
+		prefix="${D}/usr" \
+		datadir="${D}/usr/share/${P}" \
+		infodir="${D}/usr/share/info" \
+		mandir="${D}/usr/share/man" \
+		libdir0="${D}/usr/$(get_libdir)" \
+		|| die "make install failed"
+
+	cd ${S}/haddock
+	dodoc CHANGES LICENSE README TODO
+}