diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-haskell/shelly | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-haskell/shelly')
-rw-r--r-- | dev-haskell/shelly/Manifest | 4 | ||||
-rw-r--r-- | dev-haskell/shelly/files/shelly-1.5.6-monad-control-1.1.patch | 95 | ||||
-rw-r--r-- | dev-haskell/shelly/metadata.xml | 30 | ||||
-rw-r--r-- | dev-haskell/shelly/shelly-1.5.4.1.ebuild | 38 | ||||
-rw-r--r-- | dev-haskell/shelly/shelly-1.5.6-r1.ebuild | 40 | ||||
-rw-r--r-- | dev-haskell/shelly/shelly-1.5.6.ebuild | 38 | ||||
-rw-r--r-- | dev-haskell/shelly/shelly-1.6.1.2.ebuild | 38 | ||||
-rw-r--r-- | dev-haskell/shelly/shelly-1.6.3.2.ebuild | 46 |
8 files changed, 329 insertions, 0 deletions
diff --git a/dev-haskell/shelly/Manifest b/dev-haskell/shelly/Manifest new file mode 100644 index 000000000000..3e97f67541cc --- /dev/null +++ b/dev-haskell/shelly/Manifest @@ -0,0 +1,4 @@ +DIST shelly-1.5.4.1.tar.gz 27926 SHA256 62dd57cfa5ffb5280cbb9c77ec3307bcc8b622f7be65d58f6c4dbd36b7916840 SHA512 8c8519a8a1ac9f02e51211ce8c70aa60590cb6edb5a8de376cf3da2deb8e429ff7e4d31321971660b71f0778a7037fde4f9506efd028de6d8581fbc6b5afe310 WHIRLPOOL 04b6b128dff61e2c3ca8986509bab69a519bdc6a7e1f598c446460fd0922ba26fb5860bd28dcc23e2c69d178d22db2ac273f307f7d7786e4bedefb6e159b1466 +DIST shelly-1.5.6.tar.gz 28264 SHA256 f45f778d21661f616cfc849f7729e5aecef7250687e5b30c12e6d8118706d6ee SHA512 522aa76454211b9f31dc92f052703e3f9f4a103c134da063ff5c4c04e209a1f881dc10c0f8589c557ad179a8dc319951b897b8ff401dd8f9a371f69f1def6022 WHIRLPOOL 25455d9800acb5303910bab4d0d91567b3fafc74d614a2875772a60cc594213d572a92cdb46e06030f5584796e1c7ff91aaf3042c79cbcddd9c9de6a39ecf076 +DIST shelly-1.6.1.2.tar.gz 28474 SHA256 719a60b951654365574cc5af5f5499acd4fb8b3e0c573d48572c2f6ce8f56047 SHA512 7ea7b2beab5ce59c3c0aa1794ab4aa1d3ad1823908a310d06eabf2e168579741ac46ce0ac4c7b5c65274f705a09ecd8c8d93fd7fe032d0ab53c0a466165611fb WHIRLPOOL 1abec6ac4d561cfa68ea070160e027593a3ccd63d2c6dc43e19708b34c9492df7f2cee04f79e63820c96d185cf2c574ccdc58369fb048bd4485e617923f33855 +DIST shelly-1.6.3.2.tar.gz 69955 SHA256 c51912d7cc410709046bfbc1cd0a8d3feca35fd72954906757bae63c88854628 SHA512 08bbfbb93a54d663575fac7d344ae438662d663525b945eb32b675b97a5ed79eddce416e0fb10130be8fdbc1b82c62b57aed5aa008c0a7f05fe97966ee3ddc77 WHIRLPOOL 9197af1ccecbdab2ba97df05b6ac0e1661f8697a402e79cff82cc4cb9f815eb49f2f836efa4308c5efaa10867efe4e92ec8b5b4ba31ca7fafc9772a2bc6bf003 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/metadata.xml b/dev-haskell/shelly/metadata.xml new file mode 100644 index 000000000000..12bd177f7829 --- /dev/null +++ b/dev-haskell/shelly/metadata.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>haskell</herd> + <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: <https://github.com/yesodweb/Shelly.hs/blob/master/README.md> + </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.4.1.ebuild b/dev-haskell/shelly/shelly-1.5.4.1.ebuild new file mode 100644 index 000000000000..9c819bb72f47 --- /dev/null +++ b/dev-haskell/shelly/shelly-1.5.4.1.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +# ebuild generated by hackport 0.4.2.9999 + +CABAL_FEATURES="lib profile haddock hoogle hscolour" +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="" + +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-0.4:=[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 +" 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..a9a145962cbc --- /dev/null +++ b/dev-haskell/shelly/shelly-1.5.6-r1.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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.5.6.ebuild b/dev-haskell/shelly/shelly-1.5.6.ebuild new file mode 100644 index 000000000000..e587af7ac381 --- /dev/null +++ b/dev-haskell/shelly/shelly-1.5.6.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +# ebuild generated by hackport 0.4.4.9999 + +CABAL_FEATURES="lib profile haddock hoogle hscolour" +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="" + +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-0.4:=[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 +" diff --git a/dev-haskell/shelly/shelly-1.6.1.2.ebuild b/dev-haskell/shelly/shelly-1.6.1.2.ebuild new file mode 100644 index 000000000000..97215c8cc998 --- /dev/null +++ b/dev-haskell/shelly/shelly-1.6.1.2.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +# ebuild generated by hackport 0.4.3 + +CABAL_FEATURES="lib profile haddock hoogle hscolour" +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="" + +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 +" diff --git a/dev-haskell/shelly/shelly-1.6.3.2.ebuild b/dev-haskell/shelly/shelly-1.6.3.2.ebuild new file mode 100644 index 000000000000..2c91740544b4 --- /dev/null +++ b/dev-haskell/shelly/shelly-1.6.3.2.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +# ebuild generated by hackport 0.4.5.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) +} |