gentoo resync : 16.09.2020

7 files changed, 1 insertions, 176 deletions

diff --git a/dev-haskell/cgi/Manifest b/dev-haskell/cgi/Manifest
index 0277d81cf16e..ca9fc27d6377 100644
--- a/dev-haskell/cgi/Manifest
+++ b/dev-haskell/cgi/Manifest
@@ -1,11 +1,3 @@
-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
 DIST cgi-3001.5.0.0.tar.gz 19626 BLAKE2B a84ab0e78a7d7a4902f804501e0982bb22491aa04d28db8b10b61c9f298cd2d1383b07dd7d4e3fc35c0d3d42539fc210d0e0d9334254b5dde2cae6c6b9e07c7d SHA512 460f6d1494ac731c785b1cdffec541733639749bb1ad83605acaa52332b6c9e15a25982cdbf2bba5fcd69fa0317da832e6bf60c38642e394873eb5fa87b58881
-EBUILD cgi-3001.1.8.3.ebuild 780 BLAKE2B 3be74418f48e182561513c7954869001251b399eab1358b462cc86fe6458765a457058321f412532e6c0bace11d5151e8e55d3af619613f32880c0ba02640cff SHA512 48a239580bcebd4bcf9ccb0fe7caa56206d27a411351ef43d2126bfe17043fcd87716d9629c2250867591879a7fadb79dbe138cb88b21f0526418f1b2721f7a9
-EBUILD cgi-3001.1.8.4-r1.ebuild 1023 BLAKE2B 2fbd17c0d2cfdcf19119895ad610c68cd600ebf2405ef5e97d1457a05887e58412d2e7a1ccc4284b25ecabc0d03ff9e4b6902b279ae87bd09332f33bffc79870 SHA512 aea741a6bf177b41fa0c64788bc862b2422939e0c16f5e8f7fbb12f737e4ee0766f7d19d5fe65d71a69a9b85cb4fd71a4c0b3a88cc3eab0910809527145d5257
-EBUILD cgi-3001.1.8.4.ebuild 978 BLAKE2B 961261dacfa5d8619a2d55591a3a3bd3fce4028752c0b828dd622b8d3aebbaa614215c63890944c6e5ccb938fb0f16449eacdf83eed9060051a688cb7f0367bf SHA512 b4903f1d3d12a3950a30b30b71010aa066982403e5f7065185ee001fa42dc1f40575edef7cbeee66aa9107f537b6f203cf177c3b91e4fde7f7c45dac3f7589b6
-EBUILD cgi-3001.2.2.2.ebuild 1463 BLAKE2B 02624b19d9a84ea6ea9c212182e759752ed2ee420f943f130ac92a0f30a0daa39225d85c83b30385980092b6164b282be41a8fec0dc5c44cc0a38a9535a95bef SHA512 63a1902f1aeef802e7f50b2829bce05d7d0e1476afafcc657137704745765530bdba705ee8813cb6dbda5a4af0c1aa64101591d42071eb3e796c387e014809ab
 EBUILD cgi-3001.5.0.0.ebuild 1167 BLAKE2B 3afa0c67c056455a6a79c2bc00bc515fe18cd36250775cccdbccac738267096da8f59549233aadb6c94671cb4816b94afd86d6a6489d5ecfeb87809b21636a1e SHA512 6478ca5b2371e20e28c72f6a1d6b54897cd12209d34d01a13ce1497c02a4315a511ee8d54b223016f9161d6278b823f58ba8dfaf40bf3a1282c0e7d9cf341dd2
-MISC metadata.xml 623 BLAKE2B 952d247f294bb195b63cf2b413a916fa5b7ee2c30591c44181de33fc61cb1a3f8408a9444b669bf1e0c3ce4562303214d76249ef6834004eabe9d0a220cdd87b SHA512 5b99b7382f56cbdab3e82ca501851e647744ea0b7195463b4a18fc6b42a620452f3bf1117c5758598a194abb3d06401b9e20687da4785ac958bfdbb9719b3b94
+MISC metadata.xml 335 BLAKE2B f403b159f6e1bad9cecdcfe65f6a40c031c089ef41162c85aba0910676287d5dde84279d4efe97a44efcacda8961d0a3d6916a9713a4e47ec2c4e6a29751f9db SHA512 709f2b2ff3c393cb3a85617edda64ac8eaaa620a0810120943f857ed611fd5a7890c403d660487ceb9d62d5e15cb0c9e93f39e2c94da2232c81318f918741248
diff --git a/dev-haskell/cgi/cgi-3001.1.8.3.ebuild b/dev-haskell/cgi/cgi-3001.1.8.3.ebuild
deleted file mode 100644
index 4129133a7dad..000000000000
--- a/dev-haskell/cgi/cgi-3001.1.8.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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
deleted file mode 100644
index 39cfda021131..000000000000
--- a/dev-haskell/cgi/cgi-3001.1.8.4-r1.ebuild
+++ /dev/null
@@ -1,36 +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.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="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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
deleted file mode 100644
index c240467466b6..000000000000
--- a/dev-haskell/cgi/cgi-3001.1.8.4.ebuild
+++ /dev/null
@@ -1,34 +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.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="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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
deleted file mode 100644
index 97ad15b31d97..000000000000
--- a/dev-haskell/cgi/cgi-3001.2.2.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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
deleted file mode 100644
index b672947ab1f9..000000000000
--- a/dev-haskell/cgi/files/cgi-3001.1.8.4-mci.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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
index 4bd303b28a73..b12a8a8c4f4f 100644
--- a/dev-haskell/cgi/metadata.xml
+++ b/dev-haskell/cgi/metadata.xml
@@ -5,13 +5,6 @@
 		<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>