commit: 879e8573075256241b5cae3988e9cb2985cf93c2
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 12 19:42:30 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Sep 12 19:45:08 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=879e8573
dev-haskell/shelly: drop old
Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
dev-haskell/shelly/Manifest | 4 -
.../files/shelly-1.5.6-monad-control-1.1.patch | 95 ----------------------
dev-haskell/shelly/files/shelly-1.6.5-ghc-8.patch | 16 ----
.../files/shelly-1.6.8.1-ghc-8.0.2_rc1.patch | 9 --
dev-haskell/shelly/shelly-1.5.6-r1.ebuild | 39 ---------
dev-haskell/shelly/shelly-1.6.5.ebuild | 45 ----------
dev-haskell/shelly/shelly-1.6.6.ebuild | 53 ------------
dev-haskell/shelly/shelly-1.6.8.1.ebuild | 55 -------------
8 files changed, 316 deletions(-)
diff --git a/dev-haskell/shelly/Manifest b/dev-haskell/shelly/Manifest
index 686e6e51a44..4f1c8ddb5d8 100644
--- a/dev-haskell/shelly/Manifest
+++ b/dev-haskell/shelly/Manifest
@@ -1,5 +1 @@
-DIST shelly-1.5.6.tar.gz 28264 BLAKE2B
ec1a51e8799a7d0e37f31f737cfcf50bb780636094365991693b19f89ba5c72dbf7c40ed922352d76294ca8a07fcb73ba2359613ff2a244831b6fe82d6457b94
SHA512
522aa76454211b9f31dc92f052703e3f9f4a103c134da063ff5c4c04e209a1f881dc10c0f8589c557ad179a8dc319951b897b8ff401dd8f9a371f69f1def6022
-DIST shelly-1.6.5.tar.gz 97274 BLAKE2B
0cb2ef6482f509e9547dc6571b8d7e2eaf61fb0ceca2be5ed5ab423118ff69032205711b697a539e45c27551149ec79fc95e176f5b6afe7d8ccdf3c8b1f46208
SHA512
6a5b418987392d755e7faf60206a3e9283e98f56a4d9d9f956c0385074ff8909fb6bddceb050b00dbd0f8eda55eeb4897d9afd2f8dd2d510367567336a7a6770
-DIST shelly-1.6.6.tar.gz 97529 BLAKE2B
a171ceba324ca8775604d7ddedb0bb26697d1161231f5b0fed5611fb9f035e2db61011891f4be9bf8fcc7df1b4d3d50b89f7fed15b48f5bc1a5bfb1c6b891802
SHA512
1b78cb84d126f6bb67db3a3d5e669759e71811e2770831af41a4867d094f89b32c3cf39363cc39c808e71019d6e7eca18d25e854bbf4160bd3388c6769a8665c
-DIST shelly-1.6.8.1.tar.gz 97802 BLAKE2B
08f0f5d7e86b803804f6fae7c66fccf2cd5ae044dd8cb164f49254e311644bee4d103cf04ca9c7b20fb4d29e742ed9480d6c714205bdebb07656b5f925491b4e
SHA512
76ab37289a9b6c51ecb6d5326161b326a4015ed27f6c61cd889d4dbf8f6417e6629d0059fdf65ec40f4093cb921ea3b4871105ccd77c94f863c2a087e3c2fab6
DIST shelly-1.9.0.tar.gz 73344 BLAKE2B
f12e8835be5dd648427ff92b73bc9a37215a47067e65456c4c3dc8e9c2e5bb610da171648aadf9759e9a91eb075fa74d06241f83977a5380f49bc861643707cc
SHA512
7c1eb25439e08095187746d0101fd92ad56ebb5a706820bad7330667cfc806066d4675c677e5d267440d4af7b517f36449e8f5e75332521780b564edc1586254
diff --git a/dev-haskell/shelly/files/shelly-1.5.6-monad-control-1.1.patch
b/dev-haskell/shelly/files/shelly-1.5.6-monad-control-1.1.patch
deleted file mode 100644
index a2ef39376c0..00000000000
--- a/dev-haskell/shelly/files/shelly-1.5.6-monad-control-1.1.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-commit 33b32439e7ef1ba60cc8d72ae0f0c53b6d01ae90
-Merge: d3aec33 b70a308
-Author: Greg Weber <g...@gregweber.info>
-Date: Mon Dec 22 10:32:40 2014 -0800
-
- Merge pull request #84 from yesodweb/monad-control-1.0
-
- monad-control 1.0
-
-commit d3aec338e23a03027c404aaf5a7b5790b3300ec5
-Author: Luite Stegeman <stege...@gmail.com>
-Date: Mon Dec 22 16:21:01 2014 +0100
-
- bump time upper bound
-
-diff --git a/shelly.cabal b/shelly.cabal
-index ed0d086..3d3c46d 100644
---- a/shelly.cabal
-+++ b/shelly.cabal
-@@ -39,7 +39,7 @@ Library
-
- Build-depends:
- containers >= 0.4.2.0,
-- time >= 1.3 && < 1.5,
-+ time >= 1.3 && < 1.6,
- directory >= 1.1.0.0 && < 1.3.0.0,
- mtl >= 2,
- process >= 1.0,
-
-commit c1da49fb0d59a56c9e4140a5cbf0700c9fc1ca5f
-Author: Luite Stegeman <stege...@gmail.com>
-Date: Mon Dec 22 16:20:18 2014 +0100
-
- Add Alternative instance for Sh, since it's now a superclass of
- MonadPlus.
-
-diff --git a/src/Shelly/Pipe.hs b/src/Shelly/Pipe.hs
-index a8d0182..f0a64ec 100644
---- a/src/Shelly/Pipe.hs
-+++ b/src/Shelly/Pipe.hs
-@@ -138,6 +138,10 @@ instance Applicative Sh where
- pure = return
- (<*>) = ap
-
-+instance Alternative Sh where
-+ empty = mzero
-+ (<|>) = mplus
-+
- instance MonadPlus Sh where
- mzero = Sh $ return []
- mplus a b = Sh $ liftA2 (++) (unSh a) (unSh b)
-
-commit b70a308ad14af0b57bbdd9cf8441bdc30ff65c36
-Author: Michael Snoyman <mich...@snoyman.com>
-Date: Mon Dec 22 13:49:54 2014 +0200
-
- monad-control 1.0
-
-diff --git a/shelly.cabal b/shelly.cabal
-index ed0d086..99a85d3 100644
---- a/shelly.cabal
-+++ b/shelly.cabal
-@@ -46,7 +46,7 @@ Library
- unix-compat < 0.5,
- system-filepath >= 0.4.7 && < 0.5,
- system-fileio < 0.4,
-- monad-control >= 0.3.2 && < 0.4,
-+ monad-control >= 0.3.2 && < 1.1,
- lifted-base,
- lifted-async,
- exceptions == 0.6.*,
-diff --git a/src/Shelly/Base.hs b/src/Shelly/Base.hs
-index e05ad43..3d6fe00 100644
---- a/src/Shelly/Base.hs
-+++ b/src/Shelly/Base.hs
-@@ -71,11 +71,19 @@ instance MonadBase IO Sh where
- liftBase = Sh . ReaderT . const
-
- instance MonadBaseControl IO Sh where
-+#if MIN_VERSION_monad_control(1,0,0)
-+ type StM Sh a = StM (ReaderT (IORef State) IO) a
-+ liftBaseWith f =
-+ Sh $ liftBaseWith $ \runInBase -> f $ \k ->
-+ runInBase $ unSh k
-+ restoreM = Sh . restoreM
-+#else
- newtype StM Sh a = StMSh (StM (ReaderT (IORef State) IO) a)
- liftBaseWith f =
- Sh $ liftBaseWith $ \runInBase -> f $ \k ->
- liftM StMSh $ runInBase $ unSh k
- restoreM (StMSh m) = Sh . restoreM $ m
-+#endif
-
- instance Catch.MonadThrow Sh where
- throwM = liftIO . Catch.throwM
diff --git a/dev-haskell/shelly/files/shelly-1.6.5-ghc-8.patch
b/dev-haskell/shelly/files/shelly-1.6.5-ghc-8.patch
deleted file mode 100644
index 75d56220e38..00000000000
--- a/dev-haskell/shelly/files/shelly-1.6.5-ghc-8.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/Shelly/Lifted.hs b/src/Shelly/Lifted.hs
-index 825201d..cdca61b 100644
---- a/src/Shelly/Lifted.hs
-+++ b/src/Shelly/Lifted.hs
-@@ -2,4 +2,4 @@
- FlexibleInstances, FlexibleContexts, IncoherentInstances,
-- TypeFamilies, ExistentialQuantification, RankNTypes,
-- ImpredicativeTypes #-}
-+ TypeFamilies, ExistentialQuantification, RankNTypes
-+ #-}
- {-# OPTIONS_GHC -fno-warn-orphans #-}
-@@ -299,3 +299,3 @@ instance (MonadShControl m, Monoid w)
- controlSh :: MonadShControl m => ((forall x. m x -> Sh (ShM m x)) -> Sh (ShM
m a)) -> m a
--controlSh = liftShWith >=> restoreSh
-+controlSh r = liftShWith r >>= restoreSh
- {-# INLINE controlSh #-}
diff --git a/dev-haskell/shelly/files/shelly-1.6.8.1-ghc-8.0.2_rc1.patch
b/dev-haskell/shelly/files/shelly-1.6.8.1-ghc-8.0.2_rc1.patch
deleted file mode 100644
index 078f979fd01..00000000000
--- a/dev-haskell/shelly/files/shelly-1.6.8.1-ghc-8.0.2_rc1.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/src/Shelly/Pipe.hs b/src/Shelly/Pipe.hs
-index 7fe7d98..cc5668d 100644
---- a/src/Shelly/Pipe.hs
-+++ b/src/Shelly/Pipe.hs
-@@ -121,3 +121,3 @@ import Data.Text as T hiding (concat, all, find, cons)
-
--default (T.Text)
-+-- default (T.Text)
-
diff --git a/dev-haskell/shelly/shelly-1.5.6-r1.ebuild
b/dev-haskell/shelly/shelly-1.5.6-r1.ebuild
deleted file mode 100644
index 9620c6db8fd..00000000000
--- a/dev-haskell/shelly/shelly-1.5.6-r1.ebuild
+++ /dev/null
@@ -1,39 +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.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit base haskell-cabal
-
-DESCRIPTION="shell-like (systems) programming in Haskell"
-HOMEPAGE="https://github.com/yesodweb/Shelly.hs";
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz";
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/async:=[profile?]
- dev-haskell/enclosed-exceptions:=[profile?]
- >=dev-haskell/exceptions-0.6:=[profile?]
<dev-haskell/exceptions-0.7:=[profile?]
- dev-haskell/lifted-async:=[profile?]
- dev-haskell/lifted-base:=[profile?]
- >=dev-haskell/monad-control-0.3.2:=[profile?]
<dev-haskell/monad-control-1.1:=[profile?]
- >=dev-haskell/mtl-2:=[profile?]
- <dev-haskell/system-fileio-0.4:=[profile?]
- >=dev-haskell/system-filepath-0.4.7:=[profile?]
<dev-haskell/system-filepath-0.5:=[profile?]
- dev-haskell/text:=[profile?]
- dev-haskell/transformers:=[profile?]
- dev-haskell/transformers-base:=[profile?]
- <dev-haskell/unix-compat-0.5:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
-"
-
-PATCHES=("${FILESDIR}/${PN}-1.5.6-monad-control-1.1.patch")
diff --git a/dev-haskell/shelly/shelly-1.6.5.ebuild
b/dev-haskell/shelly/shelly-1.6.5.ebuild
deleted file mode 100644
index 8f5f1da427b..00000000000
--- a/dev-haskell/shelly/shelly-1.6.5.ebuild
+++ /dev/null
@@ -1,45 +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="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="shell-like (systems) programming in Haskell"
-HOMEPAGE="https://github.com/yesodweb/Shelly.hs";
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz";
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="lifted"
-
-RDEPEND="dev-haskell/async:=[profile?]
- dev-haskell/enclosed-exceptions:=[profile?]
- >=dev-haskell/exceptions-0.6:=[profile?]
<dev-haskell/exceptions-0.9:=[profile?]
- dev-haskell/lifted-async:=[profile?]
- dev-haskell/lifted-base:=[profile?]
- >=dev-haskell/monad-control-0.3.2:=[profile?]
<dev-haskell/monad-control-1.1:=[profile?]
- >=dev-haskell/mtl-2:=[profile?]
- <dev-haskell/system-fileio-0.4:=[profile?]
- >=dev-haskell/system-filepath-0.4.7:=[profile?]
<dev-haskell/system-filepath-0.5:=[profile?]
- dev-haskell/text:=[profile?]
- dev-haskell/transformers:=[profile?]
- dev-haskell/transformers-base:=[profile?]
- <dev-haskell/unix-compat-0.5:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( >=dev-haskell/hspec-1.5
- >=dev-haskell/hunit-1.2
- >=dev-haskell/text-0.11 )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag lifted lifted)
-}
diff --git a/dev-haskell/shelly/shelly-1.6.6.ebuild
b/dev-haskell/shelly/shelly-1.6.6.ebuild
deleted file mode 100644
index fde63b69885..00000000000
--- a/dev-haskell/shelly/shelly-1.6.6.ebuild
+++ /dev/null
@@ -1,53 +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.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="shell-like (systems) programming in Haskell"
-HOMEPAGE="https://github.com/yesodweb/Shelly.hs";
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz";
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="lifted"
-
-RDEPEND="dev-haskell/async:=[profile?]
- dev-haskell/enclosed-exceptions:=[profile?]
- >=dev-haskell/exceptions-0.6:=[profile?]
<dev-haskell/exceptions-0.9:=[profile?]
- dev-haskell/lifted-async:=[profile?]
- dev-haskell/lifted-base:=[profile?]
- >=dev-haskell/monad-control-0.3.2:=[profile?]
<dev-haskell/monad-control-1.1:=[profile?]
- >=dev-haskell/mtl-2:=[profile?]
- <dev-haskell/system-fileio-0.4:=[profile?]
- >=dev-haskell/system-filepath-0.4.7:=[profile?]
<dev-haskell/system-filepath-0.5:=[profile?]
- dev-haskell/text:=[profile?]
- dev-haskell/transformers:=[profile?]
- dev-haskell/transformers-base:=[profile?]
- <dev-haskell/unix-compat-0.5:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( >=dev-haskell/hspec-1.5
- >=dev-haskell/hunit-1.2
- >=dev-haskell/text-0.11 )
-"
-
-PATCHES=("${FILESDIR}"/${PN}-1.6.5-ghc-8.patch)
-
-src_prepare() {
- cabal_chdeps \
- 'time >= 1.3 && < 1.6' 'time
>= 1.3'
- default
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag lifted lifted)
-}
diff --git a/dev-haskell/shelly/shelly-1.6.8.1.ebuild
b/dev-haskell/shelly/shelly-1.6.8.1.ebuild
deleted file mode 100644
index 3a938c2007c..00000000000
--- a/dev-haskell/shelly/shelly-1.6.8.1.ebuild
+++ /dev/null
@@ -1,55 +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.9999
-#hackport: flags: build-examples:examples
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="shell-like (systems) programming in Haskell"
-HOMEPAGE="https://github.com/yesodweb/Shelly.hs";
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz";
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples lifted"
-
-RDEPEND="dev-haskell/async:=[profile?]
- dev-haskell/enclosed-exceptions:=[profile?]
- >=dev-haskell/exceptions-0.6:=[profile?]
<dev-haskell/exceptions-0.9:=[profile?]
- dev-haskell/lifted-async:=[profile?]
- dev-haskell/lifted-base:=[profile?]
- >=dev-haskell/monad-control-0.3.2:=[profile?]
<dev-haskell/monad-control-1.1:=[profile?]
- >=dev-haskell/mtl-2:=[profile?]
- <dev-haskell/system-fileio-0.4:=[profile?]
- >=dev-haskell/system-filepath-0.4.7:=[profile?]
<dev-haskell/system-filepath-0.5:=[profile?]
- dev-haskell/text:=[profile?]
- dev-haskell/transformers-base:=[profile?]
- <dev-haskell/unix-compat-0.5:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( >=dev-haskell/hspec-1.5
- >=dev-haskell/hunit-1.2
- >=dev-haskell/text-0.11 )
-"
-
-PATCHES=("${FILESDIR}"/${P}-ghc-8.0.2_rc1.patch)
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'directory >= 1.1.0.0 && < 1.3.0.0' 'directory
>= 1.1.0.0'
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag examples build-examples) \
- $(cabal_flag lifted lifted)
-}
