2023-06-28 23:10:01+00:00

37 files changed, 59 insertions, 769 deletions

diff --git a/Manifest b/Manifest
index 35282aefb8f39..9617a865c5856 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29294 BLAKE2B 7ad3028be2acc0c06ee68ab81198f7080fd1941720f33fd6941e091e6028258a23b0ddb3d35f0238e0f427c5795863e0ca5ed698cfe40e849ff60705eff61bc9 SHA512 a7175ccd013353fa19c482976a17fa00f0afcaa6e45932cc253dabfcda51dc200cc84690f21d9f0dfbcee122e75f3021ea453745f70b25e41f297356020b8357
-TIMESTAMP 2023-06-28T22:39:57Z
+MANIFEST Manifest.files.gz 29296 BLAKE2B 79708a7791ec5a384e942db140b91039a960fd55adfe9a0cd9d7c55750f9bf3d862221a6cfc8174e104d5cb2ecfb6c5b801877d80e576bbb39545af3107b8541 SHA512 8680c5c03f7d8277b52dc33909e443b474bdc83834e71696d934f1d9d5df631ae175590ff34bddd98b99bf71b16d6163225b3771952d1b2392a5ee2fa04b10b9
+TIMESTAMP 2023-06-28T23:10:08Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmSctr1fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmScvdBfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDBMA//T1onbHLHlPcAWtzavm3ruR2tfAkiOIezlo7Z8dgE/6kwWbWr/mET1XFH
-xSE483uak8CVAUeBKFQGQdgpz6qvyy9H2ZcNJ0Crt4hrICMnWw1EBe4lUv9EJHRY
-whgywWPhLH9bz7dCSKRx5bZWKU5rj6iC/FUDUZ30hmsEKjb/BHXwgGCTSr2FAU1R
-QH3cGm+xdjDno7fHaJYoiqu/sr3uCGBU6du8DcZmmu3gEd4R2VXwnQBh9XXoEVQs
-iJEX+OKLxhCOOFHhlBTq6pqrhPimi/J1D0Qcxy68NlCORsVfg2Hkcy59/ZjQ5wB4
-gNjdpSDWK346NSVSP+j5OYVUKqfd/FtzHHi5k+xUBOKvw8o4UeEnmbrndSNOi9xq
-Umb/9fRXWpwrVfuPD5okXKGgpMSPqZnHh7TTrl3/yh2KPjOZb7E5oikCgFPmpnS3
-M11RoT8meg2+usmqOhgV+d6slL5OG7RzzSwxOXuWuAjbmVg9tGMp/0+ghqgaJM97
-9Y6OZvOMPDFIXgj4cxPkCv/oTUWKAT2Hq8CVuZMMvg6+kuTBOzwixLKY04Kws/jp
-IBeELkqEsAfn+2C4qyAvBJAJuE4+hsm0D4PyPVjZu1ncizTt8S5pNJOwhTH76JuV
-LLruqwAm827M+U0N6MalvDTkLqQLhAASLMEIe/g3guTHzsp/Uvg=
-=l/Aw
+klBmwg//TWDzuYUaM1k6R3m6YhsbTTAJFV2h/vd5cwoQkV6tmY7OlmPhhAFRbThT
+re0WR5EhVSvu5qV9c5NhKDyU89zydHd4gu4z/G+bsHYOm2NGIndAUmX5sPbdg993
+NfshNf7WNb/MobSiI5NT/CfcBMFBfLMvLVwL70JozrGwf+Prqa8EngGrZAshtjVK
+oiCH6uolx2NpxSAakheMzJX7N5GQ1pnLYPSVWGkGgTJUEnnxqF/95RrKZ6Bcmb9e
+Lb7c5jzegGsH6tsVzx6PczZ+6lnMDuF6hnLbI8fSXYpjBwfs8zzfAUid1KjAhued
+L3aUm40HvBTeEMDv20cYexpRER2PVMG7VfxLj/j+n3caWd7Y5iLHu2ZFkK8N2G/h
+hu47qJ5ARMsQUbFsmI81vEhp9NpArKG1VqW+zRjzLjfnGWKiPhwrM5zfGEGS70Ib
+kxx9iIeytVzQTLXVs7itUn7nzEsFLI0asx6Rb/JS+tP2XIfyCcA+Rki11OlOHzCl
+Qu+GnlT+4TqNJ4AMoPZgDW7IpnUKQXlEjji3aN1923zpRVEp+q5QIxWy9CKSkoPR
+8XXshfl4rOIOvrMkz+mNDJdmQj+PX5T+XqjHkpI4+Onhz1WanFU+RVMbqxII3BsU
+Wylm/TV/+I3jQxiNy4EzNqpp7v3ut9J0EhQ4MXVXwsvSIBXj5y0=
+=+Fz/
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index d43824dc93793..eacaacc2fc50b 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 59ec945444bfe..8af7faa58482a 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 233f5493a484f..49cecd1ea7744 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,13 +1,9 @@
 AUX sudo-1.9.13_p3-configure-clang16.patch 3119 BLAKE2B 7fe43abb439129f7f5f31c1165f92c1ef9b22c526e150019a47dce27a7260512dfe723d11c778c9dca6ae5e53a4b2da5ce939185877298886e182bb6293b1c22 SHA512 4a319e199db85a54970b09fe655b17a0d5656248ff7f004d045f3ed777a01ac1132fb77eab56483d55b995e35153ae52c0e7ff2c168baf2106bfe9d4eafcaa9b
-DIST sudo-1.9.12p2.tar.gz 4909431 BLAKE2B 79eac710b757acae7aa98e6e6f495a475e5236be456e4687fb1441345ee296672ff80a5a60902cffcd257aa81a01fbc3857f3c52e51bb46f56c060fd299e0c05 SHA512 5e035246137d5820691f7ddfc13faec3886e3cf1563ed56633667d86ab4f1306f34cc0e27808f56790b6c6a4614826e54c5b7e47b31eb009b96dde3e52170c45
-DIST sudo-1.9.12p2.tar.gz.sig 566 BLAKE2B fa679038c33d2bf1476b56944872d3a18b66bf5c5fb2e660d1f8777cdb209928912ddd8d89d878bd2218df3acd1e7fee5aa850e8d01a1cfac6ab310c788149fa SHA512 0b2f10488c44bfcd94eed97002865d89f4a03a92ef3b890fac3121ef0f9e6c55387771ddead1a94dc92d85c35e3d28b4730f35cdc2aafb51128594555ea29876
 DIST sudo-1.9.13p3.tar.gz 5100355 BLAKE2B 46218ecf4cf06d2280ccf4c257b12a6f697eda17b96a6b7aa56f6c7f22d847ec2a8036b9f615c3328d985656539c95f37a40c6c72dfa5f65786ab45a28cf353f SHA512 c0c5cd0c6308868afdad2ecf55b86fdcf1f49889b30831c9db3bc56a63dc3a07686c285c20b2500494b2a76653e2ec69196abdc583312609a5db1c81a6e4e737
 DIST sudo-1.9.13p3.tar.gz.sig 566 BLAKE2B 5b59c7178bf157b67500d972fe1b373bc86ab09345f59733cffa85700221ceec0d5be10bce4838f16e9238154c90a972570a7a933f48dbd56bc64b38dbc0043f SHA512 eebf36e86ebd03daca05838bc56d9b1fb7ea8584a83a9f0e03c5ff07e612d36472b23797c628eff1cf4301832d139de0de62ddc8b17e20f1498f769a4db1249a
 DIST sudo-1.9.14.tar.gz 5229170 BLAKE2B 5731eda1cabb23dd3b77851ce1fcde8e1b7efc1b4fa27fe65522c7b8e23c0330003eb2d4ebb47d63416fb3a52db478b2f60ca22da6a2d66cb27c52ea5264749e SHA512 33d3bc3d66b1c5412b7d579b703d44f246386d2915c1c63be851869569c7bc627211a8897d0bc718d6ebb2bdd938b093c0901f0b7912c8475f8e6fcbbc559a99
 DIST sudo-1.9.14.tar.gz.sig 566 BLAKE2B a7081ee89bf5f12b1b605133ee2f37156779377aec010a12a67933fd21d7e3c0fce9987803bfeea28a7f3ed10784cba6b22b0fee2ff89bac8d1aeec5604bfd6d SHA512 e81d5321386ddddfc58fa884f627cf60478360ab723e1ba97a7138f4b234df2b03fc5a1db5b1b9ed117b2c8ffc2ae529569e0e7364178b1c4d3eaec9c90f86b7
-EBUILD sudo-1.9.12_p2.ebuild 7398 BLAKE2B 34cdf8e3ac4d0fa63f435d831ff572fa9afab5974f2910c4fd16bc3a20cae3a081cd59ed0d7fcd62f60086c338e69803ec80426087daf424ea3522354e9f7c17 SHA512 7ba2341ddfedc10c267946eaa33bd6c694c1429508b1e3dfa52fbe04a61eae17cd2801784f294da4f63f80cc745d66d80f07d7fc949b6d96a990926dc25836f6
 EBUILD sudo-1.9.13_p3-r1.ebuild 7466 BLAKE2B 6c880d950c1bc21c99e8e186b4602fc91b5511aa1bca7dcc1e21eeb93f39d8c802b7b5c1ddabc49ce9f42db9de05791c434574fb9bcca0a09868ca9135ef8db7 SHA512 4828c4aa791be701398466f7bf186321e6d1eca2eefa85142669ea6271563b566db334d2c77ad82746c0b36932b632e80a51bef861a222d55f6d0fd88c50b53e
-EBUILD sudo-1.9.13_p3.ebuild 7398 BLAKE2B 34cdf8e3ac4d0fa63f435d831ff572fa9afab5974f2910c4fd16bc3a20cae3a081cd59ed0d7fcd62f60086c338e69803ec80426087daf424ea3522354e9f7c17 SHA512 7ba2341ddfedc10c267946eaa33bd6c694c1429508b1e3dfa52fbe04a61eae17cd2801784f294da4f63f80cc745d66d80f07d7fc949b6d96a990926dc25836f6
 EBUILD sudo-1.9.14.ebuild 7404 BLAKE2B 4ad89b1684fb5c57a7a32125a86f0d4c89a0545b511dfbd390336e8d55c679959bdd5c25b7a7922e609d6f1f13bdb1162abc53f082fcd523b19a84cdab9b53cb SHA512 c1e16ed74a5d085f3731f92a51460654083367e010b31368dc23d7f1a18895b4d3c3107407df7348ea60d7d4b444bb8a9d78e1e431e5d933cf1b89816ceadf6c
 EBUILD sudo-9999.ebuild 7404 BLAKE2B 4ad89b1684fb5c57a7a32125a86f0d4c89a0545b511dfbd390336e8d55c679959bdd5c25b7a7922e609d6f1f13bdb1162abc53f082fcd523b19a84cdab9b53cb SHA512 c1e16ed74a5d085f3731f92a51460654083367e010b31368dc23d7f1a18895b4d3c3107407df7348ea60d7d4b444bb8a9d78e1e431e5d933cf1b89816ceadf6c
 MISC metadata.xml 1107 BLAKE2B a18b1d280445ea98ba686021abf08ab47a5ac590795018c125008f2a8e44f7ea45e256e32a737781030960cb984bc16d8fd23175fd1e88b294e5036c86085367 SHA512 8cacbd9a1a23fc7734c5ad8b95c769b8506ec35490b5e3f69439bf71bd51d1eaf04fe699a82cbb3ac56182195fff570d75e3b20c33d86774480a2939122752a6
diff --git a/app-admin/sudo/sudo-1.9.12_p2.ebuild b/app-admin/sudo/sudo-1.9.12_p2.ebuild
deleted file mode 100644
index 53d18fb3d5ff4..0000000000000
--- a/app-admin/sudo/sudo-1.9.12_p2.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright 1999-2023 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="${BROOT}"/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:0= )
-	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+="
-	sys-devel/bison
-	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.13_p3.ebuild b/app-admin/sudo/sudo-1.9.13_p3.ebuild
deleted file mode 100644
index 53d18fb3d5ff4..0000000000000
--- a/app-admin/sudo/sudo-1.9.13_p3.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright 1999-2023 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="${BROOT}"/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:0= )
-	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+="
-	sys-devel/bison
-	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/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 9816325625e8c..d8687c1c700cf 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest
index ac02fcac2ac88..8a3e4f3d97780 100644
--- a/dev-python/scipy/Manifest
+++ b/dev-python/scipy/Manifest
@@ -1,9 +1,10 @@
 AUX scipy-1.11.0-determinant-1x1-matrix.patch 2757 BLAKE2B a91cf26f38f7b783a98b0664f959ca2da9a0c7eb746c4e5d325562d6395eb239761049686671e5dd1e785652b582b59091026cc6c5cbae7070f18731f50d9f84 SHA512 35e2e7f650bc97a84d9a69e2985e71b43bdb984ceed098fefd16e3faef65cc8e5d31761fcbe5c826072e76956f619e87d1a154e159c283e0c9f6679402d5e1d5
 DIST scipy-1.10.1.tar.gz 42407997 BLAKE2B 807dceb1e056a1a2c0ec354e4e21f64e59cdab9eaf286cec3783bb93bf80efa00a71e7bd8d1898e8a2fdf86b614f035a0a97436dc4515574d73d9d4521824316 SHA512 767e1dee6285d98e4d58d8d8d1e3654b00e3216e9ad55455fc9473f1d044bef80ecce749bcd24d8f331367b882c9c3e6b652a6e901bb4296ddc7cc44699215b6
 DIST scipy-1.11.0.tar.gz 56030121 BLAKE2B e700bf8f9cffa7bc0f4832722010dcf2e03d8f93d13534f7f85734394c02536c1427cae5a097b59616f0873ba941579fcf2efd0baafc2037d9eca1f93362d38b SHA512 248cfbbedba73925b0461bf0f96c4a11bd4cfc7849cb18c58f6405074796ab0efdc4f056c58d344cb8833c0d2c6425f84e7ac6fe958cf98b1cc0bf16e7ff2444
+DIST scipy-1.11.1.tar.gz 56031509 BLAKE2B 456a80103f8c31c456f80e06b25d765f7ad5655dbdd49e99f476e78273f4291c578a8e99fda3f3a1e848c0e75e08629a09a8146b4a798e85edcaffb7ed1d34a9 SHA512 2859fc73c4fef713497f450b76a57d274bb46477a08ac909714823225f065a13c1e42a61ce67575cfc475e1e4612090cc4ca0920411fe32370c5b5c476352f97
 DIST scipy-html-1.10.1.zip 49191107 BLAKE2B 5163ae3a62745992bcf94ab02ca2bb13fcf6d2ae0eb2a113ba29bc37a8e8f40ec70e39fe16e6371ce0bc31d4c8f0f46746be91b4fe2ad41c68a985c6f00fb8e7 SHA512 f3252452d3bfd400890f29460de2f97bf72732e0fc864582e906b78808e856ead5b1bf97cba531f2150e396408e585499d127004231421d20108e96040316232
 DIST scipy-html-1.11.0.zip 50421508 BLAKE2B cb5e4a4f8817a80f54ae73b4a47ba22d2438df46ebfe27ef5fdc2695fdd983226f4ccae925bf82b15d01ced4f4b6807384ecadac5e1aa7700aa887ad06b7d065 SHA512 33718bbd5e828687d93fccc441a53b6a2e8f54ac4952d3b69d4c4668f55cb6ef5aba33df9acda20b2400effa5ae71767b2a5602a365ad2045a6edd24ff89c253
 EBUILD scipy-1.10.1.ebuild 2662 BLAKE2B dec183f49fdfc327173ad0a5ae329cf9621662f08f116a16d3048004b1de25e535b0ba5edaad8c21ffee328cbdc9eb233f2494dc99ab24a687bb21ca7699925a SHA512 ee9bf4e78a98402d4ea0658af6d45428144a5ddca988583421abc1d992ac7e38c3ef3dab4500ac09ac103c6e5e7190c7d4e1d7036bbe26c4572463edfbefc066
 EBUILD scipy-1.11.0-r1.ebuild 2850 BLAKE2B eb201e9c497d0262cd1416b9f9f90fc9c84195595e348ffc1341457922add3482b16577d7bbb48017d3bce1883c69ee4545fc30e6fabe8410d3e5113e56286ff SHA512 d703ab7e30a83a720cb4a3568a841e5348e021b5542b708483731894b4f7bb16e0b9cce1a93fad84f558b2b3fb812528fb72a6812b9dc888f89d853898aefb06
-EBUILD scipy-1.11.0.ebuild 2788 BLAKE2B 5ed5993b046a177228cc67096e20dacd5ba760f94db41d3df741b3473858ccc3828f272b880fe004824084d13775be17b4c57487f78bd703461a983ead7a2ccd SHA512 8d0cd0d692fe8b4c2575810e5a9cbc3eebe7db4f54d10521e5bd023dc9e0a596ee689c016cf9b1c5a93d5fbb9ce08cf6fc1edce12638cd225cbcd5a94c3a2586
+EBUILD scipy-1.11.1.ebuild 2804 BLAKE2B 584a0fe975160fcce1f8105378046957e9c16d5b7069b751af6203f3766597ea4f5a4116e3100fcfe7177f407431c953b5fc4314164203329ab0cf2e76679baf SHA512 3448c3333363688353ea1979ffeb030c9bd19a7327cf3ce445756645205321116f0877c0f6ef2be895cab41918ec81864c878a0d03a8e40a2b7db4e3a1bb229b
 MISC metadata.xml 953 BLAKE2B a09ea1325a175e349fbc3ca77c5e7b373538ea01147e8544f44b7d4e0c55fbbc2012431fcfe9a3457e82d295e4b5630df1ed69c48ef3462ed9b157af30a1e09a SHA512 74a21c6e1a9bef95b3d74a9513c59d302f473725c04fa32a9991b6108113c0f4b78179ce4a628140e7aa870c24ca60bddf7a00063b6b73dd45110112311371d8
diff --git a/dev-python/scipy/scipy-1.11.0.ebuild b/dev-python/scipy/scipy-1.11.1.ebuild
index 10bd746dd9b0b..ff937ef528ac6 100644
--- a/dev-python/scipy/scipy-1.11.0.ebuild
+++ b/dev-python/scipy/scipy-1.11.1.ebuild
@@ -29,7 +29,8 @@ else
 	inherit pypi
 
 	# Upstream is often behind with doc updates
-	DOC_PV=${PV}
+	#DOC_PV=${PV}
+	DOC_PV=1.11.0
 
 	SRC_URI+="
 		doc? (
diff --git a/metadata/.checksum-test-marker b/metadata/.checksum-test-marker
index ea446a24dae4c..40e3dceb570ac 100644
--- a/metadata/.checksum-test-marker
+++ b/metadata/.checksum-test-marker
@@ -1,4 +1,4 @@
-1687992031 Wed Jun 28 10:40:31 PM UTC 2023
+1687993841 Wed Jun 28 11:10:41 PM UTC 2023
 # Testcase for mirror network:
 # Watch the value over a day, if unchanging then
 # one or more mirrors is missing --checksum
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 409b3e7e61c94..da371fe1d03e9 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index d15b1f000c17a..50e7792383ed2 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 28 Jun 2023 22:39:54 +0000
+Wed, 28 Jun 2023 23:10:01 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index eb5d61d748e27..e223016b749bc 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 546124 BLAKE2B b8c960a7f19f0cac8ea254b9330e3a1add1f4be28ff0a9b4020f5e68f250a6b511280b7dd1dec4e472c73320abae493b0ab8441075c681803abfb19ea280332e SHA512 0dccc4f920463740ab2803f55b50f1cf0df2af9d58750c12c98fe5963dc8738d5a3e8d6a895c2e0d3ba8230bb61557b6e88b4fa56b2f05f5697577b68a9413df
-TIMESTAMP 2023-06-28T22:39:57Z
+TIMESTAMP 2023-06-28T23:10:07Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmSctr1fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmScvc9fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBn7g//bMrJLvt2kPhQpyHjdDtlF4woKsu6TCSjtBbWeNbMReqRjSolt3jZVwnT
-EJaLgdqpUjiOCndOMK0sQg3aBnlLrjSjETQgklM0rUwOnE8KANzRQelPNyN2y3VH
-7RV9shwwqOoM7YTQqa0rT4G/9mu6g1QpusTvQwEufxEVJ2yyg4HwMZ0fYlieES1g
-HHveZLggznGrIZY8isj0Iu+xcbCVyKI4DRaYSoka72nghBu6uZHuE9brBh4GHdT8
-N4ylbp2wrcSqye8ma2SuZcRYBfw4bM87a8ZQZ1T2pdFgTTzb+u4jDmyElC9B5b28
-a2Rtn05Tsk6Rqo/FniSCaJSVSs5GwYi2uRRC/YYXYoM1nYIsCwITTP5UJEMKbTcB
-TrY+gL2Sv5BNh3shbarP0pfkgm2uacpvONYgZCtw2CN/xl3Thgtpd4c9eCRbHFUC
-CJ1pqjDqsIlxwXcfkOXFbliAO56VX1Di0GX+QG6OgQa7y4Em7huwJ8BiaEKNCyxa
-pSaIazDsvlVRnpB1BfeCBbC3Y7fuBV+7ng+xmc97633d3y0sUTRTwUjEB+WqP8Gh
-GzGzDyv1jAvHg2xKQzI2BF2Euh1DWlhJ14BcqGtMrshmu07tKEwmc+3AIywYlXCD
-ammv3cJ+GOB8FQmRXmywNF9tpr4ChZKot8X+alWIDQzuh/AXbh4=
-=JyHs
+klCZjg//ZIYafcysFzj3zLFkpGJYY/PegybkSkhkiYzrlXZknU8zmoKo6vWs3HM6
+Hl0mBhfdz43Jl0GaGTMZPi6QmajKDS6fxjGEs1ayf4zl8NiJ2sBfRHcTpRyq/yIv
+45mcCCP/n+DExy2IbCd4RPdU3PKSkT2DUIFuo07HckW8jALF4LBRVIkNzeRRWwfw
+r/ze9pK7m3lES5m+Ux9bMEfYKSviKJ5TBiDmR7tZedcIgsF9SkGIwaFmenzoyvl/
+4OdCoNcacdJV3Yy2jOAaAAtPE2w30+bKR1BLXsYFnbZKs3h9ESiyhxxTQyA9cbgs
+ijx7F0HymcZqD3dWERzjHVAZ8fG7kDsyAbr2wqPATfu6o6IBQR1Hj+dlzOBFSCrZ
+ItgAXC9seET2zvDmnZK1MvWFSklckR3HSCVnP/m3ppgWEoo+3YLUMFaQSt9OidaT
+8OSE+LW1l87W9tN+KYZaWqXxo4nfLDamtfCNk99mfS2WESMnk93mdIcuF0rObs3P
+ekyjrisp0Kt74GfwChpBKydcpnUtn+eLCiLfmWlI4aF244CxmHMlB/QhWPuKWjPB
+9Cak/0ZpSA9ZiHB8ov16WZ/oI4zckC0vivv8b5p+RkaaRk3xOQehL5QEqfL73l8o
+gCzWqa1gCRMdFSAJ3Gex/g/el3EytSFo+SVRnF4ltwtq7daJzho=
+=Bp1e
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index d15b1f000c17a..50e7792383ed2 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 28 Jun 2023 22:39:54 +0000
+Wed, 28 Jun 2023 23:10:01 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 4cc41e0536a5c..ab61abd7313ce 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index da863dd3c0380..4f718e71ee8c7 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/sudo-1.9.12_p2 b/metadata/md5-cache/app-admin/sudo-1.9.12_p2
deleted file mode 100644
index 78b8dadc31827..0000000000000
--- a/metadata/md5-cache/app-admin/sudo-1.9.12_p2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=verify-sig? ( sec-keys/openpgp-keys-sudo ) sys-devel/bison virtual/pkgconfig >=app-portage/elt-patches-20170815 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=configure install postinst prepare unpack
-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:0= ) sssd? ( sys-auth/sssd[sudo] )
-DESCRIPTION=Allows users or groups to run commands as other users
-EAPI=8
-HOMEPAGE=https://www.sudo.ws/
-INHERIT=pam libtool tmpfiles toolchain-funcs verify-sig
-IUSE=gcrypt ldap nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=ISC BSD
-RDEPEND=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:0= ) sssd? ( sys-auth/sssd[sudo] ) >=app-misc/editor-wrapper-3 virtual/editor ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) selinux? ( sec-policy/selinux-sudo ) sendmail? ( virtual/mta ) virtual/tmpfiles
-REQUIRED_USE=?? ( pam skey ) ?? ( gcrypt ssl )
-SLOT=0
-SRC_URI=https://www.sudo.ws/sudo/dist/sudo-1.9.12p2.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.9.12p2.tar.gz verify-sig? ( https://www.sudo.ws/sudo/dist/sudo-1.9.12p2.tar.gz.sig ftp://ftp.sudo.ws/pub/sudo/sudo-1.9.12p2.tar.gz.sig )
-_eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pam	4efe951aa8ce2c16288d7c915196fe29	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=434a8cebf4c3800acb33af6321e0156a
diff --git a/metadata/md5-cache/app-admin/sudo-1.9.13_p3 b/metadata/md5-cache/app-admin/sudo-1.9.13_p3
deleted file mode 100644
index c311fc3223ca8..0000000000000
--- a/metadata/md5-cache/app-admin/sudo-1.9.13_p3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=verify-sig? ( sec-keys/openpgp-keys-sudo ) sys-devel/bison virtual/pkgconfig >=app-portage/elt-patches-20170815 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=configure install postinst prepare unpack
-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:0= ) sssd? ( sys-auth/sssd[sudo] )
-DESCRIPTION=Allows users or groups to run commands as other users
-EAPI=8
-HOMEPAGE=https://www.sudo.ws/
-INHERIT=pam libtool tmpfiles toolchain-funcs verify-sig
-IUSE=gcrypt ldap nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=ISC BSD
-RDEPEND=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:0= ) sssd? ( sys-auth/sssd[sudo] ) >=app-misc/editor-wrapper-3 virtual/editor ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) selinux? ( sec-policy/selinux-sudo ) sendmail? ( virtual/mta ) virtual/tmpfiles
-REQUIRED_USE=?? ( pam skey ) ?? ( gcrypt ssl )
-SLOT=0
-SRC_URI=https://www.sudo.ws/sudo/dist/sudo-1.9.13p3.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.9.13p3.tar.gz verify-sig? ( https://www.sudo.ws/sudo/dist/sudo-1.9.13p3.tar.gz.sig ftp://ftp.sudo.ws/pub/sudo/sudo-1.9.13p3.tar.gz.sig )
-_eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pam	4efe951aa8ce2c16288d7c915196fe29	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=434a8cebf4c3800acb33af6321e0156a
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index b239fadc052ec..4ee8a008dd740 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/scipy-1.11.0 b/metadata/md5-cache/dev-python/scipy-1.11.1
index 7461704c6b28b..01f369df7ac00 100644
--- a/metadata/md5-cache/dev-python/scipy-1.11.0
+++ b/metadata/md5-cache/dev-python/scipy-1.11.1
@@ -12,6 +12,6 @@ RDEPEND=>=dev-python/numpy-1.21.6[lapack,python_targets_python3_10(-)?,python_ta
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/s/scipy/scipy-1.11.0.tar.gz doc? ( https://docs.scipy.org/doc/scipy-1.11.0/scipy-html-1.11.0.zip )
+SRC_URI=https://files.pythonhosted.org/packages/source/s/scipy/scipy-1.11.1.tar.gz doc? ( https://docs.scipy.org/doc/scipy-1.11.0/scipy-html-1.11.0.zip )
 _eclasses_=distutils-r1	2d32e797ee29a8ffdd452f4a85860666	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a34d5f83235297b76d71eaf8deb53768	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=7b3c856d0ccf1f9dc8b66c963e196784
+_md5_=d7477ea05d370904b0d5de6d46540cf9
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index c41fdc69d94f1..4978a5568abe4 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/kbd-2.6.0 b/metadata/md5-cache/sys-apps/kbd-2.6.0
deleted file mode 100644
index 1a82b0128f022..0000000000000
--- a/metadata/md5-cache/sys-apps/kbd-2.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig test? ( dev-libs/check )
-DEFINED_PHASES=configure install prepare
-DEPEND=app-alternatives/gzip pam? ( !app-misc/vlock sys-libs/pam )
-DESCRIPTION=Keyboard and console utilities
-EAPI=8
-HOMEPAGE=https://kbd-project.org/
-IUSE=nls selinux pam test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=app-alternatives/gzip pam? ( !app-misc/vlock sys-libs/pam ) selinux? ( sec-policy/selinux-loadkeys )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/utils/kbd/kbd-2.6.0.tar.xz
-_md5_=93b4173d272b1e5357e0ea4d81169a13
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 73da3ca0f3d74..f26cd65466827 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15850 BLAKE2B f8a24ac4773896d3e2d3ac7daac96705bb587c68e5945981d4f8b934b213a0a634607e00cc3481f4c847f66ae537f4bfd1c12852438720d6cf5d711fe74f3237 SHA512 29367a48def7059bf0b6fab4e38cd0ba8266ac4b865394c346e798632efcf7c41364d99e462d98a52192ae8270db65e57b9f15ae208bef7ce4c3cfd98163dee1
-TIMESTAMP 2023-06-28T22:39:57Z
+TIMESTAMP 2023-06-28T23:10:07Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmSctr1fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmScvc9fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBcRxAAthhyUAbis5vNSIaSSiGwr9DA9NPB/0WYCCy/njOtyJT8F/+ZfIY3dzAW
-J1eo2K5yPsPb29FQnknHvpoxA9+ljUqPf44IytkySol5Nhg9mI4h2KWm5zFE9mMj
-ua2YWO4332/fEMex0jehnQdHVftaqSkBEagQ/4wLQiZTF1VwuAyrepSaIUSGPBYJ
-ejECNasR5PhJvr4rkzRXFWNW5SzXA17ezXqLoocGxZ6US61iba0+TGqBV32CZJdu
-ubnMlllzU53do7XI34ivGDpBd4c1QYx/Y7FavaZJZtPsn6z22gBHL2J/pnhhQN8B
-LmJVUq0A7G2eHddn/dJJlxdcoqwFIgYGqETjiRuxA+tO+nz+hboplcdfFqUp35xU
-Adt3d6cEKyD4f4iXdACdIOijJde2GE7hOWkVlbTk4xUFblCLmFGycX6jWQdxjZur
-DMDICLYveMDR1OLsciLE+bWfelyEygGg7RmnrotobP/8O4uf1x/wTyEflpA5pfL2
-0YKqq5j11Ud8KR4nZAJVa2d8Ldoo3LCpw8s1JFGUrV71onZ/qfT0D+ofdH4s4CpU
-cHpg+OnA1/rICd6XdLd7b8snowWH4fmff9zOyzWs2kQ48PQcJyUyIwrmIz+GUPR4
-buaZDvQ7YkscKmrn2tK/YYg2Xt5d3N25CzCv2oQrW4GGHK/zLCA=
-=YYaA
+klANpw/9EuZ31iPkbJhlUgGIxtWuOGjByH1d+rliQRYJdXmMcAE/xmX5iDVizGbE
+y8KleI94NSXzJVrtqC5bVzVJHOnFoDKaj7YFJA1DErv1a6pup0T/nDr0Hfn6Ez+S
+uJ9UliP6d+gX020VcmHo1aEJpkPeSWTAc0x4JP8Upb/Wg0TM8yZS0yIzftZ1Oqho
+mUpCUGzh/LfW9yc87kRaHb95XUIUIincp8RsuU0/h6M9jCvldhBNhAyvyvh08+Sn
+sPHsVBvGmy28T7SCCg9iagEm99UTDUOfh5h9d1QDXOpl3EM3d6Z4tFs2muTUirFT
+i4XJCqOUsw3uM3RzMI6TdcKHy3pF1bEOxtb/a8CONp7UMDmZdPv5/eHhqBhDA4Oq
+hrk6YpP9bMmRl8ErUYd7+jK3h9a2hdVJs69MFfbGGYWZg0oeXumva8E17nfCMNfK
+7be7E01xS3zsX80VHFj2KtxN4JuQAwN+svcUiCnR7NJlbiFt7OQcZXwJJ6xH/uIq
+cHVQEbs9a/Ifzynk7wHbMilXv3OoRgZwD/uCFMh/L21Ghuny7oF1hQJLdEyMFFEC
+dkR0fVsfbLeO07Avv0ViHWFVL0h5FV4pVA4uE2ylPsUQdjpW8b6CRifkY+W7vyQ3
+AOhLXfilJzN2EWIGeRVR3jEw34Q07povswrTB4Xp+1LdkX+T9kI=
+=nVtu
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index d15b1f000c17a..50e7792383ed2 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 28 Jun 2023 22:39:54 +0000
+Wed, 28 Jun 2023 23:10:01 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 6f9e0ce3b6511..45549d9797d12 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Jun 28 10:39:54 PM UTC 2023
+Wed Jun 28 11:10:01 PM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index e4bf83abe44d5..d60aafea50156 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 28 Jun 2023 22:45:01 +0000
+Wed, 28 Jun 2023 23:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index b17c374bf8657..1e9f89a3e5369 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-295a950b0c90175ea9ab778b7984a46bb1fd7a46 1687991663 2023-06-28T22:34:23+00:00
+6c5a1ddbb0d2ae16bc166e62c5cecde920d738b0 1687993469 2023-06-28T23:04:29+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index f995e28a86d45..ce77278b3a13a 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1687992001 Wed 28 Jun 2023 10:40:01 PM UTC
+1687993801 Wed 28 Jun 2023 11:10:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index d15b1f000c17a..50e7792383ed2 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Wed, 28 Jun 2023 22:39:54 +0000
+Wed, 28 Jun 2023 23:10:01 +0000
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 72f172065df92..acc583d54081a 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 1b26f41869aef..20a12b682a314 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -8294,7 +8294,6 @@ sys-kernel/kpatch:contrib - Enable contrib kpatch services files.
 sys-kernel/kpatch:kmod - Enable a kernel module (.ko file) which provides an interface for the patch modules to register new functions for replacement.
 sys-kernel/kpatch:kpatch - Enable a command-line tool which allows a user to manage a collection of patch modules.
 sys-kernel/kpatch:kpatch-build - Enable tools which convert a source diff patch to a patch module.
-sys-kernel/linux-firmware:compress - Compress firmware using xz (app-arch/xz-utils) before installation
 sys-kernel/linux-firmware:compress-xz - Compress firmware using xz (app-arch/xz-utils) before installation
 sys-kernel/linux-firmware:compress-zstd - Compress firmware using zstd (app-arch/zstd) before installation
 sys-kernel/linux-firmware:initramfs - Create and install initramfs for early microcode loading in /boot (only AMD for now)
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index fa882ad7b270f..adb1cd983059a 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest
index 877ac21104726..9cb22a388249e 100644
--- a/sys-apps/kbd/Manifest
+++ b/sys-apps/kbd/Manifest
@@ -1,8 +1,6 @@
 DIST kbd-2.5.1.tar.xz 1491952 BLAKE2B aab4c3d78c28709bf562b54fe94c0533d5c33185e183bf3eb944f89147b250d9df9b30b64a06eb4742feafe8c05a6aa491a7f007b4d6d9077bc19a4628ba05ae SHA512 74855f486aff5fc2f93a6cb29460a590c94eac653b001574e1b4eb1300ea99dfed9222f9e5d1d3a05a112a6880591d5c44ed6e76b8a64edf744ecb0892f562d0
-DIST kbd-2.6.0.tar.xz 1590196 BLAKE2B 9894bab607694cc60cece959573b8f13f687d47b4346fa84e57bffd2c062a5ac2830f9a6766aca70d2242f63f486c898fe5d777fc01dfabe85d004b1f29d364a SHA512 4b8cec06ea2143a285bedb95cb66c313ebac79dc3c64956f969f389186609bc1a066dbf32d6ae308e18947dcbe2f6f684f6c69d4210b40d449735e5704707b27
 DIST kbd-2.6.1.tar.xz 1591240 BLAKE2B 15c738379cfa9420e218ddbf6562e2c75b6bf5eb31ce159d798d49546991ca0c02bf9a11486d99bd2ba7d99f3bf6abb53ad799c6314df6d9ca9b1e8cf808b738 SHA512 8d7f39efa91ef16f4c0601c1744e7f00e411c121607660c8f585d3e085d8e8bea4ea095f6c7f491af763097a9844fb4a07d4b78a8358cb7caafbfda0626acf91
 EBUILD kbd-2.5.1.ebuild 2027 BLAKE2B 66c55f1296812b9a197460a8a90bf237def618d6fc9d00ad6e26ff543b1918c7274aae2627c836925099ed37645bf6fa5c05ebfc392077b265b46f0d31d0b1c9 SHA512 9734368dac398812fee31c31a29f6ec8b4819181a8a0a711ceadb64c825aaf515aa35d767185bf9379e5287facda5f53c923ef64aeb3f45ea054b5a5c97f2dd2
-EBUILD kbd-2.6.0.ebuild 2087 BLAKE2B d28a22fedf7b8cbbeca0245c825a27f23f9bf2889362737103a0b368a78c4eeb96d6381e262d83b1c2b131206f36074f1f06ca0220a855ffe81b032a3d3ffbf6 SHA512 25f67af979a43e1866e8bbc98bfa86c27f493b06933e37365321dc6bbdc8520478fa8253430a8ad125b64c67c8e5df7560ff3e047a84ff2e661403afb456077a
 EBUILD kbd-2.6.1.ebuild 2087 BLAKE2B d28a22fedf7b8cbbeca0245c825a27f23f9bf2889362737103a0b368a78c4eeb96d6381e262d83b1c2b131206f36074f1f06ca0220a855ffe81b032a3d3ffbf6 SHA512 25f67af979a43e1866e8bbc98bfa86c27f493b06933e37365321dc6bbdc8520478fa8253430a8ad125b64c67c8e5df7560ff3e047a84ff2e661403afb456077a
 EBUILD kbd-9999.ebuild 2087 BLAKE2B d28a22fedf7b8cbbeca0245c825a27f23f9bf2889362737103a0b368a78c4eeb96d6381e262d83b1c2b131206f36074f1f06ca0220a855ffe81b032a3d3ffbf6 SHA512 25f67af979a43e1866e8bbc98bfa86c27f493b06933e37365321dc6bbdc8520478fa8253430a8ad125b64c67c8e5df7560ff3e047a84ff2e661403afb456077a
 MISC metadata.xml 335 BLAKE2B 3b00a31428edc76e9a758c347107ad15e2f91a440a49e5167878555eda6dad176f8936ca22acbbecb5ff4827d8605b28db53ca990284b4e18c536a04d46616ed SHA512 86a6b134e0403abf5c22e868e2013a2051f504401d5ff8aa1ad682638d866ab8d837470ed87434286b77933483d7675646f382b15aed19772b2fff17258fc0f7
diff --git a/sys-apps/kbd/kbd-2.6.0.ebuild b/sys-apps/kbd/kbd-2.6.0.ebuild
deleted file mode 100644
index 23a50e0bfa38b..0000000000000
--- a/sys-apps/kbd/kbd-2.6.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/legionus/kbd.git https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git"
-	EGIT_BRANCH="master"
-else
-	if [[ $(ver_cut 3) -lt 90 ]] ; then
-		SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	else
-		inherit autotools
-		SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	fi
-fi
-
-DESCRIPTION="Keyboard and console utilities"
-HOMEPAGE="https://kbd-project.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="nls selinux pam test"
-RESTRICT="!test? ( test )"
-
-# Testsuite's Makefile.am calls missing(!)
-# ... but this seems to be consistent with the autoconf docs?
-# Needs more investigation: https://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/autom4te-Invocation.html
-QA_AM_MAINTAINER_MODE=".*--run autom4te --language=autotest.*"
-
-DEPEND="
-	app-alternatives/gzip
-	pam? (
-		!app-misc/vlock
-		sys-libs/pam
-	)
-"
-RDEPEND="
-	${DEPEND}
-	selinux? ( sec-policy/selinux-loadkeys )
-"
-BDEPEND="
-	virtual/pkgconfig
-	test? ( dev-libs/check )
-"
-
-src_prepare() {
-	default
-
-	# Rename conflicting keymaps to have unique names, bug #293228
-	# See also https://github.com/legionus/kbd/issues/76.
-	pushd "${S}"/data/keymaps/i386 &> /dev/null || die
-	mv fgGIod/trf.map fgGIod/trf-fgGIod.map || die
-	mv olpc/es.map olpc/es-olpc.map || die
-	mv olpc/pt.map olpc/pt-olpc.map || die
-	mv qwerty/cz.map qwerty/cz-qwerty.map || die
-	popd &> /dev/null || die
-
-	if [[ ${PV} == 9999 ]] || [[ $(ver_cut 3) -ge 90 ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-werror
-
-		$(use_enable nls)
-		$(use_enable pam vlock)
-		$(use_enable test tests)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	docinto html
-	dodoc docs/doc/*.html
-
-	# USE="test" installs .la files
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index e72651790290c..169f8acf2fd7d 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index 7df63d55d7edf..ddcd08e9d4e5a 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -5,4 +5,4 @@ EBUILD linux-firmware-20230404.ebuild 11196 BLAKE2B 2ba77bdaba0758932889c2fbc04d
 EBUILD linux-firmware-20230515.ebuild 11196 BLAKE2B 2ba77bdaba0758932889c2fbc04df410f10a7535f482490779545445e1af06448a467b40ca6c32f36bba870bd482685facfb0d4d2bfcebfba6b043a1167c053e SHA512 8c51e94c77cb3500fbf02adf5472e40702e09bf93ba5f1cc78b02f984bbcedba393a12c55ba11c2acdbc5b270c0ce5f7c07ca8dd6fb4a058f782ebed504cf88a
 EBUILD linux-firmware-20230625.ebuild 11204 BLAKE2B 066c6a8347a4e9ab45c06a584172ee91f88c3459032602021f62c8a1cff5262ec5c7e03e649d339cb6fbcb2bd7af3cff9a4dbbf010b53c7449d0371413e04cf5 SHA512 83db43336064c576d5d5be7929a23ed906f8ee593f89e69280d0375895e6a7fb9ca274ed5fac63e4af15b6ae468ec394b20d7f2345b65825f027754b78130884
 EBUILD linux-firmware-99999999.ebuild 11204 BLAKE2B 066c6a8347a4e9ab45c06a584172ee91f88c3459032602021f62c8a1cff5262ec5c7e03e649d339cb6fbcb2bd7af3cff9a4dbbf010b53c7449d0371413e04cf5 SHA512 83db43336064c576d5d5be7929a23ed906f8ee593f89e69280d0375895e6a7fb9ca274ed5fac63e4af15b6ae468ec394b20d7f2345b65825f027754b78130884
-MISC metadata.xml 1300 BLAKE2B 075ac0595a6408aa708224e79109b4b542f77c63841d600a89a8cc94bd13eefda3d7c6db416f16814ae67426b0d16cff48ac88bb76b692e3c4524bd3ac3cad6e SHA512 bc946c219e24b905c55004323fc7bf213a5e012bdd6b20cfc1203680a7e6460dd56e30c2735da0f94f3c95aa96b3afbbd532e3e3215da9597a512c4d448b8de7
+MISC metadata.xml 1192 BLAKE2B 52efc1e40ffdac04c33fd2c50a1b7a03f775e16c6aaac19f1a7c9c54f853f7f3dd37fd52e4cf7fcc05bf17d45e4d7956deff7b552b1b568005feca60d967fa23 SHA512 e1214670c10573aee4e272b45bb9c21c85b15d520e77f57fa1decf8c7bb1dd765bdf6b878b6c52a8455f9569735b806caf053dc7934ce74c7088b991ebb705a2
diff --git a/sys-kernel/linux-firmware/metadata.xml b/sys-kernel/linux-firmware/metadata.xml
index 9f5573f7726a1..9b0f0b62ea040 100644
--- a/sys-kernel/linux-firmware/metadata.xml
+++ b/sys-kernel/linux-firmware/metadata.xml
@@ -18,7 +18,6 @@
 	<name>Gentoo Kernel Project</name>
 </maintainer>
 <use>
-	<flag name="compress">Compress firmware using xz (<pkg>app-arch/xz-utils</pkg>) before installation</flag>
 	<flag name="compress-xz">Compress firmware using xz (<pkg>app-arch/xz-utils</pkg>) before installation</flag>
 	<flag name="compress-zstd">Compress firmware using zstd (<pkg>app-arch/zstd</pkg>) before installation</flag>
 	<flag name="initramfs">Create and install initramfs for early microcode loading in /boot (only AMD for now)</flag>