gentoo resync : 18.11.2018

3 files changed, 140 insertions, 2 deletions

diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 10b556c9e709..c1a0b1e445c8 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,11 +1,13 @@
 AUX gnupg-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch 1048 BLAKE2B 36f37b74da309100191f4d8f9c27d08a1b00d2d30fbaf169dbb74ebbe42293357a4fb62332e286fe5725dcfdc30645a602dc2a51c51924b06215b68fd5235658 SHA512 fd12827150e96cd7979ea9611d64ed4ab9e6c61cfecdd697b8fb4d162f20985b734c2bfc365a921809b9029e86a85a9b36c10ec472b3dd49c25ea18f5aef56ce
 DIST gnupg-1.4.21.tar.bz2 3689305 BLAKE2B 0c26c9c3aeae2bf2eafa858bc3bd15cc2702bce12a8a90938565322c34e2eeb8e5432932f5c9344a76aa4528b66051141536c062d9923a79d12a0767421bb017 SHA512 619e0fbc10310c7e55d129027e2945791fe91a0884b1d6f53acb4b2e380d1c6e71d1a516a59876182c5c70a4227d44a74ceda018c343b5291fa9a5d6de77c984
 DIST gnupg-2.2.10.tar.bz2 6659484 BLAKE2B d0270ca40bd70fe113fa4283c307d7d04370beec77ffba0abb7862defdab2d5a82b1508284961e30e7d0aab82bffdf09fe796741603e843a062073f179f0bfc2 SHA512 a4477828f268fa69125cf1822f8a721e67f8f4008bd9817b701989393bd93689aac8fee1f4d34d918911d53afabdcbb1c84d40e8a4489d7a29b5a769d330fddd
+DIST gnupg-2.2.11.tar.bz2 6652480 BLAKE2B 4118a9d4a9b42635850dad99d250f28bf1a15c046e17f6100c864a7ee2bfa4471b1deb0a1125805544b2ad29de36cb380cc2d309900374f01bb93db4dd977419 SHA512 8aa8beea877993b6eef155e1a503ffdde9963ff04a24e6a3dea7979efeeeeeab57e942a80ad46ef254d27a83e8cb2e3008da7749afa8e39eade190c0499f95d9
 DIST gnupg-2.2.8.tar.bz2 6632465 BLAKE2B e13bdfb2b17f87dd2122da5a489318bfcefec26c0fbb65dc6a36034314985bbd405cb22cfaf9bffa4c7928657cbc63d363f16b77d00bf86737b73c73ffbce4f2 SHA512 24271ec2663b941ed5e72e2179b48ac73d5cd838292aa9d4954952b11713f4b466f30e6af632b22c9e7c284350e300a07046d41d0ab73dcbd1639b303cd09007
 DIST gnupg-2.2.9.tar.bz2 6659547 BLAKE2B 3715fa0fcfbed24b0c985811c14e5a8c84caef0e66937ec7eb2ebefb4603a2c9a994d3c73224941254c685ca32cd83d7bb924fb7171ee569b346f2092ed7ae5d SHA512 96faf227bef78fee99ff20606f3ce74eddc407c3864b928f8676a80f50dfaf2dd291eaeeaa0d291a254275a87e4f8506df9ed31c1cfc7652999208c292a16922
 EBUILD gnupg-1.4.21.ebuild 3345 BLAKE2B 611a2e3c8d3a47337a17891ce9df00d0aca121f827169ea1aec9cb8c44b3f38858e1c8d39d08985f71790127bbbe64b16f0293b368d8dc627700fc1cc31983d7 SHA512 14a708c00e98c76fa6ef1f2d878f84f63d8e110f85b35b9c40b6da80525af685df09ea83eb1dd1fce1fe3016b9e12a46c02c91f11ea78496c12301acbf04d257
 EBUILD gnupg-2.2.10-r2.ebuild 3663 BLAKE2B ebc41be08f922215079e5f6975972a75355d068099edcb885a0b04ce0cd72010502ced08cab2890b3f65b71820d9b45e76695a865079add2bab15090bffa03bc SHA512 7294ee0c840da055910a7f3430ad164a9f93d8ade7624ecbeb3ff88b9818e422eee6259d58b9d201601b834b654b3eeaa169dc3d8e16113af1e9b4a9a3f46092
-EBUILD gnupg-2.2.10.ebuild 3325 BLAKE2B 9934a8675f24573c984152530e77db22f2914af0021f8e7120e3d6d4d26bc4bb6fad531075323b119776a01f54b9c2950aec8d45050347dadcd86f0a1f0eed35 SHA512 5332bfc99ee43e4f63605adb479356dc00d6649ba6470b6416fa2f1a46b6e41c1286f0f0a43917b29b460b2c8945e924d8845d7e1495020fe9ef72b102e67a64
+EBUILD gnupg-2.2.10.ebuild 3324 BLAKE2B ff92e79f71da06c5b4b6761de94e3210678386ff482e55b57aee4519ca9b7eaf236ccddc25505b05bd00a41c245f4f24dcbd10f25a521f6b74215fbac7c33c06 SHA512 632ee6549ebaa5aa9615e1385cfd1b17f0424fe159b720f1ef25a18f8dfeedf6f9b84c4e5d88d4c99f7c334d284ba501c2199bd9b7fc17c1e64eb05492deb6ba
+EBUILD gnupg-2.2.11.ebuild 3663 BLAKE2B ebc41be08f922215079e5f6975972a75355d068099edcb885a0b04ce0cd72010502ced08cab2890b3f65b71820d9b45e76695a865079add2bab15090bffa03bc SHA512 7294ee0c840da055910a7f3430ad164a9f93d8ade7624ecbeb3ff88b9818e422eee6259d58b9d201601b834b654b3eeaa169dc3d8e16113af1e9b4a9a3f46092
 EBUILD gnupg-2.2.8.ebuild 3197 BLAKE2B 047ced194ad1467cdd5ade6f747b200aff373e5cbee4ae4ac17a113c4c1df5176abdb2658808c3bf00682dc08a42cca4c84c704016b682a8782521bf52783f4c SHA512 99bda452847ef64c1727b31d406034ad69da164355d18d36eefa7744f25cc2376abbf4dcc72b919884881b49cfdf27c8149c513c63c58467d4eb478d1db10fd7
 EBUILD gnupg-2.2.9.ebuild 3334 BLAKE2B b59f061776948cacfcf4b0e7e348a66e2d8ae8fbb1ec3b906afc98944b9e3a92f35db13b8befb42194cdb71f2eebbf8a2e04ee9ec511aa73a5934d7996f1932e SHA512 7a8db6bfb393b88a60331ebdc3892f3b8175824adcf02338972084a6f272231bba783ff7394d02696471d962dc4298595d110c9f5b6127b6d8bedc00f1784c0a
 MISC metadata.xml 1313 BLAKE2B 2bf26407bdea8af215d09d28640b961ee98c86c297595736fbe477c8b9cfaf0f8970982ce22038dabf0d8529e39032a3fec9da0c17a5acca0cf3cb197f31f1c0 SHA512 0500f03936eba67706cea87c1f5b16db280b159fc31780b93e696e8ab20e3dece90f0bd80af5aa9582cab557cc337c65e8e101daa935ba6ca31b7f126328c0ac
diff --git a/app-crypt/gnupg/gnupg-2.2.10.ebuild b/app-crypt/gnupg/gnupg-2.2.10.ebuild
index 05d0682a4563..71676b45a15e 100644
--- a/app-crypt/gnupg/gnupg-2.2.10.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.10.ebuild
@@ -13,7 +13,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"
+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"
 
 COMMON_DEPEND_LIBS="
diff --git a/app-crypt/gnupg/gnupg-2.2.11.ebuild b/app-crypt/gnupg/gnupg-2.2.11.ebuild
new file mode 100644
index 000000000000..9e198106fa36
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.2.11.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic systemd toolchain-funcs
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
+HOMEPAGE="http://www.gnupg.org/"
+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 user-socket wks-server"
+
+# Existence of executables is checked during configuration.
+DEPEND="!app-crypt/dirmngr
+	>=dev-libs/libassuan-2.5.0
+	>=dev-libs/libgcrypt-1.7.3
+	>=dev-libs/libgpg-error-1.28
+	>=dev-libs/libksba-1.3.4
+	>=dev-libs/npth-1.2
+	>=net-misc/curl-7.10
+	bzip2? ( app-arch/bzip2 )
+	ldap? ( net-nds/openldap )
+	readline? ( sys-libs/readline:0= )
+	smartcard? ( usb? ( virtual/libusb:0 ) )
+	ssl? ( >=net-libs/gnutls-3.0:0= )
+	sys-libs/zlib
+	tofu? ( >=dev-db/sqlite-3.7 )
+	virtual/mta"
+
+RDEPEND="${DEPEND}
+	app-crypt/pinentry
+	nls? ( virtual/libintl )
+	selinux? ( sec-policy/selinux-gpg )"
+
+BDEPEND="virtual/pkgconfig
+	doc? ( sys-apps/texinfo )
+	nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=(
+	ChangeLog NEWS README THANKS TODO VERSION
+	doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
+)
+
+src_configure() {
+	local myconf=()
+
+	if use prefix && use usb; then
+		# bug #649598
+		append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
+	fi
+
+	if use elibc_SunOS || use elibc_AIX; then
+		myconf+=( --disable-symcryptrun )
+	else
+		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
+
+	econf \
+		"${myconf[@]}" \
+		$(use_enable bzip2) \
+		$(use_enable nls) \
+		$(use_enable smartcard scdaemon) \
+		$(use_enable ssl gnutls) \
+		$(use_enable tofu) \
+		$(use_enable usb ccid-driver) \
+		$(use_enable wks-server wks-tools) \
+		$(use_with ldap) \
+		$(use_with readline) \
+		--disable-ntbtls \
+		--enable-all-tests \
+		--enable-gpg \
+		--enable-gpgsm \
+		--enable-large-secmem \
+		CC_FOR_BUILD="$(tc-getBUILD_CC)" \
+		GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config" \
+		KSBA_CONFIG="${EROOT}/usr/bin/ksba-config" \
+		LIBASSUAN_CONFIG="${EROOT}/usr/bin/libassuan-config" \
+		LIBGCRYPT_CONFIG="${EROOT}/usr/bin/${CHOST}-libgcrypt-config" \
+		NPTH_CONFIG="${EROOT}/usr/bin/npth-config" \
+		$("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
+}
+
+src_compile() {
+	default
+
+	use doc && emake -C doc html
+}
+
+src_test() {
+	#Bug: 638574
+	use tofu && export TESTFLAGS=--parallel
+	default
+}
+
+src_install() {
+	default
+
+	use tools &&
+		dobin \
+			tools/{convert-from-106,gpg-check-pattern} \
+			tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
+			tools/make-dns-cert
+
+	dosym gpg /usr/bin/gpg2
+	dosym gpgv /usr/bin/gpgv2
+	echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
+	echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
+
+	dodir /etc/env.d
+	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
+
+	use doc && dodoc doc/gnupg.html/* doc/*.png
+
+	systemd_douserunit doc/examples/systemd-user/*.{service,socket}
+}