gentoo resync : 15.12.2019

5 files changed, 70 insertions, 3 deletions

diff --git a/dev-python/jaraco-functools/Manifest b/dev-python/jaraco-functools/Manifest
index 2602639d997b..eabe04f989e9 100644
--- a/dev-python/jaraco-functools/Manifest
+++ b/dev-python/jaraco-functools/Manifest
@@ -2,7 +2,8 @@ AUX jaraco-functools-2.0-fix-py37-tests.patch 1120 BLAKE2B 8fe7c807d7582ffd2c324
 DIST jaraco.functools-1.19.tar.gz 10588 BLAKE2B c71eb4e0c611f6a0bd82e04cacb7933961ba5e50091439c274bd8ceeda68b69789423994fe43f44af6cdd643b7a04418bc32ce2f937d118520298a019c5c6638 SHA512 7fbf1956ff8a132021e1f7fae5e98f40199a5d0e705b08b44ad5b2588fdd7d1088db9d7457b985c1852b50285a8f03cc9795fff0c4f53f9155f7c8ec371ff307
 DIST jaraco.functools-1.20.tar.gz 11063 BLAKE2B c202c3cda86c0f32fb3299a083ebb8d584eec444d9d8f0eff536f5e663634dab03c5831aef18d683dddde7eafff311b66a724d9004ad46f5ef92e90df16a9c7d SHA512 ba17b567dfcadb0d8ff1cc7a6ed07f2a23abfd42e73f3d815a6fa19d9be97d6af0c90bff7fb5e7ef67012ea5d931e9babc963da8a7105ba6a92d5c43c7126e04
 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
+EBUILD jaraco-functools-1.19-r1.ebuild 1584 BLAKE2B 19dbc26f0d326e2e1fe3a5e3e2111eeccadb423dafc4a108deeaffbb8bdf607a2c96b68477f6d45a0e4206f6548be2b9dec949ae45077061bb54752b0e77ea08 SHA512 f366964ea4665920d0f215e5ba8c35bbf8610c2483ffa70efcffaba6244ec0ca6950806e1d07876905ce3a5f05022b5263c8192ea218dbfd54f76a866a807ce6
+EBUILD jaraco-functools-1.20-r1.ebuild 1598 BLAKE2B 39587a96b71237112d3736608acb69f94b6318919c7ec9d12fc9bd90b8f025aa31f3a6d3fe9a029d67cb81fdb0c2e359fb7c7c0c1ea70c179c153c6fee536c4a SHA512 47941e1d0e771f478478fb2e73457df0897cefd78309236bc6f750e9527a4f4055845ea81f791b44cfe50b209bdad5581fc7b50514c88c83270acf706510e54a
+EBUILD jaraco-functools-2.0-r1.ebuild 1914 BLAKE2B 62f3b086a3f939320ba35037a41a4716a7a4e1cd0f13a4967f52c91fcec16b9a665dbe4353a39bd82f5c561d8d8ae3a00dcc0b4a62065a3ef2a4b197cdc5420b SHA512 93b2b6e1e8ac1dee7479e38654e941460ff6469412dd3a3efac6f874998afdc82a401664bbc9e3979a143f10abdb49d320ddb7f9c2ce5ecff1993fac8e063de0
+EBUILD jaraco-functools-2.0.ebuild 1832 BLAKE2B b5dd674f8b233e6025d9428723542c3b0d2852d3d2cf3044ac6fd6cd9cc56a3e56083d1e59f7fa7e8f46f68fa2081a0759b7937a73b6ef6927395db13c147087 SHA512 03f076df7ac91d39841717a1a03ba3edb06fe397bde01d42b691924ee8a2025f40f8d1e8ad2a9024e3a8a1a365dbf56cf2beb22eb3738e0011dc598b33342306
 MISC metadata.xml 550 BLAKE2B d8c0bdc0a3d2c0c3d37638bbc8534233acb659d38e0ed9e9e757ff35b261f241e213b73a5c55aee059aa7e73e71e574e4e4e52c12f3bfd9e6c3ac0059f2ec0ee SHA512 2fccec87fe5c57aa922ea30710d802c438f86fa3a72492dd4d2fc8917cc1a1a92ecb12fa5e9160c6245cbd6ab557791ac6f575de8a7a001842618f8d00343476
diff --git a/dev-python/jaraco-functools/jaraco-functools-1.19-r1.ebuild b/dev-python/jaraco-functools/jaraco-functools-1.19-r1.ebuild
index ebe3f058128f..8d6cc4c81dac 100644
--- a/dev-python/jaraco-functools/jaraco-functools-1.19-r1.ebuild
+++ b/dev-python/jaraco-functools/jaraco-functools-1.19-r1.ebuild
@@ -16,6 +16,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	<dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-functools/jaraco-functools-1.20-r1.ebuild b/dev-python/jaraco-functools/jaraco-functools-1.20-r1.ebuild
index 5dd7780fa576..fba36e00fdd5 100644
--- a/dev-python/jaraco-functools/jaraco-functools-1.20-r1.ebuild
+++ b/dev-python/jaraco-functools/jaraco-functools-1.20-r1.ebuild
@@ -16,6 +16,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	<dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-functools/jaraco-functools-2.0-r1.ebuild b/dev-python/jaraco-functools/jaraco-functools-2.0-r1.ebuild
new file mode 100644
index 000000000000..12ba71c5dadb
--- /dev/null
+++ b/dev-python/jaraco-functools/jaraco-functools-2.0-r1.ebuild
@@ -0,0 +1,63 @@
+# 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,8}} )
+
+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"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( 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}]
+	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}]
+	)
+"
+
+PATCHES=( "${FILESDIR}/${P}-fix-py37-tests.patch" )
+
+distutils_enable_sphinx docs \
+	">=dev-python/jaraco-packaging-3.2" \
+	">=dev-python/rst-linker-1.9"
+
+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
+
+	distutils-r1_python_prepare_all
+}
+
+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
+}
diff --git a/dev-python/jaraco-functools/jaraco-functools-2.0.ebuild b/dev-python/jaraco-functools/jaraco-functools-2.0.ebuild
index c6edbff3e677..5811de735c6c 100644
--- a/dev-python/jaraco-functools/jaraco-functools-2.0.ebuild
+++ b/dev-python/jaraco-functools/jaraco-functools-2.0.ebuild
@@ -16,6 +16,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]