Loosen quickcheck dep in bloomfilter-1.2.6.10-r2

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 618E971F)

3 files changed, 94 insertions, 2 deletions

diff --git a/dev-haskell/bloomfilter/ChangeLog b/dev-haskell/bloomfilter/ChangeLog
index 1da3a9ed0607..37fcfe905c99 100644
--- a/dev-haskell/bloomfilter/ChangeLog
+++ b/dev-haskell/bloomfilter/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-haskell/bloomfilter
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/bloomfilter/ChangeLog,v 1.6 2013/07/21 17:46:36 ottxor Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/bloomfilter/ChangeLog,v 1.7 2014/07/10 13:53:55 gienah Exp $
+
+*bloomfilter-1.2.6.10-r2 (10 Jul 2014)
+
+  10 Jul 2014; Mark Wright <gienah@gentoo.org> +bloomfilter-1.2.6.10-r2.ebuild,
+  +files/bloomfilter-1.2.6.10-ghc-7.7.patch:
+  Loosen quickcheck dep in bloomfilter-1.2.6.10-r2
 
   21 Jul 2013; Christoph Junghans <ottxor@gentoo.org>
   bloomfilter-1.2.6.10-r1.ebuild:
diff --git a/dev-haskell/bloomfilter/bloomfilter-1.2.6.10-r2.ebuild b/dev-haskell/bloomfilter/bloomfilter-1.2.6.10-r2.ebuild
new file mode 100644
index 000000000000..5af05753372f
--- /dev/null
+++ b/dev-haskell/bloomfilter/bloomfilter-1.2.6.10-r2.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/bloomfilter/bloomfilter-1.2.6.10-r2.ebuild,v 1.1 2014/07/10 13:53:55 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.2.18.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit eutils haskell-cabal
+
+DESCRIPTION="Pure and impure Bloom Filter implementations."
+HOMEPAGE="https://github.com/bos/bloomfilter"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE=""
+
+RDEPEND="dev-haskell/deepseq:=[profile?]
+		>=dev-lang/ghc-6.8.2:="
+DEPEND="${RDEPEND}
+		test? ( >=dev-haskell/quickcheck-2.4:2
+			<dev-haskell/quickcheck-2.8:2
+			dev-haskell/random
+			dev-haskell/test-framework
+			dev-haskell/test-framework-quickcheck2
+		)
+		>=dev-haskell/cabal-1.8"
+
+src_prepare() {
+	cabal_chdeps \
+		'QuickCheck == 2.4.*' 'QuickCheck >= 2.4 && < 2.8'
+
+	if has_version ">=dev-haskell/quickcheck-2.5"; then
+		epatch "${FILESDIR}/${PN}-1.2.6.10-quickcheck-2.6.patch"
+	fi
+	epatch "${FILESDIR}/${PN}-1.2.6.10-ghc-7.7.patch"
+}
diff --git a/dev-haskell/bloomfilter/files/bloomfilter-1.2.6.10-ghc-7.7.patch b/dev-haskell/bloomfilter/files/bloomfilter-1.2.6.10-ghc-7.7.patch
new file mode 100644
index 000000000000..899fb4176aa2
--- /dev/null
+++ b/dev-haskell/bloomfilter/files/bloomfilter-1.2.6.10-ghc-7.7.patch
@@ -0,0 +1,46 @@
+diff --git a/Data/BloomFilter.hs b/Data/BloomFilter.hs
+index 69711ef..97a8348 100644
+--- a/Data/BloomFilter.hs
++++ b/Data/BloomFilter.hs
+@@ -93,7 +93,8 @@ import Control.Monad (liftM, forM_)
+ import Control.Monad.ST (ST, runST)
+ import Control.DeepSeq (NFData(..))
+ import Data.Array.Base (unsafeAt, unsafeRead, unsafeWrite)
+-import Data.Array.ST (STUArray, thaw, unsafeFreeze)
++import Data.Array.ST (STUArray, thaw)
++import qualified Data.Array.Unsafe as U (unsafeFreeze)
+ import Data.Array.Unboxed (UArray)
+ import Data.Bits ((.&.), (.|.))
+ import Data.BloomFilter.Array (newArray)
+@@ -336,7 +337,7 @@ notElemB elt ub = any test (hashesU ub elt)
+ -- occur.  For a safer creation interface, use 'createB'.
+ unsafeFreezeMB :: MBloom s a -> ST s (Bloom a)
+ unsafeFreezeMB mb = B (hashMB mb) (shiftMB mb) (maskMB mb) `liftM`
+-                    unsafeFreeze (bitArrayMB mb)
++                    U.unsafeFreeze (bitArrayMB mb)
+ 
+ -- | Copy an immutable Bloom filter to create a mutable one.  There is
+ -- no non-copying equivalent.
+diff --git a/Data/BloomFilter/Array.hs b/Data/BloomFilter/Array.hs
+index e085bbe..5accde9 100644
+--- a/Data/BloomFilter/Array.hs
++++ b/Data/BloomFilter/Array.hs
+@@ -3,7 +3,8 @@
+ 
+ module Data.BloomFilter.Array (newArray) where
+ 
+-import Control.Monad.ST (ST, unsafeIOToST)
++import Control.Monad.ST (ST)
++import qualified Control.Monad.ST.Unsafe as U (unsafeIOToST)
+ import Data.Array.Base (MArray, STUArray(..), unsafeNewArray_)
+ #if __GLASGOW_HASKELL__ >= 704
+ import Foreign.C.Types (CInt(..), CSize(..))
+@@ -18,7 +19,7 @@ newArray :: forall e s. (MArray (STUArray s) e (ST s)) =>
+ {-# INLINE newArray #-}
+ newArray numElems numBytes = do
+   ary@(STUArray _ _ _ marr#) <- unsafeNewArray_ (0, numElems - 1)
+-  _ <- unsafeIOToST (memset marr# 0 (fromIntegral numBytes))
++  _ <- U.unsafeIOToST (memset marr# 0 (fromIntegral numBytes))
+   return ary
+ 
+ foreign import ccall unsafe "memset"