[gentoo-commits] repo/gentoo:master commit in: profiles/, dev-haskell/process-conduit/files/, dev-haskell/process-conduit/

[Sergei Trofimovich]

commit:     d15d3a401c61c23f76f1a0131b392665bc182ce6
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 26 20:56:01 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Sep 26 20:56:01 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d15d3a40

dev-haskell/process-conduit: drop masked package

Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 dev-haskell/process-conduit/Manifest               |  2 --
 .../process-conduit-1.1.0.0-conduit-1.1.patch      | 27 -----------------
 dev-haskell/process-conduit/metadata.xml           | 15 ----------
 .../process-conduit-1.1.0.0-r1.ebuild              | 34 ----------------------
 .../process-conduit/process-conduit-1.2.0.1.ebuild | 33 ---------------------
 profiles/package.mask                              |  5 ----
 6 files changed, 116 deletions(-)

diff --git a/dev-haskell/process-conduit/Manifest b/dev-haskell/process-conduit/Manifest
deleted file mode 100644
index 88194d67a90..00000000000
--- a/dev-haskell/process-conduit/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST process-conduit-1.1.0.0.tar.gz 3884 BLAKE2B 70792cc3ac8a65e591939782b8ef03e2d339cda469b40ed9858ede5a18a8ee6ab18d72b538fc3a265ebdfb9fcec05e4de020ac96826d2c8264da711e89ecfbdd SHA512 d7390a1083bc3bc5db2ce2bc0ec55f90e6c8bb8d224cc16b52a2e272baf3dceb18ee11eafd3cc306902945b04b2d746738f5a5e88bfd73e5ad0a9f5d4e5914dc
-DIST process-conduit-1.2.0.1.tar.gz 3958 BLAKE2B 5c9ca54c43b99032fea566cbd1b4693bceb8a07ed1121b7ce2e74c034adf7ec39b2874978335a59880f34eceae6dc299886b3e45c865eb16765677e955a26b04 SHA512 f58d37b04523007fcc447b865510f59559608df8c470456f5f5269d04e7104b018451ae260018cf04b03a253e7436ff0fc517c9f0d5cde705cbb8661a868b920

diff --git a/dev-haskell/process-conduit/files/process-conduit-1.1.0.0-conduit-1.1.patch b/dev-haskell/process-conduit/files/process-conduit-1.1.0.0-conduit-1.1.patch
deleted file mode 100644
index e829cc58de0..00000000000
--- a/dev-haskell/process-conduit/files/process-conduit-1.1.0.0-conduit-1.1.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- process-conduit-1.1.0.0-orig/process-conduit.cabal	2014-04-03 18:54:59.000000000 +1100
-+++ process-conduit-1.1.0.0/process-conduit.cabal	2014-07-02 09:45:32.738952743 +1000
-@@ -34,6 +34,7 @@
-                      , text             >= 0.11
-                      , process          >= 1.0
-                      , conduit          >= 1.1
-+                     , conduit-extra    >= 1.1
-                      , resourcet        >= 1.1
-                      , shakespeare-text >= 1.0
-                      , shakespeare
-@@ -48,4 +49,6 @@
-                      , bytestring
-                      , hspec           >= 1.3
-                      , conduit
-+                     , conduit-extra
-                      , process-conduit
-+                     , resourcet
---- process-conduit-1.1.0.0-orig/test.hs	2014-04-03 18:54:59.000000000 +1100
-+++ process-conduit-1.1.0.0/test.hs	2014-07-02 09:51:31.862391926 +1000
-@@ -7,6 +7,7 @@
- import Data.Conduit
- import qualified Data.Conduit.Binary as CB
- import Test.Hspec
-+import Control.Monad.Trans.Resource (runResourceT)
- 
- main :: IO ()
- main = hspec $ do

diff --git a/dev-haskell/process-conduit/metadata.xml b/dev-haskell/process-conduit/metadata.xml
deleted file mode 100644
index 476cab9249f..00000000000
--- a/dev-haskell/process-conduit/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@g.o</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Conduits for processes.
-		For more details: &lt;https://github.com/tanakh/process-conduit/blob/master/README.md&gt;
-	</longdescription>
-	<upstream>
-		<remote-id type="github">snoyberg/process-conduit</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/dev-haskell/process-conduit/process-conduit-1.1.0.0-r1.ebuild b/dev-haskell/process-conduit/process-conduit-1.1.0.0-r1.ebuild
deleted file mode 100644
index 16d6ac96635..00000000000
--- a/dev-haskell/process-conduit/process-conduit-1.1.0.0-r1.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.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit base haskell-cabal
-
-DESCRIPTION="Conduits for processes"
-HOMEPAGE="https://github.com/tanakh/process-conduit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-PATCHES=("${FILESDIR}/${PN}-1.1.0.0-conduit-1.1.patch")
-
-RDEPEND=">=dev-haskell/conduit-1.1:=[profile?]
-	>=dev-haskell/control-monad-loop-0.1:=[profile?] <dev-haskell/control-monad-loop-0.2:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?]
-	dev-haskell/shakespeare:=[profile?]
-	>=dev-haskell/shakespeare-text-1.0:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-	test? ( >=dev-haskell/hspec-1.3 )
-"

diff --git a/dev-haskell/process-conduit/process-conduit-1.2.0.1.ebuild b/dev-haskell/process-conduit/process-conduit-1.2.0.1.ebuild
deleted file mode 100644
index efbdeb02c28..00000000000
--- a/dev-haskell/process-conduit/process-conduit-1.2.0.1.ebuild
+++ /dev/null
@@ -1,33 +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.4.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Conduits for processes (deprecated)"
-HOMEPAGE="https://github.com/snoyberg/process-conduit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/conduit-1.1:=[profile?]
-	>=dev-haskell/control-monad-loop-0.1:=[profile?] <dev-haskell/control-monad-loop-0.2:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?]
-	dev-haskell/shakespeare:=[profile?]
-	>=dev-haskell/shakespeare-text-1.0:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/conduit-extra
-		>=dev-haskell/hspec-1.3 )
-"

diff --git a/profiles/package.mask b/profiles/package.mask
index 58c848a34d0..f60d893caa2 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -649,11 +649,6 @@ app-cdr/pburn
 # /usr/dict/words for generation. Removal in 30 days.
 app-admin/passook
 
-# Sergei Trofimovich <slyfox@g.o> (2020-08-29)
-# Abandoned upstream.
-# Does not compile against ghc-8.8. Removal in 30 days.
-dev-haskell/process-conduit
-
 # Miroslav Šulc <fordfrog@g.o> (2020-08-29)
 # Upstream has version 1.1.2, but only for Windows,
 # sources are gone. Removal in 30 days.