From d0f0401e5098b6f4e0a0f85ce24de3acda1bcb68 Mon Sep 17 00:00:00 2001
From: Kristian Fiskerstrand <k_f@gentoo.org>
Date: Sun, 21 Oct 2018 13:50:57 +0200
Subject: [PATCH] app-crypt/gnupg: Add user-socket USE flag

The user-socket USE flag enables --enable-run-gnupg-user-socket.

Closes: https://bugs.gentoo.org/663142
Signed-off-by: Kristian Fiskerstrand <k_f@gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11
---
 .../{gnupg-2.2.10-r1.ebuild => gnupg-2.2.10-r2.ebuild}   | 9 +++++++--
 app-crypt/gnupg/metadata.xml                             | 3 +++
 2 files changed, 10 insertions(+), 2 deletions(-)
 rename app-crypt/gnupg/{gnupg-2.2.10-r1.ebuild => gnupg-2.2.10-r2.ebuild} (95%)

diff --git a/app-crypt/gnupg/gnupg-2.2.10-r1.ebuild b/app-crypt/gnupg/gnupg-2.2.10-r2.ebuild
similarity index 95%
rename from app-crypt/gnupg/gnupg-2.2.10-r1.ebuild
rename to app-crypt/gnupg/gnupg-2.2.10-r2.ebuild
index 7d51332a5446..2bf51b3eec85 100644
--- a/app-crypt/gnupg/gnupg-2.2.10-r1.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.10-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb wks-server"
+IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server"
 
 # Existence of executables is checked during configuration.
 DEPEND="!app-crypt/dirmngr
@@ -67,6 +67,11 @@ src_configure() {
 		myconf+=( --enable-symcryptrun )
 	fi
 
+	#bug 663142
+	if use user-socket; then
+		myconf+=( --enable-run-gnupg-user-socket )
+	fi
+
 	# glib fails and picks up clang's internal stdint.h causing weird errors
 	[[ ${CC} == *clang ]] && \
 		export gl_cv_absolute_stdint_h=/usr/include/stdint.h
diff --git a/app-crypt/gnupg/metadata.xml b/app-crypt/gnupg/metadata.xml
index d9ae4079527c..710e79addfa5 100644
--- a/app-crypt/gnupg/metadata.xml
+++ b/app-crypt/gnupg/metadata.xml
@@ -22,6 +22,9 @@
 		<flag name="usb">
 		Build direct CCID access for scdaemon; requires <pkg>dev-libs/libusb</pkg>.
 		</flag>
+		<flag name="user-socket">
+		try a socket directory which is not removed by init manager at session end
+		</flag>
 		<flag name="mta">
 		Build mta support using <pkg>virtual/mta</pkg>.
 		</flag>
-- 
2.26.2