6 files changed, 114 insertions, 3 deletions
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index 65a808dbe292..f468a4416980 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -1,2 +1,3 @@
 DIST importlib_metadata-1.7.0.tar.gz 29233 BLAKE2B a8cd97a384ab06201025fcbdc401fb25788c2eb1dd4f1697ca00e79634cbce32b984cb8a7c2aeacfb0871f92857d08f3ce9c3ae43d698df7401db91add07b6ca SHA512 31f7cda6a1149ca2040032945b19b55d2e97ef8be67db1423c2c2cbb79da3dead46338f3c9eb03b46f9202fca08ed7bf388adc25d34903ddff4b2873c8a89aba
 DIST importlib_metadata-2.0.0.tar.gz 29289 BLAKE2B 4ec24db057006affe1dee20e021a47d385770b1aa905db4ff4223d59f19b53dc85c21475875074664a84a0fb6994493735f5e098d38f938816ebc69dced7a40d SHA512 3f789d717f04f7649dd4a75895669b4f9b875671937035c1c76bd089504afff8c2ba5bfb6a91096ba29eccadc88dca98ea1da5107772fd2053541db15c52b16a
+DIST importlib_metadata-3.0.0.tar.gz 28858 BLAKE2B b1d4c7dc8a1fbbd66223c32afcbf43782b42b32ecb41d1fc7fdabb93c0c8ea3797f99c5b98fa5c0fad3b176bccbfd8716d72ed85a15f8ee8d0969c5e48a62478 SHA512 c5e8f79af1f0aaee1c768ef5640c65a76154544d7e900a11d01724e8ca30007ada80fd710e808e66f35dbc9fcf678824eebc5b92ffbc3d5a04e7f8f5aca0368a
diff --git a/dev-python/importlib_metadata/importlib_metadata-3.0.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-3.0.0.ebuild
new file mode 100644
index 000000000000..9a9447958187
--- /dev/null
+++ b/dev-python/importlib_metadata/importlib_metadata-3.0.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Included in Python >= 3.8
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Read metadata from Python packages"
+HOMEPAGE="https://github.com/python/importlib_metadata"
+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 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="dev-python/zipp[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/importlib_resources-1.3.0[${PYTHON_USEDEP}]
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pyfakefs[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs dev-python/rst-linker
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	# Skip a test that requires pep517 which is not in the tree
+	sed -e 's:test_find_local:_&:' -i tests/test_integration.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/importlib_metadata/metadata.xml b/dev-python/importlib_metadata/metadata.xml
index 01c83664ac88..ffe06e8a6cd4 100644
--- a/dev-python/importlib_metadata/metadata.xml
+++ b/dev-python/importlib_metadata/metadata.xml
@@ -12,8 +12,9 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">importlib-metadata</remote-id>
-		<remote-id type="gitlab">python-devs/importlib_metadata</remote-id>
-		<bugs-to>https://gitlab.com/python-devs/importlib_metadata/issues</bugs-to>
+		<remote-id type="github">python/importlib_metadata</remote-id>
+		<bugs-to>https://github.com/python/importlib_metadata/issues</bugs-to>
+		<doc>https://importlib-metadata.readthedocs.io/</doc>
 	</upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/pymediainfo/Manifest b/dev-python/pymediainfo/Manifest
index 93dc5c392046..6f530a591a8a 100644
--- a/dev-python/pymediainfo/Manifest
+++ b/dev-python/pymediainfo/Manifest
@@ -1,2 +1,2 @@
 DIST pymediainfo-4.3.tar.gz 437170 BLAKE2B a085268c90fd963501b0f57f4e58e000c58db57e902bfedf13b67ae2b56334b333bb028f24f7593416ba956943650031a3ab0b6d6627c9ffd3728e70c34182bb SHA512 641b335761a7382b4bb7e559afbba1a9694a3b588bc329187b62d1d6cb769a6ff0c110033e4fb50ab39991687a6f728cab53d528ecedf0164c55a9ce31250fe8
-DIST pymediainfo-5.0.2.tar.gz 444950 BLAKE2B e741802ebdf64752e41648d490179cf56510800fe1c631520be138bbb985a03f061a80d59b71a44ef73e7198853198e1d85c7007d5b99f26f2033b7f6026a4b5 SHA512 7db94cf2326a518f7693f2e8d76aa7aef3440466b0eac768a553cc0763d3bceb84d8051dcd79db6577e22a4ddd580f910ac286c571f3e51197ef2e268a73671a
+DIST pymediainfo-5.0.3.tar.gz 445381 BLAKE2B f3ff936100badf6899cd0eb3e1155ac82b2f6831dd9a32baf9c1f67f3f5948e5731798c3630aecd97cd86ecbd5a492e73353c19637775453a1fe291d0a15ce33 SHA512 4124b69910050fb84162140cda5e184cb0fc13b06b85ae61ff6e47b4fca236242558b9c3c8ea90ab804ed9400171f7b1dccc25ec5961b37d1f68de21fe64580e
diff --git a/dev-python/pymediainfo/pymediainfo-5.0.2.ebuild b/dev-python/pymediainfo/pymediainfo-5.0.3.ebuild
index f64a835f4b2e..f64a835f4b2e 100644
--- a/dev-python/pymediainfo/pymediainfo-5.0.2.ebuild
+++ b/dev-python/pymediainfo/pymediainfo-5.0.3.ebuild
diff --git a/dev-python/tox/tox-3.20.1-r1.ebuild b/dev-python/tox/tox-3.20.1-r1.ebuild
new file mode 100644
index 000000000000..479835b95aed
--- /dev/null
+++ b/dev-python/tox/tox-3.20.1-r1.ebuild
@@ -0,0 +1,72 @@
+# 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_{5,6,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="virtualenv-based automation of test activities"
+HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/"
+SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+# doc disabled because of missing deps in tree
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/filelock[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-1.1[${PYTHON_USEDEP}]
+	' python3_{5,6,7} pypy3)
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
+	dev-python/pip[${PYTHON_USEDEP}]
+	dev-python/py[${PYTHON_USEDEP}]
+	>=dev-python/six-1.14[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]"
+# TODO: figure out how to make tests work without the package being
+# installed first.
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
+		>=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
+		dev-python/pathlib2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		=dev-python/tox-${PV}-${PR}[${PYTHON_USEDEP}]
+	)"
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# broken without internet
+	sed -i -e 's:test_provision_non_canonical_dep:_&:' \
+		tests/unit/session/test_provision.py || die
+	sed -i -e 's:test_provision_interrupt_child:_&:' \
+		tests/integration/test_provision_int.py || die
+	# broken with our mock version (?)
+	sed -i -e 's:test_create_KeyboardInterrupt:_&:' \
+		tests/unit/test_venv.py || die
+	# broken with Gentoo Python layout
+	sed -i -e 's:test_tox_get_python_executable:_&:' \
+		-e 's:test_find_alias_on_path:_&:' \
+		tests/unit/interpreters/test_interpreters.py || die
+	# Remove unneeded version constraint
+	sed -i -e '/^[[:space:]]*importlib-metadata/d' setup.cfg || die
+
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv --no-network || die "Testsuite failed under ${EPYTHON}"
+}