gentoo auto-resync : 06:04:2024 - 00:30:33

9 files changed, 261 insertions, 1 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index ad39ae310e2e..991d07ce5e27 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index db4f05cbb55e..574d9f9e535f 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -3,6 +3,8 @@ AUX apache-tools-2.4.54-libtool.patch 594 BLAKE2B c1b11ad580369a42fde6cbaec8d419
 AUX apache-tools-2.4.54-no-which.patch 1807 BLAKE2B 27fbe5079f3844645c1e3fe237f47f5524ccb1c9a5532b8529091176ea0fc561c0888b74997acb98f4c86cacf8f138f065f248295c2a79779eb84f706173849a SHA512 830125dd90479972715a6b09bc0cef7bfe2c8ce7d198e52765e4284555cd60e400820a622530eb2bffa9b7aec9fd6bdb3f633b948075c68e9fd96a49a7eb41fd
 DIST httpd-2.4.57.tar.bz2 7457022 BLAKE2B b33b51a741acd308ef4d4bdd2444d43eca9db68676fa67ec907eeea7384554f3f9a5608fc43dcf5819498264bbe36f176f30be9809474307642b70720036b88c SHA512 4d1e0a274ee90bdfb5f38d4a7d73a7367ed1c6388e26280e640014e49abc0df03683705b88dcfe2ec2da313dda4c7b4a3b86daffa1911f58e224eba89d82d155
 DIST httpd-2.4.58.tar.bz2 7485817 BLAKE2B 2105b8fada99f1dda55201ed89ed5326f0edb078d352cbff44f02cde80d129b65b63e07366a9a744ba474be5687fa8d3d2d8ddc64ac914b47166607f3f4a9de2 SHA512 d6e73bf413a507ec16b621ff635e178206207a9e9810ce3944b3dc98d39cde8f225307110167fc9da5822175796c8cb66f98be5b9f0d8b76dcd83a401d39b2c1
+DIST httpd-2.4.59.tar.bz2 7503198 BLAKE2B 836e3538a120d71c016149397a4efd61ae6acd8a8fb9d2ce117c7d86209c4b40c0be3c464007891f28c58182e9d40a8793abe9e94e642354492954af91d9878c SHA512 209da0bbac5e2564d4590302515b35495be6402273ff4024aa93e85e44554c95e053201d606383936425a41e1b5b97e6b40055dcbb385eb691a5029a6f3158c2
 EBUILD apache-tools-2.4.57.ebuild 2660 BLAKE2B e610383768eb40949e65f762eb68ce449aa777aa3fdd39d9c58cee42525422baa74d57b6200d194c4371123a22d9f7469b6340cf28c2ac73acd19b342409f3f9 SHA512 3a234b734543c19ebbf6f6f0616e01ce9dee328493d95a8be7cda9ccc43da4205de6b7979e3c5eddc904717a2309cafef77f50b8ee08803d23d42dc394fccc5b
 EBUILD apache-tools-2.4.58.ebuild 2660 BLAKE2B e610383768eb40949e65f762eb68ce449aa777aa3fdd39d9c58cee42525422baa74d57b6200d194c4371123a22d9f7469b6340cf28c2ac73acd19b342409f3f9 SHA512 3a234b734543c19ebbf6f6f0616e01ce9dee328493d95a8be7cda9ccc43da4205de6b7979e3c5eddc904717a2309cafef77f50b8ee08803d23d42dc394fccc5b
+EBUILD apache-tools-2.4.59.ebuild 2667 BLAKE2B 787d5cdfd21d93569358a3ff1c83df593f295946699a859d792b0c4eba384ccacda91f53ded8f8b4bf2fa88d02a245a93bc56e5e3f4f8aebb2405ff686df4d72 SHA512 26c44c4fdf9590fbb5a2672d8634674e91b1e7b2869c626351411112d067990e5d1bed06ae68d9c91331dc40c40f6b3a91afb2eba4b54c4e6306bbe824cefeb1
 MISC metadata.xml 557 BLAKE2B 2453755857cf2e46c2df17a307b095ad2b7edaa4e87363964a0bb5e3dedc9284e09c41256f24037f8d680fd3b87e906f18ffd0f8358025fb0828ea0871229731 SHA512 d7f046261c3bb8529bbfaa7e8e47a304341c397dea4d0c276696a5c32b2fa12f0af0f73ed7ad435c3548a2a167230f3abece216e3cff7440fe0cf1498b7c8819
diff --git a/app-admin/apache-tools/apache-tools-2.4.59.ebuild b/app-admin/apache-tools/apache-tools-2.4.59.ebuild
new file mode 100644
index 000000000000..ff67bbf7dac4
--- /dev/null
+++ b/app-admin/apache-tools/apache-tools-2.4.59.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
+HOMEPAGE="https://httpd.apache.org/"
+SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="ssl"
+RESTRICT="test"
+
+RDEPEND=">=dev-libs/apr-1.5.0:1=
+	dev-libs/apr-util:1=
+	dev-libs/expat
+	dev-libs/libpcre2
+	virtual/libcrypt:=
+	kernel_linux? ( sys-apps/util-linux )
+	ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+	dev-build/libtool"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/httpd-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.54-Makefile.patch" #459446
+	"${FILESDIR}/${PN}-2.4.54-no-which.patch" #844868
+	"${FILESDIR}/${PN}-2.4.54-libtool.patch" #858833
+)
+
+src_prepare() {
+	default
+
+	# This package really should upgrade to using pcre's .pc file.
+	cat <<-\EOF > "${T}"/pcre2-config
+	#!/usr/bin/env bash
+	flags=()
+	for flag; do
+		if [[ ${flag} == "--version" ]]; then
+			flags+=( --modversion )
+		else
+			flags+=( "${flag}" )
+		fi
+	done
+	exec ${PKG_CONFIG} libpcre2-8 "${flags[@]}"
+	EOF
+	chmod a+x "${T}"/pcre2-config || die
+
+	# Only here for libtool and which patches
+	eautoreconf
+}
+
+src_configure() {
+	# Silly check.
+	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
+
+	tc-export PKG_CONFIG
+	export ac_cv_path_PKGCONFIG="${PKG_CONFIG}"
+	export ac_cv_prog_ac_ct_PCRE_CONFIG="${T}"/pcre2-config
+
+	local myeconfargs=(
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
+		--sbindir="${EPREFIX}"/usr/sbin
+		--with-z="${EPREFIX}"/usr
+		--with-apr="${ESYSROOT}"/usr
+		--with-apr-util="${ESYSROOT}"/usr
+		--without-pcre
+		--with-pcre2="${T}"/pcre2-config
+		$(use_enable ssl)
+		$(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
+	)
+
+	# econf overwrites the stuff from config.layout.
+	econf "${myeconfargs[@]}"
+
+	sed -i \
+		-e '/^LTFLAGS/s:--silent::' \
+		build/rules.mk build/config_vars.mk || die
+}
+
+src_compile() {
+	emake -C support
+}
+
+src_install() {
+	emake -C support DESTDIR="${D}" install
+	dodoc CHANGES
+	doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
+		docs/man/{htcacheclean,rotatelogs}.8
+
+	# Providing compatiblity symlinks for #177697 (which we'll stop to install
+	# at some point).
+	pushd "${ED}"/usr/sbin >/dev/null || die
+	local i
+	for i in *; do
+		dosym ${i} /usr/sbin/${i}2
+	done
+	popd >/dev/null || die
+
+	# Provide a symlink for ab-ssl
+	if use ssl ; then
+		dosym ab /usr/bin/ab-ssl
+		dosym ab /usr/bin/ab2-ssl
+	fi
+}
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 463d6293399b..7837e7aa39b2 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -4,10 +4,12 @@ DIST aws-cli-1.32.74.gh.tar.gz 2682208 BLAKE2B aba8be6e597a6d07197bd06d51f167f7a
 DIST aws-cli-1.32.75.gh.tar.gz 2683704 BLAKE2B 8dd4b7522c7684dd405018067a266842243679dac88a27de7be8b279c9a2b19081b2c49425392585a3c4a3173ff24227dc16070331ee772501db37251f12c355 SHA512 64525fe4a31074ec05531066451ab6faf8c8027fb9ad26d31d7877de1e63797c46f723cd03d89a11ba27af9dd77adec91a926e3ce32ef6e2acf0e29a45cf7908
 DIST aws-cli-1.32.76.gh.tar.gz 2683951 BLAKE2B e54a1df81000999f5d978503d3b7fff38c168ff014eadf94e0953922ec94b41876c6d73287f00711a5c0af3e6d6584aa6a47d37d832e48f6dd360e94ce6797fd SHA512 6c7c1bad24a4b28040e714fd29bc15dff40320a90e51c1bc437e7a8c4b6b0d73e830c83f3664dbdd0620aba7e987d43272ad1ff35a3b723f793ad85bfb38fff1
 DIST aws-cli-1.32.77.gh.tar.gz 2684606 BLAKE2B 78147bfc060df3093f8b19adccb8047e312f18bc46f18bf91861628fb2dde26e61297ebb1dfd6a2e4513124341cae3a6bd47fb23d2c679c402e1f547d7b750ed SHA512 51e62260848d67a06991a82484958047b95033ffe0931eefe1dd62afa4603731c52637e2f0d0fe7c54bcc89816c2baa8745cfd7365c014fa85c79b7c3c378c12
+DIST aws-cli-1.32.78.gh.tar.gz 2685580 BLAKE2B 205c9263ded4fb895b6e6fe65965a478b260ba14aa18f7e78c1a5fc53fc4b3f95851d08d4ba5a57aa1112eba790478a3729a5986948211af7ef0a8600dac8c61 SHA512 5bde890b9366e8e1643a3480dbe8bcde206f719792761da23988dcf59e2605cf743f2035f673ca588a33ad0e4bcdca72e2c2436d613c08dda7fbe30b447718ae
 EBUILD awscli-1.32.64.ebuild 3022 BLAKE2B eca1e9b920babafc0c226e1d3c0b23baa63965cffceacc71118d2e4a1302945d10294223300a94f9dec4b39e52c7bd8f44e35cbf7cf30c117f9d86fe93450326 SHA512 11de7ee4880fe2bd192c6c15081b598d4c9d2f18b28064908a855cb01283408542c8981841c531d546b6de9e2b932d2a23e2fe1a9e90030566af6b966c30fd97
 EBUILD awscli-1.32.69.ebuild 3029 BLAKE2B 580c774489759d94cbe5c77316c3afbb84d597198c391cd0ed89722c239fb23a87fc34378bd669e9104fbfaaa75a924c3d73e8df2c52693ba6fc135da827643d SHA512 4a31562305f7156e91d78023ed1f56e74de8fb1555323a5cd63611254daeb7491b8e323d00e38351d9bbc2a751f257290a6bb4bd91638e28f9c45acb8742c809
 EBUILD awscli-1.32.74.ebuild 3029 BLAKE2B 580c774489759d94cbe5c77316c3afbb84d597198c391cd0ed89722c239fb23a87fc34378bd669e9104fbfaaa75a924c3d73e8df2c52693ba6fc135da827643d SHA512 4a31562305f7156e91d78023ed1f56e74de8fb1555323a5cd63611254daeb7491b8e323d00e38351d9bbc2a751f257290a6bb4bd91638e28f9c45acb8742c809
 EBUILD awscli-1.32.75.ebuild 3029 BLAKE2B 580c774489759d94cbe5c77316c3afbb84d597198c391cd0ed89722c239fb23a87fc34378bd669e9104fbfaaa75a924c3d73e8df2c52693ba6fc135da827643d SHA512 4a31562305f7156e91d78023ed1f56e74de8fb1555323a5cd63611254daeb7491b8e323d00e38351d9bbc2a751f257290a6bb4bd91638e28f9c45acb8742c809
 EBUILD awscli-1.32.76.ebuild 3029 BLAKE2B 580c774489759d94cbe5c77316c3afbb84d597198c391cd0ed89722c239fb23a87fc34378bd669e9104fbfaaa75a924c3d73e8df2c52693ba6fc135da827643d SHA512 4a31562305f7156e91d78023ed1f56e74de8fb1555323a5cd63611254daeb7491b8e323d00e38351d9bbc2a751f257290a6bb4bd91638e28f9c45acb8742c809
 EBUILD awscli-1.32.77.ebuild 3029 BLAKE2B 580c774489759d94cbe5c77316c3afbb84d597198c391cd0ed89722c239fb23a87fc34378bd669e9104fbfaaa75a924c3d73e8df2c52693ba6fc135da827643d SHA512 4a31562305f7156e91d78023ed1f56e74de8fb1555323a5cd63611254daeb7491b8e323d00e38351d9bbc2a751f257290a6bb4bd91638e28f9c45acb8742c809
+EBUILD awscli-1.32.78.ebuild 3029 BLAKE2B 580c774489759d94cbe5c77316c3afbb84d597198c391cd0ed89722c239fb23a87fc34378bd669e9104fbfaaa75a924c3d73e8df2c52693ba6fc135da827643d SHA512 4a31562305f7156e91d78023ed1f56e74de8fb1555323a5cd63611254daeb7491b8e323d00e38351d9bbc2a751f257290a6bb4bd91638e28f9c45acb8742c809
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.32.78.ebuild b/app-admin/awscli/awscli-1.32.78.ebuild
new file mode 100644
index 000000000000..4a677affdbc4
--- /dev/null
+++ b/app-admin/awscli/awscli-1.32.78.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..12} )
+
+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+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(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/r10k/Manifest b/app-admin/r10k/Manifest
index ed727cb1a107..0fee96073135 100644
--- a/app-admin/r10k/Manifest
+++ b/app-admin/r10k/Manifest
@@ -1,7 +1,9 @@
 DIST r10k-3.16.0.tar.gz 253547 BLAKE2B 683fdd5588c7b3c3b47ae0d28d75fbfb929d5595c715531eed86b8d89f76708c91f38f9ca558040b36fac38c038211086a74fdf109b37350126bc78b25f8b751 SHA512 399a357cf8617427632516e0f439a40464ba0c8201ee7b6ce15c893ae029bfd9ae1438b76aff3b9601685d14febf8fc71dbdd2954eb3352d6ce713e769cb586d
 DIST r10k-4.0.0.tar.gz 254074 BLAKE2B 8053d435691d33cd1d8b3c55c2cb3a153cd952112a93f2eeb4b715c6c0b92e9192c65f8809b4187d5ff4f5f6b9ed8f67a644d7920bf8d8294dd0b5d8fd735836 SHA512 a6b92fabcc405fe6678da724743e43d9dc3a286e3a973a3320ac94c25dd385315baaaf495dbd1706005d31f13d4c52f1c425148d3b397448fed07fd83acb04fa
 DIST r10k-4.0.1.tar.gz 254147 BLAKE2B 83c71c39f50aaf390ef75b8d87a693ba8d131297fcb12c3e408665565e35119d3e9e2832b8172b0616145459368dd5af38bcecca666ac1020ba96a59abc83657 SHA512 74583a79637d8c60f3935cd7ea382fff189beb7d6825b10b9c6bfc0a625a62f81648795cefc878cec608d96ba2396749f7fc0a1c7bdfa9bfcf914848135a0675
+DIST r10k-4.0.2.tar.gz 254228 BLAKE2B b98a665200978a023dc2566bc4b3c141eed6c950d27dc0401c8c7e8d1096f5fa0562874bd1a0e1726dd687a046cf345c0ce5003d5a2a7f72bf397d91b07065c3 SHA512 5f4d9b5fdcd45ffe5b9c2ef95fff7b7ae3136adefcee754782815bb523d0281ec3ee50615600b2fe80ee9d98b75d80747072c425c4d15c795cd7dcb27d1f192b
 EBUILD r10k-3.16.0.ebuild 1345 BLAKE2B 999cd1937b03cef17b186587a2f691d0944f7d2f49b65e1e543bf922e15bf5e77f2fcabf66540ec7d5cb17c24e22db60ff2c374c99c35a4eff658af7f0f1a421 SHA512 79e1e36896b236a03e2a1e3e124f54e8231db6dcf1bf8180b3dae1431816cff03373702eaada662476bec8f3da888b423e258bb3e14db331ee51655cb7f5180d
 EBUILD r10k-4.0.0.ebuild 1288 BLAKE2B 4cd4c24bf05a41ac8405a4f95dad8cfeef72a0ee818acef10a52ce11384ded4b7a412edf89846ec6665c7ca01f8ecbb234927edad03537773a4d4f5f0e458586 SHA512 77ab56f6c8e1237eef8ee7d87220322933a9a5138fd513758782a6e4df76440d63d48676309bb62a8c0d2e225a583d9ac8dc447c503fd4fed08424e9be348111
 EBUILD r10k-4.0.1.ebuild 1249 BLAKE2B 515676d031b4b8034672492798f32dce61e78af0f64b2c4a220204dbdcf419962321e4287dc9f4f4c3dea4978ef7d9ed743d6a84e2fbadcc520e9b1dbd25c3ea SHA512 699f42bf5293dcb46041c16991d37c3cf31fd3d77c1bbe9ba149d7c6284aea1e75df96b25c97f940ad67d39e10de7dd7e25a121647a76f3caf22788f7de4da84
+EBUILD r10k-4.0.2.ebuild 1195 BLAKE2B 3d119f1791d3c79e21a61efdf3cb6b37c22b44f14afafe70f5caaf26ae31c78771452e42a60fbe781add3a42e59fb5bb95bee43d18038c203a2701c9a3d7b645 SHA512 07bf77ffac469988fe4375f97b699b9895222f31740723234241ac7ca73ec1ac53f368640e498dd073b360d69342be1430bfc1a2664b8512fc246e54b8b498b2
 MISC metadata.xml 583 BLAKE2B ba9d1aa2afa56933206aac7d21a4d68eba309714a20ceebdd93d3e2ec96a08af0b6ca67a0badc24065cf3422e0cf3ec8538fe4574e099715cfb0c923ad4b318c SHA512 609f9a84804a73f28fcebe1081296735b34cd54927b770fd10ef82113ffeceb2f04c3e8dd100d5c018659f11227d6807d138de318e65c8e5f6fe1dd800a2c207
diff --git a/app-admin/r10k/r10k-4.0.2.ebuild b/app-admin/r10k/r10k-4.0.2.ebuild
new file mode 100644
index 000000000000..28655c6c3ecb
--- /dev/null
+++ b/app-admin/r10k/r10k-4.0.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_EXTRAINSTALL=locales
+
+inherit ruby-fakegem
+
+DESCRIPTION="Puppet environment and module deployment"
+HOMEPAGE="https://github.com/puppetlabs/r10k"
+SRC_URI="https://github.com/puppetlabs/r10k/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+git"
+
+ruby_add_rdepend "
+	~dev-ruby/colored2-3.1.2
+	>=dev-ruby/cri-2.15.10:0
+	dev-ruby/gettext-setup:1
+	>=dev-ruby/jwt-2.2.3:2 <dev-ruby/jwt-2.8.0:2
+	>=dev-ruby/ruby-gettext-3.0.2:0
+	~dev-ruby/log4r-1.1.10
+	>=dev-ruby/minitar-0.9:0
+	>=dev-ruby/multi_json-1.10:0
+	dev-ruby/puppet_forge:5
+"
+
+RDEPEND="${RDEPEND} git? ( >=dev-vcs/git-1.6.6 )"
+
+all_ruby_prepare() {
+	sed -e '/s.files/d' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid specs for unpackaged rugget git provider
+	rm -rf spec/unit/git_spec.rb spec/unit/git/rugged || die
+
+	# Avoid spec making assumptions on availability of relative symlinks
+	rm -f spec/integration/util/purageable_spec.rb || die
+}
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index 0c49d974585d..4dabc9dd47eb 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -25,6 +25,6 @@ DIST salt-3006.7.tar.gz 20562663 BLAKE2B b4ff9039509b1de7151060cb0e68252868d493e
 DIST salt-3007.0.tar.gz 20304228 BLAKE2B 3db95ce779cfd08d61536dcfb4ff6ac31788ad1d6d4665b640dcc430f5a33847f231f94fd574c5d8df7b14e2854511c80610a37cd19be5429c4643be8bd9e0eb SHA512 0e49d76dafdb981ee380ea89ceba2cddeae8cd95df1d188a6f8ba64a175c606aaf2f8101bacb040792255afdb46ae668cbc9464d0dbb055986e85cee4d5c130b
 EBUILD salt-3005.5-r1.ebuild 12567 BLAKE2B 0ee7db92b7ba6d5035b11135da669ecb08fdfd435829e1b97218fc6ac4a6e4587d52728c4a5b86abc3b0663de749428acfa7f50473e2368ad697dc9a21021ce5 SHA512 0b7c2feb5e2b3b464973617c76f2dfb9e79836f402af1b44af1d7f5a89a00623bc45244d4ed299b12f2e1a9c33222f87dc82d4832d0a60bf52d9758b2b08a580
 EBUILD salt-3006.5-r1.ebuild 15196 BLAKE2B beb3924f91cf050c2a57414e0121d08c54991c2aa1b5c89a1c67afa644c1ef030415dc588b36e6aa11adf651d851f82365b4d5ccfa27e043c707756ddfe4c6c8 SHA512 c4b1d4a50546196f75c9d1327aa13bb649a61349b52f60b91cc958ad5bfcb1c438042c29d513a94aebb9f92d4d5acc47438d4e34468701e840ca0a0e52f7805e
-EBUILD salt-3006.7-r1.ebuild 15374 BLAKE2B b98136c7f1758989a62a5244dddeb818f326e7a5c102ae027b187b487af0cad930189baf9e9d5cfd89dede0de4a00695427fb9965bcb7f93a4c0815eaa59d591 SHA512 d206b90d3b0306cf66c308f4d7d763ef268796a78e8241d9b2cbe8861010738ef80a443c37e0056f214218a3a640bcc194a135047f6e322a40279c6189f2932d
+EBUILD salt-3006.7-r1.ebuild 15502 BLAKE2B ad96ef40ee21ecf1511111511fcfc3b8966d5a1d944b629fa3842850e9819f9b1d58a56eafb07f290a999dcf75e2c779666ce03816c4a770ad48cf26b1ba202a SHA512 8ccb14b3e2cb0ef335a0cddd3d45bf73588d555fce4c48123bfe767ab4c69112c91704389882ba2a23b33a0ab5748f5bd28016fa68e0bbf91cb7a9232f3ec935
 EBUILD salt-3007.0-r1.ebuild 30877 BLAKE2B ee941343b6074c1fb5a1392fbb9a6228125f2761a3c602cb39ee96ebab38517e32fb9b9a4e319928076a79643d3e8b3ec559602b5b18ffd15a98ea3426011907 SHA512 e48cfee790e9151894e50474150ce0f29aad25ec6d274212655b7fe2f6b6a318d636b5745e8d9cc67a77a3b36a2b74530b5a1b5abde12244afda526e325a575d
 MISC metadata.xml 2304 BLAKE2B 8fac51fe1b0c0dae5fe71d88f1bf84df1de8cc8b3d836b59c3b2e82bfa085f57352e3aafd999766ae69104a8bd9798f2fffdb64e1df1e0a1ca8561dba1ef7d5e SHA512 7d3706c40c27dd67509bd638cd0550bb4822f0895fef929ecad21c218cdaa0512da443c901cc2b3a8d4afd9f5e9bc461622ac3bab2a332ccd9c64c4cbf99bf74
diff --git a/app-admin/salt/salt-3006.7-r1.ebuild b/app-admin/salt/salt-3006.7-r1.ebuild
index e9171e89adf7..fee515b1a5ff 100644
--- a/app-admin/salt/salt-3006.7-r1.ebuild
+++ b/app-admin/salt/salt-3006.7-r1.ebuild
@@ -334,6 +334,9 @@ python_test() {
 		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
+	)
 
 	# testsuite likes lots of files
 	ulimit -n 4096 || die