6 files changed, 46 insertions, 104 deletions
diff --git a/dev-haskell/alex/ChangeLog b/dev-haskell/alex/ChangeLog
index 28f3d0f691ee..cbd2ace03bcc 100644
--- a/dev-haskell/alex/ChangeLog
+++ b/dev-haskell/alex/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-haskell/alex
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/alex/ChangeLog,v 1.34 2007/12/14 01:38:53 dcoutts Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/alex/ChangeLog,v 1.35 2008/01/26 20:24:10 dcoutts Exp $
+
+  26 Jan 2008; Duncan Coutts <dcoutts@gentoo.org> -alex-2.0.1-r1.ebuild,
+  alex-2.1.0.ebuild, alex-2.2.ebuild:
+  Fix qa bug #207490 and remove old version.
 
 *alex-2.2 (14 Dec 2007)
 
diff --git a/dev-haskell/alex/Manifest b/dev-haskell/alex/Manifest
index 42a03d815cf0..17904805a7f1 100644
--- a/dev-haskell/alex/Manifest
+++ b/dev-haskell/alex/Manifest
@@ -1,32 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST alex-2.0.1-src.tar.gz 346724 RMD160 a5afc29d4a8d709815cbe6ed171bde6129a3e7bc SHA1 9314815e100eee84cd3d308a6b2d0ef9d000b9bd SHA256 1f130cfff59c874ab89ab2efb750d6b9b121ce0a8e129a9db6653bb115187966
 DIST alex-2.1.0.tar.gz 67619 RMD160 2f2c6856e1054d9e996d92bafa0e60f6bed7bdad SHA1 37599b7be5249d639b3a5a3fdc61907dc4dad660 SHA256 0b9c1246ca6ef27df4bfcb16d13cf7525d943ba2edc897d628605e1c9bd7d58b
 DIST alex-2.2.tar.gz 85042 RMD160 d93c28ce0121073be1ee4893114b36faa2396b1b SHA1 a08670e4c749850714205f425cb460ed5a0a56b2 SHA256 e958d4fc6cfdb1d351dc39a45ea882f23b1b1773a736d43814a52d4939a41ffe
-EBUILD alex-2.0.1-r1.ebuild 1616 RMD160 023a9722a8e69a263d84058e436f47f6878a3a06 SHA1 5b91c90b0a729e970fa8f4b5bb998f608e6deeb1 SHA256 751cbe337ffc018ebbc4d3c62bb388230fe2b3559d1572a350842d08db70020f
-MD5 69eae53142b7685052f616d9f0c9ef00 alex-2.0.1-r1.ebuild 1616
-RMD160 023a9722a8e69a263d84058e436f47f6878a3a06 alex-2.0.1-r1.ebuild 1616
-SHA256 751cbe337ffc018ebbc4d3c62bb388230fe2b3559d1572a350842d08db70020f alex-2.0.1-r1.ebuild 1616
-EBUILD alex-2.1.0.ebuild 1100 RMD160 db9170679e9723dcbd7a53566caf1edb6ba39912 SHA1 eaaa6a229aceb53a51297256ed98481c4400a048 SHA256 39ed5355f07a4845475758aeaf9401b1c2d4b4ac23a65caaf25fb0dd050259ce
-MD5 d96d5eecbac387b0b5d7aac3fc4c3ccc alex-2.1.0.ebuild 1100
-RMD160 db9170679e9723dcbd7a53566caf1edb6ba39912 alex-2.1.0.ebuild 1100
-SHA256 39ed5355f07a4845475758aeaf9401b1c2d4b4ac23a65caaf25fb0dd050259ce alex-2.1.0.ebuild 1100
-EBUILD alex-2.2.ebuild 1100 RMD160 d46bc2c8909ea6dc5ba66ab02cb4c6b24c5f57cd SHA1 ba830b1d443c4f422ee9c9d63f9f518d0a2ea7c2 SHA256 58cb5644b2f63da8304e0eae1b8918f6dc5430a943a4df2a559222c8d39ed766
-MD5 967abe0f122d80b3a729d6071cd0b210 alex-2.2.ebuild 1100
-RMD160 d46bc2c8909ea6dc5ba66ab02cb4c6b24c5f57cd alex-2.2.ebuild 1100
-SHA256 58cb5644b2f63da8304e0eae1b8918f6dc5430a943a4df2a559222c8d39ed766 alex-2.2.ebuild 1100
-MISC ChangeLog 3751 RMD160 b09c93ee0359196ad6238df6a8cf0b94711866d2 SHA1 b6973bb86b95d57f1a1bdbf7ee242af11278d892 SHA256 0d436f8a8e29418aaaed0bb98f4119c316fcd7b8352136bdbf409fc55d073cc3
-MD5 90beeb97629ea8fbf451e70604b08044 ChangeLog 3751
-RMD160 b09c93ee0359196ad6238df6a8cf0b94711866d2 ChangeLog 3751
-SHA256 0d436f8a8e29418aaaed0bb98f4119c316fcd7b8352136bdbf409fc55d073cc3 ChangeLog 3751
+EBUILD alex-2.1.0.ebuild 1093 RMD160 ace459906c0d17a5c4e46db9d8cd7539b5be5fa4 SHA1 3377b4ae6062734ec64eb9fb40e52c8dbbc69f50 SHA256 c87d1d4974b0d111d7a550eefd4d4880c1ac75da60c19cb2e2d2f5a291dc8bd7
+MD5 493a12d67614962e00ae267625088774 alex-2.1.0.ebuild 1093
+RMD160 ace459906c0d17a5c4e46db9d8cd7539b5be5fa4 alex-2.1.0.ebuild 1093
+SHA256 c87d1d4974b0d111d7a550eefd4d4880c1ac75da60c19cb2e2d2f5a291dc8bd7 alex-2.1.0.ebuild 1093
+EBUILD alex-2.2.ebuild 1095 RMD160 b0dc72a955900d74b7cf4625029f70bcecd72b5e SHA1 b5a33fe9979038085d9a850864115d4b7fef531e SHA256 4ac12d349f60d5f548fa53bdf2b1690ee0e07e47157906bc0077da6b8ba2feee
+MD5 fd60e9e7e70dfa030a090bb79e3624ed alex-2.2.ebuild 1095
+RMD160 b0dc72a955900d74b7cf4625029f70bcecd72b5e alex-2.2.ebuild 1095
+SHA256 4ac12d349f60d5f548fa53bdf2b1690ee0e07e47157906bc0077da6b8ba2feee alex-2.2.ebuild 1095
+MISC ChangeLog 3908 RMD160 dccd98655478dc80bb343877f0fd23895f10edfd SHA1 5e14bfe9ba3748e2dae8bc0f3e1b4f9bce3ad515 SHA256 e3bddec85457dd5b9b4a185dd8cf6af8fdc4fb5483e1b304187b36c7f019b39f
+MD5 1375f920bb57f8f7f302d2441cb7157a ChangeLog 3908
+RMD160 dccd98655478dc80bb343877f0fd23895f10edfd ChangeLog 3908
+SHA256 e3bddec85457dd5b9b4a185dd8cf6af8fdc4fb5483e1b304187b36c7f019b39f ChangeLog 3908
 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 e73d53ff3d58059e3eb24f74bb36c542 files/digest-alex-2.0.1-r1 244
-RMD160 d363cafbe1939b15e2e9ebe583a4d552a66b1d55 files/digest-alex-2.0.1-r1 244
-SHA256 623c6d5a918fbea14ee253b588f88f476e66b43507e2054bc51bc53fa8903f2e files/digest-alex-2.0.1-r1 244
 MD5 adaf626335c8504f2c5ad7182faa9691 files/digest-alex-2.1.0 229
 RMD160 facd59c247ada8a9d5015d8f2440d7de60c788d4 files/digest-alex-2.1.0 229
 SHA256 b93d5e80b4f106a33e7814debfc00ca6dc02fe29aef6d446f13fcd5910674c1f files/digest-alex-2.1.0 229
@@ -34,9 +26,9 @@ MD5 7e41f7a5318498f79673358f4b96c038 files/digest-alex-2.2 223
 RMD160 b234b3369fb86dbe6883f24f8db8121b12b98454 files/digest-alex-2.2 223
 SHA256 8524e822267c97ab2826dc7c1d5dc14dad7dcd8f5d5ce02404db6af2d30b6004 files/digest-alex-2.2 223
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHYd7HnUVyUObPUL4RAkaMAJ90o/4EF5lXy8kWLV/MapKfRXohRwCfUTNy
-3Z7xwgrSagHGM+URWmaQ52k=
-=Ob4q
+iD8DBQFHm5bxnUVyUObPUL4RAtI+AJ0cPy5KnnYmcAynnWZ09UCJVkuqpQCdGEAc
+A9s940/neFZFcikVLygoQdE=
+=A52m
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/alex/alex-2.0.1-r1.ebuild b/dev-haskell/alex/alex-2.0.1-r1.ebuild
deleted file mode 100644
index 56b1f9fd75f9..000000000000
--- a/dev-haskell/alex/alex-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,63 +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/alex/alex-2.0.1-r1.ebuild,v 1.18 2007/12/13 00:39:22 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 base eutils ghc-package
-IUSE="doc"
-# java use flag disabled because of bug #107019
-
-DESCRIPTION="A lexical analyser generator for Haskell"
-SRC_URI="http://www.haskell.org/alex/dist/${P}-src.tar.gz"
-HOMEPAGE="http://www.haskell.org/alex"
-
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ppc64 sparc x86"
-LICENSE="as-is"
-
-DEPEND=">=dev-lang/ghc-6.2
-	doc? (	~app-text/docbook-xml-dtd-4.2
-		app-text/docbook-xsl-stylesheets
-		>=dev-libs/libxslt-1.1.2 )"
-# java? >=dev-java/fop-0.20.5
-RDEPEND=""
-
-src_compile() {
-	local mydoc
-	econf || die "econf failed"
-
-	# 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
-
-	emake -j1 || die "make failed"
-}
-
-src_install() {
-	local insttarget
-
-	insttarget="install"
-	use doc && insttarget="${insttarget} install-docs"
-	emake -j1 ${insttarget} \
-		prefix="${D}/usr" \
-		datadir="${D}/usr/share/doc/${PF}" \
-		infodir="${D}/usr/share/info" \
-		mandir="${D}/usr/share/man" \
-		libdir0="${D}/usr/$(get_libdir)" \
-		|| die "make ${insttarget} failed"
-
-	dodoc "${S}/haddock/README"
-}
diff --git a/dev-haskell/alex/alex-2.1.0.ebuild b/dev-haskell/alex/alex-2.1.0.ebuild
index 3ca6d35e8375..4fd919af3a55 100644
--- a/dev-haskell/alex/alex-2.1.0.ebuild
+++ b/dev-haskell/alex/alex-2.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/alex/alex-2.1.0.ebuild,v 1.10 2007/12/13 00:39:22 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/alex/alex-2.1.0.ebuild,v 1.11 2008/01/26 20:24:10 dcoutts Exp $
 
 CABAL_FEATURES="bin"
 inherit autotools haskell-cabal
@@ -13,22 +13,28 @@ LICENSE="as-is"
 SLOT="0"
 KEYWORDS="amd64 ~ia64 ppc ppc64 sparc x86"
 IUSE="doc"
-# java use flag disabled because of bug #107019
 
 DEPEND=">=dev-lang/ghc-6.2
 		=dev-haskell/cabal-1.1.6*
 	doc? (	~app-text/docbook-xml-dtd-4.2
 		app-text/docbook-xsl-stylesheets
 		>=dev-libs/libxslt-1.1.2 )"
-# java? >=dev-java/fop-0.20.5
 RDEPEND=""
 
+src_unpack() {
+	unpack ${A}
+
+	if use doc; then
+		cd "${S}/doc/"
+		eautoreconf || die "eautoreconf for docs failed"
+	fi
+}
+
 src_compile() {
 	cabal_src_compile
 
 	if use doc; then
 		cd "${S}/doc/"
-		eautoreconf || die "eautoreconf for docs failed"
 		econf || die "econf for docs failed"
 		emake -j1 || die "emake for docs failed"
 	fi
diff --git a/dev-haskell/alex/alex-2.2.ebuild b/dev-haskell/alex/alex-2.2.ebuild
index be3f47424aaf..87787b7ae416 100644
--- a/dev-haskell/alex/alex-2.2.ebuild
+++ b/dev-haskell/alex/alex-2.2.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/alex/alex-2.2.ebuild,v 1.1 2007/12/14 01:38:53 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/alex/alex-2.2.ebuild,v 1.2 2008/01/26 20:24:10 dcoutts Exp $
 
 CABAL_FEATURES="bin"
-CABAL_MIN_VERSION="1.2.1"
 inherit autotools haskell-cabal
 
 DESCRIPTION="A lexical analyser generator for Haskell"
@@ -14,21 +13,28 @@ LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc"
-# java use flag disabled because of bug #107019
 
-DEPEND=">=dev-lang/ghc-6.2
+DEPEND=">=dev-lang/ghc-6.4
+		>=dev-haskell/cabal-1.2.1
 	doc? (	~app-text/docbook-xml-dtd-4.2
 		app-text/docbook-xsl-stylesheets
 		>=dev-libs/libxslt-1.1.2 )"
-# java? >=dev-java/fop-0.20.5
 RDEPEND=""
 
+src_unpack() {
+	unpack ${A}
+
+	if use doc; then
+		cd "${S}/doc/"
+		eautoreconf || die "eautoreconf for docs failed"
+	fi
+}
+
 src_compile() {
 	cabal_src_compile
 
 	if use doc; then
 		cd "${S}/doc/"
-		eautoreconf || die "eautoreconf for docs failed"
 		econf || die "econf for docs failed"
 		emake -j1 || die "emake for docs failed"
 	fi
diff --git a/dev-haskell/alex/files/digest-alex-2.0.1-r1 b/dev-haskell/alex/files/digest-alex-2.0.1-r1
deleted file mode 100644
index 2dea3053b1e8..000000000000
--- a/dev-haskell/alex/files/digest-alex-2.0.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 edb62560e29c8de23913c65c52adbf19 alex-2.0.1-src.tar.gz 346724
-RMD160 a5afc29d4a8d709815cbe6ed171bde6129a3e7bc alex-2.0.1-src.tar.gz 346724
-SHA256 1f130cfff59c874ab89ab2efb750d6b9b121ce0a8e129a9db6653bb115187966 alex-2.0.1-src.tar.gz 346724