Updating liguros repo

21 files changed, 356 insertions, 166 deletions

diff --git a/dev-python/GitPython/GitPython-3.1.5.ebuild b/dev-python/GitPython/GitPython-3.1.5.ebuild
new file mode 100644
index 000000000000..7d80c563a146
--- /dev/null
+++ b/dev-python/GitPython/GitPython-3.1.5.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+TEST_P=GitPython-3.1.5
+GITDB_P=gitdb-4.0.5
+SMMAP_P=smmap-3.0.4
+
+DESCRIPTION="Library used to interact with Git repositories"
+HOMEPAGE="https://github.com/gitpython-developers/GitPython https://pypi.org/project/GitPython/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz
+	test? (
+		https://dev.gentoo.org/~mgorny/dist/${TEST_P}.gitbundle
+		https://dev.gentoo.org/~mgorny/dist/${GITDB_P}.gitbundle
+		https://dev.gentoo.org/~mgorny/dist/${SMMAP_P}.gitbundle
+	)"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-vcs/git
+	>=dev-python/gitdb-4.0.1[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		>=dev-python/ddt-1.1.1[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
+
+src_test() {
+	git config --global user.email "you@example.com" || die
+	git config --global user.name "Your Name" || die
+
+	git clone "${DISTDIR}/${TEST_P}.gitbundle" "${T}"/test || die
+	git clone "${DISTDIR}/${GITDB_P}.gitbundle" \
+		"${T}"/test/git/ext/gitdb || die
+	git clone "${DISTDIR}/${SMMAP_P}.gitbundle" \
+		"${T}"/test/git/ext/gitdb/gitdb/ext/smmap || die
+
+	cd "${T}"/test || die
+	# remove performance tests
+	rm -r git/test/performance || die
+	# tests requiring network access
+	sed -i -e 's:test_fetch_error:_&:' git/test/test_remote.py || die
+	# broken apparently (also fails in git clone)
+	sed -e 's:test_rev_parse:_&:' \
+		-i git/test/test_repo.py || die
+
+	distutils-r1_src_test
+}
diff --git a/dev-python/GitPython/Manifest b/dev-python/GitPython/Manifest
index f596fe6dc58d..f7167b60e27b 100644
--- a/dev-python/GitPython/Manifest
+++ b/dev-python/GitPython/Manifest
@@ -1,4 +1,8 @@
 DIST GitPython-3.1.0.gitbundle 8618276 BLAKE2B a1ecf49c47804b399453c6931fb54903309944b47a5a8ccd02d62f4b27943e60b4b58a9e67567008fa4d5bc791b1c86642659c045c885e2155e2c44bb1a4ea81 SHA512 a71463f861f840d3169a8351155665243d9f0f0a72e210940f9f7872cfd49b6ddfac827f0ec5bc61079d8066fc7ba210a03dd99f3bbd598e22ccbcacfe8e61b3
 DIST GitPython-3.1.3.tar.gz 430558 BLAKE2B 0a36e066ad4d3d994ebaa76492f4953c0eaf8b4a0fc163af646f288ed45591e0dee532502c03007af5f6d6cf5633a32bc12a9a777fad6d745bdbc286a4815de4 SHA512 ea4043c8be79cec7ffc9c6b6383be37dcf7b4a877cf02d6fc8c9e7d39a5005e088c8780dd6e0fcd72c0711c997228f417773c82572f569c5ca1128f5ebe56736
+DIST GitPython-3.1.5.gitbundle 8795147 BLAKE2B ca876265dca1ac9b1ea2c1b21bf0ed4a5ff5d8e6bdc887dee16ebedc661cecd1d6c2ac2b0ec606dcee7c5e5b865dbaf425bfe52100ebe73331389db7a03b0f13 SHA512 5315c9985df2eeb6b8d8667e02cfff7b53fefec9f680fa0622da23f680348c9dd1aa90b6c5dba58fdf4a36748f14d1665a305553b04afed9702c6623f36d45ca
+DIST GitPython-3.1.5.tar.gz 435408 BLAKE2B 6ee25808e3ea85a502edc76e685aaa5adf998dc4497e84fcbc28d2bc8a2a7a6636ac37e5bca2d380b034d0211d218b3bedcfebeb82f31a5cbe04be024943796c SHA512 ebe5116146d653ea96aa317842bfe449cace90e95424978aba903fe7173568748f2ebd2bcb893a85d8f563c24fb9771c604a4477e41b67db9db2c83137017a63
 DIST gitdb-4.0.2.gitbundle 1474197 BLAKE2B 93dc8aeb3a43f0950bec1e8dc0c0156543a0a1ce1f20a7f0b2cd05c110338af05b6c6300c3f4b2c05e0f895496248e5fdca74eb599a4ea9aa983ed399d91f7c6 SHA512 8d4ebc93d6869a60b7717fc090000067e86a7e0373c281d0fb9939a6e2e283864256f827919eeb13be977254c0c71a4864d8e7c9b4b6dcc0af6275aa59681960
+DIST gitdb-4.0.5.gitbundle 1497722 BLAKE2B 8ee85368db7f408f96f0b48250f1ed96c8df28b0439d355ce2eecbdcc5dc94382883510c57142e7e4b6ba7cd8e82b1140eca538b45692dbe8c55bce32e1b5b4f SHA512 2c55a8e402a61ebcc362a8aee4a6154705d8ff2f5e582d13c855562dd074427681f4147641fe76681b76c99ec46040c7577dfca8bbfd575fc52772a9a6f17326
 DIST smmap-3.0.1.gitbundle 263781 BLAKE2B 6e06586010814ce0f59367c7f9289dad4891ee1debbc020b192af3945207da05b1e34907f1871f5b6b9638706b9e2fdacf390fcfff6bd06af84b9fd80f7e63a8 SHA512 c2b6c0b295c2997ed53727d3d1458ae7ec5ddbde9c83349286904726865fc026a70161955498b1a06371fb8d937e7386b80b4ea0c2e5d1c647718e6dbea93104
+DIST smmap-3.0.4.gitbundle 276552 BLAKE2B 2d17b927b2c644d2f1984168ee99fe5a9a58392401ac0b2894a1d5e5f9c292f32311a7a5d7669bd93c642ff791f4801d61ef3236c1dafa1434e99a17fd8751f6 SHA512 6deb282c6ece3b556c59c458b5242ff362b903441db63c005a0ab1ac055b3f974f9b34f30e0a4a41ef9246696e08b191254f72db61a8f24d4eb2f0e48a08937b
diff --git a/dev-python/argcomplete/Manifest b/dev-python/argcomplete/Manifest
index be23f6f647fb..785ba67812eb 100644
--- a/dev-python/argcomplete/Manifest
+++ b/dev-python/argcomplete/Manifest
@@ -1 +1,2 @@
 DIST argcomplete-1.11.1.tar.gz 50773 BLAKE2B 15c92929fc20a10a1f1e29cf8714b74dd9ab0ce11e7f77acd4b15a907ad885f944f8540a8b37fef13ea67ee8eb76107e1c72746434f2710ded7331830494ff50 SHA512 523d542cf1430d8ad7b056e3b9c52769847c6e0bb9e266d71cc961e56816b7811f488a5c412f89b8de0d022a321d74733af87a50b3c0d698e796fb5e322d16ce
+DIST argcomplete-1.12.0.tar.gz 53625 BLAKE2B 29b4f620537a087629c63dc71c6a0101d40967145680518b566b9c81e3e744c5d73e1ed016795f0ea4338be4e8f20b7df1968e388e1ff09308e012ed1ba6d0c0 SHA512 5e21e3caf1dcee661c0dadf28d7b127147325475fe3ae569fae8797a762c34b55125df9f52de8d76f0aa6dd4efdac260a358b325a7659beae02b1dedab501c18
diff --git a/dev-python/argcomplete/argcomplete-1.12.0.ebuild b/dev-python/argcomplete/argcomplete-1.12.0.ebuild
new file mode 100644
index 000000000000..7cf7945bd26b
--- /dev/null
+++ b/dev-python/argcomplete/argcomplete-1.12.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{6..9}} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Bash tab completion for argparse"
+HOMEPAGE="https://pypi.org/project/argcomplete/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		<dev-python/importlib_metadata-2[${PYTHON_USEDEP}]
+	' -2 python3_{5,6,7} pypy3)"
+# pip is called as an external tool
+BDEPEND="
+	test? (
+		app-shells/fish
+		app-shells/tcsh
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/pip-19
+	)"
+
+python_test() {
+	"${EPYTHON}" test/test.py -v || die
+}
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index a595db8b1c21..3ced917bc5d2 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -3,3 +3,4 @@ DIST hypothesis-python-4.57.1.tar.gz 9005030 BLAKE2B 3d318896cbe2d24fa6847e764a1
 DIST hypothesis-python-5.16.0.tar.gz 9011031 BLAKE2B 65659f72094ac7fcc82c7e5a8b88c0156345530742412f13398dc72ce50d2466fa9b04b5cf4a79e87916aae770f2a89aa880d1d238890c7f8c8483c4c5068bcb SHA512 66366c172aaed84f1fb5fe0cef4e0fccfa4f65c31a94d52cf3a49b44b535f8366e71974f2aaa7b39d1d1b4171fd92cbfe4bbbac8ec4b9c4ccd2b0e5d15976d26
 DIST hypothesis-python-5.16.3.tar.gz 9011952 BLAKE2B d74a68c4ee1e5aacf4be1da5a4656011b0a15f990106c21298101d36e9a097c5dfd165987ad90a45f3a0b74375c4da609cd750f618242b94f34e03b6de0ee866 SHA512 912d984995d4ad8f06e98eb2cc327629328990fc1c072527ce261b637e16622acaf4d0d93928f9dd2d6601ab78f69aa6cf129d5cd7c1c00e50754ebc06957df0
 DIST hypothesis-python-5.19.0.tar.gz 9022213 BLAKE2B d8996cfd18d24722cd4faaf8335ce2b1c67757e3ffe973a33bd8ad087fcde513442d9fdf01f486ee07b33504e4088aa9e4c104782c3b03aa4f0d77a99ba6f672 SHA512 c26b0c9c5c7e1941c7f491e8e8165fda86a6e985204b9098c214080e508167f77f7dffe65192a4418f4958c3c6df44a20d75131895517c40c1113995ace3b604
+DIST hypothesis-python-5.19.1.tar.gz 9023768 BLAKE2B d1aa7c7a537e9f4ac0f33c12fa0c8269917aa83c01b8e333492d22ac8642ea29f678ca94d6f3d6c45efce7a2fd178d7cab6bcdfefef57c19e84c559a9affd8bd SHA512 81397f64f79debcea05f343f7c8c7cb528231be0bea15f0c6b81e3f68278eff6d73fa09a2f85a798c58468087b6135fea21530402a8fb9bd8014c040ad54a8c4
diff --git a/dev-python/hypothesis/hypothesis-5.19.1.ebuild b/dev-python/hypothesis/hypothesis-5.19.1.ebuild
new file mode 100644
index 000000000000..54efc2972e96
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-5.19.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 eutils
+
+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 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+src_prepare() {
+	# avoid pytest-xdist dep for one test
+	sed -i -e 's:test_prints_statistics_given_option_under_xdist:_&:' \
+		tests/pytest/test_statistics.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	pytest -vv tests/cover tests/pytest tests/quality ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+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/pyfakefs/Manifest b/dev-python/pyfakefs/Manifest
index 5df88a33cff8..57ba60cb1947 100644
--- a/dev-python/pyfakefs/Manifest
+++ b/dev-python/pyfakefs/Manifest
@@ -1,2 +1,3 @@
 DIST pyfakefs-3.7.2.tar.gz 180195 BLAKE2B f1e76b652fc67f630fb45798974dc22455e9e99509829fbcaa479f36887c90207d7b6f087e89c9e113bb44df8c4221dc4676129663740812a9426d84a1d47401 SHA512 33bdbf7e21f1135c0ee048943a4b7dffec96e018285e4ee2e6a1c6a7f9e595e27348c83af3803d80322e7fd12a59985a6bf6342aa6211ba95c74ffa20929fb5a
 DIST pyfakefs-4.0.2.tar.gz 177627 BLAKE2B a52bd900466203af6170bb9ce92f1e5f73f246d576f12390f5b52224de34fa69a3a4c426319b701953f040e343bcf267e20ea2a33df62c4a46f6397f760330aa SHA512 ba14cbc278ece50142d441b7731b01ba316ba9f11e5d442476e12b8b678490aace9578eb3b2fa2e47d6805795ceaf85574d3c5fb992a098585597c7e96d7143a
+DIST pyfakefs-4.1.0.tar.gz 185920 BLAKE2B ee61e5ecda697150374bef035054038aed29e23958c58a3b135aae8dae7b397a194586ef6fd3ae70db1d136572a23a876d7f2dacb7e5814c1bedc9bb4502c3fe SHA512 946e21e34643db2b84e53d14bd9758c8edaa9e5e40b827fd74b245f018e8084995f55256900bf795c23a5aae29f124d9fcb80caf08442f6292adb80ee59d79b4
diff --git a/dev-python/pyfakefs/files/pyfakefs-4.1.0-openpyxl.patch b/dev-python/pyfakefs/files/pyfakefs-4.1.0-openpyxl.patch
new file mode 100644
index 000000000000..44b76b0132bf
--- /dev/null
+++ b/dev-python/pyfakefs/files/pyfakefs-4.1.0-openpyxl.patch
@@ -0,0 +1,38 @@
+From 1d6fabcaccf8dc716f7a49a67f5342d83ef37976 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 12 Jul 2020 21:26:33 +0200
+Subject: [PATCH] Skip test_write_excel if openpyxl is not installed
+
+test_write_excel fails if pandas are installed but openpyxl is not.
+Adjust the condition around the case appropriately.
+---
+ pyfakefs/tests/patched_packages_test.py | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/pyfakefs/tests/patched_packages_test.py b/pyfakefs/tests/patched_packages_test.py
+index 05ed7ef..f8d8a1a 100644
+--- a/pyfakefs/tests/patched_packages_test.py
++++ b/pyfakefs/tests/patched_packages_test.py
+@@ -28,6 +28,11 @@ try:
+ except ImportError:
+     xlrd = None
+ 
++try:
++    import openpyxl
++except ImportError:
++    openpyxl = None
++
+ 
+ class TestPatchedPackages(fake_filesystem_unittest.TestCase):
+     def setUp(self):
+@@ -57,6 +62,7 @@ class TestPatchedPackages(fake_filesystem_unittest.TestCase):
+             df = pd.read_excel(path)
+             assert (df.columns == [1, 2, 3, 4]).all()
+ 
++    if pd is not None and openpyxl is not None:
+         def test_write_excel(self):
+             self.fs.create_dir('/foo')
+             path = '/foo/bar.xlsx'
+-- 
+2.27.0
+
diff --git a/dev-python/pyfakefs/pyfakefs-4.1.0.ebuild b/dev-python/pyfakefs/pyfakefs-4.1.0.ebuild
new file mode 100644
index 000000000000..f1b37e17b4b5
--- /dev/null
+++ b/dev-python/pyfakefs/pyfakefs-4.1.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+DISTUTILS_IN_SOURCE_BUILD=1
+
+inherit distutils-r1
+
+DESCRIPTION="a fake file system that mocks the Python file system modules"
+HOMEPAGE="https://github.com/jmcgeheeiv/pyfakefs/ https://pypi.org/project/pyfakefs/"
+SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${P}-openpyxl.patch
+)
+
+python_test() {
+	"${EPYTHON}" -m pyfakefs.tests.all_tests -v || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0.ebuild b/dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0.ebuild
deleted file mode 100644
index d2db63806a95..000000000000
--- a/dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0.ebuild
+++ /dev/null
@@ -1,26 +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,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Virtualenv fixture for py.test"
-HOMEPAGE="https://github.com/man-group/pytest-plugins https://pypi.org/project/pytest-fixture-config/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-
-RDEPEND="
-	dev-python/pytest[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools-git[${PYTHON_USEDEP}]
-	test? ( dev-python/six[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-mock/Manifest b/dev-python/pytest-mock/Manifest
index bfd087640852..2a04bc1fa1a4 100644
--- a/dev-python/pytest-mock/Manifest
+++ b/dev-python/pytest-mock/Manifest
@@ -1,3 +1,4 @@
 DIST pytest-mock-1.11.2.tar.gz 22825 BLAKE2B d6843d1cb1afc0d5a242103ec4900d56418198b84fa037faf4b6841d7fbfd388273a819a26bfe051e6030690105e74211a27d2b864448598962b3e03788958fa SHA512 6dc927ce35001d088bddd9d79e024141b9e8163033b07af14b1f63330ef8b93dbf88649702f8fcc4f6ad314212fa5cbd39486b539811ec918450b3f7a716f96c
 DIST pytest-mock-2.0.0.tar.gz 24665 BLAKE2B 31a3464e8bff5a2109716e95492ce1d59f2555769e69cccf4012bc268f88c5eeca99924006bdc78cc5e20cf227860d845bead9656aba1c081da58effb38ea100 SHA512 8bd7f634afebeae628470270c81f0198647bf8cd5b0fac438891d881d9823e40e814d598670bb9c9722b864990958e69d385c7c6a6e2adc81d2adcb303fbe0b0
 DIST pytest-mock-3.1.1.tar.gz 25038 BLAKE2B 416a84af52980d6984b4a2fd63a75fc79bf27fead86e7d0950f6dfcf38bfc27befbf86bdf8d6361b19a4e45c0bf6965d7a57bea5e3fff29a361e0cdb542ef0a1 SHA512 8e55bd7dc45de2c35fbbbbf4385ea805e6546c8d894f3b351bc31fe1c6d9c790f9e14f79de01262c18634d9dfd5142be7520181f1195faccba1f0e8a06ffe675
+DIST pytest-mock-3.2.0.tar.gz 25569 BLAKE2B e6a1ab23142cf3d7ac9385ac221bfce680c7b982cb489306557b60ca81563718cb9b7fcbb149cccb2cf6f06de5c3fa737d28b0711a3197fbbc86e432c5f4e614 SHA512 1ff442e26339ac41414a8678303fbc7eab573964661c664ef029c3b3377df4ab40173976316ef99e49dd208dc1e3c7cd0a0090f5453865343090cc9439f85fa9
diff --git a/dev-python/pytest-mock/pytest-mock-3.2.0.ebuild b/dev-python/pytest-mock/pytest-mock-3.2.0.ebuild
new file mode 100644
index 000000000000..a646df8a08aa
--- /dev/null
+++ b/dev-python/pytest-mock/pytest-mock-3.2.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Thin-wrapper around the mock package for easier use with pytest"
+HOMEPAGE="https://github.com/pytest-dev/pytest-mock/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/pytest-5[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	if has_version dev-python/mock; then
+		# test fails when standalone mock is installed
+		sed -e 's|^\(def \)\(test_standalone_mock(\)|\1_\2|' -i tests/test_pytest_mock.py || die
+	fi
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	distutils_install_for_testing
+	pytest --assert=plain -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pytest-shutil/pytest-shutil-1.7.0.ebuild b/dev-python/pytest-shutil/pytest-shutil-1.7.0.ebuild
deleted file mode 100644
index 2bb6c613aa3d..000000000000
--- a/dev-python/pytest-shutil/pytest-shutil-1.7.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A goodie-bag of unix shell and environment tools for py.test"
-HOMEPAGE="https://github.com/man-group/pytest-plugins https://pypi.org/project/pytest-shutil/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/contextlib2[${PYTHON_USEDEP}]
-	dev-python/execnet[${PYTHON_USEDEP}]
-	dev-python/path-py[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/termcolor[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	${RDEPEND}
-	dev-python/setuptools-git[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	# keeps trying to install this in tests
-	sed -i 's:path.py::' setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# at this point let's not fix python2 stuff
-	if ! python_is_python3; then
-		ewarn "Tests broken on python2, not runninge tests for ${EPYTHON}"
-		return 0
-	fi
-
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pytest-virtualenv/Manifest b/dev-python/pytest-virtualenv/Manifest
index de67e14fca82..2d56bfde9fee 100644
--- a/dev-python/pytest-virtualenv/Manifest
+++ b/dev-python/pytest-virtualenv/Manifest
@@ -1,2 +1 @@
-DIST pytest-virtualenv-1.2.11.tar.gz 9528 BLAKE2B 2ddcba76f89d207e8efaac8d59c6c1209fb9557fcfad586e1226b70d49ed8093aab602149335d23d497b0674e606d00d289fc291dd721aa7470f12ec221b5f61 SHA512 317ef8717f0ad4da6d38167f1f0dd65b6f1b3bd08bd1361fe6a27e6e422cd9fab62f3fac3848082bb24411505ecd41495fc1cbedb970d43945c8f6f8cfbbdf41
 DIST pytest-virtualenv-1.7.0.tar.gz 15767 BLAKE2B 5ee65aff72c50c8facef682827f58a8053d658aa072f3a69d50d13335dda2da37ffc29af009b52a50349647a4a38e149ba1b9847115fc4b4c4f54f063198b14f SHA512 0463ebf44ae18ee50a60e421a22aaaf0e34f827ec8f21c8f0dc79cbdc253748f9d1e5b33e4f418b52f0d8fd45990e162bb6410686ebe9fdc02650c286901d474
diff --git a/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild b/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild
deleted file mode 100644
index 8343d3db9a36..000000000000
--- a/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild
+++ /dev/null
@@ -1,37 +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,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Virtualenv fixture for py.test"
-HOMEPAGE="https://github.com/manahl/pytest-plugins https://pypi.org/project/pytest-virtualenv/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-	dev-python/pytest-shutil[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/virtualenv[${PYTHON_USEDEP}]
-"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools-git[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-RESTRICT="!test? ( test )"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r1.ebuild b/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r1.ebuild
index 432c97688576..7f6f53a08718 100644
--- a/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r1.ebuild
+++ b/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0.ebuild b/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0.ebuild
deleted file mode 100644
index 98bce45a1b40..000000000000
--- a/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Virtualenv fixture for py.test"
-HOMEPAGE="https://github.com/man-group/pytest-plugins https://pypi.org/project/pytest-virtualenv/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-	dev-python/pytest-shutil[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/virtualenv[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-git[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index a166febe8856..f8731d65ae21 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,3 +1,4 @@
 DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf
 DIST setuptools-46.4.0.zip 865912 BLAKE2B 452d36132f5648c79c7e1616a93ff6a39ab2f64b2864ee397b4f57e7f72c47d418ff274f5decd35b0591b09800ad2a7cbd71c283550bd0e60a4d85744a57d4ec SHA512 31e58fd1d682089a45d23aa07c3c2c4c952ca016fa4c3416b2cba979d8b57369f80baef98ce857912e506e87d6cb456497a1ce1c75a0cdf1ee25d4e753b58726
 DIST setuptools-49.1.1.zip 2173825 BLAKE2B 44a23a2bb8613b2dcf2368997c7d89ffbd957d7004c1872bbb64631955e5e8ed2f14a49d16fff4c384c42d56b486eb2ee07f2a3e3e72add97502f39309a17fee SHA512 d33c291edb64d015530e3bd66666a612539896018c5f6b6eff65719339ec75967c4f6200be36a60955f885ebc4cb86f9acd5f52d8fd2e1fb1e4919488a986603
+DIST setuptools-49.2.0.zip 2174648 BLAKE2B 03d4d2f4df5e20a39bdf8940610e0e0ad02566bc594ba90f58f476a90882dff32f1126eb02a797027d126e45f0e3092d848214e4d28292850b5042a23cdfe6ea SHA512 72de34b2000fba981eb186b612a6b7ccec920c480966ebec4e178dc024db5628aeefde778c1bbd7dae9d38ae86aa9384a1b7d86f9c358429742daeba72ba9850
diff --git a/dev-python/setuptools/setuptools-44.1.0.ebuild b/dev-python/setuptools/setuptools-44.1.0.ebuild
index 56fd5bdf49f2..9e87131b2a19 100644
--- a/dev-python/setuptools/setuptools-44.1.0.ebuild
+++ b/dev-python/setuptools/setuptools-44.1.0.ebuild
@@ -27,15 +27,14 @@ 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}]
 		$(python_gen_cond_dep '
-			dev-python/futures[${PYTHON_USEDEP}]
-		' -2)
+			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}]
+		' -3)
 	)
 "
 PDEPEND="
@@ -68,6 +67,11 @@ python_prepare_all() {
 }
 
 python_test() {
+	if ! python_is_python3; then
+		einfo "Tests are skipped on py2 to untangle deps"
+		return
+	fi
+
 	# 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}"
diff --git a/dev-python/setuptools/setuptools-46.4.0-r1.ebuild b/dev-python/setuptools/setuptools-46.4.0-r1.ebuild
index c78752db8a17..84c903df0f5f 100644
--- a/dev-python/setuptools/setuptools-46.4.0-r1.ebuild
+++ b/dev-python/setuptools/setuptools-46.4.0-r1.ebuild
@@ -21,15 +21,14 @@ 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}]
 		$(python_gen_cond_dep '
-			dev-python/futures[${PYTHON_USEDEP}]
-		' -2)
+			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}]
+		' -3)
 	)
 "
 PDEPEND="
@@ -63,6 +62,11 @@ python_prepare_all() {
 }
 
 python_test() {
+	if ! python_is_python3; then
+		einfo "Tests are skipped on py2 to untangle deps"
+		return
+	fi
+
 	distutils_install_for_testing
 	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
 	# It tries to sandbox the test in a tempdir
diff --git a/dev-python/setuptools/setuptools-49.2.0.ebuild b/dev-python/setuptools/setuptools-49.2.0.ebuild
new file mode 100644
index 000000000000..05a423b05f07
--- /dev/null
+++ b/dev-python/setuptools/setuptools-49.2.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6,7,8,9} 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} )
+
+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::' -e 's:--cov::' pytest.ini || die
+
+	# disable the code disabling non-existing coverage plugin
+	sed -i -e 's:cov = .*:return:' conftest.py || 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
+}