Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-haskell/sha/files/
Date: Wed, 03 Aug 2016 07:36:49
Message-Id: 1470208914.4a0089fb027c669526756cbda2842d766b1c99de.monsieurp@gentoo
1 commit: 4a0089fb027c669526756cbda2842d766b1c99de
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Wed Jul 27 17:05:06 2016 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 3 07:21:54 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a0089fb
7
8 dev-haskell/sha: remove unused patch
9
10 Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
11
12 dev-haskell/sha/files/sha-1.6.0-no-tests.patch | 55 --------------------------
13 1 file changed, 55 deletions(-)
14
15 diff --git a/dev-haskell/sha/files/sha-1.6.0-no-tests.patch b/dev-haskell/sha/files/sha-1.6.0-no-tests.patch
16 deleted file mode 100644
17 index 040430b..0000000
18 --- a/dev-haskell/sha/files/sha-1.6.0-no-tests.patch
19 +++ /dev/null
20 @@ -1,55 +0,0 @@
21 -From 28704350d7b6148b2edbd5e8883c1c2dfba4f0ba Mon Sep 17 00:00:00 2001
22 -From: Sergei Trofimovich <slyfox@g.o>
23 -Date: Wed, 21 Nov 2012 23:44:33 +0300
24 -Subject: [PATCH] cabal: make depends on test libraries optional
25 -
26 -before the patch 'QuickCheck' and friends were required unconditionally:
27 -
28 - $ runhaskell Setup.hs configure -v -ftest | grep QuickCheck
29 - Dependency QuickCheck ==2.*: using QuickCheck-2.5.1.1
30 - $ runhaskell Setup.hs configure -v -f-test | grep QuickCheck
31 - Dependency QuickCheck ==2.*: using QuickCheck-2.5.1.1
32 -
33 -the patch fixes it by putting 'build-depends' under condition
34 -
35 - $ runhaskell Setup.hs configure -v -f-test | grep -i quickcheck
36 - $ runhaskell Setup.hs configure -v -ftest | grep -i quickcheck
37 - Dependency QuickCheck ==2.*: using QuickCheck-2.5.1.1
38 -
39 -Signed-off-by: Sergei Trofimovich <slyfox@g.o>
40 ----
41 - SHA.cabal | 11 ++++++-----
42 - 1 file changed, 6 insertions(+), 5 deletions(-)
43 -
44 -diff --git a/SHA.cabal b/SHA.cabal
45 -index a146b52..1ec2624 100644
46 ---- a/SHA.cabal
47 -+++ b/SHA.cabal
48 -@@ -37,9 +37,12 @@ Library
49 - Ghc-Options: -fregs-graph
50 -
51 - Executable test_sha
52 -- build-depends: base >= 4 && < 6, bytestring, binary, array,
53 -- QuickCheck == 2.*, test-framework >= 0.3,
54 -- test-framework-quickcheck2 >= 0.2
55 -+ if flag(test)
56 -+ build-depends: base >= 4 && < 6, bytestring, binary, array,
57 -+ QuickCheck == 2.*, test-framework >= 0.3,
58 -+ test-framework-quickcheck2 >= 0.2
59 -+ else
60 -+ buildable: False
61 - Main-Is: Test.hs
62 - Other-Modules: Data.Digest.Pure.SHA
63 -
64 -@@ -51,8 +54,6 @@ Executable test_sha
65 - if impl(ghc >= 6.12)
66 - Ghc-Options: -fregs-graph
67 -
68 -- if !flag(test)
69 -- buildable: False
70 -
71 - Executable sha1
72 - build-depends: base >= 4 && < 6, bytestring, binary, array, directory
73 ---
74 -1.8.0
75 -