commit: 6463561c4ad46c1eeb2280f055caa326bfd13767 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Tue Jul 27 10:01:37 2021 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Tue Jul 27 10:01:53 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6463561c
dev-haskell/blaze-textual: allow ghc[-gmp] Reported-by: Toralf Förster Closes: https://bugs.gentoo.org/790467 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> .../blaze-textual/blaze-textual-0.2.1.0.ebuild | 12 +++++++----- .../files/blaze-textual-0.2.1.0-ghc-9.0.patch | 22 ++++++++++++++++++++++ ...e-textual-0.2.1.0-integer-simple-fallback.patch | 11 +++++++++++ 3 files changed, 40 insertions(+), 5 deletions(-) diff --git a/dev-haskell/blaze-textual/blaze-textual-0.2.1.0.ebuild b/dev-haskell/blaze-textual/blaze-textual-0.2.1.0.ebuild index d4950a1b2dc..909db630574 100644 --- a/dev-haskell/blaze-textual/blaze-textual-0.2.1.0.ebuild +++ b/dev-haskell/blaze-textual/blaze-textual-0.2.1.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 # ebuild generated by hackport 0.6.6.9999 #hackport: flags: -developer,-native @@ -16,9 +16,6 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"; LICENSE="BSD" SLOT="0/${PV}" KEYWORDS="~amd64 ~x86" -IUSE="" - -RESTRICT=test # fails tests RDEPEND=">=dev-haskell/blaze-builder-0.2.1.4:=[profile?] >=dev-haskell/double-conversion-0.2.0.1:=[profile?] @@ -34,6 +31,11 @@ DEPEND="${RDEPEND} >=dev-haskell/test-framework-quickcheck2-0.2.9 ) " +PATCHES=( + "${FILESDIR}"/${PN}-0.2.1.0-ghc-9.0.patch + "${FILESDIR}"/${PN}-0.2.1.0-integer-simple-fallback.patch +) + src_configure() { haskell-cabal_src_configure \ --flag=-developer \ diff --git a/dev-haskell/blaze-textual/files/blaze-textual-0.2.1.0-ghc-9.0.patch b/dev-haskell/blaze-textual/files/blaze-textual-0.2.1.0-ghc-9.0.patch new file mode 100644 index 00000000000..86dfdb602fc --- /dev/null +++ b/dev-haskell/blaze-textual/files/blaze-textual-0.2.1.0-ghc-9.0.patch @@ -0,0 +1,22 @@ +commit c93b53a4aaad5a6ee2ddf90010957981d75d3579 (HEAD -> master, origin/master, origin/HEAD) +Author: Andrey Prokopenko <[email protected]> +Date: Sun Apr 18 01:21:37 2021 +0300 + + Hide `quoteRemInteger` import for base-4.15.0.0 + +diff --git a/Blaze/Text/Int.hs b/Blaze/Text/Int.hs +index 58cdbf4..bf395a3 100644 +--- a/Blaze/Text/Int.hs ++++ b/Blaze/Text/Int.hs +@@ -23,7 +23,10 @@ import Data.Int (Int8, Int16, Int32, Int64) + import Data.Monoid (mappend, mempty) + import Data.Word (Word, Word8, Word16, Word32, Word64) + import GHC.Base (quotInt, remInt) ++#if MIN_VERSION_base(4,15,0) ++#else + import GHC.Num (quotRemInteger) ++#endif + import GHC.Types (Int(..)) + + #if defined(INTEGER_GMP) + diff --git a/dev-haskell/blaze-textual/files/blaze-textual-0.2.1.0-integer-simple-fallback.patch b/dev-haskell/blaze-textual/files/blaze-textual-0.2.1.0-integer-simple-fallback.patch new file mode 100644 index 00000000000..44ff8fdc6ff --- /dev/null +++ b/dev-haskell/blaze-textual/files/blaze-textual-0.2.1.0-integer-simple-fallback.patch @@ -0,0 +1,11 @@ +Allow ghc[-gmp] to discover integer-simple: https://bugs.gentoo.org/790467 +--- a/blaze-textual.cabal ++++ b/blaze-textual.cabal +@@ -39,7 +39,6 @@ flag native + flag integer-simple + description: use integer-simple instead of integer-gmp + default: False +- manual: True + + library + exposed-modules:
