gentoo resync : 12.07.2021

11 files changed, 6 insertions, 346 deletions

diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index 8c311754f032..f4d945ea59b6 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/libhandy/Manifest b/gui-libs/libhandy/Manifest
index 4612c3487481..c6b1e30a6411 100644
--- a/gui-libs/libhandy/Manifest
+++ b/gui-libs/libhandy/Manifest
@@ -1,10 +1,5 @@
-AUX 0.0.13-glade3.36-compat1.patch 1655 BLAKE2B fcc6be57b5eea5554e5ba0149fdc6fe9067a436b333c299f2b6366c98798e821d6d1c861b0fc299c6de145e9f310ea5822505591e678c36f938802accecbe0e6 SHA512 beffe74c8f78767113930193870165c751443d0f9c3cf5c6df89f1f872c892a559c1d34c63f84090d6187afa4495bc2c6a557335db5a98afc3820fe688a48a6f
-AUX 0.0.13-glade3.36-compat2.patch 1879 BLAKE2B d21b874a52028e2b7e4c09da9fb1b97296872a2a7d1665124813a644c9524e56fdeba2afbca218519edf524e91efb76f6182009319e3b098e2464e478b4b5b2d SHA512 c154ee41052dadc97afe99350a08eb141c61dad7201fe2421ae0c27e9cbd5fad8af057e44ae277a2dac9b22d3e1bf945345791bc764783a8bd19448da63bde95
-AUX 0.0.13-glade3.37-compat.patch 7101 BLAKE2B 5c49a13403f5ee41d2aeb99036925c4d94c9174f55abb3f92a27ea631f641d3678caf250319d9199b68506099bab1617013652fa062535d0fc4ec88655394f7e SHA512 8c758b47afe3c0e79c55561a8e93d1ddc3220073659889eba3b0a245f271ef44f35ad8599bdb30ab524102c41b4b344c0debffc5188bc57fcc7d8fee73b73b94
 DIST libhandy-1.2.2.tar.xz 488508 BLAKE2B 1b764c90710de8a7960308b6441657799e6c3a12de9688f720748ca57653f6592fb4ba9f75841d76ae477af7c1709dc4f303658cc543c8de3f6f64d1de7d03cf SHA512 2135d3e15931fa143698de9200803c90e93c87b82c96b4fff90b75075c218a8ef2f69a26210bda8c10fb7195f115b11b804bb6de0b2f65cd464a7cefe35d0af4
 DIST libhandy-1.2.3.tar.xz 491024 BLAKE2B b15e4b12135230ce6e588e005f55edada001abaa3fbdcf2f05b5e05f364beaa8983239f3a562b8600fc07edd6b6b7e834d42a06ec1ec626d7a43d6634ba93d0e SHA512 20ed6708bb517c81d9b8520c522555d7cdaf36f19dd29603a4f86d6d47ec2552af8874605b1866eb634d25afd0a2c18690cb1be6eafce81cac7857890388799e
-DIST libhandy-v0.0.13.tar.bz2 394811 BLAKE2B 318c226f20b4d8032e984dbd47b4634e828b922dcbc244e4f3f35b94c38f27ed38427196d553809bb1d6bfa7c4830db5d27701e3595cac8a05b58a27ba4a2472 SHA512 a0918c55c9ac14af223a83db542e7dc815d97c844d1f0830a1bee4bdcdf248d00d049fa90fd2be96265535a68d56de5143ddd9264b5e997a902ac9558d5096f3
-EBUILD libhandy-0.0.13.ebuild 1641 BLAKE2B fdbb3a2bc50d3ddbbce1bef684846a33b96d73b59bbbe7bbe8f609cd62fefdb4951c949da4c5e50e641a6d473f7e8bf7ee4c102cb24f6691b2eae3cddb3a8e83 SHA512 0ca4f29996d3749799c7e8c55aec00598a14099ac1aff8eb70d374e80ae1be985339080eba22bf19d498131428d1201a16c210f381255e3491bfdd0d7f4d6ace
 EBUILD libhandy-1.2.2.ebuild 1245 BLAKE2B 54b5828a1d8a93caf902fb91b0398bc315e707e12ac211f4f9541bb3fe008f7d1701f3bfec9d841306df9b93b3998be3b1e82f284e05b8bacaa0526e81221328 SHA512 c0a3d0e87fb45b874271695706d5680e2d8f6f521fb62a3896929deda2d810fa094f8e79c62a9f22d14aeea8f74d1d5b0a1dbafc2fa54861f0476f30ad182e0e
-EBUILD libhandy-1.2.3.ebuild 1250 BLAKE2B 2c5ada7d0266a55cb68169de0a8d21049a10ae962bd6f7c80c3acf79cc650c3772531db2a0f455e486bc762d7845851b196b28b49c34914cc86b0ff5f291d910 SHA512 1a1b98c0a7346d0f8f84d86375f52faba3a39e007e910d681f237f13fbe8d4758c4dd39c8100a47d826ef77aa4288d14803de3735317683b1f4816d9e122a5b9
+EBUILD libhandy-1.2.3.ebuild 1247 BLAKE2B 071fce1a5906628b0a40e326287628c1fa2a9e2c0d9b71e1671601f73833b43054656c3aa4b0af5a68d0224453f30bc9c5cb1801e73ff7996f65dd5c2415eec1 SHA512 d49db8606c70cc79b425b2ef553205901543e4715fedca7b9122ecb86933ba3b2f2393fcddee584962c23d36218efc303c734247907ca13b1bab03dfee39861b
 MISC metadata.xml 353 BLAKE2B 7857afbafa45ea4d3230afa20992cf7196bdd23430ba09bd032b5965b3ce6b7ebadf8122b412549a84d798107adbce3f0b1d6ed79975f315889f7a7700187504 SHA512 f54a7b013a4b5f2e94efda2de95f8063a8755fb2162262a2734ea561fa10cd48be737ddbc3ab7ea93f5d1cf3f59dd91c70da25db5d331828aa74194109c5d36f
diff --git a/gui-libs/libhandy/files/0.0.13-glade3.36-compat1.patch b/gui-libs/libhandy/files/0.0.13-glade3.36-compat1.patch
deleted file mode 100644
index 13321778ff2f..000000000000
--- a/gui-libs/libhandy/files/0.0.13-glade3.36-compat1.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From c5ada7063a68cc05ed1b783a9769557b8e2a83ed Mon Sep 17 00:00:00 2001
-From: Alberto Fanjul <albertofanjul@gmail.com>
-Date: Thu, 7 May 2020 12:43:51 +0200
-Subject: [PATCH 1/2] glade: Adapt to Glade 3.36 API changes
-
-Fixes https://source.puri.sm/Librem5/libhandy/issues/267.
----
- glade/glade-hdy-header-group.c | 2 +-
- glade/glade-hdy-swipe-group.c  | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/glade/glade-hdy-header-group.c b/glade/glade-hdy-header-group.c
-index be6a9de..aa83c6b 100644
---- a/glade/glade-hdy-header-group.c
-+++ b/glade/glade-hdy-header-group.c
-@@ -43,7 +43,7 @@ glade_hdy_header_group_read_widgets (GladeWidget *widget, GladeXmlNode *node)
-         string = widget_name;
-       } else if (widget_name != NULL) {
-         tmp =
--          g_strdup_printf ("%s%s%s", string, GPC_OBJECT_DELIMITER,
-+          g_strdup_printf ("%s%s%s", string, GLADE_PROPERTY_DEF_OBJECT_DELIMITER,
-                            widget_name);
-         string = (g_free (string), tmp);
-         g_free (widget_name);
-diff --git a/glade/glade-hdy-swipe-group.c b/glade/glade-hdy-swipe-group.c
-index 0b42798..ff909b0 100644
---- a/glade/glade-hdy-swipe-group.c
-+++ b/glade/glade-hdy-swipe-group.c
-@@ -45,7 +45,7 @@ glade_hdy_swipe_group_read_widgets (GladeWidget  *widget,
-         string = widget_name;
-       } else if (widget_name != NULL) {
-         tmp =
--          g_strdup_printf ("%s%s%s", string, GPC_OBJECT_DELIMITER,
-+          g_strdup_printf ("%s%s%s", string, GLADE_PROPERTY_DEF_OBJECT_DELIMITER,
-                            widget_name);
-         string = (g_free (string), tmp);
-         g_free (widget_name);
--- 
-2.20.1
-
diff --git a/gui-libs/libhandy/files/0.0.13-glade3.36-compat2.patch b/gui-libs/libhandy/files/0.0.13-glade3.36-compat2.patch
deleted file mode 100644
index a3b2f891499a..000000000000
--- a/gui-libs/libhandy/files/0.0.13-glade3.36-compat2.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 2fb8c6a62b52aa85266f1cf0e8cf6dfa1a7f194f Mon Sep 17 00:00:00 2001
-From: Adrien Plazas <kekun.plazas@laposte.net>
-Date: Mon, 11 May 2020 13:38:36 +0200
-Subject: [PATCH 2/2] glade: Support both 3.24 and 3.36
-
-leio: Backported to 0.0.13
----
- glade/glade-hdy-header-group.c |  9 +++++++++
- glade/glade-hdy-swipe-group.c  | 11 +++++++++++
- 2 files changed, 20 insertions(+)
-
-diff --git a/glade/glade-hdy-header-group.c b/glade/glade-hdy-header-group.c
-index aa83c6b..bd620ad 100644
---- a/glade/glade-hdy-header-group.c
-+++ b/glade/glade-hdy-header-group.c
-@@ -14,6 +14,15 @@
- #include <glib/gi18n-lib.h>
- #include <gladeui/glade.h>
- 
-+/* Guess wether we are using a Glade version older than 3.36.
-+ *
-+ * If yes, redefine some symbols which got renamed.
-+ */
-+#ifndef GLADE_PROPERTY_DEF_OBJECT_DELIMITER
-+#define GLADE_PROPERTY_DEF_OBJECT_DELIMITER GPC_OBJECT_DELIMITER
-+#define glade_widget_action_get_def glade_widget_action_get_class
-+#endif
-+
- #define GLADE_TAG_HEADERGROUP_WIDGETS "headerbars"
- #define GLADE_TAG_HEADERGROUP_WIDGET  "headerbar"
- 
-diff --git a/glade/glade-hdy-swipe-group.c b/glade/glade-hdy-swipe-group.c
-index ff909b0..5b165a2 100644
---- a/glade/glade-hdy-swipe-group.c
-+++ b/glade/glade-hdy-swipe-group.c
-@@ -15,6 +15,17 @@
- #include <glib/gi18n-lib.h>
- #include <gladeui/glade.h>
- 
-+/* Guess wether we are using a Glade version older than 3.36.
-+ *
-+ * If yes, redefine some symbols which got renamed.
-+ */
-+#ifndef GLADE_PROPERTY_DEF_OBJECT_DELIMITER
-+#define GLADE_PROPERTY_DEF_OBJECT_DELIMITER GPC_OBJECT_DELIMITER
-+#define glade_widget_action_get_def glade_widget_action_get_class
-+#endif
-+
-+#define GLADE_TAG_HEADERGROUP_WIDGETS "headerbars"
-+#define GLADE_TAG_HEADERGROUP_WIDGET  "headerbar"
- #define PROP_SWIPEABLES "swipeables"
- #define GLADE_TAG_SWIPEGROUP_SWIPEABLES "swipeables"
- #define GLADE_TAG_SWIPEGROUP_SWIPEABLE "swipeable"
--- 
-2.20.1
-
diff --git a/gui-libs/libhandy/files/0.0.13-glade3.37-compat.patch b/gui-libs/libhandy/files/0.0.13-glade3.37-compat.patch
deleted file mode 100644
index 63568496d637..000000000000
--- a/gui-libs/libhandy/files/0.0.13-glade3.37-compat.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-From dfb9322ae70236edd45fad695dd6c24517f2ceaf Mon Sep 17 00:00:00 2001
-From: James Westman <james@flyingpimonster.net>
-Date: Wed, 23 Sep 2020 13:14:07 -0500
-Subject: [PATCH] glade: Fix macro renamed in GladeUI 3.37
-
-Glade 3.37 renamed the macro GWA_GET_CLASS to
-GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS [1]. This commit switches to use the new
-macro name, and for older versions of Glade, defines the new name as the old
-one for compatibility.
-
-Fixes #335 and obsoletes !607.
-
-[1]: https://gitlab.gnome.org/GNOME/glade/-/commit/bb626dd41d93c92b587b37f03d295356e39a7d04
-
-mattst88: Backported to 0.0.13
----
- glade/glade-hdy-header-group.c | 14 +++++++++++---
- glade/glade-hdy-paginator.c    | 18 +++++++++++++-----
- glade/glade-hdy-swipe-group.c  | 14 +++++++++++---
- 3 files changed, 35 insertions(+), 11 deletions(-)
-
-diff --git a/glade/glade-hdy-header-group.c b/glade/glade-hdy-header-group.c
-index bd620ad..11c3aad 100644
---- a/glade/glade-hdy-header-group.c
-+++ b/glade/glade-hdy-header-group.c
-@@ -14,6 +14,14 @@
- #include <glib/gi18n-lib.h>
- #include <gladeui/glade.h>
- 
-+/*
-+ * Another macro got renamed in GladeUI 3.38. For older versions of GladeUI,
-+ * define the new macro as the old one.
-+ */
-+#ifndef GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS
-+#define GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS GWA_GET_CLASS
-+#endif
-+
- /* Guess wether we are using a Glade version older than 3.36.
-  *
-  * If yes, redefine some symbols which got renamed.
-@@ -83,7 +91,7 @@ glade_hdy_header_group_read_widget (GladeWidgetAdaptor *adaptor,
-     return;
- 
-   /* First chain up and read in all the normal properties.. */
--  GWA_GET_CLASS (G_TYPE_OBJECT)->read_widget (adaptor, widget, node);
-+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->read_widget (adaptor, widget, node);
- 
-   glade_hdy_header_group_read_widgets (widget, node);
- }
-@@ -129,7 +137,7 @@ glade_hdy_header_group_write_widget (GladeWidgetAdaptor *adaptor,
-     return;
- 
-   /* First chain up and read in all the normal properties.. */
--  GWA_GET_CLASS (G_TYPE_OBJECT)->write_widget (adaptor, widget, context, node);
-+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->write_widget (adaptor, widget, context, node);
- 
-   glade_hdy_header_group_write_widgets (widget, context, node);
- }
-@@ -163,7 +171,7 @@ glade_hdy_header_group_set_property (GladeWidgetAdaptor *adaptor,
-                                          GTK_HEADER_BAR (list->data));
-     }
-   } else {
--    GWA_GET_CLASS (G_TYPE_OBJECT)->set_property (adaptor, object,
-+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->set_property (adaptor, object,
-                                                  property_name, value);
-   }
- }
-diff --git a/glade/glade-hdy-paginator.c b/glade/glade-hdy-paginator.c
-index cce9abf..f34acc8 100644
---- a/glade/glade-hdy-paginator.c
-+++ b/glade/glade-hdy-paginator.c
-@@ -16,6 +16,14 @@
- 
- #include <math.h>
- 
-+/*
-+ * Another macro got renamed in GladeUI 3.38. For older versions of GladeUI,
-+ * define the new macro as the old one.
-+ */
-+#ifndef GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS
-+#define GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS GWA_GET_CLASS
-+#endif
-+
- #define CENTER_CONTENT_INSENSITIVE_MSG _("This property does not apply unless Show Indicators is set.")
- 
- static gint
-@@ -231,7 +239,7 @@ glade_hdy_paginator_child_action_activate (GladeWidgetAdaptor *adaptor,
- 
-     glade_command_pop_group ();
-   } else
--    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->child_action_activate (adaptor,
-+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->child_action_activate (adaptor,
-                                                                container,
-                                                                object,
-                                                                action_path);
-@@ -315,7 +323,7 @@ glade_hdy_paginator_set_property (GladeWidgetAdaptor *adaptor,
-     if (!strcmp (id, "indicator-style"))
-       set_indicator_style (object, value);
- 
--    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor, object, id, value);
-+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor, object, id, value);
-   }
- }
- 
-@@ -332,7 +340,7 @@ glade_hdy_paginator_get_property (GladeWidgetAdaptor *adaptor,
-     g_value_reset (value);
-     g_value_set_int (value, hdy_paginator_get_page (HDY_PAGINATOR (object)));
-   } else {
--    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->get_property (adaptor, object, id, value);
-+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->get_property (adaptor, object, id, value);
-   }
- }
- 
-@@ -370,8 +378,8 @@ glade_hdy_paginator_verify_property (GladeWidgetAdaptor *adaptor,
-     return glade_hdy_paginator_verify_n_pages (object, value);
-   else if (!strcmp (id, "page"))
-     return glade_hdy_paginator_verify_page (object, value);
--  else if (GWA_GET_CLASS (GTK_TYPE_CONTAINER)->verify_property)
--    return GWA_GET_CLASS (GTK_TYPE_CONTAINER)->verify_property (adaptor, object,
-+  else if (GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->verify_property)
-+    return GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->verify_property (adaptor, object,
-                                                                 id, value);
- 
-   return TRUE;
-diff --git a/glade/glade-hdy-swipe-group.c b/glade/glade-hdy-swipe-group.c
-index 5b165a2..927dea0 100644
---- a/glade/glade-hdy-swipe-group.c
-+++ b/glade/glade-hdy-swipe-group.c
-@@ -15,6 +15,14 @@
- #include <glib/gi18n-lib.h>
- #include <gladeui/glade.h>
- 
-+/*
-+ * Another macro got renamed in GladeUI 3.38. For older versions of GladeUI,
-+ * define the new macro as the old one.
-+ */
-+#ifndef GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS
-+#define GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS GWA_GET_CLASS
-+#endif
-+
- /* Guess wether we are using a Glade version older than 3.36.
-  *
-  * If yes, redefine some symbols which got renamed.
-@@ -87,7 +95,7 @@ glade_hdy_swipe_group_read_widget (GladeWidgetAdaptor *adaptor,
-     return;
- 
-   /* First chain up and read in all the normal properties.. */
--  GWA_GET_CLASS (G_TYPE_OBJECT)->read_widget (adaptor, widget, node);
-+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->read_widget (adaptor, widget, node);
- 
-   glade_hdy_swipe_group_read_widgets (widget, node);
- }
-@@ -131,7 +139,7 @@ glade_hdy_swipe_group_write_widget (GladeWidgetAdaptor *adaptor,
-     return;
- 
-   /* First chain up and read in all the normal properties.. */
--  GWA_GET_CLASS (G_TYPE_OBJECT)->write_widget (adaptor, widget, context, node);
-+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->write_widget (adaptor, widget, context, node);
- 
-   glade_hdy_swipe_group_write_widgets (widget, context, node);
- }
-@@ -164,7 +172,7 @@ glade_hdy_swipe_group_set_property (GladeWidgetAdaptor *adaptor,
-                                        HDY_SWIPEABLE (list->data));
-     }
-   } else {
--    GWA_GET_CLASS (G_TYPE_OBJECT)->set_property (adaptor, object,
-+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->set_property (adaptor, object,
-                                                  property_name, value);
-   }
- }
--- 
-2.26.3
-
diff --git a/gui-libs/libhandy/libhandy-0.0.13.ebuild b/gui-libs/libhandy/libhandy-0.0.13.ebuild
deleted file mode 100644
index 751616d2f13b..000000000000
--- a/gui-libs/libhandy/libhandy-0.0.13.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson xdg vala virtualx
-
-MY_P="${PN}-v${PV}"
-DESCRIPTION="Library with GTK widgets for mobile phones"
-HOMEPAGE="https://source.puri.sm/Librem5/libhandy/"
-SRC_URI="https://source.puri.sm/Librem5/libhandy/-/archive/v${PV}/${MY_P}.tar.bz2"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="LGPL-2.1+"
-SLOT="0.0/0" # It may or may not break ABI in future versions at this point; if new
-# SLOT happens, it'll likely file conflict on gtk-doc and glade library and catalog
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-IUSE="examples glade gtk-doc +introspection test +vala"
-REQUIRED_USE="vala? ( introspection )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	>=x11-libs/gtk+-3.24.1:3[introspection?]
-	glade? ( dev-util/glade:3.10= )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	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
-		app-text/docbook-xml-dtd:4.3 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-glade3.36-compat{1,2}.patch
-	"${FILESDIR}"/${PV}-glade3.37-compat.patch
-)
-
-src_prepare() {
-	use vala && vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dprofiling=false # -pg passing
-		-Dstatic=false
-		$(meson_feature introspection)
-		$(meson_use vala vapi)
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use test tests)
-		$(meson_use examples)
-		$(meson_feature glade glade_catalog)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
diff --git a/gui-libs/libhandy/libhandy-1.2.3.ebuild b/gui-libs/libhandy/libhandy-1.2.3.ebuild
index 1df7e54eddb4..2e4925e780a0 100644
--- a/gui-libs/libhandy/libhandy-1.2.3.ebuild
+++ b/gui-libs/libhandy/libhandy-1.2.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libhandy/"
 
 LICENSE="LGPL-2.1+"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 IUSE="examples glade gtk-doc +introspection test +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/gui-libs/libwpe/Manifest b/gui-libs/libwpe/Manifest
index 4ddc30acd26f..db2ce0104c24 100644
--- a/gui-libs/libwpe/Manifest
+++ b/gui-libs/libwpe/Manifest
@@ -1,5 +1,5 @@
 DIST libwpe-1.10.0.tar.xz 52004 BLAKE2B 3088cb103b99ab626a74c37910d91fe8abdb07d14d0846bd202716fa1a7d8087e4095e65977e25d9a6f2b97bdfcef664f3872abd8de447ffe3e841a613ebc116 SHA512 b5634dd71cca70eb960f3c045ad109346ab6ce6b01aa8c8bc8f326d232eb16ac1600757896a4b99720af3c77084351ea4f69e2e2c81b9c32cc8bc12a5c66ba3c
 DIST libwpe-1.10.1.tar.xz 51984 BLAKE2B 8afb81e85d134a525a9f7cf0156632ea72a72ab94fcb06c411a11d5304b510cb711a1f2f948cb448bf1ac54c4734cce7a2eaa1ca34c2207c6155d4ab5c350139 SHA512 be1f366ae0d23326ceaab0fe4cdbaea4b50ab822c0e9e7315120fa665113d5eea43f5a23c8e5068f041322d3139cd4de75cfb0f03613cb40586fece1467afbca
 EBUILD libwpe-1.10.0.ebuild 576 BLAKE2B 3e5447e1a681f826dfd81eee38a8dbac24549e6eab817cc8accfc872a2215973fa28e98aaf6a801f35524f51e3079dc916bc3804d0299b5714638eb9c6e10b6a SHA512 29a9e522f8fdc3cd94262d2dd40c68aaee5f92cfbc7c97d9a562ceddf1ab0d60cd7f74c0208036a4d8da19dbd3e7dd8a564d0d949814af18b367cc67eee34671
-EBUILD libwpe-1.10.1.ebuild 581 BLAKE2B 966f3d875539aa4f2cc0d56d489b9700f96bfcc0e98cffa5749e70c270c3882139dcbf775ad8600b290b1c0310880d6fac1fc75876c91624b6a650ee2da48cd2 SHA512 70994d9579c21d34cecb4c44427fe7b12036f79581d37254f31cf7530a399a6ce971c945cb41c54df6a60985078b57e82a3c8868cd1f00482c8869b2a63c8fcd
+EBUILD libwpe-1.10.1.ebuild 577 BLAKE2B 84f3609f2cdf3c3fc3e5debac746dd74f0a08252cd66355ba326ad1c725b940473cc88184f5eaabeccc688d5e95978f59f8122535a0e31be0e0f6436a247efd9 SHA512 bdd557d543018bc6c92af3e9cc30c4f3f15f3095220e342dc0bf3bd990b57213c045443c7a7d02093b849e75385e28507f2a466bd47f89ecef8068ec04737171
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gui-libs/libwpe/libwpe-1.10.1.ebuild b/gui-libs/libwpe/libwpe-1.10.1.ebuild
index 812b9f6d8d15..8bad05aa4bc4 100644
--- a/gui-libs/libwpe/libwpe-1.10.1.ebuild
+++ b/gui-libs/libwpe/libwpe-1.10.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://wpewebkit.org/releases/${P}.tar.xz"
 LICENSE="BSD-2"
 SLOT="1.0"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	media-libs/mesa[egl]
diff --git a/gui-libs/wpebackend-fdo/Manifest b/gui-libs/wpebackend-fdo/Manifest
index d2cee2da7899..3766221df8ee 100644
--- a/gui-libs/wpebackend-fdo/Manifest
+++ b/gui-libs/wpebackend-fdo/Manifest
@@ -1,5 +1,5 @@
 DIST wpebackend-fdo-1.10.0.tar.xz 38484 BLAKE2B 6b2cb4d4b1321245dee13d33ad58ee8d31aa4f5a25cfc2cde2bc2a67db15e9835de59f1b0550b7a205502b2e201398cf8032a0f235ae01f74e4568874cb47620 SHA512 50e65d1560b943ec85b80449c838b61d7ab3baf96844542cce06028bd934b1145319f3fa07a3dc629d2a7896b95ab388edbe853b7e377cf0ff02fb66291e1ce0
 DIST wpebackend-fdo-1.8.4.tar.xz 43276 BLAKE2B 03973e94ea19db6f9a3e8e9855d970d6b2bdc546a5a69e5e80d07aec3c2aa48739653c596138c798f766816fbc4b1df4da0a5ed5bf42969812a87b4670db502e SHA512 a92fea7e16b48c89789ffa35427f716900071d4e65d7f06acc94d28f49688f3ff344623cc4801d4f5b7ebbd740a8349cce064467826c41a7983cc90811805a64
-EBUILD wpebackend-fdo-1.10.0.ebuild 661 BLAKE2B a8c599a2d1d8dc78d1ab43e015750c2e2177afcf167e44b55e5192ef2b5875ec34b2ff20de6243c976ccc649d555ce191ac07368cbc96f5ade51aba5a1157b14 SHA512 a35be892c21c097f7d81df7cc60b733dc922c175dad590512fdea7d78e077dd0a0bb365fdeca5e9ee073a93916fd2431ae0bbe4404786812a56da67237ecb0e2
+EBUILD wpebackend-fdo-1.10.0.ebuild 657 BLAKE2B b436809e8006eec6fd36ecfa7dbaf5d946286daeb48fa053c05440925a9b03eefee907a791573530f616c15bc9766d5879e61b0fed942c3d57bdd036505c6f11 SHA512 92fff51b337bf50a71c6def7709a047fb0a6dcf80848a590c4e5f156d94a5bbda3b4a8e84d8e773fd5a0f857e73c598809669cfa6026b25b79b4edad98b09922
 EBUILD wpebackend-fdo-1.8.4.ebuild 632 BLAKE2B e378d5bc2552808dfc7b86bfdfddf0d4728f0836d7bf8041a4d0891215c187a35db3e398334db7879bcc5e8fe08c9e91c7cdfcd810e7f44cea5acef477b8d003 SHA512 2621f6ae818bb841c755d7cf0cfafde23cc40b87f2fe62b84387f0211081a9eea1dcf20b6a3b0ca780ac2602c1d07f987b6c2afe39cafdaded2ef84b17135d5c
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gui-libs/wpebackend-fdo/wpebackend-fdo-1.10.0.ebuild b/gui-libs/wpebackend-fdo/wpebackend-fdo-1.10.0.ebuild
index 03c027d50901..e15da8d795a4 100644
--- a/gui-libs/wpebackend-fdo/wpebackend-fdo-1.10.0.ebuild
+++ b/gui-libs/wpebackend-fdo/wpebackend-fdo-1.10.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://wpewebkit.org/releases/${P}.tar.xz"
 LICENSE="BSD-2"
 SLOT="1.0"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	media-libs/libepoxy[egl]