patch c2hs 0.16.3 for ghc 7.6.1

Package-Manager: portage-2.1.11.17/cvs/Linux x86_64

4 files changed, 67 insertions, 6 deletions

diff --git a/dev-haskell/c2hs/ChangeLog b/dev-haskell/c2hs/ChangeLog
index 0984b3e31268..5296899743c4 100644
--- a/dev-haskell/c2hs/ChangeLog
+++ b/dev-haskell/c2hs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-haskell/c2hs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/c2hs/ChangeLog,v 1.53 2012/09/12 14:50:40 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/c2hs/ChangeLog,v 1.54 2012/09/18 06:42:39 gienah Exp $
+
+  18 Sep 2012; Mark Wright <gienah@gentoo.org> +files/c2hs-0.16.3-ghc-7.6.patch,
+  c2hs-0.16.3-r1.ebuild:
+  patch c2hs 0.16.3 for ghc 7.6.1
 
   12 Sep 2012; Alexander Vershilov <qnikst@gentoo.org> c2hs-0.16.3-r1.ebuild,
   c2hs-0.16.3.ebuild:
diff --git a/dev-haskell/c2hs/Manifest b/dev-haskell/c2hs/Manifest
index 3ee1bb384c09..888b140d01a2 100644
--- a/dev-haskell/c2hs/Manifest
+++ b/dev-haskell/c2hs/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX c2hs-0.16.3-ghc-7.6.patch 1579 SHA256 a4d29b269404690bc4524af022bd80d01d382e9164201a365b6537bb3faef91e SHA512 3daaf470928b80608702b77f42ae34e2ebe8a3e8e8b60beb9aedc725a50f020a324386dc17fb074d5c26ca0d3e471c09362fac5bfa5b5c5fd4976f8e94768b16 WHIRLPOOL 32281fe44be066efad9d413cfbc1be5675e4f99bed402a71381ee5a2d9e353792e0207aad255046f3695e21eef2a635abebd5b041901198a86cbfb6643e20dfd
 AUX c2hs-0.16.3-language-c-0.4.patch 790 SHA256 acf72e4f7e18fb3e58772719cf43056efe80e2106c026c86a7f16e7b0c971f5b SHA512 c7a3baacb08dd7fca8688f04e7cdd434c8a6e37c6ec98abbf1ea329842a9d4d8639b1a326fa73919f83557760d9b87c0467f2af6801408a7c6d6eb71ce85ef76 WHIRLPOOL c2f2fdb2c8305c83e6f77bd89a3cf425f89e333779d78b8766d18de4e00044c3c8d1a59dc7a3c398819b27c8fe9f273ab295bc4fc3d484fa328dcf99d5ab14d5
 DIST c2hs-0.16.3.tar.gz 137409 SHA256 a562be4f9c2d2a2c55bc61233f86e129aff1ec6ac588b9eb904e17379beb1ae3 SHA512 07507da0c19efb10c72d40ea21d8768a6fe94d9249c19707b8b99c3ccc4e5eea0d110e4130d5c608aa27d7eb5fe6cfa3050467f859b2e05f028e3902c035ce9a WHIRLPOOL 86e49cfd358e71b12533fd947cf3eb94f44067a4d8251d889cdf7f17077dbffb818207262990d87d4ea8cd7e09e4a237bfe74205d92cf7e16d96d2187c5c964a
-EBUILD c2hs-0.16.3-r1.ebuild 1080 SHA256 5ae99c7d0e21194b1b98739a8bf7d7324f62e517c9941d92ac5989e53a053add SHA512 c94a27b43c2a894c2c432e84b86e75f70f65b05afdcafc3895874b8806a528ad00327b4e9ed004eec5316921371e9f24db62f720fc074fc12a098c82812177a9 WHIRLPOOL 5c639365563cebdab055eb6c542521f71409379a0ea57bfc168e8a6df11301545a52b7ff660d709adac3e2fa00bc0ffa9b6898d9ec9b4df22a604fd1e3bfbf5b
+EBUILD c2hs-0.16.3-r1.ebuild 1122 SHA256 fa423ddb2b2850d0f546084cfebac190b448ddc5b200e60af455987902981f2c SHA512 cb5ef6f42d6d8465189fb83cbed5b77482ff605a372e98ba2913ff8003506cf7bd066fbf904f3f3cd9d2fc50d41f932dde7bab4b78555a26b94dc4cac6a91fc9 WHIRLPOOL cad42773bb1be9ff595ee0185816e199bc53dba896a5dcbd1dd0bd6762286d4476db2eb107336d199b3de5861e637be057357cb923e7421844c5bc7477c58517
 EBUILD c2hs-0.16.3.ebuild 985 SHA256 222c77e92dba29adade8bea45632a74b53bb08ed230bdfa1f549516dc8ad1b4d SHA512 2c4887d2c75e8426b6a1690581b8f18282259a2a1d98fc97c4cb00b88a26575fd9a9f5c8559ac4e20646eb4c669b2cfeb85ce13bdf1b3ccbd2819b0c91d6c9b4 WHIRLPOOL b08e7ba37685bacb527c0d143c92ceab22640f286bfc97130dcbe438ccf5a6fa231c52ec12024732ee135720d209372cfef7745f88f93c6c446b4c0ef72c083e
-MISC ChangeLog 6543 SHA256 d1ed783b0eb016287033d380c3077e0cbbf4e0e5cda147f08fe09400a1793752 SHA512 75740812fac957ef70806c768034c432a44b068983d129f0fed5ed438b0e3842079e8cd9b85b1ca472f59915922ac50bb283028b66a211187ff572955a9310b8 WHIRLPOOL 458d8be7cfdd966b71065c3403580fff0fdcf151d788b5b5c40982105202946c6cdc3794a8fc76211f954971fa3bbca224fcb49009a6a6976ce1bc0b78bf8f3b
+MISC ChangeLog 6684 SHA256 d572d3aabb4c7a8fc5fcc286684e6005039cc91264032ab2709c8c9032bcb806 SHA512 28a4d7fb7d47a09a46e6c0b0f5b34f7d03f5d4f6dfe16686bad6a1ca8128716f35e92473b303dfd7fb1ef88fb4175c0607e02d910c810f31753d1f6637379da8 WHIRLPOOL b95e3bb6adef4fc474fe90d8c09b4c81e4eff55026ce7d5b09a33df7a4221891940c1175402e47fe3cf46b8c4d2df7e800329b96a6199cb7b2eebce44f9ce159
 MISC metadata.xml 223 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508 SHA512 24765bbf1cb187cd262aa7fb3824c1cec65e2bf3f2198099de688916d96401a26458265b15408f22b1fbd6d6a2842df814a57ceda80dfa00d130b24423b7544f WHIRLPOOL 8fd6700f6198db6540eb51edf11372faeb6eb8a542a692e515badf236f62444f2c180f7d08e0f98e9fdfa23de14631b31af50543469aaa27084d6b637e2644c7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlBYF+0ACgkQoBEVQmGOlx+85AD/baHa6JXoq+SRXD7tUO8T3nUe
+YYXm5zv5JAa0Q4RitdIBAKVeLcF5VD+q+pdQukzOlNbxNbK4Z8HDBpyDHhbq+R/u
+=BDj5
+-----END PGP SIGNATURE-----
diff --git a/dev-haskell/c2hs/c2hs-0.16.3-r1.ebuild b/dev-haskell/c2hs/c2hs-0.16.3-r1.ebuild
index 4dff7fef5849..32b36e4e80e3 100644
--- a/dev-haskell/c2hs/c2hs-0.16.3-r1.ebuild
+++ b/dev-haskell/c2hs/c2hs-0.16.3-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/c2hs/c2hs-0.16.3-r1.ebuild,v 1.7 2012/09/12 14:50:40 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/c2hs/c2hs-0.16.3-r1.ebuild,v 1.8 2012/09/18 06:42:39 gienah Exp $
 
-EAPI="3"
+EAPI="4"
 
 CABAL_FEATURES="bin"
 inherit base haskell-cabal
@@ -24,7 +24,8 @@ DEPEND=">=dev-lang/ghc-6.6.1
 				>=dev-libs/libxslt-1.1.2 )"
 RDEPEND="dev-libs/gmp"
 
-PATCHES=("${FILESDIR}/${PN}"-0.16.3-language-c-0.4.patch)
+PATCHES=("${FILESDIR}/${PN}"-0.16.3-language-c-0.4.patch
+	"${FILESDIR}/${PN}"-0.16.3-ghc-7.6.patch)
 
 src_compile() {
 	cabal_src_compile
diff --git a/dev-haskell/c2hs/files/c2hs-0.16.3-ghc-7.6.patch b/dev-haskell/c2hs/files/c2hs-0.16.3-ghc-7.6.patch
new file mode 100644
index 000000000000..2b6adb2f0f6d
--- /dev/null
+++ b/dev-haskell/c2hs/files/c2hs-0.16.3-ghc-7.6.patch
@@ -0,0 +1,45 @@
+--- c2hs-0.16.3-orig/src/C2HS/Config.hs	2011-03-25 00:04:59.000000000 +1100
++++ c2hs-0.16.3/src/C2HS/Config.hs	2012-09-16 10:57:54.514595408 +1000
+@@ -1,3 +1,4 @@
++{-# LANGUAGE CPP #-}
+ --                                                                -*-haskell-*-
+ --  ** @configure_input@ **
+ --  ===========================================================================
+@@ -38,6 +39,10 @@
+ 
+ import Foreign  (toBool)
+ import Foreign.C (CInt)
++#if (__GLASGOW_HASKELL__>=705)
++import Foreign.C.Types(CInt(..))
++#endif
++
+ import System.Info (arch, os)
+ 
+ -- program settings
+--- c2hs-0.16.3-orig/src/Control/StateTrans.hs	2011-03-25 00:04:59.000000000 +1100
++++ c2hs-0.16.3/src/Control/StateTrans.hs	2012-09-16 10:56:52.470863551 +1000
+@@ -1,3 +1,4 @@
++{-# LANGUAGE CPP, ScopedTypeVariables #-}
+ --  The HiPar Toolkit: state transformer routines
+ --
+ --  Author : Manuel M. T. Chakravarty
+@@ -73,6 +74,10 @@
+                    throwExc, fatal, catchExc, fatalsHandledBy)
+ where
+ 
++#if !MIN_VERSION_base(4,6,0)
++import Prelude hiding (catch)
++#endif
++import Control.Exception (catch, IOException)
+ 
+ -- BEWARE! You enter monad country. Read any of Wadler's or
+ -- Launchbury/Peyton-Jones' texts before entering. Otherwise,
+@@ -296,7 +301,7 @@
+                                   ioError err
+               Right _a         -> return state
+             )
+-            `catch` (\err -> let
++            `catch` (\(err :: IOException) -> let
+                                STB handler' = handler err
+                              in
+                              handler' bs gs)