summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wright <gienah@gentoo.org>2012-09-15 07:48:36 +0000
committerMark Wright <gienah@gentoo.org>2012-09-15 07:48:36 +0000
commita987f4bbfe29f22ff4f49623e67f02cd952bc696 (patch)
treea08e8cb0dfd60d32df4d1b4e5b03880bf4048e54 /dev-haskell/readline
parentVersion bump. (diff)
downloadgentoo-2-a987f4bbfe29f22ff4f49623e67f02cd952bc696.tar.gz
gentoo-2-a987f4bbfe29f22ff4f49623e67f02cd952bc696.tar.bz2
gentoo-2-a987f4bbfe29f22ff4f49623e67f02cd952bc696.zip
Patch readline for ghc 7.6.1
(Portage version: 2.1.11.17/cvs/Linux x86_64)
Diffstat (limited to 'dev-haskell/readline')
-rw-r--r--dev-haskell/readline/ChangeLog6
-rw-r--r--dev-haskell/readline/files/readline-1.0.1.0-ghc-7.6.patch12
-rw-r--r--dev-haskell/readline/readline-1.0.1.0.ebuild14
3 files changed, 27 insertions, 5 deletions
diff --git a/dev-haskell/readline/ChangeLog b/dev-haskell/readline/ChangeLog
index 27f52e677911..5c7d1acfb671 100644
--- a/dev-haskell/readline/ChangeLog
+++ b/dev-haskell/readline/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-haskell/readline
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/readline/ChangeLog,v 1.2 2012/09/12 16:00:58 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/readline/ChangeLog,v 1.3 2012/09/15 07:48:35 gienah Exp $
+
+ 15 Sep 2012; Mark Wright <gienah@gentoo.org>
+ +files/readline-1.0.1.0-ghc-7.6.patch, readline-1.0.1.0.ebuild:
+ Patch readline for ghc 7.6.1
12 Sep 2012; Alexander Vershilov <qnikst@gentoo.org> readline-1.0.1.0.ebuild:
move dev-haskell/readline/readline-1.0.1.0.ebuild ebuild to mirror://hackage
diff --git a/dev-haskell/readline/files/readline-1.0.1.0-ghc-7.6.patch b/dev-haskell/readline/files/readline-1.0.1.0-ghc-7.6.patch
new file mode 100644
index 000000000000..96ad676a439f
--- /dev/null
+++ b/dev-haskell/readline/files/readline-1.0.1.0-ghc-7.6.patch
@@ -0,0 +1,12 @@
+--- readline-1.0.1.0-orig/System/Console/Readline.hsc 2007-11-06 02:25:00.000000000 +1100
++++ readline-1.0.1.0/System/Console/Readline.hsc 2012-09-15 17:30:53.690973810 +1000
+@@ -298,6 +298,9 @@
+ import Foreign.C.Types ( CInt, CChar, CFile )
+ import Foreign.C.String ( newCString, peekCString, withCString,
+ castCharToCChar, castCCharToChar )
++#if (__GLASGOW_HASKELL__>=705)
++import Foreign.C.Types(CInt(..))
++#endif
+ import GHC.Handle ( fdToHandle )
+
+ {-# CFILES HsReadline_cbits.c #-}
diff --git a/dev-haskell/readline/readline-1.0.1.0.ebuild b/dev-haskell/readline/readline-1.0.1.0.ebuild
index 06a1d50239e9..e9311150b173 100644
--- a/dev-haskell/readline/readline-1.0.1.0.ebuild
+++ b/dev-haskell/readline/readline-1.0.1.0.ebuild
@@ -1,13 +1,16 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/readline/readline-1.0.1.0.ebuild,v 1.2 2012/09/12 16:00:58 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/readline/readline-1.0.1.0.ebuild,v 1.3 2012/09/15 07:48:35 gienah Exp $
+
+EAPI=4
CABAL_FEATURES="haddock lib profile"
-inherit haskell-cabal
+inherit base haskell-cabal
-DESCRIPTION="Haskell interface to the GNU readline library"
-HOMEPAGE="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/readline"
+DESCRIPTION="An interface to the GNU readline library"
+HOMEPAGE="http://hackage.haskell.org/package/readline"
SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
LICENSE="GPL-2"
SLOT="0"
@@ -15,5 +18,8 @@ KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
DEPEND=">=dev-lang/ghc-6.4"
+DEPEND="${RDEPEND}"
CABAL_CORE_LIB_GHC_PV="6.8.1 6.8.2 6.8.3 6.10.1 6.10.2"
+
+PATCHES=("${FILESDIR}/${PN}-1.0.1.0-ghc-7.6.patch")