gentoo resync : 01.12.2017

3 files changed, 38 insertions, 4 deletions

diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index 2ef1f75e315e..ded429cd81ee 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -1,9 +1,10 @@
 AUX gpgme-1.1.8-et_EE.patch 347 BLAKE2B 88afa9629af3249337361e69496c3662ba7320229b50db697045174c58bee15e7cd0841125b646aa4a934d01a7a4ed309b902f70c67146c66100e2a66a24b5aa SHA512 69577d0a1ae9061277cd502d72c2add13b61def4990c09c6181a14b4792745a4e2e467090019ab1ed8d3dc6df6f09b63230d2d21974e0a802a1e976fe5de18d5
+AUX gpgme-1.10.0_beta81-build.patch 817 BLAKE2B de479a5592a470fa308e9e640bf7c88815eec8caa202e6f02cdda34b750081ef73bd1c7bc1764451ad91d48d73f1fbd5a9c7d40db11ae90093b49ad282f23d71 SHA512 633d18fda3a81a3b7592887455bac5ced37cdcb7951e7ad43dde7e4b809395fefc1eae168b49ade53862a92c07c198046602b6a56bbcacaf762b3f3e8d779983
 AUX gpgme-1.8.0-cmake.patch 1216 BLAKE2B 40510d7d2b700a58f12436ae81c2b978dcff450060dca31ffa10b00c53da0ce55405fc1eeb51ee6686f30f050337aaa3e978f1979cfe7151c5195d570f0a9432 SHA512 be2788db4a796fdd21524d20a8bc7ad52f7928fbd6e9945e5a2be048cc6251bf593a3d46623c589cbcd4491a3e5abdfc14b618098113c0e1ddcabdb4e7701f57
 AUX gpgme-1.8.0-gcc-7.patch 554 BLAKE2B b31ffa5f08203dd0b896c04b47b0cb0d4916c7170c87e5ab8bf45896058817668660a0ee1648f2111a3d8c73bf896df015b4b371c95a1caccc7450dfe0792017 SHA512 3256a04a7dfeb7b3b5a20765b6350454069f2a96d79c786326868513a8b87f5337084a0e2a5afeab0485257b4b360ba2fc9f56f08bbc0c102d75773ba83c44f7
-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
-EBUILD gpgme-1.10.0_beta81.ebuild 3108 BLAKE2B 31925558bd8e623b8a5af82e1d31d8d41f8688bd774623ef1124283e8a1be446df8aafd8708fba9fa7f2d5952bbb7a2c722e1242fd78f5e5be32505d1857a4a6 SHA512 5f8eab70fce530ac319a3fd55baf52fc234ec89479dd736bffed4443194f1f1888b61be180ea9b4d53605ac548850edc72c89a6bbc2ae80098179371dfba5ea8
+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
+EBUILD gpgme-1.10.0_beta81.ebuild 3176 BLAKE2B d67d0cab23284582395df73d37011ca452a2e90fe199706e0711ea4f50a54ce149908b794c4f3aa6308f148d820642f63feb15d6ac21dc6f8d1213f6dfdc953c SHA512 85275578dd563f69d2353652a5d4767b26cefbc8b39109c0e1e4d6f9a4413c36dea4e5ab73a377d1018e4685f2edb178ec891035a2e70495d6d4efa18ef04bb6
 EBUILD gpgme-1.8.0-r2.ebuild 2526 BLAKE2B b703d96c5cb1b55cffa7c72ba158c0e695c1e6a9d63e8801e1a5a2a5266c704c9f9441d8fa996402539ed855e755c1a1f4bab9ba23e5b652893c5ff80b39d3f9 SHA512 bb3849e3f0e2de7326c9f9c49114c0ad98827e8d72c3aad7d22e8ced2e65bb505ce79c437808e1b38e0c2d02bb2b26363557be6eb5898d062afedc87e1770a46
 EBUILD gpgme-1.8.0-r3.ebuild 2678 BLAKE2B b1eb1e842c13b4d45f641ba275bd6b129ce33d1d56cf8c9b5ad15fca1789e0c9b540ff797e5dfc6c158a9c1a4fd1db41debcdfed740be957a7f438a91d5e5c64 SHA512 3b201fbf0d78b94091bee410d12b599c1fc51ff9ca674437bb7dfbcc1bf97084002a02e05b26dd6e48b53483f78b8e2009a01fdaabea4312a4eb1062b8999d72
 EBUILD gpgme-9999.ebuild 2783 BLAKE2B aa4bcaf208df25e4a3dc4256804b02d2aa3dd1180fd4749bf79a5a16c699f3b80b11f662b61a9db76a58f3bd64696a0f6a5f51847d18bb5584f3b73b8a50ac57 SHA512 8a100c6a5760d652fca76f58725599dbdeca8202701435f519c44ab88cd4e2b97685aa9798f21e6449b8bc3a3986df9c113645c5d86d3c382bbb9a7585afaa86
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 000000000000..8f6dc01617ce
--- /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 <alon.barlev@gmail.com>
+Date: Wed, 29 Nov 2017 21:35:33 +0200
+Subject: [PATCH GPGME] tests: gpgsm: fix gpg-agent detection
+To: gnupg-devel@gnupg.org
+
+* tests/gpgsm/Makefile.am: set the GPG_AGENT var.
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ 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 562eb510e9a3..a17a8fa16028 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