Apply patch from upstream to allow haskell-src-meta-0.6.0.8 to build with ghc 7.10

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

4 files changed, 89 insertions, 10 deletions

diff --git a/dev-haskell/haskell-src-meta/ChangeLog b/dev-haskell/haskell-src-meta/ChangeLog
index 396fb801cfb3..a41a64ad0616 100644
--- a/dev-haskell/haskell-src-meta/ChangeLog
+++ b/dev-haskell/haskell-src-meta/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-haskell/haskell-src-meta
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haskell-src-meta/ChangeLog,v 1.1 2014/12/13 14:06:48 gienah Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haskell-src-meta/ChangeLog,v 1.2 2015/01/04 05:34:51 gienah Exp $
+
+  04 Jan 2015; Mark Wright <gienah@gentoo.org>
+  +files/haskell-src-meta-0.6.0.8-ghc-7.10.patch,
+  haskell-src-meta-0.6.0.8.ebuild:
+  Apply patch from upstream to allow haskell-src-meta-0.6.0.8 to build with ghc
+  7.10
 
 *haskell-src-meta-0.6.0.8 (13 Dec 2014)
 
diff --git a/dev-haskell/haskell-src-meta/Manifest b/dev-haskell/haskell-src-meta/Manifest
index e7fee26e7e00..2429c5e0f735 100644
--- a/dev-haskell/haskell-src-meta/Manifest
+++ b/dev-haskell/haskell-src-meta/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX haskell-src-meta-0.6.0.8-ghc-7.10.patch 2741 SHA256 84d1730cc15ae9252d83834919a927b0647910cb675b2b1d9991a74676e9b0d8 SHA512 8acc57e9318068bf4f94c1fc4608badbe5058a833e609c3bbc7abeffd51380da87bf44e308ad38ec6e5481235db7bb11210f7dcb8c4dc1e579f4c2d3d0fd09b8 WHIRLPOOL b2cd23892744d7aa0a8a408701dd413e76f5a6339f8e3307364d37348b643c1810020281e9d797064bea28a2fa2d5ecf0da592806fe2e9d01e6fcad5251abef9
 DIST haskell-src-meta-0.6.0.8.tar.gz 19449 SHA256 d3f69a05701d85880472c9d30efb3056fc8733f5f31e1795280aaf9f2c1262bb SHA512 590e66c837bd64db9bb8d09a698f52fb8b7c3ab07523c0e7fadcbb17bf33ee0fa523ec34012db7622681b4055164288df60083992ddbfb7553087373efbdb751 WHIRLPOOL 436fde45e32fea88107a4462ad2392d7caffdee705a8537d54d1bbff3e1e9c0a3f3d526a84361b704be933fdf0633e25eb1581228084afbb40774308f4062138
-EBUILD haskell-src-meta-0.6.0.8.ebuild 947 SHA256 6477e36207ddfda3b8567922045ef7841b522bb0cecb4dea806a0297d7c4b720 SHA512 c1e1dd845ad898a2f7dcbf2432e2c85157fe41196511e528b988a27a0c0556e7ce2f37df9eb287f2401e30174c7d51ca2e1a962b73055f5859c03a8fb30aad32 WHIRLPOOL ed9ffd5adcc9980ec56f02f28ce62acf9d6d0d7177a6f56f5eb603dd58053abdd8727eb1ae3a1612c86662da46d9405abc8a1822b5b5615d0b1502318e5c2974
-MISC ChangeLog 391 SHA256 22bfb2e059fbd611734298b99f4bc95636bc51c8e2f3c2201b324f51dafe8c4d SHA512 a7f1f6ef20752714571a3603a42ab624fb8f8084f6a350badde1d535684d753488af39c363efd56addbeee3351cff582fa948baaa9371ddabab0dc87be051c77 WHIRLPOOL 57993b19310ef8cbb170593d4985ffee8256a09a22ab8234b0f515341098cfcb5eef997dbed34439c0dfcb92c0c516f72470cc01eff9a675c7302a2a8cbaa154
+EBUILD haskell-src-meta-0.6.0.8.ebuild 1006 SHA256 7e7c6f89da1a15bd7c32b0d723e08a3177f86d220f62b377870c5fb53e62b837 SHA512 13cf222ebc88792df629400ba2ef4931c352fe942b24bbfab0543dc7853863007d9ed45c86fe5ac87875a47caf1c91ac8f11bd6671d45f4274edf40cf29a5f05 WHIRLPOOL ec54e6175db399f7dbb038dbc182447737fee63f25a5d7b49a3df336dec2c34265d4ca7428762f254ed5dc60a61168f632863abc1b0a8c6a084c845a9c02ad0d
+MISC ChangeLog 611 SHA256 3e8d376a7e0eb5ce364352b9227045d8d935c436b21a29e520b6e024c27cfc34 SHA512 9b863f91923d150b4a17d703d09e0cb6fe1b89989c2e3c37da3f95f0b5246d6e618d2454c71fc9d2db7b47dfcfe01d7f5544bd9ff4cf48d9e7aac5aa951c21a2 WHIRLPOOL 69919c82348b95c2922d8d4cc44e989dc02359f7f6a63f8fb5750e79dea13cb30c29cd4e5cf0c884c6a536bf0559b63f96b009da4535579c43b766da8b245e53
 MISC metadata.xml 323 SHA256 9bbb44b834f1b355ca72c43c9eefd8cb35d86bf9d9bf9ac55fe082c48174a221 SHA512 d9d4d874512bf75cda57a5fe699a2559b0c34233e3480137705131751fb80cfdf3c517232a2cfbef6725486c42d5f7dd47468cf8c1a5ba0aaa138ff1ef418beb WHIRLPOOL 75a1d6d12b409ed1389b4b434e583d55e922e5bd14b1a8a0c1cde4278604d467b303205547e918da3e5157a21732c10fbd4a6bcf6f0edfab509451a39694cb15
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlSMR/4ACgkQoBEVQmGOlx/w2wEAq17fenVu3BDJTeR+CTVlylKc
-JGjBqiH/2xMoMXXxZDIBAI/0qPFM0vn3i9KILPzggS3CMLv1TK0Qg6taw8SCsybL
-=LujG
+iF4EAREIAAYFAlSo0QAACgkQoBEVQmGOlx8NkwD+PEGcLVMJD6DP0r1hO6e44qt2
+kId7ddvuS/Cc5J9iPZcA/j1twRPR6rS9IYi9iFkx4IGhwI25uonJGkzP2VrNu/sM
+=qZ4E
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/haskell-src-meta/files/haskell-src-meta-0.6.0.8-ghc-7.10.patch b/dev-haskell/haskell-src-meta/files/haskell-src-meta-0.6.0.8-ghc-7.10.patch
new file mode 100644
index 000000000000..e023b53d3401
--- /dev/null
+++ b/dev-haskell/haskell-src-meta/files/haskell-src-meta-0.6.0.8-ghc-7.10.patch
@@ -0,0 +1,70 @@
+commit 24e6f45408083745080ff2f3710f58209041113c
+Author: Luite Stegeman <stegeman@gmail.com>
+Date:   Sun Dec 28 21:33:22 2014 +0100
+
+    updates for GHC 7.10 and Template Haskell 2.10
+
+diff --git a/haskell-src-meta.cabal b/haskell-src-meta.cabal
+index de6a022..42d9619 100644
+--- a/haskell-src-meta.cabal
++++ b/haskell-src-meta.cabal
+@@ -18,14 +18,14 @@ description:        The translation from haskell-src-exts abstract syntax
+ extra-source-files: ChangeLog README examples/*.hs
+ 
+ library
+-  build-depends:   base >= 4.2 && < 4.8,
++  build-depends:   base >= 4.2 && < 4.9,
+                    haskell-src-exts == 1.16.*,
+                    pretty >= 1.0 && < 1.2,
+                    syb >= 0.1 && < 0.5,
+                    th-orphans >= 0.5 && < 0.9
+ 
+   if impl(ghc >= 7.4)
+-    Build-depends: template-haskell >= 2.7 && < 2.10
++    Build-depends: template-haskell >= 2.7 && < 2.11
+   else
+     Build-depends: template-haskell >= 2.4 && < 2.7,
+                    uniplate >= 1.3 && < 1.7
+diff --git a/src/Language/Haskell/Meta/Syntax/Translate.hs b/src/Language/Haskell/Meta/Syntax/Translate.hs
+index 189d32e..36a08f1 100644
+--- a/src/Language/Haskell/Meta/Syntax/Translate.hs
++++ b/src/Language/Haskell/Meta/Syntax/Translate.hs
+@@ -384,9 +384,15 @@ a .->. b = AppT (AppT ArrowT a) b
+ toCxt :: Hs.Context -> Cxt
+ toCxt = fmap toPred
+  where
++#if MIN_VERSION_template_haskell(2,10,0)
++  toPred (Hs.ClassA n ts) = foldl' AppT (ConT (toName n)) (fmap toType ts)
++  toPred (Hs.InfixA t1 n t2) = foldl' AppT (ConT (toName n)) (fmap toType [t1,t2])
++  toPred (Hs.EqualP t1 t2) = foldl' AppT EqualityT (fmap toType [t1,t2])
++#else
+   toPred (Hs.ClassA n ts) = ClassP (toName n) (fmap toType ts)
+   toPred (Hs.InfixA t1 n t2) = ClassP (toName n) (fmap toType [t1, t2])
+   toPred (Hs.EqualP t1 t2) = EqualP (toType t1) (toType t2)
++#endif
+   toPred a@Hs.IParam{} = noTH "toCxt" a
+ 
+ foldAppT :: Type -> [Type] -> Type
+diff --git a/src/Language/Haskell/Meta/Utils.hs b/src/Language/Haskell/Meta/Utils.hs
+index 36f7e96..d194f3e 100644
+--- a/src/Language/Haskell/Meta/Utils.hs
++++ b/src/Language/Haskell/Meta/Utils.hs
+@@ -166,6 +166,9 @@ renameT env new (ForallT ns cxt t) =
+     unVarT (VarT n) = PlainTV n
+     renamePreds = renameThings renamePred
+ 
++#if MIN_VERSION_template_haskell(2,10,0)
++    renamePred = renameT
++#else
+     renamePred env new (ClassP n ts) = let
+         (ts', env', new') = renameTs env new [] ts
+       in (ClassP (normaliseName n) ts', env', new')
+@@ -174,7 +177,7 @@ renameT env new (ForallT ns cxt t) =
+         (t1', env1, new1) = renameT env new t1
+         (t2', env2, new2) = renameT env1 new1 t2
+       in (EqualP t1' t2', env2, new2)
+-
++#endif
+ 
+ -- | Remove qualification, etc.
+ normaliseName :: Name -> Name
diff --git a/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.8.ebuild b/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.8.ebuild
index 83bf8294c69f..747fc19304e5 100644
--- a/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.8.ebuild
+++ b/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.8.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.8.ebuild,v 1.1 2014/12/13 14:06:48 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.8.ebuild,v 1.2 2015/01/04 05:34:51 gienah Exp $
 
 EAPI=5
 
 # ebuild generated by hackport 0.4.3
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
+inherit base haskell-cabal
 
 DESCRIPTION="Parse source to template-haskell abstract syntax"
 HOMEPAGE="http://hackage.haskell.org/package/haskell-src-meta"
@@ -26,3 +26,5 @@ RDEPEND=">=dev-haskell/haskell-src-exts-1.16:=[profile?] <dev-haskell/haskell-sr
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.6
 "
+
+PATCHES=("${FILESDIR}/${PN}-0.6.0.8-ghc-7.10.patch")