diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2016-05-11 09:47:53 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2016-05-11 09:48:03 +0100 |
| commit | 884aac6da3885132fd3523afdafe6f4230d2a6ea (patch) | |
| tree | 14c8b2f16b5a1eb46017d1cbd25b024e2735603f /dev-haskell/feed | |
| parent | dev-haskell/lifted-async: bump up to 0.8.0.1 (diff) | |
| download | gentoo-884aac6da3885132fd3523afdafe6f4230d2a6ea.tar.gz gentoo-884aac6da3885132fd3523afdafe6f4230d2a6ea.tar.bz2 gentoo-884aac6da3885132fd3523afdafe6f4230d2a6ea.zip | |
dev-haskell/feed: allow ghc-8
Package-Manager: portage-2.2.28
Diffstat (limited to 'dev-haskell/feed')
| -rw-r--r-- | dev-haskell/feed/feed-0.3.11.1.ebuild | 6 | ||||
| -rw-r--r-- | dev-haskell/feed/files/feed-0.3.9.2-ghc-7.10.patch | 20 | ||||
| -rw-r--r-- | dev-haskell/feed/files/feed-0.3.9.2-utf8-string.patch | 25 |
3 files changed, 6 insertions, 45 deletions
diff --git a/dev-haskell/feed/feed-0.3.11.1.ebuild b/dev-haskell/feed/feed-0.3.11.1.ebuild index 88c638b2a5d3..404dd307b796 100644 --- a/dev-haskell/feed/feed-0.3.11.1.ebuild +++ b/dev-haskell/feed/feed-0.3.11.1.ebuild @@ -31,3 +31,9 @@ DEPEND="${RDEPEND} >=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4 ) " + +src_prepare() { + cabal_chdeps \ + 'base >= 4 && < 4.9' 'base >= 4' \ + 'time < 1.6' 'time' +} diff --git a/dev-haskell/feed/files/feed-0.3.9.2-ghc-7.10.patch b/dev-haskell/feed/files/feed-0.3.9.2-ghc-7.10.patch deleted file mode 100644 index 41f672c8f910..000000000000 --- a/dev-haskell/feed/files/feed-0.3.9.2-ghc-7.10.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- feed-0.3.9.2-orig/Text/Feed/Query.hs 2013-10-28 02:48:21.000000000 +1100 -+++ feed-0.3.9.2/Text/Feed/Query.hs 2015-04-04 11:48:36.759173147 +1100 -@@ -1,3 +1,4 @@ -+{-# LANGUAGE CPP #-} - -------------------------------------------------------------------- - -- | - -- Module : Text.Feed.Query -@@ -62,7 +63,12 @@ - import Data.Maybe - - -- for getItemPublishDate rfc822 date parsing. -+#if MIN_VERSION_time(1,5,0) -+import System.Locale ( rfc822DateFormat, iso8601DateFormat ) -+import Data.Time ( defaultTimeLocale ) -+#else - import System.Locale ( rfc822DateFormat, iso8601DateFormat, defaultTimeLocale ) -+#endif - import Data.Time.Format ( ParseTime, parseTime ) - - feedItems :: Feed.Feed -> [Feed.Item] diff --git a/dev-haskell/feed/files/feed-0.3.9.2-utf8-string.patch b/dev-haskell/feed/files/feed-0.3.9.2-utf8-string.patch deleted file mode 100644 index 323ae701cde4..000000000000 --- a/dev-haskell/feed/files/feed-0.3.9.2-utf8-string.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/Text/Feed/Import.hs b/Text/Feed/Import.hs -index 8fde5f9..c001cee 100644 ---- a/Text/Feed/Import.hs -+++ b/Text/Feed/Import.hs -@@ -12,6 +12,7 @@ - -- - -------------------------------------------------------------------- - -+{-# LANGUAGE CPP #-} - module Text.Feed.Import - ( parseFeedFromFile -- :: FilePath -> IO Feed - , parseFeedString -- :: String -> IO Feed -@@ -32,7 +33,12 @@ import Text.XML.Light.Lexer ( XmlSource ) - - import Control.Monad - -+#if MIN_VERSION_utf8_string(1,0,0) -+import Prelude as UTF8 (readFile) -+import Prelude -+#else - import System.IO.UTF8 as UTF8 ( readFile ) -+#endif - - -- | 'parseFeedFromFile fp' reads in the contents of the file at @fp@; - -- the assumed encoding is UTF-8. |