gentoo resync : 29.01.2021

4 files changed, 54 insertions, 11 deletions

diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index b19e39830db7..de523c5b72a6 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,7 +1,9 @@
-DIST keyring-21.5.0.tar.gz 45885 BLAKE2B 73fe60f0d414cad3b36e0c995b63f048f75358b9f4d389f41ae3a32d68c82ccb9d1fe76d9bd375d06519bcebb8ad9aa34ba98676bf37f3c5a10d9424c161e074 SHA512 25cbbcac0810829e48e6ff4c9497b8c9f3c03011047e76a6901f6c422d6eb1711e535233a90d96f8dc16a77352d4228114f3b447d9e196184a9d87402658f5bd
 DIST keyring-21.7.0.tar.gz 46998 BLAKE2B 469d2de254ed88604a40a4e05c001f50986f55296d35b54969cfa8612473cbd5184f36bd6babdfb6631ab908e03f81858434b7e52471a2d366f97293c2c0ed93 SHA512 8fc5e8f0f0cf2a336c6ce900d59fcd31b4ec270d62559a1c2b4c36803428532b463bad0b2ace9af33b6fb0d50de94229449c4ef4042287ecaa8f1fac37c5faf8
 DIST keyring-21.8.0.tar.gz 47639 BLAKE2B 3b8b11cd7ea121f9d8544a5775d9f62de23613da0265f0d815687ad311f4a7b6ed431142682df3059fbe43a342c6151871782a850c416a5b50c1df14a64d609a SHA512 4acadf421946644466b5c43481eddd111170185ba3993f4fec38cad0129259bd17aebad4dc2e2d2e88e84aa814e62d37b39efe7385ccd569e40a5291d5f4ae40
-EBUILD keyring-21.5.0.ebuild 1164 BLAKE2B 7a1c0fca40b678e8983402aec32ffe72631ece1ca576983c3c81d5f77e3adaaa36ca1cca00616982fc0fc0252522f2708df3c6125d793aea58d0ded49301fef9 SHA512 c022174b8ecca7e30edf9772a696222acc3189107afbe42ea255fc4f840ca0cf76d70f55b5d986d27759ba39642bb009369624b902a82228ae59083d65e02af2
-EBUILD keyring-21.7.0.ebuild 1172 BLAKE2B d2151e7d29443366931f0e71f9bf08b1deab55eb592657e66b77278c5e9ba1be749780e6cedc9144be6e1e108b11105ac3f8f00c80e6d6080579382135973792 SHA512 69026bca0ad861e49726e4cde2497fabb8421326ce7b9b1b250e413a55305a794fc2ddf0abee91ce6f1a0f6358db5e5770a0d77d002ddff605644bd7bea3c77b
+DIST keyring-22.0.0.tar.gz 47693 BLAKE2B 88a151327778e5e039c43caa68e53705d985d6ef2b7b668df1d941160b843f47a0e2f6f79c9afc39bc66a36373c0374333296a3cb98f1c65c620a8fad3f43fec SHA512 5e9e27cf9b09f042747909b442864a1ea0669b36f69592538b487978a582e16e58056d6bd68b35566143000ed3f5c7733e3ef471c66935a811e09fc4b7f56f6f
+DIST keyring-22.0.1.tar.gz 47782 BLAKE2B ec9f5c0418b2c279f111cbcb8ccc1fc05f64e859e2e675041289a639c7e2d4681e562c9c023e46f1eacb99f88114af97545ad36f71037db0b77e83d927785ce0 SHA512 2e264570d2e905ce4862d71fe4b02fcf0631218a693292c13159fdbad0032e91d81910f84d787e948057e2f428fcf8677ebdd83af4da54c3359347f642db0441
+EBUILD keyring-21.7.0.ebuild 1164 BLAKE2B 2dcd3277b3acd6be6423eb9262260533f1498aca99cd4753817560e6e7879c3e8036a531bb9418e270e926515d147f8e49eec81f1c7bb3658b5f5b9ced16b8ba SHA512 1812732a3326f1454652589d4d1c717ef8868b1e0af7e85196f3814e5943ae8398f2f52aa789360539c558cd5299672007dbdc28df77928c4f4cf4d1cbed87b6
 EBUILD keyring-21.8.0.ebuild 1172 BLAKE2B d2151e7d29443366931f0e71f9bf08b1deab55eb592657e66b77278c5e9ba1be749780e6cedc9144be6e1e108b11105ac3f8f00c80e6d6080579382135973792 SHA512 69026bca0ad861e49726e4cde2497fabb8421326ce7b9b1b250e413a55305a794fc2ddf0abee91ce6f1a0f6358db5e5770a0d77d002ddff605644bd7bea3c77b
+EBUILD keyring-22.0.0.ebuild 1090 BLAKE2B 54a6e182eddf3b5b7e8498fae18dcdec0e560331a25cae865422db5a07c233726953eeab324d954ce3ca5c644a2fa2beecfb9576ed914fb7c78a0a0526c6ca51 SHA512 70605a3652eb2eb753d71a46a98cbc422ff456c58e57e70b42bcd0358f76eb2d0b7f1ef8cd0dd2abed4af703eebec0d094d7334a4d282c0c037bdc8203d834c7
+EBUILD keyring-22.0.1.ebuild 1090 BLAKE2B 54a6e182eddf3b5b7e8498fae18dcdec0e560331a25cae865422db5a07c233726953eeab324d954ce3ca5c644a2fa2beecfb9576ed914fb7c78a0a0526c6ca51 SHA512 70605a3652eb2eb753d71a46a98cbc422ff456c58e57e70b42bcd0358f76eb2d0b7f1ef8cd0dd2abed4af703eebec0d094d7334a4d282c0c037bdc8203d834c7
 MISC metadata.xml 610 BLAKE2B abd4cf8986ea009081e0e21d31b8bbdbe7b2e99fb332bda41d666c97feda8974cabcabdf6d88e4d8d9a2b9aefd250ad06bfcdd8888513cc0a10cdbda9c93c981 SHA512 931f5d607bc5d9caf329f0b7a010ee055f3c962e67e61c8f4e7458f5325a89bd91678c215fbdd63160eb2d7f34ce58b0a30b144e4159fb426c243efa1dc12d05
diff --git a/dev-python/keyring/keyring-21.7.0.ebuild b/dev-python/keyring/keyring-21.7.0.ebuild
index e2a8239584f5..891ec2d70560 100644
--- a/dev-python/keyring/keyring-21.7.0.ebuild
+++ b/dev-python/keyring/keyring-21.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/keyring/keyring-21.5.0.ebuild b/dev-python/keyring/keyring-22.0.0.ebuild
index 1c9e6512b951..d62127ef81b5 100644
--- a/dev-python/keyring/keyring-21.5.0.ebuild
+++ b/dev-python/keyring/keyring-22.0.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( pypy3 python3_{6..9} )
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
 
 inherit distutils-r1
 
@@ -14,8 +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 ~x64-macos"
-IUSE="doc"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/secretstorage[${PYTHON_USEDEP}]
@@ -23,7 +22,7 @@ RDEPEND="
 	dev-python/jeepney[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
 		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' pypy3 python3_{5,6,7})
+	' pypy3 python3_7)
 "
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
@@ -36,7 +35,6 @@ distutils_enable_sphinx docs \
 	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
diff --git a/dev-python/keyring/keyring-22.0.1.ebuild b/dev-python/keyring/keyring-22.0.1.ebuild
new file mode 100644
index 000000000000..d62127ef81b5
--- /dev/null
+++ b/dev-python/keyring/keyring-22.0.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( pypy3 python3_{7..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 ~x64-macos"
+
+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_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() {
+	rm tests/backends/test_kwallet.py || die
+
+	distutils-r1_python_prepare_all
+
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}