diff options
| author |   Mark Wright <gienah@gentoo.org> | 2012-09-13 13:24:46 +0000 |
|---|---|---|
| committer | Mark Wright <gienah@gentoo.org> | 2012-09-13 13:24:46 +0000 |
| commit | 4b41cd79c500faedd62010c6a0bcf870d6a1951d (patch) | |
| tree | 601601b5c52277107a5bf891c657a726534939ec /dev-haskell | |
| parent | Remove older unstable version (diff) | |
| download | historical-4b41cd79c500faedd62010c6a0bcf870d6a1951d.tar.gz historical-4b41cd79c500faedd62010c6a0bcf870d6a1951d.tar.bz2 historical-4b41cd79c500faedd62010c6a0bcf870d6a1951d.zip | |
Fix testpack 2.1.2 build with quickcheck 2.5
Package-Manager: portage-2.1.11.14/cvs/Linux x86_64
Diffstat (limited to 'dev-haskell')
| -rw-r--r-- | dev-haskell/testpack/Manifest | 13 | ||||
| -rw-r--r-- | dev-haskell/testpack/files/testpack-2.1.2-quickcheck-2.5.patch | 31 | ||||
| -rw-r--r-- | dev-haskell/testpack/testpack-2.1.2.ebuild | 6 |
3 files changed, 47 insertions, 3 deletions
diff --git a/dev-haskell/testpack/Manifest b/dev-haskell/testpack/Manifest index a34b0a5b05d3..bff18db4a434 100644 --- a/dev-haskell/testpack/Manifest +++ b/dev-haskell/testpack/Manifest @@ -1,6 +1,17 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +AUX testpack-2.1.2-quickcheck-2.5.patch 1397 SHA256 f36d89de79110f964b6d74206037996a25df449eeeb5f44eb023fc212ece60aa SHA512 21050509872cf8723d36cd998d832b6881fd5acea12a19abbabce75f1c7dd23b70e25430af9fff6c0805203c8e4e06cf83ebb8b0b4a8942faaf441ea635d1c90 WHIRLPOOL 60f93bae1076d33fa7c458d6665f9a28b094f65d6d7db2a3643755f5811f2b4ad80a4bb89e42cd8976466c7b940153e3d2da66cb8aad1dc6905523aa778ec54c DIST testpack-2.1.1.tar.gz 14861 SHA256 afc2cd992263112e08beaebf3c75b47d885574659ce093e7810124bf611f0ffd SHA512 f0c67ffbf9397ddbbb521b2984b88816e409ed552de4bd9af162e91bd2924fff345a2e03318979db20197fd0cdfd7f8dfc27f547c865edaf27c8cf8d606ea7be WHIRLPOOL ed801aed502e73a99651862a7a990addae4e0464f85aa063fdf4e6b12e8b553a7b715626dec6d1d45bfda0e75974ba75bca9bbb0a2cc0955133d4307cf4e8e70 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.ebuild 837 SHA256 223b6d516ffe742c2f72548e6ae42434097968e15aae1eb913a4b2817e241343 SHA512 70bad1a31c6393e8b41dbac1c2ab8abd1783544bd08e6518ef252b8f547b8a2b7c9be231841bdaef43012230ff27ccef4c543c6b84c72868691921b12526292c WHIRLPOOL 4ac2c2459a438df6b8db9f56a7d5daf0b56c43772372b80a446b389f0e7e7ae98ec916184c8032c276bdc9831df49fc29e354068f78be883b9d34913d830b242 +EBUILD testpack-2.1.2.ebuild 900 SHA256 1655ec28a8c7fb5cc278721128b7076c2b3194c258bb9fcc143318d870c81e91 SHA512 8b6ad76317780a05f21ac791fdd186063e6ba9c0c170ebb0157867f98a714bd77ee13470a0ddf06dd9e62b4101413bdbf5c0bf1a0c4869970150a32a66336cdf WHIRLPOOL 533d78c21539e82c8d64396be7213fb43d1c3c55644b27820dc886f878557db302d2f420bbe3701a76410160e398554cdf725baa23729409a3a1dcc56592fca6 MISC ChangeLog 1098 SHA256 74b138a4275e2178420aab41bb89215d67f592741d73529e065aab80629cc9b5 SHA512 9adf1375241af8e0c28418cb6defd4f218346d169b3c99e54af1bdaae5f9bf2388bfbb929413d8e1d81ef8501d32913ee3198e6aa8afb284809052ee402001f1 WHIRLPOOL 672e5840b038f978b236c9a4a3e42b535622c24d133a12649ed8c02afed44b432f1d8daaf7a321936902b8a7a8f2cfae3d3506f7619b7e9bc276d1631a10e369 MISC metadata.xml 665 SHA256 ef96a191ceb13d2522b914caef5f61514368f3055de28e7bdcb0fe0a97323b04 SHA512 ce33ea4fe56cecb3855b8c4d073b989851f7fee35f3b027d7071dad34d6202dbb21bd245a275fe47b6cd0fef646a90fb94442929366c1fb285dab8f9fce80d58 WHIRLPOOL c0219ca8bf2d0a237bfa6462dec440a06291b98d429bc83ef4c75fe6cd9b9c9479ec54931e8e61eadf6c857da535759d04824191ff8105ef8f647250b15a6328 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.19 (GNU/Linux) + +iF4EAREIAAYFAlBR3qkACgkQoBEVQmGOlx+DQQD/TolhtIT3jhqHjUYMw79fDEEF +Rb4e/A9L8C2avEQd0ugA/0Gee3gP2rz38ull9IdDyf6zv8HyIUJc8ot0RjUfKN66 +=h0iF +-----END PGP SIGNATURE----- diff --git a/dev-haskell/testpack/files/testpack-2.1.2-quickcheck-2.5.patch b/dev-haskell/testpack/files/testpack-2.1.2-quickcheck-2.5.patch new file mode 100644 index 000000000000..7fdb372be8a5 --- /dev/null +++ b/dev-haskell/testpack/files/testpack-2.1.2-quickcheck-2.5.patch @@ -0,0 +1,31 @@ +--- testpack-2.1.2-orig/src/Test/HUnit/Tools.hs 2012-02-29 09:20:32.000000000 +1100 ++++ testpack-2.1.2/src/Test/HUnit/Tools.hs 2012-07-09 09:03:53.104931180 +1000 +@@ -128,7 +128,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: + +@@ -174,7 +180,12 @@ + 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 diff --git a/dev-haskell/testpack/testpack-2.1.2.ebuild b/dev-haskell/testpack/testpack-2.1.2.ebuild index 0c1d291f1996..22d765569125 100644 --- a/dev-haskell/testpack/testpack-2.1.2.ebuild +++ b/dev-haskell/testpack/testpack-2.1.2.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2012 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.ebuild,v 1.2 2012/09/12 15:38:31 qnikst Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/testpack/testpack-2.1.2.ebuild,v 1.3 2012/09/13 13:24:46 gienah Exp $ EAPI=4 # ebuild generated by hackport 0.2.18.9999 CABAL_FEATURES="lib profile haddock hoogle hscolour" -inherit haskell-cabal +inherit base haskell-cabal DESCRIPTION="Test Utililty Pack for HUnit and QuickCheck" HOMEPAGE="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/testpack" @@ -25,3 +25,5 @@ RDEPEND="dev-haskell/hunit[profile?] >=dev-lang/ghc-6.8.2" DEPEND="${RDEPEND} >=dev-haskell/cabal-1.2" + +PATCHES=("${FILESDIR}/${PN}-2.1.2-quickcheck-2.5.patch") |