[gentoo-commits] repo/gentoo:master commit in: dev-haskell/monadplus/files/, dev-haskell/monadplus/

[gentoo-commits] repo/gentoo:master commit in: dev-haskell/monadplus/files/, dev-haskell/monadplus/

[Sergei Trofimovich]

commit:     7f1b0fd76c276928b614a10e6e8cdba405c76722
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 14 19:32:42 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Dec 14 19:39:44 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f1b0fd7

dev-haskell/monadplus: bump up to 1.4.2-r1

Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 .../monadplus/files/monadplus-1.4.2-ghc-8.4.patch  | 33 ++++++++++++++++++++++
 dev-haskell/monadplus/monadplus-1.4.2-r1.ebuild    | 26 +++++++++++++++++
 2 files changed, 59 insertions(+)

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 00000000000..feebd15b06b
--- /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 00000000000..b5dbfd5ad98
--- /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)