gentoo resync : 25.11.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
commit: d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree: 0625f358789b5e015e49db139cc1dbc9be00428f /x11-misc
parent: 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)
171 files changed, 1345 insertions, 1241 deletions
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index d7a73c095d5e..eb02581ea87e 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/appmenu-gtk-module/Manifest b/x11-misc/appmenu-gtk-module/Manifest
index a3ad8d5d1dd2..245b7f8189c7 100644
--- a/x11-misc/appmenu-gtk-module/Manifest
+++ b/x11-misc/appmenu-gtk-module/Manifest
@@ -1,4 +1,4 @@
 AUX appmenu-gtk-module 239 BLAKE2B c5f055154136c6ba862ce9f74edf898fd9baa5b699fe149fd29b125bd42cee94174e7f8f8bf7a40ee63e880f38a161a652e45c171dae399e8cd2b76e4a94e2f5 SHA512 daf70376ebcd1b67eec093c8b905b6d085d4206958573ce7aa8709c053928a78a7b8d06b6fdba9a221731d89e3fe6720394d1e8cee208adfaaf298825a9cc04e
 DIST appmenu-gtk-module-0.7.3.tar.xz 48460 BLAKE2B b7008aa618e643a95445aad25bc19eed5b887810891318a891f088284f8f128e6392671226742a8b0c70699a9455739ee61ed56aec32129532ba53dc69809913 SHA512 d7df7e3cea3ccb66d013b23ae8796b8cbb0e0787f37f54078715c4863797c28d44ff38d7ac965b6eb0fd5cb327c1a4b891c74c66ba95b9b9a06e2c06ba5b2ad8
-EBUILD appmenu-gtk-module-0.7.3-r1.ebuild 1046 BLAKE2B dc95ebf4b4d8feb94c117fc9a641ae7010b27f6999453b109f58050d5316ddbf6d17736ea67211d3423eb12ee21e91f6453a08f9c936bfbf0ba0a42051ffe952 SHA512 521b4bb47e885f218facd0138541f63b536d82da46dd4523991c11fabe8ae295988f6d4576c34e83bfa67b207e82e2a011b9a256317543f32ea6e3c51735f234
+EBUILD appmenu-gtk-module-0.7.3-r1.ebuild 1043 BLAKE2B fe8d629751725a3929310aba61c3dad4fb1a925f69b4d3201ffd9e4f67337d966cc9abd0ed78228399185199578c6dc53e3f8c4c77ac632eb06a043f577014da SHA512 8b951c23fe2e59d35ca2b4f3169a70f3989209ab25c1c08daac23b6f6af7aaf0431a15060c050ba114966fc70200306eadf9f288d19214db5a89a6ff45fb9fa6
 MISC metadata.xml 330 BLAKE2B cfc9f4f9873b63df5ed997fa0fb659fd5c15205a53b727a963c125cc31cb071ccd7fcdd524939ed10b8dd6fadf4c4cc304ed3c4be852fc1e29feb0918efb698e SHA512 aa5bbe760f05a3c67365ddfa2f0c9d52636bd645075ac0ca2a96124e1127557b20d12162fe2c44b4cd77cf6106c5803da3d25b36a4dc9bb21bc1842e0da71b24
diff --git a/x11-misc/appmenu-gtk-module/appmenu-gtk-module-0.7.3-r1.ebuild b/x11-misc/appmenu-gtk-module/appmenu-gtk-module-0.7.3-r1.ebuild
index f78bf20a50b0..78cead766566 100644
--- a/x11-misc/appmenu-gtk-module/appmenu-gtk-module-0.7.3-r1.ebuild
+++ b/x11-misc/appmenu-gtk-module/appmenu-gtk-module-0.7.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/vala-panel-project/vala-panel-appmenu/uploads/570a2d
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/birdtray/Manifest b/x11-misc/birdtray/Manifest
index 89d55bedd221..4301f741b7b0 100644
--- a/x11-misc/birdtray/Manifest
+++ b/x11-misc/birdtray/Manifest
@@ -1,5 +1,4 @@
-AUX birdtray-1.8.1_qt515.patch 569 BLAKE2B 9575631ce63a01ead03240779f88ef2ea32e7a7467716cc185d01dcc698c6349d47a11d8b8926434926d52cb1d9166e3ac542861c50f1814dcdf8dcdf1e569e0 SHA512 7d0fd09166ad242beecc0319e639016701493605d85363070247ec558c218e5b8736778aa1f821c33ac0be9083a2ad01f7ec4a572fd21dee40363ce0eb041645
-DIST birdtray-1.8.1.tar.gz 767821 BLAKE2B 343fb902381396df2a9d49b619a6eaea620447276ee1c6261b8bb9667ea40d945da37522e1ddeac529d032549f3ca3288d6b780ff95b6adbc98a1dbea8fdeb10 SHA512 464bdaf1820cecb0bb9b41721389f24ce447c65e25f857998c4de5d3fb2aa53f03223938974e9bbdbfd4d719fb6aaecdf8a27c6e2ab7075b451bc8e73d8f07e7
-EBUILD birdtray-1.8.1.ebuild 834 BLAKE2B 3cf6afb885dd5a09a5255b6257f5a1fc1cda46a9d619490e69378e8eecd3880d5144d9106261507f0d7021f2af2a6d52005c8564e13343212399692ad9fb4b8c SHA512 f5dde7029b6a8ba5ca53515425505dc764eef09a1f80c1481125878252da8f6e370b6621fe0d48680146d4be338b3cb419a4eb793952ec6cf289c4fdfa79630b
+DIST birdtray-1.9.0.tar.gz 810297 BLAKE2B acc6593116fa735311f62405406192ad43e8af6481eac1d09298f846f5fab9a0dff575caefe9490d0a183c464fab763515e20e5725649fe4a800e575f712067b SHA512 898bfcebc7ba4b738e3ab41539c4de48871ebccf431bb1b12464e7f2956bad95af6158742c64ec5923d63889e777c98c75db31121d926e26f3dfe1b34d9f8b4a
+EBUILD birdtray-1.9.0.ebuild 790 BLAKE2B 5dfb0512d83d8b6bd7d46411595ea1172d0157882ae6a0fb62c3c58acccf9c0918fc70d9227387024dbbe4a1ec017756e49953c656bdd9d2c7b2b70c9380ce62 SHA512 298c47b478985275c3fa38e935a5c7629469ee85f98b8884fd65f26e402ea27c91fbf1d1f85227bd6d598f78b31f99bc69ac35ba2dc06716787403e785f574b2
 EBUILD birdtray-9999.ebuild 789 BLAKE2B 0bb40f99fedf9a15336fa68cae93dc7bad8b4cc47dede8c56c586b8a62df4b170bc947e21c3fd5c0ef01f21fee7f308d77b73af4923c0e0cf409f0e0d984596f SHA512 e344fd36ac52a6673d356d186fceb10f1d0213a6ab88914554c35f86b63f38d4c989c9fc1e5bd3ce54f4d08008ae358a346b738fc1e139f089193905b309a180
 MISC metadata.xml 449 BLAKE2B 1ab261352fabefe2d9c47dfe96681579a5291dd41fbe49df4571a0184c2429680c576bfbc270bb27bf1700b60a7019faf7b87e94fd06a5eaf2f4e8595dc13ca2 SHA512 8504f728cf157d2493e622a8091bae108fbb24cba21f2c00d3bab79f778afa485ba08c225f5964dbe7e586693fefc24721b023a51439fe1a1ffb22e5bdec5f16
diff --git a/x11-misc/birdtray/birdtray-1.8.1.ebuild b/x11-misc/birdtray/birdtray-1.9.0.ebuild
index a527d5b67e10..cd9cdf2f737d 100644
--- a/x11-misc/birdtray/birdtray-1.8.1.ebuild
+++ b/x11-misc/birdtray/birdtray-1.9.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/gyunaev/birdtray.git"
 else
-	SRC_URI="https://github.com/gyunaev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/gyunaev/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
 fi
 
@@ -31,10 +31,6 @@ RDEPEND="dev-db/sqlite:=
 DEPEND="${RDEPEND}"
 BDEPEND="dev-qt/linguist-tools:5"
 
-PATCHES=(
-	"${FILESDIR}"/${P}_qt515.patch
-)
-
 pkg_postinst() {
 	xdg_icon_cache_update
 }
diff --git a/x11-misc/birdtray/files/birdtray-1.8.1_qt515.patch b/x11-misc/birdtray/files/birdtray-1.8.1_qt515.patch
deleted file mode 100644
index a7384f02a6d8..000000000000
--- a/x11-misc/birdtray/files/birdtray-1.8.1_qt515.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 38b333b5ff9318ae136d719c5fdd4c790c294833 Mon Sep 17 00:00:00 2001
-From: George Yunaev <gyunaev@ulduzsoft.com>
-Date: Sun, 31 May 2020 13:36:14 -0700
-Subject: [PATCH] Fixed compilation on Qt 5.15 - fixes #375
-
----
- src/trayicon.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/trayicon.cpp b/src/trayicon.cpp
-index 210c5da..72d80d2 100644
---- a/src/trayicon.cpp
-+++ b/src/trayicon.cpp
-@@ -3,6 +3,7 @@
- #include <QPainter>
- #include <QProcess>
- #include <QMessageBox>
-+#include <QPainterPath>
- #include <QtNetwork/QNetworkSession>
- 
- #include "trayicon.h"
diff --git a/x11-misc/cdm/Manifest b/x11-misc/cdm/Manifest
index 254f6dbf508b..68473aaa99f6 100644
--- a/x11-misc/cdm/Manifest
+++ b/x11-misc/cdm/Manifest
@@ -1,5 +1,5 @@
 DIST cdm-0.6.1_pre20180107.tar.gz 16541 BLAKE2B 19b7a8f6ef7541333b96bb3c2d6a9d3b7ce3bffdcf6653a3799d963d3b3bab3fe3553469a9cbf0f493109ad5308c739b25ce9e5801d0904f5d7b6e78b680e2fc SHA512 dc5587debb304636be25afdf60e8328b1eb9b961694813b089df504567f63cfeac6de17df715d589cec597f51044b8c121242ebefbe5bfeccf6aa072b1c03a40
 DIST cdm-0.7.tar.gz 16154 BLAKE2B ca240e253ad4ed6b5e634069b98c90c00852fc6d6550ca1f72b3399435264055cfca31f88f6061daa3e2e3445bd1a8ad9f950b44968df4c77d6c8150b2782a34 SHA512 51591b953ec83c06a5a4407c6d6083ac11e7095c7fb22e491ed3d6626217462529d3dd3590c2a256273b3668c7246b13bfd1f2f682f5bd860ca8a34aaca0b6f5
-EBUILD cdm-0.6.1_pre20180107.ebuild 1849 BLAKE2B 6897da58d05c7e624ffe5aa993c0e1a68d413c681a2bb65c4000517fba71035144b56c76f5a1fb856a25adfa71a75e0125f812121fd43131ec40b7ea3737cf76 SHA512 6f6bb180a4cdd09cc922ad8d48ee194f51159479f7e32d3f0721ade34a3fddb3e9990b4402ad0ac401f1712f89942d3fbd6f64cde369e05c149ecb2dbdca9baa
-EBUILD cdm-0.7.ebuild 1866 BLAKE2B b2bd6acd3e399422fe76801a00901beca3e71f2d0af5c68800c21bf1b56752a071f56446284f59bb0bcae7b42601e1cb9fa09b6ae31d68211fe3a3ea6a9dfcbf SHA512 efc860cb1668cf3547ccdd6b1b947c3dd41f613f743cbbb2320dbd037b918810eb04447884dd5795976fdbb78b7f08bd008db44182cd5c28fe1e24bea397ca78
-MISC metadata.xml 717 BLAKE2B 08ac966702b39c5c912ab82c1115a3eb9166719fe1e87cbd193ba7ba61b8fca81546c86361ad9c5c51ffb7bfbfc283c4e89d250b58925c5d034d8f37d72e1357 SHA512 cfabe6705c7af59ba703ca849a7cddd649cad9c0dbd939c4fb5e2fcc2cd5383f5771f0d259b1259516037c9d8c41bd2b59a86d70109494d7e4a131ce232b5929
+EBUILD cdm-0.6.1_pre20180107.ebuild 1718 BLAKE2B ba247644bf9bb70c5c9f61c7ed0431ddf6b6e0bd1eb64f013d9dcb75b82c0e1bf80e3fc628d3a88be38fb744a7ab3eefc4ebdb6efe4bebcb2378a220d9cb1704 SHA512 f5a9b02649e6475458b9d817b88978573d85b02e1eb8ae0efc6751e8024a5cefbe6c1b725f2a9adbdd546cbdf46d07d130ca59b151eca78b6cda4b17f8cbb96f
+EBUILD cdm-0.7.ebuild 1735 BLAKE2B 52847247bfda3871a72a0e2a59caa8ee20f903f6271554f055c8f202de4daa972fa57e17c578b4289813589ed5c20e8ab6cdeb7d2ab47746fb7cf01b0fa83a5f SHA512 3cd7ebbbc1d07589aa0f832034dde9f07171aa4565c23a595dab4ecbc187fc97c645bdb9e430a3d60632f3818724a461251a1ce6199523cbffc63c799e712443
+MISC metadata.xml 637 BLAKE2B 6d5322fbd964f18a178cd927700f56bd6401a78b7f1b3abce8d70e8f74a3817a913a63671bc5dea89cc654566d669cf6133888bcc87a2df3bcb8196cfbe23c5c SHA512 22848f9f08a03e9cf170d68ea2feb836ac84ae7c24074f2e029ac85dfcd8630ae8cd79518d01951c33d8ddf8dd8c8a89faf18da7308493951abff2f8c299e0cd
diff --git a/x11-misc/cdm/cdm-0.6.1_pre20180107.ebuild b/x11-misc/cdm/cdm-0.6.1_pre20180107.ebuild
index 9702b5d25cc7..880a059eabf4 100644
--- a/x11-misc/cdm/cdm-0.6.1_pre20180107.ebuild
+++ b/x11-misc/cdm/cdm-0.6.1_pre20180107.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -12,24 +12,19 @@ SRC_URI="https://dev.gentoo.org/~gienah/snapshots/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="pam consolekit"
-REQUIRED_USE="consolekit? ( pam )"
+IUSE="pam"
 
 DEPEND=""
 RDEPEND="${DEPEND}
 	dev-util/dialog
 	x11-apps/xdpyinfo
 	x11-apps/xinit
-	consolekit? ( sys-auth/consolekit
-		sys-apps/dbus )
 	pam? ( sys-libs/pam )"
 
 src_prepare() {
 	default
-	if ! use consolekit; then
-		sed -e 's@consolekit=yes@consolekit=no@' \
+	sed -e 's@consolekit=yes@consolekit=no@' \
 			-i "${S}/src/cdmrc" || die "Could not turn off consolekit in cdmrc"
-	fi
 }
 
 src_install() {
diff --git a/x11-misc/cdm/cdm-0.7.ebuild b/x11-misc/cdm/cdm-0.7.ebuild
index ec83965c22fc..69859215a894 100644
--- a/x11-misc/cdm/cdm-0.7.ebuild
+++ b/x11-misc/cdm/cdm-0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -12,24 +12,19 @@ SRC_URI="https://github.com/evertiro/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="pam consolekit"
-REQUIRED_USE="consolekit? ( pam )"
+IUSE="pam"
 
 DEPEND=""
 RDEPEND="${DEPEND}
 	dev-util/dialog
 	x11-apps/xdpyinfo
 	x11-apps/xinit
-	consolekit? ( sys-auth/consolekit
-		sys-apps/dbus )
 	pam? ( sys-libs/pam )"
 
 src_prepare() {
 	default
-	if ! use consolekit; then
-		sed -e 's@consolekit=yes@consolekit=no@' \
+	sed -e 's@consolekit=yes@consolekit=no@' \
 			-i "${S}/src/cdmrc" || die "Could not turn off consolekit in cdmrc"
-	fi
 }
 
 src_install() {
diff --git a/x11-misc/cdm/metadata.xml b/x11-misc/cdm/metadata.xml
index 76e6b001343e..1f9a6e70a7b4 100644
--- a/x11-misc/cdm/metadata.xml
+++ b/x11-misc/cdm/metadata.xml
@@ -13,7 +13,4 @@ or the instability of qingy. Written in pure bash, CDM has no other
 dependencies, yet supports multiple users/sessions and can start
 virtually any DE/WM.
 </longdescription>
-<use> 
-  <flag name="consolekit">Enable native consolekit support</flag>
-</use>
 </pkgmetadata>
diff --git a/x11-misc/clipmenu/Manifest b/x11-misc/clipmenu/Manifest
new file mode 100644
index 000000000000..8748373c83f3
--- /dev/null
+++ b/x11-misc/clipmenu/Manifest
@@ -0,0 +1,7 @@
+DIST clipmenu-6.0.1.tar.gz 7219 BLAKE2B 85d61c34e3b964e0a39051a1443b1498fedab1f5b45c61f3a8b6c0a63058642ff4fcfabc7d4913893320b5196edac2c5a9ad5a84b71a9d2191a3e147283a816c SHA512 0c91ad3a873081a6f9abfcc7a4a9be7cbd4ca5017f447dac204042ae3f051c550111c73d9d06f1d2a7a6783cfda631154373a932ea40315e72907d52120d4801
+DIST clipmenu-6.1.0.tar.gz 8711 BLAKE2B a37f0f52343a4f22fdf4a37a57a2c715edd47aa1b77c90cf95f9af11a8107967eb24410ed43cee52ec5db5a1276c5e9bdf082668795f3054840b4f30e511ac55 SHA512 1392b08025b564dc17ca44e43847fdea85886b89fdd5426635c9c16d204610c6a9cc19297a20cdbc2eeef2c878adbfe994a2cfd05176457ca6fcbc75bc036acc
+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
+MISC metadata.xml 364 BLAKE2B 4f0c3d96c42f1ae903968e3cb3b0a28b5d0a3881c74eab0347abf13262547aa218a83bd907ec9a5c0d906948f5cb57c97372f07630368637326277fcb75c4db5 SHA512 478344a69216a5d9aa8b69a0252c171c23ae8719529fbecf912d8f298cb28bb85fd9506af2a5a4b77ddd3048c60d479dee0e5ba7909d661886d35c20107527fe
diff --git a/x11-misc/clipmenu/clipmenu-6.0.1.ebuild b/x11-misc/clipmenu/clipmenu-6.0.1.ebuild
new file mode 100644
index 000000000000..08751d666899
--- /dev/null
+++ b/x11-misc/clipmenu/clipmenu-6.0.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="Clipboard management using dmenu"
+HOMEPAGE="https://github.com/cdown/clipmenu"
+SRC_URI="https://github.com/cdown/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	x11-misc/clipnotify
+	x11-misc/dmenu
+	x11-misc/xsel
+"
+
+src_install() {
+	local binfile
+	for binfile in clipdel clipfsck clipmenu clipmenud; do
+		dobin ${binfile}
+	done
+
+	systemd_douserunit "init/clipmenud.service"
+}
diff --git a/x11-misc/clipmenu/clipmenu-6.1.0.ebuild b/x11-misc/clipmenu/clipmenu-6.1.0.ebuild
new file mode 100644
index 000000000000..47494c5e02a0
--- /dev/null
+++ b/x11-misc/clipmenu/clipmenu-6.1.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="Clipboard management using dmenu"
+HOMEPAGE="https://github.com/cdown/clipmenu"
+SRC_URI="https://github.com/cdown/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	x11-misc/clipnotify
+	x11-misc/dmenu
+	x11-misc/xsel
+"
+
+src_compile() {
+	:
+}
+
+src_install() {
+	local binfile
+	for binfile in clipdel clipfsck clipmenu clipmenud; do
+		dobin ${binfile}
+	done
+
+	systemd_douserunit "init/clipmenud.service"
+}
diff --git a/x11-misc/clipmenu/clipmenu-6.2.0.ebuild b/x11-misc/clipmenu/clipmenu-6.2.0.ebuild
new file mode 100644
index 000000000000..cc2eeecc5417
--- /dev/null
+++ b/x11-misc/clipmenu/clipmenu-6.2.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="Clipboard management using dmenu"
+HOMEPAGE="https://github.com/cdown/clipmenu"
+SRC_URI="https://github.com/cdown/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	x11-misc/clipnotify
+	x11-misc/dmenu
+	x11-misc/xsel
+"
+
+src_compile() {
+	:
+}
+
+src_install() {
+	local binfile
+	for binfile in clipctl clipdel clipfsck clipmenu clipmenud; do
+		dobin ${binfile}
+	done
+
+	systemd_douserunit "init/clipmenud.service"
+}
diff --git a/x11-misc/clipmenu/metadata.xml b/x11-misc/clipmenu/metadata.xml
new file mode 100644
index 000000000000..b99ff18165e9
--- /dev/null
+++ b/x11-misc/clipmenu/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>erkiferenc@gmail.com</email>
+		<name>Ferenc Erki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/x11-misc/clipnotify/Manifest b/x11-misc/clipnotify/Manifest
new file mode 100644
index 000000000000..3d6e95db9b31
--- /dev/null
+++ b/x11-misc/clipnotify/Manifest
@@ -0,0 +1,3 @@
+DIST clipnotify-1.0.2.tar.gz 1318 BLAKE2B a418a1a25f43c033fd6457eabe926b0ebf911b233f9dd1cf6ff7a8399ab2660083bec969aef1f44edd583ee2cd1d097b71e7014b620efcdcb8c544a63612a17b SHA512 52277099d9543e0f550de63ff2e15e3e7ba63ea38f3928006e2b570bb1bcdd3f2f09892bd4efecc1f36fb5131e0567c28c2b0597123c90b9f78ab6fbd02dfc49
+EBUILD clipnotify-1.0.2.ebuild 446 BLAKE2B 029e27bb68a337cbf45e9af2e9e80d49566bdf67a1dc8084259d997c1068fc07d4823c5c864971e83c67ef16f1b2216c085b90ad6545d12f8e5f8c62a866aca2 SHA512 65a5a57b147ca498ba3e2e54a8f07800b231f67150eae7d6d9b0473d6e539a7853343d676425af86a8a65b99be882421658c09130c4358c55eb5af434da5dde7
+MISC metadata.xml 364 BLAKE2B 4f0c3d96c42f1ae903968e3cb3b0a28b5d0a3881c74eab0347abf13262547aa218a83bd907ec9a5c0d906948f5cb57c97372f07630368637326277fcb75c4db5 SHA512 478344a69216a5d9aa8b69a0252c171c23ae8719529fbecf912d8f298cb28bb85fd9506af2a5a4b77ddd3048c60d479dee0e5ba7909d661886d35c20107527fe
diff --git a/x11-misc/clipnotify/clipnotify-1.0.2.ebuild b/x11-misc/clipnotify/clipnotify-1.0.2.ebuild
new file mode 100644
index 000000000000..f3047ebe20ed
--- /dev/null
+++ b/x11-misc/clipnotify/clipnotify-1.0.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Notify on new X clipboard events"
+HOMEPAGE="https://github.com/cdown/clipnotify"
+SRC_URI="https://github.com/cdown/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	x11-libs/libX11
+	x11-libs/libXfixes
+"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	dobin clipnotify
+}
diff --git a/x11-misc/clipnotify/metadata.xml b/x11-misc/clipnotify/metadata.xml
new file mode 100644
index 000000000000..b99ff18165e9
--- /dev/null
+++ b/x11-misc/clipnotify/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>erkiferenc@gmail.com</email>
+		<name>Ferenc Erki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/x11-misc/compose-tables/Manifest b/x11-misc/compose-tables/Manifest
new file mode 100644
index 000000000000..acf8e5e1adc3
--- /dev/null
+++ b/x11-misc/compose-tables/Manifest
@@ -0,0 +1,3 @@
+DIST libX11-1.7.0.tar.bz2 2409144 BLAKE2B 1eb6aa8f2fe50ddb2f6d324429b3d9cecfb48833c3f52f22ae8e32846be614c8db63c57d25e2b1c46612b6b333ff61ceab8ac0b605b117bcea1224f918af8e6d SHA512 f661ca90350fd8a94f054b00f12f5122cea068ebff706acfd399462236c189a296a2358d17d16166635101cf56cc19303dd407873a159932d093c9f33556f9fb
+EBUILD compose-tables-1.7.0.ebuild 896 BLAKE2B 8c9361d90be16f2dbdeec75f29e9e9f0e129fa20922c11147d363dcbc23b8747093954ca9b5c914cac9e75c2573261ac043a3ed3253fa5015e0020067345fda0 SHA512 ca1ba19ede5a08d303a9421b529b1e96b68fb30824d3da7b4cd89cfe7728003dae5a656bbfa0886894ea8a2c66a679dc47aa513fc025780f8022b9f146a8f774
+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
new file mode 100644
index 000000000000..252ac5809af1
--- /dev/null
+++ b/x11-misc/compose-tables/compose-tables-1.7.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_STATIC=no
+XORG_MULTILIB=no
+inherit xorg-3
+
+# xorg-3.eclass would attempt to fetch a tarball with a matching name to this package
+SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/lib/libX11-${PV}.tar.${XORG_TARBALL_SUFFIX}"
+S="${WORKDIR}/libX11-${PV}/"
+
+DESCRIPTION="X.Org Compose Key tables from libX11"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+# Only needed by configure
+DEPEND="
+	x11-base/xorg-proto
+	>=x11-libs/libxcb-1.11.1
+	x11-libs/xtrans"
+RDEPEND="!<x11-libs/libX11-1.7.0"
+
+XORG_CONFIGURE_OPTIONS=(
+	--without-xmlto
+	--without-fop
+	--disable-specs
+	--disable-xkb
+)
+
+src_compile() {
+	emake -C nls
+}
+
+src_install() {
+	emake DESTDIR="${D}" -C nls install
+}
+
+src_test() {
+	:;
+}
diff --git a/x11-misc/dsx/metadata.xml b/x11-misc/compose-tables/metadata.xml
index 49c86a887b6a..e1e8e6f760c3 100644
--- a/x11-misc/dsx/metadata.xml
+++ b/x11-misc/compose-tables/metadata.xml
@@ -2,7 +2,10 @@
 <!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>
+  <email>x11@gentoo.org</email>
+  <name>X11</name>
 </maintainer>
+<upstream>
+  <remote-id type="cpe">cpe:/a:x.org:libx11</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/x11-misc/copyq/Manifest b/x11-misc/copyq/Manifest
new file mode 100644
index 000000000000..047c648436f8
--- /dev/null
+++ b/x11-misc/copyq/Manifest
@@ -0,0 +1,3 @@
+DIST copyq-3.13.0.tar.gz 2917941 BLAKE2B e8fc963e6a773ae70ca5a39f9ea55a98de5c5d129b845d0da9ed08ffec65d88ed8b5dd138dea11a33d563b899f0497929ed3c40d418574e50c2a1fbbd7b1a9f6 SHA512 898d4501002202849f0b5302d7315e8c539f8b0f8d5198641b3d3a647839581841e2ef1e2519c690d3cc95f85fdc921c979f2879348184de42767d31e081c307
+EBUILD copyq-3.13.0.ebuild 1052 BLAKE2B dd57b2a42902f3f8320a14df65c153db481807cf938e17f922876464b39dc67b0ccfce67a15a3b62f201b80b4f89923de9ed57a06dd4085b991ecfba4ed0a1b0 SHA512 cedc36d6c41c9f6cacc970cdb84023deb125d8e27be00ca70f76d43ea32b4b71f7be2e46461886f89ee2de2437a8ccbe367cf618fa5bf06d548087b6a43b2310
+MISC metadata.xml 434 BLAKE2B 0afbd9651727180ed25c0334b1922dbce24fb11518f72f63de24f4b5c86ff736a046607506b3e4bb2d1ee6c8320f809e1d650f55e7f736b33926539a1d3e32f5 SHA512 28a4d5ee65431e263ca600caa712b0c19040c5d74a8b1130098ddf8abf75105840ab0bf41d0d00af0910e8b8f4345ddf8c9ee54b4a5f3d57f82cf8a9f53b9e2c
diff --git a/x11-misc/copyq/copyq-3.13.0.ebuild b/x11-misc/copyq/copyq-3.13.0.ebuild
new file mode 100644
index 000000000000..2f1b7720f7a3
--- /dev/null
+++ b/x11-misc/copyq/copyq-3.13.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Clipboard manager with advanced features"
+HOMEPAGE="https://github.com/hluk/CopyQ"
+SRC_URI="https://github.com/hluk/CopyQ/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtscript:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libX11
+	x11-libs/libXfixes
+	x11-libs/libXtst
+"
+DEPEND="${RDEPEND}
+	test? ( dev-qt/qttest:5 )"
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+
+S="${WORKDIR}/CopyQ-${PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DPLUGIN_INSTALL_PREFIX="/usr/$(get_libdir)/${PN}/plugins"
+		-DWITH_TESTS=$(usex test)
+		-DWITH_WEBKIT=OFF
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/x11-misc/copyq/metadata.xml b/x11-misc/copyq/metadata.xml
new file mode 100644
index 000000000000..53ad4c8b06ad
--- /dev/null
+++ b/x11-misc/copyq/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>onigino@protonmail.com</email>
+		<name>Gino</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">hluk/CopyQ</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest
index 2fea117f48a4..771ec92c21fa 100644
--- a/x11-misc/dmenu/Manifest
+++ b/x11-misc/dmenu/Manifest
@@ -10,4 +10,4 @@ EBUILD dmenu-4.8.ebuild 1327 BLAKE2B 8c582b520297c9565731de782807988eb92e52458bb
 EBUILD dmenu-4.9.ebuild 1414 BLAKE2B 25a16db270e58b5e68f2630a370bb95451d873dcec7fa7d3af21040d44713d68ba8c02188b5c530ef3e39fb29464fd1c9f206a6ea8915666633215f179dc61e2 SHA512 be96af4189cbe5b9ea489869995ae362abec9439f4d1c0577840ff18862d0c1c6fd9f526f2543d3bbbe756f61582b2a6449f2d891ba5d8cf8b9ace81df7fafe3
 EBUILD dmenu-5.0.ebuild 1414 BLAKE2B 4e712800e3749d3c3cf8eab605d995667b3ff46aff7f696b4387911aa0bf31e31a4ca8bad2156591e2d3007950f592122b8ef57f0eb840d084903293569a7b98 SHA512 0bfc3218a7c653bc104680ca46cec18db8554b71327864493e57693eac2f69979b31a3ceacd71e31a0c2e9ef4e5a7fd88765ff9186435328e83af74e9c2174a3
 EBUILD dmenu-9999.ebuild 1375 BLAKE2B 35a86f3d75697c2c2cdf2c7298103dcf0a97dec40b11432ebe571f3d0df3deee399035ea5a59ea2af5deddd768e5e7825e75ad02a32836153cf0b401aabe25aa SHA512 670b62a9a32187a0ec812c4d0069f9020e5711f46aad32fc8671b290a7e986ed544c04020b5706cef980801aa5265fe9091ece0db6e40aedf0cf9ae6f519ede8
-MISC metadata.xml 361 BLAKE2B 40b663e4c351f9f6696f958b5a3006a3c18782dc2a4931584e566e2cdc2ea118f1fcef6a1ea7ad60724687e6f35bc1b25bc63351c6ffac03844ba0fb977576c8 SHA512 0be9c5e4fa1f72b02220088179c79f53e07928ee2890f78a24659e47961470d12ed7b8fe56b78ac4b493a2f42ebd491a8ebff405b013e7b7943de74892eed476
+MISC metadata.xml 251 BLAKE2B e9e9d48943645d8b737bc1f7ab0efb05db0f8eddad759c9bb40d07dc008fbfb8f5cca2020de71a9ff6945f5d66292ac02355773545010cd49c77fe6dd5ab7b40 SHA512 1b6a6955118c1a74cc89a77d6de9be8f4ff9c7137c186753462670a5b93457dfd034ad5d1f4d2507ac95cc149c2a042fa5324220b58702a56b09d91de40151c9
diff --git a/x11-misc/dmenu/metadata.xml b/x11-misc/dmenu/metadata.xml
index b4a38aa72629..efcd58fe0b9b 100644
--- a/x11-misc/dmenu/metadata.xml
+++ b/x11-misc/dmenu/metadata.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>jer@gentoo.org</email>
-  </maintainer>
-  <maintainer type="project">
-    <email>desktop-misc@gentoo.org</email>
-    <name>Gentoo Desktop Miscellaneous Project</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/dsx/Manifest b/x11-misc/dsx/Manifest
deleted file mode 100644
index 3e67e5a410fb..000000000000
--- a/x11-misc/dsx/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-AUX dsx-0.1 2218 BLAKE2B dc20fbd18c0fe455a704cd0384e9d310e5f3b378842a196de5d0969b844117a1444fbe0bb04c2f2a6e698216a0eff838a95052333601befcbbf755bb825cedc6 SHA512 918d05297dc39166fe1684b306441c519bdf41e56a94d4a5f090698f69fdebb1f4d077d07be4e6d5a22614f163eb4ff8645c8751397ba52e265daece840178a9
-EBUILD dsx-0.1-r1.ebuild 530 BLAKE2B a1d3d2e332cb106552287ff6629a209f1b39e1647cb66b5b6bd01783f11cc536b40bd654b7a24a2ff6e2093fd524d38e9cd24d36b60b8d014b552548dcbc51b9 SHA512 f8a6a0d2cb016052524823385c6d6238fe648525ec8efb71a952942b1716676effab5f0a09c2a4409c25c1da7d374d6b86af996043f653303cf05bc2be3b06e5
-MISC metadata.xml 272 BLAKE2B 4dbd2b5ae92564a97b2a06ab0ec6562e8dce2dd636aaf0788ee09f8688ca5d5b6483084a65366dfbe6d144d30170e5558bc5759adecb96abb405ea96a5147285 SHA512 ebe67da08587903b5b82fc194aa3c8f1ab65371f60d2c134928362e089550d9e9fd9531bffe8b676a345b5bf0ab209ce7f50d37d98201a88176f002e17582493
diff --git a/x11-misc/dsx/dsx-0.1-r1.ebuild b/x11-misc/dsx/dsx-0.1-r1.ebuild
deleted file mode 100644
index 6b49cac790e8..000000000000
--- a/x11-misc/dsx/dsx-0.1-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="Command line selection of your X desktop environment"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND=""
-RDEPEND="
-	${PYTHON_DEPS}
-	x11-apps/xinit"
-
-S="${WORKDIR}"
-
-src_install() {
-	python_newscript "${FILESDIR}/${P}" "${PN}"
-}
diff --git a/x11-misc/dsx/files/dsx-0.1 b/x11-misc/dsx/files/dsx-0.1
deleted file mode 100644
index d8f5e7192928..000000000000
--- a/x11-misc/dsx/files/dsx-0.1
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/usr/bin/env python
-# dsx is Mandrakesoft's Xtart modified to work with a Gentoo Linux system.
-# Gentoo doesn't use a wmsession.d directory, so we're going to accept the
-# /etc/X11/Sessions executables as our menu and our command parameters.
-# I also tried to increase the robustness of the entry checking and make the
-# error messages less condescending.
-# The 0 option for "no wm" was removed.  I altered it to run option 1 instead.
-
-### Original copyright / license message from Xtart... ###
-#  This is an official linux-mandrake extension of the X windowing system for
-#  the benefit of Declan Moriarty  Copyright 2001 by civileme@mandrakesoft all
-#  rights reserved.  Use is hereby granted under the GNU General Publoic
-#  License version 2 or any future version of said license at the user's option
-#
-#  No Warranty of course.
-#  This program is designed for those who want to work in concole and   
-#  occasionally boot into window managers or who want to avoid theme
-#  persistence from one WM to another.
-################
-import sys
-import os
-import popen2
-import string
-import math
-def complain():
-    print 'X initiation aborted on invalid selection.'
-    sys.exit(0)
-    return
-print
-print 'Welcome to the Desktop Selector for X'
-print
-fspc=os.path.expanduser('~')+'/'
-io=popen2.Popen3('ls /etc/X11/Sessions',1)
-L=io.fromchild.readlines()
-Sessions={}
-Sessionkeys=[]
-primekey=0
-for k in L:
-    primekey+=1
-    name=k[:-1]
-    command='/etc/X11/Sessions/'+k[:-1]
-    Sessions[primekey]=(name, command)
-Sessionkeys=Sessions.keys()
-Sessionkeys.sort()
-for j in Sessionkeys:
-    if os.system('[ -x '+Sessions[j][1]+' ]') == 0:
-        print j, Sessions[j][0]
-    pass
-print
-sys.stdin.flush()
-s=raw_input('Enter the number of your desired desktop environment [1]: ')
-if len(s)==0:
-    s='1'
-if s=='0':
-    s='1'
-for j in range(len(s)):
-    if string.find(string.digits,s[j]) == -1:
-        print "'" + s[j] + "' isn't a digit."
-	complain()
-if len(s)>int(math.log10(primekey))+1:
-    print "That number is too big."
-    complain()
-well=int(s)
-wellformed=Sessions.has_key(well)
-if wellformed:
-    os.execvp('xinit',Sessions[well])
-else:
-    print
-    print 'Your selection was invalid.'
-    print
-    complain()
-
diff --git a/x11-misc/e16menuedit2/Manifest b/x11-misc/e16menuedit2/Manifest
index fda795ad437d..745b98c74218 100644
--- a/x11-misc/e16menuedit2/Manifest
+++ b/x11-misc/e16menuedit2/Manifest
@@ -1,4 +1,5 @@
+AUX e16menuedit2-no-common.patch 725 BLAKE2B 48a150bc33e3baac1a8bbc2f18d560ffe0a67a5a65a57633e7255c554fa9eed9f4201e775742416163ae0af4a805d0a113b6c0be2730091376d61cb9916da1ef SHA512 d99db1bd84c47369f98f2caff216cbdd9c2e10d35eed243ed0971c2f533ed26aa3a93d09a01f4fdce4c15a80416892f74f94d5168d74fa5183aacb6ddb8cea1a
 AUX e16menuedit2-no-default-docs.patch 461 BLAKE2B 87453feb85cff012e821ca86c477bd413e416dffc5893fe1f98121e6090ac73f28d47a8fe1bfb8d93388fc39373433544f988bfa52f62e322a2b261a90d9f717 SHA512 64b115434428a5632f9a2d0c28159a65136cbb106060275e57401018d9c574e68a461dca4f31e4949d089a92c86bca37433c5c0e660b085a495f8baa0f001088
 DIST e16menuedit2-0.0.3.tar.gz 370740 BLAKE2B 5d5be198f72afbd7cf22f02d8bb9179c3f877101eccc9b57c3a5e4f2fd05260e807d267d4c7abfd40fc0a41700e876efceb992d27450f2960772321a625c5a85 SHA512 41942028e7d20b5aa46fce8f54f60af46bd08e292a1812d4845d68cbc670699c8fc70a8d71c2749df623a4a083b92bc9539b9241fd7daabbee0deb855ff1be99
-EBUILD e16menuedit2-0.0.3.ebuild 705 BLAKE2B a6571e4fda94fc85de53823fb2104306f75195d5f7e621b446c1e1927f8b549358af0db3b7145dee9d6cd8ebcc13978eda820f08eb0cb016e26b486f1e748931 SHA512 1dc4104b494c3291512c91ad562ad2dbd1f37022707805115c4cbfcb75256ce0c764d2e0ec11b1512197ce6373c232a738261c80feefceecd1a5eef5b7b065d1
+EBUILD e16menuedit2-0.0.3.ebuild 743 BLAKE2B 7e65d1af263553478aeb2e29e4588bcad58a10c69a1388580b980671627cc5392d03ae0bff989fe288a37d4d511d7ab01337fde2afb4222b99ad1b118dabfdb7 SHA512 2449d10ba1aed5e85c1568b25afd29641acc6bf72c88584533b4ca27561a9a19694a082b25ba25afde1d424b183f288d2103add7a51d837c6d5143df6bc6844f
 MISC metadata.xml 343 BLAKE2B 295618490636872ce0aff5266028733087db75ec585d604a9908afe1cfa49e4101778badbc3dded2717e733fa76b879a4fbb58070b3e2e1e09268a871eb7bb8c SHA512 200efaf51e5c6746fa854a10d1d63348695db4da86091cd50ef01a9fd4b7d46cda9c79f257fdf337911d276fc2f95ca17dc05070a252f7eaa1fc3bb9eb2c1071
diff --git a/x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild b/x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild
index e0d251548c59..9c379752fcbb 100644
--- a/x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild
+++ b/x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,7 +24,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-no-default-docs.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-no-default-docs.patch"
+	"${FILESDIR}/${PN}-no-common.patch"
+)
 
 src_prepare() {
 	sed -i '1i#include <glib/gstdio.h>' src/e16menuedit2.c || die
diff --git a/x11-misc/e16menuedit2/files/e16menuedit2-no-common.patch b/x11-misc/e16menuedit2/files/e16menuedit2-no-common.patch
new file mode 100644
index 000000000000..4ac213b101f9
--- /dev/null
+++ b/x11-misc/e16menuedit2/files/e16menuedit2-no-common.patch
@@ -0,0 +1,20 @@
+--- e16menuedit2-0.0.3/src/e16menu.h.orig	2020-10-11 10:41:36.827021380 +0300
++++ e16menuedit2-0.0.3/src/e16menu.h	2020-10-11 10:51:27.043070842 +0300
+@@ -45,6 +45,6 @@
+ gboolean table_check_func (GtkTreeModel *model, GtkTreePath *path,
+                           GtkTreeIter *iter, gpointer user_data);			  
+ 
+-gchar *menu_file[MAX_RECURSION];
++extern gchar *menu_file[MAX_RECURSION];
+ 
+ #endif /* _E16MENU_H */
+--- e16menuedit2-0.0.3/src/e16menu.c.orig	2005-02-18 15:09:55.000000000 +0300
++++ e16menuedit2-0.0.3/src/e16menu.c	2020-10-11 10:51:52.615152314 +0300
+@@ -34,6 +34,7 @@
+ #include "treeview.h"
+ 
+ extern struct global_variables gv;
++gchar *menu_file[MAX_RECURSION];
+ 
+ GtkTreeModel *load_menus_from_disk (void)
+ {
diff --git a/x11-misc/fbpanel/Manifest b/x11-misc/fbpanel/Manifest
index 5828798f24bd..2feb0c943564 100644
--- a/x11-misc/fbpanel/Manifest
+++ b/x11-misc/fbpanel/Manifest
@@ -3,6 +3,7 @@ AUX fbpanel-7.0-clang.patch 2596 BLAKE2B cb9e42fb7afaf007d49c54270ee6e09a551ee5c
 AUX fbpanel-7.0-fno-common.patch 440 BLAKE2B ef20f4055b21b77f15e1946a3c94eb7dd1a74f85922ebd0059b74b7503467930b352888768948f0ca46c2966103b65b746bd2c095c03f77af7859d27bcaf3013 SHA512 a62c4514749d26bd2e77d5d0ed1eae3f83af765957ec5d5e94679f9787db3eadf192eccadfcb67dc087688d6d59303cd1f6ff0448dbca11dc8524cd3079c1d4c
 AUX fbpanel-7.0-images.patch 274 BLAKE2B f587453d0e66c5fb8c93ad936dbf1cd1291d6dd652dde29f6e995947663eae8f20da3f022e494bbc6406db48ed3acdc71a38d973638b6ec11fb63e7117efd41a SHA512 432884c3d397c24e28e909bb3626ebd29ce3023c4e1aa68ccc9defdd81b59e29f72e8d090b54a04e501852b6cda91b1e8157e49092c7562184d787c8085f3ec0
 AUX fbpanel-7.0-python3-shebangs.patch 2348 BLAKE2B 84c05bb718b5754d2679fa2b1807c9a0207058d5338dc59eb65643797d6aecc31f52eaf0134b26a3a4fa5364337fa577a641f05d58401441e14faca7ce83b0c5 SHA512 6791c1cd963f40db8df88b4758464fe99f308990ab86ee2e91c6e36c2e4f8ccf935275074352d432078ab4c3f8fb07f3535af43fb2627e0904153be087a5992e
+AUX fbpanel-7.0-remove-gdk-pixbuf-xlib.h.patch 801 BLAKE2B 49a0d7217b5e44c902200d9fc4cee57d245386cbf400e21a24672b2c121578d09dd440d56f05483afbe3e6083bbe65fdafb162e35624d7bd0f7f34b1639d2737 SHA512 d4fc104faf4bc4c9ead54530c3e00e82d9ab3c356d635c824d206dd2fa64c64b8ff57594cb6fbbef9725df30f10994de3a213aff8f1eb7fc8b59cd08498e3148
 DIST fbpanel-7.0.tar.gz 3746477 BLAKE2B 6bc8ef39d44768b5fc9fc4c58ea0b89c723f0e5239198d3b1a5f6fe27252bf22c87fec5beb13fa3371af6c218e592d67d04644bd82cc62f357def610680fc2d2 SHA512 9706a96569c41241de4dbd250c9d6a473b53a5e26e880f4c782041b2b91c7570046e1bee3070059fd2d333fb7159490732ef397b86701c72d4c65c0784948874
-EBUILD fbpanel-7.0-r2.ebuild 1529 BLAKE2B e876db52198ce5ebd462019010a743479cd0c2d6e1aa21b7d2bbf2ab2786a453ca5293aa55acceddca97d62ddbcadb6b12981ad9746a3ba3b1ee91264f23189d SHA512 b634e26e8b129c61853648c71ea0bfd14a2322f4ba2cdbe84d1a1985e9ad219ec8df920ff94cda4b4b810b2708a7bcd35ed585c146440822fab6adfa5a66fd84
+EBUILD fbpanel-7.0-r2.ebuild 1582 BLAKE2B 0579b41cbbec6571b4bbf4d0120551534a58e45c28925d59a780dc9b2fbead6308b68c2457295485a5c4cb47934bee4bfcee97f063694517fef4ac95479706a3 SHA512 30c9a6f4f462b76ee33561ee286ab4ea83b0d95d0d56d7d7100ad285bea28b7ffbf8ebba36e8eac43378d193aa4a119e81bca8d6aa6434adcd92fc3e4cdc6b0d
 MISC metadata.xml 421 BLAKE2B bec71cdd70517d1087d289c1124ed74c9540601d34de83aef4e2d45c0c3c1d3c6f6cef080edd7dd6641f146752c81a12a5c34658f8f097b940bf67ea9c024a96 SHA512 6e50dcf1443603726214701d8187864db64227db01b5c19f630d703864faec0d4692a5967a6286bd5fcd0b4762997a2bcb8ad6d4742ae5b2dc33bfe38d808fbe
diff --git a/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild b/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild
index ddb2acb616cb..d68e30e9802b 100644
--- a/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild
+++ b/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild
@@ -16,7 +16,7 @@ IUSE="alsa"
 
 RDEPEND="
 	dev-libs/glib:2
-	x11-libs/gdk-pixbuf:2[X]
+	x11-libs/gdk-pixbuf:2
 	x11-libs/gtk+:2
 	x11-libs/libX11
 	alsa? ( media-libs/alsa-lib )
@@ -36,6 +36,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-7.0-fno-common.patch
 	"${FILESDIR}"/${PN}-7.0-images.patch
 	"${FILESDIR}"/${PN}-7.0-python3-shebangs.patch
+	"${FILESDIR}"/${PN}-7.0-remove-gdk-pixbuf-xlib.h.patch
 )
 
 src_prepare() {
diff --git a/x11-misc/fbpanel/files/fbpanel-7.0-remove-gdk-pixbuf-xlib.h.patch b/x11-misc/fbpanel/files/fbpanel-7.0-remove-gdk-pixbuf-xlib.h.patch
new file mode 100644
index 000000000000..b2a0375bbb11
--- /dev/null
+++ b/x11-misc/fbpanel/files/fbpanel-7.0-remove-gdk-pixbuf-xlib.h.patch
@@ -0,0 +1,26 @@
+https://bugs.gentoo.org/753908
+
+--- a/panel/plugin.c	2015-12-05 01:34:19.000000000 -0500
++++ b/panel/plugin.c	2020-11-10 13:35:27.794816516 -0500
+@@ -3,5 +3,4 @@
+ 
+ #include <gdk-pixbuf/gdk-pixbuf.h>
+-#include <gdk-pixbuf-xlib/gdk-pixbuf-xlib.h>
+ #include <gdk/gdk.h>
+ #include <string.h>
+--- a/plugins/icons/icons.c	2015-12-05 01:34:19.000000000 -0500
++++ b/plugins/icons/icons.c	2020-11-10 13:35:49.852850997 -0500
+@@ -9,5 +9,4 @@
+ 
+ #include <gdk-pixbuf/gdk-pixbuf.h>
+-#include <gdk-pixbuf-xlib/gdk-pixbuf-xlib.h>
+ #include <gdk/gdk.h>
+ 
+--- a/plugins/taskbar/taskbar.c	2015-12-05 01:34:19.000000000 -0500
++++ b/plugins/taskbar/taskbar.c	2020-11-10 13:35:35.950782862 -0500
+@@ -9,5 +9,4 @@
+ 
+ #include <gdk-pixbuf/gdk-pixbuf.h>
+-#include <gdk-pixbuf-xlib/gdk-pixbuf-xlib.h>
+ #include <gdk/gdk.h>
+ 
diff --git a/x11-misc/gcolor2/Manifest b/x11-misc/gcolor2/Manifest
index 8b3fc84304bb..fc6ee653b0b0 100644
--- a/x11-misc/gcolor2/Manifest
+++ b/x11-misc/gcolor2/Manifest
@@ -1,7 +1,8 @@
 AUX gcolor2-0.4-amd64.patch 1484 BLAKE2B ca9dce4a0871e9dbff507c6df74b9a2e9ead18d10d318c5d0cbc108ace666a7ffe4515e8044fb2fa21ec31f0a62ba875b7875faec78cdcff0ea41fea8d4f8c99 SHA512 1b114e31a0a0fd4d500ea992616e72c8b0f1cd3442130f1955acd2d17c7a0239f6036986e9e3297182245ee7846fb9e72394acae72c88ccb2cfcf8049d105077
-AUX gcolor2-0.4-pkg-config-macro.patch 240 BLAKE2B 3cf9e2836caaed0e4d0976f58af91b9e95d76827ac052d34d14dfa293a36ac6c7bd1c8d563fab4ecdcf6f370f8c5bdc40698395c7a58123804055f73216a57b3 SHA512 e86fc73aee59d73e19d5c841169b4e4941aba78e206be67c86b45bddcdf51f86e7ad0dbfbbeafe98c6bf056a314940e27f02087224f271b085154636fbc2983a
-AUX modular-rgb.patch 800 BLAKE2B 2bfa38afc6c781d6686e5a95c99d442bb7694487ef27b34915e700f540efad746a0d2bda5112cc15e8d3c79d9f99a9b15ab0004a00d9f9baea2dd7761655d2a7 SHA512 bf2ffe9bb489869e67b8b595fba649d3a8e0fe6dd168156c61f2a1165d865ac15199e03896c9b8e6a65d6cf84e8445f303f9b8eb190c60478e1334b60716572f
+AUX gcolor2-0.4-fno-common.patch 629 BLAKE2B 9eb930e46c46564df4bf38cbc449f1dbfbe01fe17b36b3e5bd143cb0a01149578d2afe79fcfdebf0775bcb962a049d68d8a68c523e34631780788eca818b4e7f SHA512 d5d2179c27ce4a86460c72032eb6cbfa4830226ec4e8377fa365c0f80036b83eca3b959208ec7c3288968eff6471b4000e80fcdb39169a11c9ae7d2e4fdbdd93
+AUX gcolor2-0.4-pkg-config-macro.patch 168 BLAKE2B 9f66e9012cc231febd622ec9ee4a25b1b0d9f27652baf734076f4e7f430f37050481071b315c5006d999bcd6983457bb3b12269b181ce3dc357727e4723ea0a9 SHA512 5923b8467485e7aa013369196c240bba7ea439347d9c2f96356f7f869da2ac10b744b58b8ce5ba22a4608f81a29b539158661be2c8f302f3d357de01c97b7099
+AUX modular-rgb.patch 654 BLAKE2B 147c1083b6aa4fbdd468c7f30c6755e1fb0b9b3cadb932feb4dc6c2dbf4fb69125f9c4c795aa1a5aab7b4a8be10615a2b4a719de9c2dce107597664998553926 SHA512 71862c771557b23c8ed24960fbd5b43fbefe72902c9d80a59b51fa30d8350c203f1724b9e7e24c3479953cee6b34e5413ff08a74f3975f5a8b01d621af4754ee
 DIST gcolor2-0.4.tar.gz 375217 BLAKE2B c8bc8581c9790106a9461cda03e40c201faec95c9c0d7890dbb8903346a85208c506dd8c9cd0735036b4a294205f44c857edbae8282574d195e77f4954bae91c SHA512 9b9677b4be8797c9b03deef9bf1b96e6497d2adf85f74d01f1b478f04d92cb912790c4d5fb74f403295219cac6c0d3fcabaa7de340975bbcdb68b0347f6042a3
 DIST gcolor2.svg 12742 BLAKE2B 40f5e6624a0a90d8d8c81dd5814d836741bab04f19d73cfbd96f224baa78165447d1642c18a55ef282771a02de4bddd77d975c4aa75bb74b98d63227f87031ea SHA512 377dbd494e5a3f881df65415ee66310cd96b4e4ac668101aa068bfe6f575b694c930817cec942e885f93465d05ccc604950f2154e26be95618d6f272d81ffe1b
-EBUILD gcolor2-0.4-r4.ebuild 1030 BLAKE2B 01c252a591e73b8abfe3b90488f92e1c9e8fadfe08bc809aa43103ea7e9491475b53e0b02fc9ff548ba0871508972b0dc08df0924b5b51194d790d9dacdd51ce SHA512 4749498596653dd27afff678ee521934d9a538d5173061ef94e3e66b6047c554cddc1f69cfab171d1cc2b71969e962fefc46ab2612a9245bdd4b6e8a54f4ef30
+EBUILD gcolor2-0.4-r4.ebuild 1034 BLAKE2B 8abe01179114908dc0f3f593a64c18784e4f3f4b12b17543169ee3935f8932eae8b5dd837e2f49a441c70f1100eef9b0838097037537fbbe26241d34bcc35618 SHA512 2fd37f1dd44583e9943583ee07dcf562e9c57047fb375d1d7a64daa781de649249fe840263beb07b338ddb69e2fcffa0efb64092737f9f26ef7dbef1b907b684
 MISC metadata.xml 330 BLAKE2B c19955a2fb7320cb01c45f1c478f0ca6adc253862399ee4fc52e64dc728ccc2550779b3c6d9e4784ad59e303947a45009a7cff803cbe278c51aa50d41a5b1c39 SHA512 93ca94884b92665bd0e26010bdc1120a3014a0c22ab2de2b06bfff14ac716ca28017e04ec6607a0ec4b90818692ecd6d701147b8e5068e933b3fe0641a7f735f
diff --git a/x11-misc/gcolor2/files/gcolor2-0.4-fno-common.patch b/x11-misc/gcolor2/files/gcolor2-0.4-fno-common.patch
new file mode 100644
index 000000000000..f30552a13e60
--- /dev/null
+++ b/x11-misc/gcolor2/files/gcolor2-0.4-fno-common.patch
@@ -0,0 +1,27 @@
+--- a/src/callbacks.c
++++ b/src/callbacks.c
+@@ -13,6 +13,9 @@
+ #include "support.h"
+ 
+ 
++GtkWidget        *gcolor2;
++GtkWidget        *menu;
++GdkColor          colorvalue;
+ GtkWidget        *savedialog;
+ gchar            *colorname;
+ static GtkWidget *aboutdialog = NULL;
+--- a/src/callbacks.h
++++ b/src/callbacks.h
+@@ -42,9 +42,9 @@
+                            "\302\267 Usability / user interface enhancements\n" \
+                            "\302\267 Code cleanup"
+ 
+-GtkWidget *gcolor2;
+-GtkWidget *menu;
+-GdkColor   colorvalue;
++extern GtkWidget *gcolor2;
++extern GtkWidget *menu;
++extern GdkColor   colorvalue;
+ 
+ enum
+ {
diff --git a/x11-misc/gcolor2/files/gcolor2-0.4-pkg-config-macro.patch b/x11-misc/gcolor2/files/gcolor2-0.4-pkg-config-macro.patch
index ee904746f147..c3fcca0af712 100644
--- a/x11-misc/gcolor2/files/gcolor2-0.4-pkg-config-macro.patch
+++ b/x11-misc/gcolor2/files/gcolor2-0.4-pkg-config-macro.patch
@@ -1,5 +1,5 @@
---- configure.ac.old	2008-01-08 09:36:24.000000000 +0100
-+++ configure.ac	2008-01-08 09:37:06.000000000 +0100
+--- a/configure.ac
++++ b/configure.ac
 @@ -26,6 +26,7 @@
  AC_DISABLE_STATIC
  AC_PROG_LIBTOOL
diff --git a/x11-misc/gcolor2/files/modular-rgb.patch b/x11-misc/gcolor2/files/modular-rgb.patch
index eec5668c2bc7..798fe57e2e3f 100644
--- a/x11-misc/gcolor2/files/modular-rgb.patch
+++ b/x11-misc/gcolor2/files/modular-rgb.patch
@@ -1,5 +1,5 @@
---- src/callbacks.h.orig	2006-01-10 21:26:19.000000000 -0500
-+++ src/callbacks.h	2006-01-10 21:26:44.000000000 -0500
+--- a/src/callbacks.h
++++ b/src/callbacks.h
 @@ -12,6 +12,7 @@
  #define SYSTEM_FILE_2      "/usr/lib/X11/rgb.txt"
  #define SYSTEM_FILE_3      "/etc/X11/rgb.txt"
@@ -8,8 +8,8 @@
  
  /* about dialog text */
  #define ABOUT_CREDITS_TEXT "Developer:\n" \
---- src/main.c.orig	2006-01-10 21:43:20.000000000 -0500
-+++ src/main.c	2006-01-10 21:42:14.000000000 -0500
+--- a/src/main.c
++++ b/src/main.c
 @@ -36,6 +36,8 @@
  		sys_filename = SYSTEM_FILE_3;
  	else if (g_file_test (SYSTEM_FILE_4, G_FILE_TEST_EXISTS))
diff --git a/x11-misc/gcolor2/gcolor2-0.4-r4.ebuild b/x11-misc/gcolor2/gcolor2-0.4-r4.ebuild
index 0b164ecf00f6..ec842bfb9d47 100644
--- a/x11-misc/gcolor2/gcolor2-0.4-r4.ebuild
+++ b/x11-misc/gcolor2/gcolor2-0.4-r4.ebuild
@@ -1,42 +1,45 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-GCONF_DEBUG="no"
+EAPI=7
 
-inherit autotools eutils gnome2
+inherit autotools desktop xdg
 
 DESCRIPTION="A GTK+ color selector"
 HOMEPAGE="http://gcolor2.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+SRC_URI="
+	mirror://sourceforge/${PN}/${P}.tar.gz
 	https://dev.gentoo.org/~pacho/gnome/${PN}.svg"
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2.4:2"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	>=dev-util/intltool-0.27
-	virtual/pkgconfig
-"
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/modular-rgb.patch
+	"${FILESDIR}"/${P}-amd64.patch
+	"${FILESDIR}"/${P}-pkg-config-macro.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/modular-rgb.patch
-	epatch "${FILESDIR}"/${P}-amd64.patch
-	epatch "${FILESDIR}"/${P}-pkg-config-macro.patch
+	xdg_src_prepare
 
 	# To check at each bump.
 	sed "s/^#.*/[encoding: UTF-8]/" -i po/POTFILES.in || die "sed failed"
-	echo "gcolor2.glade" >> po/POTFILES.in
+	echo "gcolor2.glade" >> po/POTFILES.in || die
 
 	eautoreconf
-	gnome2_src_prepare
 }
 
 src_install() {
-	gnome2_src_install
+	default
 
 	# Icon from https://sourceforge.net/p/gcolor2/patches/5/
 	doicon -s scalable "${DISTDIR}/${PN}.svg"
diff --git a/x11-misc/i3status/Manifest b/x11-misc/i3status/Manifest
index 96dd48ad4f1a..789210b7157c 100644
--- a/x11-misc/i3status/Manifest
+++ b/x11-misc/i3status/Manifest
@@ -2,5 +2,5 @@ AUX i3status-2.11-pulseaudio.patch 1085 BLAKE2B cbef3ee6b008773aff92f629468bf543
 DIST i3status-2.12.tar.bz2 57162 BLAKE2B d3225581b628640bfb6084b390a135562c2ce052078cf014a63e106c83beb14b38270eee28d01898d478a9593ce542684252e420ffe37d07f392509ac9b2a749 SHA512 687a880a65cb8df46f5e9d2256b59724ba3424c502e9a0fb3ca71b070875df5f4008ee501c554bc716f2d728a5cf813a36d22d7377d42c3c46b14381d385bab3
 DIST i3status-2.13.tar.bz2 201409 BLAKE2B e087d69e2df3ae9348cb55739023b2164dfa3543551d173b138c72e574714069d8397716b95e92c4315aa538ea31b33aa73532d6d0f75bbc38d7db54e1f665bc SHA512 6dadff19e53499d169ba4f491e1f821014b4f92fc3c93d7947c85cbbbdeaba538d02bd8ab98fe266a8f80756a287fd5803ec77a8cd874d50082b5cad309875c2
 EBUILD i3status-2.12.ebuild 1045 BLAKE2B a7f9599f1d904046477a35cec6a6d51fafaa8980d1a94c7a914fe5deff90dfb7bfe529096e19434316bf0e81cf1ff17a87674b705b77db5453160d7fb037d416 SHA512 dcfc73c0f40c229966beb2df99ea306f402e895e809d248f0eb4ecc7ffa8bc001912624098db023e4ea35351c0c0175e221028050cb40032b7b4cdb94898966a
-EBUILD i3status-2.13.ebuild 926 BLAKE2B 2d88ed9b524cf6fd11157014ac92ddcff1779716cbdb09e46740215c3de3d61b36244d4779b1341040e59696a8df0a730dca8f6230631d194094cccf81bb27ba SHA512 c385efa7f0fb3b8412c074a422302fc1af357d9f50a5e806f7bb46d9dc3af9ceeea482915c72060d0f9b787a6d0ff218bef8056d47c836b159c1f7896961f61e
+EBUILD i3status-2.13.ebuild 924 BLAKE2B db893d3ecab8502e58927fc6afa80fb65449a29d8a80c0d47180579e443d44aacdfedf384a290a4ce5c30d3888a0a1a9387bf4836b0653cc21d2f32b9c015001 SHA512 ce6389d80cff593f78ad3f7486dcd3573080c1f5d18a82b2cbd69794f25b450b1aed4e32612677a04bc5de676076a8119983dfc6c0f2a50119d8aec5a1d7f5df
 MISC metadata.xml 923 BLAKE2B 9c815212a4cf22f000c66829c287ce86f55f9271b7e74ab55231eace1cb435092ef4539946ae598d741c34a1032f67ae23f29667499707a051fca604683c0b5a SHA512 767566a72041c13afd546301ad688053e7855fa90c036d381eb03ba4d53caa573809b9ba7433c4484004f3aed800a0b9232c6861e347a1b75ed04f56cb37240b
diff --git a/x11-misc/i3status/i3status-2.13.ebuild b/x11-misc/i3status/i3status-2.13.ebuild
index 06ad9dcfa46f..74e0f77e8a1a 100644
--- a/x11-misc/i3status/i3status-2.13.ebuild
+++ b/x11-misc/i3status/i3status-2.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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"
 
 BDEPEND="virtual/pkgconfig"
 RDEPEND="
diff --git a/x11-misc/ipager/Manifest b/x11-misc/ipager/Manifest
deleted file mode 100644
index 40bbbdaf4a92..000000000000
--- a/x11-misc/ipager/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX ipager-1.1.0-gcc43.patch 644 BLAKE2B 3ae90ee13ab0d1372681a9cd33201da64b2fd6a4299f651a55bf0c75b0e85b9fc9351443f5eecf5f3b762b43190d1b806cc4a52c84db3c464f1e6165e81db8a6 SHA512 08f2ced48ca7e117a7b0c70d7198e429d8fa0ea6dbffcd421c969fbfca6fbd7f301dc0c6cd31f2bd2f4d954a48c56d4e7ecf05a59c0a3ffa4ec4cd4a110c4ba5
-AUX ipager-1.1.0-gcc47.patch 198 BLAKE2B df06298a2f581881f269ea858abd94e0bfc0a02195ca48a7e7f6a24af3bd517144036342ba9a175c96d5e8c793dd7f9a0c1b03e38f8a85b103818496a6f797f7 SHA512 c6a851b5b6a76f2ada504ab3e727a0dc811e03e70be330a26c2001854f873ccbdbe337e9aa010fcfd2f6c644d692ef13185d6dfb91187c63072574cca581c17f
-AUX ipager-1.1.0-scons_flags.patch 901 BLAKE2B 1a1cd9687ae348426080df1c2fc6fbafc435027bc129e4977f3d43be9fdcddf29a6f5009751b0fa0d429daa56a1048f427a6049be493364ce4319cee9a88cdd1 SHA512 a44671bd29d99219f2b36d9718e32e6022f971b805531196dc464c92f8dee7df6a7bbf9d931e0a69dc617ac1dd1876929a8d77a0a7edd2014e9754f2a8070efb
-AUX ipager-1.1.0-scons_imlib2.patch 663 BLAKE2B 26422f0cc26eda7afdce9363c9a171935755d58d923d62a61f4257c32d9376aac4a49d09015b0d470c090b0c25ac73a4140f21efe3accb5b73662ab4863d0d6c SHA512 1b4e0196189ec64b48c4c841d03f3a3e3c516ffd86f432d536e7bea51ade407fe430342d5d690d00b46cc7b727c7d12441f55416f7eea6dc933fb07a2ce16e14
-DIST ipager-1.1.0.tar.gz 30499 BLAKE2B 75644cbc2e6cca9af82589c7dbed4f0244870ec104cc8df9d294a6efe52f7dd19da2e5f0008cbeb72fbfe56f33acc6b921038faf00082c478f6a5c208f3fc09b SHA512 34f2982b4378e8de7479803d205c2d9157b71863278382c91d0c3daaee57352f2f6678fa338f34dc9e6bd70081e5f0bc03634632a7b6ab20a507b6fad3c2e5e3
-EBUILD ipager-1.1.0-r1.ebuild 1099 BLAKE2B 652cdeb8da8101fb4be4e2b7f34df2b255254c63e7061514f4c021fd074d559a06c1804f021ee787e2996dcd720915317c92fd6bc9974af88f7401a5a3c94d38 SHA512 e35156736ef0c5f913da3104f1f6a8788d0c153040914c019ba604e152c648a2fb0441ca1c48ac491a7fdc8202be987ebc2a563ec6923674d9ca495c0d94e236
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/x11-misc/ipager/files/ipager-1.1.0-gcc43.patch b/x11-misc/ipager/files/ipager-1.1.0-gcc43.patch
deleted file mode 100644
index ca7752ac99d0..000000000000
--- a/x11-misc/ipager/files/ipager-1.1.0-gcc43.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Fix ipager to compile with GCC 4.3.
-
-Patch taken from Gentoo bug #173562.
-
-X-Gentoo-Bug: 173562
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
---- a/iconfig.cpp	2008-08-22 21:35:16.000000000 +0600
-+++ b/iconfig.cpp	2008-08-22 21:35:20.000000000 +0600
-@@ -30,7 +30,7 @@
- #include <iostream>
- #include <fstream>
- #include <sstream>
--
-+#include <stdlib.h>
- #include <sys/stat.h>
- #include <sys/types.h>
- 
---- a/wm.cpp	2008-08-22 21:52:36.000000000 +0600
-+++ b/wm.cpp	2008-08-22 21:52:40.000000000 +0600
-@@ -27,7 +27,7 @@
- 
- #include <time.h>
- #include "atoms.h"
--
-+#include <stdlib.h>
- 
- WM * WM::m_instance = 0;
- bool WM::x_error = false;
diff --git a/x11-misc/ipager/files/ipager-1.1.0-gcc47.patch b/x11-misc/ipager/files/ipager-1.1.0-gcc47.patch
deleted file mode 100644
index f4c899302aeb..000000000000
--- a/x11-misc/ipager/files/ipager-1.1.0-gcc47.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-https://bugs.gentoo.org/423215
-
---- a/ipager.cpp
-+++ b/ipager.cpp
-@@ -29,6 +29,7 @@
- #include <config.h>
- #endif
- 
-+#include <unistd.h>
- #include <iostream>
- #include <string>
- using namespace std;
diff --git a/x11-misc/ipager/files/ipager-1.1.0-scons_flags.patch b/x11-misc/ipager/files/ipager-1.1.0-scons_flags.patch
deleted file mode 100644
index 6eb8b1ff4f53..000000000000
--- a/x11-misc/ipager/files/ipager-1.1.0-scons_flags.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Make sure Scons takes the CFLAGS/CXXFLAGS/LDFLAGS etc for the system.
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff -Nuar ipager-1.1.0.orig/SConstruct ipager-1.1.0/SConstruct
---- ipager-1.1.0.orig/SConstruct	2008-09-08 20:32:23.007016555 -0700
-+++ ipager-1.1.0/SConstruct	2008-09-08 20:32:05.103267940 -0700
-@@ -30,6 +30,16 @@
- # environment
- ipager_env = Environment(options = ipager_options, ENV = os.environ)
- 
-+# process env variables
-+for K in ['CPPFLAGS', 'CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CC', 'CXX']:
-+  if K in os.environ.keys():
-+    dict = ipager_env.ParseFlags(os.environ[K])
-+    # These headers are supposed static. Don't check at each build.
-+    for i in dict['CPPPATH']:
-+      dict['CCFLAGS'].append('-I' + i)
-+    dict['CPPPATH'] = []
-+    ipager_env.MergeFlags(dict)
-+
- ipager_env.Append(
-         CPPFLAGS = [ '-Wall' ],
-         CPPPATH = [ '/usr/X11R6/include' ],
diff --git a/x11-misc/ipager/files/ipager-1.1.0-scons_imlib2.patch b/x11-misc/ipager/files/ipager-1.1.0-scons_imlib2.patch
deleted file mode 100644
index 283dec348ab1..000000000000
--- a/x11-misc/ipager/files/ipager-1.1.0-scons_imlib2.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- ipager-1.1.0/SConstruct	2005-11-06 06:23:24.000000000 -0500
-+++ ipager-1.1.0-gentoo/SConstruct	2008-09-08 15:18:07.000000000 -0400
-@@ -115,12 +115,14 @@
-     else:
-         print "yes"
-         ipager_env.AppendUnique(
--            CPPPATH = imlib2_env.Dictionary()['CPPPATH'], 
-             CCFLAGS = imlib2_env.Dictionary()['CCFLAGS'], 
-             LIBPATH = imlib2_env.Dictionary()['LIBPATH'],
-             LIBS    = imlib2_env.Dictionary()['LIBS']
--
-         )
-+        if imlib2_env.Dictionary().has_key('CPPPATH'): 
-+            ipager_env.AppendUnique(
-+                CPPPATH = imlib2_env.Dictionary()['CPPPATH'], 
-+            )
- 
- conf.Finish()
- 
diff --git a/x11-misc/ipager/ipager-1.1.0-r1.ebuild b/x11-misc/ipager/ipager-1.1.0-r1.ebuild
deleted file mode 100644
index 6727bc321a0c..000000000000
--- a/x11-misc/ipager/ipager-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A themable desktop pager for fluxbox and other window managers"
-HOMEPAGE="http://www.useperl.ru/ipager/index.en.html"
-SRC_URI="http://www.useperl.ru/ipager/src/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="xinerama"
-
-RDEPEND="media-libs/imlib2[X]
-	x11-libs/libXmu
-	xinerama? ( x11-libs/libXinerama )"
-DEPEND="${RDEPEND}
-	dev-util/scons"
-
-PATCHES=( "${FILESDIR}/${P}-scons_imlib2.patch"
-	  "${FILESDIR}/${P}-scons_flags.patch"
-	  "${FILESDIR}/${P}-gcc43.patch"
-	  "${FILESDIR}/${P}-gcc47.patch" )
-
-src_compile() {
-	CONFIG_OPTS="xinerama=false"
-	use xinerama && CONFIG_OPTS="${CONFIG_OPTS} xinerama=true"
-	# FYI: Passing debug=true only adds -ggdb inside the SConstruct
-
-	scons \
-		--cache-disable \
-		PREFIX="/usr" \
-		${CONFIG_OPTS} \
-		|| die "scons configure failed"
-}
-
-src_install() {
-	scons \
-		--cache-disable \
-		PREFIX="/usr" \
-		DESTDIR="${D}" \
-		install \
-		|| die "scons install failed"
-	dodoc ToDo ChangeLog README
-	dodoc themes/*.conf
-}
diff --git a/x11-misc/ipager/metadata.xml b/x11-misc/ipager/metadata.xml
deleted file mode 100644
index 7a38bb900964..000000000000
--- a/x11-misc/ipager/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/x11-misc/j4-dmenu-desktop/Manifest b/x11-misc/j4-dmenu-desktop/Manifest
index 03ad56bbf510..23d71f2403a5 100644
--- a/x11-misc/j4-dmenu-desktop/Manifest
+++ b/x11-misc/j4-dmenu-desktop/Manifest
@@ -1,3 +1,3 @@
-DIST j4-dmenu-desktop-2.17.tar.gz 33531 BLAKE2B c1dd82a444efdbbf2af644ee6cdba6746a81228c5f6b2d212d5ea248628855f1cd1c4dff091ae278eb8c6458db4934b60acd8e2dd9a9c88b32537e76878824b3 SHA512 7a41bb60a6b3afa7bf6229f08674d5f31e0152d0788a17edc210986d1b1f0d4fad13ffaa13c58ed7a0c5d2e67f8f95bb2a0f6556aeb0f2cc24c7d885b346325e
-EBUILD j4-dmenu-desktop-2.17-r1.ebuild 1186 BLAKE2B 8644a900bfb548b0988b171b12e3ba8c59c0261f8ce317a77c6ef77465bdc6a6598f723ba10b1fd15e5a0d8ec8e7f850f36971b519c32069dfb4e71c5f01aa4c SHA512 b71396ce7df1bc5f8926599ea6927fbc70f0ef2ee605512c6679de34bbfc07d8cb5bd04fddbd7ba9b4329c497d4465490d4d2c43ea87fce7ede7bcc75d3fd71d
+DIST j4-dmenu-desktop-2.18.tar.gz 34785 BLAKE2B 26d5861d6d7ddcd9653a464d1175d19532001705de193811087fd42fddbdead89b8d49bd14f8e323288d6a7ba37bd4e11f4c7c52dd9b0a454f95a83a14853bcb SHA512 f8b0c825d567d60da0fb418e6f0b24a6d9daa9fb142b194b0a8b249303f4e09b6694fce72bf031007ac67253e488fc7666d4ba7beb032bc74cc2a32aca0f6c96
+EBUILD j4-dmenu-desktop-2.18.ebuild 1186 BLAKE2B 8644a900bfb548b0988b171b12e3ba8c59c0261f8ce317a77c6ef77465bdc6a6598f723ba10b1fd15e5a0d8ec8e7f850f36971b519c32069dfb4e71c5f01aa4c SHA512 b71396ce7df1bc5f8926599ea6927fbc70f0ef2ee605512c6679de34bbfc07d8cb5bd04fddbd7ba9b4329c497d4465490d4d2c43ea87fce7ede7bcc75d3fd71d
 MISC metadata.xml 719 BLAKE2B 4eb56ae83ae7b2360e3bbe83ef36e06fb20552246d762a6345a68a4bc8f75583c3c891f258e839da9c3654a762d82695e87e2558287bdcb18b32b39c81c11676 SHA512 a50da4bde79c78ccbb92fd7823056fd6b6d8f006c12a58f88b3bf7a2d655ca3005e633986c622eb4e770168366a5c35d7768c7279a46b2707b74bfd92c46d6ca
diff --git a/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.17-r1.ebuild b/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.18.ebuild
index 8a8d8c7525b9..8a8d8c7525b9 100644
--- a/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.17-r1.ebuild
+++ b/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.18.ebuild
diff --git a/x11-misc/kronometer/Manifest b/x11-misc/kronometer/Manifest
index 9acd47d71215..43fabac543dd 100644
--- a/x11-misc/kronometer/Manifest
+++ b/x11-misc/kronometer/Manifest
@@ -1,3 +1,3 @@
 DIST kronometer-2.2.3.tar.xz 124208 BLAKE2B f9d91bf19ba64e2c337b8181e2529b409a450c1e821c6b1358a1d57627959c65b5c4db0acd15a4c8f4cd3fb12197ce6a1bf3b95d4dc4922409223b528f5f62aa SHA512 77f948ae3a03b15a0cd49bc1048897bff0788a4831beff8f336270d8af6ee1a245d2174f5a3adc224257e9f319958197af7900ce8389b312f8fe7cd6c53a71d1
-EBUILD kronometer-2.2.3.ebuild 874 BLAKE2B 4e94f281f159d711a4265b23b5a9db01af692336797d15f23232cf08e3d62cc61a7c0c8400a2e4d6ce462564a545f9e7e64c8c00f2027cc88faf7a5836a8c60a SHA512 a7aac849975850ebb17cb057fc6f39a2719e6ea51450192de4062c80a6e55181e1c1134bdcdb754be860b27ba71dd4edcc647511c90757befe506ea6af754d77
+EBUILD kronometer-2.2.3.ebuild 851 BLAKE2B c87924e0e898b3c03495449f834e95abf7ee0a5822b47e7d5db9a414507c288e67bf9435e71b5fe9d4a7833f596342121d517e15483864b19be2eedc12bc0e38 SHA512 271f5b1ebdb412bceae183b5ab995bfa2d3ae2a408c8a1aab6ac7bb5eb13c1042ffd6ae987a51f88a1d7f5d48bc37daaef32a2257f4d02af7343fe404ab0137d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/x11-misc/kronometer/kronometer-2.2.3.ebuild b/x11-misc/kronometer/kronometer-2.2.3.ebuild
index f4e6e80c584b..efd9ec24975b 100644
--- a/x11-misc/kronometer/kronometer-2.2.3.ebuild
+++ b/x11-misc/kronometer/kronometer-2.2.3.ebuild
@@ -11,7 +11,7 @@ VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="Stopwatch application"
-HOMEPAGE="https://kde.org/applications/utilities/org.kde.kronometer https://userbase.kde.org/Kronometer"
+HOMEPAGE="https://apps.kde.org/en/kronometer https://userbase.kde.org/Kronometer"
 SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
 
 LICENSE="GPL-2+"
diff --git a/x11-misc/light-locker/Manifest b/x11-misc/light-locker/Manifest
index 6c309524865c..23b422eba797 100644
--- a/x11-misc/light-locker/Manifest
+++ b/x11-misc/light-locker/Manifest
@@ -1,7 +1,4 @@
-AUX light-locker-1.8.0-elogind.patch 9190 BLAKE2B c60e166a853aaee5de2ffcbb708dd0f1b25b9fc5e2ec9a862bce2c0cd8b90928b0ceb4dae2a46e9ce3f41f9665911abaebccd9a73a9cb09c9c113788de60845e SHA512 a837a458d4d221ad4a009d2461c927168f64a3f50ef5484c0aca26913477d35cd0799605d66b8b4876b7530c7c604720fe95783576c658bd6e84b5867df1ef8e
 AUX light-locker-1.9.0-elogind.patch 9704 BLAKE2B ead5c1767ac6772477e977bc57bb63392080be397a094dabbf4f4ac779b274f27f045447609c7ce39c6a1602dd2d046d84eff21688e1e4c98c29376e579b7830 SHA512 580a32670e63979691cd1a2102f49e4af23677f4bff1c597c6a87196235844fd1ba3c8d30e148f83b99466a77908f3204e35b57bb01c25fef949e0e3e37cf2f2
-DIST light-locker-1.8.0.tar.bz2 449898 BLAKE2B d5ff454958138ec535b94492a9646dd5a4fc8196095ef3ae933d661e44eb62960ca49fe070fd88a794e2a9c5a6586317845b0d55d8cfd65107e49e31206a727a SHA512 bbad73c0b82a50ddca240d5e1bd325a99d0c60364d136fe6d9d52f196319953373c9d03cf38ebd75d4498d080e96702e09fc97c35b4b69cbe963f065719549d5
 DIST light-locker-1.9.0.tar.gz 124753 BLAKE2B 510447a5fa107988a06e92cc99d7750bc0df526356630694c5dc718460bd437879bbdcb69e0778bdb58d399aafdbea762bfda53d2e2205a1c4bade27dbff78c5 SHA512 c6f84b38affa20cf0bd7d2341f5a8eff36891ed55401955715a68a011c84c7f2300db670abb95a320eb40aee90885fe044ddf0a721e418ee4724af3e4f6a61a4
-EBUILD light-locker-1.8.0-r1.ebuild 1649 BLAKE2B 8a4ac5b83be8db7aad5e13958bdb033221e0880c71cc34993f46d4366df28526fd131fd5f085f16cd693eee02f95f1b0cf55057b799b29fba148306dfad1276f SHA512 96ef726d3183e667ebeba2409c30880616844cb73dd665638492d1fedd30b7d838209c75234f8eac19a1094e8d89f484ec14793dd999265ec6a460939389e3ea
 EBUILD light-locker-1.9.0-r2.ebuild 1597 BLAKE2B 7c8cdc55983f831aad418aabdb16f7e71027cc23774aa0258a8a73f3bd88ffbe1d6c5ebc4e9227c1ea1647d1ba0e09a818c18497dcd5fdd1b66f79e11f213a49 SHA512 ba3045591150ea5d78cb9b65a26a852a63167795d6f1efa4ba943a18b9bd71fe2002ccfc2e8a9a0d88b22d20bba2c95dfdfff753addd876fcabfa13796e47104
-MISC metadata.xml 698 BLAKE2B a8f5e435f66bea6fab128e600e4bfce575c819c2de03c141e9d5ba72880dc58017fce9e4355d700c01d441c4eec56d19f0f2ec8d27027700decedc685a8a2d38 SHA512 583d1108a9be5b71a9e3867b60b20dba60a1c999fe7a27634456b9102af8193dc22e6b7a5410c520f5aa13482a290d4e6cf6bdcde070788fd7ce8d2b74ece144
+MISC metadata.xml 521 BLAKE2B 9b974736314ee4ff02a8f58b7d3709a540998bcc087ff622f551e64a2588ea522b7c3429f15b6b4fdaad503d9791e9f2f3325cf10201c6b6f141fdb3e3af81d5 SHA512 a2c6dc9548b2da2a12c037867b2af9488ffecb31439556729d60372eaabfd60bdc4e2389d733f02e480b6c63a42905411d387ee2cb6866427928dc4886dfed4b
diff --git a/x11-misc/light-locker/files/light-locker-1.8.0-elogind.patch b/x11-misc/light-locker/files/light-locker-1.8.0-elogind.patch
deleted file mode 100644
index 511e730f434e..000000000000
--- a/x11-misc/light-locker/files/light-locker-1.8.0-elogind.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-diff --git a/README b/README
-index 330ec82..d16cc6b 100644
---- a/README
-+++ b/README
-@@ -34,6 +34,7 @@ Most of these configurations will be enabled automatically when their dependenci
- Here is a list of the different dependencies and there configuration flags:
-   --with-gtk2: This decides between the Gtk+-3.0 and Gtk+-2.0 dependency.
-   --with-systemd: This adds the support for systemd logind. This option requires the development files to be installed.
-+  --with-elogind: This adds support for elogind, a standalone version of systemd's logind daemon. Requires the elogind development files be installed. This option cannot be enabled at the same time as the --with-systemd option above.
-   --with-console-kit: This adds the support for ConsoleKit.
-   --with-upower: This adds the support for UPower.
-   --with-mit-ext: This enables the lock-after-screensaver feature. This options requires the X11 Screen Saver extension development files to be installed.
-diff --git a/configure.ac.in b/configure.ac.in
-index 929befd..8639583 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -447,6 +447,42 @@ fi
- AC_SUBST(SYSTEMD_CFLAGS)
- AC_SUBST(SYSTEMD_LIBS)
- 
-+dnl ---------------------------------------------------------------------------
-+dnl elogind
-+dnl ---------------------------------------------------------------------------
-+
-+AC_ARG_WITH(elogind,
-+            AS_HELP_STRING([--with-elogind],
-+                           [Add elogind support]),
-+            [with_elogind=$withval], [with_elogind=auto])
-+
-+if test "x$with_systemd" = "xyes" && test "x$with_elogind" = "xyes"; then
-+    AC_MSG_ERROR([Conflicting options: --with-systemd and --with-elogind])
-+fi
-+
-+PKG_CHECK_MODULES(ELOGIND,
-+                  [libelogind],
-+                  [have_elogind=yes], [have_elogind=no])
-+
-+if test "x$with_elogind" = "xauto" ; then
-+        if test x$have_elogind = xno ; then
-+                use_elogind=no
-+        else
-+                use_elogind=yes
-+        fi
-+else
-+	use_elogind=$with_elogind
-+fi
-+
-+if test "x$use_elogind" = "xyes"; then
-+        if test "x$have_elogind" = "xno"; then
-+                AC_MSG_ERROR([Elogind support explicitly required, but elogind not found])
-+        fi
-+        AC_DEFINE(WITH_ELOGIND, 1, [elogind support])
-+fi
-+AC_SUBST(ELOGIND_CFLAGS)
-+AC_SUBST(ELOGIND_LIBS)
-+
- dnl ---------------------------------------------------------------------------
- dnl UPower
- dnl ---------------------------------------------------------------------------
-@@ -668,6 +704,7 @@ echo "
-         systemd:                  ${use_systemd}
-         ConsoleKit:               ${use_console_kit}
-         UPower:                   ${use_upower}
-+        elogind:                  ${use_elogind}
- 
-                     Features:
-                     ---------
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 0fa4ef9..7c6a46f 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -90,7 +90,8 @@ light_locker_SOURCES =	\
- light_locker_LDADD =		\
- 	$(LIGHT_LOCKER_LIBS)	\
- 	$(SAVER_LIBS)			\
--	$(SYSTEMD_LIBS)                 \
-+	$(SYSTEMD_LIBS)		\
-+	$(ELOGIND_LIBS)		\
- 	$(NULL)
- 
- light_locker_LDFLAGS = -export-dynamic
-diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c
-index cab6a9e..8928cbf 100644
---- a/src/gs-listener-dbus.c
-+++ b/src/gs-listener-dbus.c
-@@ -47,6 +47,10 @@
- #include <systemd/sd-login.h>
- #endif
- 
-+#ifdef WITH_ELOGIND
-+#include <elogind/systemd/sd-login.h>
-+#endif
-+
- #include "gs-listener-dbus.h"
- #include "gs-marshal.h"
- #include "gs-debug.h"
-@@ -82,7 +86,7 @@ struct GSListenerPrivate
-         char           *session_id;
-         char           *seat_path;
- 
--#ifdef WITH_SYSTEMD
-+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
-         gboolean        have_systemd;
-         char           *sd_session_id;
-         int             delay_fd;
-@@ -138,7 +142,7 @@ gs_listener_send_switch_greeter (GSListener *listener)
- 
-         gs_debug ("Send switch greeter");
- 
--#ifdef WITH_SYSTEMD
-+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
-         /* Compare with 0. On failure this will return < 0.
-          * In the later case we probably aren't using systemd.
-          */
-@@ -179,7 +183,7 @@ gs_listener_send_lock_session (GSListener *listener)
- 
-         gs_debug ("Send lock session");
- 
--#ifdef WITH_SYSTEMD
-+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
-         /* Compare with 0. On failure this will return < 0.
-          * In the later case we probably aren't using systemd.
-          */
-@@ -363,7 +367,7 @@ gs_listener_set_idle_hint (GSListener *listener, gboolean idle)
- 
-         gs_debug ("Send idle hint: %d", idle);
- 
--#ifdef WITH_SYSTEMD
-+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
-         if (listener->priv->have_systemd) {
- 
-                 if (listener->priv->system_connection == NULL) {
-@@ -436,7 +440,7 @@ gs_listener_set_idle_hint (GSListener *listener, gboolean idle)
- void
- gs_listener_delay_suspend (GSListener *listener)
- {
--#ifdef WITH_SYSTEMD
-+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
-         DBusMessage    *message;
-         DBusMessage    *reply;
-         DBusError       error;
-@@ -509,7 +513,7 @@ gs_listener_delay_suspend (GSListener *listener)
- void
- gs_listener_resume_suspend (GSListener *listener)
- {
--#ifdef WITH_SYSTEMD
-+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
-         gs_debug ("Resume suspend: fd=%d", listener->priv->delay_fd);
- 
-         if (listener->priv->delay_fd >= 0) {
-@@ -1112,7 +1116,7 @@ _listener_message_path_is_our_session (GSListener  *listener,
-         return FALSE;
- }
- 
--#ifdef WITH_SYSTEMD
-+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
- static gboolean
- query_session_active (GSListener *listener)
- {
-@@ -1248,7 +1252,7 @@ query_lid_closed (GSListener *listener)
- #endif
- #endif
- 
--#if defined(WITH_SYSTEMD) || (defined(WITH_UPOWER) && defined(WITH_LOCK_ON_LID))
-+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND) || (defined(WITH_UPOWER) && defined(WITH_LOCK_ON_LID))
- static gboolean
- properties_changed_match (DBusMessage *message,
-                           const char  *property)
-@@ -1343,7 +1347,7 @@ listener_dbus_handle_system_message (DBusConnection *connection,
-                   dbus_message_get_destination (message));
- #endif
- 
--#ifdef WITH_SYSTEMD
-+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
- 
-         if (listener->priv->have_systemd) {
- 
-@@ -1963,7 +1967,7 @@ gs_listener_acquire (GSListener *listener,
-                                             listener_dbus_system_filter_function,
-                                             listener,
-                                             NULL);
--#ifdef WITH_SYSTEMD
-+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
-                 if (listener->priv->have_systemd) {
-                         dbus_bus_add_match (listener->priv->system_connection,
-                                             "type='signal'"
-@@ -2075,7 +2079,7 @@ query_session_id (GSListener *listener)
- 
-         dbus_error_init (&error);
- 
--#ifdef WITH_SYSTEMD
-+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
-         if (listener->priv->have_systemd) {
-                 dbus_uint32_t pid = getpid();
- 
-@@ -2164,7 +2168,7 @@ query_session_id (GSListener *listener)
- #endif
- }
- 
--#ifdef WITH_SYSTEMD
-+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
- static char *
- query_sd_session_id (GSListener *listener)
- {
-@@ -2192,7 +2196,7 @@ init_session_id (GSListener *listener)
-         listener->priv->session_id = query_session_id (listener);
-         gs_debug ("Got session-id: %s", listener->priv->session_id);
- 
--#ifdef WITH_SYSTEMD
-+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
-         g_free (listener->priv->sd_session_id);
-         listener->priv->sd_session_id = query_sd_session_id (listener);
-         gs_debug ("Got sd-session-id: %s", listener->priv->sd_session_id);
-@@ -2284,7 +2288,7 @@ gs_listener_init (GSListener *listener)
- {
-         listener->priv = GS_LISTENER_GET_PRIVATE (listener);
- 
--#ifdef WITH_SYSTEMD
-+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
-         /* check if logind is running */
-         listener->priv->have_systemd = (access("/run/systemd/seats/", F_OK) >= 0);
-         listener->priv->delay_fd = -1;
-@@ -2313,7 +2317,7 @@ gs_listener_finalize (GObject *object)
-         g_free (listener->priv->session_id);
-         g_free (listener->priv->seat_path);
- 
--#ifdef WITH_SYSTEMD
-+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
-         g_free (listener->priv->sd_session_id);
- #endif
- 
-diff --git a/src/light-locker.c b/src/light-locker.c
-index 264b033..79de29a 100644
---- a/src/light-locker.c
-+++ b/src/light-locker.c
-@@ -144,7 +144,8 @@ main (int    argc,
-                   "gtk:        %d\n"
-                   "systemd:    %s\n"
-                   "ConsoleKit: %s\n"
--                  "UPower:     %s",
-+                  "UPower:     %s\n"
-+                  "elogind:    %s",
-                   GTK_MAJOR_VERSION,
- #ifdef WITH_SYSTEMD
-                   "yes",
-@@ -160,6 +161,11 @@ main (int    argc,
-                   "yes"
- #else
-                   "no"
-+#endif
-+#ifdef WITH_ELOGIND
-+                  "yes"
-+#else
-+                  "no"
- #endif
-                   );
-         gs_debug ("Features:\n"
diff --git a/x11-misc/light-locker/light-locker-1.8.0-r1.ebuild b/x11-misc/light-locker/light-locker-1.8.0-r1.ebuild
deleted file mode 100644
index 3421ccb6d2df..000000000000
--- a/x11-misc/light-locker/light-locker-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools gnome2-utils
-
-DESCRIPTION="A simple locker using lightdm"
-HOMEPAGE="https://github.com/the-cavalry/light-locker"
-SRC_URI="https://github.com/the-cavalry/light-locker/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="consolekit +dpms elogind gtk3 +screensaver systemd +upower"
-
-BDEPEND="dev-lang/perl
-	dev-perl/XML-Parser
-	dev-util/intltool
-	sys-devel/gettext"
-DEPEND="dev-libs/dbus-glib
-	dev-libs/glib
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/libX11
-	x11-libs/pango
-	x11-libs/libXxf86vm
-	consolekit? ( sys-auth/consolekit )
-	dpms? ( x11-libs/libXext )
-	elogind? ( sys-auth/elogind )
-	!gtk3? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	screensaver? ( x11-libs/libXScrnSaver )
-	systemd? ( sys-apps/systemd )
-	upower? ( sys-power/upower )"
-RDEPEND="${DEPEND}
-	x11-misc/lightdm"
-
-REQUIRED_USE="?? ( consolekit elogind systemd )"
-
-DOCS=( AUTHORS HACKING NEWS README )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-${PV}-elogind.patch"
-)
-
-src_prepare() {
-	default
-	# remove xdt-autogen specific macro (just like upstream do) as we need to autoreconf
-	sed -si -e "/XDT_I18N/d" configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with consolekit console-kit)
-		$(use_with dpms dpms-ext)
-		$(use_with !gtk3 gtk2)
-		$(use_with screensaver x)
-		$(use_with screensaver mit-ext)
-		$(use_with systemd)
-		$(use_with elogind)
-		$(use_with upower)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/x11-misc/light-locker/metadata.xml b/x11-misc/light-locker/metadata.xml
index 3b85524b066f..610b2ccac31d 100644
--- a/x11-misc/light-locker/metadata.xml
+++ b/x11-misc/light-locker/metadata.xml
@@ -6,9 +6,7 @@
     <name>Denis Dupeyron</name>
   </maintainer>
   <use>
-    <flag name="consolekit">Keep track of the various users, sessions, and seats present on the system.</flag>
     <flag name="dpms">Turn on the display on screensaver deactivation.</flag>
-    <flag name="gtk3">Build with GTK+ 3 instead of GTK+ 2.</flag>
     <flag name="screensaver">Lock the screen on screensaver activation.</flag>
   </use>
   <upstream>
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index a27e7f1b1e0f..d725b9799b6b 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -1,8 +1,8 @@
 AUX README.gentoo 494 BLAKE2B 8a92171cbc9e8a93cc5e73101bf478b27945e85f843ef244daea881f0aa061820645c425e52dd6a75adc0bd09c95126a059694bc7d5f6084e4f0222fc5e8ab85 SHA512 07e35ef0ac603b2b817c33fd2bc06b9b254a2e3fee16e7ec8fc0c86d27330c795b8d1eae660c42c414de4d721faea2cab1d41c5950ca7a1032d758626011ae3c
 AUX Xsession 1921 BLAKE2B 9127e95c28d2a22f6a1d5f2997edf5997315667d20522c7a8b839fe492d576e0e69cf280ce2fea1fb8d4df61e3b254a38782dbd3c78fdc4ef79924b224311306 SHA512 efa046db5445464e7deb3c5aa43b1a2e1abb7ec0537d4040567d4d9932f15b954866cdd9c3a2bd703de9d7818d4fccff76008426061bc97dc342f7805cb645c1
-AUX lightdm-autologin 155 BLAKE2B 0236489d922c07cc84e17b403e746af052b9fcec1671c4b41184a26399ff8b310083c17959327eb752f8ff9ada04a7ff012ed6708c7ff50324dd0a3cef42efd8 SHA512 d09be0a61b7eea18a5c5977182362226e82a39b238c401f636bdf0a83381b97a16efc19e67be10b76854c95186dd65f539431d2352ce87a4e35dd1d40e388064
+AUX lightdm-autologin 157 BLAKE2B 54ce42f09f88c793e90f5f21743e17a0184227b83c11192e766d6f3c1020fe0dc4227da0eb8e404c8d67d6a5bcfe9b55075820fb911f1611347e99cd5c99493f SHA512 35bfeee42d2e4e34a42f5cd645c2b7aac801d8a8396b42ec7725179827ec8a52b3db106dcddaa100c3d5d6d19a2df5e462f121a18c848bd898dcce3e43fa791f
 AUX lightdm.service 279 BLAKE2B 92a9602d1d1c10fedfabd58b0794a68a278939d905f4d790ea9c2a0632abe8238a6187b3e01b4296a1187349864b30291853889ceaa519f5a12a98b2aecbb1ea SHA512 5b60788e35ebd7918b21ab52dc3f5cc29dd3aa45ddf6cfe75a72d1c541620f0438378a9bd681e2c151a465cf981e803b399f61b48ff5d0f2e1a3cc950c30d23a
 DIST introspection-20110205.m4.tar.bz2 1220 BLAKE2B 01483c1a7b73568e01cc4d84b43c4cd946aaaac0b5fa13aa27805fa17297112bfaabb1c5a34bd83d2ecdef2033b622dbd5e63914baacb8f6edf488a7396d26d9 SHA512 5c49239935b93d86cce68b577b43d1a56d8749ab5747029bfcfa67339697134be24ef29ba6c3d133b8c03e867864637c8eb61491a4b7f6bb1e56386ed66cb9be
 DIST lightdm-1.30.0.tar.xz 509220 BLAKE2B 5b6fcc6b955d7a7eb3a810a7e28707a812810d7f2568d6985a4411b1bf6f06b35ff721bd8a9388a85a4e4a64a39f5e30e86a9dbaa6d344e898ae49e9f39785ff SHA512 bca25a0aa73caf7d51e5882889a1707d2527470a170658c1be98ecfb96c8f85fd616494fc5bed658e744f91b9f8b0a98d2a0cf42f9c030242ae470c8a27145ce
-EBUILD lightdm-1.30.0-r1.ebuild 4267 BLAKE2B a68f01ea8c9dc1725c859a7ba74627f57230c22669d4a090ac8704b28fdd56233d71a031ca0e7dd2e65ae5bdc9994b88fcc5707b2afd134f956b7d93782d0942 SHA512 782a2ab3242a1fbb202989f380cc6a625be99aea157f150a649ae41599dc00be941d70be1e0af32314db48445e00d783c6d3b54c4cc486286bc3ae837cf3a4ff
+EBUILD lightdm-1.30.0-r2.ebuild 4267 BLAKE2B a68f01ea8c9dc1725c859a7ba74627f57230c22669d4a090ac8704b28fdd56233d71a031ca0e7dd2e65ae5bdc9994b88fcc5707b2afd134f956b7d93782d0942 SHA512 782a2ab3242a1fbb202989f380cc6a625be99aea157f150a649ae41599dc00be941d70be1e0af32314db48445e00d783c6d3b54c4cc486286bc3ae837cf3a4ff
 MISC metadata.xml 462 BLAKE2B 8360d85d185558b5d6c3b2d18d5210c532537d1cc93007b0f0b91d37b388d02c966dda14c298ff8c3b47bd39696b332f989fffa6e1a68001116ddd69141b21d6 SHA512 d76a144235e233e46103c3f10ee64d3b5306b82220366e006671851dc725027ddbf600ca8fab8370c7fca3b09182cd7c85b458d79e7ddca681f279909f4737ba
diff --git a/x11-misc/lightdm/files/lightdm-autologin b/x11-misc/lightdm/files/lightdm-autologin
index decfba3438b7..9063a82f2819 100644
--- a/x11-misc/lightdm/files/lightdm-autologin
+++ b/x11-misc/lightdm/files/lightdm-autologin
@@ -2,5 +2,5 @@ auth	optional	pam_env.so
 auth	required	pam_nologin.so
 auth	required	pam_permit.so
 
-account	include		system-local-login
-session	include		system-local-login
+account	substack		system-local-login
+session	substack		system-local-login
diff --git a/x11-misc/lightdm/lightdm-1.30.0-r1.ebuild b/x11-misc/lightdm/lightdm-1.30.0-r2.ebuild
index ea3868227341..ea3868227341 100644
--- a/x11-misc/lightdm/lightdm-1.30.0-r1.ebuild
+++ b/x11-misc/lightdm/lightdm-1.30.0-r2.ebuild
diff --git a/x11-misc/lineakd/Manifest b/x11-misc/lineakd/Manifest
index 6666dd0616eb..5bdef44bbe3f 100644
--- a/x11-misc/lineakd/Manifest
+++ b/x11-misc/lineakd/Manifest
@@ -1,6 +1,6 @@
 AUX lineakd-0.9.0-DELL-XPS-M1330-XOrg-1_5.patch 795 BLAKE2B ebf8e451208c38cd77ba39c3241ef3f9957946c6e1b7c91e29a1cfb346721a2b59d8e2b87e58dd52bde6fe4c6d3fbc70d8c5b02d62bb96f6d82c64f11aac3e5b SHA512 d38a7bc6ddb05eda357ffd487a494302cb08746389e65a7f7b30aaa3ebbbf5206f60cb59b07a6cea285976604b91328a002e893ef0833dfc67e9639b260da0ee
 AUX lineakd-0.9.0-gcc43.patch 772 BLAKE2B 48346e5d1a3978be0964dd6844991c58da30a036fdb12bec9b1970c3aac9d130f81891e69ed59ef772ca4b6dbfbd71effdc2556b800f6008505322c8aaa67c91 SHA512 0ade361637b26db613c5a3915d8b364cf14eda14eb744618c03440ead5f0774f853dba7c0518432ae4f872e201d5bb0503fa7e4b5eadd71d049adf5b654c8407
 DIST lineakd-0.9.tar.gz 991376 BLAKE2B 70c19d446b814562a4d9efa90b4492cc5a3fa63c8d252e6e2bcd418c1fee177924e61ec7ebfb0471fdd18eee5f7f3e4ed0fda17bff5b216cad9caffd06d68783 SHA512 e30a2e111832e3f08bbff858647536aaeb75d20008618b8c7555836104fd5a66d8e3173d0f9da76906caf13e9c9753c9140cd22dbb96fde464ed5d5f254d721e
-EBUILD lineakd-0.9.0-r2.ebuild 1061 BLAKE2B 7878561039d25afbbcb7bd4b348d7cecdd2ce83c5f5bc8a455e67a83934eccd5b234cd00ebcdb6d426c6df3a455c3088f5e2c1562774388e4630aa6554314a03 SHA512 96bd55517b44cb3017d2fee36c125a31bbdbdafc74f06e3c3ea109a6d5bb64ceb418f4cb89cf95372068c73cace695f1ebecfcdbdec7a38d81081409ade8d52a
-EBUILD lineakd-0.9.0-r3.ebuild 1140 BLAKE2B a01c354739a0391425b854ecb653dfb1033b0bb5faf66433e5bf373f36200e62e1b1cbd69584194e8c548e00b63c55c5559be9b20ae1492d3a417ee8868d3fe5 SHA512 5c370ad18e0a90126601e7e7bce6e9deec5c4e9fff440d95cd544f6ff53c7a11c22ce458f3c0076b0cb316c8381b650df3ff1a040ddd31c812aaa5723c65bf64
+EBUILD lineakd-0.9.0-r2.ebuild 1096 BLAKE2B 8a2fbcc812dae42e9a18caae1c57e9a0cc110cc0ca9e9244957085ac253764ace94209866b2834047f84e87ab1d2289973c4ec60b04a423feff5534eefdfcdf4 SHA512 1722f51bdd359a2530cf1e56617d6dda18cfef031b27d2abc3f8275c60350c388d802950460c2912cd9fde950957441cfd277deec130f9c5d9eb89f5f4e54957
+EBUILD lineakd-0.9.0-r3.ebuild 1169 BLAKE2B b9669bb05b0c0ae2cb7482073534f1485ca82169c6b011baf6df753f79345bf778222438a225ddbe3cd62cfadf3240cdd1546e29cf8f0fffb736d24032a1dacd SHA512 52a553c417d849f976f516d57466efaf805c6683caa199fdbd4d9ba6c48e75a4244334bfcaf9974dddd3fc02eab17222e2819eedb96daa7b1f24ff1dbb0d3e70
 MISC metadata.xml 352 BLAKE2B 4110d9b5e116df93d0d52f464d392dc4b55d95615b20db7c92e8792ff684e60c84ed9c9703272eb7ce70688de54ce1943c99d90b2f6d81ed8342898fbe710346 SHA512 1abdaf434e7034702a0dfceff233083abc0bdaea90e215687ace13b6d005502da7193794cdc7beda708e741c5562313b93fd41677fa07d4f68bf8ef7cfa81939
diff --git a/x11-misc/lineakd/lineakd-0.9.0-r2.ebuild b/x11-misc/lineakd/lineakd-0.9.0-r2.ebuild
index a87eac2fc117..b1d571e4369a 100644
--- a/x11-misc/lineakd/lineakd-0.9.0-r2.ebuild
+++ b/x11-misc/lineakd/lineakd-0.9.0-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils ltprune multilib
+inherit multilib
 
 MY_P=${P/.0/}
 
@@ -36,7 +36,10 @@ PATCHES=(
 )
 
 src_configure() {
-	econf $(use_enable debug) --with-x
+	econf \
+		$(use_enable debug) \
+		--with-x \
+		--disable-static
 }
 
 src_install() {
@@ -46,12 +49,12 @@ src_install() {
 
 	emake -j1 DESTDIR="${D}" install
 
-	prune_libtool_files
-
 	dodoc AUTHORS README TODO
 
 	keepdir /usr/$(get_libdir)/lineakd/plugins
 
 	insinto /etc/lineak
 	doins lineakd.conf.example lineakd.conf.kde.example
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/x11-misc/lineakd/lineakd-0.9.0-r3.ebuild b/x11-misc/lineakd/lineakd-0.9.0-r3.ebuild
index 4848da2c45c0..21a90c825f75 100644
--- a/x11-misc/lineakd/lineakd-0.9.0-r3.ebuild
+++ b/x11-misc/lineakd/lineakd-0.9.0-r3.ebuild
@@ -36,7 +36,10 @@ PATCHES=(
 )
 
 src_configure() {
-	econf $(use_enable debug) --with-x
+	econf \
+		$(use_enable debug) \
+		--with-x \
+		--disable-static
 }
 
 src_install() {
diff --git a/x11-misc/lsw/Manifest b/x11-misc/lsw/Manifest
index 47b47da7881d..f52a8de5ab69 100644
--- a/x11-misc/lsw/Manifest
+++ b/x11-misc/lsw/Manifest
@@ -1,3 +1,3 @@
 DIST lsw-0.3.tar.gz 2723 BLAKE2B f906efdbd8d2dd3781207b2112f0358d4d64a0134548364b7b65e06cf0e140337f70f3f06fdbf3a11545f34c6ce8094866635e52ccd088507f3a89c61494fb90 SHA512 54f5aeb6d17fe23a2e65fbbf4a7622c194e776261a6f0c04ece54fbf212588ec749d5bf5939a6084997f36468339f5373169234c671211a2b7712c408cf883d8
 EBUILD lsw-0.3.ebuild 673 BLAKE2B 2ea068db44a7eb1be6c2e94777260cfcf5bd19e58c9dd02a430807b2b72c0bea06f6e981df21373ae430308d8caf0ca9478c0b8cc509788d9cdf417198deea0e SHA512 18805f44432a2d02c76d40514504b36ca468fceeb095f338cabe5fd2bc25fcc7049369741e380b88e4b266108d52dbcf955416463cc5ac47c94fc8c1f5919e5c
-MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
+MISC metadata.xml 251 BLAKE2B e9e9d48943645d8b737bc1f7ab0efb05db0f8eddad759c9bb40d07dc008fbfb8f5cca2020de71a9ff6945f5d66292ac02355773545010cd49c77fe6dd5ab7b40 SHA512 1b6a6955118c1a74cc89a77d6de9be8f4ff9c7137c186753462670a5b93457dfd034ad5d1f4d2507ac95cc149c2a042fa5324220b58702a56b09d91de40151c9
diff --git a/x11-misc/lsw/metadata.xml b/x11-misc/lsw/metadata.xml
index bc1b97e1eb76..efcd58fe0b9b 100644
--- a/x11-misc/lsw/metadata.xml
+++ b/x11-misc/lsw/metadata.xml
@@ -1,8 +1,8 @@
 <?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>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/notification-daemon/Manifest b/x11-misc/notification-daemon/Manifest
index b3a74f7d14e7..ee4d8db51231 100644
--- a/x11-misc/notification-daemon/Manifest
+++ b/x11-misc/notification-daemon/Manifest
@@ -1,5 +1,6 @@
 AUX notification-daemon-0.5.0-libnotify-0.7.patch 948 BLAKE2B 9da54db70a628988b5f5b3e34dd71a7bbf8357a58be1e7c9de863d719619b6376ca311c4963e0974f77c08671f03efd28693d90f97a852ee68393e3b11b550fc SHA512 e828d89197c29c3b8e2b6b2e616d6fd63952f8b8ac23f4a0b7a8f6a75722e011d1684302b711ee530506e4e17aae6c7949f12f58a113ca6bb254a29d146d5870
 AUX notification-daemon-0.5.0-underlinking.patch 277 BLAKE2B ef30fae7ca0d8a26c18acc5f98e5a2bd4db53293f302fdba3bf3fbc362c435931d81482e174fbff5396ecee04768068e51c48a8e19be3f881803ae4af77e3637 SHA512 e370ed9435b474fddf0b884d6781bdbfb1cb68dd7f851e72f525d6153235d39f77d28257c6d720f3de63df8ac29a7bf9100669813f4edda177a9dbf21afa3e5e
 DIST notification-daemon-3.20.0.tar.xz 340752 BLAKE2B 9ded1efdb38de0097495ff570b9b91eb151e5eb030fcb9364a5ac04a4a5631c0a8483dc4068dd806d54ef0a096062ca92f9783f2030edb57f681b82015cf8584 SHA512 d9311c71a2915cb6e55bd1408e60b4d7b7fc24114410b8bd8cb358fe86c100198567099843b967f7e01ca03c91afe3f3980fb30b7f2c138bdab949e0e196a0f8
+EBUILD notification-daemon-3.20.0-r1.ebuild 860 BLAKE2B 25b340172da0360327ed04e014d22285075326745a92628ff0b9fefae555ddb5b4ea302e274b6c5d12effee0503d15a8a9b80ee67bf0558c340e4f24eac45c3b SHA512 0bec1c988b485c9a8f8e554512cb83000e7f903fa2cf7284d50c15f83d6e118fa28d28e76ab215c859ad8a6bb0522d02f2b6a47e03fa14c00896ab3f164a3444
 EBUILD notification-daemon-3.20.0.ebuild 933 BLAKE2B 6b6723c0fb6eb6d0bb651cf89391044caec710a62c646ce14c449dfadba8bac667260ab134ac3441e908fe66061db130e3a7a35f76cbb48ed56ad35258d7d58e SHA512 5ede8f81fb46b783f0d2f323d95724db34405bc5b9339afd36faea803453bd3b76c47c09b8c8525dd821637d1069572f645593c50d18c4e4b266166a7eac373a
 MISC metadata.xml 270 BLAKE2B 9c2dafa0390cfc7b94b5c44505d72021bf57cf8ffb35be7a3327f4316c3e4b2dbbfa0325d97243a8ea933440a5678cc5d35c639f5aa210b1d5ceb8ab65eb5d90 SHA512 92c366ec57074ced42e6f9960f97d1cd1a022dba7450b51f3617a6a5e00c755496dfa84aa4ac259f4b00c676366b1eaa3ec30eeb9bcb0bf41253d1910005db2f
diff --git a/x11-misc/notification-daemon/notification-daemon-3.20.0-r1.ebuild b/x11-misc/notification-daemon/notification-daemon-3.20.0-r1.ebuild
new file mode 100644
index 000000000000..136f1965fa15
--- /dev/null
+++ b/x11-misc/notification-daemon/notification-daemon-3.20.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org
+
+DESCRIPTION="Notification daemon"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/notification-daemon/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+
+RDEPEND="
+	>=dev-libs/glib-2.28:2
+	>=x11-libs/gtk+-3.19.5:3[X]
+	sys-apps/dbus
+	x11-libs/libX11
+	!x11-misc/notify-osd
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/gdbus-codegen
+	>=sys-devel/gettext-0.19.4
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS ChangeLog NEWS )
+
+src_install() {
+	default
+
+	insinto /usr/share/dbus-1/services
+	newins <<-EOF - org.freedesktop.Notifications.service
+	[D-BUS Service]
+	Name=org.freedesktop.Notifications
+	Exec=/usr/libexec/notification-daemon
+	EOF
+}
diff --git a/x11-misc/obconf-qt/Manifest b/x11-misc/obconf-qt/Manifest
index a3eff78398a8..d234c801d44d 100644
--- a/x11-misc/obconf-qt/Manifest
+++ b/x11-misc/obconf-qt/Manifest
@@ -1,3 +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
 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
new file mode 100644
index 000000000000..cec157f207b0
--- /dev/null
+++ b/x11-misc/obconf-qt/obconf-qt-0.16.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Qt GUI Openbox Configuration Tool"
+HOMEPAGE="https://lxqt.github.io/"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	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"
+fi
+
+LICENSE="GPL-2 GPL-2+"
+SLOT="0"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	>=dev-util/lxqt-build-tools-0.8.0
+	sys-apps/sed
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-libs/glib:2
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libX11
+	x11-wm/openbox:3
+"
+RDEPEND="${DEPEND}
+	!lxqt-base/lxqt-l10n
+"
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/x11-misc/obmenu-generator/Manifest b/x11-misc/obmenu-generator/Manifest
index 852ae8e471b1..b7849c12a412 100644
--- a/x11-misc/obmenu-generator/Manifest
+++ b/x11-misc/obmenu-generator/Manifest
@@ -1,3 +1,3 @@
 DIST obmenu-generator-0.88.tar.gz 20569 BLAKE2B 0b17a3d379f6a92e08dd1f2e6d943e4d30f669c11847ad1354f44c41e8d3714b174fe6194a4b952664e9cc8408080ba236871b83e9f2498f5d337bc6498e92ec SHA512 650915562792b20cb39175cf2e7d11141eba24e3345cb54e5400a18f324f6fdacc4008d57d091a3ee64a36ebcf4548d0c8328e6a2dbc62613c7001b97e10332a
-EBUILD obmenu-generator-0.88.ebuild 807 BLAKE2B 2dcd051b572e98e85e2912f95909e68c653f2856807ca6dd31c56bba494e21a65857c7e4f54637e5d2d199bc0f3c8c55846204999944d38dcd3b69c6c3dd3067 SHA512 b077f1281213801439ae787e8a3a83f9e6a0067bb615d6709cc1229e47f58c61b133b9e3f5ff8b62e9abcfcdc9a7cee56145e4ed79cb8cff6f5989787ad7dffc
+EBUILD obmenu-generator-0.88.ebuild 805 BLAKE2B f7ed00f5bfeb176b6e14663ae32016a72b9e4c08fca8cd689634021eebdca540cb803067c18943bed886b1c5bc52cf497a7a469addbe7b49fb37a5752215a26d SHA512 727b300980f85d4021c12295c8625573045b03b9c01f443a66aa146179a270ef02ae3c574316b6e2adb4530968fc142da6606f0aeaa795cd300d3d66e25e4d8c
 MISC metadata.xml 445 BLAKE2B 6f47ae8ef7c079b03a0e8769bcf6ea35b0743dfb8f94f7ee99eba54f0dd1e66ac12a1d9198ffa246601965d02a0260ef667c4b48bac243fa1c82afe0e094be1d SHA512 8cf342329f67576b238d72043cc6485628f78874ee2a0ec54c0cba8e99ed5eeb0348c75396f035c82f6d3dbb501e338d090cca8bacd0a9c8ac969cf9e4de9d67
diff --git a/x11-misc/obmenu-generator/obmenu-generator-0.88.ebuild b/x11-misc/obmenu-generator/obmenu-generator-0.88.ebuild
index 8a36e7f9249a..c745957dbfb1 100644
--- a/x11-misc/obmenu-generator/obmenu-generator-0.88.ebuild
+++ b/x11-misc/obmenu-generator/obmenu-generator-0.88.ebuild
@@ -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 c9aa98c848b4..f3304648e15e 100644
--- a/x11-misc/pcmanfm-qt/Manifest
+++ b/x11-misc/pcmanfm-qt/Manifest
@@ -1,3 +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
 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
new file mode 100644
index 000000000000..db6ed8248064
--- /dev/null
+++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.16.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake optfeature xdg-utils
+
+DESCRIPTION="Qt GUI Tabbed Filemanager"
+HOMEPAGE="https://lxqt.github.io/"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	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"
+fi
+
+LICENSE="GPL-2 GPL-2+ LGPL-2.1+"
+SLOT="0"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	>=dev-util/lxqt-build-tools-0.8.0
+"
+DEPEND="
+	dev-libs/glib:2
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	=x11-libs/libfm-qt-$(ver_cut 1-2)*
+	x11-libs/libxcb:=
+	x11-misc/xdg-utils
+	virtual/eject
+	virtual/freedesktop-icon-theme
+"
+RDEPEND="${DEPEND}
+	!lxqt-base/lxqt-l10n
+"
+
+pkg_postinst() {
+	xdg_desktop_database_update
+
+	optfeature "mount password storing" gnome-base/gnome-keyring
+	! has_version lxqt-base/lxqt-meta && optfeature "trash functionality" gnome-base/gvfs
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/x11-misc/picom/Manifest b/x11-misc/picom/Manifest
index e4b3a4fb5ec4..d29e203dc483 100644
--- a/x11-misc/picom/Manifest
+++ b/x11-misc/picom/Manifest
@@ -1,9 +1,8 @@
-AUX picom-7.5-no_opengl.patch 680 BLAKE2B d0d0e9cf752ac003bc312b736dd64388924b6a0371180da0aac7578a85b988c554c7d30a4e419b930775020b99480fed2c1fbd95868989c94ad9997727fdacfc SHA512 b15c5a471bf343667d3fbc14d16d04789eaadcb2cb906668f6235a085c3a91c2bf0e1f0822a5dc5bab5272ca7b1dd3de97087faa6916526ca49e703ae69772d1
-DIST picom-7.5.tar.gz 219456 BLAKE2B 54113547b575ad6aa1329e92ae331b7d49207fdcdc6b49d31d8ab125f7335730a7e53b260c6a6c33d5350bec1e9e6357fd34023dc7837de165289446f8f492b8 SHA512 6535e5eab1a243bbee62448bc48830b7ea3566f94b2c45d9ca76fd8b8056e1f00e55f0e4b58110364d2c4f56652cc005622d644c1db1db41d2811ecc19e6d44a
 DIST picom-8.1.tar.gz 242262 BLAKE2B 69583a7a188f62387f0784e33acfc3d84e6b7b1987f44f7634b1bd2244ae8e8763c2131a824f8ddd748558002a876cb359c656a93fcb55ad33a24cca2b7dc56e SHA512 d1d0428e5761db6820c775c07b966b5fec6a9e9d049ba9f555eb49721f855a018df7242ef61e29c0ea003644b20e1bb733ddf668053a8d4040240e98707fa4d3
+DIST picom-8.2.tar.gz 242653 BLAKE2B 1c76ad4b3152d47155f957f8f1e75447ec8e30d05bc5fb9bf09c890552168cc3c607c8980b262b18cd5f3dc2654a3416cad20cb7fe829eaef8380783d1847c82 SHA512 bdc6675e73a211075ee0df2b056342cabb19ad27fd73586f5216886f503cd994536845eb866f371e07a8dc0404346c67b899a14830e9b7cbc9c01cbd782f36b1
 DIST picom-8.tar.gz 242059 BLAKE2B cfeec7f40eaa43c115bd326abeaa547553f7bdd22a2e6b2a96f46d87c164b0e9403a876f069077e3b85d11af685aadb0cff2a4e7df2cf87646f2552f9c1a01df SHA512 154dd42dea16aca463e7d7f9913a8f10740df892bfdda2fee210a94b13c8eaf6201b35e505daf45075fdb1980bb9b85adf170b649702c1b1e2fcdc1d88406b4a
-EBUILD picom-7.5-r1.ebuild 1335 BLAKE2B 09bd5c512559e6767258c7729d0756a5654f4eed20adb0d81d768a7ab546a828becbc73c861385cc15063658cb934614a57f12bc6ae1c5851aed2e1a2c0a8e87 SHA512 589200086b027dc00a743f8d30bba2d48e20480c8c2c2f7462aeb88668fef202211e891e7967d8d6e7baea23c00ea0df863a5806e6b5280375958f935a5c08a2
 EBUILD picom-8.1.ebuild 1423 BLAKE2B 982c38dcfab72f6b6c97168e785f88c2a5c74ac69909abb4d40beeec3442cadf8525b4279b026c5ec65a2e24b6cd796f38a0be279f2b814a174d6adc30f9a62b SHA512 ee99faa95b5510d6c3d6726eb8c07b2a7156b6a52d361e1796909ec3def0fb81578ae8b87acc4a277043b4e6d25c518a49582af9010007ffb81b345ad4e71994
+EBUILD picom-8.2.ebuild 1423 BLAKE2B 982c38dcfab72f6b6c97168e785f88c2a5c74ac69909abb4d40beeec3442cadf8525b4279b026c5ec65a2e24b6cd796f38a0be279f2b814a174d6adc30f9a62b SHA512 ee99faa95b5510d6c3d6726eb8c07b2a7156b6a52d361e1796909ec3def0fb81578ae8b87acc4a277043b4e6d25c518a49582af9010007ffb81b345ad4e71994
 EBUILD picom-8.ebuild 1419 BLAKE2B a991549fde6f0bec57766fe29e7a0c15fe9277ec4c178b6697789bbb0d1f923e3e9c307161e2fc2557b4d8bcdc58d705325c018cf19f7518165fcddf21fede18 SHA512 3611ee43a9782ff7df23edab1a509450573daea133ff32c01c8149dbedf70a3ff6f3b49c73931a69aba2cd401ab1daf5217b603b4b9c8351ca01342f5c42af65
 EBUILD picom-9999.ebuild 1056 BLAKE2B 658917c293650ee1b6a44c61fe5ee5704221c8bd36881c289dbd503a13c2b4b6b70c6324b88027b486b2cdd9f4d6414558e1825fc2e3c45a7312669c9b724d72 SHA512 88b6b3d7fabd2baaef316d301663bfb61a7b8ba0d131fb6235d6bd294c3bed28fa61178d32b829e38d9faec09e7984b73e02952c2d9c4aed9f31248299f80cde
 MISC metadata.xml 677 BLAKE2B 3d9d1ca23a81c30ac451c45ecad35c3cfbc63ea0a1d5c2cfed587990b33158ca8b3c188fe611aa51b77d2c66a270f8cc95ea5f38cb6270bd1ebf92411cb8ba8f SHA512 9a77cc79578426ae9e1e89e471d4368ef662f3bff757015d4cb48f08e2cbec446753ad16233bafde8ae1c61da0ec1bbd8539534c6097c7525c5905532c8cc9a5
diff --git a/x11-misc/picom/files/picom-7.5-no_opengl.patch b/x11-misc/picom/files/picom-7.5-no_opengl.patch
deleted file mode 100644
index ca9f715140ee..000000000000
--- a/x11-misc/picom/files/picom-7.5-no_opengl.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From bd5a5fb56812ee5644e4c4bd1fdd82b9899317a7 Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Sat, 12 Oct 2019 13:29:10 +0000
-Subject: [PATCH] Unbreak -Dopengl=false clean build
-
-In file included from ../src/x.c:17:
-../src/backend/gl/glx.h:10:10: fatal error: 'GL/glx.h' file not found
- #include <GL/glx.h>
-         ^~~~~~~~~~
----
- src/x.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/x.c b/src/x.c
-index ed6668a8..2f802f1e 100644
---- a/src/x.c
-+++ b/src/x.c
-@@ -14,7 +14,9 @@
- #include <xcb/xfixes.h>
- 
- #include "atom.h"
-+#ifdef CONFIG_OPENGL
- #include "backend/gl/glx.h"
-+#endif
- #include "common.h"
- #include "compiler.h"
- #include "kernel.h"
diff --git a/x11-misc/picom/picom-7.5-r1.ebuild b/x11-misc/picom/picom-8.2.ebuild
index b2473732a34a..993b85a8ab0f 100644
--- a/x11-misc/picom/picom-7.5-r1.ebuild
+++ b/x11-misc/picom/picom-8.2.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit meson python-r1 xdg
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+inherit meson python-any-r1 virtualx xdg
 
 DESCRIPTION="A lightweight compositor for X11 (previously a compton fork)"
 HOMEPAGE="https://github.com/yshui/picom"
@@ -12,12 +12,13 @@ SRC_URI="https://github.com/yshui/picom/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MPL-2.0 MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+config-file dbus +doc +drm opengl pcre"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="+config-file dbus +doc +drm opengl pcre test"
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+REQUIRED_USE="test? ( dbus )" # avoid "DBus support not compiled in!"
+RESTRICT="test" # but tests require dbus_next
 
-RDEPEND="${PYTHON_DEPS}
+RDEPEND="
 	dev-libs/libev
 	dev-libs/uthash
 	x11-libs/libX11
@@ -38,27 +39,22 @@ RDEPEND="${PYTHON_DEPS}
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 BDEPEND="virtual/pkgconfig
-	doc? ( app-text/asciidoc )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-no_opengl.patch
-	)
+	doc? ( app-text/asciidoc )
+	test? ( $(python_gen_any_dep 'dev-python/xcffib[${PYTHON_USEDEP}]') )
+"
 
 src_configure() {
 	local emesonargs=(
 		$(meson_use config-file config_file)
 		$(meson_use dbus)
-		$(meson_use doc build_docs)
+		$(meson_use doc with_docs)
 		$(meson_use opengl)
 		$(meson_use pcre regex)
 	)
 
 	meson_src_configure
-
 }
 
-src_install() {
-	meson_src_install
-
-	python_replicate_script "${ED}"/usr/bin/compton-convgen.py
+src_test() {
+	virtx "${S}/tests/run_tests.sh" "${BUILD_DIR}/src/${PN}"
 }
diff --git a/x11-misc/polybar/Manifest b/x11-misc/polybar/Manifest
index 11cfb6163675..227a7366f6a5 100644
--- a/x11-misc/polybar/Manifest
+++ b/x11-misc/polybar/Manifest
@@ -1,7 +1,5 @@
 DIST i3ipcpp-21ce9060ac7c502225fdbd2f200b1cbdd8eca08d.tar.gz 191599 BLAKE2B 85488a6c2ab9c6f653b499ceaa6d8e803dd8b32cd701a7fbbe151f7f3ea2dc30555c520ded53f023a21b119be97c2b07ae1ab413479cfde677e2073f3d48e36b SHA512 0000ba136bd531899ce9e87d458bd6f7d16f45509def37e4fd7aafc16d0e122fe5f56d0eb9dbc3e722dbb6c9812913a7aafa4b749a9c727ab0988908b1e2a425
-DIST polybar-3.4.2.tar.gz 253194 BLAKE2B 136dd32d524902fccbf9db2b2fa8ed582d45565aa0e834af9610e6f692ef70d3e5e066c6021060df9cedf2e1aa2c92753e4fc4ce9c0935795ef4b0056c273687 SHA512 2205847ebc03040e8d2a2581d2c70e940157c5dba71e0c2d086c0f0971a6ffd83c42846a85dd93165512f35710e3f3af8b4494bcd695f71ef0ac501f74753dfd
 DIST polybar-3.4.3.tar.gz 253207 BLAKE2B 213b5ea67cc337c47f62afcdce9cacf66516e6f410d2d93570567cddf9f0f5b93764f16e3eaf7c03c56a5ddad62ade92bd83fcfe30c6b91d067c2343f7264342 SHA512 20ac34375da4634a7fd596f38e98a245186c94f8fd624d1dfdcd6633a3c8470fcc57946a50a59177e9d34689aeb5f6cde49e95b30ad699239a2aabbf0635d31a
 DIST xpp-8c019e6d7fefd2468791bc1cbf90d68ff7c1ba33.tar.gz 83974 BLAKE2B 6ea8599136288c006b6993bd6c704ec32d82773153733b4bc6a9c3f326eaf6f3b155d92f270eeb14d57b399f7b5ea0f6bdd5cee41bb5bdf4c1650f337b77f857 SHA512 92874b25305b3be777e739122ff82f1ba16b8e2e445e8ee4891918074ea8ea371f2016d7901cfc477d0286a9e15910c4cee431a11eb71e32728bfbf561313e4f
-EBUILD polybar-3.4.2-r1.ebuild 1824 BLAKE2B 7c4b4365b75d2d4d6103f2231810f5e7189f06fd170ecf06150b687f5802359db8992dfab2ee7ab3b1a41e5a6efa6a1a7732544b2708941e8c5e764f042a77b7 SHA512 19cbde22158c9e5c8924c5ee4f706473ae900c9d7e42466ab25c24ea63dc4deffccc7821868130ec97211c35c1560a6270220b18cea7252d86f7fd351695e1d7
 EBUILD polybar-3.4.3.ebuild 1808 BLAKE2B 383e0c9b63385237bf1ecf2b0650f3bdcdb8df85cd72b8fbcbdab391b509de5736592de7d9684209c332be857f79cbeec0f51a3d04b2a5ec3b1783a01bc3e846 SHA512 170c1bfe1a8b80b7feed829496724fd3f90a6a0ade553ca828ef06552f1e38cc78180ff2eeed0690b0072f7d2c82494835fb23a76a6d4eeaddb152d9c5381f01
-MISC metadata.xml 582 BLAKE2B bd70511d8795f71413b5134b7f2203882a3f7ef8e190ef05b109baf9d1164a47fd4ec9f3f955076cf3634fea7469990b1a725bf151f03a0112604113633262a9 SHA512 447e0e0dfa1cc9563ef6399d6fbd4c1bc49db4eac60263ce6abc1d7b488f3881247b74e16f421ef73061ebbd285491d271554cc468e4a44a9c9f9f25b08e1b3a
+MISC metadata.xml 813 BLAKE2B f620aa54849e10ab8a6f14e78bb00b2cb17ec9309d032025833fef0aa3e339fe3236ca3a83abed185fa2f3098b1c3127f09bed4ff75d1f4de1999097112f8f26 SHA512 b7a4b4143245837dbfc14270b008f1b48b2b7c0746d16180cabe569d562709f41229d7028397c3eca64a5a07319441d69e3affe2b0851e5a6c33f5727608989d
diff --git a/x11-misc/polybar/metadata.xml b/x11-misc/polybar/metadata.xml
index 39fc36198607..37f978d5dcef 100644
--- a/x11-misc/polybar/metadata.xml
+++ b/x11-misc/polybar/metadata.xml
@@ -5,6 +5,14 @@
 		<email>johu@gentoo.org</email>
 		<name>Johannes Huber</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>jchelmert3@posteo.net</email>
+		<name>John Helmert III</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="i3wm">Add support for i3 window manager</flag>
 		<flag name="ipc">Add support for Inter-Process Messaging</flag>
diff --git a/x11-misc/polybar/polybar-3.4.2-r1.ebuild b/x11-misc/polybar/polybar-3.4.2-r1.ebuild
deleted file mode 100644
index 1e8fb05ec227..000000000000
--- a/x11-misc/polybar/polybar-3.4.2-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-XPP_COMMIT="8c019e6d7fefd2468791bc1cbf90d68ff7c1ba33"
-I3IPCPP_COMMIT="21ce9060ac7c502225fdbd2f200b1cbdd8eca08d"
-inherit cmake-utils python-single-r1
-
-DESCRIPTION="A fast and easy-to-use tool for creating status bars"
-HOMEPAGE="https://github.com/polybar/polybar"
-SRC_URI="https://github.com/polybar/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/polybar/xpp/archive/${XPP_COMMIT}.tar.gz -> xpp-${XPP_COMMIT}.tar.gz
-	https://github.com/polybar/i3ipcpp/archive/${I3IPCPP_COMMIT}.tar.gz -> i3ipcpp-${I3IPCPP_COMMIT}.tar.gz"
-
-KEYWORDS="amd64 x86"
-LICENSE="MIT"
-SLOT="0"
-
-IUSE="alsa curl i3wm ipc mpd network pulseaudio"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep 'x11-base/xcb-proto[${PYTHON_MULTI_USEDEP}]')
-	x11-libs/cairo[X,xcb(+)]
-	x11-libs/libxcb[xkb]
-	x11-libs/xcb-util-image
-	x11-libs/xcb-util-wm
-	x11-libs/xcb-util-xrm
-	alsa? ( media-libs/alsa-lib )
-	curl? ( net-misc/curl )
-	i3wm? (
-		dev-libs/jsoncpp
-		|| ( x11-wm/i3 x11-wm/i3-gaps )
-	)
-	mpd? ( media-libs/libmpdclient )
-	network? ( net-wireless/wireless-tools )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	rmdir "${S}"/lib/xpp || die
-	mv "${WORKDIR}"/xpp-$XPP_COMMIT "${S}"/lib/xpp || die
-
-	rmdir "${S}"/lib/i3ipcpp || die
-	mv "${WORKDIR}"/i3ipcpp-$I3IPCPP_COMMIT "${S}"/lib/i3ipcpp || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_ALSA="$(usex alsa)"
-		-DENABLE_CURL="$(usex curl)"
-		-DENABLE_I3="$(usex i3wm)"
-		-DBUILD_IPC_MSG="$(usex ipc)"
-		-DENABLE_MPD="$(usex mpd)"
-		-DENABLE_NETWORK="$(usex network)"
-		-DENABLE_PULSEAUDIO="$(usex pulseaudio)"
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/x11-misc/py3status/Manifest b/x11-misc/py3status/Manifest
index e013a98d6192..546a84a395be 100644
--- a/x11-misc/py3status/Manifest
+++ b/x11-misc/py3status/Manifest
@@ -1,3 +1,3 @@
-DIST py3status-3.30.tar.gz 407251 BLAKE2B 6dc65cf3eb5ca2e182e6d27cb4f3a210e839b0c45caa7ced8683bad7ec60c53992bab10f9cd6c8577525cdeb12cd1196afe1a15f413ea58f08eb17b20f7fc6cc SHA512 f3b72a85f3cd2257ac4c94fa246a0440f4b229c42ef0140062b9f50ea7dbf4ac741648d196729d8c1ea1454c1db2c57ea0ba6999e2141b7a09c9c4c31e488440
-EBUILD py3status-3.30.ebuild 723 BLAKE2B b62005954af6e13387b48634c04e8cb52ad6d57281cf3e03032f8841d7735db691d228a2a5e81def59e5c6d3eeb6f1d2958e9f78de81c6a965ed383e067c286b SHA512 a96d6985c55f73fae78a542620c6d2f6914f71d1584580a4f9ebc932d2640d6276ec376d463a9abdbbd94847bb6549750603123b9b6fc30f19dbbb7358d05249
+DIST py3status-3.31.tar.gz 408348 BLAKE2B 69b71426974ee21fd5f70fc7448b2b08fd2b8ffd673fd0de928725f75dff7121fc9619e8ce98fc926c75dc2ee8eac21ecd77ce7f9d1df01da2698eef00b46fb0 SHA512 612bb859ce594b3eb397b6d254723cfd8fb5b005eb3279f05d72b0098769bff1434060c1086606331d207e5367323179ef52c07ebb4829bf4a10c490e524b4cc
+EBUILD py3status-3.31.ebuild 723 BLAKE2B b62005954af6e13387b48634c04e8cb52ad6d57281cf3e03032f8841d7735db691d228a2a5e81def59e5c6d3eeb6f1d2958e9f78de81c6a965ed383e067c286b SHA512 a96d6985c55f73fae78a542620c6d2f6914f71d1584580a4f9ebc932d2640d6276ec376d463a9abdbbd94847bb6549750603123b9b6fc30f19dbbb7358d05249
 MISC metadata.xml 628 BLAKE2B 649225c124569c38af8f27f617f3aa8761189acce95a76c54725a987c0124daf55723faae315161736b13a3032887d6036328ba46b48851a25f4c67cc3efc095 SHA512 220b5202a46611f41e8c814e90e079db6796b44144e05803c70b04414cc05417cf264d8fa288102e14e94a4995f000efdd19d36e51cbe17524242ac5f1318668
diff --git a/x11-misc/py3status/py3status-3.30.ebuild b/x11-misc/py3status/py3status-3.31.ebuild
index f08967d407b9..f08967d407b9 100644
--- a/x11-misc/py3status/py3status-3.30.ebuild
+++ b/x11-misc/py3status/py3status-3.31.ebuild
diff --git a/x11-misc/qps/Manifest b/x11-misc/qps/Manifest
index cf6de4623f43..e83bd5937c52 100644
--- a/x11-misc/qps/Manifest
+++ b/x11-misc/qps/Manifest
@@ -1,3 +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
 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
new file mode 100644
index 000000000000..5284132b4063
--- /dev/null
+++ b/x11-misc/qps/qps-2.2.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Qt GUI Process Manager"
+HOMEPAGE="https://lxqt.github.io/"
+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"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	>=dev-util/lxqt-build-tools-0.8.0
+"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	>=lxqt-base/liblxqt-0.16.0
+"
+RDEPEND="${DEPEND}"
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/x11-misc/revelation/Manifest b/x11-misc/revelation/Manifest
new file mode 100644
index 000000000000..c77b0b2910fd
--- /dev/null
+++ b/x11-misc/revelation/Manifest
@@ -0,0 +1,3 @@
+DIST revelation-0.5.4.tar.xz 282600 BLAKE2B 519b01252b82acf0e927a9d19783792f83822cc1f1a4c3be4af3678d5446f8012d993e12397f44aae616aca88257970de7391a1269e24cc1ebc08275d0c962ed SHA512 bd536f6c03e443d91a20606765b661dc54f3e4c1f45d060d3829a894a31e553a61785bb31d7508267abd66e057fc1d93f1716ed1b553566d92a2580ad696606f
+EBUILD revelation-0.5.4.ebuild 1045 BLAKE2B 64fb384d1cd090b7669ef3083d311e34d01b4b2453e6addd9967aadfb8a84a41dece8bfedeca38adaecf0c3274ff1dfb92c527b19de3639c7a088c16b3615433 SHA512 786b42dfe14889d330d1c53db986606a2ef0a3f642e790b19caa63fc98a8bbe9381addb8becc9b835f4ce9e12234568001b250aa7255b7d1b2b0b00455d94e2d
+MISC metadata.xml 382 BLAKE2B 2a58c709cead6b58075460431af75fd8fa8f0e8f965efc62d13878b0ffe70ef9461adb3f980463241dda25c01adf0ec934087e6da16d05822597ddcf92f10b1a SHA512 c7a4a726b4d7ec5462bfd941673327380efb5fe0d32913f125e0df1820d9605facef16a2f766fbb4baa1fdf5000b1a31beea3a454e4dc7918ea387459d28c6c9
diff --git a/x11-misc/revelation/metadata.xml b/x11-misc/revelation/metadata.xml
new file mode 100644
index 000000000000..2a6c92d969d5
--- /dev/null
+++ b/x11-misc/revelation/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>misanthropos@gmx.net</email>
+    <name>Richard Fröhning</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/x11-misc/revelation/revelation-0.5.4.ebuild b/x11-misc/revelation/revelation-0.5.4.ebuild
new file mode 100644
index 000000000000..0f47118e8de8
--- /dev/null
+++ b/x11-misc/revelation/revelation-0.5.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_8 )
+
+inherit gnome2-utils python-single-r1 meson xdg
+
+DESCRIPTION="A password manager for GNOME"
+HOMEPAGE="https://revelation.olasagasti.info/ https://github.com/mikelolasagasti/revelation"
+SRC_URI="https://github.com/mikelolasagasti/revelation/releases/download/${P}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Upstream does not provide any test suite.
+RESTRICT="test"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pycryptodomex[${PYTHON_USEDEP}]
+		dev-python/pygobject[${PYTHON_USEDEP}]
+		dev-libs/libpwquality[python,${PYTHON_USEDEP}]
+	')
+	x11-libs/gtk+:3
+	dev-libs/glib
+	dev-libs/gobject-introspection
+"
+
+DEPEND="${RDEPEND}"
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${ED}"
+	python_optimize
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/x11-misc/rofi-calc/Manifest b/x11-misc/rofi-calc/Manifest
index c545648fbcaf..45f13314230f 100644
--- a/x11-misc/rofi-calc/Manifest
+++ b/x11-misc/rofi-calc/Manifest
@@ -1,6 +1,8 @@
 DIST rofi-calc-1.5.tar.gz 1693385 BLAKE2B 7ff21873ee298c4295f2766917318796d6327959e63d99adc86857d2e05534e77062c9546ba8c6cf645a12ae46147e4583a61fc95dbc6953ee642449ff108d40 SHA512 04213b6489cd9e3c5085a88cee07ee9413819c19d4ee08f6e2eef3ad418d21b5acaf1d4ef21f1495d81694e5706f93598c91ada65f1bcc83ce94a6cf5d50ea0c
 DIST rofi-calc-1.6.tar.gz 1694150 BLAKE2B bc1f3a2589c0e704793693e0f007503d1b0eaa363f416f0d111709541f2960f0f5ab31d0eb129000e7f82af3d46ce0a52918cfbfc00d14292a839a40a0986bb0 SHA512 a87523d3d64fbd53e431dba7da674a213fcfbdcaac25906a19bc83aa3feb14da479b702b39fd58ffeb04198ea0a5d52808f7c9c36495defc99c9c83df963e0b6
+DIST rofi-calc-2.0.0.tar.gz 1695125 BLAKE2B d76c304724b0f3326a8bd26ab2c7eaed5f77f3b6d07ddc97570a1fb28d56504d98ac9ab66411290cb548b760bd3231a729dfc470e748a8447e323d1b290f677c SHA512 298f9983dbd140f5aee5b3799b165500eae100f3f5744ba07914b962faf01661dee0f5f4c9c12a07a4e210b6115ac6fb377d9fa9a7e64ef5a19600e9f55cd478
 EBUILD rofi-calc-1.5.ebuild 487 BLAKE2B 7e5ebe0a0f34d2fd09d0d6bf5181de919961f24c1dd38ad40e3c80cd249518b097448d2dc1c0cd8177d2d8323595f4e52788b010f93800cd6c10ca269b2aa8b0 SHA512 0abfc58d30bbbe41472a45cac711d0edfb6a9bfe94c7678b0929e79d5ff0fddc0fef320f7369f43a31647b68f9aaaa48d1b68d7839dd665bab84a9e0efe97bf9
 EBUILD rofi-calc-1.6.ebuild 487 BLAKE2B 7e5ebe0a0f34d2fd09d0d6bf5181de919961f24c1dd38ad40e3c80cd249518b097448d2dc1c0cd8177d2d8323595f4e52788b010f93800cd6c10ca269b2aa8b0 SHA512 0abfc58d30bbbe41472a45cac711d0edfb6a9bfe94c7678b0929e79d5ff0fddc0fef320f7369f43a31647b68f9aaaa48d1b68d7839dd665bab84a9e0efe97bf9
+EBUILD rofi-calc-2.0.0.ebuild 487 BLAKE2B 7e5ebe0a0f34d2fd09d0d6bf5181de919961f24c1dd38ad40e3c80cd249518b097448d2dc1c0cd8177d2d8323595f4e52788b010f93800cd6c10ca269b2aa8b0 SHA512 0abfc58d30bbbe41472a45cac711d0edfb6a9bfe94c7678b0929e79d5ff0fddc0fef320f7369f43a31647b68f9aaaa48d1b68d7839dd665bab84a9e0efe97bf9
 EBUILD rofi-calc-9999.ebuild 467 BLAKE2B fc14f1346f9e5ee3a4199d3f346b0be73ba077311efa515abfef36cecaa6e4299949a6027a0de6190c8ecde529904abb76b2ba2afcf3a605a6433170f66faa34 SHA512 96a703783182f67fb241919b540a5ef2f961a2eed5db80118679bb47eac2c508b695fa1ec389ceaf964860ee9758f878546bf4303e667f9b03757d2289acf2a8
 MISC metadata.xml 266 BLAKE2B 81f9187791657d73f222a9fdb13afbec46a4a493590a18dace8fc39cf1a2a321fbebab3054aad72756a04c2d6104c08e83e4fc70ad0bf8a1a24a09673956a502 SHA512 f35ebacc5e0574848fd39e1eede846facb50015a0449cc0b37807caab44b7c46d28ac490aba2e80dcdaea1ae2eca7158b5894ce647b411661955f16cb69c9223
diff --git a/x11-misc/rofi-calc/rofi-calc-2.0.0.ebuild b/x11-misc/rofi-calc/rofi-calc-2.0.0.ebuild
new file mode 100644
index 000000000000..a267871cd50b
--- /dev/null
+++ b/x11-misc/rofi-calc/rofi-calc-2.0.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Do live calculations in rofi!"
+HOMEPAGE="https://github.com/svenstaro/rofi-calc"
+SRC_URI="https://github.com/svenstaro/rofi-calc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	x11-misc/rofi
+	>=sci-libs/libqalculate-2.0
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	eautoreconf -i
+}
diff --git a/x11-misc/rofi/Manifest b/x11-misc/rofi/Manifest
index 29c4fc43ba3e..fc4f76a4ddb4 100644
--- a/x11-misc/rofi/Manifest
+++ b/x11-misc/rofi/Manifest
@@ -5,4 +5,4 @@ DIST rofi-1.6.0.tar.gz 558808 BLAKE2B 45849f71becd3ab69b85dae64af34ad42199c20976
 EBUILD rofi-1.5.4-r1.ebuild 1081 BLAKE2B 57e62dbf8e19448372d23438ffea0840144651434e6235798bc558be24d785d03d0e2143cab08b83abb39d3308446f42c46706f9aaa9edb690da1a9a7055a078 SHA512 456f687515cf00aa7826111d393056aea01159aacc88a408d66d5aef493a154ea9c823b57cd6b73ee593c0776d6f6e3d5a2ce94ccd7e97f523514d175778b236
 EBUILD rofi-1.6.0.ebuild 1127 BLAKE2B c279ac1a739c9dd30bbc1a87856e4f3b4e787a20f3f857d805a7775b2a7b363fb1a59d6f7fd7e8ab2ae904f57a8d98ed0d17201876426015ce2bd0de68ee0516 SHA512 c0cd9be17f855fcc119fd58e614aee41d1ab9b368de322f903652360bfa1ba7a166f47d2c3d09a655dec32edfbeafb5f85e0e1ae2484986524c982f3d6a6bc1a
 EBUILD rofi-99999.ebuild 1042 BLAKE2B 0c684ffbeef5366d83b4689a2e8ab9f27072e82d936985fe1a7d128a65cc8b3edcf6a42b09e85866496b280143af8d5f4ece9d8db452bdf1eae020a93302d10c SHA512 1a08b9ded70d742ef6fe5c9250291a6ff74b1efcb767594c4546bb5f7217d1c50cc04d259a55834b12d3c91b3262d82edfcd5c2ffb5ded4ac8718e54a3ea27a1
-MISC metadata.xml 546 BLAKE2B 2e5e62bcddea3c68e3f6bfc4826ea58c40f4312284cb412f29a47aabf8b062a9ec4ab7dcdaa2c86ceb4707d39e156daa4d0ca1e8bb1cd491a3eeed6070af8dac SHA512 129184ce9a703b8fa8880c1e06c68a58bbdeaa0b170128bf334fcd979fad4dd926562da816a269e7afa3f2cf1b96c648db2c676900ba88c667abe6c907c8eb7f
+MISC metadata.xml 475 BLAKE2B 6ca3375d564b137bf9e6b9f71dd725c5602a24e2184e420002c161681e314bb0ba4547e171e18e3f036637447001fd8af41e46f7f6b7ca9795020bdfacbd8a57 SHA512 0adff749d0effa8e97ebd8e00714c8f854bd5d71c07f7c83be79da5b80bb9910b06d14a7df7145d92b2aab2d905692c5b3b9481007bb47dc0b7f17f59ef781bf
diff --git a/x11-misc/rofi/metadata.xml b/x11-misc/rofi/metadata.xml
index 55134acf088d..a9c1853eed4e 100644
--- a/x11-misc/rofi/metadata.xml
+++ b/x11-misc/rofi/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>jer@gentoo.org</email>
-</maintainer>
 <maintainer type="project">
 <email>desktop-misc@gentoo.org</email>
 <name>Gentoo Desktop Miscellaneous Project</name>
diff --git a/x11-misc/screengrab/Manifest b/x11-misc/screengrab/Manifest
index 5d2b6a264167..c89e1f163a62 100644
--- a/x11-misc/screengrab/Manifest
+++ b/x11-misc/screengrab/Manifest
@@ -1,7 +1,9 @@
 DIST screengrab-1.101.tar.xz 130248 BLAKE2B 0a81b80249322a8c6b4767b9bae70d43eaa41619927fdd799179d6dc9e15fe0cfb8ef50794890d9f9c84787bb88b447f84452b64f88e114aa3393466b1cf443c SHA512 f253c4015f9c9ae6b53bb4919c0301cc843b0d6f6ab0b8ad88befbd397004aa4838d5900d1af86ed348cbba45fa352ded5192d494bd738c2f2b314e9ad73fb13
 DIST screengrab-2.0.0.tar.xz 119296 BLAKE2B 0f3c55a78fb80569b4f42e63b9443018b7296c1b48ad4aa0af4270df19f939c44dbfc932731d6b16b0e15b6a735db333387e110ca221f88aab033ecb7b56cc96 SHA512 f08cd37489062d4b9c66278203b2fdd0298d1222e42e9240c5812779216289728f84a6567d7570ad3bf209834df4549acd9d31550c328f7785da6176b237d7e7
 DIST screengrab-2.0.1.tar.xz 123628 BLAKE2B 62cad8ccbf89c4cb3728311b6dd4883676a0be514f84c6f54633e7001a39470b7209b7416e42a19603cd1ad74661eea87d015cb0c70ed8ff3e181ecc25dbeb71 SHA512 f65d1aa4a36bf7e11e29bd1d1ad009f979e3c66a27204cd74c7ef7a54bde4027efdf030933cb81d2f9cb8b67715e868e1454a1faf7bbbb63cf162214bad8dc02
+DIST screengrab-2.1.0.tar.xz 128616 BLAKE2B d62078eb131fe20ec52545751cf1a0951514a201edf434ddedb69d15b9f9f9aa4e926a749d30560afebcf2950b70dfe2fb319b9e447a1d7ace70369cf9a0d104 SHA512 dd14d8d6c957a58c60d73cf82d6a65fc182c85a9f078663caf6686e424b292a1c579d493acac03c6ee2acd4605fc025d5a5e94b3161f3c30778cc1452056af27
 EBUILD screengrab-1.101.ebuild 791 BLAKE2B c70c20be057980681a209a5100e65edb3fb5da26308822dcb60d07c28370749af4e8d97ec85caa06fd4cc0ae93e3af5910af5d5cd8fe7bb49a349496f0b32486 SHA512 046e727e33436ce07c1d7afd62cf0f869dd6e3c285a2c650c0260e6a57a4454fce74d331c7047626f78b2a6cfccd89e1582d4096bd3a28a003f9f17fe92dd9bb
 EBUILD screengrab-2.0.0.ebuild 813 BLAKE2B ce9d245a194c0cdce63057c365ef0277c091ca580b434aa110679ab9387f8e03d3b99af8cebb88f8fe9a922c3b0b3aa00d9d5c14b0f643e88724401c6280f117 SHA512 b579f2a8a3642d18a9b4a95bf7db087b0a3b5df3ca8cacd3063a1579d16dede233798366c7e18c31f02ff40391aa43aedea9d8c2d208a915d71acf33739232ee
-EBUILD screengrab-2.0.1.ebuild 811 BLAKE2B 52782dadf5efe96b44dfa443f6c7f6b43b5df7d460e3970ed84d024f2abe06841c461c19c4b3c02a6e34b0390bcabdb6c6fcedf65bd0868ac39b43854ded4c1a SHA512 1956b8073f4e18074713ce80721a5dfa117fed9bd56fac1e21dcd1d0dd88aacacfef20a74e77238c850f03af7aa05727c61985583c616050d2fe6ef6af9ff0b5
+EBUILD screengrab-2.0.1.ebuild 809 BLAKE2B 3137c009b0229f8b00a5d7be453f53b228be7a8f6c8d5abcdf60e31afdd910f1d67e96de2dc0ffe403dec16bdd81c0ed79441ba58b905fb5a8183d0dcf8e9ccc SHA512 160e6171879da808d4d2c94f6daba12896ddf6727d7924388f4aa40644768981934fe8cada8fa81bd8708eb381d7fa5d4e53328747873d0aaaa813ee615ce41d
+EBUILD screengrab-2.1.0.ebuild 811 BLAKE2B 3e6c1ab65befcf56fb2e632c11e464a42b95970c6a7a8e25832471463db8b77f9aa4a3f4e06d698a15a202b381014621dd4d323b89e1ada0691cb4efec569a41 SHA512 b1547102f47d8ef7ddf9ac2a923e5f2aec393b408849b251b7bce9569b2106d92160ee1c72ca26468ce7c994ebcf19fee31eaddf25b386d028e49a4614d1e944
 MISC metadata.xml 439 BLAKE2B 87d0955baa4cf7c8587121cb9cbe863bffd94cf8886019b9c97153fdd034aa10425d71e5fbc172be6605534a45cf838b2c04aace8a63e1cf4c6adc91251e2e63 SHA512 991791fce13ef70f4eb0c0916150d0d46ac49dbf5b56b4644cc6b399f6fbbf7f7391ad9359f22f3ffee03759fb3fea1e88905a2f444ede1b37e9a4136f3f6e58
diff --git a/x11-misc/screengrab/screengrab-2.0.1.ebuild b/x11-misc/screengrab/screengrab-2.0.1.ebuild
index 37ef4c7ac246..1ba1ca005194 100644
--- a/x11-misc/screengrab/screengrab-2.0.1.ebuild
+++ b/x11-misc/screengrab/screengrab-2.0.1.ebuild
@@ -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+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 BDEPEND="dev-qt/linguist-tools:5"
diff --git a/x11-misc/screengrab/screengrab-2.1.0.ebuild b/x11-misc/screengrab/screengrab-2.1.0.ebuild
new file mode 100644
index 000000000000..3d6f8350eae4
--- /dev/null
+++ b/x11-misc/screengrab/screengrab-2.1.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Qt GUI Screenshot Utility"
+HOMEPAGE="https://lxqt.github.io/"
+SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2 GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+BDEPEND="dev-qt/linguist-tools:5"
+DEPEND="
+	>=dev-libs/libqtxdg-3.6.0
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	kde-frameworks/kwindowsystem:5[X]
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXfixes
+"
+RDEPEND="${DEPEND}"
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index 85c890dd243d..5b32494b5c8b 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -1,6 +1,5 @@
 AUX pam-1.4-substack.patch 1126 BLAKE2B 61bcfc324b603ed4d9c23ede30f2d6215acdd043c6385c6230f95748b79e9746206525bbfba873272ef2559b605123c727c41de17cd713b31ce706a3cead9798 SHA512 0f08eb5c7904cfee570329bb42621bcbeba6e700e667dcaf956d3359792f7938c6fe4a9a3a56a471b5eb512adde0ce7b92cdaca9108a1cc9307e839c1ee3339a
 AUX sddm-0.12.0-respect-user-flags.patch 779 BLAKE2B 3ea539e4e426fa745be2ae6c59f6bd96e42d864ddba9942681397a2cdae69528d837001535502e83e6ef50a9ca65a30b62601af76a11465a5b42feffef348edf SHA512 77e3f2ec4dff122e40428444055ed7cbbb177242c9c3c034b1934dda7a3ff2345dd8fcee4b927b797f66163bffc23a5760dd55c2fa24f2c614cd7dec88ffde88
-AUX sddm-0.14.0-consolekit.patch 322 BLAKE2B ace6c045ab0282eca8bf8a11aa8aa2690fac3ce7f712cd71e48bc9ec8f04dc18b9afd997d04550ade8a37a24a66e430f6b5ae8e752345c7c132cb95ae61b2e73 SHA512 aa53338c3e154982388b2e98101cd49e607f1744acee28f46892e3a6848f06de4ba8a8bf204128da1a7b22df9efe5d95bb6ac1cd5dedb8a301f8587af381253a
 AUX sddm-0.16.0-ck2-revert.patch 918 BLAKE2B 803f3370260ce40a4b46d3d7a9f2f7529db90baba039c080606f9333e4933c6e3a219331d57dbc577e6a32567fedade3a4aec8bd1706bfb5887a0c281d37c2fb SHA512 f9b49390f656d3ba9528c9fecaff044bab7f4933293bd439fc3ccec873aae9899b4f8b93fa769d506948de2be1d3275dafc96795b1c20caf547cbf474ee12b60
 AUX sddm-0.18.0-Xsession.patch 606 BLAKE2B 0af5d0d6b8da47ead31b14ee6e21dc05e173765b64e74332c01bed2d44e6e5f3d3d67166cb460ffbbdcd0cae41d15883a9c4385b2ed242b858f337baa4e3f614 SHA512 19921eea20964f8f697e7839ce58c63412034ccae6db7d4acabddb5ca43523ccacaa8ba10dfe221d3241eeb5fa0f9ecbd205f10025afde4dc48d4106d38d140f
 AUX sddm-0.18.0-sddmconfdir.patch 1894 BLAKE2B aef497f08bd11c4fa4fdfe584b73b69192b875fde9050dbb39d6a0b1924759fedd5c50ed4fa54316f5cc9bb25c667c96eaaabce60d2acd826a4fb0bda2bb7495 SHA512 ebfb026ffca4f450005ecdc64c816720b0714ffcec7c03316148c7835919f01bb47c4c6e5041fcdbb271b70b38de99d74d959fd94b6c30b415159035b0d2b784
@@ -9,7 +8,6 @@ AUX sddm-0.18.1-only-reuse-online-sessions.patch 1201 BLAKE2B cf1947f88fa1223c78
 AUX sddm-0.18.1-revert-honor-PAM-supplemental-groups.patch 3616 BLAKE2B 71a4c6f592214160ff993e86582bf5f550be204193668f5bab7786db88ae9a1a09ee268beb3e3157c1b033e765053ba415f3d291f299b09606aa566c9c197370 SHA512 b33b26517173262194bdc98e63b84fbb1f03005abc3c079332dd9b275167d8ddc680ba5c2a9968be5c54963b64f291aab65ad9f04b9f3f69299d030753cd90f5
 DIST sddm-0.15.0.tar.gz 3520188 BLAKE2B b29a994a0ea2fbbda3f5eaf16885fdfa513a759e5db4d879eed2a7cae1472b90124d2ca65404edae8727a047a9d761b72382dc9ddb206f8dc35b5101856cf377 SHA512 4440acfc6f98ab8efe8e3a441e8dc9ee98615c3544f8adc899bc4f0334e4f1b0d37c1ef823b32cc466adc8fac942cd188b33eb49795e0468a136a959c65c7566
 DIST sddm-0.18.1.tar.xz 3402972 BLAKE2B 99ab43d374e9a3d318f692a6d496d8a6d68927af3c8e8fc2208d7355ec90649a14758b39f5733dd32f942ed569de88085576d4f5f8666f4f97079e0fb6dcb99e SHA512 ff0637600cda2f4da1f643f047f8ee822bd9651ae4ccbb614b9804175c97360ada7af93e07a7b63832f014ef6e7d1b5380ab2b8959f8024ea520fa5ff17efd60
-EBUILD sddm-0.15.0.ebuild 1576 BLAKE2B bcdb6f67b661a3c87b7fe403918ac60cc6dba303e879c8a12e2a0708596c37c5152d406b092cc85a5bacca7c36ef46e942ed054969eb526382662c918bd394e1 SHA512 48839e26239bd57053717ca81a5b6b285677384ce081652fcb774e573a37bb3d56c42489732fdec5d8442550483f3cb2b4b1b936947e3554641bd1e00c17dd45
-EBUILD sddm-0.18.1-r1.ebuild 3139 BLAKE2B 471d8656f2b28d7410f8015ad880998f0766726ae4ee93b158f03d5114bccca9ec8c3c59375a00a1812f2aafa44d1bcebc74ad9e45112914512b938ac6198a2e SHA512 4432a55ca883c650d73cd0c0755349b1a69f9141fa8917a70a10b93c063a3d8bb2e5b4910368fa4a5f238a56d881cdb7cca203d5a6afd8180a10e286dd686bf7
-EBUILD sddm-0.18.1-r3.ebuild 3156 BLAKE2B d2a68e2f3fa0278484fcde419f768151d7b38b7c632c5db36042367dcbbf7140b82ed78b6ef2cf0a0d1f63569b8f235134a25033cbf90b6bf9bcad690ff6f9e5 SHA512 bd18b1248affadd908a13f5c50920a49b3ed3961f8ee05bc2fe7ca2f7ae6d599a0b19a3e257e814e2a2e4489527c2a1f041e8718bd02f3bc597ee1db8970291d
-MISC metadata.xml 943 BLAKE2B 6bfdf54b23210c7e0d781c2f96358036ac7281825e71e4a8e9cf5fc6d43faf5525cc0ac267c7be2f5eadb08ca830350cf102425d30e19e5e4f92a3a57fc5affa SHA512 8a6b888910d68d5209c070c17e0c2e9dc5d64cf9d70cbf5ce945cfae763f864787fb998eb5544f4e6710c36b0045530780fb27f01944b60d71f60f09e8ecb516
+EBUILD sddm-0.15.0.ebuild 1447 BLAKE2B ecfaaf8fa96e9c56de20454a3c177ad89669d1d9488637962a0312db3a103437dd4eb378c9ce7106ff7eb63e39bf2a056fdc6d215da04d0f609864972bb2557e SHA512 73c4f3218f0bea8a34f25f190e0e97cf40dc912ab7b32722c8036e80c0ed2136db7cdb0b265568a270ce64304c1df4668a3873d97b69f242d8ae2475a66ecd7b
+EBUILD sddm-0.18.1-r3.ebuild 3100 BLAKE2B f10a62a85e35bfd3208ed675107ea4ec0e5575e0bf6ea7936b26245758d3c3dbbdd048ede463e3dd6975f389f403f8a1f12ff7f684c68ca62113c148314609e8 SHA512 aa8ab7302ca98f345c99770fe3c06c18df4f7ce116496fc75a0a6d176e30b2d9d89a71f34bab0024204d5b4c422f25a89ce54a54f0dcde4b9a38340ae3a931a2
+MISC metadata.xml 818 BLAKE2B 2be9c3e50193b2c6117a5447ecc9e718d74a44997f8cbeea66905115ced465ea371cf596b5b366cbc4ebb46ecb41015668b96e44e23e7b3dba583e388e78b85a SHA512 c6910844830c10a5602afa3269ffd8eeb4a1a0b2ae345fea5ca0de11f3856cbbcec86cc95930070274d8e5025b4111f1ec0c7af1721c7ed71ce5ebc428adc0d7
diff --git a/x11-misc/sddm/files/sddm-0.14.0-consolekit.patch b/x11-misc/sddm/files/sddm-0.14.0-consolekit.patch
deleted file mode 100644
index 64ea0648286a..000000000000
--- a/x11-misc/sddm/files/sddm-0.14.0-consolekit.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/data/scripts/Xsession	2016-08-28 14:52:04.910181422 +0200
-+++ b/data/scripts/Xsession	2016-08-28 14:53:07.157184480 +0200
-@@ -91,5 +91,5 @@
- if [ -z "$@" ]; then
-     exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session."
- else
--    exec $@
-+    exec ck-launch-session $@
- fi
diff --git a/x11-misc/sddm/metadata.xml b/x11-misc/sddm/metadata.xml
index c5bfbd1e394a..9d1e3774b72e 100644
--- a/x11-misc/sddm/metadata.xml
+++ b/x11-misc/sddm/metadata.xml
@@ -10,7 +10,6 @@
     <name>Gentoo KDE Project</name>
   </maintainer>
   <use>
-    <flag name="consolekit">Use ck-launch-session from sys-auth/consolekit by default in Xsession (no native support)</flag>
     <flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking.</flag>
   </use>
   <longdescription lang="en">
diff --git a/x11-misc/sddm/sddm-0.15.0.ebuild b/x11-misc/sddm/sddm-0.15.0.ebuild
index 9dde4b79612d..115926b2651b 100644
--- a/x11-misc/sddm/sddm-0.15.0.ebuild
+++ b/x11-misc/sddm/sddm-0.15.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ KEYWORDS="amd64 ~arm ~arm64 x86"
 
 LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
 SLOT="0"
-IUSE="consolekit elogind +pam systemd"
+IUSE="elogind +pam systemd"
 
 REQUIRED_USE="?? ( elogind systemd )"
 
@@ -24,7 +24,6 @@ RDEPEND="
 	>=dev-qt/qtnetwork-5.6:5
 	>=x11-base/xorg-server-1.15.1
 	x11-libs/libxcb[xkb]
-	consolekit? ( >=sys-auth/consolekit-0.9.4 )
 	elogind? ( sys-auth/elogind )
 	pam? ( sys-libs/pam )
 	systemd? ( sys-apps/systemd:= )
@@ -41,7 +40,6 @@ DEPEND="${RDEPEND}
 PATCHES=( "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" )
 
 src_prepare() {
-	use consolekit && eapply "${FILESDIR}/${PN}-0.14.0-consolekit.patch"
 	cmake-utils_src_prepare
 }
 
diff --git a/x11-misc/sddm/sddm-0.18.1-r1.ebuild b/x11-misc/sddm/sddm-0.18.1-r1.ebuild
deleted file mode 100644
index bb3da55d933b..000000000000
--- a/x11-misc/sddm/sddm-0.18.1-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLOCALES="ar bn ca cs da de es et fi fr hi_IN hu is it ja kk ko lt lv nb nl nn pl pt_BR pt_PT ro ru sk sr sr@ijekavian sr@ijekavianlatin sr@latin sv tr uk zh_CN zh_TW"
-inherit cmake l10n systemd user
-
-DESCRIPTION="Simple Desktop Display Manager"
-HOMEPAGE="https://github.com/sddm/sddm"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="consolekit elogind +pam systemd test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="?? ( elogind systemd )"
-
-BDEPEND="
-	dev-python/docutils
-	>=dev-qt/linguist-tools-5.9.4:5
-	kde-frameworks/extra-cmake-modules:5
-	virtual/pkgconfig
-"
-RDEPEND="
-	>=dev-qt/qtcore-5.9.4:5
-	>=dev-qt/qtdbus-5.9.4:5
-	>=dev-qt/qtdeclarative-5.9.4:5
-	>=dev-qt/qtgui-5.9.4:5
-	>=dev-qt/qtnetwork-5.9.4:5
-	>=x11-base/xorg-server-1.15.1
-	x11-libs/libxcb[xkb]
-	consolekit? ( >=sys-auth/consolekit-0.9.4 )
-	elogind? ( sys-auth/elogind )
-	pam? ( <=sys-libs/pam-1.3.1_p20200128-r1 )
-	systemd? ( sys-apps/systemd:= )
-	!systemd? ( sys-power/upower )
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qttest-5.9.4:5 )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch"
-	"${FILESDIR}/${PN}-0.18.0-Xsession.patch" # bug 611210
-	"${FILESDIR}/${PN}-0.18.0-sddmconfdir.patch"
-	# fix for groups: https://github.com/sddm/sddm/issues/1159
-	"${FILESDIR}/${P}-revert-honor-PAM-supplemental-groups.patch"
-	"${FILESDIR}/${P}-honor-PAM-supplemental-groups-v2.patch"
-	# fix for ReuseSession=true
-	"${FILESDIR}/${P}-only-reuse-online-sessions.patch"
-	# TODO: fix properly
-	"${FILESDIR}/${PN}-0.16.0-ck2-revert.patch" # bug 633920
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	disable_locale() {
-		sed -e "/${1}\.ts/d" -i data/translations/CMakeLists.txt || die
-	}
-	l10n_find_plocales_changes "data/translations" "" ".ts"
-	l10n_for_each_disabled_locale_do disable_locale
-
-	if ! use test; then
-		sed -e "/^find_package/s/ Test//" -i CMakeLists.txt || die
-		cmake_comment_add_subdirectory test
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_PAM=$(usex pam)
-		-DNO_SYSTEMD=$(usex '!systemd')
-		-DUSE_ELOGIND=$(usex 'elogind')
-		-DBUILD_MAN_PAGES=ON
-		-DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# Create a default.conf as upstream dropped /etc/sddm.conf w/o replacement
-	local confd="/usr/share/sddm/sddm.conf.d"
-	dodir ${confd}
-	"${D}"/usr/bin/sddm --example-config > "${D}/${confd}"/00default.conf \
-		|| die "Failed to create 00default.conf"
-
-	sed -e "/^InputMethod/s/qtvirtualkeyboard//" \
-		-e "/^ReuseSession/s/false/true/" \
-		-e "/^EnableHiDPI/s/false/true/" \
-		-i "${D}/${confd}"/00default.conf || die
-}
-
-pkg_postinst() {
-	elog "Starting with 0.18.0, SDDM no longer installs /etc/sddm.conf"
-	elog "Use it to override specific options. SDDM defaults are now"
-	elog "found in: /usr/share/sddm/sddm.conf.d/00default.conf"
-
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video
-
-	systemd_reenable sddm.service
-}
diff --git a/x11-misc/sddm/sddm-0.18.1-r3.ebuild b/x11-misc/sddm/sddm-0.18.1-r3.ebuild
index 9b168d277fe2..b2925b5571e5 100644
--- a/x11-misc/sddm/sddm-0.18.1-r3.ebuild
+++ b/x11-misc/sddm/sddm-0.18.1-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
 LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="consolekit elogind +pam systemd test"
+IUSE="elogind +pam systemd test"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="?? ( elogind systemd )"
@@ -32,7 +32,6 @@ RDEPEND="
 	>=dev-qt/qtnetwork-5.9.4:5
 	>=x11-base/xorg-server-1.15.1
 	x11-libs/libxcb[xkb]
-	consolekit? ( >=sys-auth/consolekit-0.9.4 )
 	elogind? ( sys-auth/elogind )
 	pam? ( sys-libs/pam )
 	systemd? ( sys-apps/systemd:= )
diff --git a/x11-misc/seetxt/Manifest b/x11-misc/seetxt/Manifest
index cc68f0df608b..b5705080fcdb 100644
--- a/x11-misc/seetxt/Manifest
+++ b/x11-misc/seetxt/Manifest
@@ -1,5 +1,6 @@
 AUX 0.72-0001-fix-linking.patch 1182 BLAKE2B 812fc30468d4ba59802660df6f2c7e8782e270010e2a47d55509683c1885766bc97e5ccec2ea8db874d8ce334b736999ccff9ccc1c6aa0277ba839a46a68a9be SHA512 c98c0bcd37475b187339a2b161b53005abcbe0aa5cf9533910bddb775e497099b20e95691197f5fcd1d872316b2882981c72a8b39cbbc0a4b3c7aac590781ad5
 AUX 0.72-0002-fix-shared-files-install.patch 1081 BLAKE2B 8fa5e2e94962d7c0686a9fa8e642b44cf862f3ce678ef3703d723fe90412fa94b98a03de3a043d046a58fa61e85b7159a95253bd89b1f718422b342c83220848 SHA512 9d3fd3ef0e18274fac97408045de72b64a91daa9246e728e74810e70eef33150acc7d62a1e3a2eea5ec21c61866f2e5312bc219b09b7445d852e68516d049620
+AUX seetxt-0.72-fno-common.patch 532 BLAKE2B 97d720deed426d943a602528157f0c3c2152d4194bc94c4b90f0dea8f2e4b42bd2c67ca40c36a157ae32f8c5011c84a19a8bdc21b78dba4cb996cc061d942721 SHA512 68278e84a749005299b63d6aa9e223ebc8e0205aa6cd2da6a5c8b856fa3b2a9f6583a137d65cfc59e1522df7141c3fc89e41414c32da7e8973876fef7d51cef3
 DIST seetxt-0.72.tar.bz2 141695 BLAKE2B 60d652b9099fb1b039c78142a90382f63cd71a9eedb687e23ef720db43e7e21cde6d6bfd4759eb38887e5db3cc33b87894b102da25ef88ac31e6cf53632ad623 SHA512 3d6e604e3ee8b0d382dcf60a507c54162eb28d5a9d61edc631a40a95f550276bf4e505ea37966a50d7f38ba952408d8d06b91bc71a8eb32322cb047a4ffc27ea
-EBUILD seetxt-0.72-r1.ebuild 767 BLAKE2B 9487fe23f9a1f7fc87ed62d2172412edce8f13f39e037079f439e59345a4177de3a31a8987fbe559e6f6fb850d91b0410f189ab48f0066278f7de3e85e6fb3f4 SHA512 57ae2bdd2a538d2300c5688b4d37f7782a4a78bb2dcf055eb7cabf2c489698776e3d12c3292f356238ee30607647dffd4d49f3028318fe5ca6bb0646092bf64d
+EBUILD seetxt-0.72-r1.ebuild 809 BLAKE2B 03550b9e6652b6bd816f1f141b80e126c51f60effe072be2ed4367177d707e6599e908c1931d0439054cece70486e53c0a05e2dc88877613ed8ed6c37571d917 SHA512 e689d4c47816f0ab5f01ec81c165cc2083d3c92d252e195444a752b6a41162c6e3efd58ac38d49311f7287cecb51818ed59ac8a8642384213bda7236d03b1352
 MISC metadata.xml 294 BLAKE2B e08046654c3172e703132f65821f0a5b0feed6f0d30b0960d0976ef322ea9382ab19cb3f768a3bf5d89f134086b4ae9824248e42b735338205b58d88acf96023 SHA512 11d125ca45f33597d1e0038c53ab2e4ce7d108a2da0bee40955e2295e4186f9e8bfb9118d738a8781395bc9c0614053a1797e4edc7171fbc75cbb63eea64ad4a
diff --git a/x11-misc/seetxt/files/seetxt-0.72-fno-common.patch b/x11-misc/seetxt/files/seetxt-0.72-fno-common.patch
new file mode 100644
index 000000000000..f1d69b20d42c
--- /dev/null
+++ b/x11-misc/seetxt/files/seetxt-0.72-fno-common.patch
@@ -0,0 +1,24 @@
+https://sources.debian.org/patches/see/0.72-7/40-fix_ftbfs.patch/
+https://bugs.gentoo.org/707402
+--- a/src/main.h
++++ b/src/main.h
+@@ -92,7 +92,8 @@ typedef struct {
+ struct matchspec {
+ 	int bgn;
+ 	int end;
+-} rgxp;
++};
++extern struct matchspec rgxp;
+ 
+ /* see.c */
+ void addtohistory (char *line);
+--- a/src/util.c
++++ b/src/util.c
+@@ -11,6 +11,7 @@ Public License along with this program.
+ #include "main.h"
+ 
+ char *EXDline, Me[64];
++struct matchspec rgxp;
+ 
+ int buflen (char *buffer) {
+ 	int blen = strlen(buffer), NofL=0, i;
diff --git a/x11-misc/seetxt/seetxt-0.72-r1.ebuild b/x11-misc/seetxt/seetxt-0.72-r1.ebuild
index a61c7e234474..db7394530239 100644
--- a/x11-misc/seetxt/seetxt-0.72-r1.ebuild
+++ b/x11-misc/seetxt/seetxt-0.72-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit autotools eutils
+inherit autotools
 
 DESCRIPTION="Clever, lightweight GUI text file and manual page viewer for X windows"
 HOMEPAGE="https://code.google.com/p/seetxt/ http://seetxt.sourceforge.net/"
@@ -12,16 +12,19 @@ SRC_URI="https://seetxt.googlecode.com/files/${P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PV}-0001-fix-linking.patch"
+	"${FILESDIR}/${PV}-0002-fix-shared-files-install.patch"
+	"${FILESDIR}/${PN}-0.72-fno-common.patch"
+)
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}/${PV}-0001-fix-linking.patch" \
-		"${FILESDIR}/${PV}-0002-fix-shared-files-install.patch"
+	default
 	eautoreconf
 }
 
diff --git a/x11-misc/sent/Manifest b/x11-misc/sent/Manifest
index 3605ab344577..434d471b5008 100644
--- a/x11-misc/sent/Manifest
+++ b/x11-misc/sent/Manifest
@@ -3,4 +3,4 @@ DIST sent-1.tar.gz 15285 BLAKE2B 97bd71ff355b51a809e62a0a0a6c602550adce2331d53d8
 EBUILD sent-0.2.ebuild 702 BLAKE2B 03b51aa2e154afdbd8c31d551f56e641720f714913647b6bf786d2f54e50637e31d5bc306b557c72c4834a20c5bff9b00f9c82496bce3e81cbf6ad38a52b40f4 SHA512 af2e3a329548c1e70b6cf0c27252f3b6e7e9176761e264bfcb19d41ec1621d82962e6d5931946105d9ccc6eedd55e2df4e04f321076b2eba37a26f2ab5b31c4f
 EBUILD sent-1-r1.ebuild 757 BLAKE2B 65268e220629350ab5a541f8726072e534d054b484e9ee4947f4c1d3e1e1c4a28fb05c08746adcfbd69f2036b46675e6d18f0a3a13c0c523d741d81cc866d8d3 SHA512 78dc5847a75e1a09c21f5aaeb56b0587d3594dcbe3a97bab470e3a5b4e60ff65a68371ed239320d194cf57636c6d29cd70914a2652f9fb80b33370efffc0f0ae
 EBUILD sent-9999.ebuild 737 BLAKE2B 11237d6702a9ec44a088397e363bb17ea954af778721e651bd6c4faf09976506e32c52c0acc2a745cce25eb4c5f32b4c66bd8b364d87f16682dfca411f92a24d SHA512 c7bd1af6fad3a4a59133d66faff93390576a7808310d7532fbb47dfbc2c5b4157163a1aadfbe34acd2019c570e3f0d10cc5e8c81dc080b89759796ff1352f8ef
-MISC metadata.xml 385 BLAKE2B da07e1a364f8d7bfab3b67f730b66f213d3be504a23f0ef4b724e021ca5e9475df65a68131a100d02d631f9572f5f3aede20cf6ddd755771e68433837f17309d SHA512 33686894bc0fd21279a825a7a505106da89f92a881c90b4e7ea1f6f1d7ce6632fa2976c211db3c6aeabc999146c863d193adb27b0fefee8b6fb0b536a613db26
+MISC metadata.xml 398 BLAKE2B 98f9081dfe5bc69e01624210e44a4b7f7374bec72119c4791dcaf6da25a2768577834a01c0bac317981bbbc8a716ece17235701854eb437387866d4329e5cf3e SHA512 3656f66ef7a5aabd5b95dce2d85d1b60577821a6b88f0d01a4ea7f30311832a6b09af6dd010c92ea39ceb41e9985258fdac46dfa9fb7c3adf2dd0c483b8bf993
diff --git a/x11-misc/sent/metadata.xml b/x11-misc/sent/metadata.xml
index 87b4ee7d7109..cd720d3d9cee 100644
--- a/x11-misc/sent/metadata.xml
+++ b/x11-misc/sent/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>jer@gentoo.org</email>
-<name>Jeroen Roovers</name>
-</maintainer>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
 <use>
 <flag name="savedconfig">Without a saved config.h, this package depends on <pkg>media-gfx/farbfeld</pkg> for image conversions</flag>
 </use>
diff --git a/x11-misc/shutter/Manifest b/x11-misc/shutter/Manifest
index 555df655b226..dba8f5de44b8 100644
--- a/x11-misc/shutter/Manifest
+++ b/x11-misc/shutter/Manifest
@@ -1,3 +1,3 @@
 DIST shutter-0.94.3_p20200621.tar.gz 2571420 BLAKE2B 0567d03d1b511f3bbe889ad6dda3bfa347dc69d96c7ab89368e6e97925d8d4cccb378ee0da179a65a482e6d22117aaff390088e7cac5d695edd3b8fee7c6a396 SHA512 3426b1cc475356cbcbcaba89e59e904907d61ceafb96b7d7994ff3d9a1fcb1f8151099a2361cd8de63b16fe02c1246f0cb50fb7166d666bc502f18e6fdda6d5f
-EBUILD shutter-0.94.3_p20200621.ebuild 2346 BLAKE2B 009de3fcbc7d2e119dfa4c4963d64e9552598637936389a7856a2977b3e326aac21bb12cbd217374937461240e94721cdb93ac61596298d4c2c2bdea0b04c691 SHA512 98cb52549fad1150d6c9d30fb45bb657c108be1c0206d64fd70ff643ac1f87082c7f3a020aae62da94623ab28c6e4386d04f42afa33161e8dc83b3bf96eb71e2
+EBUILD shutter-0.94.3_p20200621.ebuild 2344 BLAKE2B 8519e1ca1c0e45e8712ca98795bf24a65ea26482abd896d9c9fba923cee8c3a4363fe184c9ce68a759428dec94add0316c65ffadd14818352cf6302b2c11c7dc SHA512 1bbf7d90fc522878d9c9cb82bb9f83966e51be028adf8c1a7060d6e0619f9362b577314feb024583eed075c4a32b2a8b37476eb3e2f18dde51cd75fe51c2dde9
 MISC metadata.xml 373 BLAKE2B 1b254f3b91e248b37f243d85ca48527e68be76849f668d1918e57a454e1e9da0f899ea36805138e4c18164d91c44b6aaf6a75a46deb5b42af2aa2e1b17a679bf SHA512 9c42f1f7eea609dbd75eba9e5adf78b9f4f69a5966ad54de04cf355672357fe83f1a4f5d140d1701523d96279ca9c8c095dd796bf135a57339ef4d6939be615e
diff --git a/x11-misc/shutter/shutter-0.94.3_p20200621.ebuild b/x11-misc/shutter/shutter-0.94.3_p20200621.ebuild
index b50087351ae5..24c6be4534e1 100644
--- a/x11-misc/shutter/shutter-0.94.3_p20200621.ebuild
+++ b/x11-misc/shutter/shutter-0.94.3_p20200621.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${MY_COMMIT}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-lang/perl
diff --git a/x11-misc/slim/Manifest b/x11-misc/slim/Manifest
index 6a7ea7b5f39e..a61e44cd6d58 100644
--- a/x11-misc/slim/Manifest
+++ b/x11-misc/slim/Manifest
@@ -14,6 +14,6 @@ AUX slim-1.3.6-systemd-session.patch 820 BLAKE2B 39345e96a1dc2cfc7a94b874d5be4bc
 AUX slim-9999-config.diff 2480 BLAKE2B 11dcd073dd0cfb83e49bc545fde0190a2d733104a63b502822a7adb6b1ed21b2e227ab6ab6957e33741a3604852ff4164b106d64be039c779f2be5c23d06bd5e SHA512 6018c5eadd0c63e86b07ad8662ffc046fd1f586c101dc84bc9452295a9a11ed1a82a6a8a228bf8d5e064cc5d17b1bcea8662f957b831c96f8ba21c0f55a0d216
 AUX slim.logrotate 102 BLAKE2B 8b41d56746b9889ee7f13f3cef08f80532c0c58505061ce09262aa629af5ec77dc35278ce979c717cd53f6ba586c529201e0dca47a28044231bf2d0b9cd8f317 SHA512 b49ce2dc1a1943c5f8eea8e6394cc27b014832e2d9908220f32ffd21fbe69442ec45b18f6e435430c6cbed074e5983e2136ebade10218bb073bb13106716f5b2
 DIST slim-1.3.6.tar.gz 232547 BLAKE2B 3df58fa128cdf2b2ab005e8f41fccc076cfcf8adf7767075539f2b8edf51a92660b031837b3cdaccb261f1c1eb24104100317fd4e68ad0298242502d4e6bb506 SHA512 345b1dee5d6f0c3716dfa7c5c16274adbf18586bdaaa6af4f310e24c5a61f79a297ffac921a5ba545523317e9fe120916df226c36b9c9b49c2ac9c1ca21dee0c
-EBUILD slim-1.3.6-r5.ebuild 4180 BLAKE2B 1854668d624da2ceaf421f5cced0e11aa90a1e3dbbab2f1fb7f0527c82eb5ff0eb11bac630834f5d197d82c364dc8b1af85fc8b386d245618feb76b8c3f8ed05 SHA512 9356aab8785b8c6aa63e729772ba129bf828bcabe4df3e709e90c7e48f32330b95746de8551ce722afc357691bb474d3a026ed0bb8db1651be4b9e06ff0f3a69
-EBUILD slim-9999.ebuild 4008 BLAKE2B 2c3fa21ec5c16e4ecf5d46837d67799456f50d02ff919d4b2b39dd33a9c712b77a1e0a9ad2ea54bd9a6aed84959f233ff0473269bf3c5eaf93a27f77787f960c SHA512 68520716656b6f19d112bce9afed4f764b5d26fe200dbd763cad5f64af76a925375e88ca7da1d02f1a3a552d46add95bc723f3308171157413a59afdd82f23b9
-MISC metadata.xml 514 BLAKE2B 30f0fae6144c9bed109df03b4b77c25ddc0b2e8a69b8cecf08eb14ac3ecfa364d206d2b6832892e74986b28e293d51f51f6ae7102348d81f8a0f5594f8f95c94 SHA512 28f99f92bda5c50f97a164aa53915ecc458dfd84e6c3dbfb9dbfd6e64d0a98b7de9bfc202949506b2af91cb716a8b681f1db07b974d3d3776f15e2cdf5129950
+EBUILD slim-1.3.6-r5.ebuild 3827 BLAKE2B d945b687a7c1a18210f355afbfc0d8451b4b6da431c55827cc6a1d994e16236943ebb1b74cdbdb11d3bec47483958e9bd01573e591cef3daed9605c6e8c8b935 SHA512 807d4b74101b27495a0d930f8176fa091b008e9118d028bc4f471115bc33f2933ff8d8599a1f21d2884a68e832bda217b295d5a3f1613ce8df0bccd70ace09f6
+EBUILD slim-9999.ebuild 3664 BLAKE2B 9fe1f1efae07054d5b6a8be8fb95074d3979eac95b202c7c7ace7e3ee9d299ee3366fb2185014b50c509022073b8d909e00768232d402d248ccad51c43bd910b SHA512 4836465fd45a3bbf864890a4a35a8eb1d314a24bccd638d1e8162f9f2d68002401703f99c2773ace13459d0f5200892d510f0bb70bb792f6b9fbbf517f21752a
+MISC metadata.xml 296 BLAKE2B 32be4afe8f62ed7b8f735c21cd70f6f917208e75b2e0dbc953cf1ab25ff43b3c9d4f140beb5b4a49c00311abe6f80b7672cb5f0626539ffcc6c1fe76a59dcef9 SHA512 4c622a7f52bd12997f0fa95135ded68f5f23d2c8b6e7203afd68e57c4c0a849520314f407f69fe20dde03f4690a2fc982856d869fffa59f2b362767ccb4e19b0
diff --git a/x11-misc/slim/metadata.xml b/x11-misc/slim/metadata.xml
index 8f38f154c1b0..bce828f91d88 100644
--- a/x11-misc/slim/metadata.xml
+++ b/x11-misc/slim/metadata.xml
@@ -4,13 +4,6 @@
 	<maintainer type="person">
 		<email>axs@gentoo.org</email>
 	</maintainer>
-	<maintainer type="project">
-		<email>desktop-misc@gentoo.org</email>
-		<name>Gentoo Desktop Miscellaneous Project</name>
-	</maintainer>
-	<use>
-		<flag name="consolekit">Enable native consolekit support</flag>
-	</use>
 	<upstream>
 		<remote-id type="sourceforge">slim.berlios</remote-id>
 	</upstream>
diff --git a/x11-misc/slim/slim-1.3.6-r5.ebuild b/x11-misc/slim/slim-1.3.6-r5.ebuild
index 8b894dd5a563..49e2ecab88c2 100644
--- a/x11-misc/slim/slim-1.3.6-r5.ebuild
+++ b/x11-misc/slim/slim-1.3.6-r5.ebuild
@@ -12,8 +12,7 @@ SRC_URI="mirror://sourceforge/project/${PN}.berlios/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 sparc x86"
-IUSE="branding pam consolekit"
-REQUIRED_USE="consolekit? ( pam )"
+IUSE="branding pam"
 
 RDEPEND="x11-libs/libXmu
 	x11-libs/libX11
@@ -23,8 +22,6 @@ RDEPEND="x11-libs/libXmu
 	media-libs/libpng:0=
 	virtual/jpeg:=
 	x11-apps/sessreg
-	consolekit? ( sys-auth/consolekit
-		sys-apps/dbus )
 	pam? (	sys-libs/pam
 		!x11-misc/slimlock )"
 DEPEND="${RDEPEND}
@@ -64,7 +61,7 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use pam USE_PAM)
-		$(cmake-utils_use consolekit USE_CONSOLEKIT)
+		-DUSE_CONSOLEKIT=OFF
 	)
 
 	cmake-utils_src_configure
@@ -128,10 +125,6 @@ pkg_postinst() {
 		elog "/usr/share/doc/${PF} and change your login_cmd in /etc/slim.conf"
 		elog "accordingly."
 		elog
-		ewarn "Please note that slim supports consolekit directly.  Please do not use any "
-		ewarn "old work-arounds (including calls to 'ck-launch-session' in xinitrc scripts)"
-		ewarn "and enable USE=\"consolekit\" instead."
-		ewarn
 	fi
 	if ! use pam; then
 		elog "You have merged ${PN} without USE=\"pam\", this will cause ${PN} to fall back to"
diff --git a/x11-misc/slim/slim-9999.ebuild b/x11-misc/slim/slim-9999.ebuild
index 90753c4f0d6f..2a9801204240 100644
--- a/x11-misc/slim/slim-9999.ebuild
+++ b/x11-misc/slim/slim-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,8 +17,7 @@ DESCRIPTION="Simple Login Manager"
 HOMEPAGE="https://sourceforge.net/projects/slim.berlios/"
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="branding pam consolekit"
-REQUIRED_USE="consolekit? ( pam )"
+IUSE="branding pam"
 
 RDEPEND="x11-libs/libXmu
 	x11-libs/libX11
@@ -28,8 +27,6 @@ RDEPEND="x11-libs/libXmu
 	media-libs/libpng:0=
 	virtual/jpeg:=
 	x11-apps/sessreg
-	consolekit? ( sys-auth/consolekit
-		sys-apps/dbus )
 	pam? ( sys-libs/pam
 		!x11-misc/slimlock )"
 DEPEND="${RDEPEND}
@@ -59,7 +56,7 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DUSE_PAM=$(usex pam)
-		-DUSE_CONSOLEKIT=$(usex consolekit)
+		-DUSE_CONSOLEKIT=OFF
 	)
 
 	cmake-utils_src_configure
@@ -126,10 +123,6 @@ pkg_postinst() {
 		elog "/usr/share/doc/${PF} and change your login_cmd in /etc/slim.conf"
 		elog "accordingly."
 		elog
-		ewarn "Please note that slim supports consolekit directly.  Please do not use any "
-		ewarn "old work-arounds (including calls to 'ck-launch-session' in xinitrc scripts)"
-		ewarn "and enable USE=\"consolekit\" instead."
-		ewarn
 	fi
 	if ! use pam; then
 		elog "You have merged ${PN} without USE=\"pam\", this will cause ${PN} to fall back to"
diff --git a/x11-misc/slock/Manifest b/x11-misc/slock/Manifest
index c4f6334ee354..a29446238654 100644
--- a/x11-misc/slock/Manifest
+++ b/x11-misc/slock/Manifest
@@ -1,3 +1,3 @@
 DIST slock-1.4.tar.gz 6889 BLAKE2B 67f956fd00e7536a9db81b82e85e4128b537569d16cd25428822607a5c2f3b0310bcfec896f7e83c0091e85d21b68438f6f42da715a55cad7fac90d0d0d64b8f SHA512 ad285360dd3f16a225159abaf2f82fabf2c675bd74478cf717f68cbe5941a6c620e3c88544ce675ce3ff19af4bb0675c9405685e0f74ee4e84f7d34c61a0532f
 EBUILD slock-1.4.ebuild 1158 BLAKE2B 622c0554db008027c8f507bb0c35eae028bcb61d3c9be5a14c801a687b201e86b541b0d70a6b6ff1c0394b3de02e32ed221bc5e954e8361731c4362acd1a5324 SHA512 bbe9df6043f1bfbdb632ccc0c0a945aa7f43ce37015ecc32fd620753280c80df1e2c5ea54b40a5d3e8d6511366a346934e262976f38b9201ea0d6cf6118bbb36
-MISC metadata.xml 347 BLAKE2B 1f37fe6210fecce67b02a14defcc2510c14189876257d2a5419a50c00c237100dbc37dfff653434245e0b78daf7389121e34fe76aeaf7119280dc154f5dfc95f SHA512 5939bd8c1055a98efc2987fce141841116bb531301b8666d85c7018ff8fd0bcdb21d5fa8eb5d39ccb384666a3c53834700cfa442262624714a4633aa0ac49545
+MISC metadata.xml 251 BLAKE2B e9e9d48943645d8b737bc1f7ab0efb05db0f8eddad759c9bb40d07dc008fbfb8f5cca2020de71a9ff6945f5d66292ac02355773545010cd49c77fe6dd5ab7b40 SHA512 1b6a6955118c1a74cc89a77d6de9be8f4ff9c7137c186753462670a5b93457dfd034ad5d1f4d2507ac95cc149c2a042fa5324220b58702a56b09d91de40151c9
diff --git a/x11-misc/slock/metadata.xml b/x11-misc/slock/metadata.xml
index 807835d750ec..efcd58fe0b9b 100644
--- a/x11-misc/slock/metadata.xml
+++ b/x11-misc/slock/metadata.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>jer@gentoo.org</email>
-</maintainer>
-<maintainer type="project">
-  <email>desktop-misc@gentoo.org</email>
-  <name>Gentoo Desktop Miscellaneous Project</name>
-</maintainer>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/spacefm/Manifest b/x11-misc/spacefm/Manifest
index 7c393aa2272f..ade2b53d09d9 100644
--- a/x11-misc/spacefm/Manifest
+++ b/x11-misc/spacefm/Manifest
@@ -1,5 +1,6 @@
 AUX spacefm-9999-include-sysmacros.patch 192 BLAKE2B 6d5d99c7a49310833ff07f1c0ea93b3399e67e791241a1f56d2a4e1d796b79c3fdb2b38a11f06b508512ed0e565c43d20f988e31e333291d8942bb1d698984cd SHA512 9bc689f5d9e97ef6515ba6d475571ede0d4acd85bbe9c000e393eaf2caffa99807bd6172bb1e085b761bddad17417cef1e0530f289fb05152a6790307f8e1428
+AUX spacefm-fno-common.patch 2316 BLAKE2B 3f91d4eb0039a3b0e4ba3fe13b9d6436bd91beca0e224af7722d3fa2002e413c6e78cdb7f2eb690e2d58dda90638d896c8f186de8de544829a5bd0ff078b7a60 SHA512 02cd669d89080b5644adfa3092c452ebd3e6a1c39610ba96f5e49e23f3b6697996aa7e35709e46e6b8eb3fc73ff026cc9cf2c7183d4d867ef52e880fc33d31c4
 DIST spacefm-1.0.6.tar.gz 3498587 BLAKE2B fc4753ff370fa940ef5737bc7826558847dfbbbec43c1a150d887ed38655f9e45255a737f61a024318c9f37e86a15989da66c83d4dcf5a811603950009b20547 SHA512 37fc0dd31f02158502f592415b4c375ee49560af6f03d75b035d7c6c45bdc47064bba1ae8987b4cc8be2e02b3dfcdc17ec760411975e7b5f74343a2293fb2c8c
-EBUILD spacefm-1.0.6.ebuild 2565 BLAKE2B f5a2594fe00d590ce4f3dc927398d85ea74825c8c8ab061a7cf79b726a1cac3e562f3fc66329c4492cc451cdf43fed47a4b17a193b045b7cc393222b54285a5c SHA512 8fede0c02c8c71e6d3b59af9f288ed01452fde2d091d24d827c950a666e706b4b7461d16b05b2b7c9d078c1d2029320a8de77da4d77ce9e4305ac608dba9cb14
-EBUILD spacefm-9999.ebuild 2567 BLAKE2B 8583998e7a0dfbca946e0abdfaf909d8f4da5af6cc008a8ca5c769eb86988a9b899e248445ddb9bb6b8d38262232e6e8b3b52411c2bca2f438504aa6e8a96660 SHA512 bc3346341a2ba0f330f31caba18bf2434207d84d490b3f9ac2034452dba96540b6c8dd1fac147ac43e8a303e341b37c80077612d7fb4119c1487eefc21e69256
-MISC metadata.xml 1201 BLAKE2B 139db734d4255de23a02e7458adfd425682ef2241c6fc890ba6ad7d7ed79b7ea75d71a64ff0d40141dbd2429e59d580c873ded77e3e8cbd4efad0a1e80086126 SHA512 62587e98d0e230afee44fae4c33c985d8f1d5841579465c2dfca33d7f373700e10c964bb7ef89c640e35d49e7e29b7fd7b8b2a1961940959cef0a52266c0831d
+EBUILD spacefm-1.0.6-r1.ebuild 1932 BLAKE2B 37d44f70ae207d68ef3a95f24e7b5a492239a3cb02e8860c0a1b8df57a5812fcf75ff527c56169f4cb8590ef6fbeceeebdf955f2cfe9421924fb691081e4d0ca SHA512 b386d07854a5d568b2d48df2a3034c87c8d1032b9c58de4e053b1099e3a9db5f8f3d9a764febdb69528c71c1f232bb1b97ebc10755ee3a91727e941c88a5cc6a
+EBUILD spacefm-9999.ebuild 1932 BLAKE2B 37d44f70ae207d68ef3a95f24e7b5a492239a3cb02e8860c0a1b8df57a5812fcf75ff527c56169f4cb8590ef6fbeceeebdf955f2cfe9421924fb691081e4d0ca SHA512 b386d07854a5d568b2d48df2a3034c87c8d1032b9c58de4e053b1099e3a9db5f8f3d9a764febdb69528c71c1f232bb1b97ebc10755ee3a91727e941c88a5cc6a
+MISC metadata.xml 1073 BLAKE2B 3b14ed88b877532bc7d856e9ad7590207502695685a0ae303ff81dbefa177ad566a81762395a905302a7cdefa753f4428becfd2a6cd0a09fb8797e73fc047f08 SHA512 699c306adee51a68456e787fcc313a2232e95545cbee5d9b2b46a45da7823e166ffbc725356636692c47f78311c2fbf5fdabd4d2e5df3712451975b1bfc889a1
diff --git a/x11-misc/spacefm/files/spacefm-fno-common.patch b/x11-misc/spacefm/files/spacefm-fno-common.patch
new file mode 100644
index 000000000000..4cdc834a8277
--- /dev/null
+++ b/x11-misc/spacefm/files/spacefm-fno-common.patch
@@ -0,0 +1,86 @@
+--- a/src/settings.c
++++ b/src/settings.c
+@@ -52,6 +52,24 @@
+ /* Dirty hack: check whether we are under LXDE or not */
+ #define is_under_LXDE()     (g_getenv( "_LXSESSION_PID" ) != NULL)
+ 
++char* settings_terminal_su = NULL;
++char* settings_graphical_su = NULL;
++GList* xset_cmd_history = NULL;
++XSet* evt_win_focus = NULL;
++XSet* evt_win_move = NULL;
++XSet* evt_win_click = NULL;
++XSet* evt_win_key = NULL;
++XSet* evt_win_close = NULL;
++XSet* evt_pnl_show = NULL;
++XSet* evt_pnl_focus = NULL;
++XSet* evt_pnl_sel = NULL;
++XSet* evt_tab_new = NULL;
++XSet* evt_tab_chdir = NULL;
++XSet* evt_tab_focus = NULL;
++XSet* evt_tab_close = NULL;
++XSet* evt_device = NULL;
++
++
+ AppSettings app_settings = {0};
+ /* const gboolean singleInstance_default = TRUE; */
+ const gboolean show_hidden_files_default = FALSE;
+--- a/src/settings.h
++++ b/src/settings.h
+@@ -120,7 +120,7 @@ const char* xset_get_user_tmp_dir();
+ ///////////////////////////////////////////////////////////////////////////////
+ //MOD extra settings below
+ 
+-GList* xsets;
++extern GList* xsets;
+ 
+ enum {
+     XSET_B_UNSET,
+@@ -311,22 +311,22 @@ typedef struct
+ } XMenuItem;
+ 
+ // cache these for speed in event handlers
+-XSet* evt_win_focus;
+-XSet* evt_win_move;
+-XSet* evt_win_click;
+-XSet* evt_win_key;
+-XSet* evt_win_close;
+-XSet* evt_pnl_show;
+-XSet* evt_pnl_focus;
+-XSet* evt_pnl_sel;
+-XSet* evt_tab_new;
+-XSet* evt_tab_chdir;
+-XSet* evt_tab_focus;
+-XSet* evt_tab_close;
+-XSet* evt_device;
++extern XSet* evt_win_focus;
++extern XSet* evt_win_move;
++extern XSet* evt_win_click;
++extern XSet* evt_win_key;
++extern XSet* evt_win_close;
++extern XSet* evt_pnl_show;
++extern XSet* evt_pnl_focus;
++extern XSet* evt_pnl_sel;
++extern XSet* evt_tab_new;
++extern XSet* evt_tab_chdir;
++extern XSet* evt_tab_focus;
++extern XSet* evt_tab_close;
++extern XSet* evt_device;
+ 
+ // instance-wide command history
+-GList* xset_cmd_history;
++extern GList* xset_cmd_history;
+ 
+ static const char* terminal_programs[] =  //for pref-dialog.c
+ {
+@@ -374,8 +374,8 @@ static const char* gsu_commands[] = // order and contents must match prefdlg.ui
+ };
+ 
+ // These will contain the su and gsu settings from /etc/spacefm/spacefm.conf
+-char* settings_terminal_su;
+-char* settings_graphical_su;
++extern char* settings_terminal_su;
++extern char* settings_graphical_su;
+ 
+ typedef struct
+ {
diff --git a/x11-misc/spacefm/metadata.xml b/x11-misc/spacefm/metadata.xml
index 35fc0bff16f7..f5c9eb81f009 100644
--- a/x11-misc/spacefm/metadata.xml
+++ b/x11-misc/spacefm/metadata.xml
@@ -14,8 +14,6 @@
 		<remote-id type="github">ignorantguru/spacefm</remote-id>
 	</upstream>
 	<use>
-		<flag name="gtk2">Support GTK+ 2.x instead of GTK+ 3.x</flag>
-		<flag name="gtk3">Support GTK+ 3.x instead of GTK+ 2.x</flag>
 		<flag name="video-thumbnails">Support video thumbnails with <pkg>media-video/ffmpegthumbnailer</pkg></flag>
 	</use>
 	<longdescription lang="en">
diff --git a/x11-misc/spacefm/spacefm-1.0.6-r1.ebuild b/x11-misc/spacefm/spacefm-1.0.6-r1.ebuild
new file mode 100644
index 000000000000..b206e28490ad
--- /dev/null
+++ b/x11-misc/spacefm/spacefm-1.0.6-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info optfeature xdg
+
+DESCRIPTION="A multi-panel tabbed file manager"
+HOMEPAGE="https://ignorantguru.github.com/spacefm/"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/IgnorantGuru/${PN}.git"
+	EGIT_BRANCH="next"
+	inherit git-r3
+else
+	KEYWORDS="amd64 x86"
+	SRC_URI="https://github.com/IgnorantGuru/spacefm/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+IUSE="+startup-notification +video-thumbnails"
+
+RDEPEND="dev-libs/glib:2
+	dev-util/desktop-file-utils
+	virtual/udev
+	virtual/freedesktop-icon-theme
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/pango
+	x11-libs/libX11
+	x11-misc/shared-mime-info
+	startup-notification? ( x11-libs/startup-notification )
+	video-thumbnails? ( media-video/ffmpegthumbnailer )"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-9999-include-sysmacros.patch
+	"${FILESDIR}"/${PN}-fno-common.patch
+)
+
+src_configure() {
+	econf \
+		$(use_enable startup-notification) \
+		$(use_enable video-thumbnails) \
+		--disable-hal \
+		--enable-inotify \
+		--disable-pixmaps \
+		--with-gtk3
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "mounting as non-root user" sys-apps/udevil sys-apps/pmount sys-fs/udisks
+	optfeature "supporting ftp/nfs/smb/ssh URLs in the path bar" sys-apps/udevil
+	optfeature "performing as root" x11-misc/ktsuss kde-plasma/kde-cli-tools[kdesu]
+	optfeature "other optional dependencies" sys-apps/dbus sys-process/lsof virtual/eject
+
+	if ! has_version 'sys-fs/udisks' ; then
+		elog "When using SpaceFM without udisks, and without the udisks-daemon running,"
+		elog "you may need to enable kernel polling for device media changes to be detected."
+		elog "See /usr/share/doc/${PF}/html/spacefm-manual-en.html#devices-kernpoll"
+	fi
+}
diff --git a/x11-misc/spacefm/spacefm-1.0.6.ebuild b/x11-misc/spacefm/spacefm-1.0.6.ebuild
deleted file mode 100644
index f1c2cea9d53c..000000000000
--- a/x11-misc/spacefm/spacefm-1.0.6.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils linux-info xdg-utils
-
-DESCRIPTION="A multi-panel tabbed file manager"
-HOMEPAGE="https://ignorantguru.github.com/spacefm/"
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/IgnorantGuru/${PN}.git"
-	EGIT_BRANCH="next"
-	inherit git-r3
-else
-	KEYWORDS="amd64 x86"
-	SRC_URI="https://github.com/IgnorantGuru/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-IUSE="gtk2 +gtk3 +startup-notification +video-thumbnails"
-
-RDEPEND="dev-libs/glib:2
-	dev-util/desktop-file-utils
-	>=virtual/udev-143
-	virtual/freedesktop-icon-theme
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/pango
-	x11-libs/libX11
-	x11-misc/shared-mime-info
-	gtk2? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) )
-	!gtk2? ( x11-libs/gtk+:3 )
-	startup-notification? ( x11-libs/startup-notification )
-	video-thumbnails? ( media-video/ffmpegthumbnailer )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${PN}-9999-include-sysmacros.patch )
-
-src_configure() {
-	econf \
-		$(use_enable startup-notification) \
-		$(use_enable video-thumbnails) \
-		--disable-hal \
-		--enable-inotify \
-		--disable-pixmaps \
-		$(use_with gtk3 gtk3 "yes")
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-
-	einfo
-	elog "To mount as non-root user you need one of the following:"
-	elog "  sys-apps/udevil (recommended, see below)"
-	elog "  sys-apps/pmount"
-	elog "  sys-fs/udisks:0"
-	elog "  sys-fs/udisks:2"
-	elog "To support ftp/nfs/smb/ssh URLs in the path bar you need:"
-	elog "  sys-apps/udevil"
-	elog "To perform as root functionality you need one of the following:"
-	elog "  x11-misc/ktsuss"
-	elog "  kde-plasma/kde-cli-tools[kdesu]"
-	elog "Other optional dependencies:"
-	elog "  sys-apps/dbus"
-	elog "  sys-process/lsof (device processes)"
-	elog "  virtual/eject (eject media)"
-	einfo
-	if ! has_version 'sys-fs/udisks' ; then
-		elog "When using SpaceFM without udisks, and without the udisks-daemon running,"
-		elog "you may need to enable kernel polling for device media changes to be detected."
-		elog "See /usr/share/doc/${PF}/html/spacefm-manual-en.html#devices-kernpoll"
-		has_version '<virtual/udev-173' && ewarn "You need at least udev-173"
-		kernel_is lt 2 6 38 && ewarn "You need at least kernel 2.6.38"
-		einfo
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/x11-misc/spacefm/spacefm-9999.ebuild b/x11-misc/spacefm/spacefm-9999.ebuild
index 31647a6d0f80..b206e28490ad 100644
--- a/x11-misc/spacefm/spacefm-9999.ebuild
+++ b/x11-misc/spacefm/spacefm-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit gnome2-utils linux-info xdg-utils
+inherit linux-info optfeature xdg
 
 DESCRIPTION="A multi-panel tabbed file manager"
 HOMEPAGE="https://ignorantguru.github.com/spacefm/"
@@ -12,33 +12,35 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_BRANCH="next"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/IgnorantGuru/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 x86"
+	SRC_URI="https://github.com/IgnorantGuru/spacefm/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-IUSE="gtk2 +gtk3 +startup-notification +video-thumbnails"
+IUSE="+startup-notification +video-thumbnails"
 
 RDEPEND="dev-libs/glib:2
 	dev-util/desktop-file-utils
-	>=virtual/udev-143
+	virtual/udev
 	virtual/freedesktop-icon-theme
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
 	x11-libs/pango
 	x11-libs/libX11
 	x11-misc/shared-mime-info
-	gtk2? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) )
-	!gtk2? ( x11-libs/gtk+:3 )
 	startup-notification? ( x11-libs/startup-notification )
 	video-thumbnails? ( media-video/ffmpegthumbnailer )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/intltool
 	sys-devel/gettext
 	virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}"/${PN}-9999-include-sysmacros.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-9999-include-sysmacros.patch
+	"${FILESDIR}"/${PN}-fno-common.patch
+)
 
 src_configure() {
 	econf \
@@ -47,42 +49,20 @@ src_configure() {
 		--disable-hal \
 		--enable-inotify \
 		--disable-pixmaps \
-		$(use_with gtk3 gtk3 "yes")
+		--with-gtk3
 }
 
 pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
+	xdg_pkg_postinst
+
+	optfeature "mounting as non-root user" sys-apps/udevil sys-apps/pmount sys-fs/udisks
+	optfeature "supporting ftp/nfs/smb/ssh URLs in the path bar" sys-apps/udevil
+	optfeature "performing as root" x11-misc/ktsuss kde-plasma/kde-cli-tools[kdesu]
+	optfeature "other optional dependencies" sys-apps/dbus sys-process/lsof virtual/eject
 
-	einfo
-	elog "To mount as non-root user you need one of the following:"
-	elog "  sys-apps/udevil (recommended, see below)"
-	elog "  sys-apps/pmount"
-	elog "  sys-fs/udisks:0"
-	elog "  sys-fs/udisks:2"
-	elog "To support ftp/nfs/smb/ssh URLs in the path bar you need:"
-	elog "  sys-apps/udevil"
-	elog "To perform as root functionality you need one of the following:"
-	elog "  x11-misc/ktsuss"
-	elog "  kde-plasma/kde-cli-tools[kdesu]"
-	elog "Other optional dependencies:"
-	elog "  sys-apps/dbus"
-	elog "  sys-process/lsof (device processes)"
-	elog "  virtual/eject (eject media)"
-	einfo
 	if ! has_version 'sys-fs/udisks' ; then
 		elog "When using SpaceFM without udisks, and without the udisks-daemon running,"
 		elog "you may need to enable kernel polling for device media changes to be detected."
 		elog "See /usr/share/doc/${PF}/html/spacefm-manual-en.html#devices-kernpoll"
-		has_version '<virtual/udev-173' && ewarn "You need at least udev-173"
-		kernel_is lt 2 6 38 && ewarn "You need at least kernel 2.6.38"
-		einfo
 	fi
 }
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/x11-misc/splatmoji/Manifest b/x11-misc/splatmoji/Manifest
index 9dcd650bdfdb..2e1389457bd4 100644
--- a/x11-misc/splatmoji/Manifest
+++ b/x11-misc/splatmoji/Manifest
@@ -1,3 +1,3 @@
-DIST splatmoji-1.1.0.tar.gz 4329417 BLAKE2B b36f4e338b44afef9865b1a1e200f03a64aadddc0ad6049534d4c5029ffc2408d0b665276fe8c8af9c8f24ccdf4b71dd8d26aa000c75d3c1f07798a5d006d304 SHA512 0c8697ec58cf011d6000d46dc9dae3507708c1c9caf3d184a1018d37f7ca4df071800689b2bfda4c3908dba13f762d9ffee4212a06318b26e5ffaf93429458c0
-EBUILD splatmoji-1.1.0.ebuild 616 BLAKE2B 919cfcecdfc19dab68543e73c7061ecbd48b36f640142a85709b2a524ab3305143d166dbd3c1f7a022c5e1d384b7dd73962812785383fce890694d07500f92ed SHA512 0d29a163bafc867266f529adc4acbb0b8fffaa79796f29bc6c4aa4b7b481fa49f4306d6bf06e6987468e5136aeebc6ddd70ff871abc1929786b06c7012dcaa07
+DIST splatmoji-1.1.1.tar.gz 4329965 BLAKE2B 6c9958bc8448d4e1c84358a7631d9b69c6d38cfedf42c86b5b220e0c380c5080de6653698ede6564817fcfd3d9e68603bd472ad43473c528580176baf7735d81 SHA512 d283d633ec9ff6a3345918518aabe72af56ab5bc71991e7324f85d5eae4ec078ca6a5f6aafbd8b8ebad0cb9fb18f15d68eca5662a4c895aa615d851d9c7ed845
+EBUILD splatmoji-1.1.1.ebuild 616 BLAKE2B 919cfcecdfc19dab68543e73c7061ecbd48b36f640142a85709b2a524ab3305143d166dbd3c1f7a022c5e1d384b7dd73962812785383fce890694d07500f92ed SHA512 0d29a163bafc867266f529adc4acbb0b8fffaa79796f29bc6c4aa4b7b481fa49f4306d6bf06e6987468e5136aeebc6ddd70ff871abc1929786b06c7012dcaa07
 MISC metadata.xml 612 BLAKE2B ca9e33ad1b59ef01ed77aa8c09053544b1e184009bf499fa105ce7cf23d87baa2943b44549f27c77e02f2f4fd58dbfcbbf8412b06d6364df3d45404f256fc231 SHA512 8a2e21d68bb4e70b8899c91f2a47276808130f57037d91373356077643c653736639e72f24c2c6aba0f8154f3dfe636b9eedeb5b8d16108e767f066a89b1c21b
diff --git a/x11-misc/splatmoji/splatmoji-1.1.0.ebuild b/x11-misc/splatmoji/splatmoji-1.1.1.ebuild
index a8bdeaded1fb..a8bdeaded1fb 100644
--- a/x11-misc/splatmoji/splatmoji-1.1.0.ebuild
+++ b/x11-misc/splatmoji/splatmoji-1.1.1.ebuild
diff --git a/x11-misc/sprop/Manifest b/x11-misc/sprop/Manifest
index cf28c4909a27..5e1028eec458 100644
--- a/x11-misc/sprop/Manifest
+++ b/x11-misc/sprop/Manifest
@@ -1,3 +1,3 @@
 DIST sprop-0.1.tar.gz 2750 BLAKE2B 623a8668c49ef2e60398113bd49e036377bdd670a00c6bb5374fd106cd2757532ee2ce46f3d51e0ffef380d70c121733aa5df5a72db6abbdb6b202d9d10e2192 SHA512 74f918b2bbf627e269a674cabd8c4c26192ba67a7240061c0f0f6ddc8e86c32aff83352f2b2f4a2c6b2fcf7245cb1293ae98a2e7bd6189d632e20aa603764ddb
 EBUILD sprop-0.1-r1.ebuild 747 BLAKE2B 7bd1059bba3bd735ee1d64a0e8d0c5b324887f123df48da1d18028a6cc9e308c8c56aa9c607c11c96ca400472cf77e22b3d9bbe60b58386ff5261d53aa1f8c34 SHA512 859e3476c5119df6edccf2d420bb6308238deb3b34fda3a1f67e6336a1a0dbd96513c7072184f0b102f880b3775efd908f28221ed3da5efdb014a578a5ca07e8
-MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
+MISC metadata.xml 251 BLAKE2B e9e9d48943645d8b737bc1f7ab0efb05db0f8eddad759c9bb40d07dc008fbfb8f5cca2020de71a9ff6945f5d66292ac02355773545010cd49c77fe6dd5ab7b40 SHA512 1b6a6955118c1a74cc89a77d6de9be8f4ff9c7137c186753462670a5b93457dfd034ad5d1f4d2507ac95cc149c2a042fa5324220b58702a56b09d91de40151c9
diff --git a/x11-misc/sprop/metadata.xml b/x11-misc/sprop/metadata.xml
index a8fb43312942..efcd58fe0b9b 100644
--- a/x11-misc/sprop/metadata.xml
+++ b/x11-misc/sprop/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>jer@gentoo.org</email>
-<name>Jeroen Roovers</name>
-</maintainer>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/sselp/Manifest b/x11-misc/sselp/Manifest
index 4120837dfa58..f92f55630b86 100644
--- a/x11-misc/sselp/Manifest
+++ b/x11-misc/sselp/Manifest
@@ -1,4 +1,4 @@
 DIST sselp-0.2.tar.gz 2562 BLAKE2B e41b68931f7f386a57b13f08c4617fa84621bbd9ea7d8837adda3899ae06077e605382b1f58132afcb4ff24d9d55842c5012bf44970410db06ae0098c00a1e5a SHA512 f53163bd6bf257ef912d23dd813690a6a8700344bcc3caad73556917f12e76364b6ebc9bd11224fe8f4013d83518459440f113a313fc9721de2a124277270044
 EBUILD sselp-0.2-r1.ebuild 705 BLAKE2B 6a0e2fd1f38620e9445a6d605cf5e3071f8925d13ab630d5f1dc71c96f84d4fbd32cba85b688b261a13df5e3633a66b273b81983ed5879b47b9bb7f7c29f41bc SHA512 c37002e20983f739883e926f2eebc640205116f6a58e57efafa34b03bd2589f9de125be9c733a43b0d0458aa8c5ca2711ae2e06d7950da378970dcb5fc748e74
 EBUILD sselp-9999.ebuild 681 BLAKE2B cfb215fed644d4e1282731d0534beda8959d45aaa2fd328601ecf6159fbac4c4fe9f4a657eab4f24a442bab47cbd3118dfbe8e99e6ae1b3727985b44f906defa SHA512 7b9c9e64b24bfa1fd1cd55a53d24c785c365f50c56e517c2b2e788baed42fb3ff2f5cf771763035d23cbfdef630ead42a568280734b50c42da87b1fe377e5919
-MISC metadata.xml 369 BLAKE2B 229857fc781778834cf45f22a8a170e76bc50c7aa24caca6ed93e4f1510bb577b8153ed419821ce78edc0049b97d677ed8371ba2517c9f60759812e087a15886 SHA512 9c2113536cbda45e66eb5697ac4c173ff301a7692c7f3bafead7e5bc7e30778535dbd9dc8ee494ced840a2f17e6b1674c95418772fbffda61eb11848ef368b9d
+MISC metadata.xml 270 BLAKE2B 780ba5d2c4f595f1085effa53d87e111cda6336ec0e8460af1a734d077dea28a5e0f0ef1b281b4952a2d7e48595d78291fb017576678e00451a80b6d2617e7b3 SHA512 6ab18ca844b069acae5ffdde162b9e431e7bcee147fd07e4cd1810e9c73f306ccc0a9b29dcacbef1cc4a1715655b9048572fb25bd19bbf12ceea7ac2b4393609
diff --git a/x11-misc/sselp/metadata.xml b/x11-misc/sselp/metadata.xml
index 229dd61feac9..7f81a451ce19 100644
--- a/x11-misc/sselp/metadata.xml
+++ b/x11-misc/sselp/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="person">
-<email>jer@gentoo.org</email>
-<name>Jeroen Roovers</name>
-</maintainer>
 <maintainer type="project">
 <email>desktop-misc@gentoo.org</email>
 <name>Gentoo Desktop Miscellaneous Project</name>
diff --git a/x11-misc/sux/Manifest b/x11-misc/sux/Manifest
index 23494e2c6cf3..c8a9f58020ee 100644
--- a/x11-misc/sux/Manifest
+++ b/x11-misc/sux/Manifest
@@ -3,5 +3,5 @@ AUX sux-1.0-xauth-and-home.patch 1677 BLAKE2B 873b36cfb2688ec0f5c78b78eecea08891
 DIST sux 9403 BLAKE2B 26df0f3759b4f4f70479d1532459e3e04da05098045bed7b1066a89f6c636a1200f28866c7ba251d54c24d621b658686889f2306ed797719dfb95a55fb7b3430 SHA512 cf1afb736299e349a14837f89f0feb6a5beb1af35be8e6baef74d03e7278a9d9c331d2759ec21e5cf8b43197734f96464b82ff5904968428bc43a45d2ad0c598
 DIST sux-1.0.1.tar.gz 10614 BLAKE2B f22005a76194ff483ec24ad6ca1d92190fa9f2dbeabb96ad0343b06658b2bc2498e502e167e67df9ed335c74120b443e3daa31530aa18c615416d8464d758a5c SHA512 f121f70daa9e341ae636361675b1c73e3bb5c3f2301b93b32155c79175b3639d307b8fb0b63fbd51d98b6f3ae6c4530c0991343e86f95192a523a9a08a6048f3
 EBUILD sux-1.0-r4.ebuild 588 BLAKE2B cf275e279487c1340f0a291e44085a65229b21207a049bc05308e7bb5d60e604d9f6397cae1f0445ff3220593c1d6d6fc9cc15b4c45e931a1e1f036fcd590228 SHA512 d15931eaf95ffe014ea87d5b348dc7d0c4fd03b16a9bed22a7365b5a967c559ee8e7ad370f3513e529d4f8eca4e8485816e8a98b7d90e161e496e1264df506a5
-EBUILD sux-1.0.1.ebuild 587 BLAKE2B 7e604e215641c1c8609bfb33297bd6a844f3a3c5c72e7e246c60cc251cdce155815107b5967e54ae20ec669943a2d6cf2b76e69caec3ca19199b6822fadbe292 SHA512 ba8e51ce68903dab21e73a6dff13cd1678f99aa536748e7e12875632d80744ebc258a33e5f0be8dd6c0e680f328e70de97d1dc8e79abe2114bc420500d501da4
+EBUILD sux-1.0.1.ebuild 586 BLAKE2B df4ab630e0fc04549878c7d67fde5839a09117ae38e8fae590e4193cd54da6c2e08f4aad07674b30e07089511dd476301aab3662ad9cdd42c1ea6cb3e4ea423f SHA512 1557f3485cdaa2ff3c3fd6528d4be242fb7068448723f402b7cadb46f22dcf484e9d6483a4dfb83d95e3d5304dae56fb93822df93fe9cd4d1b3fa4f745b372e7
 MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
diff --git a/x11-misc/sux/sux-1.0.1.ebuild b/x11-misc/sux/sux-1.0.1.ebuild
index 8619606a8840..9c84c56d3da9 100644
--- a/x11-misc/sux/sux-1.0.1.ebuild
+++ b/x11-misc/sux/sux-1.0.1.ebuild
@@ -17,7 +17,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.0-xauth-and-home.patch
 )
 
-
 src_install() {
 	dobin ${PN}{,term}
 	dodoc TODO
diff --git a/x11-misc/sxhkd/Manifest b/x11-misc/sxhkd/Manifest
index 5844f4315422..0560939c0d99 100644
--- a/x11-misc/sxhkd/Manifest
+++ b/x11-misc/sxhkd/Manifest
@@ -1,3 +1,5 @@
 DIST sxhkd-0.6.1.tar.gz 34808 BLAKE2B b25ff934d0a7f28b3950152ef800da90c5f990f2efd92e9178fef8a77939dc1ed1bbde55bb5a990c33fd3d0be7490dfb2e799ca56abf3c3c6f20c258169eb100 SHA512 d8cd6166ff7e7bc800ed79c5d63cbdfad4f9824c5a5e19b6a315b2ec570295150600651376265932f5fde8b6127f629a553337c6454a1c78c62b3395aaeb55a2
+DIST sxhkd-0.6.2.tar.gz 35711 BLAKE2B a1dc409314dda68aa3df99bf584d20e492c7220dceb188b844a6bd9374a4c52b7e1a406b96fc77276498db86dd5e5114a50357ddee660f5f08d6fe974de8f990 SHA512 3f758aec3de76c6336a9008e997317ed7a05db0fcd81025d8f856694c2b8162022e25d9a48876de99056748a2dbe6a561a0e1594973c854ac2c98d44af6b03aa
 EBUILD sxhkd-0.6.1.ebuild 617 BLAKE2B 855913b42866ff8bac062f42d6215bf60b95ff76b120c795fc9288cb0e5719ca647b8668e0afcd7750a7e4be93a6e2a3b3c94e330b1fa1f61490256304656046 SHA512 4a31ec97909773124d3fb04bf3b704b232c09d3f0221a4e1e25eb2ef24f2052b5fb7e19d96b3f2bc1fc41ece9e7e1debb3a13f7af9dff87bd681437b977eee38
+EBUILD sxhkd-0.6.2.ebuild 639 BLAKE2B bc97ad09dd25bc22a8c158aadfb61098082ca2d1e1ab0f5bc94714bb96914bf4c8bbcfb129683e04bc9a7783f418a10e6429b42d669d34aea8332f8703e4131c SHA512 9dc4db7bde068802e3864b49aa2ef095993b3b8a9b104c8127c1c3102ce1ca1a050431922f9f2498b19870ee890407947611db65b29f47f82a438a38bb697f2b
 MISC metadata.xml 327 BLAKE2B 2f3ca988674ff92fd3295c19c9ea30c7d55f1ca7527a5a92a677c4eaaa8d1030dad4acf3589ea9c6d1d81499abc74d8d125a915e02b108bbab8b38d56023a671 SHA512 ccb2545217cf7ca34ec62c6b1c41aa02209bfa8d4d2dcced53df8755850c109ffeefb1a1b7c3824efe1de28778cdfa4460ba22e08d58bab795817390231061fd
diff --git a/x11-misc/sxhkd/sxhkd-0.6.2.ebuild b/x11-misc/sxhkd/sxhkd-0.6.2.ebuild
new file mode 100644
index 000000000000..81ef00356ead
--- /dev/null
+++ b/x11-misc/sxhkd/sxhkd-0.6.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs systemd
+
+DESCRIPTION="Simple X hotkey daemon"
+HOMEPAGE="https://github.com/baskerville/sxhkd/"
+SRC_URI="https://github.com/baskerville/sxhkd/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="x11-libs/libxcb
+	x11-libs/xcb-util-keysyms"
+DEPEND="${RDEPEND}
+	x11-libs/xcb-util"
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr DOCPREFIX="/usr/share/doc/${PF}" install
+	systemd_dounit contrib/systemd/${PN}.service
+}
diff --git a/x11-misc/tabbed/Manifest b/x11-misc/tabbed/Manifest
index c7961fc7db87..455c0b2a959a 100644
--- a/x11-misc/tabbed/Manifest
+++ b/x11-misc/tabbed/Manifest
@@ -1,3 +1,3 @@
 DIST tabbed-0.6.tar.gz 12926 BLAKE2B e92e2c7132f7a760286c61c99faa0b26e411326e172c231f3354e61f8151f561babd4a35998bc06cb7fd87dc962334ef0ddac78ba284cd3090bb1c2dcfa159be SHA512 bcad873251be6b5de21311531e8d24330003b42790cb94d559a0d1be45408b3e0722c14e7c7f2cefd0717fd2a2d7a100fa08fc4e10e7bb669935909602286553
 EBUILD tabbed-0.6.ebuild 951 BLAKE2B 167bd1473eb06e409dfef30a16cba6e3ff710f2b277a649ff28db7b22ae5c0ca8fc539814663383d7b49a604ff71807cc24369520937069c07f0290b5cdcf82b SHA512 b46557e4ddee419d7b7229861984e77fdbabe7041d970401a176da572f5477cf0cafc6c2eefcb1659f45cb80835058081c30ba2c6e0b667f332fc0eee5023664
-MISC metadata.xml 369 BLAKE2B 229857fc781778834cf45f22a8a170e76bc50c7aa24caca6ed93e4f1510bb577b8153ed419821ce78edc0049b97d677ed8371ba2517c9f60759812e087a15886 SHA512 9c2113536cbda45e66eb5697ac4c173ff301a7692c7f3bafead7e5bc7e30778535dbd9dc8ee494ced840a2f17e6b1674c95418772fbffda61eb11848ef368b9d
+MISC metadata.xml 251 BLAKE2B e9e9d48943645d8b737bc1f7ab0efb05db0f8eddad759c9bb40d07dc008fbfb8f5cca2020de71a9ff6945f5d66292ac02355773545010cd49c77fe6dd5ab7b40 SHA512 1b6a6955118c1a74cc89a77d6de9be8f4ff9c7137c186753462670a5b93457dfd034ad5d1f4d2507ac95cc149c2a042fa5324220b58702a56b09d91de40151c9
diff --git a/x11-misc/tabbed/metadata.xml b/x11-misc/tabbed/metadata.xml
index 229dd61feac9..efcd58fe0b9b 100644
--- a/x11-misc/tabbed/metadata.xml
+++ b/x11-misc/tabbed/metadata.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>jer@gentoo.org</email>
-<name>Jeroen Roovers</name>
-</maintainer>
-<maintainer type="project">
-<email>desktop-misc@gentoo.org</email>
-<name>Gentoo Desktop Miscellaneous Project</name>
-</maintainer>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/util-macros/Manifest b/x11-misc/util-macros/Manifest
index 0f420192d4aa..694578223b5e 100644
--- a/x11-misc/util-macros/Manifest
+++ b/x11-misc/util-macros/Manifest
@@ -1,3 +1,4 @@
+AUX util-macros-1.19.2-CPP.patch 1103 BLAKE2B 19ea2f1ca56daa27a8949566337305b383f3e1481e9a2bd8046a05188eff00a8a89dcefc30598ceb2a0641c99bf1c6bf13bbcf55e894767cc77e9b897154c47d SHA512 572f64b4a1fc2989f1fbe969c070f19312c90d7f5c4d3fd98bd749f8024a2e21a1a43ae2520e2bbbe7c9b74f76b55615e3618ca7f700837d6d8fbd574775cf26
 DIST util-macros-1.19.2.tar.bz2 84139 BLAKE2B 94eeeca771042671c6915c562e055c8b965f874c3a5aa1c8107abe38ca984ee32293f68a51ca73d65ac82d245dec6e02ddd62939ab14aee12b4b6fbf350b8c39 SHA512 3f51504b27f0478c136126f15110cf3cdbba218c4d74a8e974cca1381c6e8364609bd0c444f2fb19aa86a7f4e848dfce4f4da940463b224036f75a60b3d88619
-EBUILD util-macros-1.19.2-r1.ebuild 717 BLAKE2B fe4f82c7c5583455f25b286236c0a77ca1cc9f96636a566b39a0a1fb3441aee054ee66125ca250e21ecdc06a0f17afd682ef25bdc4c1f2fae78f2d7936ccdcbe SHA512 ddd5dddec1ab2dcd226b6dd43423c83e4c763c99b79ec661fd11d750daa08374eb701a7b949edc9e410a433dd857dc7234f507ab0e16216f36bdfc8cd433737f
+EBUILD util-macros-1.19.2-r2.ebuild 752 BLAKE2B 949a81950949fa68bdda6f73a955d2eacc684807164837dc27bb604f921158752e4ae2363022819609d8fb5381e3c84168338dfd1874478c8e993e41b60e8b34 SHA512 f0abd0adac3913bf44fcbf168a8bfb557d1c5e95890733b2f6a89a42e5f4ad5667e8dc6ea153976310310f857b389ecc1016fac59eb8da973aed2b64c835e4f5
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/util-macros/files/util-macros-1.19.2-CPP.patch b/x11-misc/util-macros/files/util-macros-1.19.2-CPP.patch
new file mode 100644
index 000000000000..e6cbee98d11c
--- /dev/null
+++ b/x11-misc/util-macros/files/util-macros-1.19.2-CPP.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/726130
+
+From bd66ce3ba4a9d1d1490cb5775a2fdd0b408879b6 Mon Sep 17 00:00:00 2001
+From: Marvin Schmidt <marv@exherbo.org>
+Date: Fri, 27 May 2016 15:13:56 +0200
+Subject: [PATCH util/macros] XORG_PROG_RAWCPP: Use AC_PATH_TOOL to find
+ preprocessor
+
+On some distributions tools like cpp are prefixed with the host-triple,
+to check for this prefixed version first AC_PATH_TOOL should be used. If
+no prefixed cpp, it will fallback to the unprefixed name.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=96257
+
+Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+---
+ xorg-macros.m4.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/xorg-macros.m4.in
++++ b/xorg-macros.m4.in
+@@ -57,7 +57,7 @@ m4_undefine([maj_needed])
+ # such as man pages and config files
+ AC_DEFUN([XORG_PROG_RAWCPP],[
+ AC_REQUIRE([AC_PROG_CPP])
+-AC_PATH_PROGS(RAWCPP, [cpp], [${CPP}],
++AC_PATH_TOOL(RAWCPP, [cpp], [${CPP}],
+    [$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/lib])
+ 
+ # Check for flag to avoid builtin definitions - assumes unix is predefined,
+-- 
+2.27.0
+
diff --git a/x11-misc/util-macros/util-macros-1.19.2-r1.ebuild b/x11-misc/util-macros/util-macros-1.19.2-r2.ebuild
index 26b75243fcd4..81fcaa3a9e9a 100644
--- a/x11-misc/util-macros/util-macros-1.19.2-r1.ebuild
+++ b/x11-misc/util-macros/util-macros-1.19.2-r2.ebuild
@@ -10,7 +10,10 @@ SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
+
+PATCHES=(
+	"${FILESDIR}"/${P}-CPP.patch
+)
 
 # there is nothing to compile for this package, all its contents are produced by
 # configure. the only make job that matters is make install
diff --git a/x11-misc/vdpauinfo/Manifest b/x11-misc/vdpauinfo/Manifest
index 899dfe274c90..ef4afb3ee4f3 100644
--- a/x11-misc/vdpauinfo/Manifest
+++ b/x11-misc/vdpauinfo/Manifest
@@ -3,4 +3,4 @@ DIST vdpauinfo-1.4.tar.bz2 11811 BLAKE2B bf0c268505b8eafb9da7c799518296498f2c04b
 EBUILD vdpauinfo-1.3.ebuild 579 BLAKE2B bd17879fe0cbb595de06b973bce5ead8f0443d8d993a2626cefc6651259589cf25c3f795a40634c04cc67bd6dba98c714b2fdff927dc66f505f1f94e1aef5c3b SHA512 b2616a840b284e040fcbc84d067b54be3bf771f0efa6da92a63f2d4fb7379c8fee047b79c38fac6c721a95d86d0afba95c794548e95dac8df028093e5257dfb8
 EBUILD vdpauinfo-1.4.ebuild 538 BLAKE2B b9e696012b6ccf8c49187ce9055f031230f63d200902e86c4e7d82ac8d14108ef687753fbb11fee476338602156213a9c61fe69672a7e0b6a625b54b946e6523 SHA512 7b6786c616e0aa71cc9d9ba4b7f2233de172dcfa6bbeda8e9d356f092d3f6105158ec17568e9d3d2d86c0830b5f3b3d59b8f402a2042798006725e5aba08207e
 EBUILD vdpauinfo-99999.ebuild 515 BLAKE2B 787c16d503300c983ca2da1eab61967a5bc2d986cf0fd969906345ae144da3e62eea7da3c4a318775271a9694be858bd5d70def0f956923d53de337432869bd1 SHA512 d65b62f29237d55d5ac6d2cc8a0965b67def68c5ea52a71c28514926bc6fdf53b7ba8781b50469a3e8eb92f16199120b6a909d0700179a6ef033f7d8c846ccad
-MISC metadata.xml 210 BLAKE2B 5fe5983d28e12b1e05d7cdaea69fdd87becfb2dd9a9b0353caab5f617a2f806227181e7100f623c8c814be524625c2739db8a93226b35b3cd9ec6d72db9895e6 SHA512 267d83ef7ae9579f44c22fe568d6d2064e426acdd07c00a69c735801e588ae0fb1988ae60199e349d444ddb5393a6a0a6836df89b2205fc85e25144ecbf56148
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-misc/vdpauinfo/metadata.xml b/x11-misc/vdpauinfo/metadata.xml
index fed47a353275..6f49eba8f496 100644
--- a/x11-misc/vdpauinfo/metadata.xml
+++ b/x11-misc/vdpauinfo/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type='person'>
-<email>jer@gentoo.org</email>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/x11-misc/vym/Manifest b/x11-misc/vym/Manifest
index 389034b842db..a3457e6fb744 100644
--- a/x11-misc/vym/Manifest
+++ b/x11-misc/vym/Manifest
@@ -1,4 +1,4 @@
 DIST vym-2.7.1.tar.bz2 6718924 BLAKE2B d7be8f2d40cedabb1bfaa3b89aac64de5e579f56ebfd757c22d4393ee712c4c4f5bf4747037683e4c6640ab0556ce4ef34bac5b27ecb747a15e58443d57f229f SHA512 985dbf18f743c36b484050ae24e4392eeae701c6c72fca6bd3dc5b70b38a283211946e279804c66253b5a394a642683ca4e3a66a7288400a9193fbcbfd8c9582
-EBUILD vym-2.7.1.ebuild 1429 BLAKE2B d3ee61a8cafb79ccb70ed2713181ee5f12c7b1b13f13a2a965b728a4344397c4c8207bb183e0efc4c98f97ec765bca2219604c671562f7e7cf01bf59beb07829 SHA512 a057035a887357c453e2eac96c6f8772b0d5854d5b80e1163a3392ee0b23d6deecdc0b6b28648d9ea55dfd98e6b29fd5e85a39aa0c7a7827baadbafcabce587b
-EBUILD vym-9999.ebuild 1388 BLAKE2B c49fcb6d039410cdbc29537fa2a206dc2b2f61fa0a0779ae885a1a8cd23d65f937b5ba5a8a9838f363ae17031feffd72f7fb7343725c168ec6e093ab35cf9808 SHA512 d612a14413c47864ddffeb4aba5c4e52f67581a2e90aeff352002a4ed6e50a4abf755cbe37b39367dd93af427ea5fb390a776a43198988979bd40aa3298eba47
+EBUILD vym-2.7.1.ebuild 1475 BLAKE2B fb407bfa0e3656b239c015cb6c5352026c7a9788c3c61d9639d4ebb6a567908a81972ab3c83c34f9b400106530618426958ed82dfc7eb505499da1e7c755d522 SHA512 1c9961efe8d0954fb2c80f42ca37581a8b23bca5023d45aee12ca398671f2953c49d55b6224309d74da5801af3df0932b6c2cde3f5da374f4ed9bc318f33ee49
+EBUILD vym-9999.ebuild 1441 BLAKE2B c6e3fa76d8a9ae59fb3553ad74ab98ef9e87908bcb2b4d1de9ba04e8f5411b82a7a2dd48b84e7dcbe6f6e4b09d50aff8e07ef2c62e4b2d1ee57ff139da2fee37 SHA512 fdd28c46a845a188323c6a184da99ba9966ff6ae11bf455796416b3228219b90042a266153c29a2d553362a01e4110c7294a1452dee0f330da1900752af1d326
 MISC metadata.xml 349 BLAKE2B 2cddfba3480871cb020e1ea5ac3c8af1f0c5be07b9e41880fbf5a36301cd283e941e8c7d8ac47dc27613364e2a003784811c721d31ce2c768d83ea7d86dd2982 SHA512 968e3560ba95072811086fd007ec5397467a9e520ec3bb368c7c3617b94d222fbb3c3929b5b9694e1bebc6af9e736dd17a43321e38e1999c562192687561cca9
diff --git a/x11-misc/vym/vym-2.7.1.ebuild b/x11-misc/vym/vym-2.7.1.ebuild
index 7dec5336b1ef..1635a0a689ac 100644
--- a/x11-misc/vym/vym-2.7.1.ebuild
+++ b/x11-misc/vym/vym-2.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,6 +15,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="dbus"
 
 RDEPEND="
+	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtprintsupport:5
@@ -25,6 +26,9 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
+"
+BDEPEND="
+	dev-qt/qtcore:5
 	dev-qt/linguist-tools:5
 "
 DOCS=( README.md doc/vym.pdf )
diff --git a/x11-misc/vym/vym-9999.ebuild b/x11-misc/vym/vym-9999.ebuild
index 539db055b531..a5984727412e 100644
--- a/x11-misc/vym/vym-9999.ebuild
+++ b/x11-misc/vym/vym-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PLOCALES="cs_CZ de_DE el es fr ia it ja pt_BR ru sv zh_CN zh_TW"
+PLOCALES="cs_CZ de_DE el es fr hr_HR ia it ja pt_BR ru sv zh_CN zh_TW"
 inherit desktop git-r3 l10n qmake-utils
 
 DESCRIPTION="View Your Mind, a mindmap tool"
-HOMEPAGE="http://www.insilmaril.de/vym/"
+HOMEPAGE="https://www.insilmaril.de/vym/"
 EGIT_REPO_URI="https://git.code.sf.net/p/vym/code"
 
 LICENSE="GPL-2"
@@ -15,6 +15,7 @@ KEYWORDS=""
 IUSE="dbus"
 
 RDEPEND="
+	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtprintsupport:5
@@ -24,6 +25,9 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
+"
+BDEPEND="
+	dev-qt/qtcore:5
 	dev-qt/linguist-tools:5
 "
 DOCS=( README.md )
diff --git a/x11-misc/wmname/Manifest b/x11-misc/wmname/Manifest
index a3769d53ca5e..d26c05c9cb1a 100644
--- a/x11-misc/wmname/Manifest
+++ b/x11-misc/wmname/Manifest
@@ -1,4 +1,4 @@
 AUX wmname-0.1-buildsystem.patch 504 BLAKE2B 7c15189ac398a4fd1fd082bda44bd2909fbe93d4b30a3b0ca7cd3a7126aa2f8028618e1e6f069aa4d1305b6c869573cac0995c5b8883bdbcbc21c1ab369063c5 SHA512 c30cc281e99d6ab72d214312ee4d5a7dfea176f7befc4d266faba373b322cd6f7bc4572c9565d460177878770d25197472d07a305d7da2e3f6cda9484d3399f6
 DIST wmname-0.1.tar.gz 2512 BLAKE2B 447df17111411533704898548263c3b6d40590b74761061517c779afa05fe5176a870490809d669e5a68bfdf8590abba91cd47969afc87d17925059e297a53af SHA512 e57100f8de2579f4090c0aaf5a5b134d03bcbcdca5c6d005b12ce39ad322d96651bb13d151cf259e935e6c50e7b21bde43a4eace112be80983a92f92b99f192f
 EBUILD wmname-0.1-r1.ebuild 650 BLAKE2B 569c1d493227ab1effde25f06648f54ee7310843317a3bb64d2d20c7e385f80d0e94eff41208b2fef7031047db13695f9d42cfc0506c3d549ca4bcb082dc730a SHA512 3a4ade53671dc6cfc553d2b6448beda23772e238ea8ab149e8edaf599755e87ff7214d44ec7af9d4ac838a5865f4c7453938aa3173b8d3005e81d9055a96018f
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+MISC metadata.xml 251 BLAKE2B e9e9d48943645d8b737bc1f7ab0efb05db0f8eddad759c9bb40d07dc008fbfb8f5cca2020de71a9ff6945f5d66292ac02355773545010cd49c77fe6dd5ab7b40 SHA512 1b6a6955118c1a74cc89a77d6de9be8f4ff9c7137c186753462670a5b93457dfd034ad5d1f4d2507ac95cc149c2a042fa5324220b58702a56b09d91de40151c9
diff --git a/x11-misc/wmname/metadata.xml b/x11-misc/wmname/metadata.xml
index 6f49eba8f496..efcd58fe0b9b 100644
--- a/x11-misc/wmname/metadata.xml
+++ b/x11-misc/wmname/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/xdg-utils/Manifest b/x11-misc/xdg-utils/Manifest
index 32dd5f0cdc47..5e46489ed357 100644
--- a/x11-misc/xdg-utils/Manifest
+++ b/x11-misc/xdg-utils/Manifest
@@ -2,6 +2,6 @@ AUX xdg-utils-1.1.3-xdg-open-pcmanfm.patch 702 BLAKE2B 1adcb274c1a5fcca4a99178bf
 DIST xdg-utils-1.1.3.tar.gz 297170 BLAKE2B bd281df73d8c966d11b502dd7ec88d96dbc9683503f54b043ae4842f146b6847bd3dd6902cf993771848d9fcb55d26d67f032af2b8aa0795a6d9855535e57d5b SHA512 d1f819a211eb4104a90dfdc6fedcb640fd46b15ccfc8762266f8f538c49d74cb00027b8c1af991fb2a200acb4379986ae375700e06a2aa08fb41a38f883acb3e
 DIST xdg-utils-1.1.3_p20200220.tar.bz2 287080 BLAKE2B eb9067527d5073f290d10ad36bcda24d4b813f3c98776b57955a7f254956795c26f1536c858ac104259f68f755746976d2cfc3aeccb9b9b35eaca5ea5eb89806 SHA512 8445109e87fb9e92edeebbf6b07a41b79344bc5016eb7224f5f2b7e599c6d075363337c81dd2ddf8f3007c633debba7f814631188c02db3ae002f622b4c323ec
 EBUILD xdg-utils-1.1.3-r1.ebuild 2131 BLAKE2B a6d2abd3b268a4bbc14d5a5cd3c88c0ab4083458f294f8a09354f95947b1526f06659c9bfc36dee0d1c6aed7654d2edd5394e0435e57e837401e5e7b2a74fc05 SHA512 688c267446e41feda372828a0443f71c00aa2008b6626b5785eb0b7a94d8be589427f6fa0d709924c0446ab8cc3d7fccdbff580db2c3e1d17e2a5cd8fd926010
-EBUILD xdg-utils-1.1.3_p20200220-r1.ebuild 2043 BLAKE2B 8dc8262457045b2dd47940def122a1b60234c5ebb08647e11f4e9e6be0e207ba89857ff9d128a9e7e50eee11c4c15a1dec7db5279b9d3ca28d8bab53e8ce5c43 SHA512 368f075527b5dc34aa6f997e4ed70295626874f1ccfc0271ab40a9dec1c257247b0daec4791f49936f8de7e8e4fcb5bcbbd5b0671ed11649a234ac05702c1b1e
+EBUILD xdg-utils-1.1.3_p20200220-r1.ebuild 2035 BLAKE2B 182f2f54a9e3c59cbad10c16d5c9896116e376e03a65b401a66041b0b3a2be3a291a84651b95f0660758867e5f4aeb0e58a65fd1f266549712f2c5403d56eb44 SHA512 68df6b6e005a734788e9bbbb40f1f6fb5bdf80332fd6772466310ef01046c9e7ea25a238973e2793d4f83de654a708e3e93107a6564cb3b1f788dcceac2c1aea
 EBUILD xdg-utils-1.1.3_p20200220.ebuild 1960 BLAKE2B ebc017c0c4d725cc5ad9e4fe6d899ac52eb4c3d4826e32e0ce7cec91dd36a715ffd1d052f79481098fcf72e9c340ce046381bd7802958c42fa0268fc8595c57f SHA512 7bc08447c7374a1878f0d83b272ff8a380e4c8bea6916c8d8562519760456f6415880a9ddedadb1ce008488e215368715aaa28b6b1d6396464b343d809a3c52d
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220-r1.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220-r1.ebuild
index 5b1faa46cb5b..2fc95ee7016c 100644
--- a/x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220-r1.ebuild
+++ b/x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220-r1.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/xdg-utils-${EGIT_COMMIT}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="dbus doc gnome"
 REQUIRED_USE="gnome? ( dbus )"
 
diff --git a/x11-misc/xdock/Manifest b/x11-misc/xdock/Manifest
index 630bb340bfe3..d8e29403843e 100644
--- a/x11-misc/xdock/Manifest
+++ b/x11-misc/xdock/Manifest
@@ -1,4 +1,4 @@
 AUX xdock-0.2.0-ldconfig.patch 130 BLAKE2B 9f5834033b57a55b6c58b0dd05c82a4a52c575d7506852f03895617deda5c12a238f0ffc714672d01cac377c7870ac3ec20f5d8761caccd2ad6d1dd86f35fda3 SHA512 1dcb07e5aa82cbff4f6728a419587d4f661ef7d89fb63ca89949d89b6bd03554a3cfb0401d6c1eb3dc2ad214aba40235105ae95b49d3bb215ab6062e22a095da
 DIST xdock-0.3.0.tar.gz 345753 BLAKE2B 23f27c09280a54dc2360ef7a20dc89e68435c27b64a4d402539184bd0df7a10742fbe84d56fac21b8ea4b7c626c718aa308664a28635d1bac55bb4c6373c9b97 SHA512 72fcfa4ae643a054c2ea1a4a4bc2772cb961dedfbb8d85acfaa997bea574cb6b2df3f88bc6bb9dae3a2a27a7a0136887c79e2508ff2e69998c4c985d34080e88
-EBUILD xdock-0.3.0.ebuild 602 BLAKE2B 658e36da87e4acf23ebb94aca892e304cb80cc871cbed22059a4f1ee4d72e51fc309464f8191fedcd976c664f41c6af04fd4f4cb02e5cc3d17cc1aa4dc1abb7e SHA512 890cb7b41761a3fef61e445ccc22049e7c387cb8d51a2c57f29d1cc79ef43fa1a66735e97cd3c5dd7188e2caa5e9c9dda644b3e385fc78070a3a24bccdbcb92e
+EBUILD xdock-0.3.0.ebuild 714 BLAKE2B 6592a52d2fead787c51db81340f896e58f6ed063b2a5cbed02487017cef7ab6031a0913dd72c8ae358992319599ee1434a211a9f0a8f4d47a9b19bc214fa3b57 SHA512 0cdb930bf185501aa05be6758e53c4572517aa7ed8505bfe2d772c903f368eacfaf3614f6b434c665e94f2e8b05a66ab93146089d127e63afe4ab4873a314338
 MISC metadata.xml 242 BLAKE2B 6cbdea992f914be2a11037deb268b389aa6109966978945c50ff838b4219fbd8f1c7e25ce77580704c20c1c9ca8bcde4bf120dbecb77b8c56facd3fcc82bac0f SHA512 701935c228e920f201ac49d55cc4160ed7efa62348c372935cb2a19333450d8af53a11cb4a509a357c0856e2d09469323d3fa1592d255716a6fae468f7659ccd
diff --git a/x11-misc/xdock/xdock-0.3.0.ebuild b/x11-misc/xdock/xdock-0.3.0.ebuild
index 63c9381744b7..379d89b1ad35 100644
--- a/x11-misc/xdock/xdock-0.3.0.ebuild
+++ b/x11-misc/xdock/xdock-0.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -23,3 +23,12 @@ src_prepare() {
 	sed -i -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' configure.ac || die
 	eautoreconf
 }
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/x11-misc/xidle/Manifest b/x11-misc/xidle/Manifest
index fcc5772bf684..2b96cf5266a6 100644
--- a/x11-misc/xidle/Manifest
+++ b/x11-misc/xidle/Manifest
@@ -1,4 +1,4 @@
 AUX xidle-26052015-dead.patch 501 BLAKE2B 2a6d64e08bdbac72cf1e6883bed95d5fcb69db91bd1227068ec4e87fbabd49c1f69c911c744741e23bc31596d7ebcd4fd82b3da9c213c28684d0f86394bc03fb SHA512 cfc6005d3143c7c5f0605f6ad09a9431c0e10a0b99e7eabe3610cd7e5cd7fb4a0d9f55af752fcec38665bcb5d228b5f1cf18682a7f8363f3d117113fadc2f950
 DIST xidle-26052015.tar.bz2 5897 BLAKE2B 91742d3f5fa9b726dd10e646298e5975253fd1e26ab5485c42a6fe48a5b83556f635e55b09bcde39d7dfa579bac8f0c800b3b2d2f1c6553a2af60070f4923317 SHA512 bb132a431a5dd585be6a93519aa06a73eade63dde81bbe582a5dd966646c5eeaca65fa2573e6795b73bbfd08388390b4e92954929577051f13098ef8e38c2200
 EBUILD xidle-26052015.ebuild 993 BLAKE2B a30aedc9f59c7ac1e0e279a2d2b5e87899bef96d658ebd14903ba0ef3c9d584ba38b448db9479aa9df0e4c268067f732e68c9eef1a42e55acae5078ebd480e9f SHA512 f7ebd65aa183a06f8e14ca550cd9cec9db7078dbd9f362150eec1b77bf5dea691a81b2caa3e523369ba1675bf4b4720f68e50443e87770269b4e34673c80a787
-MISC metadata.xml 240 BLAKE2B 64fe413f69832b5396b621f50bc6f618ddea15ddd4044ac76da4557d7dc0d963ce6ba36c0d1c0a8911af48fd71a6e84c4981f15ac7bad40bbd801e52b568a23b SHA512 25affa2d6d2fe48707ae81553343451aff9797885b4232e73973a29d4cc1d28a937d024cefca49f92383f01eb8cb811546cd2334cbb78f8e66f1db1f63ff4572
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-misc/xidle/metadata.xml b/x11-misc/xidle/metadata.xml
index f9f8bbfd9405..6f49eba8f496 100644
--- a/x11-misc/xidle/metadata.xml
+++ b/x11-misc/xidle/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>jer@gentoo.org</email>
-	<name>Jeroen Roovers</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/x11-misc/xkbset/Manifest b/x11-misc/xkbset/Manifest
index 99f318eac4f6..5eaabe28c962 100644
--- a/x11-misc/xkbset/Manifest
+++ b/x11-misc/xkbset/Manifest
@@ -6,4 +6,4 @@ DIST xkbset_0.5-7.1.debian.tar.xz 4336 BLAKE2B 48de493553add438ccce22567d1e8b706
 EBUILD xkbset-0.5_p5_p1.ebuild 1159 BLAKE2B 77f938b9a6939606617ae7dd98099e7e83ed32fac38a3c648438ef7f6ceb63b5cf75126c890772c42b12858fccfed79c8237b274013b8718aae87b8f4a0def31 SHA512 0e6e53ff85335d789bf9dc12d6e731f8223598785b9a127b37ac0c131e965a77b239c00ef95c245f94f12159b95c4202ff0f73b36e6ce90e976aa0596b8106e6
 EBUILD xkbset-0.5_p6.ebuild 981 BLAKE2B 1a252f0c7b1c33ce5f46906d36e4aaf95a4c27171f6350266ac868e890c40f7d6dace0191393ad301d855f6467ba92645f7a2fa6a400e61f84b9c613eb77f7d2 SHA512 acd96bbb958d997a5ac8642e2706be3a57ced9a71eb9f3fd286327a9d44b016895300bfbc62692c18334055a765c04178f0a9b8afc79a05acddbc2f60d2345a1
 EBUILD xkbset-0.5_p7_p1.ebuild 914 BLAKE2B 4923482a4a06d6604257f670526d25f6c576dea75b283d29dcdf8e30434e832b7cd380dc0ba4ae917636a33ceabd615fc2ade57e8aa7b4845a30126aa9a17625 SHA512 87f29e3cdc4c96c4e840d31500dd69b4f3dd5c9fa64287739ff21da4dfd7066502d0a2edbacc18c3516a78f73422c251da21846c2edd229d63470d3217e56f08
-MISC metadata.xml 306 BLAKE2B 9644abcc0daf089a11619c52345a08744954c73957bfe23d8f30d3546428e5e666f5cbb25fb32b5d21f5c3bfb1d890016eb0aa2621e3557b94c60497e6c7894b SHA512 68c4dd0cd53c28d3b53db38e239dee94fa5377570b86ede8f8aa844bd9a036deb8b777dced87a437b16dc25106e9cb8dd53c8ffa9f42f0a6db60d6f51e897795
+MISC metadata.xml 262 BLAKE2B cb551b0eb323441a2d47a1fcd705845286e4896a850de2618e61c39d971712de87a048d4f57709dce005a817e09b3bc70749e84020d0f9e64c78a74e2eb5e3e6 SHA512 1c3f56251e423f2f4ebd7fd3d9cc4d5b7d8373657df1787a2035712cce3593e569ec65cb9a60137df404ab014382ed8bf5aab13b91b766b7570ce7df687f77f0
diff --git a/x11-misc/xkbset/metadata.xml b/x11-misc/xkbset/metadata.xml
index 9cd3e9988810..778120dc8016 100644
--- a/x11-misc/xkbset/metadata.xml
+++ b/x11-misc/xkbset/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>jer@gentoo.org</email>
-</maintainer>
+<!-- maintainer-needed -->
 <use>
 <flag name="tk">Install the <pkg>dev-perl/Tk</pkg> based xkbset-gui utility</flag>
 </use>
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index ef2e59af73a9..0d9c2a8e5772 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,4 +1,6 @@
 DIST xkeyboard-config-2.30.tar.bz2 1689137 BLAKE2B 54ba0a3a82d65f4cf15c45aa500bd8a44865c9ce845d5bc1ae85d3544a384622c580baa119b8882defa9868d8210697153f868a273a38852d938bf318ed09c3b SHA512 2d775dcaab49d80f62b8eaadc9be406b42c9a3643d3a360f864a462c61865abce67d0a8a80772d54f8136603114c61b5168fd06771f9c132411911914abb1ea4
-EBUILD xkeyboard-config-2.30.ebuild 1336 BLAKE2B 37c5040ff351aba7f8aeeb4c3a59fd02263d4ddc9fe0bae39e62361dfe5b1e222a3cbf428086aea90c8367fef6163087d884b1bfb64c13e4bf5403967da5d298 SHA512 415f4f5347c8b825208375a5c5839599e352970a5532fee8ef18d736f17ad8c135907ac1cf5afb3a2ba2fbe0db63de050add2e5d3a761b4b5c58bbafb554a208
-EBUILD xkeyboard-config-9999.ebuild 1023 BLAKE2B bd4b25cfb97dbd822f4b2e06200833139dacf0c1e689e4ea50c7cd779a8b86d3e79bde1581bab7ea3fa55b205b7291ba255b1f6d2992ddfa2755327a4f33d5f8 SHA512 87e81c2aa3ab90331386369e160be599051e831c6ea59ecb0345e829b376acc4f820aad418020852431357bd470feea2999fbdedaa8f0dee372a792fb23572a8
+DIST xkeyboard-config-2.31.tar.bz2 1705328 BLAKE2B a6fe680a8f32f1ca58363faeb0955ae621712f045570f66ce1c211093f0021f60e7fa29076b9dac80ee6c07ef1e4abb738ad64fd01a75ad776e582e2dbcc286e SHA512 f6f260253e1757640cc0591f9efb55ad5d08023a53ec2f0b468465b36bae0aae4f78dc4d6e603c95aa21c9993d9a42bd641edf2017be3183921a0b1c125f4669
+EBUILD xkeyboard-config-2.30.ebuild 1338 BLAKE2B 9cda49f311d777e251148420d651b2254c29e2adbfd82ae6d70489fecfb55ed955d9f98d6bcc93878a0f6a7d7942f863257e24519e97243a4058f4259f55ef9f SHA512 6e0f427d0f7a30afcbb7263e8b3dede847a33f33bca90842c4317b4bb04f967b6586fda0abea90e506b21b2de007eb8ac30167d444b37df6e2a5d691659e0e5d
+EBUILD xkeyboard-config-2.31.ebuild 1346 BLAKE2B c959c766f7c811b58016fd0078d035682021bca7a966ea59e61b85f3526211bc9d842076b71d3e980070889f444736eef7ed067bafabe08f6b9a8c6713791131 SHA512 e5df90e9632c688546636f4c4ff4f595860263140b0c5437bc98786bffa65dfc4667805a759603e46bc82c54f59abe6189e8e831e53c69a80a3965976e43fdd6
+EBUILD xkeyboard-config-9999.ebuild 1025 BLAKE2B 40114e9b867de73171361cb9bbfc524d4b9ec67af46f58ec4aa12851ed34f9e6be3851aadb1758ae6dc7b0870eb84c83db77deb0c76ac63cd01e5438dbb0d8fc SHA512 a61f3525effabe287198ca34aa64198e876feadb44188e8a3df47465b3fddfd9cc2d56f2bf080ad19b9e8aceaff1387cff8893e7d46727903c480879fd85106c
 MISC metadata.xml 337 BLAKE2B ab0893146e71b0d96879e7ec41c7c4e057cb92570227daef015b6fa1a24c55709cd3d19e16df5afe80f706995e12a44a9fc29826a552bd436b1e9381e44acde5 SHA512 6a43f86407638d3f156d4ae64caee882878dbd1ee7c23991c8f378d55cfb0afe016202866f95c328d8b4e59186efa6a7cb7335a1c86e3fbdda4c16a96e175cf0
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.30.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.30.ebuild
index 8d68c4fd0cca..a6e711c62b76 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.30.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.30.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit python-any-r1
 
 DESCRIPTION="X keyboard configuration database"
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.31.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.31.ebuild
new file mode 100644
index 000000000000..892bf38d0d17
--- /dev/null
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.31.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+inherit python-any-r1
+
+DESCRIPTION="X keyboard configuration database"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config.git"
+	inherit autotools git-r3
+	# x11-misc/util-macros only required on live ebuilds
+	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
+else
+	SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+RDEPEND=""
+DEPEND="${LIVE_DEPEND}"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	local econfargs=(
+		--with-xkb-base="${EPREFIX}/usr/share/X11/xkb"
+		--enable-compat-rules
+		# do not check for runtime deps
+		--disable-runtime-deps
+		--with-xkb-rules-symlink=xorg
+	)
+
+	econf "${econfargs[@]}"
+}
+
+src_test() {
+	:;
+}
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
index 5ae805ded96c..2d42374cca5f 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit meson python-any-r1
 
 DESCRIPTION="X keyboard configuration database"
diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index cac32f0383e6..536b59d349c8 100644
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -2,15 +2,14 @@ AUX xlockmore-5.46-freetype261.patch 561 BLAKE2B f5fde1a8984784a2892363b85413728
 AUX xlockmore-5.47-CXX.patch 613 BLAKE2B ace9eb868bcdf4fa7fda07d5a0dfc316f992fd176616c531aa71ff5d051169165f991dd8a586685b5a0b8e1a66b0da247a441fd7a56ecd24cc39bd58f2267e8b SHA512 4eef79a2b791401433ae0c6e55179975f88b74c4e57cd64ca81df48a232723e5edaccbd7045c9f67ba81ba159e70257d5e070ea59808f52430ac08539ea91087
 AUX xlockmore-5.47-strip.patch 2048 BLAKE2B 0f0f00a38e1d3b5edebf40416698ad3b87323ce9167e7a3e0a44ca2fca853b16e9c1ff59ff74b0bf50b3484e25722a3ee840b312f2f249644614aef55095bfcc SHA512 2de24cbacab2a54e7a41f4604625096030763ad6212ec30b34be2c2fc4035b44f146bfb9d0a34df9c9ce4fa96a0eb1c9c7701b512a917fdf3eb56a5195c8585e
 AUX xlockmore-5.64_alpha0-LDFLAGS.patch 906 BLAKE2B 477e2fa3b3e74ef3bcb93d0f87f82f05f05dbd0b8fe395a2be3540986df74acff7650dcaaae84809f2cef9d5da7ff8360cd40e261328d2f404b58338e7353b13 SHA512 ae42b30b37eeccbf767e6e44a557611ae8bd549778b1b4671355d0cd4c3fbb195c23a6b3dfac7b4aa2563cfba86ddbafa791bc3786b9c8c1b84ae057e625e2b5
-AUX xlockmore-5.66_alpha06-rotator.patch 176 BLAKE2B 52115f36e2b40d911570e72fab408d518b3ba3545db9e95b16cf9ed460c80c66b0491b302d8c8752cf487e521d57ecacbf9de00f52785c095eba976291760931 SHA512 db33a41047724dadbe1ab720b5d91289e9795b664e2c032593177d6fc5733c0f004579d568365df42584db96d5ef777e23f6d4630458178a56cf578ae051ccbc
 DIST xlockmore-5.50.tar.xz 1632968 BLAKE2B 2e692d16d70e3186ec1f31c192414b286f8815f2f428a6f7f43b3de0117c51c4ad2fbdfb91debe2ecb75c8683212b5d33bee62d81374552703d578b02d3af036 SHA512 627a905c4641d6083676a766931f23c06e2ac5af9b43447ccf03143d329d24b786aac6b248318929399b5fae98f1ec17e676466b5cbd09f180377c483694c569
 DIST xlockmore-5.65.tar.xz 1945636 BLAKE2B d026975551e8ceafdcc7b8d8b6e404634f329d8d1f65e153b51798981103a023479dd58f2485c774aaf58f5928ea28a9f409c733ccfc75f98b65302e7e478ac5 SHA512 ecbf7e5c087843265eb4a537b3fe06a0d86d5f67d88c45137b6a7f4f5b30522d44fb87b5628cd9e042f90af129863fd3a4c2b5e2305df2dc3dfd867a03469ad8
-DIST xlockmore-5.66ALPHA05.tar.xz 1945728 BLAKE2B df0d5a8b0122673204c30f416c4bb599476340f0a0a4a80e08efe42c77a5dfa2408d74375dfcf2d68740d0b2c0147faff8ee01fe96e106eeed14fc779bcb3344 SHA512 259a8b2b0e7f487e5bb025a8a6961c38933ae259b3544c66823e09ea2f0fc44e19155bd335870adca653c268dc4811d41570882b021977e4981f0ded36ce3909
-DIST xlockmore-5.66ALPHA06.tar.xz 1947244 BLAKE2B 998d1438bc8ad95c21ebcace2e390936c56fe975331d2a82d10899a00b43fd245fc71c34050459d88fcc47c9b97bc074bd91be432df0a2933db0fd9153091888 SHA512 cd4d47a677b2e00f993b6a32cd2cd98a88fa04dca1d2a62303b58ebe2a4b26b4e4308a5c25883dbe8adade98ae85dbe7b61422ec05579a82b193eecb642b057c
-DIST xlockmore-5.66ALPHA08.tar.xz 1947004 BLAKE2B 44ad1f877d214a8b719db57df8f502391f635a4a9cd12bd470610c27543c4523acd6824cf01cb9bf6ca73628d4bc59bc25dafc436d4ee818d5590ae058a7b02d SHA512 a7bc5ffe09be91a5a903067c1e9cbdd5808207fc2ff0507e9bdfeb4156c187ee00da2a8d790a539b97e26985adb51326e1dcde9cdaa194bab4b8705117dc97ce
+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 2231 BLAKE2B 3accf80283ec7705cfafe4531bc38c1694d9d27381c9aa375bb14a1d59e865dd1c2aa8c99d1cdd26a93fe929b3302ca4646fe93f740feb56c86b70ca9362ed6c SHA512 f0116108dcbae364e4a7c391054890fca090fc182b8bd11c613e84bc91ccb07904e5bd14c515b934e2895c9e6bd2f82762d09719de4e648f6077338e3f05ff97
 EBUILD xlockmore-5.65.ebuild 2337 BLAKE2B 73ba42d7fc570be8efda9ce39f50174fdfb2ff653f64b4ac5ede455d737c7d248d5a128cee3433eb00bd8973a3dc525a212bd5bac6f92474034b0ec7c2a2cb46 SHA512 e1996a03cc088f2e07fd077fb4c5209607d3ea288935ed6469356af6edff47739a99fac2dec4d8d98583591167ff81f9d7da1bf60418ff47c6046c667af76f07
-EBUILD xlockmore-5.66_alpha05.ebuild 2479 BLAKE2B e6c5a0afd5d3db19928f57c5e31892115b12bc5104ccb6f5386ee31d1c34ec35a128a1367725e8fcb1c4ed80f814aff4b7133455bddc7850899f1a6b4bbd0a14 SHA512 e6b4f3f832087cfe018f37322f784e007aab26768ab5933ff0deab106a3bfc561346a23dea3f232e81208a5bb3846fccfc170ef9a1c81274a60e14669cb41f6d
-EBUILD xlockmore-5.66_alpha06.ebuild 2527 BLAKE2B 12589616ce832d6cb0bbe75372c081169c74904cbc30951bda056c2ac4e6a39d05ad4b8439f895b754331df052a99436a02a22551ece327b06b7a2fc37b3e05b SHA512 243be7ad3ccd304b8d54e4b34bf8065d65d4fbccacb969cfb7400e36c21fda424c9b83f0c127dec4442ffe4e86bb974333be46e453e541a547fa268f53073e4e
-EBUILD xlockmore-5.66_alpha08.ebuild 2479 BLAKE2B e6c5a0afd5d3db19928f57c5e31892115b12bc5104ccb6f5386ee31d1c34ec35a128a1367725e8fcb1c4ed80f814aff4b7133455bddc7850899f1a6b4bbd0a14 SHA512 e6b4f3f832087cfe018f37322f784e007aab26768ab5933ff0deab106a3bfc561346a23dea3f232e81208a5bb3846fccfc170ef9a1c81274a60e14669cb41f6d
+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
 MISC metadata.xml 446 BLAKE2B d638ac6f12a203ae9ada10ae4c33e3a3d9901e350b6e6925c50078d66b29343cae42a67f84d5334182c1e816bddb05d062eb7b7e47c9125b273db118c4de573b SHA512 c8fafb010e63c39beeee5b53ad37354d19e98ac4cf33f29606b0af379811a0738c9c70d1fb7c31a5673d4a6365fb658a6a8bf49135b748bea9069a690ce543ed
diff --git a/x11-misc/xlockmore/files/xlockmore-5.66_alpha06-rotator.patch b/x11-misc/xlockmore/files/xlockmore-5.66_alpha06-rotator.patch
deleted file mode 100644
index 6400ba33fe35..000000000000
--- a/x11-misc/xlockmore/files/xlockmore-5.66_alpha06-rotator.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/modes/glx/text3d2.cc
-+++ b/modes/glx/text3d2.cc
-@@ -83,7 +83,10 @@
- #endif
- #endif
- 
-+extern "C"
-+{
- #include "rotator.h"
-+}
- #include "text3d2.h"
- #include <GL/glu.h>
- 
diff --git a/x11-misc/xlockmore/xlockmore-5.66_alpha05.ebuild b/x11-misc/xlockmore/xlockmore-5.66_alpha10.ebuild
index 2bb52c63b8ed..2bb52c63b8ed 100644
--- a/x11-misc/xlockmore/xlockmore-5.66_alpha05.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.66_alpha10.ebuild
diff --git a/x11-misc/xlockmore/xlockmore-5.66_alpha08.ebuild b/x11-misc/xlockmore/xlockmore-5.66_alpha11.ebuild
index 2bb52c63b8ed..2bb52c63b8ed 100644
--- a/x11-misc/xlockmore/xlockmore-5.66_alpha08.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.66_alpha11.ebuild
diff --git a/x11-misc/xlockmore/xlockmore-5.66_alpha06.ebuild b/x11-misc/xlockmore/xlockmore-5.66_alpha12.ebuild
index 46cad1c85f0e..2bb52c63b8ed 100644
--- a/x11-misc/xlockmore/xlockmore-5.66_alpha06.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.66_alpha12.ebuild
@@ -51,7 +51,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.47-CXX.patch
 	"${FILESDIR}"/${PN}-5.47-strip.patch
 	"${FILESDIR}"/${PN}-5.64_alpha0-LDFLAGS.patch
-	"${FILESDIR}"/${PN}-5.66_alpha06-rotator.patch
 )
 S=${WORKDIR}/${P/_alpha/ALPHA}
 
diff --git a/x11-misc/xowl/Manifest b/x11-misc/xowl/Manifest
index 232951448e7f..35c72e963dbe 100644
--- a/x11-misc/xowl/Manifest
+++ b/x11-misc/xowl/Manifest
@@ -1,2 +1,2 @@
 EBUILD xowl-9999.ebuild 818 BLAKE2B e59325e7c1a088ca6ff87a22c4fe4c37dd1c7816d20600ff3521eee7a215d0336b012ece217334e7f41272e79cb600736d8a3f0bb2a901e2761d60f04df49cb0 SHA512 7a0c0891907059349356bf5a6f679fbd27c1c0806d30c1ecc5743ddac7f2dff7593a32b1a8b5cbe7c3286c93e0a57319f5c71ca5fefb19076859c21953b0a8ed
-MISC metadata.xml 295 BLAKE2B 2bf84c5dd3dd84feed7d59280d226bb20c53d1bff7e0e44c650a733bf3fb933a358344b291f293215d655ecc513a02bdc4f77b3e70a732d13b650e4a3db18901 SHA512 b331dbc6e9806c42576bcaaeb54c9086004924b28b2b1f0e4e9d4d9597354d42f4b63cc9ef5d3abee5cf613279b38911f3aa4d3f8dba020c8b377fe727fdb363
+MISC metadata.xml 248 BLAKE2B 122d6deb79d87e5f84380c4d7f05a94ab6a7ab145824b59389f56693698513173a1d278a957e6de71303e6b5df62da03256a75243bcad275d98829ecfb0ea0ab SHA512 58a338e8f357c34981d94e462806cc09b99f2d6fc28b377966e10c3b7b49e39650c11d03a5c15000ed08d3ddfe345fd326c5a1da82d4b89cbb828091228dfab2
diff --git a/x11-misc/xowl/metadata.xml b/x11-misc/xowl/metadata.xml
index c39cdaf110ef..a9528a673a39 100644
--- a/x11-misc/xowl/metadata.xml
+++ b/x11-misc/xowl/metadata.xml
@@ -1,9 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>jer@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">seanpringle/xowl</remote-id>
 	</upstream>
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index c2d4321324d1..b78f177ea55c 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-r1.ebuild 3411 BLAKE2B b2a0f44c61b5397a19afb5539be1130b2c00121ea72b08e775a0328f288c867d6276426df2240b16fe230d7429b88513454d47c26908b9f67de0395cf024fe42 SHA512 496b148d95873263871033308b7d49e182181b99147f922fad25ca56b6cec2c966df7ae0dd91d1b2ca6f72797dcd066e54b92e95c35b747005688d6ed161e44c
-EBUILD xscreensaver-5.43-r3.ebuild 3450 BLAKE2B aac754505d1e6ef9c4b2f080f5d90fb25f73054a18f4e8ea0244be228aed39420932bbc28d2caebdaab6e49ee0e8d01cfd8c8cb9888e3d530498e552855c7d66 SHA512 de444867d7b46d83db7b18e49886b2f8e09009ab338a82f171a69662524e88507f689adb29d1d895467e8ee9767a186cbf0ead2dc3e8a3c7f423cc55aaac17dd
-EBUILD xscreensaver-5.44-r2.ebuild 3765 BLAKE2B a4d43d5920409a70f53faf88c60545f2bc440aadfdc023abbcc26b581d9c6599373a57ae43e6cc0c16a9b5754e39a885f98004b6b4f13920d8a4d2400c11a2ef SHA512 65235c68d63fbc731656f76e9a4a3fb4aa339b1e58b2428e9d5c1b14950bdcf73154d9c580b56bbe08ba0adf7bb06397a059e6fef382e5741ff734d75c3de8f7
+EBUILD xscreensaver-5.38-r2.ebuild 3499 BLAKE2B 4b64b1a22663fa8de879ea2a2dd92c94fcd6d6c3f1fbae60f75c145b9e77ae859d21dcc98fa429cbaa1aa17325e24f370ebc070c5465347f9fc789f7dc443ec0 SHA512 bd68c95113b0ae1beb5ace3a4fe42ca0aa059b0280889003f07b29a6ba68cb06a2000365edba3184eb95729641b15702a763ebbd843fb02f68fcf6d8a6f0ffc6
+EBUILD xscreensaver-5.43-r4.ebuild 3538 BLAKE2B 74500e2edc9c1e519ac669434b323104cb5b1aeac190811dccf7dbc2614451aecea78c800c64565d08aa484ea6dea47562bc95616db82a2a096c959e83fa22b2 SHA512 6386c97e86e9f15fe1c3203200c4031cb326575bec6ca4ec4a46507891e3de1c82a61cab7e7c348621a11f8de836c1ad6e1d7a35f78a3431c06bcd849c3b2b6f
+EBUILD xscreensaver-5.44-r3.ebuild 3862 BLAKE2B 8b3ee49a2059c8ec19624a8d10e28d8858bb6d6c88e92dea2a052fa146d30b65b5c2f8c69d0e1a85ef3e4dc6b1becab55de43eca1e0600fdb1f62f58b611993b SHA512 39ab8b1472e4313c22d151dc225da887e0574ccf10afbf648efe2081dc692e5c68c230bcde9783d08e2312467bf5bce10cad92a870a50f43fefa5974cc3af600
 MISC metadata.xml 870 BLAKE2B 222f0b24d94c2d9884848813bc9927312e23c670cb03d6427af4018c469b7ca81ab5d0887fa469ad60d05aff97f3b8b2df88158638213fbce24ea6d90c7d9f1a SHA512 0743dbc932e97530aede3f34519e1785bd186662619f46d212f4b4ae0b53bfa01875a3a58d2a30e7f7e6d93f1723211e5cf95018b86dd8e5ede5a37e4c238592
diff --git a/x11-misc/xscreensaver/xscreensaver-5.38-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-5.38-r2.ebuild
index 315cf9b7a9ce..c45519def6dc 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.38-r1.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.38-r2.ebuild
@@ -21,7 +21,13 @@ COMMON_DEPEND="
 	media-libs/netpbm
 	x11-apps/appres
 	x11-apps/xwininfo
-	x11-libs/gdk-pixbuf:2[X]
+	|| (
+		(
+			x11-libs/gdk-pixbuf-xlib
+			>=x11-libs/gdk-pixbuf-2.42.0:2
+		)
+		<x11-libs/gdk-pixbuf-2.42.0:2[X]
+	)
 	x11-libs/gtk+:2
 	x11-libs/libX11
 	x11-libs/libXext
diff --git a/x11-misc/xscreensaver/xscreensaver-5.43-r3.ebuild b/x11-misc/xscreensaver/xscreensaver-5.43-r4.ebuild
index a111f518d22a..4e00075ec571 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.43-r3.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.43-r4.ebuild
@@ -21,7 +21,13 @@ COMMON_DEPEND="
 	media-libs/netpbm
 	x11-apps/appres
 	x11-apps/xwininfo
-	x11-libs/gdk-pixbuf:2[X]
+	|| (
+		(
+			x11-libs/gdk-pixbuf-xlib
+			>=x11-libs/gdk-pixbuf-2.42.0:2
+		)
+		<x11-libs/gdk-pixbuf-2.42.0:2[X]
+	)
 	x11-libs/gtk+:2
 	x11-libs/libX11
 	x11-libs/libXext
diff --git a/x11-misc/xscreensaver/xscreensaver-5.44-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-5.44-r3.ebuild
index 3d15c7f3a86f..90d0de319c50 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.44-r2.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.44-r3.ebuild
@@ -33,7 +33,15 @@ COMMON_DEPEND="
 	x11-libs/libXt
 	x11-libs/libXxf86vm
 	caps? ( sys-libs/libcap )
-	gdk-pixbuf? ( x11-libs/gdk-pixbuf:2[X] )
+	gdk-pixbuf? (
+		|| (
+			(
+				x11-libs/gdk-pixbuf-xlib
+				>=x11-libs/gdk-pixbuf-2.42.0:2
+			)
+			<x11-libs/gdk-pixbuf-2.42.0:2[X]
+		)
+	)
 	gtk? ( x11-libs/gtk+:2 )
 	jpeg? ( virtual/jpeg:0 )
 	new-login? (
diff --git a/x11-misc/xsettingsd/Manifest b/x11-misc/xsettingsd/Manifest
index 708671c03695..5d54bf13aaae 100644
--- a/x11-misc/xsettingsd/Manifest
+++ b/x11-misc/xsettingsd/Manifest
@@ -1,5 +1,5 @@
 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
-EBUILD xsettingsd-1.0.0.ebuild 546 BLAKE2B a06b77303490e65222fcbc3196c9b6b960454ee55b65a6ead3d3ba0395055bbb50d6d3076f3b61267fbcbb59d8ba4e3be022da7c796e7fa6d5879ed619e410c3 SHA512 357174ad25dd79f04b2925e0a8d58f1ca7fc4618c53d4d9986adc5dbedd6d3456c5afc4e15bda75746bc4b68a398c3fa0debb970ca26363145cfec85195005d4
+EBUILD xsettingsd-1.0.0.ebuild 543 BLAKE2B b2d84af5b7091b0bab3b41122e2397bf7fb57d7094c7f942c9a6231d2d25d2f31023dc3adfaa1e23dc8c9e2a25ab7bc7447f2627aa304b5b52fc0e096549fb0b SHA512 355acc37e97dc3e33af015136676434cc55f8160abe1566530688093a50507faa9c7c527056f143808be81521718acbdf3cbe28e06e3c0b54f03e2611aac149d
 MISC metadata.xml 330 BLAKE2B 0b8f27cf4be7ed52be5e6656a64497815cbac57febe612b3755ca2cfa9ce97f34d5807318ac39bc184b7e61b3086cecfa4e5b2e19066adfb32caead8e8833a89 SHA512 834c1c90c8297497e13de12121a39f113807228ede6ec87ad774096e870840f1f1ddc73301c63375f2600b035be12f88c77c978a8fec2e089b0624df16444959
diff --git a/x11-misc/xsettingsd/xsettingsd-1.0.0.ebuild b/x11-misc/xsettingsd/xsettingsd-1.0.0.ebuild
index 4d15a99dad4b..494313069e74 100644
--- a/x11-misc/xsettingsd/xsettingsd-1.0.0.ebuild
+++ b/x11-misc/xsettingsd/xsettingsd-1.0.0.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}"
diff --git a/x11-misc/xssstate/Manifest b/x11-misc/xssstate/Manifest
index d4cb19d1468c..1572863122e4 100644
--- a/x11-misc/xssstate/Manifest
+++ b/x11-misc/xssstate/Manifest
@@ -1,4 +1,4 @@
 AUX xssstate-1.0.20130103-gentoo.patch 2528 BLAKE2B 725f2370f3f25af07515f5ab581395061ba19cedfd6d16eed6ef115541f4dd100f8eab312f555fb232796367ca2d377a8a0de1b9c51e162af6e4431a74fd97b2 SHA512 29ed64ee4cd4512cae80c65bce9058498ffccc817a5b0dfd27eede08a6361b332377fdd0bec2430a469a5291579d5a5dd9ba7bd605af567fec07a7a8fc3b3ee1
 DIST xssstate-1.1.tar.gz 3725 BLAKE2B d772796048ba1eea89b235dd3e1534c364741a8fce0d013174d1eb1dda3d4bc50c072e0a5af72dc10365690b309229ff717dce2f347613be753bc6e38f0baf2d SHA512 96c59e9cc7b78aec8a95040cd1c4c6aaeb85f092c5a52cf64a62ceeb3fed65bdd3eb6f070b3d66ae8ec2544371a236f32e83e0a5c45e6d21f2bf7791b5c0d519
 EBUILD xssstate-1.1.ebuild 654 BLAKE2B ce63f07bcae53c4f4e992039dc245272720f8bc0090390f4f32ae19f9bf6edc273d2e3c0507e21dcf1394f773ae8c51db176f39ddf11819465933f6e6536dfde SHA512 97bd403b5bc75f80bd6625b08661b96c577da3677ee7ac4674718c7f9386066a4c27585cc42432a40f155054c49ccbd05f2f58656ff880ccfddb38ccce25575f
-MISC metadata.xml 369 BLAKE2B 229857fc781778834cf45f22a8a170e76bc50c7aa24caca6ed93e4f1510bb577b8153ed419821ce78edc0049b97d677ed8371ba2517c9f60759812e087a15886 SHA512 9c2113536cbda45e66eb5697ac4c173ff301a7692c7f3bafead7e5bc7e30778535dbd9dc8ee494ced840a2f17e6b1674c95418772fbffda61eb11848ef368b9d
+MISC metadata.xml 251 BLAKE2B e9e9d48943645d8b737bc1f7ab0efb05db0f8eddad759c9bb40d07dc008fbfb8f5cca2020de71a9ff6945f5d66292ac02355773545010cd49c77fe6dd5ab7b40 SHA512 1b6a6955118c1a74cc89a77d6de9be8f4ff9c7137c186753462670a5b93457dfd034ad5d1f4d2507ac95cc149c2a042fa5324220b58702a56b09d91de40151c9
diff --git a/x11-misc/xssstate/metadata.xml b/x11-misc/xssstate/metadata.xml
index 229dd61feac9..efcd58fe0b9b 100644
--- a/x11-misc/xssstate/metadata.xml
+++ b/x11-misc/xssstate/metadata.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>jer@gentoo.org</email>
-<name>Jeroen Roovers</name>
-</maintainer>
-<maintainer type="project">
-<email>desktop-misc@gentoo.org</email>
-<name>Gentoo Desktop Miscellaneous Project</name>
-</maintainer>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/xvfb-run/Manifest b/x11-misc/xvfb-run/Manifest
index 211fe10c0557..0b713d13c6a0 100644
--- a/x11-misc/xvfb-run/Manifest
+++ b/x11-misc/xvfb-run/Manifest
@@ -3,5 +3,5 @@ DIST xorg-server_1.19.3-2.diff.gz 139662 BLAKE2B b88708c4358a121a6f7bd099b15711b
 DIST xorg-server_1.20.8-2.diff.gz 171769 BLAKE2B 5572320e4bc1de63ba221e5c9804d6676cc7c918d417b4069572fec4385d62b73e5636a4f17eebb1897f410e323e190dff68056abd888373df4ccdd688ed7c47 SHA512 89115023fc802a3cf2fc21fabed4499112b1e6f52967eb134795f041194b05d86c59b1477d8b9001c2935efdeb64e8a0dd281a43a6252802df2d19349972f7d7
 EBUILD xvfb-run-1.18.4_p2.ebuild 773 BLAKE2B f43e286a6a376a355c527990a3600eadb7ca7078ee4e9942aa43f8b6c4679e4fccf7521914065bbc77538a5ff18e64081acfa1367919e2920d414c13b6c6225e SHA512 078d5ce6b8a52c4917c61cfc287caac0400e6db5e44b6df8c67455330e400e3cfce0fd0cd497e7c2d5081ad19076c1ce38191b6668f64bc492a663cb3c9aae4e
 EBUILD xvfb-run-1.19.3_p2.ebuild 743 BLAKE2B 9bc489339913c6139369aacb2898c8f4d4f2e987283dd70029705d28942b88ae2e011ac08bfdf72603fcb98e907869edd5a9cd145f92205ad0fdf38e8555a12b SHA512 9cf5be301ecd7fb6aec136deb9fab6e595fa0bdc1dd7392a1c654675f341056e33c9d4118a4e8dc88955ed12f865a8e3c602bf948ab6b013183dd21f48d2a311
-EBUILD xvfb-run-1.20.8_p2.ebuild 748 BLAKE2B 5ff2b04f3e2078d018063f9d5cb10088aa719c991063fc6549c07dbb6fab2531d7de5e449c1bcb98d48f4307e2ed9bcecd034dd8177e907d78ee96c8f1842939 SHA512 0e7b158d3a2a88fd4706bb5240915cc52082d93dbd32d78e1a1afa57e343066770c8de49df1bea5da52a19ab9b8375827b878aa5f66fa3019d0a971737f8f67f
+EBUILD xvfb-run-1.20.8_p2.ebuild 755 BLAKE2B b2e7dd470ff90c72d40a64f77f85de998f97c451cb6bde49d4ef00cd3d5a3dd211d6639f5beb4c0e1a728dba2cac6cb25542c4916a900fb41f1c9bce78b2d4c7 SHA512 07594ffef5bffc8c3eab48a278048e87ff3507480d28a927fb8e54ff25161f2e48f99e1717442a2206407ebfad50756359c2122565e2f26a296ad05881931ae4
 MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/x11-misc/xvfb-run/xvfb-run-1.20.8_p2.ebuild b/x11-misc/xvfb-run/xvfb-run-1.20.8_p2.ebuild
index 8ea25a1deffa..83051fe89b7f 100644
--- a/x11-misc/xvfb-run/xvfb-run-1.20.8_p2.ebuild
+++ b/x11-misc/xvfb-run/xvfb-run-1.20.8_p2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/${MY_PN:0:1}/${MY_PN}/${MY_PN}_${MY_PV}.diff.
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="dev-util/patchutils"
diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index d256678307d7..5597f01f43d4 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -1,6 +1,8 @@
 AUX zim-0.60-remove-ubuntu-theme.patch 669 BLAKE2B fbb3fe0082e7567f4ae9d0bd031096cf2bcbd4d4cb86b31ceff18dda880b5cf1f8441e452642dd28275c9ce6e20c7da0a3a77b4157da13d5d4bbe9b6a30a9086 SHA512 a2e202986c77490898c15f6c4e647667fd6662422e8bbd638624a52a33989cd4259f95b37f488ff4a947f04354704ee9df7b9d60aae2fcc928f1f3186955ea1a
 DIST zim-0.73.1.tar.gz 2615382 BLAKE2B 055857b20dbdebc1e5d8d6b13c344fcf665d9889f392f9c58fd3cfef1f80865a78c48e5138d2443f67bb29b8cd915b8d0d6bc0ac4807de20344dfe6673f1350e SHA512 ba67b396a6c06921e5e67ab5ccf0559e54b29a719262411b24f178c350bd0ac7c8239f8d5d4396b9dc291aadc36b59869d81dc04d457ce4a36eade67cdd53dd2
 DIST zim-0.73.2.tar.gz 2611490 BLAKE2B 05fd020b3add3ac9c6fd860ca002a5c0755a1a1f1ee07c6e5027e16e3b8c64d9116971e96ed235b249b65b9097551b9fcdf46ed929a03a877c36a02a7d54e8fd SHA512 26c987906759436063f88863e90cf2643996913a2fae12ebc4ae623731ad97d488d37ad70e72153aba7aaac7fe2dff9bb6f9f06c4d899a0ac20e3bfbd20ff3db
+DIST zim-0.73.3.tar.gz 2648597 BLAKE2B c3709fc418317bfbd355f3715e5fceb346026393bfaec65ca8713fb2cd33243189dc3328b4be20b08452545704d4d1196f99f96df9445aaed5d0277b310d37f0 SHA512 880839495e3aa434267ac02abe2c1779c8cb3c9c7b73de91a19e962e7face2cd05399871789d719d89d0776d09fb9b339370f4fac8e4019be538e282accbe180
 EBUILD zim-0.73.1.ebuild 2004 BLAKE2B 860e5ec15639b229ccdbadb7af5120d22f05722744927d48788b18d9a8196b82f6bbe0c40ed7230da9549446cc8a9580b3128228a780a7f53b84ff60a8ae5359 SHA512 a615515f58178875db7195628162cf0ee1470da174dfb9fedc3af1f4c52e1d974fd0df423efeabfec8d64df17608ed8f6284db54c98cfd9b54c7481b94bf7e58
 EBUILD zim-0.73.2.ebuild 2006 BLAKE2B 38362eeedb27a545084c2d8225f2c19d2cc3f025abc6fb61aedb2d0389ca50a7ff458f84da0218ce34720591221f0561248a9684ff130990e4fbbe268ee9e3ee SHA512 4d87fe9e5a7023c7d6d747b5ebac4773a5ff4f63050ef0d079c8e120086259f60fe0c0d4fbe59c338e91b53f9e4160c501e43b668588731d225966a1d18f29fa
+EBUILD zim-0.73.3.ebuild 2006 BLAKE2B 38362eeedb27a545084c2d8225f2c19d2cc3f025abc6fb61aedb2d0389ca50a7ff458f84da0218ce34720591221f0561248a9684ff130990e4fbbe268ee9e3ee SHA512 4d87fe9e5a7023c7d6d747b5ebac4773a5ff4f63050ef0d079c8e120086259f60fe0c0d4fbe59c338e91b53f9e4160c501e43b668588731d225966a1d18f29fa
 MISC metadata.xml 824 BLAKE2B a6ac745b62015073844af9a8aae0ef1d6ca6b7c28e881c7b85d31e00c808076fa944feec5980cdefc72b5ddfa2cecb98fc96b4745df12743212a4d572679408d SHA512 26a4774e75f0a06bfedc2c26f4ca688f9a2644935302e0674ba5a5308af88bc90f291a01f5b10bba62ac0f0a46561d63bfd9289de67bc53c4be454542ea76816
diff --git a/x11-misc/zim/zim-0.73.3.ebuild b/x11-misc/zim/zim-0.73.3.ebuild
new file mode 100644
index 000000000000..979b6c32c161
--- /dev/null
+++ b/x11-misc/zim/zim-0.73.3.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=no
+inherit xdg-utils virtualx distutils-r1
+
+DESCRIPTION="A desktop wiki"
+HOMEPAGE="
+	https://zim-wiki.org/
+	https://github.com/zim-desktop-wiki/zim-desktop-wiki
+"
+SRC_URI="https://github.com/${PN}-desktop-wiki/${PN}-desktop-wiki/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+RESTRICT="test"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+	')
+	x11-libs/gtk+:3[introspection]
+	x11-misc/xdg-utils
+"
+DEPEND="
+	${RDEPEND}
+"
+DOCS=( CHANGELOG.md CONTRIBUTING.md PLUGIN_WRITING.md README.md )
+PATCHES=( "${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch )
+S=${WORKDIR}/${PN}-desktop-wiki-${PV/_/-}
+
+python_prepare_all() {
+	sed -i -e "s/'USER'/'LOGNAME'/g" zim/__init__.py zim/fs.py || die
+
+	if [[ ${LINGUAS} ]]; then
+		local lingua
+		for lingua in translations/*.po; do
+			lingua=${lingua/.po}
+			lingua=${lingua/translations\/}
+			has ${lingua} ${LINGUAS} || \
+				{ rm translations/${lingua}.po || die; }
+		done
+	fi
+
+	distutils-r1_python_prepare_all
+	export XDG_RUNTIME_DIR=fakethis
+}
+
+python_install() {
+	distutils-r1_python_install
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	if ! has_version ${CATEGORY}/${PN}; then
+		elog "Please install these packages for additional functionality"
+		elog "    dev-lang/R"
+		elog "    dev-python/gtkspell-python"
+		elog "    dev-vcs/bzr"
+		elog "    media-gfx/graphviz"
+		elog "    media-gfx/imagemagick"
+		elog "    media-gfx/scrot"
+		elog "    media-sound/lilypond"
+		elog "    sci-visualization/gnuplot"
+		elog "    virtual/latex-base app-text/dvipng"
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
author	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
commit	d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree	0625f358789b5e015e49db139cc1dbc9be00428f /x11-misc
parent	2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)