gentoo resync : 05.04.2019

3 files changed, 11 insertions, 10 deletions

diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 2fe51498ebf2..cc87c708093c 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.3.1.tar.gz 917608 BLAKE2B 62fea17e481984489d640872aac4f18b7278688b499302f407fd618b6357e3cb18e995f6f0974ba16da51bae5e3337732d2e1a0a6cc65936f8936d3bc7981809 SHA512 5c76100b9efc9176803807a54ff25bfaba065fe3e8fea28b9b2f3ade289056d174e0cc4e1f399eba4ee8642e8990f43f5dc68b59cf55b7d81a43cd7cb363f542
-EBUILD pytest-3.10.1.ebuild 2215 BLAKE2B 310c20f41363ce7c46c6ebcd5a32cdadd1bc3d540a68f17e311018a12aa6e45cfd4d08b128aed7d32f0b2262639120fc45b304571ba3ce2f3c6ce0e6d8bfa057 SHA512 77c5bdcc8930b118017059421bf10adc5091fba9597fec5f225385380f24152c83e76ea29551a0a86be7a31a6c09287f0caa0413e0e6be63ec95ea92debbb8dd
+DIST pytest-4.4.0.tar.gz 931197 BLAKE2B f63186f2bd372bb1acfbc0273dcdf43f78a7c7e4ae7d6e91d4f8e59804c40437da06a69e93fe128b6d31b1144a51aea953145bce780bde0037ef395d64ed30b4 SHA512 c3e2f75434bdf712d1773eb9220c4258a7c57f92c8172033989e6bb78cfa8e2198e9fecce8daf27935e8eb71f416fcdc1a6a9a135cf8c925fbfaeaf80f616411
+EBUILD pytest-3.10.1.ebuild 2452 BLAKE2B 73f33238f6252c0f7df0534b699193ef4cb10c43932ced0488009888defb141375bb38d80e52de04a6b3835c8f97de439adc383b9769278445ffbc850a983dfd SHA512 7ccc22902002576efa336d058ea3c85cbfab0da37951cb41b6f838ac999d7db7a972fa588a3b1f78d2f6497b228ed1b61aaba7ed4966885199708e37e4fc291e
 EBUILD pytest-3.2.2.ebuild 2112 BLAKE2B 5d60971f4ac0e85e21bba987a80e4124b99ddcb2fa92249127f379f1f6c6c9e1b5e59ac5bc6252eaf2fb286a2674e9deb25cb032e4ab3138be7ef9f990d29899 SHA512 b8c78dcb725d879ab6f6b7e3a24dc1305acc2569a2b02169f77b018d68806fe410c6094ae025bab43312ba79447fa1fe9ff6f6c1fdf7354b63fd6cfd9ecd84a7
 EBUILD pytest-3.4.2.ebuild 2521 BLAKE2B be3429b82dbdaa3d09d11cadc647e9c79b6829277ae6fd2097afbbc8bf7f8009090c7a73ef016a35560d34db4f79c4d2c10ec20db64957c8eb7a505761ffe054 SHA512 a135fdfce02a379826614edaad8e8c0c1e5fc29a5e30615f4aae7e646d78abe309e53edfd251d26c77a56420e6f8a759463e72557ef7c85f53d5e5823057a8e7
-EBUILD pytest-4.3.1.ebuild 2143 BLAKE2B e7463180feebbf298729a59f3dee445e066e10cad50e48a2c6a972cda537cd8b2078299a7c8b5f13e4611d122276095840afde9c19e4f3a2e04d000704fd601e SHA512 ce095f5399acdb7e05ef3f80959ad858e49004dd58bce5ce46ce6f61cf49830f9c01a9935ab2763066b86e91898dc9a697ee8078eadff47e8bba4b3482151c1b
+EBUILD pytest-4.4.0.ebuild 2111 BLAKE2B aa77e846b170a1202a912856025827fd01234be9f3faed1bac155335c9aabb5a912ba29356b3f7fdfccddb6d6b552b3e9297fafd197fb9d811d3fc368cd41f07 SHA512 37e71b9e38096cfa16003806a469cdb8cbe9e5d5031faca375089ae7851e4e7dd8737b50f43fb51313392359c3652b667751a29d4c59524c78b18101f41a2df6
 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 97eacfe36376..5e0846138d99 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 ~arm64 ~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
@@ -24,7 +24,9 @@ PY_VER="1.5.0"
 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/more-itertools-4.0.0[${PYTHON_USEDEP}]' python2_7 )
+	$(python_gen_cond_dep '<dev-python/more-itertools-6.0.0[${PYTHON_USEDEP}]' python2_7 )
+	$(python_gen_cond_dep '>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]' python3_{4,5,6,7} pypy{,3} )
 	$(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}]
diff --git a/dev-python/pytest/pytest-4.3.1.ebuild b/dev-python/pytest/pytest-4.4.0.ebuild
index ab4d81909734..1f98542589da 100644
--- a/dev-python/pytest/pytest-4.3.1.ebuild
+++ b/dev-python/pytest/pytest-4.4.0.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"
 
 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 ~arm64 ~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
@@ -25,8 +25,8 @@ 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}]
+	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python2_7 python3_5 )
+	>=dev-python/pluggy-0.9[${PYTHON_USEDEP}]
 	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
 	>=dev-python/setuptools-40[${PYTHON_USEDEP}]
 	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
@@ -41,7 +41,6 @@ DEPEND="${RDEPEND}
 		$(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
 	)"