commit: a048cf987bceef8bf658534a01a198a9eaa5336a
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail
<DOT> com>
AuthorDate: Wed Jul 27 16:56:41 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Aug 3 07:21:54 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a048cf98
dev-haskell/hdbc: remove unused patches
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
.../hdbc/files/hdbc-2.4.0.0-ghc-7.10-1.patch | 39 --------------------
.../hdbc/files/hdbc-2.4.0.0-ghc-7.10-2.patch | 43 ----------------------
2 files changed, 82 deletions(-)
diff --git a/dev-haskell/hdbc/files/hdbc-2.4.0.0-ghc-7.10-1.patch
b/dev-haskell/hdbc/files/hdbc-2.4.0.0-ghc-7.10-1.patch
deleted file mode 100644
index 6b79476..0000000
--- a/dev-haskell/hdbc/files/hdbc-2.4.0.0-ghc-7.10-1.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/Database/HDBC/Locale.hs b/Database/HDBC/Locale.hs
-index e62b1c1..976a6a9 100644
---- a/Database/HDBC/Locale.hs
-+++ b/Database/HDBC/Locale.hs
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE CPP #-}
- module Database.HDBC.Locale
- (
- defaultTimeLocale,
-@@ -5,7 +6,12 @@ module Database.HDBC.Locale
- )
-
- where
-+
-+#if MIN_VERSION_time(1,5,0)
-+import Data.Time.Format (defaultTimeLocale)
-+#else
- import System.Locale (defaultTimeLocale)
-+#endif
-
- -- | As the semantic of System.Locale.iso8601DateFormat has changed with
- -- old-locale-1.0.0.2 in a non-compatible way, we now define our own
-diff --git a/Database/HDBC/SqlValue.hs b/Database/HDBC/SqlValue.hs
-index 9724f81..0e278cd 100644
---- a/Database/HDBC/SqlValue.hs
-+++ b/Database/HDBC/SqlValue.hs
-@@ -17,7 +17,11 @@ import Data.Char(ord,toUpper)
- import Data.Word
- import Data.Int
- import qualified System.Time as ST
--import Data.Time
-+import Data.Time ( Day (ModifiedJulianDay), DiffTime, LocalTime,
NominalDiffTime, ParseTime
-+ , TimeOfDay, TimeZone, UTCTime, ZonedTime, formatTime,
localDay, localTimeOfDay
-+ , parseTime, timeOfDayToTime, timeToTimeOfDay,
toModifiedJulianDay, utc
-+ , utcToZonedTime, zonedTimeToLocalTime, zonedTimeToUTC,
zonedTimeZone
-+ )
- import Data.Time.Clock.POSIX
- import Database.HDBC.Locale (defaultTimeLocale, iso8601DateFormat)
- import Data.Ratio
diff --git a/dev-haskell/hdbc/files/hdbc-2.4.0.0-ghc-7.10-2.patch
b/dev-haskell/hdbc/files/hdbc-2.4.0.0-ghc-7.10-2.patch
deleted file mode 100644
index d4e78b6..0000000
--- a/dev-haskell/hdbc/files/hdbc-2.4.0.0-ghc-7.10-2.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --git a/Database/HDBC/SqlValue.hs b/Database/HDBC/SqlValue.hs
-index 0e278cd..1ebf114 100644
---- a/Database/HDBC/SqlValue.hs
-+++ b/Database/HDBC/SqlValue.hs
-@@ -19,8 +19,13 @@ import Data.Int
- import qualified System.Time as ST
- import Data.Time ( Day (ModifiedJulianDay), DiffTime, LocalTime,
NominalDiffTime, ParseTime
- , TimeOfDay, TimeZone, UTCTime, ZonedTime, formatTime,
localDay, localTimeOfDay
-- , parseTime, timeOfDayToTime, timeToTimeOfDay,
toModifiedJulianDay, utc
-+ , timeOfDayToTime, timeToTimeOfDay, toModifiedJulianDay, utc
- , utcToZonedTime, zonedTimeToLocalTime, zonedTimeToUTC,
zonedTimeZone
-+#if MIN_VERSION_time(1,5,0)
-+ , parseTimeM
-+#else
-+ , parseTime
-+#endif
- )
- import Data.Time.Clock.POSIX
- import Database.HDBC.Locale (defaultTimeLocale, iso8601DateFormat)
-@@ -665,7 +670,11 @@ instance Convertible (TimeOfDay, TimeZone) SqlValue where
- instance Convertible SqlValue (TimeOfDay, TimeZone) where
- safeConvert (SqlString x) =
- do tod <- parseTime' "%T%Q %z" x
-+#if MIN_VERSION_time(1,5,0)
-+ tz <- case parseTimeM True defaultTimeLocale "%T%Q %z" x of
-+#else
- tz <- case parseTime defaultTimeLocale "%T%Q %z" x of
-+#endif
- Nothing -> convError "Couldn't extract timezone in"
(SqlString x)
- Just y -> Right y
- return (tod, tz)
-@@ -939,7 +948,11 @@ parseTime' _ inpstr =
- #else
- parseTime' :: (Typeable t, Convertible SqlValue t, ParseTime t) => String ->
String -> ConvertResult t
- parseTime' fmtstr inpstr =
-+#if MIN_VERSION_time(1,5,0)
-+ case parseTimeM True defaultTimeLocale fmtstr inpstr of
-+#else
- case parseTime defaultTimeLocale fmtstr inpstr of
-+#endif
- Nothing -> convError ("Cannot parse using default format string " ++
show fmtstr)
- (SqlString inpstr)
- Just x -> Right x
