added -r2 because of wrong directory in ebuild

4 files changed, 83 insertions, 5 deletions

diff --git a/dev-haskell/haddock/Manifest b/dev-haskell/haddock/Manifest
index cc4f7396e5d2..314d6b5fce0c 100644
--- a/dev-haskell/haddock/Manifest
+++ b/dev-haskell/haddock/Manifest
@@ -1,9 +1,9 @@
-MD5 525229af7649795a3b56d59fd19921d2 haddock-0.6-r2.ebuild 1979
+MD5 f7d22e0d079c36e5935f8a01fb5fbcd0 haddock-0.6-r2.ebuild 1979
 MD5 259a626193a148c7b93be296843b4b5e haddock-0.4.ebuild 2056
 MD5 1558aa1f0fe1bc31fe82e0e10be5d1dd haddock-0.6.ebuild 1977
-MD5 525229af7649795a3b56d59fd19921d2 haddock-0.6-r1.ebuild 1979
+MD5 89faa51b0b76878090c03ce16e514e53 haddock-0.6-r1.ebuild 1979
 MD5 e5986ca528feeab7b061105cfb1c9935 haddock-0.5.ebuild 1963
-MD5 5b4aa49981749b697f1cd847330f7097 ChangeLog 1384
+MD5 2b1be83cbfbb6de2b1c0d8ee5a1d08b9 ChangeLog 1556
 MD5 a769ecfcd1cdd2d40986627df7dfb249 metadata.xml 224
 MD5 6c35081e22594c96591797459c28da01 files/digest-haddock-0.6-r1 67
 MD5 6c35081e22594c96591797459c28da01 files/digest-haddock-0.6-r2 67
diff --git a/dev-haskell/haddock/files/digest-haddock-0.6-r2 b/dev-haskell/haddock/files/digest-haddock-0.6-r2
new file mode 100644
index 000000000000..fc424528e86b
--- /dev/null
+++ b/dev-haskell/haddock/files/digest-haddock-0.6-r2
@@ -0,0 +1 @@
+MD5 6f15d15a3e4352f77f003fb133b1d9b2 haddock-0.6-src.tar.gz 429708
diff --git a/dev-haskell/haddock/haddock-0.6-r1.ebuild b/dev-haskell/haddock/haddock-0.6-r1.ebuild
index f0fe92ee8e3e..88f68931c51d 100644
--- a/dev-haskell/haddock/haddock-0.6-r1.ebuild
+++ b/dev-haskell/haddock/haddock-0.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-0.6-r1.ebuild,v 1.1 2003/12/17 17:56:35 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-0.6-r1.ebuild,v 1.2 2003/12/22 09:11:11 kosmikus Exp $
 #
 # USE variable summary:
 #   doc    - Build extra documenation from DocBook sources,
@@ -58,7 +58,7 @@ src_install() {
 
 	make install \
 		prefix="${D}/usr" \
-		datadir="${D}/usr/share/${PF}" \
+		datadir="${D}/usr/share/${P}" \
 		infodir="${D}/usr/share/info" \
 		mandir="${D}/usr/share/man" || die "make install failed"
 
diff --git a/dev-haskell/haddock/haddock-0.6-r2.ebuild b/dev-haskell/haddock/haddock-0.6-r2.ebuild
new file mode 100644
index 000000000000..d647aa98b740
--- /dev/null
+++ b/dev-haskell/haddock/haddock-0.6-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-0.6-r2.ebuild,v 1.1 2003/12/22 09:11:11 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 base
+IUSE="doc tetex"
+
+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 ~sparc"
+LICENSE="as-is"
+
+DEPEND="virtual/ghc
+	doc? ( >=app-text/openjade-1.3.1
+		>=app-text/sgml-common-0.6.3
+		=app-text/docbook-sgml-dtd-3.1-r1
+		>=app-text/docbook-dsssl-stylesheets-1.64
+		tetex? ( >=app-text/tetex-1.0.7
+		>=app-text/jadetex-3.12 ) )"
+
+RDEPEND=""
+
+# extend path to /opt/ghc/bin to guarantee that ghc-bin is found
+GHCPATH="${PATH}:/opt/ghc/bin"
+
+src_compile() {
+	# unset SGML_CATALOG_FILES because documentation installation
+	# breaks otherwise ...
+	PATH="${GHCPATH}" SGML_CATALOG_FILES="" econf
+	# using make because emake behaved strangely on my machine
+	make || die "make failed"
+
+	# if documentation has been requested, build documentation ...
+	if use doc; then
+		cd ${S}/haddock/doc
+		emake html \
+			datadir="/usr/share/doc/${PF}" \
+			|| die "emake html failed"
+		if use tetex; then
+			emake ps \
+				datadir="/usr/share/doc/${PF}" \
+				|| die "emake ps failed"
+		fi
+	fi
+}
+
+src_install() {
+	local mydoc
+
+	make install \
+		prefix="${D}/usr" \
+		datadir="${D}/usr/share/${P}" \
+		infodir="${D}/usr/share/info" \
+		mandir="${D}/usr/share/man" || die "make install failed"
+
+	cd ${S}/haddock
+	dodoc CHANGES LICENSE README TODO
+
+	if [ "`use doc`" ]; then
+		cd ${S}/haddock/doc
+		dohtml -r haddock/* || die
+		dosym haddock.html /usr/share/doc/${PF}/html/index.html
+		if [ "`use tetex`" ]; then
+			docinto ps
+			dodoc haddock.ps || die
+		fi
+	fi
+}