gentoo resync : 29.12.2022

2 files changed, 29 insertions, 22 deletions

diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index b4e8c72ff840..c8feab63768c 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -5,5 +5,5 @@ DIST gpgme-1.16.0.tar.bz2.sig 119 BLAKE2B abf363142f67a005d1a4c13c2d3d944d0fd449
 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
 EBUILD gpgme-1.16.0.ebuild 3034 BLAKE2B c807335ac78d88b1170f57b3c4eb771b8dd78b02ea54a8df4aaa062334d3a430459a274ddbe7977c3e1fd66995582a3e30dc2e3deceefabc05db296afb51822d SHA512 06d033131be2310cc8e96b5e3b65ec3cb6f70c9f01fa35ea57ffb97b95c80237bbc27b4923d2e9a99b0c94f779a50a89b38c30ce31fd5684f7a0ec7db2bd378e
-EBUILD gpgme-1.17.1.ebuild 3225 BLAKE2B 5df274608b45c8cf3e20dd211698603df2f4f775baa81b13f938ef73304fd11811112540f56e9caa65c227ed624d5333977fbf86f74a11f7681c08d21544653d SHA512 7822cbc4a43b82dcc8a7b7e0d8eb43a7d8f583bbd4cc362616d3a8d90cac37acf7a75b34c95f3dfe2e37b5aeda5f6f5fba067f5df0280c4b9620e010f7eb32d5
+EBUILD gpgme-1.17.1-r1.ebuild 3338 BLAKE2B a543da40826de9c27c4173e06755cce7c0bbc8a576e436a62721ff4adae0c9c020ab612392d7b0b1c722caf53ef394fe3c6ea6cb546fdd27a0f0ec37b6d43cbf SHA512 673cab923556e9087474171bf771baee76802e0c58fcabb29940619b89f449a85520b96e30257dc9bbb547839bab446f9a72b6405540aff5dfa09ceeafae8888
 MISC metadata.xml 333 BLAKE2B 6dd18b63ec1f7656ab8bd705242bec45d7820db8be31f326172cad400711e6d7268c156d6b81facfdfa79118c04728ac910a8f8de36a11454227a1399235a582 SHA512 21b8d7bf3f14b5ab7e2ea587027395cdd881ecddd5a4f70237cafc70dc904b396a33f70dd7ef37519df5a204f4e3a89d9ea6ffc221df41bd9cbf23e69863f12f
diff --git a/app-crypt/gpgme/gpgme-1.17.1.ebuild b/app-crypt/gpgme/gpgme-1.17.1-r1.ebuild
index 1865282c490a..0673116bef89 100644
--- a/app-crypt/gpgme/gpgme-1.17.1.ebuild
+++ b/app-crypt/gpgme/gpgme-1.17.1-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_OPTIONAL=1
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
 
-inherit distutils-r1 libtool qmake-utils toolchain-funcs verify-sig
+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="http://www.gnupg.org/related_software/gpgme"
@@ -19,8 +19,9 @@ LICENSE="GPL-2 LGPL-2.1"
 # Use e.g. app-portage/iwdevtools integration with dev-libs/libabigail's abidiff.
 # Subslot: SONAME of each: <libgpgme.libgpgmepp.libqgpgme>
 SLOT="1/11.6.15"
-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"
+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
@@ -30,7 +31,9 @@ RDEPEND=">=app-crypt/gnupg-2
 	qt5? ( dev-qt/qtcore:5 )"
 	#doc? ( app-doc/doxygen[dot] )
 DEPEND="${RDEPEND}
-	qt5? ( dev-qt/qttest:5 )"
+	test? (
+		qt5? ( dev-qt/qttest:5 )
+	)"
 BDEPEND="python? ( dev-lang/swig )
 	verify-sig? ( sec-keys/openpgp-keys-gnupg )"
 
@@ -53,9 +56,9 @@ src_prepare() {
 	addpredict /run/user/$(id -u)/gnupg
 
 	local MAX_WORKDIR=66
-	if [[ "${#WORKDIR}" -gt "${MAX_WORKDIR}" ]]; then
-		ewarn "Disabling tests as WORKDIR '${WORKDIR}' is longer than ${MAX_WORKDIR} which will fail tests"
-		SKIP_TESTS=1
+	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
@@ -66,6 +69,7 @@ src_prepare() {
 
 src_configure() {
 	local languages=()
+
 	use common-lisp && languages+=( "cl" )
 	use cxx && languages+=( "cpp" )
 	if use qt5; then
@@ -75,9 +79,12 @@ src_configure() {
 		export MOC="$(qt5_get_bindir)/moc"
 	fi
 
+	# bug #847955
+	append-lfs-flags
+
 	# bug #811933 for libassuan prefix
 	econf \
-		$([[ -n "${SKIP_TESTS}" ]] && echo "--disable-gpg-test --disable-gpgsm-test") \
+		$(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)
@@ -93,27 +100,27 @@ src_compile() {
 }
 
 src_test() {
-	[[ -z "${SKIP_TESTS}" ]] || return
-
 	default
-	if use python; then
-		test_python() {
-			emake -C lang/python/tests check \
-				PYTHON=${EPYTHON} \
-				PYTHONS=${EPYTHON} \
-				TESTFLAGS="--python-libdir=${BUILD_DIR}/lib"
-		}
-		python_foreach_impl test_python
-	fi
+
+	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
+	# Backward compatibility for gentoo
+	# (in the past, we had slots)
 	dodir /usr/include/gpgme
 	dosym ../gpgme.h /usr/include/gpgme/gpgme.h
 }