gentoo resync : 25.08.2020

4 files changed, 50 insertions, 2 deletions

diff --git a/dev-haskell/patience/Manifest b/dev-haskell/patience/Manifest
index 9b4bb3ebe294..1128ae0e985f 100644
--- a/dev-haskell/patience/Manifest
+++ b/dev-haskell/patience/Manifest
@@ -1,3 +1,5 @@
+AUX patience-0.1.1-ghc-8.6.patch 914 BLAKE2B 840b9f375e4bc1725be57e55d2a7a6e27c8e075758d924597a34ffc80ab6c0a6f706cbb2247c063983c282451a4ff0832aca00b03a795d38898a38ffd03f3dc2 SHA512 d6a4bc0eb4abdbe8313d334ce5b60e18bf1b2d74aecc72147dcda53f6e724d2fe29d07a70c026f24614c36ab6d9132dcd6ae9ee44b5f2b04b6b317cb3121c47c
 DIST patience-0.1.1.tar.gz 4610 BLAKE2B 6ce8e959dec8493990f66c9cb7b5dc8aaef6cb4edc3207f19156ba527fd993112a29a9d39241a39c2d9c4af600cebdfd31f02833779ce6cbf74e14ce6305273a SHA512 dac94580d9b82023841b5406509f8cd0e58148756e4259708c21b78b480fb4fb67b21a82c81e702275f49d90bcd1d2b46d20bb96267131d4ff57334f110e14f7
-EBUILD patience-0.1.1.ebuild 568 BLAKE2B c3672a6f7659d9695469dd2ce33cf2bb7653cbfb845e3b6702db661d11aed518977189a7ccb2643bee4a12d9de2fafa97399325eb138ce75fb3b80bc7edeb947 SHA512 525b06e383af2aa4938aa5ceb92b4abc5f38e0e4467f5958296f1875a37ccc1719cf16c9d9dc06dd27ab82b2ed5d96658c590628e976480edfae1e138a688964
+EBUILD patience-0.1.1-r1.ebuild 600 BLAKE2B 2c1f4fc5f4a8b5919bed5dcffda07b4f551190b9e020fdf630f7fcf83dbe22c3c272e41cf1eda72205fbeb71a169fa092df6c0ea249d00f884b28d4707bfe747 SHA512 78ff61dbb71cd3d992e56116714abf35b20622d30d93994505e1c34798f082d6afd76cfba9859920396689793fd6dbfc3125ab5be976f0b11ba61cc1a7167df2
+EBUILD patience-0.1.1.ebuild 556 BLAKE2B 407ea126550f9968ce033ea1f1157c1a0afb3be969bca701417925b99376f26ad4f34201571343f2a61f9f1e5ffaac499884f0762e0f8bb23831b1f079c96a50 SHA512 0bb9bd89da9d16d56f46e5a360ed80be92f01e2c5c96eabfdb2069a7d33074cd7742416952a8c892982df4d49a7bef109adf01e6ae799f02639a596a41a5673d
 MISC metadata.xml 887 BLAKE2B 0cf15592802803b2efb4a61ec726a019abcb976bdec08c7389e3842fc0067c78aec5b96723fb3afd76c607428548bbc2ad46904f9be6edcdbf2363463d88ed4a SHA512 e6d6b6af598a2d92c07d1464c785f694f91e706ab2706909f4d1920c58764dc84856cadbed8008f337dfddc4ddb4431849b5688a7c6e50c28ff922680a766f78
diff --git a/dev-haskell/patience/files/patience-0.1.1-ghc-8.6.patch b/dev-haskell/patience/files/patience-0.1.1-ghc-8.6.patch
new file mode 100644
index 000000000000..e844e1d9df5e
--- /dev/null
+++ b/dev-haskell/patience/files/patience-0.1.1-ghc-8.6.patch
@@ -0,0 +1,20 @@
+diff -ru patience-0.1.1/Data/Algorithm/Patience.hs patience-modified/Data/Algorithm/Patience.hs
+--- patience-0.1.1/Data/Algorithm/Patience.hs	2011-08-17 08:08:14.000000000 +0800
++++ patience-modified/Data/Algorithm/Patience.hs	2018-07-11 15:17:45.021338649 +0800
+@@ -15,6 +15,7 @@
+ import Data.Sequence ( (<|), (|>), (><), ViewL(..), ViewR(..) )
+ import qualified Data.Foldable as F
+ import qualified Data.Map      as M
++import qualified Data.Map.Strict as MS
+ import qualified Data.IntMap   as IM
+ 
+ import Data.List
+@@ -68,7 +69,7 @@
+ -- Elements whose second component appears exactly once.
+ unique :: (Ord t) => S.Seq (a,t) -> M.Map t a
+ unique = M.mapMaybe id . F.foldr ins M.empty where
+-  ins (a,x) = M.insertWith' (\_ _ -> Nothing) x (Just a)
++  ins (a,x) = MS.insertWith (\_ _ -> Nothing) x (Just a)
+ 
+ -- Given two sequences of numbered "lines", returns a list of points
+ -- where unique lines match up.
diff --git a/dev-haskell/patience/patience-0.1.1-r1.ebuild b/dev-haskell/patience/patience-0.1.1-r1.ebuild
new file mode 100644
index 000000000000..04916452e606
--- /dev/null
+++ b/dev-haskell/patience/patience-0.1.1-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.3.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Patience diff and longest increasing subsequence"
+HOMEPAGE="https://hackage.haskell.org/package/patience"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.2
+"
+
+PATCHES=("${FILESDIR}"/${P}-ghc-8.6.patch)
diff --git a/dev-haskell/patience/patience-0.1.1.ebuild b/dev-haskell/patience/patience-0.1.1.ebuild
index 89ab91c32362..fddc9c0dcf58 100644
--- a/dev-haskell/patience/patience-0.1.1.ebuild
+++ b/dev-haskell/patience/patience-0.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=