Sync with portage [Fri Aug 12 19:56:17 MSK 2022].

2 years ago · d0b21dc6f5
parent f086433c4f
commit d0b21dc6f5
803 changed files with 8395 additions and 5346 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
--- a/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.1.ebuild
+++ b/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.1.ebuild
@ -32,6 +32,7 @@ DEPEND="python? ( ${PYTHON_DEPS} )
 RDEPEND="${DEPEND}
 	python? ( dev-python/pyxdg[${PYTHON_USEDEP}] )"
 BDEPEND="
 	sys-apps/help2man
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig"
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@ -3,3 +3,4 @@ DIST aws-cli-1.25.41.gh.tar.gz 2238897 BLAKE2B b0e4d1b96048971f41a0fce9c91491547
 DIST aws-cli-1.25.46.gh.tar.gz 2240196 BLAKE2B fde009f43c4a9c900b0ce66ad540252b87bd023e0070efd5403beae61fe72f4e5d42e0c0402eb36f0b45a08f8769f49ffeec404dbf9d4d58cb8ae2be72caf81e SHA512 387c428e1643c21b7598962b18d19929bc26747ed80a041bda31d2bb6239239f2693c272ba320616320be3ff1a536e6af859a289f4fb0813e0c9b89978da56f8
 DIST aws-cli-1.25.47.gh.tar.gz 2241028 BLAKE2B 6aea17029d28bf0875f58472ab27e244e2ace10d1d4d56e156c5fe97462d9ec2e10869609bbd19134edcdd3deba19235a39d409ce11617cf914d856cb325ef59 SHA512 1e76aa939f3098a19bb64cd79fd265d70bf3d96a0b92411c5d72d8e9b0635d0cfde70c6b4d3effce5ac8c82b0ddd84b761b2ce0b131ac1ed2fba9e0222057764
 DIST aws-cli-1.25.49.gh.tar.gz 2241270 BLAKE2B 6c5e3c20855df9da322f3e6085f4f6f5894f4bdb19b7a47011bd111fb5934ecbe921397e45e5539d4734520dfad144906337f488bfc4b2aaf479fe9a74a689aa SHA512 f8dbd6d0ce2e919e20e2c251d289be2720c46e9ca25595e249eb1934d6a0494347c8d13131c9839a7177f0aa89cf4a5ee0ed1a938c53febd70424349c8fcc661
 DIST aws-cli-1.25.50.gh.tar.gz 2241527 BLAKE2B 76a594e977bedaeb89bef7b3d61cbd08a157560b3610756719a04a8195b04c5e7480b94a5a6c69494cfe9fd7388550a6b26778e2ab0e1eeeec6e6eb91bfd36e0 SHA512 d112207b0fb654693503baa09ccaf3df3cf8766408a9c4a8533005e8be3cd724d28f197466af1580758ed689ebd3ad0afd895a5c4cfc06c3da15eadda0ca495e
--- a/app-admin/awscli/awscli-1.25.50.ebuild
+++ b/app-admin/awscli/awscli-1.25.50.ebuild
@ -0,0 +1,72 @@
 # 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 ~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() {
 	# 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/mcelog/Manifest
+++ b/app-admin/mcelog/Manifest
@ -1,3 +1,2 @@
 DIST mcelog-182.tar.gz 314857 BLAKE2B fc0716a468ce3eb4fd08806913c7e5e7481f0181f1217bf6e7bc6d675651dd04adac3cd0927428a6f88b15ddd919fbb1c26a4cfd977c3d902906fc09170bb1b3 SHA512 546fd30d16b00efb79e0df49c4c2d7cff08280762f04c4f67c3ceed500dcd19ba63a6eeb55f6ee444f9bbae04431745eb8aa3ded609c10e6be69cf5dd7722443
 DIST mcelog-184.tar.gz 314339 BLAKE2B 2eaceb5acd8bca9afb458541ad49bb8cd11e9bc55962a8506cfc3b5beb8d469a7ef0bd0ba44e5b845d17c18b05d897838372dd32e9dda181ea24c00eaba80c70 SHA512 b5ec84632a4c103e3e198956e219a32f4687251b3c6fa1fbc14a55bb26c4371fc993b423e715d4fb691b9d6e6c686dc6602c351ad45a8f09363166b16832e3ad
 DIST mcelog-187.tar.gz 314380 BLAKE2B bc9ea27af67c9dfe5efc9b47d392d25b87e6da781b04bfa9553119f78a524200222c95236f30281414434b97e0d99d2d4cd231275d86d51fe718571bf102e3ff SHA512 dc9c7279e115ca9f2611b80662b015044ecfe43602b17681ef6f3211902bfbc3fc58a7490f65ec46448ec9a1c0a80f018b45ae53d56c96789e41ae5186d0b0e3
--- a/app-admin/mcelog/mcelog-184.ebuild
+++ b/app-admin/mcelog/mcelog-184.ebuild
@ -1,51 +0,0 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
 PYTHON_COMPAT=( python3_{9..11} )
 inherit linux-info python-any-r1 systemd toolchain-funcs
 DESCRIPTION="A tool to log and decode Machine Check Exceptions"
 HOMEPAGE="http://mcelog.org/"
 SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="selinux"
 RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
 DEPEND="${PYTHON_DEPS}"
 # TODO: add mce-inject to the tree to support test phase
 RESTRICT="test"
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != buildonly ]]; then
 		local CONFIG_CHECK="~X86_MCE"
 		kernel_is -ge 4 12 && CONFIG_CHECK+=" ~X86_MCELOG_LEGACY"
 		check_extra_config
 	fi
 }
 src_prepare() {
 	eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
 		"${FILESDIR}"/${PN}-129-debugflags.patch
 	eapply_user
 	tc-export CC
 	python_fix_shebang genconfig.py
 }
 src_install() {
 	default
 	insinto /etc/logrotate.d/
 	newins ${PN}.logrotate ${PN}
 	newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
 	systemd_dounit ${PN}.service
 	dodoc *.pdf
 }
--- a/app-admin/salt/salt-3004.2-r1.ebuild
+++ b/app-admin/salt/salt-3004.2-r1.ebuild
@ -17,7 +17,7 @@ if [[ ${PV} == 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 fi
 LICENSE="Apache-2.0"
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
--- a/app-backup/dar/dar-2.7.6.ebuild
+++ b/app-backup/dar/dar-2.7.6.ebuild
@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/dar/${P}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86 ~amd64-linux"
+KEYWORDS="amd64 ppc sparc x86 ~amd64-linux"
 IUSE="argon2 curl dar32 dar64 doc gcrypt gpg lz4 lzo nls rsync threads xattr"
 REQUIRED_USE="?? ( dar32 dar64 )
--- a/app-backup/snapper/Manifest
+++ b/app-backup/snapper/Manifest
@ -1,3 +1 @@
 DIST snapper-0.10.1.tar.gz 407628 BLAKE2B 84b4c027762a11cbf5f49af3e94bc0e494e83e61aa35c3873d0ab98b0c232897b6d002ef28181ad3b2567cc88b84424f570e7b24278c546fb39452e399ad7333 SHA512 39f4d95e98b736510b6bea56eebc8275618a0ad3221d7fae9cd0f46f8a4af574700a6123a438918d522d65758ad50020f80c925395ae3ab84b7ad3eb924592c0
 DIST snapper-0.10.2.tar.gz 407857 BLAKE2B f59ee95612a66397f9cb1bec4a3a20fec41f12324d1a778d5bbdac2bd3359b6719d16fba5c50b3753e416681e83780180fe8965757b810165bebef8c4bed6634 SHA512 bdda67908b054beee7285bb3ac97ce28276449d7719369135a7ffa74bce40000ebc89f4f059abe44f8cc7c3a09c46af446e812229290ddd10b2af053fefbc568
 DIST snapper-0.9.1.tar.gz 400387 BLAKE2B fe9d25f573dc99e0eb6c876fa2ebb34140ea8177c72a65af65bd4b6621b81bcab71ee03948696d311444cad4c69d21db70161f67ef3917aea93e39ad54b10444 SHA512 447a024570bbb834adfc789aa5b12b037838fcf50f8d26f87a9a10b250541a589be3b24b01f990625021b8ff5b2eade0f2eda5e992f76113c62bd5e8a27c1293
--- a/app-backup/snapper/files/snapper-0.9.1-testsuite.patch
+++ b/app-backup/snapper/files/snapper-0.9.1-testsuite.patch
@ -1,84 +0,0 @@
 diff --git a/configure.ac b/configure.ac
 index 3f5c911..a8c9c95 100644
 --- a/configure.ac
 +++ b/configure.ac
@@ -84,6 +84,13 @@ CPPFLAGS="${CPPFLAGS} -DCONF_DIR='\"${SYSCONFIG}\"'"
 PAM_SECURITY=${libdir}/security
 +AC_ARG_ENABLE([tests], AC_HELP_STRING([--disable-tests],[Disable internal tests support]),
 +		[with_tests=$enableval],[with_tests=yes])
 +AM_CONDITIONAL(ENABLE_TESTS, [test "x$with_tests" = "xyes"])
 +if test "x$with_tests" = "xyes"; then
 +	AC_DEFINE(ENABLE_TESTS, 1, [Enable internal tests support])
 +fi
 +
 AC_ARG_WITH([pam-security], AC_HELP_STRING([--pam-security], [Use a custom pam security directory (default is $libdir/security)]),
 	[with_pam_security=$withval], [with_pam_security=no])
 AS_IF([test "x$with_pam_security" != xno], [PAM_SECURITY="${with_pam_security}"])
 diff --git a/testsuite-cmp/Makefile.am b/testsuite-cmp/Makefile.am
 index 81104bf..9c29477 100644
 --- a/testsuite-cmp/Makefile.am
 +++ b/testsuite-cmp/Makefile.am
@@ -2,6 +2,7 @@
 # Makefile.am for snapper/testsuite-cmp
 #
 +if ENABLE_TESTS
 AM_CPPFLAGS = -I$(top_srcdir)
 AM_LDFLAGS = -lboost_system
@@ -15,3 +16,4 @@ cmp_SOURCES = cmp.cc
 EXTRA_DIST = $(noinst_SCRIPTS)
 +endif
 diff --git a/testsuite-real/Makefile.am b/testsuite-real/Makefile.am
 index 717313a..527843d 100644
 --- a/testsuite-real/Makefile.am
 +++ b/testsuite-real/Makefile.am
@@ -2,6 +2,7 @@
 # Makefile.am for snapper/testsuite-real
 #
 +if ENABLE_TESTS
 CXXFLAGS += -std=gnu++0x
 AM_CPPFLAGS = -I$(top_srcdir)
@@ -53,3 +54,4 @@ ug_tests_SOURCES = ug-tests.cc
 EXTRA_DIST = $(test_DATA) $(test_SCRIPTS)
 +endif
 diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
 index ccb84d3..409e265 100644
 --- a/testsuite/Makefile.am
 +++ b/testsuite/Makefile.am
@@ -2,6 +2,7 @@
 # Makefile.am for snapper/testsuite
 #
 +if ENABLE_TESTS
 AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS)
 LDADD = ../snapper/libsnapper.la ../dbus/libdbus.la -lboost_unit_test_framework
@@ -48,3 +49,4 @@ lvm_utils_test_LDADD = -lboost_unit_test_framework ../snapper/libsnapper.la
 range_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
 limit_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
 +endif
 diff --git a/zypp-plugin/testsuite/Makefile.am b/zypp-plugin/testsuite/Makefile.am
 index 7b52e13..71cb545 100644
 --- a/zypp-plugin/testsuite/Makefile.am
 +++ b/zypp-plugin/testsuite/Makefile.am
@@ -1,3 +1,5 @@
 +
 +if ENABLE_TESTS
 if HAVE_ZYPP
 TEST_LOG_DRIVER = $(SHELL) tap-driver.sh
@@ -12,3 +14,4 @@ TESTS = $(check_SCRIPTS)
 EXTRA_DIST = $(check_SCRIPTS) $(noinst_SCRIPTS) $(noinst_DATA) tap-driver.sh
 endif
 +endif
--- a/app-backup/snapper/snapper-0.10.1.ebuild
+++ b/app-backup/snapper/snapper-0.10.1.ebuild
@ -1,88 +0,0 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
 inherit autotools systemd
 DESCRIPTION="Command-line program for btrfs and lvm snapshot management"
 HOMEPAGE="http://snapper.io/"
 SRC_URI="https://github.com/openSUSE/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="doc lvm pam test systemd xattr"
 RESTRICT="test"
 RDEPEND="dev-libs/boost:=[threads(+)]
 	dev-libs/json-c:=
 	dev-libs/libxml2
 	dev-libs/icu:=
 	sys-apps/acl
 	sys-apps/dbus
 	sys-apps/util-linux
 	>=sys-fs/btrfs-progs-3.17.1
 	sys-libs/zlib
 	virtual/libintl
 	lvm? ( sys-fs/lvm2 )
 	pam? ( sys-libs/pam )
 	xattr? ( sys-apps/attr )"
 DEPEND="${RDEPEND}
 	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt
 	sys-devel/gettext
 	virtual/pkgconfig"
 PATCHES=(
 	"${FILESDIR}"/cron-confd.patch
 	"${FILESDIR}"/${P}-testsuite.patch
 )
 src_prepare() {
 	default
 	sed -e "s,/usr/lib/systemd/system,$(systemd_get_systemunitdir),g" \
 		-i data/Makefile.* \
 		|| die "Failed to fix systemd services and timers installation path"
 	eautoreconf
 }
 src_configure() {
 	# ext4 code does not work anymore
 	# snapper does not build without btrfs
 	local myeconfargs=(
 		--disable-silent-rules
 		--with-conf="/etc/conf.d"
 		--enable-zypp
 		--enable-rollback
 		--enable-btrfs-quota
 		--disable-ext4
 		--enable-btrfs
 		$(use_enable doc)
 		$(use_enable lvm)
 		$(use_enable pam)
 		$(use_enable test tests)
 		$(use_enable systemd)
 		$(use_enable xattr xattrs)
 	)
 	econf "${myeconfargs[@]}"
 }
 src_install() {
 	default
 	# Existing configuration file required to function
 	keepdir /etc/snapper/configs
 	newconfd data/sysconfig.snapper snapper
 	find "${D}" -name '*.la' -delete || die
 }
 pkg_postinst() {
 	elog "In order to use Snapper, you need to set up"
 	elog "at least one config first. To do this, run:"
 	elog "snapper create-config <subvolume>"
 	elog "For more information, see man (8) snapper or"
 	elog "http://snapper.io/documentation.html"
 }
--- a/app-backup/snapper/snapper-0.10.2.ebuild
+++ b/app-backup/snapper/snapper-0.10.2.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/openSUSE/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 IUSE="doc lvm pam test systemd xattr"
 RESTRICT="test"
--- a/app-backup/snapper/snapper-0.9.1.ebuild
+++ b/app-backup/snapper/snapper-0.9.1.ebuild
@ -1,89 +0,0 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit autotools systemd bash-completion-r1
 DESCRIPTION="Command-line program for btrfs and lvm snapshot management"
 HOMEPAGE="http://snapper.io/"
 SRC_URI="https://github.com/openSUSE/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 ~riscv x86"
 IUSE="doc lvm pam test systemd xattr"
 RESTRICT="test"
 RDEPEND="dev-libs/boost:=[threads(+)]
 	dev-libs/json-c:=
 	dev-libs/libxml2
 	dev-libs/icu:=
 	sys-apps/acl
 	sys-apps/dbus
 	sys-apps/util-linux
 	>=sys-fs/btrfs-progs-3.17.1
 	sys-libs/zlib
 	virtual/libintl
 	lvm? ( sys-fs/lvm2 )
 	pam? ( sys-libs/pam )
 	xattr? ( sys-apps/attr )"
 DEPEND="${RDEPEND}
 	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt
 	sys-devel/gettext
 	virtual/pkgconfig"
 PATCHES=(
 	"${FILESDIR}"/cron-confd.patch
 	"${FILESDIR}"/${P}-testsuite.patch
 )
 src_prepare() {
 	default
 	sed -e "s,/usr/lib/systemd/system,$(systemd_get_systemunitdir),g" \
 		-i data/Makefile.* \
 		|| die "Failed to fix systemd services and timers installation path"
 	eautoreconf
 }
 src_configure() {
 	# ext4 code does not work anymore
 	# snapper does not build without btrfs
 	local myeconfargs=(
 		--disable-silent-rules
 		--with-conf="/etc/conf.d"
 		--enable-zypp
 		--enable-rollback
 		--enable-btrfs-quota
 		--disable-ext4
 		--enable-btrfs
 		$(use_enable doc)
 		$(use_enable lvm)
 		$(use_enable pam)
 		$(use_enable test tests)
 		$(use_enable systemd)
 		$(use_enable xattr xattrs)
 	)
 	econf "${myeconfargs[@]}"
 }
 src_install() {
 	default
 	# Existing configuration file required to function
 	keepdir /etc/snapper/configs
 	newconfd data/sysconfig.snapper snapper
 	find "${D}" -name '*.la' -delete || die
 	newbashcomp "${FILESDIR}"/${PN}.bash ${PN}
 }
 pkg_postinst() {
 	elog "In order to use Snapper, you need to set up"
 	elog "at least one config first. To do this, run:"
 	elog "snapper create-config <subvolume>"
 	elog "For more information, see man (8) snapper or"
 	elog "http://snapper.io/documentation.html"
 }
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/hexedit/Manifest
+++ b/app-editors/hexedit/Manifest
@ -1,2 +1 @@
 DIST hexedit-1.5.tar.gz 30544 BLAKE2B d7292a70819826fddd63f99ee9d05073b8a59f51477390af91151146ee1f5a75333560829f0351fa9e158ef932c07a3582a3e822f42e645917a7fa321055d14e SHA512 9d8e5c8c0cda0af17ffeaf528e3dacd7fc2878dfc0755cb055dae5c56f05c961353c1d1723b05897314b49a44a6eb96de5d3a599c6b29967425507eea7cc7ca5
 DIST hexedit-1.6.tar.gz 31085 BLAKE2B e576de6aaed35449adbc430c95e8ba3a8ccfba587ef5c4d347d95b84c9764cb644323af23d46ff16429b93e0348c8d310afbad482219aa1b2c1b582332bd06fe SHA512 9783406f253a67fe048ec12306df1a601b7ba92cd7a0399ad2f103aed5a3164cd21ad7c1d547a4c55192cfb7da2b2517152015a4c3db402a9217548b435f602d
--- a/app-editors/hexedit/hexedit-1.5.ebuild
+++ b/app-editors/hexedit/hexedit-1.5.ebuild
@ -1,34 +0,0 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
 inherit autotools
 DESCRIPTION="View and edit files in hex or ASCII"
 HOMEPAGE="http://rigaux.org/hexedit.html"
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 EGIT_REPO_URI="https://github.com/pixel/hexedit.git"
 else
 SRC_URI="https://github.com/pixel/hexedit/archive/${PV}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 fi
 LICENSE="GPL-2"
 SLOT="0"
 DEPEND="sys-libs/ncurses:="
 RDEPEND="${DEPEND}"
 src_prepare() {
 	default
 	eautoreconf
 }
 src_install() {
 	dobin hexedit
 	doman hexedit.1
 	dodoc Changes
 }
--- a/app-editors/hexedit/hexedit-1.6.ebuild
+++ b/app-editors/hexedit/hexedit-1.6.ebuild
@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 EGIT_REPO_URI="https://github.com/pixel/hexedit.git"
 else
 SRC_URI="https://github.com/pixel/hexedit/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 fi
 LICENSE="GPL-2"
--- a/app-editors/vscode/Manifest
+++ b/app-editors/vscode/Manifest
@ -1,6 +1,6 @@
 DIST vscode-1.69.2-amd64.tar.gz 121413876 BLAKE2B 5a410a0bf88d94a1d414d03eac437bbd0c728cc5c43b28d05dc5ade3b40225d3fcd7ff3eb5546835b7e4070e0e14b8267e0777ec157c458544beea448f8755a3 SHA512 b9fd1975a99b6302fda4f8e758f02ba00f1dae5f419eb6a07768ef685ab11592b127b7fdbc117a88da065ef8a4e3181577d651cad5958f4fb4406a85e50639bb
 DIST vscode-1.69.2-arm.tar.gz 102384679 BLAKE2B f9eb92d6661fdd55a5e6359cb51cd021f77c19fd6a2d1dbe1383131d0818249a26dae87bf30d11385a867535730ea404dd8ac2453d7807799a69369d24fb35d8 SHA512 caa9d50ccbaeb6133c810571f70e6e2136e9574abd7e125e0e07b66036e3076109e8c80fd7461c39ecb7f63c6d79cdfefc1a25f9201f429658fbcc93e48e32be
 DIST vscode-1.69.2-arm64.tar.gz 116492196 BLAKE2B c179ec2b3b6dec915f3f51808d55fa0da820007aaceed8b4b0608de4fa006c44fb93a042850a7f1f339ac36e6a042a4ab4e0e73a12be0693894b84c1bdeb155b SHA512 4eacc61348da717f2682182f8a99b6e4b15dac77abc8187a01511a58658b9661227d6d1e80ffb5b93cbbfd6c08eb719b34c92a922b9a4285c6dc48aaaf2bf407
 DIST vscode-1.70.0-amd64.tar.gz 119734068 BLAKE2B ed24b84903cc8c9a427315ac4f229de337f1d550cfd573815a32984a2fc731e905b94562da6a163af85e56367b9d307691a48d7c4e2f6bc5adf83fe6f9167fcd SHA512 db4eec2303ed2ca778b6f745dd1569f5e17543b672ec077ffaca5887c03977dbe12284d04e67713758f22556669a13380e4a5f515e98c1c63a5fb91568888881
 DIST vscode-1.70.0-arm.tar.gz 100801066 BLAKE2B 829965520d93d1d165cfc6624922eee0b48a5ed16c40275d63192d025d2f810ed1d85710e19e138178c5bff79d3f5b47f1634bbc6434aecc24e533ed2ffd6357 SHA512 8f7db99d16170e3a4823e2efaa03adba3fa89f2323be628969240db5453aefc922c3cb11575e94e3d89cd8691f7991a6a01c1510cdd66278e95788d578ba4486
 DIST vscode-1.70.0-arm64.tar.gz 114890103 BLAKE2B 17ad2db3748e5650e2e0ae85b9d857f6c981109a32c838442d672e8c0af4d6940e410d90e94580cc64bb2b57469768eff0bbac5844bf8a8b6ec8e26cb84e21bd SHA512 a74e0dffdea57f884bad06986cd31f1cbeafbb67b7ed59e5e96dec633144c8208df5b952e89186145ba2b37990d21e15fdf13109d34057652dd0357645c5adfe
 DIST vscode-1.70.1-amd64.tar.gz 119738468 BLAKE2B 7944f5fbaec4d935b71626c3c9fc8abe504510748309024d373913cde7887652e5e2c6176201d18c14e131664031feae6af4b2b75f79a11bf0625869143f6b8a SHA512 6f44acd886ded96d92627587c3c5b23fd629f8e151690e7e205eb4cb594cb1e73c582b15f847afe4c72b80e8fdb08dca165bd8840bbb770647e075b3ca9626e9
 DIST vscode-1.70.1-arm.tar.gz 100809684 BLAKE2B d45cb42134cac7156af0c5108ec70dda7e50d529daf37e352288ec299f6fa53617c260f80bb03a921da837ec706dd2078a2a17dac60255b61dffad5c253e93f5 SHA512 184728e2969d9d00d94eaaa344164ddc536c0fde6267a142ea35157ecc6befa6f1532f35e879345f27a853d05248bb678f2b666c1e07db9651d90e019ecfeb9a
 DIST vscode-1.70.1-arm64.tar.gz 114897540 BLAKE2B 9728a77a9b012352f5f85a236f3cde60ff11ba52a03836feff4ed35f8dcd0101a8924ecae0dfc0ebbf27aa396be649d2c2f013a15341829f2b0e70f491d2eec2 SHA512 0840d16599d6f83922ec8adce84e59b62fbcf61b704d2898215c0a67e4b87461c5a31288a57559cf9ec382882fe5f14512927670082b044a7d1152c80a78a642
--- a/app-editors/vscode/vscode-1.70.1.ebuild
+++ b/app-editors/vscode/vscode-1.70.1.ebuild
@ -103,8 +103,7 @@ src_install() {
 	fperms +x /opt/${PN}/{,bin/}code
 	fperms +x /opt/${PN}/chrome_crashpad_handler
 	fperms 4711 /opt/${PN}/chrome-sandbox
-	fperms 755 /opt/${PN}/resources/app/extensions/git/dist/askpass.sh
+	fperms 755 /opt/${PN}/resources/app/extensions/git/dist/{askpass,git-editor}{,-empty}.sh
 	fperms 755 /opt/${PN}/resources/app/extensions/git/dist/askpass-empty.sh
 	fperms -R +x /opt/${PN}/resources/app/out/vs/base/node
 	fperms +x /opt/${PN}/resources/app/node_modules.asar.unpacked/@vscode/ripgrep/bin/rg
 	dosym "../../opt/${PN}/bin/code" "usr/bin/vscode"
--- a/app-editors/vscodium/Manifest
+++ b/app-editors/vscodium/Manifest
@ -1,6 +1,6 @@
 DIST vscodium-1.69.2-amd64.tar.gz 121116247 BLAKE2B af616419dbf9cb96ab6662a0016013c0f406581f63ca50665b40fa827e3c4a142132192dcfee2639dc96e99cbb7edac8da26a477acfd5d5ed698535588291c9c SHA512 d1afdaeddd72706c1b51352730c1d8baaaef5e5d5adc7a111f02905704e8ea2886c72617722475a90a14a49a8032c0d120e0b35ff50e602477efc86b5fde6049
 DIST vscodium-1.69.2-arm.tar.gz 102920556 BLAKE2B 84a95f6530b7c13f18e2cc569d54a533bef39d13df54591b5d8d1b2d095345fefaaf967414f982d9049b12201c6fc86a256b64c42b3d5c0cc4ec248d26c9c636 SHA512 d1a2443a25262c7b843085abfb0a896120dc234446d3ef1b8306d2a09d7dc7cbdf1da5eb8cfe5c18067cf67941223c1bab124ab71c56b24c2f0951449b3a220b
 DIST vscodium-1.69.2-arm64.tar.gz 118959353 BLAKE2B e9a81f208babb84560f391e2a1ee8008add843e00b9d041b07bdce4d4a6cb06f979bdaa5ea1d0d818b0765ec5a726ccf8c26efabd1aa44404bde19addb941cf1 SHA512 bb761cdbbd8b52b0fbcfe21e6d851047a522792e428ce2fe8f917ffc073ee9dfedca0b8c9394385151307f38f709db4bc3c51798c81a5b5730df83786a8b0fe0
 DIST vscodium-1.70.0-amd64.tar.gz 119473836 BLAKE2B 278b071006de89408f5124a38b0dbccaffa10a574397473ba84da41d0f14ec1b472ffbaef6580cc5a033187aecb9d8de39893d0060e3d16e38741840b57a209f SHA512 d0284e25144c01aeebda8e460d5f83aa62a529bc9c97949f037de9515ad387c3b99ff306eafdeb1a2d69a18a90ba284d7acbbfcb469438ba38a9094b9c55bda2
 DIST vscodium-1.70.0-arm.tar.gz 101286329 BLAKE2B aa1862aac41bfcc1836a91933185097abf24664b1a85008603bd0d41154cdcfdf94ae6e9c5885d2762a7b00bbddae5af91f78233f5775c213925992db9969882 SHA512 9565c6c08c6c1dfb8bc1622514eb54220b2453cf697a3f30b85fe67fca9f7a295a525590c5e1b6fa23e9c84f139e54d2425e13c68d872a5a7eb001b945ae5a63
 DIST vscodium-1.70.0-arm64.tar.gz 117321647 BLAKE2B 9a49aa9d77dd2aec1561ff8332953062341fc5c6d37e2130c509941d673c2ff32b490ca6755602b46e635425cc801492ed30a058ef8b5f93b58a9c7619695512 SHA512 da82950cf243bbafebb415bf72127edc63dfa805cb37045c5ffff67f24d28fb811c44aa0d2c3b14098238dbd55c29e384872594ef6d8464af95dea6379cdd071
 DIST vscodium-1.70.1-amd64.tar.gz 119463559 BLAKE2B 735786acd7796445f66dea016d3024286c5043f5eda635963eb9dcf4fcb0ff27265aacce18d9e2be00f2f7e6ff580d0c6dc83ac91dbdb7ffd934b721c221793a SHA512 115b3f520b53becbd164c868406805e6012b51414d803283d80eb4cf992c2e0fea53af3e1939dcd9cfb1264b13b4a3eb422a89f763f8eb7fbd28ce462f3a6fd6
 DIST vscodium-1.70.1-arm.tar.gz 101292517 BLAKE2B a2a0abd470988f649d657498ebdb49c1b10ecae4a8797d78da341c526604596680af301a7bb940bcc627e6aaa6fe971a50e4311baf2364fce4eb65779ef835e3 SHA512 33dd3eda80b9a6353e72ed92ee5f2adc3bdc48c49de0fa0829195e695fdfab0cd2fcba9fa1d6a0d6e3eccc3cd4b5c87a86af5e29161105a070f4743a413d7a2a
 DIST vscodium-1.70.1-arm64.tar.gz 117318425 BLAKE2B 16af0105d270aa706d762f94190838f7a0f5fb9ffe3c1b0eccbdf120d8ff1c21473d871170b252e1a805ed9ce81d35f1bcfbc33cd085b363497f40770fb32457 SHA512 9cb90d5a43aa124bc77cdf2868b45da59fa2c8573333373a6e351f2ed00fbccf7069655e30ce39e7322d8c18bb7edb20818b781bc1d60c3f524f8b37b85a6645
--- a/app-editors/vscodium/vscodium-1.70.1.ebuild
+++ b/app-editors/vscodium/vscodium-1.70.1.ebuild
@ -95,8 +95,7 @@ src_install() {
 	fperms +x /opt/${PN}/{,bin/}codium
 	fperms +x /opt/${PN}/chrome_crashpad_handler
 	fperms 4711 /opt/${PN}/chrome-sandbox
-	fperms 755 /opt/${PN}/resources/app/extensions/git/dist/askpass.sh
+	fperms 755 /opt/${PN}/resources/app/extensions/git/dist/{askpass,git-editor}{,-empty}.sh
 	fperms 755 /opt/${PN}/resources/app/extensions/git/dist/askpass-empty.sh
 	fperms -R +x /opt/${PN}/resources/app/out/vs/base/node
 	fperms +x /opt/${PN}/resources/app/node_modules.asar.unpacked/@vscode/ripgrep/bin/rg
 	dosym "../../opt/${PN}/bin/codium" "usr/bin/vscodium"
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
--- a/app-emacs/buttercup/Manifest
+++ b/app-emacs/buttercup/Manifest
@ -1,2 +1,3 @@
 DIST buttercup-1.24.tar.gz 85337 BLAKE2B fb40d0899f68aff5f2fdb989b2c0e42005e6667ecfe8a4ca806ddb4139f497f0eed5328ba6407136b757a0f13bc6ec5ee488792da3de1e84edba394a781c410c SHA512 0a436f5e5bcf386a3675ef281ac6c9f0125917058de88a5557d879004bbf7cd4298086aa3fb86f2bd807f46c166b0fb02e248cc485878891293147656525f8ca
 DIST buttercup-1.25.tar.gz 86763 BLAKE2B ccf7ba797517710e66b666cc121766d29886e0e1a8fd5ad63cb8b5fa4ee2d2a0d2644cd413c1095f37b1ba60467c012e507230787e1daaca3e869a4072e61bb4 SHA512 1eb45485fb1de638837da4d97f6043a64e97d167c8c130d9c5ba6ff67a5e0bcae272c8247779ab1c9427668468a3b94e91af07426b5465a7c3f9c54433a0433e
 DIST buttercup-1.26.tar.gz 87554 BLAKE2B ee5d37360b6c9daa8b790f7ea6ae5bf7ff4266b1fcbe913877aefd4ede2e7d6561e48eae533c17c906e19b498d9d127692597ee728bd1fa791430f5f6ab508c8 SHA512 fb491e1db33ffaeca52529630c538040487a7bdf7766faab2c6a1bc39d1060c5bbbb7a259006b741abbec9b9a6911f8390b2513e0a4dddf856b79274ed24307c
--- a/app-emacs/buttercup/buttercup-1.26.ebuild
+++ b/app-emacs/buttercup/buttercup-1.26.ebuild
@ -0,0 +1,30 @@
 # Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
 NEED_EMACS="24.3"
 inherit elisp
 DESCRIPTION="Behaviour-driven Elisp testing"
 HOMEPAGE="https://github.com/jorgenschaefer/emacs-buttercup"
 SRC_URI="https://github.com/jorgenschaefer/emacs-${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}"/emacs-${P}
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 DOCS=( docs/{running,writing}-tests.md  )
 SITEFILE="50${PN}-gentoo.el"
 src_test() {
 	${EMACS} ${EMACSFLAGS} -L . -l buttercup \
 			 -f buttercup-run-discover || die "tests failed"
 }
 src_install() {
 	elisp_src_install
 	dobin bin/${PN}
 }
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/vkd3d/Manifest
+++ b/app-emulation/vkd3d/Manifest
@ -1,3 +1,4 @@
 DIST vkd3d-1.0.tar.xz 461884 BLAKE2B 4dbd729f9e795d3d81178abc1a8774c0bbe6a5257c96c97acf1e4b4cdb5b7e30c77235e8b8fa57f7db3196caf30c55c3b0c07e2981629dd6177436a3cd117d33 SHA512 55712528688cdedc63049e168b371b470dbb8e31ddc36d8b23b0655f4a061726eb8556b9abf3cb887f6bd21379959aed9fab93ba0fd53813aec413ebec71d615
 DIST vkd3d-1.1.tar.xz 487452 BLAKE2B 834ca06d2159a5857dde457f27e541f06624e87633af6aca7445867abc38c56a1da1fe34b6795ffbd6aa73e983ac0e4301402ae35ef8358fa8cc79c12972b11d SHA512 e107612bdca95e998f9d819bdf74e4ffe1b4d400d250ab855c4ebf94b7d3f088b3221591fef03b1c6b8ecb030feb1673f74831bd8bd8edda2989d09a8846b0f7
 DIST vkd3d-1.2.tar.xz 611240 BLAKE2B e7ea3f7120ad1092be0239bdc2e6d0dfdfecc3b1c2e7c359c4bfbd8c259f092e041a75a0e896da9a1c6370d5716590711128d31c9e552897b177b300b9a15107 SHA512 ca9d5b11e7770747b78b61f43196b45b7bda8d2dd4f1d76da915f895a04dc28c20499e1e433f5ce17416964fe0f37cdc907e7aa540ec9105afbc8a100094f3e7
 DIST vkd3d-1.4.tar.xz 774920 BLAKE2B c46a71b495fc41658ea493f65ad15aec18202889a9c7925962301cce91f32e197c5850f374331595e4bd267fcbf9836531e733fb5880ddb4936476ddedd19bbc SHA512 58535b57b0b506542f2867e9b1229682f012216b9f8913d2692d4ed64a8113248d66ea710127ec2064baf9511b7f2be7b757dffcaf95a43168d781010d007ddb
--- a/app-emulation/vkd3d/vkd3d-1.4.ebuild
+++ b/app-emulation/vkd3d/vkd3d-1.4.ebuild
@ -0,0 +1,43 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 inherit multilib-minimal
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://source.winehq.org/git/vkd3d.git"
 	inherit git-r3
 else
 	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://dl.winehq.org/vkd3d/source/${P}.tar.xz"
 fi
 #Tests fail: https://bugs.gentoo.org/838655
 RESTRICT="test"
 IUSE="spirv-tools"
 RDEPEND="spirv-tools? ( dev-util/spirv-tools:=[${MULTILIB_USEDEP}] )
 		media-libs/vulkan-loader[${MULTILIB_USEDEP},X]
 		x11-libs/xcb-util:=[${MULTILIB_USEDEP}]
 		x11-libs/xcb-util-keysyms:=[${MULTILIB_USEDEP}]
 		x11-libs/xcb-util-wm:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 		dev-util/spirv-headers
 		dev-util/vulkan-headers"
 DESCRIPTION="D3D12 to Vulkan translation library"
 HOMEPAGE="https://source.winehq.org/git/vkd3d.git/"
 LICENSE="LGPL-2.1"
 SLOT="0"
 multilib_src_configure() {
 	local myconf=(
 		$(use_with spirv-tools)
 		--disable-doxygen-pdf
 	)
 	ECONF_SOURCE=${S} econf "${myconf[@]}"
 }
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
--- a/app-eselect/eselect-wine/metadata.xml
+++ b/app-eselect/eselect-wine/metadata.xml
@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
 		<email>wine@gentoo.org</email>
 		<name>Wine</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="bitbucket">np-hardass/eselect-wine</remote-id>
 	</upstream>
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
--- a/app-i18n/opencc/opencc-1.1.4.ebuild
+++ b/app-i18n/opencc/opencc-1.1.4.ebuild
@ -22,7 +22,7 @@ fi
 LICENSE="Apache-2.0"
 SLOT="0/1.1"
-KEYWORDS="amd64 arm64 ~hppa ~loong ppc ppc64 ~riscv sparc ~x86"
+KEYWORDS="amd64 arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/uptimed/uptimed-0.4.6-r1.ebuild
+++ b/app-misc/uptimed/uptimed-0.4.6-r1.ebuild
@ -39,16 +39,7 @@ src_install() {
 }
 pkg_postinst() {
 	local spooldir="/var/spool/${PN}"
 	if [[ -d "${spooldir}" ]] ; then
 		einfo "Fixing permissions in ${spooldir}"
 		find ${spooldir} -type f -links 1 \
 			\( -name records -o -name records.old \) \
 			| xargs --no-run-if-empty chown uptimed:uptimed || die
 	fi
 	echo
 	elog "Start uptimed with '/etc/init.d/uptimed start' (for openRC)"
 	elog "or systemctl start uptimed (for systemd)"
 	elog "To view your uptime records, use the command 'uprecords'."
 	echo
 }
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
--- a/app-office/libreoffice-l10n/libreoffice-l10n-7.3.5.2.ebuild
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-7.3.5.2.ebuild
@ -17,7 +17,7 @@ BASE_SRC_URI_STABLE="https://download.documentfoundation.org/${PN/-l10n/}/stable
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86 ~amd64-linux"
 IUSE="offlinehelp"
 #
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/html2text/html2text-2.1.1.ebuild
+++ b/app-text/html2text/html2text-2.1.1.ebuild
@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/grobian/html2text.git"
 else
 	SRC_URI="https://github.com/grobian/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 DESCRIPTION="HTML to text converter"
--- a/app-text/libabw/libabw-0.1.3.ebuild
+++ b/app-text/libabw/libabw-0.1.3.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="doc static-libs"
 BDEPEND="
--- a/app-text/libebook/libebook-0.1.3-r2.ebuild
+++ b/app-text/libebook/libebook-0.1.3-r2.ebuild
@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="doc test tools"
 RESTRICT="!test? ( test )"
--- a/app-text/libepubgen/libepubgen-0.1.1-r1.ebuild
+++ b/app-text/libepubgen/libepubgen-0.1.1-r1.ebuild
@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="debug doc test"
 RESTRICT="!test? ( test )"
--- a/app-text/libetonyek/libetonyek-0.1.10-r1.ebuild
+++ b/app-text/libetonyek/libetonyek-0.1.10-r1.ebuild
@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	MDDS_VER="2.0"
 	SRC_URI="https://dev-www.libreoffice.org/src/libetonyek/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 fi
 DESCRIPTION="Library parsing Apple Keynote presentations"
 HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
--- a/app-text/libetonyek/libetonyek-9999.ebuild
+++ b/app-text/libetonyek/libetonyek-9999.ebuild
@ -8,7 +8,7 @@ if [[ ${PV} == *9999 ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://dev-www.libreoffice.org/src/libetonyek/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 fi
 DESCRIPTION="Library parsing Apple Keynote presentations"
 HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
--- a/app-text/libexttextcat/libexttextcat-3.4.6.ebuild
+++ b/app-text/libexttextcat/libexttextcat-3.4.6.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=8
@ -9,7 +9,7 @@ SRC_URI="https://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 src_configure() {
 	econf \
--- a/app-text/liblangtag/liblangtag-0.6.4.ebuild
+++ b/app-text/liblangtag/liblangtag-0.6.4.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://bitbucket.org/tagoh/${PN}/downloads/${P}.tar.bz2"
 LICENSE="|| ( LGPL-3 MPL-2.0 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 IUSE="debug doc introspection test"
 # Upstream expect liblangtag to be installed when one runs tests...
--- a/app-text/libmspub/libmspub-0.1.4.ebuild
+++ b/app-text/libmspub/libmspub-0.1.4.ebuild
@ -10,7 +10,7 @@ if [[ ${PV} = *9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev-www.libreoffice.org/src/libmspub/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 DESCRIPTION="Library parsing Microsoft Publisher documents"
 HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libmspub"
--- a/app-text/libmspub/libmspub-9999.ebuild
+++ b/app-text/libmspub/libmspub-9999.ebuild
@ -10,7 +10,7 @@ if [[ ${PV} = *9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev-www.libreoffice.org/src/libmspub/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~sparc ~x86"
 fi
 DESCRIPTION="Library parsing Microsoft Publisher documents"
 HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libmspub"
--- a/app-text/libmwaw/libmwaw-0.3.21.ebuild
+++ b/app-text/libmwaw/libmwaw-0.3.21.ebuild
@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 fi
 DESCRIPTION="Library parsing many pre-OSX MAC text formats"
--- a/app-text/libmwaw/libmwaw-9999.ebuild
+++ b/app-text/libmwaw/libmwaw-9999.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=8
@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86"
 fi
 DESCRIPTION="Library parsing many pre-OSX MAC text formats"
--- a/app-text/libnumbertext/libnumbertext-1.0.10.ebuild
+++ b/app-text/libnumbertext/libnumbertext-1.0.10.ebuild
@ -9,7 +9,7 @@ SRC_URI="https://github.com/Numbertext/${PN}/releases/download/${PV}/${P}.tar.xz
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 x86"
 IUSE=""
 src_configure() {
--- a/app-text/libodfgen/libodfgen-0.1.8.ebuild
+++ b/app-text/libodfgen/libodfgen-0.1.8.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
@ -8,7 +8,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="mirror://sourceforge/libwpd/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 fi
 DESCRIPTION="Library to generate ODF documents from libwpd and libwpg"
--- a/app-text/libodfgen/libodfgen-9999.ebuild
+++ b/app-text/libodfgen/libodfgen-9999.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
@ -8,7 +8,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="mirror://sourceforge/libwpd/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 fi
 DESCRIPTION="Library to generate ODF documents from libwpd and libwpg"
--- a/app-text/libqxp/libqxp-0.0.2.ebuild
+++ b/app-text/libqxp/libqxp-0.0.2.ebuild
@ -9,7 +9,7 @@ SRC_URI="https://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86"
 IUSE="debug doc test tools"
 RESTRICT="!test? ( test )"
--- a/app-text/libstaroffice/libstaroffice-0.0.7.ebuild
+++ b/app-text/libstaroffice/libstaroffice-0.0.7.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
@ -8,7 +8,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://github.com/fosnola/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 x86"
 fi
 DESCRIPTION="Import filter for old StarOffice documents"
--- a/app-text/libstaroffice/libstaroffice-9999.ebuild
+++ b/app-text/libstaroffice/libstaroffice-9999.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
@ -8,7 +8,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3 autotools
 else
 	SRC_URI="http://dev-www.libreoffice.org/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86"
 fi
 DESCRIPTION="Import filter for old StarOffice documents"
--- a/app-text/libwpd/libwpd-0.10.3.ebuild
+++ b/app-text/libwpd/libwpd-0.10.3.ebuild
@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
 SLOT="0.10"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv x86"
 IUSE="doc +tools"
 RDEPEND="dev-libs/librevenge"
--- a/app-text/libwpg/libwpg-0.3.3.ebuild
+++ b/app-text/libwpg/libwpg-0.3.3.ebuild
@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
 SLOT="0.3"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv x86"
 IUSE="doc static-libs"
 RDEPEND="
--- a/app-text/libwps/libwps-0.4.12.ebuild
+++ b/app-text/libwps/libwps-0.4.12.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
@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="debug doc tools"
 BDEPEND="
--- a/app-text/mythes/mythes-1.2.4-r1.ebuild
+++ b/app-text/mythes/mythes-1.2.4-r1.ebuild
@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/hunspell/MyThes/${PV}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 RDEPEND="app-text/hunspell"
--- a/app-text/poppler/poppler-22.07.0.ebuild
+++ b/app-text/poppler/poppler-22.07.0.ebuild
@ -15,7 +15,7 @@ else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
 	SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SLOT="0/122"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
--- a/dev-cpp/clucene/clucene-2.3.3.4-r8.ebuild
+++ b/dev-cpp/clucene/clucene-2.3.3.4-r8.ebuild
@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/clucene/${MY_P}.tar.gz"
 LICENSE="|| ( Apache-2.0 LGPL-2.1 )"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="debug doc static-libs"
--- a/dev-cpp/doctest/doctest-2.4.9.ebuild
+++ b/dev-cpp/doctest/doctest-2.4.9.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/doctest/doctest/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
--- a/dev-cpp/libcmis/libcmis-0.5.2-r1.ebuild
+++ b/dev-cpp/libcmis/libcmis-0.5.2-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
@ -8,7 +8,7 @@ if [[ ${PV} = 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/tdf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 x86 ~amd64-linux ~x86-linux"
 fi
 inherit autotools flag-o-matic
--- a/dev-cpp/libcmis/libcmis-9999.ebuild
+++ b/dev-cpp/libcmis/libcmis-9999.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
@ -8,7 +8,7 @@ if [[ ${PV} = 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/tdf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 fi
 inherit autotools flag-o-matic
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.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=8
@ -11,7 +11,7 @@ else
 	MY_PV=${PV/_b/-b}
 	SRC_URI="https://downloads.mariadb.com/Connectors/c/connector-c-${PV}/${P}-src.tar.gz"
 	S="${WORKDIR%/}/${PN}-${MY_PV}-src"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 CMAKE_ECLASS=cmake
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.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=8
@ -11,7 +11,7 @@ else
 	MY_PV=${PV/_b/-b}
 	SRC_URI="https://downloads.mariadb.com/Connectors/c/connector-c-${PV}/${P}-src.tar.gz"
 	S="${WORKDIR%/}/${PN}-${MY_PV}-src"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 CMAKE_ECLASS=cmake
--- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.27-r1.ebuild
+++ b/dev-db/mysql-connector-c/mysql-connector-c-8.0.27-r1.ebuild
@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-$(ver_cut 1-2)/mysql-boost-${PV}.tar.gz"
-	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 	S="${WORKDIR}/mysql-${PV}"
 fi
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
--- a/dev-java/istack-commons-runtime/istack-commons-runtime-4.1.1-r1.ebuild
+++ b/dev-java/istack-commons-runtime/istack-commons-runtime-4.1.1-r1.ebuild
@ -18,7 +18,7 @@ SRC_URI="https://github.com/eclipse-ee4j/jaxb-istack-commons/archive/${PV}.tar.g
 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 # Compile dependencies
 # POM: runtime/pom.xml
--- a/dev-java/jakartaee-migration/Manifest
+++ b/dev-java/jakartaee-migration/Manifest
@ -1,2 +1 @@
 DIST jakartaee-migration-1.0.0-sources.tar.gz 35116 BLAKE2B 98b587e5a51e8f3540d6f4570c60ffa5516801709e41260ac09f7fcabc9e96a3b9067e8eba6c5975c62e3c56585a1f334a21acc15627666e1616ced6f625c56f SHA512 f0c0dc5da4d3c5d4bae8fd4c3db349cb45b7c8d82ca0bb12f3c995e92d4b0893db111ab33ce812299d66904827adc91b22c49381625760fc05c1b10de76faa0c
 DIST jakartaee-migration-1.0.1-sources.tar.gz 35763 BLAKE2B 9e739668a7ebd65396960cd2447ecf2bc114cb85a2c554a17cb8478bef13f70f2fed26cc96553a22e7279dde698e1c094ca4dc7a8695ff9f82903ebe8badbd69 SHA512 6caaadfe5dcb21a859f2e401c039832b2774d8876ac724c3159b28c80a1153f7cd1c6706ba29a38d5f748cd2e55a85bd9bfecfb3a405f86aa85637ff3ca3c5f7
--- a/dev-java/jakartaee-migration/jakartaee-migration-1.0.0.ebuild
+++ b/dev-java/jakartaee-migration/jakartaee-migration-1.0.0.ebuild
@ -1,89 +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 pom.xml --download-uri https://ftp.fau.de/apache/tomcat/jakartaee-migration/v1.0.0/source/jakartaee-migration-1.0.0-src.tar.gz --slot 0 --keywords "~amd64" --ebuild jakartaee-migration-1.0.0.ebuild
 EAPI=7
 JAVA_PKG_IUSE="doc source test"
 MAVEN_ID="org.apache.tomcat:jakartaee-migration:1.0.0"
 JAVA_TESTING_FRAMEWORKS="junit-4"
 inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="Apache Tomcat tool for migration from Java EE 8 to Jakarta EE 9"
 HOMEPAGE="https://tomcat.apache.org"
 SRC_URI="mirror://apache/tomcat/${PN}/v${PV}/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64"
 # Common dependencies
 # POM: pom.xml
 # commons-io:commons-io:2.8.0 -> >=dev-java/commons-io-2.8.0:1
 # org.apache.bcel:bcel:6.5.0 -> >=dev-java/bcel-6.5.0:0
 # org.apache.commons:commons-compress:1.20 -> >=dev-java/commons-compress-1.20:0
 CDEPEND="
 	dev-java/ant-core:0
 	dev-java/bcel:0
 	>=dev-java/commons-compress-1.20:0
 	dev-java/commons-io:1
 "
 # Compile dependencies
 # POM: pom.xml
 # org.apache.ant:ant:1.10.9 -> !!!groupId-not-found!!!
 # POM: pom.xml
 # test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.1:4
 DEPEND="
 	>=virtual/jdk-1.8:*
 	${CDEPEND}
 "
 RDEPEND="
 	>=virtual/jre-1.8:*
 	${CDEPEND}"
 S="${WORKDIR}/${P}"
 JAVA_LAUNCHER_FILENAME="${PN}"
 JAVA_GENTOO_CLASSPATH="ant-core,bcel,commons-compress,commons-io-1"
 JAVA_SRC_DIR="src/main/java"
 JAVA_MAIN_CLASS="org.apache.tomcat.jakartaee.MigrationCLI"
 JAVA_RESOURCE_DIRS=(
 	"src/main/resources"
 )
 JAVA_TEST_GENTOO_CLASSPATH="junit-4"
 JAVA_TEST_SRC_DIR="src/test/java"
 JAVA_TEST_RESOURCE_DIRS=(
 	"src/test/resources"
 )
 src_prepare() {
 	default
 	sed -i "s/\${project.version}/${PV}/g" src/main/resources/info.properties
 }
 src_test() {
 	# we need to create jar files for the tests the same way as it's done using pom.xml
 	local implementation_version=$(grep Implementation-Version pom.xml | grep -oE "[0-9]+\.[0-9]+\.[0-9]+")
 	mkdir -p target/test-classes/META-INF || die
 	pushd target/test-classes || die
 	echo "Implementation-Version: ${implementation_version}" > META-INF/MANIFEST.MF
 	ejavac -d . -encoding ${JAVA_ENCODING} $(find "${S}/${JAVA_TEST_SRC_DIR}" -name CommonGatewayInterface.java) || die
 	jar cfm cgi-api.jar META-INF/MANIFEST.MF $(find -name CommonGatewayInterface.class) || die
 	ejavac -d . -encoding ${JAVA_ENCODING} $(find "${S}/${JAVA_TEST_SRC_DIR}" -name HelloCGI.java) || die
 	jar cfm hellocgi.jar META-INF/MANIFEST.MF $(find -name HelloCGI.class) || die
 	for enc in rsa dsa ec; do
 		cp hellocgi.jar hellocgi-signed-${enc}.jar || die
 		jarsigner -keystore "${S}/src/test/resources/keystore.p12" -storepass apache hellocgi-signed-${enc}.jar ${enc} || die
 	done
 	popd
 	java-pkg-simple_src_test
 }
--- a/dev-java/jakartaee-migration/jakartaee-migration-1.0.1.ebuild
+++ b/dev-java/jakartaee-migration/jakartaee-migration-1.0.1.ebuild
@ -17,7 +17,7 @@ HOMEPAGE="https://tomcat.apache.org"
 SRC_URI="mirror://apache/tomcat/${PN}/v${PV}/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 # Common dependencies
 # POM: pom.xml
--- a/dev-java/java-service-wrapper/Manifest
+++ b/dev-java/java-service-wrapper/Manifest
@ -1,2 +1 @@
 DIST wrapper_3.5.25_src.tar.gz 556678 BLAKE2B bead95eb2feebe0c22f8c66ca948185c320a979e498fb5156de576d443ba6e3375efb6244a66db6af101fa7dc459d983b51631fc237ad4578505be47059cf2c7 SHA512 4ce8ab5dc7acc4d78e7b902a61bb1e3785b5455f81438aa61a877107647e88ade595075ff0b8d5db0ff2b33bb94d70c2b1331561d6d282e497998eea9494c6f4
 DIST wrapper_3.5.50_src.tar.gz 779253 BLAKE2B 64863e408c2147014946f869bbd98775d1d23d4cd63ef562167f40191febf87cc72697a55fe2ec6a5d085f3df4897cc4485f4ed88a3ee3a7f7930215448972f7 SHA512 403deec1bcc70a93ce0b0749bf2d5bc27a4a540d07785bc3ac83b38257cc5e8247a784f646770c96ac318f22d30c463dafb2f002720041b93443b292d6669c09
--- a/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-as-needed.patch
+++ b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-as-needed.patch
@ -1,157 +0,0 @@
 https://bugs.gentoo.org/622806
 https://sourceforge.net/p/wrapper/patches/25/
 --- a/src/c/Makefile-linux-armel-32.make.old	2014-07-21 10:48:31.000000000 +0200
 +++ b/src/c/Makefile-linux-armel-32.make	2014-07-21 10:50:11.000000000 +0200
@@ -33,14 +33,14 @@
 	if test ! -d .deps; then mkdir .deps; fi
 wrapper: $(wrapper_SOURCE)
 -	$(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper
 +	$(COMPILE) $(CFLAGS) $(LDFLAGS) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper
 libwrapper.so: $(libwrapper_so_OBJECTS)
 -	${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
 +	${COMPILE} $(LDFLAGS) -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
 %.o: %.c
 -	@echo '$(COMPILE) -c $<'; \
 -	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
 +	@echo '$(COMPILE) $(CFLAGS) -c $<'; \
 +	$(COMPILE) $(CFLAGS) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
 	@-cp .deps/$(*F).pp .deps/$(*F).P; \
 	tr ' ' '\012' < .deps/$(*F).pp \
 	| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
 --- a/src/c/Makefile-linux-armhf-32.make.old	2014-07-21 10:48:31.000000000 +0200
 +++ b/src/c/Makefile-linux-armhf-32.make	2014-07-21 10:51:05.000000000 +0200
@@ -33,14 +33,14 @@
 	if test ! -d .deps; then mkdir .deps; fi
 wrapper: $(wrapper_SOURCE)
 -	$(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper
 +	$(COMPILE) $(CFLAGS) $(LDFLAGS) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper
 libwrapper.so: $(libwrapper_so_OBJECTS)
 -	${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
 +	${COMPILE} $(LDFLAGS) -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
 %.o: %.c
 -	@echo '$(COMPILE) -c $<'; \
 -	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
 +	@echo '$(COMPILE) $(CFLAGS) -c $<'; \
 +	$(COMPILE) $(CFLAGS) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
 	@-cp .deps/$(*F).pp .deps/$(*F).P; \
 	tr ' ' '\012' < .deps/$(*F).pp \
 	| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
 --- a/src/c/Makefile-linux-ia-64.make.old	2014-07-21 10:48:31.000000000 +0200
 +++ b/src/c/Makefile-linux-ia-64.make	2014-07-21 10:51:37.000000000 +0200
@@ -33,14 +33,14 @@
 	if test ! -d .deps; then mkdir .deps; fi
 wrapper: $(wrapper_SOURCE)
 -	$(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper
 +	$(COMPILE) $(CFLAGS) $(LDFLAGS) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper
 libwrapper.so: $(libwrapper_so_OBJECTS)
 -	${COMPILE} -lm -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
 +	${COMPILE} $(LDFLAGS) -lm -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
 %.o: %.c
 -	@echo '$(COMPILE) -c $<'; \
 -	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
 +	@echo '$(COMPILE) $(CFLAGS) -c $<'; \
 +	$(COMPILE) $(CFLAGS) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
 	@-cp .deps/$(*F).pp .deps/$(*F).P; \
 	tr ' ' '\012' < .deps/$(*F).pp \
 	| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
 --- a/src/c/Makefile-linux-ppc-32.make.old	2014-07-21 10:48:31.000000000 +0200
 +++ b/src/c/Makefile-linux-ppc-32.make	2014-07-21 10:52:05.000000000 +0200
@@ -33,14 +33,14 @@
 	if test ! -d .deps; then mkdir .deps; fi
 wrapper: $(wrapper_SOURCE)
 -	$(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper
 +	$(COMPILE) $(CFLAGS) $(LDFLAGS) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper
 libwrapper.so: $(libwrapper_so_OBJECTS)
 -	${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
 +	${COMPILE} $(LDFLAGS) -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
 %.o: %.c
 -	@echo '$(COMPILE) -c $<'; \
 -	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
 +	@echo '$(COMPILE) $(CFLAGS) -c $<'; \
 +	$(COMPILE) $(CFLAGS) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
 	@-cp .deps/$(*F).pp .deps/$(*F).P; \
 	tr ' ' '\012' < .deps/$(*F).pp \
 	| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
 --- a/src/c/Makefile-linux-ppc-64.make.old	2014-07-21 10:48:31.000000000 +0200
 +++ b/src/c/Makefile-linux-ppc-64.make	2014-07-21 10:52:45.000000000 +0200
@@ -33,14 +33,14 @@
 	if test ! -d .deps; then mkdir .deps; fi
 wrapper: $(wrapper_SOURCE)
 -	$(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper
 +	$(COMPILE) $(CFLAGS) $(LDFLAGS) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper
 libwrapper.so: $(libwrapper_so_OBJECTS)
 -	${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
 +	${COMPILE} $(LDFLAGS) -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
 %.o: %.c
 -	@echo '$(COMPILE) -c $<'; \
 -	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
 +	@echo '$(COMPILE) $(CFLAGS) -c $<'; \
 +	$(COMPILE) $(CFLAGS) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
 	@-cp .deps/$(*F).pp .deps/$(*F).P; \
 	tr ' ' '\012' < .deps/$(*F).pp \
 	| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
 --- a/src/c/Makefile-linux-x86-32.make.old	2014-07-21 10:48:31.000000000 +0200
 +++ b/src/c/Makefile-linux-x86-32.make	2014-07-21 10:53:39.000000000 +0200
@@ -36,17 +36,17 @@
 	if test ! -d .deps; then mkdir .deps; fi
 wrapper: $(wrapper_SOURCE)
 -	$(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper
 +	$(COMPILE) $(CFLAGS) $(LDFLAGS) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper
 testsuite: $(testsuite_SOURCE)
 -	$(COMPILE) -DCUNIT $(testsuite_SOURCE) -lm -pthread -L/usr/local/lib -lncurses -lcunit -o $(TEST)/testsuite
 +	$(COMPILE) $(CFLAGS) $(LDFLAGS) -DCUNIT $(testsuite_SOURCE) -lm -pthread -L/usr/local/lib -lncurses -lcunit -o $(TEST)/testsuite
 libwrapper.so: $(libwrapper_so_OBJECTS)
 -	${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
 +	${COMPILE} $(LDFLAGS) -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
 %.o: %.c
 -	@echo '$(COMPILE) -c $<'; \
 -	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
 +	@echo '$(COMPILE) $(CFLAGS) -c $<'; \
 +	$(COMPILE) $(CFLAGS) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
 	@-cp .deps/$(*F).pp .deps/$(*F).P; \
 	tr ' ' '\012' < .deps/$(*F).pp \
 	| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
 --- a/src/c/Makefile-linux-x86-64.make.old	2014-07-21 10:48:31.000000000 +0200
 +++ b/src/c/Makefile-linux-x86-64.make	2014-07-21 10:54:16.000000000 +0200
@@ -36,17 +36,17 @@
 	if test ! -d .deps; then mkdir .deps; fi
 wrapper: $(wrapper_SOURCE)
 -	$(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper
 +	$(COMPILE) $(CFLAGS) $(LDFLAGS) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper
 testsuite: $(testsuite_SOURCE)
 -	$(COMPILE) -DCUNIT $(testsuite_SOURCE) -lm -pthread -L/usr/local/lib -lncurses -lcunit -o $(TEST)/testsuite
 +	$(COMPILE) $(CFLAGS) $(LDFLAGS) -DCUNIT $(testsuite_SOURCE) -lm -pthread -L/usr/local/lib -lncurses -lcunit -o $(TEST)/testsuite
 libwrapper.so: $(libwrapper_so_OBJECTS)
 -	${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
 +	${COMPILE} $(LDFLAGS) -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
 %.o: %.c 
 -	@echo '$(COMPILE) -c $<'; \
 -	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
 +	@echo '$(COMPILE) $(CFLAGS) -c $<'; \
 +	$(COMPILE) $(CFLAGS) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
 	@-cp .deps/$(*F).pp .deps/$(*F).P; \
 	tr ' ' '\012' < .deps/$(*F).pp \
 	| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
--- a/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch
+++ b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch
@ -1,25 +0,0 @@
 |Original version of this patch by Ralph Sennhauser <sera@gentoo.org>
 |Updated version for 3.5.25 by tomboy64 <tomboy64@sina.cn>
 |
 |Added in 3.5.4, make false default for Gentoo
 |
 |* Add a new wrapper.java.command.resolve property to control whether or not the
 |  Wrapper tries to resolve any symbolic links in the Java command, specified
 |  with the wrapper.java.command property.  Historically, it has always done so,
 |  but some jvm started applications like run-java-tool on Gentoo will fail if
 |  it is run directly as they have a check to make sure it is launched via a
 |  symbolic link.
 |
 --- a/src/c/wrapper.c.old	2014-07-21 09:12:55.000000000 +0200
 +++ b/src/c/wrapper.c	2014-07-21 09:13:22.000000000 +0200
@@ -4908,7 +4908,7 @@
     if (!path) {
         log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_WARN, TEXT("The configured wrapper.java.command could not be found, attempting to launch anyway: %s"), *para);
     } else {
 -        replacePath = getBooleanProperty(properties, TEXT("wrapper.java.command.resolve"), TRUE);
 +        replacePath = getBooleanProperty(properties, TEXT("wrapper.java.command.resolve"), FALSE);
         if (replacePath == TRUE) {
             free(*para);
             *para = malloc((_tcslen(path) + 1) * sizeof(TCHAR));
--- a/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-testsuite.patch
+++ b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-testsuite.patch
@ -1,12 +0,0 @@
 diff -u -r wrapper_3.5.25_src.orig/src/c/Makefile-linux-x86-64.make wrapper_3.5.25_src/src/c/Makefile-linux-x86-64.make
 --- wrapper_3.5.25_src.orig/src/c/Makefile-linux-x86-64.make	2014-09-06 00:06:05.730644375 +0200
 +++ wrapper_3.5.25_src/src/c/Makefile-linux-x86-64.make	2014-09-06 00:06:51.130013387 +0200
@@ -23,7 +23,7 @@
 LIB = ../../lib
 TEST = ../../test
 -all: init wrapper libwrapper.so testsuite
 +all: init wrapper libwrapper.so
 clean:
 	rm -f *.o
--- a/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r2.ebuild
+++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r2.ebuild
@ -1,68 +0,0 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 JAVA_PKG_IUSE="doc source test"
 inherit java-pkg-2 java-ant-2 toolchain-funcs
 MY_PN="wrapper"
 MY_P="${MY_PN}_${PV}_src"
 DESCRIPTION="A wrapper that makes it possible to install a Java Application as daemon"
 HOMEPAGE="http://wrapper.tanukisoftware.org/"
 SRC_URI="http://${MY_PN}.tanukisoftware.org/download/${PV}/${MY_P}.tar.gz"
 LICENSE="tanuki-community"
 SLOT="0"
 KEYWORDS="amd64 ~arm x86"
 RDEPEND="
 	virtual/jre:1.8"
 DEPEND="
 	virtual/jdk:1.8
 	test? (
 		dev-java/ant-junit:0
 	)"
 S="${WORKDIR}/${MY_P}"
 JAVA_ANT_REWRITE_CLASSPATH="true"
 PATCHES=(
 	"${FILESDIR}"/${P}-as-needed.patch
 	"${FILESDIR}"/${P}-gentoo-wrapper-defaults.patch
 	"${FILESDIR}"/${P}-testsuite.patch
 )
 src_prepare() {
 	default
 	cp "${S}/src/c/Makefile-linux-armel-32.make" "${S}/src/c/Makefile-linux-arm-32.make"
 }
 src_compile() {
 	tc-export CC
 	BITS="32"
 	use amd64 && BITS="64"
 	eant -Dbits=${BITS} jar compile-c
 	if use doc; then
 		ejavadoc -d api -sourcepath src/java/ -subpackages org \
 			|| die "javadoc	failed"
 	fi
 }
 src_test() {
 	ANT_TASKS="ant-junit" eant -Dbits="${BITS}" test
 }
 src_install() {
 	java-pkg_dojar lib/wrapper.jar
 	java-pkg_doso lib/libwrapper.so
 	dobin bin/wrapper
 	dodoc README*.txt
 	dodoc doc/revisions.txt
 	use doc && java-pkg_dojavadoc api
 	use source && java-pkg_dosrc src/java/*
 }
--- a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild
+++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://download.tanukisoftware.com/wrapper/${PV}/wrapper_${PV}_src.tar
 LICENSE="tanuki-community"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 RESTRICT="!test? ( test )"
 RDEPEND=">=virtual/jre-1.8:*"
--- a/dev-java/javax-jms-api/javax-jms-api-2.0.3.ebuild
+++ b/dev-java/javax-jms-api/javax-jms-api-2.0.3.ebuild
@ -17,7 +17,7 @@ SRC_URI="https://github.com/jakartaee/messaging/archive/${PV}-RELEASE.tar.gz ->
 LICENSE="EPL-2.0 GPL-2-with-classpath-exception"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
--- a/dev-java/jctools-core/Manifest
+++ b/dev-java/jctools-core/Manifest
@ -1,2 +1 @@
 DIST jctools-3.1.0.tar.gz 4204148 BLAKE2B 88f8f5395470072571de64ee3d696e90c1fbf22a6e9c1424463bfb8b497dd3d47f8d0fcc9a039acec8380ac52a3d445789257d5a1071e49e6963c59d156065e2 SHA512 bf69387732dea043e6e5fa44fe60a5f80ef5ae9d32ebb39ac16353e5bd82502b3b6e5564a8bd9f3b8ad073a95ff984ae55133884ebeea9d0b9a777c488af2a74
 DIST jctools-3.3.0.tar.gz 4214717 BLAKE2B c9c5f5897ebf8bb7ac439b969f372c45b7652517cbc5369c07fe80d11f779eebe7fe5ffb5d93a18fe3df5d9ca9adf3cee7268c8c6ed962fccb4d84f5b0451c4b SHA512 ce212abacca6137a133f7a4e94370442d00bf73794fa7b9ce440631701a9a2fca31c4dda05e2a768fcf28f75e84f2a7f318a936e429c7f4ed20daa7b79d11a4a
--- a/dev-java/jctools-core/jctools-core-3.1.0.ebuild
+++ b/dev-java/jctools-core/jctools-core-3.1.0.ebuild
@ -1,72 +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 pom.xml --download-uri https://github.com/JCTools/JCTools/archive/v3.1.0.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jctools-core-3.1.0.ebuild
 EAPI=8
 JAVA_PKG_IUSE="doc source test"
 MAVEN_ID="org.jctools:jctools-core:3.0.1"
 JAVA_TESTING_FRAMEWORKS="junit-4"
 inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="Java Concurrency Tools Core Library"
 HOMEPAGE="https://jctools.github.io/JCTools/"
 SRC_URI="https://github.com/JCTools/JCTools/archive/v${PV}.tar.gz -> jctools-${PV}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="3"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 # Compile dependencies
 # POM: pom.xml
 # test? com.google.guava:guava-testlib:21.0 -> >=dev-java/guava-testlib-30.1.1:0
 # test? junit:junit:4.12 -> >=dev-java/junit-4.13.2:4
 # test? org.hamcrest:hamcrest-all:1.3 -> !!!artifactId-not-found!!!
 DEPEND=">=virtual/jdk-1.8:*
 	test? (
 		dev-java/guava-testlib:0
 		dev-java/hamcrest-library:1.3
 	)"
 RDEPEND=">=virtual/jre-1.8:*"
 DOCS=( ../{README,RELEASE-NOTES}.md )
 S="${WORKDIR}/JCTools-${PV}/jctools-core"
 JAVA_SRC_DIR="src/main/java"
 JAVA_TEST_GENTOO_CLASSPATH="guava-testlib,hamcrest-library-1.3,junit-4"
 JAVA_TEST_SRC_DIR="src/test/java"
 # Using the defaults of java-pkg-simple would skip more than half the number of tests.
 src_test() {
 	# These tests would fail and are not run by "mvn test".
 	# "org.jctools.queues.MpqSanityTest"
 	# "org.jctools.queues.QueueSanityTest"
 	# "org.jctools.queues.ScQueueRemoveTest"
 	# "org.jctools.util.TestUtil"
 	pushd src/test/java || die
 		local JAVA_TEST_RUN_ONLY=$(find * \
 			\( -name "*Test*.java" \
 			-o -name "nbsi_tester.java" \
 			-o -name "nbhs_tester.java" \)\
 			! -name "MpqSanityTest.java" \
 			! -name "QueueSanityTest.java" \
 			! -name "ScQueueRemoveTest.java" \
 			! -name "TestUtil.java" \
 			)
 	popd
 	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
 	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
 	java-pkg-simple_src_test
 }
 src_install() {
 	default # https://bugs.gentoo.org/789582
 	java-pkg-simple_src_install
 }
--- a/dev-java/jctools-core/jctools-core-3.3.0.ebuild
+++ b/dev-java/jctools-core/jctools-core-3.3.0.ebuild
@ -18,7 +18,7 @@ SRC_URI="https://github.com/JCTools/JCTools/archive/v${PV}.tar.gz -> jctools-${P
 LICENSE="Apache-2.0"
 SLOT="3"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 DEPEND=">=virtual/jdk-1.8:*
 	test? (
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-42.4.1.ebuild
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-42.4.1.ebuild
@ -19,7 +19,7 @@ SRC_URI="https://jdbc.postgresql.org/download/postgresql-jdbc-${PV}.src.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ppc64 ~x86"
 # Common dependencies
 # POM: pom.xml
--- a/dev-java/log4j-12-api/Manifest
+++ b/dev-java/log4j-12-api/Manifest
@ -1,2 +1 @@
 DIST apache-log4j-2.17.2-src.tar.gz 11680029 BLAKE2B 19baf31f4e00f0572fad810177d52bf3376f73a47a70ea251ce60a198f4bb322e6e97691f23b1ebb78e29f4eb6f0a36093bd2c6cb558486841d569b601d11015 SHA512 ae09c3af8662fcf5fdc4e7c7dd298e91ec85e90272b8247ce4ee60c7d4ecd48a4cd294fc9e51c0b307fbb58c677e61e31527eab4085debcc9b40919af0920176
 DIST apache-log4j-2.18.0-src.tar.gz 11748446 BLAKE2B c11a5c7cb5be77fd27504b93962c5493f92475e759a575c5536b674a7e8116d4f9840bd2eb3e95156c257ff046f0e3ec437960b0f5ca01f2ddceb509c49aac1f SHA512 104eb8dbd35d3166a0d49190b2e3fdf981b864d21ed47d84f16acd417b943a41fbafa445b2c38ae8cdc494da6af8746ecc3a0db4795f45ce427344659cffae7b
--- a/dev-java/log4j-12-api/log4j-12-api-2.17.2.ebuild
+++ b/dev-java/log4j-12-api/log4j-12-api-2.17.2.ebuild
@ -1,85 +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 log4j-1.2-api/pom.xml --download-uri mirror://apache/logging/log4j/2.17.2/apache-log4j-2.17.2-src.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild log4j-12-api-2.17.2.ebuild
 EAPI=8
 JAVA_PKG_IUSE="doc source test"
 MAVEN_ID="org.apache.logging.log4j:log4j-1.2-api:2.17.2"
 JAVA_TESTING_FRAMEWORKS="junit-vintage junit-jupiter"
 inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="The Apache Log4j 1.x Compatibility API"
 HOMEPAGE="https://logging.apache.org/log4j/2.x/"
 SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="2"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 # We don't have junit-vintage and junit-jupiter
 RESTRICT="test"
 # Common dependencies
 # POM: log4j-1.2-api/pom.xml
 # org.apache.logging.log4j:log4j-api:2.17.2 -> >=dev-java/log4j-api-2.17.2:2
 # org.apache.logging.log4j:log4j-core:2.17.2 -> >=dev-java/log4j-core-2.17.2:2
 CP_DEPEND="
 	~dev-java/log4j-api-${PV}:2
 	~dev-java/log4j-core-${PV}:2
 "
 # Compile dependencies
 # POM: log4j-1.2-api/pom.xml
 # org.jboss.spec.javax.jms:jboss-jms-api_1.1_spec:1.0.1.Final -> >=dev-java/jboss-jms-api-1.0.1:1.1
 # POM: log4j-1.2-api/pom.xml
 # test? com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.1 -> >=dev-java/jackson-dataformat-xml-2.13.2:0
 # test? commons-io:commons-io:2.11.0 -> >=dev-java/commons-io-2.11.0:1
 # test? org.apache.commons:commons-lang3:3.12.0 -> >=dev-java/commons-lang-3.12.0:3.6
 # test? org.apache.felix:org.apache.felix.framework:5.6.12 -> !!!groupId-not-found!!!
 # test? org.apache.logging.log4j:log4j-api:2.17.2 -> >=dev-java/log4j-api-2.17.2:2
 # test? org.apache.logging.log4j:log4j-core:2.17.2 -> >=dev-java/log4j-core-2.17.2:2
 # test? org.apache.velocity:velocity:1.7 -> !!!artifactId-not-found!!!
 # test? org.eclipse.tycho:org.eclipse.osgi:3.13.0.v20180226-1711 -> !!!groupId-not-found!!!
 # test? org.junit.jupiter:junit-jupiter-engine:5.8.2 -> !!!groupId-not-found!!!
 # test? org.junit.vintage:junit-vintage-engine:5.8.2 -> !!!groupId-not-found!!!
 # test? oro:oro:2.0.8 -> >=dev-java/jakarta-oro-2.0.8:2.0
 DEPEND="${CP_DEPEND}
 	>=virtual/jdk-1.8:*
 	dev-java/jboss-jms-api:1.1"
 #	test? (
 #		!!!artifactId-not-found!!!
 #		!!!groupId-not-found!!!
 #		>=dev-java/commons-io-2.11.0:1
 #		>=dev-java/jackson-dataformat-xml-2.13.0:0
 #		~dev-java/log4j-api-${PV}:2
 #		~dev-java/log4j-core-${PV}:2
 #	)
 #"
 RDEPEND="${CP_DEPEND}
 	>=virtual/jre-1.8:*"
 DOCS=( {CONTRIBUTING,README,RELEASE-NOTES,SECURITY}.md )
 S="${WORKDIR}/apache-log4j-${PV}-src"
 JAVA_CLASSPATH_EXTRA="jboss-jms-api-1.1"
 JAVA_SRC_DIR="log4j-1.2-api/src/main/java"
 JAVA_RESOURCE_DIRS="log4j-1.2-api/src/main/resources"
 #	JAVA_TEST_GENTOO_CLASSPATH="jackson-dataformat-xml,commons-io-1,!!!groupId-not-found!!!,log4j-api-2,log4j-core-2,!!!artifactId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!"
 #	JAVA_TEST_SRC_DIR="log4j-1.2-api/src/test/java"
 #	JAVA_TEST_RESOURCE_DIRS=(
 #		"log4j-1.2-api/src/test/resources"
 #	)
 src_install() {
 	default # https://bugs.gentoo.org/789582
 	java-pkg-simple_src_install
 }
--- a/dev-java/log4j-12-api/log4j-12-api-2.18.0.ebuild
+++ b/dev-java/log4j-12-api/log4j-12-api-2.18.0.ebuild
@ -18,7 +18,7 @@ SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 # We don't have junit-vintage and junit-jupiter
 RESTRICT="test"
--- a/dev-java/log4j-api/Manifest
+++ b/dev-java/log4j-api/Manifest
@ -1,2 +1 @@
 DIST apache-log4j-2.17.2-src.tar.gz 11680029 BLAKE2B 19baf31f4e00f0572fad810177d52bf3376f73a47a70ea251ce60a198f4bb322e6e97691f23b1ebb78e29f4eb6f0a36093bd2c6cb558486841d569b601d11015 SHA512 ae09c3af8662fcf5fdc4e7c7dd298e91ec85e90272b8247ce4ee60c7d4ecd48a4cd294fc9e51c0b307fbb58c677e61e31527eab4085debcc9b40919af0920176
 DIST apache-log4j-2.18.0-src.tar.gz 11748446 BLAKE2B c11a5c7cb5be77fd27504b93962c5493f92475e759a575c5536b674a7e8116d4f9840bd2eb3e95156c257ff046f0e3ec437960b0f5ca01f2ddceb509c49aac1f SHA512 104eb8dbd35d3166a0d49190b2e3fdf981b864d21ed47d84f16acd417b943a41fbafa445b2c38ae8cdc494da6af8746ecc3a0db4795f45ce427344659cffae7b
--- a/dev-java/log4j-api/log4j-api-2.17.2.ebuild
+++ b/dev-java/log4j-api/log4j-api-2.17.2.ebuild
@ -1,72 +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 log4j-api/pom.xml --download-uri mirror://apache/logging/log4j/2.17.2/apache-log4j-2.17.2-src.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild log4j-api-2.17.2.ebuild
 EAPI=8
 JAVA_PKG_IUSE="doc source test"
 MAVEN_ID="org.apache.logging.log4j:log4j-api:2.17.2"
 JAVA_TESTING_FRAMEWORKS="junit-vintage junit-jupiter"
 inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="The Apache Log4j API"
 HOMEPAGE="https://logging.apache.org/log4j/2.x/"
 SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="2"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 # junit-{jupiter,vintage} is not available in ::gentoo
 RESTRICT="test"
 # Compile dependencies
 # POM: ${PN}/pom.xml
 # org.osgi:org.osgi.core:4.3.1 -> >=dev-java/osgi-core-api-5.0.0:0
 # POM: ${PN}/pom.xml
 # test? com.fasterxml.jackson.core:jackson-core:2.13.1 -> >=dev-java/jackson-core-2.13.2:0
 # test? com.fasterxml.jackson.core:jackson-databind:2.13.1 -> >=dev-java/jackson-databind-2.13.2:0
 # test? org.apache.commons:commons-lang3:3.12.0 -> >=dev-java/commons-lang-3.12.0:3.6
 # test? org.apache.felix:org.apache.felix.framework:5.6.12 -> !!!groupId-not-found!!!
 # test? org.apache.maven:maven-core:3.8.4 -> !!!groupId-not-found!!!
 # test? org.assertj:assertj-core:3.22.0 -> !!!suitable-mavenVersion-not-found!!!
 # test? org.eclipse.tycho:org.eclipse.osgi:3.13.0.v20180226-1711 -> !!!groupId-not-found!!!
 # test? org.junit.jupiter:junit-jupiter-engine:5.8.2 -> !!!groupId-not-found!!!
 # test? org.junit.jupiter:junit-jupiter-migrationsupport:5.8.2 -> !!!groupId-not-found!!!
 # test? org.junit.jupiter:junit-jupiter-params:5.8.2 -> !!!groupId-not-found!!!
 # test? org.junit.vintage:junit-vintage-engine:5.8.2 -> !!!groupId-not-found!!!
 DEPEND=">=virtual/jdk-1.8:*
 	dev-java/osgi-core-api:0"
 #	test? (
 #		!!!groupId-not-found!!!
 #		!!!suitable-mavenVersion-not-found!!!
 #		>=dev-java/commons-lang-3.12.0:3.6
 #		>=dev-java/jackson-core-2.13.2:0
 #		>=dev-java/jackson-databind-2.13.2:0
 #	)
 #"
 RDEPEND=">=virtual/jre-1.8:*"
 DOCS=( {CONTRIBUTING,README,RELEASE-NOTES,SECURITY}.md )
 S="${WORKDIR}/apache-log4j-${PV}-src"
 JAVA_CLASSPATH_EXTRA="osgi-core-api"
 JAVA_SRC_DIR="${PN}/src/main/java"
 JAVA_RESOURCE_DIRS="${PN}/src/main/resources"
 #	JAVA_TEST_GENTOO_CLASSPATH="jackson-core,jackson-databind,commons-lang-3.6,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!suitable-mavenVersion-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!"
 #	JAVA_TEST_SRC_DIR="${PN}/src/test/java"
 #	JAVA_TEST_RESOURCE_DIRS=(
 #		"${PN}/src/test/resources"
 #	)
 src_install() {
 	default # https://bugs.gentoo.org/789582
 	java-pkg-simple_src_install
 }
--- a/dev-java/log4j-api/log4j-api-2.18.0.ebuild
+++ b/dev-java/log4j-api/log4j-api-2.18.0.ebuild
@ -18,7 +18,7 @@ SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 # junit-{jupiter,vintage} is not available in ::gentoo
 RESTRICT="test"
--- a/dev-java/log4j-core/Manifest
+++ b/dev-java/log4j-core/Manifest
@ -1,2 +1 @@
 DIST apache-log4j-2.17.2-src.tar.gz 11680029 BLAKE2B 19baf31f4e00f0572fad810177d52bf3376f73a47a70ea251ce60a198f4bb322e6e97691f23b1ebb78e29f4eb6f0a36093bd2c6cb558486841d569b601d11015 SHA512 ae09c3af8662fcf5fdc4e7c7dd298e91ec85e90272b8247ce4ee60c7d4ecd48a4cd294fc9e51c0b307fbb58c677e61e31527eab4085debcc9b40919af0920176
 DIST apache-log4j-2.18.0-src.tar.gz 11748446 BLAKE2B c11a5c7cb5be77fd27504b93962c5493f92475e759a575c5536b674a7e8116d4f9840bd2eb3e95156c257ff046f0e3ec437960b0f5ca01f2ddceb509c49aac1f SHA512 104eb8dbd35d3166a0d49190b2e3fdf981b864d21ed47d84f16acd417b943a41fbafa445b2c38ae8cdc494da6af8746ecc3a0db4795f45ce427344659cffae7b
--- a/dev-java/log4j-core/log4j-core-2.17.2-r1.ebuild
+++ b/dev-java/log4j-core/log4j-core-2.17.2-r1.ebuild
@ -1,174 +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 log4j-core/pom.xml --download-uri mirror://apache/logging/log4j/2.17.2/apache-log4j-2.17.2-src.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild log4j-core-2.17.2.ebuild
 EAPI=8
 JAVA_PKG_IUSE="doc source test"
 MAVEN_ID="org.apache.logging.log4j:log4j-core:2.17.2"
 # JAVA_TESTING_FRAMEWORKS="junit-vintage junit-jupiter"
 inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="The Apache Log4j Implementation"
 HOMEPAGE="https://logging.apache.org/log4j/2.x/"
 SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="2"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 # We don't have junit-vintage and junit-jupiter
 RESTRICT="test"
 # Common dependencies
 # POM: ${PN}/pom.xml
 # com.conversantmedia:disruptor:1.2.15 -> >=dev-java/conversant-disruptor-1.2.19:0
 # com.fasterxml.jackson.core:jackson-core:2.13.1 -> >=dev-java/jackson-core-2.13.2:0
 # com.fasterxml.jackson.core:jackson-databind:2.13.1 -> >=dev-java/jackson-databind-2.13.2:0
 # com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.1 -> >=dev-java/jackson-dataformat-xml-2.13.2:0
 # com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.1 -> >=dev-java/jackson-dataformat-yaml-2.13.2:0
 # com.fasterxml.woodstox:woodstox-core:6.2.8 -> >=dev-java/woodstox-core-6.2.8:0
 # com.lmax:disruptor:3.4.4 -> >=dev-java/lmax-disruptor-3.4.4:0
 # com.sun.mail:javax.mail:1.6.2 -> !!!suitable-mavenVersion-not-found!!!
 # org.apache.commons:commons-compress:1.21 -> >=dev-java/commons-compress-1.21:0
 # org.apache.commons:commons-csv:1.9.0 -> >=dev-java/commons-csv-1.9.0:0
 # org.apache.kafka:kafka-clients:1.1.1 -> >=dev-java/kafka-clients-1.1.1:0
 # org.apache.logging.log4j:log4j-api:2.17.2 -> >=dev-java/log4j-api-2.17.2:2
 # org.fusesource.jansi:jansi:2.4.0 -> >=dev-java/jansi-2.4.0:2
 # org.jctools:jctools-core:1.2.1 -> >=dev-java/jctools-core-2.0.2:0
 # org.slf4j:slf4j-api:1.7.35 -> >=dev-java/slf4j-api-1.7.36:0
 # org.zeromq:jeromq:0.4.3 -> >=dev-java/jeromq-0.5.2:0
 CP_DEPEND="
 	dev-java/commons-compress:0
 	dev-java/commons-csv:0
 	dev-java/conversant-disruptor:0
 	dev-java/jackson-core:0
 	dev-java/jackson-databind:0
 	dev-java/jackson-dataformat-xml:0
 	dev-java/jackson-dataformat-yaml:0
 	dev-java/jakarta-activation-api:1
 	dev-java/jansi:2
 	dev-java/javax-mail:0
 	dev-java/jctools-core:3
 	dev-java/jeromq:0
 	dev-java/kafka-clients:0
 	dev-java/lmax-disruptor:0
 	~dev-java/log4j-api-${PV}:2
 	dev-java/slf4j-api:0
 	dev-java/woodstox-core:0
 "
 # Compile dependencies
 # POM: ${PN}/pom.xml
 # org.jboss.spec.javax.jms:jboss-jms-api_1.1_spec:1.0.1.Final -> >=dev-java/jboss-jms-api-1.0.1:1.1
 # org.osgi:org.osgi.core:4.3.1 -> >=dev-java/osgi-core-api-5.0.0:0
 # POM: ${PN}/pom.xml
 # test? ch.qos.logback:logback-classic:1.2.3 -> !!!groupId-not-found!!!
 # test? ch.qos.logback:logback-core:1.2.3 -> !!!groupId-not-found!!!
 # test? com.github.tomakehurst:wiremock:2.26.3 -> !!!groupId-not-found!!!
 # test? com.google.code.java-allocation-instrumenter:java-allocation-instrumenter:3.3.0 -> !!!groupId-not-found!!!
 # test? com.h2database:h2:1.4.200 -> !!!groupId-not-found!!!
 # test? commons-codec:commons-codec:1.15 -> >=dev-java/commons-codec-1.15:0
 # test? commons-io:commons-io:2.11.0 -> >=dev-java/commons-io-2.11.0:1
 # test? commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
 # test? log4j:log4j:1.2.17 -> >=dev-java/log4j-1.2.17:0
 # test? net.javacrumbs.json-unit:json-unit:2.32.0 -> !!!groupId-not-found!!!
 # test? org.apache-extras.beanshell:bsh:2.0b6 -> >=dev-java/bsh-2.0_beta6:0
 # test? org.apache.activemq:activemq-broker:5.16.4 -> !!!groupId-not-found!!!
 # test? org.apache.commons:commons-lang3:3.12.0 -> >=dev-java/commons-lang-3.12.0:3.6
 # test? org.apache.felix:org.apache.felix.framework:5.6.12 -> !!!groupId-not-found!!!
 # test? org.apache.logging.log4j:log4j-api:2.17.2 -> >=dev-java/log4j-api-2.17.2:2
 # test? org.apache.maven:maven-core:3.8.4 -> !!!groupId-not-found!!!
 # test? org.awaitility:awaitility:4.1.1 -> !!!groupId-not-found!!!
 # test? org.codehaus.groovy:groovy-dateutil:3.0.9 -> !!!groupId-not-found!!!
 # test? org.codehaus.groovy:groovy-jsr223:3.0.9 -> !!!groupId-not-found!!!
 # test? org.codehaus.plexus:plexus-utils:3.4.1 -> !!!groupId-not-found!!!
 # test? org.eclipse.tycho:org.eclipse.osgi:3.13.0.v20180226-1711 -> !!!groupId-not-found!!!
 # test? org.hamcrest:hamcrest:2.2 -> !!!artifactId-not-found!!!
 # test? org.hdrhistogram:HdrHistogram:2.1.12 -> !!!groupId-not-found!!!
 # test? org.hsqldb:hsqldb:2.5.2 -> !!!groupId-not-found!!!
 # test? org.jmdns:jmdns:3.5.7 -> !!!groupId-not-found!!!
 # test? org.junit-pioneer:junit-pioneer:1.6.1 -> !!!groupId-not-found!!!
 # test? org.junit.jupiter:junit-jupiter-engine:5.8.2 -> !!!groupId-not-found!!!
 # test? org.junit.jupiter:junit-jupiter-params:5.8.2 -> !!!groupId-not-found!!!
 # test? org.junit.platform:junit-platform-commons:1.8.2 -> !!!groupId-not-found!!!
 # test? org.junit.vintage:junit-vintage-engine:5.8.2 -> !!!groupId-not-found!!!
 # test? org.mockito:mockito-core:4.3.1 -> !!!suitable-mavenVersion-not-found!!!
 # test? org.mockito:mockito-junit-jupiter:4.3.1 -> !!!artifactId-not-found!!!
 # test? org.slf4j:slf4j-ext:1.7.35 -> >=dev-java/slf4j-ext-1.7.36:0
 # test? org.springframework:spring-test:5.3.15 -> !!!groupId-not-found!!!
 # test? org.tukaani:xz:1.9 -> >=dev-java/xz-java-1.9:0
 # test? org.xmlunit:xmlunit-core:2.9.0 -> !!!groupId-not-found!!!
 # test? org.xmlunit:xmlunit-matchers:2.9.0 -> !!!groupId-not-found!!!
 # test? org.zapodot:embedded-ldap-junit:0.8.1 -> !!!groupId-not-found!!!
 DEPEND="${CP_DEPEND}
 	dev-java/jboss-jms-api:1.1
 	dev-java/osgi-core-api:0
 	>=virtual/jdk-1.8:*"
 #	test? (
 #		!!!artifactId-not-found!!!
 #		!!!groupId-not-found!!!
 #		!!!suitable-mavenVersion-not-found!!!
 #		>=dev-java/bsh-2.0_beta6:0
 #		>=dev-java/commons-codec-1.15:0
 #		>=dev-java/commons-io-2.11.0:1
 #		>=dev-java/commons-lang-3.12.0:3.6
 #		>=dev-java/commons-logging-1.2:0
 #		>=dev-java/log4j-1.2.17:0
 #		~dev-java/log4j-api-${PV}:2
 #		>=dev-java/slf4j-ext-1.7.36:0
 #		>=dev-java/xz-java-1.9:0
 #	)
 #"
 RDEPEND="
 	>=virtual/jre-1.8:*
 	${CP_DEPEND}"
 DOCS=( {CONTRIBUTING,README,RELEASE-NOTES,SECURITY}.md )
 S="${WORKDIR}/apache-log4j-${PV}-src"
 JAVA_CLASSPATH_EXTRA="jboss-jms-api-1.1,osgi-core-api"
 JAVA_SRC_DIR="${PN}/src/main/java"
 JAVA_RESOURCE_DIRS="${PN}/src/main/resources"
 #	JAVA_TEST_GENTOO_CLASSPATH="!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,commons-codec,commons-io-1,commons-logging,log4j,!!!groupId-not-found!!!,bsh,!!!groupId-not-found!!!,commons-lang-3.6,!!!groupId-not-found!!!,log4j-api-2,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!artifactId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!suitable-mavenVersion-not-found!!!,!!!artifactId-not-found!!!,!!!artifactId-not-found!!!,!!!groupId-not-found!!!,xz-java,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!"
 #	JAVA_TEST_SRC_DIR="${PN}/src/test/java"
 #	JAVA_TEST_RESOURCE_DIRS=(
 #		"${PN}/src/test/resources"
 #	)
 src_compile() {
 	java-pkg-simple_src_compile
 	# Process the @Plugin annotation used on Log4j 2 built-in plugins
 	# to generate a serialized plugin listing file
 	# https://logging.apache.org/log4j/2.x/manual/plugins.html
 	local processor="org.apache.logging.log4j.core.config.plugins.processor.PluginProcessor"
 	local classes="target/classes"
 	local classpath="${JAVA_JAR_FILENAME}:$(\
 		java-pkg_getjars --build-only --with-dependencies \
 		"${JAVA_GENTOO_CLASSPATH},${JAVA_CLASSPATH_EXTRA}")"
 	# Just in case java-pkg-simple.eclass changes the path in the future
 	mkdir -p "${classes}" || die "Failed to create directory for classes"
 	local sources_list_file="${T}/sources.lst"
 	find "${JAVA_SRC_DIR}" -type f -name "*.java" > "${sources_list_file}" || die
 	ejavac -d "${classes}" -cp "${classpath}" \
 		-proc:only -processor "${processor}" \
 		@"${sources_list_file}"
 	# Update the JAR to include the serialized plugin listing file
 	local jar="$(java-config -j)"
 	"${jar}" -uf "${JAVA_JAR_FILENAME}" -C "${classes}" . ||
 		die "Failed to update JAR"
 }
 src_install() {
 	default # https://bugs.gentoo.org/789582
 	java-pkg-simple_src_install
 }
--- a/dev-java/log4j-core/log4j-core-2.18.0.ebuild
+++ b/dev-java/log4j-core/log4j-core-2.18.0.ebuild
@ -18,7 +18,7 @@ SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 # We don't have junit-vintage and junit-jupiter
 RESTRICT="test"
--- a/dev-java/osgi-annotation/osgi-annotation-8.1.0.ebuild
+++ b/dev-java/osgi-annotation/osgi-annotation-8.1.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"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 RDEPEND=">=virtual/jre-1.8:*"
 DEPEND=">=virtual/jdk-1.8:*"
--- a/dev-java/osgi-core/osgi-core-8.0.0.ebuild
+++ b/dev-java/osgi-core/osgi-core-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"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 RDEPEND=">=virtual/jre-1.8:*"
--- a/dev-java/saslprep/saslprep-1.1-r1.ebuild
+++ b/dev-java/saslprep/saslprep-1.1-r1.ebuild
@ -16,8 +16,8 @@ LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="amd64 ppc64 x86"
 CP_DEPEND="dev-java/stringprep:0"
 DEPEND=">=virtual/jdk-1.8:*
-	dev-java/stringprep:0"
+	${CP_DEPEND}"
-RDEPEND=">=virtual/jre-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*
-
+	${CP_DEPEND}"
 JAVA_CLASSPATH_EXTRA="stringprep"
--- a/dev-java/xsdlib/Manifest
+++ b/dev-java/xsdlib/Manifest
@ -1,2 +1 @@
 DIST xsdlib-2013.6.1-sources.jar 274740 BLAKE2B 356c3e6005c26a1b63ea016a523140d93bb8c6a4c1952d60f5a881c92dd013e1691451be96e31b7c96c48e1f182e0224bceb712e230bb008ad97732a8e9ffdb6 SHA512 a4e308fae6a1116158ddbebfad0570f6cf1f840acb72de8bdd9414b363da78edf6aea2349f4ac7511b774a494f9e4c17c309f86aefc39b30421a1c86945302b0
 DIST xsdlib.20090415.zip 914126 BLAKE2B 7f8dc45c590606ece1775d08634f87bb7cd392c69c66204073d4867f925cf7159fe14b43cde6d59a72da90ab284d9a3adc0c4d6aa117ea5143eff8efc5bf6534 SHA512 479b20bb24c32f7a8bf548689cb6d7efc99e36d7f887d9e33b34b2e4707d74149ae1e312f7166a90acbd44422248729d6158a55d710616b656eb628cafc1e3f2
--- a/Show More
+++ b/Show More
`@ -1,2 +1 @@`
	`DIST hexedit-1.5.tar.gz 30544 BLAKE2B d7292a70819826fddd63f99ee9d05073b8a59f51477390af91151146ee1f5a75333560829f0351fa9e158ef932c07a3582a3e822f42e645917a7fa321055d14e SHA512 9d8e5c8c0cda0af17ffeaf528e3dacd7fc2878dfc0755cb055dae5c56f05c961353c1d1723b05897314b49a44a6eb96de5d3a599c6b29967425507eea7cc7ca5`
	`DIST hexedit-1.6.tar.gz 31085 BLAKE2B e576de6aaed35449adbc430c95e8ba3a8ccfba587ef5c4d347d95b84c9764cb644323af23d46ff16429b93e0348c8d310afbad482219aa1b2c1b582332bd06fe SHA512 9783406f253a67fe048ec12306df1a601b7ba92cd7a0399ad2f103aed5a3164cd21ad7c1d547a4c55192cfb7da2b2517152015a4c3db402a9217548b435f602d`	`DIST hexedit-1.6.tar.gz 31085 BLAKE2B e576de6aaed35449adbc430c95e8ba3a8ccfba587ef5c4d347d95b84c9764cb644323af23d46ff16429b93e0348c8d310afbad482219aa1b2c1b582332bd06fe SHA512 9783406f253a67fe048ec12306df1a601b7ba92cd7a0399ad2f103aed5a3164cd21ad7c1d547a4c55192cfb7da2b2517152015a4c3db402a9217548b435f602d`
`@ -1,2 +1 @@`
	`DIST jakartaee-migration-1.0.0-sources.tar.gz 35116 BLAKE2B 98b587e5a51e8f3540d6f4570c60ffa5516801709e41260ac09f7fcabc9e96a3b9067e8eba6c5975c62e3c56585a1f334a21acc15627666e1616ced6f625c56f SHA512 f0c0dc5da4d3c5d4bae8fd4c3db349cb45b7c8d82ca0bb12f3c995e92d4b0893db111ab33ce812299d66904827adc91b22c49381625760fc05c1b10de76faa0c`
	`DIST jakartaee-migration-1.0.1-sources.tar.gz 35763 BLAKE2B 9e739668a7ebd65396960cd2447ecf2bc114cb85a2c554a17cb8478bef13f70f2fed26cc96553a22e7279dde698e1c094ca4dc7a8695ff9f82903ebe8badbd69 SHA512 6caaadfe5dcb21a859f2e401c039832b2774d8876ac724c3159b28c80a1153f7cd1c6706ba29a38d5f748cd2e55a85bd9bfecfb3a405f86aa85637ff3ca3c5f7`	`DIST jakartaee-migration-1.0.1-sources.tar.gz 35763 BLAKE2B 9e739668a7ebd65396960cd2447ecf2bc114cb85a2c554a17cb8478bef13f70f2fed26cc96553a22e7279dde698e1c094ca4dc7a8695ff9f82903ebe8badbd69 SHA512 6caaadfe5dcb21a859f2e401c039832b2774d8876ac724c3159b28c80a1153f7cd1c6706ba29a38d5f748cd2e55a85bd9bfecfb3a405f86aa85637ff3ca3c5f7`
`@ -1,2 +1 @@`
	`DIST wrapper_3.5.25_src.tar.gz 556678 BLAKE2B bead95eb2feebe0c22f8c66ca948185c320a979e498fb5156de576d443ba6e3375efb6244a66db6af101fa7dc459d983b51631fc237ad4578505be47059cf2c7 SHA512 4ce8ab5dc7acc4d78e7b902a61bb1e3785b5455f81438aa61a877107647e88ade595075ff0b8d5db0ff2b33bb94d70c2b1331561d6d282e497998eea9494c6f4`
	`DIST wrapper_3.5.50_src.tar.gz 779253 BLAKE2B 64863e408c2147014946f869bbd98775d1d23d4cd63ef562167f40191febf87cc72697a55fe2ec6a5d085f3df4897cc4485f4ed88a3ee3a7f7930215448972f7 SHA512 403deec1bcc70a93ce0b0749bf2d5bc27a4a540d07785bc3ac83b38257cc5e8247a784f646770c96ac318f22d30c463dafb2f002720041b93443b292d6669c09`	`DIST wrapper_3.5.50_src.tar.gz 779253 BLAKE2B 64863e408c2147014946f869bbd98775d1d23d4cd63ef562167f40191febf87cc72697a55fe2ec6a5d085f3df4897cc4485f4ed88a3ee3a7f7930215448972f7 SHA512 403deec1bcc70a93ce0b0749bf2d5bc27a4a540d07785bc3ac83b38257cc5e8247a784f646770c96ac318f22d30c463dafb2f002720041b93443b292d6669c09`
`@ -1,2 +1 @@`
	`DIST jctools-3.1.0.tar.gz 4204148 BLAKE2B 88f8f5395470072571de64ee3d696e90c1fbf22a6e9c1424463bfb8b497dd3d47f8d0fcc9a039acec8380ac52a3d445789257d5a1071e49e6963c59d156065e2 SHA512 bf69387732dea043e6e5fa44fe60a5f80ef5ae9d32ebb39ac16353e5bd82502b3b6e5564a8bd9f3b8ad073a95ff984ae55133884ebeea9d0b9a777c488af2a74`
	`DIST jctools-3.3.0.tar.gz 4214717 BLAKE2B c9c5f5897ebf8bb7ac439b969f372c45b7652517cbc5369c07fe80d11f779eebe7fe5ffb5d93a18fe3df5d9ca9adf3cee7268c8c6ed962fccb4d84f5b0451c4b SHA512 ce212abacca6137a133f7a4e94370442d00bf73794fa7b9ce440631701a9a2fca31c4dda05e2a768fcf28f75e84f2a7f318a936e429c7f4ed20daa7b79d11a4a`	`DIST jctools-3.3.0.tar.gz 4214717 BLAKE2B c9c5f5897ebf8bb7ac439b969f372c45b7652517cbc5369c07fe80d11f779eebe7fe5ffb5d93a18fe3df5d9ca9adf3cee7268c8c6ed962fccb4d84f5b0451c4b SHA512 ce212abacca6137a133f7a4e94370442d00bf73794fa7b9ce440631701a9a2fca31c4dda05e2a768fcf28f75e84f2a7f318a936e429c7f4ed20daa7b79d11a4a`
`@ -1,2 +1 @@`
	`DIST apache-log4j-2.17.2-src.tar.gz 11680029 BLAKE2B 19baf31f4e00f0572fad810177d52bf3376f73a47a70ea251ce60a198f4bb322e6e97691f23b1ebb78e29f4eb6f0a36093bd2c6cb558486841d569b601d11015 SHA512 ae09c3af8662fcf5fdc4e7c7dd298e91ec85e90272b8247ce4ee60c7d4ecd48a4cd294fc9e51c0b307fbb58c677e61e31527eab4085debcc9b40919af0920176`
	`DIST apache-log4j-2.18.0-src.tar.gz 11748446 BLAKE2B c11a5c7cb5be77fd27504b93962c5493f92475e759a575c5536b674a7e8116d4f9840bd2eb3e95156c257ff046f0e3ec437960b0f5ca01f2ddceb509c49aac1f SHA512 104eb8dbd35d3166a0d49190b2e3fdf981b864d21ed47d84f16acd417b943a41fbafa445b2c38ae8cdc494da6af8746ecc3a0db4795f45ce427344659cffae7b`	`DIST apache-log4j-2.18.0-src.tar.gz 11748446 BLAKE2B c11a5c7cb5be77fd27504b93962c5493f92475e759a575c5536b674a7e8116d4f9840bd2eb3e95156c257ff046f0e3ec437960b0f5ca01f2ddceb509c49aac1f SHA512 104eb8dbd35d3166a0d49190b2e3fdf981b864d21ed47d84f16acd417b943a41fbafa445b2c38ae8cdc494da6af8746ecc3a0db4795f45ce427344659cffae7b`
`@ -1,2 +1 @@`
	`DIST xsdlib-2013.6.1-sources.jar 274740 BLAKE2B 356c3e6005c26a1b63ea016a523140d93bb8c6a4c1952d60f5a881c92dd013e1691451be96e31b7c96c48e1f182e0224bceb712e230bb008ad97732a8e9ffdb6 SHA512 a4e308fae6a1116158ddbebfad0570f6cf1f840acb72de8bdd9414b363da78edf6aea2349f4ac7511b774a494f9e4c17c309f86aefc39b30421a1c86945302b0`	`DIST xsdlib-2013.6.1-sources.jar 274740 BLAKE2B 356c3e6005c26a1b63ea016a523140d93bb8c6a4c1952d60f5a881c92dd013e1691451be96e31b7c96c48e1f182e0224bceb712e230bb008ad97732a8e9ffdb6 SHA512 a4e308fae6a1116158ddbebfad0570f6cf1f840acb72de8bdd9414b363da78edf6aea2349f4ac7511b774a494f9e4c17c309f86aefc39b30421a1c86945302b0`
	`DIST xsdlib.20090415.zip 914126 BLAKE2B 7f8dc45c590606ece1775d08634f87bb7cd392c69c66204073d4867f925cf7159fe14b43cde6d59a72da90ab284d9a3adc0c4d6aa117ea5143eff8efc5bf6534 SHA512 479b20bb24c32f7a8bf548689cb6d7efc99e36d7f887d9e33b34b2e4707d74149ae1e312f7166a90acbd44422248729d6158a55d710616b656eb628cafc1e3f2`