Bump gio to 0.13.0.4. Patch gio 0.13.0.3 and 0.13.0.4 for ghc 7.10, restore the KEYWORDS that ghc 7.8.4 has.

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 618E971F)

4 files changed, 58 insertions, 5 deletions

diff --git a/dev-haskell/gio/ChangeLog b/dev-haskell/gio/ChangeLog
index ca37378b774b..8eeb3340bbe5 100644
--- a/dev-haskell/gio/ChangeLog
+++ b/dev-haskell/gio/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-haskell/gio
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gio/ChangeLog,v 1.26 2014/12/13 13:56:21 gienah Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gio/ChangeLog,v 1.27 2015/01/03 10:32:11 gienah Exp $
+
+*gio-0.13.0.4 (03 Jan 2015)
+
+  03 Jan 2015; Mark Wright <gienah@gentoo.org>
+  +files/gio-0.13.0.4-ghc-7.10.patch, +gio-0.13.0.4.ebuild, gio-0.13.0.3.ebuild:
+  Bump gio to 0.13.0.4. Patch gio 0.13.0.3 and 0.13.0.4 for ghc 7.10, restore
+  the KEYWORDS that ghc 7.8.4 has.
 
 *gio-0.13.0.3 (13 Dec 2014)
 
diff --git a/dev-haskell/gio/files/gio-0.13.0.4-ghc-7.10.patch b/dev-haskell/gio/files/gio-0.13.0.4-ghc-7.10.patch
new file mode 100644
index 000000000000..43a2de3fbc4b
--- /dev/null
+++ b/dev-haskell/gio/files/gio-0.13.0.4-ghc-7.10.patch
@@ -0,0 +1,11 @@
+--- gio-0.13.0.4-orig/SetupWrapper.hs	2014-12-24 21:02:08.000000000 +1100
++++ gio-0.13.0.4/SetupWrapper.hs	2015-01-03 19:14:53.721416960 +1100
+@@ -18,7 +18,7 @@
+ 
+ import System.Environment
+ import System.Process
+-import System.Exit
++import System.Exit (exitWith, ExitCode(..))
+ import System.FilePath
+ import System.Directory
+ import qualified Control.Exception as Exception
diff --git a/dev-haskell/gio/gio-0.13.0.3.ebuild b/dev-haskell/gio/gio-0.13.0.3.ebuild
index fee806b22218..5b19cda0ea48 100644
--- a/dev-haskell/gio/gio-0.13.0.3.ebuild
+++ b/dev-haskell/gio/gio-0.13.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gio/gio-0.13.0.3.ebuild,v 1.1 2014/12/13 13:56:21 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gio/gio-0.13.0.3.ebuild,v 1.2 2015/01/03 10:32:11 gienah Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?]
@@ -29,3 +29,5 @@ DEPEND="${RDEPEND}
 	>=dev-haskell/gtk2hs-buildtools-0.13.0.3:0=
 	virtual/pkgconfig
 "
+
+PATCHES=("${FILESDIR}/${PN}-0.13.0.4-ghc-7.10.patch")
diff --git a/dev-haskell/gio/gio-0.13.0.4.ebuild b/dev-haskell/gio/gio-0.13.0.4.ebuild
new file mode 100644
index 000000000000..eaade2e79107
--- /dev/null
+++ b/dev-haskell/gio/gio-0.13.0.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gio/gio-0.13.0.4.ebuild,v 1.1 2015/01/03 10:32:11 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.4.9999
+
+#nocabaldep is for the fancy cabal-detection feature at build-time
+CABAL_FEATURES="lib profile haddock hoogle hscolour nocabaldep"
+inherit base haskell-cabal
+
+DESCRIPTION="Binding to the GIO"
+HOMEPAGE="http://projects.haskell.org/gtk2hs/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	dev-libs/glib:2
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18
+	>=dev-haskell/gtk2hs-buildtools-0.13.0.3:0=
+	virtual/pkgconfig
+"
+
+PATCHES=("${FILESDIR}/${PN}-0.13.0.4-ghc-7.10.patch")