Merge branch 'edge' into next

6 files changed, 168 insertions, 6 deletions

diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 4dc7745b11da..ccd6da654899 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,10 +1,13 @@
 AUX setuptools-42.0.0-imp-fix.patch 1839 BLAKE2B a11f8fe053a4b0ad8d326be339ba9cc95e3b90441b8fdeb4ad589d8e8248abf63a11f97ff1917aea73d3f3daf054d9fa831e805ad6823f31d474e25d67e15eb9 SHA512 c93a5b24f0169ab64ba3c80aa9c64a70609d89c776ee491de3088dc6dc7149d709836f79affde03aa58e2065e014318182a2359bae753fbb47c98d05fa9bcab3
+AUX setuptools-46.2.0-test-warning.patch 2641 BLAKE2B 6d3f9fe2425087c3d4199a0bc70cfb68bbfc881ac06c6eeb4aef010ae4db8271e2a9e289d304dbe7a4184a5ccf80236298a67c917830512d730b11ec7c9a92f3 SHA512 e59c867dd1345c32ab463a1a38626cd4de90aa05d1cc1e400e7816790fa7583353140ba0f79c213c12d130588b34115d68e8d1f6a48ece467aadcdf3cbc6ce75
 DIST setuptools-44.0.0.zip 858893 BLAKE2B 02ba2a838487ba9e80d9ca3b8598cecbec4d286f2734be439d2b73f3f7f0ca80e80ea71a0c2322093deb548503c82d6eb32b1585992979b053f14f49baa00baa SHA512 bb48e7763d258e654472bc416d16ec8708eefa95d1eb03cb6e81b623fd636cefc51a0bd67887084ab0214e256e2030a8f655184c3b59ad6937abab6a6178f3a1
 DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf
-DIST setuptools-45.3.0.zip 862788 BLAKE2B ac2216a788db374bfe702ac11639dd850c2b947eed332067c0d923a135c9a0ba1760d56df6dd7b999ed42156d8b7a1898964d2ca0777d9e84593ae5eabcfd749 SHA512 9801f23c7e10712db0772b3d7365209df4e2a167feb5a6824809a258424a9220f65438f3087021e2484731091ea1cf3dd667308631dc8bff7807535cae528364
 DIST setuptools-46.1.3.zip 862431 BLAKE2B 89d65360e15b22f535312627723ad61df84dce3ee9d5850dd0c60dace0f8c04a502ac6246afe1add1e4fbd0e0dc9530afc8bfd2a4cf058f93cde2ff4184e21f2 SHA512 7f8f99313ce2af2cbfa86ff9a3135bc3445804e9323a375b498d20dad7f8fc819481da0c2a057160397e98b6178c1eb453a093652cfdfe7896c9d31732f7ad8c
+DIST setuptools-46.2.0.zip 865117 BLAKE2B 490387146003e07a5391afa798d1e45a76e9afc81c3e0c484005b3b0bff15f172db2016907199fe2216a4e17379987a53d58149d285be6dcfe7c37a64ce7c359 SHA512 d8d89a99c6a3be0a343d6a0e17117ba00393188d69c8995a5dbe9a7772c002fc301a53963288231e3f8053ffda4cafd5406edb2f4650f2036c665f8e3eb5822e
+DIST setuptools-46.3.0.zip 864654 BLAKE2B ce916b8f84f777a4baf6dd7458d5a74d7afbc0ede3a60238ce1e6ddf8b4c9837cd88508d4af4577be446d811fc9b997e9361775abaf9308bc9af6f66ca173bfb SHA512 57bc3e1a585a99d9434ed55af037a71665ee7e76ac9dbf19c87260b3d4331183f9eb3c7389c3455407f379ba28a74e90e27346afc614003ae259ab92e3dc16ec
 EBUILD setuptools-44.0.0.ebuild 2241 BLAKE2B 01cc0eac39c495e27d0087f9c130bded0685753fb030992115760fb62132d7e319a530a200ba8fa65ad13d28f23ffb1428358d6d56803aee6a583221dae6c15b SHA512 6a444f1959796ea98e8c59c64ec4bec06b609b8fe425e827150626909a95fd2e461f02179bf03fc3e200bedb3274a910cf8ee816c21c8eb698a17f44817bf3d0
-EBUILD setuptools-44.1.0.ebuild 2250 BLAKE2B b8d6da03e24c316495bc1ecdc72d13fd123c53dec972f7548858ca653dba3ae06ccfad2a33f7d925c1e9864904bfffd43b1770153069468e930bd264a25ee999 SHA512 86702b7b7a7fe1a8225ff612a1939c560e7efbb27f9d998c70172b9e3361bc9f43400f262e8e818349f0916d0ab392166c38e1c532b7ca6b62c97c80f8ba309c
-EBUILD setuptools-45.3.0.ebuild 1876 BLAKE2B 9953cc946be899eb2003667f3e1b182e21004d93fb0ae2aed66171a01027c5b42070411923d6110df0a6e49fa37b6dfd14f5a65f3d669704668af55abeb7e88c SHA512 47d69ea4ccc916cf3d5f3b1848ef7a3072b02310418c4170e8a2bce74a370fb0c37ba4caae73a3d642ba384f735818b32cb6df9b894c23267b8ff257f3d5e6cf
+EBUILD setuptools-44.1.0.ebuild 2242 BLAKE2B 5d25046d9212067075ed3bd31d2821a24e459fa35ffb3178103907042cb354a11251de89c8a8ef161bc9f6d0a28963ab8ba75ae13d6385cee8483c6112aa814f SHA512 5f5daa3dd6f118d6654d3b0e1d7d3bffc1a47d14f1e2d7ab9dc4a78c1ee64fdab0c9bf6117e30850c5db5e325f9f0551baaa36a6ea9c512f9cfcf1306230d278
 EBUILD setuptools-46.1.3.ebuild 2018 BLAKE2B d70e0fe5452b0700f40ed9670c41374b1a2129c7578bdddf60f867b68d2112c67b32aeed2f46afed80707e3488c42e489190e2dfe4211d42d63efdb706ffbca3 SHA512 f12c8c790feb0619153877c740b836e00127be4cdb719d16645d1136afa35068bb2f384d971457faf3dbc8a2f3fea968312cbdb2cd57548698f06e84e9e1041d
-MISC metadata.xml 380 BLAKE2B e6c532ce30c0def7dde2f2ca91e1663f290954f1f099fc837247540c31979a215be5550bc42d4d841f62d3a81554ae5377c148ec34dc2e92bbca3daaa1021fb1 SHA512 70bfa11a90dc1bae499e235e01c05ff1b0ed2960062fcef46ed07095b59309c4a0c3adcd47f7b0131ff1035c8e77c5bdf75975ac1eaccaa1a9fbd06a3f868f94
+EBUILD setuptools-46.2.0.ebuild 2086 BLAKE2B ebd4790c83f6e527cfa7b8ed4829ca7781546924d5b2e9a3f6d78b558fbeb272344d0fb39fed5ac608c991a4d270abc508a62e469dd59a78822f08adc7458df6 SHA512 86a3ca87f3d890f70fdee6386874916e0119b2cc06d210504fb13898c0196065900691621ebb7c8ae8cc9199ef90f90715f04b30a061a62c9c14ffca2db352ac
+EBUILD setuptools-46.3.0.ebuild 2034 BLAKE2B 2146b9d5adf112153a7148622a7f7f171d3717691dd1a622eb5775b560186e9359244d032036900c20f668e2ae199fc9a2404c0db56bf8b599897b3daec02851 SHA512 7c705c5913f0e0b521e3f5deeb209ed89c35a774d6f67e7391dee5838820f95b202457fe96a2223e45dac1f7c5f0a3820a6715784447a86d1357df324f7b35a9
+MISC metadata.xml 443 BLAKE2B 2b923468b7dc3062ad0f95edd944ffdde6dd4a8303ce8cc9a95730fefeb211e67ea64b7a289e60009003b64731d047ab3bb47cc6c8f0805a05a3a38f57846448 SHA512 2b2b1c7a0647283b069af29be73d0aa9c1e1ec8374d15d8a3b53a44b11d4698cba57a26ef5963795eb8bdbda9602b18a02194c5741485023ffd0b3218c028110
diff --git a/dev-python/setuptools/files/setuptools-46.2.0-test-warning.patch b/dev-python/setuptools/files/setuptools-46.2.0-test-warning.patch
new file mode 100644
index 000000000000..e27db9a41da9
--- /dev/null
+++ b/dev-python/setuptools/files/setuptools-46.2.0-test-warning.patch
@@ -0,0 +1,82 @@
+From 56bcce894e99059a8abda29d8b919b0bee7fd1b9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
+Date: Tue, 12 May 2020 13:33:04 +0200
+Subject: [PATCH] Reuse @ack_2to3 in TestDevelop.test_2to3_user_mode
+
+Fixes https://github.com/pypa/setuptools/issues/2100
+---
+ changelog.d/2105.misc.rst        | 1 +
+ setuptools/tests/__init__.py     | 4 +++-
+ setuptools/tests/test_develop.py | 2 ++
+ setuptools/tests/test_test.py    | 4 +---
+ 4 files changed, 7 insertions(+), 4 deletions(-)
+ create mode 100644 changelog.d/2105.misc.rst
+
+diff --git a/changelog.d/2105.misc.rst b/changelog.d/2105.misc.rst
+new file mode 100644
+index 000000000..75eaf2cb3
+--- /dev/null
++++ b/changelog.d/2105.misc.rst
+@@ -0,0 +1 @@
++Filter ``2to3`` deprecation warnings from ``TestDevelop.test_2to3_user_mode``.
+diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
+index 9c77b51f8..6377d7857 100644
+--- a/setuptools/tests/__init__.py
++++ b/setuptools/tests/__init__.py
+@@ -6,7 +6,7 @@
+ 
+ 
+ __all__ = [
+-    'fail_on_ascii', 'py2_only', 'py3_only'
++    'fail_on_ascii', 'py2_only', 'py3_only', 'ack_2to3'
+ ]
+ 
+ 
+@@ -16,3 +16,5 @@
+ 
+ py2_only = pytest.mark.skipif(not PY2, reason="Test runs on Python 2 only")
+ py3_only = pytest.mark.skipif(not PY3, reason="Test runs on Python 3 only")
++
++ack_2to3 = pytest.mark.filterwarnings('ignore:2to3 support is deprecated')
+diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
+index 792975fd1..bb89a865b 100644
+--- a/setuptools/tests/test_develop.py
++++ b/setuptools/tests/test_develop.py
+@@ -17,6 +17,7 @@
+ 
+ from setuptools.command.develop import develop
+ from setuptools.dist import Distribution
++from setuptools.tests import ack_2to3
+ from . import contexts
+ from . import namespaces
+ 
+@@ -65,6 +66,7 @@ class TestDevelop:
+     @pytest.mark.skipif(
+         in_virtualenv or in_venv,
+         reason="Cannot run when invoked in a virtualenv or venv")
++    @ack_2to3
+     def test_2to3_user_mode(self, test_env):
+         settings = dict(
+             name='foo',
+diff --git a/setuptools/tests/test_test.py b/setuptools/tests/test_test.py
+index 0f77d8ff3..892fd120d 100644
+--- a/setuptools/tests/test_test.py
++++ b/setuptools/tests/test_test.py
+@@ -10,6 +10,7 @@
+ 
+ from setuptools.command.test import test
+ from setuptools.dist import Distribution
++from setuptools.tests import ack_2to3
+ 
+ from .textwrap import DALS
+ 
+@@ -73,9 +74,6 @@ def quiet_log():
+     log.set_verbosity(0)
+ 
+ 
+-ack_2to3 = pytest.mark.filterwarnings('ignore:2to3 support is deprecated')
+-
+-
+ @pytest.mark.usefixtures('sample_test', 'quiet_log')
+ @ack_2to3
+ def test_test(capfd):
diff --git a/dev-python/setuptools/metadata.xml b/dev-python/setuptools/metadata.xml
index 3620f425ec5f..e33e5a84ab56 100644
--- a/dev-python/setuptools/metadata.xml
+++ b/dev-python/setuptools/metadata.xml
@@ -8,5 +8,6 @@
   <upstream>
     <remote-id type="pypi">setuptools</remote-id>
     <remote-id type="github">pypa/setuptools</remote-id>
+    <remote-id type="cpe">cpe:/a:python:setuptools</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/setuptools/setuptools-44.1.0.ebuild b/dev-python/setuptools/setuptools-44.1.0.ebuild
index b08246e89b0b..cc2f0246b955 100644
--- a/dev-python/setuptools/setuptools-44.1.0.ebuild
+++ b/dev-python/setuptools/setuptools-44.1.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Collection of extensions to Distutils"
diff --git a/dev-python/setuptools/setuptools-46.2.0.ebuild b/dev-python/setuptools/setuptools-46.2.0.ebuild
new file mode 100644
index 000000000000..ef030388abe8
--- /dev/null
+++ b/dev-python/setuptools/setuptools-46.2.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-arch/unzip
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.7.0[${PYTHON_USEDEP}]
+		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-test-warning.patch
+)
+
+python_prepare_all() {
+	# disable tests requiring a network connection
+	rm setuptools/tests/test_packageindex.py || die
+
+	# don't run integration tests
+	rm setuptools/tests/test_integration.py || die
+
+	# xpass-es for me on py3
+	sed -e '/xfail.*710/s:(:(six.PY2, :' \
+		-i setuptools/tests/test_archive_util.py || die
+
+	# avoid pointless dep on flake8
+	sed -i -e 's:--flake8::' pytest.ini || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" pytest -vv ${PN} || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/setuptools/setuptools-45.3.0.ebuild b/dev-python/setuptools/setuptools-46.3.0.ebuild
index 17d23ae5d72b..8562f41ff110 100644
--- a/dev-python/setuptools/setuptools-45.3.0.ebuild
+++ b/dev-python/setuptools/setuptools-46.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
@@ -44,6 +44,10 @@ python_prepare_all() {
 	# don't run integration tests
 	rm setuptools/tests/test_integration.py || die
 
+	# xpass-es for me on py3
+	sed -e '/xfail.*710/s:(:(six.PY2, :' \
+		-i setuptools/tests/test_archive_util.py || die
+
 	# avoid pointless dep on flake8
 	sed -i -e 's:--flake8::' pytest.ini || die
 
@@ -51,6 +55,7 @@ python_prepare_all() {
 }
 
 python_test() {
+	distutils_install_for_testing
 	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
 	# It tries to sandbox the test in a tempdir
 	HOME="${PWD}" pytest -vv ${PN} || die "Tests failed under ${EPYTHON}"