Sync with portage [Tue Oct 24 09:30:38 MSK 2023].

6 months ago · 4f49bd1094
parent 66182e236f
commit 4f49bd1094
16095 changed files with 59047 additions and 30309 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/ansible-lint/Manifest
+++ b/app-admin/ansible-lint/Manifest
@ -1,3 +1,3 @@
 DIST ansible-lint-6.18.0.tar.gz 485342 BLAKE2B 8ec5a7aac4912518069adbb1b1f2a012658abd140e2d2f02808dbfdd0a8397d56bf40b66640ba299f488d1e9eababfa3105cc9c9e8e19c00eefa2a5d58c2669d SHA512 10dcb2cb92c2cf689a20dc9e12b27d2a3ee45c04f3a11470e19b62ee296e2d7fd42e49ff356929f4cea2f74f4269ae7c4d8c18b0c349bf59795898a4ed491c69
-DIST ansible-lint-6.20.0.tar.gz 498522 BLAKE2B e64e9a680bcedf55f2f0018a8bbe71d1587da930fdfce23fcb29fc5d17902e7fa0217e3179eb3e8aaa6c0a17548df0067385a7d0ffdaeb26208018955e0af614 SHA512 4e7ed61baabc755d38db89f797808114598d2838419668423baf1080f1ae58cc862310024b631ce4b03bd268fa17051a5d78f3ba4cd3a31d8b5f5f0e4ec5c003
 DIST ansible-lint-6.20.3.tar.gz 502540 BLAKE2B 2958c0515d6567922c01b323ca44de80f81dc57715c8a61c64f3c3813139469bade696666b15ddbab4fe06781a1d480fa79b7b4d58516925022aec421d7e20b6 SHA512 fa5be67960478b0c93c18259239b192dc8ca06426e9dbb66a102eab1b37e5ea60c46cfbbc4304bc458312ce3ae95c52b14a5e6582073d266d6b325d19417a875
+DIST ansible-lint-6.21.1.tar.gz 508487 BLAKE2B 9a29a5d192675a8801846fc29641651c35be5cc4d120aad128ae248a86c8493aa9125b2abb428e0fa41b233cd669a8496c85a22de7d9bac99760bbcff222066c SHA512 538735ef89bcbb65077a0e02d6c9143c0aab2ce2160679d85c8dc5d222815230893f7c9bc4ee539c20d82cd7a8c1f72d3d7ee63666c49de603f4fa99964c260e
--- a/app-admin/ansible-lint/ansible-lint-6.21.1.ebuild
+++ b/app-admin/ansible-lint/ansible-lint-6.21.1.ebuild
@ -39,6 +39,7 @@ BDEPEND="
 	>=dev-python/setuptools-scm-7.0.5[${PYTHON_USEDEP}]
 	test? (
 		dev-python/mypy[${PYTHON_USEDEP}]
+		dev-python/jmespath[${PYTHON_USEDEP}]
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
 		>=dev-python/pytest-plus-0.2[${PYTHON_USEDEP}]
 		>=dev-python/pytest-xdist-2.5.0[${PYTHON_USEDEP}]
--- a/app-admin/ansible-molecule/ansible-molecule-5.1.0.ebuild
+++ b/app-admin/ansible-molecule/ansible-molecule-5.1.0.ebuild
@ -18,7 +18,7 @@ PYPI_PN="molecule"
 inherit distutils-r1 docs optfeature pypi

 DESCRIPTION="A toolkit designed to aid in the development and testing of Ansible roles"
-HOMEPAGE="https://pypi.org/project/molecule/ https://github.com/ansible-community/molecule/"
+HOMEPAGE="https://pypi.org/project/molecule/ https://github.com/ansible/molecule/"

 LICENSE="MIT"
 SLOT="0"
@ -42,7 +42,7 @@ RDEPEND="$(python_gen_cond_dep '
 	selinux? ( sys-libs/libselinux[python,${PYTHON_USEDEP}] )
 ')"
 BDEPEND="$(python_gen_cond_dep '
-	>=dev-python/setuptools-scm-7.0.0[${PYTHON_USEDEP}]
+	<dev-python/setuptools-scm-8[${PYTHON_USEDEP}]
 	doc? (
 		dev-python/pillow[truetype,${PYTHON_USEDEP}]
 		media-fonts/roboto
--- a/app-admin/ansible-molecule/metadata.xml
+++ b/app-admin/ansible-molecule/metadata.xml
@ -8,6 +8,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">molecule</remote-id>
-		<remote-id type="github">ansible-community/molecule</remote-id>
+		<remote-id type="github">ansible/molecule</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@ -1,9 +1,4 @@
-DIST aws-cli-1.29.53.gh.tar.gz 2549518 BLAKE2B 4c9932ddbfb5f8619006589c0ed8f00b5d0230bc9d7fa811875cc4b16e9b5583a3abe4ccbb290524565dde2f78ae5696162863ea6e5224517c98414d7cb74344 SHA512 1150c20f5cc3da3a0ba2e25741441a7db8b6e399a927366902b30fd30a394634d015cc6b53bbfe7bcb759ce0aec6e0f9432a23e5b8d00cd9c2bb71afd5744627
-DIST aws-cli-1.29.57.gh.tar.gz 2556732 BLAKE2B 8bbd17041c28e18f1b94421e624e3e7209a751bcd5508b75ff5473aba814e00453159151ddbc1daca5013d06cf418384af1703a34ddf9ecb7b6dbdfe5b91c3c9 SHA512 4cbc7df76930ce5626b45a100e1fe62695d470f02af025e483eb161f92828d2d535e91b3200f9c55dc50f30955b88e5f74e015e229649e2debac0acb2da5345b
-DIST aws-cli-1.29.61.gh.tar.gz 2559946 BLAKE2B cab7954d50a235051a11978f1ee4316a0324d9b1dd492efc61ba22c1240b6c385e327756789c66b9f67443fe317f0aa464393b1a09abc300117241a6a967f4f4 SHA512 54ccad4f811956663ef68c42c33737d424996237d6dd5486e41c2bfe8b486236ebd60226edda1fcc256c0cc48924632040f163b11d2cba48ab1d16c32c0a114f
 DIST aws-cli-1.29.62.gh.tar.gz 2560151 BLAKE2B 0aa6dba4dcee72e0d3cbddb62ebcd9405682facfee4ad1348a53a5c09811a7583d7177814265158de0306518b62ae66eade301311c72cd7ddc380201d16ff30f SHA512 cda4bcc0ac535eb007b44e517d22b17cda6518d6db25162cdd0f7b506de449c72add8221d17c6cd145e0029f17c0e183928061e04b7b27274a58d157142ead7c
 DIST aws-cli-1.29.63.gh.tar.gz 2561207 BLAKE2B 83d1bf59c565ae5035eea0bfff91b2ac41e09cd250916db3bdb52b3cd336c869ca023acddf31418ca4ae81162d6cafb1cb915372d17988a4e616c018fceeb47b SHA512 2f6a699a8e1b3526adc49e88079cf19c7ddb18c6a3653ddb622ef5bc2d00dcbd4b490324e3d30f0911a236d692970072f999216876108fa6967450bc42cb1072
-DIST aws-cli-1.29.64.gh.tar.gz 2561807 BLAKE2B a4423549d6bd5789ebbd027febc411a7ab5be46bbcf1b407dc40fa95005c00bf413205c47099bb17e1f26f9d693a1af34479cbf29881dfa1544c42cc5193c0d6 SHA512 1238881d78483f7e5bd06c4653471406f7c5da8904bf5ef1a9fa3c4f8b44138313289ea626e411b2827b89a779bd1990a99a43b909b59ba022f95e38b3a025ff
-DIST aws-cli-1.29.65.gh.tar.gz 2562601 BLAKE2B 4c88ae2dcd37685f6908e027dc960d14e08f268f4f0784763b2e371f598d848c055847e27540c14d1ac745e4d87ce894e1e5a375c46ea522c384cb377146816a SHA512 b2bbcb989602be9b4f513cf8c0feddd2c680d005568d0f82a82206ebf13f2235fd0650d85502738bd0f2410e5a006d14fafa1873b7d9ba453843e8f055985a51
-DIST aws-cli-1.29.66.gh.tar.gz 2563105 BLAKE2B 547b401269b8ea5431c3ff831c513306fa4d4c9fe21a15cba74528e460e626b900f0e29ddcb93c6735d1b85f8ad89528de576a87c0bcc2f31147f047add2449d SHA512 1114e1c2279d59ee1396716ccc619e8073ff425c1eaa88cf7ee5274ebfac0361646ad8d17a4a4bc565714e5dbd6537767d91ea039fa163761cb7f38c20760c24
-DIST aws-cli-1.29.67.gh.tar.gz 2564759 BLAKE2B d73e71c37372a2bef0c2338b38d67f52e15619d3611cd664111d173e31e8ab9b3d87dbd0d1e94f7df3cbb0005410dadc748c95042143c7a0822705318e1ac25c SHA512 c9651ba2db96e4823aa7a3cdc9a3632f666dc3589e15f16c82fce7eb9b21a59468912f330255b379b47dec0c25c5c9d05536e61f4036a64259534860081e8e5b
+DIST aws-cli-1.29.68.gh.tar.gz 2565226 BLAKE2B b1f2209738c3a54beac322b14ceb54d31a4288b85038c2778d56d8dcafbabe7a307aa228c96e73faabc0ad2495edb65f701a35eddc506c70f0873f9084177c36 SHA512 d8cafa7560ab0f824b190301d9889d0cfe5d746a9a7edd3b19ad003ee70c5f6cc9a26403ec961826462f5e5509a2e12f8a6a99d851fc97b1e46f44e59294aca2
+DIST aws-cli-1.29.69.gh.tar.gz 2565597 BLAKE2B 121ad22fe37968dc2f4b3f7fbe9af7af2bd578fa340b1caf44d089b2b12cc019a9b7734a42f64569483411a2849bc67a32ee59910e00988571d6ec480f6988d9 SHA512 1f3f4d6ba1d5302b6b9080a696fb496b405279610377ba4c87a146b60b3bfbebe2c68855704835eb99c6eb2a2e8de33086bb5632a2954a8bbc4f3e7d18d8ee41
--- a/app-admin/awscli/awscli-1.29.53.ebuild
+++ b/app-admin/awscli/awscli-1.29.53.ebuild
@ -1,84 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
-	https://github.com/aws/aws-cli/
-	https://pypi.org/project/awscli/
-"
-SRC_URI="
-	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
-
-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-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 EPYTEST_DESELECT=(
-		# broken xdist (signal() works only in main thread)
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_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/test_help.py::TestHelpPager::test_can_handle_ctrl_c
-		tests/unit/test_help.py::TestHelpPager::test_can_render_contents
-		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -p xdist -n "$(makeopts_jobs)"
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
--- a/app-admin/awscli/awscli-1.29.57.ebuild
+++ b/app-admin/awscli/awscli-1.29.57.ebuild
@ -1,85 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
-	https://github.com/aws/aws-cli/
-	https://pypi.org/project/awscli/
-"
-SRC_URI="
-	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.7.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-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 EPYTEST_DESELECT=(
-		# broken xdist (signal() works only in main thread)
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_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/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py::TestHelpPager::test_can_handle_ctrl_c
-		tests/unit/test_help.py::TestHelpPager::test_can_render_contents
-		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignore
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -p xdist -n "$(makeopts_jobs)"
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
--- a/app-admin/awscli/awscli-1.29.65.ebuild
+++ b/app-admin/awscli/awscli-1.29.65.ebuild
@ -1,85 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
-	https://github.com/aws/aws-cli/
-	https://pypi.org/project/awscli/
-"
-SRC_URI="
-	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.7.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-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 EPYTEST_DESELECT=(
-		# broken xdist (signal() works only in main thread)
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_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/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py::TestHelpPager::test_can_handle_ctrl_c
-		tests/unit/test_help.py::TestHelpPager::test_can_render_contents
-		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignore
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -p xdist -n "$(makeopts_jobs)"
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
--- a/app-admin/awscli/awscli-1.29.66.ebuild
+++ b/app-admin/awscli/awscli-1.29.66.ebuild
@ -1,85 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
-	https://github.com/aws/aws-cli/
-	https://pypi.org/project/awscli/
-"
-SRC_URI="
-	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.7.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-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 EPYTEST_DESELECT=(
-		# broken xdist (signal() works only in main thread)
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_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/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py::TestHelpPager::test_can_handle_ctrl_c
-		tests/unit/test_help.py::TestHelpPager::test_can_render_contents
-		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignore
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -p xdist -n "$(makeopts_jobs)"
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
--- a/app-admin/awscli/awscli-1.29.67.ebuild
+++ b/app-admin/awscli/awscli-1.29.67.ebuild
@ -1,85 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
-	https://github.com/aws/aws-cli/
-	https://pypi.org/project/awscli/
-"
-SRC_URI="
-	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.7.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-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 EPYTEST_DESELECT=(
-		# broken xdist (signal() works only in main thread)
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_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/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py::TestHelpPager::test_can_handle_ctrl_c
-		tests/unit/test_help.py::TestHelpPager::test_can_render_contents
-		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignore
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -p xdist -n "$(makeopts_jobs)"
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
--- a/app-admin/awscli/awscli-1.29.68.ebuild
+++ b/app-admin/awscli/awscli-1.29.68.ebuild
--- a/app-admin/awscli/awscli-1.29.69.ebuild
+++ b/app-admin/awscli/awscli-1.29.69.ebuild
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@ -1,2 +1 @@
-DIST consul-1.15.2-vendor.tar.gz 43070821 BLAKE2B 39e375cf6fcb17e9a633aa7048588560f8efc93aacad7a332210d509d0b50a74e525be5e56ad9e0aa642b43f68362b8e28beb264c4365a96dd98eab6f4d296d7 SHA512 b00cd569dee83c7850fc13e5591c55dd2903242349ec747cc7ac8f18ebd207858148521c62a1da914610988f95cd543fcc5f5771a1c072c09521a8af0a474ba6
 DIST consul-1.15.3-vendor.tar.gz 43434721 BLAKE2B 7595c98cdecf67e9fb412d8fea1d790dc6b1c29f7bc427e1d0872045a05f8873dc6107f196cea04fe0a2f2553d4fbb1f8d501e5e107b2bea3ae841e5d94eda64 SHA512 b69e3a7c1ebb01c7a64f2c6167e63e8a530b81be9aad8b591d0a71f512f5157ba9a564b46f9effe52a5abd3ae61732e7af10c5ba002110f745eb3d94ebcec256
--- a/app-admin/consul/consul-1.15.2.ebuild
+++ b/app-admin/consul/consul-1.15.2.ebuild
@ -1,57 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module systemd
-
-DESCRIPTION="A tool for service discovery, monitoring and configuration"
-HOMEPAGE="https://www.consul.io"
-GIT_COMMIT="5e08e229dbdaed5adf3ca99afe9df247c51507da"
-
-SRC_URI="https://github.com/zmedico/consul/archive/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz"
-
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
-RESTRICT="test"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-
-BDEPEND="dev-go/gox"
-COMMON_DEPEND="
-	acct-group/consul
-	acct-user/consul"
-	DEPEND="${COMMON_DEPEND}"
-	RDEPEND="${COMMON_DEPEND}"
-
-S=${WORKDIR}/${P}-vendor
-
-src_prepare() {
-	default
-	sed -e 's|^GIT_DATE=.*|GIT_DATE=2023-03-30T17:51:19Z|' -i GNUmakefile || die
-}
-
-src_compile() {
-	# The dev target sets causes build.sh to set appropriate XC_OS
-	# and XC_ARCH, and skips generation of an unused zip file,
-	# avoiding a dependency on app-arch/zip.
-	GIT_DESCRIBE="v${PV}" \
-	GIT_DIRTY="" \
-	GIT_COMMIT="${GIT_COMMIT}" \
-	emake dev-build
-}
-
-src_install() {
-	dobin bin/consul
-
-	keepdir /etc/consul.d
-	insinto /etc/consul.d
-	doins "${FILESDIR}/"*.json.example
-
-	keepdir /var/log/consul
-	fowners consul:consul /var/log/consul
-
-	newinitd "${FILESDIR}/consul.initd" "${PN}"
-	newconfd "${FILESDIR}/consul.confd" "${PN}"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	systemd_dounit "${FILESDIR}/consul.service"
-}
--- a/app-admin/fluentd/Manifest
+++ b/app-admin/fluentd/Manifest
@ -1 +1,2 @@
 DIST fluentd-1.14.4.gem 852480 BLAKE2B d358a067dbfd50164583e629133632039543560104ba5c2b71fb44e3eba0d4119e73556a64f20f60d1c4d67c9c430fa4ab9e3c37e6d0cba166de9396a9dc339b SHA512 09770d0a02e1a29cc0504cd384365fff9445ba5257950b7154f7ba939dbaefcc6b9b1441838cb89d4ddb3101f1715c271de27e1cf46aac430daf968ce145fbe0
+DIST fluentd-1.14.6.gem 856576 BLAKE2B 1422ab704a4b5eb674885a192ae241aa9ee4ba187ff38c9548435c858712f40b6af028776a8e8c8cd122501463cc910e034b5f0a5815e738f7cfd4d1f0d6026e SHA512 63a4e4a51dd9913d0a3a2ea9cb40794de874ee40256890ebaaef3111cc5a401179abdea1230efc92d962811c2f618591bbc7d8d5139d8851d682818712ba3ea7
--- a/app-admin/fluentd/fluentd-1.14.6.ebuild
+++ b/app-admin/fluentd/fluentd-1.14.6.ebuild
@ -0,0 +1,63 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+inherit ruby-fakegem
+
+DESCRIPTION="data collector and unified logging layer (project under CNCF)"
+HOMEPAGE="https://www.fluentd.org"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+COMMON_DEPEND="acct-group/fluentd
+	acct-user/fluentd"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+ruby_add_rdepend "
+	dev-ruby/bundler
+	>=dev-ruby/coolio-1.4.5
+	>=dev-ruby/http_parser_rb-0.5.1
+	>=dev-ruby/msgpack-1.3.1
+	>=dev-ruby/serverengine-2.2.5
+	>=dev-ruby/sigdump-0.2.2
+	>=dev-ruby/strptime-0.2.4
+	>=dev-ruby/tzinfo-1.0
+	=dev-ruby/webrick-1.7*
+	>=dev-ruby/yajl-ruby-1.0"
+
+ruby_add_depend "test? ( dev-ruby/flexmock )"
+
+all_ruby_prepare() {
+	sed -i \
+		-e '/tzinfo-data/d' \
+		-e '/dig_rb/d' \
+		"${PN}".gemspec || die "'sed failed"
+
+	# Avoid test dependency on unpackaged oj
+	rm -f test/test_event_time.rb || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+	keepdir /var/log/fluentd
+	fowners fluentd:adm /var/log/fluentd
+	insinto /etc/fluent
+	doins fluent.conf
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotate ${PN}
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "A default configuration file has been installed in"
+		elog "${EROOT}/etc/fluent/fluent.conf. You will need to edit"
+		elog "this file to match your configuration."
+	fi
+}
--- a/app-admin/haskell-updater/haskell-updater-1.3.2-r1.ebuild
+++ b/app-admin/haskell-updater/haskell-updater-1.3.2-r1.ebuild
@ -3,12 +3,13 @@

 EAPI=8

+# ebuild generated by hackport 0.8.0.0.9999
+
 CABAL_FEATURES="nocabaldep"
 inherit haskell-cabal

 DESCRIPTION="Rebuild Haskell dependencies in Gentoo"
-HOMEPAGE="https://wiki.haskell.org/Gentoo#haskell-updater"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+HOMEPAGE="https://github.com/gentoo-haskell/haskell-updater#readme"

 LICENSE="GPL-2"
 SLOT="0"
--- a/app-admin/haskell-updater/haskell-updater-9999.ebuild
+++ b/app-admin/haskell-updater/haskell-updater-9999.ebuild
@ -0,0 +1,50 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.0.0.9999
+#hackport: flags: +pedantic
+
+CABAL_FEATURES="nocabaldep"
+inherit haskell-cabal git-r3
+
+DESCRIPTION="Rebuild Haskell dependencies in Gentoo"
+HOMEPAGE="https://github.com/gentoo-haskell/haskell-updater#readme"
+EGIT_REPO_URI="https://github.com/gentoo-haskell/haskell-updater.git"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS=""
+
+# Need a lower version for portage to get --keep-going
+RDEPEND="|| ( >=sys-apps/portage-2.1.6
+		sys-apps/pkgcore )"
+DEPEND=">=dev-lang/ghc-6.12.1"
+
+src_prepare() {
+	default
+
+	if use prefix; then
+		sed -i -e "s,/var/db/pkg,${EPREFIX}&,g" \
+			"${S}/Distribution/Gentoo/Packages.hs" || die
+
+		sed -i -e 's,"/","'"${EPREFIX}"'/",g' \
+			"${S}/Distribution/Gentoo/GHC.hs" || die
+	fi
+
+	sed -e 's/^version:.*/&.9999/' -i ${PN}.cabal || die # just to distinct from release install
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=pedantic \
+		--bindir="${EPREFIX}/usr/sbin" \
+		--constraint="Cabal == $(cabal-version)"
+}
+
+src_install() {
+	cabal_src_install
+
+	dodoc TODO
+}
--- a/app-admin/haskell-updater/metadata.xml
+++ b/app-admin/haskell-updater/metadata.xml
@ -5,4 +5,8 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="hackage">haskell-updater</remote-id>
+		<remote-id type="github">gentoo-haskell/haskell-updater</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-admin/ryzen_smu/Manifest
+++ b/app-admin/ryzen_smu/Manifest
@ -1,3 +1,4 @@
 DIST ryzen_smu-0.1.2.tar.gz 169644 BLAKE2B 48445c857d10077b87513d1ccaf6b94d46f6c9179f327de4309d699a17bdd6b41f956e29e324a466451fb2ed68218730c0a02a19b820909cc606eaeea85ed9ab SHA512 7a47b193c7143c3b6bcc2943f9ee895fa1184c9c14953e728cda4f6c8416bef19f0c5fa34344bc47e21101f47816961c4a5f222fd70a7d29401452f90c75ba04
 DIST ryzen_smu-0.1.2_p20210627.tar.xz 151900 BLAKE2B c3845755753256aeee4e68d106e2f61c3c2578a31035eebac60d6e484f60a592de1c67574519d48cf251403cc118dd98efd030d4d7eee23f58b8f7b0d2e0ca8c SHA512 65578d8696fe3b8d002895614df72d57700fb1a5b8587fe0671a6863446fad72425400f9f6767abfdc636927132820e63b7f780fd9e88b5ab4b13668be405ed0
 DIST ryzen_smu-0.1.2_p20211205.tar.xz 386260 BLAKE2B eea0466f6abd93a18c670fbbf603be7efb60807865151543341b6a0a9f248eff8a99d8ecda864bebab6e5e2471ff7239681a83ae9b3dded3b1350a7f363ee62c SHA512 93f7eaac4811ac6e3d46abeb012b1ff4e334fc9247a3747ca67489a35ea04dce20806ae2e57f46e930e5238d1d2a966e8d0b83f8bf090a735d0c2d078f3256f3
+DIST ryzen_smu-v0.1.5.tar.bz2 415723 BLAKE2B 0fed89aad85a5080d4c1a6ecdaaef6ffe2b70f0cebbf58392c725f1aa626151e4b5335096bd63cf73ff29d6f5768ce6e0a844dc7030e8c1e4dc5e04990521651 SHA512 5793beae8204a16800ed876da2a07d2f477a21cef706fed6076e1dcc6e74118b7c45a330e264302d644fdb49f7c44e4fca53dc67e43b2f2a62b3b1ea4ad00d8f
--- a/app-admin/ryzen_smu/ryzen_smu-0.1.5.ebuild
+++ b/app-admin/ryzen_smu/ryzen_smu-0.1.5.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-mod-r1
+
+DESCRIPTION="Kernel driver for AMD Ryzen's System Management Unit"
+HOMEPAGE="https://gitlab.com/leogx9r/ryzen_smu"
+SRC_URI="https://gitlab.com/leogx9r/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${PN}-v${PV}"
+
+src_compile() {
+	local modlist=( ryzen_smu )
+	local modargs=( KERNEL_BUILD="${KV_OUT_DIR}" )
+
+	linux-mod-r1_src_compile
+}
+
+src_install() {
+	linux-mod-r1_src_install
+
+	insinto /usr/lib/modules-load.d
+	doins "${FILESDIR}"/ryzen_smu.conf
+}
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/tarlz/tarlz-0.24.ebuild
+++ b/app-arch/tarlz/tarlz-0.24.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://download.savannah.gnu.org/releases/lzip/${PN}/${P}.tar.lz"

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

 RDEPEND="
 	>=app-arch/lzlib-1.12
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@ -1,3 +1,2 @@
-DIST borgmatic-1.7.15.tar.gz 390819 BLAKE2B dc9086a0363afb8acbe943776cd6f388ba85a18e50554b5187c86e7054e7ff748ea878623d9b46c19564198faf5c566b137e54681812086115311970bc517455 SHA512 cf1f6da782a5ad547a76b9e4cb00cbd4ca4232cfb5dcd027c6fee9f1a3b97fda894f27c512007b449b8e11e939249060f63c3cdde29aee3aa86710200cf8d2db
 DIST borgmatic-1.8.2.tar.gz 396972 BLAKE2B d9444ec49c3d325d865d553fa1cb28de9416aa36e999ef6452c62a9a6519e58afbc922398c52f3a1de441fd8da02e5618bc03a67baae161677a15a1780209788 SHA512 8de49c071c54516d0fb3f0d918f05226ac00519cc0605eacf204795a239554764fd1f3b0f44f3110fc551d6a89e92a59ca34ddebbfb02bf3deabc326f81ccf9c
 DIST borgmatic-1.8.3.tar.gz 399031 BLAKE2B d560ccf69f86f35951521e44fba03a4704161abfe1208a8ef23067ba09b0060be84605761a2fa0b0878d466df10391a9314e85480c15af22faaf326c84211dd9 SHA512 3f798fddadb12742928e1542d1c71838b58870ecea18c62b260829880ae7ba0ec26303548a60ff7c8071b49eb630320bb055a9a1d67e4952c8952140f09100d2
--- a/app-backup/borgmatic/borgmatic-1.7.15.ebuild
+++ b/app-backup/borgmatic/borgmatic-1.7.15.ebuild
@ -1,73 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..12} )
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1 systemd pypi
-
-DESCRIPTION="Automatically create, prune and verify backups with borgbackup"
-HOMEPAGE="https://torsion.org/borgmatic/"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv"
-
-# borg is called as an external tool, hence no pythonic stuff
-RDEPEND="app-backup/borgbackup
-	$(python_gen_cond_dep '
-		<dev-python/colorama-0.5[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		<dev-python/ruamel-yaml-0.18.0[${PYTHON_USEDEP}]
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	')"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/flexmock-0.10.10[${PYTHON_USEDEP}]
-		')
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.13-no_test_coverage.patch
-	"${FILESDIR}"/${PN}-1.7.14-systemd_service_bin_path.patch
-)
-
-# A fragile test whose only purpose is to make sure the NEWS file
-# has been updated for the current version.
-EPYTEST_DESELECT=(
-	tests/integration/commands/test_borgmatic.py::test_borgmatic_version_matches_news_version
-)
-
-distutils_enable_tests pytest
-
-src_install() {
-	distutils-r1_src_install
-	systemd_dounit sample/systemd/borgmatic.{service,timer}
-	keepdir /etc/borgmatic
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "To generate a sample configuration file, run:"
-		elog "    ${PN} config generate"
-	else
-		local oldver
-		for oldver in ${REPLACING_VERSIONS}; do
-			if ver_test "${oldver}" -lt 1.7.11; then
-				ewarn "Since version 1.7.11 ${PN} defaults to a different way of selecting archives for multi-archive actions."
-				ewarn "For details, please see"
-				ewarn
-				ewarn "	https://torsion.org/borgmatic/docs/how-to/make-per-application-backups/#archive-naming"
-				ewarn
-				break
-			fi
-		done
-	fi
-	elog
-	elog "Systemd users wishing to periodically run ${PN} can use the provided timer and service units."
-}
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
--- a/app-doc/python-docs/python-docs-3.12.0.ebuild
+++ b/app-doc/python-docs/python-docs-3.12.0.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 ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 sparc ~x86"

 src_install() {
 	rm -r _sources || die
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/micro/Manifest
+++ b/app-editors/micro/Manifest
@ -2,3 +2,5 @@ DIST micro-2.0.11-deps.tar.xz 19390200 BLAKE2B 3f4e3a60395854e1dcba0ed69c7f6b95d
 DIST micro-2.0.11.tar.gz 549261 BLAKE2B 30c21d7747870a9a85a8fb552ec9035af5c42232f4d2ee0744c24671e78ee22ff5eea803fbc19fac704b49644df0597538950b735f955eecc921e681c0ad924c SHA512 3aa3dd10baaec9fa73b5c673c3d29eb8b4d04b468e36866118bcfc70dd638c50e56d51fc6085dcc7441a2ce0d9bbf742c37fd26a7e2b92d8b20844c8a7b53487
 DIST micro-2.0.12-deps.tar.xz 27563572 BLAKE2B 416548c7b2effa88f80aeb00e15645ace642859af9b3992ec8bc702237a2a17440d34a0ccdad4079933e38fec5ae4d06749a094d211d9fc9f7a11cca9b098a29 SHA512 157f655dfab205e918367c1ea9de849c3c90671bbdf50e8c869e239350f923c62540695839e114e44d6740c06bb0855d5aa139876fe38fe87d24e3162029daef
 DIST micro-2.0.12.tar.gz 562941 BLAKE2B b360560cb0e4b27739e4efc880c66e4e934e3b6515062fb853f29ca9ee21e62edfac8ab0d554bff0062089c20ef2ab11b7d28180b851774f25327c6da58793e2 SHA512 a03fe2b91914c423f0195e9a7c7d35c3c6a38ec2ba65ca8dd8719da38806f2bc5a7b10efb73f9a2ee884bdf3f2a71a04bc3404a7a811b4fb329ffdf41336b78a
+DIST micro-2.0.13-deps.tar.xz 27532560 BLAKE2B ed994b56a73861db0eaff9c394df5a5b6c0900328c068ab9b6e4cace2ffd36082e455da22f02cd43d41386fe587b51189fb01dd04bae821aeccdefb679ec9a6a SHA512 23959b46e7602091f61ddb01d25188956b558585674dc8a782e191dd52d4912132bea860530d1a25e97015d242a2a28a9cf4c5098974e85dcf78c3dc4757734a
+DIST micro-2.0.13.tar.gz 563438 BLAKE2B f3d1876e9eff95fa59d52cc324c4682609c80fff4be8b37fdc701c452df54f35fe57502b0dac7d8aa07f7d02496c3c7ed8f06bba515466a631a39b1816eceba3 SHA512 b4b1dd3b03c906ee5c0bf9d0b576efea2a527fcdb0fe40338c78515fd5f6a4eb22bd9541567bb5956c4087e749775a1e8c33a73d185f7a6b00ba91e405d6a117
--- a/app-editors/micro/micro-2.0.13.ebuild
+++ b/app-editors/micro/micro-2.0.13.ebuild
@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module optfeature desktop xdg
+
+DESCRIPTION="Modern and intuitive terminal-based text editor"
+HOMEPAGE="https://github.com/zyedidia/micro"
+SRC_URI="https://github.com/zyedidia/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
+
+LICENSE="MIT Apache-2.0 BSD MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+BDEPEND="dev-vcs/git"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.12-no-strip.patch
+)
+
+src_compile() {
+	# We build/install this way for bug #915628 (highlighting)
+	emake VERSION=${PV} build
+}
+
+src_install() {
+	dodir /usr/bin
+	emake GOBIN="${ED}"/usr/bin install
+	doman ./assets/packaging/micro.1
+	domenu assets/packaging/micro.desktop
+	einstalldocs
+}
+
+pkg_postinst() {
+	# Update desktop file mime cache
+	xdg_pkg_postinst
+
+	optfeature_header "Clipboard support with display servers:"
+	optfeature "Xorg" x11-misc/xsel x11-misc/xclip
+	optfeature "Wayland" gui-apps/wl-clipboard
+}
--- a/app-editors/texworks/Manifest
+++ b/app-editors/texworks/Manifest
@ -1 +1,2 @@
 DIST texworks-0.6.7.tar.gz 12394465 BLAKE2B 0a2e0531ef0f296cd2be176baed14eb0c21733aeaf3ca3c43e3ff02e48bf68be8953db67f955db0b5a56676b391e2f7700404e9ea52907092d58cbbccaa02adf SHA512 b1c22c1f9bfae2595e77f0c98297cc690f62aac38125bb576d57cc3a0666d779e75af23ccf430a3547215065596b4ea60758233947cda06df8e1a7fc95c46b65
+DIST texworks-0.6.8.tar.gz 12486607 BLAKE2B a7de78adc0746c57b721a400a704d3912574933604e01124a99f5a60ba377ba66ce8d57f5f0a87e336de715d981146db6b8ae61a78c744b385c698fcdad2f7fe SHA512 23164f9ab2f611a705b533f4c435891f1279d1e0e0de2d7f947864f8919a6513cb696881dc1dcf93345471599f113d264ced57cbd2dceae343b9dde46ee80482
--- a/app-editors/texworks/files/texworks-0.6.8-optional-qtscript.patch
+++ b/app-editors/texworks/files/texworks-0.6.8-optional-qtscript.patch
@ -0,0 +1,25 @@
+It doesn't work like that.
+
+--- a/CMakeLists.txt	2023-02-18 11:42:11.000000000 +0100
+++ b/CMakeLists.txt	2023-10-21 20:00:29.144638825 +0200
+@@ -281,9 +281,11 @@
+ 	set(QT_VERSION_PATCH "${Qt6_VERSION_PATCH}")
+ else ()
+ 	# Check for Qt5
+-	find_package(Qt5 REQUIRED COMPONENTS Core Widgets Gui UiTools Concurrent Xml LinguistTools Qml OPTIONAL_COMPONENTS Script ScriptTools)
+	find_package(Qt5 REQUIRED COMPONENTS Core Widgets Gui UiTools Concurrent Xml LinguistTools Qml)
+ 	set(QT_LIBRARIES Qt5::Core Qt5::Widgets Qt5::Gui Qt5::UiTools Qt5::Concurrent Qt5::Xml Qt5::Qml)
+ 
+	find_package(Qt5Script)
+	find_package(Qt5ScriptTools)
+ 	if (Qt5Script_FOUND AND Qt5ScriptTools_FOUND)
+ 		list(APPEND QT_LIBRARIES Qt5::ScriptTools Qt5::Script)
+ 		set(WITH_QTSCRIPT ON)
+@@ -311,7 +313,6 @@
+ 	set(QT_VERSION_MAJOR "${Qt5_VERSION_MAJOR}")
+ 	set(QT_VERSION_MINOR "${Qt5_VERSION_MINOR}")
+ 	set(QT_VERSION_PATCH "${Qt5_VERSION_PATCH}")
+-	set(WITH_QTSCRIPT ON)
+ endif ()
+ 
+ # Expose the major version number of Qt to the preprocessor. This is necessary
--- a/app-editors/texworks/texworks-0.6.8.ebuild
+++ b/app-editors/texworks/texworks-0.6.8.ebuild
@ -4,19 +4,19 @@
 EAPI=8

 LUA_COMPAT=( lua5-{1..3} )
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
 CMAKE_REMOVE_MODULES_LIST=( FindLua )
-inherit lua-single python-single-r1 cmake virtualx xdg
+inherit lua-single python-single-r1 cmake xdg

-DESCRIPTION="A simple interface for working with TeX documents"
-HOMEPAGE="http://tug.org/texworks/"
+DESCRIPTION="Simple interface for working with TeX documents"
+HOMEPAGE="https://tug.org/texworks/"
 SRC_URI="https://github.com/TeXworks/texworks/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}"/${PN}-release-${PV}

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-IUSE="lua python"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="lua python test"
 RESTRICT="!test? ( test )"

 REQUIRED_USE="
@ -24,25 +24,32 @@ REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
 "

-RDEPEND="app-text/hunspell:=
+RDEPEND="
+	app-text/hunspell:=
 	app-text/poppler[qt5]
 	dev-qt/designer:5
 	dev-qt/qtcore:5
 	dev-qt/qtconcurrent:5
 	dev-qt/qtdeclarative:5
 	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
 	dev-qt/qtgui:5
-	dev-qt/qtscript:5[scripttools]
 	dev-qt/qtwidgets:5
 	sys-libs/zlib
 	lua? ( ${LUA_DEPS} )
-	python? ( ${PYTHON_DEPS} ) "
-DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/linguist-tools:5
-	virtual/pkgconfig"
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}
+	test? ( dev-qt/qttest:5 )
+"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"

 PATCHES=(
 	"${FILESDIR}"/${PN}-0.6.5-cmake_lua_version.patch
+	"${FILESDIR}"/${P}-optional-qtscript.patch
 )

 pkg_setup() {
@ -54,7 +61,8 @@ pkg_setup() {
 src_configure() {
 	local mycmakeargs=(
 		-Wno-dev
-
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Script=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5ScriptTools=ON
 		-DPREFER_BUNDLED_SYNCTEX=ON
 		-DWITH_LUA=$(usex lua)
 		-DWITH_PYTHON=$(usex python)
@ -71,5 +79,6 @@ src_configure() {
 }

 src_test() {
-	virtx cmake_src_test
+	local -x QT_QPA_PLATFORM=offscreen
+	cmake_src_test
 }
--- a/app-editors/vscode/Manifest
+++ b/app-editors/vscode/Manifest
@ -1,9 +1,6 @@
 DIST vscode-1.82.3-amd64.tar.gz 135431570 BLAKE2B 044ac09d4a75f0bc075e164061be763663e75798f28bbe88b9bb049a80791692fab6b6016e9f07e1b8360370e0faa3d4cce6ad1e3300600851dab268afcebf4b SHA512 f5365fd13e365241e6de2acd2ee86a4616fd346d5db6b81e40a384de5107c602e6fac5d14d02b500f4587cf05a65d0519756b13581f1c92040b47bd39bc2916c
 DIST vscode-1.82.3-arm.tar.gz 122196444 BLAKE2B 1c2d7f9dcf08c4f47faf599c39afb8580ecf4812f28cfd83ee7d09e1ffc28ef956ee9e69a9b431e16b8d80028936eb376fab17330e5d0176642ba3d387882018 SHA512 f5e97eeccd1cc4b8dda881cd10534b41bf7f648aee121f1538f8e1afabeb965c4784eb123000e27f3fbb0d866d0b9818e042c7b4401de9793a34c321ada822cd
 DIST vscode-1.82.3-arm64.tar.gz 132356391 BLAKE2B 04252655fc0473db6850b946aee1d3e6532c936841f4cea22508e3e42b36d9b5e04861688d53a2ced09de284e11ae534022e11523b6ade66218511ebff856c36 SHA512 76c3255170aab5606c5fc18312973152a0b5bdb60f19b5d295d0d7419ae4233d4df5ba64897c2f7dc3f74093efad9b8c4fa419256b01d149e80e16e7dedd2463
-DIST vscode-1.83.0-amd64.tar.gz 135783477 BLAKE2B ab8d74efddad2717a6e189644a2eb2e6e6a8c51bf84150b722847ba9b7022f181f6a7225b3f0f04f345b5dc2690ff4859425b06d52f1db75c716db87a06de1d1 SHA512 4c71a8b340cdfac577dae7c5f6a70e1d556fa516ff42f562c1ec6f8aaa89b101c4751d936fbb7af426429a70e111262c0a6e230584aaf43691556571d1eefad3
-DIST vscode-1.83.0-arm.tar.gz 122748258 BLAKE2B 535de1d0d61746b501a4377f482e2b09ad470959217ac96455d99738926b2a9c5df7fe2806daba080d0d6bd22df316258c7f04cfdaf1d9fdc966c4585c325455 SHA512 740fb983903a05cc5ca31cedac096fbfe5356df82f11654523b8fc957a7ea7171db9fa8693a21a5e72aadb31d6c76249dd7311052912aff4a81777a22951b65c
-DIST vscode-1.83.0-arm64.tar.gz 133019602 BLAKE2B e11cf5b340d638884ee898040e7cd7791c03e63669a3cdc1efc4efd6542e9ec8a4f0e91d25021763d0bc5530d84c932cd71455561de502cf78b99be5b0d54dda SHA512 35a74ab0cb99825cd652af145bdbed42ccfbb26b43a5e36d87612df8ece7b88020488196535fa8b997d67b09948f8a332f0838b5129cadd396e66080983d3cec
 DIST vscode-1.83.1-amd64.tar.gz 135810621 BLAKE2B c1a9d74efe24f58c46445c6bc714c5a2f8d5237642f958fbed6c540128cf9794faa368e81d074fd357e54e677fce18c77b4f1a2acd2efc0a0ef86ace4bf6521e SHA512 9b5e14ac302ab14b4fb0776836f31f7b9696db5b35987c181a1a344b9268de353d4a91df4dd62aa0b8a3293208f1e898c687a60c46d96e44018f3b94b8ca9d8e
 DIST vscode-1.83.1-arm.tar.gz 122768111 BLAKE2B 92749b01bf5f99b357e84f3910ea23226aa5a2e4071eb52539be8fa3398e2f61395fbedc0e2af5ae8c25af29f8c144f9621e24da5220904d792ae94eea76d6ac SHA512 b46c9a6a2ba80703ac1d0186af4066601d9f4b3a3063e0003cf507ce2dc37e9c4baebe72f90d3c2a92f6c2c4491d527c62a705a816535576cab2524f880a1b5b
 DIST vscode-1.83.1-arm64.tar.gz 133032981 BLAKE2B c02f3147ccf8811730695aff4f6a611b52b706b8974349b8b9ca4a4a8f46dc398809fe32ec79fdf828769d3a6713e080d82312b534f25918cefe32de0994a45f SHA512 8052e551d64754ec38eb6a8edbc14292d95fb0a177a328bc70c8f983c90952af2ad793a45a7001d81bded7410b9b8cced9d3521ce8ad2416df774ab0e110caaf
--- a/app-editors/vscode/vscode-1.82.3-r1.ebuild
+++ b/app-editors/vscode/vscode-1.82.3-r1.ebuild
@ -42,7 +42,6 @@ IUSE="kerberos"
 RDEPEND="
 	>=app-accessibility/at-spi2-core-2.46.0:2
 	app-crypt/libsecret[crypt]
-	app-i18n/ibus
 	app-misc/ca-certificates
 	dev-libs/expat
 	dev-libs/glib:2
@ -53,6 +52,7 @@ RDEPEND="
 	media-libs/libglvnd
 	media-libs/mesa
 	net-misc/curl
+	sys-apps/dbus
 	sys-libs/zlib
 	sys-process/lsof
 	x11-libs/cairo
--- a/app-editors/vscode/vscode-1.82.3.ebuild
+++ b/app-editors/vscode/vscode-1.82.3.ebuild
@ -1,112 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop pax-utils xdg optfeature
-
-DESCRIPTION="Multiplatform Visual Studio Code from Microsoft"
-HOMEPAGE="https://code.visualstudio.com"
-SRC_URI="
-	amd64? ( https://update.code.visualstudio.com/${PV}/linux-x64/stable -> ${P}-amd64.tar.gz )
-	arm? ( https://update.code.visualstudio.com/${PV}/linux-armhf/stable -> ${P}-arm.tar.gz )
-	arm64? ( https://update.code.visualstudio.com/${PV}/linux-arm64/stable -> ${P}-arm64.tar.gz )
-"
-S="${WORKDIR}"
-
-RESTRICT="mirror strip bindist"
-
-LICENSE="
-	Apache-2.0
-	BSD
-	BSD-1
-	BSD-2
-	BSD-4
-	CC-BY-4.0
-	ISC
-	LGPL-2.1+
-	Microsoft-vscode
-	MIT
-	MPL-2.0
-	openssl
-	PYTHON
-	TextMate-bundle
-	Unlicense
-	UoI-NCSA
-	W3C
-"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64"
-IUSE="kerberos"
-
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	app-crypt/libsecret[crypt]
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/mesa
-	sys-apps/util-linux
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libxkbcommon
-	x11-libs/libxkbfile
-	x11-libs/libXrandr
-	x11-libs/libxshmfence
-	x11-libs/pango
-	kerberos? ( app-crypt/mit-krb5 )
-"
-
-QA_PREBUILT="*"
-
-src_install() {
-	if use amd64; then
-		cd "${WORKDIR}/VSCode-linux-x64" || die
-	elif use arm; then
-		cd "${WORKDIR}/VSCode-linux-armhf" || die
-	elif use arm64; then
-		cd "${WORKDIR}/VSCode-linux-arm64" || die
-	else
-		die "Visual Studio Code only supports amd64, arm and arm64"
-	fi
-
-	# Cleanup
-	rm -r ./resources/app/ThirdPartyNotices.txt || die
-
-	# Disable update server
-	sed -e "/updateUrl/d" -i ./resources/app/product.json || die
-
-	if ! use kerberos; then
-		rm -r ./resources/app/node_modules.asar.unpacked/kerberos || die
-	fi
-
-	# Install
-	pax-mark m code
-	mkdir -p "${ED}/opt/${PN}" || die
-	cp -r . "${ED}/opt/${PN}" || die
-	fperms 4711 /opt/${PN}/chrome-sandbox
-
-	dosym -r "/opt/${PN}/bin/code" "usr/bin/vscode"
-	dosym -r "/opt/${PN}/bin/code" "usr/bin/code"
-	domenu "${FILESDIR}/vscode.desktop"
-	domenu "${FILESDIR}/vscode-url-handler.desktop"
-	domenu "${FILESDIR}/vscode-wayland.desktop"
-	domenu "${FILESDIR}/vscode-url-handler-wayland.desktop"
-	newicon "resources/app/resources/linux/code.png" "vscode.png"
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	optfeature "keyring support inside vscode" "virtual/secret-service"
-}
--- a/app-editors/vscode/vscode-1.83.1-r1.ebuild
+++ b/app-editors/vscode/vscode-1.83.1-r1.ebuild
@ -42,7 +42,6 @@ IUSE="kerberos"
 RDEPEND="
 	>=app-accessibility/at-spi2-core-2.46.0:2
 	app-crypt/libsecret[crypt]
-	app-i18n/ibus
 	app-misc/ca-certificates
 	dev-libs/expat
 	dev-libs/glib:2
@ -53,6 +52,7 @@ RDEPEND="
 	media-libs/libglvnd
 	media-libs/mesa
 	net-misc/curl
+	sys-apps/dbus
 	sys-libs/zlib
 	sys-process/lsof
 	x11-libs/cairo
--- a/app-editors/vscodium/Manifest
+++ b/app-editors/vscodium/Manifest
@ -1,12 +1,6 @@
-DIST vscodium-1.82.1.23255-amd64.tar.gz 122378820 BLAKE2B 76f9bdc38b4803fd37527ce91ac00512fad3a7b68824782a0126dcdde26b790f063e719ded50bdb6ffc656cd6505f3787772d4a77d9dc07cee3f8652674c979f SHA512 af5839687d9880ca1ee350421c8065a736dba7e3dc465470535156805f29eb0cd8ca2024660ec52aaa899e9bb435cc8b05d65d37544d113a5c34f119e144d603
-DIST vscodium-1.82.1.23255-arm.tar.gz 111001076 BLAKE2B 81665f6e38e692f19ae417691de87519f3922249d7ffbdac7f20ee07567e4503f0491a9e9d8d2b4e230fb3a87a27d28865cbb27a3ec511a471108393dbb8b5dd SHA512 043f1942b783fb05b8a6da02d9918e24f46b12366901f1dd3bd3c57e1d1a91152d40aa1d2578cdcbf7623f83f1ba90ea938f45a7993aa0b917243891bcfff541
-DIST vscodium-1.82.1.23255-arm64.tar.gz 122773280 BLAKE2B b07573a00a5d151e195fe7640b8c4faae9fb352794a21479256d0cfd715d0663ad250bd54e1c4049e0f56b66cca57abb8965328ea9bd9116be3be7553d16c91e SHA512 76e62d81bca0fa5046ba9dd7153360b37ffd075f52a36196aa8a66afb340eb451167b7b3b6eead542d318dc235ceb8aec5c85b87d8831f6eb7a3a2cf9e85f982
-DIST vscodium-1.82.2.23257-amd64.tar.gz 122400212 BLAKE2B 89fc60f5e0497c9cca3addd24ba93a2d693aa5b32af07c5c4024cc5bf5aa7a7cc7edeb834d496ad213ffe1de74ed88d72d178957f43a1643bd12908179dd6597 SHA512 93dae286a111b9b2d38c845f261da49c3bddfc9276694259a2e39442fb703ba85393dd432d0a284c807bc0688735923bd5f9e797e7bc8487533b4d1503c09861
-DIST vscodium-1.82.2.23257-arm.tar.gz 111018269 BLAKE2B cb46eb4754f68e4118bda7a123896b095cc3b745fa7607209d86446d7748735e854716f84932740f315469b4a09a63832c3e69e36d18c5df9b7cb3796a03d4f9 SHA512 952e19703abd7636640334fb9cc031c0d1dad3469b046bc7c4722ea9cd60617059319ef765f48b200b772e65dfcd4a19aa78c2b8d763722ab0d1a89099b990b1
-DIST vscodium-1.82.2.23257-arm64.tar.gz 122786317 BLAKE2B bf89a52ec44a8fc01305adefeaadbcd3fc11029b18b994633d408389b31545c10ccbfac1e18c93e1ad9e59c7d0a17cf3eca0486c149714515a7a086262e32764 SHA512 d747679f34cad51c44a2acd55aa0a23fb0fbe1a33e017e398b5becf36d4bcc438f82fc24845977a2d3836f5bae5d10dabfaa4ba878cd86991282d18053593694
-DIST vscodium-1.83.0.23277-amd64.tar.gz 122376313 BLAKE2B 98c36ce5d49e74397b96589bbe2993e213c584a4d71a01050b15cd78b1bd103af9ed743b7c383ee85d892623ddfbc1d082d26251b3a44bb462f2033fb4ddcd22 SHA512 baea03240a667689aba508a96a482877974e2cc1c7c1ab60b5e47867f21f69921113743d31dcbcdd158755123f59b0730d2454be3b86e8af2cccd734651f08a2
-DIST vscodium-1.83.0.23277-arm.tar.gz 111010787 BLAKE2B 3a55d6f3824b5f8eedd3fa493a2db99eee490503ce97c1081deef1fe5b9dd4dadce0603cf166647a876b7db0af31145a2c8882798feff951ea1981943fa99756 SHA512 e3c8be1195576b75d6f8243d75b2c11e677f10888d8aea74025032fd7f785433987b146817fd2c8a7f52823bed3c3de4de53552403c8054c9ab4588bd685067e
-DIST vscodium-1.83.0.23277-arm64.tar.gz 122765714 BLAKE2B 99a5ea23beb57f7e3383fa8af862f11d01cdf79efe6d2bea33a18267ef59f89de83262ee0e39f501525b68cb417bda2647f2a1531643dba2f1234629ff3197bb SHA512 2bec58bceb156c8ae7af2656c3b2954579ba42aea7c7a59ffbb98570046549a3b4d63395c729f5a7e223de880a4df539b2e5afcaf7508e7106f7b6af34a9cca3
-DIST vscodium-1.83.0.23283-amd64.tar.gz 122372769 BLAKE2B 50c136100ccd55c012454817baa1db6f110aa62e317a3008a9ab36430756b13e330ba7ea483a481eb18e3ebd733018751b7706b6bcabf6ebc15b14d045a05c90 SHA512 022f63f8189914447c58e632bcf1957c64ccfd94c8a48ee1e266fc64f6882a8f5f5831a310b7e7b31ff4ca2967c6779c4cbfa78313610fd281c04ba189948f4c
-DIST vscodium-1.83.0.23283-arm.tar.gz 111002625 BLAKE2B 429d421444839e2ba431835a1cb73bd3e7dfd3e141ae58cdb5b6a1cfaebcb2be8d1f7f8ea81763c6f4aa1bf3db19f9da45cdbf75f5ea36afe20ac5d50d816457 SHA512 fc5057240932b42b0e4dd8c8e518efc42afaecdeefc05fb71f78a537d80d864b9dc8b125b795c9ab5d5eb78f3ad0cadefcbc168d9ac2e89fb2f914e3b96406d3
-DIST vscodium-1.83.0.23283-arm64.tar.gz 122766239 BLAKE2B d8e0caf282592e2246f9be0f25079f16bccf0a7514208522ea6b09894f77c92bc55d1109b28727aa505d26ec532c66f8e89eec3a01bea09786ddc61db51a15d7 SHA512 60f64b948400cb1345bca7162728bc576cd8b9202a82647d4ac158dd7be268029fe15c84f60c4a21530d20628676bf0f86c3c218febf8c0c9a21c852ed0555d0
+DIST vscodium-1.82.3.23277-amd64.tar.gz 122402277 BLAKE2B 0021a8339354610eaa4885ffba661ee808e6e2212140dbd16a64098e9a71a592d9e9066c6fb9eb5ba76420384660d8c801dc39ddc877535d56c7e0fad3b35ab1 SHA512 de1e88fc82c4d6708e6b6e779a8eadc4e1ba546652db01e2e384a2900f2aa170261733728561cd7d21c8eac3366c7305f05f780e6965933c707422e6c029107e
+DIST vscodium-1.82.3.23277-arm.tar.gz 111021974 BLAKE2B 370e7fb95484e402529778452500d6b7ea9e0b3c62caa629143c03337ade568bd72d6981db6ee1bb6dff6573dc47929a350657d16a2e735668d30db0412d6083 SHA512 47bf5cc66032628571ce0bfc5a37c6d11acc7e321cf1667fed6d8b33a8227c2862d8d8f2f0a914de6e45cc1547c36fb0dd3ec044e69e015de3d919cb74d7370b
+DIST vscodium-1.82.3.23277-arm64.tar.gz 122784303 BLAKE2B b4a2e69176d66f3a2a2b3024c6384befec6ce72ad945f8eedbf2487e766fe77aed2bc72dde1dbdfbd469f2f01ee25c3bbc5e870c04b9736135184131480e5a1c SHA512 c07218f91e06aa924f98860beabb4d2a3610bd9186e2013d9b7941cb4fd8c6c25761707c68738ed35e47fef704b4ec49340ff86ecf612659d2fc2273542ef9c6
+DIST vscodium-1.83.1.23285-amd64.tar.gz 122374995 BLAKE2B bc2a0ad348e7f0ca1ec75f82e92e4933b8f2a92a8587cc9da1f49db1ce317d54b90b656f6f5bb14cde219dff0ceee3cd9c99856af83f08e9f6c01614b325a776 SHA512 aa0ede11b25d6838e117ab679efc047c83d45f584352fd54dc098adc7e5c48341237ab9c1001e96b3e0d05a4d5bd382693634a901cda5c68064903c1d1bd9c91
+DIST vscodium-1.83.1.23285-arm.tar.gz 111010049 BLAKE2B df414ae8f29794ff0c9bb647dae860d3f48f9a6c441696a360e61605d93e6df8dec949db139eccf867a2d34ae411c0b6f54ef2ceb6dc78088eca3947ab856623 SHA512 595f267881932d5b3b95e860d79f72120c017384c3b486a679a7505156096aad1597c4954e46aae4c65dc9650c47f277ffa872373116ba7f6d99d8010871566d
+DIST vscodium-1.83.1.23285-arm64.tar.gz 122760275 BLAKE2B 8201036ab1e2ae3194813a8374ae17216478523d81ab4ccd769196a9edca180c79cd4831ca9266776e8ba9e57fb256c8bead15ba088c89b6ffbd0bb98d675cfa SHA512 7dd3885def2d007960e4e958b8bb01aa88d8cc3e92d0aa0b26c612e094f46c2d62a26cd072efc826885c9b505885def00d4f9b390f3769780022658c8378e13b
--- a/app-editors/vscodium/vscodium-1.82.1.23255.ebuild
+++ b/app-editors/vscodium/vscodium-1.82.1.23255.ebuild
@ -1,109 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop pax-utils xdg optfeature
-
-# Usage: arch_src_uri <gentoo arch> <upstream arch>
-arch_src_uri() {
-	echo "${1}? (
-		https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-${2}-${PV}.tar.gz
-			-> ${P}-${1}.tar.gz
-	)"
-}
-
-DESCRIPTION="A community-driven, freely-licensed binary distribution of Microsoft's VSCode"
-HOMEPAGE="https://vscodium.com/"
-SRC_URI="
-	$(arch_src_uri amd64 x64)
-	$(arch_src_uri arm armhf)
-	$(arch_src_uri arm64 arm64)
-"
-S="${WORKDIR}"
-
-RESTRICT="strip bindist"
-
-LICENSE="
-	Apache-2.0
-	BSD
-	BSD-1
-	BSD-2
-	BSD-4
-	CC-BY-4.0
-	ISC
-	LGPL-2.1+
-	MIT
-	MPL-2.0
-	openssl
-	PYTHON
-	TextMate-bundle
-	Unlicense
-	UoI-NCSA
-	W3C
-"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64"
-IUSE="kerberos"
-
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	app-crypt/libsecret[crypt]
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/mesa
-	net-print/cups
-	sys-apps/util-linux
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libxkbcommon
-	x11-libs/libxkbfile
-	x11-libs/libXrandr
-	x11-libs/libxshmfence
-	x11-libs/pango
-	kerberos? ( app-crypt/mit-krb5 )
-"
-
-QA_PREBUILT="*"
-
-src_install() {
-	# Cleanup
-	rm "${S}/resources/app/LICENSE.txt" || die
-
-	if ! use kerberos; then
-		rm -r "${S}/resources/app/node_modules.asar.unpacked/kerberos" || die
-	fi
-
-	# Install
-	pax-mark m codium
-	mkdir -p "${ED}/opt/${PN}" || die
-	cp -r . "${ED}/opt/${PN}" || die
-	fperms 4711 /opt/${PN}/chrome-sandbox
-
-	dosym -r "/opt/${PN}/bin/codium" "usr/bin/vscodium"
-	dosym -r "/opt/${PN}/bin/codium" "usr/bin/codium"
-	domenu "${FILESDIR}/vscodium.desktop"
-	domenu "${FILESDIR}/vscodium-url-handler.desktop"
-	domenu "${FILESDIR}/vscodium-wayland.desktop"
-	domenu "${FILESDIR}/vscodium-url-handler-wayland.desktop"
-	newicon "resources/app/resources/linux/code.png" "vscodium.png"
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	elog "When compared to the regular VSCode, VSCodium has a few quirks"
-	elog "More information at: https://github.com/VSCodium/vscodium/blob/master/DOCS.md"
-	optfeature "keyring support inside vscode" "virtual/secret-service"
-}
--- a/app-editors/vscodium/vscodium-1.82.2.23257.ebuild
+++ b/app-editors/vscodium/vscodium-1.82.2.23257.ebuild
@ -1,109 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop pax-utils xdg optfeature
-
-# Usage: arch_src_uri <gentoo arch> <upstream arch>
-arch_src_uri() {
-	echo "${1}? (
-		https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-${2}-${PV}.tar.gz
-			-> ${P}-${1}.tar.gz
-	)"
-}
-
-DESCRIPTION="A community-driven, freely-licensed binary distribution of Microsoft's VSCode"
-HOMEPAGE="https://vscodium.com/"
-SRC_URI="
-	$(arch_src_uri amd64 x64)
-	$(arch_src_uri arm armhf)
-	$(arch_src_uri arm64 arm64)
-"
-S="${WORKDIR}"
-
-RESTRICT="strip bindist"
-
-LICENSE="
-	Apache-2.0
-	BSD
-	BSD-1
-	BSD-2
-	BSD-4
-	CC-BY-4.0
-	ISC
-	LGPL-2.1+
-	MIT
-	MPL-2.0
-	openssl
-	PYTHON
-	TextMate-bundle
-	Unlicense
-	UoI-NCSA
-	W3C
-"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64"
-IUSE="kerberos"
-
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	app-crypt/libsecret[crypt]
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/mesa
-	net-print/cups
-	sys-apps/util-linux
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libxkbcommon
-	x11-libs/libxkbfile
-	x11-libs/libXrandr
-	x11-libs/libxshmfence
-	x11-libs/pango
-	kerberos? ( app-crypt/mit-krb5 )
-"
-
-QA_PREBUILT="*"
-
-src_install() {
-	# Cleanup
-	rm "${S}/resources/app/LICENSE.txt" || die
-
-	if ! use kerberos; then
-		rm -r "${S}/resources/app/node_modules.asar.unpacked/kerberos" || die
-	fi
-
-	# Install
-	pax-mark m codium
-	mkdir -p "${ED}/opt/${PN}" || die
-	cp -r . "${ED}/opt/${PN}" || die
-	fperms 4711 /opt/${PN}/chrome-sandbox
-
-	dosym -r "/opt/${PN}/bin/codium" "usr/bin/vscodium"
-	dosym -r "/opt/${PN}/bin/codium" "usr/bin/codium"
-	domenu "${FILESDIR}/vscodium.desktop"
-	domenu "${FILESDIR}/vscodium-url-handler.desktop"
-	domenu "${FILESDIR}/vscodium-wayland.desktop"
-	domenu "${FILESDIR}/vscodium-url-handler-wayland.desktop"
-	newicon "resources/app/resources/linux/code.png" "vscodium.png"
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	elog "When compared to the regular VSCode, VSCodium has a few quirks"
-	elog "More information at: https://github.com/VSCodium/vscodium/blob/master/DOCS.md"
-	optfeature "keyring support inside vscode" "virtual/secret-service"
-}
--- a/app-editors/vscodium/vscodium-1.83.0.23277-r1.ebuild
+++ b/app-editors/vscodium/vscodium-1.83.0.23277-r1.ebuild
@ -49,7 +49,6 @@ IUSE="kerberos"
 RDEPEND="
 	>=app-accessibility/at-spi2-core-2.46.0:2
 	app-crypt/libsecret[crypt]
-	app-i18n/ibus
 	app-misc/ca-certificates
 	dev-libs/expat
 	dev-libs/glib:2
@ -60,6 +59,8 @@ RDEPEND="
 	media-libs/libglvnd
 	media-libs/mesa
 	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
 	sys-libs/zlib
 	sys-process/lsof
 	x11-libs/cairo
--- a/app-editors/vscodium/vscodium-1.83.1.23285.ebuild
+++ b/app-editors/vscodium/vscodium-1.83.1.23285.ebuild
@ -49,7 +49,6 @@ IUSE="kerberos"
 RDEPEND="
 	>=app-accessibility/at-spi2-core-2.46.0:2
 	app-crypt/libsecret[crypt]
-	app-i18n/ibus
 	app-misc/ca-certificates
 	dev-libs/expat
 	dev-libs/glib:2
@ -60,6 +59,8 @@ RDEPEND="
 	media-libs/libglvnd
 	media-libs/mesa
 	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
 	sys-libs/zlib
 	sys-process/lsof
 	x11-libs/cairo
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
--- a/app-emacs/citar/Manifest
+++ b/app-emacs/citar/Manifest
@ -1 +1,2 @@
 DIST citar-1.3.1.tar.gz 1602843 BLAKE2B 0abf90120860777e13ac495681bb1e07d6c352bc17aef173b32e60fc2d754a37628670b57e17335bc5e549c451b9565a58c8547952a5b78d6335adc7601b8f5e SHA512 a00e7ff5331fa3a161151292dd4a9d3c0a7211051f5ddf528cfe7d4a48377af64f3719f57c76013b45a30082fbfd435d98196e757169970a22bb662f49ccd346
+DIST citar-1.4.0.tar.gz 1604664 BLAKE2B 26ebe97a6701fa8c8d528ad0c6d750ea5acebda1fe6322c157fe62995140a9b3f16274888e51110a01dbd1681d7552637bc230d5d1e95270157bc524c037d7da SHA512 42ddb8eec21ad8c53b77b5ee235cd839fdb8d3a3efef8db28effd2bfc63d1d25c1031abb21df476e0243c99aaa619c2d1f29142f5569deb06281774c960924a9
--- a/app-emacs/citar/citar-1.4.0.ebuild
+++ b/app-emacs/citar/citar-1.4.0.ebuild
@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=27.1
+
+inherit elisp
+
+DESCRIPTION="Emacs package to quickly find and act on bibliographic references"
+HOMEPAGE="https://github.com/emacs-citar/citar/"
+SRC_URI="https://github.com/emacs-citar/${PN}/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	app-emacs/citeproc-el
+	app-emacs/parsebib
+"
+BDEPEND="${RDEPEND}"
+
+# Embark integration has it's own package on MELPA, and it is probably better
+# to split them. https://melpa.org/#/citar-embark
+ELISP_REMOVE="citar-embark.el"
+
+DOCS=( CHANGELOG.md CONTRIBUTING.org README.org )
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	elisp_src_compile
+	elisp-make-autoload-file
+}
+
+src_test() {
+	${EMACS} ${EMACSFLAGS} -L . -L test \
+		-l test/citar-file-test.el \
+		-l test/citar-format-test.el \
+		-l test/citar-test.el \
+		-f ert-run-tests-batch-and-exit || die
+}
--- a/app-emacs/color-theme/color-theme-6.6.0-r2.ebuild
+++ b/app-emacs/color-theme/color-theme-6.6.0-r2.ebuild
@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit elisp readme.gentoo-r1
-
-DESCRIPTION="Install color themes (includes many themes)"
-HOMEPAGE="http://www.nongnu.org/color-theme/"
-SRC_URI="http://download.savannah.gnu.org/releases-noredirect/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc sparc x86 ~amd64-linux ~x86-linux"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-replace-in-string.patch
-	"${FILESDIR}"/${P}-emacs-26.patch
-)
-ELISP_REMOVE="color-theme-autoloads.*"
-SITEFILE="50${PN}-gentoo.el"
-
-src_install() {
-	elisp-install ${PN} *.el *.elc
-	elisp-install ${PN}/themes themes/*.el
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	dodoc AUTHORS BUGS ChangeLog README
-
-	DOC_CONTENTS="To use color-theme non-interactively, initialise it
-		in your ~/.emacs file as in the following example (which is
-		for the \"Blue Sea\" theme):
-		\n
-		\n(color-theme-initialize)
-		\n(color-theme-blue-sea)"
-	readme.gentoo_create_doc
-}
--- a/app-emacs/color-theme/color-theme-6.6.0-r3.ebuild
+++ b/app-emacs/color-theme/color-theme-6.6.0-r3.ebuild
@ -11,7 +11,7 @@ SRC_URI="http://download.savannah.gnu.org/releases-noredirect/${PN}/${P}.tar.gz"

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc sparc x86 ~amd64-linux ~x86-linux"

 PATCHES=(
 	"${FILESDIR}"/${P}-replace-in-string.patch
@ -19,7 +19,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-emacs-29.patch
 )
 ELISP_REMOVE="color-theme-autoloads.*"
-SITEFILE="50${PN}-gentoo-6.6.0-r3.el"
+SITEFILE="50${PN}-gentoo.el"

 src_install() {
 	elisp-install ${PN} *.el *.elc
--- a/app-emacs/color-theme/files/50color-theme-gentoo-6.6.0-r3.el
+++ b/app-emacs/color-theme/files/50color-theme-gentoo-6.6.0-r3.el
@ -1,119 +0,0 @@
-(add-to-list 'load-path "@SITELISP@")
-
-(autoload 'color-theme-select "color-theme" "\
-Displays a special buffer for selecting and installing a color theme.
-With optional prefix ARG, this buffer will include color theme libraries
-as well.  A color theme library is in itself not complete, it must be
-used as part of another color theme to be useful.  Thus, color theme
-libraries are mainly useful for color theme authors.
-
-\(fn &optional ARG)" t)
-
-(autoload 'color-theme-describe "color-theme" "\
-Describe color theme listed at point.
-This shows the documentation of the value of text-property color-theme
-at point.  The text-property color-theme should be a color theme
-function.  See `color-themes'." t)
-
-(autoload 'color-theme-install-at-mouse "color-theme" "\
-Install color theme clicked upon using the mouse.
-First argument EVENT is used to set point.  Then
-`color-theme-install-at-point' is called.
-
-\(fn EVENT)" t)
-
-(autoload 'color-theme-install-at-point-for-current-frame "color-theme" "\
-Install color theme at point for current frame only.
-Binds `color-theme-is-global' to nil and calls
-`color-theme-install-at-point'." t)
-
-(autoload 'color-theme-print "color-theme" "\
-Print the current color theme function.
-
-You can contribute this function to <URL:news:gnu.emacs.sources> or
-paste it into your .emacs file and call it.  That should recreate all
-the settings necessary for your color theme.
-
-Example:
-
-    (require \\='color-theme)
-    (defun my-color-theme ()
-      \"Color theme by Alex Schroeder, created 2000-05-17.\"
-      (interactive)
-      (color-theme-install
-       \\='(...
-	 ...
-	 ...)))
-    (my-color-theme)
-
-If you want to use a specific color theme function, you can call the
-color theme function in your .emacs directly.
-
-Example:
-
-    (require \\='color-theme)
-    (color-theme-gnome2)
-
-\(fn &optional BUF)" t)
-
-(autoload 'color-theme-analyze-defun "color-theme" "\
-Once you have a color-theme printed, check for missing faces.
-This is used by maintainers who receive a color-theme submission
-and want to make sure it follows the guidelines by the color-theme
-author." t)
-
-(autoload 'color-theme-make-snapshot "color-theme" "\
-Return the definition of the current color-theme.
-The function returned will recreate the color-theme in use at the moment.")
-
-(autoload 'color-theme-compare "color-theme" "\
-Compare two color themes.
-This will print the differences between installing THEME-A and
-installing THEME-B.  Note that the order is important: If a face is
-defined in THEME-A and not in THEME-B, then this will not show up as a
-difference, because there is no reset before installing THEME-B.  If a
-face is defined in THEME-B and not in THEME-A, then this will show up as
-a difference.
-
-\(fn THEME-A THEME-B)" t)
-
-(autoload 'color-theme-install "color-theme" "\
-Install a color theme defined by frame parameters, variables and faces.
-
-The theme is installed for all present and future frames; any missing
-faces are created.  See `color-theme-install-faces'.
-
-THEME is a color theme definition.  See below for more information.
-
-If you want to install a color theme from your .emacs, use the output
-generated by `color-theme-print'.  This produces color theme function
-which you can copy to your .emacs.
-
-A color theme definition is a list:
-\([FUNCTION] FRAME-PARAMETERS VARIABLE-SETTINGS FACE-DEFINITIONS)
-
-FUNCTION is the color theme function which called `color-theme-install'.
-This is no longer used.  There was a time when this package supported
-automatic factoring of color themes.  This has been abandoned.
-
-FRAME-PARAMETERS is an alist of frame parameters.  These are installed
-with `color-theme-install-frame-params'.  These are installed last such
-that any changes to the default face can be changed by the frame
-parameters.
-
-VARIABLE-DEFINITIONS is an alist of variable settings.  These are
-installed with `color-theme-install-variables'.
-
-FACE-DEFINITIONS is an alist of face definitions.  These are installed
-with `color-theme-install-faces'.
-
-If `color-theme-is-cumulative' is nil, a color theme will undo face and
-frame-parameter settings of previous color themes.
-
-\(fn THEME)")
-
-(autoload 'color-theme-submit "color-theme" "\
-Submit your color-theme to the maintainer." t)
-
-(autoload 'color-theme-initialize "color-theme" "\
-Initialize the color theme package by loading color-theme-libraries." t)
--- a/app-emacs/color-theme/files/50color-theme-gentoo.el
+++ b/app-emacs/color-theme/files/50color-theme-gentoo.el
@ -1,29 +1,33 @@
 (add-to-list 'load-path "@SITELISP@")

-(autoload (quote color-theme-select) "color-theme" "\
+(autoload 'color-theme-select "color-theme" "\
 Displays a special buffer for selecting and installing a color theme.
 With optional prefix ARG, this buffer will include color theme libraries
 as well.  A color theme library is in itself not complete, it must be
 used as part of another color theme to be useful.  Thus, color theme
-libraries are mainly useful for color theme authors." t nil)
+libraries are mainly useful for color theme authors.

-(autoload (quote color-theme-describe) "color-theme" "\
+\(fn &optional ARG)" t)
+
+(autoload 'color-theme-describe "color-theme" "\
 Describe color theme listed at point.
 This shows the documentation of the value of text-property color-theme
 at point.  The text-property color-theme should be a color theme
-function.  See `color-themes'." t nil)
+function.  See `color-themes'." t)

-(autoload (quote color-theme-install-at-mouse) "color-theme" "\
+(autoload 'color-theme-install-at-mouse "color-theme" "\
 Install color theme clicked upon using the mouse.
 First argument EVENT is used to set point.  Then
-`color-theme-install-at-point' is called." t nil)
+`color-theme-install-at-point' is called.
+
+\(fn EVENT)" t)

-(autoload (quote color-theme-install-at-point-for-current-frame) "color-theme" "\
+(autoload 'color-theme-install-at-point-for-current-frame "color-theme" "\
 Install color theme at point for current frame only.
 Binds `color-theme-is-global' to nil and calls
-`color-theme-install-at-point'." t nil)
+`color-theme-install-at-point'." t)

-(autoload (quote color-theme-print) "color-theme" "\
+(autoload 'color-theme-print "color-theme" "\
 Print the current color theme function.

 You can contribute this function to <URL:news:gnu.emacs.sources> or
@ -32,12 +36,12 @@ the settings necessary for your color theme.

 Example:

-    (require 'color-theme)
+    (require \\='color-theme)
    (defun my-color-theme ()
      \"Color theme by Alex Schroeder, created 2000-05-17.\"
      (interactive)
      (color-theme-install
-       '(...
+       \\='(...
 	 ...
 	 ...)))
    (my-color-theme)
@ -47,29 +51,33 @@ color theme function in your .emacs directly.

 Example:

-    (require 'color-theme)
-    (color-theme-gnome2)" t nil)
+    (require \\='color-theme)
+    (color-theme-gnome2)
+
+\(fn &optional BUF)" t)

-(autoload (quote color-theme-analyze-defun) "color-theme" "\
+(autoload 'color-theme-analyze-defun "color-theme" "\
 Once you have a color-theme printed, check for missing faces.
 This is used by maintainers who receive a color-theme submission
 and want to make sure it follows the guidelines by the color-theme
-author." t nil)
+author." t)

-(autoload (quote color-theme-make-snapshot) "color-theme" "\
+(autoload 'color-theme-make-snapshot "color-theme" "\
 Return the definition of the current color-theme.
-The function returned will recreate the color-theme in use at the moment." nil nil)
+The function returned will recreate the color-theme in use at the moment.")

-(autoload (quote color-theme-compare) "color-theme" "\
+(autoload 'color-theme-compare "color-theme" "\
 Compare two color themes.
 This will print the differences between installing THEME-A and
 installing THEME-B.  Note that the order is important: If a face is
 defined in THEME-A and not in THEME-B, then this will not show up as a
 difference, because there is no reset before installing THEME-B.  If a
 face is defined in THEME-B and not in THEME-A, then this will show up as
-a difference." t nil)
+a difference.

-(autoload (quote color-theme-install) "color-theme" "\
+\(fn THEME-A THEME-B)" t)
+
+(autoload 'color-theme-install "color-theme" "\
 Install a color theme defined by frame parameters, variables and faces.

 The theme is installed for all present and future frames; any missing
@ -100,10 +108,12 @@ FACE-DEFINITIONS is an alist of face definitions.  These are installed
 with `color-theme-install-faces'.

 If `color-theme-is-cumulative' is nil, a color theme will undo face and
-frame-parameter settings of previous color themes." nil nil)
+frame-parameter settings of previous color themes.
+
+\(fn THEME)")

-(autoload (quote color-theme-submit) "color-theme" "\
-Submit your color-theme to the maintainer." t nil)
+(autoload 'color-theme-submit "color-theme" "\
+Submit your color-theme to the maintainer." t)

-(autoload (quote color-theme-initialize) "color-theme" "\
-Initialize the color theme package by loading color-theme-libraries." t nil)
+(autoload 'color-theme-initialize "color-theme" "\
+Initialize the color theme package by loading color-theme-libraries." t)
--- a/app-emacs/expand-region/Manifest
+++ b/app-emacs/expand-region/Manifest
@ -1 +1,2 @@
 DIST expand-region-0.11.0.tar.gz 31562 BLAKE2B 84058b1aea880de0f4a1894bbf818ae622ec7740d15564e74adbe8f3769f72b514d71de9c6b83a8f0fd60c590e281739ae15110f5f886315cc10b661b21ecc56 SHA512 3469ab0420d85fbaaa1ae9f3d0101c28b6e1786d761ecd186d744537795226917314b8b748d3499b02ea269a46a62350c37fecb34dd4183a73eafc67ce1344a8
+DIST expand-region-1.0.0.tar.gz 46001 BLAKE2B e8910ca067767b86f9e80b45b8d039cbe969d26d1f828d16749199e584a0745d1ad3d10a32dc98a49ccef3c36966e95581d53929183e1427a28baf1f82e1aa91 SHA512 2dd057f36c80a892f465ac8757248fce30089c64eb1f8de4c2e9bfc404cf10b2ca3ce88f06395c9c9225b5fa31015e260e31010488328e09bbd3fe629df2d77e
--- a/app-emacs/expand-region/expand-region-1.0.0.ebuild
+++ b/app-emacs/expand-region/expand-region-1.0.0.ebuild
@ -0,0 +1,18 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="Emacs extension to increase selected region by semantic units"
+HOMEPAGE="https://github.com/magnars/expand-region.el"
+SRC_URI="https://github.com/magnars/${PN}.el/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${PN}.el-${PV}"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.md"
--- a/app-emacs/modus-themes/modus-themes-4.2.0.ebuild
+++ b/app-emacs/modus-themes/modus-themes-4.2.0.ebuild
@ -5,7 +5,7 @@ EAPI=8

 inherit elisp

-DESCRIPTION="Convert symbol names between different naming conventions"
+DESCRIPTION="Highly accessible themes for GNU Emacs"
 HOMEPAGE="https://github.com/protesilaos/modus-themes/"

 if [[ ${PV} == *9999* ]] ; then
--- a/app-emacs/modus-themes/modus-themes-4.3.0.ebuild
+++ b/app-emacs/modus-themes/modus-themes-4.3.0.ebuild
@ -5,7 +5,7 @@ EAPI=8

 inherit elisp

-DESCRIPTION="Convert symbol names between different naming conventions"
+DESCRIPTION="Highly accessible themes for GNU Emacs"
 HOMEPAGE="https://github.com/protesilaos/modus-themes/"

 if [[ ${PV} == *9999* ]] ; then
--- a/app-emacs/modus-themes/modus-themes-9999.ebuild
+++ b/app-emacs/modus-themes/modus-themes-9999.ebuild
@ -5,7 +5,7 @@ EAPI=8

 inherit elisp

-DESCRIPTION="Convert symbol names between different naming conventions"
+DESCRIPTION="Highly accessible themes for GNU Emacs"
 HOMEPAGE="https://github.com/protesilaos/modus-themes/"

 if [[ ${PV} == *9999* ]] ; then
--- a/app-emacs/nxml-gentoo-schemas/Manifest
+++ b/app-emacs/nxml-gentoo-schemas/Manifest
@ -1 +1,2 @@
 DIST nxml-gentoo-schemas-20230914.tar.xz 8812 BLAKE2B fa039f3cf1556ef97684d7c485be5efa0cddae3dfa5a98a0bddd924a0e6f736b519a3a841712b8221dde2ee8351c8680c4b1bfb391151cf0a1ef3f073373e58d SHA512 e4cda867fb635a0b7f17a692b38a1f65966f439c585a130319ba8f53f571dedc3ca9d61a34c61ffd3ba09b04ef9aae61578bea9bb9f0562b542296c8a98d64c9
+DIST nxml-gentoo-schemas-20231022.tar.xz 8860 BLAKE2B eb6d997d5597fd83d547b356f1551c3087f69860808168dcd6bdec0a808e0effae96188d55f6c3d5dcb779ecc727fb965ce1190c60a1ec6591853f98e9a40cdd SHA512 2fbb674b7f8e6b854af1587ab03605bfe7f75e40a6f10122565264c9225d03fd30a5f569158ca83da6f84aaa31c18cced6d51a0782bb64172ab7fbfe077a630d
--- a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20231022.ebuild
+++ b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20231022.ebuild
@ -0,0 +1,24 @@
+# Copyright 1999-2023 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 ~ia64 ~ppc ~ppc64 ~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}"
+}
--- a/app-emacs/sharper/Manifest
+++ b/app-emacs/sharper/Manifest
@ -0,0 +1 @@
+DIST sharper-1.0_p20230129.tar.gz 288565 BLAKE2B aef8d9a0af0b41b92fb85e760cd449ee81fbbb7a161885b1e783e83e4b2ca553ae12d7c5f954c4ddb842d934b6da2f93d87f50d62c6e79a8aaabfeabfdf5bdad SHA512 c2adfeccb77e96bb681061dbb1276373159e97374a6b30f1e1e2cc343340b4ab1083d9c2f67f02ecc0061cd37a36b03831a2f4320b0b0b1e2d4617cfa0a8a68e
--- a/app-emacs/sharper/files/50sharper-gentoo.el
+++ b/app-emacs/sharper/files/50sharper-gentoo.el
@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'sharper-main-transient "@SITELISP@/sharper.el" nil t)
--- a/app-emacs/sharper/metadata.xml
+++ b/app-emacs/sharper/metadata.xml
@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <longdescription>
+This is a Transient-based menu for the dotnet CLI. It aims to cover the most common scenarios, but I expect eventually all of the dotnet commands will be implemented.
+  </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/sebasmonia/sharper/issues/</bugs-to>
+    <remote-id type="github">sebasmonia/sharper</remote-id>
+  </upstream>
+</pkgmetadata>
--- a/app-emacs/sharper/sharper-1.0_p20230129-r1.ebuild
+++ b/app-emacs/sharper/sharper-1.0_p20230129-r1.ebuild
@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=27.1
+
+inherit elisp
+
+DESCRIPTION=".NET SDK CLI wrapper for GNU Emacs using Transient"
+HOMEPAGE="https://github.com/sebasmonia/sharper/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/sebasmonia/${PN}.git"
+else
+	[[ "${PV}" == *_p20230129 ]] && COMMIT=496e90e337cb09329d85a6d171c0953a85e918fe
+
+	SRC_URI="https://github.com/sebasmonia/${PN}/archive/${COMMIT}.tar.gz
+		-> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="
+	app-emacs/transient
+"
+BDEPEND="
+	${RDEPEND}
+"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
--- a/app-emacs/treemacs/files/treemacs-3.0-tests.patch
+++ b/app-emacs/treemacs/files/treemacs-3.0-tests.patch
@ -1,31 +0,0 @@
-Disable bad tests.
-
--- a/test/treemacs-test.el
-+++ b/test/treemacs-test.el
-@@ -372,7 +372,7 @@
- 
- (describe "treemacs--parent"
- 
-  (it "Fails on nil input"
-+  (xit "Fails on nil input"
-     (expect (treemacs--parent nil) :to-throw))
- 
-   (it "Returns nil when input is empty"
-@@ -393,14 +393,14 @@
-   (it "Returns directory extension of extension sub-item node."
-     (expect (treemacs--parent '("/test1" "a" "b")) :to-equal '("/test1" "a")))
- 
-  (it "Returns directory of a directory extension node."
-+  (xit "Returns directory of a directory extension node."
-     (expect (treemacs--parent '("/test1" "a")) :to-equal "/test1"))
- 
-  (it "Returns project extension of a project sub-item node."
-+  (xit "Returns project extension of a project sub-item node."
-     (let ((p (treemacs-project->create! :path "/A" :path-status 'local-readable)))
-       (expect (treemacs--parent (list p "a" "b")) :to-equal (list p "a"))))
- 
-  (it "Returns project of a project extension node."
-+  (xit "Returns project of a project extension node."
-     (let ((p (treemacs-project->create! :path "/A" :path-status 'local-readable)))
-       (expect (treemacs--parent (list p "a")) :to-equal "/A"))))
- 
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/qemu/files/qemu-7.2.3-CVE-2023-2861.patch
+++ b/app-emulation/qemu/files/qemu-7.2.3-CVE-2023-2861.patch
@ -1,162 +0,0 @@
-https://bugs.gentoo.org/909542
-https://gitlab.com/qemu-project/qemu/-/commit/10fad73a2bf1c76c8aa9d6322755e5f877d83ce5
-
-From 10fad73a2bf1c76c8aa9d6322755e5f877d83ce5 Mon Sep 17 00:00:00 2001
-From: Christian Schoenebeck <qemu_oss@crudebyte.com>
-Date: Wed, 7 Jun 2023 18:29:33 +0200
-Subject: [PATCH] 9pfs: prevent opening special files (CVE-2023-2861)
-
-The 9p protocol does not specifically define how server shall behave when
-client tries to open a special file, however from security POV it does
-make sense for 9p server to prohibit opening any special file on host side
-in general. A sane Linux 9p client for instance would never attempt to
-open a special file on host side, it would always handle those exclusively
-on its guest side. A malicious client however could potentially escape
-from the exported 9p tree by creating and opening a device file on host
-side.
-
-With QEMU this could only be exploited in the following unsafe setups:
-
-  - Running QEMU binary as root AND 9p 'local' fs driver AND 'passthrough'
-    security model.
-
-or
-
-  - Using 9p 'proxy' fs driver (which is running its helper daemon as
-    root).
-
-These setups were already discouraged for safety reasons before,
-however for obvious reasons we are now tightening behaviour on this.
-
-Fixes: CVE-2023-2861
-Reported-by: Yanwu Shen <ywsPlz@gmail.com>
-Reported-by: Jietao Xiao <shawtao1125@gmail.com>
-Reported-by: Jinku Li <jkli@xidian.edu.cn>
-Reported-by: Wenbo Shen <shenwenbo@zju.edu.cn>
-Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
-Reviewed-by: Greg Kurz <groug@kaod.org>
-Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
-Message-Id: <E1q6w7r-0000Q0-NM@lizzy.crudebyte.com>
-(cherry picked from commit f6b0de53fb87ddefed348a39284c8e2f28dc4eda)
-Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
-(Mjt: drop adding qemu_fstat wrapper for 7.2 where wrappers aren't used)
--- a/fsdev/virtfs-proxy-helper.c
-+++ b/fsdev/virtfs-proxy-helper.c
-@@ -26,6 +26,7 @@
- #include "qemu/xattr.h"
- #include "9p-iov-marshal.h"
- #include "hw/9pfs/9p-proxy.h"
-+#include "hw/9pfs/9p-util.h"
- #include "fsdev/9p-iov-marshal.h"
- 
- #define PROGNAME "virtfs-proxy-helper"
-@@ -338,6 +339,28 @@ static void resetugid(int suid, int sgid)
-     }
- }
- 
-+/*
-+ * Open regular file or directory. Attempts to open any special file are
-+ * rejected.
-+ *
-+ * returns file descriptor or -1 on error
-+ */
-+static int open_regular(const char *pathname, int flags, mode_t mode)
-+{
-+    int fd;
-+
-+    fd = open(pathname, flags, mode);
-+    if (fd < 0) {
-+        return fd;
-+    }
-+
-+    if (close_if_special_file(fd) < 0) {
-+        return -1;
-+    }
-+
-+    return fd;
-+}
-+
- /*
-  * send response in two parts
-  * 1) ProxyHeader
-@@ -682,7 +705,7 @@ static int do_create(struct iovec *iovec)
-     if (ret < 0) {
-         goto unmarshal_err_out;
-     }
-    ret = open(path.data, flags, mode);
-+    ret = open_regular(path.data, flags, mode);
-     if (ret < 0) {
-         ret = -errno;
-     }
-@@ -707,7 +730,7 @@ static int do_open(struct iovec *iovec)
-     if (ret < 0) {
-         goto err_out;
-     }
-    ret = open(path.data, flags);
-+    ret = open_regular(path.data, flags, 0);
-     if (ret < 0) {
-         ret = -errno;
-     }
--- a/hw/9pfs/9p-util.h
-+++ b/hw/9pfs/9p-util.h
-@@ -13,6 +13,8 @@
- #ifndef QEMU_9P_UTIL_H
- #define QEMU_9P_UTIL_H
- 
-+#include "qemu/error-report.h"
-+
- #ifdef O_PATH
- #define O_PATH_9P_UTIL O_PATH
- #else
-@@ -112,6 +114,38 @@ static inline void close_preserve_errno(int fd)
-     errno = serrno;
- }
- 
-+/**
-+ * close_if_special_file() - Close @fd if neither regular file nor directory.
-+ *
-+ * @fd: file descriptor of open file
-+ * Return: 0 on regular file or directory, -1 otherwise
-+ *
-+ * CVE-2023-2861: Prohibit opening any special file directly on host
-+ * (especially device files), as a compromised client could potentially gain
-+ * access outside exported tree under certain, unsafe setups. We expect
-+ * client to handle I/O on special files exclusively on guest side.
-+ */
-+static inline int close_if_special_file(int fd)
-+{
-+    struct stat stbuf;
-+
-+    if (fstat(fd, &stbuf) < 0) {
-+        close_preserve_errno(fd);
-+        return -1;
-+    }
-+    if (!S_ISREG(stbuf.st_mode) && !S_ISDIR(stbuf.st_mode)) {
-+        error_report_once(
-+            "9p: broken or compromised client detected; attempt to open "
-+            "special file (i.e. neither regular file, nor directory)"
-+        );
-+        close(fd);
-+        errno = ENXIO;
-+        return -1;
-+    }
-+
-+    return 0;
-+}
-+
- static inline int openat_dir(int dirfd, const char *name)
- {
-     return openat(dirfd, name,
-@@ -146,6 +180,10 @@ again:
-         return -1;
-     }
- 
-+    if (close_if_special_file(fd) < 0) {
-+        return -1;
-+    }
-+
-     serrno = errno;
-     /* O_NONBLOCK was only needed to open the file. Let's drop it. We don't
-      * do that with O_PATH since fcntl(F_SETFL) isn't supported, and openat()
-- 
-GitLab
--- a/app-emulation/qemu/files/qemu-8.0.2-CVE-2023-2861.patch
+++ b/app-emulation/qemu/files/qemu-8.0.2-CVE-2023-2861.patch
@ -1,167 +0,0 @@
-https://bugs.gentoo.org/909542
-https://gitlab.com/qemu-project/qemu/-/commit/b9d2887be4e616cdaeedd0b7456bfaa71ee798af
-
-From b9d2887be4e616cdaeedd0b7456bfaa71ee798af Mon Sep 17 00:00:00 2001
-From: Christian Schoenebeck <qemu_oss@crudebyte.com>
-Date: Wed, 7 Jun 2023 18:29:33 +0200
-Subject: [PATCH] 9pfs: prevent opening special files (CVE-2023-2861)
-
-The 9p protocol does not specifically define how server shall behave when
-client tries to open a special file, however from security POV it does
-make sense for 9p server to prohibit opening any special file on host side
-in general. A sane Linux 9p client for instance would never attempt to
-open a special file on host side, it would always handle those exclusively
-on its guest side. A malicious client however could potentially escape
-from the exported 9p tree by creating and opening a device file on host
-side.
-
-With QEMU this could only be exploited in the following unsafe setups:
-
-  - Running QEMU binary as root AND 9p 'local' fs driver AND 'passthrough'
-    security model.
-
-or
-
-  - Using 9p 'proxy' fs driver (which is running its helper daemon as
-    root).
-
-These setups were already discouraged for safety reasons before,
-however for obvious reasons we are now tightening behaviour on this.
-
-Fixes: CVE-2023-2861
-Reported-by: Yanwu Shen <ywsPlz@gmail.com>
-Reported-by: Jietao Xiao <shawtao1125@gmail.com>
-Reported-by: Jinku Li <jkli@xidian.edu.cn>
-Reported-by: Wenbo Shen <shenwenbo@zju.edu.cn>
-Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
-Reviewed-by: Greg Kurz <groug@kaod.org>
-Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
-Message-Id: <E1q6w7r-0000Q0-NM@lizzy.crudebyte.com>
-(cherry picked from commit f6b0de53fb87ddefed348a39284c8e2f28dc4eda)
-Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
--- a/fsdev/virtfs-proxy-helper.c
-+++ b/fsdev/virtfs-proxy-helper.c
-@@ -26,6 +26,7 @@
- #include "qemu/xattr.h"
- #include "9p-iov-marshal.h"
- #include "hw/9pfs/9p-proxy.h"
-+#include "hw/9pfs/9p-util.h"
- #include "fsdev/9p-iov-marshal.h"
- 
- #define PROGNAME "virtfs-proxy-helper"
-@@ -338,6 +339,28 @@ static void resetugid(int suid, int sgid)
-     }
- }
- 
-+/*
-+ * Open regular file or directory. Attempts to open any special file are
-+ * rejected.
-+ *
-+ * returns file descriptor or -1 on error
-+ */
-+static int open_regular(const char *pathname, int flags, mode_t mode)
-+{
-+    int fd;
-+
-+    fd = open(pathname, flags, mode);
-+    if (fd < 0) {
-+        return fd;
-+    }
-+
-+    if (close_if_special_file(fd) < 0) {
-+        return -1;
-+    }
-+
-+    return fd;
-+}
-+
- /*
-  * send response in two parts
-  * 1) ProxyHeader
-@@ -682,7 +705,7 @@ static int do_create(struct iovec *iovec)
-     if (ret < 0) {
-         goto unmarshal_err_out;
-     }
-    ret = open(path.data, flags, mode);
-+    ret = open_regular(path.data, flags, mode);
-     if (ret < 0) {
-         ret = -errno;
-     }
-@@ -707,7 +730,7 @@ static int do_open(struct iovec *iovec)
-     if (ret < 0) {
-         goto err_out;
-     }
-    ret = open(path.data, flags);
-+    ret = open_regular(path.data, flags, 0);
-     if (ret < 0) {
-         ret = -errno;
-     }
--- a/hw/9pfs/9p-util.h
-+++ b/hw/9pfs/9p-util.h
-@@ -13,6 +13,8 @@
- #ifndef QEMU_9P_UTIL_H
- #define QEMU_9P_UTIL_H
- 
-+#include "qemu/error-report.h"
-+
- #ifdef O_PATH
- #define O_PATH_9P_UTIL O_PATH
- #else
-@@ -95,6 +97,7 @@ static inline int errno_to_dotl(int err) {
- #endif
- 
- #define qemu_openat     openat
-+#define qemu_fstat      fstat
- #define qemu_fstatat    fstatat
- #define qemu_mkdirat    mkdirat
- #define qemu_renameat   renameat
-@@ -108,6 +111,38 @@ static inline void close_preserve_errno(int fd)
-     errno = serrno;
- }
- 
-+/**
-+ * close_if_special_file() - Close @fd if neither regular file nor directory.
-+ *
-+ * @fd: file descriptor of open file
-+ * Return: 0 on regular file or directory, -1 otherwise
-+ *
-+ * CVE-2023-2861: Prohibit opening any special file directly on host
-+ * (especially device files), as a compromised client could potentially gain
-+ * access outside exported tree under certain, unsafe setups. We expect
-+ * client to handle I/O on special files exclusively on guest side.
-+ */
-+static inline int close_if_special_file(int fd)
-+{
-+    struct stat stbuf;
-+
-+    if (qemu_fstat(fd, &stbuf) < 0) {
-+        close_preserve_errno(fd);
-+        return -1;
-+    }
-+    if (!S_ISREG(stbuf.st_mode) && !S_ISDIR(stbuf.st_mode)) {
-+        error_report_once(
-+            "9p: broken or compromised client detected; attempt to open "
-+            "special file (i.e. neither regular file, nor directory)"
-+        );
-+        close(fd);
-+        errno = ENXIO;
-+        return -1;
-+    }
-+
-+    return 0;
-+}
-+
- static inline int openat_dir(int dirfd, const char *name)
- {
-     return qemu_openat(dirfd, name,
-@@ -142,6 +177,10 @@ again:
-         return -1;
-     }
- 
-+    if (close_if_special_file(fd) < 0) {
-+        return -1;
-+    }
-+
-     serrno = errno;
-     /* O_NONBLOCK was only needed to open the file. Let's drop it. We don't
-      * do that with O_PATH since fcntl(F_SETFL) isn't supported, and openat()
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
--- a/app-i18n/ibus-typing-booster/Manifest
+++ b/app-i18n/ibus-typing-booster/Manifest
@ -1,2 +1,3 @@
 DIST ibus-typing-booster-2.24.1.tar.gz 12218815 BLAKE2B dcc7e08d41d7a98bf1b7e14fa38bafeaa10427126d400d04b478724eb91039da11d1bd2332d1e081d140f916c77dd3a6fc0eddcb7d7797f3a8d5b0607808b8fb SHA512 e05a42f442db8047415336485ab88405f3abb221e05fc882505e423587905002d8c0d616b208e4f1cfdcfea7bc27bcab5ffe57eb06aaa10650bae062d114505e
 DIST ibus-typing-booster-2.24.2.tar.gz 12216471 BLAKE2B 069faa9340d79676c124451af09d020116894b3bc9bc5c8aed229d7315a2fb0222822c00974d5ac4fbe8410640a3b4f3ca0a6c73d8c9b1f52bc7411e8b372026 SHA512 6eb2cc058ce86ba0ffdb0261abf39d36340b3bf1cb7ef68af0db59b00fb7e739a5638e2090761acdce812382354bb3debd37ca44162dbf92a074499fcfd20d55
+DIST ibus-typing-booster-2.24.4.tar.gz 12217171 BLAKE2B 945caad00067dfcb25b6a0249e3b8c1ff18e4880b046768a2b7bf6506f6ca54e63c178d296cd6daf17e01fd7714fd9b8336c91dfe0b5161503307a5a80956009 SHA512 a6baa0bb7c5a3124dcb017d218d602035b21b6bb7a3cf34c229e265dd4d970677a99ef4d473e39b7efad65248e1398af8c47a5cf05225b7bcff293a2fe9570cf
--- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.24.4.ebuild
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.24.4.ebuild
@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="sqlite(+)"
+
+inherit gnome2-utils python-single-r1 xdg
+
+DESCRIPTION="Completion input method for IBus"
+HOMEPAGE="https://mike-fabian.github.io/ibus-typing-booster"
+SRC_URI="https://github.com/mike-fabian/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	dev-libs/m17n-lib
+	$(python_gen_cond_dep '
+		app-i18n/ibus[python(+),${PYTHON_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/pyenchant[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pyxdg[${PYTHON_USEDEP}]
+	')"
+RDEPEND="${DEPEND}
+	>=dev-db/m17n-db-1.7"
+BDEPEND="sys-devel/gettext
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	sed -i "s|/usr\(/bin/sh\)|\1|" {engine,setup}/*.in
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@ -1,3 +1 @@
-DIST sigscheme-0.9.1.tar.bz2 1140162 BLAKE2B a649ec1a5ff0899af14fa686ea7cf43140c226b1df68d4c9415c3b95c7f7ae32c539df820f0e9da7d7a809c88fa388e563549728c345017dfd62d418748be7e1 SHA512 b66b901e8a6bc6d9188112f78d3ba21a2a0776e1236aa9d2d83df27cf8111b8491f665062b493d14c2a9a1b4eb47ce2789b3ca7180225a085e94623329281e09
 DIST uim-1.8.9.tar.bz2 6233465 BLAKE2B 5fc57ffd43557cc685ca766d13e871a7b3ad3829fe3b3fcaa3ab76cba15350e82747952bcc77eda0093df0681ad5d3580cb30c96e2a707f0f3e2687a5bf96e19 SHA512 342bda32f27b9875bf1458adbfb3d3cdd92d98daf8068647e3cb01f9757fda6befbb44a7b9ba2b25b03e14b1de68c7e2d6b57362e84d6aae8bcff3959aaa12df
-DIST uim-1.8.9_pre20210103.tar.gz 4054622 BLAKE2B b50bafe9b0edbac1ab7e56afd5b654bdef793b606df3550ba7b8be467076005925bf2c5d221bbf3b3dbcdc5079bbb0e014ed29bef9b6a55c23384cb281411104 SHA512 39e046a8ee3bbc06ff0bab685e0ded8f63e9c474661ffecf7ed12e25cad3151498b2fecc7f14ca6f0c78974e55265df47d656a55bf158b41fe21a69071d02fe8
--- a/app-i18n/uim/files/uim-1.8.8-zh-TW.patch
+++ b/app-i18n/uim/files/uim-1.8.8-zh-TW.patch
@ -1,11 +0,0 @@
--- a/xim/convdisp.cpp
-+++ b/xim/convdisp.cpp
-@@ -69,7 +69,7 @@
- #endif
- 
- const char *fontset_zhCN = "-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1, -isas-fangsong ti-medium-r-normal--16-160-72-72-c-160-gb2312.1980-0";
-const char *fontset_zhTW = "-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1, -taipei-fixed-medium-r-normal--16-150-75-75-c-160-big5-0";
-+const char *fontset_zhTW = "-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1, -eten-fixed-medium-r-normal--16-150-75-75-c-160-big5.eten-0";
- const char *fontset_ja = "-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1, -jis-fixed-medium-r-normal--16-*-75-75-c-160-jisx0208.1983-0, -sony-fixed-medium-r-normal--16-*-*-*-c-80-jisx0201.1976-0";
- const char *fontset_ko = "-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1, -daewoo-gothic-medium-r-normal--16-120-100-100-c-160-ksc5601.1987-0";
- 
--- a/app-i18n/uim/files/uim-clang-16-configure.patch
+++ b/app-i18n/uim/files/uim-clang-16-configure.patch
--- a/app-i18n/uim/uim-1.8.9-r1.ebuild
+++ b/app-i18n/uim/uim-1.8.9-r1.ebuild
@ -84,6 +84,7 @@ BDEPEND="gnome-base/librsvg
 	nls? ( dev-util/intltool )"

 PATCHES=(
+	"${FILESDIR}"/${PN}-clang-16.patch
 	"${FILESDIR}"/${PN}-gentoo.patch
 	"${FILESDIR}"/${PN}-kde.patch
 	"${FILESDIR}"/${PN}-slibtool.patch
@ -91,7 +92,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-Wconversion.patch
 	"${FILESDIR}"/${PN}-xkb.patch
 	"${FILESDIR}"/${PN}-zh-TW.patch
-	"${FILESDIR}"/${PN}-clang-16-configure.patch
 )

 DOCS=( AUTHORS NEWS README RELNOTE doc )
--- a/app-i18n/uim/uim-1.8.9.ebuild
+++ b/app-i18n/uim/uim-1.8.9.ebuild
@ -1,240 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit autotools elisp-common flag-o-matic gnome2-utils qmake-utils
-
-EGIT_COMMIT="d1ac9d9315ff8c57c713b502544fef9b3a83b3e5"
-
-DESCRIPTION="A multilingual input method framework"
-HOMEPAGE="https://github.com/uim/uim"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.bz2"
-
-LICENSE="BSD GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~x86"
-IUSE="X +anthy curl eb emacs expat libffi gtk gtk2 kde l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify m17n-lib ncurses nls qt5 skk sqlite ssl static-libs xft"
-RESTRICT="test"
-REQUIRED_USE="gtk? ( X )
-	gtk2? ( X )
-	qt5? ( X )
-	xft? ( X )"
-
-CDEPEND="X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXft
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-	anthy? ( app-i18n/anthy )
-	curl? ( net-misc/curl )
-	eb? ( dev-libs/eb )
-	emacs? ( >=app-editors/emacs-23.1:* )
-	expat? ( dev-libs/expat )
-	gtk? ( x11-libs/gtk+:3 )
-	gtk2? ( x11-libs/gtk+:2 )
-	kde? ( kde-frameworks/plasma:5 )
-	libedit? ( dev-libs/libedit )
-	libffi? ( dev-libs/libffi:= )
-	libnotify? ( x11-libs/libnotify )
-	m17n-lib? ( dev-libs/m17n-lib )
-	ncurses? ( sys-libs/ncurses:0= )
-	nls? ( virtual/libintl )
-	qt5? (
-		dev-qt/qtx11extras:5
-		dev-qt/qtwidgets:5
-	)
-	skk? ( app-i18n/skk-jisyo )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( dev-libs/openssl:0= )"
-DEPEND="${CDEPEND}
-	X? ( x11-base/xorg-proto )"
-RDEPEND="${CDEPEND}
-	!dev-scheme/sigscheme
-	X? (
-		media-fonts/font-sony-misc
-		l10n_ja? (
-			|| (
-				media-fonts/font-jis-misc
-				media-fonts/intlfonts
-			)
-		)
-		l10n_ko? (
-			|| (
-				media-fonts/font-daewoo-misc
-				media-fonts/intlfonts
-			)
-		)
-		l10n_zh-CN? (
-			|| (
-				media-fonts/font-isas-misc
-				media-fonts/intlfonts
-			)
-		)
-		l10n_zh-TW? ( media-fonts/intlfonts )
-	)"
-BDEPEND="gnome-base/librsvg
-	sys-devel/gettext
-	virtual/pkgconfig
-	kde? ( dev-util/cmake )
-	nls? ( dev-util/intltool )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-gentoo.patch
-	"${FILESDIR}"/${PN}-kde.patch
-	"${FILESDIR}"/${PN}-slibtool.patch
-	"${FILESDIR}"/${PN}-tinfo.patch
-	"${FILESDIR}"/${PN}-Wconversion.patch
-	"${FILESDIR}"/${PN}-xkb.patch
-	"${FILESDIR}"/${PN}-zh-TW.patch
-)
-DOCS=( AUTHORS NEWS README RELNOTE doc )
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-	default
-	sed -i "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac
-	use nls || sed -i "/^if .*USE_NLS/,/^fi/d" configure.ac
-	# fix build with "-march=pentium4 -O2", bug #661806
-	use x86 && append-cflags $(test-flags-CC -fno-inline-small-functions)
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_with X x)
-		$(use_with anthy anthy-utf8)
-		$(use_with curl)
-		$(use_with eb)
-		$(use_enable emacs)
-		$(use_with emacs lispdir "${SITELISP}")
-		$(use_with expat)
-		$(use_enable kde kde5-applet)
-		$(use_with libedit)
-		$(use_with libffi ffi)
-		$(use_with gtk gtk3)
-		$(use_with gtk2)
-		$(use_with m17n-lib m17nlib)
-		$(use_enable ncurses fep)
-		$(use_enable nls)
-		$(use_with qt5)
-		$(use_with qt5 qt5-immodule)
-		_QMAKE5=$(qt5_get_bindir)/qmake
-		$(use_with skk)
-		$(use_with sqlite sqlite3)
-		$(use_enable ssl openssl)
-		$(use_enable static-libs static)
-		$(use_with xft)
-		--without-anthy
-		--without-canna
-		--enable-default-toolkit=$(usex gtk gtk3 $(usex gtk2 gtk $(usex qt5 qt5)))
-		--disable-gnome-applet
-		--disable-gnome3-applet
-		--disable-kde-applet
-		--disable-kde4-applet
-		--without-mana
-		--enable-maintainer-mode
-		--without-prime
-		--disable-qt4-qt3support
-	)
-
-	if (use gtk || use gtk2) && use anthy; then
-		myconf+=( --enable-dict )
-	else
-		myconf+=( --disable-dict )
-	fi
-
-	if use libnotify; then
-		myconf+=( --enable-notify=libnotify )
-	fi
-
-	if use gtk || use gtk2 || use qt5; then
-		myconf+=( --enable-pref )
-	else
-		myconf+=( --disable-pref )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-
-	if use emacs; then
-		cd emacs || die
-		elisp-compile *.el || die
-		cd - >/dev/null || die
-	fi
-}
-
-src_install() {
-	# bug #222677
-	emake -j1 DESTDIR="${D}" install
-	rm -f doc/Makefile*
-	einstalldocs
-
-	find "${ED}"/usr/$(get_libdir)/${PN} -name '*.la' -delete || die
-	use static-libs || find "${ED}" -name '*.la' -delete || die
-
-	insinto /etc/X11/xinit/xinput.d
-	sed \
-		-e "s:@EPREFIX@:${EPREFIX}:g" \
-		"${FILESDIR}"/xinput-${PN} > "${T}"/${PN}.conf
-	doins "${T}"/${PN}.conf
-
-	if use X; then
-		docinto xim
-		dodoc xim/README*
-	fi
-
-	if use emacs; then
-		elisp-install ${PN}-el emacs/*.el{,c}
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE} ${PN}-el
-		docinto emacs
-		dodoc emacs/README*
-	fi
-
-	if use ncurses; then
-		docinto fep
-		dodoc fep/README*
-	fi
-}
-
-pkg_postinst() {
-	elog "New input method switcher has been introduced. You need to set"
-	elog
-	elog "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE"
-	elog "% QT_IM_MODULE=uim ; export QT_IM_MODULE"
-	elog "% XMODIFIERS=@im=uim ; export XMODIFIERS"
-	elog
-	elog "If you would like to use uim-anthy as default input method, put"
-	elog "(define default-im-name 'anthy)"
-	elog "to your ~/.uim."
-	elog
-	elog "All input methods can be found by running uim-im-switcher-gtk, "
-	elog "uim-im-switcher-gtk3 or uim-im-switcher-qt5."
-
-	if use emacs; then
-		elisp-site-regen
-		elog
-		elog "uim is autoloaded with Emacs with a minimal set of features:"
-		elog "There is no keybinding defined to call it directly, so please"
-		elog "create one yourself and choose an input method."
-		elog "Integration with LEIM is not done with this ebuild, please have"
-		elog "a look at the documentation how to achieve this."
-	fi
-	use gtk && gnome2_query_immodules_gtk3
-	use gtk2 && gnome2_query_immodules_gtk2
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	use gtk && gnome2_query_immodules_gtk3
-	use gtk2 && gnome2_query_immodules_gtk2
-}
--- a/app-i18n/uim/uim-1.8.9_pre20210103-r1.ebuild
+++ b/app-i18n/uim/uim-1.8.9_pre20210103-r1.ebuild
@ -1,249 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools elisp-common flag-o-matic gnome2-utils qmake-utils vcs-snapshot
-
-EGIT_COMMIT="d1ac9d9315ff8c57c713b502544fef9b3a83b3e5"
-SIG_PV="0.9.1"
-
-DESCRIPTION="A multilingual input method framework"
-HOMEPAGE="https://github.com/uim/uim"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
-	https://github.com/${PN}/sigscheme/releases/download/${SIG_PV}/sigscheme-${SIG_PV}.tar.bz2"
-
-LICENSE="BSD GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 ~riscv x86"
-IUSE="X +anthy curl eb emacs expat libffi gtk gtk2 kde l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify m17n-lib ncurses nls qt5 skk sqlite ssl static-libs xft"
-RESTRICT="test"
-REQUIRED_USE="gtk? ( X )
-	gtk2? ( X )
-	qt5? ( X )
-	xft? ( X )"
-
-CDEPEND="X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXft
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-	anthy? ( app-i18n/anthy )
-	curl? ( net-misc/curl )
-	eb? ( dev-libs/eb )
-	emacs? ( >=app-editors/emacs-23.1:* )
-	expat? ( dev-libs/expat )
-	gtk? ( x11-libs/gtk+:3 )
-	gtk2? ( x11-libs/gtk+:2 )
-	kde? ( kde-frameworks/plasma:5 )
-	libedit? ( dev-libs/libedit )
-	libffi? ( dev-libs/libffi:= )
-	libnotify? ( x11-libs/libnotify )
-	m17n-lib? ( dev-libs/m17n-lib )
-	ncurses? ( sys-libs/ncurses:0= )
-	nls? ( virtual/libintl )
-	qt5? (
-		dev-qt/qtx11extras:5
-		dev-qt/qtwidgets:5
-	)
-	skk? ( app-i18n/skk-jisyo )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( dev-libs/openssl:0= )"
-DEPEND="${CDEPEND}
-	X? ( x11-base/xorg-proto )"
-RDEPEND="${CDEPEND}
-	!dev-scheme/sigscheme
-	X? (
-		media-fonts/font-sony-misc
-		l10n_ja? (
-			|| (
-				media-fonts/font-jis-misc
-				media-fonts/intlfonts
-			)
-		)
-		l10n_ko? (
-			|| (
-				media-fonts/font-daewoo-misc
-				media-fonts/intlfonts
-			)
-		)
-		l10n_zh-CN? (
-			|| (
-				media-fonts/font-isas-misc
-				media-fonts/intlfonts
-			)
-		)
-		l10n_zh-TW? ( media-fonts/intlfonts )
-	)"
-BDEPEND="dev-util/intltool
-	gnome-base/librsvg
-	sys-devel/gettext
-	virtual/pkgconfig
-	kde? ( dev-util/cmake )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-gentoo.patch
-	"${FILESDIR}"/${PN}-kde.patch
-	"${FILESDIR}"/${PN}-slibtool.patch
-	"${FILESDIR}"/${PN}-tinfo.patch
-	"${FILESDIR}"/${PN}-Wconversion.patch
-	"${FILESDIR}"/${PN}-xkb.patch
-	"${FILESDIR}"/${PN}-1.8.8-zh-TW.patch
-)
-DOCS=( AUTHORS NEWS README RELNOTE doc )
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_unpack() {
-	vcs-snapshot_src_unpack
-	rmdir "${S}"/sigscheme || die
-	mv "${WORKDIR}"/sigscheme-${SIG_PV} "${S}"/sigscheme || die
-}
-
-src_prepare() {
-	default
-	sed -i "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac
-	# fix build with >=dev-scheme/chicken-4, bug #656852
-	touch scm/json-parser-expanded.scm
-	# fix build with "-march=pentium4 -O2", bug #661806
-	use x86 && append-cflags $(test-flags-CC -fno-inline-small-functions)
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_with X x)
-		$(use_with anthy anthy-utf8)
-		$(use_with curl)
-		$(use_with eb)
-		$(use_enable emacs)
-		$(use_with emacs lispdir "${SITELISP}")
-		$(use_with expat)
-		$(use_enable kde kde5-applet)
-		$(use_with libedit)
-		$(use_with libffi ffi)
-		$(use_with gtk gtk3)
-		$(use_with gtk2)
-		$(use_with m17n-lib m17nlib)
-		$(use_enable ncurses fep)
-		$(use_enable nls)
-		$(use_with qt5)
-		$(use_with qt5 qt5-immodule)
-		_QMAKE5=$(qt5_get_bindir)/qmake
-		$(use_with skk)
-		$(use_with sqlite sqlite3)
-		$(use_enable ssl openssl)
-		$(use_enable static-libs static)
-		$(use_with xft)
-		--without-anthy
-		--without-canna
-		--enable-default-toolkit=$(usex gtk gtk3 $(usex gtk2 gtk $(usex qt5 qt5)))
-		--disable-gnome-applet
-		--disable-gnome3-applet
-		--disable-kde-applet
-		--disable-kde4-applet
-		--without-mana
-		--enable-maintainer-mode
-		--without-prime
-		--disable-qt4-qt3support
-	)
-
-	if (use gtk || use gtk2) && use anthy; then
-		myconf+=( --enable-dict )
-	else
-		myconf+=( --disable-dict )
-	fi
-
-	if use libnotify; then
-		myconf+=( --enable-notify=libnotify )
-	fi
-
-	if use gtk || use gtk2 || use qt5; then
-		myconf+=( --enable-pref )
-	else
-		myconf+=( --disable-pref )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-
-	if use emacs; then
-		cd emacs || die
-		elisp-compile *.el || die
-		cd - >/dev/null || die
-	fi
-}
-
-src_install() {
-	# bug #222677
-	emake -j1 DESTDIR="${D}" install
-	rm -f doc/Makefile*
-	einstalldocs
-
-	find "${ED}"/usr/$(get_libdir)/${PN} -name '*.la' -delete || die
-	use static-libs || find "${ED}" -name '*.la' -delete || die
-
-	insinto /etc/X11/xinit/xinput.d
-	sed \
-		-e "s:@EPREFIX@:${EPREFIX}:g" \
-		"${FILESDIR}"/xinput-${PN} > "${T}"/${PN}.conf
-	doins "${T}"/${PN}.conf
-
-	if use X; then
-		docinto xim
-		dodoc xim/README*
-	fi
-
-	if use emacs; then
-		elisp-install ${PN}-el emacs/*.el{,c}
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE} ${PN}-el
-		docinto emacs
-		dodoc emacs/README*
-	fi
-
-	if use ncurses; then
-		docinto fep
-		dodoc fep/README*
-	fi
-}
-
-pkg_postinst() {
-	elog "New input method switcher has been introduced. You need to set"
-	elog
-	elog "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE"
-	elog "% QT_IM_MODULE=uim ; export QT_IM_MODULE"
-	elog "% XMODIFIERS=@im=uim ; export XMODIFIERS"
-	elog
-	elog "If you would like to use uim-anthy as default input method, put"
-	elog "(define default-im-name 'anthy)"
-	elog "to your ~/.uim."
-	elog
-	elog "All input methods can be found by running uim-im-switcher-gtk, "
-	elog "uim-im-switcher-gtk3 or uim-im-switcher-qt5."
-
-	if use emacs; then
-		elisp-site-regen
-		elog
-		elog "uim is autoloaded with Emacs with a minimal set of features:"
-		elog "There is no keybinding defined to call it directly, so please"
-		elog "create one yourself and choose an input method."
-		elog "Integration with LEIM is not done with this ebuild, please have"
-		elog "a look at the documentation how to achieve this."
-	fi
-	use gtk && gnome2_query_immodules_gtk3
-	use gtk2 && gnome2_query_immodules_gtk2
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	use gtk && gnome2_query_immodules_gtk3
-	use gtk2 && gnome2_query_immodules_gtk2
-}
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/beep/beep-1.4.12.ebuild
+++ b/app-misc/beep/beep-1.4.12.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/spkr-beep/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ppc ~ppc64 sparc x86"

 # Tests require a speaker
 RESTRICT="test"
--- a/app-misc/fastfetch/fastfetch-2.1.2.ebuild
+++ b/app-misc/fastfetch/fastfetch-2.1.2.ebuild
@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then
 	[[ "${EGIT_BRANCH}" == "" ]] && die "Please set a git branch"
 else
 	SRC_URI="https://github.com/fastfetch-cli/fastfetch/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~loong ~riscv"
+	KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
 fi

 LICENSE="MIT"
--- a/app-misc/gramps/gramps-5.1.6-r3.ebuild
+++ b/app-misc/gramps/gramps-5.1.6-r3.ebuild
@ -17,7 +17,7 @@ SRC_URI="https://github.com/gramps-project/${PN}/archive/v${PV}.tar.gz

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="exif geo postscript +rcs +reports spell test"

 # Many tests fail unless the deprecated BerkeleyDB back-end is enabled.
--- a/app-misc/mc/files/mc-4.8.30-musl-tests.patch
+++ b/app-misc/mc/files/mc-4.8.30-musl-tests.patch
@ -0,0 +1,15 @@
+--- a/tests/lib/vfs/path_len.c
+++ b/tests/lib/vfs/path_len.c
+@@ -89,12 +89,6 @@
+         "/тестовый/путь",
+         26
+     },
+-#ifdef HAVE_CHARSET
+-    { /* 3. */
+-        "/#enc:KOI8-R/тестовый/путь",
+-        38
+-    },
+-#endif /* HAVE_CHARSET */
+ };
+ /* *INDENT-ON* */
+ 
--- a/app-misc/mc/mc-4.8.30-r1.ebuild
+++ b/app-misc/mc/mc-4.8.30-r1.ebuild
@ -55,7 +55,10 @@ PATCHES=(

 src_prepare() {
 	default
-	# patch touches configure.ac
+
+	# Bug #906194
+	use elibc_musl && eapply "${FILESDIR}"/${PN}-4.8.30-musl-tests.patch
+
 	eautoreconf
 }

--- a/app-misc/mmv/mmv-2.5.1.ebuild
+++ b/app-misc/mmv/mmv-2.5.1.ebuild
@ -9,7 +9,7 @@ SRC_URI="https://github.com/rrthomas/${PN}/releases/download/v${PV}/${P}.tar.gz"

 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm64 ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"

 DEPEND="dev-libs/boehm-gc"
 RDEPEND="${DEPEND}"
--- a/app-misc/qlcplus/Manifest
+++ b/app-misc/qlcplus/Manifest
@ -1,3 +1,2 @@
-DIST QLC+_4.12.6.tar.gz 11345674 BLAKE2B 6035f29f22dd214c1190bd13fbdf5e4bd7b4fb3e3cf20f5556fe31aa318dc1490ffe5159f00e3accd88bff8cdb4bb2763e29e318073a3bf2f00ca3676fff266a SHA512 80869bc0c1682aeb81f5463253be595aa4745d3c4b5e20a1c8ae1c3d9ceabbbf251b52bebb723d9e0297bc712cc75fe2dd472182b79bef84b351cd4795231765
 DIST QLC+_4.12.7.tar.gz 11603681 BLAKE2B 52e257842e4892f04f7f45ea7747beb89c95a40d9d55d2e3629d4b3f7eed0e621936ff8af5c3b440e3237569cc0f44856cea9ceda61234e0b8ea35005c529b42 SHA512 26b3f17d25b0f34d41c701d1902e88eceb553f8d35d7d732581523a1066338bc8bd391fbb7b966ab5fe43114f405f9a8cef2d3c0da4d7b76bbe91bf0f64eae49
-DIST QLC+_5.0.0_beta1.tar.gz 11170124 BLAKE2B aebc0ddbd2ee9b4dd242d4766a708a9e83621c1f5ab6a69ab4ad4884f10eae954ad5a7d6aaef908ec4d1c725705231676ec77a3f65f0bcee73099344540bae00 SHA512 f831be1e31a995151768a09d1cdeb8815086d2ce3fc8c4e0abf12aefe6eb02870c6d86ae87cd7061ec353ce1d23ac7f73cd7646f3c2f00ddde45c25ff36ec884
+DIST QLC+_5.0.0_beta2.tar.gz 11486175 BLAKE2B 176368661a09ae523fd111fb7a9b46d5917e91325dea0d1f70973f11bd9bb7de6b3fd57647e56ce8f743b10f28c8883ed3a10fa914aa00be6737541590ec5a88 SHA512 e6e30e7174e0a45d058caa1ed5da9ed2e0b5ab72fe45cf0e70dd42e1528b69c87aeb21dd03770fe24cae83177d26bbe938c8d6e889fa418b753e97d4606534c4
--- a/app-misc/qlcplus/qlcplus-4.12.6.ebuild
+++ b/app-misc/qlcplus/qlcplus-4.12.6.ebuild
@ -1,82 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qmake-utils udev virtualx xdg
-
-DESCRIPTION="A software to control DMX or analog lighting systems"
-HOMEPAGE="https://www.qlcplus.org/"
-SRC_URI="https://github.com/mcallegari/${PN}/archive/QLC+_${PV}.tar.gz"
-S="${WORKDIR}/qlcplus-QLC-_${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
-RDEPEND="
-	dev-embedded/libftdi:=
-	dev-libs/glib:2
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5[widgets]
-	dev-qt/qtnetwork:5
-	dev-qt/qtscript:5
-	dev-qt/qtwidgets:5
-	media-libs/alsa-lib
-	media-libs/libmad
-	media-libs/libsndfile
-	sci-libs/fftw:3.0
-	virtual/libusb:0
-	virtual/libusb:1
-	virtual/udev
-"
-IDEPEND="
-	dev-util/desktop-file-utils
-"
-DEPEND="${RDEPEND}
-	dev-qt/qttest:5
-"
-
-src_prepare() {
-	default
-
-	sed -e "/UDEVRULESDIR/s:/etc/udev/rules.d:$(get_udevdir)/rules.d:" \
-		-i variables.pri || die
-
-	## Remove Werror-flag since there are some warnings with gcc-9.x
-	sed -e "s/QMAKE_CXXFLAGS += -Werror/#&/g" \
-		-i variables.pri || die
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-}
-
-pkg_postinst() {
-	udev_reload
-
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-src_test() {
-	virtx emake check
-}
-
-pkg_postrm() {
-	udev_reload
-
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
--- a/app-misc/qlcplus/qlcplus-5.0.0_beta2.ebuild
+++ b/app-misc/qlcplus/qlcplus-5.0.0_beta2.ebuild
@ -1,11 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8

-inherit qmake-utils udev virtualx xdg
+inherit qmake-utils udev xdg

-DESCRIPTION="A software to control DMX or analog lighting systems"
+DESCRIPTION="Software to control DMX or analog lighting systems"
 HOMEPAGE="https://www.qlcplus.org/"
 SRC_URI="https://github.com/mcallegari/${PN}/archive/QLC+_${PV}.tar.gz"
 S="${WORKDIR}/qlcplus-QLC-_${PV}"
@ -17,19 +17,16 @@ IUSE="test"

 RESTRICT="!test? ( test )"

-BDEPEND="
-	dev-qt/linguist-tools:5
-"
 RDEPEND="
 	dev-embedded/libftdi:=
 	dev-libs/glib:2
 	dev-qt/qt3d:5[qml]
 	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
 	dev-qt/qtgui:5
 	dev-qt/qtmultimedia:5[widgets,qml]
 	dev-qt/qtnetwork:5
 	dev-qt/qtprintsupport:5
-	dev-qt/qtscript:5
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	media-libs/alsa-lib
@ -40,12 +37,11 @@ RDEPEND="
 	virtual/libusb:1
 	virtual/udev
 "
-IDEPEND="
-	dev-util/desktop-file-utils
-"
 DEPEND="${RDEPEND}
 	dev-qt/qttest:5
 "
+BDEPEND="dev-qt/linguist-tools:5"
+IDEPEND="dev-util/desktop-file-utils"

 src_prepare() {
 	default
@ -63,7 +59,8 @@ src_configure() {
 }

 src_test() {
-	virtx emake check
+	local -x QT_QPA_PLATFORM=offscreen
+	emake check
 }

 src_install() {
@ -83,3 +80,10 @@ pkg_postinst() {
 	elog "OR"
 	elog "	export QT_QPA_PLATFORMTHEME=gtk3"
 }
+
+pkg_postrm() {
+	udev_reload
+
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
--- a/app-misc/task/task-2.6.2.ebuild
+++ b/app-misc/task/task-2.6.2.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://github.com/GothenburgBitFactory/taskwarrior/releases/download/v

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 x86 ~x64-macos"
 IUSE="+sync"

 DEPEND="
--- a/app-misc/tracker-miners/Manifest
+++ b/app-misc/tracker-miners/Manifest
@ -1,3 +1,3 @@
 DIST tracker-miners-3.5.2.tar.xz 7513024 BLAKE2B 6f144bb5e263c08c32b940dd18f98faa4201cfa1c40fa9c97b7e0406b6ed1c9547b1925337e0b3a7e5448dd7c2518b78f62e04e5beab221a55f464506baa151b SHA512 adb29549c94c68a46e2c5ede8a51bac2d014f772a5dc1c63f5cc6950da7f941e735bf5858c3306d2ad988ce2f60126bc97e5db746afe757b9b7cbc4f90518648
-DIST tracker-miners-3.6.0.tar.xz 7506144 BLAKE2B bb223fce64901580bf33970fe350692f578d35b5fdb5f1d8bcdf3dcd8a0b0aaac083de60f90d6c4a5aa810b8912971a75517309e75d252c3772997f0d7ec2f0b SHA512 c56c182ee2200d8d264826d77ccc0f22fd1d27bf0953dbdf75538ab70981707fb384943f77db632c202a54ae3b990a9c852a619172c701e14288b7c4f4c70917
+DIST tracker-miners-3.5.3.tar.xz 7513760 BLAKE2B 5241cdd1265a2d90a85870c6e2c6e34fd447e0baf73224c159d9d2998f97a001fb52473b60ad9623af2f874638a182b1edfebad61788b60ba16c21b7e8ce661a SHA512 9855b667d6bf47e1739ae2118e54c299274b23624f54ea5ccbfcbde790a2fc817fee8d95e112ffb7b0de39faa304182845c1aa40f2ac0531e37a090f7cdcec63
 DIST tracker-miners-3.6.1.tar.xz 7506716 BLAKE2B 73791820082611023f0a275eca0b92eea8cbbf56cd198143c43f1d9be4b47c2004de081618767dd8a929d899b4fa19128d1ddb2c03988b86c7b638b59cab6c09 SHA512 08685983e6ffd9b6ce435465e8996c07fd83775c0f00cafa991fbb1bda6227bb6ef52cfad7ebc9fa5854b06c4ee15d6f94dc81192efa9e9d798f22cee404026f
--- a/app-misc/tracker-miners/tracker-miners-3.5.3.ebuild
+++ b/app-misc/tracker-miners/tracker-miners-3.5.3.ebuild
@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2

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

 inherit flag-o-matic gnome.org gnome2-utils meson python-any-r1 systemd xdg

@ -18,11 +18,10 @@ RESTRICT="!test? ( test )"

 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"

-# tracker-2.1.7 currently always depends on ICU (theoretically could be libunistring instead);
-# so choose ICU over enca always here for the time being (ICU is preferred)
+# tracker-2.1.7 currently always depends on ICU (theoretically could be libunistring instead); so choose ICU over enca always here for the time being (ICU is preferred)
 RDEPEND="
 	>=dev-libs/glib-2.70:2
-	>=app-misc/tracker-3.6_rc:3
+	>=app-misc/tracker-3.5.0:3

 	>=sys-apps/dbus-1.3.1
 	xmp? ( >=media-libs/exempi-2.1.0:= )
@ -96,8 +95,7 @@ pkg_setup() {
 src_prepare() {
 	default

-	# Avoid gst-inspect calls that may trigger sandbox;
-	# instead assume the detection will succeed and add the needed test deps for that
+	# Avoid gst-inspect calls that may trigger sandbox; instead assume the detection will succeed and add the needed test deps for that
 	if use gstreamer; then
 		sed -i -e 's:detect-h264-codec.sh:/bin/true:' tests/functional-tests/meson.build || die
 	else
@ -151,8 +149,7 @@ src_configure() {
 		$(meson_feature xps)

 		-Dbattery_detection=$(usex upower upower none)
-		# enca is a possibility, but right now we have tracker core always dep on icu and icu is preferred over enca
-		-Dcharset_detection=icu
+		-Dcharset_detection=icu # enca is a possibility, but right now we have tracker core always dep on icu and icu is preferred over enca
 		-Dgeneric_media_extractor=${media_extractor}
 		# gupnp gstreamer_backend is in bad state, upstream suggests to use discoverer, which is the default
 		-Dsystemd_user_services_dir="$(systemd_get_userunitdir)"
@ -162,7 +159,6 @@ src_configure() {

 src_test() {
 	export GSETTINGS_BACKEND="dconf" # Tests require dconf and explicitly check for it (env_reset set it to "memory")
-	export PYTHONPATH="${EROOT}"/usr/$(get_libdir)/tracker-3.0
 	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
 }

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

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="libnotify"

 DEPEND="
--- a/app-office/texmaker/Manifest
+++ b/app-office/texmaker/Manifest
@ -1 +1,2 @@
 DIST texmaker-5.0.4.tar.bz2 15812468 BLAKE2B ad252827c7db90ad20de5ca59958124714b7abe660998ef21b983a7888831aaa12fedc018a764ad8898780b18ca97b44145afe548817a867f74b407f0a2c9399 SHA512 34ff5773358c2fffbc9e7e61028cd74eef231152e3483531b66cb0d907dd8f70a4e8b6d6ea09b0b11387b592f6d1676ba8a1e737b26c86a45b16882e53edff1f
+DIST texmaker-5.1.4.tar.bz2 15277027 BLAKE2B c121569a599181ec480823fbe2429977aedad4cbd4a3a09647b7ebcaace873d56e27362148a729b1802454d8e38703d507f4f616886d4bbba4075fe91aed5a5f SHA512 6ae4be7ae9be98e494480d4574e783a5568f0dcc9c631ccbc9bf00cca9f69dc672ba72060c064748a4446d20302af89e3bc6f14e8977d1f1ddbd20458fcf6d4e
--- a/app-office/texmaker/files/texmaker-5.1-unbundle-hunspell-singleapp.patch
+++ b/app-office/texmaker/files/texmaker-5.1-unbundle-hunspell-singleapp.patch
@ -0,0 +1,60 @@
+--- a/texmaker.pro	2023-04-30 14:59:36.000000000 +0200
+++ b/texmaker.pro	2023-10-21 19:09:19.634531874 +0200
+@@ -127,28 +127,6 @@
+ 	x11fontdialog.h \
+ 	quickbeamerdialog.h \
+ 	cmdparser.h \
+-	hunspell/affentry.hxx \
+-	hunspell/affixmgr.hxx \
+-	hunspell/atypes.hxx \
+-	hunspell/baseaffix.hxx \
+-	hunspell/csutil.hxx \
+-	hunspell/filemgr.hxx \
+-	hunspell/hashmgr.hxx \
+-	hunspell/htypes.hxx \
+-	hunspell/hunvisapi.h \
+-	hunspell/hunspell.h \
+-	hunspell/hunspell.hxx \
+-	hunspell/hunzip.hxx \
+-	hunspell/langnum.hxx \
+-	hunspell/phonet.hxx \
+-	hunspell/replist.hxx \
+-	hunspell/suggestmgr.hxx \
+-	hunspell/utf_info.hxx \
+-	hunspell/w_char.hxx \
+-	singleapp/qtlocalpeer.h \
+-	singleapp/qtlockedfile.h \
+-	singleapp/qtsingleapplication.h \
+-	singleapp/qtsinglecoreapplication.h \
+ 	encodingprober/CharDistribution.h \
+ 	encodingprober/ChineseGroupProber.h \
+ 	encodingprober/ctype_test_p.h \
+@@ -567,20 +545,6 @@
+ 	svnhelper.cpp \
+ 	x11fontdialog.cpp \
+ 	cmdparser.cpp \
+-	hunspell/affentry.cxx \
+-	hunspell/affixmgr.cxx \
+-	hunspell/csutil.cxx \
+-	hunspell/filemgr.cxx \
+-	hunspell/hashmgr.cxx \
+-	hunspell/hunspell.cxx \
+-	hunspell/hunzip.cxx \
+-	hunspell/phonet.cxx \
+-	hunspell/replist.cxx \
+-	hunspell/suggestmgr.cxx \
+-	singleapp/qtlocalpeer.cpp \
+-	singleapp/qtlockedfile.cpp \
+-	singleapp/qtsingleapplication.cpp \
+-	singleapp/qtsinglecoreapplication.cpp \
+ 	encodingprober/CharDistribution.cpp \
+ 	encodingprober/ChineseGroupProber.cpp \
+ 	encodingprober/JapaneseGroupProber.cpp \
+@@ -1168,7 +1132,6 @@
+ DEFINES += DEBIAN_SPELLDIR
+ 
+ INSTALLS = target
+-SOURCES	+= singleapp/qtlockedfile_unix.cpp
+ 
+ utilities.files = doc/doc10.png \
+ 	doc/doc11.png \
--- a/app-office/texmaker/texmaker-5.1.4.ebuild
+++ b/app-office/texmaker/texmaker-5.1.4.ebuild
@ -0,0 +1,86 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qmake-utils readme.gentoo-r1 xdg
+
+DESCRIPTION="Powerful LaTeX-IDE"
+HOMEPAGE="https://xm1math.net/texmaker/"
+SRC_URI="https://xm1math.net/texmaker/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+# dev-qt/qtcore slot op: includes private/qabstractitemmodel_p.h
+COMMON_DEPEND="
+	app-text/hunspell:=
+	app-text/poppler[qt5]
+	dev-qt/qtcore:5=
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtlockedfile
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsingleapplication[X,qt5(+)]
+	dev-qt/qtwebengine:5[widgets]
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sys-libs/zlib
+	x11-libs/libX11
+	x11-libs/libXext
+"
+RDEPEND="${COMMON_DEPEND}
+	app-text/ghostscript-gpl
+	app-text/psutils
+	media-libs/netpbm
+	virtual/latex-base
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/qtconcurrent:5
+"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( utilities/AUTHORS utilities/CHANGELOG.txt )
+HTML_DOCS=( doc/. )
+
+PATCHES=( "${FILESDIR}/${PN}-5.1-unbundle-hunspell-singleapp.patch" )
+
+src_prepare() {
+	default
+
+	find singleapp hunspell -delete || die
+
+	cat >> ${PN}.pro <<- EOF
+	exists(texmakerx_my.pri):include(texmakerx_my.pri)
+	EOF
+
+	cp "${FILESDIR}"/texmakerx_my.pri . || die
+
+	sed \
+		-e '/^#include/s:hunspell/::g' \
+		-e '/^#include/s:singleapp/::g' \
+		-i *.cpp *.h || die
+
+	DOC_CONTENTS="A user manual with many screenshots is available at:
+	${EPREFIX}/usr/share/${PN}/usermanual_en.html"
+}
+
+src_configure() {
+	local myeqmakeargs=(
+		${PN}.pro
+		QT_MAJOR_VERSION=5
+		PREFIX="${EPREFIX}/usr"
+		DESKTOPDIR="${EPREFIX}/usr/share/applications"
+		ICONDIR="${EPREFIX}/usr/share/pixmaps"
+	)
+	eqmake5 ${myeqmakeargs[@]}
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+	readme.gentoo_create_doc
+}
--- a/app-pda/Manifest.gz
+++ b/app-pda/Manifest.gz
--- a/app-pda/libimobiledevice/libimobiledevice-1.3.0-r3.ebuild
+++ b/app-pda/libimobiledevice/libimobiledevice-1.3.0-r3.ebuild
@ -14,7 +14,7 @@ SRC_URI="https://github.com/libimobiledevice/libimobiledevice/releases/download/
 # While COPYING* doesn't mention 'or any later version', all the headers do, hence use +
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0/1.0-6" # based on SONAME of libimobiledevice-1.0.so
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ~ppc64 ~riscv x86"
 IUSE="doc gnutls python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"

--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
--- a/app-portage/hackport/Manifest
+++ b/app-portage/hackport/Manifest
@ -1 +1,2 @@
 DIST hackport-0.7.2.2.tar.gz 2083323 BLAKE2B e14fbd5c5fa88260518869ad72dd59d08e7cb4351cecc35952ebfdd71e34ea335e6c4b56de7577033335e3efdbff8796fd05f1ad3df20ae84ed1bc8ef7b2153f SHA512 ce880ae8a5a4dc1d446654b8bf4108bacf4a974afaad0266c291ff9f2ab6f8af49294452314cbbeec1979c8e5ffab0860d87668f63d7d7731eb11eb3144a4bd0
+DIST hackport-0.8.4.0.tar.gz 2427117 BLAKE2B fac57e56cb09d32bd51abd5cb209920176682578cb198675d8dfca82b5b6851a5ea26758b9d83f3db74b5bc03a3ed9cb33372b56e9c314e3fdbb5fc24953e722 SHA512 4ecdc4e0eef0f27b4a79c4ad20676296d925fd51f113f701718f230ca9af2068bb44ef355cc0fdb22dceec11c2fe7aee14887bf2994d49f43bd5cfc66c9b7a79
--- a/app-portage/hackport/files/hackport.bash.completion
+++ b/app-portage/hackport/files/hackport.bash.completion
@ -0,0 +1,14 @@
+_hackport()
+{
+    local CMDLINE
+    local IFS=$'\n'
+    CMDLINE=(+RTS -I0 -A8M -N1 -qg -RTS --bash-completion-index $COMP_CWORD)
+
+    for arg in ${COMP_WORDS[@]}; do
+        CMDLINE=(${CMDLINE[@]} --bash-completion-word $arg)
+    done
+
+    COMPREPLY=( $(/usr/bin/hackport "${CMDLINE[@]}") )
+}
+
+complete -o filenames -F _hackport hackport
--- a/app-portage/hackport/hackport-0.8.4.0.ebuild
+++ b/app-portage/hackport/hackport-0.8.4.0.ebuild
@ -0,0 +1,87 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: +cabal-v1,+gentoo-tests,+pedantic
+
+CABAL_FEATURES="test-suite"
+inherit haskell-cabal bash-completion-r1
+DESCRIPTION="Hackage and Portage integration tool"
+HOMEPAGE="https://github.com/gentoo-haskell/hackport#readme"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="profile"
+
+RDEPEND="
+	>=dev-haskell/async-2.0:=[profile?]
+	>=dev-haskell/base16-bytestring-0.1.1:=[profile?]
+	>=dev-haskell/base64-bytestring-1.0:=[profile?]
+	>=dev-haskell/cryptohash-sha256-0.11:=[profile?]
+	dev-haskell/dlist:=[profile?]
+	>=dev-haskell/echo-0.1.3:=[profile?]
+	>=dev-haskell/ed25519-0.0:=[profile?]
+	>=dev-haskell/edit-distance-0.2.2:=[profile?]
+	dev-haskell/extensible-exceptions:=[profile?]
+	>=dev-haskell/hashable-1.0:=[profile?]
+	>=dev-haskell/http-4000.1.5:=[profile?]
+	dev-haskell/lifted-base:=[profile?]
+	>=dev-haskell/lukko-0.1:=[profile?]
+	dev-haskell/monad-control:=[profile?]
+	>=dev-haskell/network-3.0:=[profile?]
+	>=dev-haskell/network-uri-2.6.0.2:=[profile?]
+	dev-haskell/optparse-applicative:=[profile?]
+	>=dev-haskell/parallel-3.2.1.0:=[profile?]
+	>=dev-haskell/parsec-3.1.13.0:=[profile?]
+	dev-haskell/parser-combinators:=[profile?]
+	dev-haskell/prettyprinter:=[profile?]
+	dev-haskell/quickcheck:2=
+	>=dev-haskell/random-1.2:=[profile?]
+	>=dev-haskell/regex-base-0.94.0.0:=[profile?]
+	>=dev-haskell/regex-posix-0.96.0.0:=[profile?]
+	>=dev-haskell/resolv-0.1.1:=[profile?]
+	>=dev-haskell/safe-exceptions-0.1.7.0:=[profile?]
+	dev-haskell/split:=[profile?]
+	>=dev-haskell/tar-0.5.0.3:=[profile?]
+	>=dev-haskell/text-1.2.3.0:=[profile?]
+	dev-haskell/xml:=[profile?]
+	>=dev-haskell/zlib-0.5.3:=[profile?]
+	>=dev-lang/ghc-8.10.6:=[profile?]
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0
+	test? (
+		dev-haskell/base-compat
+		>=dev-haskell/cabal-doctest-1.0
+		>=dev-haskell/doctest-0.8
+		dev-haskell/glob
+		>=dev-haskell/hspec-2.0
+		dev-haskell/hunit
+		>=dev-haskell/quickcheck-2.0
+	)
+"
+
+src_configure() {
+	if use test; then
+		export GHC_BOOTSTRAP_PACKAGES=(
+			cabal-doctest
+		)
+	fi
+
+	haskell-cabal_src_configure \
+		--flag=cabal-v1 \
+		--flag=gentoo-tests \
+		--flag=pedantic \
+		$(cabal_flag profile profile)
+}
+
+src_install() {
+	haskell-cabal_src_install
+	doman man/hackport.1
+
+	# We only install bash completion scripts currently
+	newbashcomp "${FILESDIR}/${PN}.bash.completion" "${PN}"
+}
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`DIST sharper-1.0_p20230129.tar.gz 288565 BLAKE2B aef8d9a0af0b41b92fb85e760cd449ee81fbbb7a161885b1e783e83e4b2ca553ae12d7c5f954c4ddb842d934b6da2f93d87f50d62c6e79a8aaabfeabfdf5bdad SHA512 c2adfeccb77e96bb681061dbb1276373159e97374a6b30f1e1e2cc343340b4ab1083d9c2f67f02ecc0061cd37a36b03831a2f4320b0b0b1e2d4617cfa0a8a68e`