Bump wxdirect to 0.13.1.2 and 0.90.0.1, fixes Bug 424073 - dev-haskell/wxdirect-0.12.1.3: fails to build.

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

8 files changed, 229 insertions, 32 deletions

diff --git a/dev-haskell/wxdirect/ChangeLog b/dev-haskell/wxdirect/ChangeLog
index a4039eece9c8..ad584d572899 100644
--- a/dev-haskell/wxdirect/ChangeLog
+++ b/dev-haskell/wxdirect/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-haskell/wxdirect
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wxdirect/ChangeLog,v 1.4 2012/12/06 22:54:59 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wxdirect/ChangeLog,v 1.5 2012/12/27 02:55:18 gienah Exp $
+
+*wxdirect-0.13.1.2 (27 Dec 2012)
+*wxdirect-0.90.0.1 (27 Dec 2012)
+
+  27 Dec 2012; Mark Wright <gienah@gentoo.org>
+  +files/wxdirect-0.13.1.2-ghc-7.6.patch,
+  +files/wxdirect-0.90.0.1-ghc-7.5.patch, +wxdirect-0.13.1.2.ebuild,
+  +wxdirect-0.90.0.1.ebuild, -wxdirect-0.12.1.3.ebuild, metadata.xml:
+  Bump wxdirect to 0.13.1.2 and 0.90.0.1, fixes Bug 424073 - dev-
+  haskell/wxdirect-0.12.1.3: fails to build.
 
   06 Dec 2012; Sergei Trofimovich <slyfox@gentoo.org> wxdirect-0.12.1.3.ebuild:
   Get rid of 'dev-haskell/time' depend as it's a ghc's core library.
diff --git a/dev-haskell/wxdirect/Manifest b/dev-haskell/wxdirect/Manifest
index f2b22642edbe..053c1330a8c9 100644
--- a/dev-haskell/wxdirect/Manifest
+++ b/dev-haskell/wxdirect/Manifest
@@ -1,14 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST wxdirect-0.12.1.3.tar.gz 33730 SHA256 da59315339dc78b3bfbe08c1681d53c74a56e7c3de0f41a90099bd289b1bfb11 SHA512 cb1af8014a4959b8676df205e7b32f8beeb8728243d8597c498200409612f70705c1cc4d841834acaf35208550e4535726ac5386511906e6bedcfff0c8d6c7e8 WHIRLPOOL 68f4e2a73034768a413f13dfdb895628165c67de39ce12ff2d9f8cab809c38dd8bc8c32511ffa4da5c437c5176968ea16780779aa3d9e6a0d08d81d5efe7aa99
-EBUILD wxdirect-0.12.1.3.ebuild 634 SHA256 a4624864f2975c286a33a795c0d4969348a55cb3af99b1cd82390e62e7780c29 SHA512 55c3a6d0a223c79e4109c27a5f77355cfa3fb2b1e23b066b9c3aa339c47536cf0f716b4ac84d7e58f96c3f952a960c16caccbbe4edf44d82915665c7131992a4 WHIRLPOOL d55a9568cebf9e67edb3beb8e80dd889f2f7cd1268873c1f882df1f059873e73bf4a802a349720e2e25f11b104db6d7d4b89862177783f6a8fddbc5978ee36fd
-MISC ChangeLog 935 SHA256 6a19160b734c8ad11c1718f4c2a972dabc5ae872571472390ef02faf4d29ddc3 SHA512 22d7f2a68e72edb95e132a1924ec9bc81f0591cefd2847091a2da06b20e33fda6b7ba14c241eb97497b345abe6e6492993451e49757ff34f6070e2a99532735c WHIRLPOOL 6a0079e3cf01be54304715fe3aed2f39f3c88c7568c7e2179832a77702a62458747035aadeaab167b5d688f2d0cb608a87cb7b44cf757c12e1bf694225d5c487
-MISC metadata.xml 223 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508 SHA512 24765bbf1cb187cd262aa7fb3824c1cec65e2bf3f2198099de688916d96401a26458265b15408f22b1fbd6d6a2842df814a57ceda80dfa00d130b24423b7544f WHIRLPOOL 8fd6700f6198db6540eb51edf11372faeb6eb8a542a692e515badf236f62444f2c180f7d08e0f98e9fdfa23de14631b31af50543469aaa27084d6b637e2644c7
+AUX wxdirect-0.13.1.2-ghc-7.6.patch 3208 SHA256 b95e0f4bda37b7549ba82f93131425076f0b3c9fce6463122087caf8b74824d0 SHA512 3d4c4c25ef8d6b3be5287f7b0ffb326400ec4dda7c63689801bf95f386d16ce0921d8cd88c8342b6f27b6f17ebadb626dad434c3a2e22be28d11885c132ee6bd WHIRLPOOL 426381e358f1f53042e4016fdbede77d1e6cbf2b3b1d28aa6a846c131dc38c541932212ca07e39ef0f792253fc08dd1d0e4f64103382f4fef0eb61d36fbe0d70
+AUX wxdirect-0.90.0.1-ghc-7.5.patch 2168 SHA256 26770159da0a50c5d1fa3b4f603029b38bfd2f208680c769ef09287729ff223d SHA512 eb091e7e8a3421c68f8dbe0dfcede0907dec027ab5c4efa11541db4b63bf4919e5baadf6559ba4fd47647cf612ee6515e7e8fd1900df81ab908e501ab71a82b6 WHIRLPOOL 6104f71c37f0a0a4d46ae11f8dd1f5ac12986506db161e583055d7231f3a4ad8093629e2b66f20394116c4df970d77b60d392c97851eeafa6d7e8550cebb63ab
+DIST wxdirect-0.13.1.2.tar.gz 32730 SHA256 675fa4dc4769ab213e0cb8e0535152ba38f78412f5c3e326fdd1a7914cd4c5be SHA512 da9aa9ab61fdc21fe063a9d249ad1b7a413e079a43fa71b9c20e1c3faffacc6a226315c3c65cbf991b3a5f8fe89220db7a0fc2b0afb5e735f2f0a15a1d909f29 WHIRLPOOL 9d9ec33b69da2f232fd6c79f996e9c21709be05032c600d88d5c5f10a49c24a2d4b94e44dbc25b6bed9d4fbf318df6af3026638fc066934325279815eea7cddd
+DIST wxdirect-0.90.0.1.tar.gz 31211 SHA256 237b377387f2b9375d42abbb791001ddc07fa36d990b8720372f00c3fba35a12 SHA512 caa28cd5e9ef06a8f63b40ad517873d8d853136048c3597bc850c3460e3830f9cbbafc38dad8b1f356f3fe67f05c2339d97085ca63d3d9b0a75558b713d94033 WHIRLPOOL 8bdd8066bb4df514ec367266b137a73e0a6504c9fb5e9366ed7b46efbf747d2e8cc626aaff43a36d5710f85b0c395bcfc2625601f51c19dd88c2337080b04d9b
+EBUILD wxdirect-0.13.1.2.ebuild 1127 SHA256 ac4a8cf5dad044e1c45e3bc36f8b85d7187badf02d672fed90b030082d0e93f4 SHA512 c61f7100f02b9ddde0102d53341c2d52e768f90f43bfb9d74eb6154e9f073a491e3351385f255a141f69e2c5fa9385dacdd9302f1e9b1678cc0122a5e7ce4b32 WHIRLPOOL 63c9f05617494b2927c91e90126c7b4e2ff9e9b0e00006bdc88fefcb2d0bb36bc680f973ef46de7d3771cf41bdd11d5672d87053ec0bff5e9ce3e2b253db8fda
+EBUILD wxdirect-0.90.0.1.ebuild 1083 SHA256 ad73c3add9a70a6a1170714dfcf9864461be9e1de73620d0df435028d2530240 SHA512 d45864648d99ae3510b441673df5af27b33b0c6be609fdbd48ae39b803306940f1eedff09415e1b16decdd3dc51af089c0b63d392f718b87bc85e3394a37534d WHIRLPOOL e829f55c3a7dea20b78ef904bb8c7b3f48eaae68820a9db8ecebce174129081f63c26d2186ee456325552091941b31fd7a06ba1668637843f90b1894dd9ae13c
+MISC ChangeLog 1342 SHA256 c69737663f50646c21c0f3a1d32bfbcfc443f6c18905f4a56f27e6ec04726e40 SHA512 fac2ae8f005a5bda1f5c1a54ab903d7304f17a9383b04726b44f44d6bde2b73a8ba9aa5056c9f0ecc7983de2b1af354cbbff15cac8c69105c6c3754cb41b27d5 WHIRLPOOL b7e97785197d78eda7d8a17c70a6f8c003f9046c897e68b30c39afa02023a7aeda310793a0f0e27e9ddbf1f77944feaa31b31f314abe58705367ac84c4c5698d
+MISC metadata.xml 529 SHA256 63a8cbe6f608f2ea1ff141f63d20ea1dbf13fa545c7c4c79fd6edb194f367412 SHA512 fd5bad1ef0fda43412aa832f7906ca1b14da86ab712194a50c4caf40f288d27b3a25e53683580a57c098c82be936266ae79caa6021f2ce52c06b588e0cd8fb40 WHIRLPOOL 45b1beafef4be48c64f3250f9695f0d30ad0de55646b4e8b8bf4129f18d178ee20aa13ccf1382c58de88af43035a9293aadb61f058c104a455c3f628113a97a8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDBIj4ACgkQcaHudmEf86rzjwCbBATFKKSCUJaeDZGrtY2tVKSx
-oJAAn3yQZ4o9BLaD2Ke83FfVav/xVx51
-=5QdV
+iF4EAREIAAYFAlDbuKUACgkQoBEVQmGOlx9QWAD8Dtkh/ZLV5qL9oiFutLNBtqMK
+6UpW7cOvJx4nHSPeR/4BAIHSLw2lypVntSfzU4UnNqd2jdJBvb0o/dKVa0+WQh2U
+=qu0C
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/wxdirect/files/wxdirect-0.13.1.2-ghc-7.6.patch b/dev-haskell/wxdirect/files/wxdirect-0.13.1.2-ghc-7.6.patch
new file mode 100644
index 000000000000..aa051ff34111
--- /dev/null
+++ b/dev-haskell/wxdirect/files/wxdirect-0.13.1.2-ghc-7.6.patch
@@ -0,0 +1,73 @@
+--- wxdirect-0.13.1.2-orig/wxdirect.cabal	2012-02-07 18:26:28.000000000 +1100
++++ wxdirect-0.13.1.2/wxdirect.cabal	2012-11-29 17:03:30.132111644 +1100
+@@ -68,7 +68,7 @@
+   if flag(splitBase)
+     build-depends:
+         base       >= 4     && < 5,
+-        containers >= 0.2   && < 0.5
++        containers >= 0.2   && < 0.6
+   else
+     build-depends:
+         base       >= 3     && < 4,
+--- wxdirect-0.13.1.2-orig/src/ParseEiffel.hs	2012-02-07 18:26:28.000000000 +1100
++++ wxdirect-0.13.1.2/src/ParseEiffel.hs	2012-11-29 16:13:33.791009108 +1100
+@@ -1,3 +1,4 @@
++{-# LANGUAGE ScopedTypeVariables #-}
+ -----------------------------------------------------------------------------------------
+ {-| Module      :  ParseEiffel
+     Copyright   :  (c) Daan Leijen 2003
+@@ -12,6 +13,7 @@
+ -----------------------------------------------------------------------------------------
+ module ParseEiffel( parseEiffel ) where
+ 
++import Control.Exception ( catch, IOException )
+ import Data.Char( digitToInt )
+ import Text.ParserCombinators.Parsec
+ import qualified Text.ParserCombinators.Parsec.Token as P
+@@ -33,7 +35,7 @@
+ 
+ getDefaultEiffelFiles :: IO [FilePath]
+ getDefaultEiffelFiles
+-  = do wxwin <- getEnv "WXWIN" `catch` \err -> return ""
++  = do wxwin <- getEnv "WXWIN" `catch` \(err::IOException) -> return ""
+        return [wxwin ++ "/wxc/include/wxc_defs.e"
+               ,wxwin ++ "/wxc/ewxw/eiffel/spec/r_2_4/wx_defs.e"]
+ 
+--- wxdirect-0.13.1.2-orig/src/Classes.hs	2012-02-07 18:26:28.000000000 +1100
++++ wxdirect-0.13.1.2/src/Classes.hs	2012-11-29 17:12:55.416713615 +1100
+@@ -1,3 +1,4 @@
++{-# LANGUAGE CPP #-}
+ -----------------------------------------------------------------------------------------
+ {-| Module      :  Classes
+     Copyright   :  (c) Daan Leijen 2003
+@@ -28,7 +29,9 @@
+ import Data.List( sort, sortBy )
+ import qualified Data.Set as Set
+ import qualified Data.Map as Map
++#if !MIN_VERSION_base(4,6,0)
+ import Prelude hiding ( catch )
++#endif
+ import HaskellNames( haskellTypeName, isBuiltin )
+ import Types
+ 
+--- wxdirect-0.13.1.2-orig/src/CompileClasses.hs	2012-02-07 18:26:28.000000000 +1100
++++ wxdirect-0.13.1.2/src/CompileClasses.hs	2012-11-29 17:12:55.417713640 +1100
+@@ -89,7 +89,7 @@
+            (exportsStatic,exportsClassClasses,classCount) = exportDefs decls exportsClass []
+ 
+            methodCount  = length decls
+-           ghcoptions   = [ "{-# LANGUAGE ForeignFunctionInterface #-}"]
++           ghcoptions   = [ "{-# LANGUAGE CPP, ForeignFunctionInterface #-}"]
+ 
+            export   = concat  [ ["module " ++ moduleRoot ++ moduleName
+                                 , "    ( -- * Global" ]
+@@ -103,6 +103,9 @@
+                                 , "import System.IO.Unsafe( unsafePerformIO )"
+                                 , "import " ++ moduleRoot ++ "WxcTypes"
+                                 , "import " ++ moduleRoot ++ moduleClassTypesName
++                                , "#if (__GLASGOW_HASKELL__>=705)"
++                                , "import Foreign.C.Types(CDouble(..), CInt(..), CWchar(..))"
++                                , "#endif"
+                                 , ""
+                                 ]
+                               ]
diff --git a/dev-haskell/wxdirect/files/wxdirect-0.90.0.1-ghc-7.5.patch b/dev-haskell/wxdirect/files/wxdirect-0.90.0.1-ghc-7.5.patch
new file mode 100644
index 000000000000..75d9bf21c726
--- /dev/null
+++ b/dev-haskell/wxdirect/files/wxdirect-0.90.0.1-ghc-7.5.patch
@@ -0,0 +1,49 @@
+--- wxdirect-0.90.0.1-orig/wxdirect.cabal	2012-04-19 01:05:11.000000000 +1000
++++ wxdirect-0.90.0.1/wxdirect.cabal	2012-05-19 21:12:02.612085338 +1000
+@@ -66,7 +66,7 @@
+   if flag(splitBase)
+     build-depends:
+         base       >= 4     && < 5,
+-        containers >= 0.2   && < 0.5
++        containers >= 0.2   && < 0.6
+   else
+     build-depends:
+         base       >= 3     && < 4,
+--- wxdirect-0.90.0.1-orig/src/Classes.hs	2012-04-19 01:05:10.000000000 +1000
++++ wxdirect-0.90.0.1/src/Classes.hs	2012-07-14 13:58:48.072492467 +1000
+@@ -1,3 +1,4 @@
++{-# LANGUAGE CPP #-}
+ -----------------------------------------------------------------------------------------
+ {-| Module      :  Classes
+     Copyright   :  (c) Daan Leijen 2003
+@@ -28,7 +29,9 @@
+ import Data.List( sort, sortBy )
+ import qualified Data.Set as Set
+ import qualified Data.Map as Map
++#if !MIN_VERSION_base(4,6,0)
+ import Prelude hiding ( catch )
++#endif
+ import HaskellNames( haskellTypeName, isBuiltin )
+ import Types
+ 
+--- wxdirect-0.90.0.1-orig/src/CompileClasses.hs	2012-04-19 01:05:10.000000000 +1000
++++ wxdirect-0.90.0.1/src/CompileClasses.hs	2012-05-19 21:28:27.358052781 +1000
+@@ -89,7 +89,7 @@
+            (exportsStatic,exportsClassClasses,classCount) = exportDefs decls exportsClass []
+ 
+            methodCount  = length decls
+-           ghcoptions   = [ "{-# LANGUAGE ForeignFunctionInterface #-}"]
++           ghcoptions   = [ "{-# LANGUAGE CPP, ForeignFunctionInterface #-}"]
+ 
+            export   = concat  [ ["module " ++ moduleRoot ++ moduleName
+                                 , "    ( -- * Global" ]
+@@ -103,6 +103,9 @@
+                                 , "import System.IO.Unsafe( unsafePerformIO )"
+                                 , "import " ++ moduleRoot ++ "WxcTypes"
+                                 , "import " ++ moduleRoot ++ moduleClassTypesName
++                                , "#if (__GLASGOW_HASKELL__>=705)"
++                                , "import Foreign.C.Types(CDouble(..), CInt(..), CWchar(..))"
++                                , "#endif"
+                                 , ""
+                                 ]
+                               ]
diff --git a/dev-haskell/wxdirect/metadata.xml b/dev-haskell/wxdirect/metadata.xml
index 8c66906af531..6d872e818e62 100644
--- a/dev-haskell/wxdirect/metadata.xml
+++ b/dev-haskell/wxdirect/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>haskell</herd>
-<maintainer>
-  <email>haskell@gentoo.org</email>
-</maintainer>
+	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		wxHaskell is a portable and native GUI library for Haskell. It is built on
+		top of wxWidgets, a comprehensive C++ library that is portable across all
+		major GUI platforms, including GTK, Windows, X11, and MacOS X. This version
+		works with wxWidgets 2.8 only.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/wxdirect/wxdirect-0.12.1.3.ebuild b/dev-haskell/wxdirect/wxdirect-0.12.1.3.ebuild
deleted file mode 100644
index 56de68a4e269..000000000000
--- a/dev-haskell/wxdirect/wxdirect-0.12.1.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wxdirect/wxdirect-0.12.1.3.ebuild,v 1.4 2012/12/06 22:54:59 slyfox Exp $
-
-CABAL_FEATURES="bin lib profile haddock"
-inherit haskell-cabal
-
-DESCRIPTION="helper tool for building wxHaskell"
-HOMEPAGE="http://haskell.org/haskellwiki/WxHaskell"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/parsec-2.1.0
-		>=dev-lang/ghc-6.10"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
diff --git a/dev-haskell/wxdirect/wxdirect-0.13.1.2.ebuild b/dev-haskell/wxdirect/wxdirect-0.13.1.2.ebuild
new file mode 100644
index 000000000000..35ee1c02fceb
--- /dev/null
+++ b/dev-haskell/wxdirect/wxdirect-0.13.1.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wxdirect/wxdirect-0.13.1.2.ebuild,v 1.1 2012/12/27 02:55:18 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.9999
+
+WX_GTK_VER="2.8"
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
+inherit base haskell-cabal
+
+DESCRIPTION="helper tool for building wxHaskell"
+HOMEPAGE="http://haskell.org/haskellwiki/WxHaskell"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="${WX_GTK_VER}/${PV}"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/parsec-2.1.0:=[profile?]
+		<dev-haskell/parsec-4:=[profile?]
+		>=dev-haskell/strict-0.3:=[profile?]
+		<dev-haskell/strict-1.0:=[profile?]
+		>=dev-lang/ghc-6.10.4:="
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.2"
+
+PATCHES=("${FILESDIR}/${PN}-0.13.1.2-ghc-7.6.patch")
+
+src_prepare() {
+	base_src_prepare
+	sed -e "s@executable wxdirect@executable wxdirect-${WX_GTK_VER}@" \
+		-i "${S}/${PN}.cabal" \
+		|| die "Could not change ${PN}.cabal for wxdirect slot ${WX_GTK_VER}"
+}
diff --git a/dev-haskell/wxdirect/wxdirect-0.90.0.1.ebuild b/dev-haskell/wxdirect/wxdirect-0.90.0.1.ebuild
new file mode 100644
index 000000000000..0e011dce699a
--- /dev/null
+++ b/dev-haskell/wxdirect/wxdirect-0.90.0.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wxdirect/wxdirect-0.90.0.1.ebuild,v 1.1 2012/12/27 02:55:18 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.9999
+
+WX_GTK_VER="2.9"
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
+inherit base haskell-cabal
+
+DESCRIPTION="helper tool for building wxHaskell"
+HOMEPAGE="http://haskell.org/haskellwiki/WxHaskell"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="${WX_GTK_VER}/${PV}"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/parsec-2.1.0:=[profile?]
+		<dev-haskell/parsec-4:=[profile?]
+		dev-haskell/strict:=[profile?]
+		>=dev-lang/ghc-6.10.4:="
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.2"
+
+PATCHES=("${FILESDIR}/${PN}-0.90.0.1-ghc-7.5.patch")
+
+src_prepare() {
+	base_src_prepare
+	sed -e "s@executable wxdirect@executable wxdirect-${WX_GTK_VER}@" \
+		-i "${S}/${PN}.cabal" \
+		|| die "Could not change ${PN}.cabal for wxdirect slot ${WX_GTK_VER}"
+}