Fix feed-0.3.9.2 build with utf8-string-1.0, patch by Alexander Vershilov (qnikst). Fix build with ghc 7.10.1, patch by me.

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 618E971F)

4 files changed, 86 insertions, 2 deletions

diff --git a/dev-haskell/feed/ChangeLog b/dev-haskell/feed/ChangeLog
index 03d65e53e7b0..c02045b2116b 100644
--- a/dev-haskell/feed/ChangeLog
+++ b/dev-haskell/feed/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-haskell/feed
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/feed/ChangeLog,v 1.5 2014/07/25 09:16:35 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/feed/ChangeLog,v 1.6 2015/04/04 01:00:07 gienah Exp $
+
+*feed-0.3.9.2-r1 (04 Apr 2015)
+
+  04 Apr 2015; Mark Wright <gienah@gentoo.org> +feed-0.3.9.2-r1.ebuild,
+  +files/feed-0.3.9.2-ghc-7.10.patch, +files/feed-0.3.9.2-utf8-string.patch:
+  Fix feed-0.3.9.2 build with utf8-string-1.0, patch by Alexander Vershilov
+  (qnikst). Fix build with ghc 7.10.1, patch by me.
 
   25 Jul 2014; Sergei Trofimovich <slyfox@gentoo.org> feed-0.3.9.2.ebuild:
   Drop trailing '.' from description.
diff --git a/dev-haskell/feed/feed-0.3.9.2-r1.ebuild b/dev-haskell/feed/feed-0.3.9.2-r1.ebuild
new file mode 100644
index 000000000000..4f8a758c87fb
--- /dev/null
+++ b/dev-haskell/feed/feed-0.3.9.2-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/feed/feed-0.3.9.2-r1.ebuild,v 1.1 2015/04/04 01:00:07 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds"
+HOMEPAGE="https://github.com/sof/feed"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/utf8-string:=[profile?]
+	>=dev-haskell/xml-1.2.6:=[profile?]
+	>=dev-lang/ghc-6.12.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8.0.2
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/"${P}"-utf8-string.patch
+	epatch "${FILESDIR}"/"${P}"-ghc-7.10.patch
+}
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
new file mode 100644
index 000000000000..41f672c8f910
--- /dev/null
+++ b/dev-haskell/feed/files/feed-0.3.9.2-ghc-7.10.patch
@@ -0,0 +1,20 @@
+--- 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
new file mode 100644
index 000000000000..323ae701cde4
--- /dev/null
+++ b/dev-haskell/feed/files/feed-0.3.9.2-utf8-string.patch
@@ -0,0 +1,25 @@
+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.