Patch testpack-2.1.2.1-r2 for quickcheck-2.7

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

4 files changed, 227 insertions, 18 deletions

diff --git a/dev-haskell/testpack/ChangeLog b/dev-haskell/testpack/ChangeLog
index 3a62559f6985..2d85fbdba592 100644
--- a/dev-haskell/testpack/ChangeLog
+++ b/dev-haskell/testpack/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-haskell/testpack
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/testpack/ChangeLog,v 1.11 2013/08/07 13:32:18 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/testpack/ChangeLog,v 1.12 2014/07/03 11:17:39 gienah Exp $
+
+*testpack-2.1.2.1-r2 (03 Jul 2014)
+
+  03 Jul 2014; Mark Wright <gienah@gentoo.org>
+  +files/testpack-2.1.2.1-quickcheck-2.7.patch, +testpack-2.1.2.1-r2.ebuild:
+  Patch testpack-2.1.2.1-r2 for quickcheck-2.7
 
   07 Aug 2013; Agostino Sarubbo <ago@gentoo.org> testpack-2.1.2.1.ebuild:
   Stable for x86, wrt bug #470374
diff --git a/dev-haskell/testpack/Manifest b/dev-haskell/testpack/Manifest
index 0f0371e4e849..29d6be7f7adf 100644
--- a/dev-haskell/testpack/Manifest
+++ b/dev-haskell/testpack/Manifest
@@ -1,30 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX testpack-2.1.2-quickcheck-2.5.patch 1397 SHA256 f36d89de79110f964b6d74206037996a25df449eeeb5f44eb023fc212ece60aa SHA512 21050509872cf8723d36cd998d832b6881fd5acea12a19abbabce75f1c7dd23b70e25430af9fff6c0805203c8e4e06cf83ebb8b0b4a8942faaf441ea635d1c90 WHIRLPOOL 60f93bae1076d33fa7c458d6665f9a28b094f65d6d7db2a3643755f5811f2b4ad80a4bb89e42cd8976466c7b940153e3d2da66cb8aad1dc6905523aa778ec54c
 AUX testpack-2.1.2.1-quickcheck-2.6.patch 1785 SHA256 50d6096fcded5cb79751dd59f5c63f03810659da5877dbd1f7ae884e3e0863e4 SHA512 ccca88cb1c705cb0958397af8f0f91c3e11f3063b7e1d1c2c73cf4a5a970bf827edbe21bf21b327f69442dc18297c26cb3729fd8a11eebd4c51848b11fd9c204 WHIRLPOOL 1ac81343667b04c017339ed88f882c9a881b2e1a32a7b8ab5820dc97e5c989fe1f7f86ec1228ad8c4b8c2ab59c60e7c346059c0265a5cbc600cf4bea75b56647
+AUX testpack-2.1.2.1-quickcheck-2.7.patch 6875 SHA256 af3c897f72e3e44b63f020d60702a559529f86a310b41823af2cc9af51c86729 SHA512 5af4d8984decb20b10fd83b1eb899cd42622c4a7d352aaaf18d473e5eb92e6c486299e579cfc15841334efdbdbc8b76f44308593fae39938b6e87aaef6a0e05c WHIRLPOOL 21038f23907cb485b2673a74b6d7fba8b57d478a72663f022608723fad43e0aad6fc58d05cf1f41aac8047511dc1bb2045b2596341e7a7baef0bc8e1837a771f
 DIST testpack-2.1.1.tar.gz 14861 SHA256 afc2cd992263112e08beaebf3c75b47d885574659ce093e7810124bf611f0ffd SHA512 f0c67ffbf9397ddbbb521b2984b88816e409ed552de4bd9af162e91bd2924fff345a2e03318979db20197fd0cdfd7f8dfc27f547c865edaf27c8cf8d606ea7be WHIRLPOOL ed801aed502e73a99651862a7a990addae4e0464f85aa063fdf4e6b12e8b553a7b715626dec6d1d45bfda0e75974ba75bca9bbb0a2cc0955133d4307cf4e8e70
 DIST testpack-2.1.2.1.tar.gz 14795 SHA256 4096465f44f1add5a24134bebdcef5259bff31661680cc1061900bbd936fa4ba SHA512 26cc35d2d634ffcd67ca6dfe6ffe89aa82acb983e4df7f2dabfd283d510d79962b09f7d37f532aa98862b531b2461396427cb7148235232fea5a98f0d16c63fa WHIRLPOOL e76936bc358996112e5837c8235ee150f73e753eb06b68cba9cd01840fd628551d64f48d0cc650ef9b248e83e290fb50d5fef0696c0264198a9d33ec06d398fe
 DIST testpack-2.1.2.tar.gz 14812 SHA256 2e7604b7e42c173611d9ed329921d96f9bcc8d0417dcb9296f9503bf35a2b089 SHA512 30131b82434112d89bc9d8deeddde678c4eaced9a757de3f90237b663669788e420fc05cd8ace6b64ec12d4e90c965d68b7425ed684aa10b7ae3b7601cb5444c WHIRLPOOL 3985b496ccbe2d33a6643cd26add1af638c53c83e5238717ace8c1f99523a8f38ed2a9f19e691301465e6e6e56476a764b60c58e2a7b12bda1a5652f4774cf86
 EBUILD testpack-2.1.1.ebuild 771 SHA256 846ae47e02001665d69508388a03ec5719e7574b9d4359f01444bb828b2fe7d3 SHA512 63c8af80b99a8ed7eb377e6ecae2b45b8b4d9f8262427e1c3a13969fce3d3f7455fd69be98b4760537546389972bd8f0e6eb4e04e4ae14a65cd94778fa13f728 WHIRLPOOL cdc7633e3c5981be76e634f879de54ecd8dab1f7e67f76eec99932d0320c6972eb4db28135b4aef7bfa183856dba87c8d51ef3a33cca3cf49bf6f235f09e2141
+EBUILD testpack-2.1.2.1-r2.ebuild 965 SHA256 34638fb04edb80627575bff8efcca0a201fb658c6da55102d083721c176355b6 SHA512 5d143065c6ddc2fa7e305248b40d85693bc90b7ee0890da3dd22c3de2c60849782749820c653e67d27e123ba3e388fb930bd0faa15ff5a3fd2d290042c8faf6b WHIRLPOOL 4fae212c3c0b1917c218bf11c946ea03f992e34f02e422e3e3af9e63aa47e0e5ceb8ade5794db2decea612d9da340d1d64430e64659a1f3788fd0e11cbfc6c08
 EBUILD testpack-2.1.2.1.ebuild 963 SHA256 2b8fce83fa53a9bcd8e182bfa880ba6bd28f2fb3d4ee29b9143aae514f51414f SHA512 eb6415d9a8903c623a3e39321bd26c52a72d23423a7b42af244fffcd75c7dbe3dc1dfe2970e893e3c60f56e7512a048c7885d4828e352f195a2787ce681c430b WHIRLPOOL 18d10ad9e941709f7ad98eb3185a3f7fa1bbfa16eb44e47c42f215a3beb1709211e1bfd3194b2ae11ff577f43414d9bcc59dd805f138056767e52b5a8d53a1de
 EBUILD testpack-2.1.2.ebuild 895 SHA256 1c79cc86c2d1614fbe2769bbf12b3302e2237dd655c7dc16f10d1512bbd97917 SHA512 7988ac08de02179f1da10bd30c3a37d7be5b123eec0839f8d81f7b1cbcc68464bb771ab82bf4389434522e58f9d5308e0bdc91149d68d2b99c263517f7e9ccf1 WHIRLPOOL 4cd4b398cb6cb65afa4b54399fe25fca3299289d77fa6480af46cb46bf7acb06f8f4195f1c7646545d3a92bd723b669cbccba056174685ca2c12a76215db6547
-MISC ChangeLog 1680 SHA256 6f92d1022c65717dd35b2bdf6eaa242f9f1f790d4bd0a62717a40bcd40af9363 SHA512 c022b0b1bbc8132f1e8b205c6515a208f4d7adde0361b2db8928b8ab1c15d96dbf069edbe2b2986b1e35de19de32079ec2927d6335cdd7b786136e039e1ca169 WHIRLPOOL 673fe41c81b0ff40f026f9b8d5c7e98d88dfa2a2b03964775ada7ed9120089d90380b61f881a464622706c73f7007057963a9f128342cfdb5b9e783960d3c5ca
+MISC ChangeLog 1891 SHA256 9fdcd334885b6fa22b11030addf92b5382e09a5de8c85302f2083657041cc4e8 SHA512 da86a826a65befa7464795f81019eba66a6519a45e48935cff2ed7b896ada5f73a90c1c10ed7a5fa9dded79c830cbf0fd4f04b6052bbf668bd17deffa9cd68e8 WHIRLPOOL 855a380a494df0906b7b141827aeda51262b81be63da4254e5e6294c5432a42c2a4e1f6140ade1bbbb15c6c45d286c34c64e459ce8db17487a6c5913cb013c91
 MISC metadata.xml 665 SHA256 ef96a191ceb13d2522b914caef5f61514368f3055de28e7bdcb0fe0a97323b04 SHA512 ce33ea4fe56cecb3855b8c4d073b989851f7fee35f3b027d7071dad34d6202dbb21bd245a275fe47b6cd0fef646a90fb94442929366c1fb285dab8f9fce80d58 WHIRLPOOL c0219ca8bf2d0a237bfa6462dec440a06291b98d429bc83ef4c75fe6cd9b9c9479ec54931e8e61eadf6c857da535759d04824191ff8105ef8f647250b15a6328
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSAkuhAAoJELp701BxlEWfeG4P+gL+ZHH9hbWtTDIXzj+Y0NAE
-E1fX/ocGkYC8jmN3qdWq9u4fWsRMujdeWSnxS7UcnnBWmsQohx4ABRaf83q0czzG
-qoPL3Ybhfbkn9iCvPsW3bgk+AUkmiuINZ/C5S0rNL2fXs9UJUaomiTdD0pvq4Upn
-cGKukwxbzC7O+QepmHd2cJLlD64U9PkBiS/obwkkq6lLiOrEVL0+rDRFHnBmQSzf
-rk43jxcxDJdPbw1BxQ8jkDgqrASv5GAogHLfk4mDsM2ZifqvPIPczYHL7OBjPwB/
-c+hOVN+OiEBjGvy/2WyhB+QzEWDKik+vU1YimJ77TICnra6JvRINboosFv1DXfVT
-DiDUyBG7aFx1RUA0oXKxE1jVjcO23lxq+B0Zs3G5HP/HkmAXkESjKS7CBEE3TS2U
-vYevrX/da0axM2xaTBdX4R0Ils6nFcRrcFVWV4rO+Qcrbd1hxHpPoTlGCyLSc+Xv
-mfvxq9I9YdX12w2C4uwZE6c7IrtrwoniJaIDUtkZ0b0P0J/6Ayh2AbP2i61jDcYe
-UyIgQTMML+/r+IRasSFiU1XDf+0fXbxsk2dPa3vpsTO6564F+QpACw31WJmxWR7w
-ika6iCi6IVdJUgyLaipdaC+ZsXvgj5HlG3YTmt28Iwp/OOtSHWwN1w9ds15jqB4R
-CcxKJOCUKOBu4WXhdziH
-=JwYv
+iF4EAREIAAYFAlO1O9kACgkQoBEVQmGOlx/v6gD8D+cnfrLvfEm3CbDmvxRPfg/R
+WVbEWF1jnrv3yiXy9BUBAKg5BVXlbVTX+jxsUFc19LLnJVQMUgpDlHGfLW+MiHVm
+=/8Pm
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/testpack/files/testpack-2.1.2.1-quickcheck-2.7.patch b/dev-haskell/testpack/files/testpack-2.1.2.1-quickcheck-2.7.patch
new file mode 100644
index 000000000000..62271f344c26
--- /dev/null
+++ b/dev-haskell/testpack/files/testpack-2.1.2.1-quickcheck-2.7.patch
@@ -0,0 +1,182 @@
+--- testpack-2.1.2.1-orig/testpack.cabal	2013-02-26 02:03:46.000000000 +1100
++++ testpack-2.1.2.1/testpack.cabal	2014-07-03 20:47:34.432871930 +1000
+@@ -39,7 +39,7 @@
+ 
+  Build-Depends: base >= 3 && < 5,
+                mtl, HUnit,
+-               QuickCheck >= 2.1.0.3 && < 2.5
++               QuickCheck >= 2.1.0.3 && < 2.8
+ 
+  If flag(splitBase)
+    Build-Depends: base >= 3 && < 5, containers, random
+--- testpack-2.1.2.1-orig/src/Test/HUnit/Tools.hs	2013-02-26 02:03:46.000000000 +1100
++++ testpack-2.1.2.1/src/Test/HUnit/Tools.hs	2014-07-03 21:01:50.373614959 +1000
+@@ -25,7 +25,14 @@
+ import Test.QuickCheck.Property hiding (Result(reason))
+ import qualified Control.Exception
+ import qualified Test.HUnit as HU
+-import System.Random
++#if MIN_VERSION_QuickCheck(2,7,0)
++import Test.QuickCheck.Random (newQCGen, QCGen(..))
++import System.Random (split)
++#else
++import System.Random (newStdGen, StdGen(..), split)
++#define newStdGen newQCGen
++#define StdGen QCGen
++#endif
+ import System.IO
+ import Text.Printf
+ 
+@@ -96,7 +103,7 @@
+ 
+ {-
+ -- | modified version of the tests function from Test.QuickCheck
+-tests :: Args -> Gen Result -> StdGen -> Int -> Int -> [[String]] -> IO ()
++tests :: Args -> Gen Result -> QCGen -> Int -> Int -> [[String]] -> IO ()
+ tests config gen rnd0 ntest nfail stamps
+   | ntest == maxSuccess config = return ()
+   | nfail == maxDiscard config = assertFailure $ "Arguments exhausted after " ++ show ntest ++ " tests."
+@@ -128,7 +135,13 @@
+ >        q "Integer -> Int (safe bounds)" prop_integer_to_int_pass]
+ -}
+ qc2hu :: QC.Testable a => Int -> String -> a -> HU.Test
+-qc2hu maxTest = qccheck (stdArgs {maxSuccess = maxTest, maxDiscard = 20000})
++qc2hu maxTest = qccheck (stdArgs {maxSuccess = maxTest,
++#if MIN_VERSION_QuickCheck(2,5,0)
++                                  maxDiscardRatio = if maxTest /= 0 then 20000 `div` maxTest else 10
++#else
++                                  maxDiscard = 20000
++#endif
++                                 })
+ 
+ {- | Run verbose tests.  Example:
+ 
+@@ -163,18 +176,28 @@
+ -- | Tests a property, using test arguments, produces a test result, and prints the results to 'stdout'.
+ localquickCheckWithResult :: Testable prop => Args -> prop -> IO Result
+ localquickCheckWithResult args p =
+-  do 
+ #if MIN_VERSION_QuickCheck(2,3,0)
++#if MIN_VERSION_QuickCheck(2,6,0)
++  (if chatty args then withStdioTerminal else withNullTerminal) $ \tm -> do
++#else
++  do
+      tm  <- if chatty args then newStdioTerminal else newNullTerminal
++#endif
+ #else
++  do
+      tm  <- newTerminal
+ #endif
+      rnd <- case replay args of
+-              Nothing      -> newStdGen
++              Nothing      -> newQCGen
+               Just (rnd,_) -> return rnd
+      test MkState{ terminal          = tm
+                  , maxSuccessTests   = maxSuccess args
+-                 , maxDiscardedTests = maxDiscard args
++                 , maxDiscardedTests =
++#if MIN_VERSION_QuickCheck(2,5,0)
++                                       maxDiscardRatio args * maxSuccess args
++#else
++                                       maxDiscard args
++#endif
+                  , computeSize       = case replay args of
+                                          Nothing    -> \n d -> (n * maxSize args)
+                                                          `div` maxSuccess args
+@@ -190,17 +213,23 @@
+ #endif
+                  , numSuccessShrinks = 0
+                  , numTryShrinks     = 0
++#if MIN_VERSION_QuickCheck(2,7,0)
++                 , numRecentlyDiscardedTests = 0
++                 , numTotTryShrinks = 0
++                 } (unGen (unProperty (property p)))
++#else
+                  } (unGen (property p))
++#endif
+   where 
+ --------------------------------------------------------------------------
+ -- main test loop
+-    test :: State -> (StdGen -> Int -> Prop) -> IO Result
++    test :: State -> (QCGen -> Int -> Prop) -> IO Result
+     test st f
+       | numSuccessTests st   >= maxSuccessTests st   = doneTesting st f
+       | numDiscardedTests st >= maxDiscardedTests st = giveUp st f
+       | otherwise                                    = runATest st f
+ 
+-    doneTesting :: State -> (StdGen -> Int -> Prop) -> IO Result
++    doneTesting :: State -> (QCGen -> Int -> Prop) -> IO Result
+     doneTesting st f = 
+       do
+ #if MIN_VERSION_QuickCheck(2,3,0)
+@@ -221,7 +250,7 @@
+ #endif
+                                    }
+   
+-    giveUp :: State -> (StdGen -> Int -> Prop) -> IO Result
++    giveUp :: State -> (QCGen -> Int -> Prop) -> IO Result
+     giveUp st f =
+       do
+ #if MIN_VERSION_QuickCheck(2,3,0)
+@@ -234,7 +263,7 @@
+ #endif
+                      }
+ 
+-    runATest :: State -> (StdGen -> Int -> Prop) -> IO Result
++    runATest :: State -> (QCGen -> Int -> Prop) -> IO Result
+     runATest st f =
+       do
+         let size = computeSize st (numSuccessTests st) (numDiscardedTests st)
+@@ -266,7 +295,12 @@
+           Just False -> -- failed test
+             do 
+ #if MIN_VERSION_QuickCheck(2,3,0)
++#if MIN_VERSION_QuickCheck(2,3,0)
++               (numShrinks, totFailed, lastFailed) <- foundFailure st res ts
++#else
+                numShrinks <- foundFailure st res ts
++#endif
++
+                theOutput <- terminalOutput (terminal st)
+ #else
+                foundFailure st res ts
+@@ -288,5 +322,9 @@
+                                , numShrinks = numShrinks
+                                , output     = theOutput
+ #endif
++#if MIN_VERSION_QuickCheck(2,7,0)
++                               , numShrinkTries = totFailed
++                               , numShrinkFinal = lastFailed
++#endif
+                                }
+       where (rnd1,rnd2) = split (randomSeed st)
+--- testpack-2.1.2.1-orig/src/Test/QuickCheck/Tools.hs	2013-02-26 02:03:46.000000000 +1100
++++ testpack-2.1.2.1/src/Test/QuickCheck/Tools.hs	2014-07-03 21:01:23.932306995 +1000
+@@ -23,15 +23,27 @@
+                               
+                              )
+ where
++#if MIN_VERSION_QuickCheck(2,6,0)
++import Test.QuickCheck.Property (Result(..), callbacks, expect, theException, ok, reason, stamp)
++#if MIN_VERSION_QuickCheck(2,7,0)
++#else
++import Test.QuickCheck.Property (Result(..), callbacks, expect, interrupted, ok, reason, stamp)
++#endif
++#else
+ import Test.QuickCheck hiding (Result, reason)
+ import Test.QuickCheck.Property
++#endif
+ 
+ {- | Compare two values.  If same, the test passes.  If different, the result indicates
+ what was expected and what was received as part of the error. -}
+ (@=?) :: (Eq a, Show a) => a -> a -> Result
+ expected @=? actual = 
+         MkResult {ok = Just (expected == actual), 
++#if MIN_VERSION_QuickCheck(2,7,0)
++                  expect = True, theException = Nothing,
++#else
+                   expect = True, interrupted = False,
++#endif
+                   reason = "Result: expected " ++ show expected ++ ", got " ++ show actual,
+                   stamp = [], callbacks = []}
+     
diff --git a/dev-haskell/testpack/testpack-2.1.2.1-r2.ebuild b/dev-haskell/testpack/testpack-2.1.2.1-r2.ebuild
new file mode 100644
index 000000000000..2a90323aa15a
--- /dev/null
+++ b/dev-haskell/testpack/testpack-2.1.2.1-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/testpack/testpack-2.1.2.1-r2.ebuild,v 1.1 2014/07/03 11:17:39 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.2.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit base haskell-cabal
+
+DESCRIPTION="Test Utililty Pack for HUnit and QuickCheck"
+HOMEPAGE="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/testpack"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/hunit:=[profile?]
+		dev-haskell/mtl:=[profile?]
+		>=dev-haskell/quickcheck-2.1.0.3:2=[profile?] <dev-haskell/quickcheck-2.8:2=[profile?]
+		dev-haskell/random:=[profile?]
+		>=dev-lang/ghc-6.10.4:="
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.2"
+
+PATCHES=("${FILESDIR}/${PN}-2.1.2.1-quickcheck-2.7.patch")