gentoo resync : 14.07.2018

8 files changed, 233 insertions, 0 deletions

diff --git a/dev-haskell/hscolour/Manifest b/dev-haskell/hscolour/Manifest
new file mode 100644
index 000000000000..f330570667d0
--- /dev/null
+++ b/dev-haskell/hscolour/Manifest
@@ -0,0 +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.tar.gz 26057 BLAKE2B b11a4b8506ee49e845519cc44ee19b5fbc196fd07132cb6999f361870a58991c0f22e288696cbfdcfbaee95dba9e2580e8f878fda3122a5bfe0f1b46c7818fa9 SHA512 c191375ccbda80d6f7271cff69648151fe6142e72d9a47cfba71176ab89cb9740a008020e1a48a106d5f10516eec03ed68ca7610736f6ab6fba84f85fedb0fb7
+EBUILD hscolour-1.19.ebuild 646 BLAKE2B 6b9eaf28e6b85446b4735f32f2a9be74e19d8a1c4f05cd93093d85ccdce4a9dae52b3da3b161bd75548b60d1163c416c5f56d198a38d084c092704a04c02b672 SHA512 577c856e3859a4e8ab416de4e70fbf7a2dbe0463fe6d44426d572d35e9ad5e04ee3391e945614433910a848d1c36d3fda55dd7733795d7057702a1bc61d1c85e
+EBUILD hscolour-1.20.3-r1.ebuild 786 BLAKE2B 5b91f73ea053e07a835f88bfa2a46992c4e74bc60bdabf70ec3a7b17f4c5ef2e2a7707249d140677cd014641c52e27da19396d86aa7da528fb11cf74fbca3686 SHA512 2796862e8bed140443d4f31a78b2d2c3579b346c828b8be3bd1acabdb2445f083b13ba48de26ca905b9e9c483558b58c5f379183076d39c22230b5d88620c617
+EBUILD hscolour-1.22.ebuild 793 BLAKE2B ef585c18a9b146931f79da001e2238f378a081d8802bbfdfc4d3394ef02d10ff209fc06d7b676d5bee595e425d7ad5a1b123cb175fc569f0f958172b96c53268 SHA512 75eb4da6727f94f70aa25d91c75cd104043cd5e05833d080304fd833944e8bcd8d792391540b588517ab97a74e606eafeea9279468c6ed2e99df30f58f1a4b1d
+EBUILD hscolour-1.23-r1.ebuild 764 BLAKE2B 0ef62b075fa3cd1f6ada4d2e282eb67cd8394b9cd9a7571cb92f17a2c28f0b4739595bf1ba0a469f011df80d3af0d05b6019f3e5596f3c71da2c2637222e16c5 SHA512 e132531d2c6241edb6f100fac5ebda3ad21d9d23ac9e2ee700aa9eed00db95bda06a018d439815ea0408a5d2e15317e4d415fe524c5760bf56fb3e94577dc11e
+EBUILD hscolour-1.24.ebuild 766 BLAKE2B 31b481cc40b08b4bb6ab7e2949753e64d4c0452c28187e05728dcd26ee890a18f02d0f5d827f9cfb0ebf1f5cf04d32c1eb23fef4d95903e0e7dc9fee4423931e SHA512 d8f0cbcb70aa1c55ed11966b23b283e63f93f4dd3b35223d9eda770415c9454d8a6a379686f75b923b4368aba5a1c8bd1cff2b4d821c45e3e4578f82476786f8
+MISC metadata.xml 217 BLAKE2B 41b11b7399431ee96c40a11373f20b12940ed7bb1fc77b1619212b2a57a3b34b11b77838d4ac51c1ddb80caab1030224e28567836e5d0a17b4ea6bd1afa2523c SHA512 63f267082f4ba17f6a1226d1c5a14d85d17e0f7a84857605933418d875d09cfffe2a0ca304b8a171dcae59169330fcc3cfca9d6f4c9ce24d135f1125a6d06c70
diff --git a/dev-haskell/hscolour/files/hscolour-1.19-ghc-7.5.patch b/dev-haskell/hscolour/files/hscolour-1.19-ghc-7.5.patch
new file mode 100644
index 000000000000..25e29728ca3a
--- /dev/null
+++ b/dev-haskell/hscolour/files/hscolour-1.19-ghc-7.5.patch
@@ -0,0 +1,45 @@
+--- hscolour-1.19-orig/Language/Haskell/HsColour/Colourise.hs	2011-06-06 03:05:04.000000000 +1000
++++ hscolour-1.19/Language/Haskell/HsColour/Colourise.hs	2012-06-24 10:29:57.990963394 +1000
+@@ -1,3 +1,7 @@
++{-# LANGUAGE CPP #-}
++#if (__GLASGOW_HASKELL__>=705)
++{-# LANGUAGE ScopedTypeVariables #-}
++#endif
+ module Language.Haskell.HsColour.Colourise
+   ( module Language.Haskell.HsColour.ColourHighlight
+   , ColourPrefs(..)
+@@ -9,6 +13,9 @@
+ import Language.Haskell.HsColour.ColourHighlight
+ import Language.Haskell.HsColour.Classify (TokenType(..))
+ 
++#if (__GLASGOW_HASKELL__>=705)
++import Control.Exception (catch, SomeException)
++#endif
+ import System.IO (hPutStrLn,stderr)
+ import System.Environment (getEnv)
+ import Data.List
+@@ -51,6 +58,16 @@
+ -- | Read colour preferences from .hscolour file in the current directory, or failing that,
+ --   from \$HOME\/.hscolour, and failing that, returns a default set of prefs.
+ readColourPrefs :: IO ColourPrefs
++#if (__GLASGOW_HASKELL__>=705)
++readColourPrefs = catch
++  (do val <- readFile ".hscolour"
++      parseColourPrefs ".hscolour" val)
++  (\(_ :: SomeException) -> catch
++    (do home <- getEnv "HOME"
++        val <- readFile (home++"/.hscolour")
++        parseColourPrefs (home++"/.hscolour") val)
++    (\(_ :: SomeException) -> return defaultColourPrefs))
++#else
+ readColourPrefs = catch
+   (do val <- readFile ".hscolour"
+       parseColourPrefs ".hscolour" val)
+@@ -59,6 +76,7 @@
+         val <- readFile (home++"/.hscolour")
+         parseColourPrefs (home++"/.hscolour") val)
+     (\_-> return defaultColourPrefs))
++#endif
+ 
+ -- | Convert token classification to colour highlights.
+ colourise :: ColourPrefs -> TokenType -> [Highlight]
diff --git a/dev-haskell/hscolour/hscolour-1.19.ebuild b/dev-haskell/hscolour/hscolour-1.19.ebuild
new file mode 100644
index 000000000000..5af8f7dc228f
--- /dev/null
+++ b/dev-haskell/hscolour/hscolour-1.19.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+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.20.3-r1.ebuild b/dev-haskell/hscolour/hscolour-1.20.3-r1.ebuild
new file mode 100644
index 000000000000..5a5381e147a3
--- /dev/null
+++ b/dev-haskell/hscolour/hscolour-1.20.3-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.9999
+
+# disabled haddock as there is USE="doc hscolour" case with circular depends
+CABAL_FEATURES="bin lib profile"
+inherit haskell-cabal
+
+DESCRIPTION="Colourise Haskell code"
+HOMEPAGE="http://code.haskell.org/~malcolm/hscolour/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="doc"
+
+RDEPEND=">=dev-lang/ghc-6.10.4:="
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.6"
+
+src_configure() {
+	haskell-cabal_src_configure --ghc-options=-rtsopts
+}
+
+src_install() {
+	cabal_src_install
+	if use doc; then
+		dohtml hscolour.css
+	fi
+}
diff --git a/dev-haskell/hscolour/hscolour-1.22.ebuild b/dev-haskell/hscolour/hscolour-1.22.ebuild
new file mode 100644
index 000000000000..5afdddee51bf
--- /dev/null
+++ b/dev-haskell/hscolour/hscolour-1.22.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.9999
+
+# disabled haddock as there is USE="doc hscolour" case with circular depends
+CABAL_FEATURES="bin lib profile"
+inherit haskell-cabal
+
+DESCRIPTION="Colourise Haskell code"
+HOMEPAGE="http://code.haskell.org/~malcolm/hscolour/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="doc"
+
+RDEPEND=">=dev-lang/ghc-6.10.4:="
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.6"
+
+src_configure() {
+	haskell-cabal_src_configure --ghc-options=-rtsopts
+}
+
+src_install() {
+	cabal_src_install
+	if use doc; then
+		dohtml hscolour.css
+	fi
+}
diff --git a/dev-haskell/hscolour/hscolour-1.23-r1.ebuild b/dev-haskell/hscolour/hscolour-1.23-r1.ebuild
new file mode 100644
index 000000000000..8964998e00c7
--- /dev/null
+++ b/dev-haskell/hscolour/hscolour-1.23-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# 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"
+inherit haskell-cabal
+
+DESCRIPTION="Colourise Haskell code"
+HOMEPAGE="http://code.haskell.org/~malcolm/hscolour/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
+
+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
+}
diff --git a/dev-haskell/hscolour/hscolour-1.24.ebuild b/dev-haskell/hscolour/hscolour-1.24.ebuild
new file mode 100644
index 000000000000..d1862033b496
--- /dev/null
+++ b/dev-haskell/hscolour/hscolour-1.24.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.7.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle"
+inherit haskell-cabal
+
+DESCRIPTION="Colourise Haskell code"
+HOMEPAGE="http://code.haskell.org/~malcolm/hscolour/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
+
+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
+}
diff --git a/dev-haskell/hscolour/metadata.xml b/dev-haskell/hscolour/metadata.xml
new file mode 100644
index 000000000000..522384de8446
--- /dev/null
+++ b/dev-haskell/hscolour/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>haskell@gentoo.org</email>
+</maintainer>
+</pkgmetadata>