gentoo auto-resync : 16:08:2022 - 02:29:20

8 files changed, 172 insertions, 4 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 228def1aaebe..330dd170d14b 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index e412c44f0eb3..9c2d0783f0a6 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -1,4 +1,8 @@
+AUX gpgme-1.18.0-tests-start-stop-agent-use-command-v.patch 771 BLAKE2B c0ab8ad60cbeda32910fe79ada37dab798b6d38d997516ae5d4c0b9acdad8bd1c98fda5e82769e6475ebce770661666e474ab8fad467338f919edcfebd5a2bc9 SHA512 b0bf27bcbf7973638345b8b526ec8b77df8257455a8b716715b62f16bc1b445238086ac54e3fc026277bed95b5f1fcae1e73e566a63bf5b2e5c51ecb52b023d9
 DIST gpgme-1.17.1.tar.bz2 1747692 BLAKE2B 44cf9309cbad038f23aa7c5c77fd85be23faf3d8e1eb7abdb87a737ad1ade1ee269a95ce618dba327bbd06e6f4b2a91e2446744ee08f09ea6fb3b2dad44431c5 SHA512 e6399c3de1e430e38f2692bf5ec0c02ecb36ea3dbb56ff29dc3a438a5be4900a77a0559dc5b673dc1ffbff5e7f589e548e19176b2644fe8f63e00c6b9181b920
 DIST gpgme-1.17.1.tar.bz2.sig 119 BLAKE2B 31832424c0e029dc520d3302a71b086d9fcb044c74344cc0fb4b6c6a02d0dd840e62e7eb60acfaf004e6f3650d58436b58e645ef2a50b948ecaf3ca162bf577a SHA512 e1a4213d0d39f2efd0d5c007a0449c76bd650e76e002a9acb673eef0579912db06d844df11a4f7cb821e1d8468d2d6c1303f1c5d915a5c3c9cb5abacfbd004fc
+DIST gpgme-1.18.0.tar.bz2 1762323 BLAKE2B a071b839eb75455378514f003920cd387320e9fae416e71151cf6ac1b4a058b58ed054450b79e3eeaf820ff5324ea14efa003612867477b7379a776942d62be6 SHA512 c0cb0b337d017793a15dd477a7f5eaef24587fcda3d67676bf746bb342398d04792c51abe3c26ae496e799c769ce667d4196d91d86e8a690d02c6718c8f6b4ac
+DIST gpgme-1.18.0.tar.bz2.sig 119 BLAKE2B 968f8b24ec71b4157214dd026aed83c96894ef353a9cb171f268d640a62fe464ba43540f318abf95dcfc19dffab177a0c3ad8a6e9937dc80e4ececbc8ceb3203 SHA512 02958d86cc037fffc787c6611ace8676d4e04cc1f65fd117eb911d3bfd665dddb7849bcd838af598465be78960f54883eac09c29c42f891f2e4b9713095aed7d
 EBUILD gpgme-1.17.1-r1.ebuild 3339 BLAKE2B b94b1c3ccbac471ad16c406823460d4ffca1c9428b1420f3b433f224faf2a4a760c23b2923bff5a007cf37c63497d9ed5737683ad9bb4cc97250443bb71e00b6 SHA512 f4479a00ae16770c7180c8465079a4cf0cb92811715f87439e92c591701d1ace2c6af35a2990120723ca4c4091fc673aa61fdbda67d6648891c24905279a0dd5
+EBUILD gpgme-1.18.0.ebuild 3585 BLAKE2B dd453284e0e7d65680de0bcb51013bafc85453924ac322a2928931f1c3967875af8dccc3dd1027fc87f3c004b24ed8e6f3f81ae556419bb0ed267588695beae5 SHA512 aba9378584f4bab17fde88193fe5c9d428ae05d90be96bf46009fe2e857c43af28a0463e1b9c3edb77cf9ad8b739eaffce08925e1a846c304b7e368b75e241dc
 MISC metadata.xml 333 BLAKE2B 6dd18b63ec1f7656ab8bd705242bec45d7820db8be31f326172cad400711e6d7268c156d6b81facfdfa79118c04728ac910a8f8de36a11454227a1399235a582 SHA512 21b8d7bf3f14b5ab7e2ea587027395cdd881ecddd5a4f70237cafc70dc904b396a33f70dd7ef37519df5a204f4e3a89d9ea6ffc221df41bd9cbf23e69863f12f
diff --git a/app-crypt/gpgme/files/gpgme-1.18.0-tests-start-stop-agent-use-command-v.patch b/app-crypt/gpgme/files/gpgme-1.18.0-tests-start-stop-agent-use-command-v.patch
new file mode 100644
index 000000000000..aeae35f45636
--- /dev/null
+++ b/app-crypt/gpgme/files/gpgme-1.18.0-tests-start-stop-agent-use-command-v.patch
@@ -0,0 +1,27 @@
+Sent upstream to gnupg-devel@ but not yet in archive.
+
+From: Sam James <sam@gentoo.org>
+Date: Mon, 15 Aug 2022 19:29:06 +0100
+Subject: [PATCH] tests/start-stop-agent: use 'command -v' instead of 'which'
+
+`which` is an external command which isn't required by POSIX.
+
+Debian and other distributions (like Gentoo!) are looking
+to drop it from their base set of packages.
+
+Switch to `command -v` which should always work instead.
+
+Note we already use `command -v` at the start of this test anyway.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/tests/start-stop-agent
++++ b/tests/start-stop-agent
+@@ -15,7 +15,7 @@ fi
+ 
+ GPG_AGENT_INFO=
+ export GPG_AGENT_INFO
+-GPG_AGENT=$(which gpg-agent)
++GPG_AGENT=$(command -v gpg-agent)
+ 
+ token=$(echo "gpgme-$(pwd)" | tr ' ' '_')
+ 
diff --git a/app-crypt/gpgme/gpgme-1.18.0.ebuild b/app-crypt/gpgme/gpgme-1.18.0.ebuild
new file mode 100644
index 000000000000..4338e7b48226
--- /dev/null
+++ b/app-crypt/gpgme/gpgme-1.18.0.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_OPTIONAL=1
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
+
+inherit distutils-r1 libtool flag-o-matic qmake-utils toolchain-funcs verify-sig
+
+DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
+HOMEPAGE="https://www.gnupg.org/related_software/gpgme"
+SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2
+	verify-sig? ( mirror://gnupg/gpgme/${P}.tar.bz2.sig )"
+
+LICENSE="GPL-2 LGPL-2.1"
+# Please check ABI on each bump, even if SONAMEs didn't change: bug #833355
+# Use e.g. app-portage/iwdevtools integration with dev-libs/libabigail's abidiff.
+# Subslot: SONAME of each: <libgpgme.libgpgmepp.libqgpgme.FUDGE>
+# Bump FUDGE if a release is made which breaks ABI without changing SONAME.
+# (Reset to 0 if FUDGE != 0 if libgpgme/libgpgmepp/libqpggme change.)
+SLOT="1/11.6.15.1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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="common-lisp static-libs +cxx python qt5 test"
+RESTRICT="!test? ( test )"
+
+# Note: On each bump, update dep bounds on each version from configure.ac!
+RDEPEND=">=app-crypt/gnupg-2
+	>=dev-libs/libassuan-2.5.3:=
+	>=dev-libs/libgpg-error-1.36:=
+	python? ( ${PYTHON_DEPS} )
+	qt5? ( dev-qt/qtcore:5 )"
+	#doc? ( app-doc/doxygen[dot] )
+DEPEND="${RDEPEND}
+	test? (
+		qt5? ( dev-qt/qttest:5 )
+	)"
+BDEPEND="python? ( dev-lang/swig )
+	verify-sig? ( sec-keys/openpgp-keys-gnupg )"
+
+REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.18.0-tests-start-stop-agent-use-command-v.patch
+)
+
+do_python() {
+	if use python; then
+		pushd "lang/python" > /dev/null || die
+		top_builddir="../.." srcdir="." CPP="$(tc-getCPP)" distutils-r1_src_${EBUILD_PHASE}
+		popd > /dev/null || die
+	fi
+}
+
+src_prepare() {
+	default
+
+	elibtoolize
+
+	# bug #697456
+	addpredict /run/user/$(id -u)/gnupg
+
+	local MAX_WORKDIR=66
+	if use test && [[ "${#WORKDIR}" -gt "${MAX_WORKDIR}" ]]; then
+		eerror "Unable to run tests as WORKDIR='${WORKDIR}' is longer than ${MAX_WORKDIR} which causes failure!"
+		die "Could not run tests as requested with too-long WORKDIR."
+	fi
+
+	# Make best effort to allow longer PORTAGE_TMPDIR
+	# as usock limitation fails build/tests
+	ln -s "${P}" "${WORKDIR}/b" || die
+	S="${WORKDIR}/b"
+}
+
+src_configure() {
+	local languages=()
+
+	use common-lisp && languages+=( "cl" )
+	use cxx && languages+=( "cpp" )
+	if use qt5; then
+		languages+=( "qt" )
+		#use doc ||
+		export DOXYGEN=true
+		export MOC="$(qt5_get_bindir)/moc"
+	fi
+
+	# bug #847955
+	append-lfs-flags
+
+	# bug #811933 for libassuan prefix
+	econf \
+		$(use test || echo "--disable-gpgconf-test --disable-gpg-test --disable-gpgsm-test --disable-g13-test") \
+		--enable-languages="${languages[*]}" \
+		--with-libassuan-prefix="${ESYSROOT}"/usr \
+		$(use_enable static-libs static)
+
+	use python && emake -C lang/python prepare
+
+	do_python
+}
+
+src_compile() {
+	default
+	do_python
+}
+
+src_test() {
+	default
+
+	use python && distutils-r1_src_test
+}
+
+python_test() {
+	emake -C lang/python/tests check \
+		PYTHON=${EPYTHON} \
+		PYTHONS=${EPYTHON} \
+		TESTFLAGS="--python-libdir=${BUILD_DIR}/lib"
+}
+
+src_install() {
+	default
+
+	do_python
+
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	# Backward compatibility for gentoo
+	# (in the past, we had slots)
+	dodir /usr/include/gpgme
+	dosym ../gpgme.h /usr/include/gpgme/gpgme.h
+}
diff --git a/app-crypt/libu2f-host/Manifest b/app-crypt/libu2f-host/Manifest
index 7f4808fd9919..1e2587010a79 100644
--- a/app-crypt/libu2f-host/Manifest
+++ b/app-crypt/libu2f-host/Manifest
@@ -1,5 +1,5 @@
 AUX libu2f-host-1.1.10-json-boolean.patch 1101 BLAKE2B c603290ae3f34ac9c6eccbee080ac83d7fcea2dfad69f1088de39cc35165fe7333acafee0aac53c9d973fd0b266bb822a1a68f48e64a492dbb5440976c2ecaf3 SHA512 e8b516d797bbb136fe51c367248be6d1035de409156a35ce55c9e871b236178c610e36f5859121e7fddae28e17c44db9bfa21ce4584acb3c45c6f68fbaba46e2
 DIST libu2f-host-1.1.10.tar.xz 471676 BLAKE2B 5066eaaaeda3b8c015afa8946f0af3b1b90a34488d4c71811c0d8f57a3ed2e4c8cb3d82d2df147dcf13ac3c384522d22f25894ac3a2d994a75b288891a67640a SHA512 91c5bf3994f1d3c9bd144f54b14b0404d839c15bef3c318619decdf1bd37214bcff33927af78a9826ff7d0bc9907c912a0e31104ae68d3a727a8436f2a1dbf7a
-EBUILD libu2f-host-1.1.10-r1.ebuild 1046 BLAKE2B b4de90e961c5bcb303fc9c414e3d7f8ba107741063770b068301c08bec54308643e2ec024de3680bf3ce665cf1f07d5402c2dabcaf53ff80499fa7fa67a89fe8 SHA512 bab94b575027d9245e29aa927a64e02c415535f941ee22f67eb755cabc46ce884dc271ae74384d1defc0c416b29923f097d93c2791ef18049bf2f04c65407f6d
+EBUILD libu2f-host-1.1.10-r1.ebuild 1045 BLAKE2B a54abf0b0c359e417678052fbc1beb863592a9c76c3be15d763517797ac6cdda35f895fcb7e9509f9d43a2093ee872654bd33f99894f9d26d5e9ca5ff21502fc SHA512 b2674221ebc128ecf76dee3eb8af4650852f3ec353cf1cd4a298382793f8383ff6ae15d8e0283b6c54154fde3f497da3b1290560a79b01e6cb864a3b87da2c31
 EBUILD libu2f-host-1.1.10.ebuild 1044 BLAKE2B a1db95597cf045d25dd886289c476a27b7bf696f62e7796df6225ee5aa875020fdb5c70c4aa3c2f56447167fac6a700a7b13d35f9a2528b97e27930aafbfa0cb SHA512 2aba85c68c6b90e8a4606d9d704a16b09cdf9bd57fdf9ceb161d439b9b9ca1414fd98d92df5446a56ebbacc2aa234cc8d75e2f2055f1c99136e08a6835432bc3
 MISC metadata.xml 532 BLAKE2B ee0715bb0c5c993605e314456f9e2cf6aad97cec45e38836dbbcd51d557ee65da536c7f49fd04029e24d1d72d0011ef496346017cb8854b436d9ddc38efd3262 SHA512 c3dc0519b09376c82fa5bb589765ae5b88b680025224b22da23da508216253112ef66b6e0e14c1aebf79a7f67d88a6500f2106386a8f4eead97a79ef55204112
diff --git a/app-crypt/libu2f-host/libu2f-host-1.1.10-r1.ebuild b/app-crypt/libu2f-host/libu2f-host-1.1.10-r1.ebuild
index c49ed0d65a11..1b91386b7fd4 100644
--- a/app-crypt/libu2f-host/libu2f-host-1.1.10-r1.ebuild
+++ b/app-crypt/libu2f-host/libu2f-host-1.1.10-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.xz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 IUSE="systemd"
 
 DEPEND="dev-libs/hidapi
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index 2beaeeb166b8..b1bf9c88a7ec 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1,4 +1,4 @@
 AUX qca-disable-pgp-test.patch 446 BLAKE2B a98d5951d7b89c65787d7d586a5504949c51271ebe09c5e19b90a2e24f24fb6d03d6c1f76d7ad4234354bc2507cf7031c716b3b2bf8243b8c1d85065079dded4 SHA512 30bb6d31b9392166d6bbae39da2eeb1788ac9cccffb801b074468a3606a6e1a56d6a41ee276d3b8b8d39112bf6aea7025f07f4810bb835102bd00521ee9eb104
 DIST qca-2.3.4.tar.xz 737072 BLAKE2B 64e698135f02bf115269203d44a53d40449be1620487340551c1e45f66f042132beb2cfa2363d1249f92de3ffd670f1807219cb3ce3d6e7c05afd8c22242b703 SHA512 af27338b5c018d39c8c745b63691dec3914e29ff79347ab338f4391ee1dc9832d158b222bc9ef6c7681cf4b2893a38829a4daadf1d53622d6947de2efeb880a8
-EBUILD qca-2.3.4.ebuild 1860 BLAKE2B 133ee2ea6a239d152cc407323eaa8a27f1dd4a363ffec97269c80b10a07e4ae1b286efbfc3c09ab97280c38400f94e93c7c9727213a2b327140e321c50999afe SHA512 4aab1102c21f5c92fde6e92b353eec6ba691361ee7ed99bdf48885c922c49ae448bc54b5934be481897ccbe0b557ea8566c73426a382c81445072dd5f769b9c1
+EBUILD qca-2.3.4.ebuild 1892 BLAKE2B 0620945a65e38a93e5660e68a313c15faac3f0f060a0cffa4f9588d2527f22f613421a47e2b7f0591aa4a5d5bf5c35114016387be911ba009a9b26d88978478a SHA512 b1945152b3c5292cb0bac97dd7008afbd67adb4a547e350eaba7fc75a5bd26eb109bbe0a019dc5f0d71a85b58fb5ba322f308c8bc7ad1aa894e52ca4307b4be3
 MISC metadata.xml 832 BLAKE2B 9044b545fa732c5f86c7dbb026630b4946a538ba77369eae28e894bf636ca60f6a31d7aad258fa19aee4c433d6d5a8e2a34a7c2850eef3a40d44261e592032b0 SHA512 b01bfe83343fdc265abc25922300cdc67f556a9a6f6db16918b0b3ee44c4e83db524695c5cb8952278f3e1f2e5d60a49bcc9312b35ab95f0ecc42e03764fb6bd
diff --git a/app-crypt/qca/qca-2.3.4.ebuild b/app-crypt/qca/qca-2.3.4.ebuild
index 05ecf7c86655..e46a6149285a 100644
--- a/app-crypt/qca/qca-2.3.4.ebuild
+++ b/app-crypt/qca/qca-2.3.4.ebuild
@@ -35,7 +35,12 @@ DEPEND="${RDEPEND}
 		dev-qt/qttest:5
 	)
 "
-BDEPEND="doc? ( app-doc/doxygen )"
+BDEPEND="
+	doc? (
+		app-doc/doxygen[dot]
+		virtual/latex-base
+	)
+"
 
 PATCHES=( "${FILESDIR}/${PN}-disable-pgp-test.patch" )