From 4df3bf9762850b34cd1ead5c80374d1a0fc3362e Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Mon, 12 Jul 2021 08:41:54 +0100
Subject: gentoo resync : 12.07.2021

---
 dev-python/pytest-salt/Manifest                    |  2 +-
 .../pytest-salt/pytest-salt-2020.1.27-r2.ebuild    | 43 -------------------
 .../pytest-salt/pytest-salt-2020.1.27-r3.ebuild    | 48 ++++++++++++++++++++++
 3 files changed, 49 insertions(+), 44 deletions(-)
 delete mode 100644 dev-python/pytest-salt/pytest-salt-2020.1.27-r2.ebuild
 create mode 100644 dev-python/pytest-salt/pytest-salt-2020.1.27-r3.ebuild

(limited to 'dev-python/pytest-salt')

diff --git a/dev-python/pytest-salt/Manifest b/dev-python/pytest-salt/Manifest
index 3af29bb378a0..e67d3bf4bb60 100644
--- a/dev-python/pytest-salt/Manifest
+++ b/dev-python/pytest-salt/Manifest
@@ -1,4 +1,4 @@
 AUX pytest-salt-2020.1.27-r2.patch 744 BLAKE2B 43eadb0fb01406efb9e67388a6b0ca5a021ae6ec622ec5dd5dfb1ab9575489c711dc805ce64e1373e4a0044490d71132ff4eb9584f3e9f2fb043a168d18d8349 SHA512 b0a0d56dc7d5ab43a1970488128c97de5f2c266523889896cab53040cb8eb426bda88cd8d641d706b6d09fbaf1b3f439cbfe947264cc004e766e6cc84350076f
 DIST pytest-salt-2020.1.27.tar.gz 64141 BLAKE2B 2b9261af2de28f8dce1abcd71b586594075916c8a5dbb27a24f15b9d95a575624be118d1c742f02020d3b968ffa4654cf6cd0dabefffe6876b87a4d1d58c3d60 SHA512 b0632e21f1ea5c3b57eb681cd8b270721cafd270321b708fca65427fc89817ed9e9a4216a520f35988c6866b1ed76ed84838009da9052a11cf8782d4dcf118ba
-EBUILD pytest-salt-2020.1.27-r2.ebuild 985 BLAKE2B 481b1562789969656c0f97ffb19bed526af1190e55adcf31ad257de8f27bafc9116da616b44a334e17cd8030e99c4fa9e15474450fc318509f7d876f2384cc1d SHA512 bff1f3f05ad4bdbe1578a34d3c6c6fefbb02bcb02f5f93b86a6fa5461adac2df345db492a6be4f10f37ee572173dafb09ac650621ea52e9b56d7e88feceef0de
+EBUILD pytest-salt-2020.1.27-r3.ebuild 1118 BLAKE2B a4c0e7158b9c7b97e9677415a99a0c382581a394fca6f3d89008ae7d1f4879aab41a6cb9504690373c0a9c6b150bd3bc6f858d22ebe335a4e7159802453dc98f SHA512 d0266bd26017043833368f7553d054edebfb39ae0fad5c8f21e808a92f8a2b09c0c871e0cc1123010184e48f6854465bb66a2c041391e4a0597b6d9a0433b7d5
 MISC metadata.xml 323 BLAKE2B 2eede80f9d146aa2dc511191d1e1ef7a689786878c2ba77ee62dc181d49ed07475f657886e6f9d662140ff378ddeaf65f979a6e483b92ff97834e934b225b430 SHA512 ca8b7955dc3025e3ed15ef0556b02a80b033dc2003bbb3030b42112e04d1945436a3ff2224bd2149ec34210d50a66fcc0b1577dd1464fc8e1e4ed097286e02a1
diff --git a/dev-python/pytest-salt/pytest-salt-2020.1.27-r2.ebuild b/dev-python/pytest-salt/pytest-salt-2020.1.27-r2.ebuild
deleted file mode 100644
index f3d2b483cbdb..000000000000
--- a/dev-python/pytest-salt/pytest-salt-2020.1.27-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-inherit distutils-r1
-
-MY_PV="${PV/_p/.post}"
-DESCRIPTION="PyTest Salt Plugin"
-HOMEPAGE="https://github.com/saltstack/pytest-salt"
-SRC_URI="https://github.com/saltstack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/pytest-2.8.1[${PYTHON_USEDEP}]
-	>=dev-python/psutil-4.2.0[${PYTHON_USEDEP}]
-	dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
-	dev-python/pytest-tempdir[${PYTHON_USEDEP}]
-	dev-python/msgpack[${PYTHON_USEDEP}]
-"
-#BDEPEND="
-#	test? ( app-admin/salt[${PYTHON_USEDEP}] )
-#"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2020.1.27-r2.patch"
-)
-
-# tests need network access
-RESTRICT="test"
-
-distutils_enable_tests pytest
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pytest-salt/pytest-salt-2020.1.27-r3.ebuild b/dev-python/pytest-salt/pytest-salt-2020.1.27-r3.ebuild
new file mode 100644
index 000000000000..71b7c59306f1
--- /dev/null
+++ b/dev-python/pytest-salt/pytest-salt-2020.1.27-r3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit distutils-r1
+
+MY_PV="${PV/_p/.post}"
+DESCRIPTION="PyTest Salt Plugin"
+HOMEPAGE="https://github.com/saltstack/pytest-salt"
+SRC_URI="https://github.com/saltstack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE="test"
+
+# See bug #740882 re salt/tornado dependency
+RDEPEND="
+	>=dev-python/pytest-2.8.1[${PYTHON_USEDEP}]
+	>=dev-python/psutil-4.2.0[${PYTHON_USEDEP}]
+	dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
+	dev-python/pytest-tempdir[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	|| (
+		app-admin/salt[${PYTHON_USEDEP}]
+		www-servers/tornado[${PYTHON_USEDEP}]
+	)
+"
+#BDEPEND="
+#   test? ( app-admin/salt[${PYTHON_USEDEP}] )
+#"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2020.1.27-r2.patch"
+)
+
+# Tests need network access
+RESTRICT="test"
+
+distutils_enable_tests pytest
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+}
-- 
cgit v1.2.3