Patch darcs-2.8.5 for ghc 7.10

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

4 files changed, 163 insertions, 11 deletions

diff --git a/dev-vcs/darcs/ChangeLog b/dev-vcs/darcs/ChangeLog
index ac24a293ce2f..36d0fad312c4 100644
--- a/dev-vcs/darcs/ChangeLog
+++ b/dev-vcs/darcs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-vcs/darcs
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/ChangeLog,v 1.57 2014/12/14 09:28:01 gienah Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/ChangeLog,v 1.58 2015/01/03 02:28:30 gienah Exp $
+
+  03 Jan 2015; Mark Wright <gienah@gentoo.org>
+  +files/darcs-2.8.5-ghc-7.10.patch, darcs-2.8.5-r3.ebuild:
+  Patch darcs-2.8.5 for ghc 7.10
 
 *darcs-2.8.5-r3 (14 Dec 2014)
 
diff --git a/dev-vcs/darcs/Manifest b/dev-vcs/darcs/Manifest
index 423a563e9b4b..daaab3e65bb2 100644
--- a/dev-vcs/darcs/Manifest
+++ b/dev-vcs/darcs/Manifest
@@ -6,18 +6,19 @@ AUX darcs-2.8.4-ghc-7.8-part-1.patch 5679 SHA256 454ca11d487379d3d7b19acae2c599b
 AUX darcs-2.8.4-ghc-7.8-part-2.patch 449 SHA256 1f8fcdc2c2c0b40d5062cbb45ec4a58f4e5777306ed4e126f7cb57a80a1ab410 SHA512 3dd469ea3f42f2b2c5388a9a47cdd4c901af2b663c8c1cb5ae75c595915e141652d3fe9f89b898483c06d3ee9b2d7df651b401e215b8aac0c1431b6e17639e41 WHIRLPOOL ed31ee69948625cd3b0c028d819eb71bb987582ae44749c4660cf0896c8d1584d2907fb246ec4019470a0d49becea0bcdee4cb8d7f9c90cd10c96dbf84a66cdb
 AUX darcs-2.8.4-issue2364-part-2.patch 1787 SHA256 f4468cdad4a344f48e3cefcf977d3423f4a5a98bce04326d6578d11b022cc19f SHA512 54594052d5492d98472da7aee611314bd08e3dfd3bfbe55b082cf3071048b4a066ddcdbbf445be6774255f406c8f67a6c9a76e536817354b89902ee30eeed02b WHIRLPOOL b07f0d58c06d44691e4a5ac907d35903fa80aeddb13d3c18cbd9368cbc270ae5baf77e90326a1b569b39db08505dd8d3cd14e0a8d31e325b32377c131f58fec9
 AUX darcs-2.8.4-issue2364.patch 2955 SHA256 82a427123f74a288bad08a23189be94b2137c5a264faa8e96e12ec527174b53c SHA512 01c70841c53bfdc8d047bd91609a30e37dee9def3c52930709a990ad4918461f01d5467ff9a0c0771def5151fdc5198c9a883c2f25ff2a16be756f60029f1e2e WHIRLPOOL f7f6cc4dfe2458a038cf1df5f8d72e1d0acd4245d297221fdf3d08c00576fbb0f7040e7498b0f21f0a43ef55298ada4e14eb46943566f901fd6450a73a67af5e
+AUX darcs-2.8.5-ghc-7.10.patch 4824 SHA256 bf3f70b1e2a43aa252c9b4e62d4e2ac92db27875e7e1f016bef098702a4bc6bc SHA512 f26d65a30b416dccdbc24990ea9148ab862d3b83b7e6659fd8e7ed426cccc79ef3fa3cb9f29a09e8f17aad7ce00605237faf1d923b8306748ead4f1fabd84bba WHIRLPOOL d9d1b492f217773bfac2055be7b10fcff0947f8bb211be08ec5b322ab69478a5f92e7fb61e827a4fa85d4373f5a83f7f02c651f0a6befc329aab0d7d64cdc2f9
 DIST darcs-2.8.4.tar.gz 1301464 SHA256 3fab4dbb2d5dd9f381d49f4730c12e1534b5c484b0dde9712614a7151f659f98 SHA512 c60531bacea43bdd5a18ae461dd390fe64682cac56fa4e6b5153a5da3c003b59d8fb24827bd42b4b30f0d2c61877d36b58eb98317644f9f8a200ab7c5961c48e WHIRLPOOL 128e8e58e219d427928eb8725d9566c1b6b3bb478b3cda69b30ded8798fa104eb8dec0fda8a32701f5d074babf9f11f1b3036388cd15a82118853a566c832430
 DIST darcs-2.8.5.tar.gz 1306525 SHA256 064310ed589c89500e224ad5254ab88de815c349f14f9aef9513720eb857e399 SHA512 810fd8d2df2f8703891e85dc512b0185257dc84a35590aecb2077e14a78096b4fac57dbd7f89218987d04df846992d51c5d5c4deb8cc9f441ce9195ab202223b WHIRLPOOL 78cb6d20d8bd0af5eea71e3e737c12ef7063eb71f1788c2eb173abd5813930862b2e8f078243f2f650e4a65a4405b2d1d1539aef05a193e85521f367ec3ddd80
 EBUILD darcs-2.8.4-r3.ebuild 4518 SHA256 02f691062bdd148c0bc42bd9b805de612f05cc53354a73e063542814e2926498 SHA512 6adbf8b0217e1d7e2b0455896b194e256cbc019962037f592491d77bf338167277093ccc66ef359f9e7edc84c2629159406c0a91af93bdbc4f4a58bcfe24bb89 WHIRLPOOL 270679efd2794d8322c85f56dcc8c40021bd2eaba5d6fea89e792bc1be6786733f78c1069025cad6b034c57f4055261674e70b05fc95d348b46dbd6ece72e739
 EBUILD darcs-2.8.4-r6.ebuild 4857 SHA256 696ea07f05ea63db3d30be597bc4cd0188caf2a19d7d9c28dc3cfa6def2c1779 SHA512 5c2ed391ca9720a7ab0a6146d0044c36b6897df9b41285d4a925c2a2966b0ef4666ccfd5b51260c5e89de2b459fde93fb484fbf3c9d8e4e9484d86cbc1ba067a WHIRLPOOL 7d876a4202566a9ddcc579fb46858ade5d8a19235c3fa10ec5054ae6c77391eedd47f443dd7deff45cbc4dd45b6c2de773f053fc89e5b16e503e2ddc7e701ee7
 EBUILD darcs-2.8.4.ebuild 4007 SHA256 da954f2190488bf79281f4fb886e4905449b4558f60fb011702eb4c13a2f6166 SHA512 c4a5ffc93b719eb33cf43f869a4b2db67b3bc96a6296188900c15020fe536670f1eee4ff33605fb6a193ac0a0d533a6d47dd6bb79edf266065f50405634c31ba WHIRLPOOL ed40c3cc1e73a2bcc87d59a645e99f107387d104e553ccc515ab7c11aa5dc06473395ac6753ea20c0fc5bd2c667ed777b39a6939a20f6c730f6cb7223dda544b
-EBUILD darcs-2.8.5-r3.ebuild 3811 SHA256 b43e00225e476439cb2fef33a28c57438bf521f634596861c35aec56b7f7ea95 SHA512 cb009251df9c28da77a5025ad2d0796e260f3af6aad1dad9bb899493fd1d1d4637867dc6de42138657e70b695faf62422c7dfa07848776553c822abe5d9ef043 WHIRLPOOL 5573d0949dd16dc365c031d2667849d44b9305c2b686c0de10280ce81550b4225aa1e1ef474d581e3df66dc3cb06f024b80fe27f7251fa668fb2bd9e4753e010
-MISC ChangeLog 27325 SHA256 e422cb2537d0fe46f6ea60ff312f7015529e69d69e58fe6ca3eeb1c483732b20 SHA512 485266638b88aa764a99a24a8e93b2ca9e4abfdedd8af8c17e2852e2f09ec0691c57ead2d3ed7fd3ceb4eb28db9a7c8c05c855d92214fee0a4406a1784f169c1 WHIRLPOOL 096bdd546971ef9483185a1ccd3f0396d8b680bd75cb680bc486bf0a025a30a26f6bd377f39bad170bae15a0d0a972073ff399ba872798b10de08f05bbc352de
+EBUILD darcs-2.8.5-r3.ebuild 3981 SHA256 adfa51dd607fd846d0179956a5a2ee0899bf59edd68a1756350848e81abd125f SHA512 8a64e213e9b477026c69811e036dfade4215895bef9bfd2356ed65866d255d935fefa74fc60cdcecd3555e8a317edfbf0cfffa2ef5aa489ba630db5b3de1d348 WHIRLPOOL 0ef01a8e4d206e8bd7ecfeb4a8dca09e2b69b4639b27fdf7f62b7f25b3ea588a3711228986e8ed617e89aab683f5489170c520df223b378a6d6ce2b436b26d42
+MISC ChangeLog 27466 SHA256 fa0927020e2eafb6a77a43609cb78d401eb01b8c5876366c0b3627fd58889897 SHA512 fd3093e43c836662bed927edb04724b55dd32ee008e2980ce675dd601446cf2d74849f99691282a88c915054de3ae9a33aecc965e737101d7fb72c969f7b68e0 WHIRLPOOL 4b250e1ec1d6dfa9c45443cb6a01dc4daf4efaf8fbc03b6208b60e6dbd5b76d089d1566d45c9f4e6c1bb7b3d92643d51532300c93babd49a1496310f4c4fe9c1
 MISC metadata.xml 735 SHA256 82bf82ce859b26febe80df14ae3af5fed3865bab2a364c64f23ac197a43b2c1d SHA512 a942de2931a4ac42aa3ccd37867459c0775977994c6333e0847aa461ddd4c600d769f8213a00601888682471b0e1ecf2ad5cfaae90f3f13f0e33b4cd9b938144 WHIRLPOOL a9577eb48518bae820e4030f7adee6c8f1d461018945d2d6f25f2da0bf5db06ae0f5d0eb67b64b21e0ce5bb1cc3871b51fdc0f526df7feb8fb187b738489e7e5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlSNWCcACgkQoBEVQmGOlx+1RgEAj/Bc4DEyc3BVqHX+2o/dbrpm
-T+LHjODcuuV5NzR3/kUBALiFBleVwVZIOUL5++zJJCNZKmWWlA/MpRk6H451ahTi
-=eSIs
+iF4EAREIAAYFAlSnU9YACgkQoBEVQmGOlx+RIwD/XcjG/pir9KLXfJW9MwnRrr6Q
+AFZBigEMaZXr7Zzk+4EA/iM4O2NYo9q5UgSwDIM4J9jiAM04AEUeMQZ1qH+UvlsX
+=fFOd
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/darcs/darcs-2.8.5-r3.ebuild b/dev-vcs/darcs/darcs-2.8.5-r3.ebuild
index 2155e9228336..2cd6abc71408 100644
--- a/dev-vcs/darcs/darcs-2.8.5-r3.ebuild
+++ b/dev-vcs/darcs/darcs-2.8.5-r3.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-vcs/darcs/darcs-2.8.5-r3.ebuild,v 1.1 2014/12/14 09:28:01 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/darcs-2.8.5-r3.ebuild,v 1.2 2015/01/03 02:28:30 gienah Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ EAPI=5
 #hackport: flags: +library,+executable,-hpc,-warn-as-error
 
 CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
+inherit base haskell-cabal
 
 DESCRIPTION="a distributed, interactive, smart revision control system"
 HOMEPAGE="http://darcs.net/"
@@ -54,11 +54,16 @@ DEPEND="${RDEPEND}
 		>=dev-haskell/test-framework-quickcheck2-0.2.8:=[profile?] )
 "
 
+PATCHES=("${FILESDIR}/${P}-ghc-7.10.patch")
+
 src_prepare() {
+	base_src_prepare
 	cabal_chdeps \
 		'terminfo == 0.3.*' 'terminfo >= 0.3 && < 0.5' \
 		'text       >= 0.11.0.6 && < 1.2' 'text       >= 0.11.0.6 && < 1.3' \
-		'random     == 1.0.*' 'random     >= 1.0 && < 1.2'
+		'random     == 1.0.*' 'random     >= 1.0 && < 1.2' \
+		'base >= 4.5 && < 4.8' 'base >= 4.5 && < 4.9' \
+		'ghc >= 6.10 && < 7.10' 'ghc >= 6.10 && < 7.12'
 }
 
 src_configure() {
diff --git a/dev-vcs/darcs/files/darcs-2.8.5-ghc-7.10.patch b/dev-vcs/darcs/files/darcs-2.8.5-ghc-7.10.patch
new file mode 100644
index 000000000000..138c0848b9b8
--- /dev/null
+++ b/dev-vcs/darcs/files/darcs-2.8.5-ghc-7.10.patch
@@ -0,0 +1,142 @@
+--- darcs-2.8.5-orig/src/Darcs/Repository/Internal.hs	2014-08-26 06:27:34.000000000 +1000
++++ darcs-2.8.5/src/Darcs/Repository/Internal.hs	2015-01-03 12:18:03.576529408 +1100
+@@ -71,8 +71,8 @@
+                                  writeProblem, readProblem, readfromAndWritetoProblem )
+ import System.Directory ( doesDirectoryExist, setCurrentDirectory,
+                           createDirectoryIfMissing, doesFileExist )
+-import Control.Monad ( when, unless, filterM )
+-import Control.Applicative ( (<$>) )
++import Control.Monad ( when, unless, filterM, ap )
++import Control.Applicative ( Applicative(..), (<$>) )
+ import Control.Exception ( catch, IOException )
+ 
+ import Workaround ( getCurrentDirectory, renameFile, setExecutable )
+@@ -184,6 +184,10 @@
+ instance Functor (RIO p C(r u t t)) where
+     fmap f m = RIO $ \r -> fmap f (unsafeUnRIO m r)
+ 
++instance Applicative (RIO p C(r u t t)) where
++    pure  = return
++    (<*>) = ap
++
+ -- | We have an instance of Monad so that IO actions that do not
+ -- change the tentative recorded state are convenient in the IO monad.
+ instance Monad (RIO p C(r u t t)) where
+--- darcs-2.8.5-orig/src/Darcs/Patch/Prim/V1/Commute.hs	2014-08-26 06:27:34.000000000 +1000
++++ darcs-2.8.5/src/Darcs/Patch/Prim/V1/Commute.hs	2015-01-03 12:11:31.281425244 +1100
+@@ -6,7 +6,8 @@
+     where
+ 
+ import Prelude hiding ( pi )
+-import Control.Monad ( MonadPlus, msum, mzero, mplus )
++import Control.Applicative ( Applicative(..), Alternative(..) )
++import Control.Monad ( MonadPlus, msum, mzero, mplus, liftM, ap )
+ 
+ import qualified Data.ByteString as B (ByteString, concat)
+ import qualified Data.ByteString.Char8 as BC (pack)
+@@ -35,6 +36,17 @@
+ 
+ data Perhaps a = Unknown | Failed | Succeeded a
+ 
++instance Functor Perhaps where
++    fmap = liftM
++
++instance Applicative Perhaps where
++    pure  = return
++    (<*>) = ap
++
++instance Alternative Perhaps where
++    (<|>) = mplus
++    empty = mzero
++
+ instance  Monad Perhaps where
+     (Succeeded x) >>= k =  k x
+     Failed   >>= _      =  Failed
+--- darcs-2.8.5-orig/src/Darcs/IO.hs	2014-08-26 06:27:34.000000000 +1000
++++ darcs-2.8.5/src/Darcs/IO.hs	2015-01-03 12:06:40.423103022 +1100
+@@ -23,6 +23,7 @@
+ import Data.Char ( toLower )
+ import Data.List ( isSuffixOf )
+ import System.IO.Error ( isDoesNotExistError, isPermissionError )
++import Control.Applicative ( Applicative(..) )
+ import Control.Exception.Extensible ( catch, SomeException, IOException )
+ import Control.Monad.Error
+ import System.Directory ( createDirectory,
+@@ -97,6 +98,10 @@
+ instance Functor TolerantIO where
+     fmap f m = m >>= return . f
+ 
++instance Applicative TolerantIO where
++    pure  = return
++    (<*>) = ap
++
+ instance Monad TolerantIO where
+     f >>= g = runTM $ runIO f >>= runIO . g
+     f >> g = runTM $ runIO f >> runIO g
+@@ -106,6 +111,10 @@
+ instance Functor SilentIO where
+     fmap f m = m >>= return . f
+ 
++instance Applicative SilentIO where
++    pure  = return
++    (<*>) = ap
++
+ instance Monad SilentIO where
+     f >>= g = runTM $ runIO f >>= runIO . g
+     f >> g = runTM $ runIO f >> runIO g
+--- darcs-2.8.5-orig/src/Darcs/Patch/V2/Real.hs	2014-08-26 06:27:34.000000000 +1000
++++ darcs-2.8.5/src/Darcs/Patch/V2/Real.hs	2015-01-03 11:14:40.109221505 +1100
+@@ -29,6 +29,9 @@
+     , mergeUnravelled
+     ) where
+ 
++#if MIN_VERSION_base(4,8,0)
++import Prelude hiding ( (*>) )
++#endif
+ import Control.Monad ( mplus, liftM )
+ import qualified Data.ByteString.Char8 as BC ( ByteString, pack )
+ import Data.Maybe ( fromMaybe )
+--- darcs-2.8.5-orig/src/Darcs/Patch/V2/Non.hs	2014-08-26 06:27:34.000000000 +1000
++++ darcs-2.8.5/src/Darcs/Patch/V2/Non.hs	2015-01-03 11:14:08.073788136 +1100
+@@ -40,7 +40,11 @@
+     , (>>*)
+     ) where
+ 
++#if MIN_VERSION_base(4,8,0)
++import Prelude hiding ( rem, (*>) )
++#else
+ import Prelude hiding ( rem )
++#endif
+ import Data.List ( delete )
+ import Control.Monad ( liftM, mzero )
+ import Darcs.Patch.Commute ( commuteFL )
+--- darcs-2.8.5-orig/src/Darcs/Patch/V1/Commute.hs	2014-08-26 06:27:34.000000000 +1000
++++ darcs-2.8.5/src/Darcs/Patch/V1/Commute.hs	2015-01-03 12:11:47.084707544 +1100
+@@ -28,7 +28,8 @@
+     )
+        where
+ 
+-import Control.Monad ( MonadPlus, mplus, msum, mzero, guard )
++import Control.Applicative ( Applicative(..), Alternative(..) )
++import Control.Monad ( MonadPlus, mplus, msum, mzero, guard, liftM, ap )
+ 
+ import Darcs.Patch.Commute ( toFwdCommute )
+ import Darcs.Patch.ConflictMarking ( mangleUnravelled )
+@@ -69,6 +70,17 @@
+ 
+ data Perhaps a = Unknown | Failed | Succeeded a
+ 
++instance Functor Perhaps where
++    fmap = liftM
++
++instance Applicative Perhaps where
++    pure  = return
++    (<*>) = ap
++
++instance Alternative Perhaps where
++    (<|>) = mplus
++    empty = mzero
++
+ instance  Monad Perhaps where
+     (Succeeded x) >>= k =  k x
+     Failed   >>= _      =  Failed