From 0a09d793adb8363905b3ec49f3b9cf6706252c0c Mon Sep 17 00:00:00 2001 From: Mark Wright Date: Fri, 3 Apr 2015 23:51:00 +0000 Subject: [PATCH] Apply patch by Sergei Trofimovich to port testpack-2.1.3.0 to quickcheck-2.8 Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0x618E971F --- dev-haskell/testpack/ChangeLog | 10 +- dev-haskell/testpack/Manifest | 10 +- .../files/testpack-2.1.3.0-qc28.patch | 139 ++++++++++++++++++ .../testpack/testpack-2.1.3.0-r1.ebuild | 33 +++++ 4 files changed, 186 insertions(+), 6 deletions(-) create mode 100644 dev-haskell/testpack/files/testpack-2.1.3.0-qc28.patch create mode 100644 dev-haskell/testpack/testpack-2.1.3.0-r1.ebuild diff --git a/dev-haskell/testpack/ChangeLog b/dev-haskell/testpack/ChangeLog index fe5f4d018c9b..dda36fa01425 100644 --- a/dev-haskell/testpack/ChangeLog +++ b/dev-haskell/testpack/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-haskell/testpack -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/testpack/ChangeLog,v 1.14 2014/12/14 06:16:48 gienah Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/testpack/ChangeLog,v 1.15 2015/04/03 23:50:53 gienah Exp $ + +*testpack-2.1.3.0-r1 (03 Apr 2015) + + 03 Apr 2015; Mark Wright + +files/testpack-2.1.3.0-qc28.patch, +testpack-2.1.3.0-r1.ebuild: + Apply patch by Sergei Trofimovich to port testpack-2.1.3.0 to quickcheck-2.8 *testpack-2.1.3.0 (14 Dec 2014) diff --git a/dev-haskell/testpack/Manifest b/dev-haskell/testpack/Manifest index fa555617365e..200ff0c42e30 100644 --- a/dev-haskell/testpack/Manifest +++ b/dev-haskell/testpack/Manifest @@ -4,6 +4,7 @@ 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 +AUX testpack-2.1.3.0-qc28.patch 5526 SHA256 e85a8ddc1637609cd1d39f73457a764f228ec1ef4cc1b29497fd0a497c7dfb28 SHA512 12236ab7fc6e27aee0ffe9307f7a29d965c5cfaf4a75cd833d802ede8b67fc1858dc961cecce104c1f6ff9d7a60ea0dc25e7a327187604f020cc7b4a1600b3e3 WHIRLPOOL c89dd728e6de94d9b971b513a56190fd1af122402508fc6c967404d3d8e03203479bf5c3af175b6fc747b36988a09f03374a4223d98b873650354b5f625e3a10 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 @@ -12,13 +13,14 @@ EBUILD testpack-2.1.1.ebuild 771 SHA256 846ae47e02001665d69508388a03ec5719e7574b 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 +EBUILD testpack-2.1.3.0-r1.ebuild 903 SHA256 a528e7a2c19cd010067adc6abc9c812669dd21fa69c2047e2478517783fb8401 SHA512 2dedd1086d36a4ed7a61025e9460e5497e981dfecda261663e658cf9fe6eaff0aeadda0c27baf6709206daf0388aa667dea335a0cccf50fc22407222e63f08f8 WHIRLPOOL 13b0c7c289d0612b0143d9104fb5a01862917629073a13f2b5afa5012ec8c40c779620f4411f0009b7fcc9b716e65753720253dbd92716d6a51ae1bef1a07c5f EBUILD testpack-2.1.3.0.ebuild 877 SHA256 6a3219fb7cb0d74fee698908e63ae4124ceceb493f46d41932d5d1341bafb3af SHA512 fcd76ee67f9701e5a18ffcd2c5929ac73c9d9a2ddbed354d67e963f1400b437b66c8cdf7313803550953f6342546aa9491631e5c9fe8b481b246a5a548b998aa WHIRLPOOL f84223b3f5e4e740f8bdc2291659ffeacdc9376487a1a03431fa6bb2b0e66e2993c258fda304aa42b3b7e04d7cc7f9c2e555efec574d04fc1c787d60287c5d3a -MISC ChangeLog 2154 SHA256 4abd14c24c9b57c793693e399750b8b87b15458d346f9a17c41c7723f9514aed SHA512 184e49d4f6e0c7ffeb7d09b9df797a24a69245f1dca62da1b55c3ed22c74b7f08bb4fa27473d8acdf021d1b591741b7f81d8844e8f8c79638534dc77a444b0ef WHIRLPOOL b9ee74ab0bd80e9b2c9ffdc681413ebbc6bc9068f977e59379ac232dbe414df00e3db4cf1e88e77ca12557e8dae73f811883bc6cce02150306b627bbbcd70374 +MISC ChangeLog 2384 SHA256 72a9bdf26e2bd32a5aba09d358cecc37eeddfd76b4fd573cd8d92cf69089e79e SHA512 2431a47bed722cedd5d2312abc330d7d510616a57775de3abb6f39beebdb22665515daa103a667a72eb5b2f3e24035406d5b4103db81118166f8e2fcca43d8cf WHIRLPOOL 96640fefe17d18e29de60ff34d90d7c0abb1d15544f2c9244ff5607852c34ecb0e9455582beff299ff404c745554e20782a1cedc3528b95d0e0aee85db2150c6 MISC metadata.xml 600 SHA256 b21e9f7dfca65780d46b210fa15684a3ce6b7ac906be0fe6ae7fa52ca95cd162 SHA512 7a988718f09b7f3195e1b407ce6a5290cd9e1265cb10176945a10a6a63677ca48ec236a9d5600848fb691b6bb908ee53b99fc90edeb6ead88985f086f875b256 WHIRLPOOL ffbe9bc5cb68fd85b2559c3e13652e3def33b72da9d6e1228e59361cb80a5e8fcc56cf0819ce262f2b7ec04ac77b55641177349d0205449842b99f9f52fd18a5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iF4EAREIAAYFAlSNK1YACgkQoBEVQmGOlx/9dQD8DOflo+ZQHlWdLWbbFQMMUaad -d3wttkON4pYlgGxeZ4MA+wQEbpnMG/8J+bQthhvXnpMyLWJdnH16yUa9E9i053HQ -=NqyW +iF4EAREIAAYFAlUfJ2IACgkQoBEVQmGOlx/zRQD/Tarm9gEv1HDzVKNRmgAHQK1I +HHAiLH0XtK5Rmh7liqIBAIBkWA/NOmgQr/H9JUjdbxRRu2uMoscNQkzNGPG6gV9N +=bNMN -----END PGP SIGNATURE----- diff --git a/dev-haskell/testpack/files/testpack-2.1.3.0-qc28.patch b/dev-haskell/testpack/files/testpack-2.1.3.0-qc28.patch new file mode 100644 index 000000000000..1bc9537f5d2a --- /dev/null +++ b/dev-haskell/testpack/files/testpack-2.1.3.0-qc28.patch @@ -0,0 +1,139 @@ +diff --git a/src/Test/HUnit/Tools.hs b/src/Test/HUnit/Tools.hs +index 2b66548..a24a510 100644 +--- a/src/Test/HUnit/Tools.hs ++++ b/src/Test/HUnit/Tools.hs +@@ -18,9 +18,9 @@ module Test.HUnit.Tools (assertRaises, mapassertEqual, + where + import Test.QuickCheck as QC + import Test.QuickCheck.Text +-import Test.QuickCheck.Test ++import Test.QuickCheck.Test as TQT + import Test.QuickCheck.Gen +-import Test.QuickCheck.State ++import Test.QuickCheck.State as TQS + import qualified Test.QuickCheck.Property as P + import Test.QuickCheck.Property hiding (Result(reason)) + import qualified Control.Exception +@@ -33,6 +33,9 @@ import System.Random (newStdGen, StdGen(..), split) + #define newStdGen newQCGen + #define StdGen QCGen + #endif ++#if MIN_VERSION_QuickCheck(2,8,0) ++import qualified Data.Map as Map ++#endif + import System.IO + import Text.Printf + +@@ -205,6 +208,9 @@ localquickCheckWithResult args p = + Just (_,s) -> \_ _ -> s + , numSuccessTests = 0 + , numDiscardedTests = 0 ++#if MIN_VERSION_QuickCheck(2,8,0) ++ , TQS.labels = Map.empty ++#endif + , collected = [] + , expectedFailure = False + , randomSeed = rnd +@@ -236,14 +242,14 @@ localquickCheckWithResult args p = + theOutput <- terminalOutput (terminal st) + #endif + if expectedFailure st then +- return Success{ labels = summary st ++ return Success{ TQT.labels = summary st + #if MIN_VERSION_QuickCheck(2,3,0) + , numTests = numSuccessTests st + , output = theOutput + #endif + } + else +- return NoExpectedFailure{ labels = summary st ++ return NoExpectedFailure{ TQT.labels = summary st + #if MIN_VERSION_QuickCheck(2,3,0) + , numTests = numSuccessTests st + , output = theOutput +@@ -257,7 +263,7 @@ localquickCheckWithResult args p = + theOutput <- terminalOutput (terminal st) + #endif + return GaveUp{ numTests = numSuccessTests st +- , labels = summary st ++ , TQT.labels = summary st + #if MIN_VERSION_QuickCheck(2,3,0) + , output = theOutput + #endif +@@ -306,7 +312,7 @@ localquickCheckWithResult args p = + foundFailure st res ts + #endif + if not (expect res) then +- return Success{ labels = summary st ++ return Success{ TQT.labels = summary st + #if MIN_VERSION_QuickCheck(2,3,0) + , numTests = numSuccessTests st+1 + , output = theOutput +@@ -316,7 +322,7 @@ localquickCheckWithResult args p = + return Failure{ usedSeed = randomSeed st -- correct! (this will be split first) + , usedSize = size + , reason = P.reason res +- , labels = summary st ++ , TQT.labels = summary st + #if MIN_VERSION_QuickCheck(2,3,0) + , numTests = numSuccessTests st + 1 + , numShrinks = numShrinks +diff --git a/src/Test/QuickCheck/Tools.hs b/src/Test/QuickCheck/Tools.hs +index 712c9bf..506686f 100644 +--- a/src/Test/QuickCheck/Tools.hs ++++ b/src/Test/QuickCheck/Tools.hs +@@ -20,34 +20,18 @@ Written by John Goerzen, jgoerzen\@complete.org + module Test.QuickCheck.Tools (-- * Comparisons + (@=?), + (@?=) +- + ) + 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 ++ ++import qualified Test.QuickCheck.Property as P + + {- | 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 ++(@=?) :: (Eq a, Show a) => a -> a -> P.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 = []} +- ++ P.result { P.ok = Just (expected == actual) ++ , P.reason = "Result: expected " ++ show expected ++ ", got " ++ show actual ++ } + {- | Like '@=?', but with args in a different order. -} +-(@?=) :: (Eq a, Show a) => a -> a -> Result ++(@?=) :: (Eq a, Show a) => a -> a -> P.Result + (@?=) = flip (@=?) +- +diff --git a/testpack.cabal b/testpack.cabal +index 0873b33..dab77d9 100644 +--- a/testpack.cabal ++++ b/testpack.cabal +@@ -46,7 +46,7 @@ Library + + Build-Depends: base >= 3 && < 5, + mtl, HUnit, +- QuickCheck >= 2.1.0.3 && < 2.8 ++ QuickCheck >= 2.1.0.3 && < 2.9 + + If flag(splitBase) + Build-Depends: base >= 3 && < 5, containers, random diff --git a/dev-haskell/testpack/testpack-2.1.3.0-r1.ebuild b/dev-haskell/testpack/testpack-2.1.3.0-r1.ebuild new file mode 100644 index 000000000000..c9192aff6444 --- /dev/null +++ b/dev-haskell/testpack/testpack-2.1.3.0-r1.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/testpack/testpack-2.1.3.0-r1.ebuild,v 1.1 2015/04/03 23:50:53 gienah Exp $ + +EAPI=5 + +# ebuild generated by hackport 0.4.4.9999 + +CABAL_FEATURES="lib profile haddock hoogle hscolour" +inherit eutils haskell-cabal + +DESCRIPTION="Test Utililty Pack for HUnit and QuickCheck (unmaintained)" +HOMEPAGE="https://github.com/jgoerzen/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/random:=[profile?] + >=dev-lang/ghc-7.4.1:= +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-1.6 +" + +src_prepare() { + epatch "${FILESDIR}"/${P}-qc28.patch +} -- 2.26.2