commit: 3138d0cbb627a7d52eceb27152c50b596c0be768 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Sat Sep 12 09:24:26 2020 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Sat Sep 12 09:30:12 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3138d0cb
dev-haskell/cmdlib: drop masked package Closes: https://bugs.gentoo.org/735868 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> dev-haskell/cmdlib/Manifest | 2 -- dev-haskell/cmdlib/cmdlib-0.3.5-r1.ebuild | 34 --------------------- dev-haskell/cmdlib/cmdlib-0.3.6.ebuild | 35 ---------------------- .../cmdlib/files/cmdlib-0.3.4-ghc-6.12.patch | 16 ---------- dev-haskell/cmdlib/metadata.xml | 31 ------------------- profiles/package.mask | 6 ---- 6 files changed, 124 deletions(-) diff --git a/dev-haskell/cmdlib/Manifest b/dev-haskell/cmdlib/Manifest deleted file mode 100644 index 9655b60371a..00000000000 --- a/dev-haskell/cmdlib/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST cmdlib-0.3.5.tar.gz 22881 BLAKE2B 867e15e7b32a76f81b01c69ee60af74c8b5752d680693a154e1005167155b2ac501d4c0d1d476295d95c716dbe49f39d2d4f21c1d3f5a64e930adf6c31869289 SHA512 29ca53ddde33d3154b57d56d80eed1e511476ffeb4e4b3722c003770d85d2c4815dccde9d25bc2c86dacad66af6ce6b924c2e97106945a9d9c8ed33fc2424d67 -DIST cmdlib-0.3.6.tar.gz 22971 BLAKE2B 5feb462ee53cf3d5978fdf9b10cec0cabd3522e473e3c06d458a55de1bbc95ce687b4796b974ce9b26b0febd8ef4578093cb498c6bd40bd5dec82bbcfbc446fa SHA512 9d67e931c9caaaaf833215f2561d8ca6aeddd02c64b79343974d0a4d7f1dc618a7af4327ebf50d4071b871b1fd97edc3b5db5bbc8b3334352a20276733602024 diff --git a/dev-haskell/cmdlib/cmdlib-0.3.5-r1.ebuild b/dev-haskell/cmdlib/cmdlib-0.3.5-r1.ebuild deleted file mode 100644 index b93de856c5c..00000000000 --- a/dev-haskell/cmdlib/cmdlib-0.3.5-r1.ebuild +++ /dev/null @@ -1,34 +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.2.9999 - -CABAL_FEATURES="bin lib profile haddock hoogle hscolour" -inherit base haskell-cabal - -DESCRIPTION="a library for command line parsing & online help" -HOMEPAGE="https://hackage.haskell.org/package/cmdlib"; -SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"; - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=">=dev-haskell/mtl-2:=[profile?] - >=dev-haskell/transformers-0.2.2:=[profile?] - dev-haskell/split:=[profile?] - dev-haskell/syb:=[profile?] - >=dev-lang/ghc-6.10.4:=" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.6" - -PATCHES=("${FILESDIR}/${PN}-0.3.4-ghc-6.12.patch") - -src_configure() { - haskell-cabal_src_configure \ - --flag=mtl2 \ - --flag=-test -} diff --git a/dev-haskell/cmdlib/cmdlib-0.3.6.ebuild b/dev-haskell/cmdlib/cmdlib-0.3.6.ebuild deleted file mode 100644 index 8d8239c1059..00000000000 --- a/dev-haskell/cmdlib/cmdlib-0.3.6.ebuild +++ /dev/null @@ -1,35 +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: -test,+mtl2 - -CABAL_FEATURES="bin lib profile haddock hoogle hscolour" -inherit haskell-cabal - -DESCRIPTION="a library for command line parsing & online help" -HOMEPAGE="https://hackage.haskell.org/package/cmdlib"; -SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"; - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=">=dev-haskell/mtl-2:=[profile?] - dev-haskell/split:=[profile?] - dev-haskell/syb:=[profile?] - >=dev-haskell/transformers-0.2.2:=[profile?] - >=dev-lang/ghc-7.4.1:= -" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.6 -" - -src_configure() { - haskell-cabal_src_configure \ - --flag=mtl2 \ - --flag=-test -} diff --git a/dev-haskell/cmdlib/files/cmdlib-0.3.4-ghc-6.12.patch b/dev-haskell/cmdlib/files/cmdlib-0.3.4-ghc-6.12.patch deleted file mode 100644 index 85a19d9aff0..00000000000 --- a/dev-haskell/cmdlib/files/cmdlib-0.3.4-ghc-6.12.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- cmdlib-0.3.4-orig/System/Console/CmdLib/Command.hs 2011-10-07 07:19:48.000000000 +1100 -+++ cmdlib-0.3.4/System/Console/CmdLib/Command.hs 2012-01-06 20:49:59.668959773 +1100 -@@ -225,6 +225,13 @@ - commandGroup :: (Commands a) => String -> a -> [CommandWrap] - commandGroup s l = [CommandGroup s (toCommands l)] - -+#if !MIN_VERSION_mtl(2,0,0) -+instance Monad (Either e) where -+ return = Right -+ Left l >>= _ = Left l -+ Right r >>= k = k r -+#endif -+ - -- TODO: disambiguation, hidden commands (aliases) - findCommand :: String -> [CommandWrap] -> [CommandWrap] - findCommand key list = case accum list of Left x -> [x] diff --git a/dev-haskell/cmdlib/metadata.xml b/dev-haskell/cmdlib/metadata.xml deleted file mode 100644 index c97e547df9f..00000000000 --- a/dev-haskell/cmdlib/metadata.xml +++ /dev/null @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo Haskell</name> - </maintainer> - <longdescription> - A commandline parsing library, based on getopt. Comes with a - powerful attribute system. Supports complex interfaces with many - options and commands, with option & command grouping, with simple - and convenient API. Even though quite powerful, it strives to keep - simple things simple. The library uses "System.Console.GetOpt" as - its backend. - - In comparison to the other commandline handling libraries: - - Compared to cmdargs, cmdlib has a pure attribute system and is - based on GetOpt for help formatting & argument parsing. Cmdlib may - also be more extendable due to typeclass design, and can use - user-supplied types for option arguments. - - Cmdargs >= 0.4 can optionally use a pure attribute system, - although this is clearly an add-on and the API is a second-class - citizen in relation to the impure version. - - GetOpt and parseargs both require explicit flag representation, so - they live a level below cmdlib. GetOpt is in fact used as a - backend by cmdlib. - </longdescription> -</pkgmetadata> diff --git a/profiles/package.mask b/profiles/package.mask index c892406e294..4cd2d5e3bed 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -371,12 +371,6 @@ dev-haskell/certificate # Does not compile against ghc-8.8. Removal in 30 days. dev-lang/epic -# Sergei Trofimovich <[email protected]> (2020-08-22) -# Obsolete package without reverse dependencies. -# Does not compile against ghc-8.8. Removal in 30 days. -# Bug #735868. -dev-haskell/cmdlib - # Michał Górny <[email protected]> (2020-08-22) # Dead since 2011. Frowned upon for years now. Python 2 only. # Finally all reverse dependencies are masked.
