gentoo resync : 25.08.2020

4 files changed, 37 insertions, 84 deletions

diff --git a/dev-haskell/persistent-template/Manifest b/dev-haskell/persistent-template/Manifest
index 242102162268..e06930670be4 100644
--- a/dev-haskell/persistent-template/Manifest
+++ b/dev-haskell/persistent-template/Manifest
@@ -1,5 +1,3 @@
-DIST persistent-template-2.1.3.4.tar.gz 19084 BLAKE2B 625532bca1e65a40f043f6975cf1c3c93329bd593cc2c5f6f9f62c0aa925c91a358518ce69ccc65609b4d2e9686a4337af47bd2a7e6778769d7f3cb40796241d SHA512 8b218dea93a6a2ca80801acb43f101d6809d7118f3b6765a98543d87b12b4b565d5b3ea1f1256863b2493553f996ef5dcc569432507de6477b1f59a02093d95a
-DIST persistent-template-2.5.1.6.tar.gz 20196 BLAKE2B d7d63dbead0348bc3c9239c23e5976337fa952a4a19cf86507064632d0ab1ddd7b26f984285307cf7b3ff177afd8aa5e94708412ba954815959ff09fb857bfb0 SHA512 4e2432a0f0fca28699c3abe9298b10451330dfb4e2b1a7048a2a98e3e18d4b41df06ba1bd53ffbbce3aebb123cd2f6ec9249580490a32c478ff3aff628011916
-EBUILD persistent-template-2.1.3.4.ebuild 1148 BLAKE2B 21adcaf596ee31d7298e4594380007515d61638cb04db66b34a6730ded1df3f06bd84714e57a56f35169ecc53faf46eece23ca68359ed2f455c9762da582cb67 SHA512 1637849f9c9941fe42eb307470ee577a433eafacd2be4718cda84f82634dbfbffd816b2d2fe8ea80295977f4a50ea3a88169121a368c17c47f5bd02d3f064bb5
-EBUILD persistent-template-2.5.1.6-r2.ebuild 1461 BLAKE2B 952f3c92bbd322cc411eb2bd73c5bb5c8463c541cc5af64b5a3a6b8e960f2ac85f3c996a16333652be22b41d839041b6314532f58c6a02ff3d3ffde563b137a3 SHA512 11f4a368dcd13ff985381485977b72e67a978d007ab2301258d34cb81ef6d115488f2d59f75688b4ee86323844506e312a35c7ce1b50fd177c6073007c0e05d9
+DIST persistent-template-2.8.2.3.tar.gz 25949 BLAKE2B 2b2fbfcb4e8dad68da8a820ae082db8cee9f683db9509b55b4ba908bff0a20cdf4e925db4bfe2d5c0014912e58469aa593e24a428f181928e8024917a3ab7db8 SHA512 eef94f07783f2b61ed4d00c75a57e976e2546ee1cb564471ea33e5faf01634701a7b60b4c1ee64594e0058949966f132fe46f1a5efc5a64f949fc6e6b27d5ddb
+EBUILD persistent-template-2.8.2.3.ebuild 1174 BLAKE2B 22a507b8a84f0a9e7176ab3f7fb2004e21ed5b65bcd0b09c5b30e71290a6c9a25523daeebb4f4a179fc30c1c3c9f33c30f76a6f880111b60572c110267f6cbed SHA512 9df4d2e578edcc5171c3e66143f65e896fb2011efc42099e5d84c37e64870e66e158033adf487f784aa20459acc73ebb4ff16a180388d2d05687072b9a85b108
 MISC metadata.xml 423 BLAKE2B 74c07376a1dec4710e8c652e2400fff81a26fe160c8d66535d96cde967cf6fa2e430a78464478a684ce4bbf0daf93f881fa9803f03c68d7d0d0f74dec421973f SHA512 9bb326d4650a21992d988e00e20936bb9e40138d306c75e1621b4291b6cdeb72bd40d7d25c503f89a5266c157ba917ece4828a7255ad5b5662f450c4e82091ab
diff --git a/dev-haskell/persistent-template/persistent-template-2.1.3.4.ebuild b/dev-haskell/persistent-template/persistent-template-2.1.3.4.ebuild
deleted file mode 100644
index 36fbfa68a7e8..000000000000
--- a/dev-haskell/persistent-template/persistent-template-2.1.3.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 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 test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Type-safe, non-relational, multi-backend persistence"
-HOMEPAGE="https://www.yesodweb.com/book/persistent"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-0.10:=[profile?]
-	>=dev-haskell/monad-control-0.2:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	dev-haskell/monad-logger:=[profile?]
-	dev-haskell/path-pieces:=[profile?]
-	>=dev-haskell/persistent-2.1.3:=[profile?] <dev-haskell/persistent-3:=[profile?]
-	dev-haskell/tagged:=[profile?]
-	>=dev-haskell/text-0.5:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/persistent-template/persistent-template-2.5.1.6-r2.ebuild b/dev-haskell/persistent-template/persistent-template-2.5.1.6-r2.ebuild
deleted file mode 100644
index fa0195fefb94..000000000000
--- a/dev-haskell/persistent-template/persistent-template-2.5.1.6-r2.ebuild
+++ /dev/null
@@ -1,45 +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="Type-safe, non-relational, multi-backend persistence"
-HOMEPAGE="https://www.yesodweb.com/book/persistent"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.7:=[profile?]
-	>=dev-haskell/aeson-compat-0.3.2.0:=[profile?] <dev-haskell/aeson-compat-0.4:=[profile?]
-	>=dev-haskell/http-api-data-0.2:=[profile?]
-	>=dev-haskell/monad-control-0.2:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	dev-haskell/monad-logger:=[profile?]
-	dev-haskell/path-pieces:=[profile?]
-	>=dev-haskell/persistent-2.5:=[profile?] <dev-haskell/persistent-3:=[profile?]
-	dev-haskell/tagged:=[profile?]
-	>=dev-haskell/text-0.5:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/quickcheck )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'aeson                    >= 0.7       && < 0.12' 'aeson                    >= 0.7' \
-		'http-api-data            >= 0.2       && < 0.3' 'http-api-data            >= 0.2'
-}
diff --git a/dev-haskell/persistent-template/persistent-template-2.8.2.3.ebuild b/dev-haskell/persistent-template/persistent-template-2.8.2.3.ebuild
new file mode 100644
index 000000000000..2a2501f66988
--- /dev/null
+++ b/dev-haskell/persistent-template/persistent-template-2.8.2.3.ebuild
@@ -0,0 +1,35 @@
+# 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
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Type-safe, non-relational, multi-backend persistence"
+HOMEPAGE="http://www.yesodweb.com/book/persistent"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/aeson-1.0:=[profile?] <dev-haskell/aeson-1.5:=[profile?]
+	>=dev-haskell/http-api-data-0.3.7:=[profile?]
+	>=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
+	dev-haskell/monad-logger:=[profile?]
+	dev-haskell/path-pieces:=[profile?]
+	>=dev-haskell/persistent-2.10:=[profile?] <dev-haskell/persistent-3:=[profile?]
+	>=dev-haskell/text-1.2:=[profile?]
+	>=dev-haskell/th-lift-instances-0.1.14:=[profile?] <dev-haskell/th-lift-instances-0.2:=[profile?]
+	dev-haskell/unordered-containers:=[profile?]
+	>=dev-lang/ghc-8.2.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.0.0.2
+	test? ( >=dev-haskell/hspec-2.4
+		dev-haskell/quickcheck )
+"