gentoo auto-resync : 03:03:2023 - 19:35:31

3 files changed, 2 insertions, 142 deletions

diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index 7873a7e18334..3bbe2aaa026d 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -2,11 +2,9 @@ AUX pip-20.0.2-disable-system-install.patch 1298 BLAKE2B a384ee2114e59b8bc719fc1
 AUX pip-22.2.1-no-coverage.patch 1805 BLAKE2B 790a6736194d3ad7cadbb7965978f19c251a65b98b67c64726072f2baa24831f3e3788fdba560c247cde948183c6589b6edf18d5861468801e5729ba53c42995 SHA512 5fd775c0a1cb0f88c6c632a90294f11788916371b7d4bb8b378ed1530b461a9788f289a06d6619e66fcb45dd08a7063a749a608c5f12a778db84dfcbb5e79cba
 DIST pip-22.3.1.gh.tar.gz 9326504 BLAKE2B b125599a9f77e49414dae13ca3fe0ac27c9b7e127f6ca7f467f3af4e0b51d835f2790f8311b2ec616966c299fb431403b456f7b38ea1f3fe1e7f769f7d5a78e5 SHA512 c7865c4ce79b0fea7ba469fe593af3be205b3bdb574a6ae019842e0f82a0af406ec905d8c6ff02fbbafe01630c8899a398d071ce74501ca830249160f2f6df98
 DIST pip-23.0.1.gh.tar.gz 9336422 BLAKE2B 1781b0340ba7f76299fa8e37f0509f15a08cc599d196c74b90a2cb79321de570240ed9f12bc64d45ede2182ec8a3eead44ce1b840eaa83931d089ecc07923203 SHA512 ed14ce37293e749b4fd93d7f93d81356c77428b1fb14dfd760b59aea720ebb3cce5a49c2d32ab600e73b37389937830ff4dee04750e83078c8ab9d57513f294c
-DIST pip-23.0.gh.tar.gz 9336486 BLAKE2B 693623292e498ec939ce931063bccc8079fc313a0a9f30d406a99a2084fcd84b5b5a17566602c53bb96090920bc2d0615f28b8f9c165022c2b0de62fa9355b21 SHA512 9b791ed15b4e5dd768351043929dc6ee18eeab251a26fb2b0d712dec578101f1620a13d5914d44f2761ecb95e64bc47e6b07096126404ca70345268028524d43
 DIST setuptools-62.3.2-py3-none-any.whl 1225929 BLAKE2B 608952e201f749ebf557e3962ba9856d5bdcbc534f3a25598cab0d6c53282cfb3b9f007ba135497a8addf49db4c02bc4387c486d95a4529d01ce4114154ec28a SHA512 366d69dc44e326dd7549cdacd8dec481a14dce4feef4338adc38b9de5c4c338f04d61696e13ce8603be1315f2e8734100f92d3fe4b4b11843e19f550c9631978
 DIST virtualenv-16.7.12.gh.tar.gz 8906590 BLAKE2B a1f206769e4e5797562906162e492e44c4a72720e4f88a0362dc802ce2df20c65aaab6a72dce2238445601a10fae59bd90cd362217994d30911f105afd71c5fa SHA512 0278b33fb19f6553e70ad3dcffa6ea1a455ff435b216ac9b4fadff216b2932714faa2bb6027af3058010111d8511a5c2fcd424f31c9645be361603971f111c8e
 DIST wheel-0.36.2-py2.py3-none-any.whl 35046 BLAKE2B bc4e8dab7c74eea34d3b4a813b7eaf6295a99a396a861b6cdd76f743043e89140bad132bdd13e385e8945ce02e0798e1d3ac73fc1b23bde5b2a83e4bb4dd5cdc SHA512 6bb5119b4d3704fe1e3c1eaaa3124edab13f61b46f8a0a8e75974fac4e5b25d8b53606071a03a8d8990ad1cfe2ab247ddea260098df2c0c35ae965be47080284
 EBUILD pip-22.3.1.ebuild 4655 BLAKE2B e2af91203b0d626a9bfb773b564af43a0e07fd36fa724fe246979c40cbb580ac44534f2a3654c1d212fb15ac028d30ab339686b13715d4cc083c4e0090781fdb SHA512 df4a0c3a9b05c652d4db895e7f2ef4ec982f4eea972e2a999fab74885236da4d35ae0807ac2c5bf3ca757f6be9a157f2d7e0129460c2db2953a80797dbd6692a
-EBUILD pip-23.0.1.ebuild 3752 BLAKE2B c83e186e2bc8f0e1d7f2b150ccb3029dc7e104712ea16a081803e718d8a2eadf601bddf6ccea6ce49d61c6ae02bf6dc740cf82e8a80bfd41190215d42168a72e SHA512 508eb95e06c01f5bccc4080aa52e85ce8d05ad53f68d25a21e6da4cc6a0ef985c6715c82f8176b2f0c07023b5d0d281b7afffa1188a04da57070025a18488302
-EBUILD pip-23.0.ebuild 4666 BLAKE2B 4eac229f22d51c20bfaa6eb5790994c1dddd15607c88169f9709c8701f20aef659a2e5a4eeda8ad642275e6c3e7996e2041b1a3fdd63832359ed0a0622173efd SHA512 673a27e7412afc8a09579d951c2ba29b731a7b378aa228c8b1adcced159a95ba6d95c6adec234cd8ea1b8574c3fe10b88b98961b65074655a6cc69d5a7fc1d1a
+EBUILD pip-23.0.1.ebuild 3744 BLAKE2B d54e44704f9dd800dadde07e339de1def2c19df298e537c654dc9747197afaccedff9d108c5959063561ef0529f004798c082e2560a720a9031a0b37e16fb32f SHA512 4c1dbe72bc1fd19ece2a8e9411b3701a6d2174298fd4068cbdd90e641ea7e984f40f38ba9db3d3ecf5f90d9c8c3ce8d4370bd599d3c6556a5d760be5823ea848
 MISC metadata.xml 392 BLAKE2B 94ea3de1220cb9ca64ae1186597789cc83a54adfe44695932c07dd5065df0e5f9ee5078a495e3a12563b36809d781d8ab86bb6c92c485c023199d92547b74f27 SHA512 603199f6547105f3bb64f4fcaf004e9ef62fa2e0f8ec6eab56078119684b0f5119161e0f164fe02b2cf6dd6b115588c9ef77d727eeb6d138e281f1cb0bcb5de9
diff --git a/dev-python/pip/pip-23.0.1.ebuild b/dev-python/pip/pip-23.0.1.ebuild
index 5ee61a89133b..cc7c86dab278 100644
--- a/dev-python/pip/pip-23.0.1.ebuild
+++ b/dev-python/pip/pip-23.0.1.ebuild
@@ -25,7 +25,7 @@ SRC_URI="
 LICENSE="MIT"
 # bundled deps
 LICENSE+=" Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MPL-2.0 PSF-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 SLOT="0"
 IUSE="test-rust"
 
diff --git a/dev-python/pip/pip-23.0.ebuild b/dev-python/pip/pip-23.0.ebuild
deleted file mode 100644
index b10d49be6de2..000000000000
--- a/dev-python/pip/pip-23.0.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# please bump dev-python/ensurepip-wheels along with this package!
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_TESTED=( python3_{9..10} )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_11 pypy3 )
-PYTHON_REQ_USE="ssl(+),threads(+)"
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-# setuptools & wheel .whl files are required for testing,
-# the exact version is not very important.
-SETUPTOOLS_WHL="setuptools-62.3.2-py3-none-any.whl"
-WHEEL_WHL="wheel-0.36.2-py2.py3-none-any.whl"
-# upstream still requires virtualenv-16 for testing, we are now fetching
-# it directly to avoid blockers with virtualenv-20
-VENV_PV=16.7.12
-
-DESCRIPTION="The PyPA recommended tool for installing Python packages"
-HOMEPAGE="
-	https://pip.pypa.io/en/stable/
-	https://pypi.org/project/pip/
-	https://github.com/pypa/pip/
-"
-SRC_URI="
-	https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
-	test? (
-		https://files.pythonhosted.org/packages/py3/s/setuptools/${SETUPTOOLS_WHL}
-		https://files.pythonhosted.org/packages/py2.py3/w/wheel/${WHEEL_WHL}
-		https://github.com/pypa/virtualenv/archive/${VENV_PV}.tar.gz
-			-> virtualenv-${VENV_PV}.gh.tar.gz
-	)
-"
-
-LICENSE="MIT"
-# bundled deps
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MPL-2.0 PSF-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-SLOT="0"
-IUSE="test-rust"
-
-RDEPEND="
-	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/freezegun[${PYTHON_USEDEP}]
-			dev-python/pretend[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			dev-python/scripttest[${PYTHON_USEDEP}]
-			dev-python/tomli-w[${PYTHON_USEDEP}]
-			dev-python/werkzeug[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-			test-rust? (
-				dev-python/cryptography[${PYTHON_USEDEP}]
-			)
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/pip-22.2.1-no-coverage.patch"
-	)
-
-	distutils-r1_python_prepare_all
-
-	if use test; then
-		mkdir tests/data/common_wheels/ || die
-		cp "${DISTDIR}"/{${SETUPTOOLS_WHL},${WHEEL_WHL}} \
-			tests/data/common_wheels/ || die
-	fi
-}
-
-python_compile_all() {
-	# 'pip completion' command embeds full $0 into completion script, which confuses
-	# 'complete' and causes QA warning when running as "${PYTHON} -m pip".
-	# This trick sets correct $0 while still calling just installed pip.
-	local pipcmd='import sys; sys.argv[0] = "pip"; __file__ = ""; from pip._internal.cli.main import main; sys.exit(main())'
-	"${EPYTHON}" -c "${pipcmd}" completion --bash > completion.bash || die
-	"${EPYTHON}" -c "${pipcmd}" completion --zsh > completion.zsh || die
-}
-
-python_test() {
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		einfo "Skipping tests on ${EPYTHON} since virtualenv-16 is broken"
-		return 0
-	fi
-
-	local EPYTEST_DESELECT=(
-		tests/functional/test_inspect.py::test_inspect_basic
-		tests/functional/test_install.py::test_double_install_fail
-		tests/functional/test_list.py::test_multiple_exclude_and_normalization
-		# Internet
-		tests/functional/test_install.py::test_install_dry_run
-		tests/functional/test_install.py::test_install_editable_with_prefix_setup_cfg
-		tests/functional/test_install.py::test_editable_install__local_dir_no_setup_py_with_pyproject
-		tests/functional/test_install.py::test_editable_install__local_dir_setup_requires_with_pyproject
-		tests/functional/test_install.py::test_install_8559_wheel_package_present
-		# git: fatal: transport 'file' not allowed
-		tests/functional/test_install_vcs_git.py::test_check_submodule_addition
-		# TODO
-		tests/unit/test_network_auth.py::test_keyring_cli_get_password
-		tests/unit/test_network_auth.py::test_keyring_cli_set_password
-	)
-
-	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
-
-	local -x PYTHONPATH="${WORKDIR}/virtualenv-${VENV_PV}"
-	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
-	local -x PIP_DISABLE_PIP_VERSION_CHECK=1
-	epytest -m "not network" -n "$(makeopts_jobs)"
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS.txt docs/html/**/*.rst )
-	distutils-r1_python_install_all
-
-	newbashcomp completion.bash pip
-
-	insinto /usr/share/zsh/site-functions
-	newins completion.zsh _pip
-}