gentoo resync : 30.05.2020

3 files changed, 55 insertions, 9 deletions

diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index d2fdd05586bd..d679d3e41d63 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,5 +1,7 @@
 AUX keyring-19.1.0-tests.patch 978 BLAKE2B f5ffbef3fbda93c4f1ac4373129931b4986209cb0898c363e2ce82c8b08b530ba15f6409f59e99f68d7bd06547c3e00b2f5dfd3957319485ab3db74dbadad1bb SHA512 aa33abc4ccb4bece799add8a766665f0405a69f3c5485b3ffffb5116365b10d965ba5f9458ad1006c36132b6a83f26fe9a6d83f118e46ae59a76af84c6acefb1
 AUX keyring-19.3.0-tests.patch 939 BLAKE2B 8537c22ba56a24e5f8fee3907023098dbbdaf208a5e3edfff27c0a9537214caba2d4383efd79ab8ea0d02ed6ef3ebfb3630e53f7846a1af993d440407a3f20c8 SHA512 4aa8ed401181fe14e98e855d537aec5dcf5e413728df52edfbaa16cb0babaed68f29402f0a83143248e51cbc2e3f6211b68efaf4b54d76dcf8b5ee2748f46d55
 DIST keyring-19.3.0.tar.gz 43587 BLAKE2B a1003aa55ac48f39e84431c50fe3e24e1da76a0db177eed08bd2c2110b78d10cbfcf7188519435732be68452a0318119cca1563168410b16fc529a3a7e98125c SHA512 b1d26f665203b11712ef91057ecd78cce58b35038b259605c42997283f6c41449baf242ecf43510b29598559b8aecf733eb66be6e0c439564256f40eb0f6982c
-EBUILD keyring-19.3.0.ebuild 1716 BLAKE2B e2bd07f11e9e5a1673fb32cc4a10c6fd32fdfddcd4caebf00964b7d34e4c9c0c6d0d1853cb6feb4038d83a62c321e2919d4bb4753ea3aad4c9fdf23ca7a33990 SHA512 454f31e3d7edb21ebb28e85e5d51c0c07c2afc66c513e6143eaae8b0d007412468ef8fec8baee482ab241174aa7ef64ed485eb4f8741b92d698c74949edd6eae
+DIST keyring-21.2.1.tar.gz 45535 BLAKE2B b276f5b973c418794561e0d0872761847d4cb81531dde61b75439c73039f49ffc8abf679d622a9381bc6663ffc452c8b6aabc0a4c8e4cfe5ad1c63566b78082d SHA512 35869e37b234d15799907f0efd0193ab3eb9c0799a6da2d843fdad24212b4ab983658b32bd8b09b658174dcb1ddb6d70a85d0af95730d34d8c571f2ecc9a7c8b
+EBUILD keyring-19.3.0.ebuild 1643 BLAKE2B c902a24962b88f11287b55e957a10c50410dead3a252d0827edb6bb72747b7e0686a896b93be67aac3e60f066ace99addc3f798a853d69374b6761b4b54019a9 SHA512 5ef0899592a3284f2a05de1a66b846532af35de7143a5f57b7933dad689cd1a2b94de5b83ca0038a8288c402ddb71ba538eb0f48885496a986f221aea30c5e78
+EBUILD keyring-21.2.1.ebuild 1250 BLAKE2B c5254e6e748ac3b97dc70c10b3cddae10028afcd63fd29637d58576cb1dc44da6b4bf3e7a874efb1df2db79dd306bb2cb3d043cd1d2077021f38a45218dee50e SHA512 2cf1001a95621e408efa11ed667227382715bd36fe81ce5347be1d06509756bcfc02157b3eb5f07c52f005dc61bd915a88b2dbd72ba4c5410c6d78dee70d04f0
 MISC metadata.xml 652 BLAKE2B 7b1d1ad76e12349a4b18514812900a0847e43339299997512aaccf1f8646b6f1197a81d89fc1d43daf3a0ae0a65d635087222456bd317eb52c6cdd76be027327 SHA512 cbc87333b3907d4e210a49f566ef9ad8062801f8fb4c36951b4fc72c85f7e411c1919db71082768730c45338d6dcb1d907b5d1a7e1c5288782457cb942677a37
diff --git a/dev-python/keyring/keyring-19.3.0.ebuild b/dev-python/keyring/keyring-19.3.0.ebuild
index d9dbd7b1f35a..448afd7a7d74 100644
--- a/dev-python/keyring/keyring-19.3.0.ebuild
+++ b/dev-python/keyring/keyring-19.3.0.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
 
 inherit distutils-r1
 
@@ -14,19 +15,13 @@ 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 x86"
-IUSE="doc test"
+IUSE="doc"
 
 RDEPEND="
 	dev-python/secretstorage[${PYTHON_USEDEP}]
 	dev-python/entrypoints[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3 python3_{5,6,7})
 "
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND} )
-"
-
-RESTRICT="!test? ( test )"
 
 PATCHES=(
 	"${FILESDIR}/keyring-19.1.0-tests.patch"
diff --git a/dev-python/keyring/keyring-21.2.1.ebuild b/dev-python/keyring/keyring-21.2.1.ebuild
new file mode 100644
index 000000000000..3c3edf19bd1f
--- /dev/null
+++ b/dev-python/keyring/keyring-21.2.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
+
+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 ~sparc ~x86"
+IUSE="doc"
+
+RDEPEND="
+	dev-python/secretstorage[${PYTHON_USEDEP}]
+	dev-python/entrypoints[${PYTHON_USEDEP}]
+	dev-python/jeepney[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' pypy3 python3_{5,6,7})
+"
+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
+
+python_prepare_all() {
+	sed -i -e 's:--flake8 --black --cov::' pytest.ini || die
+	# relies on cpython's gc behavior
+	sed -i -e 's:test_traceback_not_referenced:_&:' \
+		tests/test_errors.py || die
+
+	rm tests/backends/test_kwallet.py || die
+
+	distutils-r1_python_prepare_all
+
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}