gentoo resync : 31.05.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-05-31 20:59:14 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-05-31 20:59:14 +0100
commit: e748ba9741f6540f4675c23e3e37b73e822c13a4 (patch)
tree: 23dece8beabb3a3d7c6c0273b0eb40b21c62a889 /dev-libs
parent: 908778078736bd36f7a60a2d576d415cb8e000fa (diff)
204 files changed, 1640 insertions, 1823 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index e2a02f794d8e..7762be5ebf95 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/bemenu/Manifest b/dev-libs/bemenu/Manifest
index ef06ea8cdfbc..5b1f87ab7b31 100644
--- a/dev-libs/bemenu/Manifest
+++ b/dev-libs/bemenu/Manifest
@@ -1,4 +1,6 @@
 DIST bemenu-0.5.0.tar.gz 110749 BLAKE2B dbc6d295262e51c381a9208c6936c0f40e05f3667af6a562716501577861d04c7b28ba836acbce2a6644950a191e56f865efe2f126eccdad67ea68d42f2d30b5 SHA512 5f4397bcb77d3e22340988bfb131feced1782f724ff637e40bf03c36a4377f38127c827f55faccc0dcce2ca482b9353fca7c6bfe700e6cac8e095e0df3b87a31
+DIST bemenu-0.6.1.tar.gz 119885 BLAKE2B 9595fe9241009d4b2ac33ff0b70d98a5340e7f9cc3a31be053ef7ba5dcadc3e0181dae3a82b8058278fdfb62df4a60474e16eb2e2fa207c200350a6cc4e27767 SHA512 a0a77ca50d40c4aa215c668829a8e27597a4b6470be6179420125ec292c8f9555e5690791c068af5f4a5eebd8a10c6b15b0ddafa037a855b0179bd68c06bf11a
 EBUILD bemenu-0.5.0.ebuild 1147 BLAKE2B aa97ef742fdeca8fc8bb198a936a19fedbb6abd1994a15dc9073a209c241574150cd37fad669fb28b7539b95ce8897a93830b220c70e8dc56a90160d2ce75d88 SHA512 2e1165fc6b3ab5e9203f47e505ad56d9184149862509084490350832f3ff9bb84dab9374753293e82cd0381f653d1d1f30b0940d7044ce9c81ca8f04402478f2
+EBUILD bemenu-0.6.1.ebuild 1147 BLAKE2B ec4cf43bdbae360734c0d949e9e893df8f3f786dbb53f39b9d8750405cca312e1e63fc28e013266ca245178ffab1ab4dfa06f6ac9dbe2b7800ab4b2035beef27 SHA512 03340bd112b4b854d69b2317bb8c6903fa5d67786f54e8b40f1c29dfb347d659a2b20a9d2891a4803845c229ebbd8923a6dd6807c7de0f83f4dc69edc9c77910
 EBUILD bemenu-9999.ebuild 1147 BLAKE2B aa97ef742fdeca8fc8bb198a936a19fedbb6abd1994a15dc9073a209c241574150cd37fad669fb28b7539b95ce8897a93830b220c70e8dc56a90160d2ce75d88 SHA512 2e1165fc6b3ab5e9203f47e505ad56d9184149862509084490350832f3ff9bb84dab9374753293e82cd0381f653d1d1f30b0940d7044ce9c81ca8f04402478f2
 MISC metadata.xml 254 BLAKE2B 731c7015b1415180253ab851fc24ad031153050aa0feff41781a5c16ced70787ca132b4fe53adaa8a189de944dda987c65081162895f1f03d68dc77405308fa7 SHA512 49faa8aa0aef31db638fe291aa55ff114f96fd9f9b2c733f88b326b44f3e9dbf627e825de7c41d45f208b2b7e5e6cd5c03e6fee3fa6013625ce7ce158bbc9a31
diff --git a/dev-libs/bemenu/bemenu-0.6.1.ebuild b/dev-libs/bemenu/bemenu-0.6.1.ebuild
new file mode 100644
index 000000000000..02ec034fd64b
--- /dev/null
+++ b/dev-libs/bemenu/bemenu-0.6.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="dmenu clone for wayland"
+HOMEPAGE="https://github.com/Cloudef/bemenu"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Cloudef/bemenu.git"
+else
+	SRC_URI="https://github.com/Cloudef/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="doc ncurses wayland X"
+
+# Require at least one backend be built
+REQUIRED_USE="|| ( ncurses wayland X )"
+
+DEPEND="
+	ncurses? ( sys-libs/ncurses:0 )
+	wayland? (
+		dev-libs/wayland
+		dev-libs/wayland-protocols
+		x11-libs/cairo
+		x11-libs/pango
+	)
+	X? (
+		x11-libs/libxcb
+		x11-libs/libXext
+		x11-libs/libX11
+		x11-libs/cairo[X]
+		x11-libs/pango[X]
+		x11-libs/libXinerama
+	)
+"
+RDEPEND="${DEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
+
+src_compile() {
+	emake clients $(usex ncurses curses "") $(usex X x11 "") $(usex wayland wayland "") PREFIX=/usr libdir=/$(get_libdir)
+	use doc && emake doxygen PREFIX=/usr libdir=/$(get_libdir)
+}
+
+src_install() {
+	emake install PREFIX="${D}"/usr libdir=/$(get_libdir)
+}
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index df00acb24243..863cda9d3575 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -4,8 +4,10 @@ AUX boost-1.71.0-disable_icu_rpath.patch 1077 BLAKE2B c4549b7a706cd934392bdafb44
 AUX boost-1.73-boost-mpi-python-PEP-328.patch 396 BLAKE2B 5f08ce2eab46f2d108166afef086382dc9cd9a5305435cf437fa3ae505736979664357aa23cc51b2a74bee6aae46d94a671056037578562846e900fd2c7e65e8 SHA512 fa55d1da17bd110db2c9a16dce4da267a62ef10c13a6dc3aa6afd3b33e9a18499266b4411d292533b1c691e3bf0309fa1aab8ec19e7775a7835d89275183e6f2
 AUX boost-1.73-property-tree-include.patch 1832 BLAKE2B 7488cf768209bde32af608f366ad0d9a392bb36e6b9e4c7ac13a262eedea668fb58667f41cd089c91f43fee4a6a68e442c2e627ffa2341c44274b4f4f7f644db SHA512 a18fa18388b74371aa3d3826621df90e8c8f6d2c6b9cf25bc9f7761e98817cc9252ccd43fa5a374136f257e9a0c1f927eb9912d0715bb1de94b3e92af957d84a
 AUX boost-1.74-CVE-2012-2677.patch 4965 BLAKE2B 74cef075cd0aa4d4425e75d437a59c19e20325cc33c9c8fb206bdcf87efbafa6d28c6ebcd8b70f88f12e32b68b492ac6b985ccef703c61439661a194983b9ad9 SHA512 c8e6758840b58358b676226ef9f498b9e72cbeedee83cd6c8ea0608a6bc1466bedeba5b7a92d1a608c3a2788cb3c0444203e70995e3b3123198bf68081b477b9
+AUX boost-1.76-boost-numpy.patch 910 BLAKE2B 6f0b8fdf908e7be43556ba61301d0465f0b8464120d342b6ddbd053eecc432bf2c4a60e84eced622bd3fe0da468c5941fa2d5b9592490c453193ef3eaf239a8a SHA512 245cb97c493e85eae3567a720eebac7eb53d1691d22015edc27f7a56e379c9f59f5a89c49889149ec203c28ede2ed1b9853c742e604fa4b60f7a83f8b2698fba
+AUX boost-1.76-sparc-define.patch 1026 BLAKE2B ad88b1c5231c0cbbd6bfb1f01d050ff20fbee145a656a439b2920f23f116693e6a999dce9db6bb0cac94ad2f98580f0669198d026b28c05fe7a82b5887fbadff SHA512 62d63bc3db7352daf6ad47a25bbeef2bed3405e4e43650d4c34ad8535a96ae13f875837b727082c8a5b7671c35a67a20978baf44d59f15a57053308a31827373
 DIST boost_1_75_0.tar.bz2 121849575 BLAKE2B ce7ecd8bcee518ce54f7e5302f202acbea60cedd6ae9248708c0bb5bbc2713607b2e1967a9e6f77cc20a4c008c1ee4db651def55937efc80407487a7a44fa8d6 SHA512 d86f060245e98dca5c7f3f831c98ea9ccbfa8310f20830dd913d9d4c939fbe7cb94accd35f1128e7c4faf6c27adb6f4bb54e5477a6bde983dfc7aa33c4eed03a
 DIST boost_1_76_0.tar.bz2 110073117 BLAKE2B 45445e6a9725cb99131e0b831b2fac0840d083692c13887b41adeac5cb8b3732026db3641d6be20591a676b78a87fcf363eb9b1508f87ed26039bba6a1ced533 SHA512 5d68bed98c57e03b4cb2420d9b856e5f0669561a6142a4b0c9c8a58dc5b6b28e16ccbb16ac559c3a3198c45769a246bf996b96cb7b6a019dd15f05c2270e9429
 EBUILD boost-1.75.0.ebuild 11103 BLAKE2B c8b74a302e399613bc23bc8d3e78977113721dd64554db1371f58a3f36d47933c09903ca94fddaa7fe81af0f45105059b51da9c2b6fd3edc6e4a4e9684d8f3b1 SHA512 b1eb508b1f1060bf5f5e91b1c43492fb1374880290d0874afd9e3a4c7cbd9dd4f909ba1b7b7cb40fe447b15eba19cebbd5da9d8263c26209c89661d513a629b5
-EBUILD boost-1.76.0-r1.ebuild 10885 BLAKE2B 72cbb61ad8b3b6d853f62704148a02d3127772c7007810740ecaa095a2f71d77ae76b0f868757b396babdbdbe5cab2e78380d42a9f75d77e7bc27fead3cefd16 SHA512 197f6916e438ce242288a7fc76e224e5ecf50e7fc9f098c6b5b828cf45f7bed03240a78ccb1b7cd3563560cb5e44b4dc35ee1b11336f8bdda5d7adf04e3c087d
+EBUILD boost-1.76.0-r1.ebuild 10973 BLAKE2B 46cd022843fe85fc5bd91fab4971cfac99973258bff1a4aaadd8716766c87f15c5a84f6d5259437374176799117d06e47201ca0aa9690aa8e4ea440a79fdb166 SHA512 921f8b868ad529d8388ab849dfa6b8a0f8b9872648ae9212ddff795bfc193d108715ae5919a83ad136267407b1cfcc770b84d588111c4a20fcaf75b2d5ccfafd
 MISC metadata.xml 1398 BLAKE2B ddaab460cad149df5f91c1a37eb7ffaa6a2b90e1062f268925fd3e0db1403d3447963c27fcd72847319e8510723a1a245be398d50a1e317662f59f593991ff0a SHA512 ed8530328af7bef694be2af7d3ba0c83198f769223b35ee5c1a2463cf50c97e964f7a4d8361f5091e9994fe0bff000534b6c5d5e5b517d38d101061026bd01bd
diff --git a/dev-libs/boost/boost-1.76.0-r1.ebuild b/dev-libs/boost/boost-1.76.0-r1.ebuild
index d760d92ea5af..b6944ffca6c6 100644
--- a/dev-libs/boost/boost-1.76.0-r1.ebuild
+++ b/dev-libs/boost/boost-1.76.0-r1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}_${MY_PV}"
 
 LICENSE="Boost-1.0"
 SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python static-libs +threads tools zlib zstd"
 REQUIRED_USE="
 	mpi? ( threads )
@@ -45,7 +45,7 @@ RDEPEND="
 	zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )
 	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
-BDEPEND=">=dev-util/boost-build-${MAJOR_V}-r1"
+BDEPEND=">=dev-util/boost-build-${MAJOR_V}-r2"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.71.0-disable_icu_rpath.patch
@@ -54,6 +54,8 @@ PATCHES=(
 	# Boost.MPI's __init__.py doesn't work on Py3
 	"${FILESDIR}"/${PN}-1.73-boost-mpi-python-PEP-328.patch
 	"${FILESDIR}"/${PN}-1.74-CVE-2012-2677.patch
+	"${FILESDIR}"/${PN}-1.76-boost-numpy.patch
+	"${FILESDIR}"/${PN}-1.76-sparc-define.patch
 )
 
 python_bindings_needed() {
diff --git a/dev-libs/boost/files/boost-1.76-boost-numpy.patch b/dev-libs/boost/files/boost-1.76-boost-numpy.patch
new file mode 100644
index 000000000000..d9af132039e4
--- /dev/null
+++ b/dev-libs/boost/files/boost-1.76-boost-numpy.patch
@@ -0,0 +1,23 @@
+From 0796305c863804a2b31610507c531da5c0408422 Mon Sep 17 00:00:00 2001
+From: Peter Dimov <pdimov@gmail.com>
+Date: Mon, 24 May 2021 22:14:55 +0300
+Subject: [PATCH] Use the /python//numpy target instead of [ numpy.include ]
+ (fixes #361)
+
+---
+ libs/python/build/Jamfile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libs/python/build/Jamfile b/libs/python/build/Jamfile
+index dbc9fb203..03b69a25d 100644
+--- a/libs/python/build/Jamfile
++++ b/libs/python/build/Jamfile
+@@ -117,7 +117,7 @@ lib boost_numpy
+         <define>BOOST_NUMPY_SOURCE
+         [ cond [ python.numpy ] : <library>/python//python_for_extensions ]
+         [ unless [ python.numpy ] : <build>no ]
+-        <include>$(numpy-include)
++        <library>/python//numpy
+         <library>boost_python
+         <python-debugging>on:<define>BOOST_DEBUG_PYTHON
+         -<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag
diff --git a/dev-libs/boost/files/boost-1.76-sparc-define.patch b/dev-libs/boost/files/boost-1.76-sparc-define.patch
new file mode 100644
index 000000000000..b3909ee31376
--- /dev/null
+++ b/dev-libs/boost/files/boost-1.76-sparc-define.patch
@@ -0,0 +1,21 @@
+https://github.com/boostorg/predef/commit/1be0e4a2d8db15a405f64a6f65507b87c1be7e1a.patch
+
+From 1be0e4a2d8db15a405f64a6f65507b87c1be7e1a Mon Sep 17 00:00:00 2001
+From: tkoecker <tkoecker@gmx.net>
+Date: Fri, 21 May 2021 16:31:11 +0200
+Subject: [PATCH] added missing brackets (#118)
+--- a/boost/predef/architecture/sparc.h
++++ b/boost/predef/architecture/sparc.h
+@@ -34,10 +34,10 @@ Distributed under the Boost Software License, Version 1.0.
+ 
+ #if defined(__sparc__) || defined(__sparc)
+ #   undef BOOST_ARCH_SPARC
+-#   if !defined(BOOST_ARCH_SPARC) && (defined(__sparcv9) || defined(__sparc_v9__)
++#   if !defined(BOOST_ARCH_SPARC) && (defined(__sparcv9) || defined(__sparc_v9__))
+ #       define BOOST_ARCH_SPARC BOOST_VERSION_NUMBER(9,0,0)
+ #   endif
+-#   if !defined(BOOST_ARCH_SPARC) && (defined(__sparcv8) || defined(__sparc_v8__)
++#   if !defined(BOOST_ARCH_SPARC) && (defined(__sparcv8) || defined(__sparc_v8__))
+ #       define BOOST_ARCH_SPARC BOOST_VERSION_NUMBER(8,0,0)
+ #   endif
+ #   if !defined(BOOST_ARCH_SPARC)
diff --git a/dev-libs/clhpp/Manifest b/dev-libs/clhpp/Manifest
index 5c779c0ed005..7c6705a5b816 100644
--- a/dev-libs/clhpp/Manifest
+++ b/dev-libs/clhpp/Manifest
@@ -1,5 +1,3 @@
-DIST clhpp-2.0.12.tar.gz 96922 BLAKE2B ae4df7e2b65865fbaea8066d508e4058a076aace4598ca97594237541df44e5c2d20978274124cbc5d331c4983df3e0776b8afafb2204f0d96b6830999d72589 SHA512 521f0e6bd32f9bfdf764011d9e83691a574c27a9c27580601529a2665a2785ca5815407381adfa2e247547bdb79c6083d79b5d716d54e2aafa55bdd5751f1e78
 DIST clhpp-2.0.14.tar.gz 99791 BLAKE2B 4859f25359d09584bd96d63c06766ee8c8f05a09d2c79355489ab5554760511a9a500036b2988b0df85df04b591cc357f776097f91a3a9b9172ab45e8d385990 SHA512 f6b6a3c760292d0acad5eb2cb25b0d127c7615167f979c6138361376d03c66bb46735cf56716b3349f9d6691ac6557b983a767559ee5f94b163d85b90b046eb4
-EBUILD clhpp-2.0.12.ebuild 582 BLAKE2B 2c96261c0108b69e987cd7919d93d829eb5e26252cb5933debfc39e183cb353efeb22aadc6448ef57fcfb3cfafc8da894f16503696c9f557ee106d7f7f4de978 SHA512 fb82233e5cd9bbe43cdcacdf9be99d9c83fa45f5517cc7d8c9f1c6ce677446bbb22a226a7177859f0f28cb62dc69c4c7c21eb6940f9d44418ae6c06ef153d88b
-EBUILD clhpp-2.0.14.ebuild 584 BLAKE2B 4a2074580a6f558da632153a99e73efcf3063ae8f45cee20d8351a0b82cdb3062a70918fd1956dbca951cfa1d1b0193f4b6695d7e99a5f743382c8d5b1b2f984 SHA512 f846159cf9d795948042fe5d3a9e250e9786ddd7c1fd6a45bdf81180ec15c1efa2fb38df8eca8fd6e1dbc89b566dc62d90f70649f72a4ab9f9f0e8da7a7a882e
+EBUILD clhpp-2.0.14.ebuild 582 BLAKE2B 136db303f1a442c414151dda935ef39401f9e25608336af16bf94600777d4b8da2de0686070b7f2cd04b7ff0932e8ab51f1c36d57b601f90a3de8fdfd9b75d44 SHA512 c3d4bfdceb1250ff9ad1b5b7d1539cbc584ccb461de72178dc3eb721c0cd0d807a16f3907b697b5109f7b681eb707081725de72b69637e343a3e63b8bca3bb8a
 MISC metadata.xml 332 BLAKE2B f42b8bf0c7184f9cc0d2a0164d0311c2fc75e390430119c602832bd6d791913de4669ed7583a5b1f2b67db401217a3bce9d967062e7f3ba0b27801f4ca5a9056 SHA512 d18a2df576e7732073eb8ebc40aea3e67e64a1872b10cdb2bd4bc9d53c803caf1acd7296cd0d5d4ea60867e14262fef88e87e6ba128eb35a2fe797b224fac0ef
diff --git a/dev-libs/clhpp/clhpp-2.0.12.ebuild b/dev-libs/clhpp/clhpp-2.0.12.ebuild
deleted file mode 100644
index d7a61c4044f0..000000000000
--- a/dev-libs/clhpp/clhpp-2.0.12.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Khronos OpenCL C++ bindings"
-HOMEPAGE="https://github.com/KhronosGroup/OpenCL-CLHPP/"
-SRC_URI="https://github.com/KhronosGroup/OpenCL-CLHPP/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Khronos-CLHPP"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="virtual/opencl"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/OpenCL-CLHPP-${PV}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DOCS=OFF
-		-DBUILD_EXAMPLES=OFF
-		-DBUILD_TESTS=OFF
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/clhpp/clhpp-2.0.14.ebuild b/dev-libs/clhpp/clhpp-2.0.14.ebuild
index cf474607c72b..43da0bfe3323 100644
--- a/dev-libs/clhpp/clhpp-2.0.14.ebuild
+++ b/dev-libs/clhpp/clhpp-2.0.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/KhronosGroup/OpenCL-CLHPP/archive/v${PV}.tar.gz -> $
 
 LICENSE="Khronos-CLHPP"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="virtual/opencl"
 RDEPEND="${DEPEND}"
diff --git a/dev-libs/crypto++/Manifest b/dev-libs/crypto++/Manifest
index f25e284234bf..9e97f1fdbb45 100644
--- a/dev-libs/crypto++/Manifest
+++ b/dev-libs/crypto++/Manifest
@@ -6,5 +6,5 @@ DIST cryptopp850.zip 9125575 BLAKE2B 857a65d63d17a3447d3cbd8370f9d750c480a9734c7
 DIST cryptopp850.zip.sig 659 BLAKE2B e56d059069aa233b11dd1dd2c555ba8b9b0d12474d4f5ec9057e626ad22449959b9474ccf9ce553a2507f50215b669cf4b90cab6b51697559a6ffb95d41da9ec SHA512 7b59fbeb14fea942c846573c7bf8e76d6cee86aca4b605ce06323bc6f5549232285864cd735c2a882ca4df3d93747436a5268fee63dbf8eb43c503143b660e63
 EBUILD crypto++-8.2.0-r2.ebuild 1775 BLAKE2B b53a3c343a882953244e8232e9ab7dcafb9ff0dfd60f80449d9057e9ac60811e628668704adc474f88385ae9fe363534990c162ca8af82f1d78c43dd333d38d5 SHA512 491829f87023ec95132521a1605a17b3eb9e8e58b92bb4ebcbae5feed98a058731398858d8c5e0e8af6f63d7df01ff13cc3154b0340f6e4ed7a226ee22fd1861
 EBUILD crypto++-8.4.0.ebuild 1190 BLAKE2B aaeb8f3171c59e2e8061b01fc8e515da289017720b162614ea77d0d7c49dd4c0d558cbf8042272f736a2786e2eb32d05b49669c5df6a1990dcadcae60004613d SHA512 1ec1a83bff3e783106705dfa46dad55bf80026dc0665e58e325f4b43fd314036f33e94a60b392b6fd9b48aae5e2c4534619ba22d4a072ccdfb4e497dd9df1cde
-EBUILD crypto++-8.5.0.ebuild 1440 BLAKE2B 6fd40d369412459418e76241cd90788fef0d015976a03a5c027953184de628563cfe2ec8fb5cc85a16a0834ef39e53099199244e6bc4113808bb42c3b4d184ce SHA512 38e41b410b90da0a8ee1e77e85ceb4fb2823fafe8df903d5f97dd8d3184856e7ec36e21619748f16c1d76adb6ded08d67f40801f713528a2f1d4f5a15bd71683
+EBUILD crypto++-8.5.0.ebuild 1434 BLAKE2B fc314b297117c99b70eb13bbd0a247609926b5dc7c1597ebc03b1bda8fc3f114f01a2c5e03ab15eeec53cc380a79dfccf06fd1a49c6d2f2650725086a25ea1ad SHA512 fa3f509ac975ab4237fd6b6db9b8c432920d7b6c0b6850fc3d54b78b301be7347261f5273581c7445f7d3b48e8742f3d1e75a6cceec570e035f747d20d193f27
 MISC metadata.xml 505 BLAKE2B 8c1bfd20c9717c7b410af1d0dab008327049437c0c3a046bd3d3d79cac08cac11fe39c29eb933ce5dce3b3a7b57c017367d486b0c1ed70c78496b61ae0ebf981 SHA512 1a4c274988ad19a49919d882eb403c8bb75ebef7ebdc6350e6d705ab6abe672bb6ee32e8be71dbc52c3b71cdd84aee6b7b44e0a42b571de2480b7b78fc871253
diff --git a/dev-libs/crypto++/crypto++-8.5.0.ebuild b/dev-libs/crypto++/crypto++-8.5.0.ebuild
index dd8465fa9ae6..8b0907f57b01 100644
--- a/dev-libs/crypto++/crypto++-8.5.0.ebuild
+++ b/dev-libs/crypto++/crypto++-8.5.0.ebuild
@@ -16,7 +16,7 @@ LICENSE="Boost-1.0"
 # Bumped to 8.5 in 8.5.0 out of caution
 # subslot is so version (was broken in 8.3.0, check on bumps!)
 SLOT="0/8.5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 sparc x86 ~x64-macos"
 IUSE="+asm static-libs"
 
 BDEPEND="
diff --git a/dev-libs/eekboard/Manifest b/dev-libs/eekboard/Manifest
index 617f1aed94e5..d984094d1af5 100644
--- a/dev-libs/eekboard/Manifest
+++ b/dev-libs/eekboard/Manifest
@@ -1,5 +1,5 @@
 AUX eekboard-python-3.patch 1309 BLAKE2B c8161d95ade6f64e800e2937681d82fc40e6be4c0a925f8047b445faaa62692c509ec2f2200c444685454753136a80f1a3bec5d58447b87acf444081648ca821 SHA512 7900b74a1a363409d06595d91772077f8e61557a9f454d7f8d28ec7ef0345d16c5adad0a9e8f3782b4f7ed3c05b9b24feeae21ad025b2af2a5e8af149054478c
 AUX eekboard-vala.patch 971 BLAKE2B 61e8185b8946593bff928bf51e86e133c2e4b0880265a96a56da0fbb2792fba147a4aff605f9e73080fd0e41845805636b23dc4ba47378b5649aa2d73c4ea45a SHA512 0e33141e6e8bbdee661b12083e5e261b013a1c83603dd06ef93b5b9360d89153ff53225e1c8068ebccd5d92c3dfd1c439f7b0fb27ed5e8f21d9ca201c7db01fc
 DIST eekboard-1.0.8_p20121001.tar.gz 330923 BLAKE2B 74bc0a9e4d3bea73828020895726e12b986100812ff7260758a881899c7ff92dc706c6b7a57bc4d17a9524d1305658c8c29e441ba4b7b4b8023d8f2ddebc2d10 SHA512 3c6ccbaac55a4680ba4d2bd5d214b1738b7fb17f83b66b11621149b6f8a945eb6b39c47be51dfcf53f84317d860ae28b8f83e3071d5d4474fbcfbdc72f6e4c87
-EBUILD eekboard-1.0.8_p20121001-r1.ebuild 1758 BLAKE2B 37f19e6b48bb058047ac71a8c0efc6a25b7651a65859613f4ab0b9b78d67822d3bd34c21875537ecc32431344dc39864783e067e7214330acec014952206856a SHA512 06637e1337157b07b857f44b8055d8b92d06e28f34e5bf19ac7072577aa978ad986261b93ebb31cb7a783febdb4ebeecca532789b6abe2546c1fee8ba53d91a6
+EBUILD eekboard-1.0.8_p20121001-r1.ebuild 1760 BLAKE2B 00422c9a794e284c23b686ce47fa8fc2bdb2d0056c894f9a6509bc61b7dc790c5d7ea7738245494144b55aa1cea12186cc36fbdcaec46ab6108b1f1a8b1965da SHA512 7093c888c7121ef015e170a0de4d442adc0e287adda977883aa0dc5da1bf70efb5e67678ae15edbfd2d53e069ed476746c354875155f76ce0bb14adf4b733172
 MISC metadata.xml 656 BLAKE2B b76f609d45f294c0737405e47b3f47407fd03bca7733d504d83316aa0932b77ae4cdcaa8b41a1f1ea37e712278ab9c06015123111a9598e84084100b88b58617 SHA512 6d5d60ade78cbfa6bcd40b42d6bebaa7c9b860cab32ed19338facdbfaf380ab71238be0926af4d2c0948970791845e037ffc15794933240ab5ea771750a3a87a
diff --git a/dev-libs/eekboard/eekboard-1.0.8_p20121001-r1.ebuild b/dev-libs/eekboard/eekboard-1.0.8_p20121001-r1.ebuild
index e71d88839277..5c15ff749451 100644
--- a/dev-libs/eekboard/eekboard-1.0.8_p20121001-r1.ebuild
+++ b/dev-libs/eekboard/eekboard-1.0.8_p20121001-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..10} )
 VALA_USE_DEPEND="vapigen"
 
 inherit autotools gnome2-utils python-any-r1 vala vcs-snapshot virtualx xdg
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index 42e252db5ea8..0de53e962d58 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -4,6 +4,8 @@ AUX elfutils-0.180-PaX-support.patch 1058 BLAKE2B 9d7980eedf6250b848923eddb86d91
 AUX elfutils-0.183-CC-quote.patch 1795 BLAKE2B f6147afec19a45538517190f3feb4c483bda60643b7c14df66c9efa632130785865a1b7d5aefa6f29a51e2998e309333c9bc0a62a4c6bc050d9f79ddd0df7be6 SHA512 510bb7e3448318875586c33e586c16923bcaf0673f40f282f2e0ac8958ab28f070c6501e4ab4bab08209ad17ee3f861c80e1dd3354e844f78b6610a6d05eb3e7
 DIST elfutils-0.183.tar.bz2 9109254 BLAKE2B 8dd92e7c2df13d51bb51085f6cf762ea1ec7b803dcebf1202a4441ba152ed0e3332b1267276de4650d5ed5c5bed656f72f4c4e9bbf20700be45312a202351574 SHA512 bdafdd738a33cebe4f87849e5e6f1133881e77ef71b27faa0f0234ff80e9674f506957898326c2a55fd8438cbd189f7930597d0b4b9ca6c77921cc0cbd83b6b7
 DIST elfutils-0.184.tar.bz2 9185468 BLAKE2B 8e45aa603a039fb128b96a1ffee4a0137fd1808d7087a2ddc8682a9bec1d65a56e6e6ad1419ac5e9f4490cc258c8ac0ee3e49775aab278efb1889bdceaf842bf SHA512 5920c354edd6b28bb7e713d674bf6f2221e8ee91b90d582de39b1f45446aea1e7e3d4b6671024c391675b5e7530fe952c1320d730bb625c02d4c647ceb938bc8
+DIST elfutils-0.185.tar.bz2 9187627 BLAKE2B 57cfa7e4060975c4bf6170dbd354687a19a92f7069c060db1ac2fa4da5a9d34e8bddd07c7ce376b5c28b5670ad5b8c1df795164cbcfb600a44cf1db60c20c4af SHA512 34de0de1355b11740e036e0fc64f2fc063587c8eb121b19216ee5548d3f0f268d8fc3995176c47190466b9d881007cfa11a9d01e9a50e38af6119492bf8bb47f
 EBUILD elfutils-0.183.ebuild 2409 BLAKE2B 38ad0543c314452ab5342127afe96dbb58dd79c4b47db04edd1528c728f731d1d789adf1d01760588dd89f0d51ffd8b880f6deddffdf41028760cd1f197d3c14 SHA512 b536633804a651e240710c3fe036bbdcf2fe4115aebdce7fc046ecf4d1c6e288cb6ec688ea6a32d1365c9b41ad5feb5da1c979e1c586549c7508e6c23a148009
 EBUILD elfutils-0.184.ebuild 2375 BLAKE2B b66ddb74e97c9783a671cdc943aa6c0300936d6b4eac824fffa5259fc6cac9a526a737dfb8a0938da2a337f9549e9eca47e31ac79722572bb876de9730542416 SHA512 8ad71599b66baba3290ad299207d394c202630818fd3e19fe8a5f338ba552958993f0322f7a41e06bd5d542047e65e0ea30041a401a1dff57afcbdcdd12c43a5
+EBUILD elfutils-0.185.ebuild 2375 BLAKE2B b66ddb74e97c9783a671cdc943aa6c0300936d6b4eac824fffa5259fc6cac9a526a737dfb8a0938da2a337f9549e9eca47e31ac79722572bb876de9730542416 SHA512 8ad71599b66baba3290ad299207d394c202630818fd3e19fe8a5f338ba552958993f0322f7a41e06bd5d542047e65e0ea30041a401a1dff57afcbdcdd12c43a5
 MISC metadata.xml 729 BLAKE2B 7fb60c690ef99ef62b4cd4fbed802a48141b90e295f84fdad09cf18d061dd94a63086be119d733249b91fca67a1588bcea9ee442e3dd142921cb9c163d65a726 SHA512 2e5c223aad3d51f6ae770ae7feacd3731821c9de0b68f6ad2d89a4c7c8360ba6decbd6d73416648186f19d19b4aa6516302cba6554c9f4955024a19c082d0f85
diff --git a/dev-libs/elfutils/elfutils-0.185.ebuild b/dev-libs/elfutils/elfutils-0.185.ebuild
new file mode 100644
index 000000000000..5860b8abf503
--- /dev/null
+++ b/dev-libs/elfutils/elfutils-0.185.ebuild
@@ -0,0 +1,86 @@
+# Copyright 2003-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib-minimal
+
+DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)"
+HOMEPAGE="http://elfutils.org/"
+SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
+
+LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 lzma nls static-libs test +threads +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}] )
+	!dev-libs/libelf
+"
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )
+"
+BDEPEND="nls? ( sys-devel/gettext )
+	>=sys-devel/flex-2.5.4a
+	sys-devel/m4
+"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.175-disable-biarch-test-PR24158.patch
+	"${FILESDIR}"/${PN}-0.177-disable-large.patch
+	"${FILESDIR}"/${PN}-0.180-PaX-support.patch
+)
+
+src_prepare() {
+	default
+
+	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() {
+	use test && append-flags -g #407135
+
+	# 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() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable nls) \
+		$(use_enable threads thread-safety) \
+		$(use_enable valgrind) \
+		--disable-debuginfod \
+		--disable-libdebuginfod \
+		--program-prefix="eu-" \
+		--with-zlib \
+		$(use_with bzip2 bzlib) \
+		$(use_with lzma) \
+		$(use_with zstd)
+}
+
+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/expat/Manifest b/dev-libs/expat/Manifest
index 253c31f6bbc0..b92ac2f30b0b 100644
--- a/dev-libs/expat/Manifest
+++ b/dev-libs/expat/Manifest
@@ -1,5 +1,3 @@
-DIST expat-2.2.10.tar.xz 425432 BLAKE2B 5d84d7dec5aae6ca7906bd2a2b8a249457111e064295b83b6c9927b5ef0dc97e7220bac1da17781e24541259ae81b60a2314cd372bfbdfc2e08fab082377df4a SHA512 a8e0c8a9cf7e6fbacdc6e709f3c99c533ab550fba52557d24259bb8b360f9697624c7500c0e9886fa57ee2b529aadd0d1835d66fe8112e15c20df75cd3eb090f
-DIST expat-2.3.0.tar.xz 433508 BLAKE2B b547cbca23f2ca11bef326225b8e2958a3539dbb14789c33fb0f2aede35bfbe12981d151624b0497ab2ad488ec06529ae2a996e514b19b39622ae7fc29f47832 SHA512 dde8a9a094b18d795a0e86ca4aa68488b352dc67019e0d669e8b910ed149628de4c2a49bc3a5b832f624319336a01f9e4debe03433a43e1c420f36356d886820
-EBUILD expat-2.2.10.ebuild 2463 BLAKE2B 2a8e49570989a3551678feb811de9b44f117bc87c485c5bb17ec5d93bfbafb4c52c35ca2020fa230b369876d1181556aaf014d665eeff0b3f8a8a9419b16fe48 SHA512 a50c4974e7dc22818b1d580114e45d00a5066c116575358c8e12614f317cb918a26aa9a8355b749c6d116f8beb3d2287f5109a4dd1a82247594d4da6eebbda4f
-EBUILD expat-2.3.0.ebuild 2471 BLAKE2B ec8e417f394f038843c9b41de497ff614eb214c7a6227249cd14d1852ecd15b25d0fe688b5d4ed16e15465629818ad8c63a0823edfbc02261441c35f1d10199c SHA512 e55f579f5e3df0f93cc1a549294e88a240516a976c08531a879b088f08f3f48346b71e9e5b730877bf3a4f305ca3c8352cc5ab9fe3d0b31e29a2fa6acc3d14c3
+DIST expat-2.4.1.tar.xz 445024 BLAKE2B 2ae66d284a03176ef7290093f59bb7ad98011dfbf3c7c3515ba4e4b99f849474def6ce6d9844c944fed22d86ac4ea1a38863646be914d9432eda7b69d890be65 SHA512 9dc760dbf701f75e55c4479d81417622f8c750d8473498458a382a4c2932a2976a059cb3589f88855188e5173ec7868d285c4601428e0ca625df7a59cf975191
+EBUILD expat-2.4.1.ebuild 2536 BLAKE2B 9972eb17fabcb88abbef831e3788c65ce24145784da964de422b04a3662a534573e2f6b9570ca0ce9ad3f545a252fcdedcf09ddc350f7f8142cb04e3f91acb8a SHA512 dff4de479c889a0f68428e9bc5d0d46a452212c1c3cc2aa57c39021a1d4a216c1abc4854ac229bf5b14384c356d405727d3b7af9e02b689cd342eb42bbfeed2f
 MISC metadata.xml 513 BLAKE2B 1f90bebcf78b72abf04ef2e0370792ab4cc9c12f6edeb1985b42846e2d17905b0c454adfea4427a7795158c9de1963ec28ef24c21a07e5d423e576fc394a446f SHA512 8683789b6958547b10ac2d225eb59314feb942e5762308ec17704d9ade28b25b528e8df697892b0e090ecd6830c0ef8d64b1da05337b7878731e6df82abcc2a3
diff --git a/dev-libs/expat/expat-2.3.0.ebuild b/dev-libs/expat/expat-2.3.0.ebuild
deleted file mode 100644
index 9a3178cd3f51..000000000000
--- a/dev-libs/expat/expat-2.3.0.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-AUTOTOOLS_AUTO_DEPEND=no
-inherit autotools multilib-minimal usr-ldscript
-
-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="elibc_FreeBSD 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
-
-	if multilib_is_native_abi ; then
-		# libgeom in /lib and ifconfig in /sbin require libexpat on FreeBSD since
-		# we stripped the libbsdxml copy starting from freebsd-lib-8.2-r1
-		use elibc_FreeBSD && gen_usr_ldscript -a expat
-	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,png}
-
-	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.2.10.ebuild b/dev-libs/expat/expat-2.4.1.ebuild
index 005072fd32af..e06e6d5503b7 100644
--- a/dev-libs/expat/expat-2.2.10.ebuild
+++ b/dev-libs/expat/expat-2.4.1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 AUTOTOOLS_AUTO_DEPEND=no
+AT_NOEAUTOHEADER=yes  # because expat_config.h.in would need post-processing
 inherit autotools multilib-minimal usr-ldscript
 
 DESCRIPTION="Stream-oriented XML parser library"
@@ -87,7 +88,7 @@ multilib_src_install_all() {
 
 	# Note: Use of HTML_DOCS would add unwanted "doc" subfolder
 	docinto html
-	dodoc doc/*.{css,html,png}
+	dodoc doc/*.{css,html}
 
 	if use examples; then
 		docinto examples
diff --git a/dev-libs/ffcall/Manifest b/dev-libs/ffcall/Manifest
index 35c49e02784e..23991b579ff4 100644
--- a/dev-libs/ffcall/Manifest
+++ b/dev-libs/ffcall/Manifest
@@ -1,3 +1,3 @@
 DIST libffcall-2.1.tar.gz 943235 BLAKE2B ae82663174db084e830b6ff77ceedf8641b3edeb7800952ac4e2772d9033da3e45f46159e6fdae86615dc69fceba39f48d6c75e6cbd41be98f1986fa69d50b3b SHA512 da73375fb45b7d764c06437a517c2a90abf7d5de6afe0a8ca19e6dfafd2a8c7107e39d230ecbc8edfdd5926b16a0c13b7bb9319287047c47de1241b2f6ae805e
-EBUILD ffcall-2.1.ebuild 1453 BLAKE2B 3d9deb4d428ebf62b36d12c0816d13f36f7af7169ab6a229b0284f5d23b481890611ab8002944965917506b2d94d59ebe95e363ef6d0971374cf04377efac603 SHA512 b15884f72bd6d03b7967a5cdeea552108b0332d238610b475d5c9ab7f893ec840a2c252a8ad762f0413b7c0de509d8b4e972923756ed6807603300eece75b56d
+EBUILD ffcall-2.1.ebuild 1466 BLAKE2B 3a18b74e440bdb0d4a4a0d910cb77b6643a3d2f958a9656af5116642b904e650c56f10d93b1fb19f0c2b10bc7bcc1d29517fa0ed20ea42b30ed58f7561f57fa7 SHA512 00df8ef9fc1219e9d0e177d8f48add57d54d30b79fcf1021c12a0d421c47b6570db2a1ff057f11f235661e85579e93ee8aeaad421ba379fb93325bb60a9d9573
 MISC metadata.xml 858 BLAKE2B a47a659baa99a77ae0caae149918d698ab357a691fd1c57dfe9671ab5631da54b15daaa96fe45b251f800fcb00da5e3c6e87e30eec2bc960301fa6f818cb34da SHA512 e64e471f2fdcc289c678bfc4fe3d2f652062907f9ff18d0350c0907b3d9bfa4e92c76bf04d1b2f0fb3f820f917ec4e3bd7d997a0d5e2eb270ac10516cb58f971
diff --git a/dev-libs/ffcall/ffcall-2.1.ebuild b/dev-libs/ffcall/ffcall-2.1.ebuild
index f5b5a27c49d4..de9d512e1b78 100644
--- a/dev-libs/ffcall/ffcall-2.1.ebuild
+++ b/dev-libs/ffcall/ffcall-2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit flag-o-matic ltprune
+inherit flag-o-matic
 
 MY_PV="libffcall-${PV}"
 
@@ -56,5 +56,5 @@ src_install() {
 	dodoc NEWS README
 	dodir /usr/share/man
 	default
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/folks/Manifest b/dev-libs/folks/Manifest
index 2e6a64dd94da..394cb34aee91 100644
--- a/dev-libs/folks/Manifest
+++ b/dev-libs/folks/Manifest
@@ -1,6 +1,3 @@
-AUX 0.14.0-conditional-tests.patch 2279 BLAKE2B 2b04f6cc1741de4d0efdaf2cef756c5879fe2d9ec988b8612658645c2fc46ce1bc5c96d3efb532e98c5e27a705d18d143e62e1a99a6505fa1f87162725f4ebe4 SHA512 b1742262a2b7fbc95b7417170640117578e77ad1498aff93ae6bd464952bd2d8ca773f3f0987378ccb743144a160c8bcac1a312eb796928f609745a567e98c6a
-DIST folks-0.14.0.tar.xz 520924 BLAKE2B 3154e0a7e6fe8c60aa81f4772af2b9d09b88785187c87e93869f668af46549383866cfa2e50d3d29009d0acb77c26cd852c7c9a3c6188ff3e5ef53c06b11b781 SHA512 94dc025668ac34df203ea351430bf82dddb4e275d936e2b959a1b9a4cf0fff0218a4baa7d3a89c152a2cb21a94250d731c8e7470d50ac4b658fbe1448974a69e
 DIST folks-0.15.2.tar.xz 489236 BLAKE2B 63bcfedb88205b37c6e9595c3e0c34f7fc869045648e04042cce9300776e4b7d102f91312434545581882f0959502be7ba1bc2f77d50ec2af7f649444da9197d SHA512 c327e39b7cf32b72db3f84504f8ec2a4bc2d98693ca5ff21c3b544e37b58a1df9241dd1be541a39be83468b62dd0f5d7b5a3a0ca4bde5e94d1e075d77d3be505
-EBUILD folks-0.14.0.ebuild 2576 BLAKE2B 84fe21b7e0138b6d62a6666dcfa426ec85261008441ab2b7c3576e160615c57699ae4b6bcdeb6ceb0c9a00d183a0bc663b0e67c6bb2892bc8a7fafd13757a54f SHA512 c21b9a13e3e3b4fff805d9a713e85b4db03dcf151b55628b94652603586681fa020588bdcca234780ef6c95295113ce853899e1277daf72abafa4e80e3388a9a
-EBUILD folks-0.15.2.ebuild 2210 BLAKE2B cb605b9befefb6c7375ede2a2dc0730d2d14bac8d5e18664cac68ea628eb5a57138e289709d99b6be99cfc654b00c9cd899337f4331525b4a32ad1af0787343d SHA512 fc066f9a57f573f942e6fc8f1afb3282b45e400ff0b3750a8f54cdb91932d4bb003d3bed78ec4debbe35a7186368345f4d29ed735c4425e65f620a3458a3c5c1
-MISC metadata.xml 477 BLAKE2B 59650bcd983e214f924509b128b6bfd45cd015bd3f98417716d366f9a05d932b0feacff410381db14afa18da12fcfaf09c0da2fb2f122e110a6a0858c6f2bd6d SHA512 eb009ee1180b529978596f9a838454f9226906ebd7f0218e29545326222cf04b08efad06e88bd6ab66fc7486022e4f27bb234f4709ac499f1b7df77276709423
+EBUILD folks-0.15.2.ebuild 2208 BLAKE2B 9bfcddb38405b7f34d2b9f6f032d44aeb1c8409b6fa34ec27dd95dc220bde2c3d8780f746b381c3321d588c6c3a8611f59165cfcc2a35a2ba57943d61983a803 SHA512 776f71fdeb56953d5160098482a649d08c1e15723d941263fd017bf1c46f807abcd3ce8d7e8b4651e646e1d919cdadb042b2888a1f904c3839492ddec8cbd1f5
+MISC metadata.xml 395 BLAKE2B 3d62bb67ea7cfa05371530d79d4953a1b8c33a1c17e6545dea2bc5736c5f751180f495d1966a403a77c84247a4b96a752d9505c6412138df382162520d235f2a SHA512 9097dde175eab9cc701a05ab5435ce6aedaeef984ec05392f60806ac12d16563f837b916cab1018a9440d427e17722381e27763060073d329704291910873cc1
diff --git a/dev-libs/folks/files/0.14.0-conditional-tests.patch b/dev-libs/folks/files/0.14.0-conditional-tests.patch
deleted file mode 100644
index 2c64ecf6610f..000000000000
--- a/dev-libs/folks/files/0.14.0-conditional-tests.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From b9e27e284c481e876370e2eb73f95d0953fb9cda Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sun, 23 Aug 2020 11:49:44 +0300
-Subject: [PATCH] meson: Allow disabling build of tests
-
-Fixes https://gitlab.gnome.org/GNOME/folks/-/issues/121
----
- meson.build       | 21 +++++++++++++--------
- meson_options.txt |  1 +
- 2 files changed, 14 insertions(+), 8 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 53d7dcc6..123edb5c 100644
---- a/meson.build
-+++ b/meson.build
-@@ -54,6 +54,7 @@ folks_backend_dir = get_option('libdir') / 'folks' / '@0@'.format(folks_module_v
- bluez_backend_enabled = get_option('bluez_backend')
- docs_enabled = get_option('docs')
- eds_backend_enabled = get_option('eds_backend')
-+tests_enabled = get_option('tests')
- installed_tests_enabled = get_option('installed_tests')
- ofono_backend_enabled = get_option('ofono_backend')
- telepathy_backend_enabled = get_option('telepathy_backend')
-@@ -130,13 +131,15 @@ endif
- 
- if bluez_backend_enabled
-   libebook_dep = dependency('libebook-1.2', version: '>=' + min_eds_version)
--  # Needed for the BlueZ tests
--  pymod = import('python')
--  py_installation = pymod.find_installation('python3',
--    modules: [
--      'dbusmock',
--    ],
--  )
-+  if tests_enabled
-+    # Needed for the BlueZ tests
-+    pymod = import('python')
-+    py_installation = pymod.find_installation('python3',
-+      modules: [
-+        'dbusmock',
-+      ],
-+    )
-+  endif
- endif
- 
- if import_tool_enabled
-@@ -233,7 +236,9 @@ subdir('tools')
- subdir('po')
- 
- # Tests
--subdir('tests')
-+if tests_enabled
-+  subdir('tests')
-+endif
- 
- if docs_enabled
-   subdir('docs')
-diff --git a/meson_options.txt b/meson_options.txt
-index 43cd586a..62a9603c 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -11,6 +11,7 @@ option('inspect_tool', type: 'boolean', value: true, description: 'Enable buildi
- # Profiling
- option('profiling', type: 'boolean', value: false, description: 'Enable profiling code')
- # Test options
-+option('tests', type: 'boolean', value: true, description: 'Build tests programs')
- option('installed_tests', type: 'boolean', value: false, description: 'Install test programs')
- # Docs
- option('docs', type: 'boolean', value: false, description: 'Enable documentation generation')
--- 
-2.20.1
-
diff --git a/dev-libs/folks/folks-0.14.0.ebuild b/dev-libs/folks/folks-0.14.0.ebuild
deleted file mode 100644
index 91619fbdf8c2..000000000000
--- a/dev-libs/folks/folks-0.14.0.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-VALA_MAX_API_VERSION="0.48"
-PYTHON_COMPAT=( python3_{7,8} )
-
-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"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/25" # subslot = libfolks soname version
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
-
-IUSE="bluetooth eds +telepathy test tracker utils"
-REQUIRED_USE="bluetooth? ( eds )"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=dev-libs/glib-2.44: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
-	)
-	tracker? ( app-misc/tracker:0/2.0 )
-	eds? ( >=gnome-extra/evolution-data-server-3.33.2:= )
-	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="
-	>=dev-util/meson-0.49
-	>=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
-		${PYTHON_DEPS}
-		bluetooth? ( $(python_gen_any_dep 'dev-python/dbusmock[${PYTHON_USEDEP}]') )
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-conditional-tests.patch
-)
-
-python_check_deps() {
-	if use test && use bluetooth; then
-		has_version "dev-python/dbusmock[${PYTHON_USEDEP}]"
-	fi
-}
-
-pkg_setup() {
-	use test && use bluetooth && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	vala_src_prepare
-	xdg_src_prepare
-	# TODO: All tracker tests fail with SIGTRAP for some reason - investigate
-	sed -e '/subdir.*tracker/d' -i tests/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use bluetooth bluez_backend)
-		$(meson_use eds eds_backend)
-		$(meson_use eds ofono_backend)
-		$(meson_use telepathy telepathy_backend)
-		$(meson_use tracker tracker_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
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/dev-libs/folks/folks-0.15.2.ebuild b/dev-libs/folks/folks-0.15.2.ebuild
index be6aff222324..f8cafe8b1d3d 100644
--- a/dev-libs/folks/folks-0.15.2.ebuild
+++ b/dev-libs/folks/folks-0.15.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Folks"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/26" # subslot = libfolks soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
 
 IUSE="bluetooth eds +telepathy test utils"
 REQUIRED_USE="bluetooth? ( eds )"
diff --git a/dev-libs/folks/metadata.xml b/dev-libs/folks/metadata.xml
index a89e8dcef9f3..a71d137f8301 100644
--- a/dev-libs/folks/metadata.xml
+++ b/dev-libs/folks/metadata.xml
@@ -6,7 +6,6 @@
 	<name>Gentoo GNOME Desktop</name>
 </maintainer>
 <use>
-	<flag name="tracker">Load contacts from <pkg>app-misc/tracker</pkg> index</flag>
 	<flag name="telepathy">Load contacts from the Telepathy framework</flag>
 	<flag name="utils">Build the folks-inspect utility</flag>
 </use>
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index 8e5bcd4897cb..ca118d03e439 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -1,9 +1,5 @@
 DIST gjs-1.64.4.tar.xz 422496 BLAKE2B a96211f7240336dbb30c6965e405f59ee72e4288842837da8da8c6d3c59b7e04ebb6c7a8b0b02d38601c162ffdf1a1fef9f13e4db720c4c483f4a39dffd5dbb4 SHA512 21a15d7106ad6584fb1f02cb0a0a4cab211a3540adb8f2c03d35c211e3946b81935000a52351fedd95a18a7ff6b7f96e665fcafa3c411ff79f2b6cb332c82b42
-DIST gjs-1.66.2.tar.xz 440184 BLAKE2B 8df23470c763d65733c6fb622a1de8b8fed3e16c1ba67883b6ae0e7150a5a30a334735be39f9c68217501b7674fee8bfce6ab704c0742ae639a1bc14cdce4cd8 SHA512 2e0ca24532b3203a55089eb25de19b4b4f33166f40d1231198947057e45f364d3c7f794ff2079c1d9aee3fde9f99cd844944229d89d5e344a97254aaa42bad40
-DIST gjs-1.68.0.tar.xz 553044 BLAKE2B 6103299bb9ec67589393b0a863219b1bb08ebf141229574f07bb4984a2fb226f4daf4324038e9143f98048d0a2997805b93f7f408bae5ef727435c787e3b98f0 SHA512 65278ca345f2c786995bed7755dd86403b469eb6cceaa6db57dbd4af212025a3b1f01b7387f45dc9abc23d47ba2f39c5ab8a90ec95b1934f1471a68a06f0d82d
 DIST gjs-1.68.1.tar.xz 558920 BLAKE2B f5364fe92ddf4cb1e9b5dac5921fa180ed31bfe54ba8ad737e31c5f8a7f19d7e47bad07d7ca088e6e5962b2782a774b985b607214a7381a8b6c54e799df97235 SHA512 bce2f84e748dd483e0c907e7f7f230257aa4b216b76e89c3457ebba5e9bf601dcb5c771ebe864df22255e221876c6e7ee3097328e6f52ef78360f49708ff457a
 EBUILD gjs-1.64.4.ebuild 1121 BLAKE2B 98e74cb7ab03be98f02cd62a684c804ea40dff1df80632b13ef2ce357ecd5cd3030a3816258317977e1fce9021e87650d6128d71f773704b7340b6319c419f5b SHA512 229e77055f686debdebdd32e667ad59e706a77346772c8fa6164425bd3e60cb4947d477af9925aa4da8f90eaf55807ebea6c05c85acc594367bb4745f73a576a
-EBUILD gjs-1.66.2.ebuild 1109 BLAKE2B ed052e7b9398fefedf71ee2cacff2e00702f1e6c7444ea37a218bf047c07f91d8c52002f12cbab4c2a322bf85eece5377686ec44273e6bb59eeae4de093172fa SHA512 b7418593774f5712eaef63a66beb01a15cab894b535b8ee91596dbf6b10351b5b23fb52175977ad641c11949320bff14d0fbd9439889de3b955e23c9160d33ff
-EBUILD gjs-1.68.0.ebuild 1118 BLAKE2B 78679339767d36002659ab6ace56b9764bd656941d3ef4634114a680d07f84a38f69f82b70b3cc70b97949cbb95000fadfcc7c73675c066f40e309e6a6a7ade6 SHA512 c02d12781c718e98512f535c6bd87676994cd6852ccb4e1ac8bb9311297f61f65e72acc2b08c5580e1464a53e509615b2e80448b44db91ea0aa0a76d1bed697a
-EBUILD gjs-1.68.1.ebuild 1118 BLAKE2B 78679339767d36002659ab6ace56b9764bd656941d3ef4634114a680d07f84a38f69f82b70b3cc70b97949cbb95000fadfcc7c73675c066f40e309e6a6a7ade6 SHA512 c02d12781c718e98512f535c6bd87676994cd6852ccb4e1ac8bb9311297f61f65e72acc2b08c5580e1464a53e509615b2e80448b44db91ea0aa0a76d1bed697a
+EBUILD gjs-1.68.1.ebuild 1120 BLAKE2B 4b3c4da6265bf6494e180607706025373a9400baeda83f8ebaf0ebcf2ae47380b367a5b4918a61e9ecf75b59ff1e817ab35fa7cfd8a24ab406aad44304e25660 SHA512 67df97c143570e5de2ee7939b85a26065fb313fc3eccf3171aa50ed44325f8a063d917ea9031b50f0e704ebbcda308c245ba5af967f5038afd5e6e466ea72154
 MISC metadata.xml 388 BLAKE2B 9b4ab74929619cfb6c4405385667aa00521f59865df8338e9078286f2efa593dc49412153bd5b45e4fc4cbcd4c13a75c4743cd4381f05b07bed92cde09bf28fe SHA512 8aaf5f422cd8b63a71aa7773690607fb2d8ad6e6a7e350686da8e26ff4e6856c7f352ab02a79a7f2917b28758ff523a6aa6ddcfb2a1ad876aac94e6b2bd48072
diff --git a/dev-libs/gjs/gjs-1.66.2.ebuild b/dev-libs/gjs/gjs-1.66.2.ebuild
deleted file mode 100644
index 355eb763d380..000000000000
--- a/dev-libs/gjs/gjs-1.66.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 x86"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.58.0
-	dev-libs/libffi:=
-	>=dev-libs/gobject-introspection-1.61.2:=
-	dev-lang/spidermonkey:78
-	cairo? ( x11-libs/cairo[X] )
-	readline? ( sys-libs/readline:0= )
-"
-DEPEND="${RDEPEND}
-	sysprof? ( >=dev-util/sysprof-capture-3.38.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.0.ebuild b/dev-libs/gjs/gjs-1.68.0.ebuild
deleted file mode 100644
index 69f56003cd50..000000000000
--- a/dev-libs/gjs/gjs-1.68.0.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 ~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.38.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.1.ebuild b/dev-libs/gjs/gjs-1.68.1.ebuild
index 69f56003cd50..ddfa9d548626 100644
--- a/dev-libs/gjs/gjs-1.68.1.ebuild
+++ b/dev-libs/gjs/gjs-1.68.1.ebuild
@@ -11,7 +11,7 @@ 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 ~x86"
+KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 0a347b881ccb..e7e0c1ea297c 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,10 +1,12 @@
 AUX glib-2.64.1-mark-gdbus-server-auth-test-flaky.patch 842 BLAKE2B 6b2eb57b8923c8bb54ead80d829aeb7a5c8a42c62e960e7305bc3fad69c67fd21e1c9f20b5c9002c0319cf3d77992b9cb71912c9b813b723e0a56aaea38330ad SHA512 ccd92d2f1fd495618ac788ffe6b69acec05a521a0ee8ff2bacb1dce6e283a04bbc2a10e61b37fc29f3893003fa154fa0d30bc37ed266b3f813200cd8ed17c116
 DIST glib-2.66.7.tar.xz 4844892 BLAKE2B 2d128e8c933a8c5bd27734e96e50244f27c29199823e2185e8cfa5b4bbc0ca23f761c9de275c9941672eb945e302178b3cb4b5bd577f375ad953a97dddc70e34 SHA512 f6e6cc0fe2ab4a31a623bf9a1e63f833783e044e7ed55b66a84fc0cbf1410eec233fe0e226abb20aac0e40167a9624bf5e65197f9eed879da1293af44408d530
+DIST glib-2.66.8.tar.xz 4845548 BLAKE2B 8def5a2970f1df4782c93a1736d9ebd83ff1faebbfadd508e6ac58aa1d28a88a0fc7f504cc8006c2623bb656ce15d2dcb9e9188042daccd55adc8df0319599ea SHA512 d9d1bee82409bdceb14ab6008508f1abbb6eedfc22a35b1635d381594ee43c4ee9a1569d46bebe5b0b6d9fe7c629079f75660c6fa8f3b85a1dbca304bc6a6205
 DIST glib-2.68.0.tar.xz 4938804 BLAKE2B abbb06e9be3198ea79a42862bc0b71a40e87de6e4d49634458a6dd883d19c23d9e1a314b7820ea8eae230b24dccc909fd53b0e73587738e2341ff6f116e40cbe SHA512 dce0660476d67d7736c00861f4c3c267723f39032f582d1b2c17660a4939eeccd97e975da61b5be49e6f54612c6d5ce592aa7bdeacf4ecc75f3b38358da94a1d
 DIST glib-2.68.1.tar.xz 4940260 BLAKE2B fcf3a2fa2420ea3df13025d7a7e136862fa4cb6aa4f64a1af9fef7187d075db70deddad13ebde56b9032940437dbb311e9658bf112fd3cae8d8313d252ad2d87 SHA512 f705cda6f1b4b0acc5fe8d21b60994ca0ec6de39c6722f4f01cbe0ece30eacb7271d3cb29067e638e0204a3cefa2df1e535f273b72330455e185b544cebc2ab0
 DIST glib-2.68.2.tar.xz 4944192 BLAKE2B d35489dcfe9d57d8bd6ecf4f893b7c8e93a5b8108765791071fc811598d1f41287e03d95f20591d50d51a78db34f11833cc7970b1bf29299385357a14977ba0b SHA512 74d481552629cab67d22f8a440a7263a4e4b83adb6f3b772d368e255c17321b206aafd3af4653e5efbb2c3c14ca67d35f453728cbc5cd68728275d0b56789019
 EBUILD glib-2.66.7.ebuild 10440 BLAKE2B f73b51d8b515c8068e1bfc136a10f1ee0d2506002b1d807a5536fa75af8e767f99c740eddd4edda977cbb3395e7c880ace4a05adc5f29600004af7bc757191c0 SHA512 5b6bfcef44dbc7d87cc059df97dda2e57df512811934a85ce753602772952889f62ec046579986f0adf5ad95ba14b7a40b29510f0131cc07a35585790fcb5a7b
+EBUILD glib-2.66.8.ebuild 10445 BLAKE2B 65df1eb457eea785eb3d6ecae687c7b25c9257c121b2c6010a2fa2180baf8f471ede84ad81902c3a3bd2e9d4134b09d18e32b3dccb68090d918b1db6764d82c1 SHA512 42bd901d34e24696148f037276ef17dbb5dfadd05d59f603ad7d5f603bde71354dd72e7298c09cc38db510b6b3f9fb0947c240ada96af5bde3d71c33257d069e
 EBUILD glib-2.68.0.ebuild 10222 BLAKE2B e5e2b00a080c75aac379311a16812a222b1ff10dad250d96a4982deb5908d2c5ca1d82d8c608e25de6d6cb7d796a6ab7cb1e264074efaec45062daaca46b0960 SHA512 19af5623b2966409f33c0c3cd7b2d64b3decff0152bb4c069336d6135c5f7dfaccc7d756f32fb7aa365688862af13a8921db1e8214454fd165953266276ebb1c
 EBUILD glib-2.68.1.ebuild 10222 BLAKE2B e5e2b00a080c75aac379311a16812a222b1ff10dad250d96a4982deb5908d2c5ca1d82d8c608e25de6d6cb7d796a6ab7cb1e264074efaec45062daaca46b0960 SHA512 19af5623b2966409f33c0c3cd7b2d64b3decff0152bb4c069336d6135c5f7dfaccc7d756f32fb7aa365688862af13a8921db1e8214454fd165953266276ebb1c
-EBUILD glib-2.68.2.ebuild 10221 BLAKE2B 822070daa1f37db364fbc4b4966f4fde8f4de20375db353c36947a60fe7b80cf85eba329abddbf9901ce84f5bdd8a4d75a8e611494d48be19802c36746d366ec SHA512 e0ad56a716b5e1f870562287f993224f6ad0c2375d4ad75d3490b05003aae99df337bddeeadc737e1028fddff1fd53467f64045bb09679fe734dbcd64c0b7ddd
+EBUILD glib-2.68.2.ebuild 10213 BLAKE2B 14c764410afa31815ec0d4d22f081cfa0ed5d73c7af9992c30afcc3a4c7edaf8668cfc4e2224e2949417f147aac177e7dd8f4c9b8cb3382919b1f87368f72dea SHA512 31e041a5ff2399f470965bc71a5c008fe85378447fc9cf2d54f505fcc65e474c9021d75e6873ffb69156ec9cc15d04e72d6bbec7162d99ed67080878d96e7461
 MISC metadata.xml 1220 BLAKE2B c3ee6985e9ad87e30da951c79a900c6b0284a84b11bde92d4bd345c679e49b084cb1dac7f1ea4b9f1d0d8170a067565f1758ba5fc51c9e613372f0b72643effe SHA512 541b49b565499a9cbe4062a0270b08d60ee9d9cf36ca53d3339f7ae1d406db825b84c193f363181afeaaea7ab6560d7aa0d62ca85d02e5521bd6c12f14a9ba56
diff --git a/dev-libs/glib/glib-2.66.8.ebuild b/dev-libs/glib/glib-2.66.8.ebuild
new file mode 100644
index 000000000000..62117610b3cf
--- /dev/null
+++ b/dev-libs/glib/glib-2.66.8.ebuild
@@ -0,0 +1,290 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit flag-o-matic gnome.org gnome2-utils linux-info meson multilib multilib-minimal 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 elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs sysprof systemtap test utils xattr"
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+
+# * libelf isn't strictly necessary, but makes gresource tool more useful, and
+# the check is automagic in gio/meson.build. gresource is not a multilib tool
+# right now, thus it doesn't matter if non-native ABI libelf exists or not
+# (non-native binary is overwritten, it doesn't matter if libelf was linked to).
+# * 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}] ) )
+	!kernel_Winnt? ( virtual/libelf:0= )
+	fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
+	sysprof? ( >=dev-util/sysprof-capture-3.38: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)
+		-Dgtk_doc=$(multilib_native_usex gtk-doc true false)
+		$(meson_use fam)
+		-Dinstalled_tests=false
+		-Dnls=enabled
+		-Doss_fuzz=disabled
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+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() {
+	einstalldocs
+
+	# 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.68.2.ebuild b/dev-libs/glib/glib-2.68.2.ebuild
index 8741bcf271bd..c43b9d12caae 100644
--- a/dev-libs/glib/glib-2.68.2.ebuild
+++ b/dev-libs/glib/glib-2.68.2.ebuild
@@ -14,7 +14,7 @@ SLOT="2"
 IUSE="dbus debug +elf elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs sysprof systemtap test utils xattr"
 RESTRICT="!test? ( test )"
 
-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/gobject-introspection-common/Manifest b/dev-libs/gobject-introspection-common/Manifest
index c76e79ce3a58..19ef130aace1 100644
--- a/dev-libs/gobject-introspection-common/Manifest
+++ b/dev-libs/gobject-introspection-common/Manifest
@@ -1,5 +1,5 @@
 DIST gobject-introspection-1.66.1.tar.xz 1012784 BLAKE2B dd3faa70a482016c9d45b41a62eb1708b775979b92a466c45e70fa9f7679f3931467f5f41a30ecf2260afdd5759218f0afe68b82901587d7cf9267b1fe59d4e8 SHA512 ea1e20cd94ff8af3572f417f35e96648ffc3e94a91d4e4c81adf99bb0f408ac21ecf40990f9dbd5f2e0f4e83360286ca5db88dbc45bd59289596a324acf7df3d
 DIST gobject-introspection-1.68.0.tar.xz 1019732 BLAKE2B 2f99cc9cec5ea05f1a5fa4473d1ad424cc1f6b097075f798e89cf740519db180417a3f0de37afc8a0cf0771436a9d9f7d6193b69289dfb47ec077d33a7d27c91 SHA512 d2e64c119aa500b624a57baa2cebe9126ab100003d98b771f4fb51cf92748635de352997f702f40656f7c665f3dfedfbfa19912cc7a2d039d254555243bbc381
 EBUILD gobject-introspection-common-1.66.1.ebuild 928 BLAKE2B e70715e34256971a5d6b05ae3f1f15d48de78f43ce692fae64af86deecf29c84aa89e011d41293a8ad3a31b1c45a318ba3611c8efcbc6f066acfb16e7eda99cb SHA512 8d31a0da92b8b3c108941a55fd52e2f3bbfe474c9d76e794543aace9756cd8300465d6dd21dd1a161c392153cc746c23d6337830773b0c22772cff4cfe0beac1
-EBUILD gobject-introspection-common-1.68.0.ebuild 936 BLAKE2B af10d956a35e545df5668677594a4f138f89d5fea027dc7b17ac5a54c9f7bd1f764b13445635809914adb1f6dd7ff1749fe40ee43d2550bb1240dba33858d1ce SHA512 d4a952192a343d32ea4c33ade3aebcf58efa6ebbe05c4234f4db2c1a0a12f1468f5815bacc01e0098f104b05ed61104f1a779c7db0580534b2451af7a23bce12
+EBUILD gobject-introspection-common-1.68.0.ebuild 928 BLAKE2B e70715e34256971a5d6b05ae3f1f15d48de78f43ce692fae64af86deecf29c84aa89e011d41293a8ad3a31b1c45a318ba3611c8efcbc6f066acfb16e7eda99cb SHA512 8d31a0da92b8b3c108941a55fd52e2f3bbfe474c9d76e794543aace9756cd8300465d6dd21dd1a161c392153cc746c23d6337830773b0c22772cff4cfe0beac1
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
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
index ff6157de2f64..483d8f843f5a 100644
--- 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
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~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 4b790641e56a..065469acec47 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -1,5 +1,5 @@
 DIST gobject-introspection-1.66.1.tar.xz 1012784 BLAKE2B dd3faa70a482016c9d45b41a62eb1708b775979b92a466c45e70fa9f7679f3931467f5f41a30ecf2260afdd5759218f0afe68b82901587d7cf9267b1fe59d4e8 SHA512 ea1e20cd94ff8af3572f417f35e96648ffc3e94a91d4e4c81adf99bb0f408ac21ecf40990f9dbd5f2e0f4e83360286ca5db88dbc45bd59289596a324acf7df3d
 DIST gobject-introspection-1.68.0.tar.xz 1019732 BLAKE2B 2f99cc9cec5ea05f1a5fa4473d1ad424cc1f6b097075f798e89cf740519db180417a3f0de37afc8a0cf0771436a9d9f7d6193b69289dfb47ec077d33a7d27c91 SHA512 d2e64c119aa500b624a57baa2cebe9126ab100003d98b771f4fb51cf92748635de352997f702f40656f7c665f3dfedfbfa19912cc7a2d039d254555243bbc381
 EBUILD gobject-introspection-1.66.1.ebuild 1978 BLAKE2B d7f800483e3ab052eb7145aa5b75f77c638d18e2fa157f1fa6688d15c4c8eb5fec5c38d794501a68d594f954d9086ed045ff7688ba8d1ab11e2c005a0090a64c SHA512 3a07d8938879607fc037572828ad66f4e2330b41c9e2ce667ad523c7c6d9855ffced9f731720a70e5f4dc0c75017b6c207ed7613b7818bd8cc0d9df4376a4f0a
-EBUILD gobject-introspection-1.68.0.ebuild 1993 BLAKE2B 19e5042b468228bdbd88bd63563dac1ee21d46eefddefc55bde120bba1c3714d3fde11f87fdefe17210ea9684f21e7742a766715655870bf7aa08da5236850e5 SHA512 71e85f8ef705196a0dc10753c37a40c8618f4e24619fea983cc0a2cc2e3df57940c7fde5e7c274f2cd4d1fac07e0a8716a12efc3e06ab39fcc572d6e193b78db
+EBUILD gobject-introspection-1.68.0.ebuild 1985 BLAKE2B b4db889fb3637c8f2f2b08634b9bbc94c2c54eddbb4efaaf87090f2d6c30ecab7b914de1c95a0b25c48122aef658e6e5a6525f7c4ffe7689c53989837288c7d6 SHA512 aace126b652da5ae63f88f6a6f98d63d86265159904725cbb04a163bfd659a6e9174ce5207f4b6bbe1c3d1c36d59e78357606f4388f6aefd5fabe81ce15e50c0
 MISC metadata.xml 367 BLAKE2B b69aefd2ddda2f8e216d449de9ca13a5a8c473353b291bc5093ec2f6f3ac3346dc9fa25c85a64f15950813d9d6dfafd356a234c748436edb7639f37e95c71151 SHA512 1430924bf7430f4a409d6c3335a52b59567d5972440068e53e637d6c71486ef3e606ed9043184dfc168d731909e11c769042d2846e137312cd0ee0ce6f52e431
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.68.0.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.68.0.ebuild
index e9c40e78bf67..e1af1e366e6c 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.68.0.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.68.0.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 IUSE="doctool gtk-doc test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~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="
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index 3773fba1f703..3fe154c88bdf 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -4,5 +4,5 @@ AUX icu-68.1-nonunicode.patch 477 BLAKE2B 5e74142e5adbf8f3fffa23c8fb08657b5b75d1
 DIST icu4c-68_2-src.tgz 24737478 BLAKE2B ff54f903aed1a16928656e5f4fee79e4301038a70ba1d389fb2a2cc7c7dc4c76bc2430c810cea484c0ef69fbafc5728e71776c39874a5395c9dd06d573e8ea90 SHA512 24f3b7981667b37df58118f56ae76a09b719358c1efa8d6f044d28ef8df1c722a894957acadfb3c37aee39ac845893924fc3370d6bbe09875aec8d937059f84b
 DIST icu4c-69_1-src.tgz 24814903 BLAKE2B ef95a04e238f0de96e969d580ef64000ab04a4a0003e8f31fd02baab35387d5ab2c4d792ae0d14f3de8e48aa28570237ccd67fb32e03b13d1572e4a995b1de76 SHA512 d4aeb781715144ea6e3c6b98df5bbe0490bfa3175221a1d667f3e6851b7bd4a638fa4a37d4a921ccb31f02b5d15a6dded9464d98051964a86f7b1cde0ff0aab7
 EBUILD icu-68.2.ebuild 3513 BLAKE2B 96030ab9f3819d5c9d60adc9cb044150abf0adb958bef0925dae595ea4139bc80fc02d1743df56feb6b9a4ee8235d62a24280457710f6a51d720746535a50b1a SHA512 f1aba2f2669183077e5d46356ffaa570b7dcfab7531e0e4c33b6b6a4d1d8b19ef63422396b9dd8be03488089faafd4e66d61e60c763330f94dc03b9d83d55e63
-EBUILD icu-69.1.ebuild 3521 BLAKE2B 78e7c37da536a36de76cd071139c037935c959f5c15448107b2508e6e9ec325f98fc194d5c08dcd101e37bedeb188ad823ee44475a6dba12fe41df3137f218b7 SHA512 d9e95da2917901daa3c3189d2055de4a96794ff990e557bf7ad58b9bbd653e47faff354b4e9c63effe846be2c6f1465792caefebefb2366cb7b94c20793438b4
+EBUILD icu-69.1.ebuild 3520 BLAKE2B 77da9f393e2c57cba27e9b564c4f2969191cc01e02465af3dfe3bde0ac0caf8284c1e6d6ae5e1394e76a105e818911eeca3586bdfafc19cf153844166b473a01 SHA512 85707a3e75d0b21d6a78cdda3c6752e00d01c913a782e0e579e506005827bb5c8e7573abf16b39f660b834c537a048557ad40c2353ca6ef0a49676e5b7b99704
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/dev-libs/icu/icu-69.1.ebuild b/dev-libs/icu/icu-69.1.ebuild
index c460afee8489..bb3f5f0b9fe4 100644
--- a/dev-libs/icu/icu-69.1.ebuild
+++ b/dev-libs/icu/icu-69.1.ebuild
@@ -14,7 +14,7 @@ LICENSE="BSD"
 
 SLOT="0/${PV}"
 
-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 ~x86-winnt"
+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 ~x86-winnt"
 IUSE="debug doc examples static-libs"
 
 BDEPEND="${PYTHON_DEPS}
diff --git a/dev-libs/imath/Manifest b/dev-libs/imath/Manifest
index df9be449f7ff..cec808917612 100644
--- a/dev-libs/imath/Manifest
+++ b/dev-libs/imath/Manifest
@@ -1,3 +1,3 @@
 DIST imath-3.0.1.tar.gz 527715 BLAKE2B 45d8f6524fd2505bdb3318f571c44228c9baf6df869d194d4b90a9c045f1dbb8f905253aeaf6b6a9254e4b0c0c19d753b7e4ae068732f0367fc936d4a111520d SHA512 40cdae81d624636b3dd7eb456e6e205e5b7adf7aed17f6e9168374f8830f1b5755dcd32ac790f94e768513d06ab96d94a2bc57ec80a079e4ac94a3857e5e3988
-EBUILD imath-3.0.1.ebuild 1995 BLAKE2B a892bd2b5876b373e2f75e073ba2b459d9376b43072242e13eb95901da47028c964dd28d1711631b7b83d788021b571584cf6f722e5807932b58bef0e4900d49 SHA512 b6dd8b75e5c39b0f6641c51d117a0b2e5dba2b7e6446f0eeab23a8796203ac0d88198da377042cad88ec3a821942e10f21ce57c2562daf75a3ba37ee507283eb
+EBUILD imath-3.0.1.ebuild 2002 BLAKE2B 727e5c820b511d6f60995ac402fa9e12ce880b7e3b5731cc60ae8763f3a69de18dd25939db31e7b503b43e0271fcbb73cf84003b39687fadb229f8b45e236520 SHA512 9ffc3c6042e52db7c5747dcfbd441edffa394a0d79ea181b0b54017d5a6f2abaf813267c0f975650d3b6208b46c6eece209fabb334721251fcf6418ff4a7cb6b
 MISC metadata.xml 819 BLAKE2B 20d1b4527861c2c01c4e6b9f413f539b6119934932ec3c8d1a7a272f52a9579832f230279de518fee775e104c6f2f149479b6dc774567e28b612676b0ce6f399 SHA512 06d1832ce88a1a1c83ddd09687a242fb109c43e3d38d4d3d8cd236308d11a649a9f060c7fd7af7c69a209b560cf1e541e18212ce62309357186183d749304031
diff --git a/dev-libs/imath/imath-3.0.1.ebuild b/dev-libs/imath/imath-3.0.1.ebuild
index 5fce7b3bf25b..5a251808c673 100644
--- a/dev-libs/imath/imath-3.0.1.ebuild
+++ b/dev-libs/imath/imath-3.0.1.ebuild
@@ -14,7 +14,7 @@ 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):
 # ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x64-macos ~x86-solaris
-KEYWORDS="~amd64 ~ia64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ia64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="BSD"
diff --git a/dev-libs/jsonrpc-glib/Manifest b/dev-libs/jsonrpc-glib/Manifest
index e6c506f165b5..66bef2e51d6d 100644
--- a/dev-libs/jsonrpc-glib/Manifest
+++ b/dev-libs/jsonrpc-glib/Manifest
@@ -1,5 +1,3 @@
-DIST jsonrpc-glib-3.34.0.tar.xz 41792 BLAKE2B 2be0d690e3ead57a7ad71b93d13ad28e23c96d89d36373d93ba608c4ea2aeed3684862938cfb64675cfcba84d9804f6352b877e343ac2af5aed8b2d4b39854f8 SHA512 58908dd11f7848b09e63f7a7ff2185d0742c049ddffb033e768f783bcbcda7e75a658bec923372212694431b25b0fb894e3ea37ce2d7c52c99e49fd230319c10
 DIST jsonrpc-glib-3.38.0.tar.xz 42224 BLAKE2B d7caf3dc116c43d652009ce646c0b837bd8a2a1b4d2b60ba49e9d746ff5e36e4c91fe5f4b5542a4562e6c8f13130d00fd22b57777d0e5ffd6e5b46f817f4dcb4 SHA512 1862403c37b7140e91720264a1b00a408b969f0464fc022a5c24be0eea993526d118ece6611927e1309071c3db9d3d6bf9f13ae8ed23ff1d34f36fb68c2584cd
-EBUILD jsonrpc-glib-3.34.0.ebuild 971 BLAKE2B 4f0ba2deafc37cf4051ba58ee20c19c669c1f46b78c893b2c859a55bceef4e0fb2a28118d208c5bedbbc5260eb6d5ee9884c7163132fd0212642bacb1b4fab7c SHA512 93372b1f84231ef06344b177c5696b9da31863e46bfb24814d7d99eccce5f069ae23fdb9b2f3b1227bea3d3064a8957b5cf31c299ae30b4eeb4acb8c2eecea74
-EBUILD jsonrpc-glib-3.38.0.ebuild 973 BLAKE2B a081bf1c0dc4dfb2379ba42704ea87f5054827b618bf91720c0dccc2cd5fd5a52a18bf791114ef56984e1087a25265e1fecc51264d07826fcd2d20f42540637b SHA512 34c5d9ce9ef46a4a3dc32ce7609dad4b522c9be56c8bde9ac438e03fc42080c213fec44adfc8ec857ce3b83a3762743d8b60639c928f01d39bacde4488b45802
+EBUILD jsonrpc-glib-3.38.0.ebuild 971 BLAKE2B 21b1270fc6e79a3a6c8bdea517906530635343b2123e6bef6f82be5e42249f329101cb2b0e92cbafd5551cde33f3a372ff573602ee0a3b3c9106f93157a57e4f SHA512 e895f8237cfca36f5e6b2d1f5728fdb92e04564af24a0518d6a40e434af6294aeede6b2eac959280a1c888c64c72d3c5d31cc59db0409f98bc292b1199e66c1e
 MISC metadata.xml 505 BLAKE2B 2319e91326203e3b6173bc52a21d689b6adafff6a08ff2832a28d48e5b537592766b5c7a7ae5c60ea682beaca10e8037a88b05e2f98573441ea611c11e021dc5 SHA512 02f34f7222c80a4568b3c293fa46f45bf64bf1410c529c77271aa9922b22237c8f29ec9724e071cd6485d0e73ec0ea2bee028c6b0763d2c0da736d6aac24b2b3
diff --git a/dev-libs/jsonrpc-glib/jsonrpc-glib-3.34.0.ebuild b/dev-libs/jsonrpc-glib/jsonrpc-glib-3.34.0.ebuild
deleted file mode 100644
index 217ec10520e3..000000000000
--- a/dev-libs/jsonrpc-glib/jsonrpc-glib-3.34.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 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.38.0.ebuild b/dev-libs/jsonrpc-glib/jsonrpc-glib-3.38.0.ebuild
index 0029319a3d8b..68a3f323f7c2 100644
--- a/dev-libs/jsonrpc-glib/jsonrpc-glib-3.38.0.ebuild
+++ b/dev-libs/jsonrpc-glib/jsonrpc-glib-3.38.0.ebuild
@@ -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/leveldb/Manifest b/dev-libs/leveldb/Manifest
index 787f7632dcaa..5d4f948baa8a 100644
--- a/dev-libs/leveldb/Manifest
+++ b/dev-libs/leveldb/Manifest
@@ -2,4 +2,4 @@ AUX leveldb-1.18-configure.patch 1452 BLAKE2B d67c8a226fe8640a5c19d7e7d8e293d0ef
 AUX leveldb-1.20-memenv-so.patch 1877 BLAKE2B fa75c48f438248ec73765d959bbe746b3b4887d1fbfe1b33287a81a9a3fcb5ffabc5eacc350e214dfc40b78c8df7e6246bbf5a889b5d2fded5101da5a8fb72c0 SHA512 31fd9cafe226ceb83cb9a0b526ef4941e29406a182e366521ba2d78dba9ed3e7f32a088362ff9b751a82e30b12a12acd8f4d38808dde288116170417e4de8200
 DIST leveldb-1.20.tar.gz 223141 BLAKE2B 57ab5cb191679b8fbfaa28fa0a61ee1dcd757bb9c70215dd325daebfd93b30aa9bbe3c993a1758aa9804a7cd6f2c31df7cf98bdf98320cd1aebc14f5eb77d9a5 SHA512 c59258f2f58ce2d5680e9ab3da4ab0923d91cd4648dcf63cdaa26cdde92bf45e094544539ad11d8e09a4a4813435286143ed0e86c21c6c31a0596903ed4744d2
 EBUILD leveldb-1.20.ebuild 1755 BLAKE2B 0fe19dead939d81398ad0c54874393300221f7b45a1ec24dda1949ff2080d8d6bf5275efa1a51c83c0251b247cf5fcf4328ca26116ae6cd35dd9450411dba8bf SHA512 125ffe35e50299b19f937fdcd5a0876b5e576555b0bed70ed1cb2a29e908ed626a24f4a39ba4173de1cf0db923f9d8359bf068e640e2f9944e66c65229d79492
-MISC metadata.xml 400 BLAKE2B 770ed89274db8fd29e68bcc792bd9f593ea0785ff4f1651d85902bb0272cfdff3914ecd98e81dea4160ad085e1e0da6938ebfa801b2b5484cf5edd6666908e24 SHA512 b7284da0474b747738d6da09be217c815ec8b333f2b1f571594531fb77ec15a6cf4564b6053dbab84ceb94f3bcc5d16ed374780852920a7ca823df0ed00be5dc
+MISC metadata.xml 315 BLAKE2B b2a27d75d769e6e577df61582904e596262deb862c84bb7411a7ba10eab585c0d85501b95118295af4668296df912d3750f2b2df8239aa69f54495bb0f842952 SHA512 503e136c4cdefe645b1dab546e6f17c550f75c7429f0aa4511797f6b7c8dafba1f74aed6ae76590d8346b86ea814b1309388dffe9acd0de39f857f01f94e830c
diff --git a/dev-libs/leveldb/metadata.xml b/dev-libs/leveldb/metadata.xml
index 0ee1800285cc..3e973eed20b1 100644
--- a/dev-libs/leveldb/metadata.xml
+++ b/dev-libs/leveldb/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>patrick@gentoo.org</email>
-    <name>Patrick Lauer</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="github">google/leveldb</remote-id>
     <bugs-to>https://github.com/google/leveldb/issues</bugs-to>
diff --git a/dev-libs/libappindicator/Manifest b/dev-libs/libappindicator/Manifest
index f57088a4908f..f144fd65a54b 100644
--- a/dev-libs/libappindicator/Manifest
+++ b/dev-libs/libappindicator/Manifest
@@ -3,5 +3,7 @@ AUX libappindicator-12.10.0-lp1867996-fix-g-signal-emit.patch 2937 BLAKE2B f5782
 AUX libappindicator-12.10.0-lp1867996-fix-iterate-search-path.patch 483 BLAKE2B f81ffe5960196ebf683f9f52b5cba097843727086f4e836f7d27788e1cfbcb7d54196f19bf0035910aeb087b8896b54f7d91e318781fed05c74571a0a000d63a SHA512 a9ece0e95155a83a26fa070381edd3e46bf6c0346e5b5adbe6dde84e9a5792fb6d92b40dc98f7309f2776efcbeb0cd8ff7da1c0091f399b1e00eef809d930a3d
 AUX libappindicator-12.10.0-vala-inherit.patch 561 BLAKE2B 481ebe7b58af89df6a326b79a65f9ac7110c9d82a61efb993051d691d5cc728075bdd5ac904e9986cb0e41780d3e36e1637e5bd58532781934587b8c1bdf458e SHA512 b021bc0ec7fc1b311add7d6f8a9018fa6f5e807168055c95440e5f5d3d6d5b48375e11542b906058a0786194b1911c8bdcab9632573c1f128772ff6d54aa9173
 DIST libappindicator-12.10.0.tar.gz 535562 BLAKE2B a05dc839aaea9fb3fda118d16aac0eb5c35e6c5095a83eb5e8a2af4902bc1da14960fbd57d3cda5d4d5d874023549ce83657a515aa9ee16a54cadfa81062d993 SHA512 317a22a23c8ed84e74207b64b2e9683992d1fb7208176637a051dfe925974f966d1cfa31e650b45eaf839ab61641dee8fbebc8a07882a09b0dd766d88b8d5b9a
-EBUILD libappindicator-12.10.0-r301.ebuild 2107 BLAKE2B 08669f52456439e1ed2e79e621c05124ce7411905c4edae741ea56db68f9fb4f6b0ba96d0a62ce0ed0dc469fee47807111854c3182eaa5a0c06d56c1046a1d04 SHA512 eb6e2de2779cf909eea82a208dd02659a32559968040fe07804de7cf739570cdd466a08b3956771aaacc608d700b8dd9b3299bd6b7ecb4a6373dedba7790fda1
+DIST libappindicator_12.10.1+20.10.20200706.1.orig.tar.gz 75204 BLAKE2B ccc7909f25946413cf39275d8565afca253b3a2676272e4d3833f030a114e7be695fe958d2d99868a20d03a2b9c4a1fcd7fdfba07325b7a9f7f39879851e0366 SHA512 cc60875b1c4ab06348eece442a59a4057d7e13f25605435902242558e8dd5e66aeeee6725b9bd2662ef89052d3614dc4577ed8c233e9b84236a75e771aa67352
+EBUILD libappindicator-12.10.0-r301.ebuild 2120 BLAKE2B 1463512cb7bc35e86a3aaa486f85637aee8269931b2385d2a6006743be5f7055b16308137631c7f867d5b7b3c7986b94c5736ec2ad7aece1b3f8b8f0d90f67db SHA512 a7aa23d5998bbf8e8e8c8d278fa0ab6acd3ddfe3e4f9a5513f2cec1e14cc2cdee062d76990d248add697f5dc01dd178fc53e0f0a18d16d5623f0a07293f5171f
+EBUILD libappindicator-12.10.1_p20200706.ebuild 1934 BLAKE2B 24d791c45d2680996ecd499bc99dd4588d9e0d0b8815acd1440fffee94701b4a24862af9733d29b70c699a8c38229696b64e2600cecacd718a4ed1d0f9eb7935 SHA512 4280bba256963d0dd64b799e40d28481f28d8e3269b7b251ea7fe89a724dceb7441753eda9eaec2eb5bbd8dba5114c31bebceed5e84e93c47c2927b82dec3a49
 MISC metadata.xml 250 BLAKE2B 8bd202d452582a51ddf3c4bc92840531d0fee0262d112e5fc1173c8fb95a0776efe14ff15613373fd4acab6082ad6f672e278a9b942e072a643b351e8af4d467 SHA512 161da1b732e0f23b06e0732db24f27cb486e7c673e8585d2f6403dc23147b56b5a64dd09978e3dd2db20e9e6a462daf50fe8bc73774d52445d1f6549d82104e0
diff --git a/dev-libs/libappindicator/libappindicator-12.10.0-r301.ebuild b/dev-libs/libappindicator/libappindicator-12.10.0-r301.ebuild
index 32b93d812d6b..21db99eac660 100644
--- a/dev-libs/libappindicator/libappindicator-12.10.0-r301.ebuild
+++ b/dev-libs/libappindicator/libappindicator-12.10.0-r301.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 VALA_USE_DEPEND="vapigen"
 
-inherit autotools ltprune multilib-minimal vala xdg-utils
+inherit autotools multilib-minimal vala xdg-utils
 
 DESCRIPTION="A library to allow applications to export a menu into the Unity Menu bar"
 HOMEPAGE="https://launchpad.net/libappindicator"
@@ -72,5 +72,5 @@ multilib_src_install() {
 
 multilib_src_install_all() {
 	einstalldocs
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/libappindicator/libappindicator-12.10.1_p20200706.ebuild b/dev-libs/libappindicator/libappindicator-12.10.1_p20200706.ebuild
new file mode 100644
index 000000000000..c963bba5ce2d
--- /dev/null
+++ b/dev-libs/libappindicator/libappindicator-12.10.1_p20200706.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools multilib-minimal vala
+
+DESCRIPTION="A library to allow applications to export a menu into the Unity Menu bar"
+HOMEPAGE="https://launchpad.net/libappindicator"
+
+MY_PV="${PV%_p*}"
+PATCH_VERSION="${PV#*_p}"
+SRC_URI="mirror://ubuntu/pool/main/liba/${PN}/${PN}_${MY_PV}+20.10.${PATCH_VERSION}.1.orig.tar.gz"
+
+LICENSE="LGPL-2.1 LGPL-3"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86"
+IUSE="+introspection test"
+
+RDEPEND="
+	>=dev-libs/dbus-glib-0.98[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.35.4:2[${MULTILIB_USEDEP}]
+	>=dev-libs/libdbusmenu-0.6.2[gtk3,${MULTILIB_USEDEP}]
+	>=x11-libs/gtk+-3.2:3[${MULTILIB_USEDEP},introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-1:= )
+"
+DEPEND="${RDEPEND}"
+# dev-util/gtk-doc needed for eautoreconf
+BDEPEND="
+	introspection? ( $(vala_depend) )
+	>=dev-util/gtk-doc-1.14
+	>=dev-util/gtk-doc-am-1.14
+	virtual/pkgconfig
+	test? ( dev-util/dbus-test-runner )
+"
+
+S="${WORKDIR}"
+
+# FIXME: tests keep trying to access dirs they don't have access, feel free
+# to report a bug about how to avoid that
+RESTRICT="test"
+
+src_prepare() {
+	default
+	eautoreconf
+
+	# Disable MONO for now because of https://bugs.gentoo.org/382491
+	sed -i -e '/^MONO_REQUIRED_VERSION/s:=.*:=9999:' configure || die
+}
+
+multilib_src_configure() {
+	if multilib_is_native_abi; then
+		local -x VALAC VALA_API_GEN VAPIGEN_VAPIDIR PKG_CONFIG_PATH
+		use introspection && vala_src_prepare && export VALA_API_GEN="${VAPIGEN}"
+	fi
+
+	ECONF_SOURCE="${S}" \
+	econf \
+		--disable-static \
+		--with-gtk=3 \
+		$(multilib_native_use_enable introspection)
+}
+
+multilib_src_test() {
+	# Prevent tests from trying to write on /dev/fuse
+	GVFS_DISABLE_FUSE=1 dbus-run-session emake check
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libatasmart/Manifest b/dev-libs/libatasmart/Manifest
index debf14c3dc23..c9245420fa08 100644
--- a/dev-libs/libatasmart/Manifest
+++ b/dev-libs/libatasmart/Manifest
@@ -1,4 +1,4 @@
 DIST libatasmart_0.19-5.debian.tar.xz 6452 BLAKE2B 09bde3d5d79062d4df82e5582e932b6b566a91607086ddd805925d1966cdee4cb4ba43863f4b7d26a98588479b117841050f762d23c6719448635bf1e681b315 SHA512 434b6ef3ea377485ce745e147da8bb72851b2eeabe6f418379511650f0161f15a9ee21f4f0b5f9beb218b99eb417c1aeafdea4640995efbaf45024f40ce71802
 DIST libatasmart_0.19.orig.tar.xz 251204 BLAKE2B 7e2a9823c27eee5a41f93464b28236239891349639162c5fdc114c241a70fb39a3046c3de16ce402787cd86e13609fff0578bd26f7a2c994fefe3c9756d45968 SHA512 ec9edb019c477873b01289ba365ad0ed0946505d651c1f6f83a63ef61b3976a5db6439c8a0c74d9a55325db9a3a587ad6f655f8d1af9387b0d08356eccabdb62
-EBUILD libatasmart-0.19_p5.ebuild 1182 BLAKE2B 87b7f98e145901e4667953ec4adc4f532cf8f99688a8bb1697fb0262d9d54ea8b7adfdcf9ac8f5d6274df6aeec8d760dd1d51c138aa049f98c507edf3e88cbd1 SHA512 9d758a3bc2924a2eef5362082f38f4cfa76a16280536bae63d5ef50b374d2a56274d03652d74c4c034e77c0b06b5be88b63215f4d3802c756316113f616bb94a
+EBUILD libatasmart-0.19_p5.ebuild 1189 BLAKE2B 4eb5d6698f65a4197988ab6082aeab688bc0aac064bf8335b46a84d09c26509357aa8c68c0c08d176d49aecef8980777fcd10d7f76656a2e90a7beab53f98d49 SHA512 2e57a6d7a8e30a9a1cc1b00fe3802d3e852e079ac1570641d0fcd123caef2b00c29519c703e42a7ff6c6a6dffd24510d19802d835bb50fec7a1600651160c772
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/dev-libs/libatasmart/libatasmart-0.19_p5.ebuild b/dev-libs/libatasmart/libatasmart-0.19_p5.ebuild
index ca77a0f760aa..b25a58b51f21 100644
--- a/dev-libs/libatasmart/libatasmart-0.19_p5.ebuild
+++ b/dev-libs/libatasmart/libatasmart-0.19_p5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/liba/${PN}/${PN}_${PV/_p*}.orig.tar.xz
 
 LICENSE="LGPL-2.1"
 SLOT="0/4"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="static-libs"
 
 RDEPEND="virtual/libudev:="
diff --git a/dev-libs/libbpf/Manifest b/dev-libs/libbpf/Manifest
index b3478d0972aa..2898407bbf4b 100644
--- a/dev-libs/libbpf/Manifest
+++ b/dev-libs/libbpf/Manifest
@@ -11,6 +11,7 @@ DIST libbpf-0.1.0.tar.gz 666896 BLAKE2B 5923b4c8fb915722f8cc2015ab8f07773a83c425
 DIST libbpf-0.1.1.tar.gz 666908 BLAKE2B 0efb044b1dc02230d14a6e92c40d66f7cb28c7efbecc3d97d084a52dde581dbd02b02fb7fbbe8b4ca051f2f64497c6240c5dd9c992e6fe4629a1332311b7833c SHA512 b9f68323a8f53b0fb0bf418b8a37685e7d74b6f5ad7aa2f266f65cd57199b3b9b5865bc4579758e5adcfbb027ced83e12ee87f3ff3bf159c7b54cbdcd50fd62f
 DIST libbpf-0.2.tar.gz 699136 BLAKE2B d3c7005e5c27f805a33b444267ee28c3fb143c809a8a3ac733d51c56e7ee310e089964844cd4f1f7519b20dea1f4e4d6b0e6acd7bbdd173c99af54fad3635771 SHA512 22fed87cd4da1765465d812979b39ee3126b444fd6b460472a0a7e2f4fb496d278c9d7d672c3fb15005a58d361fd87c5173c18dcf55664dfbb8e6cadb2eed33a
 DIST libbpf-0.3.tar.gz 979131 BLAKE2B 523040600cb08ed1ad301899f85fd7af8bc498ff8d1fd41783aeab223feb795d074072aba048d7e38af045bb3fbfe478bb2cb0ac34f4c22e4dea4ac5f0d34a4c SHA512 91c3368626e731b5868fd1bb6d16bd049b2ed0d5cbf966647fa1069cf8c912d91f3d734f05353a0c16c8ff03790ca8e1e6515fff66e4a76d70ffdf2dbac6d8e3
+DIST libbpf-0.4.0.tar.gz 1015782 BLAKE2B f3bb1a5b1808d30612d9d3852400b71cb5d2ba4c31a177dd72b1f6060bc1d97f8d4ea7bb071a1ae2c5e94e3a4745593a0cc6b8ab6e56288e6cfb046d6de43717 SHA512 5d247f724f0dd3b2dadcc1ac10026ac57d3029b9dd7eb2831e282c58a4143042ef024170781139d89d85c4e9a3849b9ec0d3604a00bb3433be7622682b6dabc1
 EBUILD libbpf-0.0.6.ebuild 1000 BLAKE2B 160f3b9d575fd2553735b2f26ec0ab8b681a002964ae31eba4e9599f541c867f350d55fe4c6e1dfbe6077790bcf3fe9089166538b02973040b51c7bb37d7ce04 SHA512 95785c36fb8ad5130ba55c1c8b996d5e5c1bafd5eb80879494902f7f1fd3c3760c7604d51f36423e121898955b4879b88bb68bdaade76d0c90a2e0f51d27a269
 EBUILD libbpf-0.0.7.ebuild 1005 BLAKE2B b74c9b8a780943160237a87ae3833c996ec5a51685afa4c416ad5ba45f7a932785fd602b51758d2abb9df30e6d5e0b8b44f2ff44c647f473883e696c3eeaadef SHA512 6bf1a72e9bd4e531e35d8914ebac32ce6bac68462dfb5d181b51933108874c65ec50e1de8b31579b5db31d6eb3527159a087bfa730bb2c534dc8bbaed62b9daf
 EBUILD libbpf-0.0.8.ebuild 1005 BLAKE2B b74c9b8a780943160237a87ae3833c996ec5a51685afa4c416ad5ba45f7a932785fd602b51758d2abb9df30e6d5e0b8b44f2ff44c647f473883e696c3eeaadef SHA512 6bf1a72e9bd4e531e35d8914ebac32ce6bac68462dfb5d181b51933108874c65ec50e1de8b31579b5db31d6eb3527159a087bfa730bb2c534dc8bbaed62b9daf
@@ -18,6 +19,7 @@ EBUILD libbpf-0.0.9-r1.ebuild 1059 BLAKE2B 0605fbeaa1da1de10e51ee0bcaa0b355bcff8
 EBUILD libbpf-0.1.0-r1.ebuild 1157 BLAKE2B 876830f71d9f39683088881e1d3f37fe314a2b3057c3cfce1677a82e6f4bfddc2244499ed50c247c1e7221536242ccd06de1aa343406a47479c94935bf03a871 SHA512 bd206fb3c86cd3dca235afc909224219bad0bbcf636b6f690d90460443162710577ad4736ccca2e77376b1668271bdb12c7ad98d5e7e73fa30cae48caf79acdd
 EBUILD libbpf-0.1.1.ebuild 1157 BLAKE2B 876830f71d9f39683088881e1d3f37fe314a2b3057c3cfce1677a82e6f4bfddc2244499ed50c247c1e7221536242ccd06de1aa343406a47479c94935bf03a871 SHA512 bd206fb3c86cd3dca235afc909224219bad0bbcf636b6f690d90460443162710577ad4736ccca2e77376b1668271bdb12c7ad98d5e7e73fa30cae48caf79acdd
 EBUILD libbpf-0.2.ebuild 1157 BLAKE2B 876830f71d9f39683088881e1d3f37fe314a2b3057c3cfce1677a82e6f4bfddc2244499ed50c247c1e7221536242ccd06de1aa343406a47479c94935bf03a871 SHA512 bd206fb3c86cd3dca235afc909224219bad0bbcf636b6f690d90460443162710577ad4736ccca2e77376b1668271bdb12c7ad98d5e7e73fa30cae48caf79acdd
-EBUILD libbpf-0.3.ebuild 1235 BLAKE2B 8e2dc29916632b53101aa81a6981addb3f472809ef65b320d9551d4d4925b05de919b5d0587b59d7d45260ba6e5bfe536f8588443ca686c5e0fdd188a72afcf7 SHA512 1f80a3a91e36d1333b96d37c151065ea155e1647e9b40022f54f993ef800f813623cd642e91062df6e2aaa4075605240a1fdb8a2d38411f1c56537bd6eca499d
+EBUILD libbpf-0.3.ebuild 1241 BLAKE2B db815a22ebf51f56beeb8a3925f9a36cec7f0d412c110f4011e7efa40c7004ee49d4c80831628ca6db8cd97566ce16c0fa10cf20b2fde92e69aa5a769e0da85e SHA512 257b06cb0de2834d4cd09490607a2184416685ea5f4a4df57c5dc406af49cbf1d0841dff6d764aacf64e1c64c4069179ff4d6870a4145f6136086fe32c0975cc
+EBUILD libbpf-0.4.0.ebuild 1213 BLAKE2B d0911afd8e9f32e3511d8066a15fc7da4b3745038f9fe9cada2b974e2400503265e01161ff59247042fe98285b6cde48922f4cbce95dbddca44a4be985fdff49 SHA512 d81d45b3232cf398aab72ce1650797d9d08fa677bfef67a6de068a691d7298a0546a3c99a2ae605c8023974f05ca9bb70484dd70ad2dd26aa21c2de4bd712b10
 EBUILD libbpf-9999.ebuild 1185 BLAKE2B aa1fc95895f35b93f6786514095c05bdf49504aa13ebef41f2fdcd4c929826ccbb87ec2aaeff1ee0ca2c7022fa8c43bc50a396bddf7dd32e6b61275c4649a8e8 SHA512 ebbef537d0dbe3a66172bc10e6c9c7fea2c6b4e295feddbde3570b88a2e43af33258f747d6556f3f77a259a15711990bc2024900665e36f275556cf5712186d8
 MISC metadata.xml 305 BLAKE2B d5a605019f99aa1bb75e405bface00e9006038c60d280bdab31ac9a42e3bcf75e2884b3efc8be4e2a88f7e35769b610f0480ccfba291444e8d4ddaecf73a57f9 SHA512 38df62cf50255dcd59c3ab6961643379e549eb568f2c0d010cd8bf73a93fceb0dbdbb32af7b07f21475b4146f99e684aad6928963e56ea8d6777b8f63f8d8a41
diff --git a/dev-libs/libbpf/libbpf-0.3.ebuild b/dev-libs/libbpf/libbpf-0.3.ebuild
index f97946618eae..f80ac671a49d 100644
--- a/dev-libs/libbpf/libbpf-0.3.ebuild
+++ b/dev-libs/libbpf/libbpf-0.3.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} =~ [9]{4,} ]]; then
 	EGIT_REPO_URI="https://github.com/libbpf/libbpf.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 S="${WORKDIR}/${P}/src"
 
diff --git a/dev-libs/libbpf/libbpf-0.4.0.ebuild b/dev-libs/libbpf/libbpf-0.4.0.ebuild
new file mode 100644
index 000000000000..542fa1ac8cb0
--- /dev/null
+++ b/dev-libs/libbpf/libbpf-0.4.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+if [[ ${PV} =~ [9]{4,} ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/libbpf/libbpf.git"
+else
+	SRC_URI="https://github.com/libbpf/libbpf/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+S="${WORKDIR}/${P}/src"
+
+HOMEPAGE="https://github.com/libbpf/libbpf"
+DESCRIPTION="Stand-alone build of libbpf from the Linux kernel"
+
+LICENSE="GPL-2 LGPL-2.1 BSD-2"
+SLOT="0/${PV}"
+IUSE="+static-libs"
+
+COMMON_DEPEND="
+	virtual/libelf
+"
+DEPEND="
+	${COMMON_DEPEND}
+	sys-kernel/linux-headers
+"
+RDEPEND="
+	${COMMON_DEPEND}
+"
+
+PATCHES=(
+	"${FILESDIR}/libbpf-0.3.0-paths.patch"
+)
+
+src_compile() {
+	append-cflags -fPIC
+	emake \
+		BUILD_SHARED=y \
+		LIBSUBDIR="$(get_libdir)" \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		V=1
+}
+
+src_install() {
+	emake \
+		BUILD_SHARED=y \
+		LIBSUBDIR="$(get_libdir)" \
+		DESTDIR="${D}" \
+		install install_uapi_headers
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${PN}.pc
+
+	if ! use static-libs; then
+		find "${D}" -name '*.a' -delete || die
+	fi
+}
diff --git a/dev-libs/libbytesize/Manifest b/dev-libs/libbytesize/Manifest
index 6c30c37670f1..ae42bbd34170 100644
--- a/dev-libs/libbytesize/Manifest
+++ b/dev-libs/libbytesize/Manifest
@@ -4,5 +4,5 @@ DIST libbytesize-2.4.tar.gz 437416 BLAKE2B 4739b6ce5bf852112a5c662e3b5a29428df4a
 DIST libbytesize-2.5.tar.gz 439194 BLAKE2B 8d2cd82cea1e95f3368eed5855abfbc89b410fe1d627f7cbe69974f0d1fc89b600c93ad242816a37c3585b8318fcce77ef0fe6ab349d10f34a8be4c69303e343 SHA512 730d9c84bfc7199424fa34de5037dd9187d60c1f32d82cedc3e395167bf39a98a3b7f20b15f154206e797144c11de05ae0f606e0af6a2157ed946f138a346ad6
 EBUILD libbytesize-2.3.ebuild 1567 BLAKE2B 9bdfa60b750c93778a4938131ec3f499824e82599bd6692ccadaf948d64053fbf25f9fce39353220ff0d963f45fd07cb79d48d3ff0cde8a52f1bde2d899fd77d SHA512 0cf5dde0a0be0dff063e929795e1cb885fb3ee49ab8405e603f41a4eb385009b10de3f90b6813ca8d6fbc5ff3af007e43624754d42fbce00391100c0205cdfba
 EBUILD libbytesize-2.4.ebuild 1574 BLAKE2B 872b26fc774488590ad841581173fec27019013dd341507019e1845a75b6a2528486c43cdf59016e99e8f387bbd1c109998815bedd0aea0baddbb5a4e5db2c68 SHA512 ab4caf53e497f8bf2a4e72c989f854cff7714140dc4d2aecbd647edb04a4e1f2f2f3912f59aa562f9e6644bfc19b5b04025490c14485eec9af56890ca4dd451e
-EBUILD libbytesize-2.5.ebuild 1575 BLAKE2B 4e342814c628fa7d2e2723df4c46d351070be263f54a4378cb5d72d7fe7a0c2816e97f4793c15238c08e70d868a87c01baef36fa86c07939bb13a69c79e4126f SHA512 e03224b9278b08006ba37198674580da351d6ea3f4ce2fdbf3d299b9cfb5a19848255df6b2b8b3089af56296fe2bd08520e7563448bf4738742fad812563e0d8
+EBUILD libbytesize-2.5.ebuild 1575 BLAKE2B ac0a761addd9cedaf39a8500a64ad66480a2febafc6ddb6e5cba6654303031339559cf20e6e9823da2530d70724419d663d81f786920ae38a26cf0f1964b33c1 SHA512 b56aca7cf6910ab870dd46d5e528146f7abbbee710980484a2bfbc447b3366e010a673af529e8ddedeec5d54b3181e9b562f317b07bfd6933f4e01cf52a7d689
 MISC metadata.xml 425 BLAKE2B 445bf1e0d46e04c766c4c81c90f9acb8e8f3c1c3eeb567c3101400139a7b2ab830efcf737e30332af5dd0e50d46bdf9f583cccbfb2e50186cbb6d3f5a396f0df SHA512 24b8980240c3513229ea2e181c64b7f89597be9cd121459ad62bce935fd52a7bbc0ee4871e15899b69b477fdbaf0850d55821a6fbcf3afc30d0cb81a3eb83b65
diff --git a/dev-libs/libbytesize/libbytesize-2.5.ebuild b/dev-libs/libbytesize/libbytesize-2.5.ebuild
index 0ad7b008df90..a819367ec1e7 100644
--- a/dev-libs/libbytesize/libbytesize-2.5.ebuild
+++ b/dev-libs/libbytesize/libbytesize-2.5.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/storaged-project/libbytesize"
 SRC_URI="https://github.com/storaged-project/libbytesize/releases/download/${PV}/${P}.tar.gz"
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="doc python test tools"
 
 REQUIRED_USE="
diff --git a/dev-libs/libcbor/Manifest b/dev-libs/libcbor/Manifest
index efaffb0b81c8..eaf4d764bc4c 100644
--- a/dev-libs/libcbor/Manifest
+++ b/dev-libs/libcbor/Manifest
@@ -1,3 +1,3 @@
 DIST libcbor-0.8.0.tar.gz 267044 BLAKE2B e8548e7351984ebdcbeb5f13a7ca35412c3f3f05e2a44a5438d57b90bdcdc51f5265953163106f90ade911a96af665956ebeba7ed1c48cf207acf6d683af5606 SHA512 694d2d3a78d80072f96e0afb73590ca1f3572e41d2117330ef4313ed06271743b048d3ba3259c6ffe9a802d5e441379d0e54787d1d42fed08dc81ac4f06c6dbc
-EBUILD libcbor-0.8.0.ebuild 1411 BLAKE2B 63458110c30a0a74af224f5fbf0201bc5e3bb0f51477ffefdbd63185d6559dc0352ac62fd1e0c53146e758a21e3b2702bad36823281fb3bbd9a7416261ba52d6 SHA512 8b471c59566087bea2b4387462f5ba9eb4565f105430f445297359942b66f93d453461c59ba205ff828ba3334fd2b1f6d5ad36667fd8a7832e5f06efabb2a2c6
+EBUILD libcbor-0.8.0.ebuild 1412 BLAKE2B 37fa9e5d256c785c8d93ece1151a40c018fc23b9e5b542499a2608416adc4ff83e0f9dfa34b2d326a19028c5931afbe805e3b6d2b191bf365a293ff7cca0659e SHA512 f8e656cff6deed12c074f3d2de804ba5f0aa08b34a49a3e473e1ad0f58a99ed8a42b310919b3af83073f2adb2635aae1e8bea67c44b3986731d1be81e87ee1f4
 MISC metadata.xml 353 BLAKE2B ac88c66fa58046797dba48cfe47fc42a3aaf8d8a256fab563def54d126c7ad903bc2d47095ca7221b84f0fd59bcbb6677ffaef9062c9c662ef95b02bf3563b99 SHA512 56f76a4b80d8cf12f854022c2c7353119b11052bf6d454b5d2f6427a02ab64176d2d7ecfadecabafceac6b7aa5ec066145a62831d33f09a829b37cdb8bec64cf
diff --git a/dev-libs/libcbor/libcbor-0.8.0.ebuild b/dev-libs/libcbor/libcbor-0.8.0.ebuild
index 825d999239cf..b71a5d850fd2 100644
--- a/dev-libs/libcbor/libcbor-0.8.0.ebuild
+++ b/dev-libs/libcbor/libcbor-0.8.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 inherit python-any-r1 cmake-utils
 
 DESCRIPTION="CBOR protocol implementation for C and others"
diff --git a/dev-libs/libcgroup/Manifest b/dev-libs/libcgroup/Manifest
index 92c49e72059a..d172ea85b33e 100644
--- a/dev-libs/libcgroup/Manifest
+++ b/dev-libs/libcgroup/Manifest
@@ -10,6 +10,6 @@ AUX libcgroup-0.41-replace_DECLS.patch 5193 BLAKE2B d22bded7e356b31e9f1e8ceec50f
 AUX libcgroup-0.41-replace_INLCUDES.patch 3064 BLAKE2B 1947d306117beb62dba48d46b9e3caa7e2d5195c6d661b2d061c982220b7d3d92d42d4ef23172e34bf32be2e54b6c82c531aa839432e0489c2abe463b93e25f4 SHA512 17c8fa471347da4973969b954f966501d54889050766dfdd225235dd4539bb4249d57e719fa7a894aadc2e0f7296d233c89c44c96291a9266c958ca3a319541b
 AUX libcgroup-0.41-slibtool.patch 1953 BLAKE2B 7c98c05ffe6e728dedce6b321a352eeb68af02876e91d197bbd235c4c6a16647465036766eb3622da1f4d17d360d5a85bc65e6e11ed9328b87b9aa7f5d732429 SHA512 bb42f491dfa75a29610ef968e23bd234c46e685c55e216e6bea9cb6a841aa9150ffd0476bbd72edca9bde35dc65005f80e0df07f618d2089d80205e89db82515
 DIST libcgroup-0.41.tar.bz2 500120 BLAKE2B 3410b430aa58613b5b9abedba05bef99b1b8a1fd619d55fb446ab951e052a336efc918879217055bceee886a03d97c3ff46028a87e8231212653a886cfb80521 SHA512 1aedb02cd2ce3bc2e2a328a247a92976ad0978ca4d3aee4eb671fbcc6bb270348efc78dcf84f27fc500f8bfb9bb57c7d6e4d429ef2bc69e4e5118b7cd895a6bd
-EBUILD libcgroup-0.41-r5.ebuild 2425 BLAKE2B 4a45335e480bc6695cfcb2c497680c7e4c31784a2c2051e118faa0b1cce8af3ed078586398f7101f8321215460004750c6d0f17fa981d93422fd16ff5306231e SHA512 066c55cabd482d08fefa87a6e6a7a3c25e7b9b78c930ea28269eeb3043c9a5d194e660cf7a9a582ae4791ddf49d27811d138be6336ed7f344e2b522104f0ec2c
+EBUILD libcgroup-0.41-r5.ebuild 2432 BLAKE2B 4659b71aceb83895d66a82bc901b0b0a70e8ee0f906e834d27335bc9b851076866f87d0e294f4afba0dddc413955056b611b56453daeaa4f109ac4ad259e39e7 SHA512 188ba347c697312ce616f21104a90e05a1cfa355427126dfd7c60cce601deae037676f01b46f82328d29c786bbf54d0115e63a40ece3f7a68de1cdd61dee2358
 EBUILD libcgroup-0.41-r6.ebuild 2696 BLAKE2B 855387942bb5276b78b2adb2e50e0b80d6977d0aaad352c2dee3358bf40b32bd645d8c11148881fea25f263ebaeb9866a245d57bf508b7e2b5819263fde0c6e1 SHA512 1217cc658642ef0dfe0d43ec33e8f14e45c47fd6f28181ad4eb36c23422a3c2c59ac077108f7d397ba3716c0f4a4a9f790e3af8febf33597030cbf3d66a2c600
 MISC metadata.xml 700 BLAKE2B 4638c1287da7cb72c04f77ab1f8c9a46888f0c45194a1221fcc03e2f0ea0b148e7edd4608d2bf61a527dcd8f1701f91a123ecde3118b5f93bad67e56afd6e714 SHA512 faddc728ee6971cbf5e52bc89999f3bec9d312fe04d2c876a2ee69e6533ca1ba85350d0b504bff0c7da668b58a3531606fb3d67cb4f6925c08f65df2190ec0c1
diff --git a/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild b/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild
index a09bfb32a489..a3ee8b14b979 100644
--- a/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild
+++ b/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools flag-o-matic linux-info ltprune pam
+inherit autotools flag-o-matic linux-info pam
 
 DESCRIPTION="Tools and libraries to configure and manage kernel control groups"
 HOMEPAGE="http://libcg.sourceforge.net/"
@@ -85,7 +85,7 @@ src_test() {
 
 src_install() {
 	default
-	prune_libtool_files --all
+	find "${ED}" -name '*.la' -delete || die
 
 	insinto /etc/cgroup
 	doins samples/*.conf
diff --git a/dev-libs/libcroco/Manifest b/dev-libs/libcroco/Manifest
index f8f287688bcb..91a00e5ae29f 100644
--- a/dev-libs/libcroco/Manifest
+++ b/dev-libs/libcroco/Manifest
@@ -1,3 +1,4 @@
+AUX libcroco-0.6.13-CVE-2020-12825.patch 7600 BLAKE2B 2303fb7044f7458e5861b0d054bb6c6137265dfa080d6e93b0c10f8fbf0c02104a6f14248ef5a95e1967fa7c55aecfc31f8d15cfb24d792d530f10e9c375a3d3 SHA512 f1704914cf6bad4b530e239998d7c2be7d5bc8b2e071526c04b5797a52513cb50289ca575639872217a64dbe6adbc7e0a352e9427a4df5cc98f36f13baf88a33
 DIST libcroco-0.6.13.tar.xz 487840 BLAKE2B 511212f1849343d55104cc6d17662cacd524bae098bab12d6db58df41710c8dca2c5beb7a37e42feac6d856934a07feb3d11c55dc74ba055e21066f2bdefb260 SHA512 038a3ac9d160a8cf86a8a88c34367e154ef26ede289c93349332b7bc449a5199b51ea3611cebf3a2416ae23b9e45ecf8f9c6b24ea6d16a5519b796d3c7e272d4
-EBUILD libcroco-0.6.13.ebuild 1305 BLAKE2B 82078462794835865bc3e92633e2efea2e8abcb45837d968a7a4cfa984d7c3dc9f37a7784481f5227879058cd969413ae6e166f70c1b0b45e4ebbf30b7cedfe6 SHA512 c2cab85a8228b0afef2c7cab7c6c012200eef3c80658db477a60f74d6e5ade364e2c85645215507536489c5c7aad115a7709b0bc06e2965f9b12047e2ac05352
+EBUILD libcroco-0.6.13-r1.ebuild 1366 BLAKE2B 06f0c1795c8b74e897fffa70d26b4d3a81ca86eeb99a47b0d3ad3eae864e664d88297f875b7e83f53b9d1ff4b16c9daf7b95d1e90add9a91e4a79d9951d5d3a9 SHA512 99a7c151b42a330b22051743c5c051f6951eee15319d4a526a2b1c29eb27f6ffc558e8bc13c50cbbee86286536c681c7c5aa3bd356d75e919e6ab197283b5f5e
 MISC metadata.xml 677 BLAKE2B 075dc643dd13fa706bb3240a389f715e760c6d06c851c5074d6c58843668bbcbda2167fff34f720e57d48f01aaacf61dc2a5a98c11a5240550b7e2500bfef6a2 SHA512 57849cfa0cf0e61f52db3e7a357957d3eb0ea3e93381475ad1821a5e0d63c7971f31b4f52a9a851d303bac59a83edbb5fbdc76d54ccfdd6332ca5c93a43a0b14
diff --git a/dev-libs/libcroco/files/libcroco-0.6.13-CVE-2020-12825.patch b/dev-libs/libcroco/files/libcroco-0.6.13-CVE-2020-12825.patch
new file mode 100644
index 000000000000..26fc677eb160
--- /dev/null
+++ b/dev-libs/libcroco/files/libcroco-0.6.13-CVE-2020-12825.patch
@@ -0,0 +1,187 @@
+From 44cbd1e718d6a08e59b9300280c340218a84e089 Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro <mcatanzaro@gnome.org>
+Date: Wed, 12 Aug 2020 13:54:15 -0500
+Subject: [PATCH] libcroco: Limit recursion in block and any productions
+ (CVE-2020-12825)
+
+If we don't have any limits, we can recurse forever and overflow the
+stack.
+
+This is per https://gitlab.gnome.org/Archive/libcroco/-/issues/8
+
+https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1404
+---
+ src/cr-parser.c | 44 ++++++++++++++++++++++++++--------------
+ 1 file changed, 29 insertions(+), 15 deletions(-)
+
+diff --git a/src/cr-parser.c b/src/cr-parser.c
+index 07f4ed9e8b..8304b75614 100644
+--- a/src/cr-parser.c
++++ b/src/cr-parser.c
+@@ -136,6 +136,8 @@ struct _CRParserPriv {
+ 
+ #define CHARS_TAB_SIZE 12
+ 
++#define RECURSIVE_CALLERS_LIMIT 100
++
+ /**
+  * IS_NUM:
+  *@a_char: the char to test.
+@@ -343,9 +345,11 @@ static enum CRStatus cr_parser_parse_selector_core (CRParser * a_this);
+ 
+ static enum CRStatus cr_parser_parse_declaration_core (CRParser * a_this);
+ 
+-static enum CRStatus cr_parser_parse_any_core (CRParser * a_this);
++static enum CRStatus cr_parser_parse_any_core (CRParser * a_this,
++                                               guint      n_calls);
+ 
+-static enum CRStatus cr_parser_parse_block_core (CRParser * a_this);
++static enum CRStatus cr_parser_parse_block_core (CRParser * a_this,
++                                                 guint      n_calls);
+ 
+ static enum CRStatus cr_parser_parse_value_core (CRParser * a_this);
+ 
+@@ -783,7 +787,7 @@ cr_parser_parse_atrule_core (CRParser * a_this)
+         cr_parser_try_to_skip_spaces_and_comments (a_this);
+ 
+         do {
+-                status = cr_parser_parse_any_core (a_this);
++                status = cr_parser_parse_any_core (a_this, 0);
+         } while (status == CR_OK);
+ 
+         status = cr_tknzr_get_next_token (PRIVATE (a_this)->tknzr,
+@@ -794,7 +798,7 @@ cr_parser_parse_atrule_core (CRParser * a_this)
+                 cr_tknzr_unget_token (PRIVATE (a_this)->tknzr, 
+                                       token);
+                 token = NULL;
+-                status = cr_parser_parse_block_core (a_this);
++                status = cr_parser_parse_block_core (a_this, 0);
+                 CHECK_PARSING_STATUS (status,
+                                       FALSE);
+                 goto done;
+@@ -929,11 +933,11 @@ cr_parser_parse_selector_core (CRParser * a_this)
+ 
+         RECORD_INITIAL_POS (a_this, &init_pos);
+ 
+-        status = cr_parser_parse_any_core (a_this);
++        status = cr_parser_parse_any_core (a_this, 0);
+         CHECK_PARSING_STATUS (status, FALSE);
+ 
+         do {
+-                status = cr_parser_parse_any_core (a_this);
++                status = cr_parser_parse_any_core (a_this, 0);
+ 
+         } while (status == CR_OK);
+ 
+@@ -955,10 +959,12 @@ cr_parser_parse_selector_core (CRParser * a_this)
+  *in chapter 4.1 of the css2 spec.
+  *block ::= '{' S* [ any | block | ATKEYWORD S* | ';' ]* '}' S*;
+  *@param a_this the current instance of #CRParser.
++ *@param n_calls used to limit recursion depth
+  *FIXME: code this function.
+  */
+ static enum CRStatus
+-cr_parser_parse_block_core (CRParser * a_this)
++cr_parser_parse_block_core (CRParser * a_this,
++                            guint      n_calls)
+ {
+         CRToken *token = NULL;
+         CRInputPos init_pos;
+@@ -966,6 +972,9 @@ cr_parser_parse_block_core (CRParser * a_this)
+ 
+         g_return_val_if_fail (a_this && PRIVATE (a_this), CR_BAD_PARAM_ERROR);
+ 
++        if (n_calls > RECURSIVE_CALLERS_LIMIT)
++                return CR_ERROR;
++
+         RECORD_INITIAL_POS (a_this, &init_pos);
+ 
+         status = cr_tknzr_get_next_token (PRIVATE (a_this)->tknzr, &token);
+@@ -995,13 +1004,13 @@ cr_parser_parse_block_core (CRParser * a_this)
+         } else if (token->type == CBO_TK) {
+                 cr_tknzr_unget_token (PRIVATE (a_this)->tknzr, token);
+                 token = NULL;
+-                status = cr_parser_parse_block_core (a_this);
++                status = cr_parser_parse_block_core (a_this, n_calls + 1);
+                 CHECK_PARSING_STATUS (status, FALSE);
+                 goto parse_block_content;
+         } else {
+                 cr_tknzr_unget_token (PRIVATE (a_this)->tknzr, token);
+                 token = NULL;
+-                status = cr_parser_parse_any_core (a_this);
++                status = cr_parser_parse_any_core (a_this, n_calls + 1);
+                 CHECK_PARSING_STATUS (status, FALSE);
+                 goto parse_block_content;
+         }
+@@ -1108,7 +1117,7 @@ cr_parser_parse_value_core (CRParser * a_this)
+                 status = cr_tknzr_unget_token (PRIVATE (a_this)->tknzr,
+                                                token);
+                 token = NULL;
+-                status = cr_parser_parse_block_core (a_this);
++                status = cr_parser_parse_block_core (a_this, 0);
+                 CHECK_PARSING_STATUS (status, FALSE);
+                 ref++;
+                 goto continue_parsing;
+@@ -1122,7 +1131,7 @@ cr_parser_parse_value_core (CRParser * a_this)
+                 status = cr_tknzr_unget_token (PRIVATE (a_this)->tknzr,
+                                                token);
+                 token = NULL;
+-                status = cr_parser_parse_any_core (a_this);
++                status = cr_parser_parse_any_core (a_this, 0);
+                 if (status == CR_OK) {
+                         ref++;
+                         goto continue_parsing;
+@@ -1161,10 +1170,12 @@ cr_parser_parse_value_core (CRParser * a_this)
+  *        | FUNCTION | DASHMATCH | '(' any* ')' | '[' any* ']' ] S*;
+  *
+  *@param a_this the current instance of #CRParser.
++ *@param n_calls used to limit recursion depth
+  *@return CR_OK upon successfull completion, an error code otherwise.
+  */
+ static enum CRStatus
+-cr_parser_parse_any_core (CRParser * a_this)
++cr_parser_parse_any_core (CRParser * a_this,
++                          guint      n_calls)
+ {
+         CRToken *token1 = NULL,
+                 *token2 = NULL;
+@@ -1173,6 +1184,9 @@ cr_parser_parse_any_core (CRParser * a_this)
+ 
+         g_return_val_if_fail (a_this, CR_BAD_PARAM_ERROR);
+ 
++        if (n_calls > RECURSIVE_CALLERS_LIMIT)
++                return CR_ERROR;
++
+         RECORD_INITIAL_POS (a_this, &init_pos);
+ 
+         status = cr_tknzr_get_next_token (PRIVATE (a_this)->tknzr, &token1);
+@@ -1211,7 +1225,7 @@ cr_parser_parse_any_core (CRParser * a_this)
+                  *We consider parameter as being an "any*" production.
+                  */
+                 do {
+-                        status = cr_parser_parse_any_core (a_this);
++                        status = cr_parser_parse_any_core (a_this, n_calls + 1);
+                 } while (status == CR_OK);
+ 
+                 ENSURE_PARSING_COND (status == CR_PARSING_ERROR);
+@@ -1236,7 +1250,7 @@ cr_parser_parse_any_core (CRParser * a_this)
+                 }
+ 
+                 do {
+-                        status = cr_parser_parse_any_core (a_this);
++                        status = cr_parser_parse_any_core (a_this, n_calls + 1);
+                 } while (status == CR_OK);
+ 
+                 ENSURE_PARSING_COND (status == CR_PARSING_ERROR);
+@@ -1264,7 +1278,7 @@ cr_parser_parse_any_core (CRParser * a_this)
+                 }
+ 
+                 do {
+-                        status = cr_parser_parse_any_core (a_this);
++                        status = cr_parser_parse_any_core (a_this, n_calls + 1);
+                 } while (status == CR_OK);
+ 
+                 ENSURE_PARSING_COND (status == CR_PARSING_ERROR);
+-- 
+GitLab
+
diff --git a/dev-libs/libcroco/libcroco-0.6.13.ebuild b/dev-libs/libcroco/libcroco-0.6.13-r1.ebuild
index 4b2cca0bd0cb..6dc6bb37f910 100644
--- a/dev-libs/libcroco/libcroco-0.6.13.ebuild
+++ b/dev-libs/libcroco/libcroco-0.6.13-r1.ebuild
@@ -24,6 +24,8 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=( "${FILESDIR}"/${PN}-0.6.13-CVE-2020-12825.patch )
+
 src_prepare() {
 	if ! use test; then
 		# don't waste time building tests
diff --git a/dev-libs/libdazzle/Manifest b/dev-libs/libdazzle/Manifest
index dcdb672a3f50..1ade25670d55 100644
--- a/dev-libs/libdazzle/Manifest
+++ b/dev-libs/libdazzle/Manifest
@@ -1,5 +1,3 @@
-DIST libdazzle-3.38.0.tar.xz 447304 BLAKE2B 77add33e1947dc33a086501928377cc9547563a9a8095f38283a5bc4b1916bafe1ac3073abe4111ba4907857de0726d2325458663acda4df122e6237f703281f SHA512 76dee75fab5a508c274f45cf5f51bac4edc80786942ccc64e49ffe1721607d88f9067b0a7751f44a48bfe38ee87b6986d449e8c5e6b704c6ec32de84d21f7e69
 DIST libdazzle-3.40.0.tar.xz 447648 BLAKE2B fb7916fd7812c03ec63bc804974574bbf6d029596e8364f5f13cde22be330a9356ee250c0d5bfc8742545d410c94b1ad7a1fa0bd5e2f473f67d6c45fe55e8e93 SHA512 23bf0a176fb847ee46a22a96594e9ed60921f104875fd102375445f364b552167778a56dd4929a18b2a7bee1144fd5e07d5cadac3355ac4877cd56838cb5deb2
-EBUILD libdazzle-3.38.0.ebuild 1695 BLAKE2B 2121aa223e97a6f2e33eee10520a1a2b6a902518e60f705ff2e75327cc54c23b7370a71863b42ec62762886769c956883b07b39628fec5d4f862184baaad83d8 SHA512 224adf1c785192b0c26a8f2918179c2f31a42e5c86a853fa67c430188ed831ac15599d1a23450cce4a6202b9a9eb4a9c562f0c2c615c5cc6f91ecc0b6b0dd10e
-EBUILD libdazzle-3.40.0.ebuild 1697 BLAKE2B a6aa766482370f52f70c77e452dba044ef2b58f1920ba8767b52c95911ae06d02e644402a83df073072a8db7948ea6dc31d08fc78e159c9b3b0d84af8311a6f5 SHA512 790ee187857161fa3336d5e0aa226b04f69c2ce79040785fb2306fc982a4ae0e055eebcb305b9c9a6a0d8697418de07d0c80eb453a035446cf87612b721973df
+EBUILD libdazzle-3.40.0.ebuild 1695 BLAKE2B 2121aa223e97a6f2e33eee10520a1a2b6a902518e60f705ff2e75327cc54c23b7370a71863b42ec62762886769c956883b07b39628fec5d4f862184baaad83d8 SHA512 224adf1c785192b0c26a8f2918179c2f31a42e5c86a853fa67c430188ed831ac15599d1a23450cce4a6202b9a9eb4a9c562f0c2c615c5cc6f91ecc0b6b0dd10e
 MISC metadata.xml 561 BLAKE2B b496a84878e088cf09b2a5a071d3617b0d934fd92ab916c32a18dbad6015168431c30ba50125ccf21a5fea813fbc951b233c5353d30274525d5defc4d401583e SHA512 8ab426f8a2683c2bfc4a42d4d32893f5913fa1f5b2551b5be496594995916f9e17d285f2537d890fdd25be172c833b038a1942130e3fc546285c3f56a7a93652
diff --git a/dev-libs/libdazzle/libdazzle-3.38.0.ebuild b/dev-libs/libdazzle/libdazzle-3.38.0.ebuild
deleted file mode 100644
index 9995d728a144..000000000000
--- a/dev-libs/libdazzle/libdazzle-3.38.0.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 gnome.org meson xdg vala virtualx
-
-DESCRIPTION="Experimental new features for GTK+ and GLib"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/libdazzle"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
-
-IUSE="gtk-doc +introspection test +vala"
-REQUIRED_USE="vala? ( introspection )"
-RESTRICT="!test? ( test )"
-
-# We keep newer glib/gtk+ deps to avoid GtkEventControllerMotion backports gettings used
-RDEPEND="
-	>=dev-libs/glib-2.56.0:2
-	>=x11-libs/gtk+-3.24.0:3[introspection?]
-	introspection? ( dev-libs/gobject-introspection:= )
-"
-DEPEND="${RDEPEND}"
-# libxml2 required for glib-compile-resources; glib-utils for glib-mkenums
-BDEPEND="
-	>=dev-util/meson-0.49.0
-	vala? ( $(vala_depend) )
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc )
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Denable_tracing=false # extra trace debugging that would make things slower
-		-Denable_profiling=false # -pg passing
-		# On linux it'll always use a vdso based implementation that is even faster
-		# than rdtscp insn, thus never build with rdtscp until we don't support non-linux
-		# as the rdtscp using function will never get called anyways.
-		-Denable_rdtscp=false
-		-Denable_tools=true # /usr/bin/dazzle-list-counters
-		$(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
-}
-
-src_test() {
-	virtx meson_src_test
-}
diff --git a/dev-libs/libdazzle/libdazzle-3.40.0.ebuild b/dev-libs/libdazzle/libdazzle-3.40.0.ebuild
index 870ecac11850..9995d728a144 100644
--- a/dev-libs/libdazzle/libdazzle-3.40.0.ebuild
+++ b/dev-libs/libdazzle/libdazzle-3.40.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libdazzle"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 
 IUSE="gtk-doc +introspection test +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/dev-libs/libdbusmenu/Manifest b/dev-libs/libdbusmenu/Manifest
index e05cc98a291d..c32c3cb2e2fd 100644
--- a/dev-libs/libdbusmenu/Manifest
+++ b/dev-libs/libdbusmenu/Manifest
@@ -1,5 +1,5 @@
 AUX libdbusmenu-16.04.0-configure-fix.patch 1268 BLAKE2B 9b7c045b46b9b8ad6af069d4d95c0e867e4cdd7c5edba1412483a7b11424d24d757bd04c7f64fdd0ae36107befe26b54e589d658739438f331bf82277a79e391 SHA512 e872017556eb7e6b23a9c80e478b9e25be604bd2500be94879bad6634150265bb7b2979fc3cbe05a06dc9f3ca115ab57457853b37c6db622b5ec4bb23abff2bd
 AUX libdbusmenu-16.04.0-werror.patch 1131 BLAKE2B 0f08e797095a8f9358abe1784b64f8f4126f6ba6c271991a4cf95781485e6ddda30cc98db8c50c7f3cae61f398cec6d236fbccc7063073f041337832fa132536 SHA512 ba1144695110cd8ecf89deaea28e0aacc40b00a500a1dc86c28e67754599117e0a2217c4d6066c1061fa009af82e463dd303ba78c479053857ef6e793959068e
 DIST libdbusmenu-16.04.0.tar.gz 760376 BLAKE2B 6996ce09bc2b81a8f415a46490ecb3189a064a64f1716919bb1495dccefa220ab058af06f4b3391c954ec76ec38e62db9c092b620cb69cacffb064e590ec1297 SHA512 ee9654ac4ed94bdebc94a6db83b126784273a417a645b2881b2ba676a5f67d7fc95dd2bb37bfb0890aa47299ed73cb21ed7de8b75f3fed6b69bfd39065062241
-EBUILD libdbusmenu-16.04.0-r1.ebuild 3874 BLAKE2B 2ed71743f7f42342fd33e6da8a2eff206338f8289ecd2af5163893d15e3627ded3a21b5a7f7e126fc74573fb1ac647ec74542129816186a0b38cc4ea05033cb5 SHA512 5f614313b6b666e0d8dd86988094b6e872c5da0b5fac8c7c01d34bc10bd266bd0b65e3f12b0ff1d98a6a66632671b3912a3ec29822edcaf3ab872daf0c10f4bf
+EBUILD libdbusmenu-16.04.0-r1.ebuild 3881 BLAKE2B a98ac44ba760b367bfb0473ece2d77419d6ba659700e412a8b6a6d335e7cb9d3e680a496621c2ac2ff0df2cb4d90345484a17b3f81feba56a549db6e3a1cc9a3 SHA512 23ff195bf5c1eb0e37f7dc7de5adf6e242b287c843d192544fca5234978c093bfea4a5159dd0dfe1db34d9c0aa91f86375e18baea1b9254a2d1678c677dd4e39
 MISC metadata.xml 361 BLAKE2B 93f09713c694acddbfa9011a7a8c688341336d641ac74e49e914e2e099865fa6f7755a645dcee37014f5251b1577b980cb2b62e06d17f3d74ef5f0c02b0e769c SHA512 65033c817aacc6bf81e47970baca8feb6dacfcc74ed788806f65dc49e48178419b300edac867688f1be36d2ffc9291366274832912fa61cee48c328ca8f55efd
diff --git a/dev-libs/libdbusmenu/libdbusmenu-16.04.0-r1.ebuild b/dev-libs/libdbusmenu/libdbusmenu-16.04.0-r1.ebuild
index d12a12d270fb..a179f387ee24 100644
--- a/dev-libs/libdbusmenu/libdbusmenu-16.04.0-r1.ebuild
+++ b/dev-libs/libdbusmenu/libdbusmenu-16.04.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://launchpad.net/${PN/lib}/${PV%.*}/${PV}/+download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1 LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="debug gtk gtk3 +introspection test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/liberasurecode/Manifest b/dev-libs/liberasurecode/Manifest
index 66411133a866..4708c810a379 100644
--- a/dev-libs/liberasurecode/Manifest
+++ b/dev-libs/liberasurecode/Manifest
@@ -1,3 +1,3 @@
 DIST liberasurecode-1.6.2.tar.gz 210331 BLAKE2B 174141a26872ce1cb57feaeed071f8b0740810a73ec4683e2661f908fc0d58264a01ed87e7a71185f0607cbd23ebfe0141154e082dd96478712f776b764a2631 SHA512 027def96275eac67b32b2e3e7144f3042acbcafe5b27b353eb5944e73b55d34931a11324018f131b2acb381007cc79e31a5afd7390fdc517ed30ee592d6f90d5
-EBUILD liberasurecode-1.6.2.ebuild 737 BLAKE2B 496ca1515929b34cb646bc66d2bb196ac4ee15cc53ee8e3b2627d40278dcab5f6855a546c8b210451a4f7718cf3515b4a7bee1abcee0fcbd1ae5758753c2dac2 SHA512 db637560fc7bbdd1ba5cd83ca36966f2bc5ea699212315b68b4618d0de2b2eb94365e6a7787a3caa024d4955bbbc170b3801cbb1051cf5360fef7e3be5cffeb4
+EBUILD liberasurecode-1.6.2.ebuild 750 BLAKE2B 5476ae8a65c790ad7e8d28e93562a4e83f10dc88f91543feb51637a01ce3cf147269e186899cf635f6abe5341d1c3d35ff4ac415969bbf385492466a444a2049 SHA512 6dadffea7261dc6989a7270feebba05ec18e4265bcbb881adca3446b15747e0c686c875904ae6d3dede9642844789317311a9745c4da91a82c599db93425f779
 MISC metadata.xml 464 BLAKE2B ca354debebf2db1768ff8cd28d88b0edeb6a57d47fad34837d04e6ad21f59e37204c85b63df08dbee14d3eae342db561a785bf00ecb2d908fc5c0112a72baa6d SHA512 1b94d0071d7670f163e28193c066b6a9f39a086051aba5e6291c0f31d56465e6cbf48798adf6fc90e08fd56121063d909bcd4aeec58547539ec72dde4210b197
diff --git a/dev-libs/liberasurecode/liberasurecode-1.6.2.ebuild b/dev-libs/liberasurecode/liberasurecode-1.6.2.ebuild
index b79569ec340a..2adc93339bba 100644
--- a/dev-libs/liberasurecode/liberasurecode-1.6.2.ebuild
+++ b/dev-libs/liberasurecode/liberasurecode-1.6.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools ltprune
+inherit autotools
 
 DESCRIPTION="Erasure Code API library written in C with pluggable Erasure Code backends."
 HOMEPAGE="https://bitbucket.org/tsg-/liberasurecode/overview"
@@ -31,5 +31,5 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest
index 7fbe534952a4..98576d9d3a13 100644
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@@ -1,6 +1,4 @@
-DIST libevdev-1.10.0.tar.xz 445792 BLAKE2B b7638ae85cac8b8d29c3255da1de50a06db9eb97d752b383852c85c32f8f93f31135e9d28acd474695d36d87eba04d455abd99badf6e492c2561893c47f796d2 SHA512 94ab4ee7e0854c41a491d8e4713baa95ae66dd337b41823011c0913aa1c72e8bbf8b808d5936c2ef456af794b6d3a5cd7cd0515fbd1d06dd1b7ba19275bd928f
 DIST libevdev-1.11.0.tar.xz 445316 BLAKE2B f3c1aa688d83f4a27abec23f18817bbdb7a5911cc30fab694271f620c23273cf20109598edb0049239e78a173baa20471ad1f25266eff34a50ed8898d7b86080 SHA512 b3c6b4a1532c5142f3684b920dcdd497a5368aec516e8c389e2c8f9d1eaba16c907b2a7f2c82a3c3ff89bb4d0ae5503c736098c095f9f1bc98f0668e99bf639d
-EBUILD libevdev-1.10.0.ebuild 1253 BLAKE2B b3b3d4a9035d033fe36cbb51f3c72e2bd4ab4edba00833001220d8fdcebdda4bfb3c8793dead132e89987025371cc8a04f3d04c135423cb804a0a6df880e9c09 SHA512 9c8cc9469ae58eb1d1439ca3954b9b8259d43d49f797ddcc6c92bb158089218da669bcc5372273b30401cae07db0c79b94be765885a9be42bef0227b538e7ba1
-EBUILD libevdev-1.11.0.ebuild 1253 BLAKE2B b3b3d4a9035d033fe36cbb51f3c72e2bd4ab4edba00833001220d8fdcebdda4bfb3c8793dead132e89987025371cc8a04f3d04c135423cb804a0a6df880e9c09 SHA512 9c8cc9469ae58eb1d1439ca3954b9b8259d43d49f797ddcc6c92bb158089218da669bcc5372273b30401cae07db0c79b94be765885a9be42bef0227b538e7ba1
+EBUILD libevdev-1.11.0.ebuild 1252 BLAKE2B f1735dba4f6b8aa680ac2d1ea4bf35907d01ef2dc5563d53767cdc3126662f60f0cf18dfe2d932c496ee5cc57f2f35214bbe4bb078ff77148ffc0058adb14432 SHA512 8b6aa3c85043c77eb83acc08da7a0ba59183931a8cb5e8a31fb7119a59ca8535625198f05dd3b3efd0ece998e657f620281a7ab7a98b74720dd2ef3addf9b5a2
 EBUILD libevdev-9999.ebuild 1260 BLAKE2B f06f9461a4381547ce56b71d46ea692c867307fb33277c60b61a6297746ccf78187bb78ffba6c7992b587386ce1cae9957d090c7df00964b1408a03a4babf38b SHA512 154a3ef875538cd961b97e2f5dbb29085b5cdc6204d7fcd65ddaefe7ad1464398040fa87c4fa5c33a825054f13e81d9953193b534b114311c5b73be622bbc2a8
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/libevdev/libevdev-1.10.0.ebuild b/dev-libs/libevdev/libevdev-1.10.0.ebuild
deleted file mode 100644
index 0330325b6d33..000000000000
--- a/dev-libs/libevdev/libevdev-1.10.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit meson multilib-minimal python-any-r1
-
-DESCRIPTION="Handler library for evdev events"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/libevdev/ https://gitlab.freedesktop.org/libevdev/libevdev"
-
-if [[ ${PV} == 9999* ]] ; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/libevdev/libevdev.git"
-	inherit git-r3
-else
-	SRC_URI="https://www.freedesktop.org/software/libevdev/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc test"
-
-DEPEND="test? ( dev-libs/check[${MULTILIB_USEDEP}] )"
-BDEPEND="
-	${PYTHON_DEPS}
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig
-"
-RESTRICT="!test? ( test )"
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_feature doc documentation)
-		$(meson_feature test tests)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson test -v -C "${BUILD_DIR}" -t 100 || die "tests failed"
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_install_all() {
-	if use doc; then
-		local HTML_DOCS=( doc/html/. )
-		einstalldocs
-	fi
-}
diff --git a/dev-libs/libevdev/libevdev-1.11.0.ebuild b/dev-libs/libevdev/libevdev-1.11.0.ebuild
index 0330325b6d33..bdb10dff9669 100644
--- a/dev-libs/libevdev/libevdev-1.11.0.ebuild
+++ b/dev-libs/libevdev/libevdev-1.11.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 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/libgamin/Manifest b/dev-libs/libgamin/Manifest
index 6b243184596d..6b26bec3d752 100644
--- a/dev-libs/libgamin/Manifest
+++ b/dev-libs/libgamin/Manifest
@@ -8,5 +8,5 @@ DIST gamin-0.1.10.tar.bz2 452194 BLAKE2B 75537862c2b90734b616630b80103499f549fba
 DIST gamin-0.1.9-freebsd.patch.bz2 4635 BLAKE2B ea27afc7b978e15e9e957cbc1129b5bc8f0dfea7571e7bbfda981bc319929f8702d6a823bababb97af2b1da95c8403e9189c5ecaf599275e063f71d370526b89 SHA512 a9d9a8e4d85b289df6f87bf2b966ff262281db0d7e6094deb4f2c179f12c6cc3e387c1e1c28306a9fb54f2eb2837f9bdd3a34b2bb68db8abfdbecc7492e9730b
 DIST libgamin-0.1.10-opensolaris.patch.bz2 16955 BLAKE2B a7c8466fbe9f6613108a6a1b450c47c69018f9f252c17647b07591cf9fba2ba3a08cc344ca54f4647a9c809cecaa18b42bf9f2eff9e253749518b68565024b48 SHA512 fd1cfc5a6b5ba429622f8d426cfba0e3c1c05c3677fb58c53af39b4030ae56f3f71caf63eb5ecb16169c2f7e8c79a32d7d440857c2c7fd3a259cf8312a9b2004
 DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320
-EBUILD libgamin-0.1.10-r6.ebuild 2954 BLAKE2B 289bfa423844c31180af02d1228fce432d5d5b87f1535c879aa2e819b71250a1868ed8221b2679cc1e8d8534c17df48d0f8327c0bbc5e78f06763c3a9d6dd351 SHA512 0771077bb6b0364c6c9c09e28c066c10c118b04ab4dbebd160452faa65e46b49a5efe0a88a9ccdb290e689588e2afcc298ad31aa01a5f170882846c11b648d4a
+EBUILD libgamin-0.1.10-r6.ebuild 2961 BLAKE2B 9ed05b546592db1e1bc05c4085a0d0ac2bfd5fd592ec0f5654261274c4733f5febbe032472fc086224100f259ffd9ba0dc6a2f5f524717a96aeafbb9e35b1da2 SHA512 011b3aaac7e72db57b186e37ffd505c697e96ee0befc46ba75929920e2b145006a34895b2be42591fd85b962639adf9848722f9eb12a9e173ef6e2878f7a05d2
 MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/dev-libs/libgamin/libgamin-0.1.10-r6.ebuild b/dev-libs/libgamin/libgamin-0.1.10-r6.ebuild
index c19392a7f869..786de79b0ac7 100644
--- a/dev-libs/libgamin/libgamin-0.1.10-r6.ebuild
+++ b/dev-libs/libgamin/libgamin-0.1.10-r6.ebuild
@@ -6,7 +6,7 @@ EAPI="6"
 GNOME_ORG_MODULE="gamin"
 GNOME_TARBALL_SUFFIX="bz2"
 
-inherit autotools epatch ltprune gnome.org multilib-minimal
+inherit autotools epatch gnome.org multilib-minimal
 
 DESCRIPTION="Library providing the FAM File Alteration Monitor API"
 HOMEPAGE="https://www.gnome.org/~veillard/gamin/"
@@ -93,5 +93,5 @@ multilib_src_install_all() {
 	HTML_DOCS=( doc/*.{html,gif} )
 	einstalldocs
 
-	prune_libtool_files --all
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/libgdata/Manifest b/dev-libs/libgdata/Manifest
index 702228348eba..50220c043e57 100644
--- a/dev-libs/libgdata/Manifest
+++ b/dev-libs/libgdata/Manifest
@@ -1,5 +1,3 @@
-DIST libgdata-0.17.13.tar.xz 849888 BLAKE2B a364f6175828dcf6d870ddf8489da3703b987587639675ed5cbe851de8761d918da9ef91531d2b992ef5188b51f00f4bc13c3ce3b36afe6d07c4e162a93b2889 SHA512 b074097bd3cc78951638f0d726a948c9ba994c64c85c0cfe713c3d87419a9a96b66688bde88732dfb529325dca2b8251bd161337532bffaf9564f7f5819b9343
 DIST libgdata-0.18.1.tar.xz 851584 BLAKE2B 860cc42c4d0bdbdd6ca1a1001ec7ea5acc26dd1339052365554123e6524fddce65704a11614c8a081eb3eef10395fb1b4d2dfd3cf942dd1ae3556507af4c7c52 SHA512 15ff708760ca5023b692fd565c26a7c3acf035073534c0cd3f1f90e46ee0c60d14dedf360d3ac146d37135e200d9c2bc4b657e81468d0efde4821a9219875b98
-EBUILD libgdata-0.17.13.ebuild 1739 BLAKE2B b4f8b0057d3d15c247eb622fcec1eedfb4fd7387447c1c30f0b84b7c3cd3095a4047ac5306a23a6e9531f6b6a33866fd808a19744cf2cc053866a24266dc7024 SHA512 617a4a847ea87f9ae8a0b3bc82dbe9c105142b7a4139b51b34ddb37a230a1378514a9a5e8389ee7128b31f3435b87984ae2c50940d4b6d1e253d731b48b86f14
-EBUILD libgdata-0.18.1.ebuild 1743 BLAKE2B 9a1827aa873c81475639d4e2ea10d9f252e97cc71a89804f5a9e5c67087ecbe8906a1bda96390b5d84839751506d32b0f852ba67cd5b0d10527bac25a20c9e6b SHA512 21656a73beb7f340b8f6521fa9fc273bc84ceebeaca768dfb3b3942992a927ef60b64a21e97a64503dccc6b6ab3ecb500cd65c0bf4c70f6d52ac9a45026c0dc8
+EBUILD libgdata-0.18.1.ebuild 1736 BLAKE2B 4bd8940b84241e22878f5d0a2c3e10c13515f86eae5dc0abfed83937d14112c3aa9e8df4f30020678368d9d043ad612013120c112d7638009b53860669676d46 SHA512 dac29b6737f18ee4b93bd6fd0eb3eef6fba0ceb62b7cc65f9e9fcb92b22fbac31daa0fcbc02b084a0bf5e5e38e7030da547e5e4cbeb6b57dd3667fd8e4224bc2
 MISC metadata.xml 496 BLAKE2B c1ea319b0bfe89f579895ad4422216a26b3b8709d75bf9680278c22e3fa4e3e771f4573b89eb3db2704a33196149883f0c7028b7e39cdde833df510e350f560b SHA512 e12832d53a97dcaba6d2f669ece3ff9dbd504951a7539f00cce52e88e28d4c28034b203b9f1def27c812f39e5ad21532789b62cd0ab2814facf90b7b789e82dd
diff --git a/dev-libs/libgdata/libgdata-0.17.13.ebuild b/dev-libs/libgdata/libgdata-0.17.13.ebuild
deleted file mode 100644
index 214315f26395..000000000000
--- a/dev-libs/libgdata/libgdata-0.17.13.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome.org meson vala xdg
-
-DESCRIPTION="GLib-based library for accessing online service APIs using the GData protocol"
-HOMEPAGE="https://wiki.gnome.org/Projects/libgdata"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/22" # subslot = libgdata soname version
-
-IUSE="+crypt gnome-online-accounts gtk-doc +introspection test vala"
-REQUIRED_USE="vala? ( introspection )"
-RESTRICT="!test? ( test )"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.44.0:2
-	>=dev-libs/json-glib-0.15[introspection?]
-	>=dev-libs/libxml2-2:2
-	>=net-libs/libsoup-2.55.90:2.4[introspection?,vala?]
-	crypt? ( app-crypt/gcr:= )
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:=[introspection?,vala?] )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.25
-		app-text/docbook-xml-dtd:4.3 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? ( >=net-libs/uhttpmock-0.5.0
-		>=x11-libs/gdk-pixbuf-2.14:2
-	)
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	xdg_src_prepare
-	# Don't waste time building a couple small demos that aren't installed
-	sed -i -e '/subdir.*demos/d' meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dgtk=disabled # only for demos
-		$(meson_feature crypt gnome)
-		$(meson_feature gnome-online-accounts goa)
-		-Doauth1=disabled
-		$(meson_use test always_build_tests)
-		-Dinstalled_tests=false
-		-Dman=true
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use introspection)
-		$(meson_use vala vapi)
-	)
-	meson_src_configure
-}
diff --git a/dev-libs/libgdata/libgdata-0.18.1.ebuild b/dev-libs/libgdata/libgdata-0.18.1.ebuild
index 4b2bee552d91..7e95bbe440a6 100644
--- a/dev-libs/libgdata/libgdata-0.18.1.ebuild
+++ b/dev-libs/libgdata/libgdata-0.18.1.ebuild
@@ -16,7 +16,7 @@ IUSE="+crypt gnome-online-accounts gtk-doc +introspection test vala"
 REQUIRED_USE="vala? ( introspection )"
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.44.0:2
diff --git a/dev-libs/libgee/Manifest b/dev-libs/libgee/Manifest
index cef3db20542b..10c0f0b5a4af 100644
--- a/dev-libs/libgee/Manifest
+++ b/dev-libs/libgee/Manifest
@@ -1,5 +1,3 @@
-DIST libgee-0.20.3.tar.xz 678488 BLAKE2B b35dbad89ebac58ab382a1733d7add2e6fcf1e1ba3a194f20ceb6c33b5cd01d18251147af0e7879e12951bda308597ef64776a9ba4eb3d2b86309136fc709713 SHA512 c7dd32bc02ea9f0f70e7593bc5625139802a52674e5aa07fe6fc815a78517f25590419b2da00e194bf7bf5f1505a138ba133d6dba67c44f9cdcb38389825adf7
 DIST libgee-0.20.4.tar.xz 684068 BLAKE2B b40d37f5d90abb8d96d5e90c67056573960bd54cadfb1cb5daf7fc07147a9e1706e23bf0240b84245c7e1ffb814c5e358f12e974a0d8a038b0179be25f271d90 SHA512 9a4b1db47543e80a6191054fa8fb04a8c07468befe05f738409ede317e64a8b884157bb488b330cd27f3dce3af5eeb7aefb74a180c2913ed8c834d1bde8fe9c5
-EBUILD libgee-0.20.3.ebuild 676 BLAKE2B cf10539a60968b946876b6f0afd2711d10cb1bc6ca808811e9dffc852c037d439623f6df047fcf1e413772ac4c8278c9260cd6a25bfbec4e4655ac185258841c SHA512 accc81319287a22cd861f2b0cec938cbca66864814fab81896162df849d02f1b444005588ba632045c20f708e3083e24dfa455247c7cf7497d3eca2c7b9a1263
-EBUILD libgee-0.20.4.ebuild 691 BLAKE2B 5efaa4525cbf431c4526e8b6774d8b359d04795d1d58e5beacc5bab264fe53d09a38732b4556364b20bb8299446197d9d4aa56992d81f4f44358faee15ece84f SHA512 65c1e5c2a59ce18532808b358a2ac98fe5fcd782879ef2543deef460c292de0584d7075427058690fb34f4f23abfaf37063e9df06c3c56dad9b8a59a8d7eaf0a
+EBUILD libgee-0.20.4.ebuild 684 BLAKE2B e6eca0ae6b527a34017b2a8fd046ef2ae7ebaa4614c4a44970318435880b48ca6d04aee8f9a4306bc782d58efcb5114f0ac8770ff995afe23d302b87823ac53f SHA512 0c070474fdb513622e7a06453ec70a49d6f03a7b902334c0579ea601d4988d4e8b2054243a44987a9435971c7647689e5f1fc579415427d4e3f550ba927702d4
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/libgee/libgee-0.20.3.ebuild b/dev-libs/libgee/libgee-0.20.3.ebuild
deleted file mode 100644
index 1fc2c61ea356..000000000000
--- a/dev-libs/libgee/libgee-0.20.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2
-
-DESCRIPTION="GObject-based interfaces and classes for commonly used data structures"
-HOMEPAGE="https://wiki.gnome.org/Projects/Libgee"
-
-LICENSE="LGPL-2.1+"
-SLOT="0.8/2"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~x86-linux"
-IUSE="+introspection"
-
-# FIXME: add doc support, requires valadoc
-RDEPEND="
-	>=dev-libs/glib-2.36:2
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable introspection) \
-		VALAC="$(type -P false)"
-}
diff --git a/dev-libs/libgee/libgee-0.20.4.ebuild b/dev-libs/libgee/libgee-0.20.4.ebuild
index 1bdddf0d98a6..f4051af8a733 100644
--- a/dev-libs/libgee/libgee-0.20.4.ebuild
+++ b/dev-libs/libgee/libgee-0.20.4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Libgee"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.8/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~x86-linux"
 IUSE="+introspection"
 
 # FIXME: add doc support, requires valadoc
diff --git a/dev-libs/libgnome-games-support/Manifest b/dev-libs/libgnome-games-support/Manifest
index 42a1cac1205d..887f59e4c282 100644
--- a/dev-libs/libgnome-games-support/Manifest
+++ b/dev-libs/libgnome-games-support/Manifest
@@ -1,5 +1,3 @@
-DIST libgnome-games-support-1.6.1.tar.xz 44012 BLAKE2B a7ef470f955d400a07d62452a7e2b0846e9ea6d01729bc6175963c474ea8a278a4903fd8bb1e0cdf9a19006f7306cb457901d20757573ba4fc35cf8d0397aa1c SHA512 a2f0c6faea4e10fcc06487a37147a3bbee9d41daeff2a323cf078bef45664166184f63e11fdba4afe6d2d1f8f2c0dba59274707d978c84b17b70305cb206b3a8
 DIST libgnome-games-support-1.8.1.tar.xz 45264 BLAKE2B a2bb36bcff92d3e24e3f6092437cf1e2fc93de6a891ce85448d0b68d42e0b717a084fd0af927a0ec0203af79b6f7ccc67c64c4f6b7a23473bc624cba8e0489c2 SHA512 ed5ba94db9ab3d6193e7bb2d0956e20c42577b9fdba4d1d31acb252c43d248cc9b478c807b5f9489dfc88d6757bf95206405d0adf4fb68aa50b8f9d1b6ec59bf
-EBUILD libgnome-games-support-1.6.1.ebuild 667 BLAKE2B 82e1bf2bee0c0ba1c6478e8f5782557c20970ee83e73b6ecc874832bf3ce5e425c49e4eb95b0e140578755da21159c6463376755ad7c19038089ca9ddf432190 SHA512 2091bf500744a06de13c44e2cf1958d9e0bc7cdab2c008bb7a1243e242b69fb9591859b9a9b910205849fe7f829ea3efd0922d227901327dca639519a01b798a
-EBUILD libgnome-games-support-1.8.1.ebuild 669 BLAKE2B 5fead8b825c9819b2e7b42d029a00e0eca35cdb10720ed16b79659c17a8587636cee3d3e15111d902d83d20279dbf185c3a2d874e6d1d1f5ccaf6ee01ad41a01 SHA512 ce730270c935e56421e2bae3c32dd04d8bfa46d59f9334f7c77db9c323bcc8a2f921b7cac9c1d122737ff12766a6c61630377fe557e896153c06b9af9f37289a
+EBUILD libgnome-games-support-1.8.1.ebuild 667 BLAKE2B 6871cab02e73f20baaf7b8b0b53262ee20292c318d83f622789f11d0e397d167aac7a42fff9d4b3053c3f29580519e94af9a114ab75a5b9b494b81b652c6810b SHA512 572e7e4a955324d76d632042aa3295740331bdeea6baa11ac71a3bf295f743dc66f11cea6b9b1945760454ac4bfb4b9180ead23905c31782ea8985b1f9a24251
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/libgnome-games-support/libgnome-games-support-1.6.1.ebuild b/dev-libs/libgnome-games-support/libgnome-games-support-1.6.1.ebuild
deleted file mode 100644
index 26587bd4a03a..000000000000
--- a/dev-libs/libgnome-games-support/libgnome-games-support-1.6.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 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.1.ebuild b/dev-libs/libgnome-games-support/libgnome-games-support-1.8.1.ebuild
index 38664f56d3d4..c938b13bf97d 100644
--- 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
@@ -11,7 +11,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libgnome-games-support"
 
 LICENSE="LGPL-3+"
 SLOT="1/3"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 # glib dep in meson is 2.40, but vala is passed 2.44 target
diff --git a/dev-libs/libgusb/Manifest b/dev-libs/libgusb/Manifest
index 8f0169788f06..fed71773bbcb 100644
--- a/dev-libs/libgusb/Manifest
+++ b/dev-libs/libgusb/Manifest
@@ -1,3 +1,3 @@
-DIST libgusb-0.3.6.tar.xz 41648 BLAKE2B c4fe7661c3912233022c90b6201e2e9007871355dd2c7f6a67a96da77ab1d3c937bad9cc44fc8a91f89e93a66c6a072e0835e0e9178e9352b0bab73463bece3c SHA512 a185b6feaeace72f78672ebaa6788659fcccb5d6414d49afb8ab717307c7a3d8e55a2adaaadc24f00ee0059fc1e3fcee54212ac3477989f7cbe4aebbf91699c2
-EBUILD libgusb-0.3.6.ebuild 1695 BLAKE2B 7c4cd5f033343343bd048201c34000eb387f2a8e783b2dd8f43bc4755ca97c165d74abc0cfadcfde1c99ed6a5d26c6124e1b1154aaab07d6e7bbca0ae7919459 SHA512 0bba5036c3266f8c59545b626ade9addd4d61eac522e3e6d5ccc369099831ab35c02b101a2fcea738a0651eb4410f89c329a2e6e0f4cd6c5aa6d0e4dbd8795ff
+DIST libgusb-0.3.7.tar.xz 41844 BLAKE2B e0829430a7c4c9372ebc061ca8245ecd6b30f0922e4e37ae41f7f65055e7339b5a3a882c5526ea5e5663be3b7c1ad71fee7da5cffb501d63bd1cda2b618fd40d SHA512 65a35be62bff689621f418abf045f62f946c67488dd021d363ab252b9b3a2380898ec763b374f7da50901945eda666fdcae7cbfda7e143544175d7ade3ebc20d
+EBUILD libgusb-0.3.7.ebuild 1695 BLAKE2B 7c4cd5f033343343bd048201c34000eb387f2a8e783b2dd8f43bc4755ca97c165d74abc0cfadcfde1c99ed6a5d26c6124e1b1154aaab07d6e7bbca0ae7919459 SHA512 0bba5036c3266f8c59545b626ade9addd4d61eac522e3e6d5ccc369099831ab35c02b101a2fcea738a0651eb4410f89c329a2e6e0f4cd6c5aa6d0e4dbd8795ff
 MISC metadata.xml 343 BLAKE2B 5905d49c021f1b8d8e5167415d0f0c731c0b204fad7aa73f10f6a7dc8b8f417e9591ed26ce655e2d5e5963e84f0ce44d77e59cd79e8d1921899b0a9627d52911 SHA512 096d78e0613e0475d5499f3c30542bd22fc98a2598a7e2e5719747a809a19288a0a36897bc9bc647fceb98f3579f7148c32d16d78c6114d0b925f143daca91bc
diff --git a/dev-libs/libgusb/libgusb-0.3.6.ebuild b/dev-libs/libgusb/libgusb-0.3.7.ebuild
index 2288ee798781..2288ee798781 100644
--- a/dev-libs/libgusb/libgusb-0.3.6.ebuild
+++ b/dev-libs/libgusb/libgusb-0.3.7.ebuild
diff --git a/dev-libs/libgweather/Manifest b/dev-libs/libgweather/Manifest
index 076186f5ecf1..0732a8b9ecd8 100644
--- a/dev-libs/libgweather/Manifest
+++ b/dev-libs/libgweather/Manifest
@@ -4,8 +4,6 @@ AUX 3.36.2-autoskip-network-test.patch 1034 BLAKE2B a675ec70e9f8a0bcba89743c1ae1
 AUX 40.0-autoskip-network-test.patch 1038 BLAKE2B c233294ad5a301e8a7b6b96e606124a5440cc93507f291147acc6f8178341b1ce4ce292250d56467364bfadc2d28d49f02e5f3aa8f4cddac7dc621621a57d93c SHA512 fe2ff110863627e61454d1583d155b9f73c7c64814a77736783eaa533e50bbacc61065eb66a84af20f83323f0b66a1a38c70af26a1f7ef5a559865dc885c786d
 AUX 40.0-meson-tweaks.patch 3192 BLAKE2B e30f8f47beaa9683b6709389a0c603b28bbf160a1391dfead3d9bc1117bc3d811ac5cad4706bc85720f330ff5b22d5cd276947ee9bbe0f8911073a0e9a0b35be SHA512 c135d708154060d84023f2e33d16bd5a6a798311b858d0ebd15a9a51a1bf69c33ab93ef02bd8b6b65c5cfaf071af4a7a154630e3fed0767173cdfa576e554d1d
 AUX 40.0-tests-locale.patch 2023 BLAKE2B 97acdc022d38e465bd114dd3411b33752827b77167894386384614a1e0ec19f8abe1a2f52aa785dc768bb3599e20fcf64330dfb220c3519da93b42b38e736c3c SHA512 4e8edc725bccaa30ecf19f428e2e863b2cfabeb209bedd9095b12e149600ec2fce7ac8b385b1e7655d0262c8810a60891272956a829e70b513b16af0c1463435
-DIST libgweather-3.36.2.tar.xz 2707976 BLAKE2B 0051e1fe9dccef44ff6fe46bdf8e6b23c9a772ed000daf3a0349e064819d0f17f3f7d902f9c860f0d186a67fc6c5a27b31a8b20b4fec7e738221a58830216ca5 SHA512 58012931382d87b10ace79f6e2337a9244a0877a8bc241bad5da6368f6d8eaa815f88bee25cfd49b12baa4b2399a407b905f1cf0afb98f649fda6b0dc9f61f01
 DIST libgweather-40.0.tar.xz 2704404 BLAKE2B 27bc69c350ae91a07307d75b5ea1d03bb251f51bf87d5d54861965b61d7ed825ab708466cbe9d961c4f544b8b17ca6ed37b723c003ce2c1ef020270d6812c61d SHA512 72e295246bf03550039a70bd4bf5b8f06357a6b70e04308c197fba309e406d410a97d128d849d97a29a6a114faa1ef5452e6632870b7ea45223a0c305c228cc1
-EBUILD libgweather-3.36.2.ebuild 1968 BLAKE2B 4603276671a2870718979c6bf27fe522c61b9ac8d3cb4225c4a85ac73ea038be0389e89d0d71f4de6422b3122f6b2bb2f37aa6a4eebe9e6f8d18401adaa20b1a SHA512 9867a812b3c891b43ba32d44d2a47e132bccd17ae703ebaa73d91fa404e327d75969312025ffc1c1b1f8e791308e528035b5ea0dbc488c247ed2c6ab3e1c4e10
-EBUILD libgweather-40.0.ebuild 2111 BLAKE2B 74dd0ed2a40d1876abf51a98e9a18a433d078884f55fab046941b22a0fcd678fb198ae1c357885af704f3815940227aab4c23ed4fb3ab3776838e37617325f23 SHA512 92b59bcbf89993b72ba2ad6a594c8c25b319f5ef897375af17a2b7c04b2d58c742bfee385f2e6e094cc34c24cae062dd319d8d9c03dae7a51b2bbbceca841604
+EBUILD libgweather-40.0.ebuild 2108 BLAKE2B e66db83d3aea59b114eacfa0e1843711d47d192297052048aafc7bec05e322121a8794610d34040eceece1944177fdcb23d040dbaf510d153ddd159d7f925a35 SHA512 b8ebf8db02aaef7cb5656793cf9308bbf99b82a1386c7c7297247444b5da75d09d08423a7b5df333e55abf00b0a5db75c81b2dbc32695f303b560a45d0bb2c8d
 MISC metadata.xml 349 BLAKE2B 5467cd4402c0ec93c36f4cde26afe4ff2cf88d31227d8fbd22cabf50b4521c4634dba856a531da5f0054ad208daa8b178c9fad63b72dea6bbdeac13fa2f67bff SHA512 56d547e8cc66f19d606374f64c25546a687f3d199b083e406b871231a53362c0fdbcdf0a1c4f41810a2eb719e1bbab1c1589d7abeeb5630e1e04c20748b0df5f
diff --git a/dev-libs/libgweather/libgweather-3.36.2.ebuild b/dev-libs/libgweather/libgweather-3.36.2.ebuild
deleted file mode 100644
index ac0aaee8a251..000000000000
--- a/dev-libs/libgweather/libgweather-3.36.2.ebuild
+++ /dev/null
@@ -1,76 +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} )
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
-
-DESCRIPTION="Location and timezone database and weather-lookup library"
-HOMEPAGE="https://wiki.gnome.org/Projects/LibGWeather"
-
-LICENSE="GPL-2+"
-SLOT="2/3-16-2" # subslot = 3-(libgweather-3 soname suffix) w/ temporary -2 suffix for silent ABI break after 3.28 without soname bump as per distro-list
-
-IUSE="glade gtk-doc +introspection +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-RDEPEND="
-	>=dev-libs/glib-2.44.0:2
-	>=x11-libs/gtk+-3.13.5:3[introspection?]
-	>=net-libs/libsoup-2.44:2.4
-	>=dev-libs/libxml2-2.6.0:2
-	sci-geosciences/geocode-glib
-	>=sys-libs/timezone-data-2010k
-
-	glade? ( >=dev-util/glade-3.16:3.10 )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.11
-		app-text/docbook-xml-dtd:4.3 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-	$(vala_depend)
-"
-
-PATCHES=(
-	"${FILESDIR}"/3.32.1-meson-tweaks.patch # Provide introspection optionality and don't build tests that aren't ran automatically
-	"${FILESDIR}"/3.36.1-tests-locale.patch # Don't fail tests when a locale is not present, https://gitlab.gnome.org/GNOME/libgweather/-/merge_requests/58
-	"${FILESDIR}"/3.36.2-autoskip-network-test.patch
-)
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use glade glade_catalog)
-		$(meson_use vala enable_vala)
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use introspection)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/dev-libs/libgweather/libgweather-40.0.ebuild b/dev-libs/libgweather/libgweather-40.0.ebuild
index 25aefdc8fd5d..b7249ad649f9 100644
--- a/dev-libs/libgweather/libgweather-40.0.ebuild
+++ b/dev-libs/libgweather/libgweather-40.0.ebuild
@@ -16,7 +16,7 @@ SLOT="2/3-16-2" # subslot = 3-(libgweather-3 soname suffix) w/ temporary -2 suff
 IUSE="glade gtk-doc +introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.44.0:2
diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
index b3be6a8b420e..4931d19ab65b 100644
--- a/dev-libs/libical/Manifest
+++ b/dev-libs/libical/Manifest
@@ -2,6 +2,6 @@ AUX libical-3.0.4-tests.patch 747 BLAKE2B 41c72700e8a87c3665144bf12e7ea2c7f74c17
 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.9.tar.gz 886500 BLAKE2B 66810ce13d70f9f1da62ff4d4c9dbff4953a644e939f55770cd4ca367293125b47590297b64a4b755cfb11315dfb4e77ad926390cde1c2d16847d24561288750 SHA512 4a9894d82776437cb2ef16df70bffb52da7b4fd57b52a4f6941430b3b1f9830829f0775fb495411f67393581bda1304b54c9f0031bc3d4ada56d2204900cb268
-EBUILD libical-3.0.10.ebuild 2426 BLAKE2B e6ccd11cc43c019987229a1a88db9d9f41aff869c18d1d457ef7793193ae0144fb58071cc12d1bbb10b59142a094f89fc5c8c126af22146d601a622e328429a7 SHA512 05c59f5fbb58bfdcb1457af1b75debfd7fc0f55ebff929661d981822c8e928dd228dd4ede47477498f6c795a5f4d25d148154be5ac6c8f21ac6513f5288fb207
+EBUILD libical-3.0.10.ebuild 2419 BLAKE2B fa7313d6b9fb4e83173aea5df82b8073dc8d3000587e71dfe82aa4b38846e5b3b0543b083304f9832fccd3c31d5e3f194d41aee739fc169daa67db4b97b5f7a4 SHA512 915fcbb970075d32923920f1b08ce3a028c3538c0faa5c41cb4708e7ad5cc10d9f74ac470a8696da06a5a7cf5124b169803a512d3f88371f7df2164a9082553f
 EBUILD libical-3.0.9.ebuild 2419 BLAKE2B fa7313d6b9fb4e83173aea5df82b8073dc8d3000587e71dfe82aa4b38846e5b3b0543b083304f9832fccd3c31d5e3f194d41aee739fc169daa67db4b97b5f7a4 SHA512 915fcbb970075d32923920f1b08ce3a028c3538c0faa5c41cb4708e7ad5cc10d9f74ac470a8696da06a5a7cf5124b169803a512d3f88371f7df2164a9082553f
 MISC metadata.xml 414 BLAKE2B a98ae31f47d5352b02643040fc01547b8895bf62ca72627e61dfe16ce4e6084c3448c216a04fb3d5a4fe955de6f7ce6821096a5febc01f610bdd674266ccf968 SHA512 5b408580f7e11fd645b7759556b6cef87a57d381abaf38c46c1e4331f75bb4f909d22b3afdeab9a2acda485684d52929cc564fe01ad2963f5e7fa914f9db82c0
diff --git a/dev-libs/libical/libical-3.0.10.ebuild b/dev-libs/libical/libical-3.0.10.ebuild
index 4cf2814895d8..5ce88999e056 100644
--- a/dev-libs/libical/libical-3.0.10.ebuild
+++ b/dev-libs/libical/libical-3.0.10.ebuild
@@ -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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 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 da9e051805ea..6bf8a5680f0e 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,5 +1,5 @@
-DIST libinput-1.17.1.tar.xz 611492 BLAKE2B 274312240fccc49a45dedc3d41018bc952f25040217f388fd461aebabe796be106dd4f34cb2e40ce91fc75219c47fbd605c6facdc4d47893420e5df199a7edb7 SHA512 2e7baa198fed9c673d28453efb066f9371f2b575a844e41cde455c636bbe1cc68faae7129026944a502cd5d7bfcc72272066b9e3cda5c959f7b464483f9dd860
 DIST libinput-1.17.2.tar.xz 611388 BLAKE2B a94ab1e3ef65f49a3043e5f84d68748c4800be1e2e0911b45be2a9cd6655311b2e6c2fcde64827f57e74318fc759d95e045125239305a2ae94175371c178c50a SHA512 b8953ad483648d5629d56c4dc226d4906693b15da5ba4027627a51ec35ea65b0603c09056b52ed2025df1f7a877669a5b7482c025e0b37003fc676563bd05263
-EBUILD libinput-1.17.1.ebuild 2238 BLAKE2B 0298d4a85c802869d83200b71780460ccfd8fc8994632053e19a291caa54d74ef4b893e7694e4c6a2a28f49cb4dc0acb715ddca6725419d2cef9a91f8c19aff8 SHA512 9fda7370585beebc50b3ec3e0541773f255d813cf8e3fe371e830f0234ea955fd0a5873580d5cedcfd10a2413bf732280884bad141febb4aa85f42b30f1b86d7
-EBUILD libinput-1.17.2.ebuild 2245 BLAKE2B 768a84dcd6be0ae87051dfd9c98359a55a670aacaa60fb06a3d8b0f9d79a41de9a975deb34cab36bfb5b8642042a2d3de579285f50bf88868bf64ad91585ab5b SHA512 795e1e94d5bc32b46e21dd19887991c22d9bde48602d74820bb925e55d1ac7e996aaea0e64fb077515bc5dfc39a6e15d5ac2668719cd406991a1e5127d48bcce
+DIST libinput-1.17.3.tar.xz 612892 BLAKE2B 1acae8a5bc0f87b547c83a0f72e0693ac95cf85377269efebc5ade8606620fcb3d7300fabb05dafd5492458da3d2300667ed6e43d9e6fcda2bd4f461bc0685a8 SHA512 3d1ab4362ede886996795d700a938d20e04cd922e8f9598fe9346f9f93e149119526fb324a096787b4b8a47bf3e5613130bcd874f10df86761031710d2acc792
+EBUILD libinput-1.17.2.ebuild 2238 BLAKE2B 0298d4a85c802869d83200b71780460ccfd8fc8994632053e19a291caa54d74ef4b893e7694e4c6a2a28f49cb4dc0acb715ddca6725419d2cef9a91f8c19aff8 SHA512 9fda7370585beebc50b3ec3e0541773f255d813cf8e3fe371e830f0234ea955fd0a5873580d5cedcfd10a2413bf732280884bad141febb4aa85f42b30f1b86d7
+EBUILD libinput-1.17.3.ebuild 2245 BLAKE2B 768a84dcd6be0ae87051dfd9c98359a55a670aacaa60fb06a3d8b0f9d79a41de9a975deb34cab36bfb5b8642042a2d3de579285f50bf88868bf64ad91585ab5b SHA512 795e1e94d5bc32b46e21dd19887991c22d9bde48602d74820bb925e55d1ac7e996aaea0e64fb077515bc5dfc39a6e15d5ac2668719cd406991a1e5127d48bcce
 MISC metadata.xml 448 BLAKE2B c7a735047f8d22e10d1094dc4bbcbd118c025f318280dafd36029484956465c5e459326fb765f04fbdddc03743760a9008c6ac2494ad113387134fb4e79c4c48 SHA512 945c1005dccddac8085fd8b2be635c08d5b4da1f8264d564d10526d11cf814131d1fa5fd7620f35811a90b43686517519f4e9aba9253f5d5d5b69daa25be52bf
diff --git a/dev-libs/libinput/libinput-1.17.2.ebuild b/dev-libs/libinput/libinput-1.17.2.ebuild
index 610b570961f9..66c9079fcdc3 100644
--- a/dev-libs/libinput/libinput-1.17.2.ebuild
+++ b/dev-libs/libinput/libinput-1.17.2.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 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="doc input_devices_wacom test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libinput/libinput-1.17.1.ebuild b/dev-libs/libinput/libinput-1.17.3.ebuild
index 66c9079fcdc3..610b570961f9 100644
--- a/dev-libs/libinput/libinput-1.17.1.ebuild
+++ b/dev-libs/libinput/libinput-1.17.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 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="doc input_devices_wacom test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libjcat/Manifest b/dev-libs/libjcat/Manifest
index 6f4c39025943..76f655107d56 100644
--- a/dev-libs/libjcat/Manifest
+++ b/dev-libs/libjcat/Manifest
@@ -1,6 +1,8 @@
 AUX libjcat-0.1.1-disable_installed_tests.patch 1131 BLAKE2B fdefa9b78c1c8fa80ef35d1eb1d1f5bfa9f6d6434dc517e5c84affde5de8fe195d4ad605b59c45acaf73fb5bc75fb6c57bb0a95ccace0b67e3480b9157a6a704 SHA512 171b9c60e4afff59cb25bd6f94ece92e3e80dc1267395415d3d283ab429c3a2de49d43c0a0efce1b9b9f4d217e01a08ce4458c691ad270d427284ed45a88a1cf
 DIST libjcat-0.1.6.tar.gz 64485 BLAKE2B 1b9c26655864972a5b0686eaa1b2d3835d494fd897bf0e0d08639a5b8d337c245c1265fe49d24bc52038379e4eba406660f8485a5c6350b4abab01b76a80e161 SHA512 89f49b4c73305ca83157bc0ae369d2793835b6d7d06ff90e55cd27491363c8ca7451dc0e4e5c1e3def9b653581e3ad1a990469b029f4557442cefd650420dc2d
 DIST libjcat-0.1.7.tar.gz 64818 BLAKE2B a39bba9f82316e26f2d758d0ded6260968964404cc4401afb34cac2e74aff9649fa16ea28a9aceb72ef7d2d6ae45d25f8db333b212460f8e2e1c2e5649b76b68 SHA512 b22e4aee1e5bb396375ec50fb0a28544a52423116fdb81ce886638d56ee3003d3756339a4965aa0f27cb51759180f51075bd6eee6ced54b295a931c8cab0c519
+DIST libjcat-0.1.8.tar.gz 64828 BLAKE2B 86ebc635364cd78c05694baf3d5fe7d9bf6764629f4530f5ab8a9502887884b3d5369860806a252493a7a3208367b848e470730fb8c32d4c66cc8eb92df51990 SHA512 058bcf7ddddc7a3cedefcfcef9947c5f318fa806c8673b991be29f36e4fa0e09e51e972c0bebe0404fd92060715f8a497a0c0566d743bf6f3fa71bc3d94688c9
 EBUILD libjcat-0.1.6.ebuild 1446 BLAKE2B e221f9c8ae420640276ad71c36afa7067a0a7b8ba1aa88ffec5f16270c93729cc7617e63dbfcd5021cd7f776939ce070c08837399cbf0aa734d5f084f811f3c7 SHA512 57953396b10b16df1e12c1ff5f690d339ce12543af7cd0c2d1f082b94fa6de950577b5965715bd317a3999fa9a0b07676b7aa4a4b5f6aefec1803ff43d130cb6
 EBUILD libjcat-0.1.7.ebuild 1449 BLAKE2B 004523fceaae3649d805f671cd728be687262d0f89fcb90c0c22aeebb147c1b00c9a51f9e2fd1ad55ec46925c16912fdb0279ec0fec12946324beb0e1f43de61 SHA512 7251a9dd8471cc42ff69c931a45a555ba01ddbac1d61cc9fdce155f85d4f33a16384f9bda07c7a04c626e0211a86815c4077c2086e07bdc23651cc77c1533a3e
+EBUILD libjcat-0.1.8.ebuild 1449 BLAKE2B 004523fceaae3649d805f671cd728be687262d0f89fcb90c0c22aeebb147c1b00c9a51f9e2fd1ad55ec46925c16912fdb0279ec0fec12946324beb0e1f43de61 SHA512 7251a9dd8471cc42ff69c931a45a555ba01ddbac1d61cc9fdce155f85d4f33a16384f9bda07c7a04c626e0211a86815c4077c2086e07bdc23651cc77c1533a3e
 MISC metadata.xml 936 BLAKE2B 168ebcae536147919a800bac65d1a35f32ee57283ea8f5d21554df3ea38565db39c8c8332f0f0d165f52115887e68201a305f31483cae5e2b8f33dfda12ab159 SHA512 82a1d7c6a84cedeb6bd580d3917c33aba7e55d1f4f17982aa2fe0f6c9f4eca9289ed5a67340f02004b4a704c3666e546ce64abe3f2bb3f75e8a56bddbf90084b
diff --git a/dev-libs/libjcat/libjcat-0.1.8.ebuild b/dev-libs/libjcat/libjcat-0.1.8.ebuild
new file mode 100644
index 000000000000..5ba6f9393cff
--- /dev/null
+++ b/dev-libs/libjcat/libjcat-0.1.8.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_REQ_USE="xml"
+
+inherit meson python-any-r1 vala xdg-utils
+
+DESCRIPTION="Library and tool for reading and writing Jcat files "
+HOMEPAGE="https://github.com/hughsie/libjcat"
+SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="gpg gtk-doc +introspection +man pkcs7 test vala"
+
+RDEPEND="dev-libs/glib:2
+	dev-libs/json-glib:=
+	gpg? (
+		app-crypt/gpgme
+		dev-libs/libgpg-error
+	)
+	introspection? ( dev-libs/gobject-introspection:= )
+	pkcs7? ( net-libs/gnutls )
+	vala? ( dev-lang/vala:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	$(python_gen_any_dep '
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	')
+	gtk-doc? ( dev-util/gtk-doc )
+	man? ( sys-apps/help2man )
+	test? ( net-libs/gnutls[tools] )"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.1.1-disable_installed_tests.patch
+)
+
+python_check_deps() {
+	has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	xdg_environment_reset
+	use vala && vala_src_prepare
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc gtkdoc)
+		$(meson_use gpg)
+		$(meson_use introspection)
+		$(meson_use man)
+		$(meson_use pkcs7)
+		$(meson_use test tests)
+		$(meson_use vala vapi)
+	)
+	meson_src_configure
+}
diff --git a/dev-libs/liblouis/Manifest b/dev-libs/liblouis/Manifest
index 7953be10fad8..657403ba4797 100644
--- a/dev-libs/liblouis/Manifest
+++ b/dev-libs/liblouis/Manifest
@@ -1,5 +1,5 @@
 DIST liblouis-3.13.0.tar.gz 14683684 BLAKE2B 9596fac30ee8512498826ea11c3fe4d9dfba6706166938852242533f1fadde9ca8e363ea1364ebb4266b366ee49863d84ad757f8634d90e48dd8c562c31e9e8d SHA512 68f0205dc55a106c5707f959c1c0d3c121dfe62f263a664e6bec0780bee65cce2fb5d7033ae1c8312d1d79f7ccaf650af71906e8651b60f11219758e41051b61
 DIST liblouis-3.17.0.tar.gz 14868166 BLAKE2B 2edc5ef4366e29080d0d138fe45d946730e04dea278a14751106a25862f6266fe0fda492e12f4d2aa7d26d7277a11dfa2eaf8be39cdeffbcf83f2c143922e6d6 SHA512 9511e0f76ef6def3fa30f0bce4df188b2a11251e8ced0a76a92e172026e6751bc19b2c8ccd5789043b65398190a367bca03b3f1449344750e63ebd0fde60b4e3
 EBUILD liblouis-3.13.0.ebuild 1743 BLAKE2B 488ab7006fac89c4304ba02924d8e24a99df1cbbacf18083a5a69367dbb9bd2af1b7aef6a132dde5f1b9ef06c05639aaec2356702336feaa2cc92f2b06a67eae SHA512 3d8a7ad11b920e767511611cf147abcff1144141d4afa1b90aade5e1b78659c04a792753e040c5776aa1ac30635985c8e8d0aaaec2ae64ae2b170b2fdf3bba02
-EBUILD liblouis-3.17.0.ebuild 1749 BLAKE2B 986987f2ccd8dc45f221485058d06fa1b59a63476dca61eb6e48a0170fb2489212e2e44282d0831b0968de5b1f96e959ac6b98044be2364587a0ef23526b7903 SHA512 f3f8a40d5a999b442de6a45d1d1822c7778574474a546755bca53bdaeb1f1b60acab2a42a6e7846a31785329e9c47a7cbbf55e2572614445852d5044289d2ee7
+EBUILD liblouis-3.17.0.ebuild 1746 BLAKE2B 158619f1c3995ccf102f026ebb002235b7bbb78575f304d3c1090861cbb545e2e5dfb9041928fe9a6a8701cbf5159070f728b6e29948cd801906aec9c9ec2373 SHA512 7c600331191f2747f711a27e55938cb45013b256db289a1761be3546e4ce28ac24ff115e637ff36dfe49bc590c4358de0478a85f512365495aa70bca6c982cc6
 MISC metadata.xml 351 BLAKE2B 0fa7c957682fe363ddd29442ae153152469cc64ebf9005361c4b82f180c380485adf0b04467b147a441c6656ddcc9e44967fd692ed9f835d70653dbae9b9be1a SHA512 377a2d9ea4bc6007a60fcaf0284bd47af78b6fe2c901916f9cd7d6ab0f7a5225baf7314b47b0c3b00cd162278f910206bd99469bdef0165cd6e19c1eff73714d
diff --git a/dev-libs/liblouis/liblouis-3.17.0.ebuild b/dev-libs/liblouis/liblouis-3.17.0.ebuild
index 6ea877ba7b42..2c71e67467dc 100644
--- a/dev-libs/liblouis/liblouis-3.17.0.ebuild
+++ b/dev-libs/liblouis/liblouis-3.17.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/liblouis/liblouis/releases/download/v${PV}/${P}.tar.
 
 LICENSE="LGPL-2.1+"
 SLOT="0/20"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="python test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libmanette/Manifest b/dev-libs/libmanette/Manifest
index 9d4d1a27ace3..0b0c063d3552 100644
--- a/dev-libs/libmanette/Manifest
+++ b/dev-libs/libmanette/Manifest
@@ -1,5 +1,3 @@
-DIST libmanette-0.2.5.tar.xz 38192 BLAKE2B 0eed86ac8ae5d45be8b80d14aee29f199eff23f879fda99494fa163e03eb265d95146392038cf4657f4256274d65b2a842413a87fa93ec4a5f192da64054a661 SHA512 f72b908c0282aee74a86ce27650d1b6220424e76a830645758a5677b4af6208fbf1c0354cf602c76e097735168cfa3d6bc16727ebb73a14dd650708a0a0deec0
 DIST libmanette-0.2.6.tar.xz 43236 BLAKE2B 3b2a6979aa368117fa5d61623c26e6cca61388770ad77e759c3427fcba64d40361b1e1a4f87a2931281edbf5c2943a44c2ee3b0485ef52ddbf183a9e72344892 SHA512 e10a1b3e493a6472b0cf7562e3dfbba839ee69bb878676b2e3521363e9ff7c5df7d379923a4781366797e889f3c8985397080ae606264dc9bd3a4459bce0513c
-EBUILD libmanette-0.2.5.ebuild 848 BLAKE2B e51749eb7218a9b57c8b985ff9fffa57c1d9e030094a7e2871d31bc098166b7317c6399687d06b98a18bb2bb5aeada4b0dc5b9d687ff5b6b29c6a503043fd461 SHA512 bd51de492690d789d2b54dd8b6393c5eb29307aa0edba21f9708100ac87a7772fcd38613c515c78fcde9795669defc0bd534879148e13557e29dd748e8f7be45
-EBUILD libmanette-0.2.6.ebuild 992 BLAKE2B 915955e4a40c23772e02d5d438f82aa72350e3370f024d9d026a0d625f53301430593a49985ab2dbd7b8b6eebcf5983cbeee9721929f92b474c45b35ed3dc016 SHA512 631dc22e595724a55174649928aa5e84b19ce008b5c65db559b84095bfa378ee7ba9347b4e0997d7a785ac6a9ebfd5eddf5641be065b5dcf6ac64104f302f268
+EBUILD libmanette-0.2.6.ebuild 987 BLAKE2B e27ef5fa2bec4c69a197a575434c14e4b403514c66c4d69dace179ad3c6c6ce478ba6786a56c1bab9e4c22ef518e37a29c3ae5caaf01626635c9a3bd964ab2c3 SHA512 0efd4f2fb050f811f8211cfdcaa7f84aa0a69f6d8393d72b9ae2829e88b675d93d35f2c4745dda628036723dd09976833a2cd021a07d99ac106293bb9800176e
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/libmanette/libmanette-0.2.5.ebuild b/dev-libs/libmanette/libmanette-0.2.5.ebuild
deleted file mode 100644
index 521893394297..000000000000
--- a/dev-libs/libmanette/libmanette-0.2.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="Simple GObject game controller library"
-HOMEPAGE="https://gitlab.gnome.org/aplazas/libmanette"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 x86"
-IUSE="+introspection +udev +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
-	>=dev-libs/glib-2.50:2
-	udev? ( dev-libs/libgudev[introspection?] )
-	dev-libs/libevdev
-	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
-"
-DEPEND="${DEPEND}
-	vala? ( $(vala_depend) )
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	xdg_src_prepare
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature udev gudev)
-		$(meson_use introspection)
-		$(meson_use vala vapi)
-	)
-	meson_src_configure
-}
diff --git a/dev-libs/libmanette/libmanette-0.2.6.ebuild b/dev-libs/libmanette/libmanette-0.2.6.ebuild
index 92be27b7fa41..9f917ee7f861 100644
--- a/dev-libs/libmanette/libmanette-0.2.6.ebuild
+++ b/dev-libs/libmanette/libmanette-0.2.6.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/aplazas/libmanette"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc64 x86"
 IUSE="gtk-doc +introspection +udev +vala test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/dev-libs/libmaxminddb/Manifest b/dev-libs/libmaxminddb/Manifest
index 5bf0d87fad84..e9aab6a1b0aa 100644
--- a/dev-libs/libmaxminddb/Manifest
+++ b/dev-libs/libmaxminddb/Manifest
@@ -1,6 +1,6 @@
 DIST libmaxminddb-1.5.2.tar.gz 604683 BLAKE2B 4dea7413be59169104adf3dc5dfe3e4f3bdb4639bbb4a0c6365d93216e279d505f01e32f737bf66d9f5b98f65f3eaefa46f630458bd6032a32be8c74acf12a1b SHA512 074ef6b62a74cede7be332eaeff5aa7442f43de92d39ea65b38430f0e1b65a5515f4343894ca5c28a7d50181eaec44e8db7083461b9e12e7014d2d1e0ff033b8
 DIST libmaxminddb-1.6.0.tar.gz 605099 BLAKE2B 6868e42b8a166d75f6fa3a1da0fc2bd47a381ff960496ec9348b88c72b1bae180e3c0ce8989149e60d7d9c795d6baedb8e9d984098914064db985f2d201983c2 SHA512 9394e8dd959982d4ef5d15a928d32700722ed9d6c9988d9cc1bf2f4e67de0a53cc6987e90aaef3a6926c9ff36ac378f7a1fe47818fda4f5a3a22539210b2d004
 EBUILD libmaxminddb-1.5.2.ebuild 669 BLAKE2B 4b789f4f6389f90041907c455fe34765881a5722234800371371db435ee4fb9827b01b6a88209db22ee3ca74abcaa97706b3993e906b76277de0afb6356bc7fe SHA512 d51716ef0432573944954ac8cfacb00d559f78bea9b5b3ea82303ba06a554107ab993ff5af06e45c2a614481eb75370453f49633f5a8357a026add5ccaf731de
-EBUILD libmaxminddb-1.6.0.ebuild 886 BLAKE2B d5f7b28779a576a1a0d2046652ed89b149f89a17136751de7c9f2f699d64667ccc25edac1bacc24053dc4327880e03025d0983359c715be9c901cecca26c6de8 SHA512 0636f14a7390c502005ec72458b9e4421ecb3e04f996466a936d864f1d92341d4231d0c5461f0eecef92dd2c66fa5e74f1844eb13200343ef307334ecd17fc51
+EBUILD libmaxminddb-1.6.0.ebuild 882 BLAKE2B e494290aca853f49cd534931ddf000d55e07262457ce3ddd51274e4fcb1bb872f4e6d775df480ce8234a788c8576a1490e5887942f55ef3eec59a9a24b410dc4 SHA512 cae581327a36ce1ab3f298871fd398afe360f45a44fd8c2b6d35c2f5a65736d8b215e6783e9d36c67421fc2080a08fb6e4e5fc82b2894f93fe3903a3d341bdd6
 EBUILD libmaxminddb-9999.ebuild 886 BLAKE2B d5f7b28779a576a1a0d2046652ed89b149f89a17136751de7c9f2f699d64667ccc25edac1bacc24053dc4327880e03025d0983359c715be9c901cecca26c6de8 SHA512 0636f14a7390c502005ec72458b9e4421ecb3e04f996466a936d864f1d92341d4231d0c5461f0eecef92dd2c66fa5e74f1844eb13200343ef307334ecd17fc51
 MISC metadata.xml 365 BLAKE2B 3acd92dfb25bcbae837f784572887ffc5542121a91d6f2077f3410d03ddc3290d8b3485c4aa8d1c97af8f4f85a3dc8a621fc9eb5affacc1e27d41d4760ed53a4 SHA512 4e7a17cbf391683173f573d79f273e92184695e37bc68070c03ef4969e8b0e8a35a34b8b87d6582f365b93683b143f216a5a2365c9fe63a6f36ddd78e2ff8730
diff --git a/dev-libs/libmaxminddb/libmaxminddb-1.6.0.ebuild b/dev-libs/libmaxminddb/libmaxminddb-1.6.0.ebuild
index 2428e17f2542..5d3af3bbf396 100644
--- a/dev-libs/libmaxminddb/libmaxminddb-1.6.0.ebuild
+++ b/dev-libs/libmaxminddb/libmaxminddb-1.6.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	SRC_URI="https://github.com/maxmind/libmaxminddb/releases/download/${PV}/${P}.tar.gz"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~s390 sparc x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/dev-libs/libmirage/Manifest b/dev-libs/libmirage/Manifest
index 21a7f6ab6972..295b5e9e75d9 100644
--- a/dev-libs/libmirage/Manifest
+++ b/dev-libs/libmirage/Manifest
@@ -2,5 +2,5 @@ AUX libmirage-3.2.4-gcc-10.patch 1207 BLAKE2B 60104bdd6feebe1d654fe69ce7218c0134
 DIST libmirage-3.2.4.tar.bz2 234530 BLAKE2B 72329350a9e2a197ff52d396a011d3cf0178731909066ee1dab75f0d870fd751d50e2cacb69c849aa8045e94fa492732c21d201bdd4cbe3a9048f5c3f90ea881 SHA512 6fe718ad7beaf457ef0a7cc037b3bcf268574606ea9cbc1ba9abb5088c734fe9a100a35320d393a47625bbdde5515cded02e767618f2fc0801cf755af1414091
 DIST libmirage-3.2.5.tar.xz 229380 BLAKE2B ee73bf8418a209633afe7b30888c851cc0f206c03413d0b8d2717bbdb6fe77f3f32e81e1210931753cf453759ff7e4af48164866ad973b3a219381cbafd3d6f6 SHA512 f1247430d428b63734ab16328c3a484acab05fa2189b5979dc0e5759812190abd38b84bacc87b68f166f77cc88c3d4e9fb64ab0d7ec24c116c08d9314dd6b75b
 EBUILD libmirage-3.2.4.ebuild 1213 BLAKE2B d43481df1f7e1150c4163b292eb9586d0df99c78aca6fa545df6ef02445413b8a728a31ba013a825fffb458434e64305dd4d4c0b43b7336e66087433cdecf584 SHA512 1f262c22797a3df1f813eb1716d568fe192b869dcb1e7ccf7c63539d0ee8686ee1e972da6f597296842fdc8278395fc8bc731b2a941b2c6ef305ef22b2dc297d
-EBUILD libmirage-3.2.5.ebuild 1168 BLAKE2B b0686f882d6e047fa4698fc3cdc8f8d72bba375b60197a74205b0534c54be5cb7593b93a020b7bde563b80d940e43a6d8e45e21e02a2c22d19d59fa7842616a6 SHA512 fca50c501372b12b4f03862533a760e6217bb15006b86c0f6a6e624bb7c6ac740eb3cde2e07076a5e22c08b31a3b33e2d532a5488b461d885413df51ba6b5f3d
+EBUILD libmirage-3.2.5.ebuild 1166 BLAKE2B f8559131516bb8d14ca80027554e6dc97e2715ee3cf2d8757342fc89aeb2c7e1accb262864866e2f86a6863209d2c879d4c08fef63d7221f1d2d3fd538444eed SHA512 dcb7858727dbcb907a1b47251822484efe5e09ef0a3844fb53c0709c02f7d1d1614f99390cc715cfbb849f15738438ccdb6910baf1aae8a193a2366458575896
 MISC metadata.xml 332 BLAKE2B 0be8fdf09b872003fbd913a72966a059ad2d0870b281e6b86b19cf52f8c32b113d392dd71c85281f2f1abcb0933b592fb2112c18fe70359af7c7aacc9ff3a011 SHA512 d8bf249636b4dfda07c67e935bdd4b7392543fe31e2bf8c153954f4d680db45b0090f9bd89399f0241554a311b604185737c2bb7e64df43ea25adda9ee7468a0
diff --git a/dev-libs/libmirage/libmirage-3.2.5.ebuild b/dev-libs/libmirage/libmirage-3.2.5.ebuild
index 9625ed04c5a2..6c4473dd19e2 100644
--- a/dev-libs/libmirage/libmirage-3.2.5.ebuild
+++ b/dev-libs/libmirage/libmirage-3.2.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.sourceforge.net/cdemu/libmirage/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0/11" # subslot = libmirage soname version
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc +introspection"
 
 RDEPEND=">=app-arch/bzip2-1:=
diff --git a/dev-libs/libofx/Manifest b/dev-libs/libofx/Manifest
index e4ec5e5ffebd..45d3131dc8b3 100644
--- a/dev-libs/libofx/Manifest
+++ b/dev-libs/libofx/Manifest
@@ -3,5 +3,5 @@ AUX libofx-0.10.1-opensp-libdir.patch 1216 BLAKE2B 504ef0fd3a06539d1ec3590c0613a
 DIST libofx-0.10.1.tar.gz 226512 BLAKE2B bc0fa1ea0d5c7968730b50b9163a045304dd82f7e312e407ce9393a56ea6b1f9d47382b1299ee990640b98d5f047656aa38a9a8da4d8f19d3bea0236e0487cf1 SHA512 4575424abb56b93021ef223f90460979b544c32b4624936bbad16d0b5711afb6b5fa31b7c2cb835ff7a26be8c7ac51951198e5565a098713b8d33f0e17be774a
 DIST libofx-0.10.2.tar.gz 225043 BLAKE2B 2ca8cdd9913f2bddb60600d75acfb114d56d6c59191fe2b836a0c2a988b6d0404821a9f99be1fa4b258afbbc35b0cb254b348a1e7a0f7a8c4010645afff52f91 SHA512 14ba2779d94209312a8a1bbf598e6a31820df4fa7e222ae1abb8d4234a6c7ba7068e06a73ad4ee93bcb53ccb99a8007d799d9e66a9921704dc75c84b0e7dc307
 EBUILD libofx-0.10.1-r1.ebuild 1239 BLAKE2B 83292626ed46b5c33d6d50fa02e8f564a906040d225c525de948f8eaba3a617aec3e50a3ad06328b7cbc42a3df539489dcf9ba519c61aaaff554657a40a5c06b SHA512 832c114686f8c26d72af61de21bd165e3a6bedb128de84cac53b5cd1e0177420fc6a0928dda3aec320e5f5925f1575ebe2a870629fa3cf08e5a45f482e013631
-EBUILD libofx-0.10.2.ebuild 1157 BLAKE2B 3c53d2e9540cd5f0e97e1ba9b17fb4a82b0f3bd900f757c99cd63c3a92363cbfe02632db68469a5fe1b3bdd73d08323d1041376321746c2dc392b9303498843b SHA512 002c21658a1d11af11de67fdca9380e489fc74991b6cdf2bc50f4396cf4b1acdc9407aba9a36206242e31213f6136b59241edf06f53a04505c1bd0bc96411a6d
+EBUILD libofx-0.10.2.ebuild 1154 BLAKE2B ae6eb8bc734361c773269476dbb50424575a74ddc28ff487a8d97a9ba816c5faab98cec8ae3ce8613291ce635e39aaee9747b26f419c18df28be83551982b22b SHA512 366671d6f3aed9dca56e113ca9ae0052bf77f683db0c57509cf72a708daf76db8dbafc9bcb10adfe7f69b6e2e4682c21f6ecdac22c6f1001a16e7e9563b45d0f
 MISC metadata.xml 296 BLAKE2B 8c2ee36fd8bf974eaef2eb12ba873f5459d71b0dd9a161740f70bbb9e157ff6aac8e82457a30f8e00d1fc502aa4b186f31fdd97bd83ef4c54970aa751d379d54 SHA512 a95d11edfc43b8a9ea3bac90eb1ee87fa9e73388ac87eb9f8fe8773e7558bb9b761482355a841a784baaa9d0ca69a2ee08274392adc852e03594cb4d1bd7f60b
diff --git a/dev-libs/libofx/libofx-0.10.2.ebuild b/dev-libs/libofx/libofx-0.10.2.ebuild
index ae5c04394d48..3f8f6d55f1ad 100644
--- a/dev-libs/libofx/libofx-0.10.2.ebuild
+++ b/dev-libs/libofx/libofx-0.10.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/10"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc ppc64 x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest
index 3b5dea0e21ae..9d51c2f376fb 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -1,4 +1,6 @@
 DIST libpcre2-10.36-patchset-01.tar.xz 1364 BLAKE2B bfef3c876a092e06972107b44794c23b758a030181f3040c8b722db166789eac794783169b468fc71334fd660bc2f1c31422a8cb8e5bdc18a69b72654b1b59b2 SHA512 04324d1efa6d155fa3ffbc328638e4674bea305fef7f57d4369ab4a6399a0f489b4c0ecfb49643feff310d91872e1673e965c48a5c60f1bf54a319f0d275c306
 DIST pcre2-10.36.tar.bz2 1722310 BLAKE2B 5c70b7b1b0644edbcc29d3486fc0f3e2d0cb4822f4f3f3e7df603b4f4e27656a2e7f71389628ceb9bd7acc746ce4b626cd2a128d894840b22796841d1269765f SHA512 fc2a920562c80c3d31cedd94028fab55314ae0fb168cac7178f286c344a11fc514939edc3b83b8e0b57c872db4e595fd5530fd1d4b8c779be629553e9ec965a3
+DIST pcre2-10.37.tar.bz2 1729384 BLAKE2B b4e56041010d7f44e84a63a17b35e87329d258107d8b27ccead10f51e7deacc93cbee64a22c71b9f0b8f244920b3a22fa4d9b786ec441a428e0ad0bb8535773e SHA512 69f4bf4736b986e0fc855eedb292efe72a0df2e803bc0e61a6cf47775eed433bb1b2f28d7e641591ef4603d47beb543a64ed0eef9538d00f0746bc3435c143ec
 EBUILD libpcre2-10.36-r1.ebuild 2482 BLAKE2B a569108de5f728ff394048a43b3b2fbe4dd0007da77d0edfa04a5fd973822658e138cbe48ef700a07b8a19b2993e44fce9fb0aefb50cabe285338a63f7b23bc2 SHA512 33af5c3113fadfd29ed6d9d56110be92b85d5cc905e4cbcf69606ef1b797285558106b72135b8abd07e720c0348b1ef7e17dc82ae0243590a5b5ffd314f370a6
+EBUILD libpcre2-10.37-r1.ebuild 2598 BLAKE2B 917fd2653c78a6472026a1d53caaf0a02352e705f831e26223ca4a22c98a08235422d611e780a7fd98961e3b50874da96ed33a54346ad0b13b5420f566d22ab3 SHA512 9c316a1a3d9965a9de317fd610b92e852ee5f3ba2b111b9d351cbd728718637a5427595b24d19fef95c4a2b3bc3d76720ee6c70ddeb3f4755ec446c7f6fa2def
 MISC metadata.xml 1140 BLAKE2B 19f0ea04c9613f0c804c76ca74012fa2313ba69b57fe95f31720809a12d5244f78e4ce9c957723b848f0d8c3514ef27fd875f7814d2434c7e50dbcc7325c0a95 SHA512 9b54ed8cdf78e1d3fe737460117cb840280b63c196cca0bfc7b89975ea8102f9729cf5f29628f5cb7b7c1eefd8fd5c67f3c7f5fab64f9d168d6fcdedbd926b51
diff --git a/dev-libs/libpcre2/libpcre2-10.37-r1.ebuild b/dev-libs/libpcre2/libpcre2-10.37-r1.ebuild
new file mode 100644
index 000000000000..12ac913d688a
--- /dev/null
+++ b/dev-libs/libpcre2/libpcre2-10.37-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool multilib-minimal usr-ldscript
+
+PATCH_SET="${PN}-10.36-patchset-01.tar.xz"
+
+DESCRIPTION="Perl-compatible regular expression library"
+HOMEPAGE="https://www.pcre.org/"
+MY_P="pcre2-${PV/_rc/-RC}"
+if [[ ${PV} != *_rc* ]] ; then
+	# Only the final releases are available here.
+	SRC_URI="mirror://sourceforge/pcre/${MY_P}.tar.bz2
+		https://ftp.pcre.org/pub/pcre/${MY_P}.tar.bz2"
+else
+	SRC_URI="https://ftp.pcre.org/pub/pcre/Testing/${MY_P}.tar.bz2"
+fi
+
+if [[ -n "${PATCH_SET}" ]] ; then
+	SRC_URI+=" https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}
+		https://dev.gentoo.org/~polynomial-c/dist/${PATCH_SET}"
+fi
+
+LICENSE="BSD"
+SLOT="0/3" # libpcre2-posix.so version
+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="bzip2 +jit libedit +pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
+REQUIRED_USE="?? ( libedit readline )"
+
+BDEPEND="
+	virtual/pkgconfig
+	userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+"
+RDEPEND="
+	bzip2? ( app-arch/bzip2 )
+	libedit? ( dev-libs/libedit )
+	readline? ( sys-libs/readline:0= )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/pcre2-config
+)
+
+src_prepare() {
+	if [[ -d "${WORKDIR}/patches" ]] ; then
+		rm "${WORKDIR}"/patches/pcre2-10.36-001-issue2698.patch || die
+		eapply "${WORKDIR}"/patches
+	fi
+
+	default
+
+	elibtoolize
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-pcre2-8
+		--enable-shared
+		--with-match-limit-depth=$(usex recursion-limit 8192 MATCH_LIMIT)
+		$(multilib_native_use_enable bzip2 pcre2grep-libbz2)
+		$(multilib_native_use_enable libedit pcre2test-libedit)
+		$(multilib_native_use_enable readline pcre2test-libreadline)
+		$(multilib_native_use_enable zlib pcre2grep-libz)
+		$(use_enable jit)
+		$(use_enable jit pcre2grep-jit)
+		$(use_enable pcre16 pcre2-16)
+		$(use_enable pcre32 pcre2-32)
+		$(use_enable static-libs static)
+		$(use_enable unicode)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake V=1 $(multilib_is_native_abi || echo "bin_PROGRAMS=")
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		$(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \
+		install
+	multilib_is_native_abi && gen_usr_ldscript -a pcre2-posix
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/dev-libs/libpeas/Manifest b/dev-libs/libpeas/Manifest
index c57f97198e23..4d4d56a48969 100644
--- a/dev-libs/libpeas/Manifest
+++ b/dev-libs/libpeas/Manifest
@@ -1,7 +1,5 @@
 AUX 1.26.0-lua.patch 3695 BLAKE2B 16f370ea0707743db9a28cd511f6b9521d285bb37eb3a49d916fcce84965c84490253c1a30e729b21eb528b3a6397cab9bb372b9afeb22bed05e278048734bc4 SHA512 d8939b9a21b838db8e34ddfba7f54f17e88c4387cc3baa15f4df6386180677b419bb9989cecd8e0757442a45bc04f83bef06df5a8df86c17f6812a41044a7eb7
 AUX libpeas-1.28.0-tests-Explicitly-depend-on-the-GIR-and-typelib.patch 1384 BLAKE2B 7a79cfba318add238ec4d30c47a56de56bd3900246b8531b1e26242cb7a11c53fe711ea2839877afc75518a2f9e35d6d9d0c6731719d288dcd45dae53184e898 SHA512 9205686c1732e9915cc6131a32e3f9bb5ae3e7a7e9e3b62167391701203dda7463b754240311fd04d164cef3b7d79b8b36084db7dbece7c7c413c9e13d16550e
-DIST libpeas-1.28.0.tar.xz 191896 BLAKE2B 64fd65228b4ae4be59724a9e4b26133ed025866d0b7bf15377d579c87de1ebdf1225e3a2aeb004ae9733544cc53782c399581b5fb5f1625ef55532600d37afe0 SHA512 43f8bc426238f519d7a3b26409af2f7578e921893c085d00fab74699a45649d8343e5646658003980e6639f51e74f3b25519c3bbc248d5161b11c999f7dd0374
 DIST libpeas-1.30.0.tar.xz 193108 BLAKE2B 071e24530934605a6364816165d8f47ac9c94887e80eda9175b163d9af64b2624d42df75c7697220e888f2f9150c6e121bd1dc2716de5bcf0d392722938de945 SHA512 10ebcc61c8aa42b5f6892a74d5e02a52dbc8fe4c35280d78f41adc915dd9c08e9756608f8cbdbaf3d63c44074f0b9e9e531dd077ba201b416acfdcfb94b4bc42
-EBUILD libpeas-1.28.0-r100.ebuild 2040 BLAKE2B fb7fdcc138182770dc0e904aee6162fe6b9eeb873c139e309ae1a1a88fbf8c9fe76f9c50538fffa94c1b1b06ccb37ad078f854a3f8325f4429f1f6843256e188 SHA512 aeabcc490ab781cf1fe4ede74f724c6f9ab63c6b1f7bceb6ba768d51f87a1b4a455c059fda906a7d4e1a2ca7d4c7dd02f2c98d5c2ccd83079d5a51d5f1a197a3
-EBUILD libpeas-1.30.0.ebuild 1969 BLAKE2B 4a46bc3b4047f9597e5385f4366c6132bdaf0615dc6b0ff15ed4acd9081d16c542e3f2d7a3c54f3467fb2d379050b7ca74cb7a0652e863ac5885ebc00cbfdb6c SHA512 2175312d704f747450208ec0a423c985ad4d3de7ea5d92e2387acdd528a9428ffc8b5385a951721c4f82f38997566c499369747f016a7c35baeef323865f8775
+EBUILD libpeas-1.30.0.ebuild 1967 BLAKE2B 7341b999788c5f064aeb6c9c5a230603196b4dfd4a4c8280cfd9dbb6fa2406bdec4fd2594c60b23a925ea48bab9a29b7c2a0bdc80ab838e5cc7ab2a0fbb6a8ba SHA512 09f8a95941f6dafa3dfb524a05188507ff8d3dbe743acbb6366ba39ff0fbe28f01a2fd06a6eca86a479d5f0f8d58724b88db4ef2a3d57f99bdc8dac8e4670d29
 MISC metadata.xml 415 BLAKE2B c3e3dc9746663cd67cfb3a1b2e765bf5da73f9db2669ff7003b5e77ccbbe686780dd181727c3dd3d3f4c5f6e312daa1f36901896ff843cb81c687853340ef680 SHA512 4bf99a5c542cab95dadcf6db8aecbefa0be453f8851c2222ee698eec38c221f3b45b2ead6f87dd1d1ec5a233ba73054cf3b3d7b92d12ff4d88ee04a2057c50ea
diff --git a/dev-libs/libpeas/libpeas-1.28.0-r100.ebuild b/dev-libs/libpeas/libpeas-1.28.0-r100.ebuild
deleted file mode 100644
index f0e4f3205a53..000000000000
--- a/dev-libs/libpeas/libpeas-1.28.0-r100.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit gnome.org lua-single meson python-single-r1 vala virtualx xdg
-
-DESCRIPTION="A GObject plugins library"
-HOMEPAGE="https://developer.gnome.org/libpeas/stable/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-
-IUSE="glade +gtk gtk-doc lua +python vala"
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/gobject-introspection-1.39:=
-	gtk? ( >=x11-libs/gtk+-3.0.0:3[introspection] )
-	glade? ( >=dev-util/glade-3.9.1:3.10 )
-	lua? (
-		${LUA_DEPS}
-		$(lua_gen_cond_dep '
-			>=dev-lua/lgi-0.9.0[${LUA_USEDEP}]
-		')
-	)
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			>=dev-python/pygobject-3.2:3[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.11
-		app-text/docbook-xml-dtd:4.3 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# Gentoo-specific lua tweak hack
-	"${FILESDIR}"/1.26.0-lua.patch
-	"${FILESDIR}"/${P}-tests-Explicitly-depend-on-the-GIR-and-typelib.patch
-)
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	xdg_src_prepare
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature $(usex lua '!lua_single_target_luajit' 'lua') lua51)
-		$(meson_feature $(usex lua 'lua_single_target_luajit' 'lua') luajit)
-		-Dpython2=false
-		$(meson_use python python3)
-		# introspection was always enabled in autotools; would need readiness by consumers
-		# to USE flag it, but most need it for python plugins anyways
-		-Dintrospection=true
-		$(meson_use vala vapi)
-		$(meson_use gtk widgetry)
-		$(meson_use glade glade_catalog)
-		-Ddemos=false
-		$(meson_use gtk-doc gtk_doc)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
diff --git a/dev-libs/libpeas/libpeas-1.30.0.ebuild b/dev-libs/libpeas/libpeas-1.30.0.ebuild
index d011e421c633..ae87e0986133 100644
--- a/dev-libs/libpeas/libpeas-1.30.0.ebuild
+++ b/dev-libs/libpeas/libpeas-1.30.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://developer.gnome.org/libpeas/stable/"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="glade +gtk gtk-doc lua +python vala"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
diff --git a/dev-libs/libretls/Manifest b/dev-libs/libretls/Manifest
index 4edb0697c2ea..26f8b0b072fb 100644
--- a/dev-libs/libretls/Manifest
+++ b/dev-libs/libretls/Manifest
@@ -1,3 +1,5 @@
 DIST libretls-3.3.1.tar.gz 431233 BLAKE2B b935cae7bdd2e2338099dbc830e2773198d5d4ed12df80b89291d0eb8ae68549e36413c79ba1373d8bce8fd857c4a291fbd9bce30c819cc182bd5b68ac7b9527 SHA512 ddb4eb7c2c7e9cbb36ced17424ea0e08863488e6b3e18cd462ccc52b2eca685b5299f79ed6ba58ad4da2d742b61fa4857109a19137a1ee4c6cfdb48463080f4a
+DIST libretls-3.3.3.tar.gz 434208 BLAKE2B 74dd3d4e0a1aff8295b4c5023c2736006c2a8a0dab1e82457c5ec9d4c27ae57816557810b3a714bb5bbb9a560eb0dd5667af1097f1727878b1844a3e8bfa4323 SHA512 21128107ce833690f43400b11c2a841373bbe1f045a6db5ad6cbcbee181ddf97c173bb05ba41805ee0324d7435a52ad3027551f20083df9a3d052956a412bccd
 EBUILD libretls-3.3.1-r1.ebuild 661 BLAKE2B 9006ca31c4da0b05a40d756fe1b186bb956eee04fa2c6ea18992e2c6d9a683b38cdbf37c843ce1b8b5926fea97a97d9335794433d2ff37fc5083626f5e3136fb SHA512 2083dd6887e881a88ced7991b065f405f422429a5d68baf1879abf83c4d2027af12d9db2b14863d63199edbcd5c73127e4c063b846f273689c569712eef00a6f
+EBUILD libretls-3.3.3.ebuild 666 BLAKE2B be3cf83d03c882f096a7ada66fad4bbe4510552d2d4913891f46f6b4ae2a11e95ad7389115a9c36d6d73f85ef520d0af33cfaabd3be0a1dbacb4e62c2538beb8 SHA512 30c8f0c9c12b2f20e7e1d0f2455796d90e911a5439f3f9da07f43a9681cc794969af468aca4da10c150e5f628eeafff436bb9282eec37a6fae72e509123c75e7
 MISC metadata.xml 360 BLAKE2B 5cc82f43a10ff14c4f5a8defdd77defdc89b74370d49775b3fa25226ff25303f3ad276a91f90f44bb1a58f4a29ea4936a9f3bf455c16190de039e407442bf596 SHA512 c250f62e9f43df69fda74d9a276f4ec7f314522ee3a7b32cee360339bebbf7c6bf63008b433e45fcc441d01d6a363f8447a38edca9243eede7e1b6146e7b3c70
diff --git a/dev-libs/libretls/libretls-3.3.3.ebuild b/dev-libs/libretls/libretls-3.3.3.ebuild
new file mode 100644
index 000000000000..1611d59e200f
--- /dev/null
+++ b/dev-libs/libretls/libretls-3.3.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+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/libsass/Manifest b/dev-libs/libsass/Manifest
index d28a7b8ac9ee..336210f42a26 100644
--- a/dev-libs/libsass/Manifest
+++ b/dev-libs/libsass/Manifest
@@ -1,6 +1,4 @@
-DIST libsass-3.6.1.tar.gz 333609 BLAKE2B ea6cb0285a6d741614bb900ff0f3b74660c74ec9ed071abf2d980bfe3f55b02fa2873d3860e5b767ca82b5f202f3d2aef28b73357bf8d2b3117c925b4dc78791 SHA512 e9a3a30851e26145d049c4b20951c663a9d48c781a732acd3cc2cdb30df3449e445b57211f666b58afa137431fbdb149add48ff8a0dec92bd8abb514c90adebb
 DIST libsass-3.6.5.tar.gz 342426 BLAKE2B 8c6bb37da3f832dd462408a7ef4f80384e468295fc420b3d915899e65fb89a9d0b4c1cf0653b7288fedbf6a66daa2943c2911ad2c310f77a06deb84bec1d3abf SHA512 98cc7e12fdf74cd9e92d8d4a62b821956d3ad186fcee9a8d77b677a621342aa161b73d9adad4c1849678a3bac890443120cc8febe1b7429aab374321d635b8f7
-EBUILD libsass-3.6.1.ebuild 1116 BLAKE2B f1174691608a060b863409ac34e986c11bb93b2c303065ea39dde346b4b4b5305629f52a1c6ec1c9b76d602610148d51a8c3a2b9c4115ba6b9c342e46ad9a8d6 SHA512 3d47a99032af3fbdcd6542675c896d330c68c8d36f1844dc5425b3fc5601228a22283812fc0b0743a261e103dabcfc2bcb5b0fd4e30a2bb5ff6ca8812f93ea1f
-EBUILD libsass-3.6.5.ebuild 1126 BLAKE2B bbefe2fa8209883f070511b083dea9c288882a8f310016999cf89d8bc6684ecf7b98f7ddded6422f202a24d326e09246c0d6625481e1020bc415f66a026b51ea SHA512 7cbb23f3110bf0f77d8c9eb5f340affd585765b608df598996e9dae2150a244f537ee2eca21dfd01f165437d7b384be680003e06e36034ee40a39a77d837e837
+EBUILD libsass-3.6.5.ebuild 1125 BLAKE2B 99a65cca178866d7a3be04be577cdcad1b187ed5413bf93e1070005daecae3709f0f7421ca339b39a56d6628a70c3d4d12eb563c6572f9397fcca541e94b86db SHA512 0ba3b387eba29e589bf9d8768d097e4d56973ccec848a1d63c3167a25fe6ccd9cfb3865a774ce6af858b9f378bed6aab4713022baaa6cfa9d679ea785840529a
 EBUILD libsass-9999.ebuild 1122 BLAKE2B dd8f690a7536279a14bd0bd839c7db6d19e7b64d6541aaae28b546754039b77dc1f765f40792e4e06b5a12439a827da9b0f46ce2fa1ae026a718d9c4d3b26122 SHA512 4015051e835f2f73e19f78d2d6d65146d904cc1683432065fc13c68a3860767102e11aa5be5f13dd17260718e47ebff4bd92c0908a72bf95eea7966c433bdc13
 MISC metadata.xml 646 BLAKE2B 7dbc39b7729868f912149eb31c37836ed36f5547ec1311a203828425eb3c2c37fa5e03d5e5a8a66bc8f043b58766a9482b2b2582a031f0c2f8adc2c3543d5646 SHA512 f9b5434ef5ee1fedf1ade9bf69193729c9e9e66763c772fec3bb597fbb1149462c82eb5c4a6ab7376c9cc58a050931a8b2d4a33c979d38bc8ef06a86b42d5780
diff --git a/dev-libs/libsass/libsass-3.6.1.ebuild b/dev-libs/libsass/libsass-3.6.1.ebuild
deleted file mode 100644
index a6a6a9e84e45..000000000000
--- a/dev-libs/libsass/libsass-3.6.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-if [[ ${PV} = *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/sass/libsass.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/sass/libsass/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux"
-fi
-
-DESCRIPTION="A C/C++ implementation of a Sass CSS compiler"
-HOMEPAGE="https://github.com/sass/libsass"
-LICENSE="MIT"
-SLOT="0/1" # libsass soname
-IUSE="static-libs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-DOCS=( Readme.md SECURITY.md )
-
-src_prepare() {
-	default
-
-	if [[ ${PV} != *9999 ]]; then
-		[[ -f VERSION ]] || echo "${PV}" > VERSION
-	fi
-	eautoreconf
-
-	# only sane way to deal with various version-related scripts, env variables etc.
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--enable-shared
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	find "${D}" -name '*.la' -delete || die
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	dodoc -r "${S}/docs"
-}
diff --git a/dev-libs/libsass/libsass-3.6.5.ebuild b/dev-libs/libsass/libsass-3.6.5.ebuild
index 073da665f7a0..43b2169bf798 100644
--- a/dev-libs/libsass/libsass-3.6.5.ebuild
+++ b/dev-libs/libsass/libsass-3.6.5.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = *9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/sass/libsass/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+	KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux"
 fi
 
 DESCRIPTION="A C/C++ implementation of a Sass CSS compiler"
diff --git a/dev-libs/libsecp256k1/Manifest b/dev-libs/libsecp256k1/Manifest
index 38903953dd32..0049a6c04e78 100644
--- a/dev-libs/libsecp256k1/Manifest
+++ b/dev-libs/libsecp256k1/Manifest
@@ -1,5 +1,5 @@
 DIST libsecp256k1-v0.1_pre20190401.tgz 166663 BLAKE2B 68c9fc3fda6af56452f32edeae5dcb5a92f68bc3fb39a397c532951c6392347df14ea0347bbe05cab43158512e0d9f5ea87bd8f69bece1b04440860ebb8065ee SHA512 8c4945e93cb5ff241482ba4426b25162a7ae3b26860edc10c91d06b1c396887202ad971f4d38e035828352531b87fc29087a12b675e43da44f23c9ea3b6c0cc8
 DIST libsecp256k1-v0.1_pre20201028.tgz 200051 BLAKE2B 90d636049b411e02703feb2661006900a55f952f60e76e2b7147a5afe8e391a06a80d6ae1489b1e7f2382176c7ea831526465a85bca09156dc6d37b417fcb33b SHA512 54a0fa21b64dd6836e4227de51f3539afe06e0e2f352683397d6adb5dd0508af443d2e25f91e90e1ae366b261965fe7d438292314705baee799cf37421644958
 EBUILD libsecp256k1-0.1_pre20190401.ebuild 1577 BLAKE2B f1472ea251a7f43a7c6a96aabcfcf34481d55b1f43afaca01293326c1d19cb0debf9d9a258250b6f045060d4827ada3b6f0644f2029e1d37ef7349833136dbc1 SHA512 ac2c63c0db252ca605ce4d2f99de32a66ffd24d6658eb23692d5380f02507e754b2135c5de562dcc98c689c32eea8edb85b6976ab3cb5c9814088f3e9cf5e8ac
-EBUILD libsecp256k1-0.1_pre20201028.ebuild 1913 BLAKE2B 6fcca920c51a4cae6f483508575827cff4b00159610f3966d37ce1f7a87535e0e59ac22fe5a5172b49cb3597179fa3019f2a40136a48ef5dc76f358c54ca6c2f SHA512 e36565cc8b4c11c67ce2e10c77f7e486b41275828926e731d4b150aa0385c252a79121241bb2564ccce5d3adccc33dea6c8a580bda27d14209fd1d34d1d4dc26
+EBUILD libsecp256k1-0.1_pre20201028.ebuild 1911 BLAKE2B 3d222fe811adfc6df26d7a7271c72b3d4d39c39742be1046e814028d1a97d68a2c3f5399ce13f3df04cb13cb46843be20b9218355e4ef105a305493d25d90e55 SHA512 b6daafabdb58adc46dc973ba56cdb50fe9cff927ae67b9fdfe5318c0a84ad473f33890fed8afc58247fe734359151468bfbc5225436bc11ddad5aa7631e56080
 MISC metadata.xml 1368 BLAKE2B 25830c79e9859725ee995ee20c9a68a2de168ee0d9bc280b0111aa92c921a03ca72f86e8d327c1f2706e4cba5bd10d89d19e0d385db8a9d0851c4c9e184e220c SHA512 4818fb096c836d952a2619c4f63bbe02601f92c3b730121115965aaac50f6568d06e6d5940cd770a3e252dff30ce692b0805f4edf324f1cfe0cade504cb2c284
diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20201028.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20201028.ebuild
index 12f1a6b089ae..b78335558ac9 100644
--- a/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20201028.ebuild
+++ b/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20201028.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/bitcoin-core/${MyPN}/archive/${COMMITHASH}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+asm ecdh +experimental +extrakeys gmp lowmem precompute-ecmult +schnorr +recovery test test-openssl valgrind"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libsigc++/Manifest b/dev-libs/libsigc++/Manifest
index 4e552b466d78..13cb766f28c6 100644
--- a/dev-libs/libsigc++/Manifest
+++ b/dev-libs/libsigc++/Manifest
@@ -1,9 +1,5 @@
-DIST libsigc++-2.10.6.tar.xz 4791016 BLAKE2B c50283da7eb3ec1b595514ac805c5fe0b4f7687ec77478c7c703ce8915ea72e065f4e7cbe53fb90c13b81d266df74cade8f5a5c0ff2dcc3880e852f02508eaf9 SHA512 7dd57c061defe323de5721d187145dcf63346311d8993eb6346a33789f26c8509c1bf5a73d55776cc5ebe85fb14d54107553a652dd42f452aed6aed20047b549
 DIST libsigc++-2.10.7.tar.xz 4791304 BLAKE2B f3e41a753097d55d2e6f47407033139733dc813d84ffa8ba97ca94dbb2f1abc714a541fd90347c1477736eb9be109dd25d5ffc9998430b7d0fe9c627a9b2cfde SHA512 075f120f7261eac020a92956a4b2d8bfa380a63bf4e78d057d93b035dcb0590df1ee1e2d3af59edf97e3c30cc01359d259d24e4fc69bdb99952d4c9c02eb6015
-DIST libsigc++-3.0.6.tar.xz 789916 BLAKE2B 54d8dccd245a1a2c8bde34eb937eb536b88f36ee15eedd8d2ed0ad1b19933600d04669f9082053ba20543d2195e8833b46a2056055da23fc2ceb1784d5c96cc9 SHA512 4ec5319eda5c0809f1971044152ec7aa142742941644f43ec3944b248667d5694b97a30de8ea0e2260265bbf26a2ffdefbfa8cac5016799d26b92b02411b1c51
 DIST libsigc++-3.0.7.tar.xz 790604 BLAKE2B 2363fda42744c3c4a2c31f236a2160f8dd63bae098e8190e2ef20acc23296de26cb7c275b928785c99c33d23f15709e411dc51f973d4fdd6a0556b11b0031512 SHA512 0ce4b56d85ccb0041096e2241523b9ca5bf0fd52f9655d2216e2280d5902075a4685023aa60058eb8ee9b7ed0ffc945d652940b0bda73f2fc7ce4de7371ca984
-EBUILD libsigc++-2.10.6.ebuild 1377 BLAKE2B a98f755e46f8b2c9c7e6618e6701be08905008bce599f3351663af2bc642c6a1e7b196a3803badfe2254380fe470ebe4ce03cea0fdae591012aa95f2674e3d7b SHA512 014c99c199e16540c482d2d02af97b6a5380b2e45c9cdfe63a122ef668eb53bd41c4e84074c1efb9bf1a5084eec348ff93caf566efa1c0c4f8f4914f8face3d4
-EBUILD libsigc++-2.10.7.ebuild 1384 BLAKE2B 04c117e9167bd6cfcc22837c2b85bba7768daecfe4ed1c54247e94e072aedb87d7fa5eab6d4f675a67cb457d3dabdd06d204439c9f92ba0242112f22a31f56eb SHA512 aed2014594c5f24b5175bc1f456ba45358d03e66fd3d6f215917cefd81d468ba7317aacafefa14965a64f9feba2c668124a746b3b8d087cfd07c55d6e05db1b9
-EBUILD libsigc++-3.0.6.ebuild 1340 BLAKE2B 2a551988a508fdfb9961488986a7b1eb8d6b97c3937b3acac3a7f5318b47f48d4d7a6210d6741e3ef47f6c7767b5b4e156b037cea9affa446c7a7c54f0673f72 SHA512 6c3b0bc74194d73eee059a50ad9de20b277d81b66b57b5ea5c2f34183409ce09cc7bfc7c932cbfee17b84438c4094db13101a7211c4226a482ff22297f65c756
+EBUILD libsigc++-2.10.7.ebuild 1377 BLAKE2B a98f755e46f8b2c9c7e6618e6701be08905008bce599f3351663af2bc642c6a1e7b196a3803badfe2254380fe470ebe4ce03cea0fdae591012aa95f2674e3d7b SHA512 014c99c199e16540c482d2d02af97b6a5380b2e45c9cdfe63a122ef668eb53bd41c4e84074c1efb9bf1a5084eec348ff93caf566efa1c0c4f8f4914f8face3d4
 EBUILD libsigc++-3.0.7.ebuild 1340 BLAKE2B 2a551988a508fdfb9961488986a7b1eb8d6b97c3937b3acac3a7f5318b47f48d4d7a6210d6741e3ef47f6c7767b5b4e156b037cea9affa446c7a7c54f0673f72 SHA512 6c3b0bc74194d73eee059a50ad9de20b277d81b66b57b5ea5c2f34183409ce09cc7bfc7c932cbfee17b84438c4094db13101a7211c4226a482ff22297f65c756
 MISC metadata.xml 330 BLAKE2B 0b22bbb61c537a54f586756a026c3928e861873d2c6455e4792109180381c6a7bef00fa64037d5ec21da81ab7edbc6aaaecc784d66407db09bcb6613fb7b0be8 SHA512 541cc8c579c995b2b31cb5534205f7cf7c5d68b9b098fc90c96662c02a20cbd55ddbd9c25bdc19e6494620aa5847ef87035022174d35204e442a7487cd56025e
diff --git a/dev-libs/libsigc++/libsigc++-2.10.6.ebuild b/dev-libs/libsigc++/libsigc++-2.10.6.ebuild
deleted file mode 100644
index 4133034c604c..000000000000
--- a/dev-libs/libsigc++/libsigc++-2.10.6.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic gnome.org meson multilib-minimal
-
-DESCRIPTION="Typesafe callback system for standard C++"
-HOMEPAGE="https://libsigcplusplus.github.io/libsigcplusplus/
-	https://github.com/libsigcplusplus/libsigcplusplus"
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc static-libs test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-libs/boost[${MULTILIB_USEDEP}] )"
-BDEPEND="sys-devel/m4
-	doc? ( app-doc/doxygen[dot] )"
-
-multilib_src_configure() {
-	filter-flags -fno-exceptions #84263
-
-	local -a emesonargs=(
-		-Ddefault_library=$(usex static-libs both shared)
-		-Dbenchmark=$(usex test true false)
-		-Dbuild-documentation=$(multilib_native_usex doc true false)
-		-Dbuild-examples=false
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# Note: html docs are installed into /usr/share/doc/libsigc++-2.0
-	# We can't use /usr/share/doc/${PF} because of links from glibmm etc. docs
-	if use doc; then
-		docinto examples
-		dodoc examples/*.cc
-	fi
-}
diff --git a/dev-libs/libsigc++/libsigc++-2.10.7.ebuild b/dev-libs/libsigc++/libsigc++-2.10.7.ebuild
index 444e6596071e..4133034c604c 100644
--- a/dev-libs/libsigc++/libsigc++-2.10.7.ebuild
+++ b/dev-libs/libsigc++/libsigc++-2.10.7.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://libsigcplusplus.github.io/libsigcplusplus/
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libsigc++/libsigc++-3.0.6.ebuild b/dev-libs/libsigc++/libsigc++-3.0.6.ebuild
deleted file mode 100644
index 9915fc5555e0..000000000000
--- a/dev-libs/libsigc++/libsigc++-3.0.6.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 gnome.org flag-o-matic meson multilib-minimal
-
-DESCRIPTION="Typesafe callback system for standard C++"
-HOMEPAGE="https://libsigcplusplus.github.io/libsigcplusplus/
-	https://github.com/libsigcplusplus/libsigcplusplus"
-
-LICENSE="LGPL-2.1+"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	doc? (
-		app-doc/doxygen[dot]
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-"
-
-src_prepare() {
-	default
-
-	if ! use test; then
-		sed -i -e "/^subdir('tests')/d" meson.build || die
-	fi
-}
-
-multilib_src_configure() {
-	filter-flags -fno-exceptions #84263
-
-	local emesonargs=(
-		-Dbuild-examples=false
-		-Dbuild-documentation=$(multilib_native_usex doc true false)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# Note: html docs are installed into /usr/share/doc/libsigc++-3.0
-	# We can't use /usr/share/doc/${PF} because of links from glibmm etc. docs
-	use examples && dodoc -r examples
-}
-
-multilib_src_test() {
-	meson_src_test
-}
diff --git a/dev-libs/libsigsegv/Manifest b/dev-libs/libsigsegv/Manifest
index 55fdba6cbf46..e07006b0940a 100644
--- a/dev-libs/libsigsegv/Manifest
+++ b/dev-libs/libsigsegv/Manifest
@@ -2,5 +2,5 @@ AUX libsigsegv-2.12-skip-stackoverflow-tests.patch 461 BLAKE2B 021932c6eeb8a4a3a
 DIST libsigsegv-2.12.tar.gz 451408 BLAKE2B 3f2f37965dfdd5f8a7db3d5baff975003200e7ab157498524f8c99c60c285a5a8a1cf978ff3a69977d52604dc44493ac6d6d00476fca3380b285282b35873f99 SHA512 27986e8aaf4357ed131032aa7c281a5a28c5759530c62bb76f034aea33959547dcaae805e06347a1f532f0488b72fbbbdac4400f74e8d3f2128511526e8a5913
 DIST libsigsegv-2.13.tar.gz 460736 BLAKE2B 2202ef92e96b2b46d7496a69427159b06b0413e9610daa9bc035dd18f193fd650a06dcc5a2db3b36b6c68f95593f2da047579e644d5ca4e54bc17160a57dac8f SHA512 9c0cf01ee2a39f77f2e42eb06a2aa60644e10fe2cd39089de58f6206baf7fe7d61fe0ec6bf187276fcfccf61585154ce904fe374b474b7ba9fa050a61a2f3918
 EBUILD libsigsegv-2.12-r1.ebuild 759 BLAKE2B 0f1e96575db99253cb02f48d14a9f07918094b8a25db274b33e1ff07d5d35b50df5658f17426db1934f2aaa8ef6dd03ca03531d6f0c843b9ed46ed5da5c02ce2 SHA512 e7941e5ac2866276883a8fae1bd4191197ca52acf1aaaa242850dff627b80ed3487ce597e14e3e1eb626eb036bbf3898beac4f8900b256c9e8fc39fb8bf0baf3
-EBUILD libsigsegv-2.13.ebuild 797 BLAKE2B d7a07942e11ffc9db6518450e738fe679175d6bf5191e6eaa2b78def3272877e5418f3c8006af7a6d1676bd7086f29e98ce8985f700c9b165bf3357a1c573006 SHA512 9f825cb3cff2b8b073eb34b571d8eebbd062cd1dd54a95576cb5e7936b5ba5776b8660d44f9544453a77d002909b48cb73f599eaa3e607fe9319dc8c890c0fd8
+EBUILD libsigsegv-2.13.ebuild 791 BLAKE2B 8f3a4d33ab025e5cd17ddb47935ce0f54b9452225ef725a81f0ec913b960b345ea1babe806d5c49cdbfc07c53b8b56160191abea09790d86c31404429c1cba7d SHA512 a90dc63a18979905986ad35e44cc8b98cbbb678bbc8bf84c5634c447ec493387786ab58587176d75c9914b9c009783b3bfffbb3442593314d4ed4ccd88e06eef
 MISC metadata.xml 811 BLAKE2B 648cadc6a317684a62fcdeceb885b3bb153841d57928e19a84ee20a0c0dbd8626343fecb6cf2367ef195cab26b9909c6c129a4a2afc999353300b48911317711 SHA512 7f985e3e2e50e351fc14e4932f30ceab0989346183ba87c0dd16a3dc874dd0e5534984e4bcc327dc1a4c0d15e78c89aeb8491b5a8c8789b6ae42dfdb89c18fb2
diff --git a/dev-libs/libsigsegv/libsigsegv-2.13.ebuild b/dev-libs/libsigsegv/libsigsegv-2.13.ebuild
index 2f6d0e7207e4..39ea9cb5d0b9 100644
--- a/dev-libs/libsigsegv/libsigsegv-2.13.ebuild
+++ b/dev-libs/libsigsegv/libsigsegv-2.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/libsigsegv/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 
 PATCHES=(
 	# Bug #363503
diff --git a/dev-libs/libsodium/Manifest b/dev-libs/libsodium/Manifest
index a8211f1c23cf..bb7aafe8ac2e 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_p20210421.tar.gz 1855069 BLAKE2B f9b5843998b0045f97a303589de42b38a7586b4a35571eec9a0b0afd1df101467cb8f82e9a32dbdb9a25058d827a5565ad8d49ad2216d2b6af5b101612a94080 SHA512 ddb77c0608a7e6cacf1923a3d0f5950975511c46d53f6f9c23f80dd99eab84dde2a1292c1e35555f7f1659f25a1b80668516558b83c42effb921fff06c0fb559
 DIST libsodium-1.0.18_p20210421.tar.gz.minisig 311 BLAKE2B 12d00384a2acd9c9ac5cfc2ce984c2254a69be93f9cb891513c2f575fbc0cd2c03c2f323aa4b363f54fd7e1bf6b73887c0919e919142f759f0f7baa8680cdba5 SHA512 80fe3a5d41a5550b310e1fce86eed142288c70bab46c761a21206cd0c441b9355d455df49916b3eca134af60444307baa8c5566f1ea369e79f7326a6fac822bf
 EBUILD libsodium-1.0.18.ebuild 1556 BLAKE2B f2f3c2e042a14f76b944219175597afb36440eb93ae5e0ddf155cc219ea7fc554ce97b7c727ba147c9532d6999fca04eb8c68cfa446bf709be4f3966ef724d48 SHA512 7a036b36d982e96af60b5635629ae4bec2dea216e30b69d792e1bbbaabd77177d5d5e51a9eb5ecf5730948006f1ed23bc3be253662f7678a9d77af59c4308d8a
-EBUILD libsodium-1.0.18_p20210421.ebuild 2606 BLAKE2B 453f5c7ad1b968a5748ff6ec2ab2ef497eaa7ea7d2a97a64dc14e9867167e353b859128aff3723f84cc45549718e702a7db2e13dd8fcd349011eca5b261badd2 SHA512 76eba8aecdf9f0aeeecd76035cbe77ffb12daaa992e9c17f6c9b1d36cf44640850a75db292da04ce64eea10e2a7b861e486e08e6b88e8c9d7689661abe95789c
+EBUILD libsodium-1.0.18_p20210421.ebuild 2612 BLAKE2B 2aa57578e12e149c2b86896393a9dc9039b5c47548ed962cd65381a2db6ff2ca98d0a616a151afa14d2593ac896cc30d91beabf2170ab5d8b289707289929a0e SHA512 4cd7dee80fd529ee70bd97be4ae6314518b0d4d84a1200817db92f6c74763b12e07477664a8f4d6b5fdb00fab9d97ff8fb0662c858989d181613ee2f48fe5f15
 MISC metadata.xml 864 BLAKE2B 5776de362d73fafaf378d83f7c050cefced1e3659f95c87cd31ab4791d24a416004d806e14abff108a7c235b750c854d20342560372a6125564655303e098cc6 SHA512 e5ec535a7fe1a299357b7886d197bcfb7fe358cc010c89d8d030cf9a8250b3e5108e945aff5fda56014648969af33d32216c22b864ee68e1632cf08006ca95d0
diff --git a/dev-libs/libsodium/libsodium-1.0.18_p20210421.ebuild b/dev-libs/libsodium/libsodium-1.0.18_p20210421.ebuild
index 441dcc589707..3d4e4edcb0ee 100644
--- a/dev-libs/libsodium/libsodium-1.0.18_p20210421.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.18_p20210421.ebuild
@@ -31,7 +31,7 @@ fi
 
 LICENSE="ISC"
 SLOT="0/23"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+asm minimal static-libs +urandom"
 
 CPU_USE=( cpu_flags_x86_{aes,sse4_1} )
diff --git a/dev-libs/libthreadar/Manifest b/dev-libs/libthreadar/Manifest
index a820535c9b1d..9d9164eedcbf 100644
--- a/dev-libs/libthreadar/Manifest
+++ b/dev-libs/libthreadar/Manifest
@@ -1,5 +1,3 @@
-DIST libthreadar-1.3.1.tar.gz 441062 BLAKE2B 48ab120290f93c5585c1d1d9992f80836a27bf88bf250c74bff12cad7f87dd192a706ef75fe5b8815ceb2108c20d71dd932432bf37bf6ee3f01af4c3bf935647 SHA512 6eefe4d2262a170ed04e6e9e7efaae2945b68012cfed2e4606f0d6089050f3e4059d4dca2141ae862c158f5161c5ebaaa35c3eeb431fab10263787e5b74deddf
 DIST libthreadar-1.3.2.tar.gz 442260 BLAKE2B 2a743fbcd8ae0b462910b7ccde34a3fcb90239df9bf608c9d249dd9bf100315ade3b2151339ae55b1121709446c23044c3fd7bb420efb009ae8d5fe0a21a496a SHA512 6edc3a1a6eb41a3b9ada35327d712fcf3562875dbddd0bd2f3f016492cb0f10fe669ed1ac3a65573d88261b4de50201b2abe8dcbffa0abc5cc257d7a8c3c4df2
-EBUILD libthreadar-1.3.1.ebuild 916 BLAKE2B 4671cbdf194c1d90489e063e73a9187cf0ef1c4ab3409d18e62c3ac3d4cd64702196aebebc043cb4a869b6a95468833ce3aad2b3628732e37b52ebacb2dc8a81 SHA512 230032d451e5b4250cf55c45d1f53d34cc86a67d163dd3e8a80aba67086f6bbe995f143ab6cbb469f6a8fc80c5546efeb0ae660c3ea002ff9e69fd0163904d8d
-EBUILD libthreadar-1.3.2.ebuild 916 BLAKE2B 4671cbdf194c1d90489e063e73a9187cf0ef1c4ab3409d18e62c3ac3d4cd64702196aebebc043cb4a869b6a95468833ce3aad2b3628732e37b52ebacb2dc8a81 SHA512 230032d451e5b4250cf55c45d1f53d34cc86a67d163dd3e8a80aba67086f6bbe995f143ab6cbb469f6a8fc80c5546efeb0ae660c3ea002ff9e69fd0163904d8d
+EBUILD libthreadar-1.3.2.ebuild 912 BLAKE2B 48391b40e27a540218552b5abd895476a1bdba0aec771bd6385f56ae90ce5bb97f0971a11bf4133f4e16072dd8faf83e3404a384cd77ad144074b1853f8bcab1 SHA512 e383c7048c93936ef171bd945fa658350a81aac641a00fefc06b13cafd5bfa48ec0b2c3e20ea035e858c1772ceb7fb27425150a55fef2d60256c2591c2faef98
 MISC metadata.xml 889 BLAKE2B 461d6b835a6e98325f56d0287e302ed14e8cf2bd8ce16a918b2e2c041e7dccd39c62ea0426fe5f5b3ea40681077582cb130d816259d6b79ad8712e9b46bbdc48 SHA512 792b25f96d0107116a0ce2d2617356796052026aba471228e3c608c665c76f5f0319e38d6da2b5d0f4547ad6e31d8b7b8a1e9424a4b03f003806e1be5517a8b2
diff --git a/dev-libs/libthreadar/libthreadar-1.3.1.ebuild b/dev-libs/libthreadar/libthreadar-1.3.1.ebuild
deleted file mode 100644
index 7ba08a0fde3f..000000000000
--- a/dev-libs/libthreadar/libthreadar-1.3.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Threading library used by dar archiver"
-HOMEPAGE="https://sourceforge.net/projects/libthreadar/"
-SRC_URI="mirror://sourceforge/libthreadar/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS )
-
-src_configure() {
-	# Copy this comment from app-backup/dar as it applies here too
-	#
-	# configure.ac is totally funked up regarding the AC_ARG_ENABLE
-	# logic.
-	# For example "--enable-dar-static" causes configure to DISABLE
-	# static builds of dar.
-	# Do _not_ use $(use_enable) until you have verified that the
-	# logic has been fixed by upstream.
-
-	econf --disable-static
-}
-
-src_install() {
-	emake DESTDIR="${D}" pkgdatadir="${EPREFIX}"/usr/share/doc/${PF}/html install
-
-	einstalldocs
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libthreadar/libthreadar-1.3.2.ebuild b/dev-libs/libthreadar/libthreadar-1.3.2.ebuild
index 7ba08a0fde3f..f176144e28dd 100644
--- a/dev-libs/libthreadar/libthreadar-1.3.2.ebuild
+++ b/dev-libs/libthreadar/libthreadar-1.3.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/libthreadar/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc sparc x86"
 
 DOCS=( AUTHORS ChangeLog NEWS README THANKS )
 
diff --git a/dev-libs/libudfread/Manifest b/dev-libs/libudfread/Manifest
index dc160585f7f6..cc0de8f6be58 100644
--- a/dev-libs/libudfread/Manifest
+++ b/dev-libs/libudfread/Manifest
@@ -3,6 +3,6 @@ DIST libudfread-1.1.1.tar.gz 33546 BLAKE2B 2a9781d2db569ca5787b0fa27b75b790d21b7
 DIST libudfread-1.1.2.tar.gz 33744 BLAKE2B 1801d84a0ca38410a78f23e7d44f37e6d53346753c853df2e7380d259ce1ae7f0c712825b95a5753ad0bc6360cfffe1888b9e7bc30da8b84549e0f1198248f61 SHA512 3069feb5db40288beb5b112b285186162a704f0fdd3cf67a17fd4eeea015f2cfcfbb455b7aa7c3d79d00fd095a3fd11cffc7b121dce94d99c3b06a509a8977d2
 EBUILD libudfread-1.1.0.ebuild 811 BLAKE2B 54cee1ef1d58f4c9687b637df4dc4b73e2cceda6d7ff827ed596fb20d16cd5e3a41a5737ec925c9cc9921dfda8a07a899098feec971924e09208d5ad73fb19eb SHA512 2e4a53d0e6e8f96e1dd4d84113f44eac1d219c735f09aba53049ad2d8d2573475b833785296f9a763f881e793157abcb76eade9cc2db28e96563da617b0a8058
 EBUILD libudfread-1.1.1.ebuild 809 BLAKE2B 09b9f9c4276f1e5a47d9ec3eee61dccd8bb5ad08766836dcf383a1b64217024b865c5b6017ac12261f7b6939d2a7eeaf2bd48634eb573af62f2a3c49362c532b SHA512 32da6f506e59f8cf2554cff5e464d9450a10c73ccaf01dcde6150e99702e12164455fa23457710c7095785639b1a49097a41a4996d7fc758d69aaf88cef0828b
-EBUILD libudfread-1.1.2.ebuild 830 BLAKE2B d5828d070d851547b349e1310cf41e687b85c9fb58e7fbc074446c1da887e1219a24d62c5c0d367d0224a81880d2ef4a436586f88d0760ab61719dad63cd421d SHA512 fd98a3ad4f49d38f286e17094358c38bb3f557e2a56d13cfe43cb86bce5d251b47c349fd444379a50f6f31d82f207b737b56447db7fe1c382888dfa62b1c3c5a
+EBUILD libudfread-1.1.2.ebuild 825 BLAKE2B 4d8e2a78467213b8283c6ca7d677732c28d5918c90d645a915568546c8e6e7c88de0e3d4ca0fd48705280f18cd4a5ee15db02f766e6ff02d8e98703a787030e1 SHA512 9bdc79c93a67d9f2cbb57cee7a03dc893f940be5f349bbe8df3f57caf92339f410c3ee8d6c761c57ed36864040583de23474ee2e8f5e530642f2218bf4ac5e73
 EBUILD libudfread-9999.ebuild 811 BLAKE2B 54cee1ef1d58f4c9687b637df4dc4b73e2cceda6d7ff827ed596fb20d16cd5e3a41a5737ec925c9cc9921dfda8a07a899098feec971924e09208d5ad73fb19eb SHA512 2e4a53d0e6e8f96e1dd4d84113f44eac1d219c735f09aba53049ad2d8d2573475b833785296f9a763f881e793157abcb76eade9cc2db28e96563da617b0a8058
 MISC metadata.xml 254 BLAKE2B 28a36c4387e6a38145f39cc2a77ecabf1754b29efa32b7a3400b699432011196162823ee23a043d857a182fa32959a83c04fec021a151168d951687a65e91997 SHA512 953a590c431a9ac1ef877b81a589da36d36c396f06dc689bb5d62bd12e9a4e89175eb0a3142981df00ced8a50e08e6d122a734e31937a334176b782f17368d50
diff --git a/dev-libs/libudfread/libudfread-1.1.2.ebuild b/dev-libs/libudfread/libudfread-1.1.2.ebuild
index 53cb73f5648b..be5aad3b530d 100644
--- a/dev-libs/libudfread/libudfread-1.1.2.ebuild
+++ b/dev-libs/libudfread/libudfread-1.1.2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://code.videolan.org/videolan/libudfread/-/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 sparc x86"
 fi
 
 DESCRIPTION="Library for reading UDF from raw devices and image files"
diff --git a/dev-libs/libvarlink/Manifest b/dev-libs/libvarlink/Manifest
index f747de054138..0f9670c53284 100644
--- a/dev-libs/libvarlink/Manifest
+++ b/dev-libs/libvarlink/Manifest
@@ -2,7 +2,7 @@ AUX libvarlink-19-fix-meson-build.patch 1443 BLAKE2B df67a1f7b075e1c2ef91deaf881
 DIST libvarlink-16.tar.gz 56886 BLAKE2B 6c65199ced429eac733d1114cfad59c4514d299bd3bba0d4a9907498655545fd9edb9999428f39df936cd1e6710bacc08c04f05710e80f0ceb974b43809b9c22 SHA512 8152fc4fab4e9e829c2bc1585e479c23b0329c59da0be8712ff64dbbe01cde9630f228ac7edc06e9faa39dfd3d38007032ec6ed561e2363d4d33f65856f1a271
 DIST libvarlink-18.tar.gz 57708 BLAKE2B 035a3cad38d2429fa7a1bde049d6c5772ef10ef65040179839459d8672ef7fc619ff2a250ad48b108a9068c1f927226ad4ec08fa355b6c6f30a8ab8830422e9e SHA512 a0f2cfe6a3ce3e7c08b24436d4210691d6334ec903cb3d590627595ee3bda79bf4e22e7c72c7ea8ebe817e4e2b045f86d2603ae56b3fd7d429fd281fd7e5e2e8
 DIST libvarlink-19.tar.gz 57715 BLAKE2B 2175e2c9f053b7b4f4f7d8778c966bc4d39954b95c533296b6d1d1cea0e86a37634d502271fa4a5a6b70230725336c9aa152a11210f0b58435616e1a054033cd SHA512 395aaf08e5166daf31c1d3cd05ed7ad2982e817a022f2e6bf6512664f45107ed98c56d851ac098778f9018807ca98fd2903c1ee5aac387691d64610e46ea435b
-EBUILD libvarlink-16.ebuild 614 BLAKE2B 722d69431a69960ec702b12d2e517786f4f41c6451e8755a5c66cdcba63bc11dd1ae7ccfda4581afcf95af3ee5be5dc2d60fc24dd74a639dbeb3404a32ed86ce SHA512 9c4d527a1775c84c8d6acab718df04f497cc162d60aba0ea659b720aee81984b3f187d78c78512ca6c926ae8ad72320c7970d0632378662aadba8804798c6ed1
-EBUILD libvarlink-18.ebuild 614 BLAKE2B 1797a4622ae03f6a5907743ef3aa6d1330b933b2e941bb26b7cf9f904783a2a8ceba0a2a4bdd6af4b2cd2f3e3f3a30f916fc087e660b73a63f54137c591d241d SHA512 c80a0018ba7d21d5875cc3331d241b78c71c54de65c59837c49edb839304906d4d2862245f664d23120242c3b871757704ce5eeb5ec9f3e2f58aed977f423de1
-EBUILD libvarlink-19.ebuild 673 BLAKE2B 1cd3681f0f5a404c2c8a5cac8c92027c0537b75197b913b1dd3054d29b8d19de9ca078481758b3feca0d707114abd8f8ccfedcf225aeb35e1818277856ecb5b3 SHA512 2bd2742fdfbad52c1d6673e487811d2eaf0796a64b3f00b3a2d7a0f9c3fc7c5d9ee040516fe72266afe6c36b95b3643066b180650acdef36b72dd0edb179f21d
+EBUILD libvarlink-16.ebuild 556 BLAKE2B a35c69c46abe245acd09d17c9e917a34925f3c405657c03b900513aed3ee103266f5e91343b68c72c48e87d6a01bd6bca7a3a559a43c3b7b525025e9d83a68de SHA512 d0425e3929f69c8f8eeedabbad12335748a7602b6876e1197bd3539fb0e6483211cbe3e4bfc991396dea301bed5942a4c36f70c6aa0a1b512b939b3675e1cbfd
+EBUILD libvarlink-18.ebuild 556 BLAKE2B a35c69c46abe245acd09d17c9e917a34925f3c405657c03b900513aed3ee103266f5e91343b68c72c48e87d6a01bd6bca7a3a559a43c3b7b525025e9d83a68de SHA512 d0425e3929f69c8f8eeedabbad12335748a7602b6876e1197bd3539fb0e6483211cbe3e4bfc991396dea301bed5942a4c36f70c6aa0a1b512b939b3675e1cbfd
+EBUILD libvarlink-19.ebuild 615 BLAKE2B c3180fa22c2259d34515b38889754d106b91493f0f654dc4a0d591ac1a17d198219c713e7f5b1b2fc295ed21c4d5c5844e2f809f9eb06e148333c22abb749bcb SHA512 3f287cec779ac3975bf093359394b6cc8611f2203c928e252bbb017d96a8822db3e970c317c783887df2e56cf58162d1aadbc05bd506e34f4811cfa717a6c7a2
 MISC metadata.xml 327 BLAKE2B 9b7695e2581a6bf4ee1b9906b19c8ad04b2b2db2c78a93cfd2def1bce4e7fd02c79bdf3123225acd3758fcfe660a71780542b2fd00109d38b171d085d3945260 SHA512 e1e61bf472281418c1e3f4a673decf0c2c82ef82630c3a7c06fab8f58721d3e0fb8fb8b634a37914d65e11d24173967f339b9383d93488ff44a39903478011ec
diff --git a/dev-libs/libvarlink/libvarlink-16.ebuild b/dev-libs/libvarlink/libvarlink-16.ebuild
index b15afea5560f..806ab716b325 100644
--- a/dev-libs/libvarlink/libvarlink-16.ebuild
+++ b/dev-libs/libvarlink/libvarlink-16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,18 +8,14 @@ inherit meson
 DESCRIPTION="C implementation of the Varlink protocol and command line tool"
 HOMEPAGE="https://github.com/varlink/libvarlink"
 SRC_URI="https://github.com/varlink/libvarlink/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
 LICENSE="Apache-2.0"
 SLOT="0"
-
 KEYWORDS="~amd64"
 IUSE="test"
 RESTRICT="!test? ( test )"
-RDEPEND=""
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-util/meson-0.47.0
-	virtual/pkgconfig
-"
+
+BDEPEND="virtual/pkgconfig"
 
 src_configure() {
 	local emesonargs=(
diff --git a/dev-libs/libvarlink/libvarlink-18.ebuild b/dev-libs/libvarlink/libvarlink-18.ebuild
index 43b326cc7cc6..806ab716b325 100644
--- a/dev-libs/libvarlink/libvarlink-18.ebuild
+++ b/dev-libs/libvarlink/libvarlink-18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,18 +8,14 @@ inherit meson
 DESCRIPTION="C implementation of the Varlink protocol and command line tool"
 HOMEPAGE="https://github.com/varlink/libvarlink"
 SRC_URI="https://github.com/varlink/libvarlink/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
 LICENSE="Apache-2.0"
 SLOT="0"
-
 KEYWORDS="~amd64"
 IUSE="test"
 RESTRICT="!test? ( test )"
-RDEPEND=""
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-util/meson-0.47.0
-	virtual/pkgconfig
-"
+
+BDEPEND="virtual/pkgconfig"
 
 src_configure() {
 	local emesonargs=(
diff --git a/dev-libs/libvarlink/libvarlink-19.ebuild b/dev-libs/libvarlink/libvarlink-19.ebuild
index b8c592de9de1..1bc5971cde85 100644
--- a/dev-libs/libvarlink/libvarlink-19.ebuild
+++ b/dev-libs/libvarlink/libvarlink-19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,18 +8,14 @@ inherit meson
 DESCRIPTION="C implementation of the Varlink protocol and command line tool"
 HOMEPAGE="https://github.com/varlink/libvarlink"
 SRC_URI="https://github.com/varlink/libvarlink/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
 LICENSE="Apache-2.0"
 SLOT="0"
-
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
-RDEPEND=""
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-util/meson-0.47.0
-	virtual/pkgconfig
-"
+
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=( "${FILESDIR}/${P}-fix-meson-build.patch" )
 
diff --git a/dev-libs/libvterm-neovim/Manifest b/dev-libs/libvterm-neovim/Manifest
index 9d00fc9eba7f..97c0485ca9f7 100644
--- a/dev-libs/libvterm-neovim/Manifest
+++ b/dev-libs/libvterm-neovim/Manifest
@@ -1,5 +1,5 @@
 DIST libvterm-neovim-0.0_pre20150309.tar.xz 52244 BLAKE2B e4791789b2373e9cad4796d0567dd87f347f5b83b293a996d155f163602d10a3d9326d5f0b1417cd46c5b26532064f2d90b1401002413d44e81f895038bef8ac SHA512 916bf1806f6c88b64debb19a119010e6e3ef968e289ab921ebf7a5ed2d98f52881379792bc9c8826bba546da0f65cb6154d9743bb89a614ac4e12d24167a1fb4
 DIST libvterm-neovim-0.0_pre20150621.tar.xz 52240 BLAKE2B 040c2510356a03c4b5b98197a2353285e23025fb8377396fafd4dce3b1afdf0d969e067317f5eb08878fbe69cca601ac85c8dc6cc51416f58e0611100bd54f5d SHA512 e6fe678da5498177d7fbd0cd945600b643f7cd76ff9ed00f3ac7923be55793765429a2f2da5fba4055dfaa4b7200c28a021f3672ce7ae16b99e58738e5093fd8
-EBUILD libvterm-neovim-0.0_pre20150309.ebuild 712 BLAKE2B 24425e862d2e5e2c71ebbe77224fff45499295c9b12cc7cbed451a48e42d4235ca5a98dde511a23cb95e4e706f1f31944e01e9ec0368d0bc67e5ec990c04938f SHA512 4b6fbacb8f74df0a9007d6f8834d113f288731b6d8033b12061b6e1cc2ecde71d7adbea36facf331ceeb0965af475515aa6a7956ef942f9d6ebd266b2967aba0
-EBUILD libvterm-neovim-0.0_pre20150621.ebuild 712 BLAKE2B 24425e862d2e5e2c71ebbe77224fff45499295c9b12cc7cbed451a48e42d4235ca5a98dde511a23cb95e4e706f1f31944e01e9ec0368d0bc67e5ec990c04938f SHA512 4b6fbacb8f74df0a9007d6f8834d113f288731b6d8033b12061b6e1cc2ecde71d7adbea36facf331ceeb0965af475515aa6a7956ef942f9d6ebd266b2967aba0
+EBUILD libvterm-neovim-0.0_pre20150309.ebuild 725 BLAKE2B a1ed1ef6c91432f303f0ece05e99401f18918a90e4f274ba12cf1edee36d44d4f4648272114cb244874d5a39f58a0fd2dfe287217beaf63fe7046e5aa596224b SHA512 63bf094966f02ede7f909c4cef0d987453d107fd3552652d33c0e504a19951b1ba94c9a9eef267192918161b6d340dc91734906c8fb8cb61369f75d327f2afe8
+EBUILD libvterm-neovim-0.0_pre20150621.ebuild 725 BLAKE2B a1ed1ef6c91432f303f0ece05e99401f18918a90e4f274ba12cf1edee36d44d4f4648272114cb244874d5a39f58a0fd2dfe287217beaf63fe7046e5aa596224b SHA512 63bf094966f02ede7f909c4cef0d987453d107fd3552652d33c0e504a19951b1ba94c9a9eef267192918161b6d340dc91734906c8fb8cb61369f75d327f2afe8
 MISC metadata.xml 255 BLAKE2B c3c51ff357cdf3ea565d7f4bf7cb236342061e471b67eacc0a436c26d52532ce7499657a76fc92a845321318a65f9eb877573104341ddae66dc3a554a35f7362 SHA512 305ae93d2bb3da79ee181cf36bb0ca2bbac016c20555967d7281cd5c0edfc26c1450dacd7a7de57078650dab0e815be9169c0b25a24d71488185f71ae8834167
diff --git a/dev-libs/libvterm-neovim/libvterm-neovim-0.0_pre20150309.ebuild b/dev-libs/libvterm-neovim/libvterm-neovim-0.0_pre20150309.ebuild
index 2725d021a680..6f5095ce09c9 100644
--- a/dev-libs/libvterm-neovim/libvterm-neovim-0.0_pre20150309.ebuild
+++ b/dev-libs/libvterm-neovim/libvterm-neovim-0.0_pre20150309.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-inherit flag-o-matic ltprune multilib
+inherit flag-o-matic multilib
 
 DESCRIPTION="An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator"
 HOMEPAGE="http://www.leonerd.org.uk/code/libvterm/"
@@ -24,7 +24,7 @@ src_compile() {
 src_install() {
 	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
 		DESTDIR="${D}" install
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 
 	dodoc doc/*
 }
diff --git a/dev-libs/libvterm-neovim/libvterm-neovim-0.0_pre20150621.ebuild b/dev-libs/libvterm-neovim/libvterm-neovim-0.0_pre20150621.ebuild
index 2725d021a680..6f5095ce09c9 100644
--- a/dev-libs/libvterm-neovim/libvterm-neovim-0.0_pre20150621.ebuild
+++ b/dev-libs/libvterm-neovim/libvterm-neovim-0.0_pre20150621.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-inherit flag-o-matic ltprune multilib
+inherit flag-o-matic multilib
 
 DESCRIPTION="An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator"
 HOMEPAGE="http://www.leonerd.org.uk/code/libvterm/"
@@ -24,7 +24,7 @@ src_compile() {
 src_install() {
 	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
 		DESTDIR="${D}" install
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 
 	dodoc doc/*
 }
diff --git a/dev-libs/libwacom/Manifest b/dev-libs/libwacom/Manifest
index 7452ea8067d9..7f79295a9f64 100644
--- a/dev-libs/libwacom/Manifest
+++ b/dev-libs/libwacom/Manifest
@@ -1,10 +1,3 @@
-AUX libwacom-1.1-configurable_docs.patch 1281 BLAKE2B 33a4ed7776580f3146351e552fd8fbd26ad4207d612596291272fee2d6f85aac36fc0fd2d47b31c1dffdcc58a325bb3aae28122a1e7cc4dab96d10efdc2fbfcf SHA512 d1d4aa074f8b3d14f7b59f66db86b132c1ab152324b8191a2d99f61b4283ced02f2d931a725c71a92427f31f89a14e323e57c163efbb1a3d71bafe43f5b2f0cc
-AUX libwacom-1.1-match-with-autotools.patch 854 BLAKE2B a89d65616346b943b4566c1619b6f1af45f6c9543e35f2722a114623480de7391a2cc3f99ee62ff214662ce61c3d0dfc48ff163173bd138cc433b94a43c73078 SHA512 abab5526cc4c9190bc8546d2c4c590d8af41d86a180ef87aaea8509c061837dfb81ba6fb9d34348c9ec63ebcb8736191549feb921b2f6702ffb2184a783b887c
-AUX libwacom-1.1-meson-add-private.patch 694 BLAKE2B 98330d479d1e24de0ad3f4c055be5c07a3581592cfcd3e8d122ff1157691e7847f18a11ec43ab8433ebaa8d2442688772e32fab2c063f74aa5d44d55ba2cded4 SHA512 32bb46c24145f06f3bcfa6e55322ba1ca2df859bd47f8d35725e9a361f9a74f0c0c1d6a221792dc9b20928cf82f393c74301dad159cb490ce14064f0c0e8c86b
-DIST libwacom-1.1.tar.bz2 502696 BLAKE2B 1c2e03b00eb3b17dea2d5cd3e61afa4b7f36dcb727f07bb1cc42631febc9d1939bdd2652d6fd1f0d020815cac1f937c1daddae3019ac9aa01659442cdc8b9054 SHA512 8b63d9bad18c27f8078711408a7b79c70086cd0c64fe692ee693d53d834dff8ab45631eabd206f0dfac80d8cc86c14b5833831b1b99b06e34aacd235176d266b
-DIST libwacom-1.7.tar.bz2 513320 BLAKE2B 36cead331b8d79fa629803441190de2c28e22c0e70822075d0ff31552f780e93d606ec2229a2fee744d9e6b91eb4879cb5a202075caf6adf1301b07502cefb7b SHA512 0cdd34c54a4477ffb763c4a291f0a6b33d2df6b1d237332b116e792685201a63a50c3ec98b84e9dc7c0b97c9e407c3531cd67c0af5a8398b5bbf8be6ca103066
 DIST libwacom-1.9.tar.bz2 516223 BLAKE2B 272dd462bee6f152840fb684213d5cdf83cda05b71b95e28a4a307240fa3edcb42b7afb9ef0ac1bd8b470a138e54f3fed9509b02186aff771314fa87ecf3307a SHA512 d62da97038caeaf727800a680a4ef2ef49a56e632844b9a0d6c0eed9c808e033bc1d969aa1c523b4a1724dfb9b8b3665290ecb90fcdcfbf5f50cae2d06c0bffa
-EBUILD libwacom-1.1.ebuild 1021 BLAKE2B 577fe004acb6e80e80dbb40f15ecd1d8d3cc0821c6b63286adb419679aa8ee91104ff62904125b5485848d6e1e4dcf14c519661026a318c8967b358b3f0aecdc SHA512 433e73ee88ee25a5fb70079bd3f8226819a805d5f16c48017dbfd164bfb7c3b7d448015ea3841e45c4adc1aecf8116f58763958d34de398843aff81bd4c6fc91
-EBUILD libwacom-1.7.ebuild 1368 BLAKE2B 26ad7167edb40eb97405cabfdd43766615e5d2085b13d7117ced28f83cdc05f09e7168390fe55d3b3b240ecdeaa7d98e02308142fe6abb5a0b5e65cf06879467 SHA512 ddef8cc3392f7210d4053b7f157eb979e0088f3357406c7b5c994ad7e223b7177a0e4dcd2d665be4c8a591733d3bb55ced00eff46f788453be33bc1bfe25bc62
-EBUILD libwacom-1.9.ebuild 1368 BLAKE2B 26ad7167edb40eb97405cabfdd43766615e5d2085b13d7117ced28f83cdc05f09e7168390fe55d3b3b240ecdeaa7d98e02308142fe6abb5a0b5e65cf06879467 SHA512 ddef8cc3392f7210d4053b7f157eb979e0088f3357406c7b5c994ad7e223b7177a0e4dcd2d665be4c8a591733d3bb55ced00eff46f788453be33bc1bfe25bc62
+EBUILD libwacom-1.9.ebuild 1362 BLAKE2B 9362fa7a2ad34ac1c6a35dd056e34c5bfd821d92e8cfc1e593352088c3d8be6c0bbfa73e8ea9edd6a4baf5eec109db2cda72c59d366f9f5b463f011c18aa0593 SHA512 d89258d47923070b4b1e40ae689c7f473e28961d9ba068659bb5b5b4985a746b95cbdf0eb4f6c6910b486210b9d0db2ea498f097eb5fdaac1f2b2652c4d2ce3a
 MISC metadata.xml 308 BLAKE2B dc6dc477d74ab5e2071a87814f3d21f5347891f8e36e36bbcf1590c253146f65210f28257cd5ec26fe0b69209d19d489ce3c52697423c087321191694561144d SHA512 fc208d84f859f167919179d96eeea91beba8825cc2b4e225bfd86db40ab7e1e9f7c1d5eb9023166bae7d4f784b0e08e04674ab72f75c49d638b6ca5ec52857a5
diff --git a/dev-libs/libwacom/files/libwacom-1.1-configurable_docs.patch b/dev-libs/libwacom/files/libwacom-1.1-configurable_docs.patch
deleted file mode 100644
index 47eb27d54bf8..000000000000
--- a/dev-libs/libwacom/files/libwacom-1.1-configurable_docs.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 18722d30b9eb38d0cd22609e076ad45c810f137d Mon Sep 17 00:00:00 2001
-From: David Heidelberg <david@ixit.cz>
-Date: Sun, 27 Oct 2019 20:34:55 +0100
-Subject: [PATCH] meson: make documentation a feature
-
-Nice to have for distributions, which needs to have predicable build.
-
-Signed-off-by: David Heidelberg <david@ixit.cz>
----
- meson.build       | 3 ++-
- meson_options.txt | 4 ++++
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 8283613..be2fcb3 100644
---- a/meson.build
-+++ b/meson.build
-@@ -460,7 +460,8 @@ install_man(configure_file(input: 'tools/libwacom-list-local-devices.man',
- 			   copy: true))
- 
- ############### docs ###########################
--doxygen = find_program('doxygen', required: false)
-+docs_feature = get_option('documentation')
-+doxygen = find_program('doxygen', required: docs_feature)
- if doxygen.found()
- 	src_doxygen = [
- 		join_paths(dir_src, 'libwacom.h'),
-diff --git a/meson_options.txt b/meson_options.txt
-index 1d75434..84c92bf 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -1,3 +1,7 @@
-+option('documentation',
-+       type: 'feature',
-+       value: 'auto',
-+       description: 'Build doxygen documentation [default=auto]')
- option('udev-dir',
-        type: 'string',
-        value: '',
diff --git a/dev-libs/libwacom/files/libwacom-1.1-match-with-autotools.patch b/dev-libs/libwacom/files/libwacom-1.1-match-with-autotools.patch
deleted file mode 100644
index 06858cd36ad1..000000000000
--- a/dev-libs/libwacom/files/libwacom-1.1-match-with-autotools.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 07753990d7476d52cfd34fb7558c077bd8b44eeb Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Mon, 23 Sep 2019 09:29:45 +1000
-Subject: [PATCH] meson.build: match the libwacom.pc file Name with the
- autotools one (#164)
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 13459f7..3e0cc07 100644
---- a/meson.build
-+++ b/meson.build
-@@ -81,7 +81,7 @@ dep_libwacom = declare_dependency(link_with: lib_libwacom)
- install_headers('libwacom/libwacom.h', subdir: 'libwacom-1.0/libwacom')
- 
- pkgconfig.generate(filebase: 'libwacom',
--		   name: 'Libwacom',
-+		   name: 'libwacom',
- 		   description: 'Wacom model feature query library',
- 		   version: meson.project_version(),
- 		   subdirs: 'libwacom-1.0',
diff --git a/dev-libs/libwacom/files/libwacom-1.1-meson-add-private.patch b/dev-libs/libwacom/files/libwacom-1.1-meson-add-private.patch
deleted file mode 100644
index e31df3a683d0..000000000000
--- a/dev-libs/libwacom/files/libwacom-1.1-meson-add-private.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 6953c5a9fc51e286134cb977b3fdfe0999f3503a Mon Sep 17 00:00:00 2001
-From: worldofpeace <worldofpeace@protonmail.ch>
-Date: Sun, 22 Sep 2019 19:04:58 -0400
-Subject: [PATCH] meson: add private requires to .pc (#163)
-
----
- meson.build | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/meson.build b/meson.build
-index 0ae03e1..13459f7 100644
---- a/meson.build
-+++ b/meson.build
-@@ -85,6 +85,7 @@ pkgconfig.generate(filebase: 'libwacom',
- 		   description: 'Wacom model feature query library',
- 		   version: meson.project_version(),
- 		   subdirs: 'libwacom-1.0',
-+		   requires_private: deps_libwacom,
- 		   libraries: lib_libwacom)
- 
- #################### data files ########################
diff --git a/dev-libs/libwacom/libwacom-1.1.ebuild b/dev-libs/libwacom/libwacom-1.1.ebuild
deleted file mode 100644
index 786822b481a5..000000000000
--- a/dev-libs/libwacom/libwacom-1.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson udev toolchain-funcs
-
-DESCRIPTION="Library for identifying Wacom tablets and their model-specific features"
-HOMEPAGE="https://github.com/linuxwacom/libwacom"
-SRC_URI="https://github.com/linuxwacom/${PN}/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/libgudev:=
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-meson-add-private.patch"
-	"${FILESDIR}/${P}-match-with-autotools.patch"
-	"${FILESDIR}/${P}-configurable_docs.patch"
-)
-
-pkg_setup() {
-	tc-ld-disable-gold # bug https://github.com/linuxwacom/libwacom/issues/170
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature doc documentation)
-		$(meson_use test tests)
-		-Dudev-dir=$(get_udevdir)
-
-	)
-	meson_src_configure
-}
diff --git a/dev-libs/libwacom/libwacom-1.7.ebuild b/dev-libs/libwacom/libwacom-1.7.ebuild
deleted file mode 100644
index 0c54c6c491e4..000000000000
--- a/dev-libs/libwacom/libwacom-1.7.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit meson python-any-r1 toolchain-funcs udev
-
-DESCRIPTION="Library for identifying Wacom tablets and their model-specific features"
-HOMEPAGE="https://github.com/linuxwacom/libwacom"
-SRC_URI="https://github.com/linuxwacom/${PN}/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep '
-			dev-python/python-libevdev[${PYTHON_USEDEP}]
-			dev-python/pyudev[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-		')
-	)
-"
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/libgudev:=
-"
-DEPEND="${RDEPEND}"
-
-python_check_deps() {
-	has_version -b "dev-python/python-libevdev[${PYTHON_USEDEP}]" &&
-	has_version -b "dev-python/pyudev[${PYTHON_USEDEP}]" &&
-	has_version -b "dev-python/pytest[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	tc-ld-disable-gold # bug https://github.com/linuxwacom/libwacom/issues/170
-
-	if use test; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature doc documentation)
-		$(meson_feature test tests)
-		-Dudev-dir=$(get_udevdir)
-
-	)
-	meson_src_configure
-}
diff --git a/dev-libs/libwacom/libwacom-1.9.ebuild b/dev-libs/libwacom/libwacom-1.9.ebuild
index 0c54c6c491e4..be1415a4cf5a 100644
--- a/dev-libs/libwacom/libwacom-1.9.ebuild
+++ b/dev-libs/libwacom/libwacom-1.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/linuxwacom/${PN}/releases/download/${P}/${P}.tar.bz2
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index ef073179a561..65bc208d047e 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -7,7 +7,7 @@ AUX libxml2-2.9.8-out-of-tree-test.patch 1113 BLAKE2B cc257e20d3bad841e6afe220e8
 AUX libxml2-2.9.8-python3-unicode-errors.patch 1156 BLAKE2B 15d58fb615aef745ac6aa4dde01823f3e0d2c39cd86ca9369874d6c4ae01d2a95e804e34b125ff77af612906397307cca1489b93d331d0f87dd9651a3ef1869c SHA512 fbe89d3ab0d4915782752d6de8a0b057cbe78bc5372a2801556bb521f1c64bf14e641af71b97d98377dc8b65cdc520938d144758ca50ce6fe628883d8bfd6411
 DIST libxml2-2.9.10-r1-patchset.tar.xz 72088 BLAKE2B 4d5f8aed35d6c0232089e09f22a77cbd25cbd2007c1330538e1c7acc4398ec3ef9023289129677cf5499dbacde4c2f28850ae81acab351d02625d3452aedaede SHA512 a63032d1e85128f637c2b54356aab06a17e31eb1f5facd8fdf88463eb21df6a1d9fd8cc751fa94b8d322fa4f796be4e1d9aa071cbd0826ab31fae46525fde952
 DIST libxml2-2.9.10.tar.gz 5624761 BLAKE2B a9958bd7db17fbfb8259b64d66548eb19d28f1aecf40cf66752fcec5720855d31cea9941d52963badd8c18ea1770485f1c11da6213149458336ce0273418f421 SHA512 0adfd12bfde89cbd6296ba6e66b6bed4edb814a74b4265bda34d95c41d9d92c696ee7adb0c737aaf9cc6e10426a31a35079b2a23d26c074e299858da12c072ed
-DIST libxml2-2.9.12-r1-patchset.tar.bz2 5497 BLAKE2B fda8ad166c89209abaf8f94a5dfbff84e5a6c89cca36350a2f0b9b8db42c6f348b6cb8c7738a35aed8421ca994cc6ad76c3aa02a8a9899fa969b493ca1761b01 SHA512 469befb393430d2532e27f9ed834e0ab5473fc371c89582c3b1434ab1c370140f132d4acf315f7c2b9d1841ab3e78ef04069cca78d66917269b5112ab42127df
+DIST libxml2-2.9.12-r2-patchset.tar.bz2 5939 BLAKE2B e518a174385a121ca5545d0a51c2a2b4ddd21b1e7996e2806f368588b27d60e8318ab50ebfb90c3ee57ccece4f1c37e05c1daeed4203a4e9cb5a056ba530ad2b SHA512 06b96ab8426cd560c1147998965b5e718bee08536549a278269f6535ff1460ed97d83067ed0e8a4d834145a5e5a6caa912cf8aa5a33a360e4b1bc9d9135bfb04
 DIST libxml2-2.9.12.tar.gz 5681632 BLAKE2B ab93633140e9fd119d3a48ed829a91213c3d7956a00d181203f5188fb0ed0d3a7150d3128fe986b13efadf6fe484393262a3de575527f38f74aa6c0067a6d934 SHA512 df1c6486e80f0fcf3c506f3599bcfb94b620c00d0b5d26831bc983daa78d58ec58b5057b1ec7c1a26c694f40199c6234ee2a6dcabf65abfa10c447cb5705abbd
 DIST libxml2-2.9.12.tar.gz.asc 488 BLAKE2B 48ec86ec373d94de73bdb52141fc77fccd0ca296a35ed97aa3479ecdcf82b15422dd7d751359b5b1ca477e24b8eee9226784cfbfd861236e10eed2519e7959bf SHA512 69ca6ab7170cad467724e19eff99a3544966a26069e78a7b7cc27ae93a9077b11cc8dad2536bd0b27c3b45f4ea7520c813fe5a018cd65f103059f7f75147a656
 DIST xmlts20080827.tar.gz 638940 BLAKE2B c5aab959c6e0698acd5b9be82b48a8ac26f4d01cc03f9acfff20d344f97f4711fc6d4a524ae70457147e8e30c72e27b6726829e1dd21896286aa974ed60774e7 SHA512 7325d0977c4427fc4944b291ccf896a665f654cc24399e5565c12a849c2bc3aef4fa3ee42a09ac115abcb6570c51a8fbd052c38d64d164279ecdecad5a4e884d
@@ -15,6 +15,6 @@ DIST xmlts20130923.tar.gz 641522 BLAKE2B 63a47bc69278ef510cd0b3779aed729e1b309e3
 DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288
 DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe
 EBUILD libxml2-2.9.10-r5.ebuild 6644 BLAKE2B ce2df74f087c8f2c44ddfcc7ed98ac916e9441e425d08095dcea55c4cd28e3e8954ae8d700f2668fa942ffda0043d132027c64b736994425a63c5ccb30bfa9d6 SHA512 2219c61e1a9a9ece9e926e40cd924b6a3f8ba53660bee201b0123d439e31ab1190f8de985a1c9f78f56f8fc3d791cdb907a23fab54f0d823581c1e9273de4417
-EBUILD libxml2-2.9.12-r1.ebuild 6952 BLAKE2B e54425cd42be49d3c87b80de56dd2c36fcace1b4dfc98d51b18a99ce8cfa3e7908ad03ceb1efe0563948fc826a65fa5552c0e3acde4802c47004832f7da0f627 SHA512 ba05a253a90080a17dcdc841b74f564b29c5ff78521d858015234db392ec94b899207dc3ffab4671b6ceaff63b6fd2ab2180f59543b7902dbe96dfd75f2f9f30
+EBUILD libxml2-2.9.12-r2.ebuild 6950 BLAKE2B 32882b5e31426406b7a77081571fa6328fdb67b602eee3908fe8a58a50ca330e25a006f670d23ba61e73a443e14685cf840dc2e4e6ceba050d920f373a0a283a SHA512 448797c0a911973d157daafd73835bbbfbdc3c913f42c0d163a1f16782183ab55d991b07d5d9291e30168d133264240dd5fa3de43b06f44abe8e56d7453d5b27
 EBUILD libxml2-2.9.12.ebuild 6677 BLAKE2B 935788b21c4c8908152c50266b36653455703a471b1a057bc165268620d26a1b3c42c0901032dd5b47c87ff6765423ca61007af28669850bf4b6adcdb6176a32 SHA512 c1ee354ea4eec2cb8820059059b08112194777f351d1ff281561cce2bd8ad26aa3fe05d5db3826c2f4f1d10ef5ae8037409ac65b02577ce81f88cad8f607dbb4
 MISC metadata.xml 457 BLAKE2B d83c1b1fbb559e371c443c5ddcbf68ad857290b583b1a3129e4c635fea981658614be234879f42111fa02704bab6477fda3bc474ea2831743720c4f368306489 SHA512 4d2640aa0935f0101a4bfee0ee3fef776cb163c9fc7535ed962619f4f319f93eb0fb168518f3e8d38742e9735c9c777292ce4d0e2b165e834bbb04fa3f07cd9a
diff --git a/dev-libs/libxml2/libxml2-2.9.12-r1.ebuild b/dev-libs/libxml2/libxml2-2.9.12-r2.ebuild
index 8ae91f42ff0c..c240ff54c1b2 100644
--- a/dev-libs/libxml2/libxml2-2.9.12-r1.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.12-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 # Note: Please bump in sync with dev-libs/libxslt
 
-PATCHSET_VERSION="2.9.12-r1-patchset"
+PATCHSET_VERSION="2.9.12-r2-patchset"
 
 PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE="xml"
@@ -34,7 +34,7 @@ S="${WORKDIR}/${PN}-${PV%_rc*}"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug examples icu ipv6 lzma +python readline static-libs test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/libxmlb/Manifest b/dev-libs/libxmlb/Manifest
index fc2a76103327..cacfa3a0a886 100644
--- a/dev-libs/libxmlb/Manifest
+++ b/dev-libs/libxmlb/Manifest
@@ -1,9 +1,7 @@
 DIST libxmlb-0.1.15.tar.gz 92923 BLAKE2B 97b6af812397dd279e7e3c038627fcf8228cbfa5c3af91ceeb5361e32d37d357eda6a193f627a5f4442426fb08abca1ff11684fe199d9d3a4add72ca4f3f5d08 SHA512 58268b3a690af36c0923afdee3ae58e88bf778eebbc6a439be1bc85ed985efdc20cd7006c976586f7be87310dc091d67dddd370f4bbec58379fc4e7349bfa3d8
-DIST libxmlb-0.2.1.tar.gz 98284 BLAKE2B b9bf02560a231837d7837b43f01d8f78c54a80319379a7bfa191f8303b77c35e82d1e2bb57722f1bfe56224d96bd1513cef702a0375eb85a137bff8ca3104c5c SHA512 4e082f036eb62626d1724ac5093ad625f9259e9e81aa40d5ca0589a3a72dadd669c0718ff64dcae094973b6c282b6c8f8ce7212b7e47211f320035bb639ec59d
-DIST libxmlb-0.3.0.tar.gz 112097 BLAKE2B a1046ee5c940dfd23a7e3cc07c0deb2be0f18fd416c13df7f467ce98308239191788a1cf18026593862c04645486f4ab332fe71eb96dc5e5abc7909e61451cf0 SHA512 28731c84cab0b1164fc08ea751ee7da22b8f4f278c4950a2d5957cc0dcd4457b6ce47dace25dd7c163a790b7ed2619dd6b4863f8147dc201c18f3433990af2cb
 DIST libxmlb-0.3.1.tar.gz 113197 BLAKE2B 1e437cb1d9e58350b591bdb6234be453dfdf80fac72c96764c4ce3b7e1f5ffccc310590c1945bc44fd747f0f0c6caeb6ba95cdbeb29e21a1c5a990f041a10ed9 SHA512 7fc892762c7272cbb11e5cb2b6d936ba802b10aaeab68b33e5c1fbccfdd0019378080d355f1719d946e9b838ac76b77c7229723f692c0dde3de3f94ad62a1842
+DIST libxmlb-0.3.2.tar.gz 113428 BLAKE2B 30f29ebd7522ee2338b4e78e15a544bdf20514e151e63d555be29fca63a3c8251c8d340f778ba1b6b6484c084ab145f9e9d1d4acf037b3f1abad05c5b0101082 SHA512 d4c1cbb8dfd2da9f4b9f436fbba5102f0391df7786a1c0bb1543841eaa5928ac72e6d8125e263be51c69627574bfea70d72624385086879cdbdb44721c0daa3d
 EBUILD libxmlb-0.1.15.ebuild 1205 BLAKE2B b7c684f7643c068f1394e5faa8c13e58fbe7920dcea85ce0dd523bea99fa97370079b9162eb7818aaefb820fe0b7d6a650c8cc50d2469b84ff0415a6dff73c61 SHA512 2fa73b4aeeb0aa9e1845741bb0ed6d523adaaba4f8269a398cf59ecb756c65e77acb9b7418a876b453c42e68fcad9b814d2d007ed66f1d7067ec8044161a5cb6
-EBUILD libxmlb-0.2.1.ebuild 1237 BLAKE2B f09ddf7bde60485fbbe6105fe7de3bb273523b098c4de05c2f88d77c8df1a05e038de8397b2d0d566a41656a8ea7bd6c25adcd37989a11bd89870f69ca31efe6 SHA512 c66454bf600a544928229e637e28889989552f5a64e25b531f53862a28f6553005de0d8c7d639f52bd3964a8e987ca671ce552fb283fe1d345773e66a87eaea9
-EBUILD libxmlb-0.3.0.ebuild 1237 BLAKE2B f09ddf7bde60485fbbe6105fe7de3bb273523b098c4de05c2f88d77c8df1a05e038de8397b2d0d566a41656a8ea7bd6c25adcd37989a11bd89870f69ca31efe6 SHA512 c66454bf600a544928229e637e28889989552f5a64e25b531f53862a28f6553005de0d8c7d639f52bd3964a8e987ca671ce552fb283fe1d345773e66a87eaea9
 EBUILD libxmlb-0.3.1.ebuild 1237 BLAKE2B f09ddf7bde60485fbbe6105fe7de3bb273523b098c4de05c2f88d77c8df1a05e038de8397b2d0d566a41656a8ea7bd6c25adcd37989a11bd89870f69ca31efe6 SHA512 c66454bf600a544928229e637e28889989552f5a64e25b531f53862a28f6553005de0d8c7d639f52bd3964a8e987ca671ce552fb283fe1d345773e66a87eaea9
+EBUILD libxmlb-0.3.2.ebuild 1237 BLAKE2B f09ddf7bde60485fbbe6105fe7de3bb273523b098c4de05c2f88d77c8df1a05e038de8397b2d0d566a41656a8ea7bd6c25adcd37989a11bd89870f69ca31efe6 SHA512 c66454bf600a544928229e637e28889989552f5a64e25b531f53862a28f6553005de0d8c7d639f52bd3964a8e987ca671ce552fb283fe1d345773e66a87eaea9
 MISC metadata.xml 423 BLAKE2B 4f6fce646b2b255484b20c506f3a192ddfe0748987d76b4010bbc4efb69db159acfd8dff07e851f6c009aa2afac24ed2b252b7ee2a817fb583b11924d9f865a2 SHA512 b1d47209f5bb217313f0a4f6b27d0c54e4968f010c066c95b6f2df889b0914a5eae7ef8758b965f69475a4c8ce955120d6f452db5060b5f1bd93d5ca7d87e8c9
diff --git a/dev-libs/libxmlb/libxmlb-0.3.0.ebuild b/dev-libs/libxmlb/libxmlb-0.3.0.ebuild
deleted file mode 100644
index a4cc4b2a152c..000000000000
--- a/dev-libs/libxmlb/libxmlb-0.3.0.ebuild
+++ /dev/null
@@ -1,58 +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 meson python-any-r1
-
-DESCRIPTION="Library to help create and query binary XML blobs"
-HOMEPAGE="https://github.com/hughsie/libxmlb"
-SRC_URI="https://github.com/hughsie/libxmlb/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="LGPL-2.1+"
-SLOT="0/2" # libxmlb.so version
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="doc introspection stemmer test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/glib:2
-	sys-apps/util-linux
-	stemmer? ( dev-libs/snowball-stemmer )
-"
-
-DEPEND="
-	${RDEPEND}
-	doc? ( dev-util/gtk-doc )
-	introspection? ( dev-libs/gobject-introspection )
-"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-util/meson-0.47.0
-	virtual/pkgconfig
-	introspection? (
-		$(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
-	)
-"
-
-python_check_deps() {
-	has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dgtkdoc="$(usex doc true false)"
-		-Dintrospection="$(usex introspection true false)"
-		-Dstemmer="$(usex stemmer true false)"
-		-Dtests="$(usex test true false)"
-	)
-	meson_src_configure
-}
diff --git a/dev-libs/libxmlb/libxmlb-0.2.1.ebuild b/dev-libs/libxmlb/libxmlb-0.3.2.ebuild
index a4cc4b2a152c..a4cc4b2a152c 100644
--- a/dev-libs/libxmlb/libxmlb-0.2.1.ebuild
+++ b/dev-libs/libxmlb/libxmlb-0.3.2.ebuild
diff --git a/dev-libs/libzia/Manifest b/dev-libs/libzia/Manifest
index feff379322d9..4aa40e531c1e 100644
--- a/dev-libs/libzia/Manifest
+++ b/dev-libs/libzia/Manifest
@@ -1,7 +1,9 @@
 DIST libzia-4.25.tar.gz 632565 BLAKE2B b677ef71a2c02baa04e3a3e1594b28cd7161762456a44f6532462e4514851e6298ade881b61c3d02175a7029b43358e94ebdad558aa82d8210600e35b9a32e30 SHA512 5d3d9f80b53baa3aeaf359d4b3c0eeec265177e47bf11bf2c5bcebf23d339e481eaa14a1ea7f5f686c9c7477fd607095c77d85399df479d297cc5bde1086535f
 DIST libzia-4.27.tar.gz 632660 BLAKE2B 2769e24b628731c4363437513358d7de9a8eca2a49580de2b8b0a791692ef17adc696c984db202e1f7015edd5d5259dd6dc4e9a057e8267b510051aa70a4bf20 SHA512 5022569931a820cfd2c0e76b26021bf07a7c55f77872786b5907c7201be9da1a2d6d653eec3cdb9f504ce43d54207478eab38eaf697ae9dd42f17c3dce6666f5
 DIST libzia-4.28.tar.gz 634470 BLAKE2B 1d75f761b171e5b6b34b58b80588b00a13d6ed041d8eee8bbda98ea6b9c381b98f386f653fbdaa75b3119f0701cdd1c25234863a6c5ec608c935dcbae2bf6463 SHA512 12a8013db5db531e22cbe9c3f2e1ddc2c31696e47f527880772933042f8ccb60cd03abd9ef865c4b4344c8efe88e9f275cea4b2c0c07fe6321ef31c9a77b0307
+DIST libzia-4.29.tar.gz 633172 BLAKE2B 418ce8eb6a034979948f284e5153c7cb903647e0e4776210d98a4d78c01a6147701c0be6afd21067a918ab91426cff3710cddfbdb8d4828da361c92fa71c987c SHA512 f487fb36faab0c96cb75ccbb3ce6cd51732648beb07d67a128402da294f406666fe0b65be6be49debd2b3bd78aa578c5c797aaad9dc4beac923333a0474442cc
 EBUILD libzia-4.25.ebuild 963 BLAKE2B 654a9ef983820db7b0bca89042218f313d790e2c8425d40a4e45717f1506eadc8ea6906038046d0afc7e92a81e88b29a65e7cdd42a40e971c5c00dab368b4b90 SHA512 1fccdc580e2bceb1b2ffad9478239d103ba682887545e812b605cff09a35ab1f2ba362a2fe48a03233ca60208e9b20402e2a6884d47da8ca99791924004af9e7
 EBUILD libzia-4.27.ebuild 965 BLAKE2B e12e9376ae1157ec7b15186615b2ac7ccee22b7312e43b6108285826572fc18fe48f0d61b6b81e803e792ecb0768fad6cb333a12745ac906106755b7afa08482 SHA512 8439d9c29f3bad065427b7245071bb532a15356203a11b9c9fae0d68ad02e2025ec2db211b17c8e71865b2604748b36c13491ee74f3c30e90a75e185082a6bb4
-EBUILD libzia-4.28.ebuild 965 BLAKE2B e12e9376ae1157ec7b15186615b2ac7ccee22b7312e43b6108285826572fc18fe48f0d61b6b81e803e792ecb0768fad6cb333a12745ac906106755b7afa08482 SHA512 8439d9c29f3bad065427b7245071bb532a15356203a11b9c9fae0d68ad02e2025ec2db211b17c8e71865b2604748b36c13491ee74f3c30e90a75e185082a6bb4
+EBUILD libzia-4.28.ebuild 963 BLAKE2B 654a9ef983820db7b0bca89042218f313d790e2c8425d40a4e45717f1506eadc8ea6906038046d0afc7e92a81e88b29a65e7cdd42a40e971c5c00dab368b4b90 SHA512 1fccdc580e2bceb1b2ffad9478239d103ba682887545e812b605cff09a35ab1f2ba362a2fe48a03233ca60208e9b20402e2a6884d47da8ca99791924004af9e7
+EBUILD libzia-4.29.ebuild 965 BLAKE2B e12e9376ae1157ec7b15186615b2ac7ccee22b7312e43b6108285826572fc18fe48f0d61b6b81e803e792ecb0768fad6cb333a12745ac906106755b7afa08482 SHA512 8439d9c29f3bad065427b7245071bb532a15356203a11b9c9fae0d68ad02e2025ec2db211b17c8e71865b2604748b36c13491ee74f3c30e90a75e185082a6bb4
 MISC metadata.xml 325 BLAKE2B 749bbcd37b8ec3f3b537e5cca5abba07f042c3f0f56e07786633d5a68eec8242e5f9269c1cdc2b6d2862766cbb9c0bf5ebf971a7a35537c368fb033a52c1be12 SHA512 a406f9e74ba2f99af089909a9a0aef44da9ae1261a61d76cc4689e3d80e610f8610fe54ec3da3441e53c9e1f8c18487eb5662bbbc488a50b48844814cd235f2c
diff --git a/dev-libs/libzia/libzia-4.28.ebuild b/dev-libs/libzia/libzia-4.28.ebuild
index a3fecb46f788..527e88508dfa 100644
--- a/dev-libs/libzia/libzia-4.28.ebuild
+++ b/dev-libs/libzia/libzia-4.28.ebuild
@@ -10,7 +10,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/libzia/libzia-4.29.ebuild b/dev-libs/libzia/libzia-4.29.ebuild
new file mode 100644
index 000000000000..a3fecb46f788
--- /dev/null
+++ b/dev-libs/libzia/libzia-4.29.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="platform abstraction code for tucnak package"
+HOMEPAGE="http://tucnak.nagano.cz"
+SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ftdi"
+
+RDEPEND="dev-libs/glib:2
+	x11-libs/gtk+:2
+	media-libs/libsdl
+	media-libs/libpng:0
+	ftdi? ( dev-embedded/libftdi:1 )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+MAKEOPTS+=" -j1"
+
+src_prepare() {
+	eapply_user
+	sed -i -e "s/docsdir/#docsdir/g" \
+		-e "s/docs_/#docs_/g" Makefile.am || die
+
+	# Fix QA-Warning "QA Notice: pkg-config files with wrong LDFLAGS detected"
+	sed -i -e 's/@LDFLAGS@//' libzia.pc.in || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with ftdi) --with-sdl \
+		--with-png --without-bfd \
+		--disable-static
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/dev-libs/lockdev/Manifest b/dev-libs/lockdev/Manifest
index e336fa13212d..3448ce5be8cb 100644
--- a/dev-libs/lockdev/Manifest
+++ b/dev-libs/lockdev/Manifest
@@ -2,5 +2,5 @@ AUX lockdev-1.0.3-add-autotools.patch 1344 BLAKE2B 7248172afeeb5b78ca5626d20604e
 AUX lockdev-1.0.3-fix-perl.patch 307 BLAKE2B aa1d9fb4131a0dcedbac0034e450ef47cac62d4e45c56865c2e7c8c8d896143afae2e767eac3fc878fc8281656db603cb9bbe5a7ae3dfe62a164b8023493cca0 SHA512 f8647472a451ce641d687a9c61f2e650456a68a6fd9fbb57a3871a1480871de639815aef924bd6f1cf85d1c13203b605c0461077f362d2523881269040a8114a
 DIST lockdev_1.0.3-1.2.diff.gz 7642 BLAKE2B ee0da062e802d1112c49bf3dc4cdd1f3567eb11fd4173fe0170b079c2752231ee93e39201674d8e71a5970f4d7e6443406d159af63687bb37c8c72203132c4f9 SHA512 22fce119a8075a5b99a4ef83b31f62da64725067863949d4833b4d66f9e8e2d34920eee11c5acdcc14b1a643a21c56c39ec2adf31ae7fa489795dd5534eb7b6c
 DIST lockdev_1.0.3.orig.tar.gz 29150 BLAKE2B 812acf8b39507e7b00e8fd49e6828be2b6ba21811c3dca49f94543756d428f7fea9d8005e43574653180f71aa634b0f92a2c42380235c2584c6958ca38d499fb SHA512 4066985059add674ef8a9195e611db8ead89ca6191c04b7f29243b12a3448c82a3d0ea852bf99e26e1c71f163891acd198867650a5c4843f787e1944a8bc7f2b
-EBUILD lockdev-1.0.3.1.2-r3.ebuild 2063 BLAKE2B b76eee9e03d1bc1302e29260d2887a441e934a2a7f8e995369019f09bfd0c61bd4af853f1534b0dcb79c394a97cc734bf14678fc15c4939998392ca5146d43be SHA512 586d9ab056155acf4f13bd23972b0983bef257859d29bb7824a8ccc90b2d3c761326c241a810541e334eae6e7f0a4ac5ee18d43d74e6d41de9654810cfa7cde0
+EBUILD lockdev-1.0.3.1.2-r3.ebuild 2077 BLAKE2B 123ff3b8038eb0a0e4d7ebe81f3fff1cdc391078c31107849da30b020df50ebeafe47c1d417519af1427dda84ace637ef5562d7caba2f29b6850cfba9d807656 SHA512 ecab70b968c16fdff4c6ebba749a9fb11a2c1e277c47a8f10bc3bc211044021def72900b8ccefabfe6bf0fcb9f39b0bfbdaba0e91e0c932d323762df4a090932
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/lockdev/lockdev-1.0.3.1.2-r3.ebuild b/dev-libs/lockdev/lockdev-1.0.3.1.2-r3.ebuild
index ce700fe6af56..2cd31f466afb 100644
--- a/dev-libs/lockdev/lockdev-1.0.3.1.2-r3.ebuild
+++ b/dev-libs/lockdev/lockdev-1.0.3.1.2-r3.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 
 GENTOO_DEPEND_ON_PERL="no"
-inherit perl-module epatch versionator autotools ltprune multilib-minimal
+inherit perl-module epatch versionator autotools multilib-minimal
 
 MAJOR=$(get_major_version)
 MY_PV=$(get_version_component_range 1-3)
@@ -22,7 +22,7 @@ S="${WORKDIR}"/${PN}-${MY_PV}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="perl"
 
 PATCHES=(
@@ -92,7 +92,7 @@ multilib_src_install_all() {
 	dodoc AUTHORS ChangeLog* debian/NEWS README.debug
 	newdoc debian/changelog changelog.debian
 
-	prune_libtool_files --all
+	find "${ED}" -name '*.la' -delete || die
 }
 
 pkg_preinst() {
diff --git a/dev-libs/ncnn/Manifest b/dev-libs/ncnn/Manifest
index 7a5d7948ef49..f7d38573c4b7 100644
--- a/dev-libs/ncnn/Manifest
+++ b/dev-libs/ncnn/Manifest
@@ -1,10 +1,6 @@
-AUX ncnn-fix-glslang-include.patch 326 BLAKE2B 6791c4dea3e81f24ee4e08d9cd62960509f5b15ff458735a3c50877f27944af6a98531787c018dd61764dd30f67c91d813ad0a6d4ef7fc69e0e4bb926be6ac29 SHA512 5cd86899e0d943d83e336cc8da480cf8cc5a9381ae32f9885286473ef6f48fa6846406bf4dfd4c545dbbf2bcd90d81cb8a1ce33b1160163400d3a43ba87fb6d5
-DIST ncnn-20200226.tar.gz 10363010 BLAKE2B 3f5e22ecffc7d36d7babb8c316eb95785f60b2938672cc2fc4a56ae8e4cc79fef8d498032117998a1813b4a5491b4b99f6941ac41be3fe8d6c6e3276ae46396e SHA512 e91694692e2c48ba4b404b26b382939be62c61e8452a09b8c1cdad351adcda1ea8bd19ded671f6c4c6cf979ccc49c181dd47e501a351fe89ecdf17a5395b3fab
-DIST ncnn-20200413.tar.gz 10520160 BLAKE2B 10fc59f3a09d1a6b21a6c73b87dabd450279d2c30923b15266461360c6a63b7cc58f91e33c6563752161de3ca067098ed4f2d22963410fe3f72a8affbd39172e SHA512 3f3610f94cbfa6072347857675865b3b21e4cb330a3b889214e7e8cf6e7a558451979ee4ba727c28fc5919a38b27d3b0288dfbd1bfa06d92d3677b4035b019fd
-DIST ncnn-20200727.tar.gz 10989866 BLAKE2B 27ec105d4ea24b1bcccfb64074f47332515112b7fed7b6f833c6d3fd846542f14248254d076e3d1e63eb16cedb51d16dd156890ca805f4160d7e6ceb3de1b46a SHA512 122653ee4fcf6e45665154ff6014eb3291d48174ec153b27ccb9013bd705a81e664e4c4ad94df5cb3ea661891115929562db45c7c714747fb6f7673b09a16b68
+AUX ncnn-fix-glslang-include.patch 281 BLAKE2B ae6293b2c16ee870d65cde7398cfe615ba3cbfa682edd5da0e92072d80f37f46f0fdc84648bb3757a266e1406d3289025344cff462ae2c3d84e232460db40759 SHA512 7e424a89b3d2a8b9cd4630e2ea8fd789569bef9bfcbea39c11fecf2cb0d9ece9639bd01e88735715d28fe7d92aa5eee9231d59cade55829f8d4af7e33a4f4adf
 DIST ncnn-20210322.tar.gz 11339362 BLAKE2B 26848f8c6598c98e10e62717bf4aa86f803b425848bdeebd7dacd752f57174e4c3a7fe56d309cafa150be7cb80176fbd8f487c9fe79bc957e29157b1781fe849 SHA512 78862bdbba3ae4127d856f514ea37903098e8a9e827ccbdc85faa498d8a343b4c404465b7f55d368f2ea867063340f33facf286c2bad6a0587b903ba8bbf2394
-EBUILD ncnn-20200226.ebuild 692 BLAKE2B 3fb887404a2de19dd311439714ece71fd51d84484762f57fadd2a06059a569ae55b39b0cb924e3016312ce3474a03ba1917efe9b100a7d242f7bf9ea68168c35 SHA512 db08ff07cf73c967e31a9a64a361a0e40ac858a3ebb074309e0f0d120392040a5fb5874c6612f9163d2056fce9883d40aadedacbbff2a55ed17f6521b58c0a09
-EBUILD ncnn-20200413.ebuild 738 BLAKE2B 6d8d074297566d02f1d0758ec806100a85e6899c2297dbd826ff7404b7eaba50507cde5b856b80daf2746a5340e47d1d097f0d1b5def688df84c490d88b8d165 SHA512 71a813e6bed4ab60eface4dd4d011163e3168faa4e11f96891f69987d0b9bd6ad6969aaf13b4b21f1d74c6d92dc0f4cecddabb801e823c8b84f53dd4bc556d18
-EBUILD ncnn-20200727.ebuild 738 BLAKE2B 6d8d074297566d02f1d0758ec806100a85e6899c2297dbd826ff7404b7eaba50507cde5b856b80daf2746a5340e47d1d097f0d1b5def688df84c490d88b8d165 SHA512 71a813e6bed4ab60eface4dd4d011163e3168faa4e11f96891f69987d0b9bd6ad6969aaf13b4b21f1d74c6d92dc0f4cecddabb801e823c8b84f53dd4bc556d18
+DIST ncnn-20210525.tar.gz 11578821 BLAKE2B 1b6dc67cb89e4761c6de256c8854c3969c553159c11713d9bbbe04abd027e9439ffb694e8129da4d965807d1ec326d643c71c00ee1f032dbf4c2271c2699ceb2 SHA512 5d919b6830f5a75c751d64476f5bf2b9b71ced1cee29e4156c4f01a9d7d8833dfdf8420747c55979c5b39b29fd63b5bf4bc3d27b756a617ef39f4e2ce4da2f93
 EBUILD ncnn-20210322.ebuild 883 BLAKE2B 67350ea55f8bec9dde95b5ee61930d7eafccc59c57a977fd4443ec90552931f088a4bc550290b591d866b573ad2e11ab5729fea4940f21f2a3e13a760bd672f5 SHA512 b0bebef4edf4b905f842a5736868fd67a2c41b0b501e14dfee27011f06f459134f3f7b8c8ffcfbab5891d894d66a3ea124adc27f37540e2b3660f5b4a61a0d13
-MISC metadata.xml 329 BLAKE2B a70f4b06a9dffcd4c7182c52354bda1faa068fdcb5785a1e8ffa40115cf963c89a40a321688618e95ac79e5c5eec1f87772cce5fe2fdf924b57b2c8d914b6660 SHA512 3ba55224bd0842ba5354ce52680471a7e5a364acb96d530bae821c99d3ca4a9e74db67c7f854eb89a7760996e4e4d4f050fb9933077213af0bd5c9a138869f96
+EBUILD ncnn-20210525.ebuild 1804 BLAKE2B 32c7b8bb64ef7b4b177a940ca130048832f92a3190c6bb411786629b09d5a486bc306ba7753c1adebff6f40b989f048e1f5b2eaa0ab79767d936e68f51106b63 SHA512 893c53fdeeda50ba6cb4ea76eea68a961d7d77cc98fc4f93894ef3a5b944517480795d3a4f1233f66b7bb71741b74760ba9b7912b81d1a3a6597bd314266e05b
+MISC metadata.xml 617 BLAKE2B 3f4be1642c013d6f065fa54f8ede9c9929d934e79b44dc615c85437a6e13c772efeadf534c10c895fa9841855d8db3a00fd0df97f9490e5190574c79166a3874 SHA512 53192d182ea04c21a9d69c5bc1fff7e08a149168fd6dfca44d5bd6191b886a09324a60667114432280b3d2175b3fb920d71aa70f8bb5e46295ebc91d39e405e1
diff --git a/dev-libs/ncnn/files/ncnn-fix-glslang-include.patch b/dev-libs/ncnn/files/ncnn-fix-glslang-include.patch
index bd96a79e1755..00eb01f03fc3 100644
--- a/dev-libs/ncnn/files/ncnn-fix-glslang-include.patch
+++ b/dev-libs/ncnn/files/ncnn-fix-glslang-include.patch
@@ -1,13 +1,9 @@
-diff --git a/src/gpu.cpp b/src/gpu.cpp
-index ce1306c..468cd03 100644
+Needed to use system's glslang rather than bundled.
+https://github.com/Tencent/ncnn/issues/2622
 --- a/src/gpu.cpp
 +++ b/src/gpu.cpp
-@@ -21,7 +21,7 @@
- #include <vulkan/vulkan.h>
- 
+@@ -23,3 +23,3 @@
  #include "glslang/SPIRV/GlslangToSpv.h"
 -#include "glslang/glslang/Public/ShaderLang.h"
 +#include "glslang/Public/ShaderLang.h"
  
- #include "command.h"
- #include "layer.h"
diff --git a/dev-libs/ncnn/metadata.xml b/dev-libs/ncnn/metadata.xml
index 64723a6c0066..93b23a68d96a 100644
--- a/dev-libs/ncnn/metadata.xml
+++ b/dev-libs/ncnn/metadata.xml
@@ -5,6 +5,14 @@
 		<email>slashbeast@gentoo.org</email>
 		<name>Piotr Karbowski</name>
 	</maintainer>
+	<maintainer type="person" proxied="yes">
+		<email>sudinave@gmail.com</email>
+		<name>Ionen Wolkens</name>
+	</maintainer>
+	<use>
+		<flag name="tools">Enable installation of various tools in addition to the library</flag>
+		<flag name="vulkan">Enable vulkan compute support</flag>
+	</use>
 	<upstream>
 		<remote-id type="github">Tencent/ncnn</remote-id>
 	</upstream>
diff --git a/dev-libs/ncnn/ncnn-20200226.ebuild b/dev-libs/ncnn/ncnn-20200226.ebuild
deleted file mode 100644
index 50685e1b06c3..000000000000
--- a/dev-libs/ncnn/ncnn-20200226.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="A high-performance neural network inference framework"
-HOMEPAGE="https://github.com/Tencent/ncnn"
-
-SRC_URI="https://github.com/Tencent/ncnn/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-util/glslang
-	dev-util/vulkan-headers
-	media-libs/vulkan-loader"
-
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_TOOLCHAIN_FILE="${S}/toolchains/host.gcc.toolchain.cmake"
-		-DNCNN_BUILD_EXAMPLES=OFF
-		-DNCNN_BUILD_TOOLS=OFF
-		-DNCNN_VULKAN=ON
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/ncnn/ncnn-20200413.ebuild b/dev-libs/ncnn/ncnn-20200413.ebuild
deleted file mode 100644
index efda01091014..000000000000
--- a/dev-libs/ncnn/ncnn-20200413.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="A high-performance neural network inference framework"
-HOMEPAGE="https://github.com/Tencent/ncnn"
-
-SRC_URI="https://github.com/Tencent/ncnn/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-util/glslang
-	dev-util/vulkan-headers
-	media-libs/vulkan-loader"
-
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-RESTRICT=test # Tests tries to use real GPU.
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_TOOLCHAIN_FILE="${S}/toolchains/host.gcc.toolchain.cmake"
-		-DNCNN_BUILD_EXAMPLES=OFF
-		-DNCNN_BUILD_TOOLS=OFF
-		-DNCNN_VULKAN=ON
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/ncnn/ncnn-20200727.ebuild b/dev-libs/ncnn/ncnn-20200727.ebuild
deleted file mode 100644
index efda01091014..000000000000
--- a/dev-libs/ncnn/ncnn-20200727.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="A high-performance neural network inference framework"
-HOMEPAGE="https://github.com/Tencent/ncnn"
-
-SRC_URI="https://github.com/Tencent/ncnn/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-util/glslang
-	dev-util/vulkan-headers
-	media-libs/vulkan-loader"
-
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-RESTRICT=test # Tests tries to use real GPU.
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_TOOLCHAIN_FILE="${S}/toolchains/host.gcc.toolchain.cmake"
-		-DNCNN_BUILD_EXAMPLES=OFF
-		-DNCNN_BUILD_TOOLS=OFF
-		-DNCNN_VULKAN=ON
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/ncnn/ncnn-20210525.ebuild b/dev-libs/ncnn/ncnn-20210525.ebuild
new file mode 100644
index 000000000000..efac9e4e5810
--- /dev/null
+++ b/dev-libs/ncnn/ncnn-20210525.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="High-performance neural network inference framework"
+HOMEPAGE="https://github.com/Tencent/ncnn"
+SRC_URI="https://github.com/Tencent/ncnn/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="tools +vulkan"
+
+# Need the static library to run tests:
+# -DNCNN_BUILD_TESTS=ON, -DNCNN_SHARED_LIB=OFF, USE=-vulkan (skip GPU)
+RESTRICT="test"
+
+RDEPEND="
+	dev-util/glslang
+	tools? ( dev-libs/protobuf:= )
+	vulkan? ( media-libs/vulkan-loader )"
+DEPEND="
+	${RDEPEND}
+	vulkan? ( dev-util/vulkan-headers )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-fix-glslang-include.patch
+)
+DOCS=( README.md docs/. )
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -i "/DESTINATION/s| lib| $(get_libdir)|" src/CMakeLists.txt || die
+
+	# Workaround build issues on AVX without AVX2 (bug #730468)
+	# This can be removed if CXXFLAGS="-mavx -mno-avx2" builds after a bump.
+	find src -type f -exec sed -i s/__AVX__/__AVX2__/g {} + || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON # for tools
+		-DGLSLANG_TARGET_DIR="${ESYSROOT}"/usr/$(get_libdir)/cmake
+		-DNCNN_BUILD_EXAMPLES=OFF
+		-DNCNN_BUILD_TOOLS=$(usex tools)
+		-DNCNN_PYTHON=OFF # missing portalocker, and nothing needs this for now
+		-DNCNN_SHARED_LIB=ON
+		-DNCNN_SYSTEM_GLSLANG=ON
+		-DNCNN_VERSION=${PV} # avoids libncnn.so.*.%Y%m%d (build date)
+		-DNCNN_VULKAN=$(usex vulkan)
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use tools; then
+		local tools=(
+			caffe/caffe2ncnn
+			darknet/darknet2ncnn
+			mxnet/mxnet2ncnn
+			ncnn2mem
+			ncnnmerge
+			ncnnoptimize
+			onnx/onnx2ncnn
+			quantize/{ncnn2int8,ncnn2table}
+		)
+		dobin "${tools[@]/#/${BUILD_DIR}/tools/}"
+	fi
+}
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index ccce50eaffe5..024bf90c0af7 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -6,5 +6,7 @@ AUX nspr-4.8.4-darwin-install_name.patch 1046 BLAKE2B 1182149b03bd2c03fc4051bf98
 AUX nspr-4.8.9-link-flags.patch 931 BLAKE2B 6aa6aa1cf3b856a95b7baa20f58e9ed83b8b29ccce37bab39e10e0e76c433ae5c79839b5f7f9bdaf8b2475c8e3692ff4a57c246dfa4e1fed6866ab284826ee0d SHA512 0bb61dc09d287f1324749c983404e1f03fdf7014fbbd32cc5abe452fc2f32b90b759d8f18d964a61da044b5a7221f5ba274d94c93c07c8a7359e3c937e44b975
 AUX nspr-4.9.5_nspr_config.patch 251 BLAKE2B 65ae8b981e758e2955b7a3358f24b7b17dc1ef59f0e78f9fd9ddee740a4da3825bafea34f3900200b3f6edefed7d0797c194cb0339d4e36551615d599156108d SHA512 3f118b7142a19dcc7e26b348cec6029c78d585a57cc2bfc2ab7ca13d2ef953e576dab0ac044316e3165d0201bf27253afa732109f914da6f7a39f19facff8310
 DIST nspr-4.30.tar.gz 1078175 BLAKE2B dcd55c9e267602e74a8e640f6a5f4bc47160f887fa528f409be33e78b21f0ab7e19df46fb6e729907a41c587b3d79f560da52463632660ef26c85b60e3cdc011 SHA512 b0d22e915f0533aa38e30e3cfd949d966d44d4c107d5f1a9d35b49cbbe759fda70f5d70f01d79fcf6b229128619f778a220df63ef7d07c21b616f9c44914a33e
+DIST nspr-4.31.tar.gz 1078163 BLAKE2B f1682a85e425c7babc40f1cbff4ec5b1101e04279df89c91520992bd288185cd52f682d4924e65a4620975d339d7704e359bfd36ac32e5ffebb8527d03f13171 SHA512 1f37d04721335288dd8a5cf700ead5a56cee73365e619f3da90f6067830b78a050a525950686bcdd14fcf61faffd1141ec46d4180a0dd10375f7e9fef6eac6ed
 EBUILD nspr-4.30.ebuild 3897 BLAKE2B d8eea75f84f2e4e06469394528dfccdfd1a9f82ae4c301445111e2a942123bade2de6f04d305198cffc179ec9ac6a1b6c37c3d4f0e164ae6b5f4b81f1cce6e29 SHA512 ea58e507ddf472f5fa560344dab8ca4f3022b4bbdc4f8805183d1142bd5ae7280f6638acd2a74decb0184c037cca0ea5ef8feb09ec580f4a376bab3ff01af637
+EBUILD nspr-4.31.ebuild 3905 BLAKE2B beffe244b6b9b998f3b2dfd58245deb316872b38e341eb5eea14400d2cae82609b6b369ff7a2409d3ffa3c3a62ea7bee155cd90396a57604517bda50a8236af4 SHA512 64ca9f3d0b72e8002dbc6cb4e303055ac394cbf4db3e953b2ca0c96b66433aa99b818fc711d62cbd62344d8338430cd3f132b7e1cc5303937faa30bca57a02d7
 MISC metadata.xml 349 BLAKE2B 06dabb7ec8263989dcff436449a820af581cc04ce9de05d7c4553751c8d9c6dc43a2af221c69107fca9ae046a1b3ec807cd3f3122195cffd23de9c6ce8b1c258 SHA512 5185204ed18d7e0e4a48f918dfd871a18c62572968767566b6e0c028075e1054ec8028aac412de0c598936a79e3f70486ef889f96b720e2b15d862cf91b12b23
diff --git a/dev-libs/nspr/nspr-4.31.ebuild b/dev-libs/nspr/nspr-4.31.ebuild
new file mode 100644
index 000000000000..e6c6b0dfafd2
--- /dev/null
+++ b/dev-libs/nspr/nspr-4.31.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs multilib-minimal
+
+MIN_PV="$(ver_cut 2)"
+
+DESCRIPTION="Netscape Portable Runtime"
+HOMEPAGE="https://www.mozilla.org/projects/nspr/"
+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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+IUSE="debug elibc_musl"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/nspr-config
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.23-prtime.patch
+	"${FILESDIR}"/${PN}-4.7.1-solaris.patch
+	"${FILESDIR}"/${PN}-4.10.6-solaris.patch
+	"${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch
+	"${FILESDIR}"/${PN}-4.8.9-link-flags.patch
+	# We do not need to pass -L$libdir via nspr-config --libs
+	"${FILESDIR}"/${PN}-4.9.5_nspr_config.patch
+)
+
+src_prepare() {
+	cd "${S}"/nspr || die
+
+	default
+
+	use elibc_musl && eapply "${FILESDIR}"/${PN}-4.21-ipv6-musl-support.patch
+
+	# rename configure.in to configure.ac for new autotools compatibility
+	if [[ -e "${S}"/nspr/configure.in ]] ; then
+		einfo "Renaming configure.in to configure.ac"
+		mv "${S}"/nspr/configure.{in,ac} || die
+	else
+		elog "configure.in rename logic can be removed from ebuild."
+	fi
+
+	# We must run eautoconf to regenerate configure
+	eautoconf
+
+	# make sure it won't find Perl out of Prefix
+	sed -i -e "s/perl5//g" "${S}"/nspr/configure || die
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
+		"${S}"/nspr/config/rules.mk || die
+}
+
+multilib_src_configure() {
+	# We use the standard BUILD_xxx but nspr uses HOST_xxx
+	tc-export_build_env BUILD_CC
+	export HOST_CC=${BUILD_CC} HOST_CFLAGS=${BUILD_CFLAGS} HOST_LDFLAGS=${BUILD_LDFLAGS}
+	tc-export AR CC CXX RANLIB
+	[[ ${CBUILD} != ${CHOST} ]] \
+		&& export CROSS_COMPILE=1 \
+		|| unset CROSS_COMPILE
+
+	local myconf=(
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		$(use_enable debug)
+		$(use_enable !debug optimize)
+	)
+
+	# The configure has some fancy --enable-{{n,x}32,64bit} switches
+	# that trigger some code conditional to platform & arch. This really
+	# matters for the few common arches (x86, ppc) but we pass a little
+	# more of them to be future-proof.
+
+	# use ABI first, this will work for most cases
+	case "${ABI}" in
+		alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86) ;;
+		n32) myconf+=( --enable-n32 );;
+		x32) myconf+=( --enable-x32 );;
+		s390x|*64) myconf+=( --enable-64bit );;
+		default) # no abi actually set, fall back to old check
+			einfo "Running a short build test to determine 64bit'ness"
+			echo > "${T}"/test.c || die
+			${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die
+			case $(file "${T}"/test.o) in
+				*32-bit*x86-64*) myconf+=( --enable-x32 );;
+				*64-bit*|*ppc64*|*x86_64*) myconf+=( --enable-64bit );;
+				*32-bit*|*ppc*|*i386*) ;;
+				*) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
+			esac ;;
+		*) ;;
+	esac
+
+	# Ancient autoconf needs help finding the right tools.
+	LC_ALL="C" ECONF_SOURCE="${S}/nspr" \
+	ac_cv_path_AR="${AR}" \
+	econf "${myconf[@]}"
+}
+
+multilib_src_install() {
+	# Their build system is royally confusing, as usual
+	MINOR_VERSION=${MIN_PV} # Used for .so version
+	emake DESTDIR="${D}" install
+
+	einfo "removing static libraries as upstream has requested!"
+	rm "${ED}"/usr/$(get_libdir)/*.a || die "failed to remove static libraries."
+
+	# install nspr-config
+	dobin config/nspr-config
+
+	# Remove stupid files in /usr/bin
+	rm "${ED}"/usr/bin/prerr.properties || die
+
+	# This is used only to generate prerr.c and prerr.h at build time.
+	# No other projects use it, and we don't want to depend on perl.
+	# Talked to upstream and they agreed w/punting.
+	rm "${ED}"/usr/bin/compile-et.pl || die
+}
diff --git a/dev-libs/nss-pem/Manifest b/dev-libs/nss-pem/Manifest
index ff147aaba975..a5c91a72016d 100644
--- a/dev-libs/nss-pem/Manifest
+++ b/dev-libs/nss-pem/Manifest
@@ -1,8 +1,4 @@
 AUX nss-pem-1.0.5-nss-3.53.1-support.patch 5005 BLAKE2B 4cacfbc965c5c5add442e8a37a1c4ad5c567763aeec7ab567c7558fd4b343cfeeec952a5d4c5131f279d3a7794b753ba424c27398263d4b03751a7308eda118c SHA512 8a19a7831d92e45f101ca44e278b319bfd3884d4eb17ec268ca08ed08542ecf51f81be23079e30d5b87aaa467f4104c88d739043aa3c36989540a69a23f4ae13
-DIST nss-pem-1.0.5.tar.xz 36320 BLAKE2B c2294595d95a2de2bf6d9e68dc10955297fb6ef27c9e85dbabc7854b900942070f70a8e4c1abef618e7265daa75f5bd2a2fca3fe923973345f9c1b64a3da8ff5 SHA512 8dabebf114ac94441caf6d279f810de4124a3ffc05ae66777496b3e66f8b8148d535cb438a165d84f53111c468d595f3b16651cd7a990eeedca9d413aad65b2b
-DIST nss-pem-1.0.6.tar.xz 36304 BLAKE2B ea804bb7b45c6d23c82ac823e36244b13d9b8ef8355cf30e82cc09850e623317ddffdbf4f8fd0ffa9253cd64d47dd12aa1738a8f720b3ac0e9091dff3421fa02 SHA512 2640c30aa8b0721e479f77781da7b4984553a01bff481084ad6e028cb6c99e2441f89b7758b5fc10f7c586e41dfcab2083a7c47bd1e0ce19712d0c61ac237540
 DIST nss-pem-1.0.7.tar.xz 36312 BLAKE2B 0ac494c7925c3a3c764c1154e846426d3cdcf21f37bd03dcab40bbe00ae95fe3a1b4a1f6bd2b5fe3c6f1d95877651474a72d7028eafcb143fad5f6263beeb1da SHA512 4762e3ce9e1c77952af3100acb5a043912da7e52af714973f1ce86d18b3d80424f0760e151b7c360c14cea07d86f75be250de14ee47601de46da75583bb3b0d2
-EBUILD nss-pem-1.0.5.ebuild 644 BLAKE2B 6c953bf5e89b2f2fe668af5204a463f9aba5103e20bab64378d3b41eb1fbc66e53ec16b284ea3593ea05674f897d7659b8b8c25f8a3d3320c2209274eb495aa0 SHA512 7e6c8698937df6330d566736391717e4030fa026216a7d5f3f015e27708ac60402f551987c729ce536c0203202b4377673062f7ad4f7e5d6f3e05b213fc5f452
-EBUILD nss-pem-1.0.6.ebuild 717 BLAKE2B 6e91bc089f8202ebd11485f70e634698aa8b037c19d32c0412c412316e504fc396298fa8fb6477606457b924dfd1af0bdac72a263f3502e7af3abb20d581acf3 SHA512 8b0102f0110b02740e6e19790b6d7cbde13a60b5bd3beab3626fe31883c5f96672c6c8f2d93ab51b7e20fc6a1c9fec95ce8ac05f58ca86b670718074d1e3501e
 EBUILD nss-pem-1.0.7.ebuild 702 BLAKE2B 410d9a2f78d5966dd5f26deba58716e841608cad779c9284fd77af7d0f0a0c76d5dfeea998237cca2130b2e955cc54a26e874534abef0f7c89571ebbef049a68 SHA512 11e2af21ddffc0f5266508e99d6c5881fd3d08d2c7edb68ea00c739fff075d2f26fdcf6a677fba2f60905d9c722acd6ec6bc2c92099b4398bd4b938c7f0e5495
 MISC metadata.xml 333 BLAKE2B cdd90c0d17983bf6dc3dbed22382259e079792e7294ad84af5b38d07609e184715322d2e8cb57623b13e24c6c5f68a1347cee111b089042b0a5eb11f1ceab2cf SHA512 d7c04e39d92a43fa144ec157c971250bfed9bd16e5334e1c337a3ebc29d79866c8d4832fb5c62766a74577b07b983eec96991a5531a07012fca77b53b705376b
diff --git a/dev-libs/nss-pem/nss-pem-1.0.5.ebuild b/dev-libs/nss-pem/nss-pem-1.0.5.ebuild
deleted file mode 100644
index 8c408455b23d..000000000000
--- a/dev-libs/nss-pem/nss-pem-1.0.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 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="~amd64 ~arm64"
-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.6.ebuild b/dev-libs/nss-pem/nss-pem-1.0.6.ebuild
deleted file mode 100644
index ffac0b1d5430..000000000000
--- a/dev-libs/nss-pem/nss-pem-1.0.6.ebuild
+++ /dev/null
@@ -1,36 +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="~amd64 ~arm64 ~hppa"
-IUSE=""
-
-BDEPEND=" >=dev-libs/nss-3.50-r1 "
-RDEPEND="${BDEPEND}"
-
-DEPEND="!<=dev-libs/nss-3.50
-	${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/nss-pem-1.0.5-nss-3.53.1-support.patch"
-)
-
-S="${WORKDIR}/${P}/src"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DLIB_INSTALL_DIR="$(get_libdir)"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 5f610aaed192..6df1b258285f 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -2,10 +2,10 @@ AUX nss-3.21-gentoo-fixup-warnings.patch 178 BLAKE2B b51f80310db3db416d8aeaf9117
 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.63.1.tar.gz 82166899 BLAKE2B a3c1939d16dcb083fae819659c0a61ff1d4dab70c8a7fc4b176a391bf7cd22eae1c93c85533b6af15e1c1cd9fb6b007380741e0b1670f3891f298ffa1b309284 SHA512 62d1bc161fc8eea6be191dc23ec42042a2626e119b7329f6449cf78729775776fd8e9faebd0457c2413684c15be6e10722ee4a7087c7c3e103fe993f3acec730
-DIST nss-3.64.tar.gz 82173054 BLAKE2B 4786a1ff6f4e47dbb6bfef6a2bc47ffeac51aa37f12168872d23799b8d6ca440578acf512e9ec7563ef64331d3fd84c387f17e41afa2ee30d8623c6f66207631 SHA512 0a85e1f64f97670f70596d8a479693939ca454025a4b3bbd557a54ed683ffed625c670fef6a6e3440365af9aa472384f84464942381b1c093659f6a6a222ba04
 DIST nss-3.65.tar.gz 82386222 BLAKE2B 4e1876a12d042b67c6654a8396611ca33d5257b07c75b55201de229f0a6860577886f38d640837d6512b30a074d05b917bae4e34263d9c0f6f4606c80b369a04 SHA512 6f980f44056c69c74754124ce16d4880fb47440146d55906584f70d1be8e74885570308914d4482b3ee676a1f5b1e529616eae8ccd6906d678394dd929dd0825
-DIST nss-cacert-class1-class3-r1.patch 22503 BLAKE2B d2ba6b5c3675484dab5b6709478101a9dadc0baded3dbf891dcd04e5eb912079b87cdd17f893a0f539a2a53fb05357c6dd309fb624facac3b021c82c7424a91f SHA512 68906d2442986ad13ebf9cd97c26fac34af3efd5cfaacb3d7824adad966349ad796c9cec8dec44c46d5c571df88ce83aea02ce82e71da337aa4e1aeef58eda66
-EBUILD nss-3.63.1.ebuild 9222 BLAKE2B ef1afc1f6d05c0b1797759b093a1e5baa00d75371f6260302d2fe998d0b5d4f7dcfbb0ed05f21a122b5a9ed210d5e4f520353ff403d62c80d6cedc225a08fb94 SHA512 f7c24d8da1afe3514c4019b054d710061d095a808ebca71b1147eff17af1b62fb22d8853692a6820b70e3aae24e617f029f2767395b8fa1776698d0c6593f003
-EBUILD nss-3.64.ebuild 9230 BLAKE2B b75b7ae2b93705d2d87560a4307ef92691c5d9e566e3fd5c91362457a083a20f188671478f8bb03eece5ee599ef9725e67fe00a3d47e5dfae3d22d616f81fbf5 SHA512 7cc7697cf96188d5eacd43d849e9df72ce16fdc60f9e8833411941ffb653db68657aa57fa9ccef82936fc09e947a55d983c2727deeba0510569a03502631e7b5
-EBUILD nss-3.65.ebuild 9230 BLAKE2B b75b7ae2b93705d2d87560a4307ef92691c5d9e566e3fd5c91362457a083a20f188671478f8bb03eece5ee599ef9725e67fe00a3d47e5dfae3d22d616f81fbf5 SHA512 7cc7697cf96188d5eacd43d849e9df72ce16fdc60f9e8833411941ffb653db68657aa57fa9ccef82936fc09e947a55d983c2727deeba0510569a03502631e7b5
-MISC metadata.xml 515 BLAKE2B a63fb05a1a3e1b06f929f963ab0794ec1230e89903fc97a7c7db81a0b3c7b7e8b9277eaa7440f8929738ec0f805d8a8dd51c8262e569fb9be2fa0938b08ad7a2 SHA512 6bec952825416ba0ab8282669483eb75935f6b4a3052e0f78dad911c0246b8d8ce245c86cbd82b292d49338848fa50fb2009fb4a9def1ac8d81bf9a3320cd2b0
+DIST nss-3.66.tar.gz 82401896 BLAKE2B ae369899af681e1c6ea8046098c83da08c2112b16d85a0eaee46e9d4f97dfb3f7c3e97eb681ec947b5648446c6db51e8f1396ec9bb6c731c9678ecf925e7f743 SHA512 327129cb065a8c19246e081e3cbc4798c81dc52eab6ee366eade151e9d308990592075c52a7c672165725fd855a0c539d56a803c26ef066561c584d693e0e467
+DIST nss-cacert-class1-class3-r2.patch 21925 BLAKE2B 7627ff9a09f084c19d72d0490676865e3cab3ca7c920ae1ce4bea2db664f37fd0aa84fcda919809a516891ab2a62e2e7a43a9d6ada4c231adfe4c216525fac7d SHA512 1ce6ff9ab310aaca9005eafb461338b291df8523cc7044e096cd75774ce746c26eed19ec6bb2643c6c67f94650f2f309463492d80a90568f38ce2557f8ada2f4
+EBUILD nss-3.63.1-r1.ebuild 9222 BLAKE2B 8c6ad2c1156913b3a21c056524ebde104e2b6d2d8422eb5f3ae8c9782bf671ce70f8e6ccc527201e7d4c6ce3e7a703d00fe349c719368f6df0d96a36f0be06d9 SHA512 e5e73cbf0cfb93d4493278e8ec93faeb704196d5ec19aaa3e27c42518c611605b87118f2fbfe546575cd549a98c2df2b09da42bcf4a26eb86af56678fbd8b1d9
+EBUILD nss-3.65-r1.ebuild 9230 BLAKE2B 408cc679ea3d4aab61374410a0ae450ba24881f2d33879a2f98548ab282f7ced8066eee1cf3d77e981784f7359126d773985e6bc024bb93e6932fe5e7a364cbb SHA512 d6d578c57b87341aa22ffb207be76c85de7442a7ed50ff91c910d8e9d49246a3fe39451b4ff6c85c9a082f4d87f7ae86808863823295c32244eafeeeed577b07
+EBUILD nss-3.66.ebuild 9230 BLAKE2B 408cc679ea3d4aab61374410a0ae450ba24881f2d33879a2f98548ab282f7ced8066eee1cf3d77e981784f7359126d773985e6bc024bb93e6932fe5e7a364cbb SHA512 d6d578c57b87341aa22ffb207be76c85de7442a7ed50ff91c910d8e9d49246a3fe39451b4ff6c85c9a082f4d87f7ae86808863823295c32244eafeeeed577b07
+MISC metadata.xml 516 BLAKE2B d2657cd7422f790cd002e8cbf149bf840888d5a95598f5366dc88ef31fa7a34df20de3e4bab9a1e6a165dd34321317916bbb605c9f850d92bfef19bd4fdf5cba SHA512 5423340287855dc948c1897ae770c2f11a3a5fddce3e484803cccbcda6074825b5037d7fb16cdc837222c85be3c11f37c85045702462f73e56e9fe5ef1cd0259
diff --git a/dev-libs/nss/metadata.xml b/dev-libs/nss/metadata.xml
index c76b165099c1..117bb1aac778 100644
--- a/dev-libs/nss/metadata.xml
+++ b/dev-libs/nss/metadata.xml
@@ -7,7 +7,7 @@
 </maintainer>
 <use>
   <flag name="cacert">
-    Include root/class3 certs from CAcert (http://www.cacert.org/)
+    Include root/class3 certs from CAcert (https://www.cacert.org/)
   </flag>
   <flag name="utils">Install utilities included with the library</flag>
 </use>
diff --git a/dev-libs/nss/nss-3.63.1.ebuild b/dev-libs/nss/nss-3.63.1-r1.ebuild
index 106c5b77225a..ab23dc3b5588 100644
--- a/dev-libs/nss/nss-3.63.1.ebuild
+++ b/dev-libs/nss/nss-3.63.1-r1.ebuild
@@ -11,7 +11,7 @@ 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-r1.patch )"
+	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"
@@ -45,7 +45,7 @@ src_prepare() {
 	default
 
 	if use cacert ; then
-		eapply -p2 "${DISTDIR}"/nss-cacert-class1-class3-r1.patch
+		eapply -p2 "${DISTDIR}"/nss-cacert-class1-class3-r2.patch
 	fi
 
 	pushd coreconf >/dev/null || die
diff --git a/dev-libs/nss/nss-3.64.ebuild b/dev-libs/nss/nss-3.65-r1.ebuild
index f05b462f30da..200e2c3b7bf9 100644
--- a/dev-libs/nss/nss-3.64.ebuild
+++ b/dev-libs/nss/nss-3.65-r1.ebuild
@@ -11,7 +11,7 @@ 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-r1.patch )"
+	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"
@@ -45,7 +45,7 @@ src_prepare() {
 	default
 
 	if use cacert ; then
-		eapply -p2 "${DISTDIR}"/nss-cacert-class1-class3-r1.patch
+		eapply -p2 "${DISTDIR}"/nss-cacert-class1-class3-r2.patch
 	fi
 
 	pushd coreconf >/dev/null || die
diff --git a/dev-libs/nss/nss-3.65.ebuild b/dev-libs/nss/nss-3.66.ebuild
index f05b462f30da..200e2c3b7bf9 100644
--- a/dev-libs/nss/nss-3.65.ebuild
+++ b/dev-libs/nss/nss-3.66.ebuild
@@ -11,7 +11,7 @@ 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-r1.patch )"
+	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"
@@ -45,7 +45,7 @@ src_prepare() {
 	default
 
 	if use cacert ; then
-		eapply -p2 "${DISTDIR}"/nss-cacert-class1-class3-r1.patch
+		eapply -p2 "${DISTDIR}"/nss-cacert-class1-class3-r2.patch
 	fi
 
 	pushd coreconf >/dev/null || die
diff --git a/dev-libs/ocl-icd/Manifest b/dev-libs/ocl-icd/Manifest
index d9a59f63afbd..95d9c24d6f8e 100644
--- a/dev-libs/ocl-icd/Manifest
+++ b/dev-libs/ocl-icd/Manifest
@@ -1,6 +1,7 @@
 AUX ocl-icd-2.2.12-gcc-10.patch 1551 BLAKE2B 0a2b6c66e83e67db9ba08af5311da65fc8795e36c9de1b25e53db8c593796c3f5903452bc3cc5c9e36c8fc32e286a588b942d9687c38d95133f125054cfbba48 SHA512 4d0a9168d31efe845c20623802aadc91bdf87524700708ba6ffcacd563344f4eb952eed99326ccd7d44b6ffbed145edae7d453b32a70362531d416c1b521bd4a
+AUX ocl-icd-2.3.0-new-headers.patch 4641 BLAKE2B 0013da2cfbe61cf98f98740055b54f2a3a1afacbf7d8845f0a3f53622e4a5e848d8d5d0be279e4717f29bc8e379affb3508aa2efa1c355c073ca42e883bdeead SHA512 951f1fb715031ebd6b1146b08d34fdc98154435129f8c1fb7b7b01ca33e10fdf2b8651c231fc1f47a41d3dc66c77df29786b3535099b7bbaac2e2b62fa4edc93
 DIST ocl-icd-2.2.12.tar.gz 80718 BLAKE2B 524f9eea9782323eafa2f41858c4970333c029898c651bbf15624331e184d1b439d2259532b02defd67c9ab434a35b1b9a64a28e1515b3f42f09b3a270975df7 SHA512 f1668c3a39ecfbc089ee5a5f61f44ceb86ab80e504e58064dec306ce907daf77936c5403b4af15ed8714068891d68346c86725f285cfbc90c4fcb35d18db4048
-DIST ocl-icd-2.2.14.tar.gz 100629 BLAKE2B 4862560541c979edb06d89f7f57b78a34c02e38843c02b0f125a121649cd6a33570e29c86fe7d3fd6f0fa3d489831777100daef97264e32b82854384075cbbf2 SHA512 78510b6fa4e2c6a52141a51ccf0d0ef3110b0b4902a43bb97f7622ff0ce470b108dc05c9619c28ce8758ccea1e1cf6b2e7f1a296f8b07f52532f23b2b036a5cf
-EBUILD ocl-icd-2.2.12-r3.ebuild 1200 BLAKE2B 30cdb8257c4ec6c10f47edaf53c6f3ef055cfc1107cdea5512be426a21983d9dc4352b5ff518feff23383560c565b9246781274bba8c1239d6f0af79d16d1e0a SHA512 aa0cd0135aa63dcc4521b043dcf1e00dc07bcae6deb6ed49c6802fa3979bdf433e7aaadefcf9638dc95a3a477604f2540b7f3c993ab2947444dd18e1d41838e4
-EBUILD ocl-icd-2.2.14.ebuild 1172 BLAKE2B 1e9f4b6c9a504d7b1f1e2345ceb598716299ea9043d0974e42ad6b26eeec099daf9d6902900d27e1dc3d4dffdd787e06e9f6eaf3e7ff482f777cb5929dd1f1b1 SHA512 885ec62b6b718dde98f1789acb966572292c12c5ac3c4fa650835e002ab9782887d67bbe77485b151b08ac3eead72194393d89287142e383d2764b179f40fe92
+DIST ocl-icd-2.3.0.tar.gz 100848 BLAKE2B b9e5b78df63f4865bb4cb3623fbc6bd336c86b4a9e1f23a29fab1cf11f848cb20d6d8d4a480ff44e442b02d606247a923798143058256ef59c2b16c9daf7098d SHA512 003f3661b7086a7364e79d1058591f12a7095aa2c3decfc4b496f00a0863a91cd81080f33b9308e3948045f8aca5856868ed2725f478654230e51a60d654e613
+EBUILD ocl-icd-2.2.12-r4.ebuild 1245 BLAKE2B 54353b59e3466d5bfc0b4428b77417720e22bf2313ef24db4f3ff4037f5f3752395bcd0bb5aff30213fe15c881856f1922b1184be14e6e8cd272d814d066cddf SHA512 5b2bd8bdcb082456b6f8a11dd8f58a4ee5cfb3748858558c7c9279f06451739ad92f2c7984333f1acdf593bb34813c1bf7c23dd4ad6a2fa884fa873c690dd3fd
+EBUILD ocl-icd-2.3.0.ebuild 1526 BLAKE2B 05d8c1ca540428b0131a5b09a090a1d2d9c2e18ec6548bcf34f94a32bb159a7a7a4895ed8de8452547690ae4e34cbdf3c10c7fe8e5029be052f6e01cf85da65c SHA512 a430f6108f48c20a0590e84fd94888743daceaa091a716136b6f17d69fb3adb8a363c4963d57247b58af6f929e8caaf63c52ad10a0877f0db328134d37682036
 MISC metadata.xml 396 BLAKE2B e87119ee4f6793c9fa1229c9c2430f8eba749df95522f5f658a6bc26fa22265bdcaa185e8338eef057320342beea263b64f162b2a8ad3c6aa4db73307b949244 SHA512 69effb7af79439eae9702055f6f1e20318f30ef76827e5be6d69ae63ff39a6bafbb177c681f76ac9bdf861a9921d7c897cecaea320d796e6d104dbcab9a24b79
diff --git a/dev-libs/ocl-icd/files/ocl-icd-2.3.0-new-headers.patch b/dev-libs/ocl-icd/files/ocl-icd-2.3.0-new-headers.patch
new file mode 100644
index 000000000000..aa35c96ccda6
--- /dev/null
+++ b/dev-libs/ocl-icd/files/ocl-icd-2.3.0-new-headers.patch
@@ -0,0 +1,94 @@
+From aed1832c81c0971ea001e12d41e04df834257f94 Mon Sep 17 00:00:00 2001
+From: Brice Videau <bvideau@anl.gov>
+Date: Wed, 12 May 2021 10:24:44 -0500
+Subject: [PATCH] Updated to support latest Khronos headers.
+
+---
+ icd_generator.rb                              |   4 +-
+ khronos-headers/CL/cl.h                       |  46 +--
+ khronos-headers/CL/cl_d3d10.h                 |  12 +-
+ khronos-headers/CL/cl_d3d11.h                 |  12 +-
+ khronos-headers/CL/cl_dx9_media_sharing.h     |  32 +-
+ khronos-headers/CL/cl_egl.h                   |   8 +-
+ khronos-headers/CL/cl_ext.h                   | 228 +++++++++----
+ khronos-headers/CL/cl_gl.h                    |  22 +-
+ khronos-headers/CL/cl_gl_ext.h                |  26 +-
+ khronos-headers/CL/cl_icd.h                   | 316 +++++++++---------
+ khronos-headers/CL/cl_layer.h                 |   4 +-
+ khronos-headers/CL/cl_platform.h              | 125 ++++---
+ .../CL/cl_va_api_media_sharing_intel.h        |  24 +-
+ khronos-headers/CL/opencl.h                   |   3 +-
+ ocl_interface.yaml                            |  10 +-
+ run_dummy_icd.c                               |   1 -
+ 16 files changed, 484 insertions(+), 389 deletions(-)
+
+diff --git a/icd_generator.rb b/icd_generator.rb
+index bb0f2e9..ed4217f 100644
+--- a/icd_generator.rb
++++ b/icd_generator.rb
+@@ -57,7 +57,7 @@ module IcdGenerator
+                          "clGetGLContextInfoKHR", "clUnloadCompiler",
+     "clCreateContext", "clCreateContextFromType", "clWaitForEvents"]
+   $header_files = ["/usr/include/CL/cl.h", "/usr/include/CL/cl_gl.h", "/usr/include/CL/cl_egl.h",
+-    "/usr/include/CL/cl_ext.h", "/usr/include/CL/cl_gl_ext.h"]
++    "/usr/include/CL/cl_ext.h"]
+   $windows_header_files = ["/usr/include/CL/cl_dx9_media_sharing.h", "/usr/include/CL/cl_d3d11.h", "/usr/include/CL/cl_d3d10.h"]
+   $cl_data_type_error = { "cl_platform_id"   => "CL_INVALID_PLATFORM",
+                           "cl_device_id"     => "CL_INVALID_DEVICE",
+@@ -246,7 +246,7 @@ def self.generate_run_dummy_icd_source
+     run_dummy_icd += "\n\n"
+     $api_entries.each_key { |func_name|
+        next if $forbidden_funcs.include?(func_name)
+-       run_dummy_icd += $api_entries[func_name]+";\n"
++       run_dummy_icd += $api_entries[func_name]+"\n"
+     }
+     run_dummy_icd += "\n\n"
+     run_dummy_icd += "void call_all_OpenCL_functions(cl_platform_id chosen_platform) {\n"
+diff --git a/ocl_interface.yaml b/ocl_interface.yaml
+index 1e80f16..43a0e59 100644
+--- a/ocl_interface.yaml
++++ b/ocl_interface.yaml
+@@ -674,18 +674,18 @@
+                         const cl_device_partition_property_ext * /* properties */,
+                         cl_uint /*num_entries*/,
+                         cl_device_id * /*out_devices*/,
+-                        cl_uint * /*num_devices*/ ) CL_EXT_SUFFIX__VERSION_1_1;
++                        cl_uint * /*num_devices*/ ) CL_API_SUFFIX__VERSION_1_1;
+ 90: |-
+   CL_API_ENTRY cl_int CL_API_CALL
+-  clRetainDeviceEXT( cl_device_id /*device*/ ) CL_EXT_SUFFIX__VERSION_1_1;
++  clRetainDeviceEXT( cl_device_id /*device*/ ) CL_API_SUFFIX__VERSION_1_1;
+ 91: |-
+   CL_API_ENTRY cl_int CL_API_CALL
+-  clReleaseDeviceEXT( cl_device_id /*device*/ ) CL_EXT_SUFFIX__VERSION_1_1;
++  clReleaseDeviceEXT( cl_device_id /*device*/ ) CL_API_SUFFIX__VERSION_1_1;
+ 92: |-
+   CL_API_ENTRY cl_event CL_API_CALL
+   clCreateEventFromGLsyncKHR(cl_context           /* context */,
+                              cl_GLsync            /* cl_GLsync */,
+-                             cl_int *             /* errcode_ret */) CL_EXT_SUFFIX__VERSION_1_1;
++                             cl_int *             /* errcode_ret */) CL_API_SUFFIX__VERSION_1_1;
+ 93: |-
+   CL_API_ENTRY cl_int CL_API_CALL
+   clCreateSubDevices(cl_device_id                         /* in_device */,
+@@ -1016,7 +1016,7 @@
+                              const void * /*input_value*/,
+                              size_t /*param_value_size*/,
+                              void* /*param_value*/,
+-                             size_t* /*param_value_size_ret*/ ) CL_EXT_SUFFIX__VERSION_2_0;
++                             size_t* /*param_value_size_ret*/ ) CL_API_SUFFIX__VERSION_2_0;
+ 137: |-
+   CL_API_ENTRY cl_kernel CL_API_CALL
+   clCloneKernel(cl_kernel     /* source_kernel */,
+diff --git a/run_dummy_icd.c b/run_dummy_icd.c
+index 400c1b0..c064b19 100644
+--- a/run_dummy_icd.c
++++ b/run_dummy_icd.c
+@@ -39,7 +39,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #  include <CL/cl_gl.h>
+ #  include <CL/cl_egl.h>
+ #  include <CL/cl_ext.h>
+-#  include <CL/cl_gl_ext.h>
+ #pragma GCC diagnostic pop
+ #include <string.h>
+ #include "ocl_icd_debug.h"
diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.12-r3.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.12-r4.ebuild
index 73e2edae5f4f..d3d2516ba6d3 100644
--- a/dev-libs/ocl-icd/ocl-icd-2.2.12-r3.ebuild
+++ b/dev-libs/ocl-icd/ocl-icd-2.2.12-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,6 +18,7 @@ KEYWORDS="amd64 x86"
 IUSE="+khronos-headers"
 
 BDEPEND="${RUBY_DEPS}"
+DEPEND="~dev-util/opencl-headers-2020.06.16"
 DEPEND="dev-util/opencl-headers"
 RDEPEND="${DEPEND}
 	!app-eselect/eselect-opencl
diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.14.ebuild b/dev-libs/ocl-icd/ocl-icd-2.3.0.ebuild
index e5b4c9f26236..3a274d0c1685 100644
--- a/dev-libs/ocl-icd/ocl-icd-2.2.14.ebuild
+++ b/dev-libs/ocl-icd/ocl-icd-2.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 inherit autotools flag-o-matic multilib-minimal ruby-single
 
 DESCRIPTION="Alternative to vendor specific OpenCL ICD loaders"
@@ -18,11 +18,15 @@ KEYWORDS="~amd64 ~x86"
 IUSE="+khronos-headers"
 
 BDEPEND="${RUBY_DEPS}"
-DEPEND=">=dev-util/opencl-headers-2020.12.18"
+DEPEND=">=dev-util/opencl-headers-2021.04.29"
 RDEPEND="${DEPEND}
 	!app-eselect/eselect-opencl
 	!dev-libs/opencl-icd-loader"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-new-headers.patch
+)
+
 src_prepare() {
 	replace-flags -Os -O2 # bug 646122
 
@@ -36,6 +40,19 @@ multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf --enable-pthread-once --disable-official-khronos-headers
 }
 
+multilib_src_compile() {
+	local candidates=(${USE_RUBY})
+	local ruby=
+	for (( idx=${#candidates[@]}-1 ; idx>=0 ; idx-- )) ; do
+		if ${candidates[idx]} --version &> /dev/null; then
+			ruby=${candidates[idx]} && break
+		fi
+	done
+	[[ -z ${ruby} ]] && die "No ruby executable found"
+
+	emake RUBY=${ruby}
+}
+
 multilib_src_install() {
 	default
 
diff --git a/dev-libs/pegtl/Manifest b/dev-libs/pegtl/Manifest
index 81a535852734..ff38f0dafb1f 100644
--- a/dev-libs/pegtl/Manifest
+++ b/dev-libs/pegtl/Manifest
@@ -2,6 +2,6 @@ AUX pegtl-2.8.3-cmake.patch 1688 BLAKE2B d99c349dc31468cf84c2d2f3a26d514e5ae8c55
 AUX pegtl-2.8.3-gcc-10.patch 1499 BLAKE2B 55d866cd49d3c3ea157981c948127f7b1b29a7e9eef4f4f660aece9a322065faac2e0df8d1ed5f0c48b9ed009f94942b99e49eee13680ba5b2c25ef062a6ba2c SHA512 3a9255811d4c579aeb7552ff9eb6697e9401746ce0df031e2432266e946c6ff0b7e26792c37bf01c3ee3a89d31aaa8b39f4527025701ed0f6e6a49a96a93984f
 DIST pegtl-2.8.3.tar.gz 201531 BLAKE2B 093d1b5f7d1f95fa00abdae9c24d24ba9ffd8510d6512c3460374f19b12d50403c19301645c5f6fc4d697cc687079c5b0d23c32b5775b30fbf05a154aeec2c19 SHA512 9f7644b86741dfe61716bbc43b2ea0a02cfc21eaf229c47cc71a49e2f08bf2c1ff37d2b2242a1bcf518b1893be6b82c27b0e9010a1b47ef8df87ffd90d280f71
 DIST pegtl-3.2.0.tar.gz 233138 BLAKE2B 9be2cfcd90249fd57e08944533cb336f0617957c5571ef3d5371aa6da756a350ccb192b6e4e35da22b7b4e88b07e42f54eb5296c496a6b0feb544269a490f928 SHA512 3ec457e37d87d95f3a89c550abbf611a1ce094c2f05f6d23086e70079a9cabddb4c75e9121e764ad1768845a39e62ab49ca658ffed0f09d0e9a0e36501a162ae
-EBUILD pegtl-2.8.3-r1.ebuild 721 BLAKE2B 1b9ccb93bd4b593b8bd20636f14eacc6d5296646e8e76a1feee4c5858297f65c5ad60d0540683bf3b121c9c0dd7bb74a46c9348e78fc4f85869dbeb2c4c890fb SHA512 9960fef33434f9a272eda13e30a9dc8379f454922b46879a9e137a535e42e43cbb7be9f7ffe291a106e5ee47648b3a201168c8f6d37f6b5350c6007b500903b1
+EBUILD pegtl-2.8.3-r1.ebuild 728 BLAKE2B 8829d909043d92b5581e7dc3b89e3fb08baa0dc2942cffd13aaefccd417a7d48c7f2a8e8f6bec28a0c8aca168b7892984a88d57c23a0121cd2f74bd12a9efaa4 SHA512 f55c59b83f986a6ce8d4ada2bc4166c998161cc76ddc3ed986183160cd71cd567026cb5a54bf9c6b6cc3b99c748684da6b2927c4d6f08524333f236335262b5e
 EBUILD pegtl-3.2.0.ebuild 631 BLAKE2B 2fc285796ac7f29f180e408192dad8b673fec08d5ab8a513d22c9a9f63cd3bf682cd53b9923e9689ccb71ffd38f138245aa2e7a64c44a296d6523111d9df20e9 SHA512 138a9c002084645f12c37ee2fb6757d0bb992da805b65048e76e3743deb34de036b60defa87b4cfdfa8e0fc0dd81825629d9c008c6bb4615253d610dd7935719
 MISC metadata.xml 330 BLAKE2B 1ecf1d4e82723b878142197d5d8ace0b53f719bdf64fb5988c566ffaf1b60a9d7f899664a21c51d7645503f84376945e428cb9523caa92c1c09091284b42e5e1 SHA512 5177a4fb177ebd3064cbd9dd9abdda753d9c8349dae0e9dd9e02b6f61b3145f55ff691616a8933f3cc75da26f26af25770feeafce64586e4e16eca3d9a63689c
diff --git a/dev-libs/pegtl/pegtl-2.8.3-r1.ebuild b/dev-libs/pegtl/pegtl-2.8.3-r1.ebuild
index 207b474188a1..1c9a5a23ff8e 100644
--- a/dev-libs/pegtl/pegtl-2.8.3-r1.ebuild
+++ b/dev-libs/pegtl/pegtl-2.8.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/taocpp/PEGTL/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/qqwing/Manifest b/dev-libs/qqwing/Manifest
index c6ac6e2f13b9..b4aa86868a98 100644
--- a/dev-libs/qqwing/Manifest
+++ b/dev-libs/qqwing/Manifest
@@ -2,5 +2,5 @@ AUX qqwing-1.3.0-autotools.patch 5417 BLAKE2B 9314f4e0c85b8bf646b22ebd13409b305f
 DIST qqwing-1.3.3.tar.gz 89629 BLAKE2B 5583318d15a4bf31833576bec037ab27fc17a57c95ef42be828ae0de9d6d86709fdcb63f71cf51b737b45c39657220e1e14a817094065f29b17c668f53b16075 SHA512 cce6e3122f0620b4a27f5c4186b468906006b6f9deda0b3fc474d40e678722bbb07474c479a75cbcac0812a097e5be4d7ae58339810a897f966d5a73b07a6833
 DIST qqwing-1.3.4.tar.gz 352060 BLAKE2B cf78a3d06c529ab1d47739ee0914e268fe8375d5dd7eb73a05ed91fcd7231b0f2103ae2490a8edf438ebce5ec77457f2686338edb61c38a804af34df78763c31 SHA512 6762b97d7595e7831edb80d9fac06ca784c6dfb6c5717e72adaac6973ec94bec417806f8ae4b80ed95b876388c8c1a00906b0fa8653a115998c5170db25aab0d
 EBUILD qqwing-1.3.3.ebuild 489 BLAKE2B 6a7a6bb5ae79a76ec00bfd818c15817c3ec12abbc580c8a6358f7e323056d95450908363bf562f1af5f9704b0215a8559e0e02fcab32529857344335af15ba03 SHA512 3d78c8ef369708afd53aab36d7166add1b9f009ce68cbf25b621db4e9e3ad57412f02b341c3ee773e67deeeeace069c0588693df95bbeac207d45d61d4b60684
-EBUILD qqwing-1.3.4.ebuild 360 BLAKE2B b072a7c3cf93cf04ea0bc3a215d79fdf18dc94b43ba494920536cc6741692d81de5af520caec46f4c648690d64ac3436aeaff64d40f99cdfbd1525a966541119 SHA512 1595d9acfa4207b8a19da5e75e4ebc869b30d6a3ca2e3c8ead2dadec810f9a781b6f169f0565a52482c6536ef50686d00fc502cb6b15195aa21a7b6415f9b34b
+EBUILD qqwing-1.3.4.ebuild 364 BLAKE2B d8c9a7f0e534fa4587d89b264d25a1fa6b43999a896ebd73eb88dfbbd84c5b7aba4871792d98de323c6054d0a13415c7ee6dbebfee63317ab339d5f936fab0a3 SHA512 f2adb6a4bddee3545bb7d2480808d97df181e751637e8aa09814bd705cb4106f143f5f81d6c0561562285a0f5cdb92a21789a3af18c7fd49d7f52a6846b541f6
 MISC metadata.xml 343 BLAKE2B 912f9f399214a554261a33b1f52f90a9fb43540437c0dd37dd9555bc3e27b526f661c43611599362f4a7094a43f7dc1f61931a155e704e119a9187ea807759ea SHA512 66bf722993792485e5e84f2ca612dcc9b803fa022ba94249788b211f48a27e360c9bdd5303a3858fdb73cb2d71eb23377ab67ee0918cfdafb8711cab9283deca
diff --git a/dev-libs/qqwing/qqwing-1.3.4.ebuild b/dev-libs/qqwing/qqwing-1.3.4.ebuild
index ccd031c7ed29..02c5bd8cc293 100644
--- a/dev-libs/qqwing/qqwing-1.3.4.ebuild
+++ b/dev-libs/qqwing/qqwing-1.3.4.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=5
 
-inherit ltprune
-
 DESCRIPTION="Sudoku puzzle generator and solver"
 HOMEPAGE="https://qqwing.com"
 SRC_URI="https://qqwing.com/${P}.tar.gz"
@@ -15,5 +13,5 @@ KEYWORDS="amd64 arm ~arm64 x86"
 
 src_install() {
 	default
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/rapidxml/Manifest b/dev-libs/rapidxml/Manifest
index b71fbc1fa0b3..131373d6db36 100644
--- a/dev-libs/rapidxml/Manifest
+++ b/dev-libs/rapidxml/Manifest
@@ -1,4 +1,5 @@
 AUX rapidxml-1.13-clang.patch 1650 BLAKE2B 6e807a3266dbaa5a575a7036ec65b2ce6cfdb3347f4baa0c776f7ba2791fb363fb861994363a9131111e61a40f0aef818ad2e484b0b9f8d676a1cebc79be7d85 SHA512 b55735e503fbf51fa24c381effb1346dde3a2d31f0a4320634fab816832d75b23f51839f280d837247bc228d59504170bda1c1350898f9b4f79c011084f0d0e3
+AUX rapidxml-1.13-iterators.patch 1627 BLAKE2B aa5404188f12d0c193ececb43bcf0491ae03579535485f8d677b9621255b876165261007c775223851816a8552f0268349f11f54dc50fae3efbb2c0bd365a4a8 SHA512 37c5555ccc1a39f503d84e9209180937a63e431d8e5009d54e99335b2f0808b0e6c2bd6e551dca72ab535e4ac805660082de3f244b0605efd9884a9adb2bf57a
 DIST rapidxml-1.13.zip 44163 BLAKE2B 9db90dfca1943c47e95541a323e1210368447c054cf072d6768031488070e375fe2aa78a4e41f61f252d4c487e94cf1e24e4d3756e3f8774b0c2c52ef86959e7 SHA512 6c10583e6631ccdb0217d0a5381172cb4c1046226de6ef1acf398d85e81d145228e14c3016aefcd7b70a1db8631505b048d8b4f5d4b0dbf1811d2482eefdd265
-EBUILD rapidxml-1.13-r1.ebuild 470 BLAKE2B 5980f833c7b4731a142bc1247927352a21a62e304016df596bb32b5ec5746bcaae00ad849461209a2adb2c23beb025d864241978e90a21327a84b99be7b6dcd0 SHA512 ff849cc207629d4ea144c81d0c98b5e17d924a2fd64d249eceb9c18c2a866bd668569874845b10f5da14a9c38acde42ba94dfd69d1c7e2039a0ff0a1b8a4fdf9
+EBUILD rapidxml-1.13-r1.ebuild 506 BLAKE2B b1cfe9b7a953971e2b2170c9021bd9a838830460cf2f069fac2b03cce3fa9f842f1fc32f657473cadb4d808c6f1a2b4cb4ae87820b81354637723ec9fc6078c3 SHA512 8e18151c110bd6478a291332912d82d9eb0744e31268fb0e4a9ff287d233b98c3c31af498f7a43b954af0d1a1968cd337a732bc1a0b7a7771bc2fc8bc6e08793
 MISC metadata.xml 331 BLAKE2B 76a526f6ca4463cd836f236c88d20308be9ce4660a996c8efec1cb4266c776692e8cdebdea353d9c91f8b86cfdf9e697a2ca8c5ad60b3a790c7c19fd62e41578 SHA512 b38279f1436fa145a86830d5aada7ac41581c16aadab546621a0cabf72c1ca26b275c158a1a051e4b47f16e936c5c93bb7d5f8e386dfa9b5135b434d3034af22
diff --git a/dev-libs/rapidxml/files/rapidxml-1.13-iterators.patch b/dev-libs/rapidxml/files/rapidxml-1.13-iterators.patch
new file mode 100644
index 000000000000..068545241388
--- /dev/null
+++ b/dev-libs/rapidxml/files/rapidxml-1.13-iterators.patch
@@ -0,0 +1,48 @@
+https://sources.debian.org/data/main/r/rapidxml/1.13-3/debian/patches/fix-iterators.patch
+https://bugs.gentoo.org/791328
+--- a/rapidxml_iterators.hpp
++++ b/rapidxml_iterators.hpp
+@@ -18,9 +18,9 @@
+     
+     public:
+ 
+-        typedef typename xml_node<Ch> value_type;
+-        typedef typename xml_node<Ch> &reference;
+-        typedef typename xml_node<Ch> *pointer;
++        typedef typename rapidxml::xml_node<Ch> value_type;
++        typedef typename rapidxml::xml_node<Ch> &reference;
++        typedef typename rapidxml::xml_node<Ch> *pointer;
+         typedef std::ptrdiff_t difference_type;
+         typedef std::bidirectional_iterator_tag iterator_category;
+         
+@@ -56,7 +56,7 @@
+         node_iterator operator++(int)
+         {
+             node_iterator tmp = *this;
+-            ++this;
++            ++(*this);
+             return tmp;
+         }
+ 
+@@ -70,7 +70,7 @@
+         node_iterator operator--(int)
+         {
+             node_iterator tmp = *this;
+-            ++this;
++            ++(*this);
+             return tmp;
+         }
+ 
+@@ -97,9 +97,9 @@
+     
+     public:
+ 
+-        typedef typename xml_attribute<Ch> value_type;
+-        typedef typename xml_attribute<Ch> &reference;
+-        typedef typename xml_attribute<Ch> *pointer;
++        typedef typename rapidxml::xml_attribute<Ch> value_type;
++        typedef typename rapidxml::xml_attribute<Ch> &reference;
++        typedef typename rapidxml::xml_attribute<Ch> *pointer;
+         typedef std::ptrdiff_t difference_type;
+         typedef std::bidirectional_iterator_tag iterator_category;
+         
diff --git a/dev-libs/rapidxml/rapidxml-1.13-r1.ebuild b/dev-libs/rapidxml/rapidxml-1.13-r1.ebuild
index 80a5284c808b..d072ba673bc9 100644
--- a/dev-libs/rapidxml/rapidxml-1.13-r1.ebuild
+++ b/dev-libs/rapidxml/rapidxml-1.13-r1.ebuild
@@ -14,6 +14,7 @@ KEYWORDS="~amd64 ~x86"
 BDEPEND="app-arch/unzip"
 
 PATCHES=(
+	"${FILESDIR}"/${P}-iterators.patch
 	"${FILESDIR}"/${P}-clang.patch
 )
 
diff --git a/dev-libs/simdjson/Manifest b/dev-libs/simdjson/Manifest
index ab880480eb84..2e01482036ef 100644
--- a/dev-libs/simdjson/Manifest
+++ b/dev-libs/simdjson/Manifest
@@ -1,7 +1,7 @@
 AUX simdjson-0.8.0-dont-bundle-cxxopts.patch 1555 BLAKE2B 57634524ccd8db73214676359cd5c02cbdc5c97d3645c627667b6986b84bd53285103b50d152d663469623d973ca6f1332fc6b554412ba57be9395dd17a016e1 SHA512 00814353defbd7b77a88ad67faa151494c203470cc4627d8777f8dad7e5918e7650514b76dfb3007644a0864fc848cc30bd71aa61ec86b93bb9b66417da3d961
 AUX simdjson-0.9.0-tests.patch 599 BLAKE2B ac05983a3e8b1396554a4c962352afa39fbb46c53aaba95dae6bacd8c0f9b270499be3df7b82464d6f29a872e0bf9253c3d1a47d3d62727adb166388e2944682 SHA512 6e0220083dd6fcc1426a3d0b8250e8249e83868963e55e7e31221e3df2e2469794d73a59e3068722d20fb5bfb33c9d49ba5c9aa18028c8afd8a8d0d066f29a11
 DIST simdjson-0.9.2.tar.gz 7958184 BLAKE2B 7fbb3c85b5dfd2d18a09087f6c6e09437bfb8aec418eb219485b6f558fe117791b28e51a45bb416b677d42ca6d73d8b37381deee1aea4bd49fd132a16312a49e SHA512 6d546f0283b680da581b51bab86f7165abdab0a82d51e9c4a5abcf9a94e24059adfb63c8e4e8ef147fee50fc94f6a0efc4dba34dce499926e1da0dcd1fe63dd6
-DIST simdjson-0.9.3.tar.gz 7957869 BLAKE2B fc47f26843defaac5879f2e8b9d218df503cdeab9cd23820548e8797fa59d0bc4a715bf386a4436b807dd3b0c8100415c408bb7ab5908b1b1eb237712d9a66ed SHA512 d9c02d00832853c166c952755796838d09f8b096613bcb5f41eb4ee0b7db237cabd4839dd739231f0aa0dcd8c937cd63dfc79da19788ff55754c9466a7183d32
+DIST simdjson-0.9.5.tar.gz 7956300 BLAKE2B bd860e91ff3d14eba49370e7e5f62f3573e3b76e689633f93db7a03030b24bd600d07c7a378a82836e1d234249b10ee3bbb050ba495fd50733f0355fcaac8ff3 SHA512 cdb80fd76a6b67c52f5ad4c0fafe76cdb4c95f35ce6c486fe37c9c61e041c349c1c8ce01fef1dec8024083ae01a0afa780d595bffc833e8a99eb82ab62ab615e
 EBUILD simdjson-0.9.2.ebuild 1185 BLAKE2B a3fb6be762829803a2fe3822452c19ffc93eb1e33711d02f61467d95dfc60fed93c24db58f86f868a0ffd842a8ad6e54e47dca2e1d6a00ebdd20273ce65c2c87 SHA512 cd5d0a75e28a315ffeb03f2c0716e5fe82b3fff11b506b0a45d4b05572a16cad19ed91ace2d78056d2a0ed1572c157ec541c1564b79613bb178fa733e4c95feb
-EBUILD simdjson-0.9.3.ebuild 1186 BLAKE2B 56090f52f079fe5c5a159315f5f8c87da717763f7da747388e8ec179ad46d00eb96ccc74ea960f85ef294d83e0b48d2192fff0ab1dea9d5509dd698d0e6ba6dd SHA512 f79c5daccefcaecec9a1ab7e8307912601b0bac6589172b20af4cf1f0995648bfd96c47971e543ed68af8cea79ca95dd7a11d65bfa22ba8b2ef2095e840ef315
+EBUILD simdjson-0.9.5.ebuild 1186 BLAKE2B 56090f52f079fe5c5a159315f5f8c87da717763f7da747388e8ec179ad46d00eb96ccc74ea960f85ef294d83e0b48d2192fff0ab1dea9d5509dd698d0e6ba6dd SHA512 f79c5daccefcaecec9a1ab7e8307912601b0bac6589172b20af4cf1f0995648bfd96c47971e543ed68af8cea79ca95dd7a11d65bfa22ba8b2ef2095e840ef315
 MISC metadata.xml 335 BLAKE2B cb4ee46df6139081ed8708a3e4c6f999cfd822a5c2c986aa90d54945beb0c09c60c1ce9582b876809032f096921f1b4b79d5a53197e89b765eaf060425fc9279 SHA512 654e393f40c10289bca4d8afae54e4ca987e963a8a5b0f86e7976176d45d5c12c19b9830e7d275de7eabed8dc8d3325b6b581ac9cc694e64e6c39b0762081d32
diff --git a/dev-libs/simdjson/simdjson-0.9.3.ebuild b/dev-libs/simdjson/simdjson-0.9.5.ebuild
index ce97a46f1129..ce97a46f1129 100644
--- a/dev-libs/simdjson/simdjson-0.9.3.ebuild
+++ b/dev-libs/simdjson/simdjson-0.9.5.ebuild
diff --git a/dev-libs/starpu/Manifest b/dev-libs/starpu/Manifest
index 624c9c1d5b0e..60ef596f65f4 100644
--- a/dev-libs/starpu/Manifest
+++ b/dev-libs/starpu/Manifest
@@ -1,3 +1,3 @@
 DIST starpu-1.2.6.tar.gz 8911397 BLAKE2B a73cb3b230282b0b828fdaeb65f5491928fde1b2e5797f739a99c87318fa29511196f7121a72ff91bf0d663938b50f200d108fdce2726eb7ea8c7e997156dc13 SHA512 5971f8875dd54c73486583456bd0bc81c2865cb5b8bba6d47a5085d76fa6294c869efdd1c1d14144d08e6c14cbbea3a773474d46aa827ca24f58d9fb57ccbed7
-EBUILD starpu-1.2.6-r1.ebuild 2212 BLAKE2B 32338f6e843bfc862cef8ff427ee1f735c8f1c82cab5bf840362d5e86e0f5132f7ad00016557993f52c6bd938a03bf85810b97eb596f202eb1824574905f5e31 SHA512 470c21b6819b5a2a294807814e5bb8bf380a4c532284fee4cdaaf433504ebf4292de8e9be0999309f010542344e1395eaaf3cab3f2859283e9d65b87cdefafa2
+EBUILD starpu-1.2.6-r1.ebuild 2219 BLAKE2B 8ecb15979996b37e5a1bb7bcfbf74cee8b18e386e1784000a85aa645f23a547efc6952f8241f0de8034bd561dfd93b0c54983755d34e0b8eb31c39a8729e6efd SHA512 43a764ff2d24978893584e0935156539fc59df453b9783a71b907ed7334a48843d28a407f0ea971c53954bb88d5c142d5959cf995e7c99254f6c56ab9885acf8
 MISC metadata.xml 987 BLAKE2B 7b8a207da7c02ecbc5e1daab83666d19d8c1128c6e05376167707ea6b411b4bed2673d9f0c9840284ab5c6f684bed3a67fddb8fc6f25289799470a4e33792e11 SHA512 97e9412721fcec2cdee55d75ce4d8c6eb20af75adfc21bcd556a336a8ee57c138be47afb881fa77180cdc4c27975d000be965f2170f7f29db85056bfbb01cee9
diff --git a/dev-libs/starpu/starpu-1.2.6-r1.ebuild b/dev-libs/starpu/starpu-1.2.6-r1.ebuild
index 4465f97133e1..8a4a7251ea18 100644
--- a/dev-libs/starpu/starpu-1.2.6-r1.ebuild
+++ b/dev-libs/starpu/starpu-1.2.6-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 FORTRAN_STANDARD=90
 FORTRAN_NEEDED="fortran"
-inherit autotools cuda fortran-2 ltprune toolchain-funcs
+inherit autotools cuda fortran-2 toolchain-funcs
 
 DESCRIPTION="Unified runtime system for heterogeneous multicore architectures"
 HOMEPAGE="http://starpu.gforge.inria.fr/"
@@ -85,5 +85,5 @@ src_install() {
 		insinto /usr/share/doc/${PF}/examples
 		doins -r examples/*
 	fi
-	prune_libtool_files --all
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/uriparser/Manifest b/dev-libs/uriparser/Manifest
index 5963c02d95b0..29670ed1a870 100644
--- a/dev-libs/uriparser/Manifest
+++ b/dev-libs/uriparser/Manifest
@@ -1,5 +1,5 @@
 DIST uriparser-0.9.4.tar.bz2 174551 BLAKE2B b95f270685757052fca02fae0a029f08de8bc14bea733bd56e62f0bcdc6592f015453ed38c87171cea9054618328dc94a512ff816519f70594653451f751c4f8 SHA512 c5e671ce2589aacd2c562e66facbee9e1cad3101e840f40b7ebdb917fa669e0c3ae7ed75623692f601655c0b82c10bcfe3086ad628beac8f965e613228e67ecd
 DIST uriparser-0.9.5.tar.bz2 176501 BLAKE2B 5ec3d993e60c62f2478e4012354cf82f2e4155ea1a69e9a3d6611d1765fe0f3b8ba5382c928852a5fd215f51ebb0688c9d713e9f1208f18f5ce2d8b8f0fb1dca SHA512 44d36a33565b7724d721e2b5e689530227bc87e609ee78f1d23e7353480191313b1b91039c7a046566d14b83eb320c97d75e74c8ef4841e1b9c8559c3feddb34
 EBUILD uriparser-0.9.4.ebuild 1114 BLAKE2B eeef9c2c0dc64680be9608407af7eee2bf7dcc93acf558857acfdcb16bdf6cccbe8ef8653098c77e5db9851fb1df0383d8e272affd6eef9c30b6cf7db647ca15 SHA512 a53fb91fbf4a9b274cd78e6f592f191a51f17a8c80a4d3b9be5d0ad815a4ed2389e3fb54e6bfa95a2a1bcd9725fd9cdda6bf6a5d52b4720024cd632c9a7758eb
-EBUILD uriparser-0.9.5.ebuild 1413 BLAKE2B 8a27ac829f2b24d066070b45810a7bfdbdc4892a7bcf3f1c0f887b84c563df7b9f8d8a36dbabffb6f4d07a2814a5568744ec1faef619b9b369560eb04f6e3680 SHA512 0948656fa671161f1ea15d39d6035031606d479b53749d746d7de13b069c51a4908d24a766b7976df7f8c93cb37e2d4fd20162bb49a1f0b3997a0e892c956fc9
+EBUILD uriparser-0.9.5.ebuild 1410 BLAKE2B 34585430e663a8f5d2831271d16d2653688ee8924df945151a93e37efcfdf5785f077f872cd91e1e6b61c27b943615584da6c94d28281fa6b6fed4fcff7c002c SHA512 6581fee2794970dbe2f34542b51d3cfba32a94578b5797090a85e3de1ad876e5705ae7a829bafbfaa277cb47a7db6c5b16debf06556ab535d48b665a3d0e043b
 MISC metadata.xml 542 BLAKE2B ea02a2f11456940eeab83ac904b7b8893c0c41428161f0391eeb9aecbeb51f7d22ec215455837932f0a2b193e937ce41290d5e795ab0cc434b23e13b37dc7146 SHA512 6798e6f833cbbb1ebd80cf04bc5950e5bafd8b689d79211a0a778467b9785b18720918b1822106dadcb96044df2ec8f681c3cda049b1bf3ca1fa072f409dfc45
diff --git a/dev-libs/uriparser/uriparser-0.9.5.ebuild b/dev-libs/uriparser/uriparser-0.9.5.ebuild
index 559813f6f523..9c4bfee7c144 100644
--- a/dev-libs/uriparser/uriparser-0.9.5.ebuild
+++ b/dev-libs/uriparser/uriparser-0.9.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="+doc qt5 test unicode"  # +doc to address warning RequiredUseDefaults
 
 REQUIRED_USE="qt5? ( doc ) test? ( unicode )"
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index d78aa3421ed8..9ea478d31a89 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -3,5 +3,5 @@ DIST vala-0.50.7.tar.xz 3540048 BLAKE2B 4f3abdfe7f0448846f22a4d822b803484afd1a23
 DIST vala-0.52.3.tar.xz 3575936 BLAKE2B bef10fdca6af1db5d8ff7b01b624fee5879d82ceb35ccc84d847f9ce26445194d4fc7ec8c3f8177534c0144e9027633ed1b00793e4e2edbe3df51f55f29129cb SHA512 5b757c6a9d1a2e9615fddb014c64a92f6a7c231ba964e449a43e9ad19293d415b66642625aad98d18e436ab438a4530d00bb670c7c7eaae56f43b407f4035bd9
 EBUILD vala-common-0.48.12.ebuild 653 BLAKE2B d9bf714e1dba1d434be738da71300a84588f0d60c82404dcd55abd41369d92c5b936b2e9f62bbcb93d66ba861adfb3bc7ae4375d9b2528a8ffbce375fa948710 SHA512 1654740c9cec31d743809f37e41dfd4f0f2d0108def37c6ea76f6a819dcc75e4d396e827cae8f213f5672150e32f850c927ed84bf0a233e7e625c0b3135d002a
 EBUILD vala-common-0.50.7.ebuild 661 BLAKE2B 16dc4858ce7998b2a2fcee77cd6547f7c5cbed76a73ca1d1a858d2d8731779976b988a3549d6a496f209673d6312acca629db115790af3a797be737cb1c1a94c SHA512 458bfd820271e520b7a02e29bfba7df0d9ed14cfbad6b240ddd49f8d2e0a69c87c83eb365cbb168f8361f97c5bc8d3d0c840290c3ca842732a2dba819a6ca5f0
-EBUILD vala-common-0.52.3.ebuild 653 BLAKE2B 636ec05dcaa3f7c8f972cf86a1e67aad7044b9a0c59b12b6842c65c283065bd9d0235993d4616e8c61ea0e987a6bd0f4578c7228ccc8c015e073580a46360361 SHA512 83d831d84a48749d16fae9abb1d4ca8935e76a46973569de316a32edf91e27287faecd39c595073c912f153d2ceae82812b15f4899c86c97e692427bee584a5a
+EBUILD vala-common-0.52.3.ebuild 645 BLAKE2B c2aaa245d9dc1670a714656177d4fb4e1ef5e9b6858d68636977e198f783151b17958feafbede1a79c45e222e8dd7a67b0d679ff0b7eecd9404611439cbb22c2 SHA512 b44a9a161a22a33a821e5cd3d10b97d7c6390de583eb4708b17b80f6a25143be7a87d26d754dc2e4963655c32adf1e0ce38710df29bd20367a10cdddc17f5815
 MISC metadata.xml 325 BLAKE2B f1a8eb879889fa0b33809e44ee815a95f07c1d65d1e4fcb3af8797e27f258f76e7774b4a8eba9677a9e6c8a1051fbbe70a0f3675a12f9d52531d361f70826087 SHA512 3be77f30dff008c941c9513d9b8a4c689aba5f2f1005ecdb98f6cf9bc1000f562bad638cddd373f223a5570b40ea83e44656dbf848544a96ce0d166cc46805e2
diff --git a/dev-libs/vala-common/vala-common-0.52.3.ebuild b/dev-libs/vala-common/vala-common-0.52.3.ebuild
index 043fa5ecbb04..71dbcfb591c6 100644
--- a/dev-libs/vala-common/vala-common-0.52.3.ebuild
+++ b/dev-libs/vala-common/vala-common-0.52.3.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/vc/Manifest b/dev-libs/vc/Manifest
index f8246e92632f..e9ab997366a7 100644
--- a/dev-libs/vc/Manifest
+++ b/dev-libs/vc/Manifest
@@ -1,3 +1,4 @@
+AUX vc-1.4.1-missing-include.patch 417 BLAKE2B 97bc99422cf68cd2aad45bb15f8314bf0fbc23d671134facddb79e1a37417c08472618496195fe014b0ec63e1a35d9a8a389b626d6beb199d6c03adf516f4813 SHA512 6bd54e083f560d1ad14ea88ed96937b91132138a62fff8a43a23a72eafd12b520e4419899da46918ca47dd172872e515075c28a053b834ee7f5899537d79698c
 DIST vc-1.4.1.tar.gz 638797 BLAKE2B 38feab898a4ce2b15c4db508369426a6b470f24b81e6676ad0e667cc08efaf30e96ed1455c667372104192fe6eb2340fdbd367298fa68e3168350c2e134cc0b8 SHA512 dd17e214099796c41d70416d365ea038c00c5fda285b05e48d7ee4fe03f4db2671d2be006ca7b98b0d4133bfcb57faf04cecfe35c29c3b006cd91c9a185cc04a
-EBUILD vc-1.4.1.ebuild 404 BLAKE2B 4470cfed655e64e12982d942d5e825f988307e5f08174d25101df7c3f1e3569c87d4ec6091fda13065179d689fdc3467205de7c1d3b4d02a865db575600b1871 SHA512 edde57729a16c831a6e4d417130cae466878641998fca59c2bdd8d97ee4fbbcdac1758b932e13344f6092655b633a0258d88c347b865a35afd90966262d8c6a1
+EBUILD vc-1.4.1-r1.ebuild 458 BLAKE2B 9b13a354a7ee8d0b39bec13dfbf56444d792e951206bb38f830d69da503b6770403d3126e16bc7535eed3143fea589ae73146cdbb93a35290022cf66a814a4a6 SHA512 823fef7d55cf03bcee0ec4b0fd33a9563962c420ecc2f559a763b1f8d540d066c842f88a15d645bb8962fb8a65864aba1590fe8a49982dd183a082c450c4dcba
 MISC metadata.xml 292 BLAKE2B 895bf66b71e43684a437957b5ed370cc274a808714f96567956512c561d1fdf18402f5d9340d9c11bf585044e15c081648964df9640c120f74acee9790f532dd SHA512 e30b480889c2fb22f22af6d46f64399012da00bf045a4c9bb2c46b3f3255c4bc50f5970a0b3902ea90024d2ad371d1577ce4dc5a86923eb55634bfd26dafa22a
diff --git a/dev-libs/vc/files/vc-1.4.1-missing-include.patch b/dev-libs/vc/files/vc-1.4.1-missing-include.patch
new file mode 100644
index 000000000000..487705c9efb4
--- /dev/null
+++ b/dev-libs/vc/files/vc-1.4.1-missing-include.patch
@@ -0,0 +1,16 @@
+---
+ Vc/common/simdarray.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Vc/common/simdarray.h b/Vc/common/simdarray.h
+index adbe1b7d9..ba9daf27c 100644
+--- a/Vc/common/simdarray.h
++++ b/Vc/common/simdarray.h
+@@ -33,6 +33,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ //#include "../IO"
+ 
+ #include <array>
++#include <limits>
+ 
+ #include "writemaskedvector.h"
+ #include "simdarrayhelper.h"
diff --git a/dev-libs/vc/vc-1.4.1.ebuild b/dev-libs/vc/vc-1.4.1-r1.ebuild
index 6961ddd9b52f..8ac410c11b26 100644
--- a/dev-libs/vc/vc-1.4.1.ebuild
+++ b/dev-libs/vc/vc-1.4.1-r1.ebuild
@@ -10,6 +10,8 @@ HOMEPAGE="https://github.com/VcDevel/Vc"
 SRC_URI="https://github.com/VcDevel/Vc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}"/Vc-${PV}
 
+PATCHES=( "${FILESDIR}"/${P}-missing-include.patch )
+
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux ~x64-macos"
diff --git a/dev-libs/wayland-protocols/Manifest b/dev-libs/wayland-protocols/Manifest
index 69e5f4bf840d..49fe98298931 100644
--- a/dev-libs/wayland-protocols/Manifest
+++ b/dev-libs/wayland-protocols/Manifest
@@ -1,6 +1,4 @@
-DIST wayland-protocols-1.20.tar.xz 111684 BLAKE2B 2ddd3d0b0dde94fda4788a1fd6631b6fcf22fb134e74a55f2c310ab4b72802d3b069d294e3d7b68ea6ddfdb0f944ac9011b73a9678e65eec924135822f697087 SHA512 d13f65d03add2c39cc32bf6bda0e981e9f52504bf8505fceea045c8baeb73bea64fa4edb99cb837677fbab1b5b3023054adff36fac127e819690f366b81c4977
 DIST wayland-protocols-1.21.tar.xz 117296 BLAKE2B 91dbfea6045e981fe94172fd13b74b150b0585560c06ad6990cfc57e02c97a013428431de54b196b4ed16db43724aae56f57dffb2b3f21615fe5522fe33aedc8 SHA512 40133ba36d4201de9626e9869ebdf2d4f7ad06904d6a747d5af87958a08368abdc65be3acc21b8959d0c5ec37d47051ba5b81d3844079fe237dac81a7291bbb8
-EBUILD wayland-protocols-1.20.ebuild 797 BLAKE2B 16760114c9c52faa516fccfe8c4976db8249347104a9484cc1e0db0bfe3b02407bbcc6519e377c367f3e19973bc7ba1102d779f600dd556638f7e8748584af79 SHA512 b3e965ff0e7d2a2566b3103c9310aba101839fb540ebc4c08d4f5810ad343085e1d5d63ddc59dc6c56aa202a285deead877e9c73fd6403072c2bec769081415e
-EBUILD wayland-protocols-1.21.ebuild 755 BLAKE2B 3d37738cffe0026ce26377478390368b84bb188e337b29c28e8b64e7d35095c1222ba3d893245f26214273786e7587d1f760603906874c9e3aebbbd67646f740 SHA512 e5533d3931b9542b6b22e4d6a37db75c4548ea3a2fa648ddbaf8bd955eeb107c76f9c8e9f3b5c04a3e62fe930b0a2140fbe59fdcf48a3ee40ec3f988d431b217
+EBUILD wayland-protocols-1.21.ebuild 748 BLAKE2B 66baf0847f72f4228caf589c9a331220d3554f4f0136995278544a758a31c87a93ea63154f254a0252bf77c0227b9b602183ecfb7b97efd64096a9c981ab590f SHA512 fabe125b1da30781e621f6d09c19ab23f41806dbc340100647a5dfe234d542956cbb8bd6e0983247d0da07c1031dfeac3ab8253ba1617620b8779f77187cebde
 EBUILD wayland-protocols-9999.ebuild 755 BLAKE2B 3d37738cffe0026ce26377478390368b84bb188e337b29c28e8b64e7d35095c1222ba3d893245f26214273786e7587d1f760603906874c9e3aebbbd67646f740 SHA512 e5533d3931b9542b6b22e4d6a37db75c4548ea3a2fa648ddbaf8bd955eeb107c76f9c8e9f3b5c04a3e62fe930b0a2140fbe59fdcf48a3ee40ec3f988d431b217
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/wayland-protocols/wayland-protocols-1.20.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.20.ebuild
deleted file mode 100644
index 923dc813b366..000000000000
--- a/dev-libs/wayland-protocols/wayland-protocols-1.20.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Wayland protocol files"
-HOMEPAGE="https://wayland.freedesktop.org/"
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/${PN}.git/"
-	inherit git-r3 autotools
-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"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-libs/wayland"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_test() {
-	export XDG_RUNTIME_DIR="${T}/runtime-dir"
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
-	default
-}
diff --git a/dev-libs/wayland-protocols/wayland-protocols-1.21.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.21.ebuild
index f9b1910a51a1..86d58eaed2b0 100644
--- a/dev-libs/wayland-protocols/wayland-protocols-1.21.ebuild
+++ b/dev-libs/wayland-protocols/wayland-protocols-1.21.ebuild
@@ -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/weston/Manifest b/dev-libs/weston/Manifest
index 3bd9e430be34..41015ea147b8 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -1,6 +1,6 @@
 AUX README.gentoo 383 BLAKE2B a0d8fef2d1f0deebe46ed85065a09057a620aa7af4e7aa901f1fef7b75d15e2ca9d2be1b9367a651a2edf3b4265441ce47af832f423cf9725c78e61836a4f982 SHA512 e4d8f8e0edeb6773dd7ef6329074d1e40b694b9e7e10b6a429d8c5dd4fe1170594f447a42eb41446ec2355829a1da1606bf6c544434551c5c931b0794422e786
 AUX weston-pipewire-0.3.patch 11856 BLAKE2B aebe0f4859a0ac3144d8f631fd8b5e35c02f62217ad94106c138aa6095430a2aff7aedf88d67f95991d32e9c728b6704746fedc9858e41e5d99900722b6617ec SHA512 f3e028df4967672c58e1cac66fc8b7781252f15094439dca399d820d945156a15f1e420a8ed062584dcdd7c9577849127aa52974639877796ce91231123bf50d
 DIST weston-9.0.0.tar.xz 1555212 BLAKE2B 6c5feb3959ebe894861c6dc0817633b23e8518baf1c359c2967f111c071e9d4f166ef1421ad6465b036b3f1c485cab5f442476e7a44e3ec722cff576dea73852 SHA512 ccc263f8279b7b23e5c593b4a8a023de2c3dc178b1b8d6593599171770bcfe97608de9fcb77aa1cab39255451d289d323e51c317dae190c7641282e085b84f90
-EBUILD weston-9.0.0.ebuild 3756 BLAKE2B 1b543d591c30fa7e3929b5873090e8e0e337f41d5f8c21c01499ce5cc293a4b875f08e3cd19f08d9b2d216e03992ec80e7659591c9a95288e2b35492c738822d SHA512 498658504d1c64ef95db55e8b876f3afb5c8ff542a573b6f40918afd7562f15c544bca66e49e02146224be1dab7660211656d3da5bf6b62033c6b38e26e2124f
-EBUILD weston-9999.ebuild 3692 BLAKE2B 7932952bee15707f295c7c489c34fd0c2f5d665ba91c61bba818e9a54f6589bf74267833674f7c3e7b98983524adfe1ab24a612da7328d18b0441e1c27bd229f SHA512 4eed0f6064e23485be67450e21cdb42074d45dbdc3c90cda7968983f7a35e282250fae8eed5aa0aa4d585e3b9bb855f3aae5f5acd9b5ccffb1b685aba4245be4
-MISC metadata.xml 1484 BLAKE2B 0cf0554d570059077eedaf579dc65651c715a80520d89633cf1979af25014fd7817d7e4ded1d7bdbbc77346e58d026e6371cfec91f710abfdcdc5d360eec60ef SHA512 63e012a64c88b3c2aca3a5f109d468e3dd5e856b1bd42ad2a803e2881b0962f499f8b201e99e940f04b09a3618e9f3594ea2e8565b204cab4093030913222900
+EBUILD weston-9.0.0.ebuild 3755 BLAKE2B de02e57433e44ccc95ef31d8102cc5b7b324046f55cb429d71f0daf34ad2545c8a6692cf0b9051c34333bc7fb4a90c4063fdcc15ab78a3a40195a1f2a9ba5da4 SHA512 f1d838f5f916d5475d8a0335ddbd1185148e9aebd7882915f6acc7697a0582d16645b9f979a365125d6a8947f19b852aad5f5e4f8ab614ea80d47965ef219cfd
+EBUILD weston-9999.ebuild 3765 BLAKE2B 226d86686fad93bbf4f190693d3c886c2711c22f69fc4836b6af8d07d3635b943b9c7cc265468f7486ad441312ca7c73782e3f9d124b858e2b0ef656fa7e223a SHA512 c03b3e2cc8e85a17ba6ffde820129bb28d15606c4acb1dbe5ec1cac9445ffadf2b83f426c0b2a89db521b57cfa0fd90ad6217343c40c822cde82bcb2afaa1617
+MISC metadata.xml 1577 BLAKE2B fd7b5b207ef50215ea220e27557a99700c6115bdae6b74f9176430fc26cd57acd2e52903cea6105ca1425a0c9cd3b0afe2fcb1a56df385480481dbc937d9bcf8 SHA512 b0dc8edf543a5d620e40333fe6abbbc607d317588ca4cbaf336446364208301e842efdfed8532d35e29339be10e6af6e449e9f6d84e301241333b7e81ea7d59a
diff --git a/dev-libs/weston/metadata.xml b/dev-libs/weston/metadata.xml
index dff0a7012a3a..c9b552427908 100644
--- a/dev-libs/weston/metadata.xml
+++ b/dev-libs/weston/metadata.xml
@@ -21,6 +21,7 @@
 	<flag name="remoting">Enable plugin to stream output to remote hosts using <pkg>media-libs/gstreamer</pkg></flag>
 	<flag name="resize-optimization">Increase performance, allocate more RAM. Recommended to disable on Raspberry Pi</flag>
 	<flag name="screen-sharing">Enable screen-sharing through RDP</flag>
+	<flag name="seatd">Enable support for rootless session via <pkg>sys-auth/seatd</pkg></flag>
 	<flag name="wayland-compositor">Enable Wayland compositor support</flag>
 	<flag name="xwayland">Enable ability support native X11 applications</flag>
 </use>
diff --git a/dev-libs/weston/weston-9.0.0.ebuild b/dev-libs/weston/weston-9.0.0.ebuild
index 85cdf01cd444..9d19b934a222 100644
--- a/dev-libs/weston/weston-9.0.0.ebuild
+++ b/dev-libs/weston/weston-9.0.0.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI="${SRC_PATCHES}"
 else
 	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="amd64 arm ~arm64 ~ppc64 x86"
+	KEYWORDS="amd64 arm arm64 ~ppc64 x86"
 fi
 
 LICENSE="MIT CC-BY-SA-3.0"
diff --git a/dev-libs/weston/weston-9999.ebuild b/dev-libs/weston/weston-9999.ebuild
index b37bf79f61be..5bc288e98744 100644
--- a/dev-libs/weston/weston-9999.ebuild
+++ b/dev-libs/weston/weston-9999.ebuild
@@ -24,7 +24,7 @@ fi
 LICENSE="MIT CC-BY-SA-3.0"
 SLOT="0"
 
-IUSE="colord +desktop +drm editor examples fbdev fullscreen +gles2 headless ivi jpeg kiosk +launch lcms pipewire rdp remoting +resize-optimization screen-sharing +suid systemd test wayland-compositor webp +X xwayland"
+IUSE="colord +desktop +drm editor examples fbdev fullscreen +gles2 headless ivi jpeg kiosk +launch lcms pipewire rdp remoting +resize-optimization screen-sharing seatd +suid systemd test wayland-compositor webp +X xwayland"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
@@ -70,6 +70,7 @@ RDEPEND="
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
 	)
+	seatd? ( sys-auth/seatd:= )
 	systemd? (
 		sys-auth/pambase[systemd]
 		>=sys-apps/dbus-1.6
@@ -106,6 +107,7 @@ src_configure() {
 		$(meson_use gles2 renderer-gl)
 		$(meson_use launch weston-launch)
 		$(meson_use xwayland)
+		$(meson_use seatd launcher-libseat)
 		$(meson_use systemd)
 		$(meson_use remoting)
 		$(meson_use pipewire)
diff --git a/dev-libs/xmlsec/Manifest b/dev-libs/xmlsec/Manifest
index b8c0c38bd3c2..2d16b25fe61a 100644
--- a/dev-libs/xmlsec/Manifest
+++ b/dev-libs/xmlsec/Manifest
@@ -4,5 +4,5 @@ DIST xmlsec1-1.2.31.tar.gz 1989144 BLAKE2B ddc55e34867d5870fa434c739825ceaa68500
 DIST xmlsec1-1.2.32.tar.gz 1989258 BLAKE2B a1325f682efec42dbcdb066d3c242fb435daa721349905564b05829153e5337b772fbf6b996f4d249d669d76fa584055f8bec1630c4936c27fd330cda439522d SHA512 39a90e154fe760b9cb01090c0232aa6c88c595fea87a771bebdd7b38ab274e3be719d6314065d9f02b854c7be9c8ec3557e57e0158ff3696413de3424f14389e
 EBUILD xmlsec-1.2.30.ebuild 1339 BLAKE2B 35fc887e954129bdeafd206a7bab29a04dce23b7d27b29b92bf0908f16a0393cf806423a932a8e0c4676d1b35c0f0d8ff3040cecbafb31aa4754dcbfdab517e2 SHA512 8f8680ef311ab24b814de101aeab5805f5b1da155bf799a0052334e516d301d22bbd2d33e51044902dee1f53a2dbdee840b6d6ac4e68315cef7a7c4fd68d0f82
 EBUILD xmlsec-1.2.31.ebuild 1390 BLAKE2B 80c4d0d4d9940651dedc1ce3f50c023b61422ffd686a14110f68470abad796d57ce0e88608cbf0f306ec6c8382ec5a7f2739503281bdfcf53388f803c04baabb SHA512 7fd7b30b8885c611a88df01a84bdb9924c60d376defc1126778ae5052947a6e58d10a118cf670836ad8eb52eeb79e22b792d151642bfc3aa48c15e309a76038c
-EBUILD xmlsec-1.2.32.ebuild 1344 BLAKE2B c2fd02ace7be596f7f836b20ab1e12c91396dbb5ff8a146ae99dc8e65ba4587ba2051051a8719a987ca633d54bde5500a7962042e5616e2b60313656409af44c SHA512 dcf6c13a8f83d9222bac78406f92e11cdbefe9e225d10368a214706058abdd4c3bd626642588b554b3daf39a9234971ff7c3d0cac4fe6845a24d23c45c4d9c61
+EBUILD xmlsec-1.2.32.ebuild 1338 BLAKE2B fe32aea7f09c8041b552602412be1ff9eb405ddaad7594faa1f9031cc1d0509565b0c97a111b5be5345b85f5868bd169c0dc1b4b47dc6ec49f0ed24e04222894 SHA512 1cbc4efa3c00129449e52e660570478a9af0091435ae44b8eca58c0a2371b6911e3c848571269d567e6555169e80a7b9d8338df65a396d237c2a7b53096ccaee
 MISC metadata.xml 492 BLAKE2B f1d4308323da79d17e6f5e0025fff338024b6d74c90584c469917418ebb06aa9be43a1b1d5f8a8e4a25aa0584b8b96aadc5508a2aca1b9f6d3924c81bb33f41b SHA512 920fe71d66278f82b0fcb18044998d5b72cc69a07966e8d1d2527a0d1a7e78c89536e165f105dc4ed9de84377a80f3ef55804bd26f71d868808077ffcd6b39c3
diff --git a/dev-libs/xmlsec/xmlsec-1.2.32.ebuild b/dev-libs/xmlsec/xmlsec-1.2.32.ebuild
index d6a154c62367..c4da32d257a4 100644
--- a/dev-libs/xmlsec/xmlsec-1.2.32.ebuild
+++ b/dev-libs/xmlsec/xmlsec-1.2.32.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/${PN}1-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~sparc x86"
 IUSE="doc gcrypt gnutls nss +openssl static-libs test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="|| ( gcrypt gnutls nss openssl )
author	V3n3RiX <venerix@redcorelinux.org>	2021-05-31 20:59:14 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-05-31 20:59:14 +0100
commit	e748ba9741f6540f4675c23e3e37b73e822c13a4 (patch)
tree	23dece8beabb3a3d7c6c0273b0eb40b21c62a889 /dev-libs
parent	908778078736bd36f7a60a2d576d415cb8e000fa (diff)