gentoo resync : 02.06.2019

37 files changed, 783 insertions, 207 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index d91f03a0a453..3162da9aee32 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/grsync/Manifest b/x11-misc/grsync/Manifest
index 6ee4997bdc0b..b7d92c87ea24 100644
--- a/x11-misc/grsync/Manifest
+++ b/x11-misc/grsync/Manifest
@@ -1,3 +1,3 @@
 DIST grsync-1.2.6.tar.gz 333540 BLAKE2B 20719580309aba5737b74e85629b21b9715ceb8d97bd00d1840a5eda0e04316439d90999b7b787cdf8b368fff90ba489dcfc3b91992dd599f7ae05f4a565f1e7 SHA512 a7aac0cf264c968d50896156730dc0b925045def6e513adf1f2783e19fd1cdd423aa69480963479b95927fb4e863f110f3fc0439661ef7cfcacc7376fe95ff1d
-EBUILD grsync-1.2.6.ebuild 494 BLAKE2B d17c88c8fb447db42f6177cfb85b3060e263f2cdbdf56249e1fe663ed623dcd23c50d0096e6f936260128bd74c0ca84aab17bdd0e7078feca717b9c89a34f48f SHA512 9b6d264f5a7093e6549e2023f7aca53754b79033b23e113841d3322c9712c17350540ff71c95a3a5a9ff89ccb237b2872316ae856a3483a6290e0d4f0c926eb3
+EBUILD grsync-1.2.6.ebuild 498 BLAKE2B 3ed19359d70b48cdc85befe8569b7a1b1b4336131c3b6a2d18d9c6ad221d257a5c414117c58c75a99bebc1fc20dd9d8a244df5b2f516825e39836cee9b39a2c9 SHA512 df1a619c1722547c956fd79a4490f13cb4e6aaedea6e2ff054f22bc419ee93dc5bb05cd7d68b8328f8899758ac066a1f53fa2b50ebee8acd77246f111a1759b7
 MISC metadata.xml 258 BLAKE2B 46e283e28202f000bdb3b2b01ac3b3e4aa25a42715e1940135cdcef61181c745865042fe44a908a5d3e83308f7f98f0eff2b8519c0a4691e3bf5637799de420e SHA512 9909d39f5a2a4d3c92d1c105ea5250603f505e9fbb0ff433c25290ac5c2b53f00d96fe8dc0a98bec2240298b3b7060503f59caf04cb47484a63e4057bcce82c6
diff --git a/x11-misc/grsync/grsync-1.2.6.ebuild b/x11-misc/grsync/grsync-1.2.6.ebuild
index 86540cbfa78e..3476502ec396 100644
--- a/x11-misc/grsync/grsync-1.2.6.ebuild
+++ b/x11-misc/grsync/grsync-1.2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ DESCRIPTION="A gtk frontend to rsync"
 HOMEPAGE="http://www.opbyte.it/grsync/"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
 IUSE=""
 SRC_URI="http://www.opbyte.it/release/${P}.tar.gz"
 
diff --git a/x11-misc/gxmessage/Manifest b/x11-misc/gxmessage/Manifest
index f84a7479b598..638554b2561b 100644
--- a/x11-misc/gxmessage/Manifest
+++ b/x11-misc/gxmessage/Manifest
@@ -1,5 +1,5 @@
 DIST gxmessage-2.20.3.tar.gz 274110 BLAKE2B 9863e680b1d23ba3d69c35e2de826106f1078f585c0be36d1ad51946abbeef8637bc2f872f9fee20738c978146adebfbe47548de48be6b12b92c314ed93d9c32 SHA512 8f677d0ee899c88a40c912ba68b59ba9a21a0ae21db467c64756daea41fbf2a7fb566e26c74e72f89e6009b1e8029af9bd5748f92099f681346399fe7e9d8e27
 DIST gxmessage-3.4.3.tar.gz 275354 BLAKE2B 2801944c3a6542d250f91388a90736ba781013e5c370e42783db620387a07b315b176bac60e30af6e623d4f664291fdf567786e66a1f9e8c383dc772a64547e6 SHA512 4e3c455595db723e2d78060c4913f1a87b8f0c5cb6017427d48cd02652655592bf8aa1001adfbfecd5598cc0c613c78a74d71a59a7f1f0787acc29774328e93a
 EBUILD gxmessage-2.20.3.ebuild 851 BLAKE2B d0b7315257ae7aa09db15c7da5625909b241e1f8556e4462483534e4f9da4ecfc56fbbab7da7f99545ab31cde696499804501dd37456cf9fa981555ea1b006c2 SHA512 2d51cc5dda9e95f29214e928197d5a15e7a7594eb4aad230671743731f5fc9df965c04da6d406c7d5f7e64c10224263e36b2addac54794d2ae7e07c6a3b9b903
-EBUILD gxmessage-3.4.3.ebuild 878 BLAKE2B dcfb0f94b7405893ad71c5beef5a74142615f0393e19ec99d91d38b7b8ae645cbc721299703321f7ae793f97c85dea58de731ce17c664f3a6d24abdddc5e534c SHA512 5048188f71c19770e5a4f0db6781556164517e938efbef47f5edd8d7c8ce318b6c52461052d64d5188f6d44638c4d617a7d5df39b6bf40a782843a87a59f2188
+EBUILD gxmessage-3.4.3.ebuild 877 BLAKE2B daf263c07b80ff2fe1eb143582373d14c7410833e07a11138799b78226b25e60e25b08be17bc4bbbdf2b0769f97cb51a279fa697def6ba096dec87dbb5e4901a SHA512 40599f39d099218580411a2dfb4b9fd83fcfef4b5ec91ccd011961e8fd12f2d14f152ef464258b2339c4c808bff6c56c70c4053ff61e32977495b54788234c8f
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/gxmessage/gxmessage-3.4.3.ebuild b/x11-misc/gxmessage/gxmessage-3.4.3.ebuild
index aa81967dc82f..d06b773c8c53 100644
--- a/x11-misc/gxmessage/gxmessage-3.4.3.ebuild
+++ b/x11-misc/gxmessage/gxmessage-3.4.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
 
 LICENSE="GPL-3 public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/light-locker/Manifest b/x11-misc/light-locker/Manifest
index 7342ce21943f..ed4c397773a9 100644
--- a/x11-misc/light-locker/Manifest
+++ b/x11-misc/light-locker/Manifest
@@ -1,4 +1,7 @@
 AUX light-locker-1.8.0-elogind.patch 9190 BLAKE2B c60e166a853aaee5de2ffcbb708dd0f1b25b9fc5e2ec9a862bce2c0cd8b90928b0ceb4dae2a46e9ce3f41f9665911abaebccd9a73a9cb09c9c113788de60845e SHA512 a837a458d4d221ad4a009d2461c927168f64a3f50ef5484c0aca26913477d35cd0799605d66b8b4876b7530c7c604720fe95783576c658bd6e84b5867df1ef8e
+AUX light-locker-1.9.0-elogind.patch 8835 BLAKE2B ce54ca7d649d1cf88b5d6bf650a53885b023e3ca2c6b62c69a604d8c90e6a939372fd501af4a0beef2aa2a2daba88a353aea015f2446ab3e0ee5b9f6308fbbf1 SHA512 b46c09913d30127c9ce3df890b2308d9897020915960e17d36b732d6194dc269ae69f17afc4f1cc56f807c0e251a05c3b483f8baf28e8bd4820721192a9f0121
 DIST light-locker-1.8.0.tar.bz2 449898 BLAKE2B d5ff454958138ec535b94492a9646dd5a4fc8196095ef3ae933d661e44eb62960ca49fe070fd88a794e2a9c5a6586317845b0d55d8cfd65107e49e31206a727a SHA512 bbad73c0b82a50ddca240d5e1bd325a99d0c60364d136fe6d9d52f196319953373c9d03cf38ebd75d4498d080e96702e09fc97c35b4b69cbe963f065719549d5
+DIST light-locker-1.9.0.tar.gz 124753 BLAKE2B 510447a5fa107988a06e92cc99d7750bc0df526356630694c5dc718460bd437879bbdcb69e0778bdb58d399aafdbea762bfda53d2e2205a1c4bade27dbff78c5 SHA512 c6f84b38affa20cf0bd7d2341f5a8eff36891ed55401955715a68a011c84c7f2300db670abb95a320eb40aee90885fe044ddf0a721e418ee4724af3e4f6a61a4
 EBUILD light-locker-1.8.0-r1.ebuild 1617 BLAKE2B 340b6658d7bbe2567a4d0786476b77d3979f0aae1c0d9a6c3fe5ce798d7c8aa30d7e0fc97688ed0ade1785c1707f768ddd57402a8e2bf2a946f529da44183505 SHA512 186ae4504e45b0b6f4914e93c009ef7c2cc954cff6632c91a2d3b6ebc81aaef099340e67a59292e1adfd4d7fb68be672f9bc9ad550f464e6e4f9e8c39cd66a55
+EBUILD light-locker-1.9.0-r1.ebuild 1565 BLAKE2B c30a4b419691d87823ec2c9876ffa5c51d48701c714e582ca80a89ff8db08bef7d585d20771f2d1809c127d9a37008888924256854d3eccfee10e53d9a7eb151 SHA512 2725cc37c34e81beca17d2db2679e92b15783c654fc779fe32cc4abc1842a1c9c7a49f6f8c01e9f535ee3b352497da42461b840529fe8542c704db76e8956a7f
 MISC metadata.xml 698 BLAKE2B a8f5e435f66bea6fab128e600e4bfce575c819c2de03c141e9d5ba72880dc58017fce9e4355d700c01d441c4eec56d19f0f2ec8d27027700decedc685a8a2d38 SHA512 583d1108a9be5b71a9e3867b60b20dba60a1c999fe7a27634456b9102af8193dc22e6b7a5410c520f5aa13482a290d4e6cf6bdcde070788fd7ce8d2b74ece144
diff --git a/x11-misc/light-locker/files/light-locker-1.9.0-elogind.patch b/x11-misc/light-locker/files/light-locker-1.9.0-elogind.patch
new file mode 100644
index 000000000000..298e75844c4b
--- /dev/null
+++ b/x11-misc/light-locker/files/light-locker-1.9.0-elogind.patch
@@ -0,0 +1,257 @@
+From 76afbe0757d8846d76bfed350aa9c9e4242aef86 Mon Sep 17 00:00:00 2001
+From: Denis Dupeyron <calchan@gentoo.org>
+Date: Thu, 23 May 2019 13:52:12 -0600
+Subject: [PATCH] Port light-locker-1.8.0-elogind.patch
+
+---
+ README.md              |  2 ++
+ configure.ac.in        | 37 +++++++++++++++++++++++++++++++++++++
+ src/gs-listener-dbus.c | 34 +++++++++++++++++++---------------
+ src/light-locker.c     |  6 ++++++
+ 4 files changed, 64 insertions(+), 15 deletions(-)
+
+diff --git a/README.md b/README.md
+index 86b66d0..b093a4f 100644
+--- a/README.md
++++ b/README.md
+@@ -38,6 +38,8 @@ Here is a list of the different dependencies and their configuration flags:
+ 
+   --with-systemd: This adds the support for systemd logind. This option requires the development files to be installed.
+ 
++  --with-elogind: This adds support for elogind, a standalone version of systemd's logind daemon. Requires the elogind development files be installed. This option cannot be enabled at the same time as the --with-systemd option above.
++
+   --with-upower: This adds the support for UPower.
+ 
+   --with-mit-ext: This enables the lock-after-screensaver feature. This options requires the X11 Screen Saver extension development files to be installed.
+diff --git a/configure.ac.in b/configure.ac.in
+index f95863a..5c92191 100644
+--- a/configure.ac.in
++++ b/configure.ac.in
+@@ -421,6 +421,42 @@ fi
+ AC_SUBST(SYSTEMD_CFLAGS)
+ AC_SUBST(SYSTEMD_LIBS)
+ 
++dnl ---------------------------------------------------------------------------
++dnl elogind
++dnl ---------------------------------------------------------------------------
++
++AC_ARG_WITH(elogind,
++            AS_HELP_STRING([--with-elogind],
++                           [Add elogind support]),
++            [with_elogind=$withval], [with_elogind=auto])
++
++if test "x$with_systemd" = "xyes" && test "x$with_elogind" = "xyes"; then
++    AC_MSG_ERROR([Conflicting options: --with-systemd and --with-elogind])
++fi
++
++PKG_CHECK_MODULES(ELOGIND,
++                  [libelogind],
++                  [have_elogind=yes], [have_elogind=no])
++
++if test "x$with_elogind" = "xauto" ; then
++        if test x$have_elogind = xno ; then
++                use_elogind=no
++        else
++                use_elogind=yes
++        fi
++else
++       use_elogind=$with_elogind
++fi
++
++if test "x$use_elogind" = "xyes"; then
++        if test "x$have_elogind" = "xno"; then
++                AC_MSG_ERROR([Elogind support explicitly required, but elogind not found])
++        fi
++        AC_DEFINE(WITH_ELOGIND, 1, [elogind support])
++fi
++AC_SUBST(ELOGIND_CFLAGS)
++AC_SUBST(ELOGIND_LIBS)
++
+ dnl ---------------------------------------------------------------------------
+ dnl UPower
+ dnl ---------------------------------------------------------------------------
+@@ -640,6 +676,7 @@ echo "
+                     Platform:
+                     ---------
+         systemd:                  ${use_systemd}
++	elogind:                  ${use_elogind}
+         UPower:                   ${use_upower}
+ 
+                     Features:
+diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c
+index 044a2bf..164856f 100644
+--- a/src/gs-listener-dbus.c
++++ b/src/gs-listener-dbus.c
+@@ -43,6 +43,10 @@
+ #include <systemd/sd-login.h>
+ #endif
+ 
++#ifdef WITH_ELOGIND
++#include <elogind/systemd/sd-login.h>
++#endif
++
+ #include "gs-listener-dbus.h"
+ #include "gs-marshal.h"
+ #include "gs-debug.h"
+@@ -78,7 +82,7 @@ struct GSListenerPrivate
+         char           *session_id;
+         char           *seat_path;
+ 
+-#ifdef WITH_SYSTEMD
++#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
+         gboolean        have_systemd;
+         char           *sd_session_id;
+         int             delay_fd;
+@@ -134,7 +138,7 @@ gs_listener_send_switch_greeter (GSListener *listener)
+ 
+         gs_debug ("Send switch greeter");
+ 
+-#ifdef WITH_SYSTEMD
++#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
+         /* Compare with 0. On failure this will return < 0.
+          * In the later case we probably aren't using systemd.
+          */
+@@ -175,7 +179,7 @@ gs_listener_send_lock_session (GSListener *listener)
+ 
+         gs_debug ("Send lock session");
+ 
+-#ifdef WITH_SYSTEMD
++#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
+         /* Compare with 0. On failure this will return < 0.
+          * In the later case we probably aren't using systemd.
+          */
+@@ -359,7 +363,7 @@ gs_listener_set_idle_hint (GSListener *listener, gboolean idle)
+ 
+         gs_debug ("Send idle hint: %d", idle);
+ 
+-#ifdef WITH_SYSTEMD
++#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
+         if (listener->priv->have_systemd) {
+ 
+                 if (listener->priv->system_connection == NULL) {
+@@ -400,7 +404,7 @@ gs_listener_set_idle_hint (GSListener *listener, gboolean idle)
+ void
+ gs_listener_delay_suspend (GSListener *listener)
+ {
+-#ifdef WITH_SYSTEMD
++#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
+         DBusMessage    *message;
+         DBusMessage    *reply;
+         DBusError       error;
+@@ -473,7 +477,7 @@ gs_listener_delay_suspend (GSListener *listener)
+ void
+ gs_listener_resume_suspend (GSListener *listener)
+ {
+-#ifdef WITH_SYSTEMD
++#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
+         gs_debug ("Resume suspend: fd=%d", listener->priv->delay_fd);
+ 
+         if (listener->priv->delay_fd >= 0) {
+@@ -1076,7 +1080,7 @@ _listener_message_path_is_our_session (GSListener  *listener,
+         return FALSE;
+ }
+ 
+-#ifdef WITH_SYSTEMD
++#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
+ static gboolean
+ query_session_active (GSListener *listener)
+ {
+@@ -1212,7 +1216,7 @@ query_lid_closed (GSListener *listener)
+ #endif
+ #endif
+ 
+-#if defined(WITH_SYSTEMD) || (defined(WITH_UPOWER) && defined(WITH_LOCK_ON_LID))
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND) || (defined(WITH_UPOWER) && defined(WITH_LOCK_ON_LID))
+ static gboolean
+ properties_changed_match (DBusMessage *message,
+                           const char  *property)
+@@ -1307,7 +1311,7 @@ listener_dbus_handle_system_message (DBusConnection *connection,
+                   dbus_message_get_destination (message));
+ #endif
+ 
+-#ifdef WITH_SYSTEMD
++#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
+ 
+         if (listener->priv->have_systemd) {
+ 
+@@ -1880,7 +1884,7 @@ gs_listener_acquire (GSListener *listener,
+                                             listener_dbus_system_filter_function,
+                                             listener,
+                                             NULL);
+-#ifdef WITH_SYSTEMD
++#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
+                 if (listener->priv->have_systemd) {
+                         dbus_bus_add_match (listener->priv->system_connection,
+                                             "type='signal'"
+@@ -1971,7 +1975,7 @@ query_session_id (GSListener *listener)
+ 
+         dbus_error_init (&error);
+ 
+-#ifdef WITH_SYSTEMD
++#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
+         if (listener->priv->have_systemd) {
+                 dbus_uint32_t pid = getpid();
+ 
+@@ -2022,7 +2026,7 @@ query_session_id (GSListener *listener)
+         return NULL;
+ }
+ 
+-#ifdef WITH_SYSTEMD
++#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
+ static char *
+ query_sd_session_id (GSListener *listener)
+ {
+@@ -2053,7 +2057,7 @@ init_session_id (GSListener *listener)
+         else
+                 gs_debug ("Got session-id: %s", listener->priv->session_id);
+ 
+-#ifdef WITH_SYSTEMD
++#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
+         g_free (listener->priv->sd_session_id);
+         listener->priv->sd_session_id = query_sd_session_id (listener);
+         if (listener->priv->sd_session_id == NULL)
+@@ -2150,7 +2154,7 @@ gs_listener_init (GSListener *listener)
+ {
+         listener->priv = GS_LISTENER_GET_PRIVATE (listener);
+ 
+-#ifdef WITH_SYSTEMD
++#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
+         /* check if logind is running */
+         listener->priv->have_systemd = (access("/run/systemd/seats/", F_OK) >= 0);
+         listener->priv->delay_fd = -1;
+@@ -2179,7 +2183,7 @@ gs_listener_finalize (GObject *object)
+         g_free (listener->priv->session_id);
+         g_free (listener->priv->seat_path);
+ 
+-#ifdef WITH_SYSTEMD
++#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
+         g_free (listener->priv->sd_session_id);
+ #endif
+ 
+diff --git a/src/light-locker.c b/src/light-locker.c
+index aefc4c6..51ae519 100644
+--- a/src/light-locker.c
++++ b/src/light-locker.c
+@@ -139,6 +139,7 @@ main (int    argc,
+         gs_debug ("Platform:\n"
+                   "gtk:        %d\n"
+                   "systemd:    %s\n"
++		  "elogind:    %s"
+                   "UPower:     %s",
+                   GTK_MAJOR_VERSION,
+ #ifdef WITH_SYSTEMD
+@@ -146,6 +147,11 @@ main (int    argc,
+ #else
+                   "no",
+ #endif
++#ifdef WITH_ELOGIND
++                  "yes"
++#else
++                  "no"
++#endif
+ #ifdef WITH_UPOWER
+                   "yes"
+ #else
+-- 
+2.21.0
+
diff --git a/x11-misc/light-locker/light-locker-1.9.0-r1.ebuild b/x11-misc/light-locker/light-locker-1.9.0-r1.ebuild
new file mode 100644
index 000000000000..34e6e91e705d
--- /dev/null
+++ b/x11-misc/light-locker/light-locker-1.9.0-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools gnome2-utils
+
+DESCRIPTION="A simple locker using lightdm"
+HOMEPAGE="https://github.com/the-cavalry/light-locker"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+dpms elogind +screensaver systemd +upower"
+
+BDEPEND="dev-lang/perl
+	dev-perl/XML-Parser
+	dev-util/intltool
+	sys-devel/gettext"
+DEPEND="dev-libs/dbus-glib
+	dev-libs/glib
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/pango
+	x11-libs/libXxf86vm
+	dpms? ( x11-libs/libXext )
+	elogind? ( sys-auth/elogind )
+	screensaver? ( x11-libs/libXScrnSaver )
+	systemd? ( sys-apps/systemd )
+	upower? ( sys-power/upower )"
+RDEPEND="${DEPEND}
+	x11-misc/lightdm"
+
+REQUIRED_USE="?? ( elogind systemd )"
+
+DOCS=( AUTHORS HACKING NEWS README )
+
+PATCHES=(
+	"${FILESDIR}/${P}-elogind.patch"
+)
+
+src_prepare() {
+	default
+	# Fixed upstream right after the release, remove this next time you bump
+	ln -sf README.md README || die
+	# remove xdt-autogen specific macro (just like upstream do) as we need to autoreconf
+	sed -e "/XDT_I18N/d" configure.ac.in > configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with dpms dpms-ext)
+		$(use_with screensaver x)
+		$(use_with screensaver mit-ext)
+		$(use_with systemd)
+		$(use_with elogind)
+		$(use_with upower)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/x11-misc/lightdm-gtk-greeter/Manifest b/x11-misc/lightdm-gtk-greeter/Manifest
index 447e3e5ce320..8a80280c0311 100644
--- a/x11-misc/lightdm-gtk-greeter/Manifest
+++ b/x11-misc/lightdm-gtk-greeter/Manifest
@@ -1,6 +1,6 @@
 DIST lightdm-gentoo-patch-2.tar.gz 695543 BLAKE2B 62e21dd413b90053160f774663d89c81b3c9d8c4a040023f4ce50bf775a2f036e0be6ed16ae767eb5b04586a27fdbf41eb56f777340b2d56633738a126c3d575 SHA512 8d9bfdee71ab1871de33e134b11bba409cc493876e5ae9534956100ff6af6c8748b29de9082ecf8b771ccac4c8c2024e15e93332165171dfe93eb99c9a834274
 DIST lightdm-gtk-greeter-2.0.5.tar.gz 571189 BLAKE2B 583e75b1d621ffef4ade7e65fb3ab4891a119f1d416c8011a80d06e1916ecb5903f4c1af432052cb05a72aa38cde38293dd90eed00295fec5ff758e78576e10e SHA512 1ae31a36e19a2e8825bb0bfe4eef51f317306636bc0f14df9ee4c89c81d60ce7193d74e053ce59ae50c6fe05d27be73fb5a83cce732a0df4a3b4390539418fad
 DIST lightdm-gtk-greeter-2.0.6.tar.gz 575668 BLAKE2B 6aa5e4db80f411b5a5e34c5ce332906a11d7755af71f617dfedf1658c60777ba732e0ed81a9d5e01c93e2a7fd74364dffc8043d640cd6ab91f3e604769863c01 SHA512 778215351a9140f164c67c75d69efc55b1edf97a493f42a14e2a40e322f738cba99534274d00198291454466fbf407efdc927479c4821d04e12d742feb31cc3a
-EBUILD lightdm-gtk-greeter-2.0.5-r1.ebuild 2083 BLAKE2B 2a5513d297d356ba2983b3a767d4b053aa08742c83810584312835167a51ec1efd6a3022e39f42fc5f7e5265cc539beef6de2da58404dea0bb64166f0950542e SHA512 e23fc5efc3ce300a2e579e9b11b87a449a8cad55ee0262ded871b09a195f63739666435767988f9f41d0bbb14bdd4bc54fec1d9bab2a54a94eeb3dc6596cb73e
+EBUILD lightdm-gtk-greeter-2.0.5-r1.ebuild 2082 BLAKE2B f53208b088b0376a2206c982aa05240baa82701d8ce2da8b671dde208aebfdf8eb3b77d5ff496586df3344f186463021b50eac26bd330e3936d4278873df2754 SHA512 6765efd4eeba09f263eca279d9024d98c11e3f390db3cbd159b92245534d9eb435955f0ed9f8093c42d8c788d425994e0ea38ce68fc803ab4ecde173450fcca7
 EBUILD lightdm-gtk-greeter-2.0.6.ebuild 2066 BLAKE2B 94d70ad4542c3438c99592e4d6a133c3ede5d3a80d02df9fc715ba3ad4606d22cab24a519ad3d17fa11dfa31b1fb8946359d1f6058c78f44268a0b22e35980ab SHA512 45f9a5d858d517356919821ed1f70c67b21f0e43de5ef4163b9f84344130c093fd7e1e71f2562e63f58c325442d3251fa0e87f63d37fc6bb71c485310eae5228
 MISC metadata.xml 338 BLAKE2B d67c21b3faacdf75178e2dd79f1365b5d8891431f2388a959c986f9e21f1da21a5138ba6d1831c4d28f6102a6964850ce3ebe8971d955e68be0d9d97fbfa2fa4 SHA512 2b2065cbe74e2166fc4fe4970fcc01e20dc34c92842e163bcc799d162da39e2cce09f1491e6fc853d5fadd9cb40cc975f0f1e4d57462fbce2442a99441ed7403
diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.5-r1.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.5-r1.ebuild
index 09ed49940b3d..318ca61e70da 100644
--- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.5-r1.ebuild
+++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.5-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/lightdm-gtk-greeter/$(get_version_component_range
 LICENSE="GPL-3 LGPL-3
 	branding? ( CC-BY-3.0 )"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="ayatana branding"
 
 COMMON_DEPEND="ayatana? ( dev-libs/libindicator:3 )
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index 8a6470b68594..c7038da68993 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -6,7 +6,7 @@ DIST introspection-20110205.m4.tar.bz2 1220 BLAKE2B 01483c1a7b73568e01cc4d84b43c
 DIST lightdm-1.26.0.tar.xz 516092 BLAKE2B 0bbbe11959a2ea0c21e723d10e8831fc0d9e15475a415869634cfb41c6d576b77fd87720be33dae8456063947dd1b551e88c263ed76ef9b120c43df8c42513f3 SHA512 67c0671753587493ed064b66f94be58853028287c914d1101e66499bebf1408e14d33245887ce89d1c4931960225ea3984e5e625b22dc4e3020be34a3087d8e7
 DIST lightdm-1.28.0.tar.xz 517460 BLAKE2B 98a0b60623dcac07bbb6bff95fa20da9425b714fe5da0d7d86c788362e40604bea2b46675c57e70c70356f71a542adbd6431723e40b815db8565d67ddecc20a1 SHA512 e1e8a952e723bbcc106043d33a64278b228a5a47a7e54235375817b08483594cc5e46ec52f5cbb9d258266e44b045785bca1d4c62daf83071c0f668b3c480071
 DIST lightdm-1.30.0.tar.xz 509220 BLAKE2B 5b6fcc6b955d7a7eb3a810a7e28707a812810d7f2568d6985a4411b1bf6f06b35ff721bd8a9388a85a4e4a64a39f5e30e86a9dbaa6d344e898ae49e9f39785ff SHA512 bca25a0aa73caf7d51e5882889a1707d2527470a170658c1be98ecfb96c8f85fd616494fc5bed658e744f91b9f8b0a98d2a0cf42f9c030242ae470c8a27145ce
-EBUILD lightdm-1.26.0-r1.ebuild 3852 BLAKE2B 01ead162fd8ef1318ead8c9ebf8042ab687861f812fa2f63d2b5d664dc7acc199372eb2c578cf759ba47ffdd0a15b371b19181c7510007d929a37a0527de3855 SHA512 d6a0eda1ae31f1954830ac24111273102adf7c366b1105a3f5104426af13b25809ee53223bc0d38e4676ce774054b58a962a10620aeb762028dd1c6f2598d60a
+EBUILD lightdm-1.26.0-r1.ebuild 3851 BLAKE2B 818d44e66767fc8ca55c143ec008632aab9985abd2d00697db4ca46f129c7cde81f4a385b36f10ef67664142f4b464fa95519897c18d4af61f559587acb98765 SHA512 816e627aa18bb213f41e629160d6466494459720e264f0051e5888c870166f818dc5067a75341899d46b9e34f019cbd5cb1f160060666b849bc3bd0f3f1ec426
 EBUILD lightdm-1.28.0.ebuild 3886 BLAKE2B 2013d0787f3c0c0b3d4a68c9595d4df06ad4e0f040bdf89b814c5c12a6734e97c328265075e1de7271c0a1f64e8eefea6a27603e96ac16bdbd4bd2961b3291d7 SHA512 f6920480ce47f8364facb1e4b2b8e22b5d4065f9a6b5474cb6eb8656232863840d38438ba1283c3e006ef8331ce7f504122829c110d1288fb656dcc3983c04b7
 EBUILD lightdm-1.30.0.ebuild 4226 BLAKE2B 0df0010ad4e31f14a65c46acfc51c314edbb3e5a75d8f4e76bf80bd49983d6ecefaace3797c82cdceba5402a6d98796c3e22f6a9aa45548041a22ba13b36a4f6 SHA512 de7c1f643a8e4267bec58d9fe92d82f2419b6ffd568b3e6120e6e0dfaf342f8a808a2e9a093dc670acef7135e1f0fed39f84c1dc6768bdb93100474c3585a953
 MISC metadata.xml 462 BLAKE2B 8360d85d185558b5d6c3b2d18d5210c532537d1cc93007b0f0b91d37b388d02c966dda14c298ff8c3b47bd39696b332f989fffa6e1a68001116ddd69141b21d6 SHA512 d76a144235e233e46103c3f10ee64d3b5306b82220366e006671851dc725027ddbf600ca8fab8370c7fca3b09182cd7c85b458d79e7ddca681f279909f4737ba
diff --git a/x11-misc/lightdm/lightdm-1.26.0-r1.ebuild b/x11-misc/lightdm/lightdm-1.26.0-r1.ebuild
index 8277072aab4e..15b2902a69e4 100644
--- a/x11-misc/lightdm/lightdm-1.26.0-r1.ebuild
+++ b/x11-misc/lightdm/lightdm-1.26.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/CanonicalLtd/lightdm/releases/download/${PV}/${P}.ta
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="audit +gnome +gtk +introspection qt5 vala"
 
 COMMON_DEPEND="
diff --git a/x11-misc/menulibre/Manifest b/x11-misc/menulibre/Manifest
index adc01b08c963..73c5132b59c8 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.1.5.tar.gz 443986 BLAKE2B 5397e1f9d4371c017c8d2358e65bdad58b0ac10765f00fa51b2b20d9e404f19229da00719c6cb209020e5894708882d42adb30f4668e82929e0d1904ca7d3cf5 SHA512 d1bcd055d7f5c77df02470b4b6362ea5af8a6f4dd41f217c73673b63f413c3edca0ae18ccb6cff179a514ee0218613c3201e7687ec36de34436556b8a60a0856
 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 1721 BLAKE2B ce36a304c02ab5bcd8fe7d726cd2177e691aaad42a5e3c9045a6889c106f1db7af1d24380eb8359b7c48c5620423eafadda65567a945c9e2842c52dba3d246ba SHA512 a8f5203ff12c28e6fec86ddeea2f893e6c06a2d357829894da600cf9e6cc52d89fe895e886055e1e526e8917b897c90eacf5d4fda6e15b67e80ca55b97c53a14
-EBUILD menulibre-2.1.5.ebuild 1723 BLAKE2B e129bd9b2267f65ff31ba1d3162925b2c20f33507db2fc84158233ff23db933646fae498cc648611176c638c862b277f668ec80c26156d9e62e7fd577399fe48 SHA512 1c129bf2a83e3365aa7eb4805bc87660ff162339ed09be9f332abcc1a94f08a551564446c04c2dd8c3a847d08168f0f5d5c83ffc673a08451cc194de5596cf21
 EBUILD menulibre-2.2.0.ebuild 1747 BLAKE2B 2d2ac9931f476ec15dd7f832f46e688165767280d4fa5f11aa90610fe715d9fa71130927180fe92dc4ccd1208d67c28af0130df64609266129cf1000b67a56c5 SHA512 0b3ac7dd75e67c4d7d7184f55277a0bca97047f0b31b153f2e0e8a38fa7218aa052d66c3ed3710b1f78e66d29042f23932961ee2a4dc88d2cf2349206c7abdc5
+EBUILD menulibre-2.2.1.ebuild 1708 BLAKE2B 4063a5556b18b5585789fe6e0e19294aa4eaa94735d6ff79938ec8a4998a2b8e5b4e99ef5b17a75e1e2bd5ee406d0f6348879a132b0226a518206da6199a6dd3 SHA512 d1eb66ffc400e73a3a3d3883b8bc4a464bdd74f002f777d1be7e718de1013626bd92f2ba46861179e98d368eee6522df90b44cc100a97651054a607c11ddf654
 MISC metadata.xml 353 BLAKE2B 6064836036ff045dce0bc62fe8b822aefcd75b1cbb5746e12c2a2c5399802c1412b4f6bb9f9582785d5f8cff63d61f9f0c71505fd593e649e26c30f7c7019d6a SHA512 256e7ca3b20708caea270d07348c477b3d9e8300739092ad80468f4ab60e5e85b21246cf906d51a1929e627d27ed62bcf23136a3b8edc684c4ba1b53e3282454
diff --git a/x11-misc/menulibre/menulibre-2.1.5.ebuild b/x11-misc/menulibre/menulibre-2.2.1.ebuild
index 8cd4a64b1072..c0aa8ef2a8d2 100644
--- a/x11-misc/menulibre/menulibre-2.1.5.ebuild
+++ b/x11-misc/menulibre/menulibre-2.2.1.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 PYTHON_COMPAT=( python3_{5,6} )
 PYTHON_REQ_USE="xml"
 DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1 eutils gnome2-utils versionator
+inherit desktop distutils-r1 xdg-utils
 
 DESCRIPTION="Advanced freedesktop.org compliant menu editor"
 HOMEPAGE="https://bluesabre.org/projects/menulibre/"
-SRC_URI="https://launchpad.net/${PN}/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz"
+SRC_URI="https://launchpad.net/${PN}/$(ver_cut 1-2)/${PV}/+download/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -35,6 +35,7 @@ python_prepare_all() {
 	# too many categories
 	sed -i \
 		-e 's/X-GNOME-Settings-Panel;X-GNOME-PersonalSettings;DesktopSettings;X-XFCE;//' \
+		-e '/^OnlyShowIn/d' \
 		menulibre.desktop.in || die
 
 	local i
@@ -53,16 +54,13 @@ python_prepare_all() {
 
 python_install_all() {
 	distutils-r1_python_install_all
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
+	rm -r "${ED}"/usr/share/doc/${PN} || die
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/x11-misc/obconf-qt/Manifest b/x11-misc/obconf-qt/Manifest
index b7f2d7b121b8..3d079d7b1370 100644
--- a/x11-misc/obconf-qt/Manifest
+++ b/x11-misc/obconf-qt/Manifest
@@ -1,5 +1,5 @@
 DIST obconf-qt-0.13.0.tar.xz 34348 BLAKE2B c44a79f4c70d07907ee4332ea75267b1b9c000371ee4d53b8db9eb9c624c6bd62a739413b8cf4038a514a1417ebbb8318c791bda2774d7420ac8a7b8b211d09f SHA512 537c10e286311d39f3e69c2940f4267d7dd2e55888e1e50d6aeb3cad8f694fec7792ca30e258a69cfe0c5361acecd4232605e47e71e27fa53b25f4bb65a0d703
 DIST obconf-qt-0.14.1.tar.xz 97032 BLAKE2B 8bfe93325d37bdcca40b38f99f635cddf39ad1781e694f002676f6ff6fd0d6c708908ca458a051f63509f572b247b4de5778a1451e763c4372038ef99a1594d7 SHA512 7ae4feb8daa3853f768e9cb613fc99046f98744e03efc673ee9e5cb3d4ffa2861f2a9f762acd9c54ef2b9ca3f288d2901cdcce5c09db84689dd186006b8e26ed
 EBUILD obconf-qt-0.13.0.ebuild 981 BLAKE2B 7d1e7bb88f8439c558bf752d1a534839fb8ae1873365ffac8b688e4ac327e98d38f86a7492e3b064a80a4a34fa8af0004ef4a4e9e0857d24964821513b931572 SHA512 2d618927d07d3ebceaedf3ce5bd84a998301afd8dd41185cafd413d20e30a41c21b66b883d2a2f6b6bc677232be5ddebdf17252622cdb9ecb54eb73fea682c4b
-EBUILD obconf-qt-0.14.1.ebuild 899 BLAKE2B 87e1bd33fee0f41c95d700e83c1be1a224d1d2966db49daac0190648813a898866a0e2f0e254a2aff8b84f1150c4f9dea24a2b7a9337511f3f54bcd5d38c22c4 SHA512 0704a793756fce2c076481173b516f0b638b154fd65e0cfd99bacccab8a6cbc0371c3a463431d758143685c1b9a8db13a5d33ff64505754e9dfaf026f82f12a5
+EBUILD obconf-qt-0.14.1.ebuild 897 BLAKE2B abc3c5c4068221a95161ffe51178b32baece88769aa979cb719e966922e04089dd229b11afd48f9cd08a6a6a0b240c28ae25e66ed13048abb02178574fa796f0 SHA512 ff86b7a9f2e3f924961461c959d9532e036f95c3d496ea00689173c754286e01defc784186bf1cbaa77c08aace6925b67687bf345dae0f2dad472c45cbe951c3
 MISC metadata.xml 315 BLAKE2B aba8e92e822b0a8f7213a6a2a723ada9cc5be720aa857152cfb2e395b8cae65dac8ce4c13e36e3ba774e22d800890c5ec7878f0266157b92e4f0332fd2ff8dc0 SHA512 b210ddb7b5f688fc122fead9a5fbac67653099db7671e442c53cf5246f091c8f58a6db94f2be7d3250a8fe24a619c6c9269b31f6c52f62049c40963dd8a6212a
diff --git a/x11-misc/obconf-qt/obconf-qt-0.14.1.ebuild b/x11-misc/obconf-qt/obconf-qt-0.14.1.ebuild
index a969ba2d4885..f67003d63b24 100644
--- a/x11-misc/obconf-qt/obconf-qt-0.14.1.ebuild
+++ b/x11-misc/obconf-qt/obconf-qt-0.14.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="GPL-2+"
diff --git a/x11-misc/pcmanfm-qt/Manifest b/x11-misc/pcmanfm-qt/Manifest
index 0ffbdf31032e..31f00f848c20 100644
--- a/x11-misc/pcmanfm-qt/Manifest
+++ b/x11-misc/pcmanfm-qt/Manifest
@@ -1,5 +1,5 @@
 DIST pcmanfm-qt-0.13.0.tar.xz 104864 BLAKE2B 47e24ccb415bea27db9cb5f0ccd1ce6aebedc2f7140572939e533c3da9aca6aca29227a5be7954944ed82483b4420501adf22152628e3d44a206d4f9d5250412 SHA512 7b0d4ca5274e369e3af3c4b332a95ae78af54142aee39aae36832e85ca27d1f2f7509f00dc29d18a1e5a2558c8a82acd6569d2433acf13b2f95174c47779c089
 DIST pcmanfm-qt-0.14.1.tar.xz 227360 BLAKE2B 2401238ad53838c9f6e45d596c43b09eecf555bfe069a5cef633c0442867f04b636bebf29241cae8b5a1161a9dad5648390badcd6a3d8b756ac6438acac4961f SHA512 f3d170ab8344332f740a3245cc549ea0c3bddc97a45472dcd46208d59413dd42d3571821f309184417a34a627d2cb093fcaa335f782cf6e526eef3fcad212b3e
 EBUILD pcmanfm-qt-0.13.0-r1.ebuild 1064 BLAKE2B 2281e8f6f34669d2069a36a1a73a9246d1bcd6aa45e9f5f03d2b4f8f661b94975ce446e8d71c8f1384f5ec76d1e6a0a1bc28cabda36275c6ffb98b5563adb12a SHA512 8b27f29933e62f1f0545509924d2deff9712f9975ffcfed25e3d8fe345530bb3746d0df1eb243677ba826d32c1728275052743a152b7ab58bc6715b95fae2964
-EBUILD pcmanfm-qt-0.14.1-r1.ebuild 1143 BLAKE2B d16f8228d3b317e67b68786220f4ec2e7680170de6e703e50b0c174511bdb04bc569a63d628ecfc096007ca3b15e3f44c9cfd17dbe74e988cdb08e6a2a62e1fb SHA512 fcde9f4053727b670cd68b17dfb3761d15c9910994e88b128dbd1882b204b777905cc46486ccd113e6a844a3ce9531d76984ceb6737a449d8fc57c0cc51cc3fe
+EBUILD pcmanfm-qt-0.14.1-r1.ebuild 1141 BLAKE2B a0a6136ef47f11e0313a9a03a4804cbb70f4e40f63711772209566a037241647e942e31873bc8348cdd39ed9a0a3c73a72837f6f1424100c8a71247712e656b8 SHA512 ba8020579cbf486fa47212aa75155bbb80431b3930c96b018d8120ae4d0a199001ce0708efe940e78150ebba51bfeaa1b7b67427390e89db227494da7243d317
 MISC metadata.xml 316 BLAKE2B 1dc58d42a91390bd5c19ee7dccf75687a2b612f7af9569f4f3a731e8eec49eba2e244c1ced6107ed51cdd377f8d026cf6589a49c3314c60d38f58a68d7e82415 SHA512 910454c7d138693e0020b922b7b32749fdb70bb6057f4f16c7d72e3385cf278ce0dbddb0d75e57a90d5cdc14b10c0bad740d77c085d2f8d14b25b100b594a597
diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.14.1-r1.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.14.1-r1.ebuild
index e8f40638bef8..1a76e7238fba 100644
--- a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.14.1-r1.ebuild
+++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.14.1-r1.ebuild
@@ -10,7 +10,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Fast lightweight tabbed filemanager (Qt port)"
diff --git a/x11-misc/peksystray/Manifest b/x11-misc/peksystray/Manifest
index 64a1791f836e..0c31d3cc510f 100644
--- a/x11-misc/peksystray/Manifest
+++ b/x11-misc/peksystray/Manifest
@@ -1,6 +1,4 @@
 AUX peksystray-0.4.0-asneeded.patch 798 BLAKE2B fa17b9f091ccb94dc11c6086bc1bf648b08b4da3e192fa1998f09375e747cab854f25b72614998ec5289e2992ae1dcbd06dc47ffce5acb299bb4106dab35863e SHA512 d3f4c392d38b2e0f143d7e7dfa7a12ecb82e8d93f6651e254ee17d078487f6d95316f88d66a125ffc25abd2574a053f9a2b0e946bbba7f8a7d5b12903dbc8f21
-DIST peksystray-0.2.1.tar.gz 70261 BLAKE2B 8ff1d72e4cb0d35afc92b46acd7809095ded33630a896638e73bb64ad5b4eafbdcd02f53a4ef1251f567e7f9770dbce7161f47013b8e4543612506238c95b000 SHA512 c52fa6b7c8d5c57831fba993e85eb153d9b03ec04149b4d081bdde4854b099ccb423bb2e6eb36420093918f57449d208ed20dcca17344115eb989a095b69cbb2
 DIST peksystray-0.4.0.tar.bz2 73810 BLAKE2B 4ac452f14acff5afb8e14fc07a18d5efe6b68696c7063d8cd337c14b9bc0cdcb573ff830f9cc7e3b7057154a3e2a179da26977696101fbb56750320a3913b3d3 SHA512 9dc5d1df630b7447575011e971a9657a5987bdd6098c81444b7579c46bfd7747f4df18fa00376e70b046c52ae7ca95d6cb66ce8a57070795f2f8d497fa025341
-EBUILD peksystray-0.2.1.ebuild 606 BLAKE2B 993886553b8a18edc960ef0254ddee08f5f2dca7fa15ade3ce484d3e9eccf862c8ac6ec9972deb943bb01992fe3988c534dd48981e548bc058f6a4d0305f640b SHA512 e9de24dd129fc44d0f1396d679c6c1daebad62d33b3621a9cba9e4693ad947ebfefe129f42fe4e10f09ba9d39d09f1c1e1376e143e87633093b7c89f65991cea
 EBUILD peksystray-0.4.0.ebuild 554 BLAKE2B bfea69bc53205417709b9e6cb74e4cfa59319b3e76eb5bca9a50480a130dafaee741614aaaa2854f36d5419aa3bf62d526b48ca6ed05b4565d3cc555376f6720 SHA512 1f5cd4aa6252412b8870b1bfc5dcbc4137cf3a2ee156ec5a9326c3f1f57258ac04610134ecd081ea962432278abe3bd767026c1e732c32b6b46a9bbb79a8ef60
 MISC metadata.xml 300 BLAKE2B 750e120260f327b198e47b84c2ebfafad92c8e0e4565bf01b06df63ee8ba8c092d1a7f2474bc9b422d786393521c4a2439fdad56f7e5a90974872b904ec55eb0 SHA512 9a298c4fd2d42e5f14b22502fc97899123eb6bfa42143a1efd7df086c2bd97030ab04a731839e787774b216e08cbf829d7c9802b15a0a9ed412e94455e52f484
diff --git a/x11-misc/peksystray/peksystray-0.2.1.ebuild b/x11-misc/peksystray/peksystray-0.2.1.ebuild
deleted file mode 100644
index cfd9973fa440..000000000000
--- a/x11-misc/peksystray/peksystray-0.2.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils multilib
-
-DESCRIPTION="A system tray dockapp for window managers supporting docking"
-HOMEPAGE="http://freshmeat.net/projects/peksystray"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha ~amd64 ppc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXt"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	econf --x-libraries=/usr/$(get_libdir) || die
-	emake || die
-}
-
-src_install() {
-	dobin src/peksystray
-	dodoc AUTHORS NEWS README THANKS TODO
-}
diff --git a/x11-misc/polybar/Manifest b/x11-misc/polybar/Manifest
index 08102d2adcbb..828fb3c8a20a 100644
--- a/x11-misc/polybar/Manifest
+++ b/x11-misc/polybar/Manifest
@@ -1,6 +1,8 @@
 DIST i3ipcpp-0.7.1.tar.gz 191417 BLAKE2B 62b76a0921c78f374309d26856c01d1467b8bd181ce922fd47daec406afda9d76eea9a1f473b4899e22f99e2ef36fc70f72db1bb17eb1f3e71a8431c2634b915 SHA512 ef9f591bb4436916ad038bcb0c15ea3415d1978ff264fb276108ddac89c98515c464fbf252429f6a76589cb78e1434adba2efefb5a844dadad0e261f3806fb72
 DIST polybar-3.2.1.tar.gz 242327 BLAKE2B eb7bfe6e6d58fb4389016b8e5c73feea3984ce3ccefdb1acf202c6d2873a634e4d096658b850e8534c5c8c56e42ac66b3b8e80dabf5625491e5f56523b043ddf SHA512 e93c33738029b2e56a5dda75cbf3ee804c0d89c406444da6991ea8a5dd00e5544ef51d20f3d67ec293fc55ab7095e8e3057aaf8d1c08af61cf0531297e55a18d
+DIST polybar-3.3.1.tar.gz 248790 BLAKE2B 30c2cd2ff537f3a2fe2fe7ce489b5a0ab76a54cd42bbdf8b3727e5f4298898e289c6ea10a460385d8bcdc8ab11749255573bf7d728a01eae895a1ed8a2214c27 SHA512 c0bfaf99dcd19f8fcca8bd041c0f9e5f11fb822c92cf12edc2c59e67896f566ee46d1a0d75f5583d393af3a1958c3244a4eb28224f6336e9eaa98a50d740f834
 DIST xpp-1.4.0.tar.gz 84095 BLAKE2B 2af4221953abe7f40473c55cd50c608b54ebc85a62be65af987ed5e6c5eaf56fbd92531788becf39ba5ad52099ac78f36e9b2a2515b473f4d86ed5fda3fa5065 SHA512 d34cbbe2391db36db7dffac0415d26b7487536e97c4d7efd472ab0aeffa4c8e757ee030b05e2aa1cfa8a591ee591bb96a6db7eb9fa5850027f958e92f078739c
 EBUILD polybar-3.2.1.ebuild 1788 BLAKE2B c44044b3a7e3db34d10c9e018e52f192920f8a42fa6ea93e27c3cd0109143d8331c5f28e74958ed90fd569c632aa88257132c61625b0f5fb30cdfdb09f91b460 SHA512 db2abec6f14c08ed7beeff4fe90b2d832b5f249b64e5b0e4897316de597675bf06e4704ae8aa8635ec40fb3eca0e9be81c38889e82ddb7e98b73d99a69529980
-EBUILD polybar-9999.ebuild 1187 BLAKE2B b42e5685622509643cd9b8c73c2d119eb0adfc5904c52ddce1b66cb0ae4735e05e46a8e18e98f62ee6f47080c57869704b11fc2af7e593292d9736ee4d533551 SHA512 e548c3f17e6ee4c2f5190d5706d83ca567eb3c2f5c2a8bdda6e9984e6d2ba36b1f38c6052095152ca02958ff2fda7af211ff13e44f1294a0c4c7bf2a998fa5d0
+EBUILD polybar-3.3.1.ebuild 1968 BLAKE2B eeb084acbd61dddb5fcc2c1d84821c3a894717201df7233c7825e175212f46faa734dd199050ec931adabf6efb9ef937d24dd48f0e07a9cab50162cda91bd762 SHA512 23b5b98b3ce5e9c31dadbe446c72744f4a72969f08c0439e0a6982002686342ff40389948f20b20728346fdfd94f780695684110176d5c8335f18d3c677fe4a3
+EBUILD polybar-9999.ebuild 1968 BLAKE2B f3482b254e1e8ed6bcbb72531f94ffc3b21ac8cccf29992f6ec3794c3e8d650ef5f89f52f715f8b81925a6e726b68ae96e3de8e22f58b690951a854541bb6548 SHA512 25aaace811e587cccf2b4b2877bdf8e4da746043c0a574b93deaf53ea419e1612a4fcdb2e2af17877b2af53f4aebab1b23ac617555a66697c45b49302c6206e5
 MISC metadata.xml 580 BLAKE2B 965fdbd2a3799e0c8a9b6f03bfb7e21f1f413a226bd4748d860f4711d60bfadc2d6c2fdb37f3bf9933f2c494e7e6e0c0705c9a0ebef943ec2978f3aaf65c0176 SHA512 15b64a04e588b5edeec9aa5e579881c3e7c5a7f3fb66ed4443f32d50b850c437f65bc9050960710f2bb1e80ea52ccca9ecb19e8bf68fe66edddc8896a58aeeb9
diff --git a/x11-misc/polybar/polybar-3.3.1.ebuild b/x11-misc/polybar/polybar-3.3.1.ebuild
new file mode 100644
index 000000000000..d90ec9a2e765
--- /dev/null
+++ b/x11-misc/polybar/polybar-3.3.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="A fast and easy-to-use tool for creating status bars"
+HOMEPAGE="https://github.com/jaagr/polybar"
+
+if [[ ${PV} != *9999* ]]; then
+	XPP_VERSION="1.4.0"
+	I3IPCPP_VERSION="0.7.1"
+	SRC_URI="https://github.com/jaagr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/jaagr/xpp/archive/${XPP_VERSION}.tar.gz -> xpp-${XPP_VERSION}.tar.gz
+		https://github.com/jaagr/i3ipcpp/archive/v${I3IPCPP_VERSION}.tar.gz -> i3ipcpp-${I3IPCPP_VERSION}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/jaagr/${PN}.git"
+	EGIT_CLONE_TYPE="shallow"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+IUSE="alsa curl i3wm ipc mpd network pulseaudio"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	x11-base/xcb-proto
+	x11-libs/cairo[xcb]
+	x11-libs/libxcb[xkb]
+	x11-libs/xcb-util-image
+	x11-libs/xcb-util-wm
+	x11-libs/xcb-util-xrm
+	alsa? ( media-libs/alsa-lib )
+	curl? ( net-misc/curl )
+	i3wm? ( dev-libs/jsoncpp )
+	mpd? ( media-libs/libmpdclient )
+	network? ( net-wireless/wireless-tools )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if [[ ${PV} != *9999* ]]; then
+		rmdir "${S}"/lib/xpp || die
+		mv "${WORKDIR}"/xpp-$XPP_VERSION "${S}"/lib/xpp || die
+
+		rmdir "${S}"/lib/i3ipcpp || die
+		mv "${WORKDIR}"/i3ipcpp-$I3IPCPP_VERSION "${S}"/lib/i3ipcpp || die
+
+		sed -i "s/.*cpp_error,.*/&\n\t  'eventstruct'   : lambda x, y: None,/" lib/xpp/generators/cpp_client.py || die "sed failed"
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_ALSA="$(usex alsa)"
+		-DENABLE_CURL="$(usex curl)"
+		-DENABLE_I3="$(usex i3wm)"
+		-DBUILD_IPC_MSG="$(usex ipc)"
+		-DENABLE_MPD="$(usex mpd)"
+		-DENABLE_NETWORK="$(usex network)"
+		-DENABLE_PULSEAUDIO="$(usex pulseaudio)"
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/x11-misc/polybar/polybar-9999.ebuild b/x11-misc/polybar/polybar-9999.ebuild
index 3d18bd3871c8..70e8d426aaf5 100644
--- a/x11-misc/polybar/polybar-9999.ebuild
+++ b/x11-misc/polybar/polybar-9999.ebuild
@@ -1,19 +1,29 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
+EAPI=7
 
-inherit cmake-utils git-r3 python-single-r1
+PYTHON_COMPAT=( python2_7 )
+inherit cmake-utils python-single-r1
 
 DESCRIPTION="A fast and easy-to-use tool for creating status bars"
 HOMEPAGE="https://github.com/jaagr/polybar"
-EGIT_REPO_URI="https://github.com/jaagr/${PN}.git"
-EGIT_CLONE_TYPE="shallow"
+
+if [[ ${PV} != *9999* ]]; then
+	XPP_VERSION="1.4.0"
+	I3IPCPP_VERSION="0.7.1"
+	SRC_URI="https://github.com/jaagr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/jaagr/xpp/archive/${XPP_VERSION}.tar.gz -> xpp-${XPP_VERSION}.tar.gz
+		https://github.com/jaagr/i3ipcpp/archive/v${I3IPCPP_VERSION}.tar.gz -> i3ipcpp-${I3IPCPP_VERSION}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/jaagr/${PN}.git"
+	EGIT_CLONE_TYPE="shallow"
+fi
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS=""
 
 IUSE="alsa curl i3wm ipc mpd network pulseaudio"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -36,6 +46,20 @@ DEPEND="
 
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if [[ ${PV} != *9999* ]]; then
+		rmdir "${S}"/lib/xpp || die
+		mv "${WORKDIR}"/xpp-$XPP_VERSION "${S}"/lib/xpp || die
+
+		rmdir "${S}"/lib/i3ipcpp || die
+		mv "${WORKDIR}"/i3ipcpp-$I3IPCPP_VERSION "${S}"/lib/i3ipcpp || die
+
+		sed -i "s/.*cpp_error,.*/&\n\t  'eventstruct'   : lambda x, y: None,/" lib/xpp/generators/cpp_client.py || die "sed failed"
+	fi
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_ALSA="$(usex alsa)"
@@ -46,5 +70,6 @@ src_configure() {
 		-DENABLE_NETWORK="$(usex network)"
 		-DENABLE_PULSEAUDIO="$(usex pulseaudio)"
 	)
+
 	cmake-utils_src_configure
 }
diff --git a/x11-misc/qps/Manifest b/x11-misc/qps/Manifest
index 419d2ed41c8a..1414fac28bda 100644
--- a/x11-misc/qps/Manifest
+++ b/x11-misc/qps/Manifest
@@ -1,5 +1,5 @@
 DIST qps-1.10.18.tar.xz 164256 BLAKE2B 5eee79c2bab6eac23a91292132da4054836f86315a18399099aaad8853a06dbd79cb7c52af8c0e7098125d5cc06c04516235d6acb461e2caaf72584e7e05aa1b SHA512 f2647cb814e6cefba71aa70ee63c92dde88b312c9ada67e677de2bf22141afa3d7196d089606d270b610ddf3bd7466e6534de3614bea1a68d3a3b61a23b1c37d
 DIST qps-1.10.20.tar.xz 209588 BLAKE2B abf50904a97e9d2f5755bfc25509266de9c4b5a941a1010f93f475f02e8801b970ba112b01727e076c7b232cf23f50f6b8f7d2fe7acf2d8b273686f6a92404f3 SHA512 407130ac12f1e68da3e22543634d101c7a8353363ff1d9c6edbf98ce5d48f149aa5d937985f00109b40bd3cdb0b9a8e9745e845dd921be4aaf119022632bb9ef
 EBUILD qps-1.10.18.ebuild 742 BLAKE2B 6c0df4f82820d6c0fcdc54a28af624a301759c3b490585a61d74a16202a6ccc67af22f948d64cac14244a674304442e2f92a9fe9d7d39307152163c29ddbd04f SHA512 cc59e7c752c5f3ee9472e1d92713db7fba7df21b793af980b86d0d6196451f99e0cedf9cc3897534fe27c3382c0167eb258f74983261f18db6eb1914e2fadfb6
-EBUILD qps-1.10.20.ebuild 735 BLAKE2B d8421a74075e55b63b072aa5364fa92b8d4d06676da8f0c7805eabbc53f34dd2dc928805f4026d27fd777fc920bff2e88e548a48af67e38c5ca1b06a1a673c45 SHA512 a9a921be7ab7d56d31dad4d6e6cbd096713940ca72fc7d4bc0c6b868c71209c51407c75ddb30ad7b885bb8db24f288edf77ead652e6a892c73e07833113a539b
+EBUILD qps-1.10.20.ebuild 733 BLAKE2B 3bcfc79c88a00a88edd387b315cb8358cacb6a6916ccdeedf54bd349e29b4f2c900625a9958b0b832de0b8fb7b77715c3ff43222629dfb20e45df17e2b2a6ea9 SHA512 3a42d60777cbfb5ed9fa465c456a47c6192c1afcd352e3fe81ca7846b4b39c517b937b600ab1b7016f3d90226505bddcac1877e7e1be26896a8444915889c90f
 MISC metadata.xml 320 BLAKE2B 7a6824c87e5ee071bd4219df12554d6363050a126b5838af05dc627134e57d2452eab17569b3e144dcb476ec35dc41649da438b8eb7b45d9e695b2ad900581fa SHA512 b0c5950c5803e5bb765271787eab2bb755cd681f50ab183a2bb06b9f773d0dc8c959e7d9c3f15d23692b3c106d6a0bfd0db43f439225539a3a019b7dceb33292
diff --git a/x11-misc/qps/qps-1.10.20.ebuild b/x11-misc/qps/qps-1.10.20.ebuild
index 67921d696b43..707dc0fadb37 100644
--- a/x11-misc/qps/qps-1.10.20.ebuild
+++ b/x11-misc/qps/qps-1.10.20.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2+ LGPL-2.1+ QPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="debug"
 
 BDEPEND="
diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index 80bd77ee01a0..9979584289ea 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -7,6 +7,6 @@ DIST sddm-0.15.0.tar.gz 3520188 BLAKE2B b29a994a0ea2fbbda3f5eaf16885fdfa513a759e
 DIST sddm-0.18.0.tar.gz 3526688 BLAKE2B 96db3f7b4745b7b5686c3c5e4353c99f175f28c99d329df3bc49cf41788257eaf823c6998b165de90e2150e34470e65ca69731375194072aae7583c8e8dfa811 SHA512 474be3fc159ca31cae409ef5263c47376d41f500d8b495fc7ef896ad0f1a599a5fea9a58d7df2874493dfd9230d0121cdd836ec6171774df2ce1639e8e4c652f
 DIST sddm-0.18.1.tar.xz 3402972 BLAKE2B 99ab43d374e9a3d318f692a6d496d8a6d68927af3c8e8fc2208d7355ec90649a14758b39f5733dd32f942ed569de88085576d4f5f8666f4f97079e0fb6dcb99e SHA512 ff0637600cda2f4da1f643f047f8ee822bd9651ae4ccbb614b9804175c97360ada7af93e07a7b63832f014ef6e7d1b5380ab2b8959f8024ea520fa5ff17efd60
 EBUILD sddm-0.15.0.ebuild 1576 BLAKE2B bcdb6f67b661a3c87b7fe403918ac60cc6dba303e879c8a12e2a0708596c37c5152d406b092cc85a5bacca7c36ef46e942ed054969eb526382662c918bd394e1 SHA512 48839e26239bd57053717ca81a5b6b285677384ce081652fcb774e573a37bb3d56c42489732fdec5d8442550483f3cb2b4b1b936947e3554641bd1e00c17dd45
-EBUILD sddm-0.18.0.ebuild 2781 BLAKE2B 987031023cf37e50acdcf97b715ac6b99b7835d066bb690680aa0db5bc76012e0ef57973eb473982a5e967005ef38456daf0cb689268a0099ce530a37acd929c SHA512 69d08114ded9191b0ec8df902edf900afb89d80dc6880ea6e081c77e0d87dfbca790fe2658d896cb34d938c6cd375593824f41d0f1d8bfdfdca20adff886f8e8
+EBUILD sddm-0.18.0.ebuild 2777 BLAKE2B c7999e82f40cd0023abb6559f5a603e5e3d8c71c5e7f999bc3f5d56ddc7e71d9054ae86e3b9ed1242d28aaac9279f13d04c071a8eaa50f1c9a3776163b03c4dc SHA512 f34ec03dd08fd59c8cedd8f74bb45c22660907b2eabe51c056b84f247c512d3dd680179e31ce3695beb600bb4841a5ba97f57852275acd1212454c91f4f24771
 EBUILD sddm-0.18.1.ebuild 2796 BLAKE2B 3fd838e7ddd045f5db2ec515edfb69b18a1dcd50704a7a0decf02a4b97b0d776f9f584d564bc716f078911c07bce802256ecfcf432880ea4c3025c3668d29451 SHA512 c18338346335d06d64e967ea6678f1968805a58bd24b6b1a4c801c547dcd97e000b29b5a3fe54b7ab65ed6fff2235427cefed5fc4d6d917e2a47a214382f1880
 MISC metadata.xml 943 BLAKE2B 6bfdf54b23210c7e0d781c2f96358036ac7281825e71e4a8e9cf5fc6d43faf5525cc0ac267c7be2f5eadb08ca830350cf102425d30e19e5e4f92a3a57fc5affa SHA512 8a6b888910d68d5209c070c17e0c2e9dc5d64cf9d70cbf5ce945cfae763f864787fb998eb5544f4e6710c36b0045530780fb27f01944b60d71f60f09e8ecb516
diff --git a/x11-misc/sddm/sddm-0.18.0.ebuild b/x11-misc/sddm/sddm-0.18.0.ebuild
index 4763b8f4f54a..11c784821bb0 100644
--- a/x11-misc/sddm/sddm-0.18.0.ebuild
+++ b/x11-misc/sddm/sddm-0.18.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit cmake-utils l10n systemd user
 DESCRIPTION="Simple Desktop Display Manager"
 HOMEPAGE="https://github.com/sddm/sddm"
 SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
 SLOT="0"
diff --git a/x11-misc/x11vnc/Manifest b/x11-misc/x11vnc/Manifest
index 28912b5b2b86..67bfe5359bb4 100644
--- a/x11-misc/x11vnc/Manifest
+++ b/x11-misc/x11vnc/Manifest
@@ -1,9 +1,9 @@
+AUX x11vnc-0.9.16-anonymous-ssl.patch 841 BLAKE2B d037f4f784fe12cedca33be6a638524785342d4da9c2cd73acf138b64978d8303ee45fe08cc7516dd7baeed596bf53647db82caf693022cceb2e0b43c94f5dab SHA512 8c56c76758eb117db590415debaa18eec441ef952dac607ab77182f414e0e5f76d4a1dd2e543e0542a0fd413a8ec5dc2661f1dbabb27a4d6b36eacb09327ce2c
 AUX x11vnc-0.9.16-crypto.patch 645 BLAKE2B a821861e4e4807e5e019c787d07791912083a3ae2d1e4c77eb3264adee65a68ea51c35fdfcd0d71b996f4af42ff8481c877f5f324180139857e5cfc7d0ac3db3 SHA512 6e9ec1eb5aba65999dda9048fb01e13c55cbbf6f3e226c23e20ee906891487a5c94efd09f54ac765ca1ed99290357403a0b2caa3a7226fc967b0e8ecf19360a6
+AUX x11vnc-0.9.16-libressl.patch 4083 BLAKE2B 0b95dad69a0f7180edfe71da6df2c9e6025ba57ac984a04dc118e642b1ee2a6757c11d400a2e3641e71b367e4ea42d7557d48ba932d55ef839f122ea9170aab2 SHA512 041f57dc654bbf18c9fc741d42d9cc6f0646f619b2d3a473898b2e5d20609e7f475a7abfbd1e0fb9ed01017474aab0241ce04c37cec2e8acbd813f8ee678ee53
 AUX x11vnc.conf.d 1435 BLAKE2B 8403d61a4941c56127e869d6ac90d4f85237af9af786f864d32afbedf3e736528b74c8c83fcf3491794b9e62db6ef2a354dccd61f368c8e9251f915e2bd683f8 SHA512 dedc94fab89a06ca6025b99c2c944cabe77640487c8fc761a6420e5be7062ee4c1c383f3846c17bed434ad4f3ec3b994badb493919acb99da3f61caa40c60246
 AUX x11vnc.init.d 1728 BLAKE2B 45680af6aad530a9b36f29adc61c1f90ad272bd7201c30f29b3d6c5b980012ddb299c878ae1bb20734496c4f2b8b1e1c507cadee875305167e3f298993947a9e SHA512 8de7966b79b5acc83c8cebc3c2ef0819196f5a33eabad619991d04c7c059a68afbf44d0ece6b0db33cea1f525402a601b25db220733f0ff69c0fff48d3c50ac2
-DIST x11vnc-0.9.14_p20161013.tar.gz 1702047 BLAKE2B 3c2487208a2318816af408a3396d4b6cd7cbcd5b3aa7879f0390a1a6e0200cbe0bb2cc0c50581b3e3e4de916dae3fdb4426547de7203ebe95ddc62722e4219eb SHA512 82207e4d721dde633aaa13dbd1e6a18799615f8e3c225c33d4f8b01775fb81fb6b92a817e7d014653ac7b2349b0b31e46be8db25c5fd5e3ecee8fb93ca665b97
 DIST x11vnc-0.9.16.tar.gz 1708009 BLAKE2B a8789f95ef421a78a83703748e1d80fd45539dff24f80493fd75e357bc22378213915853f9d114248c172cd83977880e1e4e8a3f8df0771017e9988d83b7307d SHA512 69f65ee312f8dede6051b401304987502a213c6c28c7f41e855734f11de1fae14d5d493dc9c28b2e4b7c0be55f8dbd3b35dd2610aae910183772c3e626736fec
-EBUILD x11vnc-0.9.14_p20161013.ebuild 1374 BLAKE2B 8447ea4607d92d215214e6fb30038eb54f40b7b0c7e87af45996103208e1284e212e1c8c7ea7a72741b3a18a8ef04350bc770ea92201e7dd5eadc8f9a525f9a9 SHA512 520f30e07fab2eac5449ec931477a7e85b0376f4f19babe4d50afa843a13c8863866325fd2a2476a4b7c3d20faa91ba913270c119979287f14440e5610d476d6
-EBUILD x11vnc-0.9.16-r1.ebuild 1839 BLAKE2B d144f710a56ccd92f144315bb18217fbf3d9ff747abca835a52383fe2718c03aa25abddbb31b80b5bc9109794c7e8833602d04735f755820d44a62326e99066e SHA512 b33d6de82001218e7fa03edc3e98c66a2021fdc12ea4e3d00d446a1372629cecebc91ac695949e359e5087ee021fd48e081149098bb3bd8a896935fedc7b146d
-EBUILD x11vnc-0.9.16.ebuild 1362 BLAKE2B a56115a2d7738e3a7410f73ee7c256bf3785bb4698905a74976b3efef96b8678517c4197e632f5b2097520ed069310ace7e21f7726dea7fb2391f7e7ee92b2d2 SHA512 b1af8a7a18b44355d8e6ab956ce4a3bec428bed7afc575ac877f1e05782e35b4630511ec96ed6c14d4dc17c0686e905a39bb1154aa0d85801720d53df9ad80e0
-MISC metadata.xml 725 BLAKE2B dfdda6a6c38d7df5cf8da77b4b2ff64823f5d176711d163d3cb95e50eae631eff64098f774b3886fb1b8baebf16289d7d8958357cdd987ec697f8a915d3a6184 SHA512 07648db4c5c5198e76e08fb5de36424286eccf09e7dc685c61ef0f148c908864275611fbd339cf791551f13a3867f8196a2645ec23927a6f0afe8b4c0bda7e62
+EBUILD x11vnc-0.9.16-r2.ebuild 1954 BLAKE2B 6fc7723a676f81cf9ce0cedb651e9c08d10ab9d1f79acb31bbce5404e3d8abb4a626ae68ee1d9502f9c67608045e4bf49acf58731ffd8b08c11eb604da31328e SHA512 98e99bc49f08d8302836290d308b5415ff9ed99ebfd4193c93c7f919bf8fa4594318cee11cc7e9d4e7423018e31258f951d2c903b398746262ce9232ab653574
+EBUILD x11vnc-0.9.16-r3.ebuild 1991 BLAKE2B ac681294caad34b791298219d76ffd0f60e39b3943fbdaee1c566c56d764978f4fe75e8759b5f48ba475ef0ddfd6b75ae6e3876196a7d6c785a650b7218f26aa SHA512 e1abca08c362bdcdd5087be05078990fad5d3d93fdbb180a0b0d81b39df26957eaab629f8f6ab4ef2eaa4d7dbf08cec3a5d469c005bf823d25f7eeeae86701d4
+MISC metadata.xml 922 BLAKE2B 02740589fa0091f604e1fff99ace802d4b179a35afd2c40d4ae25d40d41af0425a6e16cdb5951b4968813478a5066c6a241d49beba811dc296f125ba2aaddd13 SHA512 b46e3d0b379cf9967ec878e57d0a21b677ca869921546224f6f663eca4da8f2d57a97d07dac9da90999454584f6ea1c80748adf12663ff03b286292603aef2c6
diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.16-anonymous-ssl.patch b/x11-misc/x11vnc/files/x11vnc-0.9.16-anonymous-ssl.patch
new file mode 100644
index 000000000000..3dafb9aa6b0c
--- /dev/null
+++ b/x11-misc/x11vnc/files/x11vnc-0.9.16-anonymous-ssl.patch
@@ -0,0 +1,26 @@
+From b9cf79fd3d61a7586fe6b24b3141e406cdf334eb Mon Sep 17 00:00:00 2001
+From: Jim Broadus <jbroadus@xevo.com>
+Date: Wed, 2 Jan 2019 17:37:40 -0800
+Subject: [PATCH] Fix anonymous SSL. In version 1.1.0, openssl introduced a
+ security level concept. Only level 0 allows the use of unauthenticated cipher
+ suites such as ADH.
+
+---
+ src/sslhelper.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/sslhelper.c b/src/sslhelper.c
+index 1a3e7474..04c2e273 100644
+--- a/src/sslhelper.c
++++ b/src/sslhelper.c
+@@ -1596,6 +1596,10 @@ static int switch_to_anon_dh(void) {
+ 	if (ssl_client_mode) {
+ 		return 1;
+ 	}
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	/* Security level must be set to 0 for unauthenticated suites. */
++	SSL_CTX_set_security_level(ctx, 0);
++#endif
+ 	if (!SSL_CTX_set_cipher_list(ctx, "ADH:@STRENGTH")) {
+ 		return 0;
+ 	}
diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.16-libressl.patch b/x11-misc/x11vnc/files/x11vnc-0.9.16-libressl.patch
new file mode 100644
index 000000000000..8e5d8a692175
--- /dev/null
+++ b/x11-misc/x11vnc/files/x11vnc-0.9.16-libressl.patch
@@ -0,0 +1,93 @@
+diff --git a/src/sslhelper.c b/src/sslhelper.c
+index 04c2e27..fb9daa6 100644
+--- a/src/sslhelper.c
++++ b/src/sslhelper.c
+@@ -803,7 +803,7 @@ static int pem_passwd_callback(char *buf, int size, int rwflag,
+ static int crl_callback(X509_STORE_CTX *callback_ctx) {
+ 	const ASN1_INTEGER *revoked_serial;
+ 	X509_STORE_CTX *store_ctx;
+-#if OPENSSL_VERSION_NUMBER > 0x10100000L
++#if OPENSSL_VERSION_NUMBER > 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ 	X509_OBJECT *obj;
+ #else
+ 	X509_OBJECT obj;
+@@ -829,7 +829,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) {
+ 	* the current certificate in order to verify it's integrity. */
+ 	store_ctx = X509_STORE_CTX_new();
+ 	X509_STORE_CTX_init(store_ctx, revocation_store, NULL, NULL);
+-#if OPENSSL_VERSION_NUMBER > 0x10100000L
++#if OPENSSL_VERSION_NUMBER > 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ 	obj = X509_OBJECT_new();
+ 	rc=X509_STORE_get_by_subject(store_ctx, X509_LU_CRL, subject, obj);
+ 	crl = X509_OBJECT_get0_X509_CRL(obj);
+@@ -865,7 +865,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) {
+ 			rfbLog("Invalid signature on CRL\n");
+ 			X509_STORE_CTX_set_error(callback_ctx,
+ 				X509_V_ERR_CRL_SIGNATURE_FAILURE);
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ 			X509_OBJECT_free(obj);
+ #else
+ 			X509_OBJECT_free_contents(&obj);
+@@ -883,7 +883,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) {
+ 			rfbLog("Found CRL has invalid nextUpdate field\n");
+ 			X509_STORE_CTX_set_error(callback_ctx,
+ 				X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD);
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ 			X509_OBJECT_free(obj);
+ #else
+ 			X509_OBJECT_free_contents(&obj);
+@@ -894,14 +894,14 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) {
+ 			rfbLog("Found CRL is expired - "
+ 				"revoking all certificates until you get updated CRL\n");
+ 			X509_STORE_CTX_set_error(callback_ctx, X509_V_ERR_CRL_HAS_EXPIRED);
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ 			X509_OBJECT_free(obj);
+ #else
+ 			X509_OBJECT_free_contents(&obj);
+ #endif
+ 			return 0; /* Reject connection */
+ 		}
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ 			X509_OBJECT_free(obj);
+ #else
+ 			X509_OBJECT_free_contents(&obj);
+@@ -912,7 +912,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) {
+ 	 * the current certificate in order to check for revocation. */
+ 	store_ctx = X509_STORE_CTX_new();
+ 	X509_STORE_CTX_init(store_ctx, revocation_store, NULL, NULL);
+-#if OPENSSL_VERSION_NUMBER > 0x10100000L
++#if OPENSSL_VERSION_NUMBER > 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ 	obj = X509_OBJECT_new();
+ 	rc=X509_STORE_get_by_subject(store_ctx, X509_LU_CRL, issuer, obj);
+ 	crl = X509_OBJECT_get0_X509_CRL(obj);
+@@ -942,7 +942,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) {
+ 					"revoked per CRL from issuer %s\n", serial, serial, cp);
+ 				OPENSSL_free(cp);
+ 				X509_STORE_CTX_set_error(callback_ctx, X509_V_ERR_CERT_REVOKED);
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ 				X509_OBJECT_free(obj);
+ #else
+ 				X509_OBJECT_free_contents(&obj);
+@@ -950,7 +950,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) {
+ 				return 0; /* Reject connection */
+ 			}
+ 		}
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ 			X509_OBJECT_free(obj);
+ #else
+ 			X509_OBJECT_free_contents(&obj);
+@@ -1596,7 +1596,7 @@ static int switch_to_anon_dh(void) {
+ 	if (ssl_client_mode) {
+ 		return 1;
+ 	}
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ 	/* Security level must be set to 0 for unauthenticated suites. */
+ 	SSL_CTX_set_security_level(ctx, 0);
+ #endif
diff --git a/x11-misc/x11vnc/metadata.xml b/x11-misc/x11vnc/metadata.xml
index ff9539136145..40fa3182ee05 100644
--- a/x11-misc/x11vnc/metadata.xml
+++ b/x11-misc/x11vnc/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>alexander@tsoy.me</email>
+		<name>Alexander Tsoy</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 		The primary goal of this program is to create a portable and
 		simple command-line server utility that allows a VNC viewer
diff --git a/x11-misc/x11vnc/x11vnc-0.9.14_p20161013.ebuild b/x11-misc/x11vnc/x11vnc-0.9.14_p20161013.ebuild
deleted file mode 100644
index ebf7c1d17f60..000000000000
--- a/x11-misc/x11vnc/x11vnc-0.9.14_p20161013.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools vcs-snapshot
-
-DESCRIPTION="A VNC server for real X displays"
-HOMEPAGE="https://libvnc.github.io/"
-SRC_URI="https://github.com/LibVNC/x11vnc/archive/e191071c1f375d04ba8f955ea0a30292a485999e.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="crypt fbcon libressl ssl xinerama zeroconf"
-
-RDEPEND=">=net-libs/libvncserver-0.9.8[ssl?]
-	x11-libs/libX11
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	>=x11-libs/libXtst-1.1.0
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	xinerama? ( x11-libs/libXinerama )
-	zeroconf? ( >=net-dns/avahi-0.6.4 )
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-libs/libXt"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# --without-v4l because of missing video4linux 2.x support wrt #389079
-	econf \
-		$(use_with crypt) \
-		$(use_with fbcon fbdev) \
-		$(use_with ssl) \
-		$(use_with ssl crypto) \
-		--without-v4l \
-		$(use_with xinerama) \
-		$(use_with zeroconf avahi)
-}
-
-src_install() {
-	default
-	doinitd "${FILESDIR}/x11vnc.init.d"
-	doconfd "${FILESDIR}/x11vnc.conf.d"
-}
diff --git a/x11-misc/x11vnc/x11vnc-0.9.16-r2.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r2.ebuild
new file mode 100644
index 000000000000..7ddfb82395ea
--- /dev/null
+++ b/x11-misc/x11vnc/x11vnc-0.9.16-r2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="VNC server for real X displays"
+HOMEPAGE="https://libvnc.github.io/"
+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 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="crypt fbcon libressl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf"
+
+COMMON_DEPEND="
+	>=net-libs/libvncserver-0.9.8[ssl]
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXext
+	>=x11-libs/libXtst-1.1.0
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
+	xcomposite? ( x11-libs/libXcomposite )
+	xdamage? ( x11-libs/libXdamage )
+	xfixes? ( x11-libs/libXfixes )
+	xinerama? ( x11-libs/libXinerama )
+	xrandr? ( x11-libs/libXrandr )
+	zeroconf? ( >=net-dns/avahi-0.6.4 )
+"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+	x11-libs/libXt
+"
+# https://bugzilla.redhat.com/show_bug.cgi?id=920554
+RDEPEND="${COMMON_DEPEND}
+	dev-lang/tk:0
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-crypto.patch # https://github.com/LibVNC/x11vnc/issues/86
+	"${FILESDIR}"/${P}-anonymous-ssl.patch # https://github.com/LibVNC/x11vnc/pull/85
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# --without-v4l because of missing video4linux 2.x support wrt #389079
+	# --with-crypto --with-ssl because USE=-ssl is broken (bug #686494)
+	econf \
+		--with-crypto \
+		--with-ssl \
+		--without-v4l \
+		--without-xkeyboard \
+		--without-fbpm \
+		--without-dpms \
+		$(use_with crypt) \
+		$(use_with fbcon fbdev) \
+		$(use_with xcomposite) \
+		$(use_with xdamage) \
+		$(use_with xfixes) \
+		$(use_with xinerama) \
+		$(use_with xrandr) \
+		$(use_with zeroconf avahi)
+}
+
+src_install() {
+	default
+	newinitd "${FILESDIR}/x11vnc.init.d" x11vnc
+	newconfd "${FILESDIR}/x11vnc.conf.d" x11vnc
+}
diff --git a/x11-misc/x11vnc/x11vnc-0.9.16-r1.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r3.ebuild
index b4e3e583f68f..752f08e414d2 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.16-r1.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.16-r3.ebuild
@@ -1,20 +1,21 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools vcs-snapshot
+EAPI=7
 
-DESCRIPTION="A VNC server for real X displays"
+inherit autotools
+
+DESCRIPTION="VNC server for real X displays"
 HOMEPAGE="https://libvnc.github.io/"
 SRC_URI="https://github.com/LibVNC/x11vnc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+-with-openssl-exception"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="crypt fbcon libressl ssl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf"
 
 COMMON_DEPEND="
-	>=net-libs/libvncserver-0.9.8[ssl?]
+	>=net-libs/libvncserver-0.9.8[ssl=]
 	x11-libs/libX11
 	x11-libs/libXcursor
 	x11-libs/libXext
@@ -35,11 +36,14 @@ DEPEND="${COMMON_DEPEND}
 	x11-libs/libXt
 "
 # https://bugzilla.redhat.com/show_bug.cgi?id=920554
-RDEPEND="dev-lang/tk:0"
+RDEPEND="${COMMON_DEPEND}
+	dev-lang/tk:0
+"
 
 PATCHES=(
-	# https://github.com/LibVNC/x11vnc/issues/86
-	"${FILESDIR}"/${P}-crypto.patch
+	"${FILESDIR}"/${P}-crypto.patch # https://github.com/LibVNC/x11vnc/issues/86
+	"${FILESDIR}"/${P}-anonymous-ssl.patch # https://github.com/LibVNC/x11vnc/pull/85
+	"${FILESDIR}"/${P}-libressl.patch
 )
 
 src_prepare() {
@@ -49,21 +53,23 @@ src_prepare() {
 
 src_configure() {
 	# --without-v4l because of missing video4linux 2.x support wrt #389079
-	econf \
-		--without-v4l \
-		--without-xkeyboard \
-		--without-fbpm \
-		--without-dpms \
-		$(use_with crypt) \
-		$(use_with fbcon fbdev) \
-		$(use_with ssl) \
-		$(use_with ssl crypto) \
-		$(use_with xcomposite) \
-		$(use_with xdamage) \
-		$(use_with xfixes) \
-		$(use_with xinerama) \
-		$(use_with xrandr) \
+	local myconf=(
+		--without-v4l
+		--without-xkeyboard
+		--without-fbpm
+		--without-dpms
+		$(use_with crypt)
+		$(use_with fbcon fbdev)
+		$(use_with ssl)
+		$(use_with ssl crypto)
+		$(use_with xcomposite)
+		$(use_with xdamage)
+		$(use_with xfixes)
+		$(use_with xinerama)
+		$(use_with xrandr)
 		$(use_with zeroconf avahi)
+	)
+	econf "${myconf[@]}"
 }
 
 src_install() {
diff --git a/x11-misc/x11vnc/x11vnc-0.9.16.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16.ebuild
deleted file mode 100644
index fdb0b5c8392a..000000000000
--- a/x11-misc/x11vnc/x11vnc-0.9.16.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools vcs-snapshot
-
-DESCRIPTION="A VNC server for real X displays"
-HOMEPAGE="https://libvnc.github.io/"
-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 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="crypt fbcon libressl ssl xinerama zeroconf"
-
-RDEPEND=">=net-libs/libvncserver-0.9.8[ssl?]
-	x11-libs/libX11
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	>=x11-libs/libXtst-1.1.0
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	xinerama? ( x11-libs/libXinerama )
-	zeroconf? ( >=net-dns/avahi-0.6.4 )
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-libs/libXt"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# --without-v4l because of missing video4linux 2.x support wrt #389079
-	econf \
-		--without-v4l \
-		$(use_with crypt) \
-		$(use_with fbcon fbdev) \
-		$(use_with ssl) \
-		$(use_with ssl crypto) \
-		$(use_with xinerama) \
-		$(use_with zeroconf avahi)
-}
-
-src_install() {
-	default
-	newinitd "${FILESDIR}/x11vnc.init.d" x11vnc
-	newconfd "${FILESDIR}/x11vnc.conf.d" x11vnc
-}
diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index 8f8e95aa5832..7830de1f209f 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -2,7 +2,9 @@ AUX zim-0.60-remove-ubuntu-theme.patch 669 BLAKE2B fbb3fe0082e7567f4ae9d0bd03109
 DIST zim-0.65.tar.gz 1899614 BLAKE2B e7989d91120f2ffe0668c996b5abd61cc1cb12b2a5acf9023dfd87819b4c8834bba09f2211c901512d9fe186eee7939e44a5f098c09ef65f1d28cc55eb97e9b7 SHA512 dee652087d3d986b80353e9087abe363392354f40db11f8819d0b3f3c6f133c08c66c651a92ed77c1656f1135998ac02622eca08ac2e28c8fb3149a724a0f7fb
 DIST zim-0.69.tar.gz 2044631 BLAKE2B 447fa4fb2d11b1399668ec6b627e23150577b574afb1e5c33738cb690779f49adb2d60e0b01eb82d2cf0dfd4a430099c1ae4b52186b60a2564c501b93aa01822 SHA512 452b2119d63927765c3807dbbdfadea94be31ee7fd3eb9b8cf79e8699c57478ec9cd392299a6e1dc3690dbe520925cddf5fca4596db809a2cc296bb6669d12af
 DIST zim-0.71.0.tar.gz 2882942 BLAKE2B f1701baf547d43d7a9687e6a1d72313649064f1d3927e14bffd5c8e348fa7a311e307f9b1704c19058bfad07d6715c79399acfdc5701efa9291db3e68065175a SHA512 7c82e19d547795f57c563383aca04a51da02463df71cfe18c4cab0307f46fb425ff0f348b43ae0ab26cb29037bc9d99aed63dbf721a542d071f9674f17f0a64a
+DIST zim-0.71.1.tar.gz 2883082 BLAKE2B 66d1c571a67e12d8d38cbc6d8bd32918f98f47bff0aa34971986896b3aeec91170cd1f2a87a411a8fccda502addd3de8176cc70ebfbafedc87c462a751e87036 SHA512 0da59955f730cc0bbee033a292c7e531b1a302c950773aed68bd8a18bf1485826086522c4144f24f500e9240ebcb9b592b33dda390923ca0eba6ab57273c0896
 EBUILD zim-0.65.ebuild 1777 BLAKE2B 29f8c8c7bd19e0580603df7a246160f57f42f08c4e474abd8852245dbe7e1656e8d8e17bdc7952771c571ea94c35c18d80e67c4990e8206c5baa806ff2847977 SHA512 d3d2cb0eea9629277c38883523a7cda05a275b729c34805c9eeaab11ea016d46b05f325efb7d6af2a093d3c71fac0b8e50e46b642a62275772cb9f2a870de6e0
 EBUILD zim-0.69.ebuild 1849 BLAKE2B 7bad44da4be87ee0b8c9a9dde44264035bf7ef330f22db53a0086badfae364285f1d51592671e36f05af67a3e025c8f58fe394bdbb370de94469042f0254bdf1 SHA512 5346b7821aa43fd866af288a9cb8ff9374cb463a68123ae931d1f4145bd8e8bd3ea23ae8faa40c95a5dc9f0ac085fd21d108aad8aaaf5c396a830e96e4628250
 EBUILD zim-0.71.0.ebuild 1897 BLAKE2B e13582f180fa5ff958f31b70be3be0fb672b27fecba7e096c301cd2c8c53865f3c5e6d22e983816116429f973486d9de89b22db64d24a4a27470782fa1c580af SHA512 a37fbb05b2277d32a6adff6f0e1d96e8dbb9bbca3aafc75ebb1e0907377b68a1fb703df0838291b6cac7a90096ec5f2fa25e1491ccae56acca257b8c19275cc1
+EBUILD zim-0.71.1.ebuild 1897 BLAKE2B e13582f180fa5ff958f31b70be3be0fb672b27fecba7e096c301cd2c8c53865f3c5e6d22e983816116429f973486d9de89b22db64d24a4a27470782fa1c580af SHA512 a37fbb05b2277d32a6adff6f0e1d96e8dbb9bbca3aafc75ebb1e0907377b68a1fb703df0838291b6cac7a90096ec5f2fa25e1491ccae56acca257b8c19275cc1
 MISC metadata.xml 824 BLAKE2B a6ac745b62015073844af9a8aae0ef1d6ca6b7c28e881c7b85d31e00c808076fa944feec5980cdefc72b5ddfa2cecb98fc96b4745df12743212a4d572679408d SHA512 26a4774e75f0a06bfedc2c26f4ca688f9a2644935302e0674ba5a5308af88bc90f291a01f5b10bba62ac0f0a46561d63bfd9289de67bc53c4be454542ea76816
diff --git a/x11-misc/zim/zim-0.71.1.ebuild b/x11-misc/zim/zim-0.71.1.ebuild
new file mode 100644
index 000000000000..e9579e77339b
--- /dev/null
+++ b/x11-misc/zim/zim-0.71.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_SINGLE_IMPL=1
+inherit xdg-utils distutils-r1 gnome2-utils virtualx
+
+DESCRIPTION="A desktop wiki"
+HOMEPAGE="
+	http://zim-wiki.org/
+	https://github.com/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="
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_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() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_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() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}