gentoo auto-resync : 17:08:2022 - 20:33:10

25 files changed, 59 insertions, 854 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 69a6a8f797e5..6c45b1b9cbd0 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/appstream-glib/Manifest b/dev-libs/appstream-glib/Manifest
index acae732a692e..4b48a326820e 100644
--- a/dev-libs/appstream-glib/Manifest
+++ b/dev-libs/appstream-glib/Manifest
@@ -1,8 +1,5 @@
-AUX appstream-glib-0.8.0-fix-as-self-test.patch 1105 BLAKE2B 55871bd0e63caac85ab6c2ed40abe9412b47b84132c3235b8c80870299c7d1f120e8533ef048ccd117eeb95cab3dda5497c332d1b14008a68ee1c768cd7c3119 SHA512 aaf7f392c7ea3faa2bd1a9cddb0ec8964432ec35a360715cc6b931209a0fc0fe7b0da79aa969101243908fa513638a208039f888d667410b0c6bbf7c36416805
 DIST appstream-glib-0.7.18.tar.xz 2309276 BLAKE2B 67f414ae45866cab314ed2b307f2045a2035c262810696246f5bdea2a0bac88d98b561f72a8e87608f90407ad6d577d720213461ecef09d277e919b5330c0bc2 SHA512 2a202eb25d823d524128a8ab164025b6579e069f8b62373cf5447d049a0e3764fca5bf1464296101a45870d1426b094493fc8ead07a6a4bcb514c0f1a91e8ff2
-DIST appstream-glib-0.8.0.tar.xz 2315988 BLAKE2B b0858a2dccc70c3eee32262bd83a73ad739d72ca049b23387fea012c68d8dcbaec28aeaa31f81b05dee12c60a5426bdbcf1f22f5a8edbb441c663882c47b1a22 SHA512 13aeb37b8e890691a14d20ed0a86a14ae7125a6e08e60adcefe58ce2f861cebf7f49a01d9d1c137205b923f3162b307fc2671d476b7aaa9eae5fc5234ea4c1da
 DIST appstream-glib-0.8.1.tar.xz 2320596 BLAKE2B de8d68c541cd6700fff0bc22a71d59510ccf584ac1380e2aed3e5aa122825cb3087d65b42ac1dc35acbd4b171382d9560545cdeaffa9d6bda721784444bf7a36 SHA512 32462a32ea25c945abb8d9084af1c84850f264b3a2136c6f54444e0168acf0d74ee450f8cbf483a504e417dc29b85a2e9bbc0a5bb8a217296eccacaa02db5ef5
 EBUILD appstream-glib-0.7.18-r1.ebuild 1651 BLAKE2B 321871842b6b26a0d05825c51d8e1b55577249e78f272c27b17af44431a45413fe659e73948ff260765d41750d6ebdfbc55c0078e8e194f1064e0e4b5e79afc9 SHA512 8fc7c9fb1b9073fe1b7340428c0d258f7d6ae6f2d87eff6b3201334e21aee4cbc60b3d3a61bf09d5f11386cc2d0f2743ba77f011a4612edef3c6043f3a893db0
-EBUILD appstream-glib-0.8.0.ebuild 1661 BLAKE2B ed20b7a3c50fa1bd95da73fbe5c844fbfd8cccff5d6573e4e9268ffa5941bdeb51e75365824839f1260da46f1353ea9384e07a126dbd162db088ca46b5058e30 SHA512 be2e2ce1a38904cdbae11eb893e85f40caa0c29c9f468c382946998e9f0e4af18dcd327b80cee17bad4481f73bd3bbff7585bcd9ecd76e11d164d9a0e9532e24
 EBUILD appstream-glib-0.8.1.ebuild 1605 BLAKE2B b738b67069244c06c830da86c586417d0519286aa79315b3416f32ce434b84b439640bdcb5ec2392acf7391cce9bb1f813c84d1477f27b197f3a97308019de4a SHA512 c047df33f26a03617df502e8c684cdfbc49350f80b04c4a103ad6d55a6ae491bfab189febda25103753581373ce657c05bec8dab548d257d902410bf14e957c5
 MISC metadata.xml 423 BLAKE2B f1fc786c21caf25b776ccfa366294cd7efe83b5f160517b80b020ae439265c92d5d2377438d8a5c2eb42498562964c1a194289561510075971a6921e87ed8e68 SHA512 d2be7970d5bb30d2de64d6a220be6aa1073c9dc692bb6ed48800ec5b509c2eb265b2dc4a0221dd880952d03fb418cf89ff026efa088ad38304dd6f2270ff8d8c
diff --git a/dev-libs/appstream-glib/appstream-glib-0.8.0.ebuild b/dev-libs/appstream-glib/appstream-glib-0.8.0.ebuild
deleted file mode 100644
index 28cc5cc07b30..000000000000
--- a/dev-libs/appstream-glib/appstream-glib-0.8.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xdg meson
-
-DESCRIPTION="Provides GObjects and helper methods to read and write AppStream metadata"
-HOMEPAGE="https://people.freedesktop.org/~hughsient/appstream-glib/ https://github.com/hughsie/appstream-glib"
-SRC_URI="https://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/8" # soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="gtk-doc fonts +introspection stemmer"
-
-RDEPEND="
-	>=dev-libs/glib-2.58.0:2
-	sys-apps/util-linux
-	app-arch/libarchive:=
-	>=net-misc/curl-7.56.0
-	>=dev-libs/json-glib-1.1.2
-	>=x11-libs/gdk-pixbuf-2.31.5:2[introspection?]
-
-	fonts? (
-		x11-libs/gtk+:3
-		>=media-libs/freetype-2.4:2
-	)
-	>=media-libs/fontconfig-2.11:1.0
-	dev-libs/libyaml
-	stemmer? ( dev-libs/snowball-stemmer:= )
-	x11-libs/pango
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${RDEPEND}"
-# libxml2 required for glib-compile-resources
-BDEPEND="
-	dev-util/gperf
-
-	dev-libs/libxml2:2
-	app-text/docbook-xml-dtd:4.2
-	dev-libs/libxslt
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.9
-		app-text/docbook-xml-dtd:4.3
-	)
-	>=sys-devel/gettext-0.19.8
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-as-self-test.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		-Ddep11=true
-		-Dbuilder=true
-		-Drpm=false
-		-Dalpm=false
-		$(meson_use fonts)
-		$(meson_use stemmer)
-		-Dman=true
-		$(meson_use gtk-doc)
-		$(meson_use introspection)
-	)
-	meson_src_configure
-}
diff --git a/dev-libs/appstream-glib/files/appstream-glib-0.8.0-fix-as-self-test.patch b/dev-libs/appstream-glib/files/appstream-glib-0.8.0-fix-as-self-test.patch
deleted file mode 100644
index e302a04a9ce8..000000000000
--- a/dev-libs/appstream-glib/files/appstream-glib-0.8.0-fix-as-self-test.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 3870226a3585be4c31c1719248be0e17d789f3d7 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Fri, 15 Jul 2022 20:33:50 +0200
-Subject: [PATCH] Properly initialize AsNodeToXmlHelper
-
-Fixes: https://github.com/hughsie/appstream-glib/issues/445
----
- libappstream-glib/as-node.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libappstream-glib/as-node.c b/libappstream-glib/as-node.c
-index 4d438f5..b6650e4 100644
---- a/libappstream-glib/as-node.c
-+++ b/libappstream-glib/as-node.c
-@@ -826,7 +826,7 @@ as_node_from_xml_internal (const gchar *data, gssize data_sz,
- 			   AsNodeFromXmlFlags flags,
- 			   GError **error)
- {
--	AsNodeToXmlHelper helper;
-+	AsNodeToXmlHelper helper = {0};
- 	AsNode *root = NULL;
- 	gboolean ret;
- 	g_autoptr(GError) error_local = NULL;
-@@ -963,7 +963,7 @@ as_node_from_file (GFile *file,
- 		   GCancellable *cancellable,
- 		   GError **error)
- {
--	AsNodeToXmlHelper helper;
-+	AsNodeToXmlHelper helper = {0};
- 	GError *error_local = NULL;
- 	AsNode *root = NULL;
- 	const gchar *content_type = NULL;
--- 
-2.35.1
diff --git a/dev-libs/dietlibc/Manifest b/dev-libs/dietlibc/Manifest
index c1821cc87cc0..4ea8e8f85805 100644
--- a/dev-libs/dietlibc/Manifest
+++ b/dev-libs/dietlibc/Manifest
@@ -1,6 +1,3 @@
-AUX dietlibc-0.34_pre20140729-dyn-lib.patch 580 BLAKE2B 0f4364bbeae48a42c77314975ba202bcd79f88fa02ee820be4b94896c2217f7eee22b36d6a196b63183d2ad80994c9f3095da9fdc917f2dece2ca9a7e2430cba SHA512 7dfcad992f97c3923402dde1c55c8249c5fd4c88b3291fff15d41010036eec83656b009968f0af67daa94de43d4ef4f0f476ba42dd41a17217edd5f9f4f576cc
 DIST dietlibc-0.34.tar.xz 662732 BLAKE2B ac709f19f98c298ee424f8320cbc7bca997156323e64d3a219251146b4257185f27519262914d3df044638ecfcf06e1e3680d8af226704dca65d6e4be20b3dc4 SHA512 2b38528c0ccf50e426f587b6448fed997fab1147eecc9e1af2f3fb3efe3d8f3997656d8e66e7cf1045ceb1f602cef43456c62ba83ff494f9c9816721bdb4d6c6
-DIST dietlibc-0.34_pre20140729.tar.bz2 670195 BLAKE2B 9479c97c09b0c8c7e5d85536afd962613e9f5fbcb1aff3ef9b2aace19d246b2d0b637f00c3abee0a2c06f170263e85ffba94247171afc47e40c8ab0e95fe5191 SHA512 a0bb5465f7fc985fd074dfcc4039003ec26b6b5fde5f2ccc53322067bd1a6459e742c9debeffda0b5146e287baa8e49f74f4a8ffafdf1daacacec4768d13db36
 EBUILD dietlibc-0.34.ebuild 1634 BLAKE2B 2d9fffcf677d489c3d59e0391645ebb02b26e7f77cfdc7385c6cbbdbd615ef584789bd7148b9c754cc1fc9b096d6f362ebf77861cd0447d84be70a7d1a729546 SHA512 37b52a403566a761e7a5571b95f4e562edca261e5c95153f6aec95334bd04b36a5cd66cb62f9d617e89ac1ccdfb5769578056f869e1da09b6098428cc786b2e4
-EBUILD dietlibc-0.34_pre20140729-r1.ebuild 1694 BLAKE2B 1543ffed8cd8d2bf5e9c4a504684d1155afab269c5cab54ce0ea1485075ba09d4c0ed4c63aaf7bc1cf476697ec4cb2ba99a3819c1f4671abfafe2f42c28292e6 SHA512 bcc055da6350f48999484fdf28cb44a8a5ae7c54d2520f8c2a9f203d7f963fe377e8b9e7c2d7fe67e5213eae39e69800119f30e7d0e413f1f285bcc1f3c1bcea
 MISC metadata.xml 417 BLAKE2B 317618b21a2569a8ff55f7457668d8185894377216aca3d317438503d311b53b5f9d0bd999105a7d9a5966621fccd01fd26900ed00af1929e51b717e468f0a46 SHA512 5b5dc39a432a04ad909887a3d397366d2cdb12648a9346afb66b37b6ca0e7002a42c0f047a515002cc78523a8382c745b25c88d1af29606b53894b25daa7b66c
diff --git a/dev-libs/dietlibc/dietlibc-0.34_pre20140729-r1.ebuild b/dev-libs/dietlibc/dietlibc-0.34_pre20140729-r1.ebuild
deleted file mode 100644
index ebed03a51dea..000000000000
--- a/dev-libs/dietlibc/dietlibc-0.34_pre20140729-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="A libc optimized for small size"
-HOMEPAGE="http://www.fefe.de/dietlibc/"
-SRC_URI="https://dev.gentoo.org/~patrick/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-DIETHOME="/usr/diet"
-
-S="${WORKDIR}/dietlibc"
-
-src_prepare() {
-	default
-
-	# use __DYN_LIB instead of __PIC__ in i386 socketcalls, bug #644116
-	eapply "${FILESDIR}"/${P}-dyn-lib.patch
-
-	# Replace sparc64 related C[XX]FLAGS (see bug #45716)
-	use sparc && replace-sparc64-flags
-
-	# gcc-hppa suffers support for SSP, compilation will fail
-	use hppa && strip-unsupported-flags
-
-	# Makefile does not append CFLAGS
-	append-flags -nostdinc -W -Wall -Wextra -Wchar-subscripts \
-		-Wmissing-prototypes -Wmissing-declarations -Wno-switch \
-		-Wno-unused -Wredundant-decls -fno-strict-aliasing
-
-	# Disable ssp for we default to it on >=gcc-4.8.3
-	append-flags $(test-flags -fno-stack-protector)
-
-	# only use -nopie on archs that support it
-	tc-enables-pie && append-flags -no-pie
-
-	sed -i -e 's:strip::' Makefile || die
-	append-flags -Wa,--noexecstack
-}
-
-src_compile() {
-	emake -j1 prefix="${EPREFIX}"${DIETHOME} \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		STRIP=":"
-}
-
-src_install() {
-	emake -j1 prefix="${EPREFIX}"${DIETHOME} \
-		DESTDIR="${D}" \
-		install-bin \
-		install-headers \
-		install-profiling
-
-	dobin "${ED}"${DIETHOME}/bin/*
-	doman "${ED}"${DIETHOME}/man/*/*
-	rm -r "${ED}"${DIETHOME}/{man,bin} || die
-
-	dodoc AUTHOR BUGS CAVEAT CHANGES README THANKS TODO PORTING
-}
diff --git a/dev-libs/dietlibc/files/dietlibc-0.34_pre20140729-dyn-lib.patch b/dev-libs/dietlibc/files/dietlibc-0.34_pre20140729-dyn-lib.patch
deleted file mode 100644
index fe3fcb072f63..000000000000
--- a/dev-libs/dietlibc/files/dietlibc-0.34_pre20140729-dyn-lib.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 843c667c1b516c0764840c6e4d41188f9c96a415 Mon Sep 17 00:00:00 2001
-From: leitner <leitner>
-Date: Mon, 4 Sep 2017 21:59:50 +0000
-Subject: [PATCH] use __DYN_LIB instead of __PIC__ in i386 socketcalls
-
----
- i386/syscalls.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/i386/syscalls.h b/i386/syscalls.h
-index 11d6f1d5..14ac517b 100644
---- a/i386/syscalls.h
-+++ b/i386/syscalls.h
-@@ -416,7 +416,7 @@ sym: \
- .Lend##sym: ; \
- .size sym,.Lend##sym-sym
- 
--#ifndef __PIC__
-+#ifndef __DYN_LIB
- #define __socketcall(name,NAME) \
- .text; \
- .type name,@function; \
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index dec2226d9593..f20dd9bfd3d1 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -1,10 +1,8 @@
 AUX gjs-1.64.5-gcc-11-support.patch 5254 BLAKE2B 77ca0c06f8214bc4a61d4e6df2371776c086738d19164d94913b0c55f795078d29c83a1f61ebd435f8977e853f2f7bbd9d442888f9ebef4e6a4fc11575734e16 SHA512 291bd7c518286af2018602a3794b2cdc4b39ea169c527af4e2ee97f9021fad56b361fc5aa65e0d4cac0d33921a97330ef50fbf03ec1d2fe04896c881c4b080ce
 DIST gjs-1.64.5.tar.xz 422548 BLAKE2B dcc0b7327cbc6a1108be031c8807e61ebd3c8392916750078aaa0d82cb3bf9f7ff0e1876c250e5ddf6e9d7bb6a17d9d1fe34c1c77ff534b7ec1dd54fa05a2d1b SHA512 41a3c79888792674b2bccbf254507ed02497eb571c8ca7f47aab406d2ee29b73c98b1c7d59c33ed33bad90c6989df944d78b86d2f7e9824d598b62e29769b6dc
-DIST gjs-1.72.0.tar.xz 620296 BLAKE2B 33665e66d548c6017bdc9ddb7409e1a21b07c9257bfa23ef35b58131037eefcf8ec5c8ffddbb1968db374f22729a6da873b85a022a2f3ed00168cba00acc7923 SHA512 224934eed511052d013cc7c2a29ccf79b14e5ed8c01db8071f07858387d7794b9156abd43ac494a13294248d9b6f2956d21c4e9581a41f5161043dff374f72f9
 DIST gjs-1.72.1.tar.xz 620248 BLAKE2B 945b988fdb8c9fc01ec73c8f10b7e5ba9db3ee6dabee65d574b42b7cc9421a0c679f15d565a5e538f6493ed58dc4f9503698b8e3c554704338225d7a748b9594 SHA512 dbceb8651e248ace064d9338d1b3ee1ec0ec835843eb617925b09d77808a71274023d7ad621ed638ff47b93e1fa46e7a349342e555dd6043dc97b81d36bf34e6
 DIST gjs-1.72.2.tar.xz 620380 BLAKE2B 5ea15bdf25c36fa0236f03adea5b2261db3923190005754119eacd070830e7baedfa842ab273219055f67f7af535d31d5844c76eddfb03a8ec1cab57297ec258 SHA512 0dd10f40e8811bbb79c541cf3dc4e3759c0e025485e4b8ad2870dc30ac8030573300bc178c78bf2d396b86733e36b33210bfbdeead6a314e592d5b3c250a16a2
 EBUILD gjs-1.64.5.ebuild 1182 BLAKE2B ba36f6e0485dc507cba57a163eb835d5857e00e6f9dc46e6659bdd4e3b35965f10d8808c3a0220e7369f29c3c0552351ebdff4d590932bf916a11b2ae26ab8bf SHA512 d2be5b242e3249e7a718f7ea595ab3b44a83645f553d7ad42cc5a2b766b96a335b86f182a718fc1544e0817ade4b2d6229a0b0a41f9c4ab5f5ab0af49fc96bde
-EBUILD gjs-1.72.0.ebuild 1885 BLAKE2B 472680725a8ac3fc8f95831135755ff14a111b4491ceada68851fe8754b5e380308524d5d1b5760581cafb2e827a2a74ea449f5d55526d4515ce8358b0e479ea SHA512 b30afd4b9b05e09b4e864f70accc355bfc0fde823cd4cc41decf88732c5a06679167187de2f55df4fbca958367f8c399e5689926c5bdf35e7edd645be6bb5d25
 EBUILD gjs-1.72.1.ebuild 1925 BLAKE2B cb5519e7e59c873f00cd8a76467121c06aa61901f148e88bbfad3318062cf61c42175e21c0ec582d2bd7b8b20c5e94069c0558165698e7f7457c8b0eaa1f1fa3 SHA512 e42397dd717a6c59cdf943447bc66c3e9e2c2afb3e9f2b39a18900fdffec6e596c42c55d10ca26d6f0f16c9fc1b07655e5c61d2c5dcce44e76d2b90bee2fd4e3
 EBUILD gjs-1.72.2.ebuild 1930 BLAKE2B cfe059849d7e42ef0a43777c16bed4edb335a0039fc781da5e3b2260512acc3019f088772c26ec8b05c5a0134e949e30d02cdb9db686ef3f5600aa593bff558b SHA512 21cc6ba7bfddd93792fc0b3c5ab2403612aa704efc18d5518e71aa6c59efa015225e5f36f6004e9636b24ac674aac6ff65761464c78d64e59fd247fe1c74d861
 MISC metadata.xml 389 BLAKE2B 68d318dc917f5072b08e83506e14d0f4b8f25bdb90b95701013466112f8fdd77c2cc193257eee82fbce517e41056eeff61cd20137b697f6d1d688d943bafb8cc SHA512 bc4b0c94d58f3f67cbe481c45fdedb5d601e3ca40b5dcc88ef8c7ad9b214e7cd0d5c47d94599f85c11cd1c21dfd57770fd64d442f4b3f960ebc70a8e16f8e8eb
diff --git a/dev-libs/gjs/gjs-1.72.0.ebuild b/dev-libs/gjs/gjs-1.72.0.ebuild
deleted file mode 100644
index 6a6738cf344c..000000000000
--- a/dev-libs/gjs/gjs-1.72.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic gnome.org meson virtualx
-
-DESCRIPTION="Javascript bindings for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
-
-LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
-SLOT="0"
-IUSE="+cairo examples gtk readline sysprof test"
-KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.66.0
-	dev-libs/libffi:=
-	>=dev-libs/gobject-introspection-1.66.1:=
-	>=dev-lang/spidermonkey-91.3.0:91
-	cairo? ( x11-libs/cairo[X,glib,svg] )
-	readline? ( sys-libs/readline:0= )
-"
-DEPEND="${RDEPEND}
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
-	test? ( sys-apps/dbus
-		>=x11-libs/gtk+-3.20:3[introspection] )
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_configure() {
-	append-cppflags -DG_DISABLE_CAST_CHECKS
-
-	# On musl, it's required that either gjs, pixman or gnome-shell to be built
-	# with a larger stack otherwise librsvg fails to render a particular SVG, as
-	# a result we fail to get gdm or gnome-shell running (greeted with a fail
-	# whale screen). The bug has been reported to librsvg. This is ideally just
-	# a temporary workaround until we understand what exactly needs a larger
-	# stack size, as it's not sufficient to do just librsvg.
-	#
-	# Please refer to:
-	# https://gitlab.gnome.org/GNOME/librsvg/-/issues/686
-	# https://gitlab.gnome.org/GNOME/librsvg/-/issues/874
-	#
-	# TODO: Find an actual fix instead of increasing the stack
-	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
-
-	# 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/glib/Manifest b/dev-libs/glib/Manifest
index 3d9173c8651b..d1734d7df7e9 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,6 +1,4 @@
 AUX glib-2.64.1-mark-gdbus-server-auth-test-flaky.patch 842 BLAKE2B 6b2eb57b8923c8bb54ead80d829aeb7a5c8a42c62e960e7305bc3fad69c67fd21e1c9f20b5c9002c0319cf3d77992b9cb71912c9b813b723e0a56aaea38330ad SHA512 ccd92d2f1fd495618ac788ffe6b69acec05a521a0ee8ff2bacb1dce6e283a04bbc2a10e61b37fc29f3893003fa154fa0d30bc37ed266b3f813200cd8ed17c116
-DIST glib-2.72.2.tar.xz 4891264 BLAKE2B 932613e69edc302793c5db9fdff36fb4ec04df3820aaa3dc2ef6cc01b8124bee3fe2f96cabd9c44b49601425ba7af072f8ad6fd331f6247e00ab6fc94f7f2620 SHA512 9a1121be1d5b1de50fb732d55298a8deb6e6e7fe02e06ab18fdfbc51a0f0d77c13c5faf29a227b5746b0f8c1c0502fc79c36cef2b7a62c4701b9deffe5887e69
 DIST glib-2.72.3.tar.xz 4893484 BLAKE2B 1360c887b07ede3de3a7d31589f3dfc07ada2fe3e7901d3f30048ab9a1379357753ae142c6c107b3fcd6dd61e1401fbe6db22f0e89ea617db2c1073f1900cbe6 SHA512 8834ab7498577c2f659d135b87c27b34e1157be27f6c1fe5af0d64a94654f78cbe6a87e6868966849674c34e88a9d51d2de8d89f78f86aa1e1af3482761f0638
-EBUILD glib-2.72.2.ebuild 10244 BLAKE2B 3f37fd728f89fabc8bba3a09946a069cf3220d14637089300cac575a1fafc667d9e04a4592552db64db2144c80f9ae697f0597a5110175cdb0fb3c74e95d71e2 SHA512 ad314b8967042ad94110d0c582bb08bdb4df84dbef60f6184223604abdaf311fe1eb056103df0ec19d7fda010b8e90f2054df86ca817f451e0dc6e6b695a530f
 EBUILD glib-2.72.3.ebuild 10244 BLAKE2B 3f37fd728f89fabc8bba3a09946a069cf3220d14637089300cac575a1fafc667d9e04a4592552db64db2144c80f9ae697f0597a5110175cdb0fb3c74e95d71e2 SHA512 ad314b8967042ad94110d0c582bb08bdb4df84dbef60f6184223604abdaf311fe1eb056103df0ec19d7fda010b8e90f2054df86ca817f451e0dc6e6b695a530f
 MISC metadata.xml 1221 BLAKE2B 517c6f9ee14ccac7192d7c1189773ec6e034bc638a8acd28081a604f8516ee639f43c82ca3233d513dbfd06db714358e396f2c4cd906715bb0950f130974ab9e SHA512 0c4203b3c9d8b91eebe4ee54f34d1aae26e5efa4c791760559b18b58d90b508936ead62ee8df81e6777ad8e0cb0e9c68d504d0f24ecd5903d4e3df89c6cc0bdf
diff --git a/dev-libs/glib/glib-2.72.2.ebuild b/dev-libs/glib/glib-2.72.2.ebuild
deleted file mode 100644
index 68cfcda45393..000000000000
--- a/dev-libs/glib/glib-2.72.2.ebuild
+++ /dev/null
@@ -1,288 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-IUSE="dbus debug +elf fam gtk-doc +mime selinux static-libs sysprof systemtap test utils xattr"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="gtk-doc? ( test )" # Bug #777636
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-# * elfutils (via libelf) does not build on Windows. gresources are not embedded
-# within ELF binaries on that platform anyway and inspecting ELF binaries from
-# other platforms is not that useful so exclude the dependency in this case.
-# * Technically static-libs is needed on zlib, util-linux and perhaps more, but
-# these are used by GIO, which glib[static-libs] consumers don't really seem
-# to need at all, thus not imposing the deps for now and once some consumers
-# are actually found to static link libgio-2.0.a, we can revisit and either add
-# them or just put the (build) deps in that rare consumer instead of recursive
-# RDEPEND here (due to lack of recursive DEPEND).
-RDEPEND="
-	!<dev-util/gdbus-codegen-${PV}
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/libpcre-8.31:3[${MULTILIB_USEDEP},static-libs?]
-	>=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
-	kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] )
-	selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
-	xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) )
-	elf? ( virtual/libelf:0= )
-	fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-# libxml2 used for optional tests that get automatically skipped
-BDEPEND="
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=sys-devel/gettext-0.19.8
-	gtk-doc? ( >=dev-util/gtk-doc-1.33
-		app-text/docbook-xml-dtd:4.2
-		app-text/docbook-xml-dtd:4.5 )
-	systemtap? ( >=dev-util/systemtap-1.3 )
-	${PYTHON_DEPS}
-	test? ( >=sys-apps/dbus-1.2.14 )
-	virtual/pkgconfig
-"
-# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen
-
-PDEPEND="
-	dbus? ( gnome-base/dconf )
-	mime? ( x11-misc/shared-mime-info )
-"
-# shared-mime-info needed for gio/xdgmime, bug #409481
-# dconf is needed to be able to save settings, bug #498436
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gio-querymodules$(get_exeext)
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch
-)
-
-pkg_setup() {
-	if use kernel_linux ; then
-		CONFIG_CHECK="~INOTIFY_USER"
-		if use test ; then
-			CONFIG_CHECK="~IPV6"
-			WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
-		fi
-		linux-info_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	if use test; then
-		# TODO: Review the test exclusions, especially now with meson
-		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
-		if ! has_version dev-util/desktop-file-utils ; then
-			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
-			ewarn "think on installing it to get these tests run."
-			sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
-			sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
-		fi
-
-		# gdesktopappinfo requires existing terminal (gnome-terminal or any
-		# other), falling back to xterm if one doesn't exist
-		#if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
-		#	ewarn "Some tests will be skipped due to missing terminal program"
-		# These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson
-		# Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready for backport (or in a bump) and file new issue if still fails
-		sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
-		# desktop-app-info/launch* might fail similarly
-		sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die
-		#fi
-
-		# https://bugzilla.gnome.org/show_bug.cgi?id=722604
-		sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
-		sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
-
-		ewarn "Tests for search-utils have been skipped"
-		sed -i -e "/search-utils/d" glib/tests/meson.build || die
-
-		# Play nice with network-sandbox, but this approach would defeat the purpose of the test
-		#sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die
-	else
-		# Don't build tests, also prevents extra deps, bug #512022
-		sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die
-	fi
-
-	# Don't build fuzzing binaries - not used
-	sed -i -e '/subdir.*fuzzing/d' meson.build || die
-
-	# gdbus-codegen is a separate package
-	sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die
-
-	# Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon
-	sed -i -e '/install_dir/d' gio/tests/meson.build || die
-
-	cat > "${T}/glib-test-ld-wrapper" <<-EOF
-		#!/usr/bin/env sh
-		exec \${LD:-ld} "\$@"
-	EOF
-	chmod a+x "${T}/glib-test-ld-wrapper" || die
-	sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die
-
-	default
-	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'
-		-Dman=true
-		$(meson_use systemtap dtrace)
-		$(meson_use systemtap)
-		$(meson_feature sysprof)
-		$(meson_native_use_bool gtk-doc gtk_doc)
-		$(meson_use fam)
-		$(meson_use test tests)
-		-Dinstalled_tests=false
-		-Dnls=enabled
-		-Doss_fuzz=disabled
-		$(meson_native_use_feature elf libelf)
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	export XDG_CONFIG_DIRS=/etc/xdg
-	export XDG_DATA_DIRS=/usr/local/share:/usr/share
-	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
-	export LC_TIME=C # bug #411967
-	export TZ=UTC
-	unset GSETTINGS_BACKEND # bug #596380
-	python_setup
-
-	# https://bugs.gentoo.org/839807
-	local -x SANDBOX_PREDICT=${SANDBOX_PREDICT}
-	addpredict /usr/b
-
-	# Related test is a bit nitpicking
-	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-	chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-
-	meson_src_test --timeout-multiplier 2 --no-suite flaky
-}
-
-multilib_src_install() {
-	meson_src_install
-	keepdir /usr/$(get_libdir)/gio/modules
-}
-
-multilib_src_install_all() {
-	# These are installed by dev-util/glib-utils
-	# TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit now with meson
-	rm "${ED}/usr/bin/glib-genmarshal" || die
-	rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die
-	rm "${ED}/usr/bin/glib-mkenums" || die
-	rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die
-	rm "${ED}/usr/bin/gtester-report" || die
-	rm "${ED}/usr/share/man/man1/gtester-report.1" || die
-	# gdbus-codegen manpage installed by dev-util/gdbus-codegen
-	rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	# Make gschemas.compiled belong to glib alone
-	local cache="/usr/share/glib-2.0/schemas/gschemas.compiled"
-
-	if [[ -e ${EROOT}${cache} ]]; then
-		cp "${EROOT}"${cache} "${ED}"/${cache} || die
-	else
-		touch "${ED}"${cache} || die
-	fi
-
-	multilib_pkg_preinst() {
-		# Make giomodule.cache belong to glib alone
-		local cache="/usr/$(get_libdir)/gio/modules/giomodule.cache"
-
-		if [[ -e ${EROOT}${cache} ]]; then
-			cp "${EROOT}"${cache} "${ED}"${cache} || die
-		else
-			touch "${ED}"${cache} || die
-		fi
-	}
-
-	# Don't run the cache ownership when cross-compiling, as it would end up with an empty cache
-	# file due to inability to create it and GIO might not look at any of the modules there
-	if ! tc-is-cross-compiler ; then
-		multilib_foreach_abi multilib_pkg_preinst
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	# glib installs no schemas itself, but we force update for fresh install in case
-	# something has dropped in a schemas file without direct glib dep; and for upgrades
-	# in case the compiled schema format could have changed
-	gnome2_schemas_update
-
-	multilib_pkg_postinst() {
-		gnome2_giomodule_cache_update \
-			|| die "Update GIO modules cache failed (for ${ABI})"
-	}
-	if ! tc-is-cross-compiler ; then
-		multilib_foreach_abi multilib_pkg_postinst
-	else
-		ewarn "Updating of GIO modules cache skipped due to cross-compilation."
-		ewarn "You might want to run gio-querymodules manually on the target for"
-		ewarn "your final image for performance reasons and re-run it when packages"
-		ewarn "installing GIO modules get upgraded or added to the image."
-	fi
-
-	for v in ${REPLACING_VERSIONS}; do
-		if ver_test "$v" "-lt" "2.63.6"; then
-			ewarn "glib no longer installs the gio-launch-desktop binary. You may need"
-			ewarn "to restart your session for \"Open With\" dialogs to work."
-		fi
-	done
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-
-	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		multilib_pkg_postrm() {
-			rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache
-		}
-		multilib_foreach_abi multilib_pkg_postrm
-		rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled
-	fi
-}
diff --git a/dev-libs/libcdio/Manifest b/dev-libs/libcdio/Manifest
index 5f50733297aa..9cd52d0a5195 100644
--- a/dev-libs/libcdio/Manifest
+++ b/dev-libs/libcdio/Manifest
@@ -1,7 +1,4 @@
-AUX libcdio-2.0.0-iso-ioleak.patch 1093 BLAKE2B bd30e99cd35d2cb09dbbc7dd91133f1649a8761e7f23b1544a65477a77466f6b72bb99eb3ac21980b1cca54590fd5852dc1b9f7fde28a50bc5e101320576bdf5 SHA512 851fb3610ab801a5c62075426b9b51d42c60d35aaf4d247a825f8323d41bce692f48632604b7e6bc03ef83974f077ced371812ce50397dc054d16e353074f625
 AUX libcdio-2.1.0-ncurses_pkgconfig.patch 923 BLAKE2B 848a76241ca173c452cf7b04142c249ca6c33b7d0514f03353bb7b1f43635d1bec36cf9f3e3ce61ab51d6cb42ab123f620fe6fe1706b71148ec2ab9592c0bc02 SHA512 98c16eebd1cd6bf57e85dd3abafba22a4a1f2f88e0d5f1c9ee98d7409c360c6e3dda43233823de97429a54be66969cec1eb8df4bbb7d0341a54c6a1ae475dd7b
-DIST libcdio-2.0.0.tar.gz 2354813 BLAKE2B d3ebf9a20004cc8c75d1e6f97a2cea68f490517e34a4cf84f343d717e49cbb9cd612a3c6911894501f16373e3222e7fc6d175fd6d93d1c967cd21502716b22f8 SHA512 8f48cc71d28b427b16f48e50bcaf0aea171055c72a9aeee383ac4374eee1d3d288323814c3a3f308a9ba097aa815319429c1931072897985a3b02b814766fd4f
 DIST libcdio-2.1.0.tar.bz2 1759040 BLAKE2B 4859fc545cf81246279b7b0434c02916e874681b40d00f8253fd7837941a34c5a717a81b1c3b1714153ad343e03c28668984f6fd5647662ec4e6759752326cb0 SHA512 c290821da55fd9ae366670a58857aa6efcebc9f25b7caea063cf12f9cbda84fe770c5f59f972227fda50517ca58c5f39c0137daa0f93179e3daa45303d8b610f
-EBUILD libcdio-2.0.0-r1.ebuild 1847 BLAKE2B 46f0f04beba6fa89e3723e2299654caf6e9c1c6cbdadb03e39773f093d6b896e10092171908d29bb7bc06c32a5108e4c1455322e9c678a92f86139ceffd69a55 SHA512 69595476e44d13d348716e78fa953f5f83f718d0605f1fc9df5766b871713944adcf551936af86fb2588947c933be6af62ff8ce767dc79f3ac8c365ed384c26c
 EBUILD libcdio-2.1.0-r1.ebuild 1804 BLAKE2B f573289277702791fcf1d6cf3156820306bd523e087ee98af0b66810a48f04d97559a3befe0fac13f58fb06d0a7e993aa6dab51835dafe2420f31ad0120dbe58 SHA512 ed841a3e8801138e2108ff87de988797de65c4cf0a0f9c1cd5ac74e047bad022ca4bed96d76c8a8f048675c92773c0330a61b801f8a3d581432115b1d94b0acb
 MISC metadata.xml 529 BLAKE2B 904a44230f894763ce7100a7816ec624427963881db42af35739fb3b31c811df8142eed82fd20946bc4fbede978bc3f561fbbcb85fe949f21cbf2e72bf6a1169 SHA512 76dc080e917f5d0bb5238eab5af3d890b6e2023866ddd1aec938f12044347269bff733278a4bdfa7655759baa20056ef565aebbcd4eacf78a772ac40e64386a8
diff --git a/dev-libs/libcdio/files/libcdio-2.0.0-iso-ioleak.patch b/dev-libs/libcdio/files/libcdio-2.0.0-iso-ioleak.patch
deleted file mode 100644
index 17732104c3d1..000000000000
--- a/dev-libs/libcdio/files/libcdio-2.0.0-iso-ioleak.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 8c0de2d3f0324ecf3fd135589589dcd783c15556 Mon Sep 17 00:00:00 2001
-From: rocky <rocky@gnu.org>
-Date: Fri, 16 Feb 2018 09:14:17 -0500
-Subject: Fix small I/O leak when we can't read ISO file
-
-See Savannah bug #53170. Thanks to David Binderman.
----
- src/iso-read.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/iso-read.c b/src/iso-read.c
-index 0541e27..8647485 100644
---- a/src/iso-read.c
-+++ b/src/iso-read.c
-@@ -1,5 +1,6 @@
- /*
--  Copyright (C) 2004-2006, 2008, 2012-2013, 2017 Rocky Bernstein <rocky@gnu.org>
-+  Copyright (C) 2004-2006, 2008, 2012-2013, 2017-2018 Rocky Bernstein
-+  <rocky@gnu.org>
- 
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-@@ -364,7 +365,10 @@ main(int argc, char *argv[])
-       ret = read_iso_file (opts.iso9660_image, opts.file_name,
-                            outfd, &bytes_written);
-   }
--  if (ret != 0) return ret;
-+  if (ret != 0) {
-+    fclose (outfd);
-+    return ret;
-+  }
- 
-   fflush (outfd);
- 
--- 
-cgit v1.0-41-gc330
-
diff --git a/dev-libs/libcdio/libcdio-2.0.0-r1.ebuild b/dev-libs/libcdio/libcdio-2.0.0-r1.ebuild
deleted file mode 100644
index 4144e54f2f0d..000000000000
--- a/dev-libs/libcdio/libcdio-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools libtool multilib-minimal toolchain-funcs
-
-DESCRIPTION="A library to encapsulate CD-ROM reading and control"
-HOMEPAGE="https://www.gnu.org/software/libcdio/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/18" # subslot is based on SONAME
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE="cddb +cxx minimal static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!minimal? (
-		>=sys-libs/ncurses-5.7-r7:0=
-		cddb? ( >=media-libs/libcddb-1.3.2 )
-	)
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	sys-apps/sed
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( dev-lang/perl )
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README{,.libcdio} THANKS TODO )
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/cdio/cdio_config.h
-	/usr/include/cdio/version.h
-)
-
-PATCHES=( "${FILESDIR}/${P}-iso-ioleak.patch" )
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	sed \
-		-e "s:-lncurses:$($(tc-getPKG_CONFIG) --libs ncurses):g" \
-		-i configure || die
-
-	elibtoolize # to prevent -L/usr/lib ending up in the linker line wrt 499510
-}
-
-multilib_src_configure() {
-	local util_switch
-	if ! multilib_is_native_abi || use minimal ; then
-		util_switch="--without"
-	else
-		util_switch="--with"
-	fi
-
-	# Tests fail if ECONF_SOURCE is not relative
-	ECONF_SOURCE="../${P}" econf \
-		--disable-maintainer-mode \
-		$(use_enable cxx) \
-		--disable-cpp-progs \
-		--disable-example-progs \
-		$(use_enable static-libs static) \
-		$(use_enable cddb) \
-		--disable-vcd-info \
-		${util_switch}-{cd-drive,cd-info,cdda-player,cd-read,iso-info,iso-read}
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libgit2-glib/Manifest b/dev-libs/libgit2-glib/Manifest
index d8e6b5e8ee6d..bb8b32d7cdb8 100644
--- a/dev-libs/libgit2-glib/Manifest
+++ b/dev-libs/libgit2-glib/Manifest
@@ -1,5 +1,3 @@
-DIST libgit2-glib-1.0.0.1.tar.xz 141664 BLAKE2B a99ad6db55d0d4bee4d7d96b92e92d12712843e41e25e5ab57f5722926fe3e95109a33654d0ab94b7f919bd5d51a0b159dcae720eee763200c964d0327b8a37d SHA512 8e156791783f79d585fa83267a5e14a4a93324fcca75e836478ddd5b5c53d9e827b07a3738c67116478435613639aab0992f32413b9a4de5fc4ff641dd042e80
 DIST libgit2-glib-1.1.0.tar.xz 140128 BLAKE2B e1e87fca17ec801059245c5687399f48886450f7ca7ea948f2179fed383543dec1b18b78abc3ec5581f570b488a166e1e03e99201385698877075be8b3205dbe SHA512 5e493b85a2bcbfea2a291e6dd243ee6948a31e7305c96c0bf04a750114de6ba3a06b435502eeae09bc1b91d34d5174e27bd4171fe969f1b376e820f82a3b5e1d
-EBUILD libgit2-glib-1.0.0.1.ebuild 1253 BLAKE2B 69db594f58807be22ad29aceed690eb17f96387403ade7577de007238556f1aa172cf380b874aee29e23c416e2924ea80ffdd3a0b1682f400b06ecfdabc2e4e6 SHA512 551dd9264d1f2a3e052b4dfe3bd829b136b1ecd20a0b4fb40256a6d47dbabd32f80027e853c64c3ae31b379c369020076cea073046685dcfe42914dec9720313
 EBUILD libgit2-glib-1.1.0.ebuild 1219 BLAKE2B 918309649d42b2e80998c4b8d7572be388fa01a0475485bacfd79d375aa38236bea05b66df9e52d2951c64d77ef80df08534669747c289ca804f3bbf900756c6 SHA512 77bfa927dbe4b7b604520c509c81d028bdcf54f8beded73d795f3957be46df7fc701bca6b7508bd0fec665d7ab261c48da9eeb8b76f655b951e1f8a16eddb300
 MISC metadata.xml 432 BLAKE2B 69d6aa326333089515925cd4c8cc5c2d86318cbe148349f2e2f1554afd8c659a5ce3aed28ad02562d8552317bb010f866e10e3793e47f5a7a5c82d11d8702e51 SHA512 bf228fa30f58c6d860b7648eb40e841c72398390539980fd48e35860f6874e141c3b81c373ee3ca1cb8bbbde5dec36a94c5381b102e1ec33e91962455d9fa8ee
diff --git a/dev-libs/libgit2-glib/libgit2-glib-1.0.0.1.ebuild b/dev-libs/libgit2-glib/libgit2-glib-1.0.0.1.ebuild
deleted file mode 100644
index ee3a43c9aa88..000000000000
--- a/dev-libs/libgit2-glib/libgit2-glib-1.0.0.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome.org meson python-r1 vala xdg
-
-DESCRIPTION="Git library for GLib"
-HOMEPAGE="https://wiki.gnome.org/Projects/Libgit2-glib"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
-IUSE="gtk-doc python +ssh +vala"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=dev-libs/gobject-introspection-1.54:=
-	>=dev-libs/glib-2.44.0:2
-	>=dev-libs/libgit2-0.26.0:0=[ssh?]
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:3[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.1.2 )
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	xdg_src_prepare
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gtk-doc gtk_doc)
-		-Dintrospection=true
-		-Dpython=false # we install python scripts manually
-		$(meson_use ssh)
-		$(meson_use vala vapi)
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	if use python ; then
-		python_moduleinto gi.overrides
-		python_foreach_impl python_domodule libgit2-glib/Ggit.py
-	fi
-}
diff --git a/dev-libs/link-grammar/Manifest b/dev-libs/link-grammar/Manifest
index 89aba349da28..06108d42309a 100644
--- a/dev-libs/link-grammar/Manifest
+++ b/dev-libs/link-grammar/Manifest
@@ -1,6 +1,4 @@
 AUX link-grammar-5.8.1-lld.patch 531 BLAKE2B e7a64032d8e8394205d4529e270bee1ec121a6b29b6a779e885cae825678679e521b2f4eb2bec6b6b6c8f1c5f311337c7b2e205a5cb1966538741e72b7e7cb37 SHA512 03dd3164c7626d70019851189fd35d7ecfcbc112b594dafc0c3390f0d533b67611838cd9207a486139f4e4c8ac78f81da87d0c00a0238ad417c90942bcaa2c6b
-DIST link-grammar-5.10.4.tar.gz 4593602 BLAKE2B 0515aed27ae8df85ceddb9685ce90db2b6e7671235b9b445b6728b1ac417d6d43b3705566066ff9735fc98c32746342c224f2399bb0f2573784f20b5f998e7be SHA512 a215694f76e15286c478884ea8a13b32976d06ea45d10897dc1b303f256a2c0af94c9f90da26b314ce5e03009b494ab526c729b66f2b1ed46ff3e8b02cb6fd08
 DIST link-grammar-5.10.5.tar.gz 4637765 BLAKE2B d280a06492462725c9c62352b6bf4fb0a11a09b2b3049e41d9a078fa2ad37c8ef0f0e99e05039e355e81d127c168024068319a4fcf64caa840c00c165ed22f11 SHA512 09774f7ce01bc7ec9912162297c9b7be176e655b70981a147d53245c015f62581e7f45c005d0590d1a65e870e3c2ac4288517012fd9caa9887e4fd86d8e6aa05
-EBUILD link-grammar-5.10.4.ebuild 2921 BLAKE2B a8f4961b5360995d58b9d52d15357717a038f417ecd61941007bd5aadb324f2bcee9b33d53a161ffa682c3bef7ea68f9813fb1c52abf2e3602f025a10f61959e SHA512 6fa2c1ab5d2140c425b3f68f59760dc61eed86dda635616a591bfb3860a2a0a57d41a1c3f0c688cd02a8e3401c7ae865505116c927f4a8da856b0bb475ca9bb6
 EBUILD link-grammar-5.10.5-r1.ebuild 2833 BLAKE2B e5dbcd6c317488e8523045c4874ab5f9b7addf9ae51722803f0dcc79c260d8b92b39d2282382411a5a6c4f4b093a60f6d9c16b33b87b84141586b5b885d26f2d SHA512 dd98a24400a1d92a8fe88af76c3e2d92b44cc707f3881337729406f95526042a12fe0ad34497e39f5e2f2d75190cce0454cd81a5aed3177d673552b59c27c43c
 MISC metadata.xml 1069 BLAKE2B e657e7727730c54d4aee903c585378978a2adf7a3a6851e6995445afe64e966e48bc4bfab6e930449c288b3ffca3436b9fbe67e88f9e790739ff0c8a079a79e2 SHA512 ba898591c96b8d05601389837891f6cda7eece200c10e014e86e0189aeeb5a0d0c04327d348ce2d77fa3d72dbbe3eec5b96953ff6903bd9670f305886f869229
diff --git a/dev-libs/link-grammar/link-grammar-5.10.4.ebuild b/dev-libs/link-grammar/link-grammar-5.10.4.ebuild
deleted file mode 100644
index aef4f10b4a0c..000000000000
--- a/dev-libs/link-grammar/link-grammar-5.10.4.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit autotools python-r1 out-of-source
-
-DESCRIPTION="A Syntactic English parser"
-HOMEPAGE="https://www.abisource.com/projects/link-grammar/ https://www.link.cs.cmu.edu/link/"
-SRC_URI="https://www.abisource.com/downloads/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/5"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86"
-IUSE="aspell +hunspell python" # pcre
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# XXX: sqlite is automagic
-# Does not build with >=sci-mathematics/minisat-2, bug #593662
-# add pcre support: pcre? ( dev-libs/libpcre )
-RDEPEND="
-	dev-db/sqlite:3
-	aspell? ( app-text/aspell )
-	hunspell? ( app-text/hunspell )
-	python? ( ${PYTHON_DEPS} )
-	!sci-mathematics/minisat"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-lang/swig:0
-	sys-devel/autoconf-archive
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${PN}-5.8.1-lld.patch )
-
-pkg_setup() {
-	if use aspell && use hunspell; then
-		ewarn "You have enabled 'aspell' and 'hunspell' support, but both cannot coexist,"
-		ewarn "only hunspell will be built. Press Ctrl+C and set only 'aspell' USE flag if"
-		ewarn "you want aspell support."
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-my_src_configure() {
-	local myconf=(
-		--disable-maintainer-mode
-		--disable-editline
-		# java is hopelessly broken, invokes maven at build time (bug #806157)
-		--disable-java-bindings
-		--disable-perl-bindings
-		--disable-static
-		--enable-sat-solver=bundled
-		$(use_enable aspell)
-		$(use_enable hunspell)
-		$(usev hunspell --with-hunspell-dictdir="${EPREFIX}"/usr/share/myspell)
-		# $(use_enable pcre regex-tokenizer)
-		# $(use_with pcre)
-	)
-
-	econf \
-		--disable-python-bindings \
-		"${myconf[@]}"
-
-	if use python; then
-		python_configure() {
-			econf \
-				--enable-python-bindings \
-				"${myconf[@]}"
-		}
-		python_foreach_impl run_in_build_dir python_configure
-	fi
-}
-
-my_src_compile() {
-	local -x MAIN_BUILD_DIR="${BUILD_DIR}"
-	default
-
-	if use python; then
-		python_compile() {
-			emake -C bindings/python \
-				VPATH="${S}:${MAIN_BUILD_DIR}" \
-				_clinkgrammar_la_DEPENDENCIES="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la \
-				_clinkgrammar_la_LIBADD="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la
-		}
-		python_foreach_impl run_in_build_dir python_compile
-	fi
-}
-
-my_src_install() {
-	local -x MAIN_BUILD_DIR="${BUILD_DIR}"
-	default
-
-	if use python; then
-		python_install() {
-			emake -C bindings/python \
-				VPATH="${S}:${MAIN_BUILD_DIR}" \
-				_clinkgrammar_la_DEPENDENCIES="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la \
-				_clinkgrammar_la_LIBADD="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la \
-				DESTDIR="${D}" \
-				install
-		}
-		python_foreach_impl run_in_build_dir python_install
-	fi
-
-	# no static archives
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/sink/Manifest b/dev-libs/sink/Manifest
index 7ed3409595dd..7740de18ad8f 100644
--- a/dev-libs/sink/Manifest
+++ b/dev-libs/sink/Manifest
@@ -1,3 +1,4 @@
+AUX sink-0.8.0-musl-execinfo.patch 1385 BLAKE2B cd8221e6b5adc56d6d308781d020e47679b49b9099377a4892d6b63c19a2e3d74e32e9254e947b8cf1d5ced281bd4f95d73df26e0eb346a8d6582b1c88f660d8 SHA512 c5a61110ac2288680ae6025442f53a1828a4644f7cd28e3b36d9404933d60deca18ec28ae80f1e09bae19564fd0308f83abd5bd9b09d0d02bc2fea8a0e4d54ac
 DIST sink-0.8.0.tar.xz 295064 BLAKE2B 8187520979b43966a4e2d782e0ceb651c49eb25a349e2f9f2251b47978b0eebe64a98ce8c04f1854cdd05779f01c2cb68f1fa008568c1e95d292dbcd65fc61fe SHA512 008ca8355ffbed2bf89a906510aac4c505c8e44de49f445db283aa565e233e7652f2e46c5bcf37e680dec940a8c0f1525e6a8f708e1b4742db62522255c8bad6
-EBUILD sink-0.8.0-r3.ebuild 1397 BLAKE2B 1bfd9829b5b0fe000900d44dcaa6254b541234a9ce99b6cf51714e95a6abf332f599605a77327496a9d0e1e9d669f514864ff002f37de61ed77e72c4ff0d07d0 SHA512 5525bb993f5100d1a5fdad5559156744ed0ea2feb456c3887516515a13b689cfcecc6212f1b94a6cc739ca2889071b39c301f68bbdb2e6b2f3e1077c631acf1b
+EBUILD sink-0.8.0-r3.ebuild 1457 BLAKE2B 8b8d77e3b4db09bf2c233492483c229cd96ff03304b622b25afb2f5f687ee239cd72a10b775746876fbe758062e97cb06081f17f0ef0b6ee2a240fc054061ae7 SHA512 24723a0ca0f45617ed4c9090f440eb97d45fab42ee2640078c669deeb0b288e67da2f86799da3352b2098566e7dc6017da097d5adef3b1bf85bf3c6571c09546
 MISC metadata.xml 236 BLAKE2B 219db736f77611984b5f2e1279f05575460ed974eee871808e2416e919104f563db1b29146c8dc34d8acac54edadbe5da16ca957c969c28922676e13bfb6c36b SHA512 09114b2f38ebda6f06b8c48887dfd47a4d632110afd7904ddbca9af0c7c402634415c765b49a6231dbec01f05c78210adef4f81f28138b56217dfa55d854dc63
diff --git a/dev-libs/sink/files/sink-0.8.0-musl-execinfo.patch b/dev-libs/sink/files/sink-0.8.0-musl-execinfo.patch
new file mode 100644
index 000000000000..b5085702a33e
--- /dev/null
+++ b/dev-libs/sink/files/sink-0.8.0-musl-execinfo.patch
@@ -0,0 +1,48 @@
+# Since musl doesn't have execinfo. We're going to avoid including it and make
+# the printStacktrace function void
+# Closes: https://bugs.gentoo.org/830945
+--- a/synchronizer/CMakeLists.txt
++++ b/synchronizer/CMakeLists.txt
+@@ -2,6 +2,12 @@ project(sink_synchronizer)
+
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
+
++INCLUDE(CheckIncludeFiles)
++CHECK_INCLUDE_FILES("execinfo.h" HAVE_EXECINFO)
++IF (HAVE_EXECINFO)
++	add_compile_definitions(HAVE_EXECINFO_H)
++ENDIF(HAVE_EXECINFO)
++
+ set(sinksynchronizer_SRCS
+     main.cpp
+     backtrace.cpp
+--- a/synchronizer/backtrace.cpp
++++ b/synchronizer/backtrace.cpp
+@@ -31,7 +31,9 @@
+ #include <chrono>
+
+ #ifndef Q_OS_WIN
++#ifdef HAVE_EXECINFO_H
+ #include <execinfo.h>
++#endif // HAVE_EXECINFO_H
+ #include <unistd.h>
+ #include <cxxabi.h>
+ #include <dlfcn.h>
+@@ -143,7 +145,7 @@ private:
+ //Print a demangled stacktrace
+ static void printStacktrace()
+ {
+-#ifndef Q_OS_WIN
++#if !defined(Q_OS_WIN) && defined(HAVE_EXECINFO_H)
+     int skip = 1;
+ 	void *callstack[128];
+ 	const int nMaxFrames = sizeof(callstack) / sizeof(callstack[0]);
+@@ -178,7 +180,7 @@ static void printStacktrace()
+ 		trace_buf << "[truncated]\n";
+     }
+     std::cerr << trace_buf.str();
+-#else
++#elif defined(Q_OS_WIN)
+     enum { maxStackFrames = 100 };
+     DebugSymbolResolver resolver(GetCurrentProcess());
+     if (resolver.isValid()) {
diff --git a/dev-libs/sink/sink-0.8.0-r3.ebuild b/dev-libs/sink/sink-0.8.0-r3.ebuild
index 78d2b574ac2b..c8108f329bf4 100644
--- a/dev-libs/sink/sink-0.8.0-r3.ebuild
+++ b/dev-libs/sink/sink-0.8.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -42,6 +42,10 @@ DEPEND="${RDEPEND}
 # fails to build
 RESTRICT+=" test"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.0-musl-execinfo.patch
+)
+
 src_prepare() {
 	cmake_src_prepare
 	# tests are sprinkled all over the place, and examples are needed...
diff --git a/dev-libs/wayland-protocols/Manifest b/dev-libs/wayland-protocols/Manifest
index ec1051097ee3..528dfe43c261 100644
--- a/dev-libs/wayland-protocols/Manifest
+++ b/dev-libs/wayland-protocols/Manifest
@@ -1,6 +1,6 @@
 DIST wayland-protocols-1.25.tar.xz 79784 BLAKE2B 6ca7fdc910bfd70ee5c3bb192bcf1c79c66c4bb713531b2d1d493bd3ec8509e1231176144d75f4e97a4c6ccc4ee1d836a7ac1cfeaaa59e927f10fa4a40cf023a SHA512 8269694a0780e4d32f1982ff4cbb50b1ef85f08157b9486bc6d7e489c64665a9d9f959121d0eede7c7b108a604d974b64d74cfdef8b5f14304465309afb0768f
 DIST wayland-protocols-1.26.tar.xz 81028 BLAKE2B 0813b8117c48b965560c3f112f67fa209f29b0c40fab2b46f46ccae227d68902277cce06281a6bd938fb3c2186e0cf4ea3670ed6d3b48b51ed655012bb1452ce SHA512 fa9c3963b548197461c8c0b9e16ebbf9cfa5b60053fc17f51b41e63a55b8c5420dd7e42313f93946b438ab47f04e1cd17bc92aae9e1074b47177dc7ce7042167
 EBUILD wayland-protocols-1.25.ebuild 755 BLAKE2B 3fc5c050521210e255e4f84757d8db55799f8f1f24a29cb80212e7961f73c16e043a64f76dfa3185aa56ed20a3e0759247f87cc41ff9f1adde61b147a276d2f4 SHA512 9ba008e0875dbcc8b3c597eb49073bce8afc3d94c0bf6837a684ef692e202b85eeb162640229199965922625763107080e4bf76388fc31b30d3eac2c758e08b6
-EBUILD wayland-protocols-1.26.ebuild 756 BLAKE2B 394be811033ced7ba23916139ee76904d596c52b12981776875894d70ccada56aba211bcdc61f000e3f032b58cda268f47749f843273fc99ce5ced257d7e2f23 SHA512 af9500678d7931c52355fc1b5d53bb8dd0c17fbd9f94b832f86cba696f7160511f64fda4330bba33032f97a6904a37b71f56689eb966be91e9aee277657a934c
+EBUILD wayland-protocols-1.26.ebuild 755 BLAKE2B 3fc5c050521210e255e4f84757d8db55799f8f1f24a29cb80212e7961f73c16e043a64f76dfa3185aa56ed20a3e0759247f87cc41ff9f1adde61b147a276d2f4 SHA512 9ba008e0875dbcc8b3c597eb49073bce8afc3d94c0bf6837a684ef692e202b85eeb162640229199965922625763107080e4bf76388fc31b30d3eac2c758e08b6
 EBUILD wayland-protocols-9999.ebuild 762 BLAKE2B 4f80b6c474c0ea97061ef6fb7703479bb82831a9a25450269356f967855e5b2d255d09a55db9a876ff7789dd8eab5d32c875c3947bf6e64c8eeabeb4c3faed4d SHA512 09dab59db34d5361d9630dc45c7728cf20c5f4491f6022093062b37756b776404964031664dd97efaaa878eb6fc850ce861b32d8e764173ecb28d432452ed719
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/dev-libs/wayland-protocols/wayland-protocols-1.26.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.26.ebuild
index dd41e6e15d91..873c3dfde4c1 100644
--- a/dev-libs/wayland-protocols/wayland-protocols-1.26.ebuild
+++ b/dev-libs/wayland-protocols/wayland-protocols-1.26.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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/wayland/Manifest b/dev-libs/wayland/Manifest
index fbf503588662..1869c2b299c2 100644
--- a/dev-libs/wayland/Manifest
+++ b/dev-libs/wayland/Manifest
@@ -1,6 +1,6 @@
 DIST wayland-1.20.0.tar.xz 225188 BLAKE2B d607610ad8b30b6b3bbfc3945679f698030f271766cfb72425f98f170a96469fb085fb9a746a866b8562d7f452c844e61ad57f634dcf365474c7d050b76022e9 SHA512 e8a1f410994b947f850799bdd0d95a2429d8467f853e62a0ab3915a4e9fe130f8aa977e03715114ab740c6ec546edea63d275ce7f927d4f3029ea126e6a7d215
 DIST wayland-1.21.0.tar.xz 225936 BLAKE2B 2b43eb1517d476bb2b4daed1083373655b57d047968fdb93dbbbbe4235af12e25557627e30b5c3d2575bac4beaf1e0a0b8ef10a3c673538d9097501f33c05836 SHA512 5575216d30fdf5c63caa6bcad071e15f2a4f3acb12df776806073f65db37a50b5b5b3cc7957c5497636f4ac01893e2eaab26e453ded44b287acde01762f5fdc3
 EBUILD wayland-1.20.0.ebuild 1516 BLAKE2B 1a602cda157f1184410d3d1bb71969f182ce9098e9ea0c9be023c1cf158850bd2b9fa3958caa7f3f5fd3974697e408425abe65c1a34d7fc8a826e21e3411325f SHA512 8f2522a515137cab3c4682b136b5a733ef155db57f88e49e4ccb6cfd79911f57173df94d2233ca8a9d9cfe94ad4f6f5ef243d3586345dc9b8e5856409717dfc4
-EBUILD wayland-1.21.0.ebuild 1479 BLAKE2B 153f9ad259224626e09c1ea78719131006ec77d352a5c20f957505e700f8a5ceb455f0e260bebb42825dede527615a779b3ae6fa554ea69048de687d6e7af428 SHA512 ac4f3986d48384e01ae4109bcfee2a5df1bfc84c1788bafb2b35f6c2330aeead1e73487eb5240f35a5bf2016d84fdf461e55631c5dd6037e7d5de4073ca54634
+EBUILD wayland-1.21.0.ebuild 1478 BLAKE2B 0884da89055eb938e9dd782c9ad0e50358205e4752ed4600f8f216f08081f34252c9f1122edffd1123be6f3693d0fe4ddbfd3ad4d2a908e2410ba911d18e44ad SHA512 f6a4e29a0bd5c0bf567a378dd3a715ba3b1f37731777766591467707b426fa845c33e5726e69028093cd5debb300368a73d41190bcbc2e5132479ba0d1397fe4
 EBUILD wayland-9999.ebuild 1485 BLAKE2B 8e82cc08d4efab01be9e60daa08f568c9c2760cd5247f66ac2aac0886ec0dcb3b9d5cc262ed7612e08c77f97c08371b454a35f2af693eb6a8cc88a19c23575d0 SHA512 fbb427c35c1e5df874e99391438babcca5c943b548dfc8c4380e694979833045a94be367d920d696c9e5b332171351e2ff298214e7e82c0c4bbc42a669ca9f12
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/dev-libs/wayland/wayland-1.21.0.ebuild b/dev-libs/wayland/wayland-1.21.0.ebuild
index 9918cd49a51e..62b0263855db 100644
--- a/dev-libs/wayland/wayland-1.21.0.ebuild
+++ b/dev-libs/wayland/wayland-1.21.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/releases/${PV}/downloads/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 inherit meson-multilib