Sync with portage [Sun Aug 4 08:51:05 MSK 2024].

2024-08-04 08:51:05 +03:00 · 2024-08-04 08:51:05 +03:00 · eb037978f3
commit eb037978f3
parent 2de3d48cfd
1669 changed files with 15338 additions and 31559 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@ -1,5 +1,3 @@
-DIST aws-cli-1.33.26.gh.tar.gz 2757281 BLAKE2B 04d88160203ff9cfc0c0f22dd9d57c70e95289af769b4639708bc6a760d32b324fe4785def2cfdf17abadfbfd04a2ef974979dd3b9ac6342bea230a297b7c022 SHA512 e4ce9037042edfdeb36a8bfd74f7998664838598af066cf324245ddc04555037f0ff7b69f1e2dbf0cb727932ef9a6c0feef8acafaed00e5b0c94b1b9e59a6c2d
 DIST aws-cli-1.33.27.gh.tar.gz 2758530 BLAKE2B c40db2483f0561078d1dc191e1d8c97bae0d0ab00f0ca11db796213567943f7dd816143340c6c9b9c28012d2881d860948138cc41b37555b7416a5289c7a5cd8 SHA512 3716ef6b5ab7db33496f31445d6ec404b89fc8a3fec564dd6644d43d4ea0db12aadcce545a481e955a166000386d8183e801780b6ac16e03bbea0f5ed9a495c5
 DIST aws-cli-1.33.31.gh.tar.gz 2765982 BLAKE2B 424422520aada1a5ab21843e61d5027937c1cd306936740ce6fe80ac8beadc5c5885727d716a7efe1890a3a3d7138710cb4b43a04d5293593d8b6fbf94e83ff9 SHA512 d7f860cb1b37c32a05550a43ff4c7e691f90ca8753fead9e1f2590556e589d6748ba163408ffbc7ecb1b1414a9df3590ffd5962aaf2acc6e49fff60a101034cb
-DIST aws-cli-1.33.32.gh.tar.gz 2766766 BLAKE2B f3b0f319b9479fbfa2a6e51d174c7cfdaba8d22354da331702c7a707d5f1e2dbb971401071da6cd8533b0b24fea5cdca2180c01b33a1335e9ecec0d78337d5bc SHA512 8618365307b77eb31356663afe6982b6117e6047c5d209c75496f748217a65fb44eeeeee2fc6921cf12a030f079b44a4dd3e987437f99ff08aa3e76b02284399
-DIST aws-cli-1.33.33.gh.tar.gz 2767435 BLAKE2B 2209a774624851df6c234c185956d94876835fe65de48f345457eb803846b82be7ef45bbea2000f462c78727125c53879888bc66eb0da9fc25dc59931147b09a SHA512 49e8ed59d9d1a3b7effe0b5407dbe6181fd5a17c194ad807f9a36053576b3db0f99d54ec0a45e78fc1a423bbdf411fa0aab2954ad05f3540da39ac8c7427a71d
+DIST aws-cli-1.33.35.gh.tar.gz 2768498 BLAKE2B d925c1a63a73bda27711d2f930d0832ea17e012d62d634330cef16f1962cbcbeb9149a5ef14765af04bfbc4b49c6160a319e02a3eab475473a2fe46ab27da305 SHA512 5804947acc002cd9f53b94865542d4f4708116a3a31dafd6a217e84d2222ff973b6c6af0237272d52d9d15e0eaf7f243ef577c1a1b3c2f18e845857886d9f2c1
--- a/app-admin/awscli/awscli-1.33.26.ebuild
+++ b/app-admin/awscli/awscli-1.33.26.ebuild
@ -1,90 +0,0 @@
-# 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+118), sigh
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1 )).$(( $(ver_cut 3-) + 118 ))"
-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
-}
--- a/app-admin/awscli/awscli-1.33.27.ebuild
+++ b/app-admin/awscli/awscli-1.33.27.ebuild
@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"

 # botocore is x.(y+1).(z+118), sigh
 BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1 )).$(( $(ver_cut 3-) + 118 ))"
--- a/app-admin/awscli/awscli-1.33.33.ebuild
+++ b/app-admin/awscli/awscli-1.33.33.ebuild
@ -1,90 +0,0 @@
-# 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+118), sigh
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1 )).$(( $(ver_cut 3-) + 118 ))"
-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
-}
--- a/app-admin/awscli/awscli-1.33.35.ebuild
+++ b/app-admin/awscli/awscli-1.33.35.ebuild
--- a/app-admin/entr/entr-5.6.ebuild
+++ b/app-admin/entr/entr-5.6.ebuild
@ -14,7 +14,7 @@ SRC_URI="https://eradman.com/entrproject/code/${P}.tar.gz"

 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"

--- a/app-arch/7zip/7zip-23.01.ebuild
+++ b/app-arch/7zip/7zip-23.01.ebuild
@ -1,110 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit edos2unix flag-o-matic toolchain-funcs
-
-NO_DOT_PV=$(ver_rs 1- '')
-DESCRIPTION="Free file archiver for extremely high compression"
-HOMEPAGE="https://www.7-zip.org/ https://sourceforge.net/projects/sevenzip/"
-# linux-x64 tarball is only used for docs
-SRC_URI="
-	https://downloads.sourceforge.net/sevenzip/7-Zip/${PV}/7z${NO_DOT_PV}-src.tar.xz
-	https://downloads.sourceforge.net/sevenzip/7-Zip/${PV}/7z${NO_DOT_PV}-linux-x64.tar.xz
-"
-S="${WORKDIR}"
-
-LICENSE="LGPL-2 BSD rar? ( unRAR )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="uasm jwasm rar"
-REQUIRED_USE="?? ( uasm jwasm )"
-
-DOCS=( readme.txt History.txt License.txt )
-HTML_DOCS=( MANUAL )
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	uasm? ( dev-lang/uasm )
-	jwasm? ( dev-lang/jwasm )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-respect-build-env.patch"
-)
-
-# TODO(NRK): also build and install the library
-# TODO(NRK): make it so this package can be used as a drop-in replacement
-# for app-arch/p7zip ??
-
-pkg_setup() {
-	# instructions in DOC/readme.txt, Compiling 7-Zip for Unix/Linux
-	# TLDR; every combination of options (clang|gcc)+(asm/noasm)
-	# has a dedicated makefile & builddir
-	mfile="cmpl"
-	if tc-is-clang; then
-		mfile="${mfile}_clang"
-		bdir=c
-	elif tc-is-gcc; then
-		mfile="${mfile}_gcc"
-		bdir=g
-	else
-		die "Unsupported compiler: $(tc-getCC)"
-	fi
-	if use jwasm || use uasm ; then
-		mfile="${mfile}_x64"
-		bdir="${bdir}_x64"
-	fi
-	export mfile="${mfile}.mak"
-	export bdir
-}
-
-src_prepare() {
-	# patch doesn't deal with CRLF even if file+patch match
-	# not even with --ignore-whitespace, --binary or --force
-	pushd "./CPP/7zip" || die "Unable to switch directory"
-	edos2unix ./7zip_gcc.mak ./var_gcc{,_x64}.mak ./var_clang{,_x64}.mak
-	sed -i -e 's/-Werror //g' ./7zip_gcc.mak || die "Error removing -Werror"
-	popd >/dev/null || die "Unable to switch directory"
-
-	default
-}
-
-src_compile() {
-	pushd "./CPP/7zip/Bundles/Alone2" || die "Unable to switch directory"
-
-	# avoid executable stack when using uasm/jwasm, harmless otherwise
-	append-ldflags -Wl,-z,noexecstack
-	export G_CFLAGS=${CFLAGS}
-	export G_CXXFLAGS=${CXXFLAGS}
-	export G_LDFLAGS=${LDFLAGS}
-
-	local args=(
-		-f "../../${mfile}"
-		CC=$(tc-getCC)
-		CXX=$(tc-getCXX)
-	)
-	# NOTE: makefile doesn't check the value of DISABLE_RAR_COMPRESS, only
-	# whether it's defined or not. so in case user has `rar` enabled
-	# DISABLE_RAR_COMPRESS (and DISABLE_RAR) needs to stay undefined.
-	if ! use rar; then
-		# disables non-free rar code but allows listing and extracting
-		# non-compressed rar archives
-		args+=( DISABLE_RAR_COMPRESS=1 )
-	fi
-	if use jwasm; then
-		args+=( USE_JWASM=1 )
-	elif use uasm; then
-		args+=( MY_ASM=uasm )
-	fi
-
-	mkdir -p "${bdir}" || die  # Bug: https://bugs.gentoo.org/933619
-	emake ${args[@]}
-	popd > /dev/null || die "Unable to switch directory"
-}
-
-src_install() {
-	dobin "./CPP/7zip/Bundles/Alone2/b/${bdir}/7zz"
-	einstalldocs
-}
--- a/app-arch/7zip/7zip-24.05.ebuild
+++ b/app-arch/7zip/7zip-24.05.ebuild
@ -1,110 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit edos2unix flag-o-matic toolchain-funcs
-
-NO_DOT_PV=$(ver_rs 1- '')
-DESCRIPTION="Free file archiver for extremely high compression"
-HOMEPAGE="https://www.7-zip.org/ https://sourceforge.net/projects/sevenzip/"
-# linux-x64 tarball is only used for docs
-SRC_URI="
-	https://downloads.sourceforge.net/sevenzip/7-Zip/${PV}/7z${NO_DOT_PV}-src.tar.xz
-	https://downloads.sourceforge.net/sevenzip/7-Zip/${PV}/7z${NO_DOT_PV}-linux-x64.tar.xz
-"
-S="${WORKDIR}"
-
-LICENSE="LGPL-2 BSD rar? ( unRAR )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="uasm jwasm rar"
-REQUIRED_USE="?? ( uasm jwasm )"
-
-DOCS=( readme.txt History.txt License.txt )
-HTML_DOCS=( MANUAL )
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	uasm? ( dev-lang/uasm )
-	jwasm? ( dev-lang/jwasm )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-respect-build-env.patch"
-)
-
-# TODO(NRK): also build and install the library
-# TODO(NRK): make it so this package can be used as a drop-in replacement
-# for app-arch/p7zip ??
-
-pkg_setup() {
-	# instructions in DOC/readme.txt, Compiling 7-Zip for Unix/Linux
-	# TLDR; every combination of options (clang|gcc)+(asm/noasm)
-	# has a dedicated makefile & builddir
-	mfile="cmpl"
-	if tc-is-clang; then
-		mfile="${mfile}_clang"
-		bdir=c
-	elif tc-is-gcc; then
-		mfile="${mfile}_gcc"
-		bdir=g
-	else
-		die "Unsupported compiler: $(tc-getCC)"
-	fi
-	if use jwasm || use uasm ; then
-		mfile="${mfile}_x64"
-		bdir="${bdir}_x64"
-	fi
-	export mfile="${mfile}.mak"
-	export bdir
-}
-
-src_prepare() {
-	# patch doesn't deal with CRLF even if file+patch match
-	# not even with --ignore-whitespace, --binary or --force
-	pushd "./CPP/7zip" || die "Unable to switch directory"
-	edos2unix ./7zip_gcc.mak ./var_gcc{,_x64}.mak ./var_clang{,_x64}.mak
-	sed -i -e 's/-Werror //g' ./7zip_gcc.mak || die "Error removing -Werror"
-	popd >/dev/null || die "Unable to switch directory"
-
-	default
-}
-
-src_compile() {
-	pushd "./CPP/7zip/Bundles/Alone2" || die "Unable to switch directory"
-
-	# avoid executable stack when using uasm/jwasm, harmless otherwise
-	append-ldflags -Wl,-z,noexecstack
-	export G_CFLAGS=${CFLAGS}
-	export G_CXXFLAGS=${CXXFLAGS}
-	export G_LDFLAGS=${LDFLAGS}
-
-	local args=(
-		-f "../../${mfile}"
-		CC=$(tc-getCC)
-		CXX=$(tc-getCXX)
-	)
-	# NOTE: makefile doesn't check the value of DISABLE_RAR_COMPRESS, only
-	# whether it's defined or not. so in case user has `rar` enabled
-	# DISABLE_RAR_COMPRESS (and DISABLE_RAR) needs to stay undefined.
-	if ! use rar; then
-		# disables non-free rar code but allows listing and extracting
-		# non-compressed rar archives
-		args+=( DISABLE_RAR_COMPRESS=1 )
-	fi
-	if use jwasm; then
-		args+=( USE_JWASM=1 )
-	elif use uasm; then
-		args+=( MY_ASM=uasm )
-	fi
-
-	mkdir -p "${bdir}" || die  # Bug: https://bugs.gentoo.org/933619
-	emake ${args[@]}
-	popd > /dev/null || die "Unable to switch directory"
-}
-
-src_install() {
-	dobin "./CPP/7zip/Bundles/Alone2/b/${bdir}/7zz"
-	einstalldocs
-}
--- a/app-arch/7zip/7zip-24.06.ebuild
+++ b/app-arch/7zip/7zip-24.06.ebuild
@ -1,110 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit edos2unix flag-o-matic toolchain-funcs
-
-NO_DOT_PV=$(ver_rs 1- '')
-DESCRIPTION="Free file archiver for extremely high compression"
-HOMEPAGE="https://www.7-zip.org/ https://sourceforge.net/projects/sevenzip/"
-# linux-x64 tarball is only used for docs
-SRC_URI="
-	https://downloads.sourceforge.net/sevenzip/7-Zip/${PV}/7z${NO_DOT_PV}-src.tar.xz
-	https://downloads.sourceforge.net/sevenzip/7-Zip/${PV}/7z${NO_DOT_PV}-linux-x64.tar.xz
-"
-S="${WORKDIR}"
-
-LICENSE="LGPL-2 BSD rar? ( unRAR )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="uasm jwasm rar"
-REQUIRED_USE="?? ( uasm jwasm )"
-
-DOCS=( readme.txt History.txt License.txt )
-HTML_DOCS=( MANUAL )
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	uasm? ( dev-lang/uasm )
-	jwasm? ( dev-lang/jwasm )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-24.05-respect-build-env.patch"
-)
-
-# TODO(NRK): also build and install the library
-# TODO(NRK): make it so this package can be used as a drop-in replacement
-# for app-arch/p7zip ??
-
-pkg_setup() {
-	# instructions in DOC/readme.txt, Compiling 7-Zip for Unix/Linux
-	# TLDR; every combination of options (clang|gcc)+(asm/noasm)
-	# has a dedicated makefile & builddir
-	mfile="cmpl"
-	if tc-is-clang; then
-		mfile="${mfile}_clang"
-		bdir=c
-	elif tc-is-gcc; then
-		mfile="${mfile}_gcc"
-		bdir=g
-	else
-		die "Unsupported compiler: $(tc-getCC)"
-	fi
-	if use jwasm || use uasm ; then
-		mfile="${mfile}_x64"
-		bdir="${bdir}_x64"
-	fi
-	export mfile="${mfile}.mak"
-	export bdir
-}
-
-src_prepare() {
-	# patch doesn't deal with CRLF even if file+patch match
-	# not even with --ignore-whitespace, --binary or --force
-	pushd "./CPP/7zip" || die "Unable to switch directory"
-	edos2unix ./7zip_gcc.mak ./var_gcc{,_x64}.mak ./var_clang{,_x64}.mak
-	sed -i -e 's/-Werror //g' ./7zip_gcc.mak || die "Error removing -Werror"
-	popd >/dev/null || die "Unable to switch directory"
-
-	default
-}
-
-src_compile() {
-	pushd "./CPP/7zip/Bundles/Alone2" || die "Unable to switch directory"
-
-	# avoid executable stack when using uasm/jwasm, harmless otherwise
-	append-ldflags -Wl,-z,noexecstack
-	export G_CFLAGS=${CFLAGS}
-	export G_CXXFLAGS=${CXXFLAGS}
-	export G_LDFLAGS=${LDFLAGS}
-
-	local args=(
-		-f "../../${mfile}"
-		CC=$(tc-getCC)
-		CXX=$(tc-getCXX)
-	)
-	# NOTE: makefile doesn't check the value of DISABLE_RAR_COMPRESS, only
-	# whether it's defined or not. so in case user has `rar` enabled
-	# DISABLE_RAR_COMPRESS (and DISABLE_RAR) needs to stay undefined.
-	if ! use rar; then
-		# disables non-free rar code but allows listing and extracting
-		# non-compressed rar archives
-		args+=( DISABLE_RAR_COMPRESS=1 )
-	fi
-	if use jwasm; then
-		args+=( USE_JWASM=1 )
-	elif use uasm; then
-		args+=( MY_ASM=uasm )
-	fi
-
-	mkdir -p "${bdir}" || die  # Bug: https://bugs.gentoo.org/933619
-	emake ${args[@]}
-	popd > /dev/null || die "Unable to switch directory"
-}
-
-src_install() {
-	dobin "./CPP/7zip/Bundles/Alone2/b/${bdir}/7zz"
-	einstalldocs
-}
--- a/app-arch/7zip/7zip-24.07.ebuild
+++ b/app-arch/7zip/7zip-24.07.ebuild
@ -17,7 +17,7 @@ S="${WORKDIR}"

 LICENSE="LGPL-2 BSD rar? ( unRAR )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE="uasm jwasm rar"
 REQUIRED_USE="?? ( uasm jwasm )"

--- a/app-arch/7zip/Manifest
+++ b/app-arch/7zip/Manifest
@ -1,8 +1,2 @@
-DIST 7z2301-linux-x64.tar.xz 1527700 BLAKE2B 35dc74f0a7a4e586ea5ae969dce72c14e0231822630d2d70f24e1c911cea0492354a258ef65096a6ce0da1510117c12466bc6cda577cdf9e8e74ede17e47f23e SHA512 d3549468de8fd161e4c9233fa0b170af1f28c74749d20f3d0eeb3873857f6c6d2cc0777d564e6a79be7cc21c9e982e10710a795320428dc51db809a8d0f9454e
-DIST 7z2301-src.tar.xz 1378588 BLAKE2B 348484b24b39db70e513fe50d79954ea0e2dd669f83e3601fa796c8f0ca4734132ca20fac8cda9b8ba550bad9146627fc0ae07056abb99028ef6d825b6a533bd SHA512 e39f660c023aa65e55388be225b5591fe2a5c9138693f3c9107e2eb4ce97fafde118d3375e01ada99d29de9633f56221b5b3d640c982178884670cd84c8aa986
-DIST 7z2405-linux-x64.tar.xz 1553872 BLAKE2B d6c0bd4eb81f4112bfe50bf6affc68021b03d059076af5519a41c8d471e978ad2b4acc8f67c650070f9d07c518741a0146579ddfb8d56fd125f6db0beece0990 SHA512 13f97236157e2761a0bf406b08fba13a1ecc6d5663fb38f8dfe3b87f3910ba34fd359d8b36bea5135319543f31ec1e210eb512ea9864d9b140c336b9e416c313
-DIST 7z2405-src.tar.xz 1486772 BLAKE2B 609c7ae8b89e56e747ebfecb25108d8918138f48f0f2ed73183c76101ddd3615aafb9eb7823be0de2a434b450587e01f476d2ed092628a311b6e4ed091e06260 SHA512 d340adfa68e818dd3d3aa411780c81532fa37b6649178b81ec3739725f83e0bc3c01744612b2d467f4d0c2cc984dd35488406d7baee185cf372acebd9c0123a7
-DIST 7z2406-linux-x64.tar.xz 1551724 BLAKE2B e4cc8141b074209b58018e6aeb4b91f140160d5d52e1fba59da2d0cfcd41c488cbfa4bda99bdedd4915ca3c3bcca50e7f7f4289f44ce120577c8b632d2f7bf07 SHA512 fce2b8e9f26f092209613dc058a267ddf24c474a80b7e9837014fdaeab53bb892b7181561ca90048ca593fe29e010b8221e078c9c3ab9815baf23bc9caf3e829
-DIST 7z2406-src.tar.xz 1487008 BLAKE2B 0f8dd19a031520a9c233725e376bca06c91b9b513bc802a54b92ea046ae3dda69a293561938a1e4467d01333d46427bfee7a055c8b62cab7a9d04cf8262fe4eb SHA512 02c6d7d045ba0dc0e8533f471f3c138f0d6549b59594095cb81a2f0e602627bd6a49df3fd680e21400a908006121ff7ba370086db9bde639f79b821bb4c9707a
 DIST 7z2407-linux-x64.tar.xz 1554932 BLAKE2B 9229fdac09148c50032656743aba0f8ce1ec06b7fd2dad2c693dc299c5f83fc093ba047e9c3c3971bf4cc9387b0db52c84167202ed7fcecfcc6f5bc508d04ada SHA512 31b5bb832e73f3c2fd0437873fe6130b8d1bd1bea8320d1b27d06bf40dd737758732eb3664fab2c36417b96ffc5daca6607b6f1aefdaa9e697122da60e37a728
 DIST 7z2407-src.tar.xz 1488556 BLAKE2B 42b4f9553aaa4797e80a2d50073ff0e77b5261e50766f8c596a632fb013ac1514a2963f27b924485f07728d13a4536c69911867e3728e8f8604ec25fc4c6824e SHA512 0299e5c1e1dfd33ecf22077f812da1f25bf2146a713c7a7e2498d639520f21f029e853914e66a84d1edfc5d721e1f3d914a3171ab336a406a94bc82d5b2d8e5d
--- a/app-arch/7zip/metadata.xml
+++ b/app-arch/7zip/metadata.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
 		<email>nrk@disroot.org</email>
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
--- a/app-backup/borgmatic/borgmatic-1.8.12.ebuild
+++ b/app-backup/borgmatic/borgmatic-1.8.12.ebuild
@ -14,7 +14,7 @@ HOMEPAGE="https://torsion.org/borgmatic/"

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv"
 IUSE="apprise"

 REQUIRED_USE="test? ( apprise )"
--- a/app-backup/dar/dar-2.7.15.ebuild
+++ b/app-backup/dar/dar-2.7.15.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/project/dar/dar/${PV}/${P}.tar.gz"

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86 ~amd64-linux"
+KEYWORDS="amd64 ppc sparc x86 ~amd64-linux"
 IUSE="argon2 curl dar32 dar64 doc gcrypt gpg lz4 lzo nls rsync xattr"

 REQUIRED_USE="
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
--- a/app-cdr/xfburn/xfburn-0.7.1.ebuild
+++ b/app-cdr/xfburn/xfburn-0.7.1.ebuild
@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86"
 IUSE="gstreamer +udev"

 DEPEND="
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
--- a/app-containers/devcontainer/devcontainer-0.65.0.ebuild
+++ b/app-containers/devcontainer/devcontainer-0.65.0.ebuild
@ -12,7 +12,7 @@ S="${WORKDIR}/package"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"

 RDEPEND="
 	net-libs/nodejs
--- a/app-containers/incus/Manifest
+++ b/app-containers/incus/Manifest
@ -1,8 +1,4 @@
-DIST incus-6.0.0.tar.xz 11839792 BLAKE2B 135574e6f19262992bb068a3c0a0045c192699503e417eb861e00a974e631fd869485eb96238d1dbe4712e789367d31afae1c62bade2a8b75f7e9a7620547e74 SHA512 eb6d784a535d487bd85b3e8272d7cddc23f2ed98ca2b3e2f19c038b4a6f910d4030822424154489adef7a688757905927309d25f6d1ff621d99d678fe6aeae2b
-DIST incus-6.0.0.tar.xz.asc 833 BLAKE2B f35c38f886290ff08e017cd54e8019c43bfbf1f9c84b26ede2cfa78acbe4047af4314465e77d6e900f296552d5ac8f8c07d26a11920bff937fbb8a0a910efb0d SHA512 0360520752fad3e95807d09e4fd6d60c96a202d0dbb61621925abd75aa801b6d573abbece3179a8906bdc47e96ddec4a746607ce2d10dcc1a76d0afd459cbf81
 DIST incus-6.0.1.tar.xz 11653056 BLAKE2B d026f9fb99d7393d286006cfe759681b58b980b7a2432a98ba8a6862e17099ef6ee8d1ec1766d00fac1a6d1e748a7d10d3d5ad14b31c542618044f77a27fe255 SHA512 8218c121cf1afd307f748c0f1c0b1ba34a05fa0c43a515aab03d9f92c66becaa6bff245e93842e7b0746ce6019d66f1a5e4c317ec05e0ab088b539e5378d78dc
 DIST incus-6.0.1.tar.xz.asc 833 BLAKE2B c5c9d3d4796e97ef745102c13e52d691e7f087a5a0cc8e0a069ec7c94686e6e8de04d3dd247157e16eb3deea2b877453e3462ec829ced2ba9cb1928af9a3aa1b SHA512 c47df95afa7c9ef7041fb29497567ab3b1ed30c3c175b4be84bc75a6a2c47072cc291e43fa738a5a58d753b04aef87334780f9d45184a9543a49fad263859aa0
-DIST incus-6.2.tar.xz 11060268 BLAKE2B ac276e9192bd309d41762e1756ed8276835d597f92fef554f74d8dd11f1d6685f95815c89a1770a7e3fd3c8c08dea65e5dffeac942e97052e7bdb1337d2d3817 SHA512 a5a41199b5ec21a6b2abb7ae33d245032db67ec8aedec3eb1cd18236ce39106c25c4a71524d363103c4a6fbe4420368e0fe8763a2eb84afdbf7f069e53312fa7
-DIST incus-6.2.tar.xz.asc 833 BLAKE2B 68e967083b715716f5eedeeb4e81c5d90e45af1c9bd3ce373d8edab9d872598585e3ee9ae738292a7cc66f52907908627d5dd62ef963f62b37ed74620d59ef90 SHA512 77a82dd92438815c0f02a4399f2cda465692589eef12dba4482bdcb0cf1bd1e71dd3a6ccedfa0d9c4a11891b0883764adae3db994f21bb46655372988941ae2a
 DIST incus-6.3.tar.xz 11717996 BLAKE2B 25a4f13e860c4d60e24b32f8ce1db0c4cf81f2595169c105d2e1a3b38563232b141f08039c243d903c5b81ddde0eb1a8008ae24cef955ed9d001241edc1336f2 SHA512 e9da3e2c3ef9c7e8b0ae77bef7fe674e427d63cc97a397c61eca3eb3f31e5e4ee8670543d7cf05b7efcfc08645ee7339c44aab87c5a4aa4578566dec3a512048
 DIST incus-6.3.tar.xz.asc 833 BLAKE2B 1b204199cda642dbe2b89167a4ac210ab43c1798ecf5079d24f585dc9e559e9216ba8dce8c39ae2de8ec298cb157d8926dd8a545c4a21464e88babe54e585c9c SHA512 e3318a8037f488b5ce0b551a485c568cba7137c70ad170f963d4cad3bb1fc8b12a9da564b03d754f82f354b1a59c37fd3857d3804e75d14428e52ee6121411a4
--- a/app-containers/incus/incus-6.0.0-r1.ebuild
+++ b/app-containers/incus/incus-6.0.0-r1.ebuild
@ -1,219 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module linux-info optfeature systemd toolchain-funcs verify-sig
-
-DESCRIPTION="Modern, secure and powerful system container and virtual machine manager"
-HOMEPAGE="https://linuxcontainers.org/incus/introduction/ https://github.com/lxc/incus"
-SRC_URI="https://linuxcontainers.org/downloads/incus/${P}.tar.xz
-	verify-sig? ( https://linuxcontainers.org/downloads/incus/${P}.tar.xz.asc )"
-
-LICENSE="Apache-2.0 BSD LGPL-3 MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="apparmor fuidshift nls"
-
-DEPEND="acct-group/incus
-	acct-group/incus-admin
-	app-arch/xz-utils
-	>=app-containers/lxc-5.0.0:=[apparmor?,seccomp(+)]
-	dev-db/sqlite:3
-	>=dev-libs/cowsql-1.15.6
-	dev-libs/lzo
-	>=dev-libs/raft-0.22.1:=[lz4]
-	>=dev-util/xdelta-3.0[lzma(+)]
-	net-dns/dnsmasq[dhcp]
-	sys-libs/libcap
-	virtual/udev"
-RDEPEND="${DEPEND}
-	fuidshift? ( !app-containers/lxd )
-	net-firewall/ebtables
-	net-firewall/iptables
-	sys-apps/iproute2
-	sys-fs/fuse:*
-	>=sys-fs/lxcfs-5.0.0
-	sys-fs/squashfs-tools[lzma]
-	virtual/acl"
-BDEPEND=">=dev-lang/go-1.21
-	nls? ( sys-devel/gettext )
-	verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
-
-CONFIG_CHECK="
-	~CGROUPS
-	~IPC_NS
-	~NET_NS
-	~PID_NS
-
-	~SECCOMP
-	~USER_NS
-	~UTS_NS
-
-	~KVM
-	~MACVTAP
-	~VHOST_VSOCK
-"
-
-ERROR_IPC_NS="CONFIG_IPC_NS is required."
-ERROR_NET_NS="CONFIG_NET_NS is required."
-ERROR_PID_NS="CONFIG_PID_NS is required."
-ERROR_SECCOMP="CONFIG_SECCOMP is required."
-ERROR_UTS_NS="CONFIG_UTS_NS is required."
-
-WARNING_KVM="CONFIG_KVM and CONFIG_KVM_AMD/-INTEL is required for virtual machines."
-WARNING_MACVTAP="CONFIG_MACVTAP is required for virtual machines."
-WARNING_VHOST_VSOCK="CONFIG_VHOST_VSOCK is required for virtual machines."
-
-# Go magic.
-QA_PREBUILT="/usr/bin/incus
-	/usr/bin/lxc-to-incus
-	/usr/bin/incus-agent
-	/usr/bin/incus-benchmark
-	/usr/bin/incus-migrate
-	/usr/sbin/fuidshift
-	/usr/sbin/lxd-to-incus
-	/usr/sbin/incusd"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/linuxcontainers.asc
-
-# The testsuite must be run as root.
-# make: *** [Makefile:156: check] Error 1
-RESTRICT="test"
-
-GOPATH="${S}/_dist"
-
-src_unpack() {
-	verify-sig_src_unpack
-	go-module_src_unpack
-}
-
-src_prepare() {
-	export GOPATH="${S}/_dist"
-
-	default
-
-	sed -i \
-		-e "s:\./configure:./configure --prefix=/usr --libdir=${EPREFIX}/usr/lib/incus:g" \
-		-e "s:make:make ${MAKEOPTS}:g" \
-		Makefile || die
-
-	# Fix hardcoded ovmf file path, see bug 763180
-	sed -i \
-		-e "s:/usr/share/OVMF:/usr/share/edk2-ovmf:g" \
-		-e "s:OVMF_VARS.ms.fd:OVMF_VARS.fd:g" \
-		doc/environment.md \
-		internal/server/apparmor/instance.go \
-		internal/server/apparmor/instance_qemu.go \
-		internal/server/instance/drivers/driver_qemu.go || die "Failed to fix hardcoded ovmf paths."
-
-	# Fix hardcoded virtfs-proxy-helper file path, see bug 798924
-	sed -i \
-		-e "s:/usr/lib/qemu/virtfs-proxy-helper:/usr/libexec/virtfs-proxy-helper:g" \
-		internal/server/device/device_utils_disk.go || die "Failed to fix virtfs-proxy-helper path."
-
-	cp "${FILESDIR}"/incus-0.4.service "${T}"/incus.service || die
-	if use apparmor; then
-		sed -i \
-			'/^EnvironmentFile=.*/a ExecStartPre=\/usr\/libexec\/lxc\/lxc-apparmor-load' \
-			"${T}"/incus.service || die
-	fi
-
-	# Disable -Werror's from go modules.
-	find "${S}" -name "cgo.go" -exec sed -i "s/ -Werror / /g" {} + || die
-}
-
-src_configure() { :; }
-
-src_compile() {
-	export GOPATH="${S}/_dist"
-	export CGO_LDFLAGS_ALLOW="-Wl,-z,now"
-
-	for k in incus-benchmark incus-simplestreams incus-user incus lxc-to-incus lxd-to-incus ; do
-		ego install -v -x "${S}/cmd/${k}"
-	done
-
-	if use fuidshift ; then
-		ego install -v -x "${S}/cmd/fuidshift"
-	fi
-
-	ego install -v -x -tags libsqlite3 "${S}"/cmd/incusd
-
-	# Needs to be built statically
-	CGO_ENABLED=0 go install -v -tags netgo "${S}"/cmd/incus-migrate
-	CGO_ENABLED=0 go install -v -tags agent,netgo "${S}"/cmd/incus-agent
-
-	use nls && emake build-mo
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	export GOPATH="${S}/_dist"
-
-	if tc-is-cross-compiler ; then
-		local bindir="_dist/bin/linux_${GOARCH}"
-	else
-		local bindir="_dist/bin"
-	fi
-
-	newsbin "${FILESDIR}"/incus-startup-0.4.sh incus-startup
-
-	# Admin tools
-	for l in incusd incus-user lxd-to-incus ; do
-		dosbin ${bindir}/${l}
-	done
-
-	# User tools
-	for m in incus-agent incus-benchmark incus-migrate incus-simplestreams incus lxc-to-incus ; do
-		dobin ${bindir}/${m}
-	done
-
-	# fuidshift, should be moved under admin tools at some point
-	if use fuidshift ; then
-		dosbin ${bindir}/fuidshift
-	fi
-
-	newconfd "${FILESDIR}"/incus-0.4.confd incus
-	newinitd "${FILESDIR}"/incus-0.4.initd incus
-	newinitd "${FILESDIR}"/incus-user-0.4.initd incus-user
-
-	systemd_dounit "${T}"/incus.service
-	systemd_newunit "${FILESDIR}"/incus-0.4.socket incus.socket
-	systemd_newunit "${FILESDIR}"/incus-startup-0.4.service incus-startup.service
-	systemd_newunit "${FILESDIR}"/incus-user-0.4.service incus-user.service
-	systemd_newunit "${FILESDIR}"/incus-user-0.4.socket incus-user.socket
-
-	if ! tc-is-cross-compiler; then
-		# Generate and install shell completion files.
-		mkdir -p "${D}"/usr/share/{bash-completion/completions/,fish/vendor_completions.d/,zsh/site-functions/} || die
-		"${bindir}"/incus completion bash > "${D}"/usr/share/bash-completion/completions/incus || die
-		"${bindir}"/incus completion fish > "${D}"/usr/share/fish/vendor_completions.d/incus.fish || die
-		"${bindir}"/incus completion zsh > "${D}"/usr/share/zsh/site-functions/_incus || die
-	else
-		ewarn "Shell completion files not installed! Install them manually with incus completion --help"
-	fi
-
-	dodoc AUTHORS
-	dodoc -r doc/*
-	use nls && domo po/*.mo
-}
-
-pkg_postinst() {
-	elog
-	elog "Please see"
-	elog "  https://wiki.gentoo.org/wiki/Incus"
-	elog "  https://wiki.gentoo.org/wiki/Incus#Migrating_from_LXD"
-	elog
-	optfeature "virtual machine support" app-cdr/cdrtools app-emulation/qemu[spice,usbredir,virtfs]
-	optfeature "btrfs storage backend" sys-fs/btrfs-progs
-	optfeature "ipv6 support" net-dns/dnsmasq[ipv6]
-	optfeature "full incus-migrate support" net-misc/rsync
-	optfeature "lvm2 storage backend" sys-fs/lvm2
-	optfeature "zfs storage backend" sys-fs/zfs
-	elog
-	elog "Be sure to add your local user to the incus group."
-	elog
-}
--- a/app-containers/incus/incus-6.2.ebuild
+++ b/app-containers/incus/incus-6.2.ebuild
@ -1,219 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module linux-info optfeature systemd toolchain-funcs verify-sig
-
-DESCRIPTION="Modern, secure and powerful system container and virtual machine manager"
-HOMEPAGE="https://linuxcontainers.org/incus/introduction/ https://github.com/lxc/incus"
-SRC_URI="https://linuxcontainers.org/downloads/incus/${P}.tar.xz
-	verify-sig? ( https://linuxcontainers.org/downloads/incus/${P}.tar.xz.asc )"
-
-LICENSE="Apache-2.0 BSD LGPL-3 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="apparmor fuidshift nls"
-
-DEPEND="acct-group/incus
-	acct-group/incus-admin
-	app-arch/xz-utils
-	>=app-containers/lxc-5.0.0:=[apparmor?,seccomp(+)]
-	dev-db/sqlite:3
-	>=dev-libs/cowsql-1.15.6
-	dev-libs/lzo
-	>=dev-libs/raft-0.22.1:=[lz4]
-	>=dev-util/xdelta-3.0[lzma(+)]
-	net-dns/dnsmasq[dhcp]
-	sys-libs/libcap
-	virtual/udev"
-RDEPEND="${DEPEND}
-	fuidshift? ( !app-containers/lxd )
-	net-firewall/ebtables
-	net-firewall/iptables
-	sys-apps/iproute2
-	sys-fs/fuse:*
-	>=sys-fs/lxcfs-5.0.0
-	sys-fs/squashfs-tools[lzma]
-	virtual/acl"
-BDEPEND=">=dev-lang/go-1.21
-	nls? ( sys-devel/gettext )
-	verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
-
-CONFIG_CHECK="
-	~CGROUPS
-	~IPC_NS
-	~NET_NS
-	~PID_NS
-
-	~SECCOMP
-	~USER_NS
-	~UTS_NS
-
-	~KVM
-	~MACVTAP
-	~VHOST_VSOCK
-"
-
-ERROR_IPC_NS="CONFIG_IPC_NS is required."
-ERROR_NET_NS="CONFIG_NET_NS is required."
-ERROR_PID_NS="CONFIG_PID_NS is required."
-ERROR_SECCOMP="CONFIG_SECCOMP is required."
-ERROR_UTS_NS="CONFIG_UTS_NS is required."
-
-WARNING_KVM="CONFIG_KVM and CONFIG_KVM_AMD/-INTEL is required for virtual machines."
-WARNING_MACVTAP="CONFIG_MACVTAP is required for virtual machines."
-WARNING_VHOST_VSOCK="CONFIG_VHOST_VSOCK is required for virtual machines."
-
-# Go magic.
-QA_PREBUILT="/usr/bin/incus
-	/usr/bin/incus-agent
-	/usr/bin/incus-benchmark
-	/usr/bin/incus-migrate
-	/usr/bin/lxc-to-incus
-	/usr/sbin/fuidshift
-	/usr/sbin/incusd
-	/usr/sbin/lxd-to-incus"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/linuxcontainers.asc
-
-# The testsuite must be run as root.
-# make: *** [Makefile:156: check] Error 1
-RESTRICT="test"
-
-GOPATH="${S}/_dist"
-
-src_unpack() {
-	verify-sig_src_unpack
-	go-module_src_unpack
-}
-
-src_prepare() {
-	export GOPATH="${S}/_dist"
-
-	default
-
-	sed -i \
-		-e "s:\./configure:./configure --prefix=/usr --libdir=${EPREFIX}/usr/lib/incus:g" \
-		-e "s:make:make ${MAKEOPTS}:g" \
-		Makefile || die
-
-	# Fix hardcoded ovmf file path, see bug 763180
-	sed -i \
-		-e "s:/usr/share/OVMF:/usr/share/edk2-ovmf:g" \
-		-e "s:OVMF_VARS.ms.fd:OVMF_VARS.fd:g" \
-		doc/environment.md \
-		internal/server/apparmor/instance.go \
-		internal/server/apparmor/instance_qemu.go \
-		internal/server/instance/drivers/driver_qemu.go || die "Failed to fix hardcoded ovmf paths."
-
-	# Fix hardcoded virtfs-proxy-helper file path, see bug 798924
-	sed -i \
-		-e "s:/usr/lib/qemu/virtfs-proxy-helper:/usr/libexec/virtfs-proxy-helper:g" \
-		internal/server/device/device_utils_disk.go || die "Failed to fix virtfs-proxy-helper path."
-
-	cp "${FILESDIR}"/incus-0.4.service "${T}"/incus.service || die
-	if use apparmor; then
-		sed -i \
-			'/^EnvironmentFile=.*/a ExecStartPre=\/usr\/libexec\/lxc\/lxc-apparmor-load' \
-			"${T}"/incus.service || die
-	fi
-
-	# Disable -Werror's from go modules.
-	find "${S}" -name "cgo.go" -exec sed -i "s/ -Werror / /g" {} + || die
-}
-
-src_configure() { :; }
-
-src_compile() {
-	export GOPATH="${S}/_dist"
-	export CGO_LDFLAGS_ALLOW="-Wl,-z,now"
-
-	for k in incus-benchmark incus-simplestreams incus-user incus lxc-to-incus lxd-to-incus ; do
-		ego install -v -x "${S}/cmd/${k}"
-	done
-
-	if use fuidshift ; then
-		ego install -v -x "${S}/cmd/fuidshift"
-	fi
-
-	ego install -v -x -tags libsqlite3 "${S}"/cmd/incusd
-
-	# Needs to be built statically
-	CGO_ENABLED=0 go install -v -tags netgo "${S}"/cmd/incus-migrate
-	CGO_ENABLED=0 go install -v -tags agent,netgo "${S}"/cmd/incus-agent
-
-	use nls && emake build-mo
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	export GOPATH="${S}/_dist"
-
-	if tc-is-cross-compiler ; then
-		local bindir="_dist/bin/linux_${GOARCH}"
-	else
-		local bindir="_dist/bin"
-	fi
-
-	newsbin "${FILESDIR}"/incus-startup-0.4.sh incus-startup
-
-	# Admin tools
-	for l in incusd incus-user lxd-to-incus ; do
-		dosbin ${bindir}/${l}
-	done
-
-	# User tools
-	for m in incus-agent incus-benchmark incus-migrate incus-simplestreams incus lxc-to-incus ; do
-		dobin ${bindir}/${m}
-	done
-
-	# fuidshift, should be moved under admin tools at some point
-	if use fuidshift ; then
-		dosbin ${bindir}/fuidshift
-	fi
-
-	newconfd "${FILESDIR}"/incus-0.4.confd incus
-	newinitd "${FILESDIR}"/incus-0.4.initd incus
-	newinitd "${FILESDIR}"/incus-user-0.4.initd incus-user
-
-	systemd_dounit "${T}"/incus.service
-	systemd_newunit "${FILESDIR}"/incus-0.4.socket incus.socket
-	systemd_newunit "${FILESDIR}"/incus-startup-0.4.service incus-startup.service
-	systemd_newunit "${FILESDIR}"/incus-user-0.4.service incus-user.service
-	systemd_newunit "${FILESDIR}"/incus-user-0.4.socket incus-user.socket
-
-	if ! tc-is-cross-compiler; then
-		# Generate and install shell completion files.
-		mkdir -p "${D}"/usr/share/{bash-completion/completions/,fish/vendor_completions.d/,zsh/site-functions/} || die
-		"${bindir}"/incus completion bash > "${D}"/usr/share/bash-completion/completions/incus || die
-		"${bindir}"/incus completion fish > "${D}"/usr/share/fish/vendor_completions.d/incus.fish || die
-		"${bindir}"/incus completion zsh > "${D}"/usr/share/zsh/site-functions/_incus || die
-	else
-		ewarn "Shell completion files not installed! Install them manually with incus completion --help"
-	fi
-
-	dodoc AUTHORS
-	dodoc -r doc/*
-	use nls && domo po/*.mo
-}
-
-pkg_postinst() {
-	elog
-	elog "Please see"
-	elog "  https://wiki.gentoo.org/wiki/Incus"
-	elog "  https://wiki.gentoo.org/wiki/Incus#Migrating_from_LXD"
-	elog
-	optfeature "virtual machine support" app-cdr/cdrtools app-emulation/qemu[spice,usbredir,virtfs]
-	optfeature "btrfs storage backend" sys-fs/btrfs-progs
-	optfeature "ipv6 support" net-dns/dnsmasq[ipv6]
-	optfeature "full incus-migrate support" net-misc/rsync
-	optfeature "lvm2 storage backend" sys-fs/lvm2
-	optfeature "zfs storage backend" sys-fs/zfs
-	elog
-	elog "Be sure to add your local user to the incus group."
-	elog
-}
--- a/app-containers/lxc/lxc-6.0.1.ebuild
+++ b/app-containers/lxc/lxc-6.0.1.ebuild
@ -18,7 +18,7 @@ IUSE="apparmor +caps examples io-uring lto man pam seccomp selinux ssl systemd t
 RDEPEND="acct-group/lxc
 	acct-user/lxc
 	apparmor? ( sys-libs/libapparmor )
-	caps? ( sys-libs/libcap[static-libs] )
+	caps? ( sys-libs/libcap )
 	io-uring? ( >=sys-libs/liburing-2:= )
 	pam? ( sys-libs/pam )
 	seccomp? ( sys-libs/libseccomp )
@ -28,8 +28,10 @@ RDEPEND="acct-group/lxc
 		sys-apps/dbus
 		sys-apps/systemd:=
 	)
-	tools? ( sys-libs/libcap[static-libs] )"
+	tools? ( sys-libs/libcap )"
 DEPEND="${RDEPEND}
+	caps? ( sys-libs/libcap[static-libs] )
+	tools? ( sys-libs/libcap[static-libs] )
 	sys-kernel/linux-headers"
 BDEPEND="virtual/pkgconfig
 	man? ( app-text/docbook2X )
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/efitools/metadata.xml
+++ b/app-crypt/efitools/metadata.xml
@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>tamiko@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
--- a/app-crypt/jitterentropy-rngd/metadata.xml
+++ b/app-crypt/jitterentropy-rngd/metadata.xml
@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>tamiko@gentoo.org</email>
-	<name>Matthias Maier</name>
-</maintainer>
-<longdescription>
-	The Jitter RNG daemon provides an entropy source that feeds into the
-	Linux /dev/random device if its entropy runs low. It updates the
-	/dev/random entropy estimator such that the newly provided entropy
-	unblocks /dev/random.
-</longdescription>
-<upstream>
-	<remote-id type="github">smuellerDD/jitterentropy-rngd</remote-id>
-</upstream>
+	<!-- maintainer-needed -->
+	<longdescription>
+		The Jitter RNG daemon provides an entropy source that feeds into the
+		Linux /dev/random device if its entropy runs low. It updates the
+		/dev/random entropy estimator such that the newly provided entropy
+		unblocks /dev/random.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">smuellerDD/jitterentropy-rngd</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@ -1,2 +1 @@
-DIST qca-2.3.8.tar.xz 761340 BLAKE2B 04ec8d2fb9c2c00b04407828c549a4bb7d8bf6cda2f1071078dd446b8fc90c89872b2a4dc838bcb4eb34132545365be210c0043bde95c084901661a874600b34 SHA512 ddb410214e8264955c2bb8c68d018e3826cb8ec48f8cc7207c2aec1c36051dc0501455b5049eff927dcf354603c0646f86ca10f2cebebe87789b3fd07a993b68
 DIST qca-2.3.9.tar.xz 765256 BLAKE2B 6f8015f45c252d4991dce9154f270d7450b94ec40156e91d537fbdbc17969873689f324032ee24e3fa1c7205a41c6da2870375bfafa308cf82f266bc89da8081 SHA512 025ef203c66e413a9c93d7e0e5449d8a23fb6bb27b2f1c4f137173e33b8c17ff6dec794c8349b6b37ee9d7fffe23875a2cf7cf6592efc373f1aac9230f83aa06
--- a/app-crypt/qca/qca-2.3.8.ebuild
+++ b/app-crypt/qca/qca-2.3.8.ebuild
@ -1,118 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake kde.org multibuild out-of-source-utils qmake-utils
-
-DESCRIPTION="Qt Cryptographic Architecture (QCA)"
-HOMEPAGE="https://userbase.kde.org/QCA"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="botan debug doc examples gcrypt gpg logger nss pkcs11 +qt5 qt6 sasl softstore +ssl test"
-REQUIRED_USE="|| ( qt5 qt6 )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	botan? ( dev-libs/botan:3= )
-	gcrypt? ( dev-libs/libgcrypt:= )
-	gpg? ( app-crypt/gnupg )
-	nss? ( dev-libs/nss )
-	pkcs11? (
-		>=dev-libs/openssl-1.1
-		dev-libs/pkcs11-helper
-	)
-	qt5? ( >=dev-qt/qtcore-5.14:5 )
-	qt6? (
-		dev-qt/qtbase:6
-		dev-qt/qt5compat:6
-	)
-	sasl? ( dev-libs/cyrus-sasl:2 )
-	ssl? ( >=dev-libs/openssl-1.1:= )
-"
-DEPEND="${RDEPEND}
-	test? (
-		qt5? (
-			dev-qt/qtnetwork:5
-			dev-qt/qttest:5
-		)
-		qt6? ( dev-qt/qtbase:6[network] )
-	)
-"
-BDEPEND="
-	doc? (
-		app-text/doxygen[dot]
-		virtual/latex-base
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-disable-pgp-test.patch"
-	"${FILESDIR}/${PN}-2.3.7-use-sha256-not-sha1.patch" # git master
-)
-
-qca_plugin_use() {
-	echo -DWITH_${2:-$1}_PLUGIN=$(usex "$1")
-}
-
-pkg_setup() {
-	MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) )
-}
-
-src_configure() {
-	myconfigure() {
-		local mycmakeargs=(
-			-DQCA_FEATURE_INSTALL_DIR="${EPREFIX}$(${MULTIBUILD_VARIANT}_get_mkspecsdir)/features"
-			-DQCA_PLUGINS_INSTALL_DIR="${EPREFIX}$(${MULTIBUILD_VARIANT}_get_plugindir)"
-			$(qca_plugin_use botan)
-			$(qca_plugin_use gcrypt)
-			$(qca_plugin_use gpg gnupg)
-			$(qca_plugin_use logger)
-			$(qca_plugin_use nss)
-			$(qca_plugin_use pkcs11)
-			$(qca_plugin_use sasl cyrus-sasl)
-			$(qca_plugin_use softstore)
-			$(qca_plugin_use ssl ossl)
-			-DBUILD_TESTS=$(usex test)
-		)
-		if [[ ${MULTIBUILD_VARIANT} == qt6 ]]; then
-				mycmakeargs+=( -DBUILD_WITH_QT6=ON )
-		else
-				mycmakeargs+=( -DBUILD_WITH_QT6=OFF )
-		fi
-		cmake_src_configure
-	}
-
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	multibuild_foreach_variant cmake_src_compile
-	if use doc; then
-		multibuild_for_best_variant cmake_build doc
-	fi
-}
-
-src_test() {
-	mytest() {
-		local -x QCA_PLUGIN_PATH="${BUILD_DIR}/lib/qca"
-		cmake_src_test
-	}
-	multibuild_foreach_variant mytest
-}
-
-src_install() {
-	multibuild_foreach_variant cmake_src_install
-
-	if use doc; then
-		multibuild_for_best_variant run_in_build_dir dodoc -r apidocs/html
-	fi
-
-	if use examples; then
-		dodoc -r "${S}"/examples
-	fi
-}
--- a/app-crypt/sbsigntools/metadata.xml
+++ b/app-crypt/sbsigntools/metadata.xml
@ -5,9 +5,6 @@
 		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>tamiko@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">ubuntu</remote-id>
 	</upstream>
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/featherpad/featherpad-1.5.1.ebuild
+++ b/app-editors/featherpad/featherpad-1.5.1.ebuild
@ -12,7 +12,7 @@ S="${WORKDIR}/FeatherPad-${PV}"

 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="+X"

 RDEPEND="
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@ -1,2 +1,3 @@
 DIST neovim-0.10.0.tar.gz 12792034 BLAKE2B b9bf44d2f0ae1075196f5f96b2fb5e974907406fa6e5bf09593d1f9f36135dab466b6a063d1d03e3716dce435df296ec6d00a2f015e85d0edd231fb9fd4c9385 SHA512 878cb58729a18179b38303bd9cf79e38997c87946665ac4e7b76d87e15f5d001028fd1454ce30b20773b20a4fe929dfa399fc2ec7f6db0774a4e864c9e8586c1
+DIST neovim-0.10.1.tar.gz 12796966 BLAKE2B 85d98abe03f69ab03d09dc1b39783974af392f707deddef4640b6953ad574f9a455897217c2431c6c2fadb56568b55ac18ed06bbfcc7bbe1c6ab013991e99ee6 SHA512 37e9d45041b059a26fe02717eae7cdbde58f0a35560c590764f5888de67cfa04bee76d6b359ab14b020ac5a661d64908960283347381d334106308504c0df908
 DIST neovim-0.9.5.tar.gz 11590180 BLAKE2B a982ea5704a8e5810c42475198157c3d2255c033f47cba940f9f6414c649167ecafe08c7fe9aeb3154a15566fdf8f5db8d535fa752e467e36ff5d552a7aa2179 SHA512 6e20d0a1d506dc292dd68dabe4b5635f86c019ca832f9927e907377e6d21fe7765b3010f5bba644bb2d7a76c178d55b290af24856a7e3c4083a1aa60bc496775
--- a/app-editors/neovim/neovim-0.10.1.ebuild
+++ b/app-editors/neovim/neovim-0.10.1.ebuild
@ -0,0 +1,130 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# RelWithDebInfo sets -Og -g
+CMAKE_BUILD_TYPE=Release
+LUA_COMPAT=( lua5-{1..2} luajit )
+inherit cmake lua-single optfeature xdg
+
+DESCRIPTION="Vim-fork focused on extensibility and agility"
+HOMEPAGE="https://neovim.io"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
+else
+	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="Apache-2.0 vim"
+SLOT="0"
+IUSE="+nvimpager test"
+
+# Upstream say the test library needs LuaJIT
+# https://github.com/neovim/neovim/blob/91109ffda23d0ce61cec245b1f4ffb99e7591b62/CMakeLists.txt#L377
+REQUIRED_USE="${LUA_REQUIRED_USE} test? ( lua_single_target_luajit )"
+# TODO: Get tests running
+RESTRICT="!test? ( test ) test"
+
+# Upstream build scripts invoke the Lua interpreter
+BDEPEND="${LUA_DEPS}
+	>=dev-util/gperf-3.1
+	>=sys-devel/gettext-0.20.1
+	virtual/libiconv
+	virtual/libintl
+	virtual/pkgconfig
+"
+# Check https://github.com/neovim/neovim/blob/master/third-party/CMakeLists.txt for
+# new dependency bounds and so on on bumps (obviously adjust for right branch/tag).
+# List of required tree-sitter parsers is taken from cmake.deps/deps.txt
+DEPEND="${LUA_DEPS}
+	>=dev-lua/luv-1.45.0[${LUA_SINGLE_USEDEP}]
+	$(lua_gen_cond_dep '
+		dev-lua/lpeg[${LUA_USEDEP}]
+		dev-lua/mpack[${LUA_USEDEP}]
+	')
+	$(lua_gen_cond_dep '
+		dev-lua/LuaBitOp[${LUA_USEDEP}]
+	' lua5-{1,2})
+	>=dev-libs/libutf8proc-2.9.0:=
+	>=dev-libs/libuv-1.46.0:=
+	>=dev-libs/libvterm-0.3.3
+	>=dev-libs/msgpack-3.0.0:=
+	>=dev-libs/tree-sitter-0.22.6:=
+	=dev-libs/tree-sitter-bash-0.21*
+	=dev-libs/tree-sitter-c-0.21*
+	=dev-libs/tree-sitter-lua-0.1*
+	=dev-libs/tree-sitter-markdown-0.2*
+	=dev-libs/tree-sitter-python-0.21*
+	=dev-libs/tree-sitter-query-0.4*
+	=dev-libs/tree-sitter-vim-0.4*
+	=dev-libs/tree-sitter-vimdoc-3*
+	>=dev-libs/unibilium-2.0.0:0=
+"
+RDEPEND="
+	${DEPEND}
+	app-eselect/eselect-vi
+"
+BDEPEND+="
+	test? (
+		$(lua_gen_cond_dep 'dev-lua/busted[${LUA_USEDEP}]')
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.0-cmake_lua_version.patch"
+	"${FILESDIR}/${PN}-9999-cmake-darwin.patch"
+)
+
+src_prepare() {
+	# Use our system vim dir
+	sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
+		-i src/nvim/globals.h || die
+
+	# https://forums.gentoo.org/viewtopic-p-8750050.html
+	xdg_environment_reset
+	cmake_src_prepare
+}
+
+src_configure() {
+	ln -s "${BROOT}"/usr/bin/luajit "${BUILD_DIR}"/luajit || die
+	# TODO: Investigate USE_BUNDLED, doesn't seem to be needed right now
+	local mycmakeargs=(
+		# appends -flto
+		-DENABLE_LTO=OFF
+		-DPREFER_LUA=$(usex lua_single_target_luajit no "$(lua_get_version)")
+		-DLUA_PRG="${ELUA}"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# install a default configuration file
+	insinto /etc/vim
+	doins "${FILESDIR}"/sysinit.vim
+
+	# symlink tree-sitter parsers
+	dodir /usr/share/nvim/runtime
+	for parser in bash c lua markdown python query vim vimdoc; do
+		dosym ../../../../$(get_libdir)/libtree-sitter-${parser}.so /usr/share/nvim/runtime/parser/${parser}.so
+	done
+
+	# conditionally install a symlink for nvimpager
+	if use nvimpager; then
+		dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "clipboard support" x11-misc/xsel x11-misc/xclip gui-apps/wl-clipboard
+	optfeature "Python plugin support" dev-python/pynvim
+	optfeature "Ruby plugin support" dev-ruby/neovim-ruby-client
+	optfeature "remote/nvr support" dev-python/neovim-remote
+}
--- a/app-editors/neovim/neovim-9999.ebuild
+++ b/app-editors/neovim/neovim-9999.ebuild
@ -49,6 +49,7 @@ DEPEND="${LUA_DEPS}
 	$(lua_gen_cond_dep '
 		dev-lua/LuaBitOp[${LUA_USEDEP}]
 	' lua5-{1,2})
+	>=dev-libs/libutf8proc-2.9.0:=
 	>=dev-libs/libuv-1.46.0:=
 	>=dev-libs/libvterm-0.3.3
 	>=dev-libs/msgpack-3.0.0:=
@ -58,11 +59,10 @@ DEPEND="${LUA_DEPS}
 	=dev-libs/tree-sitter-lua-0.1*
 	=dev-libs/tree-sitter-markdown-0.2*
 	=dev-libs/tree-sitter-python-0.21*
-	=dev-libs/tree-sitter-query-0.3*
+	=dev-libs/tree-sitter-query-0.4*
 	=dev-libs/tree-sitter-vim-0.4*
-	=dev-libs/tree-sitter-vimdoc-2*
+	=dev-libs/tree-sitter-vimdoc-3*
 	>=dev-libs/unibilium-2.0.0:0=
-	>=dev-libs/libutf8proc-2.9.0:=
 "
 RDEPEND="
 	${DEPEND}
--- a/app-editors/vscode/Manifest
+++ b/app-editors/vscode/Manifest
@ -4,3 +4,6 @@ DIST vscode-1.91.0-arm64.tar.gz 138968980 BLAKE2B 591a068e0de00a5898c9f2c83aaae7
 DIST vscode-1.91.1-amd64.tar.gz 142223657 BLAKE2B 31fba4dc0940f217648554705debf13e0caf71e84a29f85c98e861b6c78327850724262ba1b927c10a8692b4a6db6fd8ddaec69dfa577f74ca6ef696f87dc3a7 SHA512 01ff19cd5a79550ab568ef6d9ad8dc6a0e6e15560dd01d97c30f6e6d5930430cccd0675c80791df06ffbd83351f85901f1b0c684b158b6eb1f68d21dccee7508
 DIST vscode-1.91.1-arm.tar.gz 127169905 BLAKE2B 5ac2da6c115851d796bfc7835d689a59476e4bf8db770c5089b2c484776ee270067f47574899ee57c49fd6bf5ef3ea27ad8a0bf183ff4d5aa0a78aa69a252276 SHA512 e136e79d0d70b386bcf8b81b7aa3293d5697f681fe85b4d8e183877b62a131a9cfe9a5f4e0cbf34d06d57d0e9e6513787a8061995ec7c2984df62e9d96b8195a
 DIST vscode-1.91.1-arm64.tar.gz 138976160 BLAKE2B 573ab5e6fa349ac80044b6d5f3ab4d9d7947248181dd20584b1ade1eb1b42fbcbab0f8a232bcb7898dbe4e9dd2eca4cc4e3d00dfe8f0927b2807d4c94a299d1b SHA512 18abbeea0c78c8f1b8dfa4fb88782f426b8e00f3352af91679ccd345bf385f7b142f5a84acf6cf41c982dca2190e0b73284b3c8b4d26c97e571247b7e12fc412
+DIST vscode-1.92.0-amd64.tar.gz 144719694 BLAKE2B 32598d9c45dd8ae921511587f44376237d57ce15e2b417595bc7828416a1e4f0a35b7bc7b90cd60e7b98c99f9f6ec1eb5be1923aa3ef9c336768e7b9ca53717f SHA512 8e204f31784b27437a612ceb0ba05b03049e4b735ffd3808f6b3ce979ce9b3a5804fb1726afac40dcf06c215ccbe9be5de693fd789dbe75b788ea3104b0ee5e3
+DIST vscode-1.92.0-arm.tar.gz 129685400 BLAKE2B 22d95a781e409b4beb97a3463605372651304174e687b50ca9cf98c7daa64935e0cfb3eef48ed0d70cd85194806798dfeb8bb5838e388ecfcc3277aaa09acaaf SHA512 7411d67b3bd338ea855fba02ff2f87506ab9dffe2da3871d45a9511ac08e3947d3864e786502b6875fc48033860cfecfab8a4c22440cacca97ef338e96ffa9da
+DIST vscode-1.92.0-arm64.tar.gz 141628799 BLAKE2B 94ffd063dfcd9352664b17a65a8b64474d1a7a0df6cfd98efa9f6f1bf9f31b1e8f807313c9e154c96e539db3a29bd3073668a70f98a280810b42d7c61957dfde SHA512 6aa04f37c15b74db961dff439dbdb14e54ca00b28f0358e39fd85772ff6390c71c8828b21b137707b0a9a99a7b33fe140cbe900e80d7df6b19abd970ddc9c436
--- a/app-editors/vscode/vscode-1.92.0.ebuild
+++ b/app-editors/vscode/vscode-1.92.0.ebuild
@ -0,0 +1,131 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop pax-utils xdg optfeature
+
+DESCRIPTION="Multiplatform Visual Studio Code from Microsoft"
+HOMEPAGE="https://code.visualstudio.com"
+SRC_URI="
+	amd64? ( https://update.code.visualstudio.com/${PV}/linux-x64/stable -> ${P}-amd64.tar.gz )
+	arm? ( https://update.code.visualstudio.com/${PV}/linux-armhf/stable -> ${P}-arm.tar.gz )
+	arm64? ( https://update.code.visualstudio.com/${PV}/linux-arm64/stable -> ${P}-arm64.tar.gz )
+"
+S="${WORKDIR}"
+
+LICENSE="
+	Apache-2.0
+	BSD
+	BSD-1
+	BSD-2
+	BSD-4
+	CC-BY-4.0
+	ISC
+	LGPL-2.1+
+	Microsoft-vscode
+	MIT
+	MPL-2.0
+	openssl
+	PYTHON
+	TextMate-bundle
+	Unlicense
+	UoI-NCSA
+	W3C
+"
+SLOT="0"
+KEYWORDS="-* amd64 ~arm ~arm64"
+IUSE="egl kerberos wayland"
+RESTRICT="mirror strip bindist"
+
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	app-crypt/libsecret[crypt]
+	app-misc/ca-certificates
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/libglvnd
+	media-libs/mesa
+	net-misc/curl
+	sys-apps/dbus
+	sys-libs/zlib
+	sys-process/lsof
+	x11-libs/cairo
+	x11-libs/gtk+:3
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libxkbcommon
+	x11-libs/libxkbfile
+	x11-libs/libXrandr
+	x11-libs/libXScrnSaver
+	x11-libs/pango
+	x11-misc/xdg-utils
+	kerberos? ( app-crypt/mit-krb5 )
+"
+
+QA_PREBUILT="*"
+
+src_install() {
+	if use amd64; then
+		cd "${WORKDIR}/VSCode-linux-x64" || die
+	elif use arm; then
+		cd "${WORKDIR}/VSCode-linux-armhf" || die
+	elif use arm64; then
+		cd "${WORKDIR}/VSCode-linux-arm64" || die
+	else
+		die "Visual Studio Code only supports amd64, arm and arm64"
+	fi
+
+	# Cleanup
+	rm -r ./resources/app/ThirdPartyNotices.txt || die
+
+	# Disable update server
+	sed -e "/updateUrl/d" -i ./resources/app/product.json || die
+
+	if ! use kerberos; then
+		rm -r ./resources/app/node_modules.asar.unpacked/kerberos || die
+	fi
+
+	# Install
+	pax-mark m code
+	mkdir -p "${ED}/opt/${PN}" || die
+	cp -r . "${ED}/opt/${PN}" || die
+	fperms 4711 /opt/${PN}/chrome-sandbox
+
+	dosym -r "/opt/${PN}/bin/code" "usr/bin/vscode"
+	dosym -r "/opt/${PN}/bin/code" "usr/bin/code"
+
+	local EXEC_EXTRA_FLAGS=()
+	if use wayland; then
+		EXEC_EXTRA_FLAGS+=( "--ozone-platform-hint=auto" "--enable-wayland-ime" )
+	fi
+	if use egl; then
+		EXEC_EXTRA_FLAGS+=( "--use-gl=egl" )
+	fi
+
+	sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \
+		"${FILESDIR}/code-url-handler.desktop" \
+		> "${T}/code-url-handler.desktop" || die
+
+	sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \
+		"${FILESDIR}/code.desktop" \
+		> "${T}/code.desktop" || die
+
+	domenu "${T}/code.desktop"
+	domenu "${T}/code-url-handler.desktop"
+	newicon "resources/app/resources/linux/code.png" "vscode.png"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	optfeature "desktop notifications" x11-libs/libnotify
+	optfeature "keyring support inside vscode" "virtual/secret-service"
+}
--- a/app-editors/vscodium/vscodium-1.91.0.24190.ebuild
+++ b/app-editors/vscodium/vscodium-1.91.0.24190.ebuild
@ -122,7 +122,7 @@ src_install() {
 pkg_postinst() {
 	xdg_pkg_postinst
 	elog "When compared to the regular VSCode, VSCodium has a few quirks"
-	elog "More information at: https://github.com/VSCodium/vscodium/blob/master/DOCS.md"
+	elog "More information at: https://github.com/VSCodium/vscodium/blob/master/docs/index.md"
 	optfeature "desktop notifications" x11-libs/libnotify
 	optfeature "keyring support inside vscode" "virtual/secret-service"
 }
--- a/app-editors/vscodium/vscodium-1.91.1.24193.ebuild
+++ b/app-editors/vscodium/vscodium-1.91.1.24193.ebuild
@ -122,7 +122,7 @@ src_install() {
 pkg_postinst() {
 	xdg_pkg_postinst
 	elog "When compared to the regular VSCode, VSCodium has a few quirks"
-	elog "More information at: https://github.com/VSCodium/vscodium/blob/master/DOCS.md"
+	elog "More information at: https://github.com/VSCodium/vscodium/blob/master/docs/index.md"
 	optfeature "desktop notifications" x11-libs/libnotify
 	optfeature "keyring support inside vscode" "virtual/secret-service"
 }
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
--- a/app-emacs/cider/cider-1.15.1.ebuild
+++ b/app-emacs/cider/cider-1.15.1.ebuild
@ -19,7 +19,7 @@ else
 	SRC_URI="https://github.com/clojure-emacs/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"

-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi

 LICENSE="GPL-3+"
--- a/app-emacs/erlang-mode/Manifest
+++ b/app-emacs/erlang-mode/Manifest
@ -0,0 +1 @@
+DIST erlang-27.0.1.tar.gz 62055749 BLAKE2B 2cbf74efb6e2bd821b30e9b39d13b5b16899a49eedcbedd171068cb4da5d2f5cd98697a4234387d194aeace3ec1c168d752a2afd5bc52c4c6799dfd68ade6916 SHA512 03bba7f7d8226474b4dba9855e78b59c7cf78973fbb2ed48893a26879dc0dce579336e9cae6870f154bdd48cf3be6398cc1ec4ff52f252017d84edb20d565e71
--- a/app-emacs/erlang-mode/erlang-mode-27.0.1.ebuild
+++ b/app-emacs/erlang-mode/erlang-mode-27.0.1.ebuild
@ -0,0 +1,45 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="A major mode for editing Erlang"
+HOMEPAGE="https://www.erlang/
+	https://github.com/erlang/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/erlang/otp.git"
+	S="${WORKDIR}/${P}/lib/tools/emacs"
+else
+	# Distfile is shared with dev-lang/erlang.
+	SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz
+		-> erlang-${PV}.tar.gz"
+	S="${WORKDIR}/otp-OTP-${PV}/lib/tools/emacs"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND="
+	!dev-lang/erlang[emacs(-)]
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	elisp_src_prepare
+
+	sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
+		"${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die
+}
+
+src_install() {
+	elisp-install erlang *.el{,c}
+	elisp-site-file-install "${T}/${SITEFILE}"
+}
--- a/app-emacs/erlang-mode/erlang-mode-9999.ebuild
+++ b/app-emacs/erlang-mode/erlang-mode-9999.ebuild
@ -0,0 +1,45 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="A major mode for editing Erlang"
+HOMEPAGE="https://www.erlang/
+	https://github.com/erlang/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/erlang/otp.git"
+	S="${WORKDIR}/${P}/lib/tools/emacs"
+else
+	# Distfile is shared with dev-lang/erlang.
+	SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz
+		-> erlang-${PV}.tar.gz"
+	S="${WORKDIR}/otp-OTP-${PV}/lib/tools/emacs"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND="
+	!dev-lang/erlang[emacs(-)]
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	elisp_src_prepare
+
+	sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
+		"${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die
+}
+
+src_install() {
+	elisp-install erlang *.el{,c}
+	elisp-site-file-install "${T}/${SITEFILE}"
+}
--- a/app-emacs/erlang-mode/files/50erlang-mode-gentoo.el
+++ b/app-emacs/erlang-mode/files/50erlang-mode-gentoo.el
@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(require 'erlang-start)
+(setq erlang-root-dir "/usr/share")
--- a/app-emacs/erlang-mode/metadata.xml
+++ b/app-emacs/erlang-mode/metadata.xml
@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>matthew@gentoo.org</email>
+    <name>Matthew Smith</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <stabilize-allarches/>
+  <upstream>
+    <remote-id type="github">erlang/otp</remote-id>
+  </upstream>
+</pkgmetadata>
--- a/app-emacs/jinx/jinx-1.9.ebuild
+++ b/app-emacs/jinx/jinx-1.9.ebuild
@ -18,7 +18,7 @@ else
 	SRC_URI="https://github.com/minad/${PN}/archive/refs/tags/${PV}.tar.gz
 		-> ${P}.tar.gz"

-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi

 LICENSE="GPL-3+"
--- a/app-emacs/org-mode/org-mode-9.7.6.ebuild
+++ b/app-emacs/org-mode/org-mode-9.7.6.ebuild
@ -19,7 +19,7 @@ else
 	SRC_URI="https://git.savannah.gnu.org/cgit/emacs/${PN}.git/snapshot/${MY_P}.tar.gz"
 	S="${WORKDIR}/${MY_P}"

-	KEYWORDS="~amd64 ~ppc ~x86"
+	KEYWORDS="amd64 ppc x86"
 fi

 LICENSE="GPL-3+ FDL-1.3+ CC-BY-SA-3.0 odt-schema? ( OASIS-Open )"
--- a/app-emacs/scala-ts-mode/scala-ts-mode-1.0.0_p20240630.ebuild
+++ b/app-emacs/scala-ts-mode/scala-ts-mode-1.0.0_p20240630.ebuild
@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${MY_COMMIT}"

 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"

 RDEPEND="
 	>=app-editors/emacs-29[tree-sitter]
--- a/app-emacs/transient/transient-0.7.2.ebuild
+++ b/app-emacs/transient/transient-0.7.2.ebuild
@ -17,7 +17,7 @@ else
 	SRC_URI="https://github.com/magit/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"

-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 fi

 LICENSE="GPL-3+"
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@ -5,4 +5,7 @@ DIST edk2-b16284e2a0011489f6e16dfcc6af7623c3cbaf0b.tar.gz 15245558 BLAKE2B 33876
 DIST ipxe-git-1d1cf74a5e58811822bee4b3da3cff7282fcdfca.tar.gz 4074878 BLAKE2B d335d1e69bf736c53622e34e5ebeea77e294637f39bd5e2704f13b8e334b684130c259bd48b832050eebfabfc898f9786979a4c00903145fdb347a497b399f31 SHA512 e27644cbb030c43e2841058003bedea6deb979ba71591f967e01312527ed869bb863f9a03fc7b5a266752433d30164929ea1b935953a245600ad713c9fb25cb5
 DIST seabios-1.16.0.tar.gz 635419 BLAKE2B b645f20bae341d56ce4fc4a7044446050d8490c6c136377f6dccf02c88100b0644bc13d210b4a517a8be6002d5671b0fba77120a2aca3a9bafbad5e88d037e40 SHA512 9daefcfb1c9edda4462a4b080c9bac552154d577ae19703a914928e43005e7a52edd86869c6507e94a7f0c61ce8b3e6f5dea38cd5146628cb138a130947c522f
 DIST xen-4.17.4.tar.gz 46527369 BLAKE2B 2fcd1248d75157b6455727b29ecc3a4e5941eb187d645b35b6cf48a23fdfae11e810c55a1a7c0396c6a23dc977f22b8fd06ee9b91a1edc3a7ba8561023e07cfc SHA512 50dc2efd26e48131afdbc8efb1ca90154a84fe5fba5a6bc81d9801a3c13aebea91c8211872b5c69ce2773644f2c935c31cc56584a05b10b81e8728282d89eb84
+DIST xen-4.18.2.tar.gz 51911271 BLAKE2B 0b58a74d867f42e7820a1050587c11ec9099aca74875fc9e4657e1eba239afed3e23fe3dba047f1e5f6d8cab4d2fd7f0eaf6b809c7549d73e8c102add7864c46 SHA512 c5feb450155883b5d2e7f43b05a64e7215b661b7d2f438d8f5a0896bd57283379ee11ca8e2e7a1d8787813cc6f1a260253fcb8688ed7d61a2bfb636db1626941
+DIST xen-4.19.0.tar.gz 52011199 BLAKE2B bc6502bf5b68ab130f1d64e20e8a6d8ca656240545f0a4f5fe500413504c7610352bd7577f0e7e9d9354745afaf39d3edd3ad775718e20d14181dd2dca28ec0a SHA512 bc0b4257cab66b0f9d4a1fe72e07f4980398b2934989c02ffe488b465eca3443caa0ded903871480aba6e36212921f335b68d67f202f22548c31899225f2d657
 DIST xen-gentoo-patches-4.17.0-gentoo-patchset-2.tar.bz2 4001 BLAKE2B 7afce426759952e202a1dd819fe0a23108072bf9552ba14a0bd787a96ffe5e7a36f37e03dad8db9c46f5731acbc122c258eef6d517816aad9c8db1ca64700d19 SHA512 bcb1479f9ff5e194a4e452da9d0479febc2bcd465b4be69bb8f30e2e6b858fb77a71216dcb3e74dfb65e7ca6513742c294cd6b5eaa5ce82d0b122a00f1cbc450
+DIST xen-upstream-patches-4.18.3-pre-patchset-0.tar.bz2 51452 BLAKE2B 166d13eb16b5225fe5d8b96d9a7ba547b8d94b2989a15b641d53821e484d45bec8ed123180c8c7c5666da87f8a4368ad2a27284431561ae323453b4054c72d80 SHA512 bf434740567ac964babdc625c2cc13d9c2bcc79f8360f8f4dc8658fb191c60418a24cbea331d2a69fcadf4b30620f662e883695c379c87b4f8de17bfec51108c
--- a/app-emulation/xen-tools/xen-tools-4.18.3_pre0.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.18.3_pre0.ebuild
@ -0,0 +1,525 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE='ncurses,xml(+),threads(+)'
+
+inherit bash-completion-r1 flag-o-matic multilib python-single-r1 readme.gentoo-r1 toolchain-funcs
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	REPO="xen.git"
+	EGIT_REPO_URI="https://xenbits.xen.org/git-http/${REPO}"
+	S="${WORKDIR}/${REPO}"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+	SEABIOS_VER="1.16.0"
+	EDK2_COMMIT="b16284e2a0011489f6e16dfcc6af7623c3cbaf0b"
+	EDK2_OPENSSL_VERSION="1_1_1t"
+	EDK2_SOFTFLOAT_COMMIT="b64af41c3276f97f0e181920400ee056b9c88037"
+	EDK2_BROTLI_COMMIT="f4153a09f87cbb9c826d8fc12c74642bb2d879ea"
+	IPXE_COMMIT="1d1cf74a5e58811822bee4b3da3cff7282fcdfca"
+
+	XEN_GENTOO_PATCHSET_NUM=2
+	XEN_GENTOO_PATCHSET_BASE=4.17.0
+	XEN_PRE_PATCHSET_NUM=0
+	XEN_PRE_VERSION_BASE=4.18.2
+
+	XEN_BASE_PV="${PV}"
+	if [[ -n "${XEN_PRE_VERSION_BASE}" ]]; then
+		XEN_BASE_PV="${XEN_PRE_VERSION_BASE}"
+	fi
+
+	SRC_URI="
+	https://downloads.xenproject.org/release/xen/${XEN_BASE_PV}/xen-${XEN_BASE_PV}.tar.gz
+	https://www.seabios.org/downloads/seabios-${SEABIOS_VER}.tar.gz
+	ipxe? ( https://xenbits.xen.org/xen-extfiles/ipxe-git-${IPXE_COMMIT}.tar.gz )
+	ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz
+		https://github.com/openssl/openssl/archive/OpenSSL_${EDK2_OPENSSL_VERSION}.tar.gz
+		https://github.com/ucb-bar/berkeley-softfloat-3/archive/${EDK2_SOFTFLOAT_COMMIT}.tar.gz -> berkeley-softfloat-${EDK2_SOFTFLOAT_COMMIT}.tar.gz
+		https://github.com/google/brotli/archive/${EDK2_BROTLI_COMMIT}.tar.gz -> brotli-${EDK2_BROTLI_COMMIT}.tar.gz
+	)
+	"
+
+	if [[ -n "${XEN_PRE_PATCHSET_NUM}" ]]; then
+		XEN_UPSTREAM_PATCHES_TAG="$(ver_cut 1-3)-pre-patchset-${XEN_PRE_PATCHSET_NUM}"
+		XEN_UPSTREAM_PATCHES_NAME="xen-upstream-patches-${XEN_UPSTREAM_PATCHES_TAG}"
+		SRC_URI+=" https://gitweb.gentoo.org/proj/xen-upstream-patches.git/snapshot/${XEN_UPSTREAM_PATCHES_NAME}.tar.bz2"
+		XEN_UPSTREAM_PATCHES_DIR="${WORKDIR}/${XEN_UPSTREAM_PATCHES_NAME}"
+	fi
+	if [[ -n "${XEN_GENTOO_PATCHSET_NUM}" ]]; then
+		XEN_GENTOO_PATCHES_TAG="$(ver_cut 1-3 ${XEN_GENTOO_PATCHSET_BASE})-gentoo-patchset-${XEN_GENTOO_PATCHSET_NUM}"
+		XEN_GENTOO_PATCHES_NAME="xen-gentoo-patches-${XEN_GENTOO_PATCHES_TAG}"
+		SRC_URI+=" https://gitweb.gentoo.org/proj/xen-gentoo-patches.git/snapshot/${XEN_GENTOO_PATCHES_NAME}.tar.bz2"
+		XEN_GENTOO_PATCHES_DIR="${WORKDIR}/${XEN_GENTOO_PATCHES_NAME}"
+	fi
+fi
+
+DESCRIPTION="Xen tools including QEMU and xl"
+HOMEPAGE="https://xenproject.org"
+DOCS=( README )
+
+S="${WORKDIR}/xen-$(ver_cut 1-3 ${XEN_BASE_PV})"
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
+# >=dev-lang/ocaml-4 stable
+# Masked in profiles/eapi-5-files instead
+IUSE="api debug doc +hvm +ipxe lzma ocaml ovmf pygrub python +qemu +qemu-traditional +rombios screen selinux sdl static-libs system-ipxe system-qemu system-seabios systemd zstd"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	ipxe? ( rombios )
+	ovmf? ( hvm )
+	pygrub? ( python )
+	rombios? ( hvm )
+	system-ipxe? ( rombios )
+	?? ( ipxe system-ipxe )
+	?? ( qemu system-qemu )"
+
+COMMON_DEPEND="
+	lzma? ( app-arch/xz-utils )
+	qemu? (
+		dev-libs/glib:2
+		sys-libs/pam
+	)
+	zstd? ( app-arch/zstd )
+	app-arch/bzip2
+	app-arch/zstd
+	dev-libs/libnl:3
+	dev-libs/lzo:2
+	dev-libs/yajl
+	sys-apps/util-linux
+	sys-fs/e2fsprogs
+	sys-libs/ncurses
+	sys-libs/zlib
+	${PYTHON_DEPS}
+"
+
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/iproute2[-minimal]
+	net-misc/bridge-utils
+	screen? (
+		app-misc/screen
+		app-admin/logrotate
+	)
+	selinux? ( sec-policy/selinux-xen )"
+
+DEPEND="${COMMON_DEPEND}
+	app-misc/pax-utils
+	>=sys-kernel/linux-headers-4.11
+	x11-libs/pixman
+	$(python_gen_cond_dep '
+		dev-python/lxml[${PYTHON_USEDEP}]
+	')
+	x86? ( sys-devel/dev86
+		system-ipxe? ( sys-firmware/ipxe[qemu] )
+		sys-power/iasl )
+	api? ( dev-libs/libxml2
+		net-misc/curl )
+
+	ovmf? (
+		!arm? ( !arm64? ( dev-lang/nasm ) )
+		$(python_gen_impl_dep sqlite)
+		)
+	!amd64? ( >=sys-apps/dtc-1.4.0 )
+	amd64? ( sys-power/iasl
+		system-seabios? (
+			|| (
+				sys-firmware/seabios
+				sys-firmware/seabios-bin
+			)
+		)
+		system-ipxe? ( sys-firmware/ipxe[qemu] )
+		rombios? ( sys-devel/bin86 sys-devel/dev86 ) )
+	arm64? ( sys-power/iasl
+		rombios? ( sys-devel/bin86 sys-devel/dev86 ) )
+	doc? (
+		app-text/ghostscript-gpl
+		$(python_gen_cond_dep '
+			dev-python/markdown[${PYTHON_USEDEP}]
+		')
+		dev-texlive/texlive-latexextra
+		>=media-gfx/fig2dev-3.2.9-r1
+		virtual/pandoc
+	)
+	hvm? ( x11-base/xorg-proto )
+	qemu? (
+		app-arch/snappy:=
+		dev-build/meson
+		sdl? (
+			media-libs/libsdl[X]
+			media-libs/libsdl2[X]
+		)
+	)
+	system-qemu? ( app-emulation/qemu[xen] )
+	ocaml? ( dev-ml/findlib
+		dev-lang/ocaml[ocamlopt] )
+	python? ( >=dev-lang/swig-4.0.0 )"
+
+BDEPEND="dev-lang/perl
+	app-alternatives/yacc
+	sys-devel/gettext"
+
+# hvmloader is used to bootstrap a fully virtualized kernel
+# Approved by QA team in bug #144032
+QA_WX_LOAD="
+	usr/libexec/xen/boot/hvmloader
+	usr/libexec/xen/boot/ovmf.bin
+	usr/libexec/xen/boot/xen-shim
+	usr/share/qemu-xen/qemu/hppa-firmware.img
+	usr/share/qemu-xen/qemu/opensbi-riscv32-generic-fw_dynamic.elf
+	usr/share/qemu-xen/qemu/opensbi-riscv64-generic-fw_dynamic.elf
+	usr/share/qemu-xen/qemu/s390-ccw.img
+	usr/share/qemu-xen/qemu/u-boot.e500
+"
+
+QA_EXECSTACK="
+	usr/share/qemu-xen/qemu/hppa-firmware.img
+"
+
+QA_PREBUILT="
+	usr/libexec/xen/bin/elf2dmp
+	usr/libexec/xen/bin/ivshmem-client
+	usr/libexec/xen/bin/ivshmem-server
+	usr/libexec/xen/bin/qemu-edid
+	usr/libexec/xen/bin/qemu-img
+	usr/libexec/xen/bin/qemu-io
+	usr/libexec/xen/bin/qemu-keymap
+	usr/libexec/xen/bin/qemu-nbd
+	usr/libexec/xen/bin/qemu-pr-helper
+	usr/libexec/xen/bin/qemu-storage-daemon
+	usr/libexec/xen/bin/qemu-system-i386
+	usr/libexec/xen/bin/virtfs-proxy-helper
+	usr/libexec/xen/boot/ovmf.bin
+	usr/libexec/xen/boot/xen-shim
+	usr/libexec/xen/libexec/qemu-pr-helper
+	usr/libexec/xen/libexec/virtfs-proxy-helper
+	usr/libexec/xen/libexec/virtiofsd
+	usr/libexec/xen/libexec/xen-bridge-helper
+	usr/share/qemu-xen/qemu/s390-ccw.img
+	usr/share/qemu-xen/qemu/s390-netboot.img
+	usr/share/qemu-xen/qemu/u-boot.e500
+"
+
+RESTRICT="test"
+
+pkg_setup() {
+	python_setup
+	export "CONFIG_LOMOUNT=y"
+
+	#bug 522642, disable compile tools/tests
+	export "CONFIG_TESTS=n"
+
+	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64 ; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+}
+
+src_prepare() {
+	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
+	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
+	pushd tools/firmware/ > /dev/null
+	ln -s seabios-dir-remote seabios-dir || die
+	popd > /dev/null
+
+	if [[ -v XEN_UPSTREAM_PATCHES_DIR ]]; then
+		eapply "${XEN_UPSTREAM_PATCHES_DIR}"
+	fi
+
+	if [[ -v XEN_GENTOO_PATCHES_DIR ]]; then
+		eapply "${XEN_GENTOO_PATCHES_DIR}"
+	fi
+
+	# Rename qemu-bridge-helper to xen-bridge-helper to avoid file
+	# collisions with app-emulation/qemu.
+	sed -i 's/qemu-bridge-helper/xen-bridge-helper/g' \
+		tools/qemu-xen/include/net/net.h \
+		tools/qemu-xen/meson.build \
+		tools/qemu-xen/qemu-bridge-helper.c \
+		tools/qemu-xen/qemu-options.hx \
+		|| die
+	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
+
+	if use ovmf; then
+		mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die
+		rm -r tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
+		rm -r tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
+		rm -r tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die
+		rm -r tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die
+		mv ../openssl-OpenSSL_${EDK2_OPENSSL_VERSION} tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
+		mv ../berkeley-softfloat-3-${EDK2_SOFTFLOAT_COMMIT} tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
+		cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die
+		cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die
+		cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die
+	fi
+
+	# ipxe
+	if use ipxe; then
+		cp "${DISTDIR}/ipxe-git-${IPXE_COMMIT}.tar.gz" tools/firmware/etherboot/ipxe.tar.gz || die
+
+		# gcc 11
+		cp "${XEN_GENTOO_PATCHES_DIR}/ipxe/${PN}-4.15.0-ipxe-gcc11.patch" tools/firmware/etherboot/patches/ipxe-gcc11.patch || die
+		echo ipxe-gcc11.patch >> tools/firmware/etherboot/patches/series || die
+	fi
+
+	# Fix texi2html build error with new texi2html, qemu.doc.html
+	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
+
+	# Drop .config, fixes to gcc-4.6
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	# drop flags
+	unset CFLAGS
+	unset LDFLAGS
+	unset ASFLAGS
+	unset CPPFLAGS
+
+	if ! use pygrub; then
+		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
+	fi
+
+	if ! use python; then
+		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
+	fi
+
+	if ! use hvm; then
+		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
+	# Bug 351648
+	elif ! use x86 && ! has x86 $(get_all_abis); then
+		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
+		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
+		export CPATH="${WORKDIR}"/extra-headers
+	fi
+
+	if use qemu; then
+		if use sdl; then
+			sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
+				tools/Makefile || die
+		else
+			sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
+				tools/qemu-xen-traditional/xen-setup || die
+			sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
+				tools/Makefile || die
+		fi
+	else
+		# Don't bother with qemu, only needed for fully virtualised guests
+		sed -i '/SUBDIRS-$(CONFIG_QEMU_XEN)/s/^/#/g' tools/Makefile || die
+	fi
+
+	# Reset bash completion dir; Bug 472438
+	sed -e "s;^BASH_COMPLETION_DIR      :=.*;BASH_COMPLETION_DIR := $(get_bashcompdir);" \
+		-i config/Paths.mk.in || die
+
+	# xencommons, Bug #492332, sed lighter weight than patching
+	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
+		-i tools/hotplug/Linux/init.d/xencommons.in || die
+
+	# fix bashishm
+	sed -e '/Usage/s/\$//g' \
+		-i tools/hotplug/Linux/init.d/xendriverdomain.in || die
+
+	# respect multilib, usr/lib/libcacard.so.0.0.0
+	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
+		-i tools/qemu-xen/configure || die
+
+	#bug 518136, don't build 32bit exactuable for nomultilib profile
+	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
+		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
+	fi
+
+	# uncomment lines in xl.conf
+	sed -e 's:^#autoballoon=:autoballoon=:' \
+		-e 's:^#lockfile=:lockfile=:' \
+		-e 's:^#vif.default.script=:vif.default.script=:' \
+		-i tools/examples/xl.conf  || die
+
+	# disable capstone (Bug #673474)
+	sed -e "s:\$\$source/configure:\0 --disable-capstone:" \
+		-i tools/Makefile || die
+
+	# disable glusterfs
+	sed -e "s:\$\$source/configure:\0 --disable-glusterfs:" \
+		-i tools/Makefile || die
+
+	# disable jpeg automagic
+	sed -e "s:\$\$source/configure:\0 --disable-vnc-jpeg:" \
+		-i tools/Makefile || die
+
+	# disable png automagic
+	sed -e "s:\$\$source/configure:\0 --disable-png:" \
+		-i tools/Makefile || die
+
+	# disable docker (Bug #732970)
+	sed -e "s:\$\$source/configure:\0 --disable-containers:" \
+		-i tools/Makefile || die
+
+	# disable abi-dumper (Bug #791172)
+	sed -e 's/$(ABI_DUMPER) /echo /g' \
+		-i tools/libs/libs.mk || die
+
+	# disable header check (Bug #921932)
+	sed -e '/__XEN_INTERFACE_VERSION__/,+2d' \
+		-i tools/qemu-xen/include/hw/xen/xen_native.h || die
+
+	# Remove -Werror
+	find . -type f \( -name Makefile -o -name "*.mk" \) \
+		-exec sed -i \
+		-e 's/-Werror //g' \
+		-e '/^CFLAGS *+= -Werror$/d' \
+		-e 's/, "-Werror"//' \
+		{} + || die
+
+	default
+}
+
+src_configure() {
+	local myconf=(
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		--libexecdir="${EPREFIX}/usr/libexec"
+		--localstatedir="${EPREFIX}/var"
+		--disable-golang
+		--disable-pvshim
+		--disable-werror
+		--disable-xen
+		--enable-tools
+		--enable-docs
+		$(use_enable api xenapi)
+		$(use_enable ipxe)
+		$(usex system-ipxe '--with-system-ipxe=/usr/share/ipxe' '')
+		$(use_enable ocaml ocamltools)
+		$(use_enable ovmf)
+		$(use_enable rombios)
+		$(use_enable systemd)
+		--with-xenstored=$(usex ocaml 'oxenstored' 'xenstored')
+	)
+
+	use system-seabios && myconf+=( --with-system-seabios=/usr/share/seabios/bios.bin )
+	use system-qemu && myconf+=( --with-system-qemu=/usr/bin/qemu-system-x86_64 )
+	use amd64 && myconf+=( $(use_enable qemu-traditional) )
+	tc-ld-disable-gold # Bug 669570
+	econf ${myconf[@]}
+}
+
+src_compile() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+	use python && myopt="${myopt} XENSTAT_PYTHON_BINDINGS=y"
+
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	# bug #845099
+	if use ipxe; then
+		local -x NO_WERROR=1
+	fi
+
+	emake \
+		HOSTCC="$(tc-getBUILD_CC)" \
+		HOSTCXX="$(tc-getBUILD_CXX)" \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		LD="$(tc-getLD)" \
+		AR="$(tc-getAR)" \
+		OBJDUMP="$(tc-getOBJDUMP)" \
+		RANLIB="$(tc-getRANLIB)" \
+		build-tools ${myopt}
+
+	if use doc; then
+		emake -C docs build
+	else
+		emake -C docs man-pages
+	fi
+}
+
+src_install() {
+	# Override auto-detection in the build system, bug #382573
+	export INITD_DIR=/tmp/init.d
+	export CONFIG_LEAF_DIR=../tmp/default
+
+	# Let the build system compile installed Python modules.
+	local PYTHONDONTWRITEBYTECODE
+	export PYTHONDONTWRITEBYTECODE
+
+	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
+		XEN_PYTHON_NATIVE_INSTALL=y install-tools
+
+	# Fix the remaining Python shebangs.
+	python_fix_shebang "${D}"
+
+	# Remove RedHat-specific stuff
+	rm -rf "${D}"/tmp || die
+
+	if use doc; then
+		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
+		dodoc -r docs/{pdf,txt}
+	else
+		emake -C docs DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-man-pages # Bug 668032
+	fi
+	dodoc ${DOCS[@]}
+
+	newconfd "${FILESDIR}"/xendomains.confd xendomains
+	newconfd "${FILESDIR}"/xenstored.confd xenstored
+	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
+	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
+	newinitd "${FILESDIR}"/xenstored.initd-r1 xenstored
+	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
+	newinitd "${FILESDIR}"/xencommons.initd xencommons
+	newconfd "${FILESDIR}"/xencommons.confd xencommons
+	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
+	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
+	newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog
+
+	if use screen; then
+		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
+		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
+		keepdir /var/log/xen-consoles
+	fi
+
+	# For -static-libs wrt Bug 384355
+	if ! use static-libs; then
+		rm -f "${D}"/usr/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)/ocaml/*/*.a
+	fi
+
+	# for xendomains
+	keepdir /etc/xen/auto
+
+	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
+	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
+		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
+
+	keepdir /var/lib/xen/dump
+	keepdir /var/lib/xen/xenpaging
+	keepdir /var/lib/xenstored
+	keepdir /var/log/xen
+
+	if use python; then
+		python_domodule "${S}/tools/libs/stat/bindings/swig/python/xenstat.py"
+		python_domodule "${S}/tools/libs/stat/bindings/swig/python/_xenstat.so"
+	fi
+
+	python_optimize
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
--- a/app-emulation/xen-tools/xen-tools-4.19.0.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.19.0.ebuild
@ -3,7 +3,7 @@

 EAPI=8

-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE='ncurses,xml(+),threads(+)'

 inherit bash-completion-r1 flag-o-matic multilib python-single-r1 readme.gentoo-r1 toolchain-funcs
@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://xenbits.xen.org/git-http/${REPO}"
 	S="${WORKDIR}/${REPO}"
 else
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"

 	SEABIOS_VER="1.16.0"
 	EDK2_COMMIT="b16284e2a0011489f6e16dfcc6af7623c3cbaf0b"
@ -363,7 +363,7 @@ src_prepare() {
 		-i tools/Makefile || die

 	# disable png automagic
-	sed -e "s:\$\$source/configure:\0 --disable-vnc-png:" \
+	sed -e "s:\$\$source/configure:\0 --disable-png:" \
 		-i tools/Makefile || die

 	# disable docker (Bug #732970)
@ -374,6 +374,10 @@ src_prepare() {
 	sed -e 's/$(ABI_DUMPER) /echo /g' \
 		-i tools/libs/libs.mk || die

+	# disable header check (Bug #921932)
+	sed -e '/__XEN_INTERFACE_VERSION__/,+2d' \
+		-i tools/qemu-xen/include/hw/xen/xen_native.h || die
+
 	# Remove -Werror
 	find . -type f \( -name Makefile -o -name "*.mk" \) \
 		-exec sed -i \
@ -457,9 +461,6 @@ src_install() {
 	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
 		XEN_PYTHON_NATIVE_INSTALL=y install-tools

-	# Created at runtime
-	rm -rv "${ED}/var/run" || die
-
 	# Fix the remaining Python shebangs.
 	python_fix_shebang "${D}"

--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@ -1,2 +1,5 @@
 DIST xen-4.17.4.tar.gz 46527369 BLAKE2B 2fcd1248d75157b6455727b29ecc3a4e5941eb187d645b35b6cf48a23fdfae11e810c55a1a7c0396c6a23dc977f22b8fd06ee9b91a1edc3a7ba8561023e07cfc SHA512 50dc2efd26e48131afdbc8efb1ca90154a84fe5fba5a6bc81d9801a3c13aebea91c8211872b5c69ce2773644f2c935c31cc56584a05b10b81e8728282d89eb84
+DIST xen-4.18.2.tar.gz 51911271 BLAKE2B 0b58a74d867f42e7820a1050587c11ec9099aca74875fc9e4657e1eba239afed3e23fe3dba047f1e5f6d8cab4d2fd7f0eaf6b809c7549d73e8c102add7864c46 SHA512 c5feb450155883b5d2e7f43b05a64e7215b661b7d2f438d8f5a0896bd57283379ee11ca8e2e7a1d8787813cc6f1a260253fcb8688ed7d61a2bfb636db1626941
+DIST xen-4.19.0.tar.gz 52011199 BLAKE2B bc6502bf5b68ab130f1d64e20e8a6d8ca656240545f0a4f5fe500413504c7610352bd7577f0e7e9d9354745afaf39d3edd3ad775718e20d14181dd2dca28ec0a SHA512 bc0b4257cab66b0f9d4a1fe72e07f4980398b2934989c02ffe488b465eca3443caa0ded903871480aba6e36212921f335b68d67f202f22548c31899225f2d657
 DIST xen-gentoo-patches-4.17.0-gentoo-patchset-2.tar.bz2 4001 BLAKE2B 7afce426759952e202a1dd819fe0a23108072bf9552ba14a0bd787a96ffe5e7a36f37e03dad8db9c46f5731acbc122c258eef6d517816aad9c8db1ca64700d19 SHA512 bcb1479f9ff5e194a4e452da9d0479febc2bcd465b4be69bb8f30e2e6b858fb77a71216dcb3e74dfb65e7ca6513742c294cd6b5eaa5ce82d0b122a00f1cbc450
+DIST xen-upstream-patches-4.18.3-pre-patchset-0.tar.bz2 51452 BLAKE2B 166d13eb16b5225fe5d8b96d9a7ba547b8d94b2989a15b641d53821e484d45bec8ed123180c8c7c5666da87f8a4368ad2a27284431561ae323453b4054c72d80 SHA512 bf434740567ac964babdc625c2cc13d9c2bcc79f8360f8f4dc8658fb191c60418a24cbea331d2a69fcadf4b30620f662e883695c379c87b4f8de17bfec51108c
--- a/app-emulation/xen/xen-4.18.3_pre0.ebuild
+++ b/app-emulation/xen/xen-4.18.3_pre0.ebuild
@ -0,0 +1,179 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit flag-o-matic mount-boot python-any-r1 secureboot toolchain-funcs
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://xenbits.xen.org/git-http/xen.git"
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~arm -x86"
+
+	XEN_GENTOO_PATCHSET_NUM=2
+	XEN_GENTOO_PATCHSET_BASE=4.17.0
+	XEN_PRE_PATCHSET_NUM=0
+	XEN_PRE_VERSION_BASE=4.18.2
+
+	XEN_BASE_PV="${PV}"
+	if [[ -n "${XEN_PRE_VERSION_BASE}" ]]; then
+		XEN_BASE_PV="${XEN_PRE_VERSION_BASE}"
+	fi
+
+	SRC_URI="https://downloads.xenproject.org/release/xen/${XEN_BASE_PV}/xen-${XEN_BASE_PV}.tar.gz"
+
+	if [[ -n "${XEN_PRE_PATCHSET_NUM}" ]]; then
+		XEN_UPSTREAM_PATCHES_TAG="$(ver_cut 1-3)-pre-patchset-${XEN_PRE_PATCHSET_NUM}"
+		XEN_UPSTREAM_PATCHES_NAME="xen-upstream-patches-${XEN_UPSTREAM_PATCHES_TAG}"
+		SRC_URI+=" https://gitweb.gentoo.org/proj/xen-upstream-patches.git/snapshot/${XEN_UPSTREAM_PATCHES_NAME}.tar.bz2"
+		XEN_UPSTREAM_PATCHES_DIR="${WORKDIR}/${XEN_UPSTREAM_PATCHES_NAME}"
+	fi
+	if [[ -n "${XEN_GENTOO_PATCHSET_NUM}" ]]; then
+		XEN_GENTOO_PATCHES_TAG="$(ver_cut 1-3 ${XEN_GENTOO_PATCHSET_BASE})-gentoo-patchset-${XEN_GENTOO_PATCHSET_NUM}"
+		XEN_GENTOO_PATCHES_NAME="xen-gentoo-patches-${XEN_GENTOO_PATCHES_TAG}"
+		SRC_URI+=" https://gitweb.gentoo.org/proj/xen-gentoo-patches.git/snapshot/${XEN_GENTOO_PATCHES_NAME}.tar.bz2"
+		XEN_GENTOO_PATCHES_DIR="${WORKDIR}/${XEN_GENTOO_PATCHES_NAME}"
+	fi
+fi
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="https://xenproject.org"
+
+S="${WORKDIR}/xen-$(ver_cut 1-3 ${XEN_BASE_PV})"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+boot-symlinks debug uefi flask"
+REQUIRED_USE="arm? ( debug )"
+
+DEPEND="${PYTHON_DEPS}
+	uefi? ( >=sys-devel/binutils-2.22[multitarget] )
+	!uefi? ( >=sys-devel/binutils-2.22 )
+	flask? ( sys-apps/checkpolicy )"
+RDEPEND=""
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+# no tests are available for the hypervisor
+# prevent the silliness of /usr/lib/debug/usr/lib/debug files
+# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
+RESTRICT="test splitdebug strip"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	if [[ -z ${XEN_TARGET_ARCH} ]]; then
+		if use amd64; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+	use uefi && secureboot_pkg_setup
+}
+
+src_prepare() {
+	if [[ -v XEN_UPSTREAM_PATCHES_DIR ]]; then
+		eapply "${XEN_UPSTREAM_PATCHES_DIR}"
+	fi
+
+	if [[ -v XEN_GENTOO_PATCHES_DIR ]]; then
+		eapply "${XEN_GENTOO_PATCHES_DIR}"
+	fi
+
+	# Symlinks do not work on fat32 volumes # 829765
+	if ! use boot-symlinks || use uefi; then
+		eapply "${XEN_GENTOO_PATCHES_DIR}"/no-boot-symlinks/${PN}-4.16-no-symlinks.patch
+	fi
+
+	# Workaround new gcc-11 options
+	sed -e '/^CFLAGS/s/-Werror//g' -i xen/Makefile || die
+
+	# Drop .config
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	if use uefi; then
+		export EFI_VENDOR="gentoo"
+		export EFI_MOUNTPOINT="/boot"
+	fi
+
+	default
+}
+
+xen_make() {
+	# Setting clang to either 'y' or 'n' tells Xen's build system
+	# whether or not clang is used.
+	local clang=n
+	if tc-is-clang; then
+		clang=y
+	fi
+
+	# Send raw LDFLAGS so that --as-needed works
+	emake \
+		V=1 \
+		LDFLAGS="$(raw-ldflags)" \
+		HOSTCC="$(tc-getBUILD_CC)" \
+		HOSTCXX="$(tc-getBUILD_CXX)" \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		LD="$(tc-getLD)" \
+		AR="$(tc-getAR)" \
+		OBJDUMP="$(tc-getOBJDUMP)" \
+		RANLIB="$(tc-getRANLIB)" \
+		clang="${clang}" \
+		"$@"
+}
+
+src_configure() {
+	cd xen || die
+
+	touch gentoo-config || die
+	if use arm; then
+	   echo "CONFIG_EARLY_PRINTK=sun7i" >> gentoo-config || die
+	fi
+	if use debug; then
+		cat <<-EOF >> gentoo-config || die
+		CONFIG_DEBUG=y
+		CONFIG_CRASH_DEBUG=y
+EOF
+	fi
+	if use flask; then
+		echo "CONFIG_XSM=y" >> gentoo-config || die
+	fi
+
+	# remove flags
+	unset CFLAGS
+
+	tc-ld-disable-gold # Bug 700374
+
+	xen_make KCONFIG_ALLCONFIG=gentoo-config alldefconfig
+}
+
+src_compile() {
+	xen_make -C xen
+}
+
+src_install() {
+	# The 'make install' doesn't 'mkdir -p' the subdirs
+	if use uefi; then
+		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+	fi
+
+	xen_make DESTDIR="${D}" -C xen install
+
+	if use uefi; then
+		secureboot_auto_sign --in-place
+	else
+		# make install likes to throw in some extra EFI bits if it built
+		rm -rf "${D}/usr/$(get_libdir)/efi"
+	fi
+}
--- a/app-emulation/xen/xen-4.19.0.ebuild
+++ b/app-emulation/xen/xen-4.19.0.ebuild
@ -3,7 +3,7 @@

 EAPI=8

-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )

 inherit flag-o-matic mount-boot python-any-r1 secureboot toolchain-funcs

@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://xenbits.xen.org/git-http/xen.git"
 	SRC_URI=""
 else
-	KEYWORDS="amd64 ~arm -x86"
+	KEYWORDS="~amd64 ~arm -x86"

 	XEN_GENTOO_PATCHSET_NUM=2
 	XEN_GENTOO_PATCHSET_BASE=4.17.0
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/fastfetch/fastfetch-2.17.2.ebuild
+++ b/app-misc/fastfetch/fastfetch-2.17.2.ebuild
@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then
 	[[ "${EGIT_BRANCH}" == "" ]] && die "Please set a git branch"
 else
 	SRC_URI="https://github.com/fastfetch-cli/fastfetch/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86"
 fi

 LICENSE="MIT"
--- a/app-misc/hello/metadata.xml
+++ b/app-misc/hello/metadata.xml
@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>tamiko@gentoo.org</email>
-    <name>Matthias Maier</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="savannah">hello</remote-id>
-  </upstream>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="savannah">hello</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@ -1,2 +1 @@
-DIST lyx-2.4.0.tar.xz 17823824 BLAKE2B 924425bbbbc50c1e1b03e493a021be4f9b56344712407b46dc1ec75bd583f0f9803592d3fbdca70fdefdbb60056f0275ab4a25e251f728ed710ef796b50f711e SHA512 b52724a7f544f190c93b948c11b835057f73e417115cf67a5e586f6872816b3a4df7429d24b5323410a34a79f725052db57105649ff6c275141f97d391a2091b
 DIST lyx-2.4.1.tar.xz 17848700 BLAKE2B 5e9d9530610149a1b0f6a7d536068ff0da97e261a6069a9efc3c45a892c653e7accadcd0bde96bf3ffad9d936fef4a4b88ee7b5233f875bbc568044376a5b37e SHA512 80d57d46dab61ecb655c9d54ba1d20203ad943db5249ed16dbeb5b78b7845896a79224c8032213cc861fd943629fbe87ef8ac9155cc9b34da9be2f59eb087071
--- a/app-office/lyx/lyx-2.4.0.ebuild
+++ b/app-office/lyx/lyx-2.4.0.ebuild
@ -1,180 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit desktop font optfeature python-single-r1 cmake xdg
-
-DESCRIPTION="WYSIWYM (What You See Is What You Mean) document processor based on LaTeX"
-HOMEPAGE="https://www.lyx.org/"
-SRC_URI="http://ftp.lyx.org/pub/lyx/devel/lyx-$(ver_cut 1-2)/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="aspell cups dia dot enchant gnumeric html +hunspell +latex monolithic-build nls rcs rtf svg l10n_he"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="test"
-
-RDEPEND="${PYTHON_DEPS}
-	app-text/mythes
-	dev-libs/boost:=
-	sys-apps/file
-	sys-libs/zlib:=
-	virtual/imagemagick-tools[png,svg?]
-	x11-misc/xdg-utils
-
-	dev-qt/qtbase:6[concurrent,dbus,gui,widgets]
-	dev-qt/qt5compat:6
-	dev-qt/qtsvg:6
-
-	aspell? ( app-text/aspell )
-	cups? ( net-print/cups )
-	dia? ( app-office/dia )
-	dot? ( media-gfx/graphviz )
-	enchant? ( app-text/enchant:2 )
-	gnumeric? ( app-office/gnumeric )
-	html? ( dev-tex/html2latex )
-	hunspell? ( app-text/hunspell )
-	l10n_he? (
-		dev-tex/culmus-latex
-		dev-texlive/texlive-langarabic
-	)
-	latex? (
-		app-text/dvipng
-		app-text/ghostscript-gpl
-		app-text/ps2eps
-		app-text/texlive
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-mathscience
-		dev-texlive/texlive-pictures
-		dev-texlive/texlive-plaingeneric
-		|| (
-			dev-tex/latex2html
-			dev-tex/hevea
-			dev-tex/tex4ht[java]
-			dev-tex/tth
-		)
-	)
-	rcs? ( dev-vcs/rcs )
-	rtf? (
-		app-text/unrtf
-		dev-tex/html2latex
-		dev-tex/latex2rtf
-	)
-	svg? ( || (
-		gnome-base/librsvg
-		media-gfx/inkscape
-	) )
-"
-DEPEND="${RDEPEND}"
-# bc needed http://comments.gmane.org/gmane.editors.lyx.devel/137498 and bug #787839
-BDEPEND="
-	app-alternatives/bc
-	virtual/pkgconfig
-	dev-qt/qttools[linguist]
-	nls? ( sys-devel/gettext )
-"
-
-DOCS=( ANNOUNCE NEWS README RELEASE-NOTES UPGRADING )
-
-FONT_S="${S}/lib/fonts"
-FONT_SUFFIX="ttf"
-
-PATCHES=(
-	"${FILESDIR}"/lyx-2.4.0-fix-hunspell.patch
-	# Try first with xdg-open before hardcoded commands
-	# Patch from Debian using a similar approach to Fedora
-	"${FILESDIR}"/lyx-2.4.0-prefer-xdg-open.patch
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	font_pkg_setup
-}
-
-src_prepare() {
-	sed "s:python -tt:${EPYTHON} -tt:g" -i lib/configure.py || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	#bug 221921
-	export VARTEXFONTS="${T}"/fonts
-
-	local mycmakeargs=(
-		-DLYX_INSTALL=ON
-		-DLYX_USE_QT=QT6
-		-DLYX_INSTALL_PREFIX="${EPREFIX}/usr"
-		-DLYX_CXX_FLAGS_EXTRA="${CXXFLAGS}"
-
-		-DLYX_NLS=$(usex nls)
-		-DLYX_ASPELL=$(usex aspell)
-		-DLYX_ENCHANT=$(usex enchant)
-		-DLYX_HUNSPELL=$(usex hunspell)
-
-		# external dependencies
-		-DLYX_EXTERNAL_Z=ON
-		-DLYX_EXTERNAL_ICONV=ON
-		-DLYX_EXTERNAL_HUNSPELL=ON
-		-DLYX_EXTERNAL_MYTHES=ON
-		-DLYX_EXTERNAL_BOOST=ON
-		-DLYX_PROGRAM_SUFFIX=OFF
-
-		# debug control
-		-DLYX_NO_OPTIMIZE=OFF
-		-DLYX_RELEASE=ON
-		-DLYX_DEBUG=OFF
-		-DLYX_DEBUG_GLIBC=OFF
-		-DLYX_STDLIB_DEBUG=OFF
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	newicon -s 32 "development/Win32/packaging/icons/lyx_32x32.png" ${PN}.png
-	doicon -s 48 "lib/images/lyx.png"
-	doicon -s scalable "lib/images/lyx.svg"
-
-	# fix for bug 91108
-	if use latex; then
-		dosym -r /usr/share/lyx/tex /usr/share/texmf-site/tex/latex/lyx
-	fi
-
-	# fonts needed for proper math display, see also bug #15629
-	font_src_install
-
-	python_fix_shebang "${ED}"/usr/share/${PN}
-
-	if use hunspell; then
-		dosym ../myspell /usr/share/lyx/dicts
-		dosym ../myspell /usr/share/lyx/thes
-	fi
-}
-
-pkg_postinst() {
-	font_pkg_postinst
-	xdg_pkg_postinst
-
-	# fix for bug 91108
-	if use latex ; then
-		texhash || die
-	fi
-
-	optfeature "handling more fonts" dev-texlive/texlive-fontsextra
-}
-
-pkg_postrm() {
-	font_pkg_postrm
-	xdg_pkg_postrm
-
-	if use latex ; then
-		texhash || die
-	fi
-}
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
--- a/app-portage/command-not-found/Manifest
+++ b/app-portage/command-not-found/Manifest
@ -1 +1,2 @@
 DIST command-not-found-0.0.5.tar.gz 10045 BLAKE2B 5225fe4512516518172b1c7d25563488f26b359e0698a3352ebf2143dd7983fee2c44050e2b4abf72377780875436861855f0891bc10d429fba9bba695808bf3 SHA512 9125e168d64b7474f83d1bc8ed7f54ef332190d0d7325c281f1a041d47b23ce18170dff2fa3342468941cba7b0197821790ef5d1e9b8c1ee1f5a6ba1383b1005
+DIST command-not-found-0.0.6.tar.gz 10290 BLAKE2B 352a77790539acca9d54902e8078b580a5f4a789d61c395944363b4a42f8750cd518e3d8a22f69c409c8ab090cf6345677c324f3faa1e67071439cd6f600c7a3 SHA512 9396b7cb1cbcbc53047928ede0f77613e7f5ad3d5855f6476c40642c52a419aa6227e9b329d8d73d267fbd946e36f21740420ea854555025ddd2ea7eb1dbcec2
--- a/app-portage/command-not-found/command-not-found-0.0.6.ebuild
+++ b/app-portage/command-not-found/command-not-found-0.0.6.ebuild
@ -0,0 +1,40 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit optfeature python-r1
+
+DESCRIPTION="Command-not-found handler for Gentoo"
+HOMEPAGE="https://github.com/AndrewAmmerlaan/command-not-found-gentoo"
+SRC_URI="https://github.com/AndrewAmmerlaan/command-not-found-gentoo/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-gentoo-${PV}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}"
+
+src_install() {
+	python_foreach_impl python_doscript command-not-found
+
+	insinto /etc/bash/bashrc.d
+	doins command-not-found.sh
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	elog "${PN} is automatically setup for app-shells/bash, see"
+	elog "    /usr/share/doc/${PF}/README.md"
+	elog "for instructions on how to set it up for various other shells."
+	elog
+	optfeature "suggesting snaps providing the missing command" "app-containers/snapd"
+	optfeature "suggesting ebuilds providing the missing command" "app-portage/pfl"
+}
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@ -433,3 +433,15 @@ DIST bash52-025 1454 BLAKE2B 5d18e00cc44710f078037f25c61741a078bb0fc906d6d5555e5
 DIST bash52-025.sig 95 BLAKE2B aff63f1a0a753b632f0d2ce4cf8f4117689469150d41dd0e0d7f76fca973d52fb16f3957b12709826e50705f921fe141108b1046de05d17b40216ed5d4a00893 SHA512 079888adce1cb8583b547d67005f179614f1c42756de20acdb9e24763dec145a421c68e7ceb48d42b853ae7fcb07e051cc1ca56f9dfd337c9a1b001618df2828
 DIST bash52-026 1372 BLAKE2B ebe3bc47dadf5d689258c5ccf9883838d3383dc43bec68d2a6767b6348cf1515a98ec9e445c3110e8eb0d87e742c20a0d4ddb70649ec94217f55aad7d18552af SHA512 571993da2b8067ef5b7b705aee65dd414ee70b216ffbcb9fab7c08807b87a72465594c3f1576c795ae86bf951911cdde70ad1037e851b88ee379c4237ccff6fe
 DIST bash52-026.sig 95 BLAKE2B 175df0703ee5374094d41761ebc2827d34cb97328ea8e486cc9e5c946e482a7d0a16a7ac45e11296500cff8ac4c013e60b07d34abf8b3478527a80f742fbe85e SHA512 6db725ffcf429e04551b2fde329067696b20bef9418b57cff56a62f31c262d0b800061284469eb9f809ca49516516735213dc05defab52ff864ac3b214336559
+DIST bash52-027 1881 BLAKE2B b76ce03456e064f17db00e9026aa53656a063c195faa02c7d51da8d173f7525fe5411bf526f19ee9e717ee1ec957de7e73f5af851a68d5cb554f2c4492ab3844 SHA512 644ef1ea0ce002913b443cfc74d1376b3b8d1c7c976c88cfcec663313563ea905af3aa7ab7236e0ee8336195b01cfc7f2a5a738c5f787a637be92cda937f571e
+DIST bash52-027.sig 95 BLAKE2B 7120dc764120e108fbafd80dcd5010aea2f79f7508fda375740f7601c5e7508f2c830673101fe528a79cb4a7a5718ebd5dcf5e7ae81943008b128b10bb57ab8b SHA512 ad76bc672e53c62a8554a2889d420294f7dde0a996cb3058ca8a3a4108b53d35ed56dbcd0601f1984b3ae26dfe5eb6d99c9d46ebe78f0947b82502bef2419152
+DIST bash52-028 1571 BLAKE2B 58fdeecf6dd685103c7dc0e7c200cae65206e5fb3360d798b9cec05fc935ebae139bdf142f6018c9837d1780eb7c5cecff0a945369c14fa575e6801c46a15a31 SHA512 0e59ee230c2f9394814578e56270efa93e5ed8ed2fbf0c0777fdfad4d3f01f560923a80792998789c901068d88371f984f539fdebbec726759eeb7966d324328
+DIST bash52-028.sig 95 BLAKE2B 62d4663cfb25b470635321815e0860434c2edb35b220450d0123fc0bee2d80f29af060c34c765a48d75b49030f17d50852a1540be28fc615ebdd3f32391fe4d1 SHA512 e3e37ac8e6a29688c4c9dd318fc767331eec39bf947670060ebd42fd8262aad400152dc02d1d459f00170e6b788cf95d4a0a6dd62a2eae4af5bc67ebc80ece5d
+DIST bash52-029 3619 BLAKE2B 01ddb0acc5b6067e729320692284d61735ace62eeede81a74b7628fe6899da61d921a11bd0d22d0e6f2e241e7b0cb64591654a34a33916739e35e23d5cc6f5bd SHA512 b0b134347fbe0916b9c0fc60a9dbc6b6ebc7439bd5a12d0cda29a0012cbbcc16414392597764c24b8ca716ce727bce7da7fae39acc3cdba9506efb01014a43ae
+DIST bash52-029.sig 95 BLAKE2B 49c408e8da095c130868b3fab7afb85408307a10d9154dda818e014cec2ec973e1fc2a96dcd7a1769d1581e3c1d758d172bfa066d7b1ea6fdbb80e062d24ef64 SHA512 11aeca6b46a5cdf518b26a59a972e956455cb4d15aedd968ad36f8100bfc38448f89fe7a72dbecfa8da9fe556a194dda9bb34f1d16c2408b92b0e594f163f262
+DIST bash52-030 4111 BLAKE2B d0cf114642393eb2e2d060eac339674c8ce10af4d54bbcee0f450854d27373ede9dd159caf6d05fc69429ad357d666b47f6781ef590287f33a535b2c26d8754d SHA512 515902fd567dfbbca3d4f6d98a7f2f5a9d1ad323d829f9b90839de4807592708dea3d52f67cb868617278f9c8c6bb299ab3310d898be344d63e824043f17fe2d
+DIST bash52-030.sig 95 BLAKE2B b8edc295a6646721ce7be79ebac2331a36c0b84ca9f5a6b6e8c2da0674f1279debaf941bbbddd56e2b868afc60a92a34fd312e049fc8524ba1e88ca5cb952acc SHA512 2592d5b7f62a23dd16153691053e462342ae33f347349348de98487c52d2e73ab0d46216505925bc887bceb069bcb5c1c5ce7ce803e62eec7ef0458dbaf1fb69
+DIST bash52-031 1159 BLAKE2B dac378115906e21fc754267c42e129e2374c9b63f879d1717d79930589618d4d8d17821b2f529d1851db7567d3efdfb0410c18e6869047e3d87443b29d507289 SHA512 08f3e3cb6a6554ea6d1b1f5cbcd156cb75f9c0c5350801b67352a1c2ffec0d02d90c0947736fd52de304e549a1b919ea0ff42e23a8cf63a721a351ea1732bea5
+DIST bash52-031.sig 95 BLAKE2B 50e5c0b3afb0ffc8b1863bde645316d7c7c49e8b396041ca1dcf269c50b532aaccf0c3fb5a5e64036ece9054d8ccf78f7e829ecf0fbdcf8531ba57230b129f1c SHA512 f656d8fbbe79450fbf193e5c2aebc85cfc425703495f2925aa774d5c0e742ebf523c191264673c6dd76fa6071c39d5155698687475eb634cd6553e86266f91a5
+DIST bash52-032 1529 BLAKE2B 55aab849da0fcc69ab3516d9d7ff2858b5f15cbeaddf66282f43f272b52d646c2c41c2ceef632a2ae8f13c25d92e85f49fbc6de989ed4f6ac4bb7bea7fc59a5d SHA512 9eb277d2d92b9ec49f70582e52305bc45b425b189ba2a15c51c537e07ccf9cb894c1ca44fa399b04297fe51027aff7f169f41efe2d60895ca55c421c0778ef32
+DIST bash52-032.sig 95 BLAKE2B 23a5cd003c957932d0c0192b63a5e8e7366bf939c3f54ff91b444e3729607c88677fdf4a5b435e47da4a64624b10d8696e4e950fac8fbb6932bb4c64506d1f9f SHA512 d3b08c3d0efee81a8507b530405a886259438bfc4c2ab984dbe80d30177775aacf6448a2673f0bd274fe46c938a8b8d46844d3794374bafce63f7c1d8bf4efe1
--- a/app-shells/bash/bash-5.2_p32.ebuild
+++ b/app-shells/bash/bash-5.2_p32.ebuild
@ -0,0 +1,402 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/chetramey.asc
+inherit flag-o-matic toolchain-funcs prefix verify-sig
+
+# Uncomment if we have a patchset.
+#GENTOO_PATCH_DEV="sam"
+#GENTOO_PATCH_VER="${PV}"
+
+MY_PV=${PV/_p*}
+MY_PV=${MY_PV/_/-}
+MY_P=${PN}-${MY_PV}
+MY_PATCHES=()
+
+# Determine the patchlevel. See ftp://ftp.gnu.org/gnu/bash/bash-5.2-patches/.
+case ${PV} in
+	*_p*)
+		PLEVEL=${PV##*_p}
+		;;
+	9999|*_alpha*|*_beta*|*_rc*)
+		# Set a negative patchlevel to indicate that it's a pre-release.
+		PLEVEL=-1
+		;;
+	*)
+		PLEVEL=0
+esac
+
+# The version of readline this bash normally ships with. Note that we only use
+# the bundled copy of readline for pre-releases.
+READLINE_VER="8.2_p1"
+
+DESCRIPTION="The standard GNU Bourne again shell"
+HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html https://git.savannah.gnu.org/cgit/bash.git"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git"
+	EGIT_BRANCH=devel
+	inherit git-r3
+else
+	my_urls=( {'mirror://gnu/bash','ftp://ftp.cwru.edu/pub/bash'}/"${MY_P}.tar.gz" )
+
+	# bash-5.1 -> bash51
+	my_p=${PN}$(ver_cut 1-2) my_p=${my_p/.}
+
+	for (( my_patch_idx = 1; my_patch_idx <= PLEVEL; my_patch_idx++ )); do
+		printf -v my_patch_ver %s-%03d "${my_p}" "${my_patch_idx}"
+		my_urls+=( {'mirror://gnu/bash','ftp://ftp.cwru.edu/pub/bash'}/"${MY_P}-patches/${my_patch_ver}" )
+		MY_PATCHES+=( "${DISTDIR}/${my_patch_ver}" )
+	done
+
+	SRC_URI="${my_urls[*]} verify-sig? ( ${my_urls[*]/%/.sig} )"
+
+	unset -v my_urls my_p my_patch_idx my_patch_ver
+fi
+
+if [[ ${GENTOO_PATCH_VER} ]]; then
+	SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV:?}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER:?}-patches.tar.xz"
+fi
+
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-3+"
+SLOT="0"
+if (( PLEVEL >= 0 )); then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+IUSE="afs bashlogger examples mem-scramble +net nls plugins pgo +readline"
+
+DEPEND="
+	>=sys-libs/ncurses-5.2-r2:=
+	nls? ( virtual/libintl )
+"
+if (( PLEVEL >= 0 )); then
+	DEPEND+=" readline? ( >=sys-libs/readline-${READLINE_VER}:= )"
+fi
+RDEPEND="
+	${DEPEND}
+"
+# We only need bison (yacc) when the .y files get patched (bash42-005, bash51-011).
+BDEPEND="
+	pgo? ( dev-util/gperf )
+	verify-sig? ( sec-keys/openpgp-keys-chetramey )
+"
+
+# EAPI 8 tries to append it but it doesn't exist here.
+QA_CONFIGURE_OPTIONS="--disable-static"
+
+PATCHES=(
+	#"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}/
+
+	# Patches to or from Chet, posted to the bug-bash mailing list.
+	"${FILESDIR}/${PN}-5.0-syslog-history-extern.patch"
+	"${FILESDIR}/${PN}-5.2_p15-random-ub.patch"
+	"${FILESDIR}/${PN}-5.2_p15-configure-clang16.patch"
+	"${FILESDIR}/${PN}-5.2_p21-wpointer-to-int.patch"
+	"${FILESDIR}/${PN}-5.2_p21-configure-strtold.patch"
+	"${FILESDIR}/${PN}-5.2_p32-memory-leaks.patch"
+)
+
+pkg_setup() {
+	# bug #7332
+	if is-flag -malign-double; then
+		eerror "Detected bad CFLAGS '-malign-double'.  Do not use this"
+		eerror "as it breaks LFS (struct stat64) on x86."
+		die "remove -malign-double from your CFLAGS mr ricer"
+	fi
+
+	if use bashlogger; then
+		ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
+		ewarn "This will log ALL output you enter into the shell, you have been warned."
+	fi
+}
+
+src_unpack() {
+	local patch
+
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+	else
+		if use verify-sig; then
+			verify-sig_verify_detached "${DISTDIR}/${MY_P}.tar.gz"{,.sig}
+
+			for patch in "${MY_PATCHES[@]}"; do
+				verify-sig_verify_detached "${patch}"{,.sig}
+			done
+		fi
+
+		unpack "${MY_P}.tar.gz"
+
+		if [[ ${GENTOO_PATCH_VER} ]]; then
+			unpack "${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"
+		fi
+	fi
+}
+
+src_prepare() {
+	# Include official patches.
+	(( PLEVEL > 0 )) && eapply -p0 "${MY_PATCHES[@]}"
+
+	# Clean out local libs so we know we use system ones w/releases. The
+	# touch utility is invoked for the benefit of config.status.
+	if (( PLEVEL >= 0 )); then
+		rm -rf lib/{readline,termcap}/* \
+		&& touch lib/{readline,termcap}/Makefile.in \
+		&& sed -i -E 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in \
+		|| die
+	fi
+
+	# Prefixify hardcoded path names. No-op for non-prefix.
+	hprefixify pathnames.h.in
+
+	# Avoid regenerating docs after patches, bug #407985.
+	sed -i -E '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in \
+	&& touch -r . doc/* \
+	|| die
+
+	# Sometimes hangs (more noticeable w/ pgo), bug #907403.
+	rm tests/run-jobs || die
+
+	eapply -p0 "${PATCHES[@]}"
+	eapply_user
+}
+
+src_configure() {
+	local -a myconf
+
+	# Upstream only test with Bison and require GNUisms like YYEOF and
+	# YYERRCODE. The former at least may be in POSIX soon:
+	# https://www.austingroupbugs.net/view.php?id=1269.
+	# configure warns on use of non-Bison but doesn't abort. The result
+	# may misbehave at runtime.
+	unset -v YACC
+
+	myconf=(
+		--disable-profiling
+
+		# Force linking with system curses ... the bundled termcap lib
+		# sucks bad compared to ncurses.  For the most part, ncurses
+		# is here because readline needs it.  But bash itself calls
+		# ncurses in one or two small places :(.
+		--with-curses
+
+		$(use_enable mem-scramble)
+		$(use_enable net net-redirections)
+		$(use_enable readline)
+		$(use_enable readline bang-history)
+		$(use_enable readline history)
+		$(use_with afs)
+		$(use_with mem-scramble bash-malloc)
+	)
+
+	# For descriptions of these, see config-top.h.
+	# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
+	append-cppflags \
+		-DDEFAULT_PATH_VALUE=\'\""${EPREFIX}"/usr/local/sbin:"${EPREFIX}"/usr/local/bin:"${EPREFIX}"/usr/sbin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/bin\"\' \
+		-DSTANDARD_UTILS_PATH=\'\""${EPREFIX}"/bin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/usr/sbin\"\' \
+		-DSYS_BASHRC=\'\""${EPREFIX}"/etc/bash/bashrc\"\' \
+		-DSYS_BASH_LOGOUT=\'\""${EPREFIX}"/etc/bash/bash_logout\"\' \
+		-DNON_INTERACTIVE_LOGIN_SHELLS \
+		-DSSH_SOURCE_BASHRC \
+		$(use bashlogger && echo -DSYSLOG_HISTORY)
+
+	use nls || myconf+=( --disable-nls )
+
+	if (( PLEVEL >= 0 )); then
+		# Historically, we always used the builtin readline, but since
+		# our handling of SONAME upgrades has gotten much more stable
+		# in the PM (and the readline ebuild itself preserves the old
+		# libs during upgrades), linking against the system copy should
+		# be safe.
+		# Exact cached version here doesn't really matter as long as it
+		# is at least what's in the DEPEND up above.
+		export ac_cv_rl_version=${READLINE_VER%%_*}
+
+		# Use system readline only with released versions.
+		myconf+=( --with-installed-readline=. )
+	fi
+
+	if use plugins; then
+		append-ldflags "-Wl,-rpath,${EPREFIX}/usr/$(get_libdir)/bash"
+	else
+		# Disable the plugins logic by hand since bash doesn't provide
+		# a way of doing it.
+		export ac_cv_func_dl{close,open,sym}=no \
+			ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
+
+		sed -i -e '/LOCAL_LDFLAGS=/s:-rdynamic::' configure || die
+	fi
+
+	# bug #444070
+	tc-export AR
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	local -a pgo_generate_flags pgo_use_flags
+	local flag
+
+	# -fprofile-partial-training because upstream notes the test suite isn't
+	# super comprehensive.
+	# https://documentation.suse.com/sbp/all/html/SBP-GCC-10/index.html#sec-gcc10-pgo
+	if use pgo; then
+		pgo_generate_flags=(
+			-fprofile-update=atomic
+			-fprofile-dir="${T}"/pgo
+			-fprofile-generate="${T}"/pgo
+		)
+		pgo_use_flags=(
+			-fprofile-use="${T}"/pgo
+			-fprofile-dir="${T}"/pgo
+		)
+		if flag=$(test-flags-CC -fprofile-partial-training); then
+			pgo_generate_flags+=( "${flag}" )
+			pgo_use_flags+=( "${flag}" )
+		fi
+	fi
+
+	emake CFLAGS="${CFLAGS} ${pgo_generate_flags[*]}"
+	use plugins && emake -C examples/loadables CFLAGS="${CFLAGS} ${pgo_generate_flags[*]}" all others
+
+	# Build Bash and run its tests to generate profiles.
+	if (( ${#pgo_generate_flags[@]} )); then
+		# Used in test suite.
+		unset -v A
+
+		emake CFLAGS="${CFLAGS} ${pgo_generate_flags[*]}" -k check
+
+		if tc-is-clang; then
+			llvm-profdata merge "${T}"/pgo --output="${T}"/pgo/default.profdata || die
+		fi
+
+		# Rebuild Bash using the profiling data we just generated.
+		emake clean
+		emake CFLAGS="${CFLAGS} ${pgo_use_flags[*]}"
+		use plugins && emake -C examples/loadables CFLAGS="${CFLAGS} ${pgo_use_flags[*]}" all others
+	fi
+}
+
+src_test() {
+	# Used in test suite.
+	unset -v A
+
+	default
+}
+
+src_install() {
+	local d f
+
+	default
+
+	my_prefixify() {
+		while read -r; do
+			if [[ $REPLY == *$1* ]]; then
+				REPLY=${REPLY/"/etc/"/"${EPREFIX}/etc/"}
+			fi
+			printf '%s\n' "${REPLY}" || ! break
+		done < "$2" || die
+	}
+
+	dodir /bin
+	mv -- "${ED}"/usr/bin/bash "${ED}"/bin/ || die
+	dosym bash /bin/rbash
+
+	insinto /etc/bash
+	doins "${FILESDIR}"/bash_logout
+	my_prefixify bashrc.d "${FILESDIR}"/bashrc-r1 | newins - bashrc
+
+	insinto /etc/bash/bashrc.d
+	my_prefixify DIR_COLORS "${FILESDIR}"/bashrc.d/10-gentoo-color.bash | newins - 10-gentoo-color.bash
+	newins "${FILESDIR}"/bashrc.d/10-gentoo-title-r1.bash 10-gentoo-title.bash
+	if [[ ! ${EPREFIX} ]]; then
+		doins "${FILESDIR}"/bashrc.d/15-gentoo-bashrc-check.bash
+	fi
+
+	insinto /etc/skel
+	for f in bash{_logout,_profile,rc}; do
+		newins "${FILESDIR}/dot-${f}" ".${f}"
+	done
+
+	if use plugins; then
+		exeinto "/usr/$(get_libdir)/bash"
+		set -- examples/loadables/*.o
+		doexe "${@%.o}"
+
+		insinto /usr/include/bash-plugins
+		doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
+	fi
+
+	if use examples; then
+		for d in examples/{functions,misc,scripts,startup-files}; do
+			exeinto "/usr/share/doc/${PF}/${d}"
+			docinto "${d}"
+			for f in "${d}"/*; do
+				if [[ ${f##*/} != @(PERMISSION|*README) ]]; then
+					doexe "${f}"
+				else
+					dodoc "${f}"
+				fi
+			done
+		done
+	fi
+
+	# Install bash_builtins.1 and rbash.1.
+	emake -C doc DESTDIR="${D}" install_builtins
+	sed 's:bash\.1:man1/&:' doc/rbash.1 > "${T}"/rbash.1 || die
+	doman "${T}"/rbash.1
+
+	newdoc CWRU/changelog ChangeLog
+	dosym bash.info /usr/share/info/bashref.info
+}
+
+pkg_preinst() {
+	if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]]; then
+		mkdir -p -- "${EROOT}"/etc/bash \
+		&& mv -f -- "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/ \
+		|| die
+	fi
+}
+
+pkg_postinst() {
+	local old_ver
+
+	# If /bin/sh does not exist, provide it.
+	if [[ ! -e ${EROOT}/bin/sh ]]; then
+		ln -sf -- bash "${EROOT}"/bin/sh || die
+	fi
+
+	read -r old_ver <<<"${REPLACING_VERSIONS}"
+	if [[ ! $old_ver ]]; then
+		:
+	elif ver_test "$old_ver" -ge "5.2" && ver_test "$old_ver" -ge "5.2_p26-r8"; then
+		return
+	fi
+
+	while read -r; do ewarn "${REPLY}"; done <<'EOF'
+Files under /etc/bash/bashrc.d must now have a suffix of .sh or .bash.
+
+Gentoo now defaults to defining PROMPT_COMMAND as an array. Depending on the
+characteristics of the operating environment, it may contain a command to set
+the terminal's window title. Those who were already choosing to customise the
+PROMPT_COMMAND variable are now advised to append their commands like so:
+
+PROMPT_COMMAND+=('custom command goes here')
+
+Gentoo no longer defaults to having bash set the window title in the case
+that the terminal is controlled by sshd(8), unless screen is launched on the
+remote side or the terminal reliably supports saving and restoring the title
+(as alacritty, foot and tmux do). Those wanting for the title to be set
+regardless may adjust ~/.bashrc - or create a custom /etc/bash/bashrc.d
+drop-in - to set PROMPT_COMMMAND like so:
+
+PROMPT_COMMAND=(genfun_set_win_title)
+
+Those who would prefer for bash never to interfere with the window title may
+now opt out of the default title setting behaviour, either with the "unset -v
+PROMPT_COMMAND" command or by re-defining PROMPT_COMMAND as desired.
+EOF
+}
--- a/app-shells/bash/files/bash-5.2_p32-memory-leaks.patch
+++ b/app-shells/bash/files/bash-5.2_p32-memory-leaks.patch
@ -0,0 +1,130 @@
+[Compared to bash-5.2_p26-memory-leaks.patch, this drops a hunk for
+builtins/evalstring.c as the open_redir_file issue is fixed in patch 31
+upstream for bash-5.2]
+
+https://lists.gnu.org/archive/html/bug-bash/2024-01/msg00036.html
+https://lists.gnu.org/archive/html/bug-bash/2024-01/txtm8yNNPR9RQ.txt
+
+For evalstring.c:
+* https://lists.gnu.org/archive/html/bug-bash/2024-01/msg00011.html
+* https://git.savannah.gnu.org/cgit/bash.git/diff/builtins/evalstring.c?h=devel&id=81f7b44564cd1510788035cea7c59631865a7db2&dt=1#n766
+
+From 711ab85262884f2b91f09eceb9aefd0e2426ce67 Mon Sep 17 00:00:00 2001
+From: Grisha Levit <grishalevit@gmail.com>
+Date: Sat, 3 Jun 2023 16:51:26 -0400
+Subject: [PATCH] various leaks
+
+Found mostly by normal usage running a no-bash-malloc build with clang's
+LeakSanitizer enabled. So far seems to provide very accurate results.
+
+* arrayfunc.c
+- quote_compound_array_word: make sure to free VALUE
+- bind_assoc_var_internal: if assigning to a dynamic variable, make sure
+  to free the key (usually assoc_insert would do it)
+
+* bashline.c
+- bash_command_name_stat_hook: free original *NAME if we are going to
+  change what it points to (what the callers seem to expect)
+
+* builtins/evalstring.c
+- parse_and_execute: make sure to dispose of the parsed command
+  resulting from a failed function import attempt
+
+* examples/loadables/stat.c
+- loadstat: bind_assoc_variable does not free its VALUE argument so make
+  sure to do it
+
+* subst.c
+- param_expand: free temp1 value for codepaths that don't do it
+---
+ arrayfunc.c               | 6 +++++-
+ bashline.c                | 1 +
+ builtins/evalstring.c     | 4 ++++
+ examples/loadables/stat.c | 1 +
+ subst.c                   | 2 ++
+ 5 files changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/arrayfunc.c b/arrayfunc.c
+index 2c05d15b..8ba64084 100644
+--- arrayfunc.c
+++ arrayfunc.c
+@@ -208,7 +208,10 @@ bind_assoc_var_internal (entry, hash, key, value, flags)
+   newval = make_array_variable_value (entry, 0, key, value, flags);
+ 
+   if (entry->assign_func)
+-    (*entry->assign_func) (entry, newval, 0, key);
+    {
+      (*entry->assign_func) (entry, newval, 0, key);
+      FREE (key);
+    }
+   else
+     assoc_insert (hash, key, newval);
+ 
+@@ -985,6 +988,7 @@ quote_compound_array_word (w, type)
+   if (t != w+ind)
+    free (t);
+   strcpy (nword + i, value);
+  free (value);
+ 
+   return nword;
+ }
+diff --git a/bashline.c b/bashline.c
+index c85b05b6..bd7548cc 100644
+--- bashline.c
+++ bashline.c
+@@ -1928,6 +1928,7 @@ bash_command_name_stat_hook (name)
+   result = search_for_command (cname, 0);
+   if (result)
+     {
+      FREE (*name);
+       *name = result;
+       return 1;
+     }
+diff --git a/builtins/evalstring.c b/builtins/evalstring.c
+index df3dd68e..20c6a4a7 100644
+--- builtins/evalstring.c
+++ builtins/evalstring.c
+@@ -461,6 +461,8 @@ parse_and_execute (string, from_file, flags)
+ 		      should_jump_to_top_level = 0;
+ 		      last_result = last_command_exit_value = EX_BADUSAGE;
+ 		      set_pipestatus_from_exit (last_command_exit_value);
+		      dispose_command(command);
+		      global_command = (COMMAND *)NULL;
+ 		      reset_parser ();
+ 		      break;
+ 		    }
+ 
+diff --git a/examples/loadables/stat.c b/examples/loadables/stat.c
+index 1e60e7b6..ed5c9764 100644
+--- examples/loadables/stat.c
+++ examples/loadables/stat.c
+@@ -349,6 +349,7 @@ loadstat (vname, var, fname, flags, fmt, sp)
+       key = savestring (arraysubs[i]);
+       value = statval (i, fname, flags, fmt, sp);
+       v = bind_assoc_variable (var, vname, key, value, ASS_FORCE);
+      free (value);
+     }
+   return 0;
+ }
+diff --git a/subst.c b/subst.c
+index 1ac6eb2d..ff0602da 100644
+--- subst.c
+++ subst.c
+@@ -10727,6 +10727,7 @@ comsub:
+ 	    {
+ 	      chk_atstar (temp, quoted, pflags, quoted_dollar_at_p, contains_dollar_at);
+ 	      tdesc = parameter_brace_expand_word (temp, SPECIAL_VAR (temp, 0), quoted, pflags, 0);
+	      free (temp1);
+ 	      if (tdesc == &expand_wdesc_error || tdesc == &expand_wdesc_fatal)
+ 		return (tdesc);
+ 	      ret = tdesc;
+@@ -10739,6 +10740,7 @@ comsub:
+ 	    {
+ 	      set_exit_status (EXECUTION_FAILURE);
+ 	      report_error (_("%s: invalid variable name for name reference"), temp);
+	      free (temp1);
+ 	      return (&expand_wdesc_error);	/* XXX */
+ 	    }
+ 	  else
+-- 
+2.43.0
--- a/app-shells/starship/starship-1.19.0.ebuild
+++ b/app-shells/starship/starship-1.19.0.ebuild
@ -22,7 +22,7 @@ LICENSE+="
 "

 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"

 BDEPEND="
 	dev-build/cmake
--- a/app-shells/zsh-completions/zsh-completions-0.35.0.ebuild
+++ b/app-shells/zsh-completions/zsh-completions-0.35.0.ebuild
@ -8,7 +8,7 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/zsh-users/zsh-completions.git"
 else
 	SRC_URI="https://github.com/zsh-users/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 fi

 DESCRIPTION="Additional completion definitions for Zsh"
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/barcode/metadata.xml
+++ b/app-text/barcode/metadata.xml
@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>tamiko@gentoo.org</email>
-    <name>Matthias Maier</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="savannah">barcode</remote-id>
-  </upstream>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="savannah">barcode</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-text/mythes/metadata.xml
+++ b/app-text/mythes/metadata.xml
@ -6,6 +6,6 @@
 		<name>Gentoo Office project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge">hunspell</remote-id>
+		<remote-id type="github">hunspell/mythes</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
--- a/app-vim/vim-multiple-cursors/metadata.xml
+++ b/app-vim/vim-multiple-cursors/metadata.xml
@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>tamiko@gentoo.org</email>
-		<name>Matthias Maier</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>vim@gentoo.org</email>
 		<name>Gentoo Vim Project</name>
--- a/app-xemacs/Manifest.gz
+++ b/app-xemacs/Manifest.gz
--- a/app-xemacs/ebuild-mode/ebuild-mode-1.72.ebuild
+++ b/app-xemacs/ebuild-mode/ebuild-mode-1.72.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="amd64 ~hppa x86"

 RDEPEND=">=app-editors/xemacs-21.4.20-r5
 	app-xemacs/sh-script"
--- a/dev-build/Manifest.gz
+++ b/dev-build/Manifest.gz
--- a/dev-build/bazelisk/bazelisk-1.20.0.ebuild
+++ b/dev-build/bazelisk/bazelisk-1.20.0.ebuild
@ -15,7 +15,7 @@ SRC_URI="

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
 IUSE="+bazel-symlink"

 DOCS=( CONTRIBUTING.md README.md )
--- a/dev-build/cmake/Manifest
+++ b/dev-build/cmake/Manifest
@ -1,7 +1,3 @@
-DIST cmake-3.27.0-docs.tar.xz 521348 BLAKE2B 319c84195c37b1944bb5d3fde1aeae75623fc90a734c1ba74d730cd5678bff75806f7aa8aa8171fd7878a09b3316c9c0ee23c0c055e869a4385f54987f86d801 SHA512 e9c300526f9fe4e450e921308b7af42f4b8972f2f546f7bbf2dffb4ca696793fe09f1610636b05c82b1cf74ed8ef95377bec69e15f8c9197d6960e674e0d5400
-DIST cmake-3.27.9-SHA-256.txt 1646 BLAKE2B abfef38f8994d7684a44caaa4a5efa1ac8fbe38bd8e8c98bf341cf813f77ee54bea58f7b3ab7f68b3f5d992519396fd15a1f72a1d9587f593d80b8d2f8ba36e7 SHA512 310c45281735cf9812d9d1cf22a656c5b44e596ef7032a8b7b09900ef838e74b884599b42ed2f5469946f371d431b7d4b1e44f6cd49dfb36ea49d88b187b4804
-DIST cmake-3.27.9-SHA-256.txt.asc 833 BLAKE2B 57d52fc2f3233662af13eb362ec82626c4821267f55f1313907513b61cee5b8481936da2b03c908c507b3e0919e4811e90c6cb47568420a8b2187c7942de9f1e SHA512 cad2007e356eac480b2cb93778f90152788e33be2e565b38535a2d205794054e5d67d4ed7db0765a05017aedc5f1af21556535a084014fe6c446bc13258253da
-DIST cmake-3.27.9.tar.gz 10984490 BLAKE2B 66f8fb6e301ed19f993fde6c4f9e336124be6373d49b58d130ce59f4e5225cd27e02813856636b51c2521403c3a56c200ce646de5c35be2b25b5e6240c98bdb4 SHA512 56ce723b0b6d09b420a2f89ba1636cdfb1bc305bc2df91ae716f866bee07f5d702d75efbddfbaf724f47382df809107fe1e6d046314cd2f1ff07bca34ad6340a
 DIST cmake-3.28.0-docs.tar.xz 525776 BLAKE2B b643f76012768f0100c51f0dd146230eba25b634ab4f9abd9c739b0b257e4b1d54aa01be8d2dcd27a7b1d9822bf13eb8af16ff3c6984eeefdeb58988a164bc26 SHA512 474dc77e44240de921013219bd7cdc4aee80214fbf38d60dc2ddb53c0fda8a11c466c01bbee2abbd32b711ec7524678515e39a79a5634354a6cb38f9683e229f
 DIST cmake-3.28.5-SHA-256.txt 1646 BLAKE2B 763cbec9ede58cc43a7435e3fe97a9a9f28b201712f52d98ecdf8035887232fe6000675c9bab90f275ff6d44406839f04352784a921dcbc9d65c5e2440b53f52 SHA512 0fdeed277d113e4642c11b87b98305da43213bd89566e3aaaf427a11e168d9e6754632c2fd76fae542d29fddfa8b67c3c0df19f741c53fdd3aea8ce7bec73ff3
 DIST cmake-3.28.5-SHA-256.txt.asc 833 BLAKE2B bde735a577b556bc30ae1a5de0df8533243c955cc5d222537b3323e7108900af2f01799a4bfa843d953b141cc76a19aed77bfba15cf4e2c3cc36a0e7e844e853 SHA512 d495afd2ce4e16f8d3ecc0b319d59c3634aae71c26110d14225f9dd628bfe173cdd94818c69c930ef5cfff3b331445e192db0082188e0822155184e3f6f80e7d
--- a/dev-build/cmake/cmake-3.27.9.ebuild
+++ b/dev-build/cmake/cmake-3.27.9.ebuild
@ -1,295 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-cmake-docs
-# Set to 1 if prebuilt, 0 if not
-# (the construct below is to allow overriding from env for script)
-: ${CMAKE_DOCS_PREBUILT:=1}
-
-CMAKE_DOCS_PREBUILT_DEV=sam
-CMAKE_DOCS_VERSION=$(ver_cut 1-2).0
-# Default to generating docs (inc. man pages) if no prebuilt; overridden later
-# See bug #784815
-CMAKE_DOCS_USEFLAG="+doc"
-
-# TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja
-# ... but seems fine as of 3.22.3?
-# TODO ... but bootstrap sometimes(?) fails with ninja now. bug #834759.
-CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_REMOVE_MODULES_LIST=( none )
-inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
-	toolchain-funcs virtualx xdg-utils
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="https://cmake.org/"
-if [[ ${PV} == 9999 ]] ; then
-	CMAKE_DOCS_PREBUILT=0
-
-	EGIT_REPO_URI="https://gitlab.kitware.com/cmake/cmake.git"
-	inherit git-r3
-else
-	SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
-
-	if [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then
-		SRC_URI+=" !doc? ( https://dev.gentoo.org/~${CMAKE_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${CMAKE_DOCS_VERSION}-docs.tar.xz )"
-	fi
-
-	if [[ ${PV} != *_rc* ]] ; then
-		VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/bradking.asc
-		inherit verify-sig
-
-		SRC_URI+=" verify-sig? (
-			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt
-			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc
-		)"
-
-		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
-		BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-bradking-20230817 )"
-	fi
-fi
-
-[[ ${CMAKE_DOCS_PREBUILT} == 1 ]] && CMAKE_DOCS_USEFLAG="doc"
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="${CMAKE_DOCS_USEFLAG} dap emacs gui ncurses qt6 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=app-arch/libarchive-3.3.3:=
-	app-crypt/rhash:0=
-	>=dev-libs/expat-2.0.1
-	>=dev-libs/jsoncpp-1.9.2-r2:0=
-	>=dev-libs/libuv-1.10.0:=
-	>=net-misc/curl-7.21.5[ssl]
-	sys-libs/zlib
-	virtual/pkgconfig
-	dap? ( dev-cpp/cppdap )
-	emacs? ( >=app-editors/emacs-23.1:* )
-	gui? (
-		!qt6? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtwidgets:5
-		)
-		qt6? ( dev-qt/qtbase:6[gui,widgets] )
-	)
-	ncurses? ( sys-libs/ncurses:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND+="
-	doc? (
-		dev-python/requests
-		dev-python/sphinx
-	)
-	test? ( app-arch/libarchive[zstd] )
-"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-	# Prefix
-	"${FILESDIR}"/${PN}-3.27.0_rc1-0001-Don-t-use-.so-for-modules-on-darwin-macos.-Use-.bund.patch
-	"${FILESDIR}"/${PN}-3.27.0_rc1-0002-Set-some-proper-paths-to-make-cmake-find-our-tools.patch
-	# Misc
-	"${FILESDIR}"/${PN}-3.27.0_rc1-0003-Prefer-pkgconfig-in-FindBLAS.patch
-	"${FILESDIR}"/${PN}-3.27.0_rc1-0004-Ensure-that-the-correct-version-of-Qt-is-always-used.patch
-	"${FILESDIR}"/${PN}-3.27.0_rc1-0005-Respect-Gentoo-s-Python-eclasses.patch
-	"${FILESDIR}"/${PN}-3.27.0_rc1-0006-Filter-out-distcc-warnings-to-avoid-confusing-CMake.patch
-
-	# Upstream fixes (can usually be removed with a version bump)
-	# pkgconf
-	# fixes https://github.com/pkgconf/pkgconf/issues/317
-	"${FILESDIR}"/${PN}-3.27.4-0001-FindPkgConfig-ignore-whitespace-separators-in-versio.patch
-)
-
-cmake_src_bootstrap() {
-	# disable running of cmake in bootstrap command
-	sed -i \
-		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
-		bootstrap || die "sed failed"
-
-	# execinfo.h on Solaris isn't quite what it is on Darwin
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e 's/execinfo\.h/blablabla.h/' \
-			Source/kwsys/CMakeLists.txt || die
-	fi
-
-	# bootstrap script isn't exactly /bin/sh compatible
-	tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \
-		--prefix="${T}/cmakestrap/" \
-		--parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
-		|| die "Bootstrap failed"
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-	elif [[ ${PV} == *_rc* ]] || ! use verify-sig ; then
-		default
-	else
-		cd "${DISTDIR}" || die
-
-		# See https://mgorny.pl/articles/verify-sig-by-example.html#verifying-using-a-checksum-file-with-a-detached-signature
-		verify-sig_verify_detached ${MY_P}-SHA-256.txt{,.asc}
-		verify-sig_verify_unsigned_checksums ${MY_P}-SHA-256.txt sha256 ${MY_P}.tar.gz
-
-		cd "${WORKDIR}" || die
-
-		default
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# Disable Xcode hooks, bug #652134
-		sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \
-			Source/CMakeLists.txt || die
-		sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \
-			-e '/cmGlobalXCodeGenerator.h/d' \
-			Source/cmake.cxx || die
-
-		# Disable isysroot usage with GCC, we've properly instructed
-		# where things are via GCC configuration and ldwrapper
-		sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
-			Modules/Platform/Apple-GNU-*.cmake || die
-		# Disable isysroot usage with clang as well
-		sed -i -e '/_SYSROOT_FLAG/d' \
-			Modules/Platform/Apple-Clang.cmake || die
-		# Don't set a POSIX standard, system headers don't like that, #757426
-		sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
-			Source/cmLoadCommandCommand.cxx \
-			Source/cmStandardLexer.h \
-			Source/cmSystemTools.cxx \
-			Source/cmTimestamp.cxx
-		sed -i -e 's/^#if !defined(_POSIX_C_SOURCE) && !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
-			Source/cmStandardLexer.h
-	fi
-
-	# Add gcc libs to the default link paths
-	sed -i \
-		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
-		-e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
-		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
-		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-
-	if ! has_version -b \>=${CATEGORY}/${PN}-3.13 || ! cmake --version &>/dev/null ; then
-		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-		cmake_src_bootstrap
-	fi
-}
-
-src_configure() {
-	# Fix linking on Solaris
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
-
-	# ODR warnings, bug #858335
-	# https://gitlab.kitware.com/cmake/cmake/-/issues/20740
-	filter-lto
-
-	local mycmakeargs=(
-		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
-		-DCMake_ENABLE_DEBUGGER=$(usex dap)
-		-DCMAKE_DOC_DIR=/share/doc/${PF}
-		-DCMAKE_MAN_DIR=/share/man
-		-DCMAKE_DATA_DIR=/share/${PN}
-		-DSPHINX_MAN=$(usex doc)
-		-DSPHINX_HTML=$(usex doc)
-		-DBUILD_CursesDialog="$(usex ncurses)"
-		-DBUILD_TESTING=$(usex test)
-		-DBUILD_QtDialog=$(usex gui)
-	)
-
-	use gui && mycmakeargs+=( -DCMake_QT_MAJOR_VERSION=$(usex qt6 6 5) )
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
-src_test() {
-	# Fix OutDir and SelectLibraryConfigurations tests
-	# these are altered thanks to our eclass
-	sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
-		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
-		|| die
-
-	pushd "${BUILD_DIR}" > /dev/null || die
-
-	# Excluded tests:
-	#    BootstrapTest: we actualy bootstrap it every time so why test it.
-	#    BundleUtilities: bundle creation broken
-	#    CMakeOnly.AllFindModules: pthread issues
-	#    CTest.updatecvs: which fails to commit as root
-	#    Fortran: requires fortran
-	#    RunCMake.CompilerLauncher: also requires fortran
-	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
-	#        debugedit binary is not in the expected location
-	#    RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
-	#        it can't find a deb package that owns libc
-	#    TestUpload, which requires network access
-	#    RunCMake.CMP0125, known failure reported upstream (bug #829414)
-	local myctestargs=(
-		--output-on-failure
-		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload|RunCMake.CMP0125)" \
-	)
-
-	virtx cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	# If USE=doc, there'll be newly generated docs which we install instead.
-	if ! use doc && [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then
-		doman "${WORKDIR}"/${PN}-${CMAKE_DOCS_VERSION}-docs/man*/*.[0-8]
-	fi
-
-	if use emacs; then
-		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins Auxiliary/vim/syntax/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/indent
-	doins Auxiliary/vim/indent/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/${PN}.vim"
-
-	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-
-	if use gui; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-
-	if use gui; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
--- a/dev-cpp/cppdap/Manifest
+++ b/dev-cpp/cppdap/Manifest
@ -1,2 +1,3 @@
 DIST cppdap-0_pre20230605.tar.gz 100715 BLAKE2B a7b6f745b7445242544deb2cd5b93bb13ee0faefe083a5e435d9a608fb453aceef1746738beb35678833f69521e637f2b8ca47fccd3e292a56e8a74c6435df86 SHA512 034f6282e992ec346715f84da1817a699937be174ab0ea09f750a693bed158b87ec6920e0ed1f7340ef5232e9634c5aebccd78527adde34b8abc4ff00c5f617e
+DIST cppdap-0_pre20240802.tar.gz 101733 BLAKE2B 18302d37493ab38b579b0a00756e18efbaa1620e705e2bb54b24ccb3388837ea8aed28c880b358b670006f84ccb7df036125d1c2f7bb210ba51fa0caebef0759 SHA512 2432c2b413d956661342555a50ab2ed4cdf86de5e7bbda0822a2e7359ad034a0b0150bb6b98dff0d1a3d64e89cd8de67a7a620dd4c9e220a7ed1f9f80e5a36e6
 DIST cppdap-gtest-0a03480824b4fc7883255dbd2fd8940c9f81e22e.tar.gz 874709 BLAKE2B 706e6d168e080494ac63cf607c189f55f5e98100fd744dd184a8217173f66891aedb8779a9c8b0aa289889d1f73e18c50ef65d8c70228e2a795a5e5081f66894 SHA512 55867a2e39647a7846506446d642dcd740711dee8c0dfe25887fd6ad361161617f3d462bdb415dfba20693849949c022e97e2de65dd731cc63b9466edd1c8b87
--- a/dev-cpp/cppdap/cppdap-0_pre20240802.ebuild
+++ b/dev-cpp/cppdap/cppdap-0_pre20240802.ebuild
@ -0,0 +1,45 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+# See https://github.com/google/cppdap/issues/113 re no release
+CPPDAP_COMMIT="c69444ed76f7468b232ac4f989cb8f2bdc100185"
+
+DESCRIPTION="C++ library for the Debug Adapter Protocol"
+HOMEPAGE="https://github.com/google/cppdap"
+SRC_URI="https://github.com/google/cppdap/archive/${CPPDAP_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${CPPDAP_COMMIT}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-cpp/nlohmann_json"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-cpp/gtest )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		# Per README, could use rapidjson or jsoncpp instead.
+		-DCPPDAP_USE_EXTERNAL_NLOHMANN_JSON_PACKAGE=ON
+		-DCPPDAP_USE_EXTERNAL_RAPIDJSON_PACKAGE=OFF
+		-DCPPDAP_USE_EXTERNAL_JSONCPP_PACKAGE=OFF
+
+		-DCPPDAP_BUILD_TESTS=$(usex test)
+		-DCPPDAP_USE_EXTERNAL_GTEST_PACKAGE=ON
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cd "${BUILD_DIR}" || die
+	./cppdap-unittests || die
+}
--- a/dev-cpp/magic_enum/Manifest
+++ b/dev-cpp/magic_enum/Manifest
@ -1,2 +1,2 @@
-DIST magic_enum-0.8.2.tar.gz 171915 BLAKE2B e8915aa7cafa9407d5d4ab3b6837fafde6b1cb75877c8b56f82568e6291ca317720950947b2dfc7e12ca459279ba4e809a8c5782fc04adc2d7636eddcb80122d SHA512 849c426484156faf91dde3f32f6c755c7698879b16dd83e13fb86b299b53ec9bbe4d55267581386302c8acb93d80ec044cc248371fdc8608cdd8f4ab12099f0a
 DIST magic_enum-0.9.5.tar.gz 198269 BLAKE2B c3c6bbf6c5d366813dac7df5fbfc48f414cf4235d842ef3a5a2fd8f2c2857e55243b7fbf7000d598e778fc8d2d54c7d6e34f8a97fa2eaf510572bf53f17500a6 SHA512 f1b412d15e0ef624b4588adba00a18ed12eeb1f0dabc021d53a7c047b8976ecb07701b76040f47c77c75e00151619dbce1f9a75f471db04340156a39044768f3
+DIST magic_enum-0.9.6.tar.gz 199883 BLAKE2B 32909c5ea0cff32b14fb4fd5507f1f99cd45f572d56fd14f76aea3ca3c1fa16d08573568a7c7f9a3efbc9396450b2e897aa64de414b34a4c19b6c49f63aed506 SHA512 6154c816446e115f3b164df79ab8d8088eb76b632ee3fdc82ea17cc7ae8d04652c83e5cc587c2c4b334889904b101ba08a04c5837103af260768e93df17cc263
--- a/dev-cpp/magic_enum/files/magic_enum-0.9.6-werror.patch
+++ b/dev-cpp/magic_enum/files/magic_enum-0.9.6-werror.patch
@ -0,0 +1,22 @@
+--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
+@@ -12,7 +12,7 @@
+     check_cxx_compiler_flag(/std:c++latest HAS_CPPLATEST_FLAG)
+ elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
+     set(CMAKE_VERBOSE_MAKEFILE ON)
+-    set(OPTIONS -Wall -Wextra -Wshadow -pedantic-errors -Werror)
+    set(OPTIONS -Wall -Wextra)
+ 
+     check_cxx_compiler_flag(-std=c++20 HAS_CPP20_FLAG)
+     check_cxx_compiler_flag(-std=c++23 HAS_CPP23_FLAG)
+--- a/example/CMakeLists.txt
+++ b/example/CMakeLists.txt
+@@ -2,7 +2,7 @@
+ 
+ set(CMAKE_CXX_STANDARD 17)
+ if((CMAKE_CXX_COMPILER_ID MATCHES "GNU") OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
+-    set(OPTIONS -Wall -Wextra -Wshadow -pedantic-errors -Werror)
+    set(OPTIONS -Wall -Wextra)
+ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+     set(OPTIONS /W4 /WX)
+     if(HAS_PERMISSIVE_FLAG)
--- a/dev-cpp/magic_enum/magic_enum-0.9.6.ebuild
+++ b/dev-cpp/magic_enum/magic_enum-0.9.6.ebuild
@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
@ -13,10 +13,13 @@ SRC_URI="https://github.com/Neargye/magic_enum/archive/refs/tags/v${PV}.tar.gz -

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 IUSE="test"
-# Tests fail to compile
-RESTRICT="!test? ( test ) test"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-werror.patch
+)

 src_configure() {
 	local mycmakeargs=(
--- a/dev-cpp/robin-map/robin-map-1.3.0.ebuild
+++ b/dev-cpp/robin-map/robin-map-1.3.0.ebuild
@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/Tessil/robin-map"
 else
 	SRC_URI="https://github.com/Tessil/robin-map/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 fi

 LICENSE="MIT"
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@ -1,3 +1,2 @@
 DIST antlr-4.11.1-complete.jar 3547867 BLAKE2B 24e9799a402302fd13ebd91028a8e3b8141af50b446bc06bb4df3f7619cad956e9b681c0908b870a1f9d6701049e89099906cdc6038dc007984b19f7a8cc756b SHA512 a445bb71e4470ffa7bbb382a873fe5c5737b96b2c68b57593c1151ed9944ec701ce0c299ea5c3b593bd33916d384d598e2538a9b0b11b41c77a399beca4aab88
-DIST mysql-workbench-community-8.0.36-src.tar.gz 27419906 BLAKE2B 47ab5c64b5beee712c9227cdb5c46a6863d830ef75983e0e56702e0b08370b9118b301d0c34ba95180bef2fe0b01ae24791337c9e1922cd412a37f057906027a SHA512 953f072414abb8c236ffccb8a4439dcd4c5eb76ff07f5ca276c35e8cf6102ef73292412fc70113a167f34bd998603ef22b59038ae06cf84d2f0440769c1d9689
 DIST mysql-workbench-community-8.0.38-src.tar.gz 59069184 BLAKE2B ace0afbab46c106200da5234595065766798d97f57008261c166f97bed842f185e1bba90e0c60b9acf4843b54261b5aa49c8a3a6b096e72597443fcb1a011217 SHA512 9fa18d3a66111461dd47dec05ea8dfa214dac85017d51358e694d56cb05439d96a91f675e105cfbecc70c456127964a81ddb2a5a2951457196b20b10dcb6f502
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.36.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.36.ebuild
@ -1,121 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GCONF_DEBUG="no"
-
-PYTHON_COMPAT=( python3_{10,11} )
-PYTHON_REQ_USE="sqlite"
-
-ANTLR_VERSION=4.11.1
-
-inherit gnome2 flag-o-matic python-single-r1 cmake
-
-MY_P="${PN}-community-${PV}-src"
-
-DESCRIPTION="MySQL Workbench"
-HOMEPAGE="https://www.mysql.com/products/workbench/"
-SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz
-	https://www.antlr.org/download/antlr-${ANTLR_VERSION}-complete.jar"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# glibc: deprecated mutex functions, removed in 2.36.0
-CDEPEND="${PYTHON_DEPS}
-		app-crypt/libsecret
-		dev-libs/glib:2
-		>=dev-cpp/antlr-cpp-4.11.1:4
-		dev-cpp/atkmm:*
-		dev-cpp/pangomm:1.4
-		>=dev-cpp/glibmm-2.14:2
-		dev-cpp/gtkmm:3.0
-		>=net-libs/libssh-0.9.5[server]
-		x11-libs/pango
-		x11-libs/gtk+:3
-		>=x11-libs/cairo-1.5.12[glib,svg(+)]
-		>=dev-libs/rapidjson-1.1.0
-		dev-libs/libsigc++:2
-		dev-libs/boost[nls]
-		>=dev-cpp/ctemplate-0.95
-		>=dev-libs/libxml2-2.6.2:2
-		dev-libs/libzip
-		dev-libs/libpcre[cxx]
-		>=sci-libs/gdal-1.11.1-r1:=
-		virtual/opengl
-		|| ( sys-fs/e2fsprogs dev-libs/ossp-uuid )
-		dev-libs/tinyxml[stl]
-		>=dev-db/mysql-connector-c++-8.0.27-r1[legacy(-)]
-		dev-db/vsqlite++
-		|| ( dev-db/libiodbc >=dev-db/unixODBC-2.3.11 )
-		dev-python/pexpect
-		>=dev-python/paramiko-1.7.4
-"
-
-RDEPEND="${CDEPEND}
-		app-admin/sudo
-		>=sys-apps/net-tools-1.60_p20120127084908"
-
-DEPEND="${CDEPEND}
-		dev-lang/swig
-		>=virtual/jre-11
-		virtual/pkgconfig"
-
-S="${WORKDIR}"/"${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.2.5-wbcopytables.patch"
-	"${FILESDIR}/${PN}-8.0.19-mysql-connector-8.patch"
-	"${FILESDIR}/${PN}-8.0.33-gcc13.patch"
-	"${FILESDIR}/${PN}-8.0.36-libxml2-2.12-support.patch"
-)
-
-src_unpack() {
-	unpack ${PN}-community-${PV}-src.tar.gz
-}
-
-src_prepare() {
-	## remove hardcoded CXXFLAGS
-	sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die
-	## And avoid -Werror
-	sed -i -e 's/-Werror//' CMakeLists.txt || die
-	## Fix doc install directory
-	sed -i -e "/WB_INSTALL_DOC_DIR/ s/mysql-workbench/${P}/ ; /WB_INSTALL_DOC_DIR/ s/-community//" CMakeLists.txt || die
-
-	## package is very fragile...
-	strip-flags
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# -Werror=odr
-	# https://bugs.gentoo.org/924671
-	# https://bugs.mysql.com/bug.php?id=115735
-	filter-lto
-
-	if has_version dev-db/libiodbc ; then
-		IODBC="-DIODBC_CONFIG_PATH=/usr/bin/iodbc-config"
-	fi
-
-	if has_version dev-db/unixODBC ; then
-		UNIXODBC="-DUNIXODBC_CONFIG_PATH=/usr/bin/odbc_config"
-	fi
-
-	append-cxxflags -std=c++11
-	ANTLR_JAR_PATH="${DISTDIR}/antlr-${ANTLR_VERSION}-complete.jar"
-	local mycmakeargs=(
-		-DWITH_ANTLR_JAR=${ANTLR_JAR_PATH}
-		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
-		-DIODBC_INCLUDE_PATH="/usr/include/iodbc"
-		${IODBC}
-		${UNIXODBC}
-		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-		-DMySQL_CONFIG_PATH="/usr/bin/mysql_config"
-	)
-	cmake_src_configure
-}
--- a/dev-debug/Manifest.gz
+++ b/dev-debug/Manifest.gz
--- a/dev-debug/lldb/Manifest
+++ b/dev-debug/lldb/Manifest
@ -1,3 +1,4 @@
+DIST llvm-project-130c135689ec12ab78c53645808524a8d28f7cae.tar.gz 217788932 BLAKE2B 9ba8ad82597780f24e750272f9439d1e8d464813a607efec4920a13473103975bc181506dcc15c76a6e4ca83622284b77a7903e36aff6145719529630121cf0b SHA512 d9c67155f462e53968ec448e325b35a80c0d207039dd7155568fa366aa1894bc8dfaa2d5c03a67320bdefb1934720a1d23bc4b972c9fae3ff09c7a79d885c53d
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db365965f1c00bfea6c2d653b3996bd2acef8a2b37e37f6fc8a9d2b65711ad72657e0ef52c42f733053cf65051e7822f27396c30406d SHA512 89a67ebfbbc764cc456e8825ecfa90707741f8835b1b2adffae0b227ab1fe5ca9cce75b0efaffc9ca8431cae528dc54fd838867a56a2b645344d9e82d19ab1b7
@ -8,4 +9,3 @@ DIST llvm-project-18.1.8.src.tar.xz 132067260 BLAKE2B a950492f1dbfb874dff63b1ffe
 DIST llvm-project-18.1.8.src.tar.xz.sig 566 BLAKE2B 6ab0efc5b38d4483f4e32e8b85774b2edd5d88fdf29f23b88eb0b5130a7a7f0e80549612b025f927e92de4a08ff7c292cff224dbda91a5d598244e98f7ad0fbd SHA512 ddfd1e8a06756759af6cbe488c82a6d6a62ba91f3e8a0eb4cece561321824f5d165b08ed91010588790b76e19790931d2651b24dba8567e3b151d3cb43bec25b
 DIST llvm-project-19.1.0-rc1.src.tar.xz 141259912 BLAKE2B e882ff54a96900b4948e572cf073c897df6b4ce159869a42c56a4c830187d83b8d9d9b3940dad22346f142f9674575191cc9d079312f0d9aa1105390c07f504f SHA512 9f43dbe8d5f1322f73fb1c638ce4fc7a8179c9ca33fdbfbb6d72632a3d6bf4bc4993f8f5ec827510af55f4f013fba8fe3d7d9e45f262eec16ecf9ab39296b4b8
 DIST llvm-project-19.1.0-rc1.src.tar.xz.sig 438 BLAKE2B cc1acbd33440bb14f78c19cc3061a5c0cb3d9dbcd6f0d1516fe118ac02c500ba4df129f870ddf3fe1a52519feab4b631866413fce9c726272d52c3865a9eea27 SHA512 a3361992b55be13aeff5d91bb90a15e3a2ab89e486328fa4d9abc9efa3925aee70bea48449b003ae1926909d389bf71afcf6dc56d800ed2e0e3dbc65da6e4e92
-DIST llvm-project-72d8c2737bb557af9d0c735b9fa30b1b03485627.tar.gz 217324958 BLAKE2B d43c161ac98860e2ce03e7e2474c55766e7496200b090ebb1cb6dcf0c2ad3a32bae76249feca53cd8b56c63806a740c280e6306890cd28429c4a7e84cae5eada SHA512 af3b44ec3f96d636d919906cf20547eb91d0a83d07731c9db38f28311a52011d8ec66833422fad9bb89ca9ac546e308b02015a7b365086341bee1f3de1b6c5e2
--- a/dev-debug/lldb/lldb-20.0.0_pre20240801.ebuild
+++ b/dev-debug/lldb/lldb-20.0.0_pre20240801.ebuild
--- a/dev-dotnet/Manifest.gz
+++ b/dev-dotnet/Manifest.gz
--- a/dev-dotnet/csharp-language-server/csharp-language-server-0.14.0.ebuild
+++ b/dev-dotnet/csharp-language-server/csharp-language-server-0.14.0.ebuild
@ -138,7 +138,7 @@ else
 	SRC_URI="https://github.com/razzmatazz/${PN}/archive/${PV}.tar.gz
 		-> ${P}.tar.gz"

-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi

 SRC_URI+=" ${NUGET_URIS} "
--- a/Show more
+++ b/Show more
				`@ -0,0 +1 @@`
				`DIST erlang-27.0.1.tar.gz 62055749 BLAKE2B 2cbf74efb6e2bd821b30e9b39d13b5b16899a49eedcbedd171068cb4da5d2f5cd98697a4234387d194aeace3ec1c168d752a2afd5bc52c4c6799dfd68ade6916 SHA512 03bba7f7d8226474b4dba9855e78b59c7cf78973fbb2ed48893a26879dc0dce579336e9cae6870f154bdd48cf3be6398cc1ec4ff52f252017d84edb20d565e71`