gentoo Easter resync : 12.04.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-04-12 03:41:30 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-04-12 03:41:30 +0100
commit: 623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree: 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /x11-misc
parent: ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)
155 files changed, 1666 insertions, 1278 deletions
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index d4696b4ad573..4139dc745d72 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/barrier/Manifest b/x11-misc/barrier/Manifest
new file mode 100644
index 000000000000..c6e3a9ca9b32
--- /dev/null
+++ b/x11-misc/barrier/Manifest
@@ -0,0 +1,7 @@
+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
+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.2-r1.ebuild
new file mode 100644
index 000000000000..62b3dd6a5f97
--- /dev/null
+++ b/x11-misc/barrier/barrier-2.3.2-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop xdg cmake
+
+DESCRIPTION="Share a mouse and keyboard between computers (fork of Synergy)"
+HOMEPAGE="https://github.com/debauchee/barrier"
+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"
+
+RDEPEND="
+	net-misc/curl
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	gui? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtwidgets:5
+		net-dns/avahi[mdnsresponder-compat]
+	)
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+"
+DEPEND="
+	${RDEPEND}
+	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
+)
+
+DOCS=(
+	ChangeLog
+	README.md
+	doc/${PN}.conf.example{,-advanced,-basic}
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBARRIER_BUILD_GUI=$(usex gui)
+		-DBARRIER_BUILD_INSTALLER=OFF
+		-DBARRIER_REVISION=00000000
+		-DBARRIER_VERSION_STAGE=gentoo
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	einstalldocs
+	doman doc/${PN}{c,s}.1
+
+	if use gui; then
+		doicon -s scalable res/${PN}.svg
+		doicon -s 256 res/${PN}.png
+		make_desktop_entry ${PN} Barrier ${PN} Utility
+	fi
+}
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
new file mode 100644
index 000000000000..125b903e58eb
--- /dev/null
+++ b/x11-misc/barrier/files/barrier-2.3.2-inf-loop.patch
@@ -0,0 +1,132 @@
+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
new file mode 100644
index 000000000000..481a23a2d705
--- /dev/null
+++ b/x11-misc/barrier/files/barrier-2.3.2-no-avahi.patch
@@ -0,0 +1,25 @@
+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
new file mode 100644
index 000000000000..d29844843e45
--- /dev/null
+++ b/x11-misc/barrier/files/barrier-2.3.2-pthread.patch
@@ -0,0 +1,115 @@
+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
new file mode 100644
index 000000000000..bcfe31386103
--- /dev/null
+++ b/x11-misc/barrier/files/barrier-2.3.2-qt-gui-only.patch
@@ -0,0 +1,45 @@
+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/metadata.xml b/x11-misc/barrier/metadata.xml
new file mode 100644
index 000000000000..4ec6c623e4b2
--- /dev/null
+++ b/x11-misc/barrier/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chewi@gentoo.org</email>
+		<name>James Le Cuirot</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">debauchee/barrier</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest
index 3e9087baa2c8..5c74bcaebc6d 100644
--- a/x11-misc/colord/Manifest
+++ b/x11-misc/colord/Manifest
@@ -1,3 +1,3 @@
 DIST colord-1.3.5.tar.xz 1263488 BLAKE2B de70f3f76e81d3cec826f444e4c6a1603c03b7d97fedcd04a0b9e1977d1e487d7e1327c8b2738b3cf74e9717fb6803d543786c749d3a244faa1a6480e77e3436 SHA512 a0084ad2c08ae88c8023b8bade68f6cf25e13c77a6a37ef127b2914e86b06e6a7a783f9ab3585243d975dbbe1120d5daae13bdb586aefe519bf675458683025f
-EBUILD colord-1.3.5.ebuild 4342 BLAKE2B 7de8ed65da7316714946629d14d7595473e6c2281e482ea879a4d31415415f18a44be18672a840e98897c33d67a18af7e90a7138c699ebcf03d01550ba6b3061 SHA512 0938e3eda019f2bd14714439d5e8c02a5529d421189fc5347d3e1f317c3d04d7e9565823dea5b8483b94f726e449c5358ad108dac01d002e2c3ebacbb4f48307
+EBUILD colord-1.3.5.ebuild 4343 BLAKE2B 5ba2495eed05e6ed33f64d4c9565c0944d98256dfebb0bc90d12f7549101584ebc3638310d9f42c778e4a0ee435f2d35050d843f4c5bc1fc03aba71b3635043d SHA512 3f89274c4f2f416372664b4fb414aa91ce6505c07bc7f745b3085e41347f40da14919a9c335f131f3b87c177c9b5fb222d3789566e7444a63eae88aa0d8f0e57
 MISC metadata.xml 563 BLAKE2B b35a641da198a98fc9dc69dc0a49b0796060df467dfda31fa7cb1dab328a618e283f5ee9e05d7ad34742052e9441780b243f62f71329d88c1d93dfa83acc46a0 SHA512 e358961e8d31c2e9582d93875bdabe119e574b62d674e5b16028cccfa2e0604d39384fc2c5683aa343b9cf6d543f8fc35d2eef35662de43ea97fd0f50536df3a
diff --git a/x11-misc/colord/colord-1.3.5.ebuild b/x11-misc/colord/colord-1.3.5.ebuild
index 830e30340c16..d6c1e1ec1a85 100644
--- a/x11-misc/colord/colord-1.3.5.ebuild
+++ b/x11-misc/colord/colord-1.3.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.freedesktop.org/software/colord/releases/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0/2" # subslot = libcolord soname version
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 
 # We prefer policykit enabled by default, bug #448058
 IUSE="argyllcms examples extra-print-profiles +gusb +introspection +policykit scanner systemd +udev vala"
diff --git a/x11-misc/dex/Manifest b/x11-misc/dex/Manifest
index 2c46cf3dc683..9754f28a5e5d 100644
--- a/x11-misc/dex/Manifest
+++ b/x11-misc/dex/Manifest
@@ -1,5 +1,3 @@
-DIST dex-0.7.tar.gz 7679 BLAKE2B 7ebed8194158b273e8a0980f7070c615081052eef7ee2023784ce3123a2004b5e7dc402bead2f985d3a6898509f978404f8c093f668d74569577c7d7759ee121 SHA512 ee1f8c6ef0b374aadf6ad0ee6482bb23f740f67888994839c381b71b3655d0cbd7d3d5c99abe5f3bce856cb767a1b4bffdbcdf6c70969226b44a59ee76943bce
 DIST dex-0.8.0.tar.gz 8665 BLAKE2B de62557d207d257286cc706c07969b10b0d753b197333f1d24c0c0a22a897fb2e3c64a25f71770424e6cc365d028c9a1e994fcf35c68c96be7281d24ce19b1e3 SHA512 d87a7306b931736aa302dc883cbd9c635397eda2c119133a3ae8028869a4302ce3713b43cc85fdb2f804d1a74ab2499ef32a2680d5d6be039831006e617aa70a
-EBUILD dex-0.7.ebuild 644 BLAKE2B e233c3e290dcdb99af24aeff52ab2ebe7db416bd7bb34d04f93816559c92684ebf8ee51e2ccda6937d0ed7148161d095802dd616c474681eb1e97e628986b3a5 SHA512 b0636773607f2189154c9527ab710b3292925465af3b62c9ca2a46ee6d35cbb1080fbae2ee448440c83337126ba64f92c479dc3f7c59e66575968bef208844c1
-EBUILD dex-0.8.0.ebuild 753 BLAKE2B fef1e7dadb8839b799d538c3017efc6acf58ed0508b4d048f3b5396c3f8a2596b888c80f409698ce18e1dc612696384b824cebc0190316073ef8aef0aa0ee00c SHA512 b11274c611a4c39562738fb559ca3904f2e6e14a7b8f75c8ad9e5342888c0221f84e4ef49bd1b455f5ca2f7d6257d85aeea8ca0868efb6e798c3a1cb6d9b8629
+EBUILD dex-0.8.0.ebuild 763 BLAKE2B 9159afaba95e53084134031786cac984b5ad75c7a46efe9e6b8b4350de364ce619af5168f338bbf0ba99f7402b0b24cb5bdf0dfe5c94224c6541c29fbbdc2f32 SHA512 d2cea972aad67bbf2caf734072eaf52a88f3e7e8aa0e88cd79a9745fa763082378f6af379e5cbf3828537747558c90407768f2fcf0fb5e99af3dce104f867960
 MISC metadata.xml 320 BLAKE2B 13f35e27d7da69c6167f9187b75cf012fe33359467336f422478e113814b062bbbde0fe5bd4d25b3eac41cde9a45e55b61f912425049365e82afc0557371e818 SHA512 18ef7b2115ecf22f12afbeb064823e3cf2faba91730748d53fc182e557d5f1efa371fca86266fa58ce88d5c249785e2b6b6c9b29f7d504ac3867cebc55860fb6
diff --git a/x11-misc/dex/dex-0.7.ebuild b/x11-misc/dex/dex-0.7.ebuild
deleted file mode 100644
index e52e252fa36f..000000000000
--- a/x11-misc/dex/dex-0.7.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit eutils python-r1
-
-DESCRIPTION="DesktopEntry eXecution - tool to manage and launch autostart entries"
-HOMEPAGE="http://e-jc.de/"
-SRC_URI="https://github.com/jceb/dex/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch_user
-}
-
-src_install() {
-	dobin dex
-	python_replicate_script "${ED}/usr/bin/dex"
-	dodoc README
-	doman dex.1
-}
diff --git a/x11-misc/dex/dex-0.8.0.ebuild b/x11-misc/dex/dex-0.8.0.ebuild
index 5a6949640992..16346ce8b262 100644
--- a/x11-misc/dex/dex-0.8.0.ebuild
+++ b/x11-misc/dex/dex-0.8.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
 inherit python-r1
 
diff --git a/x11-misc/driconf/Manifest b/x11-misc/driconf/Manifest
deleted file mode 100644
index daad51ac057f..000000000000
--- a/x11-misc/driconf/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX driconf-0.9.1-desktop-menu.patch 334 BLAKE2B 9bd3c9a0b67041601fc6e70cbaad2ad54857ce8036a0eb863d29b98f3bce6e343048a716abc30a5c85a41ef8e9d5706a85f886c786079a08e4230a2dbde4879d SHA512 e5a752ea15a998b0a862a8db96008633d7fa23cbd51051b824bde4165c0258eabc9ab3ddde306596821dad7aba619219736e6f6c87e5b904eaea30dbddfa5bfc
-AUX driconf-0.9.1-driconf_simpleui.py.patch 395 BLAKE2B 562cbe46f21e3939332118db627b9b61c96b82aa73e29a2f446d9d7881fadf016dc7c5f6d29b1c2b74742ca4489146be46ae30d3d658b338611930fdd7732e49 SHA512 e1301471e5b2173b0bc55ad93b0df753ca74f0074afff8bf44a6da74e7060bbcfb53b9d294991bfcd81658f5594d1242ac61f0fde0d844729c1505991a1054c8
-AUX driconf-0.9.1-drop-old-tooltips.patch 2986 BLAKE2B 818180b465550d2cf312f518bd19def0cd0ca137210b51b96fbb831ee763e514aedf7fd4f6a5ca1c1d1a95db1eaf7b8b1763f900bad03553a1582926c345e7e3 SHA512 c2ac22f7c3ffffb07f2c996f8f2c88d4f4807d28334ff0992b40e2f8f13e22e902805852f996045474d3488e359bac49a97f10f970e8d1e5952e882a604d0847
-AUX driconf-0.9.1-glxinfo-unicode.patch 982 BLAKE2B 7e821a21b220f52bafff4d2209162cd6e8c7838d94e6ea3935652bca45e0842bdb77a115fdd7184604c2074a44ebea219aaaf3adbe22f5d84bab4d6c60f08d5d SHA512 b7e5711562cfe1bdc52f615dfab16e4861687c8861f1a3052f4279294cae5e14caea051b6db84142a2b182f5722d01d40592ea9b3e09240143f2d82866947560
-AUX driconf-0.9.1-update-toolbar-methods.patch 5337 BLAKE2B 32c0bde0d0688385ef7ded8301ed8370bee21281b3a473a703fd5940eaf47ebada2383ebbc280b4758a382ee10eba0bc9aae4d13650990cea39157412ceb39a8 SHA512 76edf7d171d11aba68ad0cc9114d90ea9637134288494729aefcfb09f7af4292aa7174df8551c3ed6d04e8cb8a04afca5ed2e0ebef117c24a540f2c7e7fa60c4
-DIST driconf-0.9.1.tar.gz 112529 BLAKE2B 05adc545bdc584c8569e7e139703c1c6726157cb00aa5c61355bdd8dabf49e3f7c4e1982ee34482259934d4593b86d66ae60d28238114a72bd7021abecdd3e6c SHA512 659c857fd490384cb807d6f909fcf6a0e64b9245597c43b14a793a65934f3df6ab30770b45a4180279ff9ef4b74bf7d5253a6560fcd8b15df35a76b795b6c369
-EBUILD driconf-0.9.1-r2.ebuild 1165 BLAKE2B 5ce0e8596e9e8dd556154e0ad58d4d2641a0febe021200b900cb20f28888146afe05f0a8d31190eaa096fc9cf52fa59fccc05d4086a733d6373793ee99747623 SHA512 b8c451a60137f8faaaef43b284c0bbf7ec0c06e14e533c88e5558a5f13bdbb9e3b40ec535d7daa48d2dd2e74ca3122ac2890e69dbb1b90dc56e7680019c66696
-MISC metadata.xml 234 BLAKE2B b45f6795dbd73dfcee2a68f93ec5460509b15a69401467bc8f4af9505eeb04a2aa35a2b144eb88781df4abd4e15d2b88fc728daf033c6d646762170ffb00b1a7 SHA512 fabcd59aeede4ac93d66552746edacc44fd565551aafaca67185aff7f8e6a4c0fa21f3d54e4fccd7def948ec57b90489631bd779fb992cd9322132b0a3aa503b
diff --git a/x11-misc/driconf/driconf-0.9.1-r2.ebuild b/x11-misc/driconf/driconf-0.9.1-r2.ebuild
deleted file mode 100644
index dd0e15240e8f..000000000000
--- a/x11-misc/driconf/driconf-0.9.1-r2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="driconf is a GTK+2 GUI configurator for DRI"
-HOMEPAGE="https://dri.freedesktop.org/wiki/DriConf"
-SRC_URI="https://freedesktop.org/~fxkuehl/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	x11-apps/xdriinfo"
-DEPEND="${RDEPEND}"
-
-DOCS=( CHANGELOG COPYING PKG-INFO README TODO )
-PATCHES=(
-	"${FILESDIR}"/${P}-glxinfo-unicode.patch
-	"${FILESDIR}"/${P}-update-toolbar-methods.patch
-	"${FILESDIR}"/${P}-driconf_simpleui.py.patch
-	"${FILESDIR}"/${P}-desktop-menu.patch
-	"${FILESDIR}"/${P}-drop-old-tooltips.patch
-)
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# Fix install locations which breaks location policy - Josh_B
-	sed -i \
-		-e 's:/usr/local:/usr:g' \
-		driconf \
-		driconf.desktop \
-		driconf.py \
-		setup.cfg \
-		setup.py \
-		|| die "Sed failed!"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	domenu driconf.desktop
-}
diff --git a/x11-misc/driconf/files/driconf-0.9.1-desktop-menu.patch b/x11-misc/driconf/files/driconf-0.9.1-desktop-menu.patch
deleted file mode 100644
index a8ca98412740..000000000000
--- a/x11-misc/driconf/files/driconf-0.9.1-desktop-menu.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/driconf.desktop	2006-09-18 04:41:45.000000000 +0300
-+++ b/driconf.desktop	2017-02-05 13:14:11.319444931 +0200
-@@ -5,5 +5,5 @@
- Exec=driconf
- Icon=/usr/local/share/driconf/driconf-icon.png
- Type=Application
--Categories=GNOME;Application;Settings;AdvancedSettings;
-+Categories=GNOME;Settings;HardwareSettings;
- StartupNotify=true
diff --git a/x11-misc/driconf/files/driconf-0.9.1-driconf_simpleui.py.patch b/x11-misc/driconf/files/driconf-0.9.1-driconf_simpleui.py.patch
deleted file mode 100644
index 71403cd7162e..000000000000
--- a/x11-misc/driconf/files/driconf-0.9.1-driconf_simpleui.py.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-http://cvs.fedoraproject.org/viewvc/rpms/driconf/devel/
-
---- a/driconf_simpleui.py
-+++ b/driconf_simpleui.py
-@@ -266,8 +266,8 @@
-                     j = i
-                     break
-                 i = i - 1
--            if i < chars/3:
--                i = chars
-+            else:
-+                i = j = chars
-             head, tail = head + tail[:i] + '\n', tail[j:]
-     return head
- 
-
diff --git a/x11-misc/driconf/files/driconf-0.9.1-drop-old-tooltips.patch b/x11-misc/driconf/files/driconf-0.9.1-drop-old-tooltips.patch
deleted file mode 100644
index 65291defb988..000000000000
--- a/x11-misc/driconf/files/driconf-0.9.1-drop-old-tooltips.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -ur driconf-0.9.1-old/driconf_commonui.py driconf-0.9.1/driconf_commonui.py
---- a/driconf_commonui.py	2006-09-18 04:03:43.000000000 +0200
-+++ b/driconf_commonui.py	2011-01-09 21:09:43.000000000 +0100
-@@ -299,8 +299,7 @@
-             self.label.set_active (page.app.options.has_key (opt.name))
-             self.label.set_sensitive (page.app.device.config.writable)
-             self.label.connect ("clicked", self.checkOpt)
--        tooltipString = str(opt)
--        page.tooltips.set_tip (self.label, tooltipString)
-+        self.label.set_tooltip_text (str(opt))
-         self.label.show()
-         page.table.attach (self.label, 0, 1, i, i+1,
-                            gtk.EXPAND|gtk.FILL, 0, 5, 5)
-@@ -316,10 +315,10 @@
-         self.resetButton.set_relief (gtk.RELIEF_NONE)
-         self.resetButton.set_sensitive (sensitive)
-         if removable:
--            page.tooltips.set_tip(self.resetButton, _("Remove"))
-+            self.resetButton.set_tooltip_text(_("Remove"))
-             self.resetButton.connect ("clicked", self.removeOpt)
-         else:
--            page.tooltips.set_tip(self.resetButton, _("Reset to default value"))
-+            self.resetButton.set_tooltip_text(_("Reset to default value"))
-             self.resetButton.connect ("clicked", self.resetOpt)
-         self.resetButton.show()
-         page.table.attach (self.resetButton, 2, 3, i, i+1, 0, 0, 5, 5)
-@@ -510,7 +509,6 @@
-         self.optSection = optSection
-         self.app = app
-         self.simple = simple
--        self.tooltips = gtk.Tooltips()
-         self.table = gtk.Table (len(optSection.optList), 3)
-         self.optLines = []
-         for i in range (len(optSection.optList)):
-diff -ur driconf-0.9.1-old/driconf_complexui.py driconf-0.9.1/driconf_complexui.py
---- a/driconf_complexui.py	2006-09-18 02:53:44.000000000 +0200
-+++ b/driconf_complexui.py	2011-01-09 21:10:29.000000000 +0100
-@@ -41,11 +41,10 @@
-         self.set_label_widget (frameLabel)
-         self.driver = driver
-         self.app = app
--        tooltips = gtk.Tooltips()
-         table = gtk.Table(2, 2)
-         self.execCheck = WrappingCheckButton (_("Apply only to this executable"))
-         self.execCheck.set_sensitive (app.device.config.writable)
--        tooltips.set_tip (self.execCheck, _(
-+        self.execCheck.set_tooltip_text (_(
-             "Leave this disabled to configure all applications.\n"
-             "Beware that some applications or games are just a shell script "
-             "that starts a real executable with a different name."))
-diff -ur driconf-0.9.1-old/driconf_simpleui.py driconf-0.9.1/driconf_simpleui.py
---- a/driconf_simpleui.py	2006-09-18 02:49:54.000000000 +0200
-+++ b/driconf_simpleui.py	2011-01-09 21:10:51.000000000 +0100
-@@ -342,7 +342,6 @@
-         self.set_policy (gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
-         self.driver = driver
-         self.app = app
--        self.tooltips = gtk.Tooltips()
-         self.table = None
-         self.refreshOptions()
- 
diff --git a/x11-misc/driconf/files/driconf-0.9.1-glxinfo-unicode.patch b/x11-misc/driconf/files/driconf-0.9.1-glxinfo-unicode.patch
deleted file mode 100644
index 2df25d5ecc23..000000000000
--- a/x11-misc/driconf/files/driconf-0.9.1-glxinfo-unicode.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-http://cvs.fedoraproject.org/viewvc/rpms/driconf/devel/
-
---- a/driconf_simpleui.py
-+++ b/driconf_simpleui.py
-@@ -450,11 +450,13 @@ class MainWindow (gtk.Window):
-         else:
-             screen = self.screens[0]
-             if screen.glxInfo:
--                text = "%s (%s)" % (
--                    screen.glxInfo.renderer, screen.glxInfo.vendor)
-+                text = u"%s (%s)" % (
-+                    unicode(screen.glxInfo.renderer, "utf-8", "replace"),
-+                    unicode(screen.glxInfo.vendor, "utf-8", "replace"))
-             else:
--                text = _("Screen") + " %d: %s" % (
--                    screen.num, screen.driver.name.capitalize())
-+                text = _(u"Screen") + u" %d: %s" % (screen.num,
-+                    unicode(screen.driver.name, "utf-8",
-+                        "replace").capitalize())
-             deviceHBox = gtk.HBox()
-             deviceLabel = gtk.Label()
-             deviceLabel.set_justify(gtk.JUSTIFY_LEFT)
diff --git a/x11-misc/driconf/files/driconf-0.9.1-update-toolbar-methods.patch b/x11-misc/driconf/files/driconf-0.9.1-update-toolbar-methods.patch
deleted file mode 100644
index 294c262d465c..000000000000
--- a/x11-misc/driconf/files/driconf-0.9.1-update-toolbar-methods.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-http://cvs.fedoraproject.org/viewvc/rpms/driconf/devel/
-
---- a/driconf_complexui.py
-+++ b/driconf_complexui.py
-@@ -838,42 +838,73 @@ class MainWindow (gtk.Window):
-         self.paned.show()
-         self.toolbar = gtk.Toolbar ()
-         iconSize = self.toolbar.get_icon_size()
--        self.saveButton = self.toolbar.insert_stock (
--            "gtk-save", _("Save selected configuration file"),
--            "priv", self.configTree.saveConfig, None, -1)
--        self.reloadButton = self.toolbar.insert_stock (
--            "gtk-revert-to-saved", _("Reload selected configuration file"),
--            "priv", self.configTree.reloadConfig, None, -1)
--        self.toolbar.append_space()
--        self.newButton = self.toolbar.insert_stock (
--            "gtk-new", _("Create a new device or application"),
--            "priv", self.configTree.newItem, None, -1)
--        self.removeButton = self.toolbar.insert_stock (
--            "gtk-delete", _("Remove selected device or application"),
--            "priv", self.configTree.removeItem, None, -1)
--        self.upButton = self.toolbar.insert_stock (
--            "gtk-go-up", _("Move selected item up"),
--            "priv", self.configTree.moveUp, None, -1)
--        self.downButton = self.toolbar.insert_stock (
--            "gtk-go-down", _("Move selected item down"),
--            "priv", self.configTree.moveDown, None, -1)
--        self.propertiesButton = self.toolbar.insert_stock (
--            "gtk-properties", _("Properties of selected device or application"),
--            "priv", self.configTree.properties, None, -1)
--        self.toolbar.append_space()
-+
-+        self.saveButton = gtk.ToolButton("gtk-save")
-+        self.saveButton.set_tooltip_text(_("Save selected configuration file"))
-+        self.saveButton.connect("clicked", self.configTree.saveConfig)
-+        self.saveButton.show()
-+        self.toolbar.insert(self.saveButton, -1)
-+        self.reloadButton = gtk.ToolButton("gtk-revert-to-saved")
-+        self.reloadButton.set_tooltip_text(_("Reload selected configuration file"))
-+        self.reloadButton.connect("clicked", self.configTree.reloadConfig)
-+        self.reloadButton.show()
-+        self.toolbar.insert(self.reloadButton, -1)
-+
-+        separator = gtk.SeparatorToolItem()
-+        separator.show()
-+        self.toolbar.insert(separator, -1)
-+
-+        self.newButton = gtk.ToolButton("gtk-new")
-+        self.newButton.set_tooltip_text(_("Create a new device or application"))
-+        self.newButton.connect("clicked", self.configTree.newItem)
-+        self.newButton.show()
-+        self.toolbar.insert(self.newButton, -1)
-+        self.removeButton = gtk.ToolButton("gtk-delete")
-+        self.removeButton.set_tooltip_text(_("Remove selected device or application"))
-+        self.removeButton.connect("clicked", self.configTree.removeItem)
-+        self.removeButton.show()
-+        self.toolbar.insert(self.removeButton, -1)
-+        self.upButton = gtk.ToolButton("gtk-go-up")
-+        self.upButton.set_tooltip_text(_("Move selected item up"))
-+        self.upButton.connect("clicked", self.configTree.moveUp)
-+        self.upButton.show()
-+        self.toolbar.insert(self.upButton, -1)
-+        self.downButton = gtk.ToolButton("gtk-go-down")
-+        self.downButton.set_tooltip_text(_("Move selected item down"))
-+        self.downButton.connect("clicked", self.configTree.moveDown)
-+        self.downButton.show()
-+        self.toolbar.insert(self.downButton, -1)
-+        self.propertiesButton = gtk.ToolButton("gtk-properties")
-+        self.propertiesButton.set_tooltip_text(_("Properties of selected device or application"))
-+        self.propertiesButton.connect("clicked", self.configTree.properties)
-+        self.propertiesButton.show()
-+        self.toolbar.insert(self.propertiesButton, -1)
-+
-+        separator = gtk.SeparatorToolItem()
-+        separator.show()
-+        self.toolbar.insert(separator, -1)
-+
-         # The gtk-about stock item is available with gtk >= 2.6.
-         # It's definitely not available with gtk 2.2. Not sure about 2.4.
-         if gtk.gtk_version[0] == 2 and gtk.gtk_version[1] < 6:
-             aboutStock = "gtk-dialog-info"
-         else:
-             aboutStock = "gtk-about"
--        self.aboutButton = self.toolbar.insert_stock (
--            aboutStock, _("About DRIconf"), "priv",
--            self.aboutHandler, None, -1)
--        self.toolbar.append_space()
--        self.exitButton = self.toolbar.insert_stock (
--            "gtk-quit", _("Exit DRIconf"), "priv",
--            self.exitHandler, None, -1)
-+        self.aboutButton = gtk.ToolButton(aboutStock)
-+        self.aboutButton.set_tooltip_text(_("About DRIconf"))
-+        self.aboutButton.connect("clicked", self.aboutHandler)
-+        self.aboutButton.show()
-+        self.toolbar.insert(self.aboutButton, -1)
-+
-+        separator = gtk.SeparatorToolItem()
-+        separator.show()
-+        self.toolbar.insert(separator, -1)
-+
-+        self.exitButton = gtk.ToolButton("gtk-quit")
-+        self.exitButton.set_tooltip_text(_("Exit DRIconf"))
-+        self.exitButton.connect("clicked", self.exitHandler)
-+        self.exitButton.show()
-+        self.toolbar.insert(self.exitButton, -1)
-         if len(configList) != 0:
-             self.activateConfigButtons (configList[0])
-         self.toolbar.show()
diff --git a/x11-misc/driconf/metadata.xml b/x11-misc/driconf/metadata.xml
deleted file mode 100644
index 7a7bbf810544..000000000000
--- a/x11-misc/driconf/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>x11@gentoo.org</email>
-		<name>X11</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/x11-misc/efax-gtk/Manifest b/x11-misc/efax-gtk/Manifest
index 014e9f3f4435..c2cc67ce802f 100644
--- a/x11-misc/efax-gtk/Manifest
+++ b/x11-misc/efax-gtk/Manifest
@@ -1,7 +1,9 @@
 AUX efax-gtk-3.2.13-fno-common.patch 890 BLAKE2B b21b9e622b33f0691b5cb5d32deaa2beb9b86720b9c41f34f68080a5347066942e34c8cd62d867b182a0b6199304b226ca406b6edade3d74fd5c998c8bb44f90 SHA512 723713ba260ecf77886a5888ed28f3eae48f26461c178787707a888bf910e9bf238256816c659cb9534f0765cc056cc5dd15581d905435ba7d778488e189ead8
 DIST efax-gtk-3.2.13.src.tgz 1245015 BLAKE2B 3de1e6eb75173d1fb8901e648ba98dee847f1c4171dfdb4cb8b3eb31094b44a736f4b34a988ff95011323a31db39d75135be2959c44d0f20ea0e219a8c652aaf SHA512 dde0f79df444bdaf5250eae1dc0a94184c0b32e319b04943e81178d2a744bb6e387b5aa0f2379bd23dd4c18d28c30c60083c0cda5819e5c853c1b7bdc4f5b64f
+DIST efax-gtk-3.2.14.src.tgz 1241132 BLAKE2B 8907907681076d9238219a42c7a490f15b988019be2dd291131fd48122421f8f9476ae59f4832395ff56c44b0981490f3c38c49df643dbc1125f33e735392bbf SHA512 28e0814c209c4c398a27b4f421b0902942fb2088e94d992c344093d755a74176cedce2912ad6f5c0a21fde1fc57acd8c5bb97bd98c42b76bdf2ab1b5919a595e
 DIST efax-gtk-3.2.9.src.tgz 1176921 BLAKE2B 327ee205a747bc6f3909143b79ae9754009bb29ca35a755581d7a1a6604a76deb0b17ae9c3a679652d2216668c540e2074432c88bb31ef5322d9723c8382fa2f SHA512 a2a4a648b95f9143f8ad3b42c3f8f86323a2b312fed87616eddeaebe06742a5a4ae841d79f3078bf9e819288252ad4d79ec429a66116c1d2b8df8a8a13cac806
 EBUILD efax-gtk-3.2.13-r1.ebuild 1201 BLAKE2B 692c8484abf6af95bcb7c993ff17dfe30a7b365930ee5d127e17614c855ad17eeab53a92ede35caf1cbb7e2a8bb337427696267a85a526d24ebc482099a1c627 SHA512 7ff07a8547d5d9acd71423234b4723eb5f6a22b580ee6fd4df94609a1f43ad8b3785b94df7bb5f9cc82966abc84ae01affc0aa1c7827ed07f2fc28125238475e
 EBUILD efax-gtk-3.2.13.ebuild 1194 BLAKE2B aaa54409f108bac119cfd54b839303af902ddeb7b429891627906b2ea895865c8e91ef86b00d18995d3be5eac1994ee63a36d2b402ac20e68fdc5bb4914db68d SHA512 abd4f161dca129c2ce5a23b84eb0cd4b6db310e31e5925f3d3f3e4606cc5f8a937e7f5ca903ac67b3688e6f9289d10294989e8195806a5917a39473c5d18299b
+EBUILD efax-gtk-3.2.14.ebuild 1201 BLAKE2B 692c8484abf6af95bcb7c993ff17dfe30a7b365930ee5d127e17614c855ad17eeab53a92ede35caf1cbb7e2a8bb337427696267a85a526d24ebc482099a1c627 SHA512 7ff07a8547d5d9acd71423234b4723eb5f6a22b580ee6fd4df94609a1f43ad8b3785b94df7bb5f9cc82966abc84ae01affc0aa1c7827ed07f2fc28125238475e
 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
new file mode 100644
index 000000000000..226321974658
--- /dev/null
+++ b/x11-misc/efax-gtk/efax-gtk-3.2.14.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+
+RDEPEND="
+	>=dev-libs/glib-2.10
+	media-libs/tiff:0=
+	x11-libs/libX11
+	x11-libs/c++-gtk-utils:0[gtk]
+	x11-libs/gtk+:3
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/gettext
+"
+
+DOCS="AUTHORS BUGS ChangeLog README"
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.2.13-fno-common.patch
+)
+
+src_prepare() {
+	default
+	# 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 '/^Categories/s:Office;::' \
+		${PN}.desktop || die
+}
+
+src_configure() {
+	econf \
+		--with-gtk-version=gtk3
+}
+
+src_install() {
+	default
+	# File collision with net-misc/efax wrt #401221
+	mv "${ED}"/usr/share/man/man1/efax{,-0.9a}.1 || die
+	mv "${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/fbdesk/Manifest b/x11-misc/fbdesk/Manifest
index e72e0693eed6..03fc7fe217bd 100644
--- a/x11-misc/fbdesk/Manifest
+++ b/x11-misc/fbdesk/Manifest
@@ -3,5 +3,5 @@ AUX fbdesk-1.4.1-gcc-4.3.patch 2703 BLAKE2B b18c8e47816715c9b48d34d2457649ca22a1
 AUX fbdesk-1.4.1-libpng14.patch 264 BLAKE2B 8a1a00adb1dda5800616f41ba1b983cfa1ac8b41177a1e26cda3cc8f98ed6d69288a923602cdde0b2cfd95d6be0d2ad03b78d26fbcee75c9e4f2f3a9394925ea SHA512 64ec6f394b63461955489ae44dd63a10a76050261ecda7e121bc62c65aa938c0db18911969520c2836d347b6bc765c3f1004085b42cea1c61900db49a0501cf2
 AUX fbdesk-1.4.1-libpng15.patch 5827 BLAKE2B 8a9b6bb10c50de3fee5f86d7a02710a8bca70cc937b29808386a4ce8a4cab9a2cd564fe1f2c6ae9850a41b4e2d5d048f1b9d7f0e97254f8c08323eacfbda2b0f SHA512 4d46b5acb6998069e9a2eac30c1765b315e2c8f03a7b52b1b99e3ebdb9fa35040ed0937347d92b7df2b7aec101e0bf7bfa38cb77ee28dcaa2f755fc6347bf25b
 DIST fbdesk-1.4.1.tar.gz 426550 BLAKE2B cb83e81c3a25df5f608cb6112552bc11f9b51539ce60b488b35f0eb618482a325e0613965393e417d85f25bbc2a4c11d1a09207b89a08fbb2140f427ee246186 SHA512 0a99ae062442f85a9d4018db0f2815c0e537488999e71aef18eb3df09526e2b9c931e5caf30bb0cf484ddce28c3fc3672773fbf576e3f932f30ee48c89b346a0
-EBUILD fbdesk-1.4.1.ebuild 795 BLAKE2B ca3b39d4a234980bb72b5c9d3145c75cc2fe7009d13d47a22aac5b555716ae32915a2df011f4d7f687254df140cac5e3aba36526bb25f8650e8714241c88122c SHA512 64ae9ce835181a877bf93772753657befdd339c2cf8ef41417011260e94e34cab1a045e407d6bbc2fd93d2dad61605e2c03a51dac4244ec32c1cbbf825447d1a
+EBUILD fbdesk-1.4.1.ebuild 796 BLAKE2B 08578071c7eb161218fa33f0842501f93e205c39a278e647dde8097cf44dddf4eb5df4b47d99a6022d88e605f5ed69f1a69ba1955245e037773f79a1bc1eeb47 SHA512 08aa13a925e573b3fe922655545d8f447b0e182843db451f711097883b985d22ffa624e08f17d92706b468130ef7e0598384e9842e2955c28a7ec3f0d5323559
 MISC metadata.xml 244 BLAKE2B c29b82b69ee832a577a8f60b3bed7a54ad4cfa9102913a2c29816b7d79ea3814ec51349fe77f7e87c5ce4635a69856309f7ef521dcad844d162c511d85f2f3b5 SHA512 f73008962558d828dfc4cb3bb24c36e1c28cfa47a679117b292cf378eb73f8750bb7f345928e9d149a648ba708f721ebc6ff2369405e842bb27194aa7a775e9c
diff --git a/x11-misc/fbdesk/fbdesk-1.4.1.ebuild b/x11-misc/fbdesk/fbdesk-1.4.1.ebuild
index 6f6b0d17eab1..8676ac0f523f 100644
--- a/x11-misc/fbdesk/fbdesk-1.4.1.ebuild
+++ b/x11-misc/fbdesk/fbdesk-1.4.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ia64 ppc sparc x86"
+KEYWORDS="amd64 ~ia64 ppc sparc x86"
 IUSE="debug png"
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-misc/gccmakedep/Manifest b/x11-misc/gccmakedep/Manifest
index c2e0deb0cd9f..d9456bbac4a1 100644
--- a/x11-misc/gccmakedep/Manifest
+++ b/x11-misc/gccmakedep/Manifest
@@ -1,4 +1,4 @@
 DIST gccmakedep-1.0.3.tar.bz2 104766 BLAKE2B 4da8c3d4423f55fa110b1be748e9488b713a36b575f065f58d68c24eb4fdfc337aa9c715b82dfaac6eaaf8cb2037ab4d0355297a61c39f7e7672f136bb1395d8 SHA512 563b2897770a4df2792ea3eae8183a1f9e78192b7efc9c8296ee68d1cba6e72fa962a88e3251bb780df776e2aa7e80d74d5096675c61526c232aefa4f9e6a5fc
-EBUILD gccmakedep-1.0.3-r1.ebuild 974 BLAKE2B 78d4ebf672ce31803d4cee730f2127c0ab496e7c28faf41c5395913f4e6c27df2b347f99c9ea590bd24ae7f82c559f91392873de6f6a91b59112aeadd2b4b423 SHA512 f988c412b923b693c4dd17afa079aac01c4d3a3c6ae362ea17476dc3a1395c033547422a72d6e3ae42c6c74904c9644b50009859dbaf32b47f74ad25ea75bb4d
-EBUILD gccmakedep-9999.ebuild 983 BLAKE2B 61da2435abe08bf6c47a57b2f6405b2c31fe2cb89ae58179a4abeb5520f382e81141032624dceaaf28d0fe9140c14a0fd616e1015c3e8f183e64d8a8281ffc1a SHA512 7f611f405a342884af259517e430d3aecfd1ba34b436e3109d13c709aff661899ca039cac6c85b6a627d3a620cfc44f3da0e0108107705218690a5b2818e30c4
+EBUILD gccmakedep-1.0.3-r1.ebuild 971 BLAKE2B 143e0e6e9489717c5e10302a7922c43377f0b9215889510c39a24754871a1e7cbb8da312add86dfe85d38b57bbd345390de101fad6a5d396d80d2bb77bc21c76 SHA512 3d241612014c009043639966eb781a1ac8920c1a664c74bc0f7aed4df1edd7e19240cb67b28c1c165756c85041151b100b63fa48ce5acc5066d631c11d59d96e
+EBUILD gccmakedep-9999.ebuild 979 BLAKE2B 74df3fa9178b636374be308904d13dad561253bf205b38537d00ece1a41411fe3672bfe68dde4b806195effb37f1bef4f3fa249993633bdc3413cee28a661de2 SHA512 06efe886a9c966418df5a2d93dba7479158c1e59b8c33f88716588ce8ac2a6ebfac7a1087f060aef999895e04edc730773c9a3cbff90276ba7f5f838606fb6b7
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/gccmakedep/gccmakedep-1.0.3-r1.ebuild b/x11-misc/gccmakedep/gccmakedep-1.0.3-r1.ebuild
index 06f2a1ca64d2..633115b67ad5 100644
--- a/x11-misc/gccmakedep/gccmakedep-1.0.3-r1.ebuild
+++ b/x11-misc/gccmakedep/gccmakedep-1.0.3-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
 else
 	SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-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 ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/x11-misc/gccmakedep/gccmakedep-9999.ebuild b/x11-misc/gccmakedep/gccmakedep-9999.ebuild
index f973a69d1557..667579e11771 100644
--- a/x11-misc/gccmakedep/gccmakedep-9999.ebuild
+++ b/x11-misc/gccmakedep/gccmakedep-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
 else
 	SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-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 ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/x11-misc/gigolo/Manifest b/x11-misc/gigolo/Manifest
index 246cbc30d6bb..af0b7e84e5d9 100644
--- a/x11-misc/gigolo/Manifest
+++ b/x11-misc/gigolo/Manifest
@@ -1,3 +1,5 @@
 DIST gigolo-0.5.0.tar.bz2 246473 BLAKE2B 23459a57467fefcc13c61483397837da51294fe7945619e0580b034dac14da192acb349b2334669f35ec43e1e421664b1765fb1e51164d7dca76769f27cef075 SHA512 5f33f24169c2a8e3a450926668e4611aa0a9c669edb6ef6e53bccd77228ac78b40c4916eb4a20afcd9d5d7e32373e8f13fd1cf43366e65166a9ef09366c9703b
+DIST gigolo-0.5.1.tar.bz2 246788 BLAKE2B 524307017a5d07107ded81af71e7758c60538abec2e75e5ab4e4f3c57ff82ea557e6f7b009ecbd6d7cd42fdf8fe8a8872ff973fc5051753dcc70341fee953bc5 SHA512 a21e2e808db4a16b7bcd9019e936cac57f67a76d6a9a9e34ed3eb7faa4cd5997bc561d1e9817d8e77efbf8ab0a954bc7f25719941672f604cc415caf0cb61e09
 EBUILD gigolo-0.5.0.ebuild 702 BLAKE2B c05d352b9fba57108decb65c9a05c2d6ae8fc147dd1d5007f6b76fba846d114ef5ba6a012d01de013792071ad2a530acde7effeb6e0013eb75dbb9a6fe27e709 SHA512 62df9d4fc278e42ca269679bc375aba360f4ef231008f7f1cb4aef2e0275e061056fc331dcc3b3155bffa5e8ba9f7c972842cc1c76cf0d9896bb2a96fc0ceaaa
+EBUILD gigolo-0.5.1.ebuild 704 BLAKE2B 78ea1385b9d8d677c28027cc541cc57717604f45c5af1b8b9418201752a5e758931db0e99256338c041b43c503dbabd53eff878322e62b83df5163f524685f75 SHA512 2d867f626a72f9fa0645c16fa0b3d339fdeca6fffb641a95fee08456a5d067b76520e5a54061770427938fabcfb61332151dfaa45ac1cd44525ad15640d092a1
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/x11-misc/gigolo/gigolo-0.5.1.ebuild b/x11-misc/gigolo/gigolo-0.5.1.ebuild
new file mode 100644
index 000000000000..227fa91f3625
--- /dev/null
+++ b/x11-misc/gigolo/gigolo-0.5.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-utils
+
+DESCRIPTION="a frontend to easily manage connections to remote filesystems using GIO/GVfs"
+HOMEPAGE="https://www.uvena.de/gigolo/ https://goodies.xfce.org/projects/applications/gigolo"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.16
+	>=x11-libs/gtk+-3.14:3"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig"
+
+src_prepare() {
+	rm COPYING || die
+	default
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/x11-misc/googsystray/Manifest b/x11-misc/googsystray/Manifest
deleted file mode 100644
index f154abd66997..000000000000
--- a/x11-misc/googsystray/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST googsystray-1.3.1.tar.gz 1000034 BLAKE2B d5410fa1b8fcad0713e2ced85472703a22bd4a93658762f2d5af00bd395fd7ced6486f2c061d46ef949144b423788d8e09104c2d46765abe090c2eabca618b47 SHA512 607bfe5f062ef35356429ad69b44020947fa31cf95bb9e4ef985176b83bdc75a40da470f146c0a5ed1835bbd08241d242966372032ce64d322a48a5413fa8568
-EBUILD googsystray-1.3.1-r1.ebuild 482 BLAKE2B 07ac613e4034b136fffa32a6f95882b2a3118454e3c17045fd97556caef76bea944d4577ad28e8c23b4ad235cc894a1aaab7c3f24149d331bc629e0223c6ee1e SHA512 b73cf355611fa4b723d3f8c7772bb7b01f33e74867de32f30eb772ef48b66006a528a4b65a4673d2615a5f638f2729e6ae498140e4041d10ba3ddd04adad1de8
-MISC metadata.xml 248 BLAKE2B cfae9580ed433c7566b5e1bdd5b8d6712b4f0185acd62f9c94a0739dc3fa683b4ed3ff2b9978de00e03feeaf59544d3c1a6b90ec0fe63d19cbc8a4eb6d928e87 SHA512 38396ec3bb90c02ef96e57b5a5e826d0ec890d7301308efe37288113a7906485e156ca5776459708ce2e28709ba8ff93841d8201a9f4810377888a533193c741
diff --git a/x11-misc/googsystray/googsystray-1.3.1-r1.ebuild b/x11-misc/googsystray/googsystray-1.3.1-r1.ebuild
deleted file mode 100644
index 9886a643050e..000000000000
--- a/x11-misc/googsystray/googsystray-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="System tray application for Google Voice, GMail, Calendar, Reader, and Wave"
-HOMEPAGE="http://googsystray.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-python/pygtk-2.14[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
diff --git a/x11-misc/googsystray/metadata.xml b/x11-misc/googsystray/metadata.xml
deleted file mode 100644
index 105a6c46eacd..000000000000
--- a/x11-misc/googsystray/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">googsystray</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/x11-misc/grub2-theme-preview/Manifest b/x11-misc/grub2-theme-preview/Manifest
index 29113f95c1a6..ee63fbd04c26 100644
--- a/x11-misc/grub2-theme-preview/Manifest
+++ b/x11-misc/grub2-theme-preview/Manifest
@@ -1,5 +1,7 @@
 DIST grub2-theme-preview-1.3.1.tar.gz 5064 BLAKE2B 4d67058eb725e6a9a65d9fc1ce6bccabf34bdf8215446a6aeab5f537a05b5e402030f1cc32c6e2d722f9c4a2b189e4db410a2f4a4d82306e6c039b771796b3a9 SHA512 69aed10a2612ea442a94748d3491c2300c83aafd4650dd54e520572c809c7ca3890ff3be42eeff7684ecbbfff425b3f44a651e01b5c682a1d0dc792b33b713fb
 DIST grub2-theme-preview-1.3.2.tar.gz 5486 BLAKE2B ed7e29da586bfe4388dab1b8467aa265b11e6ff9a6ad0890d27c0c4b45ec3615f08a8f1bb5a5d00015dfa83e6dd3a7c718039b9fd398e76211c4f8bda2c8f2bb SHA512 f53c1c5bac1874e8feb70619b3d65505bd083966ac9427ea36de7b218bfc068e52cfd58ffa8cc32f06974e5dcaa3581792301228f7bd56dcbf2ff01373b96885
+DIST grub2-theme-preview-1.4.1.tar.gz 197390 BLAKE2B 166d23a97036e0f6054d2d9d9c6a372769a3d4de5aad76ff1949e860064d891ffb331b6690dfb1395a521468349fc31ffa23c2fd34e5dee6ed1657a546470d00 SHA512 5ff9abad4ab0d60f12affef015e957b0e03ab19eb76addeef9d048264baa20e85c67584fa6f4b9e70c700e8b394fd6be5710c7e5588b185bd660101f4c124ce2
 EBUILD grub2-theme-preview-1.3.1.ebuild 521 BLAKE2B 2bef3ecf893d1f272f126c31686206f3a9f1bf8c9ffcb9207e78ff278d27ec0c6e0279cdc6d11eeb6a42d58561e6306cf664575227b9cc2732b7cff21706daff SHA512 5f3b48e65568400f886938085ee8b55fbb274c13148f327b10ead372584f697c7047b5748661b9d0be46be2c2abdc4c161e34c58c16c8b6de8bdbe1fd8b58878
 EBUILD grub2-theme-preview-1.3.2.ebuild 521 BLAKE2B 3c69bdb85f4ae7bdda2d1064354a7ad176a73753b165cc80997747611919ec273975f0ca6a429cbf7d0c3de9759301d6df9ac54f622f8bf61704fdf33402c588 SHA512 c106a58ddcc8965436b03210eb63322f2a760fcf2269cb53ddd34153001cba91345408766f823da67ed04a53a477ff1f22aef9df197f9221113f54f2fe10ff30
+EBUILD grub2-theme-preview-1.4.1.ebuild 558 BLAKE2B 317dbdc198362cc346ffec5e7bf1e40fd6c878f045e30979c572f0bff1ee49dfeb2a1c189c5a081a8fac7e074cd5b186af57ecc6a41cf333b6b431321d5566f0 SHA512 13b78b3eb848220ca63b40ac1749473a8642d8af0b97a2e4d6868b063045db533bccd3b9c9af982677407118ad41675a355d0f811c48ea66e5fff40b4454422e
 MISC metadata.xml 342 BLAKE2B b12306a165fac0714ee6a833ed2b8de2a5f598e36e38e42e521b10d5d432e980d0673266b571986d851b2be319520c020b8fba860c4cd6c28d76a8f3e72ec811 SHA512 3577ddbd08dfb9a7c5f35a5e6b102620985a932cef550f48c32298f44864c385e7fcedda171107285452d242dd3e03f60a3e6bce8c814e933cf35388e942f35f
diff --git a/x11-misc/grub2-theme-preview/grub2-theme-preview-1.4.1.ebuild b/x11-misc/grub2-theme-preview/grub2-theme-preview-1.4.1.ebuild
new file mode 100644
index 000000000000..87db4a2d4a93
--- /dev/null
+++ b/x11-misc/grub2-theme-preview/grub2-theme-preview-1.4.1.ebuild
@@ -0,0 +1,23 @@
+# 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=""
+
+RDEPEND="app-emulation/qemu
+	dev-libs/libisoburn
+	sys-fs/mtools
+	sys-boot/grub:2[grub_platforms_pc]"
diff --git a/x11-misc/i3blocks/Manifest b/x11-misc/i3blocks/Manifest
index 4f839f50c625..c677ba9f6557 100644
--- a/x11-misc/i3blocks/Manifest
+++ b/x11-misc/i3blocks/Manifest
@@ -1,4 +1,7 @@
 AUX i3blocks-default-sysconfdir.patch 373 BLAKE2B 4483b6c4e838559997acff86c46a879206decc0e834bd92cf8573eab28f5ce3ec74f186ce53fe3e2a69f8e7006265ce956f677470828f8b3e1bc40b5ab925abe SHA512 db974877a1eadb1b37279dd4e4159b47947958f688aed94dd3e3c49457a94a0e5d803f221dc7a160ed2cfdc915399892d010a1083a49a7ba7a53d49572c16554
+AUX i3blocks-disable-bash-completion.patch 468 BLAKE2B f4a2777bfb42468abaa79762470f871848f76e252de030792a8365656ba683095eb90c95c9f45ab4e250877bade39ee9a89acc067799138b08ac565661af46bb SHA512 cdb9cdf0103d7609f67ec7df80b725e32dc88a90d8b964d2da6d257e2bb3c67ab5a5a7fd99253c713535860752c52741e97982b4b862e88f99ba0bc634eb23b4
 DIST i3blocks-1.4.tar.gz 35943 BLAKE2B 84c1d08d173238ecd875254015dc78cb560cefb1eb11d9628dc8572fb44f9724927e622aecc9888c43fdc435df8b07f6b07e22c4543354edb2d92cc8d5d00321 SHA512 f04fd68d59097b21bc88f3097dff137de656dd3fa696d9c04b987ba25136e5e5d9cacb63998e8635fe55fcf94f47900aec8c79d98e1d1d8847856a89ad9a6578
+DIST i3blocks-1.5.tar.gz 66019 BLAKE2B 0378dac61d2f0049dffefe2a3f98512518aef311f2d9d79b72fd9882834c6a09c8954e7ca906fb96bbcc76992288fe659b4977f2cfad1234dca27ec9131ac720 SHA512 759829d59f94070251378d437891c2df05715fbd0b734c34dd41767d61957f301c6125b0058668295b8eeac29038fae6b2e8c194f903398ee736662213d1d534
 EBUILD i3blocks-1.4-r1.ebuild 772 BLAKE2B 20d48a2f984aade294280830ede7f6cdfe79b86b34cd269762896827648af0c5cc3e848ab9607bf140ba1600b5c5c324f4d50ffa4bbd931aebbaa67ea49480c0 SHA512 518be7c571700a5f1a10c7f19e79c66747adefa54535eb7a884a31a15cb61c41051fb9f7c9b31a327bfe05bb0817beabb837df6eead4bb71b1f22a3a73681a78
+EBUILD i3blocks-1.5.ebuild 701 BLAKE2B d97e08f64db12c186492425e295c9965e751bce21bae83939cd0f2f012f87bd20bf9410dc3cb08f0a0cdb0d52ccd23f56cd67dcd29a1f82fd1a7771232c3e39e SHA512 c7c2e8d056b83ebcf2212610f92e72ec82036a2ab42cd2072c9f00fd261b958df050bbaa15d1fe7ac021bd23787140e467b4cdc9f5b69e5aabf0d9d9cbf4aa3c
 MISC metadata.xml 331 BLAKE2B 4e906b5d485968ff9cc55dca82cbd704cc57a5ecf77c230bb7fd6e2a910c236bc0afa1d457f4b90b758ca5ecba0b2505512fc21f7dd12179d2b275d425430a14 SHA512 2191950260e909fd05a03d80a1f9ccde802e4e3ab890a2e05305f2e3e1c48e4c56200fddc9019b630a9efeaeac92509910e1f9b22f1a2ce85a8d005930cd05af
diff --git a/x11-misc/i3blocks/files/i3blocks-disable-bash-completion.patch b/x11-misc/i3blocks/files/i3blocks-disable-bash-completion.patch
new file mode 100644
index 000000000000..bfca548e06f1
--- /dev/null
+++ b/x11-misc/i3blocks/files/i3blocks-disable-bash-completion.patch
@@ -0,0 +1,17 @@
+--- a/Makefile.am	2019-10-20 22:46:55.603462157 +0200
++++ b/Makefile.am	2019-10-20 22:47:29.893461028 +0200
+@@ -29,14 +29,3 @@
+ 
+ dist_sysconf_DATA = \
+ 	i3blocks.conf
+-
+-if ENABLE_BASH_COMPLETION
+-bashcompletiondir = $(BASH_COMPLETION_DIR)
+-bashcompletion_DATA = bash-completion
+-
+-install-data-local:
+-	( cd '$(DESTDIR)$(BASH_COMPLETION_DIR)' && mv bash-completion i3blocks )
+-
+-uninstall-local:
+-	( cd '$(DESTDIR)$(BASH_COMPLETION_DIR)' && rm -rf i3blocks )
+-endif
diff --git a/x11-misc/i3blocks/i3blocks-1.5.ebuild b/x11-misc/i3blocks/i3blocks-1.5.ebuild
new file mode 100644
index 000000000000..d8ceeacffbb7
--- /dev/null
+++ b/x11-misc/i3blocks/i3blocks-1.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1
+
+if [[ ${PV} = 9999 ]]; then
+	inherit git-r3
+fi
+
+DESCRIPTION="highly flexible status line for the i3 window manager"
+HOMEPAGE="https://github.com/vivien/i3blocks"
+if [[ ${PV} = 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/vivien/${PN}"
+else
+	SRC_URI="https://github.com/vivien/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+SLOT="0"
+LICENSE="GPL-3"
+
+PATCHES=( "${FILESDIR}"/${PN}-disable-bash-completion.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+	newbashcomp bash-completion ${PN}
+}
diff --git a/x11-misc/icon-naming-utils/Manifest b/x11-misc/icon-naming-utils/Manifest
index 87090e5f465b..44e508a6ddb4 100644
--- a/x11-misc/icon-naming-utils/Manifest
+++ b/x11-misc/icon-naming-utils/Manifest
@@ -1,3 +1,3 @@
 DIST icon-naming-utils-0.8.90.tar.gz 70321 BLAKE2B e4944c6a279ffe38c8966783c799b1a84ba626a0611c3c29a7bccc982dfd45c7ae9d38d8b99f2e796466812a98a9216a440e871058b73aad537a0f2f4339d5ec SHA512 6c23f6138e053f9fc6de9d56f94b80849f29f9fde46cdf54b705720cb48b0c660f315484fb36fb9936d4ceade7768aad2d17280545a4b392aa56185c9452999d
-EBUILD icon-naming-utils-0.8.90-r1.ebuild 562 BLAKE2B 8f077d7cf5998dad3ac38b7706dbb58c4af2c081847767300e3e0b85799de73c4904d58de56971d64fc6b8e0635b54159608b5740b787169c6e517c0f71f41ab SHA512 60fec6fc168abb9d5e77ce1a78dad62f8607f763e597d4fe20bf334424ab849a332965ff5b969c1f3a41aebbc55afbe2e36221ec65e7a12ceffcb8d1ded7d5a1
+EBUILD icon-naming-utils-0.8.90-r1.ebuild 559 BLAKE2B a8121eaec3a106e4512d8989706eef7495b9bdd07061da20cfb9e388a9bd2da35c7839a1794d5b41a98fd47837f08f21d5fe7b0acbd7df9195b0e38107f36895 SHA512 309cf20e18142c238287d7965fecb3d08b8fd7d8e62d31cbabdc2abc3c7b084304b6e59e433f87c2f0a152ca7a57b9a3bf4873aaef1fcbf8df4b8ec499da7a0f
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90-r1.ebuild b/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90-r1.ebuild
index cd71a8e3af48..b332c0fd6790 100644
--- a/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90-r1.ebuild
+++ b/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://tango.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-perl/XML-Simple-2
diff --git a/x11-misc/imake/Manifest b/x11-misc/imake/Manifest
index 726c28374315..9382cfc8dbc6 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 463 BLAKE2B 0b37485b7a1a72d813d14c218e100ccbcc4b56fee87b6f116b98a6916cc626588a46989a2f45345bda7ea08ce4ca7b29a627f978cdeacb9c2b0520ae2edd7469 SHA512 3c0e4c3ae5480b6c3407fda45c52afe34d9abe0071ab98b4653a3b26ae3e14c800b8b9d749d5a9a9598397bce51e34a062df6e8674a327b496ab238cfdadadaf
+EBUILD imake-1.0.8.ebuild 460 BLAKE2B 7833a22996f3089960f280c83604e789d3e7d81db4563f445498a715fc7058119f48bd2a479e06ca1011f383760dd5e701315d0e27f1a3d3f573883bebd06ef1 SHA512 f3f9dbb71543b770b22dbc4979709d625f859d5aa8ff4a7e2aa9971768621e83cbc219eda4fe2ff1c64be60c3977a6599d85366add8b40f9d3a6b9986f27bf50
 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 a6eb41877f6a..4e2c15dde421 100644
--- a/x11-misc/imake/imake-1.0.8.ebuild
+++ b/x11-misc/imake/imake-1.0.8.ebuild
@@ -7,7 +7,7 @@ XORG_STATIC=no
 inherit xorg-3
 
 DESCRIPTION="C preprocessor interface to the make utility"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+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"
 IUSE=""
 
 RDEPEND="x11-misc/xorg-cf-files"
diff --git a/x11-misc/kdocker/Manifest b/x11-misc/kdocker/Manifest
index 9782e12e3fd0..bf5bc3d8369a 100644
--- a/x11-misc/kdocker/Manifest
+++ b/x11-misc/kdocker/Manifest
@@ -1,4 +1,6 @@
 AUX qt-5.14.patch 1037 BLAKE2B a6169aa7146a7e387cfba090177dea98a42d2311fd912deff98926b57f48c86bb39fa48ede81438a735f96de28eae0ec8e41f54641f03f9e67d06f7effda66ce SHA512 8c25af73914b2070aea45c173aad5f4a833e861d734d1d449d28ed595c542c001430af7f324489c6cc895adb7e580d98f41300c6d292eaa3ef3eb8148c3c4abb
 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
 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
new file mode 100644
index 000000000000..30bfc104e846
--- /dev/null
+++ b/x11-misc/kdocker/kdocker-5.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 qmake-utils xdg
+
+MY_P=KDocker-${PV}
+DESCRIPTION="Helper to dock any application into the system tray"
+HOMEPAGE="https://github.com/user-none/KDocker"
+SRC_URI="https://github.com/user-none/KDocker/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtsingleapplication[qt5(+),X]
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXpm
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS BUGS ChangeLog CREDITS README.md TODO )
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+
+	sed -i -e "/completion.path/s%/etc/bash_completion.d%$(get_bashcompdir)%" \
+		kdocker.pro || die "sed failed"
+	sed -i -e 's|/usr/share/appdata|/usr/share/metainfo|g' kdocker.pro \
+		|| die "sed failed"
+}
+
+src_configure() {
+	eqmake5 PREFIX="${EPREFIX}/usr" SYSTEMQTSA=1
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+}
diff --git a/x11-misc/lightdm-mini-greeter/Manifest b/x11-misc/lightdm-mini-greeter/Manifest
index 8bb717f53459..48d33bbede07 100644
--- a/x11-misc/lightdm-mini-greeter/Manifest
+++ b/x11-misc/lightdm-mini-greeter/Manifest
@@ -1,5 +1,5 @@
-DIST lightdm-mini-greeter-0.3.2.tar.gz 25165 BLAKE2B 677c3544607354aff252cf19448c7b8a63ee98e836bd4a42ec0043782af5c76890b2c6d0a2f83279b2a69901a009d5d6afcf5c356b7bb2ffcbd845341822e64b SHA512 eed48cca47300c2461c75a467f247bf9242c762ed868f0c00842c17fe42ddbd389b5aa03e4bb588089dae763b2927b59fe296ed9ceee80122cd4198455275380
 DIST lightdm-mini-greeter-0.3.4.tar.gz 27327 BLAKE2B 5f16b3d785e6773c127927caccfcd53089f3f31a8f1cc4c34ab09baf3cfebf9aabff45b5c76b1efdb850cde550e9335f3b8e8cd00d623a501346b9fe4e0d8e70 SHA512 dd605aaed14ead44962ef34d1d42bb350abc25f2975b2d1ed0b58e852b8f75805015ab4908a2414ebee3339e087f7d1e757f09345affb6a69bcac250ce47914f
-EBUILD lightdm-mini-greeter-0.3.2.ebuild 589 BLAKE2B 4280fb27639c62bb43b1b9682b60c38ad1f711cd423ee6a69de32a8b16a522fd5da4a8883599e08ab356333575289ccc823eeed73278e227972505c0718d689e SHA512 f2b0ba58e4f7843561c30ecc072522d592eb57e5b0576bde34c924936775bfd1e9c3ddfe864adb9a4eed092918616c2afcc3cf4ccf4e31d2351a6a6cbdc7f2d1
+DIST lightdm-mini-greeter-0.4.0.tar.gz 28761 BLAKE2B 3f35a0d6c50ef96e995b0d96a509ec0cd2feb68dc262aaf1dc353f5cac6677abd79a0f1cf4c1119f4d96c8193b5f58f5938801503979682f85037cc2d6330ce9 SHA512 c195d16f2650a1680e6fd13493c666d5bdfd2badf2dc8c3f09a4cb973eeaf1412bf7d4c9d38c28d408ad83d65f3a4bd27b2bb7071182ca108bd2bcb94164d202
 EBUILD lightdm-mini-greeter-0.3.4.ebuild 586 BLAKE2B f9a8847e8b5a2a93fefc3100dbd0f708f48fc095b2c6ccc10ca8b783348cf88ddd9f70b6e9f83df2115197e29835337f5c53971eb9cf11fe9ed9180c5737e1e2 SHA512 6e029e59fdd2e9f978bc508259aec005e86d51a7fc3392f86cef91953563e9194c2c5205a2ede04e170702a215be6811965eb375c88673dac440d454f9e34f69
+EBUILD lightdm-mini-greeter-0.4.0.ebuild 586 BLAKE2B 45bc8be020848e4319012893c3753298f50613f31af48447b4054fede4c9192b380439761bdddbc6f219ca1fbcf53d9dcf82e6b7684cdd637de7327a3b53c072 SHA512 e21a9a3a865575fde2af6facb530c00ec0cc96272d5a15819acd24e3f14838e29110bc2f2bfe5bf28055b61900ff9f8c16087883ac4a55e52bede87587e059f8
 MISC metadata.xml 353 BLAKE2B 364a6904c6b871e3a331928070a8d65a75c04ca8646636cc7978abfa8fb69cc9286556e93a7cbafd793236f6a3e5ad45ace236df780710f3ff1624b7e81211c8 SHA512 346fabfe019f6c030e58de94c7de3e344aeabb9227f931f5d3067338a9cb795fff6ecddef18d2f6af97c2fcbcb0d5953f2984914841278bd5a8632983e5b7734
diff --git a/x11-misc/lightdm-mini-greeter/lightdm-mini-greeter-0.3.2.ebuild b/x11-misc/lightdm-mini-greeter/lightdm-mini-greeter-0.4.0.ebuild
index e03722f21759..c4f43941a508 100644
--- a/x11-misc/lightdm-mini-greeter/lightdm-mini-greeter-0.3.2.ebuild
+++ b/x11-misc/lightdm-mini-greeter/lightdm-mini-greeter-0.4.0.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=7
diff --git a/x11-misc/makedepend/Manifest b/x11-misc/makedepend/Manifest
index 8c1f68ff1ae6..7dff8cb6a8f4 100644
--- a/x11-misc/makedepend/Manifest
+++ b/x11-misc/makedepend/Manifest
@@ -1,3 +1,3 @@
 DIST makedepend-1.0.6.tar.bz2 147616 BLAKE2B 6e9538e435d602ab3bcfb35a5398d6f11a23e4c9fa19bb2e3f651967d3fb1945557af2a5d84fae3e46112aae9ec411894cf8605e4856a46b120b660ff4b95ea4 SHA512 eb0e8ee8ab7515806d7d98a060cdcd392ec38e4225e5e05db26daa6651f185d0b764aab403edeea904d4d23211b1f7db20daeee6eafce8abe65225784ed0aa42
-EBUILD makedepend-1.0.6.ebuild 417 BLAKE2B b91db9744f646ac6be381c90257189d7c2ea0e24de9fe6e2c7afd3f214c2f130d8bd5a91e47143580dcbba489d0212af64b63bd703d545839cac1ec9bc38e213 SHA512 2bfdaaff4a66736a3e83f6ca5c3de9df8fcb91c9087b063345915a69cc725b8d7d5fdad814bdf3081b0db6ee4e6c3b609076787e4d174318d184c4303712ed97
+EBUILD makedepend-1.0.6.ebuild 414 BLAKE2B 956f2c33e3e8c2d1db8bf2c0bfa8b8c871b6e7955170bad1e9ba4a8ff055cb2f1349d3e03ea9c0689ef1a1f48cbc2fe2dd5caa69254e20e9439ff8002a0f1923 SHA512 44088f16a007dc3b3bf88366610ace202371c9a72bc541c5ad9cab73a7b8e1d2e0f6ef9e6cd7f90dab6437471ad842cbe258d8b00b8382963d4899e52a928654
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/makedepend/makedepend-1.0.6.ebuild b/x11-misc/makedepend/makedepend-1.0.6.ebuild
index 0fdf7132834b..35c73a35bd18 100644
--- a/x11-misc/makedepend/makedepend-1.0.6.ebuild
+++ b/x11-misc/makedepend/makedepend-1.0.6.ebuild
@@ -6,7 +6,7 @@ XORG_STATIC=no
 inherit xorg-3
 
 DESCRIPTION="create dependencies in makefiles"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-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 ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-misc/mate-notification-daemon/Manifest b/x11-misc/mate-notification-daemon/Manifest
index 7afafe3d2be9..7de7767f6531 100644
--- a/x11-misc/mate-notification-daemon/Manifest
+++ b/x11-misc/mate-notification-daemon/Manifest
@@ -1,5 +1,9 @@
 AUX org.freedesktop.Notifications.service 94 BLAKE2B 1a97aac2db9c803c9e4babf9067283b564a1eecb1d251aee3a5e66b8a4f63d2554e3e09ea06749383ce3d5b8e77c8cc3bd87ae2dde48ae8feb4886ecaf7a3c27 SHA512 0575cbfc094455c0a2f04faa534a5e0d9cc41e6d9566ab9bcb0fcbce99e142213ded786ad00c36dc434ae1b9208d34d234a341dfc86adb72925dad0ee2b25f97
 DIST mate-notification-daemon-1.22.0.tar.xz 360676 BLAKE2B 0eb50a6179b5b90243e8206bbbb6c3ce1bf65cf3b2969e0c259e4bdebdf6e86d769f74020509cc170b087a02c6295007f83efc950407f803be6e717b0fc900ae SHA512 1345604dee1315843ad5a6920aab7cbe1544c8f7c7ccea686e5684c7ea5272fa09d27edbcc996f6a568f8b3760f561b84901c44f93f1b3ae2d5ddcd3c3ce86fc
-EBUILD mate-notification-daemon-1.22.0-r1.ebuild 1004 BLAKE2B 9b8f0ac7779d502d5ee92107e628a9885f3a2bb0611437428141ee83098a2b00e692c7b7c5c7b3fe874df4fdfbb2af4dbdfff99a217e1d88b4300711237efaa1 SHA512 8dcac2ac37616924b7e37a5bac6f780a6823e3aca8890c8a93ff9eb662ae5d52da0e4dfc86177114ef98402e21e595b49294b6ef23bb9c3046eec6c2530b6ca9
-EBUILD mate-notification-daemon-1.22.0.ebuild 1005 BLAKE2B e68c9ac86fba969e02e49719abaf1a8be0a05c6b5085e241d230925f8bb1d9b4b44c0b5e67d0c42e16963040fd4500006a9b0b5b03bf5b227c23fc4236a33223 SHA512 84dc52905d706a6307feadb8061681ecde3325409f2b402c911643d2d5b86036a0630cbfa9e83bdba2a29197f5a3722307d98eb8f4f0b1047b0867cbc254f803
+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.0-r1.ebuild 1012 BLAKE2B 0a72ef658f5b71fd475dd033edc220fd1dfbcdb292ae23232162bbedbfa1b418d548008873b2fb6120dab6cdd2e95118962f8383afe27ab5e90a859659b5ae2d SHA512 58c07235a65c1cd16cec59b26221ffff0f5be1750d22c2b91af886a037378077e7afe1311db54f2ad90157d18243ef92ad50f83770b22a6dab235237fae9a69c
+EBUILD mate-notification-daemon-1.22.0.ebuild 1013 BLAKE2B 016eeee205793e4b1095d42645b6a5fac593323ccb8f8cfbeab35b8a20d13e96e4494eebcf634690b7bc7f21a423b91d00d2db6040ca82fab79d029a76455c0a SHA512 fb5148bc81fefe6afff0ddf01cd604ae132ba52922e39524c59f91a6c8788a12279497c9843774587138622cd9090156d46d728559febfd54996bf3696465387
+EBUILD mate-notification-daemon-1.22.1.ebuild 1012 BLAKE2B 0a72ef658f5b71fd475dd033edc220fd1dfbcdb292ae23232162bbedbfa1b418d548008873b2fb6120dab6cdd2e95118962f8383afe27ab5e90a859659b5ae2d SHA512 58c07235a65c1cd16cec59b26221ffff0f5be1750d22c2b91af886a037378077e7afe1311db54f2ad90157d18243ef92ad50f83770b22a6dab235237fae9a69c
+EBUILD mate-notification-daemon-1.24.0.ebuild 1030 BLAKE2B 61cc2e9e0953430b561ea473057ada9645c923d7bc1dc7077666610b2ee9b5f5aa534f2de72c4d0287e09c336bfa8f50ea286dbf7fe5ba52bff89642f2c80bdb SHA512 d3a20971b694ce3d2f69785321aeccf3152b2a50f940f060ab176fdc56c5f9cf98995feabbd2a87c046c00be782ccaf7cc60991ea20a66ebc77014b0ee96a860
 MISC metadata.xml 353 BLAKE2B 774bcae8807bbb16a1ee8bc12320e487ec817fb45d3169f4929cbd8c3f7f33a35eb1aad2682e5d87131567c56e6ffe8f2bdbda612c58926ddc3d78b14cb69e53 SHA512 3f46b4bb5e12fdb448e7b7f54db4f4a4683cbdbd89019156601abf80be0333690b65670fb110120cf613dd42ecdfb38b329ddde67fd265257d6ddb32e24bfbbd
diff --git a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.22.0-r1.ebuild b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.22.0-r1.ebuild
index b7b3b1ddb731..6956bd19ec69 100644
--- a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.22.0-r1.ebuild
+++ b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.22.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ if [[ ${PV} != 9999 ]]; then
 fi
 
 DESCRIPTION="MATE Notification daemon"
-LICENSE="GPL-2"
+LICENSE="GPL-2+ GPL-3+"
 SLOT="0"
 
 IUSE=""
diff --git a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.22.0.ebuild b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.22.0.ebuild
index ec55ea9dfdbb..73f14177d23e 100644
--- a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.22.0.ebuild
+++ b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.22.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=6
@@ -12,7 +12,7 @@ if [[ ${PV} != 9999 ]]; then
 fi
 
 DESCRIPTION="MATE Notification daemon"
-LICENSE="GPL-2"
+LICENSE="GPL-2+ GPL-3+"
 SLOT="0"
 
 IUSE=""
diff --git a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.22.1.ebuild b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.22.1.ebuild
new file mode 100644
index 000000000000..6956bd19ec69
--- /dev/null
+++ b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.22.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="MATE Notification daemon"
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+
+IUSE=""
+
+COMMON_DEPEND="dev-libs/atk
+	>=dev-libs/glib-2.50:2
+	>=sys-apps/dbus-1
+	x11-libs/cairo
+	>=x11-libs/gdk-pixbuf-2.22:2
+	>=x11-libs/libnotify-0.7
+	x11-libs/libX11
+	virtual/libintl
+	>=x11-libs/gtk+-3.22:3
+	>=x11-libs/libwnck-3:3
+	>=media-libs/libcanberra-0.4:0[gtk3]
+	!x11-misc/notify-osd
+	!x11-misc/qtnotifydaemon
+	!x11-misc/notification-daemon"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	dev-util/gdbus-codegen
+	>=dev-util/intltool-0.50.1
+	sys-devel/gettext:*
+	>=sys-devel/libtool-2.2.6:2
+	virtual/pkgconfig:*"
+
+src_configure() {
+	mate_src_configure
+}
+
+src_install() {
+	mate_src_install
+
+	insinto /usr/share/dbus-1/services
+	doins "${FILESDIR}/org.freedesktop.Notifications.service"
+}
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
new file mode 100644
index 000000000000..1fffb1ccaec2
--- /dev/null
+++ b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.24.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="MATE Notification daemon"
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+
+IUSE=""
+
+COMMON_DEPEND="dev-libs/atk
+	>=dev-libs/glib-2.50:2
+	>=sys-apps/dbus-1
+	x11-libs/cairo
+	>=x11-libs/gdk-pixbuf-2.22:2
+	>=x11-libs/libnotify-0.7
+	x11-libs/libX11
+	virtual/libintl
+	>=x11-libs/gtk+-3.22:3
+	>=x11-libs/libwnck-3:3
+	>=media-libs/libcanberra-0.4:0[gtk3]
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/libintl
+	!x11-misc/notify-osd
+	!x11-misc/qtnotifydaemon
+	!x11-misc/notification-daemon
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	dev-libs/libxml2
+	dev-util/gdbus-codegen
+	>=sys-devel/gettext-0.19.8:*
+	>=sys-devel/libtool-2.2.6:2
+	virtual/pkgconfig:*"
+
+src_configure() {
+	mate_src_configure
+}
+
+src_install() {
+	mate_src_install
+
+	insinto /usr/share/dbus-1/services
+	doins "${FILESDIR}/org.freedesktop.Notifications.service"
+}
diff --git a/x11-misc/menulibre/Manifest b/x11-misc/menulibre/Manifest
index bebcd49456fc..e49c1fcd80a1 100644
--- a/x11-misc/menulibre/Manifest
+++ b/x11-misc/menulibre/Manifest
@@ -1,7 +1,7 @@
 DIST menulibre-2.1.3.tar.gz 231336 BLAKE2B f15f962b41071f40cebdaa3fbab082932f1acad30026b89bb2b4672a860b4f7cc3caa668eadee48195a091783b6a8d5558ca44ed05034640247cad02394d3b93 SHA512 0a9040bcb311fe993238e5d1fc459db2400466c538c729ecd5bf2ff20cf9c7300ef2543c56ae4ef7cfa44cd66768ee9a9001ab997fd2507d8d74a246b2029c7a
 DIST menulibre-2.2.0.tar.gz 430567 BLAKE2B 7910f9f8e23b2ca3254b5a83a7c16315620bec38ff458a2fe3f65328b8b08ba424d853abb1fdb7334fd2b38da54b632a8d5b178a7cf876873d52c1903adcdab2 SHA512 d08d61fee3c5a9716581716c116d5b82c3221dff24093c765f6ad72d9dc17fde40ebdd2f17bcee7952b22bc4c78bdf1057cbc57af3c4651dfa6dc01cbd3ecbeb
 DIST menulibre-2.2.1.tar.gz 453217 BLAKE2B 86b3d2d8b20bfc7dcfcba380f656ec1e99f1d5dbc3779eadb9e7cc3a2b8c96afc0c2efe72802d0c93833f6c705c67d05a4ba6cc6cf9b95e0c9b9850ae4424fee SHA512 cf1425d604af26b7bde92106aa758a1f7dcc66ad1fbcdcd4c23db90bc7b6de5fe1160b917035f1d949daa1af8ba6b1145d7376ae637c8937a25cb108bf8cd15f
-EBUILD menulibre-2.1.3.ebuild 1717 BLAKE2B 468e64d1c96d0d32c127795dd9dbf5e133806868ef3c30b2d7cb03572ed27ef3654509559b467a544901376aab71360bef1cb1ad24faa577b6d1ae5981e9795c SHA512 ea0726869f8ef164ee0babdc6fcc976ddf4ab3557bc88798e50573242e68edfaa016b0e7d5abd7e9d93a8ce8652304d14a6d6bde0fdb96bb41126dda805f6837
-EBUILD menulibre-2.2.0.ebuild 1743 BLAKE2B 67db6f33c8cdf804133357962238dec8fcca7ec860516a5414b45af49d847c0d50bb5ae1d57b7525bb9e498c5d98363233327ad9bb63345b50aa9299e6a9562c SHA512 c9d4c9a0031dcac581eadfa60ca9130cbb1d66b63d368e19e082bb653a5253cdec8924a8678755a13e0d417d48b59ba6a32e6ea71d7f2e11a9cbc20ec63a0158
-EBUILD menulibre-2.2.1-r1.ebuild 1721 BLAKE2B eb66414a140e9c6164a83942b5be814c90451d8fe274158e40788da1c895fdf9432096ca041576dd8af1ea2330896408b48caa64d01e039a36544bee11d45106 SHA512 26b47e0fc065cd0d5779f2c4c88e89db4e14300f2c5c236aeb41b54ab1d0d0aa65ab2d246a3794d646dcdbcd3c7b3a6ab962a72b9e948bb024c62a482189103a
+EBUILD menulibre-2.1.3.ebuild 1723 BLAKE2B c51fd7a13db5017dcba222763ad6216a0ade38a4f582bb489e1edfa024fed6a9c3dc1574c7a71c1595bcd8b3a10859c2e08a9d8ff07e7d230b4f50699c1e1607 SHA512 56d61fb1b722ab74129d3fddf710836908c8ad592a48bac21756bc4b537ec38e26b02025f362ab967f5a8caacd369dc78acb64b47369ff58d6de1213dcbb0cd7
+EBUILD menulibre-2.2.0.ebuild 1749 BLAKE2B 1345ab3161fd786f01c9e1620d9a6dfb39b259004fff60f080d682c9bd701acc3c9e634576dac60f1664a16d4da9d83be15cf3aac0b0f6cfeea3f162703a8614 SHA512 70a349ef2442e2ab151c4b41a4d9274bbdc0a20bc211525835fa582c22777c127ddef13e4024ec375f5e70cb27ae6521fc2b5dd2438985f0992b8234e4cb67f8
+EBUILD menulibre-2.2.1-r1.ebuild 1727 BLAKE2B 5966f2f183ac516ce90e97b9a6a663ef13f64d0ae7fd74070898f51e0ff79b7f528e9c58d8f716e68e672a9ef6a0b4eb09cbd4fe3874aa45b5f5b3ff71a52029 SHA512 0ae52b863d772525c802ee96c2dbcda790636e7d8b79aa5ffb92e72cff6e0494ac99e2e91bb047b26264a3bad333d3f5f023331c86407783745a0b1654fc652f
 MISC metadata.xml 353 BLAKE2B 6064836036ff045dce0bc62fe8b822aefcd75b1cbb5746e12c2a2c5399802c1412b4f6bb9f9582785d5f8cff63d61f9f0c71505fd593e649e26c30f7c7019d6a SHA512 256e7ca3b20708caea270d07348c477b3d9e8300739092ad80468f4ab60e5e85b21246cf906d51a1929e627d27ed62bcf23136a3b8edc684c4ba1b53e3282454
diff --git a/x11-misc/menulibre/menulibre-2.1.3.ebuild b/x11-misc/menulibre/menulibre-2.1.3.ebuild
index f13ed5126411..dd50aff51167 100644
--- a/x11-misc/menulibre/menulibre-2.1.3.ebuild
+++ b/x11-misc/menulibre/menulibre-2.1.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python{3_6,3_7} )
 PYTHON_REQ_USE="xml"
 DISTUTILS_IN_SOURCE_BUILD=1
 inherit distutils-r1 eutils gnome2-utils versionator
diff --git a/x11-misc/menulibre/menulibre-2.2.0.ebuild b/x11-misc/menulibre/menulibre-2.2.0.ebuild
index a64c550a85f0..5cf36a0a2080 100644
--- a/x11-misc/menulibre/menulibre-2.2.0.ebuild
+++ b/x11-misc/menulibre/menulibre-2.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python{3_6,3_7} )
 PYTHON_REQ_USE="xml"
 DISTUTILS_IN_SOURCE_BUILD=1
 inherit distutils-r1 eutils gnome2-utils versionator
diff --git a/x11-misc/menulibre/menulibre-2.2.1-r1.ebuild b/x11-misc/menulibre/menulibre-2.2.1-r1.ebuild
index 22d9bf1344ac..c6a12203f650 100644
--- a/x11-misc/menulibre/menulibre-2.2.1-r1.ebuild
+++ b/x11-misc/menulibre/menulibre-2.2.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python{3_6,3_7} )
 PYTHON_REQ_USE="xml"
 DISTUTILS_IN_SOURCE_BUILD=1
 inherit desktop distutils-r1 xdg-utils
diff --git a/x11-misc/mozo/Manifest b/x11-misc/mozo/Manifest
index cba11b6dc621..39a00f341601 100644
--- a/x11-misc/mozo/Manifest
+++ b/x11-misc/mozo/Manifest
@@ -1,5 +1,9 @@
 DIST mozo-1.22.0.tar.xz 178924 BLAKE2B 6cc74cbdb7342d926483948391798cc9b0be66b63bba758b7ec8cea3f5555ae01f1ecf279053612ed060a283076bdac1a9ef8bd15e3cfe61d96685aeee168ae0 SHA512 f3d60e94d9bf5fdd435320856563622f0687cc2844a3d51473bcef5c442f4938a4030533271ead2fd88fb0ce805c16b40d629e5a69fc642e7e670a1afd5745db
 DIST mozo-1.22.1.tar.xz 171976 BLAKE2B c4a1166b605d3fed68b71987dbf70b7f908aabc2c7266415b0d7ce4c8ccb93ad690c72ce83a708f9d3518cfba66128d2cd4bc5413432133299595cf4d2c5a43c SHA512 6cd4ed04d43ae064077fc78ed59644bf6efe4c65c26995742166c57333d470fbe95ca4f4037e786f16dc076e75d938868948e8c2e5c662f35d971b36992f1a9b
-EBUILD mozo-1.22.0.ebuild 1275 BLAKE2B 7fbc5742a571aa0160d352298152cc3152fd567387a0e8d43b9724b31395e5cb6681a9fc6e50b30fda0b342c286528641c44dff7db939ec98416e284f3b57349 SHA512 f63067430e440ffecbc47f35da67552b05f19e812c3c185820e85ea0f9f79bdef3f72a8b9af4f1ae8f8b54e86971a4842e34d1341fd811bfb81b57e7bc21bf0e
-EBUILD mozo-1.22.1.ebuild 1277 BLAKE2B 7ce23b40c20a76644dba8216a8c1689eb3aa50455536f1e4621972fa34be97e8a60e6a0281aa0975095d4886d037df2695c35c519758c9ebce47f3aaa21b6b58 SHA512 fa7495d64a0e77f4fef860380e84b2b6ea235edc31a1c6110df348bb239e75c2a45314ad59f72ffb7ddeda59901aaddcd598146958c22b01c4a5ebbfe9d58f1d
+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.0.ebuild 1301 BLAKE2B f4e91911a5ef7933dd3442f42e45eb3b54dd636374ffae6a6b0956e965e371338f9147c6ef8022285adebc536f54ca5ebd633a5cec39914070d33155b81aaef2 SHA512 87fbe1e425e8b9e08fb9b33483e8e74dba9bd759d0645fc0e49bd4e63b5547b6d67e353164ba825ff5b7ad4877b0558c27af95f783b5d6bd5fb78f764fabf599
+EBUILD mozo-1.22.1.ebuild 1303 BLAKE2B 962903680711353447af25c447a33d106e7a473d5fd0960f865de2b6d757df1061cdb7cd667719aafddd0ef39834f81672364d57a93111550fa23f5d704f3be5 SHA512 cde95566d87330c7e77e8262e8e8956be84e19712cabd146ce514ee52ebb06d59b5ac18e084afd27092bcfe7063555e52f94679bd991a52f03a1d1a2fba67c3d
+EBUILD mozo-1.22.2.ebuild 1309 BLAKE2B 2507892f09969efaf078cca388ff58f5bac750754be96b918ac49fc8be91c6c80b636399201c5370d41afa6555b6bf63f3516caa0c2c404941c0fc5a965d6f24 SHA512 7fdde45c1cb47c4d05c749fdb54e06030b4f9ed310954e1b5cf39e38ed77b2ba382b58f8b439496ffdea99252e94edd82b1fe9b863ae037d09f7ec8812f6485b
+EBUILD mozo-1.24.0.ebuild 1313 BLAKE2B 8a3e31a0b93a79d03adb9d9bd89d689009a732093e17c3c9bb2dc67b17fc255ead1b1c7eee7d32bc14f46fa93dda34909a217d94ddd93ae38a9eb2c5b10f1f8d SHA512 26b99756a8e6a5c6eb6ff2dfc1c698942252eeeea8a3ec6442479198c9533b9d642a833d170cc71bf2d4612545c328e158c977bcb03e0db6e236dcaded069638
 MISC metadata.xml 333 BLAKE2B 9901ffa7d882f0f741c95670130db70920ebbe94af75b8d9b72f48f8eb1b48d9425b7ff49dafbe001e5287ff3eafd2d60a8760a262ab6601fecc63642e242591 SHA512 eb3bc4b3cf1cfde5f96cd414138790deae0435e8ba41576e1e44b150defd5fdda0b921d4dbb0798b9653ad5aa7690247fb69cd25d03752f8bde8017419596a76
diff --git a/x11-misc/mozo/mozo-1.22.0.ebuild b/x11-misc/mozo/mozo-1.22.0.ebuild
index e6c4de3fb470..5acaed059cd0 100644
--- a/x11-misc/mozo/mozo-1.22.0.ebuild
+++ b/x11-misc/mozo/mozo-1.22.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} != 9999 ]]; then
 fi
 
 DESCRIPTION="Mozo menu editor for MATE"
-LICENSE="GPL-2"
+LICENSE="GPL-2+ GPL-3+ LGPL-2+ LGPL-2.1+"
 SLOT="0"
 IUSE=""
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
diff --git a/x11-misc/mozo/mozo-1.22.1.ebuild b/x11-misc/mozo/mozo-1.22.1.ebuild
index a8fcc6e410aa..3c7cb640e7bb 100644
--- a/x11-misc/mozo/mozo-1.22.1.ebuild
+++ b/x11-misc/mozo/mozo-1.22.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} != 9999 ]]; then
 fi
 
 DESCRIPTION="Mozo menu editor for MATE"
-LICENSE="GPL-2"
+LICENSE="GPL-2+ GPL-3+ LGPL-2+ LGPL-2.1+"
 SLOT="0"
 IUSE=""
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
diff --git a/x11-misc/mozo/mozo-1.22.2.ebuild b/x11-misc/mozo/mozo-1.22.2.ebuild
new file mode 100644
index 000000000000..950b638c809c
--- /dev/null
+++ b/x11-misc/mozo/mozo-1.22.2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_REQ_USE="xml"
+
+inherit python-r1 mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Mozo menu editor for MATE"
+LICENSE="GPL-2+ GPL-3+ LGPL-2+ LGPL-2.1+"
+SLOT="0"
+IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=dev-python/pygobject-3:3[${PYTHON_USEDEP}]
+	>=mate-base/mate-menus-1.21.0[introspection]
+	x11-libs/gdk-pixbuf:2[introspection]
+	>=x11-libs/gtk+-3.22:3[introspection]
+	virtual/libintl
+	!!x11-misc/mate-menu-editor"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.40
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+src_prepare() {
+	mate_src_prepare
+	python_copy_sources
+}
+
+src_configure() {
+	python_foreach_impl run_in_build_dir mate_src_configure \
+		--disable-icon-update
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_test() {
+	python_foreach_impl run_in_build_dir emake check
+}
+
+src_install() {
+	installing() {
+		mate_src_install
+
+		# Massage shebang to make python_doscript happy
+		sed -e 's:#! '"${PYTHON}:#!/usr/bin/python:" \
+			-i mozo || die
+
+		python_doscript mozo
+	}
+
+	python_foreach_impl run_in_build_dir installing
+}
diff --git a/x11-misc/mozo/mozo-1.24.0.ebuild b/x11-misc/mozo/mozo-1.24.0.ebuild
new file mode 100644
index 000000000000..ac2cdefbe6e3
--- /dev/null
+++ b/x11-misc/mozo/mozo-1.24.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_REQ_USE="xml"
+
+inherit python-r1 mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Mozo menu editor for MATE"
+LICENSE="GPL-2+ GPL-3+ LGPL-2+ LGPL-2.1+"
+SLOT="0"
+IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=dev-python/pygobject-3:3[${PYTHON_USEDEP}]
+	>=mate-base/mate-menus-1.21.0[introspection]
+	x11-libs/gdk-pixbuf:2[introspection]
+	>=x11-libs/gtk+-3.22:3[introspection]
+	!!x11-misc/mate-menu-editor
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/libintl
+"
+
+DEPEND="${COMMON_DEPEND}
+	>=sys-devel/gettext-0.19.8:*
+	virtual/pkgconfig:*
+"
+
+src_prepare() {
+	mate_src_prepare
+	python_copy_sources
+}
+
+src_configure() {
+	python_foreach_impl run_in_build_dir mate_src_configure \
+		--disable-icon-update
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_test() {
+	python_foreach_impl run_in_build_dir emake check
+}
+
+src_install() {
+	installing() {
+		mate_src_install
+
+		# Massage shebang to make python_doscript happy
+		sed -e 's:#! '"${PYTHON}:#!/usr/bin/python:" \
+			-i mozo || die
+
+		python_doscript mozo
+		python_optimize
+	}
+
+	python_foreach_impl run_in_build_dir installing
+}
diff --git a/x11-misc/notification-daemon/Manifest b/x11-misc/notification-daemon/Manifest
index 50375936c26d..5c4ebbe916bd 100644
--- a/x11-misc/notification-daemon/Manifest
+++ b/x11-misc/notification-daemon/Manifest
@@ -4,8 +4,8 @@ DIST notification-daemon-0.5.0.tar.bz2 330034 BLAKE2B af201d3084716fbac02095140f
 DIST notification-daemon-3.14.1.tar.xz 280344 BLAKE2B 8e965cd52f97129f8f6116c9e21ffe73213b80f0652b7b00732c1afe3817e57a96c094a2ab8cef1628ef0e941aa90c759ff641d5d9fb3e5be8d4c8c26f27678a SHA512 977d028206d6a2005d346f697af5790b404f56399c451774037db25e37724f0cfbd558ae413c9ada40d2d7f399c1911392b19194e8fd093de74f65a6783ccc05
 DIST notification-daemon-3.18.2.tar.xz 329196 BLAKE2B cc4b00474ea20435fa412c1c27a95614baea06bfc00bf09c25b539e44ec8c41621eb7903a9245407e23a2a098290160d970e66dfe9cabc3bdf1ce3663a418f06 SHA512 962d84eb1970451d12d07027d4ee6843a96dc42c7d954dcb79bac55cd9918dcc84a2903b4ee032a0fd8f25d269e5e965a1deaab3da34b4181ea304df2adbae3c
 DIST notification-daemon-3.20.0.tar.xz 340752 BLAKE2B 9ded1efdb38de0097495ff570b9b91eb151e5eb030fcb9364a5ac04a4a5631c0a8483dc4068dd806d54ef0a096062ca92f9783f2030edb57f681b82015cf8584 SHA512 d9311c71a2915cb6e55bd1408e60b4d7b7fc24114410b8bd8cb358fe86c100198567099843b967f7e01ca03c91afe3f3980fb30b7f2c138bdab949e0e196a0f8
-EBUILD notification-daemon-0.5.0.ebuild 969 BLAKE2B 2a68f40ddd286ffe671223695c6787b72572a20e5e65f1ec613c06a56b2acdd23c4ea3729b2fc6d3a17778756e057be117819349ab8eed9145a364526997f35b SHA512 c280d0805d07355a65b7dfc6de6f028eb73d153968a31cf3e41139b0dde29820b7ae8fa69542b6ec81618044113e783f63990f380b55567508dff9a321bfda3b
-EBUILD notification-daemon-3.14.1.ebuild 964 BLAKE2B 65254aa380ec25d6bda3846bf8e77b2c7646ed3ec2421ff7f385e04c96ceeee2fa8ef463d9e6d04b12ea84ea1ae5ea05ebfd7d16849697a1b116e367d711be90 SHA512 a8aa8e6053d1bd36cbbdd48e2702e3080156186814b837e03c7808e9a11731bbfc28e13f29df75b9b65380c18b7c98c65fbe79a934e05632f78fc97d0ca0d4a4
-EBUILD notification-daemon-3.18.2.ebuild 940 BLAKE2B d265bca0c9bf017e0804e1315518dd2b9fe0d388aa07371ef21d9c67772f2d2d6a2a632da907133de90f3bc1a706da085fafd836632ba807dd9da3a33a13f8ea SHA512 ea61831fda3a51c6e06e4100f3a4cecc7c4ebd9e5f3f97b84ad5b14f3bf16910920d29724051d84a4cdf73345fdc098b15f937290e9962bfe84d5675a2a77d79
-EBUILD notification-daemon-3.20.0.ebuild 936 BLAKE2B 8ea57068c758e5a96ff897372a977db67e71a79529e107d2dda350cb524bce905a92a72f5e75b4adacf37e40f6c769ce15d006dc64749187de0c0514a1f12bc0 SHA512 36c7e516c2e5c1b3db7f3a53638241f527afec1a4c8f0e8b00eb679dd29e38121d81c7b7aebb14d281df5198fdcb99e60457f420911bb3074b2bb37056966277
+EBUILD notification-daemon-0.5.0.ebuild 964 BLAKE2B 05fad23b9462530039899511e68da49574b623314fc3a8baebeb280b551d96cb6f1b7a2a2858abef469acbf55075ecd7362719ac48a057df6bd9c9650a40778c SHA512 b3c775edcb7a25140cf76ceb3d52b0d57a6288201a841c7297365675f1a866f566917818d58b03caea549267e6b3888f620573712cbd5f9ed7e087f872c0b41c
+EBUILD notification-daemon-3.14.1.ebuild 961 BLAKE2B bda9b278350e7e3ccb3add0187011c29824732e835bafc5a5dd39978d46b01d5f38c18c72e1aa45e2f9a57f5c96d9b77c20b077c4624100428f8664c54d35c90 SHA512 83cc2f4e61790432e8d27722da4ac99ce29182440e1ecfa1d64b768fec9658f03bdadf342c01ea22bfd95be2c6e64fa1b9f293eb903b22be7e733d9defc8300f
+EBUILD notification-daemon-3.18.2.ebuild 933 BLAKE2B ebfa325b308ea42f7c3249265726cb13d4476b93f0d7f4e410a9163a5ff519578a9e1173343c2a50a8f82e651738a9b06a1d0b17be2111970754ec1e41ba87c0 SHA512 46a1a4f00896a331beff2a9b42720cff8a6cc9a1b21c727dec9af0463c0fca034668a7d1f8f04523d7a27adf96bac38f067c84e14fccbcc224af5703f4869b3e
+EBUILD notification-daemon-3.20.0.ebuild 933 BLAKE2B 6b6723c0fb6eb6d0bb651cf89391044caec710a62c646ce14c449dfadba8bac667260ab134ac3441e908fe66061db130e3a7a35f76cbb48ed56ad35258d7d58e SHA512 5ede8f81fb46b783f0d2f323d95724db34405bc5b9339afd36faea803453bd3b76c47c09b8c8525dd821637d1069572f645593c50d18c4e4b266166a7eac373a
 MISC metadata.xml 270 BLAKE2B 9c2dafa0390cfc7b94b5c44505d72021bf57cf8ffb35be7a3327f4316c3e4b2dbbfa0325d97243a8ea933440a5678cc5d35c639f5aa210b1d5ceb8ab65eb5d90 SHA512 92c366ec57074ced42e6f9960f97d1cd1a022dba7450b51f3617a6a5e00c755496dfa84aa4ac259f4b00c676366b1eaa3ec30eeb9bcb0bf41253d1910005db2f
diff --git a/x11-misc/notification-daemon/notification-daemon-0.5.0.ebuild b/x11-misc/notification-daemon/notification-daemon-0.5.0.ebuild
index fc507b776204..807ee0da169f 100644
--- a/x11-misc/notification-daemon/notification-daemon-0.5.0.ebuild
+++ b/x11-misc/notification-daemon/notification-daemon-0.5.0.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=5
@@ -13,7 +13,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/notification-daemon/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="sh"
+KEYWORDS=""
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2
diff --git a/x11-misc/notification-daemon/notification-daemon-3.14.1.ebuild b/x11-misc/notification-daemon/notification-daemon-3.14.1.ebuild
index 590080c8318c..5fe49103da47 100644
--- a/x11-misc/notification-daemon/notification-daemon-3.14.1.ebuild
+++ b/x11-misc/notification-daemon/notification-daemon-3.14.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/notification-daemon/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/notification-daemon/notification-daemon-3.18.2.ebuild b/x11-misc/notification-daemon/notification-daemon-3.18.2.ebuild
index d39b268759da..15fde45bfb77 100644
--- a/x11-misc/notification-daemon/notification-daemon-3.18.2.ebuild
+++ b/x11-misc/notification-daemon/notification-daemon-3.18.2.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=5
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/notification-daemon/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/notification-daemon/notification-daemon-3.20.0.ebuild b/x11-misc/notification-daemon/notification-daemon-3.20.0.ebuild
index c350de33fe28..22fef2824ddd 100644
--- a/x11-misc/notification-daemon/notification-daemon-3.20.0.ebuild
+++ b/x11-misc/notification-daemon/notification-daemon-3.20.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/notification-daemon/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/pcmanfm/Manifest b/x11-misc/pcmanfm/Manifest
index 399c6e4b5ee1..b6e49355b72e 100644
--- a/x11-misc/pcmanfm/Manifest
+++ b/x11-misc/pcmanfm/Manifest
@@ -1,9 +1,4 @@
-AUX pcmanfm-1.2.5-CVE-2017-8934.patch 1451 BLAKE2B 77c6fa0dea7f2a82e3aa4ecf91050852010630e43245f2838538778020a2bfac20a1ab85022337eaa4c3df53b7fc7d833578a09d059638946abee65cba7a49c2 SHA512 1ae582c72dbf4e57cda84df07348414567ed4c4f39b3b6df96a4732b926c502735bfc2c6c62e6e987efd63d21526cb63eb4665d00f0eb7338acd8de1684c36b4
-DIST pcmanfm-1.2.3.tar.xz 406756 BLAKE2B e8f4c166559266b4628f5fda4b7595ea8a28e37aa71cc3ec957ff04af8c919a248da5b189eb52040f2d049f633313cf9386c77b331b8e491ed4b3a69615c5010 SHA512 b350566c3aee0fe857ed1f0df2ae7d2ce51caf1547b951b380145078ba60f2fe6e0490c4d4c19465c5b1e0a9966205db6f8fe4dafb7cb3e987b9157551df2b28
-DIST pcmanfm-1.2.5.tar.xz 417808 BLAKE2B 1bc4ff7879baa1b62c5acf0b48977f5a81b5bac2d449064ed3ae74740f8e6981ae129cdfe123b63e57e2a22769273348df1a48def61eeb6a72a5918fdad2847c SHA512 ce53315483f58361c5a7797bdca355dbbedc2cf3907d319c7c65be844ea74ed297497dc3183c903e06b8294f6301d19347f6b9871e34bf773c04ff4fb8ab32f3
 DIST pcmanfm-1.3.1.tar.xz 423380 BLAKE2B c117f789d88b8c776f09dd598256bc889bf1d1ea2854a646da30e57e8e3b4a1410cf8411841e1b3c303f7f0cf4ec3d4046c0e05ad9c453efd1589592415119f3 SHA512 68fbc55b3ffd9da17c861d2cc41590a455ec2c0eb590ba4862f8a0ae01caac34a58645d847d318553ff588df20d355bbcbf1138a792cb45922eb04b047f681c4
-EBUILD pcmanfm-1.2.3.ebuild 1525 BLAKE2B 91dd715d6cad05ca36b3e867d9a206e74f92f20ae2e7077e4af5773634019e0f7200f480bb211cbb0737c594258d8ae73c940fbef97385750113023fb8fe73fa SHA512 b226940a0ddc5968ff2db4ef462e745c9110a6b775d12cc299e3af88353272b8736712b8151c4a2532eefe2d0190d289677bfb0fc85bba6722147d7de9c01c00
-EBUILD pcmanfm-1.2.5.ebuild 1627 BLAKE2B d7092670f43bbe87a423bb5f1492676a09938dd695b0bc48b3adf30d39d309a851f462fb5231f0820ab27cf056df23e07bb72e067f43ab25ebb74b151863e139 SHA512 4bb01a683c3820e1a0d6c8d330e4f02d0ac588f0ad69cb3e96257906aecc4dd87eadf50b75b9c716bd0ab12778eafd64d3efcae379587102c0a385b3b06fca48
 EBUILD pcmanfm-1.3.1.ebuild 1565 BLAKE2B fc0f3ba5ca8a32de15f12ca95ad1abff2af31e237e747a9a0690806305bf2acf77d13f179cdace5772343b02a5d35f45926eeb12857188da8adf04f9cd3f8824 SHA512 1ea8ce53886860a24e528ce5f384abf62a86a18794e00bea1a20df6bb45ca817ecc70ef83270d62974709b16e7073fd930a9550db9d53a969b43c2b4b55923b9
 EBUILD pcmanfm-9999.ebuild 1764 BLAKE2B 7886b9c70db89b2d86b2f18b0981fc7fc90e1e4feb23c9551b2a81bf6be0d0bff74026d04174bf507d43e5eacc7df16616bf63d17e8cf194823ccdd560e107c3 SHA512 010cf7f72a855c3cfd8486eb5a7f3f56c90856f204ded84dfc30c5d95972a952e2027469880e39435f0fa08851aae3dfe45ce38e46849d810db238ae9f52d8a0
 MISC metadata.xml 338 BLAKE2B 67489af9d290abeb2c77c1f87dd427ad7bed67ddbc6fd6f60d051ef6d76f6b156a01749c6a3a7c50c5c388f46e1e4fb796d27b4814eec44c23d6c72c79ac7fb4 SHA512 545f77be5c130d6853004c6a263611b821b6f79a937625475670eefbcf7de83aa15bcd0ec26fa6084bf1cf5e19c81c580f9f8258b63967877f6a2600df679140
diff --git a/x11-misc/pcmanfm/files/pcmanfm-1.2.5-CVE-2017-8934.patch b/x11-misc/pcmanfm/files/pcmanfm-1.2.5-CVE-2017-8934.patch
deleted file mode 100644
index 2acd91bffe24..000000000000
--- a/x11-misc/pcmanfm/files/pcmanfm-1.2.5-CVE-2017-8934.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-# index 8c2049a..876f7f3 100644 (file)
-# --- a/NEWS
-# +++ b/NEWS
-# @@ -1,3 +1,7 @@
-# +* Fixed potential access violation, use runtime user dir instead of tmp dir
-# +    for single instance socket.
-# +
-# +
-#  Changes on 1.2.5 since 1.2.4:
- 
- * Removed options to Cut, Remove and Rename from context menu on mounted
-diff --git a/src/single-inst.c b/src/single-inst.c
-index 62c37b3..aaf84ab 100644 (file)
---- a/src/single-inst.c
-+++ b/src/single-inst.c
-@@ -2,7 +2,7 @@
-  *      single-inst.c: simple IPC mechanism for single instance app
-  *
-  *      Copyright 2010 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
-- *      Copyright 2012 Andriy Grytsenko (LStranger) <andrej@rep.kiev.ua>
-+ *      Copyright 2012-2017 Andriy Grytsenko (LStranger) <andrej@rep.kiev.ua>
-  *
-  *      This program is free software; you can redistribute it and/or modify
-  *      it under the terms of the GNU General Public License as published by
-@@ -404,11 +404,16 @@ static void get_socket_name(SingleInstData* data, char* buf, int len)
-     }
-     else
-         dpynum = 0;
-+#if GLIB_CHECK_VERSION(2, 28, 0)
-+    g_snprintf(buf, len, "%s/%s-socket-%s-%d", g_get_user_runtime_dir(),
-+               data->prog_name, host ? host : "", dpynum);
-+#else
-     g_snprintf(buf, len, "%s/.%s-socket-%s-%d-%s",
-                 g_get_tmp_dir(),
-                 data->prog_name,
-                 host ? host : "",
-                 dpynum,
-                 g_get_user_name());
-+#endif
- }
diff --git a/x11-misc/pcmanfm/pcmanfm-1.2.3.ebuild b/x11-misc/pcmanfm/pcmanfm-1.2.3.ebuild
deleted file mode 100644
index 968a5439acb5..000000000000
--- a/x11-misc/pcmanfm/pcmanfm-1.2.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PLOCALES="ar be bg bn ca cs da de el en_GB es et eu fa fi fo fr gl he hr hu id
-is it ja kk km ko lg lt lv ms nl pa pl pt pt_BR ro ru si sk sl sr sr@latin sv
-te th tr tt_RU ug uk vi zh_CN zh_TW"
-PLOCALE_BACKUP="en_GB"
-
-inherit eutils xdg-utils l10n readme.gentoo
-
-MY_PV="${PV/_/}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Fast lightweight tabbed filemanager"
-HOMEPAGE="https://wiki.lxde.org/en/PCManFM"
-SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc x86"
-IUSE="debug"
-
-RDEPEND=">=dev-libs/glib-2.18:2
-	>=x11-libs/gtk+-2.16:2
-	>=lxde-base/menu-cache-0.3.2
-	x11-misc/shared-mime-info
-	>=x11-libs/libfm-${PV}:=[gtk(+)]
-	virtual/eject
-	virtual/freedesktop-icon-theme"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-S="${WORKDIR}"/${MY_P}
-
-DOCS=( AUTHORS )
-
-DOC_CONTENTS="PCmanFM can optionally support the menu://applications/
-	location. You should install lxde-base/lxmenu-data for that functionality."
-
-src_prepare() {
-	export LINGUAS="${LINGUAS:-${PLOCALE_BACKUP}}"
-	l10n_get_locales > "${S}"/po/LINGUAS
-	epatch_user
-}
-
-src_configure() {
-	econf --sysconfdir=/etc $(use_enable debug)
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/x11-misc/pcmanfm/pcmanfm-1.2.5.ebuild b/x11-misc/pcmanfm/pcmanfm-1.2.5.ebuild
deleted file mode 100644
index 79c9d379f078..000000000000
--- a/x11-misc/pcmanfm/pcmanfm-1.2.5.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar be bg bn ca cs da de el en_GB es et eu fa fi fo fr gl he hr hu id
-is it ja kk km ko lg lt lv ms nl pa pl pt pt_BR ro ru si sk sl sr sr@latin sv
-te th tr tt_RU ug uk vi zh_CN zh_TW"
-PLOCALE_BACKUP="en_GB"
-
-inherit eutils xdg-utils l10n readme.gentoo-r1
-
-MY_PV="${PV/_/}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Fast lightweight tabbed filemanager"
-HOMEPAGE="https://wiki.lxde.org/en/PCManFM"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc x86"
-IUSE="debug"
-
-RDEPEND=">=dev-libs/glib-2.18:2
-	>=x11-libs/gtk+-2.16:2
-	>=lxde-base/menu-cache-0.3.2
-	x11-misc/shared-mime-info
-	>=x11-libs/libfm-${PV}:=[gtk(+)]
-	virtual/eject
-	virtual/freedesktop-icon-theme"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-S="${WORKDIR}"/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${PN}-1.2.5-CVE-2017-8934.patch )
-
-src_prepare() {
-	default
-
-	export LINGUAS="${LINGUAS:-${PLOCALE_BACKUP}}"
-	l10n_get_locales > po/LINGUAS || die
-}
-
-src_configure() {
-	econf \
-		--sysconfdir="${EPREFIX}"/etc \
-		$(use_enable debug)
-}
-
-src_install() {
-	default
-
-	local DOC_CONTENTS="PCmanFM can optionally support the menu://applications/
-	location. You should install lxde-base/lxmenu-data for that functionality."
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/x11-misc/picom/Manifest b/x11-misc/picom/Manifest
index 8c4bed07146a..f991432d0eae 100644
--- a/x11-misc/picom/Manifest
+++ b/x11-misc/picom/Manifest
@@ -1,5 +1,5 @@
 AUX picom-7.5-no_opengl.patch 680 BLAKE2B d0d0e9cf752ac003bc312b736dd64388924b6a0371180da0aac7578a85b988c554c7d30a4e419b930775020b99480fed2c1fbd95868989c94ad9997727fdacfc SHA512 b15c5a471bf343667d3fbc14d16d04789eaadcb2cb906668f6235a085c3a91c2bf0e1f0822a5dc5bab5272ca7b1dd3de97087faa6916526ca49e703ae69772d1
 DIST picom-7.5.tar.gz 219456 BLAKE2B 54113547b575ad6aa1329e92ae331b7d49207fdcdc6b49d31d8ab125f7335730a7e53b260c6a6c33d5350bec1e9e6357fd34023dc7837de165289446f8f492b8 SHA512 6535e5eab1a243bbee62448bc48830b7ea3566f94b2c45d9ca76fd8b8056e1f00e55f0e4b58110364d2c4f56652cc005622d644c1db1db41d2811ecc19e6d44a
-EBUILD picom-7.5-r1.ebuild 1337 BLAKE2B b182183e4f925658e829d85e5f8ac7338e1163c7346fff50659a92a713ed97a3a215b0cbc018732144920c9823b365e7a7ceb9b1e598df38fbbd2d769d0d73e2 SHA512 81d006790296018f0057098f9485a74f25b867a1685a189f7b26a1f43bdab80539aeef41c35d6a4a5d381f399bf84e5c1df5c08c6ba7da488295b8c69649592c
+EBUILD picom-7.5-r1.ebuild 1335 BLAKE2B 09bd5c512559e6767258c7729d0756a5654f4eed20adb0d81d768a7ab546a828becbc73c861385cc15063658cb934614a57f12bc6ae1c5851aed2e1a2c0a8e87 SHA512 589200086b027dc00a743f8d30bba2d48e20480c8c2c2f7462aeb88668fef202211e891e7967d8d6e7baea23c00ea0df863a5806e6b5280375958f935a5c08a2
 EBUILD picom-9999.ebuild 1057 BLAKE2B e5d700777b0e76cbec5967e0149f61842c79de34372f861fe9ea0256d079aa20004a6f77eeba74655f9e63de8b24e9548816dae5a12648bf7fa0a8410da086fe SHA512 9e60499fcb059bbc8a846ca532daf07ba0cc02e7b56fbf956a5f52a3b84cd75e1049349be779f5ba31f87275ca6010a9df8f3f5fdbc0b45df4df0aef76613e4d
 MISC metadata.xml 677 BLAKE2B 3d9d1ca23a81c30ac451c45ecad35c3cfbc63ea0a1d5c2cfed587990b33158ca8b3c188fe611aa51b77d2c66a270f8cc95ea5f38cb6270bd1ebf92411cb8ba8f SHA512 9a77cc79578426ae9e1e89e471d4368ef662f3bff757015d4cb48f08e2cbec446753ad16233bafde8ae1c61da0ec1bbd8539534c6097c7525c5905532c8cc9a5
diff --git a/x11-misc/picom/picom-7.5-r1.ebuild b/x11-misc/picom/picom-7.5-r1.ebuild
index 23b072007fae..b2473732a34a 100644
--- a/x11-misc/picom/picom-7.5-r1.ebuild
+++ b/x11-misc/picom/picom-7.5-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/yshui/picom/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MPL-2.0 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+config-file dbus +doc +drm opengl pcre"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/x11-misc/projecteur/Manifest b/x11-misc/projecteur/Manifest
index ec68ed2cb408..a38c61be2970 100644
--- a/x11-misc/projecteur/Manifest
+++ b/x11-misc/projecteur/Manifest
@@ -1,3 +1,3 @@
-DIST projecteur-0.6.tar.gz 286242 BLAKE2B 80385b946fbd8ba8f6f5db4c495f382252a5c644d0626c0e6f0b95c9a1785a3fdba8347115c456517da1c5627238883db7b253a98f3aa4912dc75adc54af1f82 SHA512 d97cd9facb0db0199ae0c569a1e4c881f30901a31966f23a94d093cab5582af1b8199d7b7d2d074d852dc2c22f4ce249b9690e99e8b4d79444d17d22bcabcbc0
-EBUILD projecteur-0.6-r1.ebuild 805 BLAKE2B 1ba5091382d294db067f0e4eb6c8e728d29a4d885e6db4d4ccd9aab31dbec9844edded5d0a4beadcb7c219b441a27aae52fd876a79bbfc33c0cbc720d44bd82a SHA512 4cd17f53e08c7caf60ae5a82d3f669dc4c52e8d20caf69b9ab16954ad071de646dc71c5911ff5a799561d8b0f2decb2f4049a3fc5aaa2b8654e79e64188dd0e5
+DIST projecteur-0.7.tar.gz 296252 BLAKE2B fb20de48ee5f89e66701fc8d6cad036aed48ed862994b82431a8a14f3ec95dccb863c4c35a5de01c932150b3b311511ef01af093ddbcd23a2413ebb882152bab SHA512 9af54e47883cd3d9368edef173b9c0eb522f947f7d72f759388e2ecdf275524bdf56d3562506a383bba32c0fd2ec5c76c232a7b523e13b79caeb4d6d76bbbac0
+EBUILD projecteur-0.7.ebuild 805 BLAKE2B 1ba5091382d294db067f0e4eb6c8e728d29a4d885e6db4d4ccd9aab31dbec9844edded5d0a4beadcb7c219b441a27aae52fd876a79bbfc33c0cbc720d44bd82a SHA512 4cd17f53e08c7caf60ae5a82d3f669dc4c52e8d20caf69b9ab16954ad071de646dc71c5911ff5a799561d8b0f2decb2f4049a3fc5aaa2b8654e79e64188dd0e5
 MISC metadata.xml 612 BLAKE2B 84ebf5cc3be489a0f7483e81b43dcee7067ec325a8a6c58f2350107921d0844bc7d084d7a35cddc95296c2f1046c4e098fed2b8748f0834df90c152dcd70e91e SHA512 d51be761cc4f93a47230bb63685fb367d7b0846b048733d192c6e36e9ac87f49cfcc28631ab4980dbc50213a9bbe23d3b0db665c5257e1e0e79804d9752e822c
diff --git a/x11-misc/projecteur/projecteur-0.6-r1.ebuild b/x11-misc/projecteur/projecteur-0.7.ebuild
index d727e882f0f2..d727e882f0f2 100644
--- a/x11-misc/projecteur/projecteur-0.6-r1.ebuild
+++ b/x11-misc/projecteur/projecteur-0.7.ebuild
diff --git a/x11-misc/py3status/Manifest b/x11-misc/py3status/Manifest
index 43bd76eca836..f81346bf2420 100644
--- a/x11-misc/py3status/Manifest
+++ b/x11-misc/py3status/Manifest
@@ -1,3 +1,3 @@
-DIST py3status-3.25.tar.gz 405276 BLAKE2B 9ff163f8ff037eedda29e7479bc637c9e3ddee1edb0848bdb61b32702ad8855745340beca7f5895612209d05bae838ce71a17521ded50cb61f2516669b740009 SHA512 114c510fc3126256af49f9fd7a141ebc86fe8306cf10094c1c9e9980757bf8f23e0ddb131d54aaa8acdcb5b98f0a230e9c2f0584ea09a68b779be5b66bc865b2
-EBUILD py3status-3.25.ebuild 719 BLAKE2B 56da3c804b99364042d91fbd5bf4c028452e27b1d65042529fe283fe9e6e43e54ad8f8595e64695d217c7cd21bc6bf1ea88debacc1b3e26d4d035f8dc974ec26 SHA512 1086f878fd00553f9a82f0358d8298b425526c9d37cb62a95c794d62fa7b243ea7e7c09b5d1824bdb3cc35f54b26a1ba8aea335d4e4c0622484b9515fbed8316
+DIST py3status-3.27.tar.gz 405154 BLAKE2B 9ee094145623520a63412f90dfaac1a2bd017d1785c0e987b9c7c527afa37d2604755fa646c2506c4950079a4b5f956e67a776fa71e4ba21a07caa918780d58f SHA512 4b7c64cd3ec1f9e255e94dd144e1b83a25dce5a661727c3664148f0c6e25cef14ed10237653dcb70706f29be549acb9ed8c1c1d7734b7bd44d02ff957b4bf664
+EBUILD py3status-3.27.ebuild 723 BLAKE2B b62005954af6e13387b48634c04e8cb52ad6d57281cf3e03032f8841d7735db691d228a2a5e81def59e5c6d3eeb6f1d2958e9f78de81c6a965ed383e067c286b SHA512 a96d6985c55f73fae78a542620c6d2f6914f71d1584580a4f9ebc932d2640d6276ec376d463a9abdbbd94847bb6549750603123b9b6fc30f19dbbb7358d05249
 MISC metadata.xml 742 BLAKE2B fb30bc364ed1b07670aaff51142a99a185c06b7f20661e3ed9cab9b3a21040fcbc15db807102af9c580a6c80071267c6883fe4d5a152c109e14f9d03e213f2ec SHA512 2a30e73f6450a2227574cda7f1f0d10a6eaa6f5919fac21c51578e025efe02a831582237013648b66b1061241c51f6598ac6f0c31e6edc9d05a4d5be8417f2de
diff --git a/x11-misc/py3status/py3status-3.25.ebuild b/x11-misc/py3status/py3status-3.27.ebuild
index 9b33b20bb0f9..f08967d407b9 100644
--- a/x11-misc/py3status/py3status-3.25.ebuild
+++ b/x11-misc/py3status/py3status-3.27.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
 SRC_URI="https://github.com/ultrabug/py3status/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/x11-misc/revelation/Manifest b/x11-misc/revelation/Manifest
deleted file mode 100644
index 12a4958f5df6..000000000000
--- a/x11-misc/revelation/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX revelation-0.4.14-gnome-python.patch 925 BLAKE2B 83bf8889d0de3a6d6077929ef76e9dc7ce96f750ae485ff064a6ae95b73d5b1853bb26e80cc9a24578b17436167c5498389f2a192f22a6544d15434ba6ecdca6 SHA512 679fd27df6b73d4a5003db791165bf02f7ded6d998e78a760412e5fc4b0ccf94b3d55cbb0be1a47c1e0bc0756f3f97cbdf738025a86cf2fe86ea452121a4fbb1
-AUX revelation-0.4.14-random.patch 2127 BLAKE2B 9fa01845124172e9544679c144cc49f23104aed615a1e1087f7f6b63051027136435ef51e8ac794c78c7e554211a5f125a4641e9572c52a1279b8eaef3170738 SHA512 be5e805e58d04c0be29ad9c30a6aa867a869a4d0a8df31ce234fbe331d0191cc3bf7b82e11ec6a7c1c8306b68ddbc5ed29d9f5e8c9e3838b293896adb69c5d13
-AUX revelation-0.4.14-xor.patch 1874 BLAKE2B 44b4e6b6f1323201818c55ecedb464304dc5265a7d356224dff41021554f8611f05fabc2fc353bf7a43b7bc4e2afe32f16c7b57ef30539abeb307de50f7b270d SHA512 c4b76a92f0b6e4e1856948e1c1d4bb118bc8f2383e9ec778515fd87949814b60dd51b8dc814a070665c0138111b3ffd9d8fdad03c43bdbb0320ad19ddea23ddc
-DIST revelation-0.4.14.tar.xz 316096 BLAKE2B 163fe15fe9ae1f35613390cec6d67b7b0193aea1d613d8ed0b237c190680b700fe509e076911cf28233194c3e82917ae0772d9fbe842eada0ac8bffae256dd4d SHA512 0af5b7eea47a7706dd164f4f0a1da12fd2595e8add1455e4e4092e4b6aa1507faf2c94227dd838734bdc19fef9d268938362fca2d3cde59897580598eefa1145
-EBUILD revelation-0.4.14-r4.ebuild 1136 BLAKE2B 0fa578d41b7eaae6aab27e8d5784633d67b73442bac3d7e2e56a6991c541244fc8b7a452fd53a75811455c7b6c82acc98c7a4cbfd9ec38ea43419071376b3509 SHA512 14c7a4b4691ab3e7a4e9c6e5d8a29b11b4c518ad155f181477a0daa85b03f9ffc91b7ffe61bfbb845d2fb1790fc14b7e6f836784f8093761ce2405cedf3c8a69
-MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/x11-misc/revelation/files/revelation-0.4.14-gnome-python.patch b/x11-misc/revelation/files/revelation-0.4.14-gnome-python.patch
deleted file mode 100644
index 82a02fb259bd..000000000000
--- a/x11-misc/revelation/files/revelation-0.4.14-gnome-python.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From dffb8b7722865a82c3a5d7ce9615b6da2313d583 Mon Sep 17 00:00:00 2001
-Message-Id: <dffb8b7722865a82c3a5d7ce9615b6da2313d583.1486417682.git.tommyhebb@gmail.com>
-From: Thomas Hebb <tommyhebb@gmail.com>
-Date: Mon, 6 Feb 2017 21:44:06 +0000
-Subject: [PATCH] Remove deprecated gnome-python dependency from configure.ac
-
-The code has not depended on the module for many years (the module was
-removed in 125cf9dc28f95617fc3b37bc29a714f708b7d2ef); however, the
-configure script was never updated to match.
----
- configure.ac | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index bdfae2a..5b6ad72 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -19,7 +19,6 @@ RVL_FDO_MIME()
- RVL_PYTHON_MODULE(Crypto, yes)
- RVL_PYTHON_MODULE(gconf, yes)
- RVL_PYTHON_MODULE(gtk, yes)
--RVL_PYTHON_MODULE(gnome, yes)
- RVL_PYTHON_MODULE(gio, yes)
- RVL_PYTHON_MODULE(gobject, yes)
- RVL_PYTHON_MODULE(pango, yes)
--- 
-2.11.1
-
diff --git a/x11-misc/revelation/files/revelation-0.4.14-random.patch b/x11-misc/revelation/files/revelation-0.4.14-random.patch
deleted file mode 100644
index e54ac2bf0661..000000000000
--- a/x11-misc/revelation/files/revelation-0.4.14-random.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- src/bundle/AfSplitter.py.~1~	2012-05-26 14:19:34.000000000 +0200
-+++ src/bundle/AfSplitter.py	2017-07-15 10:10:57.817775246 +0200
-@@ -42,7 +42,7 @@
- 
- # will need changed to use Crypto.Random (now in python-crypt git)
- # see: http://lists.dlitz.net/pipermail/pycrypto/2008q3/000020.html
--from Crypto.Util.randpool import RandomPool
-+from Crypto import Random
- from Crypto.Cipher import XOR
- 
- def _xor(a, b):
-@@ -81,7 +81,7 @@
- 
- 	blockSize = len(data)
- 
--	rand = RandomPool()
-+	rand = Random.new()
- 
- 	bufblock = "\x00" * blockSize
- 
-@@ -89,12 +89,7 @@
- 	for i in range(0, stripes-1):
- 
- 		# Get some random data
--		rand.randomize()
--		rand.stir()
--		r = rand.get_bytes(blockSize)
--		if rand.entropy < 0:
--			print "Warning: RandomPool entropy dropped below 0"
--
-+		r = rand.rand(blockSize)
- 		ret += r
- 		bufblock = _xor(r, bufblock)
- 		bufblock = _diffuse(bufblock, blockSize, digesttype)
---- src/bundle/luks.py.~1~	2012-05-26 14:19:34.000000000 +0200
-+++ src/bundle/luks.py	2017-07-15 10:10:08.735052052 +0200
-@@ -65,7 +65,7 @@
- 
- # will need changed to use Crypto.Random (now in python-crypt git)
- # see: http://lists.dlitz.net/pipermail/pycrypto/2008q3/000020.html
--from Crypto.Util.randpool import RandomPool
-+from Crypto import Random
- from Crypto.Cipher import *
- import PBKDFv2, AfSplitter
- 
-@@ -178,13 +178,13 @@
- 		self.keyBytes = masterSize
- 		self.hashSpec = hashSpec
- 
--		rand = RandomPool(self.SALT_SIZE + 16 + masterSize)
-+		rand = Random.new()
- 
- 		# Generate the salt
--		self.mkDigestSalt = rand.get_bytes(self.SALT_SIZE)
-+		self.mkDigestSalt = rand.read(self.SALT_SIZE)
- 
- 		# Generate a random master key
--		self.masterKey = rand.get_bytes(self.keyBytes)
-+		self.masterKey = rand.read(self.keyBytes)
- 		self.ivGen.set_key(self.masterKey)
- 
- 		# generate the master key digest
-@@ -263,8 +263,8 @@
- 		key.passwordIterations = iterations
- 
- 		# Generate a random salt for this key
--		rand = RandomPool(self.SALT_SIZE)
--		key.passwordSalt = rand.get_bytes(self.SALT_SIZE)
-+		rand = Random.new()
-+		key.passwordSalt = rand.read(self.SALT_SIZE)
- 
- 		# Hash the key using PBKDFv2
- 		pbkdf = PBKDFv2.PBKDFv2()
diff --git a/x11-misc/revelation/files/revelation-0.4.14-xor.patch b/x11-misc/revelation/files/revelation-0.4.14-xor.patch
deleted file mode 100644
index bac45c68b18b..000000000000
--- a/x11-misc/revelation/files/revelation-0.4.14-xor.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/bundle/AfSplitter.py.~1~	2017-07-15 10:25:21.503324481 +0200
-+++ src/bundle/AfSplitter.py	2017-07-15 10:26:39.589273253 +0200
-@@ -43,13 +43,7 @@
- # will need changed to use Crypto.Random (now in python-crypt git)
- # see: http://lists.dlitz.net/pipermail/pycrypto/2008q3/000020.html
- from Crypto import Random
--from Crypto.Cipher import XOR
--
--def _xor(a, b):
--	"""Internal function to performs XOR on two strings a and b"""
--
--	xor = XOR.new(a)
--	return xor.encrypt(b)
-+from Crypto import Util
- 
- def _diffuse(block, size, digest):
- 	"""Internal function to diffuse information inside a buffer"""
-@@ -91,11 +85,11 @@
- 		# Get some random data
- 		r = rand.rand(blockSize)
- 		ret += r
--		bufblock = _xor(r, bufblock)
-+		bufblock = strxor(r, bufblock)
- 		bufblock = _diffuse(bufblock, blockSize, digesttype)
- 		rand.add_event(bufblock)
- 
--	ret += _xor(bufblock, data)
-+	ret += strxor(bufblock, data)
- 	return ret
- 
- def AFMerge(data, stripes, digesttype='sha1'):
-@@ -108,7 +102,7 @@
- 
- 	bufblock = "\x00" * blockSize
- 	for i in range(0, stripes - 1):
--		bufblock = _xor(data[i*blockSize:(i+1)*blockSize], bufblock)
-+		bufblock = strxor(data[i*blockSize:(i+1)*blockSize], bufblock)
- 		bufblock = _diffuse(bufblock, blockSize, digesttype)
- 
--	return _xor(data[(stripes-1)*blockSize:], bufblock)
-+	return strxor(data[(stripes-1)*blockSize:], bufblock)
---- src/bundle/PBKDFv2.py.~1~	2012-05-26 14:19:34.000000000 +0200
-+++ src/bundle/PBKDFv2.py	2017-07-15 10:31:27.009731785 +0200
-@@ -32,7 +32,7 @@
- """
- 
- import struct, string, math, hashlib, hmac # RFC2104
--from Crypto.Cipher import XOR
-+from Crypto import Util
- 
- ################ PBKDFv2
- class PBKDFv2:
-@@ -145,5 +145,4 @@
-         if len(a) != len(b):
-             raise ValueError("ERROR: Strings are of different size! %s %s" % (len(a), len(b)))
- 
--	xor = XOR.new(a)
--	return xor.encrypt(b)
-+	return strxor(a, b)
diff --git a/x11-misc/revelation/metadata.xml b/x11-misc/revelation/metadata.xml
deleted file mode 100644
index 1b2becffa26c..000000000000
--- a/x11-misc/revelation/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/x11-misc/revelation/revelation-0.4.14-r4.ebuild b/x11-misc/revelation/revelation-0.4.14-r4.ebuild
deleted file mode 100644
index 704d9967b80e..000000000000
--- a/x11-misc/revelation/revelation-0.4.14-r4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1 autotools gnome2
-
-DESCRIPTION="A password manager for GNOME"
-HOMEPAGE="https://revelation.olasagasti.info/"
-SRC_URI="https://www.bitbucket.org/erikg/revelation/downloads/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/pygtk[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]
-		dev-python/gconf-python[${PYTHON_MULTI_USEDEP}]
-		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-		sys-libs/cracklib[python,${PYTHON_MULTI_USEDEP}]
-	')
-"
-
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-random.patch" \
-		   "${FILESDIR}/${P}-xor.patch" \
-		   "${FILESDIR}/${P}-gnome-python.patch"
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--without-applet \
-		--disable-desktop-update \
-		--disable-mime-update
-}
-
-src_install() {
-	gnome2_src_install
-	python_fix_shebang "${ED}"
-}
diff --git a/x11-misc/shared-mime-info/Manifest b/x11-misc/shared-mime-info/Manifest
index b13f8bdff6e2..d648b327b29b 100644
--- a/x11-misc/shared-mime-info/Manifest
+++ b/x11-misc/shared-mime-info/Manifest
@@ -1,4 +1,4 @@
 DIST shared-mime-info-1.10.tar.xz 616800 BLAKE2B a63c97aba9184e7926db01968aef2a741ef089a46ab9365eb8dad5a78f585f90171751baeaa3bc62ed0a37eed6e93d60598fbe1e7e63168106fc8aa05f2f5cc8 SHA512 efc2b63cae11e6b0332f8607ba57a885dec68a23ac299bbda3eb6e2c7ed071c7c40dba73e9cf23ab675fcaa86ea3777fa931a9f25000a08ec6a748734c88beda
-EBUILD shared-mime-info-1.10-r1.ebuild 1776 BLAKE2B 618aadf2c8b88b4ad074f9d1da0e3e69242b90bfe4bc975701b6f55260ab5818fc425df99ae85003979f6248ca774aad86bb8a97ebc5712fa8eb4162766700e7 SHA512 cdefb75c28d41f26e8ee1d4c8d103df856c8d9b5f7638e35fe0930cd6b02153da9df69bfc9da44e30be0ac0306f18418164aa676a90947396a0085a9e2d2b09f
-EBUILD shared-mime-info-1.10.ebuild 1500 BLAKE2B 2fcc1c82e379729ebfcc3129f3571afbe75492dba65f77f16b3694feea1915e80649e2b370892ded22ca611a667ba6a43937d7b9b7784c81fe03ca3a7ddc349b SHA512 98dffd1e24369c0c429d7ef1cc5821cb3a27c567e3a865072310cb673113fe11faed32706ec3f2f270e53bf9e2bf5c12820ca4633d2d859fdef5ef9e3717c18e
+EBUILD shared-mime-info-1.10-r1.ebuild 1773 BLAKE2B bd008173ac18b6b06be56cfad43cddaf9e0495853c5f7526f1b236e81cd1e2f7c0730148bb020dd414e42c106e51825d02ee5c6d0234c36a33a361a290424dea SHA512 cdd5dfbc93748884a3defb0447afb0bf24283c06df886085f6880400018bdbd5b764cf056d8b4ef9c60066c16b0f08b4085f3400d7379b5eb48968df40dca453
+EBUILD shared-mime-info-1.10.ebuild 1498 BLAKE2B e5344adc995a43c1bdf551213d5fa11c0b9a3a5a1db2eefb81d1c3c0aaaf78904e32083d45e2faae467fd23f4a344903514adee3b9a1eca8c442c1d5ccc329af SHA512 fc74ce45601ba928f9231a495bc79c4ee62e15585594a1f62e2a19ec31dd8c0ccbb34bf8243f8fbcaa569d0b9b9c82dc31ab48b57363ab610e0a2674f4083a6f
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.10-r1.ebuild b/x11-misc/shared-mime-info/shared-mime-info-1.10-r1.ebuild
index 86f04c4e23a1..d88ef77286f0 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-1.10-r1.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-1.10-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://people.freedesktop.org/~hadess/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.10.ebuild b/x11-misc/shared-mime-info/shared-mime-info-1.10.ebuild
index 5a713751642b..9f8ba91c6baf 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-1.10.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-1.10.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://people.freedesktop.org/~hadess/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-misc/shutter/Manifest b/x11-misc/shutter/Manifest
index d2334b153cfa..cab46df43bd1 100644
--- a/x11-misc/shutter/Manifest
+++ b/x11-misc/shutter/Manifest
@@ -1,8 +1,4 @@
 AUX shutter-0.90-goocanvas.patch 581 BLAKE2B a944b2d15b16fc429f73456f1aa266e1687a3d765f018b1f206358e140589d12733fff2bd37b8484207abd8849548b2987fad09b7c789481ec167ea1da0cee6d SHA512 2f3e0fbfbc86740efc4aa9ed7a31caf66560948003e3afc5b9dfba9f0935fffe4de5a217fb322ef9135b981030ef79ce964b1de0a28ad28bc36e58e2261f83e5
-AUX shutter-0.90-webphoto.patch 640 BLAKE2B ed41f01bf59e60f04abc5f8dc98cb32731ee42d841d4bfeabb4e2db3b2aa782b68135f25631e36772ecf298f03827bb10e0d640304c9ebeae0f147f10ba8fc5f SHA512 710c6009f9f9a0a75c5358538f8f396e1ba796fb1090048295b07ea0855c392691f3b2b2639e295b235180abe0f374af03339d0b6c0be898a1247683ce46b08a
-AUX shutter-0.93.1-insecure_use_of_system.patch 887 BLAKE2B c4ee5de1448dcb2babef9eabbddf93499ed4dcf9a295ed3c25c0997233216fc00cb8a866d8b1b6ad218110b6f6d881c51086da6606d88c6f8ab890eabf691891 SHA512 0a4f1f50dba2b25899484d56205349b42d4a5c3f01fe30c90c4cfca67d2d0936e70489ef220ab820439b57ebf3e72820b01efa57d30dde3931f197e81727681a
-DIST shutter-0.93.1.tar.gz 3432204 BLAKE2B 7c61942c1ddc288b912e8addd31111309b2b7305582f0d684f364552e4695ad45a54b2ef39b456f4410ee1434f20422c1abf0fffd7c15525e25810fd58a28008 SHA512 50a635fdf73454b15351a7e2c4507bf0f9fd816273affbed412f42b1032087304ecf1fb4a4b655bc056820f267b98214ff5104f4fcd9e843f78e70ac4a7a4a04
 DIST shutter-0.94.3.tar.gz 3375447 BLAKE2B e996966722999ee11ed3c185fd17a77e8982688ec17253f3558f89ccfd2e3afefec34d9214acffb10009fc1a28f587a5b994e32d7bb3538cde5e4f398b8e7b95 SHA512 7f67ed6fbc94aee4b6caa73662ab20684e2d8bdfd7208dcd407bdce4e1b93f2aa1fa256ad6bce66b92c741500726b90e5701e7f31bc831709568e5c4c27bff3b
-EBUILD shutter-0.93.1-r3.ebuild 2544 BLAKE2B 33c93851f8d326cda5cb30ffd52af9d70587736e2f7ff6a38b2bd732250677cb035530a85cbe6027122d356707dfe5fd3aabee2b4f50b116ff4a1b8c122a0d63 SHA512 7425565cfd47c82983512cffe3a2c139d09c10380f3d580d90ef3832cae7f0c58ec531093f5c77ce8ed68a7fd49c8ad4278f6b183df4f8b99dc896cfb3d8bd5a
 EBUILD shutter-0.94.3.ebuild 2599 BLAKE2B 76073f34d30ba32692c4ce1ce89ac6b4c6dd69ceff261a4a88c6811a09f13d447cfe1e881c824ddd052ff3e9db6acf4c3517773de64b3c504b5799e36a3ab935 SHA512 f2675c32380199ffbaa8041dd7529b74d882c7c4473bc4642daa8a3ac8cf0e7052230e11b893731952eae96d3bbf1e5460de75f9f2148b1f1e2f6bf280d046fe
 MISC metadata.xml 318 BLAKE2B 3e11d3fc694ec5a14878e69c1eccbcf1e4152ac240a266ece373ce2522af05ec7ee4409c1afa209ab464d5fa6985aee388014cd435d42dc1d28ea8ec339bd1ee SHA512 46572230d719235fa4ed51361dafe34de6e8cc3057503b957f422516651e6b9ac99a131abf8e6a5b677f4d76163628ef5940d76c466a2d4ab1f9d60f8d64fef1
diff --git a/x11-misc/shutter/files/shutter-0.90-webphoto.patch b/x11-misc/shutter/files/shutter-0.90-webphoto.patch
deleted file mode 100644
index 647e53aa5e04..000000000000
--- a/x11-misc/shutter/files/shutter-0.90-webphoto.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: shutter-0.90/bin/shutter
-===================================================================
---- shutter-0.90.orig/bin/shutter
-+++ shutter-0.90/bin/shutter
-@@ -9396,11 +9396,7 @@ else {
-             die "ERROR: imagemagick is missing --> aborting!\n\n";
-         }
- 
--        #gnome-web-photo
--        unless ( File::Which::which('gnome-web-photo') ) {
--            warn "WARNING: gnome-web-photo is missing --> screenshots of websites will be disabled!\n\n";
--            $gnome_web_photo = FALSE;
--        }
-+        $gnome_web_photo = FALSE;
- 
-         #nautilus-sendto
-         unless ( File::Which::which('nautilus-sendto') ) {
diff --git a/x11-misc/shutter/files/shutter-0.93.1-insecure_use_of_system.patch b/x11-misc/shutter/files/shutter-0.93.1-insecure_use_of_system.patch
deleted file mode 100644
index e71a44f21c08..000000000000
--- a/x11-misc/shutter/files/shutter-0.93.1-insecure_use_of_system.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Fix insecure use of system()
-Author: Luke Faraone <lfaraone@debian.org>
-Bug: https://bugs.launchpad.net/shutter/+bug/1495163
-Debian-Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=798862
-
-Index: shutter/share/shutter/resources/modules/Shutter/App/HelperFunctions.pm
-===================================================================
---- shutter.orig/share/shutter/resources/modules/Shutter/App/HelperFunctions.pm	2015-11-05 21:34:34.222313258 -0500
-+++ shutter/share/shutter/resources/modules/Shutter/App/HelperFunctions.pm	2015-11-05 21:35:37.299461116 -0500
-@@ -53,7 +53,8 @@
- 
- sub xdg_open {
- 	my ( $self, $dialog, $link, $user_data ) = @_;
--	system("xdg-open $link");
-+	my @args = ("xdg-open", $link);
-+	system(@args);
- 	if($?){
- 		my $response = $self->{_dialogs}->dlg_error_message( 
- 			sprintf( $self->{_d}->get("Error while executing %s."), "'xdg-open'"),
diff --git a/x11-misc/shutter/shutter-0.93.1-r3.ebuild b/x11-misc/shutter/shutter-0.93.1-r3.ebuild
deleted file mode 100644
index e16c4a878a4e..000000000000
--- a/x11-misc/shutter/shutter-0.93.1-r3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="Feature-rich screenshot program"
-HOMEPAGE="http://shutter-project.org/"
-SRC_URI="http://shutter-project.org/wp-content/uploads/releases/tars/${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
-
-	eapply "${FILESDIR}"/${PN}-0.90-webphoto.patch
-	use drawing || eapply "${FILESDIR}"/${PN}-0.90-goocanvas.patch
-
-	# 560426
-	eapply "${FILESDIR}"/${P}-insecure_use_of_system.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() {
-	elog ""
-	elog "The following optional dependencies can be used to provide"
-	elog "additional functionality:"
-	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""
-}
diff --git a/x11-misc/tintwizard/Manifest b/x11-misc/tintwizard/Manifest
deleted file mode 100644
index b0aac606db52..000000000000
--- a/x11-misc/tintwizard/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST tintwizard-0.3.4.tar.gz 22918 BLAKE2B f634926017d06bbbb6d288da327603255a7b5acd85b6ea4681be3a08747020b1bf63dc7c9216126412fc9ac333734dfb7816ee9ce62db45d1336dd6ef69fd0a9 SHA512 e67f6cf7db4a34d344104b2795491799ef72365b76b65eaef01595fa2a624e219ed852a9dbbfb6221bec7b9028fdbd487bc7c1d82653466e1ff2a7b38ba4e27d
-EBUILD tintwizard-0.3.4-r3.ebuild 664 BLAKE2B 4f7c875d7fb2124ec609b5b09e8f4d62cf1e85a9676f35a966f0de3806531d69412563d869cddcd2b15bd0d29130118e782f0fc87f2c082f44c12f077a1e1420 SHA512 84b8101db848721be2e9861b80ea6404720dbed998119d328df18072085354d4bb0c098c2843e8b09d8349d22fcfca24c395eadb438862eb48b1972b6d7c57bb
-MISC metadata.xml 530 BLAKE2B 2208af0c2907746170146056abfc38aef3c3fcc7374a3e021ae8468e37fe7c4884559b5c3d940feaa314e8b2de8cb476b263d690c2f7322f2a144628b4af8c23 SHA512 9e3759be90e5523b50f9626399cda039c992025d693628c02a1c356bac2f1b2c92a9e669df4d54f3f89ebca38b41c39182ac655cbf3dede1d9d28ecc9cef9a6a
diff --git a/x11-misc/tintwizard/metadata.xml b/x11-misc/tintwizard/metadata.xml
deleted file mode 100644
index 4eff709724ca..000000000000
--- a/x11-misc/tintwizard/metadata.xml
+++ /dev/null
@@ -1,12 +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">This project aims to provide an easy way to change the appearance of
-		tint2. Through an easy-to-use graphical user interface, you can generate
-		configs and apply to them tint2.</longdescription>
-	<upstream>
-		<remote-id type="google-code">tintwizard</remote-id>
-		<remote-id type="github">vanadey/tintwizard</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/x11-misc/tintwizard/tintwizard-0.3.4-r3.ebuild b/x11-misc/tintwizard/tintwizard-0.3.4-r3.ebuild
deleted file mode 100644
index d854ab98fff7..000000000000
--- a/x11-misc/tintwizard/tintwizard-0.3.4-r3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="GUI wizard which generates config files for tint2 panels"
-HOMEPAGE="https://github.com/vanadey/tintwizard/"
-SRC_URI="https://tintwizard.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND=""
-RDEPEND="
-	${PYTHON_DEPS}
-	x11-misc/tint2
-	$(python_gen_cond_dep '
-		dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
-	')"
-
-S="${WORKDIR}"
-
-src_install() {
-	python_newscript tintwizard.py tintwizard
-	einstalldocs
-}
diff --git a/x11-misc/urxvt-perls/Manifest b/x11-misc/urxvt-perls/Manifest
index ffb22230091b..d89bb1ca0172 100644
--- a/x11-misc/urxvt-perls/Manifest
+++ b/x11-misc/urxvt-perls/Manifest
@@ -1,3 +1,4 @@
 DIST urxvt-perls-2.3.tar.gz 14717 BLAKE2B 312f9bb46839b9bd1e702ca80a6ab02c64db3f74345c9dd7a8abf6b7e66126e6ddbc27e85a4046f745b084780e4c7fb0877729764f860471c9ba80104d3493ac SHA512 d941acb6353b0a7a34cefc94064466ee6b9e879a02cb76a10cd14c37e616d05d6e36a156aeb63191dbc0876c00ee927a3b48949d833a9d12b4676cfb0417bae6
+EBUILD urxvt-perls-2.3-r1.ebuild 574 BLAKE2B 3baf1cd152931ce25b667a8dda105cedc2e74747526072cbfe3626a4ec88ee214f63514cda4cb3d2f002c39f5b41117db5c108161e3ec6eefa73f6d9c9575bac SHA512 1cdaed077147f4bb0c7c784a3ef53106cf3cc76fff14a353ffc1fb7ed2b9229a3bda4e88595d3e70e1100aae4777ff4a24de850400879f6b184026e71a73902b
 EBUILD urxvt-perls-2.3.ebuild 496 BLAKE2B dd2fca5bb8b61cbb662f8ebc76967766f0e56bac32ce8763a6f1cec62181d695a860118e76f9357e65a397b6b026bf76824488dbd031e553f9542663067dc5ca SHA512 a661577b249964ccfa3b96053ec10cc07cb951c297233022c32ffaba969a324fe123f2bdd6c0d6fb3bf3c1ee7f5c3d2cea5870faae5c43ba53b639f67d1342e9
-MISC metadata.xml 343 BLAKE2B 47097c29ad26e39a51ba211011f592a6893edb60021ffc723615624e48fe1768decf5caa4ac362b2718ee26a8d214b028cf411be088221e8b3f49728de84fc90 SHA512 b95747387d85d46ebbdf0dbca69d091d01124b69c8a758223c247be91944d44c01343d4d46eb97cc138093fd2cbf9abf27ecda76d432b45fe4f3e6981049adad
+MISC metadata.xml 460 BLAKE2B 9c560b2fbbbe81b6cb57b3bde580d7fc6d12b2e77bb8408f39c3c4cd5ea46bc3ec3f1e2fa9a662a2f8a5cbd7a06c14c2767862705986b26562ce41765b171313 SHA512 168231144be79e3d35884457fbebec6c8f99c713072a8a9a64361e1e2b57a93b23f69ca34f4acfb10bcaa1e54bf5a29ae5dc9f9cdc9627fe994e128f3210a5af
diff --git a/x11-misc/urxvt-perls/metadata.xml b/x11-misc/urxvt-perls/metadata.xml
index 67c8b7560e0f..d787dd460150 100644
--- a/x11-misc/urxvt-perls/metadata.xml
+++ b/x11-misc/urxvt-perls/metadata.xml
@@ -5,6 +5,9 @@
     <email>juippis@gentoo.org</email>
     <name>Joonas Niilola</name>
   </maintainer>
+  <use>
+    <flag name="deprecated">Install scripts which have been marked as deprecated by upstream</flag>
+  </use>
   <upstream>
     <remote-id type="github">muennich/urxvt-perls</remote-id>
   </upstream>
diff --git a/x11-misc/urxvt-perls/urxvt-perls-2.3-r1.ebuild b/x11-misc/urxvt-perls/urxvt-perls-2.3-r1.ebuild
new file mode 100644
index 000000000000..76baa0b0d908
--- /dev/null
+++ b/x11-misc/urxvt-perls/urxvt-perls-2.3-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Perl extensions for rxvt-unicode"
+HOMEPAGE="https://github.com/muennich/urxvt-perls"
+SRC_URI="https://github.com/muennich/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="deprecated"
+
+RDEPEND="x11-misc/xsel
+	x11-terms/rxvt-unicode[perl]"
+
+src_install() {
+	insinto /usr/$(get_libdir)/urxvt/perl
+	doins keyboard-select
+
+	use deprecated && doins deprecated/{clipboard,url-select}
+
+	einstalldocs
+}
diff --git a/x11-misc/urxvt-tabbedex/Manifest b/x11-misc/urxvt-tabbedex/Manifest
index d7414ce41eed..919b89d70436 100644
--- a/x11-misc/urxvt-tabbedex/Manifest
+++ b/x11-misc/urxvt-tabbedex/Manifest
@@ -1,5 +1,3 @@
-DIST urxvt-tabbedex-19.21.tar.gz 32208 BLAKE2B 6951472a21988a4673ef7716c945de6b256ab45c152e9b58729df45a868efb37ec8a82bd564dc9f1c5ab349e4b7c869dd8f2044f54528071953c69fb47f78977 SHA512 8ffb97e80b023d84ec0ba8c49001f3e05cd9dee4b64a1ef87fb44a41a27e609ad73ecf4f21af6335fff2ce750297603facd5e403a2bfdf38b13908cdc66abe33
 DIST urxvt-tabbedex-20.09.tar.gz 32254 BLAKE2B 7c2bc4d17ad91415210c039adcb01edbafe539e24d82000314124c518d76af97487c1929c168dbce40b4931822aed6224e309e82a855fbc07adf44a0639b538a SHA512 166fa965236d3f60d17d1ad914b3648895237003704219294b0ce72631e6e0431c61a3c320823f227ee58a07f968a1b7d9c479bc58c6246df2f7059e1f04613f
-EBUILD urxvt-tabbedex-19.21.ebuild 676 BLAKE2B b0f3fc6758317f4bd3e61d7a9683de5fd68fb4d27bbf5d88b1000e2bf5d4c73605062a0454155f5033ba4aab06c9081f85a3f3ff2e5b67876b2ad7d42ba427da SHA512 20525a9413005b1ce4e121878d500bff665801bdac50322de5fcee39e84cacf4181b86951a58568e05c88a552790f02685a283e2876ab0bd864815a0817060dc
-EBUILD urxvt-tabbedex-20.09.ebuild 678 BLAKE2B c418e9bcb543d955dc1657ec981f661da3320cd0a056e92c23f25cb480a44e8165714bfb600819f0e1a01d847eeb952074809477eb0e8f981fa3721e97b05f93 SHA512 d28ee4a63752563736e5f6c321fae648fef3255068f779f19e6d38c6a923f97c9dc8f6de5950d0e89a1b179c5a2ef9009da7e991cc799ed4aa7153ee24d481a2
-MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
+EBUILD urxvt-tabbedex-20.09.ebuild 676 BLAKE2B 06458a34bae0eb4cd88949b94492936f55cc8d7443366f1a34af6a05f6a1dab784c5b811d8c324b08d22c1121b5a38815273550d763751c16b846cff49b1df9b SHA512 38f60cb3fd44a1f9e7991ca210aecf79eae48c4e1cbabc1ce6d964bda5f3374d9a59fadb06f81dfea9486612078e356124149f96cd89670f710f44f5f7c9bb7a
+MISC metadata.xml 279 BLAKE2B 8a35347a0311617855cc5b982f14aee93fd54de69d01d51525a613c788a8d7c50310c62fe1d50e53db598d38a8791bd377fd77b8017d9f435534920673ec45d7 SHA512 03d0a7c99f21ce2ef849387c80f61aaa85dc5ed4128f61a11bc5ef74d5566c255b5306d7c860003177e29a00d95f81ed739c92baaeeaa76b6fa565b5bbc45a1f
diff --git a/x11-misc/urxvt-tabbedex/metadata.xml b/x11-misc/urxvt-tabbedex/metadata.xml
index 6b0a0fb3a729..0bd14750c669 100644
--- a/x11-misc/urxvt-tabbedex/metadata.xml
+++ b/x11-misc/urxvt-tabbedex/metadata.xml
@@ -5,4 +5,5 @@
     <email>juippis@gentoo.org</email>
     <name>Joonas Niilola</name>
   </maintainer>
+  <stabilize-allarches/>
 </pkgmetadata>
diff --git a/x11-misc/urxvt-tabbedex/urxvt-tabbedex-19.21.ebuild b/x11-misc/urxvt-tabbedex/urxvt-tabbedex-19.21.ebuild
deleted file mode 100644
index f9845c7725d8..000000000000
--- a/x11-misc/urxvt-tabbedex/urxvt-tabbedex-19.21.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="An extended version of rxvt-unicode's tabbed perl extension"
-HOMEPAGE="https://github.com/mina86/urxvt-tabbedex"
-
-MY_PN=${PN/urxvt-/}
-SRC_URI="https://github.com/mina86/urxvt-tabbedex/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=x11-terms/rxvt-unicode-9.21[perl]"
-
-DOCS=( AUTHORS README.md command-runner.sample )
-
-src_compile() { :; }
-
-src_install() {
-	einstalldocs
-
-	insinto /usr/$(get_libdir)/urxvt/perl/
-	doins ${MY_PN}
-
-	insinto /usr/$(get_libdir)/urxvt/
-	newins pgid-cd.pl tabbedex-pgid-cd
-}
diff --git a/x11-misc/urxvt-tabbedex/urxvt-tabbedex-20.09.ebuild b/x11-misc/urxvt-tabbedex/urxvt-tabbedex-20.09.ebuild
index 492c7a2a0eeb..28cd53709f7b 100644
--- a/x11-misc/urxvt-tabbedex/urxvt-tabbedex-20.09.ebuild
+++ b/x11-misc/urxvt-tabbedex/urxvt-tabbedex-20.09.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mina86/urxvt-tabbedex/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=x11-terms/rxvt-unicode-9.21[perl]"
 
diff --git a/x11-misc/util-macros/Manifest b/x11-misc/util-macros/Manifest
index dc0cdef58d75..0f420192d4aa 100644
--- a/x11-misc/util-macros/Manifest
+++ b/x11-misc/util-macros/Manifest
@@ -1,3 +1,3 @@
 DIST util-macros-1.19.2.tar.bz2 84139 BLAKE2B 94eeeca771042671c6915c562e055c8b965f874c3a5aa1c8107abe38ca984ee32293f68a51ca73d65ac82d245dec6e02ddd62939ab14aee12b4b6fbf350b8c39 SHA512 3f51504b27f0478c136126f15110cf3cdbba218c4d74a8e974cca1381c6e8364609bd0c444f2fb19aa86a7f4e848dfce4f4da940463b224036f75a60b3d88619
-EBUILD util-macros-1.19.2-r1.ebuild 720 BLAKE2B a16f4185df8b2754b375d6d0a549f7fae0ba799b440e1f9a827f7371a5a982ad53b616e0bac11a3061580bcf0d5b59653abbd79e78e31a4e5f158d84f1099a1f SHA512 823c12c9b54cffe90a2435797119914f44f94c1e9b3f91f036268b5baf429f768854989dd44fc73ed431bbfa93fd26de830321daaa112adcd8760ece5375e8ea
+EBUILD util-macros-1.19.2-r1.ebuild 717 BLAKE2B fe4f82c7c5583455f25b286236c0a77ca1cc9f96636a566b39a0a1fb3441aee054ee66125ca250e21ecdc06a0f17afd682ef25bdc4c1f2fae78f2d7936ccdcbe SHA512 ddd5dddec1ab2dcd226b6dd43423c83e4c763c99b79ec661fd11d750daa08374eb701a7b949edc9e410a433dd857dc7234f507ab0e16216f36bdfc8cd433737f
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/util-macros/util-macros-1.19.2-r1.ebuild b/x11-misc/util-macros/util-macros-1.19.2-r1.ebuild
index 7e989da50a1c..26b75243fcd4 100644
--- a/x11-misc/util-macros/util-macros-1.19.2-r1.ebuild
+++ b/x11-misc/util-macros/util-macros-1.19.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # there is nothing to compile for this package, all its contents are produced by
diff --git a/x11-misc/wmakerconf/Manifest b/x11-misc/wmakerconf/Manifest
index ef634842fe66..3a1f56140afa 100644
--- a/x11-misc/wmakerconf/Manifest
+++ b/x11-misc/wmakerconf/Manifest
@@ -1,6 +1,7 @@
 AUX wmakerconf-2.12-desktop.patch 337 BLAKE2B 6fb3b059a2240cc147ba720f72a18cbe2c5d5c5f0aeca2d52f809bce9902f2ce2fb67510d6efe97a616c2e2a28177fce35c584d46ccca697c12b942f49ef686d SHA512 599c668a481c51d9a0cd802c09ef855e6c0e1960ed27b1127390ee3da5f89967e6ad9a443bdb8cc47802d0d74b1d226be55fc4f6fa4f71eab61bf651cf3a2162
 AUX wmakerconf-2.12-format-security.patch 575 BLAKE2B ea65a217b77218f6946f7a15dbb131fc319f377ac9d1d6bba471a391e2c6eaa79999198a78306c870f19eb0af155110fb02f1dd0fa5f4c3eeb6c3ef4717cfb80 SHA512 b341490da9937165f408311a1f4d56e513eef4b7362cc569d9cce327b01b7b614b688a5994b9cef8dc7872930930381fc031ba1a2a0a058a5e207f843ea137b3
+AUX wmakerconf-2.12-glib-2.62.patch 500 BLAKE2B 0e2358e79a0c9d028b58527b66311afdfd47774019027850b94dcd9a446377c05877b0986f0d36b5a3e33f9665e2389238e820944aa5956c2cbd458b6ff987ec SHA512 d607c6ef920173909187610ffc87fa6351b0ccc0be7ad55bb83575d0e0034be52d6c0e079824081f4436c0dce183aedd7de2328a7305837775a1bcc00a01d51a
 AUX wmakerconf-2.12-wmaker-0.95_support.patch 3548 BLAKE2B 0f79184e802703db3a9e9276edf7f1a94ee88fc9053774b8c5f326ce175fa090d8ad15339d66804b03584a82182abd8cafcf2fab707ac7e97c4e45dbeff33ca5 SHA512 be084d96f35ef6c94a1994abb75b5b71a68ffbc6e3ba9b122b380b632d42da743c94951618094ce42305f87ff238a0c667c76859a320229992c4e0316fcbc79a
 DIST wmakerconf_2.12.tar.gz 830156 BLAKE2B 65dd7d16606304b9746e84a3e71764b5491149ac27f4a1802faa5c14a66cbeaa4d04ecce66649acaf05f798e4fe643ac48b9df15c22e5b4e054951adf1d921df SHA512 4289846b20667a12c729b646ce5cc9d673adc49c3c99f1afcf0bf2eb978d7a62c93104e44f38c47984f5fc7bd22a78fff89d68646701c7e763a26ec18d4ff059
-EBUILD wmakerconf-2.12-r3.ebuild 1373 BLAKE2B 7aa7eaa8b628dc21b2f0e1b4c639b84da42e5be3d649411df858c12507e95407c80b87464981f8f785f216951861bfca32fb2fd9d0762bcddd48bd2692f10772 SHA512 528e71176380e7a5833897ce44cfd8c99a4a82985bcfd9463a0e1e3bc636e85c7124777391297d2d7b9a6ad2135026627b83537172aee5daa81f0d8b7b716a56
+EBUILD wmakerconf-2.12-r3.ebuild 1409 BLAKE2B d6852d9ae60dc9eb2aa8700876168211f9cef830a0c316a30799dca64fd96ecf0c1dba7fef1215f6723c3d72c874952abb47e4e08c217a19da1064d589207d45 SHA512 187e1aac499dc3d632a96e159c7d4cfed40d94596661f88a80ab494463aded7f10bbddde42a7147a9e7572a39510adc8cb70b6598df27f25856f56d949903d02
 MISC metadata.xml 337 BLAKE2B 8a0c239dd9d71185a61e17ec3308c84ffa97f60dd152e50eaa50a250746f3fa7049d137d6bbe795444d9e84d66cfcf0bb6fe96031113e29e592eee52c00ab041 SHA512 8f144b1c6d8110362014ab291ecde3aef2192ffbe57ce8261849ef9069ad9449f6871a8aa7c2246b2ae866b4264e38261dee2836b86b25b73396ea7c19d1f9f5
diff --git a/x11-misc/wmakerconf/files/wmakerconf-2.12-glib-2.62.patch b/x11-misc/wmakerconf/files/wmakerconf-2.12-glib-2.62.patch
new file mode 100644
index 000000000000..422aa9e813a9
--- /dev/null
+++ b/x11-misc/wmakerconf/files/wmakerconf-2.12-glib-2.62.patch
@@ -0,0 +1,14 @@
+diff -Naur wmakerconf-2.12.orig/src/error.h wmakerconf-2.12/src/error.h
+--- wmakerconf-2.12.orig/src/error.h	2001-04-18 23:13:33.000000000 +0200
++++ wmakerconf-2.12/src/error.h	2020-03-07 23:21:51.336443663 +0100
+@@ -37,8 +37,8 @@
+ #define  N_(string)	(string)
+ /* I18n */
+ 
+-#define error     error_line=__LINE__,error_file=__FILE__,_error
+-#define warning   error_line=__LINE__,error_file=__FILE__,_warning
++#define error     _error
++#define warning   _warning
+ #define MAXSTRLEN 1024
+ 
+ #undef NO
diff --git a/x11-misc/wmakerconf/wmakerconf-2.12-r3.ebuild b/x11-misc/wmakerconf/wmakerconf-2.12-r3.ebuild
index 57ed8fa294b4..dcb30653f053 100644
--- a/x11-misc/wmakerconf/wmakerconf-2.12-r3.ebuild
+++ b/x11-misc/wmakerconf/wmakerconf-2.12-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,6 +27,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-desktop.patch
 	"${FILESDIR}"/${P}-format-security.patch
 	"${FILESDIR}"/${P}-wmaker-0.95_support.patch
+	"${FILESDIR}"/${P}-glib-2.62.patch
 )
 
 src_prepare() {
diff --git a/x11-misc/x11vnc/Manifest b/x11-misc/x11vnc/Manifest
index 1fdf7fbab908..c7a61861ba0f 100644
--- a/x11-misc/x11vnc/Manifest
+++ b/x11-misc/x11vnc/Manifest
@@ -5,6 +5,6 @@ AUX x11vnc-0.9.16-libressl.patch 4083 BLAKE2B 0b95dad69a0f7180edfe71da6df2c9e602
 AUX x11vnc.conf.d 1435 BLAKE2B 8403d61a4941c56127e869d6ac90d4f85237af9af786f864d32afbedf3e736528b74c8c83fcf3491794b9e62db6ef2a354dccd61f368c8e9251f915e2bd683f8 SHA512 dedc94fab89a06ca6025b99c2c944cabe77640487c8fc761a6420e5be7062ee4c1c383f3846c17bed434ad4f3ec3b994badb493919acb99da3f61caa40c60246
 AUX x11vnc.init.d 1728 BLAKE2B 45680af6aad530a9b36f29adc61c1f90ad272bd7201c30f29b3d6c5b980012ddb299c878ae1bb20734496c4f2b8b1e1c507cadee875305167e3f298993947a9e SHA512 8de7966b79b5acc83c8cebc3c2ef0819196f5a33eabad619991d04c7c059a68afbf44d0ece6b0db33cea1f525402a601b25db220733f0ff69c0fff48d3c50ac2
 DIST x11vnc-0.9.16.tar.gz 1708009 BLAKE2B a8789f95ef421a78a83703748e1d80fd45539dff24f80493fd75e357bc22378213915853f9d114248c172cd83977880e1e4e8a3f8df0771017e9988d83b7307d SHA512 69f65ee312f8dede6051b401304987502a213c6c28c7f41e855734f11de1fae14d5d493dc9c28b2e4b7c0be55f8dbd3b35dd2610aae910183772c3e626736fec
-EBUILD x11vnc-0.9.16-r2.ebuild 1945 BLAKE2B 85635b5d6bd6aa6b20837d31aed989a0e00e2af50d68d3dce21ccfcb5457daafcff3f27394ac8dbffc7b1857b341f1434fd8f76b8a9e144a78a311258dec7877 SHA512 ec31eed067b4502988014fadda81fd6f493be791df1b9aa67a1b93c643c1f020567efce09d9fe141af30ff1f96a42449744944d88c8bc30087a8f624224dbf8c
-EBUILD x11vnc-0.9.16-r3.ebuild 2018 BLAKE2B 4fb6d3eb92944a31a679a8768f236ad8d5d27a972a131b4b44cb482ba8dca324deac586d75b429b3bed8b1d4e25a16f2c63ac650e911c7d8407296edc0a4ec49 SHA512 f2d2ab618df8fe75a3d8ca060666e5fba9af1919909da73b59c9d0c7a2a0adcdfe1ab51ef081f1ddfd252a020c375a2675b7344ac5973b83d2e7e3d306af2d64
+EBUILD x11vnc-0.9.16-r2.ebuild 1942 BLAKE2B 72cb2940aefc086db989a74155fa48fe27a27593ba04c14af7b83a67fd2da64eb2c0354a1565ba9ddfa744b804869f5f3a102a54e87f949b9efa5ca1c01d6e63 SHA512 7d5b4399b806d4059bb5a0aff470671c8b4591febf562c003e57e7ca6c2bc429fa416ef09f6885cc9b764677c38e44041cbf5b4f911a723a98c5a13f5e795103
+EBUILD x11vnc-0.9.16-r3.ebuild 2014 BLAKE2B e85b366cab4ceb65ffc8c7b644b5814da9db6f8070c180526f66f917d291809ea9c4ddfefc921de89ef216cc03e6391df170e3435e3ddce858ebdba7432fc026 SHA512 d79f267e41843d1cf7c40814baddabea3729608d0d2dfc4f28543de459ff559b39a19221f60fcc808992c0cb0bae86126203700bcd8b181e9199bee5f8a5b2c9
 MISC metadata.xml 922 BLAKE2B 02740589fa0091f604e1fff99ace802d4b179a35afd2c40d4ae25d40d41af0425a6e16cdb5951b4968813478a5066c6a241d49beba811dc296f125ba2aaddd13 SHA512 b46e3d0b379cf9967ec878e57d0a21b677ca869921546224f6f663eca4da8f2d57a97d07dac9da90999454584f6ea1c80748adf12663ff03b286292603aef2c6
diff --git a/x11-misc/x11vnc/x11vnc-0.9.16-r2.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r2.ebuild
index d94fc7b87fed..0647c2bea807 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.16-r2.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.16-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/LibVNC/x11vnc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="crypt fbcon libressl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf"
 
 COMMON_DEPEND="
diff --git a/x11-misc/x11vnc/x11vnc-0.9.16-r3.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r3.ebuild
index f01cd79f6bad..e25329e5f473 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.16-r3.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.16-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/LibVNC/x11vnc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+-with-openssl-exception"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="crypt fbcon libressl ssl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf"
 
 COMMON_DEPEND="
diff --git a/x11-misc/xautolock/Manifest b/x11-misc/xautolock/Manifest
index 4306d51d17d7..d167f417047a 100644
--- a/x11-misc/xautolock/Manifest
+++ b/x11-misc/xautolock/Manifest
@@ -2,7 +2,9 @@ AUX xautolock-2.2_p5_p1-waitpid.patch 777 BLAKE2B 82031ddb959208db99472a72db6c1e
 DIST xautolock-2.2.tgz 35288 BLAKE2B 0cd709470002d7a6852a41a56e9f6b540405e172f30e3243a93b578e362f117a3ddd3b6ff15e653eb5466d15e7ff1d5505c19ccfd27d6e7d6ccae4c826a689ac SHA512 5f9dcc25cda706610e77a74235c4b421ca3a833d154b1a269057f0774579e1c6ec36fe0e5be5fadd6942ce8c1640a760f891397586b162e6024b524635153d04
 DIST xautolock_2.2-5.1.debian.tar.xz 5828 BLAKE2B 6a664d30b993986e70af853c037738da0576ca5ee3a0452329d4dffd3132899d1099b5bcc5bbf68ab688240b388396335b0d5227b140a74deca313112d0088cd SHA512 315f27518b89fa6633e3ce157423cd271f3db3b797fc59febc35aa8b33379bd6eda55ac9c7ccdf996c2d9d50bb6bef3b15add84b39236ace425740238de77e59
 DIST xautolock_2.2-5.2.debian.tar.xz 6216 BLAKE2B bda8c7a084e8975d268d626cc5aa02c87c7e6b0ae92351375f298cde4fabd8e48a0578c7c4bf32a280e2ecf13d82b7dcd73a874863616c0f9812ea98ffbe27e8 SHA512 807c9c7da51b16ed3a6600732f8d3b606d2f6c628238df0e6d975ea176ddce3d0e321779b19662f693ed1811b288ddae1b45228c0939e0728c122c1a2e556391
+DIST xautolock_2.2-6.debian.tar.xz 6376 BLAKE2B a7ef40b0fedd21146e359b85b7245695d9395a54aac568800b80a89fb13a08616fe771997d8b9e155c49f8218447022fcb2b256802156ee5f66d923e394a53ba SHA512 c5d350ae2e123e63564e9145de3a7a180b47cca745262cc4f935ced83e0fe2450d68fcbd0c3de3f4566e6650b3d6183b4491f5a2d0caed838221d2bc0b9e1613
 EBUILD xautolock-2.2_p5_p1-r1.ebuild 1276 BLAKE2B 085548a8d13cb2f19faa216864409a49a4cd46205a9dc0455977432ae3f8ff6fa3c9fef222853acfce3a6ba410a0d2d8a91e0f5cd67c445c29e73c980fe508e2 SHA512 8b842594fc91dc669d78d65cb091ec91c45e9172c94686d9e2c072b81d3024a1859d2cb03fb555872360969de15b91897c4fd27059f68ffa5930c12059f1b527
 EBUILD xautolock-2.2_p5_p1.ebuild 1411 BLAKE2B 50ba51c716e15d20309d3be25f030f21310b0d85e61e921e59e377806ee7d08d4fe56fbeea40044304bff1fb753052ffe6f1c0768f9c1623e5d67fc5f983e54f SHA512 9c09ce4bce65235afa3f44fa01eee830639131d6741b8d258f34844ae29c2d5e5be167377c92e419e0f0ecd5efcbfa2238f9d1fe4512d4253e624880235cf930
 EBUILD xautolock-2.2_p5_p2.ebuild 1038 BLAKE2B b58e78b0a320e36511e2b10fc8d86ab8f8018ebcfeb922646f99ae708ae67022cc9d84a6004f8385630899ed78034cf99a72901edcb9ad668ddb5efb35c7c76a SHA512 fcefc00b8d5f38a52af61ed3efc067409ac8f63fdf6f2fe21ddad43f907449d5bd6ab010cc1df542cd28b269d0b9a7005e6f21819f159bcd509c97ea33871de3
+EBUILD xautolock-2.2_p6.ebuild 1103 BLAKE2B 3c426d434e0c799d0b20414270343d08a0065129d7de9dd0f921a378fe2ade5b9e8f6f946949782aa327fb7a2681e67e9c0161abb6d339ad8a2e0409680b2147 SHA512 d5f7a06d84452ef25341f07733c9073cb4704ae5eec0019b9ec185be763137aba18dac8a1dd0fbece5b24a090b25dc75997e689ed76e6d031fee579db5deccff
 MISC metadata.xml 637 BLAKE2B d1b4ecdd6eda1ba1db1550aa7187e1cd90b6093fd257600b4b3506ffb560946ceefe52bedd4364c0506be586daeebbdb1467197047db7a72f23aee9f41680e64 SHA512 62dcaa38a5e6ed4b9f020379fedb6d59f87628ea036b74acb73f600b89d0eab640548c18b104306df3d56c055ce39adbadf49683eaa46ece7ca26c79539c32d9
diff --git a/x11-misc/xautolock/xautolock-2.2_p6.ebuild b/x11-misc/xautolock/xautolock-2.2_p6.ebuild
new file mode 100644
index 000000000000..1abba4868157
--- /dev/null
+++ b/x11-misc/xautolock/xautolock-2.2_p6.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="An automatic X screen-locker/screen-saver"
+HOMEPAGE="http://www.ibiblio.org/pub/Linux/X11/screensavers/"
+
+DEB_REVISION="$(ver_cut 4)"
+SRC_URI="
+	http://www.ibiblio.org/pub/Linux/X11/screensavers/${P/_p*/}.tgz
+	mirror://debian/pool/main/x/${PN}/${PN}_${PV/_p*/}-${DEB_REVISION}.debian.tar.xz
+"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
+
+RDEPEND="
+	x11-libs/libXScrnSaver
+"
+DEPEND="
+	${RDEPEND}
+	app-text/rman
+	x11-base/xorg-proto
+	x11-misc/imake
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2_p5_p1-waitpid.patch
+)
+S=${WORKDIR}/${P/_p*}
+
+src_prepare() {
+	mv "${WORKDIR}"/debian/patches/14-do-not-use-union-wait-type.patch{,.skip} || die
+	eapply "${WORKDIR}"/debian/patches/*.patch
+	default
+}
+
+src_configure() {
+	xmkmf || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CDEBUGFLAGS="${CFLAGS}" \
+		EXTRA_LDOPTIONS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin xautolock
+	newman xautolock.man xautolock.1
+	dodoc Changelog Readme Todo
+}
diff --git a/x11-misc/xbitmaps/Manifest b/x11-misc/xbitmaps/Manifest
index 229dfd6046f4..637d64883953 100644
--- a/x11-misc/xbitmaps/Manifest
+++ b/x11-misc/xbitmaps/Manifest
@@ -1,3 +1,3 @@
 DIST xbitmaps-1.1.2.tar.bz2 129435 BLAKE2B eff2f1e2efbabf447cbe98db09f81db96dc1442d4cce01b570774fb4e3e7323a40385d7821685724a9d9c69219528da980b2ecf01b0d3b822be8879e4d7f3e9c SHA512 eed5e2fce9fc6c532984e6ed1262e440591e311ca6c61a7fe7a5c877df84bfc2d7aff388fb9c894fc098785b8e5352f0bd7c918252247a040cf123874847450d
-EBUILD xbitmaps-1.1.2-r1.ebuild 673 BLAKE2B 77a682fc986afb96ba84d00bd7f4d53fe1e8ca91a4a1de0c2c6d4ab4bc6b5a26deece4da0fa73f7d16d3108567644f6f47610cbfbcded89857fcefb81428cfb2 SHA512 15821088942d1a70c14ab04b4dce16a6703a36c783df7a67deeea5980e15fe8b3e8738d409dfa4df535bd4f6ad16b0e2c680a5f98dfb43157fd0bcae4a017482
+EBUILD xbitmaps-1.1.2-r1.ebuild 670 BLAKE2B 3fa353f18a1bf4cf5d1bd7f09e3587982a80993d9873c81af914ed70bb8a1ce3d99653719926b4ea05c05424a92e04b1816f689a2192f14e58d423b9ad7a183b SHA512 dc27c3a42bb6d08e40fbf0585e36791da958c4b63de32e02d1f7aa1b93e07fc9ebcd6c7f495edf674040b0231ffbe405bee177f67b9d670db04f1546788aa634
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/xbitmaps/xbitmaps-1.1.2-r1.ebuild b/x11-misc/xbitmaps/xbitmaps-1.1.2-r1.ebuild
index 7be9137d7fd8..b1deeb2f45dc 100644
--- a/x11-misc/xbitmaps/xbitmaps-1.1.2-r1.ebuild
+++ b/x11-misc/xbitmaps/xbitmaps-1.1.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.x.org/releases/individual/data/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-misc/xclip/Manifest b/x11-misc/xclip/Manifest
index d6da6abd8240..7bbd558eaf4e 100644
--- a/x11-misc/xclip/Manifest
+++ b/x11-misc/xclip/Manifest
@@ -1,4 +1,4 @@
 DIST xclip-0.13.tar.gz 30461 BLAKE2B e5249c81aceca59f71eeee985ab4a4c9006b6afef98f3f6addd7adc590abea47d3e9df8110ccb6c0c065cf4356a2a2a0866e08604adbac75e3589bb97403aaa0 SHA512 191a86194a1503a47c6641a55855dc4aaa8c2c99d2e6f1d46e727feec85a6639041f37ec2265c05c178c0c7d791d3e88bde89223f879effa878812f078485ed2
-EBUILD xclip-0.13.ebuild 554 BLAKE2B 5aa13acc7487737f94314800f08676b1a02568d5c438aa1dc9e49f1111fbaa83e1d036bb80e2cbf60f09bc60ef1199f8319c5d2c5973d2fef24d3477a7c88933 SHA512 963fe821e0895b421de54c06116d5bda8faf25b26e071991c61eb58bcd2f251c260966e395c1b7744fde6de76b4a0b50ff199d3fa8bcfcfc8ad30a42d1b83f5d
+EBUILD xclip-0.13.ebuild 555 BLAKE2B 982229ecac0dde410702624310397b84172c011ec12adfae7017a5462950f71d02f6e5d92ed54f7b5a5b653381beb237bb77146cca1f87e78bab0e967e5736a6 SHA512 d932a44af91156071dc3707590eb885eb2cf569fbd09343669981a659bf4548e40d297eca7a0aff61f1798501e7922a706c292582df393b5cec5f658e91a7786
 EBUILD xclip-9999.ebuild 456 BLAKE2B 7c2fce6b884fcbdd0705a300bf2756bfe0c5466eace338a129ca220076bff3d0ad256d25df37ccebfa11f27526388d0e8563b032e2db8344242ef9fd335026c1 SHA512 cddad35c477142f3efee940c37d59c7b6191d91dc19e17d1a2902ba4ef3ac6bbdb57dd07f4f52a0af64b02b5659f19b7543094d7a44c4a1bcefa9f8451a4e1f6
 MISC metadata.xml 364 BLAKE2B feee6d00129ab16e53f20b00c4a69d5def638b3231316079b63354b089817e3c84d300ec2da1966593a51339f941232ec466d6f99d5e0f365260306287121d2b SHA512 fb7dd60c82f3d739a58c1451434d15d14906249ef5bc350dcda11ee6d5366f04981d93a98a290e653b8271269c3f21978ed50894da0bf5da9fdaaa9b2def4cf1
diff --git a/x11-misc/xclip/xclip-0.13.ebuild b/x11-misc/xclip/xclip-0.13.ebuild
index c38400be3275..eba50d7fd63f 100644
--- a/x11-misc/xclip/xclip-0.13.ebuild
+++ b/x11-misc/xclip/xclip-0.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/astrand/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-misc/xdg-user-dirs-gtk/Manifest b/x11-misc/xdg-user-dirs-gtk/Manifest
index a42c0c91ef68..fa06a53446d0 100644
--- a/x11-misc/xdg-user-dirs-gtk/Manifest
+++ b/x11-misc/xdg-user-dirs-gtk/Manifest
@@ -1,3 +1,3 @@
 DIST xdg-user-dirs-gtk-0.10.tar.xz 116528 BLAKE2B f86237859636046ecc72bdd62ee5c6a3726ad701aabe04f14bff6541554d3e9de82265cb95b353714adba5d6c8742f94150df9b6f3e4043db9e6885e61e569c1 SHA512 c3ef070244cd1c87312c2c2602dbe7bc3dd26eed632b0d8d779580d7ee6259efdda453ab7bdf4415cc72fad7a74d9dd36476189fe446d5627e4db75d905302f5
-EBUILD xdg-user-dirs-gtk-0.10-r1.ebuild 1110 BLAKE2B 2e9ea4b5ffa939840e3681b8a9fa23e378e01ec85342e96e4e95c392b4a3d016a57064e168f12eaf3eba3f9dc8258202eb78c66849f964ae745bc67fd5ad351d SHA512 c3518e6ed37dae65117e7a8372a6c53cb01c068643bdc70b26c21604aa63dde3ae0f4031f90f9bda7b0958d294cfe3cecd772ea18ed101dece6dc0c021420912
+EBUILD xdg-user-dirs-gtk-0.10-r1.ebuild 1111 BLAKE2B 5abdbd8773c2f83c1076ce5a8b2073c1e00343c0ec7752e84ae016fc8577b1b2b671971c37e532797ffaefac5c60e7dde8c7ebb03233036475ee0dae99e6d236 SHA512 7a46fc7f040c7b9d873c1cdc0942ffb1d6ffbc281bfce3e4b17814c1e527adc0bc99606bcec7e1f2a1a14c4b35313f93d75dbdb6faf4e8e7e00e425ec5868c87
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild b/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild
index 71d92d0a6d07..d433d5e80cee 100644
--- a/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild
+++ b/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/xdg-user-dirs"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/xdg-user-dirs/Manifest b/x11-misc/xdg-user-dirs/Manifest
index 842848a09d23..1b9cb16addd6 100644
--- a/x11-misc/xdg-user-dirs/Manifest
+++ b/x11-misc/xdg-user-dirs/Manifest
@@ -1,4 +1,4 @@
 AUX xdg-user-dirs-0.15-libiconv.patch 298 BLAKE2B 5028bfcafccc0310c192894cbeee12627b5b599cc5b612b6a38dcec45e36b9aa1f4ab2cdc31f29899b278088e61776bff51b5216adbf6c2497370c7966b17a50 SHA512 227b134d0782067f8c8688832036da8cb1afbcda247349db3502867e3f1b1eaa09885f2419762712ab9ce82655d4bb9a7ec17f63afdb9f00be5efcfd895ca7d4
 DIST xdg-user-dirs-0.17.tar.gz 257291 BLAKE2B 75b44a841b7961977824581dbbc760282fa3a5eed0a5496746ff6e09cabe4dec022d0f6fb129a877d8310c1fb214035f1e917c0e327dd5267bb83c47bbe00d5f SHA512 a02cc251f2d0a8bd0dad498901c8c6fbe8dae0e0e156abcaf27b1ded376a1ed369c2e59201d56ab4e38c9d521026fa39199177f3868c30e5c50cc03665dc335f
-EBUILD xdg-user-dirs-0.17.ebuild 945 BLAKE2B 03a20e6dd292ed993d44af2cfa1afed27624b0e6aa55a7b755f0a58e252f3ee6b86677e026df6443fc832440fe674fe255e4089152355ec6ca1782897f7de9d8 SHA512 dfae312745d636ff9c19621e24f5ac5c4d1b53325db09ee6ed91c95fdb8daeb6e1281f517cfc7083428e85f8c0c4ae890770f6c87dcadc6c43349c41ef145a74
+EBUILD xdg-user-dirs-0.17.ebuild 946 BLAKE2B eeb6c5bc1bf84ba37d82f18b61102089697faf53eaa6dc68b95a67db2765f6a703365bd88e274b2e382850da3f34259e624b587382c9fae3bd8b5d08969bce13 SHA512 103ee866601fcc42be78b53fc3ef7cc12a3f862ddb5f9136104d184ab0cf6964fe8e76c265c40019c43cc2293babb0891da211489e92c19e39aa44ff59bfd845
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.17.ebuild b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.17.ebuild
index 5b23d5a10fbd..bb36a19d1dcd 100644
--- a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.17.ebuild
+++ b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.17.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://user-dirs.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="gtk"
 
 RDEPEND=""
diff --git a/x11-misc/xdg-utils/Manifest b/x11-misc/xdg-utils/Manifest
index b97893e4c6f2..679d1bb53a16 100644
--- a/x11-misc/xdg-utils/Manifest
+++ b/x11-misc/xdg-utils/Manifest
@@ -1,4 +1,4 @@
 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
-EBUILD xdg-utils-1.1.3-r1.ebuild 2158 BLAKE2B 8762ae0fefdb6440012fa56b4e02f1928ae74eccb5bba383600b9665ac415c8101e3d4f51d63254959038bcffb0fa02ea8ff1fa6ff3143e475f10b0276f6e4d0 SHA512 ba720fd45a558916b0df8a508d1f8dce3c2be99cf172ae0fff61ef5d17f1b33207f33d5aad801658ae69bf49c2116692fd0f908ba9fb011c3123eadeeee06252
+EBUILD xdg-utils-1.1.3-r1.ebuild 2155 BLAKE2B 485e8e4dbfe2b9d06824fb96c9671f11cebd2036c270643bcbb72f43d76ce59a99c968fa720aec3198e882369f6f5f1861b79ec8c0afd3c1d05c57fcc2f8805a SHA512 c90d646add091124fa01b50666c3ebbc770319ce4644ecf7f5f5a694f3cf38581f5c72299be59ee74bf339e635fe8f43956cac5705393dd65ed6cf37dd913c0a
 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 fa3f1ac89cca..49d9abfce9e4 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 ~sh 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 ~x86-macos ~x64-solaris"
 IUSE="doc"
 
 RDEPEND="
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 32540b342635..ccf9baa9f8f0 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,6 +1,5 @@
-DIST xkeyboard-config-2.28.tar.bz2 1682987 BLAKE2B 8883787119bb46e4351d4023aee0f1a495b6acc87755b408ffa51d5082f84f4b1a083a8a0ee640b00afd35777bc8e8e0ef2187cd0bbb2600db81da8fef19298f SHA512 be38e61a7d3a1c03f9dc92fed5aada65fdb8b42272e874e01156a39de07f2a7c81846e9ba449aeb95661587f8d05217d549a1315ee0dd92facbb6158362e68ae
+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
-EBUILD xkeyboard-config-2.28.ebuild 1259 BLAKE2B 00d1e92c69e95a5c098dd14f33d351d1b9efc2dfe6f7715ff9684b6ff4e0ce1864f4b2a9aa97f75fb063fea195fc399b1224b29cbbdd3e49181870a0296dd1b6 SHA512 fdd0311feddd07c143fc6614b8a71dfc120882963da30bf0f07e43c477e05ed9d9b1f21aff49053bcc7bb9ed207294b0916a7317e08bae7a1ff058b63c60a1fd
-EBUILD xkeyboard-config-2.29.ebuild 1233 BLAKE2B 56544c89955b57055e22b25ca084fdedc119607dd5851946ab472527fe48411e2025fd939f1f6117e041a73a96aa3b6d32326279fd81242a0f5fbe1f3ab4463b SHA512 65b17aafb3234f9c20c215300d7659c66931e242797b175975bba0a1ecd04659ac261944d6f4d63b55f75246d7375a72147669be5e729d4496efabd71efd5731
-EBUILD xkeyboard-config-9999.ebuild 1233 BLAKE2B 56544c89955b57055e22b25ca084fdedc119607dd5851946ab472527fe48411e2025fd939f1f6117e041a73a96aa3b6d32326279fd81242a0f5fbe1f3ab4463b SHA512 65b17aafb3234f9c20c215300d7659c66931e242797b175975bba0a1ecd04659ac261944d6f4d63b55f75246d7375a72147669be5e729d4496efabd71efd5731
+EBUILD xkeyboard-config-2.29.ebuild 1395 BLAKE2B 5b12916ab898994fd013590bfe57ea2925310d251f8609f1995b9a64cf5ec4fc5f9beae49dbd2de9ee0ffed017d466c2f995487d32669e86fc149e4789c0bafb SHA512 c20621c807ffd9150558c0c2df7af2fde339045b695cca5f97f51da29ccb136a538b4125492f11617526c363d98fe496057edb5c8ff405130a5d7763d0876325
+EBUILD xkeyboard-config-9999.ebuild 1344 BLAKE2B 3c02114e37b8db6084419232eac2b01e9b9d3b7417403a77e78a340bf5c0457ae307217d6ee79e50ab0130b79c7e173824a68b4b946d25ae6cbf8e763b9bf84f SHA512 3133d952555a82d6aa55a8e8a5d39a6357d8b8e9f13f5ed5f1be0dde0ccbef4bb381fe1effab2ff259500b1810aa697892c2795084fae4b319213158fe4a4260
 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
new file mode 100644
index 000000000000..0f4d455f6ea3
--- /dev/null
+++ b/x11-misc/xkeyboard-config/files/xkeyboard-config-2.29-fix-python3-support.patch
@@ -0,0 +1,34 @@
+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.28.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.28.ebuild
deleted file mode 100644
index 3291be05d506..000000000000
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.28.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-RDEPEND="
-	!<x11-apps/xkbcomp-1.2.3
-	!<x11-libs/libX11-1.4.3
-"
-DEPEND="
-	${LIVE_DEPEND}
-"
-
-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[@]}"
-}
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.29.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.29.ebuild
index 712663d9504c..37f50f131e36 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.29.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.29.ebuild
@@ -3,6 +3,9 @@
 
 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"
 
@@ -13,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 ~sh ~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"
@@ -21,6 +24,7 @@ SLOT="0"
 IUSE=""
 
 BDEPEND="
+	${PYTHON_DEPS}
 	dev-util/intltool
 	sys-devel/gettext
 	virtual/pkgconfig
@@ -28,6 +32,14 @@ BDEPEND="
 RDEPEND=""
 DEPEND="${LIVE_DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-python3-support.patch
+)
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
 src_prepare() {
 	default
 	[[ ${PV} == 9999 ]] && eautoreconf
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
index 712663d9504c..66e3276b4ab7 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
@@ -3,6 +3,9 @@
 
 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"
 
@@ -13,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 ~sh ~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"
@@ -21,6 +24,7 @@ SLOT="0"
 IUSE=""
 
 BDEPEND="
+	${PYTHON_DEPS}
 	dev-util/intltool
 	sys-devel/gettext
 	virtual/pkgconfig
@@ -28,6 +32,10 @@ BDEPEND="
 RDEPEND=""
 DEPEND="${LIVE_DEPEND}"
 
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
 src_prepare() {
 	default
 	[[ ${PV} == 9999 ]] && eautoreconf
diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index 477b48473148..9d661a5bf9f2 100644
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -4,7 +4,11 @@ AUX xlockmore-5.47-strip.patch 2048 BLAKE2B 0f0f00a38e1d3b5edebf40416698ad3b8732
 DIST xlockmore-5.50.tar.xz 1632968 BLAKE2B 2e692d16d70e3186ec1f31c192414b286f8815f2f428a6f7f43b3de0117c51c4ad2fbdfb91debe2ecb75c8683212b5d33bee62d81374552703d578b02d3af036 SHA512 627a905c4641d6083676a766931f23c06e2ac5af9b43447ccf03143d329d24b786aac6b248318929399b5fae98f1ec17e676466b5cbd09f180377c483694c569
 DIST xlockmore-5.61.tar.xz 1936312 BLAKE2B f4d12f1dbd5da1d8cef16690e393fdd9ba4162722398c8239c0091f2cd46cc3f401c1a62ed1910bf37fc0d98f0bf0723ca9003caf507e3d8a6a83f7b51228f35 SHA512 be64b3dc22f1c0c310ed4a085fcaf9f7ed96c5d2a97f3359966201df54fc5acfc3e5d94cb0616a28a217e0cc6954f9a519198c238e40202263a7c03438771a7d
 DIST xlockmore-5.62.tar.xz 1943836 BLAKE2B 6ce9b9ad709881a50eba0e32ae1e7524414a5e92e34daeff1ce68b6bb4738117155543d15219723ab514d520064601824a22d438541a699c742ab0c620285c64 SHA512 fc7c63a8ce781ba1a9598b5e3d585cc85051da864dbd59e3232b2fa6b6529743f9244e52bdf588ae438c02a2e1e745eb81b372234189e73ae6698cc962c387c2
+DIST xlockmore-5.63ALPHA0.tar.xz 1944780 BLAKE2B 702662a96d3275be45d1a578d35ab7ec209161318ec32a7d6ea1e540dc3722d7fe21aa1681b56e4542e7d0ff870804675dd957a09037c731dd30c358253ca0d3 SHA512 2f5f2cf8b395ac89ab421729a2db2c276d28fc880b95e5166a8280530d50fd44ee809d95be248dfdd18b21f76c664f6410ed0da42e4241094e428280664b4705
+DIST xlockmore-5.63BETA.tar.xz 1944632 BLAKE2B a9616a8bfe854e4cbd099e108db4311c328d57bf169a85ea6d24df36c1746fd8a0697908c1927b17c38115dc2ed5470dfba6eb0a624e04eeae6dee3458495189 SHA512 1625fcc41120d9ad6a0b032900ccbce037d8321c1ad5d0d1b2fcc12653fc55b8567473aa6de8cbce9b76ce2cc3a0e3c6abb2b3fc311acc93f94345973a94150c
 EBUILD xlockmore-5.50.ebuild 2231 BLAKE2B 3accf80283ec7705cfafe4531bc38c1694d9d27381c9aa375bb14a1d59e865dd1c2aa8c99d1cdd26a93fe929b3302ca4646fe93f740feb56c86b70ca9362ed6c SHA512 f0116108dcbae364e4a7c391054890fca090fc182b8bd11c613e84bc91ccb07904e5bd14c515b934e2895c9e6bd2f82762d09719de4e648f6077338e3f05ff97
 EBUILD xlockmore-5.61.ebuild 2290 BLAKE2B 684053c5ea68511e810fdddff942f61ad18ffcdffa32a1b6eb68ed4269def2d03b82a70b75c3e37500615c5816077a49944b93858a53b9e07b8eba27c68bcba0 SHA512 e7818da25a25f015a06aec1f8096a3394981bc4c68a73f7a6a178fff6e278a91f088b02423eaf937aea0d9e33b5115973f23e714e78b12ae5458977012efb22f
 EBUILD xlockmore-5.62.ebuild 2290 BLAKE2B 684053c5ea68511e810fdddff942f61ad18ffcdffa32a1b6eb68ed4269def2d03b82a70b75c3e37500615c5816077a49944b93858a53b9e07b8eba27c68bcba0 SHA512 e7818da25a25f015a06aec1f8096a3394981bc4c68a73f7a6a178fff6e278a91f088b02423eaf937aea0d9e33b5115973f23e714e78b12ae5458977012efb22f
+EBUILD xlockmore-5.63_alpha0.ebuild 2290 BLAKE2B 684053c5ea68511e810fdddff942f61ad18ffcdffa32a1b6eb68ed4269def2d03b82a70b75c3e37500615c5816077a49944b93858a53b9e07b8eba27c68bcba0 SHA512 e7818da25a25f015a06aec1f8096a3394981bc4c68a73f7a6a178fff6e278a91f088b02423eaf937aea0d9e33b5115973f23e714e78b12ae5458977012efb22f
+EBUILD xlockmore-5.63_beta.ebuild 2284 BLAKE2B 5dfca5003f797a6765b33f14a91664b40559441812611677f392b2291a7e29297c254fb29ec3ea895df6e903f98e5926215b74d2ea0b342527da35eb045cc2f0 SHA512 0ec91c240df64f0a3e6c3c0aa7fbf35bdb889cb4d4cc76825223802cf3dd807067f228980838e1d813214f20ba8269d1cc9df96548dc14d2dca4b2d8ee102671
 MISC metadata.xml 446 BLAKE2B d638ac6f12a203ae9ada10ae4c33e3a3d9901e350b6e6925c50078d66b29343cae42a67f84d5334182c1e816bddb05d062eb7b7e47c9125b273db118c4de573b SHA512 c8fafb010e63c39beeee5b53ad37354d19e98ac4cf33f29606b0af379811a0738c9c70d1fb7c31a5673d4a6365fb658a6a8bf49135b748bea9069a690ce543ed
diff --git a/x11-misc/xlockmore/xlockmore-5.63_alpha0.ebuild b/x11-misc/xlockmore/xlockmore-5.63_alpha0.ebuild
new file mode 100644
index 000000000000..2071d0700818
--- /dev/null
+++ b/x11-misc/xlockmore/xlockmore-5.63_alpha0.ebuild
@@ -0,0 +1,110 @@
+# 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
+)
+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/xlockmore/xlockmore-5.63_beta.ebuild b/x11-misc/xlockmore/xlockmore-5.63_beta.ebuild
new file mode 100644
index 000000000000..989d6c25d4c0
--- /dev/null
+++ b/x11-misc/xlockmore/xlockmore-5.63_beta.ebuild
@@ -0,0 +1,110 @@
+# 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/_beta/BETA}.tar.xz
+	https://www.sillycycle.com/xlock/recent-releases/${P/_beta/BETA}.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
+)
+S=${WORKDIR}/${P/_beta/BETA}
+
+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/xorg-cf-files/Manifest b/x11-misc/xorg-cf-files/Manifest
index 9dbece18f17a..eb6920ca8ba6 100644
--- a/x11-misc/xorg-cf-files/Manifest
+++ b/x11-misc/xorg-cf-files/Manifest
@@ -1,4 +1,4 @@
 DIST xorg-cf-files-1.0.6-solaris-prefix.patch.bz2 4364 BLAKE2B 219911bf7fb6907762b70062c43842f116bb0c8ff033569d3a033918b004d89514eda43d1f478c7f0dc1b18adb17f5792990cc8d15cb9770b57e555c0b362f10 SHA512 159d55da274decdac934cded63f33164f5866dc81e853b1a205abdbe56fba4099ab4278e2fb5ff855c0b76784ba2b3fa89e6db2b4fdc9647111698e2c77da4a3
 DIST xorg-cf-files-1.0.6.tar.bz2 337859 BLAKE2B aab1495a699e6236095585c94151b3bc2edbff9e2b1f414fc916e09eca8d5dd4a5492ee9c69f8b21bf7d6c6ef1ab0639ba0d96be02b6736968b13b9d4d6f4a26 SHA512 1749a5fbcda2c15c300028abce79a3304cfb10f215bf98cf30558144eb64f9fa06a69203159f44405224ed567ac5bc0ff1222e3656367f69acc99f44871424fa
-EBUILD xorg-cf-files-1.0.6-r1.ebuild 2094 BLAKE2B fe8b05aa0b24f1b5d24fc6e7dd59cfaaec3fb27809995308547654aa5089e5970b8ac57d890db51404ccc7e45be975169ba7c5b2b9c915dc6a427205b134c6df SHA512 9079a81ecdb7b538760275e0fccacf6ddb60a4b2e7fd97afd13d43efcf4994e6df07b1260a5b2229f4c41fa4980171d9dfba6a06c53780395ace24d62b6fd3f7
+EBUILD xorg-cf-files-1.0.6-r1.ebuild 2091 BLAKE2B 9190c72aed8f1436db73de9b8cf0826228b46367227daeac2c77c7f52bb214a52734a21d1117821a7bc94dc1faad6f26200f384a6d5319b9907d69baf1f9be17 SHA512 ccd1e716d293728f40bbe6f570a916e8e29591490828ab5509183a8bf85b63536cc4afaa3d5c67b5cc67785049c5d2ec841638b8e3becf56b185f63b2fda5705
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
index 53d2699aa970..6326ffe97ca0 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+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"
 IUSE=""
 
 BDEPEND="
diff --git a/x11-misc/xscreensaver-app/Manifest b/x11-misc/xscreensaver-app/Manifest
index 90818072a7b7..8d078c724e07 100644
--- a/x11-misc/xscreensaver-app/Manifest
+++ b/x11-misc/xscreensaver-app/Manifest
@@ -1,4 +1,5 @@
 AUX xscreensaver-app-2.3-configure.ac 484 BLAKE2B 3bc48e99a411b9742d3241a6d8007382367987c64b6f7358b3f021c390aab1f3c3f7958169a6e2c2d947a2fcc9312da75998dc66bf7b820a60ce734e0903b5ff SHA512 4093fb62a68f0831cf16ed69e2fd64434c0dc5381299d52743702e6992baf016a3161a7d120ddd5b3a7859f30c2e75e0e0b88d725e519b3a69130178ac0eb60d
 DIST XScreenSaver.App-2.3.tar.gz 47566 BLAKE2B 8ba867b8bd64885f7c0ed6b86adb52b2886f5b7f99c06b3993c2eca9d9ee09bf9edeaf04fe4eebe1d3d4d175acc6c00034cf3caad8c8d2318a6f671831f92a30 SHA512 eb65cd14f70e6f152fced9f073dbc7737c855f27787472d0e7e9c4caaaf59026c0977c0f27ebd55b13391ab29491f4a96878236b78716b1f15dd9b772091f290
 EBUILD xscreensaver-app-2.3-r3.ebuild 855 BLAKE2B 32c20f91e7766bfa891b9871f53135c042b30a6dbe9ed558dc4f13392b370c28b80126731c1e341b03863e55008c0cd0e9aa95420e97760fd478d55a11753f49 SHA512 d0d37f62648a09521f0e5e994f18cff63b821ad4bbf0eaeac15eac7b75dc88a4de379f94a641331e4b950aa3b1aef0bc54f49d7ca9c2c31262b3060d8f150b67
+EBUILD xscreensaver-app-2.3-r4.ebuild 864 BLAKE2B 99b2343bf86c4fa3ed634b11179037872603b6fab765b59e874a94649a92cf630fce6b4307a7b6e16088778952be4b1b58c29b66b8ebc07768478844b6c15a60 SHA512 570f5ab06a1b36dcbd591e2c08a47be0b208fca3f17d75f0c60d57a049c976edadd93662c3e96bf3253630f5ccfb09b02ea57e206b34544f55623805d949e560
 MISC metadata.xml 371 BLAKE2B 5f7abb08f7add4875f3976d7ca48d0dd3523a8ad25238c38ef8ccd1a0b40855a4b12292d077726de6ef5c6dccbcb128f653e461c0878ad6faf55184bd8f2a031 SHA512 86572bcaec2a3d22274e9b4cbadfbaf731082f5be3499b024338da625d29cae3deac7000f42a8582932f9f6791f1deff9c277d590180e5842934df281c289726
diff --git a/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r4.ebuild b/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r4.ebuild
new file mode 100644
index 000000000000..02dacca65c2a
--- /dev/null
+++ b/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools toolchain-funcs
+
+MY_PN=${PN/-a/.A}
+MY_PN=${MY_PN/xs/XS}
+MY_PN=${MY_PN/s/S}
+
+DESCRIPTION="XScreenSaver dockapp for the Window Maker window manager"
+HOMEPAGE="http://xscreensaverapp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/xscreensaverapp/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="
+	x11-libs/libdockapp
+	x11-libs/libX11
+"
+DEPEND="
+	${CDEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+RDEPEND="
+	${CDEPEND}
+	x11-misc/xscreensaver
+"
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+src_prepare() {
+	rm configure.in || die
+	cp "${FILESDIR}"/${PN}-2.3-configure.ac configure.ac || die
+
+	default
+
+	eautoreconf
+}
+
+src_install() {
+	dobin ${MY_PN}
+	dodoc README NEWS ChangeLog TODO AUTHORS
+}
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 71a94da5f292..9ee478003b22 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -6,14 +6,14 @@ AUX xscreensaver-5.28-comment-style.patch 698 BLAKE2B da9a224ae0b657c8868fef24ad
 AUX xscreensaver-5.31-pragma.patch 442 BLAKE2B 375199197c7e3eaf5028099f0fc8b754b7e5dca4911a76de46372751c82a060ae9c0ee5ed35d1efb33f02d6ffbfbd5903ba5f823e1db5ba9d2762a8841cefacf SHA512 9aecda422bc0f22bab5eb0de22f1c861b9ed1a2ff4fff2327bec134fafc5e3116156d80a70e81b67e9ce7ce05eb6f842614b2e939cb91a618dd0b10e1d443557
 AUX xscreensaver-5.35-gentoo.patch 1328 BLAKE2B 406f9c9d318ad3de6d5b098f54b2586971240f513b6d5dba12bb2862693a548dc550d9c812fa570a68aaa652d6287bb48818512ededfc621edbb4be384312d60 SHA512 ac7b953a353f75821cb15a81b6dec224fe16601df9a9a00f90831d55ac8a69074ec86fa16967ac40e0583bdabc3b7aa2576acf3879942f274296a36997918b2f
 AUX xscreensaver-5.35-offensive.patch 1678 BLAKE2B 6479ad1d5f081d3ae0ab7e9f08edf2656ac63bb77ec1c21885e0dc8f213580669d8021ff2de76556e7be00bfee78f9c6adf410b50e57d404637fff83c42437bc SHA512 fbc7a4f8e296e1249c2e0454978e48ea82a7b99f2467e2f46ff65e3294f5d8b4a5e366c3b6c9bc37b7f0aca92fa6d59d7492b6310d48c0b3240953f77821408a
-AUX xscreensaver-5.41-comments.patch 462 BLAKE2B 6df2d5573bd3a1c44582116f3653c7c0f2ea3738e94695dd3a680a5e0333c490c9a308554ae370e6565d766768e87a49a28d0c7cefbf7e69c8e32a4a1f4dba82 SHA512 672ee1c9d455883215bbf09bc5ebb7c38efa132419a27352d0b6b570e94f193e374524e6a4e5a75f8bb178cccd1d72442b7adf5866a0c2dc389704f123f8f931
 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-gentoo.patch 1368 BLAKE2B d74cbe8effe8feb4c682f8df537a2a1897defa31c0838bfb34967642ab2e66e8058b3306c98e360e3c5f81ff4649b759d5386e6e2613c59fb945f439c3b0cc02 SHA512 bba16c093a2a16e57e3bbe77ed7a54201e7e9e1c9a3c5a65065f275a4faa6898327865b62a56be0c538dabde1fb4571ccfd567035911b85688f31ac1cba128b1
 DIST xscreensaver-5.38.tar.gz 10712548 BLAKE2B 02630aa7daa3faf8aa7ff453218bed5e3db287b7c4d9b564a6d8822db8b2e1ae6be7843342d585f2d2900d2bd0e7fd2a12d49748d81bf10818fa5bc4254f6ef8 SHA512 9014571505afd3a116f541334ea37737659f63f4cbb267a56be451e2c353d9e57218119670a44297d36d140672ea423d0682433401b17749138ab6baf6507561
-DIST xscreensaver-5.42.tar.gz 26903469 BLAKE2B a82716a3f1f19f85eb1bc7a8ba1981221ac2ad47c1411687f1043da7e50edada73ab9c7465d655546f8a9015db69ab4f35ef8ff2a0b3d79f5a59d3e02aa2f819 SHA512 84cde9364c933de720acd51a0bf75eb4d0642d60f62b92de89d932233eb5abb51e1edb53cd413b2dc4801a02cb68652a28d7d1f83cdaa8d8cdd1fee7d651eefd
 DIST xscreensaver-5.43-r1.tar.gz 26973508 BLAKE2B 67b57214e8a41ba895df6e9efcac3e712f24be06ee7914b38d3a8e639d4945c927c4ac28469d2180bc4a3999a4b89d2a60e633799ac5204c42fa17ad76dd21fc SHA512 7ccaf30fb05ae2110f742f1a5c99f83cd4c8e6749124066b5a418cf3e0ba1b8ff09858eeec29c11b0c8ea428b95b2916481c50cee6a5d952ec941b3ad1b6adcd
-EBUILD xscreensaver-5.38.ebuild 3409 BLAKE2B d9ce98672b029191da8b8b2ae6c160a8061c923b49dc85a0869009a0cbdcac98be3a0ed0b22cdd9ff7625a36d2b55e4e347d63be556e939e61da925cbb2049c3 SHA512 7dc0a26b82a3a3eda05af891c6331f5061ccfcdd0d63a504bf2e12c6444ae28eaf8eab8c0e98f8f4a477eba3bc4729721075b566ec0f31c1b13d17a33fe5d66f
-EBUILD xscreensaver-5.42.ebuild 3409 BLAKE2B f981f0ebb8ed327d7783fce5bfb46445d1de903aa03cae8104f8372cb8b3e08a72e45cc7d12db982eaaeab21fa6586cfc19f0688418599e1bcb376c169b6a2f1 SHA512 9e4cdd4b3601f92538b9dc8dfd205a969e98785e28f3a1130aac3629f46d0bca89ca58e5ec90f03e9bdad5386c79d9a7518cdcec41b11c9ec866d1da4b8ebac5
-EBUILD xscreensaver-5.43-r1.ebuild 3450 BLAKE2B b35d4a58423150912b6f7c693f80dba8c6024aa748cdc1d44710574b6c059ffb2037d6fe42a775d2afeaeaf783ed3188d521745e93fc713317f817473ad9c9eb SHA512 be9657046e52771c1f96e9ffe7e0605beda49dce8b6d698568c093b33edf3cb09c0015884be17aa404524c47978773e373222b4da87779b1046624fff662f9d8
-EBUILD xscreensaver-5.43-r2.ebuild 3452 BLAKE2B 3c321b7d8261661aa4d9fbfa18ac3d57c036a0c3f061edb6c3ad5e3e73d1836db4b11fb2a638531b77fb943783bc7ea6c5b8440f87119bb8eddcc7002c4edca7 SHA512 54a025370004e9690a539f8cccf746269037470108e84dce52fe64f2f023f25b3ed1ea2fb43c2aba77590943ed035f3cf41de078b70e247aaa9db60081ea582d
+DIST xscreensaver-5.44.tar.gz 27001826 BLAKE2B 102025aa2f57672ed3547f0e9bab989566fb8e50ecae8b9e4078ec5ee5de3cad09fec107695335ef236ad9fe19b2638978366a180a998d77b0ce8a2a5d1ebde3 SHA512 9d9144dec6f075c2d6a1c3cd45123a98d6d0cd732d6c3e3389e97b3f802b8f8765a188d1e35f97f123ca0a64661ea616b7b710577063c311da3d99d8439f1dae
+EBUILD xscreensaver-5.38.ebuild 3406 BLAKE2B d29eb0895c856865d735036c064fec9a920a9dc0253cffb9ccd07bafad75b06f341bfdc2902062c0e7935c2158d60c9400c5dcde748080ee59d4aa8049bd073c SHA512 9e87ee8b23a113934dc061cb5e6dac0d2c2536bbae0e93530a23ff6fc29fb161165cbee59f002433c894cd6d7c92ce49577b6358c0c7246b4014cff47cc955dd
+EBUILD xscreensaver-5.43-r2.ebuild 3448 BLAKE2B 953d1dfd697904e3d8c137099398fac3998c3f22ac185a0ccebf7b59c03f341a8807b2ec7d4aa4441b5c5c5d5642ad852205cb5e4a317af72ce03f9becbca827 SHA512 9b900c2ed638ddaa42fd368832e9aa7fe6d516515cd83988ee0f6104919d33355cd78f6c24b7b8e35523620db889cff50100893fb38f33727ca3e9aaea197484
+EBUILD xscreensaver-5.44-r1.ebuild 3594 BLAKE2B 95ceb762c631c6150e92b5d412b24affc64a4ea2383a014d9b8c014a89fe013720e340948929a4bc6e35654d9168a777538cd50196ba3333e5194a3abf49f151 SHA512 5c0026dd8121c7b8dfac7b21809bb7baa293e3859e9c43cba969787828cd1357413a37402972608934a731b47082e954f1dfd08c5802d304c95b5e55eeee8e44
 MISC metadata.xml 660 BLAKE2B f720a7df804148568927cc909ec46013c8de0087f2ab5751bd3852cf310161c328d43f29db22105e46b4c142db3e84fa5a2c943bae63779156bfe569726bf12b SHA512 ecc2b0423bd77d7713db654875f5d112c90c278653248298c877a84104db40430fcdaffaac2cbb972bb6ae6ce970b498d4d086278ba85c519dedeb3586bcd41b
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.41-comments.patch b/x11-misc/xscreensaver/files/xscreensaver-5.41-comments.patch
deleted file mode 100644
index 8cef848ac7bf..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.41-comments.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/hacks/fontglide.c
-+++ b/hacks/fontglide.c
-@@ -2421,8 +2421,9 @@
- 
-   textclient_close (s->tc);
- 
--//  if (s->b && s->b != s->window) XFreePixmap (dpy, s->b);
--//  if (s->ba && s->ba != s->b) XFreePixmap (dpy, s->ba);
-+/*  if (s->b && s->b != s->window) XFreePixmap (dpy, s->b);
-+/  if (s->ba && s->ba != s->b) XFreePixmap (dpy, s->ba);
-+*/
-   XFreeGC (dpy, s->bg_gc);
-   if (s->charset) free (s->charset);
-   if (s->font_override) free (s->font_override);
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.44-blurb-hndl-test-passwd.patch b/x11-misc/xscreensaver/files/xscreensaver-5.44-blurb-hndl-test-passwd.patch
new file mode 100644
index 000000000000..cf95cf105b01
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.44-blurb-hndl-test-passwd.patch
@@ -0,0 +1,10 @@
+--- a/driver/test-passwd.c
++++ b/driver/test-passwd.c
+@@ -69,6 +69,7 @@
+ char *timestring (time_t when) { return ""; }
+ 
+ const char *blurb(void) { return progname; }
++Bool in_signal_handler_p = 0;
+ Atom XA_SCREENSAVER, XA_DEMO, XA_PREFS;
+ 
+ void
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.44-gentoo.patch b/x11-misc/xscreensaver/files/xscreensaver-5.44-gentoo.patch
new file mode 100644
index 000000000000..279a19cf6386
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.44-gentoo.patch
@@ -0,0 +1,47 @@
+--- a/driver/XScreenSaver.ad.in
++++ b/driver/XScreenSaver.ad.in
+@@ -31,21 +31,21 @@
+ *mode:			random
+ *timeout:		0:10:00
+ *cycle:			0:10:00
+-*lockTimeout:		0:00:00
++*lockTimeout:		0:30:00
+ *passwdTimeout:		0:00:30
+-*dpmsEnabled:		False
++*dpmsEnabled:		True
+ *dpmsQuickoffEnabled:	False
+ *dpmsStandby:		2:00:00
+ *dpmsSuspend:		2:00:00
+ *dpmsOff:		4:00:00
+-*grabDesktopImages:	True
++*grabDesktopImages:	False
+ *grabVideoFrames:	False
+ *chooseRandomImages:	@DEFAULT_IMAGES_P@
+ ! This can be a local directory name, or the URL of an RSS or Atom feed.
+ *imageDirectory:	@DEFAULT_IMAGE_DIRECTORY@
+ *nice:			10
+ *memoryLimit:		0
+-*lock:			False
++*lock:			True
+ *verbose:		False
+ *timestamp:		True
+ *fade:			True
+@@ -63,7 +63,7 @@
+ *textLiteral:		XScreenSaver
+ *textFile:		@DEFAULT_TEXT_FILE@
+ *textProgram:		fortune
+-*textURL:		https://en.wikipedia.org/w/index.php?title=Special:NewPages&feed=rss
++*textURL:		https://planet.gentoo.org/rss20.xml
+ 
+ ! When a saver writes an error message to stdout/stderr, it can be printed
+ ! on the screen.
+@@ -124,7 +124,8 @@
+ 
+ ! The format used for printing the date and time in the password dialog box
+ ! (see the strftime(3) manual page for details.)
+-*dateFormat:		%d-%b-%y (%a); %I:%M %p
++!*dateFormat:		%d-%b-%y (%a); %I:%M %p
++*dateFormat:		%x %X
+ ! For day month date:
+ ! *dateFormat:		%a %b %d, %I:%M %p
+ ! To show the time only:
diff --git a/x11-misc/xscreensaver/xscreensaver-5.38.ebuild b/x11-misc/xscreensaver/xscreensaver-5.38.ebuild
index 6ebfe87bb887..655aea06e054 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.38.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.38.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh 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 ~x64-solaris ~x86-solaris"
 IUSE="gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
 
 COMMON_DEPEND="
diff --git a/x11-misc/xscreensaver/xscreensaver-5.42.ebuild b/x11-misc/xscreensaver/xscreensaver-5.42.ebuild
deleted file mode 100644
index 97cd9a819442..000000000000
--- a/x11-misc/xscreensaver/xscreensaver-5.42.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools desktop eutils flag-o-matic multilib pam
-
-DESCRIPTION="A modular screen saver and locker for the X Window System"
-HOMEPAGE="https://www.jwz.org/xscreensaver/"
-SRC_URI="
-	https://www.jwz.org/xscreensaver/${P}.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
-
-COMMON_DEPEND="
-	>=gnome-base/libglade-2
-	dev-libs/libxml2
-	media-libs/netpbm
-	x11-apps/appres
-	x11-apps/xwininfo
-	x11-libs/gdk-pixbuf:2[X]
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXrandr
-	x11-libs/libXt
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-	jpeg? ( virtual/jpeg:0 )
-	new-login? (
-		gdm? ( gnome-base/gdm )
-		!gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
-		)
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)
-	pam? ( sys-libs/pam )
-	xinerama? ( x11-libs/libXinerama )
-"
-# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
-RDEPEND="
-	${COMMON_DEPEND}
-	perl? (
-		dev-lang/perl
-		dev-perl/libwww-perl
-		virtual/perl-Digest-MD5
-	)
-	selinux? ( sec-policy/selinux-xscreensaver )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/bc
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.05-interix.patch
-	"${FILESDIR}"/${PN}-5.20-blurb-hndl-test-passwd.patch
-	"${FILESDIR}"/${PN}-5.20-test-passwd-segv-tty.patch
-	"${FILESDIR}"/${PN}-5.20-tests-miscfix.patch
-	"${FILESDIR}"/${PN}-5.31-pragma.patch
-	"${FILESDIR}"/${PN}-5.35-gentoo.patch
-	"${FILESDIR}"/${PN}-5.41-comments.patch
-)
-
-src_prepare() {
-	sed -i configure.in -e '/^ALL_LINGUAS=/d' || die
-	strip-linguas -i po/
-	export ALL_LINGUAS="${LINGUAS}"
-
-	if use new-login && ! use gdm; then #392967
-		sed -i \
-			-e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \
-			configure{,.in} || die
-	fi
-
-	default
-
-	use offensive || eapply "${FILESDIR}"/${PN}-5.35-offensive.patch
-
-	eapply_user
-
-	eautoconf
-	eautoheader
-}
-
-src_configure() {
-	if use ppc || use ppc64; then
-		filter-flags -maltivec -mabi=altivec
-		append-flags -U__VEC__
-	fi
-
-	unset BC_ENV_ARGS #24568
-	export RPM_PACKAGE_VERSION=no #368025
-
-	econf \
-		$(use_with jpeg) \
-		$(use_with new-login login-manager) \
-		$(use_with opengl gl) \
-		$(use_with pam) \
-		$(use_with suid setuid-hacks) \
-		$(use_with xinerama xinerama-ext) \
-		--enable-locking \
-		--with-configdir="${EPREFIX}"/usr/share/${PN}/config \
-		--with-dpms-ext \
-		--with-gtk \
-		--with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \
-		--with-pixbuf \
-		--with-proc-interrupts \
-		--with-randr-ext \
-		--with-text-file="${EPREFIX}"/etc/gentoo-release \
-		--with-x-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \
-		--with-xdbe-ext \
-		--with-xf86gamma-ext \
-		--with-xf86vmode-ext \
-		--with-xinput-ext \
-		--with-xshm-ext \
-		--without-gle \
-		--without-kerberos \
-		--x-includes="${EPREFIX}"/usr/include \
-		--x-libraries="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_install() {
-	emake install_prefix="${D}" install
-
-	dodoc README{,.hacking}
-
-	use pam && fperms 755 /usr/bin/${PN}
-	pamd_mimic_system ${PN} auth
-
-	rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
-}
diff --git a/x11-misc/xscreensaver/xscreensaver-5.43-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-5.43-r2.ebuild
index d95ba78bc02c..3f0ba54893e3 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.43-r2.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.43-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~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 ~x64-solaris ~x86-solaris"
 IUSE="caps gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
 
 COMMON_DEPEND="
diff --git a/x11-misc/xscreensaver/xscreensaver-5.43-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-5.44-r1.ebuild
index 135973789838..94909200656d 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.43-r1.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.44-r1.ebuild
@@ -7,12 +7,12 @@ inherit autotools desktop eutils flag-o-matic multilib pam
 DESCRIPTION="A modular screen saver and locker for the X Window System"
 HOMEPAGE="https://www.jwz.org/xscreensaver/"
 SRC_URI="
-	https://www.jwz.org/xscreensaver/${P}.tar.gz -> ${PF}.tar.gz
+	https://www.jwz.org/xscreensaver/${P}.tar.gz
 "
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~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 ~x64-solaris ~x86-solaris"
 IUSE="caps gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
 
 COMMON_DEPEND="
@@ -65,11 +65,9 @@ DEPEND="
 "
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.05-interix.patch
-	"${FILESDIR}"/${PN}-5.20-blurb-hndl-test-passwd.patch
-	"${FILESDIR}"/${PN}-5.20-test-passwd-segv-tty.patch
-	"${FILESDIR}"/${PN}-5.20-tests-miscfix.patch
 	"${FILESDIR}"/${PN}-5.31-pragma.patch
-	"${FILESDIR}"/${PN}-5.43-gentoo.patch
+	"${FILESDIR}"/${PN}-5.44-blurb-hndl-test-passwd.patch
+	"${FILESDIR}"/${PN}-5.44-gentoo.patch
 )
 
 src_prepare() {
@@ -85,7 +83,17 @@ src_prepare() {
 
 	default
 
-	use offensive || eapply "${FILESDIR}"/${PN}-5.35-offensive.patch
+	if ! use offensive; then
+		sed -i \
+			-e '/boobies/d;/boobs/d;/cock/d;/pussy/d;/viagra/d;/vibrator/d' \
+			hacks/barcode.c || die
+		sed -i \
+			-e 's|erect penis|shuffle board|g' \
+			-e 's|flaccid penis|flaccid anchor|g' \
+			-e 's|vagina|engagement ring|g' \
+			-e 's|Penis|Shuttle|g' \
+			hacks/glx/glsnake.c || break
+	fi
 
 	eapply_user
 
diff --git a/x11-misc/xsetleds/Manifest b/x11-misc/xsetleds/Manifest
index b38bb7e443f4..103c8069562e 100644
--- a/x11-misc/xsetleds/Manifest
+++ b/x11-misc/xsetleds/Manifest
@@ -1,6 +1,6 @@
 AUX xsetleds-0.1.3-assignment.patch 208 BLAKE2B a1f5d7814e17fac4ca1a3f0e02e17be063d7dd61316bfa7c5899a3d1812d3bae3aaed25b5bd6512c22fd0d36e0ea0f19cca837a7e0ef655fef09ba164d05f57b SHA512 8434fecb410cdfa35de8e1b93b4c3021df0629fa8d44a05b484e0d9ced597811fdbfd740acc70f9900af7e38b6f866eb3c9fc0173664dfa260d5a3ccef5aa2bd
 AUX xsetleds-0.1.3-isalpha.patch 236 BLAKE2B 0a4599f5f4f0a56521967c30ceee7d79e65d7321b2f99065e42b77e94baf9cfd53611d192326a3e574c57f7de1df3a459ddd0905bb37c8013de21c65068d6ad6 SHA512 5191fc8ed447d921dfd0a47514de03e03dc744f17b22a1ac3973b1c91104c015c7881cc156c4e2e073f3ba18e17187b34b5db80359489ffc372a07c1e6bcbb10
 DIST xsetleds-0.1.3.tar.gz 221399 BLAKE2B 11311f972abc0f0c83ec47dbfe2743d4220daa4fe445c4c0f4a5d7c827d690549611bd373577882d1ac75b853e468ce36d3a6a447873a523a530676528bbd011 SHA512 7fe6baa77b4b2c8f57dfc331776bb457520facdb2f54a5c101764c590d7c5556cd00477e56d36e64cb7264a8de28698422b99ec4852798069189fbe6c1c19f72
-EBUILD xsetleds-0.1.3-r1.ebuild 686 BLAKE2B 60c6959400619b58a9179202e0e623e4983e3925708423f886306aca89639681e3be559f06c987a9d279b3075d13b0357e898951ec6181899d7a4bb153b22a8d SHA512 cf7e24b3fb640729f8cefa44b9963504aa83159c4149d0dc941e64645d8571fc28db1c6371de1decefb93a07fde9fd98be4226b3b982f332737cf2d8f941402e
+EBUILD xsetleds-0.1.3-r1.ebuild 687 BLAKE2B 5de1b74b78689270238b598810c1a230da77090d56c06f153dfe6f8a51fd19e4e68975c3388047cdfcdd8bc3b049589ea0e11f5028fab4bc3381cc4e5077216b SHA512 b38f74fa6ba64f881b41e9055b56afa377e746c2c92660057ef51fbd344441ac3f30b406778e8bfd7ed96b3cead2f75de98e78f5ed4b1d0b0be4f79e1550d7ad
 EBUILD xsetleds-0.1.3-r2.ebuild 730 BLAKE2B ee81de0d3ce760f04eefd6fa5ba60f585b4f31fd07ade86df7b4b2f19b9a3fbf5803690f91d7b8e3c2b988960abf8281f9db96ca287d16896c08f30e3a803c01 SHA512 cea531f0016ac1b2e760bf5f5f4a34dca858a08af9940794eea18bc49efa8c58cc30bd180e68c61d3760836be1da5eb5e7f6460e3076371de2b85cef0103bd4e
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xsetleds/xsetleds-0.1.3-r1.ebuild b/x11-misc/xsetleds/xsetleds-0.1.3-r1.ebuild
index 57399f550f82..2da7811b8e48 100644
--- a/x11-misc/xsetleds/xsetleds-0.1.3-r1.ebuild
+++ b/x11-misc/xsetleds/xsetleds-0.1.3-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.unix-ag.org/user/bmeurer/xsetleds/src/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ~mips ppc sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc sparc x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-misc/xtermcontrol/Manifest b/x11-misc/xtermcontrol/Manifest
index 4b6db66b892e..bfddc077cfe7 100644
--- a/x11-misc/xtermcontrol/Manifest
+++ b/x11-misc/xtermcontrol/Manifest
@@ -1,3 +1,3 @@
 DIST xtermcontrol-3.7.tar.gz 151984 BLAKE2B 246b17e0b38540cfe022321129d76ae196c8d0b50b2a2fffbb523029321c5e8fde093fc5af16e5a550fc39eb2fcaf1fca4882de2948c45397c9bd4a9a11a06cb SHA512 b23da5dd07ea8fc59717752e937cffb36038870f3ad486d43b8d0477826916255ae8f00f894293efb2dead46ff9122c7e27200d5fc15b7bd91d9df1b649e2081
-EBUILD xtermcontrol-3.7.ebuild 371 BLAKE2B 2efe5ba73a135b3b01d9ecf4b9ebf804c6cf089c296704821ac097ec17d2d78603bd2ac5d50d6842327f2b421ce350615091162bc61a9a3db2d06dca2992b02e SHA512 931092a86264099a003047127779e75f65e07ce405d982b8b44c1cbb468da452761f1a851f724f0abdcc543976d87539e812a4423534e61652c36877c85fec25
+EBUILD xtermcontrol-3.7.ebuild 372 BLAKE2B e79fe3ec397bc714f2123e71413202fd3436de53cfd6944c5248ab6d194a30f2259793638485092db965b89eac548a37666f7a8f60eeb8f9e78914205181b1ef SHA512 949eac5ba6192597f9a3d80762aeb1b52df81a9659d0f2c02c6ad120df407b7cae9ffac1816d64c078ecb229eeab420c948fdde3468ac4fda75c8e3333662718
 MISC metadata.xml 689 BLAKE2B fce013dc9ec9488e94202966a807b7e28491fc553fc243008846f845462034a8645a68a2122832c2118a3911856c0e0fce13c563ead4da707375eaa16cc81fe4 SHA512 ee635786fb7c6876636390fac2aa50cf01946dcbead809021f7bb795ef713bf21ee04123f574d4d7d12402f93c9262f3bcae46fdd0580dd316321cb42421687e
diff --git a/x11-misc/xtermcontrol/xtermcontrol-3.7.ebuild b/x11-misc/xtermcontrol/xtermcontrol-3.7.ebuild
index 9e6e423f3ee0..857f12bcce57 100644
--- a/x11-misc/xtermcontrol/xtermcontrol-3.7.ebuild
+++ b/x11-misc/xtermcontrol/xtermcontrol-3.7.ebuild
@@ -9,5 +9,5 @@ SRC_URI="https://www.thrysoee.dk/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ia64 ppc sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86"
 IUSE=""
diff --git a/x11-misc/xtrace/Manifest b/x11-misc/xtrace/Manifest
index 04d28edff235..514025e99567 100644
--- a/x11-misc/xtrace/Manifest
+++ b/x11-misc/xtrace/Manifest
@@ -1,3 +1,3 @@
 DIST xtrace-1.4.0.tar.gz 109032 BLAKE2B 61e1360923eb6b83e47e8d6eb8882b362ef4f257b699d6de9c43556a0e9fe767edab90dfe2d5d792297be244d976a7a0ff7b2df37c87f5e63c7b4731fd2d089d SHA512 97363c5518eccdde15f2f0567d2bc46e8e54638e0b2ef33b207526d660a9f607d5176651dc95aa48267808701406f74de55bed972a931c84462446e3b74c6a7a
-EBUILD xtrace-1.4.0.ebuild 759 BLAKE2B 812529dea175c70a4ec7846ab95fe3bc1a8b80822a1fe9401b62ad58384fc79a00dcdc5c71aa5eb1d964175458420b44924dbce807a4c7985ec9d56ab15b1805 SHA512 95dbcffb2b67daac7c7ebf341795dd8c44df4497094ca1478afc8094f5617101e8dd572029175d478140ae9d90d80b2fa5c5f8a3fb432360a23f87ad0321fc85
+EBUILD xtrace-1.4.0.ebuild 755 BLAKE2B dae895a1ba61fb7085fc6bb0efb20886d65fd044df8663cead2162d9a942e0512e7c5a016b8cc30bbfd720fef32f2df2d82adab9e49eed3b35da301cf31c8a5a SHA512 8b035d3ed21e93253f4efbe3d66d3e13d452f48a9539038b37bff143558a66f6bb8a70f683b12c6630c6896e49ac2602cf0daa47ddda0e452233e81c97927b9b
 MISC metadata.xml 255 BLAKE2B a2162fdaa6e5e8ad6a0310f1e03075023f8548ab4f689c43652ccfe84418ec1ee31bc7c9351cbc8bbc08db8e1b5cb3fe700b6d0ae3bf0c751933b883704ee59a SHA512 a406e5b0292decc477b110f62832679ec16a81044082ef04854421aa6fbac93bda9ca2205a6a39347610ce2564db2cd0fdc314a4924258b00fc15231ca73df95
diff --git a/x11-misc/xtrace/xtrace-1.4.0.ebuild b/x11-misc/xtrace/xtrace-1.4.0.ebuild
index 21fc2c1feec9..e869ff648168 100644
--- a/x11-misc/xtrace/xtrace-1.4.0.ebuild
+++ b/x11-misc/xtrace/xtrace-1.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://salsa.debian.org/debian/${PN}/-/archive/${P}/${PN}-${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~sh ~x86"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~x86"
 
 DEPEND="x11-base/xorg-proto
 	x11-libs/libXext
diff --git a/x11-misc/xtrlock/Manifest b/x11-misc/xtrlock/Manifest
index 78164f69ce21..5bed8e910c47 100644
--- a/x11-misc/xtrlock/Manifest
+++ b/x11-misc/xtrlock/Manifest
@@ -1,3 +1,5 @@
 DIST xtrlock_2.12.tar.xz 20620 BLAKE2B d40599f5fec67b8e89f1028dafc929a9b21d6ae1f6e094658d07859e7f74e4686d338e1e03393f9981a62030839969b57493a8655e225b963df8dc04cf6b62f6 SHA512 8392a8c254726e99d2324415bfdac6e577f725942d4e7fd39c915637f87814f1737aefa903a1502632272cabbb10182070dc15ec5d3e5268c9c1b53218d00f36
+DIST xtrlock_2.13.tar.xz 21156 BLAKE2B 879c27936cf8058707cbdb2247e1044c8c5eadf74dcb2bcfd5ec8f4b2bab80da6859118e48943de97f7696e41456771bf274b03728a61f5ac6bef8b471192dce SHA512 656e1e77194b816b04260a88c8046b8ef25d6df0405de6fe1ee1dfb2ebfa528a329c1b67be70eaac5ce4ee6a4159d728d363bf8a59232941b76b1e6d14aa91aa
 EBUILD xtrlock-2.12.ebuild 712 BLAKE2B 5968bbe4c0c16a3a5c693a1a7db79077c2937839a5b7f2ad48c9cc0656d04ca61395708c3b2500ab2495f648864545529ad745ff8851b04ce50d1960a5659237 SHA512 9d521a618c686ca417c0c3727f7f278ba0e76c75bddf173124056af30340ceb0fb004a59b04d1307bd552d87bc9936a3bf947e585d98ed48e5ab252a4adc71b4
+EBUILD xtrlock-2.13.ebuild 715 BLAKE2B 7012bdad71fc2d45d5e5af693ff58e19c8714aefecae1d3618da544c91080249eec8c08e80e6214b23aa98e78d597ac5b503e6f77e61efb8a59cdfd66e60e62b SHA512 e4f32e61a12916eee11b64e6b4fbee0cc7a75c45de9535c5e2437931682e715ebc27a70525d5cbd81d4e1ad0fa9727b0d0957c3df296fadfd426990d434f7477
 MISC metadata.xml 318 BLAKE2B e2fde4c35c72439790ea9e4c0e403f1a0666a7ebc8e9f350b29138d01c171765fac8cd6adee54667bbc19921e6fc976a427c3429464769a02d9e8dc8c83a8925 SHA512 7d56445a5c7fffdc1104633cdd30eafa17588079b8a1f4cb226984b1aad4e41fe84320608681143dc01c5f1ac5f104cf0717e8183164031644220f9c61086a3b
diff --git a/x11-misc/xtrlock/xtrlock-2.13.ebuild b/x11-misc/xtrlock/xtrlock-2.13.ebuild
new file mode 100644
index 000000000000..87544effb0d1
--- /dev/null
+++ b/x11-misc/xtrlock/xtrlock-2.13.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="A simplistic screen locking program for X"
+HOMEPAGE="http://ftp.debian.org/debian/pool/main/x/xtrlock/"
+SRC_URI="mirror://debian/pool/main/x/${PN}/${P/-/_}.tar.xz"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	x11-libs/libX11
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+	x11-misc/imake
+"
+
+src_compile() {
+	xmkmf || die
+	emake CDEBUGFLAGS="${CFLAGS} -DSHADOW_PWD" CC="$(tc-getCC)" \
+		EXTRA_LDOPTIONS="${LDFLAGS}" xtrlock
+}
+
+src_install() {
+	dobin xtrlock
+	chmod u+s "${D}"/usr/bin/xtrlock
+	newman xtrlock.man xtrlock.1
+	dodoc debian/changelog
+}
diff --git a/x11-misc/xwallpaper/Manifest b/x11-misc/xwallpaper/Manifest
index 2912ff460e79..f2d3e5bc4115 100644
--- a/x11-misc/xwallpaper/Manifest
+++ b/x11-misc/xwallpaper/Manifest
@@ -1,4 +1,6 @@
 DIST xwallpaper-0.6.2.tar.xz 82600 BLAKE2B 2e2b1121fcc2481c4a1e3c78e357534b9609b4435c4364f22dbed78ee0de7c671d2044403c22d22b494a9c89efd17d843f32b296c863df3c0f5d7b3673ae361f SHA512 3713038ffe8fe1da117dc64db6e3c8642fe663473d1e9078963890fa08f21af6ace60e08773e23e6025fcf2116563e24c76d07a66ba02537b38aafa9ac99f395
+DIST xwallpaper-0.6.4.tar.xz 82752 BLAKE2B e81a1a9ec56ffe0a1953f1186c945c9ebb143ff683b8c0c01b819506b79520738935d04725420a24b38119221cbb71d9a5562bffd03e03736c65ba7e3c6a1713 SHA512 531910957c44f7e5ce7357fa46737967f673aeca53868012211eb91507f78bd028f8d84fcbee6e1237107816a09f8247cd0445c0907b60792ff5d07416630d56
 EBUILD xwallpaper-0.6.2-r1.ebuild 1023 BLAKE2B e285ddbab7b2fec704a7eff51e7b3a26eebd6c5e2c4721fcc8aa61ded8cfe20c54891930d4d53e36280c2a2e911cd9511bcae7b6d4f2430a4b0547f63bb1c7dd SHA512 810271ad0ce334df6adf60d69949f8a0e16b66753d872dd82190c66c97b7b37a98643b90ede10949a86086cf72e28ce36756cbcda5af9c90471b97056884a619
-EBUILD xwallpaper-9999.ebuild 1018 BLAKE2B e812a3fe52e010dbd3ac6b950a45a8e02a93f6cfa36f2f2f2016588465af6a25a2be264c748bcda18cc6010e4b10866c85a00f81bd95a46725a959c68018c418 SHA512 894e039552b341c29c207864e0c41fb3eb6d6fd93a819320e56350a1981c60c168231c6f65ad4373b1e708fb78b7cb47e5510990da0eae8061b5356eefe0b150
+EBUILD xwallpaper-0.6.4.ebuild 957 BLAKE2B 4b98ca3eeeb452114cac1659db79ce06013706d2640eafbe9232a6850f9b5782ccc0ffc96d9e014d8ae01e0583bb8370601d24ba93b57df8611ed3b30395d821 SHA512 20d58283aea3edc79637a5715db014d9002b5acce8351688bfb0cfe00612795498589c6aa09e1849a38abd9e581ace669e861a1d4f8e1da1d93b91050e6efcec
+EBUILD xwallpaper-9999.ebuild 957 BLAKE2B 4b98ca3eeeb452114cac1659db79ce06013706d2640eafbe9232a6850f9b5782ccc0ffc96d9e014d8ae01e0583bb8370601d24ba93b57df8611ed3b30395d821 SHA512 20d58283aea3edc79637a5715db014d9002b5acce8351688bfb0cfe00612795498589c6aa09e1849a38abd9e581ace669e861a1d4f8e1da1d93b91050e6efcec
 MISC metadata.xml 804 BLAKE2B db3ea33826679dd19ae2631256fb9570b190fed70efd5084059cd7b23d620f632e654658062ddb1d92ec1ac31a67285c2610282e2c5d0af0806e4c1b554dada2 SHA512 ecd6a763905744ab6a8aae1772027401810e0d18e806147a0bec305722a2a4dae39cc9fa5e400db6933b636ec9787b80fd0f1b0e2c0eaa4f5c87d2e3f4cb4991
diff --git a/x11-misc/xwallpaper/xwallpaper-0.6.4.ebuild b/x11-misc/xwallpaper/xwallpaper-0.6.4.ebuild
new file mode 100644
index 000000000000..2b1e1615823f
--- /dev/null
+++ b/x11-misc/xwallpaper/xwallpaper-0.6.4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Wallpaper setting utility for X"
+HOMEPAGE="https://github.com/stoeckmann/xwallpaper"
+
+if [ ${PV} == "9999" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/stoeckmann/${PN}.git"
+else
+	SRC_URI="https://github.com/stoeckmann/${PN}/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+fi
+
+LICENSE="ISC"
+SLOT="0"
+IUSE="jpeg png seccomp xpm"
+
+RDEPEND="
+	x11-libs/pixman
+	x11-libs/xcb-util
+	x11-libs/xcb-util-image
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	png? ( media-libs/libpng:0= )
+	seccomp? ( >=sys-libs/libseccomp-2.3.1:0= )
+	xpm? ( x11-libs/libXpm )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+src_configure() {
+	local myconf=(
+		$(use_with jpeg)
+		$(use_with png)
+		$(use_with seccomp)
+		$(use_with xpm)
+		--with-randr
+	)
+	econf "${myconf[@]}"
+}
diff --git a/x11-misc/xwallpaper/xwallpaper-9999.ebuild b/x11-misc/xwallpaper/xwallpaper-9999.ebuild
index 1fd0759173fb..2b1e1615823f 100644
--- a/x11-misc/xwallpaper/xwallpaper-9999.ebuild
+++ b/x11-misc/xwallpaper/xwallpaper-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [ ${PV} == "9999" ] ; then
 	EGIT_REPO_URI="https://github.com/stoeckmann/${PN}.git"
 else
 	SRC_URI="https://github.com/stoeckmann/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
 
 LICENSE="ISC"
@@ -44,7 +44,6 @@ src_configure() {
 		$(use_with seccomp)
 		$(use_with xpm)
 		--with-randr
-		--with-zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
 	)
 	econf "${myconf[@]}"
 }
diff --git a/x11-misc/xystray/Manifest b/x11-misc/xystray/Manifest
index b0edf9876988..5b221bf98008 100644
--- a/x11-misc/xystray/Manifest
+++ b/x11-misc/xystray/Manifest
@@ -1,4 +1,4 @@
 AUX xystray-1.0-ldflags.patch 316 BLAKE2B bd0239d319aeda5e8c61925378f2a536138cd5257a70a131b6aca45b224b2e554eac0e1e212ecacf3001f2860e9e188e551cbabef4f960f595c34c8640e46c2d SHA512 f452a0a0db60bc4c9c1a67790dd817a979bf09ee7db8e424d2d58bec83d2b56d23ee67e62f8604a82820a54e3c57fecd35ffc1202c2a89b2cb23cc904df730b4
 DIST xystray-1.0.tar.gz 18225 BLAKE2B bc115aa93448a2d6e0c0ec7f57643aa2444557090e1a7de3e3d2b6fe4c3c12045f31dbb09e6cdcb7afb95488c9fd5537a35a4ae82579017f0645d2a46e697acc SHA512 50f3700e497dae875f659d55e2d5c469e977ab513c35f82516f2c139e2813f126bcc7658d76b55346480c0ca7d65a67b74b289cdae775bd13c0dc9da31a9a92c
-EBUILD xystray-1.0.ebuild 565 BLAKE2B 761cd32c2901a96435880c56289e24b40ad3382fb8b5ae2e340354a8538d76ac5c6be374c0061bc43dafa3e06a30d65b0bb59c86ece0bf689203850c75cfa8f8 SHA512 07643dcff81ee060d43cceb7cd4c74b7c84f6ec70c4cc306f7b13422fc46e3efab0092e84c929cd61453d1dd82748b6d6f0d32f3ff30c4dcc139be760aad1fc4
+EBUILD xystray-1.0.ebuild 563 BLAKE2B 5b97ca54ca36f9d362b201844c40ced58a197661e476df8b37ea5ddbdcae0d05b1e991ef6be5bb9debdf076e967713d08e03337ee332aae209d28c31d8882c88 SHA512 844a17b4072343e4b3c25829c2f297e0d5a27f20910c0e35d604383530df38a16ce30bbf0729e34f2b53459c75fbd487a57b5e2517aa1aa178935ccdc9528531
 MISC metadata.xml 326 BLAKE2B a3d1485377bba814c3a31f73eb244304c9f5ec44a427abadc3c591b9ec2ea850005a9a362d20b44d41ecd7f4ca8c6ac5f4abf1b34ab96c12c320a1a956119b54 SHA512 a2a9e6a403ef85cfedcaf7c0b9ec395b98004203dfefaa1a560dd19f1a5f74ff981e3020e790498adb2d0a14e65b7b018e76b2626caeb74eb85d1e9805c9c43e
diff --git a/x11-misc/xystray/xystray-1.0.ebuild b/x11-misc/xystray/xystray-1.0.ebuild
index 52f7b474b722..d640d249dafd 100644
--- a/x11-misc/xystray/xystray-1.0.ebuild
+++ b/x11-misc/xystray/xystray-1.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="A simple implementation of freedesktop.org notification area for X"
-HOMEPAGE="http://steelman.github.com/xystray/"
+HOMEPAGE="https://steelman.github.com/xystray/"
 SRC_URI="https://github.com/steelman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index aded634839d7..fa58b60757b9 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -5,4 +5,5 @@ DIST zim-0.72.1.tar.gz 2596910 BLAKE2B cdc6c875ed316dcd5655d75c280b46189d9b70689
 EBUILD zim-0.71.1-r1.ebuild 1951 BLAKE2B 252170b5d9f586212befa366909af94a1ce9e5eb78536bd9dc952f4c539c5e32e0eed71e96deb276c877dfcaff698f91993dd715e08c4b07c54dd79cd7053c30 SHA512 9525cb0a84df79ea7330ade619d242bb315184a893cb570965014fff8bc2f1c9face8f790b989859ef2c203b5cf1369b4c55a1b3b6bffcea3f0ad9bab9c71577
 EBUILD zim-0.72.0.ebuild 1934 BLAKE2B 55516ba1fe0208901156c6beab8bc6a36ed3bfc60bcd1891ea129ab33d213effa7c6d3d12c9de3a588d7ca2f939d2800729577178283340d9816322bae244b84 SHA512 842f5ef971f44df01dd775c7ec65b13766b615caa6bdc862ddbf878c1022356e1749220d2c6437bc80ba234904535d00893094e76768ea92525d47c4dbb1d052
 EBUILD zim-0.72.1-r1.ebuild 1934 BLAKE2B 55516ba1fe0208901156c6beab8bc6a36ed3bfc60bcd1891ea129ab33d213effa7c6d3d12c9de3a588d7ca2f939d2800729577178283340d9816322bae244b84 SHA512 842f5ef971f44df01dd775c7ec65b13766b615caa6bdc862ddbf878c1022356e1749220d2c6437bc80ba234904535d00893094e76768ea92525d47c4dbb1d052
+EBUILD zim-0.72.1-r2.ebuild 1940 BLAKE2B dfa3171f6443e914b989010e49b505895b1ea0aa06501942c5abf3c041cd501e6e2f9ba4e5b8ee6c809ae6d6984ae0ccc117b2ad972c5827ac308a553e8f08df SHA512 e9f686901a40ccf79e72a38cd4d2da0654e928c8369f36743c3880dcbe149d36d1c043dca6da5d5b0a3161a8bedb41cde177a68ac3ff879a25dfa7572d6800c6
 MISC metadata.xml 824 BLAKE2B a6ac745b62015073844af9a8aae0ef1d6ca6b7c28e881c7b85d31e00c808076fa944feec5980cdefc72b5ddfa2cecb98fc96b4745df12743212a4d572679408d SHA512 26a4774e75f0a06bfedc2c26f4ca688f9a2644935302e0674ba5a5308af88bc90f291a01f5b10bba62ac0f0a46561d63bfd9289de67bc53c4be454542ea76816
diff --git a/x11-misc/zim/zim-0.72.1-r2.ebuild b/x11-misc/zim/zim-0.72.1-r2.ebuild
new file mode 100644
index 000000000000..51a1c261843f
--- /dev/null
+++ b/x11-misc/zim/zim-0.72.1-r2.ebuild
@@ -0,0 +1,79 @@
+# 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
+}
author	V3n3RiX <venerix@redcorelinux.org>	2020-04-12 03:41:30 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-04-12 03:41:30 +0100
commit	623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree	993eb27c93ec7a2d2d19550300d888fc1fed9e69 /x11-misc
parent	ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)