gentoo auto-resync : 22:04:2023 - 18:05:23

5 files changed, 171 insertions, 6 deletions

diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index da1d786778da..77babe34a28b 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -5,7 +5,10 @@ DIST gpgme-1.18.0.tar.bz2 1762323 BLAKE2B a071b839eb75455378514f003920cd387320e9
 DIST gpgme-1.18.0.tar.bz2.sig 119 BLAKE2B 968f8b24ec71b4157214dd026aed83c96894ef353a9cb171f268d640a62fe464ba43540f318abf95dcfc19dffab177a0c3ad8a6e9937dc80e4ececbc8ceb3203 SHA512 02958d86cc037fffc787c6611ace8676d4e04cc1f65fd117eb911d3bfd665dddb7849bcd838af598465be78960f54883eac09c29c42f891f2e4b9713095aed7d
 DIST gpgme-1.19.0.tar.bz2 1821913 BLAKE2B e0359d50cdeff14a20f0e4f463f78b1e1df62e6e3cd50c5f59d90754e7ffe1c74d0c155507bc9d16c61a45a47fdda7e82a86d7db8cbf3999615d854fc1bb5207 SHA512 c6f01ad9432abe33f407e81083dd2f299375ad13b0517429ea1c55fb8cffa05e470dd26f5910a78b8d0f4c8c1e620788a9f369d983c191a3dac681714054fe84
 DIST gpgme-1.19.0.tar.bz2.sig 119 BLAKE2B 699c2db9746c48b133ff71fbf621e3f8b9dc3e11517cb6abea48e7b0b11d6ece1f9e5aa72cfcd74b0cf24f4a51316e055baed0d93c3146e0c13865b0fdf3e9f3 SHA512 cc8bdd83063155e4aa893b4fe79208d4ff524fcaa4e21b6de0dd879501bdb21ebd7074e841625aa5b4c206273297232d3c005f44abd05214b5d9d711eb980c07
-EBUILD gpgme-1.17.1-r2.ebuild 3820 BLAKE2B 7a27cc3e9495d7ba708b9df9223aef657685f3d09604ffc30c1cd4f5ad8b96c8075c2fac38191b07f8bf877d898ff99cbf248f39b57a6f2451b549f6a4e06baa SHA512 342d7a8fc9c448c118798d475075dd29150121d9bf97752e6120c3181dbc3d6ba7aaa8fd4149010fbd0ba131bd909b5d2e07010155b6d7cf4b3ba95685f33136
-EBUILD gpgme-1.18.0-r2.ebuild 3976 BLAKE2B 8a539dcfbdc9dadbcf264c23d48699cc9b94f14cc715d1d591289b5bebb05bd55e3054c35e25ebee8aabe1d41e84a84f7833c4111175ddcc46688729fdb6ca35 SHA512 c90a56abb46bf5c0d8abc4e9833c6c013ee52a99a64c1b2d95549bc04af6ce5336f67733547c0cc2621a4a89fe8975a1f8e3e08ebfc28ff18767c4354f9c5f8a
-EBUILD gpgme-1.19.0.ebuild 4241 BLAKE2B ffde98c78d8dad21f1c580d7eec1bb079e392d557c1fb9e62adcf5ce39e5a73f69da2c3293ea9dc7385696a62577ce14962cee848e64dab6311abc7fd31c5e65 SHA512 e9baf74ecb12898f10475a6d4df7685df54e2ff53129fb7ba7b69d69314b63602ff5c1166c161132eaa3dd7471a1062387f5b2962c42c7eacb65af6f3fd205ab
+DIST gpgme-1.20.0.tar.bz2 1817377 BLAKE2B 1dce0f32a29ece87f9e0f5c9da394fe3e3b651344889f36e7c403a8336e53f831425384cc43b5aeebc96da50b5ac139a8f5b07dad85e341dcbc4b47b35c8e77a SHA512 82dfd272edd4adab09e8428bf809c13eeb50a4a7d2397c41d29ffa3832c4f46054ad75eb053fbcc876ebbf78bb8bcf71d95bc9dad68f4b326492ea513dd5b606
+DIST gpgme-1.20.0.tar.bz2.sig 119 BLAKE2B 2f623dae9bbfa68eab7433854b4357dbcb1412488cc347d9088b3da762f656467de6a57a9658e28789c2dfddbf8032aa7683c103e4daa4fdc35502a37c3efc3b SHA512 7c4632aa7c3b31653046ede11afd49eef9986675196c64e2078d65f9fb732898a6f3e818de89f51056eaff5a4854e1f859151a90f1e124890d21219f8c30b3fa
+EBUILD gpgme-1.17.1-r2.ebuild 3833 BLAKE2B d60d5a2af39b1d7ed33957b585d833e827f7d54a33d534d16fe5b83a66e54dba5bbe7777c6a941d70941c2d15bfe69a9018e799ba751d525e7541e237160a64c SHA512 2883f805a6d8faabcd403b4b4181e52341d7f88ee43bb636effdf8b0c621d84a63f93620d1b565b664586a739dae430859d6723f90862be9239f302cd3c3df65
+EBUILD gpgme-1.18.0-r2.ebuild 3989 BLAKE2B 900bbc00f2b861cd7f273a377f918355a4a146302c442bec93c7a6f7992eb3acedef21414434a2659241efcbd528ec250fbb79cf2569b001966889fe9afb776e SHA512 9096d760d9e7e461f710731bb7e193dc294fd0ebd5101c84b16ba648c06cee2eea4671b108cc70172e768b9193582b36878a089a07adcaf0ecdb0451391cc217
+EBUILD gpgme-1.19.0.ebuild 4254 BLAKE2B 5572b062d36e5a0acc2a8d9cf4cf4c169fc227a42848e6916bd61750f6199a061398db71a3568193dacff1f98379b2193caa9f567df890db2d73bd2623bc277a SHA512 259213db98e61b14ceba6d8a07deb2484aa9050259b4c37e59977b98a58f10b07dbbb67a3539a9c8fdba00fa5b29de28e252c3ecccae0bb719f018d497282d4c
+EBUILD gpgme-1.20.0.ebuild 4254 BLAKE2B 5572b062d36e5a0acc2a8d9cf4cf4c169fc227a42848e6916bd61750f6199a061398db71a3568193dacff1f98379b2193caa9f567df890db2d73bd2623bc277a SHA512 259213db98e61b14ceba6d8a07deb2484aa9050259b4c37e59977b98a58f10b07dbbb67a3539a9c8fdba00fa5b29de28e252c3ecccae0bb719f018d497282d4c
 MISC metadata.xml 333 BLAKE2B 6dd18b63ec1f7656ab8bd705242bec45d7820db8be31f326172cad400711e6d7268c156d6b81facfdfa79118c04728ac910a8f8de36a11454227a1399235a582 SHA512 21b8d7bf3f14b5ab7e2ea587027395cdd881ecddd5a4f70237cafc70dc904b396a33f70dd7ef37519df5a204f4e3a89d9ea6ffc221df41bd9cbf23e69863f12f
diff --git a/app-crypt/gpgme/gpgme-1.17.1-r2.ebuild b/app-crypt/gpgme/gpgme-1.17.1-r2.ebuild
index 88b289cba2c4..fa2428cd5ff7 100644
--- a/app-crypt/gpgme/gpgme-1.17.1-r2.ebuild
+++ b/app-crypt/gpgme/gpgme-1.17.1-r2.ebuild
@@ -25,7 +25,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="common-lisp static-libs +cxx python qt5 test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-crypt/gpgme/gpgme-1.18.0-r2.ebuild b/app-crypt/gpgme/gpgme-1.18.0-r2.ebuild
index d86b4ef52693..5b6f010ff7a2 100644
--- a/app-crypt/gpgme/gpgme-1.18.0-r2.ebuild
+++ b/app-crypt/gpgme/gpgme-1.18.0-r2.ebuild
@@ -27,7 +27,7 @@ LICENSE="GPL-2 LGPL-2.1"
 # 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="common-lisp static-libs +cxx python qt5 test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-crypt/gpgme/gpgme-1.19.0.ebuild b/app-crypt/gpgme/gpgme-1.19.0.ebuild
index 93eccd707136..9d2e1b4f6143 100644
--- a/app-crypt/gpgme/gpgme-1.19.0.ebuild
+++ b/app-crypt/gpgme/gpgme-1.19.0.ebuild
@@ -29,7 +29,7 @@ LICENSE="GPL-2 LGPL-2.1"
 # 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 ~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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="common-lisp static-libs +cxx python qt5 test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/app-crypt/gpgme/gpgme-1.20.0.ebuild b/app-crypt/gpgme/gpgme-1.20.0.ebuild
new file mode 100644
index 000000000000..9d2e1b4f6143
--- /dev/null
+++ b/app-crypt/gpgme/gpgme-1.20.0.ebuild
@@ -0,0 +1,162 @@
+# 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_OPTIONAL=1
+PYTHON_COMPAT=( python3_{9..11} )
+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.2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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.36:=
+	>=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
+)
+
+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=()
+
+	# 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="." CPP="$(tc-getCPP)" distutils-r1_src_configure
+		popd > /dev/null || die
+	fi
+}
+
+src_compile() {
+	default
+
+	if use python ; then
+		pushd lang/python > /dev/null || die
+		top_builddir="../.." srcdir="." CPP="$(tc-getCPP)" distutils-r1_src_compile
+		popd > /dev/null || die
+	fi
+}
+
+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"
+}
+
+src_install() {
+	default
+
+	if use python ; then
+		pushd lang/python > /dev/null || die
+		top_builddir="../.." srcdir="." 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
+}