Version bump. Removed old.

Package-Manager: portage-2.2.7_p18/cvs/Linux x86_64
Manifest-Sign-Key: 0x611FF3AA

7 files changed, 88 insertions, 254 deletions

diff --git a/dev-haskell/alex/ChangeLog b/dev-haskell/alex/ChangeLog
index d2bf4c1b9575..32ccfb5c0a44 100644
--- a/dev-haskell/alex/ChangeLog
+++ b/dev-haskell/alex/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-haskell/alex
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/alex/ChangeLog,v 1.70 2013/08/02 07:12:20 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/alex/ChangeLog,v 1.71 2013/11/14 18:12:08 slyfox Exp $
+
+*alex-3.1.2 (14 Nov 2013)
+
+  14 Nov 2013; Sergei Trofimovich <slyfox@gentoo.org> +alex-3.1.2.ebuild,
+  -alex-2.3.5.ebuild, -alex-3.0.2.ebuild, -files/alex-2.3.5-ghc-7.2.patch,
+  -files/alex-2.3.5-missing-test.patch:
+  Version bump. Removed old.
 
   02 Aug 2013; Sergei Trofimovich <slyfox@gentoo.org> alex-3.0.5.ebuild:
   Fix alex build failure on nonempty HCFLAGS (by hasufell).
diff --git a/dev-haskell/alex/Manifest b/dev-haskell/alex/Manifest
index d2ddefaaf433..d91b7949d1a3 100644
--- a/dev-haskell/alex/Manifest
+++ b/dev-haskell/alex/Manifest
@@ -1,20 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX alex-2.3.5-ghc-7.2.patch 612 SHA256 27ff231ac38b3f9baf359403fad14058a15e4593d1276f057370903b9a01dd01 SHA512 dbf47c278bdd9c6ae4ad5d33e15375cae2bf14241003d9f731ef5d749e7d6bf744b27982a3616ce2bac6449ecb2dacabe6c4f8952ef299bad3b5d05fc40a385b WHIRLPOOL 44605d784903f8b399143952d70702af6790c609756eb59131f468cd176e23555365ede4eb85d276eab47fce71c34356f8886609a1f12afae3dab264bb6e879c
-AUX alex-2.3.5-missing-test.patch 1967 SHA256 29fb8f7136f8b23b317febe1658dfcaadba00d356e698ca9b2056bc2af40d6a9 SHA512 3df84e634b5b1dc0ec1d0ba100a740052e6f5bd5ac0396d09e17ddfe771b20c6521ad33032939208e307f98a5991bd03f018b741f6a054857dd1f21b27cc637f WHIRLPOOL ac6217f312e0cbd22b25245cd76f255c2a4f0cf49e547017feac2dd936121434ba116b7dd33e2dd07516e26e495ee0559cfd8799f32ea205d39ac3000fa8c9da
-DIST alex-2.3.5.tar.gz 79147 SHA256 2ea6d30b98881c0fd57bfafae024050cd98dc5b0140d64a6d722c64a098ed253 SHA512 7f78ec3fbd7484f8cfbc81bde67898f7863a4d6013401fb479cf275f779cf03565eae23a2abf6dfe7bfd8a5b0c7b3f2f66590ef3fc13b54a6cb7c25c725cbca6 WHIRLPOOL 534b310dfec82d59d397914b666a89cd878046b2c76a6887a0084738909096e83739d7e4d4fad8704856d9290968b74814fa3d438b689377434409ad537d931a
-DIST alex-3.0.2.tar.gz 100396 SHA256 997e33342c3c6e0edfff862f051fc286bd661f442d09d1bc02cd6e9d22083164 SHA512 799b65607b50944dc66cc7040449995df84019c36902a8675f75ab14476944a58b6c448c8e5f747a1685a29fae6e4766aa0bfd7951a3db086de0a8af1da13a9e WHIRLPOOL b802bb90ad3fcb73b6f03716c10695a3e4be4e51ba520505a559de9512e22a045b8175f425c85e15b14b29c90a2c5e2d5b3a7b6c883f252a627a39a2f5197843
 DIST alex-3.0.5.tar.gz 100004 SHA256 c3326417a0538e355e5ad1871ab931b9c8145391e8b2ff79668eb643d9b99659 SHA512 0a6a2500b4f8a96e1fd6252b11f7684e47875b80c0113a4ba0e855b54ccd45054f21af6cac30c3edb3b9ac86a7fc60810ea33376a7ab78794f980e3cf9a22eb9 WHIRLPOOL 5c9b07f7eae546d5920c9da4dd2d198d440275da1943d155ae53aaa92fbb9bc9e8c9c91a1303c6130c9341c7ba6518665f0ff383605fa1ecb8d4bd58066f3a87
-EBUILD alex-2.3.5.ebuild 1535 SHA256 609af86c4775383bc28b21e5f85e27b20326352c1866d9726eac9759e02cfc65 SHA512 b03442d9d782b04399f87fe0086e6ff9e5419798cafe85d26b7252c3f2356da996d90c7bd192da8dfa4a78bec9b4b7286437e22f055481f194855b4406292717 WHIRLPOOL 0dfddcf4f23fc825749ed13b56ea0a90c7ce988e39e32abe7cecd42c4e612a71efa4c057a79bfa0c9af89331cc3fff97c490bb028cced9f489b4d50348ff6439
-EBUILD alex-3.0.2.ebuild 1537 SHA256 82477ac2e82442ab59a7e16573278a9c6403e03f1ef05dba9c431a8264739299 SHA512 8a4902984df74e7ec1b151bebbf18c6fc092debd865446123092a635d2f26db6c2dc6154cf7d74f90adfd504d2606249d16b2134e67906fdf8060b4826c2c3ce WHIRLPOOL 97f11764c13a947b30da15b27e06bfbf290e40e976d95176b9d33df17c1b83fdbfc34f7be73705f1c0df62c0a8cffbc8a2acf89c8a2d908ba23c545e7ee2d1e1
+DIST alex-3.1.2.tar.gz 101215 SHA256 1d14eb255c44f440f04876c496ed5db24aba8d05b45d665463633afe92361e6d SHA512 21874caf41412d926866b0450db9e29984d1df076d277a2325b3d0b80114e039462ab766b0964177f98d9b625635e219489271ab2853e39f1fef3e7d6caa8660 WHIRLPOOL f38c2381d5587bb11754011c31104477a4fbc577f9fd469eab9b255e74a0efe093a25538296093bdf4a0369e545402865fff8c92f20ec3982d83113c761a46ce
 EBUILD alex-3.0.5.ebuild 1567 SHA256 a5471d101186752f23d247d7fc951b310f9074c627aa308ee27812423c69e91f SHA512 ffe3f02130d7966ad96bb1b6c8709f47b8cc23a10c042699b0536ee50478b797e226e6dd9f1888492986b1b5e904d67d82cd9816ecf22a6fc0fc8b3a9c6d4b7c WHIRLPOOL d2e8807c82b0a0b8d29774abffa2a3d17898316958c40a6e1ddbb7eed8f116327f200b3b2384aae58246880d7cf61fb24d3218976f4ed59156152b08290002b0
-MISC ChangeLog 8173 SHA256 a65f3f8edb78d67db5472e32b34d687bbed333ac49a1801a552eac4ba29dee14 SHA512 36b8b0e6d9e516a3a2c537756a3842fc7d442eb3b14d440154c8a0a25f92d2c4ff9374fd3fb9bf4dc5092a53dfe73a47eb550ce5f3e11f695c5551fe36db2a04 WHIRLPOOL f4cfb79c225eaf46305f0e6c6f6d7d409541f473e4fde61d6d359b02557c14ed09b7e3c9c7d5e3ad36dfd55e5c6c4f502c8f953464eb4ee2dfb32ad9843322a0
+EBUILD alex-3.1.2.ebuild 1519 SHA256 cc5d9e780fbe219548cd18959325b571c072eb082a4cf76ac37cf33038917c2e SHA512 d050bf8bcca574710ca3f75bc5a1565689aa6b71e7a104cb7120fe43eea1344594a8bafb4cc0550040b52c1c8e1e1e152895472205dec730bc7efb013cbcfdcf WHIRLPOOL 9e61b7a996d81a11228d26819ad45187e16e2cf3679031f5a0537210f782e4a9f6b83d8147c674ea0545bc8f54917a3f80e4806be4395a3878547815587770f2
+MISC ChangeLog 8419 SHA256 94cafdc206de9a637021ecde0750e2f35fd09006e7c3e1d5c42d94532802fe06 SHA512 33b35d924f51082c6617f5bac420a645d3bfc08e6c1865bee1d9b43a62daad062474992b6a4544a914b63ecc509954eb41a6311d8f70392dc3b0e6e002a454c9 WHIRLPOOL 764597b74587e18ba7513ed8fcae1d57f441af6c32c18c2d5c62242c2769d6ec0f5a3942d3f2c50021de29a068067a0488de9ab4fcc73c607fb61d2d659a7974
 MISC metadata.xml 326 SHA256 f40a10865b59708ebd1c177fbe0cc3a2d74171aebcdf3fa146847abd7f27ac1d SHA512 6f0f183147880df8a2631edcccf82ed7922302692dd2e534c74bde3c9009be4923cf4928ec8726511791a2ff0d381cafb3463547dc217a643b3ed4e47390b9d5 WHIRLPOOL 55b7bffce05f866e425023efa56eb9028a1bfe545649524f3afa393098192439342d99713a4d3b0150fbdc3d9adaf0122069414d4e713e6f8892905a4e9b14ee
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlH7WyYACgkQcaHudmEf86rgqQCdFIZhovyiuw5S/bJa+sfia1wO
-4OwAn2Aq7Ip66RULhWhHjACOCann4hHY
-=0rqF
+iEYEAREIAAYFAlKFEUsACgkQcaHudmEf86pFvgCfbzC2cEHK8jIDFiMZf6mtJAcx
+JCgAoIcSV10JwYnD1Dm6b/JSas3yEd6s
+=QVMa
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/alex/alex-2.3.5.ebuild b/dev-haskell/alex/alex-2.3.5.ebuild
deleted file mode 100644
index ccf8b4aa67f0..000000000000
--- a/dev-haskell/alex/alex-2.3.5.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/alex/alex-2.3.5.ebuild,v 1.9 2012/09/12 14:51:30 qnikst Exp $
-
-# ebuild generated by hackport 0.2.9
-
-EAPI="3"
-
-CABAL_FEATURES="bin"
-inherit autotools eutils haskell-cabal
-
-DESCRIPTION="Alex is a tool for generating lexical analysers in Haskell"
-HOMEPAGE="http://www.haskell.org/alex/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE="doc"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2
-		>=dev-lang/ghc-6.8.2
-	doc? (	~app-text/docbook-xml-dtd-4.2
-		app-text/docbook-xsl-stylesheets
-		>=dev-libs/libxslt-1.1.2 )"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.3.5-missing-test.patch"
-	epatch "${FILESDIR}/${PN}-2.3.5-ghc-7.2.patch"
-
-	for f in Scan Parser; do
-		rm "${S}/src/$f."*
-		mv "${S}/dist/build/alex/alex-tmp/$f.hs" "${S}"/src/
-	done
-
-	if use doc; then
-		cd "${S}/doc/"
-		eautoreconf || die "eautoreconf for docs failed"
-	fi
-}
-
-src_configure() {
-	cabal_src_configure
-
-	if use doc; then
-		cd "${S}/doc/"
-		econf || die "econf for docs failed"
-	fi
-}
-
-src_compile() {
-	cabal_src_compile
-
-	if use doc; then
-		emake -C "${S}/doc/" -j1 || die "emake for docs failed"
-	fi
-}
-
-src_test() {
-	emake -C "${S}/tests/" || die "emake for tests failed"
-}
-
-src_install() {
-	cabal_src_install
-
-	if use doc; then
-		doman "${S}/doc/alex.1"
-		dohtml -r "${S}/doc/alex/"
-	fi
-	dodoc README
-}
diff --git a/dev-haskell/alex/alex-3.0.2.ebuild b/dev-haskell/alex/alex-3.0.2.ebuild
deleted file mode 100644
index 8a2116a43d6f..000000000000
--- a/dev-haskell/alex/alex-3.0.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/alex/alex-3.0.2.ebuild,v 1.8 2013/04/22 17:36:11 slyfox Exp $
-
-# ebuild generated by hackport 0.2.9
-
-EAPI="3"
-
-CABAL_FEATURES="bin"
-inherit autotools eutils haskell-cabal
-
-DESCRIPTION="Alex is a tool for generating lexical analysers in Haskell"
-HOMEPAGE="http://www.haskell.org/alex/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE="doc"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6
-		>=dev-haskell/quickcheck-2
-		>=dev-lang/ghc-6.8.2
-	doc? (	~app-text/docbook-xml-dtd-4.2
-		app-text/docbook-xsl-stylesheets
-		>=dev-libs/libxslt-1.1.2 )"
-
-src_prepare() {
-	HCFLAGS+=-XBangPatterns #fixes build failure on BE platforms; bug 466778
-
-	for f in Scan Parser; do
-		rm "${S}/src/$f."*
-		mv "${S}/dist/build/alex/alex-tmp/$f.hs" "${S}"/src/
-	done
-
-	if use doc; then
-		cd "${S}/doc/"
-		eautoreconf || die "eautoreconf for docs failed"
-	fi
-}
-
-src_configure() {
-	cabal_src_configure
-
-	if use doc; then
-		cd "${S}/doc/"
-		econf || die "econf for docs failed"
-	fi
-}
-
-src_compile() {
-	cabal_src_compile
-
-	if use doc; then
-		emake -C "${S}/doc/" -j1 || die "emake for docs failed"
-	fi
-}
-
-src_test() {
-	emake -C "${S}/tests/" || die "emake for tests failed"
-}
-
-src_install() {
-	cabal_src_install
-
-	if use doc; then
-		doman "${S}/doc/alex.1"
-		dohtml -r "${S}/doc/alex/"
-	fi
-	dodoc README
-}
diff --git a/dev-haskell/alex/alex-3.1.2.ebuild b/dev-haskell/alex/alex-3.1.2.ebuild
new file mode 100644
index 000000000000..a508fae634ac
--- /dev/null
+++ b/dev-haskell/alex/alex-3.1.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/alex/alex-3.1.2.ebuild,v 1.1 2013/11/14 18:12:08 slyfox Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.4.9999
+
+CABAL_FEATURES="bin test-suite"
+inherit autotools haskell-cabal
+
+DESCRIPTION="Alex is a tool for generating lexical analysers in Haskell"
+HOMEPAGE="http://www.haskell.org/alex/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	>=dev-haskell/quickcheck-2
+	>=dev-lang/ghc-6.10.4
+	doc? ( ~app-text/docbook-xml-dtd-4.2
+		app-text/docbook-xsl-stylesheets
+		>=dev-libs/libxslt-1.1.2 )"
+
+src_prepare() {
+	# drop depend on itself and happy, otherwise cabal tries to regenerate it
+	rm src/{Scan.x,Parser.y} || die
+
+	for f in Scan Parser; do
+		mv "${S}/dist/build/alex/alex-tmp/$f.hs" "${S}"/src/ || die
+	done
+
+	if use doc; then
+		cd "${S}/doc/"
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	# make sure we don't accidentally use those
+	# installed in system
+	haskell-cabal_src_configure \
+		--with-alex=false \
+		--with-happy=false
+
+	if use doc; then
+		cd "${S}/doc/"
+		econf
+	fi
+}
+
+src_compile() {
+	cabal_src_compile
+
+	if use doc; then
+		emake -C "${S}/doc/" -j1
+	fi
+}
+
+src_install() {
+	cabal_src_install
+
+	if use doc; then
+		doman "${S}/doc/alex.1"
+		dohtml -r "${S}/doc/alex/"
+	fi
+	dodoc README
+}
diff --git a/dev-haskell/alex/files/alex-2.3.5-ghc-7.2.patch b/dev-haskell/alex/files/alex-2.3.5-ghc-7.2.patch
deleted file mode 100644
index 31ab1ceee597..000000000000
--- a/dev-haskell/alex/files/alex-2.3.5-ghc-7.2.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/alex.cabal b/alex.cabal
-index d04467b..b262af7 100644
---- a/alex.cabal
-+++ b/alex.cabal
-@@ -72,7 +72,7 @@ executable alex
- 
-   build-depends: base < 5
- 
--  extensions: CPP
-+  extensions: CPP, BangPatterns
-   ghc-options: -Wall
-   other-modules:
-         AbsSyn
-diff --git a/doc/configure.ac b/doc/configure.ac
-index 51fa85d..6e772c0 100644
---- a/doc/configure.ac
-+++ b/doc/configure.ac
-@@ -9,5 +9,5 @@ FP_DIR_DOCBOOK_XSL([/usr/share/xml/docbook/stylesheet/nwalsh/current /usr/share/
- 
- AC_PATH_PROG(DbLatexCmd,dblatex)
- 
--AC_CONFIG_FILES([config.mk])
-+AC_CONFIG_FILES([config.mk alex.1])
- AC_OUTPUT
diff --git a/dev-haskell/alex/files/alex-2.3.5-missing-test.patch b/dev-haskell/alex/files/alex-2.3.5-missing-test.patch
deleted file mode 100644
index 3c80b88a2096..000000000000
--- a/dev-haskell/alex/files/alex-2.3.5-missing-test.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-commit 883587ca4feecab72381991533b2f686a57a4d57
-Author: Sergei Trofimovich <slyfox@gentoo.org>
-Date:   Mon Jul 25 08:20:13 2011 +0300
-
-    added missing tokens_bytestring test
-    
-    Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
-
-diff --git a/alex.cabal b/alex.cabal
-index b262af7..c6f6e22 100644
---- a/alex.cabal
-+++ b/alex.cabal
-@@ -57,6 +57,7 @@ extra-source-files:
- 	tests/tokens.x
- 	tests/tokens_gscan.x
- 	tests/tokens_posn.x
-+	tests/tokens_bytestring.x
- 
- flag small_base
-   description: Choose the new smaller, split-up base package.
-diff --git a/tests/tokens_bytestring.x b/tests/tokens_bytestring.x
-new file mode 100644
-index 0000000..0cb23c8
---- /dev/null
-+++ b/tests/tokens_bytestring.x
-@@ -0,0 +1,46 @@
-+{
-+{-# LANGUAGE OverloadedStrings #-}
-+module Main (main) where
-+import System.Exit
-+import Data.ByteString.Lazy.Char8 (unpack)
-+}
-+
-+%wrapper "posn-bytestring"
-+
-+$digit = 0-9			-- digits
-+$alpha = [a-zA-Z]		-- alphabetic characters
-+
-+tokens :-
-+
-+  $white+				;
-+  "--".*				;
-+  let					{ tok (\p s -> Let p) }
-+  in					{ tok (\p s -> In p) }
-+  $digit+                               { tok (\p s -> Int p (read (unpack s))) }
-+  [\=\+\-\*\/\(\)]                      { tok (\p s -> Sym p (head (unpack s))) }
-+  $alpha [$alpha $digit \_ \']*         { tok (\p s -> Var p (unpack s)) }
-+
-+{
-+-- Each right-hand side has type :: AlexPosn -> String -> Token
-+
-+-- Some action helpers:
-+tok f p s = f p s
-+
-+-- The token type:
-+data Token =
-+	Let AlexPosn		|
-+	In  AlexPosn		|
-+	Sym AlexPosn Char	|
-+        Var AlexPosn String     |
-+	Int AlexPosn Int	|
-+	Err AlexPosn
-+	deriving (Eq,Show)
-+
-+main = if test1 /= result1 then exitFailure
-+			   else exitWith ExitSuccess
-+
-+test1 = alexScanTokens "  let in 012334\n=+*foo bar__'"
-+result1 = [Let (AlexPn 2 1 3),In (AlexPn 6 1 7),Int (AlexPn 9 1 10) 12334,Sym (AlexPn 16 2 1) '=',Sym (AlexPn 17 2 2) '+',Sym (AlexPn 18 2 3) '*',Var (AlexPn 19 2 4) "foo",Var (AlexPn 23 2 8) "bar__'"]
-+
-+
-+}