Port to ghc-7.10/time-1.5.

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

7 files changed, 115 insertions, 28 deletions

diff --git a/dev-haskell/hdbc/ChangeLog b/dev-haskell/hdbc/ChangeLog
index 5105cdbbc7f9..e1c0642f914e 100644
--- a/dev-haskell/hdbc/ChangeLog
+++ b/dev-haskell/hdbc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-haskell/hdbc
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc/ChangeLog,v 1.22 2015/06/06 11:12:46 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc/ChangeLog,v 1.23 2015/08/01 16:07:28 slyfox Exp $
+
+  01 Aug 2015; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/hdbc-2.4.0.0-ghc-7.10-1.patch, +files/hdbc-2.4.0.0-ghc-7.10-2.patch,
+  hdbc-2.3.1.2.ebuild, hdbc-2.4.0.0.ebuild, hdbc-2.4.0.1.ebuild:
+  Port to ghc-7.10/time-1.5.
 
   06 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add github to remote-id in metadata.xml
diff --git a/dev-haskell/hdbc/Manifest b/dev-haskell/hdbc/Manifest
index 5c5ee35c5dae..b0f117aea2fc 100644
--- a/dev-haskell/hdbc/Manifest
+++ b/dev-haskell/hdbc/Manifest
@@ -1,30 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
+AUX hdbc-2.4.0.0-ghc-7.10-1.patch 1399 SHA256 d2b7ceb0ca06e02ba6e69d6dfb0a6b4c78f952c39d4df5f1308b10a56ef04679 SHA512 eb996ad0be88b2aae04885bfcd4f253f2bdaa8cde6f5e988d799a2a7c2784f90ee7d1b091813418ae34c967832ccbb3d4063714c8494128a6eabe48b29d15e6e WHIRLPOOL 0097f6896d4affc09527ed074be9157a6a599897174fdebceb9380245d1e52d973a9fb3921f176be665caf459283a4b7f09970b6fc2ba713ef3efe695db8d4fc
+AUX hdbc-2.4.0.0-ghc-7.10-2.patch 1952 SHA256 055e3c33d76fb9eb9ec590a43e3f508af26a3fe1eb79e7be275258c7f2295b21 SHA512 ab2a6dba7ebcc8369ea1caefd167528377e29f7a1a54aae003e070aba1e3b68728e73a4616cec561e338623f0dbf5f839d19a3f5fba554b892920b3e89a38b0e WHIRLPOOL 435d0e25248bce68345511df7b41cd6ab9f6d96bd861f4ee42b4a96e854bf8e975047f271e54744f8900f91a0327a54f42e9a1f51fdf328ef1243bf8dad37e0f
 DIST HDBC-2.3.1.2.tar.gz 23314 SHA256 07c962ebaf94f15df65dc0da875bda370abd2d163ab3fe3a946931dd11ac4ae6 SHA512 e98ca4043c311eb8e5adb02d1a59bc0d1be84ba66c224b848649a596de214a2a38b8bedfe71fa8f17ae0843cf073e814c76e7e868aca1e20619e3d5fa573109c WHIRLPOOL 76e909d4ac6ef0dce33a2771c7dba864b0e863251c76e8b9e97f706bbe36f78af566d8ec5e0bc4779161bae91528c8f6bddd7f8fdfe941d00a3f750f1d238eac
 DIST HDBC-2.4.0.0.tar.gz 23076 SHA256 de60f6881c9f613931bce3615b57bf4375a4fbc8520b5b8e17b1bf7541ce93ff SHA512 1a02a9ee2ed52e534ad4040f18c1335c41e815940921fe24f447a52dbcea889fca1fc65a4e805f8d283bab1180437db7912db625dbd042bc692d07a5131b0f71 WHIRLPOOL f7a78563206fade4b99e2b2947e01d7239ec36fb4d9ab1a00c8536f0ec950adde64f87b9e82b8a35c3c73977ca784774b2ef47c5c58073bd0b0f2bf1056d9eac
 DIST HDBC-2.4.0.1.tar.gz 23415 SHA256 7a3ee21c41e716111c4a3742a66eb448683719a9384afbf7021c5942ac73d2ad SHA512 1a20a533ffe7700cfb48c9875e9c6b09f940c1b808fd1a371327eed9c358abfe0167d206bb5b2dbb904b49f2081f91f81091d4164aad2aa08555f6de01a55d5a WHIRLPOOL 9c375d0828c1deb7d97a1312d56a41543aa342480965e39f73dd68fef79f5c68c30159f94ebf3bc2a8f80eb3a41ea08618ba499ef61cfa41725cb4507062b8f0
-EBUILD hdbc-2.3.1.2.ebuild 1612 SHA256 81b56e2b6705a160fc90879a99a5efc28c178126d866698c80a0f1e2ac3050dd SHA512 2ad04fbbcf94a3c374580d0ebdee5799cec641c52e409b0fd8775ecfd432573be89865eab441e06bde4b3b53621e7091e3e16439a9af8182834977985ceed6b8 WHIRLPOOL 451d679fc44557608ab141f6ef313de64985e2d5156437425b456d0740ec6aa7a0e00195816458a181ffdc7dddc1a3a37c32684cf0c1d9c90363778f12cac3c4
-EBUILD hdbc-2.4.0.0.ebuild 1379 SHA256 2af74ce6e1973b17da9c263b8fbc6b39926acc9e5887e84bdc30bad4db5889ca SHA512 b28ade8000ea02466247804d397ad6b2dd28ce37d9495768ae41b7a6ae47342ecee2a14929a3e8b023e67d86f36cebf6c4266391802e39f8e781ee1527c20612 WHIRLPOOL 282906ad69ea1817e67dbddb25196f0e54084893f2ac2c7624b6dae4f14c6250140b91156273e49b17cea4fb5d42a0f4f7682a4b7bb8147eb876d95a9c337d79
-EBUILD hdbc-2.4.0.1.ebuild 1464 SHA256 9bf05c001d724f242f91931ef3317ad48b5d0e833ebc43d3247411dc7271647a SHA512 549e9676a5ab504afd93e523dd6fe9eba06f1111b36299de146649795f51cfa802183148e3c0dc139a6bc11f2272a8db28eecf2292b6c93b2729c5c277fe1066 WHIRLPOOL f5d5e6420b0df18846d6f20745e43bca7d615fb1371ca27b12455a60e4dec0a666124d3f285ee012d6166862b0f4c89169c2cc50cc75ce3cebabb79e382ab87b
-MISC ChangeLog 3452 SHA256 72dcd9f38edcea6a2a7d12c6e6a8cb3f2024fa0638ce6a0b6bbed3941517515e SHA512 cbfd568bb855928ad69c89d1c4fb86c92e127e9fec4bcc389ee2169809db39aa3f07cfdea213e43f74c9e6515e2f49f87c7d24bc77a12924b83d0d19d86902ae WHIRLPOOL d9d35d3d5174c93aa9aab9aabc804f0ef1372cc28fae8c9eac98178f3500b0acf6ad055bd0e2989e4fb5caa8913920c8dbc05f9ba716092e991d51189c4bec9b
+EBUILD hdbc-2.3.1.2.ebuild 1657 SHA256 6af268d68f1df537babd5042384db6e2f7617120953733fc56a9c0f5aebd12b7 SHA512 72c7c7fb212a0213adb011d970408991439a36201e7c07ae7ad5963414b91a3ca4acc6b54b1d0b433cbe68209940bfae85b422cfbb37ef43e6c64d57f25a3eab WHIRLPOOL ee328606f25fcd769807788cfcc253629065e068b9c6cfe809c45adfcd52bbeeed53b777570905e12577681890eaa3f072fabbe75967c9b75adc55aaecc42977
+EBUILD hdbc-2.4.0.0.ebuild 1641 SHA256 87e054a9de05ee5c3ab63fc7d160deb8bd8390c700ef48614fdc62676900fecf SHA512 038802ceb1a407bae038621e266841864f7f5502df05955fa09c0fd8f8b70fdabfa5151cd92fa24f436b4c5fcbdb0a66d4ce009eba32a204608b57ad748d110b WHIRLPOOL 415c3225a381d824121aa2171031f099edb3e742455111a2be031566fa915d36505a5c0ba002bbebebd959a83a82ab6eddffd6f9e72589854a4088cc50010836
+EBUILD hdbc-2.4.0.1.ebuild 1464 SHA256 431ef3401004b2b5318007a70bc75493a0840a74a8c13504f8d0e31d169dcf3b SHA512 485b645084b7bd63e17af85a88ff5e07629d117c54d1992ad547f73a86f2ee3a7f2c71984406d40149c207818a0bbbbfcf95a00bd386db1a0ca760b1c5b7e3e1 WHIRLPOOL c40bcc9a285cf733009836d5d9309e9cc258a89a9a20cbfe21fa113049fa7f57296649329c42f9dd9a8bc0ac53f937a30b4538806bb8fa4056351746a8d017ef
+MISC ChangeLog 3681 SHA256 dfdb5e1a4d2b28825c4d08fad8f8c946224fd7fcdcbcd0ab25e175c760f82d4c SHA512 4f96e02d734610c1fe99f234afcc5910b6ec0a3f9a27b1c8502f77c6aeb53e382d67cd2582a4805aeb82ed11862d72b95fa9e5f429bb2be0907be9aba39ee3a6 WHIRLPOOL e81b0328a29b06dc8251b6da3f774c9f5acdf250fca17425e3e7cce635ba430baf97bd3ec639bb80f8005036efc08895b5f50906387a7c6d05a7e37e1798c557
 MISC metadata.xml 542 SHA256 a84ea7ec4ee2a7357676c731f189b1506fc0c5f241edffe8951345465cf8e846 SHA512 bfc67cc4c0008af841122445a87fa0f4c20948aa03ea8697255806aee14413f4b40b9f075e5d894605c76f989395c956936e100f7ea6714af92275668a7a3403 WHIRLPOOL 67860fd7262239b53c0abbd551d094679a3cb4e554e5bfb2f1a038e9da2a5a3e2d5e944dc3006efcfd80c0dd6d38711c332e2b08e8889f756632d2716fe98bba
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVctWvXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiQugP/jg18o2GotHYH/ouRRnYJmgZ
-NLc13lh6s2CA7y5As5M2Hs8gYBJtHFzCyQViVq5xA7SUtPdE40fqhVQ5KrO+qo1w
-bTS7i79uijfhMUixZie+9v3TaZVPmG3MuCc+/oMjBxmPWYyvIUyMuORQ0K0OrMV3
-xkrwJtlvrEw6f2NsrofNNgv/+zzlK8sCuzpYVr1FZioLl3BoqvBFxAVW5NnWz2Bt
-81qFGmfbDEAbFV5RsX6Kn7MOGy8vvyv7D1bJ6fnsH+vKJCmSJGWaHUOGI/fymvm1
-0mrBzUh63jPZLBecQBIIUSM3fMEQjwJCXHUe6uo6AQqVgnaSHyVu6cwaMMKglJmw
-FFmmZFzT8Xj9UsecwZxgroFmC4/7b9McKtVx9N1h7sAkS5SF0BZqGKjODOMTeP3X
-z2wbS1/o9cin9XYC8CnrsLTyiC0dI7Hxjy6VZV74fOUH2heQcaGqw57KHngDIgyQ
-jZ2GJht7nSfD5ijp3wcR9K1900D26b8sfdJCEzcKiTdM+aaTd2HHDNVHow+nPvnO
-bVCY4x7bIhy/xh1Qyq7dp+MZPaG1paSklazlr99cgjDax9pRI2gZIWBFqAXnGQZl
-RF1JEl+jWZLS0rNfKb7CgXfbLA2wKlPd/FhBU+ItElQNBgoWhWyrPOz6tEzpWpho
-txEhX8l18GfCKgiSdbEb
-=MOsi
+iEYEAREIAAYFAlW87sEACgkQcaHudmEf86qDnwCeOpOxhHIVdyW/gDGc2eTulp5X
+2GkAn3fBap08/bYu+WbAKRv4N8WHDR2y
+=79yH
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..6b79476b6662
--- /dev/null
+++ b/dev-haskell/hdbc/files/hdbc-2.4.0.0-ghc-7.10-1.patch
@@ -0,0 +1,39 @@
+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
new file mode 100644
index 000000000000..d4e78b6f8cd2
--- /dev/null
+++ b/dev-haskell/hdbc/files/hdbc-2.4.0.0-ghc-7.10-2.patch
@@ -0,0 +1,43 @@
+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
diff --git a/dev-haskell/hdbc/hdbc-2.3.1.2.ebuild b/dev-haskell/hdbc/hdbc-2.3.1.2.ebuild
index ccb76d497b54..eeea6959cb0f 100644
--- a/dev-haskell/hdbc/hdbc-2.3.1.2.ebuild
+++ b/dev-haskell/hdbc/hdbc-2.3.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc/hdbc-2.3.1.2.ebuild,v 1.2 2015/05/05 20:54:59 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc/hdbc-2.3.1.2.ebuild,v 1.3 2015/08/01 16:07:28 slyfox Exp $
 
 EAPI=5
 
@@ -21,7 +21,7 @@ SLOT="2/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="mysql odbc postgres sqlite test"
 
-RDEPEND=">=dev-haskell/convertible-1.0.10.0:=[profile?]
+RDEPEND=">=dev-haskell/convertible-1.0.10.0:=[profile?] <dev-haskell/convertible-1.1.0.0:=[profile?]
 		dev-haskell/mtl:=[profile?]
 		dev-haskell/text:=[profile?]
 		dev-haskell/utf8-string:=[profile?]
diff --git a/dev-haskell/hdbc/hdbc-2.4.0.0.ebuild b/dev-haskell/hdbc/hdbc-2.4.0.0.ebuild
index a3b92617cf57..ee50f6d03e43 100644
--- a/dev-haskell/hdbc/hdbc-2.4.0.0.ebuild
+++ b/dev-haskell/hdbc/hdbc-2.4.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc/hdbc-2.4.0.0.ebuild,v 1.1 2014/07/03 12:03:08 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc/hdbc-2.4.0.0.ebuild,v 1.2 2015/08/01 16:07:28 slyfox Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ EAPI=5
 #hackport: flags: buildtests:test
 
 CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
+inherit base haskell-cabal
 
 MY_PN="HDBC"
 MY_P="${MY_PN}-${PV}"
@@ -21,6 +21,7 @@ LICENSE="BSD"
 SLOT="2/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="test" # Tests do not compile with time 1.5
 
 RDEPEND=">=dev-haskell/convertible-1.1.0.0:=[profile?]
 	dev-haskell/mtl:=[profile?]
@@ -37,6 +38,15 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=("${FILESDIR}/${PN}-2.4.0.0-ghc-7.10-1.patch"
+		"${FILESDIR}/${PN}-2.4.0.0-ghc-7.10-2.patch")
+
+src_prepare() {
+	base_src_prepare
+	cabal_chdeps \
+		'time>=1.1.3 && <=1.5' 'time>=1.1.3 && <=1.6'
+}
+
 src_configure() {
 	haskell-cabal_src_configure \
 		$(cabal_flag test buildtests)
diff --git a/dev-haskell/hdbc/hdbc-2.4.0.1.ebuild b/dev-haskell/hdbc/hdbc-2.4.0.1.ebuild
index 26e903067f3f..051bb64b5399 100644
--- a/dev-haskell/hdbc/hdbc-2.4.0.1.ebuild
+++ b/dev-haskell/hdbc/hdbc-2.4.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc/hdbc-2.4.0.1.ebuild,v 1.1 2015/04/03 23:52:02 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc/hdbc-2.4.0.1.ebuild,v 1.2 2015/08/01 16:07:28 slyfox Exp $
 
 EAPI=5