gentoo resync : 25.08.2020

4 files changed, 4 insertions, 156 deletions

diff --git a/dev-haskell/hdbc/Manifest b/dev-haskell/hdbc/Manifest
index 835c6032e355..446187fb7f1a 100644
--- a/dev-haskell/hdbc/Manifest
+++ b/dev-haskell/hdbc/Manifest
@@ -1,7 +1,3 @@
-DIST HDBC-2.3.1.2.tar.gz 23314 BLAKE2B cc6eca2703be4768ea55b7264f960419378e415d165d63b64ac903a5228534cedec7b7e2d9f5c3284781b5a3f253a020deadd3e335bcfa46a77df746e8e99291 SHA512 e98ca4043c311eb8e5adb02d1a59bc0d1be84ba66c224b848649a596de214a2a38b8bedfe71fa8f17ae0843cf073e814c76e7e868aca1e20619e3d5fa573109c
-DIST HDBC-2.4.0.1.tar.gz 23415 BLAKE2B a63037329bd68e09c343497dd0d95a36675872122ff30bbf40ca108f8bd56454df354628b2317c11745ba58c60b5a9023128253e07a24622c1b34ef7356d07f2 SHA512 1a20a533ffe7700cfb48c9875e9c6b09f940c1b808fd1a371327eed9c358abfe0167d206bb5b2dbb904b49f2081f91f81091d4164aad2aa08555f6de01a55d5a
 DIST HDBC-2.4.0.3.tar.gz 23489 BLAKE2B 23de627666bc4a03c5f3ec93607641c539c1652a4fa9b798dbfd1f9c09ebcffc562bda88e45a522e38753177d69ee0585c9536ab6b6c353747373b751ead7f2a SHA512 394a74e69ff854e657f66f1fe25ff4d2de33bf4410d560454ec7a2cd3e383586acc34eb694a7d1d70005871240417ee32d4163af9e33978921bfbcfcfe23fe43
-EBUILD hdbc-2.3.1.2.ebuild 1566 BLAKE2B 8cebe14fce70c90aa1cf30ab495f6c2a1a956b4e4934fbf661a7076f94ec14edc78beec594592b98822eea08ec1231dafaaabbc55f61b4edc9ee9b50d9b1ddfb SHA512 faa5efa3f6edb001d36d6fb2a405b1936196f0ae131b03b211ffd3632c6d2b3e12dd3a94db03e1657b3e27a66416654c8a5510726c98f4a434129bd673c222d6
-EBUILD hdbc-2.4.0.1.ebuild 1419 BLAKE2B 083a67cdfd0d1327de84c876581741a3e3aa80f29fec2f395fc9019b99480a205f20c49bd1a5296401f7f8367f3110d6860c4fcf25bac762f1b7d513db61de0d SHA512 d632f8f3f27cdf2eb6114671756bd3901ba18aa65651a2cc3d0940672b6eb94dd0f9642b5ab7020f3711e0e7e765ce0a701ae34e5d2b0084745b562f8edd89ba
-EBUILD hdbc-2.4.0.3.ebuild 1444 BLAKE2B 3704afdf7b1794a674d3833c591e9e6c321073ad12a821a37dfe4d2389956f1ca40163340fa9f64583a8b66aa53877477b095a46e446441f6accba883c27e2f0 SHA512 51ed77b4db222948d6f9c4a07ebf26e09c2ee6c7d438ceafa4c9fa3a671df2a58d1cedfc2456eca5457f2821e6e865e0796a4d65bbd02beaead0fdfb75162d6e
+EBUILD hdbc-2.4.0.3.ebuild 895 BLAKE2B e8f014927af4ad7c9bd4ab75225d636eaa6604693781ddce2cb82658e240829c5bc46f5937cd1768e8d95bcd50186421c5b7eeb46010f5f36c1d137c295bed11 SHA512 e6355b517862fe997da3dc97a096df5dec918b9d0e8b888778025a983e5e9008d18a971e1b7784ec3f87529cf13a77f1cf6fc9f70eb5c2401fffe13345430531
 MISC metadata.xml 630 BLAKE2B 1c82d745911411d99810468c26d5b3c4e0da53f9edb5273d0a06819e21c638b37c1178d3aa655e0e591b8cedd4ffce2061377c2b1ef60a4e0b85af064112547f SHA512 21033721685ac01211cd92c395fcff02a337bfac20b04a2b14932b70a9531ecbc8a56c429c51c9227b5c0912499f8e86d6bf7eaf93179dd3b73dff449290ea80
diff --git a/dev-haskell/hdbc/hdbc-2.3.1.2.ebuild b/dev-haskell/hdbc/hdbc-2.3.1.2.ebuild
deleted file mode 100644
index c346de331f61..000000000000
--- a/dev-haskell/hdbc/hdbc-2.3.1.2.ebuild
+++ /dev/null
@@ -1,62 +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.3.1.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal versionator
-
-MY_PN="HDBC"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Haskell Database Connectivity"
-HOMEPAGE="https://github.com/hdbc/hdbc"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="mysql odbc postgres sqlite test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-haskell/convertible-1.0.10.0:=[profile?] <dev-haskell/convertible-1.1.0.0:=[profile?]
-		dev-haskell/mtl:=[profile?]
-		dev-haskell/text:=[profile?]
-		dev-haskell/utf8-string:=[profile?]
-		>=dev-lang/ghc-6.12.1:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( dev-haskell/hunit
-			dev-haskell/quickcheck
-			dev-haskell/testpack
-		)
-	"
-
-DEPENDV="$(get_version_component_range 1-2)"
-PDEPEND="mysql? ( dev-haskell/hdbc-mysql )
-		odbc? ( =dev-haskell/hdbc-odbc-${DEPENDV}* )
-		postgres? ( =dev-haskell/hdbc-postgresql-${DEPENDV}* )
-		sqlite? ( >=dev-haskell/hdbc-sqlite3-${DEPENDV} )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	cabal_src_configure $(cabal_flag test buildtests)
-}
-
-src_test() {
-	# default tests
-	haskell-cabal_src_test || die "cabal test failed"
-
-	# built custom tests
-	"${S}/dist/build/runtests/runtests" || die "unit tests failed"
-}
-
-src_install() {
-	cabal_src_install
-
-	# if tests were enabled, make sure the unit test driver is deleted
-	rm -f "${ED}/usr/bin/runtests"
-}
diff --git a/dev-haskell/hdbc/hdbc-2.4.0.1.ebuild b/dev-haskell/hdbc/hdbc-2.4.0.1.ebuild
deleted file mode 100644
index b23df73dfefe..000000000000
--- a/dev-haskell/hdbc/hdbc-2.4.0.1.ebuild
+++ /dev/null
@@ -1,63 +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.4.9999
-#hackport: flags: buildtests:test
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="HDBC"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Haskell Database Connectivity"
-HOMEPAGE="https://github.com/hdbc/hdbc"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="test" # Tests do not compile with time 1.5
-
-RDEPEND=">=dev-haskell/convertible-1.1.0.0:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit:=[profile?]
-		>=dev-haskell/quickcheck-2.0:2=[profile?]
-		>=dev-haskell/testpack-2.0:=[profile?] )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	cabal_chdeps \
-		'time >= 1.5 && < 1.6' 'time >= 1.5'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag test buildtests)
-}
-
-src_test() {
-	# default tests
-	haskell-cabal_src_test || die "cabal test failed"
-
-	# built custom tests
-	"${S}/dist/build/runtests/runtests" || die "unit tests failed"
-}
-
-src_install() {
-	cabal_src_install
-
-	# if tests were enabled, make sure the unit test driver is deleted
-	rm -f "${ED}/usr/bin/runtests"
-}
diff --git a/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild b/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild
index fb05e030b9da..90831462697a 100644
--- a/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild
+++ b/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,9 +19,9 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="2/${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
+IUSE=""
 
-RESTRICT="test" # Requires dev-haskell/testpack (deprecated), and this is a problem.
+RESTRICT="test" # Requires unmaintaned dev-haskell/testpack
 
 RDEPEND=">=dev-haskell/convertible-1.1.0.0:=[profile?]
 	dev-haskell/mtl:=[profile?]
@@ -30,32 +30,9 @@ RDEPEND=">=dev-haskell/convertible-1.1.0.0:=[profile?]
 	dev-haskell/text:=[profile?]
 	dev-haskell/utf8-string:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
-	test? ( dev-haskell/hunit:=[profile?]
-		>=dev-haskell/quickcheck-2.0:2=[profile?]
-		>=dev-haskell/testpack-2.0:=[profile?] )
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.8
 "
 
 S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag test buildtests)
-}
-
-src_test() {
-	# default tests
-	haskell-cabal_src_test || die "cabal test failed"
-
-	# built custom tests
-	"${S}/dist/build/runtests/runtests" || die "unit tests failed"
-}
-
-src_install() {
-	cabal_src_install
-
-	# if tests were enabled, make sure the unit test driver is deleted
-	rm -f "${ED}/usr/bin/runtests"
-}