Fix qa bug #207490 and remove old version.

(Portage version: 2.1.3.19)

5 files changed, 30 insertions, 80 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/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