gentoo resync : 02.09.2020

5 files changed, 50 insertions, 113 deletions

diff --git a/dev-haskell/htf/Manifest b/dev-haskell/htf/Manifest
index 82d2d04f7d41..8286bc988aa2 100644
--- a/dev-haskell/htf/Manifest
+++ b/dev-haskell/htf/Manifest
@@ -1,6 +1,3 @@
-AUX htf-0.13.1.0-aeson-pretty-0.8.patch 352 BLAKE2B 6397b1d33f5bc58f9e56498f4356203e3b1c26b11758e25319c2bdf9e488601f694d30cea0fbafe4ae8f4908ec9fe01a620123d7a763163ae679239cc8bc2e3e SHA512 31f927eeccab5037ec3394a2a608b434e43fa9c3bfd0a0d4bd6662add7abbb259986ed0ef1a84c31d2e84b68cdb6e3d6133e5bed34331b81cb7b3fc61fa8e8d8
-DIST HTF-0.13.1.0.tar.gz 78310 BLAKE2B eab7a9c2eb05246dbd413f31c32554b01527211bb469ceec8a54d11e427ca74ee706640fe3d49fc40486a238db4e284ce97511c371e7eb7161d65cb841f77a76 SHA512 1292f8f0b9189e1ce05de1cf6f686ce77a839c4191a5f8b8000c8d740abe4b8f457a7c5ed8aadc13221fe9fde9b4c15bde9f9f6f53ac03178cd1884572fb4069
-DIST HTF-0.13.2.5.tar.gz 79761 BLAKE2B 2caf1ea1192087fd614f097a45508d290cfb2a7f7633f262c7b3b37d1f1bf23d7a3cb0b7746a6b2f619b41e08500f6ce1d1a4700ae216a0641e4edd1c5db5b03 SHA512 2c68a74c6492343d21405965776d3ee7c2930677c626c5353953d53274213bee0cf803c1b6f14600759c89eb0a66db4d248af75263e6c5f1bb5a39f569b6af78
-EBUILD htf-0.13.1.0.ebuild 1413 BLAKE2B 98b03ac448b64fcc866fdccf8811550014f065b31da562f9cd44bf063aeab9e633bacfd5ea986be56a0dfa735fd0e00b04425fc49f861f06a2fe9f28bfb3aee1 SHA512 981c67cfe6e829a403bfd57e713e1cf56047ceb489df39fa249b63ce59a618e972f60f6c7920cbc616e92303da754126666294b8ffdf20d0861e58938c3d6407
-EBUILD htf-0.13.2.5.ebuild 1325 BLAKE2B f0e9a22998496036835fe5c5f47c735e26ded5f7754e2aa44520213130177a890828cb07dc3331899f86b1c85e8a3b1034827e6e1c3914a095180643d791ca34 SHA512 19709ce73fd92b08a25aab1af1a7fb2b0902459d31d1e30df27c2c874219a94f943e62ff70e97afa6b7ddcf5b071ca2d7159c2bb0bd0f47857dc67de3c6e8acd
+DIST HTF-0.14.0.3.tar.gz 80795 BLAKE2B 8933c2bc9480ff7d29cf86cf5d7718ebd179aad55a7836b2f19cf1b93ba6acd48eba89410fe4040bb073111686ae736360554a598456b7a25c77e52ed05c4335 SHA512 cf839a3fa67aec998b1f035a9b5ddb326f57c859c13767f3681deb2f8041ac283c3bcf36d0c37b08ef7878fc8ada5623af60c72a548adf8c272d2d38f8609784
+EBUILD htf-0.14.0.3.ebuild 1203 BLAKE2B d9916e56999049859fffdc377855d591cb6a93f9f53bb0844dedc20c194647dd0056b84432717c85963ad6468b0837e004dea975f4d88efa4f35c07e9fdf8dad SHA512 a4992975e214cfa72be33a7653ca751730e48b64aeb864711144b508d6d38247b3f1e214942c5cc75baeca39a651376a0d6382036dfb5c7a8f29501ef0b634c5
 MISC metadata.xml 923 BLAKE2B 690bbf2765309647e8029490cd2c7ba9055f00e8f4ccfd45ae8ef826deac43a13bf919b73607fc0241e9f60d6cda44bba1ae95de8031f76744d3eb5fefe7138b SHA512 1bcdd3551b19f09f600b050f84ab81de6e99133b29a8a94942ff068ef354a9bb31226395cb221c416a65466a96973a92521d3aa3b13c94b557bdedf011e28164
diff --git a/dev-haskell/htf/files/htf-0.13.1.0-aeson-pretty-0.8.patch b/dev-haskell/htf/files/htf-0.13.1.0-aeson-pretty-0.8.patch
deleted file mode 100644
index ac1472051eba..000000000000
--- a/dev-haskell/htf/files/htf-0.13.1.0-aeson-pretty-0.8.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/tests/TestHTF.hs b/tests/TestHTF.hs
-index 4a71874..c0442a5 100644
---- a/tests/TestHTF.hs
-+++ b/tests/TestHTF.hs
-@@ -383,3 +383,3 @@ checkOutput output =
-           BSL.toStrict $
--          J.encodePretty' (J.Config 2 J.compare) json
-+          J.encodePretty' (J.defConfig { J.confIndent = J.Spaces 2, J.confCompare = J.compare }) json
- 
diff --git a/dev-haskell/htf/htf-0.13.1.0.ebuild b/dev-haskell/htf/htf-0.13.1.0.ebuild
deleted file mode 100644
index 614b9ad03d9c..000000000000
--- a/dev-haskell/htf/htf-0.13.1.0.ebuild
+++ /dev/null
@@ -1,52 +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.6.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="HTF"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="The Haskell Test Framework"
-HOMEPAGE="https://github.com/skogsbaer/HTF/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.6:=[profile?]
-	dev-haskell/base64-bytestring:=[profile?]
-	>=dev-haskell/cpphs-1.19:=[profile?]
-	>=dev-haskell/diff-0.3:=[profile?]
-	dev-haskell/haskell-src:=[profile?]
-	>=dev-haskell/hunit-1.2.5:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	>=dev-haskell/monad-control-0.3:=[profile?]
-	>=dev-haskell/mtl-1.1:=[profile?]
-	>=dev-haskell/old-time-1.0:=[profile?]
-	>=dev-haskell/quickcheck-2.3:2=[profile?]
-	>=dev-haskell/random-1.0:=[profile?]
-	>=dev-haskell/regex-compat-0.92:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-haskell/xmlgen-0.6:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( dev-haskell/aeson-pretty
-		>=dev-haskell/temporary-1.1
-		>=dev-haskell/unordered-containers-0.2 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-aeson-pretty-0.8.patch
-}
diff --git a/dev-haskell/htf/htf-0.13.2.5.ebuild b/dev-haskell/htf/htf-0.13.2.5.ebuild
deleted file mode 100644
index d69d9e380af8..000000000000
--- a/dev-haskell/htf/htf-0.13.2.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite: needs htfpp already installed
-inherit haskell-cabal
-
-MY_PN="HTF"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="The Haskell Test Framework"
-HOMEPAGE="https://github.com/skogsbaer/HTF/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # needs stack, needs htfpp already installed
-
-RDEPEND=">=dev-haskell/aeson-0.11:=[profile?]
-	dev-haskell/base64-bytestring:=[profile?]
-	>=dev-haskell/cpphs-1.19:=[profile?]
-	>=dev-haskell/diff-0.3:=[profile?]
-	dev-haskell/haskell-src:=[profile?]
-	>=dev-haskell/hunit-1.2.5:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	>=dev-haskell/monad-control-0.3:=[profile?]
-	>=dev-haskell/mtl-1.1:=[profile?]
-	>=dev-haskell/old-time-1.0:=[profile?]
-	>=dev-haskell/quickcheck-2.3:2=[profile?]
-	>=dev-haskell/random-1.0:=[profile?]
-	>=dev-haskell/regex-compat-0.92:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-haskell/xmlgen-0.6:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/htf/htf-0.14.0.3.ebuild b/dev-haskell/htf/htf-0.14.0.3.ebuild
new file mode 100644
index 000000000000..25806e6a0ae1
--- /dev/null
+++ b/dev-haskell/htf/htf-0.14.0.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.6.9999
+
+CABAL_FEATURES="lib haddock hoogle hscolour" # test-suite: needs htfpp already installed, profile crashes cpp
+inherit haskell-cabal
+
+MY_PN="HTF"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="The Haskell Test Framework"
+HOMEPAGE="https://github.com/skogsbaer/HTF/"
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # needs stack, needs htfpp already installed
+
+RDEPEND=">=dev-haskell/aeson-0.11:=
+	dev-haskell/base64-bytestring:=
+	>=dev-haskell/cpphs-1.19:=
+	>=dev-haskell/diff-0.3:=
+	dev-haskell/haskell-src:=
+	>=dev-haskell/hunit-1.2.5:=
+	>=dev-haskell/lifted-base-0.1:=
+	>=dev-haskell/monad-control-0.3:=
+	>=dev-haskell/mtl-1.1:=
+	>=dev-haskell/old-time-1.0:=
+	>=dev-haskell/quickcheck-2.3:2=
+	>=dev-haskell/random-1.0:=
+	>=dev-haskell/regex-compat-0.92:=
+	>=dev-haskell/text-0.11:=
+	dev-haskell/vector:=
+	>=dev-haskell/xmlgen-0.6:=
+	>=dev-lang/ghc-7.6.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.0
+	>=dev-haskell/cpphs-1.19
+"
+
+S="${WORKDIR}/${MY_P}"