gentoo resync : 09.07.2022

30 files changed, 42 insertions, 379 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 0ef6180d07d1..5193899fc92f 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/alacarte/Manifest b/x11-misc/alacarte/Manifest
index a2719d8e467f..1340620794ea 100644
--- a/x11-misc/alacarte/Manifest
+++ b/x11-misc/alacarte/Manifest
@@ -1,5 +1,5 @@
 DIST alacarte-3.44.1.tar.xz 253364 BLAKE2B ebd542430f909291d06c1094aac52f87760547013f012167fa5616609251a6cb48b258122424a119b3ab10e6e2289d9a282dd66da3dcf5590b09d9c686a8934b SHA512 84b1cebdcbb53e2cca5a1425829b00db0b2a11e308584ea96179c2d0451d8c77fa6a995ae4671a024fab72869c7d2e9986dc310bfab38fe8b7b2f54d383501ca
 DIST alacarte-3.44.2.tar.xz 253580 BLAKE2B 206eea28b50ef6d0cf228031ff72c16c6ebd130dfa623b96eb727ef62aad3db0003f3a97bc188f4b8a0e9d18cc184a9230fb332131d37afb0abe71dc3d13ee1e SHA512 b62c15ca37717e988b1d64f0ab565970ae15a4bc11a3f31da8574a0b4f10a9cf8b94d0a85be34d871c106ab34c63b2dfbf535b46eb630829e73c14023b99053e
 EBUILD alacarte-3.44.1.ebuild 767 BLAKE2B d0fcb8a65e335b244e2c523f3c15050d9de601e62622f33cbd50ab6b63834fb9a206fc60620c3c299e7be9062542dd5c52f0adac12aca318de01748d5a2795bf SHA512 a3debc82c2206b86a3a5aab6f0e72da9a1f98d95e4ae59f918662f29570c2c1018876463efb78d359279e3d374cf5bf0f76e5beea96468b9c1ebeafc56617487
-EBUILD alacarte-3.44.2.ebuild 764 BLAKE2B 608c1d4d84a6c76f4e8c4aacdef03559a26412990ac102a3c8b7dba58e632d1d86b84e099f5b578642e738d0e6a1b5e05435b9a06032e7d32c47aa86e4ba06b1 SHA512 02d631947d9f357ab20d03a23e5e620b0f4227a2fc44eb7c360b1f142cbf762dff5cc07876c83206d68b7e893cd592163dcd971a64db9df126844d2fdeb43e06
+EBUILD alacarte-3.44.2.ebuild 762 BLAKE2B 95f7448ddfbf0ae4f635f163fa3fe455145a5cd5949701e587262822bf896342c42c338d8a30a57f0215517734846d12ca04bd6db274556382ad711a7643c1d8 SHA512 b0498d1fd115c416ca222aa222fa33bd969ca244e218478eecbaf87dd049d1742c0fa4519ddab02a0afd5b11af7e78873e6aceaa789537e11d7581f68ecfa37f
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/x11-misc/alacarte/alacarte-3.44.2.ebuild b/x11-misc/alacarte/alacarte-3.44.2.ebuild
index ec98922c90ce..f5d5418af06c 100644
--- a/x11-misc/alacarte/alacarte-3.44.2.ebuild
+++ b/x11-misc/alacarte/alacarte-3.44.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/alacarte"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="
diff --git a/x11-misc/easystroke/Manifest b/x11-misc/easystroke/Manifest
deleted file mode 100644
index a4521320406e..000000000000
--- a/x11-misc/easystroke/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX easystroke-0.6.0-abs.patch 1246 BLAKE2B 3fe3e984d8119198de364d4b65adc6368cf2ba94a5744878bc52c9949488304b2804ac5cf835a1a0cc77d4323778eed91310e3827b9797b4bc4020477e753116 SHA512 80596ce9fa22e880f7e41dd3574513005252fa1f2c74eb53ab7e1d3cbcd973a4bf35cdc76bfd9770a161551209cbb78677b572410a36cdc5c9075a601a809ae0
-AUX easystroke-0.6.0-buttons-scroll-send.patch 1431 BLAKE2B bba629d5d54c3544bb1564474812521587ef05c9ecaedce51dcecacf74e263602095e0e64f1961bb67c5640e3a86eca7369f46c5aabf82a919f4563bf25c7f89 SHA512 f8a862c450c665db4409d9abb07687fac5fac182a8f36038c795eb25a0cf732e0ccc3e589ae6c6eb65bde9a4f4cbd680f267734d2a65b301d1c8e7fa078dfcff
-AUX easystroke-0.6.0-cellrendertextish.patch 718 BLAKE2B 98856aa9e0cb70ffa0fb28f429a714f4caa732c18d4e16143fa2d63bf3f1ab70bf2329bb4eabccd1249e1bd09a435d37e18109bf0edfb0e9e6ced712fbe088a1 SHA512 2feacef4d9b1707dd1e20a2e84b78313744bc9ce9b2a7d0070cab47b691ec2cfd1e1616aaf1c30a722ae5ecb16c230b6a647965da4194f2700262977eedb8b9f
-AUX easystroke-0.6.0-cxx11.patch 529 BLAKE2B c56d9d2c342019bfd7f32835d19f28958d910e956f782e506c0297a339474d95d7ecb7b5fd68b11fcf128a1e0227b08f723d6b426b66b4d8a76d94137fda2d1e SHA512 719254e530e7f3de2e55ad28d4c5a6a5e817de243339813748001222b19c7266a623f3fbddca642859d0cbdef8a7dcecac53961c259ec539b4124035f2b8a101
-AUX easystroke-0.6.0-desktop.patch 294 BLAKE2B 090d292720cb8168896b57011369a42ca9d32e805a19ed21bdca45023f64eedf5e06c2618dfc954a3d40d5f8476555837c64e0c3137b414b95de3925d4fa9504 SHA512 082b353b21fdb7754a3b94519a426f69c67caca32977657bdc09ca158d783612a454b2fc08949cb9cb2ee2d1c3ce07d6f7915e782f50c3829f456e31f6330471
-AUX easystroke-0.6.0-gentoo.patch 1672 BLAKE2B 5ba245c95108e3f8025f371165dac2256c0bcefbdf20024b722fb97c2634840398e38c7d8c171d84f8357c81c2d31aee6b6ffdd7ba7448aa77825a87d4ff68d8 SHA512 e44b7d01506242985ec2b53d4f267425d7877649d4ca734ade93a68b9d52b03af1cf7fc9eab81617d2459cbe27eb88f4f82754416a910fc01e1b0de9b34486a8
-AUX easystroke-0.6.0-reinstate-signal-handlers.patch 1070 BLAKE2B c994676a92954c90f093ba1b466a2c8bdf42846b3df3d7547852fdc4f23edeee95d259c969b70006ac86934b290c5b649afa86e25b96d2445e1fd36bdd5c454a SHA512 9cfe216ecfc2148e22d2a91f25b294bde2f7933e912f2ede86002679763e0a6eb14bb3f1182fd07156d103baa4bef4434e45b27ae3753c31758524c680665572
-DIST easystroke-0.6.0.tar.gz 121358 BLAKE2B 9a4bec134f44620b10e1af9959ac4d82cb0a7ae8ea1e33ebfdafd2bb8367b7f431e48be4386803dc498b30f11a51b448570331d544fe089523ae710ffa8625ce SHA512 a74cbdfd2b56e6b20d895297e80fb63f3d8ac938235ecf7067f984d087004af22a5ea0116ae20b948e238b02a06b14044a7025d65840f0c8d00542332387c921
-EBUILD easystroke-0.6.0-r3.ebuild 1388 BLAKE2B 85cc77197a7c111b736d490795e2d223e8513a357f0b3237587399cb8f00441d8737082113b0edd4b01773aee2f27fa5d549465f8a534efe29a440e012c08f1f SHA512 9662effe600379a25910e3a2c9fc5c720fd5ef7822ae07e7bba42a3d5ee5283319c3c68b9cfc4f97bfc559844fb4a9af45e1f61bb76d7f83d4b72234b412ed4f
-MISC metadata.xml 248 BLAKE2B 6d67606db8c3165f2d3e8999794c3e3a2c5689cdc373f31d1f50ccdd58c5873269ff9321ce4ce7f8aa2db24c5aa99eca8cbccefb63a48b60a4fdce4454b0b9dd SHA512 0534050088fdb70e4e4ef69f028c4a5219153a39455ef4bc9b59737b5744e7fc264550d879ad6dd2c6f0049761eb27eb36e1a9d24292978852aea0005d2812cb
diff --git a/x11-misc/easystroke/easystroke-0.6.0-r3.ebuild b/x11-misc/easystroke/easystroke-0.6.0-r3.ebuild
deleted file mode 100644
index ea582bd59c8c..000000000000
--- a/x11-misc/easystroke/easystroke-0.6.0-r3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="a gesture-recognition application for X11"
-HOMEPAGE="https://sourceforge.net/apps/trac/easystroke/"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-cpp/gtkmm:3.0
-	dev-libs/boost:=
-	dev-libs/dbus-glib
-	dev-libs/glib:2
-	x11-base/xorg-server
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXtst
-"
-DEPEND="
-	${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}"/${P}-cellrendertextish.patch
-	"${FILESDIR}"/${P}-desktop.patch
-	"${FILESDIR}"/${P}-gentoo.patch
-	"${FILESDIR}"/${P}-reinstate-signal-handlers.patch
-	"${FILESDIR}"/${P}-buttons-scroll-send.patch
-	"${FILESDIR}"/${P}-cxx11.patch
-	"${FILESDIR}"/${P}-abs.patch
-)
-
-src_prepare() {
-	default
-
-	tc-export CC CXX PKG_CONFIG
-
-	if ! [[ -z ${LINGUAS} ]]; then
-		strip-linguas -i po/
-
-		local es_lingua lang
-		for es_lingua in $( printf "%s\n" po/*.po ); do
-			lang=${es_lingua/po\/}
-			has ${lang/.po/} ${LINGUAS} || rm ${es_lingua}
-		done
-	fi
-}
-
-src_compile() {
-	append-cxxflags -std=c++11
-	emake \
-		AOFLAGS='' \
-		LDFLAGS="${LDFLAGS}" \
-		PREFIX=/usr
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install
-}
diff --git a/x11-misc/easystroke/files/easystroke-0.6.0-abs.patch b/x11-misc/easystroke/files/easystroke-0.6.0-abs.patch
deleted file mode 100644
index 9b4ab63828db..000000000000
--- a/x11-misc/easystroke/files/easystroke-0.6.0-abs.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/handler.cc
-+++ b/handler.cc
-@@ -533,7 +533,7 @@
- 	virtual Grabber::State grab_mode() { return parent->grab_mode(); }
- };
- 
--static inline float abs(float x) { return x > 0 ? x : -x; }
-+static inline float easystroke_abs(float x) { return x > 0 ? x : -x; }
- 
- class AbstractScrollHandler : public Handler {
- 	bool have_x, have_y;
-@@ -559,7 +559,7 @@
- 			xstate->fake_click(b2);
- 	}
- 	static float curve(float v) {
--		return v * exp(log(abs(v))/3);
-+		return v * exp(log(easystroke_abs(v))/3);
- 	}
- protected:
- 	void move_back() {
-@@ -597,8 +597,8 @@
- 		offset_x += factor * curve(dx/dt)*dt/20.0;
- 		offset_y += factor * curve(dy/dt)*dt/10.0;
- 		int b1 = 0, n1 = 0, b2 = 0, n2 = 0;
--		if (abs(offset_x) > 1.0) {
--			n1 = (int)floor(abs(offset_x));
-+		if (easystroke_abs(offset_x) > 1.0) {
-+			n1 = (int)floor(easystroke_abs(offset_x));
- 			if (offset_x > 0) {
- 				b1 = 7;
- 				offset_x -= n1;
-@@ -607,10 +607,10 @@
- 				offset_x += n1;
- 			}
- 		}
--		if (abs(offset_y) > 1.0) {
--			if (abs(offset_y) < 1.0)
-+		if (easystroke_abs(offset_y) > 1.0) {
-+			if (easystroke_abs(offset_y) < 1.0)
- 				return;
--			n2 = (int)floor(abs(offset_y));
-+			n2 = (int)floor(easystroke_abs(offset_y));
- 			if (offset_y > 0) {
- 				b2 = 5;
- 				offset_y -= n2;
diff --git a/x11-misc/easystroke/files/easystroke-0.6.0-buttons-scroll-send.patch b/x11-misc/easystroke/files/easystroke-0.6.0-buttons-scroll-send.patch
deleted file mode 100644
index 27bfa4cfee66..000000000000
--- a/x11-misc/easystroke/files/easystroke-0.6.0-buttons-scroll-send.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 5388934e722308cd314d65e362ddfaf6e5ab6c94 Mon Sep 17 00:00:00 2001
-From: Thomas Jaeger <ThJaeger@gmail.com>
-Date: Sat, 13 Apr 2013 14:10:35 -0400
-Subject: Make buttons and scroll work properly with 'send'
-
----
- handler.cc | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/handler.cc b/handler.cc
-index f47aae3..c1bd279 100644
---- a/handler.cc
-+++ b/handler.cc
-@@ -545,7 +545,7 @@ class AbstractScrollHandler : public Handler {
- 
- protected:
- 	AbstractScrollHandler() : last_t(0), offset_x(0.0), offset_y(0.0) {
--		if (!prefs.move_back.get() || xstate->current_dev->absolute)
-+		if (!prefs.move_back.get() || (xstate->current_dev && xstate->current_dev->absolute))
- 			return;
- 		Window dummy1, dummy2;
- 		int dummy3, dummy4;
-@@ -563,7 +563,7 @@ protected:
- 	}
- protected:
- 	void move_back() {
--		if (!prefs.move_back.get() || xstate->current_dev->absolute)
-+		if (!prefs.move_back.get() || (xstate->current_dev && xstate->current_dev->absolute))
- 			return;
- 		XTestFakeMotionEvent(dpy, DefaultScreen(dpy), orig_x, orig_y, 0);
- 	}
-@@ -1115,6 +1115,8 @@ XState::XState() : current_dev(NULL), in_proximity(false), accepted(true) {
- 
- void XState::run_action(RAction act) {
- 	RModifiers mods = act->prepare();
-+	IF_BUTTON(act, b)
-+		return handler->replace_child(new ButtonHandler(mods, b));
- 	if (IS_IGNORE(act))
- 		return handler->replace_child(new IgnoreHandler(mods));
- 	if (IS_SCROLL(act))
--- 
-1.8.4
-
diff --git a/x11-misc/easystroke/files/easystroke-0.6.0-cellrendertextish.patch b/x11-misc/easystroke/files/easystroke-0.6.0-cellrendertextish.patch
deleted file mode 100644
index 8664ed736bae..000000000000
--- a/x11-misc/easystroke/files/easystroke-0.6.0-cellrendertextish.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/cellrenderertextish.c
-+++ b/cellrenderertextish.c
-@@ -599,7 +599,7 @@
- 	_g_free0 (self->priv->path);
- 	self->priv->path = _tmp3_;
- 	g_signal_connect_object ((GtkCellEditable*) self, "editing-done", (GCallback) _cell_editable_accel_on_editing_done_gtk_cell_editable_editing_done, self, 0);
--	_tmp4_ = _ ("Key combination...");
-+	_tmp4_ = ("Key combination...");
- 	_tmp5_ = (GtkLabel*) gtk_label_new (_tmp4_);
- 	g_object_ref_sink (_tmp5_);
- 	label = _tmp5_;
-@@ -907,7 +907,7 @@
- 				const gchar* _tmp10_;
- 				const gchar* _tmp11_ = NULL;
- 				_tmp10_ = item;
--				_tmp11_ = _ (_tmp10_);
-+				_tmp11_ = (_tmp10_);
- 				gtk_combo_box_text_append_text ((GtkComboBoxText*) self, _tmp11_);
- 				_g_free0 (item);
- 			}
diff --git a/x11-misc/easystroke/files/easystroke-0.6.0-cxx11.patch b/x11-misc/easystroke/files/easystroke-0.6.0-cxx11.patch
deleted file mode 100644
index 8619e8e9fbdc..000000000000
--- a/x11-misc/easystroke/files/easystroke-0.6.0-cxx11.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/actions.cc
-+++ b/actions.cc
-@@ -51,10 +51,11 @@
- 	context->set_icon(pb, pb->get_width(), pb->get_height());
- }
- 
--bool negate(bool b) { return !b; }
--
- TreeViewMulti::TreeViewMulti() : Gtk::TreeView(), pending(false) {
--	get_selection()->set_select_function(sigc::group(&negate, sigc::ref(pending)));
-+	get_selection()->set_select_function(
-+		[this](Glib::RefPtr<Gtk::TreeModel> const&, Gtk::TreeModel::Path const&, bool) {
-+			return !pending;
-+		});
- }
- 
- enum Type { COMMAND, KEY, TEXT, SCROLL, IGNORE, BUTTON, MISC };
diff --git a/x11-misc/easystroke/files/easystroke-0.6.0-desktop.patch b/x11-misc/easystroke/files/easystroke-0.6.0-desktop.patch
deleted file mode 100644
index c9a75a2c4b78..000000000000
--- a/x11-misc/easystroke/files/easystroke-0.6.0-desktop.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/easystroke.desktop.in
-+++ b/easystroke.desktop.in
-@@ -6,7 +6,7 @@
- Exec=easystroke
- Icon=easystroke
- Categories=GTK;Utility;Accessibility;
--Actions=About;Enable;Disable;Quit
-+Actions=About;Enable;Disable;Quit;
- _Comment=Control your desktop using mouse gestures
- 
- [Desktop Action About]
diff --git a/x11-misc/easystroke/files/easystroke-0.6.0-gentoo.patch b/x11-misc/easystroke/files/easystroke-0.6.0-gentoo.patch
deleted file mode 100644
index ee95b21486c1..000000000000
--- a/x11-misc/easystroke/files/easystroke-0.6.0-gentoo.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -19,14 +19,14 @@
- MENUDIR  = $(PREFIX)/share/applications
- LOCALEDIR= $(PREFIX)/share/locale
- DFLAGS   =
--OFLAGS   = -O2
--AOFLAGS  = -O3
-+#OFLAGS   = -O2
-+#AOFLAGS  = -O3
- STROKEFLAGS  = -Wall -std=c99 $(DFLAGS)
--CXXFLAGS = -Wall $(DFLAGS) -DLOCALEDIR=\"$(LOCALEDIR)\" `pkg-config gtkmm-3.0 dbus-glib-1 --cflags`
--CFLAGS   = -Wall $(DFLAGS) -DLOCALEDIR=\"$(LOCALEDIR)\" `pkg-config gtk+-3.0 --cflags` -DGETTEXT_PACKAGE='"easystroke"'
--LDFLAGS  = $(DFLAGS)
-+CXXFLAGS += -Wall $(DFLAGS) -DLOCALEDIR=\"$(LOCALEDIR)\" $(shell $(PKG_CONFIG) gtkmm-3.0 dbus-glib-1 --cflags)
-+CFLAGS   += -Wall $(DFLAGS) -DLOCALEDIR=\"$(LOCALEDIR)\" $(shell $(PKG_CONFIG) gtk+-3.0 --cflags) -DGETTEXT_PACKAGE='"easystroke"'
-+#LDFLAGS  = $(DFLAGS)
- 
--LIBS     = $(DFLAGS) -lboost_serialization -lX11 -lXext -lXi -lXfixes -lXtst `pkg-config gtkmm-3.0 dbus-glib-1 --libs`
-+LIBS     = $(DFLAGS) -lboost_serialization -lX11 -lXext -lXi -lXfixes -lXtst $(shell $(PKG_CONFIG) gtkmm-3.0 dbus-glib-1 --libs)
- 
- BINARY   = easystroke
- ICON     = easystroke.svg
-@@ -60,7 +60,7 @@
- include $(DEPFILES)
- 
- $(BINARY): $(OFILES)
--	$(CXX) $(LDFLAGS) -o $@ $(OFILES) $(LIBS)
-+	$(CXX) $(CFLAGS) $(LDFLAGS) -o $@ $(OFILES) $(LIBS)
- 
- stroke.o: stroke.c
- 	$(CC) $(STROKEFLAGS) $(AOFLAGS) -MT $@ -MMD -MP -MF $*.Po -o $@ -c $<
-@@ -119,7 +119,7 @@
- 	help2man -N -n "X11 gesture recognition application" ./$(BINARY) > $@
- 
- install: all
--	install -Ds $(BINARY) $(DESTDIR)$(BINDIR)/$(BINARY)
-+	install -D $(BINARY) $(DESTDIR)$(BINDIR)/$(BINARY)
- 	install -D -m 644 $(ICON) $(DESTDIR)$(ICONDIR)/$(ICON)
- 	install -D -m 644 $(MENU) $(DESTDIR)$(MENUDIR)/$(MENU)
- 	for f in $(MOFILES); do \
diff --git a/x11-misc/easystroke/files/easystroke-0.6.0-reinstate-signal-handlers.patch b/x11-misc/easystroke/files/easystroke-0.6.0-reinstate-signal-handlers.patch
deleted file mode 100644
index 2e96346459a8..000000000000
--- a/x11-misc/easystroke/files/easystroke-0.6.0-reinstate-signal-handlers.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 7bda4bd9c705413598ee9b534884bc7f23704932 Mon Sep 17 00:00:00 2001
-From: Thomas Jaeger <ThJaeger@gmail.com>
-Date: Thu, 20 Jun 2013 01:45:20 -0400
-Subject: Reinstate signal handlers that got lost in the gtk3 transition
-
-Also, fix a segfault when handling SIGINT.
----
- main.cc | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/main.cc b/main.cc
-index 55d0b3c..8cd9c56 100644
---- a/main.cc
-+++ b/main.cc
-@@ -161,7 +161,12 @@ void quit() {
- 		xstate->bail_out();
- 	dead = true;
- 	win->hide();
--	xstate->queue(sigc::ptr_fun(&Gtk::Main::quit));
-+	Glib::RefPtr<Gio::Application> app = Gio::Application::get_default();
-+	xstate->queue(sigc::mem_fun(*app.operator->(), &Gio::Application::quit));
-+}
-+
-+void sig_int(int) {
-+	quit();
- }
- 
- class App : public Gtk::Application, Base {
-@@ -371,6 +376,10 @@ void App::on_activate() {
- 
- 	create_config_dir();
- 	unsetenv("DESKTOP_AUTOSTART_ID");
-+
-+	signal(SIGINT, &sig_int);
-+	signal(SIGCHLD, SIG_IGN);
-+
- 	dpy = XOpenDisplay(NULL);
- 	if (!dpy) {
- 		printf(_("Couldn't open display.\n"));
--- 
-1.8.4
-
diff --git a/x11-misc/easystroke/metadata.xml b/x11-misc/easystroke/metadata.xml
deleted file mode 100644
index 4119740a57f8..000000000000
--- a/x11-misc/easystroke/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">easystroke</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/x11-misc/i3lock/Manifest b/x11-misc/i3lock/Manifest
index 5e21ce737381..21b2f36daae7 100644
--- a/x11-misc/i3lock/Manifest
+++ b/x11-misc/i3lock/Manifest
@@ -1,7 +1,5 @@
-DIST i3lock-2.13.tar.bz2 149332 BLAKE2B 4b285fb3a27463f0d538d291134942a19933394c4c2d0acf27dfe5624a854cef0f29c5fc2e4ce4398c85ac0e6b774521c7daa65abedc0d38b0fd4897b2e6db88 SHA512 3a9bed3d14a2d59e641b3603448bb46d769104995b1c0239eca87d582e80e64dd8905b8e455bd5b0e635d4b37d7a87208d8de37253e9af799c65f4f8d396789d
 DIST i3lock-2.14.1.tar.xz 28756 BLAKE2B b38a3fafeebb5f8cebb643baeb875922659b556a5f919c2a837923e45e8f91a5f3ce297a424414ec9f05255e5888b91723617d837e5ffdbdf81aded42edc34cb SHA512 63b6bd73f66654fe52639434f7d3da64006144ec2ed685ba8683186730d4cc2c10d5aa66174f965030030243f59afaf6def3ff732f710ae441410218f84d6deb
 DIST i3lock-2.14.tar.xz 28648 BLAKE2B ef315c4d1175a692b8ea2ac1a6a9cefdaa642fc28cfcc28cbf0c637f9d0cf0ea47738447cf0d90c3c2f869819c178a416aabc44dbfe93ab938e48da2a0143d0a SHA512 85f755333739e61a8ac90447410c48cf54345740bb6c6977efa88500e2b66dfd7fe3338e4fe38f817773219e5994ef6375010fdb3cf711e2ad42045874e39e20
-EBUILD i3lock-2.13.ebuild 700 BLAKE2B 084d7874c12f5e311f7c02089aa59ce8126385a96c6afb77969f3bae51c99881d638cac22656bb1b6b12c6cf6fdd04a697da547471d7656f1a198de732024b2f SHA512 2efbdcf1fa1fbe01d78d18b2c55ef1afe4ba8f87393905837bbf45837036d7747b1630dd6a827fbba3a641c72fb09ca4574ca491b7d92b0a93f9f945d9af7bee
 EBUILD i3lock-2.14.1.ebuild 604 BLAKE2B 96124d476d035d0b81f73415d633e686a9d8101a5d7c11e8b29b18a212b3bb90aed079f6eb3f825c4b4d5b842b1771d5aa8ec0aaad188d935dc00f20ee38dfba SHA512 5909dcb00321b3ec34a6051cca6a1a933bd55122aaa6cd1f50b9e04334ae97ff5a1b91441b6195774939245461a51fd89042d56f144e7aaf4f54519897d5964d
-EBUILD i3lock-2.14.ebuild 602 BLAKE2B 28aca33b836be07f9178389adf70478cc1a696488e146e7fcd22312d7c12d07e5ad1bdc9cebb21e49bb769a87e4de5b484ef704de93fab1fb4f7d93f0e66fcf0 SHA512 03d5d8c8fb82bf4c56f277f63e8524eb8ca84c5986f4287aac14d2b11601d5dbbb43a82bd8f735f1be4a49b4184052b3f98aa7d0c7035313d0adf47c5e15f8eb
+EBUILD i3lock-2.14.ebuild 600 BLAKE2B dac5a363343263b3bb7644f858dd028fb36efa253e20444f3a7798151720e41b23cdb9501a64038ab0ded9e34596554fe10d429725af30b5ea5dd56fb9763edb SHA512 49b0847087e31dd8d74ea11d90729faba008c89e273f5d22273b95e608480e5d5a3cac096daf700929f67ba3c13bd25c0110873525cad4f75aec0e651539ed20
 MISC metadata.xml 428 BLAKE2B f85198563990c2c04b6dc2f8144e52641757c14808ad0c17fc622d3a0d5788bd0f4faf15aec0439eb74b549e369664b50074c9d6611f4f425b2050d1dad16281 SHA512 e96eb498c24e7a52823e03e688b5c9f2796618edb5a8f4e4cbd1883ab804ec6a3eca98d0adb62d466f56206e6342652acf26a0fe43c1ee3a227632c2592001fc
diff --git a/x11-misc/i3lock/i3lock-2.13.ebuild b/x11-misc/i3lock/i3lock-2.13.ebuild
deleted file mode 100644
index 21a4ca54e6bf..000000000000
--- a/x11-misc/i3lock/i3lock-2.13.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Simple screen locker"
-HOMEPAGE="https://i3wm.org/i3lock/"
-SRC_URI="https://i3wm.org/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	dev-libs/libev
-	sys-libs/pam
-	x11-libs/cairo[X,xcb(+)]
-	x11-libs/libxcb[xkb]
-	x11-libs/libxkbcommon[X]
-	x11-libs/xcb-util
-	x11-libs/xcb-util-xrm"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	sed -i -e 's:login:system-auth:g' pam/${PN} || die
-}
-
-src_configure() {
-	tc-export CC
-	default
-}
-
-src_install() {
-	default
-	doman ${PN}.1
-}
diff --git a/x11-misc/i3lock/i3lock-2.14.ebuild b/x11-misc/i3lock/i3lock-2.14.ebuild
index 29d754d62271..4bd709873c4b 100644
--- a/x11-misc/i3lock/i3lock-2.14.ebuild
+++ b/x11-misc/i3lock/i3lock-2.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://i3wm.org/${PN}/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="dev-libs/libev
 	sys-libs/pam
diff --git a/x11-misc/i3status/Manifest b/x11-misc/i3status/Manifest
index 9d16d4e4ab73..8278cce254ea 100644
--- a/x11-misc/i3status/Manifest
+++ b/x11-misc/i3status/Manifest
@@ -8,5 +8,5 @@ AUX 0007-make-pulseaudio-an-optional-dependency-follow-best-p.patch 3810 BLAKE2B
 DIST i3status-2.13.tar.bz2 201409 BLAKE2B e087d69e2df3ae9348cb55739023b2164dfa3543551d173b138c72e574714069d8397716b95e92c4315aa538ea31b33aa73532d6d0f75bbc38d7db54e1f665bc SHA512 6dadff19e53499d169ba4f491e1f821014b4f92fc3c93d7947c85cbbbdeaba538d02bd8ab98fe266a8f80756a287fd5803ec77a8cd874d50082b5cad309875c2
 DIST i3status-2.14.tar.xz 68900 BLAKE2B e85019c2a95d50b6bd4adc6bc9dafb85c3a3d8cdaa93602a9c2af54e6818a4e58ad26f47e2c85b38744c12c08f52c4b5c1216e6f3215f8ee2f4152b42a547905 SHA512 10a1235cc314f5fc4dde4e1369a30f49118c95271f636c5803caa52d94d99ad8565b89fcd602d0c8aa7c830a79d3a3bb08e5ac8123cf07cfddc8ef0126b10f80
 EBUILD i3status-2.13-r1.ebuild 1596 BLAKE2B bade9901de5d86d0b7de2b7d21a0efa2d945ab9078241b4ca77c982e0e8fb20ffb7ce4799d6b19ff19976d0f62be2a66cd98f433c47411a1b03a6a23c7022fd5 SHA512 58b619644902a062e932ae581fe7e77c72c29cab510c3c48453032d215df611d7bd1f65d90439b2f960df2d913bba751bc52461ed82855ed0ec7a01e7d23f78f
-EBUILD i3status-2.14.ebuild 968 BLAKE2B 8c25e41fe3d9b2da1d6b2c3571511ee5f308cbaa77efa6bc78c50f6304bdb58d8dc6dd383815b643eb6290ad9617430064dfe15b0d7de95e0ea5e7490be5dd69 SHA512 f8afccd6291c716f1f478f2dae4c215c95d169fc879cb32b29c7f85d1e75607df3f62531d64f8f149ca24ec1e7fe650be6a3765a13251a8a8c629eeffc386d50
+EBUILD i3status-2.14.ebuild 975 BLAKE2B b51857a8b3dd910e8aad7da3e901d14d87f432f1f9ffe719ec16957e2b0f9cec4ab3001de498491a0a7f2889229aaa72afb03a751ad0484f787794b10821de54 SHA512 1f268f93734728109e7e0e120f61faece1d8a1eb9ae920bb0e1c3f5dd572d55341c02f00d5b186a3447af48c3bd767de0487b5c6bd18ac46698c7d72ffd396a4
 MISC metadata.xml 895 BLAKE2B 91e71a660f32f4f2311691cc3064471ae284b297e5cf5e031ffa0702027e380f5da3fe1e7e887550b8e68d299c7e65918be00683d2e2cf858d8a4e450ff10f12 SHA512 6e47f5d36d68b281e5b6f149e90ffec7b689984c5ec038cd3bcafbaf44e75d8cf2adcea02c74dc25dab9f92fdeedbe0609ce3dab57356202e9cc0b0762335909
diff --git a/x11-misc/i3status/i3status-2.14.ebuild b/x11-misc/i3status/i3status-2.14.ebuild
index 7c79b758c1c8..9a1390b6ee6a 100644
--- a/x11-misc/i3status/i3status-2.14.ebuild
+++ b/x11-misc/i3status/i3status-2.14.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://i3wm.org/${PN}/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 IUSE="pulseaudio"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/x11-misc/lightdm-gtk-greeter/Manifest b/x11-misc/lightdm-gtk-greeter/Manifest
index 5d46fba36a41..388aac1dbe3d 100644
--- a/x11-misc/lightdm-gtk-greeter/Manifest
+++ b/x11-misc/lightdm-gtk-greeter/Manifest
@@ -2,5 +2,5 @@ DIST lightdm-gentoo-patch-2.tar.gz 695543 BLAKE2B 62e21dd413b90053160f774663d89c
 DIST lightdm-gtk-greeter-2.0.7.tar.gz 580726 BLAKE2B 1cb2a92a9bda0e28b718cf033ad01e8a8a955600715c61bc5f27723a1b5f4a4624caa61bbe9bdca13064919116f5f08959db2622a5d6b097998d762ffd9cfc28 SHA512 62ad8d522db9aeea7bd0acc76c989a1d39e8be619847b294048530b2dfbebf5a5982f84daf1a5f49b0a8a7abe3234e1571fb5d4f5429b02867801015f30e4944
 DIST lightdm-gtk-greeter-2.0.8.tar.gz 583426 BLAKE2B ae06ebbc07efe5c0131c07b293671f24683699eb84f12222de8165428e935b98bbf9d1e107eaeca8f10e725a6a11c97d4f4c3d415ada0b0876b0b0a99f21d1ee SHA512 59cad69fd7f17b6a416944804be80f306ed51ee0c55826975c8564f432e8098043b677f6452e9afa290c6ef37ebdc632cd8b79e7a0a712a3407ddbf9f200b0db
 EBUILD lightdm-gtk-greeter-2.0.7-r1.ebuild 2078 BLAKE2B 5e4252ccc3d0fb4102a0f8741a051845cb9953b15004feeee6d62e22a6a385e3ee996da2ce4825e68312fa0bcb58be704e257643601bf9350e00d5d19b7689ef SHA512 8cb1c44379697de9f7328abb26ed83e18b3591dbc52eecd4f74ded1569f4daf44320d9d40dbe0cad547c4e9cccfdf5eecd9cbd7d79292172d02cb70426c989f6
-EBUILD lightdm-gtk-greeter-2.0.8.ebuild 2041 BLAKE2B 4b84db8a1c6edb6f1817b538b6ab847ecd3707281342c18fca289c64da86ba6cc05f71b3a80603d869aa330ac27d99cd48c4d70efd5f931fde259fa6f29bbacf SHA512 69f09610fcdc05feea59a2aa7a3e077c152943562d23cdccef991c60c1ba6f8df69298c2846ad6ba90f13b7b30ed9561bbda28fc1789aff74613e28d374fbaeb
-MISC metadata.xml 255 BLAKE2B 91a1a039093410e3c236d602235372a2b32c591de8141640c0abc2082e6da3a9a39c514d7847ce17e181eae16a391d19b96e02c3941452a656ca4db893cdd98a SHA512 1ddf701539414534140fbffa9ab1aeaacfd466357ab70d1db32218264a5c59c9a0f372f5c175fb3f739c9fe1704f6ebf6da748c68f45d53278ddf2b664b79e30
+EBUILD lightdm-gtk-greeter-2.0.8.ebuild 2048 BLAKE2B 13e60f52341c5a93e89f312447c06c4f20f8f6ee679f3ef9a067a045f6bba131d5086b127ab102da20d7ac2f429f0704a6ae7a292b87eeebd4d9d5d28bdadafd SHA512 7f1bf951e95ffb7a8bacfee63534e6168ac568e0bd282d5726317ce19dea24f652b404afed4baa78043ed21e0c63f4c4c656ab72e3fb7c5ef4c1a3433a3eb302
+MISC metadata.xml 333 BLAKE2B 33ddd83b04fd831e09d2f61402a6ffbbf786d80fda0a6bd832c8971fcc953b8d017aa90a004b39b4cb9b461ee4c903d59caf341697beda4853d1853423d8b186 SHA512 7bcd8ec29cdf8f07b5d7ce705512287719e7946ba4aa9ba1ab507f39ace4139d42ddd2176f1ebfc289b0d8b218720cfb4728ff71eea36e632c551ebc543aee32
diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.8.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.8.ebuild
index 94fea8aedbde..91860c1597e0 100644
--- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.8.ebuild
+++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Xubuntu/${PN}/releases/download/${P}/${P}.tar.gz
 LICENSE="GPL-3 LGPL-3
 	branding? ( CC-BY-3.0 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 ~riscv x86"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
 IUSE="appindicator branding"
 
 DEPEND="appindicator? ( dev-libs/libindicator:3 )
diff --git a/x11-misc/lightdm-gtk-greeter/metadata.xml b/x11-misc/lightdm-gtk-greeter/metadata.xml
index 9893b601af6f..f465836dc081 100644
--- a/x11-misc/lightdm-gtk-greeter/metadata.xml
+++ b/x11-misc/lightdm-gtk-greeter/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">lightdm-gtk-greeter</remote-id>
 	</upstream>
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index 24a79aea5a6f..42aa9c34b859 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -4,5 +4,5 @@ AUX lightdm-autologin 157 BLAKE2B 54ce42f09f88c793e90f5f21743e17a0184227b83c1119
 AUX lightdm.service 279 BLAKE2B 92a9602d1d1c10fedfabd58b0794a68a278939d905f4d790ea9c2a0632abe8238a6187b3e01b4296a1187349864b30291853889ceaa519f5a12a98b2aecbb1ea SHA512 5b60788e35ebd7918b21ab52dc3f5cc29dd3aa45ddf6cfe75a72d1c541620f0438378a9bd681e2c151a465cf981e803b399f61b48ff5d0f2e1a3cc950c30d23a
 DIST introspection-20110205.m4.tar.bz2 1220 BLAKE2B 01483c1a7b73568e01cc4d84b43c4cd946aaaac0b5fa13aa27805fa17297112bfaabb1c5a34bd83d2ecdef2033b622dbd5e63914baacb8f6edf488a7396d26d9 SHA512 5c49239935b93d86cce68b577b43d1a56d8749ab5747029bfcfa67339697134be24ef29ba6c3d133b8c03e867864637c8eb61491a4b7f6bb1e56386ed66cb9be
 DIST lightdm-1.30.0.tar.xz 509220 BLAKE2B 5b6fcc6b955d7a7eb3a810a7e28707a812810d7f2568d6985a4411b1bf6f06b35ff721bd8a9388a85a4e4a64a39f5e30e86a9dbaa6d344e898ae49e9f39785ff SHA512 bca25a0aa73caf7d51e5882889a1707d2527470a170658c1be98ecfb96c8f85fd616494fc5bed658e744f91b9f8b0a98d2a0cf42f9c030242ae470c8a27145ce
-EBUILD lightdm-1.30.0-r3.ebuild 4025 BLAKE2B b89c9ee87e4341ec91b392ad69cbec6be7ff561717952eacd5df3d0b1616bf1f711a81a7be2a53d2aa7db2595e05b67224b50acd67f2da39a072e795589a5775 SHA512 79385ec2c8c8052e728b2d2bd719e616202f4825765895baf8d8f6665fd72d538b54a3813e20c4fb558dc5596bfdd53631ec205248eef6038635289673900002
-MISC metadata.xml 379 BLAKE2B 5315c5fb7759be3ff41cc5cc6e285234e541cd4d419dc9feb46645e6571738f1e832237caeb7cea8eee91bcfd4e96e48bede1811855a82bfc37bd4ba21d0c17f SHA512 f91ef372c03842650704f7911bae2d7de9e322468ade243950b1195eb559d4ebfe71d5d14e3032f19a167505c3ef5cf96a765faa4a06f3c1d00bd7a65f3c7272
+EBUILD lightdm-1.30.0-r3.ebuild 4032 BLAKE2B ed5d0eb3806fd77814ba2fea76455a8d2bf0cea76532b76ab02245623d7614f2bdf9849b8747f3f961a2f3ead512f80b091e2d5875b2754c62a4cbc61678dee7 SHA512 c3dbbd3af45fb8e5f496c1635885f2e6e761760924be7950d55f4d0421fa3c0927b3d49867b78896fe859a8ab646eada1c2bd75558a3d6cdf9a4bd5e5615bbb1
+MISC metadata.xml 457 BLAKE2B b632c55116a26b388270c8502f9578ae64110f6cadcf700d2f375648684c67fb1ac99d0546d3b0719ed618a7405c66984f0e6cc758e74af7137c7f53dcd29505 SHA512 468ddb4569e5a8d8d828b76b458afcba047eab2eed47734a91cd783cd6d18274b84ba4b8dfcf301afda477ec67edd889b5b708f2de39e6ae08c47cd56ca7312b
diff --git a/x11-misc/lightdm/lightdm-1.30.0-r3.ebuild b/x11-misc/lightdm/lightdm-1.30.0-r3.ebuild
index 5f13b6bcc1a0..2c0883c92e03 100644
--- a/x11-misc/lightdm/lightdm-1.30.0-r3.ebuild
+++ b/x11-misc/lightdm/lightdm-1.30.0-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/CanonicalLtd/lightdm/releases/download/${PV}/${P}.ta
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 ~riscv x86"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
 IUSE="audit +gnome +gtk +introspection non-root qt5 vala"
 
 COMMON_DEPEND="
diff --git a/x11-misc/lightdm/metadata.xml b/x11-misc/lightdm/metadata.xml
index 642cb44f22b2..ac417af345ab 100644
--- a/x11-misc/lightdm/metadata.xml
+++ b/x11-misc/lightdm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
 	<use>
 		<flag name="gtk">Pull in the gtk+ greeter</flag>
 		<flag name="non-root">Use non-root user by default</flag>
diff --git a/x11-misc/polybar/Manifest b/x11-misc/polybar/Manifest
index b886953aa009..b47c4a2eb849 100644
--- a/x11-misc/polybar/Manifest
+++ b/x11-misc/polybar/Manifest
@@ -7,5 +7,5 @@ DIST xpp-044e69d05db7f89339bda1ccd1efe0263b01c8f6.tar.gz 84121 BLAKE2B dea238477
 EBUILD polybar-3.5.7.ebuild 1905 BLAKE2B 9239ffab8b1f236a31ecd6e9c9413e587dc573a6b2878a16e0c1b676d6964f01a6cdc3581c7e037e07a842fe4ddaca663632e9ca782b38d86bf071e036f91488 SHA512 ac44318bc96f3dafc012902c31143b5ed83e108733ed9a6b5174fb3283314240498346d5131d491f9917c3cd9ec3eb715bb71c0219a69d03cb2199bb260e0b66
 EBUILD polybar-3.6.1.ebuild 1474 BLAKE2B d12e5b734b6e7c633e6e66ebb8a3e81acaf16b14ad3f6dc67ead029c988618054ee6c150a9caa9031240c977efa5622f162f140ab7becc51d6380f9dc5b84d5a SHA512 78400d1e71373181921b5180c35c9a153f988e5c5c489e83f37296b60450c4b87fa3404db6642abf51493a96423573b22dbc9beed522ebf23562005877f7f925
 EBUILD polybar-3.6.2.ebuild 1474 BLAKE2B d12e5b734b6e7c633e6e66ebb8a3e81acaf16b14ad3f6dc67ead029c988618054ee6c150a9caa9031240c977efa5622f162f140ab7becc51d6380f9dc5b84d5a SHA512 78400d1e71373181921b5180c35c9a153f988e5c5c489e83f37296b60450c4b87fa3404db6642abf51493a96423573b22dbc9beed522ebf23562005877f7f925
-EBUILD polybar-3.6.3.ebuild 1474 BLAKE2B d12e5b734b6e7c633e6e66ebb8a3e81acaf16b14ad3f6dc67ead029c988618054ee6c150a9caa9031240c977efa5622f162f140ab7becc51d6380f9dc5b84d5a SHA512 78400d1e71373181921b5180c35c9a153f988e5c5c489e83f37296b60450c4b87fa3404db6642abf51493a96423573b22dbc9beed522ebf23562005877f7f925
+EBUILD polybar-3.6.3.ebuild 1472 BLAKE2B 9c993dbd1171d6d96a4f0f69c1f217cbb88d53236f2be20cf02dd29ed6dbf1b30a7410c85ff1c9d37e5f70c14d347f7a0bd150fcaf993f546e90b0110073641c SHA512 f04c533c3349593dbf6eb17251c94bad8dd0d74415436c5cd9ad725c90be455c07391e4019096521573740016ccbbf8149c067cb04778d80a569bff10e331ac8
 MISC metadata.xml 585 BLAKE2B c792f265587effc07acc20f097adc1a1975d23ddf55ceb07b4bda02e61e1b48b1d20c5a07792ac18fa5f02949e0a88bc18fe6df2fffd9454406cda34ac33654b SHA512 c3f9080f68d989dbfd75492ec0c4870e4df9b0525a69256ac95bf55eea60022ac018cc1afe42677bc8f822beec75d137e1e7c8a876763c72664541a0a54b28f1
diff --git a/x11-misc/polybar/polybar-3.6.3.ebuild b/x11-misc/polybar/polybar-3.6.3.ebuild
index 22e5d89b9188..770a50edd7b5 100644
--- a/x11-misc/polybar/polybar-3.6.3.ebuild
+++ b/x11-misc/polybar/polybar-3.6.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A fast and easy-to-use tool for creating status bars"
 HOMEPAGE="https://github.com/polybar/polybar"
 SRC_URI="https://github.com/polybar/${PN}/releases/download/${PV}/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 LICENSE="MIT"
 SLOT="0"
 IUSE="alsa curl doc i3wm ipc mpd network pulseaudio"
diff --git a/x11-misc/sxhkd/Manifest b/x11-misc/sxhkd/Manifest
index f2056e9ce6b7..ff01ef0b23fb 100644
--- a/x11-misc/sxhkd/Manifest
+++ b/x11-misc/sxhkd/Manifest
@@ -1,3 +1,3 @@
 DIST sxhkd-0.6.2.tar.gz 35711 BLAKE2B a1dc409314dda68aa3df99bf584d20e492c7220dceb188b844a6bd9374a4c52b7e1a406b96fc77276498db86dd5e5114a50357ddee660f5f08d6fe974de8f990 SHA512 3f758aec3de76c6336a9008e997317ed7a05db0fcd81025d8f856694c2b8162022e25d9a48876de99056748a2dbe6a561a0e1594973c854ac2c98d44af6b03aa
-EBUILD sxhkd-0.6.2.ebuild 667 BLAKE2B 7f066bf4563c1bedb2ca00c383cc4f9fc85ade14c1241ca6ecc07eb947d2273aae67ec8c08dcd8d085afa6fa69900c2299cf0b104a4e9be0e4b4e1b01b6aa2ee SHA512 32c4aaa0cf8020a71edeadda136db6a124c91ddb3d14898c09011060e536bbe2b5a58fd913bdf94196c676ee810ca1d09fcb6b20e9db740282b4fb4628b776ad
+EBUILD sxhkd-0.6.2-r1.ebuild 720 BLAKE2B d8aff4f4c3795fecc1ada514c540d2bade213ed3ebe67160305d1b57a13731ddee756654060f68a1acf7cbd184575517a3152f6f32fecafbb8272bd3ca1e0bff SHA512 e8a9b59cefed39df3ea5632a1aec4b32472834b591094d4a52b36746681ade4cc3b8eb6b7b9d0d428629194fbab6e58d41195dc4e816a5d6b1b6231488d1ac2e
 MISC metadata.xml 328 BLAKE2B ef5ee0d2400003eedf0d3a6371233fd6dee54b0c372458c25c14754959f7553731ce8a989029fe23462afcdd0a5d184a23808e619c465c483c1b8e72a77a6f48 SHA512 3ef7078052da12bb622dd64e3c6df6ede3e271953a2e9bfe49288a19d862e22bd085cd0b1aafd6e7bb16cdb9deae4d63c293f40f62ea4a0abc23b248df091a00
diff --git a/x11-misc/sxhkd/sxhkd-0.6.2.ebuild b/x11-misc/sxhkd/sxhkd-0.6.2-r1.ebuild
index 62e4eb5b3616..83ed6a4db2ef 100644
--- a/x11-misc/sxhkd/sxhkd-0.6.2.ebuild
+++ b/x11-misc/sxhkd/sxhkd-0.6.2-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 inherit toolchain-funcs systemd
 
 DESCRIPTION="Simple X hotkey daemon"
@@ -10,11 +11,13 @@ SRC_URI="https://github.com/baskerville/sxhkd/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
-RDEPEND="x11-libs/libxcb
+RDEPEND="
+	x11-libs/libxcb:=
 	x11-libs/xcb-util-keysyms"
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	x11-libs/xcb-util"
 
 src_compile() {
@@ -22,6 +25,12 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" DOCPREFIX="${EPREFIX}/usr/share/doc/${PF}" install
+	local emakeargs=(
+		DESTDIR="${D}"
+		PREFIX="${EPREFIX}"/usr
+		DOCPREFIX="${EPREFIX}"/usr/share/doc/${PF}
+	)
+	emake "${emakeargs[@]}" install
+
 	systemd_dounit contrib/systemd/${PN}.service
 }
diff --git a/x11-misc/vdpauinfo/Manifest b/x11-misc/vdpauinfo/Manifest
index 57977bc2fa6c..691960b78cf1 100644
--- a/x11-misc/vdpauinfo/Manifest
+++ b/x11-misc/vdpauinfo/Manifest
@@ -1,3 +1,3 @@
-DIST vdpauinfo-1.4_p20220208.tar.gz 12251 BLAKE2B 14b2a6bb81ac1843d30f0ae9c976971cd3409b50bd6b9adcb59d9132535fcebd3dda7a7f772aabce03bb6877e8140991301a770a58bcc4e82c864c10494773ed SHA512 a87f92a4467f87293fc931a2c5c003763aab8551adcce7fa7281b20f5520a8d2a9df2ff06bb66814cdd059266381a145c851fd7169749e8066e80e4a578cccaa
-EBUILD vdpauinfo-1.4_p20220208.ebuild 664 BLAKE2B e0497f504751fbc6551b0b029f474c63446d1bd09cfd647f9662c7b0afa3e956f2e67411bc4e500cb44d96faf6135a30cec2ce16ab117af48c02875458f44373 SHA512 3fc89ad3dfb079694258b8bca91afeb19b0e3c861a3222ed9b2c88f0063d4083e325809d22144a420ad4a32e91336535096c132a001be2f81c8eede6adf6bf50
+DIST vdpauinfo-1.5.tar.gz 12246 BLAKE2B 5673eb6d00e501234cab3434ee06ef428495f86cf18304eed628e41dd0b17f8fe25aff8ef3bb896f4f70eefe2121446eae740c638b48b3ae1bc3547de4cb3102 SHA512 f3d359242443de919803ae0b8d89809c71e94d59d8ee9994f8f315036b829ad24030b75d953346989c1d0ddf436107041491e299c3212b013ad1d2b3c0571e59
+EBUILD vdpauinfo-1.5.ebuild 548 BLAKE2B 59392934c2cd5be295e2c944877ef2d648df9bc3d2ff809dc9ea4e898281c7478e2ff3f50ad3b3449bc683f6bd34113ad90d406c2378de4db306d6412c35e090 SHA512 606eb3ee428b6b160377e162875e5738a0ef4b2ec8b0307fe73effba137c8f1ccaf05294183e67622b31cfbd260e6219667c31a81d24c0f17bec18e3c009adf3
 MISC metadata.xml 246 BLAKE2B a512e6e8ffd8a998f89ea9dbf8a29dd4bb2d6db435e4ac0ef3182fc23996e04a6e87c1771975d835038ad86d6cb61e4a1aea8b80286666d64ad0b511c9d8f163 SHA512 d827f64596500d61c0f24c9d2a69fa3ca2f8b52e5f5815106d7db2837482172f0518d99677e6332a69fd4c34289ef817203a5047363ea7d2c10372b09f9e0618
diff --git a/x11-misc/vdpauinfo/vdpauinfo-1.4_p20220208.ebuild b/x11-misc/vdpauinfo/vdpauinfo-1.5.ebuild
index 133cc3bc678a..4969f9251cdf 100644
--- a/x11-misc/vdpauinfo/vdpauinfo-1.4_p20220208.ebuild
+++ b/x11-misc/vdpauinfo/vdpauinfo-1.5.ebuild
@@ -5,12 +5,9 @@ EAPI=8
 
 inherit autotools
 
-VDPAUINFO_COMMIT="da66af25aa327d21179d478f3a6d8c03b6c7f574"
-
 DESCRIPTION="Displays info about your card's VDPAU support"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/VDPAU"
-SRC_URI="https://gitlab.freedesktop.org/vdpau/vdpauinfo/-/archive/${VDPAUINFO_COMMIT}/${P}.tar.gz"
-S="${WORKDIR}/${PN}-${VDPAUINFO_COMMIT}"
+SRC_URI="https://gitlab.freedesktop.org/vdpau/vdpauinfo/-/archive/${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"