gentoo resync : 29.06.2021

3 files changed, 3 insertions, 115 deletions

diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index 848e7aff00b7..a35f7d6fc322 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -1,7 +1,5 @@
-DIST gpgme-1.14.0.tar.bz2 1678910 BLAKE2B 75051166b1f3777d630236c5afbd1786df238272b7ccfd053c5a4b2a207ba146550f6be46c1211f3bacbe19fee2f67adbc5be558d69175c19230a1a02e32d9f2 SHA512 b7ffa30a046c75215e1c73e2f34e5e65532e4dcf6bea55796adc6f82fd38dafe264bcd4332b2001155d6f9476d6fd82a77112dad31c1bb29db9ddefc532ae668
-DIST gpgme-1.15.0.tar.bz2 1692019 BLAKE2B 4c66f24034a88e7da8a06cef3d0ac9d1d6b5eccb6d4277d36a2399d6e78f5d5f42cf0c13188c1dba72fe11d73da76a71867d3c3b13052695b868dc4a680fa85b SHA512 ab979aea6ccc6d4faf02b3b1a773ce95cb754b4d687ce7adc2ed98e218f21a284a2283d8e2429016e78fcf5a94ea863011573fd1457a71cc0ae3aadd368a98a1
 DIST gpgme-1.15.1.tar.bz2 1699349 BLAKE2B d3a6ccaa35360ed3fc79364dfcc3f2fdcb70e5e41ac72ef011373a39d5def9be9ce1be45843ab65a87630d3fc570d29db5f40b9a273aa8e281464c9d1d3477de SHA512 1d75a848cce6389f7cb8896b57a28dfe1dc5a447bfb4f128b0994a43e04134343400a3be063e971f03dfd595474cfd558519741d5d56afb3e84853ad4f2a45c2
-EBUILD gpgme-1.14.0.ebuild 2665 BLAKE2B b35b17b2cd54af7b5c775a3717bf80ec505fa006782d3bb5c1284db6a01dcfae3cc016a1e783e17cad296f531cb6734723e4dac637e242663604a1dc945b5657 SHA512 7996c1f90976e793594125a1530c399e503662691dc6b3a7351b12150d934ff52360eafd5663bcce3125c211a89a9f7078d1b80277f782ba93eda2d58be0c3c9
-EBUILD gpgme-1.15.0.ebuild 2679 BLAKE2B f93025454a52561180f78921be82fbfb2ab228f683d3bd69fe91abdf56f0c0bf7b1b336a1e4b3bad86ecaf36192e2cfd8f5b2e175302078d55fd8d346abf4ab7 SHA512 da19361e2ffc28cf5166ab6de263f75f97357a1053a92a3e095602c22fd4b9a70237904b2eac58bdcb1cd296fc74118676c4227996f9534681f221584840618e
+DIST gpgme-1.16.0.tar.bz2 1718913 BLAKE2B da55e695b148e949a1c0770d0298d7a8c9f87d7a1f9e45d380f8c13c472bd44cb4266adb9a113e2b1dcc2596291744f48fdf998ff2de876059d89d184dc87f3a SHA512 69487be69612e9bf0221ff56ae687248bd13635db1b7087130e93c1670e38f3c810bbca17723555c04fe207976c35871bbc3da005179ce099504321cf33636e4
 EBUILD gpgme-1.15.1.ebuild 2670 BLAKE2B 7007356262efc1db39dd9f024934e33f9851c5b120297472043e090ebf779aefe246c92cdb7c62c67fa97f78d44bd2a5a185cfef0e3d65dd8e1ec18368cafced SHA512 f7ebc23ff194ff6e652f5d1768b90299a642ffa30b6f6281d698fa0c26da32aca864fa1d68ccced41ca2db3e4b6de36dfdbb9f6563f68fbd1cda1fd4069bb678
+EBUILD gpgme-1.16.0.ebuild 2678 BLAKE2B a8c126d2fb79b1425069b6e174e2bc3f4da6c0fb82d08e11d1b6945e0bdf6e0f0131b3e21e6b5347fc6956864acd751aecbd959fdc9b166fff5800542dcda64f SHA512 25d734d2544950b307748c40370ca072f76a156f685a9b8f594bba4f5ae1efab0d566dbd0f226d487ccd4940b8617092e08707b2c6f7e0768ffc93a1cefb980d
 MISC metadata.xml 326 BLAKE2B 982fe6e2ae0b6ce81980b477a39341c363c867202d646ff4acc9fb361785026919cc0de914e0deee67b79441115cea8a8b36f095d4719442f527f1a0d3ba06b8 SHA512 1223f3cdd325623e524c5bf46bea592b6930bdcc2ba40f9ebf27e568c6a527f59c8315194e4ffd70c29b778d25a2e2b8f57282d5e788814d3fbbcb1de4cf6334
diff --git a/app-crypt/gpgme/gpgme-1.14.0.ebuild b/app-crypt/gpgme/gpgme-1.14.0.ebuild
deleted file mode 100644
index 5bc323ad0812..000000000000
--- a/app-crypt/gpgme/gpgme-1.14.0.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_OPTIONAL=1
-
-inherit distutils-r1 flag-o-matic libtool qmake-utils toolchain-funcs
-
-DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
-HOMEPAGE="http://www.gnupg.org/related_software/gpgme"
-SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="1/11" # subslot = soname major version
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv 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"
-
-RDEPEND=">=app-crypt/gnupg-2
-	>=dev-libs/libassuan-2.5.3:=
-	>=dev-libs/libgpg-error-1.29:=
-	python? ( ${PYTHON_DEPS} )
-	qt5? ( dev-qt/qtcore:5 )"
-	#doc? ( app-doc/doxygen[dot] )
-DEPEND="${RDEPEND}
-	qt5? ( dev-qt/qttest:5 )"
-BDEPEND="python? ( dev-lang/swig )"
-
-REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )"
-
-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
-	fi
-}
-
-pkg_setup() {
-	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
-	fi
-}
-
-src_prepare() {
-	default
-	elibtoolize
-
-	# Make best effort to allow longer PORTAGE_TMPDIR
-	# as usock limitation fails build/tests
-	ln -s "${P}" "${WORKDIR}/b"
-	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
-
-	econf \
-		$([[ -n "${SKIP_TESTS}" ]] && echo "--disable-gpg-test --disable-gpgsm-test") \
-		--enable-languages="${languages[*]}" \
-		$(use_enable static-libs static)
-
-	use python && make -C lang/python prepare
-
-	do_python
-}
-
-src_compile() {
-	default
-	do_python
-}
-
-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
-}
-
-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/gpgme/gpgme-1.15.0.ebuild b/app-crypt/gpgme/gpgme-1.16.0.ebuild
index c87f99a58840..9b99df979f9f 100644
--- a/app-crypt/gpgme/gpgme-1.15.0.ebuild
+++ b/app-crypt/gpgme/gpgme-1.16.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..9} )
 DISTUTILS_OPTIONAL=1
 
 inherit distutils-r1 flag-o-matic libtool qmake-utils toolchain-funcs