gentoo resync : 22.01.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-01-22 20:28:19 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-01-22 20:28:19 +0000
commit: abaa75b10f899ada8dd05b23cc03205064394bc6 (patch)
tree: eca3dd248b73b92013cba00a0fcc1edf2696e19a /x11-misc
parent: 24fd814c326e282c4321965c31f341dad77e270d (diff)
92 files changed, 468 insertions, 697 deletions
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 7f25d41bef53..ff53549114a7 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/albert/Manifest b/x11-misc/albert/Manifest
index 64ab71744ec9..7457dcb79506 100644
--- a/x11-misc/albert/Manifest
+++ b/x11-misc/albert/Manifest
@@ -1,8 +1,8 @@
-AUX albert-0.14.22-qt-5.11.patch 703 BLAKE2B bac316c4a75d1bed79517f4e25c7844c5e3671f85051a9654c31a1337dbb692c6f52b2adee38c0ede081b0230db0c1cb4e963e875cfae717fc98839180dfd42c SHA512 e27bff9359ae9b3c7ee1be0ab1098073ccbaef65eca316351c63c616a4772be73cefabb9ee62f9b79238eb039520d89f4aecc79eca5f0bda7490e231000490eb
-DIST albert-0.14.22-plugins.tar.gz 540446 BLAKE2B 22cf69698614a1b0e97fd1f5e3224b9097141c4a32c7999b9468c3c59b6af0d7a753de59a7abeb07f9ef9655abc05b8cb5e5079c9b41eb9f51dc09291b89b635 SHA512 4cce6ad717991a6a2293b491f17838a01ba51e4222deb78d5b793ab3390692131f4938027b96863c6cd61ec7a764fa6d52b3c3ef33cadd3183b2fe1498b6d344
-DIST albert-0.14.22.tar.gz 84925 BLAKE2B b009bd0420f2e5894e2e71e526361c6b177ceb0ed9339efd276228e3cb8aed52eba811b8f2f6ade8f39357017458f2cbfddec25f0df4de8d12397451bd98cb57 SHA512 91c131140f666dda665e07e617ce0d2af5c776233f9cf1430aedfc18299dcc22c6dcdec4d82f15fc2d81fa44679f9d3608a47128d33bfbddeb97481b430608c8
-DIST albert-0.16.1-plugins.tar.gz 534401 BLAKE2B e0713ee446b0c98a44489d8a45d60a1124cd45dd06af207ca8b8aeae4b6872a8705c3fa58e1636a4e0f95b4885253be4fd6f8376c12dc6b5110cbf2923af4d09 SHA512 3501efae9feeaf1090c1a1a3de9ed9e5788c8029dca76e06891683b43b69e5711f3c62187c273b11c418f824e9e0c0530bc5d248b37b96553fc5846c93c21224
-DIST albert-0.16.1.tar.gz 68739 BLAKE2B 4794c8aa4d2997ccf4c2d88a36c1e578ac3daa84fdd7dfebfa08941f692815a085ea2140aec9b3944c6ff8e71a4628510f9b28857137e39396be278606812640 SHA512 49dae5722982ba3fd4a25fcf5f398d8fe8d4bf66d15e2783a699174ff7196538c11ec9dde4201174c7fc7ac0852f2491b5b68abc196077305c89e22d8e1387ab
-EBUILD albert-0.14.22.ebuild 1407 BLAKE2B ee85919ed2a532f8498530daa20e748d2aa2327bade782b97d126e221c2211913584f787ebb653e136f70daf1a1911220daa987f73106a8fb3c1835fda543817 SHA512 fc71f4c8e139e1e0dc86fcd60dbba8f911a54eb989ab60957fb1fc9fba7314d5319cff2515c8b0ad246a8cda917a14b9a798e2493161db49f531c78c0892138f
-EBUILD albert-0.16.1.ebuild 1372 BLAKE2B 9283b51acf6d42fa4f19514edaf8b430f8ba157e8652551457fdc036563bcdc11c59a28e865bee8bef56ae73d28e1e211b16f564b5d0cfa23b31e26711d72c36 SHA512 ec4c97675af1e9e9668e91c60f32dbd705640228177f010acb5245a80da321074eb52a5755b4bad8a281feaeafaff275ad9cb511a444f989cec5815021f35392
-MISC metadata.xml 454 BLAKE2B 3640b6c158e08d6f93e89aafcd7533da8b0f40a086aa26b2fac8b739f12813cbb73eaab0aac0ea93c43929c40a0e14f9d395357abb5a409a2f140ac3f86ab618 SHA512 2b069b93be5c8c623fb93891818c610282b35bbf15be9b296a167d80ccb570141d8f0844e46abad8f8f860e89bee422dd5fca41a85fbad207843c2d1024a861d
+DIST albert-0.17.2-jetbrains-python-extension.tar.gz 17062 BLAKE2B fa5da8a7df5e1bb337af75a30b7fbb2584eaa49745d14e88eeea18037d70c55e9885fdbeaeab8aaaa94531e73286c69e14b4864011875d59dcb790a10fd91e88 SHA512 53b9a0d9f972dd495648dd563df8d3b1c973aa02dce99ce7bb8a9da3bcf43174094d5a03035fbaf132072d834ccf918b17076d4f522265bea77c4220140b31de
+DIST albert-0.17.2-plugins.tar.gz 548312 BLAKE2B b8911953eb40b0985eb67108249487e589910d1701d609cc9ad305db915c2c69f794a6bdd7e6453f856874ef11dfb4657e7a527abfe746dffb8952309f1aeffd SHA512 ff6a22f1ffd39c73061baaf2ae9b1b2243673ebed56cfac7bd639a262fceadea1cbea4a7534ebe2937576d22fc9a4bc1f4d1cf05262d1fb08b9230460fd7811e
+DIST albert-0.17.2-pybind11-2.6.1.tar.gz 634179 BLAKE2B 33f057e88e45985a0475783b8931ec669a16efcad5d66ecb265744155e9941b2d618391a36bff1d8c1c2d74a7e0b41de50b26eae689215d4585542fbd4282cc1 SHA512 8730efec82eef8dc09a58ca3e3b28fca45880cef85d32aa5524a8fe64e23d5f6dff4ca1b48b3034a287199bd56f4db4d6806c5358bef66fde84ed0fbf80ec264
+DIST albert-0.17.2-python-extensions.tar.gz 483617 BLAKE2B 34a1b8626c17d0297294be5cd77fe3f9b4abd985541bd995d1665e5e4a3a9dd64b393c5aba6f00347e0a4c031df2a04672246caff1038858df286c271dd33975 SHA512 13e14ce180787cde9abd0c06970109d9217f67e0b4596d73768efb1a183f6493552766e89bea6fc83703a4c0cc1b4961459cbbf5953c530d2c09d53e686ccc53
+DIST albert-0.17.2-xkcd-python-extension.tar.gz 729219 BLAKE2B f3c571bf2bf97f43a5aee7d8201f16732e12b589c8f7bfd58fe1ce138d728ba7416fed7eb203813922a5be5b3066f0c1d4bff136c61d480146fcf5da87dceb35 SHA512 0cdedb94bc82c2db8f3006efe43a084c098414aa711ebd88a011db6f1ef892f8114a73761d8b2f2a1d1be4603177f957eeb41ee642e1c31460d1507bca6fd402
+DIST albert-0.17.2.tar.gz 72652 BLAKE2B af5398307bf4dce928cfe92766551c761c407d9d98cc0a4b730cc8e95509d15c5b8ccfaef6e19d3dd2ded5e56403b14c3ac08fce90845abdfdb74ce7b3ff8b71 SHA512 ce2e32fa0018b210196e09cda8a3cce0a2cafecfdef5edae4610c621c39b66e3b4b039449d1900deb9689b5fa14178d079f7f0a7917cc1019d26b48a0a3ca415
+EBUILD albert-0.17.2.ebuild 2730 BLAKE2B 92a1744717025de8f2a198ba2da7587a61d619642bec5300df737d24978fdf0c650096939830466afd067c88346c295f77e3bf59f0a87fd83fbd78754287da62 SHA512 f6608ffa18cf6be400c7bf36c38860d105a52340d16bdfed257108d31c4466ec4547d9dbd8a9c226fb844244f7fa60e42e6f0037b1dde102e30016410ad9c2a8
+MISC metadata.xml 745 BLAKE2B 7b15716f944a6712c6aa1afe34307ca1bfa8587150df5e71d2af0b8fa96b95cea669c8e1b6c7af75667f44035869e8f8f7674837660c094bbd6e1e710940a095 SHA512 573c724bcc935bedca3beba49c89b214d54f690f4d56df73d90f9dae1a2f80f72cad75d4dc4a9166e33c71ececa571db016aa17170d3c6b864288eec9bc85a43
diff --git a/x11-misc/albert/albert-0.14.22.ebuild b/x11-misc/albert/albert-0.14.22.ebuild
deleted file mode 100644
index dddced7dd4ba..000000000000
--- a/x11-misc/albert/albert-0.14.22.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLUGINS_HASH="5dc169ce81002b4472cc55c0341f6ac52fe130f5"
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Desktop agnostic launcher"
-HOMEPAGE="https://albertlauncher.github.io/"
-# plugins is a git submodule. the hash is taken from the submodule reference in the ${PV} tag.
-SRC_URI="https://github.com/albertlauncher/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-https://github.com/albertlauncher/plugins/archive/${PLUGINS_HASH}.tar.gz -> ${P}-plugins.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="debug"
-
-RDEPEND="
-	dev-cpp/muParser
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	x11-libs/libX11
-	x11-libs/libXext
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
-
-src_prepare() {
-	mv "${WORKDIR}"/plugins-${PLUGINS_HASH}/* "${S}"/plugins/ || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DEBUG=$(usex debug)
-		-DBUILD_PYTHON=OFF #plugin directory is empty causing build failure
-		-DBUILD_VIRTUALBOX=OFF #plugin needs virtualbox installed to build, untested
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/x11-misc/albert/albert-0.16.1.ebuild b/x11-misc/albert/albert-0.16.1.ebuild
deleted file mode 100644
index c04869d05ca7..000000000000
--- a/x11-misc/albert/albert-0.16.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLUGINS_HASH="029bd8ccb58c4452bd82ab42be8739f1639e42d4"
-inherit cmake-utils xdg-utils
-
-DESCRIPTION="Desktop agnostic launcher"
-HOMEPAGE="https://albertlauncher.github.io/"
-# plugins is a git submodule. the hash is taken from the submodule reference in the ${PV} tag.
-SRC_URI="https://github.com/albertlauncher/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-https://github.com/albertlauncher/plugins/archive/${PLUGINS_HASH}.tar.gz -> ${P}-plugins.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug"
-
-RDEPEND="
-	dev-cpp/muParser
-	dev-qt/qtcharts:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	x11-libs/libX11
-	x11-libs/libXext
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	mv "${WORKDIR}"/plugins-${PLUGINS_HASH}/* "${S}"/plugins/ || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DEBUG=$(usex debug)
-		-DBUILD_PYTHON=OFF #plugin directory is empty causing build failure
-		-DBUILD_VIRTUALBOX=OFF #plugin needs virtualbox installed to build, untested
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/x11-misc/albert/albert-0.17.2.ebuild b/x11-misc/albert/albert-0.17.2.ebuild
new file mode 100644
index 000000000000..58b5b30d0b47
--- /dev/null
+++ b/x11-misc/albert/albert-0.17.2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+DESCRIPTION="A fast and flexible keyboard launcher"
+HOMEPAGE="https://albertlauncher.github.io/"
+
+PLUGINS_HASH="b4cac28be7b265027b00279baba14086d97c4d07"
+PYBIND11_VERSION="2.6.1"
+PYTHON_EXTENSIONS_COMMIT="7f571aceaf8e60eee8bb21e1ec4efa0e95523d13"
+JETBRAINS_PYTHON_EXTENSION_COMMIT="b7157473cc923fe4f15023c85a032eeab3627652"
+XKCD_PYTHON_EXTENSION_COMMIT="bf88a964473d65b39c9e09eb48dabb847206f06f"
+
+SRC_URI="
+	https://github.com/albertlauncher/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/albertlauncher/plugins/archive/${PLUGINS_HASH}.tar.gz -> ${P}-plugins.tar.gz
+	python? (
+		https://github.com/pybind/pybind11/archive/v${PYBIND11_VERSION}.tar.gz -> ${P}-pybind11-${PYBIND11_VERSION}.tar.gz
+	)
+	python-extensions? (
+		https://github.com/albertlauncher/python/archive/${PYTHON_EXTENSIONS_COMMIT}.tar.gz -> ${P}-python-extensions.tar.gz
+		https://github.com/mqus/jetbrains-albert-plugin/archive/${JETBRAINS_PYTHON_EXTENSION_COMMIT}.tar.gz -> ${P}-jetbrains-python-extension.tar.gz
+		https://github.com/bergercookie/xkcd-albert-plugin/archive/${XKCD_PYTHON_EXTENSION_COMMIT}.tar.gz -> ${P}-xkcd-python-extension.tar.gz
+	)
+"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug +python +python-extensions +statistics virtualbox"
+
+REQUIRED_USE="python-extensions? ( python )"
+
+RDEPEND="
+	dev-cpp/muParser
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	statistics? ( dev-qt/qtcharts:5 )
+	virtualbox? ( app-emulation/virtualbox[sdk] )
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	mv "${WORKDIR}"/plugins-${PLUGINS_HASH}/* "${S}"/plugins || die
+	if $(use python); then
+		mv "${WORKDIR}"/pybind11-${PYBIND11_VERSION}/* "${S}"/plugins/python/pybind11 || die
+	fi
+	if $(use python-extensions); then
+		mv "${WORKDIR}"/python-${PYTHON_EXTENSIONS_COMMIT}/* "${S}"/plugins/python/share/modules || die
+		mv "${WORKDIR}"/jetbrains-albert-plugin-${JETBRAINS_PYTHON_EXTENSION_COMMIT}/* "${S}"/plugins/python/share/modules/jetbrains_projects || die
+		mv "${WORKDIR}"/xkcd-albert-plugin-${XKCD_PYTHON_EXTENSION_COMMIT}/* "${S}"/plugins/python/share/modules/xkcd || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DEBUG=$(usex debug)
+		-DBUILD_PYTHON=$(usex python)
+		-DBUILD_VIRTUALBOX=$(usex virtualbox)
+		-DBUILD_WITH_QTCHARTS=$(usex statistics)
+	)
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/x11-misc/albert/files/albert-0.14.22-qt-5.11.patch b/x11-misc/albert/files/albert-0.14.22-qt-5.11.patch
deleted file mode 100644
index 1fa8a2fa7126..000000000000
--- a/x11-misc/albert/files/albert-0.14.22-qt-5.11.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Bug: https://bugs.gentoo.org/666998
-
-From 97fdca06dc7f82c92e5bb71e05f4fd7e74bbc616 Mon Sep 17 00:00:00 2001
-From: Michael Palimaka <kensington@gentoo.org>
-Date: Thu, 11 Oct 2018 23:09:51 +1100
-Subject: [PATCH] Add missing include.
-
----
- lib/albertcore/src/core/telemetry.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lib/albertcore/src/core/telemetry.cpp b/lib/albertcore/src/core/telemetry.cpp
-index 1fd6b06..09b7713 100644
---- a/lib/albertcore/src/core/telemetry.cpp
-+++ b/lib/albertcore/src/core/telemetry.cpp
-@@ -2,6 +2,7 @@
- 
- #include <QApplication>
- #include <QDateTime>
-+#include <QDebug>
- #include <QJsonDocument>
- #include <QMessageBox>
- #include <QNetworkAccessManager>
--- 
-2.18.1
-
diff --git a/x11-misc/albert/metadata.xml b/x11-misc/albert/metadata.xml
index 9790aca21da3..4afe47b2ac84 100644
--- a/x11-misc/albert/metadata.xml
+++ b/x11-misc/albert/metadata.xml
@@ -12,4 +12,10 @@
 	<upstream>
 		<remote-id type="github">albertlauncher/albert</remote-id>
 	</upstream>
+	<use>
+		<flag name="debug">Enable debugging informations</flag>
+		<flag name="python-extensions">Install default python extensions system-wide</flag>
+		<flag name="statistics">Enable local statistics</flag>
+		<flag name="virtualbox">Enable app-emulation/virtualbox extension</flag>
+	</use>
 </pkgmetadata>
diff --git a/x11-misc/bumblebee/Manifest b/x11-misc/bumblebee/Manifest
index 7044a0b42b04..5ba0c5c7fb07 100644
--- a/x11-misc/bumblebee/Manifest
+++ b/x11-misc/bumblebee/Manifest
@@ -2,9 +2,9 @@ AUX bumblebee-3.2.1_p20190421-gcc10.patch 2006 BLAKE2B 136c9f5aa38269efa2ef59f41
 AUX bumblebee.confd 60 BLAKE2B 68cfe5dd4db512e10cf82977556336e7bb8eb7ab3f397a2ba5b75c4d5e0856d957a126e741d2c3a45f3453479b42e0b1b42b9aab411eb80de9afc73f3c2ff8bd SHA512 4c773002e372e1696c0922bda91a104ea0ee244eb6beac84a4e7ad2ff1aee265aa248e63c3ad55ea75cabbd36b03d9efa3f8ec3ef708346837ab6a10d6652251
 AUX bumblebee.envd 127 BLAKE2B 2a993cd77706c2da4f90a3a77b4a6d0014b1322c584ae8970d75539b04b5d6a23adac7067a511f4f9d9a47797ac1d55f836c3242d26d0c464f6ea3833dc30ae5 SHA512 f42bd5992a8c80d045036a689e3c33cc2bdb7d54afb03bb7f33a80fa6a9c1e05f583cdec5b3da42021c48c1b59db4664e9c850e48ada47a1887327f7b11633af
 AUX bumblebee.initd 488 BLAKE2B be625ab381b6f588bc86402bfe7aacc8f541c0ebe2f8fdbc4309bdef5dd1cfa44953a3488bde8d0af67b8cf4b14b7b5de77ab125067b6b59379ceba75863fc45 SHA512 5c733a901e2bed20082d01f0db2e8d168106b082f2f6300388edbeec7f5b7a70ddfed908012c8ccf9a3caf070669cfb550368237dd6f8ff62018f8b767012cd7
-DIST bumblebee-3.2.1_p20170130.tar.gz 63428 BLAKE2B 33a2fbbd6e6cbc6cd026b87714d06e54d8803cc75e997cc1bd1aa1d1263c3fe9602f822b92c67fa7e76632bb19daaae11e591b88d087889a970d374f6316e847 SHA512 b457e8ce197782bd1b1fabd3c0c67e4ec26cdb90a3715bbe7a8e1550cdde19134151567cfa0c73d800c30e5d303b30bc1261d5f3cbceaa64d559416e4d541070
 DIST bumblebee-3.2.1_p20190421.tar.gz 63640 BLAKE2B 62bf3e7556b3cc3651f0e1f9fabd22501b82e78c0820b5ae113fddc24816cefd9c788a33d506944dc971092ae22dc3389ced79da6284a5e812ffad909bb03ebd SHA512 e24de3b60e55828ccbbd85774b9a776ba01b62850489b9d7952c4bf807f080b68d084f11de540a65d1bf78f6a35ce89d35f868de14e7ab9d768cdf21a1d422ec
-EBUILD bumblebee-3.2.1_p20170130-r1.ebuild 2219 BLAKE2B d422665f2e8033f644162a7ade48b83f7416747ce29a3dcaca58190054510e445bc72515d36e435dcf6990960ea1db852b3dab8b4cdc9ff42da54f6d1c174b93 SHA512 38bd8fe978bed7807f5fda4d6d48fbd97e648cd47e022efd5b11f5805aea5c175cb091eca7ae4f0da8faf67d8e27c49eae89691516932c63805258e85b080e28
+DIST bumblebee-3.2.1_p20210112.tar.gz 63840 BLAKE2B 53f433c90ea7925a059597f9ce1e6b764bf204337cda2a87b3e862951fbd86e18cf3bb973a2a43c0ff913e9b290170536760ed9163ea746f5b28b7fed4ce9c6d SHA512 2d23db5a6d2a06c37176440568fd30c3afd80a75e13db00f081c0029f9e03275bf6c7b019778b9c31dcffe49ba56ec86a3303f00074123c95560a850bdb0f36b
 EBUILD bumblebee-3.2.1_p20190421-r1.ebuild 2317 BLAKE2B 5189a2f0ab287b44c2fd72f5f4f06734e4db53db95ff2b98cf093a01202f1764275483f03a7383f82e0799135976a7d8b039870d626f9959ecf8072fcf623d3d SHA512 75ecf2b663e7f72ddc38a55a56783e218d9f6f2ac6e8bb91ddda91e902f0841c1c1b655679e9316981a4398f84df6baf4630e6102dfc17e7f5534c120d896acd
+EBUILD bumblebee-3.2.1_p20210112.ebuild 2203 BLAKE2B 7cab41e8e9037f3fc3094317d7402d15c4af198f714aa03d22f46a894e2f2f68f677005b951b1ab68639aa8ffe6efe035970c2908814a59da76e23b312331d23 SHA512 28718f6459d80ca30613a0432430fbf11680d1acbe79fd1d4965242a93c0fb06b20bd67d3ed97c5ecb10ca1f33f865581d27e576c42c9e5d04fea7347f2128b0
 EBUILD bumblebee-9999.ebuild 2215 BLAKE2B f9f61a4183cc43c2c1442101b433fec6a3477d6062da340d8421e0e63398927c5767177ea4d3c98ef87bd261de39b821d003d7a67e209de21b47c57c5e7aed21 SHA512 7da89e2bf3ee757b29fde2757dba5e63c157ff0b15b59d244df8ec43ce9a25adcd00b6f149b694488a916eb7d293b6a59d48e40c18eb94b4be1e9fa35c26a69d
 MISC metadata.xml 1111 BLAKE2B 9f9bcd089280889ccb6990617f6b470c0c69a8b77b2af849d5bde7ff45ec94e121569d2c217a87d7375e19503bf0d90de775c514e7b400c0dd2a6fbc897c21b4 SHA512 dc2f37b1def7e302fc3d82325d3179b0c64c96b2fa609f6cf5196cb97b89854fade361005327ee2f8ccc5927e0aefe1c997cf5e6f9862cc18ef09deb3a2aa814
diff --git a/x11-misc/bumblebee/bumblebee-3.2.1_p20170130-r1.ebuild b/x11-misc/bumblebee/bumblebee-3.2.1_p20210112.ebuild
index 1099ff0e4161..422ac388e2dc 100644
--- a/x11-misc/bumblebee/bumblebee-3.2.1_p20170130-r1.ebuild
+++ b/x11-misc/bumblebee/bumblebee-3.2.1_p20210112.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools multilib readme.gentoo-r1 systemd user
+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"
-	KEYWORDS="amd64 x86"
+	KEYWORDS=""
 else
-	COMMIT="d469a32fc0dfef5b3725c7a5331be2d04b870594"
+	COMMIT="8f3d307b6aabbc2cd8444c6e5a4360f3bf2915ec"
 	SRC_URI="https://github.com/Bumblebee-Project/Bumblebee/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="~amd64 ~x86"
 
 	S="${WORKDIR}/Bumblebee-${COMMIT}"
 fi
diff --git a/x11-misc/clipmenu/Manifest b/x11-misc/clipmenu/Manifest
index 8748373c83f3..835ae2be8fe9 100644
--- a/x11-misc/clipmenu/Manifest
+++ b/x11-misc/clipmenu/Manifest
@@ -3,5 +3,5 @@ DIST clipmenu-6.1.0.tar.gz 8711 BLAKE2B a37f0f52343a4f22fdf4a37a57a2c715edd47aa1
 DIST clipmenu-6.2.0.tar.gz 9019 BLAKE2B 2dddd900483656a38b2335f994a46302af797b0f47509b0bd2c1a302e1c27729cd80091a4c8bfd587844f7ee8c271742aea668910553d9a4c54595d18e4f1ec7 SHA512 adfd649a120264552e2c05314ae2ad039055308f77d620dbb3fc206e4244a6f1f2e5ed4a7e86fd547a78692aebaec1761528e10408d838f80def99959ef58295
 EBUILD clipmenu-6.0.1.ebuild 581 BLAKE2B 1dc46e286767a05c5c0defe74bab3d4fd403915df398b724da0d603eaca49731f52a17b203b3377c283d5e231713d308c274c330794258cf3c15252983857dc9 SHA512 a9a25ec760f995d863f06c21133bed83ec95e31e4547d34ff0eb67af7e851950c5f232a1c30ba4bcc4e629319898afdc65eb51a8a51fa5169d2299a0b0603ca9
 EBUILD clipmenu-6.1.0.ebuild 603 BLAKE2B fedce7c991689e9e6a9e0d4f1bd604241d309bd921499752705d1b116a90d2052de491ddb6bf44f343d92d56a3086f5ef086c710f5edd17046ff8657baa06649 SHA512 5b6fb72b91e1e439e9ed821bf795234a6362b2a5aca6f528e74e6c2f2a99a8bc37f8c7c946e3ad5337165a7d0f97922318a727ac7860e1ef5c64791ffc5d7f48
-EBUILD clipmenu-6.2.0.ebuild 611 BLAKE2B 28d0919bae816876108f33f51154006fff3af824057952a82ea0850ee746b7dbd2a1aea8f397892c01a68e1cb2d16b4809d90feee77255c03df4882a8760fcd1 SHA512 60f16a070fcc28243e072a0c85ccac06d4c207478c77ac802f5d772e3070daff26ac4e2148b5563de4395d0d887af29a3288d37d56a5d1130c3f73e4df64a7ad
+EBUILD clipmenu-6.2.0.ebuild 614 BLAKE2B 718594186206d77759521efc9875707c76676a57fca57f2b0debf5a361f3f55a8bf71afb8898c6c4d16f6ee347c6d5e098fe96151df9fa9408763c6e5bc0834e SHA512 84fcbc2540e6de8411e307c2f1b0656de44a7ec12950a56e2e384774bd53de3addeb0913d742e3c6e8e259cc485228b2222036748f07f96ede0e6594e2b46f30
 MISC metadata.xml 364 BLAKE2B 4f0c3d96c42f1ae903968e3cb3b0a28b5d0a3881c74eab0347abf13262547aa218a83bd907ec9a5c0d906948f5cb57c97372f07630368637326277fcb75c4db5 SHA512 478344a69216a5d9aa8b69a0252c171c23ae8719529fbecf912d8f298cb28bb85fd9506af2a5a4b77ddd3048c60d479dee0e5ba7909d661886d35c20107527fe
diff --git a/x11-misc/clipmenu/clipmenu-6.2.0.ebuild b/x11-misc/clipmenu/clipmenu-6.2.0.ebuild
index cc2eeecc5417..5ae7092c8f4c 100644
--- a/x11-misc/clipmenu/clipmenu-6.2.0.ebuild
+++ b/x11-misc/clipmenu/clipmenu-6.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cdown/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest
index 5bae2ef20dd6..ca1481185270 100644
--- a/x11-misc/colord/Manifest
+++ b/x11-misc/colord/Manifest
@@ -1,3 +1,3 @@
 DIST colord-1.3.5.tar.xz 1263488 BLAKE2B de70f3f76e81d3cec826f444e4c6a1603c03b7d97fedcd04a0b9e1977d1e487d7e1327c8b2738b3cf74e9717fb6803d543786c749d3a244faa1a6480e77e3436 SHA512 a0084ad2c08ae88c8023b8bade68f6cf25e13c77a6a37ef127b2914e86b06e6a7a783f9ab3585243d975dbbe1120d5daae13bdb586aefe519bf675458683025f
-EBUILD colord-1.3.5.ebuild 4321 BLAKE2B 4b9ba5bc30c9f42704592e76f1f602be29ac070e882599966489f70e3ad3462d7672603a0d1b5dc5c4bd612dc8a566b2643bc64aa1fef6fd2ad452a572256814 SHA512 8d35d6d714b1992d316fcf11cbe0ad4020efa8b09741a3577daf3012b64f628e175cc2e2900d86465327417687604a1cdf885d0a065201f9db79de0b4bbf490d
+EBUILD colord-1.3.5.ebuild 5021 BLAKE2B 9e9b880d6dbc6dead5a179d1e45c8ffef2289b9598c1b3184bb0a7c3411fc038620b50f5cba33c90318a83e49986c2b2cabf4a3f1b707f100cad8224ef639fd7 SHA512 140f21ccfc2195226b35a225c97d03ecaf8622bc7b1c4f650a2a7885a96bee6d5b5f0d6369d1bd81c6d959c53514b3a6c102e8261ec5ff5176f77cd8baa027af
 MISC metadata.xml 563 BLAKE2B b35a641da198a98fc9dc69dc0a49b0796060df467dfda31fa7cb1dab328a618e283f5ee9e05d7ad34742052e9441780b243f62f71329d88c1d93dfa83acc46a0 SHA512 e358961e8d31c2e9582d93875bdabe119e574b62d674e5b16028cccfa2e0604d39384fc2c5683aa343b9cf6d543f8fc35d2eef35662de43ea97fd0f50536df3a
diff --git a/x11-misc/colord/colord-1.3.5.ebuild b/x11-misc/colord/colord-1.3.5.ebuild
index ad4394daeb79..a58726ebee66 100644
--- a/x11-misc/colord/colord-1.3.5.ebuild
+++ b/x11-misc/colord/colord-1.3.5.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-GNOME2_LA_PUNT="yes"
+EAPI=7
+GNOME2_EAUTORECONF="yes"
 VALA_USE_DEPEND="vapigen"
 
-inherit autotools bash-completion-r1 check-reqs gnome2 user systemd udev vala multilib-minimal
+inherit bash-completion-r1 check-reqs gnome2 systemd udev vala multilib-minimal toolchain-funcs
 
 DESCRIPTION="System service to accurately color manage input and output devices"
 HOMEPAGE="https://www.freedesktop.org/software/colord/"
@@ -23,7 +23,7 @@ REQUIRED_USE="
 	vala? ( introspection )
 "
 
-COMMON_DEPEND="
+DEPEND="
 	dev-db/sqlite:3=[${MULTILIB_USEDEP}]
 	>=dev-libs/glib-2.44.0:2[${MULTILIB_USEDEP}]
 	>=media-libs/lcms-2.6:2=[${MULTILIB_USEDEP}]
@@ -33,19 +33,24 @@ COMMON_DEPEND="
 	policykit? ( >=sys-auth/polkit-0.104 )
 	scanner? (
 		media-gfx/sane-backends
-		sys-apps/dbus )
+		sys-apps/dbus
+	)
 	systemd? ( >=sys-apps/systemd-44:0= )
 	udev? (
 		dev-libs/libgudev:=[${MULTILIB_USEDEP}]
-		virtual/udev
 		virtual/libudev:=[${MULTILIB_USEDEP}]
+		virtual/udev
 	)
 "
-RDEPEND="${COMMON_DEPEND}
-	!media-gfx/shared-color-profiles
+RDEPEND="${DEPEND}
+	acct-group/colord
+	acct-user/colord
 	!<=media-gfx/colorhug-client-0.1.13
+	!media-gfx/shared-color-profiles
 "
-DEPEND="${COMMON_DEPEND}
+BDEPEND="
+	acct-group/colord
+	acct-user/colord
 	dev-libs/libxslt
 	>=dev-util/gtk-doc-am-1.9
 	>=dev-util/intltool-0.35
@@ -54,6 +59,11 @@ DEPEND="${COMMON_DEPEND}
 	extra-print-profiles? ( media-gfx/argyllcms )
 	vala? ( $(vala_depend) )
 "
+# These dependencies are required to build native build-time programs.
+BDEPEND="${BDEPEND}
+	dev-libs/glib:2
+	media-libs/lcms
+"
 
 # FIXME: needs pre-installed dbus service files
 RESTRICT="test"
@@ -68,8 +78,6 @@ pkg_pretend() {
 
 pkg_setup() {
 	use extra-print-profiles && check-reqs_pkg_setup
-	enewgroup colord
-	enewuser colord -1 -1 /var/lib/colord colord
 }
 
 src_prepare() {
@@ -78,13 +86,21 @@ src_prepare() {
 		src/sensors/cd-sensor-argyll.c \
 		configure.ac || die
 
-	eautoreconf
 	use vala && vala_src_prepare
 	gnome2_src_prepare
 	multilib_copy_sources
 }
 
 multilib_src_configure() {
+	if multilib_is_native_abi && tc-is-cross-compiler; then
+		mkdir -p "${S}-native"
+		pushd "${S}-native" >/dev/null 2>&1 || die
+		ECONF_SOURCE="${S}" econf_build --enable-static \
+			--disable-{argyllcms-sensor,print-profiles,shared,udev} \
+			{BASH_COMPLETION,GUDEV,GUSB,POLKIT,SQLITE,UDEV}_{CFLAG,LIB}S=-DSKIP
+		popd >/dev/null 2>&1 || die
+	fi
+
 	# Reverse tools require gusb
 	# bash-completion test does not work on gentoo
 	local myconf=(
@@ -115,7 +131,15 @@ multilib_src_configure() {
 
 multilib_src_compile() {
 	if multilib_is_native_abi; then
-		gnome2_src_compile
+		if tc-is-cross-compiler; then
+			emake -C "${S}-native/lib/colord" libcolord.la
+			emake -C "${S}-native/client" cd-create-profile cd-it8
+			emake \
+				CD_CREATE_PROFILE="${S}-native/client/cd-create-profile" \
+				CD_IT8="${S}-native/client/cd-it8"
+		else
+			emake
+		fi
 	else
 		emake -C lib/colord
 		use gusb && emake -C lib/colorhug
diff --git a/x11-misc/compose-tables/Manifest b/x11-misc/compose-tables/Manifest
index 9476b9178245..5191b9829238 100644
--- a/x11-misc/compose-tables/Manifest
+++ b/x11-misc/compose-tables/Manifest
@@ -1,3 +1,3 @@
 DIST libX11-1.7.0.tar.bz2 2409144 BLAKE2B 1eb6aa8f2fe50ddb2f6d324429b3d9cecfb48833c3f52f22ae8e32846be614c8db63c57d25e2b1c46612b6b333ff61ceab8ac0b605b117bcea1224f918af8e6d SHA512 f661ca90350fd8a94f054b00f12f5122cea068ebff706acfd399462236c189a296a2358d17d16166635101cf56cc19303dd407873a159932d093c9f33556f9fb
-EBUILD compose-tables-1.7.0.ebuild 889 BLAKE2B 7412ea439ac43b94a90de8391f79f039c36353f7f9ac94819dadd5787bf9d02b3ed0028f0788deea4c83951e9201cdf75323e6bf3c40d15533202374a4c2c390 SHA512 54dba5d4e1294ac5f35e11825cd20ede8a1ca2d4a8f162eee0f61a5ac63ea5cf5847c2b438c0eb2c3ecb95293205cf95acaca205778f8ecb9e2861abee54d0be
+EBUILD compose-tables-1.7.0.ebuild 874 BLAKE2B 52b9786983f09206572189b9190f5b95caeafb2c24f335e799babfdb968bf4ea81e86bf6304f273ad77a6d47fde77e128f3d6b0d27f206e9d1157c6470ee03f3 SHA512 7353961c6e93a6f045adf46f9d69c47f75251e99bcb35da7af5a9f4dbb2acfbab6ae1d85064bf7bbe792bce120239e4c7bef10cebf03e8157ed5bcda085a3642
 MISC metadata.xml 311 BLAKE2B 1e5deaa311245a5794e72574f94028f60c1c712a06820551cae811b113d633816a60fd3920ff5f2ca287558dbcff28e57537d5c0d3ee3a325c7540bc0b98da13 SHA512 760d09a1ed93bf16d8e26a70fa1178c02c6b336dff9aa29f900d5eff305686b9c3fae4bc93bcce58c0427f567d3759dd3a8adcd8707d07fdd90c6db79d4e13f2
diff --git a/x11-misc/compose-tables/compose-tables-1.7.0.ebuild b/x11-misc/compose-tables/compose-tables-1.7.0.ebuild
index 448e65eba222..3df2e244891e 100644
--- a/x11-misc/compose-tables/compose-tables-1.7.0.ebuild
+++ b/x11-misc/compose-tables/compose-tables-1.7.0.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=7
 
-XORG_STATIC=no
 XORG_MULTILIB=no
 inherit xorg-3
 
diff --git a/x11-misc/fpm2/Manifest b/x11-misc/fpm2/Manifest
index c44b8affbda7..bfd1bc05d3de 100644
--- a/x11-misc/fpm2/Manifest
+++ b/x11-misc/fpm2/Manifest
@@ -1,5 +1,3 @@
-DIST fpm2-0.79.tar.bz2 230189 BLAKE2B 6e444dbed72a139fd7cecaa3669c0da042d17dc1adc72ff0350b4b094f990e9d19a953328319ade692088536673ca04df50624919c3a2d087486f09c8dff7fa4 SHA512 2310f69df323c172954932f9a3454fab95d1389854110c1d18bfbb0dff59f0da937cbc2641abe98c7be85b7c5a65234a925acd9f82b5643079864ce529dc92b2
 DIST fpm2-0.90.tar.xz 212972 BLAKE2B 2608b40fd39db18407da5625f07534021dee72456fe168ffcb0c7b1f0a86fae0c69cdec5a9bfbfd09838622afcf575051326b9be5c47eb69e0b089abc205f99f SHA512 e02ebbc7af4202538b85394ef2e91d6fe7b11fbe6aaec5c5bd521d473b557db4ca8426810d1bef69967496071c936a789112307fbf028a8e3771d792c97495b6
-EBUILD fpm2-0.79-r1.ebuild 639 BLAKE2B 58daf07a9cca0a3483b96f17bb2b2f74cd7175917869cc4784d1e4661be606705e74cd34d7d406ed9dcd9d1add08bbf8aae564ccedf0940b9ea9fc7d64ce9aca SHA512 a655b8d7de9f9018b231c453f2b7e834be5dbbeae9342933f82d885094b0adbfff6d404f595c95941aa3c57b394f17a83d03a1fe0b3ef58e381e1580adf48719
-EBUILD fpm2-0.90.ebuild 621 BLAKE2B 2209fb77892413900f68a8de3b4dc52c5ac34c1cd297ed78632ddaf24d595cbd23f3c32cf5a3639b601791f270f6f15dcedb1047138c170ce18d1b02181d6611 SHA512 aaa7bb033bd7ec638db1c5f00a565bb0c569dc9860a90d70c9eb574077c3e02db67c0d5f08efaaf646ae17bfbd865da3e91e8efe16dcb21c0a8fbd72e266ad4f
+EBUILD fpm2-0.90.ebuild 619 BLAKE2B 227bd7b0270bc173a7fdeff7e0313398470d4c16808f3306eaf4403af0a8ed669c4f2cca1a881fe7773c24f9e5832cb1ba2b07711a403c9ff0be0c3b360991a7 SHA512 213afc4e9f64221a323d7c0f47f8246c7d75943dc7f76c94b3e43bd3a16e9f03e416bd24612d7f35cb04e6f52a0552402324f6834b44b9c46d739314d82cf46f
 MISC metadata.xml 245 BLAKE2B 26bf988c73d073000ab8d21ea881c4088b90e7081410938828744375bfa8de31cce2c78154ccfc61105c853c1f24f4994ca4e5cbb80c4c89dfd489bbd10a09ee SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4
diff --git a/x11-misc/fpm2/fpm2-0.79-r1.ebuild b/x11-misc/fpm2/fpm2-0.79-r1.ebuild
deleted file mode 100644
index d10f34560837..000000000000
--- a/x11-misc/fpm2/fpm2-0.79-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A GUI password manager utility with password generator"
-HOMEPAGE="https://als.regnet.cz/fpm2/"
-SRC_URI="https://als.regnet.cz/${PN}/download/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.10.14:2
-	dev-libs/libxml2
-	>=dev-libs/glib-2.16
-	x11-libs/libX11"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/intltool"
-
-src_prepare() {
-	default
-	# fix tests
-	local x
-	for x in ${PN}.glade data/${PN}.desktop.in; do
-		echo "${x}" >> "${S}"/po/POTFILES.in || die
-	done
-}
diff --git a/x11-misc/fpm2/fpm2-0.90.ebuild b/x11-misc/fpm2/fpm2-0.90.ebuild
index 0a7f6ea19f0d..d4ee0e2a7259 100644
--- a/x11-misc/fpm2/fpm2-0.90.ebuild
+++ b/x11-misc/fpm2/fpm2-0.90.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="https://als.regnet.cz/${PN}/download/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-libs/glib:2
diff --git a/x11-misc/gmrun/Manifest b/x11-misc/gmrun/Manifest
index b9c63b31caca..72d91e5c6470 100644
--- a/x11-misc/gmrun/Manifest
+++ b/x11-misc/gmrun/Manifest
@@ -6,4 +6,4 @@ AUX gmrun-0.9.2-sysconfdir.patch 863 BLAKE2B 11cd0ded75db0d90843799a1e06cc9118bf
 DIST gmrun-0.9.2.tar.gz 66097 BLAKE2B 3b8f253e8d683d02c8b6cc8da3d54103b53c6b9ebd4d90b4675325809f592f407a32532e6f0d3d3a112f5c7b9304eaae75bc3ba7f1e1b372614d95206edf0da3 SHA512 3ce881463c23b6c2c39b4d41ff98f3d4a2b77f45a46d4ac43d8bbf726fcb3769b643436932714f9f5c22b855188928453810468d165af2c2433059a0149d6422
 EBUILD gmrun-0.9.2-r1.ebuild 807 BLAKE2B 0072c5676d41c1747ed9c5fa4d054fe7bb95945562ade42e5c594c66cd6fc1c1e31144a76bed3fe5c2e6d18a4bcc965c4f8c3933c9893ccbe272d562bbec68b2 SHA512 b56da789824b6fdb5cf9f72a53757a2b0e6e2c1f8260867c6b9d05b2b95fc2e49c071860e3af64087bea36326d6888517276ae9253e4f26256248327dc652791
 EBUILD gmrun-0.9.2-r2.ebuild 768 BLAKE2B 3e79d32b18a322c86b83da6eb171ff6314757a8b2c81f7a6282301b015d73e3c29743354921b6ab7e410f1d88a808607313029ff6f9b689bdb80a8acd6b7011a SHA512 e36415e424243fd967bf85fb7cc66b8790da7db137aa61de9a0eaf24fc9c0199c2820a2bf54257e7e9827f0e427c653fd963941d72d824c4353f48040bfde46c
-MISC metadata.xml 523 BLAKE2B 64ba9f284e12ddc2c01c23641870422810ea147ef875177c633082e9ab65f86b0cef0ae332eb61235cee9facdc2de08a9a3e07b27cf595696ab3e42d03a161e2 SHA512 8cd78652f2a6be93952b1edb9570261fba71afff13eeba915e47c4178adfbb26450ed1159812ad211c941a0ffbd96b3e5b864c2c7300b882d2245285a1d3f730
+MISC metadata.xml 499 BLAKE2B 5353745aef22be8bf296f8904ff958a3e8d1ce3d09d560b7174f033cfba402e8fce88f040292ab7df81514ec131d2bf1a6e77a92a77a3e5413550b47ed5ea8f4 SHA512 1936f5ec9c0d0ed6ec8a4bb8700ad3d724498c876c2320babf9e5da987e37b25b81cfa09ecaada077d081075017c8efc53c4a02b64148ed2b9e916b3a7ee191c
diff --git a/x11-misc/gmrun/metadata.xml b/x11-misc/gmrun/metadata.xml
index 16bf22d5a663..062a0f912820 100644
--- a/x11-misc/gmrun/metadata.xml
+++ b/x11-misc/gmrun/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>desktop-misc@gentoo.org</email>
-		<name>Gentoo Desktop Miscellaneous Project</name>
+	<maintainer type="person">
+		<email>slashbeast@gentoo.org</email>
+		<name>Piotr Karbowski</name>
 	</maintainer>
 	<longdescription>
 		A run utility intended to replace grun or gnome-run. Most prominent
diff --git a/x11-misc/habak/Manifest b/x11-misc/habak/Manifest
index f0bda800668b..d3656dd089a0 100644
--- a/x11-misc/habak/Manifest
+++ b/x11-misc/habak/Manifest
@@ -2,7 +2,5 @@ AUX README.en 6729 BLAKE2B e7c97c01b774d6813bb87373b8634000b71094ad6668e6402805d
 AUX habak-0.2.5-fno-common.patch 586 BLAKE2B c6ad2d23f671ceee49059a87b50ba8405110c215961b0a89290224a470b7774c729d025e27cca98cc20d774ba47250e0f3fbcb9b6daca28699614fa28ad2ba55 SHA512 0e6ac0ba7555bfe9a8ca721575f7ae86331a6d31d76c28f1a52194cefd73646e6e52d90c5ca4601e3a8baea9ceb4c3cce08f75607fd65244ff4798fe668fcec3
 AUX habak-0.2.5-gentoo.patch 796 BLAKE2B 901f4673a8509029fde736c4dea5f809c268682b8a1800f51b21da40eb052a537e199193546c46169cb2d2914e61dbd8861b6e792f7618d8deba1122a2cf9a34 SHA512 0e18a2186dc533fe6defbb089e31999d16b1da3ed18a1315c6c54ea20b52641114a94cdc62d952d9dfe33f2a03899028aef4d6552141e79fb9399e9e42b396ca
 DIST habak-0.2.5-sourceforge.tar.gz 28747 BLAKE2B 60c6f60e0a16dca2091f41c9e4f419e5fb4be88a3ce44de98d91740f94e468fb7bd64bbf0b399b64035c21547b50fccf2e40954e0ff59ab1f1c0ce8dc6e56670 SHA512 4b1ff1484c65f74441b297e558360a8f2ea8f12ac63c4b74f846e41328dd84a1d619bde55e81224c3bd527897625e17bc07a6bb0d4cc3bd0eec6f4e787201277
-DIST habak-0.2.5.tar.bz2 22657 BLAKE2B 10b3c4808251b255bcf26935974514a2df5946520bd4bc080b9bdc551c727925c8b9a7485124013303654769b9daacff42d54fc0e5d567b26d99c5a75a0a50c2 SHA512 256ac24a3b322397b6cdbd2ca8add5938c77d166092a783234baa6186c3b4e01aeffd0b890749c7ac14aa39961e5fc6326f614ceb04eadfc5e4af282d04b7188
-EBUILD habak-0.2.5-r2.ebuild 953 BLAKE2B f3f8edebe88381e5677bc3ca658fc6280cc7dc1c1195f05b24cf70c7c9088d6eeadf1867d551e9fd8940a8b862a4addb2d63dee0d9c35d4e9b3fb8c9708c1e9a SHA512 d50d1b74cbc385494b872d5b8a685e0729d2a4b5f0ec29a0fa101c164df5dda3a1cd1c1329fd7613eea9ceb898660c1c4f099c8f995fe3320b326a92072da03c
 EBUILD habak-0.2.5-r3.ebuild 819 BLAKE2B b856bac330050b0cf52db34f7f39f9f625d6e5de0ab5a9fbd17abd6454be206ac3538fb3232c3e590f5f66d4c7ab3a531801bde8728d1093c98d76e20bb5bad1 SHA512 4f1b4461d71d5d2305004c2edb93c0992818905c770e24c1448901463c51188589978e9ed9056684eee4e265b5aa4cc931021dc046c6feba9805adf400f927ed
 MISC metadata.xml 272 BLAKE2B 4dbd2b5ae92564a97b2a06ab0ec6562e8dce2dd636aaf0788ee09f8688ca5d5b6483084a65366dfbe6d144d30170e5558bc5759adecb96abb405ea96a5147285 SHA512 ebe67da08587903b5b82fc194aa3c8f1ab65371f60d2c134928362e089550d9e9fd9531bffe8b676a345b5bf0ab209ce7f50d37d98201a88176f002e17582493
diff --git a/x11-misc/habak/habak-0.2.5-r2.ebuild b/x11-misc/habak/habak-0.2.5-r2.ebuild
deleted file mode 100644
index 9c1d05f55dc5..000000000000
--- a/x11-misc/habak/habak-0.2.5-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="A simple but powerful tool to set desktop wallpaper"
-HOMEPAGE="http://home.gna.org/fvwm-crystal/"
-SRC_URI="http://download.gna.org/fvwm-crystal/${PN}/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="media-libs/imlib2[X]
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-# Skip into the src directory so we avoid a recursive make call that
-# is going to break parallel make.
-S="${WORKDIR}/${P}/src"
-
-DOCS=( ChangeLog README TODO "${FILESDIR}"/README.en )
-
-src_prepare() {
-	default
-	sed -i \
-		-e '/(LDFLAGS)/s:$: -lImlib2 -lm -lX11:' \
-		-e 's:gcc:$(CC):' \
-		"${S}"/Makefile || die "Makefile fixing failed"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" ${PN}
-}
-
-src_install() {
-	dobin ${PN}
-	cd "${WORKDIR}/${P}" || die
-	einstalldocs
-}
diff --git a/x11-misc/i3blocks-contrib/Manifest b/x11-misc/i3blocks-contrib/Manifest
new file mode 100644
index 000000000000..7c3bcf8ea448
--- /dev/null
+++ b/x11-misc/i3blocks-contrib/Manifest
@@ -0,0 +1,3 @@
+DIST i3blocks-contrib-1.4.0_p20201127.tar.gz 738457 BLAKE2B 1db16c40323d0c191bb44c50d6a66523391adfdf9652976f78238fffe0ee50d99d3bd6fbcfd1a0eeef8308fd466a3eeda479299f462b4d4d31ae2f2bc7ea6b31 SHA512 ff09c7b8e4b630d014f0441342835dbf03642f32de6806a1204eccb6166eade190abe43b331ef72aaa3ba5a77f9690ae8c36a9ef9aa6d312ae5e543a46b99a72
+EBUILD i3blocks-contrib-1.4.0_p20201127.ebuild 680 BLAKE2B c6a400a49a9cfa6077b9bd4f64099419d4ba097ac3dc921c6c94ad0bf988969250844666bb9e3b161b09ea2463d7238599b3e4440ba403b92ec15ddee204f5d4 SHA512 7b01dcbbdc5d340f191e6b01d7ad06c7a190b420b56b5b6c8eac2bae7915fa2cd2606059973517aea90402a9501498922b8cb45765115086fb619596985fba3e
+MISC metadata.xml 332 BLAKE2B 174061304cb0b09fdc2279117f1dd3974b94104fe9926f854f149c580d6e64b4e2201f5a48f989b4f11a3db95e9e5051d393365069d95ca0f83b2db8b972b868 SHA512 911353979e4ca52a7fb5213811cfbac924f05eaa11f92313d65cc96d67eead4872deda29a5aa2572e67d63f2feb0f6e54bb4fd1d4bc41e4c9d6406e6153bb5f8
diff --git a/x11-misc/i3blocks-contrib/i3blocks-contrib-1.4.0_p20201127.ebuild b/x11-misc/i3blocks-contrib/i3blocks-contrib-1.4.0_p20201127.ebuild
new file mode 100644
index 000000000000..91c7d5c78649
--- /dev/null
+++ b/x11-misc/i3blocks-contrib/i3blocks-contrib-1.4.0_p20201127.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit vcs-snapshot
+
+COMMIT=154001e5713c26c70063446022919225b6f916f0
+
+DESCRIPTION="A set of scripts for i3blocks, contributed by the community"
+HOMEPAGE="https://github.com/vivien/i3blocks-contrib"
+SRC_URI="https://github.com/vivien/i3blocks-contrib/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DEPEND=""
+RDEPEND="!<x11-misc/i3blocks-1.5
+	>=x11-misc/i3blocks-1.5"
+BDEPEND=""
+
+src_prepare() {
+	sed -i -e '/^$(_BLOCKS):/ s/$/ installdirs/' Makefile
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr install
+}
diff --git a/x11-misc/i3blocks-contrib/metadata.xml b/x11-misc/i3blocks-contrib/metadata.xml
new file mode 100644
index 000000000000..827ce55718e3
--- /dev/null
+++ b/x11-misc/i3blocks-contrib/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>bkohler@gentoo.org</email>
+		<name>Ben Kohler</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">vivien/i3blocks-contrib</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/i3blocks/Manifest b/x11-misc/i3blocks/Manifest
index 22f72ed9dcc5..bc6a8785df45 100644
--- a/x11-misc/i3blocks/Manifest
+++ b/x11-misc/i3blocks/Manifest
@@ -3,5 +3,6 @@ AUX i3blocks-disable-bash-completion.patch 468 BLAKE2B f4a2777bfb42468abaa797624
 DIST i3blocks-1.4.tar.gz 35943 BLAKE2B 84c1d08d173238ecd875254015dc78cb560cefb1eb11d9628dc8572fb44f9724927e622aecc9888c43fdc435df8b07f6b07e22c4543354edb2d92cc8d5d00321 SHA512 f04fd68d59097b21bc88f3097dff137de656dd3fa696d9c04b987ba25136e5e5d9cacb63998e8635fe55fcf94f47900aec8c79d98e1d1d8847856a89ad9a6578
 DIST i3blocks-1.5.tar.gz 66019 BLAKE2B 0378dac61d2f0049dffefe2a3f98512518aef311f2d9d79b72fd9882834c6a09c8954e7ca906fb96bbcc76992288fe659b4977f2cfad1234dca27ec9131ac720 SHA512 759829d59f94070251378d437891c2df05715fbd0b734c34dd41767d61957f301c6125b0058668295b8eeac29038fae6b2e8c194f903398ee736662213d1d534
 EBUILD i3blocks-1.4-r1.ebuild 769 BLAKE2B 871a9eb5cf632c053ed5795047fa1b87b8a16519e9892a96f6ceab764b28c4b2808cbc28afe9f869fe9868a8ccc295ed65b87d38c74dd81d1e9beb771174b104 SHA512 a54bd1cbf1464eb5b7ddd72d1926aec330943602bdc346ab4e74ae5c4030365566dca85d9afda23760a8e66514fcda6172b7171fa063672c9db61d7428aebfa2
-EBUILD i3blocks-1.5.ebuild 701 BLAKE2B d97e08f64db12c186492425e295c9965e751bce21bae83939cd0f2f012f87bd20bf9410dc3cb08f0a0cdb0d52ccd23f56cd67dcd29a1f82fd1a7771232c3e39e SHA512 c7c2e8d056b83ebcf2212610f92e72ec82036a2ab42cd2072c9f00fd261b958df050bbaa15d1fe7ac021bd23787140e467b4cdc9f5b69e5aabf0d9d9cbf4aa3c
-MISC metadata.xml 331 BLAKE2B 4e906b5d485968ff9cc55dca82cbd704cc57a5ecf77c230bb7fd6e2a910c236bc0afa1d457f4b90b758ca5ecba0b2505512fc21f7dd12179d2b275d425430a14 SHA512 2191950260e909fd05a03d80a1f9ccde802e4e3ab890a2e05305f2e3e1c48e4c56200fddc9019b630a9efeaeac92509910e1f9b22f1a2ce85a8d005930cd05af
+EBUILD i3blocks-1.5-r1.ebuild 767 BLAKE2B cec20a8858f8526ec4ec5d35ebf1a15fca736b44f962cdb190fe2a13812d99804ac931070d922b235f83353109f8d3d69e0e90ecced7a235316772d74881982e SHA512 fa5683103f2190a824ce2100430edd1aa75f73d9c13e132c7135a73a64f19fa39c15fba78515028240e9e144934cb0515dd44cf6f701b1aa8e8f892be745e4ee
+EBUILD i3blocks-1.5.ebuild 699 BLAKE2B 2ca090318052d5c5fcf03d5b0b4ed896217a81194800cf07c00f7c8d47c79424438678eef5d5b1fb7b1c6c0d4982fbc4277dfdf8f4f417a8939b2ea775594d60 SHA512 7693bce42f2959023b3601e4f10da5ec2351e85bb4271a2192a14eabb45f6515a57ad21ddfe4931019b1d7109691ee544d595bc27ae8a3d68abe4b59bae34058
+MISC metadata.xml 400 BLAKE2B 306658e11cb2e3dbefbb4f79cb3d41137a9f70d2a2ad9e63dcb90d1663a3b3d3220a09f3a29ef451a4191f73ccca8294dbd96225da5c13f2186f6e1ddc8dbfe1 SHA512 43531d6c06327673e8cdf74fee209b01dc17d1c50f54a24a793fdbffde4069694502da52013ceae37dfd57c52bcafef530a36746d46e2931aba93c2673647d07
diff --git a/x11-misc/i3blocks/i3blocks-1.5-r1.ebuild b/x11-misc/i3blocks/i3blocks-1.5-r1.ebuild
new file mode 100644
index 000000000000..418265489eaa
--- /dev/null
+++ b/x11-misc/i3blocks/i3blocks-1.5-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1
+
+if [[ ${PV} = 9999 ]]; then
+	inherit git-r3
+fi
+
+DESCRIPTION="highly flexible status line for the i3 window manager"
+HOMEPAGE="https://github.com/vivien/i3blocks"
+if [[ ${PV} = 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/vivien/${PN}"
+else
+	SRC_URI="https://github.com/vivien/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+IUSE="+contrib"
+SLOT="0"
+LICENSE="GPL-3"
+
+PDEPEND="contrib? ( x11-misc/i3blocks-contrib )"
+
+PATCHES=( "${FILESDIR}"/${PN}-disable-bash-completion.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+	newbashcomp bash-completion ${PN}
+}
diff --git a/x11-misc/i3blocks/i3blocks-1.5.ebuild b/x11-misc/i3blocks/i3blocks-1.5.ebuild
index d8ceeacffbb7..9922b9524a99 100644
--- a/x11-misc/i3blocks/i3blocks-1.5.ebuild
+++ b/x11-misc/i3blocks/i3blocks-1.5.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
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/vivien/${PN}"
 else
 	SRC_URI="https://github.com/vivien/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 SLOT="0"
diff --git a/x11-misc/i3blocks/metadata.xml b/x11-misc/i3blocks/metadata.xml
index c6de48eeb14f..2e726d1c36a9 100644
--- a/x11-misc/i3blocks/metadata.xml
+++ b/x11-misc/i3blocks/metadata.xml
@@ -8,4 +8,7 @@
 	<upstream>
 		<remote-id type="github">vivien/i3blocks</remote-id>
 	</upstream>
+	<use>
+		<flag name="contrib">Install contrib modules</flag>
+	</use>
 </pkgmetadata>
diff --git a/x11-misc/i3status/Manifest b/x11-misc/i3status/Manifest
index 9e6a5ca5dd1f..eedc4e162067 100644
--- a/x11-misc/i3status/Manifest
+++ b/x11-misc/i3status/Manifest
@@ -6,6 +6,6 @@ AUX 0005-configure-disable-pulse-on-OpenBSD-and-DragonFlyBSD.patch 1463 BLAKE2B
 AUX 0006-On-NetBSD-include-sys-socket.h-for-AF_INET-6.patch 636 BLAKE2B 0aa1c55badb28a220e949a96227f0ab43e1508754187040853141e90fb2d946af5a74e586f993dd57305babb01cd1a9e474c860242bd61d78816e2ed952fdf40 SHA512 8c3a220c95fa4ef2d270e70fc922933d3ab0b8cf16f49746bb784b43033424f94937ebeea5c4162d52db1e990f3c2662ce23477ffb64597a31a17a13fc368019
 AUX 0007-make-pulseaudio-an-optional-dependency-follow-best-p.patch 3810 BLAKE2B b6e08d130fd4ba4ecd3c851edb01acfbf976f8a8134a5116115330b6ead2ae04c53fafba82ce2b006203221737a494276f82dde5140113fabec70cd0aee6b4a1 SHA512 c89341483ae97d43e58ea66324b0f8691bfe3cf849ebb3dfa4c76d4456c3bc1f2239692f2a3fa3b0cef5980ffa807e9c0c9809b16af2755b7cb71c39869a8e83
 DIST i3status-2.13.tar.bz2 201409 BLAKE2B e087d69e2df3ae9348cb55739023b2164dfa3543551d173b138c72e574714069d8397716b95e92c4315aa538ea31b33aa73532d6d0f75bbc38d7db54e1f665bc SHA512 6dadff19e53499d169ba4f491e1f821014b4f92fc3c93d7947c85cbbbdeaba538d02bd8ab98fe266a8f80756a287fd5803ec77a8cd874d50082b5cad309875c2
-EBUILD i3status-2.13-r1.ebuild 1591 BLAKE2B 1a0d3ee2139387cefa4fc3e63ca77e440c4b3ea2fbf1d7aeaff90f82f2f7697da047261ede6b61936867f0e4da00ff585c28796e8223c50357ad2068bfae0225 SHA512 1037bd5785a7e9353bbe8fab6a177e5cb6d062e5a9a4e8533d72582ba2792ba95a395cdadae25881fc3d4549d636c738123794edcac5dbf5cf63c2e0b0571b5b
+EBUILD i3status-2.13-r1.ebuild 1589 BLAKE2B 2d41ef01ba4d5cebe12dc40dad94b6ca8285ac37e3f2e16553fe7a916387e52512e20e94a02119fa95ed935853b91234b37b504b389c0ac2fa40e4123c9f0d47 SHA512 efbe456e810b7ffee5fb39b771ceed63c85d70b66f8a7d889da97417fc2976c7fa23631abb178ab66780ceb3414eb384266e1e08bff2abc39cf00c6adca3b77b
 EBUILD i3status-2.13.ebuild 920 BLAKE2B d8259edb35966d55a19871a8727b744c3a353d76edf243ac25049fa8992477eb599ffafc68e94138f48e82bea036e43efb997729205b55aa77fa10eb8c4a51a4 SHA512 27845022d890ff5fa2feee8978082944dab85043160b1330215458e77366469e36a056fcdd33aa5bb235ae9781b5bbbc6f3cbcc5318831b173e1bd9e53f404bf
-MISC metadata.xml 1035 BLAKE2B 0ab04f4037e04d28ccf2e2305775eb7dd15583e3fa6af85f7ad31d442bdf06db20820855297eedd9630b374fdf4a096e8c15ecf994e516a27a28b29fc132ff14 SHA512 7ad11f6cc4e572f43f6cfb6812b04886888f9b71bba7e6c38523713ee6856f36fd82eb525b5d36d97f77e1f96c93d0b6887865fc867531ba5a884f614e577ab5
+MISC metadata.xml 898 BLAKE2B 26948920cf32c22b1f80e57bae048dbbe6675d2b3e3593bcaa8e5d5790f34647f81b666dc2b8ef25345755bbcfee1bf71e44da76f508223ce432ddc71e8520d2 SHA512 70981067b9c47528a73fee30a5200b274613d69ed31622ec22de2ba59c5e1138dadeeecac5c5703750ecab7e08629a7a8456a1de208fe404a242929ddc2c88e6
diff --git a/x11-misc/i3status/i3status-2.13-r1.ebuild b/x11-misc/i3status/i3status-2.13-r1.ebuild
index 9107ec983b70..eeae885823e2 100644
--- a/x11-misc/i3status/i3status-2.13-r1.ebuild
+++ b/x11-misc/i3status/i3status-2.13-r1.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
@@ -10,7 +10,7 @@ SRC_URI="https://i3wm.org/${PN}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="pulseaudio"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/x11-misc/i3status/metadata.xml b/x11-misc/i3status/metadata.xml
index 79925c7a5a03..ac73075b7acf 100644
--- a/x11-misc/i3status/metadata.xml
+++ b/x11-misc/i3status/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>desktop-misc@gentoo.org</email>
-		<name>Gentoo Desktop Miscellaneous Project</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>slyfox@gentoo.org</email>
 		<name>Sergei Trofimovich</name>
diff --git a/x11-misc/imake/Manifest b/x11-misc/imake/Manifest
index a3b1ecbf0732..a00158ebd8c7 100644
--- a/x11-misc/imake/Manifest
+++ b/x11-misc/imake/Manifest
@@ -1,3 +1,3 @@
 DIST imake-1.0.8.tar.bz2 159398 BLAKE2B 2ea03a06daab883a35ac4ef5c5598db89c84b2bbc41105902f64ffaf66a2e5cebaa28bef0ee7d258eb7279eaa95671b8798701423cafffe87d8feced5bc1b63d SHA512 5352b0148664506c8eb7ba80f95fced146d150398673547ba0b2c7c966a382bc21de43dfb8e0d74e38a0a563f16ddbec48bf8c8e6daa1a0899a95403579d7728
-EBUILD imake-1.0.8.ebuild 522 BLAKE2B 77128b5558cdb78e00b422c04f844ba90b6ba66e23fc8be87d656803553e7b523dbc2c77fa4fef0f34c14c51dad2c198e35ed563ba0c4ca6c4c767d9c41888a2 SHA512 b0a62ca4ef660d97c6dc7f54775228aa478521b45b258793391c6dea171b79bfe27e637d39ba63effb9b4ce14e773ad59890ad798e1420452b7433a855c6e695
+EBUILD imake-1.0.8.ebuild 507 BLAKE2B ee0bbda5ad649905cb4a41487a0a2f2176666c20133b2d1a35d80aa9ea08f80885caf222a9ce9f105d7b0a843aa518b7db29621038046e15c7cafbbe5ee41ab0 SHA512 e8b40578cdaf3dd290966733ec0f7713113d245d24a2874da574481261bee44dc07d9774ecc981fc3c7af77bcd8118c384fafcaefd8cffffdad76db4ce615351
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/imake/imake-1.0.8.ebuild b/x11-misc/imake/imake-1.0.8.ebuild
index 3bc41c5b6d95..83e3302b4d8a 100644
--- a/x11-misc/imake/imake-1.0.8.ebuild
+++ b/x11-misc/imake/imake-1.0.8.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=7
 
-XORG_STATIC=no
 inherit toolchain-funcs xorg-3
 
 DESCRIPTION="C preprocessor interface to the make utility"
diff --git a/x11-misc/libinput-gestures/Manifest b/x11-misc/libinput-gestures/Manifest
index 6d1061c519b7..1e3755009ffe 100644
--- a/x11-misc/libinput-gestures/Manifest
+++ b/x11-misc/libinput-gestures/Manifest
@@ -1,4 +1,6 @@
 DIST libinput-gestures-2.48.tar.gz 22858 BLAKE2B 67fada253a0d02791e14c6c2175f37f75c2e4ff04b04360070d1c045cf064a9d7b362c28a1e8130e6cc435bd487370c69ded3af41d53b935f7024d722aca9593 SHA512 6ad510f2067ab6cef9c9a94f1c300fe91aa811904a0e85209dc06b3afdd4a2be8ae7bda8ccb40210cc59c3758e3b14b53285f7c3c29c6982a3894952b678a840
+DIST libinput-gestures-2.56.tar.gz 26293 BLAKE2B b48a33c13efc63545bcb5ae722066493bd6aba083a07b1ebbf10eea69afa2a8f9d80a92b60dda3e8472a55851b70e84cf7c10e0bf3428c2278dd3ef5b6f65d0d SHA512 f215444dbe7e70ae137404beb25d5a60c5a618fb2d3d20eb9b4cf3f94cbc93a7e42a5fa82efdea082e2fa229c95d86c02df91c59f4a51c067e47ccf5dcf79fa7
 EBUILD libinput-gestures-2.48.ebuild 1339 BLAKE2B 95965c98d19555134dce9e75caacea6621a8a8466d317264dbffe53fe89dcf977d9b8fe1830c82705b594a85757483c093fc2056264f0ee7e730b9474e59771b SHA512 061b1feedde28609ea7da4afa240c7ce7d15cf9b5eaf961b40bd4822375f9a4e6e9c963836906253b5df89cce9b11538dfc3a3f71a3703626a4afbba4a3f82ae
-EBUILD libinput-gestures-9999.ebuild 1339 BLAKE2B 95965c98d19555134dce9e75caacea6621a8a8466d317264dbffe53fe89dcf977d9b8fe1830c82705b594a85757483c093fc2056264f0ee7e730b9474e59771b SHA512 061b1feedde28609ea7da4afa240c7ce7d15cf9b5eaf961b40bd4822375f9a4e6e9c963836906253b5df89cce9b11538dfc3a3f71a3703626a4afbba4a3f82ae
+EBUILD libinput-gestures-2.56.ebuild 1276 BLAKE2B 7857b10c6096683619bb34cd41f69a8a4fa85cf136eca758fc203c475353c1dc1b668de9f029624a9182c0154dd5dca69fb817083abfd9941fb1639388e1165d SHA512 972bff57d2b9b5e1fb7edae7e81b2e77b14f1fdb7414eb854bb9aeea17f8bb15eebe6c5510ae0c03285c2e439bef889fa8762959b2c747dc42aa2614a47b685e
+EBUILD libinput-gestures-9999.ebuild 1276 BLAKE2B 7857b10c6096683619bb34cd41f69a8a4fa85cf136eca758fc203c475353c1dc1b668de9f029624a9182c0154dd5dca69fb817083abfd9941fb1639388e1165d SHA512 972bff57d2b9b5e1fb7edae7e81b2e77b14f1fdb7414eb854bb9aeea17f8bb15eebe6c5510ae0c03285c2e439bef889fa8762959b2c747dc42aa2614a47b685e
 MISC metadata.xml 825 BLAKE2B 2c2b255745088a09c94810f34d5540b437428582a8b4e67fa31c47ae7257ded169b8047c2ebce98e090092063d9d3086f60cf6f04accc6c50a62313d1c14528b SHA512 9ed80c1c4113a9539366f66ddcc1a0169d42252e0cf347693085d89dee2259c9c120f4e864e35d42a1af9f86019ef944c27bd2ba71cba6ff6eba8509281807c5
diff --git a/x11-misc/libinput-gestures/libinput-gestures-2.56.ebuild b/x11-misc/libinput-gestures/libinput-gestures-2.56.ebuild
new file mode 100644
index 000000000000..ef3844015c8f
--- /dev/null
+++ b/x11-misc/libinput-gestures/libinput-gestures-2.56.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit python-single-r1 xdg
+
+DESCRIPTION="Actions gestures on your touchpad using libinput"
+HOMEPAGE="https://github.com/bulletmark/libinput-gestures"
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/bulletmark/${PN}.git"
+else
+	SRC_URI="https://github.com/bulletmark/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/libinput
+	x11-misc/wmctrl
+	x11-misc/xdotool"
+DEPEND="dev-libs/libinput
+	dev-util/desktop-file-utils"
+
+src_prepare() {
+	default
+
+	# Fix docdir installation path
+	sed -i "/^DOCDIR/s@\$NAME@${PF}@" libinput-gestures-setup \
+		|| die "sed failed for libinput-gestures-setup"
+}
+
+src_test() { :; }
+
+pkg_postinst() {
+	xdg_icon_cache_update
+
+	elog "You must be in the input group to read the touchpad device."
+
+	if ! has_version x11-libs/gtk+:3 ; then
+		elog "${PN}-setup script supports Gnome 3 via x11-libs/gtk+:3."
+	fi
+	if ! has_version kde-plasma/kde-cli-tools:5 ; then
+		elog "${PN}-setup script supports Plasma 5 via kde-plasma/kde-cli-tools:5."
+	fi
+}
diff --git a/x11-misc/libinput-gestures/libinput-gestures-9999.ebuild b/x11-misc/libinput-gestures/libinput-gestures-9999.ebuild
index e1af99e98ebe..ef3844015c8f 100644
--- a/x11-misc/libinput-gestures/libinput-gestures-9999.ebuild
+++ b/x11-misc/libinput-gestures/libinput-gestures-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6..7} )
+PYTHON_COMPAT=( python3_{6..9} )
 
-inherit python-single-r1 xdg-utils
+inherit python-single-r1 xdg
 
 DESCRIPTION="Actions gestures on your touchpad using libinput"
 HOMEPAGE="https://github.com/bulletmark/libinput-gestures"
@@ -23,10 +23,10 @@ IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/libinput-1.8.0
+	dev-libs/libinput
 	x11-misc/wmctrl
 	x11-misc/xdotool"
-DEPEND=">=dev-libs/libinput-1.8.0
+DEPEND="dev-libs/libinput
 	dev-util/desktop-file-utils"
 
 src_prepare() {
@@ -51,7 +51,3 @@ pkg_postinst() {
 		elog "${PN}-setup script supports Plasma 5 via kde-plasma/kde-cli-tools:5."
 	fi
 }
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/x11-misc/light-locker/Manifest b/x11-misc/light-locker/Manifest
index 23b422eba797..997dafaee4b1 100644
--- a/x11-misc/light-locker/Manifest
+++ b/x11-misc/light-locker/Manifest
@@ -1,4 +1,4 @@
 AUX light-locker-1.9.0-elogind.patch 9704 BLAKE2B ead5c1767ac6772477e977bc57bb63392080be397a094dabbf4f4ac779b274f27f045447609c7ce39c6a1602dd2d046d84eff21688e1e4c98c29376e579b7830 SHA512 580a32670e63979691cd1a2102f49e4af23677f4bff1c597c6a87196235844fd1ba3c8d30e148f83b99466a77908f3204e35b57bb01c25fef949e0e3e37cf2f2
 DIST light-locker-1.9.0.tar.gz 124753 BLAKE2B 510447a5fa107988a06e92cc99d7750bc0df526356630694c5dc718460bd437879bbdcb69e0778bdb58d399aafdbea762bfda53d2e2205a1c4bade27dbff78c5 SHA512 c6f84b38affa20cf0bd7d2341f5a8eff36891ed55401955715a68a011c84c7f2300db670abb95a320eb40aee90885fe044ddf0a721e418ee4724af3e4f6a61a4
 EBUILD light-locker-1.9.0-r2.ebuild 1597 BLAKE2B 7c8cdc55983f831aad418aabdb16f7e71027cc23774aa0258a8a73f3bd88ffbe1d6c5ebc4e9227c1ea1647d1ba0e09a818c18497dcd5fdd1b66f79e11f213a49 SHA512 ba3045591150ea5d78cb9b65a26a852a63167795d6f1efa4ba943a18b9bd71fe2002ccfc2e8a9a0d88b22d20bba2c95dfdfff753addd876fcabfa13796e47104
-MISC metadata.xml 521 BLAKE2B 9b974736314ee4ff02a8f58b7d3709a540998bcc087ff622f551e64a2588ea522b7c3429f15b6b4fdaad503d9791e9f2f3325cf10201c6b6f141fdb3e3af81d5 SHA512 a2c6dc9548b2da2a12c037867b2af9488ffecb31439556729d60372eaabfd60bdc4e2389d733f02e480b6c63a42905411d387ee2cb6866427928dc4886dfed4b
+MISC metadata.xml 435 BLAKE2B 414e019caf3289479ae0531ee7339c8776f428666562739070e13d8f15b8c7038873774791f98026f6933097f1462eaf3a40d8ba2de743b67591a5972ecf1d5a SHA512 edc6e5d82c9f9f3a22ca2a0d04f34f9937d445ce2b656fe40b61445ffa23d909e698c45252fd5ca369666b5198e26a7061588cba517eb8196e5b88dcb72a11de
diff --git a/x11-misc/light-locker/metadata.xml b/x11-misc/light-locker/metadata.xml
index 610b2ccac31d..4e7f0e4f6abe 100644
--- a/x11-misc/light-locker/metadata.xml
+++ b/x11-misc/light-locker/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>calchan@gentoo.org</email>
-    <name>Denis Dupeyron</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <use>
     <flag name="dpms">Turn on the display on screensaver deactivation.</flag>
     <flag name="screensaver">Lock the screen on screensaver activation.</flag>
diff --git a/x11-misc/makedepend/Manifest b/x11-misc/makedepend/Manifest
index 7ce820571fbf..5ebf433941d0 100644
--- a/x11-misc/makedepend/Manifest
+++ b/x11-misc/makedepend/Manifest
@@ -1,3 +1,3 @@
 DIST makedepend-1.0.6.tar.bz2 147616 BLAKE2B 6e9538e435d602ab3bcfb35a5398d6f11a23e4c9fa19bb2e3f651967d3fb1945557af2a5d84fae3e46112aae9ec411894cf8605e4856a46b120b660ff4b95ea4 SHA512 eb0e8ee8ab7515806d7d98a060cdcd392ec38e4225e5e05db26daa6651f185d0b764aab403edeea904d4d23211b1f7db20daeee6eafce8abe65225784ed0aa42
-EBUILD makedepend-1.0.6.ebuild 404 BLAKE2B 5f109590338924aff5cdd10d786b69474dba44d797c93be089dd2f7af4f3a51b090aecf57d038163b4f67ac3cc51ceedc3fd694d02093e7060c9e2f62297f129 SHA512 2ca0b70020a513dac77dbcd8e874e6b8193ce0d5658446bba737afa1f099420a40abe5762994ce6c685dd733cfcd8a934ee3867f3540fee4c81115bf3bb66e93
+EBUILD makedepend-1.0.6.ebuild 389 BLAKE2B a6411319b802d19d376e3622d2c1193ee5184e6df600c1970b1e147886c1464c75fad78c24c6bd08a923fda8dcce073aa3ae079590fddc5aec9395e35bc044fd SHA512 4ab353d27f70734c5a778f0f1cd8ba1e007b4f41b81135f31fbb2ee80a49550b257655e12691c696edb4ac6a0fc1c2a377ee71f5189772a7a56b0806b499a2cb
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/makedepend/makedepend-1.0.6.ebuild b/x11-misc/makedepend/makedepend-1.0.6.ebuild
index 43f22b11557b..d89f1ced1741 100644
--- a/x11-misc/makedepend/makedepend-1.0.6.ebuild
+++ b/x11-misc/makedepend/makedepend-1.0.6.ebuild
@@ -2,7 +2,6 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-XORG_STATIC=no
 inherit xorg-3
 
 DESCRIPTION="create dependencies in makefiles"
diff --git a/x11-misc/obconf-qt/Manifest b/x11-misc/obconf-qt/Manifest
index d234c801d44d..941e88afedac 100644
--- a/x11-misc/obconf-qt/Manifest
+++ b/x11-misc/obconf-qt/Manifest
@@ -1,5 +1,5 @@
 DIST obconf-qt-0.15.0.tar.xz 99976 BLAKE2B 7c7aede61cfc7a26c56de7e6ab49410dc82f4f9fb4f293fa0f0896f1b14cff63d34d00dd56347ec8daca375e226fed4ebb58c633061129708fd5107daa97d074 SHA512 a723dcd3b409afc7b16572d293cbf0543e00a7177a9819e2374632c00c765de74896429f6e19a54fcee83e20ce2e0876f857447c374db2f4f925dec92be71279
 DIST obconf-qt-0.16.0.tar.xz 101588 BLAKE2B 94407df40878c64a40343ad2a8fdbebc78a99beaf017485fda52d6043f2597467c67da465dd191a78ba7c084f1072152d4033f7b5b41f257946941efda37a9e3 SHA512 ab0ddc013ca877f2434da956c314b248f6a7ef5ced1e5c605de0652d0b8c5c0e84f1e6fdf8b21c6f3d450d57a1413d625d0a31b84cac2c9062dc0f101d8e57ab
 EBUILD obconf-qt-0.15.0.ebuild 907 BLAKE2B a004fcc83626c5abc8673361e9ed2d0a34ce6cc6640b245b3312a2bc2c68be9ac8c208eb7d5ea06473e02f1239c3b4eb10a371337d2c8aa80b54357709e78003 SHA512 857a0b53d75f1e4c769096d70242471234f7331b7828f345c08111d01d30ea52bd262103c371e7f97d9e88fdb01c1bd0fc6a0d7b74e5f4dadbaca8e4073eb5e8
-EBUILD obconf-qt-0.16.0.ebuild 909 BLAKE2B c963decaaa445f61fec48ef052377f7ad642ed101b1e69ff7598e5f66ebcddfad906b419c63481cb0a0d1141e476da4065b551e7662f50bd353ab3c9291db007 SHA512 36c79b692dc2fc0af7fe7bd138a26b8506ec5233284338075f83fc404f6df007ab6c9a05f44798466b9d1dda77dff439a43f2c2bbedea41a7676c1260dad21dc
+EBUILD obconf-qt-0.16.0.ebuild 908 BLAKE2B 345ceddff907a6d5989eb63260509fe03b30ee29ff946bed102c68f86f516abb137b66df14fd131ca193f9c10a002332eba1920e4abbc5be6e4d207f6b328d11 SHA512 5b1b5981e33172d486f990d39544a907a7088c3385141f6ad9832aa2a112dfacedd4e486ff7155499a0f29cac64bf20edd4d560470dacce14cd1648561f971ce
 MISC metadata.xml 315 BLAKE2B aba8e92e822b0a8f7213a6a2a723ada9cc5be720aa857152cfb2e395b8cae65dac8ce4c13e36e3ba774e22d800890c5ec7878f0266157b92e4f0332fd2ff8dc0 SHA512 b210ddb7b5f688fc122fead9a5fbac67653099db7671e442c53cf5246f091c8f58a6db94f2be7d3250a8fe24a619c6c9269b31f6c52f62049c40963dd8a6212a
diff --git a/x11-misc/obconf-qt/obconf-qt-0.16.0.ebuild b/x11-misc/obconf-qt/obconf-qt-0.16.0.ebuild
index cec157f207b0..2f737f6ae3ec 100644
--- a/x11-misc/obconf-qt/obconf-qt-0.16.0.ebuild
+++ b/x11-misc/obconf-qt/obconf-qt-0.16.0.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
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 
 LICENSE="GPL-2 GPL-2+"
diff --git a/x11-misc/obmenu-generator/Manifest b/x11-misc/obmenu-generator/Manifest
index ab10cc30fffe..5709ba3f50d7 100644
--- a/x11-misc/obmenu-generator/Manifest
+++ b/x11-misc/obmenu-generator/Manifest
@@ -1,5 +1,5 @@
 DIST obmenu-generator-0.88.tar.gz 20569 BLAKE2B 0b17a3d379f6a92e08dd1f2e6d943e4d30f669c11847ad1354f44c41e8d3714b174fe6194a4b952664e9cc8408080ba236871b83e9f2498f5d337bc6498e92ec SHA512 650915562792b20cb39175cf2e7d11141eba24e3345cb54e5400a18f324f6fdacc4008d57d091a3ee64a36ebcf4548d0c8328e6a2dbc62613c7001b97e10332a
 DIST obmenu-generator-0.89.tar.gz 20583 BLAKE2B 0513713ed08fb47b212b07a8c8d1a2e496f6962f9940f6dc8e087043276b3d80a5c305fbebbc0c0a39c9c75058bf363adb4c8739f51ff08258e63b1305a320fd SHA512 a796b1a2c6a3080627129360cc67695b73ee7ce82a4e4e879b306fe45f73d9223c8a08d053e7c9c9e8fbb779c3ebad15737b81ec4dfb9a406d77ac74cecddde0
 EBUILD obmenu-generator-0.88.ebuild 805 BLAKE2B f7ed00f5bfeb176b6e14663ae32016a72b9e4c08fca8cd689634021eebdca540cb803067c18943bed886b1c5bc52cf497a7a469addbe7b49fb37a5752215a26d SHA512 727b300980f85d4021c12295c8625573045b03b9c01f443a66aa146179a270ef02ae3c574316b6e2adb4530968fc142da6606f0aeaa795cd300d3d66e25e4d8c
-EBUILD obmenu-generator-0.89.ebuild 807 BLAKE2B 2dcd051b572e98e85e2912f95909e68c653f2856807ca6dd31c56bba494e21a65857c7e4f54637e5d2d199bc0f3c8c55846204999944d38dcd3b69c6c3dd3067 SHA512 b077f1281213801439ae787e8a3a83f9e6a0067bb615d6709cc1229e47f58c61b133b9e3f5ff8b62e9abcfcdc9a7cee56145e4ed79cb8cff6f5989787ad7dffc
+EBUILD obmenu-generator-0.89.ebuild 805 BLAKE2B 7ac2f7baca20eb2ec961c9f89ab9f28137f7d9da94129d65bcf38f5ed39834df0dfee5ae6f3eb517f3c4d7213956b1e36259530008228728aa8d335c7ab4da84 SHA512 701e98a8b9c2202aa81a7916d886e0a64315cff92bbd901e8ef014c9dc8ed89ead620f189660cdca2b52f96eafd637f534d8671f58b5b24c6f0c9e2e4846711d
 MISC metadata.xml 445 BLAKE2B 6f47ae8ef7c079b03a0e8769bcf6ea35b0743dfb8f94f7ee99eba54f0dd1e66ac12a1d9198ffa246601965d02a0260ef667c4b48bac243fa1c82afe0e094be1d SHA512 8cf342329f67576b238d72043cc6485628f78874ee2a0ec54c0cba8e99ed5eeb0348c75396f035c82f6d3dbb501e338d090cca8bacd0a9c8ac969cf9e4de9d67
diff --git a/x11-misc/obmenu-generator/obmenu-generator-0.89.ebuild b/x11-misc/obmenu-generator/obmenu-generator-0.89.ebuild
index 8a36e7f9249a..a6fc9b2b7e48 100644
--- a/x11-misc/obmenu-generator/obmenu-generator-0.89.ebuild
+++ b/x11-misc/obmenu-generator/obmenu-generator-0.89.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="https://github.com/trizen/obmenu-generator/archive/${PV}.tar.gz -> ${P}
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-lang/perl[gdbm]
diff --git a/x11-misc/pcmanfm-qt/Manifest b/x11-misc/pcmanfm-qt/Manifest
index f3304648e15e..70b42e5a2bae 100644
--- a/x11-misc/pcmanfm-qt/Manifest
+++ b/x11-misc/pcmanfm-qt/Manifest
@@ -1,5 +1,5 @@
 DIST pcmanfm-qt-0.15.1.tar.xz 257832 BLAKE2B 78c8f5723b529b7f8a00870f017818183a498d8a1f68f8f24ab756eeda9b35d8d998b42d87f78e4a8fb6725bf3e812dca74bc1464f285a6a984dae1996b43f46 SHA512 db0d3cc683b5c94cabab5a8c68b3ae8bf5938735b34989a420692e933bb54d53ebb15da9af4a59039bfd101de0cc00c521c08207e81bfad9d80315e2d94bc559
 DIST pcmanfm-qt-0.16.0.tar.xz 275792 BLAKE2B 65deed6a6d942a57c6cdf497d254d5052b1bcca219198f3cbaa2bcd29048976610afcfc31cc2101f8ddad88f436bc8dba2483b8305ff55f178dd65c91a549814 SHA512 42c754267966b29722bd771d6f6f09c20cdb3b33bbe49deec982bdac98379dff92ac13f6f70b603aea963a3e1003034475cb682ec4264cfcf581c189826ea727
 EBUILD pcmanfm-qt-0.15.1.ebuild 1098 BLAKE2B a775a49e89656b9a857aa2095d3f770ff31a1df5591e6e69f0eb2308723449ec3e3dc7bba053fbab8074d63b1a821f3dfe1b8d1df0a869c6c9b58e3526d3295f SHA512 360c8d2adbfa632a5803ab2c1d00324a5b157322e64b4efaa050d6e51aed33fe355c7b81775731c7b4278397ea1e94eea8f5193577ac0f64804604f914e0ac2c
-EBUILD pcmanfm-qt-0.16.0.ebuild 1100 BLAKE2B 6aa6ad9bfb166469ee7212c9516242899e683b92477424f36f72f1e902f3bc7c8d41ecb0ccd018c24c1b836a097164d01e5d7ebc90a6d28458643fc7d6238b48 SHA512 f10af39c79d9fd1bb6bb86612b35f5d1759c898dbd99c42a7080d82610944905bd3d40da31543edd1b9177118e3c9380efbd188b448293e4f2b746c702e967aa
+EBUILD pcmanfm-qt-0.16.0.ebuild 1099 BLAKE2B 6c0398459837a047891b35770f7766dda49f5f55de02360624b1c381be35b8aa3198af3ac4d6ac21747866c8319c7b82bb5435ff5dc76f93bf2884d77d631d8b SHA512 17691b3af4a6902f97adf29dcf361aa417feed4506e13bfe7d98a29162d4277144da69afcc9c7547d0806a00c829c9b935fb0bf791a33d5782d685660ae389b9
 MISC metadata.xml 316 BLAKE2B 1dc58d42a91390bd5c19ee7dccf75687a2b612f7af9569f4f3a731e8eec49eba2e244c1ced6107ed51cdd377f8d026cf6589a49c3314c60d38f58a68d7e82415 SHA512 910454c7d138693e0020b922b7b32749fdb70bb6057f4f16c7d72e3385cf278ce0dbddb0d75e57a90d5cdc14b10c0bad740d77c085d2f8d14b25b100b594a597
diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.16.0.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.16.0.ebuild
index db6ed8248064..50564fd43210 100644
--- a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.16.0.ebuild
+++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.16.0.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
@@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 
 LICENSE="GPL-2 GPL-2+ LGPL-2.1+"
diff --git a/x11-misc/polybar/Manifest b/x11-misc/polybar/Manifest
index 9ee6c2acf2ec..2cf33d496024 100644
--- a/x11-misc/polybar/Manifest
+++ b/x11-misc/polybar/Manifest
@@ -1,9 +1,9 @@
 DIST i3ipcpp-21ce9060ac7c502225fdbd2f200b1cbdd8eca08d.tar.gz 191599 BLAKE2B 85488a6c2ab9c6f653b499ceaa6d8e803dd8b32cd701a7fbbe151f7f3ea2dc30555c520ded53f023a21b119be97c2b07ae1ab413479cfde677e2073f3d48e36b SHA512 0000ba136bd531899ce9e87d458bd6f7d16f45509def37e4fd7aafc16d0e122fe5f56d0eb9dbc3e722dbb6c9812913a7aafa4b749a9c727ab0988908b1e2a425
 DIST i3ipcpp-cb008b30fc5f3febfe467884cb0211ee3c16386b.tar.gz 43681 BLAKE2B a17c9764f429edd4a65d173ff43c139083a8831d9ee68d3024c033f039409efd486178a6225d06e3313642a9918298b1b60da1da75d49243973f8e2dd1fc855f SHA512 27a90d80f2de45743c2347be5ec5c88db58c4f3bb2aa44093c2a1e3178bfd5761ec806bdec9c6b6a4de6d1e67d5f14d4518e99611bf7e2984cfc880898357133
 DIST polybar-3.4.3.tar.gz 253207 BLAKE2B 213b5ea67cc337c47f62afcdce9cacf66516e6f410d2d93570567cddf9f0f5b93764f16e3eaf7c03c56a5ddad62ade92bd83fcfe30c6b91d067c2343f7264342 SHA512 20ac34375da4634a7fd596f38e98a245186c94f8fd624d1dfdcd6633a3c8470fcc57946a50a59177e9d34689aeb5f6cde49e95b30ad699239a2aabbf0635d31a
-DIST polybar-3.5.3.tar.gz 282640 BLAKE2B d3be62d912830a9d1118980b12b55747467b9e2cc8df4713cef2d4b9f4fa70c2b7030d3c04fb9abb467de20ed098443f64376fcfb1ad2bcbfcf06e59b03656aa SHA512 e381f1acb546811049a728631f2b0072ab58695d11590945f690d73cae6c119cd778f43236a3cfa7dc5926a12aaae7b95759fdb6d2a29d5684cd99612ca81aed
+DIST polybar-3.5.4.tar.gz 282581 BLAKE2B 4c9d10e2974200b3df05685e703d0fc5340d4ee194a4a01cb7a1ea6917e8e3b1a3a71849ef345eba416873a567bbf69b597b1a2dff679e17ac34b86f3e164c5d SHA512 0e01ef9284b2a66af3080e5b709f5220da07462dfa9b0836e2bdc275b4cf735245e5ede0eb404a9a73f35722ae455ec3b4ef525ad65362a2ffc607b73295eae5
 DIST xpp-044e69d05db7f89339bda1ccd1efe0263b01c8f6.tar.gz 84121 BLAKE2B dea2384773803bbc5de2ec971ed0cf769b0af8b987bbcf918718647e4787b4713af54a358c029e9603c28c5424488731f76ecc430b6b124bcd9255aef893431f SHA512 646e159d47d6dac8f08a27a1cb54e2ef48e42cff952b55b3906c2021c424e015c070a31a7a1e70b62e0edc7a8b42b935a23b9a922eaab138d3f6929bc1fdb8d4
 DIST xpp-8c019e6d7fefd2468791bc1cbf90d68ff7c1ba33.tar.gz 83974 BLAKE2B 6ea8599136288c006b6993bd6c704ec32d82773153733b4bc6a9c3f326eaf6f3b155d92f270eeb14d57b399f7b5ea0f6bdd5cee41bb5bdf4c1650f337b77f857 SHA512 92874b25305b3be777e739122ff82f1ba16b8e2e445e8ee4891918074ea8ea371f2016d7901cfc477d0286a9e15910c4cee431a11eb71e32728bfbf561313e4f
 EBUILD polybar-3.4.3.ebuild 1808 BLAKE2B 383e0c9b63385237bf1ecf2b0650f3bdcdb8df85cd72b8fbcbdab391b509de5736592de7d9684209c332be857f79cbeec0f51a3d04b2a5ec3b1783a01bc3e846 SHA512 170c1bfe1a8b80b7feed829496724fd3f90a6a0ade553ca828ef06552f1e38cc78180ff2eeed0690b0072f7d2c82494835fb23a76a6d4eeaddb152d9c5381f01
-EBUILD polybar-3.5.3.ebuild 1876 BLAKE2B b2d77f1933dabb4316aea1b8f72f1867561c4b3f48008211657b62e30c2c31df031aae9363fec7c5916ba025f45c3f4982a04a6d8a6c0690f922428249575dfb SHA512 db6f373fb542349499240d526ac0582952e8e52318bd8d34efdf8b9e5032fced903301bcea14fbc21f45f694641221cb3b89b1a6506036997602a86c1c9af3be
+EBUILD polybar-3.5.4.ebuild 1876 BLAKE2B 7ea2d00ae05072348fa4d14d794d074d3b18598d1f499847a0f97a9bc2b2beb3102e2146bf6665e414fb50bd0a4e33c1a20d4008d615501a738e1796646f7397 SHA512 18743cdcb0a9fa5cd3ae5838376579f0024ba62ebc64ec3c8204d746fb5d642fe86848796c93013d8fbabc11d993cafbafff6c85172786e9ac8142a5689f9cd0
 MISC metadata.xml 813 BLAKE2B f620aa54849e10ab8a6f14e78bb00b2cb17ec9309d032025833fef0aa3e339fe3236ca3a83abed185fa2f3098b1c3127f09bed4ff75d1f4de1999097112f8f26 SHA512 b7a4b4143245837dbfc14270b008f1b48b2b7c0746d16180cabe569d562709f41229d7028397c3eca64a5a07319441d69e3affe2b0851e5a6c33f5727608989d
diff --git a/x11-misc/polybar/polybar-3.5.3.ebuild b/x11-misc/polybar/polybar-3.5.4.ebuild
index cf06663c956e..485b315004ba 100644
--- a/x11-misc/polybar/polybar-3.5.3.ebuild
+++ b/x11-misc/polybar/polybar-3.5.4.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
diff --git a/x11-misc/qps/Manifest b/x11-misc/qps/Manifest
index e83bd5937c52..d992422c441b 100644
--- a/x11-misc/qps/Manifest
+++ b/x11-misc/qps/Manifest
@@ -1,5 +1,5 @@
 DIST qps-2.1.0.tar.xz 197352 BLAKE2B c607fde920973c21e85b74e9408f7827ad4354d95b5b16cc95c22bc4143579f1dcddf68bcf9904f4df12236d49f786f457bdf3ce809f37549211f297bab18205 SHA512 e5601657be94d4c21e189fc1113f4678a4bad70ca3c9c3882492625b37339d079d1e8240120bdb467bc47ca95a1b26f8e2da022c271377cf0dbf98e390bc8ac2
 DIST qps-2.2.0.tar.xz 205940 BLAKE2B c5454df5d7f8465687de8d59250db5f8e06edcbceead6f4ee316e02bc7596173d2319fc21e168968d9a155b0bb9aa98f074d0da3b9d618d051e2eba9159b5b13 SHA512 640c228dd9712d6becf7583cf2cf21bd35df638fcbe088650628d678a1f8f5abb055bdf95150dfe7b24687e043ebd805d1a98f331e329058b5db9dce01dd8f20
 EBUILD qps-2.1.0-r1.ebuild 736 BLAKE2B 282c784d62c5df1586702ddb2a509de2b28ad52282344212642925148da0f258b73bed5b7a893ff449dd7fb2c287bd1a9bf5bfa5b2f1f3813a5613f86019f554 SHA512 ef62a9d7080022a9abf89f36eb20a66e6a4dea0e681331a7a4849a1942486588ed42e85344b1b71b2fba80bb108898c39d579b20c92f756f4467bcb87a50d2e5
-EBUILD qps-2.2.0.ebuild 738 BLAKE2B 33d6e06503652f7563d0b5a9cd0a8097f090d2177924021b2596bb3f2fa58a39e64eb16fb9437c451250f5dfba55a4bd17975291d5009b6fa197588c6c33d61e SHA512 e6f792777133b09532fc38bc49e956e3024526b385868d105852eb44a40eb4dc247ef455b3491b1811b21a2d3783a04422b4a2c62ced2daec4d245910533965a
+EBUILD qps-2.2.0.ebuild 737 BLAKE2B 1f1f1b53c4141a6153287603a14c9a050cf1b8c58a31b3705e3a635a8e24709a6bb1b7d27a92c3de1987bfd96477b89054add1b0f8f1703769af15cacd0578b8 SHA512 d45c97c548cfc06e949793f0501d2fe9b0f798f258d8ba583e632c36610d35a4a628ea1e1f6b2667653a8ea53e1608940214837e4c1611cc8aa27adc07eab6f6
 MISC metadata.xml 320 BLAKE2B 7a6824c87e5ee071bd4219df12554d6363050a126b5838af05dc627134e57d2452eab17569b3e144dcb476ec35dc41649da438b8eb7b45d9e695b2ad900581fa SHA512 b0c5950c5803e5bb765271787eab2bb755cd681f50ab183a2bb06b9f773d0dc8c959e7d9c3f15d23692b3c106d6a0bfd0db43f439225539a3a019b7dceb33292
diff --git a/x11-misc/qps/qps-2.2.0.ebuild b/x11-misc/qps/qps-2.2.0.ebuild
index 5284132b4063..0101797a7d1b 100644
--- a/x11-misc/qps/qps-2.2.0.ebuild
+++ b/x11-misc/qps/qps-2.2.0.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="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2 GPL-2+ LGPL-2.1+ QPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 
 BDEPEND="
 	dev-qt/linguist-tools:5
diff --git a/x11-misc/rss-glx/Manifest b/x11-misc/rss-glx/Manifest
index e0d0c153a67e..9b77261467ca 100644
--- a/x11-misc/rss-glx/Manifest
+++ b/x11-misc/rss-glx/Manifest
@@ -3,4 +3,4 @@ AUX rss-glx-0.9.1-imagemagick-7.patch 5238 BLAKE2B fd3c02f9433d7d77dee0e4f6ec71a
 AUX rss-glx-0.9.1-quesoglc.patch 736 BLAKE2B 62ec14f17ee76b04f4589d71a646fc77d3521ba512d0888612cae701fedfbcb2d81fd1717210fb663c322b0088555fa0783faba91b68991f422e4962a3dd0b02 SHA512 9e71e5f15017593a15d72f005cd365a7bde5974fc0e7555b6d4a61c5ab019d92597952af7afef0cef8cc32782a1ac66ab74d11df3fcd4dcdb716d04d1bcb1b4a
 DIST rss-glx_0.9.1.tar.bz2 5435799 BLAKE2B d8161f06469f1160a6e80bb47a333746fac82df4d92eb9d007c7d6fe3a32e1a54a30d4675f64b100fd5509977dfbda7e8821daa462f00cbf748cc7c4bb8afa72 SHA512 3293e6446d6f85e895f1ba8fa982a1ab1873f60714e0b351458ac12117af2427b7cc931185b9485a2af6dd86ea9ea5f2fca92eaae9c0dd5290b5108bc2360961
 EBUILD rss-glx-0.9.1-r1.ebuild 3696 BLAKE2B 81d4a20aa44dd47efb5806d1fe95b097a9bfd89992989915ee2b8801a0f1a6fb5e619d915fd8b7050766d163109c74706019e165c8e387cb6f8a1616c37517f1 SHA512 38feb06443545b1b6f40cfb62f6dbe762d0757d50199eb7a1b7e6e4c646a536f9b91e7b4cc95d7c6cb6560c4c53a09b448fa52f32e262d79de528b95697e4b31
-MISC metadata.xml 444 BLAKE2B efed936fd7e5f9ec41b4944de689f03be14cc92c75759f91cb0f488599beb09b6fbed538df863a38909a674c4da4aebfc93b190765c9194280c62ee1b42bf9b8 SHA512 05849c2a8dbfed55c72261d2d977ece92058ddfe14565eeb22edb7d57ba2fab707bf8d97948fcbafe6f53a0880dcb651a6f8b4caf8fcc6935415c94de9443e8d
+MISC metadata.xml 335 BLAKE2B 6ffac028e510fc7e26e03b19ba6b0cfb7b66e6461a26446a32235a75204e959a8daa694e9a41bd5df193af51d5dfd33b21b58afe4323b6e54bee8c87bf34ab6b SHA512 9496f0e4b0358864b2028e4b26d9da56d961b7c55fdc6f6c89e023613ec1155dd26472a98be99d24c9bad25606708adab551cf509c5f7a81d282f73b420ee138
diff --git a/x11-misc/rss-glx/metadata.xml b/x11-misc/rss-glx/metadata.xml
index bb438a9d8a3c..6cf8d17a20e8 100644
--- a/x11-misc/rss-glx/metadata.xml
+++ b/x11-misc/rss-glx/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>desktop-misc@gentoo.org</email>
-		<name>Gentoo Desktop Miscellaneous Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="quesoglc">Enable support for OpenGL Character Renderer</flag>
 	</use>
diff --git a/x11-misc/sct/Manifest b/x11-misc/sct/Manifest
index 079f96b85902..5bf2904353de 100644
--- a/x11-misc/sct/Manifest
+++ b/x11-misc/sct/Manifest
@@ -1,4 +1,3 @@
 DIST sct-0.5.tar.gz 4802 BLAKE2B 2a7d522031f159b2a8d8d8b63603ff4094d6726d92ad7ac1675c8fbc4c716a8c8b1ae6fbc12d3fe5238552621ebbbc4416658ac89610d40010bf1560446fc55d SHA512 15f2013e3c6c56ff50078f1aa070b3388e07a780d14e5664542ea47e51e8eb84e937927467bf9ed74127a7382dea16c5ca94d255c8aeaaa696c9a81ca658f4a2
-EBUILD sct-0.5-r1.ebuild 650 BLAKE2B c542ba220656116b9a4dc4aa8ca1394ac359d1763a0bfde0e6670e28abb4f8ce01f31e90573e6220b2c64f853b0104971aa197e50f945d692f3452b2dfb6b29a SHA512 cfdd0df768b1388f0b02b2ff4f5ff02a045fd47300f40b943fca11b9f70e9ffe5e7964329f0f72e89b78b4cdfec615ce0a275b0192721356c8e583c937f233bf
-EBUILD sct-0.5.ebuild 648 BLAKE2B da2ad5954af75c1abd20618872196c7678fc30df636267e7235f111052ee2c4cd739b554a6df0517ba7b1af0045a9a338ad05fd0f1e592a1fc00ad56959bc191 SHA512 3ee17c629d7d91468675f23c1fb5d3b90de350ff390dfa1e340dda15983f74875b71369a1b9354ee4b484551bcbae214a9d1b9cad76387da8f4f32612cc40d40
+EBUILD sct-0.5-r1.ebuild 649 BLAKE2B 3412ca42809f559c5279a334cacb4cda82ae3089a3cd05378a3d5f676b7dd34ef9eeae65fd3f2179b5b76f39da55c79989be4f7f80fd92b215db7fe94cffb4c4 SHA512 3627a77b666cc7862ad9596df444229ff0e024822bd48b641c0106c1bdafd9476b9e4937ddfb0ef3568462c113a50b2d544de5a92a127d090bf5fb831a3e7d0f
 MISC metadata.xml 251 BLAKE2B f3c965f619454b2d17e1039b6c218308c83af9214f41a5b18244ce9bd811b0a0b6e0227fdaac9b1659a2e2467e6b992b771ff6cf431220648363ab8173ee76f2 SHA512 e8203a24b5e739dcf0d94742215ee6ccdccbd00bb43001f9df58d27100fa427b01937065e1d7399e3552532b09179611e06099e3af14aac5fcf9ddc4ca5463da
diff --git a/x11-misc/sct/sct-0.5-r1.ebuild b/x11-misc/sct/sct-0.5-r1.ebuild
index 2fbc0da2e7cd..34262ce5fd71 100644
--- a/x11-misc/sct/sct-0.5-r1.ebuild
+++ b/x11-misc/sct/sct-0.5-r1.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
@@ -9,7 +9,7 @@ SRC_URI="https://www.umaxx.net/dl/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
 
 DEPEND="
 	x11-libs/libXrender
diff --git a/x11-misc/sct/sct-0.5.ebuild b/x11-misc/sct/sct-0.5.ebuild
deleted file mode 100644
index f16460c1db01..000000000000
--- a/x11-misc/sct/sct-0.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Set color temperature of the screen"
-HOMEPAGE="https://www.umaxx.net/"
-SRC_URI="https://www.umaxx.net/dl/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-
-DEPEND="
-	x11-libs/libXrender
-	x11-libs/libXrandr
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libxcb
-	dev-libs/libbsd"
-
-RDEPEND="
-	${DEPEND}"
-
-src_prepare() {
-	default
-	sed \
-		-e 's:_BSD_SOURCE:_DEFAULT_SOURCE:g' \
-		-i Makefile || die
-}
-
-src_install() {
-	dobin "${PN}"
-	doman "${PN}.1"
-	einstalldocs
-}
diff --git a/x11-misc/slop/Manifest b/x11-misc/slop/Manifest
index 4df2334f99f7..3d45512ffb64 100644
--- a/x11-misc/slop/Manifest
+++ b/x11-misc/slop/Manifest
@@ -1,4 +1,4 @@
 DIST slop-7.5.tar.gz 51060 BLAKE2B 8d0fcf932181dfc482be7c54cf5a08605a32c85bcd8b27223a4cd8a08323382e802a7f20faa6c51fe67583b1d320cf783c7b5cc8b871e534ea11a32b827e1f45 SHA512 c02e40c5b924841996617fcc9629a6a739a04b6128c18e1eb06dc285d2f8026d847e67077fb59a111fc45c112f871a6e5faef20108c3d777271e1d4aca7f4737
-EBUILD slop-7.5.ebuild 808 BLAKE2B 98fbd3f0b5395b71b11c07a235aa3358a3723a346876dbc88487335b1ed74e552e6ca15bf55d01d54f47b275ada783e3177a359d542b4c74ec03b24a4a9f4e6e SHA512 92c9f8c8920abfc9e321cbdbe4788cc35a470bac8e83fc3f278e2eb63faf05896d07fb6d1f5a323455597c0c15bad731828aa240764e9805526f05dd27dce6b2
+EBUILD slop-7.5.ebuild 807 BLAKE2B 18ea2e61c88e0c52794edbc33456338bf832e960535aecb2e13095655efef51bbdc11d5a75a803d79b781dc67ece636289d99ba07503c94a932086589a8bcb5e SHA512 21cd3380e7e902468d0ce67c7992064bb342c57bc0c16c9a44a53c25c7636cd7bb474512043bc12f1dae5c547da9eb669af3dfb926362aef3e38de44835424ad
 EBUILD slop-9999.ebuild 808 BLAKE2B 98fbd3f0b5395b71b11c07a235aa3358a3723a346876dbc88487335b1ed74e552e6ca15bf55d01d54f47b275ada783e3177a359d542b4c74ec03b24a4a9f4e6e SHA512 92c9f8c8920abfc9e321cbdbe4788cc35a470bac8e83fc3f278e2eb63faf05896d07fb6d1f5a323455597c0c15bad731828aa240764e9805526f05dd27dce6b2
 MISC metadata.xml 630 BLAKE2B dbf7d848908c12d7104c7cd18cd2ca16114073803bd4600e10906a1fc4f86ddeb646359d26885551d998a279d1e11f0d74ad21b135e14a2bea827ef21ade15f7 SHA512 98eea5cce0e8a692076b5cb423a2f0522151d716ef0c9f346e915bfee8590d32dab59c183180ea7f87561bfb92e3840ad710f890a734640173bbcd471d779b0e
diff --git a/x11-misc/slop/slop-7.5.ebuild b/x11-misc/slop/slop-7.5.ebuild
index a9c376b256ec..e3d08d39be3c 100644
--- a/x11-misc/slop/slop-7.5.ebuild
+++ b/x11-misc/slop/slop-7.5.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
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/naelstrof/slop.git"
 else
 	SRC_URI="https://github.com/naelstrof/slop/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="GPL-3"
diff --git a/x11-misc/synergy/Manifest b/x11-misc/synergy/Manifest
index e7b7a02b78ad..bce180919e2a 100644
--- a/x11-misc/synergy/Manifest
+++ b/x11-misc/synergy/Manifest
@@ -6,12 +6,10 @@ AUX synergy-1.9.1-test.patch 1372 BLAKE2B 3a73c9d431d0fee62e701770ceeb01e3f652b6
 DIST googletest-aee0f9d9b5b87796ee8a0ab26b7587ec30e8858e.tar.gz 866900 BLAKE2B c162d47868583ba270675abe5df935b8f4b9a9c00dbdc80dd88afa7f2b98266640b32b2ea5e8f9f6d6227196b5d2f79dbfda4e9585106224e814cc1503cf777d SHA512 715d887b59b47d4691c7c90ef0cf0ffc3d1e758e500263c76b50fd506e90a9d1c390af745933cfe3f55e1edac5d72dccedef3cb9a50b71a5b796424471a3017b
 DIST synergy-1.12.0.png 31383 BLAKE2B 228487058d09ee4fe7d3c909a3aee567b63c0d1aeaecf0e724a7bc9c59e48abecac71f8074902fd4f02ff9347fe8f6488b0554fb78a253339b04fe8d2e958d24 SHA512 7044395b41a0d2e49d308c599710fa32398d11584e70da32d4a1ccb292b02437c09860ed14f7bdd113a646daf696988fd3c0b80f3ab52ebbcaddf4c846cdd7ab
 DIST synergy-1.9.1.tar.gz 6694745 BLAKE2B d7e19fd3e55e60b6a41dffa04d6a53c897c0a7e4895ff65ddfae18b06892959e8c7e56092b3d49f123768b3ce92d59fc890afe756192b3625db664b5fa19331e SHA512 83301f2d035bd91578cf83e335d721748791f62c85252156fd27d09db7b5216a745cfa81c06b27995d1785e676ee4c75f795b5fad2b9a700a981d27d05e5a8fe
-DIST synergy-2.0.0.tar.gz 5892923 BLAKE2B 661f42031499c9c1b2cbb90d9af45f5210c8e1b109f62cfc1cbdedf264f8c358c394005f4a040a8071773d538383adf3e85a059bc54ff67284aaf86990e0a6fa SHA512 69b8e4ea9d22f5699d3a0761cf9811d0689b06a920056b4b4dde466767ec89caaaa8c5736a78d0857ebfb814aaa3bf07591feaf0e64e0555949c5ee6d6974a13
 DIST synergy-core-1.12.0-stable.tar.gz 8237539 BLAKE2B deb9729cadd59b9aee058cde6c9a9e01325081af3cbde0b294fb000c4f805bdba72a6c12266e9f0f360b7aca8a40718295e7d34263ad851bb27be54f54d0c1a0 SHA512 234e8eb42624f006aa45dfcf50a80089a82347c7151da040f10066b412f729adf01600bc9ec2274a0941965e91ab7bab74abd398287a20906dd4a70b1948db5a
 DIST synergy-core-1.13.0-stable.tar.gz 8657662 BLAKE2B b4da6abd1b396f71aa37531e1adf71ff06d4804b74659db362a8fe2701c44786108ecc8b52932038490dfad8b7ae617f13a365ebe1ecf559f50106772bda9102 SHA512 317f0aae7742a3ecaea2f3138364a5cd1a098d76a2decdb6558900112e5dd0b53c457b461201d25d3a33cc2d9189e1f7f4e777a80b98c87d693f51b636cbb564
 DIST synergy.png 26910 BLAKE2B aa9c5c7c0647937eadc82edbdf7a5a374dd25e9450d6861f1092d8569155e38b3d0729bafb69809e62660802d471899c472a0c9d2066e4b7fcec379f34470535 SHA512 0b5a1813c71fd2923adca4cf7b0f840fc37c73a2f18ad68f8bb2fd2ea312d9a884e2e2bcd78f6dd0f13d1f31ea3991379e141ec62d970a18c3a9c46b26720c5d
 EBUILD synergy-1.12.0.ebuild 2575 BLAKE2B 577b7b30f0319736860560ae50d89d717a2a55d29bd9afc49bdc44213477cbd24f8659486d84b3719d452a294d73904bd9f2751f1cf1ab3f1d91cd14ca76bcd5 SHA512 9accf85f2ceaef3b35879ad81471e57d4c699b3a0d81a94d756b7134fb51ae25f045614ca42ab0de545917f8590c5f91a57a4f4b6c3c7e17853cbca09195024b
 EBUILD synergy-1.13.0.ebuild 2411 BLAKE2B 2c087da1de993059611347140c8671d3cca039733ed985c28171d4b42200dca7489110cb33797b07ca87619f4c495f590af27692d9a22258f54738f02cdd5b2c SHA512 b21d69b829c6e0ba251750ed662fee7247eb0608bb6a824994757c7361859cbca293c89f6e137ba19fcc1ecc73de5700374a5db43590028fa39081add2c283eb
 EBUILD synergy-1.9.1-r1.ebuild 2564 BLAKE2B 5c4ec4856bef497f2b91275f74cc10244eef9bf7ee8d840dfa718a7bea971b5564d82589483a2eb3b65dc7ea01a9e856fde11b224efe48f5eb803f66f2cfede6 SHA512 633e27d190523b7f1609631cd2c3eda2f0ca921286e78f8e9631fbb2053349b24601bbfed5f86632f5d8ec3a00910629e70d55a0a7fb26a6dfe784aa5da5a0ad
-EBUILD synergy-2.0.0.ebuild 1418 BLAKE2B 3f077859e978dcb2c25d5ea8f298925caa0aa38bb178764a4391802e6e1c7bf10627317c28c2ab9340b4ba7b52d933ad8bf96bbfac7ded4385fefd758b2420e8 SHA512 fb10cb42c79e1036290cc50eeeaf0ee583f8f41ce573534e1dad0b3e8f48690f1bfb2152ffaf26bb0722d060062078ae5fd2145da48f197ba79fbb35659ac83c
 MISC metadata.xml 332 BLAKE2B 04a719c2b19204a1ea7ed755c89b072b271760a85f3b2b7e734796deca104682c147372a1d154d4fdb493d7025e16cfc2012e7d352fdc88dde93d0f3df477b67 SHA512 8c447ce795a81157c40a2839d8845d6db89ee768f70aa397b686b5ec9a7e59fc66f9fec5561e25ab0aed68bcabc369c0c53660ee2a0b7e24b52e169d5debaae0
diff --git a/x11-misc/synergy/synergy-2.0.0.ebuild b/x11-misc/synergy/synergy-2.0.0.ebuild
deleted file mode 100644
index 750ffb44464e..000000000000
--- a/x11-misc/synergy/synergy-2.0.0.ebuild
+++ /dev/null
@@ -1,65 +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 gnome2-utils cmake-utils
-
-DESCRIPTION="Lets you easily share a single mouse and keyboard between multiple computers"
-HOMEPAGE="https://symless.com/synergy https://github.com/symless/synergy-core"
-SRC_URI="
-	https://github.com/symless/${PN}-core/archive/v${PV}-stable.tar.gz -> ${P}.tar.gz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="libressl"
-
-S=${WORKDIR}/${PN}-core-${PV}-stable
-
-COMMON_DEPEND="
-	net-misc/curl
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXtst
-	!libressl? ( dev-libs/openssl:= )
-	libressl? ( dev-libs/libressl:= )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	x11-base/xorg-proto
-"
-RDEPEND="
-	${COMMON_DEPEND}
-"
-
-src_prepare() {
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	append-cxxflags ${mycmakeargs}
-	local mycmakeargs=(  -DSYNERGY_REVISION=0bd448d5 )
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	dobin ../${P}_build/bin/${PN}{c,s} ../${P}_build/bin/synergy-core
-
-	insinto /etc
-	newins doc/synergy.conf.example synergy.conf
-
-	newman doc/${PN}c.man ${PN}c.1
-	newman doc/${PN}s.man ${PN}s.1
-
-	dodoc doc/synergy.conf.example* ChangeLog
-}
diff --git a/x11-misc/vdpauinfo/Manifest b/x11-misc/vdpauinfo/Manifest
index f55ceb153be1..a8a7ce871b13 100644
--- a/x11-misc/vdpauinfo/Manifest
+++ b/x11-misc/vdpauinfo/Manifest
@@ -1,6 +1,6 @@
 DIST vdpauinfo-1.3.tar.gz 12159 BLAKE2B 41dc31ef2f45272221e2eea969d7801cc9c8bfd693e64f7d157b17645da654b7f50d780df698736b3e2ea9c55c7d3b6e7ce75f96aacd50bbaa4032dfc753a43f SHA512 2271053c17d389ea600742ffe14e863921f18e504e07cb5db33c98745d2f71aece908408bca0161b3c2fa9cd67de8c741c132a774a4fd9443c7124168a4da79f
 DIST vdpauinfo-1.4.tar.bz2 11811 BLAKE2B bf0c268505b8eafb9da7c799518296498f2c04bde33443101625c4a80cfde6418428d3969e9ac0f4222a6985b53f3bd4dff688fc03af29de7576f3af3605e07c SHA512 7227205f35d5ad9bc64537d4e47e1924e7efbcd1185420f5f575eadff23f2932484db9c39c377282ed88fa7fd43d436064b10961082ccbf66c49dac72b4129a3
 EBUILD vdpauinfo-1.3.ebuild 579 BLAKE2B bd17879fe0cbb595de06b973bce5ead8f0443d8d993a2626cefc6651259589cf25c3f795a40634c04cc67bd6dba98c714b2fdff927dc66f505f1f94e1aef5c3b SHA512 b2616a840b284e040fcbc84d067b54be3bf771f0efa6da92a63f2d4fb7379c8fee047b79c38fac6c721a95d86d0afba95c794548e95dac8df028093e5257dfb8
-EBUILD vdpauinfo-1.4.ebuild 537 BLAKE2B 5815c60e765474205f9de927f04977e29fb00e9bdb93c55e0d01857885a3f58a5bff27e843ca2e2ea2a151c30473469d61871321ffae183761ad45a332528b73 SHA512 b106adb9535a7d094709554e6427f8a6faecbbc2788573aa76b95702722f596bba06b9d5cf0fff32a8f06570d09340f37879666620063dc78e51e55b4024e42f
+EBUILD vdpauinfo-1.4.ebuild 536 BLAKE2B 89a7c577f2bcb1957dc1814a5c3c0ecf2e1c63d3183921c8f293cde99270573f6cd8d39f14ebdb871332862ae47d3f5afcc57b124a93cafb41a5adaea6670340 SHA512 663cb4c02ea0333eda5f282869d3a5b9d8d5b67adc3613d517dcc3df382a83f9955e5a61295d4f749709a49eb1eeac0a37cfc430fd69115f0fe53bbe28d25f8e
 EBUILD vdpauinfo-99999.ebuild 515 BLAKE2B 787c16d503300c983ca2da1eab61967a5bc2d986cf0fd969906345ae144da3e62eea7da3c4a318775271a9694be858bd5d70def0f956923d53de337432869bd1 SHA512 d65b62f29237d55d5ac6d2cc8a0965b67def68c5ea52a71c28514926bc6fdf53b7ba8781b50469a3e8eb92f16199120b6a909d0700179a6ef033f7d8c846ccad
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-misc/vdpauinfo/vdpauinfo-1.4.ebuild b/x11-misc/vdpauinfo/vdpauinfo-1.4.ebuild
index a6abe66f1772..1f24203192d8 100644
--- a/x11-misc/vdpauinfo/vdpauinfo-1.4.ebuild
+++ b/x11-misc/vdpauinfo/vdpauinfo-1.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://gitlab.freedesktop.org/vdpau/${PN}/-/archive/${PV}/${P}.tar.bz2
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=x11-libs/libvdpau-1.4
diff --git a/x11-misc/wdm/Manifest b/x11-misc/wdm/Manifest
index c091ebbcfae0..4604aa36d3f1 100644
--- a/x11-misc/wdm/Manifest
+++ b/x11-misc/wdm/Manifest
@@ -3,6 +3,6 @@ AUX wdm-1.28-pkg_config.patch 779 BLAKE2B 9455f411e2f1884522836033ba104ec588fe88
 AUX wdm-1.28-remove-fakehome.patch 950 BLAKE2B 127755e61a73772d20625c32e9263f386a26f3b6b9103765d4597d77e0d8d5afa6c81023e3f096747b7020e3ce536a05781ca13120c4abc358ed02419d3538fc SHA512 55ce47472f0d7ba03bef88af52ace7db88ded7f45862d884a7bb3409a122ec17002a40195cef078f57bcaba24cfcb881d156e990bc856ca7c4f1f4dabbb6764c
 AUX wdm-1.28-terminateServer.patch 422 BLAKE2B 6d85344c1b045a8dfc206c6b0b4f5375be3d62fcb69335c628e1d63b131d62cf54784a9f84a27d49e7ed1c0aa48982bb4c5fa95249bfe6e0203991e1e6c0b381 SHA512 f00685ce1ff38f34df57864d05dd52b7148d27a81177f2c560157a470b089bd9b981ae73bcc6da8c1995822d8b74c6dffdb6166dff33adcf4cd4daa2bc9dc8cf
 DIST wdm-1.28.tar.bz2 381522 BLAKE2B 72105e949c5bc8043967f5b36838c171e32728a40d2ef5f6fe618b04337e3f37329696a7f9f1cee591bf1a037de4ca4168f270a316375e27fd7ce0c919880833 SHA512 393ace12d3975e978c05b90be691a7c27921e7e2db0bdef5f4fe06b324da56edea4936200dc123130c6de9e45af5dac6175559d641957fec104d66bad67c03a1
-EBUILD wdm-1.28-r4.ebuild 964 BLAKE2B 12fb6ddad1a3ea36d56ed0ad70e6aa1df7ee6c95154d01a2826ea591bd5982a14a44cd00620d4bf7e1ffd6a7ba8724d4425deae9df3094467482b79f185b8054 SHA512 8fe48fb962fd784ed1aed697bcb524a278ef8f9e43956413129f32dfcaad5ef9dc8851c04beab6284ec229ee875efb9f3383165e3bde927a6ee31db5384db429
-EBUILD wdm-1.28-r5.ebuild 1137 BLAKE2B 8189772d8ce15cf079b1645bdf528f3ac4e1d9bafc043f30a88e41e90a85bbea4b8b578e29f003e59ab81aad62429c8b3b76032fb3b500ad227af80517302446 SHA512 ca73ea00230875ca98e4834cc249e961f62ea5243208ed585e7e59b4cf477dde34c7c7955598748bd0e58ff613598534d72048031fbf6b7079c92f5bf7134e7a
+EBUILD wdm-1.28-r6.ebuild 988 BLAKE2B 42e455e0b4f7e0608eef95bc9db219b0e03a705e7ec81f7f4d9e5e460a09df33a7a403c67f05dc7b33f73ca16aecdc647d2415686722ed7bb115435437c2c84f SHA512 ba47ee3377bfdd322f8ee98392f19577d6995fb8a19774203e3caa1baa56cd5060744c1bf41bb9929a5e0f9016d63db77eebaa610f3c9b98b490250b4b59d8d9
+EBUILD wdm-1.28-r7.ebuild 1161 BLAKE2B 18d4fef0721d2b5ac7747795499c627a0b407a241d3ff556a033da82df248e2cc97891c22c709462f2a7ac2c5b843d4f63abcbb4436a1fb838f3e42a319b6181 SHA512 856c1faa33092f9111c215b2b10c4c55c8ddfcd0ffed3ef34c0bedaf6919b8a9dcb8a36e09620cd38d872be3ee5f148c54f6e0a0e630e2b3d67c4dd92f1c51fa
 MISC metadata.xml 350 BLAKE2B 1b1cab426ff16f13bed9114bca2d0d543457d97400f739a78cc1a1975683a7ae7c48630af6033f9f94268fa61f9382b6caa056346b2eb3038a83523261b4c8cf SHA512 deecfc72a65212b6498334be4dc9abc35d9f22b64f041181474bbeca8fd71d1e3ebdcccf9a98f57ccc57bd37958b206944c9f520bc7c4cd2d8329f9ce14a0b19
diff --git a/x11-misc/wdm/wdm-1.28-r4.ebuild b/x11-misc/wdm/wdm-1.28-r6.ebuild
index f6b3385ca80a..1ba2a83d76c2 100644
--- a/x11-misc/wdm/wdm-1.28-r4.ebuild
+++ b/x11-misc/wdm/wdm-1.28-r6.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=6
@@ -41,5 +41,8 @@ src_install() {
 	default
 
 	rm -f "${ED%/}"/etc/pam.d/wdm || die
-	pamd_mimic system-local-login wdm auth account password session
+
+	if use pam; then
+		pamd_mimic system-local-login wdm auth account password session
+	fi
 }
diff --git a/x11-misc/wdm/wdm-1.28-r5.ebuild b/x11-misc/wdm/wdm-1.28-r7.ebuild
index 797dafa1bf98..d94c24004807 100644
--- a/x11-misc/wdm/wdm-1.28-r5.ebuild
+++ b/x11-misc/wdm/wdm-1.28-r7.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
@@ -53,5 +53,8 @@ src_install() {
 	default
 
 	rm -f "${ED}"/etc/pam.d/wdm || die
-	pamd_mimic system-local-login wdm auth account password session
+
+	if use pam; then
+		pamd_mimic system-local-login wdm auth account password session
+	fi
 }
diff --git a/x11-misc/xcompmgr/Manifest b/x11-misc/xcompmgr/Manifest
index bc2845c7f04c..39907f222d95 100644
--- a/x11-misc/xcompmgr/Manifest
+++ b/x11-misc/xcompmgr/Manifest
@@ -1,3 +1,3 @@
 DIST xcompmgr-1.1.8.tar.bz2 138806 BLAKE2B 85a7cd04c97c3594ab9acf7888aa0024b60027654dc8fa609c8f2fb801b5cd58105aa50c2afe9c322a02657eeea6e57da3f35720ac63c191a81c62fbf9ee4468 SHA512 ccf29426ffb0797a53653d1ce152de5eee0cec284811fed4b8e634ea0d948180531e4619d96f47e4f9594432c57322624fe0fdaee2c9200efac427fc0904953d
-EBUILD xcompmgr-1.1.8.ebuild 415 BLAKE2B 3f51a4d05113a84fed66ddd4b9eebefd4a516a4d62f1487a2ea68b6c9f706f129fffc557b7448ac4cdfe885adbcfb8236640ac4fd1dad56f4a004a0675d4c4cf SHA512 9ca5febb86bdc02de115c769d5430104244e061fd4d5735610fa9272113a8aec6425f5a727fd9c4d029854c6a201aeaa0b112cdf0ce305fa8e6b6fdedda583de
+EBUILD xcompmgr-1.1.8.ebuild 400 BLAKE2B 4ff21b5b16df1d453d1946e2da5c9ba5a613ab2abace82df49d08963a044aee77ad004f1ea532628a30709f15d0acb531024d19d4e7a6b74af0edf285575e4a5 SHA512 a1cc7045810da283b5755bcc7bd1985c6a473dd2b58fa8fcd21801bf677b896194d3ecb08ac1847b10dd2380ab137d96193c0195fc206d2b7f18b5fa026f835f
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/xcompmgr/xcompmgr-1.1.8.ebuild b/x11-misc/xcompmgr/xcompmgr-1.1.8.ebuild
index 5d3be298debd..7f73b708e97c 100644
--- a/x11-misc/xcompmgr/xcompmgr-1.1.8.ebuild
+++ b/x11-misc/xcompmgr/xcompmgr-1.1.8.ebuild
@@ -4,7 +4,6 @@
 EAPI=7
 
 XORG_MODULE=app/
-XORG_STATIC=no
 inherit xorg-3
 
 DESCRIPTION="X Compositing manager"
diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index bd2846f64638..85c963e28a6a 100644
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -7,9 +7,9 @@ DIST xlockmore-5.65.tar.xz 1945636 BLAKE2B d026975551e8ceafdcc7b8d8b6e404634f329
 DIST xlockmore-5.66ALPHA10.tar.xz 1943664 BLAKE2B 2beecacb2e1f041b7a239b083191812ae3480475b97d2d74718515e692b42cc356bd70bdae5ae85858dedb678e0f1c696d3d339d705097d66ea13f3e2948c270 SHA512 734c33c17f0698210ac4bfe36535f1cfeb87fa0e3ce5aa93f7aa22558da22b067e3c347524d7301751725a702cacb0e1517ccd88ccc1a43cf317552fe4bd1cf0
 DIST xlockmore-5.66ALPHA11.tar.xz 2080280 BLAKE2B c6e5df805429f62979355304c28389ebca837791ce6bf4a4bc9193135cf0c0f520a4776404c62a75afb57a30c187084f2b81d783ec93d5c0896b4d88edc9ef23 SHA512 c69d6414dc5dd708b5f5cd2bcab7405d7779eb8c6dbaaef07ccb9ba74be805d32c07184b19893d95567fde05aa7bfd66c626c10f2085867905f3632a5b4edb3f
 DIST xlockmore-5.66ALPHA12.tar.xz 2083320 BLAKE2B 271c3e67076086759e325315bebb63a509adde6ee93a9cdae7c1022649231a34a9d944a94676ecee5fb53b3105766095f3e9f4f17df60de14fee1e6742b729c2 SHA512 e495dac3ce0cb1983ee2757198babc05adbadf3cad90c576af8dc83f4c49a45cdc3411106df910ccdc9701b842d7ead96cb2f253ccad094464e900e9548f963a
-EBUILD xlockmore-5.50.ebuild 2232 BLAKE2B b4cb15e668f2878401c78a078b8f6e7ab99186a7aca91686dd3f36312bda6c308590d1c20d88cabcad1057025b68792ed69105ec4e6beb87e82c17651174f3cd SHA512 37f9bfb6d087e9a14f59b9ce185bb947e456c85acb85c205ae66947b8d232bc75fd0ed1eb101f48fa3d91791ba5fdda31bc107d58dfaaa2d9e67f20180ef7f73
-EBUILD xlockmore-5.65.ebuild 2337 BLAKE2B 73ba42d7fc570be8efda9ce39f50174fdfb2ff653f64b4ac5ede455d737c7d248d5a128cee3433eb00bd8973a3dc525a212bd5bac6f92474034b0ec7c2a2cb46 SHA512 e1996a03cc088f2e07fd077fb4c5209607d3ea288935ed6469356af6edff47739a99fac2dec4d8d98583591167ff81f9d7da1bf60418ff47c6046c667af76f07
-EBUILD xlockmore-5.66_alpha10.ebuild 2479 BLAKE2B e6c5a0afd5d3db19928f57c5e31892115b12bc5104ccb6f5386ee31d1c34ec35a128a1367725e8fcb1c4ed80f814aff4b7133455bddc7850899f1a6b4bbd0a14 SHA512 e6b4f3f832087cfe018f37322f784e007aab26768ab5933ff0deab106a3bfc561346a23dea3f232e81208a5bb3846fccfc170ef9a1c81274a60e14669cb41f6d
-EBUILD xlockmore-5.66_alpha11.ebuild 2479 BLAKE2B e6c5a0afd5d3db19928f57c5e31892115b12bc5104ccb6f5386ee31d1c34ec35a128a1367725e8fcb1c4ed80f814aff4b7133455bddc7850899f1a6b4bbd0a14 SHA512 e6b4f3f832087cfe018f37322f784e007aab26768ab5933ff0deab106a3bfc561346a23dea3f232e81208a5bb3846fccfc170ef9a1c81274a60e14669cb41f6d
-EBUILD xlockmore-5.66_alpha12.ebuild 2479 BLAKE2B e6c5a0afd5d3db19928f57c5e31892115b12bc5104ccb6f5386ee31d1c34ec35a128a1367725e8fcb1c4ed80f814aff4b7133455bddc7850899f1a6b4bbd0a14 SHA512 e6b4f3f832087cfe018f37322f784e007aab26768ab5933ff0deab106a3bfc561346a23dea3f232e81208a5bb3846fccfc170ef9a1c81274a60e14669cb41f6d
+EBUILD xlockmore-5.50-r1.ebuild 2232 BLAKE2B f50ff6c7eec489f9431266a9c02902b9cba3de6219b76e8452e13390b59513e3820f65cd2824cbb4eb87262d110a97fd66236d62e6389fb78a0823fee50d4afa SHA512 24a893bd0cdf66cecdc52de86cf167ba9117f5f5ccf8e26ae4279b4b2f229f4f7f0c850c46bee7b4fd1aa984988dbac38a1181e3f69b364d4a47a74d2ea11ead
+EBUILD xlockmore-5.65-r1.ebuild 2337 BLAKE2B eb0c1f0207c023987984afdcfb3c2a3efe044b9bfc6943006cf756a76c3aacdbd55c973c636542c3b163d5d9a9ba0bc019cccd26c5b37e2a265b75dfc64d5479 SHA512 1983b541ef21f02f439070fdf8bb6dd261fe61ad39c9548e1253a9013ae3e0566a9195f3326d91748b54c05b67547896e7a6b8ecc367bd3bba9ceaca3b9478b3
+EBUILD xlockmore-5.66_alpha10-r1.ebuild 2479 BLAKE2B d96ae64ef54769762cc92171cc150b6f473ca391149291042d10b5ca12306ea541847ea8772c6dfae90b4c9bf3b334d2219855519a1906e1b35e41bf1f456056 SHA512 13f3e95593e447fa56746e875f1603fcdfc50d8dc7a7d21881e89a3c5042aea404f97c35832de4f3040a5e952db32e7cb4b4ec5db959dfe3202df31b59dac0ee
+EBUILD xlockmore-5.66_alpha11-r1.ebuild 2479 BLAKE2B d96ae64ef54769762cc92171cc150b6f473ca391149291042d10b5ca12306ea541847ea8772c6dfae90b4c9bf3b334d2219855519a1906e1b35e41bf1f456056 SHA512 13f3e95593e447fa56746e875f1603fcdfc50d8dc7a7d21881e89a3c5042aea404f97c35832de4f3040a5e952db32e7cb4b4ec5db959dfe3202df31b59dac0ee
+EBUILD xlockmore-5.66_alpha12-r1.ebuild 2479 BLAKE2B d96ae64ef54769762cc92171cc150b6f473ca391149291042d10b5ca12306ea541847ea8772c6dfae90b4c9bf3b334d2219855519a1906e1b35e41bf1f456056 SHA512 13f3e95593e447fa56746e875f1603fcdfc50d8dc7a7d21881e89a3c5042aea404f97c35832de4f3040a5e952db32e7cb4b4ec5db959dfe3202df31b59dac0ee
 MISC metadata.xml 446 BLAKE2B d638ac6f12a203ae9ada10ae4c33e3a3d9901e350b6e6925c50078d66b29343cae42a67f84d5334182c1e816bddb05d062eb7b7e47c9125b273db118c4de573b SHA512 c8fafb010e63c39beeee5b53ad37354d19e98ac4cf33f29606b0af379811a0738c9c70d1fb7c31a5673d4a6365fb658a6a8bf49135b748bea9069a690ce543ed
diff --git a/x11-misc/xlockmore/xlockmore-5.50.ebuild b/x11-misc/xlockmore/xlockmore-5.50-r1.ebuild
index b332b3f1d081..71363f18b99b 100644
--- a/x11-misc/xlockmore/xlockmore-5.50.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.50-r1.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=6
@@ -96,9 +96,8 @@ src_install() {
 	local DOCS=( README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO} )
 	default
 
-	pamd_mimic_system xlock auth
-
 	if use pam; then
+		pamd_mimic_system xlock auth
 		fperms 755 /usr/bin/xlock
 	else
 		fperms 4755 /usr/bin/xlock
diff --git a/x11-misc/xlockmore/xlockmore-5.65.ebuild b/x11-misc/xlockmore/xlockmore-5.65-r1.ebuild
index 26cf0a2b0721..bec091ad9f0f 100644
--- a/x11-misc/xlockmore/xlockmore-5.65.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.65-r1.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
@@ -98,9 +98,8 @@ src_install() {
 	local DOCS=( README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO} )
 	default
 
-	pamd_mimic_system xlock auth
-
 	if use pam; then
+		pamd_mimic_system xlock auth
 		fperms 755 /usr/bin/xlock
 	else
 		fperms 4755 /usr/bin/xlock
diff --git a/x11-misc/xlockmore/xlockmore-5.66_alpha12.ebuild b/x11-misc/xlockmore/xlockmore-5.66_alpha10-r1.ebuild
index 2bb52c63b8ed..581e292289a9 100644
--- a/x11-misc/xlockmore/xlockmore-5.66_alpha12.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.66_alpha10-r1.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
@@ -105,9 +105,8 @@ src_install() {
 	local DOCS=( README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO} )
 	default
 
-	pamd_mimic_system xlock auth
-
 	if use pam; then
+		pamd_mimic_system xlock auth
 		fperms 755 /usr/bin/xlock
 	else
 		fperms 4755 /usr/bin/xlock
diff --git a/x11-misc/xlockmore/xlockmore-5.66_alpha11.ebuild b/x11-misc/xlockmore/xlockmore-5.66_alpha11-r1.ebuild
index 2bb52c63b8ed..581e292289a9 100644
--- a/x11-misc/xlockmore/xlockmore-5.66_alpha11.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.66_alpha11-r1.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
@@ -105,9 +105,8 @@ src_install() {
 	local DOCS=( README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO} )
 	default
 
-	pamd_mimic_system xlock auth
-
 	if use pam; then
+		pamd_mimic_system xlock auth
 		fperms 755 /usr/bin/xlock
 	else
 		fperms 4755 /usr/bin/xlock
diff --git a/x11-misc/xlockmore/xlockmore-5.66_alpha10.ebuild b/x11-misc/xlockmore/xlockmore-5.66_alpha12-r1.ebuild
index 2bb52c63b8ed..581e292289a9 100644
--- a/x11-misc/xlockmore/xlockmore-5.66_alpha10.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.66_alpha12-r1.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
@@ -105,9 +105,8 @@ src_install() {
 	local DOCS=( README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO} )
 	default
 
-	pamd_mimic_system xlock auth
-
 	if use pam; then
+		pamd_mimic_system xlock auth
 		fperms 755 /usr/bin/xlock
 	else
 		fperms 4755 /usr/bin/xlock
diff --git a/x11-misc/xosview/Manifest b/x11-misc/xosview/Manifest
index 9b387e2adda5..512ca0eeca26 100644
--- a/x11-misc/xosview/Manifest
+++ b/x11-misc/xosview/Manifest
@@ -1,7 +1,7 @@
 DIST xosview-1.20.tar.gz 146373 BLAKE2B 7d53b5f2f8ce463917a1cfa65eedb60c835c6d530a19ede6bba6bfe295a01582861ca3fb7513b9a8590d9fe5111779a38db8723a2e38c911f002bce88bfc95f6 SHA512 25cd6a8cdaaff9121f0e8de7a1799d4c2706c5eb1111f3b3f8427b16e45a333fb4c675a1dec2ef6b40773e83124ff27eacc82f2b9eb6c836855930cbbf08957a
-DIST xosview-1.21.tar.gz 146428 BLAKE2B 899e0cb68489bd02e035765f8f33424d41996b80a7c16651f60a2e46538cf4eac1a9377342c2ed4f35da6cb00aa3961e34802c77fe26e4743a23e2d3dc443484 SHA512 9c42247d9e9b391b94c18ffc8c38df414f5293b7426aa57d3b357e680b02e9a3a2b332299905f2f529d488c23590e957cad9e088ddf753a6904905e2dff8074b
 DIST xosview-1.22.tar.gz 146459 BLAKE2B 7f4920b5b5a765f574694ab64e1d34ad6dbc33893cb816bb73119b4f72b7d23900528cb0db9302b24d20d7b8ce1738ce2d00be572c9fd4b391724f277afb02d5 SHA512 9bf37f557d9c07a300f6f9c21e197d25d4c5a4bb6e67b40af9c44a3159ea5010d7ba5bf427a9cec9729fa423da132a1364d0ac7027e9bc9bcd33f490d9e8282a
+DIST xosview-1.23.tar.gz 146299 BLAKE2B ba336ac152ac6c44bd51c84c160d7c1b565fe23c17aa89db36be7325f4f1caa1ab84a1ad386041841a0aacb62208fb5d59f5dd7a9d2bf071c76dff2901eb2c60 SHA512 10a25f644ec3d896071990117c6d80e553a17baf64809f11bc778652dca1498f81c333ac0f21a809ef617d7e6cbe65afaa14d5bc96908958d8f997234e660ba1
 EBUILD xosview-1.20-r1.ebuild 1199 BLAKE2B ac32bb78ba75f80e44e1f4274da49e3823aa76d86ab36626bfbb6894f4aed4100c9cccaec494884f0230410d5274db90af18fada6675c8a62d0c58945cff30fb SHA512 6495b16378dddf4a39ba53bf5d781d464ee32e5dcdbcdb1b9ae5e49d22e4841ed7414ccb85037a5292caf7d04bd24b3137f9b2947fea8861e722c6539466d0fe
-EBUILD xosview-1.21.ebuild 1201 BLAKE2B 6530a3f6d4bbc77b80b41477b42eaae3e61f23ae2249df43aa11803d3be2081ebd273cfc0c694b74ab96f2c4e6cc609072ab251aefb398914712511e4f1c5053 SHA512 342579968e7da80b5252a01f8c3d4ddd9e24f9f8bd69ab8997b07c3047797f7a8a14f706eeab1deaae465fab4f22034a6de79676ff255968be78514201f8b012
-EBUILD xosview-1.22.ebuild 1201 BLAKE2B 6530a3f6d4bbc77b80b41477b42eaae3e61f23ae2249df43aa11803d3be2081ebd273cfc0c694b74ab96f2c4e6cc609072ab251aefb398914712511e4f1c5053 SHA512 342579968e7da80b5252a01f8c3d4ddd9e24f9f8bd69ab8997b07c3047797f7a8a14f706eeab1deaae465fab4f22034a6de79676ff255968be78514201f8b012
-MISC metadata.xml 248 BLAKE2B c7f5029a5618609fad34b55b5c6e79ffe112a902735b964a3139d4ff2619f580af2268acb6bd76d5a0a4300bd6dad7e523474a9d8d12e4dd47ccb69b0d2531b0 SHA512 8363b906d5217879df7f18fdea58938e4ab205decbf5c11dcb6bb36caa58d4596ae669e4964a4660b2d9b475b8a583beb15e9208fa9cd0bb241c423173aa3b98
+EBUILD xosview-1.22.ebuild 1197 BLAKE2B 286bcd6eb9c228503ef7c1a55c88d4ddc5eddd82dc5e7121e0b3de69eeb2a7e79ae4940bc6812ca45965453890e10ac9d23555a586a761718da215fa0cc6cb54 SHA512 adc133196baa2f683241501e5f06e5a20574d36c6d783b7e20cbb58d3f334a08050ededaeffdf46118fc6e70d09daf242eebf30814fb6c749d8e94d3b39e69fd
+EBUILD xosview-1.23.ebuild 1201 BLAKE2B 6917cb2ed19336bd273fe0b7f4420a9a4c0c87e94b853a6e732db752c2b153166bcb499bbac29f225c6963b258350e160e7d498ff21aae448bc2c649bdb47b7c SHA512 fd72ef633909602cd40bfe7a695bd51565293fe422a2763390b375506fd82a82255ef1983ff8637b3a0223b7f58fb1dd20a42d546ceb6d35ae185f1af5089ce2
+MISC metadata.xml 402 BLAKE2B b3cb5abdce2b509c7eaedc1dd22c04766c9993a2004e4f39985a120d4fe8ddd4ea961ad96b8e7e74f388fce7a3785d3f513a6527e921a5357c0ed7ea9d38cb41 SHA512 e4cb48ac26181681bf80b100a8b479e07218d297770f15fc096b60b2fc8bb66278e9c4181d11b5716abe504fc8ad40be942fc9b0496fd4cc4223da77cff55154
diff --git a/x11-misc/xosview/metadata.xml b/x11-misc/xosview/metadata.xml
index cc7bf6e4bb7e..834e3ee30ea6 100644
--- a/x11-misc/xosview/metadata.xml
+++ b/x11-misc/xosview/metadata.xml
@@ -4,4 +4,8 @@
         <maintainer type="person">
                 <email>dilfridge@gentoo.org</email>
         </maintainer>
+        <maintainer type="person">
+                <email>polynomial-c@gentoo.org</email>
+                <name>Lars Wendler</name>
+        </maintainer>
 </pkgmetadata>
diff --git a/x11-misc/xosview/xosview-1.22.ebuild b/x11-misc/xosview/xosview-1.22.ebuild
index 73b4e2932992..e47a5770c69b 100644
--- a/x11-misc/xosview/xosview-1.22.ebuild
+++ b/x11-misc/xosview/xosview-1.22.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="http://www.pogo.org.uk/~mark/${PN}/releases/${P}.tar.gz"
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="suid"
 
 COMMON_DEPS="x11-libs/libX11
diff --git a/x11-misc/xosview/xosview-1.21.ebuild b/x11-misc/xosview/xosview-1.23.ebuild
index 73b4e2932992..43582f7a181d 100644
--- a/x11-misc/xosview/xosview-1.21.ebuild
+++ b/x11-misc/xosview/xosview-1.23.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
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index c51b62e3b1d1..011a3c70eb0a 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -15,7 +15,7 @@ AUX xscreensaver-remove-libXxf86misc-dep.patch 1879 BLAKE2B fa3f562edf921dded7a1
 DIST xscreensaver-5.38.tar.gz 10712548 BLAKE2B 02630aa7daa3faf8aa7ff453218bed5e3db287b7c4d9b564a6d8822db8b2e1ae6be7843342d585f2d2900d2bd0e7fd2a12d49748d81bf10818fa5bc4254f6ef8 SHA512 9014571505afd3a116f541334ea37737659f63f4cbb267a56be451e2c353d9e57218119670a44297d36d140672ea423d0682433401b17749138ab6baf6507561
 DIST xscreensaver-5.43-r1.tar.gz 26973508 BLAKE2B 67b57214e8a41ba895df6e9efcac3e712f24be06ee7914b38d3a8e639d4945c927c4ac28469d2180bc4a3999a4b89d2a60e633799ac5204c42fa17ad76dd21fc SHA512 7ccaf30fb05ae2110f742f1a5c99f83cd4c8e6749124066b5a418cf3e0ba1b8ff09858eeec29c11b0c8ea428b95b2916481c50cee6a5d952ec941b3ad1b6adcd
 DIST xscreensaver-5.44.tar.gz 27001826 BLAKE2B 102025aa2f57672ed3547f0e9bab989566fb8e50ecae8b9e4078ec5ee5de3cad09fec107695335ef236ad9fe19b2638978366a180a998d77b0ce8a2a5d1ebde3 SHA512 9d9144dec6f075c2d6a1c3cd45123a98d6d0cd732d6c3e3389e97b3f802b8f8765a188d1e35f97f123ca0a64661ea616b7b710577063c311da3d99d8439f1dae
-EBUILD xscreensaver-5.38-r2.ebuild 3443 BLAKE2B 2a5fa4a422890e3e3ea18f6ee10dff40a2dfbed586ac458b9f18f05b8d996021897f6fe67e48a6dc96db4fd0afc8f054c82603afb3f42fcd65f72f1c1962bc6d SHA512 560287aff28cd946857648601711b6ee1e341568a82747a1545909a77b7b24b580d1302a381e422cbaa372190e73e04c99f54778301720676c3a36c72a22f1e6
-EBUILD xscreensaver-5.43-r4.ebuild 3482 BLAKE2B 44140f2417a75ff86d13e39cf855815136748b44dcd1e7ea1409dd9a4a8354d59dce77b91d28cf3eb83d0fc2391644ae954afe158546ff24199cf655f418515e SHA512 e388a0290a3ddf446e91115d84e50e447835abc88d871d280cb3ae3d073527965dee2dd5b9d82502697fe35d4c8c29a2233310d4832aaa40cae26008720ffa3a
-EBUILD xscreensaver-5.44-r3.ebuild 3801 BLAKE2B 27a96c054cc1084d2244094d06ca40438a2e3448db0b98a4fca7357ea70c8ab217a35a4ea2de9ed3a8361de22339b9b96e541a443eac4a45a52a6b565034016c SHA512 d1353b7a0998419adbdaa9707c35365b64e3cd10d1302a11bc1d58ff45aa572cfbd8487230e3ea326582ed3af7cb4ae08c7d1e74fdfc04eec96acd4bf58e763c
+EBUILD xscreensaver-5.38-r3.ebuild 3456 BLAKE2B 8b763b46b36728f636b6bfc431592d135821761fb9b626c5ed350192a64e9d6ece37ae000f2e39eaa88f40dadf68ac80ed49b29ccc6e2c4d589b1f40a2286486 SHA512 a17fbf3f34ab8cfd8ecc73d7ee2f157dfd480c21b722967f3a5a7d0acea059cbc045a5322b7be8c89ed58dd2f68cb8fc973fe02fcbf28ce5ec6f43cbd1ca977b
+EBUILD xscreensaver-5.43-r5.ebuild 3495 BLAKE2B 2cb73d9f446fcdd15c7653811a1d9fc6af0e87dd5b7f32227e920e933ea9abc610dc2adfa5e8c8c92e5262982848c94514727008cf099ec963062f45b15df744 SHA512 a3941d57310a2cf2c589ff2c9276057143ba19ef670159eb404a1c6ac61214c9d7350ce4d385af8a55f5c8a3701f3e975b2762282cf570a54497fc8e5475bdc4
+EBUILD xscreensaver-5.44-r4.ebuild 3814 BLAKE2B 1e49c4fc567c22481b9ca481f6b7ed9e2cbebe4f87bfcc461e4d00111b6be6ca210daa651a698ac51c6c7197dcebba7c037702b7d7acf7c977bf3a71cdbf7e78 SHA512 cb80c2ab1af5b0dba64cff321e3bd18a2eb8cc6d67b64011bcd8f495d240a58c07956eeff5230ee73d5eb8190c26a27df80fc77bf0f9c7e1e02127e37be20101
 MISC metadata.xml 870 BLAKE2B 222f0b24d94c2d9884848813bc9927312e23c670cb03d6427af4018c469b7ca81ab5d0887fa469ad60d05aff97f3b8b2df88158638213fbce24ea6d90c7d9f1a SHA512 0743dbc932e97530aede3f34519e1785bd186662619f46d212f4b4ae0b53bfa01875a3a58d2a30e7f7e6d93f1723211e5cf95018b86dd8e5ede5a37e4c238592
diff --git a/x11-misc/xscreensaver/xscreensaver-5.38-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-5.38-r3.ebuild
index a71b8a78af4e..01313f497ec8 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.38-r2.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.38-r3.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=6
@@ -134,8 +134,10 @@ src_install() {
 
 	dodoc README{,.hacking}
 
-	use pam && fperms 755 /usr/bin/${PN}
-	pamd_mimic_system ${PN} auth
+	if use pam; then
+		fperms 755 /usr/bin/${PN}
+		pamd_mimic_system ${PN} auth
+	fi
 
 	rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
 }
diff --git a/x11-misc/xscreensaver/xscreensaver-5.43-r4.ebuild b/x11-misc/xscreensaver/xscreensaver-5.43-r5.ebuild
index e80dbdef6208..1ef07b385bf0 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.43-r4.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.43-r5.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
@@ -137,8 +137,10 @@ src_install() {
 
 	dodoc README{,.hacking}
 
-	use pam && fperms 755 /usr/bin/${PN}
-	pamd_mimic_system ${PN} auth
+	if use pam; then
+		fperms 755 /usr/bin/${PN}
+		pamd_mimic_system ${PN} auth
+	fi
 
 	rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
 }
diff --git a/x11-misc/xscreensaver/xscreensaver-5.44-r3.ebuild b/x11-misc/xscreensaver/xscreensaver-5.44-r4.ebuild
index 94304df08055..40e90de32b14 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.44-r3.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.44-r4.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
@@ -152,8 +152,10 @@ src_install() {
 
 	dodoc README{,.hacking}
 
-	use pam && fperms 755 /usr/bin/${PN}
-	pamd_mimic_system ${PN} auth
+	if use pam; then
+		fperms 755 /usr/bin/${PN}
+		pamd_mimic_system ${PN} auth
+	fi
 
 	rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
 }
diff --git a/x11-misc/xsettingsd/Manifest b/x11-misc/xsettingsd/Manifest
index 5d54bf13aaae..fae1f5c82dea 100644
--- a/x11-misc/xsettingsd/Manifest
+++ b/x11-misc/xsettingsd/Manifest
@@ -1,5 +1,7 @@
 AUX xsettingsd-1.0.0-add-cmake-buildsystem.patch 1418 BLAKE2B 981c9b2160a9bce572d7b703e08db93d9619767e39368e5f5eeb41126a78223fed840b41f5804b1a20e76bce695028f101ca5fc28297a02f93e55fd99c225349 SHA512 a3ff870af999745f873d1ab8f2eadfff73b82048a401f6ceacf79f1d7c9834c84081f09e3021af3fb977d80042e663ff40278cef0f72307f877608ba6617f041
 AUX xsettingsd-1.0.0-return-1.patch 829 BLAKE2B 9e6024303ffa9f7977187e6f718f03f993788abb5421989e31fcd55f366810903eb9c375c5281803d22ec23b61286ff799bb4096840e55ebd5fc29e0ad592e15 SHA512 f66b5c0fa5068ab5e0232d5de025a59fe8a1bcbbf9b6cc398610773d32c05eb05ef40a8dc7432f5baf153c06671f24f36f07868acd119471665b7c0450ddf6a3
 DIST xsettingsd-1.0.0.tar.gz 23627 BLAKE2B e9f7dcb9fd017f34ed88f29e1954e0824764db66eac5fbcfa55e7edef51c4bdec1cb9383efe0b6cb18b88c04818b106b9c4f95fb25daaf09a76b4b4ef4e0b75f SHA512 39077050a2fc3206c308ba399328719303884dd668b61f7756f0a3a4388ed25a3cda0849a713126c22c6b80466ab74c1317fdd9cb3e652169c80c54ba0a45790
+DIST xsettingsd-1.0.2.tar.gz 22481 BLAKE2B 1f7e8112b8910ea20492109ebc2df90d7113804653d5758bbac2b52116e737505026ddd0e17b5444951ad83606ba41495ce8e165bbe04573c740cc3faee75c1b SHA512 da2a82d0b3f5061a1fad7632d800539f4e81bd3f8631dd724705d0601556c044c62da7469a974cbe8f6d8e070247493ac5776bac966cf36f1fae825562457baa
 EBUILD xsettingsd-1.0.0.ebuild 543 BLAKE2B b2d84af5b7091b0bab3b41122e2397bf7fb57d7094c7f942c9a6231d2d25d2f31023dc3adfaa1e23dc8c9e2a25ab7bc7447f2627aa304b5b52fc0e096549fb0b SHA512 355acc37e97dc3e33af015136676434cc55f8160abe1566530688093a50507faa9c7c527056f143808be81521718acbdf3cbe28e06e3c0b54f03e2611aac149d
+EBUILD xsettingsd-1.0.2.ebuild 684 BLAKE2B d26ea4ee199ef6a5558c9e24ff9154e4370ee6e38fd622a3e3725d00d2892c8d1319b00f1cba3d810b3d6d0a16ef274c677a66c225fe9227a665f6019653b329 SHA512 debdb6e4708d1c756430cac67e341f08209fa39d8c4e8adc1dbfaa91b5dc94ed4a7830a33534450b912acb3e184465c7ac9f720900bba224bb6ad21753b7c533
 MISC metadata.xml 330 BLAKE2B 0b8f27cf4be7ed52be5e6656a64497815cbac57febe612b3755ca2cfa9ce97f34d5807318ac39bc184b7e61b3086cecfa4e5b2e19066adfb32caead8e8833a89 SHA512 834c1c90c8297497e13de12121a39f113807228ede6ec87ad774096e870840f1f1ddc73301c63375f2600b035be12f88c77c978a8fec2e089b0624df16444959
diff --git a/x11-misc/xsettingsd/xsettingsd-1.0.2.ebuild b/x11-misc/xsettingsd/xsettingsd-1.0.2.ebuild
new file mode 100644
index 000000000000..127a824fb368
--- /dev/null
+++ b/x11-misc/xsettingsd/xsettingsd-1.0.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Provides settings to X11 applications via the XSETTINGS specification"
+HOMEPAGE="https://github.com/derat/xsettingsd"
+SRC_URI="https://github.com/derat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )
+"
+BDEPEND=">=dev-util/cmake-3.15"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+		$(cmake_use_find_package test GTest)
+	)
+	cmake_src_configure
+}
diff --git a/x11-misc/xsnow/Manifest b/x11-misc/xsnow/Manifest
index d72f69686d04..7b5c0eb7f214 100644
--- a/x11-misc/xsnow/Manifest
+++ b/x11-misc/xsnow/Manifest
@@ -1,6 +1,6 @@
 AUX xsnow-3.0.7-gamesdir.patch 317 BLAKE2B 747eb31910be55b1086e05f685d39118e274c99629fd055708cd48aea28baa323ae4a8fd6d8ecc374aa6c457aeae74a336d9dee8992b601bcebcf28c3f634d4e SHA512 f947444e15fe12e1596d1e6869390ade46b8f0dc293bfcfcf7a60e9ff267de0857fe0d3830fa1524de2d9ed53748924d31e9973f1f90807c26d5b3b96aeaba67
-DIST xsnow-1.42.tar.gz 56752 BLAKE2B b6feefa4aabc464097b099a0e48d27b9bd5d1b82bc02ca187ffd8ab810f3562c1d11ad01f18f79994699e1fb1fa520269976a35634388fbab2838e2e2bb122bd SHA512 7833f3c1834d64944a578dc71bbf09966d47a1b4878fb826cf121606e76c69544d96d73665572b45c47e0e017dd0cb0bf49f76799aeb859c1dc72348da4ff257
 DIST xsnow-3.0.7.tar.gz 322314 BLAKE2B 21c754daddb989a2f0771199d15342d0c08d23669525bbd9672537c200f7ff06d92708c256f2f89b483bb91947374195e4e95c2291425e630883cfe3b9898563 SHA512 1bc58d8c4542839ccc80c7612e472754f7471d2d72c61785b27d8a89d5e6826d40b892628bcea8c7dcfcf22e4c13db76a825a8c580a32f1ea74785f6c478fb79
-EBUILD xsnow-1.42-r2.ebuild 840 BLAKE2B 26e9758f489b23dc14b0bd8fb36a99f70ef559bfa0ecddfa53c30ea103cdfdd1caf739ad4644acce8ea6ac678a33cf23e93235a8aa03dc32df71855502fa4e90 SHA512 92e50bb5485cb268bac62d773447a40a696feffb7ad3ec05f7a5feed52812298cefb58a7a24bac341de7448c777d7607b2d277c9dad4d1d397af1d36696be476
+DIST xsnow-3.2.2.tar.gz 410575 BLAKE2B 212eec5744657ece2393c92c8210df23a323deb86e58cba7ecce191da23ee094590603cb267c8325ba8915a386325561ecbc165e27acf442426374abd113c441 SHA512 767aad07834b5af0be08f2e0f205cb4bb796b4ecfd4c38a187fea26b4d8c752d231a1f870494ba70b3437e54e8b5f0f745b69aa45f99d7b32d52a0d4b4cc8ba0
 EBUILD xsnow-3.0.7.ebuild 653 BLAKE2B 9aa2d2ece2d50a442984d421e7b1f70dd0411c61f4f86d02f8f5f13ddc75b3303ba1e5def1b466f29d9901d08b076113323b231bd83be4c3a931391d86040467 SHA512 e0ee72b552ae33421680fddeb7c5cc3b6a2bd61e19209550bf72828af2f55f917f1da39f58ba6f4021fb0d6bf32df3f646db07bb249acdcf4cd25a2ab15f4b87
+EBUILD xsnow-3.2.2.ebuild 658 BLAKE2B 9a5a19848fbc5162587eb45059d4009b66df49edb521beb96d06ea12854f2905d7fcbc4b204c123f8afde13c735eb8d43c1a9c226a8cbaee3bb897ac2254c6e6 SHA512 267c9d396b669551c202828a3fb9439fab1e2e97f8231588606bd45625d65342aed4101b969b35b172b691dbacd0bb07fb62120a65b403a24236ad6a0c1c1ead
 MISC metadata.xml 220 BLAKE2B a2c3e050477292c8000b5bb0ffa26d84a57fb435ba5c96dac5c5f4d6f3e823c07116520102eacefd24227a4490dd340c7836cf8d1ba28d23fc76eeaadf04c7b9 SHA512 594861f664581733d740d9f501b84c56f9c9c67f932e97f5905a37d4f19b5a19ef4045c50571a412fbc64d318f3ad1d403ed37c61449b37e74df3d5753aedda8
diff --git a/x11-misc/xsnow/xsnow-1.42-r2.ebuild b/x11-misc/xsnow/xsnow-1.42-r2.ebuild
deleted file mode 100644
index 2ccf2f3dc660..000000000000
--- a/x11-misc/xsnow/xsnow-1.42-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="let it snow on your desktop and windows"
-HOMEPAGE="https://janswaal.home.xs4all.nl/Xsnow/"
-SRC_URI="https://janswaal.home.xs4all.nl/Xsnow/${P}.tar.gz"
-
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXt
-	x11-libs/libXext
-	x11-libs/libXpm
-"
-DEPEND="
-	${RDEPEND}
-	app-text/rman
-	x11-base/xorg-proto
-	x11-misc/imake
-	x11-misc/gccmakedep
-"
-
-src_compile() {
-	xmkmf || die
-	make depend || die
-	emake \
-		CC="$(tc-getCC)" \
-		CDEBUGFLAGS="${CFLAGS}" \
-		LOCAL_LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin xsnow
-	rman -f HTML < xsnow._man > xsnow.1-html || die
-	newman xsnow._man xsnow.1
-	newdoc xsnow.1-html xsnow.1.html
-	dodoc README
-}
diff --git a/x11-misc/xsnow/xsnow-3.2.2.ebuild b/x11-misc/xsnow/xsnow-3.2.2.ebuild
new file mode 100644
index 000000000000..1ff2e5e3a1ba
--- /dev/null
+++ b/x11-misc/xsnow/xsnow-3.2.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools xdg
+
+DESCRIPTION="let it snow on your desktop and windows"
+HOMEPAGE="https://janswaal.home.xs4all.nl/Xsnow/ https://sourceforge.net/projects/xsnow/"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="freedist"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/libxml2
+	sys-apps/dbus
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libXpm
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.7-gamesdir.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/x11-misc/xtrace/Manifest b/x11-misc/xtrace/Manifest
index 514025e99567..a6c3a9225ca6 100644
--- a/x11-misc/xtrace/Manifest
+++ b/x11-misc/xtrace/Manifest
@@ -1,3 +1,3 @@
 DIST xtrace-1.4.0.tar.gz 109032 BLAKE2B 61e1360923eb6b83e47e8d6eb8882b362ef4f257b699d6de9c43556a0e9fe767edab90dfe2d5d792297be244d976a7a0ff7b2df37c87f5e63c7b4731fd2d089d SHA512 97363c5518eccdde15f2f0567d2bc46e8e54638e0b2ef33b207526d660a9f607d5176651dc95aa48267808701406f74de55bed972a931c84462446e3b74c6a7a
 EBUILD xtrace-1.4.0.ebuild 755 BLAKE2B dae895a1ba61fb7085fc6bb0efb20886d65fd044df8663cead2162d9a942e0512e7c5a016b8cc30bbfd720fef32f2df2d82adab9e49eed3b35da301cf31c8a5a SHA512 8b035d3ed21e93253f4efbe3d66d3e13d452f48a9539038b37bff143558a66f6bb8a70f683b12c6630c6896e49ac2602cf0daa47ddda0e452233e81c97927b9b
-MISC metadata.xml 255 BLAKE2B a2162fdaa6e5e8ad6a0310f1e03075023f8548ab4f689c43652ccfe84418ec1ee31bc7c9351cbc8bbc08db8e1b5cb3fe700b6d0ae3bf0c751933b883704ee59a SHA512 a406e5b0292decc477b110f62832679ec16a81044082ef04854421aa6fbac93bda9ca2205a6a39347610ce2564db2cd0fdc314a4924258b00fc15231ca73df95
+MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/x11-misc/xtrace/metadata.xml b/x11-misc/xtrace/metadata.xml
index 867145a2f0fb..1b2becffa26c 100644
--- a/x11-misc/xtrace/metadata.xml
+++ b/x11-misc/xtrace/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>maksbotan@gentoo.org</email>
-    <name>Maxim Koltsov</name>
-  </maintainer>
+  <!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/x11-misc/xvkbd/Manifest b/x11-misc/xvkbd/Manifest
index 43022d679b81..f9f98e1dea1b 100644
--- a/x11-misc/xvkbd/Manifest
+++ b/x11-misc/xvkbd/Manifest
@@ -1,12 +1,6 @@
 AUX xvkbd-3.6-last_altgr_mask.patch 202 BLAKE2B d980f06b4975bf5dadd6e6e656fd3471fbfc651cfee7f4c118010b1c38d41f7597f7bd6d7e07e6c261f7fed0b07efefdfd4f09fcee38029f0047ed5fc2a1317f SHA512 d3d58b1ba3a7dc71a0240ba3240fd06cc1719ac35ab8f1b119f7d79823fddcdbe1605a457722ec75d4b74804f0a68ec221c5ec3d6c15bd2c4130ce96c01f771e
 AUX xvkbd-4.0-destdir.patch 1026 BLAKE2B 473a1499bff1f00846ae81de75973bc77f63f456d071ebd70fc1d112d254345bda108d34d6934075268e1f5c6e02bcc0107bbd1565380ad01dc1c08ce9b243ef SHA512 8c675dd76eb2f126c48cc669dbb5bf87e337816ef4ac5d6c4730f4259862353e4de1dfc255fda36e35f9a93b507add5922595f53e7c91257996e4c5ee6c8043b
 AUX xvkbd-4.0-fno-common.patch 510 BLAKE2B c324653ddf0638f7806a4488a0dd5474097c60c9bf476d3437208aa7b827047b08bad347b2dfef470c0a1198e2341e157c823de0a5c87fdb076793503d2e680c SHA512 62d90307834cc7dfd04c6e1cf6fa0c6e7526d6ca7dccb897c137686e3a4e5d30afffbbba6c8500d144c5ec3dd49691660573957fe6c0b89c1aaedd9183f02797
-DIST xvkbd-3.7.tar.gz 81645 BLAKE2B 9133b3b8e176034f2c39deb3ad9b334f553c834ba3285aaed59ab2a6f531c0184879c7bfe8c702313c9b0d4089883603c2f8430160f3c2af243705e5328b4ed0 SHA512 19ac5e78c34889d80571bb9feea65582fa413cdce0ba2f949840a08e70c900d720ca789d90d1118aa9667d32183b0f1edb33b7b0029ef5abb1d6faf058134385
-DIST xvkbd-3.9.tar.gz 88440 BLAKE2B d024e97c3e134fd4270db07b1eb54c45380b74bdbffb3fbcf7778e839b51ad8a74a7a236e440215eaea38062ae321db866c5344ecb7eaf2ed9ce15d663cbde9a SHA512 f85d94f9b8012023eb4e901c1962ea39a491df2af67b617efb0817023eb93c460446ab9414fb20dcaee02e270cb9cb7b058a83ae96ffae73291b799f15a04b98
-DIST xvkbd-4.0.tar.gz 408256 BLAKE2B 12f18dc6af9636021a9a067528b9ee2387c43aec0d7a23e01e7e4979273ccfa1eae7752cd2814465da906eeada44a31ff70a3f00f030e87ff66db35e3f3c7f5a SHA512 17fe50b86974f21f1456c522cec107f42a8915fa4ffa60849e03d56a3eb8b600aba46becfde458799e30b073d435c60ee8b3b61d79f4c0d86575770cb4bfd951
 DIST xvkbd-4.1.tar.gz 408704 BLAKE2B 45667706005f508e22dcd6d24631b5488ffd32b0bba2cb14e67ce1f77c5fdf3f667ca1431a0833e311bbffbc5baf08daed8ff736158c72178ae5d079f694d9d7 SHA512 6a27a659bacc0f78d70c0afab7ae0f6301f0e7f0c9ed12c581fb4fd5040791536aed50c82ccbd703377244156aade80136567276193f2789a23f05c341b6c0e9
-EBUILD xvkbd-3.7.ebuild 1058 BLAKE2B e1d2840d95f6831e7c442598227843d008a1c4906f8dd5ea64f1a33725dcd9e78e3d0d175fa0bbd264eeb1a66c6439a71b5dab6713e72adcd77deac5d2b4c82b SHA512 df24a91a9509a4fc6907052b87fec5f8c95e9ec5b7e4b8b6a5e8dcf0d6b4c17f0c6c171d7e22d9214827fec937fbda761859697f5ae0f5dfb7879abbfd696d7c
-EBUILD xvkbd-3.9.ebuild 1026 BLAKE2B 4eb776f6731a061978855c629118433fc211e1c54dabacd0ee7368fb2e62350a0d608f59cd23f43105602406ac13f46b6d6aa3e7facf7b209fce5e3a101aae9c SHA512 f8e311e4940a8b73bd9b096b27f04adf5b890de6ce953299bd3cf06d6fcea229b81213c6db605051546e7d21b6383941bd4212b1b26687ed7e00fbd65db9504d
-EBUILD xvkbd-4.0.ebuild 770 BLAKE2B e9ee8979ec4892f4202d5ce888029596362e08727f540b5db0f5a17b7933441cda3617f22d16249d85905df39459f54d675cb94d6c4527395e5403eb9cdef3e0 SHA512 6700a6a773290a24dd083bc5fe34b036b0d907c718dc827d2565f8aac3f493475ec2f0f985ae9d6f7a7f663018e813b4c4134b42a1a42a99b14ad3af8e70233b
 EBUILD xvkbd-4.1.ebuild 615 BLAKE2B 330f359558c187bb956d15509ba21be02a45288ec625fd30af5aad4a3fa2d82297c806c7454dff03e3e93c0b1a6fc9f7c90492b5804ce1349c21a7205f657c66 SHA512 6b538830bd84981da2a036ddef9fe52f488cfaff57643bcff1b1faeb5319a55f1fe9d4263a9c554fcd3476cc1b52c2fcfaceb944f89cb19c522f21834d3a5ea3
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xvkbd/xvkbd-3.7.ebuild b/x11-misc/xvkbd/xvkbd-3.7.ebuild
deleted file mode 100644
index 5be3cd228d62..000000000000
--- a/x11-misc/xvkbd/xvkbd-3.7.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="virtual keyboard for X window system"
-HOMEPAGE="http://t-sato.in.coocan.jp/xvkbd/"
-SRC_URI="http://t-sato.in.coocan.jp/xvkbd/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXaw
-	x11-libs/libXaw3d
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libXtst
-"
-DEPEND="
-	${RDEPEND}
-	app-text/rman
-	x11-base/xorg-proto
-	x11-misc/gccmakedep
-	x11-misc/imake
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.6-last_altgr_mask.patch
-
-	epatch_user
-}
-
-src_configure() {
-	xmkmf -a || die
-}
-
-src_compile() {
-	emake \
-		CC=$(tc-getCC) LD=$(tc-getCC) \
-		XAPPLOADDIR="/usr/share/X11/app-defaults" \
-		LOCAL_LDFLAGS="${LDFLAGS}" \
-		CDEBUGFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	emake \
-		XAPPLOADDIR="/usr/share/X11/app-defaults" \
-		DESTDIR="${D}" \
-		install
-
-	rm -r "${D}"/usr/$(get_libdir) "${D}"/etc || die
-
-	dodoc README
-	newman ${PN}.man ${PN}.1
-}
diff --git a/x11-misc/xvkbd/xvkbd-3.9.ebuild b/x11-misc/xvkbd/xvkbd-3.9.ebuild
deleted file mode 100644
index 8b80572a63b9..000000000000
--- a/x11-misc/xvkbd/xvkbd-3.9.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib toolchain-funcs
-
-DESCRIPTION="virtual keyboard for X window system"
-HOMEPAGE="http://t-sato.in.coocan.jp/xvkbd/"
-SRC_URI="http://t-sato.in.coocan.jp/xvkbd/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXaw
-	x11-libs/libXaw3d
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libXtst
-"
-DEPEND="
-	${RDEPEND}
-	app-text/rman
-	x11-base/xorg-proto
-	x11-misc/gccmakedep
-	x11-misc/imake
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.6-last_altgr_mask.patch
-)
-
-src_configure() {
-	xmkmf -a || die
-}
-
-src_compile() {
-	emake \
-		CC=$(tc-getCC) LD=$(tc-getCC) \
-		XAPPLOADDIR="/usr/share/X11/app-defaults" \
-		LOCAL_LDFLAGS="${LDFLAGS}" \
-		CDEBUGFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	emake \
-		XAPPLOADDIR="/usr/share/X11/app-defaults" \
-		DESTDIR="${D}" \
-		install
-
-	rm -r "${D}"/usr/$(get_libdir) "${D}"/etc || die
-
-	dodoc README
-	newman ${PN}.man ${PN}.1
-}
diff --git a/x11-misc/xvkbd/xvkbd-4.0.ebuild b/x11-misc/xvkbd/xvkbd-4.0.ebuild
deleted file mode 100644
index 90be10d40308..000000000000
--- a/x11-misc/xvkbd/xvkbd-4.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-DESCRIPTION="virtual keyboard for X window system"
-HOMEPAGE="http://t-sato.in.coocan.jp/xvkbd/"
-SRC_URI="http://t-sato.in.coocan.jp/xvkbd/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXaw
-	x11-libs/libXaw3d
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libXtst
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0-destdir.patch
-	"${FILESDIR}"/${PN}-4.0-fno-common.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	dodir /usr/share/X11/app-defaults
-
-	default
-
-	dodoc ChangeLog README
-	newman ${PN}.man ${PN}.1
-}
author	V3n3RiX <venerix@redcorelinux.org>	2021-01-22 20:28:19 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-01-22 20:28:19 +0000
commit	abaa75b10f899ada8dd05b23cc03205064394bc6 (patch)
tree	eca3dd248b73b92013cba00a0fcc1edf2696e19a /x11-misc
parent	24fd814c326e282c4321965c31f341dad77e270d (diff)