gentoo Easter resync : 12.04.2020

5 files changed, 6 insertions, 125 deletions

diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index a6911d513ceb..972fb048f0eb 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -12,8 +12,7 @@ DIST setuptools-41.4.0-py2.py3-none-any.whl 580302 BLAKE2B 58dc2d48445406f7467bf
 DIST setuptools-44.0.0-py2.py3-none-any.whl 583230 BLAKE2B 823e6792471660f247e30a938aa869d345a63db7294e5f9b4bd88f15a7694779011d29740fe317149620985f705fc6e18cbb07a18e5680cc11d7c229ffbc74f6 SHA512 7006fd303181afbeeec0e30cafb9fd1e4d3c6f55cfdd6343fedbc32b17dbb96b3d96ae37f4db27bfb168738727474cf425904ec280ff1d2b789fc48077a8fa84
 DIST wheel-0.33.6-py2.py3-none-any.whl 21556 BLAKE2B 6b6124c1e8e70592399a90c88b2a70efc5885bad81d2ff07a2e243eee008ba5cb0c927454036915a61e97489e29fe1abc4ba2e63d7eadf1a8985c8a8b7cdf4c4 SHA512 4663cd55ee9d3de138216bb06870606b546b19cb6a733f1beab211c0ba72e63d849c422d320ddc8aa8275ad04a30119a84c1351e589150cd18c2a34f9fdb224a
 DIST wheel-0.34.2-py2.py3-none-any.whl 26502 BLAKE2B 3a1bd4571c582245b60ff33c9bf74ff8a2ebafb26e56fc7b9bd215058d059b6bd13bbe21ce46002af257813a54126f27e19253f211e21c4548c7cf84cd15caf7 SHA512 4f1a44f4691ed8baad777d7874f7f4da96a5019eb485fd3a9eed9259aa2a9d5acccc6dc63a72128664347c64ee039a6076c6ca9c3b75a1f94457967864e522ed
-EBUILD pip-19.3.1-r1.ebuild 3952 BLAKE2B 47558ece06c8b19b245eda03d1f4715d69897c245f492bbf7256237d965eed978919b4373bd9bdafb713305528356a7c178b605ed9db5273577b1485dc436bfd SHA512 3d7d4399a939e2379ddf016ae2e0cd28226272edc86b8e1faee88860b21d32b0a50dc3b3738a3eb52491e32bdac2584b1ed97076740b5f59bd491a0699827a19
-EBUILD pip-19.3.1-r2.ebuild 3916 BLAKE2B 0b5663135d0c61e1fba71bff7de5e6b9e74a989f674d1cc1dc418a20631bd0d72680e9360470257b1205100a6ccf7c8f876e236327f591ba1614dc237fbe530f SHA512 f30cb585dad403eea8cee9d17f4b602ab34bf582762ec086fdfd0f93f7c0314421df62336112f42d42528be8072e2cb798cd5e5d1c8c8a6b03fc160ba69d1a5b
-EBUILD pip-20.0.2.ebuild 3957 BLAKE2B 6eeb001d9789afc065e86d13306a7c3674dfee90f4b6a4927f26c1fef7369b34f58cd1489d19b1e74c8db1c7146e6572c262071b5fe86cf2dfe892ffaa901cc9 SHA512 2dc0f239b7384054655adfcea9a081bf67867e79cdd9e3bf4090a59b5088fce04b653c312396e37da48763f08a2ca8eb1d9347bdc1a2f6e31966d8c71f7793df
-EBUILD pip-9.0.1-r2.ebuild 2455 BLAKE2B b891741da8946986a3140e1023ec956358d70b1fbabc70964ae2edf596ed96d0fa80b62732da6193ba6a9e45c81ce239058dc4054cff59b3c749d309cda3f85a SHA512 727ebc793313293384c9fcc32e403fd5dbab8ac72528fe0bb96b2011ecf9e8b659f6b4fa0b5165b97d68ef33627b0c0233ce88b955fd962b794d10c613659a45
+EBUILD pip-19.3.1-r2.ebuild 3915 BLAKE2B 62b2cac9e9c63dadf2ed8210cb975f0b39d5a7b1afa21a613d30f372638e399dedd9cc7a088bea650ca0f1a66388097b1566126501614e9d096724769da541d9 SHA512 2d23168da12f9488b7f7716f00ba85c0e6c8831d81dfaa6791f633f9470fbb6836d5836b7fba78b3902daa22c65330ed4b0c7b721a44faf4c3bed9ebf8441389
+EBUILD pip-20.0.2.ebuild 3964 BLAKE2B 29d89ae4ca9a407f23f69f5ec1d4afcf3f98bf2f6fa3dc628f7a88058300dabc90b5e641a4a3dc3ca51023cb03fdd543099e09b560d7dd322ca3ebfcb7d63c6b SHA512 6e959154d9bf723e87c7d60b0e3e8581b3a3e480140b9eaf976bddb0127990c2f32ae051a473bc9099e388a93dafe66bc461cc91a42e5e745ce383275c4e8e4a
+EBUILD pip-9.0.1-r2.ebuild 2453 BLAKE2B a491e767974c52ced074f62f5e4833306a53a38a71f9605aef4aa339600797f55e5a49121a56c769b1785dd128d03364ff05de4da565ee36270bf62e90322dca SHA512 8a181a8de1759683ecca8d01e12d6e43fb0e1423872d5a55975a1f61eed5b50de57a59f7426c74e4ccf07fee2e8e8060e78d6e5790e6668011ca5f05b55eec9f
 MISC metadata.xml 366 BLAKE2B 6cfb3fe9bd6fa72a5bc5aafb74d7f79eaa1fdf273cf45be4fb7989fd917ea8b1ad60a855770cc51944611e7590abeec450ed02c7c9ae8d850084c2b4f7c0d009 SHA512 43ccb12f2797cb70b59ff495d149c32c813e5145c65521eda9a86f675eac7756eefadeb9f4ca977e8e8c7019bae144b445240e6d7128da771eaf6d19559336f6
diff --git a/dev-python/pip/pip-19.3.1-r1.ebuild b/dev-python/pip/pip-19.3.1-r1.ebuild
deleted file mode 100644
index 8a4b36362386..000000000000
--- a/dev-python/pip/pip-19.3.1-r1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-PYTHON_REQ_USE="ssl(+),threads(+)"
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-SETUPTOOLS_PV="41.4.0"
-WHEEL_PV="0.33.6"
-
-DESCRIPTION="Installs python packages -- replacement for easy_install"
-HOMEPAGE="https://pip.pypa.io/ https://pypi.org/project/pip/ https://github.com/pypa/pip/"
-SRC_URI="
-	https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	test? (
-		https://files.pythonhosted.org/packages/py2.py3/s/setuptools/setuptools-${SETUPTOOLS_PV}-py2.py3-none-any.whl
-		https://files.pythonhosted.org/packages/py2.py3/w/wheel/wheel-${WHEEL_PV}-py2.py3-none-any.whl
-	)
-"
-# PyPI archive does not have tests, so we need to download from GitHub.
-# setuptools & wheel .whl files are required for testing, exact version is not very important.
-
-LICENSE="MIT"
-KEYWORDS="amd64 arm64 ~hppa ~sparc ~x86"
-SLOT="0"
-IUSE="test -vanilla"
-
-# disable-system-install patch breaks tests
-RESTRICT="!vanilla? ( test ) !test? ( test )"
-
-RDEPEND="
-	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/scripttest[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/${PN}-19.3-disable-version-check.patch"
-	)
-	if ! use vanilla; then
-		PATCHES+=( "${FILESDIR}/pip-19.3.1-disable-system-install.patch" )
-	fi
-	distutils-r1_python_prepare_all
-
-	if use test; then
-		mkdir tests/data/common_wheels/
-		cp "${DISTDIR}"/setuptools-${SETUPTOOLS_PV}-py2.py3-none-any.whl tests/data/common_wheels/ || die
-		cp "${DISTDIR}"/wheel-${WHEEL_PV}-py2.py3-none-any.whl tests/data/common_wheels/ || die
-	fi
-}
-
-python_test() {
-	# pip test suite likes to test installed version of pip, both the module and the executable.
-	# Here we install it into a temporary dir and add to PATHs in a subshell.
-	EPYTHON_ROOT="${T}/${EPYTHON}_root"
-	esetup.py install --root "${EPYTHON_ROOT}"
-
-	if [[ ${EPYTHON} == python2* ]]; then
-		# These tests just fail on Python 2.
-		EXCLUDE_TESTS=( or pep518_uses_build_env or install_package_with_root or install_editable_with_prefix
-			or install_from_current_directory_into_usersite or install_user_wheel
-			or uninstall_from_usersite_with_dist_in_global_site
-			or uninstall_editable_from_usersite
-			or build_env_isolation
-		)
-	fi
-
-	(
-		export PATH="${EPYTHON_ROOT}/usr/bin:$PATH"
-		export PYTHONPATH="${EPYTHON_ROOT}/$(python_get_sitedir)"
-
-		# Disable VCS and network tests.
-		# version_check tests are excluded since we explicitly disable this feature entirely.
-		# uninstall test just fails, likely because of our test environment setup.
-		python -m pytest -v \
-			-k "not (svn or git or bazaar or mercurial or version_check or uninstall_non_local_distutils ${EXCLUDE_TESTS[*]})" \
-			-m "not network" \
-			|| die
-	)
-}
-
-python_install_all() {
-	# Prevent dbus auto-launch
-	# https://bugs.gentoo.org/692178
-	export DBUS_SESSION_BUS_ADDRESS="disabled:"
-
-	local DOCS=( AUTHORS.txt docs/html/**/*.rst )
-	distutils-r1_python_install_all
-
-	COMPLETION="${T}"/completion.tmp
-
-	# '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"; import pip.__main__; sys.exit(pip.__main__._main())'
-
-	${PYTHON} -c "${pipcmd}" completion --bash > "${COMPLETION}" || die
-	newbashcomp "${COMPLETION}" ${PN}
-
-	${PYTHON} -c "${pipcmd}" completion --zsh > "${COMPLETION}" || die
-	insinto /usr/share/zsh/site-functions
-	newins "${COMPLETION}" _pip
-}
diff --git a/dev-python/pip/pip-19.3.1-r2.ebuild b/dev-python/pip/pip-19.3.1-r2.ebuild
index 8e2cf18dff9c..4336e61dd876 100644
--- a/dev-python/pip/pip-19.3.1-r2.ebuild
+++ b/dev-python/pip/pip-19.3.1-r2.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 # setuptools & wheel .whl files are required for testing, exact version is not very important.
 
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm64 ~sparc x86"
+KEYWORDS="amd64 arm64 ~sparc x86"
 SLOT="0"
 IUSE="test -vanilla"
 
diff --git a/dev-python/pip/pip-20.0.2.ebuild b/dev-python/pip/pip-20.0.2.ebuild
index 2e7b6e06d4dc..a00104e673ce 100644
--- a/dev-python/pip/pip-20.0.2.ebuild
+++ b/dev-python/pip/pip-20.0.2.ebuild
@@ -25,7 +25,7 @@ SRC_URI="
 # setuptools & wheel .whl files are required for testing, exact version is not very important.
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~sparc ~x86"
 SLOT="0"
 IUSE="test -vanilla"
 
diff --git a/dev-python/pip/pip-9.0.1-r2.ebuild b/dev-python/pip/pip-9.0.1-r2.ebuild
index 8b98697311dd..38b2b91bbee7 100644
--- a/dev-python/pip/pip-9.0.1-r2.ebuild
+++ b/dev-python/pip/pip-9.0.1-r2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://pip.pypa.io/ https://pypi.org/project/pip/ https://github.com/
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 
 IUSE="-vanilla"