gentoo resync : 11.07.2019

5 files changed, 112 insertions, 4 deletions

diff --git a/dev-python/jaraco-functools/Manifest b/dev-python/jaraco-functools/Manifest
index d0687c718956..2602639d997b 100644
--- a/dev-python/jaraco-functools/Manifest
+++ b/dev-python/jaraco-functools/Manifest
@@ -1,5 +1,8 @@
+AUX jaraco-functools-2.0-fix-py37-tests.patch 1120 BLAKE2B 8fe7c807d7582ffd2c3240e3ab74f58dd76f87ea6cbd6a8a5d2b0159579df71001993c36451f79547e674a4d19659646cd86c1181787de0fe5a3b963e646c07c SHA512 6c743bbce1f369e5369ee34a788b7966422e469986e7c5f3d7efbdc1ebafc7487a929fa0a1164aabd3da3a5f9f3c120093cfd978554e8506d05604dec2417bb9
 DIST jaraco.functools-1.19.tar.gz 10588 BLAKE2B c71eb4e0c611f6a0bd82e04cacb7933961ba5e50091439c274bd8ceeda68b69789423994fe43f44af6cdd643b7a04418bc32ce2f937d118520298a019c5c6638 SHA512 7fbf1956ff8a132021e1f7fae5e98f40199a5d0e705b08b44ad5b2588fdd7d1088db9d7457b985c1852b50285a8f03cc9795fff0c4f53f9155f7c8ec371ff307
 DIST jaraco.functools-1.20.tar.gz 11063 BLAKE2B c202c3cda86c0f32fb3299a083ebb8d584eec444d9d8f0eff536f5e663634dab03c5831aef18d683dddde7eafff311b66a724d9004ad46f5ef92e90df16a9c7d SHA512 ba17b567dfcadb0d8ff1cc7a6ed07f2a23abfd42e73f3d815a6fa19d9be97d6af0c90bff7fb5e7ef67012ea5d931e9babc963da8a7105ba6a92d5c43c7126e04
-EBUILD jaraco-functools-1.19.ebuild 1554 BLAKE2B 1a74244e073cd808188a79787629efed07f4963425e6a71b89ae9034c6395d847983ff7874d7699bff4cb85f2593d670ed4217c6ea5671954517b23d2c1f78f2 SHA512 3c025cc0d7ec81498c7aecb5726c1ed3db28be21a6f66b78dc07849d16d29dbca69b15eaaec13317d2f21ba7d980ac7bdbe14e48123d8874b363053b01fed4f3
-EBUILD jaraco-functools-1.20.ebuild 1568 BLAKE2B 1d500209af0e0c882fd2bd7b0de3eb3df065a9b67df2442d9170d78afcf49c400555c17e9c537f1f577352f0730102ded8bd06006a9a0bc4dea746e2ff77444b SHA512 f185fee1adce12b68146a4e8d5d4e7ccf86108694fa35f9604b5907ed75f1059d9cb04575210b9a8d752d04fe000fd8737b036f2c9164b1a9d652f059de7c944
+DIST jaraco.functools-2.0.tar.gz 14340 BLAKE2B 560490b1150c2385f9c4d468fe7ab4fa84475ad43e1ebed784343a71742976ed0c18df3f6240b1d5b69106a6835c0248838331a654f9d3fdc863622c3dda33be SHA512 dce30c08f0e9f3c7b682c78fc3a46a26d9972706f4c8449a12ba11aa5ed130c6d9ca405213fd93b6b4110ef9cea549e5fa925c96bfaf18681cd6957d8ba0889f
+EBUILD jaraco-functools-1.19-r1.ebuild 1557 BLAKE2B 0f4620b3574f1ccf8c3b3ea42818bd2b6bca79d35cd0d8de09b82a3b34b57e5431e8e7e5c70594e148c6e0d248fc8e984cf3b00b4ca7a93611f0b802a4307e46 SHA512 7663663c3020246578259f41c9db37796a1afe6bfaa78d8a2a65beeaf14b60af4ed3078c14370a05eb824a12a0c527d193dcba55057c71771bf2e5e18cdbaa50
+EBUILD jaraco-functools-1.20-r1.ebuild 1571 BLAKE2B 615b4ab5260a61f2eff891a47e1fbaf4d32c0fb10699c9d308a5c25517b71567a5755e87437bbff4cc657352da06c5ac43aca90428b0f613d48b7eada9839181 SHA512 ffc48c860f6a418e5b8408c0f2758d007bc79858c912587d77767775f668b64b8dcc7e4abfb1e1fa8b7493804410bf6306a611c120acf7c34095a673e1aab784
+EBUILD jaraco-functools-2.0.ebuild 1805 BLAKE2B e597f281e783bb5c2add665ffd93a87aeafbcdea15bb8db932eabc60a1c1a8ea5ca8d568232f50cd933055bc84967c240884a194210af6f84c29621aeca6974b SHA512 aab204c78228690d6d95c43123d0153fb1dcad2143842371923f053c50b4fcb02199f3566d3f2b6459bef4a4b762e2e34fafd708849d4352aad8378821e1ecea
 MISC metadata.xml 550 BLAKE2B d8c0bdc0a3d2c0c3d37638bbc8534233acb659d38e0ed9e9e757ff35b261f241e213b73a5c55aee059aa7e73e71e574e4e4e52c12f3bfd9e6c3ac0059f2ec0ee SHA512 2fccec87fe5c57aa922ea30710d802c438f86fa3a72492dd4d2fc8917cc1a1a92ecb12fa5e9160c6245cbd6ab557791ac6f575de8a7a001842618f8d00343476
diff --git a/dev-python/jaraco-functools/files/jaraco-functools-2.0-fix-py37-tests.patch b/dev-python/jaraco-functools/files/jaraco-functools-2.0-fix-py37-tests.patch
new file mode 100644
index 000000000000..dc296c4eb47c
--- /dev/null
+++ b/dev-python/jaraco-functools/files/jaraco-functools-2.0-fix-py37-tests.patch
@@ -0,0 +1,41 @@
+From cc972095e5aa2ae80d1d69d7ca84ee94178e869a Mon Sep 17 00:00:00 2001
+From: "Jason R. Coombs" <jaraco@jaraco.com>
+Date: Sat, 20 Apr 2019 07:08:41 -0400
+Subject: [PATCH] Rewrite docstring on Python 3.7.3 to allow the test to pass.
+ Fixes #12.
+
+---
+ conftest.py | 24 ++++++++++++++++++++++++
+ 1 file changed, 24 insertions(+)
+ create mode 100644 conftest.py
+
+diff --git a/conftest.py b/conftest.py
+new file mode 100644
+index 0000000..b6fad41
+--- /dev/null
++++ b/conftest.py
+@@ -0,0 +1,24 @@
++import sys
++import re
++
++import jaraco.functools
++
++
++def pytest_configure():
++	patch_for_issue_12()
++
++
++def patch_for_issue_12():
++	"""
++	Issue #12 revealed that Python 3.7.3 had a subtle
++	change in the C implementation of functools that
++	broke the assumptions around the method_cache (or
++	any caller using possibly empty keyword arguments).
++	This patch adjusts the docstring for that test so it
++	can pass on that Python version.
++	"""
++	affected_ver = 3, 7, 3
++	if sys.version_info[:3] != affected_ver:
++		return
++	mc = jaraco.functools.method_cache
++	mc.__doc__ = re.sub(r'^(\s+)75', r'\g<1>76', mc.__doc__, flags=re.M)
diff --git a/dev-python/jaraco-functools/jaraco-functools-1.19.ebuild b/dev-python/jaraco-functools/jaraco-functools-1.19-r1.ebuild
index ae4fb433a042..ebe3f058128f 100644
--- a/dev-python/jaraco-functools/jaraco-functools-1.19.ebuild
+++ b/dev-python/jaraco-functools/jaraco-functools-1.19-r1.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 RDEPEND="
-	dev-python/namespace-jaraco[${PYTHON_USEDEP}]
+	<dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 	dev-python/more-itertools[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' python2_7)
 "
diff --git a/dev-python/jaraco-functools/jaraco-functools-1.20.ebuild b/dev-python/jaraco-functools/jaraco-functools-1.20-r1.ebuild
index 8f111d3f60ec..5dd7780fa576 100644
--- a/dev-python/jaraco-functools/jaraco-functools-1.20.ebuild
+++ b/dev-python/jaraco-functools/jaraco-functools-1.20-r1.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="doc test"
 
 RDEPEND="
-	dev-python/namespace-jaraco[${PYTHON_USEDEP}]
+	<dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 	dev-python/more-itertools[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' python2_7)
 "
diff --git a/dev-python/jaraco-functools/jaraco-functools-2.0.ebuild b/dev-python/jaraco-functools/jaraco-functools-2.0.ebuild
new file mode 100644
index 000000000000..c6edbff3e677
--- /dev/null
+++ b/dev-python/jaraco-functools/jaraco-functools-2.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python{2_7,3_{5,6,7}} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Additional functions used by other projects by developer jaraco"
+HOMEPAGE="https://github.com/jaraco/jaraco.functools"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' python2_7)
+"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
+		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		dev-python/backports-unittest-mock[${PYTHON_USEDEP}]
+		dev-python/jaraco-classes[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+PATCHES=( "${FILESDIR}/${P}-fix-py37-tests.patch" )
+
+python_compile_all() {
+	if use doc; then
+		cd docs || die
+		sphinx-build . _build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	# Override pytest options to skip flake8
+	PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+# https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages#File_collisions_between_pkgutil-style_packages
+python_install() {
+	rm "${BUILD_DIR}"/lib/jaraco/__init__.py || die
+	# note: eclass may default to --skip-build in the future
+	distutils-r1_python_install --skip-build
+}