gentoo resync : 16.09.2020

5 files changed, 0 insertions, 166 deletions

diff --git a/dev-haskell/haskell-src-meta/Manifest b/dev-haskell/haskell-src-meta/Manifest
index 550066c402ce..a57180fb49f1 100644
--- a/dev-haskell/haskell-src-meta/Manifest
+++ b/dev-haskell/haskell-src-meta/Manifest
@@ -1,10 +1,3 @@
-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
 DIST haskell-src-meta-0.8.5.tar.gz 24027 BLAKE2B f94f88fa7a5edac23cab13de346056a3b9f6fb30e47de8f98142378211d7d12ad1622317bed04dec3cc322730023b0cce5e571016b6325c05e2503fe9fafa73a SHA512 873a797f53fc30dbb51b719228bc649f47d1c3432380a82b5dca11574b432676ed29d297c7547f1d752bb1c977c8858e55fb5135ffb58146b938d02414fe6723
-EBUILD haskell-src-meta-0.6.0.10.ebuild 813 BLAKE2B 78fc430196c6edc961b317685996b9bf7a1b2c4eb87c183a7fc0406819d93808c92c7a6eda719cc303d4d2d5a0afb58b1b308ae19b50e5b7d85881555622f425 SHA512 90df8937cf11d551a9469a2e82614c56790a1379a20cb3bd90b6a47ad9f825c19250d61cb821522e530c09a81d09448911b942f203272333d6c8a258bc2c70fd
-EBUILD haskell-src-meta-0.6.0.14-r1.ebuild 811 BLAKE2B 66a71726087624eaf67ea975ff3f4560de4ce436a5da25026d49539bf6b3c1887f4349b6e622d8df6872d45b0e41301402f02c958a4d6883e95eb451babe23d6 SHA512 5506be30926cb46bb2e304277827898f463515280b148bd1ea9fa7ac68fa067c1ea530808be492f360b1172bca9fc413575486f4554c810aa25a9bc3374c7ab8
-EBUILD haskell-src-meta-0.6.0.8-r1.ebuild 928 BLAKE2B a39d9aaa5941dbda954a76f19757e0a584069e9320bcccbcb135f363d2ced87ca424325138f3d9e3a22b975d9ef2e6e237235fc4a502ce7e1f53ecc2672924a4 SHA512 7761acd29d4f928efd8c0e194cadddd2756d1596e64c3dac1bf210d7a49c61050b379674258fca8d6ca78bae5400575493916442aaa0cb4ad2ccc46aa691d983
 EBUILD haskell-src-meta-0.8.5-r1.ebuild 1085 BLAKE2B 10ddee3251ec1b32a955e579fd7848966385e19972fb7f503c490a0ae849052d2ea5b22c457e09811e1a3f07955a45899d8e1cd87f53320467ede7d571ee671f SHA512 f7a76281dfc77683ee0c702719d9747c25a3372bd98b1cbda6658c8415a4262c964e79249ec7e7b29e64c38951abba621d8cfaf534aef337cfd4c6ccd32f60d1
 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
deleted file mode 100644
index e023b53d3401..000000000000
--- a/dev-haskell/haskell-src-meta/files/haskell-src-meta-0.6.0.8-ghc-7.10.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-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
deleted file mode 100644
index 6306ed577a2a..000000000000
--- a/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.10.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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="https://hackage.haskell.org/package/haskell-src-meta"
-SRC_URI="https://hackage.haskell.org/package/${P}/${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
deleted file mode 100644
index 0bf339253ea1..000000000000
--- a/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.14-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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="https://hackage.haskell.org/package/haskell-src-meta"
-SRC_URI="https://hackage.haskell.org/package/${P}/${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
deleted file mode 100644
index c313bad3f39f..000000000000
--- a/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.8-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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="https://hackage.haskell.org/package/haskell-src-meta"
-SRC_URI="https://hackage.haskell.org/package/${P}/${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'
-}