Patch gtk2hs-buildtools-0.12.3.1 for ghc 7.6.1

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

5 files changed, 92 insertions, 8 deletions

diff --git a/dev-haskell/gtk2hs-buildtools/ChangeLog b/dev-haskell/gtk2hs-buildtools/ChangeLog
index 50a239d9aebf..142ad88107ac 100644
--- a/dev-haskell/gtk2hs-buildtools/ChangeLog
+++ b/dev-haskell/gtk2hs-buildtools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-haskell/gtk2hs-buildtools
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs-buildtools/ChangeLog,v 1.10 2012/09/23 08:43:07 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs-buildtools/ChangeLog,v 1.11 2012/11/25 05:42:32 gienah Exp $
+
+  25 Nov 2012; Mark Wright <gienah@gentoo.org>
+  +files/gtk2hs-buildtools-0.12.3.1-ghc-7.5.patch, +files/gtk2hs-buildtools-0.12
+  .3.1-remove-conditional-compilation-as-it-is-ignored-ghc-7.6.patch,
+  gtk2hs-buildtools-0.12.3.1.ebuild:
+  Patch gtk2hs-buildtools-0.12.3.1 for ghc 7.6.1
 
   23 Sep 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   gtk2hs-buildtools-0.12.3.1.ebuild:
diff --git a/dev-haskell/gtk2hs-buildtools/Manifest b/dev-haskell/gtk2hs-buildtools/Manifest
index dd6bde01ca42..39ded61758f5 100644
--- a/dev-haskell/gtk2hs-buildtools/Manifest
+++ b/dev-haskell/gtk2hs-buildtools/Manifest
@@ -2,18 +2,20 @@
 Hash: SHA256
 
 AUX gtk2hs-buildtools-0.12.3-workaround-UName.patch 758 SHA256 a1d5630ddd59c92027a527a1395bc6a3cebac932f29416847291ded240799ea1 SHA512 71cdc7eac40d30ec2b816457adfba15004d1d67cc92c6057b8c6d311da0e4c8dc772f44ca8fe94da4cd31dd3339a4534ffe885cfcd5252e00c7cb2c388c6d2f9 WHIRLPOOL 34ced8a4c99e92bea2016774567c4fa8a8624fdeb5597f74100a63d3d9248d0cf9fff4bb59f0b243a8051ba74fc337ae99a38d89cd653d55ef9f653d684e96b0
+AUX gtk2hs-buildtools-0.12.3.1-ghc-7.5.patch 1981 SHA256 f120c6f7a7498bdc47bd0aa8c8fa06950f357da2c868b4231a287bf11025d4b7 SHA512 23fa9d64c3cd02ea832b828342613883b91a0e9a3443e8bff4006c9a0a68e69d4ec4aec28928ee47d23ee31244212d8f8e12c5cba20b677844f7de497554602c WHIRLPOOL 572caee8129e7d5febd628764882ad2458ac62ab4e6bd0b74e3604cfb475a715eacdf63281dff1e67ec5518e82f65658bf317f39e07d79396d45c13c172dfb55
+AUX gtk2hs-buildtools-0.12.3.1-remove-conditional-compilation-as-it-is-ignored-ghc-7.6.patch 591 SHA256 a1a8e7b54f543111ab750feacf83f246b6eab47adf079c8439b3caade8ec9633 SHA512 7404691b786a22427f75d1a1c7d9c8bae761b307e587690927556895b4d81135d9133ba529f26d9484b02aab49cce2be3571860c1f2e7d66d2c3cbdf1a4d91e8 WHIRLPOOL 0118c15f31d89d411d8a9ee715ce1117ffa01b210b28a72395f38da09855fef751e9aaa552bc2a7d063ed4b9c6c1ec37684c6851203f5b07a8c996e6a5f1698d
 DIST gtk2hs-buildtools-0.12.0.tar.gz 211213 SHA256 4819b3270d0b5e4775808679815764e7a86ac0866c7c200304ecc39fb2aff4b3 SHA512 24250a2048092cf4c77d0ac627a5c64dc76dbb4391162e007538c06be1681a45dd68403c502b97f7e131045837519c6d9178dc19a77e90e6552f1da49a72d19f WHIRLPOOL 083c9a289469fe7985db82668a813fe3bd8a996cd6abc899c8f2f38aaf2486d8071001c6150faca09e6f4cbfe12602e6d337d598ae3de03f5973cb524df1c834
 DIST gtk2hs-buildtools-0.12.3.1.tar.gz 212286 SHA256 c6ff1fbb9b50e0c5bbc65ab7e16f2b5ff80536b2704bac6c34f106ff8357b428 SHA512 9a32d8cd0c1686787fdf691067ad1c8997fa87a77093a0184d85fa6ab9fed3ed3a9733a9072fece35d0a00e3c629e1f4cbdd62a392d17c8b69533aac247ff1b3 WHIRLPOOL 2e0715214900880b1b204241458815713bb87fb68fad1d67cbcbded3c10093d59dbb73a02acf855976839e76b12901972c62d9333d2685b6c1106a3f89171544
 DIST gtk2hs-buildtools-0.12.3.tar.gz 167845 SHA256 71e58c0de00b6436a0ad761170b61c86890d8e9971107cffb1b16e0896b84984 SHA512 b9d83f42d3c184d0a4e77eacd880bea88f8dddf8962e951256d3100618146bb31a399d89628a7703030daa78b3b1f0a5fbe6d313f733c8e321af041b97ecb326 WHIRLPOOL 95e495850d66559c0f4d90f5032f3ee2e83d991425410587cbbdb3d11e702d2708d650b8ca953a294ac55109a41203b8e2570f4fa65d6ee807e47562efeabeb1
 EBUILD gtk2hs-buildtools-0.12.0.ebuild 700 SHA256 8949492632aa212a97915b909feaa8044d95f57e14420c29f85d754c0932d384 SHA512 a900d97228a3e59a0c436bf22c8dbe9dc53ed00a530d1acd389b336eb0d25adb69f4be03e1c66fc6b9274c43f7c70639425dac7caa0ebe95772ee9d33ea73d4e WHIRLPOOL e0c3fe8138c1b88c1ea5be834d18e7f540e5fe214750ff9bf3d63c23356a641fe27aef2007646f68ef9f22454916ff961a6b0e13d8b57efee06000d50fcd83ef
 EBUILD gtk2hs-buildtools-0.12.3-r3.ebuild 764 SHA256 be0dd01b4ad0de177ba46a0d3630628caa52c2e04f5d2c8b27ff46f3197760c6 SHA512 52904ad94894e193a0bcdeed5dc3d3236147e7c06cbb108124f57e8985c12642e40e45ef11eef3f4d3944afd41080094e2f1863144e6b8b99dcc45802c24a4cb WHIRLPOOL efb0607bfbffed08cf3eae77d192283e55057658da9cc43288442bc2026a7630a6a4c412f070def79e0230abf5b3326168cf213fbadf9c8a279c3d3a6f5695bf
-EBUILD gtk2hs-buildtools-0.12.3.1.ebuild 734 SHA256 70eba618f6abd3a7771850c63e1086a2eaaefdab361bbfc8fb5e484e20ad04fc SHA512 b1f73f1afa901f37cfdad49e434306fb5058c7d691fd405f1ec0a5c835b643faa7f73d32ca0d002aaa29d4ecd4b835791f13089060a5c5a4411c22114848621b WHIRLPOOL d72394ffd056ec5b3ee0c1378fc11b08b545a06b8acb8fc8aa46107af58fc0d25b7c6d8d37ab856726cd9d9423ca48562cc576202d779c72039e5d3e7c5bed5b
-MISC ChangeLog 1846 SHA256 6a3426c0fa3181fe7f5d2556d609d83ea9c22928adb2c6ac023657d2533425e4 SHA512 65d4e0a279b4c94066946d75dbbeb5fece9876a913e89e4145992dc1cc0d2939c615b527d9619a7744d9fc2f7c55afcefd9bd403bf57cbd8f87053e53c79863d WHIRLPOOL e02b02bbc13e8e2c8741cd1ed0b5ca77e4bfad454f0fce854521f8586bf2913cb931cce9fdcc75702aff07349f3ebcef343ad2fc8157faf28bb2ddc5fe0cd620
+EBUILD gtk2hs-buildtools-0.12.3.1.ebuild 1029 SHA256 7864fe6ae448c4ba10179f1776286146fef14ff74e5ee0a9f78a55a0069e7bc2 SHA512 1d06f3304e632cb7941872a92f562ed76f3f43e65a5353f22724ee5f6f3397d558a72caafe2f7db936a0ca48167de4c460f5788d489c49bcf3df65417318ecad WHIRLPOOL f66e925296ab2ce8e079aba1cfb2a3e6f2f34042d9c707235a2d30c6358c3032ddbc8dce032275df4c18b836fbdd2eb7f6d3537c5fb335d14800383f7bb110dc
+MISC ChangeLog 2127 SHA256 08131a97029808afb918acdab384735a197234101bd0f586afcc68c9d0e4e179 SHA512 4b4d876e048a6c6cd03c21ae847319dec5f66153d0931d79fcd0bb84ff78e537af364edf2147c8f50b2358b4cb12f3cb1be6a2abb931049d5b0caa0c05b58415 WHIRLPOOL 1dd7fea502a32451ab1fea2b7a992b3713e1c6fe98315019d3bf6e688638a48bbd9224798a94ffcee85f64e53b1c530437a719842480862e83baca93bdde76ed
 MISC metadata.xml 710 SHA256 7dcab7c88e6514f8297ed33472c18ef90d49db6d8947f20f52c0732ce4e9c7e2 SHA512 c220bd25357c31622634de6b86e07d3a993575dcd585970f11c9c83b6341c67165c8b4a7fa8859100cd2f0e43ec493f4b9159c85a5767d449346f8672708d0b9 WHIRLPOOL 066d59ff99773fb59535a0ae81eddb0dd11bff6bca3f84658e899dd2c49f9d1b84639f18597d0b286db72b72a8f7b5917bdc552fc7cd289326cdede8ceaa27c5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBey6UACgkQuUQtlDBCeQIQgQCghFIgg6c7wWlfssPH5/JhpDZH
-waQAn2rSg+H+M7g3Oy7w+9UKhh2l2+Tg
-=109N
+iF4EAREIAAYFAlCxr80ACgkQoBEVQmGOlx95lgD8CHUwmBQeQ8ena/XDyIjYpzvL
+4buTtUDTBUYnjbh888MA+wcJa0OJd0/S2XYx1/mmnEhDOHRajLkB1CvfHJVlqaP7
+=NaxU
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.12.3.1-ghc-7.5.patch b/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.12.3.1-ghc-7.5.patch
new file mode 100644
index 000000000000..e9a2e0516a1f
--- /dev/null
+++ b/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.12.3.1-ghc-7.5.patch
@@ -0,0 +1,51 @@
+--- gtk2hs-buildtools-0.12.3.1-orig/c2hs/base/general/FileOps.hs	2012-05-28 08:17:27.000000000 +1000
++++ gtk2hs-buildtools-0.12.3.1/c2hs/base/general/FileOps.hs	2012-07-14 14:17:58.121511985 +1000
+@@ -36,6 +36,7 @@
+ import System.Directory (doesFileExist)
+ import System.IO	 (Handle, IOMode(..), openFile)
+ import Control.Monad	 (liftM)
++import qualified Control.Exception
+ import System.Random    (newStdGen, randomRs)
+ 
+ import FNameOps  (dirname, stripDirname, addPath)
+@@ -89,7 +90,9 @@
+ 			     in do
+ 			       h <- openFile fname ReadWriteMode
+ 			       return (h, fname)
+-			     `catch` \_ -> createLoop (attempts - 1) rs'
++			     `Control.Exception.catch` ((\_ -> createLoop (attempts - 1) rs') ::
++                                                           Control.Exception.SomeException ->
++                                                           IO (Handle, FilePath))
+     --
+     sixChars :: [Int] -> ([Int], String)
+     sixChars is = 
+--- gtk2hs-buildtools-0.12.3.1-orig/c2hs/base/state/StateTrans.hs	2012-05-28 08:17:27.000000000 +1000
++++ gtk2hs-buildtools-0.12.3.1/c2hs/base/state/StateTrans.hs	2012-07-14 14:14:12.365626559 +1000
+@@ -80,6 +80,7 @@
+ where
+ 
+ import Control.Monad      (liftM)
++import qualified Control.Exception
+ import System.IO  (fixIO)
+ import Data.IORef (IORef, newIORef, readIORef, writeIORef)
+ 
+@@ -337,7 +338,7 @@
+ 				  ioError err
+ 	      Right a          -> return state
+ 	    )
+-	    `catch` (\err -> let
++	    `Control.Exception.catch` (\err -> let
+ 			       STB handler' = handler err
+ 			     in
+ 			     handler' bs gs)
+--- gtk2hs-buildtools-0.12.3.1-orig/c2hs/toplevel/C2HSConfig.hs	2012-05-28 08:17:27.000000000 +1000
++++ gtk2hs-buildtools-0.12.3.1/c2hs/toplevel/C2HSConfig.hs	2012-07-14 14:12:10.172439583 +1000
+@@ -46,7 +46,7 @@
+ 
+ import Foreign (Ptr, FunPtr)
+ import Foreign  (Storable(sizeOf, alignment), toBool)
+-import Foreign.C (CInt)
++import Foreign.C (CInt(..))
+ import System.Info (os)
+ 
+ -- program settings
diff --git a/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.12.3.1-remove-conditional-compilation-as-it-is-ignored-ghc-7.6.patch b/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.12.3.1-remove-conditional-compilation-as-it-is-ignored-ghc-7.6.patch
new file mode 100644
index 000000000000..8bbf892f431b
--- /dev/null
+++ b/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.12.3.1-remove-conditional-compilation-as-it-is-ignored-ghc-7.6.patch
@@ -0,0 +1,14 @@
+--- gtk2hs-buildtools-0.12.3.1-orig/hierarchyGen/Hierarchy.chs.template	2012-05-28 08:17:27.000000000 +1000
++++ gtk2hs-buildtools-0.12.3.1/hierarchyGen/Hierarchy.chs.template	2012-10-11 12:28:58.851901084 +1100
+@@ -38,11 +38,7 @@
+   ) where
+ 
+ import Foreign.ForeignPtr (ForeignPtr, castForeignPtr, unsafeForeignPtrToPtr)
+-#if __GLASGOW_HASKELL__>=704
+ import Foreign.C.Types    (CULong(..), CUInt(..))
+-#else
+-import Foreign.C.Types    (CULong, CUInt)
+-#endif
+ import System.Glib.GType	(GType, typeInstanceIsA)
+ @MODULE_IMPORTS@
+ {# context lib="@CONTEXT_LIB@" prefix="@CONTEXT_PREFIX@" #}
diff --git a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.3.1.ebuild b/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.3.1.ebuild
index 13017bd4a1e1..ca033ac19c88 100644
--- a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.3.1.ebuild
+++ b/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.3.1.ebuild,v 1.4 2012/09/23 08:43:07 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.3.1.ebuild,v 1.5 2012/11/25 05:42:32 gienah Exp $
 
 EAPI=4
 
@@ -21,6 +21,17 @@ DEPEND="${RDEPEND}
 		dev-haskell/alex
 		>=dev-haskell/cabal-1.8
 		dev-haskell/happy
+		dev-haskell/random
 		>=dev-lang/ghc-6.10.1"
 
-PATCHES=("${FILESDIR}"/${PN}-0.12.3-workaround-UName.patch)
+PATCHES=("${FILESDIR}"/${PN}-0.12.3-workaround-UName.patch
+	"${FILESDIR}"/${PN}-0.12.3.1-ghc-7.5.patch
+)
+
+src_prepare() {
+	base_src_prepare
+	# c2hs ignores #if __GLASGOW_HASKELL__ >= 704
+	if has_version ">=dev-lang/ghc-7.6.1"; then
+		epatch "${FILESDIR}"/${PN}-0.12.3.1-remove-conditional-compilation-as-it-is-ignored-ghc-7.6.patch
+	fi
+}