gentoo resync : 30.05.2020

4 files changed, 80 insertions, 6 deletions

diff --git a/dev-python/path-py/Manifest b/dev-python/path-py/Manifest
index 4b7cfa047e28..a8ad3f4e02b4 100644
--- a/dev-python/path-py/Manifest
+++ b/dev-python/path-py/Manifest
@@ -1,7 +1,9 @@
 AUX path-py-11.5.2-tests.patch 498 BLAKE2B 45dac8c0907630552463e73257b29aa351e9d2dae7e05f83a40facc756c1b41698d4f380141da759e20b806afdbdc91657fd692a2e1749cddc35cc7e05ed3ad4 SHA512 0f735f27fc98a1ef42d1ac4b105b8d807a645cf836f9d1525d261f1c0fd12b39867d78a6ad0dde14cb83bbafdd21bed20f54fc8eb150cde91c20cf71a6fb8df6
 AUX path-py-12.0.2-py38.patch 602 BLAKE2B 5a836612a8fb6e85595973eedcc39720cf59b5cd15c06c1520df4b3034c5719233734233f73360baee5366ac8417f677cbba3adaff5e8d01f71b5bdcd5abb5be SHA512 291f8b80012c29cb2ff2d1ad00d14b6b137a9803073df03298415f81ccb2a960f1d376dd49dc527b9a78167e06b4ce300983557b7475ca75abe1d62630cd9959
+DIST path-14.0.1.tar.gz 73830 BLAKE2B 7528f90708423802dbb177309b1a608bf8dd6b8b1563fcf3904a805830b1c53b76866ec8055bb8d4afda4adb88209b789aed90a33916e450748866479cad1889 SHA512 195abf3e70f3e82566653c8a1154047a8ab82b98eda09a2ae38ba8989e382fd3225fb5c772b827be54a3eafa696829afda2a0198d1bef7ee369e6dc40b0bf11c
 DIST path.py-11.5.2.tar.gz 43542 BLAKE2B 6b376eebf5b9197c4a2e23ee25c8261c7a8b9428007a626bc0f7d1be71496f4abf7fc6f11cee628432304e6a684bd690d6895f325981c4dd0092bdf3c4a4a4e3 SHA512 8a76ffd7d369adb4c5cbc25f2a52c5cabe899bf59d248d217fc5a086e45438d9dfe6b65b63aa2c89edd7662a793d213662cd6726d15f5ce49dc6bdaf22425865
 DIST path.py-12.0.2.tar.gz 44859 BLAKE2B c82bfd248e0e6eb21e3416c86f7a3a5fbfc5f5b327fe20da4084c53f22834013fc224bfbcf455690f53002c8f1c3e060aa0f04f3792e749dad62e51702cea348 SHA512 97971fa1e6bcdd4acf057ab4fe6cde2edb9d9d3d06dc049ea3779cae867221ae3e9d905daa1ec706f867473f738bb328b2795d3030244f8bd8ff7e8f0d5a6b2c
-EBUILD path-py-11.5.2.ebuild 1359 BLAKE2B 26a7e4fef469342245b7bf94630bd3f029d4230333916da45bf3d4c60599382a066eee2556704361229fb47e4b55bfc17b93887b26942bdfdc8406cad1c56053 SHA512 19f585ddc9d178f4b27f7efe60a4c32fa1921f217a89f0a63d7625989b1fb9dc5ae03e165ff8d3854996812920b1bea4904dd37b9c6ee36362c98b469f31a071
-EBUILD path-py-12.0.2-r1.ebuild 1385 BLAKE2B 2cb23e0bfa89eb411aea652b2a9216e57795f82da595b8d152ac751544cd2319aac6cda24b26b841df439fb53da2ba8ab610620fae39acd715c2cade8cd3a05e SHA512 ef1ee4bb910c0c9a29c4f8b256c497f5cbbc60abf5a9060027e0943e567e3e98bc8bf8489fc6d3452219a4af9190eaec67b4c4aff8a824c5e13e1128766da64b
+EBUILD path-py-11.5.2-r1.ebuild 1594 BLAKE2B 7053427dafa0ba02665e7dc70905116f85a926c23e3fc2fa48f54595c025161ecbd81bbb2ae5ee1a9dfe4e05c150bb4491e4aa9c4948a5c9cab50cb1d1752307 SHA512 b3882b7b3282a352873c33acfd4eb2f44ece9b0f3f5a114c91be10b18cfb574c29df45fdc36f14464f021baad0bfabc774fb04f3869a0c972f98525fcac0794d
+EBUILD path-py-12.0.2-r2.ebuild 1554 BLAKE2B e107da833380acd00a56844fbdc4bd11ab3c18600b198092d5eba6e95ab140bf43a7b375de6c882a17adadf8314413090aba8000e8167d9af9eec0622910ebb4 SHA512 77de4282a51a84639e479a2c32074eba3b824fb35766a05fb4b8a024c61206819a3b15f0954ad28d738a7c17b348711e9e3f95d6dfaab4b0bf70090feefbc91a
+EBUILD path-py-14.0.1.ebuild 1425 BLAKE2B bb2aca0426da6b23489a896ee03332171f77c6c902304ece9b4348d12a9788937785a8aa117e5ce45bb4a973a41cac69962d6f1e5c6d28c0c13dde5ab1025600 SHA512 3564c5eb163852c60e4e536a1dda044e45e3159594b5d23750ea783f7ee9fd978166df2fc53816d038c3e29ce03b04e2a8b15a72e18b00b704c18d1fe94930d5
 MISC metadata.xml 376 BLAKE2B a0c037397a1f2315bfbe646c139a2c565b028d0d440e4b830550a6a32fcd78415d4e9c3d4cbc0f80e5b3914dc85b1268cf101b55c7eb1eeecee004322d402340 SHA512 6273623109e7f816ecf729a7dd65ae21b0f69049343ad49b6d439312512324aa94f2d5764e2248690718a57a24a50babcf2f29813c4d45f58eef44c9f14cb9bd
diff --git a/dev-python/path-py/path-py-11.5.2.ebuild b/dev-python/path-py/path-py-11.5.2-r1.ebuild
index c95f162bf185..fe2a341258d2 100644
--- a/dev-python/path-py/path-py-11.5.2.ebuild
+++ b/dev-python/path-py/path-py-11.5.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 )
 
 inherit distutils-r1
 
@@ -18,7 +18,9 @@ LICENSE="MIT"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
-RDEPEND="$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' python3_{5,6,7} pypy3)
+RDEPEND="
+	$(python_gen_cond_dep 'dev-python/backports-os[${PYTHON_USEDEP}]' -2)
+	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' python3_{5,6,7} pypy3)
 	dev-python/appdirs[${PYTHON_USEDEP}]"
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
@@ -44,6 +46,12 @@ python_prepare_all() {
 	sed -i -r 's: --flake8:: ; s: --black:: ; s: --cov::' \
 		pytest.ini || die
 
+	# fragile test for import time
+	sed -i -e 's:test_import_time:_&:' test_path.py || die
+
+	# fails on py3.9
+	sed -i -e 's:test_version:_&:' test_path.py || die
+
 	distutils-r1_python_prepare_all
 }
 
diff --git a/dev-python/path-py/path-py-12.0.2-r1.ebuild b/dev-python/path-py/path-py-12.0.2-r2.ebuild
index 12f5101bb042..8a2bc901dae9 100644
--- a/dev-python/path-py/path-py-12.0.2-r1.ebuild
+++ b/dev-python/path-py/path-py-12.0.2-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
@@ -20,7 +20,9 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
 IUSE="test"
 
 RDEPEND="$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' python3_{5,6,7} pypy3)
-	dev-python/appdirs[${PYTHON_USEDEP}]"
+	dev-python/appdirs[${PYTHON_USEDEP}]
+	!<dev-python/pytest-shutil-1.7.0-r1
+	!<dev-python/pytest-virtualenv-1.7.0-r1"
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/packaging[${PYTHON_USEDEP}]
@@ -45,6 +47,9 @@ python_prepare_all() {
 	sed -i -r 's: --flake8:: ; s: --black:: ; s: --cov::' \
 		pytest.ini || die
 
+	# fragile test for import time
+	sed -i -e 's:test_import_time:_&:' test_path.py || die
+
 	distutils-r1_python_prepare_all
 }
 
diff --git a/dev-python/path-py/path-py-14.0.1.ebuild b/dev-python/path-py/path-py-14.0.1.ebuild
new file mode 100644
index 000000000000..a9be9a3f748e
--- /dev/null
+++ b/dev-python/path-py/path-py-14.0.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+MY_P="path-${PV}"
+
+DESCRIPTION="A module wrapper for os.path"
+HOMEPAGE="https://pypi.org/project/path/ https://github.com/jaraco/path"
+SRC_URI="mirror://pypi/p/path/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' python3_{5,6,7} pypy3)
+	dev-python/appdirs[${PYTHON_USEDEP}]
+	!<dev-python/pytest-shutil-1.7.0-r1
+	!<dev-python/pytest-virtualenv-1.7.0-r1"
+BDEPEND="
+	test? (
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}/path-py-12.0.2-py38.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# avoid a setuptools_scm dependency
+	sed -e "s/setup_requires = setuptools_scm/version = '${PV}'/" \
+		-i setup.cfg || die
+
+	# disable fancy test deps
+	sed -e 's: --flake8:: ; s: --black:: ; s: --cov:: ; s: --mypy::' \
+		-i pytest.ini || die
+
+	# fragile test for import time
+	sed -i -e 's:test_import_time:_&:' test_path.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	PYTHONPATH=. pytest -vv || die
+}