Apply patch by Roman Cheplyaka to allow lifted-async 0.2.0.2-r1 to build with monad-control-1.0.0.1

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

4 files changed, 121 insertions, 5 deletions

diff --git a/dev-haskell/lifted-async/ChangeLog b/dev-haskell/lifted-async/ChangeLog
index 3e9f56efe49a..6567ce81cc39 100644
--- a/dev-haskell/lifted-async/ChangeLog
+++ b/dev-haskell/lifted-async/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-haskell/lifted-async
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/lifted-async/ChangeLog,v 1.3 2014/12/14 05:48:44 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/lifted-async/ChangeLog,v 1.4 2014/12/23 04:20:21 gienah Exp $
+
+*lifted-async-0.2.0.2-r1 (23 Dec 2014)
+
+  23 Dec 2014; Mark Wright <gienah@gentoo.org>
+  +files/lifted-async-0.2.0.2-monad-control-1.1.patch,
+  +lifted-async-0.2.0.2-r1.ebuild:
+  Apply patch by Roman Cheplyaka to allow lifted-async 0.2.0.2-r1 to build with
+  monad-control-1.0.0.1
 
 *lifted-async-0.2.0.2 (14 Dec 2014)
 
diff --git a/dev-haskell/lifted-async/Manifest b/dev-haskell/lifted-async/Manifest
index f62caa350a9e..79a3d8edac06 100644
--- a/dev-haskell/lifted-async/Manifest
+++ b/dev-haskell/lifted-async/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX lifted-async-0.2.0.2-monad-control-1.1.patch 2298 SHA256 c1f16daf0a231f7a4eac0edeef325cab3ce17eff26d3656ddd4b5e28b40ae8c5 SHA512 fbcd9e1c4dc34162fa928f4a528b16cc58d6b3a86ac3aea82dd33f448e5869a8d48add1c5b6c574dd588be6e68285fae98fccd8520adbc2e782210d70b4a8618 WHIRLPOOL fbf1189097217e73b82bb38ab7c6d92fe15611c74d31d373f6dd54059d774df680357d6c2a25a98e947a13322096e5972153acdadcf0e97e1be4b2bf7dfcd538
 DIST lifted-async-0.2.0.2.tar.gz 6907 SHA256 ee512dc63f21cc212db1a85f5acc49a96b6400f85012ed6fe68ede4e477b581f SHA512 a69e3f93c33ca76889afd894fcadb3f0d53fae05ff47bdbaa5d164deb756c60f7282671bdfa14d092b0a985f5cdf30746fcf847241aeda08be553f7c8d90bce3 WHIRLPOOL 6801186706e9b2746cb7928af21d494e353b6342e942dcee0ae9ac8b72fb3719c916842510400c9c8aed495062189b0256b842f205903dcd9f065e009fc3bc13
 DIST lifted-async-0.2.0.tar.gz 6831 SHA256 d430a5dbca6a526f773d5019c483f79b1fe49cdb5cca5b1a78aaa70d86f90fe9 SHA512 bd0182c0ecbd1a5e46979719431e2facde276e9e31dd33615e2b433cb535fb47a373bf1b30ab0911e9c03ad9fc9d8cb9dcc7070991a7172b9ca647b9df5a51cc WHIRLPOOL e000134c2451e18c6d232c6b0f9abecf219bb3466b5e20442a6fef6c0ab4d89127f370606d8c4e947cc951e56bdab36fa18e255a51b17a39357a45433eeb0745
+EBUILD lifted-async-0.2.0.2-r1.ebuild 1185 SHA256 7dd4cbe74da1dc27e827f100c809b9391d1d3ca0e99744a9c912339304c1ceb1 SHA512 92644d805b65bb81864c61b4cf32e02f90371c5449eafb7024b1ca6d7338f888bb67528e05df0cdd9bcccaf970c62f926c172220b0d29f083f3544b5dcc31a6c WHIRLPOOL 64e0359089801532a6de53efff1ac636e70765d8a6b3c072eeee7f8cd6b71a0913052057787ac88b1040a29177a3e9bfb9fa8c1e3b68df9687797e3222a4c74c
 EBUILD lifted-async-0.2.0.2.ebuild 1042 SHA256 fa9a5c2cfe5de3cbc383160ed92e8d207d1036dff7e7449c1e151be253dcd246 SHA512 aa1c973325e6881e5f28fb3ff41a70c066f622edb07d842af09a98b76f3f45f02b2bdd7ae9d1fcd43f389f403a5cfbd46f850a4662be4da98dbc2da1bc1241b3 WHIRLPOOL b41e6e382f52a346cfac92f37e885738d60e65bcb337e14329e07036e7626403a972f4ba5724320f26317586c9a59dd2e2ba15bf29d04cc2432b087528e11c9e
 EBUILD lifted-async-0.2.0.ebuild 1002 SHA256 cd7b543aa46c59faf22686c30ec8ad6a17bd93d05dd5dc724b368ed8c890ea47 SHA512 8b923c88b091e3fd13c8137482fe99de0082e51efda683a86bbc822ee744eec9d18399115c319107318daa0bd5a76355effefbd948285f24f0025f40bf71b298 WHIRLPOOL cb87e951586f2e95afa24e316e6770ed459aec8716cfd8760740e82077268de682503950b0cd177ffc5f46b8921de2f07e974dd3e70f6c864bfedfd47fc607b1
-MISC ChangeLog 642 SHA256 7510f52288a380ff3e3982fbaf26967a73b3bf66e99431701ce305935fe54a06 SHA512 d126cea771afa1637383a11e9d0c7b679f147dfbfd98357a66e71e56e77831af3c00f531e0005a6d1b716330c98f04a09466e42022501a30791ce6ac291cb93a WHIRLPOOL 698f531e3d0f89af3ac01d00a0b0bea1c655d86e72c546e0efd02f0d7673aff2221d38d2663833e33cc5a693d0a6460fc92c930b0d9b24c98e94536cae378eaf
+MISC ChangeLog 924 SHA256 6dbb51ecfc85058174b1edd00047c4d4cf687b65616a10b303edfe1194979f44 SHA512 663b25a73ed6d128ccdde55cfad1910035f04a240a0656b5dc7fb26f8ec40aaeb43bcb7703e54a85c1f8e990176156c76d864cd0831d98ab816d489cc2227df7 WHIRLPOOL 1364c3e2c0c4fe521924c7574a5acbfd8140fe26fcfd05b7b3b22c4b98d8775b2c98260ecf677c90da64ce6e64a940aba8387bd90b2b0ee3a709f0936e890384
 MISC metadata.xml 338 SHA256 7c7688f73d0bcdc37191eaa6dee1093301d3911f817536f93226e591b12b0ac0 SHA512 683dc63d17c9ef17aeb12c69ad6154ccf90ea0a80503df360c467c898fb53a7a1bb29a4ba752ef13f1c15527ae7a5a39fd0bb77b60ead65a224ec093513747bb WHIRLPOOL bea553225794a5b0adf017c283d782f647ec855af673948869d44213aa5844ece06e5ac5f5fd49c8ad089bc69333c3f2d776ae4d5008bf39a37ca72597590e36
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlSNJMIACgkQoBEVQmGOlx80YgD/YPrCOgZyqi7D8zn2gYSClEZC
-X9dlzxi9doLhuwRhMPIA/1INsS9ZHv4QETjCHjy127PL6YDWskoqhO08/RQWK/sg
-=4YWR
+iF4EAREIAAYFAlSY7YoACgkQoBEVQmGOlx+n3wD/Wj16cKQacRY2EAnFdnywDQqI
+BgDK4fQHA9rdZiuffCgBAMexR6k2izdDZT8MNYsHbffIggLl/hRauFdnbRgEiawd
+=jEmN
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/lifted-async/files/lifted-async-0.2.0.2-monad-control-1.1.patch b/dev-haskell/lifted-async/files/lifted-async-0.2.0.2-monad-control-1.1.patch
new file mode 100644
index 000000000000..970d9842f770
--- /dev/null
+++ b/dev-haskell/lifted-async/files/lifted-async-0.2.0.2-monad-control-1.1.patch
@@ -0,0 +1,69 @@
+commit 448176aa98e03a31121501af004d8159e92b2f66
+Author: Roman Cheplyaka <roma@ro-che.info>
+Date:   Tue Dec 16 12:09:52 2014 +0200
+
+    Make lifted-async build with monad-control-1.0
+
+diff --git a/src/Control/Concurrent/Async/Lifted.hs b/src/Control/Concurrent/Async/Lifted.hs
+index fa5a158..e5034c1 100644
+--- a/src/Control/Concurrent/Async/Lifted.hs
++++ b/src/Control/Concurrent/Async/Lifted.hs
+@@ -2,6 +2,7 @@
+ {-# LANGUAGE KindSignatures #-}
+ {-# LANGUAGE RankNTypes #-}
+ {-# LANGUAGE TypeFamilies #-}
++{-# LANGUAGE ScopedTypeVariables #-}
+ 
+ {- |
+ Module      : Control.Concurrent.Async.Lifted
+@@ -47,7 +48,7 @@ module Control.Concurrent.Async.Lifted
+ 
+ import Control.Applicative
+ import Control.Concurrent (threadDelay)
+-import Control.Monad ((>=>), forever, liftM, void)
++import Control.Monad ((>=>), forever, liftM)
+ import Data.Traversable (Traversable(..))
+ import GHC.IO (unsafeUnmask)
+ import Prelude hiding (mapM)
+@@ -180,11 +181,11 @@ waitCatch
+ waitCatch a = liftBase (A.waitCatch a) >>= sequenceEither
+ 
+ -- | Generalized version of 'A.cancel'.
+-cancel :: MonadBase IO m => Async (StM m a) -> m ()
++cancel :: MonadBase IO m => Async a -> m ()
+ cancel = liftBase . A.cancel
+ 
+ -- | Generalized version of 'A.cancelWith'.
+-cancelWith :: (MonadBase IO m, Exception e) => Async (StM m a) -> e -> m ()
++cancelWith :: (MonadBase IO m, Exception e) => Async a -> e -> m ()
+ cancelWith = (liftBase .) . A.cancelWith
+ 
+ -- | Generalized version of 'A.waitAny'.
+@@ -261,10 +262,10 @@ waitEitherCatchCancel a b =
+ -- | Generalized version of 'A.waitEither_'.
+ waitEither_
+   :: MonadBaseControl IO m
+-  => Async (StM m a)
+-  -> Async (StM m b)
++  => Async a
++  -> Async b
+   -> m ()
+-waitEither_ = (void .) . waitEither
++waitEither_ a b = liftBase (A.waitEither_ a b)
+ 
+ -- | Generalized version of 'A.waitBoth'.
+ waitBoth
+@@ -280,11 +281,11 @@ waitBoth a b = do
+ {-# INLINABLE waitBoth #-}
+ 
+ -- | Generalized version of 'A.link'.
+-link :: MonadBase IO m => Async (StM m a) -> m ()
++link :: MonadBase IO m => Async a -> m ()
+ link = liftBase . A.link
+ 
+ -- | Generalized version of 'A.link2'.
+-link2 :: MonadBase IO m => Async (StM m a) -> Async (StM m b) -> m ()
++link2 :: MonadBase IO m => Async a -> Async a -> m ()
+ link2 = (liftBase .) . A.link2
+ 
+ -- | Generalized version of 'A.race'.
diff --git a/dev-haskell/lifted-async/lifted-async-0.2.0.2-r1.ebuild b/dev-haskell/lifted-async/lifted-async-0.2.0.2-r1.ebuild
new file mode 100644
index 000000000000..d277aa509b2e
--- /dev/null
+++ b/dev-haskell/lifted-async/lifted-async-0.2.0.2-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/lifted-async/lifted-async-0.2.0.2-r1.ebuild,v 1.1 2014/12/23 04:20:21 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.3.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit base haskell-cabal
+
+DESCRIPTION="Run lifted IO operations asynchronously and wait for their results"
+HOMEPAGE="https://github.com/maoe/lifted-async"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="test" # patch has a test failure: withAsync waitEither : FAIL
+
+RDEPEND=">=dev-haskell/async-2.0.1:=[profile?]
+	>=dev-haskell/lifted-base-0.2:=[profile?]
+	>=dev-haskell/monad-control-0.3.1:=[profile?]
+	>=dev-haskell/transformers-base-0.4:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( dev-haskell/hunit
+		dev-haskell/mtl
+		dev-haskell/tasty
+		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.10
+		dev-haskell/tasty-th )
+"
+
+PATCHES=("${FILESDIR}/${PN}-0.2.0.2-monad-control-1.1.patch")