gentoo resync : 14.07.2018

6 files changed, 179 insertions, 0 deletions

diff --git a/dev-haskell/haskell-src-meta/Manifest b/dev-haskell/haskell-src-meta/Manifest
new file mode 100644
index 000000000000..8c9a40ca4772
--- /dev/null
+++ b/dev-haskell/haskell-src-meta/Manifest
@@ -0,0 +1,8 @@
+AUX haskell-src-meta-0.6.0.8-ghc-7.10.patch 2741 BLAKE2B 7c776bbfe35f8674019b80eb8fe666e57f69d6e7f0b8ea94de1126487c7a890cd3d72d6119309404dce1fab062cba2842d5206f3812a64f4cdd3013732e722f3 SHA512 8acc57e9318068bf4f94c1fc4608badbe5058a833e609c3bbc7abeffd51380da87bf44e308ad38ec6e5481235db7bb11210f7dcb8c4dc1e579f4c2d3d0fd09b8
+DIST haskell-src-meta-0.6.0.10.tar.gz 19432 BLAKE2B 8984179d1964cf06f918175cb08efb444fd8cf7cdf52ac2617b399657dbcf5ba73841fc80fce0dddba1a2d4a21548d3bbbde74ffb49dcc259b4be0ec6c22c5d3 SHA512 efd6e06dc856c05b815a8a36f3411f3d5c171ad5cd84be75baaef1d7a784f3f32d81e9de175fb2ab2455ab6f3a80c2f743e4a277964816d6e8198bc4bf67ab4d
+DIST haskell-src-meta-0.6.0.14.tar.gz 20079 BLAKE2B 49d25b0061d46a0f55cc946944e29022998f1b3929df8632a3b74acbc6392054a695585aac5d2e166945ee4e513c1b049d5321c8047527cdfac42ebd23989a17 SHA512 d043ece8f28a47572f59cfc36a9d7b2c505a3d5c2ef24f0e90496c5d57b88791417234777e146a0e75c0fba10775ba41e627a00519c2e9718bf173d95e2a201f
+DIST haskell-src-meta-0.6.0.8.tar.gz 19449 BLAKE2B 0f8e21e01e26e2eddd8ebd0835b1f69e3dad3111cf7ff264c56a363f8b6f4bd7684ad3fc413c3d1584727d6ab914aa699792a98a092d91bfadae41018f73eca9 SHA512 590e66c837bd64db9bb8d09a698f52fb8b7c3ab07523c0e7fadcbb17bf33ee0fa523ec34012db7622681b4055164288df60083992ddbfb7553087373efbdb751
+EBUILD haskell-src-meta-0.6.0.10.ebuild 820 BLAKE2B f6afb3de5c70b4a1f4c59c63eb4480e27330c388d1631a9671b880fc3ce9b5801542b799250dd9b90667d8fc166561af73ff4ce95461c2fd1a8c1841fae94032 SHA512 796d30fcc6051868a0fc00520c2fd291ebbafa45f53445a1989f42fffb4e870d92ada1c173ddb5d90105394806efc85629b87ef3141445422ea1027f1643bf11
+EBUILD haskell-src-meta-0.6.0.14-r1.ebuild 816 BLAKE2B 1bffa954116f3a14c1a14c276987c6813344262840a255715537029870678810463baf64ca8226a792e1aece9df29364e479810a13276668dc062c76dc34ad22 SHA512 97f4a03d9fec091432a3cef50fdc3475325a1a866f3f261258383552ca7240310c71347761dc29c41ceb1acb04b062748a074da8ad2bf443526261c59f28636e
+EBUILD haskell-src-meta-0.6.0.8-r1.ebuild 933 BLAKE2B 93f9b720c576756e5282b81d3fe6134f22b2f235116888cd4eb873102693da9a3b43cc39acc116fb8a42c074b0ff623f35bced191d47352932bd879bfaecd232 SHA512 0d6720a8a619b643ac3e1d8fa806f35c7d5847d5f55c0c209e4d9eb94b787931cafb6fce5f9b57a8f9479e37d0c31051c053cae60a8f40215a07852cfc1bd472
+MISC metadata.xml 407 BLAKE2B 6b7053f4f1a93c0605e72ea519385a9784d55028bf184ed28a491a56ec64167188b4f97b2b26b32b28a79e8ed4e309930f7a4efb0d587eab8974b0a4cd931b3b SHA512 25b2811713d5574b1787c699c9d24beb1c694b8a397f1bfda992d0f3e6f53d3ec3a26e46beccf1d60d1df574d2c8ba85b58075d40216d3bd224904415f57410a
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.10.ebuild b/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.10.ebuild
new file mode 100644
index 000000000000..3673def57289
--- /dev/null
+++ b/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.10.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Parse source to template-haskell abstract syntax"
+HOMEPAGE="http://hackage.haskell.org/package/haskell-src-meta"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/haskell-src-exts-1.16:=[profile?] <dev-haskell/haskell-src-exts-1.17:=[profile?]
+	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.6:=[profile?]
+	>=dev-haskell/th-orphans-0.9.1:=[profile?] <dev-haskell/th-orphans-0.13:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.14-r1.ebuild b/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.14-r1.ebuild
new file mode 100644
index 000000000000..56a48d6c8de6
--- /dev/null
+++ b/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.14-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Parse source to template-haskell abstract syntax"
+HOMEPAGE="http://hackage.haskell.org/package/haskell-src-meta"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/haskell-src-exts-1.16:=[profile?] <dev-haskell/haskell-src-exts-1.18:=[profile?]
+	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.7:=[profile?]
+	>=dev-haskell/th-orphans-0.9.1:=[profile?] <dev-haskell/th-orphans-0.14:=[profile?]
+	>=dev-lang/ghc-7.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.8-r1.ebuild b/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.8-r1.ebuild
new file mode 100644
index 000000000000..24b5528cf8bb
--- /dev/null
+++ b/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.8-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit base haskell-cabal
+
+DESCRIPTION="Parse source to template-haskell abstract syntax"
+HOMEPAGE="http://hackage.haskell.org/package/haskell-src-meta"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/haskell-src-exts-1.16:=[profile?] <dev-haskell/haskell-src-exts-1.17:=[profile?]
+	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?]
+	>=dev-haskell/th-orphans-0.5:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
+
+PATCHES=("${FILESDIR}/${PN}-0.6.0.8-ghc-7.10.patch")
+
+src_prepare() {
+	base_src_prepare
+	cabal_chdeps \
+		'th-orphans >= 0.5 && < 0.9' 'th-orphans >= 0.5'
+}
diff --git a/dev-haskell/haskell-src-meta/metadata.xml b/dev-haskell/haskell-src-meta/metadata.xml
new file mode 100644
index 000000000000..5707ebf94594
--- /dev/null
+++ b/dev-haskell/haskell-src-meta/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		The translation from haskell-src-exts abstract syntax
+		to template-haskell abstract syntax isn't 100% complete yet.
+	</longdescription>
+</pkgmetadata>