gentoo resync : 15.12.2019

3 files changed, 61 insertions, 0 deletions

diff --git a/dev-haskell/monadplus/Manifest b/dev-haskell/monadplus/Manifest
index aea5ddba5f5a..decb1599d130 100644
--- a/dev-haskell/monadplus/Manifest
+++ b/dev-haskell/monadplus/Manifest
@@ -1,3 +1,5 @@
+AUX monadplus-1.4.2-ghc-8.4.patch 1034 BLAKE2B a004625fb88ad02eed904a598ef8943ad6d6319b98acddc8911e5b689ac518ff6491cdc6c6ed612c0af6dd4c7bd59f0f571b2663fec2d26754aaa1140472e2cc SHA512 12fa58624304138593b3877ca77ce60eaa3b2c049889c2b7ed8cb5b115355c67ff7c99553d242024fea5e57c91df0e5dbe995b835ac59e8faad90a0a4a04f738
 DIST monadplus-1.4.2.tar.gz 3671 BLAKE2B b256d49436933b446d3aa74e23ea778a6cf092cb858eb8ad1024adc370caeec6a1153a7cba7a25507213f758c3393c9040f354ca5238f8950b3bab6153d8416e SHA512 839a35b3de1226e177c07e30b86e841ddd19075d3ce29fa7154fefb371d9bef8aa85847d7c139faad93713d5b7889979498097f69c6e3bccfcee2fbbf7bf6539
+EBUILD monadplus-1.4.2-r1.ebuild 602 BLAKE2B 241d035969cd2ab633edd78e98aeaa7a4628075c42b265b5fd02ad6a342d930ee66b58871dc486e74c988df4696ff2b50cc93527d2c54fd3513e5d19ee318e28 SHA512 2c7f3f8912ae6e80d7489daaaba9bd20bcffd83172250016cc0ef7813de55677d6dec1a5e5d0ab5a383983e5835c88866a1cc6ad79bd48d36eec8b1cdc7d5644
 EBUILD monadplus-1.4.2.ebuild 558 BLAKE2B 4810ff648de9dc07ddf0c05303d4acfccf6e754b9ccdca9f12811b28f22cf5556e2169be7e440deb0af0bf6223a3844b58f2f94afeeaa04823418a5983e93ba2 SHA512 21a04b0c99195a582cf70481f16536b0d3f8ff1c0c948a0bdbbcf40c7c86bf0f7a0f3b3fa142dd01a42df15a5d472c49837d16c5a736cdf7603eb2e0c2770681
 MISC metadata.xml 444 BLAKE2B 354899572a25bfc7a82bbb961b49723aa03a185ca5085c1d0d9c5171494863ef2ac71728fbe726e106fb62a7b7b2c647b3874e31f1b2dee0126814d9e97c8aa6 SHA512 157161275158f6defcfaafe8da19e18ee8a7b045e96f11c0d82e7431f4398b9187bc3152c9d8e58736aa340530bd09acfd7227e0d2aebc917f8fee7e0ef6c60b
diff --git a/dev-haskell/monadplus/files/monadplus-1.4.2-ghc-8.4.patch b/dev-haskell/monadplus/files/monadplus-1.4.2-ghc-8.4.patch
new file mode 100644
index 000000000000..feebd15b06b0
--- /dev/null
+++ b/dev-haskell/monadplus/files/monadplus-1.4.2-ghc-8.4.patch
@@ -0,0 +1,33 @@
+From 63978a11cc1a512e564237e83060e9aa29ebce73 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andr=C3=A9s=20Sicard-Ram=C3=ADrez?= <asr@eafit.edu.co>
+Date: Sun, 7 Jan 2018 23:52:32 -0500
+Subject: [PATCH] Added Semigroup instance.
+
+The instance was required by GHC 8.4.1-alpha1.
+---
+ src/Control/Monad/Plus.hs | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/src/Control/Monad/Plus.hs b/src/Control/Monad/Plus.hs
+index 25f4782..654d133 100644
+--- a/src/Control/Monad/Plus.hs
++++ b/src/Control/Monad/Plus.hs
+@@ -1,5 +1,5 @@
+
+-{-# LANGUAGE DeriveFunctor, DeriveFoldable, GeneralizedNewtypeDeriving #-}
++{-# LANGUAGE CPP, DeriveFunctor, DeriveFoldable, GeneralizedNewtypeDeriving #-}
+
+ -------------------------------------------------------------------------------------
+ -- |
+@@ -263,6 +263,9 @@ instance Category Partial where
+
+ instance Monoid (Partial a b) where
+     mempty  = mzero
++#if !MIN_VERSION_base(4,11,0)
+     mappend = mplus
+-
+-
++#else
++instance Semigroup (Partial a b) where
++  (<>) = mappend
++#endif
diff --git a/dev-haskell/monadplus/monadplus-1.4.2-r1.ebuild b/dev-haskell/monadplus/monadplus-1.4.2-r1.ebuild
new file mode 100644
index 000000000000..b5dbfd5ad984
--- /dev/null
+++ b/dev-haskell/monadplus/monadplus-1.4.2-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Haskell98 partial maps and filters over MonadPlus"
+HOMEPAGE="http://hackage.haskell.org/package/monadplus"
+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.10
+"
+
+PATCHES=("${FILESDIR}"/${P}-ghc-8.4.patch)