gentoo auto-resync : 02:02:2024 - 05:44:58

8 files changed, 94 insertions, 580 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 2824f5a8f886..4c5c18bd3a0f 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 0b0749b35a69..baa94b583aea 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -4,10 +4,12 @@ DIST aws-cli-1.32.29.gh.tar.gz 2643387 BLAKE2B 0d07a5478c5a51baf743c97aa613611ae
 DIST aws-cli-1.32.30.gh.tar.gz 2644389 BLAKE2B 1cf06d774c83b1abfd91ab08100b6211a330ca30eb10a5312466dd14460b2db3588ac9318c412527f3fc8205f29852202b012ad09bde69bbdc601aae5fa0e48e SHA512 f2a746062460be4d87aa377e03cdc68e060cbf2121eedfb266d272c6930d71834decb869b9ff9cf03fc03c964634fe4451db6cc2aa1ecdeeba2762240ced8032
 DIST aws-cli-1.32.31.gh.tar.gz 2645915 BLAKE2B aa8a8668f2d88c0b4ea7f6a2398dfe3f0015fc83bd174dd14961ca5707420ee8e360ec90b2c05a464509046d6d16d1931950cb4d2876c22f875b35de6258f504 SHA512 1e96a61785b42d89ca17b81a2638c8fa017cbd44959a316f78171b0a4257caa120318d48646a8560aa87b70805aba63fb9e533c0715de7a56744e9c142304c95
 DIST aws-cli-1.32.32.gh.tar.gz 2646438 BLAKE2B 8f2f356b9a1a2df14cbe32102cff46e8c61796455eb910f2435e3d00793225262662de6b59d9d79e871806163093908dd1de6809cc45b84934a53f2b0651dd50 SHA512 6c78af166f88327cb505867a9f8b9431709f585ca92cf274add484c54d0ed1c4b014ac1bd9fa22e564ca495b2c28746c13e71607a2f8dc648f13fb206a912c13
+DIST aws-cli-1.32.33.gh.tar.gz 2647218 BLAKE2B 64b9d1e7f8a769ca30c002d80e302e161d6a4962bd248ff527a0b1682135a3e67e1a7d1c8db477da444b26fd6336c668de5ef7bc8acdabdbce10843b1eb61e18 SHA512 6a0b220220894079b2ad63b9340e07cb2a02165e9e334c9ff3b765d09287b3518dfb47ea6c77781fec6d1b732b663dad474640bc99e2421b280e2056bd237bc3
 EBUILD awscli-1.32.18.ebuild 2864 BLAKE2B 5bf1ffd344887c79c3e7baf37dfd7a00bac095342f0128d71407661ecd248843c2ec368ab0e7b7be0a7ff2c928faa01fa7c0eaad2163488752862f0cf6cd256c SHA512 eb2788ab3d268538d6a93a35d5f424cdfb6b69f5858c8ec1cbf91a3a7134f40aeabf5514cde51c81842646b795051a6cceebb3c46a14fe32431029aa3451d4ff
 EBUILD awscli-1.32.23.ebuild 2988 BLAKE2B 23cddded64b0ff1c61d8efd6df3a89dd60581110756af8581b76ffd69e7b905f2c3a0f5f53c06b5cc00a042c9125def2bbc839b440a2474c6af0008804d1722c SHA512 e9ffc0a602cacad8e3a75324901340366a4d7545e0644b52d52f45ba7026026c51eb33c63d123d9201e7d63acb6646e298855a15fffa2ba0a1f63c806d2d1cc3
 EBUILD awscli-1.32.29.ebuild 2988 BLAKE2B 23cddded64b0ff1c61d8efd6df3a89dd60581110756af8581b76ffd69e7b905f2c3a0f5f53c06b5cc00a042c9125def2bbc839b440a2474c6af0008804d1722c SHA512 e9ffc0a602cacad8e3a75324901340366a4d7545e0644b52d52f45ba7026026c51eb33c63d123d9201e7d63acb6646e298855a15fffa2ba0a1f63c806d2d1cc3
 EBUILD awscli-1.32.30.ebuild 2988 BLAKE2B 23cddded64b0ff1c61d8efd6df3a89dd60581110756af8581b76ffd69e7b905f2c3a0f5f53c06b5cc00a042c9125def2bbc839b440a2474c6af0008804d1722c SHA512 e9ffc0a602cacad8e3a75324901340366a4d7545e0644b52d52f45ba7026026c51eb33c63d123d9201e7d63acb6646e298855a15fffa2ba0a1f63c806d2d1cc3
 EBUILD awscli-1.32.31.ebuild 3029 BLAKE2B 580c774489759d94cbe5c77316c3afbb84d597198c391cd0ed89722c239fb23a87fc34378bd669e9104fbfaaa75a924c3d73e8df2c52693ba6fc135da827643d SHA512 4a31562305f7156e91d78023ed1f56e74de8fb1555323a5cd63611254daeb7491b8e323d00e38351d9bbc2a751f257290a6bb4bd91638e28f9c45acb8742c809
 EBUILD awscli-1.32.32.ebuild 3029 BLAKE2B 580c774489759d94cbe5c77316c3afbb84d597198c391cd0ed89722c239fb23a87fc34378bd669e9104fbfaaa75a924c3d73e8df2c52693ba6fc135da827643d SHA512 4a31562305f7156e91d78023ed1f56e74de8fb1555323a5cd63611254daeb7491b8e323d00e38351d9bbc2a751f257290a6bb4bd91638e28f9c45acb8742c809
+EBUILD awscli-1.32.33.ebuild 3029 BLAKE2B 580c774489759d94cbe5c77316c3afbb84d597198c391cd0ed89722c239fb23a87fc34378bd669e9104fbfaaa75a924c3d73e8df2c52693ba6fc135da827643d SHA512 4a31562305f7156e91d78023ed1f56e74de8fb1555323a5cd63611254daeb7491b8e323d00e38351d9bbc2a751f257290a6bb4bd91638e28f9c45acb8742c809
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.32.33.ebuild b/app-admin/awscli/awscli-1.32.33.ebuild
new file mode 100644
index 000000000000..4a677affdbc4
--- /dev/null
+++ b/app-admin/awscli/awscli-1.32.33.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit bash-completion-r1 distutils-r1
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local serial_tests=(
+		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
+		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
+		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
+		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
+		tests/unit/customizations/test_sessionmanager.py
+		tests/unit/test_compat.py::TestIgnoreUserSignals
+		tests/unit/test_help.py
+		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
+	)
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	EPYTEST_XDIST= epytest "${serial_tests[@]}"
+
+	local EPYTEST_DESELECT=( "${serial_tests[@]}" )
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit}
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index fa4ba8bc1c31..a66a489ecb76 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,11 +1,5 @@
-DIST sudo-1.9.15p2.tar.gz 5303642 BLAKE2B 002f820d6d82b3384a9206545a999765c2924b2650fd7f6331c191e3f631507064d71a042c606b4fcea0d518d38b5a24d3f44964bb09cb5774e50501abc3f524 SHA512 219fc138fb4850fff30c44a6dab767402172d545a83d31dba4a2a9ce27f8a9fe14f1f24f4e328517f2dd26e84906db5d2be388a9c82e89f5ca59740bb782a608
-DIST sudo-1.9.15p2.tar.gz.sig 566 BLAKE2B e526f608c11abdf2e762dd273106e5934273a42596f00afaa64826f6f56714ff8186f7e1d9233b56cae8d2aed657565f87c976437727880f674e2ef42f93560a SHA512 1b0692a19966e3a2db82d064a17312bfcab454bc9eba0e9fe7ce3dcee0507704767655c30443cb87e0b7d2015317fd38d990ccf66cd18bb47fdf6e43494d6d8e
-DIST sudo-1.9.15p4.tar.gz 5304804 BLAKE2B 011d8ee099bfc16cff141dabffd0ce2befa7fdc834108759e9fdc3c2c11c3bca02eb0c410915394b1b3e3725fbb08544f98ffa584299dbce0db2b49234c0550a SHA512 db7e2270a7303b60ecd782605c24c4b4ba6478a145a5eed1084af6202ad30c0c93725b6690ae46ff484efcfa34437991a40d7d5699fdb84af1e4c5a2aa99194f
-DIST sudo-1.9.15p4.tar.gz.sig 566 BLAKE2B 79ac7e75a3d6d9bc4559611bc98a1fcdc4e34472dc16942ec9cf9c4614d8bdace5ff16689ed067b139a40d3d01cc6c1794d9e511afe4a75c8b50401e158d4a72 SHA512 1ec52c8f2a0e50a0cfa622ce58fcbb68f05d93972d84cc08733eb88b66914022b211e740eef3a44452e0a30f498563573c8d96a6422b1211c9c8f50e58837195
 DIST sudo-1.9.15p5.tar.gz 5306611 BLAKE2B 73ee598c2a2848d5be24f97492b13eba2f326c514799220e43a1aeafc6692224a7555fb7cc0a96a2720751d3e4d98e752804db589ac3c1476f24e71f5b9bc720 SHA512 ebac69719de2fe7bd587924701bdd24149bf376a68b17ec02f69b2b96d4bb6fa5eb8260a073ec5ea046d3ac69bb5b1c0b9d61709fe6a56f1f66e40817a70b15a
 DIST sudo-1.9.15p5.tar.gz.sig 566 BLAKE2B ddd8fed1b3721aafdb32b762834168063c3f0f003ef5d83f1883615320da6fe89b08d72c8e893c8b2bf9fd892a40e47cc77d72672e43b5a24db50e7194d9bc4c SHA512 97480a3d27b546a93e997c3a1e8169904a7625ab8fa6198d0b7e1d2d040f55b2d58462cd08e5cc97c2f1c817b12343e35cdd7db207aee42785f2b95b17c600b0
-EBUILD sudo-1.9.15_p2.ebuild 7392 BLAKE2B 4ab5117908a052176c1ce192a52e0bd4d002ec048d3c450be1b27c0972dcb8f4202190f673c27e3ead2b1c3c863f771c6ed98c13aff665961f8ac96dfa29eb16 SHA512 9db7de90b298d6de961ab10921dba516ee173c7504a1411d5dc5821dec6bda5b830f8f487544a493ada7ccbdc56f6b59877bc991450c31f5346ba2ddf63fdfde
-EBUILD sudo-1.9.15_p4.ebuild 7396 BLAKE2B 462323df4ae8fe3dba4aaed720d24e62a287e7d81a209901fc20a4630a02c3318328145e105980cd21235c18d55d50a58b0ecc222cb82284a82b92f581bb3d0e SHA512 8ab4c1bbc0ea6781d9fd3634547850431234c8513eadacc48cbf6584db6081a25ebf657e5c6bb8c8ae5a032e707148d9943569b9f8b88848b375662ff9fcba9b
 EBUILD sudo-1.9.15_p5.ebuild 7392 BLAKE2B 4ab5117908a052176c1ce192a52e0bd4d002ec048d3c450be1b27c0972dcb8f4202190f673c27e3ead2b1c3c863f771c6ed98c13aff665961f8ac96dfa29eb16 SHA512 9db7de90b298d6de961ab10921dba516ee173c7504a1411d5dc5821dec6bda5b830f8f487544a493ada7ccbdc56f6b59877bc991450c31f5346ba2ddf63fdfde
 EBUILD sudo-9999.ebuild 7400 BLAKE2B 7f3ec8f785d65f4c3e3f45419a6329b9c81dfe75c52050417367817a35b1cecfc2241e2acdbae52257e32c3c5041cabf2aba731e9c167b6a4df654942c59eabc SHA512 979aefb72bc0fd32ba9bf62e782639e2feb0742290e89585b547cc3a62ede989eb996fc1413e1aa94b8071286a36ac59bb721d6a39b6941dc3556f42d8ed503d
 MISC metadata.xml 1107 BLAKE2B a18b1d280445ea98ba686021abf08ab47a5ac590795018c125008f2a8e44f7ea45e256e32a737781030960cb984bc16d8fd23175fd1e88b294e5036c86085367 SHA512 8cacbd9a1a23fc7734c5ad8b95c769b8506ec35490b5e3f69439bf71bd51d1eaf04fe699a82cbb3ac56182195fff570d75e3b20c33d86774480a2939122752a6
diff --git a/app-admin/sudo/sudo-1.9.15_p2.ebuild b/app-admin/sudo/sudo-1.9.15_p2.ebuild
deleted file mode 100644
index b130fe70e0ad..000000000000
--- a/app-admin/sudo/sudo-1.9.15_p2.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pam libtool tmpfiles toolchain-funcs
-
-MY_P="${P/_/}"
-MY_P="${MY_P/beta/b}"
-
-DESCRIPTION="Allows users or groups to run commands as other users"
-HOMEPAGE="https://www.sudo.ws/"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit mercurial
-	EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/sudo.ws.asc
-	inherit verify-sig
-
-	uri_prefix=
-	case ${P} in
-		*_beta*|*_rc*) uri_prefix=beta/ ;;
-	esac
-
-	SRC_URI="
-		https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
-		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz
-		verify-sig? (
-			https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz.sig
-			ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz.sig
-		)
-	"
-
-	if [[ ${PV} != *_beta* && ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-	fi
-
-	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-sudo )"
-fi
-
-S="${WORKDIR}/${MY_P}"
-
-# Basic license is ISC-style as-is, some files are released under
-# 3-clause BSD license
-LICENSE="ISC BSD"
-SLOT="0"
-IUSE="gcrypt ldap nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd"
-
-DEPEND="
-	sys-libs/zlib:=
-	virtual/libcrypt:=
-	gcrypt? ( dev-libs/libgcrypt:= )
-	ldap? (
-		>=net-nds/openldap-2.1.30-r1:=
-		sasl? (
-			dev-libs/cyrus-sasl
-			net-nds/openldap:=[sasl]
-		)
-	)
-	pam? ( sys-libs/pam )
-	sasl? ( dev-libs/cyrus-sasl )
-	selinux? ( sys-libs/libselinux )
-	skey? ( >=sys-auth/skey-1.1.5-r1 )
-	ssl? ( dev-libs/openssl:= )
-	sssd? ( sys-auth/sssd[sudo] )
-"
-RDEPEND="
-	${DEPEND}
-	>=app-misc/editor-wrapper-3
-	virtual/editor
-	ldap? ( dev-lang/perl )
-	pam? ( sys-auth/pambase )
-	selinux? ( sec-policy/selinux-sudo )
-	sendmail? ( virtual/mta )
-"
-BDEPEND+="
-	app-alternatives/yacc
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="
-	?? ( pam skey )
-	?? ( gcrypt ssl )
-"
-
-MAKEOPTS+=" SAMPLES="
-
-src_prepare() {
-	default
-
-	elibtoolize
-}
-
-set_secure_path() {
-	# First extract the default ROOTPATH from build env
-	SECURE_PATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env; echo "${ROOTPATH}")
-
-	case "${SECURE_PATH}" in
-		*/usr/sbin*)
-			;;
-		*)
-			SECURE_PATH=$(unset PATH; . "${EPREFIX}"/etc/profile.env; echo "${PATH}")
-			;;
-	esac
-
-	if [[ -z ${SECURE_PATH} ]] ; then
-		ewarn "	Failed to detect SECURE_PATH, please report this"
-	fi
-
-	# Then remove duplicate path entries
-	cleanpath() {
-		local newpath thisp IFS=:
-		for thisp in $1 ; do
-			if [[ :${newpath}: != *:${thisp}:* ]] ; then
-				newpath+=:${thisp}
-			else
-				einfo "   Duplicate entry ${thisp} removed..."
-			fi
-		done
-		SECURE_PATH=${newpath#:}
-	}
-	cleanpath /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}}
-
-	# Finally, strip gcc paths, bug #136027
-	rmpath() {
-		local e newpath thisp IFS=:
-		for thisp in ${SECURE_PATH} ; do
-			for e ; do
-				[[ ${thisp} == ${e} ]] && continue 2 ;
-			done
-			newpath+=:${thisp}
-		done
-		SECURE_PATH=${newpath#:}
-	}
-	rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
-}
-
-src_configure() {
-	local SECURE_PATH
-
-	set_secure_path
-
-	# bug #767712
-	tc-export PKG_CONFIG
-
-	# - audit: somebody got to explain me how I can test this before I
-	# enable it.. - Diego
-	# - plugindir: autoconf code is crappy and does not delay evaluation
-	# until `make` time, so we have to use a full path here rather than
-	# basing off other values.
-	local myeconfargs=(
-		# We set all of the relevant options by ourselves (patched
-		# into the toolchain) and setting these in the build system
-		# actually causes a downgrade when using e.g. -D_FORTIFY_SOURCE=3
-		# (it'll downgrade to =2). So, this has no functional effect on
-		# the hardening for users. It's safe.
-		--disable-hardening
-
-		# requires some python eclass
-		--disable-python
-		--enable-tmpfiles.d="${EPREFIX}"/usr/lib/tmpfiles.d
-		--enable-zlib=system
-		--with-editor="${EPREFIX}"/usr/libexec/editor
-		--with-env-editor
-		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
-		--with-rundir="${EPREFIX}"/run/sudo
-		--with-vardir="${EPREFIX}"/var/db/sudo
-		--without-linux-audit
-		--without-opie
-		$(use_enable gcrypt)
-		$(use_enable nls)
-		$(use_enable sasl)
-		$(use_enable ssl openssl)
-		$(use_with ldap)
-		$(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
-		$(use_with offensive insults)
-		$(use_with offensive all-insults)
-		$(use_with pam)
-		$(use_with pam pam-login)
-		$(use_with secure-path secure-path "${SECURE_PATH}")
-		$(use_with selinux)
-		$(use_with sendmail)
-		$(use_with skey)
-		$(use_with sssd)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if use ldap ; then
-		dodoc README.LDAP.md
-
-		cat <<-EOF > "${T}"/ldap.conf.sudo
-		# See ldap.conf(5) and README.LDAP.md for details
-		# This file should only be readable by root
-
-		# supported directives: host, port, ssl, ldap_version
-		# uri, binddn, bindpw, sudoers_base, sudoers_debug
-		# tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
-		EOF
-
-		if use sasl ; then
-			cat <<-EOF >> "${T}"/ldap.conf.sudo
-
-			# SASL directives: use_sasl, sasl_mech, sasl_auth_id
-			# sasl_secprops, rootuse_sasl, rootsasl_auth_id, krb5_ccname
-			EOF
-		fi
-
-		insinto /etc
-		doins "${T}"/ldap.conf.sudo
-		fperms 0440 /etc/ldap.conf.sudo
-
-		insinto /etc/openldap/schema
-		newins docs/schema.OpenLDAP sudo.schema
-	fi
-
-	if use pam ; then
-		pamd_mimic system-auth sudo auth account session
-		pamd_mimic system-auth sudo-i auth account session
-	fi
-
-	keepdir /var/db/sudo/lectured
-	fperms 0700 /var/db/sudo/lectured
-	# bug #652958
-	fperms 0711 /var/db/sudo
-
-	# Don't install into /run as that is a tmpfs most of the time
-	# (bug #504854)
-	rm -rf "${ED}"/run || die
-
-	# bug #697812
-	find "${ED}" -type f -name "*.la" -delete || die
-}
-
-pkg_postinst() {
-	tmpfiles_process sudo.conf
-
-	# bug #652958
-	local sudo_db="${EROOT}/var/db/sudo"
-	if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then
-		chmod 711 "${sudo_db}" || die
-	fi
-
-	if use ldap ; then
-		ewarn
-		ewarn "sudo uses the ${ROOT}/etc/ldap.conf.sudo file for ldap configuration."
-		ewarn
-		if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
-			ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
-			ewarn "configured in ${ROOT}/etc/nsswitch.conf."
-			ewarn
-			ewarn "To make use of LDAP, add this line to your ${ROOT}/etc/nsswitch.conf:"
-			ewarn "  sudoers: ldap files"
-			ewarn
-		fi
-	fi
-	if use prefix ; then
-		ewarn
-		ewarn "To use sudo on Prefix, you need to change file ownership and permissions"
-		ewarn "with root privileges, as follows:"
-		ewarn
-		ewarn "  # chown root:root ${EPREFIX}/usr/bin/sudo"
-		ewarn "  # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
-		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers"
-		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers.d"
-		ewarn "  # chown root:root ${EPREFIX}/var/db/sudo"
-		ewarn "  # chmod 4111 ${EPREFIX}/usr/bin/sudo"
-		ewarn
-	fi
-
-	elog "To use the -A (askpass) option, you need to install a compatible"
-	elog "password program from the following list. Starred packages will"
-	elog "automatically register for the use with sudo (but will not force"
-	elog "the -A option):"
-	elog ""
-	elog " [*] net-misc/ssh-askpass-fullscreen"
-	elog "     net-misc/x11-ssh-askpass"
-	elog ""
-	elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
-	elog "variable to the program you want to use."
-}
diff --git a/app-admin/sudo/sudo-1.9.15_p4.ebuild b/app-admin/sudo/sudo-1.9.15_p4.ebuild
deleted file mode 100644
index 5a3980e3142b..000000000000
--- a/app-admin/sudo/sudo-1.9.15_p4.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pam libtool tmpfiles toolchain-funcs
-
-MY_P="${P/_/}"
-MY_P="${MY_P/beta/b}"
-
-DESCRIPTION="Allows users or groups to run commands as other users"
-HOMEPAGE="https://www.sudo.ws/"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit mercurial
-	EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/sudo.ws.asc
-	inherit verify-sig
-
-	uri_prefix=
-	case ${P} in
-		*_beta*|*_rc*) uri_prefix=beta/ ;;
-	esac
-
-	SRC_URI="
-		https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
-		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz
-		verify-sig? (
-			https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz.sig
-			ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz.sig
-		)
-	"
-
-	if [[ ${PV} != *_beta* && ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86"
-	fi
-
-	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-sudo )"
-fi
-
-S="${WORKDIR}/${MY_P}"
-
-# Basic license is ISC-style as-is, some files are released under
-# 3-clause BSD license
-LICENSE="ISC BSD"
-SLOT="0"
-IUSE="gcrypt ldap nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd"
-
-DEPEND="
-	sys-libs/zlib:=
-	virtual/libcrypt:=
-	gcrypt? ( dev-libs/libgcrypt:= )
-	ldap? (
-		>=net-nds/openldap-2.1.30-r1:=
-		sasl? (
-			dev-libs/cyrus-sasl
-			net-nds/openldap:=[sasl]
-		)
-	)
-	pam? ( sys-libs/pam )
-	sasl? ( dev-libs/cyrus-sasl )
-	selinux? ( sys-libs/libselinux )
-	skey? ( >=sys-auth/skey-1.1.5-r1 )
-	ssl? ( dev-libs/openssl:= )
-	sssd? ( sys-auth/sssd[sudo] )
-"
-RDEPEND="
-	${DEPEND}
-	>=app-misc/editor-wrapper-3
-	virtual/editor
-	ldap? ( dev-lang/perl )
-	pam? ( sys-auth/pambase )
-	selinux? ( sec-policy/selinux-sudo )
-	sendmail? ( virtual/mta )
-"
-BDEPEND+="
-	app-alternatives/yacc
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="
-	?? ( pam skey )
-	?? ( gcrypt ssl )
-"
-
-MAKEOPTS+=" SAMPLES="
-
-src_prepare() {
-	default
-
-	elibtoolize
-}
-
-set_secure_path() {
-	# First extract the default ROOTPATH from build env
-	SECURE_PATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env; echo "${ROOTPATH}")
-
-	case "${SECURE_PATH}" in
-		*/usr/sbin*)
-			;;
-		*)
-			SECURE_PATH=$(unset PATH; . "${EPREFIX}"/etc/profile.env; echo "${PATH}")
-			;;
-	esac
-
-	if [[ -z ${SECURE_PATH} ]] ; then
-		ewarn "	Failed to detect SECURE_PATH, please report this"
-	fi
-
-	# Then remove duplicate path entries
-	cleanpath() {
-		local newpath thisp IFS=:
-		for thisp in $1 ; do
-			if [[ :${newpath}: != *:${thisp}:* ]] ; then
-				newpath+=:${thisp}
-			else
-				einfo "   Duplicate entry ${thisp} removed..."
-			fi
-		done
-		SECURE_PATH=${newpath#:}
-	}
-	cleanpath /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}}
-
-	# Finally, strip gcc paths, bug #136027
-	rmpath() {
-		local e newpath thisp IFS=:
-		for thisp in ${SECURE_PATH} ; do
-			for e ; do
-				[[ ${thisp} == ${e} ]] && continue 2 ;
-			done
-			newpath+=:${thisp}
-		done
-		SECURE_PATH=${newpath#:}
-	}
-	rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
-}
-
-src_configure() {
-	local SECURE_PATH
-
-	set_secure_path
-
-	# bug #767712
-	tc-export PKG_CONFIG
-
-	# - audit: somebody got to explain me how I can test this before I
-	# enable it.. - Diego
-	# - plugindir: autoconf code is crappy and does not delay evaluation
-	# until `make` time, so we have to use a full path here rather than
-	# basing off other values.
-	local myeconfargs=(
-		# We set all of the relevant options by ourselves (patched
-		# into the toolchain) and setting these in the build system
-		# actually causes a downgrade when using e.g. -D_FORTIFY_SOURCE=3
-		# (it'll downgrade to =2). So, this has no functional effect on
-		# the hardening for users. It's safe.
-		--disable-hardening
-
-		# requires some python eclass
-		--disable-python
-		--enable-tmpfiles.d="${EPREFIX}"/usr/lib/tmpfiles.d
-		--enable-zlib=system
-		--with-editor="${EPREFIX}"/usr/libexec/editor
-		--with-env-editor
-		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
-		--with-rundir="${EPREFIX}"/run/sudo
-		--with-vardir="${EPREFIX}"/var/db/sudo
-		--without-linux-audit
-		--without-opie
-		$(use_enable gcrypt)
-		$(use_enable nls)
-		$(use_enable sasl)
-		$(use_enable ssl openssl)
-		$(use_with ldap)
-		$(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
-		$(use_with offensive insults)
-		$(use_with offensive all-insults)
-		$(use_with pam)
-		$(use_with pam pam-login)
-		$(use_with secure-path secure-path "${SECURE_PATH}")
-		$(use_with selinux)
-		$(use_with sendmail)
-		$(use_with skey)
-		$(use_with sssd)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if use ldap ; then
-		dodoc README.LDAP.md
-
-		cat <<-EOF > "${T}"/ldap.conf.sudo
-		# See ldap.conf(5) and README.LDAP.md for details
-		# This file should only be readable by root
-
-		# supported directives: host, port, ssl, ldap_version
-		# uri, binddn, bindpw, sudoers_base, sudoers_debug
-		# tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
-		EOF
-
-		if use sasl ; then
-			cat <<-EOF >> "${T}"/ldap.conf.sudo
-
-			# SASL directives: use_sasl, sasl_mech, sasl_auth_id
-			# sasl_secprops, rootuse_sasl, rootsasl_auth_id, krb5_ccname
-			EOF
-		fi
-
-		insinto /etc
-		doins "${T}"/ldap.conf.sudo
-		fperms 0440 /etc/ldap.conf.sudo
-
-		insinto /etc/openldap/schema
-		newins docs/schema.OpenLDAP sudo.schema
-	fi
-
-	if use pam ; then
-		pamd_mimic system-auth sudo auth account session
-		pamd_mimic system-auth sudo-i auth account session
-	fi
-
-	keepdir /var/db/sudo/lectured
-	fperms 0700 /var/db/sudo/lectured
-	# bug #652958
-	fperms 0711 /var/db/sudo
-
-	# Don't install into /run as that is a tmpfs most of the time
-	# (bug #504854)
-	rm -rf "${ED}"/run || die
-
-	# bug #697812
-	find "${ED}" -type f -name "*.la" -delete || die
-}
-
-pkg_postinst() {
-	tmpfiles_process sudo.conf
-
-	# bug #652958
-	local sudo_db="${EROOT}/var/db/sudo"
-	if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then
-		chmod 711 "${sudo_db}" || die
-	fi
-
-	if use ldap ; then
-		ewarn
-		ewarn "sudo uses the ${ROOT}/etc/ldap.conf.sudo file for ldap configuration."
-		ewarn
-		if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
-			ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
-			ewarn "configured in ${ROOT}/etc/nsswitch.conf."
-			ewarn
-			ewarn "To make use of LDAP, add this line to your ${ROOT}/etc/nsswitch.conf:"
-			ewarn "  sudoers: ldap files"
-			ewarn
-		fi
-	fi
-	if use prefix ; then
-		ewarn
-		ewarn "To use sudo on Prefix, you need to change file ownership and permissions"
-		ewarn "with root privileges, as follows:"
-		ewarn
-		ewarn "  # chown root:root ${EPREFIX}/usr/bin/sudo"
-		ewarn "  # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
-		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers"
-		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers.d"
-		ewarn "  # chown root:root ${EPREFIX}/var/db/sudo"
-		ewarn "  # chmod 4111 ${EPREFIX}/usr/bin/sudo"
-		ewarn
-	fi
-
-	elog "To use the -A (askpass) option, you need to install a compatible"
-	elog "password program from the following list. Starred packages will"
-	elog "automatically register for the use with sudo (but will not force"
-	elog "the -A option):"
-	elog ""
-	elog " [*] net-misc/ssh-askpass-fullscreen"
-	elog "     net-misc/x11-ssh-askpass"
-	elog ""
-	elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
-	elog "variable to the program you want to use."
-}
diff --git a/app-admin/sysklogd/Manifest b/app-admin/sysklogd/Manifest
index 94273a359e94..24caf6b4c2a1 100644
--- a/app-admin/sysklogd/Manifest
+++ b/app-admin/sysklogd/Manifest
@@ -8,6 +8,6 @@ DIST sysklogd-2.5.2.tar.gz 459292 BLAKE2B c61a89e80d6fde10f5955cf3a7a563fbe9e007
 EBUILD sysklogd-2.4.4.ebuild 2100 BLAKE2B 9445ba98080898d1423312f377c871742a2d3c1cc14555418743cbe567d2e165dd1aca21ec8ce713e679a343140b914e140ea95c4d3eb58e7c704511d1a4ce9b SHA512 6098d606062db317788d64b74d0acdc5425c7dae3180c4a08bdca4c182482d3a02c05511604f00adb09175a10a6a99456c482f2aea1dc11921eaa98045902f39
 EBUILD sysklogd-2.5.0.ebuild 2064 BLAKE2B acf2bd8b56cae02e6cfd784a1dafc4c98edde26ba41830f3e2d5621a357280fafed0a588826e2848d97bd596648e94d13e5ad9491a2fb2e07c343ab9652c2852 SHA512 e27ba295080d0865b0ed1079cda1547219b6d4adab587431b4afaaf3c20a5795a23fa46c10b29cb763bd7ecbd6e80407c3a41503e3cb88a2587ef58571adbca4
 EBUILD sysklogd-2.5.1.ebuild 2058 BLAKE2B 3e5de04bdcc0f4b37ed75164c97645e90207683c8eb30acf82520b98c1cdfec50caee7ea4943305a7d12733c743d26cef88794ba6fe031e365d0cd9403a32f6c SHA512 556eb56bfa4a060d33fa187b2e2c202ad87c20931ea1729ec00164bbe59a5589ecd379acb7f0ab9d954a473e723aea19ba97acd75d1295d16a018e35bbd7a2b4
-EBUILD sysklogd-2.5.2.ebuild 2059 BLAKE2B 3b0b568afe58e36dc9a89011cf3f26743cf41d0be66eaea3adc520a751f53123edd6d614bdc9895fe5cb8b0f78ca19792fe4ff064a8feea68d3ccf8d2b7acdfc SHA512 cf3d52db988b1325b9eb6de087cc57310b4e4b295a2d51b527e475ab7df78997b6e2bc7d1faac1f565e910c72703ecdf1cfc3c481407053d0ded5a252a438905
+EBUILD sysklogd-2.5.2.ebuild 2057 BLAKE2B fa3cf843245663088650bcb4558476286360f5c12c19ebf67b38d742c1763bcd082dc224ac4331009a1c87d011eee4e80fbdcbfaa9a9193d0b1b353017570de3 SHA512 9a3eb11fa649ad666cdc61db52016ff18cc1ba47f77539d05d41c3c97d942fa155abe0f4019b1e7135e30fe2921dbcc2c4d7f4d472956942f927bcf66784b322
 EBUILD sysklogd-9999.ebuild 2064 BLAKE2B acf2bd8b56cae02e6cfd784a1dafc4c98edde26ba41830f3e2d5621a357280fafed0a588826e2848d97bd596648e94d13e5ad9491a2fb2e07c343ab9652c2852 SHA512 e27ba295080d0865b0ed1079cda1547219b6d4adab587431b4afaaf3c20a5795a23fa46c10b29cb763bd7ecbd6e80407c3a41503e3cb88a2587ef58571adbca4
 MISC metadata.xml 527 BLAKE2B c425ac629ecb84dc5e6df9d943d5366594bcfc95eac4f529720c97825f4192d4ecba8d3f5174110e654775faf368a73ef91117eb63123d09f5f6ae9880d6ddb6 SHA512 9a4deed01fed81180553cdac43d0a03967fea0aa2a1ce1747faf592abee998c8fde4744b5cd90adc3dbc324e62df7479c686297364010aeeafc09128981fee27
diff --git a/app-admin/sysklogd/sysklogd-2.5.2.ebuild b/app-admin/sysklogd/sysklogd-2.5.2.ebuild
index f125f3aced85..60d1d34765ce 100644
--- a/app-admin/sysklogd/sysklogd-2.5.2.ebuild
+++ b/app-admin/sysklogd/sysklogd-2.5.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/troglobit/sysklogd.git"
 else
 	SRC_URI="https://github.com/troglobit/sysklogd/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="BSD"