gentoo resync : 10.02.2019

4 files changed, 9 insertions, 7 deletions

diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 4066666771d1..2ea9447410d6 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -2,9 +2,9 @@ AUX pytest-3.4.2-pypy-syntaxerror-offset.patch 996 BLAKE2B ff6d362d20f6432f73956
 DIST pytest-3.10.1.tar.gz 892420 BLAKE2B 38849ae69bf4380bc1a99aa105cac04be078da4460373dfc16fa555238b2830fa2f5ae6c19de8aa2af9ac18d87c5d2705d62f7b2e67e4a62d843f6a28bbd76fd SHA512 30ff79c0fdcbeef68e1191ff400a20428e391717f06957f554b694b94baaaa565dca01346fe989c3e443c4402f3b2bdbd5564f6303a4447f933fb54cba45628f
 DIST pytest-3.2.2.tar.gz 786396 BLAKE2B e669da930890e902b0323ec3a6685080ddd889e74655f7b4cb08ec421651f987597021a31471aab5a32d637b99620ce7792cbdf8f85561db3bb10ff06a446ba1 SHA512 6df3a50e7d1efeaf7a283920b16d1daf800798f422bc851b0aacd2bbd5cb0a88c95f9057fae49943b9dfe6527ed552cdf8d983b944ab91d0af252ee4f6eb82db
 DIST pytest-3.4.2.tar.gz 812719 BLAKE2B 96623d6cdea4bd79778175c18c949938505f1862010f700f9a8cb85f445910381af391a5b69e664fbbfc254bf46502c798c72026772070236a0a3bca7aeeb3d6 SHA512 787065ab76d4482799bb2da9f024c9c383e68cc1cc01f3b80f6ed9444ca6383d20953615696ed4dd01668777b094cf5002b23c4ce51828879dcf8ebf2170c71b
-DIST pytest-4.1.1.tar.gz 903912 BLAKE2B 6466f8620ddf509ad17c9fddd8d9afd8cd53b67673bf12c603a563daa30decd6ca067ec829bece49505650536c02854493ed27d5dd350f2bd5cbd4c71c85721a SHA512 e93b742b61fdba7518d833bdc312282347853abb1fe76920f14e791ede2af57513b521b967303483dfc2e308ec83c9c9e1f8d81489ee5610808e3b33b42b8452
-EBUILD pytest-3.10.1.ebuild 2190 BLAKE2B 51f2eae063abe8a901283deb9914a18258efa71084ab117bade90c9a945e203346ae2863571f5e786ab49450d9d171fd6d6a9ba3df2a0e3d23700548c010e73e SHA512 c422d28c466fd0771c70d33be2984b5e1c4c1e9142a341ab4207b62d52d98fa308ba28872685ff0b6a5cdb889745960b60a960ab4a527bad8fc8c8cba7f46487
+DIST pytest-4.2.0.tar.gz 909527 BLAKE2B 6aa206603e81f21b7e25c1f8ab1a906954f2a08afec4b70fca5ca428aa875fbf0f012ee0122c64e1f592080b24f211cac03809f788456e8419a8928a37d4a596 SHA512 71d77b391a096877597ca5130e5433fd8e41ec764f79acbb9aadd7abe782089067ae025ebf41df379ed8dd0f48d590db64607478e6f3c240fa8a2c91f96c5a95
+EBUILD pytest-3.10.1.ebuild 2223 BLAKE2B d6bf6267602a7e9f94d28ca14846284ec9834dce2036b2313e999aec57d38c30e18b117e60431babadfe96e955e9c3758dd16ac4e660fc9d2d9db782a11ec7b0 SHA512 aa782c5dc1a4920a036da3ef4d3b7f3706ec0774d840b12539e1bcd16372bedea3b5520b42d75589defcb288efcbea778e00adaf6517b11c16a06a6fca82817f
 EBUILD pytest-3.2.2.ebuild 2112 BLAKE2B 5d60971f4ac0e85e21bba987a80e4124b99ddcb2fa92249127f379f1f6c6c9e1b5e59ac5bc6252eaf2fb286a2674e9deb25cb032e4ab3138be7ef9f990d29899 SHA512 b8c78dcb725d879ab6f6b7e3a24dc1305acc2569a2b02169f77b018d68806fe410c6094ae025bab43312ba79447fa1fe9ff6f6c1fdf7354b63fd6cfd9ecd84a7
-EBUILD pytest-3.4.2.ebuild 2526 BLAKE2B 36db6c9d56c65ee6a43b0581bd780108f9efaae100817432d1b7a91b4b665b45435732aa954394046ee2c96cfe73b350186ac7eeab8ea83121c381c076c2ec01 SHA512 526a34d56e1baf2bd979ff03103671f84b28252ec5bfe47e44f78ecab9eefa5f0d02e0a7e691d0a805ed29c8d3a6e25ede0a9ba09fe297e17df86442ac37be5a
-EBUILD pytest-4.1.1.ebuild 2109 BLAKE2B 6a4775271bf420377c5f70aacb40b633e71fd02f42a43d782a8156ba92f815422b7e88ae2453ec28250613a18d371940ffc0859d22a7117c64463695a76c116f SHA512 2e9efbbf954c0910e974457e5f8e9dc9cb915e76954154dd6e62f35a9319918507753741fd874a75737511f2470a55726af5d0c8578753d118cd9be83389b8d3
+EBUILD pytest-3.4.2.ebuild 2524 BLAKE2B 3695b3a275622ec4d09d835829a1d59f6c6e3636d133b2586e63117d32b873e45a41409f112eebbb33608b21ce9cc8e05d37924f1e5237b925ba1f38bcbe5035 SHA512 d51dafd6345671662b1fc16e343885284be3a785328852b6b997512c68a34354fde36677e781dc1a7cc2f5f90c0816cebe92e223370d3b95ae08c4b4c3adf4a8
+EBUILD pytest-4.2.0.ebuild 2143 BLAKE2B e7463180feebbf298729a59f3dee445e066e10cad50e48a2c6a972cda537cd8b2078299a7c8b5f13e4611d122276095840afde9c19e4f3a2e04d000704fd601e SHA512 ce095f5399acdb7e05ef3f80959ad858e49004dd58bce5ce46ce6f61cf49830f9c01a9935ab2763066b86e91898dc9a697ee8078eadff47e8bba4b3482151c1b
 MISC metadata.xml 309 BLAKE2B f29391c5f96f44f6329d3665346a5d46ecb4a86d103ae8008769af86126756e76bfa89cfe462e9c219e5f70b64013f662d020c7a2f6015d8cadd0eb25a7614eb SHA512 ba53c13ac716488e3e5dadf5dcfcb697dc9bb13f89e9d0fb98b9a5a6e36cafeeb64d1348008f42497117bf46fb6f3bc288c10a68c4d5ab53c9c02a3ae61b594f
diff --git a/dev-python/pytest/pytest-3.10.1.ebuild b/dev-python/pytest/pytest-3.10.1.ebuild
index 7419f06cfccb..7846463ccb39 100644
--- a/dev-python/pytest/pytest-3.10.1.ebuild
+++ b/dev-python/pytest/pytest-3.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 # When bumping, please check setup.py for the proper py version
@@ -42,6 +42,7 @@ DEPEND="${RDEPEND}
 		dev-python/requests[${PYTHON_USEDEP}]
 		!!dev-python/flaky
 		!!dev-python/pytest-capturelog
+		!!<dev-python/pytest-xdist-1.22
 	)"
 
 python_prepare_all() {
diff --git a/dev-python/pytest/pytest-3.4.2.ebuild b/dev-python/pytest/pytest-3.4.2.ebuild
index 48893ea784de..10dd7e332ab9 100644
--- a/dev-python/pytest/pytest-3.4.2.ebuild
+++ b/dev-python/pytest/pytest-3.4.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 # When bumping, please check setup.py for the proper py version
diff --git a/dev-python/pytest/pytest-4.1.1.ebuild b/dev-python/pytest/pytest-4.2.0.ebuild
index 35de82a23ee4..ab4d81909734 100644
--- a/dev-python/pytest/pytest-4.1.1.ebuild
+++ b/dev-python/pytest/pytest-4.2.0.ebuild
@@ -42,6 +42,7 @@ DEPEND="${RDEPEND}
 		dev-python/requests[${PYTHON_USEDEP}]
 		!!dev-python/flaky
 		!!dev-python/pytest-capturelog
+		!!<dev-python/pytest-xdist-1.22
 	)"
 
 python_prepare_all() {