1 |
commit: d59e4c9344392f1af0d3016041d98fe597abb22b |
2 |
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Nov 29 19:46:05 2017 +0000 |
4 |
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Nov 29 19:47:05 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d59e4c93 |
7 |
|
8 |
app-crypt/gpgme: fix tests |
9 |
|
10 |
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=639192 |
11 |
Package-Manager: Portage-2.3.13, Repoman-2.3.3 |
12 |
|
13 |
app-crypt/gpgme/Manifest | 4 ++-- |
14 |
.../gpgme/files/gpgme-1.10.0_beta81-build.patch | 28 ++++++++++++++++++++++ |
15 |
app-crypt/gpgme/gpgme-1.10.0_beta81.ebuild | 7 +++++- |
16 |
3 files changed, 36 insertions(+), 3 deletions(-) |
17 |
|
18 |
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest |
19 |
index e8cc44b4308..b8df5746154 100644 |
20 |
--- a/app-crypt/gpgme/Manifest |
21 |
+++ b/app-crypt/gpgme/Manifest |
22 |
@@ -1,2 +1,2 @@ |
23 |
-DIST gpgme-1.10.0-beta81.tar.bz2 1293818 SHA256 91bc25aac8bb953da2f216ca3a41b9c7be34bb8adae5d2b7ad51975cc221ef2a SHA512 be7b12c7c7df4fe5da574a6d443932bf4467175561c45a30bae8fe408fb916e05ce26f2b9add15e845351b3864491350060fe3436765ba0e84c167a7ec64066b WHIRLPOOL 37b83ed311927ecc17c211157ac6a35a213d1a3549948752c1aa05fe547e035de3ae47a0c3e5ab5c5aea2567d612fab2cb4864b5db2f9ca351c2c061d5aebcf5 |
24 |
-DIST gpgme-1.8.0.tar.bz2 1298407 SHA256 596097257c2ce22e747741f8ff3d7e24f6e26231fa198a41b2a072e62d1e5d33 SHA512 9f214a44ddc4d602c2a0befc66aa6be9f2c90a24e153b873475867e30eec30e074826b98c11d20b0a2e4cd04e2625ce2545220481225fceb6ca9c51d3208e3de WHIRLPOOL 79ed725e24302d4d738e90739cf3c5e6e9fa89c3e4fef87a4fca569abb7f7b7f0140e62e76161f747b555f49166fd0ccda277dbd6cc46c00ce2797c32d442f7b |
25 |
+DIST gpgme-1.10.0-beta81.tar.bz2 1293818 BLAKE2B 12dbc9120986943ace281c0f0f7020c71e5ed2760bcc85f7d427f731190df8b24779932b8fb8476372669960be28a9ce8af9622b534b4e3e7a9cd5180663f147 SHA512 be7b12c7c7df4fe5da574a6d443932bf4467175561c45a30bae8fe408fb916e05ce26f2b9add15e845351b3864491350060fe3436765ba0e84c167a7ec64066b |
26 |
+DIST gpgme-1.8.0.tar.bz2 1298407 BLAKE2B b510651d0df12091489bccf6a432420db63337cfe5149d0449cef9071cbb671a52f7837d900b4d2e40deaa47688b1ea19a025ce8c930027a14620410228bff52 SHA512 9f214a44ddc4d602c2a0befc66aa6be9f2c90a24e153b873475867e30eec30e074826b98c11d20b0a2e4cd04e2625ce2545220481225fceb6ca9c51d3208e3de |
27 |
|
28 |
diff --git a/app-crypt/gpgme/files/gpgme-1.10.0_beta81-build.patch b/app-crypt/gpgme/files/gpgme-1.10.0_beta81-build.patch |
29 |
new file mode 100644 |
30 |
index 00000000000..8f6dc01617c |
31 |
--- /dev/null |
32 |
+++ b/app-crypt/gpgme/files/gpgme-1.10.0_beta81-build.patch |
33 |
@@ -0,0 +1,28 @@ |
34 |
+From 8ffc2c7809b47a87131cde38e14dc3941d13fa21 Mon Sep 17 00:00:00 2001 |
35 |
+From: Alon Bar-Lev <alon.barlev@×××××.com> |
36 |
+Date: Wed, 29 Nov 2017 21:35:33 +0200 |
37 |
+Subject: [PATCH GPGME] tests: gpgsm: fix gpg-agent detection |
38 |
+To: gnupg-devel@×××××.org |
39 |
+ |
40 |
+* tests/gpgsm/Makefile.am: set the GPG_AGENT var. |
41 |
+ |
42 |
+Signed-off-by: Alon Bar-Lev <alon.barlev@×××××.com> |
43 |
+--- |
44 |
+ tests/gpgsm/Makefile.am | 1 + |
45 |
+ 1 file changed, 1 insertion(+) |
46 |
+ |
47 |
+diff --git a/tests/gpgsm/Makefile.am b/tests/gpgsm/Makefile.am |
48 |
+index 3774c5ff..4ab22833 100644 |
49 |
+--- a/tests/gpgsm/Makefile.am |
50 |
++++ b/tests/gpgsm/Makefile.am |
51 |
+@@ -20,6 +20,7 @@ |
52 |
+ ## Process this file with automake to produce Makefile.in |
53 |
+ |
54 |
+ GPGSM = gpgsm |
55 |
++GPG_AGENT = gpg-agent |
56 |
+ |
57 |
+ TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) LC_ALL=C GPG_AGENT_INFO= \ |
58 |
+ top_srcdir=$(top_srcdir) |
59 |
+-- |
60 |
+2.13.6 |
61 |
+ |
62 |
|
63 |
diff --git a/app-crypt/gpgme/gpgme-1.10.0_beta81.ebuild b/app-crypt/gpgme/gpgme-1.10.0_beta81.ebuild |
64 |
index 562eb510e9a..a17a8fa1602 100644 |
65 |
--- a/app-crypt/gpgme/gpgme-1.10.0_beta81.ebuild |
66 |
+++ b/app-crypt/gpgme/gpgme-1.10.0_beta81.ebuild |
67 |
@@ -6,7 +6,7 @@ EAPI="6" |
68 |
PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) |
69 |
DISTUTILS_OPTIONAL=1 |
70 |
|
71 |
-inherit distutils-r1 flag-o-matic ltprune qmake-utils toolchain-funcs |
72 |
+inherit autotools distutils-r1 flag-o-matic ltprune qmake-utils toolchain-funcs |
73 |
|
74 |
MY_PV="${PV//_/-}" |
75 |
MY_P="${PN}-${MY_PV}" |
76 |
@@ -39,6 +39,10 @@ RDEPEND="${COMMON_DEPEND} |
77 |
|
78 |
REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )" |
79 |
|
80 |
+PATCHES=( |
81 |
+ "${FILESDIR}/${P}-build.patch" |
82 |
+) |
83 |
+ |
84 |
S="${WORKDIR}/${MY_P}" |
85 |
|
86 |
do_python() { |
87 |
@@ -55,6 +59,7 @@ pkg_setup() { |
88 |
|
89 |
src_prepare() { |
90 |
default |
91 |
+ eautoreconf |
92 |
|
93 |
# Socket name is too long if we use full beta name |
94 |
# tests are failing |