From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 13CFD1387B1 for ; Mon, 21 Sep 2015 21:27:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7E30CE083B; Mon, 21 Sep 2015 21:27:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 11E71E083B for ; Mon, 21 Sep 2015 21:27:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D9ABC33BEE9 for ; Mon, 21 Sep 2015 21:27:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 62FF216C for ; Mon, 21 Sep 2015 21:27:50 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1442870856.45b650a0f158ec844470ff81cb64999c93196cfd.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-haskell/testpack/files/, dev-haskell/testpack/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-haskell/testpack/files/testpack-2.1.3.0-HUnit-1.3.patch dev-haskell/testpack/files/testpack-2.1.3.0-qc28.patch dev-haskell/testpack/testpack-2.1.3.0-r1.ebuild X-VCS-Directories: dev-haskell/testpack/ dev-haskell/testpack/files/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: 45b650a0f158ec844470ff81cb64999c93196cfd X-VCS-Branch: master Date: Mon, 21 Sep 2015 21:27:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 7b1b17d5-0a17-4a4b-a94a-20f5ffc10ee0 X-Archives-Hash: 9962fda005f882ee71871293c4eb76b5 commit: 45b650a0f158ec844470ff81cb64999c93196cfd Author: Sergei Trofimovich gentoo org> AuthorDate: Mon Sep 21 21:25:33 2015 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Mon Sep 21 21:27:36 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45b650a0 dev-haskell/testpack: tweak for QuickCheck-2.8, bug #561010 Reported-by: Toralf Förster Bug: https://bugs.gentoo.org/561010 Package-Manager: portage-2.2.20 dev-haskell/testpack/files/testpack-2.1.3.0-HUnit-1.3.patch | 13 +++++++++++++ dev-haskell/testpack/files/testpack-2.1.3.0-qc28.patch | 2 +- dev-haskell/testpack/testpack-2.1.3.0-r1.ebuild | 1 + 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dev-haskell/testpack/files/testpack-2.1.3.0-HUnit-1.3.patch b/dev-haskell/testpack/files/testpack-2.1.3.0-HUnit-1.3.patch new file mode 100644 index 0000000..599615a --- /dev/null +++ b/dev-haskell/testpack/files/testpack-2.1.3.0-HUnit-1.3.patch @@ -0,0 +1,13 @@ +diff --git a/src/Test/HUnit/Tools.hs b/src/Test/HUnit/Tools.hs +index a24a510..6b8a25e 100644 +--- a/src/Test/HUnit/Tools.hs ++++ b/src/Test/HUnit/Tools.hs +@@ -97,3 +97,7 @@ runVerbTestText (HU.PutText put us) t = do + reportFailure = reportProblem "Failure:" "Failure in: " +- reportProblem p0 p1 msg ss us = put line True us ++ reportProblem p0 p1 ++#if MIN_VERSION_HUnit(1,3,0) ++ _loc ++#endif ++ msg ss us = put line True us + where line = "### " ++ kind ++ path' ++ '\n' : msg 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 index 1bc9537..4ca1848 100644 --- a/dev-haskell/testpack/files/testpack-2.1.3.0-qc28.patch +++ b/dev-haskell/testpack/files/testpack-2.1.3.0-qc28.patch @@ -116,7 +116,7 @@ index 712c9bf..506686f 100644 - reason = "Result: expected " ++ show expected ++ ", got " ++ show actual, - stamp = [], callbacks = []} - -+ P.result { P.ok = Just (expected == actual) ++ P.failed { P.ok = Just (expected == actual) + , P.reason = "Result: expected " ++ show expected ++ ", got " ++ show actual + } {- | Like '@=?', but with args in a different order. -} diff --git a/dev-haskell/testpack/testpack-2.1.3.0-r1.ebuild b/dev-haskell/testpack/testpack-2.1.3.0-r1.ebuild index a3fa62e..97ca628 100644 --- a/dev-haskell/testpack/testpack-2.1.3.0-r1.ebuild +++ b/dev-haskell/testpack/testpack-2.1.3.0-r1.ebuild @@ -30,4 +30,5 @@ DEPEND="${RDEPEND} src_prepare() { epatch "${FILESDIR}"/${P}-qc28.patch + epatch "${FILESDIR}"/${P}-HUnit-1.3.patch }