5 files changed, 93 insertions, 7 deletions
diff --git a/dev-haskell/regex-posix/ChangeLog b/dev-haskell/regex-posix/ChangeLog
index bd39b496d26f..3cbb319f733a 100644
--- a/dev-haskell/regex-posix/ChangeLog
+++ b/dev-haskell/regex-posix/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-haskell/regex-posix
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/regex-posix/ChangeLog,v 1.36 2012/09/12 16:03:55 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/regex-posix/ChangeLog,v 1.37 2012/09/19 07:00:44 gienah Exp $
+
+  19 Sep 2012; Mark Wright <gienah@gentoo.org>
+  +files/regex-posix-0.95.1-control-exception.patch,
+  +files/regex-posix-0.95.1-ghc-7.5.patch, regex-posix-0.95.1.ebuild:
+  Patch regex-posix-0.95.1 build for ghc 7.6.1
 
   12 Sep 2012; Alexander Vershilov <qnikst@gentoo.org> regex-posix-0.71.ebuild,
   regex-posix-0.72.0.2.ebuild, regex-posix-0.72.0.3.ebuild,
diff --git a/dev-haskell/regex-posix/Manifest b/dev-haskell/regex-posix/Manifest
index d6bc8af3c99a..4e66bfd54454 100644
--- a/dev-haskell/regex-posix/Manifest
+++ b/dev-haskell/regex-posix/Manifest
@@ -1,3 +1,8 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX regex-posix-0.95.1-control-exception.patch 2137 SHA256 92f41613abf7ac901553d7232cc69f2848f1ea2e7b992db1d5b430421cbf1c5c SHA512 29fbd05ad4d608e8aac9bfefa4a0f8b2e31495837107422a552ab21aa93a8d82dcc043321a6987d333462aeef349c8a5a91e2aeeca8ea68e551b7818aca207c4 WHIRLPOOL 114aa8f430e13544193a85d7d73faf00b1aed06328248928fc68ed948aa453cbd5f274bf78afaec15d531f024521e83cf3e2fef059cdb89b2e5b98d5c92057d2
+AUX regex-posix-0.95.1-ghc-7.5.patch 554 SHA256 0f0e6bb141101ad6c96f618d699dc2e058486bd91e9459872c94ac661d77dac2 SHA512 ea77dfc50967f5d3c8beb82ece23a1c48168fa59c08d7ce58b16c22c708fb4e49c76ab8b8aac0ef5306a2babb8666385f916295bd77f57b149cad5991ebb5516 WHIRLPOOL d0f32664ad3134c89706c26f28ac87812c437eab8dcf409189b9d5d96086051007a5e61700eb1873d1e732dda865e8a349213aed2c1e6ecee16fa4aac179365b
 DIST regex-posix-0.71.tar.gz 69235 SHA256 c1a49ed802a1acf295726d46cf2726d7f9ed8665f4dd83e1411b77e1dcb4a529 SHA512 46cfada072c92d5aa7cbf309ee18ff34d773d6dabc0372310ef7757ccd5dfaf7be4064b8ed1038f7cafbad2211846ce93b4f7ba603f97c850bb22533a5846df1 WHIRLPOOL 04188fab03c1f6ec75190bd9a38a9103d670ae92f40922ea66c05a5fdfc7e8e0ad59d3d5514fde1dc403f54d9d9994192aefe664301fe61439b5345298cf0b13
 DIST regex-posix-0.72.0.2.tar.gz 42874 SHA256 bbc59136ac898e8036cd4af543c71c9ecbe688466df4feaac27763da3b7019a8 SHA512 02cb9ee43483989797c79d54bf14d7fca428fe4fcb86536882a83cb9df5735258a995999fb2a510d8951eb94652851d20accd8ec72eb53fbe49dcb04d389f60d WHIRLPOOL 105569bd9bd2927d296193bf23ccf2a88fe4a1fa17d9114ec5bf3ed4e180c9159a8845d4de019b968895bc48a82d32fee0f35599a59c5cf55f23db133bedc4dc
 DIST regex-posix-0.72.0.3.tar.gz 43718 SHA256 327ab87f3d4f5315a9414331eb382b8b997de8836d577c3f7d232c574606feb1 SHA512 95895ed1a690221006ac057a536adc104cddc8fbfd99a166e1dd81536126dda36fc5a08789eb5b8ac25ba2ff110cc6492cc34bdc5dc0a4d62d22b012a3eff6ba WHIRLPOOL 157ad40d23de8987b2ffc4d2f33563f089aabafb1894470466ad1e84679dd98f3269a205965c142a6a2736f0d9fde33cb21f4d1c4ebcc96968e25b41bdfe506a
@@ -9,6 +14,13 @@ EBUILD regex-posix-0.72.0.2.ebuild 618 SHA256 9d25edfe584e4ea3726eb438f2b1b6b4a0
 EBUILD regex-posix-0.72.0.3.ebuild 648 SHA256 42ffef3e95eec42a43d6608e760636e6ccf51f387d0c3cd9af96040144791d25 SHA512 dc7cfccda0032cfdaf783586ab40f8ba398c2a5271c49c01d833f4729e8cef57abd6724e25460af9a8b56e5dda71f855159db4057a0f9041178a5ffbf9631c0d WHIRLPOOL 731c2c511cf21ce5bf7229660ad3153f4a2ccf5352be545d99d4d28b062aa4da3a30f12da049f270c6f3a122b0b875d06e8b367f82a94de4072db57b158f47af
 EBUILD regex-posix-0.93.1.ebuild 691 SHA256 8c57f34820e903377f86c38ccb0a4cc58f064013397e860df9e03324e1ddf1f8 SHA512 78d9d32e9501a1032ca51e1f24c7c215a5b1ab6e9af59be87c7ef26fdafd9f97ada47de228698217e369e20f4b3e9ecf1f79ba3d5c3ebbc2942b266c23bcdcc2 WHIRLPOOL 744ef6ca55bf7652a5be62d6de0f53c50de4ca6986f34b294c3ef3fb982931e099ac01fbd6bf6e22ab4ff87e709e04395eef23d175e860c210e72be20ef0c445
 EBUILD regex-posix-0.94.1.ebuild 695 SHA256 394f769b316c1f66858c5a96f9d683596e84b12b0038270d40b14f7096c965e1 SHA512 a851bca9e1de31a814d6d5b092b20c9081e7d0592dac918cd7ca0843fce61b376052fd554aa345136a5e7905fe77e05a29bec34ed4f682a4aaba2a10d5407d5e WHIRLPOOL 2baad0338e27b86c0627160109dbb125481b4aaa19eeeae4cb11117fd9477d54be2de30f0e9f6e6280b7a88db50decdd8c4ba0c1ba8f81239a85728dd4c9897b
-EBUILD regex-posix-0.95.1.ebuild 789 SHA256 4e47e26104722c6c1b31c3708f55bdc2e2017721c2628728f343febf549c3daa SHA512 96af65663c44e75d19b77ba6c2ef9ab6a22a02741ad910cc9e1078620e8e5e083dfd72719bc4921d442fc9d0e63c90f19057cc9b1de6dfaae6fe87a390277888 WHIRLPOOL f2affcf1788becfd0a77f7a2f0cddf89a2e9cda2d6f2b3dc434f4b1cc27ab80887886505e0777174e57f317a969bf17979597341497ee53f8c809e856dfea0d3
-MISC ChangeLog 5096 SHA256 b81664554e65db16ca5186ac5a25ded0ffbdd89826459bd3638e6e26261085a7 SHA512 16ea58bf9cbd7dc61244f810052ba2d7dc9ad3a7e7a61f45b97b2f9729b4085bb99a44d446fdde239ee38cdcc283c4e1b6cf10fe542e3a97ca79f63aeb28e520 WHIRLPOOL 05401bfb6fb35cd7f60acb3510025ffe4bc2441adea854c2b327e0d72ea20f71592e95cfc988a507df9d3274ec38ce6be090dfcc413559d0e32848fa810f673f
+EBUILD regex-posix-0.95.1.ebuild 859 SHA256 4a57153b1ce01fff55b420e1bb9b710b8e3fe28575d916850b697212d3f540d0 SHA512 f4a110ed0ccc28fbd9cda6b0d9d4d0b3aca828706e783d93bf161867df992b908d6dd6ed8c88c9479410815123bdb1302ca15b4df564fb90bc17fd9ff3e98618 WHIRLPOOL 7ebca2cb86f869a9e8b71ea0b881171479e86fbb4f85415604f14a74f11567f32c3ea9794e68613d9ccaf045423ed6c7d277ec349b6db68764d17ad6f01fa957
+MISC ChangeLog 5314 SHA256 2d2952d6929b6d223ef9591ea2079c9caa5e24df0c25a0c8da0f7f1a6a7e1812 SHA512 97078edda95c93004fd0fbb936539526578b55b89a10061f161d5e8ec9823a3c8dc869e2bec513fa205e5b7dbdb141a794da902376df42aee57b17f802a539bb WHIRLPOOL af1b6fa75fcad5c4a27de413f0b2be05cc56b593a2f66a7aff95b790b2ed0a0d7440a41b53af49bad5938084062fbffed1af90b6b55dfd7f897778831071e3d0
 MISC metadata.xml 306 SHA256 9e163fe48d0b9d4f5babd42349f6000f19d3a115805380742737059aefdcffe9 SHA512 9030cc273d306c0ba81f00222980a03b3b589e35b6f1ae514c5f2d3ab3f66aaf8702b0ca603f109dca73eabe37d0bbb0e4d3876374731b192fdc1d3033076cd0 WHIRLPOOL 993477208fdfe86e0d5307ca6f04a37188f2836dc4976b4223894f6d6683da78bfce548f4bd4013cfcc71e73a64fb078d45c88df91b3a309d2e6aedf968b1c92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlBZbagACgkQoBEVQmGOlx+gUgEA3QpYAZBlgdkE80mYb3MxzKtS
+lWOVEEKFCKNDcR2RHSsBANc06YG9zyYBbEuG4eyAIp1Kqkz3ODiy+gzwM7dq381t
+=bp9z
+-----END PGP SIGNATURE-----
diff --git a/dev-haskell/regex-posix/files/regex-posix-0.95.1-control-exception.patch b/dev-haskell/regex-posix/files/regex-posix-0.95.1-control-exception.patch
new file mode 100644
index 000000000000..dfdfa71522f5
--- /dev/null
+++ b/dev-haskell/regex-posix/files/regex-posix-0.95.1-control-exception.patch
@@ -0,0 +1,56 @@
+diff --git a/Text/Regex/Posix/Wrap.hsc b/Text/Regex/Posix/Wrap.hsc
+index d27b756..a43bcc3 100644
+--- a/Text/Regex/Posix/Wrap.hsc
++++ b/Text/Regex/Posix/Wrap.hsc
+@@ -102,7 +102,7 @@ module Text.Regex.Posix.Wrap(
+ -- string.h is needed for memset
+ 
+ #include "myfree.h"
+-
++         
+ #include "string.h"
+ 
+ #ifndef _POSIX_C_SOURCE
+@@ -131,10 +131,19 @@ import Foreign(Ptr, FunPtr, nullPtr, newForeignPtr,
+                addForeignPtrFinalizer, Storable(peekByteOff), allocaArray,
+                allocaBytes, withForeignPtr,ForeignPtr,plusPtr,peekElemOff)
+ import Foreign.Marshal.Alloc(mallocBytes)
+-import Foreign.C(CSize,CInt,CChar)
++import Foreign.C(CChar)
++#if __GLASGOW_HASKELL__ >= 703
++import Foreign.C(CSize(CSize),CInt(CInt))
++#else
++import Foreign.C(CSize,CInt)
++#endif
+ import Foreign.C.String(peekCAString, CString)
+ import Text.Regex.Base.RegexLike(RegexOptions(..),RegexMaker(..),RegexContext(..),MatchArray)
+-import qualified System.IO.Error as IOERROR(try)
++-- deprecated: import qualified System.IO.Error as IOERROR(try)
++import qualified Control.Exception(try,IOException)
++
++try :: IO a -> IO (Either Control.Exception.IOException a)
++try = Control.Exception.try
+ 
+ type CRegex = ()   -- dummy regex_t used below to read out nsub value
+ 
+@@ -349,8 +358,10 @@ foreign import ccall unsafe "&myregfree"
+ foreign import ccall unsafe "regcomp"
+   c_regcomp :: Ptr CRegex -> CString -> CompOption -> IO ReturnCode
+ 
++{- NOT USED
+ foreign import ccall unsafe "&regfree"
+   c_regfree :: FunPtr (Ptr CRegex -> IO ())
++-}
+ 
+ foreign import ccall unsafe "regexec"
+   c_regexec :: Ptr CRegex -> CString -> CSize
+@@ -460,7 +471,7 @@ wrapError errCode regex_ptr = do
+ ----------
+ wrapCompile flags e pattern = do
+  nullTest pattern "wrapCompile pattern" $ do
+-  e_regex_ptr <- IOERROR.try $ mallocBytes (#const sizeof(regex_t)) -- ioError called if nullPtr
++  e_regex_ptr <- try $ mallocBytes (#const sizeof(regex_t)) -- ioError called if nullPtr
+   case e_regex_ptr of
+     Left ioerror -> return (Left (retOk,"Text.Regex.Posix.Wrap.wrapCompile: IOError from mallocBytes(regex_t) : "++show ioerror))
+     Right raw_regex_ptr -> do
+
diff --git a/dev-haskell/regex-posix/files/regex-posix-0.95.1-ghc-7.5.patch b/dev-haskell/regex-posix/files/regex-posix-0.95.1-ghc-7.5.patch
new file mode 100644
index 000000000000..e0de5a751637
--- /dev/null
+++ b/dev-haskell/regex-posix/files/regex-posix-0.95.1-ghc-7.5.patch
@@ -0,0 +1,12 @@
+--- regex-posix-0.95.1-orig/Text/Regex/Posix/Wrap.hsc	2011-05-10 01:55:41.000000000 +1000
++++ regex-posix-0.95.1/Text/Regex/Posix/Wrap.hsc	2012-05-13 18:06:06.314466286 +1000
+@@ -133,6 +133,9 @@
+ import Foreign.Marshal.Alloc(mallocBytes)
+ import Foreign.C(CSize,CInt,CChar)
+ import Foreign.C.String(peekCAString, CString)
++#if (__GLASGOW_HASKELL__>=705)
++import Foreign.C.Types(CInt(..), CSize(..))
++#endif
+ import Text.Regex.Base.RegexLike(RegexOptions(..),RegexMaker(..),RegexContext(..),MatchArray)
+ import qualified System.IO.Error as IOERROR(try)
+ 
diff --git a/dev-haskell/regex-posix/regex-posix-0.95.1.ebuild b/dev-haskell/regex-posix/regex-posix-0.95.1.ebuild
index 0e0386039847..b1c9a07d9829 100644
--- a/dev-haskell/regex-posix/regex-posix-0.95.1.ebuild
+++ b/dev-haskell/regex-posix/regex-posix-0.95.1.ebuild
@@ -1,13 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/regex-posix/regex-posix-0.95.1.ebuild,v 1.8 2012/09/12 16:03:55 qnikst Exp $
-
-# ebuild generated by hackport 0.2.13
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/regex-posix/regex-posix-0.95.1.ebuild,v 1.9 2012/09/19 07:00:44 gienah Exp $
 
 EAPI=4
 
 CABAL_FEATURES="lib profile haddock hscolour hoogle"
-inherit haskell-cabal
+inherit base haskell-cabal
 
 DESCRIPTION="Replaces/Enhances Text.Regex"
 HOMEPAGE="http://sourceforge.net/projects/lazy-regex"
@@ -22,3 +20,6 @@ RDEPEND=">=dev-haskell/regex-base-0.93[profile?]
 		>=dev-lang/ghc-6.8.2"
 DEPEND="${RDEPEND}
 		>=dev-haskell/cabal-1.2"
+
+PATCHES=("${FILESDIR}/${PN}-0.95.1-control-exception.patch"
+	"${FILESDIR}/${PN}-0.95.1-ghc-7.5.patch")