gentoo auto-resync : 12:02:2023 - 09:56:54

33 files changed, 325 insertions, 223 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index e6709399a0f9..d3b72c879a2a 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 922dc57c2b5b..326b09f2c4a9 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,5 +1,7 @@
 DIST ansible-5.10.0.tar.gz 36898833 BLAKE2B 5705325c150909e4911cbc6fafb9b6194bcd15cf7a97978835b29cb8b87b671fa888163e28e825d1fc98006c57313677afed63236f4a55af415a70daf5fe305f SHA512 d81b34642533dfaf0c3dba5ecc8ba483efb3d82bd40afa469de2778666e932bec3c20e61ae579184fcbd7f1ec7c8d694617f334ebb3e910db3c9f6709d3b9385
 DIST ansible-6.7.0.tar.gz 36371372 BLAKE2B 75cb14f158c36ded8313a1c5b798838afdf3a38ffc8e29a87c8e1e3e74c9aeca827432397ad83ed23a1d3aeaaef91822cc3c23aa226a307d93f84f54b25d71bb SHA512 676baf03626d5bf36aea7117d39ef71ba7878ab6bccdec1ee199bd699d559a5f3f6a0d9032ef120204093677b7fbbe1b575529d3aa692acd1a4447f9c2715f3a
+DIST ansible-7.2.0.tar.gz 36997591 BLAKE2B 3652ff103cf9d6c415387537d5abe1d11ec9c2b7f8b1e8728308532b2ba449bd3efa08d49d2edb8424d3f845c1c3694557c1acae99b7dcdf93f0e97c6b8623a2 SHA512 30d7f912cd6b2e41f1e5d880b014f00d332b4cc533512be8de885e95b63cf890ffb38a616de74c6b7fd9d6a961b7e2a1843bfe758fbcd9f3c962f1c856f20725
 EBUILD ansible-5.10.0.ebuild 702 BLAKE2B 7b57d6816ddba1439f1d66d63e51228a770cc40e338f532af21c5744570a1c1a85eb8174145982b54e93c51c6c82fc6d217ed75df85d40c22a7cb45a7550b3b7 SHA512 1a45c927ca91d436c80dd5d875247fa3f45d466373c230769fc72c4ad4f42b61aa579dbc2a4d8f7d3312a52529ab7a34a27f29e018c4f0dfeda578ec77501a37
 EBUILD ansible-6.7.0.ebuild 702 BLAKE2B dc001693f809edd51a506b788ee1f3755d7cef610a8755c50d47f56ab9733a4ac65ccf3239d79d3a79cf4ff80e0f8ecef4e99c8e5528f6f4ad155768a0e0d303 SHA512 d0c71d92fdfdc1f588d045fab3a19971d994071bbdcba6038d72b3225833180a16ff7477367cee73011169a91f50788879ddd5dd0342a3a34e40fc51feeb74b5
+EBUILD ansible-7.2.0.ebuild 705 BLAKE2B 72ee5dec33d1e62a8dbee2c100877c25e4d11b602138b66f40274e958817dc2e4095e75cbd78cbf3dac332d18bfa59147dfc22d480bf0a236d7bbaec99fe31b7 SHA512 8c5e0894fe24293c0d0a1de5665d3259fc5cbe21382d63fe152f1f9824df184dac43a117c6d75e0f6cbd6f692892aae66a9056e21ddbea5d705470fb1c775828
 MISC metadata.xml 731 BLAKE2B 26c756a1f3d67f68ba824b56b8a7a48f13e6586c761da02d61852c7669c419ecab686ed1bb59ac7e229038413fdf9c0521b11d005e8250b63380c1b5282586d2 SHA512 e6d8bf5b9748c6aaccae0fdeb3f187be80d5a956dbc57578f6fa344a667624a0a4ffbaba689d2f7bc812dd91fb3b959b3293260729ce7c995a20fe47b2cdf097
diff --git a/app-admin/ansible/ansible-7.2.0.ebuild b/app-admin/ansible/ansible-7.2.0.ebuild
new file mode 100644
index 000000000000..f5a53bb0b081
--- /dev/null
+++ b/app-admin/ansible/ansible-7.2.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://www.ansible.com/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+RESTRICT="test"
+
+RDEPEND=">=app-admin/ansible-core-2.14.0
+	<app-admin/ansible-core-2.15"
+
+python_compile() {
+	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
+	distutils-r1_python_compile
+}
+python_install() {
+	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
+	distutils-r1_python_install
+}
diff --git a/app-admin/augeas/Manifest b/app-admin/augeas/Manifest
index d0c4aeb1a718..9e546640c4f0 100644
--- a/app-admin/augeas/Manifest
+++ b/app-admin/augeas/Manifest
@@ -1,4 +1,3 @@
-AUX augeas-1.13.0-selinux.patch 661 BLAKE2B abd8430f4bf5a0c0d8033d1f265026b9cff64baf2898cbb522613b41ccde7314342c052ee7cf0d0f3b2d7295af96158c137aef57a7833cda08d435ed17c91e96 SHA512 4059e71ce3f4061fe658dab665e917a807e9f207e0d42b61687434d2368d748da536ae532c9451b9c360fedfc0e6f7fa67ed8926282fec1dbecaecc28f6b0790
 DIST augeas-1.14.0.tar.gz 2651463 BLAKE2B 428e708cfdc485feeb7fe80b8642c5b63a8563f508350ae4751a718888d187bab5d8ca8e82b5e9106527b86bb53d3c5a5a2a6e9ef35d18dae308030286039b6a SHA512 06ef6f735686ae09ec8733a3daf36f6838fa56e761dc6d89e5c44420ea2403a4649bec162b8e49b2c3fe32f0eced8413eba1f2c551103a43860bba823315f1ef
 EBUILD augeas-1.14.0-r1.ebuild 955 BLAKE2B e1c6d5ff3ceba62fbd8f10457e796ae6864aff126d0c677b2e5aeb722361e536e905ae2eca726b99376b33adc7f2e5511626e28bff5fea0606f6cdeb44507bd9 SHA512 91ada7221da5ba659dcf8de3bde99aefb208212ae455c771cba7f39bf14399adcc3e1a634a2dce25358166e7125331eaa7fcdfd64b59fa656a54cca66eac2a74
 MISC metadata.xml 788 BLAKE2B d8484727eaeaecc48fde1039c9081d9e1c9572487f9a327a8464dbe448f407efc649499c06d7eca01fdd5eefc51cf7a33ef1bcfbf7df683276904a3f7367e4cf SHA512 1f9528e412f4621928b9da5970bfb244193b763bd27e235e40ae62efd7981be831ca2beebb060e335e432cad1f52ab2bbef2536eca19095e9115db0efa3c4ca2
diff --git a/app-admin/augeas/files/augeas-1.13.0-selinux.patch b/app-admin/augeas/files/augeas-1.13.0-selinux.patch
deleted file mode 100644
index e1af18805a22..000000000000
--- a/app-admin/augeas/files/augeas-1.13.0-selinux.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://github.com/hercules-team/augeas/commit/f38398a2d07028b892eac59449a35e1a3d645fac
-
-From f38398a2d07028b892eac59449a35e1a3d645fac Mon Sep 17 00:00:00 2001
-From: Leo-Schmit <63145459+Leo-Schmit@users.noreply.github.com>
-Date: Tue, 20 Sep 2022 13:41:31 +0200
-Subject: [PATCH] Replace deprecated 'security_context_t' with 'char *' (#747)
-
---- a/src/transform.c
-+++ b/src/transform.c
-@@ -918,7 +918,7 @@ static int transfer_file_attrs(FILE *from, FILE *to,
-     struct stat st;
-     int ret = 0;
-     int selinux_enabled = (is_selinux_enabled() > 0);
--    security_context_t con = NULL;
-+    char *con = NULL;
- 
-     int from_fd;
-     int to_fd = fileno(to);
-
diff --git a/app-admin/awscli-bin/Manifest b/app-admin/awscli-bin/Manifest
index 837753659339..899733e1ec4a 100644
--- a/app-admin/awscli-bin/Manifest
+++ b/app-admin/awscli-bin/Manifest
@@ -1,10 +1,13 @@
 DIST awscli-exe-linux-aarch64-2.7.20.zip 46289081 BLAKE2B 1750e609bef53775e4bf66f1be78e2b05f763bde7677be99867ae89e252f1deb81dddf6011718ceafe1f97b53ac4871657f2644c478887eb4d021e14be400121 SHA512 f519aaaf2ebc3e163ae55abdb85b08dd49e148f902a06e671f582879790bdfa07e32f8d8e773ddeb95494aee3a38dc3fbdf91a93b14215f63e13ae87cdf3de4a
 DIST awscli-exe-linux-aarch64-2.7.24.zip 46460084 BLAKE2B c24cf41c888b1469a793354c9a97cec4273f6a762ec74b4079ab8626d0eddeb95dec5ef66270764a1c8d3b1525a5460e63009441ac83ef966b43f68efe41b00a SHA512 ee4201a193e393cf7fd1e9c473eaf41a1d7934e342035b931c3d69e985bc9e74434d31d0b46bf176c27c41d1b1000bbd487a514d62c8ccdf8d7c7e82c621d1f4
 DIST awscli-exe-linux-aarch64-2.7.28.zip 46543587 BLAKE2B aba4c360ed9ce37406f552db1df9ddd69b46b2f87a9c12c46a5026d9259202ce485a25f7cc1d768ab9c3caff3165e56f13529f3ccc1e65935e327b5980a16af5 SHA512 b126bf26c52e2ab32bf4b7f425527960fcf5a07f0e446aaf2fe0deced802419e12cc48f9c87e0cbe4fc01430264a48b1103a9b5ea5e871a811b8e8b8c8a691d6
+DIST awscli-exe-linux-aarch64-2.9.23.zip 47582887 BLAKE2B 3159308e20f54462c04c9e290fdbcc1d0433973fba36ba53fe7886f9ecd16eac0ecea6ac10a1f1cf49eb71c1ee704b84a6cdf18373fc94a1f9c648741ac5bcf0 SHA512 4f407c722c38a4f6adfda4e938f1039208774a897d62e9ccceb52f905a751a4dcb022342180d74fa39dd0cfd2af6787c550f8a214707b922d7bd135465074179
 DIST awscli-exe-linux-x86_64-2.7.20.zip 47092365 BLAKE2B 26320deb54f66043693aa40cd2fee2e110f2dbf1710278ce431781d49096860dacd906bd91a01160c69c484020cc1ca497954283213e85d42206ab2dba3f1c92 SHA512 6f5ab60fe3b59a7c8ad73e81b3d3003660736fe9da35e5e44b8d222a94cf195676a4802e8ea391bbefb9cbece77860148be1f616f32281d18726af126c7daa4b
 DIST awscli-exe-linux-x86_64-2.7.24.zip 47216162 BLAKE2B f99393a089bc495fc82d4f208f555bce144adf817b15c2995ad97493c16e18e38ee6cb77fb29c9225ff144193f878a7334ef90c318a5770d5c58b1f7e2209632 SHA512 2c25637fa421117aa3629ddfe8f9ead7ad3d7f04ead819b958e2b274621c858ea9e1ba2d9c111e63511ab75a1a7f0db275f653da2fef58dd5ee03274b1e7e8b7
 DIST awscli-exe-linux-x86_64-2.7.28.zip 47299458 BLAKE2B 3ac11104ad062ccf70fe697406a65cc08949f9b89784c5cf3f8e80c33629f5fde44853c35f8160f1f285405e576e65a73d9ba9a42b3e31a11120ee50cfccd83c SHA512 a86a2b73a11b74fa7a9b30095adaacacc7ea3a84136a9d5d63bcd776b98a6f6e005cb815fa34451cee85b55e6d1693a906bb8601a1ded3a5eff0416dd79bbc28
+DIST awscli-exe-linux-x86_64-2.9.23.zip 49149732 BLAKE2B 3a2500dc6edd2de1747e49b123de67606fa64c41da9f7e364899ae3d23c81d07105102b0afbc858a68a7db189448b171dfdb1ce6ca9ead8f4d607cc896cfcc68 SHA512 ca379e527e4e82b9970b257367f3a5eaf5c59612a2661a6802a9695b96ca16806369b549bfb3203542ebf2948ba3d59ed816f893db34c8ed950eeb9f52ac386a
 EBUILD awscli-bin-2.7.20.ebuild 2305 BLAKE2B 49bd417c8c54ac715176c3043dff2c99ff48f2eb62c80e26f4464c9b9bba989de0eed39f7e12a435098a02b50790cf0b6c3f2ea073f4af3669981728d3124cd8 SHA512 2977797f3c8e9a1a16e5cbad3de6c765234d2d093cca1f166929465f75d116e92fc7be4bc6f1bafe63f1a82d303bbc9cf10b3cff88fb89f79aca5df7c10a88e3
 EBUILD awscli-bin-2.7.24.ebuild 2305 BLAKE2B 49bd417c8c54ac715176c3043dff2c99ff48f2eb62c80e26f4464c9b9bba989de0eed39f7e12a435098a02b50790cf0b6c3f2ea073f4af3669981728d3124cd8 SHA512 2977797f3c8e9a1a16e5cbad3de6c765234d2d093cca1f166929465f75d116e92fc7be4bc6f1bafe63f1a82d303bbc9cf10b3cff88fb89f79aca5df7c10a88e3
 EBUILD awscli-bin-2.7.28.ebuild 2305 BLAKE2B 49bd417c8c54ac715176c3043dff2c99ff48f2eb62c80e26f4464c9b9bba989de0eed39f7e12a435098a02b50790cf0b6c3f2ea073f4af3669981728d3124cd8 SHA512 2977797f3c8e9a1a16e5cbad3de6c765234d2d093cca1f166929465f75d116e92fc7be4bc6f1bafe63f1a82d303bbc9cf10b3cff88fb89f79aca5df7c10a88e3
+EBUILD awscli-bin-2.9.23.ebuild 2310 BLAKE2B b271c5f667a9e74d4f912969acc212d0859cc2e08f2c27f97eda4b5a93b731a26065447f1e2fbf457328eadcd028b30784cb3aba42aacda60d32e8acb493714d SHA512 7ca23b363f727e50e5eceeb5eb3240e6e7a2a0b674d1db3b6a9271025e8ce3a5183b8515b2b1924ddb6e60d63436e9a3ce40694f937a2a620fd2bb5f40ca0e1e
 MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/app-admin/awscli-bin/awscli-bin-2.9.23.ebuild b/app-admin/awscli-bin/awscli-bin-2.9.23.ebuild
new file mode 100644
index 000000000000..b87ef9ec0311
--- /dev/null
+++ b/app-admin/awscli-bin/awscli-bin-2.9.23.ebuild
@@ -0,0 +1,90 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="command line interface for Amazon Web Services"
+HOMEPAGE="
+	https://aws.amazon.com/cli/
+	https://github.com/aws/aws-cli/
+	"
+SRC_URI="
+	amd64? ( https://awscli.amazonaws.com/awscli-exe-linux-x86_64-${PV}.zip )
+	arm64? ( https://awscli.amazonaws.com/awscli-exe-linux-aarch64-${PV}.zip )
+	"
+
+LICENSE="
+	Apache-2.0 MIT LGPL-2.1+ BSD GPL-2+-with-Pyinstaller-Bootloader-exception
+	openssl PSF-2 BSD-2 GPL-3+ public-domain
+	"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm64"
+
+RDEPEND="!app-admin/awscli
+	sys-libs/glibc"
+BDEPEND="app-arch/unzip"
+
+QA_PREBUILT="*"
+RESTRICT="strip"
+S="${WORKDIR}"
+
+# This code is based on the install script in the upstream archive.
+
+set_global_vars() {
+	ROOT_INSTALL_DIR=/opt/aws-cli
+	BIN_DIR=/usr/bin
+
+	EXE_NAME="aws"
+	COMPLETER_EXE_NAME="aws_completer"
+	INSTALLER_DIR="aws"
+	INSTALLER_DIST_DIR="${INSTALLER_DIR}/dist"
+	INSTALLER_EXE="${INSTALLER_DIST_DIR}/${EXE_NAME}"
+	AWS_EXE_VERSION=${PV}
+
+	INSTALL_DIR="${ROOT_INSTALL_DIR}/v2/${AWS_EXE_VERSION}"
+	# INSTALL_DIR="${INSTALL_DIR}"
+	INSTALL_DIST_DIR="${INSTALL_DIR}/dist"
+	INSTALL_BIN_DIR="${INSTALL_DIR}/bin"
+	INSTALL_AWS_EXE="${INSTALL_BIN_DIR}/${EXE_NAME}"
+	INSTALL_AWS_COMPLETER_EXE="${INSTALL_BIN_DIR}/${COMPLETER_EXE_NAME}"
+
+	CURRENT_INSTALL_DIR="${ROOT_INSTALL_DIR}/v2/current"
+	CURRENT_AWS_EXE="${CURRENT_INSTALL_DIR}/bin/${EXE_NAME}"
+	CURRENT_AWS_COMPLETER_EXE="${CURRENT_INSTALL_DIR}/bin/${COMPLETER_EXE_NAME}"
+
+	BIN_AWS_EXE="${BIN_DIR}/${EXE_NAME}"
+	BIN_AWS_COMPLETER_EXE="${BIN_DIR}/${COMPLETER_EXE_NAME}"
+}
+
+create_install_dir() {
+	dodir "${INSTALL_DIR}"
+	setup_install_dist
+	setup_install_bin
+	create_current_symlink
+}
+
+setup_install_dist() {
+	cp -r "${INSTALLER_DIST_DIR}" "${D}/${INSTALL_DIST_DIR}" || die
+}
+
+setup_install_bin() {
+	dodir "${INSTALL_BIN_DIR}"
+	dosym "../dist/${EXE_NAME}" "${INSTALL_AWS_EXE}"
+	dosym "../dist/${COMPLETER_EXE_NAME}" "${INSTALL_AWS_COMPLETER_EXE}"
+}
+
+create_current_symlink() {
+	dosym "${AWS_EXE_VERSION}" "${CURRENT_INSTALL_DIR}"
+}
+
+create_bin_symlinks() {
+	dodir "${BIN_DIR}"
+	dosym -r "${CURRENT_AWS_EXE}" "${BIN_AWS_EXE}"
+	dosym -r "${CURRENT_AWS_COMPLETER_EXE}" "${BIN_AWS_COMPLETER_EXE}"
+}
+
+src_install() {
+	set_global_vars
+	create_install_dir
+	create_bin_symlinks
+}
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index ffe0205c4b7b..4043b8fea965 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,11 +1,7 @@
-DIST aws-cli-1.27.54.gh.tar.gz 2349811 BLAKE2B 08cb317ea4621273644c39c1152e1a3f8bd9f52ed8c30d7c37dfea9e986ca1597fda1dfbdea8c4043fa783f061609d6f24895997e9f9a3f27d5677c0f9e6c3de SHA512 af4783eef3c1c666b8b3c6d20f1c0177db6d4ce01645b092770cba535dad95609b4bece366355ce6d6a505ac7ab5a2e390d64fb84d6c00e402f9f8ab88db91d9
 DIST aws-cli-1.27.59.gh.tar.gz 2360458 BLAKE2B e60117e41cf95d442db333cf49c146e4ed02247007b8f46228799c5dee8c486aec34b236c9a0a6d152d690ff86c34fd797a6f35227a6e443805cdfe1b1b30f00 SHA512 87b9aebe812415223285c09ab5a36de2b9c0da49775d1162a5b5d7489ad61c16ca5361b721bc9e4ec4ccc09306be24513f42d7263b315d6856be20fdf0779686
-DIST aws-cli-1.27.63.gh.tar.gz 2363224 BLAKE2B 4fe7971271d4359f9d29cdf4c028bd8d06a1a8188e6aef108c33d6b137bb2aee84f3655f3666381fdbf8166dd5ea071c564faac32fb0c06a461249385dbc503d SHA512 01c578f13c0f316c41bdf3bbc5e8532f01d0bfa108207899b8c56b990acdbf5b80d0ffbf1be944088f34e623494b1a1f6d52823d654c192b07133291e4bd7deb
 DIST aws-cli-1.27.64.gh.tar.gz 2363382 BLAKE2B fd0879e793aa5ee449ee535425976d11edb6f844f0385a630df82b62aa6db593c76ccab2b59b960b951859b88e2fd1d2db98f5f9f423b1de4dfed65c22eb131b SHA512 8966543936133e98a7ed27897b3978dbc71fde0728dff18e778cb17cf18b834c6abdc4cae13375f72280b1c3f4b43b33c3a08d4f3b99a2cefb74f27d1dd480a3
-DIST aws-cli-1.27.65.gh.tar.gz 2363808 BLAKE2B ded261ab17b81ff11332df6bf0442c4969848413dcb13c555c806f69c70ce806d62f2be17f445d67b0d6777f12cbf27ef1713478c1dc0ae6038bd368462369c5 SHA512 ff70b0cc0e3c4a4549329eb3e5e87fe9d09e01187ecb717c21a934f7e4a91e76f03334c6035b75e95d6ca4e348525681951b8ceaf3c11a379dfd35699ab2b493
-EBUILD awscli-1.27.54.ebuild 2278 BLAKE2B a074ad11e996c7c4e5c0366e5e5d3856cb1bdd7984b8eaf9ac959108e0c5737b064be5d7a579f46669403efb0c3111e8814570f041106e920102cf2a6ddf3687 SHA512 060c06ae5d2295b74940bc86eabf279eeb7a81f7cafa4a9d89e9af8076feff5a23cc3f9bad5a631e75155af64b948abe4c0de7283883a53d4b1ee5791765176b
-EBUILD awscli-1.27.59.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
-EBUILD awscli-1.27.63.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
+DIST aws-cli-1.27.69.gh.tar.gz 2366011 BLAKE2B e2ac484bb6ead107d0deca6bad5b9ca4a014f129d1253528869c303d72d58f1e9d5329b6c3180ec53190e43711d999b7026764c0cf65786903dade2a5c135f88 SHA512 85d6d820918ab42ce39e3a90751726a8dbf691083f5d71834b61b8456f6c91e3cac7ead86448187a3853a26f9e75e2e1d7f2acd3a8de59a69ebc028a4692b9ac
+EBUILD awscli-1.27.59.ebuild 2278 BLAKE2B a074ad11e996c7c4e5c0366e5e5d3856cb1bdd7984b8eaf9ac959108e0c5737b064be5d7a579f46669403efb0c3111e8814570f041106e920102cf2a6ddf3687 SHA512 060c06ae5d2295b74940bc86eabf279eeb7a81f7cafa4a9d89e9af8076feff5a23cc3f9bad5a631e75155af64b948abe4c0de7283883a53d4b1ee5791765176b
 EBUILD awscli-1.27.64.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
-EBUILD awscli-1.27.65.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
+EBUILD awscli-1.27.69.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.27.54.ebuild b/app-admin/awscli/awscli-1.27.54.ebuild
deleted file mode 100644
index 2d91a172182b..000000000000
--- a/app-admin/awscli/awscli-1.27.54.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-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.6.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-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 EPYTEST_DESELECT=(
-		# TODO
-		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
-		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
-	)
-
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-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/awscli/awscli-1.27.59.ebuild b/app-admin/awscli/awscli-1.27.59.ebuild
index 62c19f3a63fb..2d91a172182b 100644
--- a/app-admin/awscli/awscli-1.27.59.ebuild
+++ b/app-admin/awscli/awscli-1.27.59.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+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-)"
diff --git a/app-admin/awscli/awscli-1.27.65.ebuild b/app-admin/awscli/awscli-1.27.65.ebuild
deleted file mode 100644
index 62c19f3a63fb..000000000000
--- a/app-admin/awscli/awscli-1.27.65.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-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.6.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-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 EPYTEST_DESELECT=(
-		# TODO
-		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
-		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
-	)
-
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-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/awscli/awscli-1.27.63.ebuild b/app-admin/awscli/awscli-1.27.69.ebuild
index 62c19f3a63fb..62c19f3a63fb 100644
--- a/app-admin/awscli/awscli-1.27.63.ebuild
+++ b/app-admin/awscli/awscli-1.27.69.ebuild
diff --git a/app-admin/entr/Manifest b/app-admin/entr/Manifest
index d07da56d25b8..1de57815da29 100644
--- a/app-admin/entr/Manifest
+++ b/app-admin/entr/Manifest
@@ -1,3 +1,6 @@
+AUX entr-5.3-no-which.patch 495 BLAKE2B ca5ba048e53c4cdee12b88d792e5e7b6e5fae2185f5bd87bc306d36689fe7fb2697729cb4e77e6099226f77d682408d4416bf8f42479bcbd5c597acd5acfcfb4 SHA512 2a8a642b0bcc7c274634fe67e4c8b97ed038d1cd577175596ca35a92e9fddf78e7ea5ee6ef70f19bb43868c9e138ad7690f1a6368ac3e4b5d307a5e8bfe02aab
 DIST entr-5.2.tar.gz 25834 BLAKE2B c14eddaaf26994679991c43b38dcea0f1cbf53ce517af462cfed9dea2c914d9c1719053cb3b9f28f04d0cbf8719fe5612963c1428832e02bd55545ba33c72556 SHA512 b12310b6695f0b3d3d830b651dd182ddf2321aad38f569066cc2e5b17570070e48eb4900725c88c1d31a8ff71099aba78fb7508ad60706265cbdf8f29257eaaa
+DIST entr-5.3.tar.gz 20905 BLAKE2B 79b4c39ee3f9530db1d8a6cd62a6aa925e201d6b5b370b25c3884b160a83658688204005db612b1d18743ba39f0de6ccad8492910142ebfff7b550a5ec48516d SHA512 b160cb60de99a743226b472256d937ef6ace54f5350a83420f59ac2706cd0fb042d6f85fcac6c73e76c161c6225b956df8b00156dea9ce55d8b8225e8ca13e7f
 EBUILD entr-5.2.ebuild 611 BLAKE2B ae084f4e1104a3e8652ae939bc338cb36777ef2f380c328d449217a42caa9f0734369c1f872301732742b0845ac9fbf7989049119eb4196baf9711014cfd2f8d SHA512 9e07fe4c426f03c751e52c7f94ec0f0ee5799755e9cae56c47067e15fbc14898e6104fc1f2028b4efdc5f89dc703a8cc95dd5dd4ef786c9707bb97b6923431e9
-MISC metadata.xml 455 BLAKE2B 294fe2a1c6597cc0988c97a080f00c8dc1f48d96f87eecd329425d66f8bbb7e39b1152bcb7645f51b7cc0aa97186f05528c4766ae90e636ac5ab482dceac423c SHA512 d08a5678831d0d97c31588ffc0844acf137a0527d88c529a51d4c3a72f04ee71ea49450a79bd5a9a442c443c792b4d771bdff4551c9c64c2cacfd55048f40c94
+EBUILD entr-5.3.ebuild 707 BLAKE2B 9f6bba6002d70f17b8f2261e4308fefc46b29b1a9c7fca1b57b1c0449b6e8046f4e62db5e0f3eef1d13c98e0906e85beb88dabe442207e914985093922de24a6 SHA512 38f6b9a73bcb0503d14254463107a09b66ce0ee1875239f322d92531a6c5d50ce1be27f5b9dc4717e80902872e3a9c9a8ecc7c6afedd13b79ee614c819f1a8cb
+MISC metadata.xml 706 BLAKE2B d01cfcb5fccc39dfa4c298f3f741c9360ac6c77926bda0d3ade3db29e8c08a4a7a42a5d62c9c05eef73172c60aa7dba01da67747b8048dbb2b99a7af798a374b SHA512 d1ecfec008b55545b5a1317968a2d1067b72ef3f8a18d2473635994d6e47cb57b01dfb27c55e3dd3b38298a5657d12fb63c12ec47b127087d7900069d46fd593
diff --git a/app-admin/entr/entr-5.3.ebuild b/app-admin/entr/entr-5.3.ebuild
new file mode 100644
index 000000000000..cd6c30b6b897
--- /dev/null
+++ b/app-admin/entr/entr-5.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo toolchain-funcs
+
+DESCRIPTION="Run arbitrary commands when files change"
+HOMEPAGE="
+	https://eradman.com/entrproject/
+	https://github.com/eradman/entr
+"
+SRC_URI="https://eradman.com/entrproject/code/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		app-editors/vim
+		app-misc/tmux
+		dev-vcs/git
+		sys-apps/file
+	)
+"
+
+PATCH=(
+	"${FILESDIR}/${P}-no-which.patch"
+)
+
+src_configure() {
+	tc-export CC
+	export PREFIX="${EPREFIX}/usr"
+	export SHELL="${BROOT}/bin/bash"
+
+	edo ./configure
+}
diff --git a/app-admin/entr/files/entr-5.3-no-which.patch b/app-admin/entr/files/entr-5.3-no-which.patch
new file mode 100644
index 000000000000..fbc96fe697f4
--- /dev/null
+++ b/app-admin/entr/files/entr-5.3-no-which.patch
@@ -0,0 +1,16 @@
+Upstream-PR: https://github.com/eradman/entr/pull/108
+
+diff --git a/system_test.sh b/system_test.sh
+index 2687bb3..dbec661 100755
+--- a/system_test.sh
++++ b/system_test.sh
+@@ -40,7 +40,7 @@ trap "$clear_tty; $clear_tmux; $clear_tmp" EXIT
+ 
+ utils="file pgrep git vim tmux"
+ for util in $utils; do
+-	p=$(which $util 2> /dev/null) || {
++	p=$(command -pv $util) || {
+ 		echo "ERROR: could not locate the '$util' utility" >&2
+ 		echo "System tests depend on the following: $utils" >&2
+ 		exit 1
+-- 
diff --git a/app-admin/entr/metadata.xml b/app-admin/entr/metadata.xml
index e0bb95651e8f..c54583354751 100644
--- a/app-admin/entr/metadata.xml
+++ b/app-admin/entr/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>arkamar@atlas.cz</email>
+		<name>Petr Vaněk</name>
+	</maintainer>
 	<maintainer type="person">
 		<email>monsieurp@gentoo.org</email>
 		<name>Patrice Clement</name>
@@ -9,6 +13,10 @@
 		<email>shell-tools@gentoo.org</email>
 		<name>Gentoo Shell Tools Project</name>
 	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">eradman/entr</remote-id>
 	</upstream>
diff --git a/app-admin/multilog-watch/Manifest b/app-admin/multilog-watch/Manifest
index 09d436645882..a3acb05a2f9e 100644
--- a/app-admin/multilog-watch/Manifest
+++ b/app-admin/multilog-watch/Manifest
@@ -1,4 +1,4 @@
 DIST multilog-watch 12291 BLAKE2B 3526d532e51ee9d33f5bb7a15b84255669e315ce3f0490193cd1f58af74d10c3893cbd026576a824cc9641c15ea44cad2a84ee5b1dae5c11ee887f30d0c58fca SHA512 e28933b005243261a9f92c2a3a19e15ac4da2c3a505422e3521f2f1888a6cf5cdac2ee1161449334d27f4a7669b1f266d6760f12641ecf066629e26c98fcd041
 DIST sample.filter 1041 BLAKE2B 19e7fd8b7f547996f51d7f9217bee42ed4adefbf8740931e0db0da3284d7ef6b097ba69950447a6e1a04fef94945875789375ab1dc703bf5fc7e748120e0cf8b SHA512 5164461010629f22c9c19d3341251d3723f5dbc02719e19f7f94c5c4154c0e246b365d9d555f88c9589c95b0fbeabb1408137d4782b1c360325460a008192ed5
 EBUILD multilog-watch-1.12-r1.ebuild 951 BLAKE2B ba6d7ed8b4655e9ee37152550efd27997075490c28bdd441191cedb426b286814b0e36e3fd33f458bb3f87fe49234d7dae8b69c6557edfa7fdfbbb519eca70fd SHA512 fed7671e08e53ddbd359bc35bfe831e7d24573783a052492f73fa1d7a697d3531bf55f374f32a7b614b06099afd49653bb563fa81d9d27e77202a8f271ba3bf3
-MISC metadata.xml 614 BLAKE2B 9f706c3e20f77ce1bc01513a5a7c74eb36401f951d532c0f0977b0ca71a90338e52c31f4f7c1c0560a6beaeab36e2237d0defb04657bce3bada09ec2379c4f92 SHA512 d0e376e5249912bef3e4a611403f6bbe4416697fec4a7de3470dbea6578d08ec72cfac406838423762081b224209d5ab11e8dd720973d800f58a425e0895e0e4
+MISC metadata.xml 631 BLAKE2B ed8f054d95e7e43fc933fd7f2d56c51d7f7d5b6ef7130c28abcddd7b6ef6778f1e3233c24ee7f2a5bcf09680653e5ee8fa15ef73ab6620c8196fe73bf10ea8ba SHA512 5d779b08f427e8a5964a147cff281645c385222bd0f9fd9e2f4b3b32c81ac57a7451356e0838cd6e7526ac7d590c9544d39fff0833728bdb83eba4b3dd2b2a74
diff --git a/app-admin/multilog-watch/metadata.xml b/app-admin/multilog-watch/metadata.xml
index b9f58c360392..d58f27c405fc 100644
--- a/app-admin/multilog-watch/metadata.xml
+++ b/app-admin/multilog-watch/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription lang="en">This program reads logs written by multilog (part of the
-daemontools package by Dan Bernstein), discards any lines matching regular
-expressions in its configuration file, and mails the rest to a configured e-mail
-address. The e-mail is sent using qmail-remote directly, which requires qmail be
-installed on the system but which allows multilog-watch to send mail even if the
-local mail system is down.</longdescription>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">
+		This program reads logs written by multilog (part of the
+		daemontools package by Dan Bernstein), discards any lines matching regular
+		expressions in its configuration file, and mails the rest to a configured e-mail
+		address. The e-mail is sent using qmail-remote directly, which requires qmail be
+		installed on the system but which allows multilog-watch to send mail even if the
+		local mail system is down.
+	</longdescription>
 </pkgmetadata>
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index 5ebc798ca038..b728b8268b29 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -1,8 +1,8 @@
 AUX puppet.initd2 758 BLAKE2B caf8c2e3563f24d9d313e790498dc362fcd14467ca2b6329cf454a5163bae5cfa2b7af1a212b2e5bfcb4693c7291d5306e47e574d3c937aaedd02625dc954a9e SHA512 df93f7dbcf61eee9f42f4a0c2fa0e2dfc806ac737ba98329cee158e04150c9bf346abd9364b2a6824df4bb862e676be7b2c23f5947ef5aa589df745ac5c5cd03
-DIST puppet-agent_7.20.0-1focal_amd64.deb 33766302 BLAKE2B 665f4d4d8c3b096ec5f270428d0b865dc10b77c51113f65f9e66ab6bb72c3b21a07acd9433f2cc1e4e05c0fb30a11884f0bfe7a5a8a9a1d882bdd049a5490b84 SHA512 91b7eef80bc5e288f8a59a52d41340d1bc921e0754151952a3921575787e4cec1f101039c75a01ca6e7e4a5512224922be0c5be7a676d92bb19d3de291a7ab8c
-DIST puppet-agent_7.20.0-1focal_arm64.deb 33547934 BLAKE2B 323d76ac12af0c97cf38b8a78454be89c900eebcc9b1517c716700badf8845c062d2c4eb2f633ed1b6ffc36cb42e7e16a3e4e815637e92c209bc6f3c40cfd525 SHA512 a04727c71cf241e352d14bcc09eb340199a7e42b18be574d822a793ff9d91ff1e1879d67724dbf2133a6a3842fa86ed45b048845c73a5669fab45dacea3e616a
 DIST puppet-agent_7.21.0-1focal_amd64.deb 32897404 BLAKE2B 5075c0c77ae2199a3743edcc7fda94802f7b845b37084a613547705a3dc403259908698036bad95e36d7ba18c8b165971d98b81b64e56e6b40f3360e00c4fc5b SHA512 cad621b9add8c7397c681684696b78d57c149b174a43830c3c45ea1679aba791005b634a64b48b3a9d276fb00d7e1ca8e2a73f6a02756d020914f507a35dc56a
 DIST puppet-agent_7.21.0-1focal_arm64.deb 32630670 BLAKE2B 634fed97c79ca3b317ee079366a262c898ef217236014dc683cf1c11e83f2fd74bc21c18ff5242ebd2a4b15b73852ed727976134f684e0d416ac0a3ee54221c3 SHA512 be6a0566db5b1ab72b8f53bdf061c0ad4fb93794d690c6ebe697c9eb5aae45b7838b266619c5c33f3c4499a7264fb083d3f2bbb1fbf70b73458c8aa24470e3c3
-EBUILD puppet-agent-7.20.0.ebuild 2593 BLAKE2B 1e94777916beb4e793dfbcdbc5c83c875c72ff39bcc4cfee6d8799dd9445cdc46d45a58266739406399f6c4551a5e55fe46f13dd7d4e8cdabb97ed105d16835d SHA512 84230e1234ca4314eba502a376595534d5af4b135c8563308a24c874e6305b72a176652f328b37d061daf5633f83fab0a0bfd941f76a3071c6a0c20d8338cbe6
+DIST puppet-agent_7.23.0-1focal_amd64.deb 32923766 BLAKE2B eac170179de27e3c25af3115e45596e7c5190037926e7d3db163b208f401f2278d0c49d11688d25e04bbf859965be37b60f3e7ed15cfb96a5db0c652c501db2d SHA512 90cd6bde4c25fe72dd906ae515d58f56d3e6a7378fea300247854c2cbfb4f7a51adc78d98a68a7f90f7295eeee6a385bb0a1828cc9b809c5bd9ee7a2231777f8
+DIST puppet-agent_7.23.0-1focal_arm64.deb 32668574 BLAKE2B ff01899f7a6b0994eccd330dcc83ea51933e287ea4c1ce3ecdcee91e227c22256f4d4464c7d461d5023a1e6f4aac9868134fccf5dd84de2ba11de16c79be0d9f SHA512 7f3b0940d739410b2f4dd3b3ae852c9677c8db33fccee0db5291613f8b8602f8770c52eff3f577c81382be36044714b6737df8f8468a3481997cae52989fdeb8
 EBUILD puppet-agent-7.21.0.ebuild 2593 BLAKE2B a73b46e5e5bd8f3d8bbd45478bcb311a80d0f2b6ca84c23e13b70ca82820be978912ee1e0019c5efc05bcc2c1f30590117ff1d28e789238adbf085e6fd0709fc SHA512 b5e3e76e28d1abaed04fd2749333d465272aacef931531e29041dc19e6206dbf66bb468e64deaa861348bb36d7d45ddd236d9bc2be84df41dbba54c7f3c3e857
+EBUILD puppet-agent-7.23.0.ebuild 2594 BLAKE2B 3b6cef4aebda94acb5630b29b3c442ac22c6342f95e85e6b51ba5eb6d444fd2737f4958bee8d657358afeadf2b7b07e270ba1778c39429c27725b9427d9e05b1 SHA512 a786dd0d0cb38f9abbe33cc61ad274fa776dbaa99c10ad6e081e5fac32cc7ab9bc7619b2440553143ced5f17af7c59323a54c7ef0194dee6d515b639bfa7420e
 MISC metadata.xml 1032 BLAKE2B 35156eb59a786ad7dab4ac5c281796af6a8f3dcad2b7ebc2c6af926aee6fcbffaef39f0f7119f1aefed42a1e8148f323ee4d3d5f77dfb4d3671317af6fd078cc SHA512 b624438f825e288802e516637dd38f775a63b4a4aabaa53c5adfd1f71f694018dbf3d47f1622a90d5da25a00aac696f9203c085190e574a586f3a3e4fe14f9d1
diff --git a/app-admin/puppet-agent/puppet-agent-7.20.0.ebuild b/app-admin/puppet-agent/puppet-agent-7.23.0.ebuild
index 0776db0b3b8b..35263f3c4106 100644
--- a/app-admin/puppet-agent/puppet-agent-7.20.0.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-7.23.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ arm64? ( http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="puppetdb selinux"
 RESTRICT="strip"
 
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 57219da38e9c..56bb26ca2d07 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -6,9 +6,9 @@ AUX puppetmaster.init-4.x 1108 BLAKE2B 1793d3d881de2c1808159f940bf1e758c2e7fad8f
 AUX tmpfiles.d 39 BLAKE2B 2c9a992bf709a384ae02395299ddeb2febf3cd83b924acd97d0ca7fbc17dac273cb27c926790708c0d929f62282dec0477f167ed2e5fc1418a9ff5d130f246f1 SHA512 2dfec45e6f762ce0431d55b1a826e707e970defacbe050df838b66b347e7423eac78a35248c74908e7b52fa84cde5129ce3f562f64dac357f0368a3bc0b719a1
 AUX tmpfiles.d-2 35 BLAKE2B 333994788552e5c52273752f4e3c2947666737d03f9d340e16ada790607efe77da1ba9bb4852bc8274174fbb96ce0c7ae81062f7197e63ea4701e539b2650b3b SHA512 fdf00147c497bd822a14f0e42bad825a43ce0977ec6c0265d267dedeef56295e3ce319f7972d0ec2ab9f04f2407856947f4261d6e62054a36c6e1672b45f86f0
 DIST puppet-5.5.22.tar.gz 2998132 BLAKE2B 8662c89190d0904fe44ffeca1cf9a9ddca40d57ba6fb2d1e644ca353ceb55b1ca3a91416f1eef2975233c9c4498784e7d7280c111ea0cc070870cadc69341d99 SHA512 5332b084a63bdf244672cc4751022c84a1cc50d3f394a13bdcbccf7fcf4ebea67953e88957f23046608bf25e9182548449be824c18289cb2bf1e3ed29b40dc58
-DIST puppet-7.20.0.tar.gz 2817232 BLAKE2B 479c4e162230371bd69509844fcd97d0d3392eb2e66578b38e6dc120dd3dd15804d73f70c1b29f1f3d9e57af539f82e605a86c9afff15e78ff48ddf482432c4d SHA512 6774bf03ad0ee80c0fd2cd8ebad60da56df7ed9818a526084fc2cf1ba2fecc81555fff200f5feef2b5d7a2275d90f44b24160de7221d682de470b511a7051f7f
 DIST puppet-7.21.0.tar.gz 2819997 BLAKE2B 96de8ceefeea12c51288e05af5d7b126811d23388492053b0d581856f11976f0492064eb89bc585ff7f455df537d5c04fb318814945a158d531d32efdd54ff02 SHA512 b0fbdf63391054d0496c67be963f98e3d85e3a1536e50d6a3f09d0c49110bb4c92bebdc38a48cd50e824e27268150cda0643c6df0edb01b3587f00a591645ee6
+DIST puppet-7.23.0.tar.gz 2820654 BLAKE2B c9e2b544400c7fa9e59dd1d40bf89d1444ee62664b11e7aafa30aecd5fd14aa217dfe0bc24795a951c5e04b04762adb0239f6d7289b431b8f2a040716e95c642 SHA512 a66ef2bdbe38741a176e825cf7cdf117616459548731d4f5482b49263b08dcb3550305e5f0e35d228f873b330b730b682c02d38b4243f5f8bb4a190ed0f60310
 EBUILD puppet-5.5.22-r2.ebuild 3758 BLAKE2B e9e5ed85c6606cc4ed8e29c1c3f4601be291ed9da1074404cbc0870bb7ad0485a440778d50c8c1753d5bb80627bae35d107c1a2f697b63d1bfb35f86a8474b5a SHA512 b4c19d02f28f6337a0e468374b6547f388208ebab6ca4bce65b6f957b6f28329f65360d2554887b10e2727fac8b206d80fb56938fde4bd416c9b532f8fd7dc04
-EBUILD puppet-7.20.0.ebuild 3464 BLAKE2B 6886a93d04137efbf35c6893c705b161ddd3146a7cbeb1189ce85f0475ddf44ad8287971a69163a7d766c2789c722241a7606777b34fa9eacfa5754401931c2f SHA512 6dad2155b69165abf08c886ac634153602bf651c6a59d73ef79089f2baf8def0e75d6fe719b4b6011a296f88eb6d13c5bc25fcbc56c56d4699a227861765a682
 EBUILD puppet-7.21.0-r1.ebuild 3466 BLAKE2B 269e35b7c3d6275ce9a1979602804a3878a6e9ec285184496603eb6b8e98a298a19fc178718d2c1545bfcba719b3103d411fdd0f2bbe09e91ab9c7790b201ee0 SHA512 568015d5a107ef7d64efb7aef3b454316d801021e4fa7ab28ddac9b95d1b23a3e2669cc4c72b2c5ed0b1feddc2f6d39d7cae075b5cc9b96259dace4c15ab1ba2
+EBUILD puppet-7.23.0.ebuild 3468 BLAKE2B 9123c9e1f1b2cf656676dc8cff40a36d4bae26ae4bc6fc0cdcdcff4978875dde69ad1b7f2a83a6a0fbc582f9e6f344c2fdbf7d6b02d9147cd9c8d41b4991e5e3 SHA512 6a2b7cfe6b4d68dddbf51afbdc5e6455798b5f9e606296e5306b0994d37d914164d1da27fa8f8373c310b14d4677b8548a61415b78a7fafa5a9fdc1fd95e4027
 MISC metadata.xml 1570 BLAKE2B 5ea0d1f9d7e83fc99130bc7375de7638fd509d18ea5728d14d370338089c33c788156f20b976e6b909502e94e356428e4a1ce95e10bf307d81bd2fbbb1166941 SHA512 4ec568674227749e9644c4eb09d39c25f2458a7eb89f7d36d2be035845e8ffefc6bffbdbc09be9950bb424f2c940ff9bf43ea60e22cd4816bf12d3593e41e7b1
diff --git a/app-admin/puppet/puppet-7.20.0.ebuild b/app-admin/puppet/puppet-7.23.0.ebuild
index 0d57b77fea32..5c55684f787c 100644
--- a/app-admin/puppet/puppet-7.20.0.ebuild
+++ b/app-admin/puppet/puppet-7.23.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -16,7 +16,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
 IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
 RESTRICT="test"
 
@@ -74,7 +74,8 @@ all_ruby_prepare() {
 
 each_ruby_install() {
 	each_fakegem_install
-#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
+#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" \
+#	"/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
 }
 
 all_ruby_install() {
@@ -84,10 +85,10 @@ all_ruby_install() {
 	systemd_dounit "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
 
 	# tmpfiles stuff
-	newtmpfiles "${FILESDIR}/tmpfiles.d" "puppet.conf"
+	newtmpfiles "${FILESDIR}/tmpfiles.d-2" "puppet.conf"
 
 	# openrc init stuff
-	newinitd "${FILESDIR}"/puppet.init-4.x puppet
+	newinitd "${FILESDIR}"/puppet.init puppet
 
 	keepdir /etc/puppetlabs/puppet/ssl
 
diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest
index 3ad69a8abd19..236daded8bf5 100644
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@@ -1,5 +1,7 @@
 AUX puppetdb.initd 1824 BLAKE2B 76d8252b2fee61270f440734d91735fa002df1583126de60befd3cc756cc0f5368ce49461cee85ffca4c6893b1e1859bff9af86e75d73171d15ae344a9fb4149 SHA512 0d0f67b7eaf7d10474e73eb77174a51e0f891bf664706e11c7a5ef1f918d7967c67251bab797e1d117b0f2b08f4b634ad06a81f6022ef04e6394c15e36a73961
 AUX puppetdb.initd-r2 1896 BLAKE2B 04f47dd0406c1f67d4f72a911b0db8b482e37673ec9a0d14d73fb868aaae97f756e03fa39c2c7a9d69a217b5924dafa23c6f3e276a0626f06bf5c143b588a2c8 SHA512 58c248710c6eb39ec13e6f55a8bca686386e79eb048c4927925a2e2e75bce742d6a5e84001c231ea2b74fd4eed0ead81b9a4fc5672fdfbbd59f90677e4490675
 DIST puppetdb-7.11.1.tar.gz 49075994 BLAKE2B deb1a031999f18988c44b1439670ebb370d654a7dd99f20f44cdce027fa48088eadc96adca4fc8efe298c4dcc9b62d0d607262d8a5de4d07de0f2405a0f05a36 SHA512 98238e61ae7798912e345d69ff321bd7236dea6d5230a1f9ae37c533993d29611890522dde085e18e83b87bccb5a53e49e4ad38b930bb09ce7e9f22d45776a60
+DIST puppetdb-7.12.1.tar.gz 49891988 BLAKE2B d5201d443d991fc04e1a7c67d3f4df693365435354447cb4c18fd8143aa032be9a1dc6845cb6da07add830e2eee8539eb43fb37c3f1790f4ef02dc882de76ab9 SHA512 a86e293505c25e9f15b9c1a768540683b271002e197860bd1e24fc3d3afc88f104eefe3df3e44e7baab2e8ad4953f729b992de934ade57edef00d95290c5f1d2
 EBUILD puppetdb-7.11.1.ebuild 2705 BLAKE2B 94ce5edddaedf43f4d7b43f29ab965c89ff8f19ce24f5b22dfd287aaae6d66c4a14166a75688cec6846071f19051ad8c860296f95cd5b24fbd3cb27854282b1d SHA512 8a3197584c151e7b69491fe3e7797bb13eeebea9fd8255fc6778f7995aa3f476d840b877a7099c93c642235e787611e6a811c8dde0b019bafdf8f60a1ee5d4a6
+EBUILD puppetdb-7.12.1.ebuild 2707 BLAKE2B 5e85f584100fe6479c44b7cbe973f0ad85232649ee9fe149649dcef1afcc284926567da994088216858906de3cc839a0dbf5a5bcb86480287e0b3cc96ccb29e3 SHA512 55e7eb8f84ccaff35b1981256706907b2c90b351f6f74b9a32250db9366e0d90b29dff2cb6cfcb5a0e64e6cd8e1ca4852dc0ba87a31343fb122f2339d311d294
 MISC metadata.xml 486 BLAKE2B e74960c88243252794d20dd51c071147de88663d4e610e8358013b77ffaeb13b35edb7a48575932a8a30e0916782063459fe14b57ffcb2962e16b5d73c66f9d9 SHA512 e87f0d39aa659c53cb9798929c08a853247870f9c9b7dc85c9610f7b2b9c2f10a226ffeadc738e263c6bbcde495c438fbfd7dd951c2cff18b66646da9475c7c6
diff --git a/app-admin/puppetdb/puppetdb-7.12.1.ebuild b/app-admin/puppetdb/puppetdb-7.12.1.ebuild
new file mode 100644
index 000000000000..15ec35d345fe
--- /dev/null
+++ b/app-admin/puppetdb/puppetdb-7.12.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd tmpfiles
+
+DESCRIPTION="PuppetDB collects data generated by Puppet"
+HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
+SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND+=">=virtual/jdk-1.8.0"
+DEPEND+="acct-user/puppetdb
+	acct-group/puppetdb"
+
+src_prepare() {
+	sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
+	sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
+	sed -i 's/sysconfig/conf\.d/g' install.sh || die
+	sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
+	sed -i 's/var\/run/run/g' install.sh || die
+	default
+}
+
+src_compile() {
+		einfo "not compiling"
+}
+
+src_install() {
+	dodir /opt/puppetlabs/server/data/puppetdb
+	insinto /opt/puppetlabs/server/apps/puppetdb
+	insopts -m0744
+	doins ext/ezbake-functions.sh
+	insopts -m0644
+	doins ext/ezbake.manifest
+	doins puppetdb.jar
+	insinto /etc/puppetlabs/puppetdb
+	doins ext/config/logback.xml
+	doins ext/config/bootstrap.cfg
+	doins ext/config/request-logging.xml
+	insinto /etc/puppetlabs/puppetdb/conf.d
+	doins ext/config/conf.d/jetty.ini
+	doins ext/config/conf.d/repl.ini
+	doins ext/config/conf.d/database.ini
+	doins ext/config/conf.d/config.ini
+	doins ext/config/conf.d/auth.conf
+	insopts -m0755
+	insinto /opt/puppetlabs/server/apps/puppetdb/scripts
+	doins install.sh
+	insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
+	doins ext/cli/foreground
+	doins ext/cli/ssl-setup
+	doins ext/cli/config-migration
+	doins ext/cli/foreground
+	doins ext/cli/anonymize
+	doins ext/cli/reload
+	doins ext/cli/start
+	doins ext/cli/stop
+	insinto /opt/puppetlabs/server/apps/puppetdb/bin
+	doins ext/bin/puppetdb
+	insopts -m0644
+	dodir /opt/puppetlabs/server/bin
+	dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
+	dodir /opt/puppetlabs/bin
+	dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
+	dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
+	# init type tasks
+	newconfd ext/default puppetdb
+	systemd_dounit ext/redhat/puppetdb.service
+	newtmpfiles ext/puppetdb.tmpfiles.conf puppetdb.conf
+	newinitd "${FILESDIR}/puppetdb.initd-r2" puppetdb
+	# misc
+	insinto /etc/logrotate.d
+	newins ext/puppetdb.logrotate.conf puppetdb
+	fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
+	fperms -R 770 /opt/puppetlabs/server/data/puppetdb
+}
+
+pkg_postinst() {
+	tmpfiles_process puppetdb.conf
+
+	elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
+	elog
+	elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
+}
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index 5a8809566482..aef1abd20679 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -1,7 +1,7 @@
 AUX puppetserver.init 2138 BLAKE2B 6c157cb6bbe9e085ae67920abadf99ff97798115f784a60e2be4fa565f5b897f60d8abea21af273b1951477a1662c778081ee9a31063780c179097e764b0845b SHA512 50e78feda08e06a16290f90b7d593653c7fe2e98efdfc8cc7cc4a85a5be528e8bc585b934330f3a87b6f038311942fd8bc6d73f0538069d7b132dd3a64e23f11
 AUX puppetserver.init-r1 2190 BLAKE2B 6e4b547af51989d678a52e0fb41e8b27a669d96aaa445998b532524651f2bf2349a26f8eb77ead92a9e0f613a5269fe464045937f318947c8c2878b93dad0d4f SHA512 de159346c4b1b5705d53337994cf77f4b70edd20d60f0e1338589be4ee67c4a1bddca5cfdf9a4e744ff9360676f86391a6675b137c3bef050d71f2964b885b58
-DIST puppetserver-7.9.2.tar.gz 59729859 BLAKE2B 15f9261ae81f280735080a75e083b4bbc5d4b9404bd52f02180173b6cab2ebfe20e38950dd6c94c5167478293056ac562994ff27a7ad955c69621c13ffa808e1 SHA512 0c047554e10ecf36d000c9f702b759e27b8168f1f2207d9b8e904c9579d8e37d8540327d898b0a9e1812ca3223aa15b7cf4da46d7a4247e5d4b8f1596f9d5f26
 DIST puppetserver-7.9.3.tar.gz 59951239 BLAKE2B 818eee0e7bd115e0b335b1e13d7b0016933190e95a3bf71ad2498f87097de4251a1e6e2f9dfb933a1ee49c981ae0adf74f9994ec0e36a4b77aad567ab00e1fdd SHA512 d2ce573bf15c0db7cb7a9fd0a35a8286acc77ca9b2eddfe0f2dd8549034793600c04973d9f8a72ab543282325f18795727e05a723b3a3b67b027b382ded3d3eb
-EBUILD puppetserver-7.9.2.ebuild 5355 BLAKE2B a056b0cc747b7c04099df4d0a99d33081a60285bdda79286dc9bf6866bd7ca935f6ba74694031974e90fd6450e3078edffa17165f40c9f91fcf7305dac56e70b SHA512 22198f51ab66063f4962a519e2b4be072176baee327f3d7bd4e46931829eb2793b97609a095f814240eba3ed6f23297f10540b0c654a245d2b9f905a89ec4b09
+DIST puppetserver-7.9.5.tar.gz 59954391 BLAKE2B dd9c1c4bcac006ed711e9d29f2c1e96fbacbbb9f85a70e34e5b42909b20108b970bad58562acf2c3d60ed17c81144826ad4426357948f014b4ec3039f642a9d1 SHA512 c12df0d2778c3f768bf60ed4d9867eb976dc10671383f92ba63a06ad10c4552ec3109f42a9157816d2cd83481ee5cfad10c662812621b1afedf5eac25fbfe1b9
 EBUILD puppetserver-7.9.3.ebuild 5355 BLAKE2B 5e11c389026d93c2ae38f28e2f8da12fe25bc65a1600a2f8051003b726e110498f7892355ff0e9ed556547db5cedc3c45c01253f3722f7ff7705f147585e2f82 SHA512 edfc5b094ea7db88c30cb71ecc3e3476b52789b37f7b893526db5dc7b96dbfd52a4e4bd2a38aa4164ebc8cd0b967cdd5b6af077a49fe242cf2c762b155c3ce16
+EBUILD puppetserver-7.9.5.ebuild 5356 BLAKE2B 2c65cd8060ae61ef03085c53e2604e68c36a4df3f009cdf17dfe0e45f616137bbba18cf1f77a822aa6243943c91c1f081cafe4f48c90e9480dc52256e5887d17 SHA512 1a608195c86491c95a944d89a80677f98d01eaf486100f4ecaaa497290378ef0bce72e99e2553bcfa965ad1b5508d5460b573e07ecb4669330fd47b5fe8765d6
 MISC metadata.xml 341 BLAKE2B 6e19f31ed866283c5827f9ca2550ca99c12d8b9506fbc13447d8bdad3ceaae844d3b103fe6cced8f829a75b7b1c317ef43bd2d1e885e9b509f70b8646a9e5bf6 SHA512 72945305ef496758676dba53925ebbd5cd0d01935fe82708559f941d831bf6b2ce34444d5b85a16b116f577596b2647183fe7b7c6ef92080a8e332fc0226d7ac
diff --git a/app-admin/puppetserver/puppetserver-7.9.2.ebuild b/app-admin/puppetserver/puppetserver-7.9.5.ebuild
index 7323a3ecf896..5f17c2e2c29e 100644
--- a/app-admin/puppetserver/puppetserver-7.9.2.ebuild
+++ b/app-admin/puppetserver/puppetserver-7.9.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="puppetdb"
 # will need the same keywords in puppet-agent (puppet-agent now has arm64)
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 
 RDEPEND+="
 		>=virtual/jdk-1.8.0
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index 5a9481970fed..0050bf20f6b2 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -30,8 +30,8 @@ AUX syndic-initd-5 558 BLAKE2B 5e1ea25b57f56ad7bfb8be0c845e7da9f99af03c50c31ca20
 DIST salt-3004.2.tar.gz 17685127 BLAKE2B a42e31d8a006488b3a6f341f817cde21ff86248d2b548d9914c429c62d7570cdf46cf2b41311cbb08ced7f9518e68156c6df3eb78e55cacfd4d40a4e7a54f52b SHA512 b2fa434f1d25eabac51d65d75bb020943eb71aff113d683e6f436a0f205bd3c7682b1b7acd4d9a62bf37a47eb0561293d263f3174d5e266f0998a1652fcae2ef
 DIST salt-3005.1.tar.gz 17914349 BLAKE2B 697c2068bf119e4a19f92a86ce880fec9375c10ba549cdcdd2182cfeaacce31c7bc4c4c91e1a609906b4c5373bb5e3120e0db47ede5b45ee20942d7b2d201e64 SHA512 391f995f0129f3d7104a0eea4fd83b18aa6ecae0fd7a2c77c1154e24b0bcd52cef4b63db12597c85737bb33ddf605e0c23370cef3bf47f9ea85af5b77d74dc50
 DIST salt-3005.tar.gz 17894520 BLAKE2B 67e755bdbe772991f620d09f61836f8ccfa2039722c3281ec4cfaa8ef76e34c57e4db861cc652545e37eb965ab765f6b6ba0250407d7d7448aa5d4685ad9492a SHA512 c2019a97a5a98b4810cdace826d5e0a6d2890a984da4b95109c1b9328a2fd11cafd2fb0ef9752adeea1d36f8b2a69b3a4a6a5a092b6a7f050c60ec52da314a18
-EBUILD salt-3004.2-r2.ebuild 6528 BLAKE2B ac76c30eef745bf6c794029c1bffe356fe6cd1b541ed3d1285502abf1422c627ea52a1ef52b9aa2433e121cd5090edc170143fb161516a765d203eb0dfb72f6f SHA512 bad1d8ac9bbb80f49db7b76b2622ebfa924b1424912e9c2137732319d82a9bfd6b7a84daed4b02a648b4d8d04d0d9ab38ada5dc4abf3de8b967ae669e8f6f318
-EBUILD salt-3005-r1.ebuild 6976 BLAKE2B c19b56458e4082af1f71640b4e87d4a0d4a09bb64d453c6fbe1ce204ad2cfda315c0875727defb7aec7038e62da2b8f19a0d18ae89a1c55ca6aebdec368f5363 SHA512 3db49d931481105faada8242254516d2aadf25d984e47cfe92f61985998727240fe8ed3bb4447b4bfb9cec92f8500745752f09d20743c304092cb14184867d1f
-EBUILD salt-3005.1-r1.ebuild 7275 BLAKE2B 400dda88af98030a4d77b6023d8c8c78e2a03dd246f200279829aa4b437fa6005f36f31f0bd178e22882936fb04c16f7f9a570e6a162d80228f8232ccc270315 SHA512 b673e289c38731521250674e214333dcfe0ef0a882d9e45b7438de5807119a5436d9fe0767dff9baf0ba47d0ca0f579ffe2f82b2265daa0160ff289ca997eb2f
-EBUILD salt-3005.1.ebuild 7210 BLAKE2B d9e23571fd1fd2334e708ac9262101d63f7f48be1bf630ff880357797b287c1881ed0d6dc8f50eb9ea8262d21af1cf0eb0ddd96638eed4d12cfa581bcb814c9c SHA512 0eefaf18ef343a5eace392049460b4853d08a4e421b34e2d2893c93864ea4b573701f7ec8a8032da6be50856dde229a6c5cdee35c5fd00696825f21d9cfb496b
+EBUILD salt-3004.2-r2.ebuild 6525 BLAKE2B 41a9504844bd0d0666f9bbb6fc4bb460245bcc792908b7b58bfcaffd663cfa0ff98474277a463b9fc2dce4df9a142b555a32cb0640fedb43dd720c09c0d95a52 SHA512 9cfa16ff9f4f9c214e389342467ada2de70fe0ea10141cef7228b58c678a316f22932f160613acce878add5d4bef52b15f22745e69db1a898b9c85f3e8ab89e1
+EBUILD salt-3005-r1.ebuild 6973 BLAKE2B 45322d0eb4b8f62f9a177c8be25a723013c3076f8eea15b11245f9361c128537ca1347d359627f63b90f86d95ef806507eb0a1b6f3b2eb439b600b4af20a1b16 SHA512 0d0c67122ca3979bdd1f819a64a75caa148c5c0750a3b2dd024815f6c627475ad4557b284a7beaa7268ce0424502013079f72e24bbf931b47237c71ceee6e5e3
+EBUILD salt-3005.1-r1.ebuild 7272 BLAKE2B 6cf7c5221874a8dc574e45c902201475c29ae8f09cde7cca1526e94ef13716f619f1b8e3d1452efd27183db008efc07df55e104fe60c40c5c7a5d2ceb2463542 SHA512 ce2a2f0ea9831ec8d34729beaa0c0eb7695860ea18872e4a626a09600e59fc7df8ec70e2d30cede0d205b1e7cdcf39848bf52ce65772e1c558c40a58567627ca
+EBUILD salt-3005.1.ebuild 7207 BLAKE2B 1bd9d5b35ddc5e988da19381c157198f16a8ae08c2d920fefe51ac54ffeda5a795edc8f79abac8973dea9f29cca42d5a24cfda6363a00f6270a9f6432fc8179e SHA512 a09d8c7f4c36b53fa8bcf9b54cab5f484a0786ddbf61dd216cda0d5c3f94d8ac4b19a6ae00adfcac0c6b48a2963403f089af3f9f970efaadf5c16fa1233c1883
 MISC metadata.xml 2384 BLAKE2B 8ccb0cbfc8d0944e684f979731884c354655d28fd9029f8d9abae1a313734102952fb817617d54032dd5cafa64925d73ee2a3e8a38ae16d2ff9c1af8c53d514c SHA512 6a4e1b8f2e041ad1a83bf2c85c35ac30ae7db3a20aa868204661c1dde9abdfab1dff1392e2dab8a844472434b325355fea71702229de99f7751e841d063fc0da
diff --git a/app-admin/salt/salt-3004.2-r2.ebuild b/app-admin/salt/salt-3004.2-r2.ebuild
index 9a0c3a5933f5..f2a1fbff233e 100644
--- a/app-admin/salt/salt-3004.2-r2.ebuild
+++ b/app-admin/salt/salt-3004.2-r2.ebuild
@@ -62,7 +62,7 @@ RDEPEND="
 	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
 	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
 	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
-	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+	redis? ( dev-python/redis[${PYTHON_USEDEP}] )
 	selinux? ( sec-policy/selinux-salt )
 	nova? (
 		>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]
diff --git a/app-admin/salt/salt-3005-r1.ebuild b/app-admin/salt/salt-3005-r1.ebuild
index 47d410c70d15..1ec597170af1 100644
--- a/app-admin/salt/salt-3005-r1.ebuild
+++ b/app-admin/salt/salt-3005-r1.ebuild
@@ -69,7 +69,7 @@ RDEPEND="
 	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
 	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
 	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
-	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+	redis? ( dev-python/redis[${PYTHON_USEDEP}] )
 	selinux? ( sec-policy/selinux-salt )
 	nova? (
 		>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]
diff --git a/app-admin/salt/salt-3005.1-r1.ebuild b/app-admin/salt/salt-3005.1-r1.ebuild
index 6484a7f127cd..c2ddf3dedc53 100644
--- a/app-admin/salt/salt-3005.1-r1.ebuild
+++ b/app-admin/salt/salt-3005.1-r1.ebuild
@@ -70,7 +70,7 @@ RDEPEND="
 	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
 	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
 	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
-	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+	redis? ( dev-python/redis[${PYTHON_USEDEP}] )
 	selinux? ( sec-policy/selinux-salt )
 	nova? (
 		>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]
diff --git a/app-admin/salt/salt-3005.1.ebuild b/app-admin/salt/salt-3005.1.ebuild
index 68afb794ae71..1c1747cfaa93 100644
--- a/app-admin/salt/salt-3005.1.ebuild
+++ b/app-admin/salt/salt-3005.1.ebuild
@@ -70,7 +70,7 @@ RDEPEND="
 	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
 	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
 	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
-	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+	redis? ( dev-python/redis[${PYTHON_USEDEP}] )
 	selinux? ( sec-policy/selinux-salt )
 	nova? (
 		>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]
diff --git a/app-admin/yadm/Manifest b/app-admin/yadm/Manifest
index b00ed6f54a1c..71694c233e6f 100644
--- a/app-admin/yadm/Manifest
+++ b/app-admin/yadm/Manifest
@@ -1,3 +1,3 @@
 DIST yadm-3.2.1.tar.gz 109838 BLAKE2B 4e0b829ca6f74c1300b78831d64fd95250bcea7779cca672707751e38129a7e618e8a69b2f3862ac6e87cb086de09380e4e624d54c4672c125d16ea8cc3ea11c SHA512 8ce9bc66a33fc3841e47293e002b834fac5760dc771ede37adfc47a9e911ddade23c0ef5379cf8f00cf9b24853abbc1263198b8439ca4e8a3acd5787fbd935cb
 EBUILD yadm-3.2.1.ebuild 2184 BLAKE2B 313106ec99aac906658acc27ba53487f4d56d9dc6fc2845ce7778a77d8835efcea985be355ecf2aeb4231f04a69926aefe463325e4f5ac791ff7a66b2a204325 SHA512 e75793927ee1f135d5b41a26c6176e67f3769bfaab8689f06f228bc54637591f701dcdc23dd5a4347634ac817f90738422334a82a48cf189c94eb326a289dae7
-MISC metadata.xml 826 BLAKE2B 79c41680142d275a20557b3a0aca5f664542f45a34f3a09c42ab7dc15cec352462521b94f2c647b09e3801883c4a8c37d14b2d71e75fe12e16c7346cc7fb733e SHA512 d3d6100185add752cd59346eb6c6c4ee0026a6f409d63ae37ca58b9e7396b5be76794a341846d898a3c1724967e71097ff30ee331c4d0640ed0de8430ab177e9
+MISC metadata.xml 827 BLAKE2B 3cddd298559cd7c5e00921b511118663c6642169571ace6772677cb7a6e77c663258cd889c4b2278b6323f926a0d2b9ae74460af3187831ffedf22701e954e7c SHA512 91de5fd93dd9325cdb1bd4c9b2b7ff063424d3f0b9e3f87c61c5b25739f3151f07fcdf4c2a73fe52023a24f5bbc78ef860d95bddb64e9748dcf6fd4858e3b2b9
diff --git a/app-admin/yadm/metadata.xml b/app-admin/yadm/metadata.xml
index 27255b937e9d..77ccd4c2dea7 100644
--- a/app-admin/yadm/metadata.xml
+++ b/app-admin/yadm/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">TheLocehiliosan/yadm</remote-id>
 	</upstream>