gentoo auto-resync : 13:03:2024 - 00:46:32

8 files changed, 55 insertions, 92 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index bf499765d941..343f72c9b1be 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/pytest-salt-factories/Manifest b/dev-python/pytest-salt-factories/Manifest
index d45f87d2a3b0..94fdf2cf51c0 100644
--- a/dev-python/pytest-salt-factories/Manifest
+++ b/dev-python/pytest-salt-factories/Manifest
@@ -1,12 +1,10 @@
 AUX pytest-salt-factories-1.0.0_rc20-tests.patch 17428 BLAKE2B e52c44dc43f08f7933fbcea60e4ba39351cdaae79dc4037a490ae222cd41286feb308c66abe90116417f72ac0aa3c968dc30afd914545f3c08ce5f4c75d43a85 SHA512 6ac3af11d518834125fd41e9e3b49a383079cdd48888044b3009eea4f0a066fe2b8b8d20a8fc7cf6331cd8269c98140d5203dcf0f5a64504c952d8a5bd652ef2
 DIST pytest-salt-factories-1.0.0_rc20.gh.tar.gz 160140 BLAKE2B 7ecd9af695626c465e5776ed218bd92f30a556394cf4af0c2b6fb87c182f8aaf2d8f998358a7eef95fae53c85a6be2d4ed5a6ff191496fcac62a97e25cf19063 SHA512 5677c6638b5dc7f90c01f2c2204e1910c2bf6ea2c10b714173d3443d4c682b5f515ad7881e2ceee66f6eaf619e399d6fa10052604fdc9c5157c58348b63c8f2b
 DIST pytest-salt-factories-1.0.0_rc23.gh.tar.gz 162711 BLAKE2B 28610679d7717d7a6f97a2f14a1ac838aec5101171ae65f2328d9b902d04b272c5e37f08d8ff3414af52ff7af954da24c083dfdc4afd1a9342b09cce0bf5aec3 SHA512 22d8f4a1c48a144437b9ff7d064760b59bb2a1003838e07f446a6150a77c162bffa7f21c570f796d8214d870d5b029e92abf7b0410ce19726085b607628364f0
-DIST pytest-salt-factories-1.0.0_rc25.gh.tar.gz 166148 BLAKE2B 11935c0164727968b9f2bd6f77498ea9ed4dbafd48bd6bb2730716fbcb1bb69b1ab09ef9ea2e2519368f4b6408bbb03f41fb0e52fc3cf75695f2b9c2b8d37294 SHA512 dd18688731b6bd2384abff9d739154b1ca7786bc3843d9fa8c293d1950925fff6c5820680a8095d4d5f3b75bcaeb07d8b3c7703ecab64a5f3a28bad11da18397
 DIST pytest-salt-factories-1.0.0_rc28.gh.tar.gz 168150 BLAKE2B c286c2a3933f8a987f1073ba97097cec29bf494cac9c4ba21ec4c261e22570ac3445900cacf629cce6253fb1a5fb95eb3d637b4d26e8835648dd11c569a7255e SHA512 ea362daa83007d9054b023ca9c11864ba304d802fa359c8cb883aa929f339c5347d50560a2d4a9cbc151a7b05bc46d1dc2f7693dd32d26383766cb5f249f3484
 DIST pytest-salt-factories-1.0.0_rc29.gh.tar.gz 168690 BLAKE2B d365cdef727e6ed0c0d2d06ce3c8731ddf67181d4d8386d106b7569c709fc5336529c72e907d44496463b47b18659376a64c79b08d45aaa5aa7d8d927a646db3 SHA512 7dd0e9d5bb6e4b292ef145f6fec770435f1cd23a07be67c98e155b1aa3a34bec1c542d97a6cae0302ad46e5c2f4e35eadb45bd7ea8979c05c6ddf1aacde9f755
 EBUILD pytest-salt-factories-1.0.0_rc20-r1.ebuild 2098 BLAKE2B f8100dc074e78206ce1da4f5a964de6f18be4c7fe1ad181c1101db5666d68532d4a65882bc62dd03e7e0e72ac6227337ce9e1467d3d348abbe8b4f684a5fca36 SHA512 be97b9ff2e501e8e9cc252482446aa00fbf253a9ee6e12c691fb9e14685c39eac710c96242d0f7c18f1ce4e068d7b61a3cc8e7f466a95512aad4c0b55fe43c8d
 EBUILD pytest-salt-factories-1.0.0_rc23.ebuild 2157 BLAKE2B 484a02515c9efed4370738cba944730210f3ef19d8bca02352cafa8c907d9472188e00946292a75de82c36fc0578167766797f8a840ab9967990b0a7ed9ac371 SHA512 1c9931e7c35dc07325b9359728237c99792ebb87e330ddaf811ed9475243726bcb541e364aed82a214f0a22f6e37e9034c72510f921cbf67e66845df63be6aa0
-EBUILD pytest-salt-factories-1.0.0_rc25.ebuild 2882 BLAKE2B 747dd0460778809bd9b3857f997bb0f8cd5a8e8148943cf0ec5c160feb15078823d3057b18386dd82f553406c72efcc5aa05eab31cef9953dab8a0d574278d75 SHA512 91a23b104de4e3748826ba31bfd62d3f4346b6e3dc015b08a002b230725b7f7a92f1354084d9b6749b832f0af0419decbdf398a08d6e6ab2d656686516dfebec
 EBUILD pytest-salt-factories-1.0.0_rc28.ebuild 2428 BLAKE2B ece905f67a0eadb331bf0a8f84522b2ad64af1cee442fe00a00cfc5fcff929f5ed0cdcbde2bff0c64919a36cad1593d701ee6badec85093c4513a8d4ff0021fc SHA512 3e51d1a30190ecb27653439820ce7e27639c30b87f0a051d135818f6d0e13c50d2dac7befe7ffe12726e15e8e9bd55cb9694230937ce89bc059428fea196c5b0
-EBUILD pytest-salt-factories-1.0.0_rc29.ebuild 2434 BLAKE2B a3a5fc81c7d2671ee2a165e349954d3890b4576bd127bfe4d1b13b8084d8346ffdd244b6bc38582b6e36e875dd54546b472cdec4ee27e6c01625a0c42c91eec8 SHA512 0b46e78ca43c6fd1ca19c75cf9db8675943f986c971ad088bec13e41e0fec773181a5e34556d9e6c1e2d3e2240d57b47705ac7ea08d605a6af223f5b5b63642e
+EBUILD pytest-salt-factories-1.0.0_rc29.ebuild 2613 BLAKE2B e6d6b1cc9dc64b3aa92db54616e4428cccd2cbddf5f88fb515d4a39fe161032ca435343d061a0c8999966aea218fa6625763bcb9c912498c703f483f4499d60b SHA512 8c2c71fc866b224c19c457af942625dc916ae5a606d6c35afa4eff099bba8c3dca70b2a914659b7229f25abc7b9ffb7ecaa6202c68b8a8e7f9c34a42cff47450
 MISC metadata.xml 429 BLAKE2B 84a4af391d2a8bee687c8499a7642117ee99483439c044695d5d68a546fad02f1e6e96d88a56c2eaaac0bfcb8f7df97313723fe562885c72c952f052334fe825 SHA512 f561d42e196c7d9bcfe656149ba40e94a52c84f3fe518b6039dc9c7c1d213c22bba8817bc35563049526efb59cfc6eeb1ca9c1021f635a099e81e72fbb5d3c52
diff --git a/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc25.ebuild b/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc25.ebuild
deleted file mode 100644
index 2fea90873c20..000000000000
--- a/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc25.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_10 )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="The new generation of the pytest-salt Plugin"
-HOMEPAGE="https://github.com/saltstack/pytest-salt-factories"
-SRC_URI="https://github.com/saltstack/${PN}/archive/${PV//_/}.tar.gz -> ${P}.gh.tar.gz"
-S=${WORKDIR}/${PN}-${PV//_/}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/docker[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/pytest-7.0.0[${PYTHON_USEDEP}]
-	dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
-	dev-python/pytest-skip-markers[${PYTHON_USEDEP}]
-	dev-python/pytest-system-statistics[${PYTHON_USEDEP}]
-	>=dev-python/pytest-shell-utilities-1.4.0[${PYTHON_USEDEP}]
-	dev-python/pyzmq[${PYTHON_USEDEP}]
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	dev-python/virtualenv[${PYTHON_USEDEP}]
-	>=app-admin/salt-3005.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/importlib-metadata[${PYTHON_USEDEP}]
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-		dev-python/pytest-subtests[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -r -e "s:use_scm_version=True:version='${PV}', name='${PN//-/.}':" -i setup.py || die
-	sed -r -e '/(setuptools|setup_requires)/ d' -i setup.cfg || die
-
-	sed -i 's:tool.setuptools_scm:tool.disabled:' pyproject.toml || die
-	printf '__version__ = "%s"\n' "${PV}" > src/saltfactories/version.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -a EPYTEST_DESELECT=(
-		tests/functional/factories/cli/test_call.py::test_version_info
-		tests/functional/factories/cli/test_cloud.py::test_version_info
-		tests/functional/factories/cli/test_cp.py::test_version_info
-		tests/functional/factories/cli/test_key.py::test_version_info
-		tests/functional/factories/cli/test_run.py::test_version_info
-		tests/functional/factories/cli/test_salt.py::test_version_info
-		tests/functional/factories/cli/test_spm.py::test_version_info
-		tests/functional/factories/cli/test_ssh.py::test_version_info
-		tests/integration/factories/daemons/ssh/test_salt_ssh.py::test_salt_ssh
-		tests/integration/factories/daemons/sshd/test_sshd.py::test_connect
-		tests/scenarios/examples/test_echoext.py::test_echoext
-		tests/functional/factories/daemons/test_container_factory.py::test_skip_on_pull_failure
-		tests/functional/factories/daemons/test_container_factory.py::test_skip_if_docker_client_not_connectable
-	)
-
-	local tempdir
-	# ${T} is too long a path for the tests to work
-	tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)" || die
-	addwrite "${tempdir}"
-
-	(
-		cleanup() { rm -rf "${tempdir}" || die; }
-
-		trap cleanup EXIT
-		export SHELL="/bin/bash" TMPDIR="${tempdir}"
-		epytest --no-sys-stats
-	)
-}
diff --git a/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc29.ebuild b/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc29.ebuild
index 9eb29db8c3e8..f579f09b3116 100644
--- a/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc29.ebuild
+++ b/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc29.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_1{0..1} )
+PYTHON_COMPAT=( python3_1{0..2} )
 DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1
@@ -57,6 +57,8 @@ src_prepare() {
 
 python_test() {
 	local EPYTEST_DESELECT=(
+		"tests/functional/test_manager.py::test_system_service_cli[system-service(True)]"
+		"tests/functional/test_manager.py::test_system_service_config_fixture[system-service(True)]"
 		tests/integration/factories/daemons/ssh/test_salt_ssh.py::test_salt_ssh
 		tests/integration/factories/daemons/sshd/test_sshd.py::test_connect
 		tests/scenarios/examples/test_echoext.py::test_echoext
diff --git a/dev-python/raet/Manifest b/dev-python/raet/Manifest
index a4ee7f79eee5..8eaf9102a0cc 100644
--- a/dev-python/raet/Manifest
+++ b/dev-python/raet/Manifest
@@ -2,4 +2,5 @@ AUX raet-0.6.8-msgpack-1.0.patch 8061 BLAKE2B 90607848542b8ba5a219a872f6f4f4e125
 AUX raet-0.6.8-py310.patch 1893 BLAKE2B 26dfeb901c64aa8b0c8a63f8be4e02ce65a99eea5e2f81d15be9eacb686a0d13bfe2e41588ed214a78906db2e607e1468f8c477a1c5dbe67cdf7cfae2d16da6a SHA512 d15618790b20e4843ed04a1ffe17acd3b31cf51388a9764c0f8ee33a28d503345dddea8da93418c6b46291ca61e4faf6fe3351935365909d1cfde5fc18d43f6d
 DIST raet-0.6.8.tar.gz 807419 BLAKE2B 2370eb55b76a52cf89363f9891a411ea7fa2f27b84bd216c44010fd9afb5dcd9261570f916db00ff7bd922c485cd6123b3a6522154b6e05f7869d7e790177f7b SHA512 01279e7414ec3edc9f2bc0641cb9e0606ebf5700b5ce37a05fd5919f3274b3b43aad64110baf4c4b1fda3843cb1a87b6be4ab592a8f62e82b3a716a86ae61b20
 EBUILD raet-0.6.8-r5.ebuild 1024 BLAKE2B 2fc99182d540c8a3c882f4efb252422577d2a15f1541df3460e017e3049db52e7e4b9b30de01b44caf39ab68249270eae075dd6b94acfb245fb96b772b29146e SHA512 550d1137ef389afcd56a26abf46a38de4a24c1372a73efd8b7acc650024588c1212b33e7e85969d3f7410446a501f4e91465d2c7a0f11c5cad4fe9609e9678cd
+EBUILD raet-0.6.8-r6.ebuild 1065 BLAKE2B 2b62f4874f72fe3f41f35b7ba878402f377ae5b0daa916a6393ac0a53b39da4c02a68259a3e115fa2674cc03adff2bbb8998b2dc38be70ee7dedf603b8df6767 SHA512 2145dcd9547ead33d5fde065ebda667324d13972205f64101bbcecd749f6806ea73188c323656057b5e8fa8cc8f31760881a6425d1fbc6d19babef0fb42af1c2
 MISC metadata.xml 475 BLAKE2B a717b6ad3a8b2cdd4b4c48c6fae1226e92080952af627757ac935a6bc8beb3fbf941d6aa0c631281cedadfba5d10d95d6a9b5c8e4a3a47c8da800a7e89fbf8ca SHA512 605d31af6fa66007c18033eea24b7de74b8529996d9a9a19e9e188fd83831f83c5d621aff03e423d25388fca790970de9add12a10ce300aa90bbe08226f6a8e7
diff --git a/dev-python/raet/raet-0.6.8-r6.ebuild b/dev-python/raet/raet-0.6.8-r6.ebuild
new file mode 100644
index 000000000000..94a1bee2724e
--- /dev/null
+++ b/dev-python/raet/raet-0.6.8-r6.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Reliable Asynchronous Event Transport Protocol"
+HOMEPAGE="
+	https://github.com/RaetProtocol/raet/
+	https://pypi.org/project/raet/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
+	>=dev-python/libnacl-1.4.3[${PYTHON_USEDEP}]
+	>=dev-python/ioflo-2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/raet-0.6.8-msgpack-1.0.patch"
+	"${FILESDIR}/raet-0.6.8-py310.patch"
+)
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	sed -e "/setuptools_git/d" -i setup.py || die
+}
+
+python_test() {
+	pushd "${BUILD_DIR}/install$(python_get_sitedir)" >/dev/null || die
+	"${EPYTHON}" raet/test/__init__.py || die "tests failed for ${EPYTHON}"
+	popd >/dev/null || die
+}
diff --git a/dev-python/tree-sitter/Manifest b/dev-python/tree-sitter/Manifest
index 7fbc1bf469c2..749e5f2d6b15 100644
--- a/dev-python/tree-sitter/Manifest
+++ b/dev-python/tree-sitter/Manifest
@@ -10,5 +10,5 @@ DIST tree-sitter-python-0.19.0.tar.gz 129336 BLAKE2B 8a37b0d74ab89aa56d7164bd38a
 DIST tree-sitter-python-0.20.4.tar.gz 249840 BLAKE2B 563895c46ca1de400d51168473cceaed61b3df486cbf9f33ae9f63acc16268b9147917f0bc0f18d3c8cad0ab0684b4c51900a7e1c6b898735621676353630650 SHA512 2cfd327a1c0033ebb5bc1a4efe4f8b7a776ad45da6b12ad3d496fe3500e2a99ac0ecefbc6eec81d724bcdb060a0ebb8a24496dee23c83c7802e0226f495751d3
 DIST tree-sitter-rust-0.20.4.tar.gz 358924 BLAKE2B 16c7918d352163ebb866f34865c68f5d9e19bbc3ffcec0f0c61ba38a8c828cee3eb50c97ddaea01d7575e23496bca18dc5161daee8bbdaa075ba75de608be999 SHA512 f1b2e9537286921056eda4e96faa9f61131b9ca5684e7ab8aa7bd07e46d91e5eab18e6e292cfad7cdcb7ba195e80f7f1e35f04992cb8011bbd29dd2d95116f9d
 EBUILD tree-sitter-0.20.1-r1.ebuild 1472 BLAKE2B bfcd5ebcb8b1a1a1e799de1918da3c786e8da7e6a729f0054c1e49c0e0fdf273d58522896b54b385cea4733fefea5c01f39261de90156ef7dfd7a9503eb225a1 SHA512 2f9a69474f454d0e24e669f6bffc577ce5073cc20e8d8c3e609d048e8ef9e4eeaa6d3c8a39b3b9c066f8a67598aaf6171fb414cf20088f12d685127c515ddb5f
-EBUILD tree-sitter-0.20.4.ebuild 2143 BLAKE2B cb327fd0f304c3379beb5c4fc0d867dda6146bc60dcc4213f7a8407355e30435545a122debdf5759975e465b340c51d0dd234e8e68beecdbfc88ca74326c41b7 SHA512 4d7ee894719c4f300a6ac7c70e7cee6164257e592697e345392b4ca201042fb00e21ec3e7945d8f7e306a8c15032633705fb2fd5790cd0e0393e952c84eeee1e
+EBUILD tree-sitter-0.20.4.ebuild 2141 BLAKE2B 27b8fade91b55a9094f217d8ce5381a897995b754ce1bf3256724f8e8758ad02cad42b764bbcc3a02a45858bc18be54698a9b67846f0d63d85fb0501bc956b40 SHA512 17326bb18f6ff4d586918cad47456413324bf4d4844142752903177862d72456ce7900b105a5ba2db4885670c539c0723935668680cd1b5496c65b0752f26845
 MISC metadata.xml 393 BLAKE2B 15f673391ad9e9aab93808392449ddf99ccc35fe1b345010a4373b46a56c8dad461042e0a2dd735e4d53f77059a5f7920fc3215f939aacd1455c61f0ecdfa3c0 SHA512 519fc8d6fbbf3709820b26b1f4786b16f6679e569ae4adafdc5e37b2dfbc03351bfd9c6750264300a0309406ffe20868d48c3ff488dde22f900d59e1813c15ef
diff --git a/dev-python/tree-sitter/tree-sitter-0.20.4.ebuild b/dev-python/tree-sitter/tree-sitter-0.20.4.ebuild
index 32d2d13d9c6d..d8020fc38244 100644
--- a/dev-python/tree-sitter/tree-sitter-0.20.4.ebuild
+++ b/dev-python/tree-sitter/tree-sitter-0.20.4.ebuild
@@ -41,7 +41,7 @@ S=${WORKDIR}/py-${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 
 DEPEND="dev-libs/tree-sitter:="
 RDEPEND="${DEPEND}