gentoo auto-resync : 21:11:2024 - 03:03:00

17 files changed, 622 insertions, 3 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 95781c90c463..3e3d94867901 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ansible-core/Manifest b/app-admin/ansible-core/Manifest
index 927254961980..75272d3a544f 100644
--- a/app-admin/ansible-core/Manifest
+++ b/app-admin/ansible-core/Manifest
@@ -3,9 +3,11 @@ DIST ansible-core-2.14.13.tar.gz 3145413 BLAKE2B 75b11feaaefa9a63c6f83f64c796cea
 DIST ansible-core-2.15.8.tar.gz 3160606 BLAKE2B 439a3f584940e5ab46b43b0b47395e0618a3ea52c67ebcd51667f31220cb038dda35506e7843d177d555b77a55a9d2c6245a916741ab1dcdf222c535afb5f83d SHA512 020191ef4b005abbf799204da68270bd4f13a85c7f23cb9dffe85b1c5c093c0ad86e061211ab9fcc8fd0be9367717fb0baadefb1ebecd3579471120fb2e8647f
 DIST ansible_core-2.16.6.tar.gz 3176041 BLAKE2B 37aa15e8d9165eb89db0704f7670f78f3e3a50915e17bb1d56689e65e6cfc0bb15b7e01768d25c5d2a9a00802411a6eefdb9ad70aa38877d7115bc40faafea59 SHA512 cd9cc8783e13b073cbfaef889e20c8a7dfb732c91de4bae2b496a64ef47b0325c637b4ab2eadbd0c56cb004e95f5294aa1e1548675a90f06193d62defd553409
 DIST ansible_core-2.17.2.tar.gz 3125313 BLAKE2B 383e3bba117831053c8147c9aca15ee6768506a90be29b784a7232061179b514aa1287a9131b6bc471167e4e5720d2f189fa5e23a3df13c634ba8b030a68e51f SHA512 34c0630798d2c4ae4e426a7feb29f7d88738fa89df2abd36b825cbf010709c5c3ba4feaa5590d2841535d2b367d04dce9a817e9076cec791c7e9fcb47853249f
+DIST ansible_core-2.18.0.tar.gz 3064903 BLAKE2B d3d9e6169aeb05685b8380072d36f6e161ad09fe46006ad3867bdaf91561a287156e88405da0707f53c000254dad91ce69e8a14ef6c0cc8bc384e7d61e1f4795 SHA512 49165e4a6a5bf16e1450ecda0387cb8a143981bf10215f45c1376a468de7efe5348f36d8e419e1d54d701b050daab71ed908a946df29a502d160a47139d8dffa
 EBUILD ansible-core-2.14.13-r1.ebuild 1351 BLAKE2B 3c3f77546d5b5780b79cf95b69e39c627b38a28363576b6d8a929e0461ac7e26bb93a557a7f5031d0759092662c486be4a1c17b0a8233ba5523498612a8f22fd SHA512 c6426e7a3028559aac35f9238986c9b9f0bfc0bd6c18d197493272d9328e5c66b3bb5266d5d9946cbaa9e8b37951aa509977e0e35f50b558a0d559e3bb598312
 EBUILD ansible-core-2.15.8-r1.ebuild 1306 BLAKE2B c3b0b7549c906fcd2230703784ad01b649ca621cd6a3931095e9f01540b91f49a8cb8c7ae34e13c7d76664b1319f3133a397bd4081f4d6ec71b2946480a91f55 SHA512 a914547c08489517b23c2d616dc33c6821e301b28c45ac96019cc77dff469dcf6154bd42a99fb06fb84ae9aa1038bbd63803a77d32fba733ae5db387c9e98d83
 EBUILD ansible-core-2.16.6.ebuild 1286 BLAKE2B 3058395a058da21858ffee3e8570dbbcb6c94bde02f1463fd6cd93e2ed2b67825d3ff669d1d94174f0f4c5c6ffc31ddc421953d8ac93181654db37486a9d0b39 SHA512 0e0f6694774f81be6340575a2b50c99c4255a702e8f87a5a08b6e73f151603749d5ccf5b890451477082db613d23d4dca485f9f80e2d7b04efa96702a5b3f6df
 EBUILD ansible-core-2.17.2.ebuild 1286 BLAKE2B 7e8aecb8910bd095029f05035d2a31a3854214204ad1bd654838e13cced7a92200c39d73fcc35293605bcd0d4df3e0bb471d3cd60730440fc5a9823edf1ae681 SHA512 1e03eab26f3250a937dec6c5f741e436d62742a4e312d556d9c7b92b60a4fde340181da59ffe3da61d7e8c1c41a5f8de063ae8cb2a1d0e9d49297397dde1a450
+EBUILD ansible-core-2.18.0.ebuild 1289 BLAKE2B ba5580c4948d74b1d7fed66f7dc935d7ba2d84966b14c2727c601c3f16fa00c9b64143fc53e9981edbce5b9fbc9614717687874c7f3d731475a1e4eebf80e22a SHA512 7e822377caa003fec8430b45e294d2ebc310ef17fe2fbee24bc641686018e199c12ea04ba47c2a6b8228a709b3f13d73e02bc8efbe1c9a49d0b89be45e489033
 EBUILD ansible-core-9999.ebuild 1289 BLAKE2B ba5580c4948d74b1d7fed66f7dc935d7ba2d84966b14c2727c601c3f16fa00c9b64143fc53e9981edbce5b9fbc9614717687874c7f3d731475a1e4eebf80e22a SHA512 7e822377caa003fec8430b45e294d2ebc310ef17fe2fbee24bc641686018e199c12ea04ba47c2a6b8228a709b3f13d73e02bc8efbe1c9a49d0b89be45e489033
 MISC metadata.xml 924 BLAKE2B 7dcd1be7a7eea2a5a762ec295d2d285242f9350d377abb1d633c6eb7cdd1eb8f59b02a6908924f424c0b5f42b2f6b3a153523439cc10caef51656c9f75bcd87c SHA512 a6fbf2ee3743ad9d54864c8d22b75cd506f17e1abd6963b3499de55675fed711abf4df6b9fe2589d8ea0b2f93311d06cfbcca7b99469107d708d2bee5cea0694
diff --git a/app-admin/ansible-core/ansible-core-2.18.0.ebuild b/app-admin/ansible-core/ansible-core-2.18.0.ebuild
new file mode 100644
index 000000000000..4fedbdc52e4e
--- /dev/null
+++ b/app-admin/ansible-core/ansible-core-2.18.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..12} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://www.ansible.com/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
+	EGIT_BRANCH="devel"
+else
+	inherit pypi
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja2[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	>=dev-python/resolvelib-0.5.3[${PYTHON_USEDEP}]
+	<dev-python/resolvelib-1.1.0[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+BDEPEND="
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	test? (
+		dev-python/botocore[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_compile() {
+	export ANSIBLE_SKIP_CONFLICT_CHECK=1
+	distutils-r1_python_compile
+}
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 1fa7d7aec5fe..8e78794dcec2 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,8 +1,10 @@
 DIST ansible-10.2.0.tar.gz 39352378 BLAKE2B 46af9df464462ee906a4eef114da480c7bf027a29900971be56720729ffc6d2ad6d327cfd2e64f2a8834f4b45af69ee09cd732596de6d3670b777211e24bbdd9 SHA512 35b8e73ccabc15d622da2e34e9075304fb4ee3ef735e5ab1fa9d7673b5f3aad8cf6beacd697d8258914e6ea221c8ddbed4b1bee725590f2a5b4fa78458e692d5
+DIST ansible-11.0.0.tar.gz 40739296 BLAKE2B 337fff0f484c4bfdab944658aeb7158c4fe5d7aa49c4be61464974e531a4bbaada80a737005c08e3b43106c5c2052e09d7cdb60f8a53afd73019c28b416410e5 SHA512 9687703af0f4093ba4dadb530d9a257fac038a09ed6fead430247198b9f03257790602194fd01ba74db1ba20695fb2d6a37836602e6721a8c42e69e27314f3c1
 DIST ansible-7.7.0.tar.gz 40709642 BLAKE2B ee2f8d124f79ca3a3f131bfbc4f93e10d104a38262b7d60edd2a88284275fecdd3acf0e566a5cc81a1fb6a179a0b7c51215f2945d669be4c6af7aa2a4f31ade0 SHA512 7da6845c9a68f2b8c10cf3e4cc6ea347861d5b59daa6ac895731ac79b733c6724d234345054fe9e3bf4ea460345b9026492fda42dce22bfbc027c9b4de093fd9
 DIST ansible-8.7.0.tar.gz 49317896 BLAKE2B d5923753e368e908a569c5f8f261b1afe7c51d5381db190bf7de1e81f0a6359136581852faa2974f174e816944c66e2c0f625d3d62bdde324758309982c90de9 SHA512 6a67f8553c3fa56559e4a31ec627cfe2c5f42e147d94bea305ec4580af9ba8add136092b209a5a3d7f9022407e9d557484f044d23cb227973fe4e4341fed7983
 DIST ansible-9.4.0.tar.gz 38389836 BLAKE2B a2e08088565e6f248c1185ee96ac2365fc1385993d3f3fe68f941e8acb0e567c3defeec3ea376a30213921f02881bce0a0ac737323fc3ec82dc77d2d4a550dbd SHA512 4c75235a866f3f95cda8dd3b6c9d22b916ad117d54a86a30585f71c9015cd98db764afa225af5b2f6fa884af558ee488785e26c9e8b9e8be105062f069f065b2
 EBUILD ansible-10.2.0.ebuild 688 BLAKE2B 349c33e72eda578ca8ce6579e59f350f5169e77a642f539bba6c2088f4475ea37a280fde903313043089ffeb480d0d217ba090ec5944e6233ad05d90d1844957 SHA512 f74d3b95d631632accf781f5c6044625d5c9464877229f956a5955278185aae03ecce3a554d75cfec22f3ea99503905f222706638f3c399baf60e958ded8a01c
+EBUILD ansible-11.0.0.ebuild 691 BLAKE2B bab7f85878a7497e39927b8ba5bdddbff260d4422f4a46550de156fe00763b66a4a5d4353a3e69f0cdd1153d94aaa718016bba4475cde00838290c9ebd20d0fb SHA512 63bffb889f194e50f028c3263880196c331c36b820da5bc80520680443ac6f77a0afdc8fbe038c9a77f5e524e70c9d731fa6e097cb2a0a46f66c5cefd85f84bc
 EBUILD ansible-7.7.0.ebuild 655 BLAKE2B 737b7e75834d55ee6bbbdc00797896cfed122cfba478bf076156befa70e873899a3b4313408030aaa3214175e7a45bf3c86c21b4e84c2de5940c42cb5e68780d SHA512 4765ba667b64e4eb5659423a8ccc1eb8e52bd6c0f4e287b4aa4f79877d11ef88b95bca3518413f93cea3b785c27f739754af64781f783fa7e46cb2d44c1d7b57
 EBUILD ansible-8.7.0.ebuild 655 BLAKE2B 74f7871faa2bfe26fa6e09ce2b5ac89121c3b608e08e0a9ec9bf5987a8460ca1102a1cf24293a5f58307d94fca6bed53670754183d4fb2ac09a2ab7541345e2a SHA512 4e1b54c8e83abd8ce1540e48c77ec6798fe0297c9e23f040551d7f5e5d17b9092fc22a0c8970e270198f1054558295c77467d95bc8844ee8e5a61f9eff8331fc
 EBUILD ansible-9.4.0.ebuild 688 BLAKE2B d8bb8932a776dc3592f7b2d89c99a51e0cf3e1d299f15bda17a23140b77024c18cf5a379fbeb7e1ae2e481136d23a568a7582d6f50080baa4fe3b0d6c507e3c2 SHA512 8c6275fdfbe43c6ec137b5f9945616621950a3e191b05068ab1af9fc7ede679c0e49bdfbfc1a0da23e92b7f2c0d7ace0d06896a9491a44fb2eac8687179206c8
diff --git a/app-admin/ansible/ansible-11.0.0.ebuild b/app-admin/ansible/ansible-11.0.0.ebuild
new file mode 100644
index 000000000000..c56770f055fb
--- /dev/null
+++ b/app-admin/ansible/ansible-11.0.0.ebuild
@@ -0,0 +1,29 @@
+# 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_{11..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://www.ansible.com/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+RESTRICT="test"
+
+RDEPEND=">=app-admin/ansible-core-2.18.0
+	<app-admin/ansible-core-2.19"
+
+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/awscli/Manifest b/app-admin/awscli/Manifest
index 343138c44ecf..71b1b05929e8 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -2,8 +2,10 @@ DIST aws-cli-1.35.20.gh.tar.gz 2817368 BLAKE2B 92c86af16eb29a22c437491c938c08d4a
 DIST aws-cli-1.35.23.gh.tar.gz 2819656 BLAKE2B 6e9d20410344f075ce12bfc8c0a49941a846f02304de9a30516376d0b6666b8c0a9affb36dd94a463f48f17f478f5d27e0f7375a48c63eca1b3a28927211e6aa SHA512 9075af833da9abc9494a2dd01a987b874e2b4444d7d5d1f4f974da1b56940b88603e8ec115662c85c2beb7cb70a65c3bcdbbd5510a1973433f8030efc6a1c69a
 DIST aws-cli-1.36.4.gh.tar.gz 2825870 BLAKE2B 3a13a50077087633972c0eb908e0116e432f0036871f4d5a5e2429ea86dfc0c5d40a87e0950c02bc7622fb0e56b9a3ee9fc8ee9a6a1ed8ae17728bf479401d13 SHA512 735a228d52b525cfc4a9a403ad8364bfb9c558ba86daf6966743126eb21de6d0f49d76fd21d9c7a0fd29f229b4b71e0778d4b1ccd0b2e27b0c794f1e11cd6c83
 DIST aws-cli-1.36.5.gh.tar.gz 2826720 BLAKE2B fc1fae0f6983c635e27a98747dc9cdf7b43dceedc52104923e4ad1272664b09a28939db876cd235206e83925cf77bdd872de82660ddd286ba6e8ede273b5a704 SHA512 009ff8306302f47c7ea1f5eff93265ce1334e799fb541b0a96759495790e30a0164501e09b45fd72a58aa828d1a67fed4061b4e65b4dd1f84722b49b0ba43f9e
+DIST aws-cli-1.36.6.gh.tar.gz 2827814 BLAKE2B 23089b5c996a298b1a9cc529701f9ad25d5794b81e1bfdf952db829dd3d57ec2c5229f81fe071d6ef4e9d050b55766d3abb38a40ff10bb91dbb882c39dd2c68a SHA512 a02725703fe7cab1b55683a1cd9b7fcb4ca9fe7deedd7b867b52a9164af6522fe25be8da6ee1858708ad3a9e20f134155b70cc87d8c87d5df167336dc8539de0
 EBUILD awscli-1.35.20.ebuild 3240 BLAKE2B 89fc679334ea535c78d19b48324652d5d867d9348e002ed52dc3a9e2da19aac3d97b4b1584ed43f0233ecdbd40f8d68def7b89fcd94e0c947cec1b4f47d68be3 SHA512 c9c9827b23178d1a976c1292704f5c28df75d7fddea370baa37c385b783299e4f4f72eea597a54e81656844ef41d8419cc21e49558806d512662eccf4da60ef1
 EBUILD awscli-1.35.23.ebuild 3172 BLAKE2B 0db9ea2a5367a9a5091fa3c233651013f1dc9bf9e9b9d6b31163a0e6251662bebb04ada8f04e9a880dc9079c0302765ceb9f8f56b71de617d23a0d23617388c5 SHA512 e6c01254fdc3e702e008ad3a6e7aed38c4c7fcb9339ba23e665495dfd330cf597cc2f465806f39f8a35da8dfa91c22b5136c672a2c8c38a42f62342f16c97d82
 EBUILD awscli-1.36.4.ebuild 3186 BLAKE2B 63a0fb498273465997fdf8010dcec351d473545febb8aaf2c222c3176a00f0cce5edadbfbc778689949142466c05e371a017c07a54ce30deb7bd7ca86cdb1e82 SHA512 2db712c340a0d13e4f89a8ca4599cb89f83d11d519b2f90f1dcf72e903830d70ae31efbed50a958b98655e24327cc027c0c945bc061f9de7c8fbf4d45f2fa625
 EBUILD awscli-1.36.5.ebuild 3186 BLAKE2B 63a0fb498273465997fdf8010dcec351d473545febb8aaf2c222c3176a00f0cce5edadbfbc778689949142466c05e371a017c07a54ce30deb7bd7ca86cdb1e82 SHA512 2db712c340a0d13e4f89a8ca4599cb89f83d11d519b2f90f1dcf72e903830d70ae31efbed50a958b98655e24327cc027c0c945bc061f9de7c8fbf4d45f2fa625
+EBUILD awscli-1.36.6.ebuild 3186 BLAKE2B 63a0fb498273465997fdf8010dcec351d473545febb8aaf2c222c3176a00f0cce5edadbfbc778689949142466c05e371a017c07a54ce30deb7bd7ca86cdb1e82 SHA512 2db712c340a0d13e4f89a8ca4599cb89f83d11d519b2f90f1dcf72e903830d70ae31efbed50a958b98655e24327cc027c0c945bc061f9de7c8fbf4d45f2fa625
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.36.6.ebuild b/app-admin/awscli/awscli-1.36.6.ebuild
new file mode 100644
index 000000000000..2960403cf7e0
--- /dev/null
+++ b/app-admin/awscli/awscli-1.36.6.ebuild
@@ -0,0 +1,95 @@
+# 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+59)
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) - 1)).$(( $(ver_cut 3-) + 59 ))"
+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[@]}"
+
+		# flaky (some ordering?)
+		tests/functional/s3/test_cp_command.py::TestCPCommand::test_multipart_upload_with_checksum_algorithm_crc32
+	)
+	# 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/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index e6ce6a33f8e6..2ded3d253b5f 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -3,6 +3,8 @@ DIST puppet-agent_7.24.0-1focal_amd64.deb 31418478 BLAKE2B 201c0a5adbeca2b6f572d
 DIST puppet-agent_7.24.0-1focal_arm64.deb 31160744 BLAKE2B 22dfc3f0855c2e88c7202f2a9d98efd4ad9ef3a191ab9b5b8c37a6869306a47d1225d568fec9f0fc52cdf236f8258b5ca206a360049cc39e1825f1f8afc5d4af SHA512 db1b7cb25a04d6aeedd7f3bb125fe0fcac420c2881f9f3aba729143e253908376cd118073753de018d8fd1a6d7f38139766b4ec4bfb23f840ca7ee32143a8a48
 DIST puppet-agent_7.33.0-1focal_amd64.deb 31998566 BLAKE2B cb855e15cc3abde94b24fe346217f00aea2ff71ac6b08d391b05100049adb6d2692bb67f1b82138eedfa50bd1630fdadf43064c5f7c3b90ee0cf6500e9af9892 SHA512 84feba50be6df8a404c51fee764ce7edab60ba1ad32a49145b67eaab037662686f23cd7e05c117053d500ef69293f0e1b6fdf7dde438a467672aea31d8b198a0
 DIST puppet-agent_7.33.0-1focal_arm64.deb 31712884 BLAKE2B f96904f2003957cf2f69da370ea9ceb00a09a140075a6a75ba0eb33ecb2308b4aeaf2cf5e5b34b9974ccf31813b56b9c5b2336d84bb4a1b40ca5976e2efd0162 SHA512 359736e864e437054ec7df83826afddc0b7fb7d68464b46236356e4a38919396dec153a73c2ed3ad015eacc0b399ed9d940860bf47c64f97139c5ac79a5af004
+DIST puppet-agent_8.10.0-1focal_amd64.deb 36329770 BLAKE2B 564fdf826e10feca0e8d44cc06c7047d2e538a69e6aa912a80c626328cac92de010c7afdd457d2d420affaac355a16b51ef2e0929c00f43478b0709e8f214341 SHA512 7a5e6d53f34dccd6ba890f04a1f767c518d9fd91b569a2fc791dbc16656ce9bf61902627a27a59965db62359bf561f391a46ef4f32128a8fb9b5906627936cc5
+DIST puppet-agent_8.10.0-1focal_arm64.deb 35829860 BLAKE2B 71a59e1267301cf6c4dcebe079fea015d0bb450c41bdb6d7594327e247f4bb5966030cd7a7b8c6e2515b4da24fe8d449fdc4b545cb9b0d630e8812d2e334d6ec SHA512 19227bb8fa266383e25be28065a0fd62f822294665a8ad736f871f73f7bcd484b8fcb01d6c3d0c2de73755269fb9d78d2a53f321c271fe35896405c347bd9925
 DIST puppet-agent_8.5.1-1focal_amd64.deb 35945834 BLAKE2B 8c839eabf8abbc6cf87ab8a1c942b97be7fc08b9053695d07a7fc4bbf69886192063553c43f81e73521327cf8b89af18fe43d41ef3f71229d218fe123426f50c SHA512 324ea532d005a1bbb0f25fdd411f3f68a1c18371cb494f8934d73d87c19e3bbf46c653a9afbe767ed2ab6e788115f31ccef4bd084351ee6f73e4e656aab5d65a
 DIST puppet-agent_8.5.1-1focal_arm64.deb 35436770 BLAKE2B 16ead6317dab6f8b65b8ea5269eec5593697f4da6d1ec0323e074f4eab3c8518dab10af48853e591aecc62c63a5ff4e135cf02bb1d7f7d565c5200bfae98ff86 SHA512 f3acc097563d9a56cb677df72250ee25ab0e1e361eb40a2cd36b3d694854edc3850f08099b916aefbc16580f78a194e9f3bf33b1cb585836d55c6e8dcf03a379
 DIST puppet-agent_8.6.0-1focal_amd64.deb 35966100 BLAKE2B a27e5fd32c73dd798612cc78a2e4abc150b425215592e9c7a88c7d3b54a2f6dcaffd557575e7c6f64116228fdd50e15a503f8b4c8c496c0f970ee772d5a88e6c SHA512 10a89f73219da6b59e63e8d2aba63968ef2236e773077c54ef6001b010b20b3e384676880cc10b8be4fc16336bb123783de88b0fd1d5c5d91c2455f410458363
@@ -11,6 +13,7 @@ DIST puppet-agent_8.9.0-1focal_amd64.deb 36339482 BLAKE2B d3ed494da8d576a44c33b6
 DIST puppet-agent_8.9.0-1focal_arm64.deb 35843072 BLAKE2B e394ed90277299e5c86b0449fe5a49a890d738845b686e1c2d790fc50e4dee351057d63d091ed6d33180a864e5e884ee75cae9d80cb418e792f49953962f0f7f SHA512 4baeb4eac079f80be38ccffe5db2d91f9dc4f6a6bac2423a40f4f105757ecec3831e2f58bd2ba0f355fac79d4c3569766d1931c2ea531bc10bcaef08b8d9dad8
 EBUILD puppet-agent-7.24.0-r1.ebuild 2593 BLAKE2B 08fcc0a7e5887d7767d6f740501b862957a9436ef9e5b0f7ad89077a273d22e3f9ba13f2ae5e557f0f5526889cf5f92489fdd5165e0608c655f94bed6e08a002 SHA512 98d999200a527076993b9c8bb45fcce2d980b081c19afa058d7129193861ab89b323b2ea73886190cde8a633dffc96bf459b29facad8e3cbeef46be9029fac39
 EBUILD puppet-agent-7.33.0.ebuild 2594 BLAKE2B b9cd09cea7153eb9b7d5ced097d0d7bcaac63ca309ca7ec33fd7ad9cc8c08f17afed2a874300f418f01def2038e7829dcea793fa264f925745cfb732b321f545 SHA512 b7f79c39ebd5eff67070f45a821383f200f6c94a460e68a386334c1eba743991e06eeb29895c7bb8c51c4b070d9d25b6a0198662c552d53ef672da431797ae4d
+EBUILD puppet-agent-8.10.0.ebuild 2596 BLAKE2B 8468abd827d23a1790ef84ff0a073f7bfb48e62d05d01056a030c92609f8356292fed0e53d9d23517936910775815814c077c414126413820302092d8ae0fbfa SHA512 dfb1b5ab54f528c1e4d28f551d2198b7617ccd673d9987b01d47341fb54c0940b7a4a5f73257da318b4db87bf3a3386f271b2c26985d680f86c2d503104ab542
 EBUILD puppet-agent-8.5.1.ebuild 2595 BLAKE2B ff037b9f14f6a93fca87738f3312fd68b81a8026b481c28fe2ba01a01bed9797e6f65884221f3578690ed87b50fb131e3998744a6721e9f284d6710144d53082 SHA512 947547718b3e6e3692282a91a747782de80c52cf229859b83ca762d4277a7f5e8c4f98f47fbe3f6156686d6d8634e1da3c47290fedd64c74cdde72e0f217da1b
 EBUILD puppet-agent-8.6.0.ebuild 2595 BLAKE2B ff037b9f14f6a93fca87738f3312fd68b81a8026b481c28fe2ba01a01bed9797e6f65884221f3578690ed87b50fb131e3998744a6721e9f284d6710144d53082 SHA512 947547718b3e6e3692282a91a747782de80c52cf229859b83ca762d4277a7f5e8c4f98f47fbe3f6156686d6d8634e1da3c47290fedd64c74cdde72e0f217da1b
 EBUILD puppet-agent-8.9.0.ebuild 2595 BLAKE2B ff037b9f14f6a93fca87738f3312fd68b81a8026b481c28fe2ba01a01bed9797e6f65884221f3578690ed87b50fb131e3998744a6721e9f284d6710144d53082 SHA512 947547718b3e6e3692282a91a747782de80c52cf229859b83ca762d4277a7f5e8c4f98f47fbe3f6156686d6d8634e1da3c47290fedd64c74cdde72e0f217da1b
diff --git a/app-admin/puppet-agent/puppet-agent-8.10.0.ebuild b/app-admin/puppet-agent/puppet-agent-8.10.0.ebuild
new file mode 100644
index 000000000000..f5524d744e1b
--- /dev/null
+++ b/app-admin/puppet-agent/puppet-agent-8.10.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit systemd unpacker tmpfiles
+
+DESCRIPTION="general puppet client utils along with hiera and facter"
+HOMEPAGE="https://puppetlabs.com/"
+SRC_URI="amd64? ( http://apt.puppetlabs.com/pool/focal/puppet8/${PN:0:1}/${PN}/${PN}_${PV}-1focal_amd64.deb )
+arm64? ( http://apt.puppetlabs.com/pool/focal/puppet8/${PN:0:1}/${PN}/${PN}_${PV}-1focal_arm64.deb )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="puppetdb selinux"
+RESTRICT="strip"
+
+# virtual/libcrypt:= is in here despite being a pre-built package
+# to ensure that the has_version logic for the symlink doesn't become stale
+CDEPEND="!app-admin/puppet
+	!dev-ruby/hiera
+	!dev-ruby/facter
+	app-emulation/virt-what
+	acct-user/puppet
+	acct-group/puppet
+	virtual/libcrypt:="
+
+DEPEND="
+	${CDEPEND}
+	app-admin/augeas"
+RDEPEND="${CDEPEND}
+	app-portage/eix
+	sys-apps/dmidecode
+	sys-libs/libselinux
+	sys-libs/glibc
+	sys-libs/readline:0/8
+	sys-libs/libxcrypt[compat]
+	sys-libs/ncurses:0[tinfo]
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
+
+S=${WORKDIR}
+
+QA_PREBUILT="*"
+
+src_install() {
+	# conf.d
+	doconfd etc/default/puppet
+	doconfd etc/default/pxp-agent
+	# logrotate.d
+	insinto /etc/logrotate.d
+	doins etc/logrotate.d/pxp-agent
+	# puppet itself
+	insinto /etc/puppetlabs
+	doins -r etc/puppetlabs/*
+	# logdir for systemd
+	keepdir var/log/puppetlabs/puppet/
+	chmod 0750 var/log/puppetlabs/puppet/
+	# the rest
+	insinto /opt
+	dodir opt/puppetlabs/puppet/cache
+	doins -r opt/*
+	fperms 0750 /opt/puppetlabs/puppet/cache
+	# init
+	newinitd "${FILESDIR}/puppet.initd2" puppet
+	systemd_dounit lib/systemd/system/puppet.service
+	systemd_dounit lib/systemd/system/pxp-agent.service
+	newtmpfiles usr/lib/tmpfiles.d/puppet-agent.conf puppet-agent.conf
+	# symlinks
+	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
+	dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
+	dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
+	dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
+
+	# Handling of the path to the crypt library during the ongoing migration
+	# from glibc[crypt] to libxcrypt
+	# https://www.gentoo.org/support/news-items/2021-07-23-libxcrypt-migration.html
+	if has_version "sys-libs/glibc[crypt]"; then
+		local crypt_target='../../../../usr/lib64/xcrypt/libcrypt.so.1'
+	else
+		local crypt_target='../../../../usr/lib/libcrypt.so.1'
+	fi
+	dosym $crypt_target /opt/puppetlabs/puppet/lib/libcrypt.so.1
+}
+
+pkg_postinst() {
+	tmpfiles_process puppet-agent.conf
+}
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 79e49697fa41..68234670f539 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -3,11 +3,13 @@ AUX puppet.init 751 BLAKE2B b873fd1e51e2b5c148d31da4f861ee8cc60c71ef7950f10f1ba7
 AUX tmpfiles.d-2 35 BLAKE2B 333994788552e5c52273752f4e3c2947666737d03f9d340e16ada790607efe77da1ba9bb4852bc8274174fbb96ce0c7ae81062f7197e63ea4701e539b2650b3b SHA512 fdf00147c497bd822a14f0e42bad825a43ce0977ec6c0265d267dedeef56295e3ce319f7972d0ec2ab9f04f2407856947f4261d6e62054a36c6e1672b45f86f0
 DIST puppet-7.28.0.tar.gz 2827538 BLAKE2B 65f25d9de60ed1b511acb5c9d72370198f68f3158cfede2ffda90ee23ebcfecfdabcf35459d1a048c3a204e13611f67852028233e4da4b9ed2ea08cad07a37c9 SHA512 d570452ceec764c657f4678f7179400d30f8513766edc6f020db35c3a4246c1d857615a647ca481920a7d1a40cf9a15057432468ccd4697e4335dca55e121faa
 DIST puppet-7.33.0.tar.gz 1514101 BLAKE2B 6029862352710d1d427600697ab759d50854d17c02e47fbd7ec78929e0589bda507c6424c8c0e7de47a62754f5e180da5538823fe4c849c161649982f6b360ab SHA512 1f2e987cc39f25bda73f9228f20a2ddfd8e0b501c933da3ec4cb5a08cfe9ffe41e11e7bd679c039ed0acd45fe1d60f332b06e3be7653c207852677c39731cceb
+DIST puppet-8.10.0.tar.gz 1551138 BLAKE2B d00ea45efcc277c2aeff5f1083c2608226c3a755d60456185a226a64815da42c51c7a9b0b35597c896cf569e3c9ea19a7d199fcfa841d28f8e043a9925d55d54 SHA512 5fc7842695c12ba07ffafbc6e1b1bc0efab8d3b2587a01aabb8fd8c6de07c6e227b741190b138eeac94ae2ac557fe9909d836827f79292b981e5d0bd2f53b91b
 DIST puppet-8.5.1.tar.gz 1565085 BLAKE2B f352f9f70e090c4a32edd45ced5c01ed4eff891fb46c0f2d753ceeba43250960356ceb2d9047e7308732585ec114c5f728ec29a65b6a08348b74a9709ec92a89 SHA512 f1d661c34fc7c1381c6422ff7e027fdf4554a69939f5db926bf8a61a89583090fb8d28151f90093d3ca8037950ed911b0a5c7b8677a80ede72e83d9cbf89af7f
 DIST puppet-8.6.0.tar.gz 1567398 BLAKE2B 749cc055c6797e5715907fdb768264774efba62e4681733a59a457cfda9dd2682990a96331cc04d313a367e32b820ce351fb103e19891976e900d99c30ca7ba5 SHA512 b08d59b4ec79fec5f3dd2d37c9b6a9f016cf25068e507866ab8d545f59792b9af84e302675182a0318c792814f0bff2bf052c8953b6b44c5441fa2c692a9f04d
 DIST puppet-8.9.0.tar.gz 1552679 BLAKE2B 2e4de8423a467593386440c07b70a9c8ce4be33394be37114ac2f2611f9d927223eaf2d53750d91c4596388e95ede1fa60319c3f713702f51ef06cb1a09f590c SHA512 75d5fb70fa1dcbebbefe43327099fbe590c6ba36b1fdef3a7d72210c78174db444b2ccfab7c50f6446578f48a1ff253335766c255654eb668a6277b392b1f055
 EBUILD puppet-7.28.0-r1.ebuild 3464 BLAKE2B 5c9818baed85e31a7785efdb5194190f1916bb12aaa90a849b14ca2b54a8f3460b4b11311c2d8cb07e0faff5c29d9d103ad3e148afdc3c10fb9c9463aeb36c6d SHA512 3d748de12c9c12e630e3024254ec7a7793e916030c8878171084eae266a723fe6fa0268ddb4f669ce5d14b66c27318122fe22a326c837d0a24ad99f604121ceb
 EBUILD puppet-7.33.0.ebuild 3068 BLAKE2B a3d828bacb0c309de40074b565d38a053be9b35648c075b93d5e457ded76031d9721adcc314d3ad16b4d59082aa7c0033a5745344e130fa52d6e96d759eee7b3 SHA512 4735260aaaef1fd77659b46d82861b6d43ed2e7952ef768391ffcd9e604198beef657e4365096f9c23dac0f7ad51d70505f919cc333e5f4e83ea46f21d98983b
+EBUILD puppet-8.10.0.ebuild 2900 BLAKE2B 24c1990bf4d70b8189f9c17bd53cf3a01125f73a060fc408b01e5c57fd9981c46e07e30bc9fa69015b4759a0f0dfcc10b1ba785c29becc46f63555bee1a482cf SHA512 9b28ae3f7807e20f5e5a5a77232a133fe6a0ceedb068e75f60eef763f13334b0c1a2c613eb9f253103951d910f16999bea71a660e56cc3c88b8a87fdf5910482
 EBUILD puppet-8.5.1-r1.ebuild 2898 BLAKE2B 421ab14d4907e8c8aa091dd97b9883dfe3e235ec3ae83b906bd4e14028ee022db1a87fc084c3c14d870ffa4553e0deaa37936f61ef8326a434c06ad9a95e989c SHA512 463ae7d3f2c7c6ff41295a2f4e7117cd466ade90f6b0e2c477d731327f87c23d7fdcfaf5730722310652e566ae8f017c5b52d013bf7277bc163418e6e75613b2
 EBUILD puppet-8.6.0-r1.ebuild 2898 BLAKE2B 421ab14d4907e8c8aa091dd97b9883dfe3e235ec3ae83b906bd4e14028ee022db1a87fc084c3c14d870ffa4553e0deaa37936f61ef8326a434c06ad9a95e989c SHA512 463ae7d3f2c7c6ff41295a2f4e7117cd466ade90f6b0e2c477d731327f87c23d7fdcfaf5730722310652e566ae8f017c5b52d013bf7277bc163418e6e75613b2
 EBUILD puppet-8.9.0.ebuild 2898 BLAKE2B 421ab14d4907e8c8aa091dd97b9883dfe3e235ec3ae83b906bd4e14028ee022db1a87fc084c3c14d870ffa4553e0deaa37936f61ef8326a434c06ad9a95e989c SHA512 463ae7d3f2c7c6ff41295a2f4e7117cd466ade90f6b0e2c477d731327f87c23d7fdcfaf5730722310652e566ae8f017c5b52d013bf7277bc163418e6e75613b2
diff --git a/app-admin/puppet/puppet-8.10.0.ebuild b/app-admin/puppet/puppet-8.10.0.ebuild
new file mode 100644
index 000000000000..4eb0e3b0a919
--- /dev/null
+++ b/app-admin/puppet/puppet-8.10.0.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+USE_RUBY="ruby31 ruby32"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC="doc:all"
+RUBY_FAKEGEM_EXTRAINSTALL="locales"
+
+inherit ruby-fakegem systemd tmpfiles
+
+DESCRIPTION="A system automation and configuration management software"
+HOMEPAGE="https://www.puppet.com/"
+SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="augeas diff doc emacs hiera ldap rrdtool selinux shadow sqlite vim-syntax"
+RESTRICT="test"
+
+ruby_add_rdepend "
+	hiera? ( dev-ruby/hiera )
+	dev-ruby/json:=
+	dev-ruby/semantic_puppet
+	>=dev-ruby/facter-4.4.1
+	dev-ruby/deep_merge
+	dev-ruby/concurrent-ruby
+	augeas? ( dev-ruby/ruby-augeas )
+	diff? ( dev-ruby/diff-lcs )
+	doc? ( dev-ruby/rdoc )
+	ldap? ( dev-ruby/ruby-ldap )
+	shadow? ( dev-ruby/ruby-shadow )
+	sqlite? ( dev-ruby/sqlite3 )
+	virtual/ruby-ssl
+	dev-ruby/hocon"
+
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/mocha
+		dev-ruby/rack
+		dev-ruby/rspec-its
+	)"
+# this should go in the above lists, but isn't because of test deps not being keyworded
+#   dev-ruby/rspec-collection_matchers
+
+RDEPEND+=" ${RDEPEND}
+	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+	>=app-portage/eix-0.18.0
+	acct-user/puppet
+	acct-group/puppet"
+PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
+
+all_ruby_prepare() {
+	# fix systemd path
+	eapply -p0 "${FILESDIR}/puppet-systemd.patch"
+}
+
+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}"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	# systemd stuffs
+	systemd_dounit "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+
+	# tmpfiles stuff
+	newtmpfiles "${FILESDIR}/tmpfiles.d-2" "puppet.conf"
+
+	# openrc init stuff
+	newinitd "${FILESDIR}"/puppet.init puppet
+
+	keepdir /etc/puppetlabs/puppet/ssl
+
+	keepdir /var/lib/puppet/facts
+	keepdir /var/lib/puppet/files
+	fowners -R puppet:puppet /var/lib/puppet
+
+	fperms 0750 /var/lib/puppet
+
+	fperms 0750 /etc/puppetlabs
+	fperms 0750 /etc/puppetlabs/puppet
+	fperms 0750 /etc/puppetlabs/puppet/ssl
+	fowners -R :puppet /etc/puppetlabs
+	fowners -R :puppet /var/lib/puppet
+
+	# ext and examples files
+	for f in $(find ext examples -type f) ; do
+		docinto "$(dirname ${f})"
+		dodoc "${f}"
+	done
+}
+
+pkg_postinst() {
+	tmpfiles_process puppet.conf
+
+	elog
+	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
+	elog "cause puppet to hang while installing packages."
+	elog
+	elog "Portage Puppet module with Gentoo-specific resources:"
+	elog "http://forge.puppetlabs.com/gentoo/portage"
+	elog
+}
diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest
index 764752b29904..63cfab3f08e8 100644
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@@ -3,7 +3,9 @@ AUX puppetdb.initd-r2 1896 BLAKE2B 04f47dd0406c1f67d4f72a911b0db8b482e37673ec9a0
 DIST puppetdb-7.13.0.tar.gz 49917440 BLAKE2B 7cb01b2dbd6b6b22aad11a7fbcabff1c8452d51437bd0b3db3c8afe9d72bb853b66a9c8056c4c7c33f284efc4a90c788a05411fe6f80ae081ef817bb7f609bf3 SHA512 ba94031b3c15d38a2719390145e034be453a5f8368b5c53420bf3b371cc36a49f0b416447ec4d9de41ef0618b32ec806b9bae996ec3c4ca0ce05fb152940c2f2
 DIST puppetdb-8.5.0.tar.gz 60440356 BLAKE2B 8c3116b040c91a1b406e56b419ddd7e31a5ecc7aae97c73b03fcecebeedefb1b8eed44ce54b07881cbbb025b79bfa076618c6fd6df861a6dcf03c047e7c8f480 SHA512 92808758271c43eabbd508fcb321b3e52a92d0aa860f2c9b42d1df6dcffedb41110c8cc2e72c599fa1762404112f1fc76699f449858a627dd1ca5caa84a2d381
 DIST puppetdb-8.7.0.tar.gz 61636500 BLAKE2B 3e65c3e28935cc0a43b239f9d1c11e3807535c448f35e6c9e2c9191b636ae74b310b13345922144041f8052ca4e450db8f4e6a3362e5f9220bb422dffde3bd02 SHA512 fd0b1ae050d39393afb108ce3b60e49080eaa23de96b7e0afd8839d1f57f76cf66febbeb450bf7e975df7550f3817f44ae7c0c08c2ad591c09e30184ed4fde86
+DIST puppetdb-8.8.1.tar.gz 61668542 BLAKE2B 32c6921758b66731cdf4a3dee62d10c6d11a1f7ab7e31d58e42b55c060514bf919e9ed1023a1b5517bfc19323c2c7c2f9ab8ed5d6928e0cd9dbe33dcfb8ada6c SHA512 6fa8b78f1559df3e273fdd1e17c952084387f1b1d5c602f133051d60ababf5face105a321c78e101e6655fb4d5704b1b96f77e3259d09f260edbe66e7ea92918
 EBUILD puppetdb-7.13.0.ebuild 2705 BLAKE2B 7328385eb13d39f37a2affa82b49ed2fac94e68db460ff735fd4a78d26bed884b6047b4d6c5a91b7fd7f93a955e261f9f97cf0833b1d6fa67d06b65fa7eb7080 SHA512 2fccfbbab1518ca3bc804844948547f489a69b908ce04ac93ed88f2b5f241203bfe623e87a0900fddfc2b2ffe5636768bf0ef1258f1dd27d233fbfcbbbbef74b
 EBUILD puppetdb-8.5.0.ebuild 2702 BLAKE2B 764c25b8a8071be7f67fce96a88d61f06e98a0a25c07fc154b39a41c6fbf624954f94596dc2625a9471f5a6571bfcc669aa2930548d42ceafd0b78747b0d1f26 SHA512 63c7bd0dacaa4b4be81f26da9d023235fa82b80376aaa6e32fd846b14752230325185cc707e4b0b1b0277713464de694aa5b6c3c10147ac15d1b89130ea45f2b
 EBUILD puppetdb-8.7.0.ebuild 2702 BLAKE2B 764c25b8a8071be7f67fce96a88d61f06e98a0a25c07fc154b39a41c6fbf624954f94596dc2625a9471f5a6571bfcc669aa2930548d42ceafd0b78747b0d1f26 SHA512 63c7bd0dacaa4b4be81f26da9d023235fa82b80376aaa6e32fd846b14752230325185cc707e4b0b1b0277713464de694aa5b6c3c10147ac15d1b89130ea45f2b
+EBUILD puppetdb-8.8.1.ebuild 2704 BLAKE2B 9a97efa49f2a73bda1245a0c42b318fff7f78231072c95d5040ff949889a2c6e58cd4fa04e392923cc1418b5777b08c31cb8f06f08d243846ebaac749b94eaba SHA512 b2b3b6a32b5b542ea8f3d2ab40818d9429efeef33c316160c159ede665e61ac44f4d07c3686d7ca9980af7a45b52364be35f9498979b461a6f893ea7e854d967
 MISC metadata.xml 486 BLAKE2B e74960c88243252794d20dd51c071147de88663d4e610e8358013b77ffaeb13b35edb7a48575932a8a30e0916782063459fe14b57ffcb2962e16b5d73c66f9d9 SHA512 e87f0d39aa659c53cb9798929c08a853247870f9c9b7dc85c9610f7b2b9c2f10a226ffeadc738e263c6bbcde495c438fbfd7dd951c2cff18b66646da9475c7c6
diff --git a/app-admin/puppetdb/puppetdb-8.8.1.ebuild b/app-admin/puppetdb/puppetdb-8.8.1.ebuild
new file mode 100644
index 000000000000..d08261a3e451
--- /dev/null
+++ b/app-admin/puppetdb/puppetdb-8.8.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2024 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-11"
+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 5dd4507b19bd..f259500c556b 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -3,7 +3,9 @@ AUX puppetserver.init-r1 2190 BLAKE2B 6e4b547af51989d678a52e0fb41e8b27a669d96aaa
 DIST puppetserver-7.11.0.tar.gz 59927771 BLAKE2B dcf2543ac6d5427f57bb451ff9cc6db6748522ffed6fd5a7e81bd63be899fbf722016975fdfca5154489bcaf93d973d11669dd455ad44c79b3be50ccc5e0f636 SHA512 4c9c8d05048ccc35fd729a9a37151451e97655eed131f7192be2dac7614c309ffa4cdb0dd77f1c9eb2666d7df630690faa52ad2b01266010533522b58fb06f79
 DIST puppetserver-8.6.0.tar.gz 64667765 BLAKE2B bb367a2ed980a6335a6d1e2bc09ad10ccdcc636eee6b658cab5d4bc530f656c76d75545d17e11d7b58288867edcb39bd54af0ddfd5bde2f13cb5000ed33d0bd0 SHA512 e780c78371865e754a3a7fc5343b11f9a0319caf34dcf6ca998295243d1fa2137a617867782878d9bb735c96d5dd1f3e3174898eef240353d3af63eb87cdc4a2
 DIST puppetserver-8.6.3.tar.gz 64781954 BLAKE2B 98bce7ae9e51d8a7e36f6e71ec3440bed58890851e7386f1e248923df3134bf3d8d56f0a0371570dae3e0f599e201c42ae1922ee076fc3ae71d5e4dd0ecbbafb SHA512 c0b706f4a515e18d264cd00236cc8a417a2b3f90161cc3ab2e8fbb87b172418320a616ec5513287306e4447a9847daf23110853fee35f8c2701b228ed58fef57
+DIST puppetserver-8.7.0.tar.gz 64714510 BLAKE2B 459adbea46536d0281ef1afdbbaf11c528fc4f8b2a1ebdb6ee0d7a0a3bf239e26dec38778a4ff2ab7e0fc3f9613b79c8bfd1d2956be59892db9fd603695cc443 SHA512 151a468b573c003b7e41c477e8dc540f4ede7274720e53f321167507db395df50be3a3cee9cb6294feb0fffd290accf577679b077c2538c59471be1aa365d83f
 EBUILD puppetserver-7.11.0.ebuild 5355 BLAKE2B 5e11c389026d93c2ae38f28e2f8da12fe25bc65a1600a2f8051003b726e110498f7892355ff0e9ed556547db5cedc3c45c01253f3722f7ff7705f147585e2f82 SHA512 edfc5b094ea7db88c30cb71ecc3e3476b52789b37f7b893526db5dc7b96dbfd52a4e4bd2a38aa4164ebc8cd0b967cdd5b6af077a49fe242cf2c762b155c3ce16
 EBUILD puppetserver-8.6.0.ebuild 5352 BLAKE2B 4d688a0e03cc3b86f224fdb05a08534d85c99828e1eebc8356ec953bb184a57d2bb9ff8ac3c475034d7e5c6d754e32d3d373e5447827851ac258babe8add4eaa SHA512 9babc7d5023bbc6d864e38b99783bc86d662e89c2a9442ef390822c257cfdd6ae44c31887c88f793f9c795a28a9095907488422d167518a1168c0278fa8b74a4
 EBUILD puppetserver-8.6.3.ebuild 5352 BLAKE2B 4d688a0e03cc3b86f224fdb05a08534d85c99828e1eebc8356ec953bb184a57d2bb9ff8ac3c475034d7e5c6d754e32d3d373e5447827851ac258babe8add4eaa SHA512 9babc7d5023bbc6d864e38b99783bc86d662e89c2a9442ef390822c257cfdd6ae44c31887c88f793f9c795a28a9095907488422d167518a1168c0278fa8b74a4
+EBUILD puppetserver-8.7.0.ebuild 5352 BLAKE2B 4d688a0e03cc3b86f224fdb05a08534d85c99828e1eebc8356ec953bb184a57d2bb9ff8ac3c475034d7e5c6d754e32d3d373e5447827851ac258babe8add4eaa SHA512 9babc7d5023bbc6d864e38b99783bc86d662e89c2a9442ef390822c257cfdd6ae44c31887c88f793f9c795a28a9095907488422d167518a1168c0278fa8b74a4
 MISC metadata.xml 341 BLAKE2B 6e19f31ed866283c5827f9ca2550ca99c12d8b9506fbc13447d8bdad3ceaae844d3b103fe6cced8f829a75b7b1c317ef43bd2d1e885e9b509f70b8646a9e5bf6 SHA512 72945305ef496758676dba53925ebbd5cd0d01935fe82708559f941d831bf6b2ce34444d5b85a16b116f577596b2647183fe7b7c6ef92080a8e332fc0226d7ac
diff --git a/app-admin/puppetserver/puppetserver-8.7.0.ebuild b/app-admin/puppetserver/puppetserver-8.7.0.ebuild
new file mode 100644
index 000000000000..198d1e787156
--- /dev/null
+++ b/app-admin/puppetserver/puppetserver-8.7.0.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd tmpfiles
+
+DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents"
+HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
+SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="puppetdb"
+# will need the same keywords in puppet-agent (puppet-agent now has arm64)
+KEYWORDS="amd64"
+
+RDEPEND+="
+		>=virtual/jdk-11
+		app-admin/puppet-agent[puppetdb?]"
+DEPEND+="acct-user/puppet
+	acct-group/puppet"
+
+src_prepare() {
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die
+	sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
+	sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
+	sed -i 's/var\/run/run/g' install.sh || die
+	default
+}
+
+src_compile() {
+		einfo "not compiling"
+}
+
+src_install() {
+	insinto /opt/puppetlabs/server/apps/puppetserver
+	insopts -m0774
+	doins ext/ezbake-functions.sh
+	insopts -m0644
+	doins ext/ezbake.manifest
+	doins puppet-server-release.jar
+	insinto /etc/puppetlabs/puppetserver
+	doins ext/config/logback.xml
+	doins ext/config/request-logging.xml
+	insinto /etc/puppetlabs/puppetserver/services.d
+	doins ext/system-config/services.d/bootstrap.cfg
+	doins ext/config/services.d/ca.cfg
+	insinto /etc/puppetlabs/puppetserver/conf.d
+	doins ext/config/conf.d/puppetserver.conf
+	doins ext/config/conf.d/auth.conf
+	doins ext/config/conf.d/global.conf
+	doins ext/config/conf.d/web-routes.conf
+	doins ext/config/conf.d/metrics.conf
+	doins ext/config/conf.d/webserver.conf
+	insopts -m0755
+	insinto /opt/puppetlabs/server/apps/puppetserver/scripts
+	doins install.sh
+	insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
+	doins ext/cli/ca
+	doins ext/cli/irb
+	doins ext/cli/foreground
+	doins ext/cli/gem
+	doins ext/cli/ruby
+	doins ext/cli/reload
+	doins ext/cli/start
+	doins ext/cli/stop
+	insinto /opt/puppetlabs/server/apps/puppetserver/cli
+	doins ext/cli_defaults/cli-defaults.sh
+	insinto /opt/puppetlabs/server/apps/puppetserver/bin
+	doins ext/bin/puppetserver
+	insopts -m0644
+	dodir /opt/puppetlabs/server/bin
+	dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
+	dodir /opt/puppetlabs/bin
+	dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
+	dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
+	dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
+	# other sys stuff
+	dodir /etc/puppetlabs/code
+	# needed for systemd
+	keepdir /var/log/puppetlabs/puppetserver
+	dodir /etc/puppetlabs/puppet/ssl
+	fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
+	fperms -R 771 /etc/puppetlabs/puppet/ssl
+	# systemd type things
+	insinto /etc/systemd/system/puppetserver.service.d/
+	systemd_dounit ext/redhat/puppetserver.service
+	insinto /etc/default
+	newins ext/default puppetserver
+	# normal init type tasks
+	dosym ../default/puppetserver /etc/conf.d/puppetserver
+	newinitd "${FILESDIR}/puppetserver.init-r1" puppetserver
+	# misc
+	insinto /etc/logrotate.d
+	newins ext/puppetserver.logrotate.conf puppetserver
+	# cleanup
+	dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
+	fowners -R puppet:puppet /opt/puppetlabs/server/data
+	fperms -R 775 /opt/puppetlabs/server/data/puppetserver
+	fperms -R 700 /var/log/puppetlabs/puppetserver
+	insinto /opt/puppetlabs/server/data
+	doins ext/build-scripts/jruby-gem-list.txt
+	doins ext/build-scripts/mri-gem-list-no-dependencies.txt
+	newtmpfiles ext/puppetserver.tmpfiles.conf puppetserver.conf
+}
+
+pkg_postinst() {
+	tmpfiles_process puppetserver.conf
+
+	elog "to install you may want to run the following:"
+	elog
+	elog "puppet config set --section master vardir  /opt/puppetlabs/server/data/puppetserver"
+	elog "puppet config set --section master logdir  /var/log/puppetlabs/puppetserver"
+	elog "puppet config set --section master rundir  /run/puppetlabs/puppetserver"
+	elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
+	elog "puppet config set --section master codedir /etc/puppetlabs/code"
+	elog
+	elog "# install puppetserver gems"
+	elog "cd /opt/puppetlabs/server/apps/puppetserver"
+	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf"
+	elog "while read LINE; do"
+	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
+	elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt"
+	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf"
+	elog "while read LINE; do"
+	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document --ignore-dependencies \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
+	elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt"
+}
diff --git a/app-admin/ranpwd/Manifest b/app-admin/ranpwd/Manifest
index bb3d15e8e827..d99b2d823fc4 100644
--- a/app-admin/ranpwd/Manifest
+++ b/app-admin/ranpwd/Manifest
@@ -1,3 +1,3 @@
 DIST ranpwd-1.2.tar.gz 41018 BLAKE2B 787907c5ed7541f24846e4574c4e40005b85d33667d4ac2a85633085976d047271de797c2f1de3bb0e34cdd56b8b2b60ea8ae80b478c3f1d1124a413a01e351b SHA512 7ae8ff593623a2102e50fbb3356889291408263100a358de14bd44b13c1d2931bf0e1e8ec972a620b8328a179a38a0d614099ffea2473079f9ed2425809a922f
-EBUILD ranpwd-1.2.ebuild 559 BLAKE2B 765ed2e92f297d0916282e70579964564bfa8aea1a94ae5f74d42230880601144c9db0e7f8b71f2dd0f8ea99beda37ddb770732c9a08270ed872d35514309664 SHA512 7869d0d621e7278515c872c2734729e45490dda373b1e596e9214526966b3c6bd33e579fd0344e8ed5eb984ef48934c878516495f80d4ec1a760a3c5e7f374f7
+EBUILD ranpwd-1.2.ebuild 566 BLAKE2B 261c4fe509e1e868c8e4f8356a6953221f080c0b974d2f90d0c96abed0964b5949f743891a53f0fc15aa724458dafe72916e93d4855c6b183c518fc23b93f994 SHA512 8667039d2be74926c797ac9a41b4b2906aea18cf32d5c8dc9753b765997b9e4e5cf7e63c8135cc3364f50487fea1af31ae53b16224c28c50397000ac59e9e3f3
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/app-admin/ranpwd/ranpwd-1.2.ebuild b/app-admin/ranpwd/ranpwd-1.2.ebuild
index 057e17a6f3d6..2bcb389ebf17 100644
--- a/app-admin/ranpwd/ranpwd-1.2.ebuild
+++ b/app-admin/ranpwd/ranpwd-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://www.kernel.org/pub/software/utils/admin/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 ~riscv x86"
 
 src_test() {
 	einfo "generating random passwords"