Sync with portage [Wed Feb 2 14:00:10 MSK 2022].

2 years ago · 83a6748cdb
parent 23f55ece81
commit 83a6748cdb
6262 changed files with 13469 additions and 8466 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/ansible-base/Manifest
+++ b/app-admin/ansible-base/Manifest
@ -1,3 +1,4 @@
 DIST ansible-core-2.11.6.tar.gz 6999232 BLAKE2B 5105928881297226e982e42c8027a370ad31869d92ca87d338cdb6e72504a22cf3fe7843921905599c7126c840197fb7799a72c261a007437a437b85c4a65c68 SHA512 d14686afb7b2802be3bca3baf6f3840d33f7994b7c48fcb4d42f871e13e4eb54ffef413e124dbe614a55041c23b509f5e887b687dbb6c4868425957cac45910a
 DIST ansible-core-2.11.7.tar.gz 7108269 BLAKE2B c5080161bfffc34382db86f3940dbbf1c8194a4413b20ef28b3c15503aec905acfffc864041496b4f6b4b77966fee3221b80e90d4b952e38513ba9ce506ee1ae SHA512 f37c925c5302eff30d17f52a04d4a5311e38ee5c1d6db4fbdb32970afa362e0522d6ec3d07bddf40137b2f5ec5fa03a2b72e7e1ed313c28c207f65490e49af92
 DIST ansible-core-2.12.1.tar.gz 7401160 BLAKE2B 2bc412bade7f7e5dee0e51c78a74b4dea286aca1b82e2217012f168cd529a06887f11d672ff883af6a71c3af6ea1596f6720bcde9ed3696f87b8b5def1a1172b SHA512 89468d172dca502da42b94d0a781906578322ac531b3dfc3cece383b0e93fbec0f199d7b76abfd80d24654d5d939ee66a15b74565f50cca0c72d427aab9f4e08
 DIST ansible-core-2.12.2.tar.gz 7750306 BLAKE2B 629ff38ad98eebdf6b8d7f47355f065589c511fb66b19543ad696b973f6a776b420158ce157c0af5f14b85574808bd5bf3f285607e588949f6cd2e232941e508 SHA512 a9afc3768d27a7049c275da8780e6dcd7da42263fc9065a1df1aabd0d8c54020313e9065349a6f52138e11eafb176348bf2ec33c0c1b08dc9837b7ac832542af
--- a/app-admin/ansible-base/ansible-base-2.12.2.ebuild
+++ b/app-admin/ansible-base/ansible-base-2.12.2.ebuild
@ -0,0 +1,64 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
 PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=bdepend
 inherit distutils-r1
 DESCRIPTION="Model-driven deployment, config management, and command execution framework"
 HOMEPAGE="https://www.ansible.com/"
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
 	EGIT_BRANCH="devel"
 else
 	MY_PN="${PN/-base/-core}"
 	MY_P="${MY_PN}-${PV}"
 	SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
 	S="${WORKDIR}"/${MY_P}
 fi
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="test"
 RESTRICT="test"
 RDEPEND="
 	dev-python/paramiko[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/cryptography[${PYTHON_USEDEP}]
 	dev-python/httplib2[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/netaddr[${PYTHON_USEDEP}]
 	dev-python/pexpect[${PYTHON_USEDEP}]
 	>=dev-python/resolvelib-0.5.3[${PYTHON_USEDEP}]
 	<dev-python/resolvelib-0.6.0[${PYTHON_USEDEP}]
 	net-misc/sshpass
 	virtual/ssh
 "
 DEPEND="
 	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
 		dev-python/bcrypt[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
 		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
 		dev-python/passlib[${PYTHON_USEDEP}]
 		dev-python/coverage[${PYTHON_USEDEP}]
 		dev-vcs/git
 	)"
 python_compile() {
 	export ANSIBLE_SKIP_CONFLICT_CHECK=1
 	distutils-r1_python_compile
 }
 python_test() {
 	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
 }
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@ -1,2 +1,3 @@
 DIST ansible-4.6.0.tar.gz 35644507 BLAKE2B 94f544caa81ba7d20493f469483612f2ebf9eb1c4be18006b5ca6afdb3bd45428226340a0658b8f1ebecf8bd06396763ba888bb1cbd48aa6b71aaa6a56542d38 SHA512 5b7fad69628dded0b42a25e3f2fbbcc30ef876dc3f97dc1dff2c7db6443d1506fe5db62bc4d8a00ebfb7dc78ecc205a56bea3bf760f85260c835b2286f63b702
 DIST ansible-5.0.1.tar.gz 38449873 BLAKE2B 1b2cfab6f851c3eb9cc124c7178d9a156a4279fa539e960213289a6e7c8e6b4efcde009fe8484259150ffb8a2ce90080c7e9356308bea6f46e51645518593f6b SHA512 ade29442ed12f635161b2a98dabce75c125b8eac855b33cfc484f35624e55f51534a8a0c414450db60cdf3d8f25ae6ab66946a1cd2c3468f921d7a2ced38a2de
 DIST ansible-5.3.0.tar.gz 38005050 BLAKE2B 57e196fe005060cf53f9d76e33e61d461035fc9472254e90c28eb5107dc3546aa38c5f3bc340a7ace518e853bc50bb4299015dc087e286064efc661825df5ba9 SHA512 15f814f23305ceae3426464bccd6fc5cfb9b7b86b6634ce9b867d20c3d512e669387cbd12cb2ea03a66c352272aa72b53f255dfdd03c3198b70fc286e527f43a
--- a/app-admin/ansible/ansible-5.3.0.ebuild
+++ b/app-admin/ansible/ansible-5.3.0.ebuild
@ -0,0 +1,29 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
 PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 DESCRIPTION="Model-driven deployment, config management, and command execution framework"
 HOMEPAGE="https://www.ansible.com/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
 RESTRICT="test"
 RDEPEND=">=app-admin/ansible-base-2.12.0
 	<app-admin/ansible-base-2.13"
 python_compile() {
 	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
 	distutils-r1_python_compile
 }
 python_install() {
 	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
 	distutils-r1_python_install
 }
--- a/app-admin/syslog-ng/syslog-ng-3.35.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.35.1.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="amqp caps dbi geoip2 http ipv6 json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
 	test? ( python )"
--- a/app-antivirus/Manifest.gz
+++ b/app-antivirus/Manifest.gz
--- a/app-antivirus/clamav/clamav-0.103.5.ebuild
+++ b/app-antivirus/clamav/clamav-0.103.5.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="bzip2 doc clamonacc clamdtop clamsubmit iconv ipv6 libclamav-only milter metadata-analysis-api selinux systemd test xml"
 REQUIRED_USE="libclamav-only? ( !clamonacc !clamdtop !clamsubmit !milter !metadata-analysis-api )"
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/lbzip2/lbzip2-2.5_p20181227-r1.ebuild
+++ b/app-arch/lbzip2/lbzip2-2.5_p20181227-r1.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"
@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~whissi/dist/${PN}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="debug static symlink"
 RDEPEND="symlink? ( !app-arch/pbzip2[symlink] )"
--- a/app-arch/pixz/pixz-1.0.7.ebuild
+++ b/app-arch/pixz/pixz-1.0.7.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
@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://github.com/vasi/pixz/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 DESCRIPTION="Parallel Indexed XZ compressor"
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
--- a/app-backup/bareos/bareos-21.0.0-r1.ebuild
+++ b/app-backup/bareos/bareos-21.0.0-r1.ebuild
@ -12,14 +12,20 @@ inherit python-any-r1 systemd cmake tmpfiles
 DESCRIPTION="Featureful client/server network backup suite"
 HOMEPAGE="https://www.bareos.org/"
 SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> ${P}.tar.gz"
-RESTRICT="mirror"
+
 # some tests still fail propably due to missing bits in src_test -> TODO
 RESTRICT="mirror test"
 #RESTRICT="
 #	mirror
 #	!test? ( test )
 #"
 LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="X acl ceph clientonly +director glusterfs ipv6 lmdb
 	logwatch ndmp readline scsi-crypto
-	static +storage-daemon systemd tcpd vim-syntax vmware xattr"
+	static +storage-daemon systemd tcpd test vim-syntax vmware xattr"
 # get cmake variables from core/cmake/BareosSetVariableDefaults.cmake
 DEPEND="
@ -68,7 +74,15 @@ RDEPEND="${DEPEND}
 	)
 	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 	"
-BDEPEND="${PYTHON_DEPS}"
+
 BDEPEND="
 	${PYTHON_DEPS}
 	test? (
 		dev-cpp/gtest
 		dev-db/postgresql:*[server,threads]
 		dev-db/mariadb:*[server]
 	)
 "
 REQUIRED_USE="
 	static? ( clientonly )
@ -106,6 +120,26 @@ pkg_pretend() {
 	fi
 }
 src_test() {
 	# initialze catalog test database
 	initdb -D "${T}"/pgsql || die
 	pg_ctl -w -D "${T}"/pgsql start \
 		-o "-h '' -k '${T}'" || die
 	createuser -h "${T}" bareos || die
 	createdb -h "${T}" --owner bareos bareos || die
 	export PGHOST="${T}"
 	# initiale mariadb database for backup tests
 	# $USER must be set and != root
 	export USER=portage
 	default
 	cmake_src_test
 	pg_ctl -w -D "${T}"/pgsql stop || die
 	rm -rvf "${T}"/pgsql
 }
 src_prepare() {
 	# fix gentoo platform support
 	eapply -p1 "${FILESDIR}/${PN}-21-cmake-gentoo.patch"
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
--- a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/$
 LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="acl caps nls unicode selinux"
 BDEPEND="
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
--- a/app-containers/lxc/Manifest
+++ b/app-containers/lxc/Manifest
@ -1,2 +1,4 @@
 DIST lxc-4.0.11.tar.gz 1543031 BLAKE2B 0309bbb96938e60e4cbe145fa0cc3c0a85d9154282a889d74167128b6166a280bb4d53df266990a529a98935ef2c12e8d2214e9a8f6cb293d47aa5808ebad82f SHA512 23287e468da8939334f4261bfcbb52eadcbe5806bd97896db38c84eb42f32143dc17bb8b9bb7f7f88584b72056553c9edc33ddb693a345ecf88f3177573fa9c0
 DIST lxc-4.0.11.tar.gz.asc 833 BLAKE2B 68804d1d5ad09e388541b3a95a98ca14202c513ea3544a7389a49f4e13ecffc17715bb023675134fd99047c727cffe09cbd0a89883054b82650ebd23366823a7 SHA512 49a54aaf018772db40e1dadc0a10e7d727a2b14b34c0a3c704fd3f7a12e60082abf4628cc0a489ee620ef2210c7542abbdb6d1432e4297ceef52cdd6b158a5f8
 DIST lxc-4.0.12.tar.gz 1565070 BLAKE2B 819b5140b641dbc1ed6cf5f2840bb0ee6d3ab8c687f4f8064e42d347113bdf50fcbb653a6fb26598db0daab0c83ad88fe0d27fd2842fac9d7f5fef73656d7976 SHA512 04437d9c891cd3a22f756c42f05e97398772587175d65aff9d394f0f3e810efc5c1fe7077c39573de3ec259e0605bc2a7ea51093613b2cef908372ae338df19d
 DIST lxc-4.0.12.tar.gz.asc 833 BLAKE2B 2fca60b5ac267a893f70875ccdbe39db6b98b5fe51fe396692449e310b6e680e7b142380e193f5d8299f18e796ed2fd0e08cd186859069877fcca6bc26e44717 SHA512 4f2912879e6f3bf5fdbebb902cf16ca6b766b5720b817c4b4996e62098a1d282327d330ffd9768d45d69aeddb50184dc8485b0ef75b046449ce4c544cdc43c9b
--- a/app-containers/lxc/lxc-4.0.12.ebuild
+++ b/app-containers/lxc/lxc-4.0.12.ebuild
@ -0,0 +1,184 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit autotools bash-completion-r1 linux-info flag-o-matic optfeature pam readme.gentoo-r1 systemd verify-sig
 DESCRIPTION="A userspace interface for the Linux kernel containment features"
 HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc"
 SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
 	verify-sig? ( https://linuxcontainers.org/downloads/lxc/${P}.tar.gz.asc )"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 LICENSE="GPL-2 LGPL-2.1 LGPL-3"
 SLOT="0"
 IUSE="apparmor +caps doc io-uring man pam seccomp selinux +ssl +tools verify-sig"
 RDEPEND="acct-group/lxc
 	acct-user/lxc
 	app-misc/pax-utils
 	sys-apps/util-linux
 	sys-libs/libcap
 	virtual/awk
 	caps? ( sys-libs/libcap )
 	io-uring? ( >=sys-libs/liburing-2:= )
 	pam? ( sys-libs/pam )
 	seccomp? ( sys-libs/libseccomp )
 	selinux? ( sys-libs/libselinux )
 	ssl? (
 		dev-libs/openssl:0=
 	)"
 DEPEND="${RDEPEND}
 	>=sys-kernel/linux-headers-4
 	apparmor? ( sys-apps/apparmor )"
 BDEPEND="virtual/pkgconfig
 	doc? ( app-doc/doxygen[dot] )
 	man? ( app-text/docbook-sgml-utils )
 	verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
 CONFIG_CHECK="~!NETPRIO_CGROUP
 	~CGROUPS
 	~CGROUP_CPUACCT
 	~CGROUP_DEVICE
 	~CGROUP_FREEZER
 	~CGROUP_SCHED
 	~CPUSETS
 	~IPC_NS
 	~MACVLAN
 	~MEMCG
 	~NAMESPACES
 	~NET_NS
 	~PID_NS
 	~POSIX_MQUEUE
 	~USER_NS
 	~UTS_NS
 	~VETH"
 ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER: needed to freeze containers"
 ERROR_MACVLAN="CONFIG_MACVLAN: needed for internal (inter-container) networking"
 ERROR_MEMCG="CONFIG_MEMCG: needed for memory resource control in containers"
 ERROR_NET_NS="CONFIG_NET_NS: needed for unshared network"
 ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: needed for lxc-execute command"
 ERROR_UTS_NS="CONFIG_UTS_NS: needed to unshare hostnames and uname info"
 ERROR_VETH="CONFIG_VETH: needed for internal (host-to-container) networking"
 DOCS=( AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt )
 pkg_setup() {
 	linux-info_pkg_setup
 }
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.0.5-omit-sysconfig.patch # bug 558854
 )
 VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
 src_prepare() {
 	default
 	export bashcompdir="/etc/bash_completion.d"
 	eautoreconf
 }
 src_configure() {
 	append-flags -fno-strict-aliasing
 	local myeconfargs=(
 		--bindir=/usr/bin
 		--localstatedir=/var
 		--sbindir=/usr/bin
 		--with-config-path=/var/lib/lxc
 		--with-distro=gentoo
 		--with-init-script=systemd
 		--with-rootfs-path=/var/lib/lxc/rootfs
 		--with-runtime-path=/run
 		--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
 		--disable-coverity-build
 		--disable-dlog
 		--disable-fuzzers
 		--disable-mutex-debugging
 		--disable-no-undefined
 		--disable-rpath
 		--disable-sanitizers
 		--disable-tests
 		--disable-werror
 		--enable-bash
 		--enable-commands
 		--enable-memfd-rexec
 		--enable-thread-safety
 		$(use_enable apparmor)
 		$(use_enable caps capabilities)
 		$(use_enable doc api-docs)
 		$(use_enable doc examples)
 		$(use_enable io-uring liburing)
 		$(use_enable man doc)
 		$(use_enable pam)
 		$(use_enable seccomp)
 		$(use_enable selinux)
 		$(use_enable ssl openssl)
 		$(use_enable tools)
 		$(use_with pam pamdir $(getpam_mod_dir))
 	)
 	econf "${myeconfargs[@]}"
 }
 src_install() {
 	default
 	# The main bash-completion file will collide with lxd, need to relocate and update symlinks.
 	mkdir -p "${ED}"/$(get_bashcompdir) || die "Failed to create bashcompdir."
 	mv "${ED}"/etc/bash_completion.d/lxc "${ED}"/$(get_bashcompdir)/lxc-start || die "Failed to relocate lxc bash-completion file."
 	rm -r "${ED}"/etc/bash_completion.d || die "Failed to remove wrong bash_completion.d content."
 	if use tools; then
 		bashcomp_alias lxc-start lxc-{attach,cgroup,copy,console,create,destroy,device,execute,freeze,info,monitor,snapshot,stop,unfreeze,usernsexec,wait}
 	else
 		bashcomp_alias lxc-start lxc-usernsexec
 	fi
 	keepdir /etc/lxc /var/lib/lxc/rootfs /var/log/lxc
 	rmdir "${D}"/var/cache/lxc "${D}"/var/cache || die "rmdir failed"
 	find "${D}" -name '*.la' -delete -o -name '*.a' -delete || die
 	# Gentoo-specific additions!
 	newinitd "${FILESDIR}/lxc.initd.8" lxc
 	# Remember to compare our systemd unit file with the upstream one
 	# config/init/systemd/lxc.service.in
 	systemd_newunit "${FILESDIR}"/lxc_at.service.4.0.0 "lxc@.service"
 	DOC_CONTENTS="
 		For openrc, there is an init script provided with the package.
 		You should only need to symlink /etc/init.d/lxc to
 		/etc/init.d/lxc.configname to start the container defined in
 		/etc/lxc/configname.conf.
 		Correspondingly, for systemd a service file lxc@.service is installed.
 		Enable and start lxc@configname in order to start the container defined
 		in /etc/lxc/configname.conf."
 	DISABLE_AUTOFORMATTING=true
 	readme.gentoo_create_doc
 }
 pkg_postinst() {
 	readme.gentoo_print_elog
 	elog "Please run 'lxc-checkconfig' to see optional kernel features."
 	elog
 	optfeature "automatic template scripts" app-containers/lxc-templates
 	optfeature "Debian-based distribution container image support" dev-util/debootstrap
 	optfeature "snapshot & restore functionality" sys-process/criu
 }
--- a/app-containers/lxd/Manifest
+++ b/app-containers/lxd/Manifest
@ -1,2 +1,4 @@
 DIST lxd-4.0.8.tar.gz 8898153 BLAKE2B c02bea1019079f59fff5fbb2c3d3ebf13e01751fd1c18b9aa44a9306a8f631cb0c0a55f77eb17945e44c040dfdad5c790bb2c2e3ab165356e3900c3d6cccec0e SHA512 9bf5ee91438bc14e916410254979838a110d21d8329c0eaa0a5eecfd378039a3ac10291197d2f680dc12484866f21ef724618e88e6c02038e6d2484d33571dd6
 DIST lxd-4.0.8.tar.gz.asc 833 BLAKE2B 2073b113f34b2ab052e6e4f406016ac04631ec63269b79dd1e85ca5191aa73ed1f47f0e87f5155b6e5c6659138a182c4c403a66e20925cdb347f49e542e8139b SHA512 9b5f00f9d4a601e718ca91f623dd31e864963b7b8a9e9be6af8da2288b775c4fc8c60b0d6fcefa2a347d733d1e002a3714ac3dbfadf9a1188f9747e9682fe8b9
 DIST lxd-4.0.9.tar.gz 9117078 BLAKE2B aa6689c1e958258484fba5c060765dd71d5406cb4375d3132cdc38633277e6c95322e8e3aed5e9dd251140c6868ec42470e797639dde4af42848e138f3b45ee2 SHA512 657949311753895f3941deaabae2d03092fc67490d2de78db48b296fdd3e9df4c5844467dd6913814426ca423a6ee1da9705bb1a2652ea99fe1356eb7da97ebb
 DIST lxd-4.0.9.tar.gz.asc 833 BLAKE2B 7cd0d3ab518d947ca3ea6dc804c6a59b592e4e568152c078fdd3c102420bcd94d2f0b2c335b8b4ecdb19dc3c9a10f665a1510903f395247da956717beaa172a3 SHA512 79a4111571ab43e79cf669e416ed50f3ccae0fbceb86d73757d23c778035e827f47643bc87ff6a2fc64b095345a3d53cbd0c4eb245c75364e907d7449f3a0886
--- a/app-containers/lxd/files/lxd-4.0.9.initd
+++ b/app-containers/lxd/files/lxd-4.0.9.initd
@ -0,0 +1,49 @@
 #!/sbin/openrc-run
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 DAEMON=/usr/sbin/lxd
 PIDFILE=/run/lxd.pid
 depend() {
 	need net
 	need lxcfs
 }
 start() {
 	ebegin "Starting lxd service"
 	modprobe -f loop > /dev/null 2>&1
 	# Fix permissions on /var/lib/lxd and make sure it exists.
 	# Create a log directory for lxd with correct permissions.
 	install -d /var/lib/lxd --group lxd --owner root --mode 0775
 	install -d /var/log/lxd --group lxd --owner root 
 	start-stop-daemon --start \
 		--pidfile ${PIDFILE} \
 		--exec ${DAEMON} \
 		--background \
 		--make-pidfile \
 		-- \
 		${LXD_OPTIONS}
 	eend ${?}
 }
 stop() {
 	if [ "${RC_CMD}" = restart ]; then
 		ebegin "Stopping lxd service (but not containers)"
 		# start-stop-daemon sends SIGTERM with a timeout of 5s by default.
 		# SIGTERM indicates to LXD that it will be stopped temporarily.
 		# Instances will keep running.
 		start-stop-daemon --stop --quiet -p "${PIDFILE}"
 		eend ${?}
 	else
 		ebegin "Stopping lxd service and containers, waiting 40s"
 		# SIGPWR indicates to LXD that the host is going down.
 		# LXD will do a clean shutdown of all instances.
 		# After 30s all remaining instances will be killed.
 		# We wait up to 40s for LXD.
 		start-stop-daemon --stop --quiet -R SIGPWR/40 -p "${PIDFILE}"
 		eend ${?}
 	fi
 }
--- a/app-containers/lxd/files/lxd-4.0.9.service
+++ b/app-containers/lxd/files/lxd-4.0.9.service
@ -0,0 +1,25 @@
 [Unit]
 Description=LXD - main daemon
 After=network-online.target lxcfs.service lxd.socket
 Requires=network-online.target lxcfs.service lxd.socket
 Documentation=man:lxd(1)
 [Service]
 Group=lxd
 User=root
 EnvironmentFile=-/etc/environment
 ExecStart=/usr/sbin/lxd --group lxd --syslog
 ExecStartPost=/usr/sbin/lxd waitready --timeout=600
 ExecStartPre=/bin/mkdir -p /var/log/lxd
 ExecStartPre=/bin/chown -R root:lxd /var/log/lxd
 KillMode=process
 PermissionsStartOnly=true
 TimeoutStartSec=600s
 TimeoutStopSec=30s
 Restart=on-failure
 LimitNOFILE=1048576
 LimitNPROC=infinity
 TasksMax=infinity
 [Install]
 Also=lxd-containers.service lxd.socket
--- a/app-containers/lxd/lxd-4.0.9.ebuild
+++ b/app-containers/lxd/lxd-4.0.9.ebuild
@ -0,0 +1,174 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit bash-completion-r1 go-module linux-info optfeature systemd verify-sig
 DESCRIPTION="Fast, dense and secure container management"
 HOMEPAGE="https://linuxcontainers.org/lxd/introduction/ https://github.com/lxc/lxd"
 SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
 	verify-sig? ( https://linuxcontainers.org/downloads/lxd/${P}.tar.gz.asc )"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="apparmor ipv6 nls verify-sig"
 DEPEND="acct-group/lxd
 	app-arch/xz-utils
 	>=app-containers/lxc-3.0.0[apparmor?,seccomp(+)]
 	dev-db/sqlite:3
 	dev-libs/dqlite
 	dev-libs/lzo
 	dev-libs/raft[lz4]
 	>=dev-util/xdelta-3.0[lzma(+)]
 	net-dns/dnsmasq[dhcp,ipv6?]
 	sys-libs/libcap
 	virtual/udev"
 RDEPEND="${DEPEND}
 	net-firewall/ebtables
 	net-firewall/iptables[ipv6?]
 	sys-apps/iproute2[ipv6?]
 	sys-fs/fuse:*
 	sys-fs/lxcfs
 	sys-fs/squashfs-tools[lzma]
 	virtual/acl"
 BDEPEND="dev-lang/go
 	nls? ( sys-devel/gettext )
 	verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
 CONFIG_CHECK="
 	~CGROUPS
 	~IPC_NS
 	~NET_NS
 	~PID_NS
 	~SECCOMP
 	~USER_NS
 	~UTS_NS
 	~KVM
 	~MACVTAP
 	~VHOST_VSOCK
 "
 ERROR_IPC_NS="CONFIG_IPC_NS is required."
 ERROR_NET_NS="CONFIG_NET_NS is required."
 ERROR_PID_NS="CONFIG_PID_NS is required."
 ERROR_SECCOMP="CONFIG_SECCOMP is required."
 ERROR_UTS_NS="CONFIG_UTS_NS is required."
 WARNING_KVM="CONFIG_KVM and CONFIG_KVM_AMD/-INTEL is required for virtual machines."
 WARNING_MACVTAP="CONFIG_MACVTAP is required for virtual machines."
 WARNING_VHOST_VSOCK="CONFIG_VHOST_VSOCK is required for virtual machines."
 # Go magic.
 QA_PREBUILT="/usr/bin/fuidshift
 	/usr/bin/lxc
 	/usr/bin/lxc-to-lxd
 	/usr/bin/lxd-agent
 	/usr/bin/lxd-benchmark
 	/usr/bin/lxd-p2c
 	/usr/sbin/lxd"
 VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
 # The testsuite must be run as root.
 # make: *** [Makefile:156: check] Error 1
 RESTRICT="test"
 GOPATH="${S}/_dist"
 src_prepare() {
 	export GOPATH="${S}/_dist"
 	default
 	sed -i \
 		-e "s:\./configure:./configure --prefix=/usr --libdir=${EPREFIX}/usr/lib/lxd:g" \
 		-e "s:make:make ${MAKEOPTS}:g" \
 		Makefile || die
 	# Fix hardcoded ovmf file path, see bug 763180
 	sed -i \
 		-e "s:/usr/share/OVMF:/usr/share/edk2-ovmf:g" \
 		-e "s:OVMF_VARS.ms.fd:OVMF_VARS.secboot.fd:g" \
 		doc/environment.md \
 		lxd/apparmor/instance.go \
 		lxd/apparmor/instance_qemu.go \
 		lxd/instance/drivers/driver_qemu.go || die "Failed to fix hardcoded ovmf paths."
 	cp "${FILESDIR}"/lxd-4.0.9.service "${T}"/lxd.service || die
 	if use apparmor; then
 		sed -i \
 			'/^EnvironmentFile=.*/a ExecStartPre=\/usr\/libexec\/lxc\/lxc-apparmor-load' \
 			"${T}"/lxd.service || die
 	fi
 	# Disable -Werror's from go modules.
 	find "${S}" -name "cgo.go" -exec sed -i "s/ -Werror / /g" {} + || die
 }
 src_configure() { :; }
 src_compile() {
 	export GOPATH="${S}/_dist"
 	export CGO_LDFLAGS_ALLOW="-Wl,-z,now"
 	for k in fuidshift lxd-benchmark lxc lxc-to-lxd; do
 		go install -v -x "${S}/${k}" || die "failed compiling ${k}"
 	done
 	go install -v -x -tags libsqlite3 ${S}/lxd || die "Failed to build the daemon"
 	# Needs to be built statically
 	CGO_ENABLED=0 go install -v -tags netgo "${S}"/lxd-p2c
 	CGO_ENABLED=0 go install -v -tags agent,netgo "${S}"/lxd-agent
 	use nls && emake build-mo
 }
 src_test() {
 	emake check
 }
 src_install() {
 	export GOPATH="${S}/_dist"
 	local bindir="_dist/bin"
 	dosbin ${bindir}/lxd
 	for l in fuidshift lxd-agent lxd-benchmark lxd-p2c lxc lxc-to-lxd; do
 		dobin ${bindir}/${l}
 	done
 	newbashcomp scripts/bash/lxd-client lxc
 	newconfd "${FILESDIR}"/lxd-4.0.0.confd lxd
 	newinitd "${FILESDIR}"/lxd-4.0.9.initd lxd
 	systemd_dounit "${T}"/lxd.service
 	systemd_newunit "${FILESDIR}"/lxd-containers-4.0.0.service lxd-containers.service
 	systemd_newunit "${FILESDIR}"/lxd-4.0.0.socket lxd.socket
 	dodoc AUTHORS doc/*
 	use nls && domo po/*.mo
 }
 pkg_postinst() {
 	elog
 	elog "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
 	elog "including a Quick Start."
 	elog "For virtual machine support, see:"
 	elog "https://wiki.gentoo.org/wiki/LXD#Virtual_machines"
 	elog
 	elog "Please run 'lxc-checkconfig' to see all optional kernel features."
 	elog
 	optfeature "virtual machine support" app-emulation/qemu[spice,usbredir,virtfs]
 	optfeature "btrfs storage backend" sys-fs/btrfs-progs
 	optfeature "lvm2 storage backend" sys-fs/lvm2
 	optfeature "zfs storage backend" sys-fs/zfs
 	elog
 	elog "Be sure to add your local user to the lxd group."
 }
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/ccid/Manifest
+++ b/app-crypt/ccid/Manifest
@ -1,2 +1,3 @@
 DIST ccid-1.4.35.tar.bz2 676789 BLAKE2B d1123c024a798a22906a5c2c2e35f5485b8d2252ddec28571af835bbf169bc5abeb26fea871ef70d67270cc1eb52f992c56f0abb74f6deed555f15e39dbf4756 SHA512 da990b5537ec35baa1b36b9c4be7f1bdccfc149cfa4ce024ddf59504f2a2044273057c1454f227fdad8f6b04fceaf48b88e70d4d0a5475384749b367529deaeb
 DIST ccid-1.4.36.tar.bz2 677047 BLAKE2B b3d48f1c51b64d260b7055251fb04aeea4a22cc5d4f024bb972a9a9874b1bdf4b75b9daf8cd7c9f26000b04e7d4c1779e20a26d4927aa1e403cd274f548b71b5 SHA512 e9ca3f5364c6cec988edad325c1ef1b35886e3ecb15d6e1409c989b9f669fbda3f0688e246e3976b58eacc0ed035cde36e65675abf12562e81c3630d4ce67773
 DIST ccid-1.5.0.tar.bz2 689961 BLAKE2B e5621f9af647028787cddd1b5a0d674420b4bf0c532a8527b4e10773bbd8af6f6600e7c40039e27f1ae182504d4b69b5e1e4aae509154ebd9653a34bd085f820 SHA512 fa2eac306066255fd89e8220e2b8d82811ce9e284baa155ea968b7afe0f113a94b1ee1898578d02fb8cde0634b6fe60ae8af956089ce5401c11bb90c3b334d5a
--- a/app-crypt/ccid/ccid-1.5.0.ebuild
+++ b/app-crypt/ccid/ccid-1.5.0.ebuild
@ -0,0 +1,61 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
 inherit toolchain-funcs udev
 DESCRIPTION="CCID free software driver"
 HOMEPAGE="https://ccid.apdu.fr https://github.com/LudovicRousseau/CCID"
 SRC_URI="https://ccid.apdu.fr/files/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="twinserial kobil-midentity +usb"
 RDEPEND=">=sys-apps/pcsc-lite-1.8.3
 	usb? ( virtual/libusb:1 )"
 DEPEND="${RDEPEND}"
 BDEPEND="kernel_linux? ( virtual/pkgconfig )"
 DOCS=( README.md AUTHORS )
 src_configure() {
 	econf \
 		LEX=: \
 		$(use_enable twinserial) \
 		$(use_enable usb libusb)
 }
 src_compile() {
 	default
 	use kobil-midentity && emake -C contrib/Kobil_mIDentity_switch
 }
 src_install() {
 	default
 	if use kobil-midentity; then
 		dosbin contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch
 		doman contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch.8
 	fi
 	if use kernel_linux; then
 		# note: for eudev support, rules probably will always need to be
 		# installed to /usr
 		# ccid >=1.4.11 version changed the rules drastically in a minor
 		# release to no longer use the pcscd group. Using the old ones in
 		# the mean time.
 		udev_newrules "${FILESDIR}"/92_pcscd_ccid-2.rules 92-pcsc-ccid.rules
 		# disable Kobil_mIDentity_switch udev rule with USE=-kobil-midentity
 		if ! use kobil-midentity; then
 			sed \
 				-e '/Kobil_mIDentity_switch/s/^/#/' \
 				-i "${D}/$(get_udevdir)"/rules.d/92-pcsc-ccid.rules || die
 		fi
 	fi
 }
--- a/app-crypt/p11-kit/Manifest
+++ b/app-crypt/p11-kit/Manifest
@ -1,2 +1,2 @@
 DIST p11-kit-0.23.22.tar.xz 830016 BLAKE2B 4e1edfd9e2441d237c07a16c003aee5ffde38f1cf545c26e435645429f2cfa4fe7ca61cdc3c3940390aa040ba991f2ee3995b14cc31bb886d5eeffa8ed5e1721 SHA512 098819e6ca4ad9cc2a0bc2e478aea67354d051a4f03e6c7d75d13d2469b6dc7654f26b15530052f6ed51acb35531c2539e0f971b31e29e6673e857c903afb080
-DIST p11-kit-0.24.0.tar.xz 834392 BLAKE2B f967b51d3b021c6e95a0ddc1934527023aa4acbae2b193d64829620331ea0f094e1467fdea897a3121d05f30b1747607197a50c906a40609913230ab363c09e5 SHA512 48369d6fdae79b8c5a255c821fbdb982f0c649cce07c0d92f0ff0c16322fea8919faa94067cae2efede2da3646c0e69a71a3e399b769dc2327f247bcb113eb3c
+DIST p11-kit-0.24.1.tar.xz 838304 BLAKE2B e5cb98881279199e2674e2ff4f12d72c4d126c54429ee7ece6dd56ad1987f84abf58a67b8bf2405b19a5bca9d1106f8ec901364ac3d2488f65b3f92b51f850fe SHA512 8cf170c714bb9e0cf3df93e8ec55b8e3c55cabf2c6a27f177ac6de8b8028985df2ca0216d3215d6828dc2ae3095c4e1a4febe8cb26b88ec321defc66bb011e81
--- a/app-crypt/p11-kit/p11-kit-0.24.1.ebuild
+++ b/app-crypt/p11-kit/p11-kit-0.24.1.ebuild
@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
 inherit multilib-minimal
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/diskimage-builder/Manifest
+++ b/app-emulation/diskimage-builder/Manifest
@ -1 +1,2 @@
 DIST diskimage-builder-3.16.0.tar.gz 499320 BLAKE2B 2cf520957c270696a6c4c7f59d6c875d30e7245c9fa24d556ef90eca4bab9e45eb95ecc422bc84ac202df0ba8afbaac412663892c8ab18bd4847e5d630ea4e43 SHA512 e592fd9200681314519b6e58b4b3ba9106d3834e83e708b3f32c125a8f597252f43abec05b37a9f6b30397874d53b56740e2374d6d13f69e737d460f191bdd98
 DIST diskimage-builder-3.17.0.tar.gz 500580 BLAKE2B f219e8e1a3224dd23871a3d4f4688c6e8b75ad681763227a0dde34b3f89b0f5a7af827c1717a161f310590090cc0852936edb6b9e7298bbc989b01e4af28662d SHA512 466039b6cf83636a2a245b5d36f7bf0e71e897edf092010219a40bcbe1804b0fe1f205eec2388cfbcd2e2adfdaf9256c53a01e3cf7ca48663e0296d4bf542a31
--- a/app-emulation/diskimage-builder/diskimage-builder-3.17.0.ebuild
+++ b/app-emulation/diskimage-builder/diskimage-builder-3.17.0.ebuild
@ -0,0 +1,39 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 DESCRIPTION="Golden Disk Image builder"
 HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/"
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 fi
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
 DEPEND="${CDEPEND}"
 RDEPEND="${CDEPEND}
 	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
 	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
 	>=dev-python/networkx-1.10[${PYTHON_USEDEP}]
 	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
 	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
 	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
 	app-emulation/qemu
 	sys-block/parted
 	sys-fs/multipath-tools
 	sys-fs/dosfstools
 	sys-apps/gptfdisk
 	!dev-python/dib-utils[${PYTHON_USEDEP}]"
--- a/app-emulation/qemu/qemu-6.2.0-r3.ebuild
+++ b/app-emulation/qemu/qemu-6.2.0-r3.ebuild
@ -33,7 +33,7 @@ LICENSE="GPL-2 LGPL-2 BSD-2"
 SLOT="0"
 IUSE="accessibility +aio alsa bpf bzip2 capstone +caps +curl debug +doc
-	+fdt fuse glusterfs gnutls gtk infiniband iscsi io-uring
+	+fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring
 	jack jemalloc +jpeg
 	lzo multipath
 	ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs
@ -112,6 +112,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	vhost-user-fs? ( caps seccomp )
 	virgl? ( opengl )
 	virtfs? ( caps xattr )
 	vnc? ( gnutls )
 	vte? ( gtk )
 	multipath? ( udev )
 	plugins? ( !static !static-user )
--- a/app-emulation/qemu/qemu-6.2.0.ebuild
+++ b/app-emulation/qemu/qemu-6.2.0.ebuild
@ -33,7 +33,7 @@ LICENSE="GPL-2 LGPL-2 BSD-2"
 SLOT="0"
 IUSE="accessibility +aio alsa bpf bzip2 capstone +caps +curl debug +doc
-	+fdt fuse glusterfs gnutls gtk infiniband iscsi io-uring
+	+fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring
 	jack jemalloc +jpeg
 	lzo multipath
 	ncurses nfs nls numa opengl +oss +pin-upstream-blobs
@ -112,6 +112,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	vhost-user-fs? ( caps seccomp )
 	virgl? ( opengl )
 	virtfs? ( caps xattr )
 	vnc? ( gnutls )
 	vte? ( gtk )
 	multipath? ( udev )
 	plugins? ( !static !static-user )
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@ -33,7 +33,7 @@ LICENSE="GPL-2 LGPL-2 BSD-2"
 SLOT="0"
 IUSE="accessibility +aio alsa bpf bzip2 capstone +caps +curl debug +doc
-	+fdt fuse glusterfs gnutls gtk infiniband iscsi io-uring
+	+fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring
 	jack jemalloc +jpeg
 	lzo multipath
 	ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs
@ -112,6 +112,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	vhost-user-fs? ( caps seccomp )
 	virgl? ( opengl )
 	virtfs? ( caps xattr )
 	vnc? ( gnutls )
 	vte? ( gtk )
 	multipath? ( udev )
 	plugins? ( !static !static-user )
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
--- a/app-eselect/eselect-package-manager/eselect-package-manager-20110108-r1.ebuild
+++ b/app-eselect/eselect-package-manager/eselect-package-manager-20110108-r1.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=6
@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 RDEPEND=">=app-admin/eselect-1.1.1"
--- a/app-eselect/eselect-repository/Manifest
+++ b/app-eselect/eselect-repository/Manifest
@ -1,2 +1 @@
 DIST eselect-repository-11.tar.gz 8554 BLAKE2B c7bdd1559c310c492b2c00c7a7cb92d48ad24a69ff4485c1282c67b7dd211360fcda6d96eec2b9e734a1b4745f2a0fe9da1ff20d62bf1174a64b6016097ea634 SHA512 31b0b36122e580a018ca66d112cdddfbfe1568030fb9a20440450c17c759bfb872eb7ef99036a3dae14e8384a8f770354fd4cd362ed594408ae9e8dbbc6dea68
 DIST eselect-repository-12.tar.gz 8543 BLAKE2B 14866156ddfefebaea368c4a13413d79e7858520861ee2b699cb09b339f3bb4b8393af7201b4cb7d6a60d2a48d168a053cc4707e2f56a7a2a11cfb5156cfa83f SHA512 3b98b9bd87fe61c7fb4d314e72c8433b11dd80501cfd226d4a4de25ca6d08e7a14a2497a1700ac64d704368bb8e5ea2ec337d0712097e9e10182a3122a59e388
--- a/app-eselect/eselect-repository/eselect-repository-11.ebuild
+++ b/app-eselect/eselect-repository/eselect-repository-11.ebuild
@ -1,52 +0,0 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python3_{8..10} )
 inherit python-single-r1
 DESCRIPTION="Manage repos.conf via eselect"
 HOMEPAGE="https://github.com/mgorny/eselect-repository"
 SRC_URI="https://github.com/mgorny/eselect-repository/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RDEPEND="${PYTHON_DEPS}
 	app-admin/eselect
 	$(python_gen_cond_dep '
 		dev-python/lxml[${PYTHON_USEDEP}]
 	')
 	net-misc/wget"
 BDEPEND="
 	test? (
 		$(python_gen_cond_dep '
 			dev-python/pytest[${PYTHON_USEDEP}]
 		')
 	)"
 src_compile() {
 	MAKEARGS=(
 		PREFIX="${EPREFIX}/usr"
 		SYSCONFDIR="${EPREFIX}/etc"
 		SHAREDSTATEDIR="${EPREFIX}/var"
 		ESELECTDIR="${EPREFIX}/usr/share/eselect/modules"
 	)
 	emake "${MAKEARGS[@]}"
 	python_fix_shebang eselect-repo-helper
 }
 src_test() {
 	epytest
 }
 src_install() {
 	emake "${MAKEARGS[@]}" DESTDIR="${D}" install
 	einstalldocs
 }
--- a/app-eselect/eselect-repository/eselect-repository-12.ebuild
+++ b/app-eselect/eselect-repository/eselect-repository-12.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://github.com/mgorny/eselect-repository/archive/v${PV}.tar.gz -> $
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
--- a/app-i18n/nkf/nkf-2.1.4.ebuild
+++ b/app-i18n/nkf/nkf-2.1.4.ebuild
@ -1,10 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI="7"
 PYTHON_COMPAT=( python3_{7,8} )
 DISTUTILS_OPTIONAL="1"
 DISTUTILS_USE_SETUPTOOLS="no"
 inherit distutils-r1 perl-module toolchain-funcs vcs-snapshot
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/filebus/filebus-0.3.2.ebuild
+++ b/app-misc/filebus/filebus-0.3.2.ebuild
@ -1,9 +1,8 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 DISTUTILS_OPTIONAL=1
 DISTUTILS_USE_SETUPTOOLS=manual
 PYTHON_COMPAT=( python3_{7,8,9} )
 inherit distutils-r1
--- a/app-misc/filebus/filebus-0.3.4.ebuild
+++ b/app-misc/filebus/filebus-0.3.4.ebuild
@ -1,9 +1,8 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 DISTUTILS_OPTIONAL=1
 DISTUTILS_USE_SETUPTOOLS=manual
 PYTHON_COMPAT=( python3_{7,8,9,10} )
 inherit distutils-r1
--- a/app-misc/filebus/filebus-0.3.5.ebuild
+++ b/app-misc/filebus/filebus-0.3.5.ebuild
@ -1,9 +1,8 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 DISTUTILS_OPTIONAL=1
 DISTUTILS_USE_SETUPTOOLS=manual
 PYTHON_COMPAT=( python3_{7,8,9,10} )
 inherit distutils-r1
--- a/app-misc/jpipe/jpipe-0.2.0.ebuild
+++ b/app-misc/jpipe/jpipe-0.2.0.ebuild
@ -1,10 +1,9 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 GO_OPTIONAL=1
 DISTUTILS_OPTIONAL=1
 DISTUTILS_USE_SETUPTOOLS=bdepend
 PYTHON_COMPAT=( python3_{7,8,9,10} )
 inherit go-module distutils-r1
@ -384,6 +383,10 @@ BDEPEND="
 		app-arch/unzip
 		>=dev-lang/go-1.12
 	)
 	python? (
 		${PYTHON_DEPS}
 		dev-python/setuptools[${PYTHON_USEDEP}]
 	)
 "
 RDEPEND="
 	jpp-symlink? ( !app-misc/jp[jpp(-)] )
--- a/app-misc/tmux/tmux-3.2a.ebuild
+++ b/app-misc/tmux/tmux-3.2a.ebuild
@ -14,7 +14,7 @@ if [[ "${PV}" == 9999 ]] ; then
 else
 	SRC_URI="https://github.com/tmux/tmux/releases/download/${PV}/${P/_/-}.tar.gz"
 	[[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 	S="${WORKDIR}/${P/_/-}"
 fi
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
--- a/app-portage/gentoopm/gentoopm-0.3.3.ebuild
+++ b/app-portage/gentoopm/gentoopm-0.3.3.ebuild
@ -14,7 +14,7 @@ SRC_URI="https://github.com/mgorny/gentoopm/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~mips ~sparc x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 hppa ~mips ~sparc x86 ~x64-macos"
 IUSE=""
 RDEPEND="
--- a/app-portage/layman/layman-2.4.3.ebuild
+++ b/app-portage/layman/layman-2.4.3.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI="7"
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
 PYTHON_REQ_USE="xml(+),sqlite?"
 DISTUTILS_USE_SETUPTOOLS=no
--- a/app-portage/layman/layman-9999.ebuild
+++ b/app-portage/layman/layman-9999.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI="7"
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
 PYTHON_REQ_USE="xml(+),sqlite?"
 DISTUTILS_USE_SETUPTOOLS=no
--- a/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.7.ebuild
+++ b/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.7.ebuild
@ -14,7 +14,7 @@ SRC_URI="https://github.com/mgorny/smart-live-rebuild/archive/v${PV}.tar.gz -> $
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~mips ~sparc x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 hppa ~mips ~sparc x86 ~x64-macos"
 IUSE=""
 RDEPEND=">=app-portage/gentoopm-0.2.1[${PYTHON_USEDEP}]"
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
--- a/app-shells/tcsh/Manifest
+++ b/app-shells/tcsh/Manifest
@ -1,3 +1,4 @@
 DIST tcsh-6.22.02.tar.gz 1006405 BLAKE2B f18b2c48958b4d38a0f55b0df8563564b2a3b34becf02eda8802d7f5e2194082bf96c46323d606c2e6bd2a26aaed303bae3132d03515274407c63b713583dde7 SHA512 32d271b568c63265ea4c98494f5e60b37c3a3fc2594e8763b8f6f0b09018ab9db7ef6f951120b37f7880ccf04ba3a2559e30dc08d24f4ba9dc36853238d55980
 DIST tcsh-6.22.04.tar.gz 1012977 BLAKE2B 5702e17e25603a244e4481294cbe2dc2272d4f3ac8362be9e1dd65f3857e0e54520a245d321dda5ef747345776c22068dcb130705daddf71cb650b154ed96ba4 SHA512 3956df52124d496dc0e67e4e3e801787f31690f96a60399953e401648d5b4cfb06baa9833c32cb771177b3e89b7a27e5765534db073206568fe773598a55e873
 DIST tcsh-6.23.02.tar.gz 947265 BLAKE2B f1f6e1b98458a847e55802cdad14cbecb1ed222e18d8fd2547da7765e0658b645685f0baebcf5f08f237a94c7b56ba400d1e51f1743798b8acd375726772825c SHA512 bf83987e4667e3e514b99b6ee0a7f04c8eafad2bdb20f480e2a3614fc2112e01a75d3fcbf43ce54a4ef6d12a03693c3446ae6e14daa91f0ae7556019de1bce2a
 DIST tcsh-gentoo-patches-r1.9.tar.bz2 2488 BLAKE2B 58924e623c75068cdc686be61755bdbcf8d0949a2141ac532ac089f80ff083b2c9f6767038b9fc52171a00ed82c558b83216327c87b41f51c3648343869cd5b6 SHA512 9903e9c3e2279abcac09a3235f3c5db9f42156c18137eb651ede195ca2b069f0b5bc6105fed33666b69796c4ebf03e4efe63cd9beba1898bac7297a2f74bfd3d
--- a/app-shells/tcsh/files/tcsh-6.23.02-dircolors.patch
+++ b/app-shells/tcsh/files/tcsh-6.23.02-dircolors.patch
@ -0,0 +1,27 @@
 Based on original Debian patch, updated from 6.14 to 6.20 and 6.23
 silently ignore bad colour variables, for defaults have unsupported ones
 https://bugs.gentoo.org/120792
 --- a/tw.color.c
 +++ b/tw.color.c
@@ -381,16 +381,14 @@
 			if ((Char)variables[i].variable[0] == (v[0] & CHAR) &&
 			    (Char)variables[i].variable[1] == (v[1] & CHAR))
 			    break;
 +		    v += 3;
 		    if (i < nvariables) {
 -			v += 3;
 			getstring(&c, &v, &variables[i].color, ':');
 			if (i == VSym)
 			    color_as_referent = strcasecmp(
 				variables[VSym].color.s, "target") == 0;
 -			continue;
 		    }
 -		    else
 -			stderror(ERR_BADCOLORVAR, v[0], v[1]);
 +		    continue;
 		}
 		break;
 	    }
--- a/app-shells/tcsh/tcsh-6.23.02.ebuild
+++ b/app-shells/tcsh/tcsh-6.23.02.ebuild
@ -0,0 +1,110 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit flag-o-matic autotools prefix
 CONFVER="1.9"
 DESCRIPTION="Enhanced version of the Berkeley C shell (csh)"
 HOMEPAGE="https://www.tcsh.org/"
 SRC_URI="
 	ftp://ftp.astron.com/pub/tcsh/${P}.tar.gz
 	https://dev.gentoo.org/~grobian/distfiles/tcsh-gentoo-patches-r${CONFVER}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls doc"
 RESTRICT="test"
 # we need gettext because we run autoconf (AM_ICONV)
 RDEPEND="
 	>=sys-libs/ncurses-5.1:0=
 	virtual/libcrypt:=
 	virtual/libiconv"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	doc? ( dev-lang/perl )"
 CONFDIR=${WORKDIR}/tcsh-gentoo-patches-r${CONFVER}
 PATCHES=(
 	"${FILESDIR}"/${PN}-6.23.02-dircolors.patch # bug #120792
 	"${FILESDIR}"/${PN}-6.21.04-no-nls.patch
 	"${FILESDIR}"/${PN}-6.21.00-use-ncurses.patch
 )
 src_prepare() {
 	default
 	eautoreconf
 	# fix gencat usage
 	sed \
 		-e 's/cat \$\^ \$> | \$(GENCAT) \$@/rm -f $@; $(GENCAT) $@ $> $^/' \
 		-i nls/Makefile.in || die
 	# always use sysmalloc, the builtin malloc fails on Darwin, musl,
 	# etc. it's already used for glibc-linux, so this doesn't change
 	# anything for the majority of users
 	sed -i -e 's/undef SYSMALLOC/define SYSMALLOC/' config_f.h || die
 	# unify ECHO behaviour
 	echo "#undef ECHO_STYLE" >> config_f.h
 	echo "#define ECHO_STYLE      BOTH_ECHO" >> config_f.h
 	eprefixify "${CONFDIR}"/*
 	# activate the right default PATH
 	if [[ -z ${EPREFIX} ]] ; then
 		sed -i \
 			-e 's/^#MAIN//' -e '/^#PREFIX/d' \
 			"${CONFDIR}"/csh.login || die
 	else
 		sed -i \
 			-e 's/^#PREFIX//' -e '/^#MAIN/d' \
 			"${CONFDIR}"/csh.login || die
 	fi
 	eapply_user
 }
 src_configure() {
 	# make tcsh look and live along the lines of the prefix
 	append-cppflags -D_PATH_DOTCSHRC="'"'"${EPREFIX}/etc/csh.cshrc"'"'"
 	append-cppflags -D_PATH_DOTLOGIN="'"'"${EPREFIX}/etc/csh.login"'"'"
 	append-cppflags -D_PATH_DOTLOGOUT="'"'"${EPREFIX}/etc/csh.logout"'"'"
 	append-cppflags -D_PATH_USRBIN="'"'"${EPREFIX}/usr/bin"'"'"
 	append-cppflags -D_PATH_BIN="'"'"${EPREFIX}/bin"'"'"
 	# musl's utmp is non-functional
 	if use elibc_musl ; then
 		export ac_cv_header_utmp_h=no
 		export ac_cv_header_utmpx_h=no
 	fi
 	econf \
 		--prefix="${EPREFIX:-}" \
 		--datarootdir='${prefix}/usr/share' \
 		$(use_enable nls)
 }
 src_install() {
 	emake DESTDIR="${D}" install install.man
 	DOCS=( FAQ Fixes NewThings Ported README.md WishList Y2K )
 	if use doc ; then
 		perl tcsh.man2html tcsh.man || die
 		HTML_DOCS=( tcsh.html/*.html )
 	fi
 	einstalldocs
 	insinto /etc
 	doins \
 		"${CONFDIR}"/csh.cshrc \
 		"${CONFDIR}"/csh.login
 	# bug #119703: add csh -> tcsh symlink
 	dosym tcsh /bin/csh
 }
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
--- a/dev-db/citus/Manifest
+++ b/dev-db/citus/Manifest
@ -1,4 +1,6 @@
 DIST citus-10.0.6.tar.gz 5186554 BLAKE2B b7f4c46cf202bcc1a0d62d797056d5dbee625c4d00f6c0507e95201698bd9d0eceddaf2dd524e0a954a75013fcfb5f42531975ae157d1aa015a27f8adc8d9f25 SHA512 2a839eb2cc907a8294b974ec4f698042546e84757d209ce5e7c52d122f3f2af5036b3a1147d26b50170192649a19cf38d3c2bccfa445e213f604bb21ef84d478
 DIST citus-10.1.3.tar.gz 5281581 BLAKE2B cf119c550174a8b64bfee6497288a10030db7ff8d40e48d4751799d4268618afe9b7dcd72bfbd5b01dc073f6f4af55e8dc338071e3be224d15ded423885bbebd SHA512 2ad9665c5de3214a5ebc08d5df663caa634912dd9db433a43bea96d3932213786d1650a695531a4d00ab8dff7d53078848466d7a6e803bff3ab26f4df3990c91
 DIST citus-10.1.4.tar.gz 5283715 BLAKE2B e19b35734b32541678538b963f1c03a259fa404f373b759a4c08e867325e106689ff711a5db9ba9231e1f9b42e303a49e6d58c8fb18b5ab7d75e19aea4741a0e SHA512 36a19b30d63ea53a8be6a77946d54558f7fd92f2e91b356395f9273e907f24444500c31d77e9693186fc2bd8df7c7e5f62a11ddfbc8795fbde8d700ebe7a9e76
 DIST citus-10.2.3.tar.gz 5531853 BLAKE2B ed8804f699203ab3e9e6f7f03213b38e3477cdb989338dcc364e079c830bcbcb05d3fbbfa5507a306a9433ec0aa783f150cb0c8ea038265efc40f7a37fd33410 SHA512 544d47093878c4ba02502f52dd4ac23cecd67c75635d825ad43f24ef19aa5de97b1d34e1e4e86f2f23028de363cb4979244ea3639caa8f142891d247d0187322
 DIST citus-10.2.4.tar.gz 5535944 BLAKE2B 3820622ec7f60aad5989536fe6dd53b8db75c51dc31ae3a0d023058afaa369f2de29fe49369d7846ad3bd17242fb6ce7784f2832263ba79ca045c75e558e14d7 SHA512 f9d6853333984c23b3f6aaeec156719c8564958e4d446781506f95fd56e48b8df27f1ddfa1cddb085791dccd6a17c07f3df87d84a89e137ba5a6972a656222f2
 DIST citus-9.5.10.tar.gz 4744848 BLAKE2B e6d9595fe30cb93508007cb4f39933ae57b6f0f1c5ee084ac83b0f5edea0d32dc0e8fd71737e396eb9b77fd5601ae647e29dea5b13e2e7a53a59f96365773466 SHA512 24683c7607de115d1d7fc355b56ff732e5e5f2adcdbebac7ee0d71b8878de3f335f3824be9e02ae9554850c68d7e21bc6d95d581e02ba4fef9da27b2f67f2987
--- a/dev-db/citus/citus-10.1.4.ebuild
+++ b/dev-db/citus/citus-10.1.4.ebuild
@ -0,0 +1,31 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 POSTGRES_COMPAT=( 12 13 )
 inherit postgres-multi
 DESCRIPTION="Open-source postgresql extension for clustering/multi-node setups"
 HOMEPAGE="https://www.citusdata.com/"
 SRC_URI="https://github.com/citusdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 IUSE=""
 LICENSE="POSTGRESQL AGPL-3"
 KEYWORDS="~amd64"
 SLOT=0
 RESTRICT="test"
 DEPEND="${POSTGRES_DEP}
 	app-arch/lz4
 	app-arch/zstd
 	"
 RDEPEND="${DEPEND}"
 src_configure() {
 	postgres-multi_foreach econf
 }
--- a/dev-db/citus/citus-10.2.4.ebuild
+++ b/dev-db/citus/citus-10.2.4.ebuild
@ -0,0 +1,31 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 POSTGRES_COMPAT=( 12 13 14 )
 inherit postgres-multi
 DESCRIPTION="Open-source postgresql extension for clustering/multi-node setups"
 HOMEPAGE="https://www.citusdata.com/"
 SRC_URI="https://github.com/citusdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 IUSE=""
 LICENSE="POSTGRESQL AGPL-3"
 KEYWORDS="~amd64"
 SLOT=0
 RESTRICT="test"
 DEPEND="${POSTGRES_DEP}
 	app-arch/lz4
 	app-arch/zstd
 	"
 RDEPEND="${DEPEND}"
 src_configure() {
 	postgres-multi_foreach econf
 }
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@ -1,8 +1,6 @@
 DIST postgis-3.0.3.tar.gz 16871696 BLAKE2B 891f814271de9193cd17013d6d971a752d2e984cb0f68b05510450adef97fc96827e3d1a1c7e4fa4cf79a5d15eb3f74b32e6e9a8db1947f7bad7c2b23656bc8f SHA512 478f0971e18c2a1bd651c9bf7b995236aad32fda037762505cf8ac9e67a4e40917436248c1e62827a1a6da96c15c4ae8d0b606d548fa080cdff453642b897115
 DIST postgis-3.0.4.tar.gz 16871782 BLAKE2B 188e9b843526299bb112cb5f9437a9471a1b2cbf51cf85f68094172cfe98101f66cd2a72b2667161a0d40c4719ceed14299c04494e8165716b5dfd4aa84cd5c7 SHA512 0b01414433137af2708f5dee3cc054823dd788d311273f9055ab2d7bce5901e18206021381f3705408d6e263f7afc9cfcf6eaa5298b82690efaeac66486f8c0e
 DIST postgis-3.1.0.tar.gz 17262134 BLAKE2B dbc6edde826328b84ca7d6cc9329d648c7874d51528252759499131d7ad5dbc1a7a4ef881054f2fa1fc255810157270dc1c0ae0e2ea24ec702f06b9fd5f6dfed SHA512 c5b063ff7cbe855ab6ce4104d170b27eea04ae632fd6fcb8de38b14699296a8e0c9ce06bfb48ab14cba51b7a1b3f7e0a3996d9377a954dfc39fd68fe3f839e8f
 DIST postgis-3.1.1.tar.gz 17261826 BLAKE2B a14bdce3773f8cc50c72880d9b8158c32b546332884645e91cba539ab9238c3cbcbc9ee60292932c86de67a0134bdab6a2b4e6b1f3c55881afbb36a08d8f138a SHA512 b975d26c1ad01fa6b90b5b3b51fd2b4b33204a380af0f76b98d1bfd6bd95f527d4ac3548f1b822e114be17bb3a133bc88c3d33a17d4effdfa1f90ec0c683e5e5
 DIST postgis-3.1.2.tar.gz 17266501 BLAKE2B acc65e3ab70667c57a71bcb9c7bbfc382f8a6038ceb0e91aac07e36fb6b4cb6365aa968b30af13eda8292410cc1b567d871970e6cb7dfaadb454147224f9b834 SHA512 df9d2fa118987e29acd635912a708e643770ad3df82c098f8129f11ab07a9eafde969302d2d2e59a68fea6fc7312fe768a231dd4cb5de7002c418725da75848a
 DIST postgis-3.1.3.tar.gz 17273487 BLAKE2B 603be66476037fca5e75b00079a26b4beaa50f0af0626f89660f17da398576d929574cb363c4177877d9c8db5459f7eac964b85796cd93b0d0c6ff2462d7ad3f SHA512 525c982de6b5888d1f4a4f6d2cca5dfa945d8899d8038b1d62ce222e0149c4ab26a2a3602bb8c85e89ce22b3d5b20d278fc4f841144f4b0d19e6de4f48d819ad
-DIST postgis-3.1.4.tar.gz 17269391 BLAKE2B 6070fb72c777f8baf9c520ec51cf436837fffb54f21af5b4cf800940240f2fb9fcee162b2d3817cbfd4e60c2cef37eb4cf902d9e9f065e537d8d9b8ec965bef3 SHA512 afd84b45b146bdae310580fc9f8a878dd658f9e74f99c41f5d143f32974d5f5017ab4190855dcaea915a31ac2a78d34bf5561f206965264de3252f2c2ac57683
+DIST postgis-3.1.5.tar.gz 17282333 BLAKE2B 3abe3b24ad0b8a9621c206f881a920ec4e37aa75ccc68ab8e4a43a372bb9047613c81d375051a948999068595de04f14bf4f0b7921b3f3894ff77a9d8c1c3063 SHA512 640196f4c983aeb1d661d98e099f4e2a47f32b15bfde21479b8fdb2aa5d12b4c564b0962973ec1a8dd64fbfac7cd7bc94d84376935294f23ba31d7501fe64a06
 DIST postgis-3.2.0.tar.gz 16884722 BLAKE2B 118ae754199521e46508b404275bfe323465e5543ad8351d3dec3582800f6c475c30333b35ad48aac373f9d8e3875790c58858f638ee4ecb7465764703d07d40 SHA512 b49b2fbb88ec07981c0fd05400ad807e85553164023a4b47326c21f48b4e07827a183676c497ad6823dc3a6b97518e1d40906826b8a91739c96966d62858b2b5
--- a/dev-db/postgis/postgis-3.1.1-r1.ebuild
+++ b/dev-db/postgis/postgis-3.1.1-r1.ebuild
@ -1,143 +0,0 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 POSTGRES_COMPAT=( 9.6 {10..13} )
 POSTGRES_USEDEP="server"
 inherit autotools postgres-multi toolchain-funcs
 MY_P="${PN}-$(ver_rs 3 '')"
 if [[ ${PV} = *9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.osgeo.org/gitea/postgis/postgis.git"
 else
 	PGIS="$(ver_cut 1-2)"
 	SRC_URI="https://download.osgeo.org/postgis/source/${MY_P}.tar.gz"
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
 DESCRIPTION="Geographic Objects for PostgreSQL"
 HOMEPAGE="https://postgis.net"
 S="${WORKDIR}/${MY_P}"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="address-standardizer doc gtk static-libs topology"
 REQUIRED_USE="${POSTGRES_REQ_USE}"
 # Needs a running psql instance, doesn't work out of the box
 RESTRICT="test"
 RDEPEND="${POSTGRES_DEP}
 	dev-libs/json-c:=
 	dev-libs/libxml2:2
 	dev-libs/protobuf-c:=
 	>=sci-libs/geos-3.9.0
 	<sci-libs/proj-8:=
 	>=sci-libs/gdal-1.10.0:=
 	address-standardizer? ( dev-libs/libpcre )
 	gtk? ( x11-libs/gtk+:2 )
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? (
 		app-text/docbook-xsl-stylesheets
 		app-text/docbook-xml-dtd:4.5
 		dev-libs/libxslt
 		virtual/imagemagick-tools[png]
 	)
 "
 PATCHES=(
 	"${FILESDIR}/${PN}-2.2.0-arflags.patch"
 	"${FILESDIR}/${PN}-3.0.3-avoid-calling-ar-directly.patch"
 	"${FILESDIR}/${PN}-3.0.3-detect-only-stdc.patch"
 	"${FILESDIR}/${PN}-3.0.3-try-other-cpp-names.patch"
 )
 src_prepare() {
 	default
 	if [[ ${PV} = *9999* ]] ; then
 		source "${S}"/Version.config
 		PGIS="${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}"
 	fi
 	# These modules are built using the same *FLAGS that were used to build
 	# dev-db/postgresql. The right thing to do is to ignore the current
 	# *FLAGS settings.
 	QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
 	# bug #775968
 	touch build-aux/ar-lib || die
 	local AT_M4DIR="macros"
 	eautoreconf
 	postgres-multi_src_prepare
 }
 src_configure() {
 	export CPP=$(tc-getCPP)
 	local myeconfargs=(
 		$(use_with address-standardizer)
 		$(use_with gtk gui)
 		$(use_with topology)
 	)
 	postgres-multi_foreach econf "${myeconfargs[@]}"
 }
 src_compile() {
 	postgres-multi_foreach emake
 	postgres-multi_foreach emake -C topology
 	if use doc ; then
 		postgres-multi_foreach emake comments
 		postgres-multi_foreach emake cheatsheets
 		postgres-multi_forbest emake -C doc html
 	fi
 }
 src_install() {
 	postgres-multi_foreach emake DESTDIR="${D}" install
 	postgres-multi_foreach emake -C topology DESTDIR="${D}" install
 	postgres-multi_forbest dobin ./utils/postgis_restore.pl
 	dodoc CREDITS TODO loader/README.* doc/*txt
 	docinto topology
 	dodoc topology/{TODO,README}
 	if use doc ; then
 		postgres-multi_foreach emake DESTDIR="${D}" comments-install
 		docinto html
 		postgres-multi_forbest dodoc doc/html/{postgis.html,style.css}
 		docinto html/images
 		postgres-multi_forbest dodoc doc/html/images/*
 	fi
 	use static-libs || find "${ED}" -name '*.a' -delete
 }
 pkg_postinst() {
 	ebegin "Refreshing PostgreSQL symlinks"
 	postgresql-config update
 	eend $?
 	local base_uri="https://postgis.net/docs/manual-"
 	if [[ ${PV} = *9999* ]] ; then
 		base_uri+="dev"
 	else
 		base_uri+="${PGIS}"
 	fi
 	elog "To finish installing PostGIS, follow the directions detailed at:"
 	elog "${base_uri}/postgis_installation.html#create_new_db_extensions"
 }
--- a/dev-db/postgis/postgis-3.1.2.ebuild
+++ b/dev-db/postgis/postgis-3.1.2.ebuild
@ -1,143 +0,0 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 POSTGRES_COMPAT=( 9.6 {10..13} )
 POSTGRES_USEDEP="server"
 inherit autotools postgres-multi toolchain-funcs
 MY_P="${PN}-$(ver_rs 3 '')"
 if [[ ${PV} = *9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.osgeo.org/gitea/postgis/postgis.git"
 else
 	PGIS="$(ver_cut 1-2)"
 	SRC_URI="https://download.osgeo.org/postgis/source/${MY_P}.tar.gz"
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
 DESCRIPTION="Geographic Objects for PostgreSQL"
 HOMEPAGE="https://postgis.net"
 S="${WORKDIR}/${MY_P}"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="address-standardizer doc gtk static-libs topology"
 REQUIRED_USE="${POSTGRES_REQ_USE}"
 # Needs a running psql instance, doesn't work out of the box
 RESTRICT="test"
 RDEPEND="${POSTGRES_DEP}
 	dev-libs/json-c:=
 	dev-libs/libxml2:2
 	dev-libs/protobuf-c:=
 	>=sci-libs/geos-3.9.0
 	>=sci-libs/proj-4.9.0:=
 	>=sci-libs/gdal-1.10.0:=
 	address-standardizer? ( dev-libs/libpcre )
 	gtk? ( x11-libs/gtk+:2 )
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? (
 		app-text/docbook-xsl-stylesheets
 		app-text/docbook-xml-dtd:4.5
 		dev-libs/libxslt
 		virtual/imagemagick-tools[png]
 	)
 "
 PATCHES=(
 	"${FILESDIR}/${PN}-2.2.0-arflags.patch"
 	"${FILESDIR}/${PN}-3.0.3-avoid-calling-ar-directly.patch"
 	"${FILESDIR}/${PN}-3.0.3-detect-only-stdc.patch"
 	"${FILESDIR}/${PN}-3.0.3-try-other-cpp-names.patch"
 )
 src_prepare() {
 	default
 	if [[ ${PV} = *9999* ]] ; then
 		source "${S}"/Version.config
 		PGIS="${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}"
 	fi
 	# These modules are built using the same *FLAGS that were used to build
 	# dev-db/postgresql. The right thing to do is to ignore the current
 	# *FLAGS settings.
 	QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
 	# bug #775968
 	touch build-aux/ar-lib || die
 	local AT_M4DIR="macros"
 	eautoreconf
 	postgres-multi_src_prepare
 }
 src_configure() {
 	export CPP=$(tc-getCPP)
 	local myeconfargs=(
 		$(use_with address-standardizer)
 		$(use_with gtk gui)
 		$(use_with topology)
 	)
 	postgres-multi_foreach econf "${myeconfargs[@]}"
 }
 src_compile() {
 	postgres-multi_foreach emake
 	postgres-multi_foreach emake -C topology
 	if use doc ; then
 		postgres-multi_foreach emake comments
 		postgres-multi_foreach emake cheatsheets
 		postgres-multi_forbest emake -C doc html
 	fi
 }
 src_install() {
 	postgres-multi_foreach emake DESTDIR="${D}" install
 	postgres-multi_foreach emake -C topology DESTDIR="${D}" install
 	postgres-multi_forbest dobin ./utils/postgis_restore.pl
 	dodoc CREDITS TODO loader/README.* doc/*txt
 	docinto topology
 	dodoc topology/{TODO,README}
 	if use doc ; then
 		postgres-multi_foreach emake DESTDIR="${D}" comments-install
 		docinto html
 		postgres-multi_forbest dodoc doc/html/{postgis.html,style.css}
 		docinto html/images
 		postgres-multi_forbest dodoc doc/html/images/*
 	fi
 	use static-libs || find "${ED}" -name '*.a' -delete
 }
 pkg_postinst() {
 	ebegin "Refreshing PostgreSQL symlinks"
 	postgresql-config update
 	eend $?
 	local base_uri="https://postgis.net/docs/manual-"
 	if [[ ${PV} = *9999* ]] ; then
 		base_uri+="dev"
 	else
 		base_uri+="${PGIS}"
 	fi
 	elog "To finish installing PostGIS, follow the directions detailed at:"
 	elog "${base_uri}/postgis_installation.html#create_new_db_extensions"
 }
--- a/dev-db/postgis/postgis-3.1.5.ebuild
+++ b/dev-db/postgis/postgis-3.1.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=7
--- a/dev-db/sqlite/sqlite-3.37.2.ebuild
+++ b/dev-db/sqlite/sqlite-3.37.2.ebuild
@ -22,7 +22,7 @@ fi
 LICENSE="public-domain"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
 if [[ "${PV}" == "9999" ]]; then
 	PROPERTIES="live"
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
--- a/dev-embedded/libftdi/libftdi-1.5-r3.ebuild
+++ b/dev-embedded/libftdi/libftdi-1.5-r3.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit cmake python-single-r1
 MY_P="${PN}1-${PV}"
--- a/dev-embedded/libftdi/libftdi-9999.ebuild
+++ b/dev-embedded/libftdi/libftdi-9999.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 inherit cmake python-single-r1
 MY_P="${PN}1-${PV}"
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
--- a/dev-games/higan-ananke/Manifest
+++ b/dev-games/higan-ananke/Manifest
@ -1 +0,0 @@
 DIST higan_v094-source.tar.xz 882732 BLAKE2B fb2794a95060befc3495f347328e62c45ee8a21b888a9958857f739f5fb138704275b3624241fee4224e78678746e68d534db6d8d839eb4a6973c092819c509b SHA512 e7e48c76cdc93d2d66db1fa0c71e64903cf4188571b2d5ecb8066dd4e2172a67da4dee68bed6fd0a532b6fd397fa4f537b97de58cc5043a9e970d48d0b66b0da
--- a/dev-games/higan-ananke/files/higan-ananke-094-makefile.patch
+++ b/dev-games/higan-ananke/files/higan-ananke-094-makefile.patch
@ -1,38 +0,0 @@
 --- a/ananke/Makefile
 +++ b/ananke/Makefile
@@ -2,7 +2,7 @@
 include ../phoenix/Makefile
 path := /usr/local/lib
 -flags := $(flags) -O3 -fomit-frame-pointer -I..
 +flags := $(flags) $(CXXFLAGS) -I..
 all:
 	$(compiler) $(cppflags) $(flags) -fPIC -o obj/ananke.o -c ananke.cpp
@@ -13,7 +13,7 @@
 else ifeq ($(platform),macosx)
 	$(compiler) $(link) -shared -dynamiclib -undefined suppress -flat_namespace -o libananke.dylib obj/ananke.o
 else
 -	$(compiler) $(link) -shared -Wl,-soname,libananke.so.1 -o libananke.so obj/ananke.o
 +	$(compiler) $(link) $(LDFLAGS) -shared -Wl,-soname,libananke.so.1 -o libananke.so obj/ananke.o
 endif
 resource: force
 --- a/nall/Makefile
 +++ b/nall/Makefile
@@ -53,11 +53,11 @@
     link :=
   endif
 -  cflags := -x c -std=c99
 -  objcflags := -x objective-c -std=c99
 -  cppflags := -x c++ -std=c++11
 -  objcppflags := -x objective-c++ -std=c++11
 endif
 +cflags := -x c -std=c99
 +objcflags := -x objective-c -std=c99
 +cppflags := -x c++ -std=c++11
 +objcppflags := -x objective-c++ -std=c++11
 # cross-compilation support
 ifeq ($(arch),x86)
--- a/dev-games/higan-ananke/higan-ananke-094.ebuild
+++ b/dev-games/higan-ananke/higan-ananke-094.ebuild
@ -1,37 +0,0 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit toolchain-funcs
 MY_P=higan_v${PV}-source
 DESCRIPTION="A higan helper library needed for extra rom load options"
 HOMEPAGE="http://byuu.org/higan/"
 SRC_URI="http://byuu.org/files/${MY_P}.tar.xz"
 S="${WORKDIR}"/${MY_P}/ananke
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
 PATCHES=(
 	"${FILESDIR}"/${P}-makefile.patch
 )
 src_prepare() {
 	cd "${WORKDIR}"/${MY_P} || die
 	default
 }
 src_compile() {
 	emake \
 		platform="linux" \
 		compiler="$(tc-getCXX)"
 }
 src_install() {
 	newlib.so libananke.so libananke.so.1
 	dosym libananke.so.1 /usr/$(get_libdir)/libananke.so
 }
--- a/dev-games/higan-ananke/metadata.xml
+++ b/dev-games/higan-ananke/metadata.xml
@ -1,8 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
 </pkgmetadata>
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
--- a/dev-java/log4j-api/Manifest
+++ b/dev-java/log4j-api/Manifest
@ -1 +1 @@
-DIST apache-log4j-2.15.0-src.tar.gz 11550453 BLAKE2B 3b7a356714fbff0ad81f633750a45f6b3869df933c89c22b28346e49c6dfb83002ecf6374d04b1ae6a45b5486314654c8a660f3aee7a6b30273439e44db2c610 SHA512 61574722ab0a24bd0301fea57504a645f98f0e5913d1e02e49d25b3dcbf2dcbb3153cfca58fdde632087f94edc8e83820951288ba494234954ab4eeeb6b8be6a
+DIST apache-log4j-2.17.1-src.tar.gz 11602282 BLAKE2B 6e6a69565ee28fc138ddb78258ac30b13a9be3f3baee64c3427b63b059c552d314be3c4a345ea297010d345c4dcb31d154aaea6cd2fc587512c6087c5dfe0745 SHA512 21cdfca54eb0d6af261a5ae89ff98197473d9c0203b0ab530f3aef6c90957bfb95a423983c8a19d7fbab05ec194b6fad8e46628e32270dd8b94ddd194a1cb177
--- a/dev-java/log4j-api/log4j-api-2.17.1.ebuild
+++ b/dev-java/log4j-api/log4j-api-2.17.1.ebuild
@ -2,12 +2,12 @@
 # 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.15.0/apache-log4j-2.15.0-src.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild log4j-api-2.15.0.ebuild
+# java-ebuilder --generate-ebuild --workdir . --pom log4j-api/pom.xml --download-uri mirror://apache/logging/log4j/2.17.1/apache-log4j-2.17.1-src.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild log4j-api-2.17.1.ebuild
 EAPI=8
 JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.logging.log4j:log4j-api:2.15.0"
+MAVEN_ID="org.apache.logging.log4j:log4j-api:2.17.1"
 JAVA_TESTING_FRAMEWORKS="junit-vintage junit-jupiter"
 inherit java-pkg-2 java-pkg-simple
@ -25,11 +25,10 @@ RESTRICT="test"
 # Compile dependencies
 # POM: ${PN}/pom.xml
-# org.apache.logging.log4j:log4j-api-java9:2.15.0 -> >=dev-java/log4j-api-java9-2.15.0:2
+# org.osgi:org.osgi.core:4.3.1 -> >=dev-java/osgi-core-api-5.0.0:0
 # org.osgi:org.osgi.core:4.3.1 -> !!!artifactId-not-found!!!
 # POM: ${PN}/pom.xml
-# test? com.fasterxml.jackson.core:jackson-core:2.12.4 -> !!!groupId-not-found!!!
+# test? com.fasterxml.jackson.core:jackson-core:2.12.4 -> >=dev-java/jackson-core-2.13.0:0
-# test? com.fasterxml.jackson.core:jackson-databind:2.12.4 -> !!!groupId-not-found!!!
+# test? com.fasterxml.jackson.core:jackson-databind:2.12.4 -> >=dev-java/jackson-databind-2.13.0: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.6.3 -> !!!groupId-not-found!!!
@ -40,41 +39,42 @@ RESTRICT="test"
 # test? org.junit.jupiter:junit-jupiter-params:5.7.2 -> !!!groupId-not-found!!!
 # test? org.junit.vintage:junit-vintage-engine:5.7.2 -> !!!groupId-not-found!!!
-DEPEND=">=virtual/jdk-11:*
+DEPEND=">=virtual/jdk-1.8:*
-	dev-java/osgi-core-api:0
+	dev-java/osgi-core-api:0"
 	dev-java/log4j-api-java9:2"
 #	test? (
 #		!!!groupId-not-found!!!
 #		!!!suitable-mavenVersion-not-found!!!
 #		>=dev-java/commons-lang-3.12.0:3.6
 #		>=dev-java/jackson-core-2.13.0:0
 #		>=dev-java/jackson-databind-2.13.0:0
 #	)
 #"
-RDEPEND=">=virtual/jre-11:*"
+RDEPEND=">=virtual/jre-1.8:*"
 DOCS=( {CONTRIBUTING,README,RELEASE-NOTES,SECURITY}.md LICENSE.txt )
 S="${WORKDIR}/apache-log4j-${PV}-src"
-JAVA_CLASSPATH_EXTRA="log4j-api-java9-2,osgi-core-api"
+JAVA_CLASSPATH_EXTRA="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!!!,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_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_prepare() {
+#	src_prepare() {
-	default
+#		default
-	mkdir -p log4j-api/src/main/resources/META-INF/versions/9 || die
+#		mkdir -p log4j-api/src/main/resources/META-INF/versions/9 || die
-	pushd log4j-api/src/main/resources/META-INF/versions/9 || die
+#		pushd log4j-api/src/main/resources/META-INF/versions/9 || die
-		jar -xf "$(java-pkg_getjar --build-only log4j-api-java9-2 log4j-api-java9.jar)" \
+#			jar -xf "$(java-pkg_getjar --build-only log4j-api-java9-2 log4j-api-java9.jar)" \
-			org/apache/logging/log4j/util module-info.class || die
+#				org/apache/logging/log4j/util module-info.class || die
-		rm org/apache/logging/log4j/util/{PrivateSecurityManagerStackTraceUtil,PropertySource}.class || die
+#			rm org/apache/logging/log4j/util/{PrivateSecurityManagerStackTraceUtil,PropertySource}.class || die
-	popd || die
+#		popd || die
-}
+#	}
 src_install() {
 	default # https://bugs.gentoo.org/789582
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@ -13,7 +13,9 @@ DIST OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.1_12.tar.gz 188878354 BLAKE2B 4e2
 DIST OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.2_8.tar.gz 188965124 BLAKE2B 659bf8518b3104e1fedd116cb9af8b0455d323ce883485f5e42cc9d1fb4d9bae5556757b309a7473559bd67c17a9aa0e0c51934e549141b25dcaeb9032a55b80 SHA512 5eadc730b39f6300be7b64a0a4e9d87873cdfa7b0a031923ddfab473affd5b22788a33e2f01412c99c2e42ffb2774cc655c732e7721a6fc02c2b34a42dc9088d
 DIST OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.2_8.tar.gz 182550014 BLAKE2B 24a7aae5c6d282a416c996f6b35ff5c92522ac7853d4cc3248a34f642029fb95b798de3159dcd7ee60a9952dd5ef2926a97c82df0708655044fb4faa6d82019f SHA512 50e27087804582a1b124a17762cf24272cbd24ae1d1bc443950bd91c88da220415ca429894bd1d1172cb39fdbff262470276a3b3e9043b5eabf550c05ee2438b
 DIST OpenJDK17U-jdk_arm_linux_hotspot_17.0.1_12.tar.gz 188832535 BLAKE2B 4ea2e209f7bebde4cfae439773b42cb9d4143eb5b61a5e69fba181946cd3a3dc977966ed14e24ce6b23066450e64bbf204b72b04562f7af381c765bb4ea31d53 SHA512 615806f02c108c08be70d975f3dc402fc2e30f9a961630fe6528eedb7a5ee76ac07851ada5264fe263453eaefc40aa1ded1cefa37d3455af78b04fdf9caf9a93
 DIST OpenJDK17U-jdk_arm_linux_hotspot_17.0.2_8.tar.gz 188894874 BLAKE2B 9881d30cc0b4edc1c3a2d5978b08e820833e82c202f39ddf20600e56c596dc5b53d667eafdeb3048ed59a1d4e13f2ecfa136e123d8ae3f14ce43ece6ede9ab55 SHA512 708aa4a6912970ef6ea88ac3a4fcc04d4adaafcb207837dbe6c1f1e731e87faeb985fc8338a9d59f5637778be40690189c5c936ffb819265b558fc06bee99ddb
 DIST OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.1_12.tar.gz 187718236 BLAKE2B a55eeb2651d6fbd83b579527761e246bc3babb3858b7c14823e0d512e308a65be1e35899206c1e2458db74ee2aaf4d69578b4045a13a35a0b3d6577d4821d137 SHA512 5179991d451f8736776de933aa44fa726217282da66236f373a0e47d815d03754f28588acf0aca55258ca1085d0e06f53627092bd0cff2c2b60eb6ff9c1df248
 DIST OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.2_8.tar.gz 189073596 BLAKE2B 1303795dd08dedee8ea4723adaeaae4ab7ef28b81da0f5fd8b19ac5f027ec8f7edb67efe37ca47381a44b4a94223a36d37652a290c2f2cf9702520e01b700786 SHA512 beab26ef69c0ed07a14976c01dad4b2a4d708d04b22c86dabff7b87eaefd8e03f627c5c3388a0dbc55b10edaa14004bc0c44ea1fe3edb18e68cb23105d2ca44d
 DIST OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.1_12.tar.gz 191355612 BLAKE2B 21c1459c58a10ed6a87a422e70fc4fa27a37a1ea4cbd121e237d82f9ec0991e7245193c5a44cd2826d502301166a48e2d3e7ac0015dcb9a1c3732f03210ff366 SHA512 30ce2ff05d46ea125fc17256420c8bf9dcc3afe802338cd62d0961e6588cf54663aee07c6d4d21fd0f363b58628ee34cf4f9cf622b6da970924aa94d47e6406a
 DIST OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.2_8.tar.gz 191420670 BLAKE2B 901cd6f9e816e1eaa949c97a86d9cfa6d3265b33da483ac5a4ba87621b5a196c7c51305be19745f8aa504ee4471a583180bc36de5a6013ca59e4f0890ea8fa34 SHA512 e80c8f02a35587c9305a92ed20926e79b0bab6b2d0fa3fd62ef7825383f68567c38cb52d2cc82b5def219df1fe2dbb531d0973b3713d1ec18c06c6967a228f73
 DIST OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz 191978211 BLAKE2B f0428e67c6f75bc204c8e7c74b25c73a270cff1889c0e3fdcc830f868bcddb58e6c9a480ba0313638a7edf56dd2e61e52b7c4f1dd9ad3643f3e70c9770141c93 SHA512 057fc5c4869bc9113c1a299b125c8bed47e4a841238b42fbd4b39adfd7bbbca0fa9efed7315a98303ff8f4000afd02baaa5b3169be6287d06edbfbbb44728538
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.14_p9-r1.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.14_p9-r1.ebuild
@ -41,7 +41,7 @@ SRC_URI="
 DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
 HOMEPAGE="https://adoptium.net"
 LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x64-macos"
 IUSE="alsa cups headless-awt selinux source"
 RDEPEND="
--- a/dev-java/openjdk-bin/openjdk-bin-17.0.2_p8.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-17.0.2_p8.ebuild
@ -31,16 +31,18 @@ SLOT=${MY_PV%%[.+]*}
 SRC_URI="
 	$(abi_uri aarch64 arm64)
 	$(abi_uri arm)
 	$(abi_uri x64 amd64)
 	$(abi_uri x64 amd64 musl)
 	$(abi_uri aarch64 arm64-macos)
 	$(abi_uri ppc64le ppc64)
 	$(abi_uri x64 x64-macos)
 "
 DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
 HOMEPAGE="https://adoptium.net"
 LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64 ~arm64 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x64-macos"
 IUSE="alsa cups +gentoo-vm headless-awt selinux source"
 RDEPEND="
--- a/dev-java/openjdk-bin/openjdk-bin-8.322_p06.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-8.322_p06.ebuild
@ -33,7 +33,7 @@ SRC_URI="
 "
 LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x64-macos"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x64-macos"
 IUSE="alsa cups examples headless-awt selinux source"
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9.ebuild
@ -21,7 +21,7 @@ SRC_URI="
 DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin"
 HOMEPAGE="https://adoptopenjdk.net"
 LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="alsa cups +gentoo-vm headless-awt selinux"
 RDEPEND="
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.322_p06.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.322_p06.ebuild
@ -21,7 +21,7 @@ SRC_URI="
 "
 LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="alsa cups headless-awt selinux"
--- a/dev-java/openjdk/openjdk-11.0.14_p9-r1.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.14_p9-r1.ebuild
@ -40,7 +40,7 @@ SRC_URI="
 "
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap"
--- a/dev-java/openjdk/openjdk-17.0.2_p8.ebuild
+++ b/dev-java/openjdk/openjdk-17.0.2_p8.ebuild
@ -41,7 +41,7 @@ SRC_URI="
 "
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="alsa big-endian cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap"
--- a/dev-java/openjdk/openjdk-8.322_p06.ebuild
+++ b/dev-java/openjdk/openjdk-8.322_p06.ebuild
@ -16,7 +16,7 @@ HOMEPAGE="https://openjdk.java.net"
 SRC_URI="https://github.com/openjdk/jdk${SLOT}u/archive/refs/tags/jdk${MY_PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="alsa debug cups doc examples headless-awt javafx +jbootstrap selinux source"
 COMMON_DEPEND="
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
--- a/dev-lang/fennel/Manifest
+++ b/dev-lang/fennel/Manifest
@ -1 +1,2 @@
 DIST fennel-0.9.1.tar.gz 203441 BLAKE2B 74f461b3e7a24cdae0c8dde590814cb9753a12ab62e797746cc8753d178007a09084037e443d8309fa11ff309a5c6bf6c2e369942ef357aa0402883cef278542 SHA512 87e7ffbef0b49499a93255f50e77f53b9be4faa6d4609d8d65e3a64470bbf07b49a55e7dd547fda4b0e5fe0f4f1e6ece18282cc89955a57ed0a50be8dc01261c
 DIST fennel-1.0.0.tar.gz 243719 BLAKE2B 07758493c8c96d2d5151a1cb38da9fec002eb2522926dc2cad0a125c3e608daf2035a3d21743a8634a5fd0cab372e78ee0179710388c56888cb9a2fef167ea58 SHA512 4ad1635807d244297fdc7bf7c06568ae708ae805dcaac2bb190fad412da21c9e3c3b86a6afa223e343488c725afea94682f213332fb22ba66eb5190e97f18415
--- a/dev-lang/fennel/fennel-1.0.0.ebuild
+++ b/dev-lang/fennel/fennel-1.0.0.ebuild
@ -0,0 +1,36 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
 # Fails to build with with lua5-1
 LUA_COMPAT=( lua5-{3,4} luajit )
 inherit lua-single
 DESCRIPTION="Lisp-like language that compiles to Lua"
 HOMEPAGE="https://fennel-lang.org/"
 if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.sr.ht/~technomancy/${PN}"
 else
 	SRC_URI="https://git.sr.ht/~technomancy/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 LICENSE="MIT"
 SLOT="0/${PV}"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 RDEPEND="${LUA_DEPS}"
 DEPEND="${RDEPEND}"
 src_install() {
 	emake LUA_LIB_DIR="${ED}/$(lua_get_lmod_dir)" PREFIX="${ED}/usr" install
 	rm -r "${ED}"/usr/man || die
 	doman ${PN}.1
 	dodoc *.md
 }
--- a/dev-lang/fennel/metadata.xml
+++ b/dev-lang/fennel/metadata.xml
@ -6,24 +6,18 @@
    <email>xgqt@gentoo.org</email>
    <name>Maciej Barć</name>
  </maintainer>
-  <longdescription lang="en">
+  <longdescription>
    Fennel is a lisp that compiles to Lua. It aims to be easy to use,
    expressive, and has almost zero overhead compared to handwritten Lua.
-
+    Full Lua compatibility - You can use any function or library from Lua.
-    - Full Lua compatibility - You can use any function or library from Lua.
+    Zero overhead - Compiled code should be just as or more efficient
    - Zero overhead - Compiled code should be just as or more efficient
    than hand-written Lua.
-    - Compile-time macros - Ship compiled code with no runtime dependency
+    Compile-time macros - Ship compiled code with no runtime dependency
    on Fennel.
-    - Embeddable - Fennel is a one-file library as well as an executable.
+    Embeddable - Fennel is a one-file library as well as an executable.
    Embed it in other programs to support runtime extensibility and
    interactive development.
    At https://fennel-lang.org there's a live in-browser REPL you can use
    without installing anything.
  </longdescription>
  <upstream>
    <bugs-to>https://github.com/bakpakin/Fennel/issues</bugs-to>
    <remote-id type="github">bakpakin/Fennel</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
--- a/dev-libs/crc32c/crc32c-1.1.2-r1.ebuild
+++ b/dev-libs/crc32c/crc32c-1.1.2-r1.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/crc32c/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~mips ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
--- a/dev-libs/expat/expat-2.4.4.ebuild
+++ b/dev-libs/expat/expat-2.4.4.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/ex
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="examples static-libs unicode"
 BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
--- a/dev-libs/imath/imath-3.1.3.ebuild
+++ b/dev-libs/imath/imath-3.1.3.ebuild
@ -13,7 +13,7 @@ DESCRIPTION="Imath basic math package"
 HOMEPAGE="https://imath.readthedocs.io"
 SRC_URI="https://github.com/AcademySoftwareFoundation/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 # re-keywording needed for (according to ilmbase keywords): ~x64-macos ~x86-solaris
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 S="${WORKDIR}/${MY_PN}-${PV}"
 LICENSE="BSD"
--- a/dev-libs/leveldb/leveldb-1.23-r2.ebuild
+++ b/dev-libs/leveldb/leveldb-1.23-r2.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.
 LICENSE="BSD"
 SLOT="0/1"
-KEYWORDS="amd64 ~arm arm64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+crc32c +snappy +tcmalloc test"
 RESTRICT="!test? ( test )"
--- a/dev-libs/libburn/libburn-1.5.4.ebuild
+++ b/dev-libs/libburn/libburn-1.5.4.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="http://files.libburnia-project.org/releases/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="debug static-libs"
 BDEPEND="
--- a/dev-libs/libevdev/libevdev-1.12.0.ebuild
+++ b/dev-libs/libevdev/libevdev-1.12.0.ebuild
@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://www.freedesktop.org/software/libevdev/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 LICENSE="MIT"
--- a/dev-libs/libisoburn/libisoburn-1.5.4.ebuild
+++ b/dev-libs/libisoburn/libisoburn-1.5.4.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="http://files.libburnia-project.org/releases/${P}.tar.gz"
 LICENSE="GPL-2 GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="acl debug external-filters external-filters-setuid frontend-optional
 	launch-frontend launch-frontend-setuid libedit readline static-libs xattr zlib"
--- a/dev-libs/libisofs/libisofs-1.5.4.ebuild
+++ b/dev-libs/libisofs/libisofs-1.5.4.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="http://files.libburnia-project.org/releases/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="acl debug static-libs verbose-debug xattr zlib"
 BDEPEND="
--- a/dev-libs/protobuf-c/protobuf-c-1.4.0-r1.ebuild
+++ b/dev-libs/protobuf-c/protobuf-c-1.4.0-r1.ebuild
@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="BSD-2"
 # Subslot == SONAME version
 SLOT="0/1.0.0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
--- a/dev-libs/protobuf/protobuf-3.17.3.ebuild
+++ b/dev-libs/protobuf/protobuf-3.17.3.ebuild
@ -22,7 +22,7 @@ fi
 LICENSE="BSD"
 SLOT="0/28"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="emacs examples static-libs test zlib"
 RESTRICT="!test? ( test )"
--- a/Show More
+++ b/Show More
`@ -1,2 +1,2 @@`
	`DIST p11-kit-0.23.22.tar.xz 830016 BLAKE2B 4e1edfd9e2441d237c07a16c003aee5ffde38f1cf545c26e435645429f2cfa4fe7ca61cdc3c3940390aa040ba991f2ee3995b14cc31bb886d5eeffa8ed5e1721 SHA512 098819e6ca4ad9cc2a0bc2e478aea67354d051a4f03e6c7d75d13d2469b6dc7654f26b15530052f6ed51acb35531c2539e0f971b31e29e6673e857c903afb080`	`DIST p11-kit-0.23.22.tar.xz 830016 BLAKE2B 4e1edfd9e2441d237c07a16c003aee5ffde38f1cf545c26e435645429f2cfa4fe7ca61cdc3c3940390aa040ba991f2ee3995b14cc31bb886d5eeffa8ed5e1721 SHA512 098819e6ca4ad9cc2a0bc2e478aea67354d051a4f03e6c7d75d13d2469b6dc7654f26b15530052f6ed51acb35531c2539e0f971b31e29e6673e857c903afb080`
	`DIST p11-kit-0.24.0.tar.xz 834392 BLAKE2B f967b51d3b021c6e95a0ddc1934527023aa4acbae2b193d64829620331ea0f094e1467fdea897a3121d05f30b1747607197a50c906a40609913230ab363c09e5 SHA512 48369d6fdae79b8c5a255c821fbdb982f0c649cce07c0d92f0ff0c16322fea8919faa94067cae2efede2da3646c0e69a71a3e399b769dc2327f247bcb113eb3c`	`DIST p11-kit-0.24.1.tar.xz 838304 BLAKE2B e5cb98881279199e2674e2ff4f12d72c4d126c54429ee7ece6dd56ad1987f84abf58a67b8bf2405b19a5bca9d1106f8ec901364ac3d2488f65b3f92b51f850fe SHA512 8cf170c714bb9e0cf3df93e8ec55b8e3c55cabf2c6a27f177ac6de8b8028985df2ca0216d3215d6828dc2ae3095c4e1a4febe8cb26b88ec321defc66bb011e81`
`@ -1 +1,2 @@`
	`DIST diskimage-builder-3.16.0.tar.gz 499320 BLAKE2B 2cf520957c270696a6c4c7f59d6c875d30e7245c9fa24d556ef90eca4bab9e45eb95ecc422bc84ac202df0ba8afbaac412663892c8ab18bd4847e5d630ea4e43 SHA512 e592fd9200681314519b6e58b4b3ba9106d3834e83e708b3f32c125a8f597252f43abec05b37a9f6b30397874d53b56740e2374d6d13f69e737d460f191bdd98`	`DIST diskimage-builder-3.16.0.tar.gz 499320 BLAKE2B 2cf520957c270696a6c4c7f59d6c875d30e7245c9fa24d556ef90eca4bab9e45eb95ecc422bc84ac202df0ba8afbaac412663892c8ab18bd4847e5d630ea4e43 SHA512 e592fd9200681314519b6e58b4b3ba9106d3834e83e708b3f32c125a8f597252f43abec05b37a9f6b30397874d53b56740e2374d6d13f69e737d460f191bdd98`
		`DIST diskimage-builder-3.17.0.tar.gz 500580 BLAKE2B f219e8e1a3224dd23871a3d4f4688c6e8b75ad681763227a0dde34b3f89b0f5a7af827c1717a161f310590090cc0852936edb6b9e7298bbc989b01e4af28662d SHA512 466039b6cf83636a2a245b5d36f7bf0e71e897edf092010219a40bcbe1804b0fe1f205eec2388cfbcd2e2adfdaf9256c53a01e3cf7ca48663e0296d4bf542a31`
`@ -1,2 +1 @@`
	`DIST eselect-repository-11.tar.gz 8554 BLAKE2B c7bdd1559c310c492b2c00c7a7cb92d48ad24a69ff4485c1282c67b7dd211360fcda6d96eec2b9e734a1b4745f2a0fe9da1ff20d62bf1174a64b6016097ea634 SHA512 31b0b36122e580a018ca66d112cdddfbfe1568030fb9a20440450c17c759bfb872eb7ef99036a3dae14e8384a8f770354fd4cd362ed594408ae9e8dbbc6dea68`
	`DIST eselect-repository-12.tar.gz 8543 BLAKE2B 14866156ddfefebaea368c4a13413d79e7858520861ee2b699cb09b339f3bb4b8393af7201b4cb7d6a60d2a48d168a053cc4707e2f56a7a2a11cfb5156cfa83f SHA512 3b98b9bd87fe61c7fb4d314e72c8433b11dd80501cfd226d4a4de25ca6d08e7a14a2497a1700ac64d704368bb8e5ea2ec337d0712097e9e10182a3122a59e388`	`DIST eselect-repository-12.tar.gz 8543 BLAKE2B 14866156ddfefebaea368c4a13413d79e7858520861ee2b699cb09b339f3bb4b8393af7201b4cb7d6a60d2a48d168a053cc4707e2f56a7a2a11cfb5156cfa83f SHA512 3b98b9bd87fe61c7fb4d314e72c8433b11dd80501cfd226d4a4de25ca6d08e7a14a2497a1700ac64d704368bb8e5ea2ec337d0712097e9e10182a3122a59e388`
		`@ -1 +0,0 @@`
			`DIST higan_v094-source.tar.xz 882732 BLAKE2B fb2794a95060befc3495f347328e62c45ee8a21b888a9958857f739f5fb138704275b3624241fee4224e78678746e68d534db6d8d839eb4a6973c092819c509b SHA512 e7e48c76cdc93d2d66db1fa0c71e64903cf4188571b2d5ecb8066dd4e2172a67da4dee68bed6fd0a532b6fd397fa4f537b97de58cc5043a9e970d48d0b66b0da`
`@ -1 +1 @@`
	`DIST apache-log4j-2.15.0-src.tar.gz 11550453 BLAKE2B 3b7a356714fbff0ad81f633750a45f6b3869df933c89c22b28346e49c6dfb83002ecf6374d04b1ae6a45b5486314654c8a660f3aee7a6b30273439e44db2c610 SHA512 61574722ab0a24bd0301fea57504a645f98f0e5913d1e02e49d25b3dcbf2dcbb3153cfca58fdde632087f94edc8e83820951288ba494234954ab4eeeb6b8be6a`	`DIST apache-log4j-2.17.1-src.tar.gz 11602282 BLAKE2B 6e6a69565ee28fc138ddb78258ac30b13a9be3f3baee64c3427b63b059c552d314be3c4a345ea297010d345c4dcb31d154aaea6cd2fc587512c6087c5dfe0745 SHA512 21cdfca54eb0d6af261a5ae89ff98197473d9c0203b0ab530f3aef6c90957bfb95a423983c8a19d7fbab05ec194b6fad8e46628e32270dd8b94ddd194a1cb177`
`@ -1 +1,2 @@`
	`DIST fennel-0.9.1.tar.gz 203441 BLAKE2B 74f461b3e7a24cdae0c8dde590814cb9753a12ab62e797746cc8753d178007a09084037e443d8309fa11ff309a5c6bf6c2e369942ef357aa0402883cef278542 SHA512 87e7ffbef0b49499a93255f50e77f53b9be4faa6d4609d8d65e3a64470bbf07b49a55e7dd547fda4b0e5fe0f4f1e6ece18282cc89955a57ed0a50be8dc01261c`	`DIST fennel-0.9.1.tar.gz 203441 BLAKE2B 74f461b3e7a24cdae0c8dde590814cb9753a12ab62e797746cc8753d178007a09084037e443d8309fa11ff309a5c6bf6c2e369942ef357aa0402883cef278542 SHA512 87e7ffbef0b49499a93255f50e77f53b9be4faa6d4609d8d65e3a64470bbf07b49a55e7dd547fda4b0e5fe0f4f1e6ece18282cc89955a57ed0a50be8dc01261c`
		`DIST fennel-1.0.0.tar.gz 243719 BLAKE2B 07758493c8c96d2d5151a1cb38da9fec002eb2522926dc2cad0a125c3e608daf2035a3d21743a8634a5fd0cab372e78ee0179710388c56888cb9a2fef167ea58 SHA512 4ad1635807d244297fdc7bf7c06568ae708ae805dcaac2bb190fad412da21c9e3c3b86a6afa223e343488c725afea94682f213332fb22ba66eb5190e97f18415`