gentoo resync : 15.12.2019

5 files changed, 69 insertions, 3 deletions

diff --git a/dev-python/backports-unittest-mock/Manifest b/dev-python/backports-unittest-mock/Manifest
index e7811ef41921..6b7242fd60a4 100644
--- a/dev-python/backports-unittest-mock/Manifest
+++ b/dev-python/backports-unittest-mock/Manifest
@@ -1,7 +1,8 @@
 DIST backports.unittest_mock-1.3.tar.gz 4687 BLAKE2B a01712eaf5cb32d7da803aa9034f68508faa4d8db8d6f6eb02e20cb9f42c4e6bda3b409a0e2f676b6b7782f16d78877da6f093af6ac1f1deb100b19969570787 SHA512 71741db5c2e43beac8c72dbffa0efd4bbae140177f56c3b2bca3e13a3aebd8a418b5ad7654421899980f73b8dbfb3b02d85d2dfcd7b3827047fa6ba84a8dcfff
 DIST backports.unittest_mock-1.4.tar.gz 6034 BLAKE2B c347f1d45c610701b605cb75304f93c8fc7a8534e2c14efb4600a7c5cdbcff02e0534dbf572ac248d17dbc161dcabd8448941d8340a71734f29ff3294c8210f1 SHA512 ad19eba7c221fbb97ba710cbe96aa26de74ad8c70ea7b794d8dcad3dc86a55a45d36f542ad829fb8c4bcf09c772cf64532dabf337b40bf87c7b29e13236484a9
 DIST backports.unittest_mock-1.5.tar.gz 8941 BLAKE2B ba0ba99bd2668ffaf02f10cd5cf511e32660a2592550f879422400265a4b75732e03d2d0627c4563daca0063ac5759d30abf450c13f9d38b6b3a94b85cab9c17 SHA512 2f2d2c34f80009829935f9e97404bf1840d3ead9dad55fc6f967135b80ed572389d7f42ead2f82671ecfe341eb6ccf696a49560c848d1a36ec5570769a5820a5
-EBUILD backports-unittest-mock-1.3.ebuild 1469 BLAKE2B 09a8415da3184fbe957cc7f848287a566f5d43693ecd97566370f720e7e1a8e73284bf21da99798e7ec7f4fafd787c057630c0d246c977b5af4efa5ab83787e8 SHA512 99aa9d7d3bdffead81d76912fcf763a37107afead4eacb774dcbf74ea5ef627500120c36a3d1cfc6bb8a6439d194868ad5835d87a6f953b3b046ab287ab19a9f
-EBUILD backports-unittest-mock-1.4.ebuild 1580 BLAKE2B 63fbb76d6c91055df80c30c27248c2806196a854deca0929638d00b558190544656309d35907736bd67db1f4ef90868691a477f9729a5bf0fda8e59b40a7263d SHA512 d3f9773aff36e962ff3745689cc599bb02096a6ab41d482d7366d3b3c5a454d71cbc7da87425d218f430bc3fa5b1cf58ff2beac15642efb8468bd9207afcea6e
-EBUILD backports-unittest-mock-1.5.ebuild 1581 BLAKE2B 23ed87ecec6805f93543cdf8b0cf69f392a6d6a47f21e62e822426aaae2f2b6c8008cc643dd702009d829e857810229f79c9e9d56db479bc9e796d6ea8ca181a SHA512 a750b834fa44d8ce967af89afe5d50229cf743175c4486e0f164f4b0bb41c2a93461213cede82dd43277c4080a7987683823bdffd6218316e93f97dcc5025ec6
+EBUILD backports-unittest-mock-1.3.ebuild 1496 BLAKE2B 5a60644895a880ef9e9bcae2622227ed21ed687d6dfee13ab217a6f921b71bf8d6322012af6a43ab6114b6bfb13c9b04f3459e09c69618851d42c483083b5bf9 SHA512 c5c678db5b51788cd7140a340217347170d389d7f8412a948c7f0fd4a0ef6a0956c48f24dc2abf4155b37b9c6697a815b1387d5249c2c966a576299faf5c7367
+EBUILD backports-unittest-mock-1.4.ebuild 1607 BLAKE2B 4f4077e8c578075fe2c6558f95cba984fc0f16d43a1c311376860b7d338297cda406cdf7b712b65b30ad857c7d642a2b975e0dd8187032f910c423fe0c5c853b SHA512 c9626664eaecff1185421d1cc96d42af78b0678605367f740df02bc729ff88a39ee90a8ea9eceb0573b056ba95dfa65c93f1af5ecdeb012191a0fe513110d7f0
+EBUILD backports-unittest-mock-1.5-r1.ebuild 1637 BLAKE2B 54c5992d8f82d3bcac8967af91bd8b47c8e9fa2a447b67a022771c2f1591cfed1cda4c84f3670fe8a96207e92ad211f32170fd157f90c873cdef8a43092bf31e SHA512 95cf6bf2991dad843deef9a009f9b4c59dd3023e12060f8a60a90149bed3b190c8b0431facc82378606cdcc3bc46a54f538b272a98d419adb2dc3ec6e6ae6ab2
+EBUILD backports-unittest-mock-1.5.ebuild 1608 BLAKE2B 941f8b41c18166a23ad8b4a2a8804bed0b15630079b4d58502b0957e9138b89e409528d8658bdf7a3131f81705265cc96e091cf400a976313e20491d3d0b9ab7 SHA512 b23f07aa63ed8432755a5d3b5a393de3d13e09d59e3e4236c36df9ab76ccd61e869badb5ede3f938db3b806138944be291ad9e152582a28fea8829eaa063061b
 MISC metadata.xml 657 BLAKE2B a5a51b30ebc334f17d09e38e1f42fc1e06fcf65de5a56810378909169cdce48bcb0acceb8b192bec54e67a254b0809a0339fb8ee11fee48e043a082f63fb9bf9 SHA512 5d0e58887da4b7362f3469c218af61c4ec31426aec212013f3ee19992fae9e664ce13b226c928fb0e6e6ea3efdd946d1c09b1da623a741e89b7b68b74e73cf24
diff --git a/dev-python/backports-unittest-mock/backports-unittest-mock-1.3.ebuild b/dev-python/backports-unittest-mock/backports-unittest-mock-1.3.ebuild
index ef4ec1275dbf..d59f641f84e6 100644
--- a/dev-python/backports-unittest-mock/backports-unittest-mock-1.3.ebuild
+++ b/dev-python/backports-unittest-mock/backports-unittest-mock-1.3.ebuild
@@ -19,6 +19,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/backports[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]"
diff --git a/dev-python/backports-unittest-mock/backports-unittest-mock-1.4.ebuild b/dev-python/backports-unittest-mock/backports-unittest-mock-1.4.ebuild
index 6c057b3df881..caf9b410c4bd 100644
--- a/dev-python/backports-unittest-mock/backports-unittest-mock-1.4.ebuild
+++ b/dev-python/backports-unittest-mock/backports-unittest-mock-1.4.ebuild
@@ -19,6 +19,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/backports[${PYTHON_USEDEP}]
diff --git a/dev-python/backports-unittest-mock/backports-unittest-mock-1.5-r1.ebuild b/dev-python/backports-unittest-mock/backports-unittest-mock-1.5-r1.ebuild
new file mode 100644
index 000000000000..cd052cc5e1bc
--- /dev/null
+++ b/dev-python/backports-unittest-mock/backports-unittest-mock-1.5-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# It is the developer's intention that backports.unittest_mock will be
+# used even for Python 3: https://github.com/jaraco/jaraco.timing/pull/1
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7,8}} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+MY_PN="${MY_PN//-/_}"
+DESCRIPTION="Backport of unittest.mock"
+HOMEPAGE="https://github.com/jaraco/backports.unittest_mock"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/backports[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+RESTRICT="!test? ( test )"
+
+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}':" 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
+	pytest -vv --override-ini="addopts=--doctest-modules" \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	# avoid a collision with dev-python/backports
+	rm "${BUILD_DIR}"/lib/backports/__init__.py || die
+	distutils-r1_python_install --skip-build
+}
diff --git a/dev-python/backports-unittest-mock/backports-unittest-mock-1.5.ebuild b/dev-python/backports-unittest-mock/backports-unittest-mock-1.5.ebuild
index 3ad9f2bb4e32..584abb732695 100644
--- a/dev-python/backports-unittest-mock/backports-unittest-mock-1.5.ebuild
+++ b/dev-python/backports-unittest-mock/backports-unittest-mock-1.5.ebuild
@@ -19,6 +19,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/backports[${PYTHON_USEDEP}]