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

[Sergei Trofimovich]

commit:     7872e19528754d72cbe55b6bd80e4ca9e91be094
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 20 20:49:31 2016 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Feb 20 20:49:44 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7872e195

dev-haskell/classy-prelude: fix build failure, bug #575244

mono-traversable-0.9.3 introduces it's own intercalate.

Reported-by: Toralf Förster
Bug: https://bugs.gentoo.org/575244

Package-Manager: portage-2.2.27

 dev-haskell/classy-prelude/classy-prelude-0.12.0.ebuild        |  4 ++++
 .../classy-prelude/files/classy-prelude-0.12.0-mt-0.9.3.patch  | 10 ++++++++++
 2 files changed, 14 insertions(+)

diff --git a/dev-haskell/classy-prelude/classy-prelude-0.12.0.ebuild b/dev-haskell/classy-prelude/classy-prelude-0.12.0.ebuild
index 84067ab..4199cbc 100644
--- a/dev-haskell/classy-prelude/classy-prelude-0.12.0.ebuild
+++ b/dev-haskell/classy-prelude/classy-prelude-0.12.0.ebuild
@@ -45,3 +45,7 @@ DEPEND="${RDEPEND}
 	test? ( >=dev-haskell/hspec-1.3
 		dev-haskell/quickcheck )
 "
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-mt-0.9.3.patch
+}

diff --git a/dev-haskell/classy-prelude/files/classy-prelude-0.12.0-mt-0.9.3.patch b/dev-haskell/classy-prelude/files/classy-prelude-0.12.0-mt-0.9.3.patch
new file mode 100644
index 0000000..17cddcd
--- /dev/null
+++ b/dev-haskell/classy-prelude/files/classy-prelude-0.12.0-mt-0.9.3.patch
@@ -0,0 +1,10 @@
+https://bugs.gentoo.org/575244
+diff --git a/ClassyPrelude.hs b/ClassyPrelude.hs
+index a6c0db4..27173aa 100644
+--- a/ClassyPrelude.hs
++++ b/ClassyPrelude.hs
+@@ -193,3 +193,3 @@ import Data.ChunkedZip
+ import qualified Data.Char as Char
+-import Data.Sequences hiding (elem)
++import Data.Sequences hiding (elem, intercalate)
+ import Data.MonoTraversable