Fix build failure against ghc-6.12 (bug #435128 by Vicente Olivert Riera).

(Portage version: 2.2.0_alpha133_p5/cvs/Linux x86_64)

5 files changed, 103 insertions, 3 deletions

diff --git a/dev-haskell/haskeline/ChangeLog b/dev-haskell/haskeline/ChangeLog
index f8127cdb599b..6da57ba427b6 100644
--- a/dev-haskell/haskeline/ChangeLog
+++ b/dev-haskell/haskeline/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-haskell/haskeline
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haskeline/ChangeLog,v 1.21 2012/09/12 15:45:34 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haskeline/ChangeLog,v 1.22 2012/10/23 10:51:57 slyfox Exp $
+
+  23 Oct 2012; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/haskeline-0.6.4.7-ghc-6.12.patch,
+  +files/haskeline-0.6.4.7-ghc-7.5.patch,
+  +files/haskeline-0.6.4.7-ghc-7.6.patch, haskeline-0.6.4.7.ebuild:
+  Fix build failure against ghc-6.12 (bug #435128 by Vicente Olivert Riera).
 
   12 Sep 2012; Alexander Vershilov <qnikst@gentoo.org> haskeline-0.6.2.2.ebuild,
   haskeline-0.6.4.0.ebuild, haskeline-0.6.4.6-r1.ebuild,
diff --git a/dev-haskell/haskeline/files/haskeline-0.6.4.7-ghc-6.12.patch b/dev-haskell/haskeline/files/haskeline-0.6.4.7-ghc-6.12.patch
new file mode 100644
index 000000000000..3e9adc61f61b
--- /dev/null
+++ b/dev-haskell/haskeline/files/haskeline-0.6.4.7-ghc-6.12.patch
@@ -0,0 +1,22 @@
+Workarounds build failure for ghc-6.12
+
+[18 of 27] Compiling System.Console.Haskeline.Backend.Terminfo ( System/Console/Haskeline/Backend/Terminfo.hs, dist/build/System/Console/Haskeline/Backend/Terminfo.o )
+
+System/Console/Haskeline/Backend/Terminfo.hs:200:9:
+    Inferred type is less polymorphic than expected
+          Quantified type variable `m' escapes
+              In the expression: Writer.tell
+                  In the definition of `output': output = Writer.tell
+diff --git a/System/Console/Haskeline/Backend/Terminfo.hs b/System/Console/Haskeline/Backend/Terminfo.hs
+index 1bd0373..d01e9ba 100644
+--- a/System/Console/Haskeline/Backend/Terminfo.hs
++++ b/System/Console/Haskeline/Backend/Terminfo.hs
+@@ -197,7 +197,7 @@ runActionT m = do
+     return x
+ 
+ output :: TermAction -> ActionM ()
+-output = Writer.tell
++output = \x -> Writer.tell x
+ 
+ outputText :: String -> ActionM ()
+ outputText str = posixEncode str >>= output . const . termText . B.unpack
diff --git a/dev-haskell/haskeline/files/haskeline-0.6.4.7-ghc-7.5.patch b/dev-haskell/haskeline/files/haskeline-0.6.4.7-ghc-7.5.patch
new file mode 100644
index 000000000000..086f05ba8336
--- /dev/null
+++ b/dev-haskell/haskeline/files/haskeline-0.6.4.7-ghc-7.5.patch
@@ -0,0 +1,45 @@
+--- haskeline-0.6.4.7-orig/haskeline.cabal	2012-05-14 04:29:12.000000000 +1000
++++ haskeline-0.6.4.7/haskeline.cabal	2012-06-30 22:20:29.154377863 +1000
+@@ -50,7 +50,7 @@
+     }
+     else {
+         if impl(ghc>=6.11) {
+-            Build-depends: base >=4.1 && < 4.6, containers>=0.1 && < 0.6, directory>=1.0 && < 1.2,
++            Build-depends: base >=4.1 && < 4.7, containers>=0.1 && < 0.6, directory>=1.0 && < 1.2,
+                            bytestring>=0.9 && < 0.11
+         }
+         else {
+--- haskeline-0.6.4.7-orig/System/Console/Haskeline/Monads.hs	2012-05-14 04:29:12.000000000 +1000
++++ haskeline-0.6.4.7/System/Console/Haskeline/Monads.hs	2012-06-30 22:21:34.478861860 +1000
+@@ -1,3 +1,4 @@
++{-# LANGUAGE CPP #-}
+ module System.Console.Haskeline.Monads(
+                 module Control.Monad.Trans,
+                 module System.Console.Haskeline.MonadException,
+@@ -18,7 +19,9 @@
+ 
+ import Control.Monad.Trans
+ import System.Console.Haskeline.MonadException
++#if !MIN_VERSION_base(4,6,0)
+ import Prelude hiding (catch)
++#endif
+ 
+ import Control.Monad.Reader hiding (MonadReader,ask,asks,local)
+ import qualified Control.Monad.Reader as Reader
+--- haskeline-0.6.4.7-orig/System/Console/Haskeline/MonadException.hs	2012-05-14 04:29:12.000000000 +1000
++++ haskeline-0.6.4.7/System/Console/Haskeline/MonadException.hs	2012-06-30 22:21:29.657752340 +1000
+@@ -1,3 +1,4 @@
++{-# LANGUAGE CPP #-}
+ {- | This module redefines some of the functions in "Control.Exception.Extensible" to
+ work for more general monads than only 'IO'.
+ -}
+@@ -18,7 +19,9 @@
+ 
+ import qualified Control.Exception.Extensible as E
+ import Control.Exception.Extensible(Exception,SomeException)
++#if !MIN_VERSION_base(4,6,0)
+ import Prelude hiding (catch)
++#endif
+ import Control.Monad.Reader
+ import Control.Monad.State
+ import Control.Concurrent(ThreadId)
diff --git a/dev-haskell/haskeline/files/haskeline-0.6.4.7-ghc-7.6.patch b/dev-haskell/haskeline/files/haskeline-0.6.4.7-ghc-7.6.patch
new file mode 100644
index 000000000000..f09a30ad5f5d
--- /dev/null
+++ b/dev-haskell/haskeline/files/haskeline-0.6.4.7-ghc-7.6.patch
@@ -0,0 +1,22 @@
+diff --git a/haskeline.cabal b/haskeline.cabal
+index 2fa8d2e..0f43bfe 100644
+--- a/haskeline.cabal
++++ b/haskeline.cabal
+@@ -50,7 +50,7 @@ Library
+     }
+     else {
+         if impl(ghc>=6.11) {
+-            Build-depends: base >=4.1 && < 4.7, containers>=0.1 && < 0.6, directory>=1.0 && < 1.2,
++            Build-depends: base >=4.1 && < 4.7, containers>=0.1 && < 0.6, directory>=1.0 && < 1.3,
+                            bytestring>=0.9 && < 0.11
+         }
+         else {
+@@ -102,7 +102,7 @@ Library
+         install-includes: win_console.h
+         cpp-options: -DMINGW
+     } else {
+-        Build-depends: unix>=2.0 && < 2.6
++        Build-depends: unix>=2.0 && < 2.7
+                         -- unix-2.3 doesn't build on ghc-6.8.1 or earlier
+         c-sources: cbits/h_iconv.c
+                    cbits/h_wcwidth.c
diff --git a/dev-haskell/haskeline/haskeline-0.6.4.7.ebuild b/dev-haskell/haskeline/haskeline-0.6.4.7.ebuild
index d3d6cc32ffb6..11ac6c6dca6c 100644
--- a/dev-haskell/haskeline/haskeline-0.6.4.7.ebuild
+++ b/dev-haskell/haskeline/haskeline-0.6.4.7.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haskeline/haskeline-0.6.4.7.ebuild,v 1.2 2012/09/12 15:45:34 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haskeline/haskeline-0.6.4.7.ebuild,v 1.3 2012/10/23 10:51:57 slyfox Exp $
 
 EAPI=4
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
+inherit base haskell-cabal
 
 DESCRIPTION="A command-line interface for user input, written in Haskell."
 HOMEPAGE="http://trac.haskell.org/haskeline"
@@ -25,3 +25,8 @@ RDEPEND=">=dev-haskell/mtl-1.1[profile?]
 		>=dev-lang/ghc-6.10.4"
 DEPEND="${RDEPEND}
 		>=dev-haskell/cabal-1.6"
+
+PATCHES=("${FILESDIR}/${PN}-0.6.4.7-ghc-7.5.patch"
+	"${FILESDIR}/${PN}-0.6.4.7-ghc-7.6.patch"
+	"${FILESDIR}/${PN}-0.6.4.7-ghc-6.12.patch"
+	)