Fix against ghc-7.6.

Package-Manager: portage-2.2.0_alpha149_p1/cvs/Linux x86_64
Manifest-Sign-Key: 0x611FF3AA

4 files changed, 65 insertions, 7 deletions

diff --git a/dev-haskell/hdbc-sqlite/ChangeLog b/dev-haskell/hdbc-sqlite/ChangeLog
index aaca0a5985f3..51bf94ba846a 100644
--- a/dev-haskell/hdbc-sqlite/ChangeLog
+++ b/dev-haskell/hdbc-sqlite/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-haskell/hdbc-sqlite
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc-sqlite/ChangeLog,v 1.16 2012/12/07 10:35:19 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc-sqlite/ChangeLog,v 1.17 2012/12/24 15:37:59 slyfox Exp $
+
+  24 Dec 2012; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/HDBC-sqlite3-2.3.3.0-ghc-7.6.patch, hdbc-sqlite-2.3.3.0.ebuild:
+  Fix against ghc-7.6.
 
   07 Dec 2012; Sergei Trofimovich <slyfox@gentoo.org>
   hdbc-sqlite-2.3.0.0.ebuild, hdbc-sqlite-2.3.3.0.ebuild:
diff --git a/dev-haskell/hdbc-sqlite/Manifest b/dev-haskell/hdbc-sqlite/Manifest
index 76e317854b15..6d5a5674162d 100644
--- a/dev-haskell/hdbc-sqlite/Manifest
+++ b/dev-haskell/hdbc-sqlite/Manifest
@@ -1,17 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX HDBC-sqlite3-2.3.3.0-ghc-7.6.patch 1785 SHA256 7cb55a17bf646a6dde2981c39fc59e5965211865ad99cd198047529b3de96f98 SHA512 fe2b354aa8ddb62703cc1c942b65c74ed11842b129ebac5675999af2d20595c57b5e7777d2daa5025762f2bfc5ccecbc84b254416a9c8e00b2d528e99679f3b2 WHIRLPOOL 4ffd4fafe6ef37af52671ef9742889beedf145c587dc7e15f5db87ff0200da0bd9d8f7346264b17df7dcc05f368472c2363a263e1c40e84538da79efb9d599f2
 AUX TestTime.hs 3583 SHA256 3f6b2e5c5b3198d23bf5af083902613599c641dda97939f13c32b3baa96f3633 SHA512 5b0dbc957dfd0965d604ee2962cdb9c398c674f54a3961acb1ae3acd9999bc52926971f33de7a86bc66cc2de84ff5d79a1c5102f8b7705c908d37fd4a9f74ad0 WHIRLPOOL c7ece24b8622f0c11553d18d12df4287bf630af1b2f2a6130ffb949bc8995c13f5d4975884eaa1a161a38ff4b05dc1049c24e23e8cd49feb48dde6ec7855929b
 DIST HDBC-sqlite3-2.3.0.0.tar.gz 23842 SHA256 12db87d4de729e04b54f56b870b9b78c11aa2e3e8efeb4329d8a343a10a0a732 SHA512 fba8098e3f24d0133004fef3f736734e8940c5909263a2f936be006a26587fd1ccc1010b3d8fa19c91b7962e1322fac8f32a58367bc6231eecf69e5382787a52 WHIRLPOOL 060a32d1b2576bc96f9ed67c4596fc6bedacad1ab08f0eb37184b7a96a5a141a3b2c3e919e319e153e5815e52da4550374c4e5cf79be9453e5ab9101ecf0d539
 DIST HDBC-sqlite3-2.3.3.0.tar.gz 14827 SHA256 22f972fc44e830d0db62313fb870cd9d020f3d8efff2928d4cdb3f66b52de684 SHA512 66dfef4fd6dbaaaea4eadd3c5201a29f8f306170ef76dbf2e8a1f4239bcdcdd5b16d6d331c8a480a9e23209b2c86cfe981d7f83d4d3a0ba617dfdfb6663ad244 WHIRLPOOL b39aa543bfb12923dce1666e29d4f327691540d289b4faa0a83f5cf2aba2eaa3bd107947621fd46ca44b02ba9ba8888dece79cb8dbdadf597ae05efb52dc0ae6
 EBUILD hdbc-sqlite-2.3.0.0.ebuild 1286 SHA256 d9ba9ae08ff6af032a31f87392703ff03a9905cfebb54dbb02b72429138fa352 SHA512 8b81c740cf1b14583fae5db7c6d0b54e1f3112ba3048fddab41a117ffb62ff7fcb94f19265014ba809ac202ecbda11c3a212dfdb3fd3c12486819b55d4c0705e WHIRLPOOL 7f56bb034a68584527273b61c74ab8b1f5d5e4798d95e454c4bc9b0d12b84155d042393cfe85ea3cf2fb2652e53044ed5608cef4994e12a2e80673cc3201b12a
-EBUILD hdbc-sqlite-2.3.3.0.ebuild 1440 SHA256 9714a0e7eb0aa211d3300a2078f049a661edfdca10bc56ef116a4f27d26de731 SHA512 c20828607123c9b76f87f0fefca3f63aac1575c9e1fb6e4d837ca54d4f39866fe9c2d3ec1e2e8448e7bd54267d262d202649acb9d3fb2aa2c0cadd7b69d324d5 WHIRLPOOL b3f984729144f6da9b1bf5615d2556269ba40a6e5a80fc0fbd31881b41ad7859e368ecb50517a0f67d836e69a533fbeced83f5b30163fe46bfc44f0b3c92f0ad
-MISC ChangeLog 2856 SHA256 8b4d9760fabeafc3e335f2ecc5136ea0f364ae9a8ccbb282e014cdb60b46c333 SHA512 2c19f442fb41748e85255201a26d3607169e5d78b6ca080ace30af474b473d3ffd227d050db2945fd67bcda3a677fa7316538c64d252634dc07f8119db11e6cd WHIRLPOOL ed60363758d9a88b15e80a212ac3b2d06673a67ccfff1bd97a6ab1434171fc708cc9435dde76a9ed5cb208bb6f6bdf1de4ee0cd016da2519424fe4ac5500774c
+EBUILD hdbc-sqlite-2.3.3.0.ebuild 1493 SHA256 0589562ab5890883118b908497bb4efa672f54397127e9d5c91b305b38d16a04 SHA512 002951ee47bbe554afcb4934e2a5825d45b4949cec2f8f48995b6cdc58b1e15f9ebf05005b05acbf9737464c873cf2e67cd9aab873111139c278397acf87143e WHIRLPOOL 902a182f3f5212604183de03e6c46901b0eb8ab903b23766ed63966cd06d783c82d0b524bf726cdc5417cad45f5cd725f7fc68abffcf2fcf93538231876eb26e
+MISC ChangeLog 3007 SHA256 b49502612589a270a12d42ce43101858b8ac76a28d2868e6b1561c06c1710ef4 SHA512 bd1092d51b207c1a5c4ce92782a21802dee65426e5f11886ecb6b67f046c161fb199c4fc6d8e2f843e60e33e4745137f4c38f60fdf5c5c5cd14308913cd9b806 WHIRLPOOL 337581b8b1f1263d7f2d3b98eaf8e40402462961e8702c63adbde781f5cbcc2e0add0a73f3a1f7c333fe82c82ae6d59919c45263142ab120e6ec28fe76cc1d48
 MISC metadata.xml 355 SHA256 37d42261d99ad2b20e725e66ab83aa2f2905306ed05e11deab79086ad1a21985 SHA512 1ba256283a552e4f1359f94ca48f086195b43456dcb97985b6998b474cfa6e16b6e8a99ec2c46388ffe698761ea497810f9544abb62906657c2ee8b4e86b74d4 WHIRLPOOL c902693a5cfdcbe901a02c2063c3754ca5765beecd234079aa1b09f3d7cd29da21fcf0d8842552c0860af4468b1941a74d27190ae92ad54fea0a3c053e7c64ac
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDBxnQACgkQcaHudmEf86oJYACfXsukSMTZTC7x//ksuVWp1OCN
-hLsAn3RHUueHqDR7FluCW+dKTndlAJS0
-=X6Jq
+iEYEAREIAAYFAlDYdsIACgkQcaHudmEf86oetQCfQdXr0h6oXGPj+WARHyDXMvBQ
+6GQAnicgctSBwTF8zepl1GglNZ88uRHt
+=3y0W
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/hdbc-sqlite/files/HDBC-sqlite3-2.3.3.0-ghc-7.6.patch b/dev-haskell/hdbc-sqlite/files/HDBC-sqlite3-2.3.3.0-ghc-7.6.patch
new file mode 100644
index 000000000000..c0c024218117
--- /dev/null
+++ b/dev-haskell/hdbc-sqlite/files/HDBC-sqlite3-2.3.3.0-ghc-7.6.patch
@@ -0,0 +1,52 @@
+--- HDBC-sqlite3-2.3.3.0-orig/testsrc/TestSbasics.hs	2011-08-10 07:08:57.000000000 +1000
++++ HDBC-sqlite3-2.3.3.0/testsrc/TestSbasics.hs	2012-10-13 11:28:21.094200366 +1100
+@@ -1,9 +1,13 @@
++{-# LANGUAGE CPP, ScopedTypeVariables #-}
+ module TestSbasics(tests) where
+ import Test.HUnit
+ import Database.HDBC
+ import TestUtils
+ import System.IO
+-import Control.Exception hiding (catch)
++#if !MIN_VERSION_base(4,6,0)
++import Prelude hiding (catch)
++#endif
++import Control.Exception
+ 
+ openClosedb = sqlTestCase $ 
+     do dbh <- connectDB
+@@ -140,7 +144,7 @@
+        -- Let's try a rollback.
+        catch (withTransaction dbh (\_ -> do sExecuteMany sth rows
+                                             fail "Foo"))
+-             (\_ -> return ())
++             (\(_::IOException) -> return ())
+        sExecute qrysth []
+        sFetchAllRows qrysth >>= (assertEqual "rollback" [[Just "0"]])
+ 
+--- HDBC-sqlite3-2.3.3.0-orig/testsrc/Testbasics.hs	2011-08-10 07:08:57.000000000 +1000
++++ HDBC-sqlite3-2.3.3.0/testsrc/Testbasics.hs	2012-10-13 11:27:20.025541058 +1100
+@@ -1,9 +1,13 @@
++{-# LANGUAGE CPP, ScopedTypeVariables #-}
+ module Testbasics(tests) where
+ import Test.HUnit
+ import Database.HDBC
+ import TestUtils
+ import System.IO
+-import Control.Exception hiding (catch)
++#if !MIN_VERSION_base(4,6,0)
++import Prelude hiding (catch)
++#endif
++import Control.Exception
+ 
+ openClosedb = sqlTestCase $ 
+     do dbh <- connectDB
+@@ -140,7 +144,7 @@
+        -- Let's try a rollback.
+        catch (withTransaction dbh (\_ -> do executeMany sth rows
+                                             fail "Foo"))
+-             (\_ -> return ())
++             (\(_::IOException) -> return ())
+        execute qrysth []
+        fetchAllRows qrysth >>= (assertEqual "rollback" [[SqlString "0"]])
+ 
diff --git a/dev-haskell/hdbc-sqlite/hdbc-sqlite-2.3.3.0.ebuild b/dev-haskell/hdbc-sqlite/hdbc-sqlite-2.3.3.0.ebuild
index c7ce84e75626..9eb26ffd300b 100644
--- a/dev-haskell/hdbc-sqlite/hdbc-sqlite-2.3.3.0.ebuild
+++ b/dev-haskell/hdbc-sqlite/hdbc-sqlite-2.3.3.0.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/hdbc-sqlite/hdbc-sqlite-2.3.3.0.ebuild,v 1.3 2012/12/07 10:35:19 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc-sqlite/hdbc-sqlite-2.3.3.0.ebuild,v 1.4 2012/12/24 15:37:59 slyfox Exp $
 
 EAPI=4
 
@@ -38,6 +38,7 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
+	epatch "${FILESDIR}/${MY_PN}-2.3.3.0-ghc-7.6.patch"
 	cp "${FILESDIR}/TestTime.hs" "${S}/testsrc"
 }