gentoo resync : 28.04.2021

3 files changed, 0 insertions, 102 deletions

diff --git a/dev-haskell/th-utilities/Manifest b/dev-haskell/th-utilities/Manifest
index 8612edca40fd..df1797b3edad 100644
--- a/dev-haskell/th-utilities/Manifest
+++ b/dev-haskell/th-utilities/Manifest
@@ -1,6 +1,3 @@
-AUX th-utilities-0.2.3.0-ghc-8.8.patch 2566 BLAKE2B 3d59929531c5de3892155d836ffdbdbbe425bb959b65c2fa15fb58c5e9f083515f263717cc68e0a780dd95c476ce2c4cd504a4abc1f8f9c51f9d86b1cf10efb7 SHA512 346e3bf318d4f8aab2edfa89719a82997d91175ff11e2d649ac281269f062396f5dea9364a74ebb2ab0f78421dbc462ecea60e1b0868ad9fa08379659e446af3
-DIST th-utilities-0.2.3.0.tar.gz 15577 BLAKE2B fad72515936ba6b7876ff731c7a1e12246014e191282028fc1bd1846dc704d4d1408e82e82a394a1f58350f961c5b7b7f5b9ae0cfbf09551fc5964433d42b113 SHA512 edddde2ea3a9da44bd34cbf51d9f4ea14510eac9527f2f1a199390566e24f10ed84403f5450e47244b0cbfc4b5dc3a5c3f64ec596255f191d8bad83d9043a3ba
 DIST th-utilities-0.2.4.1.tar.gz 16134 BLAKE2B f8357f66c7d62f0fb902f933edb63a75474eea5bb90f80f192799ae0f2c3ce535d5888a53256331552661791277388b1cdae0bab472c3bb1d39bf79fe29f20b1 SHA512 b23272db62a0842af56efbc2f4cc0ebb8d0c900ecb3471fd2a984792da76ab57780d0960fa737fa0023dcd06e12b7585b586ae330005570046ba767101840d02
-EBUILD th-utilities-0.2.3.0.ebuild 805 BLAKE2B d4c5d4b4278513198cbbb18e501bec598c9afcbf545e66b6a14655e2baba9d3fb446ab8f62111385fd2dfc1c7e8ff003dd6419ac3018aaa9665d385c2d5e6573 SHA512 392247a11b663044fd7528e0df8018b050d7494ef2487b099ede77d4a3f0156354dad3afd222acf34831ecd0c9f5264aee850b8f982959b46e1e3a6419886bab
 EBUILD th-utilities-0.2.4.1.ebuild 763 BLAKE2B 1e05e0f88d026a67a6ee9dd3ffc8b078ed20634aecfffe0fe8743b9f7dea5cc8205538538534a5be11838b7de27224fcd4b6accc7a9c3d68099050e9d750f827 SHA512 1f77bbd1c7982942b3d7cb844d63227234358793d2c716983f0e65958af66b3b8dae1682231598b2ee406d364a845f8b12cab41fab829de8ec5fa631fbf69ab5
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/th-utilities/files/th-utilities-0.2.3.0-ghc-8.8.patch b/dev-haskell/th-utilities/files/th-utilities-0.2.3.0-ghc-8.8.patch
deleted file mode 100644
index 8a3795430b1f..000000000000
--- a/dev-haskell/th-utilities/files/th-utilities-0.2.3.0-ghc-8.8.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-commit 5e510f6a6ed24b98d143e5baeb156a8901bf3faa
-Author: Ryan Scott <ryan.gl.scott@gmail.com>
-Date:   Mon Dec 10 15:12:47 2018 -0500
-
-    Allow building with template-haskell-2.15.0.0
-
-diff --git a/src/TH/ReifySimple.hs b/src/TH/ReifySimple.hs
-index d179829..70b929e 100644
---- a/src/TH/ReifySimple.hs
-+++ b/src/TH/ReifySimple.hs
-@@ -233,18 +233,24 @@ infoToDataFamily info = case info of
-         Just $ DataFamily name (map tyVarBndrName tvs) (map go insts)
-     _ -> Nothing
-   where
--#if MIN_VERSION_template_haskell(2,11,0)
--    go (NewtypeInstD preds name params _kind con _deriving) =
-+#if MIN_VERSION_template_haskell(2,15,0)
-+    go (NewtypeInstD preds _ lhs _kind con _deriving)
-+      | ConT name:params <- unAppsT lhs
-+#elif MIN_VERSION_template_haskell(2,11,0)
-+    go (NewtypeInstD preds name params _kind con _deriving)
- #else
--    go (NewtypeInstD preds name params       con _deriving) =
-+    go (NewtypeInstD preds name params       con _deriving)
- #endif
--        DataInst name preds params (conToDataCons con)
--#if MIN_VERSION_template_haskell(2,11,0)
--    go (DataInstD preds name params _kind cons _deriving) =
-+      = DataInst name preds params (conToDataCons con)
-+#if MIN_VERSION_template_haskell(2,15,0)
-+    go (DataInstD preds _ lhs _kind cons _deriving)
-+      | ConT name:params <- unAppsT lhs
-+#elif MIN_VERSION_template_haskell(2,11,0)
-+    go (DataInstD preds name params _kind cons _deriving)
- #else
--    go (DataInstD preds name params       cons _deriving) =
-+    go (DataInstD preds name params       cons _deriving)
- #endif
--        DataInst name preds params (concatMap conToDataCons cons)
-+      = DataInst name preds params (concatMap conToDataCons cons)
-     go info' = error $
-         "Unexpected instance in FamilyI in infoToDataInsts:\n" ++ pprint info'
- 
-@@ -263,8 +269,23 @@ infoToTypeFamily info = case info of
- #endif
-     _ -> Nothing
-   where
-+#if MIN_VERSION_template_haskell(2,15,0)
-+    goEqn _ (TySynEqn _ lhs ty)
-+      | ConT name:params <- unAppsT lhs
-+      = TypeInst name params ty
-+      | otherwise
-+      = error $ "Unexpected type family instance head: " ++ pprint lhs
-+#else
-     goEqn name (TySynEqn params ty) = TypeInst name params ty
-+#endif
-+
-+#if MIN_VERSION_template_haskell(2,15,0)
-+    go (TySynInstD (TySynEqn _ lhs ty))
-+      | ConT name:params <- unAppsT lhs
-+      = TypeInst name params ty
-+#else
-     go (TySynInstD name (TySynEqn params ty)) = TypeInst name params ty
-+#endif
-     go info' = error $
-         "Unexpected instance in FamilyI in infoToTypeInsts:\n" ++ pprint info'
- 
diff --git a/dev-haskell/th-utilities/th-utilities-0.2.3.0.ebuild b/dev-haskell/th-utilities/th-utilities-0.2.3.0.ebuild
deleted file mode 100644
index ce7bbd312b27..000000000000
--- a/dev-haskell/th-utilities/th-utilities-0.2.3.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Collection of useful functions for use with Template Haskell"
-HOMEPAGE="https://github.com/fpco/th-utilities#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/primitive:=[profile?]
-	dev-haskell/syb:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/th-orphans:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hspec
-		dev-haskell/vector )
-"
-
-PATCHES=("${FILESDIR}"/${P}-ghc-8.8.patch)