gentoo resync : 15.12.2019

3 files changed, 39 insertions, 31 deletions

diff --git a/dev-haskell/hscolour/Manifest b/dev-haskell/hscolour/Manifest
index 65279f2a2212..1a9dfb6bb664 100644
--- a/dev-haskell/hscolour/Manifest
+++ b/dev-haskell/hscolour/Manifest
@@ -1,12 +1,12 @@
 AUX hscolour-1.19-ghc-7.5.patch 1701 BLAKE2B 70c2628e3adaab9c7ec06dbf054c55d9e4f7709c09ddfe39fa578194c870e17afd2c9d78743cf929b1edd94f0948458ae8b64e6dfa68f4b774b3c3b3e1ea42e5 SHA512 302fe056e61d58537c2010c2d286ff6abf1b4eea25beb9b2069492000b1edc257830892369bd16576675d00fb376c04f83f17508b9491140ee92d062b9736c29
-DIST hscolour-1.19.tar.gz 25466 BLAKE2B 852fa5e8d08cabc16c930f32951043f92c8f564773da07de0eeda931caef0197b09d307fffcb9c0c1e86ef139238d46261d355f3b54889bf61d49692b6d8a2e4 SHA512 8f2a9f16cf82fbe41513600c210a0d3af58f1b06ab1ed14a2493203cfce20a8ac959b3a34966273277ac3ceaf3b4916e82892880dd7685f8de12b2636bf53ae1
 DIST hscolour-1.20.3.tar.gz 25810 BLAKE2B 28a394ab9f90ac4a7d311e1aa7e4f41c55b26e51e02a72ed3d869d1d9dae566c7a70f3e15c136cbb538f56c303c0a5083d4f725ce2fc6f9cadf27d21b1b563a6 SHA512 759f0a3c3c36b48db7932477468f1c5de8fddec654010dbbd0d136e0f8a8f4e3c34bc9349467766a1cb90ffb56b950ee6b7926f4f62dcb68f8e048e2c212d853
 DIST hscolour-1.22.tar.gz 25979 BLAKE2B 42d974c9ffe439010df53d88c0b71397869eef64765eb60554e5bce060492a780d4bea8eeb805f271ac2b62ad4060bf5dee96f69ebe90caa9f62a572d8266207 SHA512 9762599fb4eef8f68a0a40ddfc8e7f50eb8592b1b3d7e4c8177f23f08300264c80a73dbedbe954fbcb9ff3fe1b80497b131e3f8d9adb8c1697d7195d48ef69a0
 DIST hscolour-1.23.tar.gz 26027 BLAKE2B 4dba77d61aff026f515d47c0cf84bd747b28f5d00739986f8a877171860835610812b8e1827879f8bad118bb7234ccfddccc8651c819696841a35ee3229f1b48 SHA512 a1525e0827bc399c0747898c814ad4b7947620c610e6ec579afa120ddb5f1d012f7f10547f09dd10e0bba9cd89cd220ab204ee0e40c37f0048c7222db04de23f
+DIST hscolour-1.24.4.tar.gz 28729 BLAKE2B fdda7f784e35ff165981de53df5535b3294f5dbd5d1f484bcd34a20bfde014ddc9a916f20fae639420eca8cd4577f683d0e799459e846aabcc7cb4290b7035d2 SHA512 39b631c0a8346beff1c2e02ca8e72c1b1e3f7dafcedad7dc9de274e6750501de2bc553fe72a7d3459d4f9797e916f27e28ff96f705c2c0f9d3e0eec0ac6182c7
 DIST hscolour-1.24.tar.gz 26057 BLAKE2B b11a4b8506ee49e845519cc44ee19b5fbc196fd07132cb6999f361870a58991c0f22e288696cbfdcfbaee95dba9e2580e8f878fda3122a5bfe0f1b46c7818fa9 SHA512 c191375ccbda80d6f7271cff69648151fe6142e72d9a47cfba71176ab89cb9740a008020e1a48a106d5f10516eec03ed68ca7610736f6ab6fba84f85fedb0fb7
-EBUILD hscolour-1.19.ebuild 628 BLAKE2B f85085dd02bef6f42d87dec888a1533654c997a6d3aa902e276910cbd88c79023ea245f38f36482e44123236c95957fec3dd45504d3d4c61b4976a4cd91b596e SHA512 f1015802461cd67cd86a0b0a80f52e695b63bf2a58493ce8e5c5b4b3e840e03779e9e0bc2f8fbab99e49f608834973b5e3a9693943cc948781ea14707aa965ea
 EBUILD hscolour-1.20.3-r1.ebuild 768 BLAKE2B 42f495edffb5d4fbb285169d1297c8af804c3f8ed9ef7de1033248d28784168063d7518f2c2f0c9adc1180a1cd2782572858a458ffec0758caaae34a432df09f SHA512 539c97b92b7a5b0756036a4ffafda39a8d5b4d0b9215d51ee2ec5c1bb155950ef586c8bd05b61093dad3fa40c0815df631de6ae612fa71c3070cd829798ea6e6
 EBUILD hscolour-1.22.ebuild 775 BLAKE2B 85f2b6e625ebfea93320ee717cddbf04efbb72b9d3e67cb5ffa96f7928ca2a2dfdb7ac584481737cae89e003cd26343893e814c1728e7e43fffc7e83bb2b913d SHA512 0b101bd46466e1127697d3342408cdfb3c40362384916a012d8c5656c63bd1175c490c6a9b3ffddd6a4ee1e4061944c2a544840638492788cc2f1935992d3d6a
 EBUILD hscolour-1.23-r1.ebuild 746 BLAKE2B 5af32337ee3e2547718734582180e4e26e9778d1091a97b625546ea1608807f9fb4b33cc7934386aadeff662e52889bc216dfc96dbe48df641081434aacbaec1 SHA512 a3ea97576c6e1eb0e2cc9ff80d5411c2e0eabe9b592b2fa042dc071dd47364a6da510fa4a32e3ad0da4f8a17534c5a2dc4e5810049d69ccd6c9418027ede5f97
+EBUILD hscolour-1.24.4.ebuild 841 BLAKE2B 1039701d7defb3c24c4087e3e9fb8434f2ac6d788e08f28d52ff485ee550b0574312d78bb3f4b8daa830229f43c19fcaae20dac3bca1dfc1bf4139df0c1e9ec9 SHA512 02123fb7bb72bda2d67f895b3643516f268fa85df0977cd2d5fa1679aaa4d307d206d18dc79ecd40aa6dc223ce95fb44760d5fdbc73dff8f015b9cf379fa2df1
 EBUILD hscolour-1.24.ebuild 748 BLAKE2B 1036bdde26baa51b73151816406f9f9542e49a0fb7a296ca7490949ea576ad79439e81339d90d32d8f9dad990fd6b81a980c1204a0cd383bf87c02d676bf3fea SHA512 e36caf800412ff42e2806fb50ffc93954f851c66b5e48c5597c4c2da0de47969fd3b94e8c5f6c27d2d78e340b6121df9d4d4c01d6c92d64cebe42d6d48f2b766
 MISC metadata.xml 217 BLAKE2B 41b11b7399431ee96c40a11373f20b12940ed7bb1fc77b1619212b2a57a3b34b11b77838d4ac51c1ddb80caab1030224e28567836e5d0a17b4ea6bd1afa2523c SHA512 63f267082f4ba17f6a1226d1c5a14d85d17e0f7a84857605933418d875d09cfffe2a0ca304b8a171dcae59169330fcc3cfca9d6f4c9ce24d135f1125a6d06c70
diff --git a/dev-haskell/hscolour/hscolour-1.19.ebuild b/dev-haskell/hscolour/hscolour-1.19.ebuild
deleted file mode 100644
index 82c5a14bf84c..000000000000
--- a/dev-haskell/hscolour/hscolour-1.19.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-CABAL_FEATURES="bin lib profile haddock"
-inherit base haskell-cabal
-
-DESCRIPTION="Colourise Haskell code"
-HOMEPAGE="http://code.haskell.org/~malcolm/hscolour/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.6.1"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-PATCHES=("${FILESDIR}/${PN}-1.19-ghc-7.5.patch")
-
-src_install() {
-	cabal_src_install
-	if use doc; then
-		dohtml hscolour.css
-	fi
-}
diff --git a/dev-haskell/hscolour/hscolour-1.24.4.ebuild b/dev-haskell/hscolour/hscolour-1.24.4.ebuild
new file mode 100644
index 000000000000..b5a0e294aa72
--- /dev/null
+++ b/dev-haskell/hscolour/hscolour-1.24.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle"
+# avoid Cabal dependency as it's a dependency of most packages
+# including cabal depends.
+CABAL_FEATURES+=" nocabaldep"
+inherit haskell-cabal
+
+DESCRIPTION="Colourise Haskell code"
+HOMEPAGE="http://code.haskell.org/~malcolm/hscolour/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	# llvm-general-pure passes rtsopts
+	haskell-cabal_src_configure --ghc-options=-rtsopts
+}
+
+src_install() {
+	cabal_src_install
+	if use doc; then
+		dohtml hscolour.css
+	fi
+}