gentoo resync : 28.04.2021

4 files changed, 80 insertions, 25 deletions

diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index d4a99a663f52..7bf862d7d20b 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,7 +1,8 @@
 AUX gnupg-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch 1048 BLAKE2B 36f37b74da309100191f4d8f9c27d08a1b00d2d30fbaf169dbb74ebbe42293357a4fb62332e286fe5725dcfdc30645a602dc2a51c51924b06215b68fd5235658 SHA512 fd12827150e96cd7979ea9611d64ed4ab9e6c61cfecdd697b8fb4d162f20985b734c2bfc365a921809b9029e86a85a9b36c10ec472b3dd49c25ea18f5aef56ce
+AUX gnupg-2.3.0-sqlite_check.patch 1860 BLAKE2B e5d808932e9a72dff63d9776ccc55bdb9f28e5c9e1d0a58a46980a0c62e90f206cef5b94bf5492d96faa2e927b7b0933a90e924095e5f75be5f4cba3abe3cc7c SHA512 6c67368629fd47ce17c1e3564e8b2e4d1c5f844ce641462b833a2346853b9fc086258d525fc82adc3e778a140e450071159a44894ed230f995c480696c390190
 DIST gnupg-2.2.16-scdaemon_shared-access.patch 2586 BLAKE2B 42fd5482c4e86751ce62836125997c2295c44bc5db0671a06460fd306b2ed93f290fb898fc1b1e463a863eddf9ab5f99ea3c90a55499ef45ca1ed6edf2854663 SHA512 38abaa4200114ae6b6f220fabc0a84a056761949c97bd0564557f4411a299b9a1939893555c27e26da2d8e8da4bc97a298fa7e68f1e80fe99c3f88cc329eaa84
-DIST gnupg-2.2.25.tar.bz2 7195857 BLAKE2B c930edf9259a0e1c508af8d76a86f979860adfe2c525020b37d3741679200f96483f0ad8bc1f72e2dbf7fe77696cd04d4272a2ee23e4c4abe1ed6ba88b95f365 SHA512 ab1d7cc9d8be3e7189bc4bea431b9d5db313cbd1739823950f32fbb611b2f4374889f444efbf43ce1fbf498b9865d7e6e953cd4c86d58fd688f63923c434ea2c
 DIST gnupg-2.2.27.tar.bz2 7191555 BLAKE2B d652aad382cf07cc458b29ff82718edd47457d8236dcbeee51f22d88503be141f009e9ea45b6dafe614115d9558fe371509579e58ce17a5f04540a31aa406ea3 SHA512 cf336962116c9c08ac80b1299654b94948033ef51d6d5e7f54c2f07bbf7d92c7b0bddb606ceee2cdd837063f519b8d59af5a82816b840a0fc47d90c07b0e95ab
-EBUILD gnupg-2.2.25.ebuild 5275 BLAKE2B 237085b53c471be3df1781c30392ed92cb1ff60e4f598bb07dd06d2301784ec2cc3d04049bfb35e0e70da4250f5d65172f94561c5097ce4b06ce1dc66df81247 SHA512 33ef4cb0a0d863e41498f2a2c7201d5dc6b55015dc4dad3818cc5646d61805e7e1811c1cea161e545525b9e8861600ee71144ad8fc5776bf7200ce53abcdaa3e
-EBUILD gnupg-2.2.27.ebuild 5171 BLAKE2B d574df6b1136442b5d1f164261d18bf1713ba4d5f2021a25bc5045f1ea7854f04e53581855117d08974d25b3aa36f49ea228770d9bd10117da3af943b3d19910 SHA512 c545519b83cacae77e99390b10acd5825903643b1d511eb6b2dc1b50c63816068e8a485ca50e6e274ef1469c14e5c0e54f3c90a73183172c2da2d38c593ced92
+DIST gnupg-2.3.1.tar.bz2 7570431 BLAKE2B f7c7d3246b0807798917ecd711c74ea7c52dd24530106765a1f4a6e9af098c9a99c5d0f44fc2c253d013b11f862fccf0b1630593d07b2e1950a91b3473c671c1 SHA512 d2cc82c1b47bbd79acd6ef787c01684fb084b1c5507bbca6cf7ca8834ed978ae7a44c01d652cc3afbd70e2906583c8701aebc8d9fd3fc5e0401769ad4cd46af1
+EBUILD gnupg-2.2.27.ebuild 5168 BLAKE2B cc9ad82a855cb56a630aa043537fe44fadbfece92cc09205996ba4cc3f3ca000534f7b11c29da543ec923b118d24bc23b490ce6ea29b09a799d17b36e387f855 SHA512 3f1377ad593d19580e953ef426dd23f23ae2fab65d8e6bcfee58c09605086fc0a2f2d2432b5d33ed70685ebb87561801a6b3dbf781d585aa59b6e8c9fc0dd81e
+EBUILD gnupg-2.3.1.ebuild 4831 BLAKE2B 093098049196bd759fdf6f5b40db207eb7e7e061fda3fff3faf76d204d45f04d3cf25f4268ce5edf58dfdc4ff116dd6bd89d5ef7e37f03c06e74193ba42b4938 SHA512 0d90cc64ae9d2ad09ae4732d1f617a3e7f178453c3c137dff6ad96efe0ac5dabd37e98e1fbd20ad602211088da7d0069faadb9a405655411555b704770a9e5a6
 MISC metadata.xml 1379 BLAKE2B e51735e46f2b9ade13d8aa53c1354b1285904933c260efef8e0d6d66e7b8a36199f33ab48cc98006e75e566a21422883dc3694d91e1dcbf1e7c413ba7dab557f SHA512 cd71918f048d081e7a223b9b09b0089b3e015aef674ef233c2aff43e1325ac61a3bd2bfa828071dd157fea0f5ec76ee719ccd339cf94539e3702d48ba6ecd5d4
diff --git a/app-crypt/gnupg/files/gnupg-2.3.0-sqlite_check.patch b/app-crypt/gnupg/files/gnupg-2.3.0-sqlite_check.patch
new file mode 100644
index 000000000000..dd529da7a7c6
--- /dev/null
+++ b/app-crypt/gnupg/files/gnupg-2.3.0-sqlite_check.patch
@@ -0,0 +1,62 @@
+From 58aa0e8547a29e147f3d9d1792117d96bc00ffda Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Thu, 8 Apr 2021 11:05:36 +0200
+Subject: [PATCH] gnupg: configure.ac: Fix sqlite3 detection
+
+or else --disable-sqlite has no effect and linking later fails with:
+
+  keyboxd-backend-sqlite.o: in function `show_sqlstmt.part.0':
+  backend-sqlite.c:(.text+0x42): undefined reference to `sqlite3_expanded_sql'
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ configure.ac | 23 ++++++++++++-----------
+ 1 file changed, 12 insertions(+), 11 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9cf0c6a7f..d46469cbb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -969,18 +969,20 @@ AC_ARG_ENABLE(sqlite,
+                                [disable the use of SQLITE]),
+               try_sqlite=$enableval, try_sqlite=yes)
+ 
+-if test x"$use_tofu" = xyes ; then
+-  if test x"$try_sqlite" = xyes ; then
++AS_IF([test x"$try_sqlite" = xyes], [
+     PKG_CHECK_MODULES([SQLITE3], [sqlite3 >= $NEED_SQLITE_VERSION],
+                                  [have_sqlite=yes],
+                                  [have_sqlite=no])
+-  fi
+-  if test "$have_sqlite" = "yes"; then
+-    :
+-    AC_SUBST([SQLITE3_CFLAGS])
+-    AC_SUBST([SQLITE3_LIBS])
+-  else
+-    use_tofu=no
++    AS_IF([test "$have_sqlite" = "yes"], [
++        AC_SUBST([SQLITE3_CFLAGS])
++        AC_SUBST([SQLITE3_LIBS])
++    ])
++    ])
++
++AS_IF([test "$have_sqlite" != "yes"], [
++    AS_IF([test x"$use_tofu" = xyes], [
++	use_tofu=no
++    ])
+     build_keyboxd=no
+     tmp=$(echo "$SQLITE3_PKG_ERRORS" | tr '\n' '\v' | sed 's/\v/\n*** /g')
+     AC_MSG_WARN([[
+@@ -988,8 +990,7 @@ if test x"$use_tofu" = xyes ; then
+ *** Building without SQLite support - TOFU and Keyboxd disabled
+ ***
+ *** $tmp]])
+-  fi
+-fi
++])
+ 
+ AM_CONDITIONAL(SQLITE3, test "$have_sqlite" = "yes")
+ 
+-- 
+2.31.1
+
diff --git a/app-crypt/gnupg/gnupg-2.2.27.ebuild b/app-crypt/gnupg/gnupg-2.2.27.ebuild
index 8c611bb0fbce..abbcdf02bd07 100644
--- a/app-crypt/gnupg/gnupg-2.2.27.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.27.ebuild
@@ -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 ~riscv s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 doc ldap nls readline scd-shared-access selinux +smartcard ssl tofu tools usb user-socket wks-server"
 
 # Existence of executables is checked during configuration.
diff --git a/app-crypt/gnupg/gnupg-2.2.25.ebuild b/app-crypt/gnupg/gnupg-2.3.1.ebuild
index 6b541182a736..3ca970d0c2d7 100644
--- a/app-crypt/gnupg/gnupg-2.2.25.ebuild
+++ b/app-crypt/gnupg/gnupg-2.3.1.ebuild
@@ -3,23 +3,22 @@
 
 EAPI=7
 
-inherit flag-o-matic systemd toolchain-funcs
+inherit autotools flag-o-matic systemd toolchain-funcs
 
 MY_P="${P/_/-}"
 
 DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
 HOMEPAGE="https://gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2
-	scd-shared-access? ( https://raw.githubusercontent.com/GPGTools/MacGPG2/5ca182f54b7b6cd635d1c0a4713953834489fdd9/patches/gnupg/scdaemon_shared-access.patch -> ${PN}-2.2.16-scdaemon_shared-access.patch )"
+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 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 doc ldap nls readline scd-shared-access selinux +smartcard ssl tofu tools usb user-socket wks-server"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 doc ldap nls readline selinux +smartcard sqlite ssl tofu tools usb user-socket wks-server"
 
 # Existence of executables is checked during configuration.
 DEPEND=">=dev-libs/libassuan-2.5.0
-	>=dev-libs/libgcrypt-1.8.0
+	>=dev-libs/libgcrypt-1.9.1
 	>=dev-libs/libgpg-error-1.29
 	>=dev-libs/libksba-1.3.4
 	>=dev-libs/npth-1.2
@@ -28,9 +27,10 @@ DEPEND=">=dev-libs/libassuan-2.5.0
 	ldap? ( net-nds/openldap )
 	readline? ( sys-libs/readline:0= )
 	smartcard? ( usb? ( virtual/libusb:1 ) )
+	sqlite? ( >=dev-db/sqlite-3.27 )
 	ssl? ( >=net-libs/gnutls-3.0:0= )
 	sys-libs/zlib
-	tofu? ( >=dev-db/sqlite-3.7 )"
+"
 
 RDEPEND="${DEPEND}
 	app-crypt/pinentry
@@ -44,6 +44,8 @@ BDEPEND="virtual/pkgconfig
 
 S="${WORKDIR}/${MY_P}"
 
+REQUIRED_USE="tofu? ( sqlite )"
+
 DOCS=(
 	ChangeLog NEWS README THANKS TODO VERSION
 	doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
@@ -51,17 +53,13 @@ DOCS=(
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
+	"${FILESDIR}/${PN}-2.3.0-sqlite_check.patch"
 )
 
 src_prepare() {
 	default
 
-	# Made optional because it's a non-official patch
-	if use scd-shared-access ; then
-		# Patch taken from
-		# https://github.com/GPGTools/MacGPG2/tree/dev/patches/gnupg
-		eapply "${DISTDIR}/${PN}-2.2.16-scdaemon_shared-access.patch"
-	fi
+	eautoreconf
 
 	# Inject SSH_AUTH_SOCK into user's sessions after enabling gpg-agent-ssh.socket in systemctl --user mode,
 	# idea borrowed from libdbus, see
@@ -78,6 +76,7 @@ src_configure() {
 		$(use_enable bzip2)
 		$(use_enable nls)
 		$(use_enable smartcard scdaemon)
+		$(use_enable sqlite)
 		$(use_enable ssl gnutls)
 		$(use_enable tofu)
 		$(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver')
@@ -87,7 +86,6 @@ src_configure() {
 		--with-mailprog=/usr/libexec/sendmail
 		--disable-ntbtls
 		--enable-all-tests
-		--enable-gpg
 		--enable-gpgsm
 		--enable-large-secmem
 		CC_FOR_BUILD="$(tc-getBUILD_CC)"
@@ -104,12 +102,6 @@ src_configure() {
 		append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
 	fi
 
-	if use elibc_SunOS; then
-		myconf+=( --disable-symcryptrun )
-	else
-		myconf+=( --enable-symcryptrun )
-	fi
-
 	#bug 663142
 	if use user-socket; then
 		myconf+=( --enable-run-gnupg-user-socket )
@@ -149,7 +141,7 @@ src_install() {
 	use tools &&
 		dobin \
 			tools/{convert-from-106,gpg-check-pattern} \
-			tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
+			tools/{gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
 			tools/make-dns-cert
 
 	dosym gpg /usr/bin/gpg2