gentoo resync : 22.01.2021

4 files changed, 6 insertions, 229 deletions

diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index 27c370a19a48..c90f9b7f7c90 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -1,10 +1,7 @@
-DIST gpgme-1.13.0.tar.bz2 1820504 BLAKE2B 71fbb034e3c5939d1953554ccbe0e89e2089c53a4c79e90ee51bdf96500bf4be8a5e1633772ab8dadd44616dde7be551ad7d3af0a59d7e1df10a19cd9cf56baa SHA512 47a7a67dcc6d111cddd805d288d42e870948114a6dc09ce0675ad8b3d1580bbc2a683e1e70cb2f416919cf2129c72a9ff30e2e3b9527809d04e863cc1f87267b
-DIST gpgme-1.13.1.tar.bz2 1759616 BLAKE2B 17fff261ab76b72e096aa42cc847443bfd3bbf0eb6d04af1d38561ddce1d11cfe9a98b6ced268b28f33e2cb7d900a9e6b3dfc56f1c784a021dbefbf493522e70 SHA512 11de670c6cf512508103fe67af56d9fbb2a9dda6fc6fa3cd321371bbe337c7c2c81913ca557d07187adb2a63d37ea1a44da97ab22345bbe6022c405d0cb083b8
 DIST gpgme-1.14.0.tar.bz2 1678910 BLAKE2B 75051166b1f3777d630236c5afbd1786df238272b7ccfd053c5a4b2a207ba146550f6be46c1211f3bacbe19fee2f67adbc5be558d69175c19230a1a02e32d9f2 SHA512 b7ffa30a046c75215e1c73e2f34e5e65532e4dcf6bea55796adc6f82fd38dafe264bcd4332b2001155d6f9476d6fd82a77112dad31c1bb29db9ddefc532ae668
 DIST gpgme-1.15.0.tar.bz2 1692019 BLAKE2B 4c66f24034a88e7da8a06cef3d0ac9d1d6b5eccb6d4277d36a2399d6e78f5d5f42cf0c13188c1dba72fe11d73da76a71867d3c3b13052695b868dc4a680fa85b SHA512 ab979aea6ccc6d4faf02b3b1a773ce95cb754b4d687ce7adc2ed98e218f21a284a2283d8e2429016e78fcf5a94ea863011573fd1457a71cc0ae3aadd368a98a1
-EBUILD gpgme-1.13.0-r1.ebuild 2662 BLAKE2B 8c97adac42c030e86676f04633c83b89bf38281b2c97a15e7e59ba1b3cbb34264d6faeaee0a381ec739fc906b355841f264218f7ef6e5391a34fceef3b8caac8 SHA512 7e76aad80f95a7a88e549e5141614d85dd10cb7b452184dbb0d92af11518f258d5d8dde2ff11c7d0cbdc158dc8dccdbe3d82c402102d1b694ede0205cda9064c
-EBUILD gpgme-1.13.0.ebuild 2656 BLAKE2B bade967221181538d83785a5c0926125479267623b08170192283ed9f3975a155386b7bab7b54b908bfccdece6fbff135590ff129e4e2053df658e94ee1bc719 SHA512 b601047174277ffff58a7e78ced4e6a461f23c8e5d992f02acc8cf7477d60ac1dd4abc4f8628a932c0b550a49ac0e4e208974c060dff8a9d689599dace59ec91
-EBUILD gpgme-1.13.1.ebuild 2664 BLAKE2B 18272d05b35a804c0586db6d2927e526bd97442155b174091917202e3b25179cec6ab7e1464edf4f2cdbc074b513ca9c1b8e68beaf4e463a5fcb58cc8d90db40 SHA512 5ca9a9c25d9aefccf78ede55d05d56e2b638b50a09a51940b7a4fc51b473017b9beca9bdf4f20f772a3c052de2342efca9a72b2bffc9b066ca03d158e1052c59
+DIST gpgme-1.15.1.tar.bz2 1699349 BLAKE2B d3a6ccaa35360ed3fc79364dfcc3f2fdcb70e5e41ac72ef011373a39d5def9be9ce1be45843ab65a87630d3fc570d29db5f40b9a273aa8e281464c9d1d3477de SHA512 1d75a848cce6389f7cb8896b57a28dfe1dc5a447bfb4f128b0994a43e04134343400a3be063e971f03dfd595474cfd558519741d5d56afb3e84853ad4f2a45c2
 EBUILD gpgme-1.14.0.ebuild 2667 BLAKE2B 38538209933c188dab421d0714113ed6463188f759f47a774dca1be589d658b4cb2cf92dfece06594a73a0cfea59e1e9ee1c7b7a82667fe99130db50fa417543 SHA512 d0cecd7b40962c49640784b7e50b94c3638c14c37075a2b36140d9e7a3f08fff2a63ca215339b5f0c234805b4c67a4ceca63ae9d443d35e8f65c793fb861ebf7
 EBUILD gpgme-1.15.0.ebuild 2681 BLAKE2B ef4bc531debf390e0a7cd10419ed845317117db0f2537d76b41b2d07a985874ef7e2c83ca6cc0e45e5f195d505eb7ef158c74e113c80861c6fdf545c6e7a6ef2 SHA512 c4a1e2653e60c97654dd1a1cf4ce597aa30405ca5304df016f0efe8536a417846b7540a56e8a76c814d27ee400f0cb3b92640b2c048900ff96b97b058513b9a4
+EBUILD gpgme-1.15.1.ebuild 2678 BLAKE2B 51e254c190fc64dc44aa092fc56021eb90d9b6e4175920d03b3f4d6dc1eef0b34558b1c1052bea70b740f203a7e214499b7f60def7deee2513d9371ab2e7b4b7 SHA512 7580a4d2c1f973c4eadf349aa0e5066aac451c47fd27f6fad9b78cdb98d081595972af15ad5d5d3ef7a0cc38502fefe9808325890a146e87b5f12747a34bd96c
 MISC metadata.xml 326 BLAKE2B 982fe6e2ae0b6ce81980b477a39341c363c867202d646ff4acc9fb361785026919cc0de914e0deee67b79441115cea8a8b36f095d4719442f527f1a0d3ba06b8 SHA512 1223f3cdd325623e524c5bf46bea592b6930bdcc2ba40f9ebf27e568c6a527f59c8315194e4ffd70c29b778d25a2e2b8f57282d5e788814d3fbbcb1de4cf6334
diff --git a/app-crypt/gpgme/gpgme-1.13.0-r1.ebuild b/app-crypt/gpgme/gpgme-1.13.0-r1.ebuild
deleted file mode 100644
index 045df93213c0..000000000000
--- a/app-crypt/gpgme/gpgme-1.13.0-r1.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_{6,7,8} )
-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 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"
-
-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 "${D}" -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.13.0.ebuild b/app-crypt/gpgme/gpgme-1.13.0.ebuild
deleted file mode 100644
index 3428990769b1..000000000000
--- a/app-crypt/gpgme/gpgme-1.13.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_{6,7,8} )
-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.0.2:=
-	>=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 "${D}" -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.13.1.ebuild b/app-crypt/gpgme/gpgme-1.15.1.ebuild
index 9897dca0c05b..164c9edfc863 100644
--- a/app-crypt/gpgme/gpgme-1.13.1.ebuild
+++ b/app-crypt/gpgme/gpgme-1.15.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 DISTUTILS_OPTIONAL=1
 
 inherit distutils-r1 flag-o-matic libtool qmake-utils toolchain-funcs
@@ -14,12 +14,12 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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"
 
 RDEPEND=">=app-crypt/gnupg-2
 	>=dev-libs/libassuan-2.5.3:=
-	>=dev-libs/libgpg-error-1.29:=
+	>=dev-libs/libgpg-error-1.36:=
 	python? ( ${PYTHON_DEPS} )
 	qt5? ( dev-qt/qtcore:5 )"
 	#doc? ( app-doc/doxygen[dot] )
@@ -101,7 +101,7 @@ src_test() {
 src_install() {
 	default
 	do_python
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -type f -name '*.la' -delete || die
 
 	# backward compatibility for gentoo
 	# in the past we had slots