gentoo resync : 14.07.2018

7 files changed, 187 insertions, 0 deletions

diff --git a/dev-haskell/cgi/Manifest b/dev-haskell/cgi/Manifest
new file mode 100644
index 000000000000..f35824f2aeea
--- /dev/null
+++ b/dev-haskell/cgi/Manifest
@@ -0,0 +1,9 @@
+AUX cgi-3001.1.8.4-mci.patch 713 BLAKE2B d8e83e9b012048577c27eb5133d94507717ec79711d4078391c18ac982d6db245e1552f33e9ecad2f851150edf8ab4918676770899342896a340a62b39211c7d SHA512 4aed38d7b8c8cd90018c00220799d947287ce81fdd41a550a4cfada40df151f9248f9b76a02795f2724af5e440f865f662aea5de4168d742ae63a32784ab6d82
+DIST cgi-3001.1.8.3.tar.gz 21319 BLAKE2B 68bb0a52f7664830d486f5ca09713944473088372292148d52790973c401a8aae8f56915f683d3d3a483763c11981569dcfb7d41cd05532bb985ce6227490295 SHA512 421ed1a7c7548f1785a693074807fab91cdf4c86b9085a0520b0ffc6127cf53b095dfc07e6f9ed65d475445a28e485ec219d742de369e6271c0c6fe5e7599957
+DIST cgi-3001.1.8.4.tar.gz 21421 BLAKE2B fe94e59621df341d943124d66615304607803a52d4efa032c0474f187f444a919c6da636ef6861dbc65fe3de2c16d4e4e8ee449e762f7fb753cbfb11dbe2f8a7 SHA512 0ccbad2b1393cf4149c84eaf9d5601ce976998554cf9240a61a72348eee917869c7b1e00286b22dcac3280c79c551e2947c1040ddeac3c1ec91483dbe2c18ed0
+DIST cgi-3001.2.2.2.tar.gz 17270 BLAKE2B d9ba0d6bae5e93600b8d7c6f8650f726baa27f3859138a180cbbf6a708fc9c65b3fa7804d97e7b3dc33fde7e2bc84a29237e62ba85230a38d9d0b1c12ed63f70 SHA512 cc59574d6f8711977e2f733c9a58378b6775b20de1ca07fb343f6b989a787e54bbeddb76ab8f6248cf80aebf007d8c31fbfaa03bbbde503d4402a7769957126d
+EBUILD cgi-3001.1.8.3.ebuild 802 BLAKE2B d239500f3bbd8ab5840b9e8955101970f1adbaec2858ded74bab26892c9323ea4066025239b95cdcb43bf58d3973ff64ae3ff8c207a2e34c4f49aa209ccaee8a SHA512 eb22a306ef1a784592ba9e46ba855ba8730609bb199816f84cc83f7dec38861128d1747c1a8a9855ae1097fac649e0e33934fe8c6c4eaa2ef2eaa9a73e340e36
+EBUILD cgi-3001.1.8.4-r1.ebuild 1050 BLAKE2B 6499c94d95383a04e2880bbaa6a355b8f83fe363b6ea4a1f3642e42d5c2605d20bda46b27dda2312e2be0e5fa2817cc33e3bc74c8cd991244ea39d163d33a551 SHA512 d07d4a54d0f934e854cd3b6724973d6ecf2db48dda9440a8a4e620c91de04194994981c66c9916d341f4df0697c3dd4da78fb5ff247baa1f5c1a8e639d25e7e7
+EBUILD cgi-3001.1.8.4.ebuild 1003 BLAKE2B 33d2d6d0c3c24339fd0279acdaeeb41149a61920ea52fd09b3f921a343a26ee0a20de43f17f28e7ea1ede2f595057c6e7c2f6a38ddfaa5024887a5be7a7b0be9 SHA512 c7eb93c4c0ec3f88fa5541f89bc2281172e15beacb5e8df66ac03293b5e7373dafe6eb7e6d08db43cc1891d8833acb2a9e5e32a3975245154e17605ba7ff1854
+EBUILD cgi-3001.2.2.2.ebuild 1485 BLAKE2B fed1711628b64ec9a84d6d45d9f081b17e7dcef10e5bbd418a010503b51623ac5307230530d8071e0e15e30a8e7b545b5f666351ed3a6ce9df0ee1f89da146be SHA512 dcb5ed9865234e95548a09ebd0d0bff2fbdcda062600a5337cfa23e7241df24b9538ab2d5e278b57bc292bffd4af37756ba6b02587d7bd0f1668e32aa2a502a7
+MISC metadata.xml 623 BLAKE2B 952d247f294bb195b63cf2b413a916fa5b7ee2c30591c44181de33fc61cb1a3f8408a9444b669bf1e0c3ce4562303214d76249ef6834004eabe9d0a220cdd87b SHA512 5b99b7382f56cbdab3e82ca501851e647744ea0b7195463b4a18fc6b42a620452f3bf1117c5758598a194abb3d06401b9e20687da4785ac958bfdbb9719b3b94
diff --git a/dev-haskell/cgi/cgi-3001.1.8.3.ebuild b/dev-haskell/cgi/cgi-3001.1.8.3.ebuild
new file mode 100644
index 000000000000..3b6a6a4a6110
--- /dev/null
+++ b/dev-haskell/cgi/cgi-3001.1.8.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A library for writing CGI programs"
+HOMEPAGE="http://andersk.mit.edu/haskell/cgi/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="alpha amd64 ppc sparc x86"
+IUSE=""
+
+RDEPEND="dev-haskell/extensible-exceptions:=[profile?]
+		dev-haskell/monadcatchio-mtl:=[profile?]
+		>=dev-haskell/mtl-1.0:=[profile?]
+		>=dev-haskell/network-2.0:=[profile?]
+		>=dev-haskell/parsec-2.0:=[profile?]
+		>=dev-haskell/xhtml-3000.0.0:=[profile?]
+		>=dev-lang/ghc-6.10.4:="
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.2"
diff --git a/dev-haskell/cgi/cgi-3001.1.8.4-r1.ebuild b/dev-haskell/cgi/cgi-3001.1.8.4-r1.ebuild
new file mode 100644
index 000000000000..1ed79f923185
--- /dev/null
+++ b/dev-haskell/cgi/cgi-3001.1.8.4-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.2.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit base haskell-cabal
+
+DESCRIPTION="A library for writing CGI programs"
+HOMEPAGE="http://andersk.mit.edu/haskell/cgi/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="+extensible-exceptions-in-base"
+
+RDEPEND="dev-haskell/monadcatchio-mtl:=[profile?]
+		>=dev-haskell/mtl-1.0:=[profile?]
+		>=dev-haskell/network-2.0:=[profile?]
+		>=dev-haskell/parsec-2.0:=[profile?]
+		>=dev-haskell/xhtml-3000.0.0:=[profile?]
+		>=dev-lang/ghc-6.10.4:=
+		!extensible-exceptions-in-base? ( dev-haskell/extensible-exceptions:=[profile?]
+		)"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.2"
+
+PATCHES=("${FILESDIR}"/${P}-mci.patch)
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag extensible-exceptions-in-base extensible-exceptions-in-base)
+}
diff --git a/dev-haskell/cgi/cgi-3001.1.8.4.ebuild b/dev-haskell/cgi/cgi-3001.1.8.4.ebuild
new file mode 100644
index 000000000000..ec762a995711
--- /dev/null
+++ b/dev-haskell/cgi/cgi-3001.1.8.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.2.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A library for writing CGI programs"
+HOMEPAGE="http://andersk.mit.edu/haskell/cgi/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
+IUSE="+extensible-exceptions-in-base"
+
+RDEPEND="dev-haskell/monadcatchio-mtl:=[profile?]
+		>=dev-haskell/mtl-1.0:=[profile?]
+		>=dev-haskell/network-2.0:=[profile?]
+		>=dev-haskell/parsec-2.0:=[profile?]
+		>=dev-haskell/xhtml-3000.0.0:=[profile?]
+		>=dev-lang/ghc-6.10.4:=
+		!extensible-exceptions-in-base? ( dev-haskell/extensible-exceptions:=[profile?]
+		)"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.2"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag extensible-exceptions-in-base extensible-exceptions-in-base)
+}
diff --git a/dev-haskell/cgi/cgi-3001.2.2.2.ebuild b/dev-haskell/cgi/cgi-3001.2.2.2.ebuild
new file mode 100644
index 000000000000..8281b8497809
--- /dev/null
+++ b/dev-haskell/cgi/cgi-3001.2.2.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.5.9999
+#hackport: flags: -old-mtl
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A library for writing CGI programs"
+HOMEPAGE="https://github.com/cheecheeo/haskell-cgi"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="alpha amd64 ppc sparc x86"
+IUSE="+network-uri"
+
+RDEPEND="<dev-haskell/exceptions-0.9:=[profile?]
+	>=dev-haskell/mtl-2.1.3.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	dev-haskell/mtl-compat:=
+	>=dev-haskell/multipart-0.1.2:=[profile?] <dev-haskell/multipart-0.2:=[profile?]
+	<dev-haskell/old-locale-1.1:=[profile?]
+	<dev-haskell/old-time-1.2:=[profile?]
+	>=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/xhtml-3000.0.0:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.7:=[profile?]
+			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
+	!network-uri? ( <dev-haskell/network-2.6:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
+
+src_configure() {
+	local mtl_arg=()
+
+	has_version '<dev-haskell/mtl-2.2' && \
+		mtl_arg+=(--flag=old-mtl)
+
+	haskell-cabal_src_configure \
+		$(cabal_flag network-uri network-uri) \
+		${mtl_arg}
+}
diff --git a/dev-haskell/cgi/files/cgi-3001.1.8.4-mci.patch b/dev-haskell/cgi/files/cgi-3001.1.8.4-mci.patch
new file mode 100644
index 000000000000..b672947ab1f9
--- /dev/null
+++ b/dev-haskell/cgi/files/cgi-3001.1.8.4-mci.patch
@@ -0,0 +1,15 @@
+Gentoo-bug: https://bugs.gentoo.org/show_bug.cgi?id=497496
+Gentoo-Haskell-bug: https://github.com/gentoo-haskell/gentoo-haskell/issues/297
+diff --git a/Network/CGI/Monad.hs b/Network/CGI/Monad.hs
+index 758ab03..9c41fc3 100644
+--- a/Network/CGI/Monad.hs
++++ b/Network/CGI/Monad.hs
+@@ -119,7 +119,7 @@ catchCGI = catch
+ 
+ -- | Catches any exception thrown by an CGI action, and returns either
+ --   the exception, or if no exception was raised, the result of the action.
+-tryCGI :: (MonadCGI m, MonadCatchIO m) => m a -> m (Either SomeException a)
++tryCGI :: (MonadCGI m, MonadCatchIO m, Functor m) => m a -> m (Either SomeException a)
+ tryCGI = try
+ 
+ {-# DEPRECATED handleExceptionCGI "Use catchCGI instead." #-}
diff --git a/dev-haskell/cgi/metadata.xml b/dev-haskell/cgi/metadata.xml
new file mode 100644
index 000000000000..4bd303b28a73
--- /dev/null
+++ b/dev-haskell/cgi/metadata.xml
@@ -0,0 +1,18 @@
+<?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>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		This is a Haskell library for writing CGI programs.
+	</longdescription>
+	<use>
+		<flag name="extensible-exceptions-in-base">Required to be enabled for &gt;=dev-lang/ghc-7.</flag>
+		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">cheecheeo/haskell-cgi</remote-id>
+	</upstream>
+</pkgmetadata>