gentoo resync : 28.04.2019

6 files changed, 3 insertions, 159 deletions

diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest
index b7516d00857e..50d32bd09d58 100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@@ -1,10 +1,3 @@
-AUX 1.15.0-test_manytests_to_one_import_error.patch 991 BLAKE2B 1562721b00b0b55102e06aac0be8c2d8b0a500c5ff9e7433fa75330be63a3ee9128458e7ee55429c173ba425932552e8c001c23c71c1788ecc4c1865363495ec SHA512 f46dcc913e408d1af425cc4d444d16d6585062d4debee08164039d3b35020c6c4b3af52c43484ecf32330d0107397d31030ab930965415e0ede6e22449b7d59c
-DIST pytest-xdist-1.15.0.tar.gz 87799 BLAKE2B 6990137c02f70a4ce466aeb7692cdc66adce09d475ddf31b7997abdeb54e148770fc74ee872e0f86719749705bb28ca7e56181b58f3906326c99d6051bd46fe6 SHA512 6429bd0c85024a2dcb453e4264f06d4a548637c4dcdeabf73d2b78a112ace70ff61cf0849a4845cc70a7650d10a99e5fe1087d3b7dba4b941ec0a771fc9338ed
-DIST pytest-xdist-1.20.1.tar.gz 57076 BLAKE2B efac9a0d96b2d4e28b078a7a88ba8df197fc122683d25577cc596f840977f4c116b8c7df1c397e03a50edc400265bae4a8b3900c22da388d0662a71858d7f4ec SHA512 f36e02062e946993bfb9bfaca5aa14c138817f1ad8a8013c5a64b416e91abbfb02502a371c4507c4babb15ac54aca2dce5af4ffe72ed0aa167f670bddabd4b3c
-DIST pytest-xdist-1.22.2.tar.gz 57866 BLAKE2B 356f9dccb7d970e6073dc724233013503939d92072c3fab47626e9ed36778ab73499a990a6f50271ae93b82891a09be811843907c18ae64bf93f76510338c29b SHA512 69a0a233fe52ead13cadd46c134c67e4d0fdcd2a77929aea3da2530cd54c283d46c6d416a1450016ba7e9127b30bd85add99b562d9ec0a49bbe1c08b7828df68
 DIST pytest-xdist-1.23.2.tar.gz 59932 BLAKE2B f2cf73914cf095217fb8b472f5e5f7918435c75f8da1694cc7ceb920ac3a7390d84bea93cca558ba26cf3d14a01815374eab9ea03a137a8a9f5dba2f2d4453a8 SHA512 4aae9a6d74e53a29630d0233d0a903d008023e322de726ef7ab7cf4865f428942f96cc65264e19726cb6213264edaa747da2cb6f368989417ba821f2a3f9b654
-EBUILD pytest-xdist-1.15.0.ebuild 1238 BLAKE2B f9f17170a8c0f777c86f715ad954de7daaf3f2dd8d3432f561fcb43b92461ed4d374122eec99e636467ecb3f4d376ab5a07c0605e12d50fa663bc26c025c8df2 SHA512 f639099d0f809555acdf77bfbdc783b92985f45608163a30c7ab01a5efc5e16995851a72eeb09b90876ad738e6accc14e69fd852f62e8880cb0900bfaff721bc
-EBUILD pytest-xdist-1.20.1.ebuild 927 BLAKE2B f15b00b5a68556d0a5f725616199d40e130f8cbc6b9250fdfbbf54f1d05b6fd0440b1aa55412c34e564e4acc113172ec140e614907c244aace48d2736de520aa SHA512 4fa357bafcffa5b77bdebbc36b26dbf400ba178bb4d629b56a3a52e080b397438ec66e7fc5f42f31ea95f4d811f8f4e17299a2974f358a5db117389418b81eeb
-EBUILD pytest-xdist-1.22.2.ebuild 1113 BLAKE2B 4471d4324628d16691d4078779166d86e933d0c86493784920a54b86e9f60b7f0371e5ca26766e78dfda0b794655f66b1427130d3e7d522d7f8c341fb0f06b46 SHA512 ae49420528397f9f1444ec8beb40d4af49b9304cb9e036c2523181971108cb6da68bfebb095be7bdcd981a51358320fa2df98cdbd2f444a02edbfb5efaae9c83
-EBUILD pytest-xdist-1.23.2.ebuild 1033 BLAKE2B bb0db0aa9cf0f4cc1312748dc4d21b77cc03652c3d2c4f00e42759e1a73a01ce203df68be06f9398231804a32e32880bd599af84f2eae9015d766630f090d4af SHA512 e15243b95a101e92a65c69493671b0d49a69e850706296a1babbb3a4fe56de94626cb2caf94925ec755b6669c95b9dbfdee3fd5aa5c32b9054ac553ffe58be6b
+EBUILD pytest-xdist-1.23.2.ebuild 1030 BLAKE2B 989b87f68c288b535533c9a00f5b797c4b81b90ee2635b9f85e6366d165723a5f57c56400c501bca6c3326d8374ddc7f3aa5bbca6cc761e4c65ec0e910ddb90b SHA512 39a00470970930c6efad4db30661ca0aa6268540b4fae4a4116f31cd84e8fbb447de5a277d0479eed66881d963ee99b42e87378dac53532acfbf1e76e726b692
 MISC metadata.xml 429 BLAKE2B d1c317fa9cb06da79389adbd0d8941511127f1632aa0b5402df24827c526b634e9bfdc822c9f6dbd83a527bf3c9fc4418fffc1dd23b50812d566ff1681508fb1 SHA512 f25800e22c2d0c60991a0544f69e253c5751affd7ba178fdb6fda167baed0b9756bfba1fd850908d9ed05c5cf2091848d91593eec7346d00462cfb54aa1864ae
diff --git a/dev-python/pytest-xdist/files/1.15.0-test_manytests_to_one_import_error.patch b/dev-python/pytest-xdist/files/1.15.0-test_manytests_to_one_import_error.patch
deleted file mode 100644
index 9fb56f419ceb..000000000000
--- a/dev-python/pytest-xdist/files/1.15.0-test_manytests_to_one_import_error.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From e5d80645347fc7e67efdceb97df8e95d140b283d Mon Sep 17 00:00:00 2001
-From: Bruno Oliveira <nicoddemus@gmail.com>
-Date: Mon, 5 Dec 2016 19:59:19 -0200
-Subject: [PATCH] Test using pytest 3.0
-
-Fix #99
----
- .travis.yml                | 42 ++++++++++++++++++++++--------------------
- appveyor.yml               | 23 +++++++++++++++++++++++
- setup.py                   |  2 +-
- testing/acceptance_test.py |  2 +-
- tox.ini                    |  7 +++----
- 5 files changed, 50 insertions(+), 26 deletions(-)
-
-diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py
-index 21dfd71..2bb7bb1 100644
---- a/testing/acceptance_test.py
-+++ b/testing/acceptance_test.py
-@@ -62,7 +62,7 @@ def test_import():
-                 pass
-         """)
-         result = testdir.runpytest(p1, '--tx=popen', '--tx=popen')
--        assert result.ret == 1
-+        assert result.ret in (1, 2)
-         result.stdout.fnmatch_lines([
-             "E   ImportError: *__import_of_missing_module*",
-         ])
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.15.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.15.0.ebuild
deleted file mode 100644
index 3ece3b234d6f..000000000000
--- a/dev-python/pytest-xdist/pytest-xdist-1.15.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="Distributed testing and loop-on-failing modes"
-HOMEPAGE="https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/execnet-1.1[${PYTHON_USEDEP}]
-	>=dev-python/pytest-2.4.2[${PYTHON_USEDEP}]
-	>=dev-python/py-1.4.22[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pyflakes[${PYTHON_USEDEP}]
-		dev-python/readme[${PYTHON_USEDEP}]
-	)
-"
-
-# Optional test dep:
-# dev-python/pexpect[${PYTHON_USEDEP}]
-
-PATCHES=(
-	"${FILESDIR}"/1.15.0-test_manytests_to_one_import_error.patch
-)
-
-python_prepare_all() {
-	# pexpect fail
-	sed -i -e 's/test_xfail_passes/_&/' testing/test_looponfail.py
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	distutils_install_for_testing
-	py.test -vv || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.20.1.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.20.1.ebuild
deleted file mode 100644
index acd463adc2b8..000000000000
--- a/dev-python/pytest-xdist/pytest-xdist-1.20.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="Distributed testing and loop-on-failing modes"
-HOMEPAGE="https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/execnet-1.1[${PYTHON_USEDEP}]
-	>=dev-python/pytest-3.0.0[${PYTHON_USEDEP}]
-	dev-python/pytest-forked[${PYTHON_USEDEP}]
-	>=dev-python/py-1.4.22[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-python_test() {
-	distutils_install_for_testing
-	py.test -vv || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.22.2.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.22.2.ebuild
deleted file mode 100644
index 79cf6a2a0134..000000000000
--- a/dev-python/pytest-xdist/pytest-xdist-1.22.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="Distributed testing and loop-on-failing modes"
-HOMEPAGE="https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/execnet-1.1[${PYTHON_USEDEP}]
-	>=dev-python/pytest-3.4.2[${PYTHON_USEDEP}]
-	dev-python/pytest-forked[${PYTHON_USEDEP}]
-	>=dev-python/py-1.4.22[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	# TODO: figure out why it fails
-	sed -i -e 's:test_keyboard_interrupt_dist:_&:' testing/acceptance_test.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	distutils_install_for_testing
-	py.test -vv testing || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.23.2.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.23.2.ebuild
index fcf8b14e4d65..83099c42ed26 100644
--- a/dev-python/pytest-xdist/pytest-xdist-1.23.2.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-1.23.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND="