From 56bd759df1d0c750a065b8c845e93d5dfa6b549d Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sat, 8 Aug 2015 13:49:04 -0700 Subject: proj/gentoo: Initial commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson X-Thanks: Alec Warner - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring - wrote much python to improve cvs2svn X-Thanks: Rich Freeman - validation scripts X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed --- .../files/HDBC-postgresql-2.3.2.1-ghc-7.6.patch | 53 ++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 dev-haskell/hdbc-postgresql/files/HDBC-postgresql-2.3.2.1-ghc-7.6.patch (limited to 'dev-haskell/hdbc-postgresql/files/HDBC-postgresql-2.3.2.1-ghc-7.6.patch') diff --git a/dev-haskell/hdbc-postgresql/files/HDBC-postgresql-2.3.2.1-ghc-7.6.patch b/dev-haskell/hdbc-postgresql/files/HDBC-postgresql-2.3.2.1-ghc-7.6.patch new file mode 100644 index 000000000000..2f81f35c1410 --- /dev/null +++ b/dev-haskell/hdbc-postgresql/files/HDBC-postgresql-2.3.2.1-ghc-7.6.patch @@ -0,0 +1,53 @@ +--- HDBC-postgresql-2.3.2.1-orig/testsrc/TestSbasics.hs 2012-03-04 04:08:01.000000000 +1100 ++++ HDBC-postgresql-2.3.2.1/testsrc/TestSbasics.hs 2012-10-13 11:08:27.482597846 +1100 +@@ -1,10 +1,14 @@ ++{-# LANGUAGE CPP, ScopedTypeVariables #-} + module TestSbasics(tests) where + import Test.HUnit + import Data.List + 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 +@@ -142,7 +146,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-postgresql-2.3.2.1-orig/testsrc/Testbasics.hs 2012-03-04 04:08:01.000000000 +1100 ++++ HDBC-postgresql-2.3.2.1/testsrc/Testbasics.hs 2012-10-13 11:07:43.622396904 +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"]]) + -- cgit v1.2.3