gentoo auto-resync : 14:11:2024 - 03:02:32

10 files changed, 404 insertions, 15 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 39904b00d41a..55f4f246b1ae 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index a0a7df65c099..1cb38dcba972 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -2,8 +2,10 @@ DIST aws-cli-1.35.15.gh.tar.gz 2810766 BLAKE2B 18a8464acede1801a533da89191c31309
 DIST aws-cli-1.35.20.gh.tar.gz 2817368 BLAKE2B 92c86af16eb29a22c437491c938c08d4a2745067ed923c52f271de3fd249b8fc35d4f7aa9a6e523279c463f619294096b5e88d9800a53fc9d3c3a9ddeae1e507 SHA512 d2a1aafd3aba9441b6560e1a197c1c65c3597883ac93cd8c29e1c88f03cd554039ffaacd8df10392189de5ed0b11169b2d32c8a5513ab70cc0a9f331eb87813a
 DIST aws-cli-1.35.23.gh.tar.gz 2819656 BLAKE2B 6e9d20410344f075ce12bfc8c0a49941a846f02304de9a30516376d0b6666b8c0a9affb36dd94a463f48f17f478f5d27e0f7375a48c63eca1b3a28927211e6aa SHA512 9075af833da9abc9494a2dd01a987b874e2b4444d7d5d1f4f974da1b56940b88603e8ec115662c85c2beb7cb70a65c3bcdbbd5510a1973433f8030efc6a1c69a
 DIST aws-cli-1.35.24.gh.tar.gz 2820137 BLAKE2B 04783d2232433070fdd468070e9a924a8737212cd5013f5c296d8cb2f287c3dd0dc9ecd5b73656b807c45db02bf28a10dd2049f2a06ed29f93e73de4413fbf7f SHA512 36d4f9f692c3bf199bbfb5464a089be9904e58a597fc352e40c5438c5b45c7e74e8123952fd502b7d9869c4629f95f46d5b1a59b0d436a22668182efd8eccd22
+DIST aws-cli-1.36.0.gh.tar.gz 2821055 BLAKE2B cb6fa31e3f8377e52fe35a0eef47f49f48e35d1eacea9cd63182f12a2b8d2249329cc880c56e899b69fdb9dfc44446e236362e8d7564d31ff6f236cb21ae38d2 SHA512 c6cabe0fd752e87174a9e65a9185144dc128eee0e6d5f5915ea85e0b8aa5d62fb40fefdb8f8014f1a3ae93aaad23384e7e828a06f448df536924d97c7fbb92b1
 EBUILD awscli-1.35.15.ebuild 3240 BLAKE2B 89fc679334ea535c78d19b48324652d5d867d9348e002ed52dc3a9e2da19aac3d97b4b1584ed43f0233ecdbd40f8d68def7b89fcd94e0c947cec1b4f47d68be3 SHA512 c9c9827b23178d1a976c1292704f5c28df75d7fddea370baa37c385b783299e4f4f72eea597a54e81656844ef41d8419cc21e49558806d512662eccf4da60ef1
 EBUILD awscli-1.35.20.ebuild 3247 BLAKE2B 563e1df537df7a081ac11e541ee21cea26a8799434021b9f814dc2e4a46704be1f2edf529ac225e8a9f6b3a4a81815b30d2d25f782f3b9e1dbcc098367ab769f SHA512 cb54a636f6b46f0956577c1141d9f1f7f2887c0bd53c1eca061f214dfe88591ca2ab9e7e96daa9f9c2b2b14b969c1effd8085928db3d5fcfd61463da871dbdb2
 EBUILD awscli-1.35.23.ebuild 3172 BLAKE2B 0db9ea2a5367a9a5091fa3c233651013f1dc9bf9e9b9d6b31163a0e6251662bebb04ada8f04e9a880dc9079c0302765ceb9f8f56b71de617d23a0d23617388c5 SHA512 e6c01254fdc3e702e008ad3a6e7aed38c4c7fcb9339ba23e665495dfd330cf597cc2f465806f39f8a35da8dfa91c22b5136c672a2c8c38a42f62342f16c97d82
 EBUILD awscli-1.35.24.ebuild 3172 BLAKE2B 0db9ea2a5367a9a5091fa3c233651013f1dc9bf9e9b9d6b31163a0e6251662bebb04ada8f04e9a880dc9079c0302765ceb9f8f56b71de617d23a0d23617388c5 SHA512 e6c01254fdc3e702e008ad3a6e7aed38c4c7fcb9339ba23e665495dfd330cf597cc2f465806f39f8a35da8dfa91c22b5136c672a2c8c38a42f62342f16c97d82
+EBUILD awscli-1.36.0.ebuild 3186 BLAKE2B 63a0fb498273465997fdf8010dcec351d473545febb8aaf2c222c3176a00f0cce5edadbfbc778689949142466c05e371a017c07a54ce30deb7bd7ca86cdb1e82 SHA512 2db712c340a0d13e4f89a8ca4599cb89f83d11d519b2f90f1dcf72e903830d70ae31efbed50a958b98655e24327cc027c0c945bc061f9de7c8fbf4d45f2fa625
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.36.0.ebuild b/app-admin/awscli/awscli-1.36.0.ebuild
new file mode 100644
index 000000000000..2960403cf7e0
--- /dev/null
+++ b/app-admin/awscli/awscli-1.36.0.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/kio-admin/Manifest b/app-admin/kio-admin/Manifest
index 7d8af8e21fb2..8e32c61133d4 100644
--- a/app-admin/kio-admin/Manifest
+++ b/app-admin/kio-admin/Manifest
@@ -1,3 +1,3 @@
 DIST kio-admin-24.08.3.tar.xz 38688 BLAKE2B ededa0da867c76e45efec80d60e8f4c720fe7fa663d574dd910a35d5f7b77e8b8b5d23f0322b2f635dc34f7318351400e9c9f9e032f014a68ec3ecbf86f4054b SHA512 d357ce492798cbcc1f91933c0ded5c3d1c80c9fdb9d53a7e9c98038cf87825ccc10608c763e66b46410508d9afb52a9f93623e4dcad647657d0c5237395dc1b1
-EBUILD kio-admin-24.08.3.ebuild 602 BLAKE2B 9f25f33ceb401e93259cd08a7db2338c1dfc2402c4abc5605742f4d114050cd3a7d10fd2eb38e5458ce1b5801af1288495e3743d41d48653914078fe3548e038 SHA512 0cdbda80a448fca30c1c9ac292bd62f5aa302c764b349683af8a12c2444ddf13ab7f05c55303c3c687224505156a362859aed03c3dfa4370e2729c3c975ef7c1
+EBUILD kio-admin-24.08.3.ebuild 609 BLAKE2B a31cbe435ae599879c77e0b0d5641b1cf96d438a9d34aec819f2bdcbc5d8c66f1178b03cd20bc87ee0c4008d2e89db281a5831eab210e9b1a2cf4e056a273085 SHA512 ba47be66c049fc4e5ee31da3efc85d78b35a2775f81b31c553bd77f7479fc30b02affec89731e96e7305bdd71554b3b24bb5c489eb7c777d837ebc4e7373d29c
 MISC metadata.xml 409 BLAKE2B 806cca01eabcbaa961a219c8df865253d5eb4aac6f2d80a08715606ec9ac883990b8ce2ace14b53c47a81f4b061cdc489490c6d8bf8cf2dc53e16027675b1f12 SHA512 d3f45492aab35f8938f1ad59bb40a49a554e0da3fd530ff2d478911f323ad92badeabccae3c32f7256cd140cb3caac9d2bdb3e762becc2be1d0bb012e735c5a8
diff --git a/app-admin/kio-admin/kio-admin-24.08.3.ebuild b/app-admin/kio-admin/kio-admin-24.08.3.ebuild
index 2b9319ce0e21..e13863dc5d68 100644
--- a/app-admin/kio-admin/kio-admin-24.08.3.ebuild
+++ b/app-admin/kio-admin/kio-admin-24.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/system/kio-admin"
 
 LICENSE="BSD CC0-1.0 FSFAP GPL-2 GPL-3"
 SLOT="6"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 
 DEPEND="
 	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index d618b6a63e38..9df17035ddb3 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -3,7 +3,10 @@ DIST sudo-1.9.15p5.tar.gz 5306611 BLAKE2B 73ee598c2a2848d5be24f97492b13eba2f326c
 DIST sudo-1.9.15p5.tar.gz.sig 566 BLAKE2B ddd8fed1b3721aafdb32b762834168063c3f0f003ef5d83f1883615320da6fe89b08d72c8e893c8b2bf9fd892a40e47cc77d72672e43b5a24db50e7194d9bc4c SHA512 97480a3d27b546a93e997c3a1e8169904a7625ab8fa6198d0b7e1d2d040f55b2d58462cd08e5cc97c2f1c817b12343e35cdd7db207aee42785f2b95b17c600b0
 DIST sudo-1.9.16.tar.gz 5392026 BLAKE2B 19daa789af3ca2c4832950f0dd6f26a97285fdc155f0d7c18ec1f1accafce9b86f2f5730d3bb0b8e7717c0c55f4079928e03acb3974cb2652c58d4bcb2f74a12 SHA512 1b0254eb5b75422bffd31a2ae8c56cb4e8e2ecc08e2fa687eddb638d4f2de2585fa7621c868c03423e9d636bfb5679a3758d504155dbdfd3eebfbdcbd8b58f7c
 DIST sudo-1.9.16.tar.gz.sig 566 BLAKE2B 9eb9fd2db0de5b9ce965c2109a9722e0b5f0793b7c9003123b1540d7cb5b8178043221296fd51c7f0b24ce1b1cda9f196a6d50083da172ca2afcb8f130d8eae1 SHA512 edf066f9ffdf2653468f8b45866a65214f0dff0164318d5f6bd9252f6211e82522161b1b9621798fbc9112253e6940d7137d18e8b42e8c6e5ba52ccac64d99cf
+DIST sudo-1.9.16p1.tar.gz 5396038 BLAKE2B 7f973510658e91af54121d8c4c634b26231ef270abac50f658c9ad8a446a7dbbc44cb878561fb8da51e4ec15ebc8873fdaed05be142907f96964ff42c7e4f896 SHA512 3239d16513c431383b6d54cf40690a9b8fcf905d9b8f5a2085679dd5daeaacbd7efb153b41fd672fc634277c3203aaa1dc18e6a6c01799ebc9948763ec93a038
+DIST sudo-1.9.16p1.tar.gz.sig 566 BLAKE2B 0f68bb4a653cfaacf05d6c148f690ae0022035090e6e60df7efde6b25193ac46d12905ca898e5aadb8339ca3f08e27a4408edeb75f26f7e483f136026835aa24 SHA512 96cdd7f646d2fe7eeefce7710ba421be12a9bfd6811284ba8ccb3f7288b328531bbd7215cf0182c13670f2ec7c0ee25dfd6396214ddd61ee4ee153fec19bef7e
 EBUILD sudo-1.9.15_p5.ebuild 7388 BLAKE2B cd48d8c514c86908fb01f10037c82a75385a718207bfcf0539e4f8d6f5d385f00dcfe7e82ba31402fcb2519f9c8f552a5ddb613ad37775ec7f806d6424db174f SHA512 07ea0b437edec0110292d13f6e954314eafabcd21979844c91bb8553742b2813037d5ef553d0946e31644137a4b74cc5a3829f4528d76c64747400cf21cb384a
 EBUILD sudo-1.9.16-r1.ebuild 7625 BLAKE2B 9503977cb1a6daea79b5f111f9dabf2dd5450f34200cb6e5529fd23598067fa317457a3effe02ee2d45110546f464bae3ebee62c2fcdc825db7cf778ad8b6fb8 SHA512 9675bbfb42aed9d68478b8b87dc2e72687ab462c8e08bc40ee10fc529a68984d52acfdad2c98eab2b004793d292b59d6a05530502aa14c803e2abfe5ff149f6c
-EBUILD sudo-9999.ebuild 7625 BLAKE2B 9503977cb1a6daea79b5f111f9dabf2dd5450f34200cb6e5529fd23598067fa317457a3effe02ee2d45110546f464bae3ebee62c2fcdc825db7cf778ad8b6fb8 SHA512 9675bbfb42aed9d68478b8b87dc2e72687ab462c8e08bc40ee10fc529a68984d52acfdad2c98eab2b004793d292b59d6a05530502aa14c803e2abfe5ff149f6c
+EBUILD sudo-1.9.16_p1.ebuild 7494 BLAKE2B 46dfd1f715628f886c20ce3970d00722a423cca967d9d5809dc27cc15597e6ac92e08542fc2e7bb43f663843921405d3159192c64a09129d11e82d2596911959 SHA512 dfbec0ec4e137a1f71747a72c91bf255d04c3452b2c01c4cd75940ed0caa4e3521132c16e130d75a547c70871761d1dcaa5bfeb113bc7c17bded02f349d5a5a5
+EBUILD sudo-9999.ebuild 7494 BLAKE2B 46dfd1f715628f886c20ce3970d00722a423cca967d9d5809dc27cc15597e6ac92e08542fc2e7bb43f663843921405d3159192c64a09129d11e82d2596911959 SHA512 dfbec0ec4e137a1f71747a72c91bf255d04c3452b2c01c4cd75940ed0caa4e3521132c16e130d75a547c70871761d1dcaa5bfeb113bc7c17bded02f349d5a5a5
 MISC metadata.xml 1107 BLAKE2B a18b1d280445ea98ba686021abf08ab47a5ac590795018c125008f2a8e44f7ea45e256e32a737781030960cb984bc16d8fd23175fd1e88b294e5036c86085367 SHA512 8cacbd9a1a23fc7734c5ad8b95c769b8506ec35490b5e3f69439bf71bd51d1eaf04fe699a82cbb3ac56182195fff570d75e3b20c33d86774480a2939122752a6
diff --git a/app-admin/sudo/sudo-1.9.16_p1.ebuild b/app-admin/sudo/sudo-1.9.16_p1.ebuild
new file mode 100644
index 000000000000..5a882d3247ac
--- /dev/null
+++ b/app-admin/sudo/sudo-1.9.16_p1.ebuild
@@ -0,0 +1,291 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit pam 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 autotools mercurial
+	EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/sudo.ws.asc
+	inherit libtool 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 ~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
+
+	if [[ ${PV} == 9999 ]] ; then
+		eautoreconf
+	else
+		elibtoolize
+	fi
+}
+
+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)
+		"$(use_with secure-path secure-path-value "${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-9999.ebuild b/app-admin/sudo/sudo-9999.ebuild
index 6e25ed577a92..5a882d3247ac 100644
--- a/app-admin/sudo/sudo-9999.ebuild
+++ b/app-admin/sudo/sudo-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools pam tmpfiles toolchain-funcs
+inherit pam tmpfiles toolchain-funcs
 
 MY_P="${P/_/}"
 MY_P="${MY_P/beta/b}"
@@ -12,11 +12,11 @@ DESCRIPTION="Allows users or groups to run commands as other users"
 HOMEPAGE="https://www.sudo.ws/"
 
 if [[ ${PV} == 9999 ]] ; then
-	inherit mercurial
+	inherit autotools 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
+	inherit libtool verify-sig
 
 	uri_prefix=
 	case ${P} in
@@ -86,16 +86,14 @@ REQUIRED_USE="
 
 MAKEOPTS+=" SAMPLES="
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.9.16-allow-disabling-secure-path.patch
-)
-
 src_prepare() {
 	default
 
-	# eautoreconf temporarily for allow-disabling-secure-path patch
-	# in 1.9.16; revert to elibtoolize once that is gone.
-	eautoreconf
+	if [[ ${PV} == 9999 ]] ; then
+		eautoreconf
+	else
+		elibtoolize
+	fi
 }
 
 set_secure_path() {
diff --git a/app-admin/sysklogd/Manifest b/app-admin/sysklogd/Manifest
index 997fcff4be7f..4f40457ee98c 100644
--- a/app-admin/sysklogd/Manifest
+++ b/app-admin/sysklogd/Manifest
@@ -4,6 +4,6 @@ AUX sysklogd.rc10 443 BLAKE2B 04d5d645a6e79582ce4532fdf5eb4453c61e66017596c641b6
 DIST sysklogd-2.5.2.tar.gz 459292 BLAKE2B c61a89e80d6fde10f5955cf3a7a563fbe9e00799eb1199bc9a2995585c074e7ab2b4fe6a30ae8bc224876448a521c3be9031853ae4710db2555279789aeda95d SHA512 0c160236d0f5ec31d0c5679c04b6f0f40a35af2b5b159af8b2b9dd2d37f5959efbe550dfc50c0b0419bea702b91a6594f2e141c2fbb78fdb20715ee8b2d27805
 DIST sysklogd-2.6.2.tar.gz 462950 BLAKE2B 591bf168cd9249af888feefd45ed10b8f90e7bdb71c75fbc8a95867dba0abfd20c08b0bbc13f80de2eb9ccf69ab9f77690978963ce96bf17472d2c036f96bb15 SHA512 4fb5ccba9e94c273e92ca4a55c6a7234a3dd6bbfd4568c8227b515c0ac5eeb6fdca452c82c989432e86a667dcf13df87f96aef302141e6023d630dc90466224d
 EBUILD sysklogd-2.5.2-r1.ebuild 2081 BLAKE2B d195730424a0c8a3164734e6302302d14b1a5bee7d0d605a4d6c1bcd5415658da70436d4aabbf48aa8827f95ded5852b4e693589ad27c6aa977461abfb4cd16b SHA512 5d8143bf24ea059ee74396f8c5c16a5d5576b6c2ef74509f442f5a5a6a01d47340746f94baddb4f7cdb0e828c27c320657c147701a1121c0502693981717534b
-EBUILD sysklogd-2.6.2-r1.ebuild 2082 BLAKE2B 001bd7962fe3b7f6579a3255e85cecac377dc278cce5ef1929b7f5c55a4be07b50cb863507eda1a7043820fc07e8a5667a633d9a549af2ab2cac69343984ca37 SHA512 c4e3f736b06b004854671fb966cd3eceb9146b9f18c168a63a74f389cbb05fe6d8ce8c31ea58713f32f0bdd80d19efbdaf67253560ae264239e476cbd9197c24
+EBUILD sysklogd-2.6.2-r1.ebuild 2081 BLAKE2B d195730424a0c8a3164734e6302302d14b1a5bee7d0d605a4d6c1bcd5415658da70436d4aabbf48aa8827f95ded5852b4e693589ad27c6aa977461abfb4cd16b SHA512 5d8143bf24ea059ee74396f8c5c16a5d5576b6c2ef74509f442f5a5a6a01d47340746f94baddb4f7cdb0e828c27c320657c147701a1121c0502693981717534b
 EBUILD sysklogd-9999.ebuild 2088 BLAKE2B 75100f7070c0244a9449a1f164d5866cc09cdb97ecb00e604748dd0c7306163434226b8716a56d7c8af3845527f2f48bed376195e522514174006fb54feb6e3e SHA512 9448681727487c6ea8eeaabb30fe6ac90ff0cfdd4a3d04f61a74d3a3838a66d95faa14c01a778967dafbdb4b9475c9b45d0499fab8027ff7d66751a13b561917
 MISC metadata.xml 527 BLAKE2B c425ac629ecb84dc5e6df9d943d5366594bcfc95eac4f529720c97825f4192d4ecba8d3f5174110e654775faf368a73ef91117eb63123d09f5f6ae9880d6ddb6 SHA512 9a4deed01fed81180553cdac43d0a03967fea0aa2a1ce1747faf592abee998c8fde4744b5cd90adc3dbc324e62df7479c686297364010aeeafc09128981fee27
diff --git a/app-admin/sysklogd/sysklogd-2.6.2-r1.ebuild b/app-admin/sysklogd/sysklogd-2.6.2-r1.ebuild
index ccdb8c8cbc35..56b5bae68e17 100644
--- a/app-admin/sysklogd/sysklogd-2.6.2-r1.ebuild
+++ b/app-admin/sysklogd/sysklogd-2.6.2-r1.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 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="BSD"