Sync with portage [Wed May 8 21:42:41 MSK 2024].

2024-05-08 21:42:41 +03:00 · 2024-05-08 21:42:41 +03:00 · fea6414492
commit fea6414492
parent 9ce8f93290
4863 changed files with 31293 additions and 29947 deletions
--- a/.editorconfig
+++ b/.editorconfig
@ -1,11 +0,0 @@
 # https://editorconfig.org/
 root = true
 [*.{ebuild,eclass}]
 charset = utf-8
 end_of_line = lf
 insert_final_newline = true
 indent_style = tab
 indent_size = 4
 trim_trailing_whitespace = true
 #max_line_length = 80
--- a/.mailmap
+++ b/.mailmap
@ -1,30 +0,0 @@
 # Old/new developers can be added here to map their contributions accurately
 # before joining and after retiring, as well as the usual uses of .mailmap.
 # See gitmailmap(5) for format details.
 # Please keep this list sorted.
 # Use "grep -v '^#' .mailmap | LC_ALL=en_US.utf-8 sort".
 Alexey Shvetsov <alexxy@gentoo.org> <alexxy@omrb.pnpi.spb.ru>
 Alexey Sokolov <alexey+gentoo@asokolov.org> <sokolov@google.com>
 Andrew Ammerlaan <andrewammerlaan@gentoo.org> <aammerlaan@science.ru.nl>
 Andrew Ammerlaan <andrewammerlaan@gentoo.org> <andrewammerlaan@gentoo.org>
 Andrew Ammerlaan <andrewammerlaan@gentoo.org> <andrewammerlaan@riseup.net>
 Andrew Ammerlaan <andrewammerlaan@gentoo.org> <andrew.ammerlaan@ru.nl>
 Andrew Ammerlaan <andrewammerlaan@gentoo.org> <nowa-ammerlaan@riseup.net>
 Arsen Arsenović <arsen@gentoo.org> <arsen@aarsen.me>
 Florian Schmaus <flow@gentoo.org> <flo@geekplace.eu>
 Ionen Wolkens <ionen@gentoo.org> <sudinave@gmail.com>
 Joonas Niilola <juippis@gentoo.org> <juippis@gmail.com>
 Maciej Barć <xgqt@gentoo.org> <xgqt@protonmail.com>
 Maciej Barć <xgqt@gentoo.org> <xgqt@riseup.net>
 Marek Szuba <marecki@gentoo.org> <Marek.Szuba@cern.ch>
 Martin Dummer <martin.dummer@gmx.net> <martin.dummer@ts.fujitsu.com>
 Michal Privoznik <michal.privoznik@gmail.com> <miso.privoznik@gmail.com>
 Michal Privoznik <michal.privoznik@gmail.com> <mprivozn@redhat.com>
 Michal Privoznik <michal.privoznik@gmail.com> Michal Prívozník <michal.privoznik@gmail.com>
 Petr Vaněk <arkamar@gentoo.org> <arkamar () atlas ! cz>
 Petr Vaněk <arkamar@gentoo.org> <arkamar@atlas.cz>
 Petr Vaněk <arkamar@gentoo.org> <pv@excello.cz>
 Sam James <sam@gentoo.org> Sam James (sam_c) <sam@cmpct.info>
 Sam James <sam@gentoo.org> Sam James (sam_c) <sam@gentoo.org>
 Ulrich Müller <ulm@gentoo.org> <ulm@kph.uni-mainz.de>
 Viorel Munteanu <ceamac@gentoo.org> <ceamac.paragon@gmail.com>
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/acct-group/Manifest.gz
+++ b/acct-group/Manifest.gz
--- a/acct-group/unifi-video/Manifest
+++ b/acct-group/unifi-video/Manifest
--- a/acct-group/unifi-video/metadata.xml
+++ b/acct-group/unifi-video/metadata.xml
@ -1,8 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>bkohler@gentoo.org</email>
 		<name>Ben Kohler</name>
 	</maintainer>
 </pkgmetadata>
--- a/acct-group/unifi-video/unifi-video-0-r2.ebuild
+++ b/acct-group/unifi-video/unifi-video-0-r2.ebuild
@ -1,9 +0,0 @@
 # Copyright 2020-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
 inherit acct-group
 DESCRIPTION="Group for Unifi Video"
 ACCT_GROUP_ID=348
--- a/acct-user/Manifest.gz
+++ b/acct-user/Manifest.gz
--- a/acct-user/unifi-video/Manifest
+++ b/acct-user/unifi-video/Manifest
--- a/acct-user/unifi-video/unifi-video-0-r2.ebuild
+++ b/acct-user/unifi-video/unifi-video-0-r2.ebuild
@ -1,12 +0,0 @@
 # Copyright 2020-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
 inherit acct-user
 DESCRIPTION="User for Unifi Video"
 ACCT_USER_ID=348
 ACCT_USER_GROUPS=( unifi-video )
 acct-user_add_deps
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
--- a/app-accessibility/orca/Manifest
+++ b/app-accessibility/orca/Manifest
@ -1,2 +1 @@
 DIST orca-45.1.tar.xz 3966196 BLAKE2B 5d78e228c480e880ca62f5e6b35d5394cbe41b67dc14f7158ca3dcadcd9721bb6e37f2054c1fa3375019351fc609d1ab4268becede10b60fbc67051c5e67539f SHA512 581126ced85943c916d9b2c0a55c12fe16344c9d6501be0290698c0668909faab4c1f539ffd856c82d0b386cfa8ca00ba5176ff5b9c5c1176cc30faededb411a
 DIST orca-45.2.tar.xz 3997024 BLAKE2B dfdf113694127323a92450b04b20fcc5655be0236c0173167d5d15478703b676c3fd8c1de0e75783875c5d2d40541c764fb002314d66c7570475cd63f6bfa473 SHA512 57eee451cf0da52e1297beae6c6d527886721b23c3415a5e046f3431876fdf1603dbd81ca763ed614ace68e7db96d90b413c663f113d0033ec1f2797df7bf589
--- a/app-accessibility/orca/orca-45.1.ebuild
+++ b/app-accessibility/orca/orca-45.1.ebuild
@ -1,59 +0,0 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
 PYTHON_COMPAT=( python3_{10..11} )
 inherit gnome2 python-single-r1
 DESCRIPTION="Extensible screen reader that provides access to the desktop"
 HOMEPAGE="https://wiki.gnome.org/Projects/Orca"
 LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="+braille"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 DEPEND="${PYTHON_DEPS}
 	>=app-accessibility/at-spi2-core-2.48:2[introspection]
 	>=dev-libs/glib-2.28:2
 	media-libs/gstreamer:1.0[introspection]
 	>=x11-libs/gtk+-3.6.2:3[introspection]
 	$(python_gen_cond_dep '
 		dev-python/gst-python:1.0[${PYTHON_USEDEP}]
 		>=dev-python/pygobject-3.18:3[${PYTHON_USEDEP}]
 	')
 	braille? (
 		$(python_gen_cond_dep '
 			>=app-accessibility/brltty-5.0-r3[python,${PYTHON_USEDEP}]
 			dev-libs/liblouis[python,${PYTHON_USEDEP}]
 		')
 	)
 "
 RDEPEND="${DEPEND}
 	$(python_gen_cond_dep '
 		>=app-accessibility/speech-dispatcher-0.8[python,${PYTHON_USEDEP}]
 		>=dev-python/pyatspi-2.46[${PYTHON_USEDEP}]
 		dev-python/setproctitle[${PYTHON_USEDEP}]
 	')
 	x11-libs/libwnck:3[introspection]
 	x11-libs/pango[introspection]
 "
 BDEPEND="
 	dev-util/itstool
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
 "
 #	app-text/yelp-tools
 src_configure() {
 	gnome2_src_configure \
 		$(use_with braille liblouis)
 }
 src_install() {
 	gnome2_src_install
 	python_optimize
 }
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@ -1,3 +1,5 @@
 DIST aws-cli-1.32.100.gh.tar.gz 2724286 BLAKE2B b0b20460f4c29a757237b27c24c305594854f7833c37eb1a62ae2a47708c22c87ef6eaf6f7b3574003458c344fb26ae5a97d3a9dc4c0e3e921ccc3a7eb192636 SHA512 1abf2fd5ffe1928b44eba7fe743ed67c78c3be9ee728abe99011e01b5797e03adae8c2b161b41d91fbe7a610b7e8adc527c52fefc3381a3e9cb671e2ececd43c
 DIST aws-cli-1.32.88.gh.tar.gz 2693435 BLAKE2B 043f4eb08711760b7f8e15a5eba879524788cb65823215ed9d1c8ee5337a085ab6975dfc1c90aea29b7137f050a6d4f201eba57e8c8c83c09625401d8075eb6c SHA512 cb0ed179b9549d988e19963607fe28ca6fb02c92280c451c8651a8149d60a929158f9ae04a1c764540648b8b42417e908cb956fe71ce787c4b788f83cc2ef488
 DIST aws-cli-1.32.93.gh.tar.gz 2695489 BLAKE2B d2f81786d4db158a13ec50ed833668db26bde00cc1e4f5254aa127aba82113074abafa996f525b5f7cd215fd51639481a01a49c425bb4c01e990261529f06082 SHA512 e03892ef522fa43442d1b053d0bf8dbd6c892d94398934c4af58e81153c2759f7e55a289457bb3e5b46f2f01697642498fdd6d51cdc18ad8b6c0f6a31d7c606a
 DIST aws-cli-1.32.98.gh.tar.gz 2723261 BLAKE2B f854a78226a9480d2966e0dcc817e372de96f32723c28bd7189ed484ab24e8fa9f33a018b1b3193d1a5be82e1ad2b69b2d0d6642f004aa6fd601a68862cbbbdc SHA512 989ad96da152423001832a502935ed64a92ef61ba63f9f413fa07e84910d2aa905056bbfcf49202508d6d0a910b4a2969da27e736857e918077693909e4ca0ea
 DIST aws-cli-1.32.99.gh.tar.gz 2723590 BLAKE2B 608cf942f6be189decfeed4c5169da738f1baad55522090e3f5c9c01de9f7b973e8b574506d51dd320042e6edb49b89c88853119c005798f0f72faf81fc68682 SHA512 41bc06980fe7f8cd56ee9330cab15f0c73589d85269d67824b2f48a71928cb20e3c3a7a863ebdc79c14a88b2dcf15960b5c7af3c47f424a332e85ad3c33b3647
--- a/app-admin/awscli/awscli-1.32.100.ebuild
+++ b/app-admin/awscli/awscli-1.32.100.ebuild
@ -0,0 +1,90 @@
 # 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..12} )
 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+2).z
 BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
 RDEPEND="
 	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
 	dev-python/colorama[${PYTHON_USEDEP}]
 	dev-python/docutils[${PYTHON_USEDEP}]
 	dev-python/rsa[${PYTHON_USEDEP}]
 	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	!app-admin/awscli-bin
 "
 BDEPEND="
 	test? (
 		dev-python/packaging[${PYTHON_USEDEP}]
 		dev-python/pytest-forked[${PYTHON_USEDEP}]
 	)
 "
 EPYTEST_XDIST=1
 distutils_enable_tests pytest
 src_prepare() {
 	# do not rely on bundled deps in botocore (sic!)
 	find -name '*.py' -exec sed -i \
 		-e 's:from botocore[.]vendored import:import:' \
 		-e 's:from botocore[.]vendored[.]:from :' \
 		{} + || die
 	# strip overzealous upper bounds on requirements
 	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
 	distutils-r1_src_prepare
 }
 python_test() {
 	local serial_tests=(
 		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
 		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
 		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
 		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
 		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
 		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
 		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
 		tests/unit/customizations/test_sessionmanager.py
 		tests/unit/test_compat.py::TestIgnoreUserSignals
 		tests/unit/test_help.py
 		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
 	)
 	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
 	EPYTEST_XDIST= epytest "${serial_tests[@]}"
 	local EPYTEST_DESELECT=( "${serial_tests[@]}" )
 	# integration tests require AWS credentials and Internet access
 	epytest tests/{functional,unit}
 }
 python_install_all() {
 	newbashcomp bin/aws_bash_completer aws
 	insinto /usr/share/zsh/site-functions
 	newins bin/aws_zsh_completer.sh _aws
 	distutils-r1_python_install_all
 	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
 }
--- a/app-admin/awscli/awscli-1.32.99.ebuild
+++ b/app-admin/awscli/awscli-1.32.99.ebuild
@ -0,0 +1,90 @@
 # 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..12} )
 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+2).z
 BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
 RDEPEND="
 	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
 	dev-python/colorama[${PYTHON_USEDEP}]
 	dev-python/docutils[${PYTHON_USEDEP}]
 	dev-python/rsa[${PYTHON_USEDEP}]
 	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	!app-admin/awscli-bin
 "
 BDEPEND="
 	test? (
 		dev-python/packaging[${PYTHON_USEDEP}]
 		dev-python/pytest-forked[${PYTHON_USEDEP}]
 	)
 "
 EPYTEST_XDIST=1
 distutils_enable_tests pytest
 src_prepare() {
 	# do not rely on bundled deps in botocore (sic!)
 	find -name '*.py' -exec sed -i \
 		-e 's:from botocore[.]vendored import:import:' \
 		-e 's:from botocore[.]vendored[.]:from :' \
 		{} + || die
 	# strip overzealous upper bounds on requirements
 	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
 	distutils-r1_src_prepare
 }
 python_test() {
 	local serial_tests=(
 		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
 		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
 		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
 		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
 		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
 		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
 		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
 		tests/unit/customizations/test_sessionmanager.py
 		tests/unit/test_compat.py::TestIgnoreUserSignals
 		tests/unit/test_help.py
 		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
 	)
 	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
 	EPYTEST_XDIST= epytest "${serial_tests[@]}"
 	local EPYTEST_DESELECT=( "${serial_tests[@]}" )
 	# integration tests require AWS credentials and Internet access
 	epytest tests/{functional,unit}
 }
 python_install_all() {
 	newbashcomp bin/aws_bash_completer aws
 	insinto /usr/share/zsh/site-functions
 	newins bin/aws_zsh_completer.sh _aws
 	distutils-r1_python_install_all
 	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
 }
--- a/app-admin/eclean-kernel/Manifest
+++ b/app-admin/eclean-kernel/Manifest
@ -1 +1,2 @@
 DIST eclean_kernel-2.99.7.tar.gz 25393 BLAKE2B 74f803f1007a1c54d87f087287a34a8380b21b9c66ad75a0ae64463815d5df39de0387f5d0cfd366e33efdaf039fce5dad923f1e55f93a2836830e303c3ca2df SHA512 dd43f65c1beebef59ee7a2e41375797fa5ea77171d8e4cf465b2b6a46e8e4500fb1723f664f2ce59e5b6e79d2dedd4abbaaa303a77e8349b9ee90c56e00e799e
 DIST eclean_kernel-2.99.8.tar.gz 25134 BLAKE2B efd29370f0204c8df7a8e955a50ef8ad819fd29f8cbf1d179e61588130ac6d589366f1f76d499cae42c6e99c553d1b0cd68c4f0728315940b5997196bda6b57c SHA512 57956e1f93327db86942c5be815d3df61934f93a65349faca4d2605e7667b9dfe8e42bc6d4f5c5c27fbbdd536a25371b4c4b0b88dca92ba0f5f98058f1c1b679
--- a/app-admin/eclean-kernel/eclean-kernel-2.99.8.ebuild
+++ b/app-admin/eclean-kernel/eclean-kernel-2.99.8.ebuild
@ -0,0 +1,30 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
 DISTUTILS_USE_PEP517=flit
 PYTHON_COMPAT=( python3_{10..12} )
 inherit distutils-r1 pypi
 DESCRIPTION="Remove outdated built kernels"
 HOMEPAGE="
 	https://github.com/projg2/eclean-kernel/
 	https://pypi.org/project/eclean-kernel/
 "
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~riscv ~x86"
 IUSE="lz4 lzo zstd"
 RDEPEND="
 	dev-python/distro[${PYTHON_USEDEP}]
 	kernel_linux? ( dev-python/pymountboot[${PYTHON_USEDEP}] )
 	lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
 	lzo? ( dev-python/python-lzo[${PYTHON_USEDEP}] )
 	zstd? ( dev-python/zstandard[${PYTHON_USEDEP}] )
 "
 distutils_enable_tests pytest
--- a/app-admin/eclean-kernel/eclean-kernel-9999.ebuild
+++ b/app-admin/eclean-kernel/eclean-kernel-9999.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
@ -9,15 +9,18 @@ PYTHON_COMPAT=( python3_{10..12} )
 inherit distutils-r1 git-r3
 DESCRIPTION="Remove outdated built kernels"
-HOMEPAGE="https://github.com/projg2/eclean-kernel/"
+HOMEPAGE="
 	https://github.com/projg2/eclean-kernel/
 	https://pypi.org/project/eclean-kernel/
 "
 EGIT_REPO_URI="https://github.com/projg2/eclean-kernel.git"
-LICENSE="BSD"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS=""
 IUSE="lz4 lzo zstd"
 RDEPEND="
 	dev-python/distro[${PYTHON_USEDEP}]
 	kernel_linux? ( dev-python/pymountboot[${PYTHON_USEDEP}] )
 	lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
 	lzo? ( dev-python/python-lzo[${PYTHON_USEDEP}] )
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@ -1,2 +1,2 @@
 DIST keepassxc-2.7.6-src.tar.xz 8474624 BLAKE2B 2ecdd387a7bc70aeeaef6eeabdfeed6aaf1d779056580375c011aa71d62459d38258617a4cb46fc3b215a2b6e1e3326cc8c62b228bee0be674923399421b0cbe SHA512 58bdf731e1ce15e4a9db5aae27b7740372c4b28e2998b9acf2d1be6ee5b4eead37149ddd3de039d1cb70d34f11b09f43969d36ce4241b3fe3af4adf53d8ba812
 DIST keepassxc-2.7.7-src.tar.xz 9734460 BLAKE2B d94c42334bbfde46f14f4b14612f4297c500da76ba8a82de26c4a450ee1cacb9a15517a84ef445441651dc33a71f9ca7bca63bb04d0a4e8eeb0380eded6e5477 SHA512 fd82e377bf6e57623c65f2bdd463ea59c6465fbe009552e1030ce0fe9d9177fc448b7b36a90a0da9ed2a2ed161c017d13cef618ae785f89110c038e1d9396926
 DIST keepassxc-2.7.8-src.tar.xz 9764860 BLAKE2B edc5af2b7bd6173f8df4fa20fca54e78c40610d29b02ac9f9920382b8ead3ea293e22e578c353ffc1a374a23f1117a2595570d1de7053a1d36bcb40ed8eceb04 SHA512 c4767ced36d45855b83569d0fcbcfd384ef51d204dd703b006508d55cd7ac94ac36b5476f122fbe1dc6ec301a785e026722e8f0f961d5e339e10997a3871741a
--- a/app-admin/keepassxc/keepassxc-2.7.8.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.7.8.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
@ -9,18 +9,21 @@ DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
 HOMEPAGE="https://keepassxc.org/
 	https://github.com/keepassxreboot/keepassxc/"
-if [[ "${PV}" != *9999 ]] ; then
+if [[ "${PV}" = *9999* ]] ; then
 	inherit git-r3
 	EGIT_BRANCH="develop"
 	EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
 else
 	if [[ "${PV}" == *_beta* ]] ; then
-		SRC_URI="https://github.com/keepassxreboot/${PN}/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
+		SRC_URI="https://github.com/keepassxreboot/${PN}/archive/${PV/_/-}.tar.gz
 			-> ${P}.tar.gz"
 		S="${WORKDIR}/${P/_/-}"
 	else
 		SRC_URI="https://github.com/keepassxreboot/${PN}/releases/download/${PV}/${P}-src.tar.xz"
 		KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 	fi
-else
+
-	inherit git-r3
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 	EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
 	[[ "${PV}" != 9999 ]] && EGIT_BRANCH="master"
 fi
 LICENSE="LGPL-2.1 GPL-2 GPL-3"
@ -42,27 +45,33 @@ RDEPEND="
 	dev-qt/qtwidgets:5
 	media-gfx/qrencode:=
 	sys-libs/readline:0=
-	sys-libs/zlib:=
+	sys-libs/zlib:=[minizip]
-	X? ( dev-qt/qtx11extras:5 )
+	X? (
 		dev-qt/qtx11extras:5
 	)
 	autotype? (
 		x11-libs/libX11
 		x11-libs/libXtst
 	)
 	keeshare? ( sys-libs/zlib:=[minizip] )
 	yubikey? (
 		dev-libs/libusb:1
 		sys-apps/pcsc-lite
 	)
 "
-DEPEND="${RDEPEND}
+DEPEND="
 	${RDEPEND}
 	dev-qt/qttest:5
 "
 BDEPEND="
 	dev-qt/linguist-tools:5
-	doc? ( dev-ruby/asciidoctor )
+	doc? (
 		dev-ruby/asciidoctor
 	)
 "
-PATCHES=( "${FILESDIR}"/${PN}-2.7.4-tests.patch )
+PATCHES=(
 	"${FILESDIR}/${PN}-2.7.4-tests.patch"
 )
 src_prepare() {
 	if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *9999 ]] && [[ ! -f .version ]] ; then
@ -76,7 +85,7 @@ src_configure() {
 	# https://github.com/keepassxreboot/keepassxc/issues/5801
 	filter-lto
-	local mycmakeargs=(
+	local -a mycmakeargs=(
 		# Gentoo users enable ccache via e.g. FEATURES=ccache or
 		# other means. We don't want the build system to enable it for us.
 		-DWITH_CCACHE=OFF
@ -85,6 +94,7 @@ src_configure() {
 		-DWITH_XC_AUTOTYPE="$(usex autotype)"
 		-DWITH_XC_DOCS="$(usex doc)"
 		-DWITH_XC_BROWSER="$(usex browser)"
 		-DWITH_XC_BROWSER_PASSKEYS="$(usex browser)"
 		-DWITH_XC_BOTAN3=ON
 		-DWITH_XC_FDOSECRETS=ON
 		-DWITH_XC_KEESHARE="$(usex keeshare)"
@ -95,7 +105,9 @@ src_configure() {
 		-DWITH_XC_X11="$(usex X)"
 	)
 	if [[ "${PV}" == *_beta* ]] ; then
-		mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
+		mycmakeargs+=(
 			-DOVERRIDE_VERSION="${PV/_/-}"
 		)
 	fi
 	cmake_src_configure
 }
--- a/app-admin/keepassxc/keepassxc-9999.ebuild
+++ b/app-admin/keepassxc/keepassxc-9999.ebuild
@ -9,20 +9,21 @@ DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
 HOMEPAGE="https://keepassxc.org/
 	https://github.com/keepassxreboot/keepassxc/"
-if [[ "${PV}" != *9999 ]] ; then
+if [[ "${PV}" = *9999* ]] ; then
 	inherit git-r3
 	EGIT_BRANCH="develop"
 	EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
 else
 	if [[ "${PV}" == *_beta* ]] ; then
-		SRC_URI="https://github.com/keepassxreboot/${PN}/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
+		SRC_URI="https://github.com/keepassxreboot/${PN}/archive/${PV/_/-}.tar.gz
 			-> ${P}.tar.gz"
 		S="${WORKDIR}/${P/_/-}"
 	else
 		SRC_URI="https://github.com/keepassxreboot/${PN}/releases/download/${PV}/${P}-src.tar.xz"
 		KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 	fi
 else
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 	[[ "${PV}" != 9999 ]] && EGIT_BRANCH="master"
 fi
 LICENSE="LGPL-2.1 GPL-2 GPL-3"
@ -68,6 +69,10 @@ BDEPEND="
 	)
 "
 PATCHES=(
 	"${FILESDIR}/${PN}-2.7.4-tests.patch"
 )
 src_prepare() {
 	if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *9999 ]] && [[ ! -f .version ]] ; then
 		printf '%s' "${PV}" > .version || die
@ -89,6 +94,7 @@ src_configure() {
 		-DWITH_XC_AUTOTYPE="$(usex autotype)"
 		-DWITH_XC_DOCS="$(usex doc)"
 		-DWITH_XC_BROWSER="$(usex browser)"
 		-DWITH_XC_BROWSER_PASSKEYS="$(usex browser)"
 		-DWITH_XC_BOTAN3=ON
 		-DWITH_XC_FDOSECRETS=ON
 		-DWITH_XC_KEESHARE="$(usex keeshare)"
@ -99,7 +105,9 @@ src_configure() {
 		-DWITH_XC_X11="$(usex X)"
 	)
 	if [[ "${PV}" == *_beta* ]] ; then
-		mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
+		mycmakeargs+=(
 			-DOVERRIDE_VERSION="${PV/_/-}"
 		)
 	fi
 	cmake_src_configure
 }
--- a/app-admin/qtpass/Manifest
+++ b/app-admin/qtpass/Manifest
@ -1,2 +1 @@
 DIST qtpass-1.3.2.tar.gz 310316 BLAKE2B ac0f562fd263e9d46980a69183cfd556596750e1050dbc50748cd9be45bc4bf39e4de14cb59f778cfc54f5c32050d567d88d65ec039cba1e9c2e8ef24d7ae99a SHA512 9026f74f6ff75fcef2f6a0862484a2a1eaed1370edd0659e8b4d20039affe846e0da3a0a26a804563813bc678638ab67fa516441208e70c7e9de9b2eda876a10
 DIST qtpass-1.4.0.tar.gz 581368 BLAKE2B 12bf414ea781bad34d97fe28ae39f44e17812039f0d798162b6d875918f20a1583f7a53a1e98ed917edf41c15709c7693c7651205c5e4ec85860ee773350f075 SHA512 47c1284c10e0d8a3bf63c049fc29d785d1a53bef6f183bbe22efebf466371dd454a6e43c944739f487d609f3cde188701ba538e9cb8e2c7e5530f8fa6f992625
--- a/app-admin/qtpass/qtpass-1.3.2-r2.ebuild
+++ b/app-admin/qtpass/qtpass-1.3.2-r2.ebuild
@ -1,63 +0,0 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit desktop qmake-utils virtualx
 DESCRIPTION="Multi-platform GUI for pass, the standard unix password manager"
 HOMEPAGE="https://qtpass.org https://github.com/IJHack/qtpass"
 SRC_URI="https://github.com/IJHack/qtpass/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="test"
 RDEPEND="|| ( app-admin/pass app-admin/gopass )
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtwidgets:5
 	net-misc/x11-ssh-askpass"
 DEPEND="${RDEPEND}
 	dev-qt/qtsvg:5
 	test? ( dev-qt/qttest:5 )"
 BDEPEND="dev-qt/linguist-tools:5"
 RESTRICT="!test? ( test )"
 S="${WORKDIR}/QtPass-${PV}"
 DOCS=( {CHANGELOG,CONTRIBUTING,FAQ,README}.md )
 src_prepare() {
 	default
 	if ! use test ; then
 		sed -i '/SUBDIRS += src /s/tests //' \
 			qtpass.pro || die "sed for qtpass.pro failed"
 	fi
 }
 src_configure() {
 	eqmake5 PREFIX="${EPREFIX}"/usr
 }
 src_test() {
 	virtx default
 }
 src_install() {
 	emake INSTALL_ROOT="${D}" install
 	einstalldocs
 	insinto /usr/share/qtpass/translations
 	doins localization/*.qm
 	doman qtpass.1
 	domenu qtpass.desktop
 	newicon artwork/icon.png qtpass-icon.png
 	insinto /usr/share/metainfo
 	doins qtpass.appdata.xml
 }
--- a/app-admin/restart-services/restart-services-1.3.ebuild
+++ b/app-admin/restart-services/restart-services-1.3.ebuild
@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~mschiff/src/${PN}/${P}.tgz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 RDEPEND="
 	app-admin/lib_users
--- a/app-admin/rsyslog/rsyslog-8.2404.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2404.0.ebuild
@ -24,7 +24,7 @@ else
 		)
 	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc x86"
 fi
 LICENSE="GPL-3 LGPL-3 Apache-2.0"
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@ -1,2 +1,2 @@
 DIST setools-4.4.2.tar.bz2 261962 BLAKE2B 7c8e47d8c15f1eb72d93da5d3ae1a64e857ed0a75e1a47bbad9e4b0d11180581d9e4705ebe942e460acbc4d68261f06f9b03a8c4af1516cc388c201e30dca75e SHA512 4e8cba61ca28459387d862136a2d8ee0914c4bcd254a6d39792cbfcbbf7e58cb82223c05d66c114b08aebbd75c11cef11517c51f674ddb3c1913dc85414546c1
 DIST setools-4.4.4.tar.bz2 262867 BLAKE2B d64605ef050a2d51531e2a180bff086da536aa8d5e5c8cb96a81e137f575d089f9e9ec117cf0de9864f07174d92258b27ebf8fbc462714ef50bbd6d9f80d0a60 SHA512 ef72a7244ba0c724c4aea3afc40d71427e9c0592715f81cccaa8917e96836a88807ea78039c11c261dd3b4d72294accd76ab4bd37447cd500772030245db3c6e
 DIST setools-4.5.1.tar.bz2 264998 BLAKE2B 479cec6f541c1e7125d641928ba49aee949e538612a478840cec2d70106dcf9f7fa5b8049c9d18c560587670ee624a3a744714667d52b99cff24c51e72026db7 SHA512 1045c223423fcb056ffbc2f93c4dc0ccc6ae078ce7d2acbe3a3c65de19440fe801b5b9f71038cde62bf9851f52d868c845aafbe33691ee531cf9854217e061d8
--- a/app-admin/setools/files/setools-4.4.1-cython3.patch
+++ b/app-admin/setools/files/setools-4.4.1-cython3.patch
@ -1,43 +0,0 @@
 https://bugs.gentoo.org/898664
 https://github.com/SELinuxProject/setools/pull/105/commits/fc443b5a0379f3644e071a458e996ea6115ccba3
 (cherry-picked from https://github.com/SELinuxProject/setools/commit/31e104c3a9ca97038e09d3a4549fe2b8c8df36e8)
 From fc443b5a0379f3644e071a458e996ea6115ccba3 Mon Sep 17 00:00:00 2001
 From: Chris PeBenito <chpebeni@linux.microsoft.com>
 Date: Mon, 17 Jul 2023 16:08:21 -0400
 Subject: [PATCH] SELinuxPolicy: Add explicit cast for libspol message
 callback.
 Cython 3.0 is more strict.  The change fixes this issue:
 setools/policyrep/selinuxpolicy.pxi:685:46: Cannot assign type 'void (void *, sepol_handle_t *, const char *, ...) except *' to 'msg_callback'
 Additionally, the msg_callback is not typedef-ed in sepol/debug.h, so it must
 be explicitly defined in sepol.pxd for the casting to work.
 Signed-off-by: Chris PeBenito <chpebeni@linux.microsoft.com>
 --- a/setools/policyrep/selinuxpolicy.pxi
 +++ b/setools/policyrep/selinuxpolicy.pxi
@@ -668,7 +668,7 @@ cdef class SELinuxPolicy:
         if self.sh == NULL:
             raise MemoryError
 -        sepol.sepol_msg_set_callback(self.sh, sepol_logging_callback, self.handle)
 +        sepol.sepol_msg_set_callback(self.sh, <sepol.msg_callback>sepol_logging_callback, self.handle)
         if sepol.sepol_policydb_create(&self.handle) < 0:
             raise MemoryError
 --- a/setools/policyrep/sepol.pxd
 +++ b/setools/policyrep/sepol.pxd
@@ -16,8 +16,10 @@ cdef extern from "<sepol/handle.h>":
     void sepol_handle_destroy(sepol_handle_t *sh)
 +ctypedef void (*msg_callback)(void *varg, sepol_handle_t *handle, const char *fmt, ...)
 +
 +
 cdef extern from "<sepol/debug.h>":
 -    ctypedef void (*msg_callback)(void *varg, sepol_handle_t *handle, const char *fmt, ...)
     void sepol_msg_set_callback(sepol_handle * handle, msg_callback cb, void *cb_arg)
--- a/app-admin/setools/setools-4.5.1.ebuild
+++ b/app-admin/setools/setools-4.5.1.ebuild
@ -1,11 +1,11 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI="8"
 DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit distutils-r1
@ -18,7 +18,7 @@ if [[ ${PV} == 9999 ]] ; then
 	S="${WORKDIR}/${P}"
 else
 	SRC_URI="https://github.com/SELinuxProject/setools/releases/download/${PV}/${P}.tar.bz2"
-	KEYWORDS="amd64 arm arm64 x86"
+	KEYWORDS="~amd64 ~arm64"
 	S="${WORKDIR}/${PN}"
 fi
@ -28,23 +28,20 @@ IUSE="test X"
 RESTRICT="!test? ( test )"
 RDEPEND="${PYTHON_DEPS}
 	>=dev-python/networkx-2.6[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=sys-libs/libsepol-3.2:=
 	>=sys-libs/libselinux-3.2:=
 	X? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+		dev-python/PyQt6[gui,widgets,${PYTHON_USEDEP}]
 		dev-python/pygraphviz[${PYTHON_USEDEP}]
 	)"
 DEPEND="${RDEPEND}"
-BDEPEND=">=dev-python/cython-0.27[${PYTHON_USEDEP}]
+BDEPEND=">=dev-python/cython-0.29.14[${PYTHON_USEDEP}]
 	test? (
 		>=dev-python/networkx-2.0[${PYTHON_USEDEP}]
 		sys-apps/checkpolicy
 	)"
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.4.1-cython3.patch
 )
 distutils_enable_tests pytest
 python_prepare_all() {
--- a/app-admin/setools/setools-9999.ebuild
+++ b/app-admin/setools/setools-9999.ebuild
@ -28,15 +28,16 @@ IUSE="test X"
 RESTRICT="!test? ( test )"
 RDEPEND="${PYTHON_DEPS}
-	>=dev-python/networkx-2.0[${PYTHON_USEDEP}]
+	>=dev-python/networkx-2.6[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=sys-libs/libsepol-3.2:=
 	>=sys-libs/libselinux-3.2:=
 	X? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+		dev-python/PyQt6[gui,widgets,${PYTHON_USEDEP}]
 		dev-python/pygraphviz[${PYTHON_USEDEP}]
 	)"
 DEPEND="${RDEPEND}"
-BDEPEND=">=dev-python/cython-0.27[${PYTHON_USEDEP}]
+BDEPEND=">=dev-python/cython-0.29.14[${PYTHON_USEDEP}]
 	test? (
 		sys-apps/checkpolicy
 	)"
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@ -1,2 +1,3 @@
 DIST bacula-13.0.3.tar.gz 6235649 BLAKE2B c1053e784f995aa45f2810a8b1370211a6e42f9512c11e0290f059d0e39489c24d4a7951fa055a00ecd2c4acb44581cc220271952c6d477d15c86e0a7e8680f7 SHA512 59ec616535959bde26b5b03a60355f3f8d80ae7a719a079d354f41c0f103b0e467177b6f813ef3eb4d30866f73c393d766e8337e20bb97f19ffd7eba5e5c59c5
 DIST bacula-13.0.4.tar.gz 6227040 BLAKE2B e54a754280178f74f97fdbb3c91a596b632d80739fedd5f847d183f0852ea9e82bba55ad9a745ee1ceb945bd527d33b117bc3c866783bd3073166bd20607a72a SHA512 5d33714d5575c351e28676cbd165fe7648ce15a1bc2a03f6d5635528083f3ec3bd6c7137a987690dcc8b232105e5768be91ba405a033ad60c4b82f3c88d73812
 DIST bacula-15.0.2.tar.gz 6524812 BLAKE2B 1dd0722ce2bb6363936ed9cc9df1b6d842945f17277c77f40884bafc4b0a254c5fdd2c21bd200c6ca8b77c8eb718a319552e50135c9925d2b4ad81a64ab819d2 SHA512 71bd206a2bb0cf3ca0f2cb6547b63946bc2a8a5f70c5506b9a589e5ed9871bb98b56205da7d12e54a41c9ab3539fe1114bc94d926f0f831ee9e15bba36f167f3
--- a/app-backup/bacula/bacula-15.0.2.ebuild
+++ b/app-backup/bacula/bacula-15.0.2.ebuild
@ -0,0 +1,449 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
 inherit desktop libtool qmake-utils systemd
 MY_PV=${PV/_beta/-b}
 MY_P=${PN}-${MY_PV}
 DESCRIPTION="Featureful client/server network backup suite"
 HOMEPAGE="https://www.bacula.org/"
 SRC_URI="https://downloads.sourceforge.net/bacula/${MY_P}.tar.gz"
 S=${WORKDIR}/${MY_P}
 LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 logwatch mysql postgres qt5 readline selinux +sqlite ssl static tcpd vim-syntax X"
 DEPEND="
 	!bacula-clientonly? (
 		!bacula-nodir? ( virtual/mta )
 		postgres? ( dev-db/postgresql:=[threads(+)] )
 		mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) )
 		sqlite? ( dev-db/sqlite:3 )
 	)
 	dev-libs/gmp:0
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
 		dev-qt/qtwidgets:5
 		dev-qt/qtsvg:5
 		x11-libs/qwt:6
 	)
 	logwatch? ( sys-apps/logwatch )
 	readline? ( sys-libs/readline:0 )
 	static? (
 		dev-libs/lzo[static-libs]
 		sys-libs/ncurses:=[static-libs]
 		sys-libs/zlib[static-libs]
 		acl? ( virtual/acl[static-libs(+)] )
 		ssl? (
 			dev-libs/openssl:0=[static-libs]
 		)
 	)
 	!static? (
 		dev-libs/lzo
 		sys-libs/ncurses:=
 		sys-libs/zlib
 		acl? ( virtual/acl )
 		ssl? (
 			dev-libs/openssl:0=
 		)
 	)
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 	dev-util/patchelf
 "
 RDEPEND="${DEPEND}
 	acct-user/bacula
 	acct-group/bacula
 	!bacula-clientonly? (
 		!bacula-nosd? (
 			app-arch/mt-st
 			sys-block/mtx
 		)
 	)
 	selinux? ( sec-policy/selinux-bacula )
 	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 "
 REQUIRED_USE="
 	!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
 	static? ( bacula-clientonly )
 "
 # suppress warning wrt 'implicit function declaration' in config logs
 # bug 900663
 QA_CONFIG_IMPL_DECL_SKIP=(
 	makedev		# designed to check availability in
 				# used header file
 )
 pkg_setup() {
 	#XOR and !bacula-clientonly controlled by REQUIRED_USE
 	use mysql && export mydbtype="mysql"
 	use postgres && export mydbtype="postgresql"
 	use sqlite && export mydbtype="sqlite3"
 	if use bacula-clientonly && use static && use qt5; then
 		ewarn
 		ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt5' useflag."
 		ewarn
 	fi
 }
 src_prepare() {
 	# adjusts default configuration files for several binaries
 	# to /etc/bacula/<config> instead of ./<config>
 	pushd src >&/dev/null || die
 	for f in console/console.c dird/dird.c filed/filed.c \
 		stored/bcopy.c stored/bextract.c stored/bls.c \
 		stored/bscan.c stored/btape.c stored/stored.c \
 		qt-console/main.cpp; do
 		sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \
 			|| die "sed on ${f} failed"
 	done
 	popd >&/dev/null || die
 	# bug 466688 drop deprecated categories from Desktop file
 	sed -i -e 's/Application;//' scripts/bat.desktop.in || die
 	# bug 466690 Use CXXFLAGS instead of CFLAGS
 	sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
 	# drop automatic install of unneeded documentation (for bug 356499)
 	eapply -p0 "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch
 	# bug #310087
 	eapply "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
 	# bug #311161
 	eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-lib-search-path.patch
 	# bat needs to respect LDFLAGS and CFLAGS
 	eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch
 	# tray-monitor needs to respect LDFLAGS and CFLAGS
 	eapply -p0 "${FILESDIR}"/tray-monitor-pro.patch
 	# bug #328701
 	eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
 	eapply -p0 "${FILESDIR}"/${PN}-15.0.2-fix-static.patch
 	# fix soname in libbaccat.so, see bugs #602952, #790140 and #845126
 	eapply "${FILESDIR}/bacula-fix-sonames-new.patch"
 	# correct library search path for slibtool usage (bug #914389)
 	eapply -p0 "${FILESDIR}/${PN}-15.0.2-fix_slibtool.patch"
 	# do not strip binaries
 	sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
 	sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
 	sed -i -e "s/+= qt$/+= qt nostrip/" \
 			src/qt-console/tray-monitor/tray-monitor.pro.in || die
 	eapply_user
 	# Fix systemd unit files:
 	# bug 497748
 	sed -i -e '/Requires/d' platforms/systemd/*.service.in || die
 	sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die
 	# bug 504370
 	sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in || die
 	# bug 584442 and 504368
 	sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in || die
 	# build 'bat' for Qt5
 	export QMAKE="$(qt5_get_bindir)"/qmake
 	# adapt to >=Qt-5.9 (see bug #644566)
 	# qmake needs an existing target file to generate install instructions
 	sed -i -e 's#bins.files = bat#bins.files = .libs/bat#g' \
 		src/qt-console/bat.pro.in || die
 	mkdir src/qt-console/.libs || die
 	touch src/qt-console/.libs/bat || die
 	chmod 755 src/qt-console/.libs/bat || die
 	# same for tray-monitor (bug #915605)
 	sed -i -e 's#bins.files = bac#bins.files = .libs/bac#g' \
 		src/qt-console/tray-monitor/tray-monitor.pro.in || die
 	mkdir src/qt-console/tray-monitor/.libs || die
 	touch src/qt-console/tray-monitor/.libs/bacula-tray-monitor || die
 	chmod 755 src/qt-console/tray-monitor/.libs/bacula-tray-monitor || die
 	eapply -p0 "${FILESDIR}/fix_tray_monitor.patch" || die
 	# Don't let program install man pages directly
 	sed -i -e 's/ manpages//' Makefile.in || die
 	# correct installation for plugins to mode 0755 (bug #725946)
 	sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /" src/plugins/fd/Makefile ||die
 	sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /" src/plugins/fd/docker/Makefile ||die
 	# fix bundled libtool (bug 466696)
 	# But first move directory with M4 macros out of the way.
 	# It is only needed by autoconf and gives errors during elibtoolize.
 	mv autoconf/libtool autoconf/libtool1 || die
 	elibtoolize
 }
 src_configure() {
 	local myconf=''
 	if use bacula-clientonly; then
 		myconf="${myconf} \
 			$(use_enable bacula-clientonly client-only) \
 			$(use_enable !static libtool) \
 			$(use_enable static static-cons) \
 			$(use_enable static static-fd)"
 	else
 		myconf="${myconf} \
 			$(use_enable !bacula-nodir build-dird) \
 			$(use_enable !bacula-nosd build-stored)"
 		# bug #311099
 		# database support needed by dir-only *and* sd-only
 		# build as well (for building bscan, btape, etc.)
 		myconf="${myconf}
 			--with-${mydbtype}"
 	fi
 	# do not build bat if 'static' clientonly
 	if ! use bacula-clientonly || ! use static; then
 		myconf="${myconf} \
 			$(use_enable qt5 bat)"
 	fi
 	myconf="${myconf} \
 		$(use_with X x) \
 		$(use_enable batch-insert) \
 		$(use_enable !readline conio) \
 		$(use_enable readline) \
 		$(use_with ssl openssl) \
 		$(use_enable ipv6) \
 		$(use_enable acl) \
 		$(use_with tcpd tcp-wrappers)"
 	econf \
 		--with-pid-dir=/var/run \
 		--sysconfdir=/etc/bacula \
 		--with-archivedir=/var/lib/bacula/tmp \
 		--with-subsys-dir=/var/lock/subsys \
 		--with-working-dir=/var/lib/bacula \
 		--with-logdir=/var/lib/bacula \
 		--with-scriptdir=/usr/libexec/bacula \
 		--with-systemd=$(systemd_get_systemunitdir) \
 		--with-dir-user=bacula \
 		--with-dir-group=bacula \
 		--with-sd-user=root \
 		--with-sd-group=bacula \
 		--with-fd-user=root \
 		--with-fd-group=bacula \
 		--enable-smartalloc \
 		--disable-afs \
 		--without-s3 \
 		--host=${CHOST} \
 		${myconf}
 }
 src_compile() {
 	# Make build log verbose (bug #447806)
 	emake NO_ECHO=""
 }
 src_install() {
 	emake DESTDIR="${D}" install
 	doicon scripts/bacula.png
 	keepdir /var/lib/bacula/tmp
 	# remove not needed .la files #840957
 	find "${ED}" -name '*.la' -delete || die
 	# install bat icon and desktop file when enabled
 	# (for some reason ./configure doesn't pick this up)
 	if use qt5 && ! use static ; then
 		doicon src/qt-console/images/bat_icon.png
 		domenu scripts/bat.desktop
 	fi
 	# remove some scripts we don't need at all
 	rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
 	# rename statically linked apps
 	if use bacula-clientonly && use static ; then
 		pushd "${D}"/usr/sbin || die
 		mv static-bacula-fd bacula-fd || die
 		mv static-bconsole bconsole || die
 		popd || die
 	fi
 	# extra files which 'make install' doesn't cover
 	if ! use bacula-clientonly; then
 	    # the database update scripts
 		diropts -m0750
 		insinto /usr/libexec/bacula/updatedb
 		insopts -m0754
 		doins "${S}"/updatedb/*
 		fperms 0640 /usr/libexec/bacula/updatedb/README
 		# the logrotate configuration
 		# (now unconditional wrt bug #258187)
 		diropts -m0755
 		insinto /etc/logrotate.d
 		insopts -m0644
 		newins "${S}"/scripts/logrotate bacula
 		# the logwatch scripts
 		if use logwatch; then
 			diropts -m0750
 			dodir /usr/share/logwatch/scripts/services
 			dodir /usr/share/logwatch/scripts/shared
 			dodir /etc/logwatch/conf/logfiles
 			dodir /etc/logwatch/conf/services
 			pushd "${S}"/scripts/logwatch >&/dev/null || die
 			emake DESTDIR="${D}" install
 			popd >&/dev/null || die
 		fi
 	fi
 	# Install all man pages
 	doman "${S}"/manpages/*.[18]
 	if ! use qt5; then
 		rm -vf "${D}"/usr/share/man/man1/bat.1*
 		rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
 	fi
 	if use bacula-clientonly || use bacula-nodir ; then
 		rm -vf "${D}"/usr/libexec/bacula/create_*_database
 		rm -vf "${D}"/usr/libexec/bacula/drop_*_database
 		rm -vf "${D}"/usr/libexec/bacula/make_*_tables
 		rm -vf "${D}"/usr/libexec/bacula/update_*_tables
 		rm -vf "${D}"/usr/libexec/bacula/drop_*_tables
 		rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges
 		rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup
 	fi
 	if use bacula-clientonly || use bacula-nosd; then
 		rm -vf "${D}"/usr/libexec/bacula/disk-changer
 		rm -vf "${D}"/usr/libexec/bacula/mtx-changer
 		rm -vf "${D}"/usr/libexec/bacula/dvd-handler
 	fi
 	# documentation
 	dodoc ChangeLog ReleaseNotes SUPPORT
 	# install examples (bug #457504)
 	if use examples; then
 		docinto examples/
 		dodoc -r examples/*
 	fi
 	# vim-files
 	if use vim-syntax; then
 		insinto /usr/share/vim/vimfiles/syntax
 		doins scripts/bacula.vim
 		insinto /usr/share/vim/vimfiles/ftdetect
 		newins scripts/filetype.vim bacula_ft.vim
 	fi
 	# setup init scripts
 	myscripts="bacula-fd"
 	if ! use bacula-clientonly; then
 		if ! use bacula-nodir; then
 			myscripts="${myscripts} bacula-dir"
 		fi
 		if ! use bacula-nosd; then
 			myscripts="${myscripts} bacula-sd"
 		fi
 	fi
 	for script in ${myscripts}; do
 		# copy over init script and config to a temporary location
 		# so we can modify them as needed
 		cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
 		cp "${FILESDIR}/newscripts/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
 		# now set the database dependency for the director init script
 		case "${script}" in
 			bacula-dir)
 				case "${mydbtype}" in
 					sqlite3)
 						# sqlite databases don't have a daemon
 						sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
 						;;
 					*)
 						# all other databases have daemons
 						sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
 						;;
 				esac
 				;;
 			*)
 				;;
 		esac
 		# install init script and config
 		newinitd "${T}/${script}".initd "${script}"
 		newconfd "${T}/${script}".confd "${script}"
 	done
 	systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service
 	# make sure the working directory exists
 	diropts -m0750
 	keepdir /var/lib/bacula
 	# make sure bacula group can execute bacula libexec scripts
 	fowners -R root:bacula /usr/libexec/bacula
 }
 pkg_postinst() {
 	if use bacula-clientonly; then
 		fowners root:bacula /var/lib/bacula
 	else
 		fowners bacula:bacula /var/lib/bacula
 	fi
 	einfo
 	einfo "A group 'bacula' has been created. Any users you add to this"
 	einfo "group have access to files created by the daemons."
 	einfo
 	einfo "A user 'bacula' has been created.  Please see the bacula manual"
 	einfo "for information about running bacula as a non-root user."
 	einfo
 	if ! use bacula-clientonly && ! use bacula-nodir; then
 		einfo
 		einfo "If this is a new install, you must create the ${mydbtype} databases with:"
 		einfo "  /usr/libexec/bacula/create_${mydbtype}_database"
 		einfo "  /usr/libexec/bacula/make_${mydbtype}_tables"
 		einfo "  /usr/libexec/bacula/grant_${mydbtype}_privileges"
 		einfo
 		ewarn "ATTENTION!"
 		ewarn "The format of the database may have changed."
 		ewarn "If you just upgraded from a version below 9.0.0 you must run"
 		ewarn "'update_bacula_tables' now."
 		ewarn "Make sure to have a backup of your catalog before."
 		ewarn
 	fi
 	if use sqlite; then
 		einfo
 		einfo "Be aware that Bacula does not officially support SQLite database anymore."
 		einfo "Best use it only for a client-only installation. See Bug #445540."
 		einfo
 	fi
 	einfo "Please note that 'bconsole' will always be installed. To compile 'bat'"
 	einfo "you have to enable 'USE=qt5'."
 	einfo
 	einfo "/var/lib/bacula/tmp was configured for archivedir. This dir will be used during"
 	einfo "restores, so be sure to set it to an appropriate in dir in the bacula config."
 	einfo
 	einfo "If you adapt the port numbers for baculas components in the config files"
 	einfo "make sure to adapt the file names for the pidfile accordingly"
 	einfo "(see init.d scripts)."
 }
--- a/app-backup/bacula/files/bacula-15.0.2-fix-static.patch
+++ b/app-backup/bacula/files/bacula-15.0.2-fix-static.patch
@ -0,0 +1,63 @@
 --- src/console/Makefile.in.orig	2017-07-25 19:03:05.664760298 +0200
 +++ src/console/Makefile.in	2017-07-25 19:05:43.576706091 +0200
@@ -24,6 +24,7 @@
 CONSSRCS = console.c console_conf.c authenticate.c @CONS_SRC@
 CONSOBJS = console.o console_conf.o authenticate.o @CONS_OBJ@
 JSONOBJS = bbconsjson.o console_conf.o
 +ZLIBS=@ZLIBS@
 # these are the objects that are changed by the .configure process
 EXTRAOBJS = @OBJLIST@
@@ -50,18 +51,18 @@
 bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
 	$(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
 -	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
 -	      $(OPENSSL_LIBS)
 +	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
 +	      $(OPENSSL_LIBS) $(LIBS)
 bbconsjson: Makefile $(JSONOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
 	$(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(JSONOBJS) \
 -	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
 -	      $(OPENSSL_LIBS)
 +	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
 +	      $(OPENSSL_LIBS) $(LIBS)
 static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
 	$(LIBTOOL_LINK) $(CXX) -static -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
 -	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
 -	      $(OPENSSL_LIBS)
 +	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
 +	      $(OPENSSL_LIBS) $(LIBS)
 	strip $@
 --- src/filed/Makefile.in.orig	2017-07-25 19:09:19.655852979 +0200
 +++ src/filed/Makefile.in	2017-07-25 19:11:39.519558592 +0200
@@ -69,19 +69,19 @@
 bacula-fd:  Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@
 	@echo "Linking $@ ..."
 	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \
 -	  $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
 -	  $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) $(ZSTD_LIBS) $(IOKITLIBS)
 +	  $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \
 +	  $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) $(ZSTD_LIBS) $(IOKITLIBS)
 bfdjson:  Makefile $(JSONOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@
 	@echo "Linking $@ ..."
 	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(JSONOBJS) \
 -	  $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
 -	  $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) $(ZSTD_LIBS)
 +	  $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \
 +	  $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) $(ZSTD_LIBS)
 static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@
 	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \
 -	   $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
 -	   $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) $(ZSTD_LIBS)
 +	   $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \
 +	   $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) $(ZSTD_LIBS)
 	strip $@
 Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
--- a/app-backup/bacula/files/bacula-15.0.2-fix_slibtool.patch
+++ b/app-backup/bacula/files/bacula-15.0.2-fix_slibtool.patch
@ -0,0 +1,67 @@
 # slibtool creates library in .libs directory but need -L. to find them
 # Bug #914389
 --- src/stored/Makefile.in.orig	2023-11-15 14:20:23.135630968 +0100
 +++ src/stored/Makefile.in	2023-11-15 14:22:35.771246680 +0100
@@ -267,7 +267,7 @@
 	   -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
 btape: Makefile  $(TAPEOBJS) libbacsd.la drivers ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
 -	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(TAPEOBJS) \
 +	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(TAPEOBJS) \
 	  $(SD_LIBS) $(DLIB) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
@@ -277,7 +277,7 @@
            -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
 cloud_test: Makefile cloud_test.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)  $(BLSOBJS)  libbacsd.la drivers
 -	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(CLOUDTESTOBJS) $(DLIB) \
 +	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(CLOUDTESTOBJS) $(DLIB) \
            $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 bcloud.o: bcloud.c
@@ -286,7 +286,7 @@
            -I$(basedir) $(DINCLUDE) $(S3_INC) $(CFLAGS) $<
 bcloud: Makefile bcloud.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)  $(BLSOBJS)  libbacsd.la drivers
 -	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(CLOUDCLIOBJS) $(DLIB) \
 +	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(CLOUDCLIOBJS) $(DLIB) \
            $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(S3_LIBS)
 bls.o:	bls.c
@@ -296,7 +296,7 @@
 bls:	Makefile $(BLSOBJS) libbacsd.la drivers  ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
 	@echo "Compiling $<"
 -	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BLSOBJS) $(DLIB) \
 +	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(BLSOBJS) $(DLIB) \
 	   $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 bextract.o: bextract.c
@@ -306,7 +306,7 @@
 bextract: Makefile $(BEXTOBJS) libbacsd.la drivers ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
 	@echo "Compiling $<"
 -	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) $(ZLIBS) $(LZO_LIBS) $(ZSTD_LIBS) \
 +	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) $(ZLIBS) $(LZO_LIBS) $(ZSTD_LIBS) \
 	   $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 bscan.o: bscan.c
@@ -316,7 +316,7 @@
 bscan:	Makefile $(SCNOBJS) libbacsd.la drivers ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \
 	../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE)
 -	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SCNOBJS) \
 +	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../cats -L../findlib -o $@ $(SCNOBJS) \
 	   $(SD_LIBS) -lbacsql -lbaccats $(DB_LIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 bcopy.o: bcopy.c
@@ -325,7 +325,7 @@
 	   -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
 bcopy:	Makefile $(COPYOBJS) libbacsd.la drivers ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
 -	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(COPYOBJS) \
 +	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(COPYOBJS) \
 	   $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 cloud_parts_test: Makefile cloud_parts.c
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@ -1 +1 @@
-DIST stress-ng-0.17.07.tar.gz 6260811 BLAKE2B f56dc22ca55a3b4e9c22f179653b4f832d164fd61968af146bedd3a9242509f7ede070d5cf9392ba494025682f6dfed33bd6034244c0731716977e2179514929 SHA512 5bd6dc8175d2d410447559c489e7bb1187fdce7657018ac48a2744be6e8998bc21e84b7bc536477b5db170ca9bd2aba0992127af90e3ff2312bd6130061dce6c
+DIST stress-ng-0.17.08.tar.gz 6274899 BLAKE2B ca5c00eebbefeb5be90756faa41f8130b577ca71b78253dc4ae431df1044366e79882e0e1c0850c0102e83356203400295fad977d141dddaf234423617cec965 SHA512 3df9bb507687839ad9978099bea33bc6923d324c6e6f66d441911670fcd8080e093fd02741ea8516626ae1ba357f42d2c50b6553cb75f48fd5f008e59d469777
--- a/app-benchmarks/stress-ng/stress-ng-0.17.08.ebuild
+++ b/app-benchmarks/stress-ng/stress-ng-0.17.08.ebuild
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
--- a/app-containers/devcontainer/Manifest
+++ b/app-containers/devcontainer/Manifest
@ -1,3 +1,3 @@
 DIST devcontainer-0.57.0.tgz 617323 BLAKE2B 74dd49c0e741715e34dce79cdc73617f4bed68b87f11fafa403a9548b334ecff1af8e2e3705c57c31ca057e12b19094a75a3a3e339cac3b6d005e00e7e08b433 SHA512 7b5680d003630af459d5bf12f6873ea990a67b5f16888317a27d7197799d9ff1cd802834e669c4e1c601780fa8a07c38ec4dab77e7bf64de08406403e163e954
 DIST devcontainer-0.58.0.tgz 618922 BLAKE2B e0962e273f6a28d4c6897523b565634d7849a37ed5866e47430080ac8e42026e888ba2a13cbcbb62dd6974f753383882b66b0129d1e7aad8321c938c58ffec58 SHA512 57beb86d4fcefddbaa4f13612cca0538b2449932164c062082a8ef62f3a7bd57ed6f7bb09e5954fe479c6da9caebc0b3075783fb3ba3391381ab7ce9027e5f08
 DIST devcontainer-0.59.1.tgz 619278 BLAKE2B 793ac8856814cb35ad668b496b12c8bf6e92277014ca2efd245cdebd5b032cbd574017bf758fcb92a675d7bbd07c966bb7c4344b8cb774ad11c02a4daac91eca SHA512 27bfd94b2a34815f90579ed136b6c032dc5f3b5172dfa5c124c151ef5b156038afdbc7b2bf189314c6f910bc7182117977b42712a172ca44af20c8ba481762cf
 DIST devcontainer-0.60.0.tgz 619324 BLAKE2B 8ef60c2a195b24e850ce923b79983a2514645587a2ef9739a05ce4440140595dad3d87896e6997455daf2afd3d09b8da77d9c304a3ce305b4ab6edb2ea41ab9a SHA512 f1edba9bbb8d635db492daa52d6b38063d426b7860bd9d56327ecf1b66a3777374ee1cc96cff080fe6af7e384e64e608516412c71eb1437c82938868f6389439
--- a/app-containers/devcontainer/devcontainer-0.60.0.ebuild
+++ b/app-containers/devcontainer/devcontainer-0.60.0.ebuild
@ -12,7 +12,7 @@ S="${WORKDIR}/package"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 RDEPEND="
 	net-libs/nodejs
--- a/app-containers/distrobox/Manifest
+++ b/app-containers/distrobox/Manifest
@ -1,2 +1,3 @@
 DIST distrobox-1.7.1.tar.gz 6885484 BLAKE2B c4b2710d7f1cff7baee2e340a79345359e9906e508e8b1bc351a7b8ee2d8d2e1cb13c381e40231f8c962542e37e32988d04a687810bdfd7ec917868944c51cf3 SHA512 a86a49b9f6158af3172369a201ce3852a349258c46ebb8dfb269f7b96dfbe2bf2fe9f80a5cf9b9236432d99f4f67fb3d95ab4663964fcdb0f888d48cbdd82c39
 DIST distrobox-1.7.2.0.tar.gz 6888905 BLAKE2B f74301464f3b590f246871be1a381771e0fccbd42a933b9d2a58874eb97e49ae73676f7267b56dc7facefdba6cac1fc3df52d55ef826c0d79c90bbe9e0955af7 SHA512 ae5c9ef7ee63beec6b99488091cdb5bc73dfb219988a71c624af2278ea2efc775895ae2106c6bc35783a317b5b3e92fceed2fdba5be05f94028d28a7a2fb8ce1
 DIST distrobox-1.7.2.1.tar.gz 6888919 BLAKE2B 1fd4e49585f686cf9f434c3285935bdda1131684b74dfcc20b018ab9853fb13516f3dbaf7c16b9ea55a0d038e3d9eb297bcea74c95755fbe60ef6512a9ce0df8 SHA512 aaf4324a9a31844dc08a6cc4e06d3b725675c92df01b558e733c96701d7e9700baabc1afad97ce5e2a8e2345defcea71c85f0ea6667249316f850aeca5aea149
--- a/app-containers/distrobox/distrobox-1.7.2.1.ebuild
+++ b/app-containers/distrobox/distrobox-1.7.2.1.ebuild
@ -0,0 +1,35 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
 DESCRIPTION="Use any Linux distribution inside your terminal (powered by docker/podman)"
 HOMEPAGE="https://distrobox.it/
 	https://github.com/89luca89/distrobox/"
 if [[ "${PV}" == *9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/89luca89/${PN}.git"
 else
 	SRC_URI="https://github.com/89luca89/${PN}/archive/${PV}.tar.gz
 		-> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 fi
 LICENSE="GPL-3"  # GPL-3.0-only !
 SLOT="0"
 RDEPEND="
 	|| (
 		app-containers/docker
 		app-containers/podman
 	)
 "
 src_install() {
 	sh ./install --prefix "${ED}/usr" || die "${PN} install script failed"
 	dodoc *.md
 }
--- a/app-containers/earthly/earthly-0.8.7.ebuild
+++ b/app-containers/earthly/earthly-0.8.7.ebuild
@ -23,7 +23,7 @@ SRC_URI="
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 RDEPEND="
 	|| (
--- a/app-containers/incus/Manifest
+++ b/app-containers/incus/Manifest
@ -1,2 +1,4 @@
 DIST incus-6.0.0.tar.xz 11839792 BLAKE2B 135574e6f19262992bb068a3c0a0045c192699503e417eb861e00a974e631fd869485eb96238d1dbe4712e789367d31afae1c62bade2a8b75f7e9a7620547e74 SHA512 eb6d784a535d487bd85b3e8272d7cddc23f2ed98ca2b3e2f19c038b4a6f910d4030822424154489adef7a688757905927309d25f6d1ff621d99d678fe6aeae2b
 DIST incus-6.0.0.tar.xz.asc 833 BLAKE2B f35c38f886290ff08e017cd54e8019c43bfbf1f9c84b26ede2cfa78acbe4047af4314465e77d6e900f296552d5ac8f8c07d26a11920bff937fbb8a0a910efb0d SHA512 0360520752fad3e95807d09e4fd6d60c96a202d0dbb61621925abd75aa801b6d573abbece3179a8906bdc47e96ddec4a746607ce2d10dcc1a76d0afd459cbf81
 DIST incus-6.1.tar.xz 11594436 BLAKE2B 086d5fbc56a7867a5be0ce7fd5c7292fc889611536f99ad8cdcd47168ebfe7c836952b80d6a4846feae7d3bc2be1f18fe1df2a4ef0ec7abbd4ab78d2d4e3cab0 SHA512 1e4b07801789742597fedb2059fc24153a451d2f680c04722b2c025bc2a2792314d0cb32478dd97c91350388009eb67e4d2de504634c2bda38fac2c660a2873e
 DIST incus-6.1.tar.xz.asc 833 BLAKE2B 6c223614a0fec661596b2a61a3c640b43bed5e861304dca6fab07b81595ba3ba4aab94a7087522db51983767d35c6a5945afe852a08d4d4693d15c7818b75658 SHA512 a4329a2425c094cf1e4f451682dd839a51cc072e0cee89932cc3e2fcbc3d6fddabc1fdf7d3f6f61c5ae95299a91c3dcf05f502b7a42135a9d2ed215932bfa51b
--- a/app-containers/incus/incus-6.1.ebuild
+++ b/app-containers/incus/incus-6.1.ebuild
@ -0,0 +1,219 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
 inherit go-module linux-info optfeature systemd toolchain-funcs verify-sig
 DESCRIPTION="Modern, secure and powerful system container and virtual machine manager"
 HOMEPAGE="https://linuxcontainers.org/incus/introduction/ https://github.com/lxc/incus"
 SRC_URI="https://linuxcontainers.org/downloads/incus/${P}.tar.xz
 	verify-sig? ( https://linuxcontainers.org/downloads/incus/${P}.tar.xz.asc )"
 LICENSE="Apache-2.0 BSD LGPL-3 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64"
 IUSE="apparmor fuidshift nls"
 DEPEND="acct-group/incus
 	acct-group/incus-admin
 	app-arch/xz-utils
 	>=app-containers/lxc-5.0.0:=[apparmor?,seccomp(+)]
 	dev-db/sqlite:3
 	>=dev-libs/cowsql-1.15.6
 	dev-libs/lzo
 	>=dev-libs/raft-0.22.1:=[lz4]
 	>=dev-util/xdelta-3.0[lzma(+)]
 	net-dns/dnsmasq[dhcp]
 	sys-libs/libcap
 	virtual/udev"
 RDEPEND="${DEPEND}
 	fuidshift? ( !app-containers/lxd )
 	net-firewall/ebtables
 	net-firewall/iptables
 	sys-apps/iproute2
 	sys-fs/fuse:*
 	>=sys-fs/lxcfs-5.0.0
 	sys-fs/squashfs-tools[lzma]
 	virtual/acl"
 BDEPEND=">=dev-lang/go-1.21
 	nls? ( sys-devel/gettext )
 	verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
 CONFIG_CHECK="
 	~CGROUPS
 	~IPC_NS
 	~NET_NS
 	~PID_NS
 	~SECCOMP
 	~USER_NS
 	~UTS_NS
 	~KVM
 	~MACVTAP
 	~VHOST_VSOCK
 "
 ERROR_IPC_NS="CONFIG_IPC_NS is required."
 ERROR_NET_NS="CONFIG_NET_NS is required."
 ERROR_PID_NS="CONFIG_PID_NS is required."
 ERROR_SECCOMP="CONFIG_SECCOMP is required."
 ERROR_UTS_NS="CONFIG_UTS_NS is required."
 WARNING_KVM="CONFIG_KVM and CONFIG_KVM_AMD/-INTEL is required for virtual machines."
 WARNING_MACVTAP="CONFIG_MACVTAP is required for virtual machines."
 WARNING_VHOST_VSOCK="CONFIG_VHOST_VSOCK is required for virtual machines."
 # Go magic.
 QA_PREBUILT="/usr/bin/incus
 	/usr/bin/lxc-to-incus
 	/usr/bin/incus-agent
 	/usr/bin/incus-benchmark
 	/usr/bin/incus-migrate
 	/usr/sbin/fuidshift
 	/usr/sbin/lxd-to-incus
 	/usr/sbin/incusd"
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/linuxcontainers.asc
 # The testsuite must be run as root.
 # make: *** [Makefile:156: check] Error 1
 RESTRICT="test"
 GOPATH="${S}/_dist"
 src_unpack() {
 	verify-sig_src_unpack
 	go-module_src_unpack
 }
 src_prepare() {
 	export GOPATH="${S}/_dist"
 	default
 	sed -i \
 		-e "s:\./configure:./configure --prefix=/usr --libdir=${EPREFIX}/usr/lib/incus:g" \
 		-e "s:make:make ${MAKEOPTS}:g" \
 		Makefile || die
 	# Fix hardcoded ovmf file path, see bug 763180
 	sed -i \
 		-e "s:/usr/share/OVMF:/usr/share/edk2-ovmf:g" \
 		-e "s:OVMF_VARS.ms.fd:OVMF_VARS.fd:g" \
 		doc/environment.md \
 		internal/server/apparmor/instance.go \
 		internal/server/apparmor/instance_qemu.go \
 		internal/server/instance/drivers/driver_qemu.go || die "Failed to fix hardcoded ovmf paths."
 	# Fix hardcoded virtfs-proxy-helper file path, see bug 798924
 	sed -i \
 		-e "s:/usr/lib/qemu/virtfs-proxy-helper:/usr/libexec/virtfs-proxy-helper:g" \
 		internal/server/device/device_utils_disk.go || die "Failed to fix virtfs-proxy-helper path."
 	cp "${FILESDIR}"/incus-0.4.service "${T}"/incus.service || die
 	if use apparmor; then
 		sed -i \
 			'/^EnvironmentFile=.*/a ExecStartPre=\/usr\/libexec\/lxc\/lxc-apparmor-load' \
 			"${T}"/incus.service || die
 	fi
 	# Disable -Werror's from go modules.
 	find "${S}" -name "cgo.go" -exec sed -i "s/ -Werror / /g" {} + || die
 }
 src_configure() { :; }
 src_compile() {
 	export GOPATH="${S}/_dist"
 	export CGO_LDFLAGS_ALLOW="-Wl,-z,now"
 	for k in incus-benchmark incus-simplestreams incus-user incus lxc-to-incus lxd-to-incus ; do
 		ego install -v -x "${S}/cmd/${k}"
 	done
 	if use fuidshift ; then
 		ego install -v -x "${S}/cmd/fuidshift"
 	fi
 	ego install -v -x -tags libsqlite3 "${S}"/cmd/incusd
 	# Needs to be built statically
 	CGO_ENABLED=0 go install -v -tags netgo "${S}"/cmd/incus-migrate
 	CGO_ENABLED=0 go install -v -tags agent,netgo "${S}"/cmd/incus-agent
 	use nls && emake build-mo
 }
 src_test() {
 	emake check
 }
 src_install() {
 	export GOPATH="${S}/_dist"
 	if tc-is-cross-compiler ; then
 		local bindir="_dist/bin/linux_${GOARCH}"
 	else
 		local bindir="_dist/bin"
 	fi
 	newsbin "${FILESDIR}"/incus-startup-0.4.sh incus-startup
 	# Admin tools
 	for l in incusd incus-user lxd-to-incus ; do
 		dosbin ${bindir}/${l}
 	done
 	# User tools
 	for m in incus-agent incus-benchmark incus-migrate incus-simplestreams incus lxc-to-incus ; do
 		dobin ${bindir}/${m}
 	done
 	# fuidshift, should be moved under admin tools at some point
 	if use fuidshift ; then
 		dosbin ${bindir}/fuidshift
 	fi
 	newconfd "${FILESDIR}"/incus-0.4.confd incus
 	newinitd "${FILESDIR}"/incus-0.4.initd incus
 	newinitd "${FILESDIR}"/incus-user-0.4.initd incus-user
 	systemd_dounit "${T}"/incus.service
 	systemd_newunit "${FILESDIR}"/incus-0.4.socket incus.socket
 	systemd_newunit "${FILESDIR}"/incus-startup-0.4.service incus-startup.service
 	systemd_newunit "${FILESDIR}"/incus-user-0.4.service incus-user.service
 	systemd_newunit "${FILESDIR}"/incus-user-0.4.socket incus-user.socket
 	if ! tc-is-cross-compiler; then
 		# Generate and install shell completion files.
 		mkdir -p "${D}"/usr/share/{bash-completion/completions/,fish/vendor_completions.d/,zsh/site-functions/} || die
 		"${bindir}"/incus completion bash > "${D}"/usr/share/bash-completion/completions/incus || die
 		"${bindir}"/incus completion fish > "${D}"/usr/share/fish/vendor_completions.d/incus.fish || die
 		"${bindir}"/incus completion zsh > "${D}"/usr/share/zsh/site-functions/_incus || die
 	else
 		ewarn "Shell completion files not installed! Install them manually with incus completion --help"
 	fi
 	dodoc AUTHORS
 	dodoc -r doc/*
 	use nls && domo po/*.mo
 }
 pkg_postinst() {
 	elog
 	elog "Please see"
 	elog "  https://wiki.gentoo.org/wiki/Incus"
 	elog "  https://wiki.gentoo.org/wiki/Incus#Migrating_from_LXD"
 	elog
 	optfeature "virtual machine support" app-cdr/cdrtools app-emulation/qemu[spice,usbredir,virtfs]
 	optfeature "btrfs storage backend" sys-fs/btrfs-progs
 	optfeature "ipv6 support" net-dns/dnsmasq[ipv6]
 	optfeature "full incus-migrate support" net-misc/rsync
 	optfeature "lvm2 storage backend" sys-fs/lvm2
 	optfeature "zfs storage backend" sys-fs/zfs
 	elog
 	elog "Be sure to add your local user to the incus group."
 	elog
 }
--- a/app-containers/lxc/lxc-6.0.0-r2.ebuild
+++ b/app-containers/lxc/lxc-6.0.0-r2.ebuild
@ -0,0 +1,172 @@
 # 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[static-libs] )
 	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[static-libs] )"
 DEPEND="${RDEPEND}
 	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-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/gcr/Manifest
+++ b/app-crypt/gcr/Manifest
@ -1,3 +1,2 @@
 DIST gcr-3.41.1.tar.xz 1030368 BLAKE2B 9d254b7f2ad864c45200e58b685db97c1ffbc83d29ba8cbda94d30ec565aa3dc5a2535305dc63b3264131b68ec9e48f37ac30d5ba08d0ce156f3b6091cd62dc1 SHA512 dd70d41636ede863d05824b26823a8f572902f7a9b6f09b0c70586ef0d4c046864e6956130b9231850a515a9fbfcd56faf20354c1cf8f697f005827c048a2325
 DIST gcr-4.1.0.tar.xz 722776 BLAKE2B 910cef50301a5988979f368501a8c62cf264b8af54c909309c335b06117e0504c39afd5f1c92613f13ce09db154ae5036af1ade50bd7f1482c48efd7abf02d22 SHA512 a91a5b0a7b62f7756dec2e7e19a59a4087a1423ccf24c5dd6d4a18de0a58fd91c5d5c131233360a3334c236b28ee94ec6889fcec1de85771a4b6a5daa5b9e203
 DIST gcr-4.2.1.tar.xz 719392 BLAKE2B a9134258f6daa59de4924f6bac01499d3bf87aae5e9d9ff5c69b2289ba0e82ef4c3f93a1ca7b1b007815e51e0c56f10a8abc616b31518dfa83581e8ffc5b3309 SHA512 fbb1664f6e276e35296aec46dab53ff308d031cae2f25b7d1ff5abdb56c5bd3764927d38b997d2ccbd260975f445d71619b2487327786c30b5f34d5e8865ff25
--- a/app-crypt/gcr/gcr-4.1.0.ebuild
+++ b/app-crypt/gcr/gcr-4.1.0.ebuild
@ -1,93 +0,0 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
 PYTHON_COMPAT=( python3_{9..11} )
 inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
 DESCRIPTION="Libraries for cryptographic UIs and accessing PKCS#11 modules"
 HOMEPAGE="https://gitlab.gnome.org/GNOME/gcr"
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="4/gcr-4.4-gck-2.2" # subslot = soname and soversion of libgcr and libgck
 IUSE="gtk gtk-doc +introspection systemd test +vala"
 REQUIRED_USE="
 	gtk-doc? ( introspection )
 	vala? ( introspection )
 "
 RESTRICT="!test? ( test )"
 KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 DEPEND="
 	>=dev-libs/glib-2.68.0:2
 	>=dev-libs/libgcrypt-1.2.2:0=
 	>=app-crypt/p11-kit-0.19.0
 	>=app-crypt/libsecret-0.20
 	systemd? ( sys-apps/systemd:= )
 	gtk? ( gui-libs/gtk:4[introspection?] )
 	>=sys-apps/dbus-1
 	introspection? ( >=dev-libs/gobject-introspection-1.58:= )
 	!<app-crypt/gcr-3.41.1-r1
 "
 RDEPEND="${DEPEND}"
 PDEPEND="app-crypt/gnupg"
 BDEPEND="
 	${PYTHON_DEPS}
 	gtk? ( dev-libs/libxml2:2 )
 	dev-util/gdbus-codegen
 	dev-util/glib-utils
 	gtk-doc? ( dev-util/gi-docgen )
 	>=sys-devel/gettext-0.19.8
 	test? ( app-crypt/gnupg )
 	virtual/pkgconfig
 	vala? ( $(vala_depend) )
 "
 pkg_setup() {
 	python-any-r1_pkg_setup
 }
 src_prepare() {
 	default
 	use vala && vala_setup
 	xdg_environment_reset
 }
 src_configure() {
 	local emesonargs=(
 		$(meson_use introspection)
 		$(meson_use gtk gtk4)
 		$(meson_use gtk-doc gtk_doc)
 		-Dgpg_path="${EPREFIX}"/usr/bin/gpg
 		-Dssh_agent=true
 		$(meson_feature systemd)
 		$(meson_use vala vapi)
 	)
 	meson_src_configure
 }
 src_test() {
 	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
 }
 src_install() {
 	meson_src_install
 	if use gtk-doc; then
 		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
 		mv "${ED}"/usr/share/doc/{gck-2,gcr-4} "${ED}"/usr/share/gtk-doc/html/ || die
 	fi
 }
 pkg_postinst() {
 	xdg_pkg_postinst
 	gnome2_schemas_update
 }
 pkg_postrm() {
 	xdg_pkg_postrm
 	gnome2_schemas_update
 }
--- a/app-crypt/tpm2-tools/tpm2-tools-5.6.1.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.6.1.ebuild
@ -13,7 +13,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/tpm2-tools-5.
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc64 x86"
 IUSE="+fapi test"
 RESTRICT="!test? ( test )"
--- a/app-crypt/tpm2-tss/Manifest
+++ b/app-crypt/tpm2-tss/Manifest
@ -1,3 +1,3 @@
 DIST tpm2-tss-4.0.1.tar.gz 1787139 BLAKE2B 627cdefeff6c64148f9da1425922a0a7a72debcee4930ffab208a3b9b66127c2d4f923e3e105bfd45410cdb13c19cb40cc15a720e9a05dd32ff622dabf5fcc32 SHA512 ed6ddc52cb0e8c1082a4bb001e1225eb9905fd2380da88db5fd69ff5b5d9d43a93eb67b634e49d53eb5d586832da3aef2c4c7e5f18d51bb730481f8913319d7d
 DIST tpm2-tss-4.0.2.tar.gz 1833499 BLAKE2B 91e70bcc66099fe5d7d53cf98a2c46582e96f204fc7bcb89c46497cc811ca1eb39c752be077a6e8132fc980a6581a2df075fcc6670d646d1270e642c144f043c SHA512 e92038de985ac928bf87a707b0f9b190aaa936827923ea5e3cbdda216cbc6cf8590af650c59c2e1e420ad9914dc6c1f14232ab7930ffc1a50fb0c49fdef6d3f0
-DIST tpm2-tss-4.1.0.tar.gz 1902337 BLAKE2B 72e2b13d9d65cdf8db136dd9ee75b0f53f8d8482391c27c0a52d6aa4945d05d54334f9667b96aef78f92c7e2d6e4eb655568182ef3a79477c52937b0ccfa605d SHA512 b8fa5d093b188dbb5df9888da9ea893a7eea2b88f4a93f1e349eaa1718a4d87f6cd91f029ff49afce163252ab98f859728360491d6d2019f8342afb78f0018eb
+DIST tpm2-tss-4.1.1.tar.gz 1901759 BLAKE2B 96e154e0778caf8ba8d7299c82ff1614c26254fe741290a588fa251a3013bdda26f720c148d400dc068851746e85719ae78068d64eef1067f3d45c540a303284 SHA512 a8fdc85e44c4a7960cdc21fd46154fbdb63992e072cc4356f472c962a751a826906604848b7b2608344494f85f72d591f4c0bdf42e3df7491446bdecbe22f2af
--- a/app-crypt/tpm2-tss/tpm2-tss-4.0.2.ebuild
+++ b/app-crypt/tpm2-tss/tpm2-tss-4.0.2.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar
 LICENSE="BSD-2"
 SLOT="0/4"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 IUSE="doc +fapi +openssl mbedtls +policy static-libs test"
 RESTRICT="!test? ( test )"
--- a/app-crypt/tpm2-tss/tpm2-tss-4.1.1.ebuild
+++ b/app-crypt/tpm2-tss/tpm2-tss-4.1.1.ebuild
--- a/app-dicts/Manifest.gz
+++ b/app-dicts/Manifest.gz
--- a/app-dicts/aspell-da/Manifest
+++ b/app-dicts/aspell-da/Manifest
@ -1 +1,2 @@
 DIST aspell-da-4.2.1.tar.gz 4244477 BLAKE2B 51c25e9dc3f033daf4884abb3db5681ba834835bd6ae417e9edf5200d4791fd911974dca4f3323b880efd7a2be1ee8259784e0a54d7e0bceb7249a6bb4a55736 SHA512 66a32be37615423cdd88c3ccbe81e26bc955068a5d74f1829f0d309ba93741d99f7ccbb335e0fe1a890aada984cc771eb25c00027554509c0f1fbf36fea5fb0b
 DIST aspell-da-4.3.tar.gz 4262160 BLAKE2B d7de57716c36b23e7de83152f46f3b13d9474007d05fb96171a9a2e70758afbe6ca96e0b2c6d2bacd5543e33698de5483f9dae3469017475a5e19a75975eaf86 SHA512 6cb391660f7c7dad85f0242feca284d07204dfbab348e4138e07932da8dd7446e8bccf8e3079bc40f69d73b3967da80ddd539e66eda037b8053056effd20b389
--- a/app-dicts/aspell-da/aspell-da-4.3.ebuild
+++ b/app-dicts/aspell-da/aspell-da-4.3.ebuild
@ -0,0 +1,15 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
 ASPELL_LANG="Danish"
 inherit aspell-dict-r1
 HOMEPAGE="https://github.com/mortenivar/aspell-da"
 SRC_URI="https://github.com/mortenivar/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${P}"
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos"
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/padre/padre-1.0.0-r3.ebuild
+++ b/app-editors/padre/padre-1.0.0-r3.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
@ -13,10 +13,9 @@ HOMEPAGE="https://padre.perlide.org/"
 SLOT="0"
 KEYWORDS="~amd64 ~riscv ~x86"
 IUSE=""
 # Test Deps
-TDEPEND="
+TESTDEPEND="
 	>=dev-perl/Test-MockObject-1.90.0
 	>=dev-perl/Test-Script-1.70.0
 	>=dev-perl/Test-Exception-0.270.0
@ -26,7 +25,7 @@ TDEPEND="
 "
 RDEPEND="
-	dev-lang/perl[ithreads]
+	|| ( >=dev-lang/perl-5.38.2-r3[perl_features_ithreads] <dev-lang/perl-5.38.2-r3[ithreads] )
 	>=dev-lang/perl-5.10.1
 	>=dev-perl/Algorithm-Diff-1.190.0
 	>=dev-perl/Capture-Tiny-0.60.0
@ -92,7 +91,7 @@ RDEPEND="
 "
 BDEPEND="${RDEPEND}
 	test? (
-		${TDEPEND}
+		${TESTDEPEND}
 	)
 "
--- a/app-editors/shed/shed-1.16.ebuild
+++ b/app-editors/shed/shed-1.16.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
 RDEPEND="sys-libs/ncurses:0="
 DEPEND="${RDEPEND}"
--- a/app-editors/wxhexeditor/metadata.xml
+++ b/app-editors/wxhexeditor/metadata.xml
@ -7,5 +7,6 @@
  </maintainer>
  <upstream>
    <remote-id type="sourceforge">wxhexeditor</remote-id>
    <remote-id type="github">EUA/wxHexEditor</remote-id>
  </upstream>
 </pkgmetadata>
--- a/app-editors/wxhexeditor/wxhexeditor-0.24-r2.ebuild
+++ b/app-editors/wxhexeditor/wxhexeditor-0.24-r2.ebuild
@ -1,11 +1,11 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
 MY_PN="wxHexEditor"
 WX_GTK_VER=3.0-gtk3
-inherit toolchain-funcs wxwidgets
+inherit flag-o-matic toolchain-funcs wxwidgets
 DESCRIPTION="A cross-platform hex editor designed specially for large files"
 HOMEPAGE="https://github.com/EUA/wxHexEditor"
@ -14,7 +14,6 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_PN}-v${PV}-src.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~riscv ~x86"
 IUSE=""
 DEPEND="
 	app-crypt/mhash
@ -40,4 +39,9 @@ pkg_setup() {
 src_prepare() {
 	setup-wxwidgets
 	default
 	# -Werror=odr, -Werror=lto-type-mismatch
 	# https://bugs.gentoo.org/854414
 	# https://github.com/EUA/wxHexEditor/issues/222
 	filter-lto
 }
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
--- a/app-emacs/auctex/Manifest
+++ b/app-emacs/auctex/Manifest
@ -1,2 +1 @@
 DIST auctex-13.2.tar.gz 1667548 BLAKE2B 51daf18185a01c7349a49cfb3484d0271dc30271c69a028dc70ec9dae998b0664ffa574160dd384c35e66d38da95af5af0c4bf73e5ea969a6166685f8e3a0b80 SHA512 98d3d0061a807e62045b648a699e23819a0288ea17f2247b18c6725c503dfd6c791384c47504376de098b5a4e62bf350227497be6bf7a007fd94df232a069129
 DIST auctex-13.3.tar.gz 1695608 BLAKE2B 3a22273b72237e14a31a1fb9d81e2c4ee10290919bc3d6f8cb35ab877ef26083c7edb5bbb7c88a40f45848012cc2edd375a90d872f604029ba8f03278bd95f9a SHA512 32d6f3c968a27dd5e7862993419bfa0f5e5228abca7478341a06fce153f333410cd230f8266e6b0e4fb5e4247864710e3f572b6a837c99c2879d38899590f678
--- a/app-emacs/auctex/auctex-13.2.ebuild
+++ b/app-emacs/auctex/auctex-13.2.ebuild
@ -1,60 +0,0 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
 inherit elisp
 DESCRIPTION="Extensible package for writing and formatting TeX files in Emacs"
 HOMEPAGE="https://www.gnu.org/software/auctex/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 LICENSE="GPL-3+ FDL-1.3+"
 SLOT="0"
 KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="preview-latex"
 RDEPEND="virtual/latex-base
 	preview-latex? (
 		app-text/dvipng
 		app-text/ghostscript-gpl
 	)"
 BDEPEND="${RDEPEND}"
 TEXMF="/usr/share/texmf-site"
 src_configure() {
 	econf \
 		--with-emacs \
 		--with-auto-dir="${EPREFIX}/var/lib/auctex" \
 		--with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
 		--with-packagelispdir="${EPREFIX}${SITELISP}/${PN}" \
 		--with-packagedatadir="${EPREFIX}${SITEETC}/${PN}" \
 		--with-texmf-dir="${EPREFIX}${TEXMF}" \
 		--disable-build-dir-test \
 		$(use_enable preview-latex preview)
 }
 src_compile() {
 	export VARTEXFONTS="${T}"/fonts
 	emake
 }
 src_install() {
 	emake -j1 DESTDIR="${D}" install
 	elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el"
 	if use preview-latex; then
 		elisp-site-file-install "${FILESDIR}/60${PN}-gentoo.el"
 	fi
 	dodoc ChangeLog* CHANGES FAQ INSTALL PROBLEMS.preview README RELEASE TODO
 }
 pkg_postinst() {
 	use preview-latex && texmf-update
 	elisp-site-regen
 }
 pkg_postrm() {
 	use preview-latex && texmf-update
 	elisp-site-regen
 }
--- a/app-emacs/bbdb/Manifest
+++ b/app-emacs/bbdb/Manifest
@ -1 +1,2 @@
 DIST bbdb-3.2.2b.tar.gz 199518 BLAKE2B d6eef625636689d204ed9c6c7f299380924da5b021118e70930ab3b928d547b9cbb5a1cec8d111ce52678fc44b30ee34d164f46a9c6afa98c829ba871382acef SHA512 f730b911d16484c3723f6983b94784a828173797f4732c8d8eb47d50186415e0fdfde62f4f5f5b5b6ac66b78580fcfb2a398840935400fddd5f8143831e35fe2
 DIST bbdb-3.2.2d_p20231122.tar.gz 201355 BLAKE2B 6f1abd80d580fa2bc9f5ce2a26179d54358ab156991e138e8028bec4c7e891e884f3aa938e895b3e7a5cdb7dae1548e5161c212e5b6073d8bf2c38ba76bc8029 SHA512 3d5d6a8411c14e8c8f8b60872e954c0d26e25bebb9c9148c354ea078e12a30b500ee1de026414359efca3b9fd502a0bad00c9df0549cb7c83c726d878187373d
--- a/app-emacs/bbdb/bbdb-3.2.2d_p20231122.ebuild
+++ b/app-emacs/bbdb/bbdb-3.2.2d_p20231122.ebuild
@ -0,0 +1,85 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
 inherit elisp autotools
 DESCRIPTION="The Insidious Big Brother Database"
 HOMEPAGE="https://savannah.nongnu.org/projects/bbdb/"
 if [[ "${PV}" == *9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.savannah.nongnu.org/cgit/${PN}.git"
 else
 	COMMIT="53e8ba04c47b3542db75b68f9663941daf2e6ca4"
 	SRC_URI="https://git.savannah.nongnu.org/cgit/bbdb.git/snapshot/${PN}-${COMMIT}.tar.gz
 		-> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-${COMMIT}"
 	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 LICENSE="GPL-3+ FDL-1.3"
 SLOT="0"
 IUSE="doc tex vm wanderlust"
 RESTRICT="test"                                                    # bug 631700
 RDEPEND="
 	vm? ( app-emacs/vm )
 	wanderlust? ( app-emacs/wanderlust )
 "
 BDEPEND="
 	${RDEPEND}
 	sys-apps/texinfo
 	doc? ( virtual/texi2dvi )
 "
 IDEPEND="
 	tex? ( virtual/latex-base )
 "
 SITEFILE="50${PN}-gentoo-3.2.el"
 TEXMF="/usr/share/texmf-site"
 src_prepare() {
 	default
 	eautoreconf
 }
 src_configure() {
 	local -a -r econfargs=(
 		--with-lispdir="${EPREFIX}${SITELISP}/${PN}"
 		"$(use_with vm vm-dir "${EPREFIX}${SITELISP}/vm")"
 		"$(use_with wanderlust wl-dir "${EPREFIX}${SITELISP}/wl")"
 	)
 	econf "${econfargs[@]}"
 }
 src_compile() {
 	emake -C lisp
 	emake -C doc info $(usev doc pdf)
 }
 src_install() {
 	emake -C lisp DESTDIR="${D}" install
 	emake -C doc DESTDIR="${D}" install-info $(usev doc install-pdf)
 	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	if use tex; then
 		insinto "${TEXMF}/tex/latex/${PN}"
 		doins tex/bbdb.sty
 	fi
 	dodoc AUTHORS ChangeLog NEWS README TODO
 }
 pkg_postinst() {
 	elisp-site-regen
 	use tex && texconfig rehash
 }
 pkg_postrm() {
 	elisp-site-regen
 	use tex && texconfig rehash
 }
--- a/app-emacs/buttercup/buttercup-1.35.ebuild
+++ b/app-emacs/buttercup/buttercup-1.35.ebuild
@ -17,7 +17,7 @@ else
 		-> ${P}.tar.gz"
 	S="${WORKDIR}/emacs-${P}"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm arm64 ppc ~ppc64 ~riscv sparc x86"
 fi
 LICENSE="GPL-3+"
--- a/app-emacs/eldev/Manifest
+++ b/app-emacs/eldev/Manifest
@ -1,3 +1,2 @@
-DIST eldev-1.8.2.tar.gz 298578 BLAKE2B 579c72d61e15863a81b8a060da0c78900785a2b58f6a4825d19eebb85467ff838f2777bab05dc4ff2b04367d3fe58e4e71cbce09c4bbcc1c0ad5700cc12edc6d SHA512 c5ae360311d4b23648ecfb86e40a23abd4575480b971d86579f61b2c5a2873a9db211fe044cc33a47cb31bc215890a1c0b73c54700a92fcd1eb299a22733f71a
+DIST eldev-1.10.tar.gz 306364 BLAKE2B 82d8ef2c8c4268aa77b81cdc4344c359a92f02657b2f9e02ff43b3d8e1ffb8ebee93a6cfb906b05473e9ba86b54eeb2e274e42113049220fc3f61c7e706492e5 SHA512 d46c2091c126251b381235df76f566f06034546302ee7425c5a28d55d7d4e212d326019983267f4474e6b3170547e24fb01c9a40425a2d35cf2615aa01ea9263
 DIST eldev-1.9.1.tar.gz 301188 BLAKE2B ce57bee48dda505113df269504fdcad1847e80b2df9e3f7916d7960ee7212a7cb44165b373f0e6c54c0d04f7990f46132afdf6d64ae1b93a9433353cf5058a81 SHA512 f059f49e920ea518b23cbd0a8d49d0e86c9fdb5d759bb42d44a620b95dd7eb007e1457de904c9a5149b9c76ef7737ba2942de4cf7a6be2becb2a6152e08bea26
 DIST eldev-1.9.tar.gz 300721 BLAKE2B dac07c0f7fba1a8637ca9c2e26ebef26fefa88bc6d709a313818233e8c00e2c53acdd2ba37baba2d8e07aa49634a590790faf58edcefafe910793125d7ab7aed SHA512 c3b64cf457ffc0aaa21c34c48379736c98a94773ffd830cd9d79e840638340201f08899f09363912985f54b248130946d4ce6175891fd298548e6538ca9ee142
--- a/app-emacs/eldev/eldev-1.10.ebuild
+++ b/app-emacs/eldev/eldev-1.10.ebuild
--- a/app-emacs/eldev/eldev-1.8.2.ebuild
+++ b/app-emacs/eldev/eldev-1.8.2.ebuild
@ -1,55 +0,0 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
 inherit elisp
 DESCRIPTION="Emacs Lisp Development Tool"
 HOMEPAGE="https://emacs-eldev.github.io/eldev/
 	https://github.com/doublep/eldev/"
 if [[ "${PV}" == *9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/doublep/${PN}.git"
 else
 	SRC_URI="https://github.com/doublep/${PN}/archive/${PV}.tar.gz
 		-> ${P}.tar.gz"
 	KEYWORDS="amd64 ~arm ~ppc64 ~riscv ~x86"
 fi
 LICENSE="GPL-3+"
 SLOT="0"
 ELISP_REMOVE="test/doctor.el"
 DOCS=( README.adoc )
 SITEFILE="50${PN}-gentoo.el"
 src_test() {
 	ELDEV_LOCAL="${S}" "./bin/${PN}" test
 }
 src_install() {
 	elisp_src_install
 	dobin "./bin/${PN}"
 	# NOTICE: If ELDEV_LOCAL is defined Eldev will use it
 	# to load up it's components,
 	# if it is not it will bootstrap itself from network
 	# always check if it uses installed Emacs Lisp files.
 	# Also, do not forget to run `env-update` & reopen your shell.
 	# https://github.com/doublep/eldev#influential-environment-variables
 	echo "ELDEV_LOCAL=${SITELISP}/${PN}" >> "${T}/99${PN}" || die
 	doenvd "${T}/99${PN}"
 }
 pkg_postinst() {
 	elisp_pkg_postinst
 	ewarn "Remember to run \`env-update && source /etc/profile\` if you plan"
 	ewarn "to use Eldev in a shell before logging out (or restarting"
 	ewarn "your login manager)."
 }
--- a/app-emacs/emacs-common/emacs-common-1.10.ebuild
+++ b/app-emacs/emacs-common/emacs-common-1.10.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="games gsettings gui"
 DEPEND="games? ( acct-group/gamestat )"
--- a/app-emacs/jinx/jinx-1.5.ebuild
+++ b/app-emacs/jinx/jinx-1.5.ebuild
@ -15,7 +15,7 @@ SRC_URI="
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 RDEPEND="
 	app-text/enchant:2
--- a/app-emacs/org-mode/Manifest
+++ b/app-emacs/org-mode/Manifest
@ -1,3 +1,4 @@
 DIST org-mode-release_9.6.23.tar.gz 2212912 BLAKE2B 50f387e72650561c0d76068d4c98c406560f3523e9680b4eebc8a2baa0c445a64eeb3934062f721325afe02ab0ec46d7cdff7bdf2f4f19740c130beee496d26f SHA512 60e9abdaa195a21707dbcb44cf0a30f330307455ecf63ea67db09e19efc171bb670dc31c70baca191c2a35890004871f6513fbeeff890bb18cf92b251dae8ec1
 DIST org-mode-release_9.6.24.tar.gz 2212983 BLAKE2B 3b780973b68853738b6d74162c100eff4ddb7777c13e9c2a927edbeabebf7763c6a32abc43f7e38fae986a9cbc20926d4b40b54131f0e4acd1fc16f5d62b4b5c SHA512 85696fb49a9764d8163316ae03db02a3324ac828fd11cfda509aaef4ff3af6c7c4aaad0857d225216bc7dd672cf89817b007b63ea78092804abf93475e56e171
 DIST org-mode-release_9.6.26.tar.gz 2213217 BLAKE2B a4972b4c9647fc816506cc8aebab8d21e0ef461dbf8a0dcaed789c6451ee54464eaa99f59581bc39256b68c8d66c133c60c3c523ac4a31725e7002ccdc6e51b5 SHA512 3b612b3af272c0633d8e11ed210c16218250c3f5b6be7f800659a767ebfc77ebb01bdaf649045ac9ab7edf1bb8a9c7386a8c04eaafe12d943bf48989670ca20d
 DIST org-mode-release_9.6.28.tar.gz 2213979 BLAKE2B a0dec5afe4c234d895e459abb1d30e4b7dc8b0c7ff918b8444adb7324bf77975acafe2ab1dcc7ea1ef3340471cf0508896609ca5ce4f8384777b72ce0fb0bcb8 SHA512 7e4944277ff52d3740d341e059eab00316f0baf3bf6e0f9c1b3c35577530feb0a516f1b081902e0e45b0138d1903d0bb7d96342a3fb5524bb6a066713a6c044b
--- a/app-emacs/org-mode/org-mode-9.6.24.ebuild
+++ b/app-emacs/org-mode/org-mode-9.6.24.ebuild
@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="GPL-3+ FDL-1.3+ CC-BY-SA-3.0 odt-schema? ( OASIS-Open )"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="doc odt-schema"
 RESTRICT="test"
--- a/app-emacs/org-mode/org-mode-9.6.28.ebuild
+++ b/app-emacs/org-mode/org-mode-9.6.28.ebuild
@ -0,0 +1,50 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
 inherit elisp readme.gentoo-r1
 DESCRIPTION="An Emacs mode for notes and project planning"
 HOMEPAGE="https://www.orgmode.org/"
 MY_P="${PN}-release_${PV}"
 SRC_URI="https://git.savannah.gnu.org/cgit/emacs/${PN}.git/snapshot/${MY_P}.tar.gz"
 S="${WORKDIR}"/${MY_P}
 LICENSE="GPL-3+ FDL-1.3+ CC-BY-SA-3.0 odt-schema? ( OASIS-Open )"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc odt-schema"
 RESTRICT="test"
 BDEPEND="doc? ( virtual/texi2dvi )"
 SITEFILE="50${PN}-gentoo.el"
 src_compile() {
 	emake -j1 \
 		ORGVERSION=${PV} \
 		datadir="${EPREFIX}${SITEETC}/${PN}"
 	use doc && emake -j1 pdf card
 }
 src_install() {
 	emake \
 		ORGVERSION=${PV} \
 		DESTDIR="${D}" \
 		ETCDIRS="styles csl $(use odt-schema && echo schema)" \
 		lispdir="${EPREFIX}${SITELISP}/${PN}" \
 		datadir="${EPREFIX}${SITEETC}/${PN}" \
 		infodir="${EPREFIX}/usr/share/info" \
 		install
 	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	dodoc README.org CONTRIBUTE.org etc/ORG-NEWS
 	use doc && dodoc doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf
 	local DOC_CONTENTS="Org mode has a large variety of run-time dependencies,
 		so you may have to install one or more additional packages.
 		A non-exhaustive list of these dependencies may be found at
 		<http://orgmode.org/worg/org-dependencies.html>."
 	readme.gentoo_create_doc
 }
--- a/app-emacs/yatex/Manifest
+++ b/app-emacs/yatex/Manifest
@ -1 +1,2 @@
 DIST yatex1.82.tar.gz 387358 BLAKE2B 77c88563e3beb7b29ac8a4d7204d14b966c9a88b1c2f04c6160089f0b61a70c9d6aa135d2e1cee6e13a90cc108428ce80e7ef0d0b8852b9a8651e67f34af7e1e SHA512 8c2890fc12e93aace5ac51e24da315a9d241aec023a3c67187c1fd28d2a7a02d1688b7e1177e1ba13411ecb394b5d581298c735cd80195e663bbdcf240f10fe5
 DIST yatex1.83.tar.gz 389259 BLAKE2B 40a5475c1b46e93531eeac3b7ed3e90f7a68c0faad91cc9c74b38af0e36a83578032615a2dfdcd7a6ede2b9eda36e128581c162a84b913362612cd07df9f1d81 SHA512 7e12532a5af8139b99457ff1137b19e5d1272f6bc13e3baea62d57e6ec036154ae733696ae8b6c1c1b8a6949aaa0425a34a8485ce61cbe0df72ceee1489eaedf
--- a/app-emacs/yatex/yatex-1.83.ebuild
+++ b/app-emacs/yatex/yatex-1.83.ebuild
@ -0,0 +1,61 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
 inherit elisp
 DESCRIPTION="Yet Another TeX mode for Emacs"
 HOMEPAGE="http://www.yatex.org/"
 SRC_URI="http://www.${PN}.org/${P/-}.tar.gz"
 S="${WORKDIR}/${P/-}"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="l10n_ja"
 BDEPEND="
 	l10n_ja? ( virtual/libiconv )
 "
 PATCHES=(
 	"${FILESDIR}/${PN}-1.76-direntry.patch"
 	"${FILESDIR}/${PN}-1.80-texinfo-5.patch"
 	"${FILESDIR}/${PN}-1.82-texinfo.patch"
 )
 SITEFILE="50${PN}-gentoo.el"
 src_prepare() {
 	sed -i "/(help-dir/,/)))/c\      (help-dir \"${SITEETC}/${PN}\"))" "${PN}hlp.el"
 	elisp_src_prepare
 }
 src_compile() {
 	cd docs
 	makeinfo {${PN},yahtml}e.tex || die
 	if use l10n_ja; then
 		iconv -f WINDOWS-31J -t UTF-8 "${PN}j.tex" > "${PN}-ja.texi" || die
 		iconv -f WINDOWS-31J -t UTF-8 yahtmlj.tex  > yahtml-ja.texi  || die
 		makeinfo {${PN},yahtml}-ja.texi || die
 	fi
 }
 src_install() {
 	elisp-install "${PN}" ./*.el
 	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	insinto "${SITEETC}/${PN}"
 	doins help/YATEXHLP.eng
 	doinfo docs/{${PN},yahtml}.info*
 	dodoc install docs/*.eng
 	if use l10n_ja; then
 		doins help/YATEXHLP.jp
 		doinfo docs/{${PN},yahtml}-ja.info*
 		dodoc 00readme "${PN}.new" docs/{htmlqa,qanda,*.doc}
 	fi
 }
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/dxvk/Manifest
+++ b/app-emulation/dxvk/Manifest
@ -1,12 +1,5 @@
 DIST dxvk-1.10.3.tar.gz 1204407 BLAKE2B 3507ffe4abf9c45f2a138b05e7cf706322a6bf3d2e9ae86a9d6216b206c09f79eac696ee7dfe33d0bef55e727f51301c36eb89bfa3b3f429d7d5fafc1eebdcb4 SHA512 8995b231b3f3650beda04c01f30186d10a373075a4774b4ecbfb3bbeb4de99c57555f1db0611e5c61c6a411a7215e0faf228f9861f6b7adae6fc365e8056f7e3
 DIST dxvk-2.2.tar.gz 976671 BLAKE2B 537fb8d8adb69562f8e759c6f68e5ed38a62e6ebcf05d7ed1ea32fef518af30cd53d3ffec0e3dba175d449d80de980585f91bfcf8c3904a08385b17b55b9b63b SHA512 02d066093855c3ecae7123fcaeaa32212e03fcda9556c5b70ff23eadc07240199003b8e4673f5b492487fa6e240d70a36f5b4e60b0f389f422cf4474b7197e2f
 DIST dxvk-2.3.1.tar.gz 1005669 BLAKE2B d78448fcde9d600f7206dfa606fca4069e7563bb8b181fbc172691d6c45586904ae529550926a03612ed3cc1f2a2dff00990638125c1d7ce6179d3cd3ba8df04 SHA512 085567ac263872eb93d776ce7cf982690603e240a977dbb51ad69344af387fd745536ca62819afd4a809732a6f2d22b36c3df9538decf37dec527973d41e392f
 DIST dxvk-2.3.tar.gz 996736 BLAKE2B 55944472726e1d946b84cec386267bb65511c83a18647076b5d76c78d552ad2e4710a125c3e1a9f1c0c65b8de43a122c61aec5873ec0d566a20a1f4a9088f461 SHA512 d60421f6b93e09fb18d7f92f636bb228ec5d9ab6a90ca73e1e3c240c50ad35a90ac25fce1ac3f0a940c4da8e92e1c4267a2c602eaa78ff64db12507cc4d08173
 DIST dxvk-libdisplay-info-275e6459c7.tar.bz2 81172 BLAKE2B 7a1e9e2feeb95e06e9d3f49ad9d14a8a152cca525085e819cda0b69c238fb79dddd6d547cd0f0a4b51dfc1ec74ac4c006345b9fc48563807bc8ab3bab58ea5ff SHA512 794e94e8c16d65901a7b705d1ba3361817b4e9e19e520b1004bcab232d0347f5713594d67f3c2b79d4f86b3012e710c648975547d27a63de043fcbe9e6b7e66d
 DIST dxvk-libdisplay-info-d39344f466.tar.bz2 81232 BLAKE2B af76ccd3c40bc953008bc30d222c72f90bdc77f47f767b6e7423efaa0ec89d746396a755160b5470e219a15a0aa392be6066aab12921b45a1adb35d88132cd97 SHA512 79b4bf325cefc39bc587233bd82ff64c927ca5f829b8172d213c3d47af725c8dc7fe33576a8e96a869075ee2a8f00d165f3aa9e6c472e862a47e5c800b2b3315
 DIST dxvk-spirv-headers-0bcc624926.tar.gz 437771 BLAKE2B 08815e36ad99b84777e38ad0c5616b6608a552f993e7f67433f2b8e20de81e9bce41420ac5998f5b67bca70a92ce70aed91b238990bd431c7b97070dfb0c5a60 SHA512 5995cf75d5605d41e9643bca81c195ef5aaa17d596e0282807f6fa8f8c494f7b63a41d611c535ae43dc3d609436aabef1e0d89626f37e6f20bad17b5e122e32c
 DIST dxvk-vulkan-headers-85c2334e92.tar.gz 2046570 BLAKE2B 8e7f917d440793d85afae9227514fd97ae6cab6ece53abc54320808c10ddbc84a5421663f6b7549c98fbe8b8144a3c5b8bea73d39e6c99a289c5b0baadf3abd8 SHA512 eb7bcec11fb4e7302411c30501e72d567f481a14098ece9c54c023fe4644298f1c14268ef240cfe73ddb75f9817946513cc2218e34b706ea0be5e94ecbed0f91
 DIST dxvk-vulkan-headers-98f440ce68.tar.gz 1691979 BLAKE2B bf6fd288f16df7adcb5cebeb6e13713db1c26a0b833dead2fb522227861abc60b2d0cda8e3f46f8e89cccb629e01081ba27763989ad6fd336c60a475b198c1c8 SHA512 69238d37d0af0162e0fd68094cd2fa9baa320497d34a9de491dea086c23291d0815b51e89218b1f0ee2b3314cbc8ac1809d6edb15ca51fcb282fe1e2b39a1a77
 DIST libdisplay-info-275e6459c7ab1ddd4b125f28d0440716e4888078.tar.bz2 81172 BLAKE2B 7a1e9e2feeb95e06e9d3f49ad9d14a8a152cca525085e819cda0b69c238fb79dddd6d547cd0f0a4b51dfc1ec74ac4c006345b9fc48563807bc8ab3bab58ea5ff SHA512 794e94e8c16d65901a7b705d1ba3361817b4e9e19e520b1004bcab232d0347f5713594d67f3c2b79d4f86b3012e710c648975547d27a63de043fcbe9e6b7e66d
 DIST setup_dxvk.sh 4631 BLAKE2B 25270e1f6dfd446b1d124eac3bd19da8bc770527d02d987949fc3ae0bead07866dafa25f77a90b9a408413a724354a29a4a156ff5c9dc75e26b66e079824ec86 SHA512 257fd84e29a7037f04a1a2a506502c71d527af58f8c84d8c3dfb64597ebdc41c3dca362eaf20ab4bc1982b76428c1f843815d56a6e1369d072e0009e270cb121
 DIST spirv-headers-8b246ff75c6615ba4532fe4fde20f1be090c3764.tar.gz 472513 BLAKE2B f1ad7e11c306c62509655eb41d74efc5fb88688780d006c6944844e964b339baa000f70e115c4df2947e882c9ac33186e301b31138c38fe5f997f7af7260f521 SHA512 fe1d9d70b217b194c92dd397bca386ce8452bc5ec3967d64a257b3a531386fe6a6ecb5e9ed8ab5bc5a2707c5378f02f05809d6d197dcfb3f87cd33304c3b1959
--- a/app-emulation/dxvk/dxvk-2.2-r1.ebuild
+++ b/app-emulation/dxvk/dxvk-2.2-r1.ebuild
@ -1,186 +0,0 @@
 # Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
 PYTHON_COMPAT=( python3_{10..12} )
 MULTILIB_ABIS="amd64 x86" # allow usage on /no-multilib/
 MULTILIB_COMPAT=( abi_x86_{32,64} )
 inherit flag-o-matic meson-multilib python-any-r1
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/doitsujin/dxvk.git"
 	EGIT_SUBMODULES=(
 		# picky about headers and is cross-compiled making -I/usr/include troublesome
 		include/{spirv,vulkan}
 		subprojects/libdisplay-info
 	)
 else
 	HASH_SPIRV=0bcc624926a25a2a273d07877fd25a6ff5ba1cfb
 	HASH_VULKAN=98f440ce6868c94f5ec6e198cc1adda4760e8849
 	HASH_DISPLAYINFO=d39344f466caae0495ebac4d49b03a886d83ba3a
 	SRC_URI="
 		https://github.com/doitsujin/dxvk/archive/refs/tags/v${PV}.tar.gz
 			-> ${P}.tar.gz
 		https://github.com/KhronosGroup/SPIRV-Headers/archive/${HASH_SPIRV}.tar.gz
 			-> ${PN}-spirv-headers-${HASH_SPIRV::10}.tar.gz
 		https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz
 			-> ${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz
 		https://gitlab.freedesktop.org/JoshuaAshton/libdisplay-info/-/archive/${HASH_DISPLAYINFO}/${PN}-libdisplay-info-${HASH_DISPLAYINFO::10}.tar.bz2"
 	KEYWORDS="-* amd64 x86"
 fi
 DESCRIPTION="Vulkan-based implementation of D3D9, D3D10 and D3D11 for Linux / Wine"
 HOMEPAGE="https://github.com/doitsujin/dxvk/"
 # setup_dxvk.sh is no longer provided, fetch old until a better solution
 SRC_URI+=" https://raw.githubusercontent.com/doitsujin/dxvk/cd21cd7fa3b0df3e0819e21ca700b7627a838d69/setup_dxvk.sh"
 LICENSE="ZLIB Apache-2.0 MIT"
 SLOT="0"
 IUSE="+abi_x86_32 crossdev-mingw +d3d9 +d3d10 +d3d11 debug +dxgi"
 REQUIRED_USE="
 	|| ( d3d9 d3d10 d3d11 dxgi )
 	d3d10? ( d3d11 )
 	d3d11? ( dxgi )"
 BDEPEND="
 	${PYTHON_DEPS}
 	dev-util/glslang
 	!crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.10.3-wow64-setup.patch
 )
 pkg_pretend() {
 	[[ ${MERGE_TYPE} == binary ]] && return
 	if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
 		local tool=-w64-mingw32-g++
 		for tool in $(usev abi_x86_64 x86_64${tool}) $(usev abi_x86_32 i686${tool}); do
 			if ! type -P ${tool} >/dev/null; then
 				eerror "With USE=crossdev-mingw, it is necessary to setup the mingw toolchain."
 				eerror "For instructions, please see: https://wiki.gentoo.org/wiki/Mingw"
 				use abi_x86_32 && use abi_x86_64 &&
 					eerror "Also, with USE=abi_x86_32, will need both i686 and x86_64 toolchains."
 				die "USE=crossdev-mingw is set but ${tool} was not found"
 			elif [[ ! $(LC_ALL=C ${tool} -v 2>&1) =~ "Thread model: posix" ]]; then
 				eerror "${PN} requires GCC to be built with --enable-threads=posix"
 				eerror "Please see: https://wiki.gentoo.org/wiki/Mingw#POSIX_threads_for_Windows"
 				die "USE=crossdev-mingw is set but ${tool} does not use POSIX threads"
 			fi
 		done
 	fi
 }
 src_prepare() {
 	if [[ ${PV} != 9999 ]]; then
 		rmdir include/{spirv,vulkan} subprojects/libdisplay-info || die
 		mv ../SPIRV-Headers-${HASH_SPIRV} include/spirv || die
 		mv ../Vulkan-Headers-${HASH_VULKAN} include/vulkan || die
 		mv ../libdisplay-info-${HASH_DISPLAYINFO} subprojects/libdisplay-info || die
 	fi
 	cp -- "${DISTDIR}"/setup_dxvk.sh . || die
 	default
 	sed -i "/^basedir=/s|=.*|=${EPREFIX}/usr/lib/${PN}|" setup_dxvk.sh || die
 }
 src_configure() {
 	use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
 	# random segfaults been reported with LTO in some games, filter as
 	# a safety (note that optimizing this further won't really help
 	# performance, GPU does the actual work)
 	filter-lto
 	# -mavx with mingw-gcc has a history of obscure issues and
 	# disabling is seen as safer, e.g. `WINEARCH=win32 winecfg`
 	# crashes with -march=skylake >=wine-8.10, similar issues with
 	# znver4: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
 	append-flags -mno-avx
 	if [[ ${CHOST} != *-mingw* ]]; then
 		if [[ ! -v MINGW_BYPASS ]]; then
 			unset AR CC CXX RC STRIP
 			filter-flags '-fuse-ld=*'
 			filter-flags '-mfunction-return=thunk*' #878849
 			# some bashrc-mv users tend to do CFLAGS="${LDFLAGS}" and then
 			# strip-unsupported-flags miss these during compile-only tests
 			# (primarily done for 23.0 profiles' -z, not full coverage)
 			filter-flags '-Wl,-z,*' #928038
 		fi
 		CHOST_amd64=x86_64-w64-mingw32
 		CHOST_x86=i686-w64-mingw32
 		CHOST=$(usex x86 ${CHOST_x86} ${CHOST_amd64})
 		strip-unsupported-flags
 	fi
 	multilib-minimal_src_configure
 }
 multilib_src_configure() {
 	# multilib's ${CHOST_amd64}-gcc -m32 is unusable with crossdev,
 	# unset again so meson eclass will set ${CHOST}-gcc + others
 	use crossdev-mingw && [[ ! -v MINGW_BYPASS ]] && unset AR CC CXX RC STRIP
 	local emesonargs=(
 		--prefix="${EPREFIX}"/usr/lib/${PN}
 		--{bin,lib}dir=x${MULTILIB_ABI_FLAG: -2}
 		$(meson_use {,enable_}d3d9)
 		$(meson_use {,enable_}d3d10)
 		$(meson_use {,enable_}d3d11)
 		$(meson_use {,enable_}dxgi)
 		$(usev !debug --strip) # portage won't strip .dll, so allow it here
 	)
 	meson_src_configure
 }
 multilib_src_install_all() {
 	dobin setup_dxvk.sh
 	dodoc README.md dxvk.conf
 	find "${ED}" -type f -name '*.a' -delete || die
 }
 pkg_preinst() {
 	[[ -e ${EROOT}/usr/$(get_libdir)/dxvk/d3d11.dll ]] && DXVK_HAD_OVERLAY=
 }
 pkg_postinst() {
 	if [[ ! ${REPLACING_VERSIONS} ]]; then
 		elog "To enable ${PN} on a wine prefix, you can run the following command:"
 		elog
 		elog "	WINEPREFIX=/path/to/prefix setup_dxvk.sh install --symlink"
 		elog
 		elog "See ${EROOT}/usr/share/doc/${PF}/README.md* for details."
 		elog "Note: setup_dxvk.sh is unofficially temporarily provided as it was"
 		elog "removed upstream, handling may change in the future."
 	elif [[ -v DXVK_HAD_OVERLAY ]]; then
 		# temporary warning until this version is more widely used
 		elog "Gentoo's main repo ebuild for ${PN} uses different paths than most overlays."
 		elog "If you were using symbolic links in wine prefixes it may be necessary to"
 		elog "refresh them by re-running the command:"
 		elog
 		elog "	WINEPREFIX=/path/to/prefix setup_dxvk.sh install --symlink"
 		elog
 		elog "Also, if you were using /etc/${PN}.conf, ${PN} is no longer patched to load"
 		elog "it. See ${EROOT}/usr/share/doc/${PF}/README.md* for handling configs."
 	fi
 	if [[ ! ${REPLACING_VERSIONS##* } ]] ||
 		ver_test ${REPLACING_VERSIONS##* } -lt 2.0
 	then
 		elog
 		elog ">=${PN}-2.0 requires drivers and Wine to support vulkan-1.3, meaning:"
 		elog ">=wine-*-7.1 (or >=wine-proton-7.0), and >=mesa-22.0 (or >=nvidia-drivers-510)"
 		elog "For details, see: https://github.com/doitsujin/dxvk/wiki/Driver-support"
 	fi
 }
--- a/app-emulation/dxvk/dxvk-2.3.1-r1.ebuild
+++ b/app-emulation/dxvk/dxvk-2.3.1-r1.ebuild
@ -55,6 +55,7 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.10.3-wow64-setup.patch
 	"${FILESDIR}"/${PN}-2.3.1-gcc14.patch
 )
 pkg_pretend() {
--- a/app-emulation/dxvk/dxvk-2.3.ebuild
+++ b/app-emulation/dxvk/dxvk-2.3.ebuild
@ -1,186 +0,0 @@
 # Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
 PYTHON_COMPAT=( python3_{10..12} )
 MULTILIB_ABIS="amd64 x86" # allow usage on /no-multilib/
 MULTILIB_COMPAT=( abi_x86_{32,64} )
 inherit flag-o-matic meson-multilib python-any-r1
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/doitsujin/dxvk.git"
 	EGIT_SUBMODULES=(
 		# picky about headers and is cross-compiled making -I/usr/include troublesome
 		include/{spirv,vulkan}
 		subprojects/libdisplay-info
 	)
 else
 	HASH_SPIRV=0bcc624926a25a2a273d07877fd25a6ff5ba1cfb
 	HASH_VULKAN=85c2334e92e215cce34e8e0ed8b2dce4700f4a50
 	HASH_DISPLAYINFO=275e6459c7ab1ddd4b125f28d0440716e4888078
 	SRC_URI="
 		https://github.com/doitsujin/dxvk/archive/refs/tags/v${PV}.tar.gz
 			-> ${P}.tar.gz
 		https://github.com/KhronosGroup/SPIRV-Headers/archive/${HASH_SPIRV}.tar.gz
 			-> ${PN}-spirv-headers-${HASH_SPIRV::10}.tar.gz
 		https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz
 			-> ${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz
 		https://gitlab.freedesktop.org/JoshuaAshton/libdisplay-info/-/archive/${HASH_DISPLAYINFO}/${PN}-libdisplay-info-${HASH_DISPLAYINFO::10}.tar.bz2"
 	KEYWORDS="-* amd64 x86"
 fi
 DESCRIPTION="Vulkan-based implementation of D3D9, D3D10 and D3D11 for Linux / Wine"
 HOMEPAGE="https://github.com/doitsujin/dxvk/"
 # setup_dxvk.sh is no longer provided, fetch old until a better solution
 SRC_URI+=" https://raw.githubusercontent.com/doitsujin/dxvk/cd21cd7fa3b0df3e0819e21ca700b7627a838d69/setup_dxvk.sh"
 LICENSE="ZLIB Apache-2.0 MIT"
 SLOT="0"
 IUSE="+abi_x86_32 crossdev-mingw +d3d9 +d3d10 +d3d11 +dxgi +strip"
 REQUIRED_USE="
 	|| ( d3d9 d3d10 d3d11 dxgi )
 	d3d10? ( d3d11 )
 	d3d11? ( dxgi )"
 BDEPEND="
 	${PYTHON_DEPS}
 	dev-util/glslang
 	!crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.10.3-wow64-setup.patch
 )
 pkg_pretend() {
 	[[ ${MERGE_TYPE} == binary ]] && return
 	if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
 		local tool=-w64-mingw32-g++
 		for tool in $(usev abi_x86_64 x86_64${tool}) $(usev abi_x86_32 i686${tool}); do
 			if ! type -P ${tool} >/dev/null; then
 				eerror "With USE=crossdev-mingw, it is necessary to setup the mingw toolchain."
 				eerror "For instructions, please see: https://wiki.gentoo.org/wiki/Mingw"
 				use abi_x86_32 && use abi_x86_64 &&
 					eerror "Also, with USE=abi_x86_32, will need both i686 and x86_64 toolchains."
 				die "USE=crossdev-mingw is set but ${tool} was not found"
 			elif [[ ! $(LC_ALL=C ${tool} -v 2>&1) =~ "Thread model: posix" ]]; then
 				eerror "${PN} requires GCC to be built with --enable-threads=posix"
 				eerror "Please see: https://wiki.gentoo.org/wiki/Mingw#POSIX_threads_for_Windows"
 				die "USE=crossdev-mingw is set but ${tool} does not use POSIX threads"
 			fi
 		done
 	fi
 }
 src_prepare() {
 	if [[ ${PV} != 9999 ]]; then
 		rmdir include/{spirv,vulkan} subprojects/libdisplay-info || die
 		mv ../SPIRV-Headers-${HASH_SPIRV} include/spirv || die
 		mv ../Vulkan-Headers-${HASH_VULKAN} include/vulkan || die
 		mv ../libdisplay-info-${HASH_DISPLAYINFO} subprojects/libdisplay-info || die
 	fi
 	cp -- "${DISTDIR}"/setup_dxvk.sh . || die
 	default
 	sed -i "/^basedir=/s|=.*|=${EPREFIX}/usr/lib/${PN}|" setup_dxvk.sh || die
 }
 src_configure() {
 	use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
 	# random segfaults been reported with LTO in some games, filter as
 	# a safety (note that optimizing this further won't really help
 	# performance, GPU does the actual work)
 	filter-lto
 	# -mavx with mingw-gcc has a history of obscure issues and
 	# disabling is seen as safer, e.g. `WINEARCH=win32 winecfg`
 	# crashes with -march=skylake >=wine-8.10, similar issues with
 	# znver4: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
 	append-flags -mno-avx
 	if [[ ${CHOST} != *-mingw* ]]; then
 		if [[ ! -v MINGW_BYPASS ]]; then
 			unset AR CC CXX RC STRIP
 			filter-flags '-fuse-ld=*'
 			filter-flags '-mfunction-return=thunk*' #878849
 			# some bashrc-mv users tend to do CFLAGS="${LDFLAGS}" and then
 			# strip-unsupported-flags miss these during compile-only tests
 			# (primarily done for 23.0 profiles' -z, not full coverage)
 			filter-flags '-Wl,-z,*' #928038
 		fi
 		CHOST_amd64=x86_64-w64-mingw32
 		CHOST_x86=i686-w64-mingw32
 		CHOST=$(usex x86 ${CHOST_x86} ${CHOST_amd64})
 		strip-unsupported-flags
 	fi
 	multilib-minimal_src_configure
 }
 multilib_src_configure() {
 	# multilib's ${CHOST_amd64}-gcc -m32 is unusable with crossdev,
 	# unset again so meson eclass will set ${CHOST}-gcc + others
 	use crossdev-mingw && [[ ! -v MINGW_BYPASS ]] && unset AR CC CXX RC STRIP
 	local emesonargs=(
 		--prefix="${EPREFIX}"/usr/lib/${PN}
 		--{bin,lib}dir=x${MULTILIB_ABI_FLAG: -2}
 		$(meson_use {,enable_}d3d9)
 		$(meson_use {,enable_}d3d10)
 		$(meson_use {,enable_}d3d11)
 		$(meson_use {,enable_}dxgi)
 		$(usev strip --strip) # portage won't strip .dll, so allow it here
 	)
 	meson_src_configure
 }
 multilib_src_install_all() {
 	dobin setup_dxvk.sh
 	dodoc README.md dxvk.conf
 	find "${ED}" -type f -name '*.a' -delete || die
 }
 pkg_preinst() {
 	[[ -e ${EROOT}/usr/$(get_libdir)/dxvk/d3d11.dll ]] && DXVK_HAD_OVERLAY=
 }
 pkg_postinst() {
 	if [[ ! ${REPLACING_VERSIONS} ]]; then
 		elog "To enable ${PN} on a wine prefix, you can run the following command:"
 		elog
 		elog "	WINEPREFIX=/path/to/prefix setup_dxvk.sh install --symlink"
 		elog
 		elog "See ${EROOT}/usr/share/doc/${PF}/README.md* for details."
 		elog "Note: setup_dxvk.sh is unofficially temporarily provided as it was"
 		elog "removed upstream, handling may change in the future."
 	elif [[ -v DXVK_HAD_OVERLAY ]]; then
 		# temporary warning until this version is more widely used
 		elog "Gentoo's main repo ebuild for ${PN} uses different paths than most overlays."
 		elog "If you were using symbolic links in wine prefixes it may be necessary to"
 		elog "refresh them by re-running the command:"
 		elog
 		elog "	WINEPREFIX=/path/to/prefix setup_dxvk.sh install --symlink"
 		elog
 		elog "Also, if you were using /etc/${PN}.conf, ${PN} is no longer patched to load"
 		elog "it. See ${EROOT}/usr/share/doc/${PF}/README.md* for handling configs."
 	fi
 	if [[ ! ${REPLACING_VERSIONS##* } ]] ||
 		ver_test ${REPLACING_VERSIONS##* } -lt 2.0
 	then
 		elog
 		elog ">=${PN}-2.0 requires drivers and Wine to support vulkan-1.3, meaning:"
 		elog ">=wine-*-7.1 (or >=wine-proton-7.0), and >=mesa-22.0 (or >=nvidia-drivers-510)"
 		elog "For details, see: https://github.com/doitsujin/dxvk/wiki/Driver-support"
 	fi
 }
--- a/app-emulation/dxvk/dxvk-9999.ebuild
+++ b/app-emulation/dxvk/dxvk-9999.ebuild
@ -55,6 +55,7 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.10.3-wow64-setup.patch
 	"${FILESDIR}"/${PN}-2.3.1-gcc14.patch
 )
 pkg_pretend() {
--- a/app-emulation/dxvk/files/dxvk-2.3.1-gcc14.patch
+++ b/app-emulation/dxvk/files/dxvk-2.3.1-gcc14.patch
@ -0,0 +1,7 @@
 for std::remove_if
 --- a/src/d3d9/d3d9_mem.cpp
 +++ b/src/d3d9/d3d9_mem.cpp
@@ -5,2 +5,3 @@
 #include "../util/util_likely.h"
 +#include <algorithm>
 #include <utility>
--- a/app-emulation/qtrvsim/qtrvsim-0.9.7.ebuild
+++ b/app-emulation/qtrvsim/qtrvsim-0.9.7.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/cvut/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.t
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 DEPEND="
 	dev-qt/qtbase:6[gui,widgets]
--- a/app-emulation/vkd3d-proton/Manifest
+++ b/app-emulation/vkd3d-proton/Manifest
@ -1,15 +1,8 @@
 DIST dxil-spirv-b03d68d6ed30e87a3bcef9a861fa3c6b4429e5cc.tar.gz 915224 BLAKE2B 137f4b187300261d922ecc66542c5b38e6fa825cbb4e9adb43a7ca15ea9b968e24111bcaf9142782a44a6a7abb342a4ccfbd863af3c01287936e47b6162b7139 SHA512 890c0a0e638b9bffc9ce2cee871c60a2a552d691e60ad6ffa087dfae988e559151b7025e025e4346d1389b7d8f39f8b9bf93e43c7427c883662c1d6c86ff9b1a
 DIST spirv-headers-8b246ff75c6615ba4532fe4fde20f1be090c3764.tar.gz 472513 BLAKE2B f1ad7e11c306c62509655eb41d74efc5fb88688780d006c6944844e964b339baa000f70e115c4df2947e882c9ac33186e301b31138c38fe5f997f7af7260f521 SHA512 fe1d9d70b217b194c92dd397bca386ce8452bc5ec3967d64a257b3a531386fe6a6ecb5e9ed8ab5bc5a2707c5378f02f05809d6d197dcfb3f87cd33304c3b1959
 DIST vkd3d-proton-2.10.tar.gz 1839493 BLAKE2B 0dd3716bd986a78d8616fdfbe80833379bc93778a8cd599b8874b4bd620a3d5fa2d7ac342305db6acf3bb6025ac7b4ff138b49a30f34fa86f7af3ebb09903100 SHA512 84e9ebf84ac5294baf6d03e1291d7f3c4a004d6dd9da0450319e785827a635b70377855092d750b6c26492d369018585d7ec3cf46ebefc603751e13578bfe333
 DIST vkd3d-proton-2.11.1.tar.gz 1978301 BLAKE2B ede48d1895d2e8bc7f6e5971e6f7c95cc0403a3dad0dc3bdc6e19ecf6f282cd02c8c81371af8499e40d6ef9c055acabd90c8e65cd8b1360bded223864ccc0502 SHA512 91abd9bb854fe701db6e0d8c0a28e630ca23829676e2f74fa1bcd52801c1afef91456355e30a1c8fe27ee282ddf45dab40f28134be1e07f2cb07557112d3fee6
 DIST vkd3d-proton-2.12.tar.gz 2109289 BLAKE2B 805298efa2f49a82dcc4b989856fb24469a1de9a1d175d5844be3e72187d14f3454ced52bcd65f557ec6776fda00112f4b9849dd48679e10aadf277d82b928ca SHA512 fbd4102fc9917a8e7c28edcaa500c26352a0652a008da453108cd21325ef2c757b5c0842a50e2e5ea6efcacdabe86b2ce570647313d0036967a135b01850fbe8
 DIST vkd3d-proton-2.6.tar.gz 1271948 BLAKE2B 02d2574a66614613748fe3471a6fd5aac2650fdae15a17b17ea2ed028fa53a0579b866e7240036a26108afc343395826474bb99e015b9299c2abec811bb872ab SHA512 6f27d213652e2380a9ba4534ac9ffe4b752b4608fbc2e8acd273fa151ab19ad0b132e3436384d2b8591cd1a59f0b69d342c893dc3a64be85188b5e3274bcf3f1
 DIST vkd3d-proton-dxil-spirv-9044a31d22.tar.gz 876292 BLAKE2B dd55bc2b8125c3ec4639dcb4daa1b17e64824e6abb1e7ca102b2332535a9e5ad5a5af8959cc89cfd11f839ba90ded4614eb22dd5bdbd9b60abd7340d633c1287 SHA512 26a51c9bf7d55e77191d72642d20e98ceee0ffcf359646771cd20de093c670eeff082b80dc868a3e60de0ffb2ec0e0cd1276a39c13238a18282d5cb5a2059602
 DIST vkd3d-proton-dxil-spirv-b537bbb91b.tar.gz 631130 BLAKE2B 99f40c5efde87d0af86542b427e5b0429be68ca69ba0c2b6d10a821811756d8dadff4449f268ae404f8ace09a91b3e8aaa135e534a77c0239e58c1a970a044cc SHA512 3c20090b7a1b53c30fd4967622fc7384e1bcc504c30d8075068b87dad1bd2c6f4a12459bf42e61bf76b9dd454ec17a9d529f74ab0d5583627e966d94bb341dc3
 DIST vkd3d-proton-dxil-spirv-d6ffa30abf.tar.gz 783875 BLAKE2B 971a183c84142a4a00858d85c88f48d0c2dd6c4cc7576811c958c03d7f2e8cacb54cf518fa5f3dc0d2e0da681f3a15ab8e7d35ef7bb6df0e5b429e99ccdc9b75 SHA512 68452e28a88b8437ac81479ff2562322de759aafb1e6ac253f84fd43f1d4eb3c677e54da320e5cfc2f569fe15ca7578c0c4af8dc699f51baf597b4796fdd0167
 DIST vkd3d-proton-spirv-headers-1d31a10040.tar.gz 445679 BLAKE2B 3dac88269df92428fd93ca187eb417ec0156ff0b24200daf85526aaa92c30ba8743102764e20c47d783ed0704fa690c1bf60944ef81bbdd296890dde5fb9fcaa SHA512 2536619cd7854954892dbb5ab5cd97e4e95fe3f5c121c4b2022426ae734fc20c1ebadbae1da7689f5ca18397075c54e4f16ad525b8ee873c4b0ffdc07aaacc03
 DIST vkd3d-proton-spirv-headers-aa331ab0ff.tar.gz 448200 BLAKE2B 435e3ce169f44a00181a664a6cb2f3e45e22b3d4ec033d27fb2b54564b4fcc4274ac170f373daddf9ba0bd421b3d50fc87442c15345dae24ec131f4257b33f30 SHA512 1cd6043974daa4cd71138be629544d10944064af8e5b1a5a64e746922edd0d583050ec3b036ef304dd67a689c65541b5cb375d80f26ab3c9314653169cc5aac8
 DIST vkd3d-proton-spirv-headers-ae217c1780.tar.gz 415130 BLAKE2B 0c6444c4c1cb43b9c69757d7c2257ce2fe1bc6be308341f3189766f120994e4920bc738b737d9eefc299359dab568fb8809782e3663dd589c0e4d13aecb8873a SHA512 02cf1d63b29e48ef0efe489eb32237ba2f9f4bf58a182b00dc96aab18faba94de79283398e9e945cd81130f83fff228c59b04e496716ea9ccc148a5f4465282c
 DIST vkd3d-proton-vulkan-headers-83e1a9ed8c.tar.gz 1299014 BLAKE2B 0b1e635aaa6eebec3525b13698a064e0e5b8a78829a772cbe9e1890148059bf396bc5c830e8d6ee3070a3343775991642565283994c65acfa0d82a91590b7d84 SHA512 ecb2158cad55edb4ba069383668f3b311a2f6aa6777b5b7ed94795d454622426ee34fee52b13c97d2f07b5b2f965815ee61a0203b76a0b0d2c708a4786d06b96
 DIST vkd3d-proton-vulkan-headers-a0c76b4ef7.tar.gz 2072604 BLAKE2B 324fe6cc9b803ba5dfa38a3c97d7573cb138f8e0619c0748a096f1a13eb8b608d5a780cb071f3727b0912005a0ab1bc5fd4f1a335ee74d00b44876dfe422f433 SHA512 6f447fef01946849c925634a7caf793e69f3aec52d8de2fa77fe8f5f7675c831fb54a1852cf3326e3909ce43a6f2970dd60c6976ac5d9459ef7bac62583b7ba9
 DIST vulkan-headers-f030d9dd8ca297b84b10330cee87f72acc3b0aab.tar.gz 2255357 BLAKE2B 07cfa8ccdd26966116e7c35e0d350be94936469f2b9af77c84b8c61495b6ba76813047b5d26bba1fabd44a8f35396b32b6ad32c3b93b0b1a818ce9ed45f93db2 SHA512 6adf81d16d07710322b7c92a0e0436ee33be94d55116e3c460eabb4196a180f8c7b481c19a84a8bbea4e98dda6cf63ff2876f196348921a0c1d9c8c1005cd521
--- a/app-emulation/vkd3d-proton/vkd3d-proton-2.10.ebuild
+++ b/app-emulation/vkd3d-proton/vkd3d-proton-2.10.ebuild
@ -1,207 +0,0 @@
 # Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
 MULTILIB_ABIS="amd64 x86" # allow usage on /no-multilib/
 MULTILIB_COMPAT=( abi_x86_{32,64} )
 inherit flag-o-matic meson-multilib toolchain-funcs
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/HansKristian-Work/vkd3d-proton.git"
 	EGIT_SUBMODULES=(
 		# uses hacks / recent features and easily breaks, keep bundled headers
 		# (also cross-compiled and -I/usr/include is troublesome)
 		subprojects/{SPIRV,Vulkan}-Headers
 		subprojects/dxil-spirv
 		subprojects/dxil-spirv/third_party/spirv-headers # skip cross/tools
 	)
 else
 	HASH_VKD3D=88e4f300cc0b5b6f0880c1233d562cf506b546fb # match tag on bumps
 	HASH_DXIL=d6ffa30abfc0fd3dd569af4a4efc9bc9df918d2a
 	HASH_SPIRV=1d31a100405cf8783ca7a31e31cdd727c9fc54c3
 	HASH_SPIRV_DXIL=aa331ab0ffcb3a67021caa1a0c1c9017712f2f31
 	HASH_VULKAN=a0c76b4ef76e219483755ff61dce6b67ff79f24b
 	SRC_URI="
 		https://github.com/HansKristian-Work/vkd3d-proton/archive/refs/tags/v${PV}.tar.gz
 			-> ${P}.tar.gz
 		https://github.com/HansKristian-Work/dxil-spirv/archive/${HASH_DXIL}.tar.gz
 			-> ${PN}-dxil-spirv-${HASH_DXIL::10}.tar.gz
 		https://github.com/KhronosGroup/SPIRV-Headers/archive/${HASH_SPIRV}.tar.gz
 			-> ${PN}-spirv-headers-${HASH_SPIRV::10}.tar.gz
 		https://github.com/KhronosGroup/SPIRV-Headers/archive/${HASH_SPIRV_DXIL}.tar.gz
 			-> ${PN}-spirv-headers-${HASH_SPIRV_DXIL::10}.tar.gz
 		https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz
 			-> ${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz"
 	KEYWORDS="-* amd64 x86"
 fi
 DESCRIPTION="Fork of VKD3D, development branches for Proton's Direct3D 12 implementation"
 HOMEPAGE="https://github.com/HansKristian-Work/vkd3d-proton/"
 LICENSE="LGPL-2.1+ Apache-2.0 MIT"
 SLOT="0"
 IUSE="+abi_x86_32 crossdev-mingw debug extras +strip"
 BDEPEND="
 	dev-util/glslang
 	!crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.6-wow64-setup.patch
 )
 pkg_pretend() {
 	[[ ${MERGE_TYPE} == binary ]] && return
 	if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
 		local tool=-w64-mingw32-g++
 		for tool in $(usev abi_x86_64 x86_64${tool}) $(usev abi_x86_32 i686${tool}); do
 			if ! type -P ${tool} >/dev/null; then
 				eerror "With USE=crossdev-mingw, it is necessary to setup the mingw toolchain."
 				eerror "For instructions, please see: https://wiki.gentoo.org/wiki/Mingw"
 				use abi_x86_32 && use abi_x86_64 &&
 					eerror "Also, with USE=abi_x86_32, will need both i686 and x86_64 toolchains."
 				die "USE=crossdev-mingw is enabled, but ${tool} was not found"
 			elif [[ ! $(LC_ALL=C ${tool} -v 2>&1) =~ "Thread model: posix" ]]; then
 				eerror "${PN} requires GCC to be built with --enable-threads=posix"
 				eerror "Please see: https://wiki.gentoo.org/wiki/Mingw#POSIX_threads_for_Windows"
 				die "USE=crossdev-mingw is enabled, but ${tool} does not use POSIX threads"
 			fi
 		done
 		tool=-w64-mingw32-widl
 		for tool in $(usev abi_x86_64 x86_64${tool}) $(usev abi_x86_32 i686${tool}); do
 			if ! type -P widl >/dev/null && ! type -P ${tool} >/dev/null; then
 				eerror "With USE=crossdev-mingw, you need to provide the widl compiler by either"
 				eerror "building crossdev mingw64-runtime with USE=tools or installing wine."
 				die "USE=crossdev-mingw is set but neither widl nor ${tool} were found"
 			fi
 		done
 	fi
 }
 src_prepare() {
 	if [[ ${PV} != 9999 ]]; then
 		rmdir subprojects/{{SPIRV,Vulkan}-Headers,dxil-spirv} || die
 		mv ../dxil-spirv-${HASH_DXIL} subprojects/dxil-spirv || die
 		mv ../SPIRV-Headers-${HASH_SPIRV} subprojects/SPIRV-Headers || die
 		mv ../Vulkan-Headers-${HASH_VULKAN} subprojects/Vulkan-Headers || die
 		# dxil and vkd3d's spirv headers currently mismatch and incompatible
 		rmdir subprojects/dxil-spirv/third_party/spirv-headers || die
 		mv ../SPIRV-Headers-${HASH_SPIRV_DXIL} \
 			subprojects/dxil-spirv/third_party/spirv-headers || die
 #		ln -s ../../../SPIRV-Headers/include \
 #			subprojects/dxil-spirv/third_party/spirv-headers || die
 	fi
 	default
 	sed -i "/^basedir=/s|=.*|=${EPREFIX}/usr/lib/${PN}|" setup_vkd3d_proton.sh || die
 	if [[ ${PV} != 9999 ]]; then
 		# without .git, meson sets vkd3d_build as 0x${PV} leading to failure
 		sed -i "s/@VCS_TAG@/${HASH_VKD3D::15}/" vkd3d_build.h.in || die
 		sed -i "s/@VCS_TAG@/${HASH_VKD3D::7}/" vkd3d_version.h.in || die
 	fi
 }
 src_configure() {
 	use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
 	# random segfaults been reported with LTO in some games, filter as
 	# a safety (note that optimizing this further won't really help
 	# performance, GPU does the actual work)
 	filter-lto
 	# -mavx with mingw-gcc has a history of obscure issues and
 	# disabling is seen as safer, e.g. `WINEARCH=win32 winecfg`
 	# crashes with -march=skylake >=wine-8.10, similar issues with
 	# znver4: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
 	append-flags -mno-avx
 	if [[ ${CHOST} != *-mingw* ]]; then
 		if [[ ! -v MINGW_BYPASS ]]; then
 			unset AR CC CXX RC STRIP WIDL
 			filter-flags '-fuse-ld=*'
 			filter-flags '-mfunction-return=thunk*' #878849
 			# some bashrc-mv users tend to do CFLAGS="${LDFLAGS}" and then
 			# strip-unsupported-flags miss these during compile-only tests
 			# (primarily done for 23.0 profiles' -z, not full coverage)
 			filter-flags '-Wl,-z,*' #928038
 		fi
 		CHOST_amd64=x86_64-w64-mingw32
 		CHOST_x86=i686-w64-mingw32
 		CHOST=$(usex x86 ${CHOST_x86} ${CHOST_amd64})
 		# preferring meson eclass' cross file over upstream's but, unlike
 		# dxvk, we lose static options in the process (from build-win*.txt)
 		append-ldflags -static -static-libgcc -static-libstdc++
 		strip-unsupported-flags
 	fi
 	multilib-minimal_src_configure
 }
 multilib_src_configure() {
 	# multilib's ${CHOST_amd64}-gcc -m32 is unusable with crossdev,
 	# unset again so meson eclass will set ${CHOST}-gcc + others
 	use crossdev-mingw && [[ ! -v MINGW_BYPASS ]] && unset AR CC CXX STRIP WIDL
 	# prefer ${CHOST}'s widl (mingw) over wine's as used by upstream if
 	# possible, but eclasses don't handle that so setup machine files
 	local widl=$(tc-getPROG WIDL widl)
 	use amd64 && [[ ${widl} == widl && ${ABI} == x86 ]] && widl="widl','-m32"
 	printf "[binaries]\nwidl = ['${widl}']\n" > "${T}"/widl.${ABI}.ini || die
 	local emesonargs=(
 		--prefix="${EPREFIX}"/usr/lib/${PN}
 		--{bin,lib}dir=x${ABI: -2}
 		--{cross,native}-file="${T}"/widl.${ABI}.ini
 		$(meson_use {,enable_}extras)
 		$(meson_use debug enable_trace)
 		$(usev strip --strip) # portage won't strip .dll, so allow it here
 		-Denable_tests=false # needs wine/vulkan and is intended for manual use
 	)
 	meson_src_configure
 }
 multilib_src_install_all() {
 	dobin setup_vkd3d_proton.sh
 	einstalldocs
 	find "${ED}" -type f -name '*.a' -delete || die
 }
 pkg_postinst() {
 	if [[ ! ${REPLACING_VERSIONS} ]]; then
 		elog "To enable ${PN} on a wine prefix, you can run the following command:"
 		elog
 		elog "	WINEPREFIX=/path/to/prefix setup_vkd3d_proton.sh install --symlink"
 		elog
 		elog "Should also ensure that >=app-emulation/dxvk-2.1's dxgi.dll is available"
 		elog "on it, not meant to function independently even if only using d3d12."
 		elog
 		elog "See ${EROOT}/usr/share/doc/${PF}/README.md* for details."
 	elif [[ ${REPLACING_VERSIONS##* } ]]; then
 		if ver_test ${REPLACING_VERSIONS##* } -lt 2.7; then
 			elog
 			elog ">=${PN}-2.7 requires drivers and Wine to support vulkan-1.3, meaning:"
 			elog ">=wine-*-7.1 (or >=wine-proton-7.0), and >=mesa-22.0 (or >=nvidia-drivers-510)"
 		fi
 		if ver_test ${REPLACING_VERSIONS##* } -lt 2.9; then
 			elog
 			elog ">=${PN}-2.9 has a new file to install (d3d12core.dll), old Wine prefixes that"
 			elog "relied on '--symlink' may need updates by using the setup_vkd3d_proton.sh."
 			elog
 			elog "Furthermore, it may not function properly if >=app-emulation/dxvk-2.1's"
 			elog "dxgi.dll is not available on that prefix (even if only using d3d12)."
 		fi
 	fi
 }
--- a/app-emulation/vkd3d-proton/vkd3d-proton-2.11.1.ebuild
+++ b/app-emulation/vkd3d-proton/vkd3d-proton-2.11.1.ebuild
@ -1,201 +0,0 @@
 # Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
 MULTILIB_ABIS="amd64 x86" # allow usage on /no-multilib/
 MULTILIB_COMPAT=( abi_x86_{32,64} )
 inherit flag-o-matic meson-multilib toolchain-funcs
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/HansKristian-Work/vkd3d-proton.git"
 	EGIT_SUBMODULES=(
 		# uses hacks / recent features and easily breaks, keep bundled headers
 		# (also cross-compiled and -I/usr/include is troublesome)
 		khronos/{SPIRV,Vulkan}-Headers
 		subprojects/dxil-spirv
 		subprojects/dxil-spirv/third_party/spirv-headers # skip cross/tools
 	)
 else
 	HASH_VKD3D=105b5b77c9a34fd336b5c604e3c7a6cc48f39c3a # match tag on bumps
 	HASH_DXIL=9044a31d22afff1d75d07886e5096daf5f1ebed8
 	HASH_SPIRV=1d31a100405cf8783ca7a31e31cdd727c9fc54c3
 	HASH_SPIRV_DXIL=aa331ab0ffcb3a67021caa1a0c1c9017712f2f31
 	HASH_VULKAN=a0c76b4ef76e219483755ff61dce6b67ff79f24b
 	SRC_URI="
 		https://github.com/HansKristian-Work/vkd3d-proton/archive/refs/tags/v${PV}.tar.gz
 			-> ${P}.tar.gz
 		https://github.com/HansKristian-Work/dxil-spirv/archive/${HASH_DXIL}.tar.gz
 			-> ${PN}-dxil-spirv-${HASH_DXIL::10}.tar.gz
 		https://github.com/KhronosGroup/SPIRV-Headers/archive/${HASH_SPIRV}.tar.gz
 			-> ${PN}-spirv-headers-${HASH_SPIRV::10}.tar.gz
 		https://github.com/KhronosGroup/SPIRV-Headers/archive/${HASH_SPIRV_DXIL}.tar.gz
 			-> ${PN}-spirv-headers-${HASH_SPIRV_DXIL::10}.tar.gz
 		https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz
 			-> ${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz"
 	KEYWORDS="-* amd64 x86"
 fi
 DESCRIPTION="Fork of VKD3D, development branches for Proton's Direct3D 12 implementation"
 HOMEPAGE="https://github.com/HansKristian-Work/vkd3d-proton/"
 LICENSE="LGPL-2.1+ Apache-2.0 MIT"
 SLOT="0"
 IUSE="+abi_x86_32 crossdev-mingw debug extras +strip"
 BDEPEND="
 	dev-util/glslang
 	!crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.6-wow64-setup.patch
 )
 pkg_pretend() {
 	[[ ${MERGE_TYPE} == binary ]] && return
 	if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
 		local tool=-w64-mingw32-g++
 		for tool in $(usev abi_x86_64 x86_64${tool}) $(usev abi_x86_32 i686${tool}); do
 			if ! type -P ${tool} >/dev/null; then
 				eerror "With USE=crossdev-mingw, it is necessary to setup the mingw toolchain."
 				eerror "For instructions, please see: https://wiki.gentoo.org/wiki/Mingw"
 				use abi_x86_32 && use abi_x86_64 &&
 					eerror "Also, with USE=abi_x86_32, will need both i686 and x86_64 toolchains."
 				die "USE=crossdev-mingw is enabled, but ${tool} was not found"
 			elif [[ ! $(LC_ALL=C ${tool} -v 2>&1) =~ "Thread model: posix" ]]; then
 				eerror "${PN} requires GCC to be built with --enable-threads=posix"
 				eerror "Please see: https://wiki.gentoo.org/wiki/Mingw#POSIX_threads_for_Windows"
 				die "USE=crossdev-mingw is enabled, but ${tool} does not use POSIX threads"
 			fi
 		done
 		tool=-w64-mingw32-widl
 		for tool in $(usev abi_x86_64 x86_64${tool}) $(usev abi_x86_32 i686${tool}); do
 			if ! type -P widl >/dev/null && ! type -P ${tool} >/dev/null; then
 				eerror "With USE=crossdev-mingw, you need to provide the widl compiler by either"
 				eerror "building crossdev mingw64-runtime with USE=tools or installing wine."
 				die "USE=crossdev-mingw is set but neither widl nor ${tool} were found"
 			fi
 		done
 	fi
 }
 src_prepare() {
 	if [[ ${PV} != 9999 ]]; then
 		rmdir khronos/{SPIRV,Vulkan}-Headers subprojects/dxil-spirv || die
 		mv ../dxil-spirv-${HASH_DXIL} subprojects/dxil-spirv || die
 		mv ../SPIRV-Headers-${HASH_SPIRV} khronos/SPIRV-Headers || die
 		mv ../Vulkan-Headers-${HASH_VULKAN} khronos/Vulkan-Headers || die
 		# dxil and vkd3d's spirv headers currently mismatch and incompatible
 		rmdir subprojects/dxil-spirv/third_party/spirv-headers || die
 		mv ../SPIRV-Headers-${HASH_SPIRV_DXIL} \
 			subprojects/dxil-spirv/third_party/spirv-headers || die
 	fi
 	default
 	sed -i "/^basedir=/s|=.*|=${EPREFIX}/usr/lib/${PN}|" setup_vkd3d_proton.sh || die
 	if [[ ${PV} != 9999 ]]; then
 		# without .git, meson sets vkd3d_build as 0x${PV} leading to failure
 		sed -i "s/@VCS_TAG@/${HASH_VKD3D::15}/" vkd3d_build.h.in || die
 		sed -i "s/@VCS_TAG@/${HASH_VKD3D::7}/" vkd3d_version.h.in || die
 	fi
 }
 src_configure() {
 	use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
 	# random segfaults been reported with LTO in some games, filter as
 	# a safety (note that optimizing this further won't really help
 	# performance, GPU does the actual work)
 	filter-lto
 	# -mavx with mingw-gcc has a history of obscure issues and
 	# disabling is seen as safer, e.g. `WINEARCH=win32 winecfg`
 	# crashes with -march=skylake >=wine-8.10, similar issues with
 	# znver4: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
 	append-flags -mno-avx
 	if [[ ${CHOST} != *-mingw* ]]; then
 		if [[ ! -v MINGW_BYPASS ]]; then
 			unset AR CC CXX RC STRIP WIDL
 			filter-flags '-fuse-ld=*'
 			filter-flags '-mfunction-return=thunk*' #878849
 			# some bashrc-mv users tend to do CFLAGS="${LDFLAGS}" and then
 			# strip-unsupported-flags miss these during compile-only tests
 			# (primarily done for 23.0 profiles' -z, not full coverage)
 			filter-flags '-Wl,-z,*' #928038
 		fi
 		CHOST_amd64=x86_64-w64-mingw32
 		CHOST_x86=i686-w64-mingw32
 		CHOST=$(usex x86 ${CHOST_x86} ${CHOST_amd64})
 		strip-unsupported-flags
 	fi
 	multilib-minimal_src_configure
 }
 multilib_src_configure() {
 	# multilib's ${CHOST_amd64}-gcc -m32 is unusable with crossdev,
 	# unset again so meson eclass will set ${CHOST}-gcc + others
 	use crossdev-mingw && [[ ! -v MINGW_BYPASS ]] && unset AR CC CXX STRIP WIDL
 	# prefer ${CHOST}'s widl (mingw) over wine's as used by upstream if
 	# possible, but eclasses don't handle that so setup machine files
 	local widl=$(tc-getPROG WIDL widl)
 	use amd64 && [[ ${widl} == widl && ${ABI} == x86 ]] && widl="widl','-m32"
 	printf "[binaries]\nwidl = ['${widl}']\n" > "${T}"/widl.${ABI}.ini || die
 	local emesonargs=(
 		--prefix="${EPREFIX}"/usr/lib/${PN}
 		--{bin,lib}dir=x${ABI: -2}
 		--{cross,native}-file="${T}"/widl.${ABI}.ini
 		$(meson_use {,enable_}extras)
 		$(meson_use debug enable_trace)
 		$(usev strip --strip) # portage won't strip .dll, so allow it here
 		-Denable_tests=false # needs wine/vulkan and is intended for manual use
 	)
 	meson_src_configure
 }
 multilib_src_install_all() {
 	dobin setup_vkd3d_proton.sh
 	einstalldocs
 	find "${ED}" -type f -name '*.a' -delete || die
 }
 pkg_postinst() {
 	if [[ ! ${REPLACING_VERSIONS} ]]; then
 		elog "To enable ${PN} on a wine prefix, you can run the following command:"
 		elog
 		elog "	WINEPREFIX=/path/to/prefix setup_vkd3d_proton.sh install --symlink"
 		elog
 		elog "Should also ensure that >=app-emulation/dxvk-2.1's dxgi.dll is available"
 		elog "on it, not meant to function independently even if only using d3d12."
 		elog
 		elog "See ${EROOT}/usr/share/doc/${PF}/README.md* for details."
 	elif [[ ${REPLACING_VERSIONS##* } ]]; then
 		if ver_test ${REPLACING_VERSIONS##* } -lt 2.7; then
 			elog
 			elog ">=${PN}-2.7 requires drivers and Wine to support vulkan-1.3, meaning:"
 			elog ">=wine-*-7.1 (or >=wine-proton-7.0), and >=mesa-22.0 (or >=nvidia-drivers-510)"
 		fi
 		if ver_test ${REPLACING_VERSIONS##* } -lt 2.9; then
 			elog
 			elog ">=${PN}-2.9 has a new file to install (d3d12core.dll), old Wine prefixes that"
 			elog "relied on '--symlink' may need updates by using the setup_vkd3d_proton.sh."
 			elog
 			elog "Furthermore, it may not function properly if >=app-emulation/dxvk-2.1's"
 			elog "dxgi.dll is not available on that prefix (even if only using d3d12)."
 		fi
 	fi
 }
--- a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
+++ b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
@ -242,6 +242,7 @@ src_configure() {
 	tc-ld-force-bfd # builds with non-bfd but broken at runtime (bug #867097)
 	filter-lto # build failure
 	filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
 	use custom-cflags || strip-flags # can break in obscure ways at runtime
 	use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
--- a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
@ -246,6 +246,7 @@ src_configure() {
 	tc-ld-force-bfd # builds with non-bfd but broken at runtime (bug #867097)
 	filter-lto # build failure
 	filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
 	use custom-cflags || strip-flags # can break in obscure ways at runtime
 	use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
--- a/app-emulation/wine-proton/wine-proton-9.0.1.ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0.1.ebuild
@ -264,11 +264,10 @@ src_configure() {
 		$(use_with v4l v4l2)
 		$(use_with xcomposite)
 		$(use_with xinerama)
 		--without-vosk # unpackaged, file a bug if you need this
 	)
 	filter-lto # build failure
 	filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
 	use custom-cflags || strip-flags # can break in obscure ways at runtime
 	# wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097)
--- a/app-emulation/wine-proton/wine-proton-9.0.9999.ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0.9999.ebuild
@ -269,6 +269,7 @@ src_configure() {
 	)
 	filter-lto # build failure
 	filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
 	use custom-cflags || strip-flags # can break in obscure ways at runtime
 	# wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097)
--- a/app-emulation/wine-staging/files/wine-staging-9.8-musl-ioctls-header.patch
+++ b/app-emulation/wine-staging/files/wine-staging-9.8-musl-ioctls-header.patch
@ -0,0 +1,30 @@
 https://bugs.gentoo.org/931341
 https://gitlab.winehq.org/wine/wine/-/commit/24ca848c568d5a2786abd26f2e7314b2e3f509f3
 From: Fotios Valasiadis <fvalasiad@gmail.com>
 Date: Sun, 5 May 2024 03:34:57 +0300
 Subject: [PATCH] ntdll/unix: Fix building on musl by explicitly including
 asm/ioctls.h.
 After commit 898ab8dab19d498c17859f39a55e317ee7e367a5 wine would no longer
 build on musl.
 Issue is that apparently TCSETS2 isn't defined when including sys/ioctl.h.
 A little digging shows that glibc goes ahead and includes asm/ioctls.h in
 sys/ioctl.h, providing said macro.  Musl on the other hand doesn't and relies
 on bits/ioctl.h, which lacks said macro.
 Signed-off-by: Fotios Valasiadis <fvalasiad@gmail.com>
 --- a/dlls/ntdll/unix/serial.c
 +++ b/dlls/ntdll/unix/serial.c
@@ -33,6 +33,7 @@
 #include <stdio.h>
 #ifdef HAVE_ASM_TERMBITS_H
 # include <asm/termbits.h>
 +# include <asm/ioctls.h>
 #else
 # include <termios.h>
 #endif
 -- 
 GitLab
--- a/app-emulation/wine-staging/wine-staging-9.0.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.0.ebuild
@ -325,6 +325,7 @@ src_configure() {
 	)
 	filter-lto # build failure
 	filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
 	use custom-cflags || strip-flags # can break in obscure ways at runtime
 	# wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097)
--- a/app-emulation/wine-staging/wine-staging-9.5.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.5.ebuild
@ -325,6 +325,7 @@ src_configure() {
 	)
 	filter-lto # build failure
 	filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
 	use custom-cflags || strip-flags # can break in obscure ways at runtime
 	# wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097)
--- a/app-emulation/wine-staging/wine-staging-9.6.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.6.ebuild
@ -320,6 +320,7 @@ src_configure() {
 	)
 	filter-lto # build failure
 	filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
 	use custom-cflags || strip-flags # can break in obscure ways at runtime
 	# wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097)
--- a/app-emulation/wine-staging/wine-staging-9.7.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.7.ebuild
@ -320,6 +320,7 @@ src_configure() {
 	)
 	filter-lto # build failure
 	filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
 	use custom-cflags || strip-flags # can break in obscure ways at runtime
 	# wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097)
--- a/app-emulation/wine-staging/wine-staging-9.8.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.8.ebuild
@ -177,6 +177,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-7.17-noexecstack.patch
 	"${FILESDIR}"/${PN}-7.20-unwind.patch
 	"${FILESDIR}"/${PN}-8.13-rpath.patch
 	"${FILESDIR}"/${P}-musl-ioctls-header.patch
 )
 pkg_pretend() {
@ -320,6 +321,7 @@ src_configure() {
 	)
 	filter-lto # build failure
 	filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
 	use custom-cflags || strip-flags # can break in obscure ways at runtime
 	# wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097)
--- a/Show more
+++ b/Show more
`@ -1,2 +1 @@`
	`DIST orca-45.1.tar.xz 3966196 BLAKE2B 5d78e228c480e880ca62f5e6b35d5394cbe41b67dc14f7158ca3dcadcd9721bb6e37f2054c1fa3375019351fc609d1ab4268becede10b60fbc67051c5e67539f SHA512 581126ced85943c916d9b2c0a55c12fe16344c9d6501be0290698c0668909faab4c1f539ffd856c82d0b386cfa8ca00ba5176ff5b9c5c1176cc30faededb411a`
	`DIST orca-45.2.tar.xz 3997024 BLAKE2B dfdf113694127323a92450b04b20fcc5655be0236c0173167d5d15478703b676c3fd8c1de0e75783875c5d2d40541c764fb002314d66c7570475cd63f6bfa473 SHA512 57eee451cf0da52e1297beae6c6d527886721b23c3415a5e046f3431876fdf1603dbd81ca763ed614ace68e7db96d90b413c663f113d0033ec1f2797df7bf589`	`DIST orca-45.2.tar.xz 3997024 BLAKE2B dfdf113694127323a92450b04b20fcc5655be0236c0173167d5d15478703b676c3fd8c1de0e75783875c5d2d40541c764fb002314d66c7570475cd63f6bfa473 SHA512 57eee451cf0da52e1297beae6c6d527886721b23c3415a5e046f3431876fdf1603dbd81ca763ed614ace68e7db96d90b413c663f113d0033ec1f2797df7bf589`
`@ -1 +1,2 @@`
	`DIST eclean_kernel-2.99.7.tar.gz 25393 BLAKE2B 74f803f1007a1c54d87f087287a34a8380b21b9c66ad75a0ae64463815d5df39de0387f5d0cfd366e33efdaf039fce5dad923f1e55f93a2836830e303c3ca2df SHA512 dd43f65c1beebef59ee7a2e41375797fa5ea77171d8e4cf465b2b6a46e8e4500fb1723f664f2ce59e5b6e79d2dedd4abbaaa303a77e8349b9ee90c56e00e799e`	`DIST eclean_kernel-2.99.7.tar.gz 25393 BLAKE2B 74f803f1007a1c54d87f087287a34a8380b21b9c66ad75a0ae64463815d5df39de0387f5d0cfd366e33efdaf039fce5dad923f1e55f93a2836830e303c3ca2df SHA512 dd43f65c1beebef59ee7a2e41375797fa5ea77171d8e4cf465b2b6a46e8e4500fb1723f664f2ce59e5b6e79d2dedd4abbaaa303a77e8349b9ee90c56e00e799e`
		`DIST eclean_kernel-2.99.8.tar.gz 25134 BLAKE2B efd29370f0204c8df7a8e955a50ef8ad819fd29f8cbf1d179e61588130ac6d589366f1f76d499cae42c6e99c553d1b0cd68c4f0728315940b5997196bda6b57c SHA512 57956e1f93327db86942c5be815d3df61934f93a65349faca4d2605e7667b9dfe8e42bc6d4f5c5c27fbbdd536a25371b4c4b0b88dca92ba0f5f98058f1c1b679`
`@ -1,2 +1 @@`
	`DIST qtpass-1.3.2.tar.gz 310316 BLAKE2B ac0f562fd263e9d46980a69183cfd556596750e1050dbc50748cd9be45bc4bf39e4de14cb59f778cfc54f5c32050d567d88d65ec039cba1e9c2e8ef24d7ae99a SHA512 9026f74f6ff75fcef2f6a0862484a2a1eaed1370edd0659e8b4d20039affe846e0da3a0a26a804563813bc678638ab67fa516441208e70c7e9de9b2eda876a10`
	`DIST qtpass-1.4.0.tar.gz 581368 BLAKE2B 12bf414ea781bad34d97fe28ae39f44e17812039f0d798162b6d875918f20a1583f7a53a1e98ed917edf41c15709c7693c7651205c5e4ec85860ee773350f075 SHA512 47c1284c10e0d8a3bf63c049fc29d785d1a53bef6f183bbe22efebf466371dd454a6e43c944739f487d609f3cde188701ba538e9cb8e2c7e5530f8fa6f992625`	`DIST qtpass-1.4.0.tar.gz 581368 BLAKE2B 12bf414ea781bad34d97fe28ae39f44e17812039f0d798162b6d875918f20a1583f7a53a1e98ed917edf41c15709c7693c7651205c5e4ec85860ee773350f075 SHA512 47c1284c10e0d8a3bf63c049fc29d785d1a53bef6f183bbe22efebf466371dd454a6e43c944739f487d609f3cde188701ba538e9cb8e2c7e5530f8fa6f992625`
`@ -1 +1 @@`
	`DIST stress-ng-0.17.07.tar.gz 6260811 BLAKE2B f56dc22ca55a3b4e9c22f179653b4f832d164fd61968af146bedd3a9242509f7ede070d5cf9392ba494025682f6dfed33bd6034244c0731716977e2179514929 SHA512 5bd6dc8175d2d410447559c489e7bb1187fdce7657018ac48a2744be6e8998bc21e84b7bc536477b5db170ca9bd2aba0992127af90e3ff2312bd6130061dce6c`	`DIST stress-ng-0.17.08.tar.gz 6274899 BLAKE2B ca5c00eebbefeb5be90756faa41f8130b577ca71b78253dc4ae431df1044366e79882e0e1c0850c0102e83356203400295fad977d141dddaf234423617cec965 SHA512 3df9bb507687839ad9978099bea33bc6923d324c6e6f66d441911670fcd8080e093fd02741ea8516626ae1ba357f42d2c50b6553cb75f48fd5f008e59d469777`
`@ -1 +1,2 @@`
	`DIST aspell-da-4.2.1.tar.gz 4244477 BLAKE2B 51c25e9dc3f033daf4884abb3db5681ba834835bd6ae417e9edf5200d4791fd911974dca4f3323b880efd7a2be1ee8259784e0a54d7e0bceb7249a6bb4a55736 SHA512 66a32be37615423cdd88c3ccbe81e26bc955068a5d74f1829f0d309ba93741d99f7ccbb335e0fe1a890aada984cc771eb25c00027554509c0f1fbf36fea5fb0b`	`DIST aspell-da-4.2.1.tar.gz 4244477 BLAKE2B 51c25e9dc3f033daf4884abb3db5681ba834835bd6ae417e9edf5200d4791fd911974dca4f3323b880efd7a2be1ee8259784e0a54d7e0bceb7249a6bb4a55736 SHA512 66a32be37615423cdd88c3ccbe81e26bc955068a5d74f1829f0d309ba93741d99f7ccbb335e0fe1a890aada984cc771eb25c00027554509c0f1fbf36fea5fb0b`
		`DIST aspell-da-4.3.tar.gz 4262160 BLAKE2B d7de57716c36b23e7de83152f46f3b13d9474007d05fb96171a9a2e70758afbe6ca96e0b2c6d2bacd5543e33698de5483f9dae3469017475a5e19a75975eaf86 SHA512 6cb391660f7c7dad85f0242feca284d07204dfbab348e4138e07932da8dd7446e8bccf8e3079bc40f69d73b3967da80ddd539e66eda037b8053056effd20b389`
`@ -1,2 +1 @@`
	`DIST auctex-13.2.tar.gz 1667548 BLAKE2B 51daf18185a01c7349a49cfb3484d0271dc30271c69a028dc70ec9dae998b0664ffa574160dd384c35e66d38da95af5af0c4bf73e5ea969a6166685f8e3a0b80 SHA512 98d3d0061a807e62045b648a699e23819a0288ea17f2247b18c6725c503dfd6c791384c47504376de098b5a4e62bf350227497be6bf7a007fd94df232a069129`
	`DIST auctex-13.3.tar.gz 1695608 BLAKE2B 3a22273b72237e14a31a1fb9d81e2c4ee10290919bc3d6f8cb35ab877ef26083c7edb5bbb7c88a40f45848012cc2edd375a90d872f604029ba8f03278bd95f9a SHA512 32d6f3c968a27dd5e7862993419bfa0f5e5228abca7478341a06fce153f333410cd230f8266e6b0e4fb5e4247864710e3f572b6a837c99c2879d38899590f678`	`DIST auctex-13.3.tar.gz 1695608 BLAKE2B 3a22273b72237e14a31a1fb9d81e2c4ee10290919bc3d6f8cb35ab877ef26083c7edb5bbb7c88a40f45848012cc2edd375a90d872f604029ba8f03278bd95f9a SHA512 32d6f3c968a27dd5e7862993419bfa0f5e5228abca7478341a06fce153f333410cd230f8266e6b0e4fb5e4247864710e3f572b6a837c99c2879d38899590f678`
`@ -1 +1,2 @@`
	`DIST bbdb-3.2.2b.tar.gz 199518 BLAKE2B d6eef625636689d204ed9c6c7f299380924da5b021118e70930ab3b928d547b9cbb5a1cec8d111ce52678fc44b30ee34d164f46a9c6afa98c829ba871382acef SHA512 f730b911d16484c3723f6983b94784a828173797f4732c8d8eb47d50186415e0fdfde62f4f5f5b5b6ac66b78580fcfb2a398840935400fddd5f8143831e35fe2`	`DIST bbdb-3.2.2b.tar.gz 199518 BLAKE2B d6eef625636689d204ed9c6c7f299380924da5b021118e70930ab3b928d547b9cbb5a1cec8d111ce52678fc44b30ee34d164f46a9c6afa98c829ba871382acef SHA512 f730b911d16484c3723f6983b94784a828173797f4732c8d8eb47d50186415e0fdfde62f4f5f5b5b6ac66b78580fcfb2a398840935400fddd5f8143831e35fe2`
		`DIST bbdb-3.2.2d_p20231122.tar.gz 201355 BLAKE2B 6f1abd80d580fa2bc9f5ce2a26179d54358ab156991e138e8028bec4c7e891e884f3aa938e895b3e7a5cdb7dae1548e5161c212e5b6073d8bf2c38ba76bc8029 SHA512 3d5d6a8411c14e8c8f8b60872e954c0d26e25bebb9c9148c354ea078e12a30b500ee1de026414359efca3b9fd502a0bad00c9df0549cb7c83c726d878187373d`
`@ -1 +1,2 @@`
	`DIST yatex1.82.tar.gz 387358 BLAKE2B 77c88563e3beb7b29ac8a4d7204d14b966c9a88b1c2f04c6160089f0b61a70c9d6aa135d2e1cee6e13a90cc108428ce80e7ef0d0b8852b9a8651e67f34af7e1e SHA512 8c2890fc12e93aace5ac51e24da315a9d241aec023a3c67187c1fd28d2a7a02d1688b7e1177e1ba13411ecb394b5d581298c735cd80195e663bbdcf240f10fe5`	`DIST yatex1.82.tar.gz 387358 BLAKE2B 77c88563e3beb7b29ac8a4d7204d14b966c9a88b1c2f04c6160089f0b61a70c9d6aa135d2e1cee6e13a90cc108428ce80e7ef0d0b8852b9a8651e67f34af7e1e SHA512 8c2890fc12e93aace5ac51e24da315a9d241aec023a3c67187c1fd28d2a7a02d1688b7e1177e1ba13411ecb394b5d581298c735cd80195e663bbdcf240f10fe5`
		`DIST yatex1.83.tar.gz 389259 BLAKE2B 40a5475c1b46e93531eeac3b7ed3e90f7a68c0faad91cc9c74b38af0e36a83578032615a2dfdcd7a6ede2b9eda36e128581c162a84b913362612cd07df9f1d81 SHA512 7e12532a5af8139b99457ff1137b19e5d1272f6bc13e3baea62d57e6ec036154ae733696ae8b6c1c1b8a6949aaa0425a34a8485ce61cbe0df72ceee1489eaedf`