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.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x618E971F

5 files changed, 66 insertions, 10 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/Manifest b/dev-haskell/gio/Manifest
index cfbe2d889ab8..3101aefa8506 100644
--- a/dev-haskell/gio/Manifest
+++ b/dev-haskell/gio/Manifest
@@ -2,24 +2,27 @@
 Hash: SHA256
 
 AUX gio-0.12.3-ghc-7.6.patch 944 SHA256 4afa5ca50cccf40173f1934f7a6b5b70b3cd76c43ce5d662262ea1829f16318f SHA512 86e2809d1acea8a7dfb71939e4085c4bdb7023a690e153bec3f4b2cf487d7775d4b00cb142431bb64ae4c793d648bea8ce12ac2822cbf3e6d05d8bd9a09c1bde WHIRLPOOL 1f86eceec48adda7072b96d4a5f28cab3b7a085e5b73eac7cff9560a65bce5914c9c7e66440656132befdb1a534fc63468280e83f302e657281a451b721c9a43
+AUX gio-0.13.0.4-ghc-7.10.patch 376 SHA256 d6b7ec19ca2e4b835685746a72a977ce3d58a7a047db0668dda1d3e61cffcc6b SHA512 6cc27778bb1740a407a2e5906bf25e354594d32f761dce6e52aeed5ae43061bbebbbdc4f4d3e17645d4fb49b8a2363c2b5b35ef1e33b0858fbe0e618a56d7bcd WHIRLPOOL f4cd8b0258772b6f3a14001098f319b2dc9e7447fb5b7e2ccfcd738e3c65c9ac74343b5f676d97689226bb1d54c41545fc209a758684116174808a91867de0b7
 DIST gio-0.12.0.tar.gz 76629 SHA256 2c3c60a63251d08c35abae6fe22c04de585f54e07f8a97d1f1835d42e6f3b25c SHA512 0accc2496dd93456a47fc767ce3472d5858aed27239c0a9712051a06974c99473a5654c20b42c8e314e21342745261ddaeeb42cc4d104b1aa16644e35aa01104 WHIRLPOOL 69219777af316ef92abf2038824e32650ea6b596d5f05bc16deb87c40e3eb091297133d52219c0ad4fadda2ac2deac6042aa29f0870bf9b76bac8e775baea9ec
 DIST gio-0.12.3.tar.gz 77997 SHA256 56aa7cd4d48486ce895fadba0113abc68a5f188bafccb200d448f2fe68a3b84e SHA512 8bd895dd5607679cbb6a7e82d5055e1c347bb75f152f21f9bd27feb59d01abcc419ea3abd6a87e4878318b9cffbd8b742c89def648c0605f3245eb40b2d94c0b WHIRLPOOL 77c931e4fbac05f4b0cbe0a0a6d7592654d73fc2f3b8522c9a0ca87bb91c031295401bcc4b79b93ffc6fad3b0956a037a7c82b5c831015e6e19999fe1492b174
 DIST gio-0.12.4.tar.gz 77980 SHA256 3efe74e15c2df03fcf390d37879e91f88dbd93257ae79900f88989f3cfc1fb5a SHA512 81062cbc41f01de20c82ba59b01e6711865e709864ebf9991cb339ea7317aea3286d0d82ed8ddf36556330e8b7e4cb266f7ba304a370d53b4197dfe0334c7425 WHIRLPOOL a8606fb2084efd3631678de8b999e380d4ffde34db47131d8c8d4faa91fbe8933fe030b4fa8558ee816ef04f9cb862f34b2a82222c84a123abac334bd79cf32e
 DIST gio-0.12.5.0.tar.gz 78901 SHA256 28753dea657e910609056d2eaf210b71e706f3bbe551cfe190fbe93e601bef21 SHA512 906121886b4756ba615680af58cd14019630a3f2d3282ad7fa46315be2db99b7793495bb1676760295c1ebde78699c3f131b2ae85f53d959bff92a6804c229bf WHIRLPOOL 45c676d2f914f2e378f1708852bb64b1f144ea881d2e60a33714c28da4e253948f1b2c8d72b6352fb3fe7ca31dbbda513f627848de72df22dc5d2bb6c591f381
 DIST gio-0.12.5.3.tar.gz 79099 SHA256 8cfbfe99d3c019d8f804717ebaefdbe6bccc95238b83e9ea0a1c8c0a548d3ad9 SHA512 51a72df085091847967ddf37e707a479c055a1e39f81edd1a302f2bbc2f1a4214fd9ea82bafd5a32f5e045944fcfa64c6ba6427481acee820280456ae80f413f WHIRLPOOL 755aeb6cd8b5a7a1d3d438c79c1ea579fbbb5d63afea391dd60bc36c1371c26718443872483b5ab07886c34d266cb2e7c3507007694edf23f261ed396b960136
 DIST gio-0.13.0.3.tar.gz 79391 SHA256 c5e915a1d718349832a634d3127a206a1abdebdf851443b4dcf78568a42c0294 SHA512 231c7e8096351329b1a293a34e4f0da0887bf9d44b12a3506e270dd5aa5f5ad0f6de91f81c011274ffefde9d5f7a47476c4df63769d5fcd6ee89a0f4653adcfc WHIRLPOOL 7b01e6958d4c8789bb104b46797700cff4fd71dbaf62f398922a56b11c0b999e04195acfdcf8ac0359c734c746ec5ff9f666af027f7a3d593665ea9779fdb951
+DIST gio-0.13.0.4.tar.gz 79430 SHA256 4a36b8e183660f8c093c99ec198021c630cc51bf31d7c7267a6fb2fc28e556bc SHA512 1a7b5d3120eea078ca37b8a286cd03f44cb869f74cf99b69d3e2c3ed1ae720cf6e34986b61aa8d90183d2342acf35763a48dd2dc56e3489187bfb3b6fca8bc2d WHIRLPOOL 0fa99cb172dbf62d78e23dfbc91ecbb2332c40ebbc0c0450b5afcebbeaa006a044c6b0e97bc5d918eac9efb65127312c82aafbb34f59d98ea4e04c32df6fb3f4
 EBUILD gio-0.12.0.ebuild 800 SHA256 a440d7669d83dd72bc432ff72aad8dc37e633e4ddb5ee4474141816348643736 SHA512 a478ad52698d01b6d00b781dabc5505c2ed5ab0aa6c2651c8466311a2c165cd0e92f03e6fd8f2bbe30845b916cf7790568e8d7c08569129ec897f11b360e6315 WHIRLPOOL 6fe2845e6358c9858b3eb07402b1431579c2eba72fbd3db1826b39a014f631cca12250b26da3bc73a6877409b16d225e71ec6c0293828c57fc25b98183aa5334
 EBUILD gio-0.12.3.ebuild 1043 SHA256 c4ab750b79cf56c8c33280dac5bcaf333718d49d3bf27901692280548a4f91ca SHA512 afcb07ab738e58fbe3ffc82c143ff7f88c7948a9eda9d7a64815f8f2e912db37cc52c593ad78f44c028072003034bc1dc5894ec22eaad76d82e98ac5bbe95275 WHIRLPOOL 59ae0548ad5634596e9758cce79f641950b6b68473540e2a5be25b7143703aa753d54dd383dc300da7b7986765f661b627eadbfd20eb0d3f1ee12b993f6e4358
 EBUILD gio-0.12.4-r1.ebuild 952 SHA256 39134548843b7900b4b88c5b572fce64bd524295d08215ac5044c2ac935a1200 SHA512 daf2080e838d3f12b4ee11554a6bba9f3ce03f47b3f49a71628e4efb2f753fc328b2190b699bc51bd06f13bbc0d733b0749f5988971f4342d73a49449a97f9f8 WHIRLPOOL c06456d3e5cfbed54e21b814452fc582f4e127f47200f8adb23d319c6935b3ad511026bb453a9aae8a6244c3c8f53e556105897d2f7ee4e0f4ef951bccc60bc8
 EBUILD gio-0.12.5.0-r1.ebuild 918 SHA256 426cbdb1f1715070d5cd9d84549c7648005ede5916137d092ad3c58e7e75eb0f SHA512 87037a3a9bfc179227b351e19f872164da09887bd347efc0c5f15f8802328b5cdb8acdc967e9f59f475f083df2a36202b2486ed0ac4950e582e96f4d4222b0fa WHIRLPOOL 1a8a7ffc6765b319d1f070345fb3f27a962ac04dc3bf2e6aee83f0aac26eb8f0df766e71fed860fa19d38fed86aa5aac504795517ed34c87e69fa3ebfeefce68
 EBUILD gio-0.12.5.3.ebuild 917 SHA256 3d5ba7afbfe889f712af6634dbae8c144ad64c61fe3fede01932239ffb898c7a SHA512 f9b03a3ebf651db2c151ab6cc909371f312895777ee6044b19e978857ccdbfe3982c69d9a96d0707dc91e747a708f7ddf3e86deeabdfee30252c0816c69b8321 WHIRLPOOL 9f4889cfa0a94acd2aa6c70de7c3777b5665da94770847bbdc7b31408f3a8c830f0e4b021c8f53f42af34cace6a25d01ce740f62fc2838f5b1e92c0e586f41c3
-EBUILD gio-0.13.0.3.ebuild 905 SHA256 b4f7a713bcbe3870eb084bda830e6d8a1eede7305d475c4e9be7d45be097b1bc SHA512 820a1ccc645a339ae68e45a589cc1d532408b47202eb7e211bc4c43721df6e46e4b702dec7fad46fb6bb016d0f48075d960e1c419e3c9d8b72fc62e31452c9e0 WHIRLPOOL 7f0692af79bd8132493f3bfd1600da606d3ae7c309284f72e43a68c3a53bdca18fcc815a6ea2a64ab4f6c3ec2bf2dd2d3c80a33d92ec0392dcc7cbdeb8fbc13a
-MISC ChangeLog 3568 SHA256 da62d8d01703d4594c74fb130671a368426fe7a65e32158c1c63aae822a10a3e SHA512 7a1265b3bca96673299284a74cb68c7f9072a190db2bde1a7eae2cec30c6d964d77eaefb5cdac0e9942f77cce188765bc00043330ea0d4705465a812cd119380 WHIRLPOOL f6bb99b3d12008cc286e5b96ec71851e93b213ec356ac9e79bb1117e5e99a108a67a32b344ec87471d864e7189060ae742046158aeaa27d1d2b67b7e7c58bb51
+EBUILD gio-0.13.0.3.ebuild 986 SHA256 8402a50b661adaa12a653a4ec62617f1ef396a29947cdc38e5e217066f399545 SHA512 c78e4e62cf9888ccf0f25df698d45b4e07eb98b8eda81aa7134149e21c2e2e63281a1c1c3c33bacbdfda9aa2ffad325e9b4e04ea401947df6d5964053240a93c WHIRLPOOL 889e3ec852f842265039eba66595b14b5fbe0878f83db257dc2e3f20b8e02ed130979787c33d18c656934ea1a1e5ba18dbef28a4272a3edb1ff7a330e568c8e4
+EBUILD gio-0.13.0.4.ebuild 991 SHA256 10e577a91133c146aef8f448e0e5ee89b26e8aa70b7fca153e6436222864b0df SHA512 c7b9041e4ea3556c183d20d941909ae2decfcf61212d958927d76f91035aab6ac1e29f9b0ced897bc992fb7fba1f9575b414842be1400e0db0dfb75219f8d007 WHIRLPOOL 70f4f9ea3a1093e64f26d224206e1f685c80c6d6fe203bfdcf9b4244bc621d5c175621b778605ca3b82d81b79f1441239478e4a6fdb8d5831ea51a7f4a2b200e
+MISC ChangeLog 3839 SHA256 90655079c2cd1b2f721a5d90e7c7e20f002b37188a04aea6f9700a62c4360563 SHA512 78a955c083fab36341e20bae1a48a37c53019c70c9bb6b740e18c52efbca1a3f497fd5b3b90ee88006c9afadeb693704082022d9626b4aafb902e37bf2ab6d51 WHIRLPOOL 710c3f6c2746cf74a58a81cc5c3d6687df85b822ff5445ed082b6243be6efd4eb4f7a0a0dd5a429d83270b54a316508ec378314cf71243853c56aa679431455d
 MISC metadata.xml 597 SHA256 af94818f001b1a2a562c03882397c8ef036eefac2ba49e373287249e3706347c SHA512 9aa121ce176c40342312a49b753e47bfed40688b1349ddd4039ef1bb4de3fdca9adbd8d26b72b9fe761041e9544f91c687ba361fbbf9c09be06738dcafe3944d WHIRLPOOL ed0ab5197bac1aeb68d55d6495cd7bc56a3748ec5ced4e8f91bf680f92685e40c4dc6415963d8493aa6a4e6910dc75cffc066e9709275cb9ae339eafcaa10829
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlSMRYoACgkQoBEVQmGOlx/DQgEAn3oFXGNHjiP02TAhyGAHg5mN
-ARNi6WfjFvbZxrTLveAA/3f0oyurmWpiFmEP7KClXmHQnE5xdPr2fVlLKp9Kzf4f
-=bZKc
+iF4EAREIAAYFAlSnxTIACgkQoBEVQmGOlx+xWAD/d+X+reT9el4v/7PN/iFFS3L/
+ysRabCDSvItS+AWebAYA/Rzv0Wy+lzqKKSp5akWR8leOwlzIa+W4sBzFKPvixMxj
+=4Hrx
 -----END PGP SIGNATURE-----
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")