3 files changed, 15 insertions, 23 deletions
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index b15ce1b2523f..9f090e13dc91 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -3,8 +3,8 @@ AUX gpgme-1.8.0-cmake.patch 1216 BLAKE2B 40510d7d2b700a58f12436ae81c2b978dcff450
 AUX gpgme-1.8.0-gcc-7.patch 554 BLAKE2B b31ffa5f08203dd0b896c04b47b0cb0d4916c7170c87e5ab8bf45896058817668660a0ee1648f2111a3d8c73bf896df015b4b371c95a1caccc7450dfe0792017 SHA512 3256a04a7dfeb7b3b5a20765b6350454069f2a96d79c786326868513a8b87f5337084a0e2a5afeab0485257b4b360ba2fc9f56f08bbc0c102d75773ba83c44f7
 DIST gpgme-1.10.0.tar.bz2 1370162 BLAKE2B b421d91a4fcd2e8887dc1a5c276fe1cce66f379741d86dfca751f4863039c39ccaf492c7683d6f6a0de407d2a6056e3496e45e3d472eef36a879e8b903e58c57 SHA512 8ffa348ef4775ed3209486444d54411e28c9a0ff1d7a4315feb0b2856ccd5d110b219100ea41262ca0016af69a1936d79fee0eadf2599c7c5bbeed05d11f7ab5
 DIST gpgme-1.8.0.tar.bz2 1298407 BLAKE2B b510651d0df12091489bccf6a432420db63337cfe5149d0449cef9071cbb671a52f7837d900b4d2e40deaa47688b1ea19a025ce8c930027a14620410228bff52 SHA512 9f214a44ddc4d602c2a0befc66aa6be9f2c90a24e153b873475867e30eec30e074826b98c11d20b0a2e4cd04e2625ce2545220481225fceb6ca9c51d3208e3de
-EBUILD gpgme-1.10.0.ebuild 2608 BLAKE2B d29d6a77fbf3939355e8d88049c58ddb407cf6943698fe0740ded8e21fba058dce26fbe4b43aea02608942383d1c66d7605fde4153acdbeea0cf2ac809b5aa46 SHA512 39b4d8b389716f61c609b71ca3f6759cf4dadd3053f0432dd818df18910fac6337ff7f46bd71552a7590d2bf3b6eda72ecf08a4fef38f1b830c6fb03690b8366
+EBUILD gpgme-1.10.0.ebuild 2720 BLAKE2B 2e6e6c70d56c0d03a0486f081d36c1bacf0de8735180aa0590650e9e6088298b66428d0d94a968452e430e3de0a8f2ad3b45e0b2e296ab5a633b4f7723a681b3 SHA512 f57059a86c2c110e27f1164251dc65a267c2f38fda8dd8041456460f1469cdd5c8d6b46a930dc2d38ee40c662c47f732df258b903b952599ee29196d1291aa1b
 EBUILD gpgme-1.8.0-r2.ebuild 2530 BLAKE2B f51880eb8800e66df6954ccb73e2e330f69ea553c52d187bacb00921306c8250204d14dbe748612cdd4958ca5728e1f80914eedd42367bf70225ec173ec32c18 SHA512 d1f5f1aad5bb8de38ff049084d81443c82fe88ddd720a5770e89fadb00d06094493d1911d033ebcd6ae8cbf1117e9b921465d0730b2a17730420895dd60c9244
 EBUILD gpgme-1.8.0-r3.ebuild 2682 BLAKE2B f04e23cf0773a36e380ad71e4603ec2b26583eddf25670946d4d05f134c18da8ae830cf0228417853ea97e4472e7284a87c3ac50099156de3b569961baa6827f SHA512 b6beaec93a62270d5e87b5f3798655ce3c48b3da65947904ec7667963ba39d28d9e032eb72477ff88ec68922c677b1b921daf2bed1de09c9f48e0c788fd394cb
-EBUILD gpgme-9999.ebuild 2787 BLAKE2B 264fdf2cc60ed4a87bf1ed7897a24b56e16a16729d96c00922fb48a2413e899209154d4587698436c3000ce1b575b590d5d5ad2215fe3d2808367e1629424c7a SHA512 a70e660dfc2740c339a6d28875bb85c58438d384adb439c779884ae3e1446042e8e59918f44fdc0a55be57b66848ca64532298d9d560069c7319506664191477
+EBUILD gpgme-9999.ebuild 2238 BLAKE2B afef415c3a730fc5ec3da76963a9c6a02adc2c49fd6629a49589fbc51513a288edafcb5d730f862c6147ca287d489b26190e4edbc4dbc3e29ad3c74dc7538a96 SHA512 a7c211d5b9cdddcb3d67e364e069f2d256aca238d7d1262af948859a3db50f0a300868113c721bf2796e696c5559a7089fbfc00e6096b5fc2686dac69c296e49
 MISC metadata.xml 315 BLAKE2B 18ded955b84237e03c8d14dc65f6b869c12674d4a87906f8fbc7650d02b20418cc2d97e9be6ea32f1aa170a8763cad3b91f9ac9b821a825fea0583cc66bed728 SHA512 502b5daf04f1b706514aba7d18cd454e1e99f63462159d3f5baebd1617bfa4760c7ea6fae9b7624fae2bc5943f8950211c6f4b326b6b62c3cf7eba4fc1255334
diff --git a/app-crypt/gpgme/gpgme-1.10.0.ebuild b/app-crypt/gpgme/gpgme-1.10.0.ebuild
index 941565550cdf..81ca9ecddb2f 100644
--- a/app-crypt/gpgme/gpgme-1.10.0.ebuild
+++ b/app-crypt/gpgme/gpgme-1.10.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="1/11" # subslot = soname major version
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="common-lisp static-libs cxx python qt5"
 
 COMMON_DEPEND=">=app-crypt/gnupg-2
@@ -44,6 +44,13 @@ do_python() {
 	fi
 }
 
+pkg_pretend() {
+	local MAX_WORKDIR=66
+
+	[[ "${#WORKDIR}" -le "${MAX_WORKDIR}" ]] ||
+		die "Cannot build package as WORKDIR '${WORKDIR}' is longer than ${MAX_WORKDIR} which will fail build"
+}
+
 pkg_setup() {
 	addpredict /run/user/$(id -u)/gnupg
 }
@@ -51,10 +58,10 @@ pkg_setup() {
 src_prepare() {
 	default
 
-	# Fix too long socket path for gpg-agent, this is mainly a problem
-	# for Prefix, where the builddir is deeper in the FS tree.
-	sed -i -e '/GNUPGHOME/s:$(abs_builddir):'"${T}"':' \
-		tests/gpg/Makefile.{am,in} || die
+	# Make best effort to allow longer PORTAGE_TMPDIR
+	# as usock limitation fails build/tests
+	ln -s "${P}" "${WORKDIR}/b"
+	S="${WORKDIR}/b"
 }
 
 src_configure() {
diff --git a/app-crypt/gpgme/gpgme-9999.ebuild b/app-crypt/gpgme/gpgme-9999.ebuild
index 134a3e18cd19..e9ff4a13a87d 100644
--- a/app-crypt/gpgme/gpgme-9999.ebuild
+++ b/app-crypt/gpgme/gpgme-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -65,21 +65,6 @@ src_configure() {
 		export MOC="$(qt5_get_bindir)/moc"
 	fi
 
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# FIXME: I don't know how to select on C++11 (libc++) here, but
-		# I do know all Darwin users are using C++11.  This should also
-		# apply to GCC 4.7+ with libc++, and basically anyone targetting
-		# it.
-
-		# The C-standard doesn't define strdup, and C++11 drops it
-		# resulting in an implicit declaration of strdup error.  Since
-		# it is in POSIX raise the feature set to that.
-		append-cxxflags -D_POSIX_C_SOURCE=200112L
-
-		# Work around bug 601834
-		use python && append-cflags -D_DARWIN_C_SOURCE
-	fi
-
 	econf \
 		--enable-languages="${languages[*]}" \
 		$(use_enable static-libs static)