Sync with portage [Mon Jun 27 13:11:19 MSK 2022].

2022-06-27 13:11:19 +03:00 · 2022-06-27 13:11:19 +03:00 · f51d7fb036
commit f51d7fb036
parent b994062a6d
1030 changed files with 12209 additions and 8027 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/ansible-base/ansible-base-2.12.6.ebuild
+++ b/app-admin/ansible-base/ansible-base-2.12.6.ebuild
@ -19,7 +19,7 @@ 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"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
 	S="${WORKDIR}"/${MY_P}
 fi

--- a/app-admin/ansible-molecule/ansible-molecule-3.5.2-r1.ebuild
+++ b/app-admin/ansible-molecule/ansible-molecule-3.5.2-r1.ebuild
@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 IUSE="selinux"

 RDEPEND="$(python_gen_cond_dep '
--- a/app-admin/puppet-lint/Manifest
+++ b/app-admin/puppet-lint/Manifest
@ -1,4 +1,2 @@
-DIST puppet-lint-2.4.2.gem 93184 BLAKE2B 5170bd9c30f6e2f5b30120b6edc74550e697c3243d2f5c7249f27a2d61ca2f5612d96efdc0f6be8d065e7d7a4460b9cf6e6dad13a5b24c4ce100d4e6df2f0425 SHA512 ee846688b13536b7d146ea50c0efe5083babf1ca09b77182437ec93be754ae076d54ac34f8082867a26b6df12a09bcd316e5b1aaa9c98150f9411a0c8b007c71
-DIST puppet-lint-2.5.0.gem 90112 BLAKE2B c731e0988f09f779c50aad118f136f79c6e042f43cc8a5163967c44a72d4019a00426578bc95b4cf9618057027c1707cd3463ea408a30d25ca0a0911dc3c94eb SHA512 b04097443eae40a084475f95c57ebde73af937ca3b9b006237c6b5e60caf939338e09cb1e259a26524d2294ecbc61bd91b6e34f7051d87211078912518cb364b
 DIST puppet-lint-2.5.1.gem 93184 BLAKE2B ce93397fcb05655043ed41693690d909505a74a7e8029f355d76cbcdc247cb03b87f9fc870d07e88ca378b0866b4490c853950a9dc7eff871006ff526d852c70 SHA512 5ffad674280b4b67669a59c9b17b36cef8338dc4de2c9a28b2cdfcff810f733eb4ae18824b6145b75db3816ed906c12e9d4b6404ac5294c4a9a0eb27c4272820
 DIST puppet-lint-2.5.2.gem 91136 BLAKE2B cae884b3994c7862f337a214903ecd4d7bb297e9e2bb7495fb94030304f53fa7ae98080b62944d5c96f2af0d208352d00030415a89259e8e188ec53da2a2b643 SHA512 996a5fda970c318a3f58a196c7b9aba7e712aae2b24d936b917f1dd9eb6bf5d706df28f70d88e1e174e175aabb13f1d22c8c90289314d5a1dd4ff9207ebbfe03
--- a/app-admin/puppet-lint/puppet-lint-2.4.2.ebuild
+++ b/app-admin/puppet-lint/puppet-lint-2.4.2.ebuild
@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A linter for puppet DSL"
-HOMEPAGE="http://puppet-lint.com/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 ~x86"
-
-ruby_add_bdepend "test? (
-	dev-ruby/rspec-its:1
-	dev-ruby/rspec-collection_matchers:1
-	dev-ruby/rspec-json_expectations )"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/,/^end/ s:^:#:' spec/spec_helper.rb || die
-}
--- a/app-admin/puppet-lint/puppet-lint-2.5.0.ebuild
+++ b/app-admin/puppet-lint/puppet-lint-2.5.0.ebuild
@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A linter for puppet DSL"
-HOMEPAGE="http://puppet-lint.com/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-ruby_add_bdepend "test? (
-	dev-ruby/rspec-its:1
-	dev-ruby/rspec-collection_matchers:1
-	dev-ruby/rspec-json_expectations )"
--- a/app-admin/puppet-lint/puppet-lint-2.5.2.ebuild
+++ b/app-admin/puppet-lint/puppet-lint-2.5.2.ebuild
@ -18,7 +18,7 @@ HOMEPAGE="http://puppet-lint.com/"
 LICENSE="MIT"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"

 ruby_add_bdepend "test? (
 	dev-ruby/rspec-its:1
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@ -2,3 +2,5 @@ DIST vault-1.10.3-vendor.tar.gz 48109465 BLAKE2B 45985a6ae4445ec75b29f198113fdd1
 DIST vault-1.10.3-webui.tar.xz 1258176 BLAKE2B 85fd1b804b880a3dcdbbd4e825b663f02a985259d0a74ab7cddf4a9a2393c60918b389d0e4e81574b93c8b0867647fc1d17f7ca3e719b36ab41d6825adfbdaae SHA512 9640a7e25de0761a310e234098a0dd31db9e04b30036045ff7edaaca8f7496466f1c0148855a5e1ef270638e90a8fb97aff2c5482b32512772021c99691a5aa5
 DIST vault-1.10.4-vendor.tar.gz 50089463 BLAKE2B 299e7619f158a2ea0683feaaff4a7c5019da02fa03daf25e0b4415f03b703ca11733c486165a21ffcd5b3c1d221db5b9e24e898f3cf3de014c09e29531841dcf SHA512 056a6056bac127083358f1811e8e587f0521b734219a6e03e019527fafcadfbd0d71a05314cb269e27b03423349b5a857d234d3949d0d15e7c7b1175bc573c57
 DIST vault-1.10.4-webui.tar.xz 1258340 BLAKE2B 556da0e566852e5c6a091bd9139a88a9099e5f6422e225b7a4068e1bef3d9fd5a2292bb2efbe12545c20f6c956fd6180500972d5248f05bbb96db50a90ae4741 SHA512 ec9cc568d8d56ba379d0fdee31e0edc8aa8110366b112790573794975a0b32324f517e5fead39fbf59ab99667837b0e08ebadfb6d41dcde85d474712b34b475a
+DIST vault-1.11.0-vendor.tar.gz 49927497 BLAKE2B d7a12c1c1710c2a487b9c08a871b1d7b011d90957cab6980eb2f7eaff4ff544509899ee07c326bba8310ff16ee3bf88586dba340249cf0f7804007963af7d692 SHA512 b3b9275d5ae41c21826ed0bf1eeaffffe10e5e95b085bf8cf6af6c9ff565848f4a3f83d9a8d6165867de11b0f877383cb972e7d4313a753b0dca391203ecb4c6
+DIST vault-1.11.0-webui.tar.xz 1335764 BLAKE2B 9733ae0c2fe04018dac73358a56a162e23877e68b3ce59ca569cea7e27f39c91727ab0810a737167b3f02d92a0d58e9a7195da892c677bece60fbe965dba7fdf SHA512 a5df9f0e854af8f30d6b5d15628a087c1c37361e2a0de4e412e7f78ac51affc774c1a6ed084dd849b68b147d527547593c1124d1170be38b918efd28081a6f0b
--- a/app-admin/vault/vault-1.11.0.ebuild
+++ b/app-admin/vault/vault-1.11.0.ebuild
@ -0,0 +1,86 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fcaps go-module systemd
+
+DESCRIPTION="A tool for managing secrets"
+HOMEPAGE="https://vaultproject.io/"
+
+VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
+SRC_URI="https://github.com/zmedico/vault/archive/refs/tags/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz
+	webui? (
+		https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE}
+	)"
+
+LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="+webui"
+
+BDEPEND="
+	app-arch/zip
+	dev-go/gox
+	>=dev-lang/go-1.15.3"
+COMMON_DEPEND="acct-group/vault
+	acct-user/vault"
+	DEPEND="${COMMON_DEPEND}"
+	RDEPEND="${COMMON_DEPEND}"
+
+FILECAPS=(
+	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
+)
+
+RESTRICT+=" test"
+S=${WORKDIR}/${P}-vendor
+
+src_unpack() {
+	default
+}
+
+src_prepare() {
+	default
+	# Avoid the need to have a git checkout
+	sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
+		-e 's:^\(GIT_DIRTY=\).*:\1:' \
+		-e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
+		-e "s|^BUILD_DATE=.*|BUILD_DATE=$(date +%Y-%m-%dT%H:%M:%SZ)|" \
+		-i scripts/build.sh || die
+	sed -e "/hooks/d" \
+		-e 's|^\([[:space:]]*\)goimports .*)|\1true|' \
+		-e "s/gofumpt/gofmt/g" \
+		-i Makefile || die
+	if [[ -d "${WORKDIR}/http/web_ui" ]]; then
+		rm -rf "${S}/http/web_ui" || die
+		mv "${WORKDIR}/http/web_ui" "${S}/http/web_ui" ||
+			die "mv failed"
+	else
+		mkdir -p "${S}/http/web_ui" || die
+		touch "${S}/http/web_ui/no_web_ui" || die
+	fi
+}
+
+src_compile() {
+	mkdir "${T}"/bin || die
+	BUILD_TAGS="$(usex webui ui '')" \
+	GOPATH="${T}" \
+	XC_ARCH=$(go env GOARCH) \
+	XC_OS=$(go env GOOS) \
+	XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
+	emake bin
+}
+
+src_install() {
+	dobin bin/${PN}
+	dodoc CHANGELOG.md CONTRIBUTING.md README.md
+	insinto /etc/${PN}.d
+	doins "${FILESDIR}/"*.json.example
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
--- a/app-backup/mirdir/files/mirdir-2.1-implicit-function-decl.patch
+++ b/app-backup/mirdir/files/mirdir-2.1-implicit-function-decl.patch
@ -0,0 +1,11 @@
+https://bugs.gentoo.org/854213
+--- a/mirdir.c
+++ b/mirdir.c
+@@ -88,6 +88,7 @@
+ #include <fcntl.h>
+ #include <dirent.h>
+ #include <time.h>
+#include <unistd.h>
+ 
+ /*
+ #include <sys/types.h>
--- a/app-backup/mirdir/mirdir-2.1-r3.ebuild
+++ b/app-backup/mirdir/mirdir-2.1-r3.ebuild
@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Synchronize two directory trees in a fast way"
+HOMEPAGE="https://sourceforge.net/projects/mirdir/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-Unix.tar.gz"
+S="${WORKDIR}/${P}-UNIX"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1-implicit-function-decl.patch
+)
+
+src_prepare() {
+	default
+
+	# Disable stripping, bug #239939
+	sed -i -e 's:strip .*::' Makefile.in || die
+}
+
+src_configure() {
+	# Old autoconf gets this test wrong with -flto(!) and there's
+	# no source configure.in/.ac in the tarball. bug #854213
+	export ac_cv_func_lutime=no
+
+	econf
+}
+
+src_install() {
+	dobin bin/${PN}
+	doman ${PN}.1
+
+	einstalldocs
+}
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/jitterentropy/jitterentropy-3.3.1.ebuild
+++ b/app-crypt/jitterentropy/jitterentropy-3.3.1.ebuild
@ -17,7 +17,7 @@ SRC_URI="https://github.com/smuellerDD/jitterentropy-library/archive/v${PV}.tar.
 # Do not package these two components!
 LICENSE="BSD"
 SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv x86"
 IUSE="static-libs"

 S="${WORKDIR}/${PN}-library-${PV}"
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/emacs/emacs-18.59-r14.ebuild
+++ b/app-editors/emacs/emacs-18.59-r14.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
@ -80,7 +80,7 @@ src_configure() {
 	# adding all those missing prototypes.
 	strip-flags
 	filter-flags -finline-functions -fpie
-	append-flags -Wno-implicit
+	append-flags -Wno-implicit -fno-strict-aliasing
 	append-ldflags $(test-flags -no-pie)	#639562
 	replace-flags -O[3-9] -O2
 }
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@ -1,4 +1,3 @@
 DIST vim-8.2.0360-gentoo-patches.tar.xz 2612 BLAKE2B a9273a686b31dd873b25bfc07f7bc254f11038bde275ae4e6f56513a14e0268fdc1032ae847d1d7f8539f8a657217011770ccb4685998f34722383ec7bfb1a15 SHA512 00bc8eb8b20a4a6f3bbd179bb90d42fa6727c8eaae5b625e95e52c33638d456ef36d06b51c542ecaffb237c0b4f7aa72dc3bae7fe00144d55ab0d2fa51950f3b
-DIST vim-8.2.4328.tar.gz 15983756 BLAKE2B 23d95d2ae6772fbd2a15a73dff5af75dcebf87af5a6a600d8a30284d32d1f83999111bfaa0e49c0295ae42a06f49075aeb00f8ae969eff251889b363b7445fda SHA512 f5e077891d22f468327e30808dba817efe74111c89948fbea5544be58333a8d3342290fa140939dd9c7d976575e63050e100daf947ba73373cc2268677020651
 DIST vim-8.2.4586.tar.gz 16251186 BLAKE2B 26471b493397e58d3e3d6f2c0c5cc69a08c294dcd59367a12729d1762cf2043eab0987ec4c370bd1f4cbbc67d10576f8a6dcfcb748d224b2f35476dbade32597 SHA512 354464e51a3cc13e13f3194ef8a4d5ccec978da7eb385337a042a6b2e6b38a253c587815e7c972070c516f59c7d54c89bce6926ae7f7f9635cddfd1d0bd237b9
 DIST vim-8.2.5066.tar.gz 16497942 BLAKE2B 613f009f6a03e28305763e471bf55b626f37bb8b0f01324d5a676f6682811e3c4a5c11442af839d06b7d94b3938f5a30306bac576eec5d3c76f4a135a3443bb3 SHA512 27fdd1e86b0488b974a9fd60523b31ba23b581cab4c9bd15aee9ae459e2f2d028d6887adf621ee88244b74d26697fc953b08b587a3a80b316d31b65fc588ce9e
--- a/app-editors/vim-core/vim-core-8.2.4328-r1.ebuild
+++ b/app-editors/vim-core/vim-core-8.2.4328-r1.ebuild
@ -1,231 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Please bump with app-editors/vim and app-editors/gvim
-
-VIM_VERSION="8.2"
-inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils
-
-if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vim/vim.git"
-	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
-else
-	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
-		https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
-	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"
-fi
-S="${WORKDIR}"/vim-${PV}
-
-DESCRIPTION="vim and gvim shared files"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
-
-LICENSE="vim"
-SLOT="0"
-IUSE="nls acl minimal"
-
-BDEPEND="sys-devel/autoconf"
-# Avoid icon file collision, bug #673880
-RDEPEND="!!<app-editors/gvim-8.1.0648
-	!<app-editors/vim-8.2.4328-r1"
-PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug #82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die "mkdir -p failed"
-	export HOME="${T}"/home
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]] ; then
-		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/patches
-	fi
-
-	# Fixup a script to use awk instead of nawk
-	sed -i \
-		-e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-		"${S}"/runtime/tools/mve.awk || die "sed failed"
-
-	# See bug #77841. We remove this file after the tarball extraction.
-	rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed"
-
-	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
-
-	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-	# Hopefully this pattern won't break for a while at least.
-	# This fixes bug #29398 (27 Sep 2003 agriffis)
-	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-		"${S}"/runtime/doc/syntax.txt \
-		"${S}"/runtime/doc/tagsrch.txt \
-		"${S}"/runtime/doc/usr_29.txt \
-		"${S}"/runtime/menu.vim \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-	# this is NeXT, but it's actually just a file in dev-libs/9libs
-	# This fixes bug #43885 (20 Mar 2004 agriffis)
-	sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
-
-	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-	# correctly. To avoid some really entertaining error messages about stuff
-	# which isn't even in the source file being invalid, we'll do some trickery
-	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c; do
-	    echo >> "$c" || die "echo failed"
-	done
-
-	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]]; then
-		sed -i -e \
-			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile || die "sed failed"
-	fi
-
-	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
-
-	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
-	sed -i -e \
-		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf
-
-	# Fix bug #37354: Disallow -funroll-all-loops on amd64
-	# Bug 57859 suggests that we want to do this for all archs
-	filter-flags -funroll-all-loops
-
-	# Fix bug #76331: -O3 causes problems, use -O2 instead. We'll do this for
-	# everyone since previous flag filtering bugs have turned out to affect
-	# multiple archs...
-	replace-flags -O3 -O2
-
-	# Fix bug #18245: Prevent "make" from the following chain:
-	# (1) Notice configure.ac is newer than auto/configure
-	# (2) Rebuild auto/configure
-	# (3) Notice auto/configure is newer than auto/config.mk
-	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-
-	# Remove src/auto/configure file.
-	rm -v src/auto/configure || die "rm configure failed"
-
-	emake -j1 -C src autoconf
-
-	# This should fix a sandbox violation (see bug 24447). The hvc
-	# things are for ppc64, see bug 86433.
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-		if [[ -e "${file}" ]]; then
-			addwrite ${file}
-		fi
-	done
-
-	# Let Portage do the stripping. Some people like that.
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# Keep Gentoo Prefix env contained within the EPREFIX
-	use prefix && myconf+=" --without-local-dir"
-
-	econf \
-		--with-modified-by=Gentoo-${PVR} \
-		--enable-gui=no \
-		--without-x \
-		--disable-darwin \
-		--disable-perlinterp \
-		--disable-pythoninterp \
-		--disable-rubyinterp \
-		--disable-gpm \
-		--disable-selinux \
-		$(use_enable nls) \
-		$(use_enable acl) \
-		${myconf}
-}
-
-src_compile() {
-	emake -j1 -C src auto/osdef.h objects
-	emake tools
-}
-
-src_test() { :; }
-
-src_install() {
-	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-	dodir /usr/{bin,share/{man/man1,vim}}
-	emake -C src \
-		installruntime \
-		installmanlinks \
-		installmacros \
-		installtutor \
-		installtutorbin \
-		installtools \
-		install-languages \
-		DESTDIR="${D}" \
-		BINDIR="${EPREFIX}"/usr/bin \
-		MANDIR="${EPREFIX}"/usr/share/man \
-		DATADIR="${EPREFIX}"/usr/share
-
-	keepdir ${vimfiles}/keymap
-
-	# default vimrc is installed by vim-core since it applies to
-	# both vim and gvim
-	insinto /etc/vim/
-	newins "${FILESDIR}"/vimrc-r5 vimrc
-	eprefixify "${ED}"/etc/vim/vimrc
-
-	if use minimal; then
-		# To save space, install only a subset of the files.
-		# Helps minimalize the livecd, bug 65144.
-		eshopts_push -s extglob
-
-		rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed"
-		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
-		rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
-
-		local keep_colors="default"
-		ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
-
-		local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
-		# tinkering with the next line might make bad things happen ...
-		keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
-		ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
-
-		# Delete skip_defaults_vim config not supported by vim[minimal]
-		sed -i '/skip_defaults_vim/d' "${ED}"/etc/vim/vimrc || die "sed failed"
-
-		eshopts_pop
-	fi
-
-	newbashcomp "${FILESDIR}"/xxd-completion xxd
-
-	# install gvim icon since both vim/gvim desktop files reference it
-	doicon -s scalable "${FILESDIR}"/gvim.svg
-}
-
-pkg_postinst() {
-	# update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# update icon cache
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# update icon cache
-	xdg_icon_cache_update
-}
--- a/app-editors/vim-core/vim-core-8.2.4586.ebuild
+++ b/app-editors/vim-core/vim-core-8.2.4586.ebuild
@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 S="${WORKDIR}"/vim-${PV}

--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@ -1,4 +1,3 @@
 DIST vim-8.2.0360-gentoo-patches.tar.xz 2612 BLAKE2B a9273a686b31dd873b25bfc07f7bc254f11038bde275ae4e6f56513a14e0268fdc1032ae847d1d7f8539f8a657217011770ccb4685998f34722383ec7bfb1a15 SHA512 00bc8eb8b20a4a6f3bbd179bb90d42fa6727c8eaae5b625e95e52c33638d456ef36d06b51c542ecaffb237c0b4f7aa72dc3bae7fe00144d55ab0d2fa51950f3b
-DIST vim-8.2.4328.tar.gz 15983756 BLAKE2B 23d95d2ae6772fbd2a15a73dff5af75dcebf87af5a6a600d8a30284d32d1f83999111bfaa0e49c0295ae42a06f49075aeb00f8ae969eff251889b363b7445fda SHA512 f5e077891d22f468327e30808dba817efe74111c89948fbea5544be58333a8d3342290fa140939dd9c7d976575e63050e100daf947ba73373cc2268677020651
 DIST vim-8.2.4586.tar.gz 16251186 BLAKE2B 26471b493397e58d3e3d6f2c0c5cc69a08c294dcd59367a12729d1762cf2043eab0987ec4c370bd1f4cbbc67d10576f8a6dcfcb748d224b2f35476dbade32597 SHA512 354464e51a3cc13e13f3194ef8a4d5ccec978da7eb385337a042a6b2e6b38a253c587815e7c972070c516f59c7d54c89bce6926ae7f7f9635cddfd1d0bd237b9
 DIST vim-8.2.5066.tar.gz 16497942 BLAKE2B 613f009f6a03e28305763e471bf55b626f37bb8b0f01324d5a676f6682811e3c4a5c11442af839d06b7d94b3938f5a30306bac576eec5d3c76f4a135a3443bb3 SHA512 27fdd1e86b0488b974a9fd60523b31ba23b581cab4c9bd15aee9ae459e2f2d028d6887adf621ee88244b74d26697fc953b08b587a3a80b316d31b65fc588ce9e
--- a/app-editors/vim/vim-8.2.4328-r1.ebuild
+++ b/app-editors/vim/vim-8.2.4328-r1.ebuild
@ -1,350 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Please bump with app-editors/vim-core and app-editors/gvim
-
-VIM_VERSION="8.2"
-LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{7..10} )
-PYTHON_REQ_USE="threads(+)"
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 ruby-single desktop xdg-utils
-
-if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vim/vim.git"
-else
-	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
-	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"
-fi
-
-DESCRIPTION="Vim, an improved vi-style text editor"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
-
-LICENSE="vim"
-SLOT="0"
-IUSE="X acl crypt cscope debug gpm lua minimal nls perl python racket ruby selinux sound tcl terminal vim-pager"
-REQUIRED_USE="
-	lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	vim-pager? ( !minimal )
-"
-
-RDEPEND="
-	>=app-eselect/eselect-vi-1.1
-	>=sys-libs/ncurses-5.2-r2:0=
-	nls? ( virtual/libintl )
-	acl? ( kernel_linux? ( sys-apps/acl ) )
-	crypt? ( dev-libs/libsodium:= )
-	cscope? ( dev-util/cscope )
-	gpm? ( >=sys-libs/gpm-1.19.3 )
-	lua? ( ${LUA_DEPS}
-		$(lua_gen_impl_dep 'deprecated' lua5-1)
-	)
-	~app-editors/vim-core-${PV}
-	!<app-editors/vim-core-8.2.4328-r1
-	vim-pager? ( app-editors/vim-core[-minimal] )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	racket? ( dev-scheme/racket )
-	ruby? ( ${RUBY_DEPS} )
-	selinux? ( sys-libs/libselinux )
-	sound? ( media-libs/libcanberra )
-	tcl? ( dev-lang/tcl:0= )
-	X? ( x11-libs/libXt )
-"
-DEPEND="${RDEPEND}"
-# configure runs the Lua interpreter
-BDEPEND="
-	sys-devel/autoconf
-	lua? ( ${LUA_DEPS} )
-	nls? ( sys-devel/gettext )
-"
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug #82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die "mkdir failed"
-	export HOME="${T}"/home
-
-	use lua && lua-single_pkg_setup
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]] ; then
-		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/patches/
-	fi
-
-	# Fixup a script to use awk instead of nawk
-	sed -i -e \
-		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
-
-	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
-		>> "${S}"/src/feature.h || die "echo failed"
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
-		>> "${S}"/src/feature.h || die "echo failed"
-
-	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-	# Hopefully this pattern won't break for a while at least.
-	# This fixes bug #29398 (27 Sep 2003 agriffis)
-	sed -i -e \
-		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-		"${S}"/runtime/doc/syntax.txt \
-		"${S}"/runtime/doc/tagsrch.txt \
-		"${S}"/runtime/doc/usr_29.txt \
-		"${S}"/runtime/menu.vim \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-	# this is NeXT, but it's actually just a file in dev-libs/9libs
-	# This fixes bug #43885 (20 Mar 2004 agriffis)
-	sed -i -e \
-		's/ libc\.h / /' \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-	# correctly. To avoid some really entertaining error messages about stuff
-	# which isn't even in the source file being invalid, we'll do some trickery
-	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c; do
-	    echo >> "$c" || die "echo failed"
-	done
-
-	# conditionally make the manpager.sh script
-	if use vim-pager; then
-		cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat EOF failed"
-			#!/bin/sh
-			sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
-					vim \\
-						-c 'let no_plugin_maps = 1' \\
-						-c 'set nolist nomod ft=man ts=8' \\
-						-c 'let g:showmarks_enable=0' \\
-						-c 'runtime! macros/less.vim' -
-			_EOF_
-	fi
-
-	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]]; then
-		sed -i -e \
-			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile || die "sed failed"
-	fi
-
-	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
-
-	sed -i -e \
-		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf=()
-
-	# Fix bug #37354: Disallow -funroll-all-loops on amd64
-	# Bug #57859 suggests that we want to do this for all archs
-	filter-flags -funroll-all-loops
-
-	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-	# everyone since previous flag filtering bugs have turned out to affect
-	# multiple archs...
-	replace-flags -O3 -O2
-
-	# Fix bug 18245: Prevent "make" from the following chain:
-	# (1) Notice configure.ac is newer than auto/configure
-	# (2) Rebuild auto/configure
-	# (3) Notice auto/configure is newer than auto/config.mk
-	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-	rm src/auto/configure || die "rm failed"
-	emake -j1 -C src autoconf
-
-	# This should fix a sandbox violation (see bug #24447). The hvc
-	# things are for ppc64, see bug #86433.
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-		if [[ -e "${file}" ]]; then
-			addwrite ${file}
-		fi
-	done
-
-	if use minimal; then
-		myconf=(
-			--with-features=tiny
-			--disable-nls
-			--disable-canberra
-			--disable-acl
-			--enable-gui=no
-			--without-x
-			--disable-darwin
-			--disable-luainterp
-			--disable-perlinterp
-			--disable-pythoninterp
-			--disable-mzschemeinterp
-			--disable-rubyinterp
-			--disable-selinux
-			--disable-tclinterp
-			--disable-gpm
-		)
-	else
-		use debug && append-flags "-DDEBUG"
-
-		myconf=(
-			--with-features=huge
-			$(use_enable sound canberra)
-			$(use_enable acl)
-			$(use_enable crypt libsodium)
-			$(use_enable cscope)
-			$(use_enable gpm)
-			$(use_enable nls)
-			$(use_enable perl perlinterp)
-			$(use_enable python python3interp)
-			$(use_with python python3-command "${PYTHON}")
-			$(use_enable racket mzschemeinterp)
-			$(use_enable ruby rubyinterp)
-			$(use_enable selinux)
-			$(use_enable tcl tclinterp)
-			$(use_enable terminal)
-		)
-
-		# --with-features=huge forces on cscope even if we --disable it. We need
-		# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
-		if ! use cscope; then
-			sed -i -e \
-				'/# define FEAT_CSCOPE/d' src/feature.h || die "sed failed"
-		fi
-
-		if use lua; then
-			myconf+=(
-				--enable-luainterp
-				$(use_with lua_single_target_luajit luajit)
-				--with-lua-prefix="${EPREFIX}/usr"
-			)
-		fi
-
-		# don't test USE=X here ... see bug #19115
-		# but need to provide a way to link against X ... see bug #20093
-		myconf+=(
-			--enable-gui=no
-			--disable-darwin
-			$(use_with X x)
-		)
-	fi
-
-	# let package manager strip binaries
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# keep prefix env contained within the EPREFIX
-	use prefix && myconf+=( --without-local-dir )
-
-	econf \
-		--with-modified-by=Gentoo-${PVR} \
-		"${myconf[@]}"
-}
-
-src_compile() {
-	# The following allows emake to be used
-	emake -j1 -C src auto/osdef.h objects
-
-	emake
-}
-
-src_test() {
-	einfo
-	einfo "Starting vim tests. Several error messages will be shown"
-	einfo "while the tests run. This is normal behaviour and does not"
-	einfo "indicate a fault."
-	einfo
-	ewarn "If the tests fail, your terminal may be left in a strange"
-	ewarn "state. Usually, running 'reset' will fix this."
-	einfo
-
-	# Don't let vim talk to X
-	unset DISPLAY
-
-	# See https://github.com/vim/vim/blob/f08b0eb8691ff09f98bc4beef986ece1c521655f/src/testdir/runtest.vim#L5
-	# for more information on test variables we can use.
-	# Note that certain variables need vim-compatible regex (not PCRE), see e.g.
-	# http://www.softpanorama.org/Editors/Vimorama/vim_regular_expressions.shtml.
-	#
-	# Skipped tests:
-	# - Test_expand_star_star
-	# Hangs because of a recursive symlink in /usr/include/nodejs (bug #616680)
-	# - Test_exrc
-	# Looks in wrong location? (bug #742710)
-	# - Test_job_tty_in_out
-	# Fragile and depends on TERM(?)
-	# - Test_spelldump_bang
-	# Hangs.
-	export TEST_SKIP_PAT='\(Test_expand_star_star\|Test_exrc\|Test_job_tty_in_out\|Test_spelldump_bang\)'
-
-	emake -j1 -C src/testdir nongui
-}
-
-# Call eselect vi update with --if-unset
-# to respect user's choice (bug #187449)
-eselect_vi_update() {
-	ebegin "Calling eselect vi update"
-	eselect vi update --if-unset
-	eend $?
-}
-
-src_install() {
-	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-	# Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
-	#       managed by eselect-vi
-	dobin src/vim
-	if ! use minimal ; then
-		dosym vim /usr/bin/vimdiff
-	fi
-	dosym vim /usr/bin/rvim
-	dosym vim /usr/bin/rview
-	if use vim-pager ; then
-		dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
-		dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
-		insinto ${vimfiles}/macros
-		doins runtime/macros/manpager.sh
-		fperms a+x ${vimfiles}/macros/manpager.sh
-	fi
-
-	domenu runtime/vim.desktop
-
-	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
-
-	# keep in sync with 'complete ... -F' list
-	bashcomp_alias vim ex vi view rvim rview vimdiff
-}
-
-pkg_postinst() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Call eselect vi update
-	eselect_vi_update
-
-	# update desktop file mime cache
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Call eselect vi update
-	eselect_vi_update
-
-	# update desktop file mime cache
-	xdg_desktop_database_update
-}
--- a/app-editors/vim/vim-8.2.4586.ebuild
+++ b/app-editors/vim/vim-8.2.4586.ebuild
@ -19,7 +19,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi

 DESCRIPTION="Vim, an improved vi-style text editor"
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
--- a/app-emacs/biblio/biblio-0.2_p20210418-r1.ebuild
+++ b/app-emacs/biblio/biblio-0.2_p20210418-r1.ebuild
--- a/app-emacs/biblio/files/50biblio-gentoo.el
+++ b/app-emacs/biblio/files/50biblio-gentoo.el
@ -1,2 +1,2 @@
 (add-to-list 'load-path "@SITELISP@")
-(load "@SITELISP@/biblio-autoloads")
+(load "@SITELISP@/biblio-autoloads" nil t)
--- a/app-emacs/doom-themes/Manifest
+++ b/app-emacs/doom-themes/Manifest
@ -1 +1,2 @@
 DIST doom-themes-2.1.6_p20220505.tar.gz 128520 BLAKE2B f7b2f060d2b68427bd9f375cdd8d009d68ffd0839f46aecb41ede32bde815f2b4df68a2df8af9d09c055f4443b4abcaecc0046b4449ffce9449956cf9c43755b SHA512 bc450d964d45e123b96efb6f96e153ed0d4530374197bef484b41b18f51ae49fc7c7cea2aa0aa599992709706510f725ba1943176ae02cafb16b2f2d3b7f824a
+DIST doom-themes-2.3.0.tar.gz 133034 BLAKE2B ea6c4c35f4f4b8e7cdaefd5871c99d53c7648a0421fac2e6a69bd24d2b384c4793666c21ff99e5746796995f37ff526b333418839d30ac50406ae003e0cddf4d SHA512 0197896eabdf548569a4826ff670e47cb113bb2ea252eaa9b06d2bebd68a7fa4833126536c265c15216e4f5403114f6e3e77b9db75b05a5552fae680c85d7af1
--- a/app-emacs/doom-themes/doom-themes-2.3.0.ebuild
+++ b/app-emacs/doom-themes/doom-themes-2.3.0.ebuild
@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=25.1
+
+inherit elisp
+
+DESCRIPTION="Opinionated megapack of modern color-themes for GNU Emacs"
+HOMEPAGE="https://github.com/doomemacs/themes/"
+SRC_URI="https://github.com/doomemacs/themes/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/themes-${PV}
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	elisp_src_install
+
+	insinto "${SITELISP}"/${PN}
+	doins -r themes
+}
--- a/app-emacs/eglot/eglot-1.6-r1.ebuild
+++ b/app-emacs/eglot/eglot-1.6-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
--- a/app-emacs/eglot/eglot-1.8-r1.ebuild
+++ b/app-emacs/eglot/eglot-1.8-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
--- a/app-emacs/eglot/files/50eglot-gentoo.el
+++ b/app-emacs/eglot/files/50eglot-gentoo.el
@ -1,2 +1,2 @@
 (add-to-list 'load-path "@SITELISP@")
-(load "@SITELISP@/eglot-autoload.el")
+(load "@SITELISP@/eglot-autoload.el" nil t)
--- a/app-emacs/flycheck/files/50flycheck-gentoo-r1.el
+++ b/app-emacs/flycheck/files/50flycheck-gentoo-r1.el
@ -1,2 +1,2 @@
 (add-to-list 'load-path "@SITELISP@")
-(load "@SITELISP@/flycheck-autoloads")
+(load "@SITELISP@/flycheck-autoloads" nil t)
--- a/app-emacs/flycheck/flycheck-32_p20220328-r1.ebuild
+++ b/app-emacs/flycheck/flycheck-32_p20220328-r1.ebuild
--- a/app-emacs/pdf-tools/Manifest
+++ b/app-emacs/pdf-tools/Manifest
@ -0,0 +1 @@
+DIST pdf-tools-1.0.0_pre20220619.tar.gz 459416 BLAKE2B 79a7c7a59faf9c11047bfb6218a8055cb9c757b928e52ff59ffb910e5aedb95ca7efe1dda1ae821d98a687fc6e700d8194311fc850f534f425534a1572bd34b5 SHA512 74ca8c05ad238c07ca1b6d6a594889d048220bb984b78b83e7af4c59eedfa7a35a03e153aa4d1296781f910eb0b3a68a5148876a30ad0f6e9fdecf831ff58f8e
--- a/app-emacs/pdf-tools/files/50pdf-tools-gentoo.el
+++ b/app-emacs/pdf-tools/files/50pdf-tools-gentoo.el
@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(load "@SITELISP@/pdf-tools-autoloads" nil t)
--- a/app-emacs/pdf-tools/metadata.xml
+++ b/app-emacs/pdf-tools/metadata.xml
@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <longdescription>
+    PDF Tools is, among other things, a replacement of DocView for PDF files.
+    The key difference is that pages are not pre-rendered by e.g. ghostscript
+    and stored in the file-system, but rather created on-demand and stored in
+    memory. This rendering is performed by a special library named, for
+    whatever reason, poppler, running inside a server program. This program is
+    called epdfinfo and its job is to successively read requests from Emacs and
+    produce the proper results, i.e. the PNG image of a PDF page. Actually,
+    displaying PDF files is just one part of pdf-tools. Since poppler can
+    provide us with all kinds of information about a document and is also able
+    to modify it, there is a lot more we can do with it.
+  </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/vedang/pdf-tools/issues/</bugs-to>
+    <remote-id type="github">vedang/pdf-tools</remote-id>
+  </upstream>
+</pkgmetadata>
--- a/app-emacs/pdf-tools/pdf-tools-1.0.0_pre20220619.ebuild
+++ b/app-emacs/pdf-tools/pdf-tools-1.0.0_pre20220619.ebuild
@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=fe42da60ad68e806af1677210249caccd7b99451
+NEED_EMACS=25.1  # Needs Emacs >=25.1 because of the "let-alist" function.
+
+inherit autotools elisp
+
+DESCRIPTION="Emacs Lisp support library for PDF documents"
+HOMEPAGE="https://github.com/vedang/pdf-tools/"
+SRC_URI="https://github.com/vedang/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${H}
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+# Cask is a hard dependency for tests; it is ran by helper functions too.
+RESTRICT="test"
+
+BDEPEND="app-emacs/tablist"
+DEPEND="
+	app-text/poppler:=[cairo,png]
+	dev-libs/glib:2=
+	media-libs/freetype:2=
+	media-libs/harfbuzz:=
+	media-libs/libpng:=
+	x11-libs/cairo:=
+"
+RDEPEND="
+	${DEPEND}
+	${BDEPEND}
+"
+
+DOCS=( NEWS README.org )
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	elisp_src_prepare
+
+	cd server || die
+	eautoreconf
+}
+
+src_configure() {
+	cd server || die
+	econf
+}
+
+src_compile() {
+	BYTECOMPFLAGS="-L lisp" elisp-compile lisp/*.el
+	elisp-make-autoload-file lisp/${PN}-autoloads.el lisp
+
+	emake -C server
+}
+
+src_install() {
+	elisp-install ${PN} lisp/*.el*
+	elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+
+	emake -C server DESTDIR="${D}" install
+
+	einstalldocs
+}
--- a/app-emacs/tablist/Manifest
+++ b/app-emacs/tablist/Manifest
@ -0,0 +1 @@
+DIST tablist-1.0.tar.gz 31848 BLAKE2B 11bc943aaf25fb1fe6ecb43a944d70d9b5ab4c423f9df96c881a840570780707a702240808c425e8e91321ad620c1773c80c03e2f6881ccddff84c0d818aa7a4 SHA512 14d32228e9663d218b49563ec07a5f8d094b389e06e532c0710af54d7386fcd19435fae2920163e0c774b7b67bf77ef5fc0a246dfbdb11785dca976ff47eeff2
--- a/app-emacs/tablist/files/50tablist-gentoo.el
+++ b/app-emacs/tablist/files/50tablist-gentoo.el
@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
--- a/app-emacs/tablist/metadata.xml
+++ b/app-emacs/tablist/metadata.xml
@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <longdescription>
+    This package adds marks and filters to tabulated-list-mode. It also puts a
+    dired face on tabulated list buffers. It can be used by deriving from
+    tablist-mode, or with more limited features by enabling tablist-minor-mode
+    inside a tabulated-list-mode buffer.
+  </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/politza/tablist/issues/</bugs-to>
+    <remote-id type="github">politza/tablist</remote-id>
+  </upstream>
+</pkgmetadata>
--- a/app-emacs/tablist/tablist-1.0.ebuild
+++ b/app-emacs/tablist/tablist-1.0.ebuild
@ -0,0 +1,19 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=24.3
+
+inherit elisp
+
+DESCRIPTION="Extended tabulated-list mode fro Emacs"
+HOMEPAGE="https://github.com/politza/tablist/"
+SRC_URI="https://github.com/politza/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/nemu/Manifest
+++ b/app-emulation/nemu/Manifest
@ -1 +1,2 @@
 DIST nemu-2.5.0.tar.gz 108742 BLAKE2B e68cbf50d56983873656d8e3428cb3ffaa09cafc9cbc8e545d72bf9dfb61e64a06bdc41c3f50011c4c488017efe33afe9fa1d634aae6e9151c45a7d3971c60db SHA512 081199413c41e545d23704091760c4a10b8dcdb21d9d0e6add1e549fa33bdd988490034767e08dee681eee6d06899104b8282cafc4578e06a0eabc505325bbdc
+DIST nemu-3.0.0.tar.gz 151223 BLAKE2B a71875eb727eed13bc252cee072e1c5b25bf7ea106f51ddddfb8e8bfacf21e030b1c4045de2353d40121b78756b131de1a376891197f6d553430b4b30f53bf3e SHA512 59dae5364659dda5d7c05ba6378b6e20c5d2c5b619cb919c49036918a887574b75f5d568cbfa8f21ecf790778c9de55266f5c5e3e90cc991f613a6408b10a1df
--- a/app-emulation/nemu/metadata.xml
+++ b/app-emulation/nemu/metadata.xml
@ -5,11 +5,20 @@
 		<email>monsieurp@gentoo.org</email>
 		<name>Patrice Clement</name>
 	</maintainer>
+	<maintainer type="person" proxied="yes">
+		<email>mail@void.so</email>
+		<name>Pavel Balaev</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="vnc-client">Adds support for external VNC client</flag>
 		<flag name="savevm">Adds support for QEMU savevm snapshots (experimental, QEMU must be patched)</flag>
 		<flag name="spice">Adds Spice protocol support</flag>
 		<flag name="ovf">Adds support for OVA/OVF import</flag>
 		<flag name="network-map">Adds possibility of exporting network map to SVG</flag>
+		<flag name="remote-api">Adds API for remote control</flag>
 	</use>
 </pkgmetadata>
--- a/app-emulation/nemu/nemu-3.0.0.ebuild
+++ b/app-emulation/nemu/nemu-3.0.0.ebuild
@ -0,0 +1,81 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake linux-info
+
+MY_PV="${PV/_rc/-RC}"
+
+DESCRIPTION="ncurses interface for QEMU"
+HOMEPAGE="https://github.com/nemuTUI/nemu"
+SRC_URI="https://github.com/nemuTUI/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus network-map +ovf spice +vnc-client remote-api"
+
+RDEPEND="
+	>=app-emulation/qemu-6.0.0-r3[vnc,virtfs,spice?]
+	dev-db/sqlite:3=
+	dev-libs/json-c
+	sys-libs/ncurses:=[unicode(+)]
+	virtual/libusb:1
+	virtual/libudev:=
+	dbus? ( sys-apps/dbus )
+	network-map? ( media-gfx/graphviz[svg] )
+	ovf? (
+		dev-libs/libxml2:2
+		app-arch/libarchive:=
+	)
+	remote-api? ( dev-libs/openssl )
+	spice? ( app-emulation/virt-viewer )
+	vnc-client? ( net-misc/tigervnc )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/gettext"
+S="${WORKDIR}/${PN}-${MY_PV}/"
+
+pkg_pretend() {
+	if use kernel_linux; then
+		if ! linux_config_exists; then
+			eerror "Unable to check your kernel"
+		else
+			CONFIG_CHECK="~VETH ~MACVTAP"
+			ERROR_VETH="You will need the Virtual ethernet pair device driver compiled"
+			ERROR_VETH+=" into your kernel or loaded as a module to use the"
+			ERROR_VETH+=" local network settings feature."
+			ERROR_MACVTAP="You will also need support for MAC-VLAN based tap driver."
+			check_extra_config
+		fi
+	fi
+}
+
+src_configure() {
+	# -DNM_WITH_QEMU: Do not embbed qemu.
+	local mycmakeargs=(
+		-DNM_WITH_DBUS=$(usex dbus)
+		-DNM_WITH_NETWORK_MAP=$(usex network-map)
+		-DNM_WITH_REMOTE=$(usex remote-api)
+		-DNM_WITH_OVF_SUPPORT=$(usex ovf)
+		-DNM_WITH_QEMU=off
+		-DNM_WITH_SPICE=$(usex spice)
+		-DNM_WITH_VNC_CLIENT=$(usex vnc-client)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	docompress -x /usr/share/man/man1/nemu.1.gz
+}
+
+pkg_postinst() {
+	elog "For non-root usage execute script:"
+	elog "/usr/share/nemu/scripts/setup_nemu_nonroot.sh linux <username>"
+	elog "and add udev rule:"
+	elog "cp /usr/share/nemu/scripts/42-net-macvtap-perm.rules /etc/udev/rules.d"
+	elog "Afterwards reboot or reload udev with"
+	elog "udevadm control --reload-rules && udevadm trigger"
+}
--- a/app-emulation/uade/uade-2.13-r2.ebuild
+++ b/app-emulation/uade/uade-2.13-r2.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://zakalwe.fi/uade/uade2/${P}.tar.bz2"

 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="fuse"

 RDEPEND="
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
--- a/app-eselect/eselect-fontconfig/eselect-fontconfig-20220403.ebuild
+++ b/app-eselect/eselect-fontconfig/eselect-fontconfig-20220403.ebuild
@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/fontconfig.esel

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"

 RDEPEND=">=app-admin/eselect-1.2.3"

--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/dasel/Manifest
+++ b/app-misc/dasel/Manifest
@ -1,2 +1,3 @@
 DIST dasel-1.24.3-deps.tar.xz 20531068 BLAKE2B 6cd947a88c54e46300432c2f87c0ef757a53739e0755af48f4596a87ba46faf12c967145a0f263e13abb8f01ffe10c51b45f641de348fc02e7af39417b709d1d SHA512 27696cd5a5c93b3e29ba12fd2730c04047dc752ef17a32db73e7cbc8e5d38d914705720da9ff0ffb0c8d3fb383b5070eb552b24a4e72e72ebad70c2e1085cab3
 DIST dasel-1.24.3.tar.gz 3052243 BLAKE2B bc6621515781272d45f2b459f99a5c8ab3c51a869d147bf8e0d7ea1f0f3b9e8afd0b80a4091ecccfcaa7e8e5e375d6851400dac9432aa911374d011b8c36ec36 SHA512 fc836413e0e6538102e63f08fb0030ed93fde048d11e98291f22f02ee5d5cff51523f25052b8ef7f268d52c2487086408ddc8547d2e12fb3a672d3a754838ce9
+DIST dasel-1.25.0.tar.gz 3053827 BLAKE2B 2902cddbb2feb4ce3f4d643e26c4b1f82f3b25a2d6e016257767fefe499bc4e52cefa784723ae2c33ff68614501a10e0aea2a8b8f000de3748c3e7f4fb0ff28f SHA512 ec2b1d0ca0acd84dc9465b0f4aa27b054a0897efbcb4dd6a94cf6de73415933e44b857e8dbcb01d3bac266597d2dfe132146d282c168b087dcd77512e5f06e72
--- a/app-misc/dasel/dasel-1.25.0.ebuild
+++ b/app-misc/dasel/dasel-1.25.0.ebuild
@ -0,0 +1,24 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Query, update and convert data structures from the command line"
+HOMEPAGE="https://github.com/TomWright/dasel"
+SRC_URI="https://github.com/TomWright/dasel/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~zmedico/dist/dasel-1.24.3-deps.tar.xz"
+
+LICENSE="MIT Apache-2.0 BSD BSD-2 ISC"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+src_compile() {
+	CGO_ENABLED=0 go build -o bin/dasel -ldflags="-X 'github.com/tomwright/dasel/internal.Version=${PV}'" ./cmd/dasel || die
+}
+
+src_install() {
+	dobin bin/dasel
+	dodoc CHANGELOG.md README.md
+}
--- a/app-misc/geneweb/geneweb-7.0.0-r2.ebuild
+++ b/app-misc/geneweb/geneweb-7.0.0-r2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -21,7 +21,8 @@ RDEPEND="dev-lang/ocaml[ocamlopt?]
 	dev-ml/uunf:=
 	>=dev-ml/markup-1.0.0:=
 	dev-ml/unidecode:=
-	dev-ml/calendars:="
+	dev-ml/calendars:=
+	dev-ml/zarith:="
 DEPEND="${RDEPEND}
 	dev-ml/cppo
 	test? ( dev-ml/ounit2 )"
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
--- a/app-portage/iwdevtools/Manifest
+++ b/app-portage/iwdevtools/Manifest
@ -1,2 +1,3 @@
 DIST iwdevtools-0.10.1.tar.gz 61117 BLAKE2B fd5508a40a854987db7f2ecc0e68e100cd6a8b6cc5b90a9901bbf6c16336ebc497861e05a6c1683ac9082aa9f12a03cb47f7116da793fbd8e105ed78aae2bbb3 SHA512 0f04850f15edc8af368a87bbc665c62d5588f4220c2d15ca5c0dd00d2c8135f7e1294217c8aec313650b7b7aae6433b87bdc32306c2c4c6e6747e55a13adbbe0
 DIST iwdevtools-0.11.0.tar.gz 81975 BLAKE2B 241c04488cc3da265c1c5a0cbf90ddb938b4e0da10942094f25dcb1d32a0da314a80fba1fc99b1ec54a449905be8eddab896d67194d8e511c1a7378856fd7df2 SHA512 cccbe9461f27233e228529a5fe9c729620647b1e134c723f407bdd23b4fa85f04c6294fc6579a22667dec65b20ad1c26ac9d71b214407c49463aeed6fbaed7d1
+DIST iwdevtools-0.11.1.tar.gz 83067 BLAKE2B 8fbdbe21242ccb3e578a8060ced5d4562acc70ffa8789991af00ddeaf8cb232177d2482f06f8092d6b60cc128c1b55a3f5df2eaba985f1d63795e6730c2fa1be SHA512 d893efbc75a3fa7056c2dbe5fa75bbbf262f40f8ddd44347e98559ff4e51572b64698c93b8fb3e92e73d84151cf0a11457d58f898295aae05455ac86fd4bd07d
--- a/app-portage/iwdevtools/iwdevtools-0.11.1.ebuild
+++ b/app-portage/iwdevtools/iwdevtools-0.11.1.ebuild
@ -0,0 +1,64 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson optfeature
+
+DESCRIPTION="Small tools to aid with Gentoo development, primarily intended for QA"
+HOMEPAGE="https://github.com/ionenwks/iwdevtools"
+SRC_URI="https://github.com/ionenwks/iwdevtools/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-misc/pax-utils
+	app-portage/portage-utils
+	>=app-shells/bash-5.1
+	dev-libs/libxml2:2
+	sys-apps/diffutils
+	sys-apps/file
+	sys-apps/portage
+	|| ( sys-apps/util-linux app-misc/getopt )"
+BDEPEND="
+	sys-apps/help2man
+	|| ( sys-apps/util-linux app-misc/getopt )
+	test? ( ${RDEPEND} )"
+
+src_configure() {
+	local emesonargs=(
+		-Ddocdir=${PF}
+		-Deprefix="${EPREFIX}"
+		-Dshellcheck=false
+		$(meson_use test)
+	)
+
+	has_version sys-apps/util-linux || emesonargs+=( -Dgetopt=getopt-long )
+
+	meson_src_configure
+}
+
+pkg_postinst() {
+	optfeature "detecting potential ABI issues using abidiff" dev-util/libabigail
+
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog "Optional portage integration relies on using /etc/portage/bashrc."
+		elog "The example bashrc can be used as-is if not already using one:"
+		elog
+		elog "    ln -s ../../usr/share/${PN}/bashrc ${EROOT}/etc/portage/bashrc"
+		elog
+		elog "Otherwise, inspect the tools' --help output and the example to integrate"
+		elog "(if not defining the same phase functions, the example can be sourced)."
+		elog
+		elog "Note that \`eqawarn\` is used for portage output by default. QA messages"
+		elog "aren't logged / shown post-emerge unless e.g. in /etc/portage/make.conf:"
+		elog
+		elog '    PORTAGE_ELOG_CLASSES="${PORTAGE_ELOG_CLASSES} qa"'
+		elog
+		elog "See ${EROOT}/usr/share/doc/${PF}/README.rst* for information on tools."
+	fi
+}
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
--- a/dev-cpp/abseil-cpp/abseil-cpp-20211102.0-r2.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20211102.0-r2.ebuild
@ -0,0 +1,73 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake python-any-r1
+
+# yes, it needs SOURCE, not just installed one
+# and no, 1.11.0 is not enough
+GTEST_COMMIT="1b18723e874b256c1e39378c6774a90701d70f7a"
+GTEST_FILE="gtest-${GTEST_COMMIT}.tar.gz"
+
+DESCRIPTION="Abseil Common Libraries (C++), LTS Branch"
+HOMEPAGE="https://abseil.io"
+SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://github.com/google/googletest/archive/${GTEST_COMMIT}.tar.gz -> ${GTEST_FILE} )"
+
+LICENSE="
+	Apache-2.0
+	test? ( BSD )
+"
+SLOT="0/${PV%%.*}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="test"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	test? ( sys-libs/timezone-data )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-20211102.0-fix-cuda-nvcc-build.patch"
+	"${FILESDIR}/${PN}-20211102.0-r2-cuda11.6-compile-fix.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# un-hardcode abseil compiler flags
+	sed -i \
+		-e '/"-maes",/d' \
+		-e '/"-msse4.1",/d' \
+		-e '/"-mfpu=neon"/d' \
+		-e '/"-march=armv8-a+crypto"/d' \
+		absl/copts/copts.py || die
+
+	# now generate cmake files
+	python_fix_shebang absl/copts/generate_copts.py
+	absl/copts/generate_copts.py || die
+
+	if use test; then
+		sed -i 's/-Werror//g' \
+			"${WORKDIR}/googletest-${GTEST_COMMIT}"/googletest/cmake/internal_utils.cmake || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DABSL_ENABLE_INSTALL=TRUE
+		-DABSL_LOCAL_GOOGLETEST_DIR="${WORKDIR}/googletest-${GTEST_COMMIT}"
+		-DCMAKE_CXX_STANDARD=17
+		-DABSL_PROPAGATE_CXX_STD=TRUE
+		$(usex test -DBUILD_TESTING=ON '') #intentional usex
+	)
+	cmake_src_configure
+}
--- a/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-cuda11.6-compile-fix.patch
+++ b/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-cuda11.6-compile-fix.patch
@ -0,0 +1,24 @@
+diff --git a/absl/strings/internal/string_constant.h b/absl/strings/internal/string_constant.h
+index a11336b..e1596b1 100644
+--- a/absl/strings/internal/string_constant.h
+++ b/absl/strings/internal/string_constant.h
+@@ -35,12 +35,18 @@ namespace strings_internal {
+ // below.
+ template <typename T>
+ struct StringConstant {
+ private:
+  static constexpr bool ValidateConstant(absl::string_view view) {
+    return view.empty() || 2 * view[0] != 1;
+  }
+
+public:
+   static constexpr absl::string_view value = T{}();
+   constexpr absl::string_view operator()() const { return value; }
+ 
+   // Check to be sure `view` points to constant data.
+   // Otherwise, it can't be constant evaluated.
+-  static_assert(value.empty() || 2 * value[0] != 1,
+  static_assert(ValidateConstant(value),
+                 "The input string_view must point to constant data.");
+ };
+ 
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
--- a/dev-db/mongodb/mongodb-4.2.17-r2.ebuild
+++ b/dev-db/mongodb/mongodb-4.2.17-r2.ebuild
@ -20,7 +20,7 @@ SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"

 LICENSE="Apache-2.0 SSPL-1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="debug kerberos lto ssl test +tools"
 RESTRICT="!test? ( test )"

--- a/dev-db/mysqltuner/Manifest
+++ b/dev-db/mysqltuner/Manifest
@ -1 +1,2 @@
 DIST mysqltuner-1.8.3.tar.gz 254525 BLAKE2B 7fa1fe24ab454aa15a03e62410e08988a4a0d3ac9b1e4df0219a67bffa4d6113d8c89d6f93f8e6d08a35ecc4bdbf5c0148d8e53138f05a5c22899ecca98b3614 SHA512 965ad0204cb449aa113bf1880a91468d48467c84e7d42ac8f12e7ee4035e49dc7cb191d2b11b6e5b084a60c3857e92ac4d1bef63f688538f3468fda32304a702
+DIST mysqltuner-1.9.9.tar.gz 225048 BLAKE2B 5c22ecbe3ab8ab2ad8712c6cbdfbc6bb182e6211d7894c2dc10c68b5b31f74f7512747c983844ba6ce9e12e422f510e4e68a18e85e29f443424e4dfa7055e1f7 SHA512 9373fcbcf514a989126b100739a87d711b4c2081e2608b4576d0ab88590ffd85fae57f1587e1d9f44cf0d89baa92eeb9115db2c4c6c491b701e965de7a549fa0
--- a/dev-db/mysqltuner/mysqltuner-1.9.9.ebuild
+++ b/dev-db/mysqltuner/mysqltuner-1.9.9.ebuild
@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="MySQLTuner-perl"
+
+DESCRIPTION="Makes recommendations for increased performance and stability for MySQL"
+HOMEPAGE="https://github.com/major/MySQLTuner-perl"
+SRC_URI="https://github.com/major/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-lang/perl
+	virtual/perl-Getopt-Long
+"
+
+DEPEND="${RDEPEND}"
+
+src_install() {
+	newbin mysqltuner.pl mysqltuner
+	dodoc {CONTRIBUTING,INTERNALS,USAGE}.md
+	einstalldocs
+
+	# Passwords and vulnerabilities are meant to be fed to the script uncompressed.
+	dodoc basic_passwords.txt vulnerabilities.csv
+	docompress -x "/usr/share/doc/${PF}/basic_passwords.txt" "/usr/share/doc/${PF}/vulnerabilities.csv"
+}
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@ -1,6 +1,8 @@
 DIST sqlite-doc-3380200.zip 10620764 BLAKE2B 81f7e7b9aef37bdae133c4d7dc517d2040d8202a7e0cdf00180d3abe3fb677c80dbc1987e437f0d0f34f47c61f09a7c9d664ba42af976ecfb24555590bb22087 SHA512 b54372ff788aa42b2138c6de91c42c4f6a6440623de3679f08b0519c5c20d9d865c60fa63223c60f4374ff5badb800d6f209e75abb280b9815902757424faf0b
 DIST sqlite-doc-3380300.zip 10626490 BLAKE2B 7f1c2ff11ed4ba4748c35fcd72bedec5ce1ca68d87d00839f0a5f512c7309cf1c60678c0a0d8aecf07dc521c2240acdf1262f47ff3000b95e4953e095f2ec8f2 SHA512 4c30860b6ff0ba8c9455ea037cdda642bab2c1070e8726411ee51046b442f333623ce9c810d1d028a49ce571e6cc4afe363c643e90ba59463e84bb39298c4ad3
 DIST sqlite-doc-3380500.zip 10640188 BLAKE2B d831b672879a07e700c4d19bb97435cfc3aabc2371fd1b7f9e2257d1d53edaba72d974816d509fa60dbc7feaddf4b4f64c6bc061da4945aecab7be463951cb0c SHA512 1f8520e8b06cac97a3cd532d105be847b864d4d51ff2d8ab92c62b369e2e662aa477808e566e334a9103e31b84c119050b92ab6f0ef6d5d68db4d49bf2dd8182
+DIST sqlite-doc-3390000.zip 10666677 BLAKE2B 4577af3614f9dd7862d8e4cd084010700492c1abddc94859d08dc2f2cca2d5989c03ab63fa690072c798dc52e59ccfca337a2f1cfb14162db9364f9f27a0c93b SHA512 c9d86c15f743deca233eabd68edb7538e75d7c3bd49caeb6a2a2958e1fdb3a258d2a69964626fac13c7f402dae9f33fd5e3b479ef23c43f835efeaf84d6ba32c
 DIST sqlite-src-3380200.zip 13242285 BLAKE2B a07f895f57c355e2ec1c96fc857b63d774ff52f7e49c22b1c936b260e6e7787ec656059c02cc6d38845c4368507067d86dac493559541fbb914a3da9cbc67cce SHA512 fd457602db4577b31bc6053fd3cceb220337275e3fd26976f4270fb8a7da4fa047ca23dd18e2795cdfd894d05bad4c53954a81391d71507d359fb224995e420a
 DIST sqlite-src-3380300.zip 13244116 BLAKE2B d28c26a72729b49fac009e835068a15cb14b13bcef5e2d45a94929f22329002cbbf09ff9926a7cb041d1bcbd6fb9ebac784cce06196d29a9b9bf56f97645553e SHA512 d0605148931db62d167080e384d058e87452409fcb3ce366603e6eec8e2f68754259ce217c26e641401d5b0ae7714efd45fc4a881671db37597f2f027cd7da51
 DIST sqlite-src-3380500.zip 13245057 BLAKE2B d2deefbc918ab593146950c21047dbd94168d09150ffe00da20e4ee6b02f69516b496b14e1925b00ace8a4148b87bfb263a97d75ab48990e29e12796387fee5f SHA512 d91f060165354ff4b32a72627c16b6d2310d478768794a49eef57229d7199d83f951444fdc0725acf8d2565ef61a9c7921e9c965f429b018b6fd23d129b6e630
+DIST sqlite-src-3390000.zip 13400405 BLAKE2B 48485372001782c0f8f23167f74a8f17f38801b7ded96d8b67a13a7bc60349a81643a6455e01e8f1ea97bf3ecccd97791ab7cd386f73f787fd7599004d9447d4 SHA512 65409f78bf9f1f02739749c3ac151153fd78af07822be7d532a6aeb5d742463e0dde51702ce737780dc65c526802996da7569032b76a0527f6aa784f89c0cca2
--- a/dev-db/sqlite/sqlite-3.39.0.ebuild
+++ b/dev-db/sqlite/sqlite-3.39.0.ebuild
@ -0,0 +1,436 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs
+
+if [[ "${PV}" != "9999" ]]; then
+	SRC_PV="$(printf "%u%02u%02u%02u" $(ver_rs 1- " "))"
+	DOC_PV="${SRC_PV}"
+	# DOC_PV="$(printf "%u%02u%02u00" $(ver_rs 1-3 " "))"
+fi
+
+DESCRIPTION="SQL database engine"
+HOMEPAGE="https://sqlite.org/"
+
+# On version updates, make sure to read the forum (https://sqlite.org/forum/forum)
+# for hints regarding test failures, backports, etc.
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://sqlite.org/2022/${PN}-src-${SRC_PV}.zip
+		doc? ( https://sqlite.org/2022/${PN}-doc-${DOC_PV}.zip )"
+fi
+
+LICENSE="public-domain"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
+if [[ "${PV}" == "9999" ]]; then
+	PROPERTIES="live"
+fi
+RESTRICT="!test? ( test )"
+
+if [[ "${PV}" == "9999" ]]; then
+	BDEPEND=">=dev-lang/tcl-8.6:0
+		dev-vcs/fossil"
+else
+	BDEPEND="app-arch/unzip
+		>=dev-lang/tcl-8.6:0"
+fi
+RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]
+	icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
+	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
+	tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
+	tools? ( dev-lang/tcl:0= )"
+DEPEND="${RDEPEND}
+	test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] )"
+
+if [[ "${PV}" == "9999" ]]; then
+	S="${WORKDIR}/${PN}"
+else
+	S="${WORKDIR}/${PN}-src-${SRC_PV}"
+fi
+
+_fossil_fetch() {
+	local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}"
+	local repo_id="${1}"
+	local repo_uri="${2}"
+
+	local -x FOSSIL_HOME="${HOME}"
+
+	mkdir -p "${T}/fossil/${repo_id}" || die
+	pushd "${T}/fossil/${repo_id}" > /dev/null || die
+
+	if [[ -n "${EVCS_OFFLINE}" ]]; then
+		if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
+			die "Network activity disabled using EVCS_OFFLINE and clone of repository missing: \"${distdir}/fossil-src/${repo_id}/${repo_id}.fossil\""
+		fi
+	else
+		if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
+			einfo fossil clone --verbose "${repo_uri}" "${repo_id}.fossil"
+			fossil clone --verbose "${repo_uri}" "${repo_id}.fossil" || die
+			echo
+		else
+			cp -p "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" . || die
+			einfo fossil pull --repository "${repo_id}.fossil" --verbose "${repo_uri}"
+			fossil pull --repository "${repo_id}.fossil" --verbose "${repo_uri}" || die
+			echo
+		fi
+
+		(
+			addwrite "${distdir}"
+			mkdir -p "${distdir}/fossil-src/${repo_id}" || die
+			cp -p "${repo_id}.fossil" "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" || die
+		)
+	fi
+
+	popd > /dev/null || die
+}
+
+_fossil_checkout() {
+	local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}"
+	local repo_id="${1}"
+	local branch_or_commit="${2}"
+	local target_directory="${3}"
+
+	local -x FOSSIL_HOME="${HOME}"
+
+	if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
+		die "Clone of repository missing: \"${distdir}/fossil-src/${repo_id}/${repo_id}.fossil\""
+	fi
+
+	if [[ ! -f "${T}/fossil/${repo_id}/${repo_id}.fossil" ]]; then
+		mkdir -p "${T}/fossil/${repo_id}" || die
+		cp -p "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" "${T}/fossil/${repo_id}" || die
+	fi
+
+	mkdir "${target_directory}" || die
+	pushd "${target_directory}" > /dev/null || die
+
+	einfo fossil open --quiet "${T}/fossil/${repo_id}/${repo_id}.fossil" "${branch_or_commit}"
+	fossil open --quiet "${T}/fossil/${repo_id}/${repo_id}.fossil" "${branch_or_commit}" || die
+	echo
+
+	popd > /dev/null || die
+}
+
+fossil_fetch() {
+	local repo_id="${1}"
+	local repo_uri="${2}"
+	local target_directory="${3}"
+
+	local branch_or_commit="${EFOSSIL_COMMIT:-${EFOSSIL_BRANCH:-trunk}}"
+
+	_fossil_fetch "${repo_id}" "${repo_uri}"
+	_fossil_checkout "${repo_id}" "${branch_or_commit}" "${target_directory}"
+}
+
+src_unpack() {
+	if [[ "${PV}" == "9999" ]]; then
+		fossil_fetch sqlite https://sqlite.org/src "${WORKDIR}/${PN}"
+		if use doc; then
+			fossil_fetch sqlite-doc https://sqlite.org/docsrc "${WORKDIR}/${PN}-doc"
+		fi
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	eapply_user
+
+	eautoreconf
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local -x CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}"
+	local options=()
+
+	options+=(
+		--enable-load-extension
+		--enable-threadsafe
+	)
+
+	# Support detection of misuse of SQLite API.
+	# https://sqlite.org/compile.html#enable_api_armor
+	append-cppflags -DSQLITE_ENABLE_API_ARMOR
+
+	# Support bytecode and tables_used virtual tables.
+	# https://sqlite.org/compile.html#enable_bytecode_vtab
+	# https://sqlite.org/bytecodevtab.html
+	append-cppflags -DSQLITE_ENABLE_BYTECODE_VTAB
+
+	# Support column metadata functions.
+	# https://sqlite.org/compile.html#enable_column_metadata
+	# https://sqlite.org/c3ref/column_database_name.html
+	append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
+
+	# Support sqlite_dbpage virtual table.
+	# https://sqlite.org/compile.html#enable_dbpage_vtab
+	# https://sqlite.org/dbpage.html
+	append-cppflags -DSQLITE_ENABLE_DBPAGE_VTAB
+
+	# Support dbstat virtual table.
+	# https://sqlite.org/compile.html#enable_dbstat_vtab
+	# https://sqlite.org/dbstat.html
+	append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB
+
+	# Support sqlite3_serialize() and sqlite3_deserialize() functions.
+	# https://sqlite.org/compile.html#enable_deserialize
+	# https://sqlite.org/c3ref/serialize.html
+	# https://sqlite.org/c3ref/deserialize.html
+	append-cppflags -DSQLITE_ENABLE_DESERIALIZE
+
+	# Support comments in output of EXPLAIN.
+	# https://sqlite.org/compile.html#enable_explain_comments
+	append-cppflags -DSQLITE_ENABLE_EXPLAIN_COMMENTS
+
+	# Support Full-Text Search versions 3, 4 and 5.
+	# https://sqlite.org/compile.html#enable_fts3
+	# https://sqlite.org/compile.html#enable_fts3_parenthesis
+	# https://sqlite.org/compile.html#enable_fts4
+	# https://sqlite.org/compile.html#enable_fts5
+	# https://sqlite.org/fts3.html
+	# https://sqlite.org/fts5.html
+	append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
+	options+=(--enable-fts5)
+
+	# Support hidden columns.
+	append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS
+
+	# Support memsys5 memory allocator.
+	# https://sqlite.org/compile.html#enable_memsys5
+	# https://sqlite.org/malloc.html#memsys5
+	append-cppflags -DSQLITE_ENABLE_MEMSYS5
+
+	# Support sqlite3_normalized_sql() function.
+	# https://sqlite.org/c3ref/expanded_sql.html
+	append-cppflags -DSQLITE_ENABLE_NORMALIZE
+
+	# Support sqlite_offset() function.
+	# https://sqlite.org/compile.html#enable_offset_sql_func
+	# https://sqlite.org/lang_corefunc.html#sqlite_offset
+	append-cppflags -DSQLITE_ENABLE_OFFSET_SQL_FUNC
+
+	# Support pre-update hook functions.
+	# https://sqlite.org/compile.html#enable_preupdate_hook
+	# https://sqlite.org/c3ref/preupdate_count.html
+	append-cppflags -DSQLITE_ENABLE_PREUPDATE_HOOK
+
+	# Support Resumable Bulk Update extension.
+	# https://sqlite.org/compile.html#enable_rbu
+	# https://sqlite.org/rbu.html
+	append-cppflags -DSQLITE_ENABLE_RBU
+
+	# Support R*Trees.
+	# https://sqlite.org/compile.html#enable_rtree
+	# https://sqlite.org/compile.html#enable_geopoly
+	# https://sqlite.org/rtree.html
+	# https://sqlite.org/geopoly.html
+	append-cppflags -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_GEOPOLY
+
+	# Support Session extension.
+	# https://sqlite.org/compile.html#enable_session
+	# https://sqlite.org/sessionintro.html
+	append-cppflags -DSQLITE_ENABLE_SESSION
+
+	# Support scan status functions.
+	# https://sqlite.org/compile.html#enable_stmt_scanstatus
+	# https://sqlite.org/c3ref/stmt_scanstatus.html
+	# https://sqlite.org/c3ref/stmt_scanstatus_reset.html
+	append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS
+
+	# Support sqlite_stmt virtual table.
+	# https://sqlite.org/compile.html#enable_stmtvtab
+	# https://sqlite.org/stmt.html
+	append-cppflags -DSQLITE_ENABLE_STMTVTAB
+
+	# Support unknown() function.
+	# https://sqlite.org/compile.html#enable_unknown_sql_function
+	append-cppflags -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
+
+	# Support unlock notification.
+	# https://sqlite.org/compile.html#enable_unlock_notify
+	# https://sqlite.org/c3ref/unlock_notify.html
+	# https://sqlite.org/unlock_notify.html
+	append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
+
+	# Support LIMIT and ORDER BY clauses on DELETE and UPDATE statements.
+	# https://sqlite.org/compile.html#enable_update_delete_limit
+	# https://sqlite.org/lang_delete.html#optional_limit_and_order_by_clauses
+	# https://sqlite.org/lang_update.html#optional_limit_and_order_by_clauses
+	append-cppflags -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT
+
+	# Support soundex() function.
+	# https://sqlite.org/compile.html#soundex
+	# https://sqlite.org/lang_corefunc.html#soundex
+	append-cppflags -DSQLITE_SOUNDEX
+
+	# Support URI filenames.
+	# https://sqlite.org/compile.html#use_uri
+	# https://sqlite.org/uri.html
+	append-cppflags -DSQLITE_USE_URI
+
+	# debug USE flag.
+	options+=($(use_enable debug))
+
+	# icu USE flag.
+	if use icu; then
+		# Support ICU extension.
+		# https://sqlite.org/compile.html#enable_icu
+		append-cppflags -DSQLITE_ENABLE_ICU
+		sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
+	fi
+
+	# readline USE flag.
+	options+=(
+		--disable-editline
+		$(use_enable readline)
+	)
+	if use readline; then
+		options+=(--with-readline-inc="-I${ESYSROOT}/usr/include/readline")
+	fi
+
+	# secure-delete USE flag.
+	if use secure-delete; then
+		# Enable secure_delete pragma by default.
+		# https://sqlite.org/compile.html#secure_delete
+		# https://sqlite.org/pragma.html#pragma_secure_delete
+		append-cppflags -DSQLITE_SECURE_DELETE
+	fi
+
+	# static-libs USE flag.
+	options+=($(use_enable static-libs static))
+
+	# tcl, test, tools USE flags.
+	if use tcl || use test || { use tools && multilib_is_native_abi; }; then
+		options+=(
+			--enable-tcl
+			--with-tcl="${ESYSROOT}/usr/$(get_libdir)"
+		)
+	else
+		options+=(--disable-tcl)
+	fi
+
+	if [[ "${ABI}" == "x86" ]]; then
+		if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -q "^#define __SSE__ 1$"; then
+			append-cflags -mfpmath=sse
+		else
+			append-cflags -ffloat-store
+		fi
+
+		# Skip known-broken test for now
+		# https://sqlite.org/forum/forumpost/d97caf168f
+		# https://sqlite.org/forum/forumpost/50f136d91d
+		if use test ; then
+			rm test/atof1.test || die
+		fi
+	fi
+
+	econf "${options[@]}"
+}
+
+multilib_src_compile() {
+	emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
+
+	if use tools && multilib_is_native_abi; then
+		emake changeset dbdump dbhash dbtotxt index_usage rbu scrub showdb showjournal showshm showstat4 showwal sqldiff sqlite3_analyzer sqlite3_checker sqlite3_expert sqltclsh
+	fi
+
+	if [[ "${PV}" == "9999" ]] && use doc && multilib_is_native_abi; then
+		emake tclsqlite3.c
+
+		local build_directory="$(pwd)"
+		build_directory="${build_directory##*/}"
+
+		mkdir "${WORKDIR}/${PN}-doc-build" || die
+		pushd "${WORKDIR}/${PN}-doc-build" > /dev/null || die
+
+		emake -f "../${PN}-doc/Makefile" -j1 SRC="../${PN}" BLD="../${build_directory}" DOC="../${PN}-doc" CC="$(tc-getBUILD_CC)" TCLINC="" TCLFLAGS="$($(tc-getBUILD_PKG_CONFIG) --libs tcl) -ldl -lm" base doc
+		rmdir doc/matrix{/*,} || die
+
+		popd > /dev/null || die
+	fi
+}
+
+multilib_src_test() {
+	if [[ "${EUID}" -eq 0 ]]; then
+		ewarn "Skipping tests due to root permissions"
+		return
+	fi
+
+	local -x SQLITE_HISTORY="${T}/sqlite_history_${ABI}"
+
+	# e_uri.test tries to open files in /.
+	# https://bugs.gentoo.org/839798
+	local SANDBOX_PREDICT=${SANDBOX_PREDICT}
+	addpredict "/test.db:/ÿ.db"
+
+	emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo test)
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
+
+	if use tools && multilib_is_native_abi; then
+		install_tool() {
+			if [[ -f ".libs/${1}" ]]; then
+				newbin ".libs/${1}" "${2}"
+			else
+				newbin "${1}" "${2}"
+			fi
+		}
+
+		install_tool changeset sqlite3-changeset
+		install_tool dbdump sqlite3-db-dump
+		install_tool dbhash sqlite3-db-hash
+		install_tool dbtotxt sqlite3-db-to-txt
+		install_tool index_usage sqlite3-index-usage
+		install_tool rbu sqlite3-rbu
+		install_tool scrub sqlite3-scrub
+		install_tool showdb sqlite3-show-db
+		install_tool showjournal sqlite3-show-journal
+		install_tool showshm sqlite3-show-shm
+		install_tool showstat4 sqlite3-show-stat4
+		install_tool showwal sqlite3-show-wal
+		install_tool sqldiff sqlite3-diff
+		install_tool sqlite3_analyzer sqlite3-analyzer
+		install_tool sqlite3_checker sqlite3-checker
+		install_tool sqlite3_expert sqlite3-expert
+		install_tool sqltclsh sqlite3-tclsh
+
+		unset -f install_tool
+	fi
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name "*.la" -delete || die
+
+	doman sqlite3.1
+
+	if use doc; then
+		if [[ "${PV}" == "9999" ]]; then
+			pushd "${WORKDIR}/${PN}-doc-build/doc" > /dev/null || die
+		else
+			pushd "${WORKDIR}/${PN}-doc-${DOC_PV}" > /dev/null || die
+		fi
+
+		find "(" -name "*.db" -o -name "*.txt" ")" -delete || die
+		if [[ "${PV}" != "9999" ]]; then
+			rm search search.d/admin || die
+			rmdir search.d || die
+			find -name "*~" -delete || die
+		fi
+
+		(
+			docinto html
+			dodoc -r *
+		)
+
+		popd > /dev/null || die
+	fi
+}
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
--- a/dev-java/sbt/sbt-0.13.18-r1.ebuild
+++ b/dev-java/sbt/sbt-0.13.18-r1.ebuild
@ -24,7 +24,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="binary"

 # Restrict to jdk:1.8
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@ -1,7 +1,7 @@
 DIST mercury-20.06-gentoo-patchset-3.tar.gz 5265 BLAKE2B 0539611691cfb714937bca8dc967246ce32c515b7133391d81333284e6ceffe29b929c042ee0000752bd9980c2d2332de20d7c5dc4e1a6077a6421056d975808 SHA512 54595a71db4d7684071c6496c3e92fe8c9de0a29832cc85901046f2627bd453cf0760b9857e73a91e87edfddc80d384627dc5c2cb7f3bc12ea5737eb5afa4f3b
 DIST mercury-20.06.1-gentoo-patchset-0.tar.gz 4426 BLAKE2B df6f1a3b52b1f57f502621abba175a55342ae88ecbbe8e37d22b89a7514e0dea14299c87fb1dd47866c5fc89bbb2746a92de8dcf037c1a9d5d2ba4e2e9b8c828 SHA512 c26c209a2fc2380793373785c7a8290ea336c38fe1c243df5c71791e2d1f8b6f8d4a9452a9139181aeb0422cd538c5e6ffe40332ea5b2635cab3324dc4dc320b
 DIST mercury-22.01-gentoo-patchset-0.tar.gz 4147 BLAKE2B d59f58cb8870ee3ba636f62c1df7ab54d45d23e92626e1a18717e2ef7511c8a14a63c7d9bbfbeb8ec78841f6a05311f2431c5488df9996dae1ab71ce39c99a55 SHA512 a38d524e900b1771a12921618f785436ebca6029d94c9bd7a3115682b900d688d4cab3e3167a7b110f2fc4f5e9d09c1f24dffe9e39222efd20bb17782829b4a8
-DIST mercury-22.01.1-gentoo-patchset-1.tar.gz 4292 BLAKE2B f094e6702b633f5acb1dd9ef9c56f7183ecdc162b0f9c741ceb9fdbf1e64652f5f525adeb168c0177f4d043561c797dd652eb67dbd66fba816b4d9c5151f176a SHA512 4f12079fb8392a19dcf96078222591c60f3f6724c5f0b154475665c843f9a459c5b3bbc881405d6ef0acc65d9d689aed7f41977e4d712577a9b4f2f027470baf
+DIST mercury-22.01.1-gentoo-patchset-2.tar.gz 4975 BLAKE2B 73dfe5688f7f2c44ee236e3b9fd38811afecc7f8f4dd8f0694c2c3f27ce20a74aade3678bb3a16f7bcfc1fc8b07e518a5954802e410a3f566c00df7898800675 SHA512 16319d2e78af5cb73f67555c1498b277e8c6435cfe4e62fc87817cf06f04deadfad6f8264a5270100aaf6985866b879e9b7c69d3c1839c25d36ca2506bbabd72
 DIST mercury-srcdist-20.06.1.tar.gz 47796261 BLAKE2B f282c6edb78e9090eb451585c65c9214927b94eaa5fcdf6f674aef6beb62eb65179f998bcc2e56c3c93b73dd1dc94973084eb8363bc05e334384096c9520d478 SHA512 94e901e5d3db39e3342bf2d6a2a74556a7b18b295c7e02669b487a81d41c72e572046ce1133d670ca6c1b8e246dd277439087efe8fb99b979a73555a101aa9a8
 DIST mercury-srcdist-20.06.tar.gz 47768559 BLAKE2B f242aa2ef7da53aa2dfa054e4fee8646434d276f0748b014e33ea52d22f2a8a37e6fecaa20617f4943c4c1e7d8c179ed0603a344fde2dd58da98b2bacadf1a71 SHA512 b76bd22d8eb16242c68b614ff122ed7ee7535efef6c0ceb8cc798fee4c550bc41b6faff2135cea43b24c652b654bb35ae049656585d8e7bf3a1122d07cb1ecf4
 DIST mercury-srcdist-22.01.1.tar.gz 48956249 BLAKE2B 0f5a7662327f27c27a4d9e421f71afa58920f6232093452781124817ce5c34d1953a80a08b75e95101a7e2e88159b7d4ead08d25c67a99abcb908a9582af2bab SHA512 5fa49640307233ea0f641488e5ea526385e52833007a31469e083711b63925ca7568d7ad6e09301ddf7816384a080546bc4cf46b1422f974e008917d1aa4f37a
--- a/dev-lang/mercury/mercury-22.01.1.ebuild
+++ b/dev-lang/mercury/mercury-22.01.1.ebuild
@ -5,7 +5,7 @@ EAPI=7

 inherit autotools elisp-common flag-o-matic java-pkg-opt-2 multilib vcs-clean xdg-utils

-PATCHSET_VER="1"
+PATCHSET_VER="2"
 MY_P=${PN}-srcdist-${PV}

 DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
--- a/dev-lang/spidermonkey/spidermonkey-78.15.0.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-78.15.0.ebuild
@ -7,7 +7,7 @@ EAPI="7"
 FIREFOX_PATCHSET="firefox-78esr-patches-19.tar.xz"
 SPIDERMONKEY_PATCHSET="spidermonkey-78-patches-04.tar.xz"

-LLVM_MAX_SLOT=13
+LLVM_MAX_SLOT=14

 PYTHON_COMPAT=( python3_{7..10} )
 PYTHON_REQ_USE="ssl"
@ -73,6 +73,13 @@ BDEPEND="${PYTHON_DEPS}
 	>=virtual/rust-1.41.0
 	virtual/pkgconfig
 	|| (
+		(
+			sys-devel/llvm:14
+			clang? (
+				sys-devel/clang:14
+				lto? ( =sys-devel/lld-14* )
+			)
+		)
 		(
 			sys-devel/llvm:13
 			clang? (
@ -87,20 +94,6 @@ BDEPEND="${PYTHON_DEPS}
 				lto? ( =sys-devel/lld-12* )
 			)
 		)
-		(
-			sys-devel/llvm:11
-			clang? (
-				sys-devel/clang:11
-				lto? ( =sys-devel/lld-11* )
-			)
-		)
-		(
-			sys-devel/llvm:10
-			clang? (
-				sys-devel/clang:10
-				lto? ( =sys-devel/lld-10* )
-			)
-		)
 	)
 	lto? (
 		!clang? ( sys-devel/binutils[gold] )
--- a/dev-libs/Ice/Ice-3.6.5-r2.ebuild
+++ b/dev-libs/Ice/Ice-3.6.5-r2.ebuild
@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{8..10} )

 RUBY_OPTIONAL="yes"
-USE_RUBY="ruby26"
+USE_RUBY="ruby27"

 PHP_EXT_NAME="IcePHP"
 PHP_EXT_INI="yes"
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
--- a/dev-libs/cudnn/Manifest
+++ b/dev-libs/cudnn/Manifest
@ -1,2 +1,3 @@
 DIST cudnn-linux-x86_64-8.3.1.22_cuda11.5-archive.tar.xz 856769204 BLAKE2B 375021592470b1f17d7a69701f1ac3289ceb8ddbbdacf577fa51abfdad263102d3c6cedb24ac829c49e033300532e77b6064835a8ae1e05377e375f4320c9a15 SHA512 815ef678b7510e014181f3bf782e627771e8d00d218b34f2af11436b8a49331400269f98448854353c12721468365b71a8483eb7631777f0d628982e81942a8b
 DIST cudnn-linux-x86_64-8.3.2.44_cuda11.5-archive.tar.xz 857894928 BLAKE2B 7f0f4fe4d8ccd2e7385d5c4535f4543b3d8e80f65caa5a4d5fdaa1b386a76fe16d8d9e32745a098954eda8d0b803af6146c1ffc5b46c838ea0ccecd5923984cf SHA512 4f2159e48685613b436adb3995aa80cf6d5b395c146059ccc15ef2f5f7e47c94bfeebd14b09d8832f7df76d2379829aa32edb7b69852e17a8e7036084265ed39
+DIST cudnn-linux-x86_64-8.4.1.50_cuda11.6-archive.tar.xz 850711772 BLAKE2B 47e03d7a25f92cb2e2793e7d13b6182da62329a7868a785ca2224bccfc97960721fba26e1e8a933e8d449085e895c129871bb2fd7c690265d01ad10564a1b939 SHA512 bf2069edf5c73db325d4ef27e3976169b9bd32afc49f012bd1e6f7d9bd374179dd9312538e7be7b0f8d5da0f2edd79b6788868e183f00f8b99fda185302d07c3
--- a/dev-libs/cudnn/cudnn-8.4.1.50.ebuild
+++ b/dev-libs/cudnn/cudnn-8.4.1.50.ebuild
@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+BASE_V="$(ver_cut 0-3)"
+# supports 11.x but URL has a specific version number
+CUDA_V="11.6"
+
+DESCRIPTION="NVIDIA Accelerated Deep Learning on GPU library"
+HOMEPAGE="https://developer.nvidia.com/cudnn"
+SRC_URI="https://developer.download.nvidia.com/compute/redist/cudnn/v${BASE_V}/local_installers/${CUDA_V}/cudnn-linux-x86_64-${PV}_cuda${CUDA_V}-archive.tar.xz"
+S="${WORKDIR}/cudnn-linux-x86_64-${PV}_cuda${CUDA_V}-archive"
+
+LICENSE="NVIDIA-cuDNN"
+SLOT="0/8"
+KEYWORDS="~amd64 ~amd64-linux"
+IUSE=""
+RESTRICT="mirror"
+
+RDEPEND="=dev-util/nvidia-cuda-toolkit-11*"
+
+QA_PREBUILT="*"
+
+src_install() {
+	insinto /opt/cuda/targets/x86_64-linux
+	doins -r include
+
+	insinto /opt/cuda/targets/x86_64-linux/lib
+	doins -r lib/.
+}
--- a/dev-libs/libdispatch/Manifest
+++ b/dev-libs/libdispatch/Manifest
@ -1,2 +1,3 @@
 DIST libdispatch-5.3.3.tar.gz 591794 BLAKE2B 982b99227a1292d999639e7b16c1382a38dd6799a0ea1b83dd66333d5b6388be809127565fafc7f171dab9d8aa388cf67316d7eb6fa2ae2e1b8ccf660b32f0ab SHA512 b76071e8fac19ef5aed8cb3998b903a17a4f2b9e6b992d22d394212f4d48c4a547fb7a8cf16e4ce2ef17d6b58e253c2d52c6b176c3a874132410215b73332909
 DIST libdispatch-5.5.tar.gz 592054 BLAKE2B 500ae44069063f202b48cfab2df1fb7fc012f1a1048d2460054e34f18629feefd38952d08f9de310d71774120a0516b4f9210147869e2ce34c266bf44e6fa0d7 SHA512 58ad7122d2fac7b117f4e81eec2b5c1dfdf5256865337110d660790744e83c3fea5e82fbe521b6e56fd0e2f09684e5e1475cf2cac67989a8f78dd0a284fb0d21
+DIST libdispatch-5.6.1.tar.gz 592615 BLAKE2B bbd495717456163b0740cd6bcb92d9dfa7a728b88ab6c3ec6c25bcd4bcc3575cb3eb5e93416ddf8293854c17566f4d0ef7ee4280cf15944ddf224e7439b59a5b SHA512 083a8ebdea87cc04f856db1833adcfca83b16568cff311123ccc6a835f73979ac1051f1733feacfa04155fcabc97f561738adf8e871468e808cf8048bea063b1
--- a/dev-libs/libdispatch/libdispatch-5.6.1.ebuild
+++ b/dev-libs/libdispatch/libdispatch-5.6.1.ebuild
@ -0,0 +1,53 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic cmake toolchain-funcs
+
+MY_PN="swift-corelibs-${PN}"
+MY_PV="swift-${PV}-RELEASE"
+
+DESCRIPTION="A library for concurrent code execution on multicore hardware"
+HOMEPAGE="https://github.com/apple/swift-corelibs-libdispatch"
+SRC_URI="https://github.com/apple/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+DEPEND="
+	!gnustep-base/libobjc2
+	!sys-libs/blocksruntime
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	sys-devel/clang
+	sys-devel/llvm
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+PATCHES=(
+	"${FILESDIR}/remove-Werror.patch"
+	"${FILESDIR}/libdispatch-5.3.3-musl.patch"
+)
+
+src_configure () {
+	if ! tc-is-clang ; then
+		AR=llvm-ar
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		NM=llvm-nm
+		RANLIB=llvm-ranlib
+
+		strip-unsupported-flags
+	fi
+
+	export HOST_CC="$(tc-getBUILD_CC)"
+	export HOST_CXX="$(tc-getBUILD_CXX)"
+	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+	cmake_src_configure
+}
--- a/dev-libs/libwacom/Manifest
+++ b/dev-libs/libwacom/Manifest
@ -1,3 +1,2 @@
-DIST libwacom-1.11.tar.bz2 519285 BLAKE2B fb26190d752316b5d25659d2ae76681bfff1803463360aa138eab91ed7d7ef2d04dfb6bdd4f8c2effc45a495ef3afc312a817d4fd41cd8167172cafd9f5cee9f SHA512 24e8183502dd2b928d53b3d26d8479210e855c94c225649d63ac33062a30615654ff0ab8666a25503fb3253125539cd845ca467fb228a01c608dc3adbbec73b5
 DIST libwacom-1.12.tar.bz2 543819 BLAKE2B fdbfba23d7b1e047757b0c0ff698a484cadc91c199459e1da49bfd5a5406aeb62d2ca43856f7d8363c3f36c7c05f4d3160e8fb576c3d18f085144dec259d49c5 SHA512 4e0084eda01e78f52336f3f1f1ea3ea86cb9c5fdd6d6c0316662405ebe2a328d6837f8db855e58f5fa95a640a5d456a081a7de339a372bf851bc0d5c69530379
-DIST libwacom-2.2.0.tar.xz 106444 BLAKE2B e47d07b8631f85cbde743cf3fe0f9ab5fc26673e62bf0a018463903e0f81a576ca3dd9bb3da8d0049338a87ca384f217e56dd3bc59ad713e6f7b4c20563d8ba4 SHA512 3bded4a72bec230f3318e72bdfd81fa577d4a86103a89367e01e993319f4dbb9ccc73c834c04d5a63f43a8b94457bf64e567d7e3f8d2a0e08b189300c63782a8
+DIST libwacom-2.3.0.tar.xz 107872 BLAKE2B 5589067eabb0b0d5384015a0200950146d1c028ce8cd870b845de8ec22ca1710645755253952e49f9c1db585a945c6ea8da37318b900f16602a1a7081512ecd9 SHA512 ccbeddc55cc67d8102aa4536616f3c379877ba9154a72d7ad92941854c79b727a21efacf4282b9a8730ff181d094749bf84a9fe5850de6246d91a17e5029d888
--- a/dev-libs/libwacom/libwacom-1.11.ebuild
+++ b/dev-libs/libwacom/libwacom-1.11.ebuild
@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit meson python-any-r1 toolchain-funcs udev
-
-DESCRIPTION="Library for identifying Wacom tablets and their model-specific features"
-HOMEPAGE="https://github.com/linuxwacom/libwacom"
-SRC_URI="https://github.com/linuxwacom/${PN}/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/libgudev:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep '
-			dev-python/python-libevdev[${PYTHON_USEDEP}]
-			dev-python/pyudev[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-python_check_deps() {
-	has_version -b "dev-python/python-libevdev[${PYTHON_USEDEP}]" &&
-	has_version -b "dev-python/pyudev[${PYTHON_USEDEP}]" &&
-	has_version -b "dev-python/pytest[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	tc-ld-disable-gold # bug https://github.com/linuxwacom/libwacom/issues/170
-
-	if use test; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature doc documentation)
-		$(meson_feature test tests)
-		-Dudev-dir=$(get_udevdir)
-	)
-	meson_src_configure
-}
--- a/dev-libs/libwacom/libwacom-2.3.0.ebuild
+++ b/dev-libs/libwacom/libwacom-2.3.0.ebuild
@ -65,3 +65,7 @@ src_configure() {
 pkg_postinst() {
 	udev_reload
 }
+
+pkg_postrm() {
+	udev_reload
+}
--- a/dev-libs/libxls/libxls-1.6.2.ebuild
+++ b/dev-libs/libxls/libxls-1.6.2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -16,8 +16,6 @@ BDEPEND="
 	virtual/pkgconfig
 "

-RESTRICT="test" # test driver is missing
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.4.0-asprintf.patch
 )
--- a/dev-libs/nspr/nspr-4.34.ebuild
+++ b/dev-libs/nspr/nspr-4.34.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"

 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="debug"

 MULTILIB_CHOST_TOOLS=(
--- a/dev-libs/re2/Manifest
+++ b/dev-libs/re2/Manifest
@ -1,2 +1,3 @@
 DIST re2-2021-11-01.tar.gz 408934 BLAKE2B 31662b1e9cdfec67347cbe146763a29cc8970683d545965e649a5f54ac318c40cd6daf553b6098fae7024a944f73914641b05970f1274511fac6766abe6b9130 SHA512 9ea04638b7a8667fa9a9d9894c543417c86dde21a93bd4508ae8a43fdd21384092866a3f55e93249942f36488c165e93bee18c61bab3cf138a920654563b8122
 DIST re2-2022-04-01.tar.gz 380861 BLAKE2B ebb9ac6754382dc3a2b4c6ebab994678d364b83fc433e8c7b3b8ca8733503da41b37b796081cc24120801bdda8e69fbf111ccb9ddca51808129c65c622738e61 SHA512 fc3d7cc1ee6bd771719845566d83ffc8c4e19d838748e842a1e19c7564473c9a0a061bebb3966ffa82de6515346f9bbddc2d94ceb3de89233f58826774bd7ce7
+DIST re2-2022-06-01.tar.gz 381032 BLAKE2B a4cf937e0341102a3151cd1741d51cae1bdd8ab589dcd4c9ee2f51ca43b325f7604fd5e6ae85db8ddd8fcca615ade6817a45664a037baf9cd14023ae4c4a46ac SHA512 f3d5f2a3aa5eda74bc8f434d7b000eed8e107c894307a889466a4cb16a15b352a0332e10d80ed603c9e2e38bbcbdf11f15b6953cbdf461cc9fb0560e89a8ceb8
--- a/dev-libs/re2/re2-0.2022.06.01.ebuild
+++ b/dev-libs/re2/re2-0.2022.06.01.ebuild
@ -0,0 +1,52 @@
+# Copyright 2012-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal toolchain-funcs
+
+# Different date format used upstream.
+RE2_VER=${PV#0.}
+RE2_VER=${RE2_VER//./-}
+
+DESCRIPTION="An efficient, principled regular expression library"
+HOMEPAGE="https://github.com/google/re2"
+SRC_URI="https://github.com/google/re2/archive/${RE2_VER}.tar.gz -> re2-${RE2_VER}.tar.gz"
+
+LICENSE="BSD"
+# NOTE: Always run libre2 through abi-compliance-checker!
+# https://abi-laboratory.pro/tracker/timeline/re2/
+SONAME="9"
+SLOT="0/${SONAME}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="icu"
+
+BDEPEND="icu? ( virtual/pkgconfig )"
+DEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/re2-${RE2_VER}"
+
+DOCS=( AUTHORS CONTRIBUTORS README doc/syntax.txt )
+HTML_DOCS=( doc/syntax.html )
+
+src_prepare() {
+	default
+	grep -q "^SONAME=${SONAME}\$" Makefile || die "SONAME mismatch"
+	if use icu; then
+		sed -i -e 's:^# \(\(CC\|LD\)ICU=.*\):\1:' Makefile || die
+	fi
+	multilib_copy_sources
+}
+
+src_configure() {
+	tc-export AR CXX
+}
+
+multilib_src_compile() {
+	emake SONAME="${SONAME}" shared
+}
+
+multilib_src_install() {
+	emake SONAME="${SONAME}" DESTDIR="${D}" prefix="${EPREFIX}/usr" libdir="\$(exec_prefix)/$(get_libdir)" shared-install
+}
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
--- a/dev-python/PyPDF2/Manifest
+++ b/dev-python/PyPDF2/Manifest
@ -2,5 +2,7 @@ DIST PyPDF2-2.0.0.gh.tar.gz 4574406 BLAKE2B 8554fdb7ab9ea1b9990ba72fb05ed02ef873
 DIST PyPDF2-2.1.0.gh.tar.gz 4728411 BLAKE2B 00949842da43136afc7ee3482dc0b61182a0bf3ee4479d8794891ecf0a7cac9ec92a94d480a2ab75d35be9f667b5c27cdf17c8e7ce76bb5355cf2c43c7fc814b SHA512 d82f05fe6e7f944f045600c1fd7d451181803769b38911a2d6e0553ae7b16cbfd6838883809c71fddcdfc386f62e0a5f5aaa6d947236a3c8cdedb5fe8f338a5f
 DIST PyPDF2-2.2.1.gh.tar.gz 5019240 BLAKE2B 31412cc136bebdf0288fcdf693540e2ae8b88c08f9d837ebeb17b8f8bfae289146028890f36b7b16c6012469908d4f6855169efcebce082d4c31f634b6410162 SHA512 669c41f477114bc38a214e8f4893c5eb59d40dfe07e3c436b71ede09738539e3f47d8f9293cf9c3012887d296c7a634ee93bf2542910c400c4765bd30495f0f6
 DIST PyPDF2-2.3.1.gh.tar.gz 5077679 BLAKE2B 36a70ef9e10ebb6d5c50b713f539aad56b8ccbd94d279aa0b0dc41e9ef1c682ac21b04b4612771e386e8655aa812e11bdbe04363ebaa074a96ffa7059f500e62 SHA512 885d6bab457be594c7a715345f0d4c6f5ba1e34f422e3de42822f4886c0021fc799682e9d253f3c3f48f8c45d387ef431843e2f2f9c7e54c1402ef31b975c511
+DIST PyPDF2-2.4.0.gh.tar.gz 5119230 BLAKE2B a396f1e36a4ad74396a549fa6a6dd76b4a24bee66c78e52bd01b9d3ffebbf15698c0b1b30372fbc7224a815733bfcdecc7e7caa275de32f1a25f44c0e8276c9b SHA512 664f57132c6fa9d2cba324559de985b2c4de4a1f9b5d1ca4539cc9ae35b4296a0b3dac1d15ad069e3f46cc01b2b55d530c0fd5f70e6c41ce5461dfd0ebdd4cdd
 DIST PyPDF2-sample-files-41b5cd4f774f8fbd8ac42d93b9962f0376352a15.gh.tar.gz 5406287 BLAKE2B 8ddad01235bdb55cee596d9114e5b6c3b153919bcff5203d229311243516f3595cb36dcca87cae27514a8231d72daa94782115795bff8c1c3d046236811c21e0 SHA512 6c38d5ee0e1c5c0ffdd78f7c2fe56dbf357a1e82d2af642a10264a6102ae8fb95cba6d2f76b26df6a33a5d84cfd5111885d39c1747cf95a5ce545f26bdb37263
+DIST PyPDF2-sample-files-4d24ff93dcddf21d55d028d9675d5b5bf9d7a350.gh.tar.gz 5443819 BLAKE2B 6eb440a2db3b58f7e195b8f24438552b2b414296b887cf44d75b14bda367e37ffef75b870152ac3b38e20e5a6f2c6a4cf374087b70daa9036821dd3ebdce2128 SHA512 de631f650098b6fe15830e5a816158d7f352c7a25d0c743b9e4bdf146e1ef2e3a6ea1751ed5d68f34e9a339a793bfb9dc217934595c7a8dffb854c0a4111b963
 DIST PyPDF2-sample-files-d7ce88b71820fccaaa4738aa37cbace51f3ed3d9.gh.tar.gz 5406263 BLAKE2B 69673ec380941f567d3630459dc610b1c3a58d5f2956138776412683a96292549107294775d236d1304c054fb91b238f42942a169a7bc862c0b721de647ad191 SHA512 a245de88952de08b45e483f05a1ed42a70a67c4215dd8c32a9b5d70bb64b01acc58ebb1cee677ca178eee8380528dbfac50d3a1a022f19039fa3a47746ddc2a0
--- a/dev-python/PyPDF2/PyPDF2-2.4.0.ebuild
+++ b/dev-python/PyPDF2/PyPDF2-2.4.0.ebuild
@ -0,0 +1,102 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+SAMPLE_COMMIT=4d24ff93dcddf21d55d028d9675d5b5bf9d7a350
+DESCRIPTION="Python library to work with PDF files"
+HOMEPAGE="
+	https://pypi.org/project/PyPDF2/
+	https://github.com/py-pdf/PyPDF2/
+"
+SRC_URI="
+	https://github.com/py-pdf/PyPDF2/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	test? (
+		https://github.com/py-pdf/sample-files/archive/${SAMPLE_COMMIT}.tar.gz
+			-> ${PN}-sample-files-${SAMPLE_COMMIT}.gh.tar.gz
+	)
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+BDEPEND="
+	dev-python/pillow[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Needs network access
+	tests/test_cmap.py
+	tests/test_filters.py::test_decompress_zlib_error
+	tests/test_filters.py::test_lzw_decode_neg1
+	tests/test_generic.py::test_dict_read_from_stream
+	tests/test_generic.py::test_parse_content_stream_peek_percentage
+	tests/test_generic.py::test_read_inline_image_no_has_q
+	tests/test_generic.py::test_read_inline_image_loc_neg_1
+	tests/test_generic.py::test_text_string_write_to_stream
+	tests/test_generic.py::test_name_object_read_from_stream_unicode_error
+	tests/test_generic.py::test_bool_repr
+	tests/test_generic.py::test_issue_997
+	'tests/test_page.py::test_page_operations[https://arxiv.org/pdf/2201.00029.pdf-None]'
+	tests/test_merger.py::test_trim_outline_list
+	tests/test_merger.py::test_zoom
+	tests/test_merger.py::test_zoom_xyz_no_left
+	tests/test_merger.py::test_bookmark
+	tests/test_merger.py::test_trim_outline
+	tests/test_merger.py::test1
+	tests/test_merger.py::test_sweep_recursion1
+	tests/test_merger.py::test_sweep_recursion2
+	tests/test_reader.py::test_unexpected_destination
+	tests/test_writer.py::test_sweep_indirect_references_nullobject_exception
+	tests/test_writer.py::test_write_bookmark_on_page_fitv
+	tests/test_page.py::test_extract_text_single_quote_op
+	tests/test_page.py::test_extract_text_page_pdf
+	tests/test_page.py::test_extract_text_page_pdf_impossible_decode_xform
+	tests/test_page.py::test_extract_text_operator_t_star
+	tests/test_reader.py::test_iss925
+	tests/test_reader.py::test_extract_text_xref_issue_2
+	tests/test_reader.py::test_extract_text_xref_issue_3
+	tests/test_reader.py::test_extract_text_pdf15
+	tests/test_reader.py::test_extract_text_xref_table_21_bytes_clrf
+	tests/test_reader.py::test_get_fields
+	tests/test_reader.py::test_get_fields_read_else_block
+	tests/test_reader.py::test_get_fields_read_else_block2
+	tests/test_reader.py::test_get_fields_read_else_block3
+	tests/test_reader.py::test_metadata_is_none
+	tests/test_reader.py::test_get_fields_read_write_report
+	tests/test_reader.py::test_unexpected_destination
+	tests/test_utils.py::test_deprecate_no_replacement
+	tests/test_workflows.py::test_extract_textbench
+	tests/test_xmp.py::test_xmpmm
+	tests/test_xmp.py::test_dc_description
+	tests/test_xmp.py::test_dc_creator
+	tests/test_xmp.py::test_custom_properties
+	tests/test_xmp.py::test_dc_subject
+
+	# Broken test
+	tests/test_utils.py::test_deprecate_no_replacement
+)
+
+src_unpack() {
+	default
+	if use test; then
+		mv "sample-files-${SAMPLE_COMMIT}"/* "${P}"/sample-files/ || die
+	fi
+}
--- a/dev-python/ansi2html/ansi2html-1.7.0.ebuild
+++ b/dev-python/ansi2html/ansi2html-1.7.0.ebuild
@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="amd64 arm x86"
+KEYWORDS="amd64 arm ~riscv x86"
 IUSE="doc"

 RDEPEND=">=dev-python/six-1.7.3[${PYTHON_USEDEP}]"
--- a/dev-python/binaryornot/binaryornot-0.4.4-r2.ebuild
+++ b/dev-python/binaryornot/binaryornot-0.4.4-r2.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz -> ${P}.r1.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~ppc64 ~riscv x86"

 RDEPEND=">=dev-python/chardet-3.0.2[${PYTHON_USEDEP}]"
 BDEPEND="test? ( dev-python/hypothesis[${PYTHON_USEDEP}] )"
--- a/dev-python/cachelib/Manifest
+++ b/dev-python/cachelib/Manifest
@ -1,2 +1,3 @@
 DIST cachelib-0.7.0.tar.gz 20650 BLAKE2B 427101910200e4b13e1cc98582499d4f78066c5b904797ae1e9565c5bc6ea445a9ab8f9eed4e6a9a18dcf8aa0ce369ed455edf6f551ff5476a8101aa75cec192 SHA512 034bc14a2de2eb7a7fe52a51f5ff1f96c700c1d915430c0fae5f95bb045989fbbe82458c1dc17cd8ea54e016d014679628a7470e8564f43cd763480eb06d3153
 DIST cachelib-0.8.0.tar.gz 20532 BLAKE2B 5c9eea33f52fc1ddb4eb6c25be64f43e08ed9c17f8fe233b492f293adee022ad840107a9806654d9446d2f249a78ff18d3c85c8964229df8341e7ce499e8431f SHA512 da9ba99e9c6c70542883a183558561486f37098266c4eb38920494653229f78ac47c2c26499e660241231a606040940105434f260ee977599f605a42e9b3f802
+DIST cachelib-0.9.0.gh.tar.gz 26407 BLAKE2B 8b1b6c725f5869fda4752db64ab4ee9ee9c748f0ed7e73cb5a9967d18d461cc29779a1e3dc18fcf4b9152f9586ed342fb97e75b4a9b7cb6f5efdeee02f8cf13e SHA512 53b214ba95b0e368e48ddc1e9f904497055e4c37deb0d1946419c3b294eb0e999ea690f2b79bd4801ad80201fb823927bc2024cc493006e20f623955850bba71
--- a/dev-python/cachelib/cachelib-0.9.0.ebuild
+++ b/dev-python/cachelib/cachelib-0.9.0.ebuild
@ -0,0 +1,41 @@
+# 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 distutils-r1
+
+DESCRIPTION="Collection of cache libraries in the same API interface. Extracted from werkzeug"
+HOMEPAGE="
+	https://pypi.org/project/cachelib/
+	https://github.com/pallets-eco/cachelib/
+"
+SRC_URI="
+	https://github.com/pallets-eco/cachelib/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-db/redis
+		dev-python/pylibmc[${PYTHON_USEDEP}]
+		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
+		dev-python/redis-py[${PYTHON_USEDEP}]
+		net-misc/memcached
+		www-servers/uwsgi[python,${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# bug #818523
+	tests/test_redis_cache.py
+)
--- a/dev-python/chardet/Manifest
+++ b/dev-python/chardet/Manifest
@ -1 +1,2 @@
 DIST chardet-4.0.0.tar.gz 1923933 BLAKE2B 10dce34cbe6f01536a526931510ed625bc5062335e9419e24c9e48d5697ebbe70dcc54ffaa976ec153340cc74c3086627a3b1dd9e34be32c89a9a81e83fd70d0 SHA512 cb0e052fdd9fec251ebc6eb3f31ca95ece017f2bfa99122997f989286988058ed9688e49d00631c63d8e4e52da1050e23f02b28d0e739aee7302b24c8808370e
+DIST chardet-5.0.0.gh.tar.gz 2016879 BLAKE2B 006992a4945840b3720e93f932618cf81debc094a3ae353bfdd4e56ecdc5a01e4a250bed15473d8d59108978fdbfb769081a9b87f672d35f4892d5ba04c2deb5 SHA512 d19413a4f1f571f3627ec3f55dcc6a69497f6a1d72fe972051713f4d7a473cd539cfbce2eb2c7a070295aa640c6ac2aec6fc0064751e465311935c0e4d88061a
--- a/dev-python/chardet/chardet-5.0.0.ebuild
+++ b/dev-python/chardet/chardet-5.0.0.ebuild
@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Universal encoding detector"
+HOMEPAGE="
+	https://github.com/chardet/chardet/
+	https://pypi.org/project/chardet/
+"
+SRC_URI="
+	https://github.com/chardet/chardet/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# super flaky test
+	# https://github.com/chardet/chardet/issues/256
+	test.py::test_detect_all_and_detect_one_should_agree
+)
--- a/dev-python/click-help-colors/click-help-colors-0.9.1.ebuild
+++ b/dev-python/click-help-colors/click-help-colors-0.9.1.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
@ -14,7 +14,7 @@ SRC_URI="

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 IUSE="examples"

 RDEPEND="dev-python/click[${PYTHON_USEDEP}]"
--- a/dev-python/crashtest/crashtest-0.3.1-r1.ebuild
+++ b/dev-python/crashtest/crashtest-0.3.1-r1.ebuild
@ -13,6 +13,6 @@ SRC_URI="https://github.com/sdispater/crashtest/archive/${PV}.tar.gz -> ${P}.tar

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

 distutils_enable_tests pytest
--- a/dev-python/crashtest/crashtest-0.3.1.ebuild
+++ b/dev-python/crashtest/crashtest-0.3.1.ebuild
@ -1,18 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{7..10} )
-inherit distutils-r1
-
-DESCRIPTION="Python library that makes exceptions handling and inspection easier"
-HOMEPAGE="https://github.com/sdispater/crashtest"
-SRC_URI="https://github.com/sdispater/crashtest/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-distutils_enable_tests pytest
--- a/dev-python/cryptography/cryptography-37.0.3.ebuild
+++ b/dev-python/cryptography/cryptography-37.0.3.ebuild
@ -75,7 +75,7 @@ SRC_URI="
 # extra licenses come from Rust deps
 LICENSE="Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"

 RDEPEND="
 	>=dev-libs/openssl-1.0.2o-r6:0=
--- a/dev-python/cwcwidth/cwcwidth-0.1.6-r1.ebuild
+++ b/dev-python/cwcwidth/cwcwidth-0.1.6-r1.ebuild
@ -17,7 +17,7 @@ SRC_URI="

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"

 BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"

--- a/dev-python/cwcwidth/cwcwidth-0.1.6.ebuild
+++ b/dev-python/cwcwidth/cwcwidth-0.1.6.ebuild
@ -1,28 +0,0 @@
-# Copyright 2021-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="Python bindings for wc(s)width"
-HOMEPAGE="
-	https://github.com/sebastinas/cwcwidth/
-	https://pypi.org/project/cwcwidth/"
-SRC_URI="
-	https://github.com/sebastinas/cwcwidth/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
-
-src_test() {
-	cd tests || die
-	distutils-r1_src_test
-}
--- a/dev-python/cycler/cycler-0.11.0-r1.ebuild
+++ b/dev-python/cycler/cycler-0.11.0-r1.ebuild
@ -18,6 +18,6 @@ SRC_URI="

 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"

 distutils_enable_tests pytest
--- a/dev-python/cycler/cycler-0.11.0.ebuild
+++ b/dev-python/cycler/cycler-0.11.0.ebuild
@ -1,22 +0,0 @@
-# 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="Composable style cycles"
-HOMEPAGE="
-	https://matplotlib.org/cycler/
-	https://pypi.org/project/cycler/
-	https://github.com/matplotlib/cycler"
-SRC_URI="
-	https://github.com/matplotlib/cycler/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-distutils_enable_tests pytest
--- a/Show more
+++ b/Show more
				`@ -0,0 +1 @@`
				`DIST pdf-tools-1.0.0_pre20220619.tar.gz 459416 BLAKE2B 79a7c7a59faf9c11047bfb6218a8055cb9c757b928e52ff59ffb910e5aedb95ca7efe1dda1ae821d98a687fc6e700d8194311fc850f534f425534a1572bd34b5 SHA512 74ca8c05ad238c07ca1b6d6a594889d048220bb984b78b83e7af4c59eedfa7a35a03e153aa4d1296781f910eb0b3a68a5148876a30ad0f6e9fdecf831ff58f8e`
				`@ -0,0 +1 @@`
				`DIST tablist-1.0.tar.gz 31848 BLAKE2B 11bc943aaf25fb1fe6ecb43a944d70d9b5ab4c423f9df96c881a840570780707a702240808c425e8e91321ad620c1773c80c03e2f6881ccddff84c0d818aa7a4 SHA512 14d32228e9663d218b49563ec07a5f8d094b389e06e532c0710af54d7386fcd19435fae2920163e0c774b7b67bf77ef5fc0a246dfbdb11785dca976ff47eeff2`