gentoo auto-resync : 14:09:2022 - 11:10:10

author: V3n3RiX <venerix@koprulu.sector> 2022-09-14 11:10:11 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-09-14 11:10:11 +0100
commit: 81b8f20732954c4508baf2f77472b5435e3f851f (patch)
tree: 4180177cb7ba85eab50159ce96218c2419fb24a6 /dev-libs
parent: 946859e0e36904cffb3e0ccbccb6b7b1347c1cc8 (diff)
45 files changed, 694 insertions, 244 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 856523691f33..94db9dac936b 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/appstream-glib/Manifest b/dev-libs/appstream-glib/Manifest
index 1811541c2245..0290d9bf0bc2 100644
--- a/dev-libs/appstream-glib/Manifest
+++ b/dev-libs/appstream-glib/Manifest
@@ -1,5 +1,5 @@
 DIST appstream-glib-0.7.18.tar.xz 2309276 BLAKE2B 67f414ae45866cab314ed2b307f2045a2035c262810696246f5bdea2a0bac88d98b561f72a8e87608f90407ad6d577d720213461ecef09d277e919b5330c0bc2 SHA512 2a202eb25d823d524128a8ab164025b6579e069f8b62373cf5447d049a0e3764fca5bf1464296101a45870d1426b094493fc8ead07a6a4bcb514c0f1a91e8ff2
 DIST appstream-glib-0.8.1.tar.xz 2320596 BLAKE2B de8d68c541cd6700fff0bc22a71d59510ccf584ac1380e2aed3e5aa122825cb3087d65b42ac1dc35acbd4b171382d9560545cdeaffa9d6bda721784444bf7a36 SHA512 32462a32ea25c945abb8d9084af1c84850f264b3a2136c6f54444e0168acf0d74ee450f8cbf483a504e417dc29b85a2e9bbc0a5bb8a217296eccacaa02db5ef5
 EBUILD appstream-glib-0.7.18-r1.ebuild 1651 BLAKE2B 321871842b6b26a0d05825c51d8e1b55577249e78f272c27b17af44431a45413fe659e73948ff260765d41750d6ebdfbc55c0078e8e194f1064e0e4b5e79afc9 SHA512 8fc7c9fb1b9073fe1b7340428c0d258f7d6ae6f2d87eff6b3201334e21aee4cbc60b3d3a61bf09d5f11386cc2d0f2743ba77f011a4612edef3c6043f3a893db0
-EBUILD appstream-glib-0.8.1.ebuild 1605 BLAKE2B b738b67069244c06c830da86c586417d0519286aa79315b3416f32ce434b84b439640bdcb5ec2392acf7391cce9bb1f813c84d1477f27b197f3a97308019de4a SHA512 c047df33f26a03617df502e8c684cdfbc49350f80b04c4a103ad6d55a6ae491bfab189febda25103753581373ce657c05bec8dab548d257d902410bf14e957c5
+EBUILD appstream-glib-0.8.1.ebuild 1603 BLAKE2B fdd4f849f28e18300e4871debc7633a6b51c5bd75575352ba6fda04fa2c302133f37e7380ab4a2939134d90303d217ca91e8006b506cefe78fa5482337e0fd0c SHA512 8d45b7c6f2341c18f37b8298bdf37b2ffc0eadf3fa4facbacbfd864e7d81c34e8014087a86cfa4d0e9c8161e5ac1889099a04b4116959b867515a956132b6394
 MISC metadata.xml 518 BLAKE2B 86626ba74aa4910c2c6148a1ccfbfa7239ee49dbd2ae570f033226a5b145eecdfe0fbb89381a33a7bd03f98176a009ac5d6a67a725b221f2a1005ae17de4907a SHA512 8dc91556a745b2fa694171daf8080a986a42040ce088c6c320a6287660f288522b77d701fae78bf1b16f3d9e0d20b03a8b27c849e561b6b48c5529c71bcce554
diff --git a/dev-libs/appstream-glib/appstream-glib-0.8.1.ebuild b/dev-libs/appstream-glib/appstream-glib-0.8.1.ebuild
index be7926bb8630..a05df83489f5 100644
--- a/dev-libs/appstream-glib/appstream-glib-0.8.1.ebuild
+++ b/dev-libs/appstream-glib/appstream-glib-0.8.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/8" # soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="gtk-doc fonts +introspection stemmer"
 
 RDEPEND="
diff --git a/dev-libs/appstream/Manifest b/dev-libs/appstream/Manifest
index 844f1383dfd9..92c962eb79d0 100644
--- a/dev-libs/appstream/Manifest
+++ b/dev-libs/appstream/Manifest
@@ -1,4 +1,6 @@
 AUX appstream-0.14.3-disable-Werror-flags.patch 449 BLAKE2B e6513b3c64b5f99afe8aa231d1885c157a8fb1a0849ddd4e2c015a87df58965ec6ae9c36b536bfdd3969ead61215686021f5e39274e00d9179e7e00c1f975aad SHA512 2e9e2597df81015c2eb91dabd39d3cbb6bcf01b3732a35e68e08e52df40e80edfade620e525d480f46126b5c1080027516a13a524da11d71f5c63844ce714ba6
 DIST AppStream-0.14.6.tar.xz 2403088 BLAKE2B 1eb85601c1782fc47ff21983517f301dc9493fb60347cfe8072c277cc4415e80bf6c11a93db80b6d7fe1eeda7ff1fa414fd10ce7ef0d7379b415326407d805b8 SHA512 810aa7427df50793f4bed27cc3cb5b72c156f0c582f241e06131aa8eabe82d59c8ac0bcc37a22877f7a19ac4640a9a831f8b567ce3e2d26a41ce999515affdb0
+DIST AppStream-0.15.5.tar.xz 2499336 BLAKE2B a0710d1ef2756480fa814c8b740d066e1b06dffe6a3396a44697876372dc9d0f39088ff141817af549d0cf0ad99221e68305344dfdeb82e246f7cda18c3b63a7 SHA512 83202a8db9a31e4328b2a831b02e65389aad1ba95a4c2b2709084fb843cb3675af6fac73f932a31bb3a6d3ff5db85a863c01528be67d9bbd3b9614a978239771
 EBUILD appstream-0.14.6.ebuild 1793 BLAKE2B 89217e43939efb668bce81eca458000961027308fd9dd7d1af3ae22f38a8d8ac8e8faabc32be7b2612c20fcd519f8e04c44149288d6313dbf855e78a4b2c584b SHA512 6a42df221f26a033fc454e3e438795f86c42b9a19e278cf6bb7236ca81b483d632738f24b8ed1886205da8293cb34adb51a470cb693f94d012e1fb97c6413168
+EBUILD appstream-0.15.5.ebuild 1855 BLAKE2B a072de1f9a4af74b209d24decfcbdc586ee1e4a7b19fe8824c31cd3e4f653fa238dcb242018772460b5750ad43902d0c58fabcd4abdac437cbeaa05552378c31 SHA512 f4fd40fd278e227d13e5493a8619dccd432ac5bf30c7dace4bd7020f4d7ec14351d7f2a813be4cf6d75317a8752b845db76d78ee35a4036691f8a179d1b83d15
 MISC metadata.xml 400 BLAKE2B c9855a1e3650a66c8b42fb9055d6de0aa0575ed86bb1e8695d112f2e7cdfbd5f55d6805dfeb0ed19c3354ee3cda8208fd8a4adf4e8313e791493fa1730fb32d9 SHA512 9723ac7481f748429bddde7579b81c7db2dfad2ecd5150c1c4023843c5ef47e02ce41ff43508437ae60ba427a072d09e8d46a6e6b82fc946ea3af71dd71c52f2
diff --git a/dev-libs/appstream/appstream-0.15.5.ebuild b/dev-libs/appstream/appstream-0.15.5.ebuild
new file mode 100644
index 000000000000..cd741e46c568
--- /dev/null
+++ b/dev-libs/appstream/appstream-0.15.5.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson xdg-utils
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ximion/${PN}"
+else
+	MY_PN="AppStream"
+	SRC_URI="https://www.freedesktop.org/software/appstream/releases/${MY_PN}-${PV}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}/${MY_PN}-${PV}"
+fi
+
+DESCRIPTION="Cross-distro effort for providing metadata for software in the Linux ecosystem"
+HOMEPAGE="https://www.freedesktop.org/wiki/Distributions/AppStream/"
+
+LICENSE="LGPL-2.1+ GPL-2+"
+# check as_api_level
+SLOT="0/4"
+IUSE="apt doc +introspection qt5 test"
+RESTRICT="test" # bug 691962
+
+RDEPEND="
+	>=dev-libs/glib-2.62:2
+	dev-libs/libxml2:2
+	>=dev-libs/libxmlb-0.3.6:=
+	dev-libs/libyaml
+	dev-libs/snowball-stemmer:=
+	>=net-misc/curl-7.62
+	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
+	qt5? ( dev-qt/qtcore:5 )
+"
+DEPEND="${RDEPEND}
+	test? ( qt5? ( dev-qt/qttest:5 ) )
+"
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-libs/libxslt
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	doc? ( app-text/docbook-xml-dtd:4.5 )
+	test? ( dev-qt/linguist-tools:5 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.14.3-disable-Werror-flags.patch # bug 733774
+)
+
+src_prepare() {
+	default
+	sed -e "/^as_doc_target_dir/s/appstream/${PF}/" -i docs/meson.build || die
+	if ! use test; then
+		sed -e "/^subdir.*tests/s/^/#DONT /" -i {,qt/}meson.build || die # bug 675944
+	fi
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	local emesonargs=(
+		-Dapidocs=false
+		-Ddocs=false
+		-Dcompose=false
+		-Dmaintainer=false
+		-Dstatic-analysis=false
+		-Dstemming=true
+		-Dvapi=false
+		-Dapt-support=$(usex apt true false)
+		-Dinstall-docs=$(usex doc true false)
+		-Dgir=$(usex introspection true false)
+		-Dqt=$(usex qt5 true false)
+	)
+
+	meson_src_configure
+}
diff --git a/dev-libs/boehm-gc/Manifest b/dev-libs/boehm-gc/Manifest
index b9cfb44e3043..b5a11b7a136e 100644
--- a/dev-libs/boehm-gc/Manifest
+++ b/dev-libs/boehm-gc/Manifest
@@ -1,3 +1,4 @@
+AUX boehm-gc-8.2.2-clang-15-configure.patch 1730 BLAKE2B d14482e97dd0f63373783694e250810a894ebe9c75e4b472debdd5b7de00c94a7258772a87437178e8c5bdd23670c753bfc7afc2bb10c88d074afc1da2dd3b80 SHA512 9bdaa6c838b8ececb27b08ce09fe1c28fe87cd5c8e9e06d7d015770a4dc039228b346446cf474523de1b9d5bbf836372e8458388c575f4d399fea0ce61fd8c02
 DIST boehm-gc-8.2.0-fix-headers-install.patch.xz 55320 BLAKE2B 86f6a27c49c1c36a89e836ef2adf17e6563256ad0700e05235461b9df562029781894d1b4b76ed4fb44faf9c014e7674b909cd8a097d6d3c29cb50be55b83856 SHA512 cbb963b5f4286846ae4548216677cb34042bd8757f6792d1838663b07699837c25a727740d6d9461b582c5428ebe8e0bc670134be1d68cdc61d055f8624a76bc
 DIST gc-8.0.4.tar.gz 1160528 BLAKE2B ec42378c964fc573e53f6f58aa22fa63a0b421c91b81336acfeb2e2afdb5c89514edace3a9500699e13ff1cadc4205ea245af4f0dfa5e439ed9b78cabf6058f7 SHA512 57ccca15c6e50048d306a30de06c1a844f36103a84c2d1c17cbccbbc0001e17915488baec79737449982da99ce5d14ce527176afae9ae153cbbb5a19d986366e
 DIST gc-8.0.6.tar.gz 1168660 BLAKE2B c23cb10db54db0e8b16c429e039791086dfec4216ad65fabf072bc0f05df66364d019fccf945bffc32ce12868edfbaf6d9482acb2949d1e233bd89925ab55ebd SHA512 2ea25003d585118e3ac0e12be9240e8195db511c6e94949f20453dc3cb771380bd5b956c04243b2a8ce31508587aa32de4f0f10a813577e6dbe8367688b7614e
@@ -8,5 +9,6 @@ EBUILD boehm-gc-8.0.4.ebuild 1417 BLAKE2B 0a0d40849a901b436928f336c1e897ad673131
 EBUILD boehm-gc-8.0.6.ebuild 1414 BLAKE2B 39d14d9eb6dd56b021ac9ff23db3f0ef8d773acbe4459c6ce357a3bf2fa9556f52b3ee173d936260e44a90b6ba39c04fc6785031000474b8dc32970794da62f8 SHA512 3d5e02947dcb1b35dcf4bb207671294d07f58fd41aeb46a1ec702d1ee8016038aafd8d2e2bb40a0c842924fb7efe9148a1c97b4671ae31da608ce945a9c5809e
 EBUILD boehm-gc-8.0.8.ebuild 1431 BLAKE2B fd5b4a3a2e8d0ec871752f12edffbffc5a656a215363261bc7ee6dfd8d18fb53501bd9fb806eb30888e25b6b7b68bbdf5f5247b09e892871564324acde483dea SHA512 d5afdb1a82e8546aee42487ebafe962d683b03ea8dd5bcb824c5a968ac3920a451f9bc32d6b442e8e64a305970b31544b46a9ea3f4770b24e41d0c37945de7b5
 EBUILD boehm-gc-8.2.0.ebuild 1425 BLAKE2B 5ecea765ef635fbbb813b25debf1602345e1ec74d2d3913a71e5651d09806407ac8be536d71ed78ba4150c246e37352f9b5a51108ff3ec69911b36573bc096a2 SHA512 1b414f378a4b043dc10496e39db5edb0ee5a124e1d9f5f21f9aba740d90f89aa4de62fa8526038f30abf8ee1a1e7fc27f36eecb0b3c6ba5774d4c762ccc32a99
+EBUILD boehm-gc-8.2.2-r1.ebuild 1619 BLAKE2B d10354a6ff39b44f1ca81377a0995fdb503314dd950e4632c8b7079f52a4698bdcbbf827583d1b96423f752a76fe0837c8ac2694b32c1b2c537292ee20de473e SHA512 ab2580ca86310caf54b6d68ee7a893db13a7b40ddd07c529ec9472bb68308ad1d4d5e6cbd4c1567136ccce384652f5b7c8a79860527031e37cfbfda97bfa3deb
 EBUILD boehm-gc-8.2.2.ebuild 1487 BLAKE2B 97c0fe6035da546baa69f411984451d0349b628e5bd61c512e0e50eccb424e3be73678f4f41a6ce0dd7e62bfa9710c2627cde2c2c66bbb0725e0446c6c4e1d49 SHA512 d464a042a618880d3a0aa00ec012261a46f698d9e9b96590b42fb7857f69860ccae2d35a2ca0be33fc64bdc87ae6256c356a70bf5b602744e428ef4e80ee066c
 MISC metadata.xml 441 BLAKE2B 1a5b60a047e52ee63b74e85d8f04fb905a9d7f562054d12286d9bc14d654e6875550186cca2c8c9f149f5fe950b5337cbab510f98c49faeb7c983b07b97726e6 SHA512 c4e4af95746b4270a64e5238999c4ab44568d22350a60118e6e798cfab9a3e4dbd0012c56fa809a1ca115cb8772faa3f161f29afe70770fba8e7cdcd364b83c4
diff --git a/dev-libs/boehm-gc/boehm-gc-8.2.2-r1.ebuild b/dev-libs/boehm-gc/boehm-gc-8.2.2-r1.ebuild
new file mode 100644
index 000000000000..28f0b8b30a27
--- /dev/null
+++ b/dev-libs/boehm-gc/boehm-gc-8.2.2-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# autotools for Clang 15 configure patch
+inherit autotools multilib-minimal #libtool
+
+MY_P="gc-${PV}"
+
+DESCRIPTION="The Boehm-Demers-Weiser conservative garbage collector"
+HOMEPAGE="https://www.hboehm.info/gc/ https://github.com/ivmai/bdwgc/"
+SRC_URI="https://github.com/ivmai/bdwgc/releases/download/v${PV}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="boehm-gc"
+# SONAME: libgc.so.1 libgccpp.so.1
+# We've been using subslot 0 for these instead of "1.1".
+SLOT="0"
+# Upstream marked this version as "Pre-release"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="cxx +large static-libs +threads"
+
+RDEPEND=">=dev-libs/libatomic_ops-7.4[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.2.2-clang-15-configure.patch
+)
+
+src_prepare() {
+	default
+
+	# bug #594754
+	#elibtoolize
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local config=(
+		--disable-docs
+		--with-libatomic-ops
+		$(use_enable cxx cplusplus)
+		$(use_enable static-libs static)
+		$(use threads || echo --disable-threads)
+		$(use_enable large large-config)
+	)
+
+	ECONF_SOURCE="${S}" econf "${config[@]}"
+}
+
+multilib_src_install_all() {
+	local HTML_DOCS=( doc/*.md )
+	einstalldocs
+	dodoc doc/README{.environment,.linux,.macros}
+
+	# Package provides .pc files
+	find "${ED}" -name '*.la' -delete || die
+
+	newman doc/gc.man GC_malloc.1
+}
diff --git a/dev-libs/boehm-gc/files/boehm-gc-8.2.2-clang-15-configure.patch b/dev-libs/boehm-gc/files/boehm-gc-8.2.2-clang-15-configure.patch
new file mode 100644
index 000000000000..87045eaa912f
--- /dev/null
+++ b/dev-libs/boehm-gc/files/boehm-gc-8.2.2-clang-15-configure.patch
@@ -0,0 +1,43 @@
+https://github.com/ivmai/bdwgc/pull/474
+
+From b3428e52cb9af18d6c85d0027b9c86e9b44e2e4f Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 13 Sep 2022 19:37:59 +0100
+Subject: [PATCH] Fix configure with Clang 15 (implicit function declarations)
+
+Clang 15 makes implicit function declarations an error by default
+which leads to configure falsely thinking `pthread_setname_np` is
+not present:
+```
+checking for pthread_setname_np... no
+```
+
+This fixes that issue and the following errors:
+```
+error: call to undeclared function 'pthread_setname_np'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
+error: call to undeclared function 'pthread_setname_np'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
+```
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -834,12 +834,16 @@ AS_IF([test "$THREADS" = posix],
+   [AC_MSG_CHECKING(for pthread_setname_np)
+    old_CFLAGS="$CFLAGS"
+    CFLAGS="$CFLAGS $CFLAGS_EXTRA -Werror"
+-   AC_TRY_COMPILE([#include <pthread.h>],
++   AC_TRY_COMPILE([
++#define _GNU_SOURCE 1
++#include <pthread.h>],
+                   [pthread_setname_np("thread-name")],
+      [AC_MSG_RESULT([yes (w/o tid)])
+       AC_DEFINE([HAVE_PTHREAD_SETNAME_NP_WITHOUT_TID], [1],
+                 [Define to use 'pthread_setname_np(const char*)' function.])],
+-     [AC_TRY_COMPILE([#include <pthread.h>],
++     [AC_TRY_COMPILE([
++#define _GNU_SOURCE 1
++#include <pthread.h>],
+                      [pthread_setname_np(pthread_self(), "thread-name-%u", 0)],
+        [AC_MSG_RESULT([yes (with tid and arg)])
+         AC_DEFINE([HAVE_PTHREAD_SETNAME_NP_WITH_TID_AND_ARG], [1],
+
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index f0d462954aed..3f7090800d0e 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -6,9 +6,10 @@ AUX boost-1.79.0-disable_icu_rpath.patch 1077 BLAKE2B c4549b7a706cd934392bdafb44
 AUX boost-1.79.0-fix-mips1-transition.patch 1623 BLAKE2B c44ed1a6eaf89e30c4150b42e5b26cebc8742b2446939cd3310c45a5f4c6c6d6bd84ef72f2a47991cea8a664296854651d857609a8f5500e283176de99d68dfd SHA512 aec8ddd77e25e5549c12099e57c66354baa9da79188ee7a054e98b5ad9d7f8510e7f00ccd8fd3e50d004f184ea6e3ef62f815e05db16740d286171dce2d83929
 AUX boost-1.80.0-disable_icu_rpath.patch 632 BLAKE2B f7bccbc7cf00a6c3a6eb63bddb049647c958592c4768d0a8868b7b03f02e37de54722da930340fa91c5b3b3ba1f44b1c4e0b28525c8ccf19f643dbe4b3d0561b SHA512 21c9afc7f8c6095476b075f78f3af7e8afaf50f33ec8166b5a11ed7d778c80e3a81c8ef04a20d8878a7bb47ba9cb947f7688de52fa7598497866d76fcb678f05
 AUX boost-1.80.0-fix-mips1-transition.patch 1041 BLAKE2B 03ac38ed4d403f1d75a3ade98076593e93336c77e807ab2ce0f5b9393bb2f7dd59c56a9e0fba647825eca0310e2e3f9eacd52eff17f8363cb76c9559413612c5 SHA512 a61e75322486e1e09efcf2e8f3d341c600c6b871d15ac3478573758b33cf7e9752a8576d4e02c4331dc38d568fb3386e733826502c6183aea2e1e90d9283c1a2
+AUX boost-1.80.0-unary-function.patch 757 BLAKE2B 25fbc3532add9a0fc9c90e6690fc13ac13ac8e14fb7c6b62e52c26c8e46127c75ad20742ae90d72dc073945df6c1d392d48f65de4e8454b26cda25b19637ebfd SHA512 a07a5bf9587789216395ef246d1411fff31f4488b033ebfe2b1ffd9f88fab3f73b14b9027e2717fed7237fa9b49b8b80779c3901ea1ff67d699f4309a93e8fa4
 AUX boost-1.80.0-unordered-fix.patch 7067 BLAKE2B 1a465a764dd510ec7bbbee4a2d5ca12982ee4a7dca9a605195492810c952918185c79d7d326d9eda063c0ede7a3a2c86b48ab2dc2a92b8debe4e0ee00d3e7a29 SHA512 bccdb2b136c5d99a4bfc60445ff0aa07ecffccc522215820336d55a6c4cb1a0b5636a98180e3f1af543722d4977bc2c6ce1e2b9d6156b4ecbeb398fab7a3fcb7
 DIST boost_1_79_0.tar.bz2 113456811 BLAKE2B 61f47ca022e60745868e6bdd3b5c75603dd68d878e126dcbb73de5b40fc03c0eec8eede3ec304ece58050435ef2fc1ed7eb763773c20673f85e32bbf4d5f978a SHA512 70909e0561c213d10a1fdd692f9ae7b293d3cdc63e925bdc207da9e9bba6e86474341100e7ee5de6d94f9561196b1a3a1597055a7b7382babf8931131170a312
 DIST boost_1_80_0.tar.bz2 115869904 BLAKE2B 507e811be7659442c41bc2d99811bd02a236dc94932e1a7a8cf256243b479f2d2707819cd99e016a51c9dadc215713e803afdd9ea4c105af8d5d2d28d3d06a1f SHA512 829a95b463473d69ff79ea41799c68429bb79d3b2321fbdb71df079af237ab01de9ad7e9612d8783d925730acada010068d2d1aa856c34244ee5c0ece16f208f
 EBUILD boost-1.79.0.ebuild 10641 BLAKE2B 44e43c096af4e3e30d96cffbd21df7111f76453f53b5cc604171addeda32b9cd05560b0c375f8cede3223c95ff07afc9efcfdd8faada0524dd45b4330ea6f591 SHA512 b81c002b0493a966ff11bad777cf73d5a4bef08f6ae4f3a68aa9de82d2c86cf33af89dbfd62a9a502b123c9c63f3f497fa5b6959e9fa1172f114bc5d800ac05f
-EBUILD boost-1.80.0.ebuild 10806 BLAKE2B 58ccdd3dc1ca80d2584d650e7579d806d1abecc819858d8e509e1c76a146bbb470284afa1c856d6d4273c71f1883299852d8efb226cada0a5ae5f456730a9d87 SHA512 f7a9792a1b15b63691f9e8d7b08c83457a190f32739d7b7d6ac6735033009757ae304ea90cec2d00f5efca88e6f9bcc375e6ed6177fffc8a5d81dae9e4713eb7
+EBUILD boost-1.80.0.ebuild 10855 BLAKE2B ae757ad46ddb78e622a9dc23af7c11a34659f4373f46466c44f0061a6e11c9de91cd430a74a784ea8df7509b6c147154988acf1386914f6727ffc362c06412f3 SHA512 ad270ecb27d0f30b01c03271776662b3bdfd7d1531481c35318cdb6242d3bc4687865d4b2acd94ce330d7cb5a81500932ba435f785fdb1df7916b4cdd01a4f58
 MISC metadata.xml 1350 BLAKE2B 5fd10a89cb215629c0a7a0dfd134b3d187312e49c2f77a77666f9c30128f0feec1a82dac64bec80b0f3e20f0f9648924290323e818738da07e1ce8a3112398fa SHA512 3a3584abd5be99dc70daa63bf86ff716ba310dcc7f3aa8bbae5be3e20762ed856eaf372ee9dbdab4c00bc3622288d96816eaef9f639f07cf245de501da917f65
diff --git a/dev-libs/boost/boost-1.80.0.ebuild b/dev-libs/boost/boost-1.80.0.ebuild
index e0c8fcaf0060..d70b29fc1bf3 100644
--- a/dev-libs/boost/boost-1.80.0.ebuild
+++ b/dev-libs/boost/boost-1.80.0.ebuild
@@ -51,6 +51,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.80.0-fix-mips1-transition.patch
 	# (upstreamed)
 	"${FILESDIR}"/${PN}-1.80.0-unordered-fix.patch
+	"${FILESDIR}"/${PN}-1.80.0-unary-function.patch
 )
 
 python_bindings_needed() {
diff --git a/dev-libs/boost/files/boost-1.80.0-unary-function.patch b/dev-libs/boost/files/boost-1.80.0-unary-function.patch
new file mode 100644
index 000000000000..7941d7c66395
--- /dev/null
+++ b/dev-libs/boost/files/boost-1.80.0-unary-function.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/869401
+https://github.com/boostorg/config/commit/f0af4a9184457939b89110795ae2d293582c5f66
+https://github.com/boostorg/container_hash/issues/24
+
+From: jzmaddock <john@johnmaddock.co.uk>
+Date: Mon, 11 Jul 2022 18:26:07 +0100
+Subject: [PATCH] The std lib unary/binary_function base classes are
+ deprecated/removed from libcpp15. Fixes
+ https://github.com/boostorg/container_hash/issues/24.
+
+--- a/boost/config/stdlib/libcpp.hpp
++++ b/boost/config/stdlib/libcpp.hpp
+@@ -168,4 +168,13 @@
+ #  define BOOST_NO_CXX14_HDR_SHARED_MUTEX
+ #endif
+ 
++#if _LIBCPP_VERSION >= 15000
++//
++// Unary function is now deprecated in C++11 and later:
++//
++#if __cplusplus >= 201103L
++#define BOOST_NO_CXX98_FUNCTION_BASE
++#endif
++#endif
++
+ //  --- end ---
+
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index 8e7e2e8154ca..d6c7679a67e1 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -7,5 +7,6 @@ DIST elfutils-0.187.tar.bz2 9240221 BLAKE2B 00ba3efa689d137808f5f53ecda93fd006be
 DIST elfutils-0.187.tar.bz2.sig 310 BLAKE2B b23f656de269030cc3dd518a008e22e22726138a3bd619ad269166d3b9fac4b1064d98c81a02fcc6250ca1a996cc3e81322b50e7692fe23cbee92e2908f0300d SHA512 2619d8d537364386491d5e54f2add7ffa5bab21cd19c94a29249f2d9c5cc5dac53e2031a5515268ddeee4799b71115a5d98bdbcafd361aa75bcc13a1d9b70b14
 EBUILD elfutils-0.185.ebuild 2553 BLAKE2B 814831c9a53e59cf1029350ce9da041a8bc6d7890af8b24dd3f7c0b9257c9906edc90ed394bd88733504f1f7b8849d9962098017979929ae8f99bddec709fb37 SHA512 9fd9f9fef8b6d73c83bac2bec4b8b69d9cf9bcfd029b21ef409a1f4974656004dd1dd059514b250b13b8806d7038fde18961a41e28bcae3a841e995104d47c2a
 EBUILD elfutils-0.186.ebuild 2554 BLAKE2B bd9055bcc73d88d089ab7c002f421c8721b7c2af222d9f4dba8691d73221319f77250ff967e4d231ca5be99e48773142156cd3c34072258afab2f2f043141d3a SHA512 2c88af4389bc319f8de9430f71a1be4f426be0db2a1b66651579c55a6ec1bfd1701b522930360c3c4c29356e139a03dff59d659d4ffa06b4766b93b45b04da3b
+EBUILD elfutils-0.187-r2.ebuild 3218 BLAKE2B 77bd583f864617079c415a8a71b48f919d7187b426e97fc51fbccdd7d370a6a6482c3519b967f3a8b65a71033366037d838ad82bf8fedf1f092a88cf068eaf8f SHA512 4e90350182156f5eb428b601d605c3e287e5cb613045e67c4d2e981d44c2745c492d6269a61ab1325f26530689801412a68fe0a3a4d9835af0ff60f1ebb3e269
 EBUILD elfutils-0.187.ebuild 3097 BLAKE2B e3373bbc80a9cf19ab318fa73ed1adba039ab235bc56b0cd22eddca98a486c8f4daa6768ae9fe5e13766c694534197dad6f41ef3701b8b158b90853913fe266e SHA512 b33cd29502adce7fab08ad3fe426d7232535d3a2a537cba558369869ba7cefe062e7005e9558160f8990373f568603f296b0b4f2f9754345f696e0e863dac323
 MISC metadata.xml 730 BLAKE2B 94e9585a2d765ee2a7c85a823c389453bcdbc29b90a5542333eef1253d4ebafb7c26e383dfe5c5e0fcccf61f60321e7a46b0ae8c5edf467937485d6c9867712a SHA512 663cb6d587113d21fc0d3c703731f4dcaed55fc1bc7e75e1ac465e21b161ba5c4b4cefe0fd838d28b1f890cc33008878996e1d117fcab6435f8ed49f7eb0bc73
diff --git a/dev-libs/elfutils/elfutils-0.187-r2.ebuild b/dev-libs/elfutils/elfutils-0.187-r2.ebuild
new file mode 100644
index 000000000000..701a5bc1f9ad
--- /dev/null
+++ b/dev-libs/elfutils/elfutils-0.187-r2.ebuild
@@ -0,0 +1,115 @@
+# Copyright 2003-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/elfutils.gpg
+inherit flag-o-matic multilib-minimal verify-sig
+
+DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)"
+HOMEPAGE="https://sourceware.org/elfutils/"
+SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-0.187-patches.tar.xz"
+SRC_URI+=" verify-sig? ( https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2.sig )"
+
+LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 lzma nls static-libs test +utils valgrind zstd"
+
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}]
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[static-libs?,${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1[static-libs?,${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd:=[static-libs?,${MULTILIB_USEDEP}] )
+	elibc_musl? (
+		dev-libs/libbsd
+		sys-libs/argp-standalone
+		sys-libs/fts-standalone
+		sys-libs/obstack-standalone
+	)
+	!dev-libs/libelf"
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )"
+BDEPEND=">=sys-devel/flex-2.5.4a
+	sys-devel/m4
+	nls? ( sys-devel/gettext )
+	verify-sig? ( sec-keys/openpgp-keys-elfutils )"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${WORKDIR}"/${PN}-0.187-patches/
+)
+
+src_unpack() {
+	if use verify-sig ; then
+		# Needed for downloaded patch (which is unsigned, which is fine)
+		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.bz2{,.sig}
+	fi
+
+	default
+}
+
+src_prepare() {
+	default
+
+	if use elibc_musl; then
+		eapply "${WORKDIR}"/${PN}-0.187-patches/musl/
+	fi
+
+	if ! use static-libs; then
+		sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in || die
+	fi
+
+	# https://sourceware.org/PR23914
+	sed -i 's:-Werror::' */Makefile.in || die
+}
+
+src_configure() {
+	# bug #407135
+	use test && append-flags -g
+
+	# Symbol aliases are implemented as asm statements.
+	# Will require porting: https://gcc.gnu.org/PR48200
+	filter-flags '-flto*'
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable nls)
+		--disable-debuginfod
+		--disable-libdebuginfod
+
+		# explicitly disable thread safety, it's not recommended by upstream
+		# doesn't build either on musl.
+		--disable-thread-safety
+
+		# Valgrind option is just for running tests under it; dodgy under sandbox
+		# and indeed even w/ glibc with newer instructions.
+		--disable-valgrind
+		--program-prefix="eu-"
+		--with-zlib
+		$(use_with bzip2 bzlib)
+		$(use_with lzma)
+		$(use_with zstd)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	env	LD_LIBRARY_PATH="${BUILD_DIR}/libelf:${BUILD_DIR}/libebl:${BUILD_DIR}/libdw:${BUILD_DIR}/libasm" \
+		LC_ALL="C" \
+		emake check VERBOSE=1
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	dodoc NOTES
+	# These build quick, and are needed for most tests, so don't
+	# disable their building when the USE flag is disabled.
+	if ! use utils; then
+		rm -rf "${ED}"/usr/bin || die
+	fi
+}
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index f20dd9bfd3d1..a3fa6b81799f 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -4,5 +4,5 @@ DIST gjs-1.72.1.tar.xz 620248 BLAKE2B 945b988fdb8c9fc01ec73c8f10b7e5ba9db3ee6dab
 DIST gjs-1.72.2.tar.xz 620380 BLAKE2B 5ea15bdf25c36fa0236f03adea5b2261db3923190005754119eacd070830e7baedfa842ab273219055f67f7af535d31d5844c76eddfb03a8ec1cab57297ec258 SHA512 0dd10f40e8811bbb79c541cf3dc4e3759c0e025485e4b8ad2870dc30ac8030573300bc178c78bf2d396b86733e36b33210bfbdeead6a314e592d5b3c250a16a2
 EBUILD gjs-1.64.5.ebuild 1182 BLAKE2B ba36f6e0485dc507cba57a163eb835d5857e00e6f9dc46e6659bdd4e3b35965f10d8808c3a0220e7369f29c3c0552351ebdff4d590932bf916a11b2ae26ab8bf SHA512 d2be5b242e3249e7a718f7ea595ab3b44a83645f553d7ad42cc5a2b766b96a335b86f182a718fc1544e0817ade4b2d6229a0b0a41f9c4ab5f5ab0af49fc96bde
 EBUILD gjs-1.72.1.ebuild 1925 BLAKE2B cb5519e7e59c873f00cd8a76467121c06aa61901f148e88bbfad3318062cf61c42175e21c0ec582d2bd7b8b20c5e94069c0558165698e7f7457c8b0eaa1f1fa3 SHA512 e42397dd717a6c59cdf943447bc66c3e9e2c2afb3e9f2b39a18900fdffec6e596c42c55d10ca26d6f0f16c9fc1b07655e5c61d2c5dcce44e76d2b90bee2fd4e3
-EBUILD gjs-1.72.2.ebuild 1930 BLAKE2B cfe059849d7e42ef0a43777c16bed4edb335a0039fc781da5e3b2260512acc3019f088772c26ec8b05c5a0134e949e30d02cdb9db686ef3f5600aa593bff558b SHA512 21cc6ba7bfddd93792fc0b3c5ab2403612aa704efc18d5518e71aa6c59efa015225e5f36f6004e9636b24ac674aac6ff65761464c78d64e59fd247fe1c74d861
+EBUILD gjs-1.72.2.ebuild 1928 BLAKE2B 044414c4cbc5a52e8ee5ee47af02777abf9b97e1e97fa402db44800ffe8f0632cee3f0ce0bd683b7d00cd59692a12b39a56e2ad27ed634a892dbdb48ebf45c29 SHA512 3edcba98098d9a0a28477dc38d115bc717a03cf7d4e01a2df4271c6d00e4b554c08ec98ff3d7a71d1ffb22d232fea9603bb1dec7a312af139021eb97680bdb6d
 MISC metadata.xml 389 BLAKE2B 68d318dc917f5072b08e83506e14d0f4b8f25bdb90b95701013466112f8fdd77c2cc193257eee82fbce517e41056eeff61cd20137b697f6d1d688d943bafb8cc SHA512 bc4b0c94d58f3f67cbe481c45fdedb5d601e3ca40b5dcc88ef8c7ad9b214e7cd0d5c47d94599f85c11cd1c21dfd57770fd64d442f4b3f960ebc70a8e16f8e8eb
diff --git a/dev-libs/gjs/gjs-1.72.2.ebuild b/dev-libs/gjs/gjs-1.72.2.ebuild
index 7b67fc6ef61d..f9fc7f2ed519 100644
--- a/dev-libs/gjs/gjs-1.72.2.ebuild
+++ b/dev-libs/gjs/gjs-1.72.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gjs https://gitlab.gnome.org/GNOME/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"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
diff --git a/dev-libs/gmime/Manifest b/dev-libs/gmime/Manifest
index b23a812c2341..9ead9a170551 100644
--- a/dev-libs/gmime/Manifest
+++ b/dev-libs/gmime/Manifest
@@ -3,5 +3,5 @@ DIST gmime-3.2.12.tar.xz 2233844 BLAKE2B 863a0634586a478faf32a201051639c33c214d0
 DIST gmime-3.2.13.tar.xz 2231624 BLAKE2B c1b4af7ea911c6e2cdea01700d76d218028f7a7f3fc0443b15f915658f945b0fd784928eaa572b0a4b1cd2ea6f7b2812de75f066e3dd2bef23ebd4075a393ee9 SHA512 cfbf5d9e8d6cafcb340b6e470acaf7ae0a96581d39119a751b22fcf3ede089cc24accbd26a79ec2a4b7901ce66d7092765e8c388bbfa2138606dbb4b3f81f4d3
 EBUILD gmime-2.6.23-r1.ebuild 1438 BLAKE2B 4308360fa149361b0873b37c1ec5635e8f2ec089b2e6b01d98ffd085e896d8cad936c12adf2c3ac5add7638c00eaa7f253a2aa34a0f6a690382f1487e3d59c40 SHA512 5af6e472477b49f6fcec7bafa259e84af13c84ce1ab9fb1b1a4bbbfaace36fb0c470af2cf9dc9a0e3be7c75d8b9dd27c424c2bcbb95c6d84bd36f93ad60db72a
 EBUILD gmime-3.2.12.ebuild 1591 BLAKE2B b566a92604d4273f145aa34fc2c66ace79e1a979c624c8f8f18f3f27f668900f5f77b18cf61aa9f382bc1c5f1b51b7c4a5328ed71179b59d9e42ec21b23ab72f SHA512 79203207868382680d72814dfed89f93c21749cc7b710e2e7d30ed46d62b10bcf27682c0a57e9a43ff831a300a7b9a6257685936bd52bc8ba960ca73ccd216e2
-EBUILD gmime-3.2.13.ebuild 1491 BLAKE2B 831ff37e8a5698683b7ab191cfab770d85c32527b8c391945dd95a2e5432f51ff2af98556dc4527aeda79c8234a3fa330d4ed0ec7d636fa50bf68ed0404a91a8 SHA512 db7288e4fdeb9fc7afa374bd3f602ae3afa315241e326d2503099a814cfd0ef55ee90bde6ee59982229164b279b9a43b5c8a041888331ba35064a5f0e2fb573e
+EBUILD gmime-3.2.13.ebuild 1489 BLAKE2B 98e8f4d1fb85d7135524edb5655ec7c9768d2b9e80aae84e7aa94967961abd0157c1e875894ee33f9254e6d7f777e1da469b17191f143fd07cc44ecc260ec63d SHA512 275870daeb8275ee2ef41a5de68ec620cbd399c46e06995713bc6aed174e3542ef389c4603a854b262912a3de6b0bf868edc45442b5f73ace16c3ef1a8b58899
 MISC metadata.xml 463 BLAKE2B c212a1f5a610788b4d3187a5506769a962b56707b8cb261a665342450c2fa7f059e62987dfbc303c51b5fc4b0c42c9edad22f719776ee059eac3f6d8d541c6d7 SHA512 80b71b9c32662f504537137faed26a5aa739d52b35da62df915e7fce15495906567641e66763e3fe3559efcfa8d0d2e459cb4715f479ba7861b7d70511345fa7
diff --git a/dev-libs/gmime/gmime-3.2.13.ebuild b/dev-libs/gmime/gmime-3.2.13.ebuild
index ef0aa8daabc8..e187ed2bd3a0 100644
--- a/dev-libs/gmime/gmime-3.2.13.ebuild
+++ b/dev-libs/gmime/gmime-3.2.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jstedfast/${PN}/releases/download/${PV}/${P}.tar.xz"
 
 SLOT="3.0"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="crypt doc idn test +vala"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libcgroup/Manifest b/dev-libs/libcgroup/Manifest
index fc8dec18e571..0dbeed376cd1 100644
--- a/dev-libs/libcgroup/Manifest
+++ b/dev-libs/libcgroup/Manifest
@@ -9,8 +9,12 @@ AUX libcgroup-0.41-reorder-headers.patch 953 BLAKE2B dcc4936227cfc67ddc0c32b2074
 AUX libcgroup-0.41-replace_DECLS.patch 5193 BLAKE2B d22bded7e356b31e9f1e8ceec50f7987311f36453ffd13acaf48e95eacce06052c19a89aedfbcd068218a5fdefc26e5aec737d1c00576f25fdef0b1fe658513a SHA512 c7601810e491764c30e8adfadd65e1b1b578a07af24df62cc9a7b291622d806fc196a98e01957b5acbd3bca072617bd0ff54cae200a8e6c21b5cca4d18cd45db
 AUX libcgroup-0.41-replace_INLCUDES.patch 3064 BLAKE2B 1947d306117beb62dba48d46b9e3caa7e2d5195c6d661b2d061c982220b7d3d92d42d4ef23172e34bf32be2e54b6c82c531aa839432e0489c2abe463b93e25f4 SHA512 17c8fa471347da4973969b954f966501d54889050766dfdd225235dd4539bb4249d57e719fa7a894aadc2e0f7296d233c89c44c96291a9266c958ca3a319541b
 AUX libcgroup-0.41-slibtool.patch 1953 BLAKE2B 7c98c05ffe6e728dedce6b321a352eeb68af02876e91d197bbd235c4c6a16647465036766eb3622da1f4d17d360d5a85bc65e6e11ed9328b87b9aa7f5d732429 SHA512 bb42f491dfa75a29610ef968e23bd234c46e685c55e216e6bea9cb6a841aa9150ffd0476bbd72edca9bde35dc65005f80e0df07f618d2089d80205e89db82515
+AUX libcgroup-3.0.0-configure-bashism.patch 1127 BLAKE2B ab75e9acc12e85b9a7f8f9556a9f79e88f1814ce71cad0ec3ad2c26cbc986550190513c946f0ad285e53fd0476a07e4c60ef4cd8c6700c9c2f66436d5638c172 SHA512 65168d9e662552d0555ccb035ace22f3db226e51e30336595a1f91c39aba3da73de761ee974bf38784be586e26506195ef57c91ccbfd0e3f11ae164df6b73719
+AUX libcgroup-3.0.0-musl-strerror_r.patch 1310 BLAKE2B a410898aedefb23d910f6bbd2458bd44b3b1ff09f49e81b650bcc78c28fe55f9d4a72db5afbdd110380da49dc64b7ded8bf9d7e3eadaf026f4b8c67215864920 SHA512 9b83e95fdd04b0158ef6788bbfdf0293b5f6ca28cad92ede4ae6a3165fb3db7a40567ceafe06d2b7cdd7cce31f37cb7932581a77c807bc05a6a1723e303b8f71
 DIST libcgroup-0.41.tar.bz2 500120 BLAKE2B 3410b430aa58613b5b9abedba05bef99b1b8a1fd619d55fb446ab951e052a336efc918879217055bceee886a03d97c3ff46028a87e8231212653a886cfb80521 SHA512 1aedb02cd2ce3bc2e2a328a247a92976ad0978ca4d3aee4eb671fbcc6bb270348efc78dcf84f27fc500f8bfb9bb57c7d6e4d429ef2bc69e4e5118b7cd895a6bd
 DIST libcgroup-2.0.tar.bz2 953191 BLAKE2B d4fe008a51a4f90047210a3c8e4ce48b1c4a126111ccc7fe919404b1782ea764404894a43a651e0d6b2674d02fb031cb56cf7a689c57600d856c03536524bb63 SHA512 b2c5d1128536bf49782415df2d1530cf48bdb287e5d2abdee68f9fa780d995d9bae79f97da5f0c437130d66054c96301b319cd1631a3b0efbc5bfe1e3414dc4b
+DIST libcgroup-3.0.0.tar.gz 1125800 BLAKE2B 5d4999ac513de756ffe741d2e959c01d8500a2000f521dff31832e1ef545869fb9c8ae1c78d05aaa051e7e6e68266bd57a751ba3aa897966a83ff50128090ba5 SHA512 1e8a7c9a71d928ab0e354254b007b30fc159a30e441bd52a03ded142420c94e130594bb512680c62fc22f5193934fb78afc31453342b032d1db3197fd4c3e606
 EBUILD libcgroup-0.41-r6.ebuild 2692 BLAKE2B 6bf892931d82de9ea1fe68a26d7902ff820a4a97bf0b1b0cf1a9dadc91c9af6e5af4735c65f82c7a8c2b19c6ed0f01ac4036e00729927f74b3b2e63c1846352b SHA512 82b0d4ccb18b66e6631adbc65df27292a5530e76d9e94f3c1caac67da8338eaa1de4a1a1a14cb0106a0aa80fec4882296cb4f4dd6c87b8e1369de8a623c5207b
 EBUILD libcgroup-2.0.ebuild 2318 BLAKE2B 48821bd83b937359e5b7a8dafcd285cf7aaf87efbfc323f38afc679907d68fdcb5ac3d58fe245fa1965277458676191b900e3e1eabed5de5b961b55b148cf80f SHA512 24ab58cc48929a107ab1f5b3ccecad538a55385f39b1e9fa1b57a1751697f7e381dedabebff67976729cb0e347fdd705bef1eac5555508529ef19c30366ddf0b
+EBUILD libcgroup-3.0.0.ebuild 2632 BLAKE2B e20cd6272610bdb12348ec49ec2ecf768b90f09c650e764aebf920e33d88887c924701e6a4a2b1839c8f9b8b02ac463c46d5974437da9a94f99526b6ae7939da SHA512 ce68636c2bc46752f20d7cd3a4683cab182619a294996cd1d65578c022be936c30eef1d68c684bad6922b190fe938048aa48b949b9be65102cab6b6191322a1c
 MISC metadata.xml 760 BLAKE2B e57305cd7c4ff081418bbafb284206171924ce6b775853ef76496f1016efa6cf7b8935a0ea726fc55342ae1f433beb641862cff826450eefc71b00070a92580d SHA512 9fe23f0a760268cfcca45a5dfd1542e0ee4cb848cd8031acf564c933d0ed6a298075cd3920d2c36c721c75659126c5e3a1866c347adc58dcd5d3ff2edb061e36
diff --git a/dev-libs/libcgroup/files/libcgroup-3.0.0-configure-bashism.patch b/dev-libs/libcgroup/files/libcgroup-3.0.0-configure-bashism.patch
new file mode 100644
index 000000000000..1401953b53a7
--- /dev/null
+++ b/dev-libs/libcgroup/files/libcgroup-3.0.0-configure-bashism.patch
@@ -0,0 +1,35 @@
+https://github.com/libcgroup/libcgroup/pull/243
+
+From a363c163fdeb48e0536545ece856899ed97e99b2 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 10 Sep 2022 13:52:57 +0100
+Subject: [PATCH] configure.ac: fix bashism
+
+configure scripts need to be runnable with a POSIX-compliant /bin/sh.
+
+On many (but not all!) systems, /bin/sh is provided by Bash, so errors
+like this aren't spotted. Notably Debian defaults to /bin/sh provided
+by dash which doesn't tolerate such bashisms as '=='.
+
+This retains compatibility with bash.
+
+Fixes configure warnings/errors like:
+```
+checking whether to build static libraries... no
+./configure: 14089: test: xno: unexpected operator
+checking for x86_64-pc-linux-gnu-g++... x86_64-pc-linux-gnu-g++
+```
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -137,7 +137,7 @@ AC_ARG_ENABLE([opaque-hierarchy],
+ AC_ARG_ENABLE([tests],
+       [AS_HELP_STRING([--enable-tests],[compile libcgroup tests [default=yes]])],
+       [
+-		if test "x$enableval" == xno; then
++		if test "x$enableval" = xno; then
+ 			with_tests=false
+ 		else
+ 			with_tests=true
+
diff --git a/dev-libs/libcgroup/files/libcgroup-3.0.0-musl-strerror_r.patch b/dev-libs/libcgroup/files/libcgroup-3.0.0-musl-strerror_r.patch
new file mode 100644
index 000000000000..cc1b0688c79b
--- /dev/null
+++ b/dev-libs/libcgroup/files/libcgroup-3.0.0-musl-strerror_r.patch
@@ -0,0 +1,45 @@
+https://github.com/libcgroup/libcgroup/pull/236
+
+From d190c0c548b3219b75e4c399aa89186e77bbe270 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 23 Aug 2022 20:03:09 -0700
+Subject: [PATCH] api: Use GNU strerror_r when available
+
+GNU strerror_r is only available in glibc, musl impelents the XSI
+version which is slightly different, therefore check if GNU version is
+available before using it, otherwise use the XSI compliant version.
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/configure.ac
++++ b/configure.ac
+@@ -183,6 +183,11 @@ AC_FUNC_REALLOC
+ AC_FUNC_STAT
+ AC_CHECK_FUNCS([getmntent hasmntopt memset mkdir rmdir strdup])
+ 
++orig_CFLAGS="$CFLAGS"
++CFLAGS="$CFLAGS -D_GNU_SOURCE"
++AC_FUNC_STRERROR_R
++CFLAGS="$orig_CFLAGS"
++
+ AC_SEARCH_LIBS(
+ 	[fts_open],
+ 	[fts],
+--- a/src/api.c
++++ b/src/api.c
+@@ -4571,9 +4571,13 @@ const char *cgroup_strerror(int code)
+ {
+ 	int idx = code % ECGROUPNOTCOMPILED;
+ 
+-	if (code == ECGOTHER)
++	if (code == ECGOTHER) {
++#ifdef STRERROR_R_CHAR_P
+ 		return strerror_r(cgroup_get_last_errno(), errtext, MAXLEN);
+-
++#else
++		return strerror_r(cgroup_get_last_errno(), errtext, sizeof (errtext)) ? "unknown error" : errtext;
++#endif
++	}
+ 	if (idx >= sizeof(cgroup_strerror_codes)/sizeof(cgroup_strerror_codes[0]))
+ 		return "Invalid error code";
+ 
+
diff --git a/dev-libs/libcgroup/libcgroup-3.0.0.ebuild b/dev-libs/libcgroup/libcgroup-3.0.0.ebuild
new file mode 100644
index 000000000000..a5009c1da4d8
--- /dev/null
+++ b/dev-libs/libcgroup/libcgroup-3.0.0.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic linux-info pam systemd
+
+DESCRIPTION="Tools and libraries to configure and manage kernel control groups"
+HOMEPAGE="https://github.com/libcgroup/libcgroup"
+SRC_URI="https://github.com/libcgroup/libcgroup/releases/download/v$(ver_cut 1-2)/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+daemon pam static-libs test +tools"
+REQUIRED_USE="daemon? ( tools )"
+
+# Test failure needs investigation
+RESTRICT="!test? ( test ) test"
+
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+"
+DEPEND="
+	elibc_musl? ( sys-libs/fts-standalone )
+	pam? ( sys-libs/pam )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.0-configure-bashism.patch
+	"${FILESDIR}"/${PN}-3.0.0-musl-strerror_r.patch
+)
+
+pkg_setup() {
+	local CONFIG_CHECK="~CGROUPS"
+	if use daemon; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CONNECTOR ~PROC_EVENTS"
+	fi
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Change rules file location
+	find src -name *.c -o -name *.h \
+		| xargs sed -i '/^#define/s:/etc/cg:/etc/cgroup/cg:'
+	sed -i 's:/etc/cg:/etc/cgroup/cg:' \
+		doc/man/cg* samples/config/*.conf README* || die "sed failed"
+
+	# Drop native libcgconfig init config
+	sed -i '/^man_MANS/s:cgred.conf.5::' \
+		doc/man/Makefile.am || die "sed failed"
+
+	# If we're not running tests, don't bother building them.
+	if ! use test; then
+		sed -i '/^SUBDIRS/s:tests::' Makefile.am || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	use elibc_musl && append-ldflags -lfts
+
+	local my_conf=(
+		$(use_enable static-libs static)
+		$(use_enable daemon)
+		$(use_enable pam)
+		$(use_enable tools)
+		$(use_enable test tests)
+	)
+
+	if use pam; then
+		my_conf+=( --enable-pam-module-dir="$(getpam_mod_dir)" )
+	fi
+
+	econf "${my_conf[@]}"
+}
+
+src_test() {
+	# Run just the unit tests rather than the full lot as they
+	# need fewer permissions, no containers, etc.
+	emake -C tests/gunit check
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+
+	insinto /etc/cgroup
+	doins samples/config/cgconfig.conf
+	doins samples/config/cgrules.conf
+	doins samples/config/cgsnapshot_blacklist.conf
+
+	keepdir /etc/cgroup/cgconfig.d
+	keepdir /etc/cgroup/cgrules.d
+
+	if use tools; then
+		newconfd "${FILESDIR}"/cgconfig.confd-r1 cgconfig
+		newinitd "${FILESDIR}"/cgconfig.initd-r1 cgconfig
+		systemd_dounit "${FILESDIR}"/cgconfig.service
+		systemd_dounit "${FILESDIR}"/cgrules.service
+	fi
+
+	if use daemon; then
+		newconfd "${FILESDIR}"/cgred.confd-r2 cgred
+		newinitd "${FILESDIR}"/cgred.initd-r1 cgred
+	fi
+}
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 829053661c02..a16d553f5a34 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -1,11 +1,12 @@
 AUX libgcrypt-1.10.1-fix-no-asm-hppa.patch 1166 BLAKE2B 17b27fd88b0e9ccf97c3f46780f16495d6df84e3d58ed9073af6f200908422273a6cbaa18a7285b87db2203c12a9f45f6d2853caf05d667be94a95979b5a0c47 SHA512 02e0c174844fd56da7212518f41b582894e72714e9cbc013448a5eea748cedc7d6ee5719af4049ee6695b83b5f44eb63e6c95972096ba0fc180c2cfe2482ad6e
 AUX libgcrypt-1.9.4-arm-neon-compile-fix.patch 1389 BLAKE2B 548fc764050f322786f3c0ec8f806a6a897987115db0cfd8a2a4f1ffc134a31e9069dca4e334a7a5288f5176ce8e2e8450dc2003c56915d5fdd4dc3c11012c0a SHA512 0b83ab2585502d65d1ccf36440f4a73aa9a9d3a8cb40375ca6a4e81fcc962040fb233df9a345c823281605c061b8ea0e509e0e16a5c3a32581a279e5904bbfd0
+AUX libgcrypt-1.9.4-no-fgrep-libgcrypt-config.patch 646 BLAKE2B a6a4b46dfa9a113446fb10e3c66ab64c08ea2cb768acfe0f5057e102c827ca6e3d676e1970f9234db5bec86ea6745b765a412c1b5cdc263bd7154b169960b136 SHA512 a49af765a1175dd8041a500d3c7213df27c00699bf8a5202b080539bf2909084214d008509039c81d6a28a0f4a3b9fe1f45f89aaa87742bce9a5dd8c8c469fbf
 AUX libgcrypt-multilib-syspath.patch 588 BLAKE2B 6a8d30246263339571455df3c1cccfc9f38e50117cef34bc92ce37a296c3e31017c0190923ea992f51706c55a63c6f75b1d9fc7d8d40930707486f419e1795c4 SHA512 913c1a474aba50ec3589fb5a991f65204ba2cc28203b92353fdef8fb092350c3be814a57f29a26a2176627509a4f573f6db02ebdbcde3f04a2f1d632879293dc
 AUX libgcrypt-powerpc-darwin.patch 444 BLAKE2B 37b95d21f0df07c5c06cd7e1e1efe73d02b9ac59dfe2a31d43b7a535bed356ff24095d528662d58a0cdc9c3eb25de50b5b5a4d9feb0ddb917a42f9332b33982e SHA512 2a2e7e84222f4672a70df827955bb8592e714580fecf6b5238e131038460169f9d80fd04d63d6e232f6fc448c04e0acf214993537ef22e297ea98a4d12c6ade5
 DIST libgcrypt-1.10.1.tar.bz2 3778457 BLAKE2B 46f30459891183b6d9ec18f1c7907fee0ad156c7dd75044f3db2b4d1c19dc6f30b2dfa6f85bc82adc9243aaba913e40fb6faf77d2226ca5a33897220d032437a SHA512 e5ca7966624fff16c3013795836a2c4377f0193dbb4ac5ad2b79654b1fa8992e17d83816569a402212dc8367a7980d4141f5d6ac282bae6b9f02186365b61f13
 DIST libgcrypt-1.10.1.tar.bz2.sig 119 BLAKE2B 5261d7dbfd5d82b2d3fa2ebf864a9ef0c7c978dd66a71c078df7bbb3b63f5d85180e5f909f43a49712fc16c45f7aabaa6bc30ed82a39ffc9a5d483ea6a94d162 SHA512 b156ae05079776698bc95ba5a9e48e95de8f716aa1760ef4b2e7cb8518ccec660337fc7823f865bde870461800d472fd8e458d03a7095b6bb614f6dd96f796d8
 DIST libgcrypt-1.9.4.tar.bz2 3239704 BLAKE2B b8244bc12a68955797b0c2b474ac5c95df1014231f7180a2ffa113e3aacedc98eed60ee1e4b30b032a5fcd6a04855ae07142c223906d5db9c28328a71e014f33 SHA512 d0e117ac73c94d70e9521ee1e6328691498cc8328f8c4e21338096908f5c04c7b838966eb63d59494565f4e19f506c07dab4f4d922150d75610d9f7b57abbf60
 DIST libgcrypt-1.9.4.tar.bz2.sig 119 BLAKE2B 4012c22259a9fd56f9da6c87d60077cea0dbfef85d4d4ad1ff6a2375ddefafc4cd03ee9083d18e080c14c95887b495062af886732a9593bcf1b8f187d21073fe SHA512 4aee16449b4b50dac62bd80217e769f32f43fb7cd994402b7d9cffbb1934b2771041c8c0c41a63ced9c8d9408025f9c5608ffc7f00e5e9a9b92a07cb5118a98a
-EBUILD libgcrypt-1.10.1-r1.ebuild 4973 BLAKE2B 9b4e61d861451d60dc27e330a4c8573033e602b96a2ecd871ad8998740c81a1642487f53a4f0442db95ac1f1147afc459cc0cab8fd0bb67ec873958161dafef7 SHA512 240b5b4fce16dcf8da47329616036ac9bc60a3297da01c2d2424b520852e8e3fb1025fbd19735a1b70b62f590df5b05d306dee9af8e50c00e161964b2230659c
-EBUILD libgcrypt-1.9.4-r1.ebuild 4962 BLAKE2B 5f7437ccbd2e5c7a4b9224e7b0a8676856c75a5765477147c524cbf4ca8f5c7d30b626b2ecda429161cd64e067ddda634da62be0fd5c68de03f5cfc7c6bad065 SHA512 01a11ba7af71892211fc0fbe382021aafee7c56f930af1ff581c248a1f29fbc4456bf125328a069eca024925c4f686825d91bb1644a128e87a8258dde676c7a7
+EBUILD libgcrypt-1.10.1-r2.ebuild 5032 BLAKE2B e8ddd6f2d6e69daa60d38666dfffe376b4ad031e8fc8075000bf07fd990f79ceae138445d986395f865e823b21139a84be6a0fc17cc805f7478c895cd4fe5f36 SHA512 15864294c5fa14197416992150e700eb3049b218a617d35f921350cd9955627332f201c5f7d1c10aaab02a111b5eae8e407c299a09ead0ce3b6a018423915bfc
+EBUILD libgcrypt-1.9.4-r2.ebuild 5021 BLAKE2B 28031c72d8ee46ff5ce9820339c3397d6300e07c0a7f6a88b91c2cea144546001cb3d5a2bf3a47d4018ae1d5ebfc565e2789f1b5255e581382a44b2b5949b4eb SHA512 c6cf36fac494c3e90dc1b4b5178a83676b55e5bb785644ba79af83febd431d123e1dca0f4092863e3638e476465f4fdb8e5ac0ff2418ab276e05c0761a56e908
 MISC metadata.xml 524 BLAKE2B ab417ec172246d92822cafcadf2ccb72d2b8e0c056d93f1575284afbfc30dae74086d5a3b2d0bc60ec03de0a9f02ac08dc8f961f1f38eb639d862708886141ee SHA512 52d663d33d8d76f5a4613d1fded0630a5597796b0c20ddfc5eecda92fbf28f4f3b8c976e2fdb418cebd9d743ca26b1c6329ad65e1655f6eae5c1d797df1d1f95
diff --git a/dev-libs/libgcrypt/files/libgcrypt-1.9.4-no-fgrep-libgcrypt-config.patch b/dev-libs/libgcrypt/files/libgcrypt-1.9.4-no-fgrep-libgcrypt-config.patch
new file mode 100644
index 000000000000..738eac1631b6
--- /dev/null
+++ b/dev-libs/libgcrypt/files/libgcrypt-1.9.4-no-fgrep-libgcrypt-config.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/868384
+--- a/src/libgcrypt-config.in
++++ b/src/libgcrypt-config.in
+@@ -154,7 +154,7 @@ if test "$echo_cflags" = "yes"; then
+ 
+     tmp=""
+     for i in $includes $cflags_final; do
+-       if echo "$tmp" | fgrep -v -- "$i" >/dev/null; then
++       if echo "$tmp" | grep -F -v -- "$i" >/dev/null; then
+            tmp="$tmp $i"
+        fi
+     done
+@@ -178,7 +178,7 @@ if test "$echo_libs" = "yes"; then
+ 
+     tmp=""
+     for i in $libdirs $libs_final; do
+-       if echo "$tmp" | fgrep -v -- "$i" >/dev/null; then
++       if echo "$tmp" | grep -F -v -- "$i" >/dev/null; then
+            tmp="$tmp $i"
+        fi
+     done
diff --git a/dev-libs/libgcrypt/libgcrypt-1.10.1-r1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.10.1-r2.ebuild
index b7a3aa4aaf26..285a83d7d62f 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.10.1-r1.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.10.1-r2.ebuild
@@ -39,6 +39,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-multilib-syspath.patch
 	"${FILESDIR}"/${PN}-powerpc-darwin.patch
 	"${FILESDIR}"/${PN}-1.10.1-fix-no-asm-hppa.patch
+	"${FILESDIR}"/${PN}-1.9.4-no-fgrep-libgcrypt-config.patch
 )
 
 MULTILIB_CHOST_TOOLS=(
diff --git a/dev-libs/libgcrypt/libgcrypt-1.9.4-r1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.9.4-r2.ebuild
index 713d3c7e3a16..c7a2a6fe71fc 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.9.4-r1.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.9.4-r2.ebuild
@@ -39,6 +39,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-multilib-syspath.patch
 	"${FILESDIR}"/${PN}-powerpc-darwin.patch
 	"${FILESDIR}"/${PN}-1.9.4-arm-neon-compile-fix.patch
+	"${FILESDIR}"/${PN}-1.9.4-no-fgrep-libgcrypt-config.patch
 )
 
 MULTILIB_CHOST_TOOLS=(
diff --git a/dev-libs/libgusb/Manifest b/dev-libs/libgusb/Manifest
index 9e47d5a8a0e2..3cdd5c61b908 100644
--- a/dev-libs/libgusb/Manifest
+++ b/dev-libs/libgusb/Manifest
@@ -1,3 +1,5 @@
 DIST libgusb-0.3.10.tar.xz 42972 BLAKE2B 4c49aa15cbbbb56d5ee5b896adb3e34b45332cd846933fd3aa86a645e7d897418d0e7a30d9972980e6527f1e60fc6e579f5df119708a12b3e504ff695c94d922 SHA512 66bd7c292cb9df2799b02acd48dc4b07794e7339ea1bd6473ea512dfec1b8e7e58abbd40f16a2a4805240cc8df4aec050335edb4f4178ad12ac5275438b8ae59
+DIST libgusb-0.4.0.tar.xz 49844 BLAKE2B 9f2b552d8f224b4c8209f8adaec9d9131adf6ea938a25dca2ce2e6a8b4f154e3d9d6c75dc5bb1d42c6f00b2727136156c76f6291156f2c364aaa3343990ac3bd SHA512 80aa3dea90a7a49d1108cddf066232dcb3c3a41bbbec5e598fbb1f5a554997b2fbc3ad95e514813ffb575a018585deef6ec16ba4533eefb3c1a086e1cc4534ce
 EBUILD libgusb-0.3.10.ebuild 1519 BLAKE2B 63ca13cf5c6fca4a3654de2f41603a384248c5479a5fd54b25cddf5823c97be152d6b25e63ea8c29cda59738893a494083788d6f25a7e6dad6f7a32095668c72 SHA512 c19ec7712e2a532dba2b640ef9bb2e0d371a4de265ed8e5c12f23527f7300fa95a3d79e9d0b149560b51712b2596bc1a4ce3645906553f3e6edabadc35260b64
+EBUILD libgusb-0.4.0.ebuild 1599 BLAKE2B 1755bff73c56777f8a0d386b7b949f15bbf868e5140b416c8f4a4d8a9d0ca66271824e7eb1449d91682cd8408d01497e2801153ed54594b78ee982b8b8c5caa3 SHA512 76e22b7ff75b0da737f2db0c1f9ad737b2fa98955d4d5e68ded66b0b910e2eb02774c87074afa2275b3a32dc63184e4240da108542adc003b042b3e29db0ebbe
 MISC metadata.xml 344 BLAKE2B bd362d7e89ba2d88c2f220ab47593b4ae25bc4ca486bdafda16448407213d7558d7ea807c489e5aafbb8ec83a40e8e339c8ba20d3bfc3957da33a7e7711c6898 SHA512 93166c6dd4d764901c87fc567ab1c67add1c654b7ea1f3326e7144d5c14789bdee2a1e37874f8b6158136e03363372bf1d972f49f96095b0e3e568af89c4af34
diff --git a/dev-libs/libgusb/libgusb-0.4.0.ebuild b/dev-libs/libgusb/libgusb-0.4.0.ebuild
new file mode 100644
index 000000000000..4749b7480219
--- /dev/null
+++ b/dev-libs/libgusb/libgusb-0.4.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+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 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="gtk-doc +introspection test +vala"
+REQUIRED_USE="vala? ( introspection )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.44.0:2[${MULTILIB_USEDEP}]
+	virtual/libusb:1[udev,${MULTILIB_USEDEP}]
+	>=dev-libs/json-glib-1.1.1[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	sys-apps/hwdata
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-util/umockdev-0.17.7[${MULTILIB_USEDEP}] )"
+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
+"
+
+python_check_deps() {
+	python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	default
+	use vala && vala_setup
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Ddefault_library=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_feature test umockdev)
+
+	)
+	meson_src_configure
+}
diff --git a/dev-libs/libksba/Manifest b/dev-libs/libksba/Manifest
index cd5a342fddc5..fe54c778a0a3 100644
--- a/dev-libs/libksba/Manifest
+++ b/dev-libs/libksba/Manifest
@@ -1,7 +1,4 @@
-DIST libksba-1.5.0.tar.bz2 656518 BLAKE2B 077655031f82ff13c596ad0be0d0f15408a5b793f00e3af3516f4f207285f7d76096216c7bf11d2c46c28eb332cc74df39bef84afb0f47184c8ebdd8cb92a86d SHA512 84383e8b084bf47ac646a9aacb174e510ffcab4b966b649e4351990eaf7ce78cc9d199e6c4f3a1be697888c857ee86ecef949c06156790c7d8d0bd0fb0142721
-DIST libksba-1.5.1.tar.bz2 659280 BLAKE2B f247a2c9545e3c3ae3bbcf50344ca530ef320d12b9a1e301bca086b0e1a69e6b7a88b912b14f862d82e7ad45bf588754db601d987ee42579d8042e68b5108d33 SHA512 156fe6a36daa7b11ce580366ab36a5fceda253413f0057ace791e4f028fd3158a70a3f6ba1d0c824fafee4420d1076864dbd0911606fb65e14c8b2332b6cc92b
+AUX libksba-1.6.0-no-fgrep-ksba-config.patch 636 BLAKE2B 5a24f231225d77835b62c3acc1fe5f36b9c9cc8d99d0ab0e86c3de34d49211f660105a8f9b4fe9e3b0ba0fec5ce9a6bceaebb31bbcbd80d7e623be69f17aa8a4 SHA512 8393052c0d1338e51cac150db5aa4f6b9607f437a13c0d58be22e9f7975f031d757790accb053db0c621a76ebc1b1603721f6d79f90f0d515aecf525e5b65999
 DIST libksba-1.6.0.tar.bz2 662120 BLAKE2B 59bee23f764ab3e0f79fae6074ffe568845b6089ff29b8c5112973490ff5e1436834d5d0b50954ba9fbd6be655f47043a6345181c5c7e552322ceb331d030780 SHA512 a7c76d41dfd8ec6383ac2de3c53848cd9f066b538f6f3cd43175e3c8095df51b96d0a24a573481c0c4856b09b7c224e2b562d88f5c0801e7acfb582ea2739c2b
-EBUILD libksba-1.5.0.ebuild 1045 BLAKE2B 3a522d4a2e1c74b5f7480643697905061c39dbe8c40f448679ca5102b630f94566766ff286c588847cad686a8aeb24c8105097613359a30a51f92ef26989ce99 SHA512 0a0b32fccad43d1e6c06fc451ea300c847053802157e0e72b5c38501144074a8b3dd6bb4292225ca712c4dd0b5460525ca8b5a8401da9f11a4617d6762365fb6
-EBUILD libksba-1.5.1.ebuild 1045 BLAKE2B 3a522d4a2e1c74b5f7480643697905061c39dbe8c40f448679ca5102b630f94566766ff286c588847cad686a8aeb24c8105097613359a30a51f92ef26989ce99 SHA512 0a0b32fccad43d1e6c06fc451ea300c847053802157e0e72b5c38501144074a8b3dd6bb4292225ca712c4dd0b5460525ca8b5a8401da9f11a4617d6762365fb6
-EBUILD libksba-1.6.0.ebuild 1058 BLAKE2B 51ce7a93f6561d8c631072a742132676eaf636924ab46bfd93fd45f789403c40298ce31a92677e30e43868e7636a95d6740999c31e3f9961ef419ce952f7a6b7 SHA512 9cc8ed42f6fc43ce99294be3c02495e5d5f4918f441d44576e01038571955db9da96268846f1cc90751f91eaf40ccd03cf2d0b6b1ad761000350fc5279f16d85
+EBUILD libksba-1.6.0-r1.ebuild 1129 BLAKE2B 02bc3e3ca7d5ff452f0adabbde65371df3eee9ad17fa8972b7440637dcfcc1caf9830b1b70645fd6bc95c49de6a9dd0f8d0f90009bf169af9f4e64bc2e1d06fb SHA512 211797f35a8f267e511fafc946fab54a4aaf8bcd52c6df6ea1d46c6c7f58d952adb92f175f940c49dd2b58443ce985b196256e2e39a247f94334aae54967c1df
 MISC metadata.xml 258 BLAKE2B b3ebb9691cf2c860b26172c2fc7ead843959a83806b7c06f4eec2ea349a6d2f39afe2f4b08c09bc7f65d18bece520b8b6306c8c7c2075d653f04b09af43db8fd SHA512 02ab38ca1547c68e87cbcad1dd4bb121e90d1fcca941cbfd29583ea803ed50617aa6a29df11915af5e95d63fc817df2250c7b8189157d705ef86e477d6a1685e
diff --git a/dev-libs/libksba/files/libksba-1.6.0-no-fgrep-ksba-config.patch b/dev-libs/libksba/files/libksba-1.6.0-no-fgrep-ksba-config.patch
new file mode 100644
index 000000000000..7c5f7e85cd0d
--- /dev/null
+++ b/dev-libs/libksba/files/libksba-1.6.0-no-fgrep-ksba-config.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/868384
+--- a/src/ksba-config.in
++++ b/src/ksba-config.in
+@@ -126,7 +126,7 @@ if test "$echo_cflags" = "yes"; then
+     fi
+     tmp=""
+     for i in $includes $cflags; do
+-       if echo "$tmp" | fgrep -v -- "$i" >/dev/null; then
++       if echo "$tmp" | grep -F -v -- "$i" >/dev/null; then
+            tmp="$tmp $i"
+        fi
+     done
+@@ -140,7 +140,7 @@ if test "$echo_libs" = "yes"; then
+     fi
+     tmp=""
+     for i in $libdirs $libs; do
+-       if echo "$tmp" | fgrep -v -- "$i" >/dev/null; then
++       if echo "$tmp" | grep -F -v -- "$i" >/dev/null; then
+            tmp="$tmp $i"
+        fi
+     done
diff --git a/dev-libs/libksba/libksba-1.5.0.ebuild b/dev-libs/libksba/libksba-1.5.0.ebuild
deleted file mode 100644
index 24c1dc721659..000000000000
--- a/dev-libs/libksba/libksba-1.5.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="X.509 and CMS (PKCS#7) library"
-HOMEPAGE="https://www.gnupg.org/related_software/libksba"
-SRC_URI="mirror://gnupg/libksba/${P}.tar.bz2"
-
-LICENSE="LGPL-3+ GPL-2+ GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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="static-libs"
-
-RDEPEND=">=dev-libs/libgpg-error-1.8"
-DEPEND="${RDEPEND}"
-BDEPEND="sys-devel/bison"
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
-		LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
-		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	# ppl need to use lib*-config for --cflags and --libs
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/dev-libs/libksba/libksba-1.5.1.ebuild b/dev-libs/libksba/libksba-1.5.1.ebuild
deleted file mode 100644
index 24c1dc721659..000000000000
--- a/dev-libs/libksba/libksba-1.5.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="X.509 and CMS (PKCS#7) library"
-HOMEPAGE="https://www.gnupg.org/related_software/libksba"
-SRC_URI="mirror://gnupg/libksba/${P}.tar.bz2"
-
-LICENSE="LGPL-3+ GPL-2+ GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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="static-libs"
-
-RDEPEND=">=dev-libs/libgpg-error-1.8"
-DEPEND="${RDEPEND}"
-BDEPEND="sys-devel/bison"
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
-		LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
-		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	# ppl need to use lib*-config for --cflags and --libs
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/dev-libs/libksba/libksba-1.6.0.ebuild b/dev-libs/libksba/libksba-1.6.0-r1.ebuild
index 184c9cd1140c..4519c155623c 100644
--- a/dev-libs/libksba/libksba-1.6.0.ebuild
+++ b/dev-libs/libksba/libksba-1.6.0-r1.ebuild
@@ -16,6 +16,10 @@ RDEPEND=">=dev-libs/libgpg-error-1.8"
 DEPEND="${RDEPEND}"
 BDEPEND="sys-devel/bison"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.0-no-fgrep-ksba-config.patch
+)
+
 src_configure() {
 	local myeconfargs=(
 		$(use_enable static-libs static)
@@ -28,6 +32,7 @@ src_configure() {
 
 src_install() {
 	default
-	# ppl need to use lib*-config for --cflags and --libs
+
+	# People need to use ksba-config for --cflags and --libs
 	find "${ED}" -type f -name '*.la' -delete || die
 }
diff --git a/dev-libs/libstrophe/Manifest b/dev-libs/libstrophe/Manifest
index 6b7837786b4a..9a78c23bf8e8 100644
--- a/dev-libs/libstrophe/Manifest
+++ b/dev-libs/libstrophe/Manifest
@@ -3,5 +3,5 @@ DIST libstrophe-0.12.1.tar.xz 398492 BLAKE2B 9f0e06952603d51a0697366a83d6fa80af0
 DIST libstrophe-0.12.2.tar.xz 400092 BLAKE2B 28b655e4bf3a279f837fd26e7c7ba34cd32053ad16be660c04d1c07b5335d805e9745cd24af584ed62f8ae44caebd8bda48473872163c122ecbcd57f042fc3db SHA512 1026f57b107a0ff8f088a5c7f1d88b3b5a35d0e6bfefb4f6eb56de37fe9fd2f554f547663a41353b7c6b01a2aa47f6cab4a9f7a7c87ba8c0c7708d7b2b4c2086
 EBUILD libstrophe-0.12.0.ebuild 1098 BLAKE2B 26ddb67d356153b17703001dde23cb867421a8d0aece702c614c3109a2e0ad67b56faf83d5cb81c2d44964d077a79319a365915aa9aae967914bdba0b906d91c SHA512 7870002f1358c72bf8404f897398eced26ae070a496bd341d3b9185d377d375f254a49df5009b8f35d27880f11f761d6abd4c0fa1bdf61b33cc87faa8e9802b3
 EBUILD libstrophe-0.12.1.ebuild 1077 BLAKE2B 2101b4722ecb56a4b44c996ea117101ac2bb5210b5e9c2985f5e4313786529167e6d18f08af512970548c0f5abdb06f023a8ed9d0f57f4f412fe5c4a01138648 SHA512 d393ebdac2d807007ae611cc00f459409cec134f1b870b5c2de06d7302eb8f5ac2f85b4ecee9e4d34631c4ffa0ab256782a91b3af099d29963280b8854d4d6ee
-EBUILD libstrophe-0.12.2.ebuild 1078 BLAKE2B 458b0073edc90736f2752d386ddd79497b40061452011a1fe1ad09b9931ba96d3aff9bb78e0a8ce74900b7e242affb226301d02c1a73bebcad76585a478954d6 SHA512 6d0e08338357ea7027cb238bfc83fcb54b90042f4e17d643e931eab3d93bbe9e76383d053ff7f378278b721d013c83c4cd76373488c370a7c19ae715175d9c8e
+EBUILD libstrophe-0.12.2.ebuild 1077 BLAKE2B 2101b4722ecb56a4b44c996ea117101ac2bb5210b5e9c2985f5e4313786529167e6d18f08af512970548c0f5abdb06f023a8ed9d0f57f4f412fe5c4a01138648 SHA512 d393ebdac2d807007ae611cc00f459409cec134f1b870b5c2de06d7302eb8f5ac2f85b4ecee9e4d34631c4ffa0ab256782a91b3af099d29963280b8854d4d6ee
 MISC metadata.xml 711 BLAKE2B 0fc95d72ff0d9dbf1765e8b2ddf7182d6543cecdd275798e79ad8bdf8bc494234f6fcd8acc76c6d3e87f6f4159d4b0ea0e70706932628173b1b75bed6c788701 SHA512 d8eb8fcbadee45ff2d411d766e3fba2afb18b2516eb4172ff2b072ef9b5469d7a92c32a4b70e989fd0b56eeaaad39d5f187748f7aedc6dca32493b1f2d0ca817
diff --git a/dev-libs/libstrophe/libstrophe-0.12.2.ebuild b/dev-libs/libstrophe/libstrophe-0.12.2.ebuild
index 77bb69760d4a..a491acaf81f5 100644
--- a/dev-libs/libstrophe/libstrophe-0.12.2.ebuild
+++ b/dev-libs/libstrophe/libstrophe-0.12.2.ebuild
@@ -8,7 +8,7 @@ SRC_URI="https://github.com/strophe/${PN}/releases/download/${PV}/${P}.tar.xz"
 LICENSE="|| ( MIT GPL-3 )"
 # Subslot: ${SONAME}.1 to differentiate from previous versions without SONAME
 SLOT="0/0.1"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="doc expat gnutls"
 
 RDEPEND="
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index e843ce1648e4..cde65fa326df 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -8,6 +8,6 @@ AUX nspr-4.8.9-link-flags.patch 931 BLAKE2B 6aa6aa1cf3b856a95b7baa20f58e9ed83b8b
 AUX nspr-4.9.5_nspr_config.patch 251 BLAKE2B 65ae8b981e758e2955b7a3358f24b7b17dc1ef59f0e78f9fd9ddee740a4da3825bafea34f3900200b3f6edefed7d0797c194cb0339d4e36551615d599156108d SHA512 3f118b7142a19dcc7e26b348cec6029c78d585a57cc2bfc2ab7ca13d2ef953e576dab0ac044316e3165d0201bf27253afa732109f914da6f7a39f19facff8310
 DIST nspr-4.34.1.tar.gz 1096874 BLAKE2B be12bda63a72d25a60542c5cdadaa7dc59ad2d40d41affc0af5eab07659129ff235a62227a78285e4c00bc72a365b49691658aee7818ffc4c5d014aa0c2b0df7 SHA512 b77226c3fbba6fc9acc90deb8496370dba1384de72ce564524c03bc239846fd17c27d7e1fd7ce99161faafdd8c92413ee58ce1a74a41c786759210bbab478991
 DIST nspr-4.34.tar.gz 1096407 BLAKE2B 61199c1319578570f9569011a2fea8ec6b8c4e8337b03517d1b0e1a22749a7449feb2152c348f3a1d73fefa7aa5067be460f4cbc1728c479309f4a2592424fdf SHA512 4cfac886c14cf7df4c4b79fa1c3bc92e1b14260c9c3018fa2562060d62fecb4e66c0b4e8f7edf4f4823def784a919d99dde88a89674f0cd8a644310b0569ead4
-EBUILD nspr-4.34.1.ebuild 4864 BLAKE2B 867b7f356ec292fa620376019567cb3678c4f701df12d7621e2457b397a3da06b49bfc9d9c6e2c0f9b7b6ebdc2ebabf780e7dddc6e57d5cb486189609a655c4e SHA512 bd08eb30b66d80b1eda075c778ff24f514da5799e2d73e3beff19a5c6e764c33c4a8714d887be8f5c27288212b784c78152983c8f58263820f9bb4f32375e45b
+EBUILD nspr-4.34.1.ebuild 4863 BLAKE2B 91edeae0ba8e11e94a8154bc0920c41aa180d73a4b71f25dfe6e132c1eea57f17bd86909da8f706d3c7271acf5d0aebf761f7ac853176971967665397b6ae268 SHA512 184eb5f3e9db4957f383c98084994010c0982dcb6199c9b9058cec99f256db94e89dbe1032e14e0bb74f2ae88a1e1897bdac8fd5cf7bf9e799377954a165b372
 EBUILD nspr-4.34.ebuild 4860 BLAKE2B 9cc8a8f045aa6f69987d7285927566dcc4578c1a9d16ae52de238462936565459e5f4a5dec655c4fa70dcb95dcdae461464422b10bf54feacaa2676825743520 SHA512 9e3f5aa90aea50e0c3b5e350d841f5c18a1dd41afa5aa80807454f18c339aa3d95b3e717b77fd1747de5c46f0cf118d1f7efe1ea496259d7a053f76e3a19d60c
 MISC metadata.xml 350 BLAKE2B 0f4d7850a3ca725af4e01a47e4db4219d2465b6d4db8c44e12b8f57d2064fd3c6ddbeec16888a316627f96e1f9415777f3fedecbd7065e4d13516bbed473a6f6 SHA512 2cc7f3e6eefcb5ba16c4b2127e751c47ea7a6822eb71080c96c6850ef741acff8d424c520eb60288ca32ccdbe825568d7aced9f57148e304dddd0afb7f4a8883
diff --git a/dev-libs/nspr/nspr-4.34.1.ebuild b/dev-libs/nspr/nspr-4.34.1.ebuild
index 1155e9e13110..008ba8930e99 100644
--- a/dev-libs/nspr/nspr-4.34.1.ebuild
+++ b/dev-libs/nspr/nspr-4.34.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="debug"
 
 MULTILIB_CHOST_TOOLS=(
diff --git a/dev-libs/pocl/Manifest b/dev-libs/pocl/Manifest
index b86f3b669840..193fd7cf4322 100644
--- a/dev-libs/pocl/Manifest
+++ b/dev-libs/pocl/Manifest
@@ -1,8 +1,5 @@
 AUX pocl-3.0-fix-version.patch 354 BLAKE2B 8e2b4570c204dc37bb70f20b01838f0c21a6aec57c258a206eb5e82bed69fe01d65f704cfd184c102102fd3a06eb75fb092a2ccfa4d8729192451fa894afc7e9 SHA512 bfe023132ab8080c8539a783586f9c556e7ae4cb8113c3c96b33ac02bd7d4044b36bf13e1556e181af9c12acb4b0e0778af25fd66df1fe6e7ab533c2b68108c4
 AUX pocl-3.0-icd.patch 5679 BLAKE2B 4f9edba1e71afb8c059da8f1adcb59f0ccca1bb33ad0c05eb2d3b27c1e7ea6bfa3a2d60f6e6c83136146275aed35a6501713883dad72011379e0ed4ae64eba74 SHA512 436b7f6e53372f00a8c70bb00229d22d05f24687ba2822f4b26590cbdffe64e8c2909d2f1ab6e0650fe18db7507c6bba9f5bcee1a09ec1fe5b42955ddcb99db7
-AUX vendor_opencl_libs_location.patch 962 BLAKE2B 6d0e3f070fa2022d95d35fb1563f72f5dc1b544c7f83417dbb5e3d100dad07bdf3365a48ee92e856de4edc4b7c25674b45efd6d0ace1ac559273641ca175a269 SHA512 2ae144e7590049cc1eac8fa30e360cd511331abba0dfe683867d6a089742ea12cc3bc48dafe41a1c1c9b891fdf35aaac8b14cc1e10a78d2ab49b5e14635bb258
-DIST pocl-1.8.tar.gz 1614545 BLAKE2B b0ccc08d1f899719f5def731c61727440035a879ebeebae89dd406423eba6c12b866f34cd47dd0e0f944b7f0c4569c57c44a9a62bf02552de5c4c3b8c9fb3b48 SHA512 bcbb3fa3d2234d4c5b0c17863eba0bc4c8f13f863cc58cfd1de49e21fa7bf0aec82b81aec143c81885e3a39274c8ae783b2f03b9a12846e024204d6ed0e59a9d
 DIST pocl-3.0.tar.gz 1722809 BLAKE2B 095d3d1dca3fa7ebdf61e6e34bf444755dd6842c4f16e0f80895337e96508056465d332309d38ee4db6d6b0031e1dfce350485750e59bfe0dea5951eba5fd3e4 SHA512 dc02bdf259792edb5cb3c80cde5c5261e1e21219b4b31420a3b537abbca1bc478ce0ca0dfc622727088b67d580217d47566309de7c6114a24553de4496a209ea
-EBUILD pocl-1.8-r2.ebuild 3125 BLAKE2B fbbaf9f1fa1801fe088dbc1c4fbb669c4f9f499dd7dfbf30bbdc29dbad4028f687369b78e0fc1923d58fb5f0046eba0c1ec0a0a9e733336ca609bb2b1389f5b8 SHA512 cb47b5021be314f9b80c2b21b59699a4ad9586eed4e554a98dce72c4fe15e93bcb9fd5ce5aa96231312a160fda63b558414f0b0278fefb8d55e9ff9586b3add6
 EBUILD pocl-3.0.ebuild 3665 BLAKE2B 65b2a62cee9f1dd3db5311a0bbe72cbe4684373806c0041a98dd3885832ff257a31a56f35ce6cf7ed83e351f8531d9ae576dccc686b5eef4213650d49c5295c5 SHA512 5e2ece4609ca2971fd8934728a5954a503936ba03b210359f92f176dff092ed9b2d5227d8fe6d8e5ba0e67fa3227ec86d2e732220d0458f3973b51db498ed9e2
-MISC metadata.xml 1265 BLAKE2B 857cd7ad6dae95355a8102678be5ac4628eecc4b3135ed910b06e9bb5cb5df4473ba6228cd54908717ec87386e7ae41322e8546403648f5d90cd1db57eec8861 SHA512 800fdb1d3c430cd4c4cf3a9792297708cf7779863da2e477327d0bc21c2f4ed83b599f1b703efa31b144140cd2c657a18fc76ce0a7dc5db51e7e27f202ac0e0b
+MISC metadata.xml 1191 BLAKE2B 62b985abe8c99532cc20302846fe9e05c77bbc993ef38863d44bd754df2bc388e5d094917ad11d1b117e9dfda355e35f5592fc2ede5a3bc8e91939c9e6aef9e3 SHA512 a9cdbff5f2b2e2141c6299137baed08d1e8482f3b976ef494b595f58092761aab66f33e539d236d8b7f1c564d5fa2aac4855447b54bc189f1dd81faf25fc32ec
diff --git a/dev-libs/pocl/files/vendor_opencl_libs_location.patch b/dev-libs/pocl/files/vendor_opencl_libs_location.patch
deleted file mode 100644
index 548589ca41bc..000000000000
--- a/dev-libs/pocl/files/vendor_opencl_libs_location.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -125,7 +125,7 @@
- endif()
- 
- # for libpocl.so
--set(POCL_INSTALL_PUBLIC_LIBDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}" CACHE PATH "POCL public libdir")
-+set(POCL_INSTALL_PUBLIC_LIBDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/OpenCL/vendors/pocl" CACHE PATH "POCL public libdir")
- 
- # for llvmopencl.so
- set(POCL_INSTALL_PRIVATE_LIBDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pocl" CACHE PATH "POCL private libdir")
-@@ -134,7 +134,7 @@
- if(UNIX AND NOT CMAKE_CROSSCOMPILING AND CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-   set(POCL_INSTALL_ICD_VENDORDIR "/etc/OpenCL/vendors" CACHE PATH "POCL ICD file destination")
- else()
--  set(POCL_INSTALL_ICD_VENDORDIR "${CMAKE_INSTALL_PREFIX}/etc/OpenCL/vendors" CACHE PATH "POCL ICD file destination")
-+  set(POCL_INSTALL_ICD_VENDORDIR "${SYSCONFDIR}/etc/OpenCL/vendors" CACHE PATH "POCL ICD file destination")
- endif()
- 
- # for kernel-<target>.bc
diff --git a/dev-libs/pocl/metadata.xml b/dev-libs/pocl/metadata.xml
index 9e73154528e9..a08bc6bb7825 100644
--- a/dev-libs/pocl/metadata.xml
+++ b/dev-libs/pocl/metadata.xml
@@ -6,7 +6,6 @@
 	</maintainer>
 	<use>
 		<flag name="accel">Enable the generic hardware accelerator device driver</flag>
-		<flag name="cl20">Enable reporting OpenCL 2.0 for the CPU device</flag>
 		<flag name="conformance">Ensures that certain build options which would result in non-conformant pocl build stay disabled. Note that this does not quarantee a fully conformant build of pocl.</flag>
 		<flag name="cuda">Enable the CUDA backend for NVIDIA GPUs</flag>
 		<flag name="float-conversion">When enabled, OpenCL printf() call's f/e/g formatters are handled by pocl. When disabled, these are handled by system C library.</flag>
diff --git a/dev-libs/pocl/pocl-1.8-r2.ebuild b/dev-libs/pocl/pocl-1.8-r2.ebuild
deleted file mode 100644
index cba8d60fd806..000000000000
--- a/dev-libs/pocl/pocl-1.8-r2.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DOCS_AUTODOC=0
-DOCS_BUILDER="sphinx"
-DOCS_DIR="doc/sphinx/source"
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-LLVM_MAX_SLOT=13
-
-inherit cmake llvm python-any-r1 docs
-
-DESCRIPTION="Portable Computing Language (an implementation of OpenCL)"
-HOMEPAGE="http://portablecl.org https://github.com/pocl/pocl"
-SRC_URI="https://github.com/pocl/pocl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-# TODO: hsa tce
-IUSE="accel cl20 +conformance cuda debug examples float-conversion hardening +hwloc memmanager test"
-# Tests not yet passing, fragile in Portage environment(?)
-RESTRICT="!test? ( test ) test"
-
-# TODO: add dependencies for cuda
-# Note: No := on LLVM because it pulls in Clang
-# see llvm.eclass for why
-CLANG_DEPS="!cuda? ( <sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):= )
-	cuda? ( <sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=[llvm_targets_NVPTX] )"
-RDEPEND="
-	dev-libs/libltdl
-	<sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):*
-	virtual/opencl
-
-	${CLANG_DEPS}
-	debug? ( dev-util/lttng-ust:= )
-	hwloc? ( sys-apps/hwloc:=[cuda?] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="${CLANG_DEPS}
-	virtual/pkgconfig
-	doc? (
-		$(python_gen_any_dep '<dev-python/markupsafe-2.0[${PYTHON_USEDEP}]')
-	)"
-
-PATCHES=(
-	"${FILESDIR}/vendor_opencl_libs_location.patch"
-)
-
-python_check_deps() {
-	python_has_version "<dev-python/markupsafe-2.0[${PYTHON_USEDEP}]"
-}
-
-llvm_check_deps() {
-	local usedep=$(usex cuda "[llvm_targets_NVPTX]" '')
-
-	# Clang is used at both build time (executed) and runtime
-	has_version -r "sys-devel/llvm:${LLVM_SLOT}${usedep}" && \
-		has_version -r "sys-devel/clang:${LLVM_SLOT}${usedep}" && \
-		has_version -b "sys-devel/clang:${LLVM_SLOT}${usedep}"
-}
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-
-	llvm_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		-DENABLE_HSA=OFF
-		-DENABLE_ICD=ON
-		-DENABLE_POCL_BUILDING=ON
-		-DKERNELLIB_HOST_CPU_VARIANTS=distro
-		-DPOCL_ICD_ABSOLUTE_PATH=ON
-		-DSTATIC_LLVM=OFF
-		-DWITH_LLVM_CONFIG=$(get_llvm_prefix -d "${LLVM_MAX_SLOT}")/bin/llvm-config
-
-		-DENABLE_ACCEL_DEVICE=$(usex accel)
-		-DENABLE_CONFORMANCE=$(usex conformance)
-		-DENABLE_CUDA=$(usex cuda)
-		-DENABLE_HOST_CPU_DEVICE_CL20=$(usex cl20)
-		-DENABLE_HWLOC=$(usex hwloc)
-		-DENABLE_POCL_FLOAT_CONVERSION=$(usex float-conversion)
-		-DHARDENING_ENABLE=$(usex hardening)
-		-DPOCL_DEBUG_MESSAGES=$(usex debug)
-		-DUSE_POCL_MEMMANAGER=$(usex memmanager)
-		-DENABLE_TESTS=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	docs_compile
-}
-
-src_test() {
-	export POCL_BUILDING=1
-	export POCL_DEVICES=basic
-	export CTEST_OUTPUT_ON_FAILURE=1
-	export TEST_VERBOSE=1
-
-	# Referenced https://github.com/pocl/pocl/blob/master/.drone.yml
-	# But couldn't seem to get tests working yet
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	dodoc CREDITS README CHANGES
-
-	if use doc; then
-		dodoc -r _build/html
-		docompress -x /usr/share/doc/${P}/html
-	fi
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${P}/examples
-	fi
-}
diff --git a/dev-libs/pugixml/Manifest b/dev-libs/pugixml/Manifest
index 09196ba9fe3b..02e682e8d7eb 100644
--- a/dev-libs/pugixml/Manifest
+++ b/dev-libs/pugixml/Manifest
@@ -1,6 +1,6 @@
 DIST pugixml-1.11.4.tar.gz 386229 BLAKE2B 93d9c537f10e3a12297e4d6a39f2866bd5c9678c6aff83e20fb79b6587191b6586b1fe4d9dd995a7be05cc9281cd9910fae3eddf6b2eac216873e918a5cf3231 SHA512 c83f57ef2492eee359d979597fb5089b8eca547bb9d41cfbb6bcf43d59fe75e6780b0f31dd593145ec9888c065153aba52702667e2de213fa080cd51e9e13a38
-DIST pugixml-1.12.tar.gz 389685 BLAKE2B 190ebd1e7ac298a4ef6bc35769151f4d606a88185d29cfad7acb813990e3c9b2bf5b17c461f321942a3af0688c2244a896eb0129df8def5aff63b1d65aa3f6dc SHA512 1d23fc8b0aa643b932d34012be6d545734f5177d7db711fe1f0b82e318d72b5850a8c3d8513393b86b5a1e83ee7bfd825877f9efbf801369adfcb88041b52a93
+DIST pugixml-1.12.tar.gz 571637 BLAKE2B 46bacdef3e8eb2eeae877d1d62dcb19a442d840d784c2ff402a6b1bbfedb0af1379ec98344580a491472fc1014875f35ab2319d9759e0284dbb1afbcdae27454 SHA512 29395836a2add5f2bcb8fca6be5e517ce036ec2d041ca25aae5253f29f75fbc7214e7a411f0c0e470c2476ee49b4882d66dec3502a933004eb17e6119cd8f125
 EBUILD pugixml-1.11.4.ebuild 570 BLAKE2B d48ab88ac4014ac2a5fa31e2a9adc1c3ea93100f06c97275e9c7442aef426c5d87e47ad19710e17486d87fa714cfd0bac266ec48b8ec7571b91e9b872c5a5fea SHA512 198d20b624cde5812c82b6d18d1e5b8d573712f9cf758ec21c72b99d0d024d4cfb570e5a1fede5afccdaface8a912b8bfcdecc4f6a0b2a72121f34fa0c778e3a
-EBUILD pugixml-1.12.ebuild 579 BLAKE2B 64aeae1423224ce5e2ff8fd94f0e6e7790707e7c37c5984c9edc3a442f9da4fb64c2da7a54aca9c82480a47db890d49856db70b730e818f2e73fc03177dff94f SHA512 e6567842f8ce7b4d993f9ea1a3574f97f4ca045fa17f0b4abac1fd2648ec4e68d26b23ae43e8155828b9f59e594d08f070516e70ce4c3479405d2b6b4b88ea28
-EBUILD pugixml-9999.ebuild 575 BLAKE2B a0d46d8a41900827ff9dd1e837fd17af8a07287443e2f96fcaf50069941433d0d1d8b6479fee2ce211d0e5789a3b186a5a6a987565da58271b3d35acac56837d SHA512 063b603e7620e285822bc6b90880c345690b438dc317a728fe52e7778b2eaac43a5931ab61c5278d53390e7f5884ee843c2c2ed7b12b77822a93690c46e8e5b6
+EBUILD pugixml-1.12.ebuild 835 BLAKE2B 04a9fea7cc6b3eaba3d6bf2e4f518f245ba5b17104def21c3023ddb128c9d3db96a3f0256c2b388090faab54550ca94c0832eb103cf904526d1e9013b714a033 SHA512 83647d597690656584841423b299d5b5d132c6b50e86a83b4e40d3b1c19d300ec852e66f712f7fbb675ed4607fa8350daab72fc015898f0425feb356bccb0106
+EBUILD pugixml-9999.ebuild 838 BLAKE2B 03f76c8fc15cf8c0323ae2447fec592d3a6a4e98f67603cd9037ce61d33bba69f264b11c85a8ad2798a956859381b64670a3a716137bdbada0808e1e01280265 SHA512 34d0ba267b61a00e9cc7cc33ad46912eb4fe1420624aa22c846e8d396374a017aee7f19985dc95a78f2633e712a72e9f3e39563f49886c6af05eda3bd85de5c9
 MISC metadata.xml 347 BLAKE2B d86121989c61d616a24c02c5a7455be56522faed7d6d025a43b3035e9225fad555222106114800e37b765c6c4b73f3db90ac7afad2289c08269392429b413586 SHA512 fded6654794919a99715f373c129bf51b4f21d931f7ac696a8ec078310585128aae7dd7a76f7ad0227d5de3aac8ab2bef129a3ca5b73054293ca55b8561364bc
diff --git a/dev-libs/pugixml/pugixml-1.12.ebuild b/dev-libs/pugixml/pugixml-1.12.ebuild
index ebcd674be6c0..bc15a4c1e891 100644
--- a/dev-libs/pugixml/pugixml-1.12.ebuild
+++ b/dev-libs/pugixml/pugixml-1.12.ebuild
@@ -9,7 +9,9 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/zeux/${PN}.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/zeux/${PN}/releases/download/v${PV}/${P}.tar.gz"
+	# Use non-release tarball for tests
+	# TODO: ask upstream to include tests in release tarballs?
+	SRC_URI="https://github.com/zeux/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 fi
 
@@ -18,3 +20,12 @@ HOMEPAGE="https://pugixml.org/ https://github.com/zeux/pugixml"
 
 LICENSE="MIT"
 SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local mycmakeargs=(
+		-D${PN^^}_BUILD_TESTS=$(usex test ON OFF)
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/pugixml/pugixml-9999.ebuild b/dev-libs/pugixml/pugixml-9999.ebuild
index dd62094ec7ee..ab15c38b19e9 100644
--- a/dev-libs/pugixml/pugixml-9999.ebuild
+++ b/dev-libs/pugixml/pugixml-9999.ebuild
@@ -9,8 +9,10 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/zeux/${PN}.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/zeux/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	# Use non-release tarball for tests
+	# TODO: ask upstream to include tests in release tarballs?
+	SRC_URI="https://github.com/zeux/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Light-weight, simple, and fast XML parser for C++ with XPath support"
@@ -18,3 +20,12 @@ HOMEPAGE="https://pugixml.org/ https://github.com/zeux/pugixml"
 
 LICENSE="MIT"
 SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local mycmakeargs=(
+		-D${PN^^}_BUILD_TESTS=$(usex test ON OFF)
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index f3fb283d55f2..7b2fa38f9c3e 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -3,5 +3,5 @@ DIST vala-0.56.2.tar.xz 3967960 BLAKE2B 60b48ee3ddd1cee087819cded91ccbbe378a6945
 DIST vala-0.56.3.tar.xz 3969676 BLAKE2B 66fba756d89b7fbc9689a9ff7ef8d4689b53b9ee570225fb268bb433e9c14a876eac1565999944ad72864d9a3c62f777d534579ee7ca091d90e405ef2b271314 SHA512 3222edab995a1d405bc891b37ffb4915677b7bb56ce3be7d1ece1dfb77f2d054bf7499dad9e6eb593c42678ae2c2c7cd779a595b702a3e2e38e9e0e0d69ba99e
 EBUILD vala-common-0.56.1.ebuild 652 BLAKE2B a6f3cd9df801208cec45606af33db763d5abdee123bbbbb89399f510b2bcfbeaf9cb345530787d997eacc1367f97ccb93471e6a8aa154b4911768b180a45a0c4 SHA512 3c92712b742cc3f84cbf16f5851260287a42a9fb7eab5110223e30fe30be2a43a8f76f7d452ebe70e9c8adb0f8b29fc17c18d8fe0f08d7dbedf100f660166dcf
 EBUILD vala-common-0.56.2.ebuild 660 BLAKE2B 3578c6d15454f83e69064a44c1d80bb1725cc4e4c27cfe81f6339c1f4695a0d34c722fa66954a5c0dd0ae925ee2eb731d482e341b6aafb1d771c34d931a1eee9 SHA512 5806a45e7a02b88f15a51fc2e7d0a3e2e04fae5a8985277de79d35365512af466855f127fa70329c52cd8768baafe8ba17004879bd352ee98fd18d38bae851b8
-EBUILD vala-common-0.56.3.ebuild 696 BLAKE2B cda13fb791cbae85a7aee8bb47c6d547cac279397b4aac202e85d9da34cf9317b36b6a6f1e49f6e9c46062f61756c321a41c75e22866c07f39e8c2ec60a2d007 SHA512 44bbf5b6643fcf57e3ef4782c60d2a2f0e0cb63fc43b9ae087a5567c13f5f74315a9321902e8ca0b5ceae411a34f32b237b51d2742bc49282b64211fc410a65a
+EBUILD vala-common-0.56.3.ebuild 694 BLAKE2B ea5af57713559a24c217256f84b6528fa004ad1afe3132589b64845317666f6eaf992ca9e8de86d63be6885d63abe85178f1b372474ab0ccfc24d86818d6c667 SHA512 b5e397f40f8f09698fb23264c7e4612566fad46feafe5b57b4f28e353a2c08a588907358c02286143e341277b1fbf184fb83d101debcdb68fa6c699b4b7d77ee
 MISC metadata.xml 326 BLAKE2B cd8c49993b750ebef93c620f819f42b858431d1aab4d2066a124a5118d5d18f4970b9d1eccb77121089264db7cfbe69ca06fb2fc2d2c4db98047629af9878db5 SHA512 52854d43fb74af5402cb1855409ab25d6741ea6fe48ae50416044d7b518745b02752e69cb9680e9c132e3a2f65ae29d92e9e771ac883e2ef01ae91effdf1097f
diff --git a/dev-libs/vala-common/vala-common-0.56.3.ebuild b/dev-libs/vala-common/vala-common-0.56.3.ebuild
index af2f4977c2a7..1889f60e7808 100644
--- a/dev-libs/vala-common/vala-common-0.56.3.ebuild
+++ b/dev-libs/vala-common/vala-common-0.56.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala https://gitlab.gnome.org/GNOME/va
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 
 RDEPEND=""
 DEPEND=""
author	V3n3RiX <venerix@koprulu.sector>	2022-09-14 11:10:11 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-09-14 11:10:11 +0100
commit	81b8f20732954c4508baf2f77472b5435e3f851f (patch)
tree	4180177cb7ba85eab50159ce96218c2419fb24a6 /dev-libs
parent	946859e0e36904cffb3e0ccbccb6b7b1347c1cc8 (diff)