Sync with portage [Sat Oct 26 01:02:43 MSK 2024].

2024-10-26 01:02:44 +03:00 · 2024-10-26 01:02:44 +03:00 · 28f4fad529
commit 28f4fad529
parent 0a83888a60
3500 changed files with 33252 additions and 39451 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/acct-group/Manifest.gz
+++ b/acct-group/Manifest.gz
--- a/acct-group/atuin/metadata.xml
+++ b/acct-group/atuin/metadata.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<name>Florian Schmaus</name>
--- a/acct-group/gns3/metadata.xml
+++ b/acct-group/gns3/metadata.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
 		<email>mmk@levelnine.at</email>
--- a/acct-group/openhab/metadata.xml
+++ b/acct-group/openhab/metadata.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<name>Florian Schmaus</name>
--- a/acct-group/sandmann/metadata.xml
+++ b/acct-group/sandmann/metadata.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<name>Florian Schmaus</name>
--- a/acct-user/Manifest.gz
+++ b/acct-user/Manifest.gz
--- a/acct-user/atuin/metadata.xml
+++ b/acct-user/atuin/metadata.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<name>Florian Schmaus</name>
--- a/acct-user/gns3/metadata.xml
+++ b/acct-user/gns3/metadata.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
 		<email>mmk@levelnine.at</email>
--- a/acct-user/openhab/metadata.xml
+++ b/acct-user/openhab/metadata.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<name>Florian Schmaus</name>
--- a/acct-user/sandmann/metadata.xml
+++ b/acct-user/sandmann/metadata.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<name>Florian Schmaus</name>
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
--- a/app-accessibility/kontrast/kontrast-24.08.1.ebuild
+++ b/app-accessibility/kontrast/kontrast-24.08.1.ebuild
@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kontrast/"

 LICENSE="GPL-3+"
 SLOT="6"
-KEYWORDS="amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""

 DEPEND="
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/ansible-lint/ansible-lint-24.7.0.ebuild
+++ b/app-admin/ansible-lint/ansible-lint-24.7.0.ebuild
@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/ansible/ansible-lint"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="amd64 ~arm64 ~riscv"

 # Upstream has stated explicitly that all tests require Internet access
 PROPERTIES="test_network"
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@ -1,3 +1,7 @@
 DIST aws-cli-1.35.0.gh.tar.gz 2806480 BLAKE2B d607933a9baa0e50ab8d809e0ecb68681e90815fca7db6b69b01a632a56d37a62bedaf6dc981bffaa0206b31b6ca84b3d5e3524289b9b2edc55ef1989239a696 SHA512 2008b00455755b3c332b83d6df3e86f461a94b401aeb022887feddd6f5f3ab439b382d24d46c4e0da825df24899ede6307c4e482987d07171d38704c85ac4eb1
 DIST aws-cli-1.35.10.gh.tar.gz 2811446 BLAKE2B 3151e107099821ffa3978d4a0175bf96ab9f789bb122f941cf28cac5115d1e6b97272b73e56633910721cfae0684266b7d311886e6fb414330ff9e4791581b4c SHA512 85be98b3e80e2af85acb0ac982cc85bad6789f6e051c95b7df5cc3eb313c677d6a66117a3418bc44f9c03ee6385b68b401839d4b9a609caa65fc59e8ddb55624
+DIST aws-cli-1.35.11.gh.tar.gz 2813001 BLAKE2B 8df6575c77783031d52ab99f34c90092bbb5ee67584b3a13bc29f4b171da08534f3851b2298074123e12ce8e43a2b7e98d812619652192ad5b1f97a8299f14b3 SHA512 8df319bb806233e5e32ef8bd07216b9e17966b49d5d3cb36c90bc92c7161120dc1e6434181920df62562e36dd2cc664d4b1e95e8ba953879488df25e56570bfc
+DIST aws-cli-1.35.12.gh.tar.gz 2813508 BLAKE2B 817fc49d9225c7b5ef9aa95560138e348e872ecb46ea6be415d1b41d5989eec87ee3d9fdd265c0af2e28c2dba2e1a3e2e794a43d6cca170d639184b7cf3684cf SHA512 9f8fbb9c931d9b3c1d00e25e1018b2dbca7014a5946cf1f17155d18e47837218f8575e0e2a3cc64902d3b3baa8ada99f6e01a72f5fd74b209f807c646023c2c2
+DIST aws-cli-1.35.13.gh.tar.gz 2814615 BLAKE2B ad59cfe26615902f2161b06f2ec5ffdfbad5e0ee15262a2b5d32cf4a2031afa1825c476d06cf072b190be6eab9991e7ce3f524c7864e52538726c3730bde07ca SHA512 4e23f8d64469f50b02858289387b5405474e292476b576f3f494a1efcec896abdfc0fd4f3b66423b13354628c81571f4be7152fbc9ed13de166f551386837b35
+DIST aws-cli-1.35.14.gh.tar.gz 2810216 BLAKE2B ea6de63fff9122dcd4eb47eb6cf45928321c69c6ac840b05a3183539b17e406c9056e2fcd60bdbfceb76a2ddc38844df93c80ccc9a507627c862059767b478c7 SHA512 bdb8397d02f77f8a7df37786027d6c26433a99ebc8947ffffb9f7775e75f0d926cf713686f07e7c996f4613d45e8277e6ecb2da5fb29109b023751188197e193
 DIST aws-cli-1.35.5.gh.tar.gz 2808789 BLAKE2B 545c76bd349485fbf2dc5565317678904c99443e2e6dc2e12fa9de122327d8aa0e8b9579cec37afe2e949a0c31c48e0977e52d701ffc212182c692769c35a948 SHA512 2a9c86f1a63b657d3c95f8a65020ea7837ded9f5147ce31a535f59b9d9c1c91c3354a82286c25252da7d5b7c48c1898f594be0cb9e1ba54c6768133543fcba50
--- a/app-admin/awscli/awscli-1.35.11.ebuild
+++ b/app-admin/awscli/awscli-1.35.11.ebuild
@ -0,0 +1,98 @@
+# 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.(z+34)
+BOTOCORE_PV="$(ver_cut 1).$(ver_cut 2).$(( $(ver_cut 3-) + 34 ))"
+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[@]}" )
+	case ${EPYTHON} in
+		python3.13*)
+			EPYTEST_DESELECT+=(
+				# flaky (some ordering?)
+				tests/functional/s3/test_cp_command.py::TestCPCommand::test_multipart_upload_with_checksum_algorithm_crc32
+			)
+			;;
+	esac
+	# 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.35.12.ebuild
+++ b/app-admin/awscli/awscli-1.35.12.ebuild
@ -0,0 +1,98 @@
+# 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.(z+34)
+BOTOCORE_PV="$(ver_cut 1).$(ver_cut 2).$(( $(ver_cut 3-) + 34 ))"
+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[@]}" )
+	case ${EPYTHON} in
+		python3.13*)
+			EPYTEST_DESELECT+=(
+				# flaky (some ordering?)
+				tests/functional/s3/test_cp_command.py::TestCPCommand::test_multipart_upload_with_checksum_algorithm_crc32
+			)
+			;;
+	esac
+	# 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.35.13.ebuild
+++ b/app-admin/awscli/awscli-1.35.13.ebuild
@ -0,0 +1,98 @@
+# 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.(z+34)
+BOTOCORE_PV="$(ver_cut 1).$(ver_cut 2).$(( $(ver_cut 3-) + 34 ))"
+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[@]}" )
+	case ${EPYTHON} in
+		python3.13*)
+			EPYTEST_DESELECT+=(
+				# flaky (some ordering?)
+				tests/functional/s3/test_cp_command.py::TestCPCommand::test_multipart_upload_with_checksum_algorithm_crc32
+			)
+			;;
+	esac
+	# 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.35.14.ebuild
+++ b/app-admin/awscli/awscli-1.35.14.ebuild
@ -0,0 +1,98 @@
+# 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.(z+34)
+BOTOCORE_PV="$(ver_cut 1).$(ver_cut 2).$(( $(ver_cut 3-) + 34 ))"
+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[@]}" )
+	case ${EPYTHON} in
+		python3.13*)
+			EPYTEST_DESELECT+=(
+				# flaky (some ordering?)
+				tests/functional/s3/test_cp_command.py::TestCPCommand::test_multipart_upload_with_checksum_algorithm_crc32
+			)
+			;;
+	esac
+	# 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/linode-cli/Manifest
+++ b/app-admin/linode-cli/Manifest
@ -1,3 +1,2 @@
-DIST linode_cli-5.50.0.tar.gz 146902 BLAKE2B ebe83454f06bc281a91dcc276db7378779d73717ca49bbcc81fe59e61c6eb448d7a7bde9e5482bb21ca05c0484001f86dab4b4296011ecbb156c13b38573f7ea SHA512 3fb95f76c19f17f897ebce3bfb6d32de1f9a2ed2d8ba9078180e465acbe20b873a59092809a2c766c326e0c5e27c983c84aef9ae7c210004f51b2b62225694e1
-DIST linode_cli-5.51.0.tar.gz 154535 BLAKE2B 7cd59795bed698ec73510d7881a2768f31fb405619e991608b711433cc971aa024d173b54a184b96aa7de9db879593fd358d5b4cdd140c699f941ad19f29bdd4 SHA512 ca9fad8af34e84993c8be9d6f253955389df32d42e6a881b72b2445a71951b5d2458e8580189fdc26d3c870ff7af20fce71a4a838aeb0d96380b0588e1f34146
 DIST linode_cli-5.52.0.tar.gz 160729 BLAKE2B dc0a4c30dcaab3c07c64aa519786f461a79e6f532ebfcc9917e6654b6a8bd32b2cfa2f323036d3870555b7b91620121264877a0fbae4b1bc2a71e885558bb261 SHA512 26c774e0936e16f391c5b028ffc91370d6401e85e92f08ce2e3b2435be3a8230d0d8edd3904ff0514c76b135a3ff88fae27e5e452d0aae534b0deb6f9fc8a2ff
+DIST linode_cli-5.53.1.tar.gz 154260 BLAKE2B c2c9d00f0686bcd4d083974c7c2e167963a6af2d04c244c854937e2301de6df62cf82d872aa53f01150bb657895bccedba1df2ce4d6d091ce27c7abd599d2250 SHA512 ea7b8cf42f041deca2e745d4e8113beb2c46a3a79e5a56b57a24379581eca793e2f3e0d0b5821e3644450eb4da207c3884098ad33e9ec62775657a625ed4a849
--- a/app-admin/linode-cli/linode-cli-5.51.0.ebuild
+++ b/app-admin/linode-cli/linode-cli-5.51.0.ebuild
@ -1,45 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1 pypi shell-completion
-
-DESCRIPTION="Official command-line interface for interacting with the Linode API"
-HOMEPAGE="https://github.com/linode/linode-cli https://www.linode.com/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# Tests require network, a linode account and an API key.
-# WARNING: tests will incur costs and will wipe the account.
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/boto3[${PYTHON_USEDEP}]
-	>=dev-python/linode-metadata-0.3[${PYTHON_USEDEP}]
-	dev-python/openapi3[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/rich[${PYTHON_USEDEP}]
-	<dev-python/urllib3-3[${PYTHON_USEDEP}]
-"
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	PYTHONPATH=. ${EPYTHON} linodecli completion bash > "${T}/${PN}".bash || die
-	PYTHONPATH=. ${EPYTHON} linodecli completion fish > "${T}/${PN}".fish || die
-
-	newbashcomp "${T}/${PN}".bash ${PN}
-	newfishcomp "${T}/${PN}".fish ${PN}
-
-	dosym ${PN} "$(get_bashcompdir)"/linode
-	dosym ${PN} "$(get_bashcompdir)"/lin
-	dosym ${PN} "$(get_fishcompdir)"/linode
-	dosym ${PN} "$(get_fishcompdir)"/lin
-}
--- a/app-admin/linode-cli/linode-cli-5.53.1.ebuild
+++ b/app-admin/linode-cli/linode-cli-5.53.1.ebuild
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@ -1,6 +1,8 @@
 DIST rsyslog-8.2404.0.tar.gz 3408657 BLAKE2B 67170f1ba4ad61bd79088a313ee9b093ecaab512ce24ca56cfe605d4589276406abe593d791736ecb7b2f44be998b3836173272eb5dd69f7bc9ea8d5b49d462e SHA512 fda8032ab7f9cb6c46693edeb95d2b47ab7673836ff44d0686bbbd5a3759885f65a80e1a311c809c2332a19559b0297ac7d8e59e5f828372839f67dbf362e6b1
 DIST rsyslog-8.2406.0.tar.gz 3412827 BLAKE2B c75bfba02cd9d28effb2dd64b6b665b71b46fe6e47a9e12dbe5a6735fdb59373585d655334da64e89c11cbeb0f36a1563562a9c65ead3c2747f876fd0664d800 SHA512 e7c930f9b35b73591c1655afa25408c325c967114550996caa5840331c8f089563536c8efe52588c1b727db7f27bdae9b5ba619222e050d618a3f067de1bcbd0
 DIST rsyslog-8.2408.0.tar.gz 3436647 BLAKE2B b19b25bb9a3e97038b51c049dc7ba52ccd68ec552bf12369fb16d0ec030b8335848ca7ecfe925af4873bc1390264c9b6a05b25ec3ed011389beaa2844ef7a786 SHA512 86901f76290aa451dfc8dc3d2c7eb2ea82bdbf39875fe2872169a3aa44933aff064dd5ea9b80964881fd07c34c17da25ec6a0efc1c5b7f4d6884435639fa0338
+DIST rsyslog-8.2410.0.tar.gz 3438540 BLAKE2B 5a1f2966983c9a84b0662b0f778893dc20223f0bb78f197002eda2dbcea777002294383251f7ada5fd5343a8497e0cb8517142693a04841a816479303c4f96f8 SHA512 afc7e47fc65e01527f7cccf1e4cad58a8ad0c0a98e713e0f5b9e61f808bf334308b56b300744e6f134d98e4234494070beee219f47a240b0c1708f12fb9fa382
 DIST rsyslog-doc-8.2404.0.tar.gz 6568723 BLAKE2B 4bc522f9146754a9ebae5f5f7ffb87cfa2da3d9b0832b902c73896d788a061ad4b99cd269b4fb8fc42917311ea5621dfd398428046c53883e9bba859252172ec SHA512 ea88fcf81fb45be515f1b8e7699efabba98eb7e5fcd2d5046424c303db95926a36baa1215143c05e39b9a86dcfdbc73c5c3a76dee382d7b8f1916653169df264
 DIST rsyslog-doc-8.2406.0.tar.gz 6568856 BLAKE2B c8e1dc2bf9eac465dfebd73539b4b81ec57a5a25723673f2b00477b2e60203f10614206d39a496981adcd348c44c6f455f83e56455902892719617ff136038ff SHA512 8c48bf109e105b2e92e076436e8771f55a1c6a595e525c7fce8720fc675aba4a8897eda076ff9b9369eacc8583e76ea05d056899dee1b6d97f918ff2fd55aced
 DIST rsyslog-doc-8.2408.0.tar.gz 6573562 BLAKE2B 85be04a48c6be5dce477f89227908df8695d7be844968c3d232202dc6907874058f0fa9ef07d16d9b66272b34849917f2b79b8f7ca35d5912156c90df5b0a73a SHA512 9982688880b8362ca2ecd5f076f12aaf31b966144bd9b291761e660307e4c31e8c3ccc17b6b2b0cb2ccf2e30ba81927126991f9539562c2f02966a59fd1624aa
+DIST rsyslog-doc-8.2410.0.tar.gz 6588955 BLAKE2B 1c74db5fded09410741530105f9a0e8322cc3554b022a559b02bbda92475f3cd22dd02f8b00a99bbf8de17547dba0576f12fec5bddeec4a22a7af154b5bc3311 SHA512 da21a15418060d186b20356aa690b06b0aefa1fb4195556b15aacae634b6621fe83eb38dd750c15237f19e4f46d7cdb25691fc451b40826ba37541982c15f02c
--- a/app-admin/rsyslog/rsyslog-8.2410.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2410.0.ebuild
@ -0,0 +1,509 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit autotools linux-info python-any-r1 systemd
+
+DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
+HOMEPAGE="https://www.rsyslog.com/
+	https://github.com/rsyslog/rsyslog/"
+
+if [[ "${PV}" == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
+	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
+
+	inherit git-r3
+else
+	SRC_URI="
+		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
+		doc? (
+			https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz
+		)
+	"
+
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+LICENSE="GPL-3 LGPL-3 Apache-2.0"
+SLOT="0"
+
+IUSE="clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp"
+IUSE+=" impcap jemalloc kafka kerberos kubernetes mdblookup"
+IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl"
+IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl"
+IUSE+=" systemd test usertools +uuid xxhash zeromq"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	kubernetes? ( normalize )
+	ssl? ( || ( gnutls openssl ) )
+"
+
+BDEPEND=">=dev-build/autoconf-archive-2015.02.24
+	sys-apps/lsb-release
+	virtual/pkgconfig
+	test? (
+		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
+		!jemalloc? ( sys-libs/libfaketime )
+		${PYTHON_DEPS}
+	)"
+
+RDEPEND="
+	>=dev-libs/libfastjson-0.99.8:=
+	>=dev-libs/libestr-0.1.9
+	>=sys-libs/zlib-1.2.5
+	curl? ( >=net-misc/curl-7.35.0 )
+	dbi? ( >=dev-db/libdbi-0.8.3 )
+	elasticsearch? ( >=net-misc/curl-7.35.0 )
+	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
+	imhttp? (
+		dev-libs/apr-util
+		www-servers/civetweb
+		virtual/libcrypt:=
+	)
+	impcap? ( net-libs/libpcap )
+	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
+	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
+	kerberos? ( virtual/krb5 )
+	kubernetes? ( >=net-misc/curl-7.35.0 )
+	mdblookup? ( dev-libs/libmaxminddb:= )
+	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
+	mysql? ( dev-db/mysql-connector-c:= )
+	normalize? (
+		>=dev-libs/liblognorm-2.0.3:=
+	)
+	clickhouse? ( >=net-misc/curl-7.35.0 )
+	omhttpfs? ( >=net-misc/curl-7.35.0 )
+	omudpspoof? ( >=net-libs/libnet-1.1.6 )
+	postgres? ( >=dev-db/postgresql-8.4.20:= )
+	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
+	redis? (
+		>=dev-libs/hiredis-0.11.0:=
+		dev-libs/libevent[threads(+)]
+	)
+	relp? ( >=dev-libs/librelp-1.2.17:= )
+	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
+	rfc5424hmac? (
+		>=dev-libs/openssl-0.9.8y:0=
+	)
+	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
+	ssl? (
+		gnutls? ( >=net-libs/gnutls-2.12.23:0= )
+		openssl? (
+			dev-libs/openssl:0=
+		)
+	)
+	systemd? ( >=sys-apps/systemd-234 )
+	uuid? ( sys-apps/util-linux:0= )
+	xxhash? ( dev-libs/xxhash:= )
+	zeromq? (
+		>=net-libs/czmq-4:=[drafts]
+	)"
+
+DEPEND="
+	${RDEPEND}
+	elibc_musl? ( sys-libs/queue-standalone )
+"
+
+if [[ "${PV}" == "9999" ]]; then
+	BDEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
+	BDEPEND+=" >=app-alternatives/lex-2.5.39-r1"
+	BDEPEND+=" >=app-alternatives/yacc-2.4.3"
+	BDEPEND+=" >=dev-python/docutils-0.12"
+fi
+
+CONFIG_CHECK="~INOTIFY_USER"
+WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
+
+PATCHES=( "${FILESDIR}/${PN}-8.2112.0-pr5024-configure.patch" )
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ "${PV}" == "9999" ]]; then
+		git-r3_fetch
+		git-r3_checkout
+	else
+		unpack "${P}.tar.gz"
+	fi
+
+	if use doc; then
+		if [[ "${PV}" == "9999" ]]; then
+			local _EGIT_BRANCH=
+			if [[ -n "${EGIT_BRANCH}" ]]; then
+				# Cannot use rsyslog commits/branches for documentation repository
+				_EGIT_BRANCH="${EGIT_BRANCH}"
+
+				unset EGIT_BRANCH
+			fi
+
+			git-r3_fetch "${DOC_REPO_URI}"
+			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
+
+			if [[ -n "${_EGIT_BRANCH}" ]]; then
+				# Restore previous EGIT_BRANCH information
+				EGIT_BRANCH=${_EGIT_BRANCH}
+			fi
+		else
+			cd "${S}" || die "Cannot change dir into '${S}'"
+			mkdir docs || die "Failed to create docs directory"
+			cd docs || die "Failed to change dir into '${S}/docs'"
+
+			unpack "${PN}-doc-${PV}.tar.gz"
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Bug: https://github.com/rsyslog/rsyslog/issues/3626
+	sed -i \
+		-e '\|^#!/bin/bash$|a exit 77' \
+		tests/mmkubernetes-cache-expir*.sh \
+		|| die "Failed to disable known test failure mmkubernetes-cache-expir*.sh"
+
+	sed -i \
+		-e '\|^#!/bin/bash$|a exit 0' \
+		tests/omprog-close-unresponsive*.sh \
+		|| die "Failed to disable test omprog-close-unresponsive*.sh"
+
+	sed -i \
+		-e '\|^#!/bin/bash$|a exit 0' \
+		tests/uxsock_simple.sh \
+		|| die "Failed to disable test uxsock_simple.sh"
+
+	eautoreconf
+}
+
+src_configure() {
+	# Maintainer notes:
+	# * Guardtime support is missing because libgt isn't yet available
+	#   in portage.
+	# * Hadoop's HDFS file system output module is currently not
+	#   supported in Gentoo because nobody is able to test it
+	#   (JAVA dependency).
+	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
+	#   upstream PR 129 and 136) so we need to export HIREDIS_*
+	#   variables because rsyslog's build system depends on pkg-config.
+
+	if use redis ; then
+		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
+		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
+	fi
+
+	local -a myeconfargs=(
+		--disable-debug-symbols
+		--disable-generate-man-pages
+		--without-valgrind-testbench
+		--disable-liblogging-stdlog
+		--disable-imfile-tests  # Some imfile tests fail (noticed in version 8.2208.0)
+		$(use_enable test testbench)
+		$(use_enable test libfaketime)
+		$(use_enable test extended-tests)
+		# Input Plugins without dependencies
+		--enable-imbatchreport
+		--enable-imdiag
+		--enable-imdocker
+		--enable-imfile
+		--enable-improg
+		--enable-impstats
+		--enable-imptcp
+		# Message Modificiation Plugins without dependencies
+		--enable-mmanon
+		--enable-mmaudit
+		--enable-mmcount
+		--enable-mmfields
+		--enable-mmjsonparse
+		--enable-mmpstrucdata
+		--enable-mmrm1stspace
+		--enable-mmsequence
+		--enable-mmtaghostname
+		--enable-mmutf8fix
+		# Output Modification Plugins without dependencies
+		--enable-mail
+		--enable-omprog
+		--enable-omruleset
+		--enable-omstdout
+		--enable-omuxsock
+		# Misc
+		--enable-fmhash
+		--enable-fmunflatten
+		$(use_enable xxhash fmhash-xxhash)
+		--enable-pmaixforwardedfrom
+		--enable-pmciscoios
+		--enable-pmcisconames
+		--enable-pmdb2diag
+		--enable-pmlastmsg
+		$(use_enable normalize pmnormalize)
+		--enable-pmnull
+		--enable-pmpanngfw
+		--enable-pmsnare
+		# DB
+		$(use_enable dbi libdbi)
+		$(use_enable mongodb ommongodb)
+		$(use_enable mysql)
+		$(use_enable postgres pgsql)
+		$(use_enable redis imhiredis)
+		$(use_enable redis omhiredis)
+		# Debug
+		$(use_enable debug)
+		$(use_enable debug diagtools)
+		$(use_enable debug valgrind)
+		# Misc
+		$(use_enable clickhouse)
+		$(use_enable curl fmhttp)
+		$(use_enable elasticsearch)
+		$(use_enable gcrypt libgcrypt)
+		$(use_enable imhttp)
+		$(use_enable impcap)
+		$(use_enable jemalloc)
+		$(use_enable kafka imkafka)
+		$(use_enable kafka omkafka)
+		$(use_enable kerberos gssapi-krb5)
+		$(use_enable kubernetes mmkubernetes)
+		$(use_enable normalize mmnormalize)
+		$(use_enable mdblookup mmdblookup)
+		$(use_enable omhttp)
+		$(use_enable omhttpfs)
+		$(use_enable omudpspoof)
+		$(use_enable rabbitmq omrabbitmq)
+		$(use_enable relp)
+		$(use_enable rfc3195)
+		$(use_enable rfc5424hmac mmrfc5424addhmac)
+		$(use_enable snmp)
+		$(use_enable snmp mmsnmptrapd)
+		$(use_enable gnutls)
+		$(use_enable openssl)
+		$(use_enable systemd imjournal)
+		$(use_enable systemd omjournal)
+		$(use_enable usertools)
+		$(use_enable uuid)
+		$(use_enable zeromq imczmq)
+		$(use_enable zeromq omczmq)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use doc && [[ "${PV}" == "9999" ]]; then
+		einfo "Building documentation ..."
+		local doc_dir="${S}/docs"
+		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
+		sphinx-build -b html source build || die "Building documentation failed!"
+	fi
+}
+
+src_test() {
+	local _has_increased_ulimit=
+
+	# Sometimes tests aren't executable (i.e. when added via patch)
+	einfo "Adjusting permissions of test scripts ..."
+	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
+		die "Failed to adjust test scripts permission"
+
+	if ulimit -n 3072; then
+		_has_increased_ulimit="true"
+	fi
+
+	if ! emake --jobs 1 check; then
+		eerror "Test suite failed! :("
+
+		if [[ -z "${_has_increased_ulimit}" ]]; then
+			eerror "Probably because open file limit couldn't be set to 3072."
+		fi
+
+		if has userpriv ${FEATURES}; then
+			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
+				"before you submit a bug report."
+		fi
+
+	fi
+}
+
+src_install() {
+	local -a DOCS=(
+		AUTHORS
+		ChangeLog
+		"${FILESDIR}"/README.gentoo-r1
+	)
+
+	use doc && local -a HTML_DOCS=( "${S}/docs/build/." )
+
+	default
+
+	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
+
+	systemd_newunit "${FILESDIR}/${PN}.service" ${PN}.service
+
+	keepdir /var/spool/${PN}
+	keepdir /etc/ssl/${PN}
+	keepdir /etc/${PN}.d
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}.conf" ${PN}.conf
+
+	insinto /etc/rsyslog.d/
+	newins "${FILESDIR}/50-default-r2.conf" 50-default.conf
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
+
+	if use mysql; then
+		insinto /usr/share/${PN}/scripts/mysql
+		doins plugins/ommysql/createDB.sql
+	fi
+
+	if use postgres; then
+		insinto /usr/share/${PN}/scripts/pgsql
+		doins plugins/ompgsql/createDB.sql
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	local advertise_readme=0
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		advertise_readme=1
+
+		if use mysql || use postgres; then
+			echo
+			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
+			elog "  /usr/share/doc/${PF}/scripts"
+		fi
+
+		if use ssl; then
+			echo
+			elog "To create a default CA and certificates for your server and clients, run:"
+			elog "  emerge --config =${PF}"
+			elog "on your logging server. You can run it several times,"
+			elog "once for each logging client. The client certificates will be signed"
+			elog "using the CA certificate generated during the first run."
+		fi
+	fi
+
+	if [[ ${advertise_readme} -gt 0 ]]; then
+		# We need to show the README file location
+
+		echo ""
+		elog "Please read"
+		elog ""
+		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
+		elog ""
+		elog "for more details."
+	fi
+}
+
+pkg_config() {
+	if ! use ssl ; then
+		einfo "There is nothing to configure for rsyslog unless you"
+		einfo "used USE=ssl to build it."
+
+		return 0
+	fi
+
+	if ! hash certtool &>/dev/null; then
+		die "certtool not found! Is net-libs/gnutls[tools] is installed?"
+	fi
+
+	# Make sure the certificates directory exists
+	local CERTDIR="${EROOT}/etc/ssl/${PN}"
+	if [[ ! -d "${CERTDIR}" ]]; then
+		mkdir "${CERTDIR}" || die
+	fi
+	einfo "Your certificates will be stored in ${CERTDIR}"
+
+	# Create a default CA if needed
+	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
+		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" || die
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = Portage automated CA
+		ca
+		cert_signing_key
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-self-signed \
+			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
+			--template "${T}/${PF}.$$" || die
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		# Create the server certificate
+		echo
+		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
+		read -r CN
+
+		einfo "Creating private key and certificate for server ${CN}..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die
+		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = ${CN}
+		tls_www_server
+		dns_name = ${CN}
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-certificate \
+			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--template "${T}/${PF}.$$" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	else
+		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
+	fi
+
+	# Create a client certificate
+	echo
+	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
+	read -r CN
+
+	einfo "Creating private key and certificate for client ${CN}..."
+	certtool --generate-privkey \
+		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die
+	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+	cat > "${T}/${PF}.$$" <<- _EOF
+	cn = ${CN}
+	tls_www_client
+	dns_name = ${CN}
+	expiration_days = 3650
+	_EOF
+
+	certtool --generate-certificate \
+		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+		--template "${T}/${PF}.$$" || die
+	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	rm -f "${T}/${PF}.$$"
+
+	echo
+	einfo "Here is the documentation on how to encrypt your log traffic:"
+	einfo " https://www.rsyslog.com/doc/rsyslog_tls.html"
+}
--- a/app-admin/stow/stow-2.4.1.ebuild
+++ b/app-admin/stow/stow-2.4.1.ebuild
@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/stow/${P}.tar.bz2.sig )"

 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~mips ~ppc ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"

--- a/app-admin/terraform/Manifest
+++ b/app-admin/terraform/Manifest
@ -1,6 +1,4 @@
-DIST terraform-1.8.4-deps.tar.xz 107840308 BLAKE2B 414f8e4bb6c72aa8bb0d5ed040c49c572aac0a50932f2ca3c0eddc6973f5fd21775c2db394d21628bd7bd302900fb28f4713ecf9835b5bce40c15ec6fb34bf4b SHA512 3491fc9e789444882acfcc4a8374cb3e49f6fe128d66f53339145b7fa6b75e73c8d5d294ee03b0e96af746dc0cbc6c2e0bce1d149df1c881c686000431b22428
-DIST terraform-1.8.4.tar.gz 6307332 BLAKE2B d26d62e4e99bf0e0b23277c7343e6da0281bb3b9bdfbe6b74277bc6a2ef9b8cb2e374b204ecdd933819a5576bde44115998ac030d7b801d8dd40a390d9df40dd SHA512 0babc6400a8e49ebcc734cf7ff4377ae91fb90f1e77b56e8fdc288203e1708b8f7c5c16e4aa64a720ab4b4c191959d0cfdfda1aa3514c36e806c8d5b7f65b663
-DIST terraform-1.9.1-deps.tar.xz 108273656 BLAKE2B 6bad479e0217eeafcb5f7c75926d1dcdc50873f34d194d4829a1277a06ab81a4ff4f5945ab8ba628f40475fc93e9375a165e08f99b4bc685f3d150cfbddc0a71 SHA512 0016d5bd19a34032daf58cbb8d42ba3a2209cb295f6e20c484f45b70daf3283dd2de213446ec7cc088df24ce1d825b4ab8c064b2162739356f815cab7b61cbb2
-DIST terraform-1.9.1.tar.gz 6563160 BLAKE2B 3f9d8992ca15ddd0fe225fbdb6dc194dcc42dd1700edf739f80b4fe1aef5dcdbbb560a525f0f5564562d0e299cbabbf542c54d49160fb1c8ff674421200f39de SHA512 bbc4d03807f714902300e0a461653c137cebdcaadca879da8834fc232955d2f700711541641f05337946c755e9963010034998bff76a84aa1ac65fa6ae6871ec
 DIST terraform-1.9.5-deps.tar.xz 108369816 BLAKE2B 8476a09ad400818ec95bf1457003aeab1f76cd85b9ffa07e27be58eb63469a2bd1f7c0ddaa3903ec8e1641541d091367b333772bf37026611743aea82c1cfcf2 SHA512 b2c477180aeab5c3c51acb6960a3fea1f793a22fa9529b474d9b1ebc82bc62aed5ff2ab4567838666bb1ee4cbfe4ff0dd528d8f55853dadcc2a96a2a889fc996
 DIST terraform-1.9.5.tar.gz 6568796 BLAKE2B 7dde80aef2c189942c6e23e2162a7e1f97d56ee78e7106c247600fe9437bcd63cce28003d2ac7dcb474fc91b9953d4bf953ed0e4bad68cc60ed8e1cd2d641e48 SHA512 422b7f288306d76cc82875e8514df37aa36c6cd97860f3f9a5e3770ec56f395cf1ffcc65e3211044c01d0f75b4331960720f8672efff7821a9d7f63f65999a6a
+DIST terraform-1.9.8-deps.tar.xz 107050652 BLAKE2B dfc98d9c58d981899d97278b98071d857c21ad5812f6aa3889befef4ffd0527a94af9e53a842d86826c66fcacdfcc8b265cde282cf161ae42c48966c69331a54 SHA512 982d7672f48632085ca90c2b1182cdc9a031fbc8d5a6b724578cb407f183f5185e0b1387906c171bd5ee6cbad7a8ef1c4810e5f8ef0fd424bf2e654201ad1700
+DIST terraform-1.9.8.tar.gz 6646861 BLAKE2B cadb58e748d41e50cde5fedd362a7558b4122fe33c428c9e841706cdb47426a9ae614fce10ea7ba4b04baa8379ff919707d71776d954754456e42d4e041c32a1 SHA512 dc369d612f8ea463e38538bb144d679b6fe4df2f554ec4715b669abee3d8045076a79d589e1ff950dba4e4aab84ef7a7656dd6d6be278d8b5468aeabd183d818
--- a/app-admin/terraform/terraform-1.8.4.ebuild
+++ b/app-admin/terraform/terraform-1.8.4.ebuild
@ -1,41 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-
-DESCRIPTION="A tool for building, changing, and combining infrastructure safely"
-HOMEPAGE="https://www.terraform.io/"
-SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="BUSL-1.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv"
-
-BDEPEND="dev-go/gox
-	>=dev-lang/go-1.21.5"
-
-RESTRICT="test"
-
-DOCS=( {README,CHANGELOG}.md )
-
-src_compile() {
-	export CGO_ENABLED=0
-	gox \
-		-os=$(go env GOOS) \
-		-arch=$(go env GOARCH) \
-		-output bin/terraform \
-		-verbose \
-		. || die
-}
-
-src_install() {
-	dobin bin/*
-	einstalldocs
-}
-
-pkg_postinst() {
-	elog "If you would like to install shell completions please run:"
-	elog "    terraform -install-autocomplete"
-}
--- a/app-admin/terraform/terraform-1.9.5.ebuild
+++ b/app-admin/terraform/terraform-1.9.5.ebuild
@ -11,7 +11,7 @@ SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"

 LICENSE="BUSL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="amd64 ~arm64 ~riscv"

 BDEPEND="dev-go/gox
 	>=dev-lang/go-1.21.5"
--- a/app-admin/terraform/terraform-1.9.8.ebuild
+++ b/app-admin/terraform/terraform-1.9.8.ebuild
--- a/app-antivirus/Manifest.gz
+++ b/app-antivirus/Manifest.gz
--- a/app-antivirus/clamav/clamav-1.0.7.ebuild
+++ b/app-antivirus/clamav/clamav-1.0.7.ebuild
@ -168,7 +168,7 @@ S=${WORKDIR}/clamav-${MY_P}
 LICENSE="Apache-2.0 BSD GPL-2 ISC MIT MPL-2.0 Unicode-DFS-2016 ZLIB"
 SLOT="0/lts"
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 fi

 IUSE="doc clamonacc +clamapp experimental jit libclamav-only milter rar selinux +system-mspack systemd test"
--- a/app-antivirus/clamav/clamav-1.4.1-r1.ebuild
+++ b/app-antivirus/clamav/clamav-1.4.1-r1.ebuild
@ -171,7 +171,7 @@ LICENSE="Apache-2.0 BSD GPL-2 ISC MIT MPL-2.0 Unicode-DFS-2016 ZLIB"
 # 0/sts (short term support) if not an LTS release
 SLOT="0/sts"
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 fi

 IUSE="doc clamonacc +clamapp experimental jit libclamav-only milter rar selinux +system-mspack systemd test"
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/cfv/metadata.xml
+++ b/app-arch/cfv/metadata.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>sbraz@gentoo.org</email>
--- a/app-arch/libdeflate/metadata.xml
+++ b/app-arch/libdeflate/metadata.xml
@ -17,4 +17,4 @@
 	<upstream>
 		<remote-id type="github">ebiggers/libdeflate</remote-id>
 	</upstream>
-</pkgmetadata>
+</pkgmetadata>
--- a/app-arch/p7zip/p7zip-17.05-r1.ebuild
+++ b/app-arch/p7zip/p7zip-17.05-r1.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/p7zip-project/p7zip/archive/v${PV}.tar.gz -> ${P}.ta

 LICENSE="LGPL-2.1 rar? ( unRAR )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos"
 IUSE="abi_x86_x32 natspec +pch rar test"

 REQUIRED_USE="test? ( rar )" # bug 907221
--- a/app-arch/upx-bin/upx-bin-4.2.4.ebuild
+++ b/app-arch/upx-bin/upx-bin-4.2.4.ebuild
@ -21,7 +21,7 @@ S="${WORKDIR}"

 LICENSE="GPL-2+ UPX-exception"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="-* amd64 ~arm arm64 ~mips ~ppc ~ppc64 ~x86"
 RESTRICT="strip"

 RDEPEND="!app-arch/upx"
--- a/app-arch/upx/upx-4.2.4.ebuild
+++ b/app-arch/upx/upx-4.2.4.ebuild
@ -12,7 +12,7 @@ S="${WORKDIR}/${P}-src"

 LICENSE="GPL-2+ UPX-exception" # Read the exception before applying any patches
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"

--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
--- a/app-backup/bacula/bacula-15.0.2.ebuild
+++ b/app-backup/bacula/bacula-15.0.2.ebuild
@ -3,7 +3,7 @@

 EAPI=8

-inherit desktop libtool qmake-utils systemd
+inherit desktop flag-o-matic libtool qmake-utils systemd

 MY_PV=${PV/_beta/-b}
 MY_P=${PN}-${MY_PV}
@ -195,6 +195,13 @@ src_prepare() {
 }

 src_configure() {
+	# -Werror=lto-type-mismatch
+	# bug #940695
+	#
+	# common datastructures with partial different components for
+	# different tools of the backup suite
+	filter-lto
+
 	local myconf=''

 	if use bacula-clientonly; then
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@ -1,2 +1 @@
-DIST borgmatic-1.8.13.tar.gz 621942 BLAKE2B abea4779d6b8dc2e7885c4e5ff4e6e4a472ecdba8b248f28b137ab25df5c12ce31e71489485966a0df27c8ff388476049ed8f58fcd53d16d09f01e9fa215ac0e SHA512 0057ba195c493c47ecb4eaaca1987b68c332632ebe5015ac20cd5f59f3f8f8b00a06749d828f003866986b3f70c3794a945577f4f49bf775153aa0f75fdfcf49
 DIST borgmatic-1.8.14.tar.gz 623966 BLAKE2B fd52bc5be4f63e1207a0bedcf654af075082d31af76ddc65ea30a3259f1ec093c826612e114fd9f9fa46668f80eed3b2b6a88262fbb9e4db49c36ba31efa70c5 SHA512 74daecbf02f957b21121dff073c2e114c87b1afdf6b3408b8fc2bf465102425cca60e4bdc8bc8d0e2d0a9c20b1f514eb7c9a2e136e71cb61969e07a38841235a
--- a/app-backup/borgmatic/borgmatic-1.8.13.ebuild
+++ b/app-backup/borgmatic/borgmatic-1.8.13.ebuild
@ -1,78 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1 systemd pypi
-
-DESCRIPTION="Automatically create, prune and verify backups with borgbackup"
-HOMEPAGE="https://torsion.org/borgmatic/"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv"
-IUSE="apprise"
-
-# borg is called as an external tool, hence no pythonic stuff
-RDEPEND="app-backup/borgbackup
-	$(python_gen_cond_dep '
-		<dev-python/colorama-0.5[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	')
-	apprise? ( $(python_gen_cond_dep '
-		dev-python/apprise[${PYTHON_USEDEP}]
-	') )"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/apprise[${PYTHON_USEDEP}]
-			>=dev-python/flexmock-0.10.10[${PYTHON_USEDEP}]
-		')
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.13-no_test_coverage.patch
-	"${FILESDIR}"/${PN}-1.7.14-systemd_service_bin_path.patch
-)
-
-# A fragile test whose only purpose is to make sure the NEWS file
-# has been updated for the current version.
-EPYTEST_DESELECT=(
-	tests/integration/commands/test_borgmatic.py::test_borgmatic_version_matches_news_version
-)
-
-distutils_enable_tests pytest
-
-src_install() {
-	distutils-r1_src_install
-	systemd_dounit sample/systemd/borgmatic.{service,timer}
-	keepdir /etc/borgmatic
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "To generate a sample configuration file, run:"
-		elog "    ${PN} config generate"
-	else
-		local oldver
-		for oldver in ${REPLACING_VERSIONS}; do
-			if ver_test "${oldver}" -lt 1.8.0; then
-				ewarn "Please be warned that ${PN}-1.8.0 has introduced several breaking changes."
-				ewarn "For details, please see"
-				ewarn
-				ewarn "	https://github.com/borgmatic-collective/borgmatic/releases/tag/1.8.0"
-				ewarn
-				break
-			fi
-		done
-	fi
-	elog
-	elog "Systemd users wishing to periodically run ${PN} can use the provided timer and service units."
-}
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
--- a/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-24.08.1.ebuild
+++ b/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-24.08.1.ebuild
@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/dolphin_plugins/"

 LICENSE="GPL-2+"
 SLOT="6"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~x86"
 IUSE=""

 DEPEND="
--- a/app-cdr/isoimagewriter/isoimagewriter-24.08.1.ebuild
+++ b/app-cdr/isoimagewriter/isoimagewriter-24.08.1.ebuild
@ -12,7 +12,7 @@ HOMEPAGE="https://community.kde.org/ISOImageWriter"

 LICENSE="GPL-3"
 SLOT="6"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~x86"
 IUSE=""

 DEPEND="
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
--- a/app-containers/buildah/buildah-1.35.3.ebuild
+++ b/app-containers/buildah/buildah-1.35.3.ebuild
@ -120,6 +120,7 @@ src_compile() {

 	tc-export AS LD STRIP
 	export GOMD2MAN="$(command -v go-md2man)"
+	export SELINUXOPT=
 	default
 }

@ -128,6 +129,6 @@ src_test() {
 }

 src_install() {
-	emake DESTDIR="${ED}" install install.completions
+	emake DESTDIR="${ED}" SELINUXOPT= install install.completions
 	einstalldocs
 }
--- a/app-containers/buildah/buildah-1.35.4.ebuild
+++ b/app-containers/buildah/buildah-1.35.4.ebuild
@ -120,6 +120,7 @@ src_compile() {

 	tc-export AS LD STRIP
 	export GOMD2MAN="$(command -v go-md2man)"
+	export SELINUXOPT=
 	default
 }

@ -128,6 +129,6 @@ src_test() {
 }

 src_install() {
-	emake DESTDIR="${ED}" install install.completions
+	emake DESTDIR="${ED}" SELINUXOPT= install install.completions
 	einstalldocs
 }
--- a/app-containers/buildah/buildah-1.36.0.ebuild
+++ b/app-containers/buildah/buildah-1.36.0.ebuild
@ -115,6 +115,7 @@ src_compile() {

 	tc-export AS LD STRIP
 	export GOMD2MAN="$(command -v go-md2man)"
+	export SELINUXOPT=
 	default
 }

@ -123,6 +124,6 @@ src_test() {
 }

 src_install() {
-	emake DESTDIR="${ED}" install install.completions
+	emake DESTDIR="${ED}" SELINUXOPT= install install.completions
 	einstalldocs
 }
--- a/app-containers/buildah/buildah-9999.ebuild
+++ b/app-containers/buildah/buildah-9999.ebuild
@ -115,6 +115,7 @@ src_compile() {

 	tc-export AS LD STRIP
 	export GOMD2MAN="$(command -v go-md2man)"
+	export SELINUXOPT=
 	default
 }

@ -123,6 +124,6 @@ src_test() {
 }

 src_install() {
-	emake DESTDIR="${ED}" install install.completions
+	emake DESTDIR="${ED}" SELINUXOPT= install install.completions
 	einstalldocs
 }
--- a/app-containers/incus/Manifest
+++ b/app-containers/incus/Manifest
@ -1,8 +1,4 @@
-DIST incus-6.0.1.tar.xz 11653056 BLAKE2B d026f9fb99d7393d286006cfe759681b58b980b7a2432a98ba8a6862e17099ef6ee8d1ec1766d00fac1a6d1e748a7d10d3d5ad14b31c542618044f77a27fe255 SHA512 8218c121cf1afd307f748c0f1c0b1ba34a05fa0c43a515aab03d9f92c66becaa6bff245e93842e7b0746ce6019d66f1a5e4c317ec05e0ab088b539e5378d78dc
-DIST incus-6.0.1.tar.xz.asc 833 BLAKE2B c5c9d3d4796e97ef745102c13e52d691e7f087a5a0cc8e0a069ec7c94686e6e8de04d3dd247157e16eb3deea2b877453e3462ec829ced2ba9cb1928af9a3aa1b SHA512 c47df95afa7c9ef7041fb29497567ab3b1ed30c3c175b4be84bc75a6a2c47072cc291e43fa738a5a58d753b04aef87334780f9d45184a9543a49fad263859aa0
 DIST incus-6.0.2.tar.xz 11197324 BLAKE2B fa15816ea05865ce48f7cb668c3138d2d186a1876669d6eaf05ffd335d8feedf7eda41301be9d2e07879aa3fb2e7177a5bd26cb89a3789d46ef648c2fcb06db5 SHA512 ef58bc22154204a3f89b973fd5289385fa98aa2c2a97b0ff3ed2fa2a0c899ee3dc08cb46552ade2e86dc13f5de55f9ef59aea775c60eb3df74d088f8a1e2795a
 DIST incus-6.0.2.tar.xz.asc 833 BLAKE2B bcdeb0d2a3684dcdcb620166865523a2e9eb595f0e7760f05a06ea0608dc4fc7111b75206fe62a63cfd90a0d0ec79206404994e53770d5e35a639a67e1ad753c SHA512 18587ddc7b7cb41418ee0e7a43875663e71c9d39a505fd55bc29fe83717b5d5cdc876c46912561610735ddf80462631716354a943a272ae5ccf0ee495aff1c1c
-DIST incus-6.5.tar.xz 11233032 BLAKE2B 667bf93a55dc58f8426765d3b536fee0e3b3f521fa64ba51948874a04dbf4549d856170f50723aaad18690169e41913507bdac4cf426c65cf89df06ae883b1e8 SHA512 e5e9d0b7458052214813201c771c24e878c0682d749bb150fd477f5319a4dc1b641c963646ee5c16981d5698e941b62a4c5cc7a5f29e9f45eebf6a443dc029ec
-DIST incus-6.5.tar.xz.asc 833 BLAKE2B f2c468c86f5d4524bc0590bbd6b2c3e6bb69e2173cc63eb3f0b1d75a5ecd0ceb3e906c77a31011f82ced4407a00562e066494ff2ae4e82144e9eb0e28d88d4e7 SHA512 f31aceb2972dac43f7dfca5968224961b2666eccacb1a31cc9de1baf5415e85f32f41e23f4b6eb4411e66f59260b7a847457827b641e02e7221ec6b12331d911
 DIST incus-6.6.tar.xz 11835124 BLAKE2B a21ada1f3a0eb571a896c86538873ec061293a3f7430a71a0edbc2a3f547b2ffb12095296c983b25c3285f81a13ce4c4d63c857615ddbbd8ac6a65b4a83f3976 SHA512 7d4d31702655ef5a7851a4058c04b89ade635e9196700bdd2845657c38dd5ba253f6da2a30f6dc60e4657ea1d04b08aeb7ea22842732507a558c9225eddfe007
 DIST incus-6.6.tar.xz.asc 833 BLAKE2B f59487815f87bfec1bb70342eb3463346bd0a25c8d980cc857095d8490ca45dc7785b0ea1bd7489064b08633de4cc710aa90823fdd22bb9dfd7ddfd9076b1d4c SHA512 69021d4a7827abfef370aeeaac0671e81902918d3b767468aaea54093214461e8cc23fbc8e4f83f957f5d4120d4969f0966c6312d250f2e7ce3373c603edf37a
--- a/app-containers/incus/incus-6.0.1-r1.ebuild
+++ b/app-containers/incus/incus-6.0.1-r1.ebuild
@ -1,219 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module linux-info optfeature systemd toolchain-funcs verify-sig
-
-DESCRIPTION="Modern, secure and powerful system container and virtual machine manager"
-HOMEPAGE="https://linuxcontainers.org/incus/introduction/ https://github.com/lxc/incus"
-SRC_URI="https://linuxcontainers.org/downloads/incus/${P}.tar.xz
-	verify-sig? ( https://linuxcontainers.org/downloads/incus/${P}.tar.xz.asc )"
-
-LICENSE="Apache-2.0 BSD LGPL-3 MIT"
-SLOT="0/lts"
-KEYWORDS="amd64 ~arm64"
-IUSE="apparmor fuidshift nls"
-
-DEPEND="acct-group/incus
-	acct-group/incus-admin
-	app-arch/xz-utils
-	>=app-containers/lxc-5.0.0:=[apparmor?,seccomp(+)]
-	dev-db/sqlite:3
-	>=dev-libs/cowsql-1.15.6
-	dev-libs/lzo
-	>=dev-libs/raft-0.22.1:=[lz4]
-	>=dev-util/xdelta-3.0[lzma(+)]
-	net-dns/dnsmasq[dhcp]
-	sys-libs/libcap
-	virtual/udev"
-RDEPEND="${DEPEND}
-	fuidshift? ( !app-containers/lxd )
-	net-firewall/ebtables
-	net-firewall/iptables
-	sys-apps/iproute2
-	sys-fs/fuse:*
-	>=sys-fs/lxcfs-5.0.0
-	sys-fs/squashfs-tools[lzma]
-	virtual/acl"
-BDEPEND=">=dev-lang/go-1.21
-	nls? ( sys-devel/gettext )
-	verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
-
-CONFIG_CHECK="
-	~CGROUPS
-	~IPC_NS
-	~NET_NS
-	~PID_NS
-
-	~SECCOMP
-	~USER_NS
-	~UTS_NS
-
-	~KVM
-	~MACVTAP
-	~VHOST_VSOCK
-"
-
-ERROR_IPC_NS="CONFIG_IPC_NS is required."
-ERROR_NET_NS="CONFIG_NET_NS is required."
-ERROR_PID_NS="CONFIG_PID_NS is required."
-ERROR_SECCOMP="CONFIG_SECCOMP is required."
-ERROR_UTS_NS="CONFIG_UTS_NS is required."
-
-WARNING_KVM="CONFIG_KVM and CONFIG_KVM_AMD/-INTEL is required for virtual machines."
-WARNING_MACVTAP="CONFIG_MACVTAP is required for virtual machines."
-WARNING_VHOST_VSOCK="CONFIG_VHOST_VSOCK is required for virtual machines."
-
-# Go magic.
-QA_PREBUILT="/usr/bin/incus
-	/usr/bin/lxc-to-incus
-	/usr/bin/incus-agent
-	/usr/bin/incus-benchmark
-	/usr/bin/incus-migrate
-	/usr/sbin/fuidshift
-	/usr/sbin/lxd-to-incus
-	/usr/sbin/incusd"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/linuxcontainers.asc
-
-# The testsuite must be run as root.
-# make: *** [Makefile:156: check] Error 1
-RESTRICT="test"
-
-GOPATH="${S}/_dist"
-
-src_unpack() {
-	verify-sig_src_unpack
-	go-module_src_unpack
-}
-
-src_prepare() {
-	export GOPATH="${S}/_dist"
-
-	default
-
-	sed -i \
-		-e "s:\./configure:./configure --prefix=/usr --libdir=${EPREFIX}/usr/lib/incus:g" \
-		-e "s:make:make ${MAKEOPTS}:g" \
-		Makefile || die
-
-	# Fix hardcoded ovmf file path, see bug 763180
-	sed -i \
-		-e "s:/usr/share/OVMF:/usr/share/edk2/OvmfX64:g" \
-		-e "s:OVMF_VARS.ms.fd:OVMF_VARS.fd:g" \
-		doc/environment.md \
-		internal/server/apparmor/instance.go \
-		internal/server/apparmor/instance_qemu.go \
-		internal/server/instance/drivers/driver_qemu.go || die "Failed to fix hardcoded ovmf paths."
-
-	# Fix hardcoded virtfs-proxy-helper file path, see bug 798924
-	sed -i \
-		-e "s:/usr/lib/qemu/virtfs-proxy-helper:/usr/libexec/virtfs-proxy-helper:g" \
-		internal/server/device/device_utils_disk.go || die "Failed to fix virtfs-proxy-helper path."
-
-	cp "${FILESDIR}"/incus-0.4.service "${T}"/incus.service || die
-	if use apparmor; then
-		sed -i \
-			'/^EnvironmentFile=.*/a ExecStartPre=\/usr\/libexec\/lxc\/lxc-apparmor-load' \
-			"${T}"/incus.service || die
-	fi
-
-	# Disable -Werror's from go modules.
-	find "${S}" -name "cgo.go" -exec sed -i "s/ -Werror / /g" {} + || die
-}
-
-src_configure() { :; }
-
-src_compile() {
-	export GOPATH="${S}/_dist"
-	export CGO_LDFLAGS_ALLOW="-Wl,-z,now"
-
-	for k in incus-benchmark incus-simplestreams incus-user incus lxc-to-incus lxd-to-incus ; do
-		ego install -v -x "${S}/cmd/${k}"
-	done
-
-	if use fuidshift ; then
-		ego install -v -x "${S}/cmd/fuidshift"
-	fi
-
-	ego install -v -x -tags libsqlite3 "${S}"/cmd/incusd
-
-	# Needs to be built statically
-	CGO_ENABLED=0 go install -v -tags netgo "${S}"/cmd/incus-migrate
-	CGO_ENABLED=0 go install -v -tags agent,netgo "${S}"/cmd/incus-agent
-
-	use nls && emake build-mo
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	export GOPATH="${S}/_dist"
-
-	if tc-is-cross-compiler ; then
-		local bindir="_dist/bin/linux_${GOARCH}"
-	else
-		local bindir="_dist/bin"
-	fi
-
-	newsbin "${FILESDIR}"/incus-startup-0.4.sh incus-startup
-
-	# Admin tools
-	for l in incusd incus-user lxd-to-incus ; do
-		dosbin ${bindir}/${l}
-	done
-
-	# User tools
-	for m in incus-agent incus-benchmark incus-migrate incus-simplestreams incus lxc-to-incus ; do
-		dobin ${bindir}/${m}
-	done
-
-	# fuidshift, should be moved under admin tools at some point
-	if use fuidshift ; then
-		dosbin ${bindir}/fuidshift
-	fi
-
-	newconfd "${FILESDIR}"/incus-0.4.confd incus
-	newinitd "${FILESDIR}"/incus-0.4.initd incus
-	newinitd "${FILESDIR}"/incus-user-0.4.initd incus-user
-
-	systemd_dounit "${T}"/incus.service
-	systemd_newunit "${FILESDIR}"/incus-0.4.socket incus.socket
-	systemd_newunit "${FILESDIR}"/incus-startup-0.4.service incus-startup.service
-	systemd_newunit "${FILESDIR}"/incus-user-0.4.service incus-user.service
-	systemd_newunit "${FILESDIR}"/incus-user-0.4.socket incus-user.socket
-
-	if ! tc-is-cross-compiler; then
-		# Generate and install shell completion files.
-		mkdir -p "${D}"/usr/share/{bash-completion/completions/,fish/vendor_completions.d/,zsh/site-functions/} || die
-		"${bindir}"/incus completion bash > "${D}"/usr/share/bash-completion/completions/incus || die
-		"${bindir}"/incus completion fish > "${D}"/usr/share/fish/vendor_completions.d/incus.fish || die
-		"${bindir}"/incus completion zsh > "${D}"/usr/share/zsh/site-functions/_incus || die
-	else
-		ewarn "Shell completion files not installed! Install them manually with incus completion --help"
-	fi
-
-	dodoc AUTHORS
-	dodoc -r doc/*
-	use nls && domo po/*.mo
-}
-
-pkg_postinst() {
-	elog
-	elog "Please see"
-	elog "  https://wiki.gentoo.org/wiki/Incus"
-	elog "  https://wiki.gentoo.org/wiki/Incus#Migrating_from_LXD"
-	elog
-	optfeature "virtual machine support" app-cdr/cdrtools app-emulation/qemu[spice,usbredir,virtfs]
-	optfeature "btrfs storage backend" sys-fs/btrfs-progs
-	optfeature "ipv6 support" net-dns/dnsmasq[ipv6]
-	optfeature "full incus-migrate support" net-misc/rsync
-	optfeature "lvm2 storage backend" sys-fs/lvm2
-	optfeature "zfs storage backend" sys-fs/zfs
-	elog
-	elog "Be sure to add your local user to the incus group."
-	elog
-}
--- a/app-containers/incus/incus-6.5-r1.ebuild
+++ b/app-containers/incus/incus-6.5-r1.ebuild
@ -1,215 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module linux-info optfeature systemd toolchain-funcs verify-sig
-
-DESCRIPTION="Modern, secure and powerful system container and virtual machine manager"
-HOMEPAGE="https://linuxcontainers.org/incus/introduction/ https://github.com/lxc/incus"
-SRC_URI="https://linuxcontainers.org/downloads/incus/${P}.tar.xz
-	verify-sig? ( https://linuxcontainers.org/downloads/incus/${P}.tar.xz.asc )"
-
-LICENSE="Apache-2.0 BSD LGPL-3 MIT"
-SLOT="0/stable"
-KEYWORDS="~amd64 ~arm64"
-IUSE="apparmor fuidshift nls"
-
-DEPEND="acct-group/incus
-	acct-group/incus-admin
-	app-arch/xz-utils
-	>=app-containers/lxc-5.0.0:=[apparmor?,seccomp(+)]
-	dev-db/sqlite:3
-	>=dev-libs/cowsql-1.15.6
-	dev-libs/lzo
-	>=dev-libs/raft-0.22.1:=[lz4]
-	>=dev-util/xdelta-3.0[lzma(+)]
-	net-dns/dnsmasq[dhcp]
-	sys-libs/libcap
-	virtual/udev"
-RDEPEND="${DEPEND}
-	fuidshift? ( !app-containers/lxd )
-	net-firewall/ebtables
-	net-firewall/iptables
-	sys-apps/iproute2
-	sys-fs/fuse:*
-	>=sys-fs/lxcfs-5.0.0
-	sys-fs/squashfs-tools[lzma]
-	virtual/acl"
-BDEPEND=">=dev-lang/go-1.21
-	nls? ( sys-devel/gettext )
-	verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
-
-CONFIG_CHECK="
-	~CGROUPS
-	~IPC_NS
-	~NET_NS
-	~PID_NS
-
-	~SECCOMP
-	~USER_NS
-	~UTS_NS
-
-	~KVM
-	~MACVTAP
-	~VHOST_VSOCK
-"
-
-ERROR_IPC_NS="CONFIG_IPC_NS is required."
-ERROR_NET_NS="CONFIG_NET_NS is required."
-ERROR_PID_NS="CONFIG_PID_NS is required."
-ERROR_SECCOMP="CONFIG_SECCOMP is required."
-ERROR_UTS_NS="CONFIG_UTS_NS is required."
-
-WARNING_KVM="CONFIG_KVM and CONFIG_KVM_AMD/-INTEL is required for virtual machines."
-WARNING_MACVTAP="CONFIG_MACVTAP is required for virtual machines."
-WARNING_VHOST_VSOCK="CONFIG_VHOST_VSOCK is required for virtual machines."
-
-# Go magic.
-QA_PREBUILT="/usr/bin/incus
-	/usr/bin/incus-agent
-	/usr/bin/incus-benchmark
-	/usr/bin/incus-migrate
-	/usr/bin/lxc-to-incus
-	/usr/sbin/fuidshift
-	/usr/sbin/incusd
-	/usr/sbin/lxd-to-incus"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/linuxcontainers.asc
-
-# The testsuite must be run as root.
-# make: *** [Makefile:156: check] Error 1
-RESTRICT="test"
-
-GOPATH="${S}/_dist"
-
-src_unpack() {
-	verify-sig_src_unpack
-	go-module_src_unpack
-}
-
-src_prepare() {
-	export GOPATH="${S}/_dist"
-
-	default
-
-	sed -i \
-		-e "s:\./configure:./configure --prefix=/usr --libdir=${EPREFIX}/usr/lib/incus:g" \
-		-e "s:make:make ${MAKEOPTS}:g" \
-		Makefile || die
-
-	sed -i \
-		-e "s:/usr/share/OVMF:/usr/share/edk2/OvmfX64:g" \
-		-e "s:OVMF_VARS.ms.fd:OVMF_VARS.fd:g" \
-		internal/server/instance/drivers/edk2/driver_edk2.go || die "Failed to fix hardcoded ovmf paths."
-
-	# Fix hardcoded virtfs-proxy-helper file path, see bug 798924
-	sed -i \
-		-e "s:/usr/lib/qemu/virtfs-proxy-helper:/usr/libexec/virtfs-proxy-helper:g" \
-		internal/server/device/device_utils_disk.go || die "Failed to fix virtfs-proxy-helper path."
-
-	cp "${FILESDIR}"/incus-0.4.service "${T}"/incus.service || die
-	if use apparmor; then
-		sed -i \
-			'/^EnvironmentFile=.*/a ExecStartPre=\/usr\/libexec\/lxc\/lxc-apparmor-load' \
-			"${T}"/incus.service || die
-	fi
-
-	# Disable -Werror's from go modules.
-	find "${S}" -name "cgo.go" -exec sed -i "s/ -Werror / /g" {} + || die
-}
-
-src_configure() { :; }
-
-src_compile() {
-	export GOPATH="${S}/_dist"
-	export CGO_LDFLAGS_ALLOW="-Wl,-z,now"
-
-	for k in incus-benchmark incus-simplestreams incus-user incus lxc-to-incus lxd-to-incus ; do
-		ego install -v -x "${S}/cmd/${k}"
-	done
-
-	if use fuidshift ; then
-		ego install -v -x "${S}/cmd/fuidshift"
-	fi
-
-	ego install -v -x -tags libsqlite3 "${S}"/cmd/incusd
-
-	# Needs to be built statically
-	CGO_ENABLED=0 go install -v -tags netgo "${S}"/cmd/incus-migrate
-	CGO_ENABLED=0 go install -v -tags agent,netgo "${S}"/cmd/incus-agent
-
-	use nls && emake build-mo
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	export GOPATH="${S}/_dist"
-
-	if tc-is-cross-compiler ; then
-		local bindir="_dist/bin/linux_${GOARCH}"
-	else
-		local bindir="_dist/bin"
-	fi
-
-	newsbin "${FILESDIR}"/incus-startup-0.4.sh incus-startup
-
-	# Admin tools
-	for l in incusd incus-user lxd-to-incus ; do
-		dosbin ${bindir}/${l}
-	done
-
-	# User tools
-	for m in incus-agent incus-benchmark incus-migrate incus-simplestreams incus lxc-to-incus ; do
-		dobin ${bindir}/${m}
-	done
-
-	# fuidshift, should be moved under admin tools at some point
-	if use fuidshift ; then
-		dosbin ${bindir}/fuidshift
-	fi
-
-	newconfd "${FILESDIR}"/incus-6.0.confd incus
-	newinitd "${FILESDIR}"/incus-6.0.initd incus
-	newinitd "${FILESDIR}"/incus-user-0.4.initd incus-user
-
-	systemd_dounit "${T}"/incus.service
-	systemd_newunit "${FILESDIR}"/incus-0.4.socket incus.socket
-	systemd_newunit "${FILESDIR}"/incus-startup-0.4.service incus-startup.service
-	systemd_newunit "${FILESDIR}"/incus-user-0.4.service incus-user.service
-	systemd_newunit "${FILESDIR}"/incus-user-0.4.socket incus-user.socket
-
-	if ! tc-is-cross-compiler; then
-		# Generate and install shell completion files.
-		mkdir -p "${D}"/usr/share/{bash-completion/completions/,fish/vendor_completions.d/,zsh/site-functions/} || die
-		"${bindir}"/incus completion bash > "${D}"/usr/share/bash-completion/completions/incus || die
-		"${bindir}"/incus completion fish > "${D}"/usr/share/fish/vendor_completions.d/incus.fish || die
-		"${bindir}"/incus completion zsh > "${D}"/usr/share/zsh/site-functions/_incus || die
-	else
-		ewarn "Shell completion files not installed! Install them manually with incus completion --help"
-	fi
-
-	dodoc AUTHORS
-	dodoc -r doc/*
-	use nls && domo po/*.mo
-}
-
-pkg_postinst() {
-	elog
-	elog "Please see"
-	elog "  https://wiki.gentoo.org/wiki/Incus"
-	elog "  https://wiki.gentoo.org/wiki/Incus#Migrating_from_LXD"
-	elog
-	optfeature "virtual machine support" app-cdr/cdrtools app-emulation/qemu[spice,usbredir,virtfs]
-	optfeature "btrfs storage backend" sys-fs/btrfs-progs
-	optfeature "ipv6 support" net-dns/dnsmasq[ipv6]
-	optfeature "full incus-migrate support" net-misc/rsync
-	optfeature "lvm2 storage backend" sys-fs/lvm2
-	optfeature "zfs storage backend" sys-fs/zfs
-	elog
-	elog "Be sure to add your local user to the incus group."
-	elog
-}
--- a/app-containers/lxc/Manifest
+++ b/app-containers/lxc/Manifest
@ -1,6 +1,4 @@
 DIST lxc-5.0.3.tar.gz 975269 BLAKE2B 533d97fe4d986acbf5d562bb2c295a63df2a9a8bfc27aeff5056e4235f667102500debc586c5698482ec048c1b222a0fdc234db6fd6648c4b649f87a85de18f8 SHA512 0553be317431ab7ec0c450c0f85724a53de1f251c39c9716168e17cda6a8daec70b8221228c4be64027df28a327e0f1fd508e6bb48348ab540bbfeaf2b9ac974
 DIST lxc-5.0.3.tar.gz.asc 833 BLAKE2B c35278ed17cad76d2ea94b3985e0110731efea751fb5f1c2d1c9db71486e4844285f372a94c8611dcfe91fdb16459694843b9e0a8273cfc68a56f549c7162cfb SHA512 a5ce5769d49abdf35d94de8273fd3e9c2a8ba4fafea71cf33ee6bce1d83531c8b550d972f7080409a4cc5a92e9d04ece50ed108f92c6aec4868d150e58d7d11a
-DIST lxc-6.0.1.tar.gz 964526 BLAKE2B 6fb6442e0a9a356433351f412c9a1e4f18155146e49f40ebe6e132ea770a8737793df0c7ca13ca70ce631a2308ff525fca2fd2d127b98edbd00e0af7efce6879 SHA512 7e8b9740178ae46a2ad3ba3f1e509f69f978d0a2a1f7e1938213ae9cb9a80f496d01be64958cad4aa6f01a73f1d8c3759c3e9df9df4f67c77e603ea0809d79c2
-DIST lxc-6.0.1.tar.gz.asc 833 BLAKE2B 8469ff5603c48205c6451630ec8f03617c648e3d13f73ebd7d908017422b75613e5489b42ad0f598fcf5cf9e241fccaeb4b0ec3ac186a670ed56a252e282b16e SHA512 e0ebd29c3e793e1159e350854e2ac7adacd918b76dfa2de1e0227fd45034ac9308d02b7da1c0c80eae471ebba44a0804a7a0bf17cbf1c18de45bc63974e017e0
 DIST lxc-6.0.2.tar.gz 964007 BLAKE2B 55c0155a66194d4d10fff5ffc7edc6d6afab730245a401671f8d1bd6f54bd8558bd0644c0f42bd49b5b470bc343809091f1893c27b5830674870f6b91f23d6e0 SHA512 52841b5f48eeb4b2b63e0437e3abc38cec6a801778eb2fab264c78d7ee3be957bd45aa839c9fcd281396464fa0af84bb2fc8bf4bfadc9509fae3b4dc52b44da5
 DIST lxc-6.0.2.tar.gz.asc 833 BLAKE2B b4b6b56e65239c2125864e16e947a88c2d4d97a1b2dfa6920ca5c2f89b3df7d44d9ec8eb9a56753d6009143a53f6bb5bbd13f3b5b7f26e537aa6f1f1d0d0cc85 SHA512 741caccb3dc0ef1043c04122c75a3e3f6d8e6024a65bf905b186da0aabef971a1224e60f9adee069d1a2c24f43c408be1ccc32e5d4faba85860e9a19d9e4c0d9
--- a/app-containers/lxc/lxc-6.0.1.ebuild
+++ b/app-containers/lxc/lxc-6.0.1.ebuild
@ -1,174 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 linux-info meson optfeature systemd toolchain-funcs verify-sig
-
-DESCRIPTION="A userspace interface for the Linux kernel containment features"
-HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc"
-SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
-	verify-sig? ( https://linuxcontainers.org/downloads/lxc/${P}.tar.gz.asc )"
-
-LICENSE="GPL-2 LGPL-2.1 LGPL-3"
-SLOT="0/1.8" # SONAME liblxc.so.1 + ${PV//./} _if_ breaking ABI change while bumping.
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-IUSE="apparmor +caps examples io-uring lto man pam seccomp selinux ssl systemd test +tools"
-
-RDEPEND="acct-group/lxc
-	acct-user/lxc
-	apparmor? ( sys-libs/libapparmor )
-	caps? ( sys-libs/libcap )
-	io-uring? ( >=sys-libs/liburing-2:= )
-	pam? ( sys-libs/pam )
-	seccomp? ( sys-libs/libseccomp )
-	selinux? ( sys-libs/libselinux )
-	ssl? ( dev-libs/openssl:0= )
-	systemd? (
-		sys-apps/dbus
-		sys-apps/systemd:=
-	)
-	tools? ( sys-libs/libcap )"
-DEPEND="${RDEPEND}
-	caps? ( sys-libs/libcap[static-libs] )
-	tools? ( sys-libs/libcap[static-libs] )
-	sys-kernel/linux-headers"
-BDEPEND="virtual/pkgconfig
-	man? ( app-text/docbook2X )
-	verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
-
-RESTRICT="!test? ( test )"
-
-CONFIG_CHECK="~!NETPRIO_CGROUP
-	~CGROUPS
-	~CGROUP_CPUACCT
-	~CGROUP_DEVICE
-	~CGROUP_FREEZER
-
-	~CGROUP_SCHED
-	~CPUSETS
-	~IPC_NS
-	~MACVLAN
-
-	~MEMCG
-	~NAMESPACES
-	~NET_NS
-	~PID_NS
-
-	~POSIX_MQUEUE
-	~USER_NS
-	~UTS_NS
-	~VETH"
-
-ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER: needed to freeze containers"
-ERROR_MACVLAN="CONFIG_MACVLAN: needed for internal (inter-container) networking"
-ERROR_MEMCG="CONFIG_MEMCG: needed for memory resource control in containers"
-ERROR_NET_NS="CONFIG_NET_NS: needed for unshared network"
-ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: needed for lxc-execute command"
-ERROR_UTS_NS="CONFIG_UTS_NS: needed to unshare hostnames and uname info"
-ERROR_VETH="CONFIG_VETH: needed for internal (host-to-container) networking"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/linuxcontainers.asc
-
-DOCS=( AUTHORS CONTRIBUTING MAINTAINERS README.md doc/FAQ.txt )
-
-pkg_setup() {
-	linux-info_pkg_setup
-}
-
-src_configure() {
-
-	# -Dtools-multicall=false: will create a single binary called 'lxc' that conflicts with LXD.
-	local emesonargs=(
-		--localstatedir "${EPREFIX}/var"
-
-		-Dcoverity-build=false
-		-Dinstall-state-dirs=false
-		-Doss-fuzz=false
-		-Dspecfile=false
-		-Dtools-multicall=false
-
-		-Dcommands=true
-		-Dinstall-init-files=true
-		-Dmemfd-rexec=true
-		-Dthread-safety=true
-
-		$(meson_use apparmor)
-		$(meson_use caps capabilities)
-		$(meson_use examples)
-		$(meson_use io-uring io-uring-event-loop)
-		$(meson_use lto b_lto)
-		$(meson_use man)
-		$(meson_use pam pam-cgroup)
-		$(meson_use seccomp)
-		$(meson_use selinux)
-		$(meson_use ssl openssl)
-		$(meson_use test tests)
-		$(meson_use tools)
-
-		$(usex systemd -Ddbus=true -Ddbus=false)
-		$(usex systemd -Dinit-script="systemd" -Dinit-script="sysvinit")
-
-		-Ddata-path=/var/lib/lxc
-		-Ddoc-path=/usr/share/doc/${PF}
-		-Dlog-path=/var/log/lxc
-		-Drootfs-mount-path=/var/lib/lxc/rootfs
-		-Druntime-path=/run
-	)
-
-	use tools && local emesonargs+=( -Dcapabilities=true )
-
-	if $(tc-ld-is-gold) || $(tc-ld-is-lld); then
-		local emesonargs+=( -Db_lto_mode=thin )
-	else
-		local emesonargs+=( -Db_lto_mode=default )
-	fi
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# The main bash-completion file will collide with lxd, need to relocate and update symlinks.
-	mkdir -p "${ED}"/$(get_bashcompdir) || die "Failed to create bashcompdir."
-
-	if use tools; then
-		bashcomp_alias lxc-start lxc-{attach,autostart,cgroup,checkpoint,config,console,copy,create,destroy,device,execute,freeze,info,ls,monitor,snapshot,stop,top,unfreeze,unshare,usernsexec,wait}
-	else
-		bashcomp_alias lxc-start lxc-usernsexec
-	fi
-
-	find "${ED}" -name '*.la' -delete -o -name '*.a' -delete || die
-
-	# Replace upstream sysvinit/systemd files.
-	if use systemd; then
-	rm -r "${D}$(systemd_get_systemunitdir)" || die "Failed to remove systemd lib dir"
-	else
-		rm "${ED}"/etc/init.d/lxc-{containers,net} || die "Failed to remove sysvinit scripts"
-	fi
-
-	newinitd "${FILESDIR}/${PN}.initd.9" ${PN}
-	systemd_newunit "${FILESDIR}"/lxc-monitord.service.5.0.0 lxc-monitord.service
-	systemd_newunit "${FILESDIR}"/lxc-net.service.5.0.0 lxc-net.service
-	systemd_newunit "${FILESDIR}"/lxc.service-5.0.0 lxc.service
-	systemd_newunit "${FILESDIR}"/lxc_at.service.5.0.0 "lxc@.service"
-
-	if ! use apparmor; then
-		sed -i '/lxc-apparmor-load/d' "${D}$(systemd_get_systemunitdir)/lxc.service" ||
-			die "Failed to remove apparmor references from lxc.service systemd unit."
-	fi
-}
-
-pkg_postinst() {
-	elog "Please refer to "
-	elog "https://wiki.gentoo.org/wiki/LXC for introduction and usage guide."
-	elog
-	elog "Run 'lxc-checkconfig' to see optional kernel features."
-	elog
-
-	optfeature "creating your own LXC containers" app-containers/distrobuilder
-	optfeature "automatic template scripts" app-containers/lxc-templates
-	optfeature "Debian-based distribution container image support" dev-util/debootstrap
-	optfeature "snapshot & restore functionality" sys-process/criu
-}
--- a/app-containers/podman/podman-4.9.4.ebuild
+++ b/app-containers/podman/podman-4.9.4.ebuild
@ -114,7 +114,7 @@ src_compile() {
 }

 src_install() {
-	emake DESTDIR="${D}" install install.completions $(usev wrapper install.docker-full)
+	emake DESTDIR="${D}" SELINUXOPT= install install.completions $(usev wrapper install.docker-full)

 	insinto /etc/cni/net.d
 	doins cni/87-podman-bridge.conflist
--- a/app-containers/podman/podman-5.0.2.ebuild
+++ b/app-containers/podman/podman-5.0.2.ebuild
@ -102,12 +102,12 @@ src_compile() {
 	fi

 	# BUILD_SECCOMP is used in the patch to toggle seccomp
-	emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man" BUILD_SECCOMP="$(usex seccomp)" \
+	emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man" BUILD_SECCOMP="$(usex seccomp)" SELINUXOPT= \
 		  all $(usev wrapper docker-docs)
 }

 src_install() {
-	emake DESTDIR="${D}" install install.completions $(usev wrapper install.docker-full)
+	emake DESTDIR="${D}" SELINUXOPT= install install.completions $(usev wrapper install.docker-full)

 	if use !systemd; then
 		newconfd "${FILESDIR}"/podman-5.0.0_rc4.confd podman
--- a/app-containers/podman/podman-5.0.3.ebuild
+++ b/app-containers/podman/podman-5.0.3.ebuild
@ -102,12 +102,12 @@ src_compile() {
 	fi

 	# BUILD_SECCOMP is used in the patch to toggle seccomp
-	emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man" BUILD_SECCOMP="$(usex seccomp)" \
+	emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man" BUILD_SECCOMP="$(usex seccomp)" SELINUXOPT= \
 		  all $(usev wrapper docker-docs)
 }

 src_install() {
-	emake DESTDIR="${D}" install install.completions $(usev wrapper install.docker-full)
+	emake DESTDIR="${D}" SELINUXOPT= install install.completions $(usev wrapper install.docker-full)

 	if use !systemd; then
 		newconfd "${FILESDIR}"/podman-5.0.0_rc4.confd podman
--- a/app-containers/podman/podman-5.1.1.ebuild
+++ b/app-containers/podman/podman-5.1.1.ebuild
@ -114,12 +114,12 @@ src_compile() {
 		tc-export PKG_CONFIG
 	fi

-	emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man" EXTRA_BUILDTAGS="$(usev seccomp)" \
+	emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man" EXTRA_BUILDTAGS="$(usev seccomp)" SELINUXOPT= \
 		  all $(usev wrapper docker-docs)
 }

 src_install() {
-	emake DESTDIR="${D}" install install.completions $(usev wrapper install.docker-full)
+	emake DESTDIR="${D}" SELINUXOPT= install install.completions $(usev wrapper install.docker-full)

 	if use !systemd; then
 		newconfd "${FILESDIR}"/podman-5.0.0_rc4.confd podman
--- a/app-containers/podman/podman-5.2.4.ebuild
+++ b/app-containers/podman/podman-5.2.4.ebuild
@ -114,12 +114,12 @@ src_compile() {
 		tc-export PKG_CONFIG
 	fi

-	emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man" EXTRA_BUILDTAGS="$(usev seccomp)" \
+	emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man" EXTRA_BUILDTAGS="$(usev seccomp)" SELINUXOPT= \
 		  all $(usev wrapper docker-docs)
 }

 src_install() {
-	emake DESTDIR="${D}" install install.completions $(usev wrapper install.docker-full)
+	emake DESTDIR="${D}" SELINUXOPT= install install.completions $(usev wrapper install.docker-full)

 	if use !systemd; then
 		newconfd "${FILESDIR}"/podman-5.0.0_rc4.confd podman
--- a/app-containers/podman/podman-9999.ebuild
+++ b/app-containers/podman/podman-9999.ebuild
@ -114,12 +114,12 @@ src_compile() {
 		tc-export PKG_CONFIG
 	fi

-	emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man" EXTRA_BUILDTAGS="$(usev seccomp)" \
+	emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man" EXTRA_BUILDTAGS="$(usev seccomp)" SELINUXOPT= \
 		  all $(usev wrapper docker-docs)
 }

 src_install() {
-	emake DESTDIR="${D}" install install.completions $(usev wrapper install.docker-full)
+	emake DESTDIR="${D}" SELINUXOPT= install install.completions $(usev wrapper install.docker-full)

 	if use !systemd; then
 		newconfd "${FILESDIR}"/podman-5.0.0_rc4.confd podman
--- a/app-containers/skopeo/skopeo-1.15.1.ebuild
+++ b/app-containers/skopeo/skopeo-1.15.1.ebuild
@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/containers/skopeo.git"
 else
 	SRC_URI="https://github.com/containers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64"
+	KEYWORDS="amd64 arm64"
 fi

 # main
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/heimdal/files/heimdal-7.8.0-autoconf-2.72.patch
+++ b/app-crypt/heimdal/files/heimdal-7.8.0-autoconf-2.72.patch
@ -0,0 +1,19 @@
+https://github.com/heimdal/heimdal/pull/1229
+
+From 2b372170c894ed9aa3fe2fca976f3541ea7041d9 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd@kuhls.net>
+Date: Sat, 10 Feb 2024 09:33:48 +0100
+Subject: [PATCH] cf/largefile.m4: Fix build with autoconf-2.72
+
+Fixes https://github.com/heimdal/heimdal/issues/1201
+--- a/cf/largefile.m4
+++ b/cf/largefile.m4
+@@ -10,7 +10,7 @@ dnl with generated code, such as lex
+ if test "$enable_largefile" != no -a "$ac_cv_sys_large_files" != no; then
+ 	CPPFLAGS="$CPPFLAGS -D_LARGE_FILES=$ac_cv_sys_large_files"
+ fi
+-if test "$enable_largefile" != no -a "$ac_cv_sys_file_offset_bits" != no; then
+if test "$enable_largefile" != no -a "$ac_cv_sys_file_offset_bits" != no && test -n "$ac_cv_sys_file_offset_bits"; then
+ 	CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits"
+ fi
+ ])
--- a/app-crypt/heimdal/heimdal-7.8.0-r3.ebuild
+++ b/app-crypt/heimdal/heimdal-7.8.0-r3.ebuild
@ -68,6 +68,7 @@ PATCHES=(
 	"${FILESDIR}/heimdal_fix-db60.patch"
 	"${FILESDIR}/heimdal-7.8.0-CVE-2022-45142.patch"
 	"${FILESDIR}/heimdal-7.8.0-configure-clang16.patch"
+	"${FILESDIR}/heimdal-7.8.0-autoconf-2.72.patch"
 )

 src_prepare() {
--- a/app-crypt/keysmith/keysmith-24.08.1.ebuild
+++ b/app-crypt/keysmith/keysmith-24.08.1.ebuild
@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/keysmith/"

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

 COMMON_DEPEND="
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
--- a/app-doc/execline-man-pages/Manifest
+++ b/app-doc/execline-man-pages/Manifest
@ -1 +1,2 @@
 DIST execline-man-pages-2.9.6.0.1.tar.gz 44771 BLAKE2B 43a78f4335f0381b967ba10c06453caece21e156fb4f3867e1e758985874538a5fc12c603b46d720f73cbb31dbbccb54de1296ad11f66a35b4e3e1ee958f944f SHA512 c996b90cbc8c6faa1cfd93f8772eca51ce4d445fa70c5f2f8208532c609c0a4444d01f4adc5c215e5f1da790731ee8d115d8979efa86bff929fd80a84cbfbd04
+DIST execline-man-pages-2.9.6.1.1.tar.gz 44782 BLAKE2B 944fe9240a814360962c8c088b0b7b3d960bf033def5b331a06e4ca9ccc175aeb588d6d0cc9e663668e66761e1420ed5f572d5bb670e8affa02f7da77d951c6d SHA512 474ff74cad90fb77787ff6be2d11ecfc425185804df0789a57d4df88644be2c7fa02a84ef299781eda231895d0e03bd0c163c5b5dcb75da124d1cc6b7faa8edb
--- a/app-doc/execline-man-pages/execline-man-pages-2.9.6.1.1.ebuild
+++ b/app-doc/execline-man-pages/execline-man-pages-2.9.6.1.1.ebuild
@ -0,0 +1,16 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="mdoc port of the HTML documentation for the execline suite"
+HOMEPAGE="https://git.sr.ht/~flexibeast/execline-man-pages"
+SRC_URI="
+	https://git.sr.ht/~flexibeast/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+S="${WORKDIR}/${PN}-v${PV}"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64"
--- a/app-doc/s6-linux-init-man-pages/Manifest
+++ b/app-doc/s6-linux-init-man-pages/Manifest
@ -1 +1,2 @@
 DIST s6-linux-init-man-pages-1.1.2.0.1.tar.gz 22107 BLAKE2B a4fff622f0eda9dafdcee7c281839f728460032a809d984b41a547efb44407e5f72065c0ea2fc0cadfd3067f37642cda742c05c7a5a53482343267c1c47348b7 SHA512 49574fb4f8634e5b15b3ecaf9de4c4015c494d55091d93da31ab93dd16c0beb737a03e43e44f1a1f0500268adf75ebff8841a8ed0533e971c5b37e5b5989f972
+DIST s6-linux-init-man-pages-1.1.2.1.1.tar.gz 22112 BLAKE2B dabb11ef8f18c0eee68121e85b4ba786724d719a604c41b71614c8c860a9aa30648acca15d7500768d3cbbb65715cb519a03465d08b5059fddc1930caf35c7c8 SHA512 36a8234a2ea40bbea8095880afbf05597d98720d3e9f85a14a54fca1f77d5fd9afa85952ef1990f974d94336208eec4cb420708c0fa73e830cf1890fa61a8a43
--- a/app-doc/s6-linux-init-man-pages/s6-linux-init-man-pages-1.1.2.1.1.ebuild
+++ b/app-doc/s6-linux-init-man-pages/s6-linux-init-man-pages-1.1.2.1.1.ebuild
@ -0,0 +1,16 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="mdoc port of the HTML documentation for the s6-linux-init suite"
+HOMEPAGE="https://git.sr.ht/~flexibeast/s6-linux-init-man-pages"
+SRC_URI="
+	https://git.sr.ht/~flexibeast/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+S="${WORKDIR}/${PN}-v${PV}"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64"
--- a/app-doc/s6-man-pages/Manifest
+++ b/app-doc/s6-man-pages/Manifest
@ -1 +1,2 @@
 DIST s6-man-pages-2.13.0.0.1.tar.gz 124099 BLAKE2B 97013c8ef853c4492f0be99e2412549bc30a481b61a7b3b04f4133f2be13e8a6e9d7114d0c582acd7e6f93cf3fab839d7cd153fc8a8a32f47bd597e6b7c6a5bd SHA512 d1982daead0b9c56421d421339c14f1fc9f7c32137f3c19f2fc9bab9225df8b5e220e2a807b26647c5639a3950543703c2eca5cd6afda1b81381709d703b206a
+DIST s6-man-pages-2.13.1.0.1.tar.gz 124303 BLAKE2B 95c8521cb2e88fd7d69bdab95aab62790796c6b9c22626c28b642a5caf2269e78fad5d02984a9af9b45eb5308a522c5777bc92862902cfebc822e8843bc181c6 SHA512 bbdf1fc14bb1332697c6cf24bb39927dd20d2af9c6d1cd4eac98dcf5a421a79b9ed09850a69f675d8232dc84b749d8673fdc737f293dcbdf67364dcf4c561c3f
--- a/app-doc/s6-man-pages/s6-man-pages-2.13.1.0.1.ebuild
+++ b/app-doc/s6-man-pages/s6-man-pages-2.13.1.0.1.ebuild
@ -0,0 +1,16 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="mdoc port of the HTML documentation for the s6 suite"
+HOMEPAGE="https://git.sr.ht/~flexibeast/s6-man-pages"
+SRC_URI="
+	https://git.sr.ht/~flexibeast/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+S="${WORKDIR}/${PN}-v${PV}"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64"
--- a/app-doc/s6-networking-man-pages/Manifest
+++ b/app-doc/s6-networking-man-pages/Manifest
@ -1 +1,2 @@
 DIST s6-networking-man-pages-2.7.0.3.1.tar.gz 24101 BLAKE2B 2c0a6bd7a5070e8ff64a9c687406a0a6f85492308c69670ebc5913205284539aa11fad1f4ad4b682ba3745027351edcb92d5321b9064f4570e77e54399e84a68 SHA512 d56e779dc732b88eabd3fecb18be3387be9d862608221ac3e84693f7bab7081b229f1877c5ca4a9bca0dbc07c1b4c4aa73c44421f6008d82085903540c956eda
+DIST s6-networking-man-pages-2.7.0.4.1.tar.gz 24065 BLAKE2B 19b2aee4ce84c8d89e1563f97f665736149023e0fb395706bb883e305e9a82f52dba5cd257f5c127712665279170654472542c8fa701324505538d851e061677 SHA512 c332f6298eff0d3de9a9805e56962f45e1f42e02c414ce9a19203a1c684c8744734cc03b9c68cf314ca4449f333aeaadde684f5eb9246a02e5db1c5d46cac630
--- a/app-doc/s6-networking-man-pages/s6-networking-man-pages-2.7.0.4.1.ebuild
+++ b/app-doc/s6-networking-man-pages/s6-networking-man-pages-2.7.0.4.1.ebuild
@ -0,0 +1,16 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="mdoc port of the HTML documentation for the s6 suite"
+HOMEPAGE="https://git.sr.ht/~flexibeast/s6-man-pages"
+SRC_URI="
+	https://git.sr.ht/~flexibeast/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+S="${WORKDIR}/${PN}-v${PV}"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64"
--- a/app-doc/s6-portable-utils-man-pages/Manifest
+++ b/app-doc/s6-portable-utils-man-pages/Manifest
@ -1 +1,2 @@
 DIST s6-portable-utils-man-pages-2.3.0.3.1.tar.gz 13809 BLAKE2B faa340fca488e7bdf45268f9395efe4dd5e3c77ce9e2918c56af5614bc8ddbdd560f123af047280ebc9aa183aa724f74d375b816591f658b11a551ee74273786 SHA512 ae487a5d2bf2554f87c840b5fb003de6fcdf542817fe43e7824d0318cb4ee797d1547f4d56f5d5ebe1da3d909edc6da3f498e5f21f8c028c4478a460181a2cbc
+DIST s6-portable-utils-man-pages-2.3.0.4.1.tar.gz 13808 BLAKE2B ae80692e8aa4b091d6109b52ef638cc8cc36d0364c405b59d7cffcc4e7affe0737d36bceed7969fd27c135d1c35018e91c538b1fcc21e59be1a3f19416447630 SHA512 432fe766e4d2757dc63527a14979e58d37b083121487e0b4187037dad190bc4dd6a56ad85569b187133e1a93ccc69ab7b1066d6d78b35bac5abc146e729473c8
--- a/app-doc/s6-portable-utils-man-pages/s6-portable-utils-man-pages-2.3.0.4.1.ebuild
+++ b/app-doc/s6-portable-utils-man-pages/s6-portable-utils-man-pages-2.3.0.4.1.ebuild
@ -0,0 +1,16 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="mdoc port of the HTML documentation for the s6-portable-utils suite"
+HOMEPAGE="https://git.sr.ht/~flexibeast/s6-portable-utils-man-pages"
+SRC_URI="
+	https://git.sr.ht/~flexibeast/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+S="${WORKDIR}/${PN}-v${PV}"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64"
--- a/app-doc/s6-rc-man-pages/Manifest
+++ b/app-doc/s6-rc-man-pages/Manifest
@ -1 +1,2 @@
 DIST s6-rc-man-pages-0.5.4.3.1.tar.gz 32252 BLAKE2B d0e91a73975fdb59a3fd8b82be204fd79f8767973d711bb69cc789253978386aafbb66ef2e77522b9fbe566e9614f7af135943a44462e5acdade30fc905d38ed SHA512 a613c6424ac07baba6112eab5894224ddc4bdce726e02c47363fc1654f4ff163792c24587c98e412c6660b2a65dade3fce54eb0402f33080bed1c2a4f0cdd73b
+DIST s6-rc-man-pages-0.5.5.0.1.tar.gz 32246 BLAKE2B d83f71542b009385ed1cd0fb879b49aa6235932331e2f1d9a1ccbc9208a22b408eafe5871fade506be3f08f7300d3c59a869a628ac317c0cca166b8f3c330ced SHA512 12eda823f7182ad2e3142bd3cfbe11a83fb86c6880881301db337d744e82207771caa92a44c86adfb4ec86c40dd2a02f63ac255d560f35d85846d31b97e68e49
--- a/app-doc/s6-rc-man-pages/s6-rc-man-pages-0.5.5.0.1.ebuild
+++ b/app-doc/s6-rc-man-pages/s6-rc-man-pages-0.5.5.0.1.ebuild
@ -0,0 +1,16 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="mdoc port of the HTML documentation for the s6-rc suite"
+HOMEPAGE="https://git.sr.ht/~flexibeast/s6-rc-man-pages"
+SRC_URI="
+	https://git.sr.ht/~flexibeast/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+S="${WORKDIR}/${PN}-v${PV}"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64"
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/emacs/emacs-26.3-r19.ebuild
+++ b/app-editors/emacs/emacs-26.3-r19.ebuild
@ -119,9 +119,10 @@ src_prepare() {
 src_configure() {
 	strip-flags
 	filter-flags -pie					#526948
-	replace-flags "-O[3-9]" -O2
+	replace-flags "-O[3-9]" -O2			#839405

 	# We want floating-point arithmetic to be correct #933380
+	replace-flags -Ofast -O2
 	append-flags -fno-fast-math -ffp-contract=off

 	local myconf
--- a/app-editors/emacs/emacs-27.2-r17.ebuild
+++ b/app-editors/emacs/emacs-27.2-r17.ebuild
@ -160,8 +160,10 @@ src_prepare() {
 }

 src_configure() {
+	replace-flags "-O[3-9]" -O2			#839405
+
 	# We want floating-point arithmetic to be correct #933380
-	replace-flags -Ofast -O3
+	replace-flags -Ofast -O2
 	append-flags -fno-fast-math -ffp-contract=off

 	local myconf
--- a/app-editors/emacs/emacs-28.2-r13.ebuild
+++ b/app-editors/emacs/emacs-28.2-r13.ebuild
@ -184,8 +184,10 @@ src_prepare() {
 }

 src_configure() {
+	replace-flags "-O[3-9]" -O2			#839405
+
 	# We want floating-point arithmetic to be correct #933380
-	replace-flags -Ofast -O3
+	replace-flags -Ofast -O2
 	append-flags -fno-fast-math -ffp-contract=off

 	local myconf
--- a/app-editors/emacs/emacs-29.4.ebuild
+++ b/app-editors/emacs/emacs-29.4.ebuild
@ -216,8 +216,10 @@ src_prepare() {
 }

 src_configure() {
+	replace-flags "-O[3-9]" -O2			#839405
+
 	# We want floating-point arithmetic to be correct #933380
-	replace-flags -Ofast -O3
+	replace-flags -Ofast -O2
 	append-flags -fno-fast-math -ffp-contract=off

 	local myconf
--- a/app-editors/emacs/emacs-30.0.91.ebuild
+++ b/app-editors/emacs/emacs-30.0.91.ebuild
@ -213,8 +213,10 @@ src_prepare() {
 }

 src_configure() {
+	replace-flags "-O[3-9]" -O2			#839405
+
 	# We want floating-point arithmetic to be correct #933380
-	replace-flags -Ofast -O3
+	replace-flags -Ofast -O2
 	append-flags -fno-fast-math -ffp-contract=off

 	local myconf
--- a/app-editors/emacs/emacs-30.0.9999-r1.ebuild
+++ b/app-editors/emacs/emacs-30.0.9999-r1.ebuild
@ -213,8 +213,10 @@ src_prepare() {
 }

 src_configure() {
+	replace-flags "-O[3-9]" -O2			#839405
+
 	# We want floating-point arithmetic to be correct #933380
-	replace-flags -Ofast -O3
+	replace-flags -Ofast -O2
 	append-flags -fno-fast-math -ffp-contract=off

 	local myconf
--- a/app-editors/emacs/emacs-31.0.9999.ebuild
+++ b/app-editors/emacs/emacs-31.0.9999.ebuild
@ -213,8 +213,10 @@ src_prepare() {
 }

 src_configure() {
+	replace-flags "-O[3-9]" -O2			#839405
+
 	# We want floating-point arithmetic to be correct #933380
-	replace-flags -Ofast -O3
+	replace-flags -Ofast -O2
 	append-flags -fno-fast-math -ffp-contract=off

 	local myconf
--- a/app-editors/emacs/metadata.xml
+++ b/app-editors/emacs/metadata.xml
@ -6,54 +6,81 @@
    <name>Gentoo GNU Emacs project</name>
  </maintainer>
  <longdescription>
-  GNU Emacs is an extensible, customizable text editor - and more. At its core
-  is an interpreter for Emacs Lisp, a dialect of the Lisp programming language
-  with extensions to support text editing. The features of GNU Emacs include:
-   * Content-sensitive editing modes, including syntax coloring, for a variety
-     of file types including plain text, source code, and HTML.
-   * Complete built-in documentation, including a tutorial for new users.
-   * Full Unicode support for nearly all human languages and their scripts.
-   * Highly customizable, using Emacs Lisp code or a graphical interface.
-   * A large number of extensions that add other functionality, including a
-     project planner, mail and news reader, debugger interface, calendar, and
-     more. Many of these extensions are distributed with GNU Emacs; others are
-     available separately.
+    GNU Emacs is an extensible, customizable text editor - and more. At its
+    core is an interpreter for Emacs Lisp, a dialect of the Lisp programming
+    language with extensions to support text editing. The features of
+    GNU Emacs include:
+     * Content-sensitive editing modes, including syntax coloring, for a
+       variety of file types including plain text, source code, and HTML.
+     * Complete built-in documentation, including a tutorial for new users.
+     * Full Unicode support for nearly all human languages and their scripts.
+     * Highly customizable, using Emacs Lisp code or a graphical interface.
+     * A large number of extensions that add other functionality, including
+       a project planner, mail and news reader, debugger interface, calendar,
+       and more. Many of these extensions are distributed with GNU Emacs;
+       others are available separately.
  </longdescription>
  <use>
-    <flag name="athena">Enable the MIT Athena widget set
-    (<pkg>x11-libs/libXaw</pkg>)</flag>
-    <flag name="dynamic-loading">Enable loading of dynamic libraries (modules)
-    at runtime</flag>
-    <flag name="games">Support shared score files for games</flag>
-    <flag name="gfile">Use gfile (<pkg>dev-libs/glib</pkg>) for file
-    notification</flag>
-    <flag name="gmp">Use the GNU multiple precision arithmetic library
-    (<pkg>dev-libs/gmp</pkg>) instead of the bundled mini-gmp subset</flag>
-    <flag name="gsettings">Use gsettings (<pkg>dev-libs/glib</pkg>) to read the
-    system font name</flag>
-    <flag name="gzip-el">Compress bundled Emacs Lisp source</flag>
-    <flag name="harfbuzz">Use <pkg>media-libs/harfbuzz</pkg> as text shaping
-    engine</flag>
-    <flag name="imagemagick">Use <pkg>media-gfx/imagemagick</pkg> for image
-    processing</flag>
-    <flag name="jit">Compile with Emacs Lisp native compiler support via
-    libgccjit</flag>
-    <flag name="json">Compile with native JSON support using
-    <pkg>dev-libs/jansson</pkg></flag>
-    <flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> to parse XML instead
-    of the internal Lisp implementations</flag>
-    <flag name="mailutils">Retrieve e-mail using <pkg>net-mail/mailutils</pkg>
-    instead of the internal movemail substitute</flag>
-    <flag name="source">Install C source files and make them available for
-    find-function</flag>
-    <flag name="threads">Add elisp threading support</flag>
-    <flag name="toolkit-scroll-bars">Use the selected toolkit's scrollbars in
-    preference to Emacs' own scrollbars</flag>
-    <flag name="tree-sitter">Support the <pkg>dev-libs/tree-sitter</pkg>
-    parsing library</flag>
-    <flag name="wide-int">Prefer wide Emacs integers (typically 62-bit).
-    This option has an effect only on architectures where "long" and
-    "long long" types have different size.</flag>
+    <flag name="athena">
+      Enable the MIT Athena widget set (<pkg>x11-libs/libXaw</pkg>)
+    </flag>
+    <flag name="dynamic-loading">
+      Enable loading of dynamic libraries (modules) at runtime
+    </flag>
+    <flag name="games">
+      Support shared score files for games
+    </flag>
+    <flag name="gfile">
+      Use gfile (<pkg>dev-libs/glib</pkg>) for file notification
+    </flag>
+    <flag name="gmp">
+      Use the GNU multiple precision arithmetic library
+      (<pkg>dev-libs/gmp</pkg>) instead of the bundled mini-gmp subset
+    </flag>
+    <flag name="gsettings">
+      Use gsettings (<pkg>dev-libs/glib</pkg>) to read the system font name
+    </flag>
+    <flag name="gzip-el">
+      Compress bundled Emacs Lisp source
+    </flag>
+    <flag name="harfbuzz">
+      Use <pkg>media-libs/harfbuzz</pkg> as text shaping engine
+    </flag>
+    <flag name="imagemagick">
+      Use <pkg>media-gfx/imagemagick</pkg> for image processing
+    </flag>
+    <flag name="jit">
+      Compile with Emacs Lisp native compiler support via libgccjit
+    </flag>
+    <flag name="json">
+      Compile with native JSON support using <pkg>dev-libs/jansson</pkg>
+    </flag>
+    <flag name="libxml2">
+      Use <pkg>dev-libs/libxml2</pkg> to parse XML instead of the internal
+      Lisp implementations
+    </flag>
+    <flag name="mailutils">
+      Retrieve e-mail using <pkg>net-mail/mailutils</pkg> instead of the
+      internal movemail substitute
+    </flag>
+    <flag name="source">
+      Install C source files and make them available for find-function
+    </flag>
+    <flag name="threads">
+      Add elisp threading support
+    </flag>
+    <flag name="toolkit-scroll-bars">
+      Use the selected toolkit's scrollbars in preference to Emacs' own
+      scrollbars
+    </flag>
+    <flag name="tree-sitter">
+      Support the <pkg>dev-libs/tree-sitter</pkg> parsing library
+    </flag>
+    <flag name="wide-int">
+      Prefer wide Emacs integers (typically 62-bit). This option has an
+      effect only on 32-bit systems, where it increases the maximum buffer
+      size from 0.5 to 2 GiB, at the cost of 10% to 30% Lisp slowdown.
+    </flag>
  </use>
  <upstream>
    <remote-id type="savannah">emacs</remote-id>
--- a/app-editors/ghostwriter/ghostwriter-24.08.1.ebuild
+++ b/app-editors/ghostwriter/ghostwriter-24.08.1.ebuild
@ -14,7 +14,7 @@ HOMEPAGE="https://ghostwriter.kde.org/"

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

 RDEPEND="
--- a/app-editors/jedit/Manifest
+++ b/app-editors/jedit/Manifest
@ -1 +1,2 @@
 DIST jedit5.6.0source.tar.bz2 2572329 BLAKE2B d9815feef6fb03cb4a15e7101383944776ca593884de6965aaa3e74a411f8915d0542ab62be8e4551e04dd410c1da4ebedfb8a2c2869d33eb205100d6bd84352 SHA512 89e65998ea49b5b3da4f1daad001d7cf763e196e7110b604e99e3fad038ca126cf108a471ee611ef76b5491b91d618f47cdc24b270cabccb6a80858a37720af7
+DIST jedit5.7.0source.tar.bz2 2633539 BLAKE2B f8f0ee0b8c568ab64b9812049601c6692f60346bf8f70217fd82f27daedcdfdc95f8157adeca38ba36bd7c9e3d7a29bed2506f951e3e0b0ade1cd9a53a89e669 SHA512 6f5ab4b7f4fe467400686ac9100c462b8c40912036e0a5735ec5dbece569b0eb36f8ac1d9a0d93065baafc48da4e0a00b7440c31584ca1835f164b31b2400625
--- a/app-editors/jedit/jedit-5.7.0.ebuild
+++ b/app-editors/jedit/jedit-5.7.0.ebuild
@ -0,0 +1,136 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit desktop java-pkg-2 java-pkg-simple xdg-utils
+
+DESCRIPTION="Programmer's editor written in Java"
+HOMEPAGE="https://www.jedit.org"
+SRC_URI="https://downloads.sourceforge.net/project/jedit/jedit/${PV}/jedit${PV}source.tar.bz2"
+S="${WORKDIR}/jEdit"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+
+BDEPEND="
+	app-text/docbook-xsl-stylesheets:0
+	dev-libs/libxslt:0
+"
+
+CP_DEPEND="dev-java/jsr305:0"
+
+DEPEND="
+	${CP_DEPEND}
+	>=virtual/jdk-11:*
+	test? (
+		dev-java/hamcrest:0
+		dev-java/junit:5
+		dev-java/mockito:2
+	)
+"
+
+RDEPEND="
+	${CP_DEPEND}
+	>=virtual/jre-11:*
+"
+
+PATCHES=( "${FILESDIR}/jedit-5.6.0-skip-failing-test.patch" )
+
+JAVA_MAIN_CLASS="org.gjt.sp.jedit.jEdit"
+JAVA_RESOURCE_DIRS="resources"
+JAVA_SRC_DIR="src"
+JAVA_TEST_GENTOO_CLASSPATH="
+	hamcrest
+	junit-4
+	junit-5
+	mockito-2
+"
+JAVA_TEST_SRC_DIR="test"
+JEDIT_HOME="/usr/share/${PN}/lib"
+
+src_prepare() {
+	default #780585
+	java-pkg-2_src_prepare
+	mkdir -v src resources || die
+	find org doclet -type f -name '*.java' \
+		| xargs cp --parent -t "${JAVA_SRC_DIR}" || die
+	find org -type f \
+		! -name '*.java' \
+		! -name 'package.html' \
+		! -name 'README.html' \
+		! -name 'jedit.manifest' \
+		! -name 'Reflect.last' \
+		! -name 'bsh.jj*' \
+		! -name '*.scripted' \
+		| xargs cp --parent -t "${JAVA_RESOURCE_DIRS}" || die
+
+	einfo "Creating the docs"
+	mv doc/{FAQ,whatsnew} . || die
+	mkdir doc/{FAQ,whatsnew} || die
+	# build.xml 734-804
+	xsltproc \
+		-xinclude \
+		-o doc/FAQ/ \
+		doc/jedithtml.xsl \
+		FAQ/faq.xml || die
+	xsltproc \
+		-o doc/whatsnew/ \
+		doc/jedithtml.xsl \
+		whatsnew/news.xml || die
+
+	einfo "Creating users-guide"
+	ln -s /usr/share/sgml/docbook/ . || die
+	# This is the part which does not work with xmlto. So we use xsltproc.
+	# TODO:
+	# Try "XIncludes with Xalan and Xerces" according to
+	# http://www.sagehill.net/docbookxsl/Xinclude.html#d0e40343
+	xsltproc \
+		-xinclude \
+		-o doc/users-guide/users-guide.html \
+		docbook/xsl-stylesheets/html/docbook.xsl \
+		doc/jedithtml.xsl \
+		doc/users-guide/users-guide.xml || die
+	# Cleanup. The xml files were processed and need not get installed.
+	rm doc/users-guide/*.xml || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	# The application wants all this stuff in /usr/share/jedit/lib/
+	# Using java-pkg_dolauncher with --pwd cannot solve it.
+	# If we change the location the application fails to start:
+	# "System keymap folder do not exist, your installation is broken."
+	cp -R jars doc keymaps macros modes properties startup \
+		"${D}${JEDIT_HOME}" || die
+
+	make_desktop_entry "${PN}" jEdit \
+		"${JEDIT_HOME}/doc/${PN}.png" \
+		"Development;Utility;TextEditor"
+
+	# keep the plugin directory
+	keepdir "${JEDIT_HOME}/jars"
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	elog "The system directory for jEdit plugins is"
+	elog "${JEDIT_HOME}/jars"
+	elog "If you get plugin related errors on startup, first try updating them."
+}
+
+pkg_postrm() {
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		xdg_desktop_database_update
+		elog "jEdit plugins installed into /usr/share/jedit/jars"
+		elog "(after installation of jEdit itself) haven't been"
+		elog "removed. To get rid of jEdit completely, you may"
+		elog "want to run"
+		elog ""
+		elog "    rm -r ${JEDIT_HOME}"
+	fi
+}
--- a/app-editors/mousepad/Manifest
+++ b/app-editors/mousepad/Manifest
@ -1 +1,2 @@
 DIST mousepad-0.6.2.tar.bz2 1402314 BLAKE2B c783ec58317ca3c0eaa0023ade3043f4aa4f020a12c0258fe0cf1e2303aa07dfbc67b9aa0178ca9282da98754103fda6c90ba034fa4057dd855b400c0d371085 SHA512 086f60f6f405290ed76366f4c5195e9c8f9c5058d1892200a73e48d6378428efe47f2038e3eddb81186e22dd87d57580559a556b1b22f202b6f056c7f90b64ea
+DIST mousepad-0.6.3.tar.bz2 1428583 BLAKE2B 73a0eb0cfecaa88c6d3508034561206ff1a24139bbdea4cb677ec79de30a59386cf7beb7fd540d31c0a3ec4804ba2001b13470baf0bbec19dc4cf1cc315479ee SHA512 a47e9c0d5b039444ee455e80d0ab4642d5c29d6e5632ec4fccfcef061b4bf40a1709ea73b092b02e915e1796d1593ede68e59b9fe373e127302d34f82c9beae3
--- a/app-editors/mousepad/mousepad-0.6.3.ebuild
+++ b/app-editors/mousepad/mousepad-0.6.3.ebuild
@ -0,0 +1,63 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2-utils xdg-utils
+
+DESCRIPTION="GTK+-based editor for the Xfce Desktop Environment"
+HOMEPAGE="
+	https://docs.xfce.org/apps/mousepad/start
+	https://gitlab.xfce.org/apps/mousepad/
+"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="policykit spell +shortcuts"
+
+DEPEND="
+	>=dev-libs/glib-2.56.2
+	>=x11-libs/gtk+-3.22:3
+	>=x11-libs/gtksourceview-4.0.0:4
+	policykit? ( sys-auth/polkit )
+	spell? ( app-text/gspell )
+	shortcuts? ( >=xfce-base/libxfce4ui-4.17.5:= )
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-lang/perl
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local myconf=(
+		--enable-gtksourceview4
+		$(use_enable policykit polkit)
+		$(use_enable spell plugin-gspell)
+		$(use_enable shortcuts plugin-shortcuts)
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
--- a/app-editors/pluma-plugins/metadata.xml
+++ b/app-editors/pluma-plugins/metadata.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
 		<email>immoloism@gmail.com</email>
--- a/app-editors/zed/Manifest
+++ b/app-editors/zed/Manifest
@ -1,10 +1,12 @@
 DIST alacritty-91d034ff8b53867143c005acfaa14609147c9a2c.gh.tar.gz 1642074 BLAKE2B b6e7458a29060ecf457ca44fc0e3f1f608237a304f5dc76019dc1d0baba6b964832d0a24de00b6a3d17dae0bcf4583b729c0455c6e5020bac4a473e0b2ac31e9 SHA512 930851cf579a34d3072a6e5e89f4a44f551b9df9975d1b111c00ff39815d549f9c421d2728528b0c841c28677709c2865476a69890ba299e4a0f4822f3c2029d
 DIST async-pipe-rs-82d00a04211cf4e1236029aa03e6b6ce2a74c553.gh.tar.gz 5575 BLAKE2B bbad7d35213afb7dc3eda1f72555cb5a61bc61acfa1b91771a528773c468629831f62bd26f9bdb345bcf94950892a294ce71cecc8552660cda5c28de6906764a SHA512 86b13e6acbc1d04fd386b10be1e8f1f917f0ad12a702e9709526f798ef45ee389f4e14bb4ff16d0f1b14b278c76b75b5bf925581af402b350dc933a96b019460
+DIST async-stripe-3672dd4efb7181aa597bf580bf5a2f5d23db6735.gh.tar.gz 1057821 BLAKE2B 93218011a1f75acedfb9d4cd65fb3016b4a604926de173b4ce3839a562ec1483c3a7aa2b4c5f77fe50ac648eb9dfb076d19a7c736426136fd5e0f0d3f80d9541 SHA512 6d7765423294ab80aea5c7889bdfe20fab5384ed7ea9d54fde8208879a07b62425e71e77ed0fb182c59ef473f693181a7ed99925753bf6e672b4a729c6454700
 DIST blade-e142a3a5e678eb6a13e642ad8401b1f3aa38e969.gh.tar.gz 3304563 BLAKE2B 11a7b9c6825ded7ddfcd81cc6f132f7b93c0a8d5dd78fc730525bd16d2f16d590f3d8f33714302d13278febe7f012f6c98d86a7c744f2e79f2e0a36e088ffb6b SHA512 1d5a0533a9348b216147b3a27f39c64ac3e318f820e1025edc5bf778cfb41f3e62f8bed8bfb8bedbcb672b24660601f701965ee0b6f40c05ac61405bdd95df1f
 DIST cosmic-text-542b20ca4376a3b5de5fa629db1a4ace44e18e0c.gh.tar.gz 180043 BLAKE2B 44f4429467d7e54c5348d564ae565c8e8759ccc482045ecc9fe4e3ca6c03c45f6537902e7d8867b557e0b0d1017f03b4e24f63e48a51b774e576da42439c7bb1 SHA512 7a31d1816debbbc892fd16b7b84994569fb046dfcf7f68a1be47885d4a01194f4a849d6d2e91dd534be7c39a0339108711b7017eebc15cd64b63014b5a5b57f0
 DIST font-kit-40391b7c0041d8a8572af2afa3de32ae088f0120.gh.tar.gz 1289463 BLAKE2B f35f28341ad40c77434f2765fa6ab546a3b1eeb950dd3f92ac90676f0005167aa84772d62852c45e2c24511f5e79cc8eff7844e5382bb21212c8f08cedd890fd SHA512 c6848000f0ba629b9b001618f06511882832f0334095606c7d6d4929f56a9d78fbe2db04411732619aafbc128cdaf44e7a6d32d351d0577b439cf2e0fa343682
 DIST lsp-types-72357d6f6d212bdffba3b5ef4b31d8ca856058e7.gh.tar.gz 70057 BLAKE2B 56e987fb62ee832ce6049a58a9caec08293d8a104aec43cbd4800e19f11a0b01980b231b54b7b3845b265caf7c35fb987844f6dcdbf3370a8bfe64869d25a6f6 SHA512 3df8105950ca1d0b04e02b78aae90849937691e5d5edd00d24dcdb2dd06a53cb97e6fee09611d28289d53dde9f556ca722e4dc804ab398c095b1e144c7227300
 DIST nvim-rs-69500bae73b8b3f02a05b7bee621a0d0e633da6c.gh.tar.gz 47933 BLAKE2B 4fbb0f1bd14fcbc708a52357c03574e7fe864f4a33fd7202f13bdbc1527ecc4f14377994c2d1bab9806ca921cab9a6287abd91e70802bfba4526f12b71587238 SHA512 ff75686616e5e2fc2a8629c5a03922f5a97963da42054bfe2c1c8f54edccf7b2a0f1d624460e4f51a04ee6c228b174c7308a68ff504ea5efe10df0edacbb53de
+DIST reqwest-fd110f6998da16bbca97b6dddda9be7827c50e29.gh.tar.gz 222254 BLAKE2B 59d486fa9e4dbe67e1b45efbeb39f17d9010aa97fe57467f66cefc231291197dfa6a5e8ca313faf3d727b1bcbffba79fbca141efc190db1c2928f13727241f9a SHA512 f4e486682469a97dd2db9e594ef053e10abcad80afd93e86d288a5e364518a15ed6446e2cac43abd9040207c34a5a52f3c1ff1a4190604d914dbd278bc7d5a67
 DIST tree-sitter-go-mod-a9aea5e358cde4d0f8ff20b7bc4fa311e359c7ca.gh.tar.gz 27305 BLAKE2B 919875231d9f57e8dfe4d9e7772bd71126bf3ce8d39f7d1c9cb5823810b461c96e69389f6736e819a29958e5ac934424ffa9b291c8268741c4ecff2b76ad526a SHA512 247f4298cef3aae19207f06cb977bc84afdbf7b037d34bb294c09482074935e0552711ec7ae1d5c22d4590a0f2c80fb83d59787c4fc14acde4e06f20b6a18105
 DIST tree-sitter-go-work-acb0617bf7f4fda02c6217676cc64acb89536dc7.gh.tar.gz 16413 BLAKE2B 2b97192ad26449d28bb47acb99bd3a0b9cbb8fd2521693099d4191e1d8920b74d1b93f35a1d4f9081dd7bf161f2053f8eba6f2264c8b68d0fbd0fd7d1d1c75b8 SHA512 1b88438403d38019134c41db99c509e4cdbb75c4ba947abb1b5459a9f94eff33006fca4fda4b0a35412507bcdd9f0536a7e1ba2ac0918120242b46bcca9dec96
 DIST tree-sitter-heex-1dd45142fbb05562e35b2040c6129c9bca346592.gh.tar.gz 33900 BLAKE2B 2e7bbd467a4e457211d032492daa180824d9aaf582c0ae132eeb46ddb6016b80aea289e9922542bc9744f4e16c1e5d8d4d3ebc1da4e39a87e9f9eec61e0a2ab3 SHA512 6fb1c269e648231c5453d6dea9c6b6a9f6109328bacd5fc509a4707f41c06ae3d753f7635deea7588f86df1fa7cf630ab6c9051b8d29d359b25e83be07c0b6f5
@ -17,3 +19,5 @@ DIST zed-0.155.2-crates.tar.xz 102884036 BLAKE2B 109b5355fd8f7b6995553a61ce70cd6
 DIST zed-0.155.2.tar.gz 13029083 BLAKE2B 79b7fbee1c2870ed062469967e73b45f3c9fecacc28d27fecfc79307133f04d25fd9881d182fdf327a4abf35cf98a5d68c42b5e8acc0d9f2a6771199d9b38de5 SHA512 d95acf8df3f7cf8b3081740fd9750452dd5c97461f53e57457529363cc9e20c9d7db3753f60e2b7be13772f5a7b261725c260afe76f08bcf3382a1068b481e74
 DIST zed-0.157.5-crates.tar.xz 102952440 BLAKE2B 75528dc6aca9fb6357b1f781171f83f5b7830e1ef0921c1c9881b2e1d0a9fecc597630dbb904a473ffb2cf4a95929a14a6709e04061bdd2bfa128deb19ac47d3 SHA512 d9d24b89168dded74e41a59afd3f17a50eb41212f5c7b7c9f7d52186fdfdbe85edca043eda189c60efdb52f349c430dcb57a97090aa1fc45923d955e8f00591f
 DIST zed-0.157.5.tar.gz 13064986 BLAKE2B af3148840d8552a91969b2cb7eeb1b7a9ea1cd6fcd7add1dd7f59da7e5f080fb09510018c5f6abdf1ed6119b698d798ed6aeba714665a72f3993edf6fbd81266 SHA512 a431e353161d11beb8d4da3e0a630588eeb9d8059e489abb7a20be2840d586fd3d4727b2c37309f8d83dcd51c83b1d8f8f68b9eb206a2c36d5451e057106fc84
+DIST zed-0.158.1-crates.tar.xz 93927728 BLAKE2B 6c1b37d0203723b600b50b14d878491af20e3d7e9c7a6ea71352a7a95127e39d4a3136fcafcfa1f8e8d8fb209924466e21078da67f722a6361c086341a136bde SHA512 77121510fc364fd65e8c5440ebf5683c89b6ef0d47f875276a1ba2279f9c4df47458cd4abf534dd70a73ecebdd78fdb59b922c7c08d27dad43b672957168b139
+DIST zed-0.158.1.tar.gz 13080553 BLAKE2B 4e2cebf3edaaeb855f0521c45277e04d7b67c82ba9a706fa8c030f6838cc383f8ef57d45b215168aca8b26b5dec43bae1f6a4e7a552480591c05248aad88162f SHA512 ed1adc4b788f8901c337e795e1f34cdbee5b2e04f14bc8530f69c41ffcca03384a01ea0c8a7989d76dfe11e80e1268d32965212253530cc747320171eb0b8fd8
--- a/app-editors/zed/zed-0.158.1.ebuild
+++ b/app-editors/zed/zed-0.158.1.ebuild
@ -0,0 +1,144 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Autogenerated by pycargoebuild 0.13.3
+
+EAPI=8
+
+CRATES="
+"
+
+declare -A GIT_CRATES=(
+	[alacritty_terminal]='https://github.com/alacritty/alacritty;91d034ff8b53867143c005acfaa14609147c9a2c;alacritty-%commit%/alacritty_terminal'
+	[async-pipe]='https://github.com/zed-industries/async-pipe-rs;82d00a04211cf4e1236029aa03e6b6ce2a74c553;async-pipe-rs-%commit%'
+	[async-stripe]='https://github.com/zed-industries/async-stripe;3672dd4efb7181aa597bf580bf5a2f5d23db6735;async-stripe-%commit%'
+	[blade-graphics]='https://github.com/kvark/blade;e142a3a5e678eb6a13e642ad8401b1f3aa38e969;blade-%commit%/blade-graphics'
+	[blade-macros]='https://github.com/kvark/blade;e142a3a5e678eb6a13e642ad8401b1f3aa38e969;blade-%commit%/blade-macros'
+	[blade-util]='https://github.com/kvark/blade;e142a3a5e678eb6a13e642ad8401b1f3aa38e969;blade-%commit%/blade-util'
+	[cosmic-text]='https://github.com/pop-os/cosmic-text;542b20ca4376a3b5de5fa629db1a4ace44e18e0c;cosmic-text-%commit%'
+	[font-kit]='https://github.com/zed-industries/font-kit;40391b7c0041d8a8572af2afa3de32ae088f0120;font-kit-%commit%'
+	[lsp-types]='https://github.com/zed-industries/lsp-types;72357d6f6d212bdffba3b5ef4b31d8ca856058e7;lsp-types-%commit%'
+	[nvim-rs]='https://github.com/KillTheMule/nvim-rs;69500bae73b8b3f02a05b7bee621a0d0e633da6c;nvim-rs-%commit%'
+	[reqwest]='https://github.com/zed-industries/reqwest;fd110f6998da16bbca97b6dddda9be7827c50e29;reqwest-%commit%'
+	[tree-sitter-gomod]='https://github.com/zed-industries/tree-sitter-go-mod;a9aea5e358cde4d0f8ff20b7bc4fa311e359c7ca;tree-sitter-go-mod-%commit%'
+	[tree-sitter-gowork]='https://github.com/zed-industries/tree-sitter-go-work;acb0617bf7f4fda02c6217676cc64acb89536dc7;tree-sitter-go-work-%commit%'
+	[tree-sitter-heex]='https://github.com/zed-industries/tree-sitter-heex;1dd45142fbb05562e35b2040c6129c9bca346592;tree-sitter-heex-%commit%'
+	[tree-sitter-md]='https://github.com/zed-industries/tree-sitter-markdown;4cfa6aad6b75052a5077c80fd934757d9267d81b;tree-sitter-markdown-%commit%'
+	[tree-sitter-yaml]='https://github.com/zed-industries/tree-sitter-yaml;baff0b51c64ef6a1fb1f8390f3ad6015b83ec13a;tree-sitter-yaml-%commit%'
+	[xim-ctext]='https://github.com/XDeme1/xim-rs;d50d461764c2213655cd9cf65a0ea94c70d3c4fd;xim-rs-%commit%/xim-ctext'
+	[xim-parser]='https://github.com/XDeme1/xim-rs;d50d461764c2213655cd9cf65a0ea94c70d3c4fd;xim-rs-%commit%/xim-parser'
+	[xim]='https://github.com/XDeme1/xim-rs;d50d461764c2213655cd9cf65a0ea94c70d3c4fd;xim-rs-%commit%'
+	[xkbcommon]='https://github.com/ConradIrwin/xkbcommon-rs;fcbb4612185cc129ceeff51d22f7fb51810a03b2;xkbcommon-rs-%commit%'
+)
+
+LLVM_COMPAT=( 18 )
+
+inherit cargo check-reqs desktop flag-o-matic llvm-r1 toolchain-funcs xdg
+
+DESCRIPTION="The fast, collaborative code editor"
+HOMEPAGE="https://zed.dev https://github.com/zed-industries/zed"
+SRC_URI="
+	https://github.com/zed-industries/zed/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	https://gitlab.com/api/v4/projects/35204985/packages/generic/${PN}/${PV}/${P}-crates.tar.xz
+	${CARGO_CRATE_URIS}"
+
+LICENSE="GPL-3+"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD CC0-1.0 ISC
+	LGPL-3 MIT MPL-2.0 Unicode-DFS-2016 ZLIB
+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="gles"
+CHECKREQS_DISK_BUILD="8G"
+CHECKREQS_MEMORY="16G"
+
+DEPEND="
+	app-arch/zstd:=
+	dev-db/sqlite:3
+	dev-libs/libgit2:=
+	dev-libs/mimalloc
+	dev-libs/openssl:0/3
+	dev-libs/protobuf
+	dev-libs/wayland
+	dev-libs/wayland-protocols
+	dev-util/wayland-scanner
+	dev-util/vulkan-tools
+	media-fonts/noto
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/vulkan-loader[X]
+	net-misc/curl
+	sys-libs/zlib
+	x11-libs/libxcb:=
+	x11-libs/libxkbcommon[X]
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	>=virtual/rust-1.80.0
+	dev-util/vulkan-headers
+	sys-devel/gettext
+	sys-devel/mold
+	$(llvm_gen_dep '
+		sys-devel/clang:${LLVM_SLOT}=
+		sys-devel/llvm:${LLVM_SLOT}=
+	')
+"
+
+QA_FLAGS_IGNORED="usr/bin/zedit"
+
+pkg_setup() {
+	if tc-is-gcc; then
+		export CARGO_PROFILE_RELEASE_LTO="true"
+	elif tc-is-clang; then
+		export CARGO_PROFILE_RELEASE_LTO="thin"
+	fi
+	strip-unsupported-flags
+	# flags from upstream
+	export RUSTFLAGS="${RUSTFLAGS} -C symbol-mangling-version=v0 --cfg tokio_unstable -C link-arg=-fuse-ld=mold -C link-args=-Wl,--disable-new-dtags,-rpath,\$ORIGIN/../lib"
+	# linking error with llvm-18
+	export RUSTFLAGS="${RUSTFLAGS} -C link-args=-Wl,-z,nostart-stop-gc"
+	if use gles; then
+		export RUSTFLAGS="${RUSTFLAGS} --cfg gles"
+	fi
+}
+
+src_prepare() {
+	default
+
+	export APP_CLI="zedit"
+	export APP_ICON="zed"
+	export APP_ID="dev.zed.Zed"
+	export APP_NAME="Zed"
+	export APP_ARGS="%U"
+	export DO_STARTUP_NOTIFY="true"
+	envsubst < "crates/zed/resources/zed.desktop.in" > ${APP_ID}.desktop || die
+}
+
+src_configure() {
+	cargo_src_configure --all-features
+}
+
+src_compile() {
+	export RELEASE_VERSION="${PV}"
+	export ZED_UPDATE_EXPLANATION='Updates are handled by portage'
+	cargo_src_compile --package zed --package cli
+}
+
+src_install() {
+	newbin $(cargo_target_dir)/cli ${APP_CLI}
+	exeinto "/usr/libexec"
+	newexe $(cargo_target_dir)/zed zed-editor
+
+	newicon -s 512 crates/zed/resources/app-icon.png zed.png
+	newicon -s 1024 crates/zed/resources/app-icon@2x.png zed.png
+	domenu "${S}/${APP_ID}.desktop"
+}
+
+src_test () {
+	mkdir -p "${HOME}/.config/zed" || die
+	mkdir -p "${HOME}/.local/share/zed/logs/" || die
+
+	SHELL=/usr/bin/sh RUST_BACKTRACE=full cargo_src_test -vv
+}
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
--- a/app-emacs/fedi/Manifest
+++ b/app-emacs/fedi/Manifest
@ -0,0 +1 @@
+DIST fedi-0.2.tar.gz 23341 BLAKE2B 588fefb92404d9c654c9c6a62a4404ec6ba624bbb16e64532a863d460feb7cea3aeb924f86f04d543dcb842dff7c54858628cda2170d228be5fb7590f55c77ee SHA512 e6f9a27ef9beb45df7e3fbb8dba54965135e378c37fbcdaea95e6ce8c46cb0f7b5219220c245d5cf40636e8219932a5b6bd86251ee655674d8e453d249376218
--- a/app-emacs/fedi/fedi-0.2.ebuild
+++ b/app-emacs/fedi/fedi-0.2.ebuild
@ -0,0 +1,40 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS="28.1"
+
+inherit elisp
+
+DESCRIPTION="Helper functions for Fediverse or other REST API clients for GNU Emacs"
+HOMEPAGE="https://codeberg.org/martianh/fedi.el/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://codeberg.org/martianh/${PN}.el.git"
+else
+	SRC_URI="https://codeberg.org/martianh/${PN}.el/archive/${PV}.tar.gz
+		-> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}.el"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+RDEPEND="
+	app-emacs/markdown-mode
+	|| (
+		>=app-editors/emacs-31.0
+		>=app-editors/emacs-${NEED_EMACS}[json]
+	)
+"
+BDEPEND="
+	${RDEPEND}
+"
+
+DOCS=( readme.org )
+SITEFILE="50${PN}-gentoo.el"
--- a/Show more
+++ b/Show more
				`@ -0,0 +1 @@`
				`DIST fedi-0.2.tar.gz 23341 BLAKE2B 588fefb92404d9c654c9c6a62a4404ec6ba624bbb16e64532a863d460feb7cea3aeb924f86f04d543dcb842dff7c54858628cda2170d228be5fb7590f55c77ee SHA512 e6f9a27ef9beb45df7e3fbb8dba54965135e378c37fbcdaea95e6ce8c46cb0f7b5219220c245d5cf40636e8219932a5b6bd86251ee655674d8e453d249376218`