summaryrefslogtreecommitdiff
path: root/dev-haskell/blaze-textual
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-07-28 10:27:13 +0100
committerV3n3RiX <venerix@redcorelinux.org>2021-07-28 10:27:13 +0100
commitf4fc10428424904caf2035cffc442195cb088b2c (patch)
tree72f320d5963e55586cfdeed2b14c72b8191b6327 /dev-haskell/blaze-textual
parentfbd9734cedfe790955100b8e4ab3613457d77b1a (diff)
gentoo resync : 28.07.2021
Diffstat (limited to 'dev-haskell/blaze-textual')
-rw-r--r--dev-haskell/blaze-textual/Manifest4
-rw-r--r--dev-haskell/blaze-textual/blaze-textual-0.2.1.0.ebuild12
-rw-r--r--dev-haskell/blaze-textual/files/blaze-textual-0.2.1.0-ghc-9.0.patch22
-rw-r--r--dev-haskell/blaze-textual/files/blaze-textual-0.2.1.0-integer-simple-fallback.patch11
4 files changed, 43 insertions, 6 deletions
diff --git a/dev-haskell/blaze-textual/Manifest b/dev-haskell/blaze-textual/Manifest
index d956dc3ed656..7bd0fa9a1dcd 100644
--- a/dev-haskell/blaze-textual/Manifest
+++ b/dev-haskell/blaze-textual/Manifest
@@ -1,3 +1,5 @@
+AUX blaze-textual-0.2.1.0-ghc-9.0.patch 693 BLAKE2B 1eec52d6bd1b846d705b3bffe61d7087185b3fb0396cf3650d5cc6312dc418408f2606f3dbf68859b8a56f08bf7e34696ad7d5748a7da47af39c6d7669681b76 SHA512 7e58ad2f1fe9629878042204e85d767d798752135d02753e8bf6403bd6cdf95bd91a58d544a56b5ecbef547d38640941e4c361532fa29f88fc7251f7b5e762c8
+AUX blaze-textual-0.2.1.0-integer-simple-fallback.patch 301 BLAKE2B 84b9ff91ff96c2969cb068d934c874f760411ae5765bdb09d22e3fc29cc422df8e59927ac822455f9ce335ef7ce03fbd324b7e92ed46dd3d6c1a08044c85019a SHA512 1947db78836868a91cd523b611f5970c4ae3d3b143b5c9e5d85fa552ec28a9f4809f6d8d2935f43f24b0915232bfcc4adf99381fb6c9a5b940dfcd743303f07f
DIST blaze-textual-0.2.1.0.tar.gz 6914 BLAKE2B 1f56b564d91429abf12984602784dd1af4e3e4f0ba603e306912c00fae4efd5e74575e1c3387fc382265edb3343987477f24950e3814cacb9651c9e3333259c6 SHA512 260036fc712fab44e6f852dd8b40d9fbe79e0a181788d647806b128da19f57cf2e024ffe0567265deddabebb27b9dc9dbd34422cbdbf04c9e21d3e010a4f7ee5
-EBUILD blaze-textual-0.2.1.0.ebuild 1043 BLAKE2B 431bf636a639c3a970f94ada2d1ed9db98586d092d3ea8915ab5af9025e115748e2b22dd2a3282843c9ab91fbdc01d0b8c0cafb4f3db151ca6b78e56536c7ce5 SHA512 aac8e1f367162936066d43c54bed0c56fa41e8cf40ebbdd3c3b49201a64e62799081d9984cfe599789bdcc1f342da829a736146bba3056a4679e23068890a1e0
+EBUILD blaze-textual-0.2.1.0.ebuild 1121 BLAKE2B 37c6009e22adde3d04a4fbbb8e475f4e8a224a57945911718563e298f142f01e72b846087346c94aed00098016c2cae1464f1b677c12d19720ef6bcfd385c0f1 SHA512 3fc3f951821debf18aa9fb0d5aa903f4526f44fbdef84f2c78fdb83fdffb5c0f852f8ec31ef0abaae3238c3a9801e08fdbd4945e844fdddf2295bc524a927d46
MISC metadata.xml 588 BLAKE2B a553bf9c629c8eaa97ac41d325aac053c217975d05bd6dde745688f0f6874c42d49ea3ed6021754781da3f292db4d005a22238a56c1f54c029d80815a96ca96d SHA512 8871d79e6c8d076098f6f1c57b13c64bf5533eb9388d32137e97feefaab3d918212a473599a9dc8d858fa543c6c33d7229247494baa6d8179d06365bcfdec8ab
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 d4950a1b2dc7..909db630574a 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 000000000000..86dfdb602fcb
--- /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 <persiantiger@yandex.ru>
+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 000000000000..44ff8fdc6ff6
--- /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: