commit: 4e269b53fc1b4f2a32322325f3efd9a81289a868 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Mon Dec 7 19:36:05 2020 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Mon Dec 7 19:37:43 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e269b53
dev-lang/helium: remove masked package Closes: https://bugs.gentoo.org/751757 Closes: https://bugs.gentoo.org/736054 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> dev-haskell/lvmlib/Manifest | 1 - dev-haskell/lvmlib/files/lvmlib-1.1-ghc-7.10.patch | 87 ---------------------- dev-haskell/lvmlib/files/lvmlib-1.1-ghc-8.8.patch | 15 ---- dev-haskell/lvmlib/files/lvmlib-1.1-ghc84.patch | 14 ---- dev-haskell/lvmlib/lvmlib-1.1.ebuild | 32 -------- dev-haskell/lvmlib/metadata.xml | 17 ----- dev-lang/helium/Manifest | 1 - dev-lang/helium/files/helium-1.8.1-ghc-7.10.patch | 55 -------------- dev-lang/helium/helium-1.8.1.ebuild | 35 --------- dev-lang/helium/metadata.xml | 11 --- profiles/package.mask | 7 -- 11 files changed, 275 deletions(-) diff --git a/dev-haskell/lvmlib/Manifest b/dev-haskell/lvmlib/Manifest deleted file mode 100644 index 0c3fc2b3db0..00000000000 --- a/dev-haskell/lvmlib/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST lvmlib-1.1.tar.gz 62388 BLAKE2B 9effe8b0b71ef36b3f73e792a9702d44efa5a7ed9f48f35825d75706a7dad2d5f5cac06d5941f60730c79216af5f3009110919dfa397343287e7359e702c5fbc SHA512 3f085f3ff8e53ab19de3b425c4c5a271111afcd334ec08fefd983838608ae436005c20c2d7c545650f0dd1b76d466f81661a14c8ce972df27d79a78c22023861 diff --git a/dev-haskell/lvmlib/files/lvmlib-1.1-ghc-7.10.patch b/dev-haskell/lvmlib/files/lvmlib-1.1-ghc-7.10.patch deleted file mode 100644 index ad68d78f56e..00000000000 --- a/dev-haskell/lvmlib/files/lvmlib-1.1-ghc-7.10.patch +++ /dev/null @@ -1,87 +0,0 @@ -diff --git a/Lvm/Asm/Data.hs b/Lvm/Asm/Data.hs -index 7939754..f3da0b7 100644 ---- a/Lvm/Asm/Data.hs -+++ b/Lvm/Asm/Data.hs -@@ -17,2 +17,3 @@ import Lvm.Core.Module - import Text.PrettyPrint.Leijen -+import Prelude hiding ((<$>)) - -diff --git a/Lvm/Common/IdMap.hs b/Lvm/Common/IdMap.hs -index a50bcb6..10758e6 100644 ---- a/Lvm/Common/IdMap.hs -+++ b/Lvm/Common/IdMap.hs -@@ -24,2 +24,3 @@ import Lvm.Common.Id - import Control.Arrow (first) -+import Prelude hiding (foldMap) - -diff --git a/Lvm/Core/Expr.hs b/Lvm/Core/Expr.hs -index 8bc50d7..935e16a 100644 ---- a/Lvm/Core/Expr.hs -+++ b/Lvm/Core/Expr.hs -@@ -17,2 +17,3 @@ import Lvm.Core.PrettyId - import Text.PrettyPrint.Leijen -+import Prelude hiding ((<$>)) - -diff --git a/Lvm/Core/Module.hs b/Lvm/Core/Module.hs -index 923870e..ac52201 100644 ---- a/Lvm/Core/Module.hs -+++ b/Lvm/Core/Module.hs -@@ -24,2 +24,3 @@ import Lvm.Instr.Data - import Text.PrettyPrint.Leijen -+import Prelude hiding ((<$>)) - -diff --git a/Lvm/Instr/Data.hs b/Lvm/Instr/Data.hs -index 497a690..959cb5c 100644 ---- a/Lvm/Instr/Data.hs -+++ b/Lvm/Instr/Data.hs -@@ -19,2 +19,3 @@ import Lvm.Common.Id - import Text.PrettyPrint.Leijen -+import Prelude hiding ((<$>)) - -diff --git a/Lvm/Instr/Resolve.hs b/Lvm/Instr/Resolve.hs -index 6845f74..4172a74 100644 ---- a/Lvm/Instr/Resolve.hs -+++ b/Lvm/Instr/Resolve.hs -@@ -10,2 +10,4 @@ module Lvm.Instr.Resolve (instrResolve) where - import Control.Exception (assert) -+import Control.Applicative -+import Control.Monad - import Data.Maybe -@@ -32,2 +34,6 @@ instance Functor Resolve where - -+instance Applicative Resolve where -+ pure = return -+ (<*>) = ap -- defined in Control.Monad -+ - instance Monad Resolve where -diff --git a/Lvm/Read.hs b/Lvm/Read.hs -index 7137331..25797f9 100644 ---- a/Lvm/Read.hs -+++ b/Lvm/Read.hs -@@ -9,2 +9,3 @@ module Lvm.Read (lvmReadFile, lvmRead) where - -+import Control.Applicative - import Control.Monad -@@ -390,2 +391,7 @@ instance Functor (Read v) where - Result x st2 -> Result (f x) st2) -+ -+instance Applicative (Read v) where -+ pure = return -+ (<*>) = ap -- defined in Control.Monad -+ - instance Monad (Read v) where -diff --git a/Lvm/Write.hs b/Lvm/Write.hs -index 48570f8..37469bc 100644 ---- a/Lvm/Write.hs -+++ b/Lvm/Write.hs -@@ -11,2 +11,3 @@ import qualified Control.Exception as CE (assert, catch, IOException) - import Control.Monad -+import Control.Applicative - import Data.Maybe -@@ -465,2 +466,6 @@ instance Functor Emit where - -+instance Applicative Emit where -+ pure = return -+ (<*>) = ap -- defined in Control.Monad -+ - instance Monad Emit where diff --git a/dev-haskell/lvmlib/files/lvmlib-1.1-ghc-8.8.patch b/dev-haskell/lvmlib/files/lvmlib-1.1-ghc-8.8.patch deleted file mode 100644 index 36d680794f0..00000000000 --- a/dev-haskell/lvmlib/files/lvmlib-1.1-ghc-8.8.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/Lvm/Common/IdMap.hs -+++ b/Lvm/Common/IdMap.hs -@@ -121,10 +121,10 @@ unionMaps :: [IdMap a] -> IdMap a - unionMaps = foldr unionMap emptyMap - - foldMapWithId :: (Id -> a -> b -> b) -> b -> IdMap a -> b --foldMapWithId f z (IdMap m) = IntMap.foldWithKey (f . idFromInt) z m -+foldMapWithId f z (IdMap m) = IntMap.foldrWithKey (f . idFromInt) z m - - foldMap :: (a -> b -> b) -> b -> IdMap a -> b --foldMap f z (IdMap m) = IntMap.fold f z m -+foldMap f z (IdMap m) = IntMap.foldr f z m - - sizeMap :: IdMap a -> Int - sizeMap (IdMap m) = IntMap.size m diff --git a/dev-haskell/lvmlib/files/lvmlib-1.1-ghc84.patch b/dev-haskell/lvmlib/files/lvmlib-1.1-ghc84.patch deleted file mode 100644 index 8f9e85402f9..00000000000 --- a/dev-haskell/lvmlib/files/lvmlib-1.1-ghc84.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/Lvm/Common/Byte.hs -+++ b/Lvm/Common/Byte.hs -@@ -19,2 +19,3 @@ import System.Exit - import System.IO -+import qualified Data.Semigroup as S - -@@ -68,2 +69,7 @@ max32 = 2^(32::Int) -1 -- Bastiaan (Todo: check) - -+instance S.Semigroup Bytes where -+ (<>) bs Nil = bs -+ (<>) Nil cs = cs -+ (<>) bs cs = Cat bs cs -+ - instance Monoid Bytes where diff --git a/dev-haskell/lvmlib/lvmlib-1.1.ebuild b/dev-haskell/lvmlib/lvmlib-1.1.ebuild deleted file mode 100644 index 7184d226bf0..00000000000 --- a/dev-haskell/lvmlib/lvmlib-1.1.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# ebuild generated by hackport 0.4.4.9999 - -CABAL_FEATURES="bin lib profile haddock hoogle hscolour" -inherit eutils haskell-cabal - -DESCRIPTION="The Lazy Virtual Machine (LVM)" -HOMEPAGE="http://www.cs.uu.nl/wiki/bin/view/Helium/WebHome"; -SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"; - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="dev-haskell/parsec:=[profile?] - dev-haskell/wl-pprint:=[profile?] - >=dev-lang/ghc-7.4.1:= -" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.10.1.0 -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.1-ghc-7.10.patch - "${FILESDIR}"/${PN}-1.1-ghc84.patch - "${FILESDIR}"/${PN}-1.1-ghc-8.8.patch -) diff --git a/dev-haskell/lvmlib/metadata.xml b/dev-haskell/lvmlib/metadata.xml deleted file mode 100644 index 2d49cd8f1b3..00000000000 --- a/dev-haskell/lvmlib/metadata.xml +++ /dev/null @@ -1,17 +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> - The Lazy Virtual Machine (LVM) defines a portable instruction set and file - format. It is specifically designed to execute languages with non-strict (or - lazy) semantics. This cabal package defines the core assembler (coreasm) for - compiling core programs into LVM instructions and a library. The LVM is used - as a backend for the Helium compiler. At the moment, one LVM runtime - implementation is available (written in C). More information about LVM can be - found in Chapter 6 of Daan Leijen's PhD Thesis, The Lambda Abroad. - </longdescription> -</pkgmetadata> diff --git a/dev-lang/helium/Manifest b/dev-lang/helium/Manifest deleted file mode 100644 index 2b63862803a..00000000000 --- a/dev-lang/helium/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST helium-1.8.1.tar.gz 774509 BLAKE2B 05e28d1140cd48925a2c4d06c5c152e06879389d666d54b0c5d7592453489f8e2bbaa8e7c20dbd9d72fe57a3f9651bffa05d156a32e0208e41ef0e78599353fa SHA512 4523d7323251354ea9f4fd0f6f5a112659119bef2fc0c790bb139cdcdf25e7f740ae4c7d584d0c93aabc3baaace8be49931808c59ad9133b81a64ae115e0f9b9 diff --git a/dev-lang/helium/files/helium-1.8.1-ghc-7.10.patch b/dev-lang/helium/files/helium-1.8.1-ghc-7.10.patch deleted file mode 100644 index 43af33ecac8..00000000000 --- a/dev-lang/helium/files/helium-1.8.1-ghc-7.10.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff --git a/src/Helium/Parser/LexerMonad.hs b/src/Helium/Parser/LexerMonad.hs -index 75ac077..af35093 100644 ---- a/src/Helium/Parser/LexerMonad.hs -+++ b/src/Helium/Parser/LexerMonad.hs -@@ -20,2 +20,4 @@ import Helium.Parser.LexerMessage - import Text.ParserCombinators.Parsec.Pos -+import Control.Applicative -+import Control.Monad - -@@ -47,2 +49,9 @@ returnLM x = LM (\_ pos brackets -> Right (x, [], pos, brackets)) - -+instance Functor LexerMonad where -+ fmap = liftM -+ -+instance Applicative LexerMonad where -+ pure = return -+ (<*>) = ap -- defined in Control.Monad -+ - instance Monad LexerMonad where -diff --git a/src/Helium/StaticAnalysis/Heuristics/OnlyResultHeuristics.hs b/src/Helium/StaticAnalysis/Heuristics/OnlyResultHeuristics.hs -index 880ac0b..90574f0 100644 ---- a/src/Helium/StaticAnalysis/Heuristics/OnlyResultHeuristics.hs -+++ b/src/Helium/StaticAnalysis/Heuristics/OnlyResultHeuristics.hs -@@ -1 +1,2 @@ -+{-# LANGUAGE FlexibleContexts #-} - {-| Module : OnlyResultHeuristics -diff --git a/src/Helium/StaticAnalysis/Heuristics/RepairHeuristics.hs b/src/Helium/StaticAnalysis/Heuristics/RepairHeuristics.hs -index 89e43f2..251406f 100644 ---- a/src/Helium/StaticAnalysis/Heuristics/RepairHeuristics.hs -+++ b/src/Helium/StaticAnalysis/Heuristics/RepairHeuristics.hs -@@ -1 +1,2 @@ -+{-# LANGUAGE FlexibleContexts #-} - {-| Module : RepairHeuristics -diff --git a/src/Helium/StaticAnalysis/Heuristics/TieBreakerHeuristics.hs b/src/Helium/StaticAnalysis/Heuristics/TieBreakerHeuristics.hs -index d0b01a3..ba7ca19 100644 ---- a/src/Helium/StaticAnalysis/Heuristics/TieBreakerHeuristics.hs -+++ b/src/Helium/StaticAnalysis/Heuristics/TieBreakerHeuristics.hs -@@ -1 +1,2 @@ -+{-# LANGUAGE FlexibleContexts #-} - {-| Module : TieBreakerHeuristics -diff --git a/src/Helium/StaticAnalysis/Heuristics/UnifierHeuristics.hs b/src/Helium/StaticAnalysis/Heuristics/UnifierHeuristics.hs -index c2e91f5..493c882 100644 ---- a/src/Helium/StaticAnalysis/Heuristics/UnifierHeuristics.hs -+++ b/src/Helium/StaticAnalysis/Heuristics/UnifierHeuristics.hs -@@ -1 +1,2 @@ -+{-# LANGUAGE FlexibleContexts #-} - {-| Module : UnifierHeuristics -diff --git a/src/Helium/Syntax/UHA_Pretty.hs b/src/Helium/Syntax/UHA_Pretty.hs -index af970dc..ee42a48 100644 ---- a/src/Helium/Syntax/UHA_Pretty.hs -+++ b/src/Helium/Syntax/UHA_Pretty.hs -@@ -17,2 +17,3 @@ import Control.Monad.Identity (Identity) - import qualified Control.Monad.Identity -+import Prelude hiding ((<$>)) - diff --git a/dev-lang/helium/helium-1.8.1.ebuild b/dev-lang/helium/helium-1.8.1.ebuild deleted file mode 100644 index 2a9fb0d552d..00000000000 --- a/dev-lang/helium/helium-1.8.1.ebuild +++ /dev/null @@ -1,35 +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.5.9999 - -CABAL_FEATURES="bin lib profile haddock hoogle hscolour" -inherit haskell-cabal - -DESCRIPTION="The Helium Compiler" -HOMEPAGE="https://github.com/Helium4Haskell/helium"; -SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=">=dev-haskell/lvmlib-1.1:=[profile?] - dev-haskell/mtl:=[profile?] - dev-haskell/network:=[profile?] - dev-haskell/parsec:=[profile?] - >=dev-haskell/top-1.7:=[profile?] - dev-haskell/transformers:=[profile?] - dev-haskell/wl-pprint:=[profile?] - >=dev-lang/ghc-7.4.1:= -" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.10.1.0 -" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.8.1-ghc-7.10.patch -} diff --git a/dev-lang/helium/metadata.xml b/dev-lang/helium/metadata.xml deleted file mode 100644 index e43c5ea1581..00000000000 --- a/dev-lang/helium/metadata.xml +++ /dev/null @@ -1,11 +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> - <upstream> - <remote-id type="github">Helium4Haskell/helium</remote-id> - </upstream> -</pkgmetadata> diff --git a/profiles/package.mask b/profiles/package.mask index 0288aa15bc7..e2c4e4e8a4d 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -449,13 +449,6 @@ dev-python/couchdb-python www-apps/liquid_feedback_frontend www-apps/webmcp -# Sergei Trofimovich <[email protected]> (2020-11-03) -# Hackage release does not build against gcc-8: -# https://github.com/Helium4Haskell/helium/issues/4 -# Masked for removal. Bugs: #751757, #736054 -dev-lang/helium -dev-haskell/lvmlib - # Lars Wendler <[email protected]> (2020-10-30) # Removed public macro definitions for TRUE and FALSE which breaks lots of # revdeps. See tacker bug at https://bugs.gentoo.org/751919
