Permalink
Browse files

dev-haskell/hinotify: bump up to 0.3.3

Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
  • Loading branch information...
1 parent 1c3812b commit 94966161393613c9a5ca5fe9b153a7ff71d13808 @trofi trofi committed Oct 28, 2012
View
1 dev-haskell/hinotify/Manifest
@@ -1 +1,2 @@
DIST hinotify-0.3.2.tar.gz 12014 SHA256 88c86540528f9d36bedc5779c975fbd0fd1277a4e143b9a078871ba7c2ce293f SHA512 c71c055093429d383cc55f49748e92a0900d205ea6ac2eeff85ab51b594a52e25fd538fa3de1147465ad102db8e3a83c6f48ea1a6c8e67d43033ab9db7647fbc WHIRLPOOL 6c1e76c255f2d46d785210785cd821cc9a7560dbd9e85fc71690a629c0fea9f13b683ce5cb7c3dc3e3357b8c78a4d3ee383885e767cae6ca37571ef4aa3f1d59
+DIST hinotify-0.3.3.tar.gz 11005 SHA256 d90d03806d9153e727e14d38727ee249123bdb3c00c1394b8cbf08b57f69177d SHA512 1e27f0bb9c62342deab5e53c6e4ed85d7904740214c8c20456486c49dafc601f2fdf8405ece1f123daa1594d841de500318359ee683a7152887812f0200b9efa WHIRLPOOL 3a6839e3e3f7044701edc801dd15e0df3e3e3e32e64c2b79f942201169acfa46cbe5b2b581cf84f02f7a51797f87bcde742e31b18a70718718e2a295ab4df12b
View
70 dev-haskell/hinotify/files/hinotify-0.3.2-ghc7.6.patch
@@ -1,70 +0,0 @@
-Mon Oct 22 11:44:43 FET 2012 Sergei Trofimovich <slyfox@community.haskell.org>
- * switched to extensible-exceptions (ghc-7.6 support)
-
- Fixes build failure:
- > [2 of 2] Compiling System.INotify ( dist/build/System/INotify.hs, dist/build/System/INotify.o )
- > src/System/INotify.hsc:316:13: Not in scope: `catch'
- > src/System/INotify.hsc:322:27: Not in scope: `catch'
-diff -rN -u old-hinotify/hinotify.cabal new-hinotify/hinotify.cabal
---- old-hinotify/hinotify.cabal 2012-10-23 18:20:00.066881000 +0300
-+++ new-hinotify/hinotify.cabal 2012-10-23 18:20:00.087881000 +0300
-@@ -23,7 +23,7 @@
- library
- build-depends: unix
- if flag(split-base)
-- build-depends: base >= 3 && < 5, containers, directory
-+ build-depends: base >= 3 && < 5, containers, directory, extensible-exceptions
- else
- build-depends: base < 3
- extensions: ForeignFunctionInterface
-diff -rN -u old-hinotify/src/System/INotify.hsc new-hinotify/src/System/INotify.hsc
---- old-hinotify/src/System/INotify.hsc 2012-10-23 18:20:00.066881000 +0300
-+++ new-hinotify/src/System/INotify.hsc 2012-10-23 18:20:00.091881000 +0300
-@@ -37,8 +37,7 @@
- import Prelude hiding (init)
- import Control.Monad
- import Control.Concurrent
--import Control.Concurrent.MVar
--import Control.Exception (bracket)
-+import qualified Control.Exception.Extensible as E
- import Data.Maybe
- import Data.Map (Map)
- import qualified Data.Map as Map
-@@ -291,7 +290,7 @@
- isDir = isSet inIsdir
- isSet bits = maskIsSet bits mask
- name = fromJust nameM
--
-+
- inotify_start_thread :: Handle -> MVar EventMap -> IO (ThreadId, ThreadId)
- inotify_start_thread h em = do
- chan_events <- newChan
-@@ -313,13 +312,15 @@
- runHandler (_, e@QOverflow) = do -- send overflows to all handlers
- handlers <- readMVar em
- flip mapM_ (Map.elems handlers) $ \handler ->
-- catch (handler e) (\_ -> return ()) -- supress errors
-+ handler e `E.catch` ignore_failure
- runHandler (wd, event) = do
- handlers <- readMVar em
- let handlerM = Map.lookup wd handlers
- case handlerM of
- Nothing -> putStrLn "runHandler: couldn't find handler" -- impossible?
-- Just handler -> catch (handler event) (\_ -> return ())
-+ Just handler -> handler event `E.catch` ignore_failure
-+ ignore_failure :: E.SomeException -> IO ()
-+ ignore_failure _e = return ()
-
- killINotify :: INotify -> IO ()
- killINotify (INotify h _ _ tid1 tid2) =
-@@ -328,8 +329,8 @@
- hClose h
-
- withINotify :: (INotify -> IO a) -> IO a
--withINotify = bracket initINotify killINotify
--
-+withINotify = E.bracket initINotify killINotify
-+
- foreign import ccall unsafe "sys/inotify.h inotify_init" c_inotify_init :: IO CInt
- foreign import ccall unsafe "sys/inotify.h inotify_add_watch" c_inotify_add_watch :: CInt -> CString -> CUInt -> IO CInt
- foreign import ccall unsafe "sys/inotify.h inotify_rm_watch" c_inotify_rm_watch :: CInt -> CInt -> IO CInt
View
13 ...haskell/hinotify/hinotify-0.3.2-r1.ebuild → dev-haskell/hinotify/hinotify-0.3.3.ebuild
@@ -7,20 +7,17 @@ EAPI=5
# ebuild generated by hackport 0.3.9999
CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit base haskell-cabal
+inherit haskell-cabal
-DESCRIPTION="Haskell binding to INotify"
-HOMEPAGE="http://code.haskell.org/hinotify/README.html"
+DESCRIPTION="Haskell binding to inotify"
+HOMEPAGE="https://github.com/kolmodin/hinotify.git"
SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86"
IUSE=""
-RDEPEND="dev-haskell/extensible-exceptions:=[profile?]
- >=dev-lang/ghc-6.10.4:="
+RDEPEND=">=dev-lang/ghc-7.0.1:="
DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.2"
-
-PATCHES=("${FILESDIR}"/${P}-ghc7.6.patch)
+ >=dev-haskell/cabal-1.6"

0 comments on commit 9496616

Please sign in to comment.