From 86cde0c05bcdacf226f1f9a1514c90c9642914a0 Mon Sep 17 00:00:00 2001 From: Mark Wright Date: Tue, 23 Dec 2014 03:11:26 +0000 Subject: [PATCH] Apply patch by Michael Snoyman to allow shelly-1.5.6-r1 to compile with monad-control-1.0.0.1 Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x618E971F --- dev-haskell/shelly/ChangeLog | 9 +- dev-haskell/shelly/Manifest | 10 +- .../shelly-1.5.6-monad-control-1.1.patch | 95 +++++++++++++++++++ dev-haskell/shelly/shelly-1.5.6-r1.ebuild | 40 ++++++++ 4 files changed, 149 insertions(+), 5 deletions(-) create mode 100644 dev-haskell/shelly/files/shelly-1.5.6-monad-control-1.1.patch create mode 100644 dev-haskell/shelly/shelly-1.5.6-r1.ebuild diff --git a/dev-haskell/shelly/ChangeLog b/dev-haskell/shelly/ChangeLog index 0aa248e194fe..6b24cc6b0f00 100644 --- a/dev-haskell/shelly/ChangeLog +++ b/dev-haskell/shelly/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-haskell/shelly # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/shelly/ChangeLog,v 1.3 2014/12/14 05:49:51 gienah Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/shelly/ChangeLog,v 1.4 2014/12/23 03:11:17 gienah Exp $ + +*shelly-1.5.6-r1 (23 Dec 2014) + + 23 Dec 2014; Mark Wright + +files/shelly-1.5.6-monad-control-1.1.patch, +shelly-1.5.6-r1.ebuild: + Apply patch by Michael Snoyman to allow shelly-1.5.6-r1 to compile with monad- + control-1.0.0.1 *shelly-1.5.6 (14 Dec 2014) diff --git a/dev-haskell/shelly/Manifest b/dev-haskell/shelly/Manifest index 7da5d6e229dc..c4c9c2c72382 100644 --- a/dev-haskell/shelly/Manifest +++ b/dev-haskell/shelly/Manifest @@ -1,16 +1,18 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX shelly-1.5.6-monad-control-1.1.patch 2847 SHA256 2445e1d7288fada39bd4a595f401f0eeca80387b9d6260407cf3c0f5c3d062e6 SHA512 f2a386defa742076f4a0062597113f86706eccfcacfe62483536bbffe410d5c752b8c59c365c89a39f99dbb83c88cf2c3a4f76e4d5132858f254be5cad420e00 WHIRLPOOL 0aaa2fe541a7be429ab1623f8a0ab07595d6c800f613d4ec8c7e18fd98c3629d53f33ad931770a5104fbd1735db9d64fbca0a2e8fb2573a41ffa0bdd5b71f695 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 EBUILD shelly-1.5.4.1.ebuild 1314 SHA256 973db0d39b5941f2439f056d65992fcd438b0a850478f188d918c0b862897018 SHA512 77dca80d84494fa4294e384b7eb0459c73e593974606fd81c7d694fb45a5eccbb655b5d2669625da559d385a368d6319ef5f2d6c51b6662a242962aa0e1c2204 WHIRLPOOL 12df4447e6c675ad64e0bb5dcd18b391952d8bab93861ee7240db2c0ce706cc488a22a1d22592749e371b7ee347cfb9e924970c2c5920fbd7e1befd391d3cc24 +EBUILD shelly-1.5.6-r1.ebuild 1381 SHA256 a91329485c1df918f97136a0bc146aa3957007d8ee1b75c2fad2a1235597cbbe SHA512 44000216989c3b2951220e005c2bfe03145feaba35a94f4676f6601ece934b10ce6bd38afd8909c53b9e841d9d1322069f63d342a13bcb5e29ce4b401ac6fa8f WHIRLPOOL acb37875d7bed3a7760824cd028f9c7b3425d20c2f4920207e2524c14df6aaf608ac78d3e490569215a6f64d4f4681b00537e74d7712fd965b8b25217fbaac21 EBUILD shelly-1.5.6.ebuild 1312 SHA256 c72aea3ce362128366413a62ba667b08c5ef3e97b0333fe687f43dc19c760094 SHA512 6bbc955d5919a14fcc85bd17cbd0e2680e97c02b0691c5a37072bf76487ec32200ef3efd29b1d3d8864b541be36ba6b5de84c82f51d3ac9b8d02a4cde1892b44 WHIRLPOOL dadcb0fdae3dee8cfc2555461449e46e66144877a965df598cfdc1f511187bea58ac608c85f24eb83aa6828ada959139cf2e9201a419d52320cb6526863ab9fe -MISC ChangeLog 592 SHA256 e66370b4dd3a571561f0f6438818336f4952868d0818b022147000e0b761f3b8 SHA512 7990a00fd4072b92fff0475b01a91dac2bf1944b30e0fbfcb896561a18ee208483e5f7c0b3ee68b1c69296b942c9e10cf3bc8f603ba581c277c6337c20672dff WHIRLPOOL eaea98aeb3d8329dc47e49bfa85ec46f5146938920d9256bc4118a12b3a8e717eacc877aa09654bb9fe668c395d9eb6718edc397e3a24a27b89b1eed78f331c5 +MISC ChangeLog 843 SHA256 1d2d93bd03cf89b6bed0fd2187ed4fb54ccc99e4af5e9f603e347776434c335f SHA512 95572cf91832779e272e226ebbf7c37f2a78acb1b02af64dadfbc9d7685192eb208e41df1ab5905d89bddc28f77bfe5cad21d7750a9671833174b3127f661743 WHIRLPOOL 12d921e78426f17b8764d8f83ff196828663fb1f46abe0995c666411ec05c6caabeb5fb109abb66b69e5b6f94e67259ea60dc8fe1e66097f7fa8b59bb3a7a675 MISC metadata.xml 817 SHA256 84b021e76ab21e56151435ee5cc1e54fbf40349b822c79cfb6015f4184805807 SHA512 ac2f00a98a65e277fc76dcfa5933af6cea49e274256fd5001c73de1413b444b7c5b6f3fea765fc05d13802dbceb395e413facf2f4bfa9a93d905f6bb8270b4bd WHIRLPOOL 767a90a08d357db89371343a5ab1a7472eee56588f5d132f0d1855e14d311912780a15216b5c35886b4b290424b537f716b5d3880358b76716196eabac854655 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iF4EAREIAAYFAlSNJQUACgkQoBEVQmGOlx9mlwD/Ziciqy6p7BhQRzkhSxOEnG3V -eTnuF8Nzpu2mJyRSsbsBAMsiYQ4qGynZGWKWVZ3/8Mih7vsgm+cq5JHwq3wvT3J3 -=rYdX +iF4EAREIAAYFAlSY3VwACgkQoBEVQmGOlx986AD+NH0X4qOjpU5dOl5WCXmydEB9 +eSbpVyUriPLf8J7JLNIA/ReJE2wn1nXpYIcsU5WL7wuzgrevyVvmLntBsk1gZTxL +=ONcC -----END PGP SIGNATURE----- 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 +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 +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 +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 +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/shelly-1.5.6-r1.ebuild b/dev-haskell/shelly/shelly-1.5.6-r1.ebuild new file mode 100644 index 000000000000..6738940785dc --- /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 +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/shelly/shelly-1.5.6-r1.ebuild,v 1.1 2014/12/23 03:11:17 gienah Exp $ + +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/monad-control-0.3.2:=[profile?] =dev-haskell/mtl-2:=[profile?] + =dev-haskell/system-filepath-0.4.7:=[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") -- 2.26.2