last change should have been -r1 because everyone should upgrade; created now

4 files changed, 86 insertions, 3 deletions

diff --git a/dev-haskell/haddock/ChangeLog b/dev-haskell/haddock/ChangeLog
index ad884c298a72..53148fd60e18 100644
--- a/dev-haskell/haddock/ChangeLog
+++ b/dev-haskell/haddock/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-haskell/haddock
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.6 2003/12/16 15:36:18 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.7 2003/12/17 17:56:35 kosmikus Exp $
+
+*haddock-0.6-r1 (17 Dec 2003)
+
+  17 Dec 2003; Andres Loeh <kosmikus@gentoo.org> haddock-0.6-r1.ebuild:
+  Created -r1 to make sure everyone updates to the correct version.
 
   16 Dec 2003; Andres Loeh <kosmikus@gentoo.org> haddock-0.6.ebuild:
   Fixed ebuild: Library files now in correct position. Cleaned installation of
diff --git a/dev-haskell/haddock/Manifest b/dev-haskell/haddock/Manifest
index ffe6ab06b4bd..abf69ce09ac6 100644
--- a/dev-haskell/haddock/Manifest
+++ b/dev-haskell/haddock/Manifest
@@ -1,8 +1,8 @@
 MD5 259a626193a148c7b93be296843b4b5e haddock-0.4.ebuild 2056
 MD5 1558aa1f0fe1bc31fe82e0e10be5d1dd haddock-0.6.ebuild 1977
-MD5 1558aa1f0fe1bc31fe82e0e10be5d1dd haddock-0.6-r1.ebuild 1977
+MD5 f69ee376aac42b8b4d0d015099211b08 haddock-0.6-r1.ebuild 1980
 MD5 e5986ca528feeab7b061105cfb1c9935 haddock-0.5.ebuild 1963
-MD5 e63e681071f5f23c765aea106bf5ac9c ChangeLog 1384
+MD5 5b4aa49981749b697f1cd847330f7097 ChangeLog 1384
 MD5 a769ecfcd1cdd2d40986627df7dfb249 metadata.xml 224
 MD5 6c35081e22594c96591797459c28da01 files/digest-haddock-0.6-r1 67
 MD5 0fe55540bd0531c1ca8da69fb5098d76 files/haddock-0.4-ghc6.patch 6858
diff --git a/dev-haskell/haddock/files/digest-haddock-0.6-r1 b/dev-haskell/haddock/files/digest-haddock-0.6-r1
new file mode 100644
index 000000000000..fc424528e86b
--- /dev/null
+++ b/dev-haskell/haddock/files/digest-haddock-0.6-r1
@@ -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
new file mode 100644
index 000000000000..f0fe92ee8e3e
--- /dev/null
+++ b/dev-haskell/haddock/haddock-0.6-r1.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-r1.ebuild,v 1.1 2003/12/17 17:56:35 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/${PF}" \
+		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
+}