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

Package-Manager: portage-2.1.3.19

6 files changed, 75 insertions, 113 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/Manifest b/dev-haskell/haddock/Manifest
index c121ec4c5ad6..2ffb223eab31 100644
--- a/dev-haskell/haddock/Manifest
+++ b/dev-haskell/haddock/Manifest
@@ -1,34 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST haddock-0.7-src.tar.gz 424745 RMD160 4cd90829970d576e94cb95276c7777d8d37991f0 SHA1 4f5606cfbc8858ab56a5e929dcaa92aafa483f93 SHA256 c33e80106a42b2400c358cb0f293e2e7979ef5dab2dec8c55c72b7a57a9f6217
 DIST haddock-0.8-src.tar.gz 162872 RMD160 80b7a582ea91fb36b97675d7ea8a027221a28b8e SHA1 e171d4446ac6fcef526cad4c688892fe587fe90e SHA256 d54078dd9dc75aa589cb05fbe1136c1fb41d4a346e30b71de948425ea7c05a55
-EBUILD haddock-0.7.ebuild 2532 RMD160 2ec55e492def4f10f9133b7301e05b7f68615ce4 SHA1 49a9c653f13a06b1f55e1332b8ee2f60c220712a SHA256 691ac8de3e2f7cb22b9d36be4abaad38420585c2f743aa73e8281982389d4dda
-MD5 83a0f76ba6d15b6715ef3aaad39a3e14 haddock-0.7.ebuild 2532
-RMD160 2ec55e492def4f10f9133b7301e05b7f68615ce4 haddock-0.7.ebuild 2532
-SHA256 691ac8de3e2f7cb22b9d36be4abaad38420585c2f743aa73e8281982389d4dda haddock-0.7.ebuild 2532
+DIST haddock-0.9.tar.gz 163380 RMD160 27685313184e70270d7e4f043c7d671b84acfb23 SHA1 f3c5299b657b170e7a44b66ebd60d3e0947a35aa SHA256 beefd4a6da577978e7a79cabba60970accc5cd48fbb04c424a6b36ace3a9f8d0
 EBUILD haddock-0.8.ebuild 1683 RMD160 1f0703226c9cb43ced4e04b0129162910587963c SHA1 4aad1f86d969f568399462533e2b55546d7892fa SHA256 590e99ccf635d60fa3c9d95ba1530bc5dbfd3338cd8896944d10e98f011ef42f
 MD5 a1e3d4a9a23e9f51dc9f5fd600104fca haddock-0.8.ebuild 1683
 RMD160 1f0703226c9cb43ced4e04b0129162910587963c haddock-0.8.ebuild 1683
 SHA256 590e99ccf635d60fa3c9d95ba1530bc5dbfd3338cd8896944d10e98f011ef42f haddock-0.8.ebuild 1683
-MISC ChangeLog 6790 RMD160 4a45d04b16a8dbb7e54a2df96f0e7803c038ccb9 SHA1 050f68281daf3c81d1915777d4ccc1dba0916ddb SHA256 ea25baea285ffb74cfc95706a40b781752346fde05aef7ac19105bfb37a1552e
-MD5 87c1a3bd5f19104441435f04fdf0c758 ChangeLog 6790
-RMD160 4a45d04b16a8dbb7e54a2df96f0e7803c038ccb9 ChangeLog 6790
-SHA256 ea25baea285ffb74cfc95706a40b781752346fde05aef7ac19105bfb37a1552e ChangeLog 6790
+EBUILD haddock-0.9.ebuild 1159 RMD160 7f85bedc85b9ba787227cb2da5d7cb090971a451 SHA1 0a6b800576a2999712b839ce268d0e5d660297af SHA256 7263d689bf8d2961c0b63dc1f52e0a8395f21b0b898ce4fa075d2ad148103363
+MD5 80d5e88bd0369a16b3a476b54d8c12aa haddock-0.9.ebuild 1159
+RMD160 7f85bedc85b9ba787227cb2da5d7cb090971a451 haddock-0.9.ebuild 1159
+SHA256 7263d689bf8d2961c0b63dc1f52e0a8395f21b0b898ce4fa075d2ad148103363 haddock-0.9.ebuild 1159
+MISC ChangeLog 6980 RMD160 826d5bc99fa29ca811ffdf6f6e4a26bd57ec76ce SHA1 56f74c866b24cdea5babe7574265fc519cb330ae SHA256 78b2a9d613e2cedae52a0fc0d0f22a044dbb2c0d8cb02f82f50f805677afc541
+MD5 01319a73168cc349a0fdb300d26ff162 ChangeLog 6980
+RMD160 826d5bc99fa29ca811ffdf6f6e4a26bd57ec76ce ChangeLog 6980
+SHA256 78b2a9d613e2cedae52a0fc0d0f22a044dbb2c0d8cb02f82f50f805677afc541 ChangeLog 6980
 MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
 MD5 c694674dcbef799cd4fdb6914683ebff metadata.xml 223
 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 metadata.xml 223
 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508 metadata.xml 223
-MD5 e386d6d9dde27815e5f6082f1f74d3de files/digest-haddock-0.7 247
-RMD160 9d337c6d5188a416b7c723c1c8a261f2959a2560 files/digest-haddock-0.7 247
-SHA256 21b4d64b16ca5700fb8e0d51fecdbd1f70bd9340edd1094d33a43d907bb385e3 files/digest-haddock-0.7 247
 MD5 3b77e187cde3f1ba2901ab9a5e7ef15b files/digest-haddock-0.8 247
 RMD160 1a1180d6268b3037ebb4a41866c8b71b2f3b456e files/digest-haddock-0.8 247
 SHA256 2719fc0c4edbfad95ce14105f3318f40e9b5aad3a0a9f633843dedfd00a0181f files/digest-haddock-0.8 247
+MD5 3074cc0990263e331df02d3ef6de2259 files/digest-haddock-0.9 235
+RMD160 7d6a0d7ebfe0718020cd5541498144d8d6f19592 files/digest-haddock-0.9 235
+SHA256 1cf6c3a17ff6a27f53e10a112b5adac16d3dce5be5ea25a0a2b8cd66d3452d28 files/digest-haddock-0.9 235
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHYMXonUVyUObPUL4RAjmLAJ4kiPnhUOhE7sb3scDow2+aI7L92wCdEdQX
-psW+xi6Z8b6ROiLlxrzDYVU=
-=Dzkq
+iD8DBQFHm5PknUVyUObPUL4RApimAJ47eCME7f6/jDnWKsG0EjIqz7wMVwCfRkz1
+E1ryUYP54KATF2SLcBhgfrw=
+=/ETu
 -----END PGP SIGNATURE-----
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
+}