gentoo resync : 08.07.2021

27 files changed, 78 insertions, 325 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 23581f818a6e..18245ac4ed24 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/bumblebee/Manifest b/x11-misc/bumblebee/Manifest
index d4f70adddc5a..ae972d7059ed 100644
--- a/x11-misc/bumblebee/Manifest
+++ b/x11-misc/bumblebee/Manifest
@@ -1,12 +1,7 @@
-AUX bumblebee-3.2.1_p20190421-gcc10.patch 2006 BLAKE2B 136c9f5aa38269efa2ef59f410668f1ce5e9976eb377036596a455e27188a88691099eeb7e14b7de92ce0621fc1d36ca32d8301e982fdfe41c138aa7fffc017b SHA512 da2330ca2c915349899a6d7dd525308b02f3ed527b18496ea48889a41f4b4299260d53dab85c78f14a7778576dea47e2d140690c68b61de715cbe0e8722f2031
 AUX bumblebee.confd 60 BLAKE2B 68cfe5dd4db512e10cf82977556336e7bb8eb7ab3f397a2ba5b75c4d5e0856d957a126e741d2c3a45f3453479b42e0b1b42b9aab411eb80de9afc73f3c2ff8bd SHA512 4c773002e372e1696c0922bda91a104ea0ee244eb6beac84a4e7ad2ff1aee265aa248e63c3ad55ea75cabbd36b03d9efa3f8ec3ef708346837ab6a10d6652251
 AUX bumblebee.envd 127 BLAKE2B 2a993cd77706c2da4f90a3a77b4a6d0014b1322c584ae8970d75539b04b5d6a23adac7067a511f4f9d9a47797ac1d55f836c3242d26d0c464f6ea3833dc30ae5 SHA512 f42bd5992a8c80d045036a689e3c33cc2bdb7d54afb03bb7f33a80fa6a9c1e05f583cdec5b3da42021c48c1b59db4664e9c850e48ada47a1887327f7b11633af
-AUX bumblebee.initd 488 BLAKE2B be625ab381b6f588bc86402bfe7aacc8f541c0ebe2f8fdbc4309bdef5dd1cfa44953a3488bde8d0af67b8cf4b14b7b5de77ab125067b6b59379ceba75863fc45 SHA512 5c733a901e2bed20082d01f0db2e8d168106b082f2f6300388edbeec7f5b7a70ddfed908012c8ccf9a3caf070669cfb550368237dd6f8ff62018f8b767012cd7
 AUX bumblebee.initd-r1 500 BLAKE2B c37a4ca616b31b2cc151cae750475178c471ce9e2f7f1a9491a93980a882bd8c1b5baaec8ee2ec211acb77e243b36d6a077a25c14aff96ce01a6a493cd88f4c8 SHA512 a3b7e055eb70c46516319cfc9c9e59038568ad646865bcd5cd953d2774c48c4989c8f2a77f644993543d56fb128fedfdc90904a3370dbf8325300932cf7e1d08
-DIST bumblebee-3.2.1_p20190421.tar.gz 63640 BLAKE2B 62bf3e7556b3cc3651f0e1f9fabd22501b82e78c0820b5ae113fddc24816cefd9c788a33d506944dc971092ae22dc3389ced79da6284a5e812ffad909bb03ebd SHA512 e24de3b60e55828ccbbd85774b9a776ba01b62850489b9d7952c4bf807f080b68d084f11de540a65d1bf78f6a35ce89d35f868de14e7ab9d768cdf21a1d422ec
 DIST bumblebee-3.2.1_p20210112.tar.gz 63840 BLAKE2B 53f433c90ea7925a059597f9ce1e6b764bf204337cda2a87b3e862951fbd86e18cf3bb973a2a43c0ff913e9b290170536760ed9163ea746f5b28b7fed4ce9c6d SHA512 2d23db5a6d2a06c37176440568fd30c3afd80a75e13db00f081c0029f9e03275bf6c7b019778b9c31dcffe49ba56ec86a3303f00074123c95560a850bdb0f36b
-EBUILD bumblebee-3.2.1_p20190421-r1.ebuild 2295 BLAKE2B ee30265b3733279db824a9a97a62428d0c480590543475b18eed9450c1735dafb26410a838467f1ce0c98617b9d705f02015f63ee8e4662847d07c7bab296696 SHA512 e4cb4d0c2083134ca248f59e5d709ab61b36429f13ee2a4f3cff8bb5ea8bbd384d759f7193151bff146c11e96914ac70e6eaa0e88b4d1742b69980aa08f735a7
-EBUILD bumblebee-3.2.1_p20210112-r1.ebuild 2188 BLAKE2B 6501cb6761a95fc3b4eceb1abcb5401f46da02520c38cb457043c90834fe610a5c791df08befff23acca37f26e0ccca7fbeef12fdc6e22c37b3740df40f0ad33 SHA512 b9f7bf526f7804fc9810f16488147b674d30294caa303c2ad6eb2e1c21cf7d06e08e0360852aff5b20ec49517d00244d94337ab8fc2f37f566881a2eae9abe20
 EBUILD bumblebee-3.2.1_p20210112-r4.ebuild 2174 BLAKE2B dd6be54e3cf11824082ac77e8653449d83d222ed593ff2ba4c0f8711253a8655629a79152be3c29a687eb4880197a2fe7fad14e3b59aab7fe903013714fe2d67 SHA512 41cda744892a62394e79c7a4b413ebd021b97f941c467f4a9e84ea500f8db6578e7446d2dd389cedd4482c9cf9b260503f084c599e50a31b5f6838c8465a19ba
 EBUILD bumblebee-9999.ebuild 2176 BLAKE2B 1207d11b71af20d2c0d301d852ce487289890d93d7a5852076597c2d58ea658d8e441e0e4ef64f6d82625ee20a6ba372d9339a253ed6146544b951fdd45701b2 SHA512 8cb18a00f1880bdd472f3816451cfd252a9e088790c68baff1f9034b0486368c19839ffa119ad1a315981aa2e18b7fefda4f73fa4e6021ce5d2ccb3512ed0a55
 MISC metadata.xml 1143 BLAKE2B 2f0cc1faa1d3cf4bbb1bad28b72bdf32ffbace0ef02ecefb2a786401bb23123233b647860b0a0b1b7f24e37dc11470a820b1799ac6fd8e716f8b2c8f05d95677 SHA512 e1098847284529bf6840c313198664dfc037abf0a812e22f93a55d6cced08b0d49eb12316b7ca12c26728a3560dd5a5527b01fb218f6857e9a991cfd75b90bf3
diff --git a/x11-misc/bumblebee/bumblebee-3.2.1_p20190421-r1.ebuild b/x11-misc/bumblebee/bumblebee-3.2.1_p20190421-r1.ebuild
deleted file mode 100644
index 3c344ba46d4d..000000000000
--- a/x11-misc/bumblebee/bumblebee-3.2.1_p20190421-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools readme.gentoo-r1 systemd user
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Bumblebee-Project/Bumblebee.git"
-	EGIT_BRANCH="develop"
-else
-	COMMIT="7aa457fe7b4fffc3b175ad36fdae00d7777065dc"
-	SRC_URI="https://github.com/Bumblebee-Project/Bumblebee/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-
-	S="${WORKDIR}/Bumblebee-${COMMIT}"
-fi
-
-DESCRIPTION="Service providing elegant and stable means of managing Optimus graphics chipsets"
-HOMEPAGE="https://bumblebee-project.org https://github.com/Bumblebee-Project/Bumblebee"
-
-SLOT="0"
-LICENSE="GPL-3"
-
-IUSE="+bbswitch video_cards_nouveau video_cards_nvidia"
-
-COMMON_DEPEND="
-	dev-libs/glib:2
-	dev-libs/libbsd
-	sys-apps/kmod
-	x11-libs/libX11
-"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/opengl
-	x11-base/xorg-drivers[video_cards_nvidia?,video_cards_nouveau?]
-	bbswitch? ( sys-power/bbswitch )
-"
-
-DEPEND="${COMMON_DEPEND}
-	sys-apps/help2man
-	virtual/pkgconfig
-"
-
-PDEPEND="
-	|| (
-		x11-misc/primus
-		x11-misc/virtualgl
-	)
-"
-
-REQUIRED_USE="|| ( video_cards_nouveau video_cards_nvidia )"
-
-PATCHES=(
-	# https://github.com/Bumblebee-Project/Bumblebee/issues/1058
-	"${FILESDIR}/${P}-gcc10.patch"
-)
-
-pkg_setup() {
-	enewgroup bumblebee
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	if use video_cards_nvidia ; then
-		# Get paths to GL libs for all ABIs
-		local i nvlib=""
-		for i in  $(get_all_libdirs) ; do
-			nvlib="${nvlib}:/usr/${i}/opengl/nvidia/lib"
-		done
-
-		local nvpref="/usr/$(get_libdir)/opengl/nvidia"
-		local xorgpref="/usr/$(get_libdir)/xorg/modules"
-		ECONF_PARAMS="CONF_DRIVER=nvidia CONF_DRIVER_MODULE_NVIDIA=nvidia \
-			CONF_LDPATH_NVIDIA=${nvlib#:} \
-			CONF_MODPATH_NVIDIA=${nvpref}/lib,${nvpref}/extensions,${xorgpref}/drivers,${xorgpref}"
-	fi
-
-	econf \
-		${ECONF_PARAMS}
-}
-
-src_install() {
-	default
-
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newenvd "${FILESDIR}"/${PN}.envd 99${PN}
-	systemd_dounit scripts/systemd/bumblebeed.service
-
-	local DOC_CONTENTS="In order to use Bumblebee, add your user to 'bumblebee' group.
-		You may need to setup your /etc/bumblebee/bumblebee.conf"
-	readme.gentoo_create_doc
-}
diff --git a/x11-misc/bumblebee/bumblebee-3.2.1_p20210112-r1.ebuild b/x11-misc/bumblebee/bumblebee-3.2.1_p20210112-r1.ebuild
deleted file mode 100644
index 4984d378312b..000000000000
--- a/x11-misc/bumblebee/bumblebee-3.2.1_p20210112-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools readme.gentoo-r1 systemd user
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Bumblebee-Project/Bumblebee.git"
-	EGIT_BRANCH="develop"
-else
-	COMMIT="8f3d307b6aabbc2cd8444c6e5a4360f3bf2915ec"
-	SRC_URI="https://github.com/Bumblebee-Project/Bumblebee/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-
-	S="${WORKDIR}/Bumblebee-${COMMIT}"
-fi
-
-DESCRIPTION="Service providing elegant and stable means of managing Optimus graphics chipsets"
-HOMEPAGE="https://bumblebee-project.org https://github.com/Bumblebee-Project/Bumblebee"
-
-SLOT="0"
-LICENSE="GPL-3"
-
-IUSE="+bbswitch video_cards_nouveau video_cards_nvidia"
-
-COMMON_DEPEND="
-	dev-libs/glib:2
-	dev-libs/libbsd
-	sys-apps/kmod
-	x11-libs/libX11
-"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/opengl
-	x11-base/xorg-drivers[video_cards_nvidia?,video_cards_nouveau?]
-	bbswitch? ( sys-power/bbswitch )
-"
-
-DEPEND="${COMMON_DEPEND}
-	sys-apps/help2man
-	virtual/pkgconfig
-"
-
-PDEPEND="
-	|| (
-		x11-misc/primus
-		x11-misc/virtualgl
-	)
-"
-
-REQUIRED_USE="|| ( video_cards_nouveau video_cards_nvidia )"
-
-pkg_setup() {
-	enewgroup bumblebee
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	if use video_cards_nvidia ; then
-		# Get paths to GL libs for all ABIs
-		local i nvlib=""
-		for i in  $(get_all_libdirs) ; do
-			nvlib="${nvlib}:/usr/${i}/opengl/nvidia/lib"
-		done
-
-		local nvpref="/usr/$(get_libdir)/opengl/nvidia"
-		local xorgpref="/usr/$(get_libdir)/xorg/modules"
-		ECONF_PARAMS="CONF_DRIVER=nvidia CONF_DRIVER_MODULE_NVIDIA=nvidia \
-			CONF_LDPATH_NVIDIA=${nvlib#:} \
-			CONF_MODPATH_NVIDIA=${nvpref}/lib,${nvpref}/extensions,${xorgpref}/drivers,${xorgpref}"
-	fi
-
-	econf \
-		${ECONF_PARAMS}
-}
-
-src_install() {
-	default
-
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newenvd "${FILESDIR}"/${PN}.envd 99${PN}
-	systemd_dounit scripts/systemd/bumblebeed.service
-
-	local DOC_CONTENTS="In order to use Bumblebee, add your user to 'bumblebee' group.
-		You may need to setup your /etc/bumblebee/bumblebee.conf"
-	readme.gentoo_create_doc
-}
diff --git a/x11-misc/bumblebee/files/bumblebee-3.2.1_p20190421-gcc10.patch b/x11-misc/bumblebee/files/bumblebee-3.2.1_p20190421-gcc10.patch
deleted file mode 100644
index 7d02226521e4..000000000000
--- a/x11-misc/bumblebee/files/bumblebee-3.2.1_p20190421-gcc10.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Author: Andreas Beckmann <anbe@debian.org>
-Description: fix FTBFS with gcc-10
- gcc-10 defaults to -fno-common
- see https://gcc.gnu.org/gcc-10/porting_to.html
-Bug-Debian: https://bugs.debian.org/957058
-
---- a/src/bbconfig.h
-+++ b/src/bbconfig.h
-@@ -103,7 +103,7 @@ enum bb_pm_method {
-     PM_VGASWITCHEROO,
-     PM_METHODS_COUNT /* not a method but a marker for the end */
- };
--const char *bb_pm_method_string[PM_METHODS_COUNT];
-+extern const char *bb_pm_method_string[PM_METHODS_COUNT];
- 
- /* String buffer size */
- #define BUFFER_SIZE 1024
---- a/src/switch/switching.h
-+++ b/src/switch/switching.h
-@@ -60,10 +60,10 @@ void switcheroo_off(void);
- 
- /* number of switchers as defined in switching.c */
- #define SWITCHERS_COUNT 2
--struct switching_method switching_methods[SWITCHERS_COUNT];
-+extern struct switching_method switching_methods[SWITCHERS_COUNT];
- 
- /* A switching method that can be used or NULL if none */
--struct switching_method *switcher;
-+extern struct switching_method *switcher;
- 
- struct switching_method *switcher_detect(const char *name, struct switch_info);
- enum switch_state switch_status(void);
---- a/src/bbsecondary.h
-+++ b/src/bbsecondary.h
-@@ -21,7 +21,7 @@
- #pragma once
- 
- /* PCI Bus ID of the discrete video card */
--struct pci_bus_id *pci_bus_id_discrete;
-+extern struct pci_bus_id *pci_bus_id_discrete;
- 
- /// Start the X server by fork-exec, turn card on if needed.
- bool start_secondary(bool);
---- a/src/switch/switching.c
-+++ b/src/switch/switching.c
-@@ -31,6 +31,8 @@ struct switching_method switching_method
-           switcheroo_on, switcheroo_off}
- };
- 
-+struct switching_method *switcher = NULL;
-+
- /**
-  * Enumerates through available switching methods and try a method
-  * 
---- a/src/bbsecondary.c
-+++ b/src/bbsecondary.c
-@@ -37,6 +37,9 @@
- #include "pci.h"
- #include "module.h"
- 
-+/* PCI Bus ID of the discrete video card */
-+struct pci_bus_id *pci_bus_id_discrete;
-+
- /**
-  * Substitutes DRIVER in the passed path
-  * @param x_conf_file A path to be processed
diff --git a/x11-misc/bumblebee/files/bumblebee.initd b/x11-misc/bumblebee/files/bumblebee.initd
deleted file mode 100644
index b9296538a80b..000000000000
--- a/x11-misc/bumblebee/files/bumblebee.initd
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need xdm
-	want vgl
-}
-
-PIDFILE="${PIDFILE:-/var/run/bumblebee.pid}"
-
-start() {
-	ebegin "Starting BumbleBee Daemon"
-		start-stop-daemon -S -p "${PIDFILE}" -x /usr/sbin/bumblebeed -- -D ${BUMBLEBEE_EXTRA_OPTS} --pidfile "${PIDFILE}"
-	eend $?
-}
-
-stop() {
-
-	ebegin "Stopping BumbleBee Daemon"
-		start-stop-daemon -K -p "${PIDFILE}" -R SIGTERM/10
-	eend $?
-}
diff --git a/x11-misc/compose-tables/Manifest b/x11-misc/compose-tables/Manifest
index d47eb7ddc649..c99e1ce5ce61 100644
--- a/x11-misc/compose-tables/Manifest
+++ b/x11-misc/compose-tables/Manifest
@@ -3,5 +3,5 @@ DIST libX11-1.7.1.tar.bz2 2426509 BLAKE2B 18db9146f1d1907bccc4c5a48c8d6707b070b8
 DIST libX11-1.7.2.tar.bz2 2392982 BLAKE2B ce64bd8172fcf4f5bf0783c4f25f4d220fa0eceb211b7a852802256f7241f543769565f70a59c1ff14e0bb1ae7d3f05914f8f0b1bd423dcb20181cfb2227c70d SHA512 d01e5c1848c76218605e5af2d353de6b301a251555b52a38dbe930e6635d5e8a92d1486eb6d328ad5d42a5939e0d16868ffa19a75e5a7863d1a32e0d0727bdc7
 EBUILD compose-tables-1.7.0.ebuild 875 BLAKE2B 175050ee8e184a4f740f4fc2bbfc55076ffd7609ab1736f0f8fa915d5c58938734e8d2f8bcc4e4554e4a41987b62d1bde5d427a9b16a3fb3a175a4639ca7c99f SHA512 8b38cb39673e97611c30dfb27e0a6bb751c9c9027e098fa09da52d31322cf8c17fa8052906c2aa6238d7253c66c31d9a6a67927af2ee93c8ef9f2570146f5828
 EBUILD compose-tables-1.7.1.ebuild 921 BLAKE2B 17b09ddcc3e3edb7f3680b303de817b1fa68e0b092b81e574bce64c738673a7406d412413f89f46fb5cd99b62e5f0e1db48ebfea0f7eaf0bf84d818820f959a5 SHA512 529bdff9f93c80a549f2dbee98aa78b5e4063ab4edf4dbcd93825b9fde10a847ff4a7af95b42cd71f56b9db39319331869101f3eb000daa65ef8d0cab07cd1b0
-EBUILD compose-tables-1.7.2.ebuild 928 BLAKE2B 306c0bde8c01204acf186e4f5dfac859bb382f4f6a1059d806ab41c86dbe836bea8935f461639c83f3796759f6c1401b155b16d20794638cfc039b81f6eaa6bf SHA512 117ef2953a815b3ffdf102c8e7ea8724b2f26ef19f930dad449e46eeba2a598bee22ba3fb59fb1096da7685a05b8d331a27411cff7f2153492f04d730b14a790
+EBUILD compose-tables-1.7.2.ebuild 926 BLAKE2B 998346d5e3eae7077dfa3419e4e20e3d50d1100baacb2c5a093b7f7e3ecdee5cce5f7ab556ab0869a23b2dfe63c72199390b0680fd987206eb7e302fc60ce561 SHA512 af64c60c001b100651d12fe3e6321da48ddab7b188318b5d2139d137ebd7553b10292146b6d88f8934b1e64a826569f1ddf36fad03682ec63e0d9fe8c38dd30e
 MISC metadata.xml 311 BLAKE2B 1e5deaa311245a5794e72574f94028f60c1c712a06820551cae811b113d633816a60fd3920ff5f2ca287558dbcff28e57537d5c0d3ee3a325c7540bc0b98da13 SHA512 760d09a1ed93bf16d8e26a70fa1178c02c6b336dff9aa29f900d5eff305686b9c3fae4bc93bcce58c0427f567d3759dd3a8adcd8707d07fdd90c6db79d4e13f2
diff --git a/x11-misc/compose-tables/compose-tables-1.7.2.ebuild b/x11-misc/compose-tables/compose-tables-1.7.2.ebuild
index 759d3b58ed5b..712cf489a8a0 100644
--- a/x11-misc/compose-tables/compose-tables-1.7.2.ebuild
+++ b/x11-misc/compose-tables/compose-tables-1.7.2.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="X.Org Compose Key tables from libX11"
 SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/lib/libX11-${PV}.tar.${XORG_TARBALL_SUFFIX}"
 S="${WORKDIR}/libX11-${PV}/"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 # Only needed by configure
 DEPEND="
diff --git a/x11-misc/devilspie2/Manifest b/x11-misc/devilspie2/Manifest
index d70bc83a148c..93ec009fd3fb 100644
--- a/x11-misc/devilspie2/Manifest
+++ b/x11-misc/devilspie2/Manifest
@@ -1,4 +1,4 @@
 AUX devilspie2-0.43-lua-pkgconfig.patch 551 BLAKE2B 915dc2939517efa56bafce78c748ab061885eb320b1b902642fe3bc42125c1c94b81bc085ca0a5763550ed3a87f8aef2c67e2e6b80b40c870da0bdc50a7dd57f SHA512 82b2acc0d858daf70ed44f6f8acdf69c54926ac0aa9f350b656f06a7d22e5bdff4b20293bff3fcf95149c96a63c68bfbc6f739f48bbf2c28810f6e8964166148
 DIST devilspie2_0.43-src.tar.gz 48666 BLAKE2B 3657693547f1dbdfe8542f123601f228086261855dc8e99997cea76ef586b744aacb260222000300dbe34d3030646044fc046e94c2285e6386995853ceaaffda SHA512 0f44f3991e31f68a2d38eac32ea6fe4275a56e8b5e9439490d1e819fd69b5455ede565aa2b09b70c20ac852c465ac2c05c339ae1e5c1b7824685c46a28871abd
-EBUILD devilspie2-0.43-r100.ebuild 1041 BLAKE2B 82a3982c1e2be07735315f4209462b9aabc6142f74d90267e1269ce19a120be10c345a70daeaf9923980c8a914064857cb1ced83b903367ed6786cf26b37213e SHA512 21332620d2225c00d42d23140d1b0d6097871744aa231598703252e725934e6bd64a697ae7a0180d1a1461b14537d8d54202e59730a1f67ef453dabdf2419dda
+EBUILD devilspie2-0.43-r100.ebuild 1050 BLAKE2B c530c3ce2d1cb7a930ce6ea6b0e9b1caefc540b5702c5030001408e6b1758763ad0fbc9700336ffe41779e2db8d3931ef0166544c772a5c1f82ca34ba6a382eb SHA512 72fcb6ea1af22aaa1029eaf349ef4bcb524022b34597f3378930bd8a66d667150d5d8b88202e33f1790f8946e70bab866df7af0916e234df06309c8ae099b5b2
 MISC metadata.xml 245 BLAKE2B 33d86327929801f107536147a5d58d3550471eb2f1635cd44ef84803cd8f09fd38c022336ebca0a1f8469009c75e33dd94b4f6775433a7ab537c93fe6e4e36b5 SHA512 e2effe9206b78650b406186fc5c054f5b9e269de793af596a58d32e7a17b376eac0ddc3177738f6b74076f46c5d33c774c28db9683870d9791f2aad7954782d3
diff --git a/x11-misc/devilspie2/devilspie2-0.43-r100.ebuild b/x11-misc/devilspie2/devilspie2-0.43-r100.ebuild
index ffca8f7fa9be..abeaa7126aa3 100644
--- a/x11-misc/devilspie2/devilspie2-0.43-r100.ebuild
+++ b/x11-misc/devilspie2/devilspie2-0.43-r100.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 LUA_COMPAT=( lua5-{1..3} luajit )
 PLOCALES="fi fr it ja nl pt_BR ru sv"
 
-inherit lua-single toolchain-funcs l10n
+inherit lua-single plocale toolchain-funcs
 
 DESCRIPTION="Devilspie like window matching utility, using LUA for scripting"
 HOMEPAGE="https://www.nongnu.org/devilspie2/"
@@ -39,11 +39,11 @@ PATCHES=(
 
 src_compile() {
 	tc-export PKG_CONFIG
-	emake CC="$(tc-getCC)" PREFIX="/usr" LANGUAGES="$(l10n_get_locales)"
+	emake CC="$(tc-getCC)" PREFIX="/usr" LANGUAGES="$(plocale_get_locales)"
 }
 
 src_install() {
-	emake PREFIX="/usr" DESTDIR="${ED}" LANGUAGES="$(l10n_get_locales)" install
+	emake PREFIX="/usr" DESTDIR="${ED}" LANGUAGES="$(plocale_get_locales)" install
 	einstalldocs
 	doman devilspie2.1
 }
diff --git a/x11-misc/qcomicbook/Manifest b/x11-misc/qcomicbook/Manifest
index 1ea0d3edb6cc..d6d76415f53b 100644
--- a/x11-misc/qcomicbook/Manifest
+++ b/x11-misc/qcomicbook/Manifest
@@ -1,3 +1,3 @@
 DIST qcomicbook-0.9.1.tar.gz 739887 BLAKE2B c4072e849f173bc6014e1765adc18ac359e5508b5c6bb110782bb92c81fe7683911a68910976cba16263950d9ac9b9ad53de44c4cd692d0bd24374c38012ebbe SHA512 87bd983c4442e220f1bc463e54e0ea583cddbc6becd9eec64801dc5e7e061cdac5805cba83167685ab454e41fcce329fa399d622d7f588940bf057ce4b1f423d
-EBUILD qcomicbook-0.9.1.ebuild 1621 BLAKE2B b42a54d50841d54c6bc88a4ceddce1727ba5b8f3553dda6d8ee76a089452a7a2aa8428f1bdbdb3fea7c53d6a0a93de1387b4ccf53d2afc9d4fd35104b36aa20c SHA512 0851e70d9161b6c323e41d7a0909ebe1b1fbf1f60b41ae3db54541ee7a0775b8f3577577abe5d146a01662683c8e198ad68eaea2d8000f0e6182a1bf97e2a1f8
+EBUILD qcomicbook-0.9.1.ebuild 1618 BLAKE2B 6ff4735640de8d7ad1b6569708dd76b0f99337213ca78d87b5313da3629be03c32cf010723ccf42742da4288000ed63353d3b6d6cc6247f70156b705bbee067e SHA512 f107816837786bca58db00e0847b810dae50b8eb2fa856c216a7ce9a5c3cecafe94b73e1c96eb2c95f61a8a9053dc359f4bed7f437e01a2309eb0c30230b99a6
 MISC metadata.xml 469 BLAKE2B 11613d3dd131dbbe025d0b8a72a98b6ea00e703129311bccafadfa33fb0bb812795bf8de26ccfb6fdb227db7c97cbdd0d09349eaa99bf6a7b85e6a9318e55039 SHA512 77530a25b63eab9ccef878c01440f72e1c6b96b0658b9973870d1174d1ac7c8f0a935120d7f60ba7e2bc292f4cd879be27a4488a2db41eeb39658067d346dab1
diff --git a/x11-misc/qcomicbook/qcomicbook-0.9.1.ebuild b/x11-misc/qcomicbook/qcomicbook-0.9.1.ebuild
index e17000ce7a5a..ea3d5ea091c0 100644
--- a/x11-misc/qcomicbook/qcomicbook-0.9.1.ebuild
+++ b/x11-misc/qcomicbook/qcomicbook-0.9.1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 MY_PN="QComicBook"
 CMAKE_IN_SOURCE_BUILD=1
 PLOCALES="cs_CZ de_DE es_ES fi_FI fr_CA fr_FR it_IT ko_KR nl_NL pl_PL pt_BR ru_RU uk_UA zh_CN"
-inherit cmake flag-o-matic l10n xdg
+inherit cmake flag-o-matic plocale xdg
 
 DESCRIPTION="Viewer for comic book archives containing jpeg/png images"
 HOMEPAGE="https://github.com/stolowski/QComicBook"
@@ -36,8 +36,8 @@ src_prepare() {
 		rm "i18n/${PN}_${1}.ts" || die "removing ${1} locale failed"
 	}
 	rm "i18n/${PN}_en_EN.ts" || die 'removing redundant english locale failed'
-	l10n_find_plocales_changes "i18n" "${PN}_" ".ts"
-	l10n_for_each_disabled_locale_do rm_loc
+	plocale_find_changes "i18n" "${PN}_" ".ts"
+	plocale_for_each_disabled_locale rm_loc
 
 	# fix desktop file
 	sed -e '/^Encoding/d' \
diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index 45d184331a5d..7441c0f89706 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -9,5 +9,5 @@ AUX sddm-0.18.1-revert-honor-PAM-supplemental-groups.patch 3616 BLAKE2B 71a4c6f5
 DIST sddm-0.15.0.tar.gz 3520188 BLAKE2B b29a994a0ea2fbbda3f5eaf16885fdfa513a759e5db4d879eed2a7cae1472b90124d2ca65404edae8727a047a9d761b72382dc9ddb206f8dc35b5101856cf377 SHA512 4440acfc6f98ab8efe8e3a441e8dc9ee98615c3544f8adc899bc4f0334e4f1b0d37c1ef823b32cc466adc8fac942cd188b33eb49795e0468a136a959c65c7566
 DIST sddm-0.18.1.tar.xz 3402972 BLAKE2B 99ab43d374e9a3d318f692a6d496d8a6d68927af3c8e8fc2208d7355ec90649a14758b39f5733dd32f942ed569de88085576d4f5f8666f4f97079e0fb6dcb99e SHA512 ff0637600cda2f4da1f643f047f8ee822bd9651ae4ccbb614b9804175c97360ada7af93e07a7b63832f014ef6e7d1b5380ab2b8959f8024ea520fa5ff17efd60
 EBUILD sddm-0.15.0-r2.ebuild 1477 BLAKE2B d9117fb9826beed879b15947f1830c5731fb192651f4e8d68984af87db5008a09c6e877605b13f88e8157477e4282007311106302f1c1574968ac8859b5f0908 SHA512 2864550f8a62a281f8211d93d5ccb1765b328323db83d13223626610122f6d36407508af55f35dcd834a915278c36da2c50270236e5f18fa052b4862218ab1a7
-EBUILD sddm-0.18.1-r5.ebuild 3130 BLAKE2B 3e88c9205b50fd5c6b008ca2eb0b179e359c3e94b0eb2718ef4b3eb1eedafce3bf75ff28932489b882f064a7f8b4717fc089f8e13ae67911c3e83dbed36e9364 SHA512 c98b700fc5ca7ba565bd1fa0d8b30f4f7d6666931160cae7c081c232e1e319aaaf15ca3344178b5d4ecac272b0b18f760d4fb1465121e467884800766d7f500a
+EBUILD sddm-0.18.1-r5.ebuild 3127 BLAKE2B aae71377912127d2a52fc8f007ee02fcfef2be6de42567416bbd917a0b456cb82cf432ad10ce513793d054bd3096a3b5d671579ab33719b4562997ac33f5e96e SHA512 f7bd2f7d23c05e0de84bde93ef73b09985cde1f60e4d2d84d5b4206cd0b1b9d0abd96583636f77f4f10a7bb5e73ab18b7e2a99882d769521a344a1fd1dcd49b0
 MISC metadata.xml 818 BLAKE2B 2be9c3e50193b2c6117a5447ecc9e718d74a44997f8cbeea66905115ced465ea371cf596b5b366cbc4ebb46ecb41015668b96e44e23e7b3dba583e388e78b85a SHA512 c6910844830c10a5602afa3269ffd8eeb4a1a0b2ae345fea5ca0de11f3856cbbcec86cc95930070274d8e5025b4111f1ec0c7af1721c7ed71ce5ebc428adc0d7
diff --git a/x11-misc/sddm/sddm-0.18.1-r5.ebuild b/x11-misc/sddm/sddm-0.18.1-r5.ebuild
index 2461112b8232..504fb2a2a9eb 100644
--- a/x11-misc/sddm/sddm-0.18.1-r5.ebuild
+++ b/x11-misc/sddm/sddm-0.18.1-r5.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PLOCALES="ar bn ca cs da de es et fi fr hi_IN hu is it ja kk ko lt lv nb nl nn pl pt_BR pt_PT ro ru sk sr sr@ijekavian sr@ijekavianlatin sr@latin sv tr uk zh_CN zh_TW"
-inherit cmake l10n systemd user
+inherit cmake plocale systemd user
 
 DESCRIPTION="Simple Desktop Display Manager"
 HOMEPAGE="https://github.com/sddm/sddm"
@@ -62,8 +62,8 @@ src_prepare() {
 	disable_locale() {
 		sed -e "/${1}\.ts/d" -i data/translations/CMakeLists.txt || die
 	}
-	l10n_find_plocales_changes "data/translations" "" ".ts"
-	l10n_for_each_disabled_locale_do disable_locale
+	plocale_find_changes "data/translations" "" ".ts"
+	plocale_for_each_disabled_locale disable_locale
 
 	if ! use test; then
 		sed -e "/^find_package/s/ Test//" -i CMakeLists.txt || die
diff --git a/x11-misc/synergy/Manifest b/x11-misc/synergy/Manifest
index 01a0ebf097b2..3f2783f1f2dc 100644
--- a/x11-misc/synergy/Manifest
+++ b/x11-misc/synergy/Manifest
@@ -7,5 +7,5 @@ DIST synergy-core-1.14.0.4-stable.tar.gz 8835907 BLAKE2B 56e59eb3494e9823feca774
 EBUILD synergy-1.13.1.41.ebuild 2465 BLAKE2B 4c841e8b2643d6098a99f6ca929d4dc0e40dfddc797c27920a440c8d6488931c275aa2112489055912b51a5e1745bed54198a8d1452dbedfb7b9a1afb2f61be8 SHA512 5916ec2e135a39fd83491f83d5953f6583501d13f1527319ad777799721d1eede814ffb1840f5884d5490fa6704a5e724ddfcc5260be231effed43345c9c1b9a
 EBUILD synergy-1.14.0.1_rc.ebuild 2415 BLAKE2B 41e7f53b0093101befa373b87a2c1f2ffec5bff8ff8079f3bb07c772bec14999d7bbc2dd87313febb0e5a3893435b2230c468e20fedd655387475c52ca409a50 SHA512 b39d269e192138615d32dfbcd9e3953f1704cda8174a1063128978d7b79b31216f52f9e611f72b4eeb35a54eddc39c1512c319d836666e14398c184e3d9b0de8
 EBUILD synergy-1.14.0.3_rc.ebuild 2415 BLAKE2B 41e7f53b0093101befa373b87a2c1f2ffec5bff8ff8079f3bb07c772bec14999d7bbc2dd87313febb0e5a3893435b2230c468e20fedd655387475c52ca409a50 SHA512 b39d269e192138615d32dfbcd9e3953f1704cda8174a1063128978d7b79b31216f52f9e611f72b4eeb35a54eddc39c1512c319d836666e14398c184e3d9b0de8
-EBUILD synergy-1.14.0.4.ebuild 2415 BLAKE2B 41e7f53b0093101befa373b87a2c1f2ffec5bff8ff8079f3bb07c772bec14999d7bbc2dd87313febb0e5a3893435b2230c468e20fedd655387475c52ca409a50 SHA512 b39d269e192138615d32dfbcd9e3953f1704cda8174a1063128978d7b79b31216f52f9e611f72b4eeb35a54eddc39c1512c319d836666e14398c184e3d9b0de8
+EBUILD synergy-1.14.0.4.ebuild 2414 BLAKE2B 983fa1220ce23f718a5752c2a443329db5e1cfaa30ed163c226087c9b7ab91b3d99c8161919ebb58082813e7a0777671aaccec16811cf1fd1f251af470bbb0c6 SHA512 13179e57fd96223b40c0670e3a723fefab3fa876c5fd0578e386b5f240ffb147fb9b54f9d58b5d70188795e9531a8c5efe05e93b05721c54458628eeda22f80f
 MISC metadata.xml 332 BLAKE2B 04a719c2b19204a1ea7ed755c89b072b271760a85f3b2b7e734796deca104682c147372a1d154d4fdb493d7025e16cfc2012e7d352fdc88dde93d0f3df477b67 SHA512 8c447ce795a81157c40a2839d8845d6db89ee768f70aa397b686b5ec9a7e59fc66f9fec5561e25ab0aed68bcabc369c0c53660ee2a0b7e24b52e169d5debaae0
diff --git a/x11-misc/synergy/synergy-1.14.0.4.ebuild b/x11-misc/synergy/synergy-1.14.0.4.ebuild
index e621bed9e265..49ab5d9c2aec 100644
--- a/x11-misc/synergy/synergy-1.14.0.4.ebuild
+++ b/x11-misc/synergy/synergy-1.14.0.4.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="gui test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-misc/vym/Manifest b/x11-misc/vym/Manifest
index a3457e6fb744..f247b68ad3ec 100644
--- a/x11-misc/vym/Manifest
+++ b/x11-misc/vym/Manifest
@@ -1,4 +1,4 @@
 DIST vym-2.7.1.tar.bz2 6718924 BLAKE2B d7be8f2d40cedabb1bfaa3b89aac64de5e579f56ebfd757c22d4393ee712c4c4f5bf4747037683e4c6640ab0556ce4ef34bac5b27ecb747a15e58443d57f229f SHA512 985dbf18f743c36b484050ae24e4392eeae701c6c72fca6bd3dc5b70b38a283211946e279804c66253b5a394a642683ca4e3a66a7288400a9193fbcbfd8c9582
-EBUILD vym-2.7.1.ebuild 1475 BLAKE2B fb407bfa0e3656b239c015cb6c5352026c7a9788c3c61d9639d4ebb6a567908a81972ab3c83c34f9b400106530618426958ed82dfc7eb505499da1e7c755d522 SHA512 1c9961efe8d0954fb2c80f42ca37581a8b23bca5023d45aee12ca398671f2953c49d55b6224309d74da5801af3df0932b6c2cde3f5da374f4ed9bc318f33ee49
-EBUILD vym-9999.ebuild 1441 BLAKE2B c6e3fa76d8a9ae59fb3553ad74ab98ef9e87908bcb2b4d1de9ba04e8f5411b82a7a2dd48b84e7dcbe6f6e4b09d50aff8e07ef2c62e4b2d1ee57ff139da2fee37 SHA512 fdd28c46a845a188323c6a184da99ba9966ff6ae11bf455796416b3228219b90042a266153c29a2d553362a01e4110c7294a1452dee0f330da1900752af1d326
+EBUILD vym-2.7.1.ebuild 1472 BLAKE2B 3ebeb8b14a89d3ed9693b4f6cd16912a23605258d57e9c5a8477997efc866c50466a609747dd88df4f02f27921fd4471c4bd7ab54effbf0390aebd97b1f40115 SHA512 f89e4dd6306a4e91e04363a17e75c3e6369ec981b6617162c9ede8b07e8acd3ea4305fae398ebc65ecb60a28c945278846b23180fa1f9a6e113b09bc02caa840
+EBUILD vym-9999.ebuild 1438 BLAKE2B de14c0e7d4271d41c111bd0f7ee03fe9bea905ef5c07d4e919e674e5abe2320ec1680752d4f17e348c66515ef481c56eea6676a293aaa87e04633a5a47ae6281 SHA512 62f644a969e0c05047ee1cc40e474e4588ebf3074ca8b1f043f24f21f2e46b80ed3dafe05c5c187debce4b135fad984dcb31f23ee696724d5a6e780e74f9c664
 MISC metadata.xml 349 BLAKE2B 2cddfba3480871cb020e1ea5ac3c8af1f0c5be07b9e41880fbf5a36301cd283e941e8c7d8ac47dc27613364e2a003784811c721d31ce2c768d83ea7d86dd2982 SHA512 968e3560ba95072811086fd007ec5397467a9e520ec3bb368c7c3617b94d222fbb3c3929b5b9694e1bebc6af9e736dd17a43321e38e1999c562192687561cca9
diff --git a/x11-misc/vym/vym-2.7.1.ebuild b/x11-misc/vym/vym-2.7.1.ebuild
index 1635a0a689ac..8cbb3269c7c9 100644
--- a/x11-misc/vym/vym-2.7.1.ebuild
+++ b/x11-misc/vym/vym-2.7.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 PLOCALES="cs_CZ de_DE el es fr hr_HR ia it ja pt_BR ru sv zh_CN zh_TW"
-inherit desktop l10n qmake-utils
+inherit desktop plocale qmake-utils
 
 DESCRIPTION="View Your Mind, a mindmap tool"
 HOMEPAGE="https://www.insilmaril.de/vym/"
@@ -55,8 +55,8 @@ src_prepare() {
 	rm lang/vym.en.ts || die
 	remove_locale en
 
-	l10n_find_plocales_changes lang ${PN}. .ts
-	l10n_for_each_disabled_locale_do remove_locale
+	plocale_find_changes lang ${PN}. .ts
+	plocale_for_each_disabled_locale remove_locale
 
 	"$(qt5_get_bindir)"/lrelease vym.pro || die
 }
diff --git a/x11-misc/vym/vym-9999.ebuild b/x11-misc/vym/vym-9999.ebuild
index a5984727412e..d1943a94621b 100644
--- a/x11-misc/vym/vym-9999.ebuild
+++ b/x11-misc/vym/vym-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 PLOCALES="cs_CZ de_DE el es fr hr_HR ia it ja pt_BR ru sv zh_CN zh_TW"
-inherit desktop git-r3 l10n qmake-utils
+inherit desktop git-r3 plocale qmake-utils
 
 DESCRIPTION="View Your Mind, a mindmap tool"
 HOMEPAGE="https://www.insilmaril.de/vym/"
@@ -54,8 +54,8 @@ src_prepare() {
 	rm lang/vym.en.ts || die
 	remove_locale en
 
-	l10n_find_plocales_changes lang ${PN}. .ts
-	l10n_for_each_disabled_locale_do remove_locale
+	plocale_find_changes lang ${PN}. .ts
+	plocale_for_each_disabled_locale remove_locale
 
 	"$(qt5_get_bindir)"/lrelease vym.pro || die
 }
diff --git a/x11-misc/xclip/Manifest b/x11-misc/xclip/Manifest
index bb9965b531b6..eca32e7f50f3 100644
--- a/x11-misc/xclip/Manifest
+++ b/x11-misc/xclip/Manifest
@@ -1,4 +1,4 @@
 DIST xclip-0.13.tar.gz 30461 BLAKE2B e5249c81aceca59f71eeee985ab4a4c9006b6afef98f3f6addd7adc590abea47d3e9df8110ccb6c0c065cf4356a2a2a0866e08604adbac75e3589bb97403aaa0 SHA512 191a86194a1503a47c6641a55855dc4aaa8c2c99d2e6f1d46e727feec85a6639041f37ec2265c05c178c0c7d791d3e88bde89223f879effa878812f078485ed2
 EBUILD xclip-0.13.ebuild 556 BLAKE2B 8ba3643b0e829e0587359286cfb8d471adceb19e3c15cd5f5423f8e2f2e4075eedef693e3f8a29dcc64aea7949b546ea371bed46b996cea2eaea6b73f49c2cc4 SHA512 1fed5fc97d54ca0e00f0e0ebefebe2ab691c028bb3ab189c00f40889a2c9de9e685016e1bdbcdacc896f83910cfb1bab54d10f539282b9eb84fd174382d43795
 EBUILD xclip-9999.ebuild 456 BLAKE2B 7c2fce6b884fcbdd0705a300bf2756bfe0c5466eace338a129ca220076bff3d0ad256d25df37ccebfa11f27526388d0e8563b032e2db8344242ef9fd335026c1 SHA512 cddad35c477142f3efee940c37d59c7b6191d91dc19e17d1a2902ba4ef3ac6bbdb57dd07f4f52a0af64b02b5659f19b7543094d7a44c4a1bcefa9f8451a4e1f6
-MISC metadata.xml 458 BLAKE2B a212704140f8c9147e663b6922c332abf0b33231336d839ff37702246324123c0db24feec897d1c509df3df0c3361b5f81f2a50dbdd88bed1357fc3476627e06 SHA512 b14a9935552fdbd6567be01662f345d414b895b9c75e73780597ff28eec9db45637c2812e81cdd05b12da658f47e80963e3cb7ec689c0c5d0c9fa898db05fa7a
+MISC metadata.xml 340 BLAKE2B 107808c934836e41cc868b79b6edf2df8d7e0886d0122831953e8b660bfea71f47d59edfa2a97d109dc6e427bd49c35f49cdeaf675ce9d605c22fde8282e6b1b SHA512 727d734371632f29359b12acda86588cfdf5a222856c2a1d698e9c71664e38422105aad0752c4d3562ddcf3f1acbeafe713a33a695f7a8880cf82abdc8b16211
diff --git a/x11-misc/xclip/metadata.xml b/x11-misc/xclip/metadata.xml
index f3f225956540..9bfd20691d4d 100644
--- a/x11-misc/xclip/metadata.xml
+++ b/x11-misc/xclip/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>slyfox@gentoo.org</email>
-    <name>Sergei Trofimovich</name>
-  </maintainer>
-  <maintainer type="person">
     <email>slashbeast@gentoo.org</email>
     <name>Piotr Karbowski</name>
   </maintainer>
diff --git a/x11-misc/xfe/Manifest b/x11-misc/xfe/Manifest
index b8336bfd4098..44907e8826c4 100644
--- a/x11-misc/xfe/Manifest
+++ b/x11-misc/xfe/Manifest
@@ -1,3 +1,3 @@
 DIST xfe-1.43.2.tar.gz 2834576 BLAKE2B 5ac7ebf229febb75a99e4829a38a3675d6674ec6eced13dc5be70d2b68ce88f6394621dffec2d8359e72da7eace582883b72491e90597ab4a8925685cb577fcb SHA512 ad7b450d0828747f801219c23824b0751fc2a7f0eea791369c4adb3090ffe1279056fa8804ef97b25a2f810e00d37357efc962dc9d4087c3d7cc5f8ffb37d51d
-EBUILD xfe-1.43.2.ebuild 1481 BLAKE2B e6702a7bd7ba18e78778011fe59640b62be2cb6b52a4e58eaac01a798de6c9f2bcab0c048040ed03a51da01f4224bb7786a3f151c9a4c5591ab32200cca77ce4 SHA512 dfb9097ca3558c9324ac857080ac5bebdbe9ef04c17fd406f9a802c72d33b91bc4f375750b8cb4956a52a79b9906cd20c1ea8877853eb79eabbea5346b9762dd
+EBUILD xfe-1.43.2.ebuild 1484 BLAKE2B 96a66f0334851a54b2dab16517567b15a058b5ad91e992dd8c02b429dc02cfc2d9e80a051c16ef38f40430c16a1af36cc0d40be69440c03a5193e4bc7fef3f01 SHA512 1bdd40f8fbb7d5b39f049394c1dae1d541df5016215a9ccb03c92bafb7c5544759ce76ebe39b8f4b27963e63a591fb97737f9c14c8757c30ae6cc1f183a60ccf
 MISC metadata.xml 349 BLAKE2B 1f855ee2a581396591ea01b3b1d00fe0dba88e564d38186f738d797eb50554593c2d2bf396f8a616329855ebe829b1da5461705965e252b2994545353e26f475 SHA512 08958aec505d6e35611988ed33f184112fecea69197b2f2e5d784d2db216a0b643d27c6ac24ca265fd89d612b67586925d6b768bdf86aa0060919c96ecda48cb
diff --git a/x11-misc/xfe/xfe-1.43.2.ebuild b/x11-misc/xfe/xfe-1.43.2.ebuild
index 57333f1ae0f0..f2925f4b965c 100644
--- a/x11-misc/xfe/xfe-1.43.2.ebuild
+++ b/x11-misc/xfe/xfe-1.43.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ PLOCALES="
 	bs ca cs da de el es_AR es_CO es fr hu it ja nl no pl pt_BR pt_PT ru sv tr
 	zh_CN zh_TW
 "
-inherit l10n xdg-utils
+inherit plocale xdg-utils
 
 DESCRIPTION="MS-Explorer-like minimalist file manager for X"
 HOMEPAGE="http://roland65.free.fr/xfe"
@@ -55,7 +55,7 @@ src_prepare() {
 
 	# remove not selected locales
 	rm_locale() { sed -i -e "/${1}/d" po/LINGUAS || die ;}
-	l10n_for_each_disabled_locale_do rm_locale
+	plocale_for_each_disabled_locale rm_locale
 }
 
 src_configure() {
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index ac28b65e4ca1..4ad2e1e6a442 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,4 +1,6 @@
 DIST xkeyboard-config-2.32.tar.bz2 1742570 BLAKE2B 98374e1bbbeaf24268754df8f050c663f8d07cec770c8bb86cb11bc434f6463acc9221b75b8f5dec79c8e47ac9e77deeb919a8bd3377ba712aac1fe1ce64ccc8 SHA512 c082a86efcf69ab50454875686b9b4c388cf48002de3728331de3c09c1349a38c9b9ad8ecace2215061c0c775e59c3dd230fffe3f24db63790aa71dc8eff8dea
+DIST xkeyboard-config-2.33.tar.bz2 1755990 BLAKE2B 63d5d789609711fb92acc69319efc64337cf512b3a47d3b8d24a9afbc5c57e45d6c1a7f4a283ae274b6534bb6667964248ef8dd320a24861a50580bfe2a29350 SHA512 084f79350d5dc7f9ebd5b5333d386459b0ab587f6cec27ee2d8d5c3a56b08993f9fafb9d893307f4d43cfeaf2e225c5295ad6297ae8287c68efc48a82638feb1
 EBUILD xkeyboard-config-2.32.ebuild 1012 BLAKE2B badc44dbcf680de7aa91a2b639f117fde7f799be42804179f99b86bc016dc66135689caebb93f6e504abeb49fd2c2d77bf19ed2ef805fb5ffc1430d7654a2ac8 SHA512 f063fa916ee24bd293037ca460d33d2725f1afc636e626a0db7f5e5d26a2e26d5f6e5832938e9bcf071376525c14c999fe5fcb204bdf76206fef6f983ec7199b
+EBUILD xkeyboard-config-2.33.ebuild 1019 BLAKE2B 4cea9fc1bf4b48d3ee25918ada095687ad96ab80b3d2f82dde1145694a36740e0d1b2e027e4b176ab9baa7f1cf6d4260f7fe7ba6bca5ccf5ea1f86ea20e9b3fd SHA512 c7def2f71bd13f087315d8d855008d8cb62b7e4356c032b8ea159fb4a29554a413eff9ac2a8607510ae2dbe9a0f0d48b8a759fd28c34866039c7fe32b1144f86
 EBUILD xkeyboard-config-9999.ebuild 1019 BLAKE2B 4cea9fc1bf4b48d3ee25918ada095687ad96ab80b3d2f82dde1145694a36740e0d1b2e027e4b176ab9baa7f1cf6d4260f7fe7ba6bca5ccf5ea1f86ea20e9b3fd SHA512 c7def2f71bd13f087315d8d855008d8cb62b7e4356c032b8ea159fb4a29554a413eff9ac2a8607510ae2dbe9a0f0d48b8a759fd28c34866039c7fe32b1144f86
 MISC metadata.xml 337 BLAKE2B ab0893146e71b0d96879e7ec41c7c4e057cb92570227daef015b6fa1a24c55709cd3d19e16df5afe80f706995e12a44a9fc29826a552bd436b1e9381e44acde5 SHA512 6a43f86407638d3f156d4ae64caee882878dbd1ee7c23991c8f378d55cfb0afe016202866f95c328d8b4e59186efa6a7cb7335a1c86e3fbdda4c16a96e175cf0
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.33.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.33.ebuild
new file mode 100644
index 000000000000..268d593d98c2
--- /dev/null
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.33.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit meson python-any-r1
+
+DESCRIPTION="X keyboard configuration database"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config.git"
+	inherit git-r3
+else
+	SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/libxslt
+	sys-devel/gettext
+"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dxkb-base="${EPREFIX}/usr/share/X11/xkb"
+		-Dcompat-rules=true
+	)
+	meson_src_configure
+}
diff --git a/x11-misc/xvfb-run/Manifest b/x11-misc/xvfb-run/Manifest
index 1119942841f3..bd422f125762 100644
--- a/x11-misc/xvfb-run/Manifest
+++ b/x11-misc/xvfb-run/Manifest
@@ -3,5 +3,5 @@ DIST xorg-server_1.20.10-3.diff.gz 152420 BLAKE2B e87d8800a905962cf3ddeb41e5e9cf
 DIST xorg-server_1.20.8-2.diff.gz 171769 BLAKE2B 5572320e4bc1de63ba221e5c9804d6676cc7c918d417b4069572fec4385d62b73e5636a4f17eebb1897f410e323e190dff68056abd888373df4ccdd688ed7c47 SHA512 89115023fc802a3cf2fc21fabed4499112b1e6f52967eb134795f041194b05d86c59b1477d8b9001c2935efdeb64e8a0dd281a43a6252802df2d19349972f7d7
 EBUILD xvfb-run-1.20.10.3.ebuild 775 BLAKE2B 9c070bbee3901b23015422be999c7c853e3a0ba6673648c1ac6083506f14f1dc51fa3dee63e6d9324d2d862438d3b23ab8288d1e96b94caf0dc5edca8ea7b7eb SHA512 36779fcdd347a8fd5021e5614625aec9d91c18bb9b7b2fa628fee9e4f313f0d99507ca8a5200633b511d3d0ce39f449953d55575d2a12b23c6394d655d78a65f
 EBUILD xvfb-run-1.20.10_p2.ebuild 757 BLAKE2B 480f78fea0fb293e3656ac40a94833c37cacb294c8dbeaddd6629e3c2ccc329b6f47277926d7435b41c35a33eadafb59bdda731ec006fa93465fd9c7c772f397 SHA512 7948f90a2716af559e6c8028898454dae4d4419e337163ba962e24a72f6d2fed11288a39cee3e0fdd921e1fcdf6ee57072646aa9dee56c2f7ee38a0c301cc5d3
-EBUILD xvfb-run-1.20.8_p2.ebuild 755 BLAKE2B b2e7dd470ff90c72d40a64f77f85de998f97c451cb6bde49d4ef00cd3d5a3dd211d6639f5beb4c0e1a728dba2cac6cb25542c4916a900fb41f1c9bce78b2d4c7 SHA512 07594ffef5bffc8c3eab48a278048e87ff3507480d28a927fb8e54ff25161f2e48f99e1717442a2206407ebfad50756359c2122565e2f26a296ad05881931ae4
+EBUILD xvfb-run-1.20.8_p2.ebuild 754 BLAKE2B 68043da68ba05bd0e7e054aaed496dd4476ed1c88ebd1f644c9e878b1f92eb5afbb5755799cceb75a027c37965c286c1b1cafe265a0f758b8cae2e3193fb3718 SHA512 c666c2c5b58462cb0a58f90062143e091ae902665825ea1d6c6cfd6a3507501f54073cc050da2a4c8da08105b9c77f18662582d512e22df960d71181f6012984
 MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/x11-misc/xvfb-run/xvfb-run-1.20.8_p2.ebuild b/x11-misc/xvfb-run/xvfb-run-1.20.8_p2.ebuild
index 83051fe89b7f..99fd0aba31d7 100644
--- a/x11-misc/xvfb-run/xvfb-run-1.20.8_p2.ebuild
+++ b/x11-misc/xvfb-run/xvfb-run-1.20.8_p2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/${MY_PN:0:1}/${MY_PN}/${MY_PN}_${MY_PV}.diff.
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="dev-util/patchutils"