Drop old.

Package-Manager: portage-2.2.0_alpha177_p3/cvs/Linux x86_64
Manifest-Sign-Key: 0x611FF3AA

8 files changed, 12 insertions, 545 deletions

diff --git a/dev-haskell/regex-base/ChangeLog b/dev-haskell/regex-base/ChangeLog
index b1af1666b072..b98635bf1645 100644
--- a/dev-haskell/regex-base/ChangeLog
+++ b/dev-haskell/regex-base/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-haskell/regex-base
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/regex-base/ChangeLog,v 1.38 2013/04/02 10:26:03 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/regex-base/ChangeLog,v 1.39 2013/06/19 06:32:50 slyfox Exp $
+
+  19 Jun 2013; Sergei Trofimovich <slyfox@gentoo.org>
+  -files/regex-base-0.71-0.72.patch, -regex-base-0.71.ebuild,
+  -regex-base-0.72.0.1.ebuild, -regex-base-0.72.0.2.ebuild,
+  -regex-base-0.72.ebuild, -regex-base-0.93.1.ebuild:
+  Drop old.
 
 *regex-base-0.93.2-r1 (02 Apr 2013)
 
diff --git a/dev-haskell/regex-base/Manifest b/dev-haskell/regex-base/Manifest
index 45baf1c2ea47..cc7c3cbc9137 100644
--- a/dev-haskell/regex-base/Manifest
+++ b/dev-haskell/regex-base/Manifest
@@ -1,25 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX regex-base-0.71-0.72.patch 17967 SHA256 2d2c99e429c8b1a8875abed2178d54dfb99f4c2a27ee07888f72d17d04f955a2 SHA512 d1389cd4004f9e5922158bc5750be851b300c03a5b7723513b365b85b1771dcf82be5bcd7a5a93b83799164c076b58f26eb31b9eb3dc36e12e58569c4a9cffbc WHIRLPOOL b59e7ebb00e8aba1c6446bb10b635bb747e29c67d24601de229ae9c9c5bc6e8a10004d3f0d29affe89af0cfd879f1bb7aa1872616f39858422af44c26cd01f41
-DIST regex-base-0.71.tar.gz 6759 SHA256 af230c3088c6a963c4dc29a203c8804b707aa02c135113cce13d1fefdde02ff9 SHA512 027aea713d93aa783b9142760e15e77d3e9fd0ac9b9a8ca391435939b6995a8954085891c4b015e244f19a4885577a988b7cd0cd8d78fe55d183a78cd572928d WHIRLPOOL 65c17a77f198803907efe136352f83d3a716c8147ede0d0569f4fcce91813efd0637ff11cfa49b2add52ea0a2e59fcd48b32b9257cd10b71ca0e3d75be1650e2
-DIST regex-base-0.72.0.1.tar.gz 6916 SHA256 22a521476775ede118f121e8ad0074022431ece6fb0bbeb43c073e7cad36ee59 SHA512 5bb75d9e6c7f7c5507bcf903b242998482af7f30224190744ae40cb13eef71e6148aa4c3ecc67ec9452d4065597670f7fd670dc93f492f506c445f73db6d11f7 WHIRLPOOL 4af60db8864bc1c8b1445c50e4b3695e05cc06a3accc8adf428069f46ddde278fd864b327b1dbfbae8179fd57ec92e103734eb96e089cfde28c2c8cb8e07096c
-DIST regex-base-0.72.0.2.tar.gz 11139 SHA256 38a4901b942fea646a422d52c52ef14eec4d6561c258b3c54cd96a8a354141ee SHA512 5e0c2678bb7a0095f13ebc89f0452a45864919f9dae29849c5551de5f7a33ed979a47ca2c5eeedfdd9caeab53a999cfed76aeaccac0fdd0d6ec633e80149a2e4 WHIRLPOOL 04d1f34240c9ff822b83e1238c30941d273999fcbc1a339e88d20de46fd1b7ca2fa1393d07eb24d9abbddd18d0fe9be862cbd4333c80107961890b991c057631
-DIST regex-base-0.93.1.tar.gz 9212 SHA256 24a0e76ab308517a53d2525e18744d9058835626ed4005599ecd8dd4e07f3bef SHA512 fdc4ec06ed95079e2cd0fa2bce04311c2a40129ce6a7f09fde4504c606ee34ca159dfe51bdd540256090f2e40d069fe300463ea3a3a64f5ae7f5bce066d78200 WHIRLPOOL f9a7e49a8029036c69fa02f3cdcf2086acebbbdd5d657222ec8c087a661c583421ff5eb83915cc7c04f994b88f19057ea049d20e68b381c45ad6e5f6c66ea402
 DIST regex-base-0.93.2.tar.gz 9156 SHA256 20dc5713a16f3d5e2e6d056b4beb9cfdc4368cd09fd56f47414c847705243278 SHA512 4f6269cb1c1fefa2164d999e2e787118edc5fd88e356535e50f143d0b98de4fa1854959955e183aed27a77335b81063a2385bb6bdeb8cb80e7fdd812ab96d22a WHIRLPOOL 2ad6d339e830f092916a3dfd87a2f6415a3999b33377250a91f6ac655174f8f13aa9cc4187a6840126443353fd625094060ed661faad54229a89160ea3c54579
-EBUILD regex-base-0.71.ebuild 579 SHA256 2258ba98f315716e2aa63f329318e7c5e1620edbfb72a79efefc5b2c8439cb5a SHA512 bb2f14dfd52a69420c8cbe649460417e192306784f3db60f757c2d2989369408ae65156c5dbd4a8481dae7b2849681b039956ceb78ff4df0f36468f056f25452 WHIRLPOOL 9ce1e1714e38c07cdc749101e02776534c622691d35ff0ff712a728a0bd2827ed62dc00283a7fb007c46102bac314d1de917eda2472bdf8e28ec720226c3f7f6
-EBUILD regex-base-0.72.0.1.ebuild 592 SHA256 2315ad3992d9e8789e4032bf3f70b640c38554bf30c33c470290d7c2c668a8c3 SHA512 806dc5d72e18eb33824e4d99f9ca60dfc2b2dc81cf88e274c94c2dcd66f9b8da25a0b7b74e1b5e99a06a705f060966270bd300c07f23ccb612746f47884d23b9 WHIRLPOOL 73eae9adc28b9a2e4be9a692b97e2d6e86ab2a33b6c96d8b1b23dd87e63d1e99d1b048f6a00f6888873f3f92f0b313a007cfa81c1b22482417387e36aceec35f
-EBUILD regex-base-0.72.0.2.ebuild 622 SHA256 aa656dbd81183d25b6150bef379256a0cb3421adcb901c9f1a708f5c23651f5c SHA512 8d9d788cfd0f4b0aa3935b173990cb0dae3f59c0c3c092cb24e3abff69ce5fbb09020a6fb97f7471ed2716234d6aa594d02d3fea50ce7f8ca820278704dd0410 WHIRLPOOL 6bab97428355aa4a0e126e02ee87fed24420ee9572322603783d220e6e5576f8b70551ee645b538144c576adfc186031416ae45bf0dea76cf73457ccaf627ad2
-EBUILD regex-base-0.72.ebuild 807 SHA256 86778be16339ddbebc1ac8396ac6c1cbcea06edc12291b90b3a6b4ba1132bd48 SHA512 bc58371beab01346b522455c283b712177002cde5255ee5fdd6e75f59ed0b2e1113b566410b51fc62d1a7cf04681e7372dae0cb8361f4a63fcf87d5c94e238dd WHIRLPOOL 79ba2a957255389223b847c7d62eed83aeed17d8589778f53502839da50db21d04a8fa85f7b5f46d90b6a9f806a4dddf9c48ae32066b80f158469a5afe17894c
-EBUILD regex-base-0.93.1.ebuild 700 SHA256 e014e17d11b8f31f2a643bd5bb5cb9148f84a884c55ac511a3e73b0396d0302e SHA512 d884a5ef38399d35c0a3beb1a054729ba890f7eab0f316d4acaa6e34c63d9e3e7fb20aaaaa45bc9419b034130b43c3798ddf25f68fe600b685158cd52f106878 WHIRLPOOL b41481abf57f8f739d1f6384e7eda5130160eeff8d5840271e8573c45377bc6813fdc35bd19f3fa2e7b7e33c919f2a0518c873d463edf1d2497665b6fcef7e88
 EBUILD regex-base-0.93.2-r1.ebuild 888 SHA256 323f62a0c5737a84cdafd11b768801c82aa14c9cac20d5bd8661e71e82ab9c56 SHA512 d2351692bd0a1600700c376f3a56dd18f73314739b94cb81f2defac00a367e4758609d2a40958d48e1d15e3004096777152dcb195cb62aff08ef4237b172244b WHIRLPOOL 8ec9fd54a712a4e9eaa635aaf179b5f0e3cc854d3c34997a14a4244d0e178a529ba1d226a5105f1b40fcc65b43594bd2e1a1f348e0dc789e2abb606ad5e6b7a5
 EBUILD regex-base-0.93.2.ebuild 754 SHA256 6866af2cc4d37949c7d1b9e3859f9f6ef401112434e917d5dea74f421ecbdf4e SHA512 d8e984f1320e74535b46c8ee6d7aade399f92a3d8282a785cbf0ffdfdc9a83fa2c4fd632dd687ad710bd7e80cf9f01ecd0cf245711a4586f524dda824d072a68 WHIRLPOOL 77bf68731e9cc161001830a53a2c02ef0c14a3c17e62de7644a595e6c9ebbe57e5342f65eaf60b322a91443cfa6175046029233e7df59c16d775b8aaa6af02ea
-MISC ChangeLog 5392 SHA256 baa970afca1754a2cf9963ad93ba1059a7788481172d6d79c2c012f27ee8c9f5 SHA512 264e617ddd2a89da0d2c51f2bd59d202ce80cfdb66d9b6abd92f00e1683a03bcb9ef76f7462f6319808bd9fa73ffa3ad2b93164e212761ffdd1d2c0d11cdcbeb WHIRLPOOL 634e0f8abfb500d360ac51ab55266d33abc1e5aaeae6c0be9c97df65dd7eb5d1e0b87978fe841bdbe889e60db783e7e702bdcb4225bf98c450a34fa49cbe749f
+MISC ChangeLog 5635 SHA256 55746dba7cf779d0ebf720eee879b5f7c5940f2d5a9ee656ae836d5c279ab6d8 SHA512 aaded9d418a0dd7f763f909bf0384b3fac9a6c70ff2f0022dc50d43d08a80224ab192c1060f72a64fea311f4e7a8e93798a5adf906f1c0bdaf293c9d76097c3d WHIRLPOOL c02bb2a2e4d9032019237f75756d08c5d7a806fdb078a8995045a5f015ad1d7d3d02ab814dc9ae2b7022579521096f1e4c30157076b97bd0e1c85611e6b23eae
 MISC metadata.xml 223 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508 SHA512 24765bbf1cb187cd262aa7fb3824c1cec65e2bf3f2198099de688916d96401a26458265b15408f22b1fbd6d6a2842df814a57ceda80dfa00d130b24423b7544f WHIRLPOOL 8fd6700f6198db6540eb51edf11372faeb6eb8a542a692e515badf236f62444f2c180f7d08e0f98e9fdfa23de14631b31af50543469aaa27084d6b637e2644c7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlFashkACgkQoBEVQmGOlx++DwD+IfOAKtdfFaEzWLnCXqyvJG8c
-lpzw8oDp3oJTu/1OZ5cA/R5anHhGykxGznpuMbEPWCP4SJ/uXVbNmQQz+ZOTpH0/
-=UCG1
+iEYEAREIAAYFAlHBUDAACgkQcaHudmEf86pnpACfamHd65VrGq7l9WRRSOKF+iSO
+LaEAnjgNTurBhgvwEZxvbLJ/Iq0Ct9Ma
+=TSt2
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/regex-base/files/regex-base-0.71-0.72.patch b/dev-haskell/regex-base/files/regex-base-0.71-0.72.patch
deleted file mode 100644
index 7d20ce4e10f1..000000000000
--- a/dev-haskell/regex-base/files/regex-base-0.71-0.72.patch
+++ /dev/null
@@ -1,422 +0,0 @@
-diff -urwpN regex-base-0.71/doc/lazy.html ghc-6.6.1/libraries/regex-base/doc/lazy.html
---- regex-base-0.71/doc/lazy.html	1970-01-01 01:00:00.000000000 +0100
-+++ ghc-6.6.1/libraries/regex-base/doc/lazy.html	2007-04-25 18:24:10.000000000 +0100
-@@ -0,0 +1,139 @@
-+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-+<HTML>
-+  <head>
-+    <title>Text.Regex.Lazy</title>
-+  </head>
-+<body>
-+<h1><tt>Text.Regex.Lazy</tt></h1>
-+<h2>Version 0.70 (2006-08-10)</h2>
-+
-+<h3>By Chris Kuklewicz (TextRegexLazy (at) personal (dot) mightyreason (dot) com)</h3>
-+
-+Changes from 0.66 to 0.70
-+<ul>
-+  <li> regex-tre added for libtre backend (Text.Regex.TRE), see http://laurikari.net/tre/
-+  <li> regex-devel added for tests and benchmarks
-+  <li> Text.Regex.*.Wrap APIs improved: the exported wrap* functions
-+  never call fail or error under normal circumstances, and use Either
-+  types to report errors.  Allocation failures are reported with fail.
-+  <li> Text.Regex.*.(ByteString|String) all should export
-+  compile/execute/regexec functions which report errors using Either.
-+</ul>
-+
-+Changes from 0.55 to 0.66
-+<ul>
-+  <li> I broke this into many packages, regex-base for the interface and regex-pcre, regex-posix, regex-parsec, regex-dfa for the four backends and regex-compat to replace Text.Regex(.New)
-+  <li> The top level Makefile now can drive setup and installation of all the packages at once.
-+</ul>
-+
-+Changes from 0.44 to 0.55
-+<ul>
-+  <li> <b>JRegex has been assimilated: PCRE and PosixRE are here</b>.
-+  The JRegex-style API rocks, see below and Context.hs and Example.hs
-+  <li> Haddock seems to run via ./setup haddock, but the documentation is very thin
-+  <li> ./setup test runs TestTestRegexLazy binary if uncommented in cabal file
-+  <li> default is now to compile with -Wall -Werror -O2
-+  <li> You may need to point the cabal file's "Extra-Lib-Dirs" to point to pcre.
-+  <li> You may or may not need a "-lpcre" option to ghc when building
-+  projects that depend on Text.Regex.Lazy now.
-+</ul>
-+
-+Changes from 0.33 to 0.44
-+<ul>
-+  <li> Cabal
-+  <li> Compile with -Wall -Werror
-+  <li> Change DFAEngineFPS from Data.FastPackedString to Data.ByteString
-+</ul>
-+See the LICENSE file for details on copyright.  See README for building instructions.
-+<br/>
-+The new API is very close to JRegex and supports 4 backends:
-+<ul>
-+  <li> Posix, the standard c regex library
-+  <li> PCRE, the <a href="http://www.pcre.org/">Perl Compatible Regular Expressions</a> c library
-+  <li> Full, the lazy Parsec based library (see old api below)
-+  <li> DFA, the fast lazy matching library (see old api below)
-+</ul>
-+And for all backends, there are two types that can be used as a source
-+of regular expressions or to match a regular expression against:
-+String, and ByteString.  The ByteString library will be in the next
-+GHC and can be gotten
-+from <a
-+href="http://www.cse.unsw.edu.au/~dons/fps.html">http://www.cse.unsw.edu.au/~dons/fps.html</a>.
-+<p>
-+For simplest use of the new API: import Text.Regex.Lazy and one of
-+<pre>
-+import Text.Regex.PCRE((=~),(=~~))
-+import Text.Regex.Parsec((=~),(=~~))
-+import Text.Regex.DFA((=~),(=~~))
-+import Text.Regex.PosixRE((=~),(=~~))
-+import Text.Regex.TRE((=~),(=~~))
-+</pre>
-+The things you can demand of (=~) and (=~~) are all
-+instance defined in Text.Regex.Impl.Context and they are used
-+in <tt>Example.hs</tt> as well.
-+<p>
-+<p>
-+You can redefine (=~) and (=~~) to use different options by using makeRegexOpts:
-+<pre>
-+(=~) :: (RegexMaker Regex CompOption ExecOption source,RegexContext Regex source1 target) => source1 -> source -> target
-+(=~) x r = let q :: Regex
-+               q = makeRegexOpts (some compoption) (some execoption) r
-+           in match q x
-+
-+(=~~) ::(RegexMaker Regex CompOption ExecOption source,RegexContext Regex source1 target,Monad m) => source1 -> source -> m target
-+(=~~) x r = let q :: Regex
-+                q = makeRegexOpts (some compoption) (some execoption) r
-+            in matchM q x
-+</pre>
-+There is a medium level API with functions compile/execute/regexec in
-+all the Text.Regex.*.(String|ByteString) modules.  These allow for
-+errors to be reported as Either types when compiling or running.
-+<p>
-+The low level APIs are in the Text.Regex.*.Wrap modules.  For the
-+c-library backends these expose most of the c-api in wrap* functions
-+that make the type more Haskell-like: CString and CStingLen and
-+newtypes to specify compile and execute options.  The actual foreign
-+calls are not exported; it does not export the raw c api.
-+<p>
-+Also, Text.Regex.PCRE.Wrap will let you query if it was compiled with
-+UTF8 suppor: <tt>configUTF8 :: Bool</tt>.  But I do not provide a way
-+to marshall to or from UTF8.  (If you have a UTF8 ByteString then you
-+would probably be able to make it work, assuming the indices PCRE uses
-+are in bytes, otherwise look at the wrap* functions which are a thin
-+layer over the pcreapi).
-+<p>
-+
-+<p>
-+The old Text.Regex API is can be replaced. If you need to be drop in
-+compatible with <tt>Text.Regex</tt> then you can
-+import <tt>Text.Regex.New</tt> and report any infidelities as bugs.
-+
-+Some advantages of <tt>Text.Regex.Parsec</tt> over <tt>Text.Regex</tt>:
-+<ul>
-+  <li> It does not marshal to and from c-code arrays, so it is much
-+       faster on large input strings.
-+  <li> It consumes the input <tt>String</tt> in a mostly lazy manner.
-+       This makes streaming from input to output possible.
-+  <li> It performs sanity checks so that <tt>subRegex</tt>
-+       and <tt>splitRegex</tt> don't loop or go crazy if the pattern
-+       matches an empty string -- it will just return the input.
-+  <li> If the <tt>String</tt> regex does not parse then you get a nicer error
-+       message.
-+</ul>
-+<p>
-+Internally it uses <tt>Parsec</tt> to turn the string regex into
-+a <tt>Pattern</tt> data type, simplify the <tt>Pattern</tt>, then
-+transform the <tt>Pattern</tt> into a <tt>Parsec</tt> parser that
-+accepts matching strings and stores the sub-strings of parenthesized
-+groups.
-+<p>
-+All of this was motivated by the inability to use <tt>Text.Regex</tt>
-+to complete
-+the <a
-+href="http://shootout.alioth.debian.org/gp4/benchmark.php?test=regexdna&lang=all">regex-dna
-+benchmark</a> on <a href="http://shootout.alioth.debian.org/">The
-+Computer Language Shootout</a>.  The current entry there, by Don
-+Stewart and Alson Kemp and Chris Kuklewicz, does not use this Parsec
-+solution, but rather a custom DFA lexer from the CTK library.
-+</body>
-+</HTML>
-diff -urwpN regex-base-0.71/doc/README ghc-6.6.1/libraries/regex-base/doc/README
---- regex-base-0.71/doc/README	1970-01-01 01:00:00.000000000 +0100
-+++ ghc-6.6.1/libraries/regex-base/doc/README	2007-04-25 18:24:10.000000000 +0100
-@@ -0,0 +1,39 @@
-+README for TestRegexLazy-0.66
-+
-+By Chris Kuklewicz (TextRegexLazy (at) personal (dot) mightyreason (dot) com)
-+
-+For more detail on Text.Regex.Lazy look at the very very outdated
-+lazy.html file or the LICENSE file.
-+
-+To build and install:
-+  get Data.ByteString from http://www.cse.unsw.edu.au/~dons/fps.html
-+  (You probably want to configure ByteString's cabal with -p for profiling)
-+  edit list of BACKENDS in Makefile if you want to exclude regex-tre or regex-pcre
-+  edit regex-pcre/regex-pcre.cabal to point to your PCRE installation
-+  edit CONF and USER variables in Makefile to point to your setup
-+  (The CONF includes -p for profiling)
-+  run "make all" which will create and install all the packages in $(SUBDIRS)
-+
-+The packages:
-+  regex-base : This hold the type class definitions and (most) RegexContext,Extract instances
-+  regex-compat : Builds Text.Regex.New (soon to replace Text.Regex) on top of regex-parsec
-+  regex-pcre : Build the PCRE backend, http://www.pcre.org/
-+  regex-posix : Builds the Posix backend
-+  regex-parsec : Builds my lazy parsec based pure haskell backend
-+  regex-dfa : Build the simple backend based on CTKLight (this is LGPL)
-+
-+There is an additional "regex-devel" package where I am setting up
-+testing and bechmarking. Use "make regex-devel" at the top level to
-+compile (not install), or use its cabal Setup.hs.
-+regex-devel/bench/runbench.sh is my simple toy benchmark.
-+
-+To use =~ and =~~ new API:
-+
-+> import Text.Regex.(Parsec|DFA|PCRE|PosixRE|TRE)
-+and perhaps
-+> import Text.Regex.Base
-+
-+Look at Example*.hs and instances in Text.Regex.Base.Context.hs for what it can do.
-+
-+For old "Text.Regex" API drop in compatibility, import Text.Regex.New (uses PosixRE backend)
-+
-diff -urwpN regex-base-0.71/doc/Redesign.txt ghc-6.6.1/libraries/regex-base/doc/Redesign.txt
---- regex-base-0.71/doc/Redesign.txt	1970-01-01 01:00:00.000000000 +0100
-+++ ghc-6.6.1/libraries/regex-base/doc/Redesign.txt	2007-04-25 18:24:10.000000000 +0100
-@@ -0,0 +1,14 @@
-+The regular expression stuff needs some of a rethink.
-+
-+Things that could be made more efficient, as I think of them:
-+
-+(1) Making Arrays in Wrap* may be a bit inefficient
-+counter: Usage may be like "look up element 3" so random access is good
-+
-+(2) String DFA: the findRegex computes the prefix string itself, which is sometimes wasted / sometimes wanted / always discarded.  Also, the input string at the start of the match is discarded
-+
-+(3) Lazy computes MatchedStrings array then discards it.  Wasteful.
-+
-+(4) Mighty extend RegexLike with ability to return "strings", i.e. Extract instance.  The default conversion could be left in for some things.   Then RegexContext could pull from that instead of matchOnce/matchAll.
-+
-+(5) make RegexLike default matchAll/matchOnce in terms of matchOnceText and matchAllText
-diff -urwpN regex-base-0.71/examples/Example2.hs ghc-6.6.1/libraries/regex-base/examples/Example2.hs
---- regex-base-0.71/examples/Example2.hs	1970-01-01 01:00:00.000000000 +0100
-+++ ghc-6.6.1/libraries/regex-base/examples/Example2.hs	2007-04-25 18:24:10.000000000 +0100
-@@ -0,0 +1,44 @@
-+{-# OPTIONS_GHC -fglasgow-exts #-}
-+import Text.Regex.Base
-+import Text.Regex.Posix(Regex,(=~),(=~~)) -- or DFA or PCRE or PosixRE
-+import qualified Data.ByteString.Char8 as B(ByteString,pack)
-+
-+-- Show mixing of ByteString and String as well as polymorphism:
-+
-+main = let x :: (RegexContext Regex String target) => target
-+           x = ("abaca" =~ B.pack "(.)a")
-+           x' :: (RegexContext Regex String target,Monad m) => m target
-+           x' = ("abaca" =~~ "(.)a")
-+           y :: (RegexContext Regex B.ByteString target) => target
-+           y = (B.pack "abaca" =~ "(.)a")
-+           y' :: (RegexContext Regex B.ByteString target,Monad m) => m target
-+           y' = (B.pack "abaca" =~~ B.pack "(.)a")
-+       in do print (x :: Bool)
-+             print (x :: Int)
-+             print (x :: [MatchArray])
-+             print (x' :: Maybe (String,String,String,[String]))
-+             print (y :: Bool)
-+             print (y :: Int)
-+             print (y :: [MatchArray])
-+             print (y' :: Maybe (B.ByteString,B.ByteString,B.ByteString,[B.ByteString]))
-+
-+{- Output is, except for replacing Full with DFA (which has no capture)
-+True
-+2
-+[array (0,1) [(0,(1,2)),(1,(1,1))],array (0,1) [(0,(3,2)),(1,(3,1))]]
-+Just ("a","ba","ca",["b"])
-+True
-+2
-+[array (0,1) [(0,(1,2)),(1,(1,1))],array (0,1) [(0,(3,2)),(1,(3,1))]]
-+Just ("a","ba","ca",["b"])
-+-}
-+{- The output for DFA is
-+True
-+2
-+[array (0,0) [(0,(1,2))],array (0,0) [(0,(3,2))]]
-+Just ("a","ba","ca",[])
-+True
-+2
-+[array (0,0) [(0,(1,2))],array (0,0) [(0,(3,2))]]
-+Just ("a","ba","ca",[])
-+-}
-diff -urwpN regex-base-0.71/examples/Example3.lhs ghc-6.6.1/libraries/regex-base/examples/Example3.lhs
---- regex-base-0.71/examples/Example3.lhs	1970-01-01 01:00:00.000000000 +0100
-+++ ghc-6.6.1/libraries/regex-base/examples/Example3.lhs	2007-04-25 18:24:10.000000000 +0100
-@@ -0,0 +1,21 @@
-+> {-# OPTIONS_GHC -fglasgow-exts #-}
-+
-+> import Text.Regex.Base
-+
-+> import qualified Text.Regex.PCRE as R
-+> import qualified Text.Regex.PosixRE as S
-+> import qualified Text.Regex.Parsec as F
-+
-+Choose which library to use depending on presence of PCRE library.
-+
-+> (=~) :: (RegexMaker R.Regex R.CompOption R.ExecOption a,RegexContext R.Regex b t
-+>         ,RegexMaker F.Regex F.CompOption F.ExecOption a,RegexContext F.Regex b t
-+>         ,RegexMaker S.Regex S.CompOption S.ExecOption a,RegexContext S.Regex b t)
-+>      => b -> a -> t
-+> (=~) = case R.getVersion of
-+>          Just _ -> (R.=~)
-+>          Nothing -> case S.getVersion of
-+>                       Just _ -> (S.=~)
-+>                       Nothing -> (F.=~)
-+
-+> main = print ("abc" =~ "(.)c" :: Bool)
-\ No newline at end of file
-diff -urwpN regex-base-0.71/examples/Example.hs ghc-6.6.1/libraries/regex-base/examples/Example.hs
---- regex-base-0.71/examples/Example.hs	1970-01-01 01:00:00.000000000 +0100
-+++ ghc-6.6.1/libraries/regex-base/examples/Example.hs	2007-04-25 18:24:10.000000000 +0100
-@@ -0,0 +1,14 @@
-+{-# OPTIONS_GHC -fglasgow-exts #-}
-+import Text.Regex.Base
-+import Text.Regex.Posix((=~),(=~~)) -- or DFA or PCRE or PosixRE
-+import qualified Data.ByteString.Char8 as B(ByteString,pack)
-+
-+main = let b :: Bool
-+           b = ("abaca" =~ "(.)a")
-+           c :: [MatchArray]
-+           c = ("abaca" =~ "(.)a")
-+           d :: Maybe (String,String,String,[String])
-+           d = ("abaca" =~~ "(.)a")
-+       in do print b
-+             print c
-+             print d
-diff -urwpN regex-base-0.71/Makefile ghc-6.6.1/libraries/regex-base/Makefile
---- regex-base-0.71/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ ghc-6.6.1/libraries/regex-base/Makefile	2007-04-25 18:24:10.000000000 +0100
-@@ -0,0 +1,20 @@
-+TOP=..
-+include $(TOP)/mk/boilerplate.mk
-+
-+SUBDIRS = 
-+
-+ALL_DIRS = \
-+	Text/Regex \
-+	Text/Regex/Base
-+
-+PACKAGE 	= regex-base
-+VERSION 	= 0.72
-+PACKAGE_DEPS 	= base
-+
-+EXCLUDED_SRCS	= Setup.hs
-+
-+SRC_HC_OPTS += -cpp 
-+
-+SRC_HADDOCK_OPTS += -t "Haskell Hierarchical Libraries ($(PACKAGE) package)"
-+
-+include $(TOP)/mk/target.mk
-diff -urwpN regex-base-0.71/package.conf.in ghc-6.6.1/libraries/regex-base/package.conf.in
---- regex-base-0.71/package.conf.in	1970-01-01 01:00:00.000000000 +0100
-+++ ghc-6.6.1/libraries/regex-base/package.conf.in	2007-04-25 18:24:10.000000000 +0100
-@@ -0,0 +1,27 @@
-+name:		PACKAGE
-+version:	VERSION
-+license:	BSD3
-+maintainer:	TextRegexLazy@personal.mightyreason.com
-+exposed:	True
-+
-+exposed-modules:        Text.Regex.Base
-+                        Text.Regex.Base.RegexLike
-+                        Text.Regex.Base.Context
-+                        Text.Regex.Base.Impl
-+
-+hidden-modules:
-+
-+import-dirs:	IMPORT_DIR
-+library-dirs:	LIB_DIR
-+hs-libraries:   "HSregex-base"
-+extra-libraries:
-+include-dirs:
-+includes:		
-+depends:	 base
-+hugs-options:
-+cc-options:
-+ld-options:
-+framework-dirs:
-+frameworks:
-+haddock-interfaces:	HADDOCK_IFACE
-+haddock-html:		HTML_DIR
-diff -urwpN regex-base-0.71/prologue.txt ghc-6.6.1/libraries/regex-base/prologue.txt
---- regex-base-0.71/prologue.txt	1970-01-01 01:00:00.000000000 +0100
-+++ ghc-6.6.1/libraries/regex-base/prologue.txt	2007-04-25 18:24:10.000000000 +0100
-@@ -0,0 +1 @@
-+Interfaces for regular expressions
-diff -urwpN regex-base-0.71/regex-base.cabal ghc-6.6.1/libraries/regex-base/regex-base.cabal
---- regex-base-0.71/regex-base.cabal	2006-12-05 18:29:02.000000000 +0000
-+++ ghc-6.6.1/libraries/regex-base/regex-base.cabal	2007-04-25 18:24:10.000000000 +0100
-@@ -2,7 +2,7 @@
- -- To fix for cabal < 1.1.4 comment out the Extra-Source-Files line
- -- ****************************************************************
- Name:                   regex-base
--Version:                0.71
-+Version:                0.72
- -- Cabal-Version:       >=1.1.4
- License:                BSD3
- License-File:           LICENSE
-@@ -28,7 +28,7 @@ Buildable:              True
- -- Other-Modules:
- -- ********* Be backward compatible until 6.4.2 is futher deployed
- -- HS-Source-Dirs:         "."
--Extensions:             MultiParamTypeClasses, FunctionalDependencies
-+Extensions:             MultiParamTypeClasses, FunctionalDependencies, CPP
- -- GHC-Options:            -Wall -Werror
- GHC-Options:            -Wall -Werror -O2
- -- GHC-Options:            -Wall -ddump-minimal-imports
-diff -urwpN regex-base-0.71/Text/Regex/Base/Context.hs ghc-6.6.1/libraries/regex-base/Text/Regex/Base/Context.hs
---- regex-base-0.71/Text/Regex/Base/Context.hs	2006-12-05 18:29:02.000000000 +0000
-+++ ghc-6.6.1/libraries/regex-base/Text/Regex/Base/Context.hs	2007-04-25 18:24:10.000000000 +0100
-@@ -185,9 +185,12 @@ instance (RegexLike a b) => RegexContext
-   match r s = maybe (-1,0) (!0) (matchOnce r s)
-   matchM r s = maybe regexFailed (return.(!0)) (matchOnce r s)
- 
-+#if __GLASGOW_HASKELL__
-+-- overlaps with instance (RegexLike a b) => RegexContext a b (Array Int b)
- instance (RegexLike a b) => RegexContext a b MatchArray where 
-   match r s = maybe nullArray id (matchOnce r s)
-   matchM r s = maybe regexFailed return (matchOnce r s)
-+#endif
- 
- instance (RegexLike a b) => RegexContext a b (b,MatchText b,b) where 
-   match r s = maybe (s,nullArray,empty) id (matchOnceText r s)
-@@ -216,21 +219,27 @@ instance (RegexLike a b) => RegexContext
-            , mrMatch = whole
-            , mrAfter = post
-            , mrSubs = fmap fst ma
--           , mrSubList = tail (map fst subs) })
-+           , mrSubList = map fst subs })
- 
- -- ** Instances based on matchAll,matchAllText
- 
-+#if __GLASGOW_HASKELL__
-+-- overlaps with instance (RegexLike a b) => RegexContext a b [Array Int b]
- instance (RegexLike a b) => RegexContext a b [MatchArray] where
-   match = matchAll
-   matchM = nullFail
-+#endif
- 
- instance (RegexLike a b) => RegexContext a b [MatchText b] where
-   match = matchAllText
-   matchM = nullFail
-            
-+#if __GLASGOW_HASKELL__
-+-- overlaps with instance (RegexLike a b) => RegexContext a b [b]
- instance (RegexLike a b) => RegexContext a b [(MatchOffset,MatchLength)] where
-   match r s = [ ma!0 | ma <- matchAll r s ]
-   matchM = nullFail
-+#endif
- 
- instance (RegexLike a b) => RegexContext a b [b] where
-   match r s = [ fst (ma!0) | ma <- matchAllText r s ]
diff --git a/dev-haskell/regex-base/regex-base-0.71.ebuild b/dev-haskell/regex-base/regex-base-0.71.ebuild
deleted file mode 100644
index e592a0e99076..000000000000
--- a/dev-haskell/regex-base/regex-base-0.71.ebuild
+++ /dev/null
@@ -1,19 +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/regex-base/regex-base-0.71.ebuild,v 1.3 2012/09/12 15:38:10 qnikst Exp $
-
-CABAL_FEATURES="profile haddock lib"
-inherit eutils haskell-cabal
-
-DESCRIPTION="Replaces/Enhances Text.Regex"
-HOMEPAGE="http://sourceforge.net/projects/lazy-regex"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/ghc-6.6"
-
-CABAL_CORE_LIB_GHC_PV="6.6"
diff --git a/dev-haskell/regex-base/regex-base-0.72.0.1.ebuild b/dev-haskell/regex-base/regex-base-0.72.0.1.ebuild
deleted file mode 100644
index 0fbb4ab74175..000000000000
--- a/dev-haskell/regex-base/regex-base-0.72.0.1.ebuild
+++ /dev/null
@@ -1,18 +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/regex-base/regex-base-0.72.0.1.ebuild,v 1.6 2012/09/12 15:38:10 qnikst Exp $
-
-CABAL_FEATURES="lib profile haddock"
-CABAL_MIN_VERSION=1.2
-inherit haskell-cabal
-
-DESCRIPTION="Replaces/Enhances Text.Regex"
-HOMEPAGE="http://sourceforge.net/projects/lazy-regex"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 sparc x86"
-IUSE=""
-
-DEPEND=">=dev-lang/ghc-6.6"
diff --git a/dev-haskell/regex-base/regex-base-0.72.0.2.ebuild b/dev-haskell/regex-base/regex-base-0.72.0.2.ebuild
deleted file mode 100644
index e7ebba988785..000000000000
--- a/dev-haskell/regex-base/regex-base-0.72.0.2.ebuild
+++ /dev/null
@@ -1,19 +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/regex-base/regex-base-0.72.0.2.ebuild,v 1.4 2012/09/12 15:38:10 qnikst Exp $
-
-CABAL_FEATURES="lib profile haddock"
-inherit haskell-cabal
-
-DESCRIPTION="Replaces/Enhances Text.Regex"
-HOMEPAGE="http://sourceforge.net/projects/lazy-regex"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.6.1"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
diff --git a/dev-haskell/regex-base/regex-base-0.72.ebuild b/dev-haskell/regex-base/regex-base-0.72.ebuild
deleted file mode 100644
index a8a56198ecb4..000000000000
--- a/dev-haskell/regex-base/regex-base-0.72.ebuild
+++ /dev/null
@@ -1,32 +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/regex-base/regex-base-0.72.ebuild,v 1.11 2012/09/12 15:38:10 qnikst Exp $
-
-CABAL_FEATURES="profile haddock lib"
-inherit eutils haskell-cabal
-
-MY_PV="0.71"
-MY_P="regex-base-${MY_PV}"
-
-DESCRIPTION="Replaces/Enhances Text.Regex"
-HOMEPAGE="http://sourceforge.net/projects/lazy-regex"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${MY_PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc sparc x86"
-IUSE=""
-
-DEPEND=">=dev-lang/ghc-6.6"
-
-CABAL_CORE_LIB_GHC_PV="6.6.1"
-
-src_unpack() {
-	unpack ${A}
-
-	# Upgrade us from 0.71 to 0.72 which comes with ghc-6.6.1
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-0.71-0.72.patch"
-}
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/regex-base/regex-base-0.93.1.ebuild b/dev-haskell/regex-base/regex-base-0.93.1.ebuild
deleted file mode 100644
index f27df02c7b42..000000000000
--- a/dev-haskell/regex-base/regex-base-0.93.1.ebuild
+++ /dev/null
@@ -1,19 +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/regex-base/regex-base-0.93.1.ebuild,v 1.11 2012/09/12 15:38:10 qnikst Exp $
-
-CABAL_FEATURES="profile haddock lib"
-inherit haskell-cabal
-
-DESCRIPTION="Interface API for regex-posix,pcre,parsec,tdfa,dfa"
-HOMEPAGE="http://sourceforge.net/projects/lazy-regex"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-DEPEND=">=dev-lang/ghc-6.6
-		>=dev-haskell/cabal-1.2
-		dev-haskell/mtl"