gentoo resync : 15.12.2019

8 files changed, 152 insertions, 3 deletions

diff --git a/dev-python/path-py/Manifest b/dev-python/path-py/Manifest
index 30e287b6e5c4..2c33333ade27 100644
--- a/dev-python/path-py/Manifest
+++ b/dev-python/path-py/Manifest
@@ -1,7 +1,13 @@
+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.py-10.3.1.tar.gz 35871 BLAKE2B 94e45372ad39f9c5dfe4167f5d1fd58e1e501272ed2fa5ecd116f0fffc7b924c66cc436a83a296a167c08bb2f57f169b1ace7692c2ac1284fc9070918b409a3c SHA512 e8dc874521aee6cadc5e3d7a66ca6909010f2069b1e6ed0298a3dbd86466c971ca466b442bff90906cb891fa9f13190fd9b3bf4ae62442e9fe73909169c32c02
 DIST path.py-11.0.1.tar.gz 38348 BLAKE2B 80bfc308c72f0e2867ce1811709e3d2ff63888be53814e026ee221c381387a581f8e0f8da05e5c1fade2e0d6b93ba930dc9b1f38117667239174a3acc85d76f0 SHA512 48bc8352af74e70e702e712f35f08a0bf05713b2de5f2eb617f8ef2f9138344cf74fab453aff6cbd38bd88f5c3612c39b3605e0d3899c2ab1c667662558a8651
+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
 DIST path.py-8.1.2.tar.gz 33437 BLAKE2B 0033b64e9d0f4c719414e5345989308a113c9e23f99fb46722ee7d7de85c7bb4b471f5416d646d943771cdd369ac2d8f23f925660d4212b18acf7b82daaa76c0 SHA512 639b6247d99bd7c88e7505f5f41a5896266f23c0517b470ea5c1ec90ca76e87f1971babee623bbd7bea57bbef5f7677a7163bc51bae78c3c54e978eaf7f122d1
-EBUILD path-py-10.3.1.ebuild 861 BLAKE2B 5f5be7265c82eef0e269ec73be056e254e3a7b9c981f1ee64d85998a3b0b3603a74b5996fd93c021e73df1f74843027c6ab90eca4ea1db184667a500704a9945 SHA512 518606139001b597ed15dd2bfb624d51a39870bc0ba9829e4880bf59ee08f4c770204b087bb7b9f311228dcaf13f7aab730caa7139d55fb70de500851c70e8a1
-EBUILD path-py-11.0.1.ebuild 985 BLAKE2B be00ade5e0e181a584f733624fd5e1d20e2d74272e790965ac805d09d9376f4e9c6d5458825d7cd72fafe9bb0b9ce804edd02824ef9f4cd3faec65af9185ef08 SHA512 ab267997a999d2cdf13e1d6402800827bad87940bd0a2edebf8faed1389987d553b6189d15cf55c0655fc5f991f8f088797f87ba884a28e4b4df4172b7037899
-EBUILD path-py-8.1.2.ebuild 943 BLAKE2B 947c154a6c65045b9a1709c4784e9f5a2471e22683af837b294e8db7ea481b3c94342a5bb9d64a5d6f48e614a219d25f8772d845dc185cb5e31e8b89a4f9684b SHA512 b4391fb5c8708f7628b1de1124b94a6b9f4ce1f9bdd3b71f8983539e66a72df54088bc69a8b8b3a4115430df770441a9721d7f08e9815758857d53103e1cdb1a
+EBUILD path-py-10.3.1.ebuild 888 BLAKE2B 9d99bf64f47192f1e43aab0abfd5b76977889e7aee661074067d060e165d4649218bd350f48589e547167587d1697929e2765d8d13eedd1207449487b28e6ec3 SHA512 9ffcd001f6797ab99dde65c773d60dc5b5a10c19842aed98dbcde5faf8b9ec17ed94c7b0a05aa00c933aedaf37956c106262f38d60022a9f22e5c0dcae99b1fc
+EBUILD path-py-11.0.1.ebuild 1126 BLAKE2B 45d68003dc8eb460ae4de27a65878ca6aa861574fd478e984ed48f25cc4d4f676070510e9bd1627fdbeea15784c794df8c9f2328065cfadd1326a37b6c89172d SHA512 1ead72802909fdaa7f184c0dc9b53eacbeed1c1f1dcffe9ba6408ac337d3d5443867e3525d5b5896e921219b90225612f7808989c15e04b46587c47d8978f600
+EBUILD path-py-11.5.2.ebuild 1377 BLAKE2B 8b23d20acec52d8511d94ee34307a9d8a0b1676545c05c6488229a12fcddf8e3b0aaf81d13ab6c3ea5ebde06c8cc1af19e459a3b6410309d14fd0950db038e6c SHA512 1cc504ab537e0994c0b991b1eb3c2d8940688a2fab3632329edcf963d5bf78c3d9ad9bb9f4c348407fde32ae356e35013514357d456a376c783410dd76aec000
+EBUILD path-py-12.0.2.ebuild 1365 BLAKE2B d5dda755281802d39f5bb7bfde94e246b18033ca2c6de605871ac597d273c018890504bd894b453fab27768afbf6e84d0c712ddad1fd789efdbda81407039b24 SHA512 b7aef46770250853f9bd5708cceb1a4cb445f1963b04732be660171551534f2ae18c7f6fa532d6b3676b831d5ac38168d607e436e8459eaceda02e1372137a5a
+EBUILD path-py-8.1.2.ebuild 970 BLAKE2B 867a823f4517255df63bfbc739caf38eb344678ac2906bb8ecba0e2133b595442c7a3a3705c8dfda81966dcff8d4074e902fe4728dcef3ad94083bdc763d092a SHA512 b873924299b6191cebbe30c5043fa04dbe97c0d584c184f8d67a1dfefcb74d622fc9849457104422add736b45c78f27a7fa7979f4ebd0c7dfc01fbb39ecb455a
 MISC metadata.xml 376 BLAKE2B a0c037397a1f2315bfbe646c139a2c565b028d0d440e4b830550a6a32fcd78415d4e9c3d4cbc0f80e5b3914dc85b1268cf101b55c7eb1eeecee004322d402340 SHA512 6273623109e7f816ecf729a7dd65ae21b0f69049343ad49b6d439312512324aa94f2d5764e2248690718a57a24a50babcf2f29813c4d45f58eef44c9f14cb9bd
diff --git a/dev-python/path-py/files/path-py-11.5.2-tests.patch b/dev-python/path-py/files/path-py-11.5.2-tests.patch
new file mode 100644
index 000000000000..4760b20d3cb4
--- /dev/null
+++ b/dev-python/path-py/files/path-py-11.5.2-tests.patch
@@ -0,0 +1,15 @@
+diff --git a/test_path.py b/test_path.py
+index 2a7ddb8..cc7a58f 100644
+--- a/test_path.py
++++ b/test_path.py
+@@ -420,6 +420,10 @@ class TestScratchDir:
+         platform.system() == 'Windows' and path.PY3,
+         reason="Can't write latin characters. See #133",
+     )
++    @pytest.mark.xfail(
++        path.PY2,
++        reason="Broken on python 2.7",
++    )
+     def test_listdir_other_encoding(self, tmpdir):
+         """
+         Some filesystems allow non-character sequences in path names.
diff --git a/dev-python/path-py/files/path-py-12.0.2-py38.patch b/dev-python/path-py/files/path-py-12.0.2-py38.patch
new file mode 100644
index 000000000000..292b0454acc1
--- /dev/null
+++ b/dev-python/path-py/files/path-py-12.0.2-py38.patch
@@ -0,0 +1,19 @@
+diff -ur path.py-12.0.2.orig/path/__init__.py path.py-12.0.2/path/__init__.py
+--- path.py-12.0.2.orig/path/__init__.py	2019-11-20 17:17:03.644205243 -0800
++++ path.py-12.0.2/path/__init__.py	2019-11-20 17:17:57.356875924 -0800
+@@ -72,7 +72,13 @@
+ 
+     __version__ = importlib_metadata.version('path.py')
+ except Exception:
+-    __version__ = 'unknown'
++    try:
++        import importlib.metadata
++
++        __version__ = importlib.metadata.version('path.py')
++
++    except Exception:
++        __version__ = 'unknown'
+ 
+ 
+ class TreeWalkWarning(Warning):
+Only in path.py-12.0.2/path: .__init__.py.un~
diff --git a/dev-python/path-py/path-py-10.3.1.ebuild b/dev-python/path-py/path-py-10.3.1.ebuild
index 933a80584976..789bd00cc84f 100644
--- a/dev-python/path-py/path-py-10.3.1.ebuild
+++ b/dev-python/path-py/path-py-10.3.1.ebuild
@@ -17,6 +17,7 @@ SLOT="0"
 LICENSE="MIT"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]"
diff --git a/dev-python/path-py/path-py-11.0.1.ebuild b/dev-python/path-py/path-py-11.0.1.ebuild
index 5b22dbd06d9a..1836476559cf 100644
--- a/dev-python/path-py/path-py-11.0.1.ebuild
+++ b/dev-python/path-py/path-py-11.0.1.ebuild
@@ -17,6 +17,7 @@ SLOT="0"
 LICENSE="MIT"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]"
@@ -31,6 +32,8 @@ S="${WORKDIR}/${MY_P}"
 
 python_prepare_all() {
 	sed '/setuptools_scm/d' -i setup.py || die
+	sed -r -i "s:setuptools_scm[[:space:]]*([><=]{1,2}[[:space:]]*[0-9.a-zA-Z]+)[[:space:]]*::" \
+		setup.cfg || die
 
 	# disable flake8 tests
 	sed -i 's/ --flake8//' pytest.ini || die
diff --git a/dev-python/path-py/path-py-11.5.2.ebuild b/dev-python/path-py/path-py-11.5.2.ebuild
new file mode 100644
index 000000000000..2f33ff1c53da
--- /dev/null
+++ b/dev-python/path-py/path-py-11.5.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+
+inherit distutils-r1
+
+MY_P="path.py-${PV}"
+
+DESCRIPTION="A module wrapper for os.path"
+HOMEPAGE="https://pypi.org/project/path.py/ https://github.com/jaraco/path.py"
+SRC_URI="mirror://pypi/p/path.py/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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}]"
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}/path-py-11.5.2-tests.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# avoid a setuptools_scm dependency
+	sed -i "s:use_scm_version=True:version='${PV}',name='${PN//-/.}':" setup.py || die
+	sed -r -i "s:setuptools_scm[[:space:]]*([><=]{1,2}[[:space:]]*[0-9.a-zA-Z]+)[[:space:]]*::" \
+		setup.cfg || die
+
+	# disable flake8 tests
+	sed -i -r 's: --flake8:: ; s: --black:: ; s: --cov::' \
+		pytest.ini || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	PYTHONPATH=. pytest -v || die
+}
diff --git a/dev-python/path-py/path-py-12.0.2.ebuild b/dev-python/path-py/path-py-12.0.2.ebuild
new file mode 100644
index 000000000000..5a4e0998bfa0
--- /dev/null
+++ b/dev-python/path-py/path-py-12.0.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7,8} pypy3 )
+
+inherit distutils-r1
+
+MY_P="path.py-${PV}"
+
+DESCRIPTION="A module wrapper for os.path"
+HOMEPAGE="https://pypi.org/project/path.py/ https://github.com/jaraco/path.py"
+SRC_URI="mirror://pypi/p/path.py/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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}]"
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}/path-py-12.0.2-py38.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# avoid a setuptools_scm dependency
+	sed -i "s:use_scm_version=True:version='${PV}',name='${PN//-/.}':" setup.py || die
+	sed -r -i "s:setuptools_scm[[:space:]]*([><=]{1,2}[[:space:]]*[0-9.a-zA-Z]+)[[:space:]]*::" \
+		setup.cfg || die
+
+	# disable flake8 tests
+	sed -i -r 's: --flake8:: ; s: --black:: ; s: --cov::' \
+		pytest.ini || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	PYTHONPATH=. pytest -v || die
+}
diff --git a/dev-python/path-py/path-py-8.1.2.ebuild b/dev-python/path-py/path-py-8.1.2.ebuild
index 4129ef023354..93895443079d 100644
--- a/dev-python/path-py/path-py-8.1.2.ebuild
+++ b/dev-python/path-py/path-py-8.1.2.ebuild
@@ -17,6 +17,7 @@ SLOT="0"
 LICENSE="MIT"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]