gentoo resync : 17.01.2010

7 files changed, 17 insertions, 203 deletions

diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index 3c2788b1cee4..7d6a8f69ae4d 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -13,10 +13,8 @@ DIST setuptools-41.0.1-py2.py3-none-any.whl 575966 BLAKE2B 332986453a35e4ec36ab2
 DIST setuptools-41.4.0-py2.py3-none-any.whl 580302 BLAKE2B 58dc2d48445406f7467bfb0934dc507e8a569e4759bfcc95287cfb21b5b1a7bcab061656a29a8b4976ee3ae12a3adca570035ae4a6d9df09ae7a799857775d36 SHA512 a27b38d596931dfef81d705d05689b7748ce0e02d21af4a37204fc74b0913fa7241b8135535eb7749f09af361cad90c475af98493fef11c4ad974780ee01243d
 DIST wheel-0.33.1-py2.py3-none-any.whl 21496 BLAKE2B 41bb9ed91d43f94209a010c286d541da9d68b9e727ec8a339fe3c24fb806746b1de5b62c6cd26d2c2841be17406e1f99353b6d172f5258540faeba014945e9e8 SHA512 761ad8cb96557b146642871e1f8ce75849a9828193d992a19d072236b9f8452ab54907a3b82bc7441f75f036155ae21b7450120e0c4c19aa5100b58337945ac0
 DIST wheel-0.33.6-py2.py3-none-any.whl 21556 BLAKE2B 6b6124c1e8e70592399a90c88b2a70efc5885bad81d2ff07a2e243eee008ba5cb0c927454036915a61e97489e29fe1abc4ba2e63d7eadf1a8985c8a8b7cdf4c4 SHA512 4663cd55ee9d3de138216bb06870606b546b19cb6a733f1beab211c0ba72e63d849c422d320ddc8aa8275ad04a30119a84c1351e589150cd18c2a34f9fdb224a
-EBUILD pip-19.1.ebuild 3476 BLAKE2B 72694b9acd70570e68490dccbd0b263768336257df6d1cf9783a76d66bf303630c9e49cbedece735dbd8f04e214c7dae1ac9678dfb9d3d12900e97a7cc682ab7 SHA512 8fb072517f1f740714e0b08355a2639fa0507b83cd9f6effd031d4dbfdd784bc8c682be184719319f6c72b609fc39e6206f03274863ae2fd7028653d4e83ff36
-EBUILD pip-19.3.1-r1.ebuild 3845 BLAKE2B cdc6ebc48b4106d79788eb8ffafcf63fcd55744159e6480116710c4b7c29240fdd3e49ecb93ce7f5f197dbb16bb022a4e5878be320257fe2d7c4976283d5daad SHA512 f0accd6e361db491523f5d4def86dfbb45929b927e740272fed3920788569a8076daebc95b3e6df0078eff543f948eb42ee0267750545d1bca41b90d319303a1
-EBUILD pip-19.3.1-r2.ebuild 3810 BLAKE2B 22f2de682ef2963b1329f91648714f702884a33cd907a6f257ca7f10edae001db98039834dfcf4a45890b53f1802809f43b8a50df9e9f00b3dfbf0a48c83169c SHA512 f86b1d627584a4bacb00ec3e58265a982598846b53efcef939935dc6e2d44c2a65b25862dd8f4e12677ec588b4a00e73f2120a2d846c193a835499e4098c8293
-EBUILD pip-19.3.1.ebuild 4024 BLAKE2B 6baac0f72d610819501694414ac31a166f9b0c08afd88a6f3e01361ee3e31db5470cb26e5cc7a1abdd435aca186c9267b6f9795dc15597b20252c54785faf39f SHA512 7cbf94c38e543b78da5e704f349ff8157c2bedb24023670ec7176ee385f73396a6923900fb1048ea604a18148fe47d8ec3115ce553a93fd783206fee12f42d88
-EBUILD pip-9.0.1-r1.ebuild 2322 BLAKE2B db1fe94c11315f7e4ce7bdc557c7584b58ca268d3c8fb27b9eccfb31449e42784ffdb8b302c6a83e07f6e7c990218e3c577d63aad448cc8e7df9c9361acd3678 SHA512 ba006fb6aecaf343d4f95e79890ffd5696228175a4f95f10dd5391664af4b61025a1a02ff6fe1dfd8f1771a53790288660a5bba891e479c18256593cf3a56054
-EBUILD pip-9.0.1-r2.ebuild 2467 BLAKE2B fd324e0b25678bf54e0fa1b7501ee3d3965e43b281dac481a66e8c1f666fc5f22a9fce0e6e2a6267e3e728905c540640cadc1c29372c238738c9deb46399419a SHA512 629fb863ac7fe86f14a3a47a7410ad43fe2517e0c7b5fd838f714d50d99e6c9b56b39fb3e5040d4fb6d1d734851e0ee1458ebf39f5b53d763080e3d7027f83a9
+EBUILD pip-19.1.ebuild 3584 BLAKE2B 546155c7fa234911831c843c8162e47abd037446b5968c4de59a6565b972318e973a646e16e9383b2be4f6a9d963d67e9e26725e9fc52a1a1d2845a159324d59 SHA512 018b88185e223c3578cdd6bac808807f23de514069b7a13fe3d285b284d1c345ca8c909832d5975efed63c8ceacc908852ec136973793cbdcd8e1f1fc45c445d
+EBUILD pip-19.3.1-r1.ebuild 3953 BLAKE2B f3c56b3691e0b595a543934a391a19c27b20b4c14c57066f76535bcdfdd34d0f45435d44f74b844ac85a86389e2f4c99dc99a6f369558c788327e34496f4ea17 SHA512 c4a2d0d4cdfdc8dc917333fe7ed2e0e1e490cfa00f365d9bc6e1fa8719400f271ddc77c25aa8191f1a3fe3592de10697855ebabc2ff287b5cc7b52d9de6885a5
+EBUILD pip-19.3.1-r2.ebuild 3918 BLAKE2B 5f152cb94df93812508d2136f13e7dda36b9a98f0cf6ffee4ead014b701b28d45629f6ecbf502e79b078801fb2af1f50a0c19a785d5229d06aeee18522041428 SHA512 ea7ad03d938cc024c6cb30d65b4d39edeadb591d9feb364a6f951b13d943de9c6fb9b1087b445d61873ebd344d04a7972b28f199efe134495d81b83ce5caa37c
+EBUILD pip-9.0.1-r2.ebuild 2454 BLAKE2B f1d5f60e453f92dba7d70ee49e51f870fe32041efda283c4617304a7b85d0b8aebe84b0a30a018400204f6eda2aaac8a0e0ea82c72f8413034ac356789655cac SHA512 7dacd90b1e9fabb6d34821453b1596e26d776a7020a969fa98cad1a7580036dea244ab111ea8687439fdb28d3bcaf9d58c6086021517e1514dbc253835669b46
 MISC metadata.xml 366 BLAKE2B 6cfb3fe9bd6fa72a5bc5aafb74d7f79eaa1fdf273cf45be4fb7989fd917ea8b1ad60a855770cc51944611e7590abeec450ed02c7c9ae8d850084c2b4f7c0d009 SHA512 43ccb12f2797cb70b59ff495d149c32c813e5145c65521eda9a86f675eac7756eefadeb9f4ca977e8e8c7019bae144b445240e6d7128da771eaf6d19559336f6
diff --git a/dev-python/pip/pip-19.1.ebuild b/dev-python/pip/pip-19.1.ebuild
index f0c3d00ba9d7..7a298c231eb3 100644
--- a/dev-python/pip/pip-19.1.ebuild
+++ b/dev-python/pip/pip-19.1.ebuild
@@ -78,6 +78,10 @@ python_test () {
 }
 
 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
 
diff --git a/dev-python/pip/pip-19.3.1-r1.ebuild b/dev-python/pip/pip-19.3.1-r1.ebuild
index 10543a992052..f0dfd5344704 100644
--- a/dev-python/pip/pip-19.3.1-r1.ebuild
+++ b/dev-python/pip/pip-19.3.1-r1.ebuild
@@ -95,6 +95,10 @@ python_test () {
 }
 
 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
 
diff --git a/dev-python/pip/pip-19.3.1-r2.ebuild b/dev-python/pip/pip-19.3.1-r2.ebuild
index 507b3e88684b..1be38195935a 100644
--- a/dev-python/pip/pip-19.3.1-r2.ebuild
+++ b/dev-python/pip/pip-19.3.1-r2.ebuild
@@ -114,6 +114,10 @@ python_test() {
 }
 
 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
 
diff --git a/dev-python/pip/pip-19.3.1.ebuild b/dev-python/pip/pip-19.3.1.ebuild
deleted file mode 100644
index f060898b7fcf..000000000000
--- a/dev-python/pip/pip-19.3.1.ebuild
+++ /dev/null
@@ -1,119 +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 ~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-4[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		<dev-python/pytest-rerunfailures-7.0[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		<dev-python/pytest-xdist-1.28.0[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/scripttest[${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.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 \
-			-n $(makeopts_jobs) \
-			--timeout 300 \
-			-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() {
-	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-9.0.1-r1.ebuild b/dev-python/pip/pip-9.0.1-r1.ebuild
deleted file mode 100644
index a5b251787952..000000000000
--- a/dev-python/pip/pip-9.0.1-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit eutils bash-completion-r1 distutils-r1
-
-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="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"
-SLOT="0"
-
-# Check pip/_vendor/vendor.txt for this
-#VENDOR_DEPEND="
-#	>=dev-python/distlib-0.2.2[${PYTHON_USEDEP}]
-#	>=dev-python/html5lib-1.0b8[${PYTHON_USEDEP}]
-#	>=dev-python/six-1.10.0${PYTHON_USEDEP}]
-#	>=dev-python/colorama-0.3.6[${PYTHON_USEDEP}]
-#	>=dev-python/requests-2.9.1-r2[${PYTHON_USEDEP}]
-#	>=dev-python/CacheControl-0.11.6[${PYTHON_USEDEP}]
-#	>=dev-python/lockfile-0.12.2[${PYTHON_USEDEP}]
-#	>=dev-python/progress-1.2[${PYTHON_USEDEP}]
-#	>=dev-python/packaging-16.5[${PYTHON_USEDEP}]
-#	>=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
-#	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-#	virtual/python-ipaddress[${PYTHON_USEDEP}]
-#"
-# https://github.com/pypa/pip/issues/3057
-#RDEPEND="${VENDOR_DEPEND}
-#	>=dev-python/setuptools-19.2[${PYTHON_USEDEP}]
-#	<dev-python/setuptools-19.4[${PYTHON_USEDEP}]
-#"
-#DEPEND="${RDEPEND}"
-
-# required test data isn't bundled with the tarball
-RESTRICT="test"
-
-#PATCHES=(
-#	"${FILESDIR}"/${PN}-6.0.2-disable-version-check.patch
-#	"${FILESDIR}"/${PN}-8.0.0-unbundle.patch
-#	)
-
-#python_prepare_all() {
-#	mv pip/_vendor/__init__.py "${T}" || die
-#	rm -r pip/_vendor/* || die
-#	mv "${T}"/__init__.py pip/_vendor/__init__.py || die
-#
-#	distutils-r1_python_prepare_all
-#}
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/pip-disable-system-install.patch"
-	"${FILESDIR}/${PN}-9.0.1-disable-version-check.patch"
-)
-
-python_install_all() {
-	local DOCS=( AUTHORS.txt docs/*.rst )
-	distutils-r1_python_install_all
-
-	COMPLETION="${T}"/completion.tmp
-
-	"${PYTHON}" -m pip completion --bash > "${COMPLETION}" || die
-	newbashcomp "${COMPLETION}" ${PN}
-
-	"${PYTHON}" -m pip completion --zsh > "${COMPLETION}" || die
-	insinto /usr/share/zsh/site-functions
-	newins "${COMPLETION}" _pip
-}
diff --git a/dev-python/pip/pip-9.0.1-r2.ebuild b/dev-python/pip/pip-9.0.1-r2.ebuild
index c11f49132097..4443d68b7d97 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 sh sparc x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 
 IUSE="-vanilla"