gentoo resync : 15.12.2019

5 files changed, 79 insertions, 2 deletions

diff --git a/dev-python/pytest-xprocess/Manifest b/dev-python/pytest-xprocess/Manifest
index a92987c59f15..1b6a2a1085cb 100644
--- a/dev-python/pytest-xprocess/Manifest
+++ b/dev-python/pytest-xprocess/Manifest
@@ -1,4 +1,6 @@
+AUX pytest-xprocess-0.12.1-pytest-28.patch 1245 BLAKE2B 9d4e8aeead5690a3461f4377a2215ade77929d55aa3f8e842da05fcd0269f94f306d527acc93d56573e4c081bf0a380027e37223e4bd71e3a45b6763fd8d71a6 SHA512 4b114f676ff83ad019402ba7c84f2559e267c45b8aadbcd647f99b962d484ca176f59db6e98db297583f37f9560c5cdf54af9e4bd7ddf36225ce126bcecea134
 DIST pytest-xprocess-0.12.1.tar.gz 12078 BLAKE2B 30c3c2b41e79b79c5a18911c325ff273b80c45f29d269b96c4085c0c78a6897b2064eb1d2e83f9c061c4663d2f52d88230d9e87ea2ba4d114c6e04f42aa50a5e SHA512 fda868a12a056070afd5838c4bc466b4906a7138f685d4a0e6e0adbd975e5a1a2b9b37b8de36a45fb700e02ca14ae219cfe29c467f8d03e55d2a375a7efc9927
-EBUILD pytest-xprocess-0.12.1-r1.ebuild 817 BLAKE2B aad62d48f86e12d73a5c1bad97efdbe59230664791bdbf291a01e7dcaa69fe8e998df06a8b8978a9c5d6619b6f88bf1b330eeb1019a1f899ecc4f6673d2eb297 SHA512 f1810b7b24ce0dfa1e4cb91f70a3a7ab321ee23668a09b09c80167ef641d5922f668d30c14d99acd8a6cf1c191f4b16542a3bbfe00cb305bc70397a528fc334f
-EBUILD pytest-xprocess-0.12.1.ebuild 842 BLAKE2B 6013fb3a740b09ac505b8b316f26b40bda68ced2760b6e0b8e9e19dcf45ab77850f0ad9e016d7f2914d64385f61cdf28fd5f8199e24353b2be1e7f021c6fe332 SHA512 1e069746827478f03c9f54f8ae0c3b9274275352958eab6cb65f0f248b461872ff466aedfaa6af347dd0ca8d2c5c624cd3182c194e9fe263e9134ad4aa8d35f8
+EBUILD pytest-xprocess-0.12.1-r1.ebuild 844 BLAKE2B 7bb3de0638243becd5f170e67b9b3b5dbbf36889608a2b543bed3e8ae0f7bf49e5620343156b77aa1e332d9fcf6fa3040f72e3190443d2039d7edc90e7bf54c5 SHA512 e5838c61499982330c6e31a7acb5737fcdf1534cc0e570ce83cbf56846f8f1a91f6f9da57baaef9e6d06f842631c173b03974de0ddd863081a52f44a123c2ff4
+EBUILD pytest-xprocess-0.12.1-r2.ebuild 845 BLAKE2B f6bc84676c37e1ef36b96b84a7ac5f36d4158096ab889db0f6c54d037298f50aa2dc44e3c13e57e8aa701ad4401b607c80613d0d9b9a14756af933230db81a6e SHA512 7eeccee4103ee0bb0cd8e975d47e808442be9c45d5b15113fb4d5a2004fa80501852e5ffc77bacd73014bd337f87dfd0f7dc04ed1f620327f047c4e6681086c2
+EBUILD pytest-xprocess-0.12.1.ebuild 869 BLAKE2B 7fbe9ac9597d3ad6298d6ce7916616dc00925c797ba3a4294e869802e8ffa9cd25bd1e75f701cde4f3dd9cedb8bf1fda456ebffa74575528fcfe2203fe4224ac SHA512 59bd24cdf9f2f6fd3ab9d42ec1676312aedfc3d7eecae9db8401959bdecad190cf61ed5bf77ed65d64680351c1848881f8c41eb7e97bcd6ad48dd1973544f058
 MISC metadata.xml 399 BLAKE2B 04dadaab28761796767c7a588294f6a8ea34cd665a4ca6b26dad8155432e12619f7d7825265df05d1457dc1c09265c1064efaa8280487d8eba60f1629798c648 SHA512 ae6d3628465eac8e46b14f8bb00a46884f07e85dc3246c3f3c1c6a85e178c7eab35511e583d08cb3b036f5ac28c8393dac90cf470ffb371a74cfd883a5978830
diff --git a/dev-python/pytest-xprocess/files/pytest-xprocess-0.12.1-pytest-28.patch b/dev-python/pytest-xprocess/files/pytest-xprocess-0.12.1-pytest-28.patch
new file mode 100644
index 000000000000..45d3b2446443
--- /dev/null
+++ b/dev-python/pytest-xprocess/files/pytest-xprocess-0.12.1-pytest-28.patch
@@ -0,0 +1,39 @@
+From 4b5de795b492b5beb15385b20fe289851c1b2570 Mon Sep 17 00:00:00 2001
+From: Bruno Oliveira <nicoddemus@gmail.com>
+Date: Wed, 7 Jun 2017 09:55:28 -0300
+Subject: [PATCH] Add py35 and py36 to CI and drop support for pytest<2.8
+
+Also drop requirement on pytest_cache
+---
+ pytest_xprocess.py | 3 +--
+ setup.py           | 2 +-
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/pytest_xprocess.py b/pytest_xprocess.py
+index e8d731c..c4edbdd 100644
+--- a/pytest_xprocess.py
++++ b/pytest_xprocess.py
+@@ -18,8 +18,7 @@ def pytest_addoption(parser):
+ 
+ 
+ def getrootdir(config):
+-    from pytest_cache import getrootdir
+-    return getrootdir(config, ".xprocess").ensure(dir=1)
++    return config.rootdir.join(".xprocess").ensure(dir=1)
+ 
+ 
+ def pytest_cmdline_main(config):
+diff --git a/setup.py b/setup.py
+index 1992785..b3dd88c 100755
+--- a/setup.py
++++ b/setup.py
+@@ -12,5 +12,5 @@ if __name__ == "__main__":
+         url='https://github.com/pytest-dev/pytest-xprocess/',
+         py_modules=['pytest_xprocess', 'xprocess'],
+         entry_points={'pytest11': ['xprocess = pytest_xprocess']},
+-        install_requires=['pytest-cache', 'pytest>=2.3.5', 'psutil'],
++        install_requires=['pytest>=2.8', 'psutil'],
+     )
+-- 
+2.24.0
+
diff --git a/dev-python/pytest-xprocess/pytest-xprocess-0.12.1-r1.ebuild b/dev-python/pytest-xprocess/pytest-xprocess-0.12.1-r1.ebuild
index 026a0132adb6..3e8064813561 100644
--- a/dev-python/pytest-xprocess/pytest-xprocess-0.12.1-r1.ebuild
+++ b/dev-python/pytest-xprocess/pytest-xprocess-0.12.1-r1.ebuild
@@ -15,6 +15,7 @@ SLOT="0"
 LICENSE="MIT"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-xprocess/pytest-xprocess-0.12.1-r2.ebuild b/dev-python/pytest-xprocess/pytest-xprocess-0.12.1-r2.ebuild
new file mode 100644
index 000000000000..37eec5e487ce
--- /dev/null
+++ b/dev-python/pytest-xprocess/pytest-xprocess-0.12.1-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Manage external processes across test runs"
+HOMEPAGE="https://pypi.org/project/pytest-xprocess/ https://github.com/pytest-dev/pytest-xprocess"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	"${FILESDIR}"/pytest-xprocess-0.12.1-pytest-28.patch
+)
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# Upstream's package mistakenly includes __pycache__ directory that make
+	# tests fail.
+	rm -r example/__pycache__ || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pytest-xprocess/pytest-xprocess-0.12.1.ebuild b/dev-python/pytest-xprocess/pytest-xprocess-0.12.1.ebuild
index 8791619285e2..faad3f3e3cac 100644
--- a/dev-python/pytest-xprocess/pytest-xprocess-0.12.1.ebuild
+++ b/dev-python/pytest-xprocess/pytest-xprocess-0.12.1.ebuild
@@ -15,6 +15,7 @@ SLOT="0"
 LICENSE="MIT"
 KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	|| (