Patch dav-1.0.3 for ghc 7.10.1

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

4 files changed, 48 insertions, 10 deletions

diff --git a/dev-haskell/dav/ChangeLog b/dev-haskell/dav/ChangeLog
index df4e0ff7b80a..00a130295480 100644
--- a/dev-haskell/dav/ChangeLog
+++ b/dev-haskell/dav/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-haskell/dav
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/dav/ChangeLog,v 1.7 2014/12/14 11:06:47 gienah Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/dav/ChangeLog,v 1.8 2015/04/05 05:18:25 gienah Exp $
+
+  05 Apr 2015; Mark Wright <gienah@gentoo.org> +files/dav-1.0.3-ghc-7.10.patch,
+  dav-1.0.3.ebuild:
+  Patch dav-1.0.3 for ghc 7.10.1
 
 *dav-1.0.3 (14 Dec 2014)
 
diff --git a/dev-haskell/dav/Manifest b/dev-haskell/dav/Manifest
index 2c5d3b97060b..1842647ad523 100644
--- a/dev-haskell/dav/Manifest
+++ b/dev-haskell/dav/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX dav-1.0.3-ghc-7.10.patch 1424 SHA256 684958fec0ea1510161f352353728532c5c0dad44a0849b89dc3d42c8cdc5bbf SHA512 3f3cffcb45d90127616f5593ceae27aa5cbae5b719f030f58c75fc2aab02ceac5ad2e09742bd8b328d18177fb3fc5d5b0516129c3da69ede8a2723b7062be446 WHIRLPOOL fd00a9ff195bda77c4fff325e5965a167104db3e9d9b949a0f0683394583f85e8babc305f7efa5aa68341c7d2b121caa62b41b9fd9caac2984e686ce33b3b5f0
 DIST DAV-0.4.1.tar.gz 18631 SHA256 0c681423f2b4577f92f3aa44e064381c4cd004ed623b77f86e6bffdc23b5992d SHA512 280aef7ab401df1a8b724a6ba610257085fa1829b38860dfc676c4764a95ea3a9e53d6c18007a66bad0caff931891138c9512361d2d21107582a44e534cc98ff WHIRLPOOL 6e8e2c12b5c7aff908dd9aa493c7059c21bdb4caa55f05267a484061bcbc8a606dd251f745586665d1e6593e2b5d33681cf33f7a2d7712f80bc6282d6a024905
 DIST DAV-0.5.1.tar.gz 18657 SHA256 5253e1ba8a29ed3d7bbec7f33eb6d8e65b9056c2171264876babccf28c87258b SHA512 b72d757c2dc94d328b144fd3b9d2601d3adf3795bff6b49b436684306abc0f147aaedf1e782303bfdfe1803d6821cf19215caa5faaf5184822f6887a008f91ff WHIRLPOOL 13b053bedca13bc8025b8b8c526e7451536ef288dbfe93dc52eb76b96814517b8e04db112376965bd3d8359910f9fa7087ca76caa2ee1a3127ff113d65773a30
 DIST DAV-0.6.1.tar.gz 19610 SHA256 ff758b4af16dade33f7196a2d6ac9cb98848c17ec9688c03a196b3f4cb770249 SHA512 0cca59bc6607927e80554c3edab1759b98993658da41c1d213828b14cae389026349d07c72a9bc3d4808f76946631c37fe1af2ebe02194684117f2ba0c17810e WHIRLPOOL 27c7cbbf8d3c52c0ebfea69c446b6417b24aad83d19c9296ed9358748a9dbadd114b9d4e5a242b5f1a54c8a38d0aafcaf7fa77faa54a641c8650fddd60562bf0
@@ -12,13 +13,13 @@ EBUILD dav-0.5.1.ebuild 1331 SHA256 fa106f018615e94883a8f89d9236872cfa450dfa1a18
 EBUILD dav-0.6.1.ebuild 1458 SHA256 2245544d5c6f9802b9bc696be90c6785c600e1503b5e588bc40dec33b8c8e3bf SHA512 c3ca753958c368289a87a7a00a4676894a8e2cc76e11eeea26e5fcd981b3f9552b4228be6967b79e731195aa97915b7ba02919fb7f63269e74c7ac126cfddc4b WHIRLPOOL 8119e3a73ccb1db2ee777f6f48efe5d860c750fbae0adadacb5f54f3a922ffa4e6757baea3a7e7024da3371e37d7d36ae3a46f5600fa50950e72f3206a2ad32b
 EBUILD dav-0.6.2.ebuild 1455 SHA256 f5c37b2fd5623d398b8eadf6ac77f11204f9a24a53f03236ddd4730963d2ebe4 SHA512 bf7da9cc101f42ca3bee33d4028b3560d636a5ec0eab95af0971f9e044d7f4b013a2be212a867ba77b423d8af8f308925f7f093a5cb4e33e789a91408fbb3242 WHIRLPOOL 3b989473407da8fae2fb07bd9ee2a30577f7d339ba8c630b0274ca47efdc16b0a6da755e42aeee31d7bf6cb84b2e3c1b0ae28190465fc1c35ea591911f906ed7
 EBUILD dav-1.0.1.ebuild 1477 SHA256 621d8dce641a7449a30d536f56b3ed42f59d02ae1eb3dc2438a2601f62627b8b SHA512 9c87a6ec905ef24ed2d385b90ee7507c226252e0a7d12b146393a3f8aaabdf0882268a8d20343f2fa6ca40879c0b2ba245621b4b8eacc09d57faab29c3e8a03c WHIRLPOOL b0e9cac9beec7e95600f836bb6c24379bd220eff4d15e660b06a844ac4e5dd0c1aa5d823984acd45b3ed762b604d2a00c7fa26dd3968bdd1d5253b1e9700e8a0
-EBUILD dav-1.0.3.ebuild 1738 SHA256 f980b56dfa87948ec9b575b9133bfbcc9346f7e3187d0638307c13ab8bd28498 SHA512 cf254844cb75ea78551f6e17921c1dd6e0468ad485f91927d68a20b50641e67c7f93b906248aaa6dd64a87052b7a18a76dc290679e2cdd62da468027851808c4 WHIRLPOOL c32b5d5c615fb7d03f643317ac90c5687ca4e00de553cf52d141076577acf7349595cb36b4b4bf39206b054d7b9f4519c97ac1b80860023cde84bc9d42458be5
-MISC ChangeLog 1143 SHA256 e827c62563554f9bb54bc4736a902b3660937afcf92764f60cc4d155dbbf88c9 SHA512 86f49c1a75ffb9e8818e597816b477e001c456290503db5347e632ea77964c9c2e25900bb97aae1991a82171e5d5a187b4b603bbf4bdbd5bd189864c2bfb1538 WHIRLPOOL dda1a949250d37546f2c9d001061520896292569d3752c99f18fd91df81de7f098afcb765b05c8eee37917b188fd0141791314a686454301906ddb0a1efbe7d1
+EBUILD dav-1.0.3.ebuild 1795 SHA256 9e96493ac3847bdb2d97e618db185a22af14b04838ad26e11f449bece7966767 SHA512 1aac49007f8874030aad501d6e6e606a853e9eda2170cb0bd2708dbf79cc02dd59cf98c7309fd47a44a825ea3b7efd89f8f5f16c7248c05e21e043c7e9983d9a WHIRLPOOL 03b3742ec4cb78900e5db65ed7a3542c52613c2b8749d286763b795c03f2070f76d89de0da48dfc6bb063bbaab43f33f367bd9a1878ddaeff663dd3fa7036ba3
+MISC ChangeLog 1277 SHA256 a7c9fbd18e29fac4c0c3e9f9ed70d42650635141a121ed9e3f7a49bf376e587a SHA512 15d88002abd6c327987e7dff9c70ebcf43e46d2c8fd2bd1cd008d2d898e858f5e2516d2a6f04e88b678f016f604810fa1f03ff5a8e7b0051f783d2d366de1dd7 WHIRLPOOL 061c6857ab67a8e8dcfaaf1da14656bfaafbb53837601a685bdd45a5afe266c7215011378edb92a016c9ff50f3103da5eab1a8ab9c9de23224e4669fb21bbc76
 MISC metadata.xml 562 SHA256 fe27e3017c544b0fee11a27313436c695e52b0ee89a09ad9af694cd1142f07cb SHA512 f67f5aa409832d3fb589696bcc482427a10fc15791b5eabc4e204d837f939baa2a8bfddf1858f9e3b5c79388902f81d7f7072608c8bd52b45862a00d91f58856 WHIRLPOOL 15bb40e6770a0884ce6107e622bc7f20cae52253e0c04f92c98ed8351c371eb299392cd0ee5bb6eba814ae3673187831498dad6e6c78ceecc6cb5806ef578dfd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlSNb0wACgkQoBEVQmGOlx8USwD/ZjCELAbglKqYSc+lVe73//nw
-rVDieqKKXMWnAnVUIkUBAJtlNso2FzHQyQGIIajBQ1likqn/7zZCWGdSfHfCwKoY
-=WbT3
+iF4EAREIAAYFAlUgxacACgkQoBEVQmGOlx/huwD/W3C3fOgmdMxGDp0E+e9zuEGs
+4mLqUi7YGH2c4hHmZCoA/jcjyXY/9aQXoKjx0bvj99YhBWfLPPjQfauM7ubcp/63
+=Jw93
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/dav/dav-1.0.3.ebuild b/dev-haskell/dav/dav-1.0.3.ebuild
index a5349d77496c..27a38ec878b9 100644
--- a/dev-haskell/dav/dav-1.0.3.ebuild
+++ b/dev-haskell/dav/dav-1.0.3.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/dav/dav-1.0.3.ebuild,v 1.1 2014/12/14 11:06:47 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/dav/dav-1.0.3.ebuild,v 1.2 2015/04/05 05:18:25 gienah Exp $
 
 EAPI=5
 
 # ebuild generated by hackport 0.4.4.9999
 
 CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
+inherit base haskell-cabal
 
 MY_PN="DAV"
 MY_P="${MY_PN}-${PV}"
@@ -48,6 +48,8 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=("${FILESDIR}/${PN}-1.0.3-ghc-7.10.patch")
+
 src_configure() {
 	haskell-cabal_src_configure \
 		$(cabal_flag network-uri network-uri)
diff --git a/dev-haskell/dav/files/dav-1.0.3-ghc-7.10.patch b/dev-haskell/dav/files/dav-1.0.3-ghc-7.10.patch
new file mode 100644
index 000000000000..a291e7308c00
--- /dev/null
+++ b/dev-haskell/dav/files/dav-1.0.3-ghc-7.10.patch
@@ -0,0 +1,31 @@
+--- DAV-1.0.3-orig/hdav.hs	2014-10-15 03:15:28.000000000 +1100
++++ DAV-1.0.3/hdav.hs	2015-04-05 14:41:10.869833370 +1000
+@@ -16,6 +16,8 @@
+ -- You should have received a copy of the GNU General Public License
+ -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
++{-# LANGUAGE FlexibleContexts #-}
++
+ import qualified Data.ByteString.Char8 as BC8
+ 
+ import Paths_DAV (version)
+--- DAV-1.0.3-orig/Network/Protocol/HTTP/DAV.hs	2014-10-15 03:15:28.000000000 +1100
++++ DAV-1.0.3/Network/Protocol/HTTP/DAV.hs	2015-04-05 14:40:00.119911047 +1000
+@@ -52,7 +52,7 @@
+ 
+ import Network.Protocol.HTTP.DAV.TH
+ 
+-import Control.Applicative (liftA2, Applicative)
++import Control.Applicative (liftA2, Alternative, Applicative)
+ import Control.Error (EitherT(..))
+ import Control.Lens ((^.), (.=), (%=), (.~))
+ import Control.Monad (when, MonadPlus)
+@@ -89,7 +89,7 @@
+     def = DAVContext [] def B.empty B.empty [] Nothing def Nothing "hDav-using application"
+ 
+ newtype DAVT m a = DAVT { runDAVT :: EitherT String (StateT DAVContext m) a }
+-    deriving (Applicative, Functor, Monad, MonadBase b, MonadError String, MonadFix, MonadIO, MonadPlus, MonadState DAVContext)
++    deriving (Alternative, Applicative, Functor, Monad, MonadBase b, MonadError String, MonadFix, MonadIO, MonadPlus, MonadState DAVContext)
+ 
+ -- this orphan instance is probably a bad idea
+ instance MonadMask m => MonadMask (EitherT e m) where