[gentoo-commits] repo/gentoo:master commit in: dev-haskell/cgi/, dev-haskell/cgi/files/

[gentoo-commits] repo/gentoo:master commit in: dev-haskell/cgi/, dev-haskell/cgi/files/

[Sergei Trofimovich]

commit:     7c5ab497e7dcdb7f4baff6df32b5f8d98cef3def
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 12 09:17:35 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Sep 12 09:30:04 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c5ab497

dev-haskell/cgi: drop old

Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 dev-haskell/cgi/Manifest                       |  3 --
 dev-haskell/cgi/cgi-3001.1.8.3.ebuild          | 28 ---------------
 dev-haskell/cgi/cgi-3001.1.8.4-r1.ebuild       | 36 --------------------
 dev-haskell/cgi/cgi-3001.1.8.4.ebuild          | 34 -------------------
 dev-haskell/cgi/cgi-3001.2.2.2.ebuild          | 47 --------------------------
 dev-haskell/cgi/files/cgi-3001.1.8.4-mci.patch | 15 --------
 dev-haskell/cgi/metadata.xml                   |  4 ---
 7 files changed, 167 deletions(-)

diff --git a/dev-haskell/cgi/Manifest b/dev-haskell/cgi/Manifest
index fae4cc465a5..266d06ebc5d 100644
--- a/dev-haskell/cgi/Manifest
+++ b/dev-haskell/cgi/Manifest
@@ -1,4 +1 @@
-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

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 4129133a7da..00000000000
--- 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 39cfda02113..00000000000
--- 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 c240467466b..00000000000
--- 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 97ad15b31d9..00000000000
--- 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 b672947ab1f..00000000000
--- 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 4bd303b28a7..22c9e7ab3d6 100644
--- a/dev-haskell/cgi/metadata.xml
+++ b/dev-haskell/cgi/metadata.xml
@@ -8,10 +8,6 @@
 	<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>