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

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

[Sergei Trofimovich]

commit:     a02ea22bcca692fa252bbf4d15d4ffb456321a47
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 21 19:51:23 2015 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Sep 21 19:52:02 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a02ea22b

dev-haskell/shellish: tweak for ghc-7.10, bug #561028

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

Package-Manager: portage-2.2.20

 dev-haskell/shellish/files/shellish-0.1.4-ghc-7.10.patch | 9 +++++++++
 dev-haskell/shellish/shellish-0.1.4.ebuild               | 6 +++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/dev-haskell/shellish/files/shellish-0.1.4-ghc-7.10.patch b/dev-haskell/shellish/files/shellish-0.1.4-ghc-7.10.patch
new file mode 100644
index 0000000..c756635
--- /dev/null
+++ b/dev-haskell/shellish/files/shellish-0.1.4-ghc-7.10.patch
@@ -0,0 +1,9 @@
+diff --git a/Shellish.hs b/Shellish.hs
+index 1e3c192..0ac20c2 100644
+--- a/Shellish.hs
++++ b/Shellish.hs
+@@ -1,3 +1,3 @@
+ {-# LANGUAGE ScopedTypeVariables, DeriveDataTypeable, OverloadedStrings,
+-             MultiParamTypeClasses, FlexibleInstances #-}
++             MultiParamTypeClasses, FlexibleInstances, FlexibleContexts #-}
+ 

diff --git a/dev-haskell/shellish/shellish-0.1.4.ebuild b/dev-haskell/shellish/shellish-0.1.4.ebuild
index 86f421a..f93d879 100644
--- a/dev-haskell/shellish/shellish-0.1.4.ebuild
+++ b/dev-haskell/shellish/shellish-0.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -24,3 +24,7 @@ RDEPEND="dev-haskell/mtl[profile?]
 		>=dev-lang/ghc-6.10.1"
 DEPEND="${RDEPEND}
 		>=dev-haskell/cabal-1.6"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-ghc-7.10.patch
+}

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

[Sergei Trofimovich]

commit:     afc683ae6c02e67c26b7ed1126623d05185a655c
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  6 11:39:52 2016 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Nov  6 12:02:57 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afc683ae

dev-haskell/shellish: tweak for ghc-8

Package-Manager: portage-2.3.2

 dev-haskell/shellish/files/shellish-0.1.4-ghc-8.patch | 9 +++++++++
 dev-haskell/shellish/shellish-0.1.4.ebuild            | 3 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/dev-haskell/shellish/files/shellish-0.1.4-ghc-8.patch b/dev-haskell/shellish/files/shellish-0.1.4-ghc-8.patch
new file mode 100644
index 00000000..4952554
--- /dev/null
+++ b/dev-haskell/shellish/files/shellish-0.1.4-ghc-8.patch
@@ -0,0 +1,9 @@
+diff --git a/Shellish.hs b/Shellish.hs
+index 0ac20c2..7de0e11 100644
+--- a/Shellish.hs
++++ b/Shellish.hs
+@@ -180,3 +180,3 @@ test_s = path >=> liftIO . \f -> do
+   stat <- getSymbolicLinkStatus f
+-  return $ isSymbolicLink stat
++  return $ System.PosixCompat.Files.isSymbolicLink stat
+ 

diff --git a/dev-haskell/shellish/shellish-0.1.4.ebuild b/dev-haskell/shellish/shellish-0.1.4.ebuild
index f93d879..55236c9 100644
--- a/dev-haskell/shellish/shellish-0.1.4.ebuild
+++ b/dev-haskell/shellish/shellish-0.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -27,4 +27,5 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-ghc-7.10.patch
+	epatch "${FILESDIR}"/${P}-ghc-8.patch
 }