gentoo resync : 02.02.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-02-02 01:39:05 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-02-02 01:39:05 +0000
commit: fcc5224904648a8e6eb528d7603154160a20022f (patch)
tree: 3bfce096b38a9cea8eed13fc70c1526c456e9abd /dev-libs
parent: 2fd57282f0262ca084e05b0f2c63fbada395d02b (diff)
228 files changed, 2845 insertions, 2934 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 8591dcc0e37c..59d0e85c5a3a 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/bitshuffle/Manifest b/dev-libs/bitshuffle/Manifest
new file mode 100644
index 000000000000..1226ae59e242
--- /dev/null
+++ b/dev-libs/bitshuffle/Manifest
@@ -0,0 +1,4 @@
+AUX bitshuffle-0.3.5-Makefile 1770 BLAKE2B 38debe6516431e20f133b95873ce94f5df9dfe9424fa501d8bf9e20c864957e8c1c3b69bfffe1587c9ec1a58beb4408bfe568e3b055ece87954084cdde753a73 SHA512 1eba096b1cffe0fee28236df877636421066e00d44b021e1f9d42e8a1012f314f2fd4dbcc4e4339bc669242e8c5ed661d36619c1cc2bbd6344d60abd98cbe693
+DIST bitshuffle-0.3.5.tar.gz 112312 BLAKE2B e9e70608217743a93d2bf5319af0f48feff391bb2893b161a1a4c391ab630c90fc59483041d7594eb8366a9469feb309f3b8054c8ecc630d070a9170735f61f5 SHA512 4ae371ab2e1adedb5c3a2c047e0583d320c87f0687d9dc1c921ed9e38d8b90a447fb305f399cd591adf48a473471fd5827f4da2777dd7f0fb6d5fd145fdeb36f
+EBUILD bitshuffle-0.3.5.ebuild 733 BLAKE2B bb241995cfbbe34a2e4ea9369816a114c88a7b1309bb42801591881adf6cb5b45b94bd78039ed25743cfbf84fa97a4c6b27b52ec83b00e654071170d6308e0ee SHA512 1407482cd625127a8cde3621e199559e3810bc395d7c3560a95f3d589b61a3a9c154f80412c0dcae0cc73bd327446b4d0fb7390914d343042634a7e91370a5a5
+MISC metadata.xml 323 BLAKE2B 395bf88139bea1ee92d2142ff9644b73d9f188c33377e2998a8899dbaf13eee43272ca9e06ad4ae7814c4e31db47255725f99a9a08231d4a6d3e93cd408030a2 SHA512 1e6d7f797d98eb00d3887e204e5be66af1cadd51051c5fe34ed32bf890b487f77874ff6484fad03fe5f72ee718f16e44218b65bd7eb84121605aaa73fe222d00
diff --git a/dev-libs/bitshuffle/bitshuffle-0.3.5.ebuild b/dev-libs/bitshuffle/bitshuffle-0.3.5.ebuild
new file mode 100644
index 000000000000..3a4dd5a7574d
--- /dev/null
+++ b/dev-libs/bitshuffle/bitshuffle-0.3.5.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Bitshuffle C library"
+HOMEPAGE="https://github.com/kiyo-masui/bitshuffle"
+SRC_URI="https://github.com/kiyo-masui/bitshuffle/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND="
+	app-arch/lz4
+"
+
+src_prepare() {
+	cp "${FILESDIR}/${P}-Makefile" "Makefile" || die "Failed to copy Makefile"
+	default
+}
+
+src_configure() {
+	tc-export CC
+	export PACKAGE_VERSION="${PV}"
+}
+
+src_install() {
+	local prefix="${EPREFIX}/usr"
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${prefix}" \
+		LIBDIR="${prefix}/$(get_libdir)" \
+		install
+}
diff --git a/dev-libs/bitshuffle/files/bitshuffle-0.3.5-Makefile b/dev-libs/bitshuffle/files/bitshuffle-0.3.5-Makefile
new file mode 100644
index 000000000000..f38d0cc5f149
--- /dev/null
+++ b/dev-libs/bitshuffle/files/bitshuffle-0.3.5-Makefile
@@ -0,0 +1,50 @@
+# Gentoo custom Makefile for Bitshuffle C library
+# Adapted from GNU Guix:
+# https://git.savannah.gnu.org/cgit/guix.git/tree/gnu/packages/python-compression.scm?h=v1.3.0#n346
+# Distributed under the terms of the GNU General Public License v3
+
+# To avoid bundled dependency, the copy of lz4 included
+# in Bitshuffle's source tree is not used
+
+PACKAGE_VERSION ?= 0.3.5
+
+# Upstream has never specified an soname, so we need to conduct downstream
+# soname versioning.  The format of soname is "lib${PN}.so.$(ver_cut 1)".
+# No incompatible ABI changes have been observed yet since version 0.2.4,
+# but just in case the upstream recklessly handles ABI compatibility,
+# please try to test ABI compatibility when updating to a new release,
+# using tools like 'abidiff' in dev-util/libabigail or alike.
+SONAME_VERSION := $(shell echo $(PACKAGE_VERSION) | cut -d. -f1)
+SONAME_BASE = libbitshuffle.so
+SONAME := $(SONAME_BASE).$(SONAME_VERSION)
+SOFILE := $(SONAME_BASE).$(PACKAGE_VERSION)
+
+CFLAGS := -O3 -ffast-math -std=c99 -fPIC $(CFLAGS)
+
+OBJS = \
+	src/bitshuffle.o \
+	src/bitshuffle_core.o \
+	src/iochain.o
+
+$(SOFILE): $(OBJS)
+	$(CC) $(CFLAGS) -o $@ -shared $(LDFLAGS) -Wl,-soname,$(SONAME) $^
+
+%.o: %.c
+	$(CC) $(CFLAGS) -Isrc -c $< -o $@
+
+INSTALL = install
+LN_S = ln -s
+
+PREFIX = /usr/local
+LIBDIR = $(PREFIX)/lib
+INCLUDEDIR = $(PREFIX)/include
+
+install: $(SOFILE)
+	$(INSTALL) -dm755 $(DESTDIR)$(LIBDIR)
+	$(INSTALL) -dm755 $(DESTDIR)$(INCLUDEDIR)
+	$(INSTALL) -m755 $(SOFILE) $(DESTDIR)$(LIBDIR)
+	$(INSTALL) -m644 src/bitshuffle.h $(DESTDIR)$(INCLUDEDIR)
+	$(INSTALL) -m644 src/bitshuffle_core.h $(DESTDIR)$(INCLUDEDIR)
+	$(INSTALL) -m644 src/iochain.h $(DESTDIR)$(INCLUDEDIR)
+	$(LN_S) $(SOFILE) $(DESTDIR)$(LIBDIR)/$(SONAME_BASE)
+	$(LN_S) $(SOFILE) $(DESTDIR)$(LIBDIR)/$(SONAME)
diff --git a/dev-libs/bitshuffle/metadata.xml b/dev-libs/bitshuffle/metadata.xml
new file mode 100644
index 000000000000..2884af49b9f0
--- /dev/null
+++ b/dev-libs/bitshuffle/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">kiyo-masui/bitshuffle</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 28757dd32130..de4c048c9006 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -1,4 +1,7 @@
 DIST Botan-2.18.2.tar.xz 5996928 BLAKE2B 5c5ac1e8e2de16a012aa5716138f4c2d2b8178f0a811993e5e297aa5ae9e7f6d5a4f182d50566f5848a4f93a88bcec622291a15370c4c017361ca65d3bb189bf SHA512 ccf9286ee891fb201065a0a6a991ce78ef7f5dd0caf04010527cd524b824ea470e5ce302853c1839e999a1b3dafb2e82eb298036a37d11f0cf3df5fa09529d9c
 DIST Botan-2.18.2.tar.xz.asc 488 BLAKE2B 03744e95f52031295162b63dc34d7e0fd9a6b01ae751a809eed5f24c46017fca253c8d42c88b568566f393f0e6dd55d488ef56223d164941386690e2accdf296 SHA512 6764bcdb52a3a28672bcf22f8c364c926511a7b7c9bc227ba15f1e4b2feb9b371a9a4bd9bb1ee43e85faacbef4df5ce39a158357b4ce3706a00f4220bea8d926
+DIST Botan-2.19.1.tar.xz 6088380 BLAKE2B 7a2d50bb66ea4a1875857bea769bcc30f397170a10a70377c3963d92e33321a079271c1e235a7892e33ec5b1bc19e4df8336b2586548ccd849f52ebfa47d9c8f SHA512 e604be0e7e82da89e3e1949d3035a87dc63314bd9854d5fe5129ccb3ed5bc78edb0406c7f8ad1a152b59a63b6d98ba207a0851a08428c3452cce794614b5eef5
+DIST Botan-2.19.1.tar.xz.asc 488 BLAKE2B 36f27e294fed60ea4d9ee9d919a58fc431a1bf9bdec8c12d30f2cba537a70b0e22f6a7c882cf7a80dc10aeee256f9f4a32129b55d2ab5df192d16759638feaa4 SHA512 2cd57bf97630d8f79cc0a87da79d3b338bd3b33b02ded16f6b60d5fd6cb3ea62105f577deb3b8d061f56a09ff902ff553ea3a0c603d5c3bd53a905024a2f457b
 EBUILD botan-2.18.2-r1.ebuild 4074 BLAKE2B ad2d28abbf64514ed31b13920fa302274b7e142e635f3ad4c5200695bc63f945908016c2f532fbfd008cd71f3824e0c40deed9f235fed9760733ccde90f2601f SHA512 c92b0f2f1f249174368918e6614dae17108be3a8da0dccacbe27bb2eaf45d097187e2afb1ed581f471c4dc7f19198fa27b3f41cb4ec6e7d6062b90840fa4216c
+EBUILD botan-2.19.1.ebuild 4149 BLAKE2B f5be0ee5ca561e8a496a5e1f6328eb06fa9f92b5bbce0067eec6e7a77f7696f652f3afd496bb680d4b06b9f05cad53e0d7ff88f8d4206e352507dd595761b20a SHA512 253ba93a34330775985d8e7199bb3ba88e1b8f95069ff50e52bb8689ff1aa27064d10acb80c2793a51d4c34efa72600961286369de703c7237be7d3a33438a79
 MISC metadata.xml 519 BLAKE2B 78e28054a5c35b101d1f1b20ce1095a8a4f0ee8cf312e8d4f3aa711310d34d48878040ffa2a5a7a6600b071cfb5898b69508796aacd3f1d7658c2f30cbda1200 SHA512 9b039acb51f28ad8f21ed310e34d0d36fa7c5dd763fe8661a7ae21dc8dcc08c55d1eb9f1d0e519773697fe18600ffb3424811244e6f7ae243f6e675988006142
diff --git a/dev-libs/botan/botan-2.19.1.ebuild b/dev-libs/botan/botan-2.19.1.ebuild
new file mode 100644
index 000000000000..6138e73f21d7
--- /dev/null
+++ b/dev-libs/botan/botan-2.19.1.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/botan.asc
+inherit python-r1 toolchain-funcs verify-sig
+
+MY_P="Botan-${PV}"
+DESCRIPTION="C++ crypto library"
+HOMEPAGE="https://botan.randombit.net/"
+SRC_URI="https://botan.randombit.net/releases/${MY_P}.tar.xz"
+SRC_URI+=" verify-sig? ( https://botan.randombit.net/releases/${MY_P}.tar.xz.asc )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD-2"
+SLOT="2/$(ver_cut 1-2)" # soname version
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~ppc-macos"
+IUSE="doc boost bzip2 lzma python ssl static-libs sqlite zlib"
+
+CPU_USE=(
+	cpu_flags_arm_{aes,neon}
+	cpu_flags_ppc_altivec
+	cpu_flags_x86_{aes,avx2,popcnt,rdrand,sse2,ssse3,sse4_1,sse4_2}
+)
+
+IUSE+=" ${CPU_USE[@]}"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# NOTE: Boost is needed at runtime too for the CLI tool.
+DEPEND="
+	boost? ( >=dev-libs/boost-1.48:= )
+	bzip2? ( >=app-arch/bzip2-1.0.5:= )
+	lzma? ( app-arch/xz-utils:= )
+	python? ( ${PYTHON_DEPS} )
+	ssl? ( dev-libs/openssl:= )
+	sqlite? ( dev-db/sqlite:3= )
+	zlib? ( >=sys-libs/zlib-1.2.3:= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	')
+	verify-sig? ( sec-keys/openpgp-keys-botan )
+"
+
+# NOTE: Considering patching Botan?
+# Please see upstream's guidance:
+# https://botan.randombit.net/handbook/packaging.html#minimize-distribution-patches
+
+python_check_deps() {
+	if use doc ; then
+		has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" || return 1
+	fi
+}
+
+src_configure() {
+	python_setup
+
+	local disable_modules=(
+		$(usev !boost 'boost')
+	)
+
+	if [[ -z "${DISABLE_MODULES}" ]] ; then
+		elog "Disabling module(s): ${disable_modules[@]}"
+	fi
+
+	local chostarch="${CHOST%%-*}"
+
+	# Arch specific wrangling
+	local myos=
+	case ${CHOST} in
+		*-darwin*)
+			myos=darwin
+		;;
+
+		*)
+			myos=linux
+
+			if [[ ${CHOST} == *hppa* ]] ; then
+				chostarch=parisc
+			elif [[ ${PROFILE_ARCH} == "sparc64" ]] ; then
+				chostarch="sparc32-v9"
+			fi
+		;;
+
+	esac
+
+	local pythonvers=()
+	if use python ; then
+		_append() {
+			pythonvers+=( ${EPYTHON/python/} )
+		}
+
+		python_foreach_impl _append
+	fi
+
+	local myargs=(
+		# Intrinsics
+		# TODO: x86 RDSEED (new CPU_FLAGS_X86?)
+		# TODO: POWER Crypto (new CPU_FLAGS_PPC?)
+		$(usev !cpu_flags_arm_aes '--disable-armv8crypto')
+		$(usev !cpu_flags_arm_neon '--disable-neon')
+		$(usev !cpu_flags_ppc_altivec '--disable-altivec')
+		$(usev !cpu_flags_x86_aes '--disable-aes-ni')
+		$(usev !cpu_flags_x86_avx2 '--disable-avx2')
+		$(usev !cpu_flags_x86_popcnt '--disable-bmi2')
+		$(usev !cpu_flags_x86_rdrand '--disable-rdrand')
+		$(usev !cpu_flags_x86_sse2 '--disable-sse2')
+		$(usev !cpu_flags_x86_ssse3 '--disable-ssse3')
+		$(usev !cpu_flags_x86_sse4_1 '--disable-sse4.1')
+		$(usev !cpu_flags_x86_sse4_2 '--disable-sse4.2')
+
+		# HPPA's GCC doesn't support SSP (presumably due to stack direction)
+		$(usev hppa '--without-stack-protector')
+
+		$(use_with boost)
+		$(use_with bzip2)
+		$(use_with doc documentation)
+		$(use_with doc sphinx)
+		$(use_with lzma)
+		$(use_enable static-libs static-library)
+		$(use_with ssl openssl)
+		$(use_with sqlite sqlite3)
+		$(use_with zlib)
+
+		--cpu=${chostarch}
+		--docdir=share/doc
+		--disable-modules=$( IFS=","; echo "${disable_modules[*]}" )
+		--distribution-info="Gentoo ${PVR}"
+		--libdir=$(get_libdir)
+
+		# Don't install Python bindings automatically
+		# (do it manually later in the right place)
+		# https://bugs.gentoo.org/723096
+		--no-install-python-module
+
+		--os=${myos}
+		--prefix="${EPREFIX}/usr"
+		--with-endian="$(tc-endian)"
+		--with-python-version=$( IFS=","; echo "${pythonvers[*]}" )
+		--without-doxygen
+	)
+
+	tc-export CC CXX AR
+
+	${EPYTHON} configure.py "${myargs[@]}" || die "configure.py failed with ${EPYTHON}"
+}
+
+src_test() {
+	LD_LIBRARY_PATH="${S}" ./botan-test || die "Validation tests failed"
+}
+
+src_install() {
+	default
+
+	# Manually install the Python bindings (bug #723096)
+	if use python ; then
+		python_foreach_impl python_domodule src/python/botan2.py
+	fi
+}
diff --git a/dev-libs/boxfort/Manifest b/dev-libs/boxfort/Manifest
index a9befcc39fb1..beabb22b0c56 100644
--- a/dev-libs/boxfort/Manifest
+++ b/dev-libs/boxfort/Manifest
@@ -1,5 +1,5 @@
 DIST boxfort-0.0.1_pre20200902.tar.gz 41643 BLAKE2B 6ac53b632f604ffd6b790a026703a2d64da65fc03cc71ebc3e4da3463e7c5a44ec99e85e3cdac8e5756afaf7d98785955815e194929bbc8dd6b6fd90bfb3fd52 SHA512 96090372f3e546f53f82c515c3f9e557fdd67eb7bc735683b30d8a66c2536cf21261b0467e449ccbd13e914b7cf4ea3da1a37c4108b215d6d0d08cdb68944b1e
 DIST boxfort-0.1.1.tar.gz 41993 BLAKE2B b9153a6330cecb781e2b5cd20554df3d0aad277dfc01174fd5d375211896b2912f26a76b0ba6ef7143c7101d844072e1a857caf5a8191893f22c0528c0a203d4 SHA512 48f7a0a52d03f36307271c8f387613dd53aebb19d0379e1758d557b043854c89068776ca4c22e64eb518429dd629c9a082476ecd2a548ac95e6aebef512a50ca
 EBUILD boxfort-0.0.1_pre20200902-r1.ebuild 963 BLAKE2B f79546fe561570a0da7cba09c72d5e0e7b3f23c020c30f2d7a602bed60df267e96564cdf1044c56a317d14f0134f458523694e835635c7b6eca2174a27f75f37 SHA512 b5dd8932584ce89160de6884640e8a828819c28f90d9375bce754f7c802271d4d1075e6e8796f3d4628cf9243b63252b1e865862b8620d65e8a80deae84696ee
-EBUILD boxfort-0.1.1.ebuild 882 BLAKE2B b9776e45a8cff6d5fd3764aab576429a157bc877ee86ebbec21ff97267d1ac7562672e5d6d9bc9bdd224f2ecf7ba45c3d465759effcf2144b8033973c5fe1adb SHA512 d8741fa3896c594040d7cbbd5efd5716fe97b26c47917fdaae5f274619540dd04c7f10568561ea74d59aead04bf159ce98351ea5195d4f9b577433796ffdded5
+EBUILD boxfort-0.1.1.ebuild 881 BLAKE2B 727b0079823942d325e43e2aac20b1fe30be87c68117a09dbfb0b9591c0ab091d0495e072d7d35cdfddb590fcf14becae9074d6e9901a6319d3f115931647927 SHA512 a3a92f817262f2800b7a2d1fcdfa7fd2a778bb5d1295dc907442c564071f8e6920796fcc80fe9e0bd492f8d93c4bb55c4e844c7c723f0bb59ef38233b873be72
 MISC metadata.xml 493 BLAKE2B 26ae62742b6461f52ff68fa741cbef36de3e27d9580fae5265d02e089b1403d1cccad76b09d53b707454a9bbdaf60bace25fb1f0c115ee42d17362d6fe6543db SHA512 5f89cc0f108d3971d7b1cac8c9dadc0d16df0b6b643f484fcb214c04f772a5e071ef34699c6b0ba31c2783a3cae9e2cf166799224c3ed70cc2b7cedcf43d49c3
diff --git a/dev-libs/boxfort/boxfort-0.1.1.ebuild b/dev-libs/boxfort/boxfort-0.1.1.ebuild
index 45a22331a50f..bdd68e91ca92 100644
--- a/dev-libs/boxfort/boxfort-0.1.1.ebuild
+++ b/dev-libs/boxfort/boxfort-0.1.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
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Snaipe/BoxFort/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 -riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 -riscv ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/cJSON/Manifest b/dev-libs/cJSON/Manifest
index 2d9d0b80007e..f2497aa1c72f 100644
--- a/dev-libs/cJSON/Manifest
+++ b/dev-libs/cJSON/Manifest
@@ -1,5 +1,3 @@
-DIST cJSON-1.7.14.tar.gz 352028 BLAKE2B 203795f004496793fb04577df1e4a917df2424bf7866e32459584d3dc776ee13263c5e62ded01e3776973d2210e642d1066d3126e2c737bd0fa048464f3aed84 SHA512 8de1dedc123ed025a9cbe6764e5963eb0550f726d06a8f6bedfe05b84e852cd9c1587cd381669663073967f42be894a535ba239013f304ce544c3b15a6477c01
 DIST cJSON-1.7.15.tar.gz 352278 BLAKE2B e0de3b8d56020853d56f5512e6e7216adafd238b6f69bbf6965b153bfe8ebfc23593dfa7cfb8543d8730d90820153d263c8af276c8e9588ba8a5ad76a50f8b72 SHA512 0b32a758c597fcc90c8ed0af493c9bccd611b9d4f9a03e87de3f7337bb9a28990b810befd44bc321a0cb42cbcd0b026d45761f9bab7bd798f920b7b6975fb124
-EBUILD cJSON-1.7.14.ebuild 589 BLAKE2B a08975e4959f167a9739b7b3a5f269ffc98e517af3f13cd21ee4527e85ae9cbf3262be0a8473428134c549fe3f6cfb581d8758898452de0091302932918bbefc SHA512 09eefdac63278701a652aabe6bfb5d8e08fcf8c4738ebc0dc65668e4835d5f268d786b58840b1a231028bae0f105bc49b0783da43acea396229f4783ea78af9f
 EBUILD cJSON-1.7.15.ebuild 589 BLAKE2B a08975e4959f167a9739b7b3a5f269ffc98e517af3f13cd21ee4527e85ae9cbf3262be0a8473428134c549fe3f6cfb581d8758898452de0091302932918bbefc SHA512 09eefdac63278701a652aabe6bfb5d8e08fcf8c4738ebc0dc65668e4835d5f268d786b58840b1a231028bae0f105bc49b0783da43acea396229f4783ea78af9f
 MISC metadata.xml 338 BLAKE2B b738aeafd4cdea33ca773f44c7c5d6e8f9734fdead87884b92f9fc25235b553294453d514751a624210495eab0d472430cca625603cbdbb92bacc39da5579a3d SHA512 61ec24b8fb154b574b2619ac2fc8235c1d783653d6c0880982ac98271d6594a16dce3d1c8fd72c8f37d3a8f6dded21e8ae47c9556a9f1bcece54c58741961ebc
diff --git a/dev-libs/cJSON/cJSON-1.7.14.ebuild b/dev-libs/cJSON/cJSON-1.7.14.ebuild
deleted file mode 100644
index c9555ca553bf..000000000000
--- a/dev-libs/cJSON/cJSON-1.7.14.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION=" Ultralightweight JSON parser in ANSI C"
-HOMEPAGE="https://github.com/DaveGamble/cJSON"
-SRC_URI="https://github.com/DaveGamble/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -i -e '/-Werror/d' CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_CJSON_TEST=$(usex test)
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/capnproto/Manifest b/dev-libs/capnproto/Manifest
index 108412342c72..cc721d23a576 100644
--- a/dev-libs/capnproto/Manifest
+++ b/dev-libs/capnproto/Manifest
@@ -1,5 +1,7 @@
 DIST capnproto-0.7.0.tar.gz 1983172 BLAKE2B d88b5f8e3278f8e3aceccdc459001b99328b0440812352dcb6b54bd11e18aa7fee6d337252841c86e9c3eb1afcdbd99884c965156d6cec37e3c0996c9ec1241f SHA512 a3ea278ded6a866759c0517d16b99bd38ffea1c163ce63a3604b752d8bdaafbc38a600de94afe12db35e7f7f06e29cc94c911dc2e0ecec6fe1185452df2a2bd3
 DIST capnproto-0.8.0.tar.gz 2121249 BLAKE2B 6d4ef9adb026a8ea8bc558bed1f8ce910e9c3b050ad0ac7ebd4be323cc1709a6b08956d4d2f39daee5c6485438f64695a028ea198aaae8a6c366316f10b1a64f SHA512 a3b87d47f4c160c3c72304539c3d2a6836488a50d1014c9f0eb95c112dc1e0f85b3158d26c248eff464205388ea61733c45ba10dc5441e5dd04064ba2c7970e6
+DIST capnproto-0.9.1.tar.gz 2238849 BLAKE2B f8de56c7f79b0ddad35f3e8fec7740510ca2328e4ddc633a71420901d3fc44df44d807c3965213dfc2535bbe03832c5164242d33cd0bff901d6f288fb62bab21 SHA512 bdc5960f26214139744d768ca4558b085e2d359c375a8849ca532a4c458a2daf0ee1a1f4d00745de5abf353aa1e4084a2d85e5523006f23f591f21fac2d847fd
 EBUILD capnproto-0.7.0.ebuild 893 BLAKE2B a4abba275bb800fe7ac662d9a815522f166e304c55eb2f5c55e49931820238330da71f2c7ec4f7f6b9819d4f71612888db8bb1f97de67672ce704d87ec42868e SHA512 62be82cde8adcfb628f2269419c3ee1a35756bc99d4539db198a61211b6cd521b7669b450afa2e771fc9db913c7155360181636d1441353483dd20a428bc79c2
 EBUILD capnproto-0.8.0.ebuild 968 BLAKE2B 46e5939815b8fcfc67e5774fde831a520a5220226fea6a48766610e1d2ed90beb3ee7ff4a908b700442e3537e1cb43cca29d307ee3b0bbcb649bc80cb8e6aab4 SHA512 9a8b4d3b06ecec8e804ef753a1d498d95d1e8133420972adc4aefd3d89e22cb301c91399ae0b9830ba8b65b89840a19e823730aa80184edd20d021938abb8b64
+EBUILD capnproto-0.9.1.ebuild 776 BLAKE2B a5b51f1ebb7a10ebdee61ab5920effa7b43dc0d54377f6e64bc08696e21ded31198f64b737e0253e8364a4c21c2163b9cd712c755a0b1ff142fd07f356fcec42 SHA512 437fc03b44afb49d1b141c9b80c0eb2d0711757105f88b20b24edc4f8cdb003f2f2ab9f770eb3b86886e2110554031ad97e0b0f8902d19c6291a89c32af544eb
 MISC metadata.xml 347 BLAKE2B 36c92aa137b803a5b0804f7684ecd55e13733f506000bed2fa306267b87922255486124dffe336822554c8644e2b2b34cfa13a5456a0f69f0e5b0e4136a1ce95 SHA512 af4c39c709263a8d5a3849a057475cebd9c7bac0228d599c28d0d9298c1c0d06a744f5999198217ee9248ed0318f95d376fb1802afe766082d18606f4776be57
diff --git a/dev-libs/capnproto/capnproto-0.9.1.ebuild b/dev-libs/capnproto/capnproto-0.9.1.ebuild
new file mode 100644
index 000000000000..ecd0a5027d58
--- /dev/null
+++ b/dev-libs/capnproto/capnproto-0.9.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="RPC/Serialization system with capabilities support"
+HOMEPAGE="https://capnproto.org"
+SRC_URI="https://github.com/sandstorm-io/capnproto/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${P}/c++
+
+LICENSE="MIT"
+SLOT="0/091"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
+IUSE="+ssl test zlib"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	ssl? ( dev-libs/openssl:0= )
+	zlib? ( sys-libs/zlib:0= )
+"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_OPENSSL=$(usex ssl)
+		-DBUILD_TESTING=$(usex test)
+		$(cmake_use_find_package zlib ZLIB)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_build check
+}
diff --git a/dev-libs/capstone/Manifest b/dev-libs/capstone/Manifest
index 3f0136ef7181..20b20675f7c6 100644
--- a/dev-libs/capstone/Manifest
+++ b/dev-libs/capstone/Manifest
@@ -1,4 +1,4 @@
 AUX capstone-4.0.2-libsuffix.patch 347 BLAKE2B 5478a08d072cff0873c3410ce99dcf20c7aa12594148102498c7d0ed3216af95712f0daef5e9484d1faf368b93b2b014832ead5466d60d139e9ed7bb2bd1ed02 SHA512 81ffee2dc4a406e980025402dc3f8bee886cba9f305312e03c735d4b47e69887e90240274ae1949ff9900ba2a66413d33e7ef7a9ebb83a3dc9d2769f3d008395
 DIST capstone-4.0.2.tar.gz 3439542 BLAKE2B 435729a8fef2dce6495635352101b3befe563c8404efdbb0dccabecbe2bded332221665bacdbcd9043dda72b652b6f29c0e1a548cefb8c64d5b6b9dc174ed3d9 SHA512 7f93534517307b737422a8825b66b2a1f3e1cca2049465d60ab12595940154aaf843ba40ed348fce58de58b990c19a0caef289060eb72898cb008a88c470970e
-EBUILD capstone-4.0.2-r2.ebuild 1525 BLAKE2B 16c321f533f509a6076d2a93b00f93120699e1d87fb9d4af9fd5b21232b21fa02b5f26015fcbd27aaf173f4dd71d851054b5c7284367660cf84bfa73bdd5a37f SHA512 d4e2e6a7d9b474671e8967924b035b36f65837e07f07fc26dc2e5229a112b66f8a6b1e50807c04f03e431defd895289d67fe33fc190434bc9de8e76ec9a6e0e4
+EBUILD capstone-4.0.2-r2.ebuild 1532 BLAKE2B 5a06905077ef4a45d3a9a92cb5e6d99eb24f85505f5b66b8c118b312cce25d8f763d8dc7706d8aa3059683f58bc3e0e4726ce7a390094ce88a0ef271d24cb16a SHA512 c0e10d2e4f3b6e87f42d6cb938e6d0c004879276844e7be3856d5688221d0602f7514f2496997a8799c05200599c3e276d8dbecc9d6aeb3b31d69cd411ab89e2
 MISC metadata.xml 248 BLAKE2B 2c6af7e659f89e2bd3a5135307aeabf50cbb2e42b12249cbc44830e24a5a68a0c76a5cdcff8dd3f29f444b1bb7ad974ed43b56a3dbfc1b5b664782ac124b46bd SHA512 b136db16e3c8059d1872514738d599dee1a8db086a40061b77058fd6959b2fa603c0c3ac3566ffbb5304cbd8a705ac2fc5ba642f5452c61d5a16fec88fb90ee5
diff --git a/dev-libs/capstone/capstone-4.0.2-r2.ebuild b/dev-libs/capstone/capstone-4.0.2-r2.ebuild
index c6854f19510c..9ce37b266b5f 100644
--- a/dev-libs/capstone/capstone-4.0.2-r2.ebuild
+++ b/dev-libs/capstone/capstone-4.0.2-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
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/aquynh/${PN}/archive/${PV/_rc/-rc}.tar.gz -> ${P}.ta
 
 LICENSE="BSD"
 SLOT="0/4" # libcapstone.so.4
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 # A few disassembly outputs need an update
 RESTRICT="test"
diff --git a/dev-libs/cdk/Manifest b/dev-libs/cdk/Manifest
index 39b6be2a91ba..98ec450bdf8d 100644
--- a/dev-libs/cdk/Manifest
+++ b/dev-libs/cdk/Manifest
@@ -2,7 +2,7 @@ AUX cdk-5.0.20120323-parallel-make.patch 181 BLAKE2B 2e69c15f66e63837dd430d0d22f
 DIST cdk-5.0-20160131.tgz 516298 BLAKE2B 5e899afea1f034a48e46fef073303d0069e14310194342094392da517fa47793a1ac3ac33774369842daa1966dc9a4ad7404046874bc9cae24ceaa98a3dd7c47 SHA512 f8f7fc5fec3c040cdbfc2a0d886e9d9d9d231e56ed69adae0b91e03243b5edd550c5435f973a93d4cf7ab723bd27b55712af75162c4bfd3ae28b3c16cd68f755
 DIST cdk-5.0-20210324.tgz 548203 BLAKE2B 7a944f347bf30a6bf602b9ac61fa547c7b4aef073db54272e4a8d2bd7d83093888f2ca9e5ee9c2d067777472d2abb87cca42b2912b0491b81472cfce086640b8 SHA512 72d62307824708858ca4fb3865d332cc81e987d7ef685011cf127c8f77cee3e19fe9dd6a35009d4416769cb00f04e937ebaec686c61ca0ba58655f522a175a59
 DIST cdk-5.0-20211216.tgz 552041 BLAKE2B ce82ac22d4ec2ed37079d3de52a4f93a4206e5228aa952a3e45294d260c1ffef7c363b2c290060cc909bb8ab4ae88cbedecf498db7bd0f13e2d2822d87d7e4fa SHA512 622e99681af8468aaf8638833d0821c743667fb9b41716fe16acb8e78e8a3d5ba4eb7aced0bc213697e120dcb6e96067d6b75d53531555c3e6d90e4961cb99aa
-EBUILD cdk-5.0.20160131-r1.ebuild 1184 BLAKE2B e291fd42419df39f3dedf3482235634d0841d0fcea6188c2f248bb6ed346482c2c47b6e2e2995cc66d2705811bfd805a82accaadcbde06c190f51e302c03ede7 SHA512 5ff631f36aa0a2c53d189556236e084b8b76fc8d7ab423d8874319f511b4fe05a96b41f4840824764979fcc33bf798f71f18b9fdb4715604a40d8be1f044fc69
-EBUILD cdk-5.0.20210324-r2.ebuild 1362 BLAKE2B 0ff00368623c8c023b8469a3dc0f85198da31d3c2bd15144350e46839310cbc9119cd5ee4afd8ea2d54e77586759727a3b4846ff36601cb5c53ad52c04647db5 SHA512 c034330fca16516d8834e6f53b7c615f77084c8c6abd64ded902f8f44cc21de5c9dc1c5b8f59847bd4fbee0fe74a1023186ca6b9454dd1eafee8844d5c2fe80c
-EBUILD cdk-5.0.20211216.ebuild 1301 BLAKE2B 0873a884b56c4ccc60bdece33094b4edead705453e8f9ae81d573224b58a2a3bb7fee2f87bac6dd4f3d6ea9851e4e0b8db72888d043ae9e8e7fb5423fe01d4e9 SHA512 9bf9bf2cac64a0c35ad934a238e17486a3dafdff7e0ea3f4f0403f720fef740bfbdd3f9054164edeccbe79666961e10e206277005792274eb82c8168a2891494
+EBUILD cdk-5.0.20160131-r1.ebuild 1230 BLAKE2B 8f14679e2f478a363403bad00654c90eded0b5e261cc197631c130ea6f5eae4615aa75047f5a2094d3f9d066ba92a44e70581d81df2c48f6666a27b4c76e0782 SHA512 eb90e12b0939242057e6a5cb3074132609414d9157e462fd93134225b7b902a1395eb7519a6cbd9f6d244ba9575cabc33ac83cb3837c4a74f95e644f984d5285
+EBUILD cdk-5.0.20210324-r2.ebuild 1408 BLAKE2B 289be6470d1a76b8360d1ee588719ef4ec1b638cca4a3e92ba5e1a29374fe4e02fc7b2735d8c4c4099bd374374ebba1ac9f7b43e2bf27395f5ad6bd56ad30f35 SHA512 9a7f5264715654d6e6f66ca083aa8369c7d627c8b08e4a6715fcbd05da76b31e60acbbf2ae61e53afe67aa75d3e29c2e4b48c894950f70ae4ca4f03d618a5e68
+EBUILD cdk-5.0.20211216.ebuild 1347 BLAKE2B bfdf2d3c54dfc3a09934f4f7abbe23d4a82e618f3827f7b89cfe57a1698b2b3ac94fdf06621e283f81462a710b8a728c470c97cde4b1df6ed7af24a72af96386 SHA512 f420682c4eef06435d5fa4dacc49de28c036072befa586a754e806b3e1cd268155a2a0531d4a5424958a12285ca79e66d1efac251c00a3ba7f00012d0a79c4a2
 MISC metadata.xml 258 BLAKE2B 9eea1c1dbc095bcf42ec12aecd34edb7eb5555036e5c4df6f2a99bd4b347b01d29a836383ea1c84766da09449f1f3b5d384ae88d1eca3a5b4bdebb443714ebf5 SHA512 5c828c062e4484fde8de46a476e9a3cc653b8c2863a1fc12a696d72ae81f50e2327e7ec4533085f6bae68c3f85fa6bbe0935a7f286d25363b8f60a99f7804dd0
diff --git a/dev-libs/cdk/cdk-5.0.20160131-r1.ebuild b/dev-libs/cdk/cdk-5.0.20160131-r1.ebuild
index 7f12ab36a255..637f6dcf8846 100644
--- a/dev-libs/cdk/cdk-5.0.20160131-r1.ebuild
+++ b/dev-libs/cdk/cdk-5.0.20160131-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit versionator
 
 MY_P="${PN}-$(replace_version_separator 2 -)"
 DESCRIPTION="A library of curses widgets"
-HOMEPAGE="https://dickey.his.com/cdk/cdk.html"
+HOMEPAGE="https://dickey.his.com/cdk/cdk.html https://github.com/ThomasDickey/cdk-snapshots"
 SRC_URI="ftp://ftp.invisible-island.net/cdk/${MY_P}.tgz"
 
 LICENSE="BSD"
diff --git a/dev-libs/cdk/cdk-5.0.20210324-r2.ebuild b/dev-libs/cdk/cdk-5.0.20210324-r2.ebuild
index e5d57b931979..716d6a145960 100644
--- a/dev-libs/cdk/cdk-5.0.20210324-r2.ebuild
+++ b/dev-libs/cdk/cdk-5.0.20210324-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
@@ -6,7 +6,7 @@ EAPI=7
 MY_P="${PN}-$(ver_rs 2 -)"
 
 DESCRIPTION="A library of curses widgets"
-HOMEPAGE="https://dickey.his.com/cdk/cdk.html"
+HOMEPAGE="https://dickey.his.com/cdk/cdk.html https://github.com/ThomasDickey/cdk-snapshots"
 SRC_URI="ftp://ftp.invisible-island.net/cdk/${MY_P}.tgz"
 S="${WORKDIR}"/${MY_P}
 
diff --git a/dev-libs/cdk/cdk-5.0.20211216.ebuild b/dev-libs/cdk/cdk-5.0.20211216.ebuild
index 26411f13a51a..238113a9aaba 100644
--- a/dev-libs/cdk/cdk-5.0.20211216.ebuild
+++ b/dev-libs/cdk/cdk-5.0.20211216.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
@@ -6,7 +6,7 @@ EAPI=7
 MY_P="${PN}-$(ver_rs 2 -)"
 
 DESCRIPTION="A library of curses widgets"
-HOMEPAGE="https://dickey.his.com/cdk/cdk.html"
+HOMEPAGE="https://dickey.his.com/cdk/cdk.html https://github.com/ThomasDickey/cdk-snapshots"
 SRC_URI="ftp://ftp.invisible-island.net/cdk/${MY_P}.tgz"
 S="${WORKDIR}"/${MY_P}
 
diff --git a/dev-libs/cereal/Manifest b/dev-libs/cereal/Manifest
index b3ca2cb069e0..f5bd82596c2f 100644
--- a/dev-libs/cereal/Manifest
+++ b/dev-libs/cereal/Manifest
@@ -1,5 +1,5 @@
 DIST cereal-1.3.0-fix-doctest.patch 148684 BLAKE2B 6ab6263db5b787b3ae41b9c177df19554f17837d5bb496de887f1d2d2df28c280e038fe64f0986ce3a32cedb709249a9986f6869b6e21b7c3a4b27058739496f SHA512 6389bead42f2f8008e6296f3d5ff5fc7a94920972c774003080fd3ae24ea0fd8fa1c4ab940ab800ab6b3249db003e452fd98a9ed77e5ffbdb301311fc2972a6f
 DIST cereal-1.3.0.tar.gz 374585 BLAKE2B 67bcdf8715585d8913c6ae4ff1a20d77df0eb95816b37a77620a3f08000b6e911afbd295236a6cd0394d3242ae0a3b2619f6e168503724517c9c66bc20f1d07c SHA512 2bb640a222d4efe7c624c6ec3e755fecae00ef59e91c4db462e233546c5afe73c065ba1d16d9600f7cd3cc185593109148008b0b2b870208e2f1d6984fd40c72
 EBUILD cereal-1.3.0-r1.ebuild 815 BLAKE2B 8ca410517b7d8f92e4d0fc8c534fbc1bf6d20790c3842b1323d11df7afa657c3c89e891efd51bf20a2af3b7278fc97493285f87490e9b8598e745cee4e351d77 SHA512 e44bb348fbded83fe7a5277570a0bc4ccc7558d11fdca65df216140fb51b548e0a814e77dfecd8b5e00dcb1df237bc06449d2b08059207fcecad5efebfd6ff04
-EBUILD cereal-1.3.0-r2.ebuild 1001 BLAKE2B 849295f524d5e285b4f6fa6e5331203106a0f5f65d7b8dc8ec905c07355a2854fd0200939fc241c526957268cd0914c83651c5c58f125c6b8730779b666bf06c SHA512 1306d222db5e7e44eee8cc4f25dd3f2939e74787da0a266b0bdcafa3341326907b6250099987b44287192583207d8be21081106068e48701540cf914b04247b3
+EBUILD cereal-1.3.0-r2.ebuild 1008 BLAKE2B 3e757e93f3c3ba8fb2836948909e7481dcc57ec5d90e88d221828a10f8b7b1120348dc62a7464c08210345c4f2d4422ff5c89219d37b6c1185d7bbdc562e69f1 SHA512 0659138d942509a716eab408f64511ae28805529ae43fdde6e452fccf3ed3d5648a4f42a6c2b395fb7e14700f3b69b0ff52dd3b04095ae19d98c227db1b1a83a
 MISC metadata.xml 395 BLAKE2B 6a5de4941e400c48ca8148af6748f2054614eb28337e6f8ea6f282c4fa961c8f60a57fe2e98f87cefd32cd72de32c4cbe2d13f8f7bfc91d6ba1cbdc42adcf200 SHA512 344f769d49106b234ccaa39934eb2531f2161a018c302efd27bad57f072e7ee41501f8b3c189694a9059a6ef24053ea80219307a910f64838e9c0ff51588c850
diff --git a/dev-libs/cereal/cereal-1.3.0-r2.ebuild b/dev-libs/cereal/cereal-1.3.0-r2.ebuild
index 13631891d50a..ce67e5fd8916 100644
--- a/dev-libs/cereal/cereal-1.3.0-r2.ebuild
+++ b/dev-libs/cereal/cereal-1.3.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
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+doc test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/crc32c/Manifest b/dev-libs/crc32c/Manifest
index 7e21245f7830..659373891285 100644
--- a/dev-libs/crc32c/Manifest
+++ b/dev-libs/crc32c/Manifest
@@ -5,5 +5,5 @@ DIST crc32c-1.1.1.tar.gz 29829 BLAKE2B 5ffb0809e80d1fad81a77d96683d44142a7d84fc1
 DIST crc32c-1.1.2.tar.gz 29819 BLAKE2B f48720e632b6a4aaab9591651ed92b268bc8fc5faacb01888094af86ecc9dec901be6edc419c534aebf94ade5a2ce2347c0ff2962ba57c62627d6d7c420fc23b SHA512 6325c52b5a6850b9f90086e0c0c86798c008af36e7cfd3a0216184a2d37b3bf7323481ddc6bfe4cbd5b31288b3ee6c69772d03085a13094cf95d00a9756a7196
 EBUILD crc32c-1.0.6-r1.ebuild 703 BLAKE2B 3443d226948d7357e5db97f791a96abf123a4e99573dfed1d3d15a3ed4547f43d8f9e2ed6aa72edbd373770c822582123ac162a197d70016365d489f0b6e5781 SHA512 87923213b411d5ca4c92cadd3d18aa61965e1d50f18c84d9ffbd7a2f789d9353629b768824debd9a1cbb1fb5aedf90e0e216482e907bac63ff684e7a4f61f9a3
 EBUILD crc32c-1.1.1.ebuild 866 BLAKE2B b72361efd51aea538bc2e82fa4d23a10eb954a261334989937a9f3635ce46abb797c1f19a3f4c783b10a2c8ed67040dfb199d7c25dd26b98bf6b84c9bee1d737 SHA512 bb2ad906d9124847f5df27d6980cb59b720b5f7e27dde5933f09b802883d01f3f3a999b968637e147a1075579cb895e5080f6e5e0c7be2dfb6053d92d5cf4817
-EBUILD crc32c-1.1.2-r1.ebuild 856 BLAKE2B 6fea7fb8a7ff3f6bfb9f4304baa3fe38da4ad8fafcafb7fb5b4a82fa47060076b94a7055e7372017f6e8b3ad765fc48322ac47f4edc90ff5d3359fe339ff4a85 SHA512 3e8885660efc2036d54e327727d901ef391d297282e009f1f04130b7595bf67dc3ab8b2c903ce93bbe2c190dd7d504f2ee5582b4ea31b02c03b95e36878fb1e0
+EBUILD crc32c-1.1.2-r1.ebuild 857 BLAKE2B 5a235e32ac2650d82811d8d9eee2f9e1e03295a8abc8a4cea3746ddd45f4125489dfa656cafa6443acc4dc187e2a09593ea4cee8e173724eddec09e8caddf873 SHA512 985fdfc66ab9caee0154dddc8f98f08a85ec7c1df812ca8dd6e31e65967bdf7e3d5b70477571caaa3ff146cc59107b0f269477655cf335ce25b07cecd987b466
 MISC metadata.xml 251 BLAKE2B b1949292bb332d69832bf47a05a2f53519bb6c233a09b8e595dac3ca8aff30e213aeefef78bbd8b0b52124b43669042e0d63c476b5dcacb309468bd4f233da83 SHA512 97acf3ebe0b0e94afecdbd634bb9800f9930660cb8f6be45fc54a6e24534a64399549ce1dc0862ab7d9bb3034bccdc6c96931046769846f847b769c9899f6037
diff --git a/dev-libs/crc32c/crc32c-1.1.2-r1.ebuild b/dev-libs/crc32c/crc32c-1.1.2-r1.ebuild
index dab4910a5542..0bc6721f5fb9 100644
--- a/dev-libs/crc32c/crc32c-1.1.2-r1.ebuild
+++ b/dev-libs/crc32c/crc32c-1.1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/crc32c/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/criterion/Manifest b/dev-libs/criterion/Manifest
index 588a83e7248c..7d9a4b7392b8 100644
--- a/dev-libs/criterion/Manifest
+++ b/dev-libs/criterion/Manifest
@@ -6,5 +6,5 @@ DIST klib-cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502.tar.gz 99303 BLAKE2B 7804c030
 DIST nanopb-70f0de9877b1ce12abc0229d5df84db6349fcbfc.tar.gz 301605 BLAKE2B 24ddb83b3bd220be57c82761159f2b138ec646bec53d02632e96f6cf9dd6fa39e24039a908ac9687c183612703e6973095f94aba55fab5dd5559f243c5d412b2 SHA512 ab535c57a000c5df267352fcab8dcf0560a3a0d9b92634699508c8504840510e4f9f4a21005d57baf0af2e31718eda2ebe41763c7f82ac37ef9b6342c27e2e2a
 DIST nanopb-c9124132a604047d0ef97a09c0e99cd9bed2c818.tar.gz 1124211 BLAKE2B b8dfe6916decef6b6e32315989050a8ed3e72191fe8365c36652906631a9a2cbbdddd34f8927223d866749dde58d85a8e264ef6d5daac614327db0977d05d693 SHA512 3914fe37399cf99512fbd45e496ac95490b74a2c259f96138123a3399fa2b7258e5d99ebd5293b8ad87069e1bb4ea71d13c54366382904c9607d8545afd90b62
 EBUILD criterion-2.4_pre20210114.ebuild 1928 BLAKE2B 494af9c52b899784e4beb95f2d65571d099ce8fb63d47cea3adbfd2875dfe6a26145eeeaf6ceacb867429b9d9f0e979d88536396ac80fc02eba71539bbbd164a SHA512 b771c5e2e378e8f1e8c352da31c6d11f4b86aaf8667cd28f0076aac8b3e8a1d043da244fd6653d8d459a33a003832569f2fcd896ae65e09101b44f9e6cf6a981
-EBUILD criterion-2.4_pre20211218.ebuild 1867 BLAKE2B bf804369017b1aa912cda8cbd9fcad5403597030ba06c9d7b5354ec3e9cb011927412dee57b7012414b27dc650a7a014e8e1aaf209865174b040839a5cc26a80 SHA512 e3fe21efffc4a804984e8546ba2d6944136e763d1b322a46f59b26cbc361cc687c27f2c7384417e494462a3166ba7ab225874037b57e2b29d53534baa0b38373
+EBUILD criterion-2.4_pre20211218.ebuild 1866 BLAKE2B c14ccfcb7d68b88ef3d79bdc559c62e3e7d3c2e74810e79893c87166715b5037fc499c116c01370d664b3bbb89203052cc59950ee644b72b7ddffb6b5bb2f5f6 SHA512 c94762c0dabc9a99636ed75b02139dc28545f16b20d4150fa43e4568b44500007d587cc94e1e5bd19c50e587c60bf1b8fa9cc09626b581e7a59d6fc4b316497d
 MISC metadata.xml 495 BLAKE2B e26a19888a85984288468d569c85fc5076c0e78fa79c759ef0fb4f62e2c84453200f819459a9b85ac3dd7d4a08017b4c61bfdd01b73288ed4663332030f9a8aa SHA512 9602e9b6e0405dce29b8e90c72d95ce64fe0c4f54df0ed01416cc9562533195c2fcbde1fd139547387b3aabda8b4896a05bf4a277bb3a2921bf02cf66f81b744
diff --git a/dev-libs/criterion/criterion-2.4_pre20211218.ebuild b/dev-libs/criterion/criterion-2.4_pre20211218.ebuild
index 5140accac9bd..3125df752cce 100644
--- a/dev-libs/criterion/criterion-2.4_pre20211218.ebuild
+++ b/dev-libs/criterion/criterion-2.4_pre20211218.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
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/Snaipe/Criterion/archive/${CRITERION_COMMIT}.tar.gz
 
 LICENSE="BSD-2 MIT ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/cyberjack/Manifest b/dev-libs/cyberjack/Manifest
index 349921ac11dd..9a42cbb6cb1b 100644
--- a/dev-libs/cyberjack/Manifest
+++ b/dev-libs/cyberjack/Manifest
@@ -1,5 +1,7 @@
 AUX cyberjack-3.99.5_p14-gcc10.patch 344 BLAKE2B c535dd6c5d034b0ad81dd6ce6364d2c8807e1adfb2391d5b801cf285260c6f55c2bdf9f56e3bf4c0fc06cc8f87128855f34f6e3519a6ebc67a7b6eba10aa8008 SHA512 7ee096fbca22ffccff1ae941c7e16578ee10ab3b7704902dee4643bdf1a3d1592ae5cd19625414245fd4c1ee6f10d8a869e273e47d71c47a3300356a0709995d
 AUX libifd-cyberjack6.udev-r1 1435 BLAKE2B 3606ea979cf8bc068eb7ab447af70f5f9c409369554868ba36a43eaa7202813587b2193b0ef16b42a68bb665f4eaee5ac976774ec0f77dbaa93b447a6e6021bd SHA512 bfefad4cd2b509a41d3e8f638364a3f604e80dd5302456ca9d27d592175e30a2c348353d35fda242f2f80651efcd111c7294ecde7a8d80f1c7e1a655240483d2
 DIST pcsc-cyberjack_3.99.5final.SP14.tar.bz2 1682821 BLAKE2B 389b0da28beec42e3e2f1766b76dd77efec24bf7aea906ff14ad206c182162125431ac6c81e9242813c088b4936958b8056f5e7c71424c95de6e8e1ac2357aed SHA512 c83e142d6c071f7f20f9f15b9b76ed819873760bda4b49ec042506b2d7ef9ad8674c953abe67f08a1c4b178ce44767ba6479ea1148d8eeb38797e4775b2a9e82
+DIST pcsc-cyberjack_3.99.5final.SP15.tar.bz2 1681827 BLAKE2B e6b8325e4822f24e31b7986d5a7bc0ee2c99bd29568c19ac1fe8d308f561b0bcecfcc3e0ac2633b13986b2422bb014d28c7953e622021476ac3188de4dd0ed15 SHA512 d1a5454aea96866581f48a240b96013bd0c313965a8ef7a384ac41a929f3e805ad13590c383dab7638134c730e6f26e6cd1492d533f4910aad7c515016452258
 EBUILD cyberjack-3.99.5_p14-r2.ebuild 1910 BLAKE2B ce129e192cd8396a8a4d20c39b2f58bb8f3b38cfe16c10692490c3a8222f5b71cca1a200a7dda81f98ed0e601de6bb99e6864e9c97e19e98ca9a8954a00c2c0c SHA512 30fe40220ff67cd04e1b3b4701e83a1f3d8ffd8d20976c91e711be7777deb13cb2108021b81a7691eef24ac068047846e234c71d477fa410b67f1d40fb7b7470
+EBUILD cyberjack-3.99.5_p15.ebuild 1907 BLAKE2B cf186511e2152db3b2b21bc346b50dcfe6211fdab1f6fee99ff8528b6dae43d129c6be1d0ee6d02e35bdc67ffca310134db00e40530a9d7456e2238c6327c6a2 SHA512 8e9f89f995c6070da3020dc6a84fa8d392ca853643093a0a47bb4a808a021a1143fbc04e3fe2f367f00771b57f3d9c471ef4ae85e8325b7ef1b7ee8178361c26
 MISC metadata.xml 551 BLAKE2B b6c0ee4b76f7f7e58c0cf3a09d581143fe24dc863beda59337e51605463e58c93801848f115ab710937f3e17fec8c62fcdd98da27fa7b108466ca75491b28ac2 SHA512 d43d9224b8508447ca3410792bed8e88b791c1029d2412e4be251ea41be564fce12ecf0ae1172c47c6be10371278ad35f22eafc17490a5a96f4e6c081adbcd05
diff --git a/dev-libs/cyberjack/cyberjack-3.99.5_p15.ebuild b/dev-libs/cyberjack/cyberjack-3.99.5_p15.ebuild
new file mode 100644
index 000000000000..44af14f1ad60
--- /dev/null
+++ b/dev-libs/cyberjack/cyberjack-3.99.5_p15.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="pcsc-${PN}"
+MY_PV="${PV/_p/final.SP}"
+MY_P="${MY_PN}_${MY_PV}"
+
+inherit autotools toolchain-funcs udev
+
+DESCRIPTION="REINER SCT cyberJack USB chipcard reader user space driver"
+HOMEPAGE="https://www.reiner-sct.de/"
+SRC_URI="https://support.reiner-sct.de/downloads/LINUX/V${PV/_p/_SP}/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P/_/-}"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+IUSE="static-libs threads tools +udev xml"
+
+RDEPEND="
+	sys-apps/pcsc-lite
+	virtual/libusb:1=
+	udev? ( virtual/udev )
+	xml? ( dev-libs/libxml2:2= )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES="${FILESDIR}/${PN}-3.99.5_p14-gcc10.patch"
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-debug
+		--disable-error-on-warning
+		--disable-hal
+		--disable-mac-universal
+		--disable-mac-arches-i386
+		--disable-mac-arches-x86_64
+		--disable-visibility
+		--enable-nonserial
+		--enable-pcsc
+		--enable-release
+		--enable-warnings
+		--sysconfdir="/etc/cyberjack"
+		$(use_enable static-libs static)
+		$(use_enable threads)
+		$(use_enable udev)
+		$(use_enable xml xml2)
+		--with-usbdropdir="$($(tc-getPKG_CONFIG) libpcsclite --variable=usbdropdir)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use tools; then
+		# cjBingo can't be compiled, as it's defines stuff, which got dropped
+		cd "${S}"/tools/cjflash && emake
+		cd "${S}"/tools/cjgeldkarte && emake
+	fi
+}
+
+src_install() {
+	default
+
+	use tools && dobin tools/cjflash/cjflash tools/cjgeldkarte/cjgeldkarte
+	use udev && udev_newrules "${FILESDIR}"/libifd-cyberjack6.udev-r1 99-cyberjack.rules
+
+	dodoc debian/changelog doc/{LIESMICH,README}.{pdf,txt,xml}
+
+	docinto html
+	dodoc doc/{LIESMICH,README}.html
+
+	docinto source
+	dodoc doc/*.c*
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/dbus-c++/Manifest b/dev-libs/dbus-c++/Manifest
index ddba80a45dfd..af47e5cc0d83 100644
--- a/dev-libs/dbus-c++/Manifest
+++ b/dev-libs/dbus-c++/Manifest
@@ -1,5 +1,5 @@
 AUX dbus-c++-0.9.0-gcc-4.7.patch 1073 BLAKE2B 2cc43e4d23c14646adfffae77bc1168b69d4e3e2049ae8d3b5283d41f8214fd6884500fc014b66dfbc86dc1928c7e5c33024833e4b2bb28ddad6d17e443db2d1 SHA512 3625f7473db8ee069009655f5c8b68bd7290d622be56ace8e1472bd93b0a946a000bf0d728839cd6309414cbcb925247bfee888bb58fda8316e906fe5a8e25b2
 AUX dbus-c++-gcc7.patch 891 BLAKE2B e3f1c902b52cbec776849c86d2d4c7a13acbc907355c380cad7eabdfe670d9058a1ddd3687af9bcbbd4d815affea21728d8296f5a87122bc6b5fc99396ea0428 SHA512 b8c67af11620c2414d482cb3d77784f7c9831e64e0bc9cb9b946e13b0ad13135f06cfb894667fb9b184e6fc7e750df0769a2d4c09df4f430c2189c2c3804fbae
 DIST libdbus-c++-0.9.0.tar.gz 466362 BLAKE2B 401e266286fef383754c945f3adcf8e68a1169e55d33614f1e11227c324fe1219db7043674b5894d548f827d0b673ab4f012babbb4a395c212f6e17ef6d0e281 SHA512 7acebbb4254b2886cc0f05c5ddeeeac0b5863c5552d32249463b89380b0b95b8225c80bd98b8c7fcaada42ab770b5eff41b15390cd0d78bf1ee322ac6c2de319
-EBUILD dbus-c++-0.9.0-r4.ebuild 1619 BLAKE2B d3fd1a492605078be959ee02bbfa2349511283a7987c161514e55bf3f63ac36863fc8d8e2a4528138b9ec0b86c6d1639aef0d5e4f8257dcab9cf7423afc217a3 SHA512 39c683cbe41981b7fb9bc91d08cd147a524cd73c3cab50e5cfb27513357bf8e4c9629563e14b9521caf23f04b2820d0e1fba33834448efbed091fb833e1f2325
+EBUILD dbus-c++-0.9.0-r4.ebuild 1539 BLAKE2B aaa663650fd9946ae8c86017ad580aad58a0ff2b9d8ad96b02513afc55140a80c91443be935aed33556456b905e7bab67fa3683629d09ea9737c681c2efd1bd4 SHA512 7cc9abda1a97042fe011ae6dca6a002ca62726286d35ae0f929352d023caa3cd00b4fe6810e776482d2565538d92772417a8a29b3c27c0bc90579e8f1df2ee15
 MISC metadata.xml 365 BLAKE2B 0522c37f8ab0c117b0d65e7c5e198a05644bc2332b837569a1665f60147453937bc6f9db546f341f2d9f48b61078e41dd35e0b71539cb29808365091b3a4c758 SHA512 446fe1ccce403eeb4f46c114fdb3f7d9bfaf845849873f2c9807781980c20b226160bfc8d3b039629ad4649119c7d22032bf095cdfd5636db5460fc8a541ca23
diff --git a/dev-libs/dbus-c++/dbus-c++-0.9.0-r4.ebuild b/dev-libs/dbus-c++/dbus-c++-0.9.0-r4.ebuild
index 2f8c7ffa71d6..8c140d65b285 100644
--- a/dev-libs/dbus-c++/dbus-c++-0.9.0-r4.ebuild
+++ b/dev-libs/dbus-c++/dbus-c++-0.9.0-r4.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
@@ -6,7 +6,7 @@ EAPI=7
 inherit multilib-minimal
 
 DESCRIPTION="Provides a C++ API for D-BUS"
-HOMEPAGE="https://sourceforge.net/projects/dbus-cplusplus/ https://sourceforge.net/apps/mediawiki/dbus-cplusplus/index.php?title=Main_Page"
+HOMEPAGE="https://sourceforge.net/projects/dbus-cplusplus/"
 SRC_URI="mirror://sourceforge/dbus-cplusplus/lib${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index 85f41d523fb5..e0367f73c278 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -1,6 +1,8 @@
 DIST ell-0.46.tar.xz 531420 BLAKE2B aea36c7faf75bdc282805e4c003877cfe3fc8ff31fcb1ec85a666481b5d574091876b5021259797411d102d7ae6057a79a600e89fa34da038d44863a840db78a SHA512 20a25dbcb7c93a7c29a87cd07ab6124d0915d382f588e2a808e3f7e330d00a6769f40d91264d505408eeae3c6d07ce3917e04d843b4d04c73cc7c9f01395ecc4
 DIST ell-0.47.tar.xz 531432 BLAKE2B 74c4a9d40f42eca3b105fa2433b3c8472df24bb185dacfba8f4978edeac79b94a1c7ef3c009eed3a3303125e7f3f26e08e046ebb1d913870d4f298806dc34119 SHA512 103708ea625d8eb63e5a662fc7fdd0f59cd3610c4d6de7ac2cceef89e30f8896d14a7b756047a3b046035544bcf80992aec786f06678047895cf0e3c791b8daa
+DIST ell-0.48.tar.xz 528916 BLAKE2B 3ab2a90afdedd0ebc8ac0efd69f52189a93f408db7b35e3a1a85e72ebe5884ed0c833ff1835b390925a406147d207b99328388f09124c34b935fc84f33e93339 SHA512 481b94c0aac91f26c9e618db2590f132265c07460e86c443ecac033a78566ce0e86a7c8f0ab7b2a954073ebbe66ed0303281776b82f751fa2b4d3aaf40e55dc2
 EBUILD ell-0.46.ebuild 1169 BLAKE2B ed818bc1b592a9d5768ee4875205a63bedc7c32cad81e5be707e5b345aa78de37e1c337a33fdbae36a934bb2c01e288f5ab27a8af6a3fcfd795912414dd4437c SHA512 b4aab5df0c8036b434c05e46f00277f5b9a111567b3fd1b7ecff52cbb0c6e3678fa8cd9afcba57c43bc316b7416a28582484791d66b1ffb9357e366e3821241b
 EBUILD ell-0.47.ebuild 1175 BLAKE2B c91500654e555bb6023ac37c0715d240e93d57d5f1e48f1c3a3b6083360a8a2eadcb37a8750730905b9a73abfd0d9e42e55928d884801711ca65ca947629e6a3 SHA512 a402b13afb81a1cb481464581c2210961a5ecb239ac68a638c0f3e117c1e1490cc4ae17c939d25995b1e647104a9713ed628fee4eeb9c396ddbb9dd9e86f6b8b
+EBUILD ell-0.48.ebuild 1175 BLAKE2B c91500654e555bb6023ac37c0715d240e93d57d5f1e48f1c3a3b6083360a8a2eadcb37a8750730905b9a73abfd0d9e42e55928d884801711ca65ca947629e6a3 SHA512 a402b13afb81a1cb481464581c2210961a5ecb239ac68a638c0f3e117c1e1490cc4ae17c939d25995b1e647104a9713ed628fee4eeb9c396ddbb9dd9e86f6b8b
 EBUILD ell-9999.ebuild 1175 BLAKE2B c91500654e555bb6023ac37c0715d240e93d57d5f1e48f1c3a3b6083360a8a2eadcb37a8750730905b9a73abfd0d9e42e55928d884801711ca65ca947629e6a3 SHA512 a402b13afb81a1cb481464581c2210961a5ecb239ac68a638c0f3e117c1e1490cc4ae17c939d25995b1e647104a9713ed628fee4eeb9c396ddbb9dd9e86f6b8b
 MISC metadata.xml 251 BLAKE2B a9af03a4a233a890a554ab68f1876580e3720a72c1f946ea6dbb82c49afd94243ea4017cd8a392fa2adea53c588646fd0ebccb948dde0340ec2ff05c0381fb99 SHA512 0837c31655f6a725b0fad20c8998a3a4645dc8049e14980b0097776cf59b4288276489dfddc149893f29844175eeb187a54af7d28690de4afe18ef9fd4c1f98f
diff --git a/dev-libs/ell/ell-0.48.ebuild b/dev-libs/ell/ell-0.48.ebuild
new file mode 100644
index 000000000000..56c48e4f83d1
--- /dev/null
+++ b/dev-libs/ell/ell-0.48.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic linux-info multilib-minimal
+
+DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons"
+HOMEPAGE="https://01.org/ell"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
+else
+	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+IUSE="pie test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=""
+DEPEND="test? ( sys-apps/dbus )"
+
+CONFIG_CHECK="
+	~TIMERFD
+	~EVENTFD
+	~CRYPTO_USER_API
+	~CRYPTO_USER_API_HASH
+	~CRYPTO_MD5
+	~CRYPTO_SHA1
+	~KEY_DH_OPERATIONS
+"
+
+src_prepare() {
+	default
+	[[ "${PV}" == *9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	append-cflags "-fsigned-char" #662694
+	local myeconfargs=(
+		$(use_enable pie)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	local DOCS=( ChangeLog README )
+	einstalldocs
+
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/expat/Manifest b/dev-libs/expat/Manifest
index 44e64b4f6a64..6eab1ae12078 100644
--- a/dev-libs/expat/Manifest
+++ b/dev-libs/expat/Manifest
@@ -1,7 +1,5 @@
-DIST expat-2.4.1.tar.xz 445024 BLAKE2B 2ae66d284a03176ef7290093f59bb7ad98011dfbf3c7c3515ba4e4b99f849474def6ce6d9844c944fed22d86ac4ea1a38863646be914d9432eda7b69d890be65 SHA512 9dc760dbf701f75e55c4479d81417622f8c750d8473498458a382a4c2932a2976a059cb3589f88855188e5173ec7868d285c4601428e0ca625df7a59cf975191
-DIST expat-2.4.2.tar.xz 449664 BLAKE2B 627ee86bd878b8f0edc50bdbeb26d347ec8bdd06fc369a3ee378ad133d38eb7cfe9018a5839843ba6757d727e84229c84c51d618b5de7e92197bdc7203e09b73 SHA512 c27f2b54e9babc6bd24283b62cc65546f37fa40481ac55b84d9e3ecad1b58d3c52055c71d56600b43aaf20ad142c70899a8dc424dba804b1699077c38dfe34a3
 DIST expat-2.4.3.tar.xz 451012 BLAKE2B 4c0200837ea0054a88d2a2606486482f234e4b4f6b5f16134bf2a4b7b61457b12d534c6be3f16d28f6926f896d00177ef53a947a0a6c3ad11ff024a8e76edf84 SHA512 62a7fe751f6846deec4b04fd2c2ca8ed9e139fa27cda0e3fe7f8f05107caaed70597aed17b45c49d30a60c8a0c6beae1317dd5f24240640310951aabb16dbcb7
-EBUILD expat-2.4.1.ebuild 2277 BLAKE2B 5e2039ed2e5604aafde9f4ae1b61a931c3c8e7bade01349eb804e62efc12650ae0ead3531672df8064c7dcb9a257cf00314ed7c6a591b10731a465cc9279697d SHA512 e69a6ec9a906245e8d884cb5019b68644f0e86a48fb5d30d012c588442db761b3bdb115f5ab4c7e50e36251a0edf22389ead0f36823db59a6a9d873dbc10ca82
-EBUILD expat-2.4.2.ebuild 2285 BLAKE2B dd2061f953c915e133c608b5aef2e1f63fe546a92fc02e00e936ebe2fc91d9cdd9299510c9e742b3682de6184f6cf5cfbd4cd337d42c7efd4c0c7af8b4bfed5f SHA512 a81794a0eb965a9adbd7762abcf4765abac6078f3d10874306f594c66cb1abb6b01fe346e0bd12fae249127dcf6accbbf5d9c3efc05fb2e1d66264462bf404b4
-EBUILD expat-2.4.3.ebuild 2285 BLAKE2B dd2061f953c915e133c608b5aef2e1f63fe546a92fc02e00e936ebe2fc91d9cdd9299510c9e742b3682de6184f6cf5cfbd4cd337d42c7efd4c0c7af8b4bfed5f SHA512 a81794a0eb965a9adbd7762abcf4765abac6078f3d10874306f594c66cb1abb6b01fe346e0bd12fae249127dcf6accbbf5d9c3efc05fb2e1d66264462bf404b4
+DIST expat-2.4.4.tar.xz 449448 BLAKE2B 20b2cfb27746c24e56580478c933b3ca9e9ff19aed13561bc07e8ad879daff575882b8940fdca00f8c99b146067438a4a680238728098b10e4d08303ffa00119 SHA512 c88a82f4732e27340eb9480c082bcc909b0284e16b368ee9feeb4e2dd058e8f7c42fd48feacd5272cc76cb78bd183df33eb5d0b135fdd1d3c493cb156572ab76
+EBUILD expat-2.4.3.ebuild 2277 BLAKE2B 5e2039ed2e5604aafde9f4ae1b61a931c3c8e7bade01349eb804e62efc12650ae0ead3531672df8064c7dcb9a257cf00314ed7c6a591b10731a465cc9279697d SHA512 e69a6ec9a906245e8d884cb5019b68644f0e86a48fb5d30d012c588442db761b3bdb115f5ab4c7e50e36251a0edf22389ead0f36823db59a6a9d873dbc10ca82
+EBUILD expat-2.4.4.ebuild 2278 BLAKE2B 6d9fb099b1c670541e10df0feeb1b9f10004763c4f13a2849a4deafea35a96b691acd85ab71e9da185cca797925572334aecc683f27f3ab751b9dfb9d9304617 SHA512 d52bb96a4d09c86f15d80bdbb554516a922939b6295c2efe6b0f88cbc72f02b51850aea1b202ed30693fa59f82e697ff7d727f70e085dc7f4963983f8da19a39
 MISC metadata.xml 514 BLAKE2B e38c182f42192e0f3b567423b148733b59ed885cca58d36829dfd57bad88565baca743024aa5fc701f368fcfc8886a92ae20a94f549e190a3d31e2ca5c0e28af SHA512 6248f12ed1f3e2bc10d7f11117ad18dc86ccb5ecc1fc48aac32032a062d1273e956cd22e712a1b14cc670642047f9dcaf63606dbad08895e1e3b94b0573bd74c
diff --git a/dev-libs/expat/expat-2.4.2.ebuild b/dev-libs/expat/expat-2.4.2.ebuild
deleted file mode 100644
index f397e99485c2..000000000000
--- a/dev-libs/expat/expat-2.4.2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-AUTOTOOLS_AUTO_DEPEND=no
-AT_NOEAUTOHEADER=yes  # because expat_config.h.in would need post-processing
-inherit autotools multilib-minimal
-
-DESCRIPTION="Stream-oriented XML parser library"
-HOMEPAGE="https://libexpat.github.io/"
-SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/expat-${PV}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="examples static-libs unicode"
-BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
-
-DOCS=( README.md )
-
-src_prepare() {
-	default
-
-	# fix interpreter to be a recent/good shell
-	sed -i -e "1s:/bin/sh:${BASH}:" conftools/get-version.sh || die
-	if use unicode; then
-		cp -R "${S}" "${S}"w || die
-		pushd "${S}"w >/dev/null
-		find -name Makefile.am \
-			-exec sed \
-			-e 's,libexpat\.la,libexpatw.la,' \
-			-e 's,libexpat_la,libexpatw_la,' \
-			-i {} + || die
-		eautoreconf
-		popd >/dev/null
-	fi
-}
-
-multilib_src_configure() {
-	local myconf="$(use_enable static-libs static) --without-docbook"
-
-	mkdir -p "${BUILD_DIR}"w || die
-
-	if use unicode; then
-		pushd "${BUILD_DIR}"w >/dev/null
-		CPPFLAGS="${CPPFLAGS} -DXML_UNICODE" ECONF_SOURCE="${S}"w econf ${myconf}
-		popd >/dev/null
-	fi
-
-	ECONF_SOURCE="${S}" econf ${myconf}
-}
-
-multilib_src_compile() {
-	emake
-
-	if use unicode; then
-		pushd "${BUILD_DIR}"w >/dev/null
-		emake -C lib
-		popd >/dev/null
-	fi
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-
-	if use unicode; then
-		pushd "${BUILD_DIR}"w >/dev/null
-		emake -C lib install DESTDIR="${D}"
-		popd >/dev/null
-
-		pushd "${ED}"/usr/$(get_libdir)/pkgconfig >/dev/null
-		cp expat.pc expatw.pc
-		sed -i -e '/^Libs/s:-lexpat:&w:' expatw.pc || die
-		popd >/dev/null
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	doman doc/xmlwf.1
-
-	# Note: Use of HTML_DOCS would add unwanted "doc" subfolder
-	docinto html
-	dodoc doc/*.{css,html}
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.c
-		docompress -x usr/share/doc/${PF}/examples
-	fi
-
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/dev-libs/expat/expat-2.4.3.ebuild b/dev-libs/expat/expat-2.4.3.ebuild
index f397e99485c2..8db61e9898d3 100644
--- a/dev-libs/expat/expat-2.4.3.ebuild
+++ b/dev-libs/expat/expat-2.4.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/ex
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="examples static-libs unicode"
 BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
 
diff --git a/dev-libs/expat/expat-2.4.1.ebuild b/dev-libs/expat/expat-2.4.4.ebuild
index 8db61e9898d3..15afc9578393 100644
--- a/dev-libs/expat/expat-2.4.1.ebuild
+++ b/dev-libs/expat/expat-2.4.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/ex
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="examples static-libs unicode"
 BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
 
diff --git a/dev-libs/folks/Manifest b/dev-libs/folks/Manifest
index 4d5763bce5d8..1e653d55b949 100644
--- a/dev-libs/folks/Manifest
+++ b/dev-libs/folks/Manifest
@@ -1,3 +1,5 @@
 DIST folks-0.15.3.tar.xz 491432 BLAKE2B f11123a2c41c4a36c002b26f3c3616d62e4a74bbddbde84643143404497c8e3c31d8cafc8bff0ba4714606259aaa6f7adf352ba4bb98a20c75a181ee68bfda3a SHA512 dd54aef470990974bfc9b22fb83c868ca9674608ccfddeea1bb7507dfc77d7d12a43d43462957b0bb99bf249c13868ba7326f7fd7e38de8802a3ba54e33d8d58
+DIST folks-0.15.4.tar.xz 493004 BLAKE2B 0e067a39b4e89e8fa41b20f37c774e56fcb1e0c8de23798ced647177b0d9329509ae3c03ff85a00464887deb4ce275c96b2fcf50aa2dd44af02e20b6ee45fe65 SHA512 4dbd0bb82d56a8cb179ab8148ce531817ccd55bd40f8b562eb0d77555b264e5190669b356ff009c81a963fdcacaabc02fe871bf0c3c668a648f2c820da76f25c
 EBUILD folks-0.15.3.ebuild 2349 BLAKE2B 213e515feb14d84974725e90dcb996858bcde38b6a09bada63749f37e7101f872628f6e0a9674a71342aca6ff2471774be3df5573d23dfaa4da0bdd6600e1dcd SHA512 b85cb48350c0a8bd11d016ef2c87d6da1fec68653770ddf05a6c7a7019543c7d0f86948fde7224c0c1bcf9d106361709ca5e2b43c593df341f52f4b74bd808fc
+EBUILD folks-0.15.4.ebuild 2351 BLAKE2B 383302043f5b46855941fb0d9147bea76af943f6c8011ff9bf825753857e40950f9966b1bacf4b0c3ffe79a2146d2c0431d98cda07a4c6a8da9e43e7b0258b5c SHA512 32b67a3c72f320390f5991aaf24109b25f2263866e3b24fd02b92f0b38de034dd1eb2f1a7a419b26fa93ccbd18e2102adc8ded0f91e173f5834a4e1a1d7bdbc1
 MISC metadata.xml 396 BLAKE2B f4e55d5af852a227b66080749510b9915ac9c3f7081c88051f06be73465235ccc326db015238366e62c40d6e8027eac233644ad8421eb0b59f881e2ec215a1e2 SHA512 4a6a15a7ecee35f43c7f82d24e82c32ca3811058f5135e473e15bcae21fc3023d61a6c9f638c9d97336baef3fa8126ab31a49eb036545f521dab2bf93c2a0f0a
diff --git a/dev-libs/folks/folks-0.15.4.ebuild b/dev-libs/folks/folks-0.15.4.ebuild
new file mode 100644
index 000000000000..7d90012d5b65
--- /dev/null
+++ b/dev-libs/folks/folks-0.15.4.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+VALA_MIN_API_VERSION="0.48"
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
+
+DESCRIPTION="Library for aggregating people from multiple sources"
+HOMEPAGE="https://wiki.gnome.org/Projects/Folks https://gitlab.gnome.org/GNOME/folks"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/26" # subslot = libfolks soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x86-linux"
+
+IUSE="bluetooth eds +telepathy test utils"
+REQUIRED_USE="bluetooth? ( eds )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=dev-libs/glib-2.58:2
+	>=dev-libs/libgee-0.10:0.8[introspection]
+	>=dev-libs/gobject-introspection-1.54:=
+	telepathy? (
+		>=net-libs/telepathy-glib-0.19.9
+		dev-libs/dbus-glib
+	)
+	eds? ( >=gnome-extra/evolution-data-server-3.38:= )
+	dev-libs/libxml2:2
+	utils? ( sys-libs/readline:0= )
+"
+# telepathy-mission-control needed at runtime; it is used by the telepathy
+# backend via telepathy-glib's AccountManager binding.
+RDEPEND="${DEPEND}
+	bluetooth? ( >=net-wireless/bluez-5[obex] )
+	telepathy? ( net-im/telepathy-mission-control )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	$(vala_depend)
+	telepathy? ( net-libs/telepathy-glib[vala] )
+	eds? ( gnome-extra/evolution-data-server[vala] )
+	test? (
+		sys-apps/dbus
+		bluetooth? (
+			$(python_gen_any_dep '
+				dev-python/python-dbusmock[${PYTHON_USEDEP}]
+			')
+		)
+	)
+"
+
+python_check_deps() {
+	if use test && use bluetooth; then
+		has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
+	fi
+}
+
+src_prepare() {
+	vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use bluetooth bluez_backend)
+		$(meson_use eds eds_backend)
+		$(meson_use eds ofono_backend)
+		$(meson_use telepathy telepathy_backend)
+		-Dzeitgeist=false # last rited package
+		-Dimport_tool=true
+		$(meson_use utils inspect_tool)
+		$(meson_use test tests)
+		-Dinstalled_tests=false
+		-Ddocs=false # Needs find_program sedding to specific version; only dev docs, don't bother
+	)
+	meson_src_configure
+}
+
+src_test() {
+	dbus-run-session meson test -C "${BUILD_DIR}" -t 5
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/dev-libs/gdl/Manifest b/dev-libs/gdl/Manifest
index df444775ddb8..242e136983b5 100644
--- a/dev-libs/gdl/Manifest
+++ b/dev-libs/gdl/Manifest
@@ -1,5 +1,3 @@
-DIST gdl-3.34.0.tar.xz 531368 BLAKE2B 5e32c330ab2fda0b9f06de0fd9d7e3f3118b0af36a73f4f0280f069b49002a4d00e5cbfd373d65b0ea7a15bb5b577f8babbdf7ee71ed7db773d2ad65008a452e SHA512 8c43f330556dae67e4f64e92c3ba5c2e9351d3040d6002bda89f20f9494fc93030abe80072f0cf86280f98e290805154e9ca12aaa7013f0a341d8ea94323d3b0
 DIST gdl-3.40.0.tar.xz 534016 BLAKE2B d403da4040053ce81352e14d538d15a5331423c3bb2aa76f38f4da8ccea22790507ca21fc8e6246e29dae1aa4297ecf470a71a0862475e7767a7fe7c03c8d5f4 SHA512 38cf787a47e7eece445c7bf321cb5aa691cc6bdfcb31bc10fb51c83c525b74fc8374a20989621d79e70f25ef92d9d7cce46f6f0bb993cceba3fb93b9092c1e32
-EBUILD gdl-3.34.0.ebuild 738 BLAKE2B 72ebd330d9191267e42792da69741bb2106b4e0c41d04994f1d58106f364a34841fcbe87882cd528b03ebcfb1f2c347af0fb4764cd28e0bce6ba3ad409c5be0c SHA512 6133015ad3f3d90b3ea419fdd6e886bf175c1e576a42a71ec3b705de0bd322c8352847b5f354019479bfa8c50534ace16aa6d3b823dd52c961bfe8286e4b4308
 EBUILD gdl-3.40.0.ebuild 750 BLAKE2B 1910dfc9a3827d13f17aa0beb58db6b30329b591baf090996d0be44fea81a12e694064e415e5f86378e479df2d3d09d6aa3022a0f73f4d164eb7f2c9119ca8fd SHA512 53e7afc3dfe3fe4a0e4e639ebab4c452964cec5a3e7875a8142f48e6da7c63201b6c8960fe52684a2a931978132571374963cc7d7788dfa6c001bb43277f127d
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-libs/gdl/gdl-3.34.0.ebuild b/dev-libs/gdl/gdl-3.34.0.ebuild
deleted file mode 100644
index be9719ca2082..000000000000
--- a/dev-libs/gdl/gdl-3.34.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="GNOME docking library"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gdl"
-
-LICENSE="LGPL-2.1+"
-SLOT="3/5" # subslot = libgdl-3 soname version
-IUSE="+introspection"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-
-RDEPEND="
-	dev-libs/glib:2
-	>=x11-libs/gtk+-3.0.0:3[introspection?]
-	>=dev-libs/libxml2-2.4:2
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.4
-	>=dev-util/intltool-0.40.4
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable introspection) \
-		--disable-gtk-doc
-}
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index 58c575ec0902..e58cd587c701 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -1,14 +1,7 @@
-AUX gjs-1.70.0-meson-0.60.2.patch 4173 BLAKE2B f51a18cbf663d4e4e8b9246e7c8e63cc0633943532636439a407d5e59e0121f9fad099bebfe7d8ee15ea80ff409c024ac1caf7f809af3295a747ef1a40420565 SHA512 fea4c9a7db86f39387c2dd35ce7701a18308b8fc8e3fc5f85e279832331e7a4426bc99ed59cdccdb155dc3fa7ec78b10dd607f183f00356eb6797f4f5e3b93b3
 DIST gjs-1.64.4.tar.xz 422496 BLAKE2B a96211f7240336dbb30c6965e405f59ee72e4288842837da8da8c6d3c59b7e04ebb6c7a8b0b02d38601c162ffdf1a1fef9f13e4db720c4c483f4a39dffd5dbb4 SHA512 21a15d7106ad6584fb1f02cb0a0a4cab211a3540adb8f2c03d35c211e3946b81935000a52351fedd95a18a7ff6b7f96e665fcafa3c411ff79f2b6cb332c82b42
-DIST gjs-1.68.1.tar.xz 558920 BLAKE2B f5364fe92ddf4cb1e9b5dac5921fa180ed31bfe54ba8ad737e31c5f8a7f19d7e47bad07d7ca088e6e5962b2782a774b985b607214a7381a8b6c54e799df97235 SHA512 bce2f84e748dd483e0c907e7f7f230257aa4b216b76e89c3457ebba5e9bf601dcb5c771ebe864df22255e221876c6e7ee3097328e6f52ef78360f49708ff457a
-DIST gjs-1.68.2.tar.xz 559432 BLAKE2B 09146cadcc17f16c36f2a07108b086850d51d95cba21ca95ff0311dd107835b6c5fc9d5d682c9c6713ebd082372f8b46aae31b71f7f5e0e03dcb0d47c5d3c72f SHA512 a42d4ee7be92c869ad9e74c0e02debbe62d13fd0926aa0d903efe802d0f8bc6bc18959d4e161b3960261f9e7b9c0de1d4df5cfcf1eabea29fd75063af8cba154
-DIST gjs-1.68.3.tar.xz 559792 BLAKE2B 0e625c80164ea6053941ce04d00ac688e7a2ea79150dba8849ffc22ae51951d3a6442d8a28755400331a13bf8fcff01dc299d37e61d165de61bbdc1416298f63 SHA512 1b93bdce97b81ec439cde7824491661fc7e4296464a41e4357fc902ec62024e855a4dec24ae7dcb01ec57d4a0019ab2c4aff0b3c08fb94c7beecdefe34226d46
 DIST gjs-1.68.4.tar.xz 559768 BLAKE2B 0e5f2cbb5b93c7ddc05916c95f23d9438c8e76bc2eb35c11eca5414d9f4327e0c99ec9c85795880bd478de5e3655da0f7e9223ba4c3f7c8d5685bdb4a00920d5 SHA512 c610abfa701c0a61ffa6916ec5ebcd07b1dcb04607d74ab0b6d30583da27d60f9993e037fab73e66e1580d644d3a57f0a479f55a09e3bf56fea7f17367c787b3
 DIST gjs-1.70.0.tar.xz 595292 BLAKE2B fc06f4b397350daf19a532a3ec3c2851e106bc76dda41d4a9c32b2718a6f5add1bf0c1066ba9cc5aaeeb192cb4f0a0e3dba1c16826fb3157c0a1e0a8bfe88606 SHA512 e32ee511c34fa9af210061a106d42de67d40c20f398dfacc541db0323bb4a499f2552aa28028eba16ec42afd4dec5a0cea4292155a66b966c3731ded45b23cb4
 EBUILD gjs-1.64.4.ebuild 1121 BLAKE2B 98e74cb7ab03be98f02cd62a684c804ea40dff1df80632b13ef2ce357ecd5cd3030a3816258317977e1fce9021e87650d6128d71f773704b7340b6319c419f5b SHA512 229e77055f686debdebdd32e667ad59e706a77346772c8fa6164425bd3e60cb4947d477af9925aa4da8f90eaf55807ebea6c05c85acc594367bb4745f73a576a
-EBUILD gjs-1.68.1-r1.ebuild 1120 BLAKE2B 19bcb66930e48d86adcc80fb753b5cd97b26c137e0a35ff98ddae38dba162a7dd82522e5f25ea2e4f62ccf46829ad89e654cae583bc0d2628bcebce63426461a SHA512 211799f2a201f419f6122fad8f98bfa3cfc904b566dffb6ab2c1a6195c5651834b0f60738d4f7c654f49782ace3c9f5d6c103153ad523e306fdc07383654e93e
-EBUILD gjs-1.68.2.ebuild 1125 BLAKE2B 13fd2a1ec2904660be057b1ef8702b704161dbe23796634bb62fab968d156cdf462603ec02a147f2d9ca0d9724f7769ca502613bcb640c90f0ea829f308dd8ad SHA512 b5be649efc4c5835701675423fea9153439d3f17232c9b16d2220588c7b8bdf2abf03a8c5334c18e7b9941e02b5e4a7ab9c961c563a910d5a41a84198b41be85
-EBUILD gjs-1.68.3.ebuild 1120 BLAKE2B 19bcb66930e48d86adcc80fb753b5cd97b26c137e0a35ff98ddae38dba162a7dd82522e5f25ea2e4f62ccf46829ad89e654cae583bc0d2628bcebce63426461a SHA512 211799f2a201f419f6122fad8f98bfa3cfc904b566dffb6ab2c1a6195c5651834b0f60738d4f7c654f49782ace3c9f5d6c103153ad523e306fdc07383654e93e
 EBUILD gjs-1.68.4.ebuild 1120 BLAKE2B 19bcb66930e48d86adcc80fb753b5cd97b26c137e0a35ff98ddae38dba162a7dd82522e5f25ea2e4f62ccf46829ad89e654cae583bc0d2628bcebce63426461a SHA512 211799f2a201f419f6122fad8f98bfa3cfc904b566dffb6ab2c1a6195c5651834b0f60738d4f7c654f49782ace3c9f5d6c103153ad523e306fdc07383654e93e
-EBUILD gjs-1.70.0.ebuild 1247 BLAKE2B db67807cb632a0ba71b1c5c070eb6e7d4eab758e33e20d518d13f179ccbe0991b65e2db017bec8bcead03dffc9b6e3f05061ecc545aade2fb8c5076c00f3ace1 SHA512 b3d8d300ebeba5101d3343e1def0e0ec81eedffed01f867ca157e6ce50ccccdebceef7696346cfd78947d9f555c9b79ab2e09964859b2a6e3f6ec763159aa9cc
+EBUILD gjs-1.70.0.ebuild 1189 BLAKE2B a0435573897efa84ca663435dc70ceb2a9d58167e1d6d468cfd095dbf254bcc653efddc590c8f4db954483ce0fec3e0f865212cbf31edf25d5e474e5a84f7fdf SHA512 99bbf1c080ae962eaa2eb4e94db0b9d86b3b12570a8f65b88dff0ffa51ab66e1c925731ea0af353fd5a33df1c0bf5adda4f38772f2a1efa5546092ecc00f4145
 MISC metadata.xml 389 BLAKE2B 68d318dc917f5072b08e83506e14d0f4b8f25bdb90b95701013466112f8fdd77c2cc193257eee82fbce517e41056eeff61cd20137b697f6d1d688d943bafb8cc SHA512 bc4b0c94d58f3f67cbe481c45fdedb5d601e3ca40b5dcc88ef8c7ad9b214e7cd0d5c47d94599f85c11cd1c21dfd57770fd64d442f4b3f960ebc70a8e16f8e8eb
diff --git a/dev-libs/gjs/files/gjs-1.70.0-meson-0.60.2.patch b/dev-libs/gjs/files/gjs-1.70.0-meson-0.60.2.patch
deleted file mode 100644
index 9a051131d98c..000000000000
--- a/dev-libs/gjs/files/gjs-1.70.0-meson-0.60.2.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 59bbb5e4795d2b6e41ce27ae3b18257e75b71a19 Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Sat, 27 Nov 2021 22:57:11 +0000
-Subject: [PATCH] build: disable gir install via list to pacify meson >= 0.60.2
-
-meson.build:580:0: ERROR: "install_dir" must be specified when installing a target
-installed-tests/js/meson.build:73:0: ERROR: "install_dir" must be specified when installing a target
-installed-tests/js/meson.build:91:4: ERROR: "install_dir" must be specified when installing a target
-installed-tests/js/meson.build:104:0: ERROR: "install_dir" must be specified when installing a target
-installed-tests/js/libgjstesttools/meson.build:13:0: ERROR: "install_dir" must be specified when installing a target
----
- installed-tests/js/libgjstesttools/meson.build | 2 +-
- installed-tests/js/meson.build                 | 6 +++---
- meson.build                                    | 2 +-
- 3 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/installed-tests/js/libgjstesttools/meson.build b/installed-tests/js/libgjstesttools/meson.build
-index 2e57483a..3ca4d7ed 100644
---- a/installed-tests/js/libgjstesttools/meson.build
-+++ b/installed-tests/js/libgjstesttools/meson.build
-@@ -14,7 +14,7 @@ gjstest_tools_gir = gnome.generate_gir(libgjstesttools,
-     includes: ['GObject-2.0', 'Gio-2.0'], sources: gjstest_tools_sources,
-     namespace: 'GjsTestTools', nsversion: '1.0',
-     symbol_prefix: 'gjs_test_tools_', extra_args: '--warn-error',
--    install: get_option('installed_tests'), install_dir_gir: false,
-+    install: get_option('installed_tests'), install_dir_gir: [false],
-     install_dir_typelib: installed_tests_execdir)
- gjstest_tools_typelib = gjstest_tools_gir[1]
- libgjstesttools_dep = declare_dependency(
-diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build
-index 2f007351..16b59660 100644
---- a/installed-tests/js/meson.build
-+++ b/installed-tests/js/meson.build
-@@ -74,7 +74,7 @@ regress_gir = gnome.generate_gir(libregress, includes: regress_gir_includes,
-     sources: regress_sources, namespace: 'Regress', nsversion: '1.0',
-     identifier_prefix: 'Regress', symbol_prefix: 'regress_',
-     extra_args: ['--warn-all', '--warn-error'] + regress_gir_c_args,
--    install: get_option('installed_tests'), install_dir_gir: false,
-+    install: get_option('installed_tests'), install_dir_gir: [false],
-     install_dir_typelib: installed_tests_execdir)
- regress_typelib = regress_gir[1]
- 
-@@ -91,7 +91,7 @@ if not skip_warnlib
-     warnlib_gir = gnome.generate_gir(libwarnlib, includes: ['Gio-2.0'],
-         sources: warnlib_sources, namespace: 'WarnLib', nsversion: '1.0',
-         symbol_prefix: 'warnlib_', header: 'warnlib.h',
--        install: get_option('installed_tests'), install_dir_gir: false,
-+        install: get_option('installed_tests'), install_dir_gir: [false],
-         install_dir_typelib: installed_tests_execdir)
-     warnlib_typelib = warnlib_gir[1]
- endif
-@@ -105,7 +105,7 @@ gimarshallingtests_gir = gnome.generate_gir(libgimarshallingtests,
-     includes: ['Gio-2.0'], sources: gimarshallingtests_sources,
-     namespace: 'GIMarshallingTests', nsversion: '1.0',
-     symbol_prefix: 'gi_marshalling_tests_', extra_args: '--warn-error',
--    install: get_option('installed_tests'), install_dir_gir: false,
-+    install: get_option('installed_tests'), install_dir_gir: [false],
-     install_dir_typelib: installed_tests_execdir)
- gimarshallingtests_typelib = gimarshallingtests_gir[1]
- 
-diff --git a/meson.build b/meson.build
-index 437b3fd3..73d0eaca 100644
---- a/meson.build
-+++ b/meson.build
-@@ -581,7 +581,7 @@ gjs_private_gir = gnome.generate_gir(libgjs,
-     includes: ['GObject-2.0', 'Gio-2.0'], sources: libgjs_private_sources,
-     namespace: 'GjsPrivate', nsversion: '1.0', identifier_prefix: 'Gjs',
-     symbol_prefix: 'gjs_', extra_args: '--warn-error', install: true,
--    install_dir_gir: false, install_dir_typelib: pkglibdir / 'girepository-1.0')
-+    install_dir_gir: [false], install_dir_typelib: pkglibdir / 'girepository-1.0')
- gjs_private_typelib = gjs_private_gir[1]
- 
- ### Build gjs-console interpreter ##############################################
--- 
-GitLab
-
diff --git a/dev-libs/gjs/gjs-1.68.1-r1.ebuild b/dev-libs/gjs/gjs-1.68.1-r1.ebuild
deleted file mode 100644
index 433139d0b4bd..000000000000
--- a/dev-libs/gjs/gjs-1.68.1-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org meson virtualx
-
-DESCRIPTION="Javascript bindings for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
-
-LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
-SLOT="0"
-IUSE="+cairo examples gtk readline sysprof test"
-KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.66.0
-	dev-libs/libffi:=
-	>=dev-libs/gobject-introspection-1.66.1:=
-	dev-lang/spidermonkey:78
-	cairo? ( x11-libs/cairo[X,svg] )
-	readline? ( sys-libs/readline:0= )
-"
-DEPEND="${RDEPEND}
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
-	test? ( sys-apps/dbus
-		>=x11-libs/gtk+-3.20:3[introspection] )
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_configure() {
-	# FIXME: add systemtap/dtrace support, like in glib:2
-	local emesonargs=(
-		$(meson_feature cairo)
-		$(meson_feature readline)
-		$(meson_feature sysprof profiler)
-		-Dinstalled_tests=false
-		$(meson_use !test skip_dbus_tests)
-		$(meson_use !test skip_gtk_tests)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
diff --git a/dev-libs/gjs/gjs-1.68.2.ebuild b/dev-libs/gjs/gjs-1.68.2.ebuild
deleted file mode 100644
index 0d6c7564652f..000000000000
--- a/dev-libs/gjs/gjs-1.68.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org meson virtualx
-
-DESCRIPTION="Javascript bindings for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
-
-LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
-SLOT="0"
-IUSE="+cairo examples gtk readline sysprof test"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.66.0
-	dev-libs/libffi:=
-	>=dev-libs/gobject-introspection-1.66.1:=
-	dev-lang/spidermonkey:78
-	cairo? ( x11-libs/cairo[X,svg] )
-	readline? ( sys-libs/readline:0= )
-"
-DEPEND="${RDEPEND}
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
-	test? ( sys-apps/dbus
-		>=x11-libs/gtk+-3.20:3[introspection] )
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_configure() {
-	# FIXME: add systemtap/dtrace support, like in glib:2
-	local emesonargs=(
-		$(meson_feature cairo)
-		$(meson_feature readline)
-		$(meson_feature sysprof profiler)
-		-Dinstalled_tests=false
-		$(meson_use !test skip_dbus_tests)
-		$(meson_use !test skip_gtk_tests)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
diff --git a/dev-libs/gjs/gjs-1.68.3.ebuild b/dev-libs/gjs/gjs-1.68.3.ebuild
deleted file mode 100644
index 433139d0b4bd..000000000000
--- a/dev-libs/gjs/gjs-1.68.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org meson virtualx
-
-DESCRIPTION="Javascript bindings for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
-
-LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
-SLOT="0"
-IUSE="+cairo examples gtk readline sysprof test"
-KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.66.0
-	dev-libs/libffi:=
-	>=dev-libs/gobject-introspection-1.66.1:=
-	dev-lang/spidermonkey:78
-	cairo? ( x11-libs/cairo[X,svg] )
-	readline? ( sys-libs/readline:0= )
-"
-DEPEND="${RDEPEND}
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
-	test? ( sys-apps/dbus
-		>=x11-libs/gtk+-3.20:3[introspection] )
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_configure() {
-	# FIXME: add systemtap/dtrace support, like in glib:2
-	local emesonargs=(
-		$(meson_feature cairo)
-		$(meson_feature readline)
-		$(meson_feature sysprof profiler)
-		-Dinstalled_tests=false
-		$(meson_use !test skip_dbus_tests)
-		$(meson_use !test skip_gtk_tests)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
diff --git a/dev-libs/gjs/gjs-1.70.0.ebuild b/dev-libs/gjs/gjs-1.70.0.ebuild
index 6560dd57d686..1322c5b817b2 100644
--- a/dev-libs/gjs/gjs-1.70.0.ebuild
+++ b/dev-libs/gjs/gjs-1.70.0.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
@@ -31,10 +31,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	"${FILESDIR}/gjs-1.70.0-meson-0.60.2.patch"
-)
-
 src_configure() {
 	append-cppflags -DG_DISABLE_CAST_CHECKS
 
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 35c8befd98a0..2b9b460c242f 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,8 +1,6 @@
 AUX glib-2.64.1-mark-gdbus-server-auth-test-flaky.patch 842 BLAKE2B 6b2eb57b8923c8bb54ead80d829aeb7a5c8a42c62e960e7305bc3fad69c67fd21e1c9f20b5c9002c0319cf3d77992b9cb71912c9b813b723e0a56aaea38330ad SHA512 ccd92d2f1fd495618ac788ffe6b69acec05a521a0ee8ff2bacb1dce6e283a04bbc2a10e61b37fc29f3893003fa154fa0d30bc37ed266b3f813200cd8ed17c116
-DIST glib-2.68.4.tar.xz 4945212 BLAKE2B 2135e2bea778714494b9f3ef140f20639f95dd347c9025e5663ca8f493092cd2723aba6520bb4f85687491794353685eccacc4dd34339962e5cb717e6130c025 SHA512 be17d79b41d17fd2b144184d6e793180667b7d9ba299215ea6d4948b4c05f6d888b4868c48643e25935a34ee2f85ee1d03e53325151b7a61819437cbd3c84b10
-DIST glib-2.70.0.tar.xz 4796812 BLAKE2B de393961c8c2b98fadc1cc0a3647de4fb9d54193e000005c847468e48baa30abcc518d94e1aaa69e09414ee0218c5502f872e08818bcc404aa0c61f94fe2c156 SHA512 fd3fcaebd34aebe0e63f9dc915b2df026a3f88a5c2254e9f17beea0a59ab0ac563976fca54eb57bd2f7af183c4ae76fb86f05951216bf4159d258b5e7b29696f
 DIST glib-2.70.2.tar.xz 4822356 BLAKE2B 63b1f4e05f26cd51c3345bb042e2175ebcdb22afa3fef85bccae530581a378070e6c7ea48eb957bcc73142ea228ddb70bdac2679ca2f81155a668560397aaa37 SHA512 872e3f06f87f21a32446b41aac7454fd6bf4d665c753121f6e9772cddebc592b79d88713fc6b8d510636af9f9c4528a9d508d8c4225c6dfeb928390120fb4809
-EBUILD glib-2.68.4.ebuild 10131 BLAKE2B 9ac9d90b807c36b50f37776ef8f4a1d793db908ef8610133d673f981bf0abfe3a82a9db5f8be8f1743de84f5214a0024cc631ebcdd725b3a89dfe40ae5ede65b SHA512 229e87ab89c14821986221970d21e56382a4d03d902280cb3008588d86cd79210f43dc6315993aad70944be0370f5628a4ff216a9a47a54f8af5fc022696f3c8
-EBUILD glib-2.70.0.ebuild 10115 BLAKE2B e769c96dbdeb0f90660a9b3e408434ebdfb22202497911692eec8179135a0b84192f8b6dd3b9206e46aaaee4e01c963ac92783c612db276dd36678dd9bb7b255 SHA512 6d1de5ee8572e91f83a7a7a31c2b7bfceff7a3f60f0685c14d32c4e8025253b3995ccacce5bff764a95cf720554a72164fd7875f50a353de7dd769243480b163
-EBUILD glib-2.70.2.ebuild 10115 BLAKE2B e769c96dbdeb0f90660a9b3e408434ebdfb22202497911692eec8179135a0b84192f8b6dd3b9206e46aaaee4e01c963ac92783c612db276dd36678dd9bb7b255 SHA512 6d1de5ee8572e91f83a7a7a31c2b7bfceff7a3f60f0685c14d32c4e8025253b3995ccacce5bff764a95cf720554a72164fd7875f50a353de7dd769243480b163
+DIST glib-2.70.3.tar.xz 4824700 BLAKE2B ba84333b3ad27c0092ebd8bfe31a522d30ef8b18e7483123da6e353bb572f8a58307e23758e93ac95eb781b4d5ff86f20d84eedc1ac6e72af85822f2891bcea0 SHA512 d0e58ea71575e30707b6eda0a5231bc9bd202bcd7a0293fed9e378252a9e430e219b82cd8a12eaab41bb0a0605bb9f3a1cdb8db6766cd42bac8ca9bd9885b80a
+EBUILD glib-2.70.2.ebuild 10107 BLAKE2B 119f2c3b999daec1c9f06be38ddf4ffe5e454ab8a150e73de2750af51c8c6bd08e3bf058f163dde7441b64a6ba19b5ca3b170fd3d0d44e373f3b9ec05ae3a420 SHA512 445932aa03eed856953f0882f310a2adbce4d2261963fddf34d3f11958953ce481971a4aa6cfede3b888ab0fe80c8deae72b4c094102e662e2eb45448a1c713c
+EBUILD glib-2.70.3.ebuild 10115 BLAKE2B e769c96dbdeb0f90660a9b3e408434ebdfb22202497911692eec8179135a0b84192f8b6dd3b9206e46aaaee4e01c963ac92783c612db276dd36678dd9bb7b255 SHA512 6d1de5ee8572e91f83a7a7a31c2b7bfceff7a3f60f0685c14d32c4e8025253b3995ccacce5bff764a95cf720554a72164fd7875f50a353de7dd769243480b163
 MISC metadata.xml 1221 BLAKE2B 517c6f9ee14ccac7192d7c1189773ec6e034bc638a8acd28081a604f8516ee639f43c82ca3233d513dbfd06db714358e396f2c4cd906715bb0950f130974ab9e SHA512 0c4203b3c9d8b91eebe4ee54f34d1aae26e5efa4c791760559b18b58d90b508936ead62ee8df81e6777ad8e0cb0e9c68d504d0f24ecd5903d4e3df89c6cc0bdf
diff --git a/dev-libs/glib/glib-2.68.4.ebuild b/dev-libs/glib/glib-2.68.4.ebuild
deleted file mode 100644
index 692ee586d083..000000000000
--- a/dev-libs/glib/glib-2.68.4.ebuild
+++ /dev/null
@@ -1,283 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-IUSE="dbus debug +elf fam gtk-doc +mime selinux static-libs sysprof systemtap test utils xattr"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="gtk-doc? ( test )" # Bug #777636
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-# * elfutils (via libelf) does not build on Windows. gresources are not embedded
-# within ELF binaries on that platform anyway and inspecting ELF binaries from
-# other platforms is not that useful so exclude the dependency in this case.
-# * Technically static-libs is needed on zlib, util-linux and perhaps more, but
-# these are used by GIO, which glib[static-libs] consumers don't really seem
-# to need at all, thus not imposing the deps for now and once some consumers
-# are actually found to static link libgio-2.0.a, we can revisit and either add
-# them or just put the (build) deps in that rare consumer instead of recursive
-# RDEPEND here (due to lack of recursive DEPEND).
-RDEPEND="
-	!<dev-util/gdbus-codegen-${PV}
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/libpcre-8.31:3[${MULTILIB_USEDEP},static-libs?]
-	>=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
-	kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] )
-	selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
-	xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) )
-	elf? ( virtual/libelf:0= )
-	fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-# libxml2 used for optional tests that get automatically skipped
-BDEPEND="
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=sys-devel/gettext-0.19.8
-	gtk-doc? ( >=dev-util/gtk-doc-1.33
-		app-text/docbook-xml-dtd:4.2
-		app-text/docbook-xml-dtd:4.5 )
-	systemtap? ( >=dev-util/systemtap-1.3 )
-	${PYTHON_DEPS}
-	test? ( >=sys-apps/dbus-1.2.14 )
-	virtual/pkgconfig
-"
-# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen
-
-PDEPEND="
-	dbus? ( gnome-base/dconf )
-	mime? ( x11-misc/shared-mime-info )
-"
-# shared-mime-info needed for gio/xdgmime, bug #409481
-# dconf is needed to be able to save settings, bug #498436
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gio-querymodules$(get_exeext)
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch
-)
-
-pkg_setup() {
-	if use kernel_linux ; then
-		CONFIG_CHECK="~INOTIFY_USER"
-		if use test ; then
-			CONFIG_CHECK="~IPV6"
-			WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
-		fi
-		linux-info_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	if use test; then
-		# TODO: Review the test exclusions, especially now with meson
-		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
-		if ! has_version dev-util/desktop-file-utils ; then
-			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
-			ewarn "think on installing it to get these tests run."
-			sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
-			sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
-		fi
-
-		# gdesktopappinfo requires existing terminal (gnome-terminal or any
-		# other), falling back to xterm if one doesn't exist
-		#if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
-		#	ewarn "Some tests will be skipped due to missing terminal program"
-		# These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson
-		# Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready for backport (or in a bump) and file new issue if still fails
-		sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
-		# desktop-app-info/launch* might fail similarly
-		sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die
-		#fi
-
-		# https://bugzilla.gnome.org/show_bug.cgi?id=722604
-		sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
-		sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
-
-		ewarn "Tests for search-utils have been skipped"
-		sed -i -e "/search-utils/d" glib/tests/meson.build || die
-
-		# Play nice with network-sandbox, but this approach would defeat the purpose of the test
-		#sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die
-	else
-		# Don't build tests, also prevents extra deps, bug #512022
-		sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die
-	fi
-
-	# Don't build fuzzing binaries - not used
-	sed -i -e '/subdir.*fuzzing/d' meson.build || die
-
-	# gdbus-codegen is a separate package
-	sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die
-
-	# Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon
-	sed -i -e '/install_dir/d' gio/tests/meson.build || die
-
-	cat > "${T}/glib-test-ld-wrapper" <<-EOF
-		#!/usr/bin/env sh
-		exec \${LD:-ld} "\$@"
-	EOF
-	chmod a+x "${T}/glib-test-ld-wrapper" || die
-	sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die
-
-	xdg_src_prepare
-	gnome2_environment_reset
-	# TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only
-}
-
-multilib_src_configure() {
-	if use debug; then
-		append-cflags -DG_ENABLE_DEBUG
-	else
-		append-cflags -DG_DISABLE_CAST_CHECKS # https://gitlab.gnome.org/GNOME/glib/issues/1833
-	fi
-
-	# TODO: figure a way to pass appropriate values for all cross properties that glib uses (search for get_cross_property)
-	#if tc-is-cross-compiler ; then
-		# https://bugzilla.gnome.org/show_bug.cgi?id=756473
-		# TODO-meson: This should be in meson cross file as 'growing_stack' property; and more, look at get_cross_property
-		#case ${CHOST} in
-		#hppa*|metag*) export glib_cv_stack_grows=yes ;;
-		#*)            export glib_cv_stack_grows=no ;;
-		#esac
-	#fi
-
-	local emesonargs=(
-		-Ddefault_library=$(usex static-libs both shared)
-		$(meson_feature selinux)
-		$(meson_use xattr)
-		-Dlibmount=enabled # only used if host_system == 'linux'
-		-Dinternal_pcre=false
-		-Dman=true
-		$(meson_use systemtap dtrace)
-		$(meson_use systemtap)
-		$(meson_feature sysprof)
-		$(meson_native_use_bool gtk-doc gtk_doc)
-		$(meson_use fam)
-		$(meson_use test tests)
-		-Dinstalled_tests=false
-		-Dnls=enabled
-		-Doss_fuzz=disabled
-		$(meson_native_use_feature elf libelf)
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	export XDG_CONFIG_DIRS=/etc/xdg
-	export XDG_DATA_DIRS=/usr/local/share:/usr/share
-	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
-	export LC_TIME=C # bug #411967
-	unset GSETTINGS_BACKEND # bug #596380
-	python_setup
-
-	# Related test is a bit nitpicking
-	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-	chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-
-	meson_src_test --timeout-multiplier 2 --no-suite flaky
-}
-
-multilib_src_install() {
-	meson_src_install
-	keepdir /usr/$(get_libdir)/gio/modules
-}
-
-multilib_src_install_all() {
-	# These are installed by dev-util/glib-utils
-	# TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit now with meson
-	rm "${ED}/usr/bin/glib-genmarshal" || die
-	rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die
-	rm "${ED}/usr/bin/glib-mkenums" || die
-	rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die
-	rm "${ED}/usr/bin/gtester-report" || die
-	rm "${ED}/usr/share/man/man1/gtester-report.1" || die
-	# gdbus-codegen manpage installed by dev-util/gdbus-codegen
-	rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	# Make gschemas.compiled belong to glib alone
-	local cache="/usr/share/glib-2.0/schemas/gschemas.compiled"
-
-	if [[ -e ${EROOT}${cache} ]]; then
-		cp "${EROOT}"${cache} "${ED}"/${cache} || die
-	else
-		touch "${ED}"${cache} || die
-	fi
-
-	multilib_pkg_preinst() {
-		# Make giomodule.cache belong to glib alone
-		local cache="/usr/$(get_libdir)/gio/modules/giomodule.cache"
-
-		if [[ -e ${EROOT}${cache} ]]; then
-			cp "${EROOT}"${cache} "${ED}"${cache} || die
-		else
-			touch "${ED}"${cache} || die
-		fi
-	}
-
-	# Don't run the cache ownership when cross-compiling, as it would end up with an empty cache
-	# file due to inability to create it and GIO might not look at any of the modules there
-	if ! tc-is-cross-compiler ; then
-		multilib_foreach_abi multilib_pkg_preinst
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	# glib installs no schemas itself, but we force update for fresh install in case
-	# something has dropped in a schemas file without direct glib dep; and for upgrades
-	# in case the compiled schema format could have changed
-	gnome2_schemas_update
-
-	multilib_pkg_postinst() {
-		gnome2_giomodule_cache_update \
-			|| die "Update GIO modules cache failed (for ${ABI})"
-	}
-	if ! tc-is-cross-compiler ; then
-		multilib_foreach_abi multilib_pkg_postinst
-	else
-		ewarn "Updating of GIO modules cache skipped due to cross-compilation."
-		ewarn "You might want to run gio-querymodules manually on the target for"
-		ewarn "your final image for performance reasons and re-run it when packages"
-		ewarn "installing GIO modules get upgraded or added to the image."
-	fi
-
-	for v in ${REPLACING_VERSIONS}; do
-		if ver_test "$v" "-lt" "2.63.6"; then
-			ewarn "glib no longer installs the gio-launch-desktop binary. You may need"
-			ewarn "to restart your session for \"Open With\" dialogs to work."
-		fi
-	done
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-
-	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		multilib_pkg_postrm() {
-			rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache
-		}
-		multilib_foreach_abi multilib_pkg_postrm
-		rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled
-	fi
-}
diff --git a/dev-libs/glib/glib-2.70.2.ebuild b/dev-libs/glib/glib-2.70.2.ebuild
index 3db8a09e3f72..2019f4a6893a 100644
--- a/dev-libs/glib/glib-2.70.2.ebuild
+++ b/dev-libs/glib/glib-2.70.2.ebuild
@@ -15,7 +15,7 @@ IUSE="dbus debug +elf fam gtk-doc +mime selinux static-libs sysprof systemtap te
 RESTRICT="!test? ( test )"
 REQUIRED_USE="gtk-doc? ( test )" # Bug #777636
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 # * elfutils (via libelf) does not build on Windows. gresources are not embedded
 # within ELF binaries on that platform anyway and inspecting ELF binaries from
diff --git a/dev-libs/glib/glib-2.70.0.ebuild b/dev-libs/glib/glib-2.70.3.ebuild
index 3db8a09e3f72..3db8a09e3f72 100644
--- a/dev-libs/glib/glib-2.70.0.ebuild
+++ b/dev-libs/glib/glib-2.70.3.ebuild
diff --git a/dev-libs/gobject-introspection-common/Manifest b/dev-libs/gobject-introspection-common/Manifest
index a36728d5905b..a2d0a3927a0a 100644
--- a/dev-libs/gobject-introspection-common/Manifest
+++ b/dev-libs/gobject-introspection-common/Manifest
@@ -1,5 +1,3 @@
-DIST gobject-introspection-1.68.0.tar.xz 1019732 BLAKE2B 2f99cc9cec5ea05f1a5fa4473d1ad424cc1f6b097075f798e89cf740519db180417a3f0de37afc8a0cf0771436a9d9f7d6193b69289dfb47ec077d33a7d27c91 SHA512 d2e64c119aa500b624a57baa2cebe9126ab100003d98b771f4fb51cf92748635de352997f702f40656f7c665f3dfedfbfa19912cc7a2d039d254555243bbc381
 DIST gobject-introspection-1.70.0.tar.xz 1029372 BLAKE2B a649ea77b2b7ca392202e21a7f4814aafe57afea7fedb39e78f1df1cd97d0437207c3807a51ece6c9e9bce51fdf961ee7438ccd4efd84b45dbdb57ae19a39272 SHA512 216b376ed423f607e36c723dd6b67975dbfb63c253f2d8bd0b3661e3d69f8c8059cf221db8c5260b0262fad1b7d738f3b2e5fbd51fdbc31e40ccb115c209baf0
-EBUILD gobject-introspection-common-1.68.0.ebuild 934 BLAKE2B d3c587bb7e72a9f43887f1b24c0acfa7f41efa1da917d87a324dac1332000e6a79a774611dffbe4edb889554bb2674bac8d0ae655c8e2666a474d7dfbe916c48 SHA512 39db2039abe991a4e52b5031c8908199985fd475476d8ffb9c740c2c3905df165815188bf0a2700d9e3c8c51939d26c362cba501b5208b1f0ad92a14fb85bed6
-EBUILD gobject-introspection-common-1.70.0.ebuild 942 BLAKE2B 083b78fb09d8c47a080a1eb7628e8b4f4061d3f21b5e03d29c09a3b15213f137b60e1a7d5a46c1867e258f851a76beaaafac9d0894930e6241db812589faa0da SHA512 89f61922204bdc2d672e060e2d0c2720d841042d065573cdb3cf0c271b2d3c327b7157f205b297602509b01acb0712d6e08df3f5941e13aa564134f8889cd40c
+EBUILD gobject-introspection-common-1.70.0.ebuild 934 BLAKE2B 3a49082633ebc991738de116d9a584b06165470da627646053bcae261ec625d77dd1dd5ebca2f1221a10c5479d29eec04ce34fcf10ee36ba195c9c124ba3e402 SHA512 06bd2fc8fa63bcbb09834751275355d30c9e63799a09a4af259f3d4fe88491246cf224025ef223d231a16208ff0a7fec45ae9f622d96e00a6acf9ff9d9006d45
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.68.0.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.68.0.ebuild
deleted file mode 100644
index ce767c863369..000000000000
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.68.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME_ORG_MODULE="gobject-introspection"
-
-inherit gnome.org
-
-DESCRIPTION="Build infrastructure for GObject Introspection"
-HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="!<${CATEGORY}/${GNOME_ORG_MODULE}-${PV}"
-# Use !<${PV} because mixing gobject-introspection with different version of -common can cause issues like:
-# https://forums.gentoo.org/viewtopic-p-7421930.html
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/aclocal
-	doins m4/introspection.m4
-
-	insinto /usr/share/gobject-introspection-1.0
-	doins Makefile.introspection
-}
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.70.0.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.70.0.ebuild
index b34baf454cc7..7a93928973b3 100644
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.70.0.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.70.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="!<${CATEGORY}/${GNOME_ORG_MODULE}-${PV}"
diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest
index a2d946a8db6b..e61fb894b018 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -1,5 +1,4 @@
-DIST gobject-introspection-1.68.0.tar.xz 1019732 BLAKE2B 2f99cc9cec5ea05f1a5fa4473d1ad424cc1f6b097075f798e89cf740519db180417a3f0de37afc8a0cf0771436a9d9f7d6193b69289dfb47ec077d33a7d27c91 SHA512 d2e64c119aa500b624a57baa2cebe9126ab100003d98b771f4fb51cf92748635de352997f702f40656f7c665f3dfedfbfa19912cc7a2d039d254555243bbc381
+DIST gobject-introspection-1.70.0-meson-0.61.patch.bz2 4211 BLAKE2B 0453266900dfdf24da3531d205fe03d8eb5f6e3d76db4b945852453dc46d26a77449f0ddd81bad6df6d8108d8a7369b60a07b7c4f8e0c01811f735da76cf4d56 SHA512 ba5861baaabfe20185d85ccbc02425d1e44c525a5d05c28ee84552c43ab30497bed4e713e6f1b2f9c6508714020b04b5228532e1489e8a732ba99ea61ca950c7
 DIST gobject-introspection-1.70.0.tar.xz 1029372 BLAKE2B a649ea77b2b7ca392202e21a7f4814aafe57afea7fedb39e78f1df1cd97d0437207c3807a51ece6c9e9bce51fdf961ee7438ccd4efd84b45dbdb57ae19a39272 SHA512 216b376ed423f607e36c723dd6b67975dbfb63c253f2d8bd0b3661e3d69f8c8059cf221db8c5260b0262fad1b7d738f3b2e5fbd51fdbc31e40ccb115c209baf0
-EBUILD gobject-introspection-1.68.0.ebuild 1967 BLAKE2B 5a7638715ade0a4af714a6feecbe872fe8df62a314043b0393f7ef8a4e2be34685b612be972e62edcad86a10d5ffb4cdf2de6fcf9751c6b742f0e9ae5e39466a SHA512 7931985241ce62bba4cd22ff0ba43d243447b7ef283e96c1259d44ab32ca20ddf4e05f19fba15adae8135e41b65f16c58a0c39a0b7a6498f4350ff605ac4432f
-EBUILD gobject-introspection-1.70.0.ebuild 1975 BLAKE2B bd423cb18551ae2ac014a26a7301408359718ee34aa1a8b8b2bb6c9dcebbbbebf20be4e8124fdf337fbd6de8e3018b2b2a975f76cc9235d6aa77998be45bb290 SHA512 3438047f8289d68db48810b1c3cc2f4b316be04a2cee9d21edb74dfbe04c37d42f8de2a16e7cb27bf6352d14cf23bdcf97851f2e8f18ecf9dbd85d0823e7287f
+EBUILD gobject-introspection-1.70.0.ebuild 2110 BLAKE2B 5a65ca353c979fee0d42fbf192596164bd496c57fd927dc4e20c1857dd6c0e95d8bd1d6911a322d4d833ad06d494d1106564335b03fd78e61e12527c226e658c SHA512 7d901990312e02b23d9cfc895e4082b266eb9f0cc794d5f5bb873080a1b9519d5a43bde87ebae4b098beb704eb448f048dd7eee950edc7ae18453f7c9b693cbc
 MISC metadata.xml 368 BLAKE2B 5734e81d2929cef33ae5a3e57d48717f2079944a26a34206d0c674a607068047e24c17e76435683dd6f9b369ba8abcbd6ff98037ba219e7f4ea8225d3980a3eb SHA512 e8a3b181add420cbfbffa78ba6a8bf7d7b82593ba9a54e89e52a9d0eb3a7c92f577d71080912067c16364e267bb1438ba1c8839ed62af24da39cc9e1b6f7d864
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.68.0.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.68.0.ebuild
deleted file mode 100644
index 4b0b0e3d8c84..000000000000
--- a/dev-libs/gobject-introspection/gobject-introspection-1.68.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
-inherit gnome.org meson python-single-r1 xdg
-
-DESCRIPTION="Introspection system for GObject-based libraries"
-HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
-
-LICENSE="LGPL-2+ GPL-2+"
-SLOT="0"
-IUSE="doctool gtk-doc test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# virtual/pkgconfig needed at runtime, bug #505408
-RDEPEND="
-	>=dev-libs/gobject-introspection-common-${PV}
-	>=dev-libs/glib-2.58.0:2
-	dev-libs/libffi:=
-	doctool? (
-		$(python_gen_cond_dep '
-			dev-python/mako[${PYTHON_USEDEP}]
-			dev-python/markdown[${PYTHON_USEDEP}]
-		')
-	)
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-"
-# Wants real bison, not virtual/yacc
-DEPEND="${RDEPEND}
-	gtk-doc? ( >=dev-util/gtk-doc-1.19
-		app-text/docbook-xml-dtd:4.3
-		app-text/docbook-xml-dtd:4.5
-	)
-	sys-devel/bison
-	sys-devel/flex
-	test? (
-		x11-libs/cairo[glib]
-		$(python_gen_cond_dep '
-			dev-python/mako[${PYTHON_USEDEP}]
-			dev-python/markdown[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature test cairo)
-		$(meson_feature doctool)
-		#-Dglib_src_dir
-		$(meson_use gtk-doc gtk_doc)
-		#-Dcairo_libname
-		-Dpython="${EPYTHON}"
-		#-Dgir_dir_prefix
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	python_fix_shebang "${ED}"/usr/bin/
-	python_optimize "${ED}"/usr/$(get_libdir)/gobject-introspection/giscanner
-
-	# Prevent collision with gobject-introspection-common
-	rm -v "${ED}"/usr/share/aclocal/introspection.m4 \
-		"${ED}"/usr/share/gobject-introspection-1.0/Makefile.introspection || die
-	rmdir "${ED}"/usr/share/aclocal || die
-}
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.70.0.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.70.0.ebuild
index fed69d6f20c8..6ee20137414c 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.70.0.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.70.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,13 +9,14 @@ inherit gnome.org meson python-single-r1 xdg
 
 DESCRIPTION="Introspection system for GObject-based libraries"
 HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-meson-0.61.patch.bz2"
 
 LICENSE="LGPL-2+ GPL-2+"
 SLOT="0"
 IUSE="doctool gtk-doc test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # virtual/pkgconfig needed at runtime, bug #505408
 RDEPEND="
@@ -48,6 +49,10 @@ DEPEND="${RDEPEND}
 	)
 "
 
+PATCHES=(
+	"${WORKDIR}"/${P}-meson-0.61.patch
+)
+
 pkg_setup() {
 	python-single-r1_pkg_setup
 }
diff --git a/dev-libs/granite/Manifest b/dev-libs/granite/Manifest
index dfc9a6aa0c99..67373b48018b 100644
--- a/dev-libs/granite/Manifest
+++ b/dev-libs/granite/Manifest
@@ -4,4 +4,4 @@ DIST granite-6.2.0.tar.gz 462780 BLAKE2B bb0df3649eab212e36a20ebd365521fc4ad87d1
 EBUILD granite-5.2.5-r1.ebuild 1860 BLAKE2B 2d1137832f99c220ce6893bcbc7af6ca471551bd35d9890837aab0f4d5938c7d6f418a47f869d8f729f4145cbdd099aa9796e3de96181e76ecda8f748fc2ef7c SHA512 711548b6e8a56962667195b4f67a55acd125fbcf0751a9e4d08c647ec978db88f50cf1be60d3a064586f3ed30955a5055b7dafb16b439ff19ef6e26eac028de6
 EBUILD granite-6.0.0.ebuild 823 BLAKE2B e051f2c4f1a94f4f921c0c663d0bd170894e271a79f4257603481ca232529564e28ec3a3898afe1fd5a549e6062e394321a61b8448660f85bf802cb4dbb9b8c0 SHA512 e92cf9409375b504fab7a9c7b555b2b4a1268b2736f1df1c5e61766d65dda7c7f8415b5cbded19f89b05facc8444bba5455a10557b8eda5cf7668f17450e5445
 EBUILD granite-6.2.0.ebuild 832 BLAKE2B 634804328cd13c8f2708671ab8b301b525991b7efc3ebb6a92bfdac5beb362ce6d4396fba59c2ad0d6480e228f2bce686247b10d8d04515c8d0bb83c9c856859 SHA512 1e78d6303fba5ad2ad000be62ad48dee42e235ea7aff6d87c6628c00aac6535f9f5fd9486db31f57ac8d30adf754437dd8849e602cecf306b7289ce72de984f0
-MISC metadata.xml 575 BLAKE2B 3cd927e8e8857da5988748e9bc4c9532afafeab6f336a0c30afd8e988d94881cceb02650c11ca005f9aeb37c79d92756f8472a16c005a5cab231306a6ca1a204 SHA512 0967bfa3f2aa54be8b69bdb75ac907d3c4b60c8e457970a13d9fc75cce90d86666cd596e57f382402042c3aa63b8e8df4409ed84fa1ac1a58fdab5b641d42ab6
+MISC metadata.xml 484 BLAKE2B 0b56407ec0118795843ac13ae707945da367e808b60dc690cdd5321a4fbcd75ce5bdc9b0f6a4d92ac09e3130a205f479f634119f13055350acaee5ecb916179c SHA512 c6f54c31c4f915fac10b50c0cf20eaa1ded22abe5d80b73e29fd008d29f327e6163950bee28872fa5a376109dff74ce6b561e884a91ecbd762849329b3797611
diff --git a/dev-libs/granite/metadata.xml b/dev-libs/granite/metadata.xml
index c30cfb603e40..b44c37948b52 100644
--- a/dev-libs/granite/metadata.xml
+++ b/dev-libs/granite/metadata.xml
@@ -2,11 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 
 <pkgmetadata>
-  <maintainer type="person">
-    <email>xgqt@gentoo.org</email>
-    <name>Maciej Barć</name>
-  </maintainer>
-  <longdescription lang="en">
+  <!-- maintainer-needed -->
+  <longdescription>
     Granite is a companion library for GTK+ and GLib.
     Among other things, it provides complex widgets and convenience
     functions designed for use in apps built for elementary OS.
diff --git a/dev-libs/half/Manifest b/dev-libs/half/Manifest
index f1904094a5ac..65047ecb42e9 100644
--- a/dev-libs/half/Manifest
+++ b/dev-libs/half/Manifest
@@ -1,3 +1,3 @@
 DIST half-1.12.0.tar.gz 108704 BLAKE2B f0084f380b10485b30da3ff38c5e3098044cc21fe00b084b2b9dd69b9a5c06b2ddedae1cefa61197d74a14552da2e5648db3e3108044b5fc5f7975fa1e10c6d4 SHA512 152f9c08a4493662aed96ddce5d45ece94836727766a66060640f8f1f43ee6ecdb174e7e17421ba83f2a01ba836bb1cba9fe60d83aea517f4772b9038173274b
 EBUILD half-1.12.0.ebuild 408 BLAKE2B 7fc14f4d670525c623c553df33ac5601e8856a0774038d6b01b35a2a98c8f6c7bf3ed007e3fd27ea1311eced1d038308b28fdf5c1b083eb33f125461739f06cf SHA512 a0cc47409428a44014412c242901b10242bf7797eec1ef2ff80429243f4270d9c9414664900c2b9c2a3f01222a76db0711af15ac34f4b2fc6ea7f4dca2d4de8b
-MISC metadata.xml 452 BLAKE2B a5cb97ebc54cd63cd0f83b12d12d5be16e732e8151bdddfe1cd23655f8f271e7df45441268bc9a0d25c211c49dfcd6ce3901f0684ce43156514e78eab5e80058 SHA512 7e94c60c456503b4fe4f351ac322fae0ee5c3db8a43b43ba1a5aefb23d45495135d8370e82f1f5b8431fc12bef2f94a4f8c9bae2b0a28b25a621ed0684c424b3
+MISC metadata.xml 453 BLAKE2B 4c1e76cbc277e93a92a95cda405973cc72863882ab9a6729a07976e7815119e985688387c14fc5017fd6e85aaa64eaa72b900375c7f7428eb6bbb2569c5ecaa6 SHA512 0e42066a5ac8720d1b561bcf23269013d9cceff52a9ddd6a6e0af58c7d2628c335bb290e0dc6c262a0542e286f54fd07cb487dd908343fac5cfca07410df6e56
diff --git a/dev-libs/half/metadata.xml b/dev-libs/half/metadata.xml
index da47ad0ef39f..e74d41fd607c 100644
--- a/dev-libs/half/metadata.xml
+++ b/dev-libs/half/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
     <email>sci@gentoo.org</email>
diff --git a/dev-libs/imath/Manifest b/dev-libs/imath/Manifest
index 3b46ed380dd3..41c7e499ad87 100644
--- a/dev-libs/imath/Manifest
+++ b/dev-libs/imath/Manifest
@@ -1,6 +1,7 @@
 AUX imath-3.1.1-0001-changes-needed-for-proper-slotting.patch 7206 BLAKE2B b812c30370a0022824fe8d251e26ce63abc0ba3f970059336cd8402f899ecae456982e4a3cda0e152323005d5eba3adaeee47bbacf78084ae3dbafa5bd0a89f2 SHA512 5df522b31043cbfcaa21c5fca4e4d6866f3ed93530fd0beba81d2c6c684003cf3214e3e011816996e76e177cdb60d1aec584c454664362e6079f1efaf9e857d7
-DIST imath-3.1.1.tar.gz 568231 BLAKE2B a1210b5f6ff4723a133d317c2b40338e387973a1409868a218192a53778b86a0912c77911bdf76286a6ed6931175aec38bf24ddc0c76eed3375b7a2945dba124 SHA512 b2f4cc21e44094ef139a1f04bb997c7e41770ff886457fff00d65ca477ba579c86fd5fbd465998c4519855fcb34328ac834d84d0d011f758f56a20ef79e9ca3d
+AUX imath-3.1.4-Gentoo-specific-changes-needed-for-slotting.patch 6000 BLAKE2B 0001b8bbc7ae4ec7a3bc76ca86119ee1be3324feaacd35f84741f96b4f512e3a83c2e9f0f609d6cf49687bbf76a9fe4f87a73a9ca8f6fc9b4963fdcebba2d318 SHA512 01fdf04b94c3c0e89b69abd828185be1aeb4b916eab5fbf480f04d3179414bfecc1d5cff01f05870370c0d7b688ae551ee32c99fde539e2c1c57135a41676174
 DIST imath-3.1.3.tar.gz 570840 BLAKE2B b037c9bdee87f58c7a2be9dbda52c89c26eba25fe07342710578f9eef4b90a49b9d5dc5451702c960ae94427d7f748b79b81b7fc9ad350d2252e9e4bf6a1d6cc SHA512 a11f5e736bc49098d735c7903f186c15b03efbec082a8cf2e6635546368035cec0d36c7ae64bfd01bd8eeffb2dd247b8dab19e440a3e1fe33008edacc1268f75
-EBUILD imath-3.1.1.ebuild 2244 BLAKE2B 0a6595a5db890c06428fae0d14b119670a579f30ac71634b95219605199bc3f55217751141c15114f4a31951d7e4b5b9a1a5dcbfaeece7c4df472c5dfe0b6d2c SHA512 ffab0af19982601872a6fd40f75e2a4ac84bf652efdb65a1809a227ed411aa651fdd615c3afce7139ac53ba925ab7b2cb6ca5e4e3e380a40865bf045c5d80747
-EBUILD imath-3.1.3.ebuild 2027 BLAKE2B 8f7f4b72076fc396d06d7c167e0a38f8f0ef3b57c8289c3d459b95d08f2e1bb1c98acf92178f37fb73d66262008adf8e7736b3f8e0a2b52e9560eb4984e7e410 SHA512 a8f3a5607ad6d3b3d436be442e3794e93e5ea054131533e71061d8353fcd5e0d09cb8c0813770b16efc165fe89f55e093321137f79af15d86c79fbbb033ab55f
+DIST imath-3.1.4.tar.gz 572214 BLAKE2B 6d67f542256e44f9ba6f30ae7d22a37dbf3cd1e49992fb8b0e2264d51d47e9c2297940b3a484e1f59bd8b251e8ef42d81ae88282d0769c111b3cd84cd0a9354e SHA512 f9f7d8ec333e6383191543ee927dc40e870a6330225b01070bb93ad3d149c5e31bd5989d4dc52f3321490c1c5a7cab55582c6e42e34ab4ca5723170e7578e286
+EBUILD imath-3.1.3.ebuild 2025 BLAKE2B 0b0eb714cc883281fe83cc56f7522dda57204e9db504485e5977bd7440e28ff839fe8d3e9f2a078d2bb09d1798e3dd8434766fe2ea39dff233a0262671b00358 SHA512 6a10836c93fde13fc183eaa3dc3419cc05ee76bdf405e88cd0d5da53de4160a800b0b232cd8f3eed07fe405dae77656841bb1d2c9777cc369f9086f9d87c17d8
+EBUILD imath-3.1.4.ebuild 1964 BLAKE2B bdc9475f6d32d95b3b11fde3eee0ff2aed71b81eaff22eac5dc1e757dd1bfa4bc722704b7a140da68979092b1e9734c030fdd79c96fb6512dc8c1971205568de SHA512 9e309e80b8b504b379fb9f3ae24a8975c024795e84098d9dccd37e646099f6179e94a9565eb53a6e987eb78097d9e318fda2ece338367a039c66550fdb5ce92f
 MISC metadata.xml 820 BLAKE2B f035962970166d4c636e8b98b9301e31fbc27aecb7059289a7581958619b85c7f60551d56175637d373363a41c7349c8c78ec31348590826313bdca94aec6727 SHA512 9dbff2f917f1705a611680c46f73a0ad372f27f6b5c236f691f16b6c41a51cb3d8712c4bceddb5469742f4952385e2a2b07377c4c216736810562ae89c5c52f4
diff --git a/dev-libs/imath/files/imath-3.1.4-Gentoo-specific-changes-needed-for-slotting.patch b/dev-libs/imath/files/imath-3.1.4-Gentoo-specific-changes-needed-for-slotting.patch
new file mode 100644
index 000000000000..9d384d1d0a7b
--- /dev/null
+++ b/dev-libs/imath/files/imath-3.1.4-Gentoo-specific-changes-needed-for-slotting.patch
@@ -0,0 +1,129 @@
+From ca68d34843ce4ef4b03d2b50d20f83329e3d0933 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Tue, 25 Jan 2022 06:25:51 +0100
+Subject: [PATCH] [Gentoo specific] changes needed for slotting
+
+Patches some cases to set the path according to the install
+locations, which are different than upstream default to
+respect slotted installations.
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+--- a/config/CMakeLists.txt
++++ b/config/CMakeLists.txt
+@@ -60,7 +60,7 @@ include(CMakePackageConfigHelpers)
+ 
+ configure_package_config_file(ImathConfig.cmake.in
+   ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
+-  INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
++  INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR}
+ )
+ 
+ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
+@@ -70,11 +70,11 @@ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
+ 
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
+               ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
+-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
++  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR}
+ )
+ 
+ install(EXPORT ${PROJECT_NAME}
+-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
++  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR}
+   FILE ${PROJECT_NAME}Targets.cmake
+   NAMESPACE ${PROJECT_NAME}::
+   EXPORT_LINK_INTERFACE_LIBRARIES
+--- a/config/Imath.pc.in
++++ b/config/Imath.pc.in
+@@ -5,7 +5,7 @@
+ 
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-libdir=@libdir@
++libdir=@libdir@/@IMATH_OUTPUT_SUBDIR@
+ includedir=@includedir@
+ libsuffix=@LIB_SUFFIX_DASH@
+ Name: Imath
+@@ -14,4 +14,4 @@ Version: @IMATH_VERSION@
+ Requires:
+ Conflicts:
+ Libs: -L${libdir} -lImath${libsuffix}
+-Cflags: -I${includedir} -I${includedir}/Imath
++Cflags: -I${includedir} -I${includedir}/@IMATH_OUTPUT_SUBDIR@
+--- a/config/LibraryDefine.cmake
++++ b/config/LibraryDefine.cmake
+@@ -87,8 +87,8 @@ function(IMATH_DEFINE_LIBRARY libname)
+   install(TARGETS ${libname}
+     EXPORT ${PROJECT_NAME}
+     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}
++    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}
+     INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+     PUBLIC_HEADER
+       DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${IMATH_OUTPUT_SUBDIR}
+@@ -101,8 +101,8 @@ function(IMATH_DEFINE_LIBRARY libname)
+       install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_BINDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
+       install(CODE "message(STATUS \"Creating symlink ${CMAKE_INSTALL_FULL_BINDIR}/${baselibname} -> ${verlibname}\")")
+     else()
+-      install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
+-      install(CODE "message(STATUS \"Creating symlink ${CMAKE_INSTALL_FULL_LIBDIR}/${baselibname} -> ${verlibname}\")")
++      install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
++      install(CODE "message(STATUS \"Creating symlink ${CMAKE_INSTALL_FULL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}/${baselibname} -> ${verlibname}\")")
+     endif()
+     set(verlibname)
+     set(baselibname)
+--- a/src/python/PyImath.pc.in
++++ b/src/python/PyImath.pc.in
+@@ -13,4 +13,4 @@ Name: PyImath
+ Description: Python bindings for the Imath libraries
+ Version: @IMATH_VERSION@
+ Libs: -L${libdir} -lImath${libsuffix} -lPyImath@PYIMATH_LIB_PYTHONVER_ROOT@@Python_VERSION_MAJOR@_@Python_VERSION_MINOR@${libsuffix}
+-Cflags: -I${includedir} -I${includedir}/Imath
++Cflags: -I${includedir} -I${includedir}/@IMATH_OUTPUT_SUBDIR@
+--- a/src/python/PyImathNumpy/CMakeLists.txt
++++ b/src/python/PyImathNumpy/CMakeLists.txt
+@@ -48,5 +48,5 @@ if(TARGET Python3::Python AND
+     LIBRARY_OUTPUT_NAME "imathnumpy"
+     DEBUG_POSTFIX ""
+   )
+-  install(TARGETS imathnumpy_python3 DESTINATION ${PyImath_Python3_SITEARCH_REL})
++  install(TARGETS imathnumpy_python3 DESTINATION ${PyImath_Python3_SITEARCH_REL}/${IMATH_OUTPUT_SUBDIR})
+ endif()
+--- a/src/python/config/CMakeLists.txt
++++ b/src/python/config/CMakeLists.txt
+@@ -15,7 +15,7 @@ if(IMATH_INSTALL_PKG_CONFIG)
+   function(pyimath_pkg_config_help pcinfile)
+     set(prefix ${CMAKE_INSTALL_PREFIX})
+     set(exec_prefix "\${prefix}")
+-    set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}")
++    set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}")
+     set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
+     string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)
+     set(LIB_SUFFIX_DASH ${IMATH_LIB_SUFFIX}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX})
+--- a/src/python/config/ModuleDefine.cmake
++++ b/src/python/config/ModuleDefine.cmake
+@@ -54,8 +54,8 @@ function(PYIMATH_ADD_LIBRARY_PRIV libname)
+   install(TARGETS ${libname}
+     EXPORT ${PROJECT_NAME}
+     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}
++    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}
+   )
+ endfunction()
+ 
+@@ -154,7 +154,7 @@ function(PYIMATH_DEFINE_MODULE modname)
+         LIBRARY_OUTPUT_NAME "${modname}"
+         DEBUG_POSTFIX ""
+       )
+-      install(TARGETS ${modname}_python3 DESTINATION ${PyImath_Python3_SITEARCH_REL})
++      install(TARGETS ${modname}_python3 DESTINATION ${PyImath_Python3_SITEARCH_REL}/${IMATH_OUTPUT_SUBDIR})
+     endif()
+   endif()
+ endfunction()
+-- 
+2.34.1
+
diff --git a/dev-libs/imath/imath-3.1.3.ebuild b/dev-libs/imath/imath-3.1.3.ebuild
index 3347beaa0c68..94fa189368ba 100644
--- a/dev-libs/imath/imath-3.1.3.ebuild
+++ b/dev-libs/imath/imath-3.1.3.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
@@ -13,7 +13,7 @@ DESCRIPTION="Imath basic math package"
 HOMEPAGE="https://imath.readthedocs.io"
 SRC_URI="https://github.com/AcademySoftwareFoundation/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 # re-keywording needed for (according to ilmbase keywords): ~x64-macos ~x86-solaris
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="BSD"
diff --git a/dev-libs/imath/imath-3.1.1.ebuild b/dev-libs/imath/imath-3.1.4.ebuild
index 82fabc71d73a..54eb940af84e 100644
--- a/dev-libs/imath/imath-3.1.1.ebuild
+++ b/dev-libs/imath/imath-3.1.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 
@@ -12,9 +12,8 @@ MY_PN="${PN^}"
 DESCRIPTION="Imath basic math package"
 HOMEPAGE="https://imath.readthedocs.io"
 SRC_URI="https://github.com/AcademySoftwareFoundation/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-# re-keywording needed for (according to ilmbase keywords):
-# ~mips ~x64-macos ~x86-solaris
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+# re-keywording needed for (according to ilmbase keywords): ~x64-macos ~x86-solaris
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="BSD"
@@ -42,7 +41,7 @@ BDEPEND="
 	python? ( ${PYTHON_DEPS} )
 "
 
-PATCHES=( "${FILESDIR}"/${P}-0001-changes-needed-for-proper-slotting.patch )
+PATCHES=( "${FILESDIR}"/${P}-Gentoo-specific-changes-needed-for-slotting.patch )
 DOCS=( CHANGES.md CONTRIBUTORS.md README.md SECURITY.md docs/PortingGuide2-3.md )
 
 pkg_setup() {
@@ -54,6 +53,7 @@ src_configure() {
 
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=$(usex !static-libs)
+		-DDOCS=$(usex doc)
 		-DIMATH_ENABLE_LARGE_STACK=$(usex large-stack)
 		-DIMATH_HALF_USE_LOOKUP_TABLE=ON
 		-DIMATH_INSTALL_PKG_CONFIG=ON
@@ -63,8 +63,7 @@ src_configure() {
 	)
 	if use python; then
 		mycmakeargs+=(
-			# temp. disable for finding libboost_python310, #803032
-			#-DBoost_NO_BOOST_CMAKE=OFF
+			-DBoost_NO_BOOST_CMAKE=OFF
 			-DPYTHON=ON
 			-DPython3_EXECUTABLE="${PYTHON}"
 			-DPython3_INCLUDE_DIR=$(python_get_includedir)
@@ -74,19 +73,3 @@ src_configure() {
 
 	cmake_src_configure
 }
-
-src_compile() {
-	cmake_src_compile
-
-	if use doc; then
-		pushd "${S}"/docs 2>/dev/null || die
-		doxygen || die
-		emake html
-		popd 2>/dev/null || die
-	fi
-}
-
-src_install() {
-	use doc && HTML_DOCS=( "${S}/docs/_build/html/." )
-	cmake_src_install
-}
diff --git a/dev-libs/jemalloc/Manifest b/dev-libs/jemalloc/Manifest
index 4960557a0db1..ab73a548b22b 100644
--- a/dev-libs/jemalloc/Manifest
+++ b/dev-libs/jemalloc/Manifest
@@ -1,5 +1,4 @@
 AUX jemalloc-5.2.0-gentoo-fixups.patch 1443 BLAKE2B 433f445195f13ad3932d3b0c86a4b3ab2adfe99711584c96d8377fddf31730d9a0a116b345dbb9f46e487df9d11b222625dd72238b828452be1fb3ab838c347f SHA512 6fe7419d4cbf68e4725e9a10b8f42af126be924b011aab09a6872b0bd59effec3c641f9df4c2ba9935fb1b7bbfb62c3f272bc63a5264fdc105351427fd739958
 DIST jemalloc-5.2.1.tar.bz2 554279 BLAKE2B 52cb8cd5e5807a750a7e5e9ee005afd61144d821d7f7029a5eca998fd61787a7271338dee3de586ddf93f5fdbddc2c2ca03ba64375a70096f273a6aa173da431 SHA512 0bbb77564d767cef0c6fe1b97b705d368ddb360d55596945aea8c3ba5889fbce10479d85ad492c91d987caacdbbdccc706aa3688e321460069f00c05814fae02
-EBUILD jemalloc-5.2.1-r1.ebuild 1421 BLAKE2B f1b45f90372cfab04d00b9258846f041bd76fc8da9bc6b331b41bad6f3cd1c5557a01338dcfc1b8a9754d87e1f106b8bd9865c7642a9a0a53ab2259c0406fed1 SHA512 f2df6b1cdec9110aee51c917dc2337dfd99978cba5826acd8a8bb864e9724b84c718f46022c5289e6a61274ff7fb372ea5c08e366a784f7f9f39063034a6c767
-EBUILD jemalloc-5.2.1.ebuild 1829 BLAKE2B 0b23722c52381d2b4888589c5c78a789b78cd2f23e80f6672f6f05e2ba4cf3d6dac4ecad3fbd4df875125aef6bf7b81840cd2594796eaac339dc0c51d9c88d4b SHA512 bddd9d44266a63fcd70f1e8a7c8469a465765fb37c49181fe0afedb53b8548578ef56313088bd3ad7ae484c5905b340583a88dae38cda1ee6f915c85340b4325
+EBUILD jemalloc-5.2.1-r1.ebuild 1418 BLAKE2B efc1ecdbf966fe0f3fc69f065f51c66946b59b68e59197079d9a1fc2f88da1f736015f9910a5923b0f1f2b476578f2b21d5edfea61337c76ce689326338ebe26 SHA512 745d3534239ac337bef2b6cfb38dbf5cf9b648781bfad50e9e8e3fa037313183c7a5b447e72221db152315e0372ec03edb23b102a368f818b30adbb1d50657d6
 MISC metadata.xml 638 BLAKE2B 5d10d2e2db2f0557f2a0176e8e4ad244aa6b9209519c4b21c68696561b6a2a558f206bbd7de37d1f021231b8c84ec08a6796f0af5e5b32c2ec8c047ee50e8fab SHA512 31f22b88e6fa5252504cba421a730f13a18c213dec487a764c2c05555d45539ee58a0ddfe2212f535bc276934101125a3940c9b4934c7f924e89f85ebe75672c
diff --git a/dev-libs/jemalloc/jemalloc-5.2.1-r1.ebuild b/dev-libs/jemalloc/jemalloc-5.2.1-r1.ebuild
index 7f343a744a5d..9494b7067186 100644
--- a/dev-libs/jemalloc/jemalloc-5.2.1-r1.ebuild
+++ b/dev-libs/jemalloc/jemalloc-5.2.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jemalloc/jemalloc/releases/download/${PV}/${P}.tar.b
 
 LICENSE="BSD"
 SLOT="0/2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE="debug lazy-lock prof static-libs stats xmalloc"
 HTML_DOCS=( doc/jemalloc.html )
 PATCHES=( "${FILESDIR}/${PN}-5.2.0-gentoo-fixups.patch" )
diff --git a/dev-libs/jemalloc/jemalloc-5.2.1.ebuild b/dev-libs/jemalloc/jemalloc-5.2.1.ebuild
deleted file mode 100644
index 6504cb8f9b50..000000000000
--- a/dev-libs/jemalloc/jemalloc-5.2.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="Jemalloc is a general-purpose scalable concurrent allocator"
-HOMEPAGE="http://jemalloc.net/ https://github.com/jemalloc/jemalloc"
-SRC_URI="https://github.com/jemalloc/jemalloc/releases/download/${PV}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0/2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-IUSE="debug hardened lazy-lock prof static-libs stats xmalloc"
-HTML_DOCS=( doc/jemalloc.html )
-PATCHES=( "${FILESDIR}/${PN}-5.2.0-gentoo-fixups.patch" )
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/jemalloc/jemalloc.h )
-# autotools-utils.eclass auto-adds configure options when static-libs is in IUSE
-# but jemalloc doesn't implement them in its configure; need this here to
-# supress the warnings until automagic is removed from the eclass
-QA_CONFIGURE_OPTIONS="--enable-static --disable-static --enable-shared --disable-shared"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myconf=()
-
-	if use hardened ; then
-		myconf+=( --disable-syscall )
-	fi
-
-	ECONF_SOURCE="${S}" \
-	econf  \
-		$(use_enable debug) \
-		$(use_enable lazy-lock) \
-		$(use_enable prof) \
-		$(use_enable stats) \
-		$(use_enable xmalloc) \
-		"${myconf[@]}"
-}
-
-multilib_src_install() {
-	# Copy man file which the Makefile looks for
-	cp "${S}/doc/jemalloc.3" "${BUILD_DIR}/doc" || die
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fixup install_name, #437362
-		install_name_tool \
-			-id "${EPREFIX}"/usr/$(get_libdir)/libjemalloc.2.dylib \
-			"${ED}"/usr/$(get_libdir)/libjemalloc.2.dylib || die
-	fi
-	use static-libs || find "${ED}" -name '*.a' -delete
-}
diff --git a/dev-libs/json-glib/Manifest b/dev-libs/json-glib/Manifest
index 243426250b9e..8a3e7fa18e89 100644
--- a/dev-libs/json-glib/Manifest
+++ b/dev-libs/json-glib/Manifest
@@ -1,5 +1,3 @@
-DIST json-glib-1.6.2.tar.xz 170260 BLAKE2B 8039661c92c0f8d79189fcc2d01fea0615ce13190526960178f727255c8ca5e1cd2f06079782b3513aa6686fe402d45b10ead798af196523552be73912cb54e9 SHA512 8412390a639d368ed11181621739f43bc4900143ac062c3824c7140abec58ca2b09773a415034f03896a4ff63aa3414b492997da532848709238a83c3a068b11
 DIST json-glib-1.6.6.tar.xz 1306232 BLAKE2B 93814dad74ef61ef265e348e9e145ceb63c950f1e9ecda23fbaad24e291a1cbfc690e287ccc8959fd7c056634f80815ef54fa2c75b09ebd3e158f3fa4df1c8e7 SHA512 b9a737e4ba3ecdfb9cb8f5fb751cc74e5b1553664d3088c44a1f9e5396d4037958af214dcd290ddf5af98088f46167e10e371e134e1de5cbb7aec84c5c0fd017
-EBUILD json-glib-1.6.2.ebuild 1374 BLAKE2B 8977f2a96c16ec7e1f237d54c17165e8845937e1f5268ecec13c01d2e82a75ea2cc945884eb065bba9fbaf1bdbacebf0f5fa78754cde13eeb9636a2ab864818f SHA512 c21a6c339526b76f71348c98671c1740566e6d8e67ce9d4a4db94f7780b34713d910cfc9458dde1690d398c316d769ff5d0e3aab360a21a9bf15c38319b643c5
-EBUILD json-glib-1.6.6-r1.ebuild 1734 BLAKE2B 52dec60f03ee76977bb6ad2f06b2bb3b7315c804dbb2d0672f4dd8bed84417a03741927840f99c494193a1fdd8f64447c84657da5d7c22021fca8579405397e2 SHA512 e6dda626615a6d84c21435ec5bac0261e8a9bc6b88c834bc0d9ae7ef2a63b146466e1c4420c260cddab8666c51377f6c0e5439438b2cd84ac585316e763a5fbf
+EBUILD json-glib-1.6.6-r1.ebuild 1726 BLAKE2B 58ed4eaed530e3173d174ba2e6f92421a9ed7fe49dff5fb24d3b6dd5ddd68ce0ec3fcd352388cb7d44bf4dfd8ab8d0bb843dfe86a10fcc161bdda701c06eec4d SHA512 eb4e6c5894384e8a3fe4e2c03b0928e5e37c0c255bf23a28937fc97402ea6e7c557c7f58cd2b100a88e028d0c3359356dab3528d13ee5a45b48503ae4059269d
 MISC metadata.xml 1169 BLAKE2B 940ddda4a78b735deba5a4ab0ae6e840e0f09ee3ffb5254ceca11e3b15e42e3b22bcd8e0b40dbed10179a51d93501a4407dd53e5d9d8d5b22549f8f415e8c9b1 SHA512 df2e5e05eaecbd42d7ebba8330f3fb44096cfa8eee4e9ee9e99509a749f841612e38ed102737b7f8b6b8a1b991aadb67226c2c3b6494964662c94696501e519f
diff --git a/dev-libs/json-glib/json-glib-1.6.2.ebuild b/dev-libs/json-glib/json-glib-1.6.2.ebuild
deleted file mode 100644
index 9b2439aa7502..000000000000
--- a/dev-libs/json-glib/json-glib-1.6.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org meson-multilib xdg-utils
-
-DESCRIPTION="Library providing GLib serialization and deserialization for the JSON format"
-HOMEPAGE="https://wiki.gnome.org/Projects/JsonGlib"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="gtk-doc +introspection"
-
-RDEPEND="
-	>=dev-libs/glib-2.54.0:2[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-"
-DEPEND="${RDEPEND}"
-# TODO: Can we use a newer docbook-xml-dtd, or is one needed at all?
-BDEPEND="
-	~app-text/docbook-xml-dtd-4.1.2
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.20 )
-	>=sys-devel/gettext-0.18
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	xdg_environment_reset
-	default
-	# Disable installed-tests; this also indirectly removes build_aux/gen-installed-test.py calls, thus not needing python-any-r1.eclass
-	sed -e 's/install: true/install: false/g' -i json-glib/tests/meson.build || die
-	sed -e '/install_data/d' -i json-glib/tests/meson.build || die
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_native_use_feature introspection)
-		$(meson_native_use_feature gtk-doc gtk_doc)
-		$(meson_native_true man)
-	)
-	meson_src_configure
-}
diff --git a/dev-libs/json-glib/json-glib-1.6.6-r1.ebuild b/dev-libs/json-glib/json-glib-1.6.6-r1.ebuild
index 173cbd9e95a2..f8da05466a2a 100644
--- a/dev-libs/json-glib/json-glib-1.6.6-r1.ebuild
+++ b/dev-libs/json-glib/json-glib-1.6.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/JsonGlib"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="gtk-doc +introspection"
 
 RDEPEND="
diff --git a/dev-libs/jsonrpc-glib/Manifest b/dev-libs/jsonrpc-glib/Manifest
index 8d264a099650..956b815d1eb6 100644
--- a/dev-libs/jsonrpc-glib/Manifest
+++ b/dev-libs/jsonrpc-glib/Manifest
@@ -1,5 +1,3 @@
-DIST jsonrpc-glib-3.38.0.tar.xz 42224 BLAKE2B d7caf3dc116c43d652009ce646c0b837bd8a2a1b4d2b60ba49e9d746ff5e36e4c91fe5f4b5542a4562e6c8f13130d00fd22b57777d0e5ffd6e5b46f817f4dcb4 SHA512 1862403c37b7140e91720264a1b00a408b969f0464fc022a5c24be0eea993526d118ece6611927e1309071c3db9d3d6bf9f13ae8ed23ff1d34f36fb68c2584cd
 DIST jsonrpc-glib-3.40.0.tar.xz 42392 BLAKE2B 106d010d5615d6c4a3e1fdc314d1d63be0b76424aca4c6e3771c21e75b79dca5f524e711c99fe1175797644e11d0458317bfa1f363a5abd296dab5b3f95dd708 SHA512 5d4fae86e7eeb029a8daf3eff26107a374ba1b68caa2862563e8d9854913ae306448f4c712be6f0f82961031f1b618aaba7ded154f81b4a023fa366c71f1b887
-EBUILD jsonrpc-glib-3.38.0.ebuild 971 BLAKE2B 21b1270fc6e79a3a6c8bdea517906530635343b2123e6bef6f82be5e42249f329101cb2b0e92cbafd5551cde33f3a372ff573602ee0a3b3c9106f93157a57e4f SHA512 e895f8237cfca36f5e6b2d1f5728fdb92e04564af24a0518d6a40e434af6294aeede6b2eac959280a1c888c64c72d3c5d31cc59db0409f98bc292b1199e66c1e
-EBUILD jsonrpc-glib-3.40.0.ebuild 973 BLAKE2B a081bf1c0dc4dfb2379ba42704ea87f5054827b618bf91720c0dccc2cd5fd5a52a18bf791114ef56984e1087a25265e1fecc51264d07826fcd2d20f42540637b SHA512 34c5d9ce9ef46a4a3dc32ce7609dad4b522c9be56c8bde9ac438e03fc42080c213fec44adfc8ec857ce3b83a3762743d8b60639c928f01d39bacde4488b45802
+EBUILD jsonrpc-glib-3.40.0.ebuild 971 BLAKE2B a5e3b578e16987bc81a66f43a056f9e4f65ae6720f86f2982073780ca9f2dc8b019174528f9bb1d3eeb2ea697a31a48ddc42206e4273177347bff7d025705fcd SHA512 091c0df94cd51b5fcf81e1025778b0ec0cd9666c752fcd97e4405cf392d3a19a46b37ee48557e5a8a384135910540ed24abd4db28e0d96625c149fc563a52785
 MISC metadata.xml 506 BLAKE2B 21d02bfa7d40b0c215817396da945211436ee9e021d40696efbe4c091cd0e3d2f4621ba97fcc9aa1c96c3bf0f40707b0af95571ddf8edd16ab01c00f4c76cb6d SHA512 af3d14d9201d2fc7530d661edff7f7b714d8dba4342a4695a8edd540da266b52583d35a6280595b98918b913734a19a07d613b240f673120cbb27f643cb18f45
diff --git a/dev-libs/jsonrpc-glib/jsonrpc-glib-3.38.0.ebuild b/dev-libs/jsonrpc-glib/jsonrpc-glib-3.38.0.ebuild
deleted file mode 100644
index 68a3f323f7c2..000000000000
--- a/dev-libs/jsonrpc-glib/jsonrpc-glib-3.38.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org meson xdg vala
-
-DESCRIPTION="JSON-RPC library for GLib"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/jsonrpc-glib"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/1"
-KEYWORDS="amd64 x86"
-
-IUSE="gtk-doc +introspection test vala"
-REQUIRED_USE="vala? ( introspection )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/json-glib[introspection?]
-	introspection? ( dev-libs/gobject-introspection:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	vala? ( $(vala_depend) )
-	dev-util/glib-utils
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc )
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Denable_profiling=false # -pg passing
-		$(meson_use introspection with_introspection)
-		$(meson_use vala with_vapi)
-		$(meson_use gtk-doc enable_gtk_doc)
-		$(meson_use test enable_tests)
-	)
-	meson_src_configure
-}
diff --git a/dev-libs/jsonrpc-glib/jsonrpc-glib-3.40.0.ebuild b/dev-libs/jsonrpc-glib/jsonrpc-glib-3.40.0.ebuild
index 0029319a3d8b..063b0c60669a 100644
--- a/dev-libs/jsonrpc-glib/jsonrpc-glib-3.40.0.ebuild
+++ b/dev-libs/jsonrpc-glib/jsonrpc-glib-3.40.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/jsonrpc-glib"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="gtk-doc +introspection test vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest
index d6b8a329abbd..a3af31633cd2 100644
--- a/dev-libs/leatherman/Manifest
+++ b/dev-libs/leatherman/Manifest
@@ -3,6 +3,8 @@ AUX leatherman-1.12.6-SIGSTKSZ.patch 1863 BLAKE2B f244c82ef18441c115b435a1aaff06
 AUX portage-sandbox-test-fix.patch 2010 BLAKE2B 8e9e180c180f2059f57c953a9c828164a96b07d6a3054b555c572c6c80e79dbf5092da5fb23e9fb95f3db0bff02788ef4a9ac40483b1673382f4c1d11b0b3833 SHA512 35bfb2d3b1ca98cf7f10e9356e899532516d4a9671b0cebca1780e602ef53f9a5705ee6c4c03d70aecad163faccdce6ec15d7e32f00ebcda946d0cf6638a22a2
 AUX shared_nowide.patch 4627 BLAKE2B c29dae187c0056956498487e0b6c8a88b74253f5d221df3f274da9bea7ae5163b76f3027df99e06fec7999274751c6d173db6ca7ec896a687536d7199c1b4827 SHA512 cc05ed7250728490955cc464d3a32ce4d81cfd7a9518487fc7d0f7a397eb0ac522e474cfadc036f233080e508f148f644c41764e31f99b76ab75403a7ca78486
 DIST leatherman-1.12.6.tar.gz 818106 BLAKE2B 056ea52c355cf178e16be03f2a4fb54bf0e6aece4045545e7e45c50664e711db2bb756f56c9cd33a6dfe1de24c4ecb98766d4bd158ffb7757958274ba38f76db SHA512 4e2a1ee2e7226224f115648a78bc3e4798ef0528ef32e01d1e7ebcbeb1250fd6ed88001c9db21456feeef3bd6ff201b0fd68fd5feb2671a66d13519dd3454386
+DIST leatherman-1.12.7.tar.gz 815838 BLAKE2B 21284f5128c9264b751011b1d68c6baf553037612cab39cc339920091ae42980f6c3920f5b339d4cba31a40b190fa73d779f45dcc30b78e866708c3178ac6699 SHA512 dd763bf89d8356aa00805817af7029ee77452a9210b6aded16ac1434f233fbba9b41014ab55a076773f50da6d16e1cffae50e2a23d1c4b336df9cc88c05ede56
 EBUILD leatherman-1.12.6-r1.ebuild 1303 BLAKE2B 22629e094676e56567cabd366ee869c9ffb5fea05dcdd94a7b2dc01bb9329135c3b57be2b882d59e566743a4d9ae13c266d6df9f9651a7dda78d90f032c8b3c0 SHA512 0e41bed3e1097ddf40c102ccdf07ee8da8757cbf606579996d3f976edcf64e786e119248d1f883f83ab57c6901504eed43fa356e44468fff5df5ef8625ea10a3
 EBUILD leatherman-1.12.6-r2.ebuild 1369 BLAKE2B e0446cdff002e93a6076f4bceb38a93d35e17d4ce0e244957a3f82504d41adeec35ba85f465dd2a37fb9f34ff0ed5548145bcd68769f44c7d034d813956e084b SHA512 72cd33acae8899f0a7d49cbe422d3075d855bb685ee8d5b65b8edeaee5f939ce6512f917f0e7fa699ee88adf16dca282bbf956d56eff6cd1b30a947cae9cf976
+EBUILD leatherman-1.12.7.ebuild 1277 BLAKE2B 24fcba03f516fcce116529325c974363d93c3c3870a65fe12e8edf43e7ab81f681d1502e560ccb0ebbcb69393f36294b8905328cf54e7f97c19df7a61548b2ae SHA512 2899a47ab0b5acb37a306fe4df959c075ba8024415b3b28bfac5bd892d1cb7b3cceecdaf5ed204091f08ad284b3eb519e2613c3e151610b12e3f34b9b91a555f
 MISC metadata.xml 341 BLAKE2B 63e2c407d9e7f5dfcf324cba650e46ae440f9b365645b5bb51f943c3d003ce9a94522d512667879b1d4a22ba71b9ddce560606e52f5b6cdb84677d2a4efbba6e SHA512 5b2e4f0b7aa914686915312fe957f40ece7701168775e160730c76975af52530ad2d95595ab8c6b410470a0cd2ea11e3bdf2a9fd78d0926a6cbcc2628ff275d2
diff --git a/dev-libs/leatherman/leatherman-1.12.7.ebuild b/dev-libs/leatherman/leatherman-1.12.7.ebuild
new file mode 100644
index 000000000000..ec52f32f8a1a
--- /dev/null
+++ b/dev-libs/leatherman/leatherman-1.12.7.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A C++ toolkit"
+HOMEPAGE="https://github.com/puppetlabs/leatherman"
+SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug static-libs test"
+#RESTRICT="!test? ( test )"
+RESTRICT="test"  # restricted til we don't need the shared_nowide patch
+
+RDEPEND=">=dev-libs/boost-1.73:=[nls]
+	net-misc/curl"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/portage-sandbox-test-fix.patch
+	"${FILESDIR}"/1.12.2-shared_nowide.patch
+)
+
+src_prepare() {
+	sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die
+	# vendored boost lib conflicts with boost 1.73 and above
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+		-DCMAKE_BUILD_TYPE=None
+		-DLEATHERMAN_ENABLE_TESTING=$(usex test)
+		# We depend on Boost with nls, so this is always true
+		-DLEATHERMAN_USE_ICU=ON
+
+		-DLEATHERMAN_SHARED=$(usex !static-libs)
+	)
+
+	if use debug; then
+		mycmakeargs+=(
+			-DCMAKE_BUILD_TYPE=Debug
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	"${WORKDIR}/${P}"_build/bin/leatherman_test || die
+}
diff --git a/dev-libs/level-zero/Manifest b/dev-libs/level-zero/Manifest
index 725c71f11177..946b62e30f4d 100644
--- a/dev-libs/level-zero/Manifest
+++ b/dev-libs/level-zero/Manifest
@@ -1,5 +1,5 @@
-DIST level-zero-1.6.2.tar.gz 394003 BLAKE2B 3e4de24ee9abef1d2b21bf277c5ac13b9e9e7a3361d2ad2623893e3d0edaed14c5fa04624f3edc57725bf5303133caca9bd1686947900cc2e4c52bc2b76582e7 SHA512 589736a41d213a9834d06d2e668dcc91edb5d40e93dfb59b98df7ec4f6f26a9ad3e9379ede3b6bb570ba415b1d488c83f60cd43abafe15a692dc507965323497
 DIST level-zero-1.7.4.tar.gz 395803 BLAKE2B 09b977cbd7bd438daeb1cf4b97c4a6e586239b01a873604282a925458e8c2abb896dbce7e3199cc27ef4e85fa6dbae8b77186bedc9f942427c81aa2bdf81c97c SHA512 270c273fa7f3a90d3a3af8d7882c8dfca684eeeab9b6c01b9145aa802186d8a1a5eaaf1afd720fb12be3a6338a4d95698bb5dd175abb96b4c2916c94e4f4771c
-EBUILD level-zero-1.6.2.ebuild 627 BLAKE2B 755a50ecbac1beb9b13c0182ea215ccf470fe077298b5ec1f66d91cf3aaaff93494157b68123731f646866ee330f095ed6da9147de05c79f36a216066f8e70e7 SHA512 82daabbf6d60d43b4432cd993da60e28ffdb2f8b5b4f62829595aecffa3730df5e8bec49c84fa056b43d89a816c660b2757253b1023b19568e61e308c6e4009b
-EBUILD level-zero-1.7.4.ebuild 628 BLAKE2B 1fa3cc5af83b1833f1d4c5156facc615d2adba4911e79b7d1493d1254d84b2f5573fb59d67b25c6a65e7afced86ca045b844c823c52d77882cd95634f04941f9 SHA512 243f70daad287d2acd9bd3cbd8d20738a4696c09dffc8d7c1223fb9e751c96048e748f81fccec4a6aec0b6020337f43d8bbfb015fd320745595794766e5709b4
+DIST level-zero-1.7.9.tar.gz 396946 BLAKE2B c0b09e5318d5ba430b760d28d0f0943f8de910eaa0acc6477947ef4d6e0dc8af6ba3e1f8b2728e6fd9e763f038d1a22acd8c1d23eaac2e6fafa1f1f6913a91cd SHA512 65721d00de32d4b483eeca2b9f803a05724619afc46f664d6d5fb344fcff6a053a9a23daf24ab0fa05f598c7fde3e91c6b350fb9e8bf6ea38c596dbfe42fadc1
+EBUILD level-zero-1.7.4.ebuild 627 BLAKE2B aca47fb72cf707848e75b93925d2026623612743ef8516f7d813143423a3b1a0bc7487edd309a583135e30a2c5dcfbd0f5fd388f94489e1963caf86cc899f6a5 SHA512 a3ebecbe6443a186d1b32edae090b0f97ff442f2aae1f22df0f23846b6dc583c7b893a9e4499cb8da756c83af65c15c712f200d129b59856dcaf8ed62e6035ca
+EBUILD level-zero-1.7.9.ebuild 628 BLAKE2B 19db5e3da871d1eafc51d0cb941f4264bf2ae829720ccf185c6167d44aed4aa2f107c96c4009b48ca37c4516aeb77548886d6de8e06d140ebb1b309c73c6d640 SHA512 e61cb69efacfbd907551fcb62c3ebe4f0aeb5c1fbae007607d5af2bac778db2d40cbc3bbf9cb1d8d73cfd547fbf7fc6f2f82ece63f2bcf59a7a72591416cd899
 MISC metadata.xml 586 BLAKE2B 44eca05640a9276ea9cbddccc0d199dc8c7297a3fbf5ad6b58693c406961efa2aabf99501faaace47ce6bb97736fe371533e89a5a700949b03db66359222b269 SHA512 da9b222b216ed217842f236eeb1991e31ec4f140d86c0a048e9e401a18018d90d6ad8d4f10edec8b71386687bc9481ebf9154a1190bf6969d4fab04bba20100e
diff --git a/dev-libs/level-zero/level-zero-1.7.4.ebuild b/dev-libs/level-zero/level-zero-1.7.4.ebuild
index c930117ab95b..af873cd942fa 100644
--- a/dev-libs/level-zero/level-zero-1.7.4.ebuild
+++ b/dev-libs/level-zero/level-zero-1.7.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/oneapi-src/${PN}/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 src_prepare() {
 	cmake_src_prepare
diff --git a/dev-libs/level-zero/level-zero-1.6.2.ebuild b/dev-libs/level-zero/level-zero-1.7.9.ebuild
index 6bdcbfa49b8a..84d0079b1c54 100644
--- a/dev-libs/level-zero/level-zero-1.6.2.ebuild
+++ b/dev-libs/level-zero/level-zero-1.7.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/oneapi-src/${PN}/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 
 src_prepare() {
 	cmake_src_prepare
diff --git a/dev-libs/leveldb/Manifest b/dev-libs/leveldb/Manifest
index 6aa97aa7da14..d3f797580b52 100644
--- a/dev-libs/leveldb/Manifest
+++ b/dev-libs/leveldb/Manifest
@@ -6,5 +6,5 @@ DIST leveldb-1.20.tar.gz 223141 BLAKE2B 57ab5cb191679b8fbfaa28fa0a61ee1dcd757bb9
 DIST leveldb-1.23.tar.gz 242925 BLAKE2B ef9ac853cdc2f376b9b4299c1017db8c262cb318ad771f40fe81c9fb71ea06ee56ac533b3e8af4e6fdd28577a2f87cfd103ecb49098187d099ccd6019b8ca1d2 SHA512 ac15eac29387b9f702a901b6567d47a9f8c17cf5c7d8700a77ec771da25158c83b04959c33f3d4de7a3f033ef08f545d14ba823a8d527e21889c4b78065b0f84
 EBUILD leveldb-1.20.ebuild 1696 BLAKE2B cf3635413925eb7fda325336206a17ba3449559e4c70b8f66db79dc0704d4acd5c1f5f08f5e5a9b7b73ebdf9366ab0cb09e94b3957497147e8518e266235414c SHA512 2267e43e96a97110a190882aeb053aee5ef40e6735059989320ba272db5e86a66e384883f10afba274d05c41054f050d22851b89c6be769c6e881e5a9762a681
 EBUILD leveldb-1.23-r1.ebuild 940 BLAKE2B c8845aaaedf9dae20e102864641a6562f402c5e13673b17bc9246b721aeddd2e3a8abf2188a8da5327f66176e9749c900c5a541c564d44a5c0bbe1b1bdfe0004 SHA512 9b34fa37095e60d03c2f04e14bbb774e671bc6eefabcdd15f472c03ca4a72d725a6fd0da442df8ad9d2112043bb3422ac1cc000649a10ee08cd434c47d1011f6
-EBUILD leveldb-1.23-r2.ebuild 1025 BLAKE2B 6c409077328b45131dea3597fd7f0f50d1e751b52fd46c2a2cba2e1524519feb102797a1593aa0192cccd7a7fe0564fb2b0f42ca1a39a32eb68ef15f1a0addff SHA512 74440ecdae58f496949a97e976c11971397291d566af3400034e7cbc831a75a33a48c8ee122bbc2423a0c05d0bce5d31e4dfbe10d5ff07e37c4704b50cb51b1b
+EBUILD leveldb-1.23-r2.ebuild 1026 BLAKE2B 5b3232e693b5e6314250b9387be8767b19e8e9afee3dc0050d7bdb88a5066102addb0af2261d27222c4f2f2348139c82b73ae610e85440fbab46534396bd305a SHA512 9d8321e5199085c127d11451b136434b1c53a76fc9191ae446e526009aa019edfc8380b045274804beff6bc687d617c93f676e1b07a730a10d928bbd02b6494c
 MISC metadata.xml 511 BLAKE2B 2108f2600f79e95a7afe0d3f2b96afe529ec8b2aec0eba1e4231e902c118b9332f11dd952db93c95f2d6133362d2315435e17da153cf17fb7382da18a8651377 SHA512 44a3726f1dfb71c1abd07b2c3b0c9e0243ac74fa23f87c8564c503d192944879196433e3cae9849ad1fec79f20e72156fed412cbb18d0fbb573d987830f640d4
diff --git a/dev-libs/leveldb/leveldb-1.23-r2.ebuild b/dev-libs/leveldb/leveldb-1.23-r2.ebuild
index a245acc26713..398757537db1 100644
--- a/dev-libs/leveldb/leveldb-1.23-r2.ebuild
+++ b/dev-libs/leveldb/leveldb-1.23-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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.
 
 LICENSE="BSD"
 SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+crc32c +snappy +tcmalloc test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libansilove/Manifest b/dev-libs/libansilove/Manifest
index f95fd255bf79..f2554f618e20 100644
--- a/dev-libs/libansilove/Manifest
+++ b/dev-libs/libansilove/Manifest
@@ -1,4 +1,4 @@
 DIST libansilove-1.2.8.tar.gz 59695 BLAKE2B 4be4fb1f7277cc53bdc31399b429fc142cd3b87933da4c87604fe290b8697dd4c3d03a4c77bbac62648b0b8b0da509b5f7b17d2867e2e9e56eaf00674219fff3 SHA512 99df7fa0e5f2eb26a95b5073587e957378163fcab9ca828f7d6eca79dcb92463b1788285813c4fed6bfc9ee753c425fd34968e5e08999bc63fe6c4ba5939198f
 EBUILD libansilove-1.2.8.ebuild 588 BLAKE2B c6d98e2b87fbb9840e46c0f859a736819ee0eaaf14b2f56880f250ea265a9e5624e4b955562656a817e0e81049798528b3760e593d0113bf8c313c5e1be6debe SHA512 88ef22d3592634ead3204b8b34a55a65766a9433952d23e2443dd6104888b45797d6c0a27227ce5e6741d223ead421a8dc0dcf0c772b5f081855b8a7b37da9ca
 EBUILD libansilove-9999.ebuild 576 BLAKE2B 87c3087832270affcf72e50b3bd4c6667d65355663e66da57aece50fffa61b31bef9f9c651126aab73e000d5e23ada053cbab99229fb5815f4b5df0bc5c7bdf9 SHA512 8b3e4cff2640d0c8519635ccfc9e15165ae401a7d052ade92cb02146380846ad0da04bb67a9484945c167cd58ef5d6518f69b10b3fe98ab3ea887989843b685f
-MISC metadata.xml 510 BLAKE2B ee5eda9f207020075b5b8dc259a33703f39180e21025c4dbcd5bb4c22471f26b30f55b35dea00f5b430fb9fb4bef710dacc44ccf3bd29601b82a33f0d8fbaf6a SHA512 bc307754eadc95f2694443faf4967ddfd35e0f34bf63a3c881fce9937d0cdbd12df0f7e81a037e9af368b335d64ec140d22f32a4ec5e1fd9913b281a4c6bf7ed
+MISC metadata.xml 511 BLAKE2B 326fb74ded1bca2aff1bfd21a0de0f063ac7015710226f0b04e272a5665b086115a0bfc70884a92417473b149a4d3e41173602be9ce9c9a0d5ac3428b7a99db2 SHA512 062e9312119ea28e711fa63b6f8554f415cf37b74949497bad0c94e27c2e44d9edb338fc14e87ecade56cf8e1e1fd2c1f38fb6acb62d973ea75d37e9f37b107f
diff --git a/dev-libs/libansilove/metadata.xml b/dev-libs/libansilove/metadata.xml
index 70ff020903d9..97728a514b7a 100644
--- a/dev-libs/libansilove/metadata.xml
+++ b/dev-libs/libansilove/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 
 <pkgmetadata>
   <maintainer type="person">
diff --git a/dev-libs/libbsd/Manifest b/dev-libs/libbsd/Manifest
index d3f58a7f943f..a9cf8680cab7 100644
--- a/dev-libs/libbsd/Manifest
+++ b/dev-libs/libbsd/Manifest
@@ -1,3 +1,5 @@
 DIST libbsd-0.11.3.tar.xz 399712 BLAKE2B 1af04b8fcbc0bfa59fba549639d61a33ac934fe7ee42b506d1b0452e0b836b0bfdd3d8739de90465be46fe6a9d326a2d11bcf72280aa19ccba81db5da6d63d89 SHA512 a7015ea1ffa3766b1a4690526a25231898ad8275149b31fb6801082450172249997c36165626d101ffce53b59767a46676eebc0806426922fe4e773a0376c1f5
+DIST libbsd-0.11.5.tar.xz 409972 BLAKE2B 00c89ad1be351e7851538eac2744f5aef87b5937330d514d17af8a20a04bc6eab0e2bda61d0080da1d1439306b3b191ab68b4bc4cd8558ff0adfe402bfbf5b52 SHA512 c52c19eddd53630aca14f9f6221f7b84aa9cc798b4bb91e867822b161793313aab872ac1c0350d29312a72fee6e2061f3910ff918b724ec171d8c9de5837c841
 EBUILD libbsd-0.11.3.ebuild 1276 BLAKE2B 2f7c2b5e0e8787d2202ed3d2e66dc0f6d82d519e8877de6090633685bdced48d28cdf0948163cee674ae5dcf042e1aa67e2b87e7fca1ee922c9de7540d16c63f SHA512 f31cfbc348e390f479be6075d8bb5891fb2e37dcd04637e3bafa9a9dcc2f332325ab5f1f8b4d1c509f8474524953f09afc1da1b1d66bd3581102cf555b53f6c7
+EBUILD libbsd-0.11.5.ebuild 1053 BLAKE2B 5c0c7e80dcb7b10d5ea696dd970866439d44d0a53b2eeb570c8716b7a0458e35b2a714c19c145718f1782830a548be8b43d988e1c8bc1960b5dacad358ae9602 SHA512 91b9af7545f827a2c1af4270b3186b4de742f8f314699a1ebc1b0db0bf1be8907107940848aad726d8f55f7930c115e5fab84dd1f541b703f1bc1d0c863d12a4
 MISC metadata.xml 363 BLAKE2B a1c4a829ec2dabf18360ab23b1aed4892f0650849a5287070fa15abffad4dc074d3c9c1fb698aa4da63262dcc1a4b57431654374c2f43764127daa389e7381d4 SHA512 5120ee7fb2fc2513df1a78a279d8d691969ee08d85ad2d960b5579069767eeb20087019a8a95d2f3c3f11d2ae721233a8283e47ad35d4c0fdbdef4cebc1ce930
diff --git a/dev-libs/libbsd/libbsd-0.11.5.ebuild b/dev-libs/libbsd/libbsd-0.11.5.ebuild
new file mode 100644
index 000000000000..55d75e728bd8
--- /dev/null
+++ b/dev-libs/libbsd/libbsd-0.11.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal
+
+DESCRIPTION="Library to provide useful functions commonly found on BSD systems"
+HOMEPAGE="https://libbsd.freedesktop.org/wiki/ https://gitlab.freedesktop.org/libbsd/libbsd"
+SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz"
+
+LICENSE="BSD BSD-2 BSD-4 ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+RDEPEND="app-crypt/libmd[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-3.17
+"
+
+multilib_src_configure() {
+	# The build system will install libbsd-ctor.a despite of USE="-static-libs"
+	# which is correct, see:
+	# https://gitlab.freedesktop.org/libbsd/libbsd/commit/c5b959028734ca2281250c85773d9b5e1d259bc8
+	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/dev-libs/libburn/Manifest b/dev-libs/libburn/Manifest
index 7661834e26dd..017da3afc799 100644
--- a/dev-libs/libburn/Manifest
+++ b/dev-libs/libburn/Manifest
@@ -1,3 +1,3 @@
 DIST libburn-1.5.4.tar.gz 991212 BLAKE2B 3fd4aa70eed2c9d0d33ef8bb967cd6208f1561aeebe8bc2b222fa4639fa3c215d49ee5ed3efc32813221fc4a9016ec9a3cabdcd8ae052d161794c0af11c7e6ee SHA512 dd7b14093e62e2c02011955c24e01d70ed78969b14faf7e5a63c0da97a80c438b628922532eb135af7dea8ee7c7b83554b3354160306dad852ce5bf6eb1d5ac9
-EBUILD libburn-1.5.4.ebuild 849 BLAKE2B 0446cf6c7e8cb680f56305da0457fe0c01e198ab85dd532d0296541d2a3ea364f5c7f5736a2169263f8609c9b08bf7864e668b7cd244883697cf37174f5351f0 SHA512 748fef428c77d903eee9624adeb336a0263d4693df8da3d790ddc61e321923395a5b52da08161375591d979678a4c0984cc021211f44423ce43999a4fd7eb4fc
+EBUILD libburn-1.5.4.ebuild 855 BLAKE2B 24b8753ef3505698d8655f2a25e724516542dfdf2af397351a05d2a2ca6e2f9bffd527e81bacafd2dbcba1ea18eaad99067fc16531f14b592fd9cb3c1bbcfb01 SHA512 c39efd1ce862f773b4290c5030855a34248b9a389ccdd82588b102ac6e41734fe3ae4ae0d78212e5dd0eb0186f5a28aebb30526db5189e6b3bd5c910ed7f67e4
 MISC metadata.xml 244 BLAKE2B 81e7bffb2ab3a3015b9a90bb48d0f62a65b55840b50a77f41b24961c3d9f682405c866b25a88c900785d60f669e60791607921808b988ab3ae525e31933e6067 SHA512 d4a328a1ed124445554a4a6f16cd5d9021314f6f4634c9e2866a68ca318220889554603e405c7aba69e9135cb5848de9bbf361f923fd3c0a5a6c803345351b93
diff --git a/dev-libs/libburn/libburn-1.5.4.ebuild b/dev-libs/libburn/libburn-1.5.4.ebuild
index 0d4edbf7a916..0b38168bb122 100644
--- a/dev-libs/libburn/libburn-1.5.4.ebuild
+++ b/dev-libs/libburn/libburn-1.5.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="debug static-libs"
 
 BDEPEND="
diff --git a/dev-libs/libcbor/Manifest b/dev-libs/libcbor/Manifest
index 4119d7bccc00..d4753cf90c2a 100644
--- a/dev-libs/libcbor/Manifest
+++ b/dev-libs/libcbor/Manifest
@@ -1,5 +1,5 @@
 DIST libcbor-0.8.0.tar.gz 267044 BLAKE2B e8548e7351984ebdcbeb5f13a7ca35412c3f3f05e2a44a5438d57b90bdcdc51f5265953163106f90ade911a96af665956ebeba7ed1c48cf207acf6d683af5606 SHA512 694d2d3a78d80072f96e0afb73590ca1f3572e41d2117330ef4313ed06271743b048d3ba3259c6ffe9a802d5e441379d0e54787d1d42fed08dc81ac4f06c6dbc
 DIST libcbor-0.9.0.tar.gz 275405 BLAKE2B 7e78722650c702552dda4844615c454989281abe8c45ba3c9168af16e9d440a1b7e4e0c9afd89faa48e74ba85dcbe0c7733eec3e44fdafc0ca340e97574fe274 SHA512 710239f69d770212a82e933e59df1aba0fb3ec516ef6666a366f30a950565a52981b0d46ca7e0eea739f5785d79cc21fc19acd857a4a0b135f4f6aa3ef5fd3b0
 EBUILD libcbor-0.8.0.ebuild 1400 BLAKE2B 7ac71bd26273ecf58e7aad467dde3ce9ff481df063cc8560430c83315df0811b6449d554fb5d07cf759c7c6d43ad582891b5d77bab131c47886e3ac6a10d9c64 SHA512 8f5a022618f982241debf0dae641c32449c2c7d37099b70efe390833d371ef498cd76556bac9e31431f9da70bedc33f117accfab72ed7203b405a0f56324b95f
-EBUILD libcbor-0.9.0.ebuild 1408 BLAKE2B dd4b171b25c73975d8026d0cb3fbeeb65ad09adc4e48f597b5d541a7d3b435d4e7ae3b71e301e4b691c1e884cff86bf35e79a0ab901e88f93306e467bbb24446 SHA512 812473227cb138c6443897733a38086c9e09a561a5b1149b7fdcab0ca42a817d7f9e2df3021750ba64e0401841a56813540c5d57cc2be22d5eb5a5c1294ba565
+EBUILD libcbor-0.9.0.ebuild 1414 BLAKE2B a29cfa3b2b76f49ea79a7a284e7efceccae8ef01e7735713abc411c1acc0b2151034037f829448e5ccc9f74dbb2a46560f2e803615779404033f2908d2691f1e SHA512 e500a1ca4e9700ca176511ae1ba56409f2646988a1135e5008dcf26824a72a2eb75379ec46503cd92cd4fcd549eb556e75d9a21b0a625a0c62565206e98f3b4f
 MISC metadata.xml 354 BLAKE2B d9752402ef9faeeaea114dbb4500672b2f4afd3c76787723c7b8037de18bb97e76079da1365905aa1b13d6852302632c7bcb46b8a685c90b5d04cb479c066c21 SHA512 bfe13a6ade46439d252cf3848a006b05ee8ac053fd80b091d0f01a2a67fe4fb1018ddd15d3a410f9061e59001f1dd448caa0a063e5fb5df180864cae830d02e2
diff --git a/dev-libs/libcbor/libcbor-0.9.0.ebuild b/dev-libs/libcbor/libcbor-0.9.0.ebuild
index 2c1723006aef..a48480af6a93 100644
--- a/dev-libs/libcbor/libcbor-0.9.0.ebuild
+++ b/dev-libs/libcbor/libcbor-0.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/PJK/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="+custom-alloc doc test"
 
 BDEPEND="
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index d66eaddf8414..0d5869ccbec2 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -1,9 +1,7 @@
 DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2
-DIST llvmorg-13.0.1-rc1.tar.gz 147284646 BLAKE2B 3a1d8d382de633b7f8fc998f8ad1e03c24b733aefc591615cbd34115d1d6d74962ae33bbf2224527b521a76930ffee425527225563a558a04173e9aa9487c781 SHA512 d487bfc9b898ad0046e0c94338d7757d8a05a1a84d683abfbc9ed4994c6d12caf88fd18575225e284070fc67b3ac0970ca6639e61b1a7cc2948b216a5364a22d
-DIST llvmorg-13.0.1-rc2.tar.gz 147304491 BLAKE2B 86b2c64e57e4aaab837229b25a95d5517ac077d22cf552d71ff6b996dbdbcd171ad51de7eb12d098b50a139beda4ace843727181a1c6978fc487215391e64a3a SHA512 0d890f3317504c8cef10e118b245e5a4c815cc19f07cbc511a66bde6c9b1f3d15c167942608a8987befe9115b24657d29f72305f9f2794385a7434b80167f40f
+DIST llvmorg-13.0.1-rc3.tar.gz 147302323 BLAKE2B 9ac2f97568062d7dd618295a68d6e14898fcd69e2bb66290b999ceb8c12132371f4e9b59d8ba2b252e5e5cb249045676b24fc50c117b2afae20abab98f426582 SHA512 88a04ad02af2d41ec21c7a62bad21ee0e627b7276a16795875afd062ed29ac7fb4aadec5b5e48785a6502c9fd797a4b67d648a21f193c9f7602112870b10a3d1
 EBUILD libclc-13.0.0.ebuild 1431 BLAKE2B 023945ee57d09ff8763d18d0076733f929d7d0834757e9c7bcc02398512899a3c004a5c79d25f3c33418114824d03e78d904022f889cd7420eafb95a1d3543a0 SHA512 536fea5a39a795ea8984cafd271617291c6da14ebb39214a448a835e62e80fcd1ce004e69b770a22c78e1660209f76efd4fd2e6dc90b0b431b710dadb7f9824b
 EBUILD libclc-13.0.1.9999.ebuild 1422 BLAKE2B f3af05e150ecfe6545b45f5aa8e1e37a99193eb00f3fdd3d2ac35824898ae1f7279233e1db91456dfa665f6f14689f3eb39db95ccad2aa3d36f9ff60320677fb SHA512 a37bde17738852f5e824108f99bf65535bec2fb2e568e5d9d00b5ee14ed2b07c3a26db19bbea03c8950b6f3d1f60a05fced021d7b3aa93964395b0e6b235e568
-EBUILD libclc-13.0.1_rc1.ebuild 1422 BLAKE2B f3af05e150ecfe6545b45f5aa8e1e37a99193eb00f3fdd3d2ac35824898ae1f7279233e1db91456dfa665f6f14689f3eb39db95ccad2aa3d36f9ff60320677fb SHA512 a37bde17738852f5e824108f99bf65535bec2fb2e568e5d9d00b5ee14ed2b07c3a26db19bbea03c8950b6f3d1f60a05fced021d7b3aa93964395b0e6b235e568
-EBUILD libclc-13.0.1_rc2.ebuild 1422 BLAKE2B 4581595de54d598a5aee5fd78b594a8aaea3c08913cf48597dd1aec88fdd299bc104ed44919ca96ea7b9ace2f290c370ce2edfcb57ab46fadc9e380b7bbce634 SHA512 1f0749b33eede2d913c2700511e46042f70c8825292ac47a2cf0b1c9ed0de470758b5d0222f11cde20b83d7599abc0150918d405c409837999529be2baf3535b
+EBUILD libclc-13.0.1_rc3.ebuild 1422 BLAKE2B 4581595de54d598a5aee5fd78b594a8aaea3c08913cf48597dd1aec88fdd299bc104ed44919ca96ea7b9ace2f290c370ce2edfcb57ab46fadc9e380b7bbce634 SHA512 1f0749b33eede2d913c2700511e46042f70c8825292ac47a2cf0b1c9ed0de470758b5d0222f11cde20b83d7599abc0150918d405c409837999529be2baf3535b
 EBUILD libclc-14.0.0.9999.ebuild 1443 BLAKE2B a1074740140a14cd68ee7491b4d1dc3d296accaa269a82cb4f98f8a3c49935a43a61e43bcd9c8da4435040117fdc170dd153771d5581f765f9375be98fb72ded SHA512 540a4bbfed08807ae4fda13516126d85c4fa5e0756d2143a2bd2b4c61d9c0cc538ff34a77d7147bd54ed315af9739b273d0b5f63921496bb8f99dba5b014d6a0
 MISC metadata.xml 395 BLAKE2B fe71cab225f1879c7bfcb591a2bf96aaf7c2d454a3b83a8f4730e36c609d7064a9f0a3c9cd105eb11248a80e552a6ddddaaf69db0ec7c955356698a63042f9d9 SHA512 160750cbd7da115c3b9d070a73afac330c6841cb4a0d3102c65f4e9396c008d82431e14f66fae1c7ec83199a97d3749b662cb01d9d769ee20bd6d08666f5565c
diff --git a/dev-libs/libclc/libclc-13.0.1_rc1.ebuild b/dev-libs/libclc/libclc-13.0.1_rc1.ebuild
deleted file mode 100644
index de9b38e9f826..000000000000
--- a/dev-libs/libclc/libclc-13.0.1_rc1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake llvm llvm.org python-any-r1
-
-DESCRIPTION="OpenCL C library"
-HOMEPAGE="https://libclc.llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
-SLOT="0"
-KEYWORDS=""
-IUSE_VIDEO_CARDS="video_cards_nvidia video_cards_r600 video_cards_radeonsi"
-IUSE="${IUSE_VIDEO_CARDS}"
-REQUIRED_USE="|| ( ${IUSE_VIDEO_CARDS} )"
-
-LLVM_MAX_SLOT=13
-BDEPEND="
-	|| (
-		sys-devel/clang:13
-		sys-devel/clang:12
-		sys-devel/clang:11
-		sys-devel/clang:10
-	)
-	${PYTHON_DEPS}"
-
-LLVM_COMPONENTS=( libclc )
-llvm.org_set_globals
-
-llvm_check_deps() {
-	has_version -b "sys-devel/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
-	# we do not need llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local libclc_targets=()
-
-	use video_cards_nvidia && libclc_targets+=(
-		"nvptx--"
-		"nvptx64--"
-		"nvptx--nvidiacl"
-		"nvptx64--nvidiacl"
-	)
-	use video_cards_r600 && libclc_targets+=(
-		"r600--"
-	)
-	use video_cards_radeonsi && libclc_targets+=(
-		"amdgcn--"
-		"amdgcn-mesa-mesa3d"
-		"amdgcn--amdhsa"
-	)
-	# TODO: spirv
-	[[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
-
-	libclc_targets=${libclc_targets[*]}
-	local mycmakeargs=(
-		-DLIBCLC_TARGETS_TO_BUILD="${libclc_targets// /;}"
-		-DLLVM_CONFIG="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/libclc/libclc-13.0.1_rc2.ebuild b/dev-libs/libclc/libclc-13.0.1_rc3.ebuild
index 1da191d1914e..1da191d1914e 100644
--- a/dev-libs/libclc/libclc-13.0.1_rc2.ebuild
+++ b/dev-libs/libclc/libclc-13.0.1_rc3.ebuild
diff --git a/dev-libs/libdispatch/Manifest b/dev-libs/libdispatch/Manifest
index 4be75f4f4e94..9cb2560adb43 100644
--- a/dev-libs/libdispatch/Manifest
+++ b/dev-libs/libdispatch/Manifest
@@ -1,4 +1,4 @@
 AUX remove-Werror.patch 1217 BLAKE2B f7ef18089abcd11fb8ed36980e681a804649b8ad8891b97113966c099bb05178604983359b79eb853ad6256a6c116fa8fdca116b29e2d6108c2a38fff01472a1 SHA512 0c17b1b36a02b401182a91e1f751f71b343f1d61ce7340230fdb13e89354316d0f2863fc3ea2f1a33bee6033c79e30e35024519c515a03a4d88467456ef340cc
 DIST libdispatch-5.3.3.tar.gz 591794 BLAKE2B 982b99227a1292d999639e7b16c1382a38dd6799a0ea1b83dd66333d5b6388be809127565fafc7f171dab9d8aa388cf67316d7eb6fa2ae2e1b8ccf660b32f0ab SHA512 b76071e8fac19ef5aed8cb3998b903a17a4f2b9e6b992d22d394212f4d48c4a547fb7a8cf16e4ce2ef17d6b58e253c2d52c6b176c3a874132410215b73332909
-EBUILD libdispatch-5.3.3-r1.ebuild 1016 BLAKE2B 4141eca689244076d295d418a96d9509b154309985b474930a6d1c2e418f85069e3067bed613cac7b6edaf4ca11e8e1d02ab4869e4f4db4836acf8aa8eb361ba SHA512 5a6493b703396c833141e5f211a73393c81d73f54d6ddeeb5637beadb3559805e147f8f0e91a6084ef8dc8d9a8d2c03bdc6fa5ea4178bc8ab72632d49d169458
+EBUILD libdispatch-5.3.3-r1.ebuild 1013 BLAKE2B 6e71f0a4c7304d9bf72a3e05db52b3105d1cd97ed01583bf5327af0825b6da4709439357e303e27abd117d3b502040a18c34fc221de1961c90ad43560e6ec6a2 SHA512 64441726d02a68aa4c0cd23dda4cbc82ac1c6b5c7abb627bad4a363cc43832721abc033611c763216df25bf18c5f00500cff009b0454ed8fa3023dd5f348bad3
 MISC metadata.xml 350 BLAKE2B 179ce6945eeec3c78414fb6dd66822f26ac6b629528da5868b44d3715355ec80acb1cc5dd8357b659f31877c83bfc10ae8b236367904bbbdd36d2ec7c1458739 SHA512 64646993f5469b2573385aa94fa578ae0e7645f4c5a30b631cf1d0de9ac5ef88270ba85e95f684b884631ec21d7ef31c4d68b563923901651da2ec631b0ccff5
diff --git a/dev-libs/libdispatch/libdispatch-5.3.3-r1.ebuild b/dev-libs/libdispatch/libdispatch-5.3.3-r1.ebuild
index 1f05cf1d1cdb..5ec153ddcd8c 100644
--- a/dev-libs/libdispatch/libdispatch-5.3.3-r1.ebuild
+++ b/dev-libs/libdispatch/libdispatch-5.3.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/apple/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ppc64 ~riscv x86"
 
 DEPEND="!gnustep-base/libobjc2"
 RDEPEND="${DEPEND}"
diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest
index 5546879cc6aa..0559f11b3e15 100644
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@@ -1,6 +1,6 @@
 DIST libevdev-1.11.0.tar.xz 445316 BLAKE2B f3c1aa688d83f4a27abec23f18817bbdb7a5911cc30fab694271f620c23273cf20109598edb0049239e78a173baa20471ad1f25266eff34a50ed8898d7b86080 SHA512 b3c6b4a1532c5142f3684b920dcdd497a5368aec516e8c389e2c8f9d1eaba16c907b2a7f2c82a3c3ff89bb4d0ae5503c736098c095f9f1bc98f0668e99bf639d
 DIST libevdev-1.12.0.tar.xz 443716 BLAKE2B 1df548cc9bc2472c88308eb2794df7d5636d498631b8873a1957f5cc959097235e64f46f61285a3cbe1abbfe1d968946ae181dfcd8150fecfddf212ed7f4e07e SHA512 6c1c1362d5112cdf3816d1f735c27e625f5463ebf10a83d675cd9364c3fb291ebcb91c051da442f1a36ed28ba7dd99af74546707f61274f7d5715c544a0ed04c
 EBUILD libevdev-1.11.0.ebuild 1111 BLAKE2B f10e33cfa17f0171956e65da7125225ff1d39d6356f48451465523fab1bb0112f6842aad3986c7720ddfc240e6cdf9162a7394038893ffd23d0b44badea90013 SHA512 9903be70f11c5ea07ac6c4005ad698f3a93068f8d30118cdade48833423ae73ddee35660e2a7d54a4cd2309a5e865d30ad50347af8ea445529eb2b0b4473d831
-EBUILD libevdev-1.12.0.ebuild 1125 BLAKE2B ce62c1ea5c7af156ec23f634c96464493bde831a5b52e9a1bdb380d7599ed5d73e7dfbbde2c1e76db8793ff7e7d492a98de2e4e756a79a3680514f8bdaa9e3d9 SHA512 96b8725a9a580a343317270ce5b2c2a73f1927e20ce8c02cc807bee9d83df9351a2eb19c34c5f29c2b3ec3d4325f53e0063755e6894d3ce5b4c7e3994ca78e79
+EBUILD libevdev-1.12.0.ebuild 1118 BLAKE2B 49f2238cca846d4cc9b3c99783924be11be9631c42f3c41d62970f75d7a42bad8fed5f18ccad37409cecab950af4433586fa383da2cb75cfc154025dc8817f17 SHA512 c42f0802afe1a4f84a32dbaa444d9e612cb3d003fe14ec52a8cce30eb465bf56cc21635edff78679f6058aa733bdc78589edec222e7301a39348381722264675
 EBUILD libevdev-9999.ebuild 1119 BLAKE2B 7454c31abb9ea204726b25bdf082078716cca0e911e3012121c06cb37663ebf911e48765a5e718db2b65ace23cebcc305e34129576e4bb1ff863829520f21b6d SHA512 805de4364e75326dada41594b727af707f8b1682b990cc4871a475a545b43a4539e29b57b26bde18e72620d38f2dbae0139094e8d00b4c872b0bd174a83fe8b9
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/dev-libs/libevdev/libevdev-1.12.0.ebuild b/dev-libs/libevdev/libevdev-1.12.0.ebuild
index 87b1d58afa37..2c4a086e78b0 100644
--- a/dev-libs/libevdev/libevdev-1.12.0.ebuild
+++ b/dev-libs/libevdev/libevdev-1.12.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://www.freedesktop.org/software/libevdev/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/libevent/Manifest b/dev-libs/libevent/Manifest
index 2949a0f2361b..e417541e008a 100644
--- a/dev-libs/libevent/Manifest
+++ b/dev-libs/libevent/Manifest
@@ -1,7 +1,7 @@
 DIST libevent-2.1.11.tar.gz 1082234 BLAKE2B c6721589834bff027a8149ee0076e1877fba000d1712a405e20030192d9c81b892d0930bc1a4774650bef4cb08c60ac81b5928dc17346492ae7e4ded2125579a SHA512 9d0517b117f128f4f196b19a810524814bab75fa967d533063aaa619d3cf2dca97b443edd5805b764da2993d8e37caa536dce39f68ffcc2a88d32a89204c2de3
 DIST libevent-2.1.12.tar.gz 1100847 BLAKE2B bc1ace15f639ecef2e6b3f95976b8830c1d86f1d06606dd949e2978611fdf9859ed4eb9292d13e6e90e3835063edb94aae64a15c518d5dabe680f37d5a7f5290 SHA512 88d8944cd75cbe78bc4e56a6741ca67c017a3686d5349100f1c74f8a68ac0b6410ce64dff160be4a4ba0696ee29540dfed59aaf3c9a02f0c164b00307fcfe84f
 EBUILD libevent-2.1.11.ebuild 1585 BLAKE2B c161f33d7495496181920013ef14d7dd81667259b1bf90f08f24939a9315aad47de251c8dc3c7dacf385f01180ee74aa0603b0b43f3c6a92edb0b848998320e7 SHA512 a40c419b90d930d5f9ced97c1e86af0a643e2fdfebd12f4b0bc22e68eb5333a27c1d7200297d0b0053f428afba8dc36f0386507d6fc48cad29cf106c546c5ca2
-EBUILD libevent-2.1.12.ebuild 1782 BLAKE2B fc81705414664ac1032d2f721e221cbba4de757ef96e820a135c66c67e25cf820fbbbf667a149a5053c4b61b1db7e14c761f6b0672c5d9cb7e214dce14a4ceda SHA512 0324940098b1e024f40a30f05d1890c5f72bd7c892fc9db50fda6fca352f05db2fe33c5ab0875ec576306a2475692e64708d5be8136fb9dc956751576693cbe0
+EBUILD libevent-2.1.12.ebuild 1781 BLAKE2B c8f9deeec10cb3df87967151501b5dd4b6aa559555644a79bc48a4cedf67438e87a2cf9f97f0740d8c0d9f56c4e0c5c651d49d14da8e9ab636e9f4bf7fa7e8bc SHA512 6244116c2a9cf2bcf3efb24ee09c9ff8227ede7b854f9ecf9bc5c99fa45b499025ec96fcc4ba555826232508bdee7b24e1c53c3cbb25ede635cc094a6942ab03
 EBUILD libevent-2.1.9999.ebuild 1373 BLAKE2B e63481164e06fcf66173232ebc124aa7ec71c017f576fa2bda552da6ed38c1c292a8953406829d8075224c65a408256da2cdd8e6225831ce56aa4077f4a4e8a2 SHA512 9cb3489ddf24f00a09768d29c78fa88481c5ee738239a38837225a0af168a10102981a4c1b84e1736105811feb71881bd5ab7b3ef84fa4f00cdbb339fa644cfc
 EBUILD libevent-9999.ebuild 1375 BLAKE2B 81351bd0afe5fdc579f19105a7ab7aeb0b76d45291e4ae5cf9d7cb3ef47e1926846ebc33236c12bba08746ee2f3ec54ccf8822f1e671e1e5678c3c9865aa9b6b SHA512 9651907284b14c63de0daeb3d93706fd1ca1711b886ef4327c59f5040ea870b02f9e144be223b3b47746fd8f8a01ca88dbcdb3ce2fe019043033f2fc495306d1
 MISC metadata.xml 935 BLAKE2B 45e1677dd467a0b9f0de89bf9966cec3368da090bc330c7b31aa8528d19440e3523ef3afb67d27102cbf4b40ad8343dc03d040f5961629e2a43d55fe46d7e5a6 SHA512 a7a5ac5c59e2a767bbb511c4eefb53535d894a936d5cd0e9206c176a4f50dfc90387a46a35ece2b48740974f9352793ab56026573678ab74e3e1e5250799bdcf
diff --git a/dev-libs/libevent/libevent-2.1.12.ebuild b/dev-libs/libevent/libevent-2.1.12.ebuild
index f99b2cc3942f..b25c5ebe459e 100644
--- a/dev-libs/libevent/libevent-2.1.12.ebuild
+++ b/dev-libs/libevent/libevent-2.1.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="
 LICENSE="BSD"
 
 SLOT="0/2.1-7"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="
 	+clock-gettime debug malloc-replacement +ssl static-libs test
 	+threads verbose-debug
diff --git a/dev-libs/libfido2/Manifest b/dev-libs/libfido2/Manifest
index cecd0db3e668..d1680a39b0b0 100644
--- a/dev-libs/libfido2/Manifest
+++ b/dev-libs/libfido2/Manifest
@@ -2,5 +2,5 @@ AUX libfido2-1.7.0-cmakelists.patch 867 BLAKE2B ce559f70b1bc22731b16ddfd30b4a0be
 DIST libfido2-1.8.0.tar.gz 535947 BLAKE2B 48ca29fc1b582b4c915ce3dac2b3c24b1c71b144681f77f13059a599eb5e38b263442abecacad495e28a6fea63fc98c142a32939bb49a521b6a6a8d4ad0f1ff0 SHA512 dbea52a80068323e9945ef7a6e93ab1438bc4347390fc91694a94669900d4ce4abe95e1b6df90fe8b6b2dde6b5d28d9dc0c6b022c24ccb661f28c30c33417999
 DIST libfido2-1.9.0.tar.gz 576088 BLAKE2B 19d2933178011aebf11b44e12550518937b204a40b781ade565bd2852de6d1bbb88dda90f612e852e4561b7a9db6927df9d0a9f0b4c511208f3ab648b2cf1a9f SHA512 99edf9c52a871ed5dc3ab41ac07ca8a22670e7527c48ed69c096f001651e1e714bc3f1f55e22003cb66670fa4e851095834c2acd0e5b31887fad46bfb9f4b089
 EBUILD libfido2-1.8.0.ebuild 995 BLAKE2B f072b7bb688f75979af0fab6e848c8e6c654e87112a2cd899663eb06bcce7ed9df8ca902fe534300ad8e111c1f1c49c3612cc6eb44fc34ffb5b4f51e6e648e4d SHA512 85a8f6da7d4c485a1d8495f97866aedb9c5f2b63f2f91c8eb13801bb4b233a8038b6f78af05123d890187c2d2c182e3a1807f8e6c8a7eba8c5be025134a4281a
-EBUILD libfido2-1.9.0.ebuild 1002 BLAKE2B 9ee8b96698111a25e876eb70e9a5de6b93a4f38a7e8a18eff56a0d9ba6124e530807483d813c4dc700de6ca346f9cdd3902ca95fb922fbb1049ddf5b87e3b2ae SHA512 eb5a86f9375c22e469ade49f791865337260b926f610fa5e8ba1ef0d860396b5a45eac85927a57c39dc2155345b2940d92c5690b20071b40b33a765a3d771cd6
+EBUILD libfido2-1.9.0.ebuild 1008 BLAKE2B 72b7acb5728033a9254856404e7f6b34e0c61a57a4b88e90297c9a92b9fbf1aa7e66aa9d4b3a1d011f7cd4c4b4aa42898ab4b8fe526da42852710246c799ae66 SHA512 a74fa35fb706e77e353a94c73242db6f733e62a8d98fdbab428a173e8f36cf5685133308b165aa91cd3690559e8085c90ca9326d2eadf51fbb8abab955382dc4
 MISC metadata.xml 331 BLAKE2B dbe587eb713db674febdaa58494979a44bee5a40345ef37ce67fad22e629e73948fd7e66c3109e010a7f2a51c769f5079f70ee3812098b4673eb9a5b7e70e6fe SHA512 355fd46051ca69fa79ea4953a361f8981cc75c0eb77d1e4b9315ffb3de75662660e7072211967d452dbf2ed3d3ba31baa355cafd8dae1c13e245620b0c1e7f86
diff --git a/dev-libs/libfido2/libfido2-1.9.0.ebuild b/dev-libs/libfido2/libfido2-1.9.0.ebuild
index 7a6d7db00223..3ff00061a391 100644
--- a/dev-libs/libfido2/libfido2-1.9.0.ebuild
+++ b/dev-libs/libfido2/libfido2-1.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Yubico/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="nfc static-libs"
 
 DEPEND="
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index d25b5f568165..0f43c2bbda72 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -1,4 +1,5 @@
 AUX libgcrypt-1.6.1-uscore.patch 843 BLAKE2B a1023bf915e342dd52d07d4c497d3e514c8c4b6c621e4f8704c4841fd95d48773f0af850a456c6f80b80deed878be1334f08f8181f97dce64ed9e61f5cb1bae5 SHA512 971814ac34f17464a96fbc110fe995923d873981949a0126e50c206d39499d6146fd00414e837774e6932e4b491cc68c4147278d6216dda630fb876bc8f61791
+AUX libgcrypt-1.9.4-arm-neon-compile-fix.patch 1389 BLAKE2B 548fc764050f322786f3c0ec8f806a6a897987115db0cfd8a2a4f1ffc134a31e9069dca4e334a7a5288f5176ce8e2e8450dc2003c56915d5fdd4dc3c11012c0a SHA512 0b83ab2585502d65d1ccf36440f4a73aa9a9d3a8cb40375ca6a4e81fcc962040fb233df9a345c823281605c061b8ea0e509e0e16a5c3a32581a279e5904bbfd0
 AUX libgcrypt-multilib-syspath.patch 588 BLAKE2B 6a8d30246263339571455df3c1cccfc9f38e50117cef34bc92ce37a296c3e31017c0190923ea992f51706c55a63c6f75b1d9fc7d8d40930707486f419e1795c4 SHA512 913c1a474aba50ec3589fb5a991f65204ba2cc28203b92353fdef8fb092350c3be814a57f29a26a2176627509a4f573f6db02ebdbcde3f04a2f1d632879293dc
 AUX libgcrypt-powerpc-darwin.patch 444 BLAKE2B 37b95d21f0df07c5c06cd7e1e1efe73d02b9ac59dfe2a31d43b7a535bed356ff24095d528662d58a0cdc9c3eb25de50b5b5a4d9feb0ddb917a42f9332b33982e SHA512 2a2e7e84222f4672a70df827955bb8592e714580fecf6b5238e131038460169f9d80fd04d63d6e232f6fc448c04e0acf214993537ef22e297ea98a4d12c6ade5
 DIST libgcrypt-1.8.7.tar.bz2 2985660 BLAKE2B cb2132b826f3f3af240e6c9ac5fd992808aa17ce64144d17452591a5b1e402564af82c021b58f5fd620ebeb5894ac9654835f6d8376ec05ee41fc02189dd6825 SHA512 6309d17624d8029848990d225d5924886c951cef691266c8e010fbbb7f678972cee70cbb91d370ad0bcdc8c8761402a090c2c853c9427ec79293624a59da5060
@@ -6,5 +7,5 @@ DIST libgcrypt-1.8.8.tar.bz2 2987685 BLAKE2B 7b590c06d91403f1bbfa108379b3747271e
 DIST libgcrypt-1.9.4.tar.bz2 3239704 BLAKE2B b8244bc12a68955797b0c2b474ac5c95df1014231f7180a2ffa113e3aacedc98eed60ee1e4b30b032a5fcd6a04855ae07142c223906d5db9c28328a71e014f33 SHA512 d0e117ac73c94d70e9521ee1e6328691498cc8328f8c4e21338096908f5c04c7b838966eb63d59494565f4e19f506c07dab4f4d922150d75610d9f7b57abbf60
 EBUILD libgcrypt-1.8.7.ebuild 2307 BLAKE2B 07fbec8932d2aa100e835463a98cae64451eac74ad8e0f9d96d642d7f7430bd4e778b82e6851c537f3e31a11b5acc52a396bb9c86cb21d81556417e0ee49e922 SHA512 8225fbe1f3154766235ae022bae1e0a31287ff6b27f6cd68b549724c13469ed32bd6387817b95bf6e2baa5a6b6be28b0914043b995cd1d0ffd258dfc200134a5
 EBUILD libgcrypt-1.8.8.ebuild 2318 BLAKE2B 335fffac9a01ebe760a019fb668ce229f22ac6bc6aea38d2fd893fdda587d76895b0bf27146a32c4817d955eab4ac5ae9aa032a3157f9dcf3ae07a98599cc60e SHA512 eea978726cb25bb0c9de94b8617cabd3e5c28b20010ccfba2f4124a4609b655d496ea376d9d72bf07c031116433f74c03d69335950ce295d922ae83801a19ada
-EBUILD libgcrypt-1.9.4.ebuild 2844 BLAKE2B 53eb4fb610facb8455ddc557ac9333e1fcab61b2bfa8db28cf09ba9fa13b4b128dca92f0eaf43bc90745b3d533ad08e671ac5c6cdebcd5b6cffed1cc349de103 SHA512 77e9afc4fe1990ac2cf3d1ec96123a17f6327900d4565e16c98cf06027e397f3aca0b24bd56cee07a7a3f10d7ad5f6c914c9fb7ef3d0422dff91e0403816d217
+EBUILD libgcrypt-1.9.4.ebuild 4414 BLAKE2B a41923959d6ab0fc6a75c9c799cee492293b656628a50acec6c3692bccdddc1f7e4ec8b1a8764da64c69ccac4bea8f4d757f3b30cd1efb93eea98fcab236fa0d SHA512 344586cc5b6c373b920a53b7c3835da6c2e76108102d5b8569671510b2c1e38f5e12036b0256a07036ef335c02ed1ac5ae38fc2de99579dd421edbb173c49c54
 MISC metadata.xml 597 BLAKE2B c16e58e302622a51420a94adf5a3f47bf16e49cf5c3e21f5c552d1f64a533aa9ad9a58ae15fb4a314bf7bc833706f0a35ca74305fe96e40a6f8a5b20a267e2c6 SHA512 0d5ea002080a6e0d656c2be39b725168a323ec9536ec85cf791d64d7f0dd8255e3dd541934866c61d61d19789860fc71b2f6fa11ffdfc9b83c8177773f451632
diff --git a/dev-libs/libgcrypt/files/libgcrypt-1.9.4-arm-neon-compile-fix.patch b/dev-libs/libgcrypt/files/libgcrypt-1.9.4-arm-neon-compile-fix.patch
new file mode 100644
index 000000000000..a42b0e89008a
--- /dev/null
+++ b/dev-libs/libgcrypt/files/libgcrypt-1.9.4-arm-neon-compile-fix.patch
@@ -0,0 +1,44 @@
+https://lists.gnupg.org/pipermail/gcrypt-devel/2022-January/005224.html
+
+From bc0b82ad8201a4d7bffa3cf0f5504b72c1011cb1 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 18 Jan 2022 12:44:22 +0000
+Subject: [PATCH] cipher/cipher-gcm: fix build failure on ARM NEON
+
+'features' is only defined when relevant CPU features are found, but
+one of the uses below its definition checked for GCM_USE_ARM_NEON which
+wasn't in the guard above it.
+
+i.e. We used to only define 'features' when:
+- GCM_USE_INTEL_PCLMUL
+- GCM_USE_ARM_PMULL
+- GCM_USE_S390X_CRYPTO
+- GCM_USE_PPC_VPMSUM
+- GCM_USE_S390X_CRYPTO
+- GCM_USE_PPC_VPMSUM
+is set.
+
+We were missing GCM_USE_ARM_NEON so when we check for GCM_USE_ARM_NEON
+below, it'd fail as features wasn't defined.
+
+Bug: https://bugs.gentoo.org/831397
+---
+ cipher/cipher-gcm.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/cipher/cipher-gcm.c b/cipher/cipher-gcm.c
+index a039c5e9..22834f35 100644
+--- a/cipher/cipher-gcm.c
++++ b/cipher/cipher-gcm.c
+@@ -583,7 +583,8 @@ static void
+ setupM (gcry_cipher_hd_t c)
+ {
+ #if defined(GCM_USE_INTEL_PCLMUL) || defined(GCM_USE_ARM_PMULL) || \
+-    defined(GCM_USE_S390X_CRYPTO) || defined(GCM_USE_PPC_VPMSUM)
++    defined(GCM_USE_ARM_NEON) || defined(GCM_USE_S390X_CRYPTO) || \
++    defined(GCM_USE_PPC_VPMSUM)
+   unsigned int features = _gcry_get_hw_features ();
+ #endif
+ 
+-- 
+2.34.1
diff --git a/dev-libs/libgcrypt/libgcrypt-1.9.4.ebuild b/dev-libs/libgcrypt/libgcrypt-1.9.4.ebuild
index 544ba718baee..b921a352a0e5 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.9.4.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.9.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,8 +11,22 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1 MIT"
 SLOT="0/20" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+asm cpu_flags_arm_neon cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_padlock cpu_flags_x86_sha cpu_flags_x86_sse4_1 doc o-flag-munging static-libs"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+asm cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 cpu_flags_ppc_vsx3 cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_padlock cpu_flags_x86_sha cpu_flags_x86_sse4_1 doc o-flag-munging static-libs"
+
+# Build system only has --disable-arm-crypto-support right now
+# If changing this, update src_configure logic too.
+# ARM CPUs seem to, right now, support all-or-nothing for crypto extensions,
+# but this looks like it might change in future. This is just a safety check
+# in case people somehow do have a CPU which only supports some. They must
+# for now disable them all if that's the case.
+REQUIRED_USE="
+	cpu_flags_arm_aes? ( cpu_flags_arm_sha1 cpu_flags_arm_sha2 )
+	cpu_flags_arm_sha1? ( cpu_flags_arm_aes cpu_flags_arm_sha2 )
+	cpu_flags_arm_sha2? ( cpu_flags_arm_aes cpu_flags_arm_sha1 )
+	cpu_flags_ppc_vsx3? ( cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 )
+	cpu_flags_ppc_vsx2? ( cpu_flags_ppc_altivec )
+"
 
 RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
@@ -21,6 +35,7 @@ BDEPEND="doc? ( virtual/texi2dvi )"
 PATCHES=(
 	"${FILESDIR}"/${PN}-multilib-syspath.patch
 	"${FILESDIR}"/${PN}-powerpc-darwin.patch
+	"${FILESDIR}"/${PN}-1.9.4-arm-neon-compile-fix.patch
 )
 
 MULTILIB_CHOST_TOOLS=(
@@ -39,11 +54,26 @@ multilib_src_configure() {
 		# function for that, we'll have to abuse cflags for this
 		append-cflags -Wa,--divide
 	fi
+
+	if [[ ${CHOST} == powerpc* ]] ; then
+		# ./configure does a lot of automagic, prevent that
+		# generic ppc32+ppc64 altivec
+		use cpu_flags_ppc_altivec || local -x gcry_cv_cc_ppc_altivec=no
+		use cpu_flags_ppc_altivec || local -x gcry_cv_cc_ppc_altivec_cflags=no
+		# power8 vector extension, aka arch 2.07 ISA, also checked below via ppc-crypto-support
+		use cpu_flags_ppc_vsx2 || local -x gcry_cv_gcc_inline_asm_ppc_altivec=no
+		# power9 vector extension, aka arch 3.00 ISA
+		use cpu_flags_ppc_vsx3 || local -x gcry_cv_gcc_inline_asm_ppc_arch_3_00=no
+	fi
+
 	local myeconfargs=(
 		CC_FOR_BUILD="$(tc-getBUILD_CC)"
 
 		--enable-noexecstack
 		$(use_enable cpu_flags_arm_neon neon-support)
+		# See REQUIRED_USE comment above
+		$(use_enable cpu_flags_arm_aes arm-crypto-support)
+		$(use_enable cpu_flags_ppc_vsx2 ppc-crypto-support)
 		$(use_enable cpu_flags_x86_aes aesni-support)
 		$(use_enable cpu_flags_x86_avx avx-support)
 		$(use_enable cpu_flags_x86_avx2 avx2-support)
diff --git a/dev-libs/libgnome-games-support/Manifest b/dev-libs/libgnome-games-support/Manifest
index 550ab31be717..124232671d2c 100644
--- a/dev-libs/libgnome-games-support/Manifest
+++ b/dev-libs/libgnome-games-support/Manifest
@@ -1,5 +1,3 @@
-DIST libgnome-games-support-1.8.1.tar.xz 45264 BLAKE2B a2bb36bcff92d3e24e3f6092437cf1e2fc93de6a891ce85448d0b68d42e0b717a084fd0af927a0ec0203af79b6f7ccc67c64c4f6b7a23473bc624cba8e0489c2 SHA512 ed5ba94db9ab3d6193e7bb2d0956e20c42577b9fdba4d1d31acb252c43d248cc9b478c807b5f9489dfc88d6757bf95206405d0adf4fb68aa50b8f9d1b6ec59bf
 DIST libgnome-games-support-1.8.2.tar.xz 45328 BLAKE2B 6df5e49629f65a12a683b6c026afa0629132ef3462d714f751fe75595a74dc3d3ab24c50c4a05e893999271ca66cd8395f36fc56ad01139a16b7f0c610fa2def SHA512 6c622b8a64df02be53b56cf8f2da6c9bc866f30042eb61c621db5ab38c4b88e90151c81a71eeba4f8d182b76d581df31f822409e633b45ee928737001f65f16e
-EBUILD libgnome-games-support-1.8.1.ebuild 667 BLAKE2B 6871cab02e73f20baaf7b8b0b53262ee20292c318d83f622789f11d0e397d167aac7a42fff9d4b3053c3f29580519e94af9a114ab75a5b9b494b81b652c6810b SHA512 572e7e4a955324d76d632042aa3295740331bdeea6baa11ac71a3bf295f743dc66f11cea6b9b1945760454ac4bfb4b9180ead23905c31782ea8985b1f9a24251
-EBUILD libgnome-games-support-1.8.2.ebuild 648 BLAKE2B 7ad5f24652c972c8e61d3a8eb4d05b42dc1f9dca0e6807a243788302475241aab8fa06c92f3036e4b7d4d97c0acd3f54b078f356a3baff2b24e42d40e334eb9a SHA512 c474730af873cccef2b367630565dfab663dc46f1d62f263318c4892e66e6a0146eb824c44dc9691fa6f12d2fa5c5df43276cad6aae2379ce747a67add05dace
+EBUILD libgnome-games-support-1.8.2.ebuild 646 BLAKE2B 58d76ebc67c020abf58ab247d7bad72b61b42725012c8c0b0c04b6a293467a279a46b02422490f163c6bba6b495790c02a61e2ba1157441925e59cff34a4a543 SHA512 ce34f0719c73d142efae615e2c6d3b48d8d11b740ef4bc458a9583cd1f3f0f809d819405923e3c060f7ce2dc584375cca6346b5a968b446df15ea61608a126bf
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-libs/libgnome-games-support/libgnome-games-support-1.8.1.ebuild b/dev-libs/libgnome-games-support/libgnome-games-support-1.8.1.ebuild
deleted file mode 100644
index c938b13bf97d..000000000000
--- a/dev-libs/libgnome-games-support/libgnome-games-support-1.8.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_MIN_API_VERSION="0.40"
-
-inherit gnome.org meson vala xdg
-
-DESCRIPTION="Library for code common to GNOME games"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/libgnome-games-support"
-
-LICENSE="LGPL-3+"
-SLOT="1/3"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-# glib dep in meson is 2.40, but vala is passed 2.44 target
-RDEPEND="
-	>=dev-libs/libgee-0.14.0:0.8=
-	>=dev-libs/glib-2.44:2
-	>=x11-libs/gtk+-3.19.2:3
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	$(vala_depend)
-"
-
-src_prepare() {
-	vala_src_prepare
-	xdg_src_prepare
-}
diff --git a/dev-libs/libgnome-games-support/libgnome-games-support-1.8.2.ebuild b/dev-libs/libgnome-games-support/libgnome-games-support-1.8.2.ebuild
index 728265d4f924..5c6809aaca4e 100644
--- a/dev-libs/libgnome-games-support/libgnome-games-support-1.8.2.ebuild
+++ b/dev-libs/libgnome-games-support/libgnome-games-support-1.8.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
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libgnome-games-support"
 
 LICENSE="LGPL-3+"
 SLOT="1/3"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 IUSE=""
 
 # glib dep in meson is 2.40, but vala is passed 2.44 target
diff --git a/dev-libs/libgnt/Manifest b/dev-libs/libgnt/Manifest
index 46bee24de0ce..7ad492390617 100644
--- a/dev-libs/libgnt/Manifest
+++ b/dev-libs/libgnt/Manifest
@@ -3,5 +3,5 @@ AUX libgnt-2.14.0-tinfo.patch 567 BLAKE2B 7d9b1c0b520a3f2c3d74d6659a503f554c5b78
 DIST libgnt-2.14.2.tar.xz 106128 BLAKE2B d3db0ba3a297c14f32cc49b4e5b3392f47031e9406d862520a2f014f4d4e93c13e2ba5a2d61df81637f9dd7961d64ba69b393ee5b3cfebd7eb2768e3f16f29d0 SHA512 17b39e132b44b23486d7d39fa02761997a28abf53f67bf71bbad86d35124e5deb0363d670b2fb5ac99d47256282b0ef6ad1886e12984c868bb0d13ea7ba7d860
 DIST libgnt-2.14.3.tar.xz 106388 BLAKE2B bba785c998e53c75ed9c3b0b4ad1d96d63628a6e2b0ac7abec76a671ddfc0284fd787cd6793433aef83e6b31c6efecce0c656e131ca9b8bf548486de1010e1f9 SHA512 7131834cfe585177865bebf26167de08a04fced3da4e9a072d9b09b3becd1194914757b1a1fc8f129ae6c8fefe3ec1ce0d80d6c50cb624a5698b66ee2e06c6c8
 EBUILD libgnt-2.14.2.ebuild 779 BLAKE2B 4276e180412105d5a1efb42d90e63f53005314233b3eff2d080c9055d057377a0e8a151b536e4b9ca76c53e0cfdfbba79dd6372f5eaa8d35bd115a1fa86926b7 SHA512 9607b64bc4070f2817a9dab608af514bdd0bdb6fc9d338178aaf5d482b0b4c61835e8e9c71f9c60ba089c3576860d0a4cde8f12b537c7d0f020a1dcc721b52fe
-EBUILD libgnt-2.14.3.ebuild 751 BLAKE2B fc438837f266a1b68ce7d1795c6ccf316ea304cffa410ee804ec1b222d4f2f0c67e5374cd23accea4e2b9e236d64990d16d7648a39b95c055603b798ba511a85 SHA512 6e6d28ef8e4fdc11a2e9b659806c1e38ba631484ce5060b80c792518e5fd3c2f4083ad715c6e255475b0692541f7af42866c7a570d7d0bc6609cd65d6b629fb8
+EBUILD libgnt-2.14.3.ebuild 749 BLAKE2B f8cc7f4f6e97f662133563b5d179b7bcef271b88c42fd2f60371c9b26acc3160753e4ebcb6722beca75b69a8b41f8955b66288745c62417a053de516093f7042 SHA512 ef01ab6a4ae687c335f098aa84400c15fc7a116f1c8896df9ddf4f0663df2ebfecb413616ef6ead6ed35b7dc7078004633f65113fec98ee3bcd738ae82e61e30
 MISC metadata.xml 258 BLAKE2B bd458e931e669f3599d041086b28cb8e05f9daca13a17504ca4bdf6a19f9e0e0bce389981d9b65875a04e7a6e068aab4d7f92819a6c545638a1e37ed462866ac SHA512 f3d8019f0e5fb12b60d75645d9d8468cc5ca283d1df19b23604a58221cf08b7a5b63744e4e99f26c80b798e2caf52c5a69f8d383c3aed06f7a1996e72f7f36bc
diff --git a/dev-libs/libgnt/libgnt-2.14.3.ebuild b/dev-libs/libgnt/libgnt-2.14.3.ebuild
index e3b5baf277fb..d8042983bbe4 100644
--- a/dev-libs/libgnt/libgnt-2.14.3.ebuild
+++ b/dev-libs/libgnt/libgnt-2.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/pidgin/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index 423a45831774..de1cc6aa9d67 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -1,7 +1,10 @@
 AUX libgpg-error-1.37-remove_broken_check.patch 786 BLAKE2B 38c3b7039d17de117ba876c11377fe765e39a4630d2dbda21d07aa6a0e027b5ee0e4f2da225d7d6847b5086c7f4aebe378c82a259ec9d82e7ecaac1f77413959 SHA512 6b9087cfa21d844f2306aca0e5575a03b9409ae8e5ea55158734560abd135af265512bec3de8c943210ade60b6334ea1798aa517ba5738cb9fe6720b3cb3c68f
 AUX libgpg-error-1.42-cross_compile.patch 785 BLAKE2B 91dcb2dd4d44776dbf0f1bd0b7bb7df2d8855625e1de306583cb42a14f74b2daa015605a8af46fd2a659a81da9f312d20d02f49ff6042ec9ce8ab40f42b9776a SHA512 76a9bdfa85de81ba60eac771022f0b1daedc97097e281ca954381ed54b30a00e84ca2f0970f252ee735b1ef6f1ea2071a4df25ae1fbef0d380d964c577e2fd22
+AUX libgpg-error-1.44-remove_broken_check.patch 811 BLAKE2B ff90643ba8afe80393ae0328590ba161c5a68c6b1d6e3ab771a9b295e2827d4cb02d620315e0437647d36698d539c911aa572a9d57393feed9818986440dd437 SHA512 29dbad17b3626eab56ecc352479f55aeb54958245558716134e1da5c8581c0713d53463caa778ebd6c33ea3281072d7aa2d6fd62630bfa973a41bd3e76ca1a57
 DIST libgpg-error-1.42.tar.bz2 973996 BLAKE2B eb3381ec7106cfe5dca333391f473e97b03df83f247d3067e9f933ed7206f826e59d2b74b8c28d41e785ffe1c2980b680470064eb2fa2ff1ee3d8fa8be5b81a8 SHA512 f6d95712a874edefc39a7746062c8037a62801a550560c5b2eab08b5b86987c1de5be60eba5fcb56d35a37db109aa32d07b7eff2bb99800c1c47d2227421a8f4
 DIST libgpg-error-1.43.tar.bz2 999006 BLAKE2B 22c5491ebd43b8010cdd4e82a58443fb8d19d51de9a033d0bb44634a82f033916d5d9fcfe47eb47e64a513521b01ff088838a8979f488cde74e5944c28dec0aa SHA512 36769a62d0b4b219a6d58195bed692e34d3b0313f628b1036055ca34b69332edbe6bcdace9855a60d06e7be5998dc13bf1305d0b2bb211a4d8f701e85040961c
+DIST libgpg-error-1.44.tar.bz2 1014475 BLAKE2B dc101769510bc9edff38048216a961df8b08373a0b6d04b13c882bbcb43c4d0e05ecfdfd7788c89b5799082f4d15386efac5eb1762a48ae1ab70b554d0bfbb36 SHA512 a0eef310b9d44532d1ae6e7266226ea3e82d908aa31f775a026e56a7f8303b78adfdceb3ae5a40f7d242987635e764c539a024ce8dc0d66590e1a3fa50f6b784
 EBUILD libgpg-error-1.42.ebuild 1898 BLAKE2B 05436135f19c5e2422f08274f1f3ad755b8683fcd9dfa56914ed8822b816e070cf910c92a6dc385e824ead0f5e85cc89e9fc4f4652e4119a2a5a5571b2cc7666 SHA512 fe0532eaa898e8a39c79651121593e907cc0fca3ddf5db54dcc2889309c2980055e52a54438452d320c38e3f45ff705327185962d4c6c7fb40cca7013c311cab
 EBUILD libgpg-error-1.43.ebuild 1866 BLAKE2B 35f3821ccc218ba18946c395fe549620ff420da72a6cc4a42316da38c6ac4149202fa4d5b487b0f61c1d3dc28f6e921f92490fc8ff2580ede2a975441ccaad76 SHA512 d6375a17977429462e8f2564940a8ff6e005a90236ef6cdf0f701c6f83d82ec86bbdeb71c010c72f7a3009078147a6268b14a1a950bbb535487f1b7bc75b22ef
+EBUILD libgpg-error-1.44.ebuild 1866 BLAKE2B 0071a99bf76003193009345c97d685e4030495c529e5b5bc74b0e5cbf29c73c3bbe4290acaecf09d2a9818b2a7331b264c6e430cad84822ffa31ca441372ec41 SHA512 7c12fca0e1fd6ba8f446de4d1234c90ee7afa836a38bb81ba0712ba337ce9a3a5d84a37341d8a96ada56912a1044d0bc0176116dcfdaa2bb1c2cc06212b2d31c
 MISC metadata.xml 414 BLAKE2B 3d1e1094b2527b3462c9791d278b82e0003201c1ac9a4fca2fceb1f1265384b6a0cb3617bf2e6416afd2a1044564e6cb2beeb7df926017bfdeb88fa61177faa8 SHA512 2254c2fb4aebd808a733fc5264c722b374e85ceabe540257ab7ecd4f46d6ce6a12bfbf4c4ec59af62c8a1601189d693bb33eb69eb28a7a6fdf8210458d173fb8
diff --git a/dev-libs/libgpg-error/files/libgpg-error-1.44-remove_broken_check.patch b/dev-libs/libgpg-error/files/libgpg-error-1.44-remove_broken_check.patch
new file mode 100644
index 000000000000..043099c097bd
--- /dev/null
+++ b/dev-libs/libgpg-error/files/libgpg-error-1.44-remove_broken_check.patch
@@ -0,0 +1,22 @@
+This breaks our multilib builds:
+
+  Confirm gpg-error-config works... no
+  ***  Please report to <https://bugs.gnupg.org> with gpg-error-config-test.log
+
+--- libgpg-error-1.44/src/Makefile.am
++++ libgpg-error-1.44/src/Makefile.am
+@@ -347,14 +347,6 @@
+ 	cp gpg-error.h gpgrt.h
+ 
+ gpg-error-config: gpgrt-config gpg-error-config-old gpg-error-config-test.sh
+-	@echo $(ECHO_N) "Confirm gpg-error-config works... $(ECHO_C)"
+-	@if ./gpg-error-config-test.sh --old-new; then \
+-	  echo "good";                                         \
+-	else                                                   \
+-	  echo "no";                                           \
+-	  echo "***  Please report to <https://bugs.gnupg.org> with gpg-error-config-test.log"; \
+-	  exit 1; \
+-	fi
+ 	cp gpg-error-config-old $@
+ 
+ install-data-local:
diff --git a/dev-libs/libgpg-error/libgpg-error-1.44.ebuild b/dev-libs/libgpg-error/libgpg-error-1.44.ebuild
new file mode 100644
index 000000000000..5347656622a7
--- /dev/null
+++ b/dev-libs/libgpg-error/libgpg-error-1.44.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools multilib-minimal toolchain-funcs prefix
+
+DESCRIPTION="Contains error handling functions used by GnuPG software"
+HOMEPAGE="https://www.gnupg.org/related_software/libgpg-error"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="common-lisp nls static-libs"
+
+RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gpg-error-config
+)
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/gpg-error.h
+	/usr/include/gpgrt.h
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.44-remove_broken_check.patch"
+)
+
+src_prepare() {
+	default
+
+	if use prefix ; then
+		# don't hardcode /usr/xpg4/bin/sh as shell on Solaris
+		sed -i -e 's/solaris\*/disabled/' configure.ac || die
+	fi
+
+	# only necessary for as long as we run eautoreconf, configure.ac
+	# uses ./autogen.sh to generate PACKAGE_VERSION, but autogen.sh is
+	# not a pure /bin/sh script, so it fails on some hosts
+	hprefixify -w 1 autogen.sh
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(multilib_is_native_abi || echo --disable-languages)
+		$(use_enable common-lisp languages)
+		$(use_enable nls)
+		# required for sys-power/suspend[crypt], bug 751568
+		$(use_enable static-libs static)
+		--enable-threads
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
+		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/dev-libs/libgusb/Manifest b/dev-libs/libgusb/Manifest
index eb65d73f1c18..83639fe303c3 100644
--- a/dev-libs/libgusb/Manifest
+++ b/dev-libs/libgusb/Manifest
@@ -1,7 +1,5 @@
 DIST libgusb-0.3.10.tar.xz 42972 BLAKE2B 4c49aa15cbbbb56d5ee5b896adb3e34b45332cd846933fd3aa86a645e7d897418d0e7a30d9972980e6527f1e60fc6e579f5df119708a12b3e504ff695c94d922 SHA512 66bd7c292cb9df2799b02acd48dc4b07794e7339ea1bd6473ea512dfec1b8e7e58abbd40f16a2a4805240cc8df4aec050335edb4f4178ad12ac5275438b8ae59
 DIST libgusb-0.3.7.tar.xz 41844 BLAKE2B e0829430a7c4c9372ebc061ca8245ecd6b30f0922e4e37ae41f7f65055e7339b5a3a882c5526ea5e5663be3b7c1ad71fee7da5cffb501d63bd1cda2b618fd40d SHA512 65a35be62bff689621f418abf045f62f946c67488dd021d363ab252b9b3a2380898ec763b374f7da50901945eda666fdcae7cbfda7e143544175d7ade3ebc20d
-DIST libgusb-0.3.9.tar.xz 42708 BLAKE2B 6d73f3dba891dc7594c2df02198bb1632c8e7ccea2b60f5071c87ae1111b6e2cfed4f9b912f58f788f199c5ee075db156a4d7326aa9b5e6448581c2acd1af469 SHA512 4a4545d9e8ccadf2c66ef891936a30b2b73b7b471a9b0e945da21fd2b55efc3a8d12cfd5127dfcbca0ba24f565b25f8edd7a276b70a6615eb4b2201791745c6c
 EBUILD libgusb-0.3.10.ebuild 1519 BLAKE2B 41ad01720c407eaf9fc9e6a7d11d646103457289231280568733be44a89de05ace36554255ebbad0f517b1e6e6ca6687f717ae57904658889c122af365519d22 SHA512 443e57694504ae04e6b51030b599b9f840518dd11d0e6ede6195e5b831ab7d8833803012af118e2b4c2b0f662d85c7dab68f3077a3f4ff0aeb0cb9e4fa751d7c
 EBUILD libgusb-0.3.7-r1.ebuild 1513 BLAKE2B 6a36977eae498f15a9292723c26624d8bbc12ad07907cf98b7a3c95ea6348e68bdbbeb81ec2744c678e9f1ffee81443805af39367526a7dd4d660da913cab730 SHA512 361111fe47bc09d5a715a98561e70e5f9e99adc617753142282236920d0a9e5805b2e5d2a647c3c5f6ab4b340be75102c0cb5310cdd38f14951e5ad2c0fadcde
-EBUILD libgusb-0.3.9.ebuild 1519 BLAKE2B 17d730f541318e98fd2cec90d47b7bc876a8fc7f5ca36440039e57832ee65731315011bc1a92e06b5d7c83e57b83e9d689adc8de688ea445e5240016e1f661d8 SHA512 2e3b4978f64e4b4573646273d985bc231b61bcc11b28bdaab2fd0e45132f5c5a3d5912408ced16865d918443e03e3b89327b43d03667bcda19af5d8a556d0e08
 MISC metadata.xml 344 BLAKE2B bd362d7e89ba2d88c2f220ab47593b4ae25bc4ca486bdafda16448407213d7558d7ea807c489e5aafbb8ec83a40e8e339c8ba20d3bfc3957da33a7e7711c6898 SHA512 93166c6dd4d764901c87fc567ab1c67add1c654b7ea1f3326e7144d5c14789bdee2a1e37874f8b6158136e03363372bf1d972f49f96095b0e3e568af89c4af34
diff --git a/dev-libs/libgusb/libgusb-0.3.9.ebuild b/dev-libs/libgusb/libgusb-0.3.9.ebuild
deleted file mode 100644
index 2df3883b3301..000000000000
--- a/dev-libs/libgusb/libgusb-0.3.9.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit meson-multilib python-any-r1 vala
-
-DESCRIPTION="GObject wrapper for libusb"
-HOMEPAGE="https://github.com/hughsie/libgusb"
-SRC_URI="https://people.freedesktop.org/~hughsient/releases/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-IUSE="gtk-doc +introspection static-libs test +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
-	>=dev-libs/glib-2.44.0:2[${MULTILIB_USEDEP}]
-	virtual/libusb:1[udev,${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	sys-apps/hwdata
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
-	gtk-doc? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/docbook-xml-dtd:4.4
-		dev-util/gtk-doc
-	)
-	vala? ( $(vala_depend) )
-	virtual/pkgconfig
-"
-
-RESTRICT="!test? ( test )"
-
-python_check_deps() {
-	has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	use vala && vala_src_prepare
-	default
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Ddefault_library=$(usex static-libs both shared)
-		$(meson_use test tests)
-		$(meson_native_use_bool vala vapi)
-		-Dusb_ids="${EPREFIX}"/usr/share/hwdata/usb.ids
-		$(meson_native_use_bool gtk-doc docs)
-		$(meson_native_use_bool introspection)
-
-	)
-	meson_src_configure
-}
diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
index f982ffb32dc9..0bee25ce9cbc 100644
--- a/dev-libs/libical/Manifest
+++ b/dev-libs/libical/Manifest
@@ -1,8 +1,5 @@
 AUX libical-3.0.11-pkgconfig-libdir.patch 612 BLAKE2B 90b53adfb90684dd8c18f91a4de5d87df9cf590e097e414eef7ec92221dddbc5b0ade7b3deccd1aed6c7c61c1d9bb16663d2e1910718ced1f21a55ffeffe7a16 SHA512 bf1af662e65d62778fcc946543d41e4fd592a90bb643a8b584916c4d62ddb100c1746aaf0d4b4698c1b97de19926220f7c3c8dd03014febfdce32015571f77eb
 AUX libical-3.0.4-tests.patch 747 BLAKE2B 41c72700e8a87c3665144bf12e7ea2c7f74c1786eb21c4550d12ed3dd86fe587ca26471319e8a695983529f789085a1e4ca0fae4ca48cab97b5376ed858deede SHA512 16367f68d15112b37266a794efe4a19f7c971fafe48b13c85095f15657f9d98796067bce91680986615d95740269f8fe1d03deb674ce2bb952b462de1d2ab1c9
-AUX libical-3.0.5-pkgconfig-libdir.patch 1229 BLAKE2B 3bfb99d68c9c379b1c64d84091c6ee3af676e8cb8d6082783f1f15dd430f73c8b82d403d120f1b2cb682c71313ef4262f42923ffc72480ab83d9b42aacee4df1 SHA512 24d312f8f6ad9c1a3d10ffd3ea96893a2345eefcf7485b6464a8879d561f8d23922c84560765dea3b83614eacb4ee6efe63c9233cf8964c441ae17630d001c37
-DIST libical-3.0.10.tar.gz 889470 BLAKE2B 990a37cdb6a00c52bab1a10f5899752dc2f9f0f2c3e0ada9e54803007e3db97dcd600544bf45a9a0646631aaf41839a0818b5d70b3e6e305826db2dd1cc30bdb SHA512 e32ccaff9b8a501f340567a1221c580023e4ed79918519bfa88aee2c0e8b62f5ea37e10907f2eb6fbd346a57408708a74e30aaf9a57a8d711eae30ddc974ddd0
 DIST libical-3.0.12.tar.gz 883537 BLAKE2B a67cbf767f5dba7717c80b2ed90f257025544b6fbbd85e4d10712fb63ec5d750c00e9a1d664b0c75f7e833847aeee2fc1412866bf4b599ead663132b3665835f SHA512 e97aec11895d4c51fcb1fe32598f5fc23bbffc26274d1f46e74d1b9a365bea65446563224b852d13a763334eab0375e77cabb5ba535d3b2f89b652bbe24b4517
-EBUILD libical-3.0.10.ebuild 2461 BLAKE2B 64991ad408f26956773f1dbcd64e02c465e2758585d970d9441edabca4de552873afc275eb09bcea5b61195b4a005abf00cf685f19c8ffa0dbdbd66fc9a823e5 SHA512 31f2a9baaf70b3ec78d5f94f761eed0b27b8962b46d11de0f4fc9c45b103b46d286aaf8d3a3472a6371bc25611a4e1a5c785ffa7e94dc1e715eacbaf72df5601
-EBUILD libical-3.0.12.ebuild 2477 BLAKE2B 2337032c95a9d2d9c3cb08e45c7c1674fc7d18d1f86c797cc2396fbf91da79b7161a68c898c0b11ae765cf03b1a83766c708804ee9e08e6454cfc98ec2654a7d SHA512 7d6eec0805f74beb835293eceacf8416a9dd434baa2362a82821d65cb536e98ea200a28fd0ab7ce3e078bce5a06b359f3420d2da6871c1e598c3f998f4901d2e
+EBUILD libical-3.0.12.ebuild 2470 BLAKE2B b88d73cf9650df8db27900f7d6cf7dec9147fbec3baa47739a2952d04b7296896db5a045822462b5083791ab744da8572f875c9c3cfeb0b56638c6bfd91e1ac5 SHA512 1ad241526b56cf35498e582887e66813486b7922eef140b92b0a12861f6ef2d373b798961eab25870e031f352909ed9e20443e0991bf725f25e68f7e2f5c1163
 MISC metadata.xml 415 BLAKE2B a03d59a58e875698695319e5f427ef82ef11dd8aaa457cc6647039ec57583d730d53c5040b5b76007bf9662a78684968791f0a15ae7172007d4c49ffe8fd2318 SHA512 0663988285e1881903c0e8f62bd5ef99c26089b54f4abfeaa0a97f5ecc9820586b1a20077ddea24bf4e513b8049110f08c33acde433777adc1dd6d03f7ea7966
diff --git a/dev-libs/libical/files/libical-3.0.5-pkgconfig-libdir.patch b/dev-libs/libical/files/libical-3.0.5-pkgconfig-libdir.patch
deleted file mode 100644
index a3a80e9f76f5..000000000000
--- a/dev-libs/libical/files/libical-3.0.5-pkgconfig-libdir.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Fix pkgconfig libdir paths.
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -336,7 +336,7 @@
- set(VERSION "${PROJECT_VERSION}")
- set(prefix "${CMAKE_INSTALL_PREFIX}")
- set(exec_prefix "\${prefix}")
--set(libdir "\${exec_prefix}/lib")
-+set(libdir "${LIB_INSTALL_DIR}")
- set(includedir "\${prefix}/include")
- set(PTHREAD_LIBS "${CMAKE_THREAD_LIBS_INIT}")
- 
---- a/libical.pc.in
-+++ b/libical.pc.in
-@@ -8,7 +8,7 @@
- Name: libical
- Description: An implementation of basic iCAL protocols
- Version: @LIBICAL_LIB_VERSION_STRING@
--Libs: -L${libdir} -lical -licalss -licalvcal
-+Libs: -lical -licalss -licalvcal
- Libs.private: @PTHREAD_LIBS@
- @REQUIRES_PRIVATE_ICU@
- Cflags: -I${includedir}
---- a/src/libical-glib/CMakeLists.txt
-+++ b/src/libical-glib/CMakeLists.txt
-@@ -233,7 +233,7 @@
- 
- set(prefix "${CMAKE_INSTALL_PREFIX}")
- set(exec_prefix "\${prefix}")
--set(libdir "\${exec_prefix}/lib")
-+set(libdir "${LIB_INSTALL_DIR}")
- set(includedir "\${prefix}/include")
- 
- configure_file(
---- a/src/libical-glib/libical-glib.pc.in
-+++ b/src/libical-glib/libical-glib.pc.in
-@@ -8,4 +8,4 @@
- Version: @LIBICAL_LIB_VERSION_STRING@
- Requires: glib-2.0, gobject-2.0, libical
- Cflags: -I${includedir}
--Libs: -L${libdir} -lical-glib
-+Libs: -lical-glib
- 
diff --git a/dev-libs/libical/libical-3.0.10.ebuild b/dev-libs/libical/libical-3.0.10.ebuild
deleted file mode 100644
index 3efd1ffc1495..000000000000
--- a/dev-libs/libical/libical-3.0.10.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-VALA_USE_DEPEND="vapigen"
-inherit cmake python-any-r1 vala
-
-DESCRIPTION="Implementation of basic iCAL protocols"
-HOMEPAGE="https://github.com/libical/libical"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
-SLOT="0/3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="berkdb doc examples +glib +introspection static-libs test vala"
-
-REQUIRED_USE="introspection? ( glib ) vala? ( introspection )"
-
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dev-libs/icu:=
-	berkdb? ( sys-libs/db:= )
-	glib? ( dev-libs/glib:2 )
-"
-DEPEND="${COMMON_DEPEND}
-	glib? ( dev-libs/libxml2:2 )
-"
-RDEPEND="${COMMON_DEPEND}
-	sys-libs/timezone-data
-"
-BDEPEND="
-	dev-lang/perl
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		glib? ( dev-util/gtk-doc )
-	)
-	introspection? ( dev-libs/gobject-introspection )
-	test? (
-		${PYTHON_DEPS}
-		glib? ( $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') )
-	)
-	vala? ( $(vala_depend) )
-"
-
-DOCS=(
-	AUTHORS ReadMe.txt ReleaseNotes.txt TEST THANKS TODO
-	doc/{AddingOrModifyingComponents,UsingLibical}.txt
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.0.4-tests.patch"
-	"${FILESDIR}/${PN}-3.0.5-pkgconfig-libdir.patch"
-)
-
-python_check_deps() {
-	has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	use examples || cmake_comment_add_subdirectory examples
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package berkdb BDB)
-		-DICAL_BUILD_DOCS=$(usex doc)
-		-DICAL_GLIB=$(usex glib)
-		-DGOBJECT_INTROSPECTION=$(usex introspection)
-		-DSHARED_ONLY=$(usex !static-libs)
-		-DLIBICAL_BUILD_TESTING=$(usex test)
-		-DICAL_GLIB_VAPI=$(usex vala)
-	)
-	if use vala; then
-		mycmakeargs+=(
-			-DVALAC="${VALAC}"
-			-DVAPIGEN="${VAPIGEN}"
-		)
-	fi
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use doc && cmake_src_compile docs
-}
-
-src_test() {
-	local myctestargs=(
-		-E "(icalrecurtest|icalrecurtest-r)" # bug 660282
-	)
-
-	cmake_src_test
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/apidocs/html/. )
-
-	cmake_src_install
-
-	if use examples; then
-		rm examples/CMakeLists.txt || die
-		dodoc -r examples
-	fi
-}
diff --git a/dev-libs/libical/libical-3.0.12.ebuild b/dev-libs/libical/libical-3.0.12.ebuild
index a9a1be42b120..a48681327fb0 100644
--- a/dev-libs/libical/libical-3.0.12.ebuild
+++ b/dev-libs/libical/libical-3.0.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
 SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="berkdb doc examples +glib +introspection static-libs test vala"
 
 REQUIRED_USE="introspection? ( glib ) vala? ( introspection )"
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 9ced5df61318..db1edb374174 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,5 +1,3 @@
-DIST libinput-1.19.2.tar.xz 654924 BLAKE2B b55d34186bba3d4956d7308594acd0928b7bc575c34b8c53ee95780887beccd141804e278cd1ea6c8fb48d064bde9c95c26c6613d6169dfa4e7ccdd64a50d3e3 SHA512 fc5244dc90ceb710f7b5bb76a3cafc7dd5a8d5fa05c51122412615bfc3a99435d6a1017b79c3ce73561139fc2f5959acaf16cb9500796ea2f3eb6cb95d1a1acb
 DIST libinput-1.19.3.tar.xz 655164 BLAKE2B a07d91603a3d4e759aad25ee46b11dbee47eb013a2361f1b70acd616fee0ed9660e6fa8773948d6acf3686179fd7aaf76bf8285f3dc3137a4b1b605ec0e4d6d2 SHA512 f4b776d0da78c687ba21b430a04941ac6b43f68970c82ec9f7360358fdea5ed6a873948ce66a25bcdd64d4b95fa4bf705cc24dbc25c7c0f5fd2d0efbd763f298
-EBUILD libinput-1.19.2.ebuild 2254 BLAKE2B 66d37c3c9a68bb5950fe486516f31bd4ad74c74b330b50ca6215c1e20a6861422d966f4f5bb5c783d39d65f2917eb11429f069ff09bfceb8de090180cc468c39 SHA512 b8d5c658d2c0b9f4131648a06adbe32e802cea7f5f631e673beb1944873631fea3fb5ec0b44d0deead6d87f121f8b0de120593dbbf3c449bb36662f5b50b3be9
-EBUILD libinput-1.19.3.ebuild 2267 BLAKE2B b03ca7b22dc9b66a98e83756c2ee961e0e75de0e95e1fb209f131b07b7b680c70d5c143dc2afba9904cab0a30313bf2287ce8eb9d45b2108f806dde8710df965 SHA512 364620cf58a7647ee11b6bc94190e7357208002aac531310a50f4973f238edf430a552689a78f5e66c2ed4cf2c3ae675d3c859dae41cbeaaf3b7b03750dd3bee
+EBUILD libinput-1.19.3.ebuild 2260 BLAKE2B 5ff2aed88d53ebaee2c869ac6173fa946cc324ad58a1918105571dcc21e191fb2a94d95326aa74fcc77603ece590807878861ddbab63f38948bb4e186a93983d SHA512 0e1da4863310b22e9fa96c1b353091da77c406788adc282483dd5c376085d27b8b8809a7751276e3e5ca6be38e96df5c8c96ec9530c5b13982e8ccc7340f16db
 MISC metadata.xml 449 BLAKE2B 677e5fee3bf4047ba47b90aca7f30b9ce57e947e6b5f6903cbb93c214b084f0d93f6253980090544d4ff4a821263c156e0706ae5499cacbb2e52d629f3a7b253 SHA512 103e8b39ad6b9ffde159095dbc4553d8b695db44e49582518055313c79ff6123bcc424c3980cbbaeabaa455e00a828039f73c1f3424ce038d5a2d63ed3e7849d
diff --git a/dev-libs/libinput/libinput-1.19.2.ebuild b/dev-libs/libinput/libinput-1.19.2.ebuild
deleted file mode 100644
index d197fec9f0ad..000000000000
--- a/dev-libs/libinput/libinput-1.19.2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 2014-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 udev
-
-DESCRIPTION="Library to handle input devices in Wayland"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/ https://gitlab.freedesktop.org/libinput/libinput"
-SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0/10"
-[[ "$(ver_cut 3)" -gt 900 ]] || \
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="doc input_devices_wacom test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		$(python_gen_any_dep '
-			dev-python/commonmark[${PYTHON_USEDEP}]
-			dev-python/recommonmark[${PYTHON_USEDEP}]
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			>=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]
-		')
-		>=app-doc/doxygen-1.8.3
-		>=media-gfx/graphviz-2.38.0
-	)
-"
-#	test? ( dev-util/valgrind )
-RDEPEND="
-	input_devices_wacom? ( >=dev-libs/libwacom-0.27 )
-	>=dev-libs/libevdev-1.9.902
-	>=sys-libs/mtdev-1.1
-	virtual/libudev:=
-	virtual/udev
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-libs/check-0.9.10 )"
-
-python_check_deps() {
-	has_version -b "dev-python/commonmark[${PYTHON_USEDEP}]" && \
-	has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" && \
-	has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" && \
-	has_version -b ">=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	sed "s@, '-Werror'@@" -i meson.build || die #744250
-}
-
-src_configure() {
-	# gui can be built but will not be installed
-	local emesonargs=(
-		-Ddebug-gui=false
-		$(meson_use doc documentation)
-		$(meson_use input_devices_wacom libwacom)
-		$(meson_use test tests)
-		-Dudev-dir="${EPREFIX}$(get_udevdir)"
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	if use doc ; then
-		docinto html
-		dodoc -r "${BUILD_DIR}"/Documentation/.
-	fi
-}
-
-pkg_postinst() {
-	pkgname="dev-python/python-libevdev"
-	if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version "${pkgname}" ; then
-		einfo "${pkgname} must be installed to use the"
-		einfo "libinput measure and libinput replay tools."
-	fi
-
-	udevadm hwdb --update --root="${ROOT}"
-}
diff --git a/dev-libs/libinput/libinput-1.19.3.ebuild b/dev-libs/libinput/libinput-1.19.3.ebuild
index 4fc5406a4519..eb86ae8388e5 100644
--- a/dev-libs/libinput/libinput-1.19.3.ebuild
+++ b/dev-libs/libinput/libinput-1.19.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 LICENSE="MIT"
 SLOT="0/10"
 [[ "$(ver_cut 3)" -gt 900 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="doc input_devices_wacom test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libisoburn/Manifest b/dev-libs/libisoburn/Manifest
index ccc78f2a2f0f..ef6cfc512607 100644
--- a/dev-libs/libisoburn/Manifest
+++ b/dev-libs/libisoburn/Manifest
@@ -1,3 +1,3 @@
 DIST libisoburn-1.5.4.tar.gz 1623904 BLAKE2B 3bb6ba88ad0422e1f3fbefdadb60231ea338a6bb8f39087fd25d58d68a4603c445d5d02b54c0a69897c321b4620f2ceb46eb8899552d2486e579a34f345a9d7f SHA512 5fc8532a13caf6caa5a0711753ca99ee2b3f4d5e2db9b3ed2aeef76714e3ae6de6d9c2db0d8297c0d749c42c5ab84fe92989751d8da24d41457b98656eb1bd86
-EBUILD libisoburn-1.5.4.ebuild 1838 BLAKE2B 9f7ef44cd2c8dd543764d033481f06d317e51ec4899f460e7ad5b148b4ac0c8b7bf30a42c34c2b894acbe250cf6fba83ad8c1e3a18dbbf4f7064b36a88eba1bb SHA512 ebfce81c53a419f39c53424a647fd7657e4be5f1917fb88006cb1a2dfa84f687f94cd4e0c2264bc2b908a83f702bdd3105324c1a69bc713f745fdf9dc419c159
+EBUILD libisoburn-1.5.4.ebuild 1844 BLAKE2B 41ef930e9f5ee9cdfc903b8a52b957cd50a4872a999142ab71751cebe56569e6a308483ea62807c99447aea5b8c4faeb6d1ce31f7fd422ad5bcd9b5af0b5c5ec SHA512 86b40818a6eed435f94968f1d6e0c76b73b5026d48612698d3bc017eb3f19d744c13e6bbcced9ad6d1e3b8a4d8e475296eaa4170b44b5338e5d8c2567683a054
 MISC metadata.xml 830 BLAKE2B c89f5f41f77640a55e5e48c2e1b16fa87fab35fd6b9b2d5c428e3ad700aaa088682d1ff6ca1ca674025b2b110cad722453b9a80889e81d021e941d41d7e14fcd SHA512 b687baf3d21a495da1036196fc653b92934d2de797ff0b149dfd94a81dde6d965778db7b8fd4284ae09cb07d01205eaa983f586bf4adee7092d1b3b3a8b72ed9
diff --git a/dev-libs/libisoburn/libisoburn-1.5.4.ebuild b/dev-libs/libisoburn/libisoburn-1.5.4.ebuild
index f99f0c93ff92..74241677864c 100644
--- a/dev-libs/libisoburn/libisoburn-1.5.4.ebuild
+++ b/dev-libs/libisoburn/libisoburn-1.5.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2 GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="acl debug external-filters external-filters-setuid frontend-optional
 	launch-frontend launch-frontend-setuid libedit readline static-libs xattr zlib"
 
diff --git a/dev-libs/libisofs/Manifest b/dev-libs/libisofs/Manifest
index 22ce051e909d..8025b36015f1 100644
--- a/dev-libs/libisofs/Manifest
+++ b/dev-libs/libisofs/Manifest
@@ -1,3 +1,3 @@
 DIST libisofs-1.5.4.tar.gz 870395 BLAKE2B 2cb9d247219c368e9808dbb2b7bcbe22829e78683a6dc6d8a182b54ebfe6d8c8a082990179b784f891fc79f2ed4830f09dd43c64bfdce60cbff6c34fae2150e7 SHA512 a06e834e81081358478cdd27d1dcc6f3bb52ffd2ea57ade59f3ff2f69868fb6886a0b38fd1580d24295b7ed936ac471f107df64d62c1ff42b57dd8ce0810e3f2
-EBUILD libisofs-1.5.4.ebuild 970 BLAKE2B 4e7a2104a5a154e00600aa2676c91db2b4d848ddfbc815a4ed3e22282eb7cfd863f738867a65848f5f0ce1cf8199e33a5a6a114da3445e0fa5a74be7357a36e4 SHA512 7d6075637dded93f4122b0fbced1b67e3df498eb929c3b9a55b04bd8a9b0f3ddde65dd3cebbcc6c2616cdc60897c0a6c9ca2c129b6032f729ff8065e4e6db5e0
+EBUILD libisofs-1.5.4.ebuild 976 BLAKE2B c7eba7846e48520112085ea9b1e5c24a594d6f9683963f4f45806b7359ce36d3ffb3a645de0a2f55c1289f0188d646c850d312746bce160249e75027b9af89a3 SHA512 785c8ade5ee3b1914937286362ba971f175ff6e738587f269ed2bce1675ca5183d21ea7e9307ba7cf509141fe571cb6576b14907a7d334b571d4623153e8a7c8
 MISC metadata.xml 321 BLAKE2B 88d0d1ac9eaba1741f02a93cbcd6c55dc6f2cf22f6051969e9bbdc497f515fbedb024f6027517893342466cd04fbd94cdead3b015c311c99aaedc4f3681f193d SHA512 870d6fd484548245f01fdebf2fc2e664d6445cbca7a47c34065f4d077709cc9c989a0157f799b811a37345b8c1a87d07f72f66658b86319f8425bc02c0609f47
diff --git a/dev-libs/libisofs/libisofs-1.5.4.ebuild b/dev-libs/libisofs/libisofs-1.5.4.ebuild
index 7a268c49b53a..be926a02cb69 100644
--- a/dev-libs/libisofs/libisofs-1.5.4.ebuild
+++ b/dev-libs/libisofs/libisofs-1.5.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="acl debug static-libs verbose-debug xattr zlib"
 
 BDEPEND="
diff --git a/dev-libs/liblouis/Manifest b/dev-libs/liblouis/Manifest
index 69403071eb39..6d90cdf194b4 100644
--- a/dev-libs/liblouis/Manifest
+++ b/dev-libs/liblouis/Manifest
@@ -1,5 +1,7 @@
 DIST liblouis-3.13.0.tar.gz 14683684 BLAKE2B 9596fac30ee8512498826ea11c3fe4d9dfba6706166938852242533f1fadde9ca8e363ea1364ebb4266b366ee49863d84ad757f8634d90e48dd8c562c31e9e8d SHA512 68f0205dc55a106c5707f959c1c0d3c121dfe62f263a664e6bec0780bee65cce2fb5d7033ae1c8312d1d79f7ccaf650af71906e8651b60f11219758e41051b61
 DIST liblouis-3.17.0.tar.gz 14868166 BLAKE2B 2edc5ef4366e29080d0d138fe45d946730e04dea278a14751106a25862f6266fe0fda492e12f4d2aa7d26d7277a11dfa2eaf8be39cdeffbcf83f2c143922e6d6 SHA512 9511e0f76ef6def3fa30f0bce4df188b2a11251e8ced0a76a92e172026e6751bc19b2c8ccd5789043b65398190a367bca03b3f1449344750e63ebd0fde60b4e3
+DIST liblouis-3.20.0.tar.gz 15119793 BLAKE2B ed8eb9df0364818c73b1ac8afa5311cdcf8bb47b142607ceeced731655ed14a3d5be83465dd923164902b807424a5e1180fc4ae7fd3ef9ed50065f6e6e9b3b0e SHA512 edc94f1f91fbaffcc13c6dbe7958c7f41dac3328038b25bb446d54dc3e26d904da0d0d5e19268cee6b6de3ef228dcd45ff50164ccd148939e6440fe8b5d4b428
 EBUILD liblouis-3.13.0.ebuild 1743 BLAKE2B 488ab7006fac89c4304ba02924d8e24a99df1cbbacf18083a5a69367dbb9bd2af1b7aef6a132dde5f1b9ef06c05639aaec2356702336feaa2cc92f2b06a67eae SHA512 3d8a7ad11b920e767511611cf147abcff1144141d4afa1b90aade5e1b78659c04a792753e040c5776aa1ac30635985c8e8d0aaaec2ae64ae2b170b2fdf3bba02
 EBUILD liblouis-3.17.0.ebuild 1754 BLAKE2B 4ee8c8921887dc304b833d4b1c15eeffcb305783e1683264118b2dab887d87f93c375cdc9b99c376e80d1aaa8aa7fcb84160334080f723f1e1732767ab325fde SHA512 be9c3ebdee4e7418fc93bb66b73c97da3e0a5b63f35d5c6df9c2a8e6cd90193387af7a980602d23ad061c4e969bcd2c83142a33b9e0e444348b10a40b726c5d8
+EBUILD liblouis-3.20.0.ebuild 1757 BLAKE2B 703f4c636cc8e95653e3ecf86473f843957a5922f034469717efde5423bf204640965617eb304148d9ca927447aa8d340acf76b7e64868b7ef116b98a78e1707 SHA512 7a3b15852d3a6246d88190ada360b84e412417f2d2eeecdffc47c3076e83e9e98f948a9bdbf418c2f42598dfc2ee6266fc2600a13d90d1b802fdc447cfe9b941
 MISC metadata.xml 352 BLAKE2B 5c562663af1cb8a830ef585416cd7dbd4977393310fb2216ac6fb5bbaa594ad4fb144bac1a49d161e5946978cbc28acdbaf5d59e781da5438d7116f34c259290 SHA512 23c7fd40c40c8e574d995d0fdbe56242e9b1874d576ba8a34cee80e3c3e41785e782ca37fb3f89665c24d5857cb956b70c9219dc3dc35cb209f947f0b267c4be
diff --git a/dev-libs/liblouis/liblouis-3.20.0.ebuild b/dev-libs/liblouis/liblouis-3.20.0.ebuild
new file mode 100644
index 000000000000..ed9d9ebc447f
--- /dev/null
+++ b/dev-libs/liblouis/liblouis-3.20.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_OPTIONAL=1
+inherit distutils-r1
+
+DESCRIPTION="An open-source braille translator and back-translator"
+HOMEPAGE="https://github.com/liblouis/liblouis"
+SRC_URI="https://github.com/liblouis/liblouis/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/20"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="python test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-apps/help2man
+	python? ( ${PYTHON_DEPS}
+		>=dev-python/setuptools-42.0.2[${PYTHON_USEDEP}]
+	)
+	test? ( dev-libs/libyaml )
+"
+
+src_prepare() {
+	default
+
+	if use python; then
+		pushd python > /dev/null
+		distutils-r1_src_prepare
+		popd > /dev/null
+	fi
+}
+
+src_configure() {
+	econf \
+		--enable-ucs4 \
+		--disable-static
+}
+
+src_compile() {
+	default
+
+	if use python; then
+		pushd python > /dev/null
+		# setup.py imports liblouis to get the version number,
+		# and this causes the shared library to be dlopened
+		# at build-time.  Hack around it with LD_PRELOAD.
+		# Thanks ArchLinux.
+		LD_PRELOAD+=':../liblouis/.libs/liblouis.so'
+			distutils-r1_src_compile
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	if use python; then
+		pushd python > /dev/null
+		LD_PRELOAD+=':../liblouis/.libs/liblouis.so' \
+			distutils-r1_src_install
+		popd > /dev/null
+	fi
+
+	# These need to be after distutils src_install, or it'll try to install them from under python/ as well
+	DOCS=( README AUTHORS NEWS ChangeLog doc/liblouis.txt )
+	HTML_DOCS=( doc/liblouis.html )
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libphonenumber/Manifest b/dev-libs/libphonenumber/Manifest
index 1b89c9772313..011760c686a1 100644
--- a/dev-libs/libphonenumber/Manifest
+++ b/dev-libs/libphonenumber/Manifest
@@ -1,7 +1,5 @@
 AUX libphonenumber-8.12.37-cmake.patch 1963 BLAKE2B 4ca131a59bb4a5558b01eb1428cf9be4e8c006c85235800f09689960c7c489a4da52d044eb0b11b40172bc37382545f46872f35571b0f349a9749ce21237da64 SHA512 feb365105ad3aa6437b495e0ea86d8050bed06444adb6ce79628186f3d8a5cc67f496b1a73ee8bee049d12e6e108921d76cdfd2d0d1a9095b4d5bc0acf5d2deb
 AUX libphonenumber-8.12.37-testing.patch 3349 BLAKE2B 1c96a9efd1919c04ed86ad63713e89ea8a6a21139faaa0b4cff406f0d168c57b981b0af1aedf54e54ed753cfa1c8ea815e78fde86c578c9151bdb5d98e6b4ad2 SHA512 00ed243396507f1d7448faed83f82009de7be1418b499f560b0961ea9796bfe7285d9c04c43dc5f3cd8baa90314a487e377f4fba571c5b492e065a97056ce375
-DIST libphonenumber-8.12.37.tar.gz 11005274 BLAKE2B 2bcffe898ca7aa667a35e9a7340a54f880cdb9f290e807e9ff7f6ee778df83dd80023703595781a97355a43a8096bdc957a7f79336b5bf9d892ada26e35ae025 SHA512 420ea841679c1ff420289b3fea0bb6d86d4d1e99525fce00cc90025c8ade99e56e2dcbb7fca64190437ff0a889cdc7373f182e7699db20a072c32e984b8dff33
 DIST libphonenumber-8.12.39.tar.gz 11007180 BLAKE2B 27a47b35497772740da04cb9b79e1a6b4fd6f9b0d4a89768e1ba9212672f1a0fd06c5837aa8858a4680b5c47ef16721c6ef145d8d2cd77dccbe27bb4b0897dcf SHA512 82570c60b132022a713c0664de2c29997cff0ab8c3ab97dbec0f8d1cd1782090ba92ca7d2f044760f523c986660f13b70aacf8a9c247a3b80eb19d35227bc2a8
-EBUILD libphonenumber-8.12.37.ebuild 1149 BLAKE2B 1482c372b5d7ab343ed4f1f78765d64a38538c94281872dcaa14a009187f654e6a92204d53d95179cf0d8c16b88483e7da5f034f57faee72e6a5ed7c536fcbbf SHA512 3b656755e55d20494ce8d86255b0bfe78e8300194a29e34852902a9534564fc9eb528840bf9603cecc704318cdbf2483f4ddbc32b2d4622515971d9820a72468
-EBUILD libphonenumber-8.12.39.ebuild 1170 BLAKE2B 8f5f3fde899d58c7a56a594605045382de984e8321f1e7820f74fb0d372c23827ba8c5acf0014ecfab7fa76c4265d575a09df1dad72e18505b2955da83c5e210 SHA512 b554925d81bb4b99ab08a5687916672f522f63c84195b404dac063899e943e47a965fda1f0fc1003d07371868ba0a1000eccdb6cf9d18fdb2f5617eb6579eb1c
+EBUILD libphonenumber-8.12.39.ebuild 1172 BLAKE2B 577342f44537a288b296ca90b50545e039fe115824e91784f290a6afb088c7a42b28b265a447341598d576b7d118a361445e95c5fe6212309a363476de0b3524 SHA512 81d721a186dc2d5ae7bbf12635d86d60475777c8ecd0e58e909fe05c9363bc08441c12a296d1d427ce569ffd9313307bd7dbc67ef4e9cb3883f7715ff8e193e0
 MISC metadata.xml 417 BLAKE2B 95de59ae08b1ea02b4e31e2db29ed6e17040d243c0254ae64eaa0c1a4195244063714ebe9f29e0979a9f6be728eecdf47f8bfac77f674128fc37f52eaf8c8896 SHA512 6fc39161d18efec9984fac508c586a579d93ae12a3cd3d4671630af04d8c86db1b86a5f43ac421fa7c0a4b38f7e333676fc36c8066fe08ebe2a92e56f1acb882
diff --git a/dev-libs/libphonenumber/libphonenumber-8.12.37.ebuild b/dev-libs/libphonenumber/libphonenumber-8.12.37.ebuild
deleted file mode 100644
index f613d7a4ab4b..000000000000
--- a/dev-libs/libphonenumber/libphonenumber-8.12.37.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_MAKEFILE_GENERATOR="emake" # broken w/ ninja
-inherit cmake
-
-DESCRIPTION="Library for parsing, formatting, and validating international phone numbers"
-HOMEPAGE="https://github.com/google/libphonenumber"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-CMAKE_USE_DIR="${WORKDIR}"/${P}/cpp
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="test"
-
-RESTRICT="test !test? ( test )"
-
-DEPEND="
-	dev-libs/icu:=
-	dev-libs/protobuf:=
-	dev-libs/boost:=
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	test? ( dev-cpp/gtest )
-"
-
-PATCHES=(
-	# it is either this, or disable BUILD_GEOCODER
-	# https://github.com/google/libphonenumber/pull/2556
-	"${FILESDIR}"/${P}-cmake.patch
-	# see also https://github.com/google/libphonenumber/pull/2459
-	# using a stripped-down patch w/ BUILD_TESTING
-	"${FILESDIR}"/${P}-testing.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_STATIC_LIB=OFF
-		-DBUILD_TESTING=$(usex test)
-		-DREGENERATE_METADATA=OFF # avoid JRE dependency
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/libphonenumber/libphonenumber-8.12.39.ebuild b/dev-libs/libphonenumber/libphonenumber-8.12.39.ebuild
index 7b2495ee4158..b73f1a758e97 100644
--- a/dev-libs/libphonenumber/libphonenumber-8.12.39.ebuild
+++ b/dev-libs/libphonenumber/libphonenumber-8.12.39.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ CMAKE_USE_DIR="${WORKDIR}"/${P}/cpp
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="test"
 
 RESTRICT="test !test? ( test )"
diff --git a/dev-libs/libpwquality/Manifest b/dev-libs/libpwquality/Manifest
index 2116c0e3d84c..73cc5e4bdd3f 100644
--- a/dev-libs/libpwquality/Manifest
+++ b/dev-libs/libpwquality/Manifest
@@ -1,5 +1,3 @@
-DIST libpwquality-1.4.2.tar.bz2 423072 BLAKE2B 7f571e73ed4d12e6780dd47b6579aca3b7413eff23f9c11114ee2f95134893097b3cd183fcfc5482c96ca9bfdd1e137d4064062591f56b3998f3bf85768389eb SHA512 6f395e94797cc565edae6de8f4c7c60736d07ffa849c9878ec4d867f8cb7bea6f08bdd20501791dd05b02d487f8fea66a02a30841c7cea6e86b5903eaf685879
 DIST libpwquality-1.4.4.tar.bz2 426923 BLAKE2B 732e349a89b418d0b29d433551cd67e7b5f0daacb50ea73cfa7e45623801f6b559322645b4f4b0d741512964556d7e004d6a1c63b20e395c3c1b96923506e8bb SHA512 2d49b79105361663f009f7183fde9123e6f1e63bd678dfe5418143f611e763af8dd44374b826b3c22a00e721047c539741dc44d99a2289b9ab229791768d6e76
-EBUILD libpwquality-1.4.2.ebuild 2006 BLAKE2B 7a4a78dbfe9f5ba3c8c0067534100080c4f3fa33c0fbefe5a1eec3b4844bcad9fa16fa359c2857196ebb97434396ff3e2f10b563a5b9c97df919d6d2d6758580 SHA512 6640d72ace02066c5a9cdc3b2841d4baffbda4237e8fc048b73700443830555638941e57b8360c959e5be61647babf25aec16da38c939198e868c0453b01f15c
 EBUILD libpwquality-1.4.4.ebuild 2006 BLAKE2B 7a4a78dbfe9f5ba3c8c0067534100080c4f3fa33c0fbefe5a1eec3b4844bcad9fa16fa359c2857196ebb97434396ff3e2f10b563a5b9c97df919d6d2d6758580 SHA512 6640d72ace02066c5a9cdc3b2841d4baffbda4237e8fc048b73700443830555638941e57b8360c959e5be61647babf25aec16da38c939198e868c0453b01f15c
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-libs/libpwquality/libpwquality-1.4.2.ebuild b/dev-libs/libpwquality/libpwquality-1.4.2.ebuild
deleted file mode 100644
index c20212beb2f5..000000000000
--- a/dev-libs/libpwquality/libpwquality-1.4.2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit pam python-r1 usr-ldscript
-
-DESCRIPTION="Library for password quality checking and generating random passwords"
-HOMEPAGE="https://github.com/libpwquality/libpwquality"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="pam python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-BDEPEND="
-	>=sys-devel/gettext-0.18.2
-	virtual/pkgconfig
-"
-RDEPEND="
-	>=sys-libs/cracklib-2.8:=[static-libs(+)?]
-	pam? ( sys-libs/pam )
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	# ensure pkgconfig files go in /usr
-	sed -e 's:\(pkgconfigdir *=\).*:\1 '${EPREFIX}/usr/$(get_libdir)'/pkgconfig:' \
-		-i src/Makefile.{am,in} || die "sed failed"
-	use python && python_copy_sources
-}
-
-src_configure() {
-	# Install library in /lib for pam
-	configuring() {
-		local sitedir
-		econf \
-			--libdir="${EPREFIX}/$(get_libdir)" \
-			$(use_enable pam) \
-			--with-securedir="${EPREFIX}/$(getpam_mod_dir)" \
-			$(use_enable python python-bindings) \
-			$(usex python "--with-pythonsitedir=$(use python && python_get_sitedir)" "") \
-			$(use_enable static-libs static)
-	}
-	if_use_python_python_foreach_impl configuring
-}
-
-src_compile() {
-	if_use_python_python_foreach_impl default
-}
-
-src_test() {
-	if_use_python_python_foreach_impl default
-}
-
-src_install() {
-	if_use_python_python_foreach_impl default
-	if use static-libs; then
-		# Do not install static libs in /lib
-		mkdir -p "${ED}/usr/$(get_libdir)"
-		mv "${ED}/$(get_libdir)/libpwquality.a" "${ED}/usr/$(get_libdir)/" || die
-		gen_usr_ldscript libpwquality.so
-	fi
-	find "${ED}" -name '*.la' -delete || die
-}
-
-if_use_python_python_foreach_impl() {
-	if use python; then
-		python_foreach_impl run_in_build_dir "$@"
-	else
-		"$@"
-	fi
-}
diff --git a/dev-libs/libqtxdg/Manifest b/dev-libs/libqtxdg/Manifest
index 764e3511a22b..1d483a23a965 100644
--- a/dev-libs/libqtxdg/Manifest
+++ b/dev-libs/libqtxdg/Manifest
@@ -1,3 +1,5 @@
 DIST libqtxdg-3.7.1.tar.xz 74832 BLAKE2B 92b0f47412e04fa3100f1045a0ceb69ee7787634ab02883958156b96e756aecae1e916fa9963ef072e1d78f337102b2bfb7a42a1dcd9481fd158dde73e57fcef SHA512 764fb953c5c5564a8f5e189f3fa867b82e1da215e0734d2fb995bb29ba163936a38cf68c6c812ff3c183b7ab4fce59d1189c68885b65f103accb5446e71682e7
+DIST libqtxdg-3.8.0.tar.xz 76044 BLAKE2B c49f1317c55ea09c4fe9aaea3e96851c4e5dcbc797e97a8db58dd34b35151e18c654327b71566b5578319dd7a01862627a52a02ce3840951e15fe01b57666dcc SHA512 e9e8d163fe1a60a2d03787ec3feef6ff6e89dfea4df7c0c7b3a72784992baf49ffeb352894d3cb8747ec0cd49576562f7dae3abbde932d13374f51bc77f14ea1
 EBUILD libqtxdg-3.7.1.ebuild 1118 BLAKE2B c248274bcbcf8b5dcba932fa50c625795aa35f22cc5be314e1ec39f713ad257bf5caa55f04011ef07f7587c9a14fe13c1b2863c85b86448511532757b17094f8 SHA512 6d2722f2bc7a32820106164fdf4cd7dc8ea8734aa54f126b54c459d9299722229246682c1bfa5ae6ed8adbc65e3e408889b948cde153bf1631e0bc94ddb128a2
+EBUILD libqtxdg-3.8.0.ebuild 1172 BLAKE2B 6d55d5dc704982b176c24c70507568f209c3c62a44f7973c9fcdeef950bed42394aa5ec304520974bd63248a943596d0d5ba83f7f1fa5b9183cbdd06a93cb2cc SHA512 e20cf6461d74d51bab745d62cf05bc0cfce5af66a92459e991611ac7cff4e3fcf7bb31df4cef6a0426c5342f4043bb1be3aeaf724d387693a843441195e9d657
 MISC metadata.xml 423 BLAKE2B 6205fdbb66e8286d35f33cd497befee8128750eecf8ca674c578937ae1fdd34f4036e91c7719e9333c78a4a5a6fdd3082b7ffc6fcfb839f2d7cb9218ba92a837 SHA512 0097795563b8aba727267461be9ff727fc738c1efa182ba9c8d9e15c7d334efc41fae1c402b09315ad41c8af179f9ad1dfa1d0b055cfd072b2e013227c36edc4
diff --git a/dev-libs/libqtxdg/libqtxdg-3.8.0.ebuild b/dev-libs/libqtxdg/libqtxdg-3.8.0.ebuild
new file mode 100644
index 000000000000..4d53d7eae82f
--- /dev/null
+++ b/dev-libs/libqtxdg/libqtxdg-3.8.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake optfeature virtualx
+
+DESCRIPTION="Qt Implementation of XDG Standards"
+HOMEPAGE="https://lxqt-project.org/"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
+else
+	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1"
+SLOT="0"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	>=dev-util/lxqt-build-tools-0.10.0
+	virtual/pkgconfig
+"
+RDEPEND="
+	>=dev-qt/qtcore-5.15:5
+	>=dev-qt/qtdbus-5.15:5
+	>=dev-qt/qtgui-5.15:5=
+	>=dev-qt/qtsvg-5.15:5
+	>=dev-qt/qtwidgets-5.15:5
+	>=dev-qt/qtxml-5.15:5
+	x11-misc/xdg-utils
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qttest-5.15:5 )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTS=$(usex test)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	# Tests don't work with C
+	LC_ALL=en_US.utf8 virtx cmake_src_test
+}
+
+pkg_postinst() {
+	! has_version lxqt-base/lxqt-meta && optfeature "features that require a terminal emulator" x11-terms/xterm
+}
diff --git a/dev-libs/libreport/Manifest b/dev-libs/libreport/Manifest
index 80782c45efd5..3856fbfa8825 100644
--- a/dev-libs/libreport/Manifest
+++ b/dev-libs/libreport/Manifest
@@ -1,3 +1,5 @@
 DIST libreport-2.15.2.tar.gz 1859867 BLAKE2B f890e3cb8b2a23647e4c3fb0caaf984b1b21fd32e066d04f835f8a475e317cbc75287375e0a10a01b91670d04bba1f15b1180065f7029b8d7d1c0a2fb890914b SHA512 c98003325fa70d674177c9f602a7f121815a9675701ee780ad8908ed69862f2c69be65c7483fd3f017ba299dda51ba304f0908c771c9d97cb5bba057e3a9c5dc
+DIST libreport-2.16.0.tar.gz 1901880 BLAKE2B 520ad157de02dbe5fd15b2ffcfc9b0a09587c3696b41a202f0a78b53a2d366a2991906437aa38d7c84407dcd4a788d358b9e320f70c30e602f1b903433288717 SHA512 cbb456bb63b92a255fecb87191160c2e515b4434cbaaa9404fb69f4f78421fe98c4057969f4b6b99e1b52e815d83c483bdbbe606a4bd2e34cf5268769e7bd40f
 EBUILD libreport-2.15.2.ebuild 1942 BLAKE2B fffb0d535a1c653c12ef66c4c216276dd5cbcec78f83f9f7a947d0aa645503c05b52be1b2fd1be1c181909adaf2fde992df058898d83c37edd19f68252e3eae7 SHA512 bb7477486d972a73b543444925290dea0eb5b68f1e14db85e6f7a653d5c5bc9f2c049451c3ab346712ff380d1beb936bc56a6bca302c9bf39a547aee8d44632c
+EBUILD libreport-2.16.0.ebuild 1949 BLAKE2B 7b103e6feec98f7bc70478fc06f6865397c7cbeea7d2022002ef2dcc4332c996b648ca3a720af58c7d410470535331aea61146d66aa418360c1a00c73a66e9b4 SHA512 b6ba7594be9f8adc9c659ec4409f1c20716a964526d38c3aa0da99f5310b4fca9aa69e1c5b8f30081d21f1d8e130cb009b78f8f5e72813a45ffe22369a088237
 MISC metadata.xml 240 BLAKE2B 1f4d972fe6e8f4096f8905fe5ec3f77b8689f3b0e01ac676ae4e55ce3aa66c18473cc82b5766131f155b9f4cd3fa6c541ab3bd32bfd233ff89722937105f968a SHA512 2e9f28bd0e525aa062cb098048dd176668b1ca2220e0018279ec4779eb80a2e8ad4f1ea73899aded97b7d27379e88d2f60cc80af4a6992880edf6e301b7e1090
diff --git a/dev-libs/libreport/libreport-2.16.0.ebuild b/dev-libs/libreport/libreport-2.16.0.ebuild
new file mode 100644
index 000000000000..f8d64e4b1687
--- /dev/null
+++ b/dev-libs/libreport/libreport-2.16.0.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit autotools python-r1
+
+DESCRIPTION="Generic library for reporting software bugs"
+HOMEPAGE="https://github.com/abrt/libreport"
+SRC_URI="https://github.com/abrt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/2"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="gtk +python"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	app-admin/augeas
+	app-arch/libarchive:0=
+	>=dev-libs/glib-2.43.4:2
+	>=dev-libs/satyr-0.38:0=
+	dev-libs/json-c:=
+	dev-libs/libxml2:2
+	dev-libs/nettle:=
+	dev-libs/newt:=
+	dev-libs/xmlrpc-c:=
+	net-libs/libproxy:=
+	net-misc/curl:=[ssl]
+	sys-apps/dbus
+	sys-apps/systemd
+	gtk? ( >=x11-libs/gtk+-3.3.12:3 )
+	python? ( ${PYTHON_DEPS} )
+	x11-misc/xdg-utils
+"
+RDEPEND="${DEPEND}
+	acct-user/abrt
+	acct-group/abrt
+"
+BDEPEND="
+	app-text/asciidoc
+	app-text/xmlto
+	>=dev-util/intltool-0.3.50
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+
+# Tests require python-meh, which is highly redhat-specific.
+RESTRICT="test"
+
+src_prepare() {
+	default
+	./gen-version || die # Needed to be run before autoreconf
+	eautoreconf
+	use python && python_copy_sources
+}
+
+src_configure() {
+	use python && python_setup
+
+	local myargs=(
+		--localstatedir="${EPREFIX}/var"
+		--without-bugzilla
+		$(use_with gtk)
+		$(use_with python python3)
+	)
+	if use python; then
+		python_foreach_impl run_in_build_dir econf "${myargs[@]}"
+	else
+		econf "${myargs[@]}"
+	fi
+}
+
+src_compile() {
+	if use python; then
+		python_foreach_impl run_in_build_dir default
+	else
+		default
+	fi
+}
+
+src_install() {
+	if use python; then
+		python_install() {
+			default
+			python_optimize
+		}
+		python_foreach_impl run_in_build_dir python_install
+	else
+		default
+	fi
+
+	# Need to set correct ownership for use by app-admin/abrt
+	diropts -o abrt -g abrt
+	keepdir /var/spool/abrt
+
+	find "${D}" -name '*.la' -exec rm -f {} + || die
+}
diff --git a/dev-libs/libretls/Manifest b/dev-libs/libretls/Manifest
index da970bb939ce..180d96ff161b 100644
--- a/dev-libs/libretls/Manifest
+++ b/dev-libs/libretls/Manifest
@@ -1,3 +1,5 @@
 DIST libretls-3.4.1.tar.gz 435404 BLAKE2B 11b828f5c058b929d1d4bc0cd3c53f17592c113f10f6bb73f8b7e672b5ab376e768e33893c4fcf5c0b447bc5cd30012c8aaaf5b639cb4962f4e0849ac3ee6cf1 SHA512 5d8b8d6cafd4b3c7e97eb417dad35a415bd69d599e9ee720f5598452a6750589b570ffa52718062d2ae3477df81b2316064577a25d2c68fa673082bb766b16ad
+DIST libretls-3.4.2.tar.gz 435457 BLAKE2B 2bfe4af4ea8d773f79b6607e7a0a2e7ae7cfae40690312e940c583bfc6de98087f328d1613e65695f46cf6ba1e11f9ef5f043185d21bcd595004f70cec6f3ef3 SHA512 0ded26558b74a00e5e05629d577c07ad9b8a8955aacbd7f97d6d1c81d4e7ccfe7c2fe0cc5bcb03fffb282cd51b8404236371d0074e39508099d1990fc3e065ba
 EBUILD libretls-3.4.1.ebuild 663 BLAKE2B aae0f351b3aa8bed9e12226fd7f323e2c58771d750e424c2caaf2cba0fd98559224e75ce84738a5c89301bf37c5a934dbbeac981cbff2188a7cbc2c4fca66893 SHA512 abb227cda09a245991959d7015bce467eac2b2ba0eb5a7f55c9ed7f40abbbeff2d3e45708233fb73742dadbda507c0c2a4c605d2b0e26ff6ea645353444c32ed
+EBUILD libretls-3.4.2.ebuild 669 BLAKE2B 21ee067e2e922e487172c93c2abbfc8b076549125c4afe97c0ac97a6898a023d50e57273a12fd6de7f468f44f6d8ba1c4c3f1dd463fb6652aa396ee5209f3f4f SHA512 30e790b4c21a4dd580762971f82efc9d893a8c0de126d1c8966c68af4b9869dd4c09b1e12a695ccdf50ed5044988a2fbc1e17f371ec0f65830d9064f5372bcea
 MISC metadata.xml 361 BLAKE2B 9f05ddd1ac3e1a634962c9c800c3bdf60554488c61dff9b215866b24e0b2472d7c0873f0fd6bacec2abbab0e79faca728a4b22e34633c3dde64995b05b86db61 SHA512 c7b186da31da21b4ad5c5662325cb2757e3ee8d7cfd84d75a49b07aebd4dc882cb9b0e16ffce99a8ae2409a53dd750dfb5ec6eff0f9da9f4afee013f102ef688
diff --git a/dev-libs/libretls/libretls-3.4.2.ebuild b/dev-libs/libretls/libretls-3.4.2.ebuild
new file mode 100644
index 000000000000..777d4586d76b
--- /dev/null
+++ b/dev-libs/libretls/libretls-3.4.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal
+
+DESCRIPTION="Port of libtls from LibreSSL to OpenSSL"
+HOMEPAGE="https://git.causal.agency/libretls/about/"
+SRC_URI="https://causal.agency/libretls/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/22"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+DEPEND="dev-libs/openssl:="
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+multilib_src_configure() {
+	local myconf=(
+		--disable-static
+	)
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libsodium/Manifest b/dev-libs/libsodium/Manifest
index d9be7ba50513..aeb47e4201c6 100644
--- a/dev-libs/libsodium/Manifest
+++ b/dev-libs/libsodium/Manifest
@@ -4,5 +4,5 @@ DIST libsodium-1.0.18.tar.gz.sig 566 BLAKE2B bb892901e2228c93018d79a5c8e70e0ea45
 DIST libsodium-1.0.18_p20210617.tar.gz 1854880 BLAKE2B 5b421c7efacca5b2a2b5a99a04719d708c217bc6f0b344f08d566bde85c4f758862c0ad61924346eac508542c2d9c6313cb1e3e421743e424f396dd1972e8195 SHA512 d7cd64101fed11ce33c4865dec253f1058acab376c3a6097422508087f4449b2f7fd1b38835915843106f620bf86694d846695e0c8a35f921e4f190dea3164bc
 DIST libsodium-1.0.18_p20210617.tar.gz.minisig 311 BLAKE2B c54b76a9e29f49bccca80466a5aaa77fb8341e8164041331003710de8f9b173fd25de4812157377645d97ba8a97470076a7f5e037501ba8376b285a06461efa9 SHA512 2180beb872716ad6b728a455981b548003b18594c3f28435c5ddc9803ab2a0f8f1945b6c77de5928b948bbb803b4fa7527cc2e72059931364343a2fdf51ca1be
 EBUILD libsodium-1.0.18.ebuild 1563 BLAKE2B 436396cc79b476ac4ae42efcb9f5d41edde6544a57062b7ae11bc0a3796194a92ba0e463ae51219641cb3e599b38c300c1837c3215a79fbcb856fff8100e7e93 SHA512 0f0474831c5f0a315562e992942dc7c62e5527fbcdd760a60c1c8419e1a083cdde0faf6082fb9a519411de7c372e75eb5233830d61d99a5986be3c20ddb594cb
-EBUILD libsodium-1.0.18_p20210617.ebuild 2512 BLAKE2B 352e01126528e036183083772b839ee4aead323e6ce2e1ec5a1b2271a06bad004168a07c2e2c7336cc95861e81ddf13b234be4d46ec036619dcf6d722ce82306 SHA512 9de6f693ae17860b086cf01d50c4daded55442ee3fc5bb5dea247a4375ec26f44118e84b92a917c91f4be1023a30750c5dcf6b401fab1e85b7aad8d65ff58d94
+EBUILD libsodium-1.0.18_p20210617.ebuild 2518 BLAKE2B e1c4e6b96aa6656451262b8f7e4b81eabc396d7325a4cd49a8e405bbc58a09892160f3ce59cb2722b868936804f1c22957a59f608791d8a40658cd082a09c6bb SHA512 77089eb2f42e5f88a5936f5f7e85443d346ff960b2995bd0d43113839cdb659e88223f32ff93fd8ccbd229915aad68dc00273c8db5ad6e6bc47d47e7dd7f83e0
 MISC metadata.xml 865 BLAKE2B 04e3718818b19a548afdb2b479d9c24c1b66fb117e91c417ea856cb8bc362634ac717e47dee33de2e626315e8a1c961acd3ef45cde8bbaeadfda5360fcfadc24 SHA512 75aa772e03a2b6579be1a650953766ae4ef06b1a98bc2cc1d79fecbfd0a1b3334b1762605aed7b6f859066d8f63f96ec76e233410a96f45b370519099f635483
diff --git a/dev-libs/libsodium/libsodium-1.0.18_p20210617.ebuild b/dev-libs/libsodium/libsodium-1.0.18_p20210617.ebuild
index 959d0c871f7b..1abc44b5a010 100644
--- a/dev-libs/libsodium/libsodium-1.0.18_p20210617.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.18_p20210617.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
@@ -31,7 +31,7 @@ fi
 
 LICENSE="ISC"
 SLOT="0/23"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="+asm minimal static-libs +urandom"
 
 CPU_USE=( cpu_flags_x86_{aes,sse4_1} )
diff --git a/dev-libs/libusb/Manifest b/dev-libs/libusb/Manifest
index cef554fa8483..ee3e84f86f32 100644
--- a/dev-libs/libusb/Manifest
+++ b/dev-libs/libusb/Manifest
@@ -1,4 +1,6 @@
 AUX libusb-1.0.24-multi_device_config_parsing.patch 2340 BLAKE2B 28e8f3916843599e3b2f03228d2366de29a9332fc0a147e32c61f8944bb0f77fe1b57b3f323f161bafd00f5ef8434c33afeb5c89ad4a0d658b54daf2ba5dc541 SHA512 78af84f9dc33589f89e6f97d5aa81ec11208dc65c3bd8b8c947837d0f70d68e5313ce3a68853d4d6cc8af4cc2f237b5c95ac2db563f0013652f88479dbcfdd68
 DIST libusb-1.0.24.tar.bz2 606593 BLAKE2B f6188b5af1225cf8b6d1486b6efcf48e837ee4f2e3592adab3ae6aae0a74a67aa54f40f0dd547f951a194d40954f2ee33acf741d2eee0b8449ce64f2edcf1018 SHA512 5aea36a530aaa15c6dd656d0ed3ce204522c9946d8d39ffbb290dab4a98cda388a2598da4995123d1032324056090bd429e702459626d3e8d7daeebc4e7ff3dc
+DIST libusb-1.0.25.tar.bz2 609127 BLAKE2B 3aecfbf9fc068fdfb8e612918bb895988f8400dc2c3ffd96a81792ab844d632f0c098947200512ddc37cfa9003956f8454c1d0362973a5d646a225f81cc2923b SHA512 f1e6e5577d4bd1ff136927dc66c615014a06ac332ddd797b1d1ad5f7b68e2405e66068dcb210e2f0ae3e31681603ef72efbd88bf7fbe0eb41ce700fdc3f92f9d
 EBUILD libusb-1.0.24-r2.ebuild 1772 BLAKE2B 8ce1e44dc5838e83968a70c5a165468eb39bdccf1f818a8604fc0efacd8d1f0dbbeb222f65d3e4416ae988c7b327acfc46b060ba02bd580c418b897ec8f1b87b SHA512 0e851aac8a4012a6d89acb2f797ebc462f00c0c6b1dd9f1a673ade1a056ea802d2dc6204e83d20b606b0366f9562d7be0f5960240945e5acbe911232fbcda2c6
+EBUILD libusb-1.0.25.ebuild 1688 BLAKE2B 6330e6be3ddf43cc551d3196aa1b45d212e6a2c2bfb4f9a084baef0f559ab30a077238c66008ffea950d3e7f8406197130bce567af1fbd3255bb1c991d4f4cc5 SHA512 5673513eb6023e471f77822bd12629d21635340d46b5153187b6c4a966fe32a1dbbe463c400b9044e2bcbed0f14a1a581683e63cf286619f65ce774f33763ef3
 MISC metadata.xml 336 BLAKE2B 8598a5e3d01ee5d7efb7ef2d48fcde99c13ee9e5915d3fe4fb2b16689482dfb31ea23d27d75e638aa7e429f725b876e834f3319eccc188f4af6704d3fed14c4f SHA512 8bfb8a1c4a2185393c1cc00b6ba17a9e04276e7708ab5c590209eb7c522212c8b45981dd935ef15421f5865ac7861c5dadfbc7d8f53ab4a42b3f0315696b3713
diff --git a/dev-libs/libusb/libusb-1.0.25.ebuild b/dev-libs/libusb/libusb-1.0.25.ebuild
new file mode 100644
index 000000000000..328fa227b1de
--- /dev/null
+++ b/dev-libs/libusb/libusb-1.0.25.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal usr-ldscript
+
+DESCRIPTION="Userspace access to USB devices"
+HOMEPAGE="https://libusb.info/ https://github.com/libusb/libusb"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="debug doc examples static-libs test udev"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="static-libs? ( !udev )"
+
+RDEPEND="udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	!udev? ( virtual/os-headers )"
+BDEPEND="doc? ( app-doc/doxygen )"
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable udev)
+		$(use_enable debug debug-log)
+		$(use_enable test tests-build)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake
+
+	if multilib_is_native_abi; then
+		use doc && emake -C doc
+	fi
+}
+
+multilib_src_test() {
+	emake check
+
+	# noinst_PROGRAMS from tests/Makefile.am
+	if [[ -e /dev/bus/usb ]]; then
+		tests/stress || die
+	else
+		# bug #824266
+		ewarn "/dev/bus/usb does not exist, skipping stress test"
+	fi
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi; then
+		gen_usr_ldscript -a usb-1.0
+
+		use doc && dodoc -r doc/api-1.0
+	fi
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	dodoc AUTHORS ChangeLog NEWS PORTING README TODO
+
+	if use examples; then
+		docinto examples
+		dodoc examples/*.{c,h}
+	fi
+}
diff --git a/dev-libs/libutf8proc/Manifest b/dev-libs/libutf8proc/Manifest
index 5df124305064..d1047f0d625d 100644
--- a/dev-libs/libutf8proc/Manifest
+++ b/dev-libs/libutf8proc/Manifest
@@ -1,8 +1,11 @@
 AUX libutf8proc-grapheme-test.patch 882 BLAKE2B ed3092be0d7e4e81c9dbde765d4a7cbfadfce266bc71f00dec83f1897436c3c1e759aef06d58136e7bc015861062d26e17b5b4989040bfef4d28d652e0f756eb SHA512 34f3d82bff1a6d0de9cae56b78af8197f103d9c6a4eb9bc912b28f84be8ecec2a7859758a5d1a9d4f5b7593c3f1e17c12f8ca6fdf980916327e3cff718bdc6d9
 DIST libutf8proc-2.5.0.tar.gz 155485 BLAKE2B a0cd9285e7f171b9449d9d98f91173bad2b793a00a9c10287c43cc2050b6a0306e289cbd3b4faebb0d97fd305b77ecbb7ce11f119d9ead2a580029db0d7ad898 SHA512 0c553faf4f3841c17c7aa4cce1e917b1585c430ac3f7f240ab98cbe01b9743f2074532e6f71faf3df030f5af00e483a3faf9716a67e6a4b1bb66a3de48308014
 DIST libutf8proc-2.6.1.tar.gz 182903 BLAKE2B aa2545136e084a44b2e3470e9395c15327b8d6fbe48e3145336366e208fb0e2565961c302a9117f8275e5b8a218d48a7059b5c1d2cfdff11e8341dc1bfb820a9 SHA512 9a09fe58a63c8c7983b8968b9b2c82f3d188724ed125097ea0de6a18d87569c678e226dc5de183108e47b3f068117e6bb352da1c3d24ebfd8018fb0b2346592e
+DIST libutf8proc-2.7.0.tar.gz 187906 BLAKE2B b2b3dc86ffa38f1d75293455cca22d3c0a0c51c529f154bbeaf40bb8b91bcedbf3955cfa459323db8b00566ce42857391875dac6fd677e36f700e8614767ac25 SHA512 29f7883de13302d609e8755872ed43174e70076e9681b4ac3f9b03e50295c45d9972c193bc81f94ad7e11e2d33a46cad5a30a80873173e6e1ae242101ebb3bed
 DIST libutf8proc-EastAsianWidth-13.0.0-r1.xz 68808 BLAKE2B e8bac9804aa195ebed82ba51f164166976e4feb2f8c3699847738bb2a320f2a00eada1743bcbadc398dbf7998a47d6f4de5826e278eba86a198748eb59abb7e9 SHA512 f74345a9f509865705d55f18a0f258346ba261d8b9a59e5fc4de51b84ecad6d1fcc9afa0af312b09fb76bacdf5f597b0f2a965800a18c80f65a604a0bc64d3d2
 DIST libutf8proc-EastAsianWidth-13.0.0.xz 62040 BLAKE2B 1665047336ded524d0b0a0c6a88afe0d9041a82eda688451b9b2556bcf9eebe6d817119e9aa6e07c602b076e710ecfc73d0bf3487ec5dcb131cd56914e1e6354 SHA512 8f6670299d545cc323a226cb310915ab2600d4e372221814afa67a75c6963bc0a4473a6e28fc847c0ad9761466c6f80de7b1eb3ed04fa28703a20ab34bcee0f2
+DIST libutf8proc-EastAsianWidth-14.0.0.xz 70420 BLAKE2B c2fa8ec34ae3cccb532d8ba82dc7ef40d82da2ed2f4bf187ef0df28cecd2e91320e25287e7bc6e7f22ffa6730af7b910b73d69172664235f3236c16a5ffe990f SHA512 5bd11dc8c30d12692d3cbca932c1bda5e19d9b5e99fc9f1a3ff8864e4f0e577769c4e1f91338cad10a468c38b904cf16b99ba44f44b80695cac23fe436f1e24a
 EBUILD libutf8proc-2.5.0.ebuild 1304 BLAKE2B 72b5926b5a75057ccf8edf2f8137faeea319e7346b9785b2977ec1d7460e8f6b58e759b27cc80be449b0d4fa366953a1c48228bbf6b31d0615e658250326bd23 SHA512 209ad6a8d3360e90f8bfe02e94771dede789dd9d403f2917d6cc0c82cc0c01b4a59f415f8db072b92cf0b2d6cc501982d0a3659ececcf4acfe228dc654b2031a
 EBUILD libutf8proc-2.6.1.ebuild 1428 BLAKE2B a3b29c2bcc1142908dfd9e085d1977c441b5665508d5b5933e100d59a24a264d43bbad2f584c611d0c11cd0735533847eb4d408dc4f44b321ab982ef7d4e5c4e SHA512 ba39903d5e564f38ad129a6b8986c30fbacc3c1ea309822215016ee87289ebad14a08a2bc32181b0fd131033559fe09e914e3fd4a1e4de513d8b0d56b509e000
+EBUILD libutf8proc-2.7.0.ebuild 1422 BLAKE2B 4f156f8f3fdd4fda7abbf7b639411ee5bc483906489af2c9419417b517ad717a14dea57ee2ec88693f6eedfab768f4dc75fb177406e7a6f39b25cc5d0fb9df2f SHA512 dbc0db8ecb73db135ff7bda2084d797d9b566d374e7819c28c7e828794631d2b8767e2446aae77bd5fe274678244ea535880023b9f0314f42c37e88e0c867175
 MISC metadata.xml 249 BLAKE2B a37da98d387308dab889eab2665b67e4176707f3c115a7a69cb7f4b19f9864b96bc2fe70efa105e627c4b57a7d626f6b23dc2709a225a9debada3356f3cf32a0 SHA512 a5095fb01e05f24583a962e36131b2f02cf2d1dd7a97051200e465ad97db014721de7c1857f5eb736cb0290682e8de833cb4c735f7de8d98cdfae1aed6d3d549
diff --git a/dev-libs/libutf8proc/libutf8proc-2.7.0.ebuild b/dev-libs/libutf8proc/libutf8proc-2.7.0.ebuild
new file mode 100644
index 000000000000..7e8a223a3271
--- /dev/null
+++ b/dev-libs/libutf8proc/libutf8proc-2.7.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+USE_RUBY="ruby25 ruby26 ruby27"
+
+inherit ruby-single toolchain-funcs
+
+DESCRIPTION="A clean C Library for processing UTF-8 Unicode data"
+HOMEPAGE="https://github.com/JuliaStrings/utf8proc"
+SRC_URI="https://github.com/JuliaStrings/${PN#lib}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	cjk? ( https://dev.gentoo.org/~hattya/distfiles/${PN}-EastAsianWidth-14.0.0.xz )"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="cjk static-libs test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? (
+		=app-i18n/unicode-data-14.0*
+		${RUBY_DEPS}
+	)"
+S="${WORKDIR}/${P#lib}"
+
+src_prepare() {
+	if use cjk; then
+		einfo "Modifying East Asian Ambiguous (A) as wide ..."
+		cp "${WORKDIR}"/${PN}-EastAsianWidth-14.0.0 ${PN#lib}_data.c || die
+	fi
+
+	default
+}
+
+src_compile() {
+	emake \
+		AR="$(tc-getAR)" \
+		CC="$(tc-getCC)" \
+		prefix="/usr" \
+		libdir="${EPREFIX}/usr/$(get_libdir)"
+}
+
+src_install() {
+	emake \
+		DESTDIR="${ED}" \
+		prefix="/usr" \
+		libdir="/usr/$(get_libdir)" \
+		install
+	use static-libs || find "${ED}" -name '*.a' -delete || die
+}
+
+src_test() {
+	cp "${EPREFIX}"/usr/share/unicode-data/{DerivedCoreProperties,{Normalization,auxiliary/GraphemeBreak}Test}.txt data || die
+
+	emake CC="$(tc-getCC)" check
+}
diff --git a/dev-libs/libzia/Manifest b/dev-libs/libzia/Manifest
index 3e2dc6a1b065..4aaf42fa9696 100644
--- a/dev-libs/libzia/Manifest
+++ b/dev-libs/libzia/Manifest
@@ -3,5 +3,5 @@ DIST libzia-4.32.tar.gz 633444 BLAKE2B 60fbc85297b06e109f6c989798b6c5629d6f2d861
 DIST libzia-4.34.tar.gz 636031 BLAKE2B f33c13f4159fd6e6e83e3aada2560ed6f2160811eb1d94078c8792c5dfb07cc6c69f2a41f9b82ddf73b28b2cd57480590393b3c6b5ac24eece1ef40e55a52014 SHA512 a93ecea84d506767d20f03fa8b56408c6e8a0aaa4b8dad26b21e133c83a4726ebf3ca88425bc63249cb98fbd95dd3bb4d9afb8529bdd5e70fc5dbffbc6bf5533
 EBUILD libzia-4.30.ebuild 972 BLAKE2B 9f4836d3afecae91e382f7a5bca85ff975027da86e4d9c1dcd100ffe283772bc526bb0086051b5d4459c4f562d25f0be303579b7f8f1facccca6fbb3353754c5 SHA512 5f024cd389418478031574adbc2f08a1550283fa3e1d3e37add45a232d9e2e4ec7e71d9cb1b48f5c24fc68f8374ff567b8765f7e58db11d8b0ba2cdab571b3f8
 EBUILD libzia-4.32.ebuild 973 BLAKE2B 3a9e0fdb102777c7bbb7fef3058ee287df919633769b6dfe816378d4eb4c3c450cbfbd77e7f515112230c4c9e97bcead764f29fbdbaf7e3f7103ea09b3790dcc SHA512 49d3361f42075c32c328865a1ab678dbfc8ed05c913f49871511984b833ea861d0ce0aa1dc5ddfe0c5e669195cdb23ae32929d324a7eae00ed0fdc656c70cd62
-EBUILD libzia-4.34.ebuild 974 BLAKE2B b74446348dfd0d0f0c1470349aaa04ae1d59d034c1ecf96d5da37a9507e7200d6e487c427e4312464e90561668cd06274140e74e2a00c46aba0c2ee0d51ed4c4 SHA512 6555ced9e553fc7546163ee0e77f0c87f8421d038bccdca61e290414d3fa30ac3dfadc4d86154933c1926018fcd6b365a29246abf41f66db59432ecc4a2a4e59
+EBUILD libzia-4.34.ebuild 972 BLAKE2B 3091df6e10498c689e46ebb6ae449965e372c1c52b7607d0fa7a774046fc0d6395c222b847cf3361371c9f0fbac4b6c174709eaa1549f898a2d656fc640e1c6b SHA512 09222797a05805598abca2aee5f87d02d2d414100513fc18586a574d7e571f97d8852ba50dae99cc0b6aac92d3aa1f09db0cdcedfd2686931d21c9a06a3defd1
 MISC metadata.xml 326 BLAKE2B 1b8ed6c9d40252f3371cf9a1ec295f593c8898dd8e45173ca05cededf987c7e44e2fafca613f8ad3022e9fbb6886d6aec2d183fd47c3064f35038784f361ebc4 SHA512 0c8a48b1101aa184dc596581feaf47463688801cb0f342177ecfb6fade1d63520ca1b9dcb278279470c181b560f555de332e4d2583e8856eec9057cde34df48f
diff --git a/dev-libs/libzia/libzia-4.34.ebuild b/dev-libs/libzia/libzia-4.34.ebuild
index 0e9b995dd476..7d83b69f0dae 100644
--- a/dev-libs/libzia/libzia-4.34.ebuild
+++ b/dev-libs/libzia/libzia-4.34.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="ftdi"
 
 RDEPEND="dev-libs/glib:2
diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest
index 5c28c22dab7b..cbb5e96b826f 100644
--- a/dev-libs/libzip/Manifest
+++ b/dev-libs/libzip/Manifest
@@ -1,3 +1,3 @@
 DIST libzip-1.8.0.tar.xz 760604 BLAKE2B 7aadbd4df909806ff728f9315f91c2f4b4e884464ef36acd668b23739fa57e4f65987b368cae0d728dd6cc1468718e40086cf0dc21f437a5c2cad91b455c0bb1 SHA512 fe94a26a2797dff7c9b27334f29982f8e523dd5095bf32ebcadc6443726864f0ff7b2e8bf243e52cad8f79297bc7a87d73fdbc35edae4ffc8ab6aa0bcc93b03e
-EBUILD libzip-1.8.0.ebuild 2366 BLAKE2B 8715d7bf701f343266aeb8c0f1cd02aa1523dab2aa586f0351e76b4b2f37b0773f19a6d4b1e7c06369974e859bb1e451051684ec4206c0730c0b19ab86c89cc5 SHA512 a7abdcf40eae0e05e161735a05c7d52f607e7ea828366f872fa5601bff2eb23bfab2d298632d1a8b5aded0983c00dbd53622b63cd56c70b52380eee026988747
+EBUILD libzip-1.8.0.ebuild 2377 BLAKE2B dfcff8979333cb16b1ab1af1e9a9589177f2d29348ebeea02e84becc73dd3d3748c9e4e4b6d51f657f12b2ccb6665fca491b11613643633fcba425f915d5c330 SHA512 3d596a6173000f4cb441f1e334646521f812bf13c431d880b2e88a5a0457bc91c9ef4da6dfe8088ccde5f629728602b5250b3a2c1e3d781582081866b43a38df
 MISC metadata.xml 510 BLAKE2B cd0e88d175985805badcbe4b6aa771fd65ab9e8e86a3d37e18531e61ef9fac92ba191ba4a3806c37743a51541b1f353f5bf58b7195898de74eb2c389623a6994 SHA512 e073a6f074e9d5dc8abffada8338c608915527ab3c76f693cd261c6a99aef73e18c0e0088d508d62032619f779f1c6d9445cdd0273aeb61e41b9e3b449762337
diff --git a/dev-libs/libzip/libzip-1.8.0.ebuild b/dev-libs/libzip/libzip-1.8.0.ebuild
index 75dc43584331..b5bd1678c9c4 100644
--- a/dev-libs/libzip/libzip-1.8.0.ebuild
+++ b/dev-libs/libzip/libzip-1.8.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0/5"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="bzip2 gnutls lzma mbedtls ssl static-libs test tools"
 REQUIRED_USE="test? ( tools )"
 
diff --git a/dev-libs/link-grammar/Manifest b/dev-libs/link-grammar/Manifest
index b57e12bc4acd..06c92adebfdc 100644
--- a/dev-libs/link-grammar/Manifest
+++ b/dev-libs/link-grammar/Manifest
@@ -1,10 +1,9 @@
+AUX link-grammar-5.10.2-musl.patch 371 BLAKE2B 989e27593b2780401a4df5ef292f8487a32f4fe0287e4745143bed6f72a7d0af71b20a1d8e06144bc116fe12f1778a3cf8f3e8f86922f3049d99d82a82b7076a SHA512 d2eb12fc12cdd1129420d976facb7f652bd475336c71d683b9d561dcb4a9001c60d127d27446f3c1f93757ad6715214a53d3170e03ee1952cb3c37ea03368a05
 AUX link-grammar-5.8.0-dont-inject-O3.patch 621 BLAKE2B becccc08314e45416ee96ec52a5b03b3cf5b1fc141a427a774c7d2b816cff985abba54a99b8bc308e9e75759045b335380a186031d647cc8df00582669615ebd SHA512 71e05d722d24a4647af9f879c14d74d2875ee5435f1b70acb8f962f9e7e602e044e8ed98e118e3ad9ebf725a9701a302ca1e5ea75aa8662326f29251c1317138
 AUX link-grammar-5.8.0-out-of-source-build.patch 1189 BLAKE2B ba89966a0744b39f0f24fa3359a031041cae61f3ec26aaad42eb6e05cbc5c33e54f927c460b33f8d1d37b3987e149f1c88da1ebaab408d322954eefa755b38cb SHA512 e2f094f341bf943a57ce04f10f49a1aac8345ced88a63c54fdfceda946ab575ff088c597d61847d9a9bbebf10af9ad1c284239f29004fc7917deddcd79ddce69
 AUX link-grammar-5.8.1-lld.patch 531 BLAKE2B e7a64032d8e8394205d4529e270bee1ec121a6b29b6a779e885cae825678679e521b2f4eb2bec6b6b6c8f1c5f311337c7b2e205a5cb1966538741e72b7e7cb37 SHA512 03dd3164c7626d70019851189fd35d7ecfcbc112b594dafc0c3390f0d533b67611838cd9207a486139f4e4c8ac78f81da87d0c00a0238ad417c90942bcaa2c6b
+DIST link-grammar-5.10.2.tar.gz 3853934 BLAKE2B d2cb64a6b0146f40ce5b197c21ded94f1256360615c2332a1c546f6b6c71c98d2500e97b0fcabae964377a04143fa13ba3af324f2de729cfccd280e53f6fb7c3 SHA512 71bc881cb628fe1898403024d8e949b2fbf44f5d20445f6fff7bb6038646840556d734434beb7eb43b63f661e18333657deaeb1b8c96b50d5fe3b6ef727565c2
 DIST link-grammar-5.8.0.tar.gz 3782125 BLAKE2B 8027e91212d3269b8e3ceaa5c837ad961cd2dfd92849d3989094ab771d97d30f4b228cfc1e32e9e843676aa439d790fb444823f7db69004538ad068c7bf28a45 SHA512 1262e2faf1de6f05a62f9d622f43c02253b4c241342df9b443a70ae04bd328d1fc49cd2f91c881e694f67215005833fec8b1fa9d395b1e547985b376c7415d2e
-DIST link-grammar-5.8.1.tar.gz 3791847 BLAKE2B 8c89b95eaae87f0b576374c3f8c00529d61b62004718424d1ac1a41b694d8b56ba75d0a7068e1411376c260781f5adae8512976a6572e54f18d84abe98c1839e SHA512 0ef99d3ccb3d922a946f1f73b8b81cee9ece156886dab3367837e1e9f79944967da1391daf7f96ea5a95a0abdd346b642111a7939eb9aa079557c10b3efe8022
-DIST link-grammar-5.9.1.tar.gz 3809872 BLAKE2B fe0c407e2e4ea4201036647cbea7d4c2606fa9943653fcc2d3505963a00773006912b8af5c2762acf498220d2f48319a031736d59790c0fed616432973ea24ec SHA512 c8d8bc99ddd6f6190ebcb24fcafc79497c3eeab1deb3099691f55c735a0a607a8372a8dca5cd86ce7c20cd3a45e4f1cbf91bef39dc781a5b5a2246006b4f601e
+EBUILD link-grammar-5.10.2.ebuild 2955 BLAKE2B 9110a507c8574d8fcd73441275831e59b35b28d824ffbb0dd3b21143241faad23e4d906f08abcad9fbfd44ab4b0ee47a4d154c380dac6b2f58dab6813fa2f13c SHA512 2f2fc15e568326559ca3f65db137ee0a0948c63e4c99f7c0daffe5d949c66818be1eaf4e2df561b7e6656a5b4193e9560cd2155e37a6de4a61fd9ed33d87f057
 EBUILD link-grammar-5.8.0.ebuild 3187 BLAKE2B c571f8e5efd48157f76551eadef5de79f6d1092ee98299b4d0fd0d7059dd7971140445913dbab7236dcebef7e113a469eeba70b2a4d5c6d0b7a5c072f2235177 SHA512 2971f78f62d10407e12764b930c2f63ce25b2ff152ff9d8cf399163463461c029b83d14db4b5069b41e476509ccbb8c23dc5b0b0b354aa86f43c0471a24d0ebc
-EBUILD link-grammar-5.8.1.ebuild 3055 BLAKE2B b029a010785009c0463a272e8fa70a0166e14419292a4ea8f0c09d4d1bac7bd75ed7122ade19c4615816650dc71a0296c4ff97d0f873f756f8b6f3f9f9c61505 SHA512 7d21f89272decc806e310f961d3e40edc5fa55398aca74f71a9d80b151e18e7a27ee4d243c0fe5aee81ae5662f24ce242ccf3b0254ed9675b57aec786932a2e6
-EBUILD link-grammar-5.9.1.ebuild 3069 BLAKE2B eac0da4f591ce50f20f1483e9f4caba16ce3a510434423e2a9d48fc46e422906abd5a64208d85a057db7a751218cf3f684d3f9ee08326c7a4e0e3751b14fe6cd SHA512 fb327c449b874d86549806e367067ad5abc4ded9e22feff9df7e5700aa500f4c20f4121b497c80bd43483ec947c8bf18f0d74f5bd044698b9d51eceaa1d8eade
-MISC metadata.xml 964 BLAKE2B d5e9edeb0dc780ed561105e1834e81ad21c4d495f17cf1db4a66c0b6f862c572d2f4ade6b0a52a14f70ac73bdb58d06686d844bfe760818c7bb5e039f51eda56 SHA512 d3456442cd0a2a5b6e89e2ab3067c00c2bf0faf3f373cd3bf4f0cbf52ee37b882b9e2ed5785e2b43348c6d5e174b918e69c2e8e6bf91b1b16b1d2b692b796823
+MISC metadata.xml 1069 BLAKE2B e657e7727730c54d4aee903c585378978a2adf7a3a6851e6995445afe64e966e48bc4bfab6e930449c288b3ffca3436b9fbe67e88f9e790739ff0c8a079a79e2 SHA512 ba898591c96b8d05601389837891f6cda7eece200c10e014e86e0189aeeb5a0d0c04327d348ce2d77fa3d72dbbe3eec5b96953ff6903bd9670f305886f869229
diff --git a/dev-libs/link-grammar/files/link-grammar-5.10.2-musl.patch b/dev-libs/link-grammar/files/link-grammar-5.10.2-musl.patch
new file mode 100644
index 000000000000..8015e3ceb1e4
--- /dev/null
+++ b/dev-libs/link-grammar/files/link-grammar-5.10.2-musl.patch
@@ -0,0 +1,13 @@
+--- a/link-grammar/minisat/minisat/utils/System.h
++++ b/link-grammar/minisat/minisat/utils/System.h
+@@ -21,10 +21,6 @@
+ #ifndef Minisat_System_h
+ #define Minisat_System_h
+ 
+-#if defined(__linux__)
+-#include <fpu_control.h>
+-#endif
+-
+ #include "minisat/mtl/IntTypes.h"
+ 
+ //-------------------------------------------------------------------------------------------------
diff --git a/dev-libs/link-grammar/link-grammar-5.9.1.ebuild b/dev-libs/link-grammar/link-grammar-5.10.2.ebuild
index 7d7c3b6289d0..16ede02d89b8 100644
--- a/dev-libs/link-grammar/link-grammar-5.9.1.ebuild
+++ b/dev-libs/link-grammar/link-grammar-5.10.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
-inherit autotools java-pkg-opt-2 python-r1 out-of-source
+inherit autotools python-r1 out-of-source
 
 DESCRIPTION="A Syntactic English parser"
 HOMEPAGE="https://www.abisource.com/projects/link-grammar/ https://www.link.cs.cmu.edu/link/"
@@ -14,7 +14,7 @@ SRC_URI="https://www.abisource.com/downloads/${PN}/${PV}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0/5"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="aspell +hunspell java python" # pcre
+IUSE="aspell +hunspell python" # pcre
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 # XXX: sqlite is automagic
@@ -24,10 +24,6 @@ RDEPEND="
 	dev-db/sqlite:3
 	aspell? ( app-text/aspell )
 	hunspell? ( app-text/hunspell )
-	java? (
-		>=virtual/jdk-1.6:*
-		dev-java/ant-core
-	)
 	python? ( ${PYTHON_DEPS} )
 	!sci-mathematics/minisat"
 DEPEND="${RDEPEND}"
@@ -36,21 +32,21 @@ BDEPEND="
 	sys-devel/autoconf-archive
 	virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.8.1-lld.patch
+	"${FILESDIR}"/${P}-musl.patch
+)
+
 pkg_setup() {
 	if use aspell && use hunspell; then
 		ewarn "You have enabled 'aspell' and 'hunspell' support, but both cannot coexist,"
 		ewarn "only hunspell will be built. Press Ctrl+C and set only 'aspell' USE flag if"
 		ewarn "you want aspell support."
 	fi
-	use java && java-pkg-opt-2_pkg_setup
 }
 
 src_prepare() {
 	default
-	use java && java-pkg-opt-2_src_prepare
-
-	eapply "${FILESDIR}"/${PN}-5.8.1-lld.patch
-
 	eautoreconf
 }
 
@@ -58,13 +54,14 @@ my_src_configure() {
 	local myconf=(
 		--disable-maintainer-mode
 		--disable-editline
+		# java is hopelessly broken, invokes maven at build time (bug #806157)
+		--disable-java-bindings
 		--disable-perl-bindings
 		--disable-static
 		--enable-sat-solver=bundled
 		$(use_enable aspell)
 		$(use_enable hunspell)
-		$(usex hunspell --with-hunspell-dictdir="${EPREFIX}"/usr/share/myspell '')
-		$(use_enable java java-bindings)
+		$(usev hunspell --with-hunspell-dictdir="${EPREFIX}"/usr/share/myspell)
 		# $(use_enable pcre regex-tokenizer)
 		# $(use_with pcre)
 	)
@@ -117,7 +114,3 @@ my_src_install() {
 	# no static archives
 	find "${ED}" -name '*.la' -delete || die
 }
-
-pkg_preinst() {
-	use java && java-pkg-opt-2_pkg_preinst
-}
diff --git a/dev-libs/link-grammar/link-grammar-5.8.1.ebuild b/dev-libs/link-grammar/link-grammar-5.8.1.ebuild
deleted file mode 100644
index 2cdb1a11a0e9..000000000000
--- a/dev-libs/link-grammar/link-grammar-5.8.1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit autotools java-pkg-opt-2 python-r1 out-of-source
-
-DESCRIPTION="A Syntactic English parser"
-HOMEPAGE="https://www.abisource.com/projects/link-grammar/ https://www.link.cs.cmu.edu/link/"
-SRC_URI="https://www.abisource.com/downloads/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="aspell +hunspell java python" # pcre
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# XXX: sqlite is automagic
-# Does not build with >=sci-mathematics/minisat-2, bug #593662
-# add pcre support: pcre? ( dev-libs/libpcre )
-RDEPEND="
-	dev-db/sqlite:3
-	aspell? ( app-text/aspell )
-	hunspell? ( app-text/hunspell )
-	java? (
-		>=virtual/jdk-1.6:*
-		dev-java/ant-core
-	)
-	python? ( ${PYTHON_DEPS} )
-	!sci-mathematics/minisat"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-lang/swig:0
-	sys-devel/autoconf-archive
-	virtual/pkgconfig"
-
-pkg_setup() {
-	if use aspell && use hunspell; then
-		ewarn "You have enabled 'aspell' and 'hunspell' support, but both cannot coexist,"
-		ewarn "only hunspell will be built. Press Ctrl+C and set only 'aspell' USE flag if"
-		ewarn "you want aspell support."
-	fi
-	use java && java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-	use java && java-pkg-opt-2_src_prepare
-
-	eapply "${FILESDIR}"/${P}-lld.patch
-
-	eautoreconf
-}
-
-my_src_configure() {
-	local myconf=(
-		--disable-maintainer-mode
-		--disable-editline
-		--disable-perl-bindings
-		--disable-static
-		--enable-sat-solver=bundled
-		$(use_enable aspell)
-		$(use_enable hunspell)
-		$(usex hunspell --with-hunspell-dictdir="${EPREFIX}"/usr/share/myspell '')
-		$(use_enable java java-bindings)
-		# $(use_enable pcre regex-tokenizer)
-		# $(use_with pcre)
-	)
-
-	econf \
-		--disable-python-bindings \
-		"${myconf[@]}"
-
-	if use python; then
-		python_configure() {
-			econf \
-				--enable-python-bindings \
-				"${myconf[@]}"
-		}
-		python_foreach_impl run_in_build_dir python_configure
-	fi
-}
-
-my_src_compile() {
-	local -x MAIN_BUILD_DIR="${BUILD_DIR}"
-	default
-
-	if use python; then
-		python_compile() {
-			emake -C bindings/python \
-				VPATH="${S}:${MAIN_BUILD_DIR}" \
-				_clinkgrammar_la_DEPENDENCIES="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la \
-				_clinkgrammar_la_LIBADD="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la
-		}
-		python_foreach_impl run_in_build_dir python_compile
-	fi
-}
-
-my_src_install() {
-	local -x MAIN_BUILD_DIR="${BUILD_DIR}"
-	default
-
-	if use python; then
-		python_install() {
-			emake -C bindings/python \
-				VPATH="${S}:${MAIN_BUILD_DIR}" \
-				_clinkgrammar_la_DEPENDENCIES="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la \
-				_clinkgrammar_la_LIBADD="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la \
-				DESTDIR="${D}" \
-				install
-		}
-		python_foreach_impl run_in_build_dir python_install
-	fi
-
-	# no static archives
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_preinst() {
-	use java && java-pkg-opt-2_pkg_preinst
-}
diff --git a/dev-libs/link-grammar/metadata.xml b/dev-libs/link-grammar/metadata.xml
index 8c1053e05a54..3f4b9ddbf83e 100644
--- a/dev-libs/link-grammar/metadata.xml
+++ b/dev-libs/link-grammar/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>soap@gentoo.org</email>
+		<name>David Seifert</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Desktop</name>
diff --git a/dev-libs/log4cplus/Manifest b/dev-libs/log4cplus/Manifest
index ea8a2bcab9ef..57b3f7c989c6 100644
--- a/dev-libs/log4cplus/Manifest
+++ b/dev-libs/log4cplus/Manifest
@@ -2,7 +2,7 @@ AUX log4cplus-1.2.0-fix-c++14.patch 897 BLAKE2B c4067272e84b2e442ef61c5468734ee9
 DIST log4cplus-1.2.0.tar.bz2 629119 BLAKE2B f1b4629f7b6184b3f34f9d702c17487e113548cba46f5a25bb0f4972d7f3ce207310b25c94abea8cc1360591f7d0ac3d466075e584f25ce1968fee9d5b5c543a SHA512 2c3f16645051a230f9ec9a6ac689421efc4b51d5f40cb772e552bd199d2ad13c39d7e577cc63d51617555941412da166a6cda8861ee219154a953d9926aae626
 DIST log4cplus-2.0.6.tar.bz2 1197177 BLAKE2B cb2d4635b109690a81f2e228d48424a67addfccec6f5c6a1ef0e91b8f4ee24d41ba690e812d812a157688e2399ffefc0574111b7c6b38ce3551c11632acf76e9 SHA512 9dbbcff18fb50e7dd1a43076deb1be7d00343fc7ba590ef45a8098b544cb8421262f21fb9f319a570adac59b93960fceb2748e04902a39a8a90903b650de8cfd
 DIST log4cplus-2.0.7.tar.bz2 1210637 BLAKE2B 59e9c3c351c7893c7e9c39e9d12616579cff3b4dfdd3e069f0adb4b75fb2b46d6fe8efceea2b6103c5531a723f015518bf10ce6a581724b6ae5f49e994b74c72 SHA512 9d1b36d0c2347dd9d9ab8852114b8138f56063c51625eaab7f4c680ee852e1e6872c6712465b10057ec9e42305b83d956f6753100dfd3ec58518d6620cc4106c
-EBUILD log4cplus-1.2.0.ebuild 1608 BLAKE2B db26b191772d7a3b1f616fb713fa9d8fbba984c2aa1c62541c93a2ac18d2b98b3e82b863d1b0ce0b306a59bb8ca2ced8377c41a1637e7a7808aa3e063721f80d SHA512 36d58defbd0d2a7308951f3a1252773149740145b25080a3d2f5ad3fbb0c690507274c90ddd9a0b25935d9515a5e167c90fb14bea56c8a3b65a7945ac3bf9bf0
-EBUILD log4cplus-2.0.6.ebuild 996 BLAKE2B c1d9b3cb47da4ec5bbe864ab4fff99d1f9750374164753395938ce16bf306ad927027b22266681bedcbc9c8baa61243021d2f9f5d4cb5c96164b486c9160ed87 SHA512 d0eab7c467f1cd1a6fddcac998a550523262359e81c6bc93100f867c86cf4b602e6d88b573af0a33daa18a66a88ed6e2243776e43bfee27d4aa4cc0276e3fb1c
-EBUILD log4cplus-2.0.7.ebuild 992 BLAKE2B 64ab4e4c775bfa179aaef698c7bac6085cb1dc21b11e8d844456da7c9049c5c3d86e8e72b774a62f8f975fb2b6ed5978a9ee75b747e62cb45c5b840cc36e17ed SHA512 8f25db3c59b87d008e8df751ef1f3770836bbe276a9c7fd55162d552dd9a97ac1db9e76b96bdb3a65424c6036c26672cff2a927086334cc51e06d36da7ef41b0
+EBUILD log4cplus-1.2.0.ebuild 1608 BLAKE2B 9a57f60b53167c615a168a58eb9d6c600c22de0b6494256ee433c360cfb9fcff284fd531ea6c728f56b72ce508c0ac400d01fac0eff27273aaf674a78d908945 SHA512 0a2827afef22fbf973f3dc67edf8c9491e29b754770896c819d1e0ef468b933036e0751a0f7c610a4962c74993c34676d83d89ebf8596e4311cb56ed634ffe32
+EBUILD log4cplus-2.0.6.ebuild 996 BLAKE2B 91d9916ceebb2e64d210f9cd4c2c614d3092d4b3b19d93b55e1ca64c61769dc1bd6a49dad7ee3e83703f9284baabf7eca38d428218c049555625a1c2f37cbf2c SHA512 57bc4981805da36bce56484daf73d70898ba8dae46bbb88a74a9e3544f3014c94fc601925bb3411ae736e8dfebed6e841e817df89957e64a2978e12ece6035a2
+EBUILD log4cplus-2.0.7.ebuild 992 BLAKE2B 56a27c121e135b21806fa17f11e0765825b609c1a8e83668535c8670a8fa435792fac4515ec0cdff94bd318fe9e978610c43f3aa032d89f5f90fa5f0bbe10770 SHA512 b78e3d1adf59851cd4baf3b044304bb7ab7b8fdc05322d9e52aa8d0e75c184b9073e93e2b7d300ef9d422d826c92068a97980fd56ab6091dcd185de054988518
 MISC metadata.xml 1019 BLAKE2B 4656573d247296e8ef15672860d7131eb38e2ec19b6a020d545a0df5b2cef3bb2ab23098dadb747960914a0b1afe0e95b3c9598001b4f23f43e531d0ea04c765 SHA512 e0568fab0d1b3d20bf05c3cb1feb65f3e6737de39e5df251ab9fff20b4142e67b143c99749e374edfd6c6c23326e90a4d294551efd2be60b2c849bac40bd6593
diff --git a/dev-libs/log4cplus/log4cplus-1.2.0.ebuild b/dev-libs/log4cplus/log4cplus-1.2.0.ebuild
index 5d5331b72abb..d0049f0f238c 100644
--- a/dev-libs/log4cplus/log4cplus-1.2.0.ebuild
+++ b/dev-libs/log4cplus/log4cplus-1.2.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="C++ port of the Log for Java (log4j) logging library"
-HOMEPAGE="http://log4cplus.sourceforge.net/ https://github.com/log4cplus/log4cplus"
+HOMEPAGE="https://log4cplus.sourceforge.io/ https://github.com/log4cplus/log4cplus"
 SRC_URI="mirror://sourceforge/project/${PN}/${PN}-stable/${PV}/${P}.tar.bz2"
 
 LICENSE="|| ( Apache-2.0 BSD-2 )"
diff --git a/dev-libs/log4cplus/log4cplus-2.0.6.ebuild b/dev-libs/log4cplus/log4cplus-2.0.6.ebuild
index de590a2efbbb..50dbca5b740d 100644
--- a/dev-libs/log4cplus/log4cplus-2.0.6.ebuild
+++ b/dev-libs/log4cplus/log4cplus-2.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 inherit cmake
 
 DESCRIPTION="C++ port of the Log for Java (log4j) logging library"
-HOMEPAGE="http://log4cplus.sourceforge.net/ https://github.com/log4cplus/log4cplus"
+HOMEPAGE="https://log4cplus.sourceforge.io/ https://github.com/log4cplus/log4cplus"
 SRC_URI="mirror://sourceforge/project/${PN}/${PN}-stable/${PV}/${P}.tar.bz2"
 
 LICENSE="|| ( Apache-2.0 BSD-2 )"
diff --git a/dev-libs/log4cplus/log4cplus-2.0.7.ebuild b/dev-libs/log4cplus/log4cplus-2.0.7.ebuild
index 8dbf6e61cf0d..8897b1ac07c7 100644
--- a/dev-libs/log4cplus/log4cplus-2.0.7.ebuild
+++ b/dev-libs/log4cplus/log4cplus-2.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 inherit cmake
 
 DESCRIPTION="C++ port of the Log for Java (log4j) logging library"
-HOMEPAGE="http://log4cplus.sourceforge.net/ https://github.com/log4cplus/log4cplus"
+HOMEPAGE="https://log4cplus.sourceforge.io/ https://github.com/log4cplus/log4cplus"
 SRC_URI="mirror://sourceforge/project/${PN}/${PN}-stable/${PV}/${P}.tar.bz2"
 
 LICENSE="|| ( Apache-2.0 BSD-2 )"
diff --git a/dev-libs/marisa/Manifest b/dev-libs/marisa/Manifest
index 046a9aa3b9d6..8944f6b9ef19 100644
--- a/dev-libs/marisa/Manifest
+++ b/dev-libs/marisa/Manifest
@@ -2,7 +2,7 @@ AUX marisa-0.2.5-cpu_features_check.patch 4645 BLAKE2B 3ccd0b23d881d56d2341e1ed8
 AUX marisa-0.2.6-riscv_word_size.patch 486 BLAKE2B fef98bb16375bb482bfc5a219ecb61f9401e2bd560962f99e82c1725207c95a52c3ee9699d1fdc95bdfd972e15d6ca63e6c2e5c67938a385c592423205be8c08 SHA512 7da1120c5db4d8c902fd0bd16aa86f95cff09e8d81aa8d4140353eefbd2e3d7a100a9f38909193a5fd2333a652ce8b65198b0664792fe390790dd87883f6a7fa
 DIST marisa-0.2.5.tar.gz 167434 BLAKE2B 2b88e9f0060529c2180400290bb975a946666f58f77f7604cf3ea8ae0ad7e44e0d95e18c8911d9630561b9593eb2ec123b5c67d6d195dab480d86fe431ce2531 SHA512 62975a2dacd2a1072c990cd490f866cd5483c069c94a4706baf3ffc21ec43991583a8ef8721c3b841617b0654cbb894698c19759ff12b8887b6fd28939dfb547
 DIST marisa-0.2.6.tar.gz 168332 BLAKE2B 3b8a89a9a0b344d9de96edb5bf17c50db07da373e75eba098f48c9064321d579ac104db622608119377084c79165bf558c804eaff591903b67330b13bc8acf55 SHA512 c094e4b22e1457efdd20f2b978ee421b53e36ed94e4fdbd8944136c0ba23da4f6ba9fe3a2c64729c1426aee4dbe8098bfa5eebb943ae7fdaa4eec760485c564d
-EBUILD marisa-0.2.5.ebuild 2262 BLAKE2B 4b59b590907a1ce4426142ad0bcf0770e048f9cc56d41802fd44f78b1827e98feac6cb4391c58d6ad77487f391759adfc824d011592737fda04af10963e6f5b4 SHA512 cabdee55108d6d1ddafb9df2ba684da1ee838a99ff9f8bd7a5df5e4ae4341b20a84eac98ae9b0374db07aef1078040d6591e4310f184ab48d22ec8e1f2bbae1e
-EBUILD marisa-0.2.6.ebuild 2904 BLAKE2B 805572704ef2669dee3de403ae3f234cc22ec5aafda3c138b6107308d7ed06476ffd71a814d363f670605b277c423a1ba04ecee624ff19e429a5eff58b936fb3 SHA512 6084ca852d7c8df7d91f5605fe32db155f1ff93b7a421206fd6c0e3de16463cf45bf138852402c94c3c91f256ab5a544db0b69bcf6993d5fc248811c7a1ba3f5
-EBUILD marisa-9999.ebuild 2796 BLAKE2B aae358f1d13901cad56450e9173f8934fb690fa45ab154d39414830cce1755b320e106cddf6f1629c9aa1cdc1b2d822364ab7cb113423b8914c1e4f53a1cea07 SHA512 f0820a5257e3724ba8ec665187746f5a22595d0f07e6218b7ffc70608b1989dfa762fbdbd5f045479432ccb1df671d39a6e1435fa765fa96fafcb709fe7705a8
+EBUILD marisa-0.2.5.ebuild 2234 BLAKE2B 02ba56d816fab0c09264a98d4648060075504507028ff7e16da14c56b3863b5b9df3805ef1181d7330bf0bab94e182374444440e4c5f59e4bbd755b9c2c63a5d SHA512 a86361ab9bfe31aae2130a1e72498ca2096294442a27b2da8c81e68ab4f9e9a1c32d972f1f2b259ac5c3f4b141a473a0802fd6c70c0742695d51f73b4245430c
+EBUILD marisa-0.2.6.ebuild 2871 BLAKE2B 122e2fdbee0555fef41df4f69d07b70806da84aa1eecd930e2c70e5bca88080882db67c1e2380368425c333ec5a7ce5d27488cc2771ce1d9d116d8d4e0b425ae SHA512 3fbef4416cd17626d1a77c0013012ad42cb1ad9f1ad92cba89a1d41bc5b177b78cf1bb4919c52d8d9ef083f9b8f85438794d125f453de84870153618eb123c4c
+EBUILD marisa-9999.ebuild 2764 BLAKE2B d4c3df20f134dac32608de57e70c7a372cf21b6a153ae959eb764bbfe66880be164ea597b55a28d95a90d4e3f349c79c684c0340d01271549d5f8c75eee52e06 SHA512 71b497e8e551d5dee341a06c369fff566c7bdeb3cdd0fec282c7c2585be0e669575325374b00179f8a40267506675608c65810aaa7077025f209da438be20448
 MISC metadata.xml 466 BLAKE2B 52091b0a7fff43b807097f38ccc624057f7cc8becbbb8c4efd2a461d62fbf0bd1498497683ca3ed6b7730768d0fc94d461c983ab1deef8ac156ac3f1bd86c0e7 SHA512 b5914b5a81efb935857a7088421fe765d89a8101cd2a38568c8a9903957fa92482ec7882d4ce4e9555c467e14e2a1fca74b3966d71c541a42cbb0c2880331b12
diff --git a/dev-libs/marisa/marisa-0.2.5.ebuild b/dev-libs/marisa/marisa-0.2.5.ebuild
index bac968c1f7a8..af6c3b508d46 100644
--- a/dev-libs/marisa/marisa-0.2.5.ebuild
+++ b/dev-libs/marisa/marisa-0.2.5.ebuild
@@ -1,10 +1,9 @@
-# Copyright 2014-2020 Gentoo Authors
+# Copyright 2014-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
+PYTHON_COMPAT=( python{3_7,3_8,3_9} )
 DISTUTILS_OPTIONAL="1"
-DISTUTILS_USE_SETUPTOOLS="no"
 
 inherit autotools distutils-r1
 
diff --git a/dev-libs/marisa/marisa-0.2.6.ebuild b/dev-libs/marisa/marisa-0.2.6.ebuild
index c958dfd64c35..2f47a949a3cf 100644
--- a/dev-libs/marisa/marisa-0.2.6.ebuild
+++ b/dev-libs/marisa/marisa-0.2.6.ebuild
@@ -1,10 +1,9 @@
-# Copyright 2014-2021 Gentoo Authors
+# Copyright 2014-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
-PYTHON_COMPAT=( python3_{8,9} )
+EAPI="8"
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_OPTIONAL="1"
-DISTUTILS_USE_SETUPTOOLS="no"
 
 inherit autotools distutils-r1 toolchain-funcs
 
@@ -24,7 +23,7 @@ fi
 
 LICENSE="|| ( BSD-2 LGPL-2.1+ )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 IUSE="python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -40,7 +39,7 @@ if [[ "${PV}" != "9999" ]]; then
 fi
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.2.6-riscv_word_size.patch
+	"${FILESDIR}/${PN}-0.2.6-riscv_word_size.patch"
 )
 
 src_prepare() {
diff --git a/dev-libs/marisa/marisa-9999.ebuild b/dev-libs/marisa/marisa-9999.ebuild
index 929e4c4fe299..0d1643f7630f 100644
--- a/dev-libs/marisa/marisa-9999.ebuild
+++ b/dev-libs/marisa/marisa-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 2014-2020 Gentoo Authors
+# Copyright 2014-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
+EAPI="8"
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_OPTIONAL="1"
-DISTUTILS_USE_SETUPTOOLS="no"
 
 inherit autotools distutils-r1 toolchain-funcs
 
diff --git a/dev-libs/mathjax/Manifest b/dev-libs/mathjax/Manifest
index a1c154062325..f76db5fa29c1 100644
--- a/dev-libs/mathjax/Manifest
+++ b/dev-libs/mathjax/Manifest
@@ -3,5 +3,5 @@ DIST mathjax-2.7.4.tar.gz 25355532 BLAKE2B 0bed5224356757c64989de8b9355f5c2505f1
 DIST mathjax-2.7.7.tar.gz 25347766 BLAKE2B c1f11bc854c95888d7f04ee627094a2e297e7554b0380dab30c08e2c4405495df611b440da0efd1e6456150513e07fa4ef90808d2332f9fb83785c118228de18 SHA512 471bd22475827a13d79de7d335f3e51ace06dfc04f575e8829b4505f428949f1dbe58798635cb434ed02ae0cd3fd8d1d577196b4961365fbcb399cc075d3284f
 EBUILD mathjax-2.7.0.ebuild 1221 BLAKE2B 4ff6312f8abe475a5b04b33af927a6c0bd5d23dbfc47d44c7aaf2ec9a7fc60d0f74df33ad337cb1f839d85d04f5265bfd8ae4f59bfb944b9e51d7bd7504c0d09 SHA512 1569474015ab59649e2cfff5eb76179216e39359730561b9ce8e58edd496e1f92f10821b036a3fed3bc557d6ea2481157172800d614e584c7f35e9587914a90e
 EBUILD mathjax-2.7.4.ebuild 1225 BLAKE2B 9179ab6dc16043b5a7d2882e0b9524ba965e12f581d50f32f824be900075979b060d69009563b949ccc6dccdc673a064ae6f4c7582a6adc4571dc308aabe50bd SHA512 51715934fdc95a540123f82534adff380ac7170c23a3cb9c3caac547a96d763368b110b3babb1b732782a06d4cfcf407b604a6557dcff2a0ac4786898c4899b4
-EBUILD mathjax-2.7.7.ebuild 1387 BLAKE2B 3e2fb1a46b853374aa91fbc5dbefb540414cad55d64aca7c1f3b8c02985ce766251c43fadfe2a3860c663f9a5d5dddb9a132c88a111ffa67b0518786bbfe09db SHA512 d837c2f3101f61a20ac824b02a67dbdaf079c586147221300ca35fa4a042c69a055ead8c859abe53b11f2ff162aa79d5ebd5d5ee644b933ef75ccfa8c265d650
+EBUILD mathjax-2.7.7.ebuild 1393 BLAKE2B 1877438d02fd1b5ea2be34f0c6c3a482691eceef13995109210cb459b711118a52ae846e96e6663fce225e5c24398139c6b5f3ec8f11908b82fb0ec6b145f327 SHA512 dabec1eb3e9372184115ef786905c3f4e631aa7faa569a7d1781f6d012d4d89cc03c2df68333cb5ca2410ea092016c831e8d3bd76573dc27832bd51aadff70bd
 MISC metadata.xml 1031 BLAKE2B 443d480cafaf805f15cd458c74a1e924500891efb2a6d8ea55f43526c96e23b09680ee8c60c6781c14c3d2dea4bc2f405ed21aa53158084b5bfa03bb05f50435 SHA512 7dc43317b8ded022ac97992df27e9fca2d2d59daa94cf4da2a0c3a6f552894b2e2516e6ffd688b233f3b2e0103c5a29522236449b692acbbb1cb4ae2f03aee8f
diff --git a/dev-libs/mathjax/mathjax-2.7.7.ebuild b/dev-libs/mathjax/mathjax-2.7.7.ebuild
index 8c9b6075c3cb..c38ed9a4f288 100644
--- a/dev-libs/mathjax/mathjax-2.7.7.ebuild
+++ b/dev-libs/mathjax/mathjax-2.7.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ S="${WORKDIR}"/MathJax-${PV}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc examples"
 
 RDEPEND="doc? ( app-doc/mathjax-docs:${SLOT} )"
diff --git a/dev-libs/mimalloc/Manifest b/dev-libs/mimalloc/Manifest
index 2950f9495505..d5e38f4302e3 100644
--- a/dev-libs/mimalloc/Manifest
+++ b/dev-libs/mimalloc/Manifest
@@ -2,4 +2,4 @@ DIST mimalloc-1.7.3.tar.gz 908042 BLAKE2B 6a96fc33148261e3f69a55196725bb2cf2e45f
 DIST mimalloc-2.0.3.tar.gz 917461 BLAKE2B 4b803881ab75afa358cb2dd251268c0934472074bf1983c3851a9d4f8c8ec0ea3907b52c40b0efe1cc09916cf4c5aa93f786a606e0b999536118b91bb5800310 SHA512 275a5249d09a57c9a039714fc6eef24ae778496954972419f3ac8e33f3d12e9837ba0691a3c08a4ab807c26b868aad3a5b2c28ee10ecaa60fe21ffe1d416f08f
 EBUILD mimalloc-1.7.3.ebuild 637 BLAKE2B 552662f1b43b295fbab238b23057817d390b4b3996e0b89edeace2928c06700eb061b4aa8ee7fb22cbf1fdb9424d1db887bc956498bd03337c5993205b668eda SHA512 173520d36a96e6b8cd4634592c948d41de78b3cd87437add909768ee4fe2f139f18010b830a827d4dab0e6f4a296ebcef699192845324f3d0e6676bec3f1d312
 EBUILD mimalloc-2.0.3-r1.ebuild 761 BLAKE2B 6e6187c1bea297633a50df0d45e8b244e3d4bcfcb003f726578337b08b8754fb96155d98864b93e8d25640228f10bd4fa9606712d0068e38c2439976b241fefe SHA512 108a0ddbbbd54899e569bf667d4633edeeab643c1fa6f4294747a826c5b04dc1d674c92215b51a8a93f4a41d8edc32ffff9115c1eee4cb356a3a24d1dab1fc0d
-MISC metadata.xml 322 BLAKE2B 811930d7bd9b6240b866a9a8e90ff6b4d48ba7e985c61cb475c8b8de67265d8f9b7317a84191cf5b5a9961e130e792b6cfbbdd3cbebe9e3d9128a7a5bcfaaf49 SHA512 b9b3bdc237c9a9f362f90ff72888f5bed80385d3acd27cc1a4c9bcd89939ce3a45593c51481a6529a9aac25a86726e1a0362ce2094e11dce555175e656c293d1
+MISC metadata.xml 323 BLAKE2B 15c8d2f369c245843b6a8370d0ca2bbaf6325c7872901c0b3ff74be816d9407b46c51d33144b2cfac7f961a9b7d83b44738ca362572dd0e32d4840f69266f493 SHA512 f53bdf6c2703bd59d6cc7505f1f9f8d9c57bc67c2923018d0998b8acc51d7e4251f3dbee44bfa1fe674ad44889747738e83ae7f4a18ff72cbc32422eb9c050dc
diff --git a/dev-libs/mimalloc/metadata.xml b/dev-libs/mimalloc/metadata.xml
index 07fc15aa3a03..356c7a2700cd 100644
--- a/dev-libs/mimalloc/metadata.xml
+++ b/dev-libs/mimalloc/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>sam@gentoo.org</email>
diff --git a/dev-libs/nss-pem/Manifest b/dev-libs/nss-pem/Manifest
index 2c7f0cdade54..e7f3ca41a3fd 100644
--- a/dev-libs/nss-pem/Manifest
+++ b/dev-libs/nss-pem/Manifest
@@ -1,5 +1,3 @@
-DIST nss-pem-1.0.7.tar.xz 36312 BLAKE2B 0ac494c7925c3a3c764c1154e846426d3cdcf21f37bd03dcab40bbe00ae95fe3a1b4a1f6bd2b5fe3c6f1d95877651474a72d7028eafcb143fad5f6263beeb1da SHA512 4762e3ce9e1c77952af3100acb5a043912da7e52af714973f1ce86d18b3d80424f0760e151b7c360c14cea07d86f75be250de14ee47601de46da75583bb3b0d2
 DIST nss-pem-1.0.8.tar.xz 41840 BLAKE2B 6a210517b6f70a6a1a0351970811500c1364c6cbb0159dc4b7b3edeff7c01d3b643a5a4a4946a350a1a49898570141acda1e913fdc79d750339f5021445e61c7 SHA512 9fd1fa9203fd707668506752be6f99d26e53281b8b95d7c3020da33ab8cb287890b66c8a59f1ee952fe8d2a8a350d7c5b4214a523a2e1762e48989f02c408b33
-EBUILD nss-pem-1.0.7.ebuild 709 BLAKE2B be88263a61e86d281777161fdd427bd38b77d25b407713bd076d3a61c1b511186f62a66c71d0a4fe9b8834e858fb93518db686b19438e70000352ad12f8d1b84 SHA512 1fd7d140a2afba6e65671fd0c210b67e829f6ae609695a6bb69e51a0241f0f0b199ced96ee962b995e543fb908841e5c4349ecc041e6a7ca6c69e0cc7b10b05e
-EBUILD nss-pem-1.0.8.ebuild 718 BLAKE2B 57d9bcdbeb2756e02900fc8277f627c6cba45d49c4f8f32034b800c30ebeed1442b8c8bddcb49738f3aaf8f321e07c0f1cac4e54f03c02d83660ceaaca0503ca SHA512 e932c660100a3de4523a1e532b1a250f2fdc35043ef0ae59208932624eb18ddee7d8d453e1c1dca89da9303c27705d89410551ff8cef911d7ad44cbf37d1c052
+EBUILD nss-pem-1.0.8.ebuild 715 BLAKE2B bfa7cac830e4441be0fae4b5fe250bbe6f2ca38023bc60d8af3b5676ca53e2d87395908ceb764bddc80921813b979b45ace8e96422497c5c01e3622951352083 SHA512 d6b822d6576cab069d9da9475c7acac7a9b38ec19641d71cf8a11a387a0a773fc7a6c908439b610d0e215f62f8e4c086a4d70a381541f82ba74f323ec89b658b
 MISC metadata.xml 334 BLAKE2B 7d88d82ca4bedbacb87ab53bc2a30e77ab13b062c439dacd1521f68a5677bad460310abf9f1e69826c44eaee4cade54bdb0d30923a7d2dfef9eaa4554288498e SHA512 c1a58a0c5e2401a1b75e4223f2cc6e0a25e8a3ead8c5c3f86cf96675ecf3dd813d0db4652fb6c68e0acbffa62ca6e4123dc74a4f565345cb1bba79e033b41922
diff --git a/dev-libs/nss-pem/nss-pem-1.0.7.ebuild b/dev-libs/nss-pem/nss-pem-1.0.7.ebuild
deleted file mode 100644
index 679d9dcd0506..000000000000
--- a/dev-libs/nss-pem/nss-pem-1.0.7.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS="cmake"
-
-inherit cmake-multilib
-
-DESCRIPTION="PEM file reader for Network Security Services (NSS)"
-HOMEPAGE="https://github.com/kdudka/nss-pem"
-SRC_URI="https://github.com/kdudka/${PN}/releases/download/${P}/${P}.tar.xz"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-solaris"
-IUSE=""
-
-BDEPEND=" >=dev-libs/nss-3.50-r1 "
-RDEPEND="${BDEPEND}"
-
-DEPEND="!<=dev-libs/nss-3.50
-	${RDEPEND}"
-
-S="${WORKDIR}/${P}/src"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DLIB_INSTALL_DIR="$(get_libdir)"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/nss-pem/nss-pem-1.0.8.ebuild b/dev-libs/nss-pem/nss-pem-1.0.8.ebuild
index 0c1efa2257bd..e2ca48835c0e 100644
--- a/dev-libs/nss-pem/nss-pem-1.0.8.ebuild
+++ b/dev-libs/nss-pem/nss-pem-1.0.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/kdudka/${PN}/releases/download/${P}/${P}.tar.xz"
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-solaris"
 IUSE=""
 
 BDEPEND=" >=dev-libs/nss-3.50-r1 "
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 4d6ef06f2498..c3b34dd92143 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -1,13 +1,9 @@
 AUX nss-3.21-gentoo-fixup-warnings.patch 178 BLAKE2B b51f80310db3db416d8aeaf9117ef801389b5b2df47c04aff51bf0759dd5bff41b09d1e9011f99b345d5769a3aab19acb943ee97f8437465518115f6902a0da1 SHA512 7667a020311ca11e8f1836bc146e4a3c94ff2a489882dbe87debcccfeaafeb50e6607574c64254a826b4b6f0bb436b310a3386fff4a58324f0e5e58debaa9d51
 AUX nss-3.23-hppa-byte_order.patch 460 BLAKE2B 97358cc8fbea0b0d3beee0697833e48ef01039ceb08fd00792a7f7ef68409eb076022c03764ab079fdaa971a0358130002fa11c0c182ebeb33dcdf660be26408 SHA512 ad0097bb6cf409d61eb28202d7460c87e983d6db977aba38ff9ef2749b3f7bb8fdadce4174f5bf806350ae33733097a1f444792d31cc43574b28341893642e5a
 AUX nss-3.53-gentoo-fixups.patch 6886 BLAKE2B 1c605d8db02ebe0492c41955207368197a79990e43e219a71962cb28ac0cecd9e0acc2b76e16f5b116fdb8bf8790d96046cb4f376df9b8634ac48e54924589f8 SHA512 51031f92519f57d4b57a547cf549f2d5da1c5a7212d4b304fb0d71d6a85a5aefd64724ec9075c14c9b49c1e99c3ffe91cbec501c3504985aa9b16eacf2aa15ed
-DIST nss-3.68.1.tar.gz 82405747 BLAKE2B 89a2e893d3af02b192d044049ec84462e53d96bf2ba9a88112b4dfde5af5c0d9a615ed94b5c97c26775de998cc38240d19d5f2e5eb2573a6715d2a7106d99fe3 SHA512 9aa932e8ba1a0c3bffd402f7129d03de30481bde712aaa197bc79d14b307179e691423aa0c6300767fce2c667917c8d2e2b38e361269b7671548d72435887f84
 DIST nss-3.68.2.tar.gz 82406396 BLAKE2B 0542278f63770e9d4f3ce51516d7786680f2a869907ec91b2c4160f9fcad60703dd0e2a77bae91306349ff56908af0020e9479815e2b15392da7b14b27f8c7bc SHA512 31fe62f9e6f1695546bf8b087ae35ac2d3f39fde6be6ab3fcbc81ef66cf6290fc34b799e3809fcba4e913d0e305c476ee8ee1f22d0f957ec6978025920bdb9de
-DIST nss-3.73.1.tar.gz 83931597 BLAKE2B 590e3c9c5262f4ca0d9137905ce396ddc81f722fabbb54f235eb1bab344d9b7913b0be8d4ddf99fef34d45ed0102e8b7b571764eefe055eefe6bb487c22bafbe SHA512 4cca26cb430f1c167ce7c3a2654c1315938c73bbd425c89d4e636a966fd052724499f34affc5764ec680eeaa080892caab28ef00fe21992421c739f7623cf071
 DIST nss-3.74.tar.gz 83937875 BLAKE2B 55881f0e78e0ccc9b246c4323f6f2a5f7a84cb5e57aa3902d3d5a4068ec0be6f2669a9da11377b86d11d2ce400c2e73a6132fd4e490a04aad96be399110edbea SHA512 6fb322b64a5b42e5e22e803c8985986240d2990849d576cfc4b94cdc5c4ab27f683ebc4e1cf5e0ad16c636fc32debb24ec3b2d02d5baedc8fbaedec79c908226
 DIST nss-cacert-class1-class3-r2.patch 21925 BLAKE2B 7627ff9a09f084c19d72d0490676865e3cab3ca7c920ae1ce4bea2db664f37fd0aa84fcda919809a516891ab2a62e2e7a43a9d6ada4c231adfe4c216525fac7d SHA512 1ce6ff9ab310aaca9005eafb461338b291df8523cc7044e096cd75774ce746c26eed19ec6bb2643c6c67f94650f2f309463492d80a90568f38ce2557f8ada2f4
-EBUILD nss-3.68.1.ebuild 9537 BLAKE2B 600eb8f26f86928dd31649faa07fe214cca366569caa370ff74fbc92b7be6939103483f90991d898fe7af94bfe834cf2700e7c76d373b6ac2daf94eefef4c01b SHA512 2f4c88a54496b6bca05f52e769b9989d890cf7aa9b795ad3cf4be107a7e2728688b5e249c17b0eead9c10d1937915c60ab2e391cfef44fc77549d353436a6c9f
-EBUILD nss-3.68.2.ebuild 9545 BLAKE2B 57a0e34026e0281234701a172c7045fe292b954a31e18ccf9b837080694134e9c4fe0f8aefb32f57031f61662c17df1a0885c5bdfa2d6c716cd32fa8eefeb03a SHA512 6c09f160516d26f8837b8224054e2e3959f029abc583cd42d991ef18add6d756da1724780aa3cf15a848b47f173c797537fc4cbf57b424406a7b7cd7b769f030
-EBUILD nss-3.73.1.ebuild 9545 BLAKE2B 11e6bb946ec4d094b604f2c22a7e6f78ac0331faf409938b6ffccf0ea902b70eb195ad85359613e591c6555af8e17550bb756c20ac84f886ba17e3f5eda446c8 SHA512 85a9aaf8c321c4ef04cf8724c8b3865f0038779612e8990f92878359282225a33f184487f342d01c2aaf7b2fc2c14d44d4b8b2d0f9e45c1b6779fc089383f30b
+EBUILD nss-3.68.2.ebuild 9537 BLAKE2B cab6e2a96b12ece321375fc3613c9be11c5e269f620ce1fc79cbada50a1dd15ad5e7331cd0f11cb9a6542b28994152a444607f775ebef5ba57f66524e0734a95 SHA512 8dfd349b94766601f5a8e8ce36c93bd69c48730cd96d4a78f551161bf2542f9915c6d5d39aa7fa7e35662078ce5b14d4f309253e51e33ef4967a87b8dfb5d0b2
 EBUILD nss-3.74.ebuild 9545 BLAKE2B db225789dfbea45ad8d975feb0dbd85d276182eab69b82494f2378561535bccd5da1b08c7579ee050dfdb24c22b5da7d39685bc3e1d76d9e692e8a2c3815d793 SHA512 16b63ad55f8405d11a7647826b64dc14a3ee3c1f6533eaff66ef528f41855e619d4c1e2e1df3191ebe0c1fafeafc846173ec12d835209e6caa2d070f5279e412
 MISC metadata.xml 517 BLAKE2B 85fba14d0b8a3539c57b8dca15a0f7789bb78a92891ff39271f804fa07b1620f5f3ece89269e3305b578064a53aeae7ab298bb97cdc019f41793888d42159727 SHA512 7b1fba5488498d5499134f1b58ecaa01cb8c51af3da666d55fba3884703d34efb57b449e76461fb6e13c37687bf5125c5dbab1934a950d4d13c0cff5a3b3318e
diff --git a/dev-libs/nss/nss-3.68.1.ebuild b/dev-libs/nss/nss-3.68.1.ebuild
deleted file mode 100644
index e0e1815712f9..000000000000
--- a/dev-libs/nss/nss-3.68.1.ebuild
+++ /dev/null
@@ -1,367 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multilib toolchain-funcs multilib-minimal
-
-NSPR_VER="4.32"
-RTM_NAME="NSS_${PV//./_}_RTM"
-
-DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
-HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
-SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
-	cacert? ( https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch )"
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="cacert utils cpu_flags_ppc_altivec cpu_flags_ppc_vsx"
-# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
-RDEPEND="
-	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
-	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	virtual/pkgconfig
-"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-lang/perl"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${P}/${PN}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/nss-config
-)
-
-PATCHES=(
-	# Custom changes for gentoo
-	"${FILESDIR}/${PN}-3.53-gentoo-fixups.patch"
-	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
-	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
-)
-
-src_prepare() {
-	default
-
-	if use cacert ; then
-		eapply -p2 "${DISTDIR}"/nss-cacert-class1-class3-r2.patch
-	fi
-
-	pushd coreconf >/dev/null || die
-	# hack nspr paths
-	echo 'INCLUDES += -I$(DIST)/include/dbm' \
-		>> headers.mk || die "failed to append include"
-
-	# modify install path
-	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
-		-i source.mk || die
-
-	# Respect LDFLAGS
-	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
-	popd >/dev/null || die
-
-	# Fix pkgconfig file for Prefix
-	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
-		config/Makefile || die
-
-	# use host shlibsign if need be #436216
-	if tc-is-cross-compiler ; then
-		sed -i \
-			-e 's:"${2}"/shlibsign:shlibsign:' \
-			cmd/shlibsign/sign.sh || die
-	fi
-
-	# dirty hack
-	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
-		lib/ssl/config.mk || die
-	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
-		cmd/platlibs.mk || die
-
-	multilib_copy_sources
-
-	strip-flags
-}
-
-multilib_src_configure() {
-	# Ensure we stay multilib aware
-	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
-}
-
-nssarch() {
-	# Most of the arches are the same as $ARCH
-	local t=${1:-${CHOST}}
-	case ${t} in
-		*86*-pc-solaris2*) echo "i86pc"   ;;
-		aarch64*)          echo "aarch64" ;;
-		hppa*)             echo "parisc"  ;;
-		i?86*)             echo "i686"    ;;
-		x86_64*)           echo "x86_64"  ;;
-		*)                 tc-arch ${t}   ;;
-	esac
-}
-
-nssbits() {
-	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
-	if [[ ${1} == BUILD_ ]]; then
-		cc=$(tc-getBUILD_CC)
-	else
-		cc=$(tc-getCC)
-	fi
-	echo > "${T}"/test.c || die
-	${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
-	case $(file "${T}/${1}test.o") in
-		*32-bit*x86-64*) echo USE_X32=1;;
-		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
-		*32-bit*|*ppc*|*i386*) ;;
-		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
-	esac
-}
-
-multilib_src_compile() {
-	# use ABI to determine bit'ness, or fallback if unset
-	local buildbits mybits
-	case "${ABI}" in
-		n32) mybits="USE_N32=1";;
-		x32) mybits="USE_X32=1";;
-		s390x|*64) mybits="USE_64=1";;
-		${DEFAULT_ABI})
-			einfo "Running compilation test to determine bit'ness"
-			mybits=$(nssbits)
-			;;
-	esac
-	# bitness of host may differ from target
-	if tc-is-cross-compiler; then
-		buildbits=$(nssbits BUILD_)
-	fi
-
-	local makeargs=(
-		CC="$(tc-getCC)"
-		CCC="$(tc-getCXX)"
-		AR="$(tc-getAR) rc \$@"
-		RANLIB="$(tc-getRANLIB)"
-		OPTIMIZER=
-		${mybits}
-	)
-
-	# Take care of nspr settings #436216
-	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
-	unset NSPR_INCLUDE_DIR
-
-	export NSS_ALLOW_SSLKEYLOGFILE=1
-	export NSS_ENABLE_WERROR=0 #567158
-	export BUILD_OPT=1
-	export NSS_USE_SYSTEM_SQLITE=1
-	export NSDISTMODE=copy
-	export FREEBL_NO_DEPEND=1
-	export FREEBL_LOWHASH=1
-	export NSS_SEED_ONLY_DEV_URANDOM=1
-	export USE_SYSTEM_ZLIB=1
-	export ZLIB_LIBS=-lz
-	export ASFLAGS=""
-	# Fix build failure on arm64
-	export NS_USE_GCC=1
-	# Detect compiler type and set proper environment value
-	if tc-is-gcc; then
-		export CC_IS_GCC=1
-	elif tc-is-clang; then
-		export CC_IS_CLANG=1
-	fi
-
-	# explicitly disable altivec/vsx if not requested
-	# https://bugs.gentoo.org/789114
-	case ${ARCH} in
-		ppc*)
-			use cpu_flags_ppc_altivec || export NSS_DISABLE_ALTIVEC=1
-			use cpu_flags_ppc_vsx || export NSS_DISABLE_CRYPTO_VSX=1
-			;;
-	esac
-
-	local d
-
-	# Build the host tools first.
-	LDFLAGS="${BUILD_LDFLAGS}" \
-	XCFLAGS="${BUILD_CFLAGS}" \
-	NSPR_LIB_DIR="${T}/fakedir" \
-	emake -j1 -C coreconf \
-		CC="$(tc-getBUILD_CC)" \
-		${buildbits-${mybits}}
-	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
-
-	# Then build the target tools.
-	for d in . lib/dbm ; do
-		CPPFLAGS="${myCPPFLAGS}" \
-		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		NSPR_LIB_DIR="${T}/fakedir" \
-		emake -j1 "${makeargs[@]}" -C ${d} OS_TEST="$(nssarch)"
-	done
-}
-
-# Altering these 3 libraries breaks the CHK verification.
-# All of the following cause it to break:
-# - stripping
-# - prelink
-# - ELF signing
-# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
-# Either we have to NOT strip them, or we have to forcibly resign after
-# stripping.
-#local_libdir="$(get_libdir)"
-#export STRIP_MASK="
-#	*/${local_libdir}/libfreebl3.so*
-#	*/${local_libdir}/libnssdbm3.so*
-#	*/${local_libdir}/libsoftokn3.so*"
-
-export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
-
-generate_chk() {
-	local shlibsign="$1"
-	local libdir="$2"
-	einfo "Resigning core NSS libraries for FIPS validation"
-	shift 2
-	local i
-	for i in ${NSS_CHK_SIGN_LIBS} ; do
-		local libname=lib${i}.so
-		local chkname=lib${i}.chk
-		"${shlibsign}" \
-			-i "${libdir}"/${libname} \
-			-o "${libdir}"/${chkname}.tmp \
-		&& mv -f \
-			"${libdir}"/${chkname}.tmp \
-			"${libdir}"/${chkname} \
-		|| die "Failed to sign ${libname}"
-	done
-}
-
-cleanup_chk() {
-	local libdir="$1"
-	shift 1
-	local i
-	for i in ${NSS_CHK_SIGN_LIBS} ; do
-		local libfname="${libdir}/lib${i}.so"
-		# If the major version has changed, then we have old chk files.
-		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
-			&& rm -f "${libfname}.chk"
-	done
-}
-
-multilib_src_install() {
-	pushd dist >/dev/null || die
-
-	dodir /usr/$(get_libdir)
-	cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
-	local i
-	for i in crmf freebl nssb nssckfw ; do
-		cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
-	done
-
-	# Install nss-config and pkgconfig file
-	dodir /usr/bin
-	cp -L */bin/nss-config "${ED}"/usr/bin || die
-	dodir /usr/$(get_libdir)/pkgconfig
-	cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
-
-	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
-	# bug 517266
-	sed 	-e 's#Libs:#Libs: -lfreebl#' \
-		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
-		*/lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
-		|| die "could not create nss-softokn.pc"
-
-	# all the include files
-	insinto /usr/include/nss
-	doins public/nss/*.{h,api}
-	insinto /usr/include/nss/private
-	doins private/nss/{blapi,alghmac,cmac}.h
-
-	popd >/dev/null || die
-
-	local f nssutils
-	# Always enabled because we need it for chk generation.
-	nssutils=( shlibsign )
-
-	if multilib_is_native_abi ; then
-		if use utils; then
-			# The tests we do not need to install.
-			#nssutils_test="bltest crmftest dbtest dertimetest
-			#fipstest remtest sdrtest"
-			# checkcert utils has been removed in nss-3.22:
-			# https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
-			# https://hg.mozilla.org/projects/nss/rev/df1729d37870
-			# certcgi has been removed in nss-3.36:
-			# https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
-			nssutils+=(
-				addbuiltin
-				atob
-				baddbdir
-				btoa
-				certutil
-				cmsutil
-				conflict
-				crlutil
-				derdump
-				digest
-				makepqg
-				mangle
-				modutil
-				multinit
-				nonspr10
-				ocspclnt
-				oidcalc
-				p7content
-				p7env
-				p7sign
-				p7verify
-				pk11mode
-				pk12util
-				pp
-				rsaperf
-				selfserv
-				signtool
-				signver
-				ssltap
-				strsclnt
-				symkeyutil
-				tstclnt
-				vfychain
-				vfyserv
-			)
-			# install man-pages for utils (bug #516810)
-			doman doc/nroff/*.1
-		fi
-		pushd dist/*/bin >/dev/null || die
-		for f in ${nssutils[@]}; do
-			dobin ${f}
-		done
-		popd >/dev/null || die
-	fi
-
-	# Prelink breaks the CHK files. We don't have any reliable way to run
-	# shlibsign after prelink.
-	dodir /etc/prelink.conf.d
-	printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \
-		> "${ED}"/etc/prelink.conf.d/nss.conf
-}
-
-pkg_postinst() {
-	multilib_pkg_postinst() {
-		# We must re-sign the libraries AFTER they are stripped.
-		local shlibsign="${EROOT}/usr/bin/shlibsign"
-		# See if we can execute it (cross-compiling & such). #436216
-		"${shlibsign}" -h >&/dev/null
-		if [[ $? -gt 1 ]] ; then
-			shlibsign="shlibsign"
-		fi
-		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
-	}
-
-	multilib_foreach_abi multilib_pkg_postinst
-}
-
-pkg_postrm() {
-	multilib_pkg_postrm() {
-		cleanup_chk "${EROOT}"/usr/$(get_libdir)
-	}
-
-	multilib_foreach_abi multilib_pkg_postrm
-}
diff --git a/dev-libs/nss/nss-3.68.2.ebuild b/dev-libs/nss/nss-3.68.2.ebuild
index 204996686c03..9f45dee60454 100644
--- a/dev-libs/nss/nss-3.68.2.ebuild
+++ b/dev-libs/nss/nss-3.68.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/$
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="cacert utils cpu_flags_ppc_altivec cpu_flags_ppc_vsx"
 # pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
 RDEPEND="
diff --git a/dev-libs/nss/nss-3.73.1.ebuild b/dev-libs/nss/nss-3.73.1.ebuild
deleted file mode 100644
index 97adb106159f..000000000000
--- a/dev-libs/nss/nss-3.73.1.ebuild
+++ /dev/null
@@ -1,367 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic multilib toolchain-funcs multilib-minimal
-
-NSPR_VER="4.32"
-RTM_NAME="NSS_${PV//./_}_RTM"
-
-DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
-HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
-SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
-	cacert? ( https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch )"
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="cacert utils cpu_flags_ppc_altivec cpu_flags_ppc_vsx"
-# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
-RDEPEND="
-	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
-	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	virtual/pkgconfig
-"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-lang/perl"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${P}/${PN}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/nss-config
-)
-
-PATCHES=(
-	# Custom changes for gentoo
-	"${FILESDIR}/${PN}-3.53-gentoo-fixups.patch"
-	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
-	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
-)
-
-src_prepare() {
-	default
-
-	if use cacert ; then
-		eapply -p2 "${DISTDIR}"/nss-cacert-class1-class3-r2.patch
-	fi
-
-	pushd coreconf >/dev/null || die
-	# hack nspr paths
-	echo 'INCLUDES += -I$(DIST)/include/dbm' \
-		>> headers.mk || die "failed to append include"
-
-	# modify install path
-	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
-		-i source.mk || die
-
-	# Respect LDFLAGS
-	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
-	popd >/dev/null || die
-
-	# Fix pkgconfig file for Prefix
-	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
-		config/Makefile || die
-
-	# use host shlibsign if need be #436216
-	if tc-is-cross-compiler ; then
-		sed -i \
-			-e 's:"${2}"/shlibsign:shlibsign:' \
-			cmd/shlibsign/sign.sh || die
-	fi
-
-	# dirty hack
-	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
-		lib/ssl/config.mk || die
-	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
-		cmd/platlibs.mk || die
-
-	multilib_copy_sources
-
-	strip-flags
-}
-
-multilib_src_configure() {
-	# Ensure we stay multilib aware
-	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
-}
-
-nssarch() {
-	# Most of the arches are the same as $ARCH
-	local t=${1:-${CHOST}}
-	case ${t} in
-		*86*-pc-solaris2*) echo "i86pc"   ;;
-		aarch64*)          echo "aarch64" ;;
-		hppa*)             echo "parisc"  ;;
-		i?86*)             echo "i686"    ;;
-		x86_64*)           echo "x86_64"  ;;
-		*)                 tc-arch ${t}   ;;
-	esac
-}
-
-nssbits() {
-	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
-	if [[ ${1} == BUILD_ ]]; then
-		cc=$(tc-getBUILD_CC)
-	else
-		cc=$(tc-getCC)
-	fi
-	echo > "${T}"/test.c || die
-	${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
-	case $(file "${T}/${1}test.o") in
-		*32-bit*x86-64*) echo USE_X32=1;;
-		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
-		*32-bit*|*ppc*|*i386*) ;;
-		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
-	esac
-}
-
-multilib_src_compile() {
-	# use ABI to determine bit'ness, or fallback if unset
-	local buildbits mybits
-	case "${ABI}" in
-		n32) mybits="USE_N32=1";;
-		x32) mybits="USE_X32=1";;
-		s390x|*64) mybits="USE_64=1";;
-		${DEFAULT_ABI})
-			einfo "Running compilation test to determine bit'ness"
-			mybits=$(nssbits)
-			;;
-	esac
-	# bitness of host may differ from target
-	if tc-is-cross-compiler; then
-		buildbits=$(nssbits BUILD_)
-	fi
-
-	local makeargs=(
-		CC="$(tc-getCC)"
-		CCC="$(tc-getCXX)"
-		AR="$(tc-getAR) rc \$@"
-		RANLIB="$(tc-getRANLIB)"
-		OPTIMIZER=
-		${mybits}
-	)
-
-	# Take care of nspr settings #436216
-	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
-	unset NSPR_INCLUDE_DIR
-
-	export NSS_ALLOW_SSLKEYLOGFILE=1
-	export NSS_ENABLE_WERROR=0 #567158
-	export BUILD_OPT=1
-	export NSS_USE_SYSTEM_SQLITE=1
-	export NSDISTMODE=copy
-	export FREEBL_NO_DEPEND=1
-	export FREEBL_LOWHASH=1
-	export NSS_SEED_ONLY_DEV_URANDOM=1
-	export USE_SYSTEM_ZLIB=1
-	export ZLIB_LIBS=-lz
-	export ASFLAGS=""
-	# Fix build failure on arm64
-	export NS_USE_GCC=1
-	# Detect compiler type and set proper environment value
-	if tc-is-gcc; then
-		export CC_IS_GCC=1
-	elif tc-is-clang; then
-		export CC_IS_CLANG=1
-	fi
-
-	# explicitly disable altivec/vsx if not requested
-	# https://bugs.gentoo.org/789114
-	case ${ARCH} in
-		ppc*)
-			use cpu_flags_ppc_altivec || export NSS_DISABLE_ALTIVEC=1
-			use cpu_flags_ppc_vsx || export NSS_DISABLE_CRYPTO_VSX=1
-			;;
-	esac
-
-	local d
-
-	# Build the host tools first.
-	LDFLAGS="${BUILD_LDFLAGS}" \
-	XCFLAGS="${BUILD_CFLAGS}" \
-	NSPR_LIB_DIR="${T}/fakedir" \
-	emake -j1 -C coreconf \
-		CC="$(tc-getBUILD_CC)" \
-		${buildbits-${mybits}}
-	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
-
-	# Then build the target tools.
-	for d in . lib/dbm ; do
-		CPPFLAGS="${myCPPFLAGS}" \
-		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		NSPR_LIB_DIR="${T}/fakedir" \
-		emake -j1 "${makeargs[@]}" -C ${d} OS_TEST="$(nssarch)"
-	done
-}
-
-# Altering these 3 libraries breaks the CHK verification.
-# All of the following cause it to break:
-# - stripping
-# - prelink
-# - ELF signing
-# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
-# Either we have to NOT strip them, or we have to forcibly resign after
-# stripping.
-#local_libdir="$(get_libdir)"
-#export STRIP_MASK="
-#	*/${local_libdir}/libfreebl3.so*
-#	*/${local_libdir}/libnssdbm3.so*
-#	*/${local_libdir}/libsoftokn3.so*"
-
-export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
-
-generate_chk() {
-	local shlibsign="$1"
-	local libdir="$2"
-	einfo "Resigning core NSS libraries for FIPS validation"
-	shift 2
-	local i
-	for i in ${NSS_CHK_SIGN_LIBS} ; do
-		local libname=lib${i}.so
-		local chkname=lib${i}.chk
-		"${shlibsign}" \
-			-i "${libdir}"/${libname} \
-			-o "${libdir}"/${chkname}.tmp \
-		&& mv -f \
-			"${libdir}"/${chkname}.tmp \
-			"${libdir}"/${chkname} \
-		|| die "Failed to sign ${libname}"
-	done
-}
-
-cleanup_chk() {
-	local libdir="$1"
-	shift 1
-	local i
-	for i in ${NSS_CHK_SIGN_LIBS} ; do
-		local libfname="${libdir}/lib${i}.so"
-		# If the major version has changed, then we have old chk files.
-		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
-			&& rm -f "${libfname}.chk"
-	done
-}
-
-multilib_src_install() {
-	pushd dist >/dev/null || die
-
-	dodir /usr/$(get_libdir)
-	cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
-	local i
-	for i in crmf freebl nssb nssckfw ; do
-		cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
-	done
-
-	# Install nss-config and pkgconfig file
-	dodir /usr/bin
-	cp -L */bin/nss-config "${ED}"/usr/bin || die
-	dodir /usr/$(get_libdir)/pkgconfig
-	cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
-
-	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
-	# bug 517266
-	sed 	-e 's#Libs:#Libs: -lfreebl#' \
-		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
-		*/lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
-		|| die "could not create nss-softokn.pc"
-
-	# all the include files
-	insinto /usr/include/nss
-	doins public/nss/*.{h,api}
-	insinto /usr/include/nss/private
-	doins private/nss/{blapi,alghmac,cmac}.h
-
-	popd >/dev/null || die
-
-	local f nssutils
-	# Always enabled because we need it for chk generation.
-	nssutils=( shlibsign )
-
-	if multilib_is_native_abi ; then
-		if use utils; then
-			# The tests we do not need to install.
-			#nssutils_test="bltest crmftest dbtest dertimetest
-			#fipstest remtest sdrtest"
-			# checkcert utils has been removed in nss-3.22:
-			# https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
-			# https://hg.mozilla.org/projects/nss/rev/df1729d37870
-			# certcgi has been removed in nss-3.36:
-			# https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
-			nssutils+=(
-				addbuiltin
-				atob
-				baddbdir
-				btoa
-				certutil
-				cmsutil
-				conflict
-				crlutil
-				derdump
-				digest
-				makepqg
-				mangle
-				modutil
-				multinit
-				nonspr10
-				ocspclnt
-				oidcalc
-				p7content
-				p7env
-				p7sign
-				p7verify
-				pk11mode
-				pk12util
-				pp
-				rsaperf
-				selfserv
-				signtool
-				signver
-				ssltap
-				strsclnt
-				symkeyutil
-				tstclnt
-				vfychain
-				vfyserv
-			)
-			# install man-pages for utils (bug #516810)
-			doman doc/nroff/*.1
-		fi
-		pushd dist/*/bin >/dev/null || die
-		for f in ${nssutils[@]}; do
-			dobin ${f}
-		done
-		popd >/dev/null || die
-	fi
-
-	# Prelink breaks the CHK files. We don't have any reliable way to run
-	# shlibsign after prelink.
-	dodir /etc/prelink.conf.d
-	printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \
-		> "${ED}"/etc/prelink.conf.d/nss.conf
-}
-
-pkg_postinst() {
-	multilib_pkg_postinst() {
-		# We must re-sign the libraries AFTER they are stripped.
-		local shlibsign="${EROOT}/usr/bin/shlibsign"
-		# See if we can execute it (cross-compiling & such). #436216
-		"${shlibsign}" -h >&/dev/null
-		if [[ $? -gt 1 ]] ; then
-			shlibsign="shlibsign"
-		fi
-		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
-	}
-
-	multilib_foreach_abi multilib_pkg_postinst
-}
-
-pkg_postrm() {
-	multilib_pkg_postrm() {
-		cleanup_chk "${EROOT}"/usr/$(get_libdir)
-	}
-
-	multilib_foreach_abi multilib_pkg_postrm
-}
diff --git a/dev-libs/ntl/Manifest b/dev-libs/ntl/Manifest
index b316f3f12680..186cee9e7e14 100644
--- a/dev-libs/ntl/Manifest
+++ b/dev-libs/ntl/Manifest
@@ -1,4 +1,5 @@
 DIST ntl-11.4.4.tar.gz 2378708 BLAKE2B 9a4c85bbe2fd2d3360988e0c350864fc0a05714e39ce3972228d93aba17f0dc079c90fbe40ab9d72116d1e31f55328bbd5cc71cd080e42ea33bc92361b4462aa SHA512 ed89d82008ca8785cb3d69de9577f42abe464dabf167ea2aaf801951843fc427d41171cbaac2f0cf68f35110d029cc28a65bd5aad69d30e7312f5ebcb0b58911
-EBUILD ntl-11.4.4-r1.ebuild 1902 BLAKE2B cd05f67d73bba5f4f4af5bb0dd52f10e8473589c770b5cf5db3df89b8ea9917b99e8ffbafa6b288af1e4d2634ba22c7831b579344c10d8e6c2e0cab891444c81 SHA512 ca77386127ab3feb186faee1dac9059e572374ee0167e6aff0258d520ff8c2662679fe51eec7b1b7fc97d0d77e410b0498c1c1970210ddd1c7b01286572c7be7
+DIST ntl-11.5.1.tar.gz 2304103 BLAKE2B 92284383451c7a810f7ee8d9a82836695d19d2a2e46b71c8c60b00acb77f4b4d3bad5497a309616a3e3188567d20203f5ad31295130ab0f3ace08417188c9fda SHA512 cf1f642b8a0f9cdc6dda888e07183817dc67ff494e56a852053aeb15b3d2a0e61fbc05824779c5d1f20b8115fba6f97266acf7e0b0b527c25df5989c86d5928f
 EBUILD ntl-11.4.4.ebuild 1704 BLAKE2B a32d148309c83276b1c56856917cb7c3a2b43c1ba4302cc6e6a634e63badf8d5aabdd48f534b72fa83718e1f797689df170ca88ea777d223a0ffeceab4f96688 SHA512 e20d5ba994de73f4762cf05a3a84ef14237849c9eae86c45f8a0ba40e8da08b2a3d855abfd8b921b95b25daeabff10bce1760ca5b263c341bcb256fff5c56d13
+EBUILD ntl-11.5.1-r1.ebuild 2070 BLAKE2B f9d048576f2e95ad247b02e0c26c2df69bbb8351c619a6aac3a0991fc58fa5f4e68a97219b3d176ba3550e59b799a522b2a96fec9e7f8e32cf438dd95422764e SHA512 9a1da9d4c5907496c142682d76c9a9c22e9970b0a3faa85aadfc8d3999f61049a70b4f6b7cb87bb27a59a2e5de65e72b0ba0c3b7250c82ccb7e133aac1713582
 MISC metadata.xml 553 BLAKE2B cdfae3ba1eecfe54b279aec52c8a122226eb0247dfad805feb9f0854705e99247f15e42dedd6d08164a8d9c9cc9db871a481f6bcebad3062ac32ad05c3c32b7b SHA512 ca5e891461461757b75aea48a2cf631cc871daf33159c1f2c2a9a9e6acad43db97733de1c24754709e9b4eb1173a50af3ce63690443ce5ddd6794de9580b0d19
diff --git a/dev-libs/ntl/ntl-11.4.4-r1.ebuild b/dev-libs/ntl/ntl-11.5.1-r1.ebuild
index cc4a14f83cd4..b5dd020eb133 100644
--- a/dev-libs/ntl/ntl-11.4.4-r1.ebuild
+++ b/dev-libs/ntl/ntl-11.5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.shoup.net/ntl/ https://github.com/libntl/ntl"
 SRC_URI="https://www.shoup.net/ntl/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
-SLOT="0/43"
+SLOT="0/44"
 KEYWORDS="~amd64 ~arm64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="bindist doc static-libs threads cpu_flags_x86_avx2"
 
@@ -32,6 +32,11 @@ src_unpack() {
 }
 
 src_configure() {
+	# The DoConfig script builds its own libtool, but doesn't
+	# really try to set up the build environment (bug 718892).
+	export CC=$(tc-getCC)
+	export CXX=$(tc-getCXX)
+
 	# Currently the build system can build a static library or both
 	# static and shared libraries, but not only shared libraries. The
 	# name NTL_GMP_LIP is *not* a typo.
diff --git a/dev-libs/opencl-clang/Manifest b/dev-libs/opencl-clang/Manifest
index 3a2ebf71c3e5..fa97ee4c7ffe 100644
--- a/dev-libs/opencl-clang/Manifest
+++ b/dev-libs/opencl-clang/Manifest
@@ -1,8 +1,11 @@
 AUX opencl-clang-10.0.0.1_find-llvm-tblgen.patch 379 BLAKE2B 23587b8500ad6215603326572a10aef71ce66fcec322834b7e6a7648bfee5a92ce698fa706ebd9cfc0fe3048005919b1d9ec1ebb1d4123412f2fd06593b64841 SHA512 b2e9ae0ceec231b33e2b70664c3cb7c56f5d30f62e2444c6a505c7ab300a463d32ad1a650e8afe1b1bd4b568b3a31c02c280ead3caa8a66548d96df16dc8f131
 AUX opencl-clang-11.1.0_version.patch 404 BLAKE2B 31d8f90de04be1d563caf35534b86fb5f9aba08922be00b9685a402550eaf09334fb7ced28e7ba05d840e389b8d0b315d4809cd26763b4d9a76410401dded687 SHA512 57f59db22b33d856bec6deba6c04ae68d9e5da2c0b2da4fad5053c6915a5e634bb0206eb3c933f2228947df92a633ee2d051164b696803a8e6c330a9218ca6f9
+AUX opencl-clang-13.0.0_version.patch 404 BLAKE2B a1ce164d2e7492e8ebc3fc068fd1cbcdf8255923ecf54ae49677b857e022c4501e885f991c391e0e0ac4806d692c7f3ae7e60e66fbf68611c15be61fab2b523b SHA512 7dad6d570a92d4571d1a1ea2fb14b53167a390d193205b05784f55bc53d6604a8c9899a68ec56092b2f10c7d8e6f4c0b0a62b4090b10488b478043e815010a44
 AUX opencl-clang-8.0.0-clang_library_dir.patch 468 BLAKE2B 09315ce9250920caf8c84853a5cf08506b01d91f7c993273be910b38f9c97f1f31e1042d75a111734eaa86fad771bed5b09c6c9001e253c71f26bd7c1e668dcd SHA512 c5a715c05c7bc7b904a46cac8d6a10f161da6d978401c5c60853a19dfb63c65690994bdc57fe327ee36bb5b6151a0018d6931c38553917f2dc82e9cef44e0b0d
 DIST opencl-clang-11.1.0_pre20201222.tar.gz 77968 BLAKE2B efb1759329869eda69cb2e001afe27180d69f030b980cd45f137a34ca54be0bb41849a447dff8a28f20dbe3e7ed66204bcf54a62caef9efcecea815b25951f9e SHA512 46e904855122e24f6214748186d40ba3f85c14169403a192bd28b8d5faf68afeca36a424609ee7c94ddaa5aa0d8b1268bf89ce9cc255933093d71f587889e3e4
 DIST opencl-clang-12.0.0.tar.gz 25292 BLAKE2B 6979ce3f37b0e29e6b7ca9b015c04af6e01ceb6381158492a928d805b26b9bddf00b7a7a3edd987924f1c3a8ad914b7d6e9d9fea22b12166afceb25365edae6c SHA512 7fa05480b10be97dd784b8fb7579a2471cf3a904facd9949a980602085515bb3d42a042c74db80381771ad18f78bed2efdcb09538a865ac4a600d6190b8f9c31
+DIST opencl-clang-13.0.0.tar.gz 25299 BLAKE2B 1aabb4a97ba0bfd6129ea2b821508457de9d8ab78b4456217d655239081f8547e87730f54f05511e1a3ca6c54836fad5cb0cf69f26ac5ffd86ff6ae930f5e2dc SHA512 d346e51339060795d80bdf9d3e3b58e55b089d94ed3c0bc3c7e1e8f81a5f65238d90dacc95ec27e8db7d38a6a03b05df5c4120e9ba0ec72a7bbca28a59d697f7
 EBUILD opencl-clang-11.1.0_pre20201222.ebuild 1262 BLAKE2B 4b130083a32b8e696a70a6f1058409596823de40432ae2925756ba901223981bc92f32380e74874ac67a0e4001dc1304939329ad34f901fc564ad2bca2c7c96a SHA512 44ce33fd10db3aedd36c892815326cd1295983cf267ec9fa57518067d8d974463953313bcea915a0d16cdcba8ae7935a94c09c10eab0de7825dcd90b203af205
 EBUILD opencl-clang-12.0.0.ebuild 963 BLAKE2B 75f81c1822e9977fc38a8bb296e209e7ecbed243a66874773e6d04cb44cfb832fcba1bef0df8338c7bbc68f79f23c1bc933325cf00a8969a3459402d8e55ea88 SHA512 3b46e1fd9878e169c800ed4cc5115f1ea8f10a80c6c221b2ef4931ea20c8328249b2e884085eb63cd209deaf58ef54151d55d692de9b4c881c26dec7eeca20cb
+EBUILD opencl-clang-13.0.0.ebuild 1006 BLAKE2B c0ad8bb1c96b6eee0e94b2645ebce7f3c75ff6eb46eea361b6b98203b930a8b061e19bb45259794ec1a386f96072b1faabe2eaf879758c6498ef07c424b20192 SHA512 f561f5ef4903c47b62ad9143300d403b5a5c503c4e73cc3eee4c2daf53605731af05eb70daf854011819fa9fb647732ee0328d3572f721cc6257b2f03728d4bb
 MISC metadata.xml 251 BLAKE2B b22019593bb3b4bc147601f4bb0d9b1b581cdc60b044374d440221c23a56dd8d66361e70a22f91445b364a91e5082a103107c9b17e25370d9e5da54a38031438 SHA512 0ed66fe371eb8158e69a8bf0cbf9b184e7d04450c034121fe45d200be9285ee4e6347c5fa9c7bfead588bcfdbe4928556418e3cac6d3e55622eb30d47c186a78
diff --git a/dev-libs/opencl-clang/files/opencl-clang-13.0.0_version.patch b/dev-libs/opencl-clang/files/opencl-clang-13.0.0_version.patch
new file mode 100644
index 000000000000..1664960b6608
--- /dev/null
+++ b/dev-libs/opencl-clang/files/opencl-clang-13.0.0_version.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -20,7 +20,7 @@
+     add_definitions(-DUSE_PREBUILT_LLVM)
+ 
+     if(NOT PREFERRED_LLVM_VERSION)
+-        set(PREFERRED_LLVM_VERSION "12.0.0")
++        set(PREFERRED_LLVM_VERSION "13.0.0")
+     endif(NOT PREFERRED_LLVM_VERSION)
+     message(STATUS "Looking for LLVM version ${PREFERRED_LLVM_VERSION}")
+     find_package(LLVM ${PREFERRED_LLVM_VERSION} REQUIRED)
diff --git a/dev-libs/opencl-clang/opencl-clang-13.0.0.ebuild b/dev-libs/opencl-clang/opencl-clang-13.0.0.ebuild
new file mode 100644
index 000000000000..1c05a54ecb8e
--- /dev/null
+++ b/dev-libs/opencl-clang/opencl-clang-13.0.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+
+inherit cmake-multilib llvm
+
+DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
+HOMEPAGE="https://github.com/intel/opencl-clang"
+SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${PV}"
+
+LICENSE="UoI-NCSA"
+SLOT="13"
+KEYWORDS="~amd64"
+
+DEPEND="
+	>=dev-util/spirv-llvm-translator-13.0.0:13=[${MULTILIB_USEDEP}]
+	>=sys-devel/clang-13.0.0:13=[static-analyzer,${MULTILIB_USEDEP}]
+	sys-devel/llvm:13=[${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+LLVM_MAX_SLOT=13
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.0.0-clang_library_dir.patch
+	"${FILESDIR}"/${PN}-10.0.0.1_find-llvm-tblgen.patch
+	"${FILESDIR}"/${PN}-13.0.0_version.patch
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
+		-DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib/clang
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/protobuf-c/Manifest b/dev-libs/protobuf-c/Manifest
index e4c157478717..0613a126f595 100644
--- a/dev-libs/protobuf-c/Manifest
+++ b/dev-libs/protobuf-c/Manifest
@@ -3,5 +3,5 @@ AUX protobuf-c-1.4.0-include-path.patch 8092 BLAKE2B d1abcadbaf41789a882427cbae6
 DIST protobuf-c-1.3.3.tar.gz 500505 BLAKE2B 6f00eac847f5287cdea5afaea5be05d660eda10b30a14bbab89331ef134f93b8a77d3f6546cab246447494b0283b32218f794c56a7d081906c49668631b14505 SHA512 85308348929487e3a89158c6078dab39cee0b39a0611a4d5ba73d20520e41d96915e42a0d6060ebd3eb7d922c82444f5ca000ea4f8791b37734485cbb7e283b1
 DIST protobuf-c-1.4.0.tar.gz 505251 BLAKE2B 5f53238c064f82de87012eb739bf6a44c202d0dbf2fc5af394accdc52a9934d1fb9cea2bb4a4d529fdf98959546aaa672c1c991a9a7016803d16f65accc907cd SHA512 6a2e5031b85b5986e863661437dea002eba217257a50a27db88d29fa1a3db1014ed6ec7c21d89df700d181b18e169d1037146cb6475c10cd5a068a91e522e3c3
 EBUILD protobuf-c-1.3.3-r1.ebuild 1080 BLAKE2B 030805a9c9ac7dbf9fa6d9f2815b6ddb74821abdec9b4ba1d540df15d97a8f29c6f0b7d144c88392740d99bfe134e8b52d6be90da9ccb48138f7741ff552e173 SHA512 4c3fbacee9cb0f9a636158544cf68e58b0f648f582459b8741a45b4022dbf563f735b42d4ba6eb4ad48e7479e305f9a7dbe5972c072d0b5e35650ff8f6c04fe4
-EBUILD protobuf-c-1.4.0-r1.ebuild 1122 BLAKE2B 50f9588b22b77bb3ea91b7c7fde8f7529d67d511de6f1f63b7d35ebdc785326801dfdce8f18d3c9e95cd59f9b05d23848d03e2620db89e081e9b6642136115ef SHA512 d45c295b6bcb667f6eaa558e13cc21c08a30458dfd3ecbc5d8dda4194d12b9d29f5acca2082eb50dc8bca48b54f4668134964d8bd116a1f77fce0bc54ea34c1e
+EBUILD protobuf-c-1.4.0-r1.ebuild 1144 BLAKE2B 11ecd13a8592703af7d6e00558a397fd7f94b8178eb011713d8c1fe2403d9861a163ac06c04790ed4972555c255cb1689d7006f61f5b0bd5e525688e7588e38e SHA512 58e507b57839c3106b98a20963aac04ea432608535518ab529e06ec3a47ce9a64fbb596473336905089aeb42e3eb1d88d747bafe717bd2952045c824beab7661
 MISC metadata.xml 259 BLAKE2B 650e53279ca9375b8dcdec83d1065b370b820ee770225c753fc93d8600781aa4c191fe2a8016e34f5a24b4f9a94b922bc48eb75550c25a2d85672674866c0b62 SHA512 12f8cbcc9bac27c99a9a80b6f9ae803a8cde6b765ce0487a08cf76e83347bf0ac9793d50cc00d692a6069906d0e98af684c7b060262ec95f57621850ca47677c
diff --git a/dev-libs/protobuf-c/protobuf-c-1.4.0-r1.ebuild b/dev-libs/protobuf-c/protobuf-c-1.4.0-r1.ebuild
index 7a7d74d82d13..ae984fd64d87 100644
--- a/dev-libs/protobuf-c/protobuf-c-1.4.0-r1.ebuild
+++ b/dev-libs/protobuf-c/protobuf-c-1.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,13 +16,14 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="BSD-2"
 # Subslot == SONAME version
 SLOT="0/1.0.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
+BDEPEND=">=dev-libs/protobuf-3:0
+	virtual/pkgconfig"
 DEPEND=">=dev-libs/protobuf-3:0=[${MULTILIB_USEDEP}]"
 RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.4.0-include-path.patch
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index 646e6c04fdc0..a7120cc55e66 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -1,21 +1,25 @@
 AUX 70protobuf-gentoo.el 170 BLAKE2B 6d9a92bd3310ca09d18dd762bc0bbd4b0b36184c17f95c80c02183c457fe4ff1142ca1e3207e5a77c078fe5f768cb3e85abc712abc1f4c85774ca1ebf178059b SHA512 ed73cd6b1bf6c0019e4da73c3a480b0f917e949dfad2696336e805263c81610b2a8a0514840e389db0f0e78252cf053d754c5e07731dc5e9c93c9e88f0b2923c
 AUX proto.vim 49 BLAKE2B 9b6d31105811a8f8cbcf76328172fda5b66b33351bb16573ed1ed08d4c553af2805962a6d6609fbdad4a2644bf9cecd1e771a557f138111ad2c0be959b497ee9 SHA512 65c1f49887c17973d1dfce07fa86d04c5079d2382826eaeb22e128570717f181c53d22ba50905252021f7e476a90ecd29f9d18799c1ccea64b01f4638323538e
-AUX protobuf-3.15.0-disable_no-warning-test.patch 965 BLAKE2B fdc24fa141b5d3c4d45dace718d089e26862bb451789c14e652e74cfedde7cca14d1c4c2bc7fbf028516e47b790841bd9c69658b94a47d3ad36ee61bed596b36 SHA512 d1c4ad3ff7a5548437a116243b263d4ccc22b2bc8872c0e043788e902c5190b26de73d61736fb08403bfe4a0b4c2340dbe8d92f35768e52ba3c770350b26cb49
 AUX protobuf-3.16.0-protoc_input_output_files.patch 10060 BLAKE2B e91d2e60ec9a901df0b0e11a8e51ff92b8765357e052231a915a2afa996c78096e18cf443708bf32e51b882c3fe2512e2ab9f7bb8ec1c6141f2c9bb7fb98af95 SHA512 03721151866f25564e203eb5af987649bf3c148ba7b9e1a2a837b336062b911d892714c4deaa5b19572a3ec47e3b309114ce67b0ec0adcff50d208b73283a7b5
-AUX protobuf-3.16.0-system_libraries.patch 6299 BLAKE2B 30a2aa46cf9bf6a415e5a12d6d8c931fdd5a18cb100e4389ed777196480598e1400464cf759a49ee3bc4954fc3b9e8d6029a24623aad123186bcb27ca1da6ef7 SHA512 b4b2b60cff6bea9d4dd716c8f7106b0c77ca35f1377201996d6fc323fd4dc59054d7300bb5e949005405ae7371d6c56d1b30195804e723d05fc2199554398302
 AUX protobuf-3.17.0-disable_no-warning-test.patch 965 BLAKE2B 584b43b43861280254f92ad48d8a068b6427e1af3822097f2ddd872983fae11f3bd7af1d73b9b58592987ac4aff7399fa31291e21db6656518bce10c5977a785 SHA512 a67fe3231064c1cf3f4ca94be4248fd65f455b1aaa1d1a09afae847a9b9bbae9673d1fec177e822abe0a83b2fe3342bd20dd9aff87adea0dddcc05309aaca682
 AUX protobuf-3.17.0-system_libraries.patch 6299 BLAKE2B a9252af294342e0a12137c618bc1e6fbe9aa021feaa458c2638aaf407dd6a43473587b7ac3e7278217874e5091ff7337234594715daa7567c9d3cf1bd3191973 SHA512 1d712f886e28907d5a5bef414c9fec56d1c056c316428f6e05fdfb87494e93506c17ff6dd5cff4ec716a6f20b56258393773701cdb6b04f87e44264a919a588e
-DIST protobuf-3.16.0.tar.gz 5299781 BLAKE2B 9ace02a6038c31b7393671fb2ccd6a4866a3f8b7d87d2bc8371f49d65b9180f10792ca2430a83449dfa7d785a1244dac23c20756414c9d1e7c7e871a8038b123 SHA512 0191e5a6a23d03f691e883e259f6d06a0ac8eef427455bc7d1cc70b6f0ed260e4ad8f360c836fd4bdc95ec0ca314c887cbf7acbcda60e03cdfe69e4cd275bff5
+AUX protobuf-3.18.0-disable_no-warning-test.patch 1620 BLAKE2B af958e23f5229706b28e4832768e87aafe9c107b8a1f9418ee16fa50927b89d8546e36544781c94a43e29ad3466e79707b882897b18d448d603ab09d4c24d731 SHA512 484ced278252af1fa03f093ccdc8b28199c5b32056c365b5fc932cb8af6e73a32bb9ca1ab2f489e43cca8fc2334c8d323095b54c359e28ede47c7ec191c08905
+AUX protobuf-3.18.0-system_libraries.patch 7514 BLAKE2B 480217c0192f7948592a44804b33332f0e50e331f9219896eae36d5bae39f2541ffc3c4939f65a61cb58c8b4ebe377b5837a22eeeb16dc97e7e432ec55bac784 SHA512 c5b1a195dc50b7dc50317613d32511fc771ce2f3c78a2bb54eef2e00f822dba0ffe421c6d708c5230f769ff93aefe8c12d4d134d06190fdb7cc2f2e42fb343ef
+AUX protobuf-3.19.0-disable_no-warning-test.patch 1620 BLAKE2B e4f324ed59b2c31662cc625e9d3f1fdb20ee2a25769dbf86093e5000f73a01e11f05459989aaefeaf0414648cd52f1f1025b9d4f1423cdca4844e42e96f54836 SHA512 8c4bc72976a7eb3418b51e7a1c45b49d7ffaeb91a86f440008e6f162773b1db7afed4a6ae1d0b3510d49361c369b6552a9ba4976d104d804d825227aa7113d95
+AUX protobuf-3.19.0-system_libraries.patch 7514 BLAKE2B 1ff5c226232c325ed48cf16e2c47652615c4bd1503f1be8560e7f2e8658ffefeffeef72a6baf4368f758e30a4a81d582769b61dd0b3e383c8188cd03bf409c01 SHA512 b6a58e483dbb1f6151c2f7c735fbd55f34bcf98d6370eabb425dbd96e10cb87e8dfbf5024ad8f888cb80a095bc26598aceb55d576d37166550ee62db41c51a44
 DIST protobuf-3.17.0.tar.gz 5185780 BLAKE2B a168619df72cdf097c7ddfd50aca96a2101bf73e7c1c842c020e6ee08a853db8674a86ca999b7706da3dd21d4d3d2159241c93232efc693701962f3a54a382e9 SHA512 36ed2de641849ce01531ff1207f62a0748f811519c40622a119a17a1e709864382de81481fb58f374a025948971c48416e7e6de9c00512a78633c7a8a3aa3a36
 DIST protobuf-3.17.1.tar.gz 5192666 BLAKE2B 7f912db7e0835aaa42628fcf564a5666e2cbfa021bb35638a5eec53c3c457f1e747225dea54f732b7239a1520febca9bc20c824b1938f100796caa3ac2133bc1 SHA512 5a18aa3c1dab040dc6d22310a8503241081106acf7ca89079d7b416533d7c2cdd47719dc9023e6bc26969f0f1c796550260a04034a403c69752f6a3a7a651bb8
 DIST protobuf-3.17.2.tar.gz 5192779 BLAKE2B 97f9561848e70b8d26ebcc7fc4fa8da51c4b8267efbe1d2d386c2785308e7ba7edc05f1b3863c274dc8838866d58b58509606d72c51a22b956d1d528584c4c95 SHA512 b3e7ad50ed772668df70a3a20ad1af13a5e82f23b109e4fecd34e6a74947bed300963c9f084907fbfafe28fc18365cde7df1975e2ff9538d2f5a3d2b458bca98
 DIST protobuf-3.17.3.tar.gz 5235236 BLAKE2B 2495e678c8f9436d4e5a30ccee8b6226125d418ac7ecf7df20b078a1a16c221cbccab7d846dcd56a90220c106617fa75c410a21b62612fedec378cd7e8571350 SHA512 b4030b4474cc5fb5a62501200725dd488e6e66e3ced4ed12ab4ee029fcfed305e92ec966adafbdd343afffd186908163849422b95eaa500e7e741ac325d01d12
+DIST protobuf-3.18.2.tar.gz 5272935 BLAKE2B f65caa4483d3ff4186f9ea388e2a9ef232ab758cfda846cfb5993df1f991e4574e63a33b175dd00c72f61c0a23ed12d3c62eb658cd397bf43b805c41fb34c47e SHA512 8ca613fdeefcbd93e866fab65effc38aa8508060aa3de0109dbead68f2e27eb22ad0a8aea10c8b4c3e9de181d62185c93b369fb5abf96de02a170f2e5c27e0cd
 DIST protobuf-3.19.1.tar.gz 5291573 BLAKE2B a34f1a7cf99ecb6cb8a26bc858de6273bfd26aa9be1e89e48c16cb5df0f1e9576479344c8250017238dbac0d0c4ac33001125b5fc622cb64ed6b91023198b03a SHA512 f1271f5159a7be363a5f60ce4921dfea68a8468d66808330bacaeaa1cb7f652d045ab080b5d82816a6fd4e6d7d7fe79aaa6c8d66d81692721d36ce3bbf619f31
-EBUILD protobuf-3.16.0.ebuild 3783 BLAKE2B 69eeaf3d61bcbea029a2b18340f59cc1c21f22e4846788b5064177a2f36ddbea02ac461c58a8a6234bdedf3805c037ef6fb924ffa3ffdc8a5ac5ab7437ce6491 SHA512 9cae2e13569c1a134a38e658f919c95323b80b13974bd465c6c6456be4d0a812ba1dc4b6d8eeb369bef1c5314b29452a9a298d46d3847533d649bda6fec1a792
-EBUILD protobuf-3.17.0.ebuild 3783 BLAKE2B 3d98490797351fe6162cb0cf05cb6e052b9744e55b2d667633fbd7c3dbafcef772de7be65cc68b6effcb705c792bbe6920f316a186feb13166401a1d8abc6f92 SHA512 aef0d4674bcd1ff299acd4eed64c7d8dcb0492e312b615b8b47e2b90f5dad517a2f252fa29f7223fc17717d94cc792400894f499e9058b96d4f4ef19ca98790c
-EBUILD protobuf-3.17.1.ebuild 3783 BLAKE2B 3d98490797351fe6162cb0cf05cb6e052b9744e55b2d667633fbd7c3dbafcef772de7be65cc68b6effcb705c792bbe6920f316a186feb13166401a1d8abc6f92 SHA512 aef0d4674bcd1ff299acd4eed64c7d8dcb0492e312b615b8b47e2b90f5dad517a2f252fa29f7223fc17717d94cc792400894f499e9058b96d4f4ef19ca98790c
-EBUILD protobuf-3.17.2.ebuild 3783 BLAKE2B 3d98490797351fe6162cb0cf05cb6e052b9744e55b2d667633fbd7c3dbafcef772de7be65cc68b6effcb705c792bbe6920f316a186feb13166401a1d8abc6f92 SHA512 aef0d4674bcd1ff299acd4eed64c7d8dcb0492e312b615b8b47e2b90f5dad517a2f252fa29f7223fc17717d94cc792400894f499e9058b96d4f4ef19ca98790c
-EBUILD protobuf-3.17.3.ebuild 3783 BLAKE2B 54485dd8de73b96c68e7593a0a83226fed7fdf247729a9b229c52548bfb247347ac51b7a22a11b5196fe43c0ae7964f11a502e4c280f8407d9427b269e8e4896 SHA512 390a3ce080af6e36d0a2dcf16aa1f6fbc25a20eeb65c857189fed1f07ddeb48a2a0ed9c32da10e88940fbcee88fd379a2a216e79a7d799c3e7d6b83096283d3f
-EBUILD protobuf-3.19.1.ebuild 3734 BLAKE2B 9c73d6772cc04ca5427495bbc323c63c40be942fba7be79f646fce3919508cc84c83a540126787964436512f71e8b79321bd6bd0bc05a3ba364df10e54738608 SHA512 af1b53f45a7ce8944b63031deeca3c9ccb5034d02868a95f542df0f16a7c96d3ef14f0765a675213cb9fc5bf413e90874f0835baaf94f2e19d3cf19826b25861
-EBUILD protobuf-9999.ebuild 2699 BLAKE2B 38dbeeffa901ebc96ecbe1bac8436cf56fece07193547ff40b5da67341a3589b7a588a78bd951d08484d089f445ead164a4e2ca06f03179e4b15c8e983f5daf3 SHA512 5e10427330334edfc0e8841aa2700462ea16141ca4276c1d7b417e49604151c4ec67ff6cd0494d3bb56bfd9b1fde336661d7ff3e72da2b521e80d193f3bf1b5e
-MISC metadata.xml 623 BLAKE2B 0073d736a4b20a2bb9d49c48e0191843286c8c09553a8b662e64494b0674fd8d1b411a7fdbb85e088783cac04af5ab590f9e7ee99027197f37270588a005caca SHA512 a242b229d34554e31aed2638e2febade4e1c3df86c2bfad87fa42d0be307a10a90d94e92dfbebed6ff6a50b3724b7a9a274e967a81bda8a6ae4b3eddb4c23a71
+DIST protobuf-3.19.3.tar.gz 5293258 BLAKE2B c05b70ffca97f7166ea6a511a36907eed125edf1ebf17f908718221d9b851be84dfb2b1b39973f2faf35f6ade630e6ba4f9e8b91b8fbc922c5db97079323ee6e SHA512 1c003e7cbc8eae6a038f46e688b401ee202ba47f502561e909df79770f6e8b7daf3dc1ccc727e31bfb5b52cd04cb4fef7d2d2a28d650c13f396872ad4aa076c6
+EBUILD protobuf-3.17.0.ebuild 3963 BLAKE2B defb3effe35c18bd6643ad86bcc45b912d619492201b69acf1948d992003980cc5be7a76c57c44d2089da7951172a587fddf70e514752afdea79517bad192cad SHA512 7b47d28f8ab0b8a07a49115e9feea9e7eb92c5ed797332eece04c009d6cede9d1a27d8573a1528a9a20fce3a440246b42aec32d6b57cf5595b7f633ec414893d
+EBUILD protobuf-3.17.1.ebuild 3963 BLAKE2B defb3effe35c18bd6643ad86bcc45b912d619492201b69acf1948d992003980cc5be7a76c57c44d2089da7951172a587fddf70e514752afdea79517bad192cad SHA512 7b47d28f8ab0b8a07a49115e9feea9e7eb92c5ed797332eece04c009d6cede9d1a27d8573a1528a9a20fce3a440246b42aec32d6b57cf5595b7f633ec414893d
+EBUILD protobuf-3.17.2.ebuild 3963 BLAKE2B defb3effe35c18bd6643ad86bcc45b912d619492201b69acf1948d992003980cc5be7a76c57c44d2089da7951172a587fddf70e514752afdea79517bad192cad SHA512 7b47d28f8ab0b8a07a49115e9feea9e7eb92c5ed797332eece04c009d6cede9d1a27d8573a1528a9a20fce3a440246b42aec32d6b57cf5595b7f633ec414893d
+EBUILD protobuf-3.17.3.ebuild 3963 BLAKE2B 354826907c0820d5238b21cd8c3047ad4e75cb215fcd88592f4740e8bdf19803fe3e21e7b9f512af086085d83f3c6c4059316ee9d731aaa5268689e49d5efe9a SHA512 fa9aed179f0b781c1a02706d70ac5d6b172e495c5d51ecb79b4e5be1e2cdc2afd128f5569d6a621298b8724d5d3f484309bc6953ccd17477c8aea57396829a05
+EBUILD protobuf-3.18.2.ebuild 4163 BLAKE2B 66946fad9676382e10d5a4e6e36b149c9778a78c80062f22d772f796b77a3af60e2828c8e9c9359252ceb8e74adbaaf53a7a0f77f24929d7d53d035e1e5fab3a SHA512 f7e6cfd41a05621999a9c412cec7cfb75fbdff53062fcf500cdc844faef207b13c616ca3f8488ba0f14b90e70a791b8da90f3f08e88e03b15a14b1f6b63c80c4
+EBUILD protobuf-3.19.1.ebuild 3938 BLAKE2B 8a495968d8cd4272f19506e0108e903364775211c8d5f1fbc6d65ff291db66e12596d5fbd48e7490ac84ecbe20b5377fc9fcff6d774a1f73fded6544f064a82f SHA512 46bd3a0f653b807627e1cdddab4ce91d7c7fdf224183437b6566fb782194450c4f2b3e13b12661c95529787d4ddf01f8b51b48bdb22d3f348619316fb116c1c5
+EBUILD protobuf-3.19.3.ebuild 4139 BLAKE2B e6370e9d46cd62d2668481e2ced7b2a78e9d93ed8d0502d84ad28545422c405ec7e71599cdefbdcf19a200afeea2ee376d033a99200060305f73815340c61327 SHA512 61c62718e911a344f584072b041ebdd1c1312c73da89f6d64921df40f39a8a8bcea97e73d7de36f5596230296b5fc2686f8d6986fbb11f8454e6aa1eb8b252fb
+EBUILD protobuf-9999.ebuild 2672 BLAKE2B 5627d3ad014e4360622b5837088bd6bdbc24b78886d734b1b37d01b474a4013e1ddec73422224c235e4908e8c1601e9650a69ee13d2ddb024d734c05080ab344 SHA512 bf151189787bbd05ff37f7d4e7e160d29b52ae1740704dd2b3446cb94e34e141e41d53b5a28d829c74c50e7f3fa5fd36a6bf528f0ad00af7fdc5be972c5738fc
+MISC metadata.xml 595 BLAKE2B ba1b916e26b1e53f68e660f03d2e53fea8d22db04e8241ebec3ec20fbb251c2b164cf25d5fb6118423ce7721a822ae2302aab137b0748730e9a6860bf8e65668 SHA512 785e2550621b79b6350e1a6b52ed9992610769885fb29a9e92ee45a35158cc08707a3590dfcbece9ee9a5e16e1abfb614e8186132da7b942f2761b5e6ecfa827
diff --git a/dev-libs/protobuf/files/protobuf-3.15.0-disable_no-warning-test.patch b/dev-libs/protobuf/files/protobuf-3.15.0-disable_no-warning-test.patch
deleted file mode 100644
index 031b1b222a9e..000000000000
--- a/dev-libs/protobuf/files/protobuf-3.15.0-disable_no-warning-test.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Disable no-warning-test which is compiled with -Werror option and whose only purpose is checking if compilation results in any warnings.
-
---- /src/Makefile.am
-+++ /src/Makefile.am
-@@ -709,7 +709,7 @@
- GOOGLEMOCK_SRC_DIR=$(srcdir)/../third_party/googletest/googlemock
- check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \
-                  protobuf-lite-test test_plugin protobuf-lite-arena-test \
--                 no-warning-test $(GZCHECKPROGRAMS)
-+                 $(GZCHECKPROGRAMS)
- protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
-                       $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la     \
-                       $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la     \
-@@ -896,4 +896,4 @@
- 
- TESTS = protobuf-test protobuf-lazy-descriptor-test protobuf-lite-test \
-         google/protobuf/compiler/zip_output_unittest.sh $(GZTESTS)     \
--        protobuf-lite-arena-test no-warning-test
-+        protobuf-lite-arena-test
diff --git a/dev-libs/protobuf/files/protobuf-3.18.0-disable_no-warning-test.patch b/dev-libs/protobuf/files/protobuf-3.18.0-disable_no-warning-test.patch
new file mode 100644
index 000000000000..9abf5deca295
--- /dev/null
+++ b/dev-libs/protobuf/files/protobuf-3.18.0-disable_no-warning-test.patch
@@ -0,0 +1,36 @@
+From 290073d7d4ddaa6d39ad12c90245e795c5482432 Mon Sep 17 00:00:00 2001
+From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
+Date: Sat, 29 Jan 2022 22:43:50 +0800
+Subject: [PATCH] protobuf-3.18.0: disable no-warning test
+
+Disable no-warning-test which is compiled with -Werror option
+and whose only purpose is checking if compilation results in any warnings.
+
+Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
+Signed-off-by: Yixun Lan <dlan@gentoo.org>
+---
+ src/Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index e6b4d0f..1cfd885 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -726,7 +726,7 @@ GOOGLETEST_SRC_DIR=$(srcdir)/../third_party/googletest/googletest
+ GOOGLEMOCK_SRC_DIR=$(srcdir)/../third_party/googletest/googlemock
+ check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \
+                  protobuf-lite-test test_plugin protobuf-lite-arena-test \
+-                 no-warning-test $(GZCHECKPROGRAMS)
++                 $(GZCHECKPROGRAMS)
+ protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
+                       $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la     \
+                       $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la     \
+@@ -915,4 +915,4 @@ nodist_no_warning_test_SOURCES = no_warning_test.cc $(protoc_outputs)
+ 
+ TESTS = protobuf-test protobuf-lazy-descriptor-test protobuf-lite-test \
+         google/protobuf/compiler/zip_output_unittest.sh $(GZTESTS)     \
+-        protobuf-lite-arena-test no-warning-test
++        protobuf-lite-arena-test
+-- 
+2.34.1
+
diff --git a/dev-libs/protobuf/files/protobuf-3.16.0-system_libraries.patch b/dev-libs/protobuf/files/protobuf-3.18.0-system_libraries.patch
index 5b6f4101e9ca..0e417c51bdab 100644
--- a/dev-libs/protobuf/files/protobuf-3.16.0-system_libraries.patch
+++ b/dev-libs/protobuf/files/protobuf-3.18.0-system_libraries.patch
@@ -1,6 +1,24 @@
---- /Makefile.am
-+++ /Makefile.am
-@@ -11,28 +11,10 @@
+From 10b2d5bb5a4d1b7529cb781e5513940ad6db4ada Mon Sep 17 00:00:00 2001
+From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
+Date: Sat, 29 Jan 2022 22:46:38 +0800
+Subject: [PATCH] protobuf-3.18.0: system_libraries
+
+Use system version of GoogleTest,
+which will unbundle gtest, gmock libraries
+
+Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
+Signed-off-by: Yixun Lan <dlan@gentoo.org>
+---
+ Makefile.am     | 20 +-------------------
+ configure.ac    |  7 -------
+ src/Makefile.am | 33 ++++++---------------------------
+ 3 files changed, 7 insertions(+), 53 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 7ce954e..c1493e0 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -11,28 +11,10 @@ SUBDIRS = . src
  # Always include third_party directories in distributions.
  DIST_SUBDIRS = src conformance benchmarks third_party/googletest
  
@@ -30,9 +48,11 @@
  	  echo "Making clean in conformance"; \
  	  cd conformance && $(MAKE) $(AM_MAKEFLAGS) clean; \
  	fi; \
---- /configure.ac
-+++ /configure.ac
-@@ -236,12 +236,5 @@
+diff --git a/configure.ac b/configure.ac
+index 4a6d50a..6301bd6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -236,12 +236,5 @@ if test "x$ANDROID_TEST" = xyes; then
  fi
  AC_SUBST([LIBLOG_LIBS])
  
@@ -45,11 +65,13 @@
 -
  AC_CONFIG_FILES([Makefile src/Makefile benchmarks/Makefile conformance/Makefile protobuf.pc protobuf-lite.pc])
  AC_OUTPUT
---- /src/Makefile.am
-+++ /src/Makefile.am
-@@ -703,19 +703,11 @@
-   google/protobuf/testing/file.cc                              \
-   google/protobuf/testing/file.h
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 1cfd885..73c2c6d 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -720,19 +720,11 @@ COMMON_TEST_SOURCES =                                          \
+   google/protobuf/testing/googletest.cc                        \
+   google/protobuf/testing/googletest.h
  
 -GOOGLETEST_BUILD_DIR=../third_party/googletest/googletest
 -GOOGLEMOCK_BUILD_DIR=../third_party/googletest/googlemock
@@ -68,7 +90,7 @@
  # Disable optimization for tests unless the user explicitly asked for it,
  # since test_util.cc takes forever to compile with optimization (with GCC).
  # See configure.ac for more info.
-@@ -807,12 +799,8 @@
+@@ -825,12 +817,8 @@ $(am_protobuf_test_OBJECTS): unittest_proto_middleman
  # Run cpp_unittest again with PROTOBUF_TEST_NO_DESCRIPTORS defined.
  protobuf_lazy_descriptor_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \
                        libprotoc.la                                   \
@@ -83,7 +105,7 @@
  protobuf_lazy_descriptor_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
  protobuf_lazy_descriptor_test_SOURCES =                        \
    google/protobuf/compiler/cpp/cpp_unittest.cc                 \
-@@ -833,11 +821,7 @@
+@@ -851,11 +839,7 @@ COMMON_LITE_TEST_SOURCES =                                             \
  # full runtime and we want to make sure this test builds without full
  # runtime.
  protobuf_lite_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la     \
@@ -96,7 +118,7 @@
  protobuf_lite_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
  protobuf_lite_test_SOURCES =                                           \
    google/protobuf/lite_unittest.cc                                     \
-@@ -849,11 +833,7 @@
+@@ -867,11 +851,7 @@ $(am_protobuf_lite_test_OBJECTS): unittest_proto_middleman
  # gtest when building the test internally our memory sanitizer doesn't detect
  # memory leaks (don't know why).
  protobuf_lite_arena_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \
@@ -109,7 +131,7 @@
  protobuf_lite_arena_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
  protobuf_lite_arena_test_SOURCES =       \
    google/protobuf/lite_arena_unittest.cc \
-@@ -863,8 +843,7 @@
+@@ -881,8 +861,7 @@ $(am_protobuf_lite_arena_test_OBJECTS): unittest_proto_middleman
  
  # Test plugin binary.
  test_plugin_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
@@ -118,4 +140,7 @@
 +                    -lgtest
  test_plugin_SOURCES =                                          \
    google/protobuf/compiler/mock_code_generator.cc              \
-   google/protobuf/testing/file.cc                              \
+   google/protobuf/compiler/test_plugin.cc                      \
+-- 
+2.34.1
+
diff --git a/dev-libs/protobuf/files/protobuf-3.19.0-disable_no-warning-test.patch b/dev-libs/protobuf/files/protobuf-3.19.0-disable_no-warning-test.patch
new file mode 100644
index 000000000000..eb3dd0c1cb3f
--- /dev/null
+++ b/dev-libs/protobuf/files/protobuf-3.19.0-disable_no-warning-test.patch
@@ -0,0 +1,36 @@
+From 12e381222a8cdce50845dfb7d8fdf863f6f8bb8a Mon Sep 17 00:00:00 2001
+From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
+Date: Fri, 28 Jan 2022 15:08:40 +0800
+Subject: [PATCH] protobuf-3.19.0: disable no-warning test
+
+Disable no-warning-test which is compiled with -Werror option
+and whose only purpose is checking if compilation results in any warnings.
+
+Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
+Signed-off-by: Yixun Lan <dlan@gentoo.org>
+---
+ src/Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 3312e5d..7e86b62 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -722,7 +722,7 @@ GOOGLETEST_SRC_DIR=$(srcdir)/../third_party/googletest/googletest
+ GOOGLEMOCK_SRC_DIR=$(srcdir)/../third_party/googletest/googlemock
+ check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \
+                  protobuf-lite-test test_plugin protobuf-lite-arena-test \
+-                 no-warning-test $(GZCHECKPROGRAMS)
++                 $(GZCHECKPROGRAMS)
+ protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
+                       $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la     \
+                       $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la     \
+@@ -911,4 +911,4 @@ nodist_no_warning_test_SOURCES = no_warning_test.cc $(protoc_outputs)
+ 
+ TESTS = protobuf-test protobuf-lazy-descriptor-test protobuf-lite-test \
+         google/protobuf/compiler/zip_output_unittest.sh $(GZTESTS)     \
+-        protobuf-lite-arena-test no-warning-test
++        protobuf-lite-arena-test
+-- 
+2.34.1
+
diff --git a/dev-libs/protobuf/files/protobuf-3.19.0-system_libraries.patch b/dev-libs/protobuf/files/protobuf-3.19.0-system_libraries.patch
new file mode 100644
index 000000000000..56905c7847db
--- /dev/null
+++ b/dev-libs/protobuf/files/protobuf-3.19.0-system_libraries.patch
@@ -0,0 +1,146 @@
+From c080d329298e841d7d4e1380ff7ec88de5cb3b02 Mon Sep 17 00:00:00 2001
+From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
+Date: Fri, 28 Jan 2022 15:14:59 +0800
+Subject: [PATCH] protobuf-3.19.0: system_libraries
+
+Use system version of GoogleTest,
+which will unbundle gtest, gmock libraries
+
+Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
+Signed-off-by: Yixun Lan <dlan@gentoo.org>
+---
+ Makefile.am     | 20 +-------------------
+ configure.ac    |  7 -------
+ src/Makefile.am | 33 ++++++---------------------------
+ 3 files changed, 7 insertions(+), 53 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 41d4061..b24f8f4 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -11,28 +11,10 @@ SUBDIRS = . src
+ # Always include third_party directories in distributions.
+ DIST_SUBDIRS = src conformance benchmarks third_party/googletest
+ 
+-# Build gmock before we build protobuf tests.  We don't add gmock to SUBDIRS
+-# because then "make check" would also build and run all of gmock's own tests,
+-# which takes a lot of time and is generally not useful to us.  Also, we don't
+-# want "make install" to recurse into gmock since we don't want to overwrite
+-# the installed version of gmock if there is one.
+ check-local:
+-	@echo "Making lib/libgmock.a lib/libgmock_main.a in gmock"
+-	@cd third_party/googletest/googletest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la
+-	@cd third_party/googletest/googlemock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la
+ 
+-# We would like to clean gmock when "make clean" is invoked.  But we have to
+-# be careful because clean-local is also invoked during "make distclean", but
+-# "make distclean" already recurses into gmock because it's listed among the
+-# DIST_SUBDIRS.  distclean will delete gmock/Makefile, so if we then try to
+-# cd to the directory again and "make clean" it will fail.  So, check that the
+-# Makefile exists before recursing.
+ clean-local:
+-	@if test -e third_party/googletest/Makefile; then \
+-	  echo "Making clean in googletest"; \
+-	  cd third_party/googletest && $(MAKE) $(AM_MAKEFLAGS) clean; \
+-	fi; \
+-	if test -e conformance/Makefile; then \
++	@if test -e conformance/Makefile; then \
+ 	  echo "Making clean in conformance"; \
+ 	  cd conformance && $(MAKE) $(AM_MAKEFLAGS) clean; \
+ 	fi; \
+diff --git a/configure.ac b/configure.ac
+index 02085ca..449fb3d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -236,12 +236,5 @@ if test "x$ANDROID_TEST" = xyes; then
+ fi
+ AC_SUBST([LIBLOG_LIBS])
+ 
+-# HACK:  Make gmock's configure script pick up our copy of CFLAGS and CXXFLAGS,
+-#   since the flags added by ACX_CHECK_SUNCC must be used when compiling gmock
+-#   too.
+-export CFLAGS
+-export CXXFLAGS
+-AC_CONFIG_SUBDIRS([third_party/googletest])
+-
+ AC_CONFIG_FILES([Makefile src/Makefile benchmarks/Makefile conformance/Makefile protobuf.pc protobuf-lite.pc])
+ AC_OUTPUT
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 7e86b62..47d759f 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -716,19 +716,11 @@ COMMON_TEST_SOURCES =                                          \
+   google/protobuf/testing/googletest.cc                        \
+   google/protobuf/testing/googletest.h
+ 
+-GOOGLETEST_BUILD_DIR=../third_party/googletest/googletest
+-GOOGLEMOCK_BUILD_DIR=../third_party/googletest/googlemock
+-GOOGLETEST_SRC_DIR=$(srcdir)/../third_party/googletest/googletest
+-GOOGLEMOCK_SRC_DIR=$(srcdir)/../third_party/googletest/googlemock
+ check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \
+                  protobuf-lite-test test_plugin protobuf-lite-arena-test \
+                  $(GZCHECKPROGRAMS)
+ protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
+-                      $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la     \
+-                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la     \
+-                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
+-protobuf_test_CPPFLAGS = -I$(GOOGLETEST_SRC_DIR)/include \
+-                         -I$(GOOGLEMOCK_SRC_DIR)/include
++                      -lgtest -lgmock -lgmock_main
+ # Disable optimization for tests unless the user explicitly asked for it,
+ # since test_util.cc takes forever to compile with optimization (with GCC).
+ # See configure.ac for more info.
+@@ -820,12 +812,8 @@ $(am_protobuf_test_OBJECTS): unittest_proto_middleman
+ # Run cpp_unittest again with PROTOBUF_TEST_NO_DESCRIPTORS defined.
+ protobuf_lazy_descriptor_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \
+                       libprotoc.la                                   \
+-                      $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la        \
+-                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la        \
+-                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
+-protobuf_lazy_descriptor_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include \
+-                                         -I$(GOOGLETEST_SRC_DIR)/include \
+-                                         -DPROTOBUF_TEST_NO_DESCRIPTORS
++                      -lgtest -lgmock -lgmock_main
++protobuf_lazy_descriptor_test_CPPFLAGS = -DPROTOBUF_TEST_NO_DESCRIPTORS
+ protobuf_lazy_descriptor_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
+ protobuf_lazy_descriptor_test_SOURCES =                        \
+   google/protobuf/compiler/cpp/cpp_unittest.cc                 \
+@@ -847,11 +835,7 @@ COMMON_LITE_TEST_SOURCES =                                             \
+ # full runtime and we want to make sure this test builds without full
+ # runtime.
+ protobuf_lite_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la     \
+-                           $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \
+-                           $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \
+-                           $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
+-protobuf_lite_test_CPPFLAGS= -I$(GOOGLEMOCK_SRC_DIR)/include \
+-                             -I$(GOOGLETEST_SRC_DIR)/include
++                           -lgtest -lgmock -lgmock_main
+ protobuf_lite_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
+ protobuf_lite_test_SOURCES =                                           \
+   google/protobuf/lite_unittest.cc                                     \
+@@ -863,11 +847,7 @@ $(am_protobuf_lite_test_OBJECTS): unittest_proto_middleman
+ # gtest when building the test internally our memory sanitizer doesn't detect
+ # memory leaks (don't know why).
+ protobuf_lite_arena_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \
+-                      $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la        \
+-                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la        \
+-                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
+-protobuf_lite_arena_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include  \
+-                                    -I$(GOOGLETEST_SRC_DIR)/include
++                      -lgtest -lgmock -lgmock_main
+ protobuf_lite_arena_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
+ protobuf_lite_arena_test_SOURCES =       \
+   google/protobuf/lite_arena_unittest.cc \
+@@ -877,8 +857,7 @@ $(am_protobuf_lite_arena_test_OBJECTS): unittest_proto_middleman
+ 
+ # Test plugin binary.
+ test_plugin_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
+-                    $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la
+-test_plugin_CPPFLAGS = -I$(GOOGLETEST_SRC_DIR)/include
++                    -lgtest
+ test_plugin_SOURCES =                                          \
+   google/protobuf/compiler/mock_code_generator.cc              \
+   google/protobuf/compiler/test_plugin.cc                      \
+-- 
+2.34.1
+
diff --git a/dev-libs/protobuf/metadata.xml b/dev-libs/protobuf/metadata.xml
index b881bbd59270..4ac93ba8e52d 100644
--- a/dev-libs/protobuf/metadata.xml
+++ b/dev-libs/protobuf/metadata.xml
@@ -5,9 +5,9 @@
 		<email>arfrever.fta@gmail.com</email>
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
-	<maintainer type="person" proxied="proxy">
-		<email>floppym@gentoo.org</email>
-		<name>Mike Gilbert</name>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
 	</maintainer>
 	<slots>
 		<subslots>Soname version number</subslots>
diff --git a/dev-libs/protobuf/protobuf-3.17.0.ebuild b/dev-libs/protobuf/protobuf-3.17.0.ebuild
index 390df7df0b7c..ab50d514273e 100644
--- a/dev-libs/protobuf/protobuf-3.17.0.ebuild
+++ b/dev-libs/protobuf/protobuf-3.17.0.ebuild
@@ -58,6 +58,9 @@ src_prepare() {
 	# https://github.com/protocolbuffers/protobuf/issues/8460
 	sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" -i src/google/protobuf/any_test.cc || die
 
+	# https://github.com/protocolbuffers/protobuf/issues/9392
+	sed -e "s/^AC_PROG_OBJC$/AS_CASE([\$target_os], [darwin*], [AC_PROG_OBJC], [AM_CONDITIONAL([am__fastdepOBJC], [false])])/" -i configure.ac || die
+
 	eautoreconf
 }
 
@@ -74,7 +77,6 @@ src_configure() {
 
 multilib_src_configure() {
 	local options=(
-		OBJC="$(tc-getBUILD_CC)"
 		$(use_enable static-libs static)
 		$(use_with zlib)
 	)
diff --git a/dev-libs/protobuf/protobuf-3.17.1.ebuild b/dev-libs/protobuf/protobuf-3.17.1.ebuild
index 390df7df0b7c..ab50d514273e 100644
--- a/dev-libs/protobuf/protobuf-3.17.1.ebuild
+++ b/dev-libs/protobuf/protobuf-3.17.1.ebuild
@@ -58,6 +58,9 @@ src_prepare() {
 	# https://github.com/protocolbuffers/protobuf/issues/8460
 	sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" -i src/google/protobuf/any_test.cc || die
 
+	# https://github.com/protocolbuffers/protobuf/issues/9392
+	sed -e "s/^AC_PROG_OBJC$/AS_CASE([\$target_os], [darwin*], [AC_PROG_OBJC], [AM_CONDITIONAL([am__fastdepOBJC], [false])])/" -i configure.ac || die
+
 	eautoreconf
 }
 
@@ -74,7 +77,6 @@ src_configure() {
 
 multilib_src_configure() {
 	local options=(
-		OBJC="$(tc-getBUILD_CC)"
 		$(use_enable static-libs static)
 		$(use_with zlib)
 	)
diff --git a/dev-libs/protobuf/protobuf-3.17.2.ebuild b/dev-libs/protobuf/protobuf-3.17.2.ebuild
index 390df7df0b7c..ab50d514273e 100644
--- a/dev-libs/protobuf/protobuf-3.17.2.ebuild
+++ b/dev-libs/protobuf/protobuf-3.17.2.ebuild
@@ -58,6 +58,9 @@ src_prepare() {
 	# https://github.com/protocolbuffers/protobuf/issues/8460
 	sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" -i src/google/protobuf/any_test.cc || die
 
+	# https://github.com/protocolbuffers/protobuf/issues/9392
+	sed -e "s/^AC_PROG_OBJC$/AS_CASE([\$target_os], [darwin*], [AC_PROG_OBJC], [AM_CONDITIONAL([am__fastdepOBJC], [false])])/" -i configure.ac || die
+
 	eautoreconf
 }
 
@@ -74,7 +77,6 @@ src_configure() {
 
 multilib_src_configure() {
 	local options=(
-		OBJC="$(tc-getBUILD_CC)"
 		$(use_enable static-libs static)
 		$(use_with zlib)
 	)
diff --git a/dev-libs/protobuf/protobuf-3.17.3.ebuild b/dev-libs/protobuf/protobuf-3.17.3.ebuild
index a29ab8dcb86c..400858520580 100644
--- a/dev-libs/protobuf/protobuf-3.17.3.ebuild
+++ b/dev-libs/protobuf/protobuf-3.17.3.ebuild
@@ -58,6 +58,9 @@ src_prepare() {
 	# https://github.com/protocolbuffers/protobuf/issues/8460
 	sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" -i src/google/protobuf/any_test.cc || die
 
+	# https://github.com/protocolbuffers/protobuf/issues/9392
+	sed -e "s/^AC_PROG_OBJC$/AS_CASE([\$target_os], [darwin*], [AC_PROG_OBJC], [AM_CONDITIONAL([am__fastdepOBJC], [false])])/" -i configure.ac || die
+
 	eautoreconf
 }
 
@@ -74,7 +77,6 @@ src_configure() {
 
 multilib_src_configure() {
 	local options=(
-		OBJC="$(tc-getBUILD_CC)"
 		$(use_enable static-libs static)
 		$(use_with zlib)
 	)
diff --git a/dev-libs/protobuf/protobuf-3.18.2.ebuild b/dev-libs/protobuf/protobuf-3.18.2.ebuild
new file mode 100644
index 000000000000..0aea6a331d06
--- /dev/null
+++ b/dev-libs/protobuf/protobuf-3.18.2.ebuild
@@ -0,0 +1,147 @@
+# Copyright 2008-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
+	EGIT_SUBMODULES=()
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="BSD"
+SLOT="0/29"
+# -hppa for bug #831728
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="emacs examples static-libs test zlib"
+RESTRICT="!test? ( test )"
+
+BDEPEND="emacs? ( app-editors/emacs:* )"
+DEPEND="test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+RDEPEND="emacs? ( app-editors/emacs:* )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.18.0-disable_no-warning-test.patch"
+	"${FILESDIR}/${PN}-3.18.0-system_libraries.patch"
+	"${FILESDIR}/${PN}-3.16.0-protoc_input_output_files.patch"
+)
+
+DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
+
+src_prepare() {
+	default
+
+	# https://github.com/protocolbuffers/protobuf/issues/7413
+	sed -e "/^AC_PROG_CXX_FOR_BUILD$/d" -i configure.ac || die
+
+	# https://github.com/protocolbuffers/protobuf/issues/8082
+	sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die
+
+	# https://github.com/protocolbuffers/protobuf/issues/8459
+	sed \
+		-e "/^TEST(ArenaTest, BlockSizeSmallerThanAllocation) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" \
+		-e "/^TEST(ArenaTest, SpaceAllocated_and_Used) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" \
+		-i src/google/protobuf/arena_unittest.cc || die
+
+	# https://github.com/protocolbuffers/protobuf/issues/8460
+	sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" -i src/google/protobuf/any_test.cc || die
+
+	# https://github.com/protocolbuffers/protobuf/issues/9392
+	sed -e "s/^AC_PROG_OBJC$/AS_CASE([\$target_os], [darwin*], [AC_PROG_OBJC], [AM_CONDITIONAL([am__fastdepOBJC], [false])])/" -i configure.ac || die
+
+	# https://github.com/protocolbuffers/protobuf/issues/9433
+	sed -e "/^[[:space:]]*static_assert(alignof(T) <= 8, \"\");$/d" -i src/google/protobuf/descriptor.cc || die
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
+
+	if tc-ld-is-gold; then
+		# https://sourceware.org/bugzilla/show_bug.cgi?id=24527
+		tc-ld-disable-gold
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local options=(
+		$(use_enable static-libs static)
+		$(use_with zlib)
+	)
+
+	if tc-is-cross-compiler; then
+		# Build system uses protoc when building, so protoc copy runnable on host is needed.
+		mkdir -p "${WORKDIR}/build" || die
+		pushd "${WORKDIR}/build" > /dev/null || die
+		ECONF_SOURCE="${S}" econf_build "${options[@]}"
+		options+=(--with-protoc="$(pwd)/src/protoc")
+		popd > /dev/null || die
+	fi
+
+	ECONF_SOURCE="${S}" econf "${options[@]}"
+}
+
+src_compile() {
+	multilib-minimal_src_compile
+
+	if use emacs; then
+		elisp-compile editors/protobuf-mode.el
+	fi
+}
+
+multilib_src_compile() {
+	if tc-is-cross-compiler; then
+		emake -C "${WORKDIR}/build/src" protoc
+	fi
+
+	default
+}
+
+multilib_src_test() {
+	emake check
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name "*.la" -delete || die
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins editors/proto.vim
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/proto.vim"
+
+	if use emacs; then
+		elisp-install ${PN} editors/protobuf-mode.el*
+		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
+	fi
+
+	if use examples; then
+		DOCS+=(examples)
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-libs/protobuf/protobuf-3.19.1.ebuild b/dev-libs/protobuf/protobuf-3.19.1.ebuild
index 41c154dc9b6a..affbc3d58502 100644
--- a/dev-libs/protobuf/protobuf-3.19.1.ebuild
+++ b/dev-libs/protobuf/protobuf-3.19.1.ebuild
@@ -19,7 +19,8 @@ HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/pro
 
 LICENSE="BSD"
 SLOT="0/30"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+# -hppa for bug #831728
+KEYWORDS="~alpha amd64 arm arm64 -hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="emacs examples static-libs test zlib"
 RESTRICT="!test? ( test )"
 
@@ -55,6 +56,9 @@ src_prepare() {
 	# https://github.com/protocolbuffers/protobuf/issues/8460
 	sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" -i src/google/protobuf/any_test.cc || die
 
+	# https://github.com/protocolbuffers/protobuf/issues/9392
+	sed -e "s/^AC_PROG_OBJC$/AS_CASE([\$target_os], [darwin*], [AC_PROG_OBJC], [AM_CONDITIONAL([am__fastdepOBJC], [false])])/" -i configure.ac || die
+
 	eautoreconf
 }
 
@@ -71,7 +75,6 @@ src_configure() {
 
 multilib_src_configure() {
 	local options=(
-		OBJC="$(tc-getBUILD_CC)"
 		$(use_enable static-libs static)
 		$(use_with zlib)
 	)
diff --git a/dev-libs/protobuf/protobuf-3.16.0.ebuild b/dev-libs/protobuf/protobuf-3.19.3.ebuild
index 68eb4507463b..9171eaebedbc 100644
--- a/dev-libs/protobuf/protobuf-3.16.0.ebuild
+++ b/dev-libs/protobuf/protobuf-3.19.3.ebuild
@@ -21,8 +21,8 @@ else
 fi
 
 LICENSE="BSD"
-SLOT="0/27"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+SLOT="0/30"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="emacs examples static-libs test zlib"
 RESTRICT="!test? ( test )"
 
@@ -33,8 +33,8 @@ RDEPEND="emacs? ( app-editors/emacs:* )
 	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-3.15.0-disable_no-warning-test.patch"
-	"${FILESDIR}/${PN}-3.16.0-system_libraries.patch"
+	"${FILESDIR}/${PN}-3.19.0-disable_no-warning-test.patch"
+	"${FILESDIR}/${PN}-3.19.0-system_libraries.patch"
 	"${FILESDIR}/${PN}-3.16.0-protoc_input_output_files.patch"
 )
 
@@ -58,6 +58,12 @@ src_prepare() {
 	# https://github.com/protocolbuffers/protobuf/issues/8460
 	sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" -i src/google/protobuf/any_test.cc || die
 
+	# https://github.com/protocolbuffers/protobuf/issues/9392
+	sed -e "s/^AC_PROG_OBJC$/AS_CASE([\$target_os], [darwin*], [AC_PROG_OBJC], [AM_CONDITIONAL([am__fastdepOBJC], [false])])/" -i configure.ac || die
+
+	# https://github.com/protocolbuffers/protobuf/issues/9433
+	sed -e "/^[[:space:]]*static_assert(alignof(T) <= 8, \"\");$/d" -i src/google/protobuf/descriptor.cc || die
+
 	eautoreconf
 }
 
@@ -74,7 +80,6 @@ src_configure() {
 
 multilib_src_configure() {
 	local options=(
-		OBJC="$(tc-getBUILD_CC)"
 		$(use_enable static-libs static)
 		$(use_with zlib)
 	)
diff --git a/dev-libs/protobuf/protobuf-9999.ebuild b/dev-libs/protobuf/protobuf-9999.ebuild
index f2b413703d21..fe2db6a46086 100644
--- a/dev-libs/protobuf/protobuf-9999.ebuild
+++ b/dev-libs/protobuf/protobuf-9999.ebuild
@@ -33,8 +33,8 @@ RDEPEND="emacs? ( app-editors/emacs:* )
 	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-3.17.0-disable_no-warning-test.patch"
-	"${FILESDIR}/${PN}-3.17.0-system_libraries.patch"
+	"${FILESDIR}/${PN}-3.19.0-disable_no-warning-test.patch"
+	"${FILESDIR}/${PN}-3.19.0-system_libraries.patch"
 	"${FILESDIR}/${PN}-3.16.0-protoc_input_output_files.patch"
 )
 
@@ -52,7 +52,6 @@ src_configure() {
 
 multilib_src_configure() {
 	local options=(
-		OBJC="$(tc-getBUILD_CC)"
 		$(use_enable static-libs static)
 		$(use_with zlib)
 	)
diff --git a/dev-libs/quazip/Manifest b/dev-libs/quazip/Manifest
index 3e965bda5b1d..a60db2ba28c3 100644
--- a/dev-libs/quazip/Manifest
+++ b/dev-libs/quazip/Manifest
@@ -1,7 +1,4 @@
-AUX quazip-1.1-cmake.patch 3279 BLAKE2B 5b596da742e87c00c742881a8585d4f48955d99dfd868451ad2eacde64b7f035dfcf38efeb21335ee8c2e68a6aa0606a7d18e2a23198efc5e1d3f3068a93261d SHA512 5c28adf3e6ae96c3be89dab18092be2089e2b622a9c88e9423abdd505db306680c97abc861d4b90829efeca6b3a85907ad927512e95da575eaec39bd231a8b5a
 AUX quazip-1.2-cmake.patch 2978 BLAKE2B 3125b2b84e9316f3db9afbbfc91b379933dec602e288cbfffbc58cd422ea3f26653075d9bce731671e375127c937c6fcc2ff9cf217884be67057c9ecdd43115d SHA512 033c63a46ec0b1ea82f713dc807faf30c266e4bf385b4e9c0b1e6320c12f7c2093d1388a06e65ea32cfe27374324f00eb08baca9a2648bac8d0801a783b19fa7
-DIST quazip-1.1.tar.gz 153870 BLAKE2B c784d21d7c9623472fabf9bbf68c9d191dd0765f6b7114f0ea0b2597bbb31a9957feaea4d0325f98116d71acc4a7057f5c28ce5b84c6317cd25fdade30a279da SHA512 418516759e993c2e5636422c6a14e2caf95f836698b91d2188df5ef9b97879ee326255273793fc802325e14f378cbe2baad7e6ec2e1732e19bf238f70891f22c
 DIST quazip-1.2.tar.gz 155878 BLAKE2B cfd5505509863dfdfcc88cf9f50aeff0ee0c1391412dc8aeb34ab020debd8a29279563323a0ca13a8d3b8b026518f5d079b8fa989aca20a9bec083c6dd4e3695 SHA512 3f4b1a4194ca286163b1c17880ea471a341dcc05d758ee8f3d1e540d0f6aed7ac18200450187034c46b4fab1da39111dca534d75859701259406a6dd50205386
-EBUILD quazip-1.1-r1.ebuild 941 BLAKE2B 19855983f1cfcfd549bfbd4e183c570d663492e507ff1daed5821d76c75dc9bf18b55697cb4e555091e8f2e538111d400979d4cc175556269dbd6ff46d1b0ae8 SHA512 d8545a52bd5ec70501514f3fe45808190c393c892b8a8e3abe0810bbd1d091378ef4d397a8239413f075d4f0453a9ef2a9ef57379180ec13808a3172f6f16eb1
-EBUILD quazip-1.2.ebuild 945 BLAKE2B 8a864f56c7b722b9b196b470df69cfcb14eba0dec5f7e8d1713750835442e5767956f0669d182dbe34831120b7c4f0144f78e73a98ceec422511c05d71156419 SHA512 f670036990d26bab46c4440e972a331b6f0b0274d058fd2d4d23a8555e01aa83ce5b4e38ed86f23ff53e37d42a4c812ff26f7a922a29b665f21063ccfc8c639e
+EBUILD quazip-1.2.ebuild 941 BLAKE2B fdfbd8cc0cb2a17409081c4de485bd573a1ff3145778c71d57e618dcf860638b8bc85923a624e3ef36b1f865b576c65183ed82229dc0cd378f159372b8c80fb6 SHA512 bde570eb2fd7d7944db9cad35fe888044c26c602ddbf31ce4782161e85620db781b46ba951d499519409a00464fdcb84e63c4e6c1e76818ad886fced3fddf46c
 MISC metadata.xml 348 BLAKE2B 756252686a3a4888fa4466e59594dc39bd40675d1a9b4b98124ec014d6fdaa14ad5dfd0659712fe5c2e7d338753d7b101fa3183831964764f68e67bb7b950ac7 SHA512 e10894c3e476992491b0692fcce8091450deee9782c7b580e2b956276b000a851844f9a0c408708c9508be607e3744be4f6849162ee362ac818a2e6ad05eb9a7
diff --git a/dev-libs/quazip/files/quazip-1.1-cmake.patch b/dev-libs/quazip/files/quazip-1.1-cmake.patch
deleted file mode 100644
index 1355f6c13d39..000000000000
--- a/dev-libs/quazip/files/quazip-1.1-cmake.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From cb46ae4bc4c9684010b433eec3a35fc4fa1ebc5d Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sat, 20 Feb 2021 22:53:46 +0100
-Subject: [PATCH] Use CTest module provided BUILD_TESTING (default: ON)
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 38 +++++++++++++++++---------------------
- 1 file changed, 17 insertions(+), 21 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c314fe1..bac3699 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -16,7 +16,7 @@ if(NOT CMAKE_BUILD_TYPE)
- 	set(CMAKE_BUILD_TYPE RELEASE)
- endif()
- 
--enable_testing()
-+include(CTest)
- set(CMAKE_AUTOMOC ON)
- set(CMAKE_INCLUDE_CURRENT_DIR ON)
- set(CMAKE_DEBUG_POSTFIX d)
-@@ -27,33 +27,29 @@ set(QUAZIP_LIB_FILE_NAME quazip${QuaZip_VERSION_MAJOR}-qt${QUAZIP_QT_MAJOR_VERSI
- set(QUAZIP_LIB_TARGET_NAME QuaZip)
- set(QUAZIP_DIR_NAME QuaZip-Qt${QUAZIP_QT_MAJOR_VERSION}-${QUAZIP_LIB_VERSION})
- set(QUAZIP_PACKAGE_NAME QuaZip-Qt${QUAZIP_QT_MAJOR_VERSION})
--set(QUAZIP_ENABLE_TESTS OFF)
- if(QUAZIP_QT_MAJOR_VERSION EQUAL 6)
--	find_package(Qt6 REQUIRED COMPONENTS Core Core5Compat
--                         OPTIONAL_COMPONENTS Network Test)
-+    find_package(Qt6 REQUIRED COMPONENTS Core Core5Compat)
- 	set(QUAZIP_LIB_QT_LIBRARIES Qt6::Core Qt6::Core5Compat)
--	set(QUAZIP_TEST_QT_LIBRARIES Qt6::Core Qt6::Core5Compat Qt6::Network Qt6::Test)
- 	set(QUAZIP_PKGCONFIG_REQUIRES Qt6Core)
--	if (Qt6Network_FOUND AND Qt6Test_FOUND)
--                set(QUAZIP_ENABLE_TESTS ON)
--        endif()
-+    if (BUILD_TESTING)
-+        find_package(Qt6 REQUIRED COMPONENTS Network Test)
-+        set(QUAZIP_TEST_QT_LIBRARIES Qt6::Core Qt6::Core5Compat Qt6::Network Qt6::Test)
-+    endif()
- elseif(QUAZIP_QT_MAJOR_VERSION EQUAL 5)
--	find_package(Qt5 REQUIRED COMPONENTS Core
--                         OPTIONAL_COMPONENTS Network Test)
-+    find_package(Qt5 REQUIRED COMPONENTS Core)
- 	set(QUAZIP_LIB_QT_LIBRARIES Qt5::Core)
--	set(QUAZIP_TEST_QT_LIBRARIES Qt5::Core Qt5::Network Qt5::Test)
- 	set(QUAZIP_PKGCONFIG_REQUIRES Qt5Core)
--        if (Qt5Network_FOUND AND Qt5Test_FOUND)
--                set(QUAZIP_ENABLE_TESTS ON)
--        endif()
-+    if (BUILD_TESTING)
-+        find_package(Qt5 REQUIRED COMPONENTS Network Test)
-+        set(QUAZIP_TEST_QT_LIBRARIES Qt5::Core Qt5::Network Qt5::Test)
-+    endif()
- elseif(QUAZIP_QT_MAJOR_VERSION EQUAL 4)
--	find_package(Qt4 4.5.0 REQUIRED COMPONENTS QtCore
--                           OPTIONAL_COMPONENTS QtNetwork QtTest)
-+    find_package(Qt4 4.5.0 REQUIRED COMPONENTS QtCore)
- 	set(QUAZIP_LIB_QT_LIBRARIES Qt4::QtCore)
--	set(QUAZIP_TEST_QT_LIBRARIES Qt4::QtCore Qt4::QtNetwork Qt4::QtTest)
- 	set(QUAZIP_PKGCONFIG_REQUIRES QtCore)
--    if (QT_QTNETWORK_FOUND AND QT_QTTEST_FOUND)
--            set(QUAZIP_ENABLE_TESTS ON)
-+    if (BUILD_TESTING)
-+        find_package(Qt4 REQUIRED COMPONENTS Network Test)
-+        set(QUAZIP_TEST_QT_LIBRARIES Qt4::QtCore Qt4::QtNetwork Qt4::QtTest)
-     endif()
- else()
- 	message(FATAL_ERROR "Qt version ${QUAZIP_QT_MAJOR_VERSION} is not supported")
-@@ -69,7 +65,7 @@ endif()
- 
- add_subdirectory(quazip)
- 
--if(QUAZIP_ENABLE_TESTS)
--        add_subdirectory(qztest EXCLUDE_FROM_ALL)
-+if(BUILD_TESTING)
-+    add_subdirectory(qztest EXCLUDE_FROM_ALL)
- endif()
- 
--- 
-2.30.1
-
diff --git a/dev-libs/quazip/quazip-1.1-r1.ebuild b/dev-libs/quazip/quazip-1.1-r1.ebuild
deleted file mode 100644
index 29a58b0ea105..000000000000
--- a/dev-libs/quazip/quazip-1.1-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package"
-HOMEPAGE="https://stachenov.github.io/quazip/"
-SRC_URI="https://github.com/stachenov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/1"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dev-qt/qtcore:5
-	sys-libs/zlib[minizip]
-"
-DEPEND="${COMMON_DEPEND}
-	test? (
-		dev-qt/qtnetwork:5
-		dev-qt/qttest:5
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!=dev-libs/quazip-1.1-r0:1
-"
-
-PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DQUAZIP_QT_MAJOR_VERSION=5
-		-DBUILD_TESTING=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	use test && cmake_build qztest
-}
diff --git a/dev-libs/quazip/quazip-1.2.ebuild b/dev-libs/quazip/quazip-1.2.ebuild
index b118be537348..e0d53de5bc70 100644
--- a/dev-libs/quazip/quazip-1.2.ebuild
+++ b/dev-libs/quazip/quazip-1.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=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/stachenov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/rapidjson/Manifest b/dev-libs/rapidjson/Manifest
index 47b487c9e9a7..84fb2b3403b9 100644
--- a/dev-libs/rapidjson/Manifest
+++ b/dev-libs/rapidjson/Manifest
@@ -4,6 +4,6 @@ AUX rapidjson-1.1.0-valgrind_optional.patch 814 BLAKE2B c12e3571050eb63da3e02eb0
 AUX rapidjson-1.1.1-valgrind_optional.patch 868 BLAKE2B 39e46efcd4ebea2f85b40531e46bfcf23eed894e93b6fe4cd8fcb7ac8c614d5e6e98c21c17304f3cf6c7c6415eadaa32b4c496f559f07fd56870820a027dc2c1 SHA512 a71016e4dc17d40afe18ea84c915ff52ce78a28c8e9a0d10342db34954993e2d65dbff7059c6683837334414c73ade934c805d0fa3d758358f7b236d1b57371d
 DIST rapidjson-1.1.0.tar.gz 1019402 BLAKE2B e1564b3cfa020f76437b0a35048a42ff2cd98b5ce285e63f228e158885182e5cecda13407cdf30c03fa39b47cbc579ff0065f6c2682d04b806e8f9ea8d36fc4e SHA512 2e82a4bddcd6c4669541f5945c2d240fb1b4fdd6e239200246d3dd50ce98733f0a4f6d3daa56f865d8c88779c036099c52a9ae85d47ad263686b68a88d832dff
 EBUILD rapidjson-1.1.0-r2.ebuild 1196 BLAKE2B e1f709ff94d5cf7cb1c581cce49415cc76e221f8a2134e5b7c3f2ececd39aa7ac86e945653e331523675c02ace4e1e2256221d700141815a83b61b8fc94ca01f SHA512 e4fab2177decc21c90598409eda202ca59ed4b2c8e99e920ec8ecab72c2a5f6aa30cbd3064af6ddd6f7e388f8523a61cb38d3ecfd63a6af02d59b3aeb02f1189
-EBUILD rapidjson-1.1.0-r3.ebuild 1400 BLAKE2B 2c93de56c2c9702399657a515fd13bb0ee78b23e3a17d153322f312d82c877a93450f16ff4ac0983180a15b101f0d8eec145a6b367ac2a9df120adf4e6dfd4d1 SHA512 37966fcd469fa7ff2f6b975c6b4cc77289b08769483bb3f61c843bd12e8dc8a43597cbb379f77f4c52322dacd5e19861234dbf3d58abc3d48483bbf6936e5628
+EBUILD rapidjson-1.1.0-r3.ebuild 1394 BLAKE2B 27e330e27b9a2945d489b0dfd684c026f56771dea1b0130cd49e7e9b6b820ffa6428db756d92ceb700391d1926322d3e0084cce453e357ffa54adbd200846f2c SHA512 966a30312d91dcdfe512e8817a501e597ce937b592f0b0bdff846f06e5744ef9ee5aa066c4789de2d256db258163d61461324bdb73e951644e63e72c4b9639c3
 EBUILD rapidjson-9999.ebuild 1372 BLAKE2B 63ce9fe9810b4634c309033bbc6d1fe8dfec760054bd729dee5fd09bd3fcade93b01e404bf8668dfd9ee796d5ffc1c7834b2b1d67af8fceeafa2a037a776c640 SHA512 e73764145a92116b5bc65d4c336f775e4ab142b560d9ec26b9a63b41d688ac4579887b8da9b720142ee05401d9460bd4c9aac89db01bb2edf6f23a341a11a15e
 MISC metadata.xml 396 BLAKE2B d177f4924bccb6e3900f0c431d7924334b0b22fb29463afbaaef3f0277aaa762829d1967c5159fee70785cbd650e00386e7085e74ed46f5636a4566f21247e6e SHA512 29f756f76db339ccf8367aef394335a2ffd158f83d6f6babb48ec3eda39b078125b10741e8cd5e87ea136bac243b0df77816efb7ae1ce01ee0507ed0c8e82ae1
diff --git a/dev-libs/rapidjson/rapidjson-1.1.0-r3.ebuild b/dev-libs/rapidjson/rapidjson-1.1.0-r3.ebuild
index da68858dfa4f..a73c6599b674 100644
--- a/dev-libs/rapidjson/rapidjson-1.1.0-r3.ebuild
+++ b/dev-libs/rapidjson/rapidjson-1.1.0-r3.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
@@ -18,7 +18,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/miloyip/rapidjson/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 	S="${WORKDIR}/rapidjson-${PV}"
 fi
 
diff --git a/dev-libs/rocm-comgr/Manifest b/dev-libs/rocm-comgr/Manifest
index acaa0ad43627..7fbbe240f097 100644
--- a/dev-libs/rocm-comgr/Manifest
+++ b/dev-libs/rocm-comgr/Manifest
@@ -1,4 +1,5 @@
 AUX rocm-comgr-3.1.0-dependencies.patch 1241 BLAKE2B adaebf5f5da85687b431ff237b9ddd49b1afeccc81f9306b26aa35f2bce5309ec45f1449d464b59f8a63b86cbcd43bd58014733f4ff0e3babad91be966379ed2 SHA512 f6162acd8af142efac6596b8e95199b3b14dc7d3906f30515b10b422a74fdc97fef1563d392e8c67bbec2b7c0ed532690c16f4a3bbfffc1b274e0c86c345bcef
+AUX rocm-comgr-4.3.0_strip-usr-include.patch 820 BLAKE2B c6f30de65db0dc690a41d1563bab100d1bc3503101867092e45480d256408d77a1104f49bbea9e38be41fd9b693d7a4e6a0d81ff9b6879681b3f07342abbbb73 SHA512 2c58214bbab369365b8bf38565bb141362041f3e56035e5f4e31b839d7440a62eec627c2fdd87ab1d3f5409a9d49844d14a293887acab5cdb2c53cfac3994761
 DIST rocm-comgr-3.10.0.tar.gz 98322 BLAKE2B a7245531eb7e5e7a306a91ca917f03b25a159729a8fbd830cbb02355f807900f439d3d793c416ea277aa0aa64829e697ef8bb32a246a3618ed9bc2c42d25acdf SHA512 b9e0ae6d10a39d55855c35305560af8c5cdbef8f9d41022c40dc60b4fcc629a73a91c6d7235dd0785aba5e14f566f7ce0911a5a1c52c39cebd947f7b585c4d5a
 DIST rocm-comgr-3.9.0.tar.gz 98316 BLAKE2B 424ff5152d99b1ea001985fbd9a6ca1a0925931579205b487505a6c3733d95fe4ee21d91453c538995b3696984acdf4d45cc77c43e1a7c75db78ad1164e3f9e6 SHA512 f49c91ba0db244a0f0d820edeb60013c8a09220e9e1a6be464c48766ac3322b18ed1d0f009e5b1df58340a6dd324a75717194696214e2bb7455cb85e516f071a
 DIST rocm-comgr-4.0.0.tar.gz 98316 BLAKE2B d96200d2fe8929631d1f40577a115b72e2341a66941e9de9de2e61c3d9eab9cb4a0cb51f3b2abc183be832ee86404b5f24d053396615038f4ca6bda23a7331d5 SHA512 fdbb334ff1cb2cd5eb40b9dcf1bbcb138b95d24fac80a90c12c9b5b2ac24226eed4f30ac2fa1923c274fae830e52542d5725436a77c404d1680266b103444549
@@ -10,5 +11,6 @@ EBUILD rocm-comgr-3.9.0.ebuild 1071 BLAKE2B ef1d2f0cce59048be48ac0b312dce8b7fbcd
 EBUILD rocm-comgr-4.0.0.ebuild 1071 BLAKE2B ef1d2f0cce59048be48ac0b312dce8b7fbcd458133cb8d3bd5d9266d91117926760bba9baa6b1a86e2d894a41b83defee0f4b363a28436a739d7ba481fbd2904 SHA512 19351ad8d2202c7a180b29070d922d1f0305ce223aaa392ffa4419537fca181fe2084f6b5c377c94c8a14ab2f17ce7180d3f3004b76c9bd8c00b227d5f688ca7
 EBUILD rocm-comgr-4.1.0.ebuild 1071 BLAKE2B 4282f0fb3617b28a387e0446764478677fe929a71e1d99145bcf5df4058e018f9cf9abb2a8f4f68dc655a14c4bc81c58a19b2a39b9244f34c6c5f19c499ff7e2 SHA512 79ad997d3e711d111501efe7c276d11c9304cf4ab3c5d1bdf9f5919e2c282f5241c3f8b74207c05acdea70f522d1fb195f3650f5a244d0780f1c2465ad7939b6
 EBUILD rocm-comgr-4.2.0.ebuild 1071 BLAKE2B 4282f0fb3617b28a387e0446764478677fe929a71e1d99145bcf5df4058e018f9cf9abb2a8f4f68dc655a14c4bc81c58a19b2a39b9244f34c6c5f19c499ff7e2 SHA512 79ad997d3e711d111501efe7c276d11c9304cf4ab3c5d1bdf9f5919e2c282f5241c3f8b74207c05acdea70f522d1fb195f3650f5a244d0780f1c2465ad7939b6
+EBUILD rocm-comgr-4.3.0-r1.ebuild 1084 BLAKE2B 1386328f3b75963b1b16e9b28b3894fac2f246c8ba5094c7cf8e4f784353086278d064072a295ed391319794df3fc3212dfd85dce41a023863bd6950baa0eb1e SHA512 949ff3b7670c09c7f702c233854a05547415996cbd04d77fd5de1b2f4b3b3557d0bb4129daf0a3b49e16e890017d466d1ec72822f6f4af05a1f92b6d718feace
 EBUILD rocm-comgr-4.3.0.ebuild 1071 BLAKE2B 4282f0fb3617b28a387e0446764478677fe929a71e1d99145bcf5df4058e018f9cf9abb2a8f4f68dc655a14c4bc81c58a19b2a39b9244f34c6c5f19c499ff7e2 SHA512 79ad997d3e711d111501efe7c276d11c9304cf4ab3c5d1bdf9f5919e2c282f5241c3f8b74207c05acdea70f522d1fb195f3650f5a244d0780f1c2465ad7939b6
 MISC metadata.xml 382 BLAKE2B c49984c9ac37bdd2ba8f4345d91d4b6e79f4e8d91e0b89dcd286ef32ede9477c964554cafe52419ca1d696a4b2b7391d45c6a8a4316e3a3103268153fc3bdda2 SHA512 d8d0ce6840a73611e02721c1fd458f9756962583484a61c6fe9051dcca1641091008eea4c01a71d4ee70649eb4c29e99d86e1f24861c05e4a542d0c60d388590
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-4.3.0_strip-usr-include.patch b/dev-libs/rocm-comgr/files/rocm-comgr-4.3.0_strip-usr-include.patch
new file mode 100644
index 000000000000..9d722a57d2a6
--- /dev/null
+++ b/dev-libs/rocm-comgr/files/rocm-comgr-4.3.0_strip-usr-include.patch
@@ -0,0 +1,16 @@
+On Gentoo, ROCM_PATH=/usr we do not need to set -I${ROCM_PATH}/include.
+Actually it is harmful to the `include_next`s.
+
+Index: ROCm-CompilerSupport-rocm-4.3.0/lib/comgr/src/comgr-compiler.cpp
+===================================================================
+--- comgr/src/comgr-compiler.cpp
++++ comgr/src/comgr-compiler.cpp
+@@ -927,8 +927,6 @@ AMDGPUCompiler::addTargetIdentifierFlags
+ 
+ amd_comgr_status_t AMDGPUCompiler::addCompilationFlags() {
+   HIPIncludePath = (Twine(env::getHIPPath()) + "/include").str();
+-  // HIP headers depend on hsa.h which is in ROCM_DIR/include.
+-  ROCMIncludePath = (Twine(env::getROCMPath()) + "/include").str();
+   ClangIncludePath =
+       (Twine(env::getLLVMPath()) + "/lib/clang/" + CLANG_VERSION_STRING).str();
+   ClangIncludePath2 = (Twine(env::getLLVMPath()) + "/lib/clang/" +
diff --git a/dev-libs/rocm-comgr/rocm-comgr-4.3.0-r1.ebuild b/dev-libs/rocm-comgr/rocm-comgr-4.3.0-r1.ebuild
new file mode 100644
index 000000000000..192ddca854e1
--- /dev/null
+++ b/dev-libs/rocm-comgr/rocm-comgr-4.3.0-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/"
+	inherit git-r3
+	S="${WORKDIR}/${P}/lib/comgr"
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ROCm-CompilerSupport-rocm-${PV}/lib/comgr"
+	KEYWORDS="~amd64"
+fi
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.0-dependencies.patch
+	"${FILESDIR}"/${PN}-4.3.0_strip-usr-include.patch
+)
+
+DESCRIPTION="Radeon Open Compute Code Object Manager"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport"
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND=">=dev-libs/rocm-device-libs-${PV}
+	>=sys-devel/llvm-roc-${PV}:="
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLD_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/lld"
+		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/llvm"
+		-DClang_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/clang"
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/skalibs/Manifest b/dev-libs/skalibs/Manifest
index 4a063c8d9cc0..0d9d826e3911 100644
--- a/dev-libs/skalibs/Manifest
+++ b/dev-libs/skalibs/Manifest
@@ -1,3 +1,7 @@
+AUX skalibs-2.11.1.0-respect-user-provided-flags.patch 1207 BLAKE2B caaf3b25d9b588aa2edf974fb1c680da80aa7eb0a46764faa65e7faa3dcd0cd0483114094fdbb855f2300be73f32914127a8a1405ec79f5340b7995278bf0389 SHA512 6637398016c16be07429cbb58d150bb7ca75768b162b2ae0a05c77dfbd0f0346b60cfc53b1ef2df7b887caebda9350cba4b1d396b8d3f16357861a7468695bba
+AUX skalibs-2.9.3.0-respect-user-provided-flags.patch 1215 BLAKE2B 48efa77149dfe60b2c77bdbc778bc71e73fd9d90a2e33ca1c2fd922839c1c7c03d8f85b099640d0994654c7b82fc1404b687207fd36a058ae0c0479ef93d62bc SHA512 b2f2c44a9c99ee56d9773673b8edd335934b9342d1560cd260e4ba773b7596e1fd9765454e47270bf8c2d0f6ce21afaae76a3164b8184c88d6ef602c02f7a1fb
+DIST skalibs-2.11.1.0.tar.gz 218300 BLAKE2B 9ab30a43065745a8d2d846167dc9887b0353ec55ec7d4b26f663870fef8dee5eebbf73056346829c1187946f1a64de05eea5067e7b6ea4d5be522f586915ba27 SHA512 7db390b887234437d52f3b9388f7398e92877cde4c93de76532abff64ee1a127524181c53a0fdddd86bd84247d84f704527bd89c5581e27433081862e9970af7
 DIST skalibs-2.9.3.0.tar.gz 231372 BLAKE2B f0d0b530eab4d0c98346a94af078604d741a6da4ac9625b6b903011b791c16789a8488b562623376bfc1119fca5a2ab1c2dc35b563cb1d8ff36edad2d7793922 SHA512 41e867fcaf16da437840b796a41b2d34ea53aafedde8b4fc86d712934ec533e9f7f2a8b7902542570ea6b5bcba772569fc4f47bccef770b5dee4f9d113b3df11
-EBUILD skalibs-2.9.3.0.ebuild 858 BLAKE2B 5024db40b6e36cc0abcf81cc42e8abac9d2aeab566449a8347d19c90443f69139f9071221801c8bd977ae2a487d817c0b9e0beda89fcfd3b62f2593dccb916c4 SHA512 f8443be69d7cef64b10c4ed86110c3f12ef373d793cf70c545a4d8ad943624492102c76b815d669c73977c9aa88a344269792284621db3dc500a30ef143d7caf
-MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
+EBUILD skalibs-2.11.1.0.ebuild 984 BLAKE2B a6de74599b83362820b14241ee24370dbf2c39b69f68afbfd66b0febe9cb286e1ff87b2b0ce30ac3e856c770e3ca27dd278bffafb7ddb230bcf3a2df1dccbb7c SHA512 10222496b25a0404a4485dde0336e90c85f5ab95721a2e2bdec8c826883e61fc74e3fe489f0926e5cec4440b806bddfbe81e58916d499506bdb7e114be8121c3
+EBUILD skalibs-2.9.3.0.ebuild 1033 BLAKE2B a020fd7b3c911e796d3059d4ae1263b9cb5285f2908af24d8f5b0b767ec87f037da81e3c0a3a0b397756fde1943eff9fc59cf25e74e7236610ad79de2bfea18e SHA512 b4de37ef321d442c12ec8a6e2ceae183b6ec7c577f3f2d849bc0ee89df36732d4abc4b50bfeeeaebe6288084987644c7f38ed18a393502c664e63e8f983a9b83
+MISC metadata.xml 500 BLAKE2B a0a2130490a01139a57fa7cfe6fb63532250b5d26b3d94bce3cc5da02552f53b84c0f6e714604040026c95ef6031adcec3cfae5f002e2d4f830aab5c594c9d20 SHA512 401f71564f9d41c07bf1271789654f4a1ff6bb957ff03945dc62a501c1dd9f3f3a49c5f1a4177d6f79182283cd9ef62243a7083d0f0c3efd076935d304f0cdc9
diff --git a/dev-libs/skalibs/files/skalibs-2.11.1.0-respect-user-provided-flags.patch b/dev-libs/skalibs/files/skalibs-2.11.1.0-respect-user-provided-flags.patch
new file mode 100644
index 000000000000..3092d86f3f6e
--- /dev/null
+++ b/dev-libs/skalibs/files/skalibs-2.11.1.0-respect-user-provided-flags.patch
@@ -0,0 +1,33 @@
+From: Laurent Bercot <ska-skaware@skarnet.org>
+Date: Mon, 24 Jan 2022 11:44:29 +0000
+Subject: [PATCH]  Apply user-provided CPPFLAGS, CFLAGS and LDFLAGS during
+ autodetection
+
+Upstream-commit: d9f541c2b3af (" Apply user-provided CPPFLAGS, CFLAGS and LDFLAGS during autodetection")
+See-also: http://skarnet.org/lists/skaware/1656.html
+---
+diff --git a/configure b/configure
+index 1aa8fc7..430e57e 100755
+--- a/configure
++++ b/configure
+@@ -99,7 +99,7 @@ stripdir () {
+ tryflag () {
+   echo "Checking whether compiler accepts $2 ..."
+   echo "typedef int x;" > "$tmpc"
+-  if $CC_AUTO "$2" -c -o "$tmpo" "$tmpc" >/dev/null 2>&1 ; then
++  if $CC_AUTO $CPPFLAGS_POST $CFLAGS_POST "$2" -c -o "$tmpo" "$tmpc" >/dev/null 2>&1 ; then
+     echo "  ... yes"
+     eval "$1=\"\${$1} \$2\""
+     eval "$1=\${$1# }"
+@@ -113,7 +113,7 @@ tryflag () {
+ tryldflag () {
+   echo "Checking whether linker accepts $2 ..."
+   echo "typedef int x;" > "$tmpc"
+-  if $CC_AUTO -nostdlib "$2" -o "$tmpe" "$tmpc" >/dev/null 2>&1 ; then
++  if $CC_AUTO $CPPFLAGS_POST $CFLAGS_POST $LDFLAGS_POST -nostdlib "$2" -o "$tmpe" "$tmpc" >/dev/null 2>&1 ; then
+     echo "  ... yes"
+     eval "$1=\"\${$1} \$2\""
+     eval "$1=\${$1# }"
+-- 
+2.34.1
+
diff --git a/dev-libs/skalibs/files/skalibs-2.9.3.0-respect-user-provided-flags.patch b/dev-libs/skalibs/files/skalibs-2.9.3.0-respect-user-provided-flags.patch
new file mode 100644
index 000000000000..a36db4853a15
--- /dev/null
+++ b/dev-libs/skalibs/files/skalibs-2.9.3.0-respect-user-provided-flags.patch
@@ -0,0 +1,33 @@
+From: Laurent Bercot <ska-skaware@skarnet.org>
+Date: Mon, 24 Jan 2022 11:44:29 +0000
+Subject: [PATCH]  Apply user-provided CPPFLAGS, CFLAGS and LDFLAGS during
+ autodetection
+
+Backported-from: d9f541c2b3af (" Apply user-provided CPPFLAGS, CFLAGS and LDFLAGS during autodetection")
+See-also: http://skarnet.org/lists/skaware/1656.html
+---
+diff --git a/configure b/configure
+index 55f34f8..49b3678 100755
+--- a/configure
++++ b/configure
+@@ -99,7 +99,7 @@ stripdir () {
+ tryflag () {
+   echo "Checking whether compiler accepts $2 ..."
+   echo "typedef int x;" > "$tmpc"
+-  if $CC_AUTO "$2" -c -o /dev/null "$tmpc" >/dev/null 2>&1 ; then
++  if $CC_AUTO $CPPFLAGS_POST $CFLAGS_POST "$2" -c -o /dev/null "$tmpc" >/dev/null 2>&1 ; then
+     echo "  ... yes"
+     eval "$1=\"\${$1} \$2\""
+     eval "$1=\${$1# }"
+@@ -113,7 +113,7 @@ tryflag () {
+ tryldflag () {
+   echo "Checking whether linker accepts $2 ..."
+   echo "typedef int x;" > "$tmpc"
+-  if $CC_AUTO -nostdlib "$2" -o /dev/null "$tmpc" >/dev/null 2>&1 ; then
++  if $CC_AUTO $CPPFLAGS_POST $CFLAGS_POST $LDFLAGS_POST -nostdlib "$2" -o /dev/null "$tmpc" >/dev/null 2>&1 ; then
+     echo "  ... yes"
+     eval "$1=\"\${$1} \$2\""
+     eval "$1=\${$1# }"
+-- 
+2.34.1
+
diff --git a/dev-libs/skalibs/metadata.xml b/dev-libs/skalibs/metadata.xml
index db463f3eeb66..56d2647aa7fe 100644
--- a/dev-libs/skalibs/metadata.xml
+++ b/dev-libs/skalibs/metadata.xml
@@ -5,4 +5,12 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<maintainer type="person" proxied="yes">
+		<email>arkamar@atlas.cz</email>
+		<name>Petr Vaněk</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/skalibs/skalibs-2.11.1.0.ebuild b/dev-libs/skalibs/skalibs-2.11.1.0.ebuild
new file mode 100644
index 000000000000..69fb41fd5e6c
--- /dev/null
+++ b/dev-libs/skalibs/skalibs-2.11.1.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="General-purpose libraries from skarnet.org"
+HOMEPAGE="https://www.skarnet.org/software/skalibs/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc ipv6 static-libs"
+
+HTML_DOCS=( doc/. )
+
+PATCHES=( "${FILESDIR}/${P}-respect-user-provided-flags.patch" )
+
+src_prepare() {
+	default
+
+	# Avoid QA warning for LDFLAGS addition
+	sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+	sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+	tc-export AR CC RANLIB
+
+	local myconf=(
+		--datadir=/etc
+		--dynlibdir=/usr/$(get_libdir)
+		--libdir=/usr/$(get_libdir)/${PN}
+		--sysdepdir=/usr/$(get_libdir)/${PN}
+		--enable-clock
+		--enable-shared
+		$(use_enable static-libs static)
+		$(use_enable ipv6)
+	)
+
+	econf "${myconf[@]}"
+}
diff --git a/dev-libs/skalibs/skalibs-2.9.3.0.ebuild b/dev-libs/skalibs/skalibs-2.9.3.0.ebuild
index 116469617d0d..fb9bc2eb668a 100644
--- a/dev-libs/skalibs/skalibs-2.9.3.0.ebuild
+++ b/dev-libs/skalibs/skalibs-2.9.3.0.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit toolchain-funcs
+
 DESCRIPTION="General-purpose libraries from skarnet.org"
 HOMEPAGE="https://www.skarnet.org/software/skalibs/"
 SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
@@ -14,15 +16,21 @@ IUSE="doc ipv6 static-libs"
 
 HTML_DOCS=( doc/. )
 
+PATCHES=( "${FILESDIR}/${P}-respect-user-provided-flags.patch" )
+
 src_prepare() {
 	default
 
 	# Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector
 	sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \
 		configure || die
+
+	sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
 }
 
 src_configure() {
+	tc-export AR CC RANLIB
+
 	econf \
 		--datadir=/etc \
 		--dynlibdir=/usr/$(get_libdir) \
diff --git a/dev-libs/userspace-rcu/Manifest b/dev-libs/userspace-rcu/Manifest
index f7985e9fcf72..9455be9b5882 100644
--- a/dev-libs/userspace-rcu/Manifest
+++ b/dev-libs/userspace-rcu/Manifest
@@ -1,6 +1,6 @@
 AUX userspace-rcu-0.13.1-tests-no-benchmark.patch 441 BLAKE2B 8e5737b349d21ae4cdc87b821027bd500f35921afbc1d506977038a79b14e468ea3dfbf7f2d301e905217b3454641ab81c3eceae7a597dc777967133f66b7c20 SHA512 a1749498e1b038b003502d1c40aa664fea36558f403229bb7c28a0540ef341fc578dcc46985a45a8dcd59c3a7e035efd205c40288d58c0e5866af019b65e0d82
 DIST userspace-rcu-0.13.0.tar.bz2 608434 BLAKE2B 11b5d13f4e1a577cc33ad430eb387b26cc2db2ba9ff32c7a09f9cb6c8a418548cd87c198ab4b63be3df884d8e3878046ba817106ff2f07cbab86dd60c9bb1d34 SHA512 7288b5a4a2dca6a75ecaa8553b942b9e7be9cae25776d2448fb0b0c950af9919c369791839607c6c1e6cbd32bbd1e1cafc18ee753f0e3bdc2ed7b65488612580
 DIST userspace-rcu-0.13.1.tar.bz2 609961 BLAKE2B 96581fb3e90764870d2eb3eff6999e3c20bf206e3a0d5c910acfe693d55e0cb389fa5126a74d175f3c46655e740ecf1c1426c367eb3c28f3ef3a634848e51e83 SHA512 c86f2eb260cccb3cb6bd54ddbc0b46e60083fc99423e9403242ebed7f39a2a49c68af933ea6f373e2a9d4f9dc56f5befe030740891e28cf2fabe927a48ff8182
-EBUILD userspace-rcu-0.13.0.ebuild 791 BLAKE2B b711826c1f1d7de9feb6cf1fdf679bc068d08f635b52e3130c7bf7fb3132ee60ac4f05b445ad6abf41908f3e4c71db53ca211076c4c2409110fba1c4544f6cfc SHA512 78d733e2bb48079bec52015c27bf5184e333a64d49713dae4c2688209d9506c1689d72e66af2909e365597c43febbbcb290472362bb2f9fce99eb82d92494afd
-EBUILD userspace-rcu-0.13.1.ebuild 904 BLAKE2B 81564f23e58646f5c9c5d31678250f53ce358aeb04e873b11434ea0aca770ce4cfd81eeaa666ad1754fe0613f1017db5ea3834daa560c69c89db41ae4a20efd5 SHA512 70781b79afe67324c23563c250785e64ab5698ed168c5194a3655b2e5b9b27041409d4a2fd323ec811fed05cfbb3ed0eab893ebdd60c13c9692882ff03a691e4
+EBUILD userspace-rcu-0.13.0.ebuild 921 BLAKE2B 978ef09483a3e55f0531bd053ae90e19b325f0ea8e1d6779c103a92ce69979bd61bb968327b2857c21cad1079758f343857d2855939e2b6a11cacfc32cabe542 SHA512 c36757747954a8f77102fbf5ba9ad02e3536af0441298422cd5cd5e909158568abe69a1e57362ff05507988be35b13496e170c7157c6b11e1d67fcd63d405a27
+EBUILD userspace-rcu-0.13.1.ebuild 981 BLAKE2B c59855ab84e56212d5313055290b9add903f57e22b9434fe3b8b17b15ec00d5eeaa2713d77eec0262ec6e4389944ba141cd6ae9fe5ce7e62cbf13a961861e89e SHA512 4652eabec915bf012ef8606568ab6193b66c570d2237a04c1177aa5b97cc3bc3e89be609226a36fa4bef13e8df97714646a691b2f09185fef1d1db23ace564c0
 MISC metadata.xml 357 BLAKE2B 11e5edf30ea2771ab569b3353e6bd726f3d925347cd4c1f601b4c57b03ff9ae4c68a5a338b4cdf101060af34f4f13e3fe1a7cc8ac5a7b7218bd16ceab2ca048a SHA512 640a8b8fe2188028e7c0da0aba2069167d8799faa37b66c0bed3636c386e9e250865453b3f370a0123f713f72ef35e0a1ee54e7df66a56985e8e42f6816025a0
diff --git a/dev-libs/userspace-rcu/userspace-rcu-0.13.0.ebuild b/dev-libs/userspace-rcu/userspace-rcu-0.13.0.ebuild
index 580b14a63699..0e94ce6b9ec3 100644
--- a/dev-libs/userspace-rcu/userspace-rcu-0.13.0.ebuild
+++ b/dev-libs/userspace-rcu/userspace-rcu-0.13.0.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit autotools
+
 DESCRIPTION="userspace RCU (read-copy-update) library"
 HOMEPAGE="https://liburcu.org/"
 SRC_URI="https://lttng.org/files/urcu/${P}.tar.bz2"
@@ -15,6 +17,13 @@ RESTRICT="!test? ( test )"
 
 DEPEND="test? ( sys-process/time )"
 
+src_prepare() {
+	default
+
+	# Refresh libtool (see https://github.com/gentoo/gentoo/pull/23973)
+	eautoreconf
+}
+
 src_configure() {
 	local myeconfargs=(
 		--enable-shared
diff --git a/dev-libs/userspace-rcu/userspace-rcu-0.13.1.ebuild b/dev-libs/userspace-rcu/userspace-rcu-0.13.1.ebuild
index 434c0ba25a9e..392cecbc2209 100644
--- a/dev-libs/userspace-rcu/userspace-rcu-0.13.1.ebuild
+++ b/dev-libs/userspace-rcu/userspace-rcu-0.13.1.ebuild
@@ -25,6 +25,7 @@ src_prepare() {
 	default
 
 	# Needed for tests patch
+	# ... and refresh libtool (see https://github.com/gentoo/gentoo/pull/23973)
 	eautoreconf
 }
 
diff --git a/dev-libs/utfcpp/Manifest b/dev-libs/utfcpp/Manifest
index 09618952d392..6f8eada954ff 100644
--- a/dev-libs/utfcpp/Manifest
+++ b/dev-libs/utfcpp/Manifest
@@ -1,8 +1,11 @@
+DIST ftest-20211106174116.tar.gz 3232 BLAKE2B 9a2184e82a19465333600b7c31de9a51e6716a4099f23145d93c967636da6539a0e71bfdd082507bf19a440df1199a1abf6f528b3957391f8b2a5c3e4dfb26ec SHA512 d92d3a3abd4f7b35971bfe7d74e1b822931818f60149a56ad29dd3238300ad71de1989fedc602a44a9c1a253da7bce758adf8d5b6da63ca6f322fb06dcefc98a
 DIST utfcpp-3.1.1.tar.gz 26374 BLAKE2B 93ad55c113c922e0105b509adf8dc1505e625bfeed0c60dabe7243ec288e3dd13b79b9382af2fff6daf780c5ebf9da32a492263d4998204222c1e446d16f4473 SHA512 720e2eba5c04f0bc4903a287138149a9cd432bc68bb163fe36b2e0d26d8bf616b4665f389b4a9c97af6ae7869e78973d97db976a4745512a241eebf774608997
 DIST utfcpp-3.1.2.tar.gz 26388 BLAKE2B f0ebf7f054c488259d2a409b2c5201b73e928901cf337cdc2a99a2f64deaf431ee60328b3b61e134d3cd49428eb0c921057ea248269029ef2838ed72dd8af7d7 SHA512 d43df19d9e8652291f1301a326ec0d592bad43d6ecf9086947037f0ae0c1e70c2d96082c48066639e2b7c57c0ea0e4782d6b215d017cf96a4c73ff3a15feec75
 DIST utfcpp-3.1.tar.gz 25871 BLAKE2B 6bafb933b777e842375b3dc6b1b5bc41efb0e9f40bbd33ccbbaf07b57a28c4e485d596725297fc2de83c23fa3c66872519883727714d236f4a37e07ed4825fc9 SHA512 826ac7aa61215ac2144fa3f5edc7f291c3dd25dc69b0c82526840f4651f822515ec262915e1117d975e5c5dd729f6166806a5d397262f59a2b323eb7009671f5
+DIST utfcpp-3.2.1.tar.gz 27377 BLAKE2B 27c4becfa7e1f5e8b63ee0e03b9f66cf5d6743cff3706222dde6e21c3feb51897eddd7dcaeaaacc66513fdb209d5be392e83ba22ab7a7d848bdf9721577d6444 SHA512 5798487f12b1bc55d3e06aed38f7604271ca3402963efcf85d181fd590d8a088d21e961e77698e60dc2cdae8cf4506645903442c45fd328201752d9589180e0d
 EBUILD utfcpp-3.1.1.ebuild 935 BLAKE2B 7baf8b90a10408faea6792eede2b0ec01ed88b7408141c769e0bf3a1ccd397298656a398cc6be46dfe4ebc949ec0260aad01f719a6596f53dc5a7ee323a79ed1 SHA512 9ad08d27cc85de20535298dc2429fa3f7937834170e2260fb444bd387540b023d7b932a86157393f25afe9e1c169cde57ff0cfc914a813a5507d04ab7ad6e72e
 EBUILD utfcpp-3.1.2.ebuild 934 BLAKE2B 799839e521d6c2c881b937c610cc7016907325d5ded407fbd452fda66ec1be1365fa696856b3fa8d18c11a822807c25f8f5c509bb023788b6d471afad856c0ce SHA512 a0b28f7086b5b2e3b4fc8b6cb4f0336a3697eaa9b77c9f711ae5e090561f2b7c62306c2abaea62f2424441fd0ffce5f3c8810878f25b579df8add3e300d441a8
 EBUILD utfcpp-3.1.ebuild 929 BLAKE2B 98b8653c0a5a8dfccbe50f191c8505fa38d5f707c1c229d6b65e6a793a270b6914f6849e0a3a56b12539a57ff88a65b35deec68ff224ff8cf28d3d1561ab9dd4 SHA512 b126f8b1ec192eda63d84dd44023c5c18a9772becb08f9b611cffb72938023212c65b2cda98e6009274983138a90fe8fa8e11759b8d30f2f440354862379e54c
-EBUILD utfcpp-9999.ebuild 898 BLAKE2B 3412683e554ceae20d79a57b4487f614175decaf501be0f4dc33f95ab81a822cdef2a3d736442f2fe7b1c8ecba30f62b9db3ed7638300d9fac3ae289dac7ba39 SHA512 3ddbc5569ebe18570ab9f6f437240c707706df91c23851761e8749c6b9efc11abd1ea1393ed2b9dd8bce497939715de56de8d0121810123773fc63f30496b812
-MISC metadata.xml 490 BLAKE2B 37e2294a4fb66b2f057dce77d4a6104ae7f4cb993aba2383fea9814238926f76d79006fb533fa05509deedad222b0347f6ff6dcf42418e4008862412ace3329a SHA512 b6df12771b42f42e268b239bc7dfe07493b2f56bf366ae24a03f42f71368feaacc596facfb8875e76fed01b807685affe90aab02ffd7f9e5dcd7df52d0844ccc
+EBUILD utfcpp-3.2.1.ebuild 1364 BLAKE2B 1f76d53808d8578de1b735659ca8c79001ed4cba1ce626ddeb51ae74310066e33491f0fb9e700dd0bd65cecb817caa6ce1e26ac60b31536df15d19cec68c2742 SHA512 7bdf80c5da8bd190c8407a343621e061e479d4ba18e88d68767c45948a6abe82305e56145dc31da551ac0bb62285ed6f208a9de628ce5a95548791c3cb2a068a
+EBUILD utfcpp-9999.ebuild 1268 BLAKE2B 991a901db757f36b9ebc115a45b585ec3e0eca396820a3456106fd3c3872c22060f6821a5c3f6d35b7fed3f28bd8792df01ea2547e58325e92d477450fb99366 SHA512 067403e83fdbc062b9d82e676a156f7b867a4efdae70cccff1b3f00010655d9e65930874ae672d203a9a2c27fe4048ad42b709218111dbd98f530e9a2319b72d
+MISC metadata.xml 462 BLAKE2B 647bb7ccdffe7c2a5ca47f431b83c31d298430e4fbfba009bccaac39a3a514239318bab1dc946f5f49ea07169c79a1e1502b7d5d669e9e2afb886f405e8499ae SHA512 52bca2028d95d47e93f52295f9c3082e232e0cf14d24bf8e19eb4443d667703b3f1b34c641ed4a9038813cccb92ac1af2674acd20d6c2060db1f96878061a680
diff --git a/dev-libs/utfcpp/metadata.xml b/dev-libs/utfcpp/metadata.xml
index 3aee5d1f054e..b9907b54a199 100644
--- a/dev-libs/utfcpp/metadata.xml
+++ b/dev-libs/utfcpp/metadata.xml
@@ -5,9 +5,9 @@
 		<email>arfrever.fta@gmail.com</email>
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
-	<maintainer type="person" proxied="proxy">
-		<email>floppym@gentoo.org</email>
-		<name>Mike Gilbert</name>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">nemtrif/utfcpp</remote-id>
diff --git a/dev-libs/utfcpp/utfcpp-3.2.1.ebuild b/dev-libs/utfcpp/utfcpp-3.2.1.ebuild
new file mode 100644
index 000000000000..91f09205a24c
--- /dev/null
+++ b/dev-libs/utfcpp/utfcpp-3.2.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 2015-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit cmake
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/nemtrif/utfcpp"
+	EGIT_SUBMODULES=()
+else
+	FTEST_GIT_REVISION="1e14b77c2ab8489386fc7046a8bced696c0fc4d6"
+	FTEST_DATE="20211106174116"
+fi
+
+DESCRIPTION="UTF-8 C++ library"
+HOMEPAGE="https://github.com/nemtrif/utfcpp"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/nemtrif/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		test? ( https://github.com/nemtrif/ftest/archive/${FTEST_GIT_REVISION}.tar.gz -> ftest-${FTEST_DATE}.tar.gz )"
+fi
+
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND=""
+DEPEND=""
+RDEPEND=""
+
+src_unpack() {
+	if [[ "${PV}" == "9999" ]]; then
+		git-r3_src_unpack
+
+		if use test; then
+			git-r3_fetch https://github.com/nemtrif/ftest refs/heads/master
+			git-r3_checkout https://github.com/nemtrif/ftest "${WORKDIR}/ftest"
+		fi
+	else
+		default
+
+		if use test; then
+			mv ftest-${FTEST_GIT_REVISION} ftest || die
+		fi
+	fi
+
+	rmdir "${S}/extern/ftest" || die
+	ln -s ../../ftest "${S}/extern/ftest" || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUTF8_SAMPLES=OFF
+		-DUTF8_TESTS=$(usex test ON OFF)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/utfcpp/utfcpp-9999.ebuild b/dev-libs/utfcpp/utfcpp-9999.ebuild
index ca5002a61255..0b15d97bb35e 100644
--- a/dev-libs/utfcpp/utfcpp-9999.ebuild
+++ b/dev-libs/utfcpp/utfcpp-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2015-2020 Gentoo Authors
+# Copyright 2015-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
 inherit cmake
 
@@ -10,6 +10,9 @@ if [[ "${PV}" == "9999" ]]; then
 
 	EGIT_REPO_URI="https://github.com/nemtrif/utfcpp"
 	EGIT_SUBMODULES=()
+else
+	FTEST_GIT_REVISION=""
+	FTEST_DATE=""
 fi
 
 DESCRIPTION="UTF-8 C++ library"
@@ -17,7 +20,8 @@ HOMEPAGE="https://github.com/nemtrif/utfcpp"
 if [[ "${PV}" == "9999" ]]; then
 	SRC_URI=""
 else
-	SRC_URI="https://github.com/nemtrif/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/nemtrif/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		test? ( https://github.com/nemtrif/ftest/archive/${FTEST_GIT_REVISION}.tar.gz -> ftest-${FTEST_DATE}.tar.gz )"
 fi
 
 LICENSE="Boost-1.0"
@@ -27,14 +31,27 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 BDEPEND=""
-DEPEND="test? ( dev-cpp/gtest )"
+DEPEND=""
 RDEPEND=""
 
-src_prepare() {
-	sed -e "/add_subdirectory(extern\/gtest)/d" -i CMakeLists.txt || die
-	sed -e "s/gtest_main/gtest &/" -i tests/CMakeLists.txt || die
+src_unpack() {
+	if [[ "${PV}" == "9999" ]]; then
+		git-r3_src_unpack
+
+		if use test; then
+			git-r3_fetch https://github.com/nemtrif/ftest refs/heads/master
+			git-r3_checkout https://github.com/nemtrif/ftest "${WORKDIR}/ftest"
+		fi
+	else
+		default
+
+		if use test; then
+			mv ftest-${FTEST_GIT_REVISION} ftest || die
+		fi
+	fi
 
-	cmake_src_prepare
+	rmdir "${S}/extern/ftest" || die
+	ln -s ../../ftest "${S}/extern/ftest" || die
 }
 
 src_configure() {
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index 2e2669fd4d60..2e4653cba3c8 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -1,11 +1,5 @@
 DIST vala-0.52.10.tar.xz 3598676 BLAKE2B f1d54634ffb8a152e5672badc912338a2982a81f5ee998b05212de807197d3f5cdd5b08ec9b521a004933fa6585b24b1e45a9cbc1a375c9863460350d3d3749b SHA512 d7517c25228db9c69bc68e16ed3903ea5dda016d5e84183491fef0b65edbbaf34065e785b0e0dc48f3af2460dc9ac6c435436f460b01929b2403ef0b9a2ad2d8
-DIST vala-0.52.5.tar.xz 3583412 BLAKE2B ee81903be59267ce3499dfd7ef4e73708431641a16ca3c806a64d1660b85e8977f125cd67de0f2cfec610d37395c5a56028eb1c888a024bd9a1b159e2111e75b SHA512 88522ab5d12a8fbf538ed6ca56a1f402f3749bdfcfc9cdee2ad7ebcf98ebcd606e976fded83f2d853ac32cbaf326d96d1d888a5c56d018389753ac43456fa82f
-DIST vala-0.52.7.tar.xz 3591372 BLAKE2B 73ae3ffe9ecbcbbe385fc7ec16d45e968872705762de38cf2ef0bb6e33dfe6002adf750b2cd6bdf0d5ec17a6904dde07fbe55ea2f41079add4cb3164917cec1b SHA512 6876c898a601d056c12b59a421883256a480eedbf3098fb62082815775fb5037723c7e8820066e52dfd30053b79c63152822a1a11d70b7c4e372378605d966c9
-DIST vala-0.52.8.tar.xz 3599348 BLAKE2B fd21f1a08efc798df0d57a283b19bd2558786e86820c21f7a3fc08c092cf71297e7a3e24585a6a77119a8bfa5f44ca4c2922c31fb5b45a97db7413a4788ecc56 SHA512 648d17f431dd7ad1aab70532ae760d3622b911828001334e9dec98cc22db8be61a00080b1bf1ca14b9589b44a25ff5516d71d1b9f0acd98e1dc88e86f12cdfd3
 DIST vala-0.54.6.tar.xz 3908328 BLAKE2B 19930f2b130c194a4f70a191042c1c7f5243829297daff2e3d1c9210c15bfba3973ecdbe09b8ae7435a88f4785bf06515b166f7a5a770d550404d3132b1c811e SHA512 6943e11c5f351f9f76991b75fbe51c4d133eaf4858ea75e67d514b7216cfabd4f0d81f09c89af26ab22fdf26783938742ae75bb49b7de4f1c2696934e2d4d0ae
-EBUILD vala-common-0.52.10.ebuild 653 BLAKE2B 01e790e858e3e4f602c15f208309927cda5ef9c2a808ba7c524198e9ded3746017dc2dc37740a413a4dc41873cc2e197736348802099165c11272e64447709fa SHA512 ae5cac34fb4d0f7bbcebe84ab30378cce75749d593848991856aca9990143e5213cfc124b2a4eeeb96d30230efefc6219d17335057d9c5c6d4ab44efb29b4708
-EBUILD vala-common-0.52.5.ebuild 645 BLAKE2B c2aaa245d9dc1670a714656177d4fb4e1ef5e9b6858d68636977e198f783151b17958feafbede1a79c45e222e8dd7a67b0d679ff0b7eecd9404611439cbb22c2 SHA512 b44a9a161a22a33a821e5cd3d10b97d7c6390de583eb4708b17b80f6a25143be7a87d26d754dc2e4963655c32adf1e0ce38710df29bd20367a10cdddc17f5815
-EBUILD vala-common-0.52.7.ebuild 653 BLAKE2B 636ec05dcaa3f7c8f972cf86a1e67aad7044b9a0c59b12b6842c65c283065bd9d0235993d4616e8c61ea0e987a6bd0f4578c7228ccc8c015e073580a46360361 SHA512 83d831d84a48749d16fae9abb1d4ca8935e76a46973569de316a32edf91e27287faecd39c595073c912f153d2ceae82812b15f4899c86c97e692427bee584a5a
-EBUILD vala-common-0.52.8.ebuild 653 BLAKE2B 636ec05dcaa3f7c8f972cf86a1e67aad7044b9a0c59b12b6842c65c283065bd9d0235993d4616e8c61ea0e987a6bd0f4578c7228ccc8c015e073580a46360361 SHA512 83d831d84a48749d16fae9abb1d4ca8935e76a46973569de316a32edf91e27287faecd39c595073c912f153d2ceae82812b15f4899c86c97e692427bee584a5a
+EBUILD vala-common-0.52.10.ebuild 645 BLAKE2B 83357d9b5e013241456d8afa2caa3078a652686f76ececd9d5c7b85f0f7d0da13b7ff48f797db27419811ee15ed94e0e7ff2717587ff8eeb4ed2beafca6832a3 SHA512 ee301c5563e517cb3f194d58418353cb95fbc493c4125c1caede2b7f91beb8b56d31285eed240ef8e27fa5361f8de18540cd775e97c7ef097308ca206e4732f4
 EBUILD vala-common-0.54.6.ebuild 653 BLAKE2B 01e790e858e3e4f602c15f208309927cda5ef9c2a808ba7c524198e9ded3746017dc2dc37740a413a4dc41873cc2e197736348802099165c11272e64447709fa SHA512 ae5cac34fb4d0f7bbcebe84ab30378cce75749d593848991856aca9990143e5213cfc124b2a4eeeb96d30230efefc6219d17335057d9c5c6d4ab44efb29b4708
 MISC metadata.xml 326 BLAKE2B cd8c49993b750ebef93c620f819f42b858431d1aab4d2066a124a5118d5d18f4970b9d1eccb77121089264db7cfbe69ca06fb2fc2d2c4db98047629af9878db5 SHA512 52854d43fb74af5402cb1855409ab25d6741ea6fe48ae50416044d7b518745b02752e69cb9680e9c132e3a2f65ae29d92e9e771ac883e2ef01ae91effdf1097f
diff --git a/dev-libs/vala-common/vala-common-0.52.10.ebuild b/dev-libs/vala-common/vala-common-0.52.10.ebuild
index 40415607535f..b607b6d6c6e8 100644
--- a/dev-libs/vala-common/vala-common-0.52.10.ebuild
+++ b/dev-libs/vala-common/vala-common-0.52.10.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 
 RDEPEND=""
 DEPEND=""
diff --git a/dev-libs/vala-common/vala-common-0.52.5.ebuild b/dev-libs/vala-common/vala-common-0.52.5.ebuild
deleted file mode 100644
index 71dbcfb591c6..000000000000
--- a/dev-libs/vala-common/vala-common-0.52.5.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME_ORG_MODULE="vala"
-
-inherit gnome.org
-
-DESCRIPTION="Build infrastructure for packages that use Vala"
-HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-
-RDEPEND=""
-DEPEND=""
-BDEPEND=""
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/aclocal
-	doins vala.m4 vapigen/vapigen.m4
-	insinto /usr/share/vala
-	doins vapigen/Makefile.vapigen
-}
diff --git a/dev-libs/vala-common/vala-common-0.52.7.ebuild b/dev-libs/vala-common/vala-common-0.52.7.ebuild
deleted file mode 100644
index 043fa5ecbb04..000000000000
--- a/dev-libs/vala-common/vala-common-0.52.7.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME_ORG_MODULE="vala"
-
-inherit gnome.org
-
-DESCRIPTION="Build infrastructure for packages that use Vala"
-HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-
-RDEPEND=""
-DEPEND=""
-BDEPEND=""
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/aclocal
-	doins vala.m4 vapigen/vapigen.m4
-	insinto /usr/share/vala
-	doins vapigen/Makefile.vapigen
-}
diff --git a/dev-libs/vala-common/vala-common-0.52.8.ebuild b/dev-libs/vala-common/vala-common-0.52.8.ebuild
deleted file mode 100644
index 043fa5ecbb04..000000000000
--- a/dev-libs/vala-common/vala-common-0.52.8.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME_ORG_MODULE="vala"
-
-inherit gnome.org
-
-DESCRIPTION="Build infrastructure for packages that use Vala"
-HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-
-RDEPEND=""
-DEPEND=""
-BDEPEND=""
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/aclocal
-	doins vala.m4 vapigen/vapigen.m4
-	insinto /usr/share/vala
-	doins vapigen/Makefile.vapigen
-}
diff --git a/dev-libs/voikko-fi/Manifest b/dev-libs/voikko-fi/Manifest
index 1f02814e6e04..e2338c9e8d55 100644
--- a/dev-libs/voikko-fi/Manifest
+++ b/dev-libs/voikko-fi/Manifest
@@ -1,4 +1,7 @@
 DIST voikko-fi-2.4.tar.gz 701807 BLAKE2B 978871a733b12be53287ec2d4637428f6991cdb3098a97cc7fc673d7b1e1ac85eb6811653c1121a1f04b23f40e1b6ff6340a5514c2d1231cf7be37879c70cf20 SHA512 00098fd52d4f81b30fe7f0ecb97ee8f240d898dfd511da1fdc5e6fd7046f2bf94c0230dc733bc6034f178d56d26c3ee69965eb61c04fc7b30087131767701858
 DIST voikko-fi-2.4.tar.gz.asc 833 BLAKE2B f4f470118716cf3ad2348b8ae74f57d95a03adff3ffee66a1f09ae569e240a99ff08e026cd7bf575347ec9941bf6e0174c0b3b468a3434304dd8356db3e4d35d SHA512 bb68fe81c0d8cea206b93484d94d5bfc9a9272827616f3ce8016721027a736b190ae37679baed70df0350c3f84235fdb3d6a525d93123ff561ef6d83b7717562
+DIST voikko-fi-2.5.tar.gz 703898 BLAKE2B 596425311bcdbbf8af97bc32cd69c59cdfa56300afbce22501f084b138ffbd7a915f08628e40a832110e9d366d128747d7e7a0ebdfa38a7734c4f1c1cb303997 SHA512 6de3c6c13a9fb05a463a55177dc1707d5e4ca01c7ccf08e0f8ab73cb3a353ee4935adc23a1b5f6c5da568dbb075c081a700d8d46eb99b6bcbed0efb4d977f59a
+DIST voikko-fi-2.5.tar.gz.asc 833 BLAKE2B 329d442064adee3967b703e19edcdfb20a03e3337751282129e2816f265fcd4ada9c2ce82c146bcde8a644e47b462404ce9abf99f5bc6d2fe2f986f83b73d1e1 SHA512 ccdaa4e76b81f8ee8fcc20c1d870200a1255f9aa84c8dae139f343e8b2cc9ecefb38a16af8653e9c94a1e5cba25c850b8309d406e3d5b323864c8c0ad38979eb
 EBUILD voikko-fi-2.4.ebuild 868 BLAKE2B d7184dcceec265824877e5d6234f68877abb798d687557bd635e64cb5588bb9a99a6c142a76bc53f057339051aea940ec4520d9260ca2cca5e324c7ed7a7db63 SHA512 37027aa58408aa4538a8a2962807e3ae95e7fd8cd95d508253eefd224ff291f39fdfdd1149412f17364d254df703095198a5a6fe3c60decd71a0d6ff84db643d
+EBUILD voikko-fi-2.5.ebuild 870 BLAKE2B 7fc9b1968ea849a782f95e1273f7d8de8a3b40130bc49f10c870b4006242c4cdd5d22429f59892190d73ba51727f8425837f23614b387a594fd6c5088c820954 SHA512 62d5868ce4aa4c54c3b8f3c310b985f31c9c9390ed25df0ca63a988f73060d4b3ef84bfae1c3ba01d65fc1f4d9565edd94aff2b77de5c2f86bdec3822db257fc
 MISC metadata.xml 255 BLAKE2B 6fe10a1f843a8b2494606052a69206e32fdd5edf3ca6bdfb661cf6f8e39c0e16fb652acb8697d339770f3559c56a4ba964a0e959b3e0bb456d09ee7570f0d9e9 SHA512 235170971553178916cc484a07e1c665c94cd0a7ec442d2190d3608f7a3441dd2fe08fea666ca23d151077c10c908bc1da0e57355fab43be02711be35531b362
diff --git a/dev-libs/voikko-fi/voikko-fi-2.5.ebuild b/dev-libs/voikko-fi/voikko-fi-2.5.ebuild
new file mode 100644
index 000000000000..3b00b9ca71b0
--- /dev/null
+++ b/dev-libs/voikko-fi/voikko-fi-2.5.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml"
+
+inherit python-any-r1 verify-sig
+
+DESCRIPTION="Finnish dictionary for libvoikko based spell checkers (vvfst format)"
+HOMEPAGE="https://voikko.puimula.org/"
+SRC_URI="https://www.puimula.org/voikko-sources/${PN}/${P}.tar.gz
+	verify-sig? ( https://www.puimula.org/voikko-sources/voikko-fi/${P}.tar.gz.asc )"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-libs/foma
+	dev-libs/libvoikko"
+RDEPEND="${DEPEND}"
+BDEPEND="${PYTHON_DEPS}
+	dev-libs/libvoikko
+	verify-sig? ( sec-keys/openpgp-keys-voikko )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/voikko.asc
+
+src_compile() {
+	emake vvfst
+}
+
+src_install() {
+	emake DESTDIR="${D}/usr/share/voikko/" vvfst-install
+	einstalldocs
+}
diff --git a/dev-libs/wayland-protocols/Manifest b/dev-libs/wayland-protocols/Manifest
index 7f31913d8b13..45ef2e4fa739 100644
--- a/dev-libs/wayland-protocols/Manifest
+++ b/dev-libs/wayland-protocols/Manifest
@@ -1,6 +1,6 @@
 DIST wayland-protocols-1.23.tar.xz 74116 BLAKE2B a92f9d80e8d9062fb79c06e13141b46e0f43d0813f461e087a9fa724fa752df3b4fe5698e34e7431f3b43cca0adf7b86ab77c948060f6c02e4c7693f7975cd15 SHA512 11f09147da1dd01a9f5c921eb0bfc6244a72023a052ef96bc121e16437a2c43d0dbba748c2de832539f57371e90b16bd13069bec07391305717f8fca295ea2a6
 DIST wayland-protocols-1.24.tar.xz 77120 BLAKE2B 912132cb2b65b99184f25942e02000444ce5d37b60f33363999e8431db5835d3c0dab41dae312f0dbb02d03ab7e4f3f588e7b507e767ec132a82fd816700b09a SHA512 4b1122517db56f48a5fafd4bd0cb7f94faef6fdd2d80e6cec17e5a6bafbaf2f5a71b958ed12e6d13965494885c209b2fb6dd8331487b39c6f251e71f1e770a15
 EBUILD wayland-protocols-1.23.ebuild 748 BLAKE2B 66baf0847f72f4228caf589c9a331220d3554f4f0136995278544a758a31c87a93ea63154f254a0252bf77c0227b9b602183ecfb7b97efd64096a9c981ab590f SHA512 fabe125b1da30781e621f6d09c19ab23f41806dbc340100647a5dfe234d542956cbb8bd6e0983247d0da07c1031dfeac3ab8253ba1617620b8779f77187cebde
-EBUILD wayland-protocols-1.24.ebuild 755 BLAKE2B 3d37738cffe0026ce26377478390368b84bb188e337b29c28e8b64e7d35095c1222ba3d893245f26214273786e7587d1f760603906874c9e3aebbbd67646f740 SHA512 e5533d3931b9542b6b22e4d6a37db75c4548ea3a2fa648ddbaf8bd955eeb107c76f9c8e9f3b5c04a3e62fe930b0a2140fbe59fdcf48a3ee40ec3f988d431b217
+EBUILD wayland-protocols-1.24.ebuild 748 BLAKE2B 8b993cf653000a28fb907eca38e142b92a78d91f3e8a57bdf77650b3310b9c8fab3e5445e3daabe6fd11af00d2ced745e00ab0cf4b5a84086a6425107b65d891 SHA512 dc0b169ce9c4ad4fc89f47d0a09cdea9217046d0dc40cf6d79cf1b8f780cf5f9b94ff05d2d278cb53c798cdf265198db836bc4da4367e8d5943c5d26a6802434
 EBUILD wayland-protocols-9999.ebuild 755 BLAKE2B 3d37738cffe0026ce26377478390368b84bb188e337b29c28e8b64e7d35095c1222ba3d893245f26214273786e7587d1f760603906874c9e3aebbbd67646f740 SHA512 e5533d3931b9542b6b22e4d6a37db75c4548ea3a2fa648ddbaf8bd955eeb107c76f9c8e9f3b5c04a3e62fe930b0a2140fbe59fdcf48a3ee40ec3f988d431b217
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/dev-libs/wayland-protocols/wayland-protocols-1.24.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.24.ebuild
index f9b1910a51a1..5e506be1a991 100644
--- a/dev-libs/wayland-protocols/wayland-protocols-1.24.ebuild
+++ b/dev-libs/wayland-protocols/wayland-protocols-1.24.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
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/wayland/Manifest b/dev-libs/wayland/Manifest
index 2a4c3af81f02..d56ee48e8999 100644
--- a/dev-libs/wayland/Manifest
+++ b/dev-libs/wayland/Manifest
@@ -1,6 +1,6 @@
 DIST wayland-1.19.0.tar.xz 456380 BLAKE2B 0f70bb02e890898c4763001884527067adb686abe9a2b9325badf1730d411d269c437037afc298eec8075eb1e3845f5b81b8ed3d702908388a54e7063cbea91a SHA512 d8a86f5e23e4a88e7c84b82fdb51eb350419086afe462ecb2f4d5c3ba9290ede310cbbcffd60215219ddccf5bad4adec21a5ebfbef6577200f66ac7a1b64a5ef
 DIST wayland-1.20.0.tar.xz 225188 BLAKE2B d607610ad8b30b6b3bbfc3945679f698030f271766cfb72425f98f170a96469fb085fb9a746a866b8562d7f452c844e61ad57f634dcf365474c7d050b76022e9 SHA512 e8a1f410994b947f850799bdd0d95a2429d8467f853e62a0ab3915a4e9fe130f8aa977e03715114ab740c6ec546edea63d275ce7f927d4f3029ea126e6a7d215
 EBUILD wayland-1.19.0.ebuild 1469 BLAKE2B a44e69efbd172377a84d8bfe46ca35a9f10652f37ffc949d7b59d9130ea460ab42db6affacf076bc2bd574c70629d814cf829d452a88ae7cfc0c135097a08d72 SHA512 3a368fef2f2170c29ffc2598b0cf634109c10cb1d845803299a07a3a6634864650283190fe81cda401c2e4de488cdd0f632145a590caee959c25387461fe380f
-EBUILD wayland-1.20.0.ebuild 1516 BLAKE2B e22d931ee9acbbb3649fb888e0bbbe911a7ce34824fff5187c1476e0614d152b2f7afa9537561e3ec8791ec51fe0683c812e35081f456b729e193fbc649442c4 SHA512 08c911a8941744012b548c16278b9c687cbcac2487cef6cd4409081aad531a22b663aa5008ee7c14866364a7ef5ac95d73f69a9c50c296ab0ba3c7a71ce9e9e4
+EBUILD wayland-1.20.0.ebuild 1509 BLAKE2B aec03209348120b00dd9381950c85463a1e36898db8ef098c5eabb0a13b7a32de6672a85ce4930c12f9c63bf9208ecfdbaafee1fb29c9738d856414c791ecf8d SHA512 251bc4c671f62c101544411971fe08a6da4a42226f2133a8df9b723fd2f834356a66f66095c97257268fe42cbc943e2c1d15d8520d9bdceb4e61fb9666abbdfd
 EBUILD wayland-9999.ebuild 1516 BLAKE2B e22d931ee9acbbb3649fb888e0bbbe911a7ce34824fff5187c1476e0614d152b2f7afa9537561e3ec8791ec51fe0683c812e35081f456b729e193fbc649442c4 SHA512 08c911a8941744012b548c16278b9c687cbcac2487cef6cd4409081aad531a22b663aa5008ee7c14866364a7ef5ac95d73f69a9c50c296ab0ba3c7a71ce9e9e4
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/dev-libs/wayland/wayland-1.20.0.ebuild b/dev-libs/wayland/wayland-1.20.0.ebuild
index 49ec2b8a68f5..a003f452d7a3 100644
--- a/dev-libs/wayland/wayland-1.20.0.ebuild
+++ b/dev-libs/wayland/wayland-1.20.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 inherit meson-multilib
 
diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index b863466baa37..7ce2065737a1 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -1,3 +1,5 @@
 DIST xapian-bindings-1.4.18.tar.xz 1135644 BLAKE2B 7120c42d73794f8212bf15afb4566119e44cd39c711d50aab4fcc4320419babc440d4dd732af9e739c68397e740da192fa80cd08c5d2b59e1ae13af4444ff3d6 SHA512 e965384febaa83c28fd63b82192bfa4d5d34b4eb7cfacf1ddfc1201deada4f0498df8e50a191713dc95feb8edb0b1a4e9d6983a639c564f086ee305b8a05397e
+DIST xapian-bindings-1.4.19.tar.xz 1137596 BLAKE2B 46004a3449a3137db42164a8b4c5b8684d2eaf0edfa60fe7ca41d5565d1cc16b110ca8204100c9e654baa323a4c73536f80550b17989ce3ee4a132315c31a50e SHA512 c3e353a192822be5d86d448b9d5e4c5eb15d5eb2d079560f7c457f8f7ca85d42e2b933891e784d384c188577f427ca1929c2b47732b9d637e36543e8b5b704d6
 EBUILD xapian-bindings-1.4.18-r1.ebuild 7061 BLAKE2B 8ab8e0fa2a6ab5bd3bf0298e2afd9dad783abb9660ac104a16046922838b23592c6b7099a47d113039d60be14ab549aace5da5ff602284e48242c4a027429a3d SHA512 57ff3aaa344665e81859569e5d9db86d5efe5c901ddc4c2f5f2970fea0ebe60f62252db1428b74c613da3acfa3f193f45ed66f655b29a562e82c37960fac32d7
+EBUILD xapian-bindings-1.4.19.ebuild 7064 BLAKE2B 408f2d342ab62066908adba9e9569dc13dd218305df9fcc95c6a2fe4b9c0d1114a6b024865a78c469b7f0866b2b3a0b8680e4875bfc270da3129d088bfda778d SHA512 74c71589d1ca899c0472c5ae25f30b860fdd76a7bd6ce49f63250ccc7b96df8586e4514789bc15cc8efd0896f42ce5eee360fa904c62e58d484b5111d5cc3e97
 MISC metadata.xml 253 BLAKE2B abd5250029676d23201d38d764a87f155a72fdb12c27eb98faea12eb441fd986c1cf2f230265e7e7d257e5dcc81b6710ec90ebf8dbc3a6597a04c4fff95eb771 SHA512 96c2922337805fd36723b0f847b2b15365e7207a21d57f6c6ab7e3cf8ca089b781635eaaf3ef01cbe61c34ee8b3f4c1c6234242db390ccc3c3bf0b1ab660b467
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.19.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.19.ebuild
new file mode 100644
index 000000000000..a22b427d3f7b
--- /dev/null
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.19.ebuild
@@ -0,0 +1,343 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1,3,4} luajit )
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_REQ_USE="threads(+)"
+
+USE_PHP="php7-3 php7-4 php8-0"
+
+PHP_EXT_NAME="xapian"
+PHP_EXT_INI="yes"
+PHP_EXT_OPTIONAL_USE="php"
+
+USE_RUBY="ruby26 ruby27 ruby30"
+RUBY_OPTIONAL="yes"
+
+inherit java-pkg-opt-2 lua mono-env multibuild php-ext-source-r3 python-r1 ruby-ng
+
+DESCRIPTION="SWIG and JNI bindings for Xapian"
+HOMEPAGE="https://www.xapian.org/"
+SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="java lua mono perl php python ruby tcl"
+REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )
+	lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	ruby? ( || ( $(ruby_get_use_targets) ) )"
+
+COMMONDEPEND=">=dev-libs/xapian-1.4.19
+	lua? ( ${LUA_DEPS} )
+	perl? ( dev-lang/perl:= )
+	php? ( dev-lang/php:=[-threads] )
+	python? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+	)
+	ruby? ( $(ruby_implementations_depend) )
+	tcl? ( dev-lang/tcl:= )
+	mono? ( dev-lang/mono )"
+DEPEND="${COMMONDEPEND}
+	virtual/pkgconfig
+	java? ( >=virtual/jdk-1.6 )"
+RDEPEND="${COMMONDEPEND}
+	java? ( >=virtual/jre-1.6 )"
+
+S="${WORKDIR}/${P}"
+
+has_basic_bindings() {
+	# Update this list if new bindings are added that are not built
+	# multiple times for multiple versions like lua, php, python and ruby are
+	return $(use mono || use java || use perl || use tcl)
+}
+
+php_copy_sources() {
+	local MULTIBUILD_VARIANTS=($(php_get_slots))
+	multibuild_copy_sources
+}
+
+php_foreach_impl() {
+	local MULTIBUILD_VARIANTS=($(php_get_slots))
+	multibuild_foreach_variant "$@"
+}
+
+ruby_copy_sources() {
+	local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations))
+	multibuild_copy_sources
+}
+
+ruby_foreach_impl() {
+	local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations))
+	multibuild_foreach_variant "$@"
+}
+
+pkg_setup() {
+	use mono && mono-env_pkg_setup
+	use java && java-pkg-opt-2_pkg_setup
+}
+
+src_unpack() {
+	default
+
+	if use php; then
+		local php_slot
+		for php_slot in $(php_get_slots); do
+			# Unfortunately required for php-ext-source-r3_createinifiles().
+			mkdir "${WORKDIR}/${php_slot}"
+		done
+	fi
+}
+
+src_prepare() {
+	use java && java-pkg-opt-2_src_prepare
+
+	# https://trac.xapian.org/ticket/702
+	export XAPIAN_CONFIG="/usr/bin/xapian-config"
+
+	if use lua; then
+		lua_copy_sources
+	fi
+
+	if use php; then
+		php_copy_sources
+	fi
+
+	if use python; then
+		python_copy_sources
+	fi
+
+	if use ruby; then
+		ruby_copy_sources
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	if has_basic_bindings ; then
+		local conf=(
+			--disable-documentation
+			$(use_with mono csharp)
+			$(use_with java)
+			$(use_with perl)
+			$(use_with tcl)
+			--without-lua
+			--without-php
+			--without-php7
+			--without-python
+			--without-python3
+			--without-ruby
+		)
+
+		if use java; then
+			local -x CXXFLAGS="${CXXFLAGS} $(java-pkg_get-jni-cflags)"
+		fi
+
+		if use perl; then
+			local -x PERL_ARCH="$(perl -MConfig -e 'print $Config{installvendorarch}')"
+			local -x PERL_LIB="$(perl -MConfig -e 'print $Config{installvendorlib}')"
+		fi
+
+		econf "${conf[@]}"
+	fi
+
+	lua_configure() {
+		local myconf=(
+			--disable-documentation
+			--without-csharp
+			--without-java
+			--without-perl
+			--without-tcl
+			--without-php
+			--without-php7
+			--without-python
+			--without-python3
+			--without-ruby
+			--with-lua
+		)
+
+		local -x LUA_INC="$(lua_get_include_dir)"
+		local -x LUA_LIB="$(lua_get_cmod_dir)"
+
+		econf "${myconf[@]}"
+
+	}
+
+	if use lua; then
+		lua_foreach_impl run_in_build_dir lua_configure
+	fi
+
+	php_configure() {
+		local myconf=(
+			--disable-documentation
+			--without-java
+			--without-lua
+			--without-csharp
+			--without-perl
+			--without-python
+			--without-python3
+			--without-ruby
+			--without-tcl
+		)
+		if [[ ${MULTIBUILD_VARIANT} == php5.* ]]; then
+			myconf+=(
+				--with-php
+				--without-php7
+			)
+			local -x PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT/-/.}/bin/php-config"
+		elif [[ ${MULTIBUILD_VARIANT} == php7.* ]]; then
+			myconf+=(
+				--without-php
+				--with-php7
+			)
+			local -x PHP_CONFIG7="${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT/-/.}/bin/php-config"
+		fi
+
+		econf "${myconf[@]}"
+	}
+
+	if use php; then
+		addpredict /usr/share/snmp/mibs/.index
+		addpredict /var/lib/net-snmp/mib_indexes
+
+		php_foreach_impl run_in_build_dir php_configure
+	fi
+
+	python_configure() {
+		local myconf=(
+			--disable-documentation
+			--without-java
+			--without-lua
+			--without-csharp
+			--without-perl
+			--without-php
+			--without-php7
+			--without-ruby
+			--without-tcl
+			--with-python3
+		)
+
+		# Avoid sandbox failures when compiling modules
+		addpredict "$(python_get_sitedir)"
+
+		econf "${myconf[@]}"
+	}
+
+	if use python; then
+		python_foreach_impl run_in_build_dir python_configure
+	fi
+
+	ruby_configure() {
+		local myconf=(
+			--disable-documentation
+			--without-java
+			--without-lua
+			--without-csharp
+			--without-perl
+			--without-php
+			--without-php7
+			--without-python
+			--without-python3
+			--with-ruby
+			--without-tcl
+		)
+		local -x RUBY="${EPREFIX}/usr/bin/${MULTIBUILD_VARIANT}"
+
+		econf "${myconf[@]}"
+	}
+
+	if use ruby; then
+		ruby_foreach_impl run_in_build_dir ruby_configure
+	fi
+}
+
+src_compile() {
+	if has_basic_bindings ; then
+		default
+	fi
+
+	if use lua; then
+		lua_foreach_impl run_in_build_dir emake
+	fi
+
+	if use php; then
+		php_foreach_impl run_in_build_dir emake
+	fi
+
+	if use python; then
+		unset PYTHONDONTWRITEBYTECODE
+		python_foreach_impl run_in_build_dir emake
+	fi
+
+	if use ruby; then
+		ruby_foreach_impl run_in_build_dir emake
+	fi
+}
+
+src_test() {
+	if has_basic_bindings ; then
+		default
+	fi
+
+	if use lua; then
+		lua_foreach_impl run_in_build_dir emake check
+	fi
+
+	if use php; then
+		php_foreach_impl run_in_build_dir emake check
+	fi
+
+	if use python; then
+		python_foreach_impl run_in_build_dir emake check
+	fi
+
+	if use ruby; then
+		ruby_foreach_impl run_in_build_dir emake check
+	fi
+}
+
+src_install() {
+	if has_basic_bindings ; then
+		emake DESTDIR="${D}" install
+	fi
+
+	if use java; then
+		java-pkg_dojar java/built/xapian.jar
+		# TODO: make the build system not install this...
+		java-pkg_doso java/.libs/libxapian_jni.so
+		rm -rf "${ED}/var" || die "could not remove java cruft!"
+	fi
+
+	if use lua; then
+		lua_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
+	fi
+
+	if use php; then
+		php_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
+		php-ext-source-r3_createinifiles
+		# php-ext-source-r3_createinifiles() changes current directory.
+		cd "${S}"
+	fi
+
+	if use python; then
+		python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
+		python_foreach_impl python_optimize
+	fi
+
+	if use ruby; then
+		ruby_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
+	fi
+
+	# For some USE combinations this directory is not created
+	if [[ -d "${ED}/usr/share/doc/xapian-bindings" ]]; then
+		mv "${ED}/usr/share/doc/xapian-bindings" "${ED}/usr/share/doc/${PF}" || die
+	fi
+
+	dodoc AUTHORS HACKING NEWS TODO README
+}
diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index 65181ccccfe6..877d35f3318a 100644
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -2,7 +2,9 @@ AUX xapian-1.4.17-gcc11-missing-include.patch 185 BLAKE2B b06ab13c3fa91ed34e98c8
 DIST xapian-core-1.2.25.tar.xz 3253292 BLAKE2B a130e26188c949d0433d017e8d13e7ecf6241a232d00125699ba8ed63eab9cb1651e02182fcc152f960f4e122709958632779daaaf5760fe50953a3b5b07a243 SHA512 a15b5d9b5770337519f671732f53f0642b31f08206824500d589ba309c9e91a05a30353d66ebf70a4c1cb1824b44e1c7b7630e799de3b15d645cf951a6017bfe
 DIST xapian-core-1.4.17.tar.xz 2997700 BLAKE2B 882bc28c9a55731212a5c3ac6da3ad2082e3345cb473eb2c09b80fdd05e700bb31cff6c9a0524b27da015b14655c30548e92a457b48af43279bfd3564cf3c3fa SHA512 3eaf45d31eb9318e292fa052b32b1d9e1035651bdd3c366a0134f4b39d03d987083c19426a3d4b10f60078190fc3388f05b332cba958263bab1abf236c7a3ca7
 DIST xapian-core-1.4.18.tar.xz 2984508 BLAKE2B e5d680578e0a4605a8e99470921fba29cdd3d137d017608b8bf571951726055d2a1d49e9649829f0df92af3d27d0565f90baaca5a4eb5c67cb368f5d1e592d28 SHA512 ba6240054c0d2f92b9f1059aa934cdf35388ee7c7e05f4ef6f9856bdaed8ad821095a348ed9a892afdf18c3c0ad20e163028ad0ed3a9934bd69b861e814678ef
+DIST xapian-core-1.4.19.tar.xz 2994860 BLAKE2B 9566df1646192370e346c1b0d1e1cda68034fe5d3ab94835709f969df643fd36da49a58a2d3b4177a42faf5af2e71df771277848169ae62f94fe0bb0378ba6aa SHA512 d596058d7f9bfa0b73c5b6354331a799936b45f27012894f6792872ade8656bb0387b504aea8c1c3edfbd48787190452e7a49d2b62d181cb050c46edd3e67346
 EBUILD xapian-1.2.25-r1.ebuild 2035 BLAKE2B 0bd199c71ce17e0c01eb702679a3e356d35fe8150c3aec92cbddc1127487638443aacc19d6cd0b1cd84725a044e61ceff288f331efeb2ea581e48d12e38a336a SHA512 2155f4652a2f6581aef65bf635aedcce76b7d3746cdcb270c97a34d3e5c6c386900d168fd2880b31fe50f1be2751df3e8b5f25ee74de3c1fea1e259deee190b8
 EBUILD xapian-1.4.17-r1.ebuild 1941 BLAKE2B 2cd45961ad77e56c60f906e7e49afc5287452a2b5f0e8abc51e5c0740ade9eb5ac5978e9ca9394af7b418e8a03eff83d482278bc64780957cbc8879198c49c7f SHA512 cc0aec3d3d555d28cba486f92d5bf8bf00fcd7b52c890ed6d3af11c8e9f8e0ec403dab41364a22f841953a554c40b58f0825808a04a48f1e34cdf9833f223141
 EBUILD xapian-1.4.18-r1.ebuild 1878 BLAKE2B 9f2ace2f966a2f129094b0f9efedf5e998eeb14bf0afad044988d951ef79eeebf56888a2ea108021449705c33eb1b466307fe0c73302b3397b2e5024386913be SHA512 74d0b7b8ed3dbf8c82de3f39e13d1e4720fe346efe5c0e6218805a9fcca59708b19f083056e089b1b33124bfc9f0fc9b0399a2b7aa2e10951f1f3fdefe1806bd
+EBUILD xapian-1.4.19.ebuild 1885 BLAKE2B 8c19f9d88ce9ab515d68fca6297483313b463770954919c7309da5867e028c93f16bb6799420a01e053381b46ad63b108911c3282aa1190e2c267ab42a3d9e05 SHA512 00235915eaf4c295f481c07253e96e1dcbaad4efe894b1a0bf2b994abb039ad47dcd6e8e1421c7f64807f71abe202ca78074220850badfc551428aec983a5fd1
 MISC metadata.xml 935 BLAKE2B beadb37293a033eafd108c3c81738866565c127813d860c6014fb75a97edb89117c29bc513a623c47be7270936e0e9e5f28f8a8f7ad3fad6630c896337cd627e SHA512 bd4020e6f4505cb25848c5cddefd2ce9d7a2e6f625ef622b220b510d65e083eda255f00154da26174b998a91082118cba8c25f1ee92df46d2442d1ace3b0b1d5
diff --git a/dev-libs/xapian/xapian-1.4.19.ebuild b/dev-libs/xapian/xapian-1.4.19.ebuild
new file mode 100644
index 000000000000..8e92d1d7fa29
--- /dev/null
+++ b/dev-libs/xapian/xapian-1.4.19.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit multilib-minimal
+
+MY_P="${PN}-core-${PV}"
+
+DESCRIPTION="Xapian Probabilistic Information Retrieval library"
+HOMEPAGE="https://www.xapian.org/"
+SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/30" # ABI version of libxapian.so
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
+IUSE="doc static-libs cpu_flags_x86_sse cpu_flags_x86_sse2 +inmemory +remote"
+
+DEPEND="sys-apps/util-linux[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+multilib_src_configure() {
+	local myconf=""
+
+	if use cpu_flags_x86_sse2; then
+		myconf="${myconf} --enable-sse=sse2"
+	else
+		if use cpu_flags_x86_sse; then
+			myconf="${myconf} --enable-sse=sse"
+		else
+			myconf="${myconf} --disable-sse"
+		fi
+	fi
+
+	myconf="${myconf} $(use_enable static-libs static)"
+
+	use inmemory || myconf="${myconf} --disable-backend-inmemory"
+	use remote || myconf="${myconf} --disable-backend-remote"
+
+	myconf="${myconf} --enable-backend-glass --enable-backend-chert --program-suffix="
+
+	ECONF_SOURCE=${S} econf ${myconf}
+}
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/xapian/postingsource.h
+	/usr/include/xapian/attributes.h
+	/usr/include/xapian/valuesetmatchdecider.h
+	/usr/include/xapian/version.h
+	/usr/include/xapian/version.h
+	/usr/include/xapian/types.h
+	/usr/include/xapian/positioniterator.h
+	/usr/include/xapian/registry.h
+)
+
+multilib_src_test() {
+	emake check VALGRIND=
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	if use doc; then
+		rm -rf "${ED}/usr/share/doc/xapian-core-${PV}" || die
+	fi
+
+	dodoc AUTHORS HACKING PLATFORMS README NEWS
+
+	find "${ED}" -name "*.la" -type f -delete || die
+}
author	V3n3RiX <venerix@koprulu.sector>	2022-02-02 01:39:05 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-02-02 01:39:05 +0000
commit	fcc5224904648a8e6eb528d7603154160a20022f (patch)
tree	3bfce096b38a9cea8eed13fc70c1526c456e9abd /dev-libs
parent	2fd57282f0262ca084e05b0f2c63fbada395d02b (diff)