gentoo resync : 28.07.2021

3 files changed, 10 insertions, 57 deletions

diff --git a/dev-haskell/regex-tdfa/Manifest b/dev-haskell/regex-tdfa/Manifest
index 02bed8b87c9e..65c4c55f17fc 100644
--- a/dev-haskell/regex-tdfa/Manifest
+++ b/dev-haskell/regex-tdfa/Manifest
@@ -1,5 +1,3 @@
-DIST regex-tdfa-1.2.2.tar.gz 65969 BLAKE2B c533dd7fd39e973ccf73d1bced6c35e65ce3a57a543e3e6c15c191748c2073c7d4a230f995168a2c52f4eafe152961950edcb28fa72c064a70bd058a49a28896 SHA512 86241b9bfa27351302e4ef18fd2cdc8a58341d6a8fa12c92e3ebb11cca93e58e5a69b97b545c61ce704bd6e2ac0b7a7c1a3555f138ba5ee9cf9728175f43d26a
-DIST regex-tdfa-1.3.1.0.tar.gz 77767 BLAKE2B 2993a19f68ad167446ac8e7fbbd3552176de5cf35ca69627fd8e0d6be877986b90253dee13aae1f95f5328b6b30bb96c2ed594403c1bac1ef4d8cf0283675d5e SHA512 becac929003ea2c1a8fe1e890a53d3cb914eeb02090a23d014120d04ee144e24c2c7bdfaadd58a2dd70ed49df1e0059a3f8a94faa4ce0a6efd533ee6019c951f
-EBUILD regex-tdfa-1.2.2.ebuild 782 BLAKE2B 05b96af14d1f2f0d20d28158cdef2f31aefa584cef3cd489f293a38c053a4b93124dcc341b0c3ed34b14c9ad65a1be2246e2d30c18b82c0f3cc20f9938f32a75 SHA512 198f8bded69bc1576511477c6de6690c0b60bb58194b53cfa0258f4b88d4b0f11ab4759ddaaef90c3fdaef6382d3d9bb8201a79263b324e0ca9474373f7c5d0a
-EBUILD regex-tdfa-1.3.1.0.ebuild 1362 BLAKE2B fa3114037cd96567c38234cab655e2010639b4ce41fea26127e28b5714d26339353190fa5bebe8824b61c2da5a6bef253d49568b79c0e49811f9353604ab78f9 SHA512 ce584633b74350d04e570a22c6ef76df23f3872cce6a3feb38dda6c88e860a2e8026013a0403dde01e7fed5f62624c48f58a9f664f92e7c157b4de38747050a1
+DIST regex-tdfa-1.3.1.1.tar.gz 78057 BLAKE2B f18f87bdace5a14d2c80b4797e5e05b3b5fb042a84a7ddaf44a153c1d34631c9b722b3cbb1a2024464ab549c058c25ff94372046d6aeab064ba4f6acda86fb20 SHA512 d90461dd142602ee392e8861d6a44a15b59ffae9ed9aae150aa0f27245f04839da46ed3c8cb87e11f8c35ff017b0a596e2874b6a1ec653452a2fab3ee1f83b4e
+EBUILD regex-tdfa-1.3.1.1.ebuild 1097 BLAKE2B 2d4830f87a9f8a5ebff7b81ba5a19ea92270a45407b97b038fcdda948344f1687d165a828e6a4866b6a6205968bff910e5a77eb084f62fedab853fe64eac3a85 SHA512 ea262ff0b02aa387dc17207f83afeb66665bc8f11e7b2c6849e2c62c6ef8693546b1333c376dbc33686681e3d3fcaa24d81fe44456930da1b2e18941c6a6b051
 MISC metadata.xml 339 BLAKE2B 78bb33fbf77bb354f3b4914eb67e5ad5661d9e2560946963bd68ddc564a1c8c26ffe26e93b37a0ecc69ed276dcbb83b6e5323ca53c719bf18d358a100c14fd0a SHA512 6295da241ce281076d6d81b4007ee114ed3b9e460101bc43bd67b4958cfefdfa429e7f0fdd73cb8e384bd55d8e43373254db422364fbdce7047e90ee5f3ebe39
diff --git a/dev-haskell/regex-tdfa/regex-tdfa-1.2.2.ebuild b/dev-haskell/regex-tdfa/regex-tdfa-1.2.2.ebuild
deleted file mode 100644
index 111f440fcb00..000000000000
--- a/dev-haskell/regex-tdfa/regex-tdfa-1.2.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: -base4,-devel
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Replaces/Enhances Text.Regex"
-HOMEPAGE="https://github.com/ChrisKuklewicz/regex-tdfa"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	>=dev-haskell/regex-base-0.93.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-base4 \
-		--flag=-devel
-}
diff --git a/dev-haskell/regex-tdfa/regex-tdfa-1.3.1.0.ebuild b/dev-haskell/regex-tdfa/regex-tdfa-1.3.1.1.ebuild
index 383f8942d261..7cdc06a6deaa 100644
--- a/dev-haskell/regex-tdfa/regex-tdfa-1.3.1.0.ebuild
+++ b/dev-haskell/regex-tdfa/regex-tdfa-1.3.1.1.ebuild
@@ -1,44 +1,33 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-# ebuild generated by hackport 0.6.2.9999
+# ebuild generated by hackport 0.6.7.9999
 #hackport: flags: +base4,-devel,+force-o2
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
-DESCRIPTION="Replaces/Enhances Text.Regex"
-HOMEPAGE="https://hackage.haskell.org/package/regex-tdfa"
+DESCRIPTION="Pure Haskell Tagged DFA Backend for \"Text.Regex\" (regex-base)"
+HOMEPAGE="https://wiki.haskell.org/Regular_expressions"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
-	>=dev-haskell/mtl-2.1.3:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+RDEPEND=">=dev-haskell/mtl-2.1.3:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
 	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
 	>=dev-haskell/regex-base-0.94:=[profile?] <dev-haskell/regex-base-0.95:=[profile?]
 	>=dev-haskell/text-1.2.3:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.12
-	test? ( dev-haskell/semigroups
-		>=dev-haskell/utf8-string-1.0.1 <dev-haskell/utf8-string-1.1 )
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/utf8-string-1.0.1 <dev-haskell/utf8-string-1.1 )
 "
 
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base               >= 4.5 && < 4.14' 'base               >= 4.5'
-}
-
 src_configure() {
 	haskell-cabal_src_configure \
 		--flag=base4 \