gentoo resync : 25.08.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-08-25 10:45:55 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-08-25 10:45:55 +0100
commit: 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
tree: c513fe68548b40365c1c2ebfe35c58ad431cdd77 /x11-misc
parent: 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)
155 files changed, 1669 insertions, 1678 deletions
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 6594d51710f5..0138e504d9c5 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/alacarte/Manifest b/x11-misc/alacarte/Manifest
index 1f1ae40022dc..e42c7d4eddb9 100644
--- a/x11-misc/alacarte/Manifest
+++ b/x11-misc/alacarte/Manifest
@@ -1,5 +1,3 @@
-DIST alacarte-3.11.91.tar.xz 199128 BLAKE2B 711baf87d48b79cf52ad41bc9292c848a0f69477388580b9dddc068c8184178ae1e3c455a5b9ac6d99ef442d4b36544a45852aa134744379fc14b6c69c6a77df SHA512 b4b5ead4ba0b9742ea0530ecb5362afa970125d29750aaf147be6fd477f238b9c360307ce1df2a56330a69cd9c849a0dde4be44b36bf55377f42e30429411935
 DIST alacarte-3.36.0.tar.xz 201088 BLAKE2B 26c924a8a88c014358db38496cb8a20eca82e9b3d514a9feefa64db3674527cef454346c538a1cdb04ebbb384a64dee395738d8d2a19f4d2445e887f5714f8d6 SHA512 7406fef4c59f94f26d52ad6b52ddd8a5183e9ceb50834aecd5e83f60d996ab4efd09ecbc9d3568d65fe1dd9290e446b5c5c5f6ad89c7e81b0ef304d2a10476b9
-EBUILD alacarte-3.11.91.ebuild 1335 BLAKE2B baa5b6b922f92788c6dbe63ad969f6e512d66edd3fa62f821b6f0e3775861d32377af03132347e5ac610deb0e2170342f548d9f341f7aea2f60aaa8aa13a4b39 SHA512 9bf1bc0ce59f8ff04ec425850d720c7e8f9ec3d3bdfec7dbd1068d292b7fb332bfcb1185a8edcb5a16f8d1a2233b83ddd36290b6550ee5b2cd7ed65fdd14da53
 EBUILD alacarte-3.36.0.ebuild 815 BLAKE2B b3d51e668b90d5873f54e3efdbb172532b3319bc5bc7f2773b58f9f3d073a0dc5e80073a2efdf3dfca7ee131d427b97fece62d6b8974b7b5c0db8e156fc53ac6 SHA512 e7ec4db8ce9d82f9dc76fdd00fd58184286c9999861b7eba58f680c55d0500fbb89f74fb9610edc53007c6cbb0806a452c37eb5d978193d1142baacb79756976
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-misc/alacarte/alacarte-3.11.91.ebuild b/x11-misc/alacarte/alacarte-3.11.91.ebuild
deleted file mode 100644
index 6d193c90411b..000000000000
--- a/x11-misc/alacarte/alacarte-3.11.91.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-# FIXME: support python3 but installs in a weird location
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit gnome2 python-r1
-
-DESCRIPTION="Simple GNOME menu editor"
-HOMEPAGE="https://git.gnome.org/browse/alacarte"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=gnome-base/gnome-menus-3.5.3:3[introspection]
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-libs/gdk-pixbuf:2[introspection]
-	x11-libs/gtk+:3[introspection]
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40.0
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	gnome2_src_prepare
-	python_copy_sources
-}
-
-src_configure() {
-	python_foreach_impl run_in_build_dir gnome2_src_configure
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-src_test() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installing() {
-		gnome2_src_install
-		# Massage shebang to make python_doscript happy
-		sed -e 's:#! '"${PYTHON}:#!/usr/bin/python:" \
-			-i alacarte || die
-			python_doscript alacarte
-		}
-	python_foreach_impl run_in_build_dir installing
-}
diff --git a/x11-misc/appmenu-gtk-module/Manifest b/x11-misc/appmenu-gtk-module/Manifest
new file mode 100644
index 000000000000..a57c11d4fe10
--- /dev/null
+++ b/x11-misc/appmenu-gtk-module/Manifest
@@ -0,0 +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 1039 BLAKE2B 4dd6de022a98fe803165b37cdefc57f0caa6635152649170f2777fa11f93989a658887622944868bc6e743f52bbf01745cc20f74e06a578cf7c19a0553970cd2 SHA512 89b195e2ce0621295b25ca367f1ce92800cefca437ccf7af29974fc501406743c75110798bc1a9d3a817322a189e40fbd502dbab3207a13ea4785f4d75b302c1
+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
new file mode 100644
index 000000000000..ce784a6457b5
--- /dev/null
+++ b/x11-misc/appmenu-gtk-module/appmenu-gtk-module-0.7.3-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake gnome2-utils systemd
+
+DESCRIPTION="Application menu module for GTK"
+HOMEPAGE="https://gitlab.com/vala-panel-project/vala-panel-appmenu"
+SRC_URI="https://gitlab.com/vala-panel-project/vala-panel-appmenu/uploads/570a2d1a65e77d42cb19e5972d0d1b84/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/glib[dbus]
+	>=x11-libs/gtk+-2.24.0:2
+	>=x11-libs/gtk+-3.22.0:3
+"
+DEPEND="${RDEPEND}
+	dev-libs/wayland
+"
+
+src_prepare() {
+	cmake_src_prepare
+	sed -i -e "/^pkg_check_modules(SYSTEMD/d" data/CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DGSETTINGS_COMPILE=OFF
+		-DCMAKE_DISABLE_FIND_PACKAGE_VCM=ON
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	exeinto /etc/X11/xinit/xinitrc.d
+	newexe "${FILESDIR}"/${PN} 85-${PN}
+
+	systemd_dounit "${BUILD_DIR}"/data/appmenu-gtk-module.service
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+}
diff --git a/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module b/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module
new file mode 100644
index 000000000000..e6520aabcd6f
--- /dev/null
+++ b/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module
@@ -0,0 +1,12 @@
+if [[ -n "$GTK_MODULES" ]]; then
+    GTK_MODULES="${GTK_MODULES}:appmenu-gtk-module"
+else
+    GTK_MODULES="appmenu-gtk-module"
+fi
+
+if [[ -z "$UBUNTU_MENUPROXY" ]]; then
+    UBUNTU_MENUPROXY=1
+fi
+
+export GTK_MODULES
+export UBUNTU_MENUPROXY
diff --git a/x11-misc/appmenu-gtk-module/metadata.xml b/x11-misc/appmenu-gtk-module/metadata.xml
new file mode 100644
index 000000000000..bbffdc112335
--- /dev/null
+++ b/x11-misc/appmenu-gtk-module/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">shlomif/rinutils</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/arandr/Manifest b/x11-misc/arandr/Manifest
index fe7676338206..19731a0b4ac4 100644
--- a/x11-misc/arandr/Manifest
+++ b/x11-misc/arandr/Manifest
@@ -1,3 +1,3 @@
 DIST arandr-0.1.10.tar.gz 100203 BLAKE2B b5754dda4c4f9c5e957a9fc75b7236480417b899c2705bc5aee514899c664d39b5902921c69ac425aff99f3a6ea512bfc0c2c0259519c1a6e0fc553f6e367cc2 SHA512 12c2fe5b36f8d8e688d990e352c1cfa3e8512c0b647b78a8af93f9472704e4867fac4c56c207465fb7b420c9022dc545dea8ad8a29af3037758ab4587dcd38ba
-EBUILD arandr-0.1.10.ebuild 1077 BLAKE2B 276258e1b0eaf8817794ad3a22e49097590653e6b5b3f65dacd743fe99ad575991e235163f677e01c5d112566d19b69282c0ea20a3766d68071324000e048849 SHA512 7ca1bdf3d1c7f7c15b1957c21e2c2d78246889236e316305689d40afa1dd919fb16526562359aab862f4f21eb55c6344e96bc022960d1668c204bd6c8603782d
+EBUILD arandr-0.1.10.ebuild 1084 BLAKE2B 10757875da511cd52efbd6f3df858d33c8c2f68c0dd34ec8dc614e362d6d9f2096a9e0be3703a98aff8302ed2ef0eb245b64b47b9ad5f4399fe38eb3e4d2020b SHA512 b3f9d63540170ce68b6658143d9f1c730346bab66bf0bf5716ba086692e851a6d422f73850698b6e3af9e79386bda8220f7ea6c83a0a06f4dc3a60cd2be2d939
 MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
diff --git a/x11-misc/arandr/arandr-0.1.10.ebuild b/x11-misc/arandr/arandr-0.1.10.ebuild
index dc86e38022b2..a10346404f0b 100644
--- a/x11-misc/arandr/arandr-0.1.10.ebuild
+++ b/x11-misc/arandr/arandr-0.1.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://christian.amsuess.com/tools/arandr/files/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	dev-python/pygobject:3=[${PYTHON_USEDEP}]
diff --git a/x11-misc/barrier/Manifest b/x11-misc/barrier/Manifest
index c6e3a9ca9b32..6726ab72af7b 100644
--- a/x11-misc/barrier/Manifest
+++ b/x11-misc/barrier/Manifest
@@ -1,7 +1,5 @@
-AUX barrier-2.3.2-inf-loop.patch 4636 BLAKE2B 83df131ec2b17c2ab445d3848855497bc507cc9d3ae61101bd3f0f7eff848a8cba7ebeb0fdb8d3fb53e99027f808dd16e87a16edcd497ce447e95246d633c2c6 SHA512 9b5f36ecf2b2204692b3531927abad4a9fc01e1a134cbfde8e2f36ba326a2a4432e7fe13cafa7ebcdccee3284635885ae23fac2edeb96d2002ca535805aefe0f
-AUX barrier-2.3.2-no-avahi.patch 864 BLAKE2B 343c5eb12fdf004140f28f8bad8c78183e7a15d3ca06eb7e378ad02dacb81be96de3b3651aaf7eed13ee94fcb84e08fd48b1c145fa2b70658d6febf168d00c1a SHA512 efa25e95d960f3dc1e8ec763dc4bde2fe7f5f6506c6f59d37f4cdaf36a30a5433e0a0b9d16d0f6fc86770a9cd50c8028add411db163290eed15b87416c4ee388
-AUX barrier-2.3.2-pthread.patch 4061 BLAKE2B 44900b4a675abd843240f63e5f74dedc2165f170c39d44d0490892a44a786a3d8c3f1e47b7661e879dbc82a5074c8fc9a3a3672ca5fdbe9f91861b62ab9a9753 SHA512 d9b1e92904bb0f7927dd6c09474ad9264a25f730d1e32c0cc68d0f28d155b56ce908a0908c07ef09040e28e22c9699b7b7605c284ee2cd6ddb01f56b457e1cf7
-AUX barrier-2.3.2-qt-gui-only.patch 1329 BLAKE2B 179bba5dfa392b786d181302f8bbd7f1e3293fdc3445566cdf824df1de1cfbc28f7c0b03f68f949a92de9b0f047d8d5bc45c58ec4c593c7d5f081bc6b61f208d SHA512 cf9a27da008fe03057ab091b17dc144a312fcfe65b692a520e023e56d34df3df2a9b9691fa64b426e54edaa6472ae4b1fdc7837818875f06e9e9b32ad6d883ce
-DIST barrier-2.3.2.tar.gz 7244128 BLAKE2B 263be99ffb692e5b8e3e3450565fbaf5c5e2f23beca4beaf5d699547933be1bcdcbf1ed6b9ce8bd53f2a5dbb1eba3fc06490620555520fcff0e8d34ff2ad52cb SHA512 0452244afc3294aaafd89f18d2472e24fb2fc62426e7be91ab4ffceca4697c7acb8f4438fc299835f1312f0ada83911679abe6b8e1268631130c5877e193ff83
-EBUILD barrier-2.3.2-r1.ebuild 1464 BLAKE2B 9606b1dda451529711d441a7bf8fab21291f212be38e125f24adf4b66b4f57e4bdcf68db28a68e2a7d1a3b0396bbf1e5ea01276fd82487dd2f9584d2d1a06687 SHA512 ed96d398beb14f62af7455b067bc1b5aeba031b5676cfd028bd3f792146ee68dcce37f61a7205b784b511c7da254ebc1cfcaf99e3489a6d587e899bb2be10219
+AUX barrier-2.3.3-gtest.patch 3981 BLAKE2B f9a91a9b090ae4210d005db307d31930f7d2939f17e1c2bdbdbcd26b22743054f2d35c57c3e55ac6b6212e2d2274bcecad015c2afe8db909bfd4c030f976ae65 SHA512 82d78f658af279c8f2ec48cfa1dcec2cd6104d605b1157adeead73623fd0f7459141eb696619e71ea78ab1f7872369c78ef1ceeb9f90e7e7bed4b2a57aac5cca
+AUX barrier-2.3.3-tests.patch 4951 BLAKE2B 66996d3d9297bf0b188350154a380e522a0ddade4b1693fb62be6acbd624f327527b281cc3611b25b3cae0d084dc6af0eaae0e8487696c4b2589f76382381a4f SHA512 dcde430f1c0e1a4d65a4ed6afad1501f4ec6e448d0a56eeeadb46732fb8149fc7e74b5245e583ca8d4552ecca75dd59cabb9ba4ad549c8fda55e2178ede1ffed
+DIST barrier-2.3.3.tar.gz 5465909 BLAKE2B 3f881526f53113e48f1ea2e1592ebf2e932a8296fcba331243678963945001e7700dddc3bf8957f85285aec02c3d3700d31786cef291862a9b21780ee9e96cd6 SHA512 1ac945ce090d5bbdae7bab7d4ca802cc2d54c1644a12088203b240e38078d32d3b30ae2f764ba27d66c9d709e430b0eb1b4576314d99dd6177d8b88d19b89777
+EBUILD barrier-2.3.3.ebuild 1610 BLAKE2B cae50a8a315968c45ebe3a71da8fc66b3809b06e9f77fdf4f2e780804731ccb118cf4d85c9188edfa78b200bc07135d654fcead9f3e69860677af1b35d9e39d2 SHA512 46cd279a5c2bc53ac629b68605b9af845285e79da7308394e9932ff1ff1253c9d982b6bb529d4e1f57bb598dd1aad26069a5e6712bb9960e3c7eb788e8739ab8
 MISC metadata.xml 329 BLAKE2B bbddf11c798d648935ee56a6ee9cbf7a73d30f13a880264ed07db3b7710eb7329166838b4e1adbb157b699805c2d891bdfae2799c7bb1b6ea3419b97438a49de SHA512 84462a8601400583e7570ecfca9fac2539eb9be9c097ebeead8cfc42e2be95c61369934a0e1d9252e3ed8fa181f64116a3cc0228da27340f6c29bdf5b4133883
diff --git a/x11-misc/barrier/barrier-2.3.2-r1.ebuild b/x11-misc/barrier/barrier-2.3.3.ebuild
index 62b3dd6a5f97..502083619611 100644
--- a/x11-misc/barrier/barrier-2.3.2-r1.ebuild
+++ b/x11-misc/barrier/barrier-2.3.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop xdg cmake
+inherit desktop virtualx xdg cmake
 
 DESCRIPTION="Share a mouse and keyboard between computers (fork of Synergy)"
 HOMEPAGE="https://github.com/debauchee/barrier"
@@ -12,7 +12,8 @@ SRC_URI="https://github.com/debauchee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="gui libressl"
+IUSE="gui libressl test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	net-misc/curl
@@ -36,14 +37,13 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
+	dev-cpp/gtest
 	x11-base/xorg-proto
 "
 
 PATCHES=(
-	"${FILESDIR}"/${P}-inf-loop.patch
-	"${FILESDIR}"/${P}-no-avahi.patch
-	"${FILESDIR}"/${P}-pthread.patch
-	"${FILESDIR}"/${P}-qt-gui-only.patch
+	"${FILESDIR}"/${P}-tests.patch
+	"${FILESDIR}"/${P}-gtest.patch
 )
 
 DOCS=(
@@ -56,13 +56,20 @@ src_configure() {
 	local mycmakeargs=(
 		-DBARRIER_BUILD_GUI=$(usex gui)
 		-DBARRIER_BUILD_INSTALLER=OFF
+		-DBARRIER_BUILD_TESTS=$(usex test)
 		-DBARRIER_REVISION=00000000
+		-DBARRIER_USE_EXTERNAL_GTEST=ON
 		-DBARRIER_VERSION_STAGE=gentoo
 	)
 
 	cmake_src_configure
 }
 
+src_test() {
+	"${BUILD_DIR}"/bin/unittests || die
+	virtx "${BUILD_DIR}"/bin/integtests || die
+}
+
 src_install() {
 	cmake_src_install
 	einstalldocs
diff --git a/x11-misc/barrier/files/barrier-2.3.2-inf-loop.patch b/x11-misc/barrier/files/barrier-2.3.2-inf-loop.patch
deleted file mode 100644
index 125b903e58eb..000000000000
--- a/x11-misc/barrier/files/barrier-2.3.2-inf-loop.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-From c79120c049d825fedeed70d5a1a9dc64d17ce9f0 Mon Sep 17 00:00:00 2001
-From: Vasily Galkin <galkin-vv@ya.ru>
-Date: Sun, 9 Feb 2020 23:27:26 +0300
-Subject: [PATCH] Fix infinite loop on fast TCP disconnection
-
-The commit a841b28 changed the condition for removing job from processing.
-New flag MultiplexerJobStatus::continue_servicing become used
-instead of checking pointer for NULL.
-However for cases when TCPSocket::newJob() returns nullptr
-the behaviour changed: earlier the job was removed, but after change
-it is called again, since MultiplexerJobStatus equal to {true, nullptr}
-means "run this job again".
-
-This leads to problem with eating CPU and RAM on linux
-https://github.com/debauchee/barrier/issues/470
-
-There is similar windows problem, but not sure it is related.
-https://github.com/debauchee/barrier/issues/552
-
-Since it looks that the goal of a841b28 was only clarifying
-object ownership and not changing job deletion behaviour,
-this commit tries to get original behaviour and fix the bugs above
-by returning {false, nullptr} instead of {true, nullptr}
-when TCPSocket::newJob() returns nullptr.
----
- src/lib/net/SecureSocket.cpp |  4 ++--
- src/lib/net/TCPSocket.cpp    | 25 +++++++++++++------------
- src/lib/net/TCPSocket.h      |  3 ++-
- 3 files changed, 17 insertions(+), 15 deletions(-)
-
-diff --git a/src/lib/net/SecureSocket.cpp b/src/lib/net/SecureSocket.cpp
-index 99f626e8..92abea3c 100644
---- a/src/lib/net/SecureSocket.cpp
-+++ b/src/lib/net/SecureSocket.cpp
-@@ -761,7 +761,7 @@ MultiplexerJobStatus SecureSocket::serviceConnect(ISocketMultiplexerJob* job,
-     // If status > 0, success
-     if (status > 0) {
-         sendEvent(m_events->forIDataSocket().secureConnected());
--        return {true, newJob()};
-+        return newJobOrStopServicing();
-     }
- 
-     // Retry case
-@@ -793,7 +793,7 @@ MultiplexerJobStatus SecureSocket::serviceAccept(ISocketMultiplexerJob* job,
-     // If status > 0, success
-     if (status > 0) {
-         sendEvent(m_events->forClientListener().accepted());
--        return {true, newJob()};
-+        return newJobOrStopServicing();
-     }
- 
-     // Retry case
-diff --git a/src/lib/net/TCPSocket.cpp b/src/lib/net/TCPSocket.cpp
-index 4f4251ad..09a8f17e 100644
---- a/src/lib/net/TCPSocket.cpp
-+++ b/src/lib/net/TCPSocket.cpp
-@@ -403,6 +403,15 @@ void TCPSocket::setJob(std::unique_ptr<ISocketMultiplexerJob>&& job)
-     }
- }
- 
-+MultiplexerJobStatus TCPSocket::newJobOrStopServicing()
-+{
-+    auto new_job = newJob();
-+    if (new_job)
-+        return {true, std::move(new_job)};
-+    else
-+        return {false, {}};
-+}
-+
- std::unique_ptr<ISocketMultiplexerJob> TCPSocket::newJob()
- {
-     // note -- must have m_mutex locked on entry
-@@ -519,22 +528,14 @@ MultiplexerJobStatus TCPSocket::serviceConnecting(ISocketMultiplexerJob* job, bo
-         catch (XArchNetwork& e) {
-             sendConnectionFailedEvent(e.what());
-             onDisconnected();
--            auto new_job = newJob();
--            if (new_job)
--                return {true, std::move(new_job)};
--            else
--                return {false, {}};
-+            return newJobOrStopServicing();
-         }
-     }
- 
-     if (write) {
-         sendEvent(m_events->forIDataSocket().connected());
-         onConnected();
--        auto new_job = newJob();
--        if (new_job)
--            return {true, std::move(new_job)};
--        else
--            return {false, {}};
-+        return newJobOrStopServicing();
-     }
- 
-     return {true, {}};
-@@ -548,7 +549,7 @@ MultiplexerJobStatus TCPSocket::serviceConnected(ISocketMultiplexerJob* job,
-     if (error) {
-         sendEvent(m_events->forISocket().disconnected());
-         onDisconnected();
--        return {true, newJob()};
-+        return newJobOrStopServicing();
-     }
- 
-     EJobResult writeResult = kRetry;
-@@ -603,7 +604,7 @@ MultiplexerJobStatus TCPSocket::serviceConnected(ISocketMultiplexerJob* job,
-     if (writeResult == kBreak || readResult == kBreak) {
-         return {false, {}};
-     } else if (writeResult == kNew || readResult == kNew) {
--        return {true, newJob()};
-+        return newJobOrStopServicing();
-     } else {
-         return {true, {}};
-     }
-diff --git a/src/lib/net/TCPSocket.h b/src/lib/net/TCPSocket.h
-index 28891353..0b988886 100644
---- a/src/lib/net/TCPSocket.h
-+++ b/src/lib/net/TCPSocket.h
-@@ -76,7 +76,8 @@ protected:
- 
-     void removeJob();
-     void setJob(std::unique_ptr<ISocketMultiplexerJob>&& job);
--    
-+    MultiplexerJobStatus newJobOrStopServicing();
-+
-     bool                isReadable() { return m_readable; }
-     bool                isWritable() { return m_writable; }
- 
--- 
-2.24.1
-
diff --git a/x11-misc/barrier/files/barrier-2.3.2-no-avahi.patch b/x11-misc/barrier/files/barrier-2.3.2-no-avahi.patch
deleted file mode 100644
index 481a23a2d705..000000000000
--- a/x11-misc/barrier/files/barrier-2.3.2-no-avahi.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 93a4035409ed5a4349c9848c3dae3ec670884ee0 Mon Sep 17 00:00:00 2001
-From: Tetja Rediske <tetja+gitlab@tetja.de~>
-Date: Sat, 19 Oct 2019 00:28:13 +0200
-Subject: [PATCH] make non-gui variants build without avahi
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7f9efac8..8e10776e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -175,7 +175,7 @@ if (UNIX)
-             link_directories("/usr/X11R6/lib")
-         endif()
- 
--        if (${PKG_CONFIG_FOUND})
-+        if (BARRIER_BUILD_GUI AND ${PKG_CONFIG_FOUND})
-             pkg_check_modules (AVAHI_COMPAT REQUIRED avahi-compat-libdns_sd)
-             include_directories (BEFORE SYSTEM ${AVAHI_COMPAT_INCLUDE_DIRS})
-             set (CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES};${AVAHI_COMPAT_INCLUDE_DIRS}")
--- 
-2.24.1
-
diff --git a/x11-misc/barrier/files/barrier-2.3.2-pthread.patch b/x11-misc/barrier/files/barrier-2.3.2-pthread.patch
deleted file mode 100644
index d29844843e45..000000000000
--- a/x11-misc/barrier/files/barrier-2.3.2-pthread.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From a0b3124f80f5696cbf070b3b714533ab4012398d Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Tue, 10 Mar 2020 21:10:48 +0000
-Subject: [PATCH] Use -pthread flag and simplify pthread build logic
-
-Sometimes -lpthread is not enough. This has caused build failures on
-Gentoo Linux in the past.
-
-The logic also seems needlessly complex. We check for HAVE_PTHREAD on
-UNIX platforms even though CMake errors out if pthreads are not
-found. Similarly, we have a fallback for HAVE_PTHREAD_SIGNAL being
-false even though we always set it to true.
----
- CMakeLists.txt                             | 11 ++++-------
- res/config.h.in                            |  6 ------
- src/lib/arch/Arch.h                        |  4 +---
- src/lib/arch/unix/ArchMultithreadPosix.cpp | 13 -------------
- 4 files changed, 5 insertions(+), 29 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8e10776e..ae7ccb21 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -123,12 +123,10 @@ if (UNIX)
-     check_type_size (short SIZEOF_SHORT)
- 
-     # pthread is used on both Linux and Mac
--    check_library_exists ("pthread" pthread_create "" HAVE_PTHREAD)
--    if (HAVE_PTHREAD)
--        list (APPEND libs pthread)
--    else()
--        message (FATAL_ERROR "Missing library: pthread")
--    endif()
-+    set (CMAKE_THREAD_PREFER_PTHREAD TRUE)
-+    set (THREADS_PREFER_PTHREAD_FLAG TRUE)
-+    find_package (Threads REQUIRED)
-+    list (APPEND libs Threads::Threads)
- 
-     # curl is used on both Linux and Mac
-     find_package (CURL)
-@@ -269,7 +267,6 @@ if (UNIX)
-     set (HAVE_CXX_EXCEPTIONS 1)
-     set (HAVE_CXX_MUTABLE 1)
-     set (HAVE_CXX_STDLIB 1)
--    set (HAVE_PTHREAD_SIGNAL 1)
-     set (SELECT_TYPE_ARG1 int)
-     set (SELECT_TYPE_ARG234 " (fd_set *)")
-     set (SELECT_TYPE_ARG5 " (struct timeval *)")
-diff --git a/res/config.h.in b/res/config.h.in
-index f3a72449..2bd3b3bf 100644
---- a/res/config.h.in
-+++ b/res/config.h.in
-@@ -55,12 +55,6 @@
- /* Define if you have a POSIX `sigwait` function. */
- #cmakedefine HAVE_POSIX_SIGWAIT ${HAVE_POSIX_SIGWAIT}
- 
--/* Define if you have POSIX threads libraries and header files. */
--#cmakedefine HAVE_PTHREAD ${HAVE_PTHREAD}
--
--/* Define if you have `pthread_sigmask` and `pthread_kill` functions. */
--#cmakedefine HAVE_PTHREAD_SIGNAL ${HAVE_PTHREAD_SIGNAL}
--
- /* Define if your compiler defines socklen_t. */
- #cmakedefine HAVE_SOCKLEN_T ${HAVE_SOCKLEN_T}
- 
-diff --git a/src/lib/arch/Arch.h b/src/lib/arch/Arch.h
-index c062d6f3..940a2e3a 100644
---- a/src/lib/arch/Arch.h
-+++ b/src/lib/arch/Arch.h
-@@ -54,9 +54,7 @@
- #    include "arch/unix/ArchConsoleUnix.h"
- #    include "arch/unix/ArchDaemonUnix.h"
- #    include "arch/unix/ArchLogUnix.h"
--#    if HAVE_PTHREAD
--#        include "arch/unix/ArchMultithreadPosix.h"
--#    endif
-+#    include "arch/unix/ArchMultithreadPosix.h"
- #    include "arch/unix/ArchNetworkBSD.h"
- #    include "arch/unix/ArchSleepUnix.h"
- #    include "arch/unix/ArchStringUnix.h"
-diff --git a/src/lib/arch/unix/ArchMultithreadPosix.cpp b/src/lib/arch/unix/ArchMultithreadPosix.cpp
-index c9ddc6ce..4866edce 100644
---- a/src/lib/arch/unix/ArchMultithreadPosix.cpp
-+++ b/src/lib/arch/unix/ArchMultithreadPosix.cpp
-@@ -36,17 +36,6 @@
- 
- #define SIGWAKEUP SIGUSR1
- 
--#if !HAVE_PTHREAD_SIGNAL
--    // boy, is this platform broken.  forget about pthread signal
--    // handling and let signals through to every process.  barrier
--    // will not terminate cleanly when it gets SIGTERM or SIGINT.
--#    define pthread_sigmask sigprocmask
--#    define pthread_kill(tid_, sig_) kill(0, (sig_))
--#    define sigwait(set_, sig_)
--#    undef HAVE_POSIX_SIGWAIT
--#    define HAVE_POSIX_SIGWAIT 1
--#endif
--
- static
- void
- setSignalSet(sigset_t* sigset)
-@@ -344,9 +333,7 @@ ArchMultithreadPosix::newThread(ThreadFunc func, void* data)
-     // can't tell the difference.
-     if (!m_newThreadCalled) {
-         m_newThreadCalled = true;
--#if HAVE_PTHREAD_SIGNAL
-         startSignalHandler();
--#endif
-     }
- 
-     // note that the child thread will wait until we release this mutex
--- 
-2.24.1
-
diff --git a/x11-misc/barrier/files/barrier-2.3.2-qt-gui-only.patch b/x11-misc/barrier/files/barrier-2.3.2-qt-gui-only.patch
deleted file mode 100644
index bcfe31386103..000000000000
--- a/x11-misc/barrier/files/barrier-2.3.2-qt-gui-only.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From af0ce63733e040d6220aaa2157190015d4a9b0fd Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Tue, 17 Mar 2020 22:45:20 +0000
-Subject: [PATCH] Only require Qt5 when building the GUI
-
-Commit 6c888437 made Qt5 mandatory for all builds when it is only
-required for the GUI. There's already a find_package call in src/gui,
-it just needed the REQUIRED flag to be added.
----
- CMakeLists.txt         | 6 ------
- src/gui/CMakeLists.txt | 2 +-
- 2 files changed, 1 insertion(+), 7 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8e10776e..ee0835ec 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -357,12 +357,6 @@ else()
-     set (OPENSSL_LIBS ${lib_ssl} ${lib_crypto})
- endif()
- 
--
--# Check we have the *required* Qt5 libs.
--find_package(Qt5Core REQUIRED)
--find_package(Qt5Network REQUIRED)
--find_package(Qt5Widgets REQUIRED)
--
- #
- # Configure_file... but for directories, recursively.
- #
-diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
-index 4988fe6a..f29fd910 100644
---- a/src/gui/CMakeLists.txt
-+++ b/src/gui/CMakeLists.txt
-@@ -1,6 +1,6 @@
- cmake_minimum_required (VERSION 3.4)
- 
--find_package (Qt5 COMPONENTS Core Widgets Network)
-+find_package (Qt5 REQUIRED COMPONENTS Core Widgets Network)
- set (CMAKE_AUTOMOC ON)
- set (CMAKE_AUTORCC ON)
- set (CMAKE_AUTOUIC ON)
--- 
-2.25.1
-
diff --git a/x11-misc/barrier/files/barrier-2.3.3-gtest.patch b/x11-misc/barrier/files/barrier-2.3.3-gtest.patch
new file mode 100644
index 000000000000..363f8c2c02c0
--- /dev/null
+++ b/x11-misc/barrier/files/barrier-2.3.3-gtest.patch
@@ -0,0 +1,116 @@
+From bd1db368b333783697d686c82c42e48c4bec8b9e Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Fri, 21 Aug 2020 23:13:58 +0100
+Subject: [PATCH] Add BARRIER_USE_EXTERNAL_GTEST CMake option to use external
+ GTest
+
+---
+ CMakeLists.txt                     |  1 +
+ src/test/CMakeLists.txt            | 38 ++++++++++++++++++++----------
+ src/test/integtests/CMakeLists.txt |  4 +---
+ src/test/unittests/CMakeLists.txt  |  4 +---
+ 4 files changed, 29 insertions(+), 18 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4947d20f..18b242db 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -21,6 +21,7 @@ project (barrier C CXX)
+ option (BARRIER_BUILD_GUI "Build the GUI" ON)
+ option (BARRIER_BUILD_INSTALLER "Build the installer" ON)
+ option (BARRIER_BUILD_TESTS "Build the tests" ON)
++option (BARRIER_USE_EXTERNAL_GTEST "Use external installation of Google Test framework" OFF)
+ 
+ set (CMAKE_EXPORT_COMPILE_COMMANDS ON)
+ set (CMAKE_CXX_STANDARD 14)
+diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
+index daecb317..4a50e701 100644
+--- a/src/test/CMakeLists.txt
++++ b/src/test/CMakeLists.txt
+@@ -14,19 +14,33 @@
+ # You should have received a copy of the GNU General Public License
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
+-include_directories(
+-    ../../ext/gtest
+-    ../../ext/gtest/include
+-    ../../ext/gmock
+-    ../../ext/gmock/include)
+-    
+-add_library(gtest STATIC ../../ext/gtest/src/gtest-all.cc)
+-add_library(gmock STATIC ../../ext/gmock/src/gmock-all.cc)
++if (BARRIER_USE_EXTERNAL_GTEST)
++    include (FindPkgConfig)
++    find_package(GTest REQUIRED)
++    pkg_check_modules(GMOCK REQUIRED gmock)
++    include_directories(
++        ${GTEST_INCLUDE_DIRS}
++        ${GMOCK_INCLUDE_DIRS}
++    )
++else()
++    include_directories(
++        ../../ext/gtest
++        ../../ext/gtest/include
++        ../../ext/gmock
++        ../../ext/gmock/include
++    )
+ 
+-if (UNIX)
+-    # ignore warnings in gtest and gmock
+-    set_target_properties(gtest PROPERTIES COMPILE_FLAGS "-w")
+-    set_target_properties(gmock PROPERTIES COMPILE_FLAGS "-w")
++    add_library(gtest STATIC ../../ext/gtest/src/gtest-all.cc)
++    add_library(gmock STATIC ../../ext/gmock/src/gmock-all.cc)
++
++    set(GTEST_LIBRARIES gtest)
++    set(GMOCK_LIBRARIES gmock)
++
++    if (UNIX)
++        # ignore warnings in gtest and gmock
++        set_target_properties(gtest PROPERTIES COMPILE_FLAGS "-w")
++        set_target_properties(gmock PROPERTIES COMPILE_FLAGS "-w")
++    endif()
+ endif()
+ 
+ add_subdirectory(integtests)
+diff --git a/src/test/integtests/CMakeLists.txt b/src/test/integtests/CMakeLists.txt
+index 0460d8df..9ef875bd 100644
+--- a/src/test/integtests/CMakeLists.txt
++++ b/src/test/integtests/CMakeLists.txt
+@@ -68,8 +68,6 @@ endif()
+ 
+ include_directories(
+     ../../
+-    ../../../ext/gtest/include
+-    ../../../ext/gmock/include
+ )
+ 
+ if (UNIX)
+@@ -80,4 +78,4 @@ endif()
+ 
+ add_executable(integtests ${sources})
+ target_link_libraries(integtests
+-    arch base client common io ipc mt net platform server synlib gtest gmock ${libs} ${OPENSSL_LIBS})
++    arch base client common io ipc mt net platform server synlib ${GTEST_LIBRARIES} ${GMOCK_LIBRARIES} ${libs} ${OPENSSL_LIBS})
+diff --git a/src/test/unittests/CMakeLists.txt b/src/test/unittests/CMakeLists.txt
+index c46375ce..61a0d35f 100644
+--- a/src/test/unittests/CMakeLists.txt
++++ b/src/test/unittests/CMakeLists.txt
+@@ -50,8 +50,6 @@ list(APPEND headers ${platform_sources})
+ 
+ include_directories(
+     ../../
+-    ../../../ext/gtest/include
+-    ../../../ext/gmock/include
+     ../../../ext
+ )
+ 
+@@ -67,4 +65,4 @@ endif()
+ 
+ add_executable(unittests ${sources})
+ target_link_libraries(unittests
+-    arch base client server common io net platform server synlib mt ipc gtest gmock ${libs} ${OPENSSL_LIBS})
++    arch base client server common io net platform server synlib mt ipc ${GTEST_LIBRARIES} ${GMOCK_LIBRARIES} ${libs} ${OPENSSL_LIBS})
+-- 
+2.26.2
+
diff --git a/x11-misc/barrier/files/barrier-2.3.3-tests.patch b/x11-misc/barrier/files/barrier-2.3.3-tests.patch
new file mode 100644
index 000000000000..a4cc0d665a07
--- /dev/null
+++ b/x11-misc/barrier/files/barrier-2.3.3-tests.patch
@@ -0,0 +1,150 @@
+From 4a031b8ce538af0c15857c37c1964bf144d5bc38 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Fri, 21 Aug 2020 22:22:48 +0100
+Subject: [PATCH] Add BARRIER_BUILD_TESTS CMake option to make tests optional
+
+---
+ CMakeLists.txt                             | 2 +-
+ src/CMakeLists.txt                         | 5 ++++-
+ src/lib/barrier/KeyMap.h                   | 4 ++++
+ src/test/unittests/barrier/KeyMapTests.cpp | 2 ++
+ 4 files changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6a377c04..4947d20f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -20,6 +20,7 @@ project (barrier C CXX)
+ 
+ option (BARRIER_BUILD_GUI "Build the GUI" ON)
+ option (BARRIER_BUILD_INSTALLER "Build the installer" ON)
++option (BARRIER_BUILD_TESTS "Build the tests" ON)
+ 
+ set (CMAKE_EXPORT_COMPILE_COMMANDS ON)
+ set (CMAKE_CXX_STANDARD 14)
+@@ -49,7 +50,6 @@ else()
+ endif()
+ 
+ set (libs)
+-include_directories (BEFORE SYSTEM ./ext/gtest/include)
+ 
+ if (UNIX)
+     if (NOT APPLE)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 55aad09d..c3dea51f 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -19,7 +19,10 @@ include_directories (${CMAKE_CURRENT_BINARY_DIR}/lib)
+ 
+ add_subdirectory(lib)
+ add_subdirectory(cmd)
+-add_subdirectory(test)
++
++if (BARRIER_BUILD_TESTS)
++    add_subdirectory(test)
++endif()
+ 
+ if (BARRIER_BUILD_GUI)
+     add_subdirectory(gui)
+diff --git a/src/lib/barrier/KeyMap.h b/src/lib/barrier/KeyMap.h
+index b6eb8658..812b4d26 100644
+--- a/src/lib/barrier/KeyMap.h
++++ b/src/lib/barrier/KeyMap.h
+@@ -24,7 +24,9 @@
+ #include "common/stdset.h"
+ #include "common/stdvector.h"
+ 
++#ifdef TEST_ENV
+ #include <gtest/gtest_prod.h>
++#endif
+ 
+ namespace barrier {
+ 
+@@ -327,6 +329,7 @@ public:
+     //@}
+ 
+ private:
++#ifdef TEST_ENV
+     FRIEND_TEST(KeyMapTests,
+                 findBestKey_requiredDown_matchExactFirstItem);
+     FRIEND_TEST(KeyMapTests,
+@@ -340,6 +343,7 @@ private:
+     FRIEND_TEST(KeyMapTests,
+                 findBestKey_onlyOneRequiredDown_matchTwoRequiredChangesItem);
+     FRIEND_TEST(KeyMapTests, findBestKey_noRequiredDown_cannotMatch);
++#endif
+ 
+ private:
+     //! Ways to synthesize a key
+diff --git a/src/test/unittests/barrier/KeyMapTests.cpp b/src/test/unittests/barrier/KeyMapTests.cpp
+index 59806339..c0832199 100644
+--- a/src/test/unittests/barrier/KeyMapTests.cpp
++++ b/src/test/unittests/barrier/KeyMapTests.cpp
+@@ -15,6 +15,8 @@
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
+ 
++#define TEST_ENV
++
+ #include "barrier/KeyMap.h"
+ 
+ #include "test/global/gtest.h"
+-- 
+2.26.2
+
+From 19e020080cb3f54befb504abc48cf304ab42f23e Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Sat, 22 Aug 2020 11:46:25 +0100
+Subject: [PATCH] Respect DISPLAY environment variable in XWindows tests
+
+XWindowsScreenTests was failing under Gentoo's package manager. I have
+also addressed this in XWindowsScreenSaverTests, which is currently
+unused.
+---
+ src/test/integtests/platform/XWindowsScreenSaverTests.cpp | 7 ++++++-
+ src/test/integtests/platform/XWindowsScreenTests.cpp      | 7 ++++++-
+ 2 files changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/src/test/integtests/platform/XWindowsScreenSaverTests.cpp b/src/test/integtests/platform/XWindowsScreenSaverTests.cpp
+index c6a2710c..1ee273ed 100644
+--- a/src/test/integtests/platform/XWindowsScreenSaverTests.cpp
++++ b/src/test/integtests/platform/XWindowsScreenSaverTests.cpp
+@@ -30,7 +30,12 @@ using ::testing::_;
+ // TODO: not working on build machine for some reason
+ TEST(CXWindowsScreenSaverTests, activate_defaultScreen_todo)
+ {
+-    Display* display = XOpenDisplay(":0.0");
++    const char* displayName = getenv("DISPLAY");
++    if (displayName == NULL) {
++        displayName = ":0.0";
++    }
++
++    Display* display = XOpenDisplay(displayName);
+     Window window = DefaultRootWindow(display);
+     MockEventQueue eventQueue;
+     EXPECT_CALL(eventQueue, removeHandler(_, _)).Times(1);
+diff --git a/src/test/integtests/platform/XWindowsScreenTests.cpp b/src/test/integtests/platform/XWindowsScreenTests.cpp
+index d8f75e15..97358197 100644
+--- a/src/test/integtests/platform/XWindowsScreenTests.cpp
++++ b/src/test/integtests/platform/XWindowsScreenTests.cpp
+@@ -25,11 +25,16 @@ using ::testing::_;
+ 
+ TEST(CXWindowsScreenTests, fakeMouseMove_nonPrimary_getCursorPosValuesCorrect)
+ {
++    const char* displayName = getenv("DISPLAY");
++    if (displayName == NULL) {
++        displayName = ":0.0";
++    }
++
+     MockEventQueue eventQueue;
+     EXPECT_CALL(eventQueue, adoptHandler(_, _, _)).Times(2);
+     EXPECT_CALL(eventQueue, adoptBuffer(_)).Times(2);
+     EXPECT_CALL(eventQueue, removeHandler(_, _)).Times(2);
+-    XWindowsScreen screen(new XWindowsImpl(), ":0.0", false, false, 0, &eventQueue);
++    XWindowsScreen screen(new XWindowsImpl(), displayName, false, false, 0, &eventQueue);
+ 
+     screen.fakeMouseMove(10, 20);
+ 
+-- 
+2.26.2
+
diff --git a/x11-misc/birdtray/Manifest b/x11-misc/birdtray/Manifest
index 9f1d8852cc98..89d55bedd221 100644
--- a/x11-misc/birdtray/Manifest
+++ b/x11-misc/birdtray/Manifest
@@ -1,8 +1,5 @@
-AUX birdtray-1.7.0-desktop_file_deprecated_category.patch 263 BLAKE2B 9a456d55e242112726f00bcf87041720b9ee56097c50d71e4bf3f318f49a8ad78224954c7eff764d31cd3ba520fb8c895984776a27a3f1b354837e77382cf023 SHA512 186cd5a80d5d2f32c82708f48d137a06aad506fd44bb6b188ec80cd6041e68bfbd33a16f123b79d67bb977836b2815893e221cc60a3e35388e34c3a45abecfe5
 AUX birdtray-1.8.1_qt515.patch 569 BLAKE2B 9575631ce63a01ead03240779f88ef2ea32e7a7467716cc185d01dcc698c6349d47a11d8b8926434926d52cb1d9166e3ac542861c50f1814dcdf8dcdf1e569e0 SHA512 7d0fd09166ad242beecc0319e639016701493605d85363070247ec558c218e5b8736778aa1f821c33ac0be9083a2ad01f7ec4a572fd21dee40363ce0eb041645
-DIST birdtray-1.7.0.tar.gz 398153 BLAKE2B 87e583ab55b828213f5da97a61c3fc710b381b46ab688f02b6d1c4d01a2577451375d7366f0406cf685f1366497204e985de7905b1635161e252c11b9456da61 SHA512 3c2940a3a0e405d3fce1cd0411437ffa56f76c458e42ea059de1bd3fca802621643be39c1a0df3fc3fb0deac2aa53f7631c4bee191efd4b48e591dd05b30a6ab
 DIST birdtray-1.8.1.tar.gz 767821 BLAKE2B 343fb902381396df2a9d49b619a6eaea620447276ee1c6261b8bb9667ea40d945da37522e1ddeac529d032549f3ca3288d6b780ff95b6adbc98a1dbea8fdeb10 SHA512 464bdaf1820cecb0bb9b41721389f24ce447c65e25f857998c4de5d3fb2aa53f03223938974e9bbdbfd4d719fb6aaecdf8a27c6e2ab7075b451bc8e73d8f07e7
-EBUILD birdtray-1.7.0-r1.ebuild 862 BLAKE2B 21c440df982cf6ed61053fc37571c2fa960a29a9d638c88b5bcde64fb3b13ace13035af186db2da7dd0f52871cbd6e97033dda8ea3118f38744177fa8db1a36a SHA512 1516790487053f202f379551554b9cccf96b1c2eb6d84037e60dabd1384df817f7c07a7acfebdbdfc070aa8795c43938a3ca098f9419f12a7ab2770cad91d9af
-EBUILD birdtray-1.8.1.ebuild 784 BLAKE2B 727c0d72b465fba168061ca5996f2bd160de992938d4ea2aa910fd6fb0eb5551cb733649bfc3785f77ced8cf0745ef22462bba896be592ddb8f8af0038838866 SHA512 e6b0ed12114660c95f89e06a149f438fe1412828ab5b89d17ba4316bb39cad67fe66918108025d46cf4f05f5e23a3806d8bdb9fee19e5875be2b7692678b5759
-EBUILD birdtray-9999.ebuild 739 BLAKE2B 5e86f0dda25dc8ba671cf1fea88f8defac4c051c7ae05004fbfe78950ddfe4131f0929bd7a7ed82731adcb48c225a56ad597306815ac6e9be3bac22a3779f86f SHA512 309b5a63ba487d1e0cfd52032c4395600120ca42bc4f599d77f81c6709b2fbe2ab0744e9bb658e85ff18fa086505e189acf3b0f2c7c117fddc9bf1ad54f352d7
+EBUILD birdtray-1.8.1.ebuild 834 BLAKE2B 3cf6afb885dd5a09a5255b6257f5a1fc1cda46a9d619490e69378e8eecd3880d5144d9106261507f0d7021f2af2a6d52005c8564e13343212399692ad9fb4b8c SHA512 f5dde7029b6a8ba5ca53515425505dc764eef09a1f80c1481125878252da8f6e370b6621fe0d48680146d4be338b3cb419a4eb793952ec6cf289c4fdfa79630b
+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.7.0-r1.ebuild b/x11-misc/birdtray/birdtray-1.7.0-r1.ebuild
deleted file mode 100644
index 39890d9c3e53..000000000000
--- a/x11-misc/birdtray/birdtray-1.7.0-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="A new mail system tray notification icon for Thunderbird"
-HOMEPAGE="https://github.com/gyunaev/birdtray"
-
-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/RELEASE_${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/${PN}-RELEASE_${PV}"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-
-RDEPEND="dev-db/sqlite:=
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	x11-libs/libX11"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.0-desktop_file_deprecated_category.patch
-)
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/x11-misc/birdtray/birdtray-1.8.1.ebuild b/x11-misc/birdtray/birdtray-1.8.1.ebuild
index bb684e4e0580..a527d5b67e10 100644
--- a/x11-misc/birdtray/birdtray-1.8.1.ebuild
+++ b/x11-misc/birdtray/birdtray-1.8.1.ebuild
@@ -23,11 +23,13 @@ RDEPEND="dev-db/sqlite:=
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	x11-libs/libX11"
 
 DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
 
 PATCHES=(
 	"${FILESDIR}"/${P}_qt515.patch
diff --git a/x11-misc/birdtray/birdtray-9999.ebuild b/x11-misc/birdtray/birdtray-9999.ebuild
index 4820733d2bcb..92d300f4bfb9 100644
--- a/x11-misc/birdtray/birdtray-9999.ebuild
+++ b/x11-misc/birdtray/birdtray-9999.ebuild
@@ -23,11 +23,13 @@ RDEPEND="dev-db/sqlite:=
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	x11-libs/libX11"
 
 DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
 
 pkg_postinst() {
 	xdg_icon_cache_update
diff --git a/x11-misc/birdtray/files/birdtray-1.7.0-desktop_file_deprecated_category.patch b/x11-misc/birdtray/files/birdtray-1.7.0-desktop_file_deprecated_category.patch
deleted file mode 100644
index 104b24bf8de9..000000000000
--- a/x11-misc/birdtray/files/birdtray-1.7.0-desktop_file_deprecated_category.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/src/res/com.ulduzsoft.Birdtray.desktop
-+++ b/src/res/com.ulduzsoft.Birdtray.desktop
-@@ -28,5 +28,5 @@
- X-MultipleArgs=false
- Type=Application
- Icon=com.ulduzsoft.Birdtray
--Categories=Application;Network;Email;
-+Categories=Network;Email;
- StartupNotify=true
diff --git a/x11-misc/bumblebee/Manifest b/x11-misc/bumblebee/Manifest
index 758f165dec70..0982da4d07c0 100644
--- a/x11-misc/bumblebee/Manifest
+++ b/x11-misc/bumblebee/Manifest
@@ -5,6 +5,6 @@ AUX bumblebee.initd 485 BLAKE2B 7583befe5a3e3b699bf895f1e4ac445dbe1bbbb172ef0c9e
 DIST bumblebee-3.2.1_p20170130.tar.gz 63428 BLAKE2B 33a2fbbd6e6cbc6cd026b87714d06e54d8803cc75e997cc1bd1aa1d1263c3fe9602f822b92c67fa7e76632bb19daaae11e591b88d087889a970d374f6316e847 SHA512 b457e8ce197782bd1b1fabd3c0c67e4ec26cdb90a3715bbe7a8e1550cdde19134151567cfa0c73d800c30e5d303b30bc1261d5f3cbceaa64d559416e4d541070
 DIST bumblebee-3.2.1_p20190421.tar.gz 63640 BLAKE2B 62bf3e7556b3cc3651f0e1f9fabd22501b82e78c0820b5ae113fddc24816cefd9c788a33d506944dc971092ae22dc3389ced79da6284a5e812ffad909bb03ebd SHA512 e24de3b60e55828ccbbd85774b9a776ba01b62850489b9d7952c4bf807f080b68d084f11de540a65d1bf78f6a35ce89d35f868de14e7ab9d768cdf21a1d422ec
 EBUILD bumblebee-3.2.1_p20170130.ebuild 2219 BLAKE2B d422665f2e8033f644162a7ade48b83f7416747ce29a3dcaca58190054510e445bc72515d36e435dcf6990960ea1db852b3dab8b4cdc9ff42da54f6d1c174b93 SHA512 38bd8fe978bed7807f5fda4d6d48fbd97e648cd47e022efd5b11f5805aea5c175cb091eca7ae4f0da8faf67d8e27c49eae89691516932c63805258e85b080e28
-EBUILD bumblebee-3.2.1_p20190421.ebuild 2310 BLAKE2B f6440bdfdc01b6c9d40b9fd0ffce6eab1bd2ba63f0987d508e8fbbcbb560f6c6a5cc91afb0413a9eb327346874ba533f79bdfb294a42345d10e6ce47a3d7e172 SHA512 62beb1f2f3a134251c4657985edf1b0eda809f021cd8470089533a92b01b46433ef51b644c2f267b0cbd59c78708f6ea1c8976d100d41424583283b961da1b50
+EBUILD bumblebee-3.2.1_p20190421.ebuild 2317 BLAKE2B 5189a2f0ab287b44c2fd72f5f4f06734e4db53db95ff2b98cf093a01202f1764275483f03a7383f82e0799135976a7d8b039870d626f9959ecf8072fcf623d3d SHA512 75ecf2b663e7f72ddc38a55a56783e218d9f6f2ac6e8bb91ddda91e902f0841c1c1b655679e9316981a4398f84df6baf4630e6102dfc17e7f5534c120d896acd
 EBUILD bumblebee-9999.ebuild 2215 BLAKE2B f9f61a4183cc43c2c1442101b433fec6a3477d6062da340d8421e0e63398927c5767177ea4d3c98ef87bd261de39b821d003d7a67e209de21b47c57c5e7aed21 SHA512 7da89e2bf3ee757b29fde2757dba5e63c157ff0b15b59d244df8ec43ce9a25adcd00b6f149b694488a916eb7d293b6a59d48e40c18eb94b4be1e9fa35c26a69d
 MISC metadata.xml 1111 BLAKE2B 9f9bcd089280889ccb6990617f6b470c0c69a8b77b2af849d5bde7ff45ec94e121569d2c217a87d7375e19503bf0d90de775c514e7b400c0dd2a6fbc897c21b4 SHA512 dc2f37b1def7e302fc3d82325d3179b0c64c96b2fa609f6cf5196cb97b89854fade361005327ee2f8ccc5927e0aefe1c997cf5e6f9862cc18ef09deb3a2aa814
diff --git a/x11-misc/bumblebee/bumblebee-3.2.1_p20190421.ebuild b/x11-misc/bumblebee/bumblebee-3.2.1_p20190421.ebuild
index eb6477c36832..b45b50e5519a 100644
--- a/x11-misc/bumblebee/bumblebee-3.2.1_p20190421.ebuild
+++ b/x11-misc/bumblebee/bumblebee-3.2.1_p20190421.ebuild
@@ -9,11 +9,11 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Bumblebee-Project/Bumblebee.git"
 	EGIT_BRANCH="develop"
-	KEYWORDS=""
+	KEYWORDS="amd64 x86"
 else
 	COMMIT="7aa457fe7b4fffc3b175ad36fdae00d7777065dc"
 	SRC_URI="https://github.com/Bumblebee-Project/Bumblebee/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 
 	S="${WORKDIR}/Bumblebee-${COMMIT}"
 fi
diff --git a/x11-misc/compton/Manifest b/x11-misc/compton/Manifest
index f2a548b81aea..a642efc381bf 100644
--- a/x11-misc/compton/Manifest
+++ b/x11-misc/compton/Manifest
@@ -1,4 +1,3 @@
 DIST compton-0.1_beta2.tar.gz 144239 BLAKE2B 993c091aa0eab4171740a26c4ea8e9da66368fbcddbbdf9c466dd2cb2dbe0a685dc6c2027a5b56d08df4fd42d21784dd2cbb7cf56869feb1b74b4854db20a5f8 SHA512 c3a019d90e32559d44e3a4969bcc15a15837db9c9519ce8cc70b1bd3d0cb16d29449f68cc2f6a8d834569c9620ec6533ab85c1586da957c69b1ae341d9584535
-EBUILD compton-0.1_beta2-r1.ebuild 1622 BLAKE2B bc94eb7180dc20d20d20cdc8dbc85180ebfe2b94ef73637b215fbd8c138bcaddf6c0f87db7417710e73f46b9bea8631e04d958775306deabc5ee69860fa13fb1 SHA512 eb576faf20ff968a86bfe6a09530b7284870e31eab7eac31185ff34f07c8e6cadccdb4fde039556c77bf72fd7b588b8ab58984d78938862a29961dce9153d0e4
-EBUILD compton-0.1_beta2.ebuild 1612 BLAKE2B c2bb025332d6e10ad0b8e9f862b2276f70d9ba8ff4001659a961424859d3615837e40be4c1da718f2c7d710760a227a18260c6cadadbcf21efe8c43dabdb01ce SHA512 9602222cc536892d0f1538b59bb768b379f093eb45641fb362f28ff5013dee6e8715039f0256ef075706998871ce06bdb9673d9edf748abb1004926aa1a5cf5c
+EBUILD compton-0.1_beta2-r1.ebuild 1620 BLAKE2B 4ce7494998b74587207b657a32aed32cd1fe646c543b656d2ae827e0c919f0d4daf7697e4ac9d7065f48f77ec52a74da8e9eee5e49068ddcf779abb04ecc4589 SHA512 bbe8af1a62d6265a806fbbeaef851489da3ecf13a6f70565be5a04a0ec49bbb4240539478a4fe559f9724652a7cc097aacd4237e52d2fa9140bd0e629b494ca9
 MISC metadata.xml 484 BLAKE2B 903744ba49b9aaae86cec59c83f96f02da325d17813d6ceaedd88eab1450ae76eac7a40c9e1b44086651efd21e5580b605b9095925625fa3bb1e6c708ed8809f SHA512 d01d17901f47f7e2c0201c0a6665d0e27693ac42b27ef8dce8a78763ec775a41fed88b4565db434351a2c9d01e762121bca3f347f467e77e71bde66f019640cb
diff --git a/x11-misc/compton/compton-0.1_beta2-r1.ebuild b/x11-misc/compton/compton-0.1_beta2-r1.ebuild
index 1b4cdd3e8453..696c1d85125f 100644
--- a/x11-misc/compton/compton-0.1_beta2-r1.ebuild
+++ b/x11-misc/compton/compton-0.1_beta2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/chjj/compton/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="dbus +drm opengl +pcre xinerama"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/x11-misc/compton/compton-0.1_beta2.ebuild b/x11-misc/compton/compton-0.1_beta2.ebuild
deleted file mode 100644
index feff59e96fab..000000000000
--- a/x11-misc/compton/compton-0.1_beta2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit toolchain-funcs python-r1
-
-DESCRIPTION="A compositor for X, and a fork of xcompmgr-dana"
-HOMEPAGE="https://github.com/chjj/compton"
-SRC_URI="https://github.com/chjj/compton/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="dbus +drm opengl +pcre xinerama"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-libs/libconfig:=
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	dbus? ( sys-apps/dbus )
-	opengl? ( virtual/opengl )
-	pcre? ( dev-libs/libpcre:3 )
-	xinerama? ( x11-libs/libXinerama )"
-RDEPEND="${COMMON_DEPEND}
-	x11-apps/xprop
-	x11-apps/xwininfo"
-DEPEND="${COMMON_DEPEND}
-	app-text/asciidoc
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	drm? ( x11-libs/libdrm )"
-
-nobuildit() { use $1 || echo yes ; }
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		tc-export CC
-	fi
-}
-
-src_compile() {
-	emake docs
-
-	NO_DBUS=$(nobuildit dbus) \
-	NO_XINERAMA=$(nobuildit xinerama) \
-	NO_VSYNC_DRM=$(nobuildit drm) \
-	NO_VSYNC_OPENGL=$(nobuildit opengl) \
-	NO_REGEX_PCRE=$(nobuildit pcre) \
-		emake compton
-}
-
-src_install() {
-	NO_DBUS=$(nobuildit dbus) \
-	NO_VSYNC_DRM=$(nobuildit drm) \
-	NO_VSYNC_OPENGL=$(nobuildit opengl) \
-	NO_REGEX_PCRE=$(nobuildit pcre) \
-		default
-	docinto examples
-	dodoc compton.sample.conf dbus-examples/*
-	python_foreach_impl python_newscript bin/compton-convgen.py compton-convgen
-}
diff --git a/x11-misc/efax-gtk/Manifest b/x11-misc/efax-gtk/Manifest
index e171af653ac9..1c9d0d381d6e 100644
--- a/x11-misc/efax-gtk/Manifest
+++ b/x11-misc/efax-gtk/Manifest
@@ -1,8 +1,6 @@
 AUX efax-gtk-3.2.13-fno-common.patch 890 BLAKE2B b21b9e622b33f0691b5cb5d32deaa2beb9b86720b9c41f34f68080a5347066942e34c8cd62d867b182a0b6199304b226ca406b6edade3d74fd5c998c8bb44f90 SHA512 723713ba260ecf77886a5888ed28f3eae48f26461c178787707a888bf910e9bf238256816c659cb9534f0765cc056cc5dd15581d905435ba7d778488e189ead8
 DIST efax-gtk-3.2.14.src.tgz 1241132 BLAKE2B 8907907681076d9238219a42c7a490f15b988019be2dd291131fd48122421f8f9476ae59f4832395ff56c44b0981490f3c38c49df643dbc1125f33e735392bbf SHA512 28e0814c209c4c398a27b4f421b0902942fb2088e94d992c344093d755a74176cedce2912ad6f5c0a21fde1fc57acd8c5bb97bd98c42b76bdf2ab1b5919a595e
 DIST efax-gtk-3.2.15.src.tgz 1253414 BLAKE2B 1cd5eadced1e1ad03cb3d05b2068ce232c5632cebdba3320b721b773685f9ba4f1c69f4f0f0f0e261fce127ccaeb2f8eb5b95a4f6cbcc7adcc36c4a22729acb8 SHA512 83ba678162c2ec5c62eeba941a712f507aaeef3a42dfffe8a7dedca72af5ee46626e9c709d7617fc3bf62191ce0f6b10bac2498e1996cc45270db638fdfb7e63
-DIST efax-gtk-3.2.9.src.tgz 1176921 BLAKE2B 327ee205a747bc6f3909143b79ae9754009bb29ca35a755581d7a1a6604a76deb0b17ae9c3a679652d2216668c540e2074432c88bb31ef5322d9723c8382fa2f SHA512 a2a4a648b95f9143f8ad3b42c3f8f86323a2b312fed87616eddeaebe06742a5a4ae841d79f3078bf9e819288252ad4d79ec429a66116c1d2b8df8a8a13cac806
-EBUILD efax-gtk-3.2.14.ebuild 1201 BLAKE2B 692c8484abf6af95bcb7c993ff17dfe30a7b365930ee5d127e17614c855ad17eeab53a92ede35caf1cbb7e2a8bb337427696267a85a526d24ebc482099a1c627 SHA512 7ff07a8547d5d9acd71423234b4723eb5f6a22b580ee6fd4df94609a1f43ad8b3785b94df7bb5f9cc82966abc84ae01affc0aa1c7827ed07f2fc28125238475e
+EBUILD efax-gtk-3.2.14.ebuild 1199 BLAKE2B 36a88b655703d690310c5c4b37113bf2d164d9f55608461bdefe18d01a7d03bfac1ed1cebba69501a678c9a1f90390e649946d79c255eda3ac419f4a33cc06c9 SHA512 99fe4a109e775b8bb3a5c4afa688ad59a7dac7f136a29477db06dd7a92929d4d52f3ab397d72a9a8c4aa3501d7cc098a5dc67bc913e28227f88e585995eea240
 EBUILD efax-gtk-3.2.15.ebuild 1144 BLAKE2B aeb18760930539ad906618917327ef72332d5f068a8d3abe3de1602ceca6dfcadc05454b1af0d4c9cdf9f912ddc072332993a1b2b7232c4157f9f9d0f0bec582 SHA512 77b30769cc8bf783d8a7923e9d18c84a4ce4526dc827b9cbb8993a2374452598def6790fba3c71d9fef242ea00ffa2baf8c3b56d92c44c1460cd998c924bae87
-EBUILD efax-gtk-3.2.9.ebuild 1209 BLAKE2B f49936691e5286b360fe284130d14ba1a61e64502d9ffa6c502c49ce5b8e21e0ced3ffdad62ccdc7167ead726312bb04158a667133aed43e9bfaaa15047e35c3 SHA512 c2e20282c1dc1a7b59dfb7088da0ab6dda7f10027e63e90655207456136bf108f45d28ad8e20480e9ef17e22df3aa461bb4016a3c77719c42f6205b938baccc6
 MISC metadata.xml 354 BLAKE2B c4168be07b9ff9bb2a00459999ce4cd94ce8a0e2da7253df4c3a9c2ceed596e46e589d508dd4b561869ead4cda8c503a88de2256eec027e95be4191c7fc7aecd SHA512 6b32fac40a7eeabdbc54a4416d05fbe7d516b95056d00b4ecf5f707a667b53994fe519f653dbc2c00b48354698602c5b961684f9cfa67e1e6bc75faaabf3941f
diff --git a/x11-misc/efax-gtk/efax-gtk-3.2.14.ebuild b/x11-misc/efax-gtk/efax-gtk-3.2.14.ebuild
index 226321974658..776229b9a314 100644
--- a/x11-misc/efax-gtk/efax-gtk-3.2.14.ebuild
+++ b/x11-misc/efax-gtk/efax-gtk-3.2.14.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.src.tgz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.10
diff --git a/x11-misc/efax-gtk/efax-gtk-3.2.9.ebuild b/x11-misc/efax-gtk/efax-gtk-3.2.9.ebuild
deleted file mode 100644
index 42e3dab12b44..000000000000
--- a/x11-misc/efax-gtk/efax-gtk-3.2.9.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="A graphical frontend for the 'efax' application"
-HOMEPAGE="http://efax-gtk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.src.tgz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="nls"
-
-RDEPEND=">=dev-libs/glib-2.10
-	media-libs/tiff:0
-	x11-libs/libX11
-	x11-libs/c++-gtk-utils:3
-	x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-DOCS="AUTHORS BUGS ChangeLog README"
-
-src_prepare() {
-	# Prevent sandbox violation with chown/chgrp and existing spooldir
-	sed -i -e '/ch.*lp.*spooldir/d' efax-gtk-faxfilter/Makefile.in || die
-
-	sed -i \
-		-e '/^Encoding/d' \
-		-e '/^Icon/s:.png::' \
-		-e '/^Categories/s:Application;::' \
-		${PN}.desktop || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		--with-gtk-version=gtk3
-}
-
-src_install() {
-	default
-	# https://bugs.gentoo.org/401221
-	mv -vf "${ED}"usr/share/man/man1/efax{,-0.9a}.1 || die
-	mv -vf "${ED}"usr/share/man/man1/efix{,-0.9a}.1 || die
-}
-
-pkg_postinst() {
-	local spooldir="${EROOT}"/var/spool/fax
-	[[ -d ${spooldir} ]] && chown lp:lp "${spooldir}"
-}
diff --git a/x11-misc/fbpanel/Manifest b/x11-misc/fbpanel/Manifest
index 9cb0c2ca416a..0360031d90b3 100644
--- a/x11-misc/fbpanel/Manifest
+++ b/x11-misc/fbpanel/Manifest
@@ -2,8 +2,10 @@ AUX fbpanel-6.1-underlinking.patch 789 BLAKE2B f0995b59f54eb5da7a7b74d470604abae
 AUX fbpanel-7.0-clang.patch 2596 BLAKE2B cb9e42fb7afaf007d49c54270ee6e09a551ee5c538d82b4cf4eb1c79663b6bc517e3d4da0117c4fbc5030df0c907289ef843cf59ca3dec69ba8f5ad3e8a1aab5 SHA512 78dfea33f3a29b857768b64bc6ea61404dee3cb75587500e98e17aeecf92a310abf1796577d433e13aab4a5524ce2400906d0e6ce2ab468a488dbae03857902f
 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-shebangs.patch 2348 BLAKE2B 8a68eb84f0d4c28e23483724c2600e10375e6bd96bbe640f6d1ff4ef47c17ae140873229e95322de2fd825cf5dd54d6eca6a08a4058e70d3b185f4f8b1d3440f SHA512 547367bc298548b0936e4b83e8ddccc9c9e689f5aac8a7aac1ef5e09050ce33936dba4c39d971c4f3ff5065daa55bc28989588cb08e8277ca9e201ca6994eec7
 DIST fbpanel-7.0.tar.gz 3746477 BLAKE2B 6bc8ef39d44768b5fc9fc4c58ea0b89c723f0e5239198d3b1a5f6fe27252bf22c87fec5beb13fa3371af6c218e592d67d04644bd82cc62f357def610680fc2d2 SHA512 9706a96569c41241de4dbd250c9d6a473b53a5e26e880f4c782041b2b91c7570046e1bee3070059fd2d333fb7159490732ef397b86701c72d4c65c0784948874
 EBUILD fbpanel-7.0-r1.ebuild 1427 BLAKE2B 08a3742360ffe73505eb75d96aa64d662f935ce88a1ebece48bcb5c6f862920d5636fc7ebbcf752cebc7e3bdc9a6fd77c311ded7b9a8786d63278a16838558e3 SHA512 3161ec424feebf681fbae71432207348d0a41d834e8f7bbaca834b4e5c827206525d1841dffc129225b8e6a3a8693157ed9dd4610f2becd03e0e28b201a88a76
+EBUILD fbpanel-7.0-r2.ebuild 1533 BLAKE2B 2f5d874331e3618056974297856dc1a0868cf61d54095d44adf60fceaebd45774be2fa5d1a4fc41ef28d1e0970196c9a2ad31f69d0e3e0b7c4054e9b8f14cad5 SHA512 e22fac287617a349c1e80e4adc16bedf6d3bc2e0a73bc543ba0389d801c7f3a9c714c0710bfa44c1adde58a0b0736dc582f7fdd9135f17a35173ddf6e6bc9971
 EBUILD fbpanel-7.0.ebuild 1334 BLAKE2B 2bc40160ddc4e6b4543527fb273ec0006a06006fb2571294c5d5a87be1c39bc26d688479bc78bc135cf8482edf7d91a3baf5a380c2f6e493f8595f405dcb9314 SHA512 e5506238b3c62e5e3ce86d3b75883f6dee9e6a87fa1fddea8ca8163ccc71116e2d4080d0fb636b4e9302d135dff013e4c7fea2a7594d36b0e3ee923d907fa57e
 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
new file mode 100644
index 000000000000..b122768dea13
--- /dev/null
+++ b/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit python-any-r1 toolchain-funcs
+
+DESCRIPTION="light-weight X11 desktop panel"
+HOMEPAGE="https://aanatoly.github.io/fbpanel/"
+SRC_URI="https://aanatoly.github.io/fbpanel/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+IUSE="alsa"
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gdk-pixbuf:2[X]
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	alsa? ( media-libs/alsa-lib )
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1-underlinking.patch
+	"${FILESDIR}"/${PN}-7.0-clang.patch
+	"${FILESDIR}"/${PN}-7.0-fno-common.patch
+	"${FILESDIR}"/${PN}-7.0-images.patch
+	"${FILESDIR}"/${PN}-7.0-python3-shebangs.patch
+)
+
+src_prepare() {
+	default
+	2to3 -n -w --no-diffs configure .config/*.py || die
+}
+
+src_configure() {
+	tc-export CC
+	# not autotools based
+	local myconfigure=(
+		./configure V=1
+		--mandir="${EPREFIX}"/usr/share/man/man1
+		--datadir="${EPREFIX}"/usr/share/${PN}
+		--prefix="${EPREFIX}"/usr
+		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN}
+		$(usex alsa --sound --no-sound)
+	)
+	echo ${myconfigure[@]} || die
+	${myconfigure[@]} || die
+}
+
+pkg_postinst() {
+	elog "For the volume plugin to work, you need to configure your kernel"
+	elog "with CONFIG_SND_MIXER_OSS or CONFIG_SOUND_PRIME or some other means"
+	elog "that provide the /dev/mixer device node."
+}
diff --git a/x11-misc/fbpanel/files/fbpanel-7.0-python3-shebangs.patch b/x11-misc/fbpanel/files/fbpanel-7.0-python3-shebangs.patch
new file mode 100644
index 000000000000..5f98657b42c2
--- /dev/null
+++ b/x11-misc/fbpanel/files/fbpanel-7.0-python3-shebangs.patch
@@ -0,0 +1,120 @@
+--- a/.config/help
++++ b/.config/help
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/env python3
+ 
+ import re, os, sys, textwrap
+ # Formats help message
+--- a/.config/repl.py
++++ b/.config/repl.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/env python3
+ 
+ import re, sys
+ 
+--- a/.config/tar.py
++++ b/.config/tar.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/env python3
+ 
+ import subprocess as sp
+ import re, tempfile
+--- a/configure
++++ b/configure
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/env python3
+ 
+ import sys
+ if sys.version_info < (2, 7):
+--- a/exec/make_profile.in
++++ b/exec/make_profile.in
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+ 
+ umask 0077
+ # new profile directory
+--- a/exec/xlogout
++++ b/exec/xlogout
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+ 
+ # xlogout - logs user out of its X session
+ # Linux specific since uses /proc
+--- a/scripts/endianess.sh
++++ b/scripts/endianess.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+ 
+ # When cross compiling, you may put cross compiler directory 
+ # in PATH before native gcc (aka spoofing), or you may set CC 
+--- a/scripts/install_locale.sh
++++ b/scripts/install_locale.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+ 
+ dir=/tmp/lo-$$
+ mkdir $dir
+--- a/scripts/install_locale.sh.in
++++ b/scripts/install_locale.sh.in
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+ 
+ dir=/tmp/lo-$$
+ mkdir $dir
+--- a/scripts/install.sh
++++ b/scripts/install.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+ 
+ usage () 
+ {
+--- a/scripts/mk_tar
++++ b/scripts/mk_tar
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+ 
+ 
+ function info()
+--- a/scripts/rfs-pkg-config
++++ b/scripts/rfs-pkg-config
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+ 
+ # Tt runs pkg-config in a way that everything is searched under RFS
+ # but reported including full path. Suitable for cross-compiling
+--- a/scripts/update-proj.sh
++++ b/scripts/update-proj.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+ 
+ function usage () 
+ {
+--- a/www/plugins/mk_gallery
++++ b/www/plugins/mk_gallery
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/usr/bin/env sh
+ 
+ echo > "$1"
+ #echo '<table cellpadding="0" cellspacing="0" border="0" align="left" bgcolor="#ffffff">' >> "$1"
+--- a/www/shots/mk_gallery
++++ b/www/shots/mk_gallery
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/usr/bin/env sh
+ 
+ function help ()
+ {
diff --git a/x11-misc/gpaste/Manifest b/x11-misc/gpaste/Manifest
index 33a47a24ac57..398a6229a81a 100644
--- a/x11-misc/gpaste/Manifest
+++ b/x11-misc/gpaste/Manifest
@@ -1,3 +1,3 @@
 DIST gpaste-3.20.3.tar.gz 157869 BLAKE2B 02b52b8023c875bd3c651cc5864603812f0cfd49cfac774ee4e27eae63c66e46f34d5128b717af514cc1c57fb93a775ff01f827210bd7cfa5e9ab5de9a87fd07 SHA512 08b7c52d16e630ac57e4d583ae985763b536728ef9997ce5ecc8a8ffb9be8745e1e5aed9003a4ab522ba76a276855c6a095fef7a73b4f4d80b54c7a9c3e6e9d1
 EBUILD gpaste-3.20.3.ebuild 1462 BLAKE2B 4c08db2d5cf05e824dd0e380b817a439d3b807daf5f6f800b33a3b5a996dd6c76b645eca63e018b1a9a1681c7a80b7e0da17fe45deeb34df3d64c1e658dedf25 SHA512 1579bc767610f4acb79fb6657a5723bc81a59713ab2251ff5e90bbbf11facd4ed992c06f9f817d154d382ab75e3e25c849ed676d42cd646095f8629f3479ec12
-MISC metadata.xml 595 BLAKE2B 7a8327f78e0e4cb106350051ff89a5677401e9ffa2d833e424da1f14a89c3147e59be124e6e0a26a3609f57c8a6078a00b6fce6a8f36889bafa5021539c0d89a SHA512 8fca7baa9d40775abe8ce7db98c5fc8e882d96e6200db5d84b6b1964369d6c499e344b30826c405368a18ca0f2caeab94d8dc44f648fe10f317075d82f60ca3d
+MISC metadata.xml 404 BLAKE2B b3bee2faf7f5e7ebaa212dcf5926437b55877bd5d9a3988db09c78411f8f24eb4c60db56ca4ea021c064ede1079f33598e096f8e1e793abef0a5c0aef27b0e82 SHA512 fbd89391c9bf83754466bd2d2dc590d819292eb1e2aa29d3c66e22c32c599ad0ccbeef93ad706326c4aa0665c5ca4448cedf5485694ae076a1b3794e5f33b999
diff --git a/x11-misc/gpaste/metadata.xml b/x11-misc/gpaste/metadata.xml
index 306c2a798778..b673fd439b9f 100644
--- a/x11-misc/gpaste/metadata.xml
+++ b/x11-misc/gpaste/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>leho@kraav.com</email>
-		<name>Leho Kraav </name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="applet">Enable gpaste-applet</flag>
 		<flag name="gnome">Enable proper gnome support and
diff --git a/x11-misc/grub2-theme-preview/Manifest b/x11-misc/grub2-theme-preview/Manifest
index 3c243f9b2a31..5f607803b60c 100644
--- a/x11-misc/grub2-theme-preview/Manifest
+++ b/x11-misc/grub2-theme-preview/Manifest
@@ -1,3 +1,5 @@
 DIST grub2-theme-preview-1.4.2.tar.gz 197383 BLAKE2B e380b63fd700352fa769b86da4aa9204f0f6e375f91134cc306d2bc0b108637c17127cb22ea06259338552cf04c9087a77defa3809c759e6b8931435da79ce98 SHA512 5f53d5da1ac3fa2d6597ee88df28a4e406eb5c824ea126d4386dca3718bfe4350bf399c5a4055479d34d5dd75b947e0f0af19c1533a0ee6474fea550387f676a
+DIST grub2-theme-preview-1.5.1.tar.gz 197976 BLAKE2B 561090bc4ab7fc6d170521380fe595e8db6ef553a5359bd5a1b42e986f2aab52a6c08ce0f5183dd8aa6d87d8bb44410cf6df80cb69781557cadb9f35b19ee5cf SHA512 a96ee503b793707ce59a0a691c3a0b7eaf206d0780de4f3ef53c6d6c05ab23c9dc58774a40043a35bbebdc4becc5414e520b9e5c805953c9145435d644aabfe9
 EBUILD grub2-theme-preview-1.4.2.ebuild 558 BLAKE2B 317dbdc198362cc346ffec5e7bf1e40fd6c878f045e30979c572f0bff1ee49dfeb2a1c189c5a081a8fac7e074cd5b186af57ecc6a41cf333b6b431321d5566f0 SHA512 13b78b3eb848220ca63b40ac1749473a8642d8af0b97a2e4d6868b063045db533bccd3b9c9af982677407118ad41675a355d0f811c48ea66e5fff40b4454422e
+EBUILD grub2-theme-preview-1.5.1.ebuild 743 BLAKE2B 300937ef4a2f6f4bfbb2fbcf4d06a9d8de98c4302b70cbc38ba189b7aec48891f787608c8c5b2b1dd246b0ec60b96a4bd47a04eb36221472f1584bd1bf111e90 SHA512 25003f6009f5513048e175c7275b2e1e0beb67964cac966fdcec65b65aaa928060e58ed2579341404011b3396b8aa9e68b4bbf5c44acc3b4c58dbf984990f2f9
 MISC metadata.xml 342 BLAKE2B b12306a165fac0714ee6a833ed2b8de2a5f598e36e38e42e521b10d5d432e980d0673266b571986d851b2be319520c020b8fba860c4cd6c28d76a8f3e72ec811 SHA512 3577ddbd08dfb9a7c5f35a5e6b102620985a932cef550f48c32298f44864c385e7fcedda171107285452d242dd3e03f60a3e6bce8c814e933cf35388e942f35f
diff --git a/x11-misc/grub2-theme-preview/grub2-theme-preview-1.5.1.ebuild b/x11-misc/grub2-theme-preview/grub2-theme-preview-1.5.1.ebuild
new file mode 100644
index 000000000000..c955b14f2b62
--- /dev/null
+++ b/x11-misc/grub2-theme-preview/grub2-theme-preview-1.5.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Preview a GRUB 2.x theme using KVM/QEMU"
+HOMEPAGE="https://github.com/hartwork/grub2-theme-preview"
+SRC_URI="https://github.com/hartwork/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="grub_platforms_efi-64"
+
+RDEPEND="app-emulation/qemu
+	dev-python/distro[${PYTHON_USEDEP}]
+	dev-libs/libisoburn
+	sys-fs/mtools
+	grub_platforms_efi-64? (
+		sys-boot/grub:2[grub_platforms_efi-64]
+		sys-firmware/edk2-ovmf
+	)
+	!grub_platforms_efi-64? (
+		sys-boot/grub:2[grub_platforms_pc]
+	)
+"
diff --git a/x11-misc/imake/Manifest b/x11-misc/imake/Manifest
index 9382cfc8dbc6..5c37fe71b5dd 100644
--- a/x11-misc/imake/Manifest
+++ b/x11-misc/imake/Manifest
@@ -1,3 +1,3 @@
 DIST imake-1.0.8.tar.bz2 159398 BLAKE2B 2ea03a06daab883a35ac4ef5c5598db89c84b2bbc41105902f64ffaf66a2e5cebaa28bef0ee7d258eb7279eaa95671b8798701423cafffe87d8feced5bc1b63d SHA512 5352b0148664506c8eb7ba80f95fced146d150398673547ba0b2c7c966a382bc21de43dfb8e0d74e38a0a563f16ddbec48bf8c8e6daa1a0899a95403579d7728
-EBUILD imake-1.0.8.ebuild 460 BLAKE2B 7833a22996f3089960f280c83604e789d3e7d81db4563f445498a715fc7058119f48bd2a479e06ca1011f383760dd5e701315d0e27f1a3d3f573883bebd06ef1 SHA512 f3f9dbb71543b770b22dbc4979709d625f859d5aa8ff4a7e2aa9971768621e83cbc219eda4fe2ff1c64be60c3977a6599d85366add8b40f9d3a6b9986f27bf50
+EBUILD imake-1.0.8.ebuild 532 BLAKE2B 3c6354087421c8df7c4b49057309f1d5cde8b7e8a2edf0586d7b815840166ae4ca8c27395697ee48e0468b2b70feb27151b9b7dd57f4792562528fb572676c2b SHA512 d5e3a4e6127859738a4a26690cc3fa6182f55a1ea4fea2931b5f68923dbb45efc09ecb639217c01b0839eea278f3859bd3823db4257fd9c8f7c842f3564d99de
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/imake/imake-1.0.8.ebuild b/x11-misc/imake/imake-1.0.8.ebuild
index 4e2c15dde421..4ace6394603e 100644
--- a/x11-misc/imake/imake-1.0.8.ebuild
+++ b/x11-misc/imake/imake-1.0.8.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 XORG_STATIC=no
-inherit xorg-3
+inherit toolchain-funcs xorg-3
 
 DESCRIPTION="C preprocessor interface to the make utility"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
@@ -13,3 +13,7 @@ IUSE=""
 RDEPEND="x11-misc/xorg-cf-files"
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
+
+src_configure() {
+	econf CPP="$(tc-getPROG CPP cpp)"
+}
diff --git a/x11-misc/imwheel/Manifest b/x11-misc/imwheel/Manifest
index a74de258c04c..d3be4ca3e401 100644
--- a/x11-misc/imwheel/Manifest
+++ b/x11-misc/imwheel/Manifest
@@ -1,3 +1,4 @@
+AUX imwheel-1.0.0_pre13_p20100827-autotools.patch 993 BLAKE2B a935fabbd39ec5cfb51bacf635f1c59d01775fde305a149c4e2899219de26305f19be6dcb05fed313a5c0acf062e28322c7b2bba85483fa939851e72f3d49123 SHA512 8c632ea2a0dbc7501a10ae0e62fd38cc777b5647d321a8cf5ab53f2d351779be8656b275242dcba7d70a639f06018ab1ffc0f1dd4baebe7014f5c34b88651e2a
 DIST imwheel-1.0.0_pre13_p20100827.tar.bz2 125776 BLAKE2B eda41d2d3ce7f057dd71fbbfb4304064134fe37068788182880fcfc6727c12f5748bac40f3115e8be0093c027373689b7375c58487fe8c5a97d0b1e9c297431e SHA512 3b5ae23a1762122f6fe86610da6ad65118e8e743a88f370d6f6cdd084b4aa5f08d3089fccf3fca3a69b06560d7c2d7cfecfde1375154af9f519c0d4fe996080c
-EBUILD imwheel-1.0.0_pre13_p20100827.ebuild 689 BLAKE2B d534d2384f4db666e061aad547007effc41c35d8ff53194f6c8ff5aef0cc02be7259832b8ae4828c7a654081773cb99004f0326e94a23f7006792d83f5a750b6 SHA512 b5cddb76ec536eaed2eb74880169295ca7eb61b7660475372d233a0e9784de48abb6adf141efa74abe4e3b3d39ddee6a6ee5bb5feb866d303a116b19de4bfda3
+EBUILD imwheel-1.0.0_pre13_p20100827.ebuild 705 BLAKE2B 74785d7bc902743aa15b6fed21122f3af9e61588c7cd0bc94bc2078d61c7991691eef5d20ce982fd595c9c66b4947e66b256281f12bf9a4f608afd9b61139777 SHA512 895e0bbfade253f5b15baa68198e7828eb1a8bd6d482c6ff1d2f7ba0ce8904bb397b95a0bcf3106f92dee7ab88b4d203d5b13cad139f83280554ef3c28852250
 MISC metadata.xml 353 BLAKE2B 4d6fa01905f2aa762571614af6aa45f09e2972d06af9e6d4b09b4be4844e4ad42fa1c9010995a53f1365ec53e7fa712dc385406b8b607e5ca07a2e174af7a48f SHA512 2cf1e0e8cf35f3aa5b0e543a694ab9869f28ed457dbd7294463bdbe96960cbd63709fc8557f7e1c8ef0d2c77e1a6ffebf4d39ed6a5e52a3683d8d6f336d76ef5
diff --git a/x11-misc/imwheel/files/imwheel-1.0.0_pre13_p20100827-autotools.patch b/x11-misc/imwheel/files/imwheel-1.0.0_pre13_p20100827-autotools.patch
new file mode 100644
index 000000000000..e889f2a694ae
--- /dev/null
+++ b/x11-misc/imwheel/files/imwheel-1.0.0_pre13_p20100827-autotools.patch
@@ -0,0 +1,32 @@
+--- a/configure.in
++++ b/configure.in
+@@ -15,6 +15,7 @@
+ AC_PROG_CC
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
++AM_PROG_AR
+ AC_PROG_MAKE_SET
+ dnl AC_PREFIX_PROGRAM(bin/imwheel)
+ AM_CONFIG_HEADER(config.h)
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -22,7 +22,7 @@
+ 		find $(distdir) -name CVS -exec rm -rvf '{}' ';' ; \
+ 	done
+ 
+-ETCDIR=/etc/X11/imwheel
++ETCDIR=$(DESTDIR)/etc/X11/imwheel
+ 
+ install-exec-hook:
+ if SUID
+@@ -31,8 +31,8 @@
+ 	chmod u+s $$progname
+ endif
+ 	$(mkinstalldirs) $(ETCDIR)
+-	-[ -f /etc/imwheelrc ] && mv /etc/imwheelrc $(ETCDIR)/imwheelrc || true
+-	-[ -f /etc/X11/imwheelrc ] && mv /etc/X11/imwheelrc $(ETCDIR)/imwheelrc || true
++	-[ -f $(DESTDIR)/etc/imwheelrc ] && mv $(DESTDIR)/etc/imwheelrc $(ETCDIR)/imwheelrc || true
++	-[ -f $(DESTDIR)/etc/X11/imwheelrc ] && mv $(DESTDIR)/etc/X11/imwheelrc $(ETCDIR)/imwheelrc || true
+ 	-[ -f $(ETCDIR)/imwheelrc ] && install -m 644 imwheelrc $(ETCDIR)/imwheelrc.new || install -m 644 imwheelrc $(ETCDIR)/imwheelrc
+ 
+ extras: $(EXTRA_PROGRAMS)
diff --git a/x11-misc/imwheel/imwheel-1.0.0_pre13_p20100827.ebuild b/x11-misc/imwheel/imwheel-1.0.0_pre13_p20100827.ebuild
index 0898ec96384e..b2028583345f 100644
--- a/x11-misc/imwheel/imwheel-1.0.0_pre13_p20100827.ebuild
+++ b/x11-misc/imwheel/imwheel-1.0.0_pre13_p20100827.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
@@ -12,21 +12,23 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ppc x86"
-IUSE=""
 
-RDEPEND="x11-libs/libXtst
+RDEPEND="
+	x11-libs/libXtst
 	x11-libs/libX11
 	x11-libs/libXmu
 	x11-libs/libXt
 	x11-libs/libXext"
-
 DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	>=sys-apps/sed-4"
+	x11-base/xorg-proto"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-autotools.patch # bug 726140
+)
 
 src_prepare() {
 	default
-	sed -i -e "s:/etc:${D}/etc:g" Makefile.am || die
+	mv configure.{in,ac} || die
 	eautoreconf
 }
 
diff --git a/x11-misc/j4-dmenu-desktop/Manifest b/x11-misc/j4-dmenu-desktop/Manifest
index 05469706d543..03ad56bbf510 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.ebuild 844 BLAKE2B c7a6cd3d14f91e26e27012b8d47828753d3c966d146a10feb177aab0153cc6870266f7bc2b14cd24032ecaed9516c14ae3adddcd49b100d2b686df227fc6d3e4 SHA512 74f3fb875e880382c82077aafbb2a9c2174befb17456cf8601f18ff21604805c44a6152fe07513137b3d08c86411257a79832d5e82b750165a0c54e66d769070
-MISC metadata.xml 590 BLAKE2B b2f14516c9e17b71672913561ff260cb2cf7ff25d54eccacdbbfd4419224518815c0990ac2c29d7de087b86dac7c5b25be31f25993fb8a8f5b004ad5fe7cc5f3 SHA512 131576f1a9f0ccaa9cc79659e3889371df0a200d7184d1a8efa365ee089353fab875e55bd14d0a01e92c32583f3cafaacd18e8f8282300480d9cf67ad587d3ae
+EBUILD j4-dmenu-desktop-2.17-r1.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.ebuild b/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.17-r1.ebuild
index d95530d4b3ed..8a8d8c7525b9 100644
--- a/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.17.ebuild
+++ b/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.17-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 MY_PV="r${PV}"
 
@@ -14,16 +14,16 @@ SRC_URI="https://github.com/enkore/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="test"
+IUSE="+dmenu test"
 RESTRICT="!test? ( test )"
 
 DEPEND="test? ( dev-cpp/catch:1 )"
-RDEPEND="x11-misc/dmenu"
+RDEPEND="dmenu? ( x11-misc/dmenu )"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# Respect users CFLAGS
 	sed -i -e "s/-pedantic -O2//" CMakeLists.txt || die
@@ -32,14 +32,25 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DWITH_GIT_CATCH="no"
-		-DWITH_TESTS=$(usex test)
+		-DWITH_TESTS="$(usex test)"
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	doman j4-dmenu-desktop.1
 }
+
+pkg_postinst() {
+	if ! use dmenu; then
+		elog "As you have disabled the 'dmenu' use flag,"
+		elog "x11-misc/dmenu won't be installed by default."
+		elog ""
+		elog "Since x11-misc/j4-dmenu-desktop uses x11-misc/dmenu as default,"
+		elog "you must configure your own replacement with --dmenu=<command>,"
+		elog "as otherwise it won't work."
+	fi
+}
diff --git a/x11-misc/j4-dmenu-desktop/metadata.xml b/x11-misc/j4-dmenu-desktop/metadata.xml
index 4e3a92938dfe..fd4200a47052 100644
--- a/x11-misc/j4-dmenu-desktop/metadata.xml
+++ b/x11-misc/j4-dmenu-desktop/metadata.xml
@@ -10,6 +10,9 @@
 		The purpose is to find .desktop files,
 		but shell commands can also be executed.
 	</longdescription>
+	<use>
+		<flag name="dmenu">Use <pkg>x11-misc/dmenu</pkg> as default. Disable to use a different implementation.</flag>
+	</use>	
 	<upstream>
 		<bugs-to>https://github.com/enkore/j4-dmenu-desktop/issues</bugs-to>
 		<remote-id type="github">enkore/j4-dmenu-desktop</remote-id>
diff --git a/x11-misc/kdocker/Manifest b/x11-misc/kdocker/Manifest
index bf5bc3d8369a..411610c889da 100644
--- a/x11-misc/kdocker/Manifest
+++ b/x11-misc/kdocker/Manifest
@@ -2,5 +2,5 @@ AUX qt-5.14.patch 1037 BLAKE2B a6169aa7146a7e387cfba090177dea98a42d2311fd912deff
 DIST KDocker-5.2.tar.gz 173508 BLAKE2B e44a924a085c2d237c113028f40a98cfa8a8a5398525aea4e38fadabd23a10cc91648a55f800afd2ad398b744ad450d9c7bc26dd5bae994603f6ea4b322b5804 SHA512 1a98bf7b6360f4ce042b3e5330798076d42bd463c16e41b259706811f11516a34acfb0ace59f2c10c07aa6b2ff8fc57b1b1fa3ccdd33d452e220ec46446e8b64
 DIST KDocker-5.3.tar.gz 180861 BLAKE2B b9ee9c2b035fb477e947b1b451d55e76fb4d9ae8788469fc2d05e1721b5ab71657e00e31331b5be6cf8776b37b7032720d4609df29f57e5c66a44d9fc5d38318 SHA512 8e5af389c402f337c75f861b4cc83036486903a9728fbcb6ea812392c297203fad7eec4e7b11eb1db83514fd615094ab9826277b73312ae8ea13b012d82524c4
 EBUILD kdocker-5.2.ebuild 1023 BLAKE2B d6820c8191514cfeef8c0c73682a939cb3efec366d4404a923a50072264c721e6514adf6f9832c9c23598ffd65f28202c8317a06e7b29c627d4afd4df0040888 SHA512 4d7d54c4d3cd5ec9b74b29946dd53c89b296b89c0edc95cd4002a3fafa08b7dd3702ac34982366dc50ea6447bbcd43ae8dfc5fe23384ce0ef7e54247e3587598
-EBUILD kdocker-5.3.ebuild 1075 BLAKE2B 0475f48ef4b05d48f7df8538733b3b50a0bc961c0b0aa945802d09b6c9724b55b551d5b0b0460cf208322190eeba9731d47a2770582ce5cc369bd66d5a21be97 SHA512 daf9c232f3014c53bf852bbf5cd9aff9329a130d88989c78d21719e40a3c65732e821c2b295aba769c534d759af5681068e3a054e93aa78f8ad5ec374aac4ae6
+EBUILD kdocker-5.3.ebuild 1073 BLAKE2B 1979ffc81ae80841482d2d3f0f93caec50328d82da0720f003aebde1091fa29915d98454347ba73a41c9cbafad4de0e3b4debdd310810aaa14f0a98e465498aa SHA512 d34c62df4bc2aeef10d8a2d0d3a0e60d9bf87218494edffb934f54f471868970490a48f150ecad1c6235663354897e15db88ab3e2d42d31d75302515783e56ab
 MISC metadata.xml 513 BLAKE2B 74790e6c3a0503c7092152bc6b74850ef0c2ae5fedc71a1ac887775054b5965a8c13aace575792488ee443552d17a5f2f5732d92255600a00082911857c9541f SHA512 51f230ff4133f037ad1d92a18224004d27d0382efe842cd9c3d012f4589c611f9788d333c5bdd33936964aabcce4d96d790a4045b6a3cbbd37fd11597a3a5ea0
diff --git a/x11-misc/kdocker/kdocker-5.3.ebuild b/x11-misc/kdocker/kdocker-5.3.ebuild
index 30bfc104e846..67fc17c6af22 100644
--- a/x11-misc/kdocker/kdocker-5.3.ebuild
+++ b/x11-misc/kdocker/kdocker-5.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/user-none/KDocker/archive/${PV}.tar.gz -> ${MY_P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/x11-misc/mate-notification-daemon/Manifest b/x11-misc/mate-notification-daemon/Manifest
index f4cf0078d34b..3b5c8d88d34b 100644
--- a/x11-misc/mate-notification-daemon/Manifest
+++ b/x11-misc/mate-notification-daemon/Manifest
@@ -2,5 +2,5 @@ AUX org.freedesktop.Notifications.service 94 BLAKE2B 1a97aac2db9c803c9e4babf9067
 DIST mate-notification-daemon-1.22.1.tar.xz 340472 BLAKE2B 09a4fd8f14ffcde530bf3f95aa5d38f5ab1d105dd854464eb698fa3f42594e4559a48d034a0e25a021f2cd2382d02fbe357269636ea2603f940d666467ba4058 SHA512 5faec84a2c25b3d17db5e0e564081a5712a0ae9a648b61e7d6233f7c6671a137cb9e0d2328eccad4e634eb99cae72cf235589f3667b9bf29e66c3734f7ed8bc7
 DIST mate-notification-daemon-1.24.0.tar.xz 392588 BLAKE2B 480272848b3403d34eaa1f555a573dbf74a4e8e45e76c4726943bda4c29d7002f00d1a828e318d51dd07a44df1c64902c38bbe41c1c14339e8cb8710f7008f36 SHA512 0fd2da98001c60672d4833e974ac74dd561f54ca6f3fd74f8d6620e3b28768add46dd891d7446b01426b6aed09d4966d902cbde45aac3498fdcbb837e531a147
 EBUILD mate-notification-daemon-1.22.1.ebuild 1010 BLAKE2B 0db390170a60ac80a322b6a53c6e1dca1ee9df124bfe4c09a4462aa5ab033b6892846046533f269da9b209bad1fe2fe5675ab8f84044a7723b5f33d8d1dc7282 SHA512 3e63812692ea6e8c8ad57c279e9389abd8c9ce6cb6d20108b3bfcbfec2b9c6c9d0c6e5e150198cf6ec76f689848f719568658bb4addab036e7e8e9bb058dcfb4
-EBUILD mate-notification-daemon-1.24.0.ebuild 1030 BLAKE2B 61cc2e9e0953430b561ea473057ada9645c923d7bc1dc7077666610b2ee9b5f5aa534f2de72c4d0287e09c336bfa8f50ea286dbf7fe5ba52bff89642f2c80bdb SHA512 d3a20971b694ce3d2f69785321aeccf3152b2a50f940f060ab176fdc56c5f9cf98995feabbd2a87c046c00be782ccaf7cc60991ea20a66ebc77014b0ee96a860
+EBUILD mate-notification-daemon-1.24.0.ebuild 1028 BLAKE2B 628a6b16802acc6b15febaaa876d4ef6f7fd053e2d2bc3930c4658c13d72dc460f585db90865594179c359551774b1bcf800fea2e72b0235663abb4530075d0e SHA512 df275daceeb8e1d5ee36f37f3c7007710a69540ca4d528c93a28eea494e087510cd64c6753cf7cecfc1a008b9512033f676922ac00480474d0f39ccc88c6e1b8
 MISC metadata.xml 353 BLAKE2B 774bcae8807bbb16a1ee8bc12320e487ec817fb45d3169f4929cbd8c3f7f33a35eb1aad2682e5d87131567c56e6ffe8f2bdbda612c58926ddc3d78b14cb69e53 SHA512 3f46b4bb5e12fdb448e7b7f54db4f4a4683cbdbd89019156601abf80be0333690b65670fb110120cf613dd42ecdfb38b329ddde67fd265257d6ddb32e24bfbbd
diff --git a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.24.0.ebuild b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.24.0.ebuild
index 1fffb1ccaec2..5ae232097c09 100644
--- a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.24.0.ebuild
+++ b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.24.0.ebuild
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="MATE Notification daemon"
diff --git a/x11-misc/mozo/Manifest b/x11-misc/mozo/Manifest
index 6fd6492ae724..c3aadb6a8c63 100644
--- a/x11-misc/mozo/Manifest
+++ b/x11-misc/mozo/Manifest
@@ -1,5 +1,5 @@
 DIST mozo-1.22.2.tar.xz 172644 BLAKE2B 15e643cfdceb1d62f7fd1499a42bb92a4dd8485adc764d304a2b3f31ffac962fa48f2af402564a6c1598fc97ae19288f4281bc19e9ba6855aeb329ec09bbe4ab SHA512 c5122b37036291ea7a2ecdb2a2ca37bf63d88404f8fb608c45917a28f4e5996d862764ea5e33544027f8f1f144387de40e204aa69b07d5a590b76aca29e1ad71
 DIST mozo-1.24.0.tar.xz 228180 BLAKE2B 6eb880b82dcb608f84efd8df74e77812f9da68dfa877ec896c6f04fa18088e8e4a82641c715e3620201dbb8a1bea8bb4ded09dd72f50770edae09c1326cbf453 SHA512 e0d217d2e7bb7d2c8df777e51bfb20e8bf4fa1bee0f9f3a9348ec1c8501b386a4afbd8848735ecfa61a0f9576382d784d3ef5b884a2a34af6ba33d3a126fe193
 EBUILD mozo-1.22.2.ebuild 1307 BLAKE2B e4c08af9d630349234bd45a8173cec99adb987c2c5ce49b1191c6ee2d3ac9127399e6c5c89a2e2407bea7a9170f2ab02445bb339cc2a0927ae37905b480cf6b3 SHA512 09c705c33cc6d9c65c3087d6daa4004a5f99b60b5a5ef7042e9edcde938f1238ac662d8b99713025cddb081cdd41795f0a30ee5c2e9baa9d6b8d3ff1751e3baf
-EBUILD mozo-1.24.0.ebuild 1313 BLAKE2B 8a3e31a0b93a79d03adb9d9bd89d689009a732093e17c3c9bb2dc67b17fc255ead1b1c7eee7d32bc14f46fa93dda34909a217d94ddd93ae38a9eb2c5b10f1f8d SHA512 26b99756a8e6a5c6eb6ff2dfc1c698942252eeeea8a3ec6442479198c9533b9d642a833d170cc71bf2d4612545c328e158c977bcb03e0db6e236dcaded069638
+EBUILD mozo-1.24.0.ebuild 1311 BLAKE2B 31a5bb689aff98fe1f37caea0a4f856262592214f24621ed6be18fba2563c601e0c41f37e96e2605104f2bae7473135e27bf0a7a7530480cec2eab00ba22cf8a SHA512 d7ffdb97ca09abe2814c244accd3d622fced0e385c1723ac22d925ca97e7b9358382540718cb877996dc7d3108156b9a9fc5c866f34e564eb055202d74e7bb56
 MISC metadata.xml 333 BLAKE2B 9901ffa7d882f0f741c95670130db70920ebbe94af75b8d9b72f48f8eb1b48d9425b7ff49dafbe001e5287ff3eafd2d60a8760a262ab6601fecc63642e242591 SHA512 eb3bc4b3cf1cfde5f96cd414138790deae0435e8ba41576e1e44b150defd5fdda0b921d4dbb0798b9653ad5aa7690247fb69cd25d03752f8bde8017419596a76
diff --git a/x11-misc/mozo/mozo-1.24.0.ebuild b/x11-misc/mozo/mozo-1.24.0.ebuild
index ac2cdefbe6e3..cfcfb2e97d20 100644
--- a/x11-misc/mozo/mozo-1.24.0.ebuild
+++ b/x11-misc/mozo/mozo-1.24.0.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="xml"
 inherit python-r1 mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Mozo menu editor for MATE"
diff --git a/x11-misc/mugshot/Manifest b/x11-misc/mugshot/Manifest
index 6a6e4d92d404..6a065482eb4d 100644
--- a/x11-misc/mugshot/Manifest
+++ b/x11-misc/mugshot/Manifest
@@ -1,3 +1,4 @@
+AUX mugshot-0.4.2-python39.patch 1369 BLAKE2B e006525dae248e4e8d04a01932f74371846c2757c085f5a0afc634f2c163c81918e6130ca796bcf122645bb7bd4e33348eea3ed0d926ff867028ab84641bf67a SHA512 c3868bec2772e7834bae8de87c2407986aacca1d32125631da92788ac9ae03e5a688b36ff6090792990f6c3163ecae1623eccd84349dc0099b4809258f14793b
 DIST mugshot-0.4.2.tar.gz 121020 BLAKE2B c092e25273dbd8ef9cbfbc001fb5f86b134ed8f9bf5d84993d5f46664f17eb74eda5c121ee70b5f0c4b0adb5aa1fc4d21d8c59d3f0cf4a4f67991d06690f5aa5 SHA512 721629cf4a7e4d84fd8505279cf88c88ac88c7b6c995ac84a2fd6a9b978c92716bbe20d7b0301ca70e99c007698e4cddf41b6cf1111bf496eec4d39591cd9ed1
-EBUILD mugshot-0.4.2-r1.ebuild 1534 BLAKE2B 9ec842e924950051e7e65eea7c10afea40fe9802e69fad07098e78b76c179908e177fa1f7326b68813ea3f573892326f660b5899814b517a37629c547502dcfe SHA512 44934fa75f7554eac3a914742ce8d08003a8f17583dc7d2eb14cd66059d86bb3fc697ea60f95f50dbba8829154edb01586f5d53307d4f3bed560c9bff038267c
+EBUILD mugshot-0.4.2-r1.ebuild 1587 BLAKE2B 4c48a5849b55e9d6a21974bcb7c102ed6d6cc1b29685066e2aef2776931bcd3488b7c6a351b3a7dcec9bceb582e1fc688c5b919ae6db0f5f863d9fa832514fb1 SHA512 0b02356145d66c3d0e00a13db08756f1547050e98fa864b34e3c73ec2bbef7fd239a4f72d34864c4540970fb0ebd6fa8f0c774c6379268b3d7de4f370c704e69
 MISC metadata.xml 943 BLAKE2B b39c09aa84b6a1f25d001e073b2c369af9ebebb7448fff5b3abc83898516963e117c33d1c03fb6db72422e4b20c065ed78e711326f28912e1ed5321b232bbee1 SHA512 3b4e66543245b2db7d1c255adf30112834935ab552a7d6773921838510417e000fd41c63fcab7e6be8df043f3daeab1cfcbebccaebf44f6185abfcb47898a3f2
diff --git a/x11-misc/mugshot/files/mugshot-0.4.2-python39.patch b/x11-misc/mugshot/files/mugshot-0.4.2-python39.patch
new file mode 100644
index 000000000000..b0443f7a3d33
--- /dev/null
+++ b/x11-misc/mugshot/files/mugshot-0.4.2-python39.patch
@@ -0,0 +1,36 @@
+From 643b3d005a8865c961b836aeae4c1f76711646e9 Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki <conrad@kostecki.com>
+Date: Mon, 24 Aug 2020 23:58:10 +0200
+Subject: [PATCH] Add python3.9 compatiblity
+
+Starting with python3.9, launching of mugshot will fail,
+as getiterator() been deprecated since Python 2.7,
+and has been removed in Python 3.9. Using iter() will fix that.
+
+Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
+---
+ mugshot_lib/Builder.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/mugshot_lib/Builder.py b/mugshot_lib/Builder.py
+index 7297541..6c08d70 100644
+--- a/mugshot_lib/Builder.py
++++ b/mugshot_lib/Builder.py
+@@ -89,7 +89,7 @@ def add_from_file(self, filename):
+         tree = ElementTree()
+         tree.parse(filename)
+ 
+-        ele_widgets = tree.getiterator("object")
++        ele_widgets = tree.iter("object")
+         for ele_widget in ele_widgets:
+             name = ele_widget.attrib['id']
+             widget = self.get_object(name)
+@@ -111,7 +111,7 @@ def add_from_file(self, filename):
+             if connections:
+                 self.connections.extend(connections)
+ 
+-        ele_signals = tree.getiterator("signal")
++        ele_signals = tree.iter("signal")
+         for ele_signal in ele_signals:
+             self.glade_handler_dict.update(
+                 {ele_signal.attrib["handler"]: None})
diff --git a/x11-misc/mugshot/mugshot-0.4.2-r1.ebuild b/x11-misc/mugshot/mugshot-0.4.2-r1.ebuild
index c547ba1e9538..a39fccdd02af 100644
--- a/x11-misc/mugshot/mugshot-0.4.2-r1.ebuild
+++ b/x11-misc/mugshot/mugshot-0.4.2-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS="no"
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1 gnome2-utils xdg-utils
 
@@ -59,6 +59,8 @@ BDEPEND="
 
 S="${WORKDIR}/${PN}-${P}"
 
+PATCHES=( "${FILESDIR}/${PN}-0.4.2-python39.patch" )
+
 python_install() {
 	distutils-r1_python_install
 
diff --git a/x11-misc/nts/Manifest b/x11-misc/nts/Manifest
deleted file mode 100644
index 21708047bda2..000000000000
--- a/x11-misc/nts/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST nts-82.tar.gz 155819 BLAKE2B f5f6ab561b754c450f41a8e929fe54d59de6430adfefe65fee17ab1a71766c6f4dd16ed8f4a6ae1e927814f42e6461eaca5744ad8fdf3143771949cd76c3fb5c SHA512 03ec801a550668c8654240823f63e4793d54d12630181e38031872f8d5e6cf01e151be1a5762c7013941701a679d361951f271e0f4cf0d90da54ed1db2ea61fd
-EBUILD nts-82-r1.ebuild 551 BLAKE2B cb0115336daa63b48351c007739addd56614797c1bdd8a96d8f8a8aefdffc6dcd81f2783944a426df0d8a728ffa15aea5a4ad36bb0b892a88303bbe24119fd4e SHA512 8512cde74eee60082249578f3eba805f102f5aa2d98dc7d4b0d02fafe860c94b7ed3bd27dcf3331a16bad888bf14295b4fb3eba46abba6f8ba6a813421dd8552
-MISC metadata.xml 615 BLAKE2B 03e6681fd844456cd6693e1e5787d226f6077a84ee6f64eb184cb010e6e6958eeddfd35380a1984773b3fbfc0323b3d0788d60fc2ec663770699ffcf88f75548 SHA512 8e52c5501a6dd3e2c941cab91635ef15dbd93287070b4b3bb6eca6fc2c250923e624269388d88a75737e7322ce40f71c2cc916f10cc365d3e65f42dcd8657404
diff --git a/x11-misc/nts/metadata.xml b/x11-misc/nts/metadata.xml
deleted file mode 100644
index 17a66d0a724b..000000000000
--- a/x11-misc/nts/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		nts is an acronym for Note Taking Simplified. It provides a simple,
-		intuitive format for using plain text files to store notes, a command
-		line interface for viewing notes in a variety of convenient ways and a
-		cross-platform, wx(python)-based GUI for creating and modifying notes as
-		well as viewing them. Displayed items can be grouped by path or tag and
-		can be filtered in various ways.
-	</longdescription>
-</pkgmetadata>
diff --git a/x11-misc/nts/nts-82-r1.ebuild b/x11-misc/nts/nts-82-r1.ebuild
deleted file mode 100644
index 8aeaa2feba33..000000000000
--- a/x11-misc/nts/nts-82-r1.ebuild
+++ /dev/null
@@ -1,20 +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 distutils-r1
-
-DESCRIPTION="Note Taking made Simple, an intuitive note taking application"
-HOMEPAGE="http://www.duke.edu/~dgraham/NTS/"
-SRC_URI="http://www.duke.edu/~dgraham/NTS/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/wxpython:3.0[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	|| ( dev-python/docutils[${PYTHON_USEDEP}] app-text/pandoc )
-"
diff --git a/x11-misc/obconf-qt/Manifest b/x11-misc/obconf-qt/Manifest
index 2f003c31cf33..a3eff78398a8 100644
--- a/x11-misc/obconf-qt/Manifest
+++ b/x11-misc/obconf-qt/Manifest
@@ -1,5 +1,3 @@
-DIST obconf-qt-0.14.1.tar.xz 97032 BLAKE2B 8bfe93325d37bdcca40b38f99f635cddf39ad1781e694f002676f6ff6fd0d6c708908ca458a051f63509f572b247b4de5778a1451e763c4372038ef99a1594d7 SHA512 7ae4feb8daa3853f768e9cb613fc99046f98744e03efc673ee9e5cb3d4ffa2861f2a9f762acd9c54ef2b9ca3f288d2901cdcce5c09db84689dd186006b8e26ed
 DIST obconf-qt-0.15.0.tar.xz 99976 BLAKE2B 7c7aede61cfc7a26c56de7e6ab49410dc82f4f9fb4f293fa0f0896f1b14cff63d34d00dd56347ec8daca375e226fed4ebb58c633061129708fd5107daa97d074 SHA512 a723dcd3b409afc7b16572d293cbf0543e00a7177a9819e2374632c00c765de74896429f6e19a54fcee83e20ce2e0876f857447c374db2f4f925dec92be71279
-EBUILD obconf-qt-0.14.1.ebuild 904 BLAKE2B 20d540f25296788ccf5531abbeb7ad2d2537d25c0c0914c311df6687027205eed535bbee18c92348155b6c7cfe0970630febab9f7ac844ab1480674305228c70 SHA512 87fa3f6ce4915ab69164b7099ed5cce0212b5a6bc4f74d2d19464af8d276b827f7a70a49cb8059c3573dbaab920748899c6610ea080e48f98c230f9faa71c931
-EBUILD obconf-qt-0.15.0.ebuild 909 BLAKE2B 4f0b479af6c398fef0b881d336e869be225105b8bf4f2aebbafd827fa0c3605d21457b2589839c7532813ddbb2117e36c70dc4b450244139d9e0f43d9999e35a SHA512 cca31af52fb81a7cd8a3a326ae29cafe8b6279c573a60b67a4b73869383bf208119742d77cb943ad88e6748debb73d6e63455e77597bcd2ea43562887cbd0315
+EBUILD obconf-qt-0.15.0.ebuild 907 BLAKE2B a004fcc83626c5abc8673361e9ed2d0a34ce6cc6640b245b3312a2bc2c68be9ac8c208eb7d5ea06473e02f1239c3b4eb10a371337d2c8aa80b54357709e78003 SHA512 857a0b53d75f1e4c769096d70242471234f7331b7828f345c08111d01d30ea52bd262103c371e7f97d9e88fdb01c1bd0fc6a0d7b74e5f4dadbaca8e4073eb5e8
 MISC metadata.xml 315 BLAKE2B aba8e92e822b0a8f7213a6a2a723ada9cc5be720aa857152cfb2e395b8cae65dac8ce4c13e36e3ba774e22d800890c5ec7878f0266157b92e4f0332fd2ff8dc0 SHA512 b210ddb7b5f688fc122fead9a5fbac67653099db7671e442c53cf5246f091c8f58a6db94f2be7d3250a8fe24a619c6c9269b31f6c52f62049c40963dd8a6212a
diff --git a/x11-misc/obconf-qt/obconf-qt-0.14.1.ebuild b/x11-misc/obconf-qt/obconf-qt-0.14.1.ebuild
deleted file mode 100644
index 27965776487c..000000000000
--- a/x11-misc/obconf-qt/obconf-qt-0.14.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Openbox window manager 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://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.6.0
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-libs/glib:2
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	sys-apps/sed
-	x11-wm/openbox:3
-	x11-libs/libX11
-"
-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/obconf-qt/obconf-qt-0.15.0.ebuild b/x11-misc/obconf-qt/obconf-qt-0.15.0.ebuild
index 4979e3f9df38..82d22dcca954 100644
--- a/x11-misc/obconf-qt/obconf-qt-0.15.0.ebuild
+++ b/x11-misc/obconf-qt/obconf-qt-0.15.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="GPL-2 GPL-2+"
diff --git a/x11-misc/pcmanfm-qt/Manifest b/x11-misc/pcmanfm-qt/Manifest
index d91561c811f5..05a68c861f05 100644
--- a/x11-misc/pcmanfm-qt/Manifest
+++ b/x11-misc/pcmanfm-qt/Manifest
@@ -1,5 +1,3 @@
-DIST pcmanfm-qt-0.14.1.tar.xz 227360 BLAKE2B 2401238ad53838c9f6e45d596c43b09eecf555bfe069a5cef633c0442867f04b636bebf29241cae8b5a1161a9dad5648390badcd6a3d8b756ac6438acac4961f SHA512 f3d170ab8344332f740a3245cc549ea0c3bddc97a45472dcd46208d59413dd42d3571821f309184417a34a627d2cb093fcaa335f782cf6e526eef3fcad212b3e
 DIST pcmanfm-qt-0.15.1.tar.xz 257832 BLAKE2B 78c8f5723b529b7f8a00870f017818183a498d8a1f68f8f24ab756eeda9b35d8d998b42d87f78e4a8fb6725bf3e812dca74bc1464f285a6a984dae1996b43f46 SHA512 db0d3cc683b5c94cabab5a8c68b3ae8bf5938735b34989a420692e933bb54d53ebb15da9af4a59039bfd101de0cc00c521c08207e81bfad9d80315e2d94bc559
-EBUILD pcmanfm-qt-0.14.1-r1.ebuild 1148 BLAKE2B f90921c01860b426fc45a0bfbff8105ebe545b501294760b4aff28eed23b809ec5e6983d589929ece717a3f5868a1c1bd16ce071944f0d5ffed8ac37ee7c3389 SHA512 cafe1662e08f4213708a40d360a208087a313ed6f61996664ca55be2b96c88e4b0b0d25ce00415669a0d87d419e745e636b3e22cb05a209ddf7fbcfe57a37658
-EBUILD pcmanfm-qt-0.15.1.ebuild 1096 BLAKE2B fbb76574d117324e398eaebc432b75a5884aed76ca5dfda5f7885e05da6adc0ea64cc43886a5170e781a0db3ab54a96b33ecd4d04bb2c6984259af9c3db2b8a1 SHA512 be78ecf60902fb23d57f78834a97f1b6803b012eec2b2f891de1313b58bca943cad01a6bd55e4a556f4b51501e586af0932d248accde738fff3ca91525680a7f
+EBUILD pcmanfm-qt-0.15.1.ebuild 1094 BLAKE2B 5802b2a5d48d26162381649b5cce5b27c39d058f0d118774cb40df60943b7ad9884603b4686f98e887fa1ac55669ada6854559aa86f60af03cc53a9638952777 SHA512 750af0234415a19364512c36d7aebe844cccb6f8108123ba22f6d7673490b981ad6dbac608fb609f57921c5b06c4681c2e99f948dfa3a0eee9d4bc91eec7ed84
 MISC metadata.xml 316 BLAKE2B 1dc58d42a91390bd5c19ee7dccf75687a2b612f7af9569f4f3a731e8eec49eba2e244c1ced6107ed51cdd377f8d026cf6589a49c3314c60d38f58a68d7e82415 SHA512 910454c7d138693e0020b922b7b32749fdb70bb6057f4f16c7d72e3385cf278ce0dbddb0d75e57a90d5cdc14b10c0bad740d77c085d2f8d14b25b100b594a597
diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.14.1-r1.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.14.1-r1.ebuild
deleted file mode 100644
index e7ec85088df3..000000000000
--- a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.14.1-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-fi
-
-DESCRIPTION="Fast lightweight tabbed filemanager (Qt port)"
-HOMEPAGE="https://lxqt.github.io/"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.6.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
-
-	if ! has_version lxqt-base/lxqt-meta && ! has_version gnome-base/gvfs; then
-		elog
-		elog "To make use of the 'trash' functionality, please install"
-		elog "the 'gnome-base/gvfs' package."
-		elog
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.15.1.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.15.1.ebuild
index 4852d019e3c9..ab092edeac77 100644
--- a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.15.1.ebuild
+++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.15.1.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="GPL-2 GPL-2+ LGPL-2.1+"
diff --git a/x11-misc/polybar/Manifest b/x11-misc/polybar/Manifest
index cf5043038dcc..c4e1b1c85cdf 100644
--- a/x11-misc/polybar/Manifest
+++ b/x11-misc/polybar/Manifest
@@ -1,5 +1,7 @@
 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 1810 BLAKE2B f486c0ecadfd0c4c48f88fc680aaec50c5a05facf34214ebd3246e895893d819bbf07d4f0eb38f95769656dfc1c4c3cbc32296dedd5a7795f008b38385988f89 SHA512 835ef90b9d945ddddef6a28cd59c071b9ce0273241f322cd69e390662d698ea9d7aa5ed1b4bef06bb4177b53e840d429c1ef090a8ac553d34c565c3a3ad4c7b3
 MISC metadata.xml 582 BLAKE2B bd70511d8795f71413b5134b7f2203882a3f7ef8e190ef05b109baf9d1164a47fd4ec9f3f955076cf3634fea7469990b1a725bf151f03a0112604113633262a9 SHA512 447e0e0dfa1cc9563ef6399d6fbd4c1bc49db4eac60263ce6abc1d7b488f3881247b74e16f421ef73061ebbd285491d271554cc468e4a44a9c9f9f25b08e1b3a
diff --git a/x11-misc/polybar/polybar-3.4.3.ebuild b/x11-misc/polybar/polybar-3.4.3.ebuild
new file mode 100644
index 000000000000..e6f8b9feaf99
--- /dev/null
+++ b/x11-misc/polybar/polybar-3.4.3.ebuild
@@ -0,0 +1,67 @@
+# 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 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_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_src_configure
+}
diff --git a/x11-misc/projecteur/Manifest b/x11-misc/projecteur/Manifest
index 6c033e3ef455..8036a01a6697 100644
--- a/x11-misc/projecteur/Manifest
+++ b/x11-misc/projecteur/Manifest
@@ -1,6 +1,3 @@
-AUX projecteur-0.7-fix-git-detection.patch 1740 BLAKE2B 18087fca44642910cc7b16902d10f295b55e00965d1104a5a293728d2ef5514cd2da0f0e1535662ce5385c604111d6b8ba56835b28a5e11811d59c51a76c0ff7 SHA512 f45928c0787e107c49364d2a9bf207f39f55f16278888baee5335a50ec6ec98e7c49f4734da65cf729482396b2d4297acdcef72ee101ac4113f0870bb9357918
-DIST projecteur-0.7.tar.gz 296252 BLAKE2B fb20de48ee5f89e66701fc8d6cad036aed48ed862994b82431a8a14f3ec95dccb863c4c35a5de01c932150b3b311511ef01af093ddbcd23a2413ebb882152bab SHA512 9af54e47883cd3d9368edef173b9c0eb522f947f7d72f759388e2ecdf275524bdf56d3562506a383bba32c0fd2ec5c76c232a7b523e13b79caeb4d6d76bbbac0
 DIST projecteur-0.8.tar.gz 379203 BLAKE2B b2171bd6120c9f6245c129519e33adbb4661ea4cd0df5f30c6c90fbefb8b7c5024da5c6d920d4e162b818bc0fc6417731dcf0c540103ed6f12976123c45c69eb SHA512 e892e87f442cfa7f0102efa01b43e63ed7ea9c30c875496dd3d683ee769de66f0a4ccfae149f060924e5613dfd7758a0b19d565232fb6db75b9228cee4a956de
-EBUILD projecteur-0.7-r2.ebuild 855 BLAKE2B 4cf9f3ff4809e03d5aeab30f10c96dc20c134eb1e5c81baa075583f01d0b62a669a385501f107d606825865f5cac38963b8f3033aaf77ddbd3937d3a0f08c6a1 SHA512 f5a8e094d1e181a3437f41b1f1b9a9028667c2e7d7d5dfe1fc2ebb923c810fe9a675b7b94c947cb9d477a14721994cd873d0a0828cdece8f1793bf4b86165335
-EBUILD projecteur-0.8.ebuild 805 BLAKE2B 1ba5091382d294db067f0e4eb6c8e728d29a4d885e6db4d4ccd9aab31dbec9844edded5d0a4beadcb7c219b441a27aae52fd876a79bbfc33c0cbc720d44bd82a SHA512 4cd17f53e08c7caf60ae5a82d3f669dc4c52e8d20caf69b9ab16954ad071de646dc71c5911ff5a799561d8b0f2decb2f4049a3fc5aaa2b8654e79e64188dd0e5
+EBUILD projecteur-0.8.ebuild 948 BLAKE2B e30b164914ed71a6cc887ce83281be0d6e948e2be9e95f5ca5c0862ef32ce101cc610c41ba61a55288b4264bfb380170c301b456275b84c113757ba0cf17be54 SHA512 8da018f746920cc16b9fdf2fe8c0bc4e2b4738107f4665dc109a37b09ad6037b7c1e365b343db4d1e3cf23f2f742773acf712e478c8ae5bb6e45a392ae3cf8d4
 MISC metadata.xml 612 BLAKE2B 84ebf5cc3be489a0f7483e81b43dcee7067ec325a8a6c58f2350107921d0844bc7d084d7a35cddc95296c2f1046c4e098fed2b8748f0834df90c152dcd70e91e SHA512 d51be761cc4f93a47230bb63685fb367d7b0846b048733d192c6e36e9ac87f49cfcc28631ab4980dbc50213a9bbe23d3b0db665c5257e1e0e79804d9752e822c
diff --git a/x11-misc/projecteur/files/projecteur-0.7-fix-git-detection.patch b/x11-misc/projecteur/files/projecteur-0.7-fix-git-detection.patch
deleted file mode 100644
index 841005968123..000000000000
--- a/x11-misc/projecteur/files/projecteur-0.7-fix-git-detection.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 259be1617f1b0b92e53440d95fa88aa4bf3fe25b Mon Sep 17 00:00:00 2001
-From: Jahn <jahnf@users.noreply.github.com>
-Date: Sun, 10 May 2020 19:34:19 +0200
-Subject: [PATCH] Make sure version_distance is always valid, fixes build with
- not git available. #73
-
----
- cmake/modules/GitVersion.cmake | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/cmake/modules/GitVersion.cmake b/cmake/modules/GitVersion.cmake
-index 1cbbd09..fcb77bc 100644
---- a/cmake/modules/GitVersion.cmake
-+++ b/cmake/modules/GitVersion.cmake
-@@ -282,6 +282,7 @@ function(get_version_info prefix directory)
-   set(${prefix}_VERSION_MAJOR ${${prefix}_VERSION_MAJOR} PARENT_SCOPE)
-   set(${prefix}_VERSION_MINOR ${${prefix}_VERSION_MINOR} PARENT_SCOPE)
-   set(${prefix}_VERSION_PATCH ${${prefix}_VERSION_PATCH} PARENT_SCOPE)
-+  set(${prefix}_VERSION_DISTANCE ${${prefix}_VERSION_DISTANCE} PARENT_SCOPE)
- 
-   # Build version string...
-   set(VERSION_STRING "${${prefix}_VERSION_MAJOR}.${${prefix}_VERSION_MINOR}")
-@@ -412,8 +413,8 @@ function(add_version_info_custom_prefix target prefix directory)
- 
-   get_target_property(type ${target} TYPE)
-   if(type STREQUAL "SHARED_LIBRARY")
--     set_target_properties(${target} PROPERTIES SOVERSION "${VERSION_MAJOR}.${VERSION_MINOR}")
--     set_property(TARGET ${target} PROPERTY VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
-+    set_target_properties(${target} PROPERTIES SOVERSION "${VERSION_MAJOR}.${VERSION_MINOR}")
-+    set_property(TARGET ${target} PROPERTY VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
-   endif()
-   set_property(TARGET ${target} APPEND PROPERTY SOURCES ${output_files})
-   target_include_directories(${target} PUBLIC $<BUILD_INTERFACE:${output_dir}>)
diff --git a/x11-misc/projecteur/projecteur-0.7-r2.ebuild b/x11-misc/projecteur/projecteur-0.7-r2.ebuild
deleted file mode 100644
index 26072768e67e..000000000000
--- a/x11-misc/projecteur/projecteur-0.7-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="${PN/p/P}"
-
-inherit cmake udev xdg-utils
-
-DESCRIPTION="Linux Desktop Application for the Logitech Spotlight device"
-HOMEPAGE="https://github.com/jahnf/Projecteur"
-SRC_URI="https://github.com/jahnf/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	|| (
-		dev-qt/qtgui:5[X(-)]
-		dev-qt/qtgui:5[xcb(-)]
-	)
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	virtual/udev
-	x11-libs/libX11
-"
-DEPEND="${RDEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES="${FILESDIR}/${P}-fix-git-detection.patch"
-
-pkg_postinst() {
-	udev_reload
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	udev_reload
-	xdg_icon_cache_update
-}
diff --git a/x11-misc/projecteur/projecteur-0.8.ebuild b/x11-misc/projecteur/projecteur-0.8.ebuild
index d727e882f0f2..d6bb721d5dbd 100644
--- a/x11-misc/projecteur/projecteur-0.8.ebuild
+++ b/x11-misc/projecteur/projecteur-0.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jahnf/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 
@@ -34,6 +34,15 @@ DEPEND="${RDEPEND}"
 
 BDEPEND="virtual/pkgconfig"
 
+src_prepare() {
+	default
+
+	cmake_src_prepare
+
+	# Don't treat all warnings as errors
+	sed -e '/add_compile_options/d' -i CMakeLists.txt || die
+}
+
 pkg_postinst() {
 	udev_reload
 	xdg_icon_cache_update
diff --git a/x11-misc/qps/Manifest b/x11-misc/qps/Manifest
index f0a10b65a4af..cf6de4623f43 100644
--- a/x11-misc/qps/Manifest
+++ b/x11-misc/qps/Manifest
@@ -1,7 +1,3 @@
-DIST qps-1.10.20.tar.xz 209588 BLAKE2B abf50904a97e9d2f5755bfc25509266de9c4b5a941a1010f93f475f02e8801b970ba112b01727e076c7b232cf23f50f6b8f7d2fe7acf2d8b273686f6a92404f3 SHA512 407130ac12f1e68da3e22543634d101c7a8353363ff1d9c6edbf98ce5d48f149aa5d937985f00109b40bd3cdb0b9a8e9745e845dd921be4aaf119022632bb9ef
-DIST qps-2.0.0.tar.xz 211452 BLAKE2B 9b8501f3e57939b33ea54daf58d84cf37b6b66a0c4a32d546691898a82f19b747eba4eef77db6f07ca917da83fabfbee0f7ad9cd146b92e160c886d5f1905a02 SHA512 b5c3d194e97ac61ede43e29f4f12e3775ee8afabb1c1c344d068ea0af85fc8a574667cb6c4b801af620e81da1648b0618e31df7c0d5701cf47625482e8528019
 DIST qps-2.1.0.tar.xz 197352 BLAKE2B c607fde920973c21e85b74e9408f7827ad4354d95b5b16cc95c22bc4143579f1dcddf68bcf9904f4df12236d49f786f457bdf3ce809f37549211f297bab18205 SHA512 e5601657be94d4c21e189fc1113f4678a4bad70ca3c9c3882492625b37339d079d1e8240120bdb467bc47ca95a1b26f8e2da022c271377cf0dbf98e390bc8ac2
-EBUILD qps-1.10.20.ebuild 733 BLAKE2B 414d9ea3e21681785e5d1911e8c51e2d840bd23b7b88578b836f6ef0010ae249aed1d445fea5e6fee1c85a0910844f6fe78d3ed846c4743042a669ba8cd1ed3f SHA512 f734a5219314d961c1ab6631e1997820bb5e6000ad7a1e0982b4fe33e3516c6f95f1c42a2cb0fb891e3b5a7c76dd0c90f47a9985ed0004f4d586b5dfd5c94361
-EBUILD qps-2.0.0.ebuild 735 BLAKE2B e0500670a8aaafd62cefb11faceb54123a0eebe49886f5f2e7813dd1016a5a03b2dc6d2bace95a519c99dbc7f3e5389a0b0f72996b911777493bd3aec3223ce6 SHA512 fb3c9d64dfc2badb8ec2b787ec33df6e886f560209a7f321f8d1be95d47b169afdc16c3d598b5d9c9bd8854d109b126fa058a62233d4321969ba6e8af75d0164
-EBUILD qps-2.1.0-r1.ebuild 738 BLAKE2B dcbc8b48c426fa17a06dd9d7e1aad24af119aa509bee3a3c7a2bcbbd5da382bf4f4afc21c5f070e83ae710204a4620a5ca2df1c39aca7c04063afe0410f70713 SHA512 41bcaa6cb338f1f2b396c94c91daa8b62bb33c7d86901145f6a2ed37e0c99758bc60c54230c01974e3c5d308f76f972c4b2998dfa5f37cff006b97114a7859fa
+EBUILD qps-2.1.0-r1.ebuild 736 BLAKE2B 282c784d62c5df1586702ddb2a509de2b28ad52282344212642925148da0f258b73bed5b7a893ff449dd7fb2c287bd1a9bf5bfa5b2f1f3813a5613f86019f554 SHA512 ef62a9d7080022a9abf89f36eb20a66e6a4dea0e681331a7a4849a1942486588ed42e85344b1b71b2fba80bb108898c39d579b20c92f756f4467bcb87a50d2e5
 MISC metadata.xml 320 BLAKE2B 7a6824c87e5ee071bd4219df12554d6363050a126b5838af05dc627134e57d2452eab17569b3e144dcb476ec35dc41649da438b8eb7b45d9e695b2ad900581fa SHA512 b0c5950c5803e5bb765271787eab2bb755cd681f50ab183a2bb06b9f773d0dc8c959e7d9c3f15d23692b3c106d6a0bfd0db43f439225539a3a019b7dceb33292
diff --git a/x11-misc/qps/qps-1.10.20.ebuild b/x11-misc/qps/qps-1.10.20.ebuild
deleted file mode 100644
index 35616a6fed6b..000000000000
--- a/x11-misc/qps/qps-1.10.20.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Visual process manager - Qt version of ps/top"
-HOMEPAGE="https://lxqt.github.io/"
-SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+ LGPL-2.1+ QPL-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="debug"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.6.0
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-"
-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/qps/qps-2.0.0.ebuild b/x11-misc/qps/qps-2.0.0.ebuild
deleted file mode 100644
index 2fd670cd0aaa..000000000000
--- a/x11-misc/qps/qps-2.0.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Visual process manager - Qt version of ps/top"
-HOMEPAGE="https://lxqt.github.io/"
-SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+ LGPL-2.1+ QPL-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="debug"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.6.0
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-"
-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/qps/qps-2.1.0-r1.ebuild b/x11-misc/qps/qps-2.1.0-r1.ebuild
index 0a414be68936..1b0b6adbf9e4 100644
--- a/x11-misc/qps/qps-2.1.0-r1.ebuild
+++ b/x11-misc/qps/qps-2.1.0-r1.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+ QPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 BDEPEND="
 	dev-qt/linguist-tools:5
diff --git a/x11-misc/qt5ct/Manifest b/x11-misc/qt5ct/Manifest
index 13ed4304fb96..5c1327893442 100644
--- a/x11-misc/qt5ct/Manifest
+++ b/x11-misc/qt5ct/Manifest
@@ -1,5 +1,5 @@
-DIST qt5ct-0.41.tar.bz2 73009 BLAKE2B de6360feb16a82b262c13e6a3cbe226b7be7c3e95b1f1262b3802de59fc3bb8820c935b170a15a88e80164e6167f6259777c65fda6a3f8fbf1d115a63ddcc1f2 SHA512 a94f9996dc2198d3c8c9af8610912d12b915b8c547a49c36f7bc083b6f237b318d7903e91fb6fcfe06996a319c361104c1923e6d0c49446b6fb66a1e44fae009
 DIST qt5ct-1.0.tar.bz2 73360 BLAKE2B a2a37534434102f08d0f225017c5b835bc22ac2d86592505d4dcc8823a8ed34fd54085a581e86e83ecaec04141e90f4c6e87b9aaed027b68e29ed9a773108263 SHA512 f650362c90782128e1b3ddb61e73d0295bc5b108a75c8a10d085ce9df7dc0926ac40baf80705136b39cc779212fc97e121757c440f2728aab12b761caace78b2
-EBUILD qt5ct-0.41.ebuild 1026 BLAKE2B 64c305e03b1bb2d1b534cb1fae06816821606bf28fedda93c326e0c7b7c23c49f846a3ab08be11cab61a45a75c3e7644d60c0605b353ddac582f4ad6a6321a49 SHA512 9a58316f68fe1c57b1e94594c47504bb0cbc4091e403b86fccf0be6ff74e745703d7d2f7b60c511cd7078da73e10d228fe6f2fabf49331b1c4bd3ae3de0be23d
-EBUILD qt5ct-1.0.ebuild 1040 BLAKE2B 16822020b9fca286f10dded558b938d81725c04f8f91e21a2a7b400b2f8919264e62e6ae13136e711c618f1efbc7c1bb8f70f77a26c7a8dafa4730cd72317288 SHA512 b35f92581b02ef5ff241a74f8210b7093b784ebee3272a42985b36af487c0bcfdaba88383176997dc16425e8200d91e306a7e6d76951fd25268921ef884a6e0a
+DIST qt5ct-1.1.tar.bz2 79890 BLAKE2B e816d76ea35b2133891ccf63be47a227d95dc9783b6f2ac18ee7a7c67bae545fbdc7109103e63c18f093458942ae0b9bab3d1847c40abea9761ab0c314de6357 SHA512 0df00c0680aefb0eada1ddb70886fd63641c403ab42843f8d209413a56895dce0a88eb88a98d09d23a30df3b15ca1d595237592958769a1be86719f2a16cbdf7
+EBUILD qt5ct-1.0.ebuild 1043 BLAKE2B f204afa68a682ca0ccb96d938dedc9f3bfe80a5f6d362411d356aff92db2b6e378cbae79c8c8597cad07e7916b9fdac1d0081e7d1524fce7018cf813ddc70ac3 SHA512 dcdbe854ab9834d3019cae1a640a4cb43aa1112c4c91bca9135e541983a1d737bf65cbc235f7089fe037e86d31b953ef3f70bc2d6804a5d6b8d009000d15e0c2
+EBUILD qt5ct-1.1.ebuild 1045 BLAKE2B 655e8453f4c44b92801ef5733f5e674477cc3ac0628bf60b81e4cfeca0da693db938cf48721f1fd8a73f4047b57d92762bb55cbed4cd0e5bb804b2f2ce59878d SHA512 5d0b741947b904423f126d9752c999cf6c9683a82360b10c8cc3cc0ec79ec4b2c49ae4c4531bff378952932973bf835aaa41abe0d17d946d9e5c4e564b8a2e86
 MISC metadata.xml 566 BLAKE2B dbb30222ccd1079489ce54e50d5d4ce9a3b9e9acf38d4cc30a402f81418685a3cf86f1adae23d85a409f9866ca11ec1321e543e14bd37ed13a45d02a32accc15 SHA512 d40c24dd0cc2d0b2c79251cf1fb2540dbec484653817469198f4ad7e41164a8c518442c5d11764f0c8aa53bd7ae9758629acc7ba4a4c9f2a374af13cbdaf67c1
diff --git a/x11-misc/qt5ct/qt5ct-1.0.ebuild b/x11-misc/qt5ct/qt5ct-1.0.ebuild
index 9f615edb3db0..5ec0690f1e18 100644
--- a/x11-misc/qt5ct/qt5ct-1.0.ebuild
+++ b/x11-misc/qt5ct/qt5ct-1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.sourceforge.net/qt5ct/${P}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="+dbus"
 
 RDEPEND="
diff --git a/x11-misc/qt5ct/qt5ct-0.41.ebuild b/x11-misc/qt5ct/qt5ct-1.1.ebuild
index 575ed6982d0c..976ddce58235 100644
--- a/x11-misc/qt5ct/qt5ct-0.41.ebuild
+++ b/x11-misc/qt5ct/qt5ct-1.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
@@ -7,11 +7,11 @@ inherit qmake-utils
 
 DESCRIPTION="Qt5 configuration tool, similar to qtconfig for Qt4"
 HOMEPAGE="https://sourceforge.net/projects/qt5ct/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+SRC_URI="https://download.sourceforge.net/qt5ct/${P}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="+dbus"
 
 RDEPEND="
diff --git a/x11-misc/rofi-calc/Manifest b/x11-misc/rofi-calc/Manifest
index 1572c38d95b8..c545648fbcaf 100644
--- a/x11-misc/rofi-calc/Manifest
+++ b/x11-misc/rofi-calc/Manifest
@@ -3,4 +3,4 @@ DIST rofi-calc-1.6.tar.gz 1694150 BLAKE2B bc1f3a2589c0e704793693e0f007503d1b0eaa
 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-9999.ebuild 467 BLAKE2B fc14f1346f9e5ee3a4199d3f346b0be73ba077311efa515abfef36cecaa6e4299949a6027a0de6190c8ecde529904abb76b2ba2afcf3a605a6433170f66faa34 SHA512 96a703783182f67fb241919b540a5ef2f961a2eed5db80118679bb47eac2c508b695fa1ec389ceaf964860ee9758f878546bf4303e667f9b03757d2289acf2a8
-MISC metadata.xml 376 BLAKE2B b1094be05c70026df494df22cf0d3b9be6f63a8a6afefaa8356d86499b2c64687a6c2881370303192b9b9789c6aeee68233cbba317710ff46214e181e43c9634 SHA512 7f5960e28ad496fe1eb0ab78fb1471a9b3b5583c3a32c3f06ab9bb939e3da2aee1bc3b4096575ddc9f0e797604b5fcfa7f0418055000d0007acc899c34ccc46c
+MISC metadata.xml 266 BLAKE2B 81f9187791657d73f222a9fdb13afbec46a4a493590a18dace8fc39cf1a2a321fbebab3054aad72756a04c2d6104c08e83e4fc70ad0bf8a1a24a09673956a502 SHA512 f35ebacc5e0574848fd39e1eede846facb50015a0449cc0b37807caab44b7c46d28ac490aba2e80dcdaea1ae2eca7158b5894ce647b411661955f16cb69c9223
diff --git a/x11-misc/rofi-calc/metadata.xml b/x11-misc/rofi-calc/metadata.xml
index 300495cc81c1..6f38d7d1e4e2 100644
--- a/x11-misc/rofi-calc/metadata.xml
+++ b/x11-misc/rofi-calc/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>robin@hallabro-kokko.se</email>
-		<name>Robin Hallabro-Kokko</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+    <!-- maintainer-needed -->
+    <upstream>
+        <remote-id type="github">svenstaro/rofi-calc</remote-id>
+    </upstream>
 </pkgmetadata>
diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index 126ef78dca38..85c890dd243d 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -11,5 +11,5 @@ DIST sddm-0.15.0.tar.gz 3520188 BLAKE2B b29a994a0ea2fbbda3f5eaf16885fdfa513a759e
 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 3159 BLAKE2B dd6e5db19e9e5210bc0073c98d867934f87e0d151b5080919b01908701b39a3b9bfc040ffb0ec7f682aa4c2e74e3ad36c4c82608e70765faf0136d7fe3a810c0 SHA512 a5e36435a6920dbf8ab4cc2a44ebae93b0734964f0e3527defc01fcb2bd073af311af985a551b0f04016d7aff971eee362e6597e58b927ac6a862bca50a3bf92
+EBUILD sddm-0.18.1-r3.ebuild 3156 BLAKE2B d2a68e2f3fa0278484fcde419f768151d7b38b7c632c5db36042367dcbbf7140b82ed78b6ef2cf0a0d1f63569b8f235134a25033cbf90b6bf9bcad690ff6f9e5 SHA512 bd18b1248affadd908a13f5c50920a49b3ed3961f8ee05bc2fe7ca2f7ae6d599a0b19a3e257e814e2a2e4489527c2a1f041e8718bd02f3bc597ee1db8970291d
 MISC metadata.xml 943 BLAKE2B 6bfdf54b23210c7e0d781c2f96358036ac7281825e71e4a8e9cf5fc6d43faf5525cc0ac267c7be2f5eadb08ca830350cf102425d30e19e5e4f92a3a57fc5affa SHA512 8a6b888910d68d5209c070c17e0c2e9dc5d64cf9d70cbf5ce945cfae763f864787fb998eb5544f4e6710c36b0045530780fb27f01944b60d71f60f09e8ecb516
diff --git a/x11-misc/sddm/sddm-0.18.1-r3.ebuild b/x11-misc/sddm/sddm-0.18.1-r3.ebuild
index ddadebe514b0..9b168d277fe2 100644
--- a/x11-misc/sddm/sddm-0.18.1-r3.ebuild
+++ b/x11-misc/sddm/sddm-0.18.1-r3.ebuild
@@ -12,7 +12,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"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="consolekit elogind +pam systemd test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-misc/shutter/Manifest b/x11-misc/shutter/Manifest
index 2d61dadac04d..4e230bbf2b46 100644
--- a/x11-misc/shutter/Manifest
+++ b/x11-misc/shutter/Manifest
@@ -1,5 +1,3 @@
-AUX shutter-0.90-goocanvas.patch 581 BLAKE2B a944b2d15b16fc429f73456f1aa266e1687a3d765f018b1f206358e140589d12733fff2bd37b8484207abd8849548b2987fad09b7c789481ec167ea1da0cee6d SHA512 2f3e0fbfbc86740efc4aa9ed7a31caf66560948003e3afc5b9dfba9f0935fffe4de5a217fb322ef9135b981030ef79ce964b1de0a28ad28bc36e58e2261f83e5
-DIST shutter-0.94.3.tar.gz 3375447 BLAKE2B e996966722999ee11ed3c185fd17a77e8982688ec17253f3558f89ccfd2e3afefec34d9214acffb10009fc1a28f587a5b994e32d7bb3538cde5e4f398b8e7b95 SHA512 7f67ed6fbc94aee4b6caa73662ab20684e2d8bdfd7208dcd407bdce4e1b93f2aa1fa256ad6bce66b92c741500726b90e5701e7f31bc831709568e5c4c27bff3b
-EBUILD shutter-0.94.3-r1.ebuild 2083 BLAKE2B 3314d2c7a31903e529434c3e3a4f72ea13768ee6fb09e8b121b054648fc44ba51797c14f524731e2fe85396467f8cfc41c5b02c7e084d085e86e3fea9612100b SHA512 c40be1fa15b4b7bf3297a29b769e2b317cbc71c8594f988ee4e531168856a9cf15fe08e9c18c701344ebe5ab8425e8c012e4115135cd831fb2e9ca1bf514f2d0
-EBUILD shutter-0.94.3.ebuild 2601 BLAKE2B 950db9d14ef692b89d48e73f8264d49b776565ba692a7a5a6b712c809a8a4c30ff7c08f2b01b400631eb2da739af479632adadd99e4281a2297a759e132ac21c SHA512 e8155275463b8456a74a7b18180b0705e328f2597359bb87141bb488c0a45c4278bdfd1db3a7d713e4e64bf9e54dcd7d39925f3ac11e2a4915ce71e4636f8923
-MISC metadata.xml 439 BLAKE2B 688e0946d2c791929e7b351a877ca58d45eaeda73d13fa8eba1e97f3644e8f1d7eadbee432f9f028dc8bda21f72397156386875f7ae3db200fc1ce7108e265a0 SHA512 b4fb3c9f38b71cd3c31af6d819f69709b36ec68035ed695092c54794ca226be58190e7c35019c82e057046630dd5b338dead49b2d09e91ebb40fd979e11c7107
+DIST shutter-0.94.3_p20200621.tar.gz 2571420 BLAKE2B 0567d03d1b511f3bbe889ad6dda3bfa347dc69d96c7ab89368e6e97925d8d4cccb378ee0da179a65a482e6d22117aaff390088e7cac5d695edd3b8fee7c6a396 SHA512 3426b1cc475356cbcbcaba89e59e904907d61ceafb96b7d7994ff3d9a1fcb1f8151099a2361cd8de63b16fe02c1246f0cb50fb7166d666bc502f18e6fdda6d5f
+EBUILD shutter-0.94.3_p20200621.ebuild 2342 BLAKE2B 0676ea8c19807cae8ddc3b3a66621ff7abfc884ed7ee0a69771e5b4f201e6ead0854a8ff1d977b7fb3539c66c23c1d5e28c257cf07517ccc4a9edbff28686141 SHA512 9999f8f578e5fee77105b424488fe9d7b85ef1a4c3a83d809f86225a9b1e6950ab8bd461d870a1a714bc67782ee685405c2607f43ea2ca7da67c17b5b090901a
+MISC metadata.xml 373 BLAKE2B 1b254f3b91e248b37f243d85ca48527e68be76849f668d1918e57a454e1e9da0f899ea36805138e4c18164d91c44b6aaf6a75a46deb5b42af2aa2e1b17a679bf SHA512 9c42f1f7eea609dbd75eba9e5adf78b9f4f69a5966ad54de04cf355672357fe83f1a4f5d140d1701523d96279ca9c8c095dd796bf135a57339ef4d6939be615e
diff --git a/x11-misc/shutter/files/shutter-0.90-goocanvas.patch b/x11-misc/shutter/files/shutter-0.90-goocanvas.patch
deleted file mode 100644
index 3a811635a988..000000000000
--- a/x11-misc/shutter/files/shutter-0.90-goocanvas.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: shutter-0.90/bin/shutter
-===================================================================
---- shutter-0.90.orig/bin/shutter
-+++ shutter-0.90/bin/shutter
-@@ -9407,12 +9407,7 @@ else {
-             $nautilus_sendto = FALSE;
-         }
- 
--        #goocanvas
--        eval { require Goo::Canvas };
--        if ($@) {
--            warn "WARNING: Goo::Canvas/libgoo-canvas-perl is missing --> drawing tool will be disabled!\n\n";
--            $goocanvas = FALSE;
--        }
-+        $goocanvas = FALSE;
- 
-         #net-dbus-glib-perl
-         eval { require Net::DBus::GLib };
diff --git a/x11-misc/shutter/metadata.xml b/x11-misc/shutter/metadata.xml
index f341b92a1e2e..e863a6fabb22 100644
--- a/x11-misc/shutter/metadata.xml
+++ b/x11-misc/shutter/metadata.xml
@@ -9,7 +9,4 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<use>
-		<flag name="drawing">Enables drawing tool</flag>
-	</use>
 </pkgmetadata>
diff --git a/x11-misc/shutter/shutter-0.94.3.ebuild b/x11-misc/shutter/shutter-0.94.3.ebuild
deleted file mode 100644
index 4a8e44ee526f..000000000000
--- a/x11-misc/shutter/shutter-0.94.3.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit xdg-utils desktop
-
-DESCRIPTION="Feature-rich screenshot program"
-HOMEPAGE="https://shutter-project.org/"
-#SRC_URI="https://shutter-project.org/wp-content/uploads/releases/tars/${P}.tar.gz"
-SRC_URI="https://launchpad.net/shutter/0.9x/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="drawing"
-
-RDEPEND="dev-lang/perl
-	drawing? ( dev-perl/Goo-Canvas )
-	dev-perl/libxml-perl
-	dev-perl/gnome2-canvas
-	dev-perl/gnome2-perl
-	dev-perl/gnome2-wnck
-	dev-perl/Gtk2-Unique
-	dev-perl/Gtk2-ImageView
-	dev-perl/File-DesktopEntry
-	dev-perl/File-HomeDir
-	dev-perl/File-Which
-	dev-perl/JSON
-	dev-perl/File-Copy-Recursive
-	dev-perl/File-MimeInfo
-	dev-perl/Locale-gettext
-	dev-perl/Net-DBus
-	dev-perl/Proc-Simple
-	dev-perl/Proc-ProcessTable
-	dev-perl/Sort-Naturally
-	dev-perl/WWW-Mechanize
-	dev-perl/X11-Protocol
-	dev-perl/XML-Simple
-	dev-perl/libwww-perl
-	virtual/imagemagick-tools[perl]"
-
-src_prepare() {
-	default
-
-	use drawing || eapply "${FILESDIR}"/${PN}-0.90-goocanvas.patch
-
-	#Fix tray icon because it doesn't pick the right icon using various themes
-	sed -i -e "/\$tray->set_from_icon_name/s:set_from_icon_name:set_from_file:" \
-	-e "s:shutter-panel:/usr/share/icons/hicolor/scalable/apps/&.svg:" \
-	bin/shutter || die "failed to fix trayicon"
-}
-
-src_install() {
-	dobin bin/${PN}
-	insinto /usr/share/${PN}
-	doins -r share/${PN}/*
-	dodoc README
-	domenu share/applications/${PN}.desktop
-	# Man page is broken. Reconstruct it.
-	gunzip share/man/man1/${PN}.1.gz || die "gunzip failed"
-	doman share/man/man1/${PN}.1
-	doicon share/pixmaps/${PN}.png
-	doins -r share/locale
-	insinto /usr/share/icons/hicolor
-	doins -r share/icons/hicolor/*
-	find "${D}"/usr/share/shutter/resources/system/plugins/ -type f ! -name '*.*' -exec chmod 755 {} \; \
-		|| die "failed to make plugins executables"
-	find "${D}"/usr/share/shutter/resources/system/upload_plugins/upload -type f \
-		-name "*.pm" -exec chmod 755 {} \; || die "failed to make upload plugins executables"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-
-	elog ""
-	elog "These optional dependencies provide additional functions:"
-	elog ""
-	elog "- media-libs/exiftool            : Writing Exif information"
-	elog "- dev-libs/libappindicator       : Status icon support for Unity"
-	elog "- dev-perl/{Net-OAuth,Path-Class}: Dropbox support"
-	elog "- dev-perl/JSON-XS               : vgy.me image hosting support"
-	elog""
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/x11-misc/shutter/shutter-0.94.3-r1.ebuild b/x11-misc/shutter/shutter-0.94.3_p20200621.ebuild
index d2df1d6487bc..b29843d0ea8a 100644
--- a/x11-misc/shutter/shutter-0.94.3-r1.ebuild
+++ b/x11-misc/shutter/shutter-0.94.3_p20200621.ebuild
@@ -7,7 +7,9 @@ inherit desktop eutils xdg-utils
 
 DESCRIPTION="Feature-rich screenshot program"
 HOMEPAGE="https://shutter-project.org/"
-SRC_URI="https://launchpad.net/shutter/0.9x/${PV}/+download/${P}.tar.gz"
+MY_COMMIT="af237e7f415a5fa20402703490c6190dc1af9b20"
+SRC_URI="https://github.com/shutter-project/shutter/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -15,10 +17,11 @@ KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	dev-lang/perl
-	dev-perl/libxml-perl
 	dev-perl/gnome2-canvas
-	dev-perl/gnome2-perl
 	dev-perl/gnome2-wnck
+	dev-perl/libxml-perl
+	dev-perl/libwww-perl
+	dev-perl/Glib-Object-Introspection
 	dev-perl/Gtk2-Unique
 	dev-perl/Gtk2-ImageView
 	dev-perl/File-DesktopEntry
@@ -29,13 +32,13 @@ RDEPEND="
 	dev-perl/File-MimeInfo
 	dev-perl/Locale-gettext
 	dev-perl/Net-DBus
+	dev-perl/Number-Bytes-Human
 	dev-perl/Proc-Simple
 	dev-perl/Proc-ProcessTable
 	dev-perl/Sort-Naturally
 	dev-perl/WWW-Mechanize
 	dev-perl/X11-Protocol
 	dev-perl/XML-Simple
-	dev-perl/libwww-perl
 	virtual/imagemagick-tools[perl]
 "
 
@@ -57,6 +60,9 @@ src_install() {
 	insinto /usr/share/metainfo
 	doins share/appdata/shutter.appdata.xml
 
+	# .po doesn't belong to installed system, only .mo
+	rm -r "${ED}"/usr/share/shutter/resources/po || die
+
 	find "${ED}"/usr/share/shutter/resources/system/plugins/ -type f ! -name '*.*' -exec chmod 755 {} \; \
 		|| die "failed to make plugins executables"
 	# shutter executes perl scripts as standalone scripts, and after that "require"s them.
diff --git a/x11-misc/simpleswitcher/Manifest b/x11-misc/simpleswitcher/Manifest
index 68c3e460f141..35eaf5a32a9d 100644
--- a/x11-misc/simpleswitcher/Manifest
+++ b/x11-misc/simpleswitcher/Manifest
@@ -1,4 +1,6 @@
 DIST simpleswitcher-20140219-cbc89a71a61fd2d164c3fdc3ef4d3fa809c1741a.tar.gz 16370 BLAKE2B 5bc23dcb26a99857c943b52b857f227043f3062337815f9d9f7feef05120abcdec31c3d756433e763b984cc8df506c9667954de200f19edff72a7a9efab9dbde SHA512 1c17e1858855d587a85a2ba2c0000ddc3e6da0e8bfdb6703de04a7bceaa575d2db0b8a032f3833c1f08c0ce413eaa1908fa62c6b6c98dba367668a7bceec467c
+DIST simpleswitcher-20191008-7230421aa2e3364e3b4620f1ea3760f8f810b1a5.tar.gz 16400 BLAKE2B 5bf6efa685c6114cb8ad5ea491f683f25aa7c2ed84d5f3014de9c3eb4ef1934be232082190c3c7444acfebf902ba7e0aabf29604cd7abb9fa33c6fd024ef2b90 SHA512 b86eee41de3c0b92fe68f13b8691fd0a60a6ffbb73bfcf411c2898b3bb5b159bc4d36a09b651cba27d375ae2db99ce2e046b1dde8e9d93d8d5444b3b338c484c
 EBUILD simpleswitcher-20140219.ebuild 720 BLAKE2B 76d591f761556a0ceb92790b0bc274030f1c746fe4edd21a3a9eb1b193a72b8d79e10f284d0e66a7d4dcc70067133f06ed873f5b59543e15efdedeb0ad365b67 SHA512 ba2202e5f1587246c3976984bc8d2e6c6da4990601c53820dbb90ff5644fbd1a221195419ae95961d1efb0458da8fd627dc52acde5dfd9105f0cc5e31e0bd8e5
-EBUILD simpleswitcher-99999999.ebuild 593 BLAKE2B 33d2836e07484d515514770fbae9c2d1a6f4467e0d7188420720dc3fa06cdc8f24baa88c368b6c7be92796a6ce20409f8d131ba52e50dafe81801e1662fac2e4 SHA512 3c616712833cef5b49ca616fb76510646d4b2d5aa32d44db11ac1eb2845666486695928cbadd0c86b98a96620b6bf2ca2a2e17d43f18d2c8bbddd9486d76287a
+EBUILD simpleswitcher-20191008.ebuild 677 BLAKE2B 3d7f777b44af674c090587aa4efda26df9506f900ece22bffbff6bd9c3f1faac0f307515b39b473e51a7b41961743e08460fddee6495c3866c0f3b8c4ca7ff9e SHA512 2f80704f638a0e7da69e6cab10e05d282e0e6f946f995fffa445a4cf3039617a1bef8be49eacdbc5596e217e6e6692f138de5e7fcd2023e593513b64a4b822e8
+EBUILD simpleswitcher-99999999.ebuild 550 BLAKE2B c4541ff14cfb3029134ce285d0d472e95da9d0e13e60102d8a670634c9856da6e852c1e9a5e102a21e00edd91643b958b3614c2b4e0af9187fe858e687df8232 SHA512 ddd8d681380e3e4f54e1719f0d0eb84bccdfdbe2500f452b91d6a064a32d34605e48d76171c50648d06f48b79bb5d93b77ca9bfef29a5ad9adf9f4402b537c79
 MISC metadata.xml 307 BLAKE2B e6baba19f9e851500948d66078b74d9f0d1aa06000b8fb13e4de54a43c5d1206a02033375e554995497dff2b431158788d1dd86dafa780a3fcd454ac7a14a8d4 SHA512 3f110a2d7c7a233ee80fd3d7cb3e5a315a04011fd13251d785cbcace59c5b5be3734d3c52eed2c4ad89454b21f3b039a89ae5d80e63735370f581d9e9b0478cb
diff --git a/x11-misc/simpleswitcher/simpleswitcher-20191008.ebuild b/x11-misc/simpleswitcher/simpleswitcher-20191008.ebuild
new file mode 100644
index 000000000000..e7051abca7cf
--- /dev/null
+++ b/x11-misc/simpleswitcher/simpleswitcher-20191008.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+SSHASH="7230421aa2e3364e3b4620f1ea3760f8f810b1a5"
+DESCRIPTION="lightweight EWMH window switcher with features and looks of dmenu"
+HOMEPAGE="https://github.com/seanpringle/simpleswitcher"
+SRC_URI="https://github.com/seanpringle/simpleswitcher/archive/${SSHASH}.tar.gz -> ${P}-${SSHASH}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXft
+	x11-libs/libXinerama
+	x11-libs/libXres
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+S=${WORKDIR}/${PN}-${SSHASH}
+
+src_compile() {
+	tc-export CC
+	default
+}
diff --git a/x11-misc/simpleswitcher/simpleswitcher-99999999.ebuild b/x11-misc/simpleswitcher/simpleswitcher-99999999.ebuild
index 093564097040..24730fddec45 100644
--- a/x11-misc/simpleswitcher/simpleswitcher-99999999.ebuild
+++ b/x11-misc/simpleswitcher/simpleswitcher-99999999.ebuild
@@ -27,8 +27,3 @@ src_compile() {
 	tc-export CC
 	default
 }
-
-src_install() {
-	default
-	doman ${PN}.1
-}
diff --git a/x11-misc/slim/Manifest b/x11-misc/slim/Manifest
index e4ba83ffa12f..6a7ea7b5f39e 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 4173 BLAKE2B 3c5f8a25ca6993e91cdc1a017aa8bc4710c7e2b296266ced0335540f692a353bd107f768b898c2839ddd244f6e66d686c116f59a65ec566dc14ee2a04e6d33e1 SHA512 088936053faf8b2b5711d47ca1817fec1ee0693c89a4dcc0c563cbf6f76b2f8e173856f82b091bf39ab2f45a2207fbf99be91fcd09e18b67d97f89c3ad70e936
+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
diff --git a/x11-misc/slim/slim-1.3.6-r5.ebuild b/x11-misc/slim/slim-1.3.6-r5.ebuild
index 9b1efda4c881..8b894dd5a563 100644
--- a/x11-misc/slim/slim-1.3.6-r5.ebuild
+++ b/x11-misc/slim/slim-1.3.6-r5.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=5
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/project/${PN}.berlios/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 sparc x86"
 IUSE="branding pam consolekit"
 REQUIRED_USE="consolekit? ( pam )"
 
diff --git a/x11-misc/slock/Manifest b/x11-misc/slock/Manifest
index 64e33cdfb56e..c4f6334ee354 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 1154 BLAKE2B b41c82706e1066216efe83a939a62c97337be6fdff15e6f5b98472f99371624185ddc26edfebf4248a3aaf6fd92e188bbe2f24e70f1a693b5291387f29ef8a36 SHA512 1060e582d61d758049dd9e184965b5ec1e5418fa193c556965acc789627966a5309888e18aada49dd8e3f06ffe0a07ab6b459bcc02376352f23e8f32fb1bed71
+EBUILD slock-1.4.ebuild 1158 BLAKE2B 622c0554db008027c8f507bb0c35eae028bcb61d3c9be5a14c801a687b201e86b541b0d70a6b6ff1c0394b3de02e32ed221bc5e954e8361731c4362acd1a5324 SHA512 bbe9df6043f1bfbdb632ccc0c0a945aa7f43ce37015ecc32fd620753280c80df1e2c5ea54b40a5d3e8d6511366a346934e262976f38b9201ea0d6cf6118bbb36
 MISC metadata.xml 347 BLAKE2B 1f37fe6210fecce67b02a14defcc2510c14189876257d2a5419a50c00c237100dbc37dfff653434245e0b78daf7389121e34fe76aeaf7119280dc154f5dfc95f SHA512 5939bd8c1055a98efc2987fce141841116bb531301b8666d85c7018ff8fd0bcdb21d5fa8eb5d39ccb384666a3c53834700cfa442262624714a4633aa0ac49545
diff --git a/x11-misc/slock/slock-1.4.ebuild b/x11-misc/slock/slock-1.4.ebuild
index a8d677de1b6d..ac963b394c18 100644
--- a/x11-misc/slock/slock-1.4.ebuild
+++ b/x11-misc/slock/slock-1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 hppa x86"
+KEYWORDS="amd64 ~arm64 hppa x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-misc/slop/Manifest b/x11-misc/slop/Manifest
index c48634512f13..4df2334f99f7 100644
--- a/x11-misc/slop/Manifest
+++ b/x11-misc/slop/Manifest
@@ -1,6 +1,4 @@
-DIST slop-7.4.tar.gz 50079 BLAKE2B 20815270bf1bffe0ef26630fd31d0d4cc7261633cef389e64c232a89033b6e8b5e1651fb5c882e2870808107734c4c088123b85675fa2aae932570d770344dc8 SHA512 13d09c2c9f05760ee0a273edb6d40da8a87989d3f071a8c868a0c7e535ba89b9eb934c79d56212cd689687f86e3683cef1b749ef7b37be3805ea8eb05c796e58
 DIST slop-7.5.tar.gz 51060 BLAKE2B 8d0fcf932181dfc482be7c54cf5a08605a32c85bcd8b27223a4cd8a08323382e802a7f20faa6c51fe67583b1d320cf783c7b5cc8b871e534ea11a32b827e1f45 SHA512 c02e40c5b924841996617fcc9629a6a739a04b6128c18e1eb06dc285d2f8026d847e67077fb59a111fc45c112f871a6e5faef20108c3d777271e1d4aca7f4737
-EBUILD slop-7.4.ebuild 841 BLAKE2B e9d7a1c367746cf7755c53e6e67b49350636a9e492fb4925227301e3bbd75b7fff0305cdcb5d44c0d68545677770b5cc286e9762c68da9175379bb4b0856cb04 SHA512 2d488df26b6f1c39539d9eba88baa621a6166b53b30ec30d68bda1eb617dbd9da5b17d74a2fffc5193012141e1e3a68c180ed6d62d3703dd26d35eab4410e078
 EBUILD slop-7.5.ebuild 808 BLAKE2B 98fbd3f0b5395b71b11c07a235aa3358a3723a346876dbc88487335b1ed74e552e6ca15bf55d01d54f47b275ada783e3177a359d542b4c74ec03b24a4a9f4e6e SHA512 92c9f8c8920abfc9e321cbdbe4788cc35a470bac8e83fc3f278e2eb63faf05896d07fb6d1f5a323455597c0c15bad731828aa240764e9805526f05dd27dce6b2
 EBUILD slop-9999.ebuild 808 BLAKE2B 98fbd3f0b5395b71b11c07a235aa3358a3723a346876dbc88487335b1ed74e552e6ca15bf55d01d54f47b275ada783e3177a359d542b4c74ec03b24a4a9f4e6e SHA512 92c9f8c8920abfc9e321cbdbe4788cc35a470bac8e83fc3f278e2eb63faf05896d07fb6d1f5a323455597c0c15bad731828aa240764e9805526f05dd27dce6b2
 MISC metadata.xml 630 BLAKE2B dbf7d848908c12d7104c7cd18cd2ca16114073803bd4600e10906a1fc4f86ddeb646359d26885551d998a279d1e11f0d74ad21b135e14a2bea827ef21ade15f7 SHA512 98eea5cce0e8a692076b5cb423a2f0522151d716ef0c9f346e915bfee8590d32dab59c183180ea7f87561bfb92e3840ad710f890a734640173bbcd471d779b0e
diff --git a/x11-misc/slop/slop-7.4.ebuild b/x11-misc/slop/slop-7.4.ebuild
deleted file mode 100644
index a61629c541d3..000000000000
--- a/x11-misc/slop/slop-7.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-inherit cmake-utils
-
-DESCRIPTION="An application that queries the user for a selection for printing"
-HOMEPAGE="https://github.com/naelstrof/slop"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/naelstrof/slop.git"
-else
-	SRC_URI="https://github.com/naelstrof/slop/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-IUSE="opengl"
-
-RDEPEND="
-	dev-libs/icu:=
-	x11-libs/libX11
-	x11-libs/libXext
-	opengl? (
-		media-libs/glew:0=
-		virtual/opengl
-		x11-libs/libXrender:=
-	)"
-DEPEND="
-	${RDEPEND}
-	media-libs/glm"
-
-src_configure() {
-	local mycmakeargs=(
-		-DSLOP_OPENGL=$(usex opengl)
-	)
-	cmake-utils_src_configure
-}
diff --git a/x11-misc/splatmoji/Manifest b/x11-misc/splatmoji/Manifest
index 586ae685fe87..9dcd650bdfdb 100644
--- a/x11-misc/splatmoji/Manifest
+++ b/x11-misc/splatmoji/Manifest
@@ -1,3 +1,3 @@
-DIST splatmoji-1.0.tar.gz 407506 BLAKE2B 5e2ac158501c29b013249eb9e4e509afd5b2418ce3975bc1f4e1739ac92227ca135ade6e4bd328400d337414befc7e413f76ce5a87a9cedcfcaec293e2439d1d SHA512 71d7d1895570cd85c5cc7896d165b8aa7444a89eb8d99c2e10a977bec38853e03ba707231551bc763add260d3c3bc8e0553b561204cb8f88d384870b7dba7fa0
-EBUILD splatmoji-1.0.ebuild 567 BLAKE2B 9e2ff2c4af3c9b4226c53fcc98fb2ff9d4437299dd9519705ade5ab66944b2b606c481f6055bc1f1344046a2505684d60dce1c4083fb1483bb6934854e1660ef SHA512 6883d0bb93191fb26aa5238a481a0eaca5409b77fbeab690b546f46156901b4846d2c6d558434154f2477f88862bad2541219961372eae97ed1ab6a34938224c
+DIST splatmoji-1.1.0.tar.gz 4329417 BLAKE2B b36f4e338b44afef9865b1a1e200f03a64aadddc0ad6049534d4c5029ffc2408d0b665276fe8c8af9c8f24ccdf4b71dd8d26aa000c75d3c1f07798a5d006d304 SHA512 0c8697ec58cf011d6000d46dc9dae3507708c1c9caf3d184a1018d37f7ca4df071800689b2bfda4c3908dba13f762d9ffee4212a06318b26e5ffaf93429458c0
+EBUILD splatmoji-1.1.0.ebuild 616 BLAKE2B 919cfcecdfc19dab68543e73c7061ecbd48b36f640142a85709b2a524ab3305143d166dbd3c1f7a022c5e1d384b7dd73962812785383fce890694d07500f92ed SHA512 0d29a163bafc867266f529adc4acbb0b8fffaa79796f29bc6c4aa4b7b481fa49f4306d6bf06e6987468e5136aeebc6ddd70ff871abc1929786b06c7012dcaa07
 MISC metadata.xml 612 BLAKE2B ca9e33ad1b59ef01ed77aa8c09053544b1e184009bf499fa105ce7cf23d87baa2943b44549f27c77e02f2f4fd58dbfcbbf8412b06d6364df3d45404f256fc231 SHA512 8a2e21d68bb4e70b8899c91f2a47276808130f57037d91373356077643c653736639e72f24c2c6aba0f8154f3dfe636b9eedeb5b8d16108e767f066a89b1c21b
diff --git a/x11-misc/splatmoji/splatmoji-1.0.ebuild b/x11-misc/splatmoji/splatmoji-1.1.0.ebuild
index fe3507b04dc6..a8bdeaded1fb 100644
--- a/x11-misc/splatmoji/splatmoji-1.0.ebuild
+++ b/x11-misc/splatmoji/splatmoji-1.1.0.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
@@ -23,4 +23,6 @@ src_install() {
 	doins splatmoji.config
 	insinto /usr/share/splatmoji
 	doins -r data
+	insinto /usr/lib/splatmoji
+	doins lib/functions
 }
diff --git a/x11-misc/sunflower/Manifest b/x11-misc/sunflower/Manifest
index 2697dd0284fd..8628e9d7ce7f 100644
--- a/x11-misc/sunflower/Manifest
+++ b/x11-misc/sunflower/Manifest
@@ -1,6 +1,3 @@
-AUX sunflower 82 BLAKE2B f0ff1d683ac90ce80d4c9aa168681829f44cbdf94d95bc35441fc82d3fe2db57ece7a4e564d99990de901e6a01e7b8013a840717a67ef798d34a08c9ebea03d4 SHA512 5e9685e8e2d8933e9b3bb2f3dc92ad677f38b63766bdb407cef7373590ed8d0e73aebd1ed6e489b39c8b1477c50657df499a7b5e50c09df1e675448dcad7f62c
-DIST sunflower-0.2-59.tgz 790126 BLAKE2B 32df1ced73ba0bf5e814e52010eefbbd10657bdbb602dd3a48dc08b865195c3d1efa631bfe2d421f0a12a2f01521a2c6248fe5b9ca8fcc268423f0c9aa3d252d SHA512 e97076eb1c57d52b8fd95501259acaaa9a429f9daacc30ef587cce2f3419433f5aa4554e0e86beeceda208b4be425b98c64c6ced04e36e86b2b4f803176c37f9
-DIST sunflower-0.3.61.tar.gz 975053 BLAKE2B 5845ce0e81cf98b7488c9c34b8a3b6702e01abe9976bd4186691ce3804164d707d3ca999896e3f8d60e5253891d94f39e2fabdb50170afa8ec0f937df141db89 SHA512 f55c2fb15889f903375776f989498827dcab287e87d4015c50f12780dd2f0271e1e127533a10ca94f44ebd44727018917cf92e828bbe82b7653d8ed559ee1cc3
-EBUILD sunflower-0.2_alpha59.ebuild 2179 BLAKE2B 9190ab3dc2703b4dd1b56e3a3bd0067335d9497a4be13e8a343355c7d16d2fe3608b21a6ca1e5b4b3e3de302de79779e3a5a8436903de14a582222e396e86369 SHA512 eb5ca2f8be41572ba390286c60c687aa6b91c48bb1babdf8535e92fc1a93f496d4174e352593bb07385a9df550893a23700e0ae91f83171355f1dd7ba4f720eb
-EBUILD sunflower-0.3.61.ebuild 2247 BLAKE2B 2ed58a4bd560cd12594c7b366c593831b16c06ff54c41cda233b42fb4ec612430748089fe946c4f7b5dafc7913f6c3c827a71c8ea718a5b708ec3d6b352b5cc3 SHA512 d9134e077c77b072f1bbcb95d672d06e669f3d38b155d4f53474f3f9b9364081b0dac992e2a1f63436d4b0b269ba456fa79675bb62f59bcaaecbcd060cd7055b
+DIST sunflower-0.4_p20200716.tar.xz 830248 BLAKE2B 673b320bf08c0e0600fae06a531f75403b0e76bd8a267918986da84537a5213f0a1d99c9de74820f15652b80959e9029566f4611138893f08919f389a66a8032 SHA512 0e30bbadb3d60a64e2a2b629104c2a3ad88d997d581c1c76ef593afa1d3c48aafd185b4cd36da25bed5c3e9b9d1389f0709aaa40e796e883dccfe71b214620ed
+EBUILD sunflower-0.4_p20200716-r1.ebuild 818 BLAKE2B fde070e88b7ff643158e4de317ed9693b2559078f51557a7105c74541c019dd65e7e3193bb05163ddcda213111a1d58939255c54b8d702078f3ce836c9bff01d SHA512 06a378e03f8c2a67cd9b5c93a434b943022a1262ed00e47868ba7e190cbae6cbfab2f5828589ea40a56ba6b279b48a123f61ab9df72cfda886e683a8cf161467
 MISC metadata.xml 331 BLAKE2B 16f51cce07665f2b4c089d6831dc0b4640e7b21d2415f4bdf644afbd19242cf4c7b45fd62ea937fb75b30d8b948940ad66f1fdead711bbd83ef50a2638b401d2 SHA512 dab5d495adda997004324ba91ded752f50eaaf1c6392f8943d48d54c5cd3363137dd4d742a7b939e5affe3d3e805ed393c9397797dce1c820d4e596f7f2aeaf8
diff --git a/x11-misc/sunflower/files/sunflower b/x11-misc/sunflower/files/sunflower
deleted file mode 100644
index 192d4b99e1ae..000000000000
--- a/x11-misc/sunflower/files/sunflower
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env python
-
-import os
-os.chdir("@SITEDIR@")
-import sunflower.Sunflower
diff --git a/x11-misc/sunflower/sunflower-0.2_alpha59.ebuild b/x11-misc/sunflower/sunflower-0.2_alpha59.ebuild
deleted file mode 100644
index d1fea9c5a0c7..000000000000
--- a/x11-misc/sunflower/sunflower-0.2_alpha59.ebuild
+++ /dev/null
@@ -1,89 +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 gnome2-utils python-r1 xdg-utils
-
-MY_PN="Sunflower"
-DESCRIPTION="Small and highly customizable twin-panel file manager with plugin-support"
-HOMEPAGE="https://github.com/MeanEYE/Sunflower
-	https://sunflower-fm.org/"
-SRC_URI="http://sunflower-fm.org/pub/sunflower-${PV/_alpha/-}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	>=dev-python/pygtk-2.15.0[${PYTHON_USEDEP}]
-	>=dev-python/notify-python-0.1[${PYTHON_USEDEP}]
-	gnome-base/librsvg:2"
-
-S=${WORKDIR}/${MY_PN}
-
-src_prepare() {
-	default
-	find "${S}" -name "*.py[co]" -delete || die
-	find "${S}"/translations -name "*.po" -delete || die
-	rm "${S}"/translations/${PN}.pot || die
-
-	sed -i \
-		-e '/^application_file/s/os.path.dirname(sys.argv\[0\])/os.getcwd()/' \
-		${MY_PN}.py || die
-}
-
-src_install() {
-	touch __init__.py || die
-	installme() {
-		# install modules
-		python_moduleinto ${PN}
-		python_domodule images application ${MY_PN}.py \
-			AUTHORS CHANGES COPYING DEPENDS TODO __init__.py
-
-		# generate and install startup scripts
-		sed \
-			-e "s#@SITEDIR@#$(python_get_sitedir)/${PN}#" \
-			"${FILESDIR}"/${PN} > "${WORKDIR}"/${PN} || die
-		python_doscript "${WORKDIR}"/${PN}
-	}
-
-	# install for all enabled implementations
-	python_foreach_impl installme
-
-	insinto /usr/share/locale
-	# correct gettext behavior
-	if [[ -n "${LINGUAS+x}" ]] ; then
-		for i in $(cd "${S}"/translations ; echo *) ; do
-			if has ${i} ${LINGUAS} ; then
-				doins -r "${S}"/translations/${i}
-			fi
-		done
-	else
-		doins -r "${S}"/translations/*
-	fi
-
-	newicon -s 64 images/${PN}_64.png ${PN}.png
-	doicon -s scalable images/${PN}.svg
-	newmenu ${MY_PN}.desktop ${PN}.desktop
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-
-	# TODO: better description
-	elog "optional dependencies:"
-	elog "  dev-python/libgnome-python"
-	elog "  media-libs/mutagen"
-	elog "  x11-libs/vte:0[python] (terminal support)"
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/x11-misc/sunflower/sunflower-0.3.61.ebuild b/x11-misc/sunflower/sunflower-0.3.61.ebuild
deleted file mode 100644
index e632d371fb25..000000000000
--- a/x11-misc/sunflower/sunflower-0.3.61.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit python-r1 xdg-utils desktop
-
-MY_PN="${PN^}"
-MY_PV=$(ver_rs 2 '-')
-
-DESCRIPTION="Small and highly customizable twin-panel file manager with plugin-support"
-HOMEPAGE="https://github.com/MeanEYE/Sunflower
-	https://sunflower-fm.org/"
-SRC_URI="https://github.com/MeanEYE/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	>=dev-python/pygtk-2.15.0:2[${PYTHON_USEDEP}]
-	>=dev-python/notify-python-0.1[${PYTHON_USEDEP}]
-	gnome-base/librsvg:2
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-"
-
-S=${WORKDIR}/${MY_PN}-$MY_PV
-
-src_prepare() {
-	default
-	find "${S}"/translations -name "*.po" -delete || die
-	rm "${S}"/translations/${PN}.pot || die
-
-	sed -i \
-		-e '/^application_file/s/os.path.dirname(sys.argv\[0\])/os.getcwd()/' \
-		${MY_PN}.py || die
-}
-
-src_install() {
-	touch __init__.py || die
-	installme() {
-		# install modules
-		python_moduleinto ${PN}
-		python_domodule images application ${MY_PN}.py \
-			AUTHORS CHANGES COPYING DEPENDS TODO __init__.py
-
-		# generate and install startup scripts
-		sed \
-			-e "s#@SITEDIR@#$(python_get_sitedir)/${PN}#" \
-			"${FILESDIR}"/${PN} > "${WORKDIR}"/${PN} || die
-		python_doscript "${WORKDIR}"/${PN}
-	}
-
-	# install for all enabled implementations
-	python_foreach_impl installme
-
-	insinto /usr/share/locale
-	# correct gettext behavior
-	if [[ -n "${LINGUAS+x}" ]] ; then
-		for i in $(cd "${S}"/translations ; echo *) ; do
-			if has ${i} ${LINGUAS} ; then
-				doins -r "${S}"/translations/${i}
-			fi
-		done
-	else
-		doins -r "${S}"/translations/*
-	fi
-
-	newicon -s 64 images/${PN}_64.png ${PN}.png
-	doicon -s scalable images/${PN}.svg
-	newmenu ${MY_PN}.desktop ${PN}.desktop
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-
-	# TODO: better description
-	elog "optional dependencies:"
-	elog "  dev-python/libgnome-python"
-	elog "  media-libs/mutagen"
-	elog "  x11-libs/vte:0[python] (terminal support)"
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/x11-misc/sunflower/sunflower-0.4_p20200716-r1.ebuild b/x11-misc/sunflower/sunflower-0.4_p20200716-r1.ebuild
new file mode 100644
index 000000000000..18bd85007e5f
--- /dev/null
+++ b/x11-misc/sunflower/sunflower-0.4_p20200716-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="Small and highly customizable twin-panel file manager with plugin-support"
+HOMEPAGE="https://github.com/MeanEYE/Sunflower
+	https://sunflower-fm.org/"
+SRC_URI="https://dev.gentoo.org/~slashbeast/distfiles/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/chardet[${PYTHON_USEDEP}]
+"
+
+RDEPEND="${DEPEND}
+	dev-python/pycairo[${PYTHON_USEDEP}]
+"
+
+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/tint2/Manifest b/x11-misc/tint2/Manifest
index ad9aa466f6de..4f462c8483e6 100644
--- a/x11-misc/tint2/Manifest
+++ b/x11-misc/tint2/Manifest
@@ -5,5 +5,5 @@ DIST tint2-v16.7.tar.gz 551197 BLAKE2B ef1c5b3dea255e12f6dcea80a29f016e32e48f729
 EBUILD tint2-16.2.ebuild 1273 BLAKE2B ef37602f6f90f16fe0b6fef490bed60e55b326437d925cac0187df093c16b0038eb2e7460db16bb8f02881a797064510076ac7f8f99e26a43e6b85fbf4ea8f4c SHA512 329bf5a8f20b644e6fcc5e382cc72a8d1fa3766f66e302c3648d59c7f9495efb3babe31848772116320dc0df23f687d86233859fafd54f762a46aa26e2db132c
 EBUILD tint2-16.6.1.ebuild 1275 BLAKE2B f8cacb894d6955a00e3432a2ebc3de37faefd9e1c07a6da5da3cf288d7382a63252bf5b88ab87c085b3eb2616da7b133e15c04212407df5133b36ca33f92f472 SHA512 82db6f40551561c1ffa5fd315380f929f3747de63cedecf7e2ea66845db444aba2dc350b4dfd32f90172af750917e3a5a28044d5a7fceb08414e944218ac0893
 EBUILD tint2-16.6.ebuild 1278 BLAKE2B 0f8fff73d71aa594f162e951c8258a70902b303c7db43ae3d9a238f4a2d92e04cf160791f90e8648473012862cd86351a16256ac4aacc57ebd4e8a9afdb60288 SHA512 f80543332fd3602c29423d8420b85afa8b1d2f3e55550acf54151dedab7405e587b7e5cfab6874fb5fca1eb9c7eb0dd3343e21fc11461fac65c12d3865902419
-EBUILD tint2-16.7.ebuild 1302 BLAKE2B 6ee304f17a1cece110573b6b60eb6644ea90325f132f8c2fe7c2a94ae6197e0cc54fd227a8fc146893d7f7456dcaeabd11251d4b51adf53f37431f2f9edeb167 SHA512 f9b8f0f7cddc8abea6940c0810ff88e80af8173b27bf6351a70ca6582f37cb65c6cf48494935b2fd85b184bf32bd22aee3c42b9bfd742363901a2fb798c614f0
+EBUILD tint2-16.7.ebuild 1300 BLAKE2B 02e58401a6a39173ce5ebcecb7209db422f1e2f2b76c9474351452dc0a8341251614e6f5b09ae54fe764b27679194a2f17150475509f69cd92a7c5a88f8ee0ea SHA512 7c2b6de1c0933ef0c75394908ce39cd4f1ad8d3e955d07b842f9284623ac77f156963e468a1b0dd579ed2e98699247b7b7060d31d963db8c5e1938a5d33057ba
 MISC metadata.xml 789 BLAKE2B 95159a0de8a09e4381a7cccf494554faecd8ca1e20e3d175eeb1ef76015f7609a3fe6cbbc0208414b7b703d78339b0a8b643263766269e1e466506ee25a4cbe7 SHA512 e50c127a10ae89a7ec04c7b3a1d5dad3fd1ca89ac37b66378d8b24921d3ffe43ea4037182e20a624880be0eea527414e3727726e6799bbec4d46e2d3bdc934cf
diff --git a/x11-misc/tint2/tint2-16.7.ebuild b/x11-misc/tint2/tint2-16.7.ebuild
index 1a088f5d1abb..f71adacd17f3 100644
--- a/x11-misc/tint2/tint2-16.7.ebuild
+++ b/x11-misc/tint2/tint2-16.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,7 +12,7 @@ S=${WORKDIR}/${PN}-v${PV}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="battery svg startup-notification tint2conf"
 
 DEPEND="
diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index be15b8532d15..c6fb9c89fd5d 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -8,6 +8,6 @@ DIST VirtualGL-2.6.3.tar.gz 1197037 BLAKE2B d331ddac80d98e5c1d6be90e90d06706ff3e
 DIST VirtualGL-2.6.4.tar.gz 1198141 BLAKE2B 34794897f62ccdf7f5d80b1c4465af5e22d72408e14ae9243c66315c9ffeedb21eb5dc6afc95c889c000c46685b8ab6e0756edaee4f34d9d28ea0b71459efba3 SHA512 a475e5b7373d0c86ec7d1274f7527cd7bb1d82acdb38d42366faae58175052f957e090a4c8fdb4e3ba4b2b9063957c14b46d55316b69420247d2f9cf3afb1280
 EBUILD virtualgl-2.6.1-r1.ebuild 2709 BLAKE2B 95b4f319aeae46ee30ddd72eed37956bf465857e25e0397c8837a6e86689c2803513ab2d13385cd7e8ad879a78a5567fc33e3f0070a69d0ad26688c9a0694aed SHA512 2981a1b63d890e16159ae292e70a34e50deb363183eaa9910ff1501a15de61d279eb77bdf2cf5e0fc39100ad7dcff841a07f426eb60f6bf2d0cd5da25e4cdc01
 EBUILD virtualgl-2.6.3-r1.ebuild 2960 BLAKE2B 15f663fe63ebcf45c8efc7efa31af1bf2f98b39916533e335e30eb2fa03fba204e28e1c06c6a1e83c0f612a8b6cb56c22340ee77cf10685f60aec5f8eec86f2c SHA512 159f58a730f670615a26640e9b5f9d7e55b10562e2af06cc1dc93b5066b5c6d4b7095e0718ee3382f126376e0803446927afc7a5552dcf77d62b2794f6c1b504
-EBUILD virtualgl-2.6.4.ebuild 2844 BLAKE2B 6a01f775a41796ff666a9270f2fd656cbcbfc0225c8501e243792b814c0e12fe856c684fc8432b8b2af388b1240bb71c67d7b7c9ec7baf3b6835df22c4fd15a3 SHA512 770f8776d32136cbb660acbc69f8f4ae1bef52ef3c64adaa7a6d7255e98086994626484bb60afc9392bfc39be1be44f949b36168269f472c38e107711185fc86
+EBUILD virtualgl-2.6.4-r1.ebuild 2929 BLAKE2B 2c591c97f2cb5fd44fb96d970a7e99f2c0c6414303a179e7a455e53a0699d38d7358b814b5d67a4bc58eb3bd666cb5b9956317ae3b8255fcb77c405a72e01323 SHA512 7d72262e2e9f00c4895aef235b054281fb4c93843055d7802029d3f38bce1bcfd3f577ea015004ed805505b3d958b28579bf3932d6fefaf3976c12fe4cdaec81
 EBUILD virtualgl-9999.ebuild 2711 BLAKE2B 6e80ffef02dbb840712e2d8767a3de5acde047a119e3550ad341174d7206ebb811b86a2fade4af739a66363d681106811c6b78a55d8e01160d59ee85a58e6cbd SHA512 53dc4e4e1bd74c0866d165e8e76cc36717081408046ebb798cf31abfcca27d0b93048ebb9a66c513a5914a8f455127d89b667ad210696eb849380f85457bcc10
 MISC metadata.xml 840 BLAKE2B bce303f2b3aac9d5cccd03062f64761f6fadc1194fc78c5850e8ecc3ae00ae0282d21be2f64e2fed294255c3fc3405a48b8cab7270e2c6e20b557b72d1dd82ae SHA512 7b4ffc9dccfe1c5bee2168216854b4020d1854fd85402a4757b8cbd6cf11e90e85ddf352f210d02d55388569b1dafd953377793a35f4130bd45210625c95f3af
diff --git a/x11-misc/virtualgl/virtualgl-2.6.4.ebuild b/x11-misc/virtualgl/virtualgl-2.6.4-r1.ebuild
index ec1b128132e7..0778a983fa19 100644
--- a/x11-misc/virtualgl/virtualgl-2.6.4.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.6.4-r1.ebuild
@@ -14,7 +14,7 @@ else
 	MY_P="${MY_PN}-${PV}"
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration"
@@ -34,6 +34,7 @@ RDEPEND="
 	x11-libs/libXext[${MULTILIB_USEDEP}]
 	x11-libs/libXtst[${MULTILIB_USEDEP}]
 	x11-libs/libXv[${MULTILIB_USEDEP}]
+	x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}]
 	virtual/glu[${MULTILIB_USEDEP}]
 	virtual/opencl[${MULTILIB_USEDEP}]
 	virtual/opengl[${MULTILIB_USEDEP}]
@@ -43,6 +44,7 @@ RDEPEND="
 		>=x11-libs/libXext-1.3.2[abi_x86_32]
 		>=x11-libs/libXtst-1.2.3[abi_x86_32]
 		>=x11-libs/libXv-1.0.10[abi_x86_32]
+		x11-libs/xcb-util-keysyms[abi_x86_32]
 		>=virtual/glu-9.0-r1[abi_x86_32]
 		virtual/opencl[abi_x86_32]
 		>=virtual/opengl-7.0-r1[abi_x86_32]
diff --git a/x11-misc/vnc2swf/Manifest b/x11-misc/vnc2swf/Manifest
index 3f94f5cc5ec1..4b622331b89e 100644
--- a/x11-misc/vnc2swf/Manifest
+++ b/x11-misc/vnc2swf/Manifest
@@ -1,3 +1,4 @@
+AUX vnc2swf-0.5.0-respect-AR.patch 773 BLAKE2B 808a213a1adf20ed42e0488b789e3bc863caa8980717fe742209b621f40209aeb92a29857802e346f3c0d6c1281d854aa21aef1fd65a760b1ea3c06cae091e53 SHA512 f2d32fdcf85af359eae49c622570e6abba7f3214333636512b8c839cc2893997b24231ffaf18abe448ca68eef4efeba95b83d3abf526079dc071e6a6768c74b1
 DIST vnc2swf-0.5.0.tar.gz 438058 BLAKE2B bb0effab90934746451efbe23610b3534de31ca1f5f8331dfc1f907b9733f69e78d960bd8d27cc6d75cb0ef688045b019b9b984dcd0e6207819e0590b35fa183 SHA512 f1551015eaafb7810b5d6367b73605f97bc5c0d4d3449dfe1a98af90f743133c0534c8988ee72ce2fc8599926a5f3ed5a785bf18788522b4a7c3cb8bc0529913
-EBUILD vnc2swf-0.5.0-r1.ebuild 962 BLAKE2B 732900f2cf326d2db87a70fb505c34845eeb85b3dec3b61e5eb3dbbb43c135fcdb1c51a9434a377de9cb534c5a2b9f90e555f56595fbecc336149272da9c0df5 SHA512 4af7e15ef99e79e591a891dee41dd06dd7c7ea5cb6ee87255ac5aa7516f6caef08b2facfc9bc50f0339c0f672fc522640c8b0599ee772412d51987e6c9ab8d5e
+EBUILD vnc2swf-0.5.0-r1.ebuild 1085 BLAKE2B b2be3168b626fd4cc3d8994575b7134c3bc77dd6a9919c4a5082ef7a39dfefc6690aa755907f14f03d26f434a3915fb031fa2748bef4fc321e0dcbafcc07a2c1 SHA512 a30fdf7fb403edb8d31a71bdad69787221d3cbb5b489fc6fdab42f99da1708d05e5e6f4a786071d4b19ff55d65ca96e0b1b348a00b9f6ffb6fced342590021dc
 MISC metadata.xml 595 BLAKE2B e5cb40382a69ca1f5d8df0825ad2fe0b1df483f25f6f460694de69d3ecb52206436e0b283a6d647f58ceab872df857a50b106a2af52abe91b1ae343dea354463 SHA512 6704b8f85e5439e662e490d581adcfe3b822bfd75e78b91a4074e5cf23267b1e180b91d18cf098c5745587c4e31829d4469bbbee3741fc1535eefe6d737f9732
diff --git a/x11-misc/vnc2swf/files/vnc2swf-0.5.0-respect-AR.patch b/x11-misc/vnc2swf/files/vnc2swf-0.5.0-respect-AR.patch
new file mode 100644
index 000000000000..4c03bb7e5c16
--- /dev/null
+++ b/x11-misc/vnc2swf/files/vnc2swf-0.5.0-respect-AR.patch
@@ -0,0 +1,45 @@
+--- a/configure.in
++++ b/configure.in
+@@ -12,6 +12,9 @@
+ AC_PROG_MAKE_SET
+ AC_LANG_CPLUSPLUS
+ 
++AC_ARG_VAR([AR], [the archiver to use])
++AC_CHECK_TOOL([AR], [ar])
++
+ case "`(uname -sr) 2>/dev/null`" in
+ "SunOS 5"*)
+   SOLARIS=yes
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -95,7 +95,7 @@
+ LIBS = @LIBS@
+ LDFLAGS = @LDFLAGS@
+ RANLIB = @RANLIB@
+-AR = ar cq
++AR = @AR@ cq
+ 
+ prefix = /usr/X11R6
+ exec_prefix = $(prefix)
+--- a/rdr/Makefile.in
++++ b/rdr/Makefile.in
+@@ -37,7 +37,7 @@
+ LIBS = @LIBS@
+ LDFLAGS = @LDFLAGS@
+ RANLIB = @RANLIB@
+-AR = ar cq
++AR = @AR@ cq
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cxx .c .o
+--- a/rfb/Makefile.in
++++ b/rfb/Makefile.in
+@@ -36,7 +36,7 @@
+ LIBS = @LIBS@
+ LDFLAGS = @LDFLAGS@
+ RANLIB = @RANLIB@
+-AR = ar cq
++AR = @AR@ cq
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cxx .c .o
diff --git a/x11-misc/vnc2swf/vnc2swf-0.5.0-r1.ebuild b/x11-misc/vnc2swf/vnc2swf-0.5.0-r1.ebuild
index 07b8cc0bbeb5..a589a99435ca 100644
--- a/x11-misc/vnc2swf/vnc2swf-0.5.0-r1.ebuild
+++ b/x11-misc/vnc2swf/vnc2swf-0.5.0-r1.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=7
 
+inherit autotools
+
 DESCRIPTION="A tool for recording Flash SWF movies from VNC sessions"
 HOMEPAGE="https://www.unixuser.org/~euske/vnc2swf/"
 SRC_URI="https://www.unixuser.org/~euske/vnc2swf/${P}.tar.gz"
@@ -23,10 +25,17 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-respect-AR.patch # bug 726264
+)
+
 src_prepare() {
 	default
 	sed -i -e "s:docs:html:" README || die
 	sed -i -e "s:-mouse ::" -e "s:./vnc2swf:vnc2swf:" recordwin.sh || die
+
+	mv configure.{in,ac} || die
+	eautoconf
 }
 
 src_install() {
diff --git a/x11-misc/xdg-utils/Manifest b/x11-misc/xdg-utils/Manifest
index 5e1df61c5060..32dd5f0cdc47 100644
--- a/x11-misc/xdg-utils/Manifest
+++ b/x11-misc/xdg-utils/Manifest
@@ -1,6 +1,7 @@
 AUX xdg-utils-1.1.3-xdg-open-pcmanfm.patch 702 BLAKE2B 1adcb274c1a5fcca4a99178bfe38d70e5b1d1f792c20ea4de166096137d0c393a38b4958e1044aa2a6afd4437b9e4eb40d1223ea6b7dd905e93e0499a88478a3 SHA512 fd30975e48a3a7607a812bcc87d5a9595875695693609d477acbe9826a52c53b14c66a4118888eb6d8fcb63630c5f614250f4c8640d1ea99710b26714920c019
 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 2155 BLAKE2B 485e8e4dbfe2b9d06824fb96c9671f11cebd2036c270643bcbb72f43d76ce59a99c968fa720aec3198e882369f6f5f1861b79ec8c0afd3c1d05c57fcc2f8805a SHA512 c90d646add091124fa01b50666c3ebbc770319ce4644ecf7f5f5a694f3cf38581f5c72299be59ee74bf339e635fe8f43956cac5705393dd65ed6cf37dd913c0a
-EBUILD xdg-utils-1.1.3_p20200220.ebuild 1993 BLAKE2B 8b242fc7aabb7c991aee9e973c8a00e7485b386420ce3a696f2abd60ac5baac06d4d8e5dd309361571c4406f0b2af86158c902f06d740eb3c6bc4a34d093f6ff SHA512 0c122936928bdfce67cdf09e21a140525367f4523cd33c0e4c82b58383164547d8a81f596c7e8e789c766b8102e3fec03045e57d564553a41e5d6c803fbdc482
+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.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-r1.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.3-r1.ebuild
index 49d9abfce9e4..5b30aeb094d3 100644
--- a/x11-misc/xdg-utils/xdg-utils-1.1.3-r1.ebuild
+++ b/x11-misc/xdg-utils/xdg-utils-1.1.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://portland.freedesktop.org/download/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND="
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
new file mode 100644
index 000000000000..5b1faa46cb5b
--- /dev/null
+++ b/x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+EGIT_COMMIT="9816ebb3e6fd9f23e993b8b7fcbd56f92d9c9197"
+DESCRIPTION="Portland utils for cross-platform/cross-toolkit/cross-desktop interoperability"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/xdg-utils/"
+SRC_URI="
+	https://gitlab.freedesktop.org/xdg/xdg-utils/-/archive/${EGIT_COMMIT}/${P}.tar.bz2"
+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"
+IUSE="dbus doc gnome"
+REQUIRED_USE="gnome? ( dbus )"
+
+RDEPEND="
+	dev-util/desktop-file-utils
+	dev-perl/File-MimeInfo
+	dbus? (
+		sys-apps/dbus
+		gnome? (
+			dev-perl/Net-DBus
+			dev-perl/X11-Protocol
+		)
+	)
+	x11-misc/shared-mime-info
+	x11-apps/xprop
+	x11-apps/xset
+"
+BDEPEND=">=app-text/xmlto-0.0.26-r1[text(+)]"
+
+DOCS=( ChangeLog README RELEASE_NOTES TODO )
+
+# Tests run random system programs, including interactive programs
+# that block forever
+RESTRICT="test"
+
+src_prepare() {
+	default
+	# If you choose to do git snapshot instead of patchset, you need to remember
+	# to run `autoconf` in ./ and `make scripts-clean` in ./scripts/ to refresh
+	# all the files
+	eautoreconf
+}
+
+src_configure() {
+	export ac_cv_path_XMLTO="$(type -P xmlto) --skip-validation" #502166
+	default
+	emake -C scripts scripts-clean
+}
+
+src_install() {
+	default
+
+	newdoc scripts/xsl/README README.xsl
+	use doc && dodoc -r scripts/html
+
+	# Install default XDG_DATA_DIRS, bug #264647
+	echo XDG_DATA_DIRS=\"${EPREFIX}/usr/local/share\" > 30xdg-data-local
+	echo 'COLON_SEPARATED="XDG_DATA_DIRS XDG_CONFIG_DIRS"' >> 30xdg-data-local
+	doenvd 30xdg-data-local
+
+	echo XDG_DATA_DIRS=\"${EPREFIX}/usr/share\" > 90xdg-data-base
+	echo XDG_CONFIG_DIRS=\"${EPREFIX}/etc/xdg\" >> 90xdg-data-base
+	doenvd 90xdg-data-base
+}
+
+pkg_postinst() {
+	[[ -x $(type -P gtk-update-icon-cache) ]] \
+		|| elog "Install dev-util/gtk-update-icon-cache for the gtk-update-icon-cache command."
+}
diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220.ebuild
index 2df4bb6913bb..8b4ad2909ad1 100644
--- a/x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220.ebuild
+++ b/x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220.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 ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND="
diff --git a/x11-misc/xflux-gui/Manifest b/x11-misc/xflux-gui/Manifest
index 6de97af3415c..6a793c1d0e0f 100644
--- a/x11-misc/xflux-gui/Manifest
+++ b/x11-misc/xflux-gui/Manifest
@@ -1,4 +1,4 @@
 AUX xflux-gui-1.2.0-disable-gschemas-compiled.patch 1540 BLAKE2B c1071aecced986b9bf8662de558ce8cd3c822ebfcc7d3d6601eba9ec30438bfcbc763e26eb31113b00b75e07f463125872ed8897c490ddd32cf96b0798e72557 SHA512 bd03efe531f0b55df89bbf2b6e6dbdbf7c48c214b9969d3c458d093a13603011b956efc0cc6695401abc7abfea18ed29be6501784a66edcf63f8ebd6793b3c15
 DIST xflux-gui-1.2.0.tar.gz 31831 BLAKE2B ad6b29f75cf5c287efdb4c1eaa12610a6fd2d4515e7f77cb991f0140d9de1128981ae274a1503f7c5bb83ff84f8dc124ba64e5abdd2e97c1d7157c84df51bead SHA512 244c11efbf58112d3d84209142faafbbe46b33df1edf13e122945ff767fc6a394c147979c0086bd88cb41ee7c80b5bd87016b3e158f3a959f3aca8bda47707d2
-EBUILD xflux-gui-1.2.0-r1.ebuild 1042 BLAKE2B c18449765fc796f296fe3c874c96d5a603ec3f34a872713a4945a063db74954ab81b5957a269635fdfe95ba4fe902430e7b9a1a5e75e241a72ffb0777d093b5f SHA512 d40f59ffcd8f9761034f0169ee282d14e3d999238281afd1b64074f4cdd1cba00c98394ef3cbcbdc148ccebe6a2199b3dc04f10f5509ca7c2399e57f94838dac
+EBUILD xflux-gui-1.2.0-r1.ebuild 1055 BLAKE2B e753363511a0295eddcec708f032071773f6bde25a64c8afa44cb1bd9389f24522cefdbf0faa7e47d0ddced731dd54a2cd2f36c651cf09b914e31ecbbb60e4e5 SHA512 e320e6303143952772ad3fcf6aa1fe8d9a304d80db2e0ab399a1f8b6996c96a0cab734b7bbf16a0d7478d2e0e08e6bc1156e07be51e138960f9a030d09c09682
 MISC metadata.xml 737 BLAKE2B d576868e8ee0b92e6439103d674d5a87e72d3794d202d1d8d1d200e5d479abdee76d31211520c5c04a53ed6a4567c0c6396cd2d08da0a82b3fe85c7b2c0f32d6 SHA512 60dacd24dfe19906d233434a547e0ef87d33ef5cfc9b3175df28ac65b9744fdf653bf449c4fdcc754950bdf5e859985735e889cd7755d7fae0458d067a5aba13
diff --git a/x11-misc/xflux-gui/xflux-gui-1.2.0-r1.ebuild b/x11-misc/xflux-gui/xflux-gui-1.2.0-r1.ebuild
index 0efff0431536..fbb4bdea381a 100644
--- a/x11-misc/xflux-gui/xflux-gui-1.2.0-r1.ebuild
+++ b/x11-misc/xflux-gui/xflux-gui-1.2.0-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1 gnome2-utils xdg-utils
 
 DESCRIPTION="A GUI for f.lux"
-HOMEPAGE="https://justgetflux.com/"
+HOMEPAGE="https://github.com/xflux-gui/fluxgui/"
 SRC_URI="https://github.com/${PN}/fluxgui/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/x11-misc/xfractint/Manifest b/x11-misc/xfractint/Manifest
index 623ad28ecd06..2fa64f796619 100644
--- a/x11-misc/xfractint/Manifest
+++ b/x11-misc/xfractint/Manifest
@@ -1,5 +1,8 @@
 AUX xfractint-20.04p09-ldflags.patch 1067 BLAKE2B 4faddadfa0105ffedef7552264971bf685121a74ccd449b12f33d525af61c9fa0557fc3e693848883d88a5b868c96f8e3bd2e14764182ecb2655b6ba64a12294 SHA512 af78e1facb6e436fed67e56871172fef742df1eafa75c55a75752dda855f81f7aff35cfaf042cf1f7502f66d4a9c7bf831b781c8641299873cc2537fe5da0ace
+AUX xfractint-20.04p16-install-phase.patch 729 BLAKE2B 937aa26a6b0e4e4f9c5ef52677f47ed5fb0f7906f116da378b82020bc765c01cd488b1625d61f33324c4984ba2cb1c669b1fca95fc834a948bf22fe87977a0c4 SHA512 fab66eafe5b97b767e6e67f09bde79f3b984e0d40fcb4fff1e5002da5a47e052916b3ec6786921fa393e150ef47e78e286fc0dda58e4affdb2cc5989a58ef7e3
 AUX xfractint.envd 63 BLAKE2B 1622655f8b51034a4f3e7c9d7b11fd7628a33b30a17df15b6af8d5aaccb824f14ab4659fbd356cb188d8c0f1f0d2c1537a8bbcf1fa560eba9c5a2ced7bd7d7f1 SHA512 1e923957e93a53af47a8bc3205c350b9fe4bbfa9f955c5eb5673c1ce857808bdf0ad020c643c7f81dda1c0b5caf2480005c2f31eabdaa39908ef68649687b5a2
 DIST xfractint-20.04p14.tar.gz 1336285 BLAKE2B 946c34551acf131845f1ecf17d4fe82214535627e8ea68d704efcff4b93c525d82f004bde8ae1bac11df8c82caa3bcff4778b2f8dfed1bdb494ba036e62256c5 SHA512 7d13c719f4f4b0680455b9b7f86644928d8145606973d208e5bf0d26b4f7b04ddbf8d2080ea35c872b21e079f1a116f3ef94e9acb36a45d43c16403c473e2acd
+DIST xfractint-20.04p16.tar.gz 1356976 BLAKE2B 2cb05021c76d9761bf7020a2b9a0fbf7d682a620d931b7841ce75780c1a3aabb6bbbd1b2e378fba3e96b2cfdaf845ff9cdafcf3219ee756fe7d128a19b342132 SHA512 6696daf21c2927d87f58f7d7136c5d51bd8c60d78e901d537f1ef38f27b70c42a590b05c663363c49a8cb30d7013a969813e7bbe4a97f49b9c286497b440bdf1
 EBUILD xfractint-20.04_p14.ebuild 1046 BLAKE2B 41ae48fe45aeef7169d01d2ae52f5484655ec45ba8f7a284466b6cbacb96bff08322fe4c4f0669dbb888221866d6947f81b50c56a6f98175b3970db0e5930db3 SHA512 bbb5ecc9db4ef63e664aa99a7d6ab242ad74c3f0ae57d3e52efd7bf7232fbe9bef8b6aff43393cb3e5ff25e711950effc86c817da9d6b69e513a908d1cc343cb
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD xfractint-20.04_p16.ebuild 674 BLAKE2B 5bc294cf5552f866946a09c04b0ed7a79a904d74f10d75ebd05037ff571e2a77891d0de40dc93c3b8058c890dee15574d77cf12fae99b6665e000f23477882e8 SHA512 da8ee28b77377eed848c4b23b37d547b1b499905cd1fa46547d472fb3a40c6d8e84eedb406bea1c427645559495fe58f7cc6d595ca4b8656408739fb0100a378
+MISC metadata.xml 366 BLAKE2B 5cfc7ce6a7f5e6d02ad5f78d0e9d177c346b498b679f5623cf7d2321021a3d0289fe30c1b2360cec5903409627898de04fec3d2a7c26ea875f8e891685158549 SHA512 d602f03153bd9f03c962a47d7b10c829e2bdbde64cb5e67bfb4fb7c8755eb87784139ae1e1b287d6dd5c99d2f7a96f7c04f67fede847095116385db7cced5f2e
diff --git a/x11-misc/xfractint/files/xfractint-20.04p16-install-phase.patch b/x11-misc/xfractint/files/xfractint-20.04p16-install-phase.patch
new file mode 100644
index 000000000000..0387b63b7e43
--- /dev/null
+++ b/x11-misc/xfractint/files/xfractint-20.04p16-install-phase.patch
@@ -0,0 +1,24 @@
+Prevents recompiling in install phase and sets default
+CC if not set
+Fix by David Denoncin
+
+--- a/Makefile	2020-08-01 23:19:09.000000000 -0000
++++ b/Makefile	2020-08-02 14:33:52.943061996 -0000
+@@ -150,7 +150,7 @@
+ # For Sun Solaris 2.x w/GNU gcc, use CC = gcc
+ #CC = gcc
+ #CC = /usr/bin/gcc
+-CC ?=
++CC ?= /usr/bin/gcc
+ 
+ # For HPUX, use LIBS = -L/usr/lib/X11R4 -lX11 -lm -lcurses -ltermcap
+ # For AIX or OSF/1, add -lbsd
+@@ -345,7 +345,7 @@
+ 	cd $(COMDIR) ; ${MAKE} clean
+ 	cd $(UDIR) ; ${MAKE} clean "AS=${AS}"
+ 
+-install: xfractint fractint.hlp
++install:
+ #	$(STRIP) xfractint
+ 	$(INSTALL) -d $(BINDIR) $(MANDIR) $(SRCDIR)/$(PDIR) $(SRCDIR)/$(FDIR) \
+ 		$(SRCDIR)/$(IDIR) $(SRCDIR)/$(LDIR) $(SRCDIR)/$(MDIR) $(SRCDIR)/$(XDIR)
diff --git a/x11-misc/xfractint/metadata.xml b/x11-misc/xfractint/metadata.xml
index 6f49eba8f496..bfbd225ab16b 100644
--- a/x11-misc/xfractint/metadata.xml
+++ b/x11-misc/xfractint/metadata.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>ddenoncin@gmail.com</email>
+		<name>David Denoncin</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/xfractint/xfractint-20.04_p16.ebuild b/x11-misc/xfractint/xfractint-20.04_p16.ebuild
new file mode 100644
index 000000000000..0e98bb543fd8
--- /dev/null
+++ b/x11-misc/xfractint/xfractint-20.04_p16.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_P=${P/_}
+
+DESCRIPTION="A fractal generator"
+HOMEPAGE="https://www.fractint.org"
+SRC_URI="https://www.fractint.org/ftp/current/linux/${MY_P}.tar.gz"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="free-noncomm HPND public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXft
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-20.04p16-install-phase.patch"
+)
+
+src_compile() {
+	emake CC="$(tc-getCC)" AS="$(tc-getAS)" OPT="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${ED}/usr" install
+}
diff --git a/x11-misc/xkbd/Manifest b/x11-misc/xkbd/Manifest
index 5780e5a82dd9..3780fa105479 100644
--- a/x11-misc/xkbd/Manifest
+++ b/x11-misc/xkbd/Manifest
@@ -2,6 +2,11 @@ AUX xkbd-0.8.15-fix-keysyms-search.patch 438 BLAKE2B 881880be1b72af0cd5ae7703a9c
 AUX xkbd-0.8.15-increase-delay.patch 770 BLAKE2B 1c96d074ba584cb74718a3ed80751b34b287d4e612e30cfd322c8d44d377fcb1a1b3e64f50c12240948b72d99c632fc342d02db3cf8072adb6435b6eea80e18b SHA512 49487d975134d2319d194b5d5110bd6d93b45f712129d1f6f05d00e6611403a9acd5a6a1183e371d56619a9d7456a00cfefded4aa21a63bdf3e1493a59085fcd
 AUX xkbd-0.8.16-desktop.patch 1172 BLAKE2B 994a60ce696aa09a8a8d5f61e39366ef0dd12970ab1ef8b5bf48a18a731a90713ea20335d7a4715d390e1ae865a99a4f02f4dca87a46d6794db6f49069327edc SHA512 26d4281cfc15a8aaadb0bd9ffc70df7c63b31abc54fd45ec0055abe37d7f960ac4d05056dabaca14bb33f19d34c5e293b4b0b45fe96b7d0078b73897d9ac388e
 AUX xkbd-0.8.16-fix-geometry.patch 1081 BLAKE2B bc0906cc6aa06256cd6c22a288cac1d51ca658871b8d2c014b3efa3fe4f3b2c99be38ee0503a37663a6fdf7d17b71d39e82490c6b84e6e3251990c265e02a9b7 SHA512 03c2fcc4a2d731ea3dc3bb9c596e9d867b01e09713c65f5614f37eb86c2e41edacd16ee67b67a01fb7fab9e2e9e936cfa9ab5bee214f3427710a88829a538899
+AUX xkbd-999999-evdev.patch 448 BLAKE2B 43c17e904bbf7e916355dbe97da70e20b1cd10771dd748d9082de4b61ea7deff6ddff8dcd9a9eac0904adf663f8212d0dd7cadf8ee0c01e6941ebb4460621aa8 SHA512 4e4812aa42325a4492d699452700595307c73b5e15fe9116aa6c6aab12fca943580cbc941ab2335750ed89871d1c7ee8fc578a1e1ab0c21f3479ae0426b4cd3f
+AUX xkbd-999999-xft.patch 797 BLAKE2B ce1eaa3b1d16baab6269927efe79ee19e611067465793e1ba2313cef28ca7fa55f2541c0714fb58f5157f7f5b9550daad6a3724bd2cae3fa3c2868c8b596507f SHA512 886d83b5653cbd1b49745a997fd9079a5bf6fd0f31b0c009e65ab26c0b43448b41fe58833d482bf099ecaf2529e71b488c37c3896bea47ec243786421fe79cb6
 DIST xkbd-0.8.16.tar.gz 347616 BLAKE2B a7ee906d6ae3328d5366b88ebe960b6fdf84a5cad1c1db4b1a0056fc5842196699dfa749c3c0398054bc54073b422798c0efaf57c8116d05b6754c84d6abae03 SHA512 8410f722cb93069eea26f9d1ed6b9fea76ed5222b8586c2f78ccc1a0f040a964e165df0611ce72c108dbc7adeec31515595c81be3867e68c0cadd8846d985d4a
+DIST xkbd-0.8.18.tar.gz 50421 BLAKE2B 7652f33cdf00584cc55fcb9dbced9d92c57cf6383b6164d8c026bf88c962e7469b094de7454b451745feb396fbe5ad561193c9d4de8e7b9f65c27a55e7cf478c SHA512 335e18e76e6bf8b7142eb785c9003e8a3d80719e6737149be8e1178bd7281fada6808ea0b18538caf3c3fa1d62778a3d6a45a1fa8b3b0845dca19f3e62942831
 EBUILD xkbd-0.8.16-r1.ebuild 811 BLAKE2B bd7732d840d253dea3899b3f3d33232c4cf74a2dfd87d25bbf4c00f7850239219903536697a2dc42ad4f9e050e7ade739de3af26b3d81dd9f111b2ee4e479498 SHA512 1f24a011cf05e651ca3e550e8fc693a8ab6e1bd2bc67740c9070bc20092dc3c11ac2acfeee7b1735583010b970fd1af30a61ad299790851ab7997e27387a85df
-MISC metadata.xml 272 BLAKE2B 4dbd2b5ae92564a97b2a06ab0ec6562e8dce2dd636aaf0788ee09f8688ca5d5b6483084a65366dfbe6d144d30170e5558bc5759adecb96abb405ea96a5147285 SHA512 ebe67da08587903b5b82fc194aa3c8f1ab65371f60d2c134928362e089550d9e9fd9531bffe8b676a345b5bf0ab209ce7f50d37d98201a88176f002e17582493
+EBUILD xkbd-0.8.18.ebuild 755 BLAKE2B 1a7a5ee2c928381eab31c9a30bdd16684deca8b0c2061ed8a54ef1be86d02b106e0456c3970321ba0dea873cc7f1bd27f2d51b9dcc473e53caf0919e334ab270 SHA512 de6c0e4d9f3db6e65e0f04c08c298333a22612c0b24792b226ccdf43d81b5f23c7c631dbed05dc0f15788debc3d68f893996acc113d234726f169ffd88cd91ae
+EBUILD xkbd-999999.ebuild 1051 BLAKE2B 4fbba7618b97abf123f7cad735d4254e040ec55a6e830831105ec68d338c2273b2b5a2a4b6052e8099286125ea9bd2ee643fa518c0f88dc120f9d85240a7616a SHA512 38457f50b99e9da9b7425670f098aaaf8314711395fed68355fc28d88e712eea42bb2405547de72964db165a4a6f4bdb6e44efcb45d57796fccd2dc1576ce442
+MISC metadata.xml 528 BLAKE2B 7ed86e072723be552f3d67dd120908f1c08a804a96d2fca8d88af30bc714a5cb65e3d3677076c0b020a780b9b868a92f03d6a1b6bc4edab10f0820e9714c7099 SHA512 cb6cb76112b88837fb99dbc1d6c789edf4760ba64ba24dce5badf1d4bad4995dee19d9f2ff87fdddc608098b013ab31e20fd9cc145c633e9b4a603ea11d76758
diff --git a/x11-misc/xkbd/files/xkbd-999999-evdev.patch b/x11-misc/xkbd/files/xkbd-999999-evdev.patch
new file mode 100644
index 000000000000..087fd74ea01a
--- /dev/null
+++ b/x11-misc/xkbd/files/xkbd-999999-evdev.patch
@@ -0,0 +1,15 @@
+--- a/src/xtg.c
++++ b/src/xtg.c
+@@ -382,10 +382,12 @@
+ static void map_to(){
+ 	float x=scrX1,y=scrY1,w=width,h=height,dx=pf[p_touch_add],dy=pf[p_touch_add];
+ 	_short m = 1;
++#ifdef USE_EVDEV
+ 	if (pa[p_touch_add] && pa[p_touch_add][0] == '+' && pa[p_touch_add][1] == 0) {
+ 		if (mwidth && devX!=0) dx = (devX - mwidth)/2;
+ 		if (mheight && devY!=0) dy = (devY - mheight)/2;
+ 	}
++#endif
+ 	if (dx!=0 && mwidth) {
+ 		float b = (w/mwidth)*dx;
+ 		x-=b;
diff --git a/x11-misc/xkbd/files/xkbd-999999-xft.patch b/x11-misc/xkbd/files/xkbd-999999-xft.patch
new file mode 100644
index 000000000000..8f803111bc02
--- /dev/null
+++ b/x11-misc/xkbd/files/xkbd-999999-xft.patch
@@ -0,0 +1,33 @@
+--- a/src/kb.c
++++ b/src/kb.c
+@@ -66,7 +66,7 @@
+   if (*f) XftFontClose(kb->display, *f);
+   return ((*f = XftFontOpenName(kb->display, kb->screen, fontname)) != NULL);
+ #else
+-  if (*f) XUnloadFont((*f)->fid);
++  if (*f) XUnloadFont(kb->display, (*f)->fid);
+   if ((*f = XLoadQueryFont(kb->display, fontname)) == NULL) return 0;
+   XSetFont(kb->display, kb->gc, (*f)->fid);
+   return True;
+--- a/src/button.c
++++ b/src/button.c
+@@ -150,7 +150,7 @@
+ 	&extents);
+   return extents.width;
+ #else
+-  return XTextWidth(kb->font_info, txt, strlen(txt));
++  return XTextWidth(kb->font, txt, strlen(txt));
+ #endif
+ }
+ 
+@@ -441,8 +441,10 @@
+ 
+   b->fg_gc      = k->gc;
+   b->bg_gc      = k->rev_gc;
++#ifdef USE_XFT
+   b->col = k->color;
+   b->col_rev = k->color_rev;
++#endif
+ 
+   b->layout_switch = -1;
+ 
diff --git a/x11-misc/xkbd/metadata.xml b/x11-misc/xkbd/metadata.xml
index 49c86a887b6a..b43c941bd068 100644
--- a/x11-misc/xkbd/metadata.xml
+++ b/x11-misc/xkbd/metadata.xml
@@ -2,7 +2,12 @@
 <!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>desktop-misc@gentoo.org</email>
+<name>Gentoo Desktop Miscellaneous Project</name>
 </maintainer>
+<use>
+<flag name='evdev'>Enable <pkg>dev-libs/libevdev</pkg> support for xtg</flag>
+<flag name='xi'>Enable XInput2 support through <pkg>x11-libs/libXi</pkg></flag>
+<flag name='xrandr'>Enable XRandR support through <pkg>x11-libs/libXrandr</pkg></flag>
+</use>
 </pkgmetadata>
diff --git a/x11-misc/xkbd/xkbd-0.8.18.ebuild b/x11-misc/xkbd/xkbd-0.8.18.ebuild
new file mode 100644
index 000000000000..d7baae0ef8c1
--- /dev/null
+++ b/x11-misc/xkbd/xkbd-0.8.18.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic
+
+DESCRIPTION="onscreen soft keyboard for X11"
+HOMEPAGE="https://github.com/mahatma-kaganovich/xkbd"
+SRC_URI="https://github.com/mahatma-kaganovich/${PN}/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="debug +xft +xpm"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXtst
+	xft? ( x11-libs/libXft )
+	xpm? ( x11-libs/libXpm )
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+DOCS=( AUTHORS )
+S=${WORKDIR}/${PN}-${P}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	use debug && append-cppflags -DDEBUG
+	econf \
+		$(use_enable xft) \
+		$(use_enable xpm) \
+		--disable-debug
+}
diff --git a/x11-misc/xkbd/xkbd-999999.ebuild b/x11-misc/xkbd/xkbd-999999.ebuild
new file mode 100644
index 000000000000..8d6139bf4019
--- /dev/null
+++ b/x11-misc/xkbd/xkbd-999999.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic git-r3
+
+DESCRIPTION="onscreen soft keyboard for X11"
+HOMEPAGE="https://github.com/mahatma-kaganovich/xkbd"
+EGIT_REPO_URI="https://github.com/mahatma-kaganovich/xkbd"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="debug +evdev +xft +xi +xpm +xrandr +xscreensaver"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXtst
+	evdev? ( dev-libs/libevdev )
+	xft? ( x11-libs/libXft )
+	xpm? ( x11-libs/libXpm )
+	xrandr? ( x11-libs/libXrandr )
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+DOCS=( AUTHORS )
+PATCHES=(
+	"${FILESDIR}"/${PN}-999999-evdev.patch
+	"${FILESDIR}"/${PN}-999999-xft.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	use debug && append-cppflags -DDEBUG
+	econf \
+		$(use_enable evdev) \
+		$(use_enable xft) \
+		$(use_enable xi) \
+		$(use_enable xpm) \
+		$(use_enable xrandr) \
+		$(use_enable xscreensaver ss) \
+		--disable-debug
+}
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 596493a2da9a..ef2e59af73a9 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,7 +1,4 @@
-AUX xkeyboard-config-2.29-fix-python3-support.patch 1042 BLAKE2B 0ca08ee5c3b82b4af1c9fe9b49fe5ad04a9978a7215f4381c4be96506067068fdf4204dbbd23976a4dd049779701ec3c52a09a961d9e1fecd153007e9ff00ecc SHA512 5619cbfa849792138b0e2785d8d94560707937bf15e026ed85a1ce255212d13bce61de5eeb3b8a6d4a431f41de58d03421911ef7abaf095163a38ca0c5304b3a
-DIST xkeyboard-config-2.29.tar.bz2 1707176 BLAKE2B 436f2e8f4c7bea5a96e551daf01cdf6f7eeb2468dbacd28b977be003e159d0af9f233f17749fb5379444ce84c8d5c78f1c949e4bddfa3db6d39338ae01f0aefe SHA512 202255af097f3063d76341d1b4a7672662dc645f9bcd7afa87bc966a41db4c20fc6b8f4fbe2fcaec99b6bc458eac10129141a866a165857c46282f6705b78670
 DIST xkeyboard-config-2.30.tar.bz2 1689137 BLAKE2B 54ba0a3a82d65f4cf15c45aa500bd8a44865c9ce845d5bc1ae85d3544a384622c580baa119b8882defa9868d8210697153f868a273a38852d938bf318ed09c3b SHA512 2d775dcaab49d80f62b8eaadc9be406b42c9a3643d3a360f864a462c61865abce67d0a8a80772d54f8136603114c61b5168fd06771f9c132411911914abb1ea4
-EBUILD xkeyboard-config-2.29.ebuild 1395 BLAKE2B 5b12916ab898994fd013590bfe57ea2925310d251f8609f1995b9a64cf5ec4fc5f9beae49dbd2de9ee0ffed017d466c2f995487d32669e86fc149e4789c0bafb SHA512 c20621c807ffd9150558c0c2df7af2fde339045b695cca5f97f51da29ccb136a538b4125492f11617526c363d98fe496057edb5c8ff405130a5d7763d0876325
-EBUILD xkeyboard-config-2.30.ebuild 1344 BLAKE2B 3c02114e37b8db6084419232eac2b01e9b9d3b7417403a77e78a340bf5c0457ae307217d6ee79e50ab0130b79c7e173824a68b4b946d25ae6cbf8e763b9bf84f SHA512 3133d952555a82d6aa55a8e8a5d39a6357d8b8e9f13f5ed5f1be0dde0ccbef4bb381fe1effab2ff259500b1810aa697892c2795084fae4b319213158fe4a4260
+EBUILD xkeyboard-config-2.30.ebuild 1336 BLAKE2B 37c5040ff351aba7f8aeeb4c3a59fd02263d4ddc9fe0bae39e62361dfe5b1e222a3cbf428086aea90c8367fef6163087d884b1bfb64c13e4bf5403967da5d298 SHA512 415f4f5347c8b825208375a5c5839599e352970a5532fee8ef18d736f17ad8c135907ac1cf5afb3a2ba2fbe0db63de050add2e5d3a761b4b5c58bbafb554a208
 EBUILD xkeyboard-config-9999.ebuild 1023 BLAKE2B bd4b25cfb97dbd822f4b2e06200833139dacf0c1e689e4ea50c7cd779a8b86d3e79bde1581bab7ea3fa55b205b7291ba255b1f6d2992ddfa2755327a4f33d5f8 SHA512 87e81c2aa3ab90331386369e160be599051e831c6ea59ecb0345e829b376acc4f820aad418020852431357bd470feea2999fbdedaa8f0dee372a792fb23572a8
 MISC metadata.xml 337 BLAKE2B ab0893146e71b0d96879e7ec41c7c4e057cb92570227daef015b6fa1a24c55709cd3d19e16df5afe80f706995e12a44a9fc29826a552bd436b1e9381e44acde5 SHA512 6a43f86407638d3f156d4ae64caee882878dbd1ee7c23991c8f378d55cfb0afe016202866f95c328d8b4e59186efa6a7cb7335a1c86e3fbdda4c16a96e175cf0
diff --git a/x11-misc/xkeyboard-config/files/xkeyboard-config-2.29-fix-python3-support.patch b/x11-misc/xkeyboard-config/files/xkeyboard-config-2.29-fix-python3-support.patch
deleted file mode 100644
index 0f4d455f6ea3..000000000000
--- a/x11-misc/xkeyboard-config/files/xkeyboard-config-2.29-fix-python3-support.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From c847c834cce190c5c835a454bfe548195da9fa53 Mon Sep 17 00:00:00 2001
-From: MilhouseVH <milhouseVH.github@nmacleod.com>
-Date: Sun, 16 Feb 2020 09:41:43 +0000
-Subject: [PATCH] fix python3 support
-
-https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/issues/197
----
- rules/compat/map-variants.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/rules/compat/map-variants.py b/rules/compat/map-variants.py
-index ebbfec9..979ba43 100755
---- a/rules/compat/map-variants.py
-+++ b/rules/compat/map-variants.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/env python3
- 
- import argparse
- import re
-@@ -12,8 +12,8 @@ class Layout(object):
-             assert variant is None
-             # parse a layout(variant) string
-             match = re.match(r'([^(]+)\(([^)]+)\)', layout)
--            self.layout = match[1]
--            self.variant = match[2]
-+            self.layout = match.groups()[0]
-+            self.variant = match.groups()[1]
- 
-     def __str__(self):
-         if self.variant:
--- 
-2.24.1
-
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.29.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.29.ebuild
deleted file mode 100644
index 37f50f131e36..000000000000
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.29.ebuild
+++ /dev/null
@@ -1,62 +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} )
-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}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-python3-support.patch
-)
-
-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-2.30.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.30.ebuild
index 66e3276b4ab7..8d68c4fd0cca 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.30.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.30.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
 	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"
+	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"
diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index 9908b3c163b2..79e77ff08f86 100644
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -6,8 +6,10 @@ DIST xlockmore-5.50.tar.xz 1632968 BLAKE2B 2e692d16d70e3186ec1f31c192414b286f881
 DIST xlockmore-5.62.tar.xz 1943836 BLAKE2B 6ce9b9ad709881a50eba0e32ae1e7524414a5e92e34daeff1ce68b6bb4738117155543d15219723ab514d520064601824a22d438541a699c742ab0c620285c64 SHA512 fc7c63a8ce781ba1a9598b5e3d585cc85051da864dbd59e3232b2fa6b6529743f9244e52bdf588ae438c02a2e1e745eb81b372234189e73ae6698cc962c387c2
 DIST xlockmore-5.63.tar.xz 1944624 BLAKE2B 8ee27c5cc88a7088705b7a017563698fa4bf99418bf3237594a1237547fa1eb9d5274327672f33344e97d2333eca71f95e51f760f0548abef06f8006a97c55c0 SHA512 0b067ced9afe0c5498f0b1e19bf163b0363bbb4bc2bc2007c1c0416328cdc2d528d664b122ef68322c38f2bcc37a15665b31ee6e8ce2369bad9e50528b93a047
 DIST xlockmore-5.64.tar.xz 1944496 BLAKE2B 1b2c0337950bcf7ba094012c70c6c8578523b81a6af6dd68a0373425f87d7da28a770a8f7453019cc1527501a417390f013f43b3da2ddfc7d44380c512f9b4c9 SHA512 4946e8e9f895c0433c09e1cd639389d26020a764d62b08b329ce5d9e5de4bb6438f024639b2068c94f21cb0ebb5a6f94dffff6f606c6c3e2372a5102768e7f39
+DIST xlockmore-5.65.tar.xz 1945636 BLAKE2B d026975551e8ceafdcc7b8d8b6e404634f329d8d1f65e153b51798981103a023479dd58f2485c774aaf58f5928ea28a9f409c733ccfc75f98b65302e7e478ac5 SHA512 ecbf7e5c087843265eb4a537b3fe06a0d86d5f67d88c45137b6a7f4f5b30522d44fb87b5628cd9e042f90af129863fd3a4c2b5e2305df2dc3dfd867a03469ad8
 EBUILD xlockmore-5.50.ebuild 2231 BLAKE2B 3accf80283ec7705cfafe4531bc38c1694d9d27381c9aa375bb14a1d59e865dd1c2aa8c99d1cdd26a93fe929b3302ca4646fe93f740feb56c86b70ca9362ed6c SHA512 f0116108dcbae364e4a7c391054890fca090fc182b8bd11c613e84bc91ccb07904e5bd14c515b934e2895c9e6bd2f82762d09719de4e648f6077338e3f05ff97
 EBUILD xlockmore-5.62.ebuild 2290 BLAKE2B 684053c5ea68511e810fdddff942f61ad18ffcdffa32a1b6eb68ed4269def2d03b82a70b75c3e37500615c5816077a49944b93858a53b9e07b8eba27c68bcba0 SHA512 e7818da25a25f015a06aec1f8096a3394981bc4c68a73f7a6a178fff6e278a91f088b02423eaf937aea0d9e33b5115973f23e714e78b12ae5458977012efb22f
 EBUILD xlockmore-5.63.ebuild 2284 BLAKE2B 5dfca5003f797a6765b33f14a91664b40559441812611677f392b2291a7e29297c254fb29ec3ea895df6e903f98e5926215b74d2ea0b342527da35eb045cc2f0 SHA512 0ec91c240df64f0a3e6c3c0aa7fbf35bdb889cb4d4cc76825223802cf3dd807067f228980838e1d813214f20ba8269d1cc9df96548dc14d2dca4b2d8ee102671
 EBUILD xlockmore-5.64.ebuild 2337 BLAKE2B 73ba42d7fc570be8efda9ce39f50174fdfb2ff653f64b4ac5ede455d737c7d248d5a128cee3433eb00bd8973a3dc525a212bd5bac6f92474034b0ec7c2a2cb46 SHA512 e1996a03cc088f2e07fd077fb4c5209607d3ea288935ed6469356af6edff47739a99fac2dec4d8d98583591167ff81f9d7da1bf60418ff47c6046c667af76f07
+EBUILD xlockmore-5.65.ebuild 2337 BLAKE2B 73ba42d7fc570be8efda9ce39f50174fdfb2ff653f64b4ac5ede455d737c7d248d5a128cee3433eb00bd8973a3dc525a212bd5bac6f92474034b0ec7c2a2cb46 SHA512 e1996a03cc088f2e07fd077fb4c5209607d3ea288935ed6469356af6edff47739a99fac2dec4d8d98583591167ff81f9d7da1bf60418ff47c6046c667af76f07
 MISC metadata.xml 446 BLAKE2B d638ac6f12a203ae9ada10ae4c33e3a3d9901e350b6e6925c50078d66b29343cae42a67f84d5334182c1e816bddb05d062eb7b7e47c9125b273db118c4de573b SHA512 c8fafb010e63c39beeee5b53ad37354d19e98ac4cf33f29606b0af379811a0738c9c70d1fb7c31a5673d4a6365fb658a6a8bf49135b748bea9069a690ce543ed
diff --git a/x11-misc/xlockmore/xlockmore-5.65.ebuild b/x11-misc/xlockmore/xlockmore-5.65.ebuild
new file mode 100644
index 000000000000..26cf0a2b0721
--- /dev/null
+++ b/x11-misc/xlockmore/xlockmore-5.65.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic pam
+
+DESCRIPTION="Just another screensaver application for X"
+HOMEPAGE="https://www.sillycycle.com/xlockmore.html"
+SRC_URI="
+	https://www.sillycycle.com/xlock/${P/_alpha/ALPHA}.tar.xz
+	https://www.sillycycle.com/xlock/recent-releases/${P/_alpha/ALPHA}.tar.xz
+"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock"
+
+REQUIRED_USE="
+	|| ( crypt pam )
+	pam? ( !xlockrc )
+	xlockrc? ( !pam )
+"
+RDEPEND="
+	gtk? ( x11-libs/gtk+:2 )
+	imagemagick? ( media-gfx/imagemagick:= )
+	motif? ( >=x11-libs/motif-2.3:0 )
+	nas? ( media-libs/nas )
+	opengl? (
+		virtual/opengl
+		virtual/glu
+		truetype? ( >=media-libs/ftgl-2.1.3_rc5 )
+	)
+	pam? ( sys-libs/pam )
+	truetype? ( media-libs/freetype:2 )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.46-freetype261.patch
+	"${FILESDIR}"/${PN}-5.47-CXX.patch
+	"${FILESDIR}"/${PN}-5.47-strip.patch
+	"${FILESDIR}"/${PN}-5.64_alpha0-LDFLAGS.patch
+)
+S=${WORKDIR}/${P/_alpha/ALPHA}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=()
+
+	if use opengl && use truetype; then
+			myconf=( --with-ftgl )
+			append-cppflags -DFTGL213
+		else
+			myconf=( --without-ftgl )
+	fi
+
+	myconf+=(
+		$(use_enable pam)
+		$(use_enable xlockrc)
+		$(use_enable vtlock)
+		$(use_with crypt)
+		$(use_with debug editres)
+		$(use_with gtk gtk2)
+		$(use_with imagemagick magick)
+		$(use_with motif)
+		$(use_with nas)
+		$(use_with opengl mesa)
+		$(use_with opengl)
+		$(use_with truetype freetype)
+		$(use_with truetype ttf)
+		$(use_with xinerama)
+		--disable-mb
+		--enable-appdefaultdir=/usr/share/X11/app-defaults
+		--enable-syslog
+		--enable-vtlock
+		--without-esound
+		--without-gtk
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	local DOCS=( README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO} )
+	default
+
+	pamd_mimic_system xlock auth
+
+	if use pam; then
+		fperms 755 /usr/bin/xlock
+	else
+		fperms 4755 /usr/bin/xlock
+	fi
+
+	docinto html
+	dodoc docs/xlock.html
+}
diff --git a/x11-misc/xmobar/Manifest b/x11-misc/xmobar/Manifest
index 2aba509b8a33..0a2e896c5f0c 100644
--- a/x11-misc/xmobar/Manifest
+++ b/x11-misc/xmobar/Manifest
@@ -1,5 +1,7 @@
 AUX xmobar-0.24.3-alsa-mixer-0.3.patch 1113 BLAKE2B bd73e83144c9544b96ecce7c0990a68e14befc8556e325d62634bb62745f9f0dd84711b2b4873d31c6b228ba1383132edb3fb75638eb0e306333e354cf2c78c6 SHA512 87e1a2461aa98d02f6b4e0602429e24fd906de86f982328affb055514151e338ce20a4294485f490ef1678e7a3633736d7bb553d66c464a9dddf1becf6dc2b58
 AUX xmobar-0.24.3-noxpm.patch 363 BLAKE2B f7bc04a5c317400501c0bfc86b403cb7c12e5407ff492a58cc252b54d4723a00fe2dbb954c0ff85f0b9d9f283b0b1739ef7b882e797f8f26125044dbd56b36ff SHA512 54e87bfac3476d0821c7b42ace5f9f3f2709ca89bdb182f3e93bdfb3e09cb0432267698e20aa325099949694120f0f81810e5c5a026839899de2b1d4550485c8
 DIST xmobar-0.24.3.tar.gz 100317 BLAKE2B 3ca7aeb977688b975674dc767f645d15aaf296ff906f51d79529ee58d827188437695b4ee0b960563f6c0ce1489baf1f5bdc4360807989277078a93dfafb3ed1 SHA512 aa16d55b16cf108005ee8ec6c3d1b348b3e70a5182cbb97eed2aeb67bed83bee4b23acff6d29d5bda5a30ce35dc87463a6ade6e0814b588f53b173a1c3b5a5b3
+DIST xmobar-0.35.1.tar.gz 133251 BLAKE2B bebd535f2f29f89131b468e1226a63168321cfdb93129e4e3e6cdf9e2489bf4df6bdc02a5d3f6569d5c35d2cfe1fb05efec73587544c7526bf2f97bfe6a7e1b4 SHA512 fd7bb8710f3c877835aa0b20e0fca227f6f620c0be31acd46e6a464b4ba3f6c7da8df31cd3f345e606b03a54328dd9a298e46e8fc2935e74ebd8c5712cedbf76
 EBUILD xmobar-0.24.3-r1.ebuild 3131 BLAKE2B 9559d065d2fc80acbb5284f06fe6f7ceb1c1664663d889376f86aacb1846ead62c4f3818d8dee68638b3aea84ff42e6b0ccaeb79e84b3666a10784cb0245b3ff SHA512 a3e3295e0654c6c36d2024e53c1fbf8d3fa0b6edf9705c876a63acbe5b6f6397c76eeb32364ae4cf92aafdd7c4d3c08d8a21af019adce163d9cb274277b39442
-MISC metadata.xml 807 BLAKE2B 3529fa66e04b28b6a55fd835e942c7bbe0e1e3888d16374eb62a7a57c5e88244a4bbd6fbc8370f3e27a586f3ed46b32f28afcd0d5f0254374230809c0338f9d7 SHA512 3753cd9088cf4c0d7858876d7606379c52b65ab5ed2314b69a480d3b21c522b8f3934b2572c61f72efb7be1da3b77665e055b6a76641c7f22d7c0de65e98ec44
+EBUILD xmobar-0.35.1.ebuild 4193 BLAKE2B 4cc95a1a3740458b337f8fe3881b01c799f553b42f4d4bad4d72bac8433ac1d006676c75992cd7ba7157cd6d80fe0bf008004e171c61badd42e9c20a0add5e40 SHA512 da52c03e62bed40b886adfec53e7ade451c4865bab4233b00a191a452241c0a5c81ad81e21d23d50fb7792ecbb714c23341cde38a9af070e77e5c5f23879e6cb
+MISC metadata.xml 1541 BLAKE2B 25764867ba7aa8e01234baf9fba704bd28354a251775f53f4aebac5eaeab3d2c758fea53beeaa80b87096e15555aaa7867b1a6436fead8ed54de3dc3d84a74df SHA512 910fa9e26f97f950c920b01ecb1de35c21933619f2c5a416dca4afdefbfe5a8939ac5d92c664772ce85ead5797a7f08de548e9f55e8adb03ab1288a75b7dc296
diff --git a/x11-misc/xmobar/metadata.xml b/x11-misc/xmobar/metadata.xml
index 69dba3f2e452..3ecfd078e089 100644
--- a/x11-misc/xmobar/metadata.xml
+++ b/x11-misc/xmobar/metadata.xml
@@ -6,11 +6,20 @@
 		<name>Gentoo Haskell</name>
 	</maintainer>
 	<use>
+		<flag name="alsa">Use alsa-mixer to get the volume from soundcards</flag>
+		<flag name="conduit">Use conduit to fetch weather data.</flag>
+		<flag name="dbus">Publish a service on the session bus for controlling xmobar</flag>
+		<flag name="inotify">inotify support (modern Linux only). Required for the Mail and MBox plugins</flag>
 		<flag name="mpd">Support mpd plugin</flag>
-		<flag name="mpris">Enables MPRIS v1, v2  support</flag>
 		<flag name="timezone">Enables localized date support</flag>
-		<flag name="conduit">Use conduit to fetch weather data.</flag>
-		<flag name="uvmeter">Plugin to show UV data for Australia.</flag>
+		<flag name="mpris">Enables MPRIS v1, v2  support</flag>
+		<flag name="rtsopts">Reduce process wakekups frequency to decrease CPU usage</flag>
+		<flag name="uvmeter">Plugin to show UV data for Australia</flag>
+		<flag name="weather">Enable weather plugin</flag>
+		<flag name="wifi">Wireless info support via nl80211. Required for the Wireless plugin on systems running Linux</flag>
+		<flag name="iwlib">Wireless info support via Wext ioctls (deprecated)</flag>
+		<flag name="xft">Use Xft to render text. UTF-8 support included</flag>
+		<flag name="xpm">Enable usage of xpm for icons</flag>
 	</use>
 	<longdescription>
 		Xmobar is a minimalistic text based status bar.
diff --git a/x11-misc/xmobar/xmobar-0.35.1.ebuild b/x11-misc/xmobar/xmobar-0.35.1.ebuild
new file mode 100644
index 000000000000..50130b0d928b
--- /dev/null
+++ b/x11-misc/xmobar/xmobar-0.35.1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+#hackport: flags: -all_extensions,+with_threaded,+with_utf8,with_iwlib:iwlib,with_alsa:alsa,with_xft:xft,with_datezone:timezone,with_dbus:dbus,with_mpd:mpd,with_inotify:inotify,with_mpris:mpris,with_xpm:xpm,with_nl80211:wifi
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A Minimalistic Text Based Status Bar"
+HOMEPAGE="http://xmobar.org"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa dbus inotify iwlib mpd mpris +rtsopts timezone uvmeter +weather wifi xft xpm"
+
+RDEPEND="dev-haskell/async:=[profile?]
+	>=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
+	>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	dev-haskell/old-locale:=[profile?]
+	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/parsec-numbers-0.1.0:=[profile?]
+	dev-haskell/regex-compat:=[profile?]
+	>=dev-haskell/stm-2.3:=[profile?] <dev-haskell/stm-2.6:=[profile?]
+	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+	>=dev-haskell/x11-1.6.1:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	alsa? ( >=dev-haskell/alsa-core-0.5:=[profile?] <dev-haskell/alsa-core-0.6:=[profile?]
+		>=dev-haskell/alsa-mixer-0.3:=[profile?] <dev-haskell/alsa-mixer-0.4:=[profile?] )
+	dbus? ( >=dev-haskell/dbus-1:=[profile?]
+		weather? ( dev-haskell/http-client-tls:=[profile?]
+				dev-haskell/http-conduit:=[profile?]
+				dev-haskell/http-types:=[profile?] )
+		xpm? ( x11-libs/libXpm ) )
+	!dbus? ( !uvmeter? ( weather? ( !xpm? ( dev-haskell/http-client-tls:=[profile?]
+						dev-haskell/http-conduit:=[profile?]
+						dev-haskell/http-types:=[profile?] ) ) ) )
+	inotify? ( >=dev-haskell/hinotify-0.3:=[profile?] <dev-haskell/hinotify-0.5:=[profile?] )
+	iwlib? ( >=dev-haskell/iwlib-0.1.0:=[profile?] <dev-haskell/iwlib-0.2:=[profile?]
+			net-wireless/wireless-tools )
+	!iwlib? ( wifi? ( >=dev-haskell/cereal-0.5.8.1:=[profile?]
+				>=dev-haskell/netlink-1.1.1.0:=[profile?] ) )
+	mpd? ( >=dev-haskell/libmpd-0.9.0.10:=[profile?] )
+	mpris? ( >=dev-haskell/dbus-1:=[profile?]
+			!dbus? ( !uvmeter? ( weather? ( dev-haskell/http-client-tls:=[profile?]
+							dev-haskell/http-conduit:=[profile?]
+							dev-haskell/http-types:=[profile?] ) ) )
+			xpm? ( x11-libs/libXpm
+			weather? ( dev-haskell/http-client-tls:=[profile?]
+					dev-haskell/http-conduit:=[profile?]
+					dev-haskell/http-types:=[profile?] ) )
+			!xpm? ( uvmeter? ( weather? ( dev-haskell/http-client-tls:=[profile?] ) ) ) )
+	!mpris? ( !dbus? ( weather? ( dev-haskell/http-client-tls:=[profile?] )
+				xpm? ( x11-libs/libXpm
+					weather? ( dev-haskell/http-conduit:=[profile?]
+						dev-haskell/http-types:=[profile?] ) ) ) )
+	timezone? ( >=dev-haskell/timezone-olson-0.1:=[profile?] <dev-haskell/timezone-olson-0.3:=[profile?]
+			>=dev-haskell/timezone-series-0.1:=[profile?] <dev-haskell/timezone-series-0.2:=[profile?] )
+	uvmeter? ( dev-haskell/http-conduit:=[profile?]
+			dev-haskell/http-types:=[profile?] )
+	xft? ( >=dev-haskell/x11-xft-0.2:=[profile?] <dev-haskell/x11-xft-0.4:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3
+		dev-haskell/temporary )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-all_extensions \
+		$(cabal_flag alsa with_alsa) \
+		$(cabal_flag timezone with_datezone) \
+		$(cabal_flag dbus with_dbus) \
+		$(cabal_flag inotify with_inotify) \
+		$(cabal_flag iwlib with_iwlib) \
+		$(cabal_flag mpd with_mpd) \
+		$(cabal_flag mpris with_mpris) \
+		$(cabal_flag wifi with_nl80211) \
+		$(cabal_flag rtsopts with_rtsopts) \
+		--flag=with_threaded \
+		--flag=with_utf8 \
+		$(cabal_flag uvmeter with_uvmeter) \
+		$(cabal_flag weather with_weather) \
+		$(cabal_flag xft with_xft) \
+		$(cabal_flag xpm with_xpm)
+}
+
+src_install() {
+	cabal_src_install
+
+	dodoc examples/xmobar.config examples/xmobar.hs readme.md changelog.md
+}
diff --git a/x11-misc/xmonad-log-applet/Manifest b/x11-misc/xmonad-log-applet/Manifest
deleted file mode 100644
index 67333cd48778..000000000000
--- a/x11-misc/xmonad-log-applet/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX xmonad.hs 1801 BLAKE2B e8235819cbd5086141def1d45652750129c8153e65c52b9e72ee9b42d3dd6110e9d1b6e3da651ff18beb9b3c61e3afaa83fff9059a7d2113a0a445d2e07e0b99 SHA512 3d20f037dabff24c69811672850734396a4c4f57a9e33e03a15f93d8e5b4edcf43dadf9d95ab82c310dbf0064e8fb7a6a0e8e330c5b51997e0dffe719dd0cb21
-DIST xmonad-log-applet-2.0.0.tar.gz 82881 BLAKE2B a059158558cc2fcb150e90cbd055cf50367dbed464c46891b6c63d49d2b5e2974ea3fc859afe8f1115af78fae60e639bde0aec37af8be693720eca80905712b8 SHA512 1885ac97569d909ab1c6af99d9b271d0f782de905dfe035df27524f428d09cefa20a468103477132656dea8945faf886270fd70a49e5a08be538e04f3f05baca
-EBUILD xmonad-log-applet-2.0.0-r301.ebuild 929 BLAKE2B 6002ba6efb52cd4fc216421d146b2ffd62beae91287fc010db976e53b73f4e60692fe0387137dac3ee37b73b3c1055dffdcc43126dd5a26ef8fe124f0e836f7f SHA512 77d4c9c8c82761f62de6c382af27211842c06780e5b28f63dad436c2f94afa3d62b2ff11ab06efa9f7c9e2f2c8976dccf08fd96b1db9e6460b2033de155ec3de
-MISC metadata.xml 647 BLAKE2B 0af322628cb650feee33ab99817bdd2955689b9cfa2c4bd736d9363b1de33be9913972884792d98cfd827cbb5133e5c52ae92e747df80ba6636be8ad64f12226 SHA512 92739437a732ad395f4af992972cd4be68abb931a26e1b47e0035b0e681fa5095e5019b4f0fda178f53197fd42cdbd679b6673727fc5ac425437768f8ad12fff
diff --git a/x11-misc/xmonad-log-applet/files/xmonad.hs b/x11-misc/xmonad-log-applet/files/xmonad.hs
deleted file mode 100644
index 54b0025a97c4..000000000000
--- a/x11-misc/xmonad-log-applet/files/xmonad.hs
+++ /dev/null
@@ -1,60 +0,0 @@
-import XMonad
-import XMonad.Config.Gnome
-import XMonad.Hooks.DynamicLog
-
-import Control.OldException
-
-import DBus
-import DBus.Connection
-import DBus.Message
-
-main :: IO ()
-main =  withConnection Session $ \dbus -> do
-    getWellKnownName dbus
-    xmonad $ gnomeConfig
-         { logHook = dynamicLogWithPP (prettyPrinter dbus)
-         }
-
-prettyPrinter :: Connection -> PP
-prettyPrinter dbus = defaultPP
-    { ppOutput   = dbusOutput dbus
-    , ppTitle    = pangoSanitize
-    , ppCurrent  = pangoColor "green" . wrap "[" "]" . pangoSanitize
-    , ppVisible  = pangoColor "yellow" . wrap "(" ")" . pangoSanitize
-    , ppHidden   = const ""
-    , ppUrgent   = pangoColor "red"
-    , ppLayout   = const ""
-    , ppSep      = " "
-    }
-
-getWellKnownName :: Connection -> IO ()
-getWellKnownName dbus = tryGetName `catchDyn` (\(DBus.Error _ _) -> getWellKnownName dbus)
-  where
-    tryGetName = do
-        namereq <- newMethodCall serviceDBus pathDBus interfaceDBus "RequestName"
-        addArgs namereq [String "org.xmonad.Log", Word32 5]
-        sendWithReplyAndBlock dbus namereq 0
-        return ()
-
-dbusOutput :: Connection -> String -> IO ()
-dbusOutput dbus str = do
-    msg <- newSignal "/org/xmonad/Log" "org.xmonad.Log" "Update"
-    addArgs msg [String ("<b>" ++ str ++ "</b>")]
-    -- If the send fails, ignore it.
-    send dbus msg 0 `catchDyn` (\(DBus.Error _ _) -> return 0)
-    return ()
-
-pangoColor :: String -> String -> String
-pangoColor fg = wrap left right
-  where
-    left  = "<span foreground=\"" ++ fg ++ "\">"
-    right = "</span>"
-
-pangoSanitize :: String -> String
-pangoSanitize = foldr sanitize ""
-  where
-    sanitize '>'  xs = "&gt;" ++ xs
-    sanitize '<'  xs = "&lt;" ++ xs
-    sanitize '\"' xs = "&quot;" ++ xs
-    sanitize '&'  xs = "&amp;" ++ xs
-    sanitize x    xs = x:xs
diff --git a/x11-misc/xmonad-log-applet/metadata.xml b/x11-misc/xmonad-log-applet/metadata.xml
deleted file mode 100644
index e8a655590796..000000000000
--- a/x11-misc/xmonad-log-applet/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-	</maintainer>
-	<maintainer type="person">
-		<email>flo@geekplace.eu</email>
-	</maintainer>
-	<longdescription>
-		xmonad-log-applet is for Xmonad users who find the GNOME, MATE, or Xfce panel useful. The applet will show the active workspaces, the title of the selected window or whatever information you send it from your xmonad.hs.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">alexkay/xmonad-log-applet</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/x11-misc/xmonad-log-applet/xmonad-log-applet-2.0.0-r301.ebuild b/x11-misc/xmonad-log-applet/xmonad-log-applet-2.0.0-r301.ebuild
deleted file mode 100644
index 9038beb0ce04..000000000000
--- a/x11-misc/xmonad-log-applet/xmonad-log-applet-2.0.0-r301.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools gnome2
-
-DESCRIPTION="Gnome and XFCE applet for displaying XMonad log"
-HOMEPAGE="https://github.com/alexkay/xmonad-log-applet"
-SRC_URI="https://github.com/downloads/alexkay/${PN}/${P}.tar.gz"
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT="mirror"
-
-RDEPEND="
-	sys-apps/dbus
-	xfce-base/xfce4-panel
-	dev-libs/dbus-glib
-	dev-libs/glib:2
-	dev-haskell/dbus
-	x11-libs/gtk+:3
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure --sysconfdir=/etc --with-panel=xfce4
-}
-
-src_install() {
-	gnome2_src_install
-	dodoc AUTHORS.md README.md
-	dodoc "${FILESDIR}"/xmonad.hs
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	elog "Remember to update your xmonad.hs accordingly"
-	elog "a sample xmonad.hs is provided in /usr/share/doc/${PF}"
-}
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index a4a5de87e51c..c2d4321324d1 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -9,12 +9,13 @@ AUX xscreensaver-5.35-offensive.patch 1678 BLAKE2B 6479ad1d5f081d3ae0ab7e9f08edf
 AUX xscreensaver-5.43-gentoo.patch 1340 BLAKE2B 177631b961b97d339149fd969d68ebbab5bd6444aea4f1379c199efbcbe5924106890578a5210bae5c55249ea1883af437e7edebb32fbccd35022acc3d7c29de SHA512 53ec2d02e20139389f832750ecee92e634ec8ecea5bfd5ef27a58ab0e6f3cbde299263bd92006581a4076f4b0721c036c1ac28cac50b1a2bf47c24df08347d04
 AUX xscreensaver-5.43-offensive.patch 1799 BLAKE2B f85d26a07ba2712855567a0779eaff7dba7e9a7350f320f78db5b1280890925cd82694ec3fa9c47c173ada2a1979a21b707dacb05c46c8721516687d52fcc8b7 SHA512 041105a4c96a197506c596d4793f7200f52e496f13d41209daa7eb05d5433280ede45411ee3f60679a1030c1edc4009383d6d50a97dff1af7e65a63a217b25d3
 AUX xscreensaver-5.44-blurb-hndl-test-passwd.patch 247 BLAKE2B fb88708de900b90fdb846608cc0a08706c339792e10099e7873aef00b7c66a408dba71489d0938b59e619345c739e4f6a35a9c97b1ae83cfa040035df3499434 SHA512 bd7f0e3f670e99ad1297306c88e30ac9cc381adf2a54cfd52192c1f562293ebdfcf3e956990cd2f3d877a2ca0d2f5b13332de726304ef93510c5bd08ae39a819
+AUX xscreensaver-5.44-gcc.patch 549 BLAKE2B 9e8b626fd7a9f3778c1bc62a3f161cd2d94b70769fc4adc06c64dd2c7515fbc5054257560326a7d15c124fa90e93b907bb5f3c5954bbe11c123540625b0f2e57 SHA512 d55908911b738e3fc5245627ca79f9c2880402921d38f80247e2143422543396399f5529fd70f4f473935d2606f10dbe3501d2e64af158b38fc03d995345ff10
 AUX xscreensaver-5.44-gentoo.patch 1368 BLAKE2B d74cbe8effe8feb4c682f8df537a2a1897defa31c0838bfb34967642ab2e66e8058b3306c98e360e3c5f81ff4649b759d5386e6e2613c59fb945f439c3b0cc02 SHA512 bba16c093a2a16e57e3bbe77ed7a54201e7e9e1c9a3c5a65065f275a4faa6898327865b62a56be0c538dabde1fb4571ccfd567035911b85688f31ac1cba128b1
 AUX xscreensaver-remove-libXxf86misc-dep.patch 1879 BLAKE2B fa3f562edf921dded7a1b3e9644d79d10a768baea64fbbed6301dba0fdaa1d575b85b2e8322eda251030a79835f7476020680a8b5a05354d279db8aa06943475 SHA512 6e55932f6be85042eb6f88a79d32b90fe51734b90f9e15aeebfefcdfe087af85b6cf5bed8c3c4212c1e8a91a77dda49eb6fbb64b829dcd02230710b803863a7d
 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 3437 BLAKE2B f8fbcb02b9f5927e395a13b438235cc4b4d5b8f0660253085d890326151dbebdc826ba89b401c855a86a7f037828527408cf44484478d72e2722fdd0048d7dfa SHA512 2237ff0d15867e50b564c8889d251afc7e2a08431701f9a8a36e9120ca47c6665b03be86eec4ec2f6fc1a38352dca5297fcd60d813d1b73856707447a2e14f87
-EBUILD xscreensaver-5.43-r3.ebuild 3476 BLAKE2B 573c05f1255f99c769b96c605952a525ace1ee8782e6c5408fd4a02501e584654478fededc8396d3eb0fa69b1096ebf2b9d87390a2f5b79264e61f2ad67b7c54 SHA512 525acd033e5cabd0cc7d0a03f72f7e86bcbe229c11aaa2de78a2639dc20657258416782003adbc528ae610af694429236c6f5381aec7e135b6f8a16b17726bb8
-EBUILD xscreensaver-5.44-r2.ebuild 3755 BLAKE2B 5de38bbcf33fd443e012f136b7e437d96a56f688853664bc1ea64467c88b2892c4e90a91646884094cbc9abdbc51dd1524ade3b210719b029ac5d06284c8ff3d SHA512 3f9b8926051b8363e5b6d7062dec240f9502a395d9521fbde525c0a6aa37f6073858f6d67b5b0e81e51c1ef7d22c4912500c920f613a44bfdb29ad133841d487
+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
 MISC metadata.xml 870 BLAKE2B 222f0b24d94c2d9884848813bc9927312e23c670cb03d6427af4018c469b7ca81ab5d0887fa469ad60d05aff97f3b8b2df88158638213fbce24ea6d90c7d9f1a SHA512 0743dbc932e97530aede3f34519e1785bd186662619f46d212f4b4ae0b53bfa01875a3a58d2a30e7f7e6d93f1723211e5cf95018b86dd8e5ede5a37e4c238592
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.44-gcc.patch b/x11-misc/xscreensaver/files/xscreensaver-5.44-gcc.patch
new file mode 100644
index 000000000000..16493e1fd1dc
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.44-gcc.patch
@@ -0,0 +1,16 @@
+--- a/configure.in
++++ b/configure.in
+@@ -468,11 +468,11 @@
+ 
+ AC_DEFUN([AC_CHECK_GCC_ARG],
+  [if test -n "$GCC"; then
+-   AC_CACHE_CHECK([whether gcc accepts [$2]],
++   AC_CACHE_CHECK([whether [$CC] accepts [$2]],
+      ac_cv_gcc_accepts_[$1],
+     [rm -rf conftest.$ac_ext
+      touch conftest.$ac_ext
+-     if ( ( gcc -c [$2] conftest.$ac_ext -o/dev/null >/dev/null ) 2>&1 | \
++     if ( ( $CC -c [$2] conftest.$ac_ext -o/dev/null >/dev/null ) 2>&1 | \
+           grep unrecognized >/dev/null ); then
+        ac_cv_gcc_accepts_[$1]=no
+      else
diff --git a/x11-misc/xscreensaver/xscreensaver-5.38-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-5.38-r1.ebuild
index 9ffa8e21aea5..315cf9b7a9ce 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.38-r1.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.38-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
 
 COMMON_DEPEND="
diff --git a/x11-misc/xscreensaver/xscreensaver-5.43-r3.ebuild b/x11-misc/xscreensaver/xscreensaver-5.43-r3.ebuild
index 5a18a2279341..a111f518d22a 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.43-r3.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.43-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="caps gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
 
 COMMON_DEPEND="
diff --git a/x11-misc/xscreensaver/xscreensaver-5.44-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-5.44-r2.ebuild
index 49a04e5dd618..3d15c7f3a86f 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.44-r2.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.44-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="caps +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam +perl selinux suid xinerama"
 REQUIRED_USE="
 	gdk-pixbuf? ( gtk )
@@ -71,6 +71,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.31-pragma.patch
 	"${FILESDIR}"/${PN}-5.44-blurb-hndl-test-passwd.patch
 	"${FILESDIR}"/${PN}-5.44-gentoo.patch
+	"${FILESDIR}"/${PN}-5.44-gcc.patch
 )
 
 src_prepare() {
diff --git a/x11-misc/xsel/Manifest b/x11-misc/xsel/Manifest
index fca5cf98cd04..896ca7d75f1b 100644
--- a/x11-misc/xsel/Manifest
+++ b/x11-misc/xsel/Manifest
@@ -1,4 +1,4 @@
 DIST xsel-1.2.0.tar.gz 169155 BLAKE2B 59b5c2f03058be1a584f12bd5c129a008ae581545b7aed3a54240f6a0b9c29e857c7425cbf6fa6421ccd577a1907a9a6c1d7213e4ccc43309a5e8933e707847d SHA512 e28623e6cc180f2e2210c20697d21d336633f0a5272ca9b62150a1c535e8de89731acc07230a9977e391e37d3943a9d687f1f967765a15bca5092a6c6d8c4d8f
 EBUILD xsel-1.2.0-r1.ebuild 606 BLAKE2B 4c9cfe30c381195fd8431ffd91259c13bdc2549338417e7c4a69e42e3aeaf88cbf2377e8dc8b4fa37c6d17ffce851af09f79f8a22d969b79d5c7dbcf59bfbe9e SHA512 1705a70ea837bdd3d35c94e405185164ad530a06a55f3b5c835ec9cd9b03b75afd1390478dbb6f978fe344c903be54caec08b2e612accf50130ccaf8337ecf09
-EBUILD xsel-9999.ebuild 570 BLAKE2B c9764165375cad08000658f418bb16ccafa2790dae30ec3cf0095e6d98a5d14f5956f47878c788281b1f633945b0b8b3efd17d28a76aa77460676c5d93cfc6e6 SHA512 742086512bb37463fe2c51481128befd1e27a82bb1597d1cce294ff310256b59b0ec2a42e9ef08f249426ae7a2d594e78e65f51452f663958c80bf450206c153
+EBUILD xsel-9999.ebuild 568 BLAKE2B 66dcdd575ed15292aab0e6f629bfe0f65d8e83fa80e2678061a502704c3da015f55fb4553573a23782afae1945afc11264eb74b58f81ad91fe725aa542d6f56a SHA512 02903c21b332e05b486718e831fc68a51b92365b0d5021b626a8814696428e6ebfe7037be6c397909c25b4d153259de4907374d433285ac0c1c2fcc26539166d
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xsel/xsel-9999.ebuild b/x11-misc/xsel/xsel-9999.ebuild
index d3edca7a9f74..fbb8543c5cc5 100644
--- a/x11-misc/xsel/xsel-9999.ebuild
+++ b/x11-misc/xsel/xsel-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit autotools git-r3
 
 DESCRIPTION="Command-line program for getting and setting the contents of the X selection"
 HOMEPAGE="http://www.vergenet.net/~conrad/software/xsel"
-EGIT_REPO_URI="https://github.com/kfish/xsel.git"
+EGIT_REPO_URI="https://github.com/kfish/xsel"
 
 LICENSE="HPND"
 SLOT="0"
@@ -23,10 +23,7 @@ DEPEND="
 "
 
 src_prepare() {
+	sed -i -e 's| -Werror -g||g' configure.ac || die
 	default
 	eautoreconf
 }
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}"
-}
diff --git a/x11-misc/xsettingsd/Manifest b/x11-misc/xsettingsd/Manifest
new file mode 100644
index 000000000000..708671c03695
--- /dev/null
+++ b/x11-misc/xsettingsd/Manifest
@@ -0,0 +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
+MISC metadata.xml 330 BLAKE2B 0b8f27cf4be7ed52be5e6656a64497815cbac57febe612b3755ca2cfa9ce97f34d5807318ac39bc184b7e61b3086cecfa4e5b2e19066adfb32caead8e8833a89 SHA512 834c1c90c8297497e13de12121a39f113807228ede6ec87ad774096e870840f1f1ddc73301c63375f2600b035be12f88c77c978a8fec2e089b0624df16444959
diff --git a/x11-misc/xsettingsd/files/xsettingsd-1.0.0-add-cmake-buildsystem.patch b/x11-misc/xsettingsd/files/xsettingsd-1.0.0-add-cmake-buildsystem.patch
new file mode 100644
index 000000000000..bb46f5e37b93
--- /dev/null
+++ b/x11-misc/xsettingsd/files/xsettingsd-1.0.0-add-cmake-buildsystem.patch
@@ -0,0 +1,51 @@
+From 7ddb3b8dec442fd1bd502dc7b97841bb07526cae Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 26 Jul 2020 16:47:22 +0200
+Subject: [PATCH] Add cmake buildsystem
+
+---
+ CMakeLists.txt | 32 ++++++++++++++++++++++++++++++++
+ 1 file changed, 32 insertions(+)
+ create mode 100644 CMakeLists.txt
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+new file mode 100644
+index 0000000..42dca7d
+--- /dev/null
++++ b/CMakeLists.txt
+@@ -0,0 +1,32 @@
++cmake_minimum_required(VERSION 3.15)
++
++project(xsettingsd VERSION 1.0.0)
++
++include(GNUInstallDirs)
++
++find_package(X11 REQUIRED)
++
++set(libxsettingsd_SRCS
++    common.cc
++    config_parser.cc
++    data_reader.cc
++    data_writer.cc
++    setting.cc
++    settings_manager.cc
++)
++
++add_library(libxsettingsd STATIC ${libxsettingsd_SRCS})
++
++add_executable(xsettingsd xsettingsd.cc)
++add_executable(dump_xsettings dump_xsettings.cc)
++
++target_include_directories(xsettingsd PUBLIC "${PROJECT_BINARY_DIR}")
++target_include_directories(dump_xsettings PUBLIC "${PROJECT_BINARY_DIR}")
++
++target_link_libraries(xsettingsd PUBLIC libxsettingsd X11::X11)
++target_link_libraries(dump_xsettings PUBLIC libxsettingsd X11::X11)
++
++install(TARGETS xsettingsd DESTINATION ${CMAKE_INSTALL_BINDIR})
++install(TARGETS dump_xsettings DESTINATION ${CMAKE_INSTALL_BINDIR})
++
++install(FILES xsettingsd.1 dump_xsettings.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
+-- 
+2.27.0
+
diff --git a/x11-misc/xsettingsd/files/xsettingsd-1.0.0-return-1.patch b/x11-misc/xsettingsd/files/xsettingsd-1.0.0-return-1.patch
new file mode 100644
index 000000000000..795e82ce002f
--- /dev/null
+++ b/x11-misc/xsettingsd/files/xsettingsd-1.0.0-return-1.patch
@@ -0,0 +1,26 @@
+From 3ec9deebd8e3496feacab83e41846dc4fffc3404 Mon Sep 17 00:00:00 2001
+From: Phil Miller <unmobile+gh@gmail.com>
+Date: Mon, 25 Jun 2018 10:58:59 -0500
+Subject: [PATCH] Return 1 to indicate error from main()
+
+The statement 'return false;' was most likely to end up indicating successful exit
+by returning a 0 value, when failure seems to be intended.
+
+This was flagged as a warning in the Debian Clang Archive Rebuild.
+---
+ dump_xsettings.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dump_xsettings.cc b/dump_xsettings.cc
+index f94a0c0..e9330b4 100644
+--- a/dump_xsettings.cc
++++ b/dump_xsettings.cc
+@@ -270,7 +270,7 @@ int main(int argc, char** argv) {
+ 
+   xsettingsd::DataReader reader(buffer, data_size);
+   if (!xsettingsd::DumpSettings(&reader))
+-    return false;
++    return 1;
+ 
+   return 0;
+ }
diff --git a/x11-misc/xsettingsd/metadata.xml b/x11-misc/xsettingsd/metadata.xml
new file mode 100644
index 000000000000..c782cfbaf57c
--- /dev/null
+++ b/x11-misc/xsettingsd/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">derat/xsettingsd</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/xsettingsd/xsettingsd-1.0.0.ebuild b/x11-misc/xsettingsd/xsettingsd-1.0.0.ebuild
new file mode 100644
index 000000000000..4d15a99dad4b
--- /dev/null
+++ b/x11-misc/xsettingsd/xsettingsd-1.0.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Provides settings to X11 applications via the XSETTINGS specification"
+HOMEPAGE="https://github.com/derat/xsettingsd"
+SRC_URI="https://github.com/derat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-return-1.patch
+	"${FILESDIR}"/${P}-add-cmake-buildsystem.patch
+)
diff --git a/x11-misc/xvfb-run/Manifest b/x11-misc/xvfb-run/Manifest
index 922c1466be7d..211fe10c0557 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 741 BLAKE2B 8356910a3ff1dd3cc426ef266503038814aded34a792a8a2d40c53d8d2bc881486ad32ad3eca7c110998f470892f071a5d98f246477257a6d633e1036df86265 SHA512 9ee1c7d8aff0d71ef0e4abfc42482d7fdf60a0e645c62197fc4ea0d7ea92cdf5a52dd56b6a28cb047e9ba550f44d0c34a5a956d070e8b528e8f8f8bfa32c58ef
+EBUILD xvfb-run-1.20.8_p2.ebuild 748 BLAKE2B 5ff2b04f3e2078d018063f9d5cb10088aa719c991063fc6549c07dbb6fab2531d7de5e449c1bcb98d48f4307e2ed9bcecd034dd8177e907d78ee96c8f1842939 SHA512 0e7b158d3a2a88fd4706bb5240915cc52082d93dbd32d78e1a1afa57e343066770c8de49df1bea5da52a19ab9b8375827b878aa5f66fa3019d0a971737f8f67f
 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 c2608ef15845..8ea25a1deffa 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 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 DEPEND="dev-util/patchutils"
diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index c0a0866c071a..d256678307d7 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -1,8 +1,6 @@
 AUX zim-0.60-remove-ubuntu-theme.patch 669 BLAKE2B fbb3fe0082e7567f4ae9d0bd031096cf2bcbd4d4cb86b31ceff18dda880b5cf1f8441e452642dd28275c9ce6e20c7da0a3a77b4157da13d5d4bbe9b6a30a9086 SHA512 a2e202986c77490898c15f6c4e647667fd6662422e8bbd638624a52a33989cd4259f95b37f488ff4a947f04354704ee9df7b9d60aae2fcc928f1f3186955ea1a
-DIST zim-0.72.1.tar.gz 2596910 BLAKE2B cdc6c875ed316dcd5655d75c280b46189d9b7068922ea0cc05606bce8f5bd0ef7d92b7965ee0af067add28ef75f53363e864b3ca43d216dbf99fe2cac6e19a73 SHA512 3b74388eb9272e6c5c89e752d784428b18ffc6cbc76311162aa8f42f2de434ad8e9f9c6932b8aaa62e2a3abdb879a31c982cc3103e7eaa3a5407a02cb6750bfc
-DIST zim-0.73.0.tar.gz 2615116 BLAKE2B 0d7c3910dfaa49f5260b4f7d23f812aa4cd9288bb19ffca0ca7297c49a508b89d4815ee7f2e98883f43c5cad92c6084939b827ccc4cb4e976edbf1cbc910eafa SHA512 0c01c63f68fe661263e25eef80e9b5872f2e5315d1e6a378de6b2486c081d39e5970435feee879a444f16f67ff2eda1a1e790630a3829a630c0ea95e59a505fa
 DIST zim-0.73.1.tar.gz 2615382 BLAKE2B 055857b20dbdebc1e5d8d6b13c344fcf665d9889f392f9c58fd3cfef1f80865a78c48e5138d2443f67bb29b8cd915b8d0d6bc0ac4807de20344dfe6673f1350e SHA512 ba67b396a6c06921e5e67ab5ccf0559e54b29a719262411b24f178c350bd0ac7c8239f8d5d4396b9dc291aadc36b59869d81dc04d457ce4a36eade67cdd53dd2
-EBUILD zim-0.72.1-r2.ebuild 1938 BLAKE2B 8df050f51ac404af6410471445eacd43d9450d50f151780e97082d131144d7d2ac84c5dae37e08ac6fbe242311663216a30e5afc9b91a2cc26c340f78b189606 SHA512 3b7f99d4dc56c86c98fbd72fb285c9fdf825062ef25fde9c0de72c9ffc571ebc015a241edb1dc8a76e836d989d1096ebd4adf8eff49d9fffbbe4fa14c612ddff
-EBUILD zim-0.73.0.ebuild 1940 BLAKE2B dfa3171f6443e914b989010e49b505895b1ea0aa06501942c5abf3c041cd501e6e2f9ba4e5b8ee6c809ae6d6984ae0ccc117b2ad972c5827ac308a553e8f08df SHA512 e9f686901a40ccf79e72a38cd4d2da0654e928c8369f36743c3880dcbe149d36d1c043dca6da5d5b0a3161a8bedb41cde177a68ac3ff879a25dfa7572d6800c6
-EBUILD zim-0.73.1.ebuild 2001 BLAKE2B baa7b03409977a87b624a59d104703fca9c98107381ed2f54792bcc5fa2f18d42dd2201d282f4e0d4922f3c8cba1214eaa5721e379c83a2ac77018ab7dfbe5d3 SHA512 150377bbc61f8de1bcb92235e874b7b660f25f8fc268a4f642b0f3ce43d55470f944c916a85241e7197e67dce96c865c2e8121ff0297df0150393886db1a29e5
+DIST zim-0.73.2.tar.gz 2611490 BLAKE2B 05fd020b3add3ac9c6fd860ca002a5c0755a1a1f1ee07c6e5027e16e3b8c64d9116971e96ed235b249b65b9097551b9fcdf46ed929a03a877c36a02a7d54e8fd SHA512 26c987906759436063f88863e90cf2643996913a2fae12ebc4ae623731ad97d488d37ad70e72153aba7aaac7fe2dff9bb6f9f06c4d899a0ac20e3bfbd20ff3db
+EBUILD zim-0.73.1.ebuild 2004 BLAKE2B 860e5ec15639b229ccdbadb7af5120d22f05722744927d48788b18d9a8196b82f6bbe0c40ed7230da9549446cc8a9580b3128228a780a7f53b84ff60a8ae5359 SHA512 a615515f58178875db7195628162cf0ee1470da174dfb9fedc3af1f4c52e1d974fd0df423efeabfec8d64df17608ed8f6284db54c98cfd9b54c7481b94bf7e58
+EBUILD zim-0.73.2.ebuild 2006 BLAKE2B 38362eeedb27a545084c2d8225f2c19d2cc3f025abc6fb61aedb2d0389ca50a7ff458f84da0218ce34720591221f0561248a9684ff130990e4fbbe268ee9e3ee SHA512 4d87fe9e5a7023c7d6d747b5ebac4773a5ff4f63050ef0d079c8e120086259f60fe0c0d4fbe59c338e91b53f9e4160c501e43b668588731d225966a1d18f29fa
 MISC metadata.xml 824 BLAKE2B a6ac745b62015073844af9a8aae0ef1d6ca6b7c28e881c7b85d31e00c808076fa944feec5980cdefc72b5ddfa2cecb98fc96b4745df12743212a4d572679408d SHA512 26a4774e75f0a06bfedc2c26f4ca688f9a2644935302e0674ba5a5308af88bc90f291a01f5b10bba62ac0f0a46561d63bfd9289de67bc53c4be454542ea76816
diff --git a/x11-misc/zim/zim-0.73.0.ebuild b/x11-misc/zim/zim-0.73.0.ebuild
deleted file mode 100644
index 51a1c261843f..000000000000
--- a/x11-misc/zim/zim-0.73.0.ebuild
+++ /dev/null
@@ -1,79 +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} )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_SINGLE_IMPL=1
-inherit xdg-utils distutils-r1 virtualx
-
-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 ~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
-}
-
-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
-}
diff --git a/x11-misc/zim/zim-0.73.1.ebuild b/x11-misc/zim/zim-0.73.1.ebuild
index 44944193205d..4cd3e599e93e 100644
--- a/x11-misc/zim/zim-0.73.1.ebuild
+++ b/x11-misc/zim/zim-0.73.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/${PN}-desktop-wiki/${PN}-desktop-wiki/archive/${PV/_
 
 LICENSE="BSD GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm x86"
 RESTRICT="test"
 
 RDEPEND="
diff --git a/x11-misc/zim/zim-0.72.1-r2.ebuild b/x11-misc/zim/zim-0.73.2.ebuild
index c970ffe1e845..979b6c32c161 100644
--- a/x11-misc/zim/zim-0.72.1-r2.ebuild
+++ b/x11-misc/zim/zim-0.73.2.ebuild
@@ -5,7 +5,8 @@ EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="sqlite"
 DISTUTILS_SINGLE_IMPL=1
-inherit xdg-utils distutils-r1 virtualx
+DISTUTILS_USE_SETUPTOOLS=no
+inherit xdg-utils virtualx distutils-r1
 
 DESCRIPTION="A desktop wiki"
 HOMEPAGE="
@@ -16,7 +17,7 @@ SRC_URI="https://github.com/${PN}-desktop-wiki/${PN}-desktop-wiki/archive/${PV/_
 
 LICENSE="BSD GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~arm ~x86"
 RESTRICT="test"
 
 RDEPEND="
@@ -48,6 +49,7 @@ python_prepare_all() {
 	fi
 
 	distutils-r1_python_prepare_all
+	export XDG_RUNTIME_DIR=fakethis
 }
 
 python_install() {
author	V3n3RiX <venerix@redcorelinux.org>	2020-08-25 10:45:55 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-08-25 10:45:55 +0100
commit	3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
tree	c513fe68548b40365c1c2ebfe35c58ad431cdd77 /x11-misc
parent	05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)