Add new version and remove old version which had some QA issues.

(Portage version: 2.1.3.19)

5 files changed, 59 insertions, 97 deletions

diff --git a/dev-haskell/haddock/ChangeLog b/dev-haskell/haddock/ChangeLog
index efd2f5651893..50069d2d2110 100644
--- a/dev-haskell/haddock/ChangeLog
+++ b/dev-haskell/haddock/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-haskell/haddock
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.52 2007/12/13 05:40:31 dcoutts Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.53 2008/01/26 20:11:10 dcoutts Exp $
+
+*haddock-0.9 (26 Jan 2008)
+
+  26 Jan 2008; Duncan Coutts <dcoutts@gentoo.org> -haddock-0.7.ebuild,
+  +haddock-0.9.ebuild:
+  Add new version and remove old version which had some QA issues.
 
   13 Dec 2007; Duncan Coutts <dcoutts@gentoo.org> haddock-0.8.ebuild:
   Updates for upward compatability with cabal-1.2 and ghc-6.8
diff --git a/dev-haskell/haddock/files/digest-haddock-0.7 b/dev-haskell/haddock/files/digest-haddock-0.7
deleted file mode 100644
index 74c6f105ecbc..000000000000
--- a/dev-haskell/haddock/files/digest-haddock-0.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 759419e78416d5f093190968a4dc18f5 haddock-0.7-src.tar.gz 424745
-RMD160 4cd90829970d576e94cb95276c7777d8d37991f0 haddock-0.7-src.tar.gz 424745
-SHA256 c33e80106a42b2400c358cb0f293e2e7979ef5dab2dec8c55c72b7a57a9f6217 haddock-0.7-src.tar.gz 424745
diff --git a/dev-haskell/haddock/files/digest-haddock-0.9 b/dev-haskell/haddock/files/digest-haddock-0.9
new file mode 100644
index 000000000000..f0ef5f94b2c1
--- /dev/null
+++ b/dev-haskell/haddock/files/digest-haddock-0.9
@@ -0,0 +1,3 @@
+MD5 8ba056279427231fd35c8ca2e690221d haddock-0.9.tar.gz 163380
+RMD160 27685313184e70270d7e4f043c7d671b84acfb23 haddock-0.9.tar.gz 163380
+SHA256 beefd4a6da577978e7a79cabba60970accc5cd48fbb04c424a6b36ace3a9f8d0 haddock-0.9.tar.gz 163380
diff --git a/dev-haskell/haddock/haddock-0.7.ebuild b/dev-haskell/haddock/haddock-0.7.ebuild
deleted file mode 100644
index 9dde0b2ad326..000000000000
--- a/dev-haskell/haddock/haddock-0.7.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2007 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.17 2007/12/13 00:45:33 dcoutts Exp $
-#
-# USE variable summary:
-#	doc	   - Build extra documenation from DocBook sources,
-#				in HTML format.
-#	java   - Build the above docs as PostScript as well.
-
-inherit ghc-package multilib
-IUSE="doc"
-#java use flag disable, bug #107019
-
-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="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
-LICENSE="as-is"
-
-DEPEND="<dev-lang/ghc-6.6
-	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=""
-
-pkg_setup() {
-	if ! has_version dev-lang/ghc; then
-		eerror "Due to a bug in the portage dependency resolution, emerge"
-		eerror "sometimes tries to merge haddock before a version of ghc"
-		eerror "is available on the system. This is usually triggered when"
-		eerror "you try to bootstrap ghc on a system with USE=\"doc\" using"
-		eerror "the command"
-		eerror
-		eerror "   emerge ghc"
-		eerror
-		eerror "To resolve this problem, proceed in two steps. First, emerge"
-		eerror "haddock (which should first pull in ghc-bin). Second, emerge"
-		eerror "ghc again:"
-		eerror
-		eerror "   emerge haddock"
-		eerror "   emerge ghc"
-		die "portage dependency problem"
-	fi
-}
-
-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 README TODO
-}
diff --git a/dev-haskell/haddock/haddock-0.9.ebuild b/dev-haskell/haddock/haddock-0.9.ebuild
new file mode 100644
index 000000000000..bf1f00e6fe40
--- /dev/null
+++ b/dev-haskell/haddock/haddock-0.9.ebuild
@@ -0,0 +1,48 @@
+# 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-0.9.ebuild,v 1.1 2008/01/26 20:11:10 dcoutts Exp $
+
+CABAL_FEATURES="bin"
+inherit haskell-cabal eutils autotools
+
+DESCRIPTION="A documentation tool for Haskell."
+HOMEPAGE="http://haskell.org/haddock/"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+DEPEND=">=dev-lang/ghc-6.4
+		>=dev-haskell/cabal-1.2
+	doc? (  ~app-text/docbook-xml-dtd-4.2
+			app-text/docbook-xsl-stylesheets
+			>=dev-libs/libxslt-1.1.2 )"
+RDEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	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/"* || die "installing docs failed"
+	fi
+	dodoc CHANGES README
+}