gentoo auto-resync : 28:10:2023 - 10:32:42

4 files changed, 196 insertions, 0 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 9dc1ce0529da..06669dd69112 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index f998a3b2fbc9..477f08b3e20d 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -1,8 +1,12 @@
 AUX gpgme-1.18.0-tests-start-stop-agent-use-command-v.patch 771 BLAKE2B c0ab8ad60cbeda32910fe79ada37dab798b6d38d997516ae5d4c0b9acdad8bd1c98fda5e82769e6475ebce770661666e474ab8fad467338f919edcfebd5a2bc9 SHA512 b0bf27bcbf7973638345b8b526ec8b77df8257455a8b716715b62f16bc1b445238086ac54e3fc026277bed95b5f1fcae1e73e566a63bf5b2e5c51ecb52b023d9
+AUX gpgme-1.23.1-tests-gnupg-no-tofu.patch 828 BLAKE2B a46a844bc2e44ceb2c647486eb108dc43b0b517ab2171317a936e9a3f8f4d5f0e1c0e3cbd4881540c4f48940975d72a8199e0554d93918be121585223f83032c SHA512 533ed3810736d5cbea3a9cc30cd1b8b3f02051853afab80f564e860afc70097fc0cc6d1d269664b68d58eca78601f90c399a9dcd995c16d65f9bd29e85724b8f
 DIST gpgme-1.21.0.tar.bz2 1830113 BLAKE2B 77000567fde5b78bf46352b25c81e7223506c00703360c87d3bd05afde29ef33d7f9f82e2dbe20f4e64bb6d99a0d8f442d88762d14a72b7ddabf5b38be62e130 SHA512 eb70813d22920d6d54459a4271259edf55d5833edfdd053551ca245521e06a8c19ed02dc93e0c53132a699e6d8c82499f50caf8e390af28468e3549470595b7d
 DIST gpgme-1.21.0.tar.bz2.sig 119 BLAKE2B ac19a5694e139be36ee9c6e28501d4a695166cfbc8f1561de7c7741a274f35cb0a67f779b5fc1ff58b5a11eeaa5e575c06233be65d01c40504efe16a759740ea SHA512 8a471333fd0fc6da50990c3aed67900a6b183cde0fcc449d37435289d8f309c68555c741281c06af9740ac088ae0b4747263da1dfd23d90b050185706948b227
 DIST gpgme-1.22.0.tar.bz2 1717836 BLAKE2B 6c03f4252391a114233fed284bf9eba03fa7b67328b506c01554fbd4239e0f3ede0bc79d82e9f21718084ca17945d628707d4451ac765a8f36d282e7e2d75f8e SHA512 17053053fa885f01416433e43072ac716b5d5db0c3edf45b2d6e90e6384d127626e6ae3ce421abba8f449f5ca7e8963f3d62f3565d295847170bc998d1ec1a70
 DIST gpgme-1.22.0.tar.bz2.sig 119 BLAKE2B fde8892743e7658004d73d89dcb3899fd003ad9222fa47ec0beb29c507917936cd34ade58609cb44c8ed2d2dc0c8e4aba6ac73ed4789d2a375f79055d23c2349 SHA512 20468946e8247dd12991b25a599ee815b2627931fd3886c41b310eea51f058a51cd1584de2292241a225144bf9a1f18b70bb495cb34304879fc294fc95b220ea
+DIST gpgme-1.23.1.tar.bz2 1716825 BLAKE2B 5810bafb2bbea0a44078fdd587fdeae5a2705dac381d6873dd1cdff017a0be7213125846201cdfef510a5802fdc6d86fd2216b17c380ef5f9e30add5edeaa70c SHA512 a82d5de29a38e5cee4042b3891d0a2c265001832e8578ba17b26c48c6d2a4d5919ac9655b4bfb5235dc8c7cea8d3254054da270d287133b9161e7c6ef93b2d58
+DIST gpgme-1.23.1.tar.bz2.sig 119 BLAKE2B bc31079a0632aee4f84347114f3705d8e5068282000057cd8f332b541ee9f0d82eda246ed9b0fb156bb5fbb887156df8ba28518b184ce71b4c66c80e02efc154 SHA512 c3546bc69f8f083d6ebf146336860af263810224a7e9a42c233bfa1210eb0f6f82c26bf134d261ca823eef170549c2642ea2d689610446df91805c5d3c02528f
 EBUILD gpgme-1.21.0.ebuild 4206 BLAKE2B 37e9cf4b62626a59d34dd19a5fe4b08b45e2e6597f16b7027de8ffc1e1816564c7e9d5b3da1fc4eed3e9270e1d6c22749c1a98060e22058c5e98e6bc3d1cf7b4 SHA512 63f254e37f79408868a60c26fff08724f69a549a1c17500c672b7225be672bb85d24ab961263db9db9ad49e395cee11fed10e836aaebef08373ffa5b950dc9b9
 EBUILD gpgme-1.22.0.ebuild 4397 BLAKE2B ef06a1ded6942aafb35d5d1c2754101fbbd4c4ce668be5c170df7cd93398c523ce4f361d775a46c7f3fb4347fe8622396dae5c1a56f0b469ea4ee86e174de2e5 SHA512 05e77d43219d447784fa542edb64b025eabd3b69554d412456c7454c6b1021f9d6c1ee211362670d2e77d150279b012c1640d29444e9bf939e8f70ed8700cb58
+EBUILD gpgme-1.23.1.ebuild 4425 BLAKE2B e189c9019c91ab24c1797c63740414f001528597b69821472a13961d63f314b77cfbbc62ebedd2e06b4b5bcdd65a22b36b40eefb96d41743d78ce6091f7e3716 SHA512 68da3ff808f324914b1dcb0c5e05c34dec845a0a44dc859959846e3f989c5bec3cde050c046ca80694c62147b9a7156cdcbb59f4f6ef8174d34ddf8fb788e3f1
 MISC metadata.xml 333 BLAKE2B 6dd18b63ec1f7656ab8bd705242bec45d7820db8be31f326172cad400711e6d7268c156d6b81facfdfa79118c04728ac910a8f8de36a11454227a1399235a582 SHA512 21b8d7bf3f14b5ab7e2ea587027395cdd881ecddd5a4f70237cafc70dc904b396a33f70dd7ef37519df5a204f4e3a89d9ea6ffc221df41bd9cbf23e69863f12f
diff --git a/app-crypt/gpgme/files/gpgme-1.23.1-tests-gnupg-no-tofu.patch b/app-crypt/gpgme/files/gpgme-1.23.1-tests-gnupg-no-tofu.patch
new file mode 100644
index 000000000000..831f68c8ea18
--- /dev/null
+++ b/app-crypt/gpgme/files/gpgme-1.23.1-tests-gnupg-no-tofu.patch
@@ -0,0 +1,26 @@
+https://dev.gnupg.org/T6778
+--- a/lang/python/tests/support.py
++++ b/lang/python/tests/support.py
+@@ -46,13 +46,15 @@ def is_gpg_version(version):
+ 
+ 
+ def have_tofu_support(ctx, some_uid):
+-    keys = list(
+-        ctx.keylist(
+-            some_uid,
+-            mode=(gpg.constants.keylist.mode.LOCAL |
+-                  gpg.constants.keylist.mode.WITH_TOFU)))
+-    return len(keys) > 0
+-
++    try:
++        keys = list(
++            ctx.keylist(
++                some_uid,
++                mode=(gpg.constants.keylist.mode.LOCAL |
++                      gpg.constants.keylist.mode.WITH_TOFU)))
++        return len(keys) > 0
++    except gpg.errors.GPGMEError:
++        return False
+ 
+ # Skip the Python tests for GnuPG < 2.1.12.  Prior versions do not
+ # understand the command line flags that we assume exist.  C.f. issue
diff --git a/app-crypt/gpgme/gpgme-1.23.1.ebuild b/app-crypt/gpgme/gpgme-1.23.1.ebuild
new file mode 100644
index 000000000000..62c999847385
--- /dev/null
+++ b/app-crypt/gpgme/gpgme-1.23.1.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Maintainers should:
+# 1. Join the "Gentoo" project at https://dev.gnupg.org/project/view/27/
+# 2. Subscribe to release tasks like https://dev.gnupg.org/T6159
+# (find the one for the current release then subscribe to it +
+# any subsequent ones linked within so you're covered for a while.)
+
+DISTUTILS_EXT=1
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{10..12} )
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
+
+# in-source builds are not supported:
+# * https://dev.gnupg.org/T6313#166339
+# * https://dev.gnupg.org/T6673#174545
+inherit distutils-r1 libtool flag-o-matic out-of-source 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.2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="common-lisp static-libs +cxx python qt5 test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )"
+
+# - 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.46-r1:=
+	python? ( ${PYTHON_DEPS} )
+	qt5? ( dev-qt/qtcore:5 )
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		qt5? ( dev-qt/qttest:5 )
+	)
+"
+#doc? ( app-doc/doxygen[dot] )
+BDEPEND="
+	python? ( dev-lang/swig )
+	verify-sig? ( sec-keys/openpgp-keys-gnupg )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.18.0-tests-start-stop-agent-use-command-v.patch
+	"${FILESDIR}"/${PN}-1.23.1-tests-gnupg-no-tofu.patch
+)
+
+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"
+}
+
+my_src_configure() {
+	local languages=()
+
+	# bug #847955
+	append-lfs-flags
+
+	if use common-lisp ; then
+		languages+=( "cl" )
+	fi
+
+	if use cxx ; then
+		languages+=( "cpp" )
+	fi
+
+	# TODO: qt6? but qt5 and qt5 are mutually exclusive :(
+	if use qt5; then
+		languages+=( "qt5" )
+
+		#use doc ||
+		export DOXYGEN=true
+		export MOC="$(qt5_get_bindir)/moc"
+	fi
+
+	local myeconfargs=(
+		$(use test || echo "--disable-gpgconf-test --disable-gpg-test --disable-gpgsm-test --disable-g13-test")
+		--enable-languages="${languages[*]}"
+		$(use_enable static-libs static)
+	)
+
+	econf "${myeconfargs[@]}"
+
+	if use python ; then
+		emake -C lang/python prepare
+
+		pushd lang/python > /dev/null || die
+		top_builddir="../.." srcdir="${S}/lang/python" CPP="$(tc-getCPP)" distutils-r1_src_configure
+		popd > /dev/null || die
+	fi
+}
+
+my_src_compile() {
+	default
+
+	if use python ; then
+		pushd lang/python > /dev/null || die
+		top_builddir="../.." srcdir="${S}/lang/python" CPP="$(tc-getCPP)" distutils-r1_src_compile
+		popd > /dev/null || die
+	fi
+}
+
+my_src_test() {
+	default
+
+	if use python ; then
+		distutils-r1_src_test
+	fi
+}
+
+python_test() {
+	emake -C lang/python/tests check \
+		PYTHON=${EPYTHON} \
+		PYTHONS=${EPYTHON} \
+		TESTFLAGS="--python-libdir=${BUILD_DIR}/lib"
+}
+
+my_src_install() {
+	default
+
+	if use python ; then
+		pushd lang/python > /dev/null || die
+		top_builddir="../.." srcdir="${S}/lang/python" CPP="$(tc-getCPP)" distutils-r1_src_install
+		popd > /dev/null || die
+	fi
+
+	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
+}