Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Bump mongodb-1.3.1

  • Loading branch information...
commit 1c3812be9ba9a7ede0d60e31985b9394230913e2 1 parent 0b05d7d
@markwright markwright authored
View
2  dev-haskell/mongodb/Manifest
@@ -1,2 +1,2 @@
DIST mongoDB-1.2.0.tar.gz 30535 SHA256 23e853990a94e68dcfbde8ee6761ae4335e587c7750939d7ea3521744750ce65 SHA512 ca0c54c4f1e6929bb6cbeec8d1136983c27a3db25f9ababd67bff7a700b72a4ad240c29b7bea796fb45f106ef3185a70bb12a32166df3a10e50d20724ae37e0a WHIRLPOOL 9ae80a531ba83eef0a3b1ee08f4be2788e2dbf317a271f4f0b76e7c51ad25aa76d9117471e65cde03c899b309e1f3100142bb0f65421bfae61ad6ddba63b9799
-DIST mongoDB-1.3.0.tar.gz 31354 SHA256 aa4e42f5d6482d55402de7088d8b2c1ecbaa144937272b915dbe49165729d9d0 SHA512 04e3e7c701cdec0c77267da90916a24cb4d6e1a9b51e72a2d8e6f918a43448bcb921ae83c4c7ac00f03148f31b276b3913d270ece4ae1be93c2d7e59f2db41e3 WHIRLPOOL 28b5cebce3da02f0bcefb87e06c0439627f340310a4664a4338a0caafefc0ed36527bcdb44fbaa5d206bc8116b031e9be014b54dcbe03890a9ef341daa343f08
+DIST mongoDB-1.3.1.tar.gz 31574 SHA256 85122741555c6e8a1b6e363a9606c9d1b78accbee27f523d64f5153b525a7ae3 SHA512 c293bc253a56ff44deda35fbf40731079517348fda4641efb05addc62402ae0c92f8c0b99516296b574936f732e48f1b439d093da6e1b78824058389b04c43d4 WHIRLPOOL 44f2100baa653d74c8b07f8681e235dae52a4203f60bfd26f92032520305da8c5fa936b0fc3627ade44cdecfaca6ab7c1226b1ad25f7cfcbc915c53781771eba
View
84 dev-haskell/mongodb/files/mongodb-1.3.0-ghc-7.6.patch
@@ -1,84 +0,0 @@
---- mongoDB-1.3.0-orig/Database/MongoDB/Internal/Util.hs 2012-06-15 00:12:16.000000000 +1000
-+++ mongoDB-1.3.0/Database/MongoDB/Internal/Util.hs 2012-09-15 20:55:51.173626267 +1000
-@@ -97,7 +97,7 @@
- updateAssocs key valu assocs = case back of [] -> (key, valu) : front; _ : back' -> front ++ (key, valu) : back'
- where (front, back) = break ((key ==) . fst) assocs
-
--bitOr :: (Bits a) => [a] -> a
-+bitOr :: (Bits a, Num a) => [a] -> a
- -- ^ bit-or all numbers together
- bitOr = foldl (.|.) 0
-
---- mongoDB-1.3.0-orig/Database/MongoDB/Query.hs 2012-06-15 00:12:16.000000000 +1000
-+++ mongoDB-1.3.0/Database/MongoDB/Query.hs 2012-10-20 18:29:34.159808907 +1100
-@@ -1,6 +1,6 @@
- -- | Query and update documents
-
--{-# LANGUAGE OverloadedStrings, RecordWildCards, NamedFieldPuns, TupleSections, FlexibleContexts, FlexibleInstances, UndecidableInstances, MultiParamTypeClasses, GeneralizedNewtypeDeriving, StandaloneDeriving, TypeSynonymInstances, TypeFamilies #-}
-+{-# LANGUAGE OverloadedStrings, RecordWildCards, NamedFieldPuns, TupleSections, FlexibleContexts, FlexibleInstances, UndecidableInstances, MultiParamTypeClasses, GeneralizedNewtypeDeriving, StandaloneDeriving, TypeSynonymInstances, TypeFamilies, CPP #-}
-
- module Database.MongoDB.Query (
- -- * Monad
-@@ -47,8 +47,13 @@
- import Data.Maybe (listToMaybe, catMaybes)
- import Data.Word (Word32)
-
-+#if MIN_VERSION_base(4,6,0)
-+import Control.Concurrent.MVar.Lifted (MVar, newMVar, mkWeakMVar,
-+ readMVar, modifyMVar)
-+#else
- import Control.Concurrent.MVar.Lifted (MVar, newMVar, addMVarFinalizer,
- readMVar, modifyMVar)
-+#endif
- import Control.Monad.Base (MonadBase(liftBase))
- import Control.Monad.Error (ErrorT, Error(..), MonadError, runErrorT,
- throwError)
-@@ -508,7 +513,11 @@
- newCursor db col batchSize dBatch = do
- var <- newMVar dBatch
- let cursor = Cursor (db <.> col) batchSize var
-+#if MIN_VERSION_base(4,6,0)
-+ mkWeakMVar var (closeCursor cursor)
-+#else
- addMVarFinalizer var (closeCursor cursor)
-+#endif
- return cursor
-
- nextBatch :: (MonadIO m, MonadBaseControl IO m) => Cursor -> Action m [Document]
---- mongoDB-1.3.0-orig/System/IO/Pipeline.hs 2012-06-15 00:12:16.000000000 +1000
-+++ mongoDB-1.3.0/System/IO/Pipeline.hs 2012-10-20 18:29:46.437108534 +1100
-@@ -2,7 +2,7 @@
-
- A pipeline closes itself when a read or write causes an error, so you can detect a broken pipeline by checking isClosed. It also closes itself when garbage collected, or you can close it explicitly. -}
-
--{-# LANGUAGE DoRec, RecordWildCards, NamedFieldPuns, ScopedTypeVariables #-}
-+{-# LANGUAGE DoRec, RecordWildCards, NamedFieldPuns, ScopedTypeVariables, CPP #-}
-
- module System.IO.Pipeline (
- IOE,
-@@ -19,8 +19,13 @@
- import GHC.Conc (ThreadStatus(..), threadStatus)
-
- import Control.Monad.Trans (liftIO)
-+#if MIN_VERSION_base(4,6,0)
-+import Control.Concurrent.MVar.Lifted (MVar, newEmptyMVar, newMVar, withMVar,
-+ putMVar, readMVar, mkWeakMVar)
-+#else
- import Control.Concurrent.MVar.Lifted (MVar, newEmptyMVar, newMVar, withMVar,
- putMVar, readMVar, addMVarFinalizer)
-+#endif
- import Control.Monad.Error (ErrorT(ErrorT), runErrorT)
-
- onException :: (Monad m) => ErrorT e m a -> m () -> ErrorT e m a
-@@ -58,7 +63,11 @@
- rec
- let pipe = Pipeline{..}
- listenThread <- forkIO (listen pipe)
-+#if MIN_VERSION_base(4,6,0)
-+ mkWeakMVar vStream $ do
-+#else
- addMVarFinalizer vStream $ do
-+#endif
- killThread listenThread
- closeStream stream
- return pipe
View
43 dev-haskell/mongodb/mongodb-1.3.0-r1.ebuild
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-# ebuild generated by hackport 0.2.18.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit base haskell-cabal
-
-MY_PN="mongoDB"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Driver (client) for MongoDB, a free, scalable, fast, document DBMS"
-HOMEPAGE="http://github.com/selectel/mongodb-haskell"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/binary[profile?]
- >=dev-haskell/bson-0.2.0[profile?]
- <dev-haskell/bson-0.3.0[profile?]
- dev-haskell/cryptohash[profile?]
- >=dev-haskell/lifted-base-0.2[profile?]
- >=dev-haskell/monad-control-0.3.1[profile?]
- >=dev-haskell/mtl-2[profile?]
- dev-haskell/network[profile?]
- dev-haskell/parsec[profile?]
- dev-haskell/random[profile?]
- dev-haskell/random-shuffle[profile?]
- dev-haskell/text[profile?]
- >=dev-haskell/transformers-base-0.4.1[profile?]
- >=dev-lang/ghc-6.8.2"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.2"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=("${FILESDIR}/${PN}-1.3.0-ghc-7.6.patch")
View
42 dev-haskell/mongodb/mongodb-1.3.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+MY_PN="mongoDB"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Driver (client) for MongoDB, a free, scalable, fast, document
+DBMS"
+HOMEPAGE="http://github.com/selectel/mongodb-haskell"
+SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="" #Fixme: "OtherLicense", please fill in manually
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/binary:=[profile?]
+ >=dev-haskell/bson-0.2.0:=[profile?]
+ <dev-haskell/bson-0.3.0:=[profile?]
+ dev-haskell/cryptohash:=[profile?]
+ >=dev-haskell/lifted-base-0.1.0.3:=[profile?]
+ >=dev-haskell/monad-control-0.3.1:=[profile?]
+ >=dev-haskell/mtl-2:=[profile?]
+ dev-haskell/network:=[profile?]
+ dev-haskell/parsec:=[profile?]
+ dev-haskell/random:=[profile?]
+ dev-haskell/random-shuffle:=[profile?]
+ dev-haskell/text:=[profile?]
+ >=dev-haskell/transformers-base-0.4.1:=[profile?]
+ >=dev-lang/ghc-6.10.4:="
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.2"
+
+S="${WORKDIR}/${MY_P}"
Please sign in to comment.
Something went wrong with that request. Please try again.