gentoo resync : 02.09.2020

3 files changed, 58 insertions, 51 deletions

diff --git a/dev-haskell/text-show/Manifest b/dev-haskell/text-show/Manifest
index 6c171e4c6536..df45a7a503ac 100644
--- a/dev-haskell/text-show/Manifest
+++ b/dev-haskell/text-show/Manifest
@@ -1,3 +1,3 @@
-DIST text-show-3.4.tar.gz 105127 BLAKE2B 4ea8f7cddaaad4630f0c8317dbe4d5505f27f3008c5e17117d9100f94bb49439edd2761acef60696ef8a97dc8412964d0a9750353f91b30257b025c9e88fd054 SHA512 48b7fdd801c4fc31e12f14a9ba0589e0971481a2f8562d00c697a9fd48f6420e73df0a7318ff4579a786cd606a1fda2287eab3f8c423810c0d00919c68eeebed
-EBUILD text-show-3.4.ebuild 2016 BLAKE2B e01a4519d216d8ce87098c71a16de8725b144c47d46468214792a5a34256164acfa969d5c539a788027026f7828485fd4c918922ee2f8091c63d2498ae76dcf3 SHA512 057855614fe96cb7d824e80a26ee7cecc2d64ae9797b8ebde4b63e39554e2c70598cb7750067b4ad7bc49f5c53ca9b33a2e8d15a759e591de7e9da88120c3936
+DIST text-show-3.8.5.tar.gz 95620 BLAKE2B 51c1a5f9b29d60e305b53db1a47bc415f8cec3fa4c29c22d103ffc20dd4585bc8241f471031eaaf798c0df379c589cd4a9622877b7f69cedc5f15c3fa94c9291 SHA512 17e6e4d188280d4545867b31210f9e8e69337996c80b8c4f9fd846e50605acb29ebb2429e72ce76545426741055c4806c20a32b59d47e190a38d0f1ed9405947
+EBUILD text-show-3.8.5.ebuild 2212 BLAKE2B c5ee88b668b59e175e7026ec2016e3604f6a255c72d681a65843d02645e8b3fa1c40ed98becb1e684ef4b8fcdad74ee9485690812d67a96c2f2843c1dcec3768 SHA512 849c9406d795b7c8f592770afc03fc157c383934829d74a3390a627a6a1bb5f8c0076ba942132dccdaed1ab1c5b0f8226592a369ac1877a5dca1156b9f2d64b6
 MISC metadata.xml 1745 BLAKE2B d094818a5099ee07ad3d768a300b456f1d5e62b11fcf1c5bbfcf6fb4ec0417709d96bb1f6f76eceb89e5154dfd19ce57fd281ef1011c1885e947992ebdaaeb05 SHA512 ee8e1085322a3ecfc53b35f651757515b214be5e3511931390e0e79b65d449a8cc15af6d50b695cd777abe5508c662b0bb9bb5cf4943399bd01809c9b124b2c7
diff --git a/dev-haskell/text-show/text-show-3.4.ebuild b/dev-haskell/text-show/text-show-3.4.ebuild
deleted file mode 100644
index 3e0806d71e12..000000000000
--- a/dev-haskell/text-show/text-show-3.4.ebuild
+++ /dev/null
@@ -1,49 +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: -developer
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Efficient conversion of values into Text"
-HOMEPAGE="https://github.com/RyanGlScott/text-show"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/base-compat-0.8.1:=[profile?] <dev-haskell/base-compat-1:=[profile?]
-	>=dev-haskell/bifunctors-5.1:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
-	dev-haskell/bytestring-builder:=[profile?]
-	>=dev-haskell/contravariant-0.5:=[profile?] <dev-haskell/contravariant-2:=[profile?]
-	>=dev-haskell/generic-deriving-1.11:=[profile?] <dev-haskell/generic-deriving-2:=[profile?]
-	>=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-2:=[profile?]
-	>=dev-haskell/semigroups-0.17:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/text-0.11.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/th-lift-0.7.6:=[profile?] <dev-haskell/th-lift-1:=[profile?]
-	>=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-haskell/void-0.5:=[profile?] <dev-haskell/void-1:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/base-compat-0.8.2 <dev-haskell/base-compat-1
-		>=dev-haskell/base-orphans-0.5.2 <dev-haskell/base-orphans-1
-		>=dev-haskell/deriving-compat-0.3 <dev-haskell/deriving-compat-1
-		>=dev-haskell/hspec-2 <dev-haskell/hspec-3
-		>=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-3
-		>=dev-haskell/quickcheck-instances-0.1 <dev-haskell/quickcheck-instances-0.4
-		>=dev-haskell/tagged-0.8.3 <dev-haskell/tagged-1 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-developer
-}
diff --git a/dev-haskell/text-show/text-show-3.8.5.ebuild b/dev-haskell/text-show/text-show-3.8.5.ebuild
new file mode 100644
index 000000000000..0bd37f1302be
--- /dev/null
+++ b/dev-haskell/text-show/text-show-3.8.5.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+#hackport: flags: -developer
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Efficient conversion of values into Text"
+HOMEPAGE="https://github.com/RyanGlScott/text-show"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/base-compat-batteries-0.11:=[profile?] <dev-haskell/base-compat-batteries-0.12:=[profile?]
+	>=dev-haskell/bifunctors-5.1:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
+	dev-haskell/bytestring-builder:=[profile?]
+	>=dev-haskell/generic-deriving-1.11:=[profile?] <dev-haskell/generic-deriving-2:=[profile?]
+	>=dev-haskell/text-0.11.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/th-abstraction-0.3:=[profile?] <dev-haskell/th-abstraction-0.4:=[profile?]
+	>=dev-haskell/th-lift-0.7.6:=[profile?] <dev-haskell/th-lift-1:=[profile?]
+	>=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( >=dev-haskell/base-orphans-0.8.2 <dev-haskell/base-orphans-0.9
+		>=dev-haskell/deriving-compat-0.5.6 <dev-haskell/deriving-compat-1
+		>=dev-haskell/hspec-2 <dev-haskell/hspec-3
+		>=dev-haskell/quickcheck-2.12 <dev-haskell/quickcheck-2.15
+		>=dev-haskell/quickcheck-instances-0.3.18 <dev-haskell/quickcheck-instances-0.4 )
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base                  >= 4.9 && < 4.14' 'base                  >= 4.9' \
+		'base      >= 4.5    && < 4.14' 'base      >= 4.5' \
+		'base                  >= 4.5 && < 4.9' 'base                  >= 4.5' \
+		'ghc-boot-th           >= 8.0  && < 8.9' 'ghc-boot-th           >= 8.0' \
+		'template-haskell      >= 2.11 && < 2.16' 'template-haskell      >= 2.11' \
+		'template-haskell      >= 2.5  && < 2.11' 'template-haskell      >= 2.5' \
+		'QuickCheck            >= 2.12   && < 2.14' 'QuickCheck            >= 2.12'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-developer
+}