patch c2hs 0.16.3 for ghc 7.6.1

(Portage version: 2.1.11.17/cvs/Linux x86_64)

3 files changed, 54 insertions, 4 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/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)