From 7bc9c63c9da678a7e6fceb095d56c634afd22c56 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 15 Dec 2019 18:09:03 +0000 Subject: gentoo resync : 15.12.2019 --- dev-haskell/haskell-src/Manifest | 3 ++ .../files/haskell-src-1.0.3.0-ghc-8.8.patch | 39 ++++++++++++++++++++++ dev-haskell/haskell-src/haskell-src-1.0.3.0.ebuild | 30 +++++++++++++++++ 3 files changed, 72 insertions(+) create mode 100644 dev-haskell/haskell-src/files/haskell-src-1.0.3.0-ghc-8.8.patch create mode 100644 dev-haskell/haskell-src/haskell-src-1.0.3.0.ebuild (limited to 'dev-haskell/haskell-src') diff --git a/dev-haskell/haskell-src/Manifest b/dev-haskell/haskell-src/Manifest index 1a3c93f8dd04..105791547aba 100644 --- a/dev-haskell/haskell-src/Manifest +++ b/dev-haskell/haskell-src/Manifest @@ -1,5 +1,8 @@ +AUX haskell-src-1.0.3.0-ghc-8.8.patch 1204 BLAKE2B 4435acd543148e120c39c94db4678bd0f4bb5ddb8e1c486a652e55bbe72ae72a0a994e4e5b841d6c19b4620acf281c5c0e044a708109eebf0ff7ed73344d9cd7 SHA512 d70c9a9e8a6066c834e634e877b6644b6d4ad0c6dee30b1f1d828ccdb81efd7860e93f7503dc6df12684996c7906dfb4d4c274e6a8f3e8f588d030bd41004784 DIST haskell-src-1.0.1.6.tar.gz 52967 BLAKE2B 2c98fa8a52ce54cfd281f3e86a2a8f310284d0977171b4bc5a56873d70b0fb28e0db1eb336a015df56e3d7f85db6ab656276e9c54d53c8c36e0b9687635daf89 SHA512 61035aee535335bb6e2dba96217d48054c89ef3d33af01abfbec077c40d54150bd78b200d5dff4fa6c490c500f32951eb8fb8352243625fc6ad735fad60afda9 DIST haskell-src-1.0.2.0.tar.gz 53636 BLAKE2B 1348bfc21d66d4226fa1045d2fc64de48ff91ed6ea978964f68389ec53bfbb63f407e130b0c168029d4d1daae2d1ffb59a32912721ad6fafe6054fb74f22cae6 SHA512 202b05ffcc505fb1332f5b3c8984b08a435911f574c4e1b2f2543a8758aa9e9a33f559c5c6cf3f8a3b7cda3f540e2da5b92e6456ee40dfe690cdf69a3e018b06 +DIST haskell-src-1.0.3.0.tar.gz 29863 BLAKE2B a75a52f6df1da50a8509db495a9dde56c1b0edf4b0934deb24822940dc7a0a1e252994a55342175e8e08894aa86c540b5cb8437c190d5e2aeeb19f62eb43b602 SHA512 6426f1602b2e9165c44efc4d10cdc8bdbc0b4291b7255d8ed223f1e5f474f6c41830cdd39af154290d2e972f9699269a67279baaf63f0e4c4321c96b37f0f5a5 EBUILD haskell-src-1.0.1.6.ebuild 606 BLAKE2B 2c5a25008d1b3fd0689fb467bbd1ceb261e290ef361def3d22b123ee7bf48f367b49d1333ed331de7acdbf9e9b7fd6bf9ffdd362d7b93cc072b785d76ba1b1c7 SHA512 f5748f8610edcd6bcf6f5a6ccb570dbced93ff0510138e0654e4d0d5f333ce411809ca7e785a30ceedeb7ae9c8ba6b45df67b8f2b3d1912b409f23e44837199a EBUILD haskell-src-1.0.2.0.ebuild 627 BLAKE2B f4ccde43fac21b2906a8f97e5ff54fd56920ba8954a8e54c8141b5a464dbb29893d73d97466e9b278344c2606e4b5dfd0cee95be279eb859aa241493384e5a74 SHA512 547f0f807f4f0670201394b8ab49bf9783150d76e4c4a5fa80e9895c3703b8094c6f99025a92673ce5330ece14d7f4a6c7f594b44c6ee83b7690be50a79cb162 +EBUILD haskell-src-1.0.3.0.ebuild 859 BLAKE2B 52d37d26bf082c844e9a3ad6c5d394f1e913cca32bd612cde5e3a70e8c64a5bd5ac83b3a29f6ed2565e7498d52b8a9a280803ee1c0e5c0f8180d408e2d0ba37e SHA512 ccc7f6d0220ca74585cce8d8614f44fe7b3ef4ec7beb568e8093ac974cd3f15ffe03d90589ebe026087215aba37a1101a533af4336893540792052478894783e MISC metadata.xml 217 BLAKE2B 41b11b7399431ee96c40a11373f20b12940ed7bb1fc77b1619212b2a57a3b34b11b77838d4ac51c1ddb80caab1030224e28567836e5d0a17b4ea6bd1afa2523c SHA512 63f267082f4ba17f6a1226d1c5a14d85d17e0f7a84857605933418d875d09cfffe2a0ca304b8a171dcae59169330fcc3cfca9d6f4c9ce24d135f1125a6d06c70 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 new file mode 100644 index 000000000000..84342b0d6847 --- /dev/null +++ b/dev-haskell/haskell-src/files/haskell-src-1.0.3.0-ghc-8.8.patch @@ -0,0 +1,39 @@ +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 new file mode 100644 index 000000000000..430a13692d3a --- /dev/null +++ b/dev-haskell/haskell-src/haskell-src-1.0.3.0.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2019 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="http://hackage.haskell.org/package/haskell-src" +SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~sparc ~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 ) -- cgit v1.2.3