commit: d59e4c9344392f1af0d3016041d98fe597abb22b Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> AuthorDate: Wed Nov 29 19:46:05 2017 +0000 Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> CommitDate: Wed Nov 29 19:47:05 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d59e4c93
app-crypt/gpgme: fix tests Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=639192 Package-Manager: Portage-2.3.13, Repoman-2.3.3 app-crypt/gpgme/Manifest | 4 ++-- .../gpgme/files/gpgme-1.10.0_beta81-build.patch | 28 ++++++++++++++++++++++ app-crypt/gpgme/gpgme-1.10.0_beta81.ebuild | 7 +++++- 3 files changed, 36 insertions(+), 3 deletions(-) diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest index e8cc44b4308..b8df5746154 100644 --- a/app-crypt/gpgme/Manifest +++ b/app-crypt/gpgme/Manifest @@ -1,2 +1,2 @@ -DIST gpgme-1.10.0-beta81.tar.bz2 1293818 SHA256 91bc25aac8bb953da2f216ca3a41b9c7be34bb8adae5d2b7ad51975cc221ef2a SHA512 be7b12c7c7df4fe5da574a6d443932bf4467175561c45a30bae8fe408fb916e05ce26f2b9add15e845351b3864491350060fe3436765ba0e84c167a7ec64066b WHIRLPOOL 37b83ed311927ecc17c211157ac6a35a213d1a3549948752c1aa05fe547e035de3ae47a0c3e5ab5c5aea2567d612fab2cb4864b5db2f9ca351c2c061d5aebcf5 -DIST gpgme-1.8.0.tar.bz2 1298407 SHA256 596097257c2ce22e747741f8ff3d7e24f6e26231fa198a41b2a072e62d1e5d33 SHA512 9f214a44ddc4d602c2a0befc66aa6be9f2c90a24e153b873475867e30eec30e074826b98c11d20b0a2e4cd04e2625ce2545220481225fceb6ca9c51d3208e3de WHIRLPOOL 79ed725e24302d4d738e90739cf3c5e6e9fa89c3e4fef87a4fca569abb7f7b7f0140e62e76161f747b555f49166fd0ccda277dbd6cc46c00ce2797c32d442f7b +DIST gpgme-1.10.0-beta81.tar.bz2 1293818 BLAKE2B 12dbc9120986943ace281c0f0f7020c71e5ed2760bcc85f7d427f731190df8b24779932b8fb8476372669960be28a9ce8af9622b534b4e3e7a9cd5180663f147 SHA512 be7b12c7c7df4fe5da574a6d443932bf4467175561c45a30bae8fe408fb916e05ce26f2b9add15e845351b3864491350060fe3436765ba0e84c167a7ec64066b +DIST gpgme-1.8.0.tar.bz2 1298407 BLAKE2B b510651d0df12091489bccf6a432420db63337cfe5149d0449cef9071cbb671a52f7837d900b4d2e40deaa47688b1ea19a025ce8c930027a14620410228bff52 SHA512 9f214a44ddc4d602c2a0befc66aa6be9f2c90a24e153b873475867e30eec30e074826b98c11d20b0a2e4cd04e2625ce2545220481225fceb6ca9c51d3208e3de 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 new file mode 100644 index 00000000000..8f6dc01617c --- /dev/null +++ b/app-crypt/gpgme/files/gpgme-1.10.0_beta81-build.patch @@ -0,0 +1,28 @@ +From 8ffc2c7809b47a87131cde38e14dc3941d13fa21 Mon Sep 17 00:00:00 2001 +From: Alon Bar-Lev <[email protected]> +Date: Wed, 29 Nov 2017 21:35:33 +0200 +Subject: [PATCH GPGME] tests: gpgsm: fix gpg-agent detection +To: [email protected] + +* tests/gpgsm/Makefile.am: set the GPG_AGENT var. + +Signed-off-by: Alon Bar-Lev <[email protected]> +--- + tests/gpgsm/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/gpgsm/Makefile.am b/tests/gpgsm/Makefile.am +index 3774c5ff..4ab22833 100644 +--- a/tests/gpgsm/Makefile.am ++++ b/tests/gpgsm/Makefile.am +@@ -20,6 +20,7 @@ + ## Process this file with automake to produce Makefile.in + + GPGSM = gpgsm ++GPG_AGENT = gpg-agent + + TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) LC_ALL=C GPG_AGENT_INFO= \ + top_srcdir=$(top_srcdir) +-- +2.13.6 + diff --git a/app-crypt/gpgme/gpgme-1.10.0_beta81.ebuild b/app-crypt/gpgme/gpgme-1.10.0_beta81.ebuild index 562eb510e9a..a17a8fa1602 100644 --- a/app-crypt/gpgme/gpgme-1.10.0_beta81.ebuild +++ b/app-crypt/gpgme/gpgme-1.10.0_beta81.ebuild @@ -6,7 +6,7 @@ EAPI="6" PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) DISTUTILS_OPTIONAL=1 -inherit distutils-r1 flag-o-matic ltprune qmake-utils toolchain-funcs +inherit autotools distutils-r1 flag-o-matic ltprune qmake-utils toolchain-funcs MY_PV="${PV//_/-}" MY_P="${PN}-${MY_PV}" @@ -39,6 +39,10 @@ RDEPEND="${COMMON_DEPEND} REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )" +PATCHES=( + "${FILESDIR}/${P}-build.patch" +) + S="${WORKDIR}/${MY_P}" do_python() { @@ -55,6 +59,7 @@ pkg_setup() { src_prepare() { default + eautoreconf # Socket name is too long if we use full beta name # tests are failing
