Loosen quickcheck dep in bloomfilter-1.2.6.10-r2

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x618E971F

4 files changed, 101 insertions, 11 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/Manifest b/dev-haskell/bloomfilter/Manifest
index 8f6275942da3..9ca6f1adf04d 100644
--- a/dev-haskell/bloomfilter/Manifest
+++ b/dev-haskell/bloomfilter/Manifest
@@ -1,21 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX bloomfilter-1.2.6.10-ghc-7.7.patch 1918 SHA256 c15fc07c51339bd6cb4e3b2b128efc7557b5bac837a12da090144ee482ef00a6 SHA512 a6b2d6eee30ede3756443c218418aa6caddfd24241b3bb0018f48bbb9c414dda4ab65ec291f895a3a58414116b3a2dceedf2cb285bb3897ce64f47a29d208f97 WHIRLPOOL f649c35bdc1017540bc6e1b7aeef6ea86f3724bc4875b8302763954a1f85bbf2864b71c3a18f1d3cf13a11dfc69020a50ec8d4fc99e78a441d8dfd2df0306ecd
 AUX bloomfilter-1.2.6.10-quickcheck-2.6.patch 525 SHA256 b76ac9639efbfb98321dd743035bc94eadbeb3e5c160892372414238d807b5ad SHA512 2c979315d63ee2481ea70b118d3936326775de6dbfda72040a54df3384ef6fc1b101223a34f7dbdad761cdefed41a7e6ce0ea4a65ec0a07af2039473c1dc07ee WHIRLPOOL dffbe7bcee19ff05e06b6a6278674891f9e7f2c43bd3f962f36058bb8013dac37ea5d2e9bd27130a2bf647b8322e456d5afe625bfe4924ac44739a1e04e5eaef
 DIST bloomfilter-1.2.6.10.tar.gz 21533 SHA256 927420bcc1e1dec89ddfc1437d551fb2de325fd6bd01d79b207b3a84ca6152fc SHA512 c3bad38edf59bd59439c24385e300fab90f4ccd1b1faf7bea6c4b25b2bcabdfc806a7274d1cad40a711312b016d6fbb99a0ca9cf8b358ad874bbbabc14e1f454 WHIRLPOOL 2008461972b46dc1253972d7e31badb7e8e286556ee03e7bd7e0c7c35cdffccec801eea41cc6096beedc1cf40fb1fb4a84925efdab39202a1f869a80899d4e6d
 DIST bloomfilter-1.2.6.8.tar.gz 20282 SHA256 ce1625badd464db49433fd03844aec807e54d927bab3c017e37a2eec5d2b6263 SHA512 569320da18a40b3c3828654058e74995cbcb8698f1053c3033af7aa1cd055e6f4d57b7a7aa2fd5af43bd20d93ff75da748037cb42806b92c8017c92c37420aa2 WHIRLPOOL 9d535daad1137e0792f468b4a150cc61dd0a0607ef25c0d1c31382e3eac28e8ae15960543578a8418562aba57fe59af16a56df854076f37d37d4fda8957a68e7
 EBUILD bloomfilter-1.2.6.10-r1.ebuild 1116 SHA256 68dcc2737efa1d99e9cc3e3a5352e97bd8937bf712ae937aa31ca4c9552ef685 SHA512 9a2328e26332002488efe2da0feed1c6a6eb5ef89b601ffd21011496acb63ee4648525c4a69331944bc52db0b82c5fc86ef98d59229b0cc8aff1a5667a837a7c WHIRLPOOL ab42f7bd67556cef0db33e60cf6ab1a73fe24e119c26792053acab626954df9dcc36eacb12b7cbc0f28dc245b783e3817796338a574a96c2e62ce9df40b75343
+EBUILD bloomfilter-1.2.6.10-r2.ebuild 1167 SHA256 d2a0e6f6e97ebd9acad9058d1d5b6b62c757811ea3c06d1aa5258d9801a51b02 SHA512 b0001dc4f2ac0034712fd81191868068d4ac743a43a0db10f0f3d8d0b254e1e519e1f79962facc0e243f786d10a59951dd72b03eb6362d9b5a240d3662d4dc6e WHIRLPOOL 1c25dd1edfc760a62a159693165439057160abd66f0e09f2cd6cf70fd6e9a5a9bbd80d00a661183f3b3b3a72ab256da81667e7c3ffbffc430080af8b6a915211
 EBUILD bloomfilter-1.2.6.8.ebuild 712 SHA256 1e66a802ecae7a7d3441f2f1e8d2005afa420720011b85fdb3382ccfa8d5e355 SHA512 2766515c7ce8ff926b7f85b93bb2716a1904946502c3dfdb7ac233c932929af6273f6fff0d491d0ee5b27d48707268e61e98d39c326be926825945a987548b18 WHIRLPOOL aa35053ab07b58e30051d7c4974537b0bd13343b8388ec7f5331c849a3058d85a07708ae2bdcc17dc865492726930ad508acc779f521419972cf66aa25b7bc43
-MISC ChangeLog 1217 SHA256 719e068f6ba5ea0426eb6f01bbcd5edd855f8c60a85979d89aa9725c31bf198e SHA512 95275d05b2f7c8871dba7ef00673dd05c1de1e8d388372080897b7f0f0872c53d1a46bed0025d64b72aeb92e4909a47b51b44f3bc751384bd8f268441d182543 WHIRLPOOL e81135f4c048733f9e53d4ad5a22e1636a1590903893d25ba736e231c453b2708ec8f8522c697be12ac577ba7a220388952e49e0495c9fabdd8867ae16242546
+MISC ChangeLog 1434 SHA256 1a974d5befe1834947a4f055a99e428cc04e89a77023ae2b8349588c395cab78 SHA512 cd1510adf66fa579350283c50fe3b707e53150e68e98bddb9a2ec579bad0ffdfc76c840d372708549a7147db45bdf61faf750a7de944022e570f5b00721a78ed WHIRLPOOL 0335073f7f4b96a7d9dc58d2f314d1bdcf8cd4a21d9ae9308e631a7cecf858ae7db52f87891ebbcac057b2a8cebdef6434693dbd3ccf5b77e002647a42fc75a3
 MISC metadata.xml 313 SHA256 d38ce8cb8b8f1bee2428852803478ec84bc925c2332de0333c000eee5c53387d SHA512 d166206607d170c7e95e08dbbbdf73ca99415a34d87ffd74a7b034ba7a804c787f15d3ab954bb1b25c3aff13519b6322f88b1e13c6b88117a9550971f239158f WHIRLPOOL 9ebbdc9e75f5efffd821a66d3ed6abb20eb66177fbf85c6d6203b64f6740fef479cb0c9f46e3c421afc0944d92d2964b59bd10f5af89df89c000a5e8e008f0c3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJR7B5+AAoJEOeBhlrCAAWGHTEH+QFvgBujC0X2+6OX84GpYyIY
-CRnZlblqtNJCbG/g61Q7urXx8PjQwo1l/HBBQoKdIlcOUUh5EZkEaWWiFGpKB82E
-XFGZ2O/FCjHswlPOOKDXqqzjfT9roLMT2u7xmfMjRCQN7Ig91qbjsSlnDXDRV0Qh
-tTbCu2cfja5LR3XKlNI2QESFK2qJmqXERlAQ0iksSG0ivTrWWKxx3/7T1IldpQmQ
-w1mUXCF5mRDqIcZOLEhP2nkh93hezyv6pE2ljGNm/SIy80S8sjcSYig6iiOiZXRh
-9NwZyMcjV+bwCye8V33LjdY847lY6KsykPiKuOeF3DmtJoX/o60eIyxFOFZZ4Q8=
-=crCL
+iF4EAREIAAYFAlO+mvsACgkQoBEVQmGOlx+cxwD/UlvXq/yoFPupCFOJCEJml/k7
+KX20Q6MYE5TM2bNs61UA/1cu35jx6N5JdGutxYQfOcLEYZh6aA9kUr9bcCIts7Ir
+=QZhd
 -----END PGP SIGNATURE-----
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"