Patch hourglass-0.2.6 for ghc 7.10

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x618E971F

diff --git a/dev-haskell/hourglass/ChangeLog b/dev-haskell/hourglass/ChangeLog
index 40f04fe289f2385e4e49347506b350e57c7375f7..a16074f55f96340a3a1764013f73a7a83ed645ea 100644 (file)
--- a/dev-haskell/hourglass/ChangeLog
+++ b/dev-haskell/hourglass/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-haskell/hourglass
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hourglass/ChangeLog,v 1.1 2014/12/14 05:19:40 gienah Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hourglass/ChangeLog,v 1.2 2015/03/11 12:16:18 gienah Exp $
+
+  11 Mar 2015; Mark Wright <gienah@gentoo.org>
+  +files/hourglass-0.2.6-ghc-7.10.patch, hourglass-0.2.6.ebuild:
+  Patch hourglass-0.2.6 for ghc 7.10
 
 *hourglass-0.2.6 (14 Dec 2014)
 

diff --git a/dev-haskell/hourglass/Manifest b/dev-haskell/hourglass/Manifest
index 6b336b127e60f3446bdbb9cd47f981e0616de488..7b64a036281b470e6b5bec64a9823a0a3020f177 100644 (file)
--- a/dev-haskell/hourglass/Manifest
+++ b/dev-haskell/hourglass/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX hourglass-0.2.6-ghc-7.10.patch 480 SHA256 8749ab1411be067e0d9aa84a3b1c941eb393afe8f7bce6adf2790ed8cc27a8f0 SHA512 b390c9e1acdce7e7d5910b366e2d7cc965147ac7e571e3de0d6cdf7eb3a00805961e7cce6dad229cb782b5792992451fc457d24c3699347932fb92498e854b87 WHIRLPOOL f36677608c607d4f0feea84af9fdb551483c3b0102c3adf176cc5581855a4accf1ec82eed23d4e07235b05e1bd9da2456ad17ed2027b9ee0534b323b7a90de66
 DIST hourglass-0.2.6.tar.gz 23143 SHA256 a3a62b434c863848cb8ad97e0fb7e1712875a9a864115b8f3f324f934baf2e09 SHA512 f1c6157ffe218be04a6dfd4571a2e67ed5db0811e39f3374faa38bc1ab2e20e24f35f2a3e4b8439601249f7954bce032091f6733e051ea5aa4f5b20fc0aa4a1d WHIRLPOOL ecf99e010ae4ccd0a43d8ceb84847590e482ab68ed0dcf9af67df898caa7f2fd30be7a2c83d321494e9932ea2a334627ce572dd802d9c32dc53c7857b414bc81
-EBUILD hourglass-0.2.6.ebuild 781 SHA256 235394b789194253b7b55fab3e736a25af2f7223f443f515b2c13075915641f5 SHA512 666e43f9dd064c77e38a19803c82dc1b6ccfb09f60ebffeb0f979fa8348111f2fe28c049dfb54479001b96547f8f1d0a1ee87b4ac35fb9afec98ed8e6769a244 WHIRLPOOL b364514cf8add1174c299ebe59de92b9401956ea5502bf34b86bd7c66b8b42e177cf2d0a658da8ea339cd08c07d50b9957b89c8c26130b05091dc37be0e9d8b5
-MISC ChangeLog 352 SHA256 b3be46a9854fc118ce2823fcea7a9057a7d2dff8c5ea176bc2e237689e30793d SHA512 f240d46314260b1f599aa9a8bacd94892895e6eaa16fd56fe2d1d044a14b8355e50ef68231f20694580712b99de48ee89b1b44512c8f1e42f6d1b43f08d52b76 WHIRLPOOL bd4878f8aae969533df80344d86c495761dc7ca8e7d94677ab6cc02ab33f76d7c784fe990f0dd629a90f988c7618c5be0f6ac04043de010db3ebc8059c673f8b
+EBUILD hourglass-0.2.6.ebuild 838 SHA256 37eb99b23df7b348c0d7b51d88a40309a600d63723ca67db542156dc4728ee97 SHA512 b0f192e277cb4d18a3e19ae3b2b7b8e30c0de51107e7b63ad94c472cecad59e84a7bda04dae93be290e719c014d42a489e6150c975e9dbbadf976da8bec96f62 WHIRLPOOL 8b396355d4384bd0e6d28f8bdf26a710fc396f06efbfadc49fe07ac44740bc37aa05f04a7175d12e0de3596b2012fe1bc91f12ef04fae22b1d7b730134cc9092
+MISC ChangeLog 502 SHA256 59fcc16f77b21795f790058c04de10cc8341aeed58a50d517a6fb0c083ff5702 SHA512 1cdc1d8745da89b74fe0ee9f167f1ef074119e52dd79243dce0369a91a3461f0b4092567afff391fbf054d766e963580a27d4d6747969a61c8707f8d28025a44 WHIRLPOOL b5c8e71e2d4c19b49b2652ce9607ac2b6bf947edb1afc6bdf750166b7cc3756c83a3543b1532d0c69cbcc6edc627a31e60465c1813f4dc7d7aec3b4a383bf0a4
 MISC metadata.xml 485 SHA256 153843b0924ffd22844c1a876c7ff6388c587eb66ff334a672d771133499dd94 SHA512 f5c7c8c9b57bd8f1558a13bde71f2cdb44905bb135c28524f4eb0e0a620b3bedf7c733001e8bb1e0ef58d5966dd8a1fd75777504b3dd197b602db5c05979ad2d WHIRLPOOL 5334042022acd969bbfabf6f7936c3c1a6b1680b069ad449a968a24be42c1daaf482da4bd384e9c2fcb32198aac8deccbd759e24f0e2f5a2f80c3a1f31fbe537
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlSNHfIACgkQoBEVQmGOlx+duwD/YIqsyFy2FPHZz24LmU0zz0+W
-6pUPzq/+Rq5ANVxQiRUA/2pdicX3URsFSauK4McNeoljrEphMuWUtVptVKicMR0X
-=HeNW
+iF4EAREIAAYFAlUAMhYACgkQoBEVQmGOlx9qCAD/ZRkaBG9q5IOwd/ycbNP69LSR
+d/xYZ3CDEcj5rGltDjgBAMx4xhvbhUnMgPrpqJFQQOukceeJc5ZMJFWtCHtKW7qQ
+=fBWQ
 -----END PGP SIGNATURE-----

diff --git a/dev-haskell/hourglass/files/hourglass-0.2.6-ghc-7.10.patch b/dev-haskell/hourglass/files/hourglass-0.2.6-ghc-7.10.patch
new file mode 100644 (file)
index 0000000..1756ba2
--- /dev/null
+++ b/dev-haskell/hourglass/files/hourglass-0.2.6-ghc-7.10.patch
@@ -0,0 +1,14 @@
+--- hourglass-0.2.6-orig/tests/Tests.hs        2014-10-19 20:25:15.000000000 +1100
++++ hourglass-0.2.6/tests/Tests.hs     2015-01-03 16:56:11.788832544 +1100
+@@ -25,7 +25,11 @@
+ import qualified Data.Time.Clock as T
+ import qualified Data.Time.Clock.POSIX as T
+ import qualified Data.Time.Format as T
++#if MIN_VERSION_time(1,5,0)
++import qualified System.Locale as T hiding (defaultTimeLocale)
++#else
+ import qualified System.Locale as T
++#endif
+ 
+ import qualified Control.Exception as E
+ 

diff --git a/dev-haskell/hourglass/hourglass-0.2.6.ebuild b/dev-haskell/hourglass/hourglass-0.2.6.ebuild
index 437470350723df024c884952792144ea35241e52..39847575fb0bd46c03f2f3ccd0f946f2a35c8268 100644 (file)
--- a/dev-haskell/hourglass/hourglass-0.2.6.ebuild
+++ b/dev-haskell/hourglass/hourglass-0.2.6.ebuild
@@ -1,13 +1,13 @@
-# 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/hourglass/hourglass-0.2.6.ebuild,v 1.1 2014/12/14 05:19:40 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hourglass/hourglass-0.2.6.ebuild,v 1.2 2015/03/11 12:16:18 gienah Exp $
 
 EAPI=5
 
 # ebuild generated by hackport 0.4.3
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
+inherit base haskell-cabal
 
 DESCRIPTION="simple performant time related library"
 HOMEPAGE="https://github.com/vincenthz/hs-hourglass"
@@ -27,3 +27,5 @@ DEPEND="${RDEPEND}
                dev-haskell/tasty-hunit
                dev-haskell/tasty-quickcheck )
 "
+
+PATCHES=("${FILESDIR}/${PN}-0.2.6-ghc-7.10.patch")