gentoo auto-resync : 22:08:2024 - 12:26:19

7 files changed, 509 insertions, 4 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 928d9b3e590e..4c767d747dbb 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 4ccf59e0ed30..c53f41cc6c2f 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -3,9 +3,11 @@ DIST aws-cli-1.33.40.gh.tar.gz 2769444 BLAKE2B a26e26cb4694460e36fe2d9730092db33
 DIST aws-cli-1.34.0.gh.tar.gz 2773056 BLAKE2B c6c9d89fe719116faad47417dd1aa9a98125b65efaf61476582cf7fec16e7ab5bd9823b6973bde51891a8bdad8ec9bfade305abfcee2eb70f6cf2679ef815d1b SHA512 914efb62ec94825529e981c934f617b0c1ae3c367b7215bff7160b8bef7c3ea73d0400d3e04ff237546731e3586077c83ed918c0747f75ff4079e8b5e1159809
 DIST aws-cli-1.34.1.gh.tar.gz 2773592 BLAKE2B 38dab4a072a807c9f8dc57f6ac97e7c756f40c89f9ab288f695b3670c0995678669c67e54664dbd54ac4aaa02620e79500467bcc780b1282b6ffdd05b65ead92 SHA512 620cc1d28f0e85b265a0aff80d7aa99b8f076cb3458b4ad6deb77f8a2b5d17ed1f1542ac88cbc5472063de3da6d6f35698058194ee79c6fe2b9e8d592382f5cc
 DIST aws-cli-1.34.2.gh.tar.gz 2773948 BLAKE2B 71ccdb3898087ad8e51cbd49253e4a999cf10c8cb4d719acd4d5e0adfff73920da8fea8702accb5fc408c43cf86c903736704b6350df30620bae2049e7c8bf83 SHA512 a983b3ed870717c81bd79bc9d436bde12585d396a43d4652c52795541c551fa88a48929a7319f1124abc02a259fbadfe2d261304b49267a4bf64688215ad7dfe
+DIST aws-cli-1.34.3.gh.tar.gz 2772150 BLAKE2B 4cd6f36a6987e4d58130d26c60d3254258d24d1065a0834aa5cb987cf51f7d2a6049e05253f63ac0a11cd4f2d4a94b68affb2195d51db8a57fe0a1808f55dca4 SHA512 2ee6a5bb5b2565913f6f70ff8a1c8b9561034019857016cf548b0c683ee67d98095a0572d692a531250f933302b673ba5a8f9c42e73cf5c385236fc1ca14821e
 EBUILD awscli-1.33.35.ebuild 3048 BLAKE2B 4002d52c91dbcd135f95485348470378b344c96349c05b8cf1424900a18cbe82683c050253b47d845dcf0d4373ed97946287f1e403e5d2a7e0b2646449257a4b SHA512 ec71ff0fdf28ff024763abb7e7f603521b109f027cb56c2806ab6bf50c71a02947cbf067d112451093df8ae6c786585effe20c5c980138d7a8149219d59edfff
 EBUILD awscli-1.33.40.ebuild 3055 BLAKE2B 442cc5222134bd9b622bc3f9f35b1882cc0ff4c8cfe9b5d1a5cae7fe09f1d7036d057ab1e231f5cb29370aaabea11be300ace2fbe634cb38c819b401a728afdb SHA512 00175b451b0c44db1b3e57fa56f4bd845c6b91a5409412e8b7580eaedea5c2c17e4841ad6fb1ae6d65cf94d302259493a961e8e1c4f30cf928be229bb8e0486a
 EBUILD awscli-1.34.0.ebuild 3030 BLAKE2B caff93dffa12da6e0698e0c392d5c54288b22335b9ab6568d5c21cc9a894c952489cce772f5b34be10825a6066920e34c8766dfc4a4a96b2c801233049de7d82 SHA512 127fd2aef4d38ff566bc470dad93552291abd3ae7f1a3bc81f8ef5ef331eece6519d53c6c1e89fcddbdb3566ede964e502b752a7f7076baeb09eb3141f726ab0
 EBUILD awscli-1.34.1.ebuild 3030 BLAKE2B caff93dffa12da6e0698e0c392d5c54288b22335b9ab6568d5c21cc9a894c952489cce772f5b34be10825a6066920e34c8766dfc4a4a96b2c801233049de7d82 SHA512 127fd2aef4d38ff566bc470dad93552291abd3ae7f1a3bc81f8ef5ef331eece6519d53c6c1e89fcddbdb3566ede964e502b752a7f7076baeb09eb3141f726ab0
 EBUILD awscli-1.34.2.ebuild 3030 BLAKE2B caff93dffa12da6e0698e0c392d5c54288b22335b9ab6568d5c21cc9a894c952489cce772f5b34be10825a6066920e34c8766dfc4a4a96b2c801233049de7d82 SHA512 127fd2aef4d38ff566bc470dad93552291abd3ae7f1a3bc81f8ef5ef331eece6519d53c6c1e89fcddbdb3566ede964e502b752a7f7076baeb09eb3141f726ab0
+EBUILD awscli-1.34.3.ebuild 3030 BLAKE2B caff93dffa12da6e0698e0c392d5c54288b22335b9ab6568d5c21cc9a894c952489cce772f5b34be10825a6066920e34c8766dfc4a4a96b2c801233049de7d82 SHA512 127fd2aef4d38ff566bc470dad93552291abd3ae7f1a3bc81f8ef5ef331eece6519d53c6c1e89fcddbdb3566ede964e502b752a7f7076baeb09eb3141f726ab0
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.34.3.ebuild b/app-admin/awscli/awscli-1.34.3.ebuild
new file mode 100644
index 000000000000..599b9bd389b9
--- /dev/null
+++ b/app-admin/awscli/awscli-1.34.3.ebuild
@@ -0,0 +1,90 @@
+# 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..13} )
+
+inherit bash-completion-r1 distutils-r1
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# botocore is x.(y+1).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1 )).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local serial_tests=(
+		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
+		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
+		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
+		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
+		tests/unit/customizations/test_sessionmanager.py
+		tests/unit/test_compat.py::TestIgnoreUserSignals
+		tests/unit/test_help.py
+		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
+	)
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	EPYTEST_XDIST= epytest "${serial_tests[@]}"
+
+	local EPYTEST_DESELECT=( "${serial_tests[@]}" )
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit}
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index 626244566b82..6f78b9dd92bd 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -22,11 +22,13 @@ AUX syndic-initd-5 558 BLAKE2B 5e1ea25b57f56ad7bfb8be0c845e7da9f99af03c50c31ca20
 DIST salt-3005.5.tar.gz 17940104 BLAKE2B c7a820bc946c2cd8124fb6f559608ab1dc3cd85d6f0e7d0a2a87b7bc0dda361178e83b307c2fecd8a47d59032f85dc9f4caeef5698e98c0e349d1c6979f9f68a SHA512 1332c9751a225dbf569601eb1932fe3ebea93c8d8be7485b1b8150d5200ad2e82954c970d59ba0e888860062d059db78a50bffe69fc367bdb7b2388b62e19f32
 DIST salt-3006.5.tar.gz 20536455 BLAKE2B cf475dc5e919f6ab180578db2aae5f3655623b39b134d67609da4f607be909340c6e55c940cfb66f129cc75d40b5cdda094e866db116d8a45aa5eef26d8fa1eb SHA512 8aaf5c5d36d8aa17b3fe867cee470f7b3c5dd1f6abaf5bdb49a3df76d3498d0dc1fa305a069bc95ad057489db229454b38b0ea9c1ade1e46b5d9b57aeef10c23
 DIST salt-3006.7.tar.gz 20562663 BLAKE2B b4ff9039509b1de7151060cb0e68252868d493e114e327a3c48bfc5584f67521a2106b41b77377f6d43ab5795399b6fe5860ce8e091459687c4a5b2378752729 SHA512 9d1759a7c0dfc9ad4fdc94460f0f3799483737207bfdc8ddd1424e5c6083ea74ef520f13c323d5cbd7f65c1d9bb13bbbeb5f2cafe6dcacbc2689e733794aef2d
+DIST salt-3006.9.tar.gz 19691113 BLAKE2B f08dfef58273cef809e4aa954d348b282967affa85e4b2814bb539c41bfcecde29e5a903ed14786b353262e31212c3d581550ac031b5c4866453bec398d5ae88 SHA512 96385f505363645d958c3a05f3d50b240f6c750b28e4a11b419c08ec152fc9a66930e555beeba282ef463986f4b570f6dda1ad944aefd14d4cce586a9f1741e1
 DIST salt-3007.0.tar.gz 20304228 BLAKE2B 3db95ce779cfd08d61536dcfb4ff6ac31788ad1d6d4665b640dcc430f5a33847f231f94fd574c5d8df7b14e2854511c80610a37cd19be5429c4643be8bd9e0eb SHA512 0e49d76dafdb981ee380ea89ceba2cddeae8cd95df1d188a6f8ba64a175c606aaf2f8101bacb040792255afdb46ae668cbc9464d0dbb055986e85cee4d5c130b
 DIST salt-3007.1.tar.gz 19401831 BLAKE2B ea8c89a24991467367dc0c50e3d2f864e2f6211ba9a71195d6308a86df16229fc77baa2ec837f043ebad36d9d7a6673fefa3a1a826472d900925e657e2152718 SHA512 732820bae98ce2eb74175a2c37c986076572e0e60d04a270861fd3b0b6871cd2cc703683a8c0d97ffc43b2f7fffb76ae709a1aea839d10abc9f5d0837eaade4b
 EBUILD salt-3005.5-r1.ebuild 12562 BLAKE2B 353e88ebd0c8992826ed030f2cd89bba882e1ea74239276d7f81d904ba27b91e1c4e5b5586bfbc1b16c6446de5f22610e14992b72fa7c5a6d56d3a002e4455c4 SHA512 86392b47a9e0d52a4186416550b75f7ea701355e970efcd1af4cbf27d0cf6f4025de0b6364998e712daca357761e8cd5e65a604ad605d29395231b6193943ea4
 EBUILD salt-3006.5-r1.ebuild 15196 BLAKE2B beb3924f91cf050c2a57414e0121d08c54991c2aa1b5c89a1c67afa644c1ef030415dc588b36e6aa11adf651d851f82365b4d5ccfa27e043c707756ddfe4c6c8 SHA512 c4b1d4a50546196f75c9d1327aa13bb649a61349b52f60b91cc958ad5bfcb1c438042c29d513a94aebb9f92d4d5acc47438d4e34468701e840ca0a0e52f7805e
 EBUILD salt-3006.7-r1.ebuild 15501 BLAKE2B 0de15bea8e2c92b5fe242137604e7bf09555cd054b4a0ef04026b388830ac2b797a51e3c541f43dc40723c0790c9f414f165d6ec950cc247e01c07d594a835e8 SHA512 85bb4881135999701972f2105ed185475c50a62ffe50361bd9842f2603582d9cb0eb2c2b6044ae2227b2f8430662b6e84a7b5a1890cb3c1427e709fedd428b63
+EBUILD salt-3006.9.ebuild 19210 BLAKE2B 3547b1e65be906860d0518d692a4329b91948aacf003530a2def960c7fe5c32f1a6d382203ea7891c38c01dc7d62bb916840b6f8878df73a0ec8dbfe85b07f7e SHA512 35ca63b6bb9ade6395c7eac746234b077ff20ed018e0e022def8e50e036feedadb33c88709f95b6c9e13f06d4db667222a00d8d3575b46937eae6e9704ba85ec
 EBUILD salt-3007.0-r1.ebuild 30876 BLAKE2B 2816e84e757e2076c2c81aa9de3b6984e3567de44a1219dae131c110b5b9b54b9f3c41ac54f0a99e0813bc8347c412948affba56b8e38917b393b81878247034 SHA512 0fdb640a921418059800c9f86d29d4495ef489e607dfcb54baffc7071e22898b9ed5ffbd823641fd0459b1c355bf87aff64f0f65635047a8b1d90c5b5f4e0ae2
 EBUILD salt-3007.1.ebuild 30929 BLAKE2B 07fd76ca5eff01bf95ec9c071ba0470af80fdb9ff5457eed2490ec2750d02881df85738e6bc6266f7431bf979408d3272e6493d3b9cfe75286df53b2c10c4ced SHA512 e0dcb1413b967bfe9b85d39333baf86075763a931b5b0c0e680967f83920cd4d7029dc31ea94b880b3e04f42548f9ee74112bf15de825bf3d5e5b8954cd8d215
 MISC metadata.xml 2244 BLAKE2B 2c67e0828b71051c1c542b1e2142d93d623c28f30e36b59442dda3966f18ef2ae1111a263f1faf56c288c927c7db13736cfa68111248e84378fab23043d49e02 SHA512 89e46a1379b2cf95aff0af082f989cb50a1a769240407fbe6a43de1a3f312be5b690f30d1349aa659268fcf3818a2d829fcff18fd11988b161038cb19e13bde5
diff --git a/app-admin/salt/salt-3006.9.ebuild b/app-admin/salt/salt-3006.9.ebuild
new file mode 100644
index 000000000000..4278c54ee0f5
--- /dev/null
+++ b/app-admin/salt/salt-3006.9.ebuild
@@ -0,0 +1,413 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_1{0..2} )
+
+DISTUTILS_USE_PEP517=setuptools
+inherit systemd distutils-r1
+
+DESCRIPTION="Salt is a remote execution and configuration manager"
+HOMEPAGE="https://www.saltstack.com/resources/community/
+	https://github.com/saltstack"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git"
+	EGIT_BRANCH="develop"
+else
+	inherit pypi
+	KEYWORDS="~amd64 ~riscv ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="
+	cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako
+	mongodb neutron	nova openssl portage profile redis selinux test raet
+	+zeromq vim-syntax
+"
+
+RDEPEND="
+	sys-apps/pciutils
+	>=dev-python/certifi-2023.07.22[${PYTHON_USEDEP}]
+	dev-python/croniter[${PYTHON_USEDEP}]
+	dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-41.0.3[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.5[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.1.4[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/libnacl[${PYTHON_USEDEP}]
+	dev-python/looseversion[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
+	>=dev-python/psutil-5.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pycryptodome-3.19.1[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-6.0.1[${PYTHON_USEDEP}]
+	>=dev-python/markupsafe-2.1.2[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.32.3[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/tomli[${PYTHON_USEDEP}]
+	dev-python/watchdog[${PYTHON_USEDEP}]
+	>=dev-python/werkzeug-3.0.3[${PYTHON_USEDEP}]
+	libcloud? (
+		dev-python/aiohttp[${PYTHON_USEDEP}]
+		dev-python/aiosignal[${PYTHON_USEDEP}]
+		>=dev-python/apache-libcloud-2.5.0[${PYTHON_USEDEP}]
+		dev-python/async-timeout[${PYTHON_USEDEP}]
+	)
+	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
+	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+	libvirt? (
+		dev-python/libvirt-python[${PYTHON_USEDEP}]
+	)
+	openssl? (
+		dev-libs/openssl:0=[-bindist(-)]
+		>=dev-python/pyopenssl-23.2.0[${PYTHON_USEDEP}]
+	)
+	raet? (
+		>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
+		>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
+	)
+	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
+	cheetah? ( >=dev-python/cheetah3-3.2.2[${PYTHON_USEDEP}] )
+	genshi? ( dev-python/genshi[${PYTHON_USEDEP}] )
+	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
+	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
+	redis? ( dev-python/redis[${PYTHON_USEDEP}] )
+	selinux? ( sec-policy/selinux-salt )
+	amd64? (
+		nova? (
+			$(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_1{0..1})
+		)
+		neutron? (
+			$(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_1{0..1})
+		)
+	)
+	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
+	profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
+	vim-syntax? ( app-vim/salt-vim )
+	zeromq? ( >=dev-python/pyzmq-19.0.0[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	dev-python/build[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		app-arch/zip
+		dev-python/apache-libcloud[${PYTHON_USEDEP}]
+		dev-python/boto3[${PYTHON_USEDEP}]
+		dev-python/cherrypy[${PYTHON_USEDEP}]
+		>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+		dev-python/mako[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/moto-2.0.0[${PYTHON_USEDEP}]
+		<dev-python/moto-5[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/bcrypt[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		>=dev-python/pyopenssl-23.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-7.2.0[${PYTHON_USEDEP}]
+		<=dev-python/pytest-8.2.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-salt-factories-1.0.0_rc28[${PYTHON_USEDEP}]
+		dev-python/pytest-tempdir[${PYTHON_USEDEP}]
+		dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
+		dev-python/pytest-subtests[${PYTHON_USEDEP}]
+		dev-python/pytest-shell-utilities[${PYTHON_USEDEP}]
+		dev-python/pytest-skip-markers[${PYTHON_USEDEP}]
+		dev-python/pytest-system-statistics[${PYTHON_USEDEP}]
+		dev-python/pytest-custom-exit-code[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		net-dns/bind-tools
+		>=dev-python/virtualenv-20.3.0[${PYTHON_USEDEP}]
+		dev-util/yamllint[${PYTHON_USEDEP}]
+		!x86? ( >=dev-python/boto3-1.21.46[${PYTHON_USEDEP}] )
+	)
+"
+
+DOCS=( README.rst AUTHORS )
+
+REQUIRED_USE="
+	|| ( raet zeromq )
+	test? ( cheetah genshi )
+	!amd64? ( !nova !neutron )
+"
+RESTRICT="!test? ( test ) x86? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/salt-3003-gentoolkit-revdep.patch"
+	"${FILESDIR}/salt-3005.1-no-entry-points.patch"
+)
+
+python_prepare_all() {
+	local -a remove_test_files=(
+		# remove tests with external dependencies that may not be available, and
+		# tests that don't work in sandbox
+		tests/pytests/functional/modules/file/test_readlink.py
+		tests/pytests/functional/modules/file/test_symlink.py
+		tests/pytests/functional/modules/state/test_jinja_filters.py
+		tests/pytests/functional/modules/state/test_jinja_renderer.py
+		tests/pytests/functional/modules/state/test_mako_renderer.py
+		tests/pytests/functional/modules/state/test_pyobjects_renderer.py
+		tests/pytests/functional/pillar/test_gpg.py
+		tests/pytests/functional/runners/test_winrepo.py
+		tests/pytests/functional/states/file/test_keyvalue.py
+		tests/pytests/functional/states/file/test_patch.py
+		tests/pytests/functional/transport/server/test_req_channel.py
+		tests/pytests/functional/utils/test_async_event_publisher.py
+		tests/pytests/integration/master/test_clear_funcs.py
+		tests/pytests/integration/minion/test_reauth.py
+		tests/pytests/integration/modules/test_cmdmod.py
+		tests/pytests/integration/modules/test_jinja.py
+		tests/pytests/integration/returners/test_noop_return.py
+		tests/pytests/integration/runners/test_manage.py
+		tests/pytests/integration/ssh/test_pillar_compilation.py
+		tests/pytests/integration/ssh/test_slsutil.py
+		tests/pytests/integration/states/test_ini_manage.py
+		tests/pytests/integration/states/test_state_test.py
+		tests/pytests/integration/utils/test_templates.py
+		tests/pytests/pkg/integration/test_check_imports.py
+		tests/pytests/pkg/integration/test_clean_zmq_teardown.py
+		tests/pytests/pkg/integration/test_enabled_disabled.py
+		tests/pytests/pkg/integration/test_help.py
+		tests/pytests/pkg/integration/test_logrotate_config.py
+		tests/pytests/pkg/integration/test_pkg.py
+		tests/pytests/pkg/integration/test_python.py
+		tests/pytests/unit/fileserver/gitfs/test_gitfs.py
+		tests/pytests/unit/loader/test_lazy.py
+		tests/pytests/unit/modules/test_yaml.py
+		tests/pytests/unit/pillar/test_pillar.py
+		tests/pytests/unit/renderers/test_yamlex.py
+		tests/pytests/unit/roster/test_dir.py
+		tests/pytests/unit/states/file/test_keyvalue.py
+		tests/pytests/unit/utils/jinja/test_get_template.py
+		tests/pytests/unit/utils/jinja/test_salt_cache_loader.py
+		tests/pytests/unit/utils/test_cache.py
+		tests/pytests/unit/utils/test_versions.py
+		tests/unit/modules/test_boto_{vpc,secgroup,elb}.py
+		tests/unit/modules/test_saltcheck.py
+		tests/unit/netapi/rest_tornado/test_saltnado.py
+		tests/unit/states/test_boto_vpc.py
+		tests/unit/states/test_module.py
+		tests/unit/utils/test_schema.py
+		tests/unit/{test_{zypp_plugins,module_names},utils/test_extend}.py
+
+		# tests that require network access
+		tests/integration/cloud
+		tests/integration/modules/test_cmdmod.py
+		tests/integration/modules/test_cp.py
+		tests/integration/modules/test_disk.py
+		tests/integration/modules/test_file.py
+		tests/integration/modules/test_gentoolkitmod.py
+		tests/integration/modules/test_linux_acl.py
+		tests/integration/modules/test_localemod.py
+		tests/integration/modules/test_sysctl.py
+		tests/integration/modules/test_timezone.py
+		tests/integration/modules/test_tls.py
+		tests/integration/output/test_output.py
+		tests/integration/returners/test_appoptics_return.py
+		tests/integration/returners/test_librato_return.py
+		tests/integration/shell/test_enabled.py
+		tests/integration/states/test_archive.py
+		tests/integration/states/test_cmd.py
+		tests/integration/states/test_compiler.py
+		tests/integration/states/test_handle_iorder.py
+		tests/pytests/functional/cli/test_salt_cloud.py
+		tests/pytests/functional/cli/test_salt_run_.py
+		tests/pytests/functional/modules/test_http.py
+		tests/pytests/functional/modules/test_pip.py
+		tests/pytests/functional/states/test_pip_state.py
+		tests/pytests/integration/cli/test_salt_proxy.py
+		tests/pytests/integration/minion/test_job_return.py
+		tests/pytests/integration/modules/state/test_state.py
+		tests/pytests/integration/modules/state/test_state_state_events.py
+		tests/pytests/integration/pillar/cache/test_pillar_cache.py
+		tests/pytests/integration/pillar/test_fileclient.py
+		tests/pytests/integration/pillar/test_pillar_include.py
+		tests/pytests/integration/proxy/test_simple.py
+		tests/pytests/integration/runners/state/orchestrate/test_events.py
+		tests/pytests/integration/wheel/test_pillar_roots.py
+		tests/pytests/pkg/downgrade/test_salt_downgrade.py
+		tests/pytests/pkg/integration/test_pip.py
+		tests/pytests/pkg/integration/test_pip_upgrade.py
+		tests/pytests/pkg/integration/test_salt_api.py
+		tests/pytests/pkg/integration/test_salt_call.py
+		tests/pytests/pkg/integration/test_salt_exec.py
+		tests/pytests/pkg/integration/test_salt_grains.py
+		tests/pytests/pkg/integration/test_salt_key.py
+		tests/pytests/pkg/integration/test_salt_minion.py
+		tests/pytests/pkg/integration/test_salt_output.py
+		tests/pytests/pkg/integration/test_salt_pillar.py
+		tests/pytests/pkg/integration/test_salt_state_file.py
+		tests/pytests/pkg/integration/test_salt_ufw.py
+		tests/pytests/pkg/integration/test_salt_user.py
+		tests/pytests/pkg/integration/test_systemd_config.py
+		tests/pytests/pkg/integration/test_version.py
+		tests/pytests/pkg/upgrade/test_salt_upgrade.py
+		tests/pytests/scenarios/dns/multimaster/test_dns.py
+		tests/pytests/scenarios/dns/test_dns.py
+		tests/pytests/unit/client/ssh/test_ssh.py
+		tests/pytests/unit/loader/test_loading_modules.py
+		tests/pytests/unit/modules/test_tls.py
+		tests/pytests/unit/test_client.py
+		tests/pytests/unit/utils/test_aws.py
+		tests/pytests/unit/utils/test_gitfs.py
+		tests/pytests/unit/utils/test_http.py
+		tests/pytests/{integration,functional}/netapi tests/integration/netapi
+		tests/unit/modules/test_boto3_elasticsearch.py
+		tests/unit/modules/test_boto3_route53.py
+		tests/unit/modules/test_network.py
+		tests/unit/{states,modules}/test_zcbuildout.py
+
+		# tests require root access
+		tests/integration/pillar/test_git_pillar.py
+		tests/integration/states/test_supervisord.py
+		tests/pytests/functional/cli/test_salt.py
+		tests/pytests/functional/states/file/test_accumulated.py
+		tests/pytests/scenarios/performance/test_performance.py
+		tests/pytests/unit/cloud/test_map.py
+		tests/pytests/unit/modules/state/test_state.py
+		tests/pytests/unit/modules/state/test_top_file_merge.py
+		tests/pytests/unit/proxy/test_netmiko_px.py
+		tests/pytests/unit/proxy/test_ssh_sample.py
+		tests/pytests/unit/roster/test_sshknownhosts.py
+	)
+
+	rm -r "${remove_test_files[@]}" || die
+
+	# axe the boto dep (bug #888235)
+	find "${S}/tests" -name 'test_boto_*.py' -delete || die
+
+	# removes contextvars, see bug: https://bugs.gentoo.org/799431
+	sed -i '/^contextvars/d' requirements/base.txt || die
+
+	# called_once should be assert_called_once_with
+	find "${S}/tests" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:[.]called_once:.assert_called_once:g' -- || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	local svc
+	USE_SETUPTOOLS=1 distutils-r1_python_install_all
+
+	for svc in minion master syndic api; do
+		newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc}
+		newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
+		systemd_dounit "${FILESDIR}"/salt-${svc}.service
+	done
+
+	insinto /etc/${PN}
+	doins -r conf/*
+}
+
+python_test() {
+	local -a EPYTEST_DESELECT=(
+		# doesn't like the distutils warning
+		tests/pytests/integration/cli/test_batch.py::test_batch_retcode
+		tests/pytests/integration/cli/test_batch.py::test_multiple_modules_in_batch
+
+		# hangs indefinitely
+		tests/pytests/unit/test_minion.py::test_master_type_disable
+
+		# needs root
+		tests/pytests/unit/modules/test_cmdmod.py::test_runas_env_sudo_group
+		tests/pytests/unit/modules/test_portage_config.py::test_enforce_nice_config
+
+		# don't like sandbox
+		tests/pytests/functional/fileserver/test_roots.py::test_symlink_list
+		tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_content
+		tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_empty_file
+		tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_no_append_on_match
+		tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_no_match_newline
+		tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_no_match_no_newline
+		tests/pytests/functional/modules/test_defaults.py::test_defaults_get
+		tests/pytests/functional/pillar/test_top.py::test_pillar_top_compound_match
+		tests/pytests/functional/states/file/test_append.py::test_file_append_check_cmd
+		tests/pytests/functional/states/file/test_blockreplace.py::test_issue_49043
+		tests/pytests/functional/states/file/test_directory.py::test_directory_clean_require_in
+		tests/pytests/functional/states/file/test_directory.py::test_directory_clean_require_in_with_id
+		tests/pytests/functional/states/file/test_directory.py::test_directory_clean_require_with_name
+		tests/pytests/functional/states/file/test_managed.py::test_file_managed_requisites
+		tests/pytests/functional/states/file/test_managed.py::test_issue_8947_utf8_sls
+		tests/pytests/functional/states/file/test_managed.py::test_managed_escaped_file_path
+		tests/pytests/functional/states/file/test_managed.py::test_managed_file_issue_51208
+		tests/pytests/functional/states/file/test_managed.py::test_managed_file_with_grains_data
+		tests/pytests/functional/states/file/test_managed.py::test_managed_latin1_diff
+		tests/pytests/functional/states/file/test_managed.py::test_managed_source_hash_indifferent_case
+		tests/pytests/functional/states/file/test_managed.py::test_managed_unicode_jinja_with_tojson_filter
+		tests/pytests/functional/states/file/test_recurse.py::test_issue_2726_mode_kwarg
+		tests/pytests/functional/states/file/test_replace.py::test_file_replace_check_cmd
+		tests/pytests/functional/states/file/test_replace.py::test_file_replace_prerequired_issues_55775
+		tests/pytests/functional/utils/functools/test_namespaced_function.py::test_namespacing
+		tests/pytests/integration/modules/test_state.py::test_logging_and_state_output_order
+		tests/pytests/integration/modules/test_test.py::test_deprecation_warning_emits_deprecation_warnings
+		tests/pytests/unit/config/schemas/test_ssh.py::test_config_validate
+		tests/pytests/unit/grains/test_core.py::test_get_machine_id
+		tests/pytests/unit/loader/test_loader.py::test_named_loader_context_name_not_packed
+		tests/pytests/unit/loader/test_loader.py::test_return_named_context_from_loaded_func
+		tests/pytests/unit/modules/test_saltutil.py::test_clear_job_cache
+		tests/pytests/unit/modules/test_saltutil.py::test_list_extmods
+		tests/pytests/unit/pillar/test_pillar.py::test_pillar_get_cache_disk
+		tests/pytests/unit/state/test_state_compiler.py::test_verify_high_too_many_functions_declared_error_message
+		tests/pytests/unit/test_ext_importers.py::test_tornado_import_override
+		tests/pytests/unit/utils/test_rsax931.py::test_find_libcrypto_darwin_catalina
+		tests/pytests/unit/utils/test_versions.py::test_warn_until_good_version_argument
+		tests/pytests/unit/utils/test_x509.py::"test_parse_general_names[inpt27-CommandExecutionError-Joiner U\\\\+200C not allowed at position 9 in '.*']"
+		tests/unit/transport/test_ipc.py::IPCMessagePubSubCase::test_async_reading_streamclosederror
+
+		# tests that need network access
+		tests/integration/master/test_event_return.py::TestEventReturn::test_master_startup
+		tests/pytests/functional/states/file/test_managed.py::test_verify_ssl_https_source
+		tests/pytests/unit/modules/test_aptpkg.py::test_sourceslist_architectures
+		tests/pytests/unit/modules/test_aptpkg.py::test_sourceslist_multiple_comps
+		tests/pytests/unit/modules/test_yumpkg.py::test_get_yum_config
+		tests/pytests/unit/modules/test_yumpkg.py::test_get_yum_config_value_none
+		tests/pytests/unit/test_ext_importers.py::test_tornado_import_override
+		tests/pytests/unit/utils/test_http.py::test_backends_decode_body_false
+		tests/pytests/unit/utils/test_http.py::test_backends_decode_body_true
+		tests/pytests/unit/utils/test_http.py::test_query_proxy
+		tests/pytests/unit/utils/test_network.py::test_isportopen
+	)
+	[[ ${EPYTHON#*.} -ge 11 ]] && EPYTEST_DESELECT+=(
+		tests/unit/test_master.py::TransportMethodsTest::test_aes_funcs_black
+		tests/unit/test_master.py::TransportMethodsTest::test_clear_funcs_black
+	)
+	[[ ${EPYTHON#*.} -ge 12 ]] && EPYTEST_DESELECT+=(
+		tests/integration/modules/test_hosts.py::HostsModuleTest::test_set_host
+		tests/integration/minion/test_minion_cache.py::BasePillarTest::test_minion_cache_should_cache_files
+		tests/pytests/functional/channel/test_server.py::"test_pub_server_channel[transport(zeromq)]"
+		tests/pytests/functional/transport/zeromq/test_pub_server_channel.py::test_pub_channel
+		tests/pytests/functional/transport/zeromq/test_pub_server_channel.py::test_pub_channel_filtering
+		tests/pytests/functional/transport/zeromq/test_pub_server_channel.py::test_pub_channel_filtering_topic
+		tests/pytests/functional/transport/zeromq/test_request_client.py::test_request_channel_issue_64627
+		tests/pytests/unit/modules/test_nilrt_ip.py::test_when_config_has_quotes_around_string_they_should_be_removed
+		tests/pytests/unit/modules/test_nilrt_ip.py::test_when_config_has_no_quotes_around_string_it_should_be_returned_as_is
+		tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[42]"
+		tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[-99.9]"
+		tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[default_value2]"
+		tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[default_value3]"
+		tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[default_value4]"
+		tests/unit/modules/test_zypperpkg.py::ZypperTestCase::test_repo_value_info
+		tests/unit/utils/test_color.py::ColorUtilsTestCase::test_get_colors
+	)
+
+	# testsuite likes lots of files
+	ulimit -n 4096 || die
+
+	# ${T} is too long a path for the tests to work
+	local TMPDIR
+	TMPDIR="$(mktemp --directory --tmpdir=/tmp ${PN}-XXXX)" || die
+	(
+		export TMPDIR
+		cleanup() { rm -rf "${TMPDIR}" || die; }
+
+		trap cleanup EXIT
+
+		addwrite "${TMPDIR}"
+
+		USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \
+			epytest
+	)
+}
diff --git a/app-admin/socklog/Manifest b/app-admin/socklog/Manifest
index 011b8aa10996..35370c5629f5 100644
--- a/app-admin/socklog/Manifest
+++ b/app-admin/socklog/Manifest
@@ -1,5 +1,5 @@
 AUX socklog-2.1.0-headers.patch 925 BLAKE2B f1f283e27a1e4e260e5c9313304090a9b62d8f0f4854be19e1fcfcb8af764346c650cb28e610779020ff7183d16d32a0e61745addcdcec52031057398b8d3d94 SHA512 d522a421a592813992646d9d2679b26c7c70a87645e06705ba212b26decd6f7dd969b4a35f54732b0b383783956c1b9ab2fc3cd402f6f5ff1a941ef1863c1419
 AUX socklog-2.1.0-respect-ar-ranlib.patch 372 BLAKE2B 44d1c60100a6cc1a044cc7ab440ecb4d66f9bae8d0dae18a1e0e7b60848736439e9acf56dec6644e612ae7515749ca5b74b44a3dd86bdb33e12ff0dc50c41141 SHA512 862178c36bb87367436b59851bea30351c15cbef8c2a4d26b8a3d9cbb522eee3a4589add0b476d53f07869d0c7b833b6255727eda7430e02c9a37a7160167986
 DIST socklog-2.1.0.tar.gz 56942 BLAKE2B 4f88044bb075dc8e503956f0ddf50fd4e748bf090e62acd34701e716d1dd34a639590b319b4377de06d3b0305d865652abd303210745e355ae67f5dff41cb895 SHA512 920ce5e661a6a3d970fa77ee3c228d48699ea03530be2b43b7517458b25e31a0a7f352ece2d076c715b6d34dbb26b424b48eb0f55b9bcd0355b74d3e34c77ac7
-EBUILD socklog-2.1.0.ebuild 968 BLAKE2B 746e36953d4a23ab2c1611c047ced05d503a2e7af12b7720d8b4bfa688ddc5e28ad078a791295b59db8f3dc7a210fff3bc4b3050a8f0bd2ce72863ff5bb88fe3 SHA512 d3a71cb40d570ffe4c992a2fd17716d2e658483447f5d17d5fe7234bb1163314a47377aeab023aa8a77ec8dfbd4bf570df30ce642ae27bf7cc2d193b8e165692
+EBUILD socklog-2.1.0-r1.ebuild 931 BLAKE2B 790e291b8c56622a89c9f7b7549315c4b78ab5eaa1d003483a7da95a17924867e469bef62e9a25fb75dd4145221985fd0a88c385ca19e5b055dd0902e6c0cf42 SHA512 94feaea79e57a197ad294e20e2f40f4e1ab70060d15620bcc0f1348671af6d5a93b76737f5c40cc277abf0922d568a25b5669df72b500e464bd9abe45b0a93ab
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/app-admin/socklog/socklog-2.1.0.ebuild b/app-admin/socklog/socklog-2.1.0-r1.ebuild
index 367d62460e7e..06c852d19bc3 100644
--- a/app-admin/socklog/socklog-2.1.0.ebuild
+++ b/app-admin/socklog/socklog-2.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,8 +15,6 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="static"
 
-RDEPEND=">=sys-process/runit-1.4.0"
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.1.0-headers.patch
 	"${FILESDIR}"/${PN}-2.1.0-respect-ar-ranlib.patch