gentoo resync : 16.09.2020

5 files changed, 2 insertions, 120 deletions

diff --git a/dev-haskell/persistent-sqlite/Manifest b/dev-haskell/persistent-sqlite/Manifest
index bca932e34f75..830b7aecb0b1 100644
--- a/dev-haskell/persistent-sqlite/Manifest
+++ b/dev-haskell/persistent-sqlite/Manifest
@@ -1,8 +1,3 @@
-AUX persistent-sqlite-2.1.4.2-exe.patch 709 BLAKE2B 41fbf74d91c0cf98a7417754ac3533eac51dbf35258f9fd2f6be286271ecb0699ac461a6d9898fd211c06e288da572080f14d6c19263b8199d49d394de0fdfaa SHA512 96772879c46426fba0e79d23c5b11d2ae3e2e30a272bb11bc3f739eb20a7c5b182e952163b974b440f39c947180675e384dce5d7f7ea693e7835055248e18ced
-DIST persistent-sqlite-2.1.4.2.tar.gz 1460596 BLAKE2B b5bb2a869888fd276fc4a515000253408f878964b5b4b0740406a7655f2488a8b5c9354be108bc4f24b31caafa4916a9973ed2204a4be7ca53745dbc7217893f SHA512 9c959164135120f02464daee6d9012872d12212bcb94128010f05784cd11cd04d2fd2dcca5dafd9036d0bd4154a5262b26816b27d7a335f0404634471e3944c7
 DIST persistent-sqlite-2.10.6.2.tar.gz 2220390 BLAKE2B f146ec84ae45d0d4b4cb3c809bf694182c8592369e222029824f6eb6a39abbbb67acc6bdd2af4a9b8080d50ffcdc20968fa14cac237a475b220dcefe3329fc2d SHA512 b1db41bf77ae53b99c28f3224c9a2b7335faa4a78c96487270249959cc9491fa542e28d38dd63a2b417580f6a41608ffcee152e8609fe16392005c728862c7bc
-DIST persistent-sqlite-2.6.tar.gz 3565770 BLAKE2B e92865929494d37ea5363dcb5110821e5ae5de099aca3fefa59311d2586b9c450f648fd4077ac7310efe72d5c7267b8f5c943610e65db7731608d8e86c62fdfe SHA512 c0be576429ee0051eeeffff6c6d7168a7993deeca47acd27bf2d0075afad2702855f2c14d8b389697d5053aa097d81fe119e4eb215a1c56f782e2ac95a5f8ff8
-EBUILD persistent-sqlite-2.1.4.2.ebuild 1302 BLAKE2B 5f82fc77a67f846d665ee4a7ad3b6134abd679b2583dfb3e4c5bead612557e2391117a11c8aa6fb41f5040ac7488553bd475dcd032e5f1695e45d0143adde57a SHA512 04f9d44c2f711fec358afb5b2b58b2508474621e662ed26ba7ecb173cda57540486e47029a766b232cccf8849254ae7e86381a66e363aaae2362dc55bcf03c63
-EBUILD persistent-sqlite-2.10.6.2.ebuild 1798 BLAKE2B 5c74bb24992fe69fb9024892495c7d4f4b51d361d95e02b662a5e5337acb74e56ad42d72d85aabd644b283819f09615bcecb3ca76f57e4d5160c33d66fcb2483 SHA512 9fb0bdf40d858c514f0fee7040a7ed09e2382a44a294e437672312624abcd706350fc76c6e3c4e7e7a973873a7e1b0d77b0161122b19fce9dad8b9c08d3ff221
-EBUILD persistent-sqlite-2.6.ebuild 1259 BLAKE2B 1e607715e92a1710d92ea5b2831568959f46fe1418b7db5421692dadbe0b268e6bc858d9c5f4f1056ff2167eb7f957f8e42d9e67f2058f531f862765aabc6075 SHA512 3a4d79baa945f87d95e49389c471b3fc1310e18cc92e9cc9210f596d41bcd64edc5ac4d875a7d8eb0d7d01cd95c1b093c9806d70d45c1a3b905ca83dcc99c08c
+EBUILD persistent-sqlite-2.10.6.2.ebuild 1799 BLAKE2B ba520b1d5bef896e45ce4380d469433e320c972b0e51549cd95a1d3907d3a2a2bfb1c0de138e9dec6e5b7b11ddb3ef9a14fdff0cd8af740fabb44cae4a1d7f4c SHA512 7ed477b7b4339d445bc4fa444edc93b79183a933710f7231811ecb13d76b098bd6c9d785f6ab7da27a8b518cf3b1d228c2088f270919ffd60665a5e2b20563d1
 MISC metadata.xml 533 BLAKE2B c34bf1644536c848850e9e5c8049a4f55588c9aca1f430fde30360a3f56d5457a55796e17d430d9622ea6d9beb804fff4fdd12e3120b7b2db322f8c2e319d0fb SHA512 d8224799947db36e76c7e77dd7303f77961f1c0ddeed6b795f3b5c047db6af57148c6a31f3838a9c35900d6859a333bf85965caa68263e23d0533c17ce2ad3d7
diff --git a/dev-haskell/persistent-sqlite/files/persistent-sqlite-2.1.4.2-exe.patch b/dev-haskell/persistent-sqlite/files/persistent-sqlite-2.1.4.2-exe.patch
deleted file mode 100644
index 2bd856f5f786..000000000000
--- a/dev-haskell/persistent-sqlite/files/persistent-sqlite-2.1.4.2-exe.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/persistent-sqlite.cabal b/persistent-sqlite.cabal
-index 39971e7..c0edfe3 100644
---- a/persistent-sqlite.cabal
-+++ b/persistent-sqlite.cabal
-@@ -76,2 +76,2 @@ executable sanity
-     hs-source-dirs: test
--    build-depends: base, persistent-sqlite
-+    build-depends: base, persistent-sqlite, monad-logger
-diff --git a/test/sanity.hs b/test/sanity.hs
-index aed09a3..ce61fed 100644
---- a/test/sanity.hs
-+++ b/test/sanity.hs
-@@ -3,2 +3,3 @@
- import Database.Persist.Sqlite
-+import Control.Monad.Logger
- 
-@@ -7,2 +8,2 @@ $(return []) -- just force TH to run
- main :: IO ()
--main = withSqliteConn ":memory:" $ const $ return ()
-+main = runStderrLoggingT $ withSqliteConn ":memory:" $ const $ return ()
diff --git a/dev-haskell/persistent-sqlite/persistent-sqlite-2.1.4.2.ebuild b/dev-haskell/persistent-sqlite/persistent-sqlite-2.1.4.2.ebuild
deleted file mode 100644
index 56c7aa40a997..000000000000
--- a/dev-haskell/persistent-sqlite/persistent-sqlite-2.1.4.2.ebuild
+++ /dev/null
@@ -1,48 +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
-#hackport: flags: +systemlib
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Backend for the persistent library using sqlite3"
-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="build-sanity-exe"
-
-RDEPEND=">=dev-db/sqlite-3.0
-	>=dev-haskell/aeson-0.6.2:=[profile?]
-	>=dev-haskell/conduit-0.5.3:=[profile?]
-	>=dev-haskell/monad-control-0.2:=[profile?]
-	>=dev-haskell/monad-logger-0.2.4:=[profile?]
-	dev-haskell/old-locale:=[profile?]
-	>=dev-haskell/persistent-2.1:=[profile?] <dev-haskell/persistent-3:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2.1:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-	virtual/libc
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( dev-haskell/hspec
-		dev-haskell/persistent-template )
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-exe.patch
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag build-sanity-exe build-sanity-exe) \
-		--flag=systemlib
-}
diff --git a/dev-haskell/persistent-sqlite/persistent-sqlite-2.10.6.2.ebuild b/dev-haskell/persistent-sqlite/persistent-sqlite-2.10.6.2.ebuild
index e3b69f748f49..d00865d77b15 100644
--- a/dev-haskell/persistent-sqlite/persistent-sqlite-2.10.6.2.ebuild
+++ b/dev-haskell/persistent-sqlite/persistent-sqlite-2.10.6.2.ebuild
@@ -10,7 +10,7 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="Backend for the persistent library using sqlite3"
-HOMEPAGE="http://www.yesodweb.com/book/persistent"
+HOMEPAGE="https://www.yesodweb.com/book/persistent"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-haskell/persistent-sqlite/persistent-sqlite-2.6.ebuild b/dev-haskell/persistent-sqlite/persistent-sqlite-2.6.ebuild
deleted file mode 100644
index da127f5e3af4..000000000000
--- a/dev-haskell/persistent-sqlite/persistent-sqlite-2.6.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
-#hackport: flags: +systemlib
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Backend for the persistent library using sqlite3"
-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="build-sanity-exe"
-
-RDEPEND=">=dev-db/sqlite-3.0
-	>=dev-haskell/aeson-0.6.2:=[profile?]
-	>=dev-haskell/conduit-0.5.3:=[profile?]
-	>=dev-haskell/monad-control-0.2:=[profile?]
-	>=dev-haskell/monad-logger-0.2.4:=[profile?]
-	dev-haskell/old-locale:=[profile?]
-	>=dev-haskell/persistent-2.6:=[profile?] <dev-haskell/persistent-3:=[profile?]
-	dev-haskell/resource-pool:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	virtual/libc
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hspec
-		dev-haskell/persistent-template
-		dev-haskell/temporary )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag build-sanity-exe build-sanity-exe) \
-		--flag=systemlib
-}