Patch epic 0.9.3 to build with ghc 7.6.1

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0x618E971F

4 files changed, 81 insertions, 11 deletions

diff --git a/dev-lang/epic/ChangeLog b/dev-lang/epic/ChangeLog
index 12cf2eb6b62e..35bb043399a9 100644
--- a/dev-lang/epic/ChangeLog
+++ b/dev-lang/epic/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/epic
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/epic/ChangeLog,v 1.4 2012/09/12 16:07:50 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/epic/ChangeLog,v 1.5 2012/11/18 06:53:41 gienah Exp $
+
+  18 Nov 2012; Mark Wright <gienah@gentoo.org> +files/epic-0.9.3-ghc-7.6.patch,
+  epic-0.9.3.ebuild:
+  Patch epic 0.9.3 to build with ghc 7.6.1
 
   12 Sep 2012; Alexander Vershilov <qnikst@gentoo.org> epic-0.9.2.ebuild,
   epic-0.9.3.ebuild:
diff --git a/dev-lang/epic/Manifest b/dev-lang/epic/Manifest
index b1d5a9e90cd9..d4482a5cb6bb 100644
--- a/dev-lang/epic/Manifest
+++ b/dev-lang/epic/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX epic-0.9.3-ghc-7.6.patch 1636 SHA256 0c186bbbfe91c686c9c66a222376dc398c4d7b69b8e43f7f624f09d01f74848d SHA512 d9d656a4695adab61f40a33ca57b66810f8b9feb16f608443d6483db5adede10aa5946d93b21bbd82be76d8e5f3fc5c5f6aacab80e2ce8b6f5ceedd4dd3aa6c0 WHIRLPOOL 6c2719321df52eb9a9f4d3ff2cb7c8aef7e185acd747c34e82fc8f01c75f62b11299cbcfd7dcc3910d92a718f339d7ca7ea1e658a986551fbf0acd29fe9ff98e
 DIST epic-0.9.2.tar.gz 65607 SHA256 dca5fb553e383ff1984fb4de9e734a6c4a1390290aafa7bf5b4718d7d1743bc7 SHA512 f9ec3011e8e54d061180a1b3f945158741b35f91ee75ea065df2871d2a872ab8117bb5d34912e4ef84fd39c681eff10fb070a2fdfb23342bfc23aed5bd61534e WHIRLPOOL 85e9982abffd84eea89436912fbccf8e1aa131c9eebcf0354fdea20d321f6f9b3c40eccd6e9044c6c9fa76967180f761fc10928eda501ee17c1c2164e08fa3b5
 DIST epic-0.9.3.tar.gz 86632 SHA256 6708a21cdf226f0a9344afaf1ee25900b74462d94ed681f815252305251d1ef5 SHA512 2db308f62561f6b4dbada2064754e9e9cbac21ebc3148e04dd102c8eeb6e122f1361374a8900a5daadcb1dac823c21cc5f7164b2ca902183e8647e936991ce08 WHIRLPOOL cbd4e03ff0d1db4551224c884517be1dc4f44521434ca32a52df1743eb691ccd9c4157ca01e64258668473984ec44fff215e43647c0eef9aea015f6fe601de37
 EBUILD epic-0.9.2.ebuild 760 SHA256 1c100b4eed6a5c766df4d73661cc1f272994946a9e11b5872733131ed4bf5906 SHA512 772aaae33224504bf78a292758cf57fd1774a1a90a4909d53aa5c310e88400d2deb27c07de8298e514d2cb9619974e3c818ddc3dabc5ca0537d1c6fb536ff8d4 WHIRLPOOL b8e6f1ebd8fcb24df4138811c2550de5f2005834dc9e4b357adc2c007617c36c612b882b6049fbee29655e22ce9e20e5dc4ae49b7d1be1e139c6d37ad28c05d7
-EBUILD epic-0.9.3.ebuild 763 SHA256 fc35ace1e4ea878c24b98908a9fab787cadf4a875433c651934c7af224e3bed1 SHA512 0211b2597ddfc0f63cf9480a0ca79395d2740e03b92d11f8e01b5e158b4524a9351869179e854ccd50c65fe8bc235f22c41393508c79d26868a63c3ec1f43970 WHIRLPOOL b12de1a52aa2f2913899e230a9bc3af223d01271aa6aa243350bddf8edf2b62d2f67669cc04edfd30452af5a9dd608e1ab2b27551fbda75bb738b019b9bc5794
-MISC ChangeLog 775 SHA256 9bbb64b976f7b48414cc8ebad191e016690925af1b4aefdf5ce5476b1cfd9d73 SHA512 7cdce860d13f7946054895096386ba20f4b06dd394f47830cdcdf469c88f8b80aa55f390fd007137c1419ce1c85b43c4cb15950c2ee27e52e0155de2c42c3a5e WHIRLPOOL 5ad58fef6a4b0482acb8d213c899478efdf12d4777dde1c6be80bf1719e6f3ce1186b8bc85b60e91de3ad55270594b250be12eb3c599799f58ded39cfe1c9bcf
+EBUILD epic-0.9.3.ebuild 838 SHA256 df0d691e65e54bc0d7d9c5ca1c22409d3959d998bb510bf2fe09fcc6684bcdcd SHA512 8f374291ec817126db1a408171327ff4e57f1a33d60a5a8e06118003c5ed23dc85818f763d3e13122ea759beec722f20d0847b7c6203255c721ea6a611db2217 WHIRLPOOL 2a3bccb3eb57870a862643135894511fe232675fb47d64048d1573fcc8f48feb6bb1f870166cd52808ac8d2c8bc537800f6e5e6433f549b45fe2e0623eeba845
+MISC ChangeLog 920 SHA256 29d2d96717c4d6f9b0abf5fb5b669e9e0a301b24cf4f41bca4c774c1ad2e51eb SHA512 03ae44d3c53c53ac32749c6a03f0a3cb175cfc2ee2a6fca8612eae3fe1015de3d1436a5eee6cfcf1de4955544067623f383a05a8f2be63c642119b57057d908e WHIRLPOOL a16d102d273ba99269c374efb20e5f419a67899bf90868f54ebc739765e70489059c8c54e95750c415ef25eac6e083d7c0b67de145e655e159689d568e907480
 MISC metadata.xml 687 SHA256 d7c2d264d9ee8ef866ee151645509cf0eeac956391ee93b1889d089062799529 SHA512 898fc0be38b88caf66cd0d6f129fa4232a7f78abdd44bfeafe5b6d43bec62623495cc7c9e0b15f2322daab3eaf7c71f91799ec20a6456d8a53163ecaaf22d360 WHIRLPOOL 939216258599d3f41f5845583be2b8ad7ab7e059f530c9bff6f9420873fa877dd69ce5f4def54195357445e9c19ccdde5c301d88c2f7899e3482b0aaadc14d22
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlCohfwACgkQoBEVQmGOlx/jUQD/Vbjb1lJBfoA8/DBVfQN3jUy2
+hotIDI2kHVRcvns0WIMBAKKesohPXeA6r165sLKJsBoqSJMy7i8mL52lIuQEZgBR
+=Mb8x
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/epic/epic-0.9.3.ebuild b/dev-lang/epic/epic-0.9.3.ebuild
index c68846f1742e..9fac4f12a7b4 100644
--- a/dev-lang/epic/epic-0.9.3.ebuild
+++ b/dev-lang/epic/epic-0.9.3.ebuild
@@ -1,27 +1,29 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/epic/epic-0.9.3.ebuild,v 1.3 2012/09/12 16:07:50 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/epic/epic-0.9.3.ebuild,v 1.4 2012/11/18 06:53:41 gienah Exp $
 
-# ebuild generated by hackport 0.2.16.9999
+EAPI=5
 
-EAPI=4
+# ebuild generated by hackport 0.3.9999
 
 CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
+inherit base haskell-cabal
 
 DESCRIPTION="Compiler for a simple functional language"
 HOMEPAGE="http://www.dcs.st-and.ac.uk/~eb/epic.php"
 SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
-SLOT="0"
+SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="dev-haskell/cabal
-		dev-haskell/mtl[profile?]
+RDEPEND="dev-haskell/cabal:=[profile?]
+		dev-haskell/mtl:=[profile?]
 		>=dev-libs/boehm-gc-7.0[threads]
-		>=dev-lang/ghc-6.10.1"
+		>=dev-lang/ghc-6.10.4:="
 DEPEND="${RDEPEND}
 		>=dev-haskell/cabal-1.8.0.4
 		dev-haskell/happy"
+
+PATCHES=("${FILESDIR}/${PN}-0.9.3-ghc-7.6.patch")
diff --git a/dev-lang/epic/files/epic-0.9.3-ghc-7.6.patch b/dev-lang/epic/files/epic-0.9.3-ghc-7.6.patch
new file mode 100644
index 000000000000..d168f032b92f
--- /dev/null
+++ b/dev-lang/epic/files/epic-0.9.3-ghc-7.6.patch
@@ -0,0 +1,53 @@
+--- epic-0.9.3-orig/Epic/Language.lhs	2012-02-28 10:44:29.000000000 +1100
++++ epic-0.9.3/Epic/Language.lhs	2012-09-14 16:20:29.841939337 +1000
+@@ -1,9 +1,14 @@
+-> {-# LANGUAGE FlexibleInstances, MultiParamTypeClasses,
++> {-# LANGUAGE FlexibleInstances, MultiParamTypeClasses, CPP,
+ > FunctionalDependencies #-}
+ 
+ > module Epic.Language where
+ 
+ > import Control.Monad
++#if MIN_VERSION_base(4,6,0)
++> import Control.Exception.Base
++#endif
++
++
+ > import System.IO
+ > import System.Directory
+ > import System.Environment
+@@ -379,7 +384,13 @@
+ > environment :: String -> IO (Maybe String)
+ > environment x = catch (do e <- getEnv x
+ >                           return (Just e))
+->                       (\_ -> return Nothing)
++#if MIN_VERSION_base(4,6,0)
++>                           (\y-> do return (y::SomeException);  return Nothing)  
++#endif
++> 
++#if !MIN_VERSION_base(4,6,0)
++>                           (\_->  return Nothing)  
++#endif  
+ 
+ Some tests
+ 
+--- epic-0.9.3-orig/Epic/CodegenC.lhs	2012-02-28 10:44:29.000000000 +1100
++++ epic-0.9.3/Epic/CodegenC.lhs	2012-09-14 16:13:48.061329048 +1000
+@@ -1,3 +1,4 @@
++> {-#LANGUAGE FlexibleContexts#-}
+ > module Epic.CodegenC where
+ 
+ > import Control.Monad.State
+@@ -98,10 +99,11 @@
+ >       if (x>max) then put x else return ()
+ 
+ >    cgs [] = return ""
++
+ >    cgs (x:xs) = do xc <- cg x
+ >                    xsc <- cgs xs
+ >                    return $ xc ++ "\n" ++ xsc
+-
++>    cg::  (MonadState Int m) => ByteOp -> m [Char]
+ >    cg (CALL t fn args) = return $ tmp t ++ " = " ++ quickcall fn ++ 
+ >                          targs "(" args ++ ");"
+ >    cg (TAILCALL t fn args)