gentoo resync : 28.11.2020

5 files changed, 4 insertions, 132 deletions

diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 0f0f97fc766d..7c26d087148c 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -2,14 +2,10 @@ AUX pytest-4.5.0-strip-setuptools_scm.patch 674 BLAKE2B 4eab3e26423d81614223a88a
 AUX pytest-4.6.10-timeout.patch 1297 BLAKE2B 3a5b4005b1aff72b17a366283e692bca19ebd952ef1d5e10f6c702962cb20a83fec48cce5fb0cc35a8da47df2370e85879bf01b9e95f4c271d2d3241f9ea9545 SHA512 f1d2270644e43dfc2ff31ed900456c5707ea19a83447ab80a4d3013e44db36f726676917156930385547f8a75bdbc8835d46d7e6f3301fd51f187c281a5425b0
 DIST pytest-4.6.11.tar.gz 952305 BLAKE2B af07adf5e8fc614b1fdb7b5673fb9c557ff0dd3f22e2f3bf853c643c5c8bd38f307018579299b700d90034a826db73a3e569857d6d6f7ac6646ace894b35a39b SHA512 6fddf4944bd9fab83024aa2d338d54aaf3d164bd5c7f634357376f3b0d2dab6a43d784e7fb567236c2d2f029151c5d9e2cb36c22e9b551c2c8823c52a2246e9c
 DIST pytest-5.4.3.tar.gz 1022353 BLAKE2B 70d4f23cbbfc4c4ce63c512ee0a01556973761a6d3ebb71a6d9ed4fb4a4a21531e1b151ed0e4c5e56e5dd3243a1a272441f17c4c2c4e3b0b19c24654b74e8e52 SHA512 0a07d4f4f791969c6f21961a0ba0f8c6670e5870c6cc1cebf93766587bb9cb3e10db8e57f0bd33dd22b275f3aad7aa674949f124ac80e0ccca64e35be4beee4e
-DIST pytest-6.0.1.tar.gz 1069631 BLAKE2B 89a78ebf8e8cf968ea767fe7244408ca79d247c1ca459815ac299ce773b44c375429935c8a25b4de26349969113c60e4b6812d5aa2d805691664af74796ea85b SHA512 bdd790c3860da2ed3a3ff47f04512c3bfae4fa1e31fc6b96fc19bd57d1804a6fec968ecf17a11c5b20d30dcf82d6391ef0d893ae57a3da9ad777a15c078c129f
-DIST pytest-6.0.2.tar.gz 1070533 BLAKE2B 54397bdf8255641e1cb0555a78b3687a49376d9cc603a98b6df3415159aef0331cbaa7d0883bafbceea1b2273fc0ba5c867f7b66eef5b2b4c24f3e5196786877 SHA512 478d28c30f4f990dcdd98edcd074051e32d9ab25941c21bdc9c4cc47b726da79b5b3a01572ff97f608598ef6bb9df075ebba49abb2f1420947e0c6d4fe0be9c8
 DIST pytest-6.1.1.tar.gz 1084076 BLAKE2B 61eb5efcffbd5a623c7021e37bbe908522fcfbf42ac56cb45fb7e10e0cd30e845bb8a6c563e86bbff47fba1f0db72f1451eb0bf86862b7e150e29be6a2e80967 SHA512 fc61028a01187f6161061a0c2fc392dd719586780a49eec037a72878de00bc33a81c1bc0e2be01be52b30c7eeea2c590d1a4ec08cb14a955bc624478118889b0
 DIST pytest-6.1.2.tar.gz 1084943 BLAKE2B cbdf29c54118b5daf699f11fb674d37d5972a163a7a53f42f6ddf9224e2d8d9e84b9a88106d5a77e70f470ccbffb15c2cf9a939be69bc0a2cab1fc4c76054562 SHA512 6335e994c5273881c8d1c334fe6bfa9cd0a3e5c251f3d6a9332f7f7c1427e6560ff48d8f235b307ea5eb53491072daf30c41f566bb67b304354fd88d286c61b1
 EBUILD pytest-4.6.11-r1.ebuild 2473 BLAKE2B 4a5edd72d94553b553730a5caa2c17c25826a5be58bce6273d39d2a010a70c1fa1f8acb0751c3fe5185883a94da31ecd7e772f606c82d8d99b639804bd49d5d4 SHA512 da60063475df3b7e9e531b234e486bcafe7c1e926f58f7ebaa8e38cb02233629160aa20a9b665fddb83e50f52b0b46702b8a80e65195af4ff7b3e939927db9cb
 EBUILD pytest-5.4.3.ebuild 1940 BLAKE2B b17bc0f3efe70c149ee494d2528f8e16a839c4cb2965378ab6c8b37e3c1b295bab253edd8410f6f2a69cbeb288d6299898320d387330e2d7b5b31418e985a0d8 SHA512 d99fa3064053e3ac99fadce4b23749e16dc2d9e6658f3ab07b1e68c1885d9fd243f4ab4f5462e127b9afdbb957bb498c41126ce79164a31cb2accbbaa1f4b7e9
-EBUILD pytest-6.0.1.ebuild 1633 BLAKE2B 73a5881fa47f5886f289d0d03e6e3c8d9a4f1ee79200181ac3a1db840d6b64a117c2d7c6a99cd8f1a56e6a1d5c915fafc89cf8d78f332239555dee39d436bb04 SHA512 6a2e9b98db3f4525abc7aed5cb949c719477f743baeaf607ee6e2bbbdc3604b36c9377691c600326c43d410619fdafb4846fcb3bef71cb4d5186ae8c374e6545
-EBUILD pytest-6.0.2.ebuild 1643 BLAKE2B b0dc9cba5789c10852c482fbfc35ed6c44a8e5284c5bbad46c27237f03a32aa8f32db2cc18b1c93e810cd51e1fba934de45228402e29bd9834fa9c7dce7d1562 SHA512 dc7786a4fb5c7aef47d6adb57741ecba21e16c48ac086bf6565d2800327fe9393c62c4f4d2d954d89310eacc94a15c40c7dd5c158662b92518ab6f88cd345a65
-EBUILD pytest-6.1.1.ebuild 1645 BLAKE2B 86f1428f01d05acc1b3c64fe989d7a35b09ce3407e08d49ff582d40c4999d768c56ee4088dc4c6c3bd0d9852ef8a83fcf0de5e7a0f7cc397ab2951b9711bc936 SHA512 e8e0006c7a66b44b96a49d850baf2ca4cdfb249ec46f65ec5b5faa1318777976d3fa25614215f38a099cd7ad1524cefac84a9a55f7bba911d8f89e1947fe4d7e
-EBUILD pytest-6.1.2.ebuild 1645 BLAKE2B 86f1428f01d05acc1b3c64fe989d7a35b09ce3407e08d49ff582d40c4999d768c56ee4088dc4c6c3bd0d9852ef8a83fcf0de5e7a0f7cc397ab2951b9711bc936 SHA512 e8e0006c7a66b44b96a49d850baf2ca4cdfb249ec46f65ec5b5faa1318777976d3fa25614215f38a099cd7ad1524cefac84a9a55f7bba911d8f89e1947fe4d7e
+EBUILD pytest-6.1.1.ebuild 1638 BLAKE2B c43166fa602717e4e88285aa5066bae519e881edd4aa4773d8dd9d1edccbf45b3778921b46a2e02fddf288cf3eacfa26581da70d49a3ea7e23643eda167da36f SHA512 252999b9f78a253bf152895550ed60a0c69b66a9de6309b8a98c4f5de42e04befbef39f65ee24f9d59def9a668363e4472f806eb3bbff5c2b5a3dad1c447c1ab
+EBUILD pytest-6.1.2.ebuild 1656 BLAKE2B f7c0cde785cb6eeaf085916a50b4448116e5b05733a771682de619253b827ea157d25e0936c576807281c196f9f1ea568b088089a7c7feadb74c7668399e087f SHA512 3baf9e0cf2a554ca9d352e7fef25a15b625483e1142755f0f5f64bf39e1eaa4d214128cbdd7f466deeb1aaa59b288a96b51d2e9b92711c50de58e7e910ffaaa7
 MISC metadata.xml 333 BLAKE2B 2155c30735de72aace8fe3e88a16c011f3961b4b644d761be31c45094f243f1eeeac1803f5a74219198039dcf1f7474531b2ec814a3ed591c59fd6d9ad5a914a SHA512 c59e04710dd640b2e7bb0214e52b05ec50367d895d057886ae9bf9342312006e7b21f5625e1c4f5d7a9e12a7f7b64a968e5371f8c2c45a8ac8b1c8ca6d39b10b
diff --git a/dev-python/pytest/pytest-6.0.1.ebuild b/dev-python/pytest/pytest-6.0.1.ebuild
deleted file mode 100644
index 1e25f4560094..000000000000
--- a/dev-python/pytest/pytest-6.0.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="https://pytest.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc64 ~riscv sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' python3_{6,7} pypy3)
-	dev-python/iniconfig[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
-	<dev-python/pluggy-1
-	>=dev-python/py-1.8.2[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-"
-# flake cause a number of tests to fail
-DEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/argcomplete[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/xmlschema[${PYTHON_USEDEP}]
-		!!dev-python/flaky
-	)"
-
-python_prepare_all() {
-	# fragile to warnings from other packages (setuptools)
-	# little value for us to run it
-	sed -i -e 's:test_no_warnings:_&:' \
-		testing/test_meta.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	"${EPYTHON}" -m pytest -vv --lsof -rfsxX ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pytest/pytest-6.0.2.ebuild b/dev-python/pytest/pytest-6.0.2.ebuild
deleted file mode 100644
index fc8b64880d99..000000000000
--- a/dev-python/pytest/pytest-6.0.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="https://pytest.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' python3_{6,7} pypy3)
-	dev-python/iniconfig[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
-	<dev-python/pluggy-1
-	>=dev-python/py-1.8.2[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-"
-# flake cause a number of tests to fail
-DEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/argcomplete[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/xmlschema[${PYTHON_USEDEP}]
-		!!dev-python/flaky
-	)"
-
-python_prepare_all() {
-	# fragile to warnings from other packages (setuptools)
-	# little value for us to run it
-	sed -i -e 's:test_no_warnings:_&:' \
-		testing/test_meta.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	"${EPYTHON}" -m pytest -vv --lsof -rfsxX ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pytest/pytest-6.1.1.ebuild b/dev-python/pytest/pytest-6.1.1.ebuild
index f101893a5c2b..80ac5b35a8fe 100644
--- a/dev-python/pytest/pytest-6.1.1.ebuild
+++ b/dev-python/pytest/pytest-6.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pytest/pytest-6.1.2.ebuild b/dev-python/pytest/pytest-6.1.2.ebuild
index f101893a5c2b..c10d175798ea 100644
--- a/dev-python/pytest/pytest-6.1.2.ebuild
+++ b/dev-python/pytest/pytest-6.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"