Thanks to peanuts for reporting: unconditionally require x11-libs/wxGTK with opengl USE flag. Bump wxcore to 0.13.2.3.

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

5 files changed, 46 insertions, 37 deletions

diff --git a/dev-haskell/wxcore/ChangeLog b/dev-haskell/wxcore/ChangeLog
index b0e853c4922d..b0be879a6ec1 100644
--- a/dev-haskell/wxcore/ChangeLog
+++ b/dev-haskell/wxcore/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-haskell/wxcore
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wxcore/ChangeLog,v 1.4 2012/12/27 02:58:09 gienah Exp $
+# 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 $
+
+*wxcore-0.13.2.3 (13 Jan 2013)
+
+  13 Jan 2013; Mark Wright <gienah@gentoo.org>
+  +files/wxcore-0.13.2.3-ghc-7.6.patch, +wxcore-0.13.2.3.ebuild,
+  -files/wxcore-0.13.2.1-ghc-7.6.patch, -wxcore-0.13.2.1.ebuild,
+  wxcore-0.90.0.3.ebuild:
+  Thanks to peanuts for reporting: unconditionally require x11-libs/wxGTK with
+  opengl USE flag. Bump wxcore to 0.13.2.3.
 
 *wxcore-0.90.0.3 (27 Dec 2012)
 *wxcore-0.13.2.1 (27 Dec 2012)
diff --git a/dev-haskell/wxcore/Manifest b/dev-haskell/wxcore/Manifest
index a08b3b769319..119e5c96e9a4 100644
--- a/dev-haskell/wxcore/Manifest
+++ b/dev-haskell/wxcore/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX wxcore-0.13.2.1-ghc-7.6.patch 1868 SHA256 33a2b6fb391061903e3b98c3b86477f20015a4a538f5acb478fe0ec3a0018f8e SHA512 1d7368aa932b00e78e697fa9edd527ec4c773d570a8bbeeff383991b73fea5d35d93205e0aa60930042ef215da6cae647cd7031cbf62e05d53d93b442c448e16 WHIRLPOOL 91258305f5d4d86c5f8681115712279b5a5726bb7f96bcb7dc6b56a2ab8ea934ba0409b34b38247f68baf5bd7fbcffb80d0d6d854aedace586bc9112d927aa95
+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
-DIST wxcore-0.13.2.1.tar.gz 539205 SHA256 26a615a594f3733d79205dafd5e3e00649284c6b5a3dcd35b4db5fc1fb4e0d5c SHA512 53a48f503f2ac824963e82aed920218835bdb67531386415c1bdb6c2b34f421474eb8494222869d5dd5b1c45599832ab79500e05ccfbe37f0f0b2ea3a0292fa4 WHIRLPOOL 5f40753e30b7a4ebdb50f4ac713550a532d652ee2ef3dfb86411a97627f6f781d2c3180dcfd30a7d39e338592974dcead1dab54530fde040bc3267e0b23d0ecf
+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.1.ebuild 1075 SHA256 a0ed55c6bcf2dd801a63fdce44245ab9d333e0ed5062346b043174c39ce0c5b6 SHA512 15de95e8406dabcd5a356f4c5359b2d695c89113b6947604b1a7506d311b5f48145357030388fd8d1023d91e3bfd151a0ffd3908ea86dbfe3709c3cdd7d0170e WHIRLPOOL b1a307dea90df7a2a628c21ed0372deb5e0e32320bc060fe69bac814f03d6720695ac9de9ed7a43ccbe4049ed4d7569eb69a23620bdfd0356da123c6cd1847c0
-EBUILD wxcore-0.90.0.3.ebuild 1070 SHA256 de52183b62f4864ec4c114ad68603d24239c90dd8b8fb9bd550fc73dfc956893 SHA512 48f12d365c9494a78656227d8d1a8b27feb1a69e611e375e889753680df5a164f85d0adef8e4c7d7174708346d4477ab04a329673528d152ea3224d1ce329439 WHIRLPOOL 887b9d085c624677e765291e89ed8a3b9b2e6607a1fb31bd5571ee1042b32e05e0440e51ef6f3ed2c54b52719f4072f7afa444b4cd6739fe8272dfac68ba5c06
-MISC ChangeLog 1032 SHA256 05e7ac954960f0159f37d5eb1f33c46690211e63485a6771eb15aa977b03a7fb SHA512 9039af74f2013b6d21af54fd29d8a6d785d7325147747fbca1da7dc9b85ab8a5db5633776601d24164f0541869072c0328a7e1c291d6812085c053b28230a5d1 WHIRLPOOL 67b71f9955499f46dda85b8dff6943b40a879cd959d5161c3e470ac9440b2fdd88e90191e637e7eb036682c34e106cca351cd03c38ede9234f0b38c57551f7c4
+EBUILD wxcore-0.13.2.3.ebuild 1193 SHA256 6de50b1987071caf5476267c455e2f83b244ae97c9b774ee9fba1a4931c298e7 SHA512 abb8adc6cac908d6d424b1a24e958843b1911ff0d4260fa4b72b753f09825ba06f655ad9313a1e5428a2e0c050b4ee3275b38484c0e7b116460df29a6953f95c WHIRLPOOL 2d942964593904af4d79d5a4a623edfba4b0006397be0c89c54a3c9474233e94639e5df6acd93a5033187b472de691f1c89c45692bd58171df8119283f0d7af6
+EBUILD wxcore-0.90.0.3.ebuild 1128 SHA256 c1ecb9d1204bb2ad117e2efb7a3d5fcdecc501e438c1749026250b1793f55f25 SHA512 cd4e3fc43ec7ff54bd282161dcf66bfde95e3b4af2c9f991f994bdf072b1c8a35461ab36923ead50229e37f36e69d3eb83ff5fbae50a9c2771ebd0697b4d82d4 WHIRLPOOL ee67d73c7766db8d638d1057db55e129aa9ce426e59ef8544fb6f1f96396a7d59a5d8a60288998d38043f7abcaa2aa0ebd8bf1b88f785fdc2a5ff7170325153a
+MISC ChangeLog 1391 SHA256 c686980cad6ba8353d0210f1caaa1d9dc2aa8ded191593cea4a72d9f2eb77218 SHA512 54b694110ffb3081d58979863b28d231862de04347bd21766ad420ecd1aeb0a514c741af4b5874c03b76eb96c65fe753431206a77ef4b8e0ad71fa90837d2440 WHIRLPOOL da24c5dadfe7b6fbd939704040fdc69f377f65dd8fbb3f8604df9d18b4f3ff7baa3a456726ed30aca0ebe6f47fb468ff034c287d45d9b626b3c7ae8be00e6468
 MISC metadata.xml 529 SHA256 e7f417f44997fddc1b32333d105b714bee7aee16779ced1c63285627c15e0ccd SHA512 f4146bc6eb115a4e641db55093c80d60f7633c3141560ef14040f78d10e3784639bc15e9d350505e22aa40fc704ed6665dba28ff162b460ea6162246207cb1d7 WHIRLPOOL 33bcc59f549a5e14e90cc6fd8f894d5e795f8e60b65f2697234a623cdfd4cf65ef9202cbb82b5cd07665b1aac5bb3df6ac415334f22890047535de4f191bf18c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlDbuUcACgkQoBEVQmGOlx/1jgD/QIsGcy7SIvR+b9Mu6vkuzfEn
-a86CXgSl4SIU6FY5cJ8A/2d5yNKEueVEoIqG6+2PB6/v1wESa1TNy3VVlXY+3o7k
-=pj2T
+iF4EAREIAAYFAlDyoT4ACgkQoBEVQmGOlx8UbwEApKVWsaff/vyXveHx+UTskR1m
+zJyC/DdfJ+hSzsh5KIUBAI6s6Brdhzs8OCe3ogfXKMx3vKPEcxnIPM1UJDSkFMBr
+=P+9/
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/wxcore/files/wxcore-0.13.2.1-ghc-7.6.patch b/dev-haskell/wxcore/files/wxcore-0.13.2.3-ghc-7.6.patch
index efc2c7b97a2f..3d5adbea0904 100644
--- a/dev-haskell/wxcore/files/wxcore-0.13.2.1-ghc-7.6.patch
+++ b/dev-haskell/wxcore/files/wxcore-0.13.2.3-ghc-7.6.patch
@@ -1,23 +1,12 @@
---- wxcore-0.13.2.1-orig/wxcore.cabal	2012-02-07 18:27:09.000000000 +1100
-+++ wxcore-0.13.2.1/wxcore.cabal	2012-11-29 17:21:49.458155692 +1100
-@@ -209,7 +209,7 @@
-     build-depends:
-       array >= 0.2 && < 0.5,
-       base >= 4 && < 5,
--      containers >= 0.2 && < 0.5
-+      containers >= 0.2 && < 0.6
-   else
-     build-depends:
-       array >= 0.1 && < 0.3,
---- wxcore-0.13.2.1-orig/src/haskell/Graphics/UI/WXCore/Events.hs	2012-02-07 18:27:09.000000000 +1100
-+++ wxcore-0.13.2.1/src/haskell/Graphics/UI/WXCore/Events.hs	2012-11-29 17:21:49.458155692 +1100
+--- wxcore-0.13.2.3-orig/src/haskell/Graphics/UI/WXCore/Events.hs	2012-09-30 19:56:52.000000000 +1000
++++ wxcore-0.13.2.3/src/haskell/Graphics/UI/WXCore/Events.hs	2013-01-13 10:08:50.415293002 +1100
 @@ -1,4 +1,4 @@
 -{-# LANGUAGE ForeignFunctionInterface #-}
 +{-# LANGUAGE CPP, ForeignFunctionInterface #-}
  -----------------------------------------------------------------------------------------
  {-|	Module      :  Events
  	Copyright   :  (c) Daan Leijen 2003
-@@ -240,6 +240,9 @@
+@@ -241,6 +241,9 @@
  import Foreign.Marshal.Alloc
  import Foreign.Marshal.Array
  import Foreign.Marshal.Utils
@@ -27,8 +16,8 @@
  
  import Data.Char ( chr ) -- used in stc
  import Data.Maybe ( fromMaybe, fromJust )
---- wxcore-0.13.2.1-orig/src/haskell/Graphics/UI/WXCore/WxcTypes.hs	2012-02-07 18:27:09.000000000 +1100
-+++ wxcore-0.13.2.1/src/haskell/Graphics/UI/WXCore/WxcTypes.hs	2012-11-29 17:42:22.477244493 +1100
+--- wxcore-0.13.2.3-orig/src/haskell/Graphics/UI/WXCore/WxcTypes.hs	2012-09-30 19:56:52.000000000 +1000
++++ wxcore-0.13.2.3/src/haskell/Graphics/UI/WXCore/WxcTypes.hs	2013-01-13 10:08:50.420293137 +1100
 @@ -142,7 +142,12 @@
  
  import Data.Int
diff --git a/dev-haskell/wxcore/wxcore-0.13.2.1.ebuild b/dev-haskell/wxcore/wxcore-0.13.2.3.ebuild
index ac9c2ca759d1..6941e02da136 100644
--- a/dev-haskell/wxcore/wxcore-0.13.2.1.ebuild
+++ b/dev-haskell/wxcore/wxcore-0.13.2.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.1.ebuild,v 1.1 2012/12/27 02:58:09 gienah Exp $
+# $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 $
 
 EAPI=5
 
@@ -16,17 +16,18 @@ 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="opengl"
+IUSE=""
 
 RDEPEND="dev-haskell/parsec:=[profile?]
 		dev-haskell/stm:=[profile?]
 		>dev-haskell/wxdirect-0.12.1.2:${WX_GTK_VER}=[profile?]
-		>=dev-lang/ghc-6.10.4:=
-		x11-libs/wxGTK:${WX_GTK_VER}=[X,gstreamer,opengl?]"
+		<dev-haskell/wxdirect-0.90:${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.2"
 
-PATCHES=("${FILESDIR}/${PN}-0.13.2.1-ghc-7.6.patch")
+PATCHES=("${FILESDIR}/${PN}-0.13.2.3-ghc-7.6.patch")
 
 src_prepare() {
 	base_src_prepare
@@ -34,3 +35,8 @@ src_prepare() {
 		-i "${S}/Setup.hs" \
 		|| die "Could not change Setup.hs for wxdirect slot ${WX_GTK_VER}"
 }
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=splitbase
+}
diff --git a/dev-haskell/wxcore/wxcore-0.90.0.3.ebuild b/dev-haskell/wxcore/wxcore-0.90.0.3.ebuild
index 1160e775da6d..73bb26823ae9 100644
--- a/dev-haskell/wxcore/wxcore-0.90.0.3.ebuild
+++ b/dev-haskell/wxcore/wxcore-0.90.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wxcore/wxcore-0.90.0.3.ebuild,v 1.1 2012/12/27 02:58:09 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wxcore/wxcore-0.90.0.3.ebuild,v 1.2 2013/01/13 11:57:38 gienah Exp $
 
 EAPI=5
 
@@ -16,13 +16,13 @@ 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="opengl"
+IUSE=""
 
 RDEPEND="dev-haskell/parsec:=[profile?]
 		dev-haskell/stm:=[profile?]
-		>=dev-haskell/wxc-0.90.0.4:${WX_GTK_VER}=[opengl,profile?]
+		>=dev-haskell/wxc-0.90.0.4:${WX_GTK_VER}=[profile?]
 		>=dev-haskell/wxdirect-0.90:${WX_GTK_VER}=[profile?]
-		>=dev-lang/ghc-6.10.4:="
+		>=dev-lang/ghc-6.12.1:="
 DEPEND="${RDEPEND}
 		>=dev-haskell/cabal-1.2"
 
@@ -34,3 +34,8 @@ src_prepare() {
 		-i "${S}/Setup.hs" \
 		|| die "Could not change Setup.hs for wxdirect slot ${WX_GTK_VER}"
 }
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=splitbase
+}