summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2012-05-13 15:56:28 +0000
committerSergei Trofimovich <slyfox@gentoo.org>2012-05-13 15:56:28 +0000
commit3476c6f370c0c521da830d71f0acadc11e7447b4 (patch)
treed254061dd7db3662f2bcb46e9f5e662a15721c84 /dev-haskell/gtk2hs-buildtools
parentfix homepage and src_uri wrt #415637 (diff)
downloadgentoo-2-3476c6f370c0c521da830d71f0acadc11e7447b4.tar.gz
gentoo-2-3476c6f370c0c521da830d71f0acadc11e7447b4.tar.bz2
gentoo-2-3476c6f370c0c521da830d71f0acadc11e7447b4.zip
Version bump (ghc-7.4 support)
(Portage version: 2.2.0_alpha101_p6/cvs/Linux x86_64)
Diffstat (limited to 'dev-haskell/gtk2hs-buildtools')
-rw-r--r--dev-haskell/gtk2hs-buildtools/ChangeLog11
-rw-r--r--dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.12.3-workaround-UName.patch19
-rw-r--r--dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.3-r3.ebuild28
3 files changed, 56 insertions, 2 deletions
diff --git a/dev-haskell/gtk2hs-buildtools/ChangeLog b/dev-haskell/gtk2hs-buildtools/ChangeLog
index c929a8b8f912..3260dbfd3186 100644
--- a/dev-haskell/gtk2hs-buildtools/ChangeLog
+++ b/dev-haskell/gtk2hs-buildtools/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for dev-haskell/gtk2hs-buildtools
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs-buildtools/ChangeLog,v 1.3 2011/06/21 11:02:16 hwoarang Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs-buildtools/ChangeLog,v 1.4 2012/05/13 15:56:28 slyfox Exp $
+
+*gtk2hs-buildtools-0.12.3-r3 (13 May 2012)
+
+ 13 May 2012; Sergei Trofimovich <slyfox@gentoo.org>
+ +files/gtk2hs-buildtools-0.12.3-workaround-UName.patch,
+ +gtk2hs-buildtools-0.12.3-r3.ebuild:
+ Version bump (ghc-7.4 support)
21 Jun 2011; Markos Chandras <hwoarang@gentoo.org>
gtk2hs-buildtools-0.12.0.ebuild:
diff --git a/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.12.3-workaround-UName.patch b/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.12.3-workaround-UName.patch
new file mode 100644
index 000000000000..cd8b66ac6d4f
--- /dev/null
+++ b/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.12.3-workaround-UName.patch
@@ -0,0 +1,19 @@
+diff --git a/c2hs/toplevel/Main.hs b/c2hs/toplevel/Main.hs
+index 47ddd0a..f921c8d 100644
+--- a/c2hs/toplevel/Main.hs
++++ b/c2hs/toplevel/Main.hs
+@@ -363,9 +363,11 @@ execute opts args | Help `elem` opts = help
+
+ preCompFile <- getSwitch preCompSB
+
+- unless (preCompFile==Nothing) $
+- preCompileHeader headerFile (fromJust preCompFile)
+- `fatalsHandledBy` ioErrorHandler
++ -- broken when .chs contains C preproc code:
++ -- http://www.mail-archive.com/gtk2hs-devel@lists.sourceforge.net/msg01160.html
++ -- unless (preCompFile==Nothing) $
++ -- preCompileHeader headerFile (fromJust preCompFile)
++ -- `fatalsHandledBy` ioErrorHandler
+
+ let bndFileWithoutSuffix = stripSuffix bndFile
+ unless (null bndFile) $ do
diff --git a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.3-r3.ebuild b/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.3-r3.ebuild
new file mode 100644
index 000000000000..f92d6178002f
--- /dev/null
+++ b/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.3-r3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.3-r3.ebuild,v 1.1 2012/05/13 15:56:28 slyfox Exp $
+
+# ebuild generated by hackport 0.2.13
+
+EAPI="3"
+
+CABAL_FEATURES="bin"
+inherit base haskell-cabal
+
+DESCRIPTION="Tools to build the Gtk2Hs suite of User Interface libraries."
+HOMEPAGE="http://projects.haskell.org/gtk2hs/"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ dev-haskell/alex
+ >=dev-haskell/cabal-1.8
+ dev-haskell/happy
+ >=dev-lang/ghc-6.10.1"
+
+PATCHES=("${FILESDIR}"/${P}-workaround-UName.patch)