Sync with portage [Sun Dec 8 13:29:05 MSK 2024].

2024-12-08 13:29:05 +03:00 · 2024-12-08 13:29:05 +03:00 · 36fde986d4
commit 36fde986d4
parent 8c440dd4ec
2416 changed files with 19054 additions and 34376 deletions
--- a/30
+++ b/30
@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512

-MANIFEST Manifest.files.gz 29783 BLAKE2B 3693409d1478a9a959b237f3ab56a767c2dcb692d899932efa71d65de7c08469151d8c28d72821e2250d6b8b7fa7f89812ce4221da524c632405e4ccebb8622d SHA512 93d01e18391f2bea36b9d9688a77d873137a678e9d68907bdc23829abdcebba6a745755741eab03d8de9178a6b25de89e0684a78cb7738df04ca4b5fa8bc57ec
-TIMESTAMP 2024-12-06T13:41:05Z
+MANIFEST Manifest.files.gz 29783 BLAKE2B 1bfda3d7c311809509dc32ac450457bd5555d1d6eb6966a11b5608baccf5a3f8ebc989ccc5d0025e1a52054aeb21f56193ff09b9774b90548d2f00e50359b49e SHA512 f261bc40bb0710a3694bf29e8d98b4e97e83dcde817e75c73cd36f8ba4f5688feed96c90b83e329bc57ca5418115fd84cbadce5c8618b7935ca9b355f59a885e
+TIMESTAMP 2024-12-08T09:40:12Z
 -----BEGIN PGP SIGNATURE-----

-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmdS/vFfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmdVaXxfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCRog//Wc39czvtcCl+JVoeAbFcxmwUIjktlA5EZ15hn8P/be3pXURUHQZ8Guin
-xkqI4ElDzAhvjQ9akOuO20PInw7gD4anPCcUfHug4vBsROoitAfSnfzGJQlxGLBB
-jPKFJzkxjlw+8KjrvGSQeaonGvZZmZ+oBm8lVlxkKgX31Yj5hativw+tVATsXapN
-CZQKMBocprfxD4PctUeGM2fwRlT8CTaV/sPpMG3vXIhLWtq1oZ3RlGkt1aVkeSJe
-ySiYj4W8EuWQhrLMtXg5eTpC7NWbz4nsxD8+J/NPpy5L2QyJt2JPpLahMcSSRmVt
-fSP5ePGPLDI4y3iLHLhESwJ60OmlTas5II7UbUUM5r/otJp5ivSK8XqReOEtmGLj
-EWkJDtTzB0exvdD3izBWrRMp+Qn9aeTdGGKRFnIk0zBxiBcP/WmKaLcUDzFlaVcn
-6jHwCy+/oUvG7NLHAV+Ov9HhmmmPFyMk4r/zuzdOvMa0km77AoDBM34BoPMfopyY
-baHJINTR4bSCBAu7fqoi5u6SZy5XSeyOix29DqLdb8533AyzNjxr785IgfCy/WyD
-jkaYmMNWvV3vSUTV8hx5zf9Hq7n2lIi4OS6CTYbgIIdiJd6AsoER9llX9gD/BdV/
-PaiIJ9H/13HRrWpJw/+bhCB4Xw9b5NBSLNFdarMyn2e2F06TlCc=
-=ha1w
+klBJ0xAAkAOhy053iEiBUi5JVYSkOVum3c5qLcBbpzWAQ02numXKoHubnTK50bL0
+gunxA9ixUbVlfg+vyixMbZByrdIOATvjEpRsvahhGIfDQGSZNOTw4y6LbyxOypvJ
+uzIqsdBBBqOumFOAraLF5RVz9CPaqIEYijr6btF6odzr8LPlNpjo1LSTkfVsUiRh
+//fvWoJW4aqgJyOYcq5+xM7u/uWcYsVhnXEZtcTLhWlrwop12R1OSww0YH4XChJ7
+ZzWdJqUiEJaW8pruBOyEEozunwoQEB+f2iawrbKgxbNaNOg/HjwcOdzSmUsoRPvi
+nbh51mIr/4wwLX+12A7emdnKPsYGZGLzLFtdm5X2N7Nt9mOUMLK+4310dXP/yTZh
+FA/py2xZxtrCtygboJSNeVbKz70l0toKtEjgMbSCo9lKYlZQJhp+SAO0h73ITmer
+tJeNsYOq5WCS2/yGxggAcgIJb7a7ho3DgBH+m47eH+m1Rm8TpFpPxJoG/MGoIoH3
+PbRK1W31gSPsqyWakC5HYCtra88LQVbLznefIF4kBUKRiKIDsJ7GNtD6RIbv3iwR
+vxgq+s6fQ+wg3N2hIolK98cy7YFJtnPmJhaw7FANZAC+kmOAKpYwK+z8XqBQHY7C
+PLbEgFP0I3s2mC3RnGJIihHuWU8s4UvHghIN4twEL0NUWa+ArFo=
+=hznJ
 -----END PGP SIGNATURE-----
--- 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,13 +1,7 @@
 DIST aws-cli-1.36.12.gh.tar.gz 2842234 BLAKE2B b9f333d7fa8b7aa9c0452b6da87c3b097f1b5027f1f9c36888448f5e5763a93696e1d25cca167a17d9ab7332c5491be500a44462eed44c18f886ec9f0816a248 SHA512 b7797a29230628201d808958c4f9660768646f1c1a3f53c39c09791fb8ff0cbfab000b950abc87541ff9e54723b726913a487cf5f164c8b82e609fd92dae7b14
-DIST aws-cli-1.36.13.gh.tar.gz 2845931 BLAKE2B 53a4dc5bfa111ea32a89aa1e6f8795a2007419dd65b092abd5f9d0040d7f1750c570b480071e427ce1738a37d4ac8f5e56628d9f4462cdfbdfe90509bc1c83f7 SHA512 df2ce608b52efb2d8641e1ecea201507def53c11ef7dfd85e4a83423fdfbff75ff94f3e3c0ab1e9ebbce56442fface5b13d95e441519abb3b05af14f77145a2c
-DIST aws-cli-1.36.15.gh.tar.gz 2848095 BLAKE2B ad355829f2388c6035713308badf8239684a475e1c925838cfd16f88505f88d3c71b6f73d5d4335936d3aeae239cb78f08150fcfd36c7b15cbea8a61813786b6 SHA512 d8e559b468b9bd50941b073229525be9ffc218dbf4c72894146c745d635bce94e3c5d4532b7a14a91892964431a601dd113f127bcbe2502711fc7422e0beb920
 DIST aws-cli-1.36.17.gh.tar.gz 2849378 BLAKE2B 67e79717e6ad2cdc62f79fdc6ab370e091677fff4e3f2a7872fc0f49e49e53cc395c50a5fd7ed1c46481dcc4f9b4425651bf0c09adc9f769f039647c5b33f794 SHA512 82412802be0056eaa791f725579151dab2fedbf1c6bbf5461cdde016e0d8adc977ae1fb6796696d844706f92d3a4c4bb6424e7a0e7b5a0d7b0a0c2e0070b774f
-DIST aws-cli-1.36.4.gh.tar.gz 2825870 BLAKE2B 3a13a50077087633972c0eb908e0116e432f0036871f4d5a5e2429ea86dfc0c5d40a87e0950c02bc7622fb0e56b9a3ee9fc8ee9a6a1ed8ae17728bf479401d13 SHA512 735a228d52b525cfc4a9a403ad8364bfb9c558ba86daf6966743126eb21de6d0f49d76fd21d9c7a0fd29f229b4b71e0778d4b1ccd0b2e27b0c794f1e11cd6c83
 DIST aws-cli-1.36.9.gh.tar.gz 2836018 BLAKE2B aada8a63f5bedd5aeeddd56fe18bb49ae1763ba5c737f72aa2f2e00b57fa4e1ab52ec266ca6883859ec633ec2b1658383426809870ba1372d86f9d8e0a055ac6 SHA512 ec47c26012027071732d60f9bd8b3322c1c75b2362dffe7affd8cd6d70732e6239bfbb6531759a247bcb2f29613a88b196d10f405302d25a05ada7968bd7574e
 EBUILD awscli-1.36.12.ebuild 3186 BLAKE2B 63a0fb498273465997fdf8010dcec351d473545febb8aaf2c222c3176a00f0cce5edadbfbc778689949142466c05e371a017c07a54ce30deb7bd7ca86cdb1e82 SHA512 2db712c340a0d13e4f89a8ca4599cb89f83d11d519b2f90f1dcf72e903830d70ae31efbed50a958b98655e24327cc027c0c945bc061f9de7c8fbf4d45f2fa625
-EBUILD awscli-1.36.13.ebuild 3186 BLAKE2B 63a0fb498273465997fdf8010dcec351d473545febb8aaf2c222c3176a00f0cce5edadbfbc778689949142466c05e371a017c07a54ce30deb7bd7ca86cdb1e82 SHA512 2db712c340a0d13e4f89a8ca4599cb89f83d11d519b2f90f1dcf72e903830d70ae31efbed50a958b98655e24327cc027c0c945bc061f9de7c8fbf4d45f2fa625
-EBUILD awscli-1.36.15.ebuild 3186 BLAKE2B 63a0fb498273465997fdf8010dcec351d473545febb8aaf2c222c3176a00f0cce5edadbfbc778689949142466c05e371a017c07a54ce30deb7bd7ca86cdb1e82 SHA512 2db712c340a0d13e4f89a8ca4599cb89f83d11d519b2f90f1dcf72e903830d70ae31efbed50a958b98655e24327cc027c0c945bc061f9de7c8fbf4d45f2fa625
 EBUILD awscli-1.36.17.ebuild 3186 BLAKE2B 63a0fb498273465997fdf8010dcec351d473545febb8aaf2c222c3176a00f0cce5edadbfbc778689949142466c05e371a017c07a54ce30deb7bd7ca86cdb1e82 SHA512 2db712c340a0d13e4f89a8ca4599cb89f83d11d519b2f90f1dcf72e903830d70ae31efbed50a958b98655e24327cc027c0c945bc061f9de7c8fbf4d45f2fa625
-EBUILD awscli-1.36.4.ebuild 3179 BLAKE2B b08625a4293f13915f076119919380f482a550799f0b4a8ba37f413fb23314bd5f8ee153658520d17560e91fc464ffdb0bc61f444dda692627baa6ddc80fd97b SHA512 2acdae36bf23c5c4c4bf23ca22ef04df62e76f08fc3ecc9acf6ba28bd4c6b9bd325f301123c9cb5694b62991cf41bfcff797ce4c72ae07e0d7c490df02adae4c
-EBUILD awscli-1.36.9.ebuild 3186 BLAKE2B 63a0fb498273465997fdf8010dcec351d473545febb8aaf2c222c3176a00f0cce5edadbfbc778689949142466c05e371a017c07a54ce30deb7bd7ca86cdb1e82 SHA512 2db712c340a0d13e4f89a8ca4599cb89f83d11d519b2f90f1dcf72e903830d70ae31efbed50a958b98655e24327cc027c0c945bc061f9de7c8fbf4d45f2fa625
+EBUILD awscli-1.36.9.ebuild 3179 BLAKE2B b08625a4293f13915f076119919380f482a550799f0b4a8ba37f413fb23314bd5f8ee153658520d17560e91fc464ffdb0bc61f444dda692627baa6ddc80fd97b SHA512 2acdae36bf23c5c4c4bf23ca22ef04df62e76f08fc3ecc9acf6ba28bd4c6b9bd325f301123c9cb5694b62991cf41bfcff797ce4c72ae07e0d7c490df02adae4c
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
--- a/app-admin/awscli/awscli-1.36.13.ebuild
+++ b/app-admin/awscli/awscli-1.36.13.ebuild
@ -1,95 +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+59)
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) - 1)).$(( $(ver_cut 3-) + 59 ))"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local serial_tests=(
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
-		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
-		tests/unit/customizations/test_sessionmanager.py
-		tests/unit/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py
-		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	EPYTEST_XDIST= epytest "${serial_tests[@]}"
-
-	local EPYTEST_DESELECT=(
-		"${serial_tests[@]}"
-
-		# flaky (some ordering?)
-		tests/functional/s3/test_cp_command.py::TestCPCommand::test_multipart_upload_with_checksum_algorithm_crc32
-	)
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit}
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
--- a/app-admin/awscli/awscli-1.36.15.ebuild
+++ b/app-admin/awscli/awscli-1.36.15.ebuild
@ -1,95 +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+59)
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) - 1)).$(( $(ver_cut 3-) + 59 ))"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local serial_tests=(
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
-		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
-		tests/unit/customizations/test_sessionmanager.py
-		tests/unit/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py
-		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	EPYTEST_XDIST= epytest "${serial_tests[@]}"
-
-	local EPYTEST_DESELECT=(
-		"${serial_tests[@]}"
-
-		# flaky (some ordering?)
-		tests/functional/s3/test_cp_command.py::TestCPCommand::test_multipart_upload_with_checksum_algorithm_crc32
-	)
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit}
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
--- a/app-admin/awscli/awscli-1.36.4.ebuild
+++ b/app-admin/awscli/awscli-1.36.4.ebuild
@ -1,95 +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+59)
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) - 1)).$(( $(ver_cut 3-) + 59 ))"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local serial_tests=(
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
-		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
-		tests/unit/customizations/test_sessionmanager.py
-		tests/unit/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py
-		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	EPYTEST_XDIST= epytest "${serial_tests[@]}"
-
-	local EPYTEST_DESELECT=(
-		"${serial_tests[@]}"
-
-		# flaky (some ordering?)
-		tests/functional/s3/test_cp_command.py::TestCPCommand::test_multipart_upload_with_checksum_algorithm_crc32
-	)
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit}
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
--- a/app-admin/awscli/awscli-1.36.9.ebuild
+++ b/app-admin/awscli/awscli-1.36.9.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+59)
 BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) - 1)).$(( $(ver_cut 3-) + 59 ))"
--- a/app-admin/kio-admin/Manifest
+++ b/app-admin/kio-admin/Manifest
@ -1,3 +1,3 @@
 DIST kio-admin-24.08.3.tar.xz 38688 BLAKE2B ededa0da867c76e45efec80d60e8f4c720fe7fa663d574dd910a35d5f7b77e8b8b5d23f0322b2f635dc34f7318351400e9c9f9e032f014a68ec3ecbf86f4054b SHA512 d357ce492798cbcc1f91933c0ded5c3d1c80c9fdb9d53a7e9c98038cf87825ccc10608c763e66b46410508d9afb52a9f93623e4dcad647657d0c5237395dc1b1
-EBUILD kio-admin-24.08.3.ebuild 621 BLAKE2B 5c86fa205c7ee785f60fa0104006885bf650f64bb7c14711ab6e2dba393634ff345064cf1bc9e4493514cefd659034c591a126db73cfbd49dff9de02ec66331b SHA512 2047f7657605ae7130041de20f709b02c961f500d863919ebf49e22903bbbec01ea8110ba7de290e11e10c2b30eee6dcfe119cb5aecb39a972979569b37fd84f
+EBUILD kio-admin-24.08.3.ebuild 628 BLAKE2B a8df3ef3b47fef9e712a29c508c405c63ef59fbb8d722a471526324f7169575ad6a787c19e5b10ae07e2f88ed8d004c1f180a4c1121173222c0c02ebeb6e4596 SHA512 39c2e250a62d37a11e2055b3bc44e9b9809ad15cc67071312e42fd877fc2d80fafd65a1422d08bce78f55300749ff3993eeffb0dd7bf1a592497cc867bdf1b07
 MISC metadata.xml 409 BLAKE2B 806cca01eabcbaa961a219c8df865253d5eb4aac6f2d80a08715606ec9ac883990b8ce2ace14b53c47a81f4b061cdc489490c6d8bf8cf2dc53e16027675b1f12 SHA512 d3f45492aab35f8938f1ad59bb40a49a554e0da3fd530ff2d478911f323ad92badeabccae3c32f7256cd140cb3caac9d2bdb3e762becc2be1d0bb012e735c5a8
--- a/app-admin/kio-admin/kio-admin-24.08.3.ebuild
+++ b/app-admin/kio-admin/kio-admin-24.08.3.ebuild
@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/system/kio-admin"

 LICENSE="BSD CC0-1.0 FSFAP GPL-2 GPL-3"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"

 DEPEND="
 	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
--- a/app-admin/winbox/Manifest
+++ b/app-admin/winbox/Manifest
@ -1,3 +1,3 @@
-DIST winbox-4.0_beta12.zip 23210536 BLAKE2B 800ee9d9c9d86e21687c63d84bb4630eef0f0c5c6350dd8eec5416bd90fb4d8e761381e094defdd4ac6accc70268d3b68d1a4f37ac60c009fe010f7e7001aea7 SHA512 81196211c2c91ff84752fd0bb3004fa77642f90ad82926917338fda92311c20d4515019bc46731219f3c82682d44d4d8f1dd3d704412052b921c44f18384ceb1
-EBUILD winbox-4.0_beta12.ebuild 967 BLAKE2B a20c223729f925fcb14a9b8da04095eac636e332237c423d7e22473571e35508d53a27bd790a4f5ee96085b6dab329726f655478ac34d3c59eea83030dcbc4c3 SHA512 57ea82e178a7e4ad61ca92ce41e9926b231c7ee6010ccd9d2209ba13c5dd9993a2a2f19c55d3f899ecbd774b90febfefd7dbeafc3d28b04bf7ce565fea57cbcf
+DIST winbox-4.0_beta13.zip 23264075 BLAKE2B 6eddcf344910f8bdafff743afbab8e8814e09602dc951b4a199c762a5f1046a542276709d51e0c18acdef1cdce3538f3e4fff62f5ef96a01016a6213fe972170 SHA512 17b0729fd0050001b8350642a9700d47e04f31486678e078e5b954cc6da7ea89b7888c1d8120f52360b2d07c4c9aa09041ecac4fad6b7435481e90515ca90107
+EBUILD winbox-4.0_beta13.ebuild 967 BLAKE2B a20c223729f925fcb14a9b8da04095eac636e332237c423d7e22473571e35508d53a27bd790a4f5ee96085b6dab329726f655478ac34d3c59eea83030dcbc4c3 SHA512 57ea82e178a7e4ad61ca92ce41e9926b231c7ee6010ccd9d2209ba13c5dd9993a2a2f19c55d3f899ecbd774b90febfefd7dbeafc3d28b04bf7ce565fea57cbcf
 MISC metadata.xml 397 BLAKE2B 74b4d1e3c50447f470c2004c6094ca281d3eb71ccfe0cb428321b7a132dfdc291b1d2e0b86d5582f9f5bf022b120427dad50fd797e1301fda8ef91a1c3b14b28 SHA512 f6680ee8e6bd0b29de66db0de8abdf11fa2187398954cbe2d6fe7b6ddf7d3af1ba89744cc340d6b54213812500c74cb6a7632d2dc74fd7c2223f0d9db1a74f1a
--- a/app-admin/winbox/winbox-4.0_beta13.ebuild
+++ b/app-admin/winbox/winbox-4.0_beta13.ebuild
--- a/app-arch/7zip/7zip-24.09.ebuild
+++ b/app-arch/7zip/7zip-24.09.ebuild
@ -17,7 +17,7 @@ S="${WORKDIR}"

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

--- a/app-arch/7zip/Manifest
+++ b/app-arch/7zip/Manifest
@ -1,8 +1,8 @@
 AUX 7zip-24.05-respect-build-env.patch 1428 BLAKE2B 00a6da925ca0236a423e1f82426ae81976358c30ba8b6d30b8af368aeb8e4271c443d3e401f7ea32ef6743b21c730f2ecaf78319e0bdf8c76d6a45baa8f9c1e3 SHA512 0aabff2930325553de08314bd161d2132f5c6fd3ed0363c37c961b04e16ae8b906053c0f8f9132c55760acf3ec1dbdb47f0677d618cf82d8ce8cfe6d52cb6e8d
-DIST 7z2407-linux-x64.tar.xz 1554932 BLAKE2B 9229fdac09148c50032656743aba0f8ce1ec06b7fd2dad2c693dc299c5f83fc093ba047e9c3c3971bf4cc9387b0db52c84167202ed7fcecfcc6f5bc508d04ada SHA512 31b5bb832e73f3c2fd0437873fe6130b8d1bd1bea8320d1b27d06bf40dd737758732eb3664fab2c36417b96ffc5daca6607b6f1aefdaa9e697122da60e37a728
-DIST 7z2407-src.tar.xz 1488556 BLAKE2B 42b4f9553aaa4797e80a2d50073ff0e77b5261e50766f8c596a632fb013ac1514a2963f27b924485f07728d13a4536c69911867e3728e8f8604ec25fc4c6824e SHA512 0299e5c1e1dfd33ecf22077f812da1f25bf2146a713c7a7e2498d639520f21f029e853914e66a84d1edfc5d721e1f3d914a3171ab336a406a94bc82d5b2d8e5d
 DIST 7z2408-linux-x64.tar.xz 1556956 BLAKE2B 177b355830201e48d314667c1936e3ca0b624b3fd47b8696df78cc27bb559fd239c1ab2146a88111c3bd1ef1396e694d235babb9b8391fc55cac89c97d7990bd SHA512 00b8d2b89e1410e360cf034c44a43cb88927d76317ee291519ef1f39e3cab68b5549de66f0f6b867f0367d50e7661f484e0a0f7afdd2ecb963804e44c789d7ce
 DIST 7z2408-src.tar.xz 1493700 BLAKE2B fd22a302044ca8655187573173fdc13ae93efaf907cb60076600013e3f463912b876cc3764853ce9d1850fc10dc264cd96917ef6dca9332541db292aee3f1ab4 SHA512 889e9aeaa629d6474a609a15066b2fa7b1353fa5e7255e044297591f565b08b16b885d44f4c4a046f2f9da189599ace300cf61fd9ac0e7bc316fb9d96a18a039
-EBUILD 7zip-24.07.ebuild 3002 BLAKE2B 8740aab4a7893ecc23a695e52fcd7838224306b73ab589ced26ca924825b20b13cd3e8c0f2779f2145b4015dc01293b023a1c78b30d8ed05e62d16d982e0bede SHA512 7b3b5a93e5e38787c292bb771dd9f429abf76451b6d2a5f9ad328a4fba99ab8a858bb5f0af634df8630bbdc0fcb6658deb4771af304374812f9df6c209fd509e
+DIST 7z2409-linux-x64.tar.xz 1565344 BLAKE2B 4ded059fe85073405b4a1510378ed473bca6de2792d313fc3dcb77850dc2531b06866bb4d9de4d4dbc848be5a98b2e4cf5bbe191248f0ae53a279b48b586c169 SHA512 aebf18d861944e2b52d91434b1d59d80a5aadf3b2e80ab3d248357bcaf3c429442caf4ad3297057a559f2719cae9ce5b0aa391963570ffa75b6dcdf1f3c25603
+DIST 7z2409-src.tar.xz 1511288 BLAKE2B 5fcb39acc282b7dafbd1900eaf77e15e634adda5eff5d630b9d0821aa0d1e8569856cf99503ab7ffe69a82cec82a1a890772d6cff86cdb0af01dd462a94c0908 SHA512 461b702eb275655ebda70e128a5e184d15d2b0556f11ab1b409c0ff8a1e9c5d64761bdfb1685c5a0278534024a1e4ce46e4443d55cae373e487dc9ae180ef310
 EBUILD 7zip-24.08.ebuild 3021 BLAKE2B cb25e4abb650c622528ea0eed277f1f5b1419e46b5234a53b83120d6247842158c556190442f9ee792129e17b4915bd8b90daf32bcb07f3114687c28fae9d345 SHA512 dade7aa8de294f3c8a3ec209bdbb66b87e5f0a824166e2b5013d1d8bda0f14ecee7425db15874b67c274361b0fc047cfc90b0c9e122aa1183794286dec103c01
+EBUILD 7zip-24.09.ebuild 3023 BLAKE2B b06db4baa851dbabc67dd07be83b1c4ca860e4c768a8f10083bae3475c64c5d1bb246044f72cc399dc27d2ce346e69c717eff164fd13a5d09fa1a67757db2bb3 SHA512 7e08192eec8e2a2dd06fedd6b260bf55b869e0cdb5c1639c0bd86302cb2899472bc9de27cc3645c088c6fab6846c9cb73fdcf84a467ffe0f70b90208d03e1328
 MISC metadata.xml 968 BLAKE2B cc816cf086d296a591c2ae494022f35102570c8823ccdc5ada3dde2a83d515060b703d283d74ebd00738f28a0fb4dd8fdeaea10ae9168423dcf146034561f213 SHA512 e4d71bc79b0e6d4435442e74256550f93815b68142cdac763fed9a22bd5e92c25ba288d94738316d726c2073f4f86dcf00f3d77c65a02b0e06ea3c1dc7699cbb
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@ -1,8 +1,5 @@
 AUX libarchive-3.7.2-lrzip.patch 1095 BLAKE2B 011c61282f5ad91436e8155458695c5f0b9144e21ae856ba319927e6431d9730257d6e7f7ebcc916ad784e24b2f4ff2af75955aa0493ea3705fa8826f632f163 SHA512 71e3aefe7d3e5faa6cd47e350e52135d594184d957cf3e2d592e3770971ff3fed8886b7fe6c897c94efa15b3b9e9d15be05686178d201b422d4503e3878b704d
-DIST libarchive-3.7.6.tar.xz 5458552 BLAKE2B 3251dc4d59867d1c9b43e78ac7735c27670e819a1aba4f4a76372b8509e2427ff24e379f6102a4cc3c92b965d182c8939bb6df4c82d4d1141cdd1db13bf039a2 SHA512 3ca90d665772418b9ac444044511989e81e785a13db3c101851390ba7c2ba0793c799cedb9df990e900ab78c98207f70ecee7e21829578555dde99424950ae2a
-DIST libarchive-3.7.6.tar.xz.asc 659 BLAKE2B 9f6a621dd4aa20f06dff71225723e60a6cee1f2a54ff07d2d19670153105f2f75d6439320f49eb46c28a4416828af7dc4f0d827e46ec9aeb5b703f06eb329d77 SHA512 2840b13f910f47d34daeed9680beb4b3cdde2d7de26ab8453756261c51fb7a39b727454f370b0ee60f8e1646c65544331a22558cbe8faf79a201b1d1346b37c1
 DIST libarchive-3.7.7.tar.xz 5480580 BLAKE2B e118c693f7a78e86ab868fc6c2c77beba539cf5c7d5999e270cdceb225e9f85c68c938ec6ce3a33f75b2a44a6f7debe2c280d2573c1bcf05806300e8dce1a4f0 SHA512 2524f71f4c2ebc254a1927279be3394e820d0a0c6dec7ef835a862aa08c35756edaa4208bcdc710dd092872b59c200b555b78670372e2830822e278ff1ec4e4a
 DIST libarchive-3.7.7.tar.xz.asc 659 BLAKE2B 066d97312ded566e2c96ffc4603477fc829bcf17dcc057249dad51a0abea7aa5559691c0c25b581212168f8442db028a2dcc34148c648e973450fcb9dd5e35af SHA512 9f532df76bc381b40d7454a7bbbab85e34a646167ee7ca197fae45c713002e32f40e2b2871bc4a0d7149df19e69e2079efd9ab2f22eccf959b203604293d6094
-EBUILD libarchive-3.7.6.ebuild 4617 BLAKE2B b50a720bd43687ccc3a4d78284ffc7848c149e20fdc65ca3102e26e7234ae3c3739c5f3d36f8027fc4ff6bd0e7c0bbdd0d0e41848a229f9d5814cf73c7ead846 SHA512 bc274e264d64f612ab46187aa236ef9a876f4c9a4b897a64667fc378c17e5445827136ef8a17aee47e08a8ede2736617fa1ec33adc2b9e6e812bf95a6be5e090
-EBUILD libarchive-3.7.7.ebuild 4618 BLAKE2B d6b2f05c42fbdc044ad5521335524f17fb085e173ea2cdf5afcd0c4951da886bc40c731779a927594f3ffa062ca560ef204085d9859faa7ce807196ab76ff456 SHA512 20b69f3a59f0732addf7277de5d9031205ed83df86fdaf022103cee8f5ef7fba30d92b2d7398b58916fe2e4fe125fd899092014b1eed67fb34682f5182b61704
+EBUILD libarchive-3.7.7.ebuild 4617 BLAKE2B b50a720bd43687ccc3a4d78284ffc7848c149e20fdc65ca3102e26e7234ae3c3739c5f3d36f8027fc4ff6bd0e7c0bbdd0d0e41848a229f9d5814cf73c7ead846 SHA512 bc274e264d64f612ab46187aa236ef9a876f4c9a4b897a64667fc378c17e5445827136ef8a17aee47e08a8ede2736617fa1ec33adc2b9e6e812bf95a6be5e090
 MISC metadata.xml 1224 BLAKE2B 538433528de5543ad8e912ce0d072340be3f6eeefe16320ef48b3c30a35ebdff4a32055edf89f36e4479ab1468c620871fcb5ba91bd66e81798093b4d0345949 SHA512 9f53d623a02334f675c06edea2829ce52e78d85e3894e684ae920a678eb47046393b7a93808c7e1761d30a69faa5986cd4922ae7ef8f1e2ef221de39869bd12b
--- a/app-arch/libarchive/libarchive-3.7.6.ebuild
+++ b/app-arch/libarchive/libarchive-3.7.6.ebuild
@ -1,173 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit libtool multilib-minimal toolchain-funcs verify-sig
-
-DESCRIPTION="Multi-format archive and compression library"
-HOMEPAGE="
-	https://www.libarchive.org/
-	https://github.com/libarchive/libarchive/
-"
-SRC_URI="
-	https://www.libarchive.de/downloads/${P}.tar.xz
-	verify-sig? ( https://www.libarchive.de/downloads/${P}.tar.xz.asc )
-"
-
-LICENSE="BSD BSD-2 BSD-4 public-domain"
-SLOT="0/13"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="
-	acl blake2 +bzip2 +e2fsprogs expat +iconv lz4 +lzma lzo nettle
-	static-libs test xattr +zstd
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sys-libs/zlib:=[${MULTILIB_USEDEP}]
-	acl? ( virtual/acl:=[${MULTILIB_USEDEP}] )
-	blake2? ( app-crypt/libb2:=[${MULTILIB_USEDEP}] )
-	bzip2? ( app-arch/bzip2:=[${MULTILIB_USEDEP}] )
-	expat? ( dev-libs/expat:=[${MULTILIB_USEDEP}] )
-	!expat? ( dev-libs/libxml2:=[${MULTILIB_USEDEP}] )
-	iconv? ( virtual/libiconv:=[${MULTILIB_USEDEP}] )
-	dev-libs/openssl:=[${MULTILIB_USEDEP}]
-	lz4? ( >=app-arch/lz4-0_p131:=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.2.5-r1:=[${MULTILIB_USEDEP}] )
-	lzo? ( >=dev-libs/lzo-2:=[${MULTILIB_USEDEP}] )
-	nettle? ( dev-libs/nettle:=[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	kernel_linux? (
-		virtual/os-headers
-		e2fsprogs? ( sys-fs/e2fsprogs[${MULTILIB_USEDEP}] )
-	)
-	test? (
-		app-arch/lrzip
-		app-arch/lz4
-		app-arch/lzip
-		app-arch/lzop
-		app-arch/xz-utils
-		app-arch/zstd
-		lzma? ( app-arch/xz-utils[extra-filters(+)] )
-	)
-"
-BDEPEND="
-	verify-sig? ( >=sec-keys/openpgp-keys-libarchive-20221209 )
-	elibc_musl? ( sys-libs/queue-standalone )
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libarchive.org.asc
-
-# false positives (checks for libc-defined hash functions)
-QA_CONFIG_IMPL_DECL_SKIP=(
-	SHA256_Init SHA256_Update SHA256_Final
-	SHA384_Init SHA384_Update SHA384_Final
-	SHA512_Init SHA512_Update SHA512_Final
-)
-
-PATCHES=(
-	# https://github.com/libarchive/libarchive/issues/2069
-	# (we can simply update the command since we don't support old lrzip)
-	"${FILESDIR}/${PN}-3.7.2-lrzip.patch"
-)
-
-src_prepare() {
-	default
-
-	# Needed for flags to be respected w/ LTO
-	elibtoolize
-}
-
-multilib_src_configure() {
-	export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923
-
-	local myconf=(
-		$(use_enable acl)
-		$(use_enable static-libs static)
-		$(use_enable xattr)
-		$(use_with blake2 libb2)
-		$(use_with bzip2 bz2lib)
-		$(use_with expat)
-		$(use_with !expat xml2)
-		$(use_with iconv)
-		$(use_with lz4)
-		$(use_with lzma)
-		$(use_with lzo lzo2)
-		$(use_with nettle)
-		--with-zlib
-		$(use_with zstd)
-
-		# Windows-specific
-		--without-cng
-	)
-	if multilib_is_native_abi ; then
-		myconf+=(
-			--enable-bsdcat="$(tc-is-static-only && echo static || echo shared)"
-			--enable-bsdcpio="$(tc-is-static-only && echo static || echo shared)"
-			--enable-bsdtar="$(tc-is-static-only && echo static || echo shared)"
-			--enable-bsdunzip="$(tc-is-static-only && echo static || echo shared)"
-		)
-	else
-		myconf+=(
-			--disable-bsdcat
-			--disable-bsdcpio
-			--disable-bsdtar
-			--disable-bsdunzip
-		)
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi ; then
-		emake
-	else
-		emake libarchive.la
-	fi
-}
-
-src_test() {
-	mkdir -p "${T}"/bin || die
-	# tests fail when lbzip2[symlink] is used in place of ref bunzip2
-	ln -s "${BROOT}/bin/bunzip2" "${T}"/bin || die
-	# workaround lrzip broken on 32-bit arches with >= 10 threads
-	# https://bugs.gentoo.org/927766
-	cat > "${T}"/bin/lrzip <<-EOF || die
-		#!/bin/sh
-		exec "$(type -P lrzip)" -p1 "\${@}"
-	EOF
-	chmod +x "${T}/bin/lrzip" || die
-	local -x PATH=${T}/bin:${PATH}
-	multilib-minimal_src_test
-}
-
-multilib_src_test() {
-	# sandbox is breaking long symlink behavior
-	local -x SANDBOX_ON=0
-	local -x LD_PRELOAD=
-	# some locales trigger different output that breaks tests
-	local -x LC_ALL=C.UTF-8
-	emake check
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi ; then
-		emake DESTDIR="${D}" install
-	else
-		local install_targets=(
-			install-includeHEADERS
-			install-libLTLIBRARIES
-			install-pkgconfigDATA
-		)
-		emake DESTDIR="${D}" "${install_targets[@]}"
-	fi
-
-	# Libs.private: should be used from libarchive.pc instead
-	find "${ED}" -type f -name "*.la" -delete || die
-	# https://github.com/libarchive/libarchive/issues/1766
-	sed -e '/Requires\.private/s:iconv::' \
-		-i "${ED}/usr/$(get_libdir)/pkgconfig/libarchive.pc" || die
-}
--- a/app-arch/libarchive/libarchive-3.7.7.ebuild
+++ b/app-arch/libarchive/libarchive-3.7.7.ebuild
@ -16,7 +16,7 @@ SRC_URI="

 LICENSE="BSD BSD-2 BSD-4 public-domain"
 SLOT="0/13"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="
 	acl blake2 +bzip2 +e2fsprogs expat +iconv lz4 +lzma lzo nettle
 	static-libs test xattr +zstd
--- a/app-arch/lxqt-archiver/Manifest
+++ b/app-arch/lxqt-archiver/Manifest
@ -1,9 +1,5 @@
-DIST lxqt-archiver-0.9.0.tar.xz 183352 BLAKE2B 60443b7f4407b85bc1233f00ad2e46861c17281331d3b611021ca14be2e159befa0c8303d51b9021d35aa246d4fd9138ceb4f4b19cd6143438f8c3b976f9c40d SHA512 42ee097ae7fb17dbd00d9b94e8673664911c73bb5f353d08177c78d548eb24c39aa1daf57347eeefcb46ec63a8702c37f63ca2b42fd22bc85aed8f7a41585f3c
-DIST lxqt-archiver-0.9.1.tar.xz 186600 BLAKE2B 365b849578f9f663ed7628c52c4c7205af10ea255dd131a94a6960c581111e02fedee01be0bd674d1ef71c9648cc5a58de1b548c972eb415cfae990e7045cfb4 SHA512 fd7862c85f6f93c870a4b28d2ed3705fcc0431e9b4d887f4fab6d860eddc5fe99d8a4c2f7cd2957c34d72b74a11b8eec49bbcca40dfee11f20f6a39f37e9ee00
 DIST lxqt-archiver-1.0.0.tar.xz 187944 BLAKE2B c28e0c7c5a41fa5a1e2d417239e5de0b33d3a84a2833fab7239f50ae1b7f426c2b7fd630a09cea24f2032183e2bdcc037276462fdab3719fb709fd9f51ea8afd SHA512 12552539cb7601c3c1422ed00d6fa8ed0ebed744ce8b7b4a3e3cc8bd59bf8df165008fa63b0ce173b58309001f35c33a219cd80e7568acf12c4c896320fc5061
 DIST lxqt-archiver-1.1.0.tar.xz 191944 BLAKE2B c4356f8ea35e6fa9477fd31e5f5371d832ba33cadc53a2ab2e9a5bafcf9a5ddef1cead1c99234a9e8ff8572a96d760e661d3b6599023ffb4abefa0ab48185d75 SHA512 7c2c1a9e9eae30452c3c6c276c5fe30f5b9d9ed8ca92291e69fdc32d1cb94e3a88de79a4379cddebec8ca201a57c70494b8e57c5704b885010a51ec6647f1a16
-EBUILD lxqt-archiver-0.9.0.ebuild 1288 BLAKE2B 0401a420bcd98e5118c541ba79c514401126b8a94151cf5aa988dcc7f111c7d89b41379e4df5bbfb8c2311f4bf10855db46d5597cf60e4d6f26c61f4e5761685 SHA512 55818ad06afba1827d359edf44211c00cec2e8c4412d1b7f31ecff03e49a9c1ae7545c05f7408fc137d003ab6b665c8a9227d15c034dc444bfe5ab830d3a3c6b
-EBUILD lxqt-archiver-0.9.1.ebuild 1290 BLAKE2B 658005cc38bbc0dafa0ecf29e22743119393452e36365a41f9a113a015e62762dad2fb89a7c284c91f39bb3c6a7d4d57a913e89c625e1214a05c6f79a30c8e97 SHA512 0dab5b31df8a80a5c905d840dc5e1706b34d75bd988f94ee5e9eb7b97cf541da7d875df1f969de36d031f18cb98500702d8b5582bcbda7e6e33096da3eacfd71
 EBUILD lxqt-archiver-1.0.0.ebuild 1228 BLAKE2B d5325ed6d79fb7ea9557a311712a1dc228b10ad84063da3f9f6579f13cf18ebc9fa0a86a4e64d799f2dc93d2235b40140905f39843173d8948055f9f8fa02763 SHA512 4612a9adf6c332fdedb93e20b9f09b4422536662939b6f5da618ea2c5f34aa8bb5fa83b845fcad924f962c8f73324a76ab4b9556735f5e11fb0ecc160924e2b8
 EBUILD lxqt-archiver-1.1.0.ebuild 1176 BLAKE2B 17490bb6bebcb3edac517f98af8918f2b6d8cae01cbaf1d95ba2dabcacd9f0e93a41b5a8e16afd89809a96bf46c4ffbdf55da41479214f03f5414d70b23a8daf SHA512 b97743ceeedac6788227cf499ea81208e706165782f0fab37ade5630deaa17f4b33cbaf230ba5732cfc2aa2fccb18bc668d744c6885980e32e84a5b06b3fde69
 MISC metadata.xml 330 BLAKE2B 1f25c787f9b43ef0ef62206ca9ab67dfab8b95b2786fc84248541159507290229b291b9f83541adc196b58a9dcad7c0f3abd18c5c899a98978dc72403386896d SHA512 12f4638550e157da50134bf6c7cb480bd49661b9655900efdbb12a023c4bd4cd13018d7caa672096329691cf8556f89c9d13d6710463048329c8e3bd5f04f6ee
--- a/app-arch/lxqt-archiver/lxqt-archiver-0.9.0.ebuild
+++ b/app-arch/lxqt-archiver/lxqt-archiver-0.9.0.ebuild
@ -1,53 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PV="$(ver_cut 1-2)"
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Qt GUI File Archiver"
-HOMEPAGE="https://lxqt-project.org/"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
-	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~loong ~riscv x86"
-fi
-
-LICENSE="GPL-2 GPL-2+"
-SLOT="0"
-
-BDEPEND="
-	>=dev-qt/linguist-tools-5.15:5
-	>=dev-util/lxqt-build-tools-0.13.0
-"
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/json-glib
-	>=dev-qt/qtcore-5.15:5
-	>=dev-qt/qtgui-5.15:5
-	>=dev-qt/qtwidgets-5.15:5
-	>=dev-qt/qtx11extras-5.15:5
-	>=x11-libs/libfm-qt-1.4:=
-"
-RDEPEND="${DEPEND}"
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-
-	elog "Please note that this is only a graphical front-end, and additional"
-	elog "packages are needed to have support for specific file formats."
-	elog "For example, to be able to work with the 7-Zip format, the"
-	elog "'app-arch/p7zip' package may be used."
-	elog "For the full list of supported formats, see the 'README.md' file:"
-	elog "https://github.com/lxqt/lxqt-archiver/blob/master/README.md"
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
--- a/app-arch/lxqt-archiver/lxqt-archiver-0.9.1.ebuild
+++ b/app-arch/lxqt-archiver/lxqt-archiver-0.9.1.ebuild
@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PV="$(ver_cut 1-2)"
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Qt GUI File Archiver"
-HOMEPAGE="https://lxqt-project.org/"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
-	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~loong ~riscv ~x86"
-fi
-
-LICENSE="GPL-2 GPL-2+"
-SLOT="0"
-
-BDEPEND="
-	>=dev-qt/linguist-tools-5.15:5
-	>=dev-util/lxqt-build-tools-0.13.0
-"
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/json-glib
-	>=dev-qt/qtcore-5.15:5
-	>=dev-qt/qtgui-5.15:5
-	>=dev-qt/qtwidgets-5.15:5
-	>=dev-qt/qtx11extras-5.15:5
-	>=x11-libs/libfm-qt-1.4:=
-"
-RDEPEND="${DEPEND}"
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-
-	elog "Please note that this is only a graphical front-end, and additional"
-	elog "packages are needed to have support for specific file formats."
-	elog "For example, to be able to work with the 7-Zip format, the"
-	elog "'app-arch/p7zip' package may be used."
-	elog "For the full list of supported formats, see the 'README.md' file:"
-	elog "https://github.com/lxqt/lxqt-archiver/blob/master/README.md"
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@ -1,4 +1,6 @@
 AUX unrar-6.2.6-honor-flags.patch 1238 BLAKE2B 3006316800d6933f85935b0d1d4a224ae63d76d826c2a71f21ba148466d17e76e0a93f24d9c88015a8c58c4ca8f602ad25da48d097b80a078dbcc38a1a47715d SHA512 11cb495b661272b44078368318d2ec9f91e5d70bc79e5504c41a7d8e5207dc6b9afbad7cb36ac3188268f3797fa236bee55fcad8c95daeda2191a9e2a26dfd60
 DIST unrar-7.0.9.tar.gz 258287 BLAKE2B 4933d62c8b7ea227b5eee8ce078a08cbe7534f35641ee0ce33bdd246f1045c65f773894d5868738b2174ea2bb2858745b5bd31dc5f958ef70188bcb805165300 SHA512 4dff760bd69275dcd9bacac7a8fa9a6e68e2d047ea3775abc16a80d9a6e277b686153faafb1b711582d86eabfdf3254c601d9f585b28104dbd85ece4868876ed
+DIST unrar-7.1.2.tar.gz 264081 BLAKE2B e5cd9c577ae4c8b8025970e597b7b270fe74beb47974ce038ce334c6cd49eb3bbbd1126eecf7093703f998f5a55a3be3ea911d950dd25040ef0f98272d5d84dd SHA512 3492334ef95916728af573f8f5bcb8d5a8c4a014b5daa0ffeaa67c9c56a5603a2389b030c6e0126064b1f281db5143907fa83f8c4249d23abc3273a5387d90d6
 EBUILD unrar-7.0.9.ebuild 2685 BLAKE2B 332085c550f25cb82bee91c44b781d92a759d5f703dbca420572ccd56835bd1860b49f4f53a85e1eed2813df7928b70576a937c3c2e012e57293550f64574836 SHA512 4303ffb94537dfd8c243787933d60ecb25853ba79edf8ac5bf312c816be886128e75ae455431650b6085d5149994882aae1854e5df2345c2d5d06385fb0881af
+EBUILD unrar-7.1.2.ebuild 2692 BLAKE2B bba031bf53b4af6754f50ae2ad40f17af1037d5395702c7810dd1e7065833a8cac34b3e1d3bccc9f86535ecc32c7cb801d3df2c668b7cfa0bfd2ebc7c3b9d14b SHA512 5395896675abed2dcb4c5ebd2a9f5d1766e4824fcdb773cb83a3134e0d1469daa514e404313eb5c75ab434a422903743044b77f171ac210440191bd38374d15d
 MISC metadata.xml 520 BLAKE2B d8b7da005139f02d8fdb948cb6e2c6af4073fab248ee05e80aaf4c706d9213a7600010b89b3ad99e89cbb651caf647dc898373225315ec1dc2c6f5a51424fa8a SHA512 65e6387fe9ecb267f630480287bfb4376c16b1d8088fa4f2078a747d53210ea92ef3ff03f05fdbcadf97af71e47a691f19425573b0b630b5c7640caab2ca890a
--- a/app-arch/unrar/unrar-7.1.2.ebuild
+++ b/app-arch/unrar/unrar-7.1.2.ebuild
@ -0,0 +1,79 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib toolchain-funcs
+
+MY_PN="${PN}src"
+
+DESCRIPTION="Uncompress rar files"
+HOMEPAGE="https://www.rarlab.com/rar_add.htm"
+SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/unrar"
+
+LICENSE="unRAR"
+SLOT="0/7" # subslot = soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+PATCHES=( "${FILESDIR}/${PN}-6.2.6-honor-flags.patch" )
+
+src_prepare() {
+	default
+
+	local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" )
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" )
+	else
+		sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" )
+	fi
+	sed -i "${sed_args[@]}" makefile || die
+}
+
+src_configure() {
+	mkdir -p build-{lib,bin} || die
+	printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die
+	cp build-{lib,bin}/Makefile || die
+}
+
+src_compile() {
+	unrar_make() {
+		emake AR="$(tc-getAR)" CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
+	}
+
+	unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname) || die
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV}) || die
+
+	unrar_make -C build-bin
+}
+
+src_install() {
+	dobin build-bin/unrar
+	dodoc readme.txt
+
+	dolib.so build-lib/libunrar*
+
+	# unrar doesn't officially install headers, but unofficially, software
+	# depends on it anyway. There is no standard for where to install them,
+	# but the most common location (shared by nearly all vendors) is "unrar".
+	# FreeBSD alone uses "libunrar". Gentoo formerly used "libunrar6" and
+	# had a compat symlink for FreeBSD, then passed the compat location in
+	# ./configure scripts e.g. for sys-fs/rar2fs. Software in the wild
+	# seems to expect either "unrar" or "libunrar".
+	# See: https://bugs.gentoo.org/916036
+	#
+	# We now use the "standard" (hah) location, and keep the compat symlink but
+	# change the destination. The version-suffixed location lacks utility, but
+	# we would keep it if we could, just in case -- unfortunately portage is
+	# buggy: https://bugs.gentoo.org/834600
+	#
+	# Hopefully, no one has ever actually used it and therefore this does not
+	# matter. The odds are on our side, since it periodically changed location
+	# arbitrarily.
+	insinto /usr/include/unrar
+	doins *.hpp
+	dosym unrar /usr/include/libunrar
+
+	find "${ED}" -type f -name "*.a" -delete || die
+}
--- a/app-arch/zstd/Manifest
+++ b/app-arch/zstd/Manifest
@ -1,7 +1,4 @@
 AUX zstd-1.5.4-no-find-valgrind.patch 596 BLAKE2B 28c5bcc005511703833fc73b2f11ee7a42a69c5e762e71c269265c42585fe4cf167a4bdba4f0e36e8e0e7a61e01e0f992c9417690bc879978d575823aa5e1884 SHA512 ad6cd84fde1a4f29710ecffe40854a8bbad0b1428000a57d706b221411675e2d79958c940dc955ec27020cfb7c9a14b7ac84cfe15759a5d07552d46f94b7df88
-DIST zstd-1.5.5.tar.gz 2368543 BLAKE2B 7680e27a0adacfb809d9fc81e06d3f99bf74df30374d3b5cb2d58f667dd1b7d5c41697e608592709e17c0e32277f20a6d615edee409b5d7cdcb15da2799a2350 SHA512 99109ec0e07fa65c2101c9cb36be56b672bbd0ee69d265f924718e61f9192ae8385c8d9e4d0c318be9edfa6d849fd3d60e5f164fa120961449429ea3c5dab6b6
 DIST zstd-1.5.6.tar.gz 2406875 BLAKE2B fe17cf0950f8ee2cc07bfa2b41e97f36a1832e396386cb94a55bede975dc974920578cf147b39eecbc5b53ff06fe0dc1fe781a4cab9bc9f767ea28c0e786422e SHA512 54a578f2484da0520a6e9a24f501b9540a3fe3806785d6bc9db79fc095b7c142a7c121387c7eecd460ca71446603584ef1ba4d29a33ca90873338c9ffbd04f14
-EBUILD zstd-1.5.5-r1.ebuild 1633 BLAKE2B 95d1deef4ee44d393f712f01a76307e0deda25dfa21aeb0644fe137614276bfcfade8511eaedeb5383c65a8aed16cff7335c87dce52e92c95ae7ce4eb9b86ce2 SHA512 9b889e06acf9dbb8b3998b058c8a835a54ffe41770112c8e3cefea4bf885cb118552135163096850183e04faa79b29991d8ab8afd0462990821ea45ba1ba76e4
-EBUILD zstd-1.5.5.ebuild 1746 BLAKE2B 2c06a19b3307d2b1300b8f8f3c60867a9c6d34d2fbb6fcf5463542d1b04f74afbd33b72b78d1d98b84b4377f8ee6184c3cedd9e4a593d4e6bf625fd575478173 SHA512 372bf15f2f134605c019b93206f758ad65df0cf20bd95f6cf7a7eced372771bcfcd44e72a11b9dfe7ba5d0a992c0b7f091a40c767ec7e7023103b2f7ea50394c
 EBUILD zstd-1.5.6.ebuild 2205 BLAKE2B 33feb555f8b95ad7244e6b51c4418108f28bc596ba655fbbf1c66c9e7e19f4e4fb43719308f25fd107dc336160b245f75b57f91e10d4ea0f01cfda544c9d27ab SHA512 6e8b6905e5e9e7dc1f15a0d25d1cdb1f429f1bc0f440f10db7f0a4b234baf675a521dbcb1332ae359c76c7b7595c5339037b86d2717188b7f2c4ef79d07fa800
 MISC metadata.xml 302 BLAKE2B 66692581b8918a23bab99bb3b0909702327c1acf2b7f8ec2fbfdf74ff75a8f178ce1140e0a9d46b64983dfe9529134db842a5a60a86b7fcbbd5db88e844d136d SHA512 097c09d06824c85919b21bc841c791851b1a7d1a6c6d16a26bbe9bed9dfb1522cacdd2b430b8ff51762fb73b388d88ec679d46570b2e56b36352ea2cf20e46f6
--- a/app-arch/zstd/zstd-1.5.5-r1.ebuild
+++ b/app-arch/zstd/zstd-1.5.5-r1.ebuild
@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson-multilib
-
-DESCRIPTION="zstd fast compression library"
-HOMEPAGE="https://facebook.github.io/zstd/"
-SRC_URI="https://github.com/facebook/zstd/releases/download/v${PV}/${P}.tar.gz"
-S="${WORKDIR}"/${P}/build/meson
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="+lzma lz4 static-libs test zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	lzma? ( app-arch/xz-utils )
-	lz4? ( app-arch/lz4:= )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}"
-
-MESON_PATCHES=(
-	# Workaround until Valgrind bugfix lands
-	"${FILESDIR}"/${PN}-1.5.4-no-find-valgrind.patch
-)
-
-PATCHES=(
-)
-
-src_prepare() {
-	cd "${WORKDIR}"/${P} || die
-	default
-
-	cd "${S}" || die
-	eapply "${MESON_PATCHES[@]}"
-}
-
-multilib_src_configure() {
-	local native_file="${T}"/meson.${CHOST}.${ABI}.ini.local
-
-	# This replaces the no-find-valgrind patch once bugfix lands in a meson
-	# release + we can BDEPEND on it (https://github.com/mesonbuild/meson/pull/11372)
-	cat >> ${native_file} <<-EOF || die
-	[binaries]
-	valgrind='valgrind-falseified'
-	EOF
-
-	local emesonargs=(
-		-Ddefault_library=$(multilib_native_usex static-libs both shared)
-
-		$(meson_native_true bin_programs)
-		$(meson_native_true bin_contrib)
-		$(meson_use test bin_tests)
-
-		$(meson_native_use_feature zlib)
-		$(meson_native_use_feature lzma)
-		$(meson_native_use_feature lz4)
-
-		--native-file "${native_file}"
-	)
-
-	meson_src_configure
-}
--- a/app-arch/zstd/zstd-1.5.5.ebuild
+++ b/app-arch/zstd/zstd-1.5.5.ebuild
@ -1,73 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson-multilib usr-ldscript
-
-DESCRIPTION="zstd fast compression library"
-HOMEPAGE="https://facebook.github.io/zstd/"
-SRC_URI="https://github.com/facebook/zstd/releases/download/v${PV}/${P}.tar.gz"
-S="${WORKDIR}"/${P}/build/meson
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="+lzma lz4 static-libs test zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	lzma? ( app-arch/xz-utils )
-	lz4? ( app-arch/lz4:= )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}"
-
-MESON_PATCHES=(
-	# Workaround until Valgrind bugfix lands
-	"${FILESDIR}"/${PN}-1.5.4-no-find-valgrind.patch
-)
-
-PATCHES=(
-)
-
-src_prepare() {
-	cd "${WORKDIR}"/${P} || die
-	default
-
-	cd "${S}" || die
-	eapply "${MESON_PATCHES[@]}"
-}
-
-multilib_src_configure() {
-	local native_file="${T}"/meson.${CHOST}.${ABI}.ini.local
-
-	# This replaces the no-find-valgrind patch once bugfix lands in a meson
-	# release + we can BDEPEND on it (https://github.com/mesonbuild/meson/pull/11372)
-	cat >> ${native_file} <<-EOF || die
-	[binaries]
-	valgrind='valgrind-falseified'
-	EOF
-
-	local emesonargs=(
-		-Ddefault_library=$(multilib_native_usex static-libs both shared)
-
-		$(meson_native_true bin_programs)
-		$(meson_native_true bin_contrib)
-		$(meson_use test bin_tests)
-
-		$(meson_native_use_feature zlib)
-		$(meson_native_use_feature lzma)
-		$(meson_native_use_feature lz4)
-
-		--native-file "${native_file}"
-	)
-
-	meson_src_configure
-}
-
-multilib_src_install() {
-	meson_src_install
-
-	multilib_is_native_abi && gen_usr_ldscript -a zstd
-}
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@ -1,3 +1,3 @@
-DIST stress-ng-0.18.06.tar.gz 6683654 BLAKE2B fafea2c51b05e314118fd4d4551ecfbfb3ea6a256e6986290ed90ed9b9fe060e6fc558aafc40ea64b7d53afe6bc642f00be2e08348aa491d442b9371eebf2851 SHA512 f0ab899cbc4e8419fa174a45f655b4c607fdfbc09e15e98fe7d297dcd5411ae2c9580d439bf550503e577497ec62a272e9762af5e6160b6645d4587dab87f8e6
-EBUILD stress-ng-0.18.06.ebuild 1277 BLAKE2B cee4c814289ffeb384a90663735b96a291926533b90316ccf81ace8c5aab93bda6cd0feadc88bdc2a9fc89028e661f1558ad4c364ce0fdeabf2726422d70d248 SHA512 5584d89b82cb35eed6bbf61bdcf4442ff29fdbd5c5b8d0f08649ea0830da70d3300c7716b3ee748ae6fc961bbcedabc1eec0c542b01f72e78e2a8d50aafa3d5d
+DIST stress-ng-0.18.07.tar.gz 6693742 BLAKE2B 452275807233cc740aa20b87793d2dfbb36adde17c539e7cf3bcfa22c6753dd46e551f5795ba3ee05956083ee33d906e18975f5451aaec56e68ae9aab1a66872 SHA512 359c88567b6a8e8fc743d6eacaef01d4a472748147fc044b9382abfd4ef75e3bcb625a9bed151db38b0f9ad48fd907a4373f1b7624c26f9c20d331046c3a57d8
+EBUILD stress-ng-0.18.07.ebuild 1277 BLAKE2B cee4c814289ffeb384a90663735b96a291926533b90316ccf81ace8c5aab93bda6cd0feadc88bdc2a9fc89028e661f1558ad4c364ce0fdeabf2726422d70d248 SHA512 5584d89b82cb35eed6bbf61bdcf4442ff29fdbd5c5b8d0f08649ea0830da70d3300c7716b3ee748ae6fc961bbcedabc1eec0c542b01f72e78e2a8d50aafa3d5d
 MISC metadata.xml 965 BLAKE2B bc3ca07d204693d8e4efa2bd547af2e57e672c312cf2e8feafecc9fbaad8d7119b61483684c16ce89ffd0224bb42a4ca1a7df277909364f77439091e02b0d153 SHA512 963755da68b098fc10b296a15b866fafc0ec6ea0d232a2d2eae9aa478801b282818b3b124303f92ad77b7bbd258acfb54e56317012cd2bd7a1274a1f81c419d5
--- a/app-benchmarks/stress-ng/stress-ng-0.18.07.ebuild
+++ b/app-benchmarks/stress-ng/stress-ng-0.18.07.ebuild
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@ -29,10 +29,10 @@ DIST gnupg-2.5.1.tar.bz2 8126739 BLAKE2B 46955d2eebe14395adc0fdf81e89a32f3f9baaa
 DIST gnupg-2.5.1.tar.bz2.sig 238 BLAKE2B cd024a63ecb82a12e92444cbff8dbc9bef6a4e436d59957aae77927cce0baf9e282e63df7a5159a521c7c8694a0dbe96d6537ad3ec5f779c7c0dea8d02b5e70d SHA512 8ffd5cc72a2907972bf1854e804f6c215ff66ba2d6e91952700f49b2b5ba8bab035d0f42efdb0d3c3166301cda6e716394928bdd9c0d0d1e1789a02c7aa1a926
 EBUILD gnupg-2.2.42-r4.ebuild 5703 BLAKE2B e3b01ff2397a38d7062799195fc52c969d0ac117211eb385c13280211a5e0c7467fe158e1fcc958afda9745c0a9b9ef482d21d4d8809de14ebefddcd089fa6ba SHA512 80845654342a6f301d80e7c22e9efd8531fbdc3cb989c99421ccc2bdc532f79983b4d44088558cfbf2a941869f2bd83c587c262d141851be43b5e15e01ddb0d0
 EBUILD gnupg-2.2.43-r1.ebuild 5573 BLAKE2B 2fb3e5977f4f1828ba87b88100622b84e6c48e892e97e49e65456bfe97d9a8b4f19d5c0b53804eaa8f5a2a8cae3a256478c3b509da77aefb0e9835af3871ba30 SHA512 c6e3532520d1945046e08cef686691ae3efc21e9b2e6a7bf3a7c8e0c24d69130fde03ff6c8336ecd92bb7018bcda5555dd0c9f4332efffcfca1200ae9c039936
-EBUILD gnupg-2.2.45.ebuild 5645 BLAKE2B 1ec23a834e5a336cd939be1f6c3eba1630b1882c3fcc947c0797b98519d6ea0037365f04bd09aaad209562a79395c021e9b9b05d8f38a66bcb189d8a53994503 SHA512 f8212761df52df60dceb06b2cd3038763229b7a55f0f73e808382a954d84cefb7984ec0ac70fb303404827317c9a89fee02241d2cfe77fe8635bb96e33a889a2
+EBUILD gnupg-2.2.45.ebuild 5640 BLAKE2B d9abb60011f75e85b7281b5b0118a630bffd08c98df043b9852b7df3dbbc1a4fc1076c8eda093189d578f9941364c97571833be3500b3b428fc039a26859a267 SHA512 3bfc180bd7d3095b6831e8085b26ce1887aaeb25991fb55befc57bc38f70a3412c1dbea86b387d393c8715de78b0736c45f3f9e57d0a48fddc4bfe66d50f34d9
 EBUILD gnupg-2.4.5-r1.ebuild 5894 BLAKE2B a235df7b022acf9bc4d11fa566b7edf39f60dd865802685f5bf68e6df76913589691476a2d48a885816e8aecc2112de14508e44882e43dd3bbefdedd54385a14 SHA512 f621e0a6227862acdab31bb5902e235b8fd5c3e3908be747d5680957d0d55ad5b92ba6a7e2436d1902cd304a40a62fdca8236e67563624bce0b4d683c0364d9b
 EBUILD gnupg-2.4.5-r2.ebuild 6119 BLAKE2B 2f414a0dfe969c750e09ceacde25805ed8b04cb9ae9630b2731da6473796ca77dbb76bd555198350dd6b837f3cd14f7019a75b63ba05f1f0366dc544747f4ce4 SHA512 04ca8526ddc38c858f50c233568c28111f90c6ae222663eebc5ffcfa3852ee5397eca28fbf73324e771855060dd74792b97eac51c64d79edd2ccb3eb35c3c8f0
-EBUILD gnupg-2.4.6-r1.ebuild 6108 BLAKE2B 42df459e2600661c0f8927e9fc8fe70fc7aa226208aa9e4bb618d939d61207c9b5e1a9a08d9098fc51c2f5190e67ec8eea0fec827efec2db81d5361ff3f1811b SHA512 d6004160d9f7ecfa6d3712c12e12d7b1e606b945985a7696aa94e39466c1c8b5427dfc6455ad1e1da9e170b7b4580e1a4f7105c9e3cc468f48b0b9439386582f
+EBUILD gnupg-2.4.6-r1.ebuild 6103 BLAKE2B acc4c2e33f3991e1e9c3aac52740b88ba220c92eee08ddc34c3f67ae364877cb1b4dae3e39239f3c5ac8f5f0f71dba345402c0394f96d5193c7b65f69589ed73 SHA512 3ebc0b608bf83cce2ef621172feb2dd7398ea2a2bacece141c46fe0fa52f3793b6f46270f661c0ddd6f907643fd1e71049f49182efa5175265bb932487765aec
 EBUILD gnupg-2.4.7.ebuild 6071 BLAKE2B 60a0f547d426102d9670adfa258aaedf439a5ef5fc1587200c4233df859174959631c964408780ca7791f4421e9a566c08fa18bef6038c76d321ac2f4a5e5082 SHA512 f0cfd30a7c16f40bd83b72d68578a51d578f62eae82b08d4bb7610663a2683ba535a30b7abc576770f5569700d48f5b275a19a4a1fe676c10c22367e5b748782
 EBUILD gnupg-2.5.1.ebuild 6087 BLAKE2B 489d00a348d323809439f838e90e344db63aa5185c089d2ef743469a5867ea06b5ba0ab97005bfef30f5957edb7f213501d2f692774bf9458c3afcbd167a8208 SHA512 e744fe7b322c16c4d842fb553a5129abc482bcb8846121c92be7d3bbc3139ee546dde281fc2645ec6413dd8b9fd0bbb77630f7fa6fe0cd6a2de524195517ac2b
 MISC metadata.xml 1189 BLAKE2B dae783678abfe0bae095970d96d952f591a569debad411708d29a2f128c6a291b73a33ee0b3491a6a5ec44c11f56d33c1531022e0ef9eaad3326c9cd0f79e3fb SHA512 bc7d6a9ceda213c134d9afc527fe0b0c87a4886a171b7a1e1f662f3978fec5e71323bae4c9f3882e1d763d5738446f161265070a8e513a59fa62ef0f792e9fa5
--- a/app-crypt/gnupg/gnupg-2.2.45.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.45.ebuild
@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"

 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl test tofu tools usb user-socket wks-server"
 RESTRICT="!test? ( test )"

--- a/app-crypt/gnupg/gnupg-2.4.6-r1.ebuild
+++ b/app-crypt/gnupg/gnupg-2.4.6-r1.ebuild
@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"

 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl test +tofu tpm tools usb user-socket wks-server"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( tofu )"
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/faudio/Manifest
+++ b/app-emulation/faudio/Manifest
@ -1,5 +1,5 @@
-DIST faudio-24.10.tar.gz 1125385 BLAKE2B 1179139403621302c238b1ba4dfd691b64541c2b23919cfb86f9cad587e1fbd68be18c62c00fc3a9c408d7c580e2ce63392d362ad32a60957bc102b5a1189c51 SHA512 e0b2031ba8452aa0696bc841013db5558c97f87a0071cf5fb48dd668363980d6d7d1adbc22d051e5019f32ee4aaf5553ebb80d37b87e9bcde153b828be5ff127
 DIST faudio-24.11.tar.gz 1126428 BLAKE2B 47dc75a85a247079cabd1920dc63a2932bedcdb848bcf3e0f7d6ce8b093c53dc16af2329bd21ab92578378a0b4ba5e494a9e97fd0b54f80a7c1a29dabeadc008 SHA512 7a2c8c1ea7e3ab31211dedbd54cd60d06ddb0ada5ae00c7eca3bbf71cee4701ecbb232313f672018e28e472285e0862658ad1fa84f01fd8e77deefb47e47d080
-EBUILD faudio-24.10.ebuild 920 BLAKE2B 12bb27ecc809be0b53cef352bc722a8594c177263fea398710c808577ee77da594b78c0a2f86335d7f62fb81065cc5636e33138281af88cc8d522b7ad3795620 SHA512 9c68c1dcc2ba2e17e5cbac0cadb8fc6ed5eef85cf5d4df133134afc889a577e05ce2bed4a91b5db4e8f0a1f24f61bc48b6dc807e5606415c9a7b5ed1aa8f3594
-EBUILD faudio-24.11.ebuild 922 BLAKE2B c6dd07114357c562b66ac863e8e60b8cfd8186c64eadd5157810f7f9c053bfa458ddff0a73d0c71a6924ec6b9a43c7640351d9c4e9df28b59ef3fd1a11cb91bd SHA512 1b87460b62a618462045196bc288a84d1eef54845cff0cf9f4099320ae7b929f47e32acf29c73bd76563ff6188856636cac884f531893594e8361a3ffbaadce5
+DIST faudio-24.12.tar.gz 1126609 BLAKE2B 06b610a49080f036b521a0acbe10a82aae748e240dcb87cecf5eeda89d982e5fca3ae2d9a8afb2ad45957ddcb26f423ebbf2639b320e0fb2683aa0ab7cd0f523 SHA512 1bef0f3c60850537330033b136fbb5205901db8bfedcce7650b98564d8b514623f4b8e702adf025c9d6a8707eb7c73f90e9b8fd40085bd8027e1cb7c6f3be11e
+EBUILD faudio-24.11.ebuild 920 BLAKE2B 12bb27ecc809be0b53cef352bc722a8594c177263fea398710c808577ee77da594b78c0a2f86335d7f62fb81065cc5636e33138281af88cc8d522b7ad3795620 SHA512 9c68c1dcc2ba2e17e5cbac0cadb8fc6ed5eef85cf5d4df133134afc889a577e05ce2bed4a91b5db4e8f0a1f24f61bc48b6dc807e5606415c9a7b5ed1aa8f3594
+EBUILD faudio-24.12.ebuild 920 BLAKE2B 12bb27ecc809be0b53cef352bc722a8594c177263fea398710c808577ee77da594b78c0a2f86335d7f62fb81065cc5636e33138281af88cc8d522b7ad3795620 SHA512 9c68c1dcc2ba2e17e5cbac0cadb8fc6ed5eef85cf5d4df133134afc889a577e05ce2bed4a91b5db4e8f0a1f24f61bc48b6dc807e5606415c9a7b5ed1aa8f3594
 MISC metadata.xml 719 BLAKE2B b71b3829f3c1a2a546621b460f3ccc41f79db0acf913f409bc55ad2b8632a8361a7b45952b8aab2f9564391b14f3735f17c10a0e5f46da55fc49b730a743a5e6 SHA512 f52da50d3b16eb8dda8d2af6d7db6ae1e457d48c9a79977cb5288e379446ea4a5e420bd2dc17067d3bcba5cee7838ce10401f319e556d671b0483def94c3f2d7
--- a/app-emulation/faudio/faudio-24.11.ebuild
+++ b/app-emulation/faudio/faudio-24.11.ebuild
@ -12,7 +12,7 @@ S="${WORKDIR}/FAudio-${PV}"

 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug dumpvoices test"
 RESTRICT="!test? ( test )"

--- a/app-emulation/faudio/faudio-24.12.ebuild
+++ b/app-emulation/faudio/faudio-24.12.ebuild
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@ -20,12 +20,9 @@ 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.18.3.tar.gz 51911584 BLAKE2B 01bc915ea88c6a80608bb4f9c37ec75cd4abcc785b99d33eb9de3c32b65c884d47d6c7431d388e73699012b9edd6c44bdc051233726a4239f333e35eba35d72f SHA512 cb71b362ea0b78ba324cd0f9b7003f93936cc61fd22df4791d178f80d396aacf4f42f5d95209ec599f42548df47ea46b04f8baddb4bd78f7fb06e2681b57f3f8
-DIST xen-4.19.0.tar.gz 52011199 BLAKE2B bc6502bf5b68ab130f1d64e20e8a6d8ca656240545f0a4f5fe500413504c7610352bd7577f0e7e9d9354745afaf39d3edd3ad775718e20d14181dd2dca28ec0a SHA512 bc0b4257cab66b0f9d4a1fe72e07f4980398b2934989c02ffe488b465eca3443caa0ded903871480aba6e36212921f335b68d67f202f22548c31899225f2d657
+DIST xen-4.19.1.tar.gz 51991715 BLAKE2B 1e16c15c98b0e02ee55129cde3f41b314a4eaaff9956f5fa6cea7d9391c51e103b7d62f647e628634ed63bc3ac41bb93a65ec4e26aa39fb2f174f9aef161cd90 SHA512 6971d07d4eafd40186f35cf6de235badbdf0e1640974693b8fbd415876c46634094178a6157e6dfdc16af885c70ff3b7a72be35a88dcc63daf36e6eb08f9b17b
 DIST xen-gentoo-patches-4.17.0-gentoo-patchset-2.tar.bz2 4001 BLAKE2B 7afce426759952e202a1dd819fe0a23108072bf9552ba14a0bd787a96ffe5e7a36f37e03dad8db9c46f5731acbc122c258eef6d517816aad9c8db1ca64700d19 SHA512 bcb1479f9ff5e194a4e452da9d0479febc2bcd465b4be69bb8f30e2e6b858fb77a71216dcb3e74dfb65e7ca6513742c294cd6b5eaa5ce82d0b122a00f1cbc450
-DIST xen-upstream-patches-4.18.4-pre-patchset-0.tar.bz2 30806 BLAKE2B 29654a8bbf5515ba51b278cc62222bc741ddab59976655e4b5df02fe75277d20686e4f4cda7a38997fab86a179fa511fc6c2b9c830080a4af80a24215c0e6e71 SHA512 b188c5111714eb1775ee7ad91ed443c03cdb6342c2e26ad5e2f4724f82220191695ecb0b616c8dc3956c07560d0d4056eb1cfdd1143a7b138c4a8669ac24c945
 DIST xen-upstream-patches-4.18.4-pre-patchset-1.tar.bz2 55216 BLAKE2B 9cc25750cc48db6efbc349278a89cfc3880326ad4556d5dad28a016bbf270435acff606d545420d44a3143ab1f540156c6997ad676d36b3ec3d5e85a63fb495c SHA512 3752998f804c7e1e5dc327a1a84dafbdac6c06eefa404766fc94089521d836a5fecd2f760e229200d4b6267af88f55b119505336be4d57e9fd74457b122f896f
-DIST xen-upstream-patches-4.19.1-pre-patchset-1.tar.bz2 77344 BLAKE2B 8f201a0aee7f0dda2d06f2a476de213d835b94e55ff0c5ddbcae539db49dc51993bf424a68fcc70e67469394590e6d2256107efd9cfc578c9a09f5c55750c828 SHA512 a8ebf31d5805d238298b77ff086270b7077f38786249237601eba716b62ad63b4b8f13158ed6c3ca126f78d7bf991a55ffce85fd8826d59061410a5bc24bb883
-EBUILD xen-tools-4.18.4_pre0-r1.ebuild 16080 BLAKE2B 1a90ecebe2131f6af0320e6b0f16fbcc3b7eb2d260be1348b87869c13abec599c580a704bc84d87f0720faf9a1f52bca91ce844e99ae0ec3a6e07d5d4bf50c9f SHA512 832202e5ac853d7136736f4697146f093dbcd7921506049890e94f1c526a1d4ef1e397cf05763cb053be8acee5e45a74f6a4fe840c79aaf2f30532f0159ac238
 EBUILD xen-tools-4.18.4_pre1.ebuild 16080 BLAKE2B d7f99bad8a6314272190a7352bb4071326cc8447d6dd7dc283e742de35933c37a1d642c62a2642ac28f35560c16eb94ff6be3f000abc4e364f6ebab9122bc1ec SHA512 67e13dd0ec19c34175118c9fd05662678ef5720cb212db71e1427c907254f7667607ad36f0097f08a040e14fe729c5f14ef3cb37e918efafe5eea9ce73923b9a
-EBUILD xen-tools-4.19.1_pre1.ebuild 16082 BLAKE2B 9699af8ab7d420ba11a1fb90b5eff3bf6877e2bb960092b19beee5fe63ec3f15858f839493f3c7148b5b975e0674388dc665449842df1205a83b745cc0126bc5 SHA512 2b8efc9486a4850092fdc07f11fc95c379a18c7302e4f79e6917e3950f834b811b3251a88f9f43430a6cbd3daf81442df8059fe70fe073acb36964317d9ed221
+EBUILD xen-tools-4.19.1.ebuild 16075 BLAKE2B 1ff2433c0d99bf375057e9053d324da289381f0ad441b46f54f98ba3bf0cdb75f374f226a9761c64aef3ced3c04e8f90ac2e7b6079803050d6af4c3aee0cb23f SHA512 90be3bfbc98d8e8f99fe694fbce447dfbe84ea07b1c23f01995d724bb13e733ecf30926139e5cd611188cea990aec22b352c1ba21205567ef92132b645d413ab
 MISC metadata.xml 1562 BLAKE2B a619e34e6fec4c6ffc00fd098dc040c5bb464ed7f2032db2e933fada0614e82c21269175f37720a123404551474e2aeeb2728b405ff93f9b4d9d092d027e0839 SHA512 f45c793a4b4819f0e50501ddc85acdaf99e4d675530712f8dccfb5166d071ae8ed07917a61d56037d6ba3a54123f72f4512d8c11643ea8c6e507feb9d29594e7
--- a/app-emulation/xen-tools/xen-tools-4.18.4_pre0-r1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.18.4_pre0-r1.ebuild
@ -1,529 +0,0 @@
-# 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.3
-
-	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 gettext (Bug #937219)
-	sed -e "s:\$\$source/configure:\0 --disable-gettext:" \
-		-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.1_pre1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.19.1_pre1.ebuild
@ -25,8 +25,8 @@ else

 	XEN_GENTOO_PATCHSET_NUM=2
 	XEN_GENTOO_PATCHSET_BASE=4.17.0
-	XEN_PRE_PATCHSET_NUM=1
-	XEN_PRE_VERSION_BASE=4.19.0
+	XEN_PRE_PATCHSET_NUM=
+	XEN_PRE_VERSION_BASE=

 	XEN_BASE_PV="${PV}"
 	if [[ -n "${XEN_PRE_VERSION_BASE}" ]]; then
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@ -1,10 +1,7 @@
 DIST xen-4.18.3.tar.gz 51911584 BLAKE2B 01bc915ea88c6a80608bb4f9c37ec75cd4abcc785b99d33eb9de3c32b65c884d47d6c7431d388e73699012b9edd6c44bdc051233726a4239f333e35eba35d72f SHA512 cb71b362ea0b78ba324cd0f9b7003f93936cc61fd22df4791d178f80d396aacf4f42f5d95209ec599f42548df47ea46b04f8baddb4bd78f7fb06e2681b57f3f8
-DIST xen-4.19.0.tar.gz 52011199 BLAKE2B bc6502bf5b68ab130f1d64e20e8a6d8ca656240545f0a4f5fe500413504c7610352bd7577f0e7e9d9354745afaf39d3edd3ad775718e20d14181dd2dca28ec0a SHA512 bc0b4257cab66b0f9d4a1fe72e07f4980398b2934989c02ffe488b465eca3443caa0ded903871480aba6e36212921f335b68d67f202f22548c31899225f2d657
+DIST xen-4.19.1.tar.gz 51991715 BLAKE2B 1e16c15c98b0e02ee55129cde3f41b314a4eaaff9956f5fa6cea7d9391c51e103b7d62f647e628634ed63bc3ac41bb93a65ec4e26aa39fb2f174f9aef161cd90 SHA512 6971d07d4eafd40186f35cf6de235badbdf0e1640974693b8fbd415876c46634094178a6157e6dfdc16af885c70ff3b7a72be35a88dcc63daf36e6eb08f9b17b
 DIST xen-gentoo-patches-4.17.0-gentoo-patchset-2.tar.bz2 4001 BLAKE2B 7afce426759952e202a1dd819fe0a23108072bf9552ba14a0bd787a96ffe5e7a36f37e03dad8db9c46f5731acbc122c258eef6d517816aad9c8db1ca64700d19 SHA512 bcb1479f9ff5e194a4e452da9d0479febc2bcd465b4be69bb8f30e2e6b858fb77a71216dcb3e74dfb65e7ca6513742c294cd6b5eaa5ce82d0b122a00f1cbc450
-DIST xen-upstream-patches-4.18.4-pre-patchset-0.tar.bz2 30806 BLAKE2B 29654a8bbf5515ba51b278cc62222bc741ddab59976655e4b5df02fe75277d20686e4f4cda7a38997fab86a179fa511fc6c2b9c830080a4af80a24215c0e6e71 SHA512 b188c5111714eb1775ee7ad91ed443c03cdb6342c2e26ad5e2f4724f82220191695ecb0b616c8dc3956c07560d0d4056eb1cfdd1143a7b138c4a8669ac24c945
 DIST xen-upstream-patches-4.18.4-pre-patchset-1.tar.bz2 55216 BLAKE2B 9cc25750cc48db6efbc349278a89cfc3880326ad4556d5dad28a016bbf270435acff606d545420d44a3143ab1f540156c6997ad676d36b3ec3d5e85a63fb495c SHA512 3752998f804c7e1e5dc327a1a84dafbdac6c06eefa404766fc94089521d836a5fecd2f760e229200d4b6267af88f55b119505336be4d57e9fd74457b122f896f
-DIST xen-upstream-patches-4.19.1-pre-patchset-1.tar.bz2 77344 BLAKE2B 8f201a0aee7f0dda2d06f2a476de213d835b94e55ff0c5ddbcae539db49dc51993bf424a68fcc70e67469394590e6d2256107efd9cfc578c9a09f5c55750c828 SHA512 a8ebf31d5805d238298b77ff086270b7077f38786249237601eba716b62ad63b4b8f13158ed6c3ca126f78d7bf991a55ffce85fd8826d59061410a5bc24bb883
-EBUILD xen-4.18.4_pre0.ebuild 4536 BLAKE2B 30a527849841dd6c3850606db1cf38f8d3a58ad356e77d873ad60ebb59bbc1088d244095c0c7e81c2dfd56bc635cf622efcffb280baf16202e7cfc4211a1e23f SHA512 cdda47bbc483affabf4d9145695e6c3d3f4adfed02ce7f694e55d0456b7f92d246d61ceea0a6e6b97b28e052216af7825798b618c84b835a6e65574cb448bb5e
 EBUILD xen-4.18.4_pre1.ebuild 4536 BLAKE2B 48e0eeccede1bb6aa01193d91ddfe5e56da80a464e81fc25109cb588ff3d5283b9138c9097ddec948f7d3a89d0cc3d82eeb1dd06103247487aa87b527a9355f6 SHA512 f4291fa07ee9b145ed99749676c1cd4fb97b55d3684503681a66b2686553adbfc69c7c46bcffef3741fdbda29cf277e9fd5b73aad0a87dacac6b8589b3139ef8
-EBUILD xen-4.19.1_pre1.ebuild 4537 BLAKE2B 880fe82fa2833f39e9bcc8e7c74deb78a9b074bc5b4d2a933ad4da05f0421dff5e95a4472aab184ba8c559ebfe715b6808724031c3aadfd70a78334769d4ce2b SHA512 8cf01599e59129df7775a323c37bb2b0fe692bc423280a74d99a3fcfa00e01d821f03f77b454f4a3b845892051b8ed51422b8c4145e4935df5ff067db8ed782a
+EBUILD xen-4.19.1.ebuild 4530 BLAKE2B 25b4955125c215fd10fa64b287c85652d58e36d5e5b06b8f6044a4c6c10f5f82cfc7d8bfa69aa47b36c9d556ee665dc4e54b72ffa0c66f61582ded49b782117a SHA512 e1124411694f70bd9fefde87dd2c4538be19a97b3500b94e82311063a97a97b20d0417ed23d7027c9e316c638bf0966e8de5b3c07f68304f87b029a16d0b8cb9
 MISC metadata.xml 775 BLAKE2B 35370f9f1a629b090ffaf3c984b54fdc195c7f60e5ca8ec12c51d31494ee238e4fc9d29e0aa724109a992a7d4ab0e1663a9764b31f7c7eb98fbbcab68d386809 SHA512 68e59dc5fc7d9478fcef4e346d0124e8fa7497a4fbfce4bc42ff323dc5cd73d5b26d6819639268fc8e555670168835a3dcfa9596eadd74975585183fcd366d18
--- a/app-emulation/xen/xen-4.18.4_pre0.ebuild
+++ b/app-emulation/xen/xen-4.18.4_pre0.ebuild
@ -1,179 +0,0 @@
-# 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.3
-
-	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.1_pre1.ebuild
+++ b/app-emulation/xen/xen-4.19.1_pre1.ebuild
@ -16,8 +16,8 @@ else

 	XEN_GENTOO_PATCHSET_NUM=2
 	XEN_GENTOO_PATCHSET_BASE=4.17.0
-	XEN_PRE_PATCHSET_NUM=1
-	XEN_PRE_VERSION_BASE=4.19.0
+	XEN_PRE_PATCHSET_NUM=
+	XEN_PRE_VERSION_BASE=

 	XEN_BASE_PV="${PV}"
 	if [[ -n "${XEN_PRE_VERSION_BASE}" ]]; then
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
--- a/app-forensics/aflplusplus/Manifest
+++ b/app-forensics/aflplusplus/Manifest
@ -1,7 +1,7 @@
-DIST aflplusplus-4.07c-patches.tar.xz 4788 BLAKE2B de109198fbabfce2554459fee6a14f66002a952f5584ff265a6ff7d7646f520ed53a6d9c8c125a05eb5a4aa0c1cc675dca82647ad4c0965cdab10d3aa2f09467 SHA512 0ea4279b261d55cf209e32ca4b7fd7dc1181ec902dd7e4c7f36854d84f14037e643a543dcbb849927b41919c527303fc5877c9fab5b09c8988fbfab499b8f8bc
-DIST aflplusplus-4.08c.tar.gz 2894794 BLAKE2B 5576ec54969c7ae10b05fe10320581b348f989c1bc412bd63b2ca7ecb3bd1782a90c2660d971375667f6dd820f9035d7abb2207f59a1aaa5e7640d352eaa5757 SHA512 52c35ed544db8be778b79a64977fcc74092b541c4c07a788b20f4b9e8db95ff9c52c997ebf6f5a1056f962f3551df06a5eca02679bc2b71bb9d8944c1f77984a
 DIST aflplusplus-4.21c-patches.tar.xz 4932 BLAKE2B 8d53291a6d26ecc3d08fb4ca2711544e16c393def9fcb383d4eeb1d67d6bcd531788907ebeac2413e7fed5af5d56f363c6c4d766453e1d8de482cb6d285164ca SHA512 10322ed8d4549ccd2ee85fee00ffea712195858a004344424c31ebe4e4e8d3caf03f0d81d5cb38365418ee1e96288ba44504cb41a66644076e2cb46527f111fc
 DIST aflplusplus-4.21c.tar.gz 3004235 BLAKE2B c182260ba25a8a7a87b91ece5b3ea6aafba09b3361259361d9be24b7c5dd90430403a3170ed9397edaa714a45f62de26f324aab005a27a44fffce2708bb366e5 SHA512 cb58d58561ac814e07e9b5b735fade42b977fb1b92a63f1d7a66a5809203e83acf805ccfdc8ce29c9a3b374a189690010ca3d8ae20e261680751cea3c4841777
-EBUILD aflplusplus-4.08c-r1.ebuild 2721 BLAKE2B 3fc069d6b9db009d28a2139d67829ea03106abc05e7a418ec523833104f9d6ad002614554c6334eb042c85918523ebac4f36b97988369d2828063037e4ad428f SHA512 39bab582783c38981ff543aab999e23eeff59dcd90b794ecf7a2fa19b307b9b78f879f40aa7d660a127b3285de6cd9ceced735c900e01b9b4cb7c1dd0c79506b
+DIST aflplusplus-4.30c-patches.tar.xz 5008 BLAKE2B 60031d726e0d1834d0791bb88e437ac81bca1995dd424d64a0694b7e518e3ddbcf490413d830d2fe7649a1eb5c4cfa0e34e8115505a8c5df5e3fddce80b31efd SHA512 6d9d6bf03f5e899b58252eb299029f1b3630f129e78dd7ec2512ae48244822e0614d915c04ba699b2b56d4f839451b0e76e3f1148eb3027e6e7f53a79111add3
+DIST aflplusplus-4.30c.tar.gz 3031558 BLAKE2B 7f9c7d32afc5316cef460a72e7603aee36161559c2bb5c03edc408c16e8ba8bf96ced2c90e5578caa401ace37caf3ff7bba72ab58b7070c7c5b69004dc2d4da7 SHA512 072c9524978843eec6be5428793be43d10f3530a3f569fd4015d950cdd87696e887c3b567440afee8cb5e359b234d0c5e668cf9ab90622783fc82f68e3ec5f98
 EBUILD aflplusplus-4.21c.ebuild 2346 BLAKE2B 56a3e90c74122c9665cb3182c4c432bdc35081e1a23444434a6f7dc9b0a4ec2129526a4270173304f30e5bf7fc8317d26a4546d8e58312c84c0282a1b27ab4c5 SHA512 0a131c03eacdf848330e0811172bf27666b30080e7a33ceb0da82f2dbecc3925df6737845d2cbcf16448f03908fa4bcb75026e9f7746fb7f53b658b5b133b6fb
+EBUILD aflplusplus-4.30c.ebuild 2403 BLAKE2B 6f7fbef69198c13b4b29a474d9deeec384a6f62a9e0b31609c7c3b895b9b5de9caed9c24a31d1d080412df25966d807d529f72972af64ee7c4b5f8d6c2e9b217 SHA512 1cda94973666892b643687ee5e11288aa60704d909287a2eb9522686476db13e71347c3db243740cb9289d62f94ae52ad28e53d307bb68aac1a4c48286969ae5
 MISC metadata.xml 328 BLAKE2B c9ad582740e9c2ad03a30fe0eaafb8ee19f0d9bc2e98cc7bcd14385a3407f84301479d324b92d3aecafdc1e5cfef1d2cfc8a15c2ecb5d8f2fa348d82de920128 SHA512 e56ce158f6764926c2ed4dc486f017ce75fa272ac8e6ad16e4a816f8c734d7313e3dc9cb007bab07efe73e59cab185312a02d6178296bfe25002719ce4975d14
--- a/app-forensics/aflplusplus/aflplusplus-4.08c-r1.ebuild
+++ b/app-forensics/aflplusplus/aflplusplus-4.08c-r1.ebuild
@ -3,12 +3,11 @@

 EAPI=8

+LLVM_COMPAT=( {15..19} )
 PYTHON_COMPAT=( python3_{10..13} )
-LLVM_MAX_SLOT=17
-LLVM_MIN_SLOT=14
-inherit toolchain-funcs llvm optfeature python-single-r1
+inherit flag-o-matic toolchain-funcs llvm-r1 optfeature python-single-r1

-AFL_PATCHSET="${PN}-4.07c-patches"
+AFL_PATCHSET="${PN}-4.30c-patches"
 DESCRIPTION="Fork of AFL, the popular compile-time instrumentation fuzzer"
 HOMEPAGE="https://github.com/AFLplusplus/AFLplusplus"
 SRC_URI="https://github.com/AFLplusplus/AFLplusplus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
@ -17,7 +16,7 @@ S="${WORKDIR}"/AFLplusplus-${PV}

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

@ -25,20 +24,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 # This isn't compatible with sandbox
 RESTRICT="test"

-LLVM_DEPS="
-	<sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):=
-	|| (
-"
-# We go downwards as Portage prefers left-most in || ( .. )
-for ((i=${LLVM_MAX_SLOT}; i >= ${LLVM_MIN_SLOT}; i--)) ; do
-	LLVM_DEPS+=" sys-devel/clang:${i}"
-done
-LLVM_DEPS+=" )"
-unset i
-
 RDEPEND="
 	${PYTHON_DEPS}
-	${LLVM_DEPS}
+	$(llvm_gen_dep '
+		sys-devel/clang:${LLVM_SLOT}=
+		sys-devel/llvm:${LLVM_SLOT}=
+	')
 	!app-forensics/afl
 "
 DEPEND="
@ -56,13 +47,8 @@ PATCHES=(
 	"${WORKDIR}"/${AFL_PATCHSET}
 )

-llvm_check_deps() {
-	has_version -b "sys-devel/clang:${LLVM_SLOT}" && \
-		has_version -b "sys-devel/llvm:${LLVM_SLOT}"
-}
-
 pkg_setup() {
-	llvm_pkg_setup
+	llvm-r1_pkg_setup
 	python-single-r1_pkg_setup
 }

@ -81,7 +67,6 @@ mymake() {
 		CC="$(tc-getCC)" \
 		CXX="$(tc-getCXX)" \
 		CFLAGS_FLTO="" \
-		LLVM_CONFIG="$(get_llvm_prefix ${LLVM_MAX_SLOT})"/bin/llvm-config \
 		PREFIX="${EPREFIX}/usr" \
 		HELPER_PATH="${EPREFIX}/usr/$(get_libdir)/afl" \
 		DOC_PATH="${EPREFIX}/usr/share/doc/${PF}" \
@ -90,6 +75,9 @@ mymake() {
 }

 src_compile() {
+	# bug #945258
+	append-cflags -std=gnu17
+
 	mymake
 }

--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/byobu/Manifest
+++ b/app-misc/byobu/Manifest
@ -1,3 +1,3 @@
 DIST byobu_5.133.orig.tar.gz 761655 BLAKE2B 796cfe22ba60a8cfe41ca6570e4c7f265dd249e7767086341903da7862037f39b1f49434b6dae36d12d82df1ee34306b815ff3f8e703eeedab79cf02e8d86a7d SHA512 4c0ef7a3b483e48c57f3e97dae1c7c77084797016efb677b201f2b56c6b9f4b771739d9a6d9a4fb612203a22e9fa460db80fde30c837b102ad830b1b2919db6c
-EBUILD byobu-5.133.ebuild 1140 BLAKE2B 6b8ebdf57c36dfe39c54177e617800fd981261ae584d57c616e5fc34eb60824ae2a3bdec47f2985845d872194531829200dbeff490d7b9e9b5095c84ae617463 SHA512 3ea92b8d3efde63ab540d447f9828a567186d1fa63c8cbf809cf96ea088dfce201c1e19d9b5b943dd40d2fc9e47ef83cb152bd6b8bf1c10e726d2203c6c43b96
+EBUILD byobu-5.133.ebuild 1140 BLAKE2B 1100047857fb94b5abdc1c22b252cd1519f0195b92fab81407983a2cf9cc7731bffeed3fdd4b4a439e6d5ed831568dc44d574dc878c37b5de2a44e26d0608941 SHA512 e5bb0c61f25ac9a19ef81da29bc39fd6f45442a0f78c607a14bb8465ee4877a5779bc0bc76ad61363f9bdfcd6980b4c4fd640fde1d89398c489507851739357a
 MISC metadata.xml 1050 BLAKE2B ce56bf211e124b46a41139537b12ea67fbcad402c15765ba50004db5a0292f402a563607512e557592badf100f844fcded005d637844907c9d3ac805d82de751 SHA512 c7da9c8b2bdd67980c855cc51ee5b393b63257231b00da9b728085746abe54f61bd4b4eb4a61bc6c19435362de9e9c704bf78bbb8f5098fa2f5e2ff19738c590
--- a/app-misc/byobu/byobu-5.133.ebuild
+++ b/app-misc/byobu/byobu-5.133.ebuild
@ -3,7 +3,7 @@

 EAPI=8

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

 inherit python-single-r1

--- a/app-misc/ebusd/Manifest
+++ b/app-misc/ebusd/Manifest
@ -1,13 +1,8 @@
-AUX ebusd-23.3-cxxflags.patch 851 BLAKE2B f185992011ff7058d346e01580382ed0ba9e9c95ac6d01ae35a7c185cb0e58e74c9af65559098d0202f32b09326fcd1c613bba7d682e6fca744fb37dc6b36b3d SHA512 fcb8a7561784793529bea87545a39101107a9fbd4f3ac51f749a18259003daa1de11d21a37f503300de9fbb8136bfaa4de15ceaa67cfd09f5511962cb58574b4
-AUX ebusd-23.3-docs.patch 1246 BLAKE2B 36911064e6f6e8fbbec068ae392f9e5902f6aaac9c9d1a63231df1caa7f1b0b444f895ca8e59a65486c8ff76922677df31605ab3368560ddaa5d49bb261b9732 SHA512 1dcafaf09a840a4843a476351e2e0902baf2aaa05812f8453960cd7e67176971aac76906ce35037a2a22ca5901d0d74c2df08785b771d3edffb0b157959c8f1c
-AUX ebusd-23.3-gcc13.patch 1678 BLAKE2B 6eaff01ff919c9b8db4f522fcc9ad226648cf18f19aa1ee230709f8aa9744c51ddb03f1c3171cdca5aec4b321058056b853b2ec269df88bc9b5f430a51afa8c0 SHA512 b7ed196c2543fe55ac926283f51061e184ceb57a21be02aac589b9beaf20372a8341b7cb237cca788d5ee6179459107e1732d1f26382f7cf18baee9438c4246b
 AUX ebusd-23.3-gentoo.patch 1048 BLAKE2B eb46d46aa473fc36b3e7e7ec7b61131659f1c99f53fc5511a15baf91a4a7ac4f1686c4a1e88abaa832c4ab8bffd029457284d4fdf64a843f08b19a8f065a9636 SHA512 f242ddbbe06e14ae88072331a17776a78110d0b74bb21b74e1b21c51ec5c6325687d86cba8e1e7e7dc2961b08fbc98dc8f640bb84a77020ebe48506d93616c0b
 AUX ebusd-23.3-htmlpath.patch 1006 BLAKE2B fdbc318454ee743eb2343caa0f16cf21f868ac60a634c2e8acc5dd4a3a4aa9eae0c04d11b803cca6987306412f2807f31a3032cc5db45fe3e6de0b4f89d92a39 SHA512 eaf5f423ee04e3d58f6d927c7b7d6316ac93594b0ff2dbb7ab17406a1c10d1b8ac07e582692c983fe4c360c65d57bf67d5f095d3e8f32df7ae1a764b3dff1086
 AUX ebusd.confd 193 BLAKE2B a5560507305e5afecc9b127ede67592ff7d3a1751ba27f3a3c43664fe30f2e7946b0bfa059b918865ee4244d2a89f3d7c5e0227f177a48dca98bff1666bd9c6d SHA512 ed2d38d4b3ff39fd5954dc7ac4d5e724c80b26f6c85a48b6a2ddbdea029f01b5e6b19909c7925e5ec879453204e28e40917c15b07e798bbc60950467314cd8f3
 AUX ebusd.initd-r1 552 BLAKE2B 8f40a1d684ddd054153a6b0562d06896253a407eb9497c6080f0e51c6fc5e01a3fe1529cf5568085107191893ad539a2dc21da7a71bbe6fd2e319b62da6af656 SHA512 4b29fca333c5f3bcc676c6a0e9b9a7c0c309b81bbed55b4d863a86b11ef59e051679919393efb8c396b3f2124e772aae9005f7f12642037301e1907f118eee1a
 AUX ebusd.service-r1 175 BLAKE2B b6b1ba670dc27a525fbbb4ce8d74c10cfd9e093da2602ca41afbc54f8a89ff8ff8c2c0cf6671edc2a0fed9a3b2cccebfee74209b415f75792bd02c29d0815315 SHA512 9ccbadf5b15c4b85921db7780e0b99e352c1020d5bc457f6290d7c6d6fb1371bd92ffbbbdef3c32fad89b751a4d4baae5f8582dd3405f4deb74fc716b6a3351a
-DIST ebusd-23.3.tar.gz 583788 BLAKE2B c61bf76e0c451672432689aeaf10b317adb52729ea0872cb01dca22e1f7ac12091d287dd082b87361ce37846b1d74c869588964f3dc71e82ffd00c4555e27150 SHA512 acf155d36e99db1c9c2ff04eabbfddba8493f2566b6691f609c86af0e42e3cb0594618fd51e874e475cfc7b9c742d1e010099f38e19c21f52c953ebcfb0f2ea2
 DIST ebusd-24.1.tar.gz 595318 BLAKE2B 40bbedf1af983c8bbb123b8774b013d02e8f49d653e729d5b6bf78cda50d70ff5b09bfe5993714cf311d5b90777bf6e6616557cef881120b0cad56fc7a5ac0e9 SHA512 a4ab5e21f345894c29b7af84f46f93ac4a3ee658d69ca7fb002d52233e8c041043df328212cbeae4f01220e7a6bf4ec8a26ad3757eb0cf6da157d237f5b6b0b6
-EBUILD ebusd-23.3-r2.ebuild 1914 BLAKE2B 882eb1aa123b5f2f2456b772ef8fb3721f93c229d2cb35bb778ad1b02276c13d6570bbc5523a5433bd5371a78e329e130304a833c4757371f9a3efcfa18b06d2 SHA512 43787903a02ef021442f53957b4b9febbdca91797429287e312d0c69a7e19253bacf159e2c59469303a8a820472da32cda185c5aff113c7678a64b033d0191dd
-EBUILD ebusd-24.1.ebuild 1808 BLAKE2B c11c32db6c521eefd253babed801916648bbc1f97dfd971f3da6ab8d1a6db2648911c555ebe9102e3dcf1c2f5b29580f75a267089cc76bb1043c2206f9c8837a SHA512 4b64a36ecc0a954f8576e4f06e00d4217c09f62ea22316dce6752eef4e9acbab79bbf47f1da248f47dc16802893668b847914cfb01bfb4a38dcd901c73803128
+EBUILD ebusd-24.1.ebuild 1806 BLAKE2B b7149fcfad79b9cf4c6ff50e1bdff697f59ffa6200b930f1e20e8cae8e8fab19ea2489aa7365f9f2ee5aeffdcc9d2b162dabdc3f936a2589817b8c4f160106a6 SHA512 efb16fcaac9585bea440a8f0d9da09b0efbe3efd945e6b09d48f873c676257c37397430e6fcd625dc070a8167da659ccda8a7e7b72497d9e121297a32ef76865
 MISC metadata.xml 815 BLAKE2B d6c87cb6506a61d1b502ab233fcb9cb878e4e315d1cd2a09ecf36121de19a06d9aee77925b19d6fc24ed274ac220c22a011dec01704f61676583697647506417 SHA512 cdcbc39babc7f6dd6a5f3f1ca713a54b44e80cf0a57eb9bdb4f6989c7425fe30eee73dd8e893f7d82e681e32e03a4089e94630ebe77686c6a0bb056e6c92c7a4
--- a/app-misc/ebusd/ebusd-23.3-r2.ebuild
+++ b/app-misc/ebusd/ebusd-23.3-r2.ebuild
@ -1,100 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools systemd
-
-DESCRIPTION="Daemon for communication with eBUS heating systems"
-HOMEPAGE="
-	https://ebusd.de
-	https://github.com/john30/ebusd
-"
-SRC_URI="https://github.com/john30/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+contrib doc knx mqtt +ssl test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/openssl:0=
-	mqtt? ( app-misc/mosquitto )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	doc? (
-		app-text/doxygen
-		media-gfx/graphviz
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-23.3-cxxflags.patch"
-	"${FILESDIR}/${PN}-23.3-docs.patch"
-	"${FILESDIR}/${PN}-23.3-gcc13.patch"
-	"${FILESDIR}/${PN}-23.3-gentoo.patch"
-	"${FILESDIR}/${PN}-23.3-htmlpath.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# KNXd is currently not packaged in Gentoo
-	local myeconfargs=(
-		$(use_with contrib)
-		$(use_with doc docs)
-		$(use_with knx)
-		$(use_with mqtt)
-		$(use_with ssl)
-
-		--localstatedir="${EPREFIX}/var"
-		--without-knxd
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use test; then
-		pushd src/lib/ebus/test || die
-			emake
-		popd || die
-
-		if use contrib; then
-			pushd src/lib/ebus/contrib/test || die
-				emake
-			popd || die
-		fi
-	fi
-}
-
-src_test() {
-	pushd src/lib/ebus/test || die
-		./test_filereader >/dev/null && \
-		./test_data >/dev/null && \
-		./test_message >/dev/null && \
-		./test_symbol >/dev/null && \
-		einfo "standard: OK!" || die
-	popd || die
-
-	if use contrib; then
-		pushd src/lib/ebus/contrib/test || die
-			./test_contrib >/dev/null && einfo "contrib: OK!" || die
-		popd || die
-	fi
-}
-
-src_install() {
-	default
-	use doc && dodoc -r docs/html
-	newinitd "${FILESDIR}"/ebusd.initd-r1 ebusd
-	newconfd "${FILESDIR}"/ebusd.confd ebusd
-	systemd_newunit "${FILESDIR}"/ebusd.service-r1 ebusd.service
-}
--- a/app-misc/ebusd/ebusd-24.1.ebuild
+++ b/app-misc/ebusd/ebusd-24.1.ebuild
@ -14,7 +14,7 @@ SRC_URI="https://github.com/john30/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.

 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+contrib doc knx mqtt +ssl test"
 RESTRICT="!test? ( test )"

--- a/app-misc/ebusd/files/ebusd-23.3-cxxflags.patch
+++ b/app-misc/ebusd/files/ebusd-23.3-cxxflags.patch
@ -1,28 +0,0 @@
-From 6c2d102544f45856fb14484a3fc763822ff03376 Mon Sep 17 00:00:00 2001
-From: Conrad Kostecki <conikost@gentoo.org>
-Date: Sat, 13 Jan 2024 21:33:28 +0100
-Subject: [PATCH] configure.ac: quote CXXFLAGS
-
-CXXCLAGS needs to be quote, as otherwise the test could fail on some
-CXXFLAGS like '-mfpmath=sse,387'
-
-test: syntax error: `-mfpmath=sse,387' unexpected
-
-Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
---
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 90368e04..0469eb20 100755
--- a/configure.ac
-+++ b/configure.ac
-@@ -8,7 +8,7 @@ AC_CONFIG_AUX_DIR([build])
- AC_CONFIG_MACRO_DIR([m4])
- AC_GNU_SOURCE
- 
-if test -z $CXXFLAGS; then
-+if test -z "${CXXFLAGS}"; then
- 	CXXFLAGS="-fpic -Wall -Wno-unused-function -Wextra -g -O2"
- fi
- AC_PROG_CXX([g++-6 g++-5 g++-4.9 g++-4.8 g++])
--- a/app-misc/ebusd/files/ebusd-23.3-docs.patch
+++ b/app-misc/ebusd/files/ebusd-23.3-docs.patch
@ -1,27 +0,0 @@
--- a/configure.ac
-+++ b/configure.ac
-@@ -47,6 +47,13 @@
- if test "x$with_contrib" != "xno"; then
- 	AC_DEFINE_UNQUOTED(HAVE_CONTRIB, [1], [Defined if contributed sources are enabled.])
- fi
-+AC_ARG_WITH(docs, AS_HELP_STRING([--without-docs], [disable generation of docs]), [], [with_docs=yes])
-+if test "x$with_docs" != "xno"; then
-+	AC_CHECK_PROGS([HAVE_DOXYGEN], [doxygen], [])
-+	if test -z "$HAVE_DOXYGEN"; then
-+        	AC_MSG_WARN([Doxygen not found - continuing without Doxygen support.])
-+	fi
-+fi
- AC_ARG_WITH(ebusfeed, AS_HELP_STRING([--with-ebusfeed], [enable inclusion of ebusfeed tool]), [with_ebusfeed=yes], [])
- AM_CONDITIONAL([WITH_EBUSFEED], [test "x$with_ebusfeed" == "xyes"])
- AC_ARG_WITH(mqtt, AS_HELP_STRING([--without-mqtt], [disable support for MQTT handling]), [], [with_mqtt=yes])
-@@ -156,10 +163,6 @@
- else
- 	AC_DEFINE(REVISION, "[m4_esyscmd_s([git describe --always 2>/dev/null || (date +p%Y%m%d)])]", [The revision of the package.])
- fi
-AC_CHECK_PROGS([HAVE_DOXYGEN], [doxygen], [])
-if test -z "$HAVE_DOXYGEN"; then
-	AC_MSG_WARN([Doxygen not found - continuing without Doxygen support.])
-fi
- 
- AM_CONDITIONAL([HAVE_DOXYGEN], [test -n "$HAVE_DOXYGEN"])
- AM_COND_IF([HAVE_DOXYGEN], [AC_CONFIG_FILES([docs/Doxyfile])])
--- a/app-misc/ebusd/files/ebusd-23.3-gcc13.patch
+++ b/app-misc/ebusd/files/ebusd-23.3-gcc13.patch
@ -1,60 +0,0 @@
-From 3384f3780087bd6b94d46bf18cdad18201ad516c Mon Sep 17 00:00:00 2001
-From: John <ebusd@ebusd.eu>
-Date: Sat, 30 Dec 2023 17:38:19 +0100
-Subject: [PATCH] add missed includes as reported by gcc13
-
---
- src/ebusd/mqttclient.h           | 1 +
- src/ebusd/mqttclient_mosquitto.h | 1 +
- src/lib/ebus/device.h            | 1 +
- src/lib/ebus/transport.h         | 1 +
- 4 files changed, 4 insertions(+)
-
-diff --git a/src/ebusd/mqttclient.h b/src/ebusd/mqttclient.h
-index 5309d31a..965647ba 100755
--- a/src/ebusd/mqttclient.h
-+++ b/src/ebusd/mqttclient.h
-@@ -19,6 +19,7 @@
- #ifndef EBUSD_MQTTCLIENT_H_
- #define EBUSD_MQTTCLIENT_H_
- 
-+#include <cstdint>
- #include <list>
- #include <map>
- #include <string>
-diff --git a/src/ebusd/mqttclient_mosquitto.h b/src/ebusd/mqttclient_mosquitto.h
-index d749b60b..e08ca5eb 100755
--- a/src/ebusd/mqttclient_mosquitto.h
-+++ b/src/ebusd/mqttclient_mosquitto.h
-@@ -21,6 +21,7 @@
- 
- #include "ebusd/mqttclient.h"
- #include <mosquitto.h>
-+#include <ctime>
- #include <list>
- #include <map>
- #include <string>
-diff --git a/src/lib/ebus/device.h b/src/lib/ebus/device.h
-index d4224017..8da116a7 100755
--- a/src/lib/ebus/device.h
-+++ b/src/lib/ebus/device.h
-@@ -19,6 +19,7 @@
- #ifndef LIB_EBUS_DEVICE_H_
- #define LIB_EBUS_DEVICE_H_
- 
-+#include <cstdint>
- #include <string>
- #include "lib/ebus/result.h"
- #include "lib/ebus/transport.h"
-diff --git a/src/lib/ebus/transport.h b/src/lib/ebus/transport.h
-index ec4c2319..ba3a8324 100755
--- a/src/lib/ebus/transport.h
-+++ b/src/lib/ebus/transport.h
-@@ -21,6 +21,7 @@
- 
- #include <unistd.h>
- #include <termios.h>
-+#include <cstdint>
- #include <string>
- #include "lib/ebus/result.h"
- #include "lib/ebus/symbol.h"
--- a/app-misc/qtxdg-tools/Manifest
+++ b/app-misc/qtxdg-tools/Manifest
@ -1,9 +1,5 @@
-DIST qtxdg-tools-3.11.0.tar.xz 16716 BLAKE2B ef6b88e69b0b4e8896ba37f7b5f663234a5348759d430600396432f4abb52901001c54ec78bd706efa021b51d9ff514457ff8e123d5142a6562cd380dd5a15ee SHA512 da88f36130b7c23d1553bce252ddc783ae30ba91cd55fba065702376f6cc9c0353c0ad4bb099ed1b65964bd9d476ae431bfde46df110bccec832d3f57cbaa7f3
-DIST qtxdg-tools-3.12.0.tar.xz 16740 BLAKE2B 3e716c85d1715b23001d32a301995d77351f6f95ceaa80a0fa6c1ac1713029b8df97324ac550032fe88315b0fc89adc72b705b1580923f5838c48384222f48a4 SHA512 a9b2f76bd732da4c13b6d4c5716be57a67c3197fad214d04d324d3f39500726754deb0fdde42fb2b5f04407932b3ea63a5dfb5e9588144ea801572efa59aecb5
 DIST qtxdg-tools-4.0.0.tar.xz 16760 BLAKE2B 8e85e4de4c3cdf100de294582cfa9f4d3d0b120bee0ff7a907a308a95d45a1db4a9846899373e13a63e1b8049690e34439ce91d34b6b2964f972c3a5a91641ec SHA512 0d3e3a4afa5a4a0a63b4e9c489b4b20688b5c6c79f6460d9d15dc519bdb911b14f4307e50cd236c20ab939c517eed2ba284295d4f05deb764facda4acad8f4d8
 DIST qtxdg-tools-4.1.0.tar.xz 16796 BLAKE2B cf5fc3c84365168924d894a1a52a3be77a0ed2697ef61ff511dfcbf498406737c8272c2d56d4e0774240375fe04715da9706fa1b5052cd654d9ddbfe9eb54851 SHA512 0293293d66760199c79634eeac7483640b6ba683d440d3d8bd738be2638a8b3a6f22007d65fc763141803d0ce3684dc8d535a6701eb3122bb03a74a6ae79fcd3
-EBUILD qtxdg-tools-3.11.0.ebuild 600 BLAKE2B 8a66a2f000e598909459f5756926bd4d113fb2849c6498607e9576d2af102639d1c45d526090c9612bbc3730d8424f6c32f0cd15cf86c49a4ff23a081a1f17f7 SHA512 de016014c38a326121630d1ac16db6a0a0cc2792cb3d353218a3ccd8caa88bf04ee505f89c0cdc20c0ea73678c3b0d320d1e0d9d7d79c6d9366dd60f9cd74bef
-EBUILD qtxdg-tools-3.12.0.ebuild 600 BLAKE2B d37c3a832ae5016fb5f505771d217c51e715aa674c7c5d9fb5fbad7c9b6134f485bc7940aac47d6e1dcf6881de8ed85ca21f4b05e87275603833d59fa6aaa754 SHA512 af91707372394a4fb1b21fdb600ec13395e5d15d569b71e96dac18a61e536cc326eb52de3cffda05a7688e004697aed4c9c58f68f7da115a4bcf12f0aa2afd61
 EBUILD qtxdg-tools-4.0.0.ebuild 585 BLAKE2B 8337833785f739cc0fcad89255829d394b198e7eafcafaa06b5dc67cc8e8809f1ef3fb60b3f1097244078f90cff0caf2f995b4582a361d1f6af66a73e082410a SHA512 1c63875aaa287d8c90ba94c3ba9e531b7d3e5a4aef701c72092ee48479b56428c5ceed4bb1069ce8389f43c9036d39bd65a6e1c4f7a2a91234c8569248755f77
 EBUILD qtxdg-tools-4.1.0.ebuild 587 BLAKE2B f4536231134ce121ba646c1aeeb30d00534c0a3835e3a905cba6c9c00f3c2913805ccce462898a28d20f9c99a3f29cb81c7af3f4850c7b14b9ca7f86e225c95c SHA512 611f30ee852ac413c086530e71316a37837cd2e330d64fb1cdd5668f3d65a1a795bf527a6df54f3744a6628d0c42d4d838d8e8802d7e6bb2f9e0332ac6c03bcd
 MISC metadata.xml 318 BLAKE2B 0cfa3589deb6a2af8f05101ae300035d66d7bd7d0523f3196e005c82c1e0bea15d09feb3b44a2c1db94efccf15f13552e05cf1d38c6fbd7b359f75bea573adbf SHA512 321b105744b1138f2d444235800fa9680c11a92e4e22efccd994c9d103365e2ae449f39ac64f213dce2e895e9b8bcd94c311d1e90a4c00e1f4071a0cd8a68c54
--- a/app-misc/qtxdg-tools/qtxdg-tools-3.11.0.ebuild
+++ b/app-misc/qtxdg-tools/qtxdg-tools-3.11.0.ebuild
@ -1,27 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="User Tools from libqtxdg"
-HOMEPAGE="https://lxqt-project.org/"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
-	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-BDEPEND=">=dev-util/lxqt-build-tools-0.13.0"
-RDEPEND="
-	>=dev-libs/libqtxdg-3.11.0
-	>=dev-qt/qtcore-5.15:5
-"
-DEPEND="${RDEPEND}"
--- a/app-misc/qtxdg-tools/qtxdg-tools-3.12.0.ebuild
+++ b/app-misc/qtxdg-tools/qtxdg-tools-3.12.0.ebuild
@ -1,27 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="User Tools from libqtxdg"
-HOMEPAGE="https://lxqt-project.org/"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
-	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-BDEPEND=">=dev-util/lxqt-build-tools-0.13.0"
-RDEPEND="
-	>=dev-libs/libqtxdg-3.12.0
-	>=dev-qt/qtcore-5.15:5
-"
-DEPEND="${RDEPEND}"
--- a/app-misc/screenfetch/Manifest
+++ b/app-misc/screenfetch/Manifest
@ -1,5 +1,5 @@
 DIST screenfetch-3.9.1.tar.gz 77350 BLAKE2B 10852e63c9ad615cea9a5e53374f16e2f3ac40074bc247c144c91b5e96e0040c6b6623d2a79300e859cef0d8eeb2e935aad585c73d668676dda388d5af6693b3 SHA512 e186901480dcad57b765052b1b156b7706a196ce0e08b6b88264912a5d2a1250e5014923312353a82ccabd8129d4d2421891f13fd34f0ed76c50ce9633207df0
+DIST screenfetch-3.9.9.tar.gz 80102 BLAKE2B 1bffd9d3de015ecc99cac66d1ea470a7fe9ec0030589b3f0f6378a65edccad016b27ceb89a5934dd85f143778c4b40fadce7eb0f9e7a8c25e50b8fa4ba060014 SHA512 f5df01fab9fb075e709cf12a3fd03b771bb9dcaad7fb5b0a76c464f450f8b016768a91f308bbf36cc8b3cea69e5e5d0a7792d7c4abf7cbe75120d4f5ad4d8874
 EBUILD screenfetch-3.9.1-r1.ebuild 795 BLAKE2B 495ffe0c7b8e918d4a3cf10e1aa796209eb397503d2f35da179306bafaafca2618f803b4512f8982cddaaf6292c5132a10a07de91c92815d640e2919f1278559 SHA512 2b5d92f5a19e1b6af867f32eefa28b43cb4ec2c21c33b73fc5750ca27d47e0d7fea524e2684fe1858f7eebe378c27adca44fa1af0e537e4c8195d146d228a083
-EBUILD screenfetch-3.9.1.ebuild 699 BLAKE2B f70b0de1eb3d79064a25e74315b1e9bea733c310d6c236c26b345f5ca460cfedef4cf85a854247e1fdb47918be5ed1fbdec82f6a0468d926dd516dd78fafdfad SHA512 4e1729290cc836d02578db0b6b2065cbdae13f2a55f14febf512aa12a064f6818c63cc8b25b91d9b0b4f24e2c431b16947ba229cafeb74d5865259402e8f5980
-EBUILD screenfetch-9999.ebuild 790 BLAKE2B 4ead16cac14ab1c3998bcc556dac3861cf047220a33891b8db30f3e3ed5345cbc597a562955b667543a108725569fa9511ebacb0eba8f67353f734cc7c4b3d0f SHA512 11d8dccf923b1259576bfccfc9b725272710e20f990a7e7b9999f8fd127db27010a81978e495e63b31b892be99fb0f8d5fe23ec1baa3a0bcf0f134f18d662738
-MISC metadata.xml 356 BLAKE2B 507d3741adeb24052dad3fee30f0d9870d18e79d0478588312599385718f344d64b88635b49f940474049baf98aea747a0bff36de37b39fe6624af6663840997 SHA512 a1255f0813e8142a9226af6313b5e021f5d729ab2a0a623140f5f9421e84a824fbde86424744d40f2e9f2150441483eb810242d220679f2a5beef6e8690fc000
+EBUILD screenfetch-3.9.9.ebuild 656 BLAKE2B 35453cc9f002823fd38639c5f03794d6e8c457ede86b6aa1ceba1ba5a6d6e1775a9edf8860a888d34d290b25bab8301e2a06b93445ef0b85fdcebca07c15e267 SHA512 54ca9bd0225668a8a3e5f9bcc010425b0d9477a5528f75becfa1bc17e6337853708548c3fba1fc2772f8ea058f7692efc57ddfaf5d165cf1c3e2fc5ac4e45976
+MISC metadata.xml 254 BLAKE2B f885213df981fb63218785a7ad3ac03e778609ea7fe18a69384ba687b466bd78acac4eb3f9adef83379217cdf00780a80327fdf04d50b1efea4ddeecfb4ca34a SHA512 f31316c3342ab306cef23c51cd15ff1e05a4cbb399381ef1f9df3e9a7bc87752b6084604345b89e5c7cc5e54f1a7e2bdf16977b040c4b6e72324c757f252834d
--- a/app-misc/screenfetch/metadata.xml
+++ b/app-misc/screenfetch/metadata.xml
@ -2,9 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<use>
-		<flag name="X">Use the <pkg>media-gfx/scrot</pkg> package to take screenshots</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">KittyKatt/screenFetch</remote-id>
 	</upstream>
--- a/app-misc/screenfetch/screenfetch-3.9.1.ebuild
+++ b/app-misc/screenfetch/screenfetch-3.9.1.ebuild
@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="${PN/f/F}"
-
-DESCRIPTION="Bash Screenshot Information Tool"
-HOMEPAGE="https://github.com/KittyKatt/screenFetch"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/KittyKatt/screenFetch.git"
-	inherit git-r3
-else
-	KEYWORDS="amd64 ~arm x86 ~x64-macos"
-	SRC_URI="https://github.com/KittyKatt/screenFetch/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${MY_PN}-${PV}"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="curl X"
-
-DEPEND=""
-RDEPEND="
-	curl? ( net-misc/curl )
-	X? (
-		media-gfx/scrot
-		x11-apps/xdpyinfo
-	)"
-
-src_install() {
-	newbin ${PN}-dev ${PN}
-	einstalldocs
-}
--- a/app-misc/screenfetch/screenfetch-3.9.9.ebuild
+++ b/app-misc/screenfetch/screenfetch-3.9.9.ebuild
@ -1,26 +1,18 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=7
+EAPI=8

 inherit optfeature

-MY_PN="${PN/f/F}"
-
 DESCRIPTION="Bash Screenshot Information Tool"
 HOMEPAGE="https://github.com/KittyKatt/screenFetch"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/KittyKatt/screenFetch.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~arm ~loong ~x86 ~x64-macos"
-	SRC_URI="https://github.com/KittyKatt/screenFetch/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${MY_PN}-${PV}"
-fi
+SRC_URI="https://github.com/KittyKatt/screenFetch/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S=${WORKDIR}/${PN/f/F}-${PV}

 LICENSE="GPL-3+"
 SLOT="0"
+KEYWORDS="~amd64 ~arm ~loong ~riscv ~x86 ~x64-macos"

 src_install() {
 	newbin ${PN}-dev ${PN}
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@ -1,4 +1,5 @@
 DIST eix-0.36.7.tar.xz 639832 BLAKE2B 37202ae78378688ede95b410fe2e6325d63a9553dc082e4e09dc5bcd261f4e7bf49f349a92c286743c30a54cdc5bc1733fedebae33c37d601e6f5db1faf499e7 SHA512 5f5d059b502633be22c8a18fca410e2319061989bbc65b23592c87a9a109b93e615a5b5a7ca92a500999e3cc791e331b12e32a10700cc104040b1980f7f7a0f9
+DIST eix-0.36.9.tar.xz 642764 BLAKE2B 08f3a76283e540d57d667123f3787a57f08d746b5e8d9c24d541c72dd3c3b225cbfe9130764b5b6457735907b05ba37d415a807cbe37986fa78a366632ecf934 SHA512 7d9a1f7513678a64103e38340e456168d1530edb1fbb2c3379362f79f74737d2fac03340801c67cf186505c2d569e1337cedfe186b22f5ad546ac9bcc542d32c
 EBUILD eix-0.36.7-r1.ebuild 2529 BLAKE2B 6e2b60686d17411e16bbc233962e3250398224ed69d0703051c64774cd29ea4071ef3e4404ce5b3a36ae85d566de13fb9da83bf4cf6aa1242299ffdef170144b SHA512 42c966d17db3e9bfcf4c9c65b6a4b7c151d6368cf08f9ca08971472c6a1230c494a6b9cac1f451b0770ed1c8ee05b78e2ccb5f35e4b7a5a96be9c83fe8cad706
-EBUILD eix-0.36.7-r2.ebuild 2610 BLAKE2B 4b5c6536aaaa22d71e15d33410b58dd99abde7595fe63db3ccc5f87308b1936c47855909dcf7eac871ac39e81c858547e33aa48fb7d49d121e9ea73411e9b27d SHA512 c9cf134accb921173b5d9baa4e8609bab44c7d1c709d66ef61a16ed3cf1b73011ea2132237dc5e44841ce0e27e71782364710b4d93fbb1664a1b9dc53b5f4eed
+EBUILD eix-0.36.9.ebuild 2610 BLAKE2B 4b5c6536aaaa22d71e15d33410b58dd99abde7595fe63db3ccc5f87308b1936c47855909dcf7eac871ac39e81c858547e33aa48fb7d49d121e9ea73411e9b27d SHA512 c9cf134accb921173b5d9baa4e8609bab44c7d1c709d66ef61a16ed3cf1b73011ea2132237dc5e44841ce0e27e71782364710b4d93fbb1664a1b9dc53b5f4eed
 MISC metadata.xml 952 BLAKE2B ef76318a2bef5560870b4c4e48ca3122ccf67f5951f8cd4a5423b6a667a39311c9725aa99a115d18e0035106f4ebc2d2679987feea91c477d5f19d6244f885cd SHA512 823873a3a87bf0ff3cbb8ab6bd2eebdf45b1f5541aa13cd4a1411def808e03b5c961050a6fc10fa5210694fac9736e0acb4917df75e7d238391dffdbb2094cd9
--- a/app-portage/eix/eix-0.36.7-r2.ebuild
+++ b/app-portage/eix/eix-0.36.7-r2.ebuild
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
--- a/app-shells/autojump/Manifest
+++ b/app-shells/autojump/Manifest
@ -1,4 +1,4 @@
 AUX 22.5.3-Use-mock-from-unittest.patch 689 BLAKE2B b0d518d66efb7511b8bbd8d31f5ce00c7561e90e259289a4dff051665c19bc9f3537cb04ed77e89d18c9b3fd6edcb6e0b912f0b9dfc9db1fc491b11a21957828 SHA512 a15cf9369527535dd475db53aa014108af2fe6cc72b04b166589c2c9d7464dd2eb999998aa8d55fc306bd6432b3926dc11caf00009b7b45562221957dc748dcd
 DIST autojump-22.5.3.tar.gz 55429 BLAKE2B 3a2773669f81d1a54c01cce9fe75bc01609265998b035b4ba1aa064f1132acf852b59eb04ebfa744e628152f0ab478cbef24e5aff326bf84cec6e2c9348e8360 SHA512 d1dd3cbb67fda4e0a17ec5028b947faf46be8a95a6cd8418127b927f42bc95b71538a06658b38b479c77d147a6cd5e8cef77639ef538c7d449414c469c13f140
-EBUILD autojump-22.5.3-r3.ebuild 2041 BLAKE2B 89f0371ff77ca84b34adf43795861aebcba23de3a719b1b9edf2a9fdc0e290913d1a64cc6ef1ea2d599467791b5426060c54ff67b4305f39282ae1d1d881537a SHA512 eae0500c4fb88eda810c5eb4f3b72b91ffff20babaf9723e9eceb1d6fb50241bd0b18311f63469b4bcabd2b1f5ba7615818b79cae93c7f88e058013863e6605c
+EBUILD autojump-22.5.3-r3.ebuild 2041 BLAKE2B 173c4b3c3c2934932f16aa916256fbd8433fcea8a9287bcc1f749e900c6ec6419053a2c4888247fa34ea98ddf5e439ea48da098127d5926d3ee3e333f0b24ee3 SHA512 847b4a5a7f6941b698589d44203ebff25688209923acf32a8636c7ec9ba4c776a51cb381263ded481176cf1f6ebad1762ab2035d0ab70b0b05dc6fde65863072
 MISC metadata.xml 491 BLAKE2B 775beb745c9218ed955dca11149ccb5b17c3efacc8f916ca15a65f67632e01feac271d5a36c39316de8024f352427b658cf35e54f5d03682d681920b730af4bb SHA512 d26e3c132c90c94bae47c1f7a4af71eaf873a12546d429632736885c515764aa612fb8155003643678d2156b42e94a692b0e3174d2b4825b559426c29eaa863c
--- a/app-shells/autojump/autojump-22.5.3-r3.ebuild
+++ b/app-shells/autojump/autojump-22.5.3-r3.ebuild
@ -4,7 +4,7 @@
 EAPI=8

 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 DISTUTILS_SINGLE_IMPL=1

 inherit distutils-r1 vcs-snapshot prefix
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@ -1,7 +1,9 @@
 AUX bash-completion-2.14.0-optimize-kernel-modules.patch 493 BLAKE2B cdc4ddab98922d1282380953ee5fb3b8d81415cd6e799e28f24d3298e86ebc3958a4afebf3ae4c603547bb1b0f06baa8d51ecd64dbbcf5f909630ff94b4c50c5 SHA512 a8a95045b1046538f242515d50c5c625b809b69da6e8e600a33e671408f452b42d69d64e7831c29a2f743c88826f51c29054ba9712b7b13cdeb18c960fa0c397
 DIST bash-completion-2.14.0.tar.xz 428980 BLAKE2B c28ec0cd348a3954461f7a865823a358e47c4b479c7812baa6d54aef856c958510967806550e62784955f9daf233a0b01edade19884e534df857472a3196e63e SHA512 2e12d2e57c932b931a6cfe59234f9d33d715538d6ea4eb72ed4ed3d8d2cf2cedaf08fcb6abaf3117e06115d892283e38a07b3abe5c91c026d2c06a0f64e347bd
+DIST bash-completion-2.15.0.tar.xz 457836 BLAKE2B d2234cb2baf8494d2159e8abe6780e0879efb6fe9e851c0d51ebf09363c83652ef610658e2beca181adc0d6c844472a68a219be8b3ca51271fdfc53477f174ba SHA512 3b7e98801c3ceab7853c0603bdaa0cd6f0a658e0f7f24b092f341bd1794633b62d33e664035b6ab3c03b5a3dd941b16f87a415aade8a2707578c59cc48b1a9f7
 DIST bashcomp-2.0.3.tar.gz 3539 BLAKE2B 75304d144792cc7f6ad5455a05a65c33c646d6f7384d020a06a1fcf012cd51625a3dd0750ad539253453b1eede196c340286a1e81737f0835b5091609ba01295 SHA512 b2bd185ccbd4456939ccc731cc1983fcec2b9564a9920642a753fadd5d897fdb96b925ac1524657629d621d45b37d99076c8ae72511a827e96ff6c388d720008
 EBUILD bash-completion-2.14.0-r1.ebuild 5103 BLAKE2B e0bceea2ff6cdf72f3549974aab60aab736cf433de74650f330a30ee5a5647e8b856b6b05582baa61c82d8fbe27c0963caa6756a230f6977ad70d2ef1dcca9b4 SHA512 89ca2f0c2903dbf16640af394fb17faeef33e2f07a3c4af412a7e5ccdf26e2826e3dabe683b26e32673312c7773df1bff2f98f59ec36593f80fc674c09a6143f
 EBUILD bash-completion-2.14.0.ebuild 4807 BLAKE2B e1594f534ff65922f13ad3a95c1476fc54ab96cde7f2550c3d2136cc3694591e54d6b57c493c531ecf2a0f83efcbb29698c758f7ff44039f0bfb95244b1cab9e SHA512 a3d0201c0b48f92b500f9ef4b6b1ddf8f8d4212c668bf3a08039ff64a9f9bb0e39467f61cdb79e6268271e6b8ea19565483ed0e745fc55cc6fa0c3682753a465
+EBUILD bash-completion-2.15.0.ebuild 5112 BLAKE2B 19bf2b716c81ec5cd7300feab0d561688561a4bcdeec88f186d321e947143bbfa28c2c89fd3465155974e2f5e0ac0a601d87a880b872cab0f2b0556522c51a07 SHA512 669218ed61ba2e71d3020f915e72d9f1f85724080648d74bf179d3e2b8a76f016597aba3e5da5bd8ba92ec742fd593b2a1bf7c60d6f9b753180efd5ea5a3eabf
 EBUILD bash-completion-9999.ebuild 4608 BLAKE2B fe5c0aeff60122ab244b90c6528ac64953f53549377c4d92b1dd54e46ddb9850bde316621d2c39aa471946272741aecf99a2fb17e7886833f419d659027b6a88 SHA512 1fa98733a40adc30569f32dfd7ac90de1b4836967f378b4c4b8a1e24365e7d114367ed79a7e409868da1f4760ec12fc1fa75f2544bddd117eec9fd233f73d072
 MISC metadata.xml 1436 BLAKE2B a01cee2abf1c4bc38ed6fe464f3daf43f8cf441a2a70f74b20bad79e37183a311326a863680d6939f18f8adebb9976861de897df272ab3cc7448cafbcb87f4b3 SHA512 f1b1af3f696ed159b8e1f728b51d651ac66ff849ee3bb37d949bc09e3be47698ea052ed48826edf4341d87835b3b54482153ca4fa3c299a5602eaec5f0cd780b
--- a/app-shells/bash-completion/bash-completion-2.15.0.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.15.0.ebuild
@ -0,0 +1,183 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+BASHCOMP_P=bashcomp-2.0.3
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit python-any-r1
+
+DESCRIPTION="Programmable Completion for bash"
+HOMEPAGE="https://github.com/scop/bash-completion"
+SRC_URI="
+	https://github.com/scop/bash-completion/releases/download/${PV}/${P}.tar.xz
+	eselect? (
+		https://github.com/projg2/bashcomp2/releases/download/v${BASHCOMP_P#*-}/${BASHCOMP_P}.tar.gz
+	)
+"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="+eselect test"
+RESTRICT="!test? ( test )"
+
+# completion collision with net-fs/mc
+RDEPEND="
+	>=app-shells/bash-4.3_p30-r1:0
+	sys-apps/miscfiles
+	!<app-text/tree-2.1.1-r1
+	!!net-fs/mc
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		$(python_gen_any_dep '
+			dev-python/pexpect[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		')
+	)
+"
+PDEPEND="
+	>=app-shells/gentoo-bashcomp-20140911
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.14.0-optimize-kernel-modules.patch
+)
+
+strip_completions() {
+	# Remove unwanted completions.
+	local strip_completions=(
+		# Slackware package stuff, quite generic names cause collisions
+		# (e.g. with sys-apps/pacman)
+		explodepkg installpkg makepkg pkgtool removepkg upgradepkg
+
+		# Debian/Red Hat network stuff
+		ifdown ifup ifquery ifstatus
+
+		# Installed in app-editors/vim-core
+		xxd
+
+		# Now-dead symlinks to deprecated completions
+		hd ncal
+
+		# For GNU mailman, which isn't packaged. If mailman isn't installed,
+		# it triggers a QA warning.
+		arch
+	)
+
+	local file
+	for file in "${strip_completions[@]}"; do
+		rm "${ED}"/usr/share/bash-completion/completions/${file} ||
+			die "stripping ${file} failed"
+	done
+
+	# remove deprecated completions (moved to other packages)
+	rm "${ED}"/usr/share/bash-completion/completions/_* || die
+}
+
+python_check_deps() {
+	python_has_version "dev-python/pexpect[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/pytest[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	if use eselect; then
+		eapply "${WORKDIR}/${BASHCOMP_P}/bash-completion-blacklist-support.patch"
+	fi
+
+	default
+}
+
+src_test() {
+	local EPYTEST_DESELECT=(
+		# redhat-specific, we strip these completions
+		test/t/test_if{down,up}.py
+		# not available for icedtea
+		test/t/test_javaws.py
+		# TODO
+		test/t/test_vi.py::TestVi::test_2
+		test/t/test_xmlwf.py::TestXmlwf::test_2 #bug 886159
+		test/t/test_xrandr.py::TestXrandr::test_output_filter
+		test/t/unit/test_unit_dequote.py
+		test/t/test_sudo.py::TestSudo::test_1 #bug 935400
+		test/t/test_xfreerdp.py::TestXfreerdp::test_6 #bug 935400
+		test/t/unit/test_unit_command_offset.py::TestUnitCommandOffset::test_cmd_quoted #bug 931744
+		test/t/test_make.py::TestMake::test_6 #bug 931744
+	)
+	local EPYTEST_IGNORE=(
+		# stupid test that async tests work
+		test/fixtures/pytest/test_async.py
+	)
+	local EPYTEST_XDIST=1
+
+	# portage's HOME override breaks tests
+	local -x HOME=$(unset HOME; echo ~)
+	addpredict "${HOME}"
+	# used in pytest tests
+	local -x NETWORK=none
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdist.plugin
+	emake -C completions check
+	epytest
+}
+
+src_install() {
+	# work-around race conditions, bug #526996
+	mkdir -p "${ED}"/usr/share/bash-completion/{completions,helpers} || die
+
+	emake DESTDIR="${D}" profiledir="${EPREFIX}"/etc/bash/bashrc.d install
+
+	strip_completions
+
+	dodoc AUTHORS CHANGELOG.md CONTRIBUTING.md README.md
+
+	# install the python completions for all targets, bug #622892
+	local TARGET
+	for TARGET in "${PYTHON_COMPAT[@]}"; do
+		if [[ ! -e "${ED}"/usr/share/bash-completion/completions/${TARGET/_/.} ]]; then
+			dosym python "${ED}"/usr/share/bash-completion/completions/${TARGET/_/.}
+		fi
+	done
+
+	# install the eselect module
+	if use eselect; then
+		insinto /usr/share/eselect/modules
+		doins "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect"
+		doman "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect.5"
+	fi
+}
+
+pkg_postinst() {
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "${v}" -lt 2.1-r90; then
+			ewarn "For bash-completion autoloader to work, all completions need to"
+			ewarn "be installed in /usr/share/bash-completion/completions. You may"
+			ewarn "need to rebuild packages that installed completions in the old"
+			ewarn "location. You can do this using:"
+			ewarn
+			ewarn "$ find ${EPREFIX}/usr/share/bash-completion -maxdepth 1 -type f '!' -name 'bash_completion' -exec emerge -1v {} +"
+			ewarn
+			ewarn "After the rebuild, you should remove the old setup symlinks:"
+			ewarn
+			ewarn "$ find ${EPREFIX}/etc/bash_completion.d -type l -delete"
+		fi
+	done
+
+	if has_version 'app-shells/zsh'; then
+		elog
+		elog "If you are interested in using the provided bash completion functions with"
+		elog "zsh, valuable tips on the effective use of bashcompinit are available:"
+		elog "  http://www.zsh.org/mla/workers/2003/msg00046.html"
+		elog
+	fi
+}
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@ -4,7 +4,6 @@ AUX bash-5.2_p15-configure-clang16.patch 1116 BLAKE2B 5ef332cd2847f46e351e5db6dd
 AUX bash-5.2_p15-random-ub.patch 451 BLAKE2B adab09c3f2ce3697e3659e01266120155714b80263bd125808edf556a354291af615540189553b1c32a2d462ac41e28a9df8fb9f7d963a3ca3629d297a46e62d SHA512 ac62d3bd609a5d17434cb3614c3ee229569a84087173ebf694eb144a43891fdaead7c531f034b47d72c801ba46d48b0db616e3dcaec82bd7151df518ef070400
 AUX bash-5.2_p21-configure-strtold.patch 910 BLAKE2B 83ec6ff756543ee44c18902f2d30dd662a84237b9594a7e0cfc21a1c16fce49e37cf67729b3a17d59cc978cb6675e04457e3b6b0909d94cb234a1dde96f7c9ea SHA512 d8f0487db08dc7ba3f42075067556757142b13f739ca765d851e51ce09d11d4cce02ad016b724e70dd418d9bb37166c4c4ebb98e874cd89920661470486d252e
 AUX bash-5.2_p21-wpointer-to-int.patch 512 BLAKE2B 0c7f5eb5b697abf15c1d17888a973e44d0ead1f095778b41841a6a1937a5b9e7ce5fa6a05e4404504990b0a244fdecfc12ce7c33ee7d67b4c837435e9bfe2b57 SHA512 61bc7f96a1f3f782f0502c660f7578f4c97b3aae244c95ce3810815fcf9c81734cd19599dc9c8b0707d4f2bbb50497ef85c02e66fdd360d49befe0fed0ca4985
-AUX bash-5.2_p26-memory-leaks.patch 4357 BLAKE2B 1b9f08054b28fa0e73b7b3d4da2674efd75b3ce11392a078d5072ba8e466f4a9c504892f9a1f2f62e4dc39b22050e68d42bcbae8ebe537df699d0c884c89a0b9 SHA512 ad30a74b7f4ecf5f7446867baf9b177fb1036e384b61a2ed73b121b17b7f686f9bdf9295c5c251b11d165f80e6110a2768257a2460c7e93abe78a5f763b972e8
 AUX bash-5.2_p32-memory-leaks.patch 4293 BLAKE2B 80d035f494b59f2774a905dd68375b00b43c7ac296be35a87a1c830946c26d65d8bc54e82aca75e63b8d2c0c64109b8a331a92dca80ed5f32d8cbcda99f87f48 SHA512 5ae73c1bd1330b6dee1982630ff2b8fb26c788337ad2f46ff78f972134b2555eb502c0610738a9fde31f424966af1e60b473a337a437b76e12e1f841a90f4845
 AUX bash-5.2_p32-read-delimiter-in-invalid-mbchar.patch 7718 BLAKE2B ab7fe139630be59b26a72f92f22e4a2b556594d341d82b0f15f99880724f5ea5cfd912a8de6b6e1db902c14d65395c74a03379e3e01ce69bb4512c681518301d SHA512 95b6e1653853ff4a202c21385f246abc8e6b5ebbaf757646ff1b8338bf1e1874fab2f28650cc47a1b967022fbc74d1d81fa64f3e28fd7bfb07292cea568470bc
 AUX bash_logout 205 BLAKE2B b8c0266c3d1e31a714304a2b3b33389f042ae5bd497379f9b15ce31d47d1e3da73ba6536023953b00efe27b687e2ff45d94e3f01a13acc824dc12e31552c5b94 SHA512 7234250c03fc920996a381f9daef9e2d8ab1e1a29acdebed6669d8e0fe1c872a7fa343adf7d9ddc81225b0cd9eb223ba7ad1ff42448aff057fc6d6baa8f04a7d
@ -43,8 +42,6 @@ DIST bash-5.2.tar.gz 10950833 BLAKE2B 51b196e710794ebad8eac28c31c93eb99ac1a7db30
 DIST bash-5.2.tar.gz.sig 95 BLAKE2B 2991b7c46ef1cdca08062f419be47fca7551f4c5d9aad8a5c1da74974f5e7707d23914b4cecf9b6c9610471146b2c49b611bb62a5d974f1c37cceb77b719851c SHA512 a161664f124f906be32709f66702f8f780e6d52e558ea45e71ec60a959c9435ff68477ee65a0a9f6c0051d5592f5044fb3b410cf3cd3ae5a8a323789b01be258
 DIST bash-5.3-alpha.tar.gz 11195025 BLAKE2B b3325f6927d7dde86aae165891317b972f0b9814e134676b3d7d3aea81ce4d4cad1a01f160e290352072153ad3568ee21701a35190ef5e6274b3c03fc95c8d42 SHA512 52354eb7cd71330192ec76fdda04bcacf758a312e89b45558db5f5345f19b0d8e54732049934958cf89786f5bd7c538d88859eb8d8d22dabfc9ec7305263d10e
 DIST bash-5.3-alpha.tar.gz.sig 95 BLAKE2B 69c8b33fe2a40498662ef084967701cff1926086785a41d6f49a3c2e2b9908499226d3d970bdb6397a74d3ccc22acb3651261ad2a421799eb135c64a78af8589 SHA512 c9587da66457e2010b0852c6dbf5949821a543b7f1b616a4d016df3477913e2a655c57289e83adeeb31b8b8afca22313e3af76cf727b93932d33a889c1263c20
-DIST bash-5.3_alpha_p20241115-fa68e6da80970c302948674369d278164a33ed39.tar.gz 14947053 BLAKE2B f05df995a93ee010e7867e828d30f2cdd0aa62fa020e632018cb8f3945626e0b0c254e4cb6f6e4de3dbb01994870a39f1edecb8fb30b4d38e6455d0c645ba2c5 SHA512 de33fc8dbf9d4a833220423bdd53627fa67335130442964c88e82f11ddf1c19aab0d166d5f7dba30767b8878b36ce7ddf4deea03633e98fa3459669f99086f5b
-DIST bash-5.3_alpha_p20241121-22417e78816237ae66f2da661567dfe5ed3452a1.tar.gz 14888873 BLAKE2B 78f9d15aee593497a2213e9cfcb03a0b5c8d127beacf0a2268f4bbefb79da41e6b2e4b9bf43b46c7b7cf4a276038554f708ee783fbd30f2489881af2fac165cc SHA512 f06e908ec673a605e967f7392aadcdea293bacafeb6991fd286e1b64ef606845c8cd78b01b1bb04a7ae9ad5c049324f51c1299c2fc90fdd3fd38575f9b380c11
 DIST bash-5.3_alpha_p20241126-49c2670226b045746d66765b23af37c1c7ba5597.tar.gz 14891201 BLAKE2B 984e67e7d4520147ea28a72cab1afb364dce5ba942f07d25d805160395630fe10cbacc8302f47cbd108c4cba04622782e245f553586be3cd4c48b8685a798334 SHA512 b7795724d97012074361f229b561ccfb87a272e6d4351b9fc5cf13747b51d87fa3b7a1282a25a80aac248ca470c620e6e940abdb776cddd7cedfddcc23509f88
 DIST bash205b-001 1132 BLAKE2B 0c5eef29777d54ef05957ea3d63b1556fb380bd20c238dc28993d822b37bc4e78ff4048ad069f6b8cd25da77ccdeb7aecd86c4349cb9d81e5e94c7001eeae5e6 SHA512 5ce4357468821b05e747201f3aa57225ad8f540c9e2c87051720490e039c30b478b9b662a68f14a0800fefe40184e4495e2645665200f9d75e9a115b2ac08071
 DIST bash205b-002 755 BLAKE2B 6a6ed5679d451f02f8104b345c1722d11718ce3b4043b581c17786d40d8da69a34786fb56d0c363dba277b8e9dd33f12f70c9cc73a9fc39ba4a8319406f0458d SHA512 46947b0229478d5c2cfeff68b8ebc00e4ef0c8b94e336ca12f72b4490ba3622c0240c01c17c1641c3b07adc2c64ec94d6d780365e8990768ec8888f3a9526883
@ -470,21 +467,19 @@ DIST bash52-036 5941 BLAKE2B e86b0df8ea7ace1ce4bc6f269de389f2f85fbe20e59e6a1e88a
 DIST bash52-036.sig 95 BLAKE2B 5ed270f26471e08456f73498ea8110c514b8e1bae424182f4cf530ab6e4f89a7946cabd3f7dd703f4f4bab7de9c73922e7be688df18df485cd64a33ce98df223 SHA512 7a26b606ab0d7a5716ac49bd1492e3b3480c3764aaec64e1763a2beda7a962c81a4066887c950b3bdd1ada317b790bd985f8b858e78c7cb8eb4a2bd02f1b07cd
 DIST bash52-037 2835 BLAKE2B 4af190d53b498d6d4403f64f39060f1add17edfe3e48b4b58a4377d1e96caa93017aed3df7011a64c99fd908af967603ed287e6bbb0380a8569d170779d8f26a SHA512 3e104dff63dabceea2f56f9dc58869d48a71ce61c3c8aff4f289d2f4a47d4325e70178d520c265a25ddb2227e0b78f08177fcd594470e5e81f4116aad282b4de
 DIST bash52-037.sig 95 BLAKE2B e3cfa89933fe59159a44dc20832406d3c42e28ac0c33674bf369a2f20a1d9de3e985bd178640f17be7b45a4fe3f96c72f80124384cec42fa263eb95586150a3b SHA512 437a69a167a4b889fca40b03eb2dcaa1ddc53db8fde924a6f8bcd21c3ac0c7629cb87b7bc08fa3b16f46b05c6a198a01dce6af3d2b761429345acd361df105dd
-EBUILD bash-2.05b_p13.ebuild 5606 BLAKE2B 469efdd37131bf6d95856e2826b53c8cd49451abc6f495bd5f0ce9247af7a2c4df5cc44a785610b8946a1756a1f9388fd3ba1336bd0c91ad72388d9ef8833c77 SHA512 7a7257ec4f7ad8a97d82f0589fefffa6c2e1ac78908bac3b0bc57d66f00da211d024418bd1bcfa6f4ffc85442602b268a210b8fcd41a0f2c7de5a6a0dab2ec0c
-EBUILD bash-3.0_p22.ebuild 5744 BLAKE2B c4a123ba4bb255a956a34d803e9dfeeaf1ac0791ff69803a9c40c327b999bb71d410e1a221775d60997c5254741a06d8f427a723184900253e631589ae02d8c9 SHA512 7f91ad5ff7b633ba0b2de15df6bf63ae9cc63692035bf416a19d34ba61adb142aff71bd2a0ab712d948e27dc14a343a7a4b2fd35394417c2b5f98cfb098988c8
-EBUILD bash-3.1_p23.ebuild 5421 BLAKE2B eafa5f676a4b0963180d84213f20287ff5ba80535484483b156b61e0b55b6845d086fa95ce4acc6b77194929aba4e7a5acc4b01ebca2422b11eacb9aff3831f9 SHA512 bd74758f4ff4e9a1d51d6092be5306a734dd65eb25bb70006304845221ae74f0d4399aa8bf39d3d26f61de6be2548445f81572d824ae7e331d745d6b900ff578
-EBUILD bash-3.2_p57.ebuild 5586 BLAKE2B b3562e839f6990e43a456551c4ec00b00f030df4af525c298db701a1c8fc58b427eb33197bd125649101290d7ea77f6933c219980a7e6eb3b881b5985b006532 SHA512 f2f0da6b38ac013ed2a7c3a66b17f1c41e61e955bad738a730e5ca5d1826aec4ec148aed984cfbf37222b9938b55d8ae779eddc1e0a0785e13cb25e3ddc5b30e
-EBUILD bash-4.0_p44.ebuild 5114 BLAKE2B 36ee9a3e850f77ddaffdfd6b8b4056ed593aaf81d5e789d687b50f22324c1e6e667013ac5dada957aa5a0074192d00f21268639a279d288c4acf73b911a088ae SHA512 21711cec10f552d5554eff321bd8dfd36f9ffc28cbb09eae7f81ba01d8461a5a76f9e8da22502ee41e5baf27a517cd82659a153e4217a01be097b3e2c91a3ef7
-EBUILD bash-4.1_p17.ebuild 4714 BLAKE2B 071a30d9e5e5b0a90d042161fd6c3be2ca6ba07b7047aa5615b516a573f2d997fab16692771a26def63905285206ea9825e7f28fde03f63209b185c4de5244a9 SHA512 977cffd153537f924b056a64cea4de39d4940fd1a18005675adec7aa9333dbaca213425f26c2d781b55646a3f54c34fd360e47d1e94ff54421656834d091749a
-EBUILD bash-4.2_p53.ebuild 5267 BLAKE2B d4cbe1f6583362c27b4086bb359302a9f318821c8ca44f6f9d1cac8a8fdc1c714dc13e4084091f9f3b79d1c3559cd003fa47d0635bfa421810c15df8e431536c SHA512 c2e77c42970eb9e33371a33642ed67060bbb5f2bb8505417e1b77bfb2bf6e51bbd4a7f780c46e11f49aac5357c917f2bb5550d26245b842b22a2997ec1b74b43
-EBUILD bash-4.3_p48-r2.ebuild 6468 BLAKE2B ed379a7ee2259e0aa31bea5ad287dacae3efd689ca8b7d35402f47fae6f259e38b0668de24799fef41f97ffe52e4e603108528e29f07be435689ff73d0456903 SHA512 b05bf299c97744a5be6619d2c22a26c40fbe2ada56694cad6fa69ab261e613bd9cf733cb072e75819454a7b1349db160c9b91df1fb572f92bc03721fa26576e7
-EBUILD bash-4.4_p23-r2.ebuild 6466 BLAKE2B 0d21212fa9b42f23b21e82472c6b63922ab6c7f00fc16acac37d45f0dea05208478a2c96520a8832b15d6e79fbcb4c7f09f9a73897db4cd3d29366f108e0009f SHA512 2f653ff9f0ecac322bf8c4c62639ef3b4e251137b76803163f43f3a2a025a3714ffb5aa41633d2ae485ee380d0542c19937e610df94247e81f4f25b8f5b7767a
-EBUILD bash-5.0_p18-r2.ebuild 7790 BLAKE2B 86eaa54c758391ca3242e39ad0028becfb0ded4967341d5e27420a670a767e55a157fa096bb7eb0453e62eabbfe812b50e522f5d77721d5c2249d6c0515527b2 SHA512 f43af09745a70ee60f16551780d9a4197d43ca38fb61f5fe24a4ada264184f8069302845ea6ba01588dfa8da2271ca21ba1871049c8a094258202bf1207bc0ad
-EBUILD bash-5.1_p16-r13.ebuild 10408 BLAKE2B 94d31cd597d2e10caa99ffc74b35f374ed867ee05035b15743b1bf636b043b6b9d864e64e726439525f53293d9c9ea6ee66a22737dbd4b535e11743993b6f77b SHA512 a207f8cc87f4e1091d9a42456c37eee594b037b6fc5adac6b6e02bf8e00606817274dd18587b88cd4d0b5007b34499eaf479567bbbe50b2317e51125a9198ef8
+EBUILD bash-2.05b_p13.ebuild 5623 BLAKE2B 23fad87ff1bfbe5099e6c8aeb88611888d8a5a73a88ec130a7b89b04076fbfecc00a2ea479b8952792046679285a9b9f894881997632c4e40679313d5ef76b67 SHA512 4058f5774c5f25ae75acff1f866fc0842348103105a1c952ff78982b63fd8a6c46442ffcf490096585be50514d145a449d3ea37712e34214b5171ce76f3b9539
+EBUILD bash-3.0_p22.ebuild 5761 BLAKE2B c876eef88cb4b9f60df5ed807efa8648f4d3dc4435fc6b85f4b2280a2d5534a79cefba5d5982ca06c20a7941deb43da4006e6309f2e1f8abfeb6fb7db15ed115 SHA512 7dabaff26f6b3866e2315d8b64fc96d879e14981d35479a500f26461f32175adb2a38ec528ed5db4e9fd703398d28d3157309ad092ebe40793fd3b7fcf7e687e
+EBUILD bash-3.1_p23.ebuild 5438 BLAKE2B 72ce9fa45d23d83d51ca32185abc909f607f267a7636f2c37e81bd9427b155b67dedbd16f1e14756c18a3537a156eb2910a0653dd85130c6f4ae1ce8a5bf7241 SHA512 30f5b07a03f6d233b07b4c241cbd55bfebb687e92084911a8551d6839e74209d4004b9e0d62246b7aeef4eeea87787a5bcc90974a7bf373b9a846577935d9c3e
+EBUILD bash-3.2_p57.ebuild 5603 BLAKE2B b34889836a6c70a05110b718307fd58540f0c4d3ae846327b0847532ddcf302d4543b30e86cebd204e7a196e8cafaa46cd4714d79a0f23ed23c94dc16c00f666 SHA512 b9a03f71734025a31b26636e847d2806e17ba45f5db37faf157c2424762d8be82a2cf63409928f6725b35e83c92e78712c472cd6c48f58610385712697e41e4e
+EBUILD bash-4.0_p44.ebuild 5131 BLAKE2B 383caf9be5db3a69d537cf24ce0860996735298ea904dbc10733faedb43b10e3959290da21b3e9b7f004b0c545bc7d43d6c6199d2428f59f5966f4263fd48a62 SHA512 fdb65ccce95e5f5fc28dd63bdc50e67f14bf77117a60a8b7977bf5db02ab614d2b24c8185a5d3c706b14f07ff8e004e860673f52153d39e12d3fea6e088af46f
+EBUILD bash-4.1_p17.ebuild 4731 BLAKE2B 7be493ca2db1a7f9224090463aa13864e2b1eec42d55e46996fa26bf51bab25ec60c410bba5253788bd6451c3c9c1cb569d9a1031700131edb5a8ce486e87e82 SHA512 09dc1acb402278cb10e98918bd718680548f5dff93f97286193a50c74739424a4ef3eaa57c59ffb4b1147eff8b7940a77d3df668c709bba097240c670d9eb239
+EBUILD bash-4.2_p53.ebuild 5284 BLAKE2B be81e596f4c2d3b705cba02fa2a4739f9dd57de5f04b70bd0a3a300361bf238445b0bb3a48028483e8a0f6746b8f4641c988e75974cbc2d28fdb757f1b34046d SHA512 5abae3545c25e3ccf63f36e48e63ceb835e7bce6498abdd0490ed2cc08ed4cb02ebf77d8797a7abd45a2b675f7c45a7bcc73933de91b93d6dcef2ceb732ab4be
+EBUILD bash-4.3_p48-r2.ebuild 6485 BLAKE2B b4d6713527bc4b18aec27d001543b967030e4de416e9258637690a19f135aeecb017cebbffe9016d49255cc26f1f417e4fda8b34da9d3c2ac61c45daace56fd5 SHA512 8c4eca867cc4a0934b203eab9f34ca43cd9a1b5e0f392a7848737d5cc95152cd8cf08749d4629225dda48f3558e7a5801d457cc526bcff49ee5328d63459cfe3
+EBUILD bash-4.4_p23-r2.ebuild 6483 BLAKE2B 20f9cc2edee161f4d43cbcb556ff363187ffcef3f2460717228ab040c53c778d275133e9db2139facedce13e8f539bdfe3128e55123a20e5a3dea852e982f949 SHA512 ab969f429bfbd4f410e65e081367f3f110053c28dc1f8690960f6966d59b6d34f04bb78a2291c9daffb034670478b7d827728753a5dc106146840558168f8a1d
+EBUILD bash-5.0_p18-r2.ebuild 7807 BLAKE2B 1db98c0168fcf5eb0315b934f5f04d3ef61f908afb4481541ab9c803c41fae7d4db69b8dac13e75bc371d3cf1658837a57d695fda46cbb04555c88a4eeda5089 SHA512 912679e15afa98689ba62c16b8ce1f1b29a10cf549a956f3e7e9dd89d8296be050d3e2c93d205efc34d1ce2d0094af1dab9cd3ef383720d4ba371e7f002ea64a
+EBUILD bash-5.1_p16-r13.ebuild 10425 BLAKE2B 5d1139d0b9988ece989e126d48b0522c4835805541d8e2a201d02a36dbc06e0cfcfc603c3f064e9ef1c08579dc8740be73e66bcbc2ab3f4db40c30a9d4a0dacb SHA512 9d2541cbc9b8bbdc172b9b0fa624ff2e3fbe0d8291b82e2e7f0054293cba9ede3d2c3c752c96f1363fe7febda0162180ecd40ea432e228670066e196e8b62604
 EBUILD bash-5.2_p37.ebuild 11864 BLAKE2B fbc51a614a3cd31d434e578600c4b4183520e008ccd005fd5edecbe6272d01264e0612a45f6537d994f057572e78bbf68fcd2dc3832f6b9d7650236a4eb856c2 SHA512 148edbf2b3479f3b70238fa182075db8a65dc364e7627498e11ad52b9fc073b36e8a570b0321106835b690902a6ceecbd8b2064ef6f82dae5c3cdf4c2b6bbcd0
 EBUILD bash-5.3_alpha-r5.ebuild 11560 BLAKE2B ddc3a3eb579849d0ab989f96f79212ac1438dd9cd61c618aa5a3ad4b0e60a6bf9452ca6063d3f7fd4742176ef8f3c991bb51440e59b7a2c08e61c73f6acad313 SHA512 06b44f783b7e0e47e1eee18c95614068e5e1111c8acc9255c4756285919ece70189fe0c6a00abe0732921dfff9b9ae751de85c5d5d0c27c57dd8ada7d0b3686f
-EBUILD bash-5.3_alpha_p20241115.ebuild 12151 BLAKE2B 52d8c1b46545103cde794aaade5fdf2bab17b906030afba78b58fa22dfa24bdc23d550ac73220590890a9cb180258ccc5d9007e9c72b608df723ece007cc99b3 SHA512 f427b04b25fcc25ae4dd2cc8ad4a83286d766096efb0874b44b9765445e29e974d49551a60984f2708c8ba851bae07472afa093c7d99ae07f348d6040ef448a9
-EBUILD bash-5.3_alpha_p20241121.ebuild 12151 BLAKE2B 7c45306db4437df7c5f6d9556930ab923e0f305feda83dd63d3ba468bf3431be3cc75921b834d1cf64378f060da33570fd823d9cc59a11c1c05cfb5bbf0841cb SHA512 d87e7913743689922502cdbce69438eb6e92c402915c295500f29fdb050bc2b54eddf5f5c484f5a494f1d824e463edc1fb1f96d4e2831c977eb4fab1ae7ea659
 EBUILD bash-5.3_alpha_p20241126.ebuild 12151 BLAKE2B a6a24160cc5b3e63d99f3fa998d876455fda2ba785ab3a0ded81d16cdee0cb9a621fcadb88198e8ce0dd498a371b90c65915610977b0c01fe8fb3d224f086b3e SHA512 b5b9030216fd98f5f0a635bf7a637fc884342b45d5e8b55bd115454209126ab68d0513d8ab5092115cf01f877321717e4cfb7b392975d503aa97f2b48f1f1653
 EBUILD bash-9999.ebuild 12151 BLAKE2B 2a196c15c43c613d03ca3ea480bdb4151b189a9b7c71a104b76268e6c051b12d4497a4d55af6dd2df10d5a9541778fb396b9c0a30cefdc16ea435f9a604e1a2b SHA512 d50d982e70df19288f69c6194b9d893cbee7fcf07034e7ba50495b3e25e6b5aba4e481f82d3781fcc9c7b1461b8d89158ea02465bc6f64105cb7489299cc267c
 MISC metadata.xml 1009 BLAKE2B f71587b0a6d05b907f82b26be93b071290d91dc8f612f7b008a05eaa94d45be2ef8c1d992b7ac886648a9dcf964c30e8d9a7aff90d44835beb452e0d635b9533 SHA512 8aa1cb4c3206a76d10181394a91c315967fd9d3b359194f430f075fdd5a0b4b32149eec36b85412ef7e84b55e7b01955c75486b2df82b392a5acb3df8229a88d
--- a/app-shells/bash/bash-2.05b_p13.ebuild
+++ b/app-shells/bash/bash-2.05b_p13.ebuild
@ -103,7 +103,7 @@ src_configure() {

 	# bash 5.3 drops unprototyped functions, earlier versions are
 	# incompatible with C23.
-	append-cflags -std=gnu17
+	append-cflags $(test-flags-CC -std=gnu17)

 	local myconf=(
 		--with-installed-readline=.
--- a/app-shells/bash/bash-3.0_p22.ebuild
+++ b/app-shells/bash/bash-3.0_p22.ebuild
@ -108,7 +108,7 @@ src_configure() {

 	# bash 5.3 drops unprototyped functions, earlier versions are
 	# incompatible with C23.
-	append-cflags -std=gnu17
+	append-cflags $(test-flags-CC -std=gnu17)

 	local myconf=(
 		--with-installed-readline=.
--- a/app-shells/bash/bash-3.1_p23.ebuild
+++ b/app-shells/bash/bash-3.1_p23.ebuild
@ -103,7 +103,7 @@ src_configure() {

 	# bash 5.3 drops unprototyped functions, earlier versions are
 	# incompatible with C23.
-	append-cflags -std=gnu17
+	append-cflags $(test-flags-CC -std=gnu17)

 	local myconf=(
 		--with-installed-readline=.
--- a/app-shells/bash/bash-3.2_p57.ebuild
+++ b/app-shells/bash/bash-3.2_p57.ebuild
@ -105,7 +105,7 @@ src_configure() {

 	# bash 5.3 drops unprototyped functions, earlier versions are
 	# incompatible with C23.
-	append-cflags -std=gnu17
+	append-cflags $(test-flags-CC -std=gnu17)

 	local myconf=(
 		--with-installed-readline=.
--- a/app-shells/bash/bash-4.0_p44.ebuild
+++ b/app-shells/bash/bash-4.0_p44.ebuild
@ -99,7 +99,7 @@ src_prepare() {
 src_configure() {
 	# bash 5.3 drops unprototyped functions, earlier versions are
 	# incompatible with C23.
-	append-cflags -std=gnu17
+	append-cflags $(test-flags-CC -std=gnu17)

 	local myconf=(
 		--with-installed-readline=.
--- a/app-shells/bash/bash-4.1_p17.ebuild
+++ b/app-shells/bash/bash-4.1_p17.ebuild
@ -94,7 +94,7 @@ src_prepare() {
 src_configure() {
 	# bash 5.3 drops unprototyped functions, earlier versions are
 	# incompatible with C23.
-	append-cflags -std=gnu17
+	append-cflags $(test-flags-CC -std=gnu17)

 	local myconf=(
 		--with-installed-readline=.
--- a/app-shells/bash/bash-4.2_p53.ebuild
+++ b/app-shells/bash/bash-4.2_p53.ebuild
@ -106,7 +106,7 @@ src_configure() {

 	# bash 5.3 drops unprototyped functions, earlier versions are
 	# incompatible with C23.
-	append-cflags -std=gnu17
+	append-cflags $(test-flags-CC -std=gnu17)

 	local myconf=(
 		--with-installed-readline=.
--- a/app-shells/bash/bash-4.3_p48-r2.ebuild
+++ b/app-shells/bash/bash-4.3_p48-r2.ebuild
@ -115,7 +115,7 @@ src_configure() {

 	# bash 5.3 drops unprototyped functions, earlier versions are
 	# incompatible with C23.
-	append-cflags -std=gnu17
+	append-cflags $(test-flags-CC -std=gnu17)

 	local myconf=(
 		--docdir='$(datarootdir)'/doc/${PF}
--- a/app-shells/bash/bash-4.4_p23-r2.ebuild
+++ b/app-shells/bash/bash-4.4_p23-r2.ebuild
@ -126,7 +126,7 @@ src_configure() {

 	# bash 5.3 drops unprototyped functions, earlier versions are
 	# incompatible with C23.
-	append-cflags -std=gnu17
+	append-cflags $(test-flags-CC -std=gnu17)

 	local myconf=(
 		--disable-profiling
--- a/app-shells/bash/bash-5.0_p18-r2.ebuild
+++ b/app-shells/bash/bash-5.0_p18-r2.ebuild
@ -130,7 +130,7 @@ src_configure() {

 	# bash 5.3 drops unprototyped functions, earlier versions are
 	# incompatible with C23.
-	append-cflags -std=gnu17
+	append-cflags $(test-flags-CC -std=gnu17)

 	local myconf=(
 		--disable-profiling
--- a/app-shells/bash/bash-5.1_p16-r13.ebuild
+++ b/app-shells/bash/bash-5.1_p16-r13.ebuild
@ -175,7 +175,7 @@ src_configure() {

 	# bash 5.3 drops unprototyped functions, earlier versions are
 	# incompatible with C23.
-	append-cflags -std=gnu17
+	append-cflags $(test-flags-CC -std=gnu17)

 	myconf=(
 		--disable-profiling
--- a/app-shells/bash/bash-5.3_alpha_p20241115.ebuild
+++ b/app-shells/bash/bash-5.3_alpha_p20241115.ebuild
@ -1,411 +0,0 @@
-# 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.
-case ${PV} in
-	9999|*_alpha*|*_beta*|*_rc*)
-		# Set a negative patchlevel to indicate that it's a pre-release.
-		PLEVEL=-1
-		;;
-	*_p*)
-		PLEVEL=${PV##*_p}
-		;;
-	*)
-		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.3_alpha"
-
-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
-elif (( PLEVEL < 0 )) && [[ ${PV} == *_p* ]] ; then
-	# It can be useful to have snapshots in the pre-release period once
-	# the first alpha is out, as various bugs get reported and fixed from
-	# the alpha, and the next pre-release is usually quite far away.
-	#
-	# i.e. if it's worth packaging the alpha, it's worth packaging a followup.
-	BASH_COMMIT="fa68e6da80970c302948674369d278164a33ed39"
-	SRC_URI="https://git.savannah.gnu.org/cgit/bash.git/snapshot/bash-${BASH_COMMIT}.tar.gz -> ${P}-${BASH_COMMIT}.tar.gz"
-	S=${WORKDIR}/${PN}-${BASH_COMMIT}
-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} )"
-	S=${WORKDIR}/${MY_P}
-
-	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
-
-LICENSE="GPL-3+"
-SLOT="0"
-if (( PLEVEL >= 0 )); then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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"
-)
-
-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
-	elif (( PLEVEL < 0 )) && [[ ${PV} == *_p* ]] ; then
-		default
-	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
-
-	# wcsnwidth(), substring() issues with -Wlto-type-mismatch, reported
-	# upstream to Chet by email.
-	filter-lto
-
-	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/bash-5.3_alpha_p20241121.ebuild
+++ b/app-shells/bash/bash-5.3_alpha_p20241121.ebuild
@ -1,411 +0,0 @@
-# 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.
-case ${PV} in
-	9999|*_alpha*|*_beta*|*_rc*)
-		# Set a negative patchlevel to indicate that it's a pre-release.
-		PLEVEL=-1
-		;;
-	*_p*)
-		PLEVEL=${PV##*_p}
-		;;
-	*)
-		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.3_alpha"
-
-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
-elif (( PLEVEL < 0 )) && [[ ${PV} == *_p* ]] ; then
-	# It can be useful to have snapshots in the pre-release period once
-	# the first alpha is out, as various bugs get reported and fixed from
-	# the alpha, and the next pre-release is usually quite far away.
-	#
-	# i.e. if it's worth packaging the alpha, it's worth packaging a followup.
-	BASH_COMMIT="22417e78816237ae66f2da661567dfe5ed3452a1"
-	SRC_URI="https://git.savannah.gnu.org/cgit/bash.git/snapshot/bash-${BASH_COMMIT}.tar.gz -> ${P}-${BASH_COMMIT}.tar.gz"
-	S=${WORKDIR}/${PN}-${BASH_COMMIT}
-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} )"
-	S=${WORKDIR}/${MY_P}
-
-	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
-
-LICENSE="GPL-3+"
-SLOT="0"
-if (( PLEVEL >= 0 )); then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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"
-)
-
-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
-	elif (( PLEVEL < 0 )) && [[ ${PV} == *_p* ]] ; then
-		default
-	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
-
-	# wcsnwidth(), substring() issues with -Wlto-type-mismatch, reported
-	# upstream to Chet by email.
-	filter-lto
-
-	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_p26-memory-leaks.patch
+++ b/app-shells/bash/files/bash-5.2_p26-memory-leaks.patch
@ -1,136 +0,0 @@
-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
- open_redir_file: if we did not get a pointer to pass back the expanded
-  filename, make sure to free the name
-
-* 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;
- 		    }
-@@ -762,6 +764,8 @@ open_redir_file (r, fnp)
- 
-   if (fnp)
-     *fnp = fn;
-+  else
-+    free (fn);
-   return fd;
- }
- 
-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-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/epspdf/Manifest
+++ b/app-text/epspdf/Manifest
@ -2,6 +2,6 @@ DIST epspdf-0.6.5.1.zip 445167 BLAKE2B 2e1ee1e04e8731fdfb085596a463b897714a460f7
 DIST epspdf-0.6.5.zip 331312 BLAKE2B 3bd2c9cd432172c38efe33d08068f20fddf169d5d7bc94c9f1720cf379de9ba54aedb1cb6fd438b721c2e98f24dfd1ca4b3dab5c1fe01a71791748f952832ac9 SHA512 28ef12546a957c62fd94b405b53359898d46c825bad8fd2167b5ab23bb2a6ea457ccbcc8263b31574e128ebe56e21b30fae27d406397df3fdc1506a088ab41f4
 DIST epspdf.0.6.3.tgz 335975 BLAKE2B aacd6e222bfe74636dba796fd6e878fa9970f469d096eb77acf4a336a0ab5620629de7ba1c763afa62b181887724db55be57d1929a041a945c7d74ea3028d6de SHA512 ddb0d8c17b6b0bbb934312e6253a2b689d2545c892af989efac9782022c501109f2ff57bb2ea7c26d63d7747e2a510c18bd22a6076bb7137fe0252c38b2125ea
 EBUILD epspdf-0.6.3-r1.ebuild 1293 BLAKE2B 1e4bb8206d71f7d49be984264701b5efb2a25f2603a464d641cc1b17c5192dd67f34dc601cc61df31572ec47e6be6518bc03b90e160ca65e54eb37aa1a8a6657 SHA512 13fc224b5f9163c1efea111548bad8d122b4a7a53f833b7457a1bae2e5b2005fbbd30e9d7c9db2423070e409780793f346e1cb182f1946797d96a974cb3bc071
-EBUILD epspdf-0.6.5.1.ebuild 1362 BLAKE2B 3172d7f5bd7d0fa4ee332c1c9afd910153a84ea38a99b7e6f731955c00477d694a6df58f8efa767fe69d6acc4557929f30f1aa9d4183cd03d351206764b5f23f SHA512 a547241c3f75ae5b84f44ca182d541dc50236cb401bec85f86eabf6e44754ef875cfef30af30a1c75f9fdb26fb2f8b854d47ebad9fe5159c5639a98c2325c208
+EBUILD epspdf-0.6.5.1.ebuild 1361 BLAKE2B eb6455905abcf62781db57f65da36016917b2997e3f1519b8ccd7d1a956534e1599f00adfd903b48f680c9ffa73dc29a65c3d0c70e89987072ed5bb021cc1848 SHA512 af4348e1565e10b805aaf70e3c823b2243daa0a9882cde621fc1a7122b1f46a0b710215a646cc9767359f4877a931d45698add1945ca51df708acc34818227ae
 EBUILD epspdf-0.6.5.ebuild 1312 BLAKE2B e2338259804c916f23cb22f44930a13051ad4576c0e35ea6263c9b2a772648e82b66b0cc403af84e8c87ecda0c785c1f092609085e8ef548f90f708209b05c11 SHA512 3fe89e336932622d12fb69e8db7dd81cff14801d7f364cd31dc06e5acbc0e0b4d1e5da23045063d757fdcd39b373026b7594306f08f4415a775c8d89abf032a0
 MISC metadata.xml 246 BLAKE2B b56c934f8eecd3492d6abe15cf5883fdbc1979c37abbc5ad196e345ee17bb865db5eab10ac7de93bbfce94c4e865bf6b86d5f8bc081b5cb1d3d58d1158b81921 SHA512 b61f56c5e078714565ff9e33c81217e788f78bae9cf10d6ca78a82703a8e08119dff3afa68306eced0b7c62db9220d28efa4c9782e943c991e30b25b9ead82f5
--- a/app-text/epspdf/epspdf-0.6.5.1.ebuild
+++ b/app-text/epspdf/epspdf-0.6.5.1.ebuild
@ -13,7 +13,7 @@ S="${WORKDIR}"/${PN}

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc tk"

 RDEPEND="
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@ -11,6 +11,6 @@ DIST ghostscript-gpl-10.04.0-patches.tar.xz 3088 BLAKE2B 4bac1ebfc5f4be7e5174add
 EBUILD ghostscript-gpl-10.02.1-r1.ebuild 5557 BLAKE2B e01a38acf3a9f8a1f964451381a65fefacedfaacbbbf9580d5392264dc5cd9627193855ecc3a9318b37b30328beb1a994fd2ff724744678f8ddea643c6cd9c67 SHA512 75a1b1fbf0b97b91b606a2586a4b99e6342eb94aa219c4e648b0e0f279295cad8a3d59db517e65abf17cac3eaccce6c5ec89439a6b904c95bf61c2cc139647cb
 EBUILD ghostscript-gpl-10.02.1.ebuild 5508 BLAKE2B 033bea6de3043f151dc2cb9d36c1dd7aa2fe408ead7eb2105362b8650a5506ceb41d7f610147f80b9c9f3160cc2f4112e8e7e69b08074b687d98d38f99c94a17 SHA512 570a62fb19e670d54b32562bfc8362793bf44f69e1394dcecc8d85f479cacbcb0665d2e7016df0a9af66e8f1879c0a0aeeef076dec771925cff29b3744ee02ca
 EBUILD ghostscript-gpl-10.03.0-r1.ebuild 5533 BLAKE2B 2d36792340870c0a19b1ff3ae8814580ea6841cd9ccd3e8da43ec408543e54ebebf7d67538ee1d2aa565d8da3d58a97e944fc7e6623b6a7f21702d9d6955c869 SHA512 194731943a8db22bdb65a8de90cb08f662627fedd9409fd574c2d22c12306eb380393b55efeb8ac82b62338e87500704c98cd098eda2c4a31c1c1dde28748a91
-EBUILD ghostscript-gpl-10.03.1.ebuild 5589 BLAKE2B 1f95a114f5fd6df75b2fb2ad3791f312ab0c2d46f1d9fc0f8bd11b301502563665c864f2d9625bd8b4485fe4b5f0c0fa5332983bc33e1e29e310bbbbfa8f460a SHA512 4aa3a71b60308d1910d99aa062bee927015d91c269eed3429652c5f76fef2a9d9fa39f525eebc8c9f666cdd944416a689fce1f6165f9b514218d01357e67012d
-EBUILD ghostscript-gpl-10.04.0.ebuild 5602 BLAKE2B ed97f51bd93ff934a96b37994ba57902ec56b3234cade3527bdea5de7f5b96efd6a5710a2af67082aa43be4470726adfb6b6a56137ff62c29b43606a389ea60d SHA512 72d95aef4b0b18959a3819152046143d98d5eceb79be50ab47d22c0b67b39ff342bbb30e2e80afc5f52e28e473ccdabbbe4e5e166150b18dda9c051518e545fc
+EBUILD ghostscript-gpl-10.03.1.ebuild 5650 BLAKE2B 1dc6d9577f16a282e5550f56feafca77f83c362e0b40c2b769d90f5e2848af8d58279e5366ffc659bc79c78d9b7caf5703f930106bbd99446361ee76e325018e SHA512 745795782b26fe7e7637573f4d5c074c013b8827949a11ededec02cafbafa245558ba4f5628b964a89a2d2e291b4577dfffe9aefebe5c4146078f267a3b63f06
+EBUILD ghostscript-gpl-10.04.0.ebuild 5663 BLAKE2B 63b8694ca8bdf751407d2752712bffc28c1c6d7e064e270e19256c3499b914fe67dffb3f8a8d42410f91ddecb4608005c1c922a083db08dbc12159918463c1ca SHA512 c093545b74ce8202bca3682d5f82e2221b1714a078a1c88f4696ddbea5832c8f3947f513dacb0653e9fc096334b01c023f2706dad5f68bbbd29b951efedd3b04
 MISC metadata.xml 831 BLAKE2B e594fcc7ef78d3eb9f157a46c63f33fd35887fa82cdc304bc4b2db4e772473e8ba695b0ef932a69df0c8a5ac5269955ae600b436444782820475f44c6fc1d9f1 SHA512 2b067dfde63ffd8da3afb27c889884e51a3e1158cef153bc30ffb10a69cb0f7d409bc38a335651010d4e1dddad3bf09a9873445d77416da2bbd2ac7af5ab1598
--- a/app-text/ghostscript-gpl/ghostscript-gpl-10.03.1.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-10.03.1.ebuild
@ -25,7 +25,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="AGPL-3 CPL-1.0"
 SLOT="0/$(ver_cut 1-2)"
 KEYWORDS="~alpha amd64 ~arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="cups dbus gtk l10n_de static-libs unicode X"
+IUSE="cups cpu_flags_arm_neon dbus gtk l10n_de static-libs unicode X"

 LANGS="ja ko zh-CN zh-TW"
 for X in ${LANGS} ; do
@ -159,6 +159,7 @@ src_configure() {
 		$(use_enable cups) \
 		$(use_enable dbus) \
 		$(use_enable gtk) \
+		$(use_enable cpu_flags_arm_neon neon) \
 		$(use_with cups pdftoraster) \
 		$(use_with unicode libidn) \
 		$(use_with X x) \
--- a/app-text/ghostscript-gpl/ghostscript-gpl-10.04.0.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-10.04.0.ebuild
@ -25,7 +25,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="AGPL-3 CPL-1.0"
 SLOT="0/$(ver_cut 1-2)"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="cups dbus gtk l10n_de static-libs unicode X"
+IUSE="cups cpu_flags_arm_neon dbus gtk l10n_de static-libs unicode X"

 LANGS="ja ko zh-CN zh-TW"
 for X in ${LANGS} ; do
@ -161,6 +161,7 @@ src_configure() {
 		$(use_enable cups) \
 		$(use_enable dbus) \
 		$(use_enable gtk) \
+		$(use_enable cpu_flags_arm_neon neon) \
 		$(use_with cups pdftoraster) \
 		$(use_with unicode libidn) \
 		$(use_with X x) \
--- a/app-text/lowdown/Manifest
+++ b/app-text/lowdown/Manifest
@ -2,11 +2,9 @@ AUX lowdown-0.10.0-pkgconfig-libmd.patch 309 BLAKE2B 617d3af07f0414fce674573e48f
 AUX lowdown-1.1.0-shared-linking.patch 1504 BLAKE2B d53f317fb68c6a627a96243df871a205d460124fa91c4d08373a5a3134bbc4877a0ffdeb7e0336342d049f67b003e82d978cbbbba9b660fabd82550deafbd2e7 SHA512 21f282ca34c319f33795a71c5dbb0937a171853bd570538c750537013dcfc93c06035ee14eca468382e27bba427cb009fb57fef54c34d9509a93279abd52c05b
 AUX lowdown-1.3.0-shared-linking.patch 1548 BLAKE2B 9a2e7d03c17f34ca3a9b04ab144a7944e422e92db53f8a031beebf9d964913f7b060a1e4b0ecba00716379b1422423c48627edd5e3dc8b8f2204988a6b710480 SHA512 ec6891da03a56178610bc70e7133f3fbe5757093f2ad2939215db636fc10c652172c48b6a273cd886e696139923af4a849c0d3288185c076ff1df992d9265653
 DIST lowdown-1.1.1.tar.gz 600635 BLAKE2B 39c0a2472ff6b9b3fa2b6d72c1f2d482592976f7b50c1bbaf1965bfbb6d28f22e0a7498bb54087bb83070bd74ea673409be97815f51a0a5a67e980bbfc4e01b2 SHA512 2a69da945a83696480651e8221d73bcb18bac9bc38bb88126ddf73520d2a4ff396dde08a7abf6f550669ec9ba34abdaa186b0980f312fa157371ee754576bb6a
-DIST lowdown-1.1.2.tar.gz 603453 BLAKE2B 02c549ad803d3e7a0bfc7fb05094452d57dbfd2ada9f5211571a3df45bef7fdca0b1cbd54a28cb86e6bec6b6be2d914ace05c728a3c0263bafe00f47eb52b7c2 SHA512 b8a649814bda946740695b5fe1120ad8653fe058acf37cc3c033fa78a0d49b0036eb2f4ada9b4aeda5d2c85ede7195d681c2605c6113f3c6a1113f760a7f2e49
-DIST lowdown-1.2.0.tar.gz 657032 BLAKE2B 73b3bfc1b09bc6beb38949a344e5b458f8a1537a99ce48710d170f0553c099d0226b6082923b01c02971d3f82c9773ae95e8792f56ccf0d530708aecab480766 SHA512 ed989e12f1bd6da03cbf139bfe0fb0100fbe23cac266990bb1bc34a3e0be3d4512e1ab1da2397c439d20dc40dd7daa4fc4318116ef2b5e759368e9a28e483744
 DIST lowdown-1.3.0.tar.gz 666560 BLAKE2B 8bf9da6163a65bff7ac5774d0d31a0dc1438832944b2560a9f725bf9c83c359575fdb828d5065a0138e84466c9a95ca514c72cba6c457a0bb02f9e4558cce017 SHA512 ac51e8ff74450bf02d3c8e41f129f15f2ac92d47a07c020f10eea143b506fd113afac0e9bec447c336cf70176ebc886a8933fa38f5779931c9dfd9c06421fcda
+DIST lowdown-1.3.1.tar.gz 668638 BLAKE2B 5d3541e104a25519a580d6b0e8fdfdb03642dcefcdab016f8d1744f5dcd704611d792ca79b988962a014cbcfb20d05e8a8be62eb50708e4c85c5a3d1fe512df1 SHA512 b530bd0ad050a1197e04de971bb10e63c185736f487bcf91467f53d9c63b698aa40d364f8a0d340e3bbf929a9318050c68fdc8127c5ddf526bded327f57419df
 EBUILD lowdown-1.1.1.ebuild 1268 BLAKE2B 5255cfe4e112542e70a082e060c0cea16b6e1fd1816abb7b7e767b4e45f6357ffc689727b55a92dd72f8fde86feaa3f7254f2a0c654f3c3ed5199e20e21a23f1 SHA512 c8d00b1d2a3f5bb5e868d753ea589b489f214ed64e9a7cd74f2e7416f9016222c7a315a09b70d3d7b747d9bc02d029fe094651df960e57e694855dc00af76517
-EBUILD lowdown-1.1.2.ebuild 1269 BLAKE2B 1ba13052f20726d5e431dc3d2f26c81a0c61c349477d4d4ad1ef17586174f7afd698d47ba288156e82197f0415a32c981328473ce9e461cd90a645263077e2aa SHA512 2df11c9c31ff55f298ae3c5696f46688863c15bd425b4981472225d25d717fc0b953c09251119998c5782d8f74ea9a351634140720c762a90116666a2f212d71
-EBUILD lowdown-1.2.0.ebuild 1305 BLAKE2B 0765b3bb4bd833cb589f5d077065e50adc130f388206cab7995f7e25a9ceabfe0f9ed4b7b2ac9de7dc82ce9044e0de0b81406811191895f6244bd624c62c75d7 SHA512 3f40949ac3848b5988c719420074d93f1b1917a40e69f914807729e031036d45c7b18c7e5f41b09fe0fccbd34503dfbe534a50ed5d1411c27fecc5f0dca20c50
 EBUILD lowdown-1.3.0.ebuild 1305 BLAKE2B 366bb95f82c794f0ceb696f4d727d72b36d7346975228f48fb367574f56c3316a2d35b0958c815295a6e94d6eb5063ef48ec1c7a84b1a7ec613338244f96be7a SHA512 9c110a201bcb2bbd923b6160ee095b1fe1102d419643c2ed688bf65c7d14ec8ef49029ecd0bd030a1c1286beaa52818e377218d762121f0e0d4a003bdd3eeb49
+EBUILD lowdown-1.3.1.ebuild 1305 BLAKE2B 366bb95f82c794f0ceb696f4d727d72b36d7346975228f48fb367574f56c3316a2d35b0958c815295a6e94d6eb5063ef48ec1c7a84b1a7ec613338244f96be7a SHA512 9c110a201bcb2bbd923b6160ee095b1fe1102d419643c2ed688bf65c7d14ec8ef49029ecd0bd030a1c1286beaa52818e377218d762121f0e0d4a003bdd3eeb49
 MISC metadata.xml 333 BLAKE2B cfa2021e507b7538cf73840fb9eb8e1f6c157f7090b1156e4bd1cd917547adeea76cc31d619d60b0d189c915ae4748437b8d9a9a96a532276d6deb1d0f2258d9 SHA512 fa991b0162a4eab9c81815b4a523d33a08e7a7716b5a443165f0cc05d906b7dc3d7da388d0e3d3202a7262a7971d771ffb29debf42659c8ed3c3de6ed184d73e
--- a/app-text/lowdown/lowdown-1.1.2.ebuild
+++ b/app-text/lowdown/lowdown-1.1.2.ebuild
@ -1,67 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs flag-o-matic
-
-MY_PV="VERSION_${PV//./_}"
-DESCRIPTION="Markdown translator producing HTML5, roff documents in the ms and man formats"
-HOMEPAGE="https://kristaps.bsd.lv/lowdown/"
-SRC_URI="https://github.com/kristapsdz/lowdown/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="ISC"
-SLOT="0/2"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-DEPEND="
-	virtual/libcrypt:=
-"
-RDEPEND="
-	${DEPEND}
-"
-
-# configure tests for a bunch of BSD functions on Linux
-QA_CONFIG_IMPL_DECL_SKIP=(
-	crypt_newhash
-	crypt_checkpass
-	warnc
-	errc
-	getexecname
-	getprogname
-	memset_s
-	pledge
-	recallocarray
-	strlcat
-	strlcpy
-	strtonum
-	TAILQ_FOREACH_SAFE
-	unveil
-)
-
-PATCHES=(
-	"${FILESDIR}/lowdown-0.10.0-pkgconfig-libmd.patch"
-	"${FILESDIR}/lowdown-1.1.0-shared-linking.patch"
-)
-
-src_configure() {
-	append-flags -fPIC
-	tc-export CC AR
-
-	./configure \
-		PREFIX="/usr" \
-		MANDIR="/usr/share/man" \
-		LDFLAGS="${LDFLAGS}" \
-		CPPFLAGS="${CPPFLAGS}" \
-		LIBDIR="/usr/$(get_libdir)" \
-		|| die "./configure failed"
-}
-
-src_compile() {
-	emake $(usex elibc_musl UTF8_LOCALE=C.UTF-8 '')
-}
-
-src_test() {
-	LD_LIBRARY_PATH="${S}" emake regress
-}
--- a/app-text/lowdown/lowdown-1.3.1.ebuild
+++ b/app-text/lowdown/lowdown-1.3.1.ebuild
@ -42,7 +42,7 @@ QA_CONFIG_IMPL_DECL_SKIP=(

 PATCHES=(
 	"${FILESDIR}/lowdown-0.10.0-pkgconfig-libmd.patch"
-	"${FILESDIR}/lowdown-1.1.0-shared-linking.patch"
+	"${FILESDIR}/lowdown-1.3.0-shared-linking.patch"
 )

 src_configure() {
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@ -6,8 +6,9 @@ AUX mupdf-1.24.1-cross-fixes.patch 7098 BLAKE2B a97c6c0454e9e1b2b0476c36387709b9
 AUX mupdf-1.24.1-darwin.patch 604 BLAKE2B 47421e731a53eaa12f963e928900a978db651325dd9ac180861494ed7a4456afed90953ca1b5ebd51310144f383d72ae95726d6feebbda73b17be46f1a656804 SHA512 e239d15b68fced7ff51d85fa67afdbdaf5da77d67be1ca45d49f91080d87a7e2bd583b70678be9a6ed7c5ef69121aa2bc45bb26c7ed4bef3a0121aee5865f7d3
 AUX mupdf-1.24.1-openssl-x11.patch 660 BLAKE2B 5fc5d680e05d9ebdf0243ed7cbf44cbf69d836725288059b894fec7c47d8bffa621099303270d8298b966cbbbde49a0fb18a6d1e47ced7558558439b19b31b74 SHA512 24117446375fb8222a4adcef0955cb5e79cdef033faa9fe9331d29eeea85849206eae40bdb9f5e4ff8e8cd98261c28e6bf8f16f218fb3c78adf0fa6e60e8b9fb
 AUX mupdf-1.24.8-add-desktop-pc-files.patch 841 BLAKE2B ec5bb8c70fb01fd54e58952123f1c1f9ba07a18e9d2718a1d7ef4d5a847049e49578556ebdfb5afca228e0abb4312b07bbed814b267c6401583309357cd5c135 SHA512 78f2c0662caccec43a8b83e9402cb24a6c24efe730860be64157595474e7a738389a11ee1695a22abe5f904aa3587ad4e11940f4c2677f7823ea2545018efd88
+AUX mupdf-1.24.8-c23.patch 782 BLAKE2B da6da463c77cb58256327c98c9db04581c115c57009598e74517d6912ee33f11089e35c392312afae0c709bb716c4898d2fcee4766dc26c20460c6d8df6454a6 SHA512 bd4bde8468010841fc22abe445e5a78d35cbb01333378512c045367b58895354631bb1e694b6fe5809a3f844eeaed8719a606db57b64cb6c03965768e7388454
 DIST mupdf-1.24.1-source.tar.gz 55310618 BLAKE2B 33396b0cca6e2beb1b2bc70c606917c8d9b30b6a277645849ef7ba1e7efbf909c21196acdd5d94d964dd20d3ba746c45cab3c899dfbee1b2138de12e32375a4e SHA512 9d6fbd3388173f06c5db4a27753e69afd21ed32d93f263d4448c3be60a3be747b61102edd5430459f0dbe7ae4df2019689a2f3a582acec77ff322b6d41066fba
 DIST mupdf-1.24.8-source.tar.gz 54039703 BLAKE2B 0fe25d9f0f01a1e387da590c28abac66309247c46c05c7c9b36c4bc911fc16adab681243c2c1d2c50ec91bb76b737022bd3faf06b0b3a803e9120829d9cae5b4 SHA512 17d8fd9fd0e176c8abd1ebc594259a0f7cf822338085ea4574451ba8ec1ac72ba8bd2d5388a1421bbfd4e91257a48d0e0766213ace0933c39d3cb8d774a3860e
 EBUILD mupdf-1.24.1.ebuild 4966 BLAKE2B d8470b8685706eeac458eb4a49271a25415c4921ff398501dbc7b629630d69fdc2b93f1397c94dc0449ada79b3f0cfa6186d5840b7676a2b0a719a6d4d309186 SHA512 2d039fa41bd7c971127760a6beec47c8cfda2f4d737fad0eeec755469e2197dfe52e3a10a4fb892e44110f9961bd785c228baa31e2b7f4c97176ce073ac18552
-EBUILD mupdf-1.24.8.ebuild 4984 BLAKE2B 85fa458431936d3e1392f576c67b0d61fc57971c3b5c0c3ffaea706cac6e204a5827d93b94b4b7728404a587e91d2f9490d88b5f32d81dd7508aeac11d22b80f SHA512 d025866d536ec02b817e382a26d9a6ff3364026084e25dae766671b33390db4b57e2c5a3ed26bb335ee13d699b0b124554b05ebe1a9ca046a244c45ee2920c39
+EBUILD mupdf-1.24.8.ebuild 5018 BLAKE2B 54cd90dc1b19391fff8b4b81bb725966a8902d142c291c7f3e93e769c1af4d20024accd476d9af15ee6c01207973932543bd6531b3fe4e56e9a58b28cf142753 SHA512 ffa1fb989a279816f3725da2321eab2dce706460b3b9ad464cda053a26709f583569f8cecde692f5315817057d81e0bcdb73b1f80c1ce024f0bace322508f2c8
 MISC metadata.xml 516 BLAKE2B ad2fb06efd79889747566fbef91a71dcdc3452443dc6edbf077510b494b74b75a153262390c09eb625e54d6c13b63e557acdf11b0843ab35337ff581536fccb8 SHA512 d823f015eb0c9e5354845adf5296de8c52bc33c135b17fba04955ed85b6c5f2ff7c4c630fbf6010b4cd98728591a7340f30e2d6bd90573c1a9f2b3a47ae9a537
--- a/app-text/mupdf/files/mupdf-1.24.8-c23.patch
+++ b/app-text/mupdf/files/mupdf-1.24.8-c23.patch
@ -0,0 +1,20 @@
+https://bugs.gentoo.org/944028
+https://github.com/ArtifexSoftware/mupdf/commit/11b1b948ac52d3b9b70813e642368721d4518630
+
+From aaf110d35ea191ef75407e6af6c9d142c123b6ad Mon Sep 17 00:00:00 2001
+From: Tor Andersson <tor@ccxvii.net>
+Date: Tue, 26 Nov 2024 20:16:35 +0100
+Subject: [PATCH] egl: fix fgPlatformDestroyContext prototype for C23
+
+C23 removes unprototyped functions, so this conflicted with the definition
+in fg_init_x11.c.
+--- a/thirdparty/freeglut/src/egl/fg_init_egl.h
+++ b/thirdparty/freeglut/src/egl/fg_init_egl.h
+@@ -28,6 +28,6 @@
+ 
+ extern void fghPlatformInitializeEGL();
+ extern void fghPlatformCloseDisplayEGL();
+-extern void fgPlatformDestroyContext();
+extern void fgPlatformDestroyContext(SFG_PlatformDisplay pDisplay, SFG_WindowContextType MContext);
+ 
+ #endif
--- a/app-text/mupdf/mupdf-1.24.8.ebuild
+++ b/app-text/mupdf/mupdf-1.24.8.ebuild
@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source

 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="archive +javascript opengl ssl X"
 REQUIRED_USE="opengl? ( javascript )"

@ -57,6 +57,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.24.1-openssl-x11.patch
 	# General cross fixes from Debian (refreshed)
 	"${FILESDIR}"/${PN}-1.21.1-fix-aliasing-violation.patch
+	"${FILESDIR}"/${PN}-1.24.8-c23.patch
 )

 src_prepare() {
--- a/app-text/paper-clip/Manifest
+++ b/app-text/paper-clip/Manifest
@ -1,6 +1,7 @@
+AUX paper-clip-5.5.1-document-vala-return.patch 978 BLAKE2B 456c6def5938c2b9b1aac35099ab685efd11edffbd3ebac91d1c14b5eb5d5e806b9bfd4a76b4fc5eaa60ce5c56c77fde2469c57c55e1c310c9f3002fbd748a55 SHA512 00f0ae20818e2b60d43e2e5c87c2fbda2c10e714606c91366c65a161c42447afa9cca5cc02e9ffde67013779132858b9687f842f19115fac88cb7b4a39716987
 DIST paper-clip-5.5.1.tar.gz 183419 BLAKE2B 18af0f18d8d3da9f6d6f4cea57aa817e902666ee60f851ec54adc64506d3f4a8508895f64ace28424b0a3018e6bdf0b80cd40a602d226b09e83d1efa2e82daf4 SHA512 5cca56b2cc6f3619c40b202b8e53e3e01834fb10dcf1769553fb6904d50297736c9dcaad376422d2ea49203f40b32fb24d64a1f161a49868e446459d94f08138
 DIST paper-clip-5.5.tar.gz 183365 BLAKE2B 74b2b893ad7f421eeeb7e6c5bd3921b20b379cebcdb86371a262455fe95a67c0fdddc894b5ecb3da9d7c612a6e9e7ac91ba4d98cc4e2cfb994de388f9f0f8a45 SHA512 880ed9ee81788e1d1f50d0bf5c119ebf2f45a939432f44e363ce0513217a74af7f9fd012f110fc3a38db392341a3529b8785f0130a4bf0fe83f6dbe12d663b19
 EBUILD paper-clip-5.5-r1.ebuild 1437 BLAKE2B 2968def15b6eb31c94fb763522ce7e4141fbe4ea30c24286ca8b6fc069378a7cfcd05dba5684f0dd108676b27da3d16474e8df4b6463b1f3bbade01f93a668e7 SHA512 18220fec476959a5868b03711123d594bfa5013d4cd6fab5fe57ea7d05c7a8f973af8c3321f6a928da04a820ccf540cd2712c297170bf55fd3ccc020ce450f3e
-EBUILD paper-clip-5.5.1.ebuild 1438 BLAKE2B e0a1b2369091f7e6d930ed6b8c2117ea4a60566b3b0e0f5a4d9dadd9eb67fa40be8a2d4ec49302f49c3965b26107034749fbe877423be6aff681d965cab68429 SHA512 85453415dcaa2430dde6ef776b44708d0980db66d4ef27d74837d6767a8fcfbd1be35f490bc24cc795bd63bdee96a817aee06ec61d28d47740d61aee7e984b89
+EBUILD paper-clip-5.5.1-r1.ebuild 1509 BLAKE2B 614a9731f206be77b3b1a8f65b34cc81a948fe7d4ea3597d0e9a823cd60cbb95fcc3a380d8794ea8effc03c8994241d4cc53c5c2d19212c50c5fb62172757b2f SHA512 0fd26d321ed9bac50e2a5e0b18bc2c4b4dfb273b3837daadd51d030684dae5e7ff2d30267521c5c33310c04c32a0f32962629e521b7dbd8a09fd4dcf56906e44
 EBUILD paper-clip-9999.ebuild 1438 BLAKE2B 1a14f8e45453220be43f7a87e792ea58fa1c6c378f001f2889f46a5eedfc7c8795b3066df392e2207580f86803d08aca29c24ec6e599b925d4c65b3c3e59aff5 SHA512 3fc7ae135ecb7e409041455be7084aa84a7c1a930758d8dee35b88e8e555bfea8263fab923fbc33338f2c9d309f3fce6cdc949ad089a897148348384ce11aa24
 MISC metadata.xml 413 BLAKE2B 66acd49c6583aec7c89aa17de477237b5214aefc73b4814eb8170f1af322fd3d1565557060e2fc63027740457c84131e9d6d4be0f1dd4d531ac7da79429e0c91 SHA512 69d713bd2b11742920a25f5db125de72bb44403a049a1969e988b124d2d88ea36d6ac04a8b2091380f9208ad4407f354322e307a433bb58c413353069eb8cccc
--- a/app-text/paper-clip/files/paper-clip-5.5.1-document-vala-return.patch
+++ b/app-text/paper-clip/files/paper-clip-5.5.1-document-vala-return.patch
@ -0,0 +1,24 @@
+From 33a64d825b87c842b9ecc243297c7a0248db7180 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Diego=20Iv=C3=A1n=20M=2EE?= <diegoivan.mae@gmail.com>
+Date: Mon, 5 Aug 2024 18:08:36 -0600
+Subject: [PATCH] vala: Solve Vala errors at C compile time
+
+---
+ src/Document.vala | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/Document.vala b/src/Document.vala
+index 872309f..e52e1a7 100644
+--- a/src/Document.vala
+++ b/src/Document.vala
+@@ -451,7 +451,9 @@ public class PaperClip.Document : Object {
+                                                    "copies");
+ 
+         int res = DirUtils.create_with_parents (destination_path, 0777);
+-        return_if_fail (res > -1);
+        if (res < 0) {
+            throw new IOError.FAILED (@"Could not create $destination_path");
+        }
+ 
+         string destination_file = Path.build_filename (destination_path,
+                                                        "%s".printf (original_file.get_basename ()));
--- a/app-text/paper-clip/paper-clip-5.5.1-r1.ebuild
+++ b/app-text/paper-clip/paper-clip-5.5.1-r1.ebuild
@ -44,6 +44,8 @@ BDEPEND="
 	dev-util/desktop-file-utils
 "

+PATCHES=( "${FILESDIR}/paper-clip-5.5.1-document-vala-return.patch" )
+
 DOCS=( README.md )

 src_prepare() {
--- a/Show more
+++ b/Show more