gentoo resync : 16.09.2020

8 files changed, 1 insertions, 280 deletions

diff --git a/dev-haskell/lifted-async/Manifest b/dev-haskell/lifted-async/Manifest
index 165f58baac97..ac07b3bbcf64 100644
--- a/dev-haskell/lifted-async/Manifest
+++ b/dev-haskell/lifted-async/Manifest
@@ -1,14 +1,3 @@
-AUX lifted-async-0.2.0.2-monad-control-1.1.patch 2298 BLAKE2B 3a76cec4560fb618f7d68568d668e6baa8ed555befbfb9f0e778c9a2911b6a86d835ede634654e7665d292e23155e2234b6d5bd09c384cac4f66c3daa4d2aea3 SHA512 fbcd9e1c4dc34162fa928f4a528b16cc58d6b3a86ac3aea82dd33f448e5869a8d48add1c5b6c574dd588be6e68285fae98fccd8520adbc2e782210d70b4a8618
 DIST lifted-async-0.10.0.6.tar.gz 10308 BLAKE2B f9718ed3d97d4cb17b87d49efb594a7b61f11b6be9819b44bd8382a87bb247b754328db07417699f5140f6168d42c3d51fceaaaf33da748f9aba8683101cd6ec SHA512 9e5ae5d906df2577453c9b86f196f4bb4ec4d7766c5d9bcb7d2fa66be62daa44c033ed1475bdc004e1540da81f645a4d39db35142d32d09b33cfe9c01412f1ce
-DIST lifted-async-0.2.0.2.tar.gz 6907 BLAKE2B da3f85064197fe4dae8f54f28d040d05d4acb9d3bbc638d32af61edf0e361ad9b9398d858d808e8264caace4e88754aa75dab32fa60ae0837f8d9619f7dbf14b SHA512 a69e3f93c33ca76889afd894fcadb3f0d53fae05ff47bdbaa5d164deb756c60f7282671bdfa14d092b0a985f5cdf30746fcf847241aeda08be553f7c8d90bce3
-DIST lifted-async-0.6.0.1.tar.gz 8871 BLAKE2B d4629501d4696487a703b08216afd2baba298b100a4c1664e0dc43d29642b1b52fbf817a3582e3d9124d9bbfe896c18f399fa19877e10bad939941127ab9bc4b SHA512 afa436919bf50a343739ec9ca1e492cdac037df1e286812e77089c939303ce00a0f8681303eb41ea476df5d4013be6ef45c63c161ab0fa92b0ced4a0c4e57120
-DIST lifted-async-0.7.0.2.tar.gz 9096 BLAKE2B 48203cf7fb41108a37b236c827e5fcb623e3bd82b43df7a1ee6f8e47363bfcb08a8feb9c5908471e84df0cbb83480a2e1fb4fb4a94e906f8a63d71480a1601f0 SHA512 7dcbc10d0e5c055b3b1d3f4a2a69304b2b66413cb0ba99d1abb03f067b6f898b1aa0d9ed9deae0016fd1198717c048b8ba5b40e60ce3c1bf888c876dca15a222
-DIST lifted-async-0.8.0.1.tar.gz 9453 BLAKE2B f74d017f8afd51f08e48225b590d6b88899429214cc0a33fcac2bc5e1e67524d43e7d78830ff0be9258dbb333069331b18850968d1b896cd26abdf66943a472b SHA512 529a8c2c88f6277f5618d89f62d99318c9ae059c650f40e6cbc61f70621f073a10fff0ce3f27936d71a0dcd222afdbfa58d0922ae45075753d74c3e7bab5bcfa
-DIST lifted-async-0.9.1.1.tar.gz 10077 BLAKE2B 13132800149f014add45245ef3a2988fab4e1609b5f0cf05284d73f584e0a541d7eccc8e7a6ce5117fc374ab2c4c123adc9bc6fbdb52a5fc2662913b986a54f1 SHA512 c8e3d3e6bcfb361b5fe1bd948d21f8d2087e18b2f035557564e94fb444fae64baf0302d3938c5ca31f8a68a2fd5e7fb1389f1a318c3a2b447facee823511b5ad
 EBUILD lifted-async-0.10.0.6.ebuild 1264 BLAKE2B 6f4a009cb1f868dfcc3c7b08c621aff0f86784423d3552d39dc9599e48f4481cb06341c8bc697a55989d4183e9e112c34356b349dda2e3854d52ca3b9181a715 SHA512 b765eeb33987645ceaf6732f70ae8aa0c02f30e6a1e4b0b1a1c4ab8a734a758c717d78749e1ed27ecb0752bf54cd8cb954442c2d07bfc8daefebc34b2cdcead4
-EBUILD lifted-async-0.2.0.2-r1.ebuild 1047 BLAKE2B 629a2767424f499923bbcca3cf918b519c53897dcf9ced7a66c5ea6725703aea717606e5023822eb9bfb75b66b7a130e3d82c252d0f58b2dfa3d01f1af3cf2d0 SHA512 6cfb1dec33df8e95beebf2834ccf1299bfc4974e3bcf8ebd8db578d9e7a6c52d35a2efb592553e29a284a3aa3b278b35adc01b38ba8d99501cc72e09bf8a860c
-EBUILD lifted-async-0.6.0.1.ebuild 1396 BLAKE2B 8a25f5b31294e6674bf23da75297d725bb559fa6bcf41d661ebecd6cd20b2133f90d187fc671dffa4f37b1cba9e936d98c213c7214f62a02f079082f2810e25b SHA512 b21ebde7055e771efa3a82c91517ed8839ee853dc5aa0d2bc0709c2844c4fa39cf7f91c901b04ace7ce0312d1b9614903d032d635d7e50f6a61aedd780fc9a3c
-EBUILD lifted-async-0.7.0.2.ebuild 1401 BLAKE2B 2ed9d7fd30445b76ac8e01141d013017546c2da3bcd57ce72c4151612c70f4a0c7c06416b39cbe13f86c71a8e9db59134f54ca10ef4de50161f3d58b0a42d2f2 SHA512 a1e0b033f41fe260da3effe5ef6c4b51a79cc53f4e40edbbc332cd1de01e22933ce990a4b0c36278ea1b82e2d6c3b0cf175bb5f128f18d71c7b19da1651a216d
-EBUILD lifted-async-0.8.0.1-r1.ebuild 1360 BLAKE2B fd3e91a47dbec02b1624fc00e1c96807116143982c826d80ec5afad7f62a44ab546a5cc77b249a4cb1950c79fd839d71ade66df7c68badae65033da3f856a2e1 SHA512 59ee291784f406caaef21c8be459dfab3390777deb376de04e2b7ce8ea9f235e7d254831064c3f2a9670f165f924a386013849a106680391e4815a6e501754be
-EBUILD lifted-async-0.9.1.1-r1.ebuild 1402 BLAKE2B 23497636d21c00e08febad993510fc48f210feac77f455f4fe9b3bae2589da9880e0d981f8fa1fc30d1a68587ee498a3d5d01d2c8ecae1a45a1c7f89e9b8f234 SHA512 5448bc11cd87fd33a7400229e02061446a1c13b6c4b0153723efe5bf57b68768866c8799d744f52ece2c517ff763a6d79f012b995a8318d0d3e8cfcc3a08124e
-MISC metadata.xml 570 BLAKE2B 93b0c1bf5eeb84c781fed4f7818ea6f14a0100145d795acb37f99bfea839d6127c20d314b801671145f168712b25c86a9c6ad8826cc6d2524c229cba7872460a SHA512 3ac2ac2a66816f8bcd8caa84499255edb7995bc0a8f58fa28e5aca88a36b7cbd4b87e6981632a2706bdea09b1c52252a6b98ca7bf60cf9895ec1dd3a692de0c3
+MISC metadata.xml 492 BLAKE2B 1054dfb61e701dcbc93bd06af7a97086730390dc3c7a88b82ca810b39b3b326c1d2dba148c1f192ab668499074b409ac2ef21e22954ddcc301b32e00e955d63d SHA512 2b1616f6b44580f19d7974e3766e45d6b046bb4c8b96d3292fe2e9477643ad825aaa413788ae44e150ebea9b97a6be18227f4e5487d866c2aaa8fc5e34d72008
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
deleted file mode 100644
index 970d9842f770..000000000000
--- a/dev-haskell/lifted-async/files/lifted-async-0.2.0.2-monad-control-1.1.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-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
deleted file mode 100644
index 6eb3a3d3e4ee..000000000000
--- a/dev-haskell/lifted-async/lifted-async-0.2.0.2-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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="https://hackage.haskell.org/package/${P}/${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")
diff --git a/dev-haskell/lifted-async/lifted-async-0.6.0.1.ebuild b/dev-haskell/lifted-async/lifted-async-0.6.0.1.ebuild
deleted file mode 100644
index e0ff1c8210b5..000000000000
--- a/dev-haskell/lifted-async/lifted-async-0.6.0.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Run lifted IO operations asynchronously and wait for their results"
-HOMEPAGE="https://github.com/maoe/lifted-async"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+monad-control-1"
-
-RDEPEND=">=dev-haskell/async-2.0.1:=[profile?] <dev-haskell/async-2.1:=[profile?]
-	>=dev-haskell/lifted-base-0.2:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?]
-	>=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	monad-control-1? ( >=dev-haskell/constraints-0.2:=[profile?] <dev-haskell/constraints-0.5:=[profile?]
-				>=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] )
-	!monad-control-1? ( >=dev-haskell/monad-control-0:=[profile?] <dev-haskell/monad-control-1:=[profile?] )
-"
-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 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag monad-control-1 monad-control-1)
-}
diff --git a/dev-haskell/lifted-async/lifted-async-0.7.0.2.ebuild b/dev-haskell/lifted-async/lifted-async-0.7.0.2.ebuild
deleted file mode 100644
index bb02d14dd1e5..000000000000
--- a/dev-haskell/lifted-async/lifted-async-0.7.0.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Run lifted IO operations asynchronously and wait for their results"
-HOMEPAGE="https://github.com/maoe/lifted-async"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+monad-control-1"
-
-RDEPEND=">=dev-haskell/async-2.0.1:=[profile?] <dev-haskell/async-2.1:=[profile?]
-	>=dev-haskell/lifted-base-0.2:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?]
-	>=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	monad-control-1? ( >=dev-haskell/constraints-0.2:=[profile?] <dev-haskell/constraints-0.6:=[profile?]
-				>=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] )
-	!monad-control-1? ( >=dev-haskell/monad-control-0:=[profile?] <dev-haskell/monad-control-1:=[profile?] )
-"
-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 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag monad-control-1 monad-control-1)
-}
diff --git a/dev-haskell/lifted-async/lifted-async-0.8.0.1-r1.ebuild b/dev-haskell/lifted-async/lifted-async-0.8.0.1-r1.ebuild
deleted file mode 100644
index 90466b09e0bc..000000000000
--- a/dev-haskell/lifted-async/lifted-async-0.8.0.1-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Run lifted IO operations asynchronously and wait for their results"
-HOMEPAGE="https://github.com/maoe/lifted-async"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+monad-control-1"
-
-RDEPEND=">=dev-haskell/async-2.0.1:=[profile?] <dev-haskell/async-2.2:=[profile?]
-	>=dev-haskell/lifted-base-0.2:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?]
-	>=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	monad-control-1? ( >=dev-haskell/constraints-0.2:=[profile?]
-				>=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] )
-	!monad-control-1? ( >=dev-haskell/monad-control-0:=[profile?] <dev-haskell/monad-control-1:=[profile?] )
-"
-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 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag monad-control-1 monad-control-1)
-}
diff --git a/dev-haskell/lifted-async/lifted-async-0.9.1.1-r1.ebuild b/dev-haskell/lifted-async/lifted-async-0.9.1.1-r1.ebuild
deleted file mode 100644
index 8428de08c804..000000000000
--- a/dev-haskell/lifted-async/lifted-async-0.9.1.1-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Run lifted IO operations asynchronously and wait for their results"
-HOMEPAGE="https://github.com/maoe/lifted-async"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+monad-control-1"
-
-RDEPEND=">=dev-haskell/async-2.0.1:=[profile?] <dev-haskell/async-2.2:=[profile?]
-	>=dev-haskell/lifted-base-0.2:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?]
-	>=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	monad-control-1? ( >=dev-haskell/constraints-0.2:=[profile?] <dev-haskell/constraints-0.10:=[profile?]
-				>=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] )
-	!monad-control-1? ( >=dev-haskell/monad-control-0:=[profile?] <dev-haskell/monad-control-1:=[profile?] )
-"
-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 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag monad-control-1 monad-control-1)
-}
diff --git a/dev-haskell/lifted-async/metadata.xml b/dev-haskell/lifted-async/metadata.xml
index 7fd3c230ac1d..e8d11c949fe8 100644
--- a/dev-haskell/lifted-async/metadata.xml
+++ b/dev-haskell/lifted-async/metadata.xml
@@ -9,9 +9,6 @@
 		This package provides IO operations from @async@ package lifted to any
 		instance of 'MonadBase' or 'MonadBaseControl'.
 	</longdescription>
-	<use>
-		<flag name="monad-control-1">Use moand-control == 1.*</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">maoe/lifted-async</remote-id>
 	</upstream>