gentoo resync : 04.01.2022

4 files changed, 5 insertions, 53 deletions

diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index 646dd86319c9..c9e5f54dcf9b 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,7 +1,5 @@
-DIST keyring-23.2.1.tar.gz 44522 BLAKE2B 79ba1fb530cecad84ba94e9a27f32196367af92952946c07581d68d5e89fac93d9b7a33cad8d1a95ae9ffe1568ddc189cd17decea7113debb022dafba4472bfd SHA512 205f74d9457f65952b1cada1a829bb97318cb80689b410eedb49def3577234f715ec6420d7d12833255ef5098040d0a5186be47fa6b8c6db6036406c3ee2e246
-DIST keyring-23.3.0.tar.gz 44669 BLAKE2B 3f6cd3ff558b0a792d405c1c8175bf68c8463f26662d74c1f439e28d7914ef7f26c6091c64ef372e78028eeda04d2a5bcbe253477632b2e53d92d36ade43d47a SHA512 39264abf585949da444fdacbb1195c981157e151d1d14373c5afe0f6547f8da46b2da3e14f47e363bbccd69ee90bc182c287bd963d8b99301a5e919e511426cf
 DIST keyring-23.4.0.tar.gz 44557 BLAKE2B 1115ecfca9f7d7cd5d28168d9d4198e329217ace82a32fe4db1b40aa96e6a352face46f4e8877407618e701713a8f1347810a24706bbe1872bff758f71ae34f5 SHA512 214041375a1bddda099042168f0f4c5ea4cf24c347a0693ab3efd7eb7a0ab2c36abff33f3d83168cfe5ae5dd971e0f3de4548fb0651e435009766aec740e64eb
-EBUILD keyring-23.2.1.ebuild 1224 BLAKE2B fe8952fba1242bc4ec90fedc89519464367423f2bcda88a07c2fbadad6718275db705f842a1090b92fb4bcc44519fb7a2c07e606434b7f709e766658e4a6f13a SHA512 16059d2b1e6b56e37de7aa728b04a564a04d9530b5373bacd44e699f64504e8ecb177dba3b80c17e9ce2b1ad7eb59955001ad82f4712e3c697f2763c5120c9de
-EBUILD keyring-23.3.0.ebuild 1232 BLAKE2B ecd83cf09cc6891d07147eb52d772f4a7a628a69c3a835b5b9e8d3d356e72bbc9d43c44bed0e7a860c2004570f7314f8afe30054d21afdd96eb6ea444296b7ed SHA512 fd87cbb0c01401314515048ae0c72a5cb950db943712a40bbdb06fe4af3765902af22ea90a2da6c5510bc6b0223d5aadcc77525b0bc09d9f023cf78c1699ef20
-EBUILD keyring-23.4.0.ebuild 1232 BLAKE2B ecd83cf09cc6891d07147eb52d772f4a7a628a69c3a835b5b9e8d3d356e72bbc9d43c44bed0e7a860c2004570f7314f8afe30054d21afdd96eb6ea444296b7ed SHA512 fd87cbb0c01401314515048ae0c72a5cb950db943712a40bbdb06fe4af3765902af22ea90a2da6c5510bc6b0223d5aadcc77525b0bc09d9f023cf78c1699ef20
+DIST keyring-23.5.0.tar.gz 44586 BLAKE2B 70179f8353147679f03c888b1af00d2461264e7a7062eb7b1372615ae883f43352999ce57e24f3378ac66d5e74a81df66702bf380eb32d6d3554777e9ca63dfe SHA512 639d1cdece5dac854053818f3a4751b30fb9f13a2b3abb0090ba0cb519b50604858673678fe6205c2ec10be863e5f3d63cc7891424beabe2482d35b820a60da1
+EBUILD keyring-23.4.0.ebuild 1224 BLAKE2B fe8952fba1242bc4ec90fedc89519464367423f2bcda88a07c2fbadad6718275db705f842a1090b92fb4bcc44519fb7a2c07e606434b7f709e766658e4a6f13a SHA512 16059d2b1e6b56e37de7aa728b04a564a04d9530b5373bacd44e699f64504e8ecb177dba3b80c17e9ce2b1ad7eb59955001ad82f4712e3c697f2763c5120c9de
+EBUILD keyring-23.5.0.ebuild 1232 BLAKE2B 266955c3c21b0cc1afe1f9962b9820c134426bd877b3631dd142c74d37f1dbcc6c2b22519ab6e305e9a71e4e66dd732e933791ade4ac7bca305216c535cea121 SHA512 eb3ad32ce55f93b535cf19bc7cab8b4d1b64a3cbbc3339946f38f5ee5edeffee9967649505a7e0dd0dedc8fd4daa70d17a771c83ded4ba564ea75cad6fafa04e
 MISC metadata.xml 611 BLAKE2B 7f938075d992467e01da200f0c859e9bc6a6128296151b3529b2168b68364605bd7dbadf69f7820d459d5db6950908e0b0acb09a636f1fc45862093df6d08334 SHA512 a0ad1729c53b18fedf227053648b04541f5adcf56bfaa73218e214f8c2409ebe2574a5917442c5218084b38da34691b6566f2c65390ef6487985a123f62f9efb
diff --git a/dev-python/keyring/keyring-23.2.1.ebuild b/dev-python/keyring/keyring-23.2.1.ebuild
deleted file mode 100644
index f96cd174d7d8..000000000000
--- a/dev-python/keyring/keyring-23.2.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Provides access to the system keyring service"
-HOMEPAGE="https://github.com/jaraco/keyring"
-SRC_URI="https://github.com/jaraco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/secretstorage[${PYTHON_USEDEP}]
-	dev-python/entrypoints[${PYTHON_USEDEP}]
-	dev-python/jeepney[${PYTHON_USEDEP}]
-	dev-python/importlib_metadata[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/jaraco-packaging \
-	dev-python/rst-linker
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-EPYTEST_DESELECT=(
-	# this test fails if importlib-metadata returns more than one
-	# entry, i.e. when keyring is installed already
-	tests/test_packaging.py::test_entry_point
-)
-
-EPYTEST_IGNORE=(
-	# apparently does not unlock the keyring properly
-	tests/backends/test_libsecret.py
-	# hangs
-	tests/backends/test_kwallet.py
-)
diff --git a/dev-python/keyring/keyring-23.4.0.ebuild b/dev-python/keyring/keyring-23.4.0.ebuild
index dced4d33c0b0..f96cd174d7d8 100644
--- a/dev-python/keyring/keyring-23.4.0.ebuild
+++ b/dev-python/keyring/keyring-23.4.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/jaraco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="PSF-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/secretstorage[${PYTHON_USEDEP}]
diff --git a/dev-python/keyring/keyring-23.3.0.ebuild b/dev-python/keyring/keyring-23.5.0.ebuild
index dced4d33c0b0..509006168d2e 100644
--- a/dev-python/keyring/keyring-23.3.0.ebuild
+++ b/dev-python/keyring/keyring-23.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8