gentoo resync : 25.08.2020

8 files changed, 102 insertions, 124 deletions

diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index 0ab0a218c9e1..d31abfb683d5 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,7 +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
 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 1274 BLAKE2B 09ce045944478da8ded1c129c1510166a28910be93cbf1f1f5efa0b6f22d07f08395e123d1b0a2cb78cf1af43ff9a0eaf1d747e9e3c8e49950b77e6f709bc58c SHA512 0a6cf495b4bfd7da9d4be1fa471bb6ea2f1890552289fd1959dd809799f23bf541f3dbca0c15a6ae7a1e41688cdf532232bfd884700a7b29286e6b01944df7f0
-MISC metadata.xml 652 BLAKE2B 7b1d1ad76e12349a4b18514812900a0847e43339299997512aaccf1f8646b6f1197a81d89fc1d43daf3a0ae0a65d635087222456bd317eb52c6cdd76be027327 SHA512 cbc87333b3907d4e210a49f566ef9ad8062801f8fb4c36951b4fc72c85f7e411c1919db71082768730c45338d6dcb1d907b5d1a7e1c5288782457cb942677a37
+DIST keyring-21.3.0.tar.gz 73120 BLAKE2B 6124e29e4dfa0b4c1f4ad3c1262c282935f860c0aea796a9e66987e64e4737d7f746c9c832b427e49cdadb87e61a33f7bfbd956299400311ff08e59f643cf6ff SHA512 85119a13aeb62456f8b9409990c3f5f6e0c83e9850466ee3b7a3d10e879e3b7fd6d723b2b683a8904b5d20c76fc85471d16aaedbd7ce04d8b88f1d1dd265f0ff
+DIST keyring-21.3.1.tar.gz 73553 BLAKE2B 75824dc1ce757501ed286a2dc5c49c644df0fd3278f7344bf42c8e687f51b2c488e038377e776b13f0d97b3f60d940467248689d8f1572811a15400a14d85529 SHA512 6a95d602eed052378c78fe3d8134eeaccd5fd13051ecda32710061c2b9348ebbfc350dc004ef41df94df28006ead4bbefe3bc968bdabd136acf27c469a87ee7a
+EBUILD keyring-21.2.1.ebuild 1267 BLAKE2B f1a95e142caf22676560dedffacecfd0d06d1097916190e8219bcf472b536239f1effd6169b60a1c6564a5e5c0180b8bf935d5ae303ac10d76425fce02d6a064 SHA512 3c174310a9fe8665993891684da99d7a3c304c73a191059d4fc8095117a56ed2623a42b333e8224b9217fe0c698a695804ade899f5c5c17190bdbe248c957d29
+EBUILD keyring-21.3.0.ebuild 1281 BLAKE2B 1e2e062a47177c8928df23e48fdb99917e51e7da008a1483fc83b09fa9a98b95f489a879db37b6de17a7365a6ef121a20ba3507fecbe32a5d346f3aa84fd4537 SHA512 c7916d84182970017e8a5a955ee260661f09ad75202a53b0e73cc3b306496eea5646157596c5b2e1a0cf4c37fe3eab9a3f90ca179b77472e619271bb546945fb
+EBUILD keyring-21.3.1.ebuild 1164 BLAKE2B 8b30b9f248e9517db0d4831b6d0d05744ca6d4b2862bc8066bd0ec9811b05d3f3bda31056064416057b9cc17a442d6140c0e348bad302f021d255fe27a50a964 SHA512 3828e321691678d215dc54ce441f7b9a36c4760cca8b7989abfed7d91f6914a49373bd163e7d05ff7bfcb7e73594ec050a4c9dff05f7a7222043cf91a8a86b0b
+MISC metadata.xml 610 BLAKE2B abd4cf8986ea009081e0e21d31b8bbdbe7b2e99fb332bda41d666c97feda8974cabcabdf6d88e4d8d9a2b9aefd250ad06bfcdd8888513cc0a10cdbda9c93c981 SHA512 931f5d607bc5d9caf329f0b7a010ee055f3c962e67e61c8f4e7458f5325a89bd91678c215fbdd63160eb2d7f34ce58b0a30b144e4159fb426c243efa1dc12d05
diff --git a/dev-python/keyring/files/keyring-19.1.0-tests.patch b/dev-python/keyring/files/keyring-19.1.0-tests.patch
deleted file mode 100644
index 0e4bdfd1960e..000000000000
--- a/dev-python/keyring/files/keyring-19.1.0-tests.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/keyring/tests/test_errors.py b/keyring/tests/test_errors.py
-index a90905f..1d5f568 100644
---- a/keyring/tests/test_errors.py
-+++ b/keyring/tests/test_errors.py
-@@ -1,5 +1,8 @@
-+import platform
-+import unittest
- from unittest import mock
- 
-+import pytest
- from keyring import errors
- 
- 
-@@ -13,6 +16,7 @@ class DeletionDetector:
- 
- 
- class TestExceptionInfo:
-+    @pytest.mark.skipif("pypy" in platform.python_implementation().lower(), reason="broken on pypy")
-     def test_traceback_not_referenced(self):
-         """
-         Ensure that an ExceptionInfo does not keep a reference
-diff --git a/tests/test_packaging.py b/tests/test_packaging.py
-index 3ede719..4bdfa25 100644
---- a/tests/test_packaging.py
-+++ b/tests/test_packaging.py
-@@ -1,6 +1,7 @@
- import pkg_resources
-+import pytest
- 
--
-+@pytest.mark.skip("for some reason we are getting 2 of the same entry point")
- def test_entry_point():
-     """
-     Keyring provides exactly one 'keyring' console script
diff --git a/dev-python/keyring/files/keyring-19.3.0-tests.patch b/dev-python/keyring/files/keyring-19.3.0-tests.patch
deleted file mode 100644
index 82cef178c6cb..000000000000
--- a/dev-python/keyring/files/keyring-19.3.0-tests.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/keyring/tests/test_multiprocess.py b/keyring/tests/test_multiprocess.py
-index 49af222..8fdd1a3 100644
---- a/keyring/tests/test_multiprocess.py
-+++ b/keyring/tests/test_multiprocess.py
-@@ -11,6 +11,11 @@ def subprocess_get():
-     keyring.get_password('test_app', 'test_user')
- 
- 
-+pytestmark = pytest.mark.xfail(
-+    platform.system() == 'Linux', reason="#410: keyring discovery fails intermittently"
-+)
-+
-+
- def test_multiprocess_get():
-     proc1 = multiprocessing.Process(target=subprocess_get)
-     proc1.start()
-@@ -23,9 +28,6 @@ def test_multiprocess_get():
-     sys.version_info < (3, 8) and platform.system() == 'Darwin',
-     reason="#281: Prior to 3.8, multiprocess invocation fails",
- )
--@pytest.mark.xfail(
--    platform.system() == 'Linux', reason="#410: tests fail intermittently"
--)
- def test_multiprocess_get_after_native_get():
-     keyring.get_password('test_app', 'test_user')
-     test_multiprocess_get()
diff --git a/dev-python/keyring/keyring-19.3.0.ebuild b/dev-python/keyring/keyring-19.3.0.ebuild
deleted file mode 100644
index 448afd7a7d74..000000000000
--- a/dev-python/keyring/keyring-19.3.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# 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 x86"
-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})
-"
-
-PATCHES=(
-	"${FILESDIR}/keyring-19.1.0-tests.patch"
-	# https://github.com/jaraco/keyring/commit/411204df606bdf02c99f3360ec033e3c235d5f67
-	"${FILESDIR}/keyring-19.3.0-tests.patch"
-)
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/jaraco-packaging \
-	dev-python/rst-linker
-
-python_prepare_all() {
-	# avoid setuptools_scm and a bunch of style checker dependencies
-	sed -i "s:use_scm_version=True:version='${PV}',name='${PN//-/.}':" setup.py || die
-	sed -r \
-		-e "s:setuptools(_|-)scm[[:space:]]*([><=]{1,2}[[:space:]]*[0-9.a-zA-Z]+|)[[:space:]]*::" \
-		-e "/pytest-checkdocs/ d" \
-		-e "/pytest-flake8/ d" \
-		-e "/pytest-black-multipy/ d" \
-		-e "/pytest-cov/ d" \
-		-i setup.cfg || die
-
-	# avoid other deps
-	local -a pytest_params=(doctest-modules flake8 black cov)
-	sed -r -e "$(printf -- 's:[[:space:]]*--%s:: ;' "${pytest_params[@]}")" \
-		-i pytest.ini || die
-
-	rm ${PN}/tests/backends/test_kwallet.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/keyring/keyring-21.2.1.ebuild b/dev-python/keyring/keyring-21.2.1.ebuild
index 31150c3125ee..63d0699c6485 100644
--- a/dev-python/keyring/keyring-21.2.1.ebuild
+++ b/dev-python/keyring/keyring-21.2.1.ebuild
@@ -14,7 +14,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 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ~ppc64 sparc x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/keyring/keyring-21.3.0.ebuild b/dev-python/keyring/keyring-21.3.0.ebuild
new file mode 100644
index 000000000000..651413158c99
--- /dev/null
+++ b/dev-python/keyring/keyring-21.3.0.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 ~hppa ~ia64 ~ppc ~ppc64 ~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 --mypy::' 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}
+}
diff --git a/dev-python/keyring/keyring-21.3.1.ebuild b/dev-python/keyring/keyring-21.3.1.ebuild
new file mode 100644
index 000000000000..669cfb619df2
--- /dev/null
+++ b/dev-python/keyring/keyring-21.3.1.ebuild
@@ -0,0 +1,45 @@
+# 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 ~hppa ~ia64 ~ppc ~ppc64 ~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 --mypy::' pytest.ini || die
+	rm tests/backends/test_kwallet.py || die
+
+	distutils-r1_python_prepare_all
+
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
diff --git a/dev-python/keyring/metadata.xml b/dev-python/keyring/metadata.xml
index ff28974cc0c1..9faa7f300c0e 100644
--- a/dev-python/keyring/metadata.xml
+++ b/dev-python/keyring/metadata.xml
@@ -13,9 +13,9 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">keyring</remote-id>
-		<remote-id type="bitbucket">kang/python-keyring-lib</remote-id>
 		<remote-id type="github">jaraco/keyring</remote-id>
 	</upstream>
 </pkgmetadata>