Added missing patch noticed by Diego Elio Pettenò in bug #452994.

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

4 files changed, 67 insertions, 10 deletions

diff --git a/dev-haskell/hdbc-odbc/ChangeLog b/dev-haskell/hdbc-odbc/ChangeLog
index b001af802f6b..3c776b2ccfdf 100644
--- a/dev-haskell/hdbc-odbc/ChangeLog
+++ b/dev-haskell/hdbc-odbc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-haskell/hdbc-odbc
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc-odbc/ChangeLog,v 1.19 2012/12/24 15:34:09 slyfox Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc-odbc/ChangeLog,v 1.20 2013/01/19 15:44:48 slyfox Exp $
+
+  19 Jan 2013; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/hdbc-odbc-2.3.1.0-ghc-7.6.patch, hdbc-odbc-2.3.1.1.ebuild:
+  Added missing patch noticed by Diego Elio Pettenò in bug #452994.
 
 *hdbc-odbc-2.3.1.1 (24 Dec 2012)
 
diff --git a/dev-haskell/hdbc-odbc/Manifest b/dev-haskell/hdbc-odbc/Manifest
index aed371257275..ddadb839eff9 100644
--- a/dev-haskell/hdbc-odbc/Manifest
+++ b/dev-haskell/hdbc-odbc/Manifest
@@ -2,16 +2,17 @@
 Hash: SHA256
 
 AUX hdbc-odbc-2.3.1.0-ghc-6.12.patch 1378 SHA256 63b2a3cef8248dc1616c6c9b99e9f377c3f3b01129fcce88306645456c056d85 SHA512 6109a604910332a99c54326292d109d952a9c0de9e061ea07b843c8ddb8cbf230d01c22caea0550e7f97c9c2b3187650a49b7807875912381afb92c468adb1b6 WHIRLPOOL 60c0ceb509fafd4700c8380a506873ddf81601663e16a113b37e584c7498ffba018d4fd1109d16a93a3107adddad981adbf01689010111e8ed13055bdbec762b
+AUX hdbc-odbc-2.3.1.0-ghc-7.6.patch 1773 SHA256 4ec1dac2479f63a7b49f883f509a52bf2f69a6851306091be913ef3cade12853 SHA512 1978f79956a73b8615331698839583a242bf15987875a43df496b3bc68a814e516cd3d6868cad47b2b3f30226295a8affeab9995c056f58b649eb6a673ffb034 WHIRLPOOL 1623fabcd162006515502d5d7a7fbe3b98994e82ad94ee198af55aa56eae80f02df7bb7dbe27a058d68c7b65b2439584e9b57c2ac2f42e2de4f8052772d77fa6
 DIST HDBC-odbc-2.3.1.0.tar.gz 23604 SHA256 c44d777006341b73f4124773ee8d09c8d84839d5dcf622a0e4c320fd1e1aea6f SHA512 73fc7d0d82275316823dd0dd8baa7b1c422c2bdf06a18ad1da3f242a1628c6c10e8cd7941426b0915f38b94eec9f0fb517a8f4d67c922717dd60a04a7fa855b3 WHIRLPOOL 6ff993a2fa3e584141449ad520c9c829c768f1fb38983e9c63be49af07af1cb1ac0b1a516a6a077c13c9afa2336d93fa888fcd41e7acce4c5d042a1ad6d1c109
 DIST HDBC-odbc-2.3.1.1.tar.gz 24518 SHA256 87b992ec8b26d01070ddc732cb07052ba482e29faf9c235832f7778f3c7fd77f SHA512 dbf95afca7906c4814f79e00d1fef0d26ed71c8da45a0fd51c4e3e4e0427d56d1937be0b0c4088841d5f12d93da0c4c29ec6f359c2e58fdf4c693f34bdae250a WHIRLPOOL 195c717831d4e2099e2f71a76870495a062cccb19d949257a89d358214bee2bee06985553738c7818125c8a094e19ddbc6a0d81f17bcd4e9f1e7d595c0576e29
 EBUILD hdbc-odbc-2.3.1.0.ebuild 1746 SHA256 4553eef3abf6ba930d2a69d6116d20ac4690f12a352980b8efcc99b1b2e923bb SHA512 5cf457578b32be4f6b73ed6132c83f49858746b74b70c904f523955a33c8648ae0f03164b1af55a6186c0761b54013f5d02e547c8f8ff9348d13e1eea72d6cd4 WHIRLPOOL ebcbc0d34aeeda44b717229d737c488622a712bd21e60a72ce4adfdae2f3df7897d9f5bed661ce3333fbd7465e83f60c7ed5231142fbc668ba175ee6053bd464
-EBUILD hdbc-odbc-2.3.1.1.ebuild 1591 SHA256 1bb8d1d53b38b6cc7e5687dffc941667afaf06d737e873b2c878903e1570f4d1 SHA512 454cf2e7b3f20377a4dc2f19c3f2789a24accd52b435265745b5a5af870d9fd1e2ad3bab610d40c1d9eed99ffc9ed191dabe340fc68dea24b559375d57c7cd9e WHIRLPOOL 2d362c6b68bc580fb4e5190df09c2ce39dd7eae316c12f45debebef814ef01b5fdf81c901217f9176ce4edadd9094303e79907725fdf791a903bbe7a03c09778
-MISC ChangeLog 3126 SHA256 b05c21e13ef1d9cf3e1d986928b11d8fc4c792f122e75e4a5139ac731e047943 SHA512 9bf06448fad9e6ac8a8818a9dd22d736d200afc765fb156a8a43a3d2f2b5ff126b65b0f9e7daf7fc6449dbe83c9397765f77f5867d1f89c8e1653324c104d01d WHIRLPOOL 897de60f859db3c5e6923b37070b884a023cdcffb8a6da0ce41df3405bb6d2c3d54d3ffc2d19255a98c3d37915925a07d006055498a62203385134194e0d0fc0
+EBUILD hdbc-odbc-2.3.1.1.ebuild 1588 SHA256 a23fa1fcd9fdb308712d36ef9ec61ebcb373d9bcfcf8c316db3346819acd373d SHA512 5c2e6115672ba7706152bb670f3c00a6c6c171d22c22d1b2fad1906f57ec9f79fab3bb4544618c9541ab4fe4f02d8c201669b5cb1f50e942e9e5b3a33610534e WHIRLPOOL a166532d7f181c1c4853a4ae6e78b6034750aa263b682a6d180354d28ad7957d3937be2bf2a4769a6f31343efbb568cc41a88ee57d26cd25c902524509d78c32
+MISC ChangeLog 3318 SHA256 7b1134d99e4959268a151dd25ef223facb43c8d5c5a7bd67b189d655937713f3 SHA512 295484c63841a0c9836368eb020da8752d59bb2df67ad0da7053042ab9d5c4405ef44fd27061e1bbd13c2856f86a1f150967e9d32f335d4c0fca07d5b3831dff WHIRLPOOL f15980fe0840d305a1efff7eb5e4324f2e51da419eeafa8ceedc1b1c908d293429811ae3b171853780a6429be65f4bad17fd4af48151462b316db327ba7eb13b
 MISC metadata.xml 445 SHA256 73798a7861c495cff602a71aaddcd6025ddd4677dd4a28ae7174f7a338773fef SHA512 fd93e9f6a27be6e6f779d7dcf91cfdb222c8269d1f32ebc7c4fa202116edeb1876c7f76f6810498d1cc29f0c42d561369a5ffd5ce91b38121190a8d6409623db WHIRLPOOL 0768078774a874acb5278d2b1fd61aa75ff24d376ddca13b5366c4769c3219af888884c746a1d8e840f437fe8bc7eef77fe26f744f1d82abad14b22694cebb6a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDYddwACgkQcaHudmEf86qfxgCeMuI8Ljx4MF2AYWkA3Ya0giPX
-6vgAn2wydE2nb880vJBGXRxqGVrE8zOO
-=BexR
+iEYEAREIAAYFAlD6v2IACgkQcaHudmEf86oE3ACdG4xFatDVxOSgbdmsS3yhWzgE
+ow8An2H9CfGwskM+rIaBAlPpP4UZn8v9
+=dtuP
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/hdbc-odbc/files/hdbc-odbc-2.3.1.0-ghc-7.6.patch b/dev-haskell/hdbc-odbc/files/hdbc-odbc-2.3.1.0-ghc-7.6.patch
new file mode 100644
index 000000000000..8092cf16da6c
--- /dev/null
+++ b/dev-haskell/hdbc-odbc/files/hdbc-odbc-2.3.1.0-ghc-7.6.patch
@@ -0,0 +1,52 @@
+--- HDBC-odbc-2.3.1.0-orig/testsrc/TestSbasics.hs	2011-08-10 07:16:38.000000000 +1000
++++ HDBC-odbc-2.3.1.0/testsrc/TestSbasics.hs	2012-10-13 12:30:47.216363898 +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
+@@ -123,7 +127,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-odbc-2.3.1.0-orig/testsrc/Testbasics.hs	2011-08-10 07:16:38.000000000 +1000
++++ HDBC-odbc-2.3.1.0/testsrc/Testbasics.hs	2012-10-13 12:30:10.883415738 +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-odbc/hdbc-odbc-2.3.1.1.ebuild b/dev-haskell/hdbc-odbc/hdbc-odbc-2.3.1.1.ebuild
index e389391e66d3..f0d6fe5840a1 100644
--- a/dev-haskell/hdbc-odbc/hdbc-odbc-2.3.1.1.ebuild
+++ b/dev-haskell/hdbc-odbc/hdbc-odbc-2.3.1.1.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/hdbc-odbc/hdbc-odbc-2.3.1.1.ebuild,v 1.1 2012/12/24 15:34:09 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc-odbc/hdbc-odbc-2.3.1.1.ebuild,v 1.2 2013/01/19 15:44:48 slyfox Exp $
 
 EAPI=5
 
@@ -43,7 +43,7 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	epatch "${FILESDIR}/${MY_PN}-2.3.1.0-ghc-7.6.patch"
+	epatch "${FILESDIR}/${PN}-2.3.1.0-ghc-7.6.patch"
 }
 
 src_configure() {