gentoo resync : 25.09.2021

4 files changed, 2 insertions, 93 deletions

diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index f11aad0e7803..65824f3d07a1 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,9 +1,5 @@
-DIST keyring-23.0.1.tar.gz 48614 BLAKE2B dd56b92464934a7596bba97c5a1990eb2b3bf33da2eb469aa028ad346c09fa14687cc9214cb48ed82c0f32fc4fcf779391a00a5c9fffdff25f31e7f70f2bd731 SHA512 9f779e419049aef699c67dcb93277f336a2063b42394a4ff2350b8e72b81fe6763f6a6fbe8f358e90bf31540513095e2e56b83742841ee567e5d46b91995c063
 DIST keyring-23.1.0.tar.gz 43668 BLAKE2B 7ef9a8858568ef8d0889b693cab55f7d2e61ebc3e6116b1f936c6b841ef3a50838b80d6315e5a04bee44a71b1e3bd1112d627603c8b9d113b12173d3442af776 SHA512 d3bd6c6c224a00f2d2aa0c22ec05a5e78707db37c62ed0e03d444ed94e2eee053f7eb1e4c387073753ca5c9b76a9f51d0bda8294f9ba2a326c84afd913a14293
-DIST keyring-23.2.0.tar.gz 44489 BLAKE2B 8d3321b71bdee6f61c3e33866d9612c2ef249613063af58767658d33975275fce72fb9c8b83cdff5881c3e20738a679f50b84c4e8979ac9f282df3331c718a88 SHA512 10aa3debfcdb8b4a7632cfdaae71d2fb5993192bb25f3acb428f23fb830b262fc69a91f5a3c936e6828182436e999b7aeab4b6510ef0b36881eab44476ddcb8d
 DIST keyring-23.2.1.tar.gz 44522 BLAKE2B 79ba1fb530cecad84ba94e9a27f32196367af92952946c07581d68d5e89fac93d9b7a33cad8d1a95ae9ffe1568ddc189cd17decea7113debb022dafba4472bfd SHA512 205f74d9457f65952b1cada1a829bb97318cb80689b410eedb49def3577234f715ec6420d7d12833255ef5098040d0a5186be47fa6b8c6db6036406c3ee2e246
-EBUILD keyring-23.0.1.ebuild 1183 BLAKE2B 10f561a5fe7733894a9c18e03b6d463b71757f860636d32b7b0b77ef5b4a19ee8be01d93f36a3f7496ae10fb664a24917303fcb6bcf7cc3ede3fce7399ce98f6 SHA512 7c0ecea87bb0c1454fef5418ccac2817396d8513b515e756b0eaface1b51454dd4fee9c48f448779198a4b49359d52c604841144fb1c4e28043935a57d7cec27
-EBUILD keyring-23.1.0.ebuild 1191 BLAKE2B 85bc01ef8ba4c8bc0bf59b6f7b006412b70bba05aa37894cd176c730886fbb11df43a70dc2731155fc93d2be20d708397ff1630295f6062177b1154b6d95d73f SHA512 aa9f4be2343a15757781ba7b5976745da0b09c690c759d1e8e5f352d488b496acc7ff25e3a832b857a72f719535811a52b8918d148f1609af54e268e3342339d
-EBUILD keyring-23.2.0.ebuild 1187 BLAKE2B 4fc4ed01d8e2e37f51402e99cc9677dba6e5327fd7127ef7dfb6a24b59f625e3c1c3ac21f5bbb4ae7a86976b1ed7ee46c21eee603ffc4a08333ca9ae41ad801f SHA512 8d2d9a54582886ee2fdf83bdb621c6d7458cf1b4d6ce91eab4f3b34ce1b7e888fa7cb9ca49ce127f6875fcc27252c1725cbd5d3debfc30fde273ad587f280953
+EBUILD keyring-23.1.0.ebuild 1183 BLAKE2B cb3e159c70bff82170068e461bcabc774eb8d6ae4bac0b8c525ee5d9af0b15f3418fef41aaeb3ac5ad5c90ca57264e3418903a1b5763e53876b2f338dba4025b SHA512 6b6a934fa0b979a87533cd0818ea34ed01e5072f770025b01830550d4c507dfaeacd75a5efd9a1149128bbf160847b44054a8ab11472b4789b9b4da69c198f0c
 EBUILD keyring-23.2.1.ebuild 1238 BLAKE2B e20171b43584911da4ef3ebf3f83a682746ec01ed7dddf8443943496f663e134075ac7f66e31c906452f51b50788da435e2eebba1361a9b7879346f05e485a49 SHA512 48f09195bd1eb57f3d4d543333e73740b228588954d2842ee6654197f498c63f989d367c6e05eceb9fb553fc72f6fbf62ea6ed7f7ee0cfdf7aec796b32cbef97
 MISC metadata.xml 611 BLAKE2B 7f938075d992467e01da200f0c859e9bc6a6128296151b3529b2168b68364605bd7dbadf69f7820d459d5db6950908e0b0acb09a636f1fc45862093df6d08334 SHA512 a0ad1729c53b18fedf227053648b04541f5adcf56bfaa73218e214f8c2409ebe2574a5917442c5218084b38da34691b6566f2c65390ef6487985a123f62f9efb
diff --git a/dev-python/keyring/keyring-23.0.1.ebuild b/dev-python/keyring/keyring-23.0.1.ebuild
deleted file mode 100644
index 4e13723b2dd4..000000000000
--- a/dev-python/keyring/keyring-23.0.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..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 ~ia64 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}
-
-python_test() {
-	local 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 tests/backends/test_kwallet.py ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/keyring/keyring-23.1.0.ebuild b/dev-python/keyring/keyring-23.1.0.ebuild
index f815a958a2ce..e3b5d94fb8c4 100644
--- a/dev-python/keyring/keyring-23.1.0.ebuild
+++ b/dev-python/keyring/keyring-23.1.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 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/secretstorage[${PYTHON_USEDEP}]
diff --git a/dev-python/keyring/keyring-23.2.0.ebuild b/dev-python/keyring/keyring-23.2.0.ebuild
deleted file mode 100644
index 065e420f45f4..000000000000
--- a/dev-python/keyring/keyring-23.2.0.ebuild
+++ /dev/null
@@ -1,45 +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 ~ia64 ~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=(
-	# hangs
-	tests/backends/test_libsecret.py
-	tests/backends/test_kwallet.py
-)