alex-2.1 works with cabal 1.1.6 only, not cabal 1.2

Package-Manager: portage-2.1.3.19

4 files changed, 23 insertions, 21 deletions

diff --git a/dev-haskell/alex/ChangeLog b/dev-haskell/alex/ChangeLog
index 47d6d80bb2e9..b52344ccd255 100644
--- a/dev-haskell/alex/ChangeLog
+++ b/dev-haskell/alex/ChangeLog
@@ -1,6 +1,9 @@
 # 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.32 2007/10/31 12:53:01 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/alex/ChangeLog,v 1.33 2007/12/13 00:39:22 dcoutts Exp $
+
+  12 Dec 2007; Duncan Coutts <dcoutts@gentoo.org> alex-2.1.0.ebuild:
+  alex-2.1 works with cabal 1.1.6 only, not cabal 1.2
 
   31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org> alex-2.0.1-r1.ebuild,
   alex-2.1.0.ebuild:
diff --git a/dev-haskell/alex/Manifest b/dev-haskell/alex/Manifest
index 9045130eb3b2..1a385caeed9d 100644
--- a/dev-haskell/alex/Manifest
+++ b/dev-haskell/alex/Manifest
@@ -3,18 +3,18 @@ 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
-EBUILD alex-2.0.1-r1.ebuild 1618 RMD160 8a0e5232db464af0e2fe7e2ab6d7a536c3c1b756 SHA1 479e1c70e25b8de62d22819cd9554fe0b9549dd7 SHA256 9e91f10bdffc513389ca6f61ff0c3166521214acecd131fd987f959b7a45ba1e
-MD5 f60521c9df788352e65979a2cb82ed1c alex-2.0.1-r1.ebuild 1618
-RMD160 8a0e5232db464af0e2fe7e2ab6d7a536c3c1b756 alex-2.0.1-r1.ebuild 1618
-SHA256 9e91f10bdffc513389ca6f61ff0c3166521214acecd131fd987f959b7a45ba1e alex-2.0.1-r1.ebuild 1618
-EBUILD alex-2.1.0.ebuild 1099 RMD160 87e729d84f2c16407e2a1f9768b743189d17c7ac SHA1 09af528ba5101c20eb4edca6f0ad11387d92b876 SHA256 af29959780fc690b00673a57196b360b8404be250199bb29a11a01860dc643ae
-MD5 86f79867cb5192917b47f13660b50eba alex-2.1.0.ebuild 1099
-RMD160 87e729d84f2c16407e2a1f9768b743189d17c7ac alex-2.1.0.ebuild 1099
-SHA256 af29959780fc690b00673a57196b360b8404be250199bb29a11a01860dc643ae alex-2.1.0.ebuild 1099
-MISC ChangeLog 3491 RMD160 ed5499f3cfd6b224dda849ac2fa8e4ed111d17d8 SHA1 9d3e7564d57090151b538562c7f7bf7d7dbfeb28 SHA256 9f8382e5a788eecaec8d771e6a050d7a0323e8d2760a23e9a194b5c3e1367e9d
-MD5 c598b2a61873560a70e27d49e9ab9f58 ChangeLog 3491
-RMD160 ed5499f3cfd6b224dda849ac2fa8e4ed111d17d8 ChangeLog 3491
-SHA256 9f8382e5a788eecaec8d771e6a050d7a0323e8d2760a23e9a194b5c3e1367e9d ChangeLog 3491
+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
+MISC ChangeLog 3615 RMD160 cbecef098ebae508b954b26e8190adbd6d38913e SHA1 ffa46763dc728134600851fd48edcc3cc66f6ffd SHA256 af08b8b51da6c53576669962d65d53409c9cb384a4e56b2c9d745e756995c364
+MD5 cc61a264e47ac48b13ca812679ae5fe4 ChangeLog 3615
+RMD160 cbecef098ebae508b954b26e8190adbd6d38913e ChangeLog 3615
+SHA256 af08b8b51da6c53576669962d65d53409c9cb384a4e56b2c9d745e756995c364 ChangeLog 3615
 MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
 MD5 c694674dcbef799cd4fdb6914683ebff metadata.xml 223
 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 metadata.xml 223
@@ -28,7 +28,7 @@ SHA256 b93d5e80b4f106a33e7814debfc00ca6dc02fe29aef6d446f13fcd5910674c1f files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFHKHtonUVyUObPUL4RApcbAJ0bBunHHAjIB9h+iZaqXnNsiZHoKQCeMcGx
-Cijl1keBzgoz9YZC0h2tdkc=
-=z+nP
+iD8DBQFHYH9TnUVyUObPUL4RAoSyAJ46yfb6nwVFyco9ADb2fJ9r5jJ3SwCeNoU8
+NZhHWYXwfi/eyNilsGg3nQc=
+=oF5Y
 -----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
index 285f47d15179..56b1f9fd75f9 100644
--- a/dev-haskell/alex/alex-2.0.1-r1.ebuild
+++ b/dev-haskell/alex/alex-2.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.17 2007/10/31 12:53:01 dcoutts Exp $
+# $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,
@@ -59,6 +59,5 @@ src_install() {
 		libdir0="${D}/usr/$(get_libdir)" \
 		|| die "make ${insttarget} failed"
 
-	cd ${S}/haddock
-	dodoc README
+	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 a0713c8907be..3ca6d35e8375 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
 # 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.9 2007/10/31 12:53:01 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/alex/alex-2.1.0.ebuild,v 1.10 2007/12/13 00:39:22 dcoutts Exp $
 
 CABAL_FEATURES="bin"
 inherit autotools haskell-cabal
@@ -16,7 +16,7 @@ IUSE="doc"
 # java use flag disabled because of bug #107019
 
 DEPEND=">=dev-lang/ghc-6.2
-		>=dev-haskell/cabal-1.1.6
+		=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 )"