gentoo resync : 14.07.2018

9 files changed, 357 insertions, 0 deletions

diff --git a/dev-haskell/shelly/Manifest b/dev-haskell/shelly/Manifest
new file mode 100644
index 000000000000..922c5429968f
--- /dev/null
+++ b/dev-haskell/shelly/Manifest
@@ -0,0 +1,12 @@
+AUX shelly-1.5.6-monad-control-1.1.patch 2847 BLAKE2B c979ca3d31f146dd18e49526e131130a61c6c3b35cf0b87148d9ea7097d2690f4b7d5255a06c45f87b1077d98516443e41bf6c8a2d9b89f93cf1d9860422a4ed SHA512 f2a386defa742076f4a0062597113f86706eccfcacfe62483536bbffe410d5c752b8c59c365c89a39f99dbb83c88cf2c3a4f76e4d5132858f254be5cad420e00
+AUX shelly-1.6.5-ghc-8.patch 700 BLAKE2B a1bad8d6dccb17b40f87178f377bcf8abbb485cf5ca8c599182a1b96635eb4df83a7ea1f4266ddd0e57f11b921a3b4a346a511611a81ae531cef3df498b67ef0 SHA512 fcbdb8b61cb471c2d3731c84e334875b3c5b8e4752e679097df99c80e31c15785878d2f73ba3e6247991ee3941896922e07f42aff2fbd33fa5f3eb7c8a8ad7cd
+AUX shelly-1.6.8.1-ghc-8.0.2_rc1.patch 251 BLAKE2B 6d4a799f132b9ed9d0b1558c0b4616c8458f40e8d7ceddd09cf288646ab265d9ff854db7af2c76e63c15ae6f21799045ed83b1178807c4841a046fda4f1c7d81 SHA512 46b6992227ee15ab9d02b52e897a7507c2e0cd97b4b2d4b1899d269c132ff0ac4179fe3693f4e538adb174b2ff523eb85c419f54bbe7a95d2154bbdae8720d81
+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
+EBUILD shelly-1.5.6-r1.ebuild 1265 BLAKE2B 066de23f0b060d8110830f9d975a1b2d6e365d48aa66fc97bbe17585fabfeed88a8558a5de4fa6197b35af2a70706b51e1fc8a42fe354ab3e34fd030f3fd52e2 SHA512 7b94d6e9eb605531edc66928829e15bddc41cdbb69bcd04d6dd5cff087b4e074a870e04e7d018cec0866e4ac8a2a44eba693491456069906b3ee68fcfb0d66e7
+EBUILD shelly-1.6.5.ebuild 1389 BLAKE2B 76275f779b24c9465d7b4493357255b6f98950385fe9aff6e437b76c063c5559d4f99654f5b0640477f4f7332fcb7273adaddb1c3de6f90fcbfb2df90872c7e8 SHA512 00aa6ddffb3f8dd41d3f6c947bdd086c9f235ee5cc824d0cf91f046b63fb388c6e91fdc4ef316d34855b99a5de95e4ea3869b0eb604582d76b007610dee1aefd
+EBUILD shelly-1.6.6.ebuild 1557 BLAKE2B 59bc6c65ca298d7aee2da1b50c36500cdbffd7c91f69749b098586d5af85f86a595434b01f3a02a01e9de3cd57771ff85162e151a45733ed68058e42872b4136 SHA512 0bfe9ba453d6bb7f598ed94a4fdf70c9f9fb8d7e9d21017736043e8b296bd40b321b393d0791e9398c223aaf4cfab18ae9ac7a1784ffa16a82535f3a676d583d
+EBUILD shelly-1.6.8.1.ebuild 1629 BLAKE2B fc296b400798222e22314968eff767fb1db4abc2fe96603c399a87f9e5a7e77eec41e27536d5b1889e3b88c32f7a0ba6fe238cbf07ea5706776e63bb15d508d8 SHA512 29c5804da2a86c983aa79e9fbf7d8728685e30c03494370656aec8a764331d654f868ecda94ebdd0de2ba1ee46356981583afe45e25dce976973e37e959f166a
+MISC metadata.xml 1068 BLAKE2B 92ccc8747907426957a475c110516beb04d036015f4a79a8d8732045c4cdca61e1b247087675bf85b7957d1b73b69e80b95378742229969cfbc38827d6ac2f29 SHA512 e27e2b45c197ba0f7696ff142d6b6b69df12ed35074d0f9924cf87b043fe9301ad17f1fd2874a904347781825f691ce1feefddfabcccc20a186072992dbb15b4
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
new file mode 100644
index 000000000000..a2ef39376c08
--- /dev/null
+++ b/dev-haskell/shelly/files/shelly-1.5.6-monad-control-1.1.patch
@@ -0,0 +1,95 @@
+commit 33b32439e7ef1ba60cc8d72ae0f0c53b6d01ae90
+Merge: d3aec33 b70a308
+Author: Greg Weber <greg@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 <stegeman@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 <stegeman@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 <michael@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
new file mode 100644
index 000000000000..75d56220e38c
--- /dev/null
+++ b/dev-haskell/shelly/files/shelly-1.6.5-ghc-8.patch
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 000000000000..078f979fd013
--- /dev/null
+++ b/dev-haskell/shelly/files/shelly-1.6.8.1-ghc-8.0.2_rc1.patch
@@ -0,0 +1,9 @@
+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/metadata.xml b/dev-haskell/shelly/metadata.xml
new file mode 100644
index 000000000000..061239b47e2b
--- /dev/null
+++ b/dev-haskell/shelly/metadata.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		Shelly provides convenient systems programming in Haskell,
+		similar in spirit to POSIX shells. Shelly:
+		
+		* is aimed at convenience and getting things done rather than
+		being a demonstration of elegance.
+		
+		* has detailed and useful error messages
+		
+		* maintains its own environment, making it thread-safe.
+		
+		* is modern, using Text and system-filepath/system-fileio
+		
+		Shelly is originally forked from the Shellish package.
+		
+		See the shelly-extra package for additional functionality.
+		
+		An overview is available in the README: &lt;https://github.com/yesodweb/Shelly.hs/blob/master/README.md&gt;
+	</longdescription>
+	<upstream>
+		<remote-id type="github">yesodweb/Shelly.hs</remote-id>
+	</upstream>
+	<use>
+		<flag name="lifted">run the tests against Shelly.Lifted</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-haskell/shelly/shelly-1.5.6-r1.ebuild b/dev-haskell/shelly/shelly-1.5.6-r1.ebuild
new file mode 100644
index 000000000000..ddcff5b9bc5f
--- /dev/null
+++ b/dev-haskell/shelly/shelly-1.5.6-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# 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="mirror://hackage/packages/archive/${PN}/${PV}/${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
new file mode 100644
index 000000000000..d3d9fd78e085
--- /dev/null
+++ b/dev-haskell/shelly/shelly-1.6.5.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# 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="mirror://hackage/packages/archive/${PN}/${PV}/${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
new file mode 100644
index 000000000000..209da0df31f9
--- /dev/null
+++ b/dev-haskell/shelly/shelly-1.6.6.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# 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="mirror://hackage/packages/archive/${PN}/${PV}/${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
new file mode 100644
index 000000000000..ab7e9c46dcc8
--- /dev/null
+++ b/dev-haskell/shelly/shelly-1.6.8.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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="mirror://hackage/packages/archive/${PN}/${PV}/${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)
+}