gentoo resync : 25.03.2022

32 files changed, 174 insertions, 141 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 46366d1d4b5e..450bbf62815b 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/alacarte/Manifest b/x11-misc/alacarte/Manifest
index b1df8e9b3cdf..b2f9f61c5285 100644
--- a/x11-misc/alacarte/Manifest
+++ b/x11-misc/alacarte/Manifest
@@ -1,3 +1,5 @@
 DIST alacarte-3.42.0.tar.xz 203836 BLAKE2B e020529acd5b6b716c8e1b876b3edc1107cf61fbcebb648ce7f593e830f0ae7ea3445a5ccda2cd798e0441e999cff2e9e4630a7b2fe0b711adef56bf59931c25 SHA512 df56f79e0697268ceebd15614c9e6c6bbef82c10c64c90b39eac1718043edb1a1ea71d03798705d94407cf2dcc3fead6c2d08ff6c5a9ca710574eb15ffed68d1
+DIST alacarte-3.44.1.tar.xz 253364 BLAKE2B ebd542430f909291d06c1094aac52f87760547013f012167fa5616609251a6cb48b258122424a119b3ab10e6e2289d9a282dd66da3dcf5590b09d9c686a8934b SHA512 84b1cebdcbb53e2cca5a1425829b00db0b2a11e308584ea96179c2d0451d8c77fa6a995ae4671a024fab72869c7d2e9986dc310bfab38fe8b7b2f54d383501ca
 EBUILD alacarte-3.42.0.ebuild 817 BLAKE2B 2c10e517fe9fa01f04aeb8e137627ed64f078e57d878519ffb73304d23c73f2afd81768254d235743fd6536dd1d9f8fad514d55c0a6b0163507d18f94de35def SHA512 f66c007d4d4d3f9e05652b66281a0427db2cc4c914dac507583898364eda91c1a2507810aec8164769bcf003846a33758d0385c28137fa7831c5b6258e2bfe5c
+EBUILD alacarte-3.44.1.ebuild 769 BLAKE2B 0bab1c893de5a2673b16e04842ef9d4eba62f66cea2f2287605a09c2b972b24f9c305ce229da3cc9d44ce5fec4c1b2d2e45a5ba8d9213ae62e65d0d5a77c30a1 SHA512 54ab52a056000ce6d31a8f1b2c1b48ab34aa07f2338607b80ab626910c552458e5ce3a48e3d8269a300a99985fc42dfc05645773495ef7742694f0348e060aed
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/x11-misc/alacarte/alacarte-3.44.1.ebuild b/x11-misc/alacarte/alacarte-3.44.1.ebuild
new file mode 100644
index 000000000000..c78a03bfd63d
--- /dev/null
+++ b/x11-misc/alacarte/alacarte-3.44.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml"
+
+inherit gnome2 python-single-r1
+
+DESCRIPTION="Simple GNOME menu editor"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/alacarte"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
+	>=gnome-base/gnome-menus-3.5.3:3[introspection]
+"
+RDEPEND="${DEPEND}
+	x11-libs/gdk-pixbuf:2[introspection]
+	x11-libs/gtk+:3[introspection]
+"
+BDEPEND="
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_install() {
+	gnome2_src_install
+	python_optimize
+}
diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest
index de1fd32f5379..35d1247a6323 100644
--- a/x11-misc/colord/Manifest
+++ b/x11-misc/colord/Manifest
@@ -1,5 +1,3 @@
-AUX 1.4.5-optional-introspection.patch 2436 BLAKE2B d2572caf95e94e12f64a1a15bdb2f686a0fc5196cd29b66f2ff7f312bd904167442b60e6cce05c738ffec0c06ed8da280e6738082afca2a9117576fcafd5f0a8 SHA512 46a0b28dccb54adfe562f3f5763ae6160588be7ce7d4bd6f691d15e4df3007d08a28c1c4f787abe05eb37ae5d07a058021553989c584180c924e6ab4a6a06016
-AUX 1.4.5-tests-Don-t-use-exact-floating-point-comparisons.patch 1768 BLAKE2B b8620120b46b9095235d33d92a862971ed6d3944ed7cdbfb44eb161104e96c571327965267ee8de10cfac71fa3956639f87c6d16dde81571f5f2e0c7db073779 SHA512 ca08f1325fde85da14f7a348df054ff47bc2a008f57f33c7cb8a8f60394bdb453da1e94402bc69cd16a9ac4899f0b75766b879b1a1cd8217b39557d4a3856158
 DIST colord-1.4.6.tar.xz 1872528 BLAKE2B bf87ed1abe0a827ad81b5467847975d70e4cb83c1973fac3bcb1650875b7a0b375d48633bb1b01c7da1e8acd62cc4cf19f0efe9722e12bde3d8ec4833800ef2c SHA512 d55d3322199d0bfee74eee9e183c9246ec33e755f0144d96087acb3c43ab5a3d872086fcef9f29cdd2295be71daac703cdf90ad10bf183622fdd84347e7af123
 EBUILD colord-1.4.6.ebuild 3350 BLAKE2B 6b6badab6b2ab5780f14936386566467a6c3925ab58f45563331d32fe3c81b48f14603bb9bfa476eca202c113a71fff30aa0bd72634eea9250f676c16a49adfd SHA512 6f00b9fcc94a7a21d456499ea830a80a4311fdffff50aa322545edac919e2c46c67b200e6e9789c5db0f1f71212d1d423a95025501f80ac3d9a9eb5981843105
 MISC metadata.xml 459 BLAKE2B 6d8217206edfdae4ed92783b04004d62c6eed7c8d684ad6b921d44c8830fee2aeb5480de68fbbe78535e4825333b1c312bb70196e18102e62d696e26597e8441 SHA512 4f255205fc902918b48a3c653e5c732a117df2e5a8f7ce6e4a7517b03694e14882e484440fce98e9c4cc13aa62739e01666d969e19947a5ae6e3b37130260508
diff --git a/x11-misc/colord/files/1.4.5-optional-introspection.patch b/x11-misc/colord/files/1.4.5-optional-introspection.patch
deleted file mode 100644
index 8bc4580bebe3..000000000000
--- a/x11-misc/colord/files/1.4.5-optional-introspection.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From e73723cabe4d5a2e2b281d2f1ea751b2d75bccc6 Mon Sep 17 00:00:00 2001
-From: David Michael <fedora.dm0@gmail.com>
-Date: Fri, 30 Apr 2021 16:28:17 -0400
-Subject: [PATCH] build: Make introspection optional in meson
-
-It defaults to enabled to preserve existing behavior.
----
- lib/colord/meson.build   | 2 ++
- lib/colorhug/meson.build | 2 ++
- meson_options.txt        | 1 +
- 3 files changed, 5 insertions(+)
-
-diff --git a/lib/colord/meson.build b/lib/colord/meson.build
-index dbb3d196..fe9d1cdb 100644
---- a/lib/colord/meson.build
-+++ b/lib/colord/meson.build
-@@ -146,6 +146,7 @@ pkgg.generate(
-   description : 'colord is a system daemon for managing color devices',
- )
- 
-+if get_option('introspection')
- libcolord_girtarget = gnome.generate_gir(colord,
-   sources : [
-     'cd-client.c',
-@@ -202,6 +203,7 @@ libcolord_girtarget = gnome.generate_gir(colord,
- )
- libcolord_gir = libcolord_girtarget[0]
- libcolord_typelib = libcolord_girtarget[1]
-+endif
- 
- if get_option('vapi')
- gnome.generate_vapi('colord',
-diff --git a/lib/colorhug/meson.build b/lib/colorhug/meson.build
-index 9526ea4d..c0ce2887 100644
---- a/lib/colorhug/meson.build
-+++ b/lib/colorhug/meson.build
-@@ -73,6 +73,7 @@ pkgg.generate(
-   description : 'ColorHug is a simple display hardware colorimeter',
- )
- 
-+if get_option('introspection')
- libcolorhug_gir = gnome.generate_gir(colorhug,
-   sources : [
-     'ch-common.c',
-@@ -107,6 +108,7 @@ libcolorhug_gir = gnome.generate_gir(colorhug,
-   ],
-   install : true
- )
-+endif
- 
- if get_option('tests')
-   e = executable(
-diff --git a/meson_options.txt b/meson_options.txt
-index c184898e..10517622 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -7,6 +7,7 @@ option('systemd', type : 'boolean', value : true, description : 'Enable systemd
- option('argyllcms_sensor', type : 'boolean', value : true, description : 'Enable ArgllCMS sensor')
- option('reverse', type : 'boolean', value : false, description : 'Enable reverse engineering tools')
- option('sane', type : 'boolean', value : false, description : 'Enable SANE support')
-+option('introspection', type : 'boolean', value : true, description : 'Build gobject-introspection typelib files')
- option('vapi', type : 'boolean', value : false, description : 'Build vala bindings')
- option('print_profiles', type : 'boolean', value : false, description : 'Build extra print profiles')
- option('tests', type : 'boolean', value : true, description : 'Build self tests')
diff --git a/x11-misc/colord/files/1.4.5-tests-Don-t-use-exact-floating-point-comparisons.patch b/x11-misc/colord/files/1.4.5-tests-Don-t-use-exact-floating-point-comparisons.patch
deleted file mode 100644
index de56fe145440..000000000000
--- a/x11-misc/colord/files/1.4.5-tests-Don-t-use-exact-floating-point-comparisons.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From d68cd11cd31d379e4f3bb4c964b17fd50c8c54a6 Mon Sep 17 00:00:00 2001
-From: Christopher James Halse Rogers <raof@ubuntu.com>
-Date: Wed, 11 Nov 2020 17:13:19 +1100
-Subject: [PATCH] tests: Don't use exact floating point comparisons.
-
-The tests asserting that cd_icc_get_version are exactly equal to 3.4 or
-2.09 fail on (at least) i386, armel, and s390x because floating point is
-hateful.
-
-Signed-off-by: Christopher James Halse Rogers <raof@ubuntu.com>
----
- lib/colord/cd-test-private.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/colord/cd-test-private.c b/lib/colord/cd-test-private.c
-index 4b16ca5..231c4ae 100644
---- a/lib/colord/cd-test-private.c
-+++ b/lib/colord/cd-test-private.c
-@@ -1494,7 +1494,7 @@ colord_icc_func (void)
- 	/* check profile properties */
- 	g_assert_cmpint (cd_icc_get_size (icc), ==, 25244);
- 	g_assert_cmpstr (cd_icc_get_checksum (icc), ==, "9ace8cce8baac8d492a93a2a232d7702");
--	g_assert_cmpfloat (cd_icc_get_version (icc), ==, 3.4);
-+	g_assert_cmpfloat_with_epsilon (cd_icc_get_version (icc), 3.4, 0.01);
- 	g_assert (g_str_has_suffix (cd_icc_get_filename (icc), "ibm-t61.icc"));
- 	g_assert_cmpint (cd_icc_get_kind (icc), ==, CD_PROFILE_KIND_DISPLAY_DEVICE);
- 	g_assert_cmpint (cd_icc_get_colorspace (icc), ==, CD_COLORSPACE_RGB);
-@@ -1727,7 +1727,7 @@ colord_icc_save_func (void)
- 	g_object_unref (file);
- 
- 	/* verify changed values */
--	g_assert_cmpfloat (cd_icc_get_version (icc), ==, 2.09);
-+	g_assert_cmpfloat_with_epsilon (cd_icc_get_version (icc), 2.09, 0.001);
- 	g_assert_cmpint (cd_icc_get_kind (icc), ==, CD_PROFILE_KIND_OUTPUT_DEVICE);
- 	g_assert_cmpint (cd_icc_get_colorspace (icc), ==, CD_COLORSPACE_XYZ);
- 	g_assert_cmpstr (cd_icc_get_metadata_item (icc, "SelfTest"), ==, "true");
--- 
-2.26.3
-
diff --git a/x11-misc/gromit/Manifest b/x11-misc/gromit/Manifest
index 66b49ffffd62..9d7d2e1aff6a 100644
--- a/x11-misc/gromit/Manifest
+++ b/x11-misc/gromit/Manifest
@@ -1,4 +1,4 @@
 AUX gromit-20041213-build.patch 873 BLAKE2B d8f88ec45871bfd7af5626107920683510be979c3c7557033208316f428c2470f3fe0ffe2b9bd58126ad61dcfc47e8ff1e93acbf4f3cbf332f2414b6a056090f SHA512 99f638750af04813495edfe0605e6213df30dd408d547964c82e349c0c3e023e12e4d5ea9ac60a2b428f1241b26c80565987d987ab77de2c802556c0048b9084
 DIST gromit-20041213.tar.gz 21970 BLAKE2B 44740d29086bb5f7cfd11a882ffb8e89cd0ea87bd91c0017376b312211b64bd999f9dc81fce358b6a1d7d311f0a34940bd81b205ee2baa54112c930309109585 SHA512 8d10953bf0500e9b411ce6d7b6c43b295ab64113e8a873438409de8a1aad19b685483045341b0af889e7c833816f035c95dda90d3c201caf7c69ea7cbad57e42
-EBUILD gromit-20041213-r1.ebuild 631 BLAKE2B cd35b3e0a7db482bc245d3242dc609826f67c87416f3d7dceeab8f27ba096686a9eede4ebf78e22f4c19ef32910662ba727349c3d3f4021afdd71cf621b3515f SHA512 6e7a1450b460a62dcfa746b032a3c74ac7f1fbdc356b2e36ba0bea1338f2fbfc25e334eb90c3eaa233b420f3ab6c0671b96bc1b360f8df5f5300d8a70ca0582c
+EBUILD gromit-20041213-r1.ebuild 633 BLAKE2B 9af003435ec8b3316171aba10b9340d5f30fd51ce5715e9fc198fde3d9d5a8ddb13d4071882cae8bb01b82a47842b45e22c31881039fe87c8fa88c46d02b835a SHA512 fd7e969e95a100fcb2f7a3681eb37ba3a48622877c87aee9052ac0b3a806fcb5ad4f860fad26033c95c31022c7c96d97c2615edda859db11aaa8a6ad502f8602
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/x11-misc/gromit/gromit-20041213-r1.ebuild b/x11-misc/gromit/gromit-20041213-r1.ebuild
index 83184db01362..5c81d81cc756 100644
--- a/x11-misc/gromit/gromit-20041213-r1.ebuild
+++ b/x11-misc/gromit/gromit-20041213-r1.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=6
@@ -25,7 +25,7 @@ PATCHES=(
 src_compile() {
 	tc-export PKG_CONFIG
 
-	emake CC=$(tc-getCC)
+	emake CC="$(tc-getCC)"
 }
 
 src_install() {
diff --git a/x11-misc/kronometer/Manifest b/x11-misc/kronometer/Manifest
index 581a3a81886d..f3e2ff100630 100644
--- a/x11-misc/kronometer/Manifest
+++ b/x11-misc/kronometer/Manifest
@@ -1,3 +1,5 @@
+AUX kronometer-2.2.3-missing-dep.patch 578 BLAKE2B 2395c67fbfc5c465ff71326dc3d0dba56768b814040913629c4718e2d2d4d0e782649bbdbd1cc7b0fc8b47ca6610b1f5ac5edd7a626143aea5bbfe6434fe4351 SHA512 3bac194647c9c78caa2103cf8a2ba7715524bdd293caa60ae0c6bfaf78b3fd5aa093f068d3fea2906368ecfb8d0e1d1f2be7c4e3733c4cd5caa0aa71150137f1
+AUX kronometer-2.2.3-missing-link.patch 589 BLAKE2B 231c8207d3df8f5480d2b20e5359c4eacafe55a15269334dda3b00dc5005e735ae530353b876dd5a2376ef498f74da0bdb12b56a58521a3f677663d71078691d SHA512 02bc07af28bc2f531be154c80b6c3189513439a0626d6660850a7fd16052771e62024b9f837c4c784ec7b9d1552d4c8706922948346af10633d25894ff6dddd1
 DIST kronometer-2.2.3.tar.xz 124208 BLAKE2B f9d91bf19ba64e2c337b8181e2529b409a450c1e821c6b1358a1d57627959c65b5c4db0acd15a4c8f4cd3fb12197ce6a1bf3b95d4dc4922409223b528f5f62aa SHA512 77f948ae3a03b15a0cd49bc1048897bff0788a4831beff8f336270d8af6ee1a245d2174f5a3adc224257e9f319958197af7900ce8389b312f8fe7cd6c53a71d1
-EBUILD kronometer-2.2.3.ebuild 851 BLAKE2B c87924e0e898b3c03495449f834e95abf7ee0a5822b47e7d5db9a414507c288e67bf9435e71b5fe9d4a7833f596342121d517e15483864b19be2eedc12bc0e38 SHA512 271f5b1ebdb412bceae183b5ab995bfa2d3ae2a408c8a1aab6ac7bb5eb13c1042ffd6ae987a51f88a1d7f5d48bc37daaef32a2257f4d02af7343fe404ab0137d
+EBUILD kronometer-2.2.3.ebuild 938 BLAKE2B 2bc47e8a51a38978f6c06150ae52b302c46d59d765f24dcb2c095ecf27a8bcd3f048895ab7d4d478cf6fe569fc5a5b147dd6af5f87645a8f3c021d2b228a8087 SHA512 b5e8644f88e85591ac5d49236f9804600182fb200fa6c94cb4e5bcf348659a9947b4c50d84a5a0d7948e4de2bf7d5372eb7c0e03e281110ad52bf42d44d5052f
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/x11-misc/kronometer/files/kronometer-2.2.3-missing-dep.patch b/x11-misc/kronometer/files/kronometer-2.2.3-missing-dep.patch
new file mode 100644
index 000000000000..5b73598a43ef
--- /dev/null
+++ b/x11-misc/kronometer/files/kronometer-2.2.3-missing-dep.patch
@@ -0,0 +1,24 @@
+From 04499b5e063e5595f66d7624be851a53d85a5948 Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Mon, 21 Mar 2022 21:00:59 +0100
+Subject: [PATCH] Add missing find_package for KCoreAddons
+
+---
+ CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 31fc597..2773638 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -30,6 +30,7 @@ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED
+ 
+ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED
+     COMPONENTS
++    CoreAddons
+     Config
+     Crash
+     DocTools
+-- 
+GitLab
+
diff --git a/x11-misc/kronometer/files/kronometer-2.2.3-missing-link.patch b/x11-misc/kronometer/files/kronometer-2.2.3-missing-link.patch
new file mode 100644
index 000000000000..f08cb9459cbd
--- /dev/null
+++ b/x11-misc/kronometer/files/kronometer-2.2.3-missing-link.patch
@@ -0,0 +1,24 @@
+From 2894243edd8c636d9855615522300b4361e2f258 Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Sun, 20 Mar 2022 18:07:50 +0100
+Subject: [PATCH] Add missing KCoreAddons link
+
+---
+ src/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 7f510b8..be8805d 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -10,6 +10,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+ endif()
+ 
+ target_link_libraries(kronometer
++    KF5::CoreAddons
+     KF5::Crash
+     gui)
+ 
+-- 
+GitLab
+
diff --git a/x11-misc/kronometer/kronometer-2.2.3.ebuild b/x11-misc/kronometer/kronometer-2.2.3.ebuild
index efd9ec24975b..df7872459d80 100644
--- a/x11-misc/kronometer/kronometer-2.2.3.ebuild
+++ b/x11-misc/kronometer/kronometer-2.2.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
@@ -11,7 +11,7 @@ VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="Stopwatch application"
-HOMEPAGE="https://apps.kde.org/en/kronometer https://userbase.kde.org/Kronometer"
+HOMEPAGE="https://apps.kde.org/kronometer https://userbase.kde.org/Kronometer"
 SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
 
 LICENSE="GPL-2+"
@@ -31,3 +31,8 @@ DEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 "
 RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-missing-dep.patch"
+	"${FILESDIR}/${P}-missing-link.patch"
+)
diff --git a/x11-misc/openbox-menu/Manifest b/x11-misc/openbox-menu/Manifest
index f221e5eb230b..4c5b7c125493 100644
--- a/x11-misc/openbox-menu/Manifest
+++ b/x11-misc/openbox-menu/Manifest
@@ -2,5 +2,5 @@ AUX openbox-menu-0.8.1-build.patch 486 BLAKE2B 90f74e4e3c7925e6e35098f1a3c64aed1
 AUX openbox-menu-0.8.1-gtk3.patch 2511 BLAKE2B c6c915bacb681cb507ea36d653fe742ceb5ced7829001e854f4b96fd395d05773b1e8ecb9bed52823dd430277f7dae89193e020a8f1593d3e5f530839ab4d246 SHA512 7b6441186771529c996f71e7bb8538e18e2cf344abcca7d94b337a1180d66bb71b948674a1c4702bf2821f54168ac139c6602399be1b9c57f86a914762f21acb
 AUX openbox-menu-0.8.1-makefile.patch 3562 BLAKE2B 542a20fbda371b186a6130804f3b2ac8b5b07c4d11db662ac622699a59ac16fbd9e4a1e573d48a166f5950adbdea8d4f240482ae09610ed83433dbaf284109f0 SHA512 9ceb1a2d69e65625796431b34af9a1b58980293633dbe253ff103d2c3a97aca33984c66c2c85fea2c15fa16747d190d31642112c1c546bbee0b850341da61548
 DIST openbox-menu-0.8.1.tar.gz 27960 BLAKE2B f4c78956c163b0d8ca2d601b05354217071e93307a0abc1536d1d373a3d402384b0a4d3c15252aaf9aae7c20b76b5b8aa69edfacbe11cfaa76b1aba8a7a4834e SHA512 de6454e88ac30b5cb1094ae427116808ad9dd2f37c8d2ae20dea77aa60d414a47149c09e8ea7d3c5c31182b728b8a4f13283f33c6e2a34d3cd4b64f91d4ef8da
-EBUILD openbox-menu-0.8.1.ebuild 914 BLAKE2B 0780b2f73ee0052dcb20404cbedd82ccd88739e9b62650de0c5abd292d2bb37832622fa5b5a503fa47ed03fcea68c9b5276ab0801db181e27f2164d924a87024 SHA512 dd8dd8606f261b0a46cdb9bb3a3b978ad1203c3bc7c18b20400c2bc31758ea85de5a9406fdb590c56a2019ad718bb95e7aa4dc934525f6184e2d438253140bd4
+EBUILD openbox-menu-0.8.1.ebuild 916 BLAKE2B 76709c650eee24238b9d548e2beed5e096bd86817ebae59f1f43be5785d55f217c2b194f2c76de77453cf5f7426cf8ca3fa75ef28ed94d1a2122514f4915705f SHA512 30db28b7bda2c2f8cc556d43f6170c4806ca23325d6cf1ace42f650ea19d5a2ac7ba4dd21f251bdac1e627bedb26459eeea45cfd17422788344d07750327e6a6
 MISC metadata.xml 496 BLAKE2B 59b4f3a6e81c3d40a411fce4a253fd4c47a238b90a6e745855d420783a610276f3f843a96517bdb8e16b3d6fa75b5e6968840f443574ec7167c98ef24cebd0c7 SHA512 846f9d45a24c5333edd5ae2573463dbc7018a61daca647eb4c3b9f7c1285363677bf2474d2cad5e9d2b67ee1cfc85ab1ece0405755a46a95cbbe0076264bef17
diff --git a/x11-misc/openbox-menu/openbox-menu-0.8.1.ebuild b/x11-misc/openbox-menu/openbox-menu-0.8.1.ebuild
index 616287e4131d..1feb6e43a525 100644
--- a/x11-misc/openbox-menu/openbox-menu-0.8.1.ebuild
+++ b/x11-misc/openbox-menu/openbox-menu-0.8.1.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
@@ -35,7 +35,7 @@ PATCHES=(
 )
 
 src_compile() {
-	emake CC=$(tc-getCC) PKG_CONFIG=$(tc-getPKG_CONFIG) \
+	emake CC="$(tc-getCC)" PKG_CONFIG=$(tc-getPKG_CONFIG) \
 		WITH_ICONS=$(usex icons '1' '0') \
 		WITH_SVG=$(usex svg '1' '0')
 }
diff --git a/x11-misc/sent/Manifest b/x11-misc/sent/Manifest
index 031c2d1a09d1..3f0b8ad4f237 100644
--- a/x11-misc/sent/Manifest
+++ b/x11-misc/sent/Manifest
@@ -1,4 +1,4 @@
 DIST sent-1.tar.gz 15285 BLAKE2B 97bd71ff355b51a809e62a0a0a6c602550adce2331d53d8e2eef86fabfbd6c3122f93d431a670479fd22ec2a7c37880f2b464e453780ce1a965143ef83c47f07 SHA512 4797468bf949de507662253eac1ec80f566553051f407a55a88ccdd6544532c0d8d0f51bb11b88bdff78e6630519558049569ac0c9d3d8279f243882653ef1c0
-EBUILD sent-1-r1.ebuild 757 BLAKE2B 65268e220629350ab5a541f8726072e534d054b484e9ee4947f4c1d3e1e1c4a28fb05c08746adcfbd69f2036b46675e6d18f0a3a13c0c523d741d81cc866d8d3 SHA512 78dc5847a75e1a09c21f5aaeb56b0587d3594dcbe3a97bab470e3a5b4e60ff65a68371ed239320d194cf57636c6d29cd70914a2652f9fb80b33370efffc0f0ae
-EBUILD sent-9999.ebuild 737 BLAKE2B 11237d6702a9ec44a088397e363bb17ea954af778721e651bd6c4faf09976506e32c52c0acc2a745cce25eb4c5f32b4c66bd8b364d87f16682dfca411f92a24d SHA512 c7bd1af6fad3a4a59133d66faff93390576a7808310d7532fbb47dfbc2c5b4157163a1aadfbe34acd2019c570e3f0d10cc5e8c81dc080b89759796ff1352f8ef
+EBUILD sent-1-r1.ebuild 756 BLAKE2B 52114e6dca1315d106312b6d84df3dbb84ad3837481b818272836e3fcc4f2fab3e1140c1656d6bfaed4add17b9aa4216ed75bad42c18ae7b451391576ae50790 SHA512 b030a5bbf8749c0b580dc29118e54c9137ba00d03bd2eb6a31229fe3d9746cc4f794b270ff117abbf6fcaa2de0500c62b77c1b4c7b9b243d45ebb61ce17d63b6
+EBUILD sent-9999.ebuild 739 BLAKE2B 4f0df5a7137cbea8764a5a26655403c0957c4097425ed6de0958bcf33c601c54dc7aebcb1c6a019c1e4996bbc8f89c66d63cb9a7c4c1e50582706a9ef1aae75f SHA512 246c304fd05170dbbb9012bdbb347795137d5950de1273fd41315624d58db73bbe65757e7303d84f0344dfff44b06c9ccc6e2e4f24fa6cafe8f4905e269bb664
 MISC metadata.xml 399 BLAKE2B 2a606838880d9eddb1597732948149cd580301da447929d30a159e658fa48a0637ff1d20ca77ffacc00af913193acfc7eb5d3613cdda2e8616792e374778cb52 SHA512 95d1e79e216286b751c260bc490438a6b0d653f93f5c2a8b38b97795313b4ac6e4450f4a88f106f656ff91ba946b619b1cd98b9e0102f4dfff35a2a704736b7a
diff --git a/x11-misc/sent/sent-1-r1.ebuild b/x11-misc/sent/sent-1-r1.ebuild
index 8324b45871a4..4a36a2f9f469 100644
--- a/x11-misc/sent/sent-1-r1.ebuild
+++ b/x11-misc/sent/sent-1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -36,7 +36,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake CC=$(tc-getCC)
+	emake CC="$(tc-getCC)"
 }
 
 src_install() {
diff --git a/x11-misc/sent/sent-9999.ebuild b/x11-misc/sent/sent-9999.ebuild
index 95b2d9227ca5..08ec94ec84d1 100644
--- a/x11-misc/sent/sent-9999.ebuild
+++ b/x11-misc/sent/sent-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -35,7 +35,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake CC=$(tc-getCC)
+	emake CC="$(tc-getCC)"
 }
 
 src_install() {
diff --git a/x11-misc/spnavcfg/Manifest b/x11-misc/spnavcfg/Manifest
index 308c05c5e3ca..afcfa0e3c72a 100644
--- a/x11-misc/spnavcfg/Manifest
+++ b/x11-misc/spnavcfg/Manifest
@@ -1,3 +1,3 @@
 DIST spnavcfg-0.3.1.tar.gz 215460 BLAKE2B f2bd35022399ec085d5c8b08c7514fdac8e974b33e9923a79446fa9552827d5986abf136fdb95ed31d7dbec419eb34ce13039955c6255cff971ffedcd3cc8a02 SHA512 b5e0ef2036eebc971298d95e8a91bd89ade956933919a4a5dc062fd977ff159bba392b0092ac36142fb317a9758c26319b07680b473f9957eda0163146be5408
-EBUILD spnavcfg-0.3.1.ebuild 629 BLAKE2B 871087fae76d853b5b57b8826905903386d74cdcdf660b4ef265cea031df8d93594695731cbd5b17791c3aadcb32b3e20ae5eaa159f9fa46fbb334a8869eddac SHA512 dda9498dadf18a137eba689191be6e7fe6fc9ce92ec0683dc7335d515716a391901756dd535b9701c985f16fde53d448fde44342f20b78645bac74c3b22f1a15
+EBUILD spnavcfg-0.3.1.ebuild 631 BLAKE2B 87950402346b2d18842697a0e66cc38c7cd897fab3ebb824b100748f35e110acbeaf7f41a933486f50c1d8ee1e02251ffc94da9c28dbf74f7b601a027569cc83 SHA512 13274238bdbecf96267c64cd3cc3aa23a444efe4df24c1616bd4b34bf6060e3580a72a06f1ab470af25edb3d8d9ceac0deaccb203aa1cccb849a0e3e849facd9
 MISC metadata.xml 514 BLAKE2B 50df594dc158c9d7aae74568d8eb00a1351df08aec9aee998d9c34812edcaf51e75a7e3e1e75d4fd74ba3be0249f1cd61530eb9d7b1946bee63af3959e84bef8 SHA512 5627cd947830e8c82068402f2fb9a0a65e92b141ab9f61d285e1caf37c43e3e7ab3666d05062493dd339ce5093bffb2ac5622fff702591b7b0fea15b9a061394
diff --git a/x11-misc/spnavcfg/spnavcfg-0.3.1.ebuild b/x11-misc/spnavcfg/spnavcfg-0.3.1.ebuild
index ae66b2298782..3cec1650f544 100644
--- a/x11-misc/spnavcfg/spnavcfg-0.3.1.ebuild
+++ b/x11-misc/spnavcfg/spnavcfg-0.3.1.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
@@ -25,5 +25,5 @@ src_configure() {
 }
 
 src_compile() {
-	emake CC=$(tc-getCC)
+	emake CC="$(tc-getCC)"
 }
diff --git a/x11-misc/stalonetray/Manifest b/x11-misc/stalonetray/Manifest
index ab703b2602f5..adbbd052fbe7 100644
--- a/x11-misc/stalonetray/Manifest
+++ b/x11-misc/stalonetray/Manifest
@@ -1,3 +1,3 @@
 DIST stalonetray-0.8.4.tar.gz 94614 BLAKE2B 4def696bbd580960f2d7fd84516658e4b4112b40989523840566d34dac71ba92e3adf021796059db919515cc978ac0c5d7783a4ed41aa9f82c8cbcfd00bc958b SHA512 3afdeb7794171f490c5eca631c574003a00bbed863b9caf4024e1b064772d3c24ea3836f280eeab1d50def67928f4d08d3d375047f43bcc39f16a3250015ff2b
-EBUILD stalonetray-0.8.4.ebuild 858 BLAKE2B b79459058ac014cb29d475b191232228b4ed48cbb8010f8806e464f3fa1d5c4234e4bff1b484b26028c7a0aa8c24712813e9e5789768f12a9f63dada83a5c2e5 SHA512 393516a13b3451aab5307999dc61aedcedc6a57fa46f0f5fd507e97d92ca65e5346ed6737d02539dd890aa0157fed7e5224ac97e8e19b0458bab2ded0e7bc7c9
+EBUILD stalonetray-0.8.4.ebuild 865 BLAKE2B 69c1c2fb4c375cb5a238e1f815095a76deb053a0f9b311ab14e614254672e8242ea39808aec27b10f602ae30d0ef4b652fc02d7d0913e2093511a7f17cf9e155 SHA512 188dafa253af9d5b991df314df5f0472d765dff7e6f06d5b2227e53541c835e54f6dcb80013270b219d3f97f812c49a35f05a1b13cee9a1a3e3d29623fc4f596
 MISC metadata.xml 571 BLAKE2B 5e087897b3484de8ab890fb90f5eb48f244e56eb79db8e3b8e0a12c84915a171f7c024189818054792900dd34acf008e7b47cf03bc6abe9eba71ec3a478b91d5 SHA512 678c405cc7e8a73bb602ad9560a68440008561d248a4db46f5c73d5e14ea79df116ecdc23985b5f7d6b945dc74cf3b259e4ab20a8c528e547b3ad93c9aa2d62d
diff --git a/x11-misc/stalonetray/stalonetray-0.8.4.ebuild b/x11-misc/stalonetray/stalonetray-0.8.4.ebuild
index bf278325f3dc..f63dff437496 100644
--- a/x11-misc/stalonetray/stalonetray-0.8.4.ebuild
+++ b/x11-misc/stalonetray/stalonetray-0.8.4.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/kolbusa/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE="debug +graceful-exit"
 
 RDEPEND="x11-libs/libICE
diff --git a/x11-misc/tabbed/Manifest b/x11-misc/tabbed/Manifest
index 32609c781cd6..d15dc8c22332 100644
--- a/x11-misc/tabbed/Manifest
+++ b/x11-misc/tabbed/Manifest
@@ -1,3 +1,3 @@
 DIST tabbed-0.6.tar.gz 12926 BLAKE2B e92e2c7132f7a760286c61c99faa0b26e411326e172c231f3354e61f8151f561babd4a35998bc06cb7fd87dc962334ef0ddac78ba284cd3090bb1c2dcfa159be SHA512 bcad873251be6b5de21311531e8d24330003b42790cb94d559a0d1be45408b3e0722c14e7c7f2cefd0717fd2a2d7a100fa08fc4e10e7bb669935909602286553
-EBUILD tabbed-0.6-r1.ebuild 974 BLAKE2B bc2c127509ba7e31f84712d7b5c246c5b0844b2ae567fed5d8589c5b48eb193f49d70764a722cd10aecd46d7705a7e2e2d2d2f546d6f978d79f4d24dce783305 SHA512 41ffea7ca5d761519f30e77a968706ae7be7877804d569e4c6cf0c2957d7ae68f3ba993206f27ef1e59ed66a1c7ecb6bdd84739dd717deebc2db8775e5cda19b
+EBUILD tabbed-0.6-r1.ebuild 976 BLAKE2B ce3837cc733343ed5c03dfb65d091e3a064197edd9fb00411ce0c59649172b33d55c3b2000cee39fa5c0dba00af2518d960ce1a70fc6afd0421c80cbf43bd97c SHA512 9e354a1df57cb2914fa6e18540ca05190a43273a63d846747d125abccfce8aa7c39b1fac1e9c113350db08a7c6780ab263e3951a27c8294a100b6ed2720e6340
 MISC metadata.xml 252 BLAKE2B ed5f11ce8c4de4fde4020b83dc772d6b47192ea5617cacf05adf13ab5a29923858b2969ed9dc26e75194cb972d41ffceee40856e6f955f42039693af96ebb2e4 SHA512 7f9b5cf205b6500eb65742c67963c3c6c375fa05c7eb094037fb9950d9d2840930e8b4d3ef76c948ddf7f37005012be51c8217c758a615dd7e128c80b6b1db28
diff --git a/x11-misc/tabbed/tabbed-0.6-r1.ebuild b/x11-misc/tabbed/tabbed-0.6-r1.ebuild
index 7351759f0314..44798c1dea91 100644
--- a/x11-misc/tabbed/tabbed-0.6-r1.ebuild
+++ b/x11-misc/tabbed/tabbed-0.6-r1.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
@@ -40,7 +40,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake CC=$(tc-getCC)
+	emake CC="$(tc-getCC)"
 }
 src_install() {
 	default
diff --git a/x11-misc/xkbset/Manifest b/x11-misc/xkbset/Manifest
index 26f0d85a7284..6c78631860ac 100644
--- a/x11-misc/xkbset/Manifest
+++ b/x11-misc/xkbset/Manifest
@@ -1,5 +1,5 @@
 AUX xkbset-0.5-ldflags.patch 412 BLAKE2B f42d74ab24dd14348bdcddb83aa16ce732a9b912aa4b52283026ea55c2f546b76a89dd0d57f0c21495bab95b9b81b6ee8b9d080217bfc07ca88ac27c432a438f SHA512 594eb6ff7f812633d4e7c3e8ab1a90f3f71856556680ba3643d40eb75602a0e9b09cee129929f7d7aabc70d009f3b511c0fafb8dfe6943b4456b9da95a9eba39
 DIST xkbset-0.5.tar.gz 13933 BLAKE2B f889bbf527e6ee808d970796815445cfa4803f315916c412d540eaac778f8cfdfa6e3d00e171cb21de589a61e5320de2af4f8b8c19c4c2a45c3cf837da38a0e7 SHA512 64de1a18076c0e0fd3e3189444b6033880028f53777566286caf935bfafcf062ccbd408d20926e2a4febb77d15b026349e0288f2aa93c815ddd9437b96589d8c
 DIST xkbset_0.5-7.1.debian.tar.xz 4336 BLAKE2B 48de493553add438ccce22567d1e8b706418a6db8a70aaeb83835c33662c8ebc22f8e3250a8b87d521a02c41e44f7252dce774525a1fa5c4bfbf57f876dd728f SHA512 f927cc1fde5b3d0658d28a8fc1cdaa0c366826f7a8eab19404dda6a66a0e91ce3c262da1e783169a7521eb10a3470e9c75c01e60728daea737ad1319bc0b946f
-EBUILD xkbset-0.5_p7_p1.ebuild 914 BLAKE2B 4923482a4a06d6604257f670526d25f6c576dea75b283d29dcdf8e30434e832b7cd380dc0ba4ae917636a33ceabd615fc2ade57e8aa7b4845a30126aa9a17625 SHA512 87f29e3cdc4c96c4e840d31500dd69b4f3dd5c9fa64287739ff21da4dfd7066502d0a2edbacc18c3516a78f73422c251da21846c2edd229d63470d3217e56f08
+EBUILD xkbset-0.5_p7_p1.ebuild 916 BLAKE2B 24e1a4addb26c3dd3dbeede0d499a76074132fa1f51863a4f38fc594bd152bd7a42a52222392260a4a6bca5ed4fa8c479a2c609d4b252c6926c627d8d3f4fa74 SHA512 67ca9ca9bf30eae6950609131a097b6f5aa52b0d41c039dac74f00d483ab985aed03d8a9d9e2bfbd3408e225e0ee866f137e917a44b1b3d39885eb14a4a5adaa
 MISC metadata.xml 263 BLAKE2B 9ba9469ad9b41de189f6dab68b26c1dc96974503f40c6219fc2ea2fb44ba60323b66e4347c7959193966345c186b702121c4393a7e947fb1a487de801146e4be SHA512 ffb77d6366cd3d4bdb1bb28aa419ab549b834370359e8e6d6810165129ac937ca96c4aac2527fd20c13bb26d139c2876edbbf595118378dcfbabd98420032708
diff --git a/x11-misc/xkbset/xkbset-0.5_p7_p1.ebuild b/x11-misc/xkbset/xkbset-0.5_p7_p1.ebuild
index 47ac617ee117..125b8f843a53 100644
--- a/x11-misc/xkbset/xkbset-0.5_p7_p1.ebuild
+++ b/x11-misc/xkbset/xkbset-0.5_p7_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -38,7 +38,7 @@ PATCHES=(
 )
 
 src_compile() {
-	emake CC=$(tc-getCC) INC_PATH= LIB_PATH=
+	emake CC="$(tc-getCC)" INC_PATH= LIB_PATH=
 }
 
 src_install() {
diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index aff8042d4e77..bea48b3449bb 100644
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -5,5 +5,5 @@ AUX xlockmore-5.64_alpha0-LDFLAGS.patch 906 BLAKE2B 477e2fa3b3e74ef3bcb93d0f87f8
 DIST xlockmore-5.66.tar.xz 1995064 BLAKE2B 630643f2968a5015dd35b4e1a24cd3d4e7ef9d6d75b0916416e93ab28bacb5a161983b036d9042a5686b2f17ba493ad510e2df9f7443488f9b988662e644ec7a SHA512 d0a4665e23b32cc3370703e55396cd5c9659f836aa13a1737dd709632746cf9221acd66a529b9e05af981e5bef539e70582959b9d821854b93ef735ad1cd928d
 DIST xlockmore-5.69.tar.xz 2008396 BLAKE2B 69341456769f34c1ac537f382b4baf287b5da47f4620581cbea5ab92749a26467781ebb6d7f3dfa9bd1eedf92d21fb8e501715af681972f06007408a5a44f4e5 SHA512 03c5938a7442665a2743894c0daa45f3b38569f2b3c3cf395f0d0f5758f6f873e0ef703936d0846d0210babe52357a398a885f919257efe9a2038c8e06be40b9
 EBUILD xlockmore-5.66.ebuild 2488 BLAKE2B ec994f139176a9f4b5aebfa992825e7e550912d79f1ff12451e6c6b595d9796d4eacf503ac73c0327726803305f244238586032d0e027378111ab1472e19c6a2 SHA512 a08870595a6e7b07014f55cf568a8fd13c34ddeaaad9e9300e965c9875d35deae9a62ee74450fb6fa1c9846876f8603152d55db7b0f570a4bc3c395aaa686701
-EBUILD xlockmore-5.69.ebuild 2491 BLAKE2B 396cd1349bdd4a05b5808ab61660b45f3d1e960aecfd357a25f8a4a22084afcaaeed213b86d75b589004903b4e25e7eed1426ff558e1334144a1a6fe6e81a4ad SHA512 eb671ac6cf850051724fb8e17f439303cd02e97979b8bc121497969674b7b4d126f1019bfbc2264479b90b914b18ec955b9fcca092a2fcf3c226f4c2100c73be
+EBUILD xlockmore-5.69.ebuild 2498 BLAKE2B ed3f0737f3dca2553bfb9317dfd1bc27034c06e30a1e0f009508f2ca28393a49e00a1e4b986e82a54dfffc71ce1f4985841d50ea148b3a2e1ad21c4a364a9648 SHA512 ade21adc2b94836d1f44c38e9c78a752d955c01bf110b5f7e6270adbe4fe3c93ae6c86606b04c1af720587146336392a9a70ce948a961b01e447ef2edf67a843
 MISC metadata.xml 326 BLAKE2B 933c62f987014fd25320e5b9d231747e4fe9ddcf24109f34b1d5df2a186695305b4d3778d4f0b1132e73e79dc483f62bce3b08338ef69f4829998339d29d10fc SHA512 cea9a5ef5e3bbc00c784c65877a67dc10cfb2e97d6280f87defba6f3bea2afec972f1e761aac9b55acaa7e8cc8930e81ab9182d2b2b07fec01ad0ad1525c2c41
diff --git a/x11-misc/xlockmore/xlockmore-5.69.ebuild b/x11-misc/xlockmore/xlockmore-5.69.ebuild
index 642e24bb7e56..f8548d0929a9 100644
--- a/x11-misc/xlockmore/xlockmore-5.69.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.69.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P/_alpha/ALPHA}"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock"
 
 REQUIRED_USE="
diff --git a/x11-misc/xpad/Manifest b/x11-misc/xpad/Manifest
index 9ce88b4ce438..dbf563647ae1 100644
--- a/x11-misc/xpad/Manifest
+++ b/x11-misc/xpad/Manifest
@@ -1,3 +1,5 @@
 DIST xpad-5.4.0.tar.bz2 163394 BLAKE2B 478e96b6c09748f4643d287887f8432642f42e6786e6473832328f7d1202a1a23d96f2a06859e8da096b0e6c420df06269b6c2459e67cbceb29b9f569d565931 SHA512 a20b1d16d0d9e4cb0b88c969165eb9514b69a0eaef91eca8a3fb4da08ea8a2db32891de3c8a2a4a97db21bf78f515c7b6f798c59ba155f480f866334fca7986f
+DIST xpad-5.7.0.tar.bz2 162675 BLAKE2B 2166816696d2e00a261fcc8e9483841be7803121dc3669ab35fdd014728f16a47860448dd6b754836a3dfcd0fbbd1805b87e470f96c0b692fbe3a588c81ee35f SHA512 ab9319473cbec9a7022e520e2284853270fccca88ad19e8cb52024ce79a2dd8049251009a22b97e2387de12b9e75576e50d4d17a7236cb8e0eb4c840c3400ef3
 EBUILD xpad-5.4.0.ebuild 694 BLAKE2B 1ad02a6f235dd20b901970bd3fa5c79ac1be011297d8338c956fd7c3894f9f8cb3ed748e9e1aa81bc01196688610ac8bdcf2cdc19d61506e37ef7b6fd078b9a9 SHA512 fb723683e307f951ef6c68fae4e7b5d915178413c71dca5ac04cfd2e54a656bed9898c46627714193db650e2adb4a5f283d6818dae17a60937438bf5c7a87422
-MISC metadata.xml 315 BLAKE2B 502322a145dc802096f144a9fda57a37f3008548dc87acff583fad3806acb8f7c9f69e81e0ec0a4bcf68aceef3388dccc2e203ddad899f210e27cda9ca7cc5fb SHA512 2eec930e9db809f4a8b28997e6aa8c38923333a1c837f0bfcd499f10b6a8064c28a981c13ccebff88c64fd06e799f472f549ba2367a916d853b4bbc35ae40e87
+EBUILD xpad-5.7.0.ebuild 683 BLAKE2B 4a24d0885069aab9affe957b6fd55e39b602184a909ace33416ed4e20bae966d8b9865919c30f659f8506ec61f379a155ee69b3d29defcc12a73fbf75819f6d3 SHA512 f95732abb029dbb8a77382bde28e0b917ff31e8ffb92fa1315d084a047404a0089c10d11344626dfa584ec6b92ba132d1e45bda8be859e73d853efef34df2fa3
+MISC metadata.xml 553 BLAKE2B a46c921ebebf55ac68b39fd00a78cb79038c3c78977f5b1967eb7f8b3f9745a1879bf1703cd2e71abe0f9eda83b4847089da3ecd9ed0c3d8864ff37af15f4866 SHA512 a99de9e46f399383bbe225e2ef1518327e4219e2877eb3a2b56e83e9aa6f79ad18e6e999b642e24212653bb0ad3ae44c47b7bce820562746b8f55859193f9f0c
diff --git a/x11-misc/xpad/metadata.xml b/x11-misc/xpad/metadata.xml
index 8f73356cc3dd..93bd8f933bed 100644
--- a/x11-misc/xpad/metadata.xml
+++ b/x11-misc/xpad/metadata.xml
@@ -1,9 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>rndxelement@protonmail.com</email>
+		<name>Philipp Rösner</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">xpad</remote-id>
-		<changelog>https://launchpadlibrarian.net/253130440/ChangeLog</changelog>
+		<changelog>https://launchpadlibrarian.net/589705902/ChangeLog</changelog>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/xpad/xpad-5.7.0.ebuild b/x11-misc/xpad/xpad-5.7.0.ebuild
new file mode 100644
index 000000000000..f445ca27ceed
--- /dev/null
+++ b/x11-misc/xpad/xpad-5.7.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="A sticky note application for GTK"
+HOMEPAGE="https://launchpad.net/xpad"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+
+RDEPEND="
+	app-accessibility/at-spi2-atk
+	dev-libs/atk
+	>=dev-libs/glib-2.58:2
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3[X]
+	x11-libs/gtksourceview:4
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/pango
+"
+DEPEND="${RDEPEND}"
+BDEPEND=">=dev-util/intltool-0.31
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
diff --git a/x11-misc/xplanet/Manifest b/x11-misc/xplanet/Manifest
index 659a536ce974..dda536e29fd3 100644
--- a/x11-misc/xplanet/Manifest
+++ b/x11-misc/xplanet/Manifest
@@ -3,5 +3,5 @@ AUX xplanet-1.3.1-giflib.patch 1232 BLAKE2B 6f7e5a1c9388ed1d9cb13e6ec38ee53b0b5a
 AUX xplanet-1.3.1-narrowing_conversion.patch 3297 BLAKE2B fc3be555b908c858383c6b2d4bb7d937d01e542729ce6ad0836fe20b555c255794250940496610a3b3e2ec843c8c51fcbbd3661d8786401fa82ad6032231d4e9 SHA512 49ac3b55f7950d327cbc0bef630ff6b3375c3b4501a0b960ce3df13d03daae821db4dfa7c3fb6920376fd3846f175669ba457fe95ae9a51ef532f957fbef1d2a
 AUX xplanet-1.3.1-remove-null-comparison.patch 6773 BLAKE2B 580f2275f40e9c182bcd201906565debd644843ea592f23c62283fb9c9f974ea1bf11e94c793dce24c042b048843165392f065cee37bcea2353527026b29de17 SHA512 a3ac916070eadd2b0dbd33fbe584f5d5d2f621556389f8d0542d591d5b384eb75bfd9e9bd7411b335bfa1e530f638c1c348063a90ebf5ae62ae65995ccb3949d
 DIST xplanet-1.3.1.tar.gz 1236035 BLAKE2B 71a5f856476e11333f5b97b4f7829c4376c570a44433b5a5ba1cfdf7cc425b1c9b89588cac3e0763e0c641a8b93c43bfc5f724fc3b9e3b5b418cabfa7193e0da SHA512 06ce3187fbd364f4ccee768fceca559690c905c870e2fb25ca32453ce09c564ba3455ec539f1e3da177de23a0611f767b375efe2e10b601d09313c0d068e35e0
-EBUILD xplanet-1.3.1-r2.ebuild 1613 BLAKE2B 97974be4ded7281cf455ac51b2d36f11f7c23e486848cfc8141091ae7e43f53f37b1248ca3c36d2910bf2b25b97ba6ac2f208118d6d3f9112ed25a503d65b6b0 SHA512 7afc961c96dda7d72b60a937e5c83a42973cdcaf6461a86100a8824e008daf1f43ff41ffcad2de6e1ab7a47bd37617da35fef615b37348e37ec25f9890352bb2
+EBUILD xplanet-1.3.1-r2.ebuild 1615 BLAKE2B 3bbd11bc9670a86c519205c8f070c80636d9a9dc887ce670d8c1795f30f41fcc302430087c8f1c6910a93f88292a25dd754ebf59bd5f21003d63f2b1a5a6c890 SHA512 5e65727a9eb5763a6f7547c40a81a99ca86a855497bbd8c856d8648bd862602744f893edd1dc226dc7b2930d2690324e4556ff34fd1be303740a3f61927fa1f7
 MISC metadata.xml 330 BLAKE2B 1e8b369bc4399644cf0ead5e59b8dec5d44e3f8e4d9b0bde0aae62d00d08f905dd3add788beae6f239788ade51afb148ed692c7e1f7366013c7fed90e2ab2a02 SHA512 2d7b9ac8f23a3454f909049e7940b55656ab7fc89fdda521f24cf64f92859ac5ea08b972c2f8d09dabed0a322e21221c20807d64b0ae491d5d640da0145b7a61
diff --git a/x11-misc/xplanet/xplanet-1.3.1-r2.ebuild b/x11-misc/xplanet/xplanet-1.3.1-r2.ebuild
index 581d092126e2..c557e893a087 100644
--- a/x11-misc/xplanet/xplanet-1.3.1-r2.ebuild
+++ b/x11-misc/xplanet/xplanet-1.3.1-r2.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
@@ -69,5 +69,5 @@ src_configure() {
 }
 
 src_compile() {
-	emake AR=$(tc-getAR)
+	emake AR="$(tc-getAR)"
 }