Sync with portage [Sat Dec 14 22:14:54 MSK 2024].

app-admin/awscli/Manifest

@@ -1,7 +1,3 @@
 DIST aws-cli-1.36.12.gh.tar.gz 2842234 BLAKE2B b9f333d7fa8b7aa9c0452b6da87c3b097f1b5027f1f9c36888448f5e5763a93696e1d25cca167a17d9ab7332c5491be500a44462eed44c18f886ec9f0816a248 SHA512 b7797a29230628201d808958c4f9660768646f1c1a3f53c39c09791fb8ff0cbfab000b950abc87541ff9e54723b726913a487cf5f164c8b82e609fd92dae7b14
 DIST aws-cli-1.36.17.gh.tar.gz 2849378 BLAKE2B 67e79717e6ad2cdc62f79fdc6ab370e091677fff4e3f2a7872fc0f49e49e53cc395c50a5fd7ed1c46481dcc4f9b4425651bf0c09adc9f769f039647c5b33f794 SHA512 82412802be0056eaa791f725579151dab2fedbf1c6bbf5461cdde016e0d8adc977ae1fb6796696d844706f92d3a4c4bb6424e7a0e7b5a0d7b0a0c2e0070b774f
-DIST aws-cli-1.36.18.gh.tar.gz 2849802 BLAKE2B c3986340d3772e9a76cdb34b39cefcb2fa5b9a784119d02f567ee8bf2b6e872e7ae4f3ec93f36322e6af91e0e8c0f3f24302fff3fa691e8f3902f246b840f802 SHA512 830e5288f3eaf9505cd2ead20bd44e4f59c876831b9a86198532554ea03a88ebd2ef060a196bad373fdf24c7eb3bb654a8322e43601843a1a1bca72d49e81870
+DIST aws-cli-1.36.22.gh.tar.gz 2853997 BLAKE2B a9f309c157595edd37e87834e7b67c16c04edb8f9f2381e8dd2335cc932b2071f7cfd24ca4abd16100ef1de21adb7f502af911d71c20459e0321a9375a49ec0e SHA512 05ee5d22f5f552ba0e7eaf4a1a88bcb3a2cb8db30315fdbf04d9c9c1c69b07ae3a8727e1dca1b154d9dad4bf89aa5950c0f369a965f92ec99f7e0251665f13eb
-DIST aws-cli-1.36.19.gh.tar.gz 2850770 BLAKE2B 0eabde9e9f355491fc5de2030b46d4cb568c1665ade8814357d295d6d8f3b1faf9ea68fc9ab3101c627630af5559e7ec6096771d84f865c9ec62f015554f6508 SHA512 40c1103011566f0363f6e9ceeb86d3610f6fc857401ae2167b690cb4e7bf50dc4169c864ac7899b4b29d6ec9cf39679f1e1dcdb8883b274b70beb4add9c170e0
-DIST aws-cli-1.36.20.gh.tar.gz 2851211 BLAKE2B a2ccd9fe5dda2e0f0135b4cd9bd87f33b880a3a6d4aadd234691705c84882b7315644e2efb519d8fc356abe638816f94b1e763ef116eb672f16e01f613cee42c SHA512 89237fda738a6b3fde9d412165554068c8882490b7a9ba3ae60226fb6f43d76ad8db894f9c39d9527294820bf36ed98d526f797901b9ca8a771669f65439cae8
-DIST aws-cli-1.36.21.gh.tar.gz 2852985 BLAKE2B 5e3571eedadd8c47a96408261f449df579e94062a99c8fbb6ebf57aedec2834dbb62230775968108c19dd6f28f09014c6d8fe1a70c1f89bb0ea53fb0ecf9f55c SHA512 5d325c7ec2e6e46311e9122cad69e8e566cf665e10fb8c74b1652e40c7c08bb8787a035748b23bdd42212efe18bd2069a433633126d1ce542ec4f4685ed3a83f
-DIST aws-cli-1.36.9.gh.tar.gz 2836018 BLAKE2B aada8a63f5bedd5aeeddd56fe18bb49ae1763ba5c737f72aa2f2e00b57fa4e1ab52ec266ca6883859ec633ec2b1658383426809870ba1372d86f9d8e0a055ac6 SHA512 ec47c26012027071732d60f9bd8b3322c1c75b2362dffe7affd8cd6d70732e6239bfbb6531759a247bcb2f29613a88b196d10f405302d25a05ada7968bd7574e

app-admin/awscli/awscli-1.36.12.ebuild

@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
 
 # botocore is x.(y-1).(z+59)
 BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) - 1)).$(( $(ver_cut 3-) + 59 ))"

app-admin/awscli/awscli-1.36.19.ebuild

@@ -1,95 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit bash-completion-r1 distutils-r1
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
-	https://github.com/aws/aws-cli/
-	https://pypi.org/project/awscli/
-"
-SRC_URI="
-	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-# botocore is x.(y-1).(z+59)
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) - 1)).$(( $(ver_cut 3-) + 59 ))"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local serial_tests=(
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
-		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
-		tests/unit/customizations/test_sessionmanager.py
-		tests/unit/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py
-		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	EPYTEST_XDIST= epytest "${serial_tests[@]}"
-
-	local EPYTEST_DESELECT=(
-		"${serial_tests[@]}"
-
-		# flaky (some ordering?)
-		tests/functional/s3/test_cp_command.py::TestCPCommand::test_multipart_upload_with_checksum_algorithm_crc32
-	)
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit}
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}

app-admin/awscli/awscli-1.36.20.ebuild

@@ -1,95 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit bash-completion-r1 distutils-r1
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
-	https://github.com/aws/aws-cli/
-	https://pypi.org/project/awscli/
-"
-SRC_URI="
-	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-# botocore is x.(y-1).(z+59)
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) - 1)).$(( $(ver_cut 3-) + 59 ))"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local serial_tests=(
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
-		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
-		tests/unit/customizations/test_sessionmanager.py
-		tests/unit/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py
-		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	EPYTEST_XDIST= epytest "${serial_tests[@]}"
-
-	local EPYTEST_DESELECT=(
-		"${serial_tests[@]}"
-
-		# flaky (some ordering?)
-		tests/functional/s3/test_cp_command.py::TestCPCommand::test_multipart_upload_with_checksum_algorithm_crc32
-	)
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit}
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}

app-admin/awscli/awscli-1.36.21.ebuild

@@ -1,95 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit bash-completion-r1 distutils-r1
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
-	https://github.com/aws/aws-cli/
-	https://pypi.org/project/awscli/
-"
-SRC_URI="
-	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-# botocore is x.(y-1).(z+59)
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) - 1)).$(( $(ver_cut 3-) + 59 ))"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local serial_tests=(
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
-		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
-		tests/unit/customizations/test_sessionmanager.py
-		tests/unit/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py
-		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	EPYTEST_XDIST= epytest "${serial_tests[@]}"
-
-	local EPYTEST_DESELECT=(
-		"${serial_tests[@]}"
-
-		# flaky (some ordering?)
-		tests/functional/s3/test_cp_command.py::TestCPCommand::test_multipart_upload_with_checksum_algorithm_crc32
-	)
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit}
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}

app-admin/awscli/awscli-1.36.9.ebuild

@@ -1,95 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit bash-completion-r1 distutils-r1
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
-	https://github.com/aws/aws-cli/
-	https://pypi.org/project/awscli/
-"
-SRC_URI="
-	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
-
-# botocore is x.(y-1).(z+59)
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) - 1)).$(( $(ver_cut 3-) + 59 ))"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local serial_tests=(
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
-		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
-		tests/unit/customizations/test_sessionmanager.py
-		tests/unit/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py
-		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	EPYTEST_XDIST= epytest "${serial_tests[@]}"
-
-	local EPYTEST_DESELECT=(
-		"${serial_tests[@]}"
-
-		# flaky (some ordering?)
-		tests/functional/s3/test_cp_command.py::TestCPCommand::test_multipart_upload_with_checksum_algorithm_crc32
-	)
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit}
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}

app-containers/docker-buildx/docker-buildx-0.14.0.ebuild

@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/docker/buildx.git"
 else
 	SRC_URI="https://github.com/docker/buildx/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
 

app-containers/incus/Manifest

@@ -1,6 +1,4 @@
 DIST incus-6.0.2.tar.xz 11197324 BLAKE2B fa15816ea05865ce48f7cb668c3138d2d186a1876669d6eaf05ffd335d8feedf7eda41301be9d2e07879aa3fb2e7177a5bd26cb89a3789d46ef648c2fcb06db5 SHA512 ef58bc22154204a3f89b973fd5289385fa98aa2c2a97b0ff3ed2fa2a0c899ee3dc08cb46552ade2e86dc13f5de55f9ef59aea775c60eb3df74d088f8a1e2795a
 DIST incus-6.0.2.tar.xz.asc 833 BLAKE2B bcdeb0d2a3684dcdcb620166865523a2e9eb595f0e7760f05a06ea0608dc4fc7111b75206fe62a63cfd90a0d0ec79206404994e53770d5e35a639a67e1ad753c SHA512 18587ddc7b7cb41418ee0e7a43875663e71c9d39a505fd55bc29fe83717b5d5cdc876c46912561610735ddf80462631716354a943a272ae5ccf0ee495aff1c1c
-DIST incus-6.6.tar.xz 11835124 BLAKE2B a21ada1f3a0eb571a896c86538873ec061293a3f7430a71a0edbc2a3f547b2ffb12095296c983b25c3285f81a13ce4c4d63c857615ddbbd8ac6a65b4a83f3976 SHA512 7d4d31702655ef5a7851a4058c04b89ade635e9196700bdd2845657c38dd5ba253f6da2a30f6dc60e4657ea1d04b08aeb7ea22842732507a558c9225eddfe007
-DIST incus-6.6.tar.xz.asc 833 BLAKE2B f59487815f87bfec1bb70342eb3463346bd0a25c8d980cc857095d8490ca45dc7785b0ea1bd7489064b08633de4cc710aa90823fdd22bb9dfd7ddfd9076b1d4c SHA512 69021d4a7827abfef370aeeaac0671e81902918d3b767468aaea54093214461e8cc23fbc8e4f83f957f5d4120d4969f0966c6312d250f2e7ce3373c603edf37a
 DIST incus-6.7.tar.xz 11313960 BLAKE2B c55ec6c584eeb6123d707b628ff27f96f6555ad5d17a720c55cc69cfb2abee9c6692544fba63ec2c63c5c8cb0d68baf0c9fadc2bb538dfce20362097fa3809ee SHA512 4b7e9af926d6132f63cbc53466d98691b2fb182a1900cf4ac5964df8678829da0241c4a468cfe3e49d448ecb25d2e8b1be0f52ac71c176a87d554fcd59ab5f97
 DIST incus-6.7.tar.xz.asc 833 BLAKE2B 6c72ca10f20f55607b1059bf908e4b36d81b499c2b6e329855c8769cafe9def44bf8cc6a320718150192daf6e820f6e42beb1b9e7a90f794b9c906734b0ba742 SHA512 dd6d55f8f3e8538f8050fce0124bbab1495978ad1ccee954a3d38cc1bb33c0a8f9f6a7f673e7e0942e9bc732a2acdbcb71245c110eb091ef0b53015ef05e9d74

app-containers/incus/incus-6.6.ebuild

@@ -1,216 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module linux-info optfeature systemd toolchain-funcs verify-sig
-
-DESCRIPTION="Modern, secure and powerful system container and virtual machine manager"
-HOMEPAGE="https://linuxcontainers.org/incus/introduction/ https://github.com/lxc/incus"
-SRC_URI="https://linuxcontainers.org/downloads/incus/${P}.tar.xz
-	verify-sig? ( https://linuxcontainers.org/downloads/incus/${P}.tar.xz.asc )"
-
-LICENSE="Apache-2.0 BSD LGPL-3 MIT"
-SLOT="0/stable"
-KEYWORDS="~amd64 ~arm64"
-IUSE="apparmor fuidshift nls"
-
-DEPEND="acct-group/incus
-	acct-group/incus-admin
-	app-arch/xz-utils
-	>=app-containers/lxc-5.0.0:=[apparmor?,seccomp(+)]
-	dev-db/sqlite:3
-	>=dev-libs/cowsql-1.15.6
-	dev-libs/lzo
-	>=dev-libs/raft-0.22.1:=[lz4]
-	>=dev-util/xdelta-3.0[lzma(+)]
-	net-dns/dnsmasq[dhcp]
-	sys-libs/libcap
-	virtual/udev"
-RDEPEND="${DEPEND}
-	fuidshift? ( !app-containers/lxd )
-	net-firewall/ebtables
-	net-firewall/iptables
-	sys-apps/iproute2
-	sys-fs/fuse:*
-	>=sys-fs/lxcfs-5.0.0
-	sys-fs/squashfs-tools[lzma]
-	virtual/acl"
-BDEPEND=">=dev-lang/go-1.21
-	nls? ( sys-devel/gettext )
-	verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
-
-CONFIG_CHECK="
-	~CGROUPS
-	~IPC_NS
-	~NET_NS
-	~PID_NS
-
-	~SECCOMP
-	~USER_NS
-	~UTS_NS
-
-	~KVM
-	~MACVTAP
-	~VHOST_VSOCK
-"
-
-ERROR_IPC_NS="CONFIG_IPC_NS is required."
-ERROR_NET_NS="CONFIG_NET_NS is required."
-ERROR_PID_NS="CONFIG_PID_NS is required."
-ERROR_SECCOMP="CONFIG_SECCOMP is required."
-ERROR_UTS_NS="CONFIG_UTS_NS is required."
-
-WARNING_KVM="CONFIG_KVM and CONFIG_KVM_AMD/-INTEL is required for virtual machines."
-WARNING_MACVTAP="CONFIG_MACVTAP is required for virtual machines."
-WARNING_VHOST_VSOCK="CONFIG_VHOST_VSOCK is required for virtual machines."
-
-# Go magic.
-QA_PREBUILT="/usr/bin/incus
-	/usr/bin/incus-agent
-	/usr/bin/incus-benchmark
-	/usr/bin/incus-migrate
-	/usr/bin/lxc-to-incus
-	/usr/sbin/fuidshift
-	/usr/sbin/incusd
-	/usr/sbin/lxd-to-incus"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/linuxcontainers.asc
-
-# The testsuite must be run as root.
-# make: *** [Makefile:156: check] Error 1
-RESTRICT="test"
-
-GOPATH="${S}/_dist"
-
-src_unpack() {
-	verify-sig_src_unpack
-	go-module_src_unpack
-}
-
-src_prepare() {
-	export GOPATH="${S}/_dist"
-
-	default
-
-	sed -i \
-		-e "s:\./configure:./configure --prefix=/usr --libdir=${EPREFIX}/usr/lib/incus:g" \
-		-e "s:make:make ${MAKEOPTS}:g" \
-		Makefile || die
-
-	sed -i \
-		-e "s:/usr/share/OVMF:/usr/share/edk2/OvmfX64:g" \
-		-e "s:OVMF_VARS.ms.fd:OVMF_VARS.fd:g" \
-		internal/server/instance/drivers/edk2/driver_edk2.go || die "Failed to fix hardcoded ovmf paths."
-
-	# Fix hardcoded virtfs-proxy-helper file path, see bug 798924
-	sed -i \
-		-e "s:/usr/lib/qemu/virtfs-proxy-helper:/usr/libexec/virtfs-proxy-helper:g" \
-		internal/server/device/device_utils_disk.go || die "Failed to fix virtfs-proxy-helper path."
-
-	cp "${FILESDIR}"/incus-0.4.service "${T}"/incus.service || die
-	if use apparmor; then
-		sed -i \
-			'/^EnvironmentFile=.*/a ExecStartPre=\/usr\/libexec\/lxc\/lxc-apparmor-load' \
-			"${T}"/incus.service || die
-	fi
-
-	# Disable -Werror's from go modules.
-	find "${S}" -name "cgo.go" -exec sed -i "s/ -Werror / /g" {} + || die
-}
-
-src_configure() { :; }
-
-src_compile() {
-	export GOPATH="${S}/_dist"
-	export CGO_LDFLAGS_ALLOW="-Wl,-z,now"
-
-	for k in incus-benchmark incus-simplestreams incus-user incus lxc-to-incus lxd-to-incus ; do
-		ego install -v -x "${S}/cmd/${k}"
-	done
-
-	if use fuidshift ; then
-		ego install -v -x "${S}/cmd/fuidshift"
-	fi
-
-	ego install -v -x -tags libsqlite3 "${S}"/cmd/incusd
-
-	# Needs to be built statically
-	CGO_ENABLED=0 go install -v -tags netgo "${S}"/cmd/incus-migrate
-	CGO_ENABLED=0 go install -v -tags agent,netgo "${S}"/cmd/incus-agent
-
-	use nls && emake build-mo
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	export GOPATH="${S}/_dist"
-
-	if tc-is-cross-compiler ; then
-		local bindir="_dist/bin/linux_${GOARCH}"
-	else
-		local bindir="_dist/bin"
-	fi
-
-	newsbin "${FILESDIR}"/incus-startup-0.4.sh incus-startup
-
-	# Admin tools
-	for l in incusd incus-user lxd-to-incus ; do
-		dosbin ${bindir}/${l}
-	done
-
-	# User tools
-	for m in incus-agent incus-benchmark incus-migrate incus-simplestreams incus lxc-to-incus ; do
-		dobin ${bindir}/${m}
-	done
-
-	# fuidshift, should be moved under admin tools at some point
-	if use fuidshift ; then
-		dosbin ${bindir}/fuidshift
-	fi
-
-	newconfd "${FILESDIR}"/incus-6.0.confd incus
-	newinitd "${FILESDIR}"/incus-6.0.initd incus
-	newinitd "${FILESDIR}"/incus-user-0.4.initd incus-user
-
-	systemd_dounit "${T}"/incus.service
-	systemd_newunit "${FILESDIR}"/incus-0.4.socket incus.socket
-	systemd_newunit "${FILESDIR}"/incus-startup-0.4.service incus-startup.service
-	systemd_newunit "${FILESDIR}"/incus-user-0.4.service incus-user.service
-	systemd_newunit "${FILESDIR}"/incus-user-0.4.socket incus-user.socket
-
-	if ! tc-is-cross-compiler; then
-		# Generate and install shell completion files.
-		mkdir -p "${D}"/usr/share/{bash-completion/completions/,fish/vendor_completions.d/,zsh/site-functions/} || die
-		"${bindir}"/incus completion bash > "${D}"/usr/share/bash-completion/completions/incus || die
-		"${bindir}"/incus completion fish > "${D}"/usr/share/fish/vendor_completions.d/incus.fish || die
-		"${bindir}"/incus completion zsh > "${D}"/usr/share/zsh/site-functions/_incus || die
-	else
-		ewarn "Shell completion files not installed! Install them manually with incus completion --help"
-	fi
-
-	dodoc AUTHORS
-	dodoc -r doc/*
-	use nls && domo po/*.mo
-}
-
-pkg_postinst() {
-	elog
-	elog "Please see"
-	elog "  https://wiki.gentoo.org/wiki/Incus"
-	elog "  https://wiki.gentoo.org/wiki/Incus#Migrating_from_LXD"
-	elog
-	optfeature "virtual machine support" app-cdr/cdrtools app-emulation/qemu[spice,usbredir,virtfs]
-	optfeature "OCI container images support" app-containers/skopeo app-containers/umoci
-	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
-}

app-doc/python-docs/python-docs-3.12.8.ebuild

@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
 
 src_install() {
 	rm -r _sources || die

app-emacs/emacs-common/Manifest

@@ -1,2 +1 @@
 DIST emacs-common-1.10.tar.xz 61800 BLAKE2B 9dd25f45bf0db308417a6c35d87e3b8c6a7dd2f11de57ab2e6fcf81646aa5d5b54b76a78142de0e175df3ba4dce4f404f4774cb0a0d64c41e484de4ea4da6e6a SHA512 a9a9142394261b34ba625e48eaac489f713cef52df3ca801c2445759bf27d6335b4e7162305f314203d3efcd89f6e65a635595ffc0ad6e6082b735c5f8283b82
-DIST emacs-common-1.9.tar.xz 61812 BLAKE2B 6a87dae71120c2b41a4918dc788f7baa161eb0cc2b895a39e721330a6151a888cd9d930f93ac840557d3766847a7eb5ff8907d2fdde2c897a296887c0a5cf8c2 SHA512 b2e2df57a83548aeb7f7271a7d0b9ca27086d0c0ec80b6aa354016938ece70e8d9058214e7a813ec491bd67a61df8afbe4b55081b68a109ce527ba6cdba7e891

app-emacs/emacs-common/emacs-common-1.10.ebuild

@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit elisp-common desktop gnome2-utils readme.gentoo-r1
+inherit elisp-common desktop eapi9-pipestatus gnome2-utils readme.gentoo-r1
 
 DESCRIPTION="Common files needed by all GNU Emacs versions"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
@@ -22,7 +22,7 @@ IDEPEND="gui? ( gsettings? ( dev-libs/glib ) )"
 src_install() {
 	insinto "${SITELISP}"
 	sed -e "s:@libdir@:$(get_libdir):g" subdirs.el.in | newins - subdirs.el
-	assert
+	pipestatus || die
 	newins site-gentoo.el{,.orig}
 
 	keepdir /etc/emacs

app-emacs/emacs-common/emacs-common-1.9.ebuild

@@ -1,111 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp-common desktop gnome2-utils xdg-utils readme.gentoo-r1
-
-DESCRIPTION="Common files needed by all GNU Emacs versions"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
-SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="games gsettings gui"
-
-DEPEND="games? ( acct-group/gamestat )"
-RDEPEND="${DEPEND}"
-PDEPEND=">=app-editors/emacs-23.1:*"
-IDEPEND="gui? ( gsettings? ( dev-libs/glib ) )"
-
-src_install() {
-	insinto "${SITELISP}"
-	sed -e "s:@libdir@:$(get_libdir):g" subdirs.el.in | newins - subdirs.el
-	assert
-	newins site-gentoo.el{,.orig}
-
-	keepdir /etc/emacs
-	insinto /etc/emacs
-	doins site-start.el
-
-	if use games; then
-		keepdir /var/games/emacs
-		fowners 0:gamestat /var/games/emacs
-		fperms g+w /var/games/emacs
-	fi
-
-	if use gui; then
-		local i
-		domenu emacs.desktop emacsclient.desktop
-
-		pushd icons || die
-		newicon sink.png emacs-sink.png
-		newicon emacs25_48.png emacs.png
-		for i in 16 24 32 48 128; do
-			[[ ${i} -le 48 ]] && newicon -s ${i} emacs22_${i}.png emacs22.png
-			newicon -s ${i} emacs23_${i}.png emacs23.png
-			newicon -s ${i} emacs25_${i}.png emacs.png
-		done
-		doicon -s scalable emacs23.svg
-		newicon -s scalable emacs25.svg emacs.svg
-		popd
-
-		if use gsettings; then
-			insinto /usr/share/glib-2.0/schemas
-			doins org.gnu.emacs.defaults.gschema.xml
-		fi
-	fi
-
-	DOC_CONTENTS="All site initialisation for Gentoo-installed packages is
-		added to ${SITELISP}/site-gentoo.el. In order for this site
-		initialisation to be loaded for all users automatically, a default
-		site startup file /etc/emacs/site-start.el is installed. You are
-		responsible for maintenance of this file.
-		\n\nAlternatively, individual users can add the following command:
-		\n\n(require 'site-gentoo)
-		\n\nto their ~/.emacs initialisation files, or, for greater
-		flexibility, users may load single package-specific initialisation
-		files from the ${SITELISP}/site-gentoo.d/ directory."
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# make sure that site-gentoo.el exists since site-start.el requires it
-	if [[ ! -f ${ED}${SITELISP}/site-gentoo.el ]]; then		#554518
-		mv "${ED}${SITELISP}"/site-gentoo.el{.orig,} || die
-	fi
-	if [[ -d ${EROOT}${SITELISP} ]]; then
-		elisp-site-regen
-		cp "${EROOT}${SITELISP}/site-gentoo.el" "${ED}${SITELISP}/" || die
-	fi
-
-	if use games; then
-		local f
-		for f in /var/games/emacs/{snake,tetris}-scores; do
-			if [[ -e ${EROOT}${f} ]]; then
-				cp "${EROOT}${f}" "${ED}${f}" || die
-			fi
-			touch "${ED}${f}" || die
-			chgrp gamestat "${ED}${f}" || die
-			chmod g+w "${ED}${f}" || die
-		done
-	fi
-}
-
-pkg_postinst() {
-	if use gui; then
-		xdg_desktop_database_update
-		xdg_icon_cache_update
-		use gsettings && gnome2_schemas_update
-	fi
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	if use gui; then
-		xdg_desktop_database_update
-		xdg_icon_cache_update
-		use gsettings && gnome2_schemas_update
-	fi
-}

app-emacs/nxml-gentoo-schemas/Manifest

@@ -1,2 +1 @@
-DIST nxml-gentoo-schemas-20241031.tar.xz 8996 BLAKE2B 9ea6eae66a8d4f23f50307b43824b0276719cadc4484f216b5859f70571d7b7912b4d7443cc6bc97fcd8525906901caadff54a9704c2f8571a5f991907ff185a SHA512 5419e207c37d5759ab8be2dc0f5b607410d9f6a244bc44759319af3678f199ba159a158a62813138bf82bc2098583f949f706c45fc48a6c4de7767bbb0da70a2
 DIST nxml-gentoo-schemas-20241116.tar.xz 8816 BLAKE2B f334655d695d0555311c89357ec798b9f803da2cef3483f5e305deb5890097c990ebe4cc87c1dd9f4ffc56b2c739ac70702a43f19f61b6cc5c6d50f5ccc41321 SHA512 d47210e980279f615646a3ffd970784578d7b0428eb312b11390b6a094242dcfb4b5e4ba1a3e89812394d309575490912c2b9020d70d12e97df26fe8d886f4ab

app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20241031.ebuild

@@ -1,24 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp
-
-DESCRIPTION="Extension for nxml-mode with Gentoo-specific schemas"
-HOMEPAGE="https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/"
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
-
-LICENSE="MIT GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~x64-macos"
-
-SITEFILE="60${PN}-gentoo.el"
-
-src_compile() { :; }
-
-src_install() {
-	insinto "${SITEETC}/${PN}"
-	doins schemas.xml *.rnc
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-}

app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20241116.ebuild

@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
 
 LICENSE="MIT GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 SITEFILE="60${PN}-gentoo.el"
 

app-emacs/spacemacs-theme/spacemacs-theme-0.3_p20241101.ebuild

@@ -19,7 +19,7 @@ else
 		-> ${P}.gh.tar.gz"
 	S="${WORKDIR}/${PN}-${COMMIT}"
 
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="GPL-3+"

app-emulation/vkd3d/vkd3d-1.14.ebuild

@@ -21,7 +21,7 @@ SRC_URI="https://dl.winehq.org/vkd3d/source/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="ncurses spirv-tools"
 RESTRICT="test" #838655
 

app-i18n/ibus-hangul/files/ibus-hangul-1.5.4-gcc14-fix.patch

@@ -0,0 +1,12 @@
+Bug: https://bugs.gentoo.org/924488
+--- a/tests/ibus-hangul.c
++++ b/tests/ibus-hangul.c
+@@ -261,7 +261,7 @@ create_window ()
+                       G_CALLBACK (window_inserted_text_cb), entry);
+     gtk_container_add (GTK_CONTAINER (window), entry);
+     gtk_widget_show_all (window);
+-    gtk_window_present (window);
++    gtk_window_present (GTK_WINDOW(window));
+ }
+ 
+ static void

app-i18n/ibus-hangul/files/ibus-hangul-test.patch

@@ -4,7 +4,7 @@
                        G_CALLBACK (window_inserted_text_cb), entry);
      gtk_container_add (GTK_CONTAINER (window), entry);
      gtk_widget_show_all (window);
-+    gtk_window_present (window);
++    gtk_window_present (GTK_WINDOW(window));
  }
  
  static void

app-i18n/ibus-hangul/ibus-hangul-1.5.4-r1.ebuild

@@ -0,0 +1,63 @@
+# 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-utils python-single-r1 xdg virtualx
+
+DESCRIPTION="Korean Hangul engine for IBus"
+HOMEPAGE="https://github.com/libhangul/ibus-hangul/wiki"
+SRC_URI="https://github.com/libhangul/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		app-i18n/ibus[python(+),${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	')
+	>=app-i18n/libhangul-0.1
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-test.patch
+	"${FILESDIR}"/${PN}-1.5.4-gcc14-fix.patch
+)
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		--with-python=${EPYTHON}
+}
+
+src_test() {
+	"${BROOT}"${GLIB_COMPILE_SCHEMAS} --allow-any-name "${S}"/data || die
+
+	export GSETTINGS_BACKEND="memory"
+	export GSETTINGS_SCHEMA_DIR="${S}/data"
+	virtx default
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}

app-i18n/ibus-hangul/ibus-hangul-1.5.4.ebuild

@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 
 inherit gnome2-utils python-single-r1 xdg virtualx
 

app-i18n/ibus-hangul/ibus-hangul-1.5.5.ebuild

@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit autotools gnome2-utils python-single-r1 xdg virtualx
 

app-i18n/poedit/poedit-3.5.2.ebuild

@@ -15,7 +15,7 @@ SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}-oss/${P}.tar.
 LICENSE="MIT"
 SLOT="0"
 
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 
 RDEPEND="
 	app-text/gtkspell:3

app-i18n/rime-data/Manifest

@@ -1,20 +1,41 @@
 DIST rime-array-1.0.20240624.tar.gz 1721033 BLAKE2B 5bce47a0d78252a43934c4a4af83df7a8323af40411a765369aedac5bcb0da8f290e3a236b821aee33681a8ce89794586e9252a683f3ab2e25ea9459693319f1 SHA512 9999ec3bd3865c1a9d4bb35ba195bdd9dd3317701b3c693359faa67fdf41b0a1dc827124ec25b6f12b4281e155bad874a75d25cf67c52f33fecc5d8f426970ce
+DIST rime-array-1.0.20241201.tar.gz 1721033 BLAKE2B 5bce47a0d78252a43934c4a4af83df7a8323af40411a765369aedac5bcb0da8f290e3a236b821aee33681a8ce89794586e9252a683f3ab2e25ea9459693319f1 SHA512 9999ec3bd3865c1a9d4bb35ba195bdd9dd3317701b3c693359faa67fdf41b0a1dc827124ec25b6f12b4281e155bad874a75d25cf67c52f33fecc5d8f426970ce
 DIST rime-bopomofo-1.0.20240624.tar.gz 5985 BLAKE2B 01b43029f35a392e363bbf60e0708651122dc14f2aaf6c103292e571a06ebdd804fc3097e0b0f874b66efadeff6c0d521a7ee3c640111b6054e318eeb6d84ae7 SHA512 106a2897ac409b12e5a9aee35bed31e6bd76e4c2cb5caed5d201e03891b316fe42e279c72e5a3b06fe575ea2e897903986fcab9401933b7dfc4d47064be01bce
+DIST rime-bopomofo-1.0.20241201.tar.gz 5985 BLAKE2B 01b43029f35a392e363bbf60e0708651122dc14f2aaf6c103292e571a06ebdd804fc3097e0b0f874b66efadeff6c0d521a7ee3c640111b6054e318eeb6d84ae7 SHA512 106a2897ac409b12e5a9aee35bed31e6bd76e4c2cb5caed5d201e03891b316fe42e279c72e5a3b06fe575ea2e897903986fcab9401933b7dfc4d47064be01bce
 DIST rime-cangjie-1.0.20240624.tar.gz 392488 BLAKE2B 8c8ed40265e20793571b1c615134d293295fddd17ce48df9054d61b36b3a572d7546dbc5368f9f63efae73bf3572f9f2e9cad447b16eb2d3fd207e931e0c703d SHA512 b56c1363413fe6579cac994c0a2c12d75fe9efb842c4536a0962f64bb197009ab1f5071a204a2bc7983d0e06ecd6934e4db72a157a2cda76294b98d304715cad
+DIST rime-cangjie-1.0.20241201.tar.gz 392488 BLAKE2B 8c8ed40265e20793571b1c615134d293295fddd17ce48df9054d61b36b3a572d7546dbc5368f9f63efae73bf3572f9f2e9cad447b16eb2d3fd207e931e0c703d SHA512 b56c1363413fe6579cac994c0a2c12d75fe9efb842c4536a0962f64bb197009ab1f5071a204a2bc7983d0e06ecd6934e4db72a157a2cda76294b98d304715cad
+DIST rime-cantonese-1.0.20241201.tar.gz 4809139 BLAKE2B 6d03de0d209ecce49e9335d22bea7323af0b08bf6828966351c40eabd120d2ff5a2d7ad3c184388a2fc760411ac74b782f370f147fd9def1c75a82a50f16755f SHA512 677c6f4762838684bf037f0b6fcbeedbb24f62a4d86687f1379753fd9b65a227d5191e4458d58cff8bab71fe8790dc1a4d5276ab2523628502ed93fa5aa00f71
 DIST rime-combo-pinyin-1.0.20240624.tar.gz 21271 BLAKE2B 64d408746abd7e9055a063c02488333c4e725238c58417a1332520aa04eaa2cae286dcea46ef3547335039ee92ee109c89c050cc1317610ecb0e045de390014d SHA512 bd446c27c63701657e6277930292bcc5cea210a5a42bb5802abd0b7fbc8043c87fc7eaf8c2d2c23838516aa6de5ddfb3fd0257b49a47d2dc8de263b2bc076429
+DIST rime-combo-pinyin-1.0.20241201.tar.gz 23075 BLAKE2B b3e874e5c45ca0b15f2b7068f16eb5b1532da785a366224c6a133e2bcba04db5f2a4676c82fb4d681c769501bddd8a012843dafbdc3a86baa898b2ad36fa352c SHA512 beb8a99826587d11b3ba3c49a554922d8fb4a71ee4df641a284b513a97c5e393fdb99186e82594aed3dff3162f26a288fbf994648fa2dcfbe365226fcde34e9b
 DIST rime-double-pinyin-1.0.20240624.tar.gz 16998 BLAKE2B c8c93eee98e896d69e5b677a8eb38979e74ab8bbefdf705aa2ab9afd8f30bea3a3156dab994e95a33313e7fc4e2af4a25b7eade32c8f8bb009f7c955e1215e2a SHA512 2ab98a7b804b2fa3d0a59fd0b9a8b79316caa3a2da070766359d550d1d56edf85d55874044409780a2a21d729a2a7e834fdcf9419eb0d34252acbdef304a5c40
+DIST rime-double-pinyin-1.0.20241201.tar.gz 16998 BLAKE2B c8c93eee98e896d69e5b677a8eb38979e74ab8bbefdf705aa2ab9afd8f30bea3a3156dab994e95a33313e7fc4e2af4a25b7eade32c8f8bb009f7c955e1215e2a SHA512 2ab98a7b804b2fa3d0a59fd0b9a8b79316caa3a2da070766359d550d1d56edf85d55874044409780a2a21d729a2a7e834fdcf9419eb0d34252acbdef304a5c40
 DIST rime-emoji-1.0.20240624.tar.gz 50946 BLAKE2B 00626480f5acbd8144fafbf3a6ece3e90f564da0d84d08f450dffce23444fb15985d0821e84a67946503b1532c418ac6f525d299d17ffaddb62cd4bfb1de91ff SHA512 b4fb707c964a421186fd8d46b6f676590dcc3d176fb308d360dc9ddb3fb1e8dd52bd2b7efb3378b3723d9f00adefb5918f6bec6925c7e2b43d46e4c9ebc9374a
+DIST rime-emoji-1.0.20241201.tar.gz 50946 BLAKE2B 91a96e7b4913ef2a380c1e98fc77b5289094f4efafa31fab1e64f5fc5a22082f89ebb27953e1cc1b84dfd8d9d97c92e6412560bc513a0eaa2ca72d787da89ac8 SHA512 b4785f4909e270a0cc40a2706a20ac9193358f901cba48bb4c3f5e0dcf67688e18e99101aa7e5945e73e5c9b73c71113216c2c91ad5d6eab1885943c6ca7f839
 DIST rime-essay-1.0.20240624.tar.gz 1772231 BLAKE2B 0dad76ef2474ba1cee66b7eea758fef9226c3f9748a15f58f5c8ac4d9224fab8558e1a4c0efc892f5de16293f79adef056af8b19bc239b3cd8e8fc43b9bbedf5 SHA512 6f12f9adcca6a19ff38731d65c81d40a2aba5ad11c3794992d71e7ee985d7554637204abd340dab868a44a9c2f0290fc13fb9e6eba5d2f14200eaf8e84f27936
+DIST rime-essay-1.0.20241201.tar.gz 1772231 BLAKE2B 0dad76ef2474ba1cee66b7eea758fef9226c3f9748a15f58f5c8ac4d9224fab8558e1a4c0efc892f5de16293f79adef056af8b19bc239b3cd8e8fc43b9bbedf5 SHA512 6f12f9adcca6a19ff38731d65c81d40a2aba5ad11c3794992d71e7ee985d7554637204abd340dab868a44a9c2f0290fc13fb9e6eba5d2f14200eaf8e84f27936
 DIST rime-ipa-1.0.20240624.tar.gz 9510 BLAKE2B e271911cb4d066ff4b7813be062f9778bb04469b15268bdc93530f664a75ee723007ba806772092fd30302fea7a610b879b2a0598ec424a90d4c14e446a0ba87 SHA512 06cd5fb467e6694458bd67505fac7a496c490e9aabf8ad92ec881ac354e63dfaf2f9a4dd216960b260d62183cade49d267444ac340466ef03ce2ab7a9646b9f1
+DIST rime-ipa-1.0.20241201.tar.gz 9510 BLAKE2B e271911cb4d066ff4b7813be062f9778bb04469b15268bdc93530f664a75ee723007ba806772092fd30302fea7a610b879b2a0598ec424a90d4c14e446a0ba87 SHA512 06cd5fb467e6694458bd67505fac7a496c490e9aabf8ad92ec881ac354e63dfaf2f9a4dd216960b260d62183cade49d267444ac340466ef03ce2ab7a9646b9f1
 DIST rime-luna-pinyin-1.0.20240624.tar.gz 395899 BLAKE2B 8c165f6e3537481ef4c913babd6264ac4d6e90cbd4f80380a3f91f5438061569fd6d3f8b77bed0caace4e537e176c000c61e41c6bcfb0d6654c1e81b8d6d3aa3 SHA512 504e218d1e29df04de991afeedb2811fd27989438c9bfb9b404daa6a82834df7071a646fc91c3dec42f9992a2f4ae7dc0fe5acf4499b3a75185f3cd36a1695b2
+DIST rime-luna-pinyin-1.0.20241201.tar.gz 395822 BLAKE2B 318e7fe427198777dc2afa402a135251e65f0cc3cb32519047b7e09408bb18693682ee6483de6f7271aeafb8298f620852d8de352c2d61fa3f4fedede804d6d0 SHA512 da22da589928544d68132aa0075b711bb96776278e3c4c78e732df6f9b9ee7b410105a364011988570077dac9df01fa94c4e0706c7693121546b1140ab0197fa
 DIST rime-middle-chinese-1.0.20240624.tar.gz 137940 BLAKE2B 72e8a0b19a432505a68bfae4d72b657216e5ddb3361a756b6b2eabde6d94c0c863a635c2bcbcca446b6363361e2add93c04dbdc161368aae75d749aa35a47506 SHA512 dabcf2683e54dcf44e6ce7a89da6b1d808a210ca20fbe131f793bb0c9d51213c3514f231b944adf4495aa8fe2a43d7ae984d83dc90fa49a0e4bd6279df9cd009
+DIST rime-middle-chinese-1.0.20241201.tar.gz 137940 BLAKE2B 72e8a0b19a432505a68bfae4d72b657216e5ddb3361a756b6b2eabde6d94c0c863a635c2bcbcca446b6363361e2add93c04dbdc161368aae75d749aa35a47506 SHA512 dabcf2683e54dcf44e6ce7a89da6b1d808a210ca20fbe131f793bb0c9d51213c3514f231b944adf4495aa8fe2a43d7ae984d83dc90fa49a0e4bd6279df9cd009
 DIST rime-pinyin-simp-1.0.20240624.tar.gz 545339 BLAKE2B cf428ed593db51ca9d8274293f8011229f60df41dfccaaaf01bdc0d41dfb7108c06570cb589577e5ad335ec2836ffa9cc60ef4d21e4871ec9c64e77b4cd9fb06 SHA512 4b89f9f3edd79b1220b77731eac99cf90c3496a8a09bc816ba0a40eaaae8743bd817d908492aa9ffde768b65d24a488cda558a8c8c7aa355754909420be2eead
+DIST rime-pinyin-simp-1.0.20241201.tar.gz 545333 BLAKE2B 96849699c1a498cdb0d8d912f6e516feae3e393e31ee201b04bd5e8ea0bfdee53bd8bce6ed2a65310fa5e67f4075e6d9c285e9227a1a845945eaf576fc5d379a SHA512 f9cf5f15a2e401b5a644a9b15233d8e2bf0503f030858dab32ba1696b57ffd970a1fad6aceeb505635ec35bb0678682b64ff2eab0f2804e1c38d9fccad815975
 DIST rime-prelude-1.0.20240624.tar.gz 18313 BLAKE2B 09e926f77abc5a4fcc55d6f6f27f1b8b2e1a69317d8cb4a2656eecd416c1b7139a0de65d7eea30afaf342566753daa2be0c88104cf2c05d78cb26d0b567c9f04 SHA512 0cf701db3ca87ed15022428ba516d939cd10d4b97cb6d4ecdafaec70399c60f9d58a4f8b96e8fb8159534514bbf4e3b2206ec0cfac094d8039c0040ce79dc093
+DIST rime-prelude-1.0.20241201.tar.gz 18313 BLAKE2B 09e926f77abc5a4fcc55d6f6f27f1b8b2e1a69317d8cb4a2656eecd416c1b7139a0de65d7eea30afaf342566753daa2be0c88104cf2c05d78cb26d0b567c9f04 SHA512 0cf701db3ca87ed15022428ba516d939cd10d4b97cb6d4ecdafaec70399c60f9d58a4f8b96e8fb8159534514bbf4e3b2206ec0cfac094d8039c0040ce79dc093
 DIST rime-quick-1.0.20240624.tar.gz 151060 BLAKE2B 80adf8a416969d5623400b06721e5bb4dc0a972d0a0ef09e10bbb2c6dfbb7d92c89503b60d59413e425cbb097f0c2d00cbdd932372c7c664846cc8e48958c632 SHA512 d693b90b76cf3dc72e84bb378e3b1a35850bed9edec45bfb321bf800561bd03fdf34ea41bc7ca8da53b02579de111da394a6aa4493989a4a4bde2eb0e2d7d485
+DIST rime-quick-1.0.20241201.tar.gz 151060 BLAKE2B 80adf8a416969d5623400b06721e5bb4dc0a972d0a0ef09e10bbb2c6dfbb7d92c89503b60d59413e425cbb097f0c2d00cbdd932372c7c664846cc8e48958c632 SHA512 d693b90b76cf3dc72e84bb378e3b1a35850bed9edec45bfb321bf800561bd03fdf34ea41bc7ca8da53b02579de111da394a6aa4493989a4a4bde2eb0e2d7d485
 DIST rime-scj-1.0.20240624.tar.gz 228601 BLAKE2B ca68ce8b08edc4c1cb5dae0d3f50a4a66adb9dd6dea49260ef4b0f14b16cb0b7b6555c89de1d332a68f8641c031ada602ebc4946851ff141b14f0fdf41f6d364 SHA512 396e8c1cb0679078afaced1bb8525446340bda02bbcc42e48ccc2414b1830439a2599e8ea2a4ae15b47fd9f488ba52eec342596f1c5efa074955f274cf69728d
+DIST rime-scj-1.0.20241201.tar.gz 228601 BLAKE2B ca68ce8b08edc4c1cb5dae0d3f50a4a66adb9dd6dea49260ef4b0f14b16cb0b7b6555c89de1d332a68f8641c031ada602ebc4946851ff141b14f0fdf41f6d364 SHA512 396e8c1cb0679078afaced1bb8525446340bda02bbcc42e48ccc2414b1830439a2599e8ea2a4ae15b47fd9f488ba52eec342596f1c5efa074955f274cf69728d
 DIST rime-soutzoe-1.0.20240624.tar.gz 37388 BLAKE2B 2eaecd629ae4b00b9ecb73eb58a77bd123906c45fa71318aa0468caefca3aa151181be7766cccc81a6aba260def897a7c58032257a517443c3da3dba91cb6996 SHA512 5141fe76deffe40a22e2c3013d6f4b47e6e65c6f652b85aa0401612a78384430f78e1031d894a735903ece9d8e319b836c9388edd05a0593f23d7961bea92a04
+DIST rime-soutzoe-1.0.20241201.tar.gz 37388 BLAKE2B 2eaecd629ae4b00b9ecb73eb58a77bd123906c45fa71318aa0468caefca3aa151181be7766cccc81a6aba260def897a7c58032257a517443c3da3dba91cb6996 SHA512 5141fe76deffe40a22e2c3013d6f4b47e6e65c6f652b85aa0401612a78384430f78e1031d894a735903ece9d8e319b836c9388edd05a0593f23d7961bea92a04
 DIST rime-stenotype-1.0.20240624.tar.gz 15311 BLAKE2B edfc0989e9a86b7664b5316270fafb2f8c3f45af6ad757a1ad89d30ce4b93aa8cb20c86f62692adabdcbd33bce67022ecaf3e1bc34ffddd2ea0b497dca9ba2c3 SHA512 4c01a70348e0e28b0b0e33f605e22e6017c9870f4e218fcc1fe36c2d480796461b3f74edb7501d78bebbaa9b05f62524c792b10c3ac42d89f39ed6a99b1426c2
+DIST rime-stenotype-1.0.20241201.tar.gz 15311 BLAKE2B edfc0989e9a86b7664b5316270fafb2f8c3f45af6ad757a1ad89d30ce4b93aa8cb20c86f62692adabdcbd33bce67022ecaf3e1bc34ffddd2ea0b497dca9ba2c3 SHA512 4c01a70348e0e28b0b0e33f605e22e6017c9870f4e218fcc1fe36c2d480796461b3f74edb7501d78bebbaa9b05f62524c792b10c3ac42d89f39ed6a99b1426c2
 DIST rime-stroke-1.0.20240624.tar.gz 707495 BLAKE2B cc1a2f2d9621646d8c0000e015321549903d2e5bd14a37a2a078d84b0ee5e1ea022d0a006bb171c14ee77e7df3930f455715c179e9ae6301784926d86385c096 SHA512 b7d6c5a621a6c6a416da90a0bbce8d221f49be38b2d4ad7e8a0b32689129123b637256810a4f829f6cfac9c427c8b255e3983dbce6e8c1fe6be610ad2494374a
+DIST rime-stroke-1.0.20241201.tar.gz 707495 BLAKE2B cc1a2f2d9621646d8c0000e015321549903d2e5bd14a37a2a078d84b0ee5e1ea022d0a006bb171c14ee77e7df3930f455715c179e9ae6301784926d86385c096 SHA512 b7d6c5a621a6c6a416da90a0bbce8d221f49be38b2d4ad7e8a0b32689129123b637256810a4f829f6cfac9c427c8b255e3983dbce6e8c1fe6be610ad2494374a
 DIST rime-terra-pinyin-1.0.20240624.tar.gz 731136 BLAKE2B dee4c46d997d4af3be9bc9474bf932511bc5790e46c888c5d25a0a48a64fc06eeccb6b6e370e7732875b00360669c441222aa0bc17c74428e4186880f8603454 SHA512 5d79f299c8f5c98c0f33bd045f46aa3fc883407a23df0c0c4db14081a238c09b49b9e23d2cf9faf194c138d77b79702ce84e3e0f3a4996cf230b5c2a87d368de
+DIST rime-terra-pinyin-1.0.20241201.tar.gz 731136 BLAKE2B dee4c46d997d4af3be9bc9474bf932511bc5790e46c888c5d25a0a48a64fc06eeccb6b6e370e7732875b00360669c441222aa0bc17c74428e4186880f8603454 SHA512 5d79f299c8f5c98c0f33bd045f46aa3fc883407a23df0c0c4db14081a238c09b49b9e23d2cf9faf194c138d77b79702ce84e3e0f3a4996cf230b5c2a87d368de
 DIST rime-wubi-1.0.20240624.tar.gz 1093293 BLAKE2B ae3551bb51824e6c4fea52a18793acf477b48b827df24ad16b24fd5265d2567a35c70f4b09082247fcce5de6f7433fc19bcf3e43f2adf2683aeac658f9f13beb SHA512 f535a15f1a52b7173b42d72fec58cbb68887be590cee1a2a6b1d883dec377d61cf17ece68f0c400dec26b55fd0ac2744d0fb835d8c9129245ddc985fa256ebb8
+DIST rime-wubi-1.0.20241201.tar.gz 1093293 BLAKE2B ae3551bb51824e6c4fea52a18793acf477b48b827df24ad16b24fd5265d2567a35c70f4b09082247fcce5de6f7433fc19bcf3e43f2adf2683aeac658f9f13beb SHA512 f535a15f1a52b7173b42d72fec58cbb68887be590cee1a2a6b1d883dec377d61cf17ece68f0c400dec26b55fd0ac2744d0fb835d8c9129245ddc985fa256ebb8
 DIST rime-wugniu-1.0.20240624.tar.gz 268955 BLAKE2B c1dc03f1e27716ee4725e031c570a67da3f2543ec760d624f19e0f40cb44089ddedd10ee226dfe4211d8f7b29c0c66db640f41794dbf09c5543f669ae132715f SHA512 257d4bd8d62dda5bce4beb39879fc46b4981590ce16d347ad3e2441f1b9bacabfe3772d8e0cf134a4a70b7dd5490e6bb6b6526e0e45d58d22730217e23407095
+DIST rime-wugniu-1.0.20241201.tar.gz 268955 BLAKE2B c1dc03f1e27716ee4725e031c570a67da3f2543ec760d624f19e0f40cb44089ddedd10ee226dfe4211d8f7b29c0c66db640f41794dbf09c5543f669ae132715f SHA512 257d4bd8d62dda5bce4beb39879fc46b4981590ce16d347ad3e2441f1b9bacabfe3772d8e0cf134a4a70b7dd5490e6bb6b6526e0e45d58d22730217e23407095

app-i18n/rime-data/rime-data-1.0.20241201-r1.ebuild

@@ -0,0 +1,84 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+declare -A PKGS=(
+	[rime-essay]=e0519d0579722a0871efb68189272cba61a7350b
+	[rime-bopomofo]=c7618f4f5728e1634417e9d02ea50d82b71956ab
+	[rime-cangjie]=0ac8452eeb4abbcd8dd1f9e7314012310743285f
+	[rime-luna-pinyin]=0418e912d023c2325598b53b8cdfbefb049d6130
+	[rime-prelude]=3803f09458072e03b9ed396692ce7e1d35c88c95
+	[rime-stroke]=65fdbbf2f9485cc907cb9a6d6b9210938a50f71e
+	[rime-terra-pinyin]=9df66c7edc9474a945e9f4744419b156278d1580
+)
+declare -A PKGS_EXTRA=(
+	[rime-array]=557dbe38381de174fe96e53e9bf8c863a275307c
+	[rime-cantonese]=2014519280672d2f03e342656c2574019eddfe67
+	[rime-combo-pinyin]=fe97c4a3673e131540e534bb43c4323a24bd514f
+	[rime-double-pinyin]=69bf85d4dfe8bac139c36abbd68d530b8b6622ea
+	[rime-emoji]=ca7df5f5498ccd99cc312413ceae7d13717456b8
+	[rime-ipa]=22b71710e029bcb412e9197192a638ab11bc2abf
+	[rime-middle-chinese]=582e144e525525ac2b6c2498097d7c7919e84174
+	[rime-pinyin-simp]=c0b1cc5553caed77e1338adc08d6dc048c50c813
+	[rime-quick]=3fe5911ba608cb2df1b6301b76ad1573bd482a76
+	[rime-scj]=cab5a0858765eff0553dd685a2d61d5536e9149c
+	[rime-soutzoe]=beeaeca72d8e17dfd1e9af58680439e9012987dc
+	[rime-stenotype]=f3e9189d5ce33c55d3936cc58e39d0c88b3f0c88
+	[rime-wubi]=152a0d3f3efe40cae216d1e3b338242446848d07
+	[rime-wugniu]=abd1ee98efbf170258fcf43875c21a4259e00b61
+)
+
+generate_src_uri() {
+	local -n LIST=$1
+	local pkg
+	for pkg in "${!LIST[@]}"; do
+		SRC_URI+=" https://github.com/rime/${pkg}/archive/${LIST[$pkg]}.tar.gz -> ${pkg}-${PV}.tar.gz"
+	done
+}
+
+DESCRIPTION="Data resources for Rime Input Method Engine"
+HOMEPAGE="https://rime.im/ https://github.com/rime/plum"
+
+generate_src_uri PKGS
+SRC_URI+=" extra? ( "
+generate_src_uri PKGS_EXTRA
+SRC_URI+=" )"
+
+S=${WORKDIR}
+
+# LGPL-3 :
+#	essay bopomofo cangjie emoji ipa
+#	luna-pinyin prelude quick stroke terra-pinyin wubi
+# GPL-3 :
+#	array combo-pinyin double-pinyin middle-chinese
+#	scj soutzoe stenotype wugniu
+# Apache-2 :
+#	rime-pinyin-simp
+# CC-BY-4.0 :
+#	rime-cantonese
+LICENSE="GPL-3 LGPL-3 extra? ( Apache-2.0 CC-BY-4.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+
+IUSE="extra"
+
+src_install() {
+	insinto "/usr/share/rime-data"
+
+	_install_pkgs() {
+		local -n LIST=$1
+		local pkg f
+		for pkg in "${!LIST[@]}"; do
+			doins "${pkg}-${LIST[$pkg]}"/*[!AUTHORS\|LICENSE\|README.md\|check.py]
+			for f in AUTHORS LICENSE README.md; do
+				if [ -f "${pkg}-${LIST[$pkg]}/${f}" ]; then
+					newdoc "${pkg}-${LIST[$pkg]}/${f}" "${pkg}_${f}"
+				fi
+			done
+		done
+	}
+
+	_install_pkgs PKGS
+	use extra && _install_pkgs PKGS_EXTRA
+}

app-office/joplin-desktop/joplin-desktop-3.1.23.ebuild

@@ -16,7 +16,7 @@ SRC_URI="https://github.com/laurent22/joplin/releases/download/v${PV}/${APPIMAGE
 
 LICENSE="AGPL-3+"
 SLOT="0"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 RESTRICT="bindist"
 
 RDEPEND="

app-office/libreoffice-l10n/libreoffice-l10n-24.2.7.2.ebuild

@@ -17,7 +17,7 @@ BASE_SRC_URI_STABLE="https://download.documentfoundation.org/${PN/-l10n/}/stable
 
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv ~x86 ~amd64-linux"
 IUSE="offlinehelp"
 
 #

app-office/libreoffice/libreoffice-24.2.7.2.ebuild

@@ -111,7 +111,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
 
 [[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv ~x86 ~amd64-linux"
 
 COMMON_DEPEND="${PYTHON_DEPS}
 	app-arch/unzip

app-portage/iwdevtools/iwdevtools-0.12.14.ebuild

@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 

app-portage/mgorny-dev-scripts/Manifest

@@ -1,2 +1 @@
-DIST mgorny-dev-scripts-55.tar.gz 19610 BLAKE2B 9f08783b9f7f33bcb64b5db9af60502106c5d48e249a5f5355d8a242085ec674e6af1012a036efb731077f137ce94f0bbdc3d7edf659f25821191d9a4e61d8c7 SHA512 3a0504a41359f909a40726337d7d71505bf8f26f68e29662916377bb388622cdcaa90748ddc19b9bde3ed2f0803311fcc477f0cf0b5ca07d0a1448630beb4fd5
 DIST mgorny-dev-scripts-56.tar.gz 19629 BLAKE2B 11f066437f8e666def01bd818aea22c8c6ff39285dba5702279c63e42715141e27e65d2b1e819d35bf2f062521f87833e0f6373aade46db6e25728f4a017bb9d SHA512 3f320296a46f923ef9900c638ad939488da2ae1f3b12d85b6c73f5dd046dc8637394a2e238b0f8746d6eac30d8fe158f854c16b5b7322e62790a5007ef76e8a3

app-portage/mgorny-dev-scripts/mgorny-dev-scripts-55.ebuild

@@ -1,32 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Handy scripts for ebuild development and more"
-HOMEPAGE="https://github.com/projg2/mgorny-dev-scripts/"
-SRC_URI="
-	https://github.com/projg2/mgorny-dev-scripts/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
-
-RDEPEND="
-	app-portage/gentoolkit
-	>=app-portage/gpyutils-0.12
-	dev-perl/URI
-	dev-util/pkgcheck
-	dev-vcs/git
-	net-misc/wget
-	sys-apps/portage
-	x11-misc/xdg-utils
-"
-
-src_install() {
-	dodoc README.rst
-	rm -f COPYING README.rst || die
-	dobin *
-}

app-portage/mgorny-dev-scripts/mgorny-dev-scripts-56.ebuild

@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	app-portage/gentoolkit

app-shells/fzf/Manifest

@@ -1,8 +1,2 @@
-DIST fzf-0.54.3-deps.tar.xz 5875812 BLAKE2B 19e27c17c86ae5df2a84bfde2a7df912a3e1b4e46c1475da0d10b190df272de0f09b3e546c84bc78e012788bd0842125681e43fe090f244bbd538bf2c6050175 SHA512 29a006cdb8352090aeda6d15e020700d123a1fa1e125bb82058253054e0cefc2d52b055392b38ba9b262bf0802609a7d99b49f602081fb472f0d0c7d709fcc59
-DIST fzf-0.54.3.tar.gz 292944 BLAKE2B 4a2e7a6cc50504215fa14ef6559df8b14fa0d89a499ca06f25b170cd2456d22cc30260de80821db9525ba4d6ece24ab39d863f23004f680bd3cf1d2a6985ec25 SHA512 e93056c3030e4a9dca59066fe111ef7539040a2e5bb800030d8f3e032acfae7db5fd2cf32aa7a45b505ec180e95c05bebe801bfc60c65db15fe9b647959ea987
-DIST fzf-0.55.0-deps.tar.xz 5891700 BLAKE2B 63de6f3817796eef8c6e69c7bdf66e2f379be1e438558245cedb4dfa6ab16ad6dc74fb901481359bd099533b48f4f4670a83588d7befe4812085b7c6bb2faf58 SHA512 2c3f0affe988e8dabb743425b707ec082f59d185abad7f9d82043d922890060151b06c89056c201df7a328d67edcd54ed91ca1c62d1dd4648ee72977186ffeb4
-DIST fzf-0.55.0.tar.gz 295984 BLAKE2B 304eb1c3ce682827d99ed699f2432eccb9cfe2025e331a291a43068000e9423913642a41cf124dbedf494adafd85a2ddcd5311f16f1a41b98550a0befd209f03 SHA512 b931b24b9398d189e83caf69fc7bdabbd906be6caed9d84dfe8ce0ec4ac980a78a89b7af988105996c6f217604d00f73efbf7be89b2c871e8b1f57b5e6bb72bb
-DIST fzf-0.56.0-deps.tar.xz 5883628 BLAKE2B c7d015a84fbd528fe1800dba11e9594c47185e998f227cbe4588e8348b2aa6f882898bfe6da0d9f459a0aafed61707afed36bb8d833150131fed9698cd97a4a3 SHA512 2ffa5bc8b2fd6c9aecb8f3c31e38316736e647f7364d81f9469877657ef94bf7083ab71c3835eeadf221a873ca98059bcbc35fcc65e967646477058fc429db43
-DIST fzf-0.56.0.tar.gz 299021 BLAKE2B 67aa9b2a8b13e453c0d3a4e9fcfd2ed4e2ebea65bedaa44626ff328fd1dc32f824e08f4665156959da244ed2ea38ca03d5bf31549c6fb509398db9bf79a9ed0d SHA512 c1d6bd686717695714771ce73979c5d2069b8991e99d73e2e5ec2c87fc1805e2d2f536d50e0ee2846d8ec372bcf189e17cbaf7a45a89cc201294c74c53b4f54c
 DIST fzf-0.56.3-deps.tar.xz 5884504 BLAKE2B b5ffa8dd62e81d4db0266b1c66ebcb3938dc5a7702aced44f516327e2f94c7b381ac50e43dad012934c7adb397aa1b6c73b75fac91723838cc39c5c8d0076018 SHA512 ac15caa887d5d01fde7de5ed9dfc3c6c8b91ef583577aafe6ab93486732201b46625467ce1fc076a5b2ec5f6f71aa63d96c649564fe4ee672e950cf03d904c28
 DIST fzf-0.56.3.tar.gz 300405 BLAKE2B d4139fd5fc95d710f18f5415f98e512c58812d5e5849481b47898b618dd33f33cfa532a9b767a787f565337f7ca8ea383f6bf10100ef90a78bbba9ad77e68fa3 SHA512 7144036bf3d027272bb1f961bb6a2721a7a85b16955b45f67798e16ac9f7891a04ed3b343b71c3426358e9e92abe1faba10b679caf8f99ca1905c6b312e6c9b7

app-shells/fzf/fzf-0.54.3.ebuild

@@ -1,72 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="General-purpose command-line fuzzy finder, written in Golang"
-HOMEPAGE="https://github.com/junegunn/fzf"
-
-# For fancy versioning only. Bump on the next release!
-# MY_GIT_REV is the first 7 characters of release commit, we truncate it
-# after to make it easier to copy/paste.
-MY_GIT_REV=9e92b6f11e0f59272de410f56493893334071e6e
-MY_GIT_REV=${MY_GIT_REV:0:7}
-
-SRC_URI="https://github.com/junegunn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${P}-deps.tar.xz"
-
-LICENSE="MIT BSD-with-disclosure"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-
-src_prepare() {
-	default
-	sed -i 's/-s -w //' Makefile || die # bug #795225
-}
-
-src_compile() {
-	emake PREFIX="${EPREFIX}"/usr VERSION=${PV} REVISION=${MY_GIT_REV} bin/${PN}
-}
-
-src_install() {
-	dobin bin/${PN}
-	doman man/man1/${PN}.1
-
-	dobin bin/${PN}-tmux
-	doman man/man1/${PN}-tmux.1
-
-	insinto /usr/share/vim/vimfiles/plugin
-	doins plugin/${PN}.vim
-
-	insinto /usr/share/nvim/runtime/plugin
-	doins plugin/${PN}.vim
-
-	newbashcomp shell/completion.bash ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	newins shell/completion.zsh _${PN}
-
-	insinto /usr/share/fzf
-	doins shell/key-bindings.bash
-	doins shell/key-bindings.fish
-	doins shell/key-bindings.zsh
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "To add fzf support to your shell, make sure to use the right file"
-		elog "from ${EROOT}/usr/share/fzf."
-		elog
-		elog "For bash, add the following line to ~/.bashrc:"
-		elog
-		elog "	# source ${EROOT}/usr/share/bash-completion/completions/fzf"
-		elog "	# source ${EROOT}/usr/share/fzf/key-bindings.bash"
-		elog
-		elog "Plugins for Vim and Neovim are installed to respective directories"
-		elog "and will work out of the box."
-		elog
-		elog "For fzf support in tmux see fzf-tmux(1)."
-	fi
-}

app-shells/fzf/fzf-0.55.0.ebuild

@@ -1,72 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="General-purpose command-line fuzzy finder, written in Golang"
-HOMEPAGE="https://github.com/junegunn/fzf"
-
-# For fancy versioning only. Bump on the next release!
-# MY_GIT_REV is the first 7 characters of release commit, we truncate it
-# after to make it easier to copy/paste.
-MY_GIT_REV=9e92b6f11e0f59272de410f56493893334071e6e
-MY_GIT_REV=${MY_GIT_REV:0:7}
-
-SRC_URI="https://github.com/junegunn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${P}-deps.tar.xz"
-
-LICENSE="MIT BSD-with-disclosure"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-
-src_prepare() {
-	default
-	sed -i 's/-s -w //' Makefile || die # bug #795225
-}
-
-src_compile() {
-	emake PREFIX="${EPREFIX}"/usr VERSION=${PV} REVISION=${MY_GIT_REV} bin/${PN}
-}
-
-src_install() {
-	dobin bin/${PN}
-	doman man/man1/${PN}.1
-
-	dobin bin/${PN}-tmux
-	doman man/man1/${PN}-tmux.1
-
-	insinto /usr/share/vim/vimfiles/plugin
-	doins plugin/${PN}.vim
-
-	insinto /usr/share/nvim/runtime/plugin
-	doins plugin/${PN}.vim
-
-	newbashcomp shell/completion.bash ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	newins shell/completion.zsh _${PN}
-
-	insinto /usr/share/fzf
-	doins shell/key-bindings.bash
-	doins shell/key-bindings.fish
-	doins shell/key-bindings.zsh
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "To add fzf support to your shell, make sure to use the right file"
-		elog "from ${EROOT}/usr/share/fzf."
-		elog
-		elog "For bash, add the following line to ~/.bashrc:"
-		elog
-		elog "	# source ${EROOT}/usr/share/bash-completion/completions/fzf"
-		elog "	# source ${EROOT}/usr/share/fzf/key-bindings.bash"
-		elog
-		elog "Plugins for Vim and Neovim are installed to respective directories"
-		elog "and will work out of the box."
-		elog
-		elog "For fzf support in tmux see fzf-tmux(1)."
-	fi
-}

app-shells/fzf/fzf-0.56.0.ebuild

@@ -1,72 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="General-purpose command-line fuzzy finder, written in Golang"
-HOMEPAGE="https://github.com/junegunn/fzf"
-
-# For fancy versioning only. Bump on the next release!
-# MY_GIT_REV is the first 7 characters of release commit, we truncate it
-# after to make it easier to copy/paste.
-MY_GIT_REV=9e92b6f11e0f59272de410f56493893334071e6e
-MY_GIT_REV=${MY_GIT_REV:0:7}
-
-SRC_URI="https://github.com/junegunn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${P}-deps.tar.xz"
-
-LICENSE="MIT BSD-with-disclosure"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-src_prepare() {
-	default
-	sed -i 's/-s -w //' Makefile || die # bug #795225
-}
-
-src_compile() {
-	emake PREFIX="${EPREFIX}"/usr VERSION=${PV} REVISION=${MY_GIT_REV} bin/${PN}
-}
-
-src_install() {
-	dobin bin/${PN}
-	doman man/man1/${PN}.1
-
-	dobin bin/${PN}-tmux
-	doman man/man1/${PN}-tmux.1
-
-	insinto /usr/share/vim/vimfiles/plugin
-	doins plugin/${PN}.vim
-
-	insinto /usr/share/nvim/runtime/plugin
-	doins plugin/${PN}.vim
-
-	newbashcomp shell/completion.bash ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	newins shell/completion.zsh _${PN}
-
-	insinto /usr/share/fzf
-	doins shell/key-bindings.bash
-	doins shell/key-bindings.fish
-	doins shell/key-bindings.zsh
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "To add fzf support to your shell, make sure to use the right file"
-		elog "from ${EROOT}/usr/share/fzf."
-		elog
-		elog "For bash, add the following line to ~/.bashrc:"
-		elog
-		elog "	# source ${EROOT}/usr/share/bash-completion/completions/fzf"
-		elog "	# source ${EROOT}/usr/share/fzf/key-bindings.bash"
-		elog
-		elog "Plugins for Vim and Neovim are installed to respective directories"
-		elog "and will work out of the box."
-		elog
-		elog "For fzf support in tmux see fzf-tmux(1)."
-	fi
-}

app-text/paper-clip/paper-clip-5.5.1-r1.ebuild

@@ -19,7 +19,7 @@ else
 		-> ${P}.tar.gz"
 	S="${WORKDIR}/${APP_PN}-${PV}"
 
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="GPL-3+"

app-text/poppler/poppler-24.11.0-r1.ebuild

@@ -17,7 +17,7 @@ else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
 	SRC_URI+=" test? ( https://gitlab.freedesktop.org/poppler/test/-/archive/${TEST_COMMIT}/test-${TEST_COMMIT}.tar.bz2 -> ${PN}-test-${TEST_COMMIT}.tar.bz2 )"
 	SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )"
-	KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 	SLOT="0/143"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 

dev-ada/aunit/aunit-24.0.0-r3.ebuild

@@ -13,7 +13,7 @@ SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 
 RDEPEND="${ADA_DEPS}"

dev-ada/gnatcoll-core/gnatcoll-core-24.0.0-r3.ebuild

@@ -12,7 +12,7 @@ SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc +shared static-libs static-pic"
 REQUIRED_USE="|| ( shared static-libs static-pic )
 	${ADA_REQUIRED_USE}"

dev-ada/gprbuild/gprbuild-24.0.0-r2.ebuild

@@ -18,7 +18,7 @@ SRC_URI="
 		-> ${XMLADA}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 
 DEPEND="${ADA_DEPS}

dev-ada/gtkada/gtkada-24.0.0.ebuild

@@ -13,7 +13,7 @@ SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+shared static-libs static-pic"
 
 RDEPEND="${ADA_DEPS}

dev-ada/libgpr/libgpr-24.0.0.ebuild

@@ -18,7 +18,7 @@ S="${WORKDIR}"/${MYP}
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+shared static-libs static-pic"
 
 RDEPEND="dev-ada/xmlada:=[shared?,static-libs?,static-pic?,${ADA_USEDEP}]"

dev-ada/templates-parser/templates-parser-24.0.0.ebuild

@@ -13,7 +13,7 @@ SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+shared static-libs"
 RESTRICT="test"
 

dev-ada/xmlada/xmlada-24.0.0-r3.ebuild

@@ -13,7 +13,7 @@ SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc +shared static-libs static-pic"
 REQUIRED_USE="|| ( shared static-libs static-pic )
 	${ADA_REQUIRED_USE}"

dev-build/cmake/cmake-3.31.2.ebuild

@@ -277,6 +277,17 @@ src_install() {
 }
 
 pkg_postinst() {
+	if [[ -z ${EPREFIX} ]] ; then
+		local file
+		# See bug #599684 and  bug #753581 (at least)
+		for file in /etc/arch-release /etc/redhat-release /etc/debian_version ; do
+			eerror "Errant ${file} found!"
+			eerror "The presence of these files is known to confuse CMake's"
+			eerror "library path logic. Please (re)move this file:"
+			eerror " mv ${file} ${file}.bak"
+		done
+	fi
+
 	if use gui; then
 		xdg_icon_cache_update
 		xdg_desktop_database_update

dev-build/cmake/cmake-9999.ebuild

@@ -278,6 +278,17 @@ src_install() {
 }
 
 pkg_postinst() {
+	if [[ -z ${EPREFIX} ]] ; then
+		local file
+		# See bug #599684 and  bug #753581 (at least)
+		for file in /etc/arch-release /etc/redhat-release /etc/debian_version ; do
+			eerror "Errant ${file} found!"
+			eerror "The presence of these files is known to confuse CMake's"
+			eerror "library path logic. Please (re)move this file:"
+			eerror " mv ${file} ${file}.bak"
+		done
+	fi
+
 	if use gui; then
 		xdg_icon_cache_update
 		xdg_desktop_database_update

dev-games/physfs/physfs-3.2.0.ebuild

@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/icculus/physfs.git"
 else
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc64 ~riscv x86"
 	SRC_URI="https://github.com/icculus/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-release-${PV}"
 fi

dev-go/go-tools/Manifest

@@ -4,3 +4,5 @@ DIST go-tools-0.20.0-deps.tar.xz 383336 BLAKE2B 0bddd81087bae28c2d874a2ea647a529
 DIST go-tools-0.20.0.tar.gz 3779878 BLAKE2B 42175d921dfb5acb25c9eee224138675619860aefaca09db8e354481c146faa52b2fcc64d99953d8508a79ce8375ebcc42a1e7d20f4721e55b8c843989565fbc SHA512 c67706593d0a48f941955e40cadc1e39961b07ba51c9342b302ba99f93a1e55b9feec21d6171ee370f96293253be27b480274d48a16eff1055373f81b73f2dd9
 DIST go-tools-0.24.0-deps.tar.xz 423048 BLAKE2B 0df1a18476c207e26c5397aa81d475e96ac00cbf9460899c3e66804963b5661befcd648f0bc51bf67775b533c370dcf634939bd6c5efad5ee289f73233c09b66 SHA512 f4eb6bfc918b947b6903e260edc99f71ebea4b8c39a118526608b9c86712e97029ab4473fd617dc8377a7021a8b606d267abf686c4a36a37556f828afd53fb4c
 DIST go-tools-0.24.0.tar.gz 6977100 BLAKE2B ca0a9c5d3e41ca9accbacfc4074827bb3750c7bab8b20a80c76998dc4078d889eeaaf0f7fc6cd3864b5613c8474175d626165a5e20ada12876afa0279d325887 SHA512 bb41b620d4e3fe2c028a618656b47e28e9ecf2ecc49bb70dcd919948d0c6a4eeeded04ef2fa7604307029686605d5d809ff671dc1b0d3143af7100e4e480a444
+DIST go-tools-0.28.0-deps.tar.xz 424928 BLAKE2B 1c970a5e4c1b278852307a4c980d7f64d3caf288005f1bd25d422745c333d8cb5bf671a11d8c3d28e5a578cca4c4c1bc28179b06df91c3efbb7d33d7701c384e SHA512 a1df8204d19e8e0a6cd0aaa292c6b4258e456abb37f28a11e1580c8709437fa400b886e21a37cb28eca22a8dd8fc1cce467aad8c4998247cd729df052fd08c9b
+DIST go-tools-0.28.0.tar.gz 7452244 BLAKE2B a8721c39cb03b93e68c84138df1e580d7033bc8440e7300894d80cbd2e997537e946235d47e183c78e71e3c40c603a35556124755332581c2557a6b433c8d0bf SHA512 325595736259e74b2249ba183d73690d557e64d80183d109a2f443ccd1e64146595a367452639e2d032b194b31615eb2ecdd4b971ae9a8bbb06fa68b5578a713

dev-go/go-tools/go-tools-0.28.0.ebuild

@@ -0,0 +1,48 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="Tools that support the Go programming language (godoc, etc.)"
+HOMEPAGE="https://pkg.go.dev/golang.org/x/tools"
+SRC_URI="https://github.com/golang/tools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
+S=${WORKDIR}/${P#go-}
+
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+# Many test failures.
+RESTRICT="test"
+
+GO_TOOLS_BINS=(
+	authtest benchcmp bisect bundle callgraph compilebench cookieauth
+	deadcode defers digraph eg fieldalignment file2fuzz findcall fiximports
+	fuzz-driver fuzz-runner gitauth go-contrib-init godex godoc goimports
+	gomvpkg gonew gopackages gorename gostacks gotype goyacc html2article
+	httpmux ifaceassert lostcancel netrcauth nilness nodecount play present
+	present2md shadow splitdwarf ssadump stress stringer stringintconv
+	toolstash unmarshal unusedresult
+)
+
+src_compile() {
+	local bin packages
+	readarray -t packages < <(ego list ./... | grep -E "/($(echo "${GO_TOOLS_BINS[@]}" | tr ' ' '|'))$")
+	GOBIN="${S}/bin" ego install -work "${packages[@]}"
+}
+
+src_test() {
+	ego test -work ./...
+}
+
+src_install() {
+	# bug 558818: install binaries in $GOROOT/bin to avoid file collisions
+	local goroot=$(go env GOROOT)
+	goroot=${goroot#${EPREFIX}}
+	exeinto "${goroot}/bin"
+	doexe bin/*
+	dodir /usr/bin
+	ln "${ED}/${goroot}/bin/godoc" "${ED}/usr/bin/godoc" || die
+}

dev-java/fop/files/fop-2.9-FO2StructureTreeConverterTestCase.patch

@@ -1,45 +0,0 @@
-There were 2 failures:
-1) testRemoveBlocks(org.apache.fop.accessibility.fo.FO2StructureTreeConverterTestCase)
-org.junit.ComparisonFailure: expected:<....0" encoding="UTF-8"[ standalone="no"]?><structure-tree-se...> but was:<....0" encoding="UTF-8"[]?><structure-tree-se...>
-        at org.junit.Assert.assertEquals(Assert.java:117)
-        at org.junit.Assert.assertEquals(Assert.java:146)
-        at org.apache.fop.accessibility.fo.FO2StructureTreeConverterTestCase.compare(FO2StructureTreeConverterTestCase.java:225)
-        at org.apache.fop.accessibility.fo.FO2StructureTreeConverterTestCase.testRemoveBlocks(FO2StructureTreeConverterTestCase.java:150)
-2) testRemoveTableHeader(org.apache.fop.accessibility.fo.FO2StructureTreeConverterTestCase)
-org.junit.ComparisonFailure: expected:<....0" encoding="UTF-8"[ standalone="no"]?><structure-tree-se...> but was:<....0" encoding="UTF-8"[]?><structure-tree-se...>
-        at org.junit.Assert.assertEquals(Assert.java:117)
-        at org.junit.Assert.assertEquals(Assert.java:146)
-        at org.apache.fop.accessibility.fo.FO2StructureTreeConverterTestCase.compare(FO2StructureTreeConverterTestCase.java:225)
-        at org.apache.fop.accessibility.fo.FO2StructureTreeConverterTestCase.testRemoveTableHeader(FO2StructureTreeConverterTestCase.java:187)
-
-FAILURES!!!
-Tests run: 11,  Failures: 2
-
---- a/fop-core/src/test/java/org/apache/fop/accessibility/fo/FO2StructureTreeConverterTestCase.java
-+++ b/fop-core/src/test/java/org/apache/fop/accessibility/fo/FO2StructureTreeConverterTestCase.java
-@@ -43,6 +43,7 @@ import javax.xml.transform.stream.StreamSource;
- 
- import org.custommonkey.xmlunit.Diff;
- import org.junit.Test;
-+import org.junit.Ignore;
- import org.w3c.dom.Document;
- import org.xml.sax.SAXException;
- import org.xml.sax.helpers.AttributesImpl;
-@@ -144,7 +145,7 @@ public class FO2StructureTreeConverterTestCase {
-         assertNull(d.getStructureTreeEventHandler().startNode("table-body", null, null));
-     }
- 
--    @Test
-+    @Test @Ignore
-     public void testRemoveBlocks() throws Exception {
-         keepEmptyTags = false;
-         compare("<fo:root xmlns:fo=\"http://www.w3.org/1999/XSL/Format\">\n"
-@@ -180,7 +181,7 @@ public class FO2StructureTreeConverterTestCase {
-                         + "</structure-tree-sequence>\n");
-     }
- 
--    @Test
-+    @Test @Ignore
-     public void testRemoveTableHeader() throws Exception {
-         keepEmptyTags = false;
-         String fo = IOUtils.toString(getResource("table-artifact.fo"), "utf8").replace("role=\"artifact\"", "");

dev-java/fop/files/fop-2.9-MissingLanguageWarningTestCase.patch

@@ -1,88 +0,0 @@
-There was 1 failure:
-1) testMissingLanguage(org.apache.fop.accessibility.pdf.MissingLanguageWarningTestCase)
-org.junit.ComparisonFailure: expected:<3[2:36]> but was:<3[0:37]>
-	at org.junit.Assert.assertEquals(Assert.java:117)
-	at org.junit.Assert.assertEquals(Assert.java:146)
-	at org.apache.fop.accessibility.pdf.MissingLanguageWarningTestCase$MissingLanguageEventChecker.processEvent(MissingLanguageWarningTestCase.java:65)
-	at org.apache.fop.events.CompositeEventListener.processEvent(CompositeEventListener.java:61)
-	at org.apache.fop.events.FOPEventListenerProxy.processEvent(FOPEventListenerProxy.java:70)
-	at org.apache.fop.apps.FOUserAgent$FOPEventBroadcaster.broadcastEvent(FOUserAgent.java:621)
-	at org.apache.fop.events.DefaultEventBroadcaster$1.invoke(DefaultEventBroadcaster.java:170)
-	at jdk.proxy2/jdk.proxy2.$Proxy12.unknownLanguage(Unknown Source)
-	at org.apache.fop.render.pdf.PDFPainter$LanguageAvailabilityChecker.checkLanguageAvailability(PDFPainter.java:106)
-	at org.apache.fop.render.pdf.PDFPainter$LanguageAvailabilityChecker.access$000(PDFPainter.java:90)
-	at org.apache.fop.render.pdf.PDFPainter.prepareImageMCID(PDFPainter.java:238)
-	at org.apache.fop.render.pdf.PDFPainter.drawImageUsingURI(PDFPainter.java:216)
-	at org.apache.fop.render.pdf.PDFPainter.drawImage(PDFPainter.java:182)
-	at org.apache.fop.render.intermediate.IFRenderer.drawImage(IFRenderer.java:1306)
-	at org.apache.fop.render.intermediate.IFRenderer.renderImage(IFRenderer.java:1293)
-	at org.apache.fop.render.AbstractRenderer.renderInlineViewport(AbstractRenderer.java:1030)
-	at org.apache.fop.render.AbstractPathOrientedRenderer.renderInlineViewport(AbstractPathOrientedRenderer.java:836)
-	at org.apache.fop.render.intermediate.IFRenderer.renderInlineViewport(IFRenderer.java:860)
-	at org.apache.fop.render.AbstractRenderer.renderInlineArea(AbstractRenderer.java:877)
-	at org.apache.fop.render.intermediate.IFRenderer.renderInlineArea(IFRenderer.java:924)
-	at org.apache.fop.render.AbstractRenderer.renderLineArea(AbstractRenderer.java:845)
-	at org.apache.fop.render.AbstractRenderer.renderBlocks(AbstractRenderer.java:704)
-	at org.apache.fop.render.AbstractRenderer.renderBlock(AbstractRenderer.java:758)
-	at org.apache.fop.render.intermediate.IFRenderer.renderBlock(IFRenderer.java:1004)
-	at org.apache.fop.render.AbstractRenderer.renderBlocks(AbstractRenderer.java:689)
-	at org.apache.fop.render.AbstractRenderer.renderFlow(AbstractRenderer.java:591)
-	at org.apache.fop.render.AbstractPathOrientedRenderer.renderFlow(AbstractPathOrientedRenderer.java:789)
-	at org.apache.fop.render.AbstractRenderer.renderMainReference(AbstractRenderer.java:568)
-	at org.apache.fop.render.AbstractRenderer.renderBodyRegion(AbstractRenderer.java:433)
-	at org.apache.fop.render.AbstractRenderer.renderRegionViewport(AbstractRenderer.java:380)
-	at org.apache.fop.render.intermediate.IFRenderer.renderRegionViewport(IFRenderer.java:735)
-	at org.apache.fop.render.AbstractRenderer.renderPageAreas(AbstractRenderer.java:345)
-	at org.apache.fop.render.AbstractRenderer.renderPage(AbstractRenderer.java:318)
-	at org.apache.fop.render.intermediate.IFRenderer.renderPage(IFRenderer.java:584)
-	at org.apache.fop.area.RenderPagesModel.renderPage(RenderPagesModel.java:193)
-	at org.apache.fop.area.RenderPagesModel.checkPreparedPages(RenderPagesModel.java:174)
-	at org.apache.fop.area.RenderPagesModel.addPage(RenderPagesModel.java:146)
-	at org.apache.fop.layoutmgr.AbstractPageSequenceLayoutManager.finishPage(AbstractPageSequenceLayoutManager.java:316)
-	at org.apache.fop.layoutmgr.PageSequenceLayoutManager.finishPage(PageSequenceLayoutManager.java:243)
-	at org.apache.fop.layoutmgr.PageSequenceLayoutManager.activateLayout(PageSequenceLayoutManager.java:147)
-	at org.apache.fop.area.AreaTreeHandler.endPageSequence(AreaTreeHandler.java:267)
-	at org.apache.fop.fo.DelegatingFOEventHandler.endPageSequence(DelegatingFOEventHandler.java:114)
-	at org.apache.fop.accessibility.fo.FO2StructureTreeConverter.endPageSequence(FO2StructureTreeConverter.java:184)
-	at org.apache.fop.fo.pagination.PageSequence.endOfNode(PageSequence.java:140)
-	at org.apache.fop.fo.FOTreeBuilder$MainFOHandler.endElement(FOTreeBuilder.java:390)
-	at org.apache.fop.fo.FOTreeBuilder$3.run(FOTreeBuilder.java:207)
-	at org.apache.fop.fo.FOTreeBuilder$3.run(FOTreeBuilder.java:204)
-	at java.base/java.security.AccessController.doPrivileged(AccessController.java:318)
-	at org.apache.fop.fo.FOTreeBuilder.endElement(FOTreeBuilder.java:203)
-	at org.apache.xalan.transformer.TransformerIdentityImpl.endElement(TransformerIdentityImpl.java:1102)
-	at java.xml/com.sun.org.apache.xerces.internal.parsers.AbstractSAXParser.endElement(AbstractSAXParser.java:618)
-	at java.xml/com.sun.org.apache.xerces.internal.impl.XMLDocumentFragmentScannerImpl.scanEndElement(XMLDocumentFragmentScannerImpl.java:1728)
-	at java.xml/com.sun.org.apache.xerces.internal.impl.XMLDocumentFragmentScannerImpl$FragmentContentDriver.next(XMLDocumentFragmentScannerImpl.java:2899)
-	at java.xml/com.sun.org.apache.xerces.internal.impl.XMLDocumentScannerImpl.next(XMLDocumentScannerImpl.java:605)
-	at java.xml/com.sun.org.apache.xerces.internal.impl.XMLNSDocumentScannerImpl.next(XMLNSDocumentScannerImpl.java:112)
-	at java.xml/com.sun.org.apache.xerces.internal.impl.XMLDocumentFragmentScannerImpl.scanDocument(XMLDocumentFragmentScannerImpl.java:542)
-	at java.xml/com.sun.org.apache.xerces.internal.parsers.XML11Configuration.parse(XML11Configuration.java:889)
-	at java.xml/com.sun.org.apache.xerces.internal.parsers.XML11Configuration.parse(XML11Configuration.java:825)
-	at java.xml/com.sun.org.apache.xerces.internal.parsers.XMLParser.parse(XMLParser.java:141)
-	at java.xml/com.sun.org.apache.xerces.internal.parsers.AbstractSAXParser.parse(AbstractSAXParser.java:1224)
-	at org.apache.xalan.transformer.TransformerIdentityImpl.transform(TransformerIdentityImpl.java:485)
-	at org.apache.fop.accessibility.pdf.MissingLanguageWarningTestCase.testMissingLanguage(MissingLanguageWarningTestCase.java:90)
-
-FAILURES!!!
-Tests run: 10,  Failures: 1
-
---- a/fop-core/src/test/java/org/apache/fop/accessibility/pdf/MissingLanguageWarningTestCase.java
-+++ b/fop-core/src/test/java/org/apache/fop/accessibility/pdf/MissingLanguageWarningTestCase.java
-@@ -31,6 +31,7 @@ import javax.xml.transform.stream.StreamSource;
- 
- import org.junit.Before;
- import org.junit.Test;
-+import org.junit.Ignore;
- 
- import static org.junit.Assert.assertEquals;
- import static org.junit.Assert.assertFalse;
-@@ -82,7 +83,7 @@ public class MissingLanguageWarningTestCase {
-         fop = fopFactory.newFop(MimeConstants.MIME_PDF, userAgent, NullOutputStream.NULL_OUTPUT_STREAM);
-     }
- 
--    @Test
-+    @Test @Ignore
-     public void testMissingLanguage() throws Exception {
-         Source src = new StreamSource(getClass().getResourceAsStream("missing-language.fo"));
-         SAXResult res = new SAXResult(fop.getDefaultHandler());

dev-java/fop/files/fop-2.9-PDFToUnicodeCMapTestCase.patch

@@ -1,33 +0,0 @@
-There was 1 failure:
-1) unpairedHighSurrogateTest(org.apache.fop.pdf.PDFToUnicodeCMapTestCase)
-java.lang.IllegalStateException: Event model isn't consistent with the EventProducer interface. Please rebuild FOP! Affected method: org.apache.fop.render.pdf.PDFEventProducer.unpairedSurrogate
-        at org.apache.fop.events.DefaultEventBroadcaster$1.invoke(DefaultEventBroadcaster.java:155)
-        at jdk.proxy2/jdk.proxy2.$Proxy11.unpairedSurrogate(Unknown Source)
-        at org.apache.fop.pdf.PDFToUnicodeCMap$ToUnicodeCMapBuilder.writeBFCharEntries(PDFToUnicodeCMap.java:160)
-        at org.apache.fop.pdf.PDFToUnicodeCMap$ToUnicodeCMapBuilder.writeBFEntries(PDFToUnicodeCMap.java:108)
-        at org.apache.fop.pdf.PDFToUnicodeCMap$ToUnicodeCMapBuilder.writeCMap(PDFToUnicodeCMap.java:99)
-        at org.apache.fop.pdf.PDFToUnicodeCMapTestCase.buildAndAssertLine(PDFToUnicodeCMapTestCase.java:100)
-        at org.apache.fop.pdf.PDFToUnicodeCMapTestCase.unpairedHighSurrogateTest(PDFToUnicodeCMapTestCase.java:307)
-
-FAILURES!!!
-Tests run: 10,  Failures: 
-
---- a/fop-core/src/test/java/org/apache/fop/pdf/PDFToUnicodeCMapTestCase.java
-+++ b/fop-core/src/test/java/org/apache/fop/pdf/PDFToUnicodeCMapTestCase.java
-@@ -29,6 +29,7 @@ import java.util.Set;
- import org.junit.Assert;
- import org.junit.Before;
- import org.junit.Test;
-+import org.junit.Ignore;
- 
- import static org.junit.Assert.assertEquals;
- import static org.junit.Assert.assertNotNull;
-@@ -278,7 +279,7 @@ public class PDFToUnicodeCMapTestCase {
-      * Checks that an unpaired surrogate (a high-surrogate as the last code unit) is correctly handled.
-      * @throws IOException
-      */
--    @Test
-+    @Test @Ignore
-     public void unpairedHighSurrogateTest() throws IOException {
-         final int charMapSize = 10;
- 

dev-java/jansi/jansi-1.18.ebuild

@@ -16,7 +16,7 @@ S="${WORKDIR}/jansi-jansi-project-${PV}/jansi"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64"
+KEYWORDS="amd64 arm64 ppc64"
 
 CP_DEPEND="
 	dev-java/hawtjni-runtime:0

dev-lang/python/python-3.12.8.ebuild

@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="
 	bluetooth build debug +ensurepip examples gdbm libedit
 	+ncurses pgo +readline +sqlite +ssl test tk valgrind

dev-lang/python/python-3.13.0-r100.ebuild

@@ -283,6 +283,11 @@ src_configure() {
 				-x test_strtod
 			)
 			;;
+		hppa*)
+			COMMON_TEST_SKIPS+=(
+				-x test_gdb
+			)
+			;;
 		mips*)
 			COMMON_TEST_SKIPS+=(
 				-x test_ctypes

dev-lang/python/python-3.13.0.ebuild

@@ -285,6 +285,11 @@ src_configure() {
 				-x test_strtod
 			)
 			;;
+		hppa*)
+			COMMON_TEST_SKIPS+=(
+				-x test_gdb
+			)
+			;;
 		mips*)
 			COMMON_TEST_SKIPS+=(
 				-x test_ctypes

dev-lang/python/python-3.13.1-r100.ebuild

@@ -283,6 +283,11 @@ src_configure() {
 				-x test_strtod
 			)
 			;;
+		hppa*)
+			COMMON_TEST_SKIPS+=(
+				-x test_gdb
+			)
+			;;
 		mips*)
 			COMMON_TEST_SKIPS+=(
 				-x test_ctypes

dev-lang/python/python-3.13.1.ebuild

@@ -285,6 +285,11 @@ src_configure() {
 				-x test_strtod
 			)
 			;;
+		hppa*)
+			COMMON_TEST_SKIPS+=(
+				-x test_gdb
+			)
+			;;
 		mips*)
 			COMMON_TEST_SKIPS+=(
 				-x test_ctypes

dev-lang/python/python-3.14.0_alpha1-r100.ebuild

@@ -284,6 +284,11 @@ src_configure() {
 				-x test_strtod
 			)
 			;;
+		hppa*)
+			COMMON_TEST_SKIPS+=(
+				-x test_gdb
+			)
+			;;
 		mips*)
 			COMMON_TEST_SKIPS+=(
 				-x test_ctypes

dev-lang/python/python-3.14.0_alpha1.ebuild

@@ -286,6 +286,11 @@ src_configure() {
 				-x test_strtod
 			)
 			;;
+		hppa*)
+			COMMON_TEST_SKIPS+=(
+				-x test_gdb
+			)
+			;;
 		mips*)
 			COMMON_TEST_SKIPS+=(
 				-x test_ctypes

dev-lang/python/python-3.14.0_alpha2-r100.ebuild

@@ -284,6 +284,11 @@ src_configure() {
 				-x test_strtod
 			)
 			;;
+		hppa*)
+			COMMON_TEST_SKIPS+=(
+				-x test_gdb
+			)
+			;;
 		mips*)
 			COMMON_TEST_SKIPS+=(
 				-x test_ctypes

dev-lang/python/python-3.14.0_alpha2.ebuild

@@ -286,6 +286,11 @@ src_configure() {
 				-x test_strtod
 			)
 			;;
+		hppa*)
+			COMMON_TEST_SKIPS+=(
+				-x test_gdb
+			)
+			;;
 		mips*)
 			COMMON_TEST_SKIPS+=(
 				-x test_ctypes

dev-lang/spidermonkey/Manifest

@@ -2,10 +2,8 @@ DIST firefox-102.15.0esr.source.tar.xz 486592324 BLAKE2B b70727fa91d0d270673374b
 DIST firefox-102esr-patches-13.tar.xz 22212 BLAKE2B 02e9edd071a99abbac02faa11ffce061d5d12d8baa9ce54b51d6bfdbf8160022a1565902d65ca30fe51b5670e509fa921b11a460989933cbb797fcd59d635125 SHA512 8b8b0f3789978447a1293fd9acb5c2db3d7e9f724357a0d762b54f7e34d28f11655997ffeafccfe8001a01dd595848d257f90cb983462c405d434cc794216520
 DIST firefox-115.16.0esr.source.tar.xz 515133700 BLAKE2B 9501b617b346d56f6de975f88974be6fdc3d4a901b2a1b952b6bbf6cc46384084260078d23c52bedff83a65bec4ea5ec78c3bcaac86c78d0b44e796317534840 SHA512 b6f93ec3d6acac5df177253c65b833c017e65ed6e78e96ff029098443928d291f6f67164aedb83d80aa28ee9dee305086597798238d3330e35183030e53e3550
 DIST firefox-115esr-patches-13.tar.xz 51360 BLAKE2B a048bfadba989ebbd4c6e3df97d303d6853844e66ed92f5f5f322acf18866218b91d52dbbece63827de283eef855c932d67e329c8d93200aa83f11268a5d1b2f SHA512 186ec72323e621362dcef1bc67c476716aff97dfad701faa9220a7302e798d3cb4ed90d5ea59e3e92f016be29875bb5219787635db99a8848b7c76e4e2e09e90
-DIST firefox-128.3.0esr.source.tar.xz 560960556 BLAKE2B 015fefb408dcea5733053151aff05579b007ab757542a47956e007dc127b460f4a35e885a2ee4ef4dbb936820c8ea3907b00383f659b15a84e701590b50a5d72 SHA512 3c6ef272c0fb653d030fe3f7f72aa0e1097b1c6759556166815cde15465330f988b3bc23df4b4eb753daee930edbb1ef72145273cb29d0952bd9d7c547050f9b
 DIST firefox-128.4.0esr.source.tar.xz 558619512 BLAKE2B 1f0528c8806bb034af623f2022740bb5056ea11817b9cb7154a60b87f04051ba5ae06b0daf55e6b03b7531c369deb871d3d3579a86f3ca19f3ab71ccb45243f9 SHA512 e720b1f993926d73f5a5727648f753176ac2fd093fb0b71393946bbc5919ce5fc7b88b82960bd1aa427b5663c7f659828dc6702485fc0c1e7a6961571c67faa3
 DIST firefox-128.5.0esr.source.tar.xz 567200548 BLAKE2B b524796854d4f622e90c219e4e302e5665f3f1e3ffb7935ba58244903dbcf1c2b9a13731e9af5507ffc25dda621d4ea13650aae842ed0317843182da55d1d652 SHA512 ff20f18f92c5e9cd1d9eaf7c38cec61bcab2dca8dd2817519b712bc1f760b5c6e290212acf3289152764e5130e01626950b7ecd9327b2c587b24a246591afd67
-DIST firefox-128esr-patches-03.tar.xz 14156 BLAKE2B 9a618f0ddb8596b740893dc9113f374d193a00e4e8e76dbb2794928ceaafc7b5309cb6f69f6287ae1e423f0be0a060580b0d9d59307c9889362dd17fb7d31d3d SHA512 c6ec7233b368fac623ec0cce6f5c37d358a0fa5bb2154dc67eebb50968376ca9d46f3a734f5d79a4aa4edde9e300a9c65315d0e499aa6a1325b6c76a6c164258
 DIST firefox-128esr-patches-07.tar.xz 18856 BLAKE2B 44d0ddf11518c7eef0a96de4f475a6ae1535e43e5bf89b8f61dc95330f28d6a053d08e6a183cf71432107256c83cd6ee6f742b235ca82babe4dd83698bf80d07 SHA512 60b4f18f5d91fc25f86cceccd561b55f167299908fbf2f9d7d69a8ce299c643f0b538d613d4348e42dd17c3812e4fa315e15004614af1f40fbe2adda417a1a81
 DIST spidermonkey-102-patches-05j.tar.xz 4596 BLAKE2B 215b770bbdf17973d7b3fd1df6cee9647459d2b02b0be5bdb289d457e5dbdb06ceac7a3082fc2f5836e991a4ac4486d73330b0276a466b5c528dab226a27829c SHA512 d2b8e32dac87d60a00fd93479dc34d8adab4feec24a38591cebeb4cf271aa2fd964f4dc26e67ebfb127a47bc8f684d50b32b2cff18ed5286701a04a289058185
 DIST spidermonkey-115-patches-02.tar.xz 4896 BLAKE2B f78d9804c1427b45d6fda496b4991ec6f672dec9ce031ed57a2920fa1968c942a235f46e40166c8ab8d731a1963f322d34bb2f6984133179175e6f7376d27d13 SHA512 11fd01152d1e7b8ca89bf628076e1f4fb4f1ba6c9dc0f9dd544252495c580c04e4d5ffc238d5587f9e993aa91a47828333564ca55f60e008bd370089cd07d2e6

dev-lang/spidermonkey/spidermonkey-128.3.0-r1.ebuild

@@ -1,480 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-FIREFOX_PATCHSET="firefox-128esr-patches-03.tar.xz"
-SPIDERMONKEY_PATCHSET="spidermonkey-128-patches-02.tar.xz"
-
-LLVM_COMPAT=( 17 18 19 )
-
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="ncurses,ssl,xml(+)"
-
-RUST_NEEDS_LLVM=1
-
-WANT_AUTOCONF="2.1"
-
-inherit autotools check-reqs flag-o-matic llvm-r1 multiprocessing python-any-r1 rust toolchain-funcs
-
-MY_PN="mozjs"
-MY_PV="${PV/_pre*}"
-
-MY_MAJOR=$(ver_cut 1)
-
-MOZ_ESR=yes
-
-MOZ_PV=${PV}
-MOZ_PV_SUFFIX=
-if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
-	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
-
-	# Convert the ebuild version to the upstream Mozilla version
-	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
-	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
-	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
-fi
-
-if [[ -n ${MOZ_ESR} ]] ; then
-	# ESR releases have slightly different version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-MOZ_PN="firefox"
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
-MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
-
-MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
-
-if [[ ${PV} == *_rc* ]] ; then
-	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
-fi
-
-PATCH_URIS=(
-	https://dev.gentoo.org/~juippis/mozilla/patchsets/${FIREFOX_PATCHSET}
-	https://dev.gentoo.org/~juippis/mozilla/patchsets/${SPIDERMONKEY_PATCHSET}
-)
-
-DESCRIPTION="Mozilla's JavaScript engine written in C and C++"
-HOMEPAGE="https://spidermonkey.dev https://firefox-source-docs.mozilla.org/js/index.html"
-SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
-	${PATCH_URIS[@]}"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-LICENSE="MPL-2.0"
-SLOT="$(ver_cut 1)"
-IUSE="clang cpu_flags_arm_neon debug +jit lto test"
-
-#RESTRICT="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="${PYTHON_DEPS}
-	$(llvm_gen_dep '
-		clang? (
-			llvm-core/clang:${LLVM_SLOT}
-			llvm-core/lld:${LLVM_SLOT}
-			llvm-core/llvm:${LLVM_SLOT}
-		)
-	')
-	>=dev-util/cbindgen-0.26.0
-	virtual/pkgconfig
-	test? (
-		$(python_gen_any_dep 'dev-python/six[${PYTHON_USEDEP}]')
-	)"
-DEPEND=">=dev-libs/icu-73.1:=
-	dev-libs/nspr
-	sys-libs/readline:0=
-	sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/firefox-${PV%_*}"
-
-llvm_check_deps() {
-	if use clang ; then
-		if ! has_version -b "llvm-core/clang:${LLVM_SLOT}" ; then
-			einfo "llvm-core/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-			return 1
-		fi
-
-		if ! has_version -b "llvm-core/llvm:${LLVM_SLOT}" ; then
-			einfo "llvm-core/llvm:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-			return 1
-		fi
-
-		if ! tc-ld-is-mold ; then
-			if ! has_version -b "llvm-core/lld:${LLVM_SLOT}" ; then
-				einfo "llvm-core/lld:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-				return 1
-			fi
-		fi
-	fi
-
-	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
-}
-
-mozconfig_add_options_ac() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_add_options_mk() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_use_enable() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_enable "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-python_check_deps() {
-	if use test ; then
-		python_has_version "dev-python/six[${PYTHON_USEDEP}]"
-	fi
-}
-
-pkg_pretend() {
-	if use test ; then
-		CHECKREQS_DISK_BUILD="4400M"
-	else
-		CHECKREQS_DISK_BUILD="4300M"
-	fi
-
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use test ; then
-			CHECKREQS_DISK_BUILD="4400M"
-		else
-			CHECKREQS_DISK_BUILD="4300M"
-		fi
-
-		check-reqs_pkg_setup
-
-		llvm-r1_pkg_setup
-		rust_pkg_setup
-
-		if use clang && use lto && tc-ld-is-lld ; then
-			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
-			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
-			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
-
-			local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
-			[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
-			[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
-
-			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
-				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
-				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
-				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
-				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
-				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
-				eerror "  - Rebuild lld with llvm that was used to build rust (may need to rebuild the whole "
-				eerror "    llvm/clang/lld/rust chain depending on your @world updates)"
-				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
-			fi
-		fi
-
-		python-any-r1_pkg_setup
-
-		# Build system is using /proc/self/oom_score_adj, bug #604394
-		addpredict /proc/self/oom_score_adj
-
-		if ! mountpoint -q /dev/shm ; then
-			# If /dev/shm is not available, configure is known to fail with
-			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
-			ewarn "/dev/shm is not mounted -- expect build failures!"
-		fi
-
-		# Ensure we use C locale when building, bug #746215
-		export LC_ALL=C
-	fi
-}
-
-src_prepare() {
-	if use lto ; then
-		rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch || die
-	fi
-
-	# Workaround for bgo #915651,915651,929013 on musl
-	if use elibc_glibc ; then
-		rm -v "${WORKDIR}"/firefox-patches/*bgo-748849-RUST_TARGET_override.patch || die
-	fi
-
-	eapply "${WORKDIR}"/firefox-patches
-	eapply "${WORKDIR}"/spidermonkey-patches
-
-	default
-
-	# Make cargo respect MAKEOPTS
-	export CARGO_BUILD_JOBS="$(makeopts_jobs)"
-
-	# Workaround for bgo #915651,915651,929013 on musl
-	if ! use elibc_glibc ; then
-		if use amd64 ; then
-			export RUST_TARGET="x86_64-unknown-linux-musl"
-		elif use x86 ; then
-			export RUST_TARGET="i686-unknown-linux-musl"
-		elif use arm64 ; then
-			export RUST_TARGET="aarch64-unknown-linux-musl"
-		elif use ppc64 ; then
-			export RUST_TARGET="powerpc64le-unknown-linux-musl"
-		else
-			die "Unknown musl chost, please post your rustc -vV along with emerge --info on Gentoo's bug #915651"
-		fi
-	fi
-
-	# sed-in toolchain prefix
-	sed -i \
-		-e "s/objdump/${CHOST}-objdump/" \
-		python/mozbuild/mozbuild/configure/check_debug_ranges.py ||
-			die "sed failed to set toolchain prefix"
-
-	einfo "Removing pre-built binaries ..."
-	find third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
-
-	# Create build dir
-	BUILD_DIR="${WORKDIR}/${PN}_build"
-	mkdir -p "${BUILD_DIR}" || die
-}
-
-src_configure() {
-	# Show flags set at the beginning
-	einfo "Current BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Current CFLAGS:    ${CFLAGS}"
-	einfo "Current CXXFLAGS:  ${CXXFLAGS}"
-	einfo "Current LDFLAGS:   ${LDFLAGS}"
-	einfo "Current RUSTFLAGS: ${RUSTFLAGS}"
-
-	local have_switched_compiler=
-	if use clang ; then
-		# Force clang
-		einfo "Enforcing the use of clang due to USE=clang ..."
-
-		local version_clang=$(clang --version 2>/dev/null | grep -F -- 'clang version' | awk '{ print $3 }')
-		[[ -n ${version_clang} ]] && version_clang=$(ver_cut 1 "${version_clang}")
-		[[ -z ${version_clang} ]] && die "Failed to read clang version!"
-
-		if tc-is-gcc; then
-			have_switched_compiler=yes
-		fi
-
-		AR=llvm-ar
-		CC=${CHOST}-clang-${version_clang}
-		CXX=${CHOST}-clang++-${version_clang}
-		NM=llvm-nm
-		RANLIB=llvm-ranlib
-		READELF=llvm-readelf
-		OBJDUMP=llvm-objdump
-
-	elif ! use clang && ! tc-is-gcc ; then
-		# Force gcc
-		have_switched_compiler=yes
-		einfo "Enforcing the use of gcc due to USE=-clang ..."
-		AR=gcc-ar
-		CC=${CHOST}-gcc
-		CXX=${CHOST}-g++
-		NM=gcc-nm
-		RANLIB=gcc-ranlib
-		READELF=readelf
-		OBJDUMP=objdump
-	fi
-
-	if [[ -n "${have_switched_compiler}" ]] ; then
-		# Because we switched active compiler we have to ensure
-		# that no unsupported flags are set
-		strip-unsupported-flags
-	fi
-
-	# Ensure we use correct toolchain,
-	# AS is used in a non-standard way by upstream, #bmo1654031
-	export HOST_CC="$(tc-getBUILD_CC)"
-	export HOST_CXX="$(tc-getBUILD_CXX)"
-	export AS="$(tc-getCC) -c"
-
-	tc-export CC CXX LD AR AS NM OBJDUMP RANLIB READELF PKG_CONFIG
-
-	# Pass the correct toolchain paths through cbindgen
-	if tc-is-cross-compiler ; then
-		export BINDGEN_CFLAGS="${SYSROOT:+--sysroot=${ESYSROOT}} --target=${CHOST} ${BINDGEN_CFLAGS-}"
-	fi
-
-	# ../python/mach/mach/mixin/process.py fails to detect SHELL
-	export SHELL="${EPREFIX}/bin/bash"
-
-	# Set state path
-	export MOZBUILD_STATE_PATH="${BUILD_DIR}"
-
-	# Set MOZCONFIG
-	export MOZCONFIG="${S}/.mozconfig"
-
-	# Initialize MOZCONFIG
-	mozconfig_add_options_ac '' --enable-project=js
-
-	mozconfig_add_options_ac 'Gentoo default' \
-		--host="${CBUILD:-${CHOST}}" \
-		--target="${CHOST}" \
-		--disable-ctype \
-		--disable-jemalloc \
-		--disable-smoosh \
-		--disable-strip \
-		--enable-readline \
-		--enable-release \
-		--enable-shared-js \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--prefix="${EPREFIX}/usr" \
-		--with-intl-api \
-		--with-system-icu \
-		--with-system-nspr \
-		--with-system-zlib \
-		--with-toolchain-prefix="${CHOST}-" \
-		--x-includes="${ESYSROOT}/usr/include" \
-		--x-libraries="${ESYSROOT}/usr/$(get_libdir)"
-
-	mozconfig_use_enable debug
-	mozconfig_use_enable jit
-	mozconfig_use_enable test tests
-
-	if use debug ; then
-		mozconfig_add_options_ac '+debug' --disable-optimize
-		mozconfig_add_options_ac '+debug' --enable-debug-symbols
-		mozconfig_add_options_ac '+debug' --enable-real-time-tracing
-	else
-		mozconfig_add_options_ac '-debug' --enable-optimize
-		mozconfig_add_options_ac '-debug' --disable-debug-symbols
-		mozconfig_add_options_ac '-debug' --disable-real-time-tracing
-	fi
-
-	# We always end up disabling this at some point due to newer rust versions. bgo#933372
-	mozconfig_add_options_ac '--disable-rust-simd' --disable-rust-simd
-
-	# Modifications to better support ARM, bug 717344
-	if use cpu_flags_arm_neon ; then
-		mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-fpu=neon
-
-		if ! tc-is-clang ; then
-			# thumb options aren't supported when using clang, bug 666966
-			mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-thumb=yes
-			mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-thumb-interwork=no
-		fi
-	fi
-
-	# Tell build system that we want to use LTO
-	if use lto ; then
-		if use clang ; then
-			if tc-ld-is-mold ; then
-				mozconfig_add_options_ac '+lto' --enable-linker=mold
-			else
-				mozconfig_add_options_ac '+lto' --enable-linker=lld
-			fi
-			mozconfig_add_options_ac '+lto' --enable-lto=cross
-
-		else
-			mozconfig_add_options_ac '+lto' --enable-linker=bfd
-			mozconfig_add_options_ac '+lto' --enable-lto=full
-		fi
-	fi
-
-	# LTO flag was handled via configure
-	filter-lto
-
-	# Pass MAKEOPTS to build system
-	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
-
-	# Use system's Python environment
-	export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="none"
-	export PIP_NETWORK_INSTALL_RESTRICTED_VIRTUALENVS=mach
-
-	# Disable notification when build system has finished
-	export MOZ_NOSPAM=1
-
-	# Portage sets XARGS environment variable to "xargs -r" by default which
-	# breaks build system's check_prog() function which doesn't support arguments
-	mozconfig_add_options_ac 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
-
-	# Set build dir
-	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
-
-	# Show flags we will use
-	einfo "Build BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Build CFLAGS:    ${CFLAGS}"
-	einfo "Build CXXFLAGS:  ${CXXFLAGS}"
-	einfo "Build LDFLAGS:   ${LDFLAGS}"
-	einfo "Build RUSTFLAGS: ${RUSTFLAGS}"
-
-	./mach configure || die
-}
-
-src_compile() {
-	./mach build --verbose || die
-}
-
-src_test() {
-	if "${BUILD_DIR}/js/src/js" -e 'print("Hello world!")'; then
-		einfo "Smoke-test successful, continuing with full test suite"
-	else
-		die "Smoke-test failed: did interpreter initialization fail?"
-	fi
-
-	cp "${FILESDIR}"/spidermonkey-${SLOT}-known-test-failures.txt "${T}"/known_test_failures.list || die
-
-	if use x86 ; then
-		echo "non262/Intl/DateTimeFormat/timeZone_version.js" >> "${T}"/known_test_failures.list
-		echo "test262/intl402/Locale/constructor-non-iana-canon.js" >> "${T}"/known_test_failures.list
-	fi
-
-	./mach jstests --exclude-file="${T}"/known_test_failures.list || die
-}
-
-src_install() {
-	cd "${BUILD_DIR}" || die
-	default
-
-	# fix soname links
-	pushd "${ED}"/usr/$(get_libdir) &>/dev/null || die
-	mv lib${MY_PN}-${MY_MAJOR}.so lib${MY_PN}-${MY_MAJOR}.so.0.0.0 || die
-	ln -s lib${MY_PN}-${MY_MAJOR}.so.0.0.0 lib${MY_PN}-${MY_MAJOR}.so.0 || die
-	ln -s lib${MY_PN}-${MY_MAJOR}.so.0 lib${MY_PN}-${MY_MAJOR}.so || die
-	popd &>/dev/null || die
-
-	# remove unneeded files
-	rm \
-		"${ED}"/usr/bin/js${MY_MAJOR}-config \
-		"${ED}"/usr/$(get_libdir)/libjs_static.ajs || die
-
-	# fix permissions
-	chmod -x \
-		"${ED}"/usr/$(get_libdir)/pkgconfig/*.pc \
-		"${ED}"/usr/include/mozjs-${MY_MAJOR}/js-config.h || die
-}

dev-libs/apache-arrow/apache-arrow-18.1.0.ebuild

@@ -28,7 +28,7 @@ S="${WORKDIR}/${P}/cpp"
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~riscv ~s390 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~riscv ~s390 x86"
 IUSE="
 	+brotli bzip2 compute dataset +json lz4 +parquet re2 +snappy ssl
 	test zlib zstd

dev-libs/c-blosc2/c-blosc2-2.15.2.ebuild

@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0/4"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test +zlib +zstd"
 REQUIRED_USE="test? ( zlib zstd )"
 RESTRICT="!test? ( test )"

dev-libs/castxml/Manifest

@@ -1,2 +1 @@
 DIST CastXML-0.6.10.tar.gz 123149 BLAKE2B c69caf043bdf733cbc519109ba0e2c675f169fbcbf3fe4d4c13c509fcd01838eab9e71b69369f152c7c3d41d48e73f8c1288091cd8addcefdb04de254f79ce0a SHA512 40d16714600f20f94d2b2da6d0021665f5115faf25d3d92d76b320fd8167f093991ad6e36ce0cbf9979d5ab265f246018f609f4b96a46b115bed411d398937cc
-DIST CastXML-0.6.8.tar.gz 122609 BLAKE2B 3266535a2f08e4aa3c344f2d26cb0b98ba5d3736036ba95face5a603bbc9547a53647892e1f11cf748d954c556bec2099a734a9b9e566254186e9765c0410413 SHA512 7645286ef7fe89ebd1d582a289f9446a96f9aa6db89539314cc2a77bd005ca203d0346f5b4f7d14b83baefc41e0a2a8e55585b429985777cff6c3c0ffc1ef6ce

dev-libs/castxml/castxml-0.6.10.ebuild

@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~riscv ~x86"
 IUSE="+man test"
 RESTRICT="!test? ( test )"
 

dev-libs/castxml/castxml-0.6.8.ebuild

@@ -1,64 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {17..19} )
-
-inherit cmake llvm-r1
-
-MY_P=CastXML-${PV}
-DESCRIPTION="C-family abstract syntax tree XML output tool"
-HOMEPAGE="https://github.com/CastXML/CastXML"
-SRC_URI="
-	https://github.com/CastXML/CastXML/archive/v${PV}.tar.gz
-		-> ${MY_P}.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~riscv ~x86"
-IUSE="+man test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	$(llvm_gen_dep '
-		llvm-core/clang:${LLVM_SLOT}=
-	')
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	man? ( dev-python/sphinx )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCastXML_INSTALL_DOC_DIR="share/doc/${PF}"
-		-DCastXML_INSTALL_MAN_DIR="share/man"
-		-DSPHINX_MAN="$(usex man)"
-		-DSPHINX_HTML=OFF
-		-DBUILD_TESTING="$(usex test)"
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	local CMAKE_SKIP_TESTS=(
-		# Regex doesn't match the full build path
-		cmd.input-missing
-		cmd.rsp-missing
-
-		# Gets confused by extra #defines we set for hardening etc (bug #891813)
-		cmd.cc-gnu-src-cxx-E
-		cmd.cc-gnu-src-cxx-cmd
-		cmd.cc-gnu-c-src-c-E
-		cmd.cc-gnu-c-src-c-cmd
-		cmd.cc-gnu-tgt-i386-opt-E
-		cmd.cc-gnu-c-tgt-i386-opt-E
-	)
-
-	cmake_src_test
-}

dev-libs/glib/Manifest

@@ -5,5 +5,6 @@ DIST glib-2.78.6.tar.xz 5344808 BLAKE2B d16173794c4aa019459cf8c8c84d4107fb839382
 DIST glib-2.80.4.tar.xz 5535760 BLAKE2B 1d2b301703b27a5c2def370e1d44b4f7b08a940969563ce9d8d7c38e5f0a32163b95523e09cedc4a57b2af84a57d63dc545abcb31b61a8066ef62ba396fb4f3c SHA512 efdc7dd1e0609b0f2d988a8cc8fd4a3fda96e8450832f905f7686f9063b727cb996e0e4e638aca62f60b76f9f04be62e089a615413e64cf298c7eef26e074570
 DIST glib-2.80.5.tar.xz 5538308 BLAKE2B 3f17ff85a85d20858b69c2dccc1e5d6ffd92661a8cfda8b8770dd391861999ff3381008f4fe382e90f0a7798fe218debda7f559f6e3ac8f9305e3be98b879969 SHA512 c9cc9f99e217fd950810fcfbfa7300c7850cae4dbfbabc03cdcadb6dcca2e51ea7979ceb68c09d8e9776fd1c04db73b89b81f748c8bd911e1f7ad9f704dff172
 DIST glib-2.82.2.tar.xz 5555528 BLAKE2B 930fa7816082e6ba4b7f394985840bb6abf4fe9a4451286cddd3cfc8a4f3d4e3b4f06f09fbb34486f6fd47d0b72363b06a280ccae62d061724a7a2e00734bc4c SHA512 d5b761ec0c088496f2f9e5767568076a30ff492c272f21133560689f4e6a177d403c78d71ef85da63de331152c4d1f27b65d3e927ebfaf0fb63592f66e564ea1
+DIST glib-2.82.4.tar.xz 5556896 BLAKE2B 62caecc7570b1639f6ddf1deb9debb6d3d6180b74f497f2fcace5ce65d6e28996555d51e5b4980f500bdc3f811b5b6214521b1170f553f2fa1fd240fd0eec835 SHA512 5df0b3c56fe6cf6c94019e29afb408174a5864cdb97cf58d5a12a0f83990b5c2004a49c8e3b0e195f5808874b5911a4a7b3d6aea8718aada1b40561e623cd08d
 DIST gobject-introspection-1.80.1.tar.xz 1040228 BLAKE2B 7a8c1da9bc8aef293deedde1eed97536fa2f42f79a9761ac8ededb0676e46b636545a69e20e63d812844aeb626fa4fb7ce3c7922e51554fdc79560f16443acd9 SHA512 f45c2c1b105086488d974c6134db9910746df8edb187772f2ecd249656a1047c8ac88ba51f5bf7393c3d99c3ace143ecd09be256c2f4d0ceee110c9ad51a839a
 DIST gobject-introspection-1.82.0.tar.xz 1052872 BLAKE2B 8336ae26d48a71a203655d9d268076f603055ceabb55dbfa676f2c67b4096b83afc106d485dc45d02b3a8be806f9ef50d54806a82e61f2a252ae59543c61e934 SHA512 e139fadb4174c72b648914f3774d89fc0e5eaee45bba0c13edf05de883664dad8276dbc34006217bb09871ed4bad23adab51ff232a17b9eb131329b2926cafb7

dev-libs/glib/glib-2.80.5.ebuild

@@ -214,8 +214,8 @@ multilib_src_configure() {
 	# Build internal copy of gobject-introspection to avoid circular dependency (Built for native abi only)
 	if multilib_native_use introspection && ! has_version ">=dev-libs/${INTROSPECTION_P}" ; then
 		einfo "Bootstrapping gobject-introspection..."
-		INTROSPECTION_BIN_DIR="${T}/usr/bin"
+		INTROSPECTION_BIN_DIR="${T}/${EPREFIX}/usr/bin"
-		INTROSPECTION_LIB_DIR="${T}/usr/$(get_libdir)"
+		INTROSPECTION_LIB_DIR="${T}/${EPREFIX}/usr/$(get_libdir)"
 
 		local emesonargs=(
 			-Dpython="${EPYTHON}"
@@ -268,7 +268,10 @@ multilib_src_configure() {
 		export PKG_CONFIG_LIBDIR="${INTROSPECTION_LIB_DIR}/pkgconfig:${INTROSPECTION_BUILD_DIR}/meson-private"
 
 		# Set the normal primary pkgconfig search paths as secondary
-		export PKG_CONFIG_PATH="$(pkg-config --variable pc_path pkg-config)"
+		# (We also need to prepend our just-built one for later use of
+		# g-ir-scanner to use the new one and to help workaround bugs like
+		# bug #946221.)
+		export PKG_CONFIG_PATH="${PKG_CONFIG_LIBDIR}:$(pkg-config --variable pc_path pkg-config)"
 
 		# Add the paths to the built glib libraries to the library path so that gobject-introspection can load them
 		for gliblib in glib gobject gthread gmodule gio girepository; do

dev-libs/glib/glib-2.82.2.ebuild

@@ -214,8 +214,8 @@ multilib_src_configure() {
 	# Build internal copy of gobject-introspection to avoid circular dependency (Built for native abi only)
 	if multilib_native_use introspection && ! has_version ">=dev-libs/${INTROSPECTION_P}" ; then
 		einfo "Bootstrapping gobject-introspection..."
-		INTROSPECTION_BIN_DIR="${T}/usr/bin"
+		INTROSPECTION_BIN_DIR="${T}/${EPREFIX}/usr/bin"
-		INTROSPECTION_LIB_DIR="${T}/usr/$(get_libdir)"
+		INTROSPECTION_LIB_DIR="${T}/${EPREFIX}/usr/$(get_libdir)"
 
 		local emesonargs=(
 			-Dpython="${EPYTHON}"
@@ -268,7 +268,10 @@ multilib_src_configure() {
 		export PKG_CONFIG_LIBDIR="${INTROSPECTION_LIB_DIR}/pkgconfig:${INTROSPECTION_BUILD_DIR}/meson-private"
 
 		# Set the normal primary pkgconfig search paths as secondary
-		export PKG_CONFIG_PATH="$(pkg-config --variable pc_path pkg-config)"
+		# (We also need to prepend our just-built one for later use of
+		# g-ir-scanner to use the new one and to help workaround bugs like
+		# bug #946221.)
+		export PKG_CONFIG_PATH="${PKG_CONFIG_LIBDIR}:$(pkg-config --variable pc_path pkg-config)"
 
 		# Add the paths to the built glib libraries to the library path so that gobject-introspection can load them
 		for gliblib in glib gobject gthread gmodule gio girepository; do

dev-libs/glib/glib-2.82.4.ebuild

@@ -0,0 +1,430 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg
+
+DESCRIPTION="The GLib library of C routines"
+HOMEPAGE="https://www.gtk.org/"
+
+INTROSPECTION_PN="gobject-introspection"
+INTROSPECTION_PV="1.82.0"
+INTROSPECTION_P="${INTROSPECTION_PN}-${INTROSPECTION_PV}"
+SRC_URI="
+	${SRC_URI}
+	introspection? ( mirror://gnome/sources/gobject-introspection/${INTROSPECTION_PV%.*}/gobject-introspection-${INTROSPECTION_PV}.tar.${GNOME_TARBALL_SUFFIX} )
+"
+INTROSPECTION_SOURCE_DIR="${WORKDIR}/${INTROSPECTION_P}"
+INTROSPECTION_BUILD_DIR="${WORKDIR}/${INTROSPECTION_P}-build"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="dbus debug +elf doc +introspection +mime selinux static-libs sysprof systemtap test utils xattr"
+RESTRICT="!test? ( test )"
+
+# * elfutils (via libelf) does not build on Windows. gresources are not embedded
+# within ELF binaries on that platform anyway and inspecting ELF binaries from
+# other platforms is not that useful so exclude the dependency in this case.
+# * Technically static-libs is needed on zlib, util-linux and perhaps more, but
+# these are used by GIO, which glib[static-libs] consumers don't really seem
+# to need at all, thus not imposing the deps for now and once some consumers
+# are actually found to static link libgio-2.0.a, we can revisit and either add
+# them or just put the (build) deps in that rare consumer instead of recursive
+# RDEPEND here (due to lack of recursive DEPEND).
+RDEPEND="
+	!<dev-libs/gobject-introspection-1.80.1
+	!<dev-util/gdbus-codegen-${PV}
+	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+	>=dev-libs/libpcre2-10.32:0=[${MULTILIB_USEDEP},unicode(+),static-libs?]
+	>=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
+	introspection? (
+		>=dev-libs/gobject-introspection-common-${INTROSPECTION_PV}
+	)
+	kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] )
+	selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
+	xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) )
+	elf? ( virtual/libelf:0= )
+	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+# libxml2 used for optional tests that get automatically skipped
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	>=sys-devel/gettext-0.19.8
+	doc? ( >=dev-util/gi-docgen-2023.1 )
+	dev-python/docutils
+	systemtap? ( >=dev-debug/systemtap-1.3 )
+	${PYTHON_DEPS}
+	test? ( >=sys-apps/dbus-1.2.14 )
+	virtual/pkgconfig
+
+	introspection? (
+		$(python_gen_any_dep '
+			dev-python/setuptools[${PYTHON_USEDEP}]
+		')
+		virtual/pkgconfig
+		sys-devel/bison
+		app-alternatives/lex
+		${PYTHON_DEPS}
+	)
+"
+# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen
+
+PDEPEND="
+	dbus? ( gnome-base/dconf )
+	mime? ( x11-misc/shared-mime-info )
+"
+# shared-mime-info needed for gio/xdgmime, bug #409481
+# dconf is needed to be able to save settings, bug #498436
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gio-querymodules$(get_exeext)
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch
+)
+
+python_check_deps() {
+	if use introspection ; then
+		python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]"
+	fi
+}
+
+pkg_setup() {
+	if use kernel_linux ; then
+		CONFIG_CHECK="~INOTIFY_USER"
+		if use test ; then
+			CONFIG_CHECK="~IPV6"
+			WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
+		fi
+		linux-info_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	if use test; then
+		# TODO: Review the test exclusions, especially now with meson
+		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
+		if ! has_version dev-util/desktop-file-utils ; then
+			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
+			ewarn "think on installing it to get these tests run."
+			sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
+			sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
+		fi
+
+		# gdesktopappinfo requires existing terminal (gnome-terminal or any
+		# other), falling back to xterm if one doesn't exist
+		#if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
+		#	ewarn "Some tests will be skipped due to missing terminal program"
+		# These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson
+		# Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready
+		# for backport (or in a bump) and file new issue if still fails
+		sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
+		# desktop-app-info/launch* might fail similarly
+		sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die
+		#fi
+
+		# https://bugzilla.gnome.org/show_bug.cgi?id=722604
+		sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
+		sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
+
+		ewarn "Tests for search-utils have been skipped"
+		sed -i -e "/search-utils/d" glib/tests/meson.build || die
+
+		# Play nice with network-sandbox, but this approach would defeat the purpose of the test
+		#sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die
+	else
+		# Don't build tests, also prevents extra deps, bug #512022
+		sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die
+	fi
+
+	# Don't build fuzzing binaries - not used
+	sed -i -e '/subdir.*fuzzing/d' meson.build || die
+
+	# gdbus-codegen is a separate package
+	sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die
+	sed -i -e '/install : true/d' gio/gdbus-2.0/codegen/meson.build || die
+
+	# Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon
+	sed -i -e '/install_dir/d' gio/tests/meson.build || die
+
+	cat > "${T}/glib-test-ld-wrapper" <<-EOF
+		#!/usr/bin/env sh
+		exec \${LD:-ld} "\$@"
+	EOF
+	chmod a+x "${T}/glib-test-ld-wrapper" || die
+	sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die
+
+	# make default sane for us
+	if use prefix ; then
+		sed -i -e "s:/usr/local:${EPREFIX}/usr:" gio/xdgmime/xdgmime.c || die
+		# bug #308609, without path, bug #314057
+		export PERL=perl
+	fi
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# fix standards conflicts
+		sed -i \
+			-e 's/\<\(_XOPEN_SOURCE_EXTENDED\)\>/_POSIX_PTHREAD_SEMANTICS/' \
+			-e '/\<_XOPEN_SOURCE\>/s/\<2\>/600/' \
+			meson.build || die
+		sed -i -e '/#define\s\+_POSIX_SOURCE/d' \
+			glib/giounix.c || die
+	fi
+
+	# disable native macOS integrations
+	sed -i -e '/glib_conf.set(.HAVE_\(CARBON\|COCOA\).,/s/true/false/' \
+		meson.build || die
+	sed -i \
+		-e '/AvailabilityMacros.h/d' \
+		gio/giomodule.c || die
+
+	# Link the glib source to the introspection subproject directory so it can be built there first
+	if use introspection ; then
+		ln -s "${S}" "${INTROSPECTION_SOURCE_DIR}/subprojects/glib"
+	fi
+
+	default
+	gnome2_environment_reset
+	# TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only
+}
+
+multilib_src_configure() {
+	# TODO: figure a way to pass appropriate values for all cross properties
+	# that glib uses (search for get_cross_property)
+	#if tc-is-cross-compiler ; then
+		# https://bugzilla.gnome.org/show_bug.cgi?id=756473
+		# TODO-meson: This should be in meson cross file as 'growing_stack'
+		# property; and more, look at get_cross_property
+		#case ${CHOST} in
+		#hppa*|metag*) export glib_cv_stack_grows=yes ;;
+		#*)            export glib_cv_stack_grows=no ;;
+		#esac
+	#fi
+
+	# Build internal copy of gobject-introspection to avoid circular dependency (Built for native abi only)
+	if multilib_native_use introspection && ! has_version ">=dev-libs/${INTROSPECTION_P}" ; then
+		einfo "Bootstrapping gobject-introspection..."
+		INTROSPECTION_BIN_DIR="${T}/${EPREFIX}/usr/bin"
+		INTROSPECTION_LIB_DIR="${T}/${EPREFIX}/usr/$(get_libdir)"
+
+		local emesonargs=(
+			-Dpython="${EPYTHON}"
+			-Dbuild_introspection_data=true
+			# Build an internal copy of glib for the internal copy of gobject-introspection
+			--force-fallback-for=glib
+			# Tell meson to make paths in pkgconfig files relative, because we arent doing an actual install
+			-Dpkgconfig.relocatable=true
+
+			# We want as minimal a build as possible here to speed things up
+			# and reduce the risk of failures.
+			-Dglib:selinux=disabled
+			-Dglib:xattr=false
+			-Dglib:libmount=disabled
+			-Dglib:man-pages=disabled
+			-Dglib:dtrace=false
+			-Dglib:systemtap=false
+			-Dglib:sysprof=disabled
+			-Dglib:documentation=false
+			-Dglib:tests=false
+			-Dglib:installed_tests=false
+			-Dglib:nls=disabled
+			-Dglib:oss_fuzz=disabled
+			-Dglib:libelf=disabled
+			-Dglib:multiarch=false
+		)
+
+		ORIG_SOURCE_DIR=${EMESON_SOURCE}
+		EMESON_SOURCE=${INTROSPECTION_SOURCE_DIR}
+
+		ORIG_BUILD_DIR=${BUILD_DIR}
+		BUILD_DIR=${INTROSPECTION_BUILD_DIR}
+
+		pushd ${INTROSPECTION_SOURCE_DIR} || die
+
+		meson_src_configure
+		meson_src_compile
+		# Install to the portage temp directory so that pkgconfig relative paths resolve correctly
+		meson_src_install --destdir "${T}" --skip-subprojects glib
+
+		popd || die
+
+		EMESON_SOURCE=${ORIG_SOURCE_DIR}
+		BUILD_DIR=${ORIG_BUILD_DIR}
+
+		# Add gobject-introspection binaries and pkgconfig files to path
+		export PATH="${INTROSPECTION_BIN_DIR}:${PATH}"
+
+		# Override primary pkgconfig search paths to prioritize our internal copy
+		export PKG_CONFIG_LIBDIR="${INTROSPECTION_LIB_DIR}/pkgconfig:${INTROSPECTION_BUILD_DIR}/meson-private"
+
+		# Set the normal primary pkgconfig search paths as secondary
+		# (We also need to prepend our just-built one for later use of
+		# g-ir-scanner to use the new one and to help workaround bugs like
+		# bug #946221.)
+		export PKG_CONFIG_PATH="${PKG_CONFIG_LIBDIR}:$(pkg-config --variable pc_path pkg-config)"
+
+		# Add the paths to the built glib libraries to the library path so that gobject-introspection can load them
+		for gliblib in glib gobject gthread gmodule gio girepository; do
+			export LD_LIBRARY_PATH="${BUILD_DIR}/${gliblib}:${LD_LIBRARY_PATH}"
+		done
+
+		# Add the paths to the gobject-introspection python modules to python path so they can be imported
+		export PYTHONPATH="${INTROSPECTION_LIB_DIR}/gobject-introspection:${PYTHONPATH}"
+	fi
+
+	use debug && EMESON_BUILD_TYPE=debug
+
+	local emesonargs=(
+		-Ddefault_library=$(usex static-libs both shared)
+		-Druntime_dir="${EPREFIX}"/run
+		$(meson_feature selinux)
+		$(meson_use xattr)
+		-Dlibmount=enabled # only used if host_system == 'linux'
+		-Dman-pages=enabled
+		$(meson_use systemtap dtrace)
+		$(meson_use systemtap)
+		$(meson_feature sysprof)
+		$(meson_use doc documentation)
+		$(meson_use test tests)
+		-Dinstalled_tests=false
+		-Dnls=enabled
+		-Doss_fuzz=disabled
+		$(meson_native_use_feature elf libelf)
+		-Dmultiarch=false
+		$(meson_native_use_feature introspection)
+	)
+
+	# Workaround for bug #938302
+	if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
+		local native_file="${T}"/meson.${CHOST}.ini.local
+		cat >> ${native_file} <<-EOF || die
+		[binaries]
+		dtrace='stap-dtrace'
+		EOF
+		emesonargs+=( --native-file "${native_file}" )
+	fi
+
+	meson_src_configure
+}
+
+multilib_src_test() {
+	export XDG_CONFIG_DIRS=/etc/xdg
+	export XDG_DATA_DIRS=/usr/local/share:/usr/share
+	# TODO: Use ${ABI} here to be unique for multilib?
+	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
+	export LC_TIME=C # bug #411967
+	export TZ=UTC
+	unset GSETTINGS_BACKEND # bug #596380
+	python_setup
+
+	# https://bugs.gentoo.org/839807
+	local -x SANDBOX_PREDICT=${SANDBOX_PREDICT}
+	addpredict /usr/b
+
+	# Related test is a bit nitpicking
+	mkdir -p "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" || die
+	chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" || die
+
+	meson_src_test --timeout-multiplier 20 --no-suite flaky
+}
+
+multilib_src_install() {
+	meson_src_install
+	keepdir /usr/$(get_libdir)/gio/modules
+}
+
+multilib_src_install_all() {
+	# These are installed by dev-util/glib-utils
+	# TODO: With patching we might be able to get rid of the python-any deps
+	# and removals, and test depend on glib-utils instead; revisit now with
+	# meson
+	rm "${ED}/usr/bin/glib-genmarshal" || die
+	rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die
+	rm "${ED}/usr/bin/glib-mkenums" || die
+	rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die
+	rm "${ED}/usr/bin/gtester-report" || die
+	rm "${ED}/usr/share/man/man1/gtester-report.1" || die
+	# gdbus-codegen manpage installed by dev-util/gdbus-codegen
+	rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+
+	# Make gschemas.compiled belong to glib alone
+	local cache="/usr/share/glib-2.0/schemas/gschemas.compiled"
+
+	if [[ -e ${EROOT}${cache} ]]; then
+		cp "${EROOT}"${cache} "${ED}"/${cache} || die
+	else
+		touch "${ED}"${cache} || die
+	fi
+
+	multilib_pkg_preinst() {
+		# Make giomodule.cache belong to glib alone
+		local cache="/usr/$(get_libdir)/gio/modules/giomodule.cache"
+
+		if [[ -e ${EROOT}${cache} ]]; then
+			cp "${EROOT}"${cache} "${ED}"${cache} || die
+		else
+			touch "${ED}"${cache} || die
+		fi
+	}
+
+	# Don't run the cache ownership when cross-compiling, as it would end up with an empty cache
+	# file due to inability to create it and GIO might not look at any of the modules there
+	if ! tc-is-cross-compiler ; then
+		multilib_foreach_abi multilib_pkg_preinst
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	# glib installs no schemas itself, but we force update for fresh install in case
+	# something has dropped in a schemas file without direct glib dep; and for upgrades
+	# in case the compiled schema format could have changed
+	gnome2_schemas_update
+
+	multilib_pkg_postinst() {
+		gnome2_giomodule_cache_update \
+			|| die "Update GIO modules cache failed (for ${ABI})"
+	}
+	if ! tc-is-cross-compiler ; then
+		multilib_foreach_abi multilib_pkg_postinst
+	else
+		ewarn "Updating of GIO modules cache skipped due to cross-compilation."
+		ewarn "You might want to run gio-querymodules manually on the target for"
+		ewarn "your final image for performance reasons and re-run it when packages"
+		ewarn "installing GIO modules get upgraded or added to the image."
+	fi
+
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "$v" "-lt" "2.63.6"; then
+			ewarn "glib no longer installs the gio-launch-desktop binary. You may need"
+			ewarn "to restart your session for \"Open With\" dialogs to work."
+		fi
+	done
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		multilib_pkg_postrm() {
+			rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache || die
+		}
+		multilib_foreach_abi multilib_pkg_postrm
+		rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled || die
+	fi
+}

dev-libs/icu-layoutex/icu-layoutex-75.1.ebuild

@@ -19,7 +19,7 @@ S="${WORKDIR}"/${PN/-layoutex}/source
 LICENSE="BSD"
 SLOT="0/${PV%.*}"
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 sparc x86"
+	KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 sparc x86"
 fi
 IUSE="debug static-libs test"
 RESTRICT="!test? ( test )"

dev-libs/icu-le-hb/icu-le-hb-2.0.0.ebuild

@@ -11,7 +11,7 @@ SRC_URI="https://github.com/harfbuzz/icu-le-hb/releases/download/${PV}/${P}.tar.
 
 LICENSE="icu"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ppc ppc64 sparc x86"
 
 # dev-libs/icu is not linked into icu-le-hb but the latter still needs
 # to be rebuilt on dev-libs/icu upgrades (see bug #621786).

dev-libs/icu/icu-75.1.ebuild

@@ -19,7 +19,7 @@ SRC_URI+=" verify-sig? ( https://github.com/unicode-org/icu/releases/download/re
 S="${WORKDIR}"/${PN}/source
 
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 LICENSE="BSD"
 SLOT="0/${PV%.*}"

dev-libs/libgcrypt/libgcrypt-1.11.0-r1.ebuild

@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
 
 LICENSE="LGPL-2.1+ GPL-2+ MIT"
 SLOT="0/20" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="+asm doc +getentropy static-libs"
 IUSE+=" cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_arm_sve"
 IUSE+=" cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 cpu_flags_ppc_vsx3"

dev-libs/libmodbus/libmodbus-3.1.11-r1.ebuild

@@ -11,7 +11,7 @@ SRC_URI="https://github.com/stephane/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 

dev-libs/nspr/nspr-4.36.ebuild

@@ -13,7 +13,7 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE="debug"
 
 MULTILIB_CHOST_TOOLS=(