Adding metadata

20 files changed, 225 insertions, 60 deletions

diff --git a/dev-python/cx_Freeze/cx_Freeze-6.8.2.ebuild b/dev-python/cx_Freeze/cx_Freeze-6.8.2.ebuild
index f4c518e9129b..ce811954548c 100644
--- a/dev-python/cx_Freeze/cx_Freeze-6.8.2.ebuild
+++ b/dev-python/cx_Freeze/cx_Freeze-6.8.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="PYTHON"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/importlib_metadata[${PYTHON_USEDEP}]
diff --git a/dev-python/google-auth/google-auth-2.3.3.ebuild b/dev-python/google-auth/google-auth-2.3.3.ebuild
index 239b4bb07e62..6ee65cde4278 100644
--- a/dev-python/google-auth/google-auth-2.3.3.ebuild
+++ b/dev-python/google-auth/google-auth-2.3.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/gssapi/gssapi-1.7.2.ebuild b/dev-python/gssapi/gssapi-1.7.2.ebuild
index 61892c644001..4dc3125762ad 100644
--- a/dev-python/gssapi/gssapi-1.7.2.ebuild
+++ b/dev-python/gssapi/gssapi-1.7.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 
 RDEPEND="
 	dev-python/decorator[${PYTHON_USEDEP}]
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 4554d82117a3..67f9c28bcd18 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -6,3 +6,4 @@ DIST hypothesis-python-6.25.0.tar.gz 9170363 BLAKE2B 505aebee64882de9516a653d790
 DIST hypothesis-python-6.27.0.tar.gz 9172229 BLAKE2B e5d69923579877a4abaa740663a36510452e10cb782c1c239db03ae22bad9898ba881d808d33ecedaf9319130e619ccadfe87ad9719b1fb05bbcbcd9683d8bba SHA512 54083e0fff2e1af8d3cd91b0e059565091e63058029a501a098228a5b1a411fe652ac542e847c0b03407f9b3f27ca5358b43b15740d6e9e0c882c94ef9e48bad
 DIST hypothesis-python-6.27.1.tar.gz 9173425 BLAKE2B 0fa35a863cbddb9bdd592622247abe7a9bdfc6e4624d1a0913b58a47c29d4c507a1aee8f29f9b6080628894a41140801f567bd5b5f1e83b5505b33089992e10b SHA512 3e2f1d4d268f998ccb6bf3784844d82ff3f276074b13c82fabf87a98441764dcbab576348e77ef4c71cd5f6839f92f978e52571f7e290efc680df984eb2ddebe
 DIST hypothesis-python-6.27.2.tar.gz 9173689 BLAKE2B 1f3aced11713f272158f8990090ee27cd44f585849ddfb416d636b6390335c717c98a7b1f5060f38118498d08faed00f25e7e51f42eea2efc902720db2b2513e SHA512 eed1f15b8cc739e2c02e234090f937cc8a4ffddf4d44ec4ce1bdf3759cdc12d47c358e29b401f262cd2ffc25485a1db7ff4265870f588282939546300a272426
+DIST hypothesis-python-6.27.3.tar.gz 9173846 BLAKE2B d8ba0509ff182cf25b8fbb8c5ade3c3d88fe54fb90203d41db68c1462903623d8ec4817d615cb42ec03948f5bc581a97902a55e73ac427416ac51a7bd067f560 SHA512 497b7e70aa29088dfe7c20be501c537201613813f6c74aec4723a87846ef38494026cb2ad79eb930b1a17b33b65eaf9dfce1411be8a58bc322d6f61f4d62b2f7
diff --git a/dev-python/hypothesis/hypothesis-6.27.3.ebuild b/dev-python/hypothesis/hypothesis-6.27.3.ebuild
new file mode 100644
index 000000000000..8b48444a4699
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.27.3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
+SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' python3_{7..9})
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+distutils_enable_tests --install pytest
+
+python_prepare() {
+	if ! use cli || ! has "${EPYTHON}" python3.{7..9}; then
+		sed -i -e '/console_scripts/d' setup.py || die
+	fi
+}
+
+python_test() {
+	distutils_install_for_testing
+	epytest tests/cover tests/pytest tests/quality \
+		-p no:pytest-describe \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/jellyfish/jellyfish-0.8.9.ebuild b/dev-python/jellyfish/jellyfish-0.8.9.ebuild
index 26c722411624..d0eae3c81277 100644
--- a/dev-python/jellyfish/jellyfish-0.8.9.ebuild
+++ b/dev-python/jellyfish/jellyfish-0.8.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/k5test/k5test-0.10.1.ebuild b/dev-python/k5test/k5test-0.10.1.ebuild
index 84386c1aa42e..18c378cb325e 100644
--- a/dev-python/k5test/k5test-0.10.1.ebuild
+++ b/dev-python/k5test/k5test-0.10.1.ebuild
@@ -12,4 +12,4 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
diff --git a/dev-python/krb5/krb5-0.2.0.ebuild b/dev-python/krb5/krb5-0.2.0.ebuild
index 3ed0cfb60d49..52ae46a20a82 100644
--- a/dev-python/krb5/krb5-0.2.0.ebuild
+++ b/dev-python/krb5/krb5-0.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 
 RDEPEND="
 	virtual/krb5
diff --git a/dev-python/pip/pip-21.3.1-r1.ebuild b/dev-python/pip/pip-21.3.1-r1.ebuild
index 71460f35227f..ce3d1f47fd62 100644
--- a/dev-python/pip/pip-21.3.1-r1.ebuild
+++ b/dev-python/pip/pip-21.3.1-r1.ebuild
@@ -32,7 +32,7 @@ SRC_URI="
 "
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 SLOT="0"
 IUSE="test vanilla"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pip/pip-21.3.1.ebuild b/dev-python/pip/pip-21.3.1.ebuild
index 1be1494ac910..0e34e53192b5 100644
--- a/dev-python/pip/pip-21.3.1.ebuild
+++ b/dev-python/pip/pip-21.3.1.ebuild
@@ -56,6 +56,7 @@ BDEPEND="
 python_prepare_all() {
 	local PATCHES=(
 		"${FILESDIR}/${PN}-21.3-no-coverage.patch"
+		"${FILESDIR}/${P}-cryptography-tests.patch"
 	)
 	if ! use vanilla; then
 		PATCHES+=( "${FILESDIR}/pip-20.0.2-disable-system-install.patch" )
@@ -76,7 +77,7 @@ python_test() {
 		return 0
 	fi
 
-	local deselect=(
+	local EPYTEST_DESELECT=(
 		tests/functional/test_install.py::test_double_install_fail
 		tests/functional/test_list.py::test_multiple_exclude_and_normalization
 		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-download]'
@@ -96,12 +97,21 @@ python_test() {
 		tests/functional/test_pep660.py
 	)
 
-	[[ ${EPYTHON} == python3.10 ]] && deselect+=(
+	[[ ${EPYTHON} == python3.10 ]] && EPYTEST_DESELECT+=(
 		tests/lib/test_lib.py::test_correct_pip_version
 		# uses vendored packaging that uses deprecated distutils
 		tests/functional/test_warning.py::test_pip_works_with_warnings_as_errors
 	)
 
+	if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			tests/functional/test_install.py::test_install_sends_client_cert
+			tests/functional/test_install_config.py::test_do_not_prompt_for_authentication
+			tests/functional/test_install_config.py::test_prompt_for_authentication
+			tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed
+		)
+	fi
+
 	distutils_install_for_testing
 	pushd "${WORKDIR}/virtualenv-${VENV_PV}" >/dev/null || die
 	distutils_install_for_testing
@@ -110,7 +120,7 @@ python_test() {
 	local -x GENTOO_PIP_TESTING=1 \
 		PATH="${TEST_DIR}/scripts:${PATH}" \
 		PYTHONPATH="${TEST_DIR}/lib:${BUILD_DIR}/lib"
-	epytest ${deselect[@]/#/--deselect } -m "not network"
+	epytest -m "not network"
 }
 
 python_install_all() {
diff --git a/dev-python/pyspnego/pyspnego-0.3.1.ebuild b/dev-python/pyspnego/pyspnego-0.3.1.ebuild
index 37a7ee2a2084..80fb8746c0b4 100644
--- a/dev-python/pyspnego/pyspnego-0.3.1.ebuild
+++ b/dev-python/pyspnego/pyspnego-0.3.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/python-lsp-server/Manifest b/dev-python/python-lsp-server/Manifest
index 1df65b66f4ef..d7d9f7e98f31 100644
--- a/dev-python/python-lsp-server/Manifest
+++ b/dev-python/python-lsp-server/Manifest
@@ -1,2 +1,3 @@
 DIST python-lsp-server-1.2.4.tar.gz 62073 BLAKE2B b1426d71a4da5ac29fa6b3e956010625d594eee7924a51eb5074933866254189a9738895bc5dd4aae8acc1733b9f162b73646d9a3eee3ac17a587456f2da00e4 SHA512 862d59426c6e7c19f9d3d2766ec5f9ec818d29988ee72cde9553e4b1725fbbe4230ed2f6d7e8d08983c9ef1ced8d5afe42d6751ea529d3d8799c8930b1e10a26
 DIST python-lsp-server-1.3.1.tar.gz 62464 BLAKE2B 89bcd96aab49c1819df29f5535d527669ce6a1face08647247fb9fe3700882b95afb4c32e8c5b6cab81148476b71b5645a6290a2ab2252fdeb93691430dd7b4b SHA512 45327254b0826d2883d0838734eb97a53fb4c6f61fe72c397de903107dbb852834a4c363aa34189a06a5f40cadb3644cb940fd69c969210c287cd3c21b81283c
+DIST python-lsp-server-1.3.2.tar.gz 62480 BLAKE2B 309b36190b3924846d919182fe971a9f201f4f7f788dee814faa2748d4d04ac15e2eabc5a7102afb0e728bd5a9b343859b5c0634999a8233fa17c906536a6e89 SHA512 9d918787648849cad54e7253f69c87aa82418c592a66e2929f678b5f8e127b52ccb4591dc83467158f776afa0f7fd9ccd3eaf6be3f6663ef434153cc66276179
diff --git a/dev-python/python-lsp-server/python-lsp-server-1.3.2.ebuild b/dev-python/python-lsp-server/python-lsp-server-1.3.2.ebuild
new file mode 100644
index 000000000000..f66537ca1b97
--- /dev/null
+++ b/dev-python/python-lsp-server/python-lsp-server-1.3.2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python Language Server for the Language Server Protocol"
+HOMEPAGE="https://github.com/python-lsp/python-lsp-server"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+IUSE="all-plugins"
+
+BDEPEND="
+	test? (
+		>=dev-python/autopep8-1.6.0[${PYTHON_USEDEP}]
+		<dev-python/autopep8-1.7.0[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		>=dev-python/flake8-4.0.0[${PYTHON_USEDEP}]
+		<dev-python/flake8-4.1.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
+		<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		>=dev-python/pycodestyle-2.8.0[${PYTHON_USEDEP}]
+		<dev-python/pycodestyle-2.9.0[${PYTHON_USEDEP}]
+		>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
+		<dev-python/pyflakes-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
+		dev-python/QtPy[gui,testlib,${PYTHON_USEDEP}]
+		>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
+		dev-python/yapf[${PYTHON_USEDEP}]
+	)"
+
+RDEPEND="
+	>=dev-python/jedi-0.17.2[${PYTHON_USEDEP}]
+	<dev-python/jedi-0.19.0[${PYTHON_USEDEP}]
+	>=dev-python/python-lsp-jsonrpc-1.0.0[${PYTHON_USEDEP}]
+	dev-python/pluggy[${PYTHON_USEDEP}]
+	all-plugins? (
+		>=dev-python/autopep8-1.6.0[${PYTHON_USEDEP}]
+		<dev-python/autopep8-1.7.0[${PYTHON_USEDEP}]
+		>=dev-python/flake8-4.0.0[${PYTHON_USEDEP}]
+		<dev-python/flake8-4.1.0[${PYTHON_USEDEP}]
+		>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
+		<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
+		>=dev-python/pycodestyle-2.8.0[${PYTHON_USEDEP}]
+		<dev-python/pycodestyle-2.9.0[${PYTHON_USEDEP}]
+		>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
+		<dev-python/pyflakes-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
+		dev-python/yapf[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# remove pytest-cov dep
+	sed -i -e '0,/addopts/I!d' setup.cfg || die
+
+	# This fails with py3.10, but it is not important. Instead of
+	# 'invalid syntax' we now get 'syntax-error'
+	sed -i -e 's/test_syntax_error_pylint_py3/_&/' \
+		test/plugins/test_pylint_lint.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+pkg_postinst() {
+	optfeature "Automatically formats Python code to conform to the PEP 8 style guide" dev-python/autopep8
+	optfeature "A wrapper around PyFlakes, pep8 & mccabe" dev-python/flake8
+	optfeature "flake8 plugin: McCabe complexity checker" dev-python/mccabe
+	optfeature "Python style guide checker (fka pep8)" dev-python/pycodestyle
+	optfeature "Python docstring style checker" dev-python/pydocstyle
+	optfeature "Passive checker for Python programs" dev-python/pyflakes
+	optfeature "Python code static checker" dev-python/pylint
+	optfeature "Python refactoring library" dev-python/rope
+	optfeature "A formatter for Python files" dev-python/yapf
+}
diff --git a/dev-python/regex/regex-2021.11.10.ebuild b/dev-python/regex/regex-2021.11.10.ebuild
index b3ed7f47123f..6d59b40bf9b5 100644
--- a/dev-python/regex/regex-2021.11.10.ebuild
+++ b/dev-python/regex/regex-2021.11.10.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="doc"
 
 PATCHES=(
diff --git a/dev-python/requests-credssp/Manifest b/dev-python/requests-credssp/Manifest
index ca9270fbf0a4..05c5d94c1dc9 100644
--- a/dev-python/requests-credssp/Manifest
+++ b/dev-python/requests-credssp/Manifest
@@ -1 +1 @@
-DIST requests-credssp-1.2.0.gh.tar.gz 23310 BLAKE2B 647dff76fbb47b9b972f403a9fb2a10ffab5e1915e32977e65b5f5c1cb206ec1b9fa884e12d687761087b2f7f4cb9e8bde631b68140cc50dbd9561a4999bdf55 SHA512 55458773cbf14a468d22d0b04186611385ff24fceda85052e69981bd6d4fd32a46f96b95fa36724b72fd9719485b2ed8906d1927284157e7bc685c0c42c2312c
+DIST requests-credssp-1.3.0.tar.gz 23666 BLAKE2B 3ab7db4c06a65483b26012b282a85174a50c9e9449fc33b90a22f7963bcd33c2b4642ce83f0632383e8c1fbc8dd4761fc00bc6d1adccb5cee020f0d67971f225 SHA512 6281ecd5d7e14792bd175603dfbb95237b990d5cad6e4c7252fd503b76c579590217194ecd3eb3120cb33cc4f2958be459e63fa3fa8d7411a8aa40d1666276b7
diff --git a/dev-python/requests-credssp/requests-credssp-1.2.0.ebuild b/dev-python/requests-credssp/requests-credssp-1.2.0.ebuild
deleted file mode 100644
index aeca524fcc72..000000000000
--- a/dev-python/requests-credssp/requests-credssp-1.2.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="HTTPS CredSSP authentication with the requests library"
-HOMEPAGE="https://pypi.org/project/requests-credssp/"
-# .gh for tests in github tarball, drop ".gh" on next bump
-SRC_URI="https://github.com/jborean93/requests-credssp/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-# Needs unpackaged pyspnego (https://github.com/jborean93/pyspnego)
-RESTRICT="test"
-
-RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/ntlm-auth[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-#distutils_enable_tests pytest
diff --git a/dev-python/requests-credssp/requests-credssp-1.3.0.ebuild b/dev-python/requests-credssp/requests-credssp-1.3.0.ebuild
new file mode 100644
index 000000000000..f59395e16584
--- /dev/null
+++ b/dev-python/requests-credssp/requests-credssp-1.3.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="HTTPS CredSSP authentication with the requests library"
+HOMEPAGE="https://pypi.org/project/requests-credssp/ https://github.com/jborean93/requests-credssp"
+SRC_URI="https://github.com/jborean93/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
+	dev-python/pyspnego[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/requests/files/requests-2.26.0-trustme-dep.patch b/dev-python/requests/files/requests-2.26.0-trustme-dep.patch
index b3a81659a9be..5542bb68da90 100644
--- a/dev-python/requests/files/requests-2.26.0-trustme-dep.patch
+++ b/dev-python/requests/files/requests-2.26.0-trustme-dep.patch
@@ -1,22 +1,20 @@
-From 6a1b5cbc124e0c3362ddefae5939db5c216a74db Mon Sep 17 00:00:00 2001
+From 55da533a87afe188282b7f8dfbadeb30c21743d8 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
 Date: Sat, 27 Nov 2021 10:33:35 +0100
-Subject: [PATCH] Skip the test requiring trustme when it is not available
+Subject: [PATCH] Defer the trustme import until inside the fixture
 
-Modify the nosan_server fixture to cause test_https_warnings to be
-skipped when trustme is not installed on the system, rather than causing
-the whole test suite to fail unconditionally.  This makes it possible
-to run all the remaining tests on systems where trustme cannot be
-installed due to its dependencies.
+Move the trustme import from global scope into the nosan_server fixture
+in order to make it possible to deselect the test via command-line
+when trustme is not available.
 ---
- tests/conftest.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ tests/conftest.py | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/tests/conftest.py b/tests/conftest.py
-index 099462cf..5d38f254 100644
+index 099462cf52..4f9b2641b4 100644
 --- a/tests/conftest.py
 +++ b/tests/conftest.py
-@@ -13,7 +13,6 @@ import threading
+@@ -13,7 +13,6 @@
  
  import pytest
  from requests.compat import urljoin
@@ -24,14 +22,14 @@ index 099462cf..5d38f254 100644
  
  
  def prepare_url(value):
-@@ -38,6 +37,7 @@ def httpbin_secure(httpbin_secure):
+@@ -38,6 +37,10 @@ def httpbin_secure(httpbin_secure):
  
  @pytest.fixture
  def nosan_server(tmp_path_factory):
-+    trustme = pytest.importorskip('trustme')
++    # delay importing until the fixture in order to make it possible
++    # to deselect the test via command-line when trustme is not available
++    import trustme
++
      tmpdir = tmp_path_factory.mktemp("certs")
      ca = trustme.CA()
      # only commonName, no subjectAltName
--- 
-2.34.1
-
diff --git a/dev-python/requests/requests-2.26.0.ebuild b/dev-python/requests/requests-2.26.0.ebuild
index 6d1aef856567..f001a52a318b 100644
--- a/dev-python/requests/requests-2.26.0.ebuild
+++ b/dev-python/requests/requests-2.26.0.ebuild
@@ -44,17 +44,23 @@ PATCHES=(
 
 python_test() {
 	local EPYTEST_DESELECT=(
-		# Internet
+		# Internet (doctests)
 		requests/__init__.py::requests
 		requests/api.py::requests.api.request
 		requests/models.py::requests.models.PreparedRequest
 		requests/sessions.py::requests.sessions.Session
-		tests/test_requests.py::TestRequests::test_https_warnings
+		# require IPv4 interface in 10.* range
 		tests/test_requests.py::TestTimeout::test_connect_timeout
 		tests/test_requests.py::TestTimeout::test_total_timeout_connect
 		# TODO: openssl?
 		tests/test_requests.py::TestRequests::test_pyopenssl_redirect
 	)
 
+	if ! has_version "dev-python/trustme[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			tests/test_requests.py::TestRequests::test_https_warnings
+		)
+	fi
+
 	epytest
 }
diff --git a/dev-python/tomli-w/tomli-w-0.4.0.ebuild b/dev-python/tomli-w/tomli-w-0.4.0.ebuild
index 7765cc3e016c..645996965879 100644
--- a/dev-python/tomli-w/tomli-w-0.4.0.ebuild
+++ b/dev-python/tomli-w/tomli-w-0.4.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 BDEPEND="
 	test? ( dev-python/tomli[${PYTHON_USEDEP}] )"