Bump wxcore to 0.90.1.1, loosen array dep in 0.13.2.3

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

5 files changed, 88 insertions, 10 deletions

diff --git a/dev-haskell/wxcore/ChangeLog b/dev-haskell/wxcore/ChangeLog
index b0be879a6ec1..19b750a5085b 100644
--- a/dev-haskell/wxcore/ChangeLog
+++ b/dev-haskell/wxcore/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-haskell/wxcore
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wxcore/ChangeLog,v 1.5 2013/01/13 11:57:38 gienah Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wxcore/ChangeLog,v 1.6 2014/03/23 15:03:49 gienah Exp $
+
+*wxcore-0.90.1.1 (23 Mar 2014)
+
+  23 Mar 2014; Mark Wright <gienah@gentoo.org>
+  +files/wxcore-0.90.1.1-ghc-7.5.patch, +wxcore-0.90.1.1.ebuild,
+  wxcore-0.13.2.3.ebuild:
+  Bump wxcore to 0.90.1.1, loosen array dep in 0.13.2.3
 
 *wxcore-0.13.2.3 (13 Jan 2013)
 
diff --git a/dev-haskell/wxcore/Manifest b/dev-haskell/wxcore/Manifest
index 119e5c96e9a4..b44bec91b4db 100644
--- a/dev-haskell/wxcore/Manifest
+++ b/dev-haskell/wxcore/Manifest
@@ -3,16 +3,19 @@ Hash: SHA256
 
 AUX wxcore-0.13.2.3-ghc-7.6.patch 1504 SHA256 72241f092cb0b9aecbbd4d1c85f4e34cbd61edc750f0b31ed60a7386113ef771 SHA512 8fec53e80fbeb9db5b00e35add5ec79b444657c11a9921de3eb795b6a5be0bc725fc15a67fc4c6da8f5ff1c1870dcf55fd5eb628ae5effc7828816dc995e4c6c WHIRLPOOL 3a17f17caf603de33f3ca17c74b8d6bcb32ff94a957b2e287e6aafb60b675683a7c8bb6bb7f80127db571e193de56925093711a1d2d32fd8c392f696b7b47b85
 AUX wxcore-0.90.0.1-ghc-7.5.patch 1094 SHA256 458013b272b17a9612775c2a8a8af972a7f92015465841d17a174c9b6e8241ec SHA512 9a36dd2f8ec920a4cb05dbc9f7b0e468a9611b20b5b4719aa786ec4fefcc85216d2a765dda6ca1fde68301e9be6bffef811c59cdb6b5f544a4eac6927bd63b2b WHIRLPOOL 372453af99645ee01af6f2d2fc46d87402f714fe6920691057c21945daa2acc5a3bd77fc66c7192ac70dafbd5d0bd8d0d904c3b6afdb6bb55cf7604c9f36b30f
+AUX wxcore-0.90.1.1-ghc-7.5.patch 732 SHA256 094a770e8aa098ad5a9c5b4dcc5df6ff484d22579c33d9cb0de23f082bef8370 SHA512 c1a0c5d5699e82bf25808072c521e34d4963fe1bf67da3c1fa196adc4adc5daf797d0054774c4a71726681673beda4fde83e350895880acbb0e9fdfd3a9a8417 WHIRLPOOL e2fa2b6c56f815432907c3b5c46cc9bb30f91fc0acde7925736dc680de6e96f244585c397aea1a8eddaa19a131f5b987604d3849b738adc39c045177833f186c
 DIST wxcore-0.13.2.3.tar.gz 539251 SHA256 e02aab9b0d1084c723fafaf759576cc7a4800d3112d0f99923e88f75cec8ee57 SHA512 9745819c35a1ff4a287a992e146126df1170cacc8702d4a647ec9a4a3ead0518f015a6068858e035b4e30c165c3b84bc5251cd27c554d3271a6fab02f107d264 WHIRLPOOL 13e68eeb85b23104349990d03bdde6010f0ee8c046ec350cf4921fb723fc7f7c0d99b5565e0c40241601b8a3d9561a239dabd305c8096480e858fbd0e4ebf015
 DIST wxcore-0.90.0.3.tar.gz 354646 SHA256 bcc6530a8c087248ab9404fc370e0fd8556d9d05c318780a1ff2a7cf4c86e934 SHA512 b9164b08720c21f2c256ff2b5cb4904a2f3e3342830472fac0c6cb66087972b913b9738ed759f9f24dd75a63a8360c79861478ac62b1ba158e3dffda977c0c0c WHIRLPOOL abda6d125c844797a657d116771db5d24d429b008f1b14c448299eb25536ed30bd8ae6662db59b77eea33bbe1750d3fc3876506d749ebbc2a8688e47f2de9ddd
-EBUILD wxcore-0.13.2.3.ebuild 1193 SHA256 6de50b1987071caf5476267c455e2f83b244ae97c9b774ee9fba1a4931c298e7 SHA512 abb8adc6cac908d6d424b1a24e958843b1911ff0d4260fa4b72b753f09825ba06f655ad9313a1e5428a2e0c050b4ee3275b38484c0e7b116460df29a6953f95c WHIRLPOOL 2d942964593904af4d79d5a4a623edfba4b0006397be0c89c54a3c9474233e94639e5df6acd93a5033187b472de691f1c89c45692bd58171df8119283f0d7af6
+DIST wxcore-0.90.1.1.tar.gz 358007 SHA256 f7b5a63d0d2fbaef6e8ffb9565ac30b347ece2efd0483dfe1e89ac839cdc46d5 SHA512 90f7f9c3520633e4b805aae4a166fa4f2737b5c00a59d5736bccea401f0ecb6f35addd113a617c19e45bd32e8eac0b362f8d9494b9fc63e2a091f36809b8e95a WHIRLPOOL fa40a1b39632ce6255c70915e2b9e48ad5f4ce11329d0c3571092de40217b6d4703796bc7f61e1c8c4cb66cad7fbef000eacf6d2ef0c5bd40d287a68d072faf3
+EBUILD wxcore-0.13.2.3.ebuild 1250 SHA256 b9ab74c2f7cad901c53c21ccd056d1626d26aea930132dd88240d3baf2f8f844 SHA512 2067559e12435b675515f505c0a3ad7d23510746ac1f5c8b721117cc645abe0c2b0bdcc22e585f1849070621abe020d72c83d0ff3a1b1876122d63f7c9470d0f WHIRLPOOL b08e58d8cfcfea5ea9c9979483320edc1ccbd07b1c432496169909ab240ff53125538ab8bde96210b75727e94ff014db7a9844ac6083fc5b91e6d6422f66c9e1
 EBUILD wxcore-0.90.0.3.ebuild 1128 SHA256 c1ecb9d1204bb2ad117e2efb7a3d5fcdecc501e438c1749026250b1793f55f25 SHA512 cd4e3fc43ec7ff54bd282161dcf66bfde95e3b4af2c9f991f994bdf072b1c8a35461ab36923ead50229e37f36e69d3eb83ff5fbae50a9c2771ebd0697b4d82d4 WHIRLPOOL ee67d73c7766db8d638d1057db55e129aa9ce426e59ef8544fb6f1f96396a7d59a5d8a60288998d38043f7abcaa2aa0ebd8bf1b88f785fdc2a5ff7170325153a
-MISC ChangeLog 1391 SHA256 c686980cad6ba8353d0210f1caaa1d9dc2aa8ded191593cea4a72d9f2eb77218 SHA512 54b694110ffb3081d58979863b28d231862de04347bd21766ad420ecd1aeb0a514c741af4b5874c03b76eb96c65fe753431206a77ef4b8e0ad71fa90837d2440 WHIRLPOOL da24c5dadfe7b6fbd939704040fdc69f377f65dd8fbb3f8604df9d18b4f3ff7baa3a456726ed30aca0ebe6f47fb468ff034c287d45d9b626b3c7ae8be00e6468
+EBUILD wxcore-0.90.1.1.ebuild 1294 SHA256 fe4f6c712e6457c6eef0cd16239711d58f216e93e6646a92ddebe62ea424e55d SHA512 1748a811a0d5364f37296d1e5a3a8a4c5863977fb6b5674235ca419306c0d78b9e14d59925bb755a897df2b8d5dff97121c87a72fe13a2d6b8a2a14b2f490932 WHIRLPOOL f1ea3772338d1dc8849a11a4c7036b77486a22c3df5a7f37fe3ff510e2639c8397b906c5926239731b6b824e73003e0b211115004e3577ef3deb42a1e435580d
+MISC ChangeLog 1618 SHA256 9cc9decdac5fd78e3925454e728d785ecb3ef31b25aa11d95655e80a58897f2a SHA512 b7ce3edc8d3e2bd863f1fbabcd113ec966aef461840fb758b8d5d4a490a84a15a8655ffd556d499316e06559f04e9bdad6101adc1bcfc967a6507394839a48a3 WHIRLPOOL 9a15eafa9f6b283a94ed0d7fb19f0bba2ea23253ae774bf6ccfa40a461c68678f8b35c9b3ae5e60a142061c134a220edcb39894181356e2594179ceaf486c2c3
 MISC metadata.xml 529 SHA256 e7f417f44997fddc1b32333d105b714bee7aee16779ced1c63285627c15e0ccd SHA512 f4146bc6eb115a4e641db55093c80d60f7633c3141560ef14040f78d10e3784639bc15e9d350505e22aa40fc704ed6665dba28ff162b460ea6162246207cb1d7 WHIRLPOOL 33bcc59f549a5e14e90cc6fd8f894d5e795f8e60b65f2697234a623cdfd4cf65ef9202cbb82b5cd07665b1aac5bb3df6ac415334f22890047535de4f191bf18c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlDyoT4ACgkQoBEVQmGOlx8UbwEApKVWsaff/vyXveHx+UTskR1m
-zJyC/DdfJ+hSzsh5KIUBAI6s6Brdhzs8OCe3ogfXKMx3vKPEcxnIPM1UJDSkFMBr
-=P+9/
+iF4EAREIAAYFAlMu99wACgkQoBEVQmGOlx9YuAD/XzIelg2338SODyt4K6SRut2G
+zwzhGcBPWC0CB/o5G3EA/R9ih46bE8J7eu0ySZzQRS2O8AouRSkQUbG3vljAy2zy
+=+FzO
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/wxcore/files/wxcore-0.90.1.1-ghc-7.5.patch b/dev-haskell/wxcore/files/wxcore-0.90.1.1-ghc-7.5.patch
new file mode 100644
index 000000000000..ee2405dce90e
--- /dev/null
+++ b/dev-haskell/wxcore/files/wxcore-0.90.1.1-ghc-7.5.patch
@@ -0,0 +1,18 @@
+--- wxcore-0.90.1.1-orig/src/haskell/Graphics/UI/WXCore/Events.hs	2014-03-23 08:01:17.000000000 +1100
++++ wxcore-0.90.1.1/src/haskell/Graphics/UI/WXCore/Events.hs	2014-03-23 17:05:26.428738461 +1100
+@@ -1,4 +1,4 @@
+-{-# LANGUAGE ForeignFunctionInterface #-}
++{-# LANGUAGE CPP, ForeignFunctionInterface #-}
+ -----------------------------------------------------------------------------------------
+ {-|	Module      :  Events
+ 	Copyright   :  (c) Daan Leijen 2003
+@@ -248,6 +248,9 @@
+ import Foreign.Marshal.Alloc
+ import Foreign.Marshal.Array
+ import Foreign.Marshal.Utils
++#if (__GLASGOW_HASKELL__>=705)
++import Foreign.C.Types(CInt(..))
++#endif
+ 
+ import Data.Char ( chr ) -- used in stc
+ import Data.Maybe ( fromMaybe, fromJust )
diff --git a/dev-haskell/wxcore/wxcore-0.13.2.3.ebuild b/dev-haskell/wxcore/wxcore-0.13.2.3.ebuild
index 6941e02da136..36fc6f67d39b 100644
--- a/dev-haskell/wxcore/wxcore-0.13.2.3.ebuild
+++ b/dev-haskell/wxcore/wxcore-0.13.2.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wxcore/wxcore-0.13.2.3.ebuild,v 1.1 2013/01/13 11:57:38 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wxcore/wxcore-0.13.2.3.ebuild,v 1.2 2014/03/23 15:03:49 gienah Exp $
 
 EAPI=5
 
@@ -34,6 +34,8 @@ src_prepare() {
 	sed -e "s@wxdirect@wxdirect-${WX_GTK_VER}@g" \
 		-i "${S}/Setup.hs" \
 		|| die "Could not change Setup.hs for wxdirect slot ${WX_GTK_VER}"
+	cabal_chdeps \
+		'array >= 0.2 && < 0.5' 'array >= 0.2'
 }
 
 src_configure() {
diff --git a/dev-haskell/wxcore/wxcore-0.90.1.1.ebuild b/dev-haskell/wxcore/wxcore-0.90.1.1.ebuild
new file mode 100644
index 000000000000..82fac84c12d5
--- /dev/null
+++ b/dev-haskell/wxcore/wxcore-0.90.1.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wxcore/wxcore-0.90.1.1.ebuild,v 1.1 2014/03/23 15:03:49 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.6.9999
+
+WX_GTK_VER="2.9"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit base haskell-cabal wxwidgets
+
+DESCRIPTION="wxHaskell core"
+HOMEPAGE="http://haskell.org/haskellwiki/WxHaskell"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="wxWinLL-3.1"
+SLOT="${WX_GTK_VER}/${PV}"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/parsec:=[profile?]
+	dev-haskell/stm:=[profile?]
+	>=dev-haskell/wxc-0.90.1.0:${WX_GTK_VER}=[profile?]
+	>=dev-haskell/wxdirect-0.90.1.0:${WX_GTK_VER}=[profile?]
+	>=dev-lang/ghc-6.12.1:=
+	x11-libs/wxGTK:${WX_GTK_VER}=[X,gstreamer,opengl]
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8.0.2
+"
+
+PATCHES=("${FILESDIR}/${PN}-0.90.1.1-ghc-7.5.patch")
+
+src_prepare() {
+	base_src_prepare
+	sed -e "s@wxdirect@wxdirect-${WX_GTK_VER}@g" \
+		-i "${S}/Setup.hs" \
+		|| die "Could not change Setup.hs for wxdirect slot ${WX_GTK_VER}"
+	cabal_chdeps \
+		'array >= 0.2 && < 0.5' 'array >= 0.2'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=splitbase
+}