gentoo resync : 25.08.2020

3 files changed, 60 insertions, 52 deletions

diff --git a/dev-haskell/aeson-compat/Manifest b/dev-haskell/aeson-compat/Manifest
index ed0c045a702e..06425ae20555 100644
--- a/dev-haskell/aeson-compat/Manifest
+++ b/dev-haskell/aeson-compat/Manifest
@@ -1,3 +1,3 @@
-DIST aeson-compat-0.3.6.tar.gz 8956 BLAKE2B 82a201543c2719e2bffbca1682e4181980ea5a26b7f0df782b5a5db7f99cbd60c477988d011ef8149f9f93fe8740935ef1fd174881cff62431d830b82da08708 SHA512 2d2bd172a1335886894df73fbb999ce5b8ae5ff710866560278b4bcf27a5ef4a2ff025a0a97cc4f764e85819bf6a9771bdaf7acbd830f1baee5f3133ff5c185d
-EBUILD aeson-compat-0.3.6.ebuild 2117 BLAKE2B 7bff5d6e8ccf25eae9541c2031e4d7a7594a33a785480ff2999fa6dd3c897a0c6e6d8af0174b9af8584f146f03c3f306d84fff37bde510226eaab2e99ac49569 SHA512 bb6e1730791b3f42c9eceb1cffbf48a711790d5afeb52a5ec1a445ed865f3ea5f01eb25ac3c926ff14475326d7387e757f360b984aaa0f0323e5d68c4b3460ec
+DIST aeson-compat-0.3.9.tar.gz 7441 BLAKE2B c370023ca56ddcd1f60cd4ee57e29299178bb04f9fad274e3109424df926c357faeab4e22416938b71f5f3109cf90ed8b3282fe14250ac17c872ea887998a8bc SHA512 84da7cbace32527d0e20d32415ba770d14417ad4dd9ca0f86e8b5f100449af8a51a7b32c7dfdd7b3557764bd7dfc9ae4aa0a95999bc34b074f49d243a4f4bc46
+EBUILD aeson-compat-0.3.9-r2.ebuild 2633 BLAKE2B fef286f819dde479ecff9f2607c5ead6d5815e29759ea00943e354a944a8831028747505395222aaa3f3555956d2d1003699f1a19803e6eef6b27a33c93fda49 SHA512 1c71693bc6fa9fb10b02b4e912769659dd16c55f25c6e13d382181a386e012d5d442c16a99ef8b80358a50498052e9da654c80df2943e9bf3647fea69eabe982
 MISC metadata.xml 406 BLAKE2B 1c0f6ca620c1db4eccc6f1cc9f681e86ec441b2319b1f634b6c4d6317da0446820e5aa7a3ba51b7e9d3068286f1af8eea8df1c78517a514870b9bbb66666dc55 SHA512 9e9212d62d26253da1ea61274f831d6e799d32b0d888be0b341df2dbda4edac71023beba570ac3b58f244359736ec51f9e20053962e6995696f824a247fe5283
diff --git a/dev-haskell/aeson-compat/aeson-compat-0.3.6.ebuild b/dev-haskell/aeson-compat/aeson-compat-0.3.6.ebuild
deleted file mode 100644
index 00a02581e95a..000000000000
--- a/dev-haskell/aeson-compat/aeson-compat-0.3.6.ebuild
+++ /dev/null
@@ -1,50 +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
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Compatibility layer for aeson"
-HOMEPAGE="https://github.com/phadej/aeson-compat#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.7.0.6:=[profile?] <dev-haskell/aeson-1.1:=[profile?]
-	>=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
-	>=dev-haskell/base-compat-0.6.0:=[profile?] <dev-haskell/base-compat-0.10:=[profile?]
-	>=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.9:=[profile?]
-	>=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/nats-1:=[profile?] <dev-haskell/nats-1.2:=[profile?]
-	>=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/semigroups-0.16.2.2:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	>=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
-	>=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/time-locale-compat-0.1.0.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/base-orphans-0.4.5 <dev-haskell/base-orphans-0.6
-		>=dev-haskell/quickcheck-2.7.6
-		>=dev-haskell/quickcheck-instances-0.3 <dev-haskell/quickcheck-instances-0.3.13
-		>=dev-haskell/tasty-0.10 <dev-haskell/tasty-0.12
-		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.10
-		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.9 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'QuickCheck            >=2.7.6 && <2.9.2' 'QuickCheck            >=2.7.6'
-}
diff --git a/dev-haskell/aeson-compat/aeson-compat-0.3.9-r2.ebuild b/dev-haskell/aeson-compat/aeson-compat-0.3.9-r2.ebuild
new file mode 100644
index 000000000000..afeccade5caf
--- /dev/null
+++ b/dev-haskell/aeson-compat/aeson-compat-0.3.9-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.5.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Compatibility layer for aeson"
+HOMEPAGE="https://github.com/phadej/aeson-compat#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/aeson-0.7.0.6:=[profile?] <dev-haskell/aeson-1.5:=[profile?]
+	>=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
+	>=dev-haskell/attoparsec-iso8601-1.0.0.0:=[profile?] <dev-haskell/attoparsec-iso8601-1.1:=[profile?]
+	>=dev-haskell/base-compat-0.6.0:=[profile?]
+	>=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
+	>=dev-haskell/hashable-1.2:=[profile?]
+	>=dev-haskell/nats-1.1.2:=[profile?] <dev-haskell/nats-1.2:=[profile?]
+	>=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+	>=dev-haskell/semigroups-0.18.5:=[profile?]
+	>=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+	>=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/time-locale-compat-0.1.0.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?]
+	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+	>=dev-haskell/void-0.7.2:=[profile?] <dev-haskell/void-0.8:=[profile?]
+	>=dev-lang/ghc-7.6.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.16.0
+	test? ( >=dev-haskell/base-orphans-0.4.5 <dev-haskell/base-orphans-0.9
+		>=dev-haskell/quickcheck-2.10
+		>=dev-haskell/quickcheck-instances-0.3.16 <dev-haskell/quickcheck-instances-0.4
+		>=dev-haskell/tasty-0.10
+		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11
+		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 )
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base                     >=4.6  && <4.13' 'base                     >=4.6' \
+		'base-compat              >=0.6.0 && <0.11' 'base-compat              >=0.6.0' \
+		'hashable                 >=1.2  && <1.3' 'hashable                 >=1.2' \
+		'semigroups               >=0.18.5 && <0.19' 'semigroups               >=0.18.5' \
+		'time                     >=1.4.0.1 && <1.9' 'time                     >=1.4.0.1' \
+		'tasty                 >=0.10 && <1.2' 'tasty                 >=0.10' \
+		'QuickCheck            >=2.10 && <2.13' 'QuickCheck            >=2.10'
+}