Sync with portage [Tue Oct 11 23:32:58 MSK 2022].

2 years ago · c0928ac01c
parent 0fd40e80af
commit c0928ac01c
20855 changed files with 32300 additions and 26826 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@ -1,9 +1,3 @@
-DIST aws-cli-1.25.75.gh.tar.gz 2270365 BLAKE2B 68cd58d03e0712133104dbb145c6d4bcedf8925e59088d0f2c7ecb7c91beb572a3c8c33f55d95e1a2e0e462648c06cde2460e595942e8adb33c3dcab8ec6a2fc SHA512 c21de74e0ae7380a810d11bad53f0233bc50c8959f047d58c4f4c2cd23231fab34dbba1dac6096790adb28b1ca99e22e70019bcda32738df6e984b2bb46abaa8
 DIST aws-cli-1.25.81.gh.tar.gz 2273195 BLAKE2B 3bf3ca742b08c0bf4367ae1bfabcf8c2626010d60cc11ff66250753f62609eba80053c1d8696cc3184ba9f947f995a8bb95489b01f60a3fa7e1a8cbb4961652c SHA512 4f10de492a56b158d88671c149d4ed4171fbbde8fe84de15a446e31a7d8003a4562439eabd369cb80dcf91987caab6aef05e5b3f5684aeea47ba0d323883c53c
-DIST aws-cli-1.25.82.gh.tar.gz 2273453 BLAKE2B 11c307a78df654634a7ae75cc8a7ce7d37697aa9ce792a3ad2b1a250291f2ff3574bea13219c072f223e4f27b7e5df757b49971374a5962f19b57ae00f77cd44 SHA512 90737a8cc9aac60970e705c5637672b74e89278926196c1363252038401e12bcb31672c878d2a3b6f213f5a5aac308e5b170e90342f6d270793aead3c8485eaf
-DIST aws-cli-1.25.83.gh.tar.gz 2273842 BLAKE2B 3b3986f539302830d981478cf485c9a724a0c1bd216b6a3952781eeeb96e58d0f7cf575a899e79e55dc2252d90c15c1cf2cbde755fa4f89ac4fcabbab788896a SHA512 7194d281477bc8f94b91901fdea57a1da44e703a04d28df9bb63a7f17370ec31eb640128f07b902a46892ca77377e706a0d99f6d53699a572c9cb2ef7d0f6c04
-DIST aws-cli-1.25.85.gh.tar.gz 2274915 BLAKE2B 074651fd32ec378c8f574266ff2a2e43ddb3d16fc7cb73dda75895819d948216acefe6e5c0da1ef059e36c4b684a6b360f996e3ff905abfc71a4c68dc78ad64d SHA512 ca6b6012fbe69467adfeade7f4b7c4cf40c50f2c62aee71c1e459bfa6597d3510e8ba087752c23ca77306e49cffbb68dde95167eed0d9313ab1488855b2aa4dd
-DIST aws-cli-1.25.87.gh.tar.gz 2285796 BLAKE2B 47df516ee23e9955ce8798546a2fecdc4b43199aa3daa5195c4dda010c3e4c86d2a4b6aac1dfd1c057cfb2f5ed9ea9a718b34aad09d8ddbb176ab3bfb4a86d25 SHA512 8beb4d70773c890dec4b4914c77d6fd73e4b66a6ee11316d0a851f17d6abc20cc67bf33d7209e8a285f84195d68c9f497eb8471ecb59438bf3b03353d960a8f6
-DIST aws-cli-1.25.88.gh.tar.gz 2285714 BLAKE2B 037bb747f6a3a4b09b5289ff44d7dc65be469197271094f5c231474f1d70ee62952a51da6aaae03ab706f3f408544966ba2c0ea9fd93f1d1d0580c236fe3385c SHA512 0377af9d6774fc9bfc4dd351bbe21cf601c5a287a83eea5da3a983349d20ab2279137f3ba5afdd99118877518d330f6e6da0ef017874bbe42331c2638ad2d85e
 DIST aws-cli-1.25.89.gh.tar.gz 2285887 BLAKE2B 1da21b1e314b187ee105d2bf256ce2fea42fec8d1e5cf0de39c8371a93a588e24e5415b2e50ae314d39613a4ae55963bd544cc7ab3e08d0e38089c5c609454f4 SHA512 39087e269a0318777af73d010d7c6264fd595fc5d27f24bb66da07763165729526bd8a60f4225241eb5172d879d6f562c5bf64ad5979d7ac3be40b7d8cf33486
 DIST aws-cli-1.25.90.gh.tar.gz 2285948 BLAKE2B a664e70e7367e6cf6fbaf62ab4dbbf649e92f3184793cb0f444c520b947cfc0845e075a44025b48a02b431e237d835de23aba6f83fdea5810d759690368ce069 SHA512 f42b0125cddc35314a675f84672fb5716300d9625eac7338b36b6f501d412a5e932f1d75566a9cdaca84b9f7cd65cc354199e5138675d48a0f52ace9a1ab126b
--- a/app-admin/awscli/awscli-1.25.75.ebuild
+++ b/app-admin/awscli/awscli-1.25.75.ebuild
@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-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 ~arm64 ~riscv x86"
-
-# botocore is x.(y+2).(z-1)
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(( $(ver_cut 3-) - 1 ))"
-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() {
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-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.25.81.ebuild
+++ b/app-admin/awscli/awscli-1.25.81.ebuild
@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"

 # botocore is x.(y+2).(z-1)
 BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(( $(ver_cut 3-) - 1 ))"
--- a/app-admin/awscli/awscli-1.25.82.ebuild
+++ b/app-admin/awscli/awscli-1.25.82.ebuild
@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..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 ~arm64 ~riscv ~x86"
-
-# botocore is x.(y+2).(z-1)
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(( $(ver_cut 3-) - 1 ))"
-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() {
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-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.25.83.ebuild
+++ b/app-admin/awscli/awscli-1.25.83.ebuild
@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..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 ~arm64 ~riscv ~x86"
-
-# botocore is x.(y+2).(z-1)
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(( $(ver_cut 3-) - 1 ))"
-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() {
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-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.25.85.ebuild
+++ b/app-admin/awscli/awscli-1.25.85.ebuild
@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..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 ~arm64 ~riscv ~x86"
-
-# botocore is x.(y+2).(z-1)
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(( $(ver_cut 3-) - 1 ))"
-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() {
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-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.25.87.ebuild
+++ b/app-admin/awscli/awscli-1.25.87.ebuild
@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..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 ~arm64 ~riscv ~x86"
-
-# botocore is x.(y+2).(z-1)
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(( $(ver_cut 3-) - 1 ))"
-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() {
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-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.25.88.ebuild
+++ b/app-admin/awscli/awscli-1.25.88.ebuild
@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..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 ~arm64 ~riscv ~x86"
-
-# botocore is x.(y+2).(z-1)
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(( $(ver_cut 3-) - 1 ))"
-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() {
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-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/consul/consul-1.12.5.ebuild
+++ b/app-admin/consul/consul-1.12.5.ebuild
@ -14,7 +14,7 @@ SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.g
 LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
 RESTRICT+=" test"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="amd64 ~arm64 ~x86"

 BDEPEND="dev-go/gox"
 COMMON_DEPEND="
--- a/app-admin/lnav/lnav-0.11.0.ebuild
+++ b/app-admin/lnav/lnav-0.11.0.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/tstack/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}

 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="pcap test"
 RESTRICT="!test? ( test )"

--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
--- a/app-benchmarks/bonnie/bonnie-2.0.6-r3.ebuild
+++ b/app-benchmarks/bonnie/bonnie-2.0.6-r3.ebuild
@ -3,7 +3,7 @@

 EAPI=8

-inherit toolchain-funcs
+inherit flag-o-matic toolchain-funcs

 DESCRIPTION="Performance Test of Filesystem I/O using standard C library calls"
 HOMEPAGE="https://www.textuality.com/bonnie/"
@ -22,6 +22,7 @@ PATCHES=(

 src_compile() {
 	tc-export CC
+	append-cflags -std=gnu89 # old codebase, incompatible with c2x

 	emake -f /dev/null Bonnie
 }
--- a/app-dicts/Manifest.gz
+++ b/app-dicts/Manifest.gz
--- a/app-dicts/aspell-pt/Manifest
+++ b/app-dicts/aspell-pt/Manifest
@ -1 +1,2 @@
 DIST aspell6.pt-20220304.tar.bz2 170068 BLAKE2B 058e9e96d57da795251f99c83e1c39805208fe5b4d404e8e59944863e8ddeaa583d5934cc2916272d1598075865199029e7fb55fc3e6c22f47825e6326e18465 SHA512 39646317a85f82b1e5fe160b42e469ec7317fecafba168cb26ef1c138d90d03e1cc01b0a50cbb75c97e4cf70aa7197beb89d0041ed7fc32b2653ef5f9b755305
+DIST aspell6.pt-20220621.tar.bz2 170248 BLAKE2B 24263cc1fc19b0758c08637edbd8e2b7d75132ee2cde46cfb4fb60d820452d57117e73666dae542f43c15fcc85868c686a98909ec1b3469396871b6e1ad03bb6 SHA512 9e5d7bd10b858f7fac288212c5658786fe1ce27c895673177aca99a17996ba7629817e0882432bfcf4dc9bdee501393f9f25744d59b0ae5995e2c2c78e2c147f
--- a/app-dicts/aspell-pt/aspell-pt-20220621.ebuild
+++ b/app-dicts/aspell-pt/aspell-pt-20220621.ebuild
@ -0,0 +1,19 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ASPELL_LANG="Portuguese"
+ASPELL_VERSION=6
+MY_PN="${PN/-/.}"
+MY_P="${MY_PN/aspell/aspell${ASPELL_VERSION}}-${PV}"
+MY_S="${PN/aspell/aspell${ASPELL_VERSION}}-${PV}"
+
+inherit aspell-dict-r1
+
+HOMEPAGE="https://natura.di.uminho.pt/wiki/doku.php?id=dicionarios:main"
+SRC_URI="https://natura.di.uminho.pt/download/sources/Dictionaries/aspell${ASPELL_VERSION}/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_S/pt/pt_PT}-0"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/gummi/Manifest
+++ b/app-editors/gummi/Manifest
@ -1,2 +1 @@
-DIST gummi-0.8.2.tar.gz 595733 BLAKE2B 9c7366df2b8fe40f7876f065a1156eb4992048b3eaec5dde332c50ccb98ef2a5d8d2cbe73ebb56eb3736bbce49f3168f165db82f562ee7265ce0859952801a2c SHA512 3882f1e2779b94348cc0cc243c3968a78165c16de41029f9fcb8ba2fa942d329c43f5ecc8ba8327590e14343556ca472a51d1e824ce0985a415ab92aa2cbbc42
 DIST gummi-0.8.3.tar.gz 590485 BLAKE2B d919544eca87e22da49afc879933b5b54b23ed0a21303c95deb405c5ecdec57981d19f526e7cef27f904a6cc1fb5e1bea7af1131578b0f4275460035a5d9167f SHA512 c8c7b5427ed37a995bc8c6f814a5af2926595acfe4dea649e02af424291b8dff0d7264f1e68c7a86b457a9710ad6b18fed2238f1adeec91360921a242a7cb980
--- a/app-editors/gummi/gummi-0.8.2.ebuild
+++ b/app-editors/gummi/gummi-0.8.2.ebuild
@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils
-
-DESCRIPTION="Simple LaTeX editor for GTK+ users"
-HOMEPAGE="https://github.com/alexandervdm/gummi"
-SRC_URI="https://github.com/alexandervdm/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-
-RDEPEND="
-	app-text/gtkspell:3
-	app-text/poppler[cairo]
-	dev-libs/glib:2
-	dev-texlive/texlive-latex
-	dev-texlive/texlive-latexextra
-	x11-libs/gtk+:3
-	x11-libs/gtksourceview:3.0
-	x11-libs/pango
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	elog "Gummi supports spell-checking through gtkspell. Support for"
-	elog "additional languages can be added by installing myspell-**-"
-	elog "packages for your language of choice."
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
--- a/app-emacs/eglot/Manifest
+++ b/app-emacs/eglot/Manifest
@ -1,2 +1,3 @@
 DIST eglot-1.6.tar.gz 288078 BLAKE2B a2214d216d0eeaca32d974c6686696dfcf141b3384741bc8cce0d02abb508eb5713933bc227d12a07f4b87fc34601431845b1b8e519538ae04ecc74b24db4004 SHA512 51227c8e2b0a1dd9a63ededbea592f01616ff728c34c330400c078212fef3f3e747e6dd30ba312523cbe60c7ea663a7af9d83300210cf331ea6162d2db5c7e41
 DIST eglot-1.8.tar.gz 302450 BLAKE2B 7247b11adaf9a65a2e071ca17b55038fe85f5842fb4155b44dbfa82bae5774e4cd2f7a5557d40cb1a7ab7f554233f15abe297e10568a1630b464ab6a600d978f SHA512 0295eff6dfbbf9d7a82349b8e5ed9e7dad700f2f0bfcab879d906e30bfbb4d28b8779fd9076108ac9b1594a60ca5e30c5035e2f8ceae44add99c28a843027609
+DIST eglot-1.9.tar.gz 316541 BLAKE2B 5b9f188ae3f2b26fd7bb95aeb3095fbf5a78f6a15eeccaceaf947f5f91e78253622d2c81d5e57f11762c0370baf9d6c856a4f770c2652840d750f98ee780b418 SHA512 961399e0877a09bd292424715c3fac86e7750e144ba302e61262925b6ded1d30c6ebf3e63067b27b56fa2062461a947425951ac5538e25312d179fa20bd68b79
--- a/app-emacs/eglot/eglot-1.9.ebuild
+++ b/app-emacs/eglot/eglot-1.9.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS="26.1"
+
+inherit elisp
+
+DESCRIPTION="A minimal Emacs LSP client"
+HOMEPAGE="https://github.com/joaotavora/eglot"
+SRC_URI="https://github.com/joaotavora/eglot/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+# test requires internet connection to install several language servers, one of which
+# is not packaged
+RESTRICT="test"
+
+SITEFILE="50${PN}-gentoo.el"
+ELISP_REMOVE="eglot-tests.el"
+DOCS=( README.md NEWS.md )
+
+src_install() {
+	elisp-make-autoload-file "${S}"/${PN}-autoload.el "${S}"/
+	elisp_src_install
+}
--- a/app-emacs/emacs-bazel-mode/emacs-bazel-mode-0_p20220707.ebuild
+++ b/app-emacs/emacs-bazel-mode/emacs-bazel-mode-0_p20220707.ebuild
@ -16,7 +16,7 @@ SRC_URI="https://github.com/bazelbuild/${PN}/archive/${H}.tar.gz
 S="${WORKDIR}"/${PN}-${H}

 LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 SLOT="0"

 DOCS=( CONTRIBUTING.md README.md )
--- a/app-emacs/emms/Manifest
+++ b/app-emacs/emms/Manifest
@ -1,3 +1,3 @@
 DIST emms-10.tar.xz 171792 BLAKE2B 33368d62c170d3a3cb024887cc421ed69c0e2fc4c9af8676bb8d056b13981b75e3d4acaca9e0276062ed19060c97e5a62b07d51279dc6bf1e9565c1c2a7f17f6 SHA512 383a8ad2769021969a522125a0d588b3caea82345067d59cf21116e3dfd54a2ec60d9be60b479dfd5f14804b7e5f8f513e64bcae0ff936ea3bb9603074116b7a
 DIST emms-11.tar.gz 205268 BLAKE2B 7461b1873710747dbc5f7b24c33adb1e7303a5e88cbe056d45b5fd5bea9a5c8c3ab9128468bae761b088cbfcf523274677d5865b137853ea6970883a5897ee83 SHA512 9119998fbf72b1b957ffe96acc35a152efd0215a28356fb05efc358075b8baa9487a35782422e3b53605ea899ff390b55636d8d36877c3f12c5e5400bbb5bb95
-DIST emms-5.4.tar.gz 311583 BLAKE2B fc5a67a0e1e35f9e9d83112e0f98a7489e0aff7ca6a2b4a633b296eb20218ffa798f33754069da9be93fe8725a0438db77e0f8aa25bdf617f45cba954abdf556 SHA512 a274938ace810404a8891c60e8f54fadc60054e2b7f1139941b69b40e8693f2177ec9ecd795517e17a0b7ca3477f2e75a0a844408ad35975a4b69266c466fbff
+DIST emms-12.tar.gz 206897 BLAKE2B f65a3142c3de5bba9244e08de0f6769d880fb3df2dddce8bcb8ddfe61f68426c5821b49483631629eb3d0c3b9e23d1754ea824bc0888230b35cf1fab1d6dc1f2 SHA512 1f3781fd268208f5a15675f8dff88a47e82ea9dc746d7053aaa04141e38e95365596c21fc8b66e17253099b76e0c5e3a1fc04418c0cb7151836375aabfe863e7
--- a/app-emacs/emms/emms-5.4.ebuild
+++ b/app-emacs/emms/emms-5.4.ebuild
@ -1,21 +1,21 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=7
+EAPI=8

 inherit elisp toolchain-funcs

 DESCRIPTION="The Emacs Multimedia System"
 HOMEPAGE="https://www.gnu.org/software/emms/
 	https://www.emacswiki.org/emacs/EMMS"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+SRC_URI="https://git.savannah.gnu.org/cgit/emms.git/snapshot/${P}.tar.gz"

 LICENSE="GPL-3+ FDL-1.1+"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"

 RDEPEND="media-libs/taglib"
-DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}"

 # EMMS can use almost anything for playing media files therefore the dependency
 # possibilities are so broad that we refrain from setting anything explicitly
@ -24,15 +24,17 @@ DEPEND="${RDEPEND}"
 SITEFILE="50${PN}-gentoo.el"

 src_compile() {
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
-		all emms-print-metadata
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" all emms-print-metadata
 }

 src_install() {
-	elisp-install ${PN} lisp/*.{el,elc}
+	elisp-install ${PN} *.el *.elc
 	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+
+	exeinto /usr/bin
+	doexe src/emms-print-metadata
+
 	doinfo doc/emms.info*
-	dobin src/emms-print-metadata
 	doman emms-print-metadata.1
-	dodoc AUTHORS ChangeLog NEWS README THANKGNU
+	dodoc AUTHORS NEWS README THANKGNU
 }
--- a/app-emacs/posframe/Manifest
+++ b/app-emacs/posframe/Manifest
@ -1,2 +1,3 @@
 DIST posframe-0.8.5.tar.gz 77569 BLAKE2B bf379f4641ed78f7cd92fcb443f3e01f78360113dc9eec4b1dcbba581ec0df5b11eeeda27eaea6dd28f7aa324c33aa499079afe9665da9d1d2328904117364d9 SHA512 ce9c76f8a943d206f3438b82ba637b96a9f3cf0d1078f8b940ab8a0aaa9940aa308a76be5b678d7394b25716f631ca3305e25b850fd25ffa18d79551baff0586
 DIST posframe-1.1.7.tar.gz 79507 BLAKE2B ad6c12b8733a6db18b53a20c78ca16412206ce782e269500ffa36ff7e29873a4d46e6addbf30c7e5a7a818de3b752cc481a4031c96ff8760e714373ece06db0f SHA512 c3762ec115df4c6967a8a7bff4c8d9447b97da36903e166a2f4d7da382b8e22b2e7f97c5cfa3f40f5461c78821552574a905b4e595ef34f5fb45c8cd17fee95b
+DIST posframe-1.1.8.tar.gz 79505 BLAKE2B 008ac743127f667aa992823e0ad167198f0a8bff171b96730c2071b5b7034bd8f0e196b1b85df6b43692b32005b51136f11068bb553a2ebd07266edac6c757c8 SHA512 714304a15b0b12769ab165ba2978290bf04bfe7b5051f2829872396f4f623e7a3a5193fcc246a3c8eb59073bdc1b17ddf275ab484ac08dc68192b803fa90a47e
--- a/app-emacs/posframe/posframe-1.1.8.ebuild
+++ b/app-emacs/posframe/posframe-1.1.8.ebuild
@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=26.1
+
+inherit elisp
+
+DESCRIPTION="Pop up a frame at point"
+HOMEPAGE="https://github.com/tumashu/posframe/"
+SRC_URI="https://github.com/tumashu/${PN}/archive/refs/tags/v${PV}.tar.gz
+			-> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+DOCS=( README.org snapshots )
+SITEFILE="50${PN}-gentoo.el"
--- a/app-emacs/racket-mode/racket-mode-20220830.ebuild
+++ b/app-emacs/racket-mode/racket-mode-20220830.ebuild
@ -15,7 +15,7 @@ S="${WORKDIR}"/${PN}-${H}

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

 RDEPEND="dev-scheme/racket:=[-minimal]"
 BDEPEND="${RDEPEND}"
--- a/app-emacs/spacemacs-theme/spacemacs-theme-0.3.ebuild
+++ b/app-emacs/spacemacs-theme/spacemacs-theme-0.3.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://github.com/nashamri/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"

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

 DOCS=( README.md img )
 ELISP_REMOVE="spacemacs-theme-pkg.el"
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/fuse-utils/fuse-utils-1.4.3-r2.ebuild
+++ b/app-emulation/fuse-utils/fuse-utils-1.4.3-r2.ebuild
@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=7
+EAPI=8

 inherit autotools

@ -11,13 +11,13 @@ SRC_URI="mirror://sourceforge/fuse-emulator/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 IUSE="audiofile gcrypt jpeg png zlib"

 RDEPEND=">=app-emulation/libspectrum-1.4.4[audiofile?,gcrypt?,zlib?]
 	audiofile? ( >=media-libs/audiofile-0.3.6 )
 	gcrypt? ( dev-libs/libgcrypt )
-	jpeg? ( virtual/jpeg:0 )
+	jpeg? ( media-libs/libjpeg-turbo:= )
 	png? ( media-libs/libpng:0 )
 	zlib? ( sys-libs/zlib )"
 DEPEND="${RDEPEND}"
--- a/app-emulation/fuse/fuse-1.6.0.ebuild
+++ b/app-emulation/fuse/fuse-1.6.0.ebuild
@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=7
+EAPI=8

 inherit autotools flag-o-matic xdg

@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/fuse-emulator/${P}.tar.gz"

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86"
 IUSE="alsa ao backend-X backend-fbcon +backend-gtk3 backend-sdl backend-svga gpm joystick memlimit png pulseaudio +xml +zlib"

 # TODO:
@ -64,7 +64,8 @@ _fuse_audio_driver() {
 }

 src_prepare() {
-	xdg_src_prepare
+	default
+	xdg_environment_reset
 	eautoreconf

 	# Bug #854522
--- a/app-emulation/libspectrum/libspectrum-1.5.0.ebuild
+++ b/app-emulation/libspectrum/libspectrum-1.5.0.ebuild
@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=7
+EAPI=8

 inherit autotools

@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/fuse-emulator/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86"
 IUSE="audiofile bzip2 gcrypt zlib"

 RDEPEND="dev-libs/glib:2
@ -34,7 +34,6 @@ src_prepare() {

 src_configure() {
 	local myconf=(
-		--disable-static
 		$(use_with audiofile libaudiofile)
 		$(use_with bzip2)
 		$(use_with gcrypt libgcrypt)
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
--- a/app-eselect/eselect-awk/Manifest
+++ b/app-eselect/eselect-awk/Manifest
@ -1 +1,2 @@
 DIST eselect-awk-0.3.tar.gz 1543 BLAKE2B 9ff340002d76a3bc3569501d7b92a8d216eac65e9c009be2a7b43802512050fdae962b53e66bbd0e5df6d295968aa4e3d56c8442adce5eac5d7c8b1f30b1e924 SHA512 d90ed1c8edddd996e2b62b4a927d2c5ead5790aff275e3a79f4a1361358c4debef0c50ec2c8d6da5a210755a5d51cad4b2c5d6ee90553227f0f24b251b52e383
+DIST eselect-awk-0.4.tar.bz2 1687 BLAKE2B a733bbd48ad6d4e5aa1a159eac0b5b55d0b7a844588212eeff522a3ac3c3e689e52456108a9734192de2364b9927652314cd6d0142af6726018db8197ba09784 SHA512 3e4130cc5a126e2978cc9c990e238700e109d2ea5ab0b734dbd45a10ebdbcfdf0a718ee672e76c3b674f4986921cebdaa6b37c22d34815170011766ee7dba99d
--- a/app-eselect/eselect-awk/eselect-awk-0.4.ebuild
+++ b/app-eselect/eselect-awk/eselect-awk-0.4.ebuild
@ -0,0 +1,17 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Manages the {,/usr}/bin/awk symlink"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="https://gitweb.gentoo.org/proj/eselect-awk.git/snapshot/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux"
+
+src_install() {
+	insinto /usr/share/eselect/modules
+	doins awk.eselect
+}
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
--- a/app-i18n/kcc/files/kcc-1.0-clang16.patch
+++ b/app-i18n/kcc/files/kcc-1.0-clang16.patch
@ -0,0 +1,19 @@
+https://bugs.gentoo.org/871399
+--- a/kcc.c
+++ b/kcc.c
+@@ -33,2 +33,3 @@
+ #include <sys/stat.h>
+#include <unistd.h>
+ 
+@@ -138,4 +139,6 @@
+ #ifdef __STDC__
+int getstr(char *str, register int n, FILE *fp);
+ void error(char *format, ...);
+ #else
+int getstr();
+ void error();
+@@ -152,3 +155,3 @@
+  ---------------------------------------------------------------------*/
+-main(c, v)
+int main(c, v)
+     register int c;
--- a/app-i18n/kcc/kcc-1.0.ebuild
+++ b/app-i18n/kcc/kcc-1.0.ebuild
@ -1,33 +1,35 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=7
+EAPI=8

-inherit toolchain-funcs
+inherit flag-o-matic toolchain-funcs

-DESCRIPTION="A Kanji code converter"
+DESCRIPTION="Kanji code converter"
 HOMEPAGE="http://www2s.biglobe.ne.jp/~Nori/ruby/"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
+S="${WORKDIR}/${PN}"

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

-S="${WORKDIR}/${PN}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-gcc3-gentoo.diff
 	"${FILESDIR}"/${PN}-exit.diff
-	"${FILESDIR}"/${PN}-1.0-fix-build-system.patch
+	"${FILESDIR}"/${P}-fix-build-system.patch
+	"${FILESDIR}"/${P}-clang16.patch
 )

 src_configure() {
 	tc-export CC
+	append-cflags -std=gnu89 # old codebase, incompatible with c2x
 }

 src_install() {
 	dobin kcc
 	einstalldocs

-	cp -f kcc.jman kcc.1 || die
+	cp kcc.jman kcc.1 || die
 	doman -i18n=ja kcc.1
 }
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
--- a/app-office/gtg/gtg-0.6-r1.ebuild
+++ b/app-office/gtg/gtg-0.6-r1.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://github.com/getting-things-gnome/gtg/archive/refs/tags/v${PV}.ta

 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
--- a/app-officeext/Manifest.gz
+++ b/app-officeext/Manifest.gz
--- a/app-officeext/languagetool/languagetool-5.6.ebuild
+++ b/app-officeext/languagetool/languagetool-5.6.ebuild
@ -18,6 +18,6 @@ SRC_URI="https://www.languagetool.org/download/${MY_P}.oxt"

 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"

 RDEPEND=">=virtual/jre-1.8"
--- a/app-officeext/ooo2gd/ooo2gd-3.0.0-r2.ebuild
+++ b/app-officeext/ooo2gd/ooo2gd-3.0.0-r2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -16,5 +16,5 @@ SRC_URI="https://ooo2gd.googlecode.com/files/${PN}_${PV}.oxt"

 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~x86"
 IUSE=""
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/aha/aha-0.5.1.ebuild
+++ b/app-text/aha/aha-0.5.1.ebuild
@ -9,7 +9,7 @@ SRC_URI="https://github.com/theZiz/aha/archive/refs/tags/${PV}.tar.gz -> ${P}.ta

 LICENSE="LGPL-2+ MPL-1.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"

 PATCHES=(
 	"${FILESDIR}/${P}-null-ptr-dereference-fix.patch"
--- a/app-text/convertlit/convertlit-1.8-r4.ebuild
+++ b/app-text/convertlit/convertlit-1.8-r4.ebuild
@ -3,7 +3,7 @@

 EAPI=8

-inherit toolchain-funcs
+inherit flag-o-matic toolchain-funcs

 MY_P="clit${PV//./}"

@ -29,6 +29,7 @@ PATCHES=(

 src_compile() {
 	tc-export AR CC
+	append-cflags -std=gnu89 # old codebase, incompatible with c2x

 	emake -C lib
 	emake -C ${MY_P}
--- a/app-text/pdftk/Manifest
+++ b/app-text/pdftk/Manifest
@ -1,3 +1,2 @@
-DIST pdftk-v3.3.2.tar.bz2 2169492 BLAKE2B 53cb98fe3e3d1dbe8b01a45b5b11c6fbe57017ea8029efe35677914a48ffd446c5d67621443a89f512b15d0f7e77a81c945d4c220ccaf4fd658cc1726cc32059 SHA512 b02c713b67531205e760e8d8a240a82af47dbdc28e59aa683e03772d2fb27b504b98f8be1e8dc73bfc967cc9532f3dc1eccbd105abb21db396268855233051eb
 DIST pdftk-v3.3.2.tar.gz 2343475 BLAKE2B cfa3cac4b78695d757e9cd3ba02f2a3e304343c481a44b0b6165e239d90e5ef72be3385faa1a72cd36194844f441fd1e93194e8d815807d2d0b364d0421553d2 SHA512 44056737e3b9b3cb988f46e96a0f3ec13193cfc662946f6def93add0ed56608fc026181254165440f1172e9fdda00771c3c018c20bf20ce87dad322fc1394893
 DIST pdftk-v3.3.3.tar.gz 2380289 BLAKE2B b370777f5b87706ed811e424214db23b5622ef4e2420fe00c7e5e7d03fb51314589e7a1588d911c0734c075612adab9af17a1ad4ddcaac7a5dfc407c1aa28392 SHA512 2fd8dce8787856955984d6396ccb9a57d4e7a255cd74f10b31a7d87c84fac80143c0067d76bf6d8c0ec1a55dfb7d1e90f4898706e8ae26ccdf657b38d88e6cd6
--- a/app-text/pdftk/pdftk-3.3.2-r1.ebuild
+++ b/app-text/pdftk/pdftk-3.3.2-r1.ebuild
@ -15,7 +15,7 @@ SRC_URI="https://gitlab.com/pdftk-java/pdftk/-/archive/v${PV}/pdftk-v${PV}.tar.g

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

 CP_DEPEND="
 	dev-java/bcprov:0
--- a/app-text/pdftk/pdftk-3.3.2.ebuild
+++ b/app-text/pdftk/pdftk-3.3.2.ebuild
@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="gcj-free version of pdftk written in Java"
-HOMEPAGE="https://gitlab.com/pdftk-java/pdftk"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/pdftk-java/pdftk/"
-else
-	SRC_URI="https://gitlab.com/pdftk-java/pdftk/-/archive/v${PV}/pdftk-v${PV}.tar.bz2"
-	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-	S="${WORKDIR}/pdftk-v${PV}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-JAVA_PKG_STRICT="yes"
-EANT_GENTOO_CLASSPATH="bcprov,commons-lang-3.6"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-CDEPEND="
-	dev-java/bcprov:0
-	dev-java/commons-lang:3.6"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.8:*"
-
-src_install() {
-	java-pkg_newjar "build/jar/pdftk.jar"
-	java-pkg_dolauncher ${PN} --main com.gitlab.pdftk_java.pdftk
-}
--- a/app-text/sgrep/sgrep-1.94a-r1.ebuild
+++ b/app-text/sgrep/sgrep-1.94a-r1.ebuild
@ -3,6 +3,8 @@

 EAPI=8

+inherit flag-o-matic
+
 DESCRIPTION="Use structural criteria to grep and index text, SGML, XML and HTML and filter"
 HOMEPAGE="https://www.cs.helsinki.fi/u/jjaakkol/sgrep.html"
 SRC_URI="ftp://ftp.cs.helsinki.fi/pub/Software/Local/Sgrep/${P}.tar.gz"
@ -22,6 +24,8 @@ src_prepare() {
 }

 src_configure() {
+	append-cflags -std=gnu89 # old codebase, incompatible with c2x
+
 	econf --datadir="${EPREFIX}"/etc
 }

--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
--- a/app-vim/vim-go/vim-go-1.26.ebuild
+++ b/app-vim/vim-go/vim-go-1.26.ebuild
@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/fatih/vim-go"
 SRC_URI="https://github.com/fatih/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="BSD"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 RESTRICT="test"

 RDEPEND="dev-go/gopls"
--- a/app-vim/vspec/vspec-1.9.2.ebuild
+++ b/app-vim/vspec/vspec-1.9.2.ebuild
@ -14,7 +14,7 @@ SRC_URI="https://github.com/kana/vim-${PN}/archive/refs/tags/v${PV}.tar.gz -> ${
 S="${WORKDIR}/vim-${P}"

 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"

--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
--- a/dev-ada/e3-core/e3-core-22.1.0-r1.ebuild
+++ b/dev-ada/e3-core/e3-core-22.1.0-r1.ebuild
@ -42,6 +42,11 @@ PATCHES=(

 distutils_enable_tests pytest

+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
 src_compile() {
 	local PLATFORM=x86_64-linux
 	rm src/e3/os/data/rlimit* || die
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
--- a/dev-cpp/tbb/Manifest
+++ b/dev-cpp/tbb/Manifest
@ -1,5 +1,3 @@
 DIST tbb-2020.3.tar.gz 2639788 BLAKE2B 3e92bccdc8179fc049379ccbb8ad7f615623177abc61d813b1a601020c345137bfd7d4c4600cf5b0d587e5ebef677635c3c8124d06b05fdd3325128ed8c9f84a SHA512 04c4b5501418792827190691d03d20d4dc1fd3cbbcf459a4d40c5c2281d964e658f31f133ad3907b78e17ed04f4ff16728ed89487ed0ce2cb239f23feb34bd87
-DIST tbb-2021.4.0.tar.gz 2452533 BLAKE2B a635c6efa1894c33e2f75c1aa03b6c0f4a86ebef3b58fa42bd25b53d661ed7a9d21f49f121dd3679735f219fbfc35604600bcc72ba60d3602e6de77b0d62e37b SHA512 96da2bc351fd64dfa854f8e6cabc1c4e53af3d55760e99d6f83ad53779c727af333d13d6be0828ed70371cf796498d2063e9dd0e4b2f6451623bb5d28ccbf20b
 DIST tbb-2021.5.0.tar.gz 2463218 BLAKE2B 2d50d312b86318ba4923afe68753b3781f9646cbdb33861f3458301a3a19b7ca3aab6959dca085294dfc743d7f552635f80fb524ec5d780a46f58ffe02e3280d SHA512 0e7b71022e397a6d7abb0cea106847935ae79a1e12a6976f8d038668c6eca8775ed971202c5bd518f7e517092b67af805cc5feb04b5c3a40e9fbf972cc703a46
-DIST tbb-2021.6.0.tar.gz 2566074 BLAKE2B ec5d98d2890828323cefabc75011658d508eab531c9b30030162f6ce367c54a8d70d6c6611c00d93ab3ef041ea1af35f8180768e114611847547447545f70c71 SHA512 c28bd4045e3269d0d9c24dbf360f849d26eaa15e34fa9dd3f5feae0f3440ff74ab1d05154b95549a135e7d9e97fd9a7ff4b4e468b13265e0477bb58f47e856b6
 DIST tbb-2021.7.0.tar.gz 2571727 BLAKE2B 2977ef1a33d9bc7baa40e0e57c02e62798a09c6c66cdbe369f2702d87fd9877c3d97f8d83f71384028995ea0956f5c5630d4aaf4edbe68538e7c514d3b87085c SHA512 d314e3d88b85c96607a9eda15e3d808bf361eb562a534c59101929236e90c187883e7718e5435b5e7f01f4ee652c9765af95f5f173368b83997e4666b7403a49
--- a/dev-cpp/tbb/tbb-2021.4.0.ebuild
+++ b/dev-cpp/tbb/tbb-2021.4.0.ebuild
@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib
-
-DESCRIPTION="High level abstract threading library"
-HOMEPAGE="https://www.threadingbuildingblocks.org"
-SRC_URI="https://github.com/oneapi-src/oneTBB/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/oneTBB-${PV}"
-
-LICENSE="Apache-2.0"
-# https://github.com/oneapi-src/oneTBB/blob/master/CMakeLists.txt#L53
-# libtbb<SONAME>-libtbbmalloc<SONAME>-libtbbbind<SONAME>
-SLOT="0/12-2-3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-apps/hwloc:="
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-lto.patch
-	# bug 827883
-	"${FILESDIR}"/${P}-missing-TBB_machine_fetchadd4.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DTBB_TEST=$(usex test)
-		-DTBB_ENABLE_IPO=OFF
-		-DTBB_STRICT=OFF
-	)
-
-	cmake-multilib_src_configure
-}
--- a/dev-cpp/tbb/tbb-2021.6.0.ebuild
+++ b/dev-cpp/tbb/tbb-2021.6.0.ebuild
@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib flag-o-matic
-
-DESCRIPTION="High level abstract threading library"
-HOMEPAGE="https://www.threadingbuildingblocks.org"
-SRC_URI="https://github.com/oneapi-src/oneTBB/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/oneTBB-${PV}"
-
-LICENSE="Apache-2.0"
-# https://github.com/oneapi-src/oneTBB/blob/master/CMakeLists.txt#L53
-# libtbb<SONAME>-libtbbmalloc<SONAME>-libtbbbind<SONAME>
-SLOT="0/12.5-2.5-3.5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="!kernel_Darwin? ( sys-apps/hwloc:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	# need to verify this is in master
-	"${FILESDIR}"/${PN}-2021.5.0-musl-mallinfo.patch
-	# musl again, should be in.. 2022?
-	"${FILESDIR}"/${PN}-2021.5.0-musl-setcontext.patch
-	"${FILESDIR}"/${PN}-2021.5.0-flags-stripping.patch
-)
-
-src_configure() {
-	# bug #872287
-	filter-flags -D_GLIBCXX_ASSERTIONS
-	append-cppflags -U_GLIBCXX_ASSERTIONS
-
-	local mycmakeargs=(
-		-DTBB_TEST=$(usex test)
-		-DTBB_ENABLE_IPO=OFF
-		-DTBB_STRICT=OFF
-	)
-
-	cmake-multilib_src_configure
-}
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
--- a/dev-db/sqlite/sqlite-3.39.4.ebuild
+++ b/dev-db/sqlite/sqlite-3.39.4.ebuild
@ -25,7 +25,7 @@ fi

 LICENSE="public-domain"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
 if [[ "${PV}" == "9999" ]]; then
 	PROPERTIES="live"
--- a/dev-go/Manifest.gz
+++ b/dev-go/Manifest.gz
--- a/dev-go/gopls/gopls-0.9.4.ebuild
+++ b/dev-go/gopls/gopls-0.9.4.ebuild
@ -5,7 +5,7 @@ EAPI=7
 inherit go-module

 ARCHIVE_URI="https://github.com/golang/tools/archive/refs/tags/gopls/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 DESCRIPTION="\"Go please\" is the official Go language server"
 HOMEPAGE="https://github.com/golang/tools/blob/master/gopls/README.md"
 SLOT="0"
--- a/dev-go/gox/gox-1.0.1.ebuild
+++ b/dev-go/gox/gox-1.0.1.ebuild
@ -10,7 +10,7 @@ SRC_URI="https://github.com/mitchellh/gox/archive/v${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="MPL-2.0"
 SLOT="0/${PVR}"
-KEYWORDS="amd64 ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"

 RESTRICT+=" test"

--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
--- a/dev-java/ant-eclipse-ecj/Manifest
+++ b/dev-java/ant-eclipse-ecj/Manifest
@ -1,2 +1,3 @@
 DIST ecjsrc-4.15.jar 2166228 BLAKE2B 794e0ba1a19b325e2dd8ad0b288ccbe04866627670b50d39dd327c13fe1fac56200eb3a6c1c3d1af043cad795508b9b714a5243049671414b5a62a97725d3297 SHA512 ada55b2522cf26570f0cd43f415eb5cf20e6840f83dadc72e1ae474ebf10eadca73f9fa3d1db51e13fd2762c38cd3e3567db3c7840d43ae3d8665ebe35e1889d
 DIST ecjsrc-4.22.jar 2358194 BLAKE2B e091050297b4556c38adfb01fb1e43e13644af1b3c2b30a93cfe3fdbb55050a0f7709081c7406d384d7141de67a954253aa26cdbb45f56327b16ee5ddd5e82a7 SHA512 cd52a72aecded032625ee83581ac565e1e96f8d26ecfc76e982274fd3d6238f1e7f22576855589b021e9a5ef67686b9b75e010c4e2033a8b7f6e7c9b1ff7eb4c
+DIST ecjsrc-4.25.jar 2340770 BLAKE2B e1e82356984a72e7ebbd5ace2ccbaf885c7acfdaf410b2386fa0a143f85e4431cfa2f5d254197eb56203c48505bc7dbe264664815b572c725ac5814645254776 SHA512 b475d58ef6a03e4bbf7e0f440edcbdd61e0548f68e48c7762973f60850a14fc1c234bb9a41be404ed06db14a273646f1dc5ad7effd4c7146b46f40a52850f236
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r2.ebuild
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r2.ebuild
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.25.ebuild
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.25.ebuild
@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple prefix
+
+DMF="R-${PV}-202208311800"
+
+DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler"
+HOMEPAGE="https://www.eclipse.org/"
+SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar"
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+SLOT="4.25"
+IUSE=""
+
+CDEPEND="~dev-java/eclipse-ecj-${PV}:${SLOT}
+	dev-java/ant-core:0"
+# though technically both could be set to 1.8 and it would
+# compile using jdk 11+, it would not compile using jdk 1.8
+# because eclipse ecj has min jdk 11
+RDEPEND="${CDEPEND}
+	>=virtual/jre-11:*"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-17:*"
+BDEPEND="app-arch/unzip"
+
+JAVA_GENTOO_CLASSPATH="ant-core,eclipse-ecj-${SLOT}"
+
+src_prepare() {
+	default
+
+	# Remove everything but the Ant component.
+	find org -type f ! -path "org/eclipse/jdt/internal/antadapter/*" ! -name "JDTCompilerAdapter.java" -delete || die
+
+	rm build.xml || die
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	find org -type f ! -name "*.java" | xargs jar uvf "${PN}.jar" || die "jar update failed"
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	insinto /usr/share/java-config-2/compiler
+	doins "${FILESDIR}/ecj-${SLOT}"
+	eprefixify "${ED}"/usr/share/java-config-2/compiler/ecj-${SLOT}
+}
--- a/dev-java/ant-eclipse-ecj/files/ecj-4.22
+++ b/dev-java/ant-eclipse-ecj/files/ecj-4.22
@ -1,5 +1,5 @@
 JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.22"
-PACKAGE="=dev-java/ant-eclipse-ecj-4.21*"
+PACKAGE="=dev-java/ant-eclipse-ecj-4.22*"
 SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17"
 SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17"
 ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
--- a/dev-java/ant-eclipse-ecj/files/ecj-4.25
+++ b/dev-java/ant-eclipse-ecj/files/ecj-4.25
@ -0,0 +1,7 @@
+JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.25"
+PACKAGE="=dev-java/ant-eclipse-ecj-4.25*"
+SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18"
+SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18"
+ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
+ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.25,ant-eclipse-ecj-4.25"
+GENERATION="2"
--- a/dev-java/aqute-bnd-annotation/aqute-bnd-annotation-6.3.1.ebuild
+++ b/dev-java/aqute-bnd-annotation/aqute-bnd-annotation-6.3.1.ebuild
@ -17,7 +17,7 @@ SRC_URI="https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.annotation/$

 LICENSE="Apache-2.0 EPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"

 # Common dependencies
 # POM: biz.aQute.bnd.annotation-${PV}.pom
--- a/dev-java/cdi-api/cdi-api-4.0.1-r2.ebuild
+++ b/dev-java/cdi-api/cdi-api-4.0.1-r2.ebuild
@ -18,13 +18,15 @@ SRC_URI="https://github.com/jakartaee/cdi/archive/${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+EL_API_SLOT="5.0"

 DEPEND="
-	>=dev-java/injection-api-2.0.1:0
-	>=dev-java/jakarta-annotations-api-2.1.1:0
-	>=dev-java/jakarta-el-api-5.0.1:0
-	>=dev-java/jakarta-interceptors-2.1.0:0
+	dev-java/injection-api:0
+	dev-java/jakarta-annotations-api:0
+	dev-java/jakarta-el-api:${EL_API_SLOT}
+	dev-java/jakarta-interceptors:0
 	>=virtual/jdk-11:*
 "
 RDEPEND=">=virtual/jre-11:*"
@ -58,7 +60,7 @@ src_compile() {
 	JAVA_CLASSPATH_EXTRA="
 		injection-api
 		jakarta-annotations-api
-		jakarta-el-api
+		jakarta-el-api-${EL_API_SLOT}
 		jakarta-interceptors
 	"
 	JAVA_SRC_DIR="lang-model/src/main/java"
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@ -1,2 +1,3 @@
 DIST ecjsrc-4.15.jar 2166228 BLAKE2B 794e0ba1a19b325e2dd8ad0b288ccbe04866627670b50d39dd327c13fe1fac56200eb3a6c1c3d1af043cad795508b9b714a5243049671414b5a62a97725d3297 SHA512 ada55b2522cf26570f0cd43f415eb5cf20e6840f83dadc72e1ae474ebf10eadca73f9fa3d1db51e13fd2762c38cd3e3567db3c7840d43ae3d8665ebe35e1889d
 DIST ecjsrc-4.22.jar 2358194 BLAKE2B e091050297b4556c38adfb01fb1e43e13644af1b3c2b30a93cfe3fdbb55050a0f7709081c7406d384d7141de67a954253aa26cdbb45f56327b16ee5ddd5e82a7 SHA512 cd52a72aecded032625ee83581ac565e1e96f8d26ecfc76e982274fd3d6238f1e7f22576855589b021e9a5ef67686b9b75e010c4e2033a8b7f6e7c9b1ff7eb4c
+DIST ecjsrc-4.25.jar 2340770 BLAKE2B e1e82356984a72e7ebbd5ace2ccbaf885c7acfdaf410b2386fa0a143f85e4431cfa2f5d254197eb56203c48505bc7dbe264664815b572c725ac5814645254776 SHA512 b475d58ef6a03e4bbf7e0f440edcbdd61e0548f68e48c7762973f60850a14fc1c234bb9a41be404ed06db14a273646f1dc5ad7effd4c7146b46f40a52850f236
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.25.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.25.ebuild
@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="ecj"
+DMF="R-${PV}-202208311800"
+
+DESCRIPTION="Eclipse Compiler for Java"
+HOMEPAGE="https://www.eclipse.org/"
+SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar"
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+SLOT="4.25"
+IUSE="+ant"
+
+COMMON_DEP="
+	app-eselect/eselect-java
+	dev-java/ant-core:0"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-11:*"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-17:*
+	app-arch/unzip"
+PDEPEND="
+	ant? ( ~dev-java/ant-eclipse-ecj-${PV} )"
+
+JAVA_JAR_FILENAME="${MY_PN}.jar"
+JAVA_GENTOO_CLASSPATH="ant-core"
+
+S="${WORKDIR}"
+
+# See https://bugs.eclipse.org/bugs/show_bug.cgi?id=479134 for details
+src_prepare() {
+	default
+
+	# These have their own package.
+	rm org/eclipse/jdt/core/JDTCompilerAdapter.java || die
+	rm -r org/eclipse/jdt/internal/antadapter || die
+
+	# JavaCore is not distributed in the jar
+	sed -i -e '/import org.eclipse.jdt.core.JavaCore;/d' \
+		-e 's|JavaCore.getOptions()||g' \
+		org/eclipse/jdt/internal/compiler/batch/ClasspathDirectory.java
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	find org META-INF -type f ! -name "*.java" | xargs jar uvf "${JAVA_JAR_FILENAME}" || die "jar update failed"
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dolauncher ${MY_PN}-${SLOT} --main \
+		org.eclipse.jdt.internal.compiler.batch.Main
+}
+
+pkg_postinst() {
+	einfo "To select between slots of ECJ..."
+	einfo " # eselect ecj"
+
+	eselect ecj update ecj-${SLOT}
+}
+
+pkg_postrm() {
+	eselect ecj update
+}
--- a/dev-java/injection-api/injection-api-2.0.1.ebuild
+++ b/dev-java/injection-api/injection-api-2.0.1.ebuild
@ -17,7 +17,7 @@ SRC_URI="https://github.com/eclipse-ee4j/${PN}/archive/${PV}.tar.gz -> ${P}.tar.

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"

 DEPEND=">=virtual/jdk-11:*"
 RDEPEND=">=virtual/jre-1.8:*"
--- a/dev-java/jakarta-el-api/jakarta-el-api-5.0.1-r1.ebuild
+++ b/dev-java/jakarta-el-api/jakarta-el-api-5.0.1-r1.ebuild
@ -18,8 +18,8 @@ HOMEPAGE="https://projects.eclipse.org/projects/ee4j.el"
 SRC_URI="https://github.com/jakartaee/expression-language/archive/${PV}-RELEASE-api.tar.gz -> ${P}.tar.gz"

 LICENSE="EPL-2.0 GPL-2-with-classpath-exception"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+SLOT="5.0"

 DEPEND=">=virtual/jdk-11:*"
 # <release>11</release>
--- a/dev-java/jakarta-interceptors/jakarta-interceptors-2.1.0.ebuild
+++ b/dev-java/jakarta-interceptors/jakarta-interceptors-2.1.0.ebuild
@ -17,7 +17,7 @@ SRC_URI="https://github.com/jakartaee/interceptors/archive/${PV}-RELEASE.tar.gz

 LICENSE="EPL-2.0 GPL-2-with-classpath-exception"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"

 DEPEND="
 	dev-java/jakarta-annotations-api:0
--- a/dev-java/jaxrs-api/jaxrs-api-2.1.6.ebuild
+++ b/dev-java/jaxrs-api/jaxrs-api-2.1.6.ebuild
@ -18,7 +18,7 @@ SRC_URI="https://github.com/jakartaee/rest/archive/${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="EPL-2.0 GPL-2-with-classpath-exception"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"

 # Compile dependencies
 # POM: ${PN}/pom.xml
--- a/dev-java/mockito/mockito-1.9.5-r3.ebuild
+++ b/dev-java/mockito/mockito-1.9.5-r3.ebuild
@ -27,3 +27,5 @@ DEPEND=">=virtual/jdk-1.8:*
 RDEPEND=">=virtual/jre-1.8:*
 	${CP_DEPEND}"
 BDEPEND="app-arch/unzip"
+
+JAVADOC_ARGS="-source 8"
--- a/dev-java/objenesis/Manifest
+++ b/dev-java/objenesis/Manifest
@ -1,2 +1 @@
-DIST objenesis-3.2.tar.gz 123629 BLAKE2B d875224d7a9fcf6173787edaca35f58f72d6c85ee443831be8050170ba826e8a155c7983c62ef5d01a1bb8331943dd6da5cb50eefb87cc0c7d3db540b01fcac3 SHA512 8f0bf9449191bce1823be0cbae85438edf595bde0483bb2fb4415a880b6715ae60826473bd5ee15789a7d0638932878dbdaaf7b42a6d582aa7bbf09124e97e3b
 DIST objenesis-3.3.tar.gz 125400 BLAKE2B 36cff7cb5a2dca9a81f3ca07d56995f68d9c61c9d2b7caeac5f87bb13da02b0494053927e2221c776edef0bafb862f5c97dfc0e79cf991c6c970b5b9206a5aa3 SHA512 786fe0d2d1dba0f006d5218101578d8fd23616765f5cdb4df190d138fd10dd675b9189887c27a40b63f09ed5e1dac1324b2936c7ac24a655e6f63d53b9cd7c01
--- a/dev-java/objenesis/objenesis-3.2.ebuild
+++ b/dev-java/objenesis/objenesis-3.2.ebuild
@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom objenesis-3.2/main/pom.xml --download-uri https://github.com/easymock/objenesis/archive/refs/tags/3.2.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild objenesis-3.2.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.objenesis:objenesis:3.2"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A library for instantiating Java objects"
-HOMEPAGE="http://objenesis.org/"
-SRC_URI="https://github.com/easymock/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Compile dependencies
-# POM: ${P}/main/pom.xml
-# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
-# test? org.objenesis:objenesis-test:3.2 -> >=dev-java/objenesis-test-3.2:0
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	test? (
-		>=dev-java/objenesis-test-3.2:0
-	)
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-"
-
-S="${WORKDIR}"
-
-JAVA_SRC_DIR="${P}/main/src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,objenesis-test"
-JAVA_TEST_SRC_DIR="${P}/main/src/test/java"
--- a/dev-java/osgi-cmpn/osgi-cmpn-8.0.0.ebuild
+++ b/dev-java/osgi-cmpn/osgi-cmpn-8.0.0.ebuild
@ -14,7 +14,7 @@ SRC_URI="https://docs.osgi.org/download/r$(ver_cut 1)/${PN/-/.}-${PV}.jar -> ${P

 LICENSE="Apache-2.0 OSGi-Specification-2.0"
 SLOT="8"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"

 CP_DEPEND="
 	dev-java/cdi-api:0
--- a/dev-java/tomcat-el-api/Manifest
+++ b/dev-java/tomcat-el-api/Manifest
@ -0,0 +1,5 @@
+DIST apache-tomcat-10.0.27-src.tar.gz 6154411 BLAKE2B 87a66acacf5443189620af3c8f306e1ae7d8572f9d6ba657379f8a9691c01530e2f1cb17bb1daef5504459480395f4eabdbb626b6da3a879c5a11910029e002b SHA512 ab7c2ae4134ec9652dc0d19343be7d3bf298b1c7a367b51bcceb88f1aaf70ecb45b3a7b9682e2deac70a1e9b00aca974b77110d3363bc5d1c88dc3ae95015e15
+DIST apache-tomcat-10.1.0-src.tar.gz 6060833 BLAKE2B 49f36131c1e809b298ac915e671b9f4df55b55c2ba34d21ee3fdeb8759ddaf53a6780b177e8049446079d91186c52669969f30762ddf776d9f8615e527d5a975 SHA512 08323eec0403473fa97f419d7911980c3dfe7b1607a64741bbe972a737dfa70ea04ea80ca9ab28bf72bdde9d24cf8f7161eeb8b194204c777d1628d00c78611c
+DIST apache-tomcat-10.1.1-src.tar.gz 6061845 BLAKE2B c0069d47dd51b35ed6817576a4d4c888c478708c9788d625e1344579076fb448434b8f5a350bbb63b284cd145275da5a0badd839b4e83fcd32de7710efa3066f SHA512 417415001ff5d20c5c9fbc70c90df492f04d4b86c594da190202c439fd9e75d4cd4a51c5dcc57e525026363a8cbb89826219509ee41a4f05f8ef58a469bfe14c
+DIST apache-tomcat-8.5.83-src.tar.gz 6025934 BLAKE2B 29df8c53819d90abf1b1bda3f5c3e6013c354ee847760849d83a5e7ec4a39688f25cc5f8226fe37c235e717761de123e4e480ae834e8f9f37a5c6b5819b9823d SHA512 26dcb71025ab714a4fc78379aeb026e88d1de1b5c268a4a3f753a122127aa738a9b40b2d743799db70c0364d8eb786f0fe3ec9733e8ccf1f22f88ea34d68318f
+DIST apache-tomcat-9.0.68-src.tar.gz 6212265 BLAKE2B 21a7772c0473c016486b4b90c005b65613e79739cf68eaa0c0a0e83c30016f49921816893f8babe42b462538c47bc776630812526c330e7c6360f02a719574cd SHA512 63bb2c42f683c4c5e362b19bda046de172382714e80298106c61cc728feea9681b568450f04cb95d6cae08e5a71933c7755b9b81b706c46d63f4683c2a3a96be
--- a/dev-java/tomcat-el-api/metadata.xml
+++ b/dev-java/tomcat-el-api/metadata.xml
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
--- a/dev-java/tomcat-el-api/tomcat-el-api-10.0.27.ebuild
+++ b/dev-java/tomcat-el-api/tomcat-el-api-10.0.27.ebuild
@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.tomcat:tomcat-el-api:10.0.27"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Tomcat's EL API 5.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="4.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+
+DEPEND=">=virtual/jdk-11:*"
+RDEPEND=">=virtual/jre-11:*"
+
+S="${WORKDIR}/apache-tomcat-${PV}-src"
+
+JAVA_RESOURCE_DIRS="resources"
+JAVA_SRC_DIR="java/jakarta/el"
+
+src_prepare() {
+	default
+	# remove anything related to "el" or "jsp"
+	find java/jakarta \( -name 'jsp' -o -name 'servlet' \) \
+		-exec rm -rf {} + || die "removing jsp failed"
+
+	mkdir resources || "creating \"resources\" failed"
+	cp -r java/jakarta resources || "cannot copy to \"resources\" dir"
+	find resources -name '*.java' -exec rm -rf {} + || die "removing *.java files failed"
+}
--- a/dev-java/tomcat-el-api/tomcat-el-api-10.1.0.ebuild
+++ b/dev-java/tomcat-el-api/tomcat-el-api-10.1.0.ebuild
@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.tomcat:tomcat-el-api:10.1.0"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Tomcat's EL API 5.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="5.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+
+DEPEND=">=virtual/jdk-11:*"
+RDEPEND=">=virtual/jre-11:*"
+
+S="${WORKDIR}/apache-tomcat-${PV}-src"
+
+JAVA_RESOURCE_DIRS="resources"
+JAVA_SRC_DIR="java/jakarta/el"
+
+src_prepare() {
+	default
+	# remove anything related to "el" or "jsp"
+	find java/jakarta \( -name 'jsp' -o -name 'servlet' \) \
+		-exec rm -rf {} + || die "removing jsp failed"
+
+	mkdir resources || "creating \"resources\" failed"
+	cp -r java/jakarta resources || "cannot copy to \"resources\" dir"
+	find resources -name '*.java' -exec rm -rf {} + || die "removing *.java files failed"
+}
--- a/dev-java/tomcat-el-api/tomcat-el-api-10.1.1.ebuild
+++ b/dev-java/tomcat-el-api/tomcat-el-api-10.1.1.ebuild
@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.tomcat:tomcat-el-api:10.1.1"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Tomcat's EL API 5.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="5.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+
+DEPEND=">=virtual/jdk-11:*"
+RDEPEND=">=virtual/jre-11:*"
+
+S="${WORKDIR}/apache-tomcat-${PV}-src"
+
+JAVA_RESOURCE_DIRS="resources"
+JAVA_SRC_DIR="java/jakarta/el"
+
+src_prepare() {
+	default
+	# remove anything related to "el" or "jsp"
+	find java/jakarta \( -name 'jsp' -o -name 'servlet' \) \
+		-exec rm -rf {} + || die "removing jsp failed"
+
+	mkdir resources || "creating \"resources\" failed"
+	cp -r java/jakarta resources || "cannot copy to \"resources\" dir"
+	find resources -name '*.java' -exec rm -rf {} + || die "removing *.java files failed"
+}
--- a/dev-java/tomcat-el-api/tomcat-el-api-8.5.83.ebuild
+++ b/dev-java/tomcat-el-api/tomcat-el-api-8.5.83.ebuild
@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.tomcat:tomcat-el-api:8.5.83"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Tomcat's EL API 5.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+
+DEPEND=">=virtual/jdk-11:*"
+RDEPEND=">=virtual/jre-11:*"
+
+S="${WORKDIR}/apache-tomcat-${PV}-src"
+
+JAVA_RESOURCE_DIRS="resources"
+JAVA_SRC_DIR="java/javax/el"
+
+src_prepare() {
+	default
+	# remove anything related to "el" or "jsp"
+	find java/javax \( -name 'jsp' -o -name 'servlet' \) \
+		-exec rm -rf {} + || die "removing jsp failed"
+
+	mkdir resources || "creating \"resources\" failed"
+	cp -r java/javax resources || "cannot copy to \"resources\" dir"
+	find resources -name '*.java' -exec rm -rf {} + || die "removing *.java files failed"
+}
--- a/dev-java/tomcat-el-api/tomcat-el-api-9.0.68.ebuild
+++ b/dev-java/tomcat-el-api/tomcat-el-api-9.0.68.ebuild
@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.tomcat:tomcat-el-api:9.0.68"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Tomcat's EL API 5.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+
+DEPEND=">=virtual/jdk-11:*"
+RDEPEND=">=virtual/jre-11:*"
+
+S="${WORKDIR}/apache-tomcat-${PV}-src"
+
+JAVA_RESOURCE_DIRS="resources"
+JAVA_SRC_DIR="java/javax/el"
+
+src_prepare() {
+	default
+	# remove anything related to "el" or "jsp"
+	find java/javax \( -name 'jsp' -o -name 'servlet' \) \
+		-exec rm -rf {} + || die "removing jsp failed"
+
+	mkdir resources || "creating \"resources\" failed"
+	cp -r java/javax resources || "cannot copy to \"resources\" dir"
+	find resources -name '*.java' -exec rm -rf {} + || die "removing *.java files failed"
+}
--- a/dev-java/tomcat-jsp-api/Manifest
+++ b/dev-java/tomcat-jsp-api/Manifest
@ -0,0 +1,5 @@
+DIST apache-tomcat-10.0.27-src.tar.gz 6154411 BLAKE2B 87a66acacf5443189620af3c8f306e1ae7d8572f9d6ba657379f8a9691c01530e2f1cb17bb1daef5504459480395f4eabdbb626b6da3a879c5a11910029e002b SHA512 ab7c2ae4134ec9652dc0d19343be7d3bf298b1c7a367b51bcceb88f1aaf70ecb45b3a7b9682e2deac70a1e9b00aca974b77110d3363bc5d1c88dc3ae95015e15
+DIST apache-tomcat-10.1.0-src.tar.gz 6060833 BLAKE2B 49f36131c1e809b298ac915e671b9f4df55b55c2ba34d21ee3fdeb8759ddaf53a6780b177e8049446079d91186c52669969f30762ddf776d9f8615e527d5a975 SHA512 08323eec0403473fa97f419d7911980c3dfe7b1607a64741bbe972a737dfa70ea04ea80ca9ab28bf72bdde9d24cf8f7161eeb8b194204c777d1628d00c78611c
+DIST apache-tomcat-10.1.1-src.tar.gz 6061845 BLAKE2B c0069d47dd51b35ed6817576a4d4c888c478708c9788d625e1344579076fb448434b8f5a350bbb63b284cd145275da5a0badd839b4e83fcd32de7710efa3066f SHA512 417415001ff5d20c5c9fbc70c90df492f04d4b86c594da190202c439fd9e75d4cd4a51c5dcc57e525026363a8cbb89826219509ee41a4f05f8ef58a469bfe14c
+DIST apache-tomcat-8.5.83-src.tar.gz 6025934 BLAKE2B 29df8c53819d90abf1b1bda3f5c3e6013c354ee847760849d83a5e7ec4a39688f25cc5f8226fe37c235e717761de123e4e480ae834e8f9f37a5c6b5819b9823d SHA512 26dcb71025ab714a4fc78379aeb026e88d1de1b5c268a4a3f753a122127aa738a9b40b2d743799db70c0364d8eb786f0fe3ec9733e8ccf1f22f88ea34d68318f
+DIST apache-tomcat-9.0.68-src.tar.gz 6212265 BLAKE2B 21a7772c0473c016486b4b90c005b65613e79739cf68eaa0c0a0e83c30016f49921816893f8babe42b462538c47bc776630812526c330e7c6360f02a719574cd SHA512 63bb2c42f683c4c5e362b19bda046de172382714e80298106c61cc728feea9681b568450f04cb95d6cae08e5a71933c7755b9b81b706c46d63f4683c2a3a96be
--- a/dev-java/tomcat-jsp-api/metadata.xml
+++ b/dev-java/tomcat-jsp-api/metadata.xml
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
--- a/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.0.27.ebuild
+++ b/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.0.27.ebuild
@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.tomcat:tomcat-jsp-api:10.0.27"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Tomcat's JSP API 3.1 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+
+CP_DEPEND="
+	~dev-java/tomcat-el-api-${PV}:4.0
+	~dev-java/tomcat-servlet-api-${PV}:5.0
+"
+
+DEPEND="
+	>=virtual/jdk-11:*
+	${CP_DEPEND}"
+
+RDEPEND="
+	>=virtual/jre-11:*
+	${CP_DEPEND}"
+
+S="${WORKDIR}/apache-tomcat-${PV}-src"
+
+JAVA_RESOURCE_DIRS="resources"
+JAVA_SRC_DIR="java/jakarta/servlet/jsp"
+
+src_prepare() {
+	default
+	mkdir -p resources/jakarta/servlet || "creating \"resources\" failed"
+	cp -r {java,resources}/jakarta/servlet/jsp || "cannot copy to \"resources\" dir"
+	find resources \( -name '*.java' -o -name 'tagext' \) \
+		-exec rm -rf {} + || die "removing *.java files failed"
+}
--- a/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.0.ebuild
+++ b/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.0.ebuild
@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.tomcat:tomcat-jsp-api:10.1.0"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Tomcat's JSP API 3.1 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+
+CP_DEPEND="
+	~dev-java/tomcat-el-api-${PV}:5.0
+	~dev-java/tomcat-servlet-api-${PV}:6.0
+"
+
+DEPEND="
+	>=virtual/jdk-11:*
+	${CP_DEPEND}"
+
+RDEPEND="
+	>=virtual/jre-11:*
+	${CP_DEPEND}"
+
+S="${WORKDIR}/apache-tomcat-${PV}-src"
+
+JAVA_RESOURCE_DIRS="resources"
+JAVA_SRC_DIR="java/jakarta/servlet/jsp"
+
+src_prepare() {
+	default
+	mkdir -p resources/jakarta/servlet || "creating \"resources\" failed"
+	cp -r {java,resources}/jakarta/servlet/jsp || "cannot copy to \"resources\" dir"
+	find resources \( -name '*.java' -o -name 'tagext' \) \
+		-exec rm -rf {} + || die "removing *.java files failed"
+}
--- a/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.1.ebuild
+++ b/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.1.ebuild
@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.tomcat:tomcat-jsp-api:10.1.1"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Tomcat's JSP API 3.1 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+
+CP_DEPEND="
+	~dev-java/tomcat-el-api-${PV}:5.0
+	~dev-java/tomcat-servlet-api-${PV}:6.0
+"
+
+DEPEND="
+	>=virtual/jdk-11:*
+	${CP_DEPEND}"
+
+RDEPEND="
+	>=virtual/jre-11:*
+	${CP_DEPEND}"
+
+S="${WORKDIR}/apache-tomcat-${PV}-src"
+
+JAVA_RESOURCE_DIRS="resources"
+JAVA_SRC_DIR="java/jakarta/servlet/jsp"
+
+src_prepare() {
+	default
+	mkdir -p resources/jakarta/servlet || "creating \"resources\" failed"
+	cp -r {java,resources}/jakarta/servlet/jsp || "cannot copy to \"resources\" dir"
+	find resources \( -name '*.java' -o -name 'tagext' \) \
+		-exec rm -rf {} + || die "removing *.java files failed"
+}
--- a/dev-java/tomcat-jsp-api/tomcat-jsp-api-8.5.83.ebuild
+++ b/dev-java/tomcat-jsp-api/tomcat-jsp-api-8.5.83.ebuild
@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.tomcat:tomcat-jsp-api:8.5.83"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Tomcat's JSP API 3.1 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2.3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+
+CP_DEPEND="
+	~dev-java/tomcat-el-api-${PV}:3.0
+	~dev-java/tomcat-servlet-api-${PV}:3.1
+"
+
+DEPEND="
+	>=virtual/jdk-11:*
+	${CP_DEPEND}"
+
+RDEPEND="
+	>=virtual/jre-11:*
+	${CP_DEPEND}"
+
+S="${WORKDIR}/apache-tomcat-${PV}-src"
+
+JAVA_RESOURCE_DIRS="resources"
+JAVA_SRC_DIR="java/javax/servlet/jsp"
+
+src_prepare() {
+	default
+	mkdir -p resources/javax/servlet || "creating \"resources\" failed"
+	cp -r {java,resources}/javax/servlet/jsp || "cannot copy to \"resources\" dir"
+	find resources \( -name '*.java' -o -name 'tagext' \) \
+		-exec rm -rf {} + || die "removing *.java files failed"
+}
--- a/dev-java/tomcat-jsp-api/tomcat-jsp-api-9.0.68.ebuild
+++ b/dev-java/tomcat-jsp-api/tomcat-jsp-api-9.0.68.ebuild
@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.tomcat:tomcat-jsp-api:9.0.68"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Tomcat's JSP API 3.1 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2.3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+
+CP_DEPEND="
+	~dev-java/tomcat-el-api-${PV}:3.0
+	~dev-java/tomcat-servlet-api-${PV}:4.0
+"
+
+DEPEND="
+	>=virtual/jdk-11:*
+	${CP_DEPEND}"
+
+RDEPEND="
+	>=virtual/jre-11:*
+	${CP_DEPEND}"
+
+S="${WORKDIR}/apache-tomcat-${PV}-src"
+
+JAVA_RESOURCE_DIRS="resources"
+JAVA_SRC_DIR="java/javax/servlet/jsp"
+
+src_prepare() {
+	default
+	mkdir -p resources/javax/servlet || "creating \"resources\" failed"
+	cp -r {java,resources}/javax/servlet/jsp || "cannot copy to \"resources\" dir"
+	find resources \( -name '*.java' -o -name 'tagext' \) \
+		-exec rm -rf {} + || die "removing *.java files failed"
+}
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@ -1,10 +1,14 @@
 DIST apache-tomcat-10.0.23-src.tar.gz 6136614 BLAKE2B 4eaf963187b9a754ed459d7f85e6f7d329927b949bb4a390a602cdc6651aa037aeec559c511ddb9880b6ec4d7cd97b96d82da341509370e412e1b21b799d8c2e SHA512 19ec026bae75318e9ffbe2e619ad2e12ec116382ea88a1064696275afb3fd13e6f08efe497dde79689bfc828f76e27d114ad3a9284b79c8d956a6a85bdac6360
 DIST apache-tomcat-10.0.26-src.tar.gz 6153701 BLAKE2B fb16f83cf71dc97f21739c3714d2d3d201aa6b6b4242c351fabfc04ee767e59b6e376c7c8984dcda12d6942835221c55d4451b2d0a1245a2dbb73636c93da47c SHA512 f66387a3ca67b6b3df8504c4ae089e8f30e389811a8d0b7d2241e115b8cf712a38f3d0fea938cef7fa9745f412aa70ad47840e40e2385fbd1435b636e93b45b4
+DIST apache-tomcat-10.0.27-src.tar.gz 6154411 BLAKE2B 87a66acacf5443189620af3c8f306e1ae7d8572f9d6ba657379f8a9691c01530e2f1cb17bb1daef5504459480395f4eabdbb626b6da3a879c5a11910029e002b SHA512 ab7c2ae4134ec9652dc0d19343be7d3bf298b1c7a367b51bcceb88f1aaf70ecb45b3a7b9682e2deac70a1e9b00aca974b77110d3363bc5d1c88dc3ae95015e15
 DIST apache-tomcat-10.1.0-src.tar.gz 6060833 BLAKE2B 49f36131c1e809b298ac915e671b9f4df55b55c2ba34d21ee3fdeb8759ddaf53a6780b177e8049446079d91186c52669969f30762ddf776d9f8615e527d5a975 SHA512 08323eec0403473fa97f419d7911980c3dfe7b1607a64741bbe972a737dfa70ea04ea80ca9ab28bf72bdde9d24cf8f7161eeb8b194204c777d1628d00c78611c
+DIST apache-tomcat-10.1.1-src.tar.gz 6061845 BLAKE2B c0069d47dd51b35ed6817576a4d4c888c478708c9788d625e1344579076fb448434b8f5a350bbb63b284cd145275da5a0badd839b4e83fcd32de7710efa3066f SHA512 417415001ff5d20c5c9fbc70c90df492f04d4b86c594da190202c439fd9e75d4cd4a51c5dcc57e525026363a8cbb89826219509ee41a4f05f8ef58a469bfe14c
 DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc3871beeddccdb4cfed05ba176581ebb50f52ba867bed8dbc500e97b7348a3a87b9693fb73eb81209df4f31e8c1ced7e30a6af30b SHA512 c455fa3da9da8fcbf1d54ae5dce808f8a4520ccafd627a6b2d1b003c37e8395d8b2a55d5471bf6c196549d082715862b3b8958aef88613293a07fc0160aa5c6e
 DIST apache-tomcat-5.5.36-src.tar.gz 3743113 BLAKE2B dbfcfd123a23b0ceb9f1fdd936e42324ea8b10cf327a1d0abf1703006535859c7122690a08b5ec27b86b526cc7709a7199b4f35f123538ff11f23f3b489358f3 SHA512 845636b5b992fbbb7d657d192afbab1e6a924bfd0c71b025cf22776eb4527d92d63f9b3f33475d4349a0df4cebd984ba3776eedd7482b820abdea909e90a97b7
 DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c
 DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce
 DIST apache-tomcat-8.5.82-src.tar.gz 6011553 BLAKE2B ea34c0485877ace8c84144f0e75f370c0ac461b5b725d97a07e27014b7a14b1ab88fad4230d4fae60190d7bff3836f691615b57b9f085797477acc69560a57ce SHA512 3e0a0a808fb78493930ce8832731eba4ab3cc440387c3b5226ff6e4ac2faf5fd70eff1560d840d34f14a8acfd7e60fc8b7f638f3dbe0c0ed4569dc4271a9c3f2
+DIST apache-tomcat-8.5.83-src.tar.gz 6025934 BLAKE2B 29df8c53819d90abf1b1bda3f5c3e6013c354ee847760849d83a5e7ec4a39688f25cc5f8226fe37c235e717761de123e4e480ae834e8f9f37a5c6b5819b9823d SHA512 26dcb71025ab714a4fc78379aeb026e88d1de1b5c268a4a3f753a122127aa738a9b40b2d743799db70c0364d8eb786f0fe3ec9733e8ccf1f22f88ea34d68318f
 DIST apache-tomcat-9.0.65-src.tar.gz 6195265 BLAKE2B 13ca956b58e9f1831700f67d1fa8883f6471ab6b700b2af169bf284552658a4e9ad4130451b36976af4dd366cc987e228e0b0f98e688cccf577c626dfc78aae7 SHA512 3ff344370cc36f5bed389ed198054783a4f5bc86476a751cda280618457a06bae38c1e764b0c110c2f68efe2d34243a4e24596e8b90e8fbd171bf584a22fd3bc
 DIST apache-tomcat-9.0.67-src.tar.gz 6211392 BLAKE2B 273b921ce580be6fb76d8567e5b0aec01b936518875f8470c1cee4b159519f723e606680d9986f61fbbab79cea2d027195f3debe9af59dfac786b0d0566d7c02 SHA512 33319d70c50fde71d163f66dc388ed2d5855aa4f087f7e2259adc27cc7ed30ace079d81e52def43a904c88ac670bb0c71667938b931a214470d77679108914cc
+DIST apache-tomcat-9.0.68-src.tar.gz 6212265 BLAKE2B 21a7772c0473c016486b4b90c005b65613e79739cf68eaa0c0a0e83c30016f49921816893f8babe42b462538c47bc776630812526c330e7c6360f02a719574cd SHA512 63bb2c42f683c4c5e362b19bda046de172382714e80298106c61cc728feea9681b568450f04cb95d6cae08e5a71933c7755b9b81b706c46d63f4683c2a3a96be
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.27.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.27.ebuild
@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.tomcat:tomcat-servlet-api:10.0.27"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Tomcat's Servlet API 6.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="5.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+
+CP_DEPEND="~dev-java/tomcat-el-api-${PV}:4.0"
+
+DEPEND="
+	>=virtual/jdk-11:*
+	${CP_DEPEND}"
+
+RDEPEND="
+	>=virtual/jre-11:*
+	${CP_DEPEND}"
+
+S="${WORKDIR}/apache-tomcat-${PV}-src"
+
+JAVA_RESOURCE_DIRS="resources"
+JAVA_SRC_DIR="java/jakarta/servlet"
+
+src_prepare() {
+	default
+	# remove anything related to "el" or "jsp"
+	find java/jakarta \( -name 'el' -o -name 'jsp' \) \
+		-exec rm -rf {} + || die "removing jsp failed"
+
+	mkdir resources || "creating \"resources\" failed"
+	cp -r java/jakarta resources || "cannot copy to \"resources\" dir"
+	find resources -name '*.java' -exec rm -rf {} + || die "removing *.java files failed"
+}
--- a/Show More
+++ b/Show More