gentoo resync : 19.03.2019

5 files changed, 6 insertions, 72 deletions

diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 92f856072279..2fe51498ebf2 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -2,11 +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.2.1.tar.gz 913065 BLAKE2B cde085627872d601df1c6d91d9620fbb97789b6e176fe104bc991faa800268e5e61651e211a8840743b21f8cd9b57dcee8685143e2f4d56d197afae35a577aed SHA512 e41bf7c685cacd62261df6d356911297a65ba85e13a50f8aed23d382d257c4c1cd3213971a3970fec210b8e97b72bd0034c0c1f87be7f306286d541c5ea57097
-DIST pytest-4.3.0.tar.gz 915820 BLAKE2B ee8c55bb3a6e79d4897b218f372f8b0ceb524ea627f2e803484d83791ebe979da760695d3f6d7d85bc6494bdee1079f71aaf2418f1bd9e2318aba7471445413e SHA512 67894dc6c7001290e3372b5015227cf800c02d40ff28f76fad1249bd866f25c2368d8f0895d7c97a6b3318608f88e44db0bff723e7aeef79e380227cd7ec147e
-EBUILD pytest-3.10.1.ebuild 2218 BLAKE2B e946219d1c7f5e9ae8cd5cc3dfaad225cb2e22009b30cddfe06a4bb5b1ab1ef42edc0fd9d76b66c17b0b1c70671529a8a59016ec6fae7806f289e0375ddf7a3c SHA512 61b31c1d9f791420255595ddc0c8a5ebbe13b340863889602de89f00d1746e3b65464f259232e237a1e559df185a4707cebb7a03a75e877b59c84d0f392d96d8
+DIST pytest-4.3.1.tar.gz 917608 BLAKE2B 62fea17e481984489d640872aac4f18b7278688b499302f407fd618b6357e3cb18e995f6f0974ba16da51bae5e3337732d2e1a0a6cc65936f8936d3bc7981809 SHA512 5c76100b9efc9176803807a54ff25bfaba065fe3e8fea28b9b2f3ade289056d174e0cc4e1f399eba4ee8642e8990f43f5dc68b59cf55b7d81a43cd7cb363f542
+EBUILD pytest-3.10.1.ebuild 2215 BLAKE2B 310c20f41363ce7c46c6ebcd5a32cdadd1bc3d540a68f17e311018a12aa6e45cfd4d08b128aed7d32f0b2262639120fc45b304571ba3ce2f3c6ce0e6d8bfa057 SHA512 77c5bdcc8930b118017059421bf10adc5091fba9597fec5f225385380f24152c83e76ea29551a0a86be7a31a6c09287f0caa0413e0e6be63ec95ea92debbb8dd
 EBUILD pytest-3.2.2.ebuild 2112 BLAKE2B 5d60971f4ac0e85e21bba987a80e4124b99ddcb2fa92249127f379f1f6c6c9e1b5e59ac5bc6252eaf2fb286a2674e9deb25cb032e4ab3138be7ef9f990d29899 SHA512 b8c78dcb725d879ab6f6b7e3a24dc1305acc2569a2b02169f77b018d68806fe410c6094ae025bab43312ba79447fa1fe9ff6f6c1fdf7354b63fd6cfd9ecd84a7
-EBUILD pytest-3.4.2.ebuild 2522 BLAKE2B b0489f8e20d9fe101fd5c58a27aba40acfaad325c076c31ce84bd0a9603513c342f8aa2d61ff771556390c5d4c5728c1a2c662bc0f42e229af8c0890e5d193d3 SHA512 5b17d631f81591a4d02c8c34d3e06b2f12ca1f54f62d6cdb8b47fa7b67578d0cc46d76724739bc991743cba88909e6ccc1c549f301661cfe531eaebb6f958533
-EBUILD pytest-4.2.1.ebuild 2143 BLAKE2B e7463180feebbf298729a59f3dee445e066e10cad50e48a2c6a972cda537cd8b2078299a7c8b5f13e4611d122276095840afde9c19e4f3a2e04d000704fd601e SHA512 ce095f5399acdb7e05ef3f80959ad858e49004dd58bce5ce46ce6f61cf49830f9c01a9935ab2763066b86e91898dc9a697ee8078eadff47e8bba4b3482151c1b
-EBUILD pytest-4.3.0.ebuild 2143 BLAKE2B e7463180feebbf298729a59f3dee445e066e10cad50e48a2c6a972cda537cd8b2078299a7c8b5f13e4611d122276095840afde9c19e4f3a2e04d000704fd601e SHA512 ce095f5399acdb7e05ef3f80959ad858e49004dd58bce5ce46ce6f61cf49830f9c01a9935ab2763066b86e91898dc9a697ee8078eadff47e8bba4b3482151c1b
+EBUILD pytest-3.4.2.ebuild 2521 BLAKE2B be3429b82dbdaa3d09d11cadc647e9c79b6829277ae6fd2097afbbc8bf7f8009090c7a73ef016a35560d34db4f79c4d2c10ec20db64957c8eb7a505761ffe054 SHA512 a135fdfce02a379826614edaad8e8c0c1e5fc29a5e30615f4aae7e646d78abe309e53edfd251d26c77a56420e6f8a759463e72557ef7c85f53d5e5823057a8e7
+EBUILD pytest-4.3.1.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 6b8a1f1fd8d8..97eacfe36376 100644
--- a/dev-python/pytest/pytest-3.10.1.ebuild
+++ b/dev-python/pytest/pytest-3.10.1.ebuild
@@ -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
diff --git a/dev-python/pytest/pytest-3.4.2.ebuild b/dev-python/pytest/pytest-3.4.2.ebuild
index 021146937930..1233650e0bcf 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.3.0.ebuild b/dev-python/pytest/pytest-4.3.0.ebuild
deleted file mode 100644
index ab4d81909734..000000000000
--- a/dev-python/pytest/pytest-4.3.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="http://pytest.org/"
-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"
-IUSE="test"
-
-# When bumping, please check setup.py for the proper py version
-PY_VER="1.5.0"
-
-# pathlib2 has been added to stdlib before py3.6, but pytest needs __fspath__
-# support, which only came in py3.6.
-RDEPEND="
-	>=dev-python/atomicwrites-1.0[${PYTHON_USEDEP}]
-	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python2_7 python3_{4,5} )
-	>=dev-python/pluggy-0.7[${PYTHON_USEDEP}]
-	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-40[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	virtual/python-funcsigs[${PYTHON_USEDEP}]"
-
-# flake & pytest-capturelog cause a number of tests to fail
-DEPEND="${RDEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2)
-		dev-python/requests[${PYTHON_USEDEP}]
-		!!dev-python/flaky
-		!!dev-python/pytest-capturelog
-		!!<dev-python/pytest-xdist-1.22
-	)"
-
-python_prepare_all() {
-	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
-
-	# Something in the ebuild environment causes this to hang/error.
-	# https://bugs.gentoo.org/598442
-	rm testing/test_pdb.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# In v4.1.1, pytest started being picky about its own verbosity options.
-	# running pytest on itself with -vv made 3 tests fail. This is why we don't
-	# have it below.
-	"${EPYTHON}" "${BUILD_DIR}"/lib/pytest.py --lsof -rfsxX \
-		|| die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pytest/pytest-4.2.1.ebuild b/dev-python/pytest/pytest-4.3.1.ebuild
index ab4d81909734..ab4d81909734 100644
--- a/dev-python/pytest/pytest-4.2.1.ebuild
+++ b/dev-python/pytest/pytest-4.3.1.ebuild