commit:     29902db175cb8b0243388e7e46f6244281530c51
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 16 21:33:46 2017 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu Feb 16 21:57:08 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29902db1

dev-haskell/shelly: tweak for ghc-8.0.2

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-haskell/shelly/files/shelly-1.6.8.1-ghc-8.0.2_rc1.patch |  9 +++++++++
 dev-haskell/shelly/shelly-1.6.8.1.ebuild                    | 11 ++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/dev-haskell/shelly/files/shelly-1.6.8.1-ghc-8.0.2_rc1.patch 
b/dev-haskell/shelly/files/shelly-1.6.8.1-ghc-8.0.2_rc1.patch
new file mode 100644
index 0000000000..078f979fd0
--- /dev/null
+++ b/dev-haskell/shelly/files/shelly-1.6.8.1-ghc-8.0.2_rc1.patch
@@ -0,0 +1,9 @@
+diff --git a/src/Shelly/Pipe.hs b/src/Shelly/Pipe.hs
+index 7fe7d98..cc5668d 100644
+--- a/src/Shelly/Pipe.hs
++++ b/src/Shelly/Pipe.hs
+@@ -121,3 +121,3 @@ import Data.Text as T hiding (concat, all, find, cons)
+ 
+-default (T.Text)
++-- default (T.Text)
+ 

diff --git a/dev-haskell/shelly/shelly-1.6.8.1.ebuild 
b/dev-haskell/shelly/shelly-1.6.8.1.ebuild
index bffac6ca6e..ddb90b352c 100644
--- a/dev-haskell/shelly/shelly-1.6.8.1.ebuild
+++ b/dev-haskell/shelly/shelly-1.6.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -40,6 +40,15 @@ DEPEND="${RDEPEND}
                >=dev-haskell/text-0.11 )
 "
 
+PATCHES=("${FILESDIR}"/${P}-ghc-8.0.2_rc1.patch)
+
+src_prepare() {
+       default
+
+       cabal_chdeps \
+               'directory                 >= 1.1.0.0 && < 1.3.0.0' 'directory  
               >= 1.1.0.0'
+}
+
 src_configure() {
        haskell-cabal_src_configure \
                $(cabal_flag examples build-examples) \

Reply via email to