From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 86EC2158094 for ; Mon, 22 Aug 2022 07:36:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8484EE0948; Mon, 22 Aug 2022 07:36:02 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 43DD0E0952 for ; Mon, 22 Aug 2022 07:36:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E3AEE340C93 for ; Mon, 22 Aug 2022 07:36:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3AF1A599 for ; Mon, 22 Aug 2022 07:35:58 +0000 (UTC) From: "Jakov Smolić" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jakov Smolić" Message-ID: <1661152846.62ce1ee82631f06c1b3f079df957da05ff926269.jsmolic@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-haskell/haskell-src/, dev-haskell/haskell-src/files/, profiles/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-haskell/haskell-src/Manifest dev-haskell/haskell-src/files/haskell-src-1.0.3.0-ghc-8.8.patch dev-haskell/haskell-src/haskell-src-1.0.3.0.ebuild dev-haskell/haskell-src/metadata.xml profiles/package.mask X-VCS-Directories: profiles/ dev-haskell/haskell-src/files/ dev-haskell/haskell-src/ X-VCS-Committer: jsmolic X-VCS-Committer-Name: Jakov Smolić X-VCS-Revision: 62ce1ee82631f06c1b3f079df957da05ff926269 X-VCS-Branch: master Date: Mon, 22 Aug 2022 07:35:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d88eed45-4188-4ce2-9f95-d2ce00ec09a9 X-Archives-Hash: b719705a377a79761a2058b808d9175b commit: 62ce1ee82631f06c1b3f079df957da05ff926269 Author: Jakov Smolić gentoo org> AuthorDate: Mon Aug 22 07:20:46 2022 +0000 Commit: Jakov Smolić gentoo org> CommitDate: Mon Aug 22 07:20:46 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62ce1ee8 dev-haskell/haskell-src: treeclean Closes: https://bugs.gentoo.org/862495 Closes: https://bugs.gentoo.org/736024 Signed-off-by: Jakov Smolić gentoo.org> dev-haskell/haskell-src/Manifest | 1 - .../files/haskell-src-1.0.3.0-ghc-8.8.patch | 39 ---------------------- dev-haskell/haskell-src/haskell-src-1.0.3.0.ebuild | 30 ----------------- dev-haskell/haskell-src/metadata.xml | 7 ---- profiles/package.mask | 1 - 5 files changed, 78 deletions(-) diff --git a/dev-haskell/haskell-src/Manifest b/dev-haskell/haskell-src/Manifest deleted file mode 100644 index cbf48573cb3b..000000000000 --- a/dev-haskell/haskell-src/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST haskell-src-1.0.3.0.tar.gz 29863 BLAKE2B a75a52f6df1da50a8509db495a9dde56c1b0edf4b0934deb24822940dc7a0a1e252994a55342175e8e08894aa86c540b5cb8437c190d5e2aeeb19f62eb43b602 SHA512 6426f1602b2e9165c44efc4d10cdc8bdbc0b4291b7255d8ed223f1e5f474f6c41830cdd39af154290d2e972f9699269a67279baaf63f0e4c4321c96b37f0f5a5 diff --git a/dev-haskell/haskell-src/files/haskell-src-1.0.3.0-ghc-8.8.patch b/dev-haskell/haskell-src/files/haskell-src-1.0.3.0-ghc-8.8.patch deleted file mode 100644 index 84342b0d6847..000000000000 --- a/dev-haskell/haskell-src/files/haskell-src-1.0.3.0-ghc-8.8.patch +++ /dev/null @@ -1,39 +0,0 @@ -commit bd0a8199252f4cd7f5d93ee862a919646f85a06f -Author: Ollie Charles -Date: Wed Sep 18 12:36:15 2019 +0100 - - Build with GHC 8.8 - -diff --git a/Language/Haskell/ParseMonad.hs b/Language/Haskell/ParseMonad.hs -index 1ed9b7a..f9bea5e 100644 ---- a/Language/Haskell/ParseMonad.hs -+++ b/Language/Haskell/ParseMonad.hs -@@ -12,6 +12,8 @@ - -- - ----------------------------------------------------------------------------- - -+{-# LANGUAGE CPP #-} -+ - module Language.Haskell.ParseMonad( - -- * Parsing - P, ParseResult(..), atSrcLoc, LexContext(..), -@@ -134,7 +136,9 @@ instance Monad P where - case m i x y l s mode of - Failed loc msg -> Failed loc msg - Ok s' a -> runP (k a) i x y l s' mode -+#if !(MIN_VERSION_base(4,13,0)) - fail = Fail.fail -+#endif - - -- | @since 1.0.3.0 - instance Fail.MonadFail P where -@@ -191,7 +195,9 @@ instance Monad (Lex r) where - return = pure - Lex v >>= f = Lex $ \k -> v (\a -> runL (f a) k) - (>>) = (*>) -+#if !(MIN_VERSION_base(4,13,0)) - fail = Fail.fail -+#endif - - -- | @since 1.0.3.0 - instance Fail.MonadFail (Lex r) where diff --git a/dev-haskell/haskell-src/haskell-src-1.0.3.0.ebuild b/dev-haskell/haskell-src/haskell-src-1.0.3.0.ebuild deleted file mode 100644 index 04e987ba642d..000000000000 --- a/dev-haskell/haskell-src/haskell-src-1.0.3.0.ebuild +++ /dev/null @@ -1,30 +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.5.5.9999 - -CABAL_FEATURES="lib profile haddock hoogle hscolour" -inherit haskell-cabal - -DESCRIPTION="Support for manipulating Haskell source code" -HOMEPAGE="https://hackage.haskell.org/package/haskell-src" -SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=">=dev-haskell/fail-4.9:=[profile?] =dev-haskell/semigroups-0.18:=[profile?] =dev-haskell/syb-0.1:=[profile?] =dev-lang/ghc-7.4.1:= -" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.10 - dev-haskell/happy -" - -PATCHES=( "${FILESDIR}"/${PN}-1.0.3.0-ghc-8.8.patch ) diff --git a/dev-haskell/haskell-src/metadata.xml b/dev-haskell/haskell-src/metadata.xml deleted file mode 100644 index c7bb0e775ab0..000000000000 --- a/dev-haskell/haskell-src/metadata.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - haskell@gentoo.org - - diff --git a/profiles/package.mask b/profiles/package.mask index 0a24bc1d21d4..3d4c5682ef8c 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -434,7 +434,6 @@ dev-haskell/half dev-haskell/hamlet dev-haskell/happstack-server dev-haskell/harp -dev-haskell/haskell-src # Hans de Graaff (2022-07-16) # No longer supported upstream. Use a newer ruby version instead.