gentoo resync : 16.06.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-06-16 21:23:20 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-06-16 21:23:20 +0100
commit: fab849d1daed0ba7f2ac497d07985c3dbb692543 (patch)
tree: 10baa743a5340b42ad538dd19d48669ccac209b1 /x11-misc
parent: 73c318acdaf6f8309d68bd266051e6dd1f1bd787 (diff)
22 files changed, 244 insertions, 127 deletions
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index b96c96a9020f..95e9c57450e3 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/light-locker/Manifest b/x11-misc/light-locker/Manifest
index ed4c397773a9..96825a635028 100644
--- a/x11-misc/light-locker/Manifest
+++ b/x11-misc/light-locker/Manifest
@@ -1,7 +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
+AUX light-locker-1.9.0-elogind.patch 9704 BLAKE2B ead5c1767ac6772477e977bc57bb63392080be397a094dabbf4f4ac779b274f27f045447609c7ce39c6a1602dd2d046d84eff21688e1e4c98c29376e579b7830 SHA512 580a32670e63979691cd1a2102f49e4af23677f4bff1c597c6a87196235844fd1ba3c8d30e148f83b99466a77908f3204e35b57bb01c25fef949e0e3e37cf2f2
 DIST light-locker-1.8.0.tar.bz2 449898 BLAKE2B d5ff454958138ec535b94492a9646dd5a4fc8196095ef3ae933d661e44eb62960ca49fe070fd88a794e2a9c5a6586317845b0d55d8cfd65107e49e31206a727a SHA512 bbad73c0b82a50ddca240d5e1bd325a99d0c60364d136fe6d9d52f196319953373c9d03cf38ebd75d4498d080e96702e09fc97c35b4b69cbe963f065719549d5
 DIST light-locker-1.9.0.tar.gz 124753 BLAKE2B 510447a5fa107988a06e92cc99d7750bc0df526356630694c5dc718460bd437879bbdcb69e0778bdb58d399aafdbea762bfda53d2e2205a1c4bade27dbff78c5 SHA512 c6f84b38affa20cf0bd7d2341f5a8eff36891ed55401955715a68a011c84c7f2300db670abb95a320eb40aee90885fe044ddf0a721e418ee4724af3e4f6a61a4
 EBUILD light-locker-1.8.0-r1.ebuild 1617 BLAKE2B 340b6658d7bbe2567a4d0786476b77d3979f0aae1c0d9a6c3fe5ce798d7c8aa30d7e0fc97688ed0ade1785c1707f768ddd57402a8e2bf2a946f529da44183505 SHA512 186ae4504e45b0b6f4914e93c009ef7c2cc954cff6632c91a2d3b6ebc81aaef099340e67a59292e1adfd4d7fb68be672f9bc9ad550f464e6e4f9e8c39cd66a55
-EBUILD light-locker-1.9.0-r1.ebuild 1565 BLAKE2B c30a4b419691d87823ec2c9876ffa5c51d48701c714e582ca80a89ff8db08bef7d585d20771f2d1809c127d9a37008888924256854d3eccfee10e53d9a7eb151 SHA512 2725cc37c34e81beca17d2db2679e92b15783c654fc779fe32cc4abc1842a1c9c7a49f6f8c01e9f535ee3b352497da42461b840529fe8542c704db76e8956a7f
+EBUILD light-locker-1.9.0-r2.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
index 298e75844c4b..aa630bd1fd28 100644
--- 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
@@ -1,14 +1,15 @@
-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
+From 0b5dbd25a21a16b93c371fd892b910969e4b2d58 Mon Sep 17 00:00:00 2001
+From: Robert Dyer <robert.dyer@sony.com>
+Date: Mon, 3 Jun 2019 22:17:08 -0500
+Subject: [PATCH] fix-up light-locker-1.9.0-elogind.patch
 
 ---
  README.md              |  2 ++
- configure.ac.in        | 37 +++++++++++++++++++++++++++++++++++++
- src/gs-listener-dbus.c | 34 +++++++++++++++++++---------------
+ configure.ac.in        | 39 ++++++++++++++++++++++++++++++++++++++-
+ src/Makefile.am        |  4 +++-
+ src/gs-listener-dbus.c | 32 +++++++++++++++++---------------
  src/light-locker.c     |  6 ++++++
- 4 files changed, 64 insertions(+), 15 deletions(-)
+ 5 files changed, 66 insertions(+), 17 deletions(-)
 
 diff --git a/README.md b/README.md
 index 86b66d0..b093a4f 100644
@@ -24,9 +25,18 @@ index 86b66d0..b093a4f 100644
  
    --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
+index 67c271b..2c0678f 100644
 --- a/configure.ac.in
 +++ b/configure.ac.in
+@@ -408,7 +408,7 @@ if test "x$with_systemd" = "xauto" ; then
+                 use_systemd=yes
+         fi
+ else
+-	use_systemd=$with_systemd
++        use_systemd=$with_systemd
+ fi
+ 
+ if test "x$use_systemd" = "xyes"; then
 @@ -421,6 +421,42 @@ fi
  AC_SUBST(SYSTEMD_CFLAGS)
  AC_SUBST(SYSTEMD_LIBS)
@@ -55,7 +65,7 @@ index f95863a..5c92191 100644
 +                use_elogind=yes
 +        fi
 +else
-+       use_elogind=$with_elogind
++        use_elogind=$with_elogind
 +fi
 +
 +if test "x$use_elogind" = "xyes"; then
@@ -74,89 +84,109 @@ index f95863a..5c92191 100644
                      Platform:
                      ---------
          systemd:                  ${use_systemd}
-+	elogind:                  ${use_elogind}
++        elogind:                  ${use_elogind}
          UPower:                   ${use_upower}
  
                      Features:
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 0fa4ef9..be6fb0d 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -25,6 +25,7 @@ AM_CPPFLAGS =							\
+ 	$(DBUS_CFLAGS)						\
+ 	$(LIBNOTIFY_CFLAGS)					\
+ 	$(SYSTEMD_CFLAGS)					\
++	$(ELOGIND_CFLAGS)					\
+ 	$(NULL)
+ 
+ bin_PROGRAMS = \
+@@ -90,7 +91,8 @@ light_locker_SOURCES =	\
+ light_locker_LDADD =		\
+ 	$(LIGHT_LOCKER_LIBS)	\
+ 	$(SAVER_LIBS)			\
+-	$(SYSTEMD_LIBS)                 \
++	$(SYSTEMD_LIBS)			\
++	$(ELOGIND_LIBS)			\
+ 	$(NULL)
+ 
+ light_locker_LDFLAGS = -export-dynamic
 diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c
-index 044a2bf..164856f 100644
+index 044a2bf..3ba476e 100644
 --- a/src/gs-listener-dbus.c
 +++ b/src/gs-listener-dbus.c
-@@ -43,6 +43,10 @@
+@@ -41,6 +41,8 @@
+ 
+ #ifdef WITH_SYSTEMD
  #include <systemd/sd-login.h>
++#elif WITH_ELOGIND
++#include <elogind/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
+@@ -78,7 +80,7 @@ struct GSListenerPrivate
          char           *session_id;
          char           *seat_path;
  
 -#ifdef WITH_SYSTEMD
-+#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
++#if defined(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)
+@@ -134,7 +136,7 @@ gs_listener_send_switch_greeter (GSListener *listener)
  
          gs_debug ("Send switch greeter");
  
 -#ifdef WITH_SYSTEMD
-+#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
          /* Compare with 0. On failure this will return < 0.
           * In the later case we probably aren't using systemd.
           */
-@@ -175,7 +179,7 @@ gs_listener_send_lock_session (GSListener *listener)
+@@ -175,7 +177,7 @@ gs_listener_send_lock_session (GSListener *listener)
  
          gs_debug ("Send lock session");
  
 -#ifdef WITH_SYSTEMD
-+#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
          /* Compare with 0. On failure this will return < 0.
           * In the later case we probably aren't using systemd.
           */
-@@ -359,7 +363,7 @@ gs_listener_set_idle_hint (GSListener *listener, gboolean idle)
+@@ -359,7 +361,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 defined(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)
+@@ -400,7 +402,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)
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
          DBusMessage    *message;
          DBusMessage    *reply;
          DBusError       error;
-@@ -473,7 +477,7 @@ gs_listener_delay_suspend (GSListener *listener)
+@@ -473,7 +475,7 @@ gs_listener_delay_suspend (GSListener *listener)
  void
  gs_listener_resume_suspend (GSListener *listener)
  {
 -#ifdef WITH_SYSTEMD
-+#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
++#if defined(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,
+@@ -1076,7 +1078,7 @@ _listener_message_path_is_our_session (GSListener  *listener,
          return FALSE;
  }
  
 -#ifdef WITH_SYSTEMD
-+#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
  static gboolean
  query_session_active (GSListener *listener)
  {
-@@ -1212,7 +1216,7 @@ query_lid_closed (GSListener *listener)
+@@ -1212,7 +1214,7 @@ query_lid_closed (GSListener *listener)
  #endif
  #endif
  
@@ -165,78 +195,78 @@ index 044a2bf..164856f 100644
  static gboolean
  properties_changed_match (DBusMessage *message,
                            const char  *property)
-@@ -1307,7 +1311,7 @@ listener_dbus_handle_system_message (DBusConnection *connection,
+@@ -1307,7 +1309,7 @@ listener_dbus_handle_system_message (DBusConnection *connection,
                    dbus_message_get_destination (message));
  #endif
  
 -#ifdef WITH_SYSTEMD
-+#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
  
          if (listener->priv->have_systemd) {
  
-@@ -1880,7 +1884,7 @@ gs_listener_acquire (GSListener *listener,
+@@ -1880,7 +1882,7 @@ gs_listener_acquire (GSListener *listener,
                                              listener_dbus_system_filter_function,
                                              listener,
                                              NULL);
 -#ifdef WITH_SYSTEMD
-+#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
++#if defined(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)
+@@ -1971,7 +1973,7 @@ query_session_id (GSListener *listener)
  
          dbus_error_init (&error);
  
 -#ifdef WITH_SYSTEMD
-+#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
          if (listener->priv->have_systemd) {
                  dbus_uint32_t pid = getpid();
  
-@@ -2022,7 +2026,7 @@ query_session_id (GSListener *listener)
+@@ -2022,7 +2024,7 @@ query_session_id (GSListener *listener)
          return NULL;
  }
  
 -#ifdef WITH_SYSTEMD
-+#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
  static char *
  query_sd_session_id (GSListener *listener)
  {
-@@ -2053,7 +2057,7 @@ init_session_id (GSListener *listener)
+@@ -2053,7 +2055,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)
++#if defined(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)
+@@ -2150,7 +2152,7 @@ gs_listener_init (GSListener *listener)
  {
          listener->priv = GS_LISTENER_GET_PRIVATE (listener);
  
 -#ifdef WITH_SYSTEMD
-+#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
          /* check if logind is running */
          listener->priv->have_systemd = (access("/run/systemd/seats/", F_OK) >= 0);
          listener->priv->delay_fd = -1;
-@@ -2179,7 +2183,7 @@ gs_listener_finalize (GObject *object)
+@@ -2179,7 +2181,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)
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
          g_free (listener->priv->sd_session_id);
  #endif
  
 diff --git a/src/light-locker.c b/src/light-locker.c
-index aefc4c6..51ae519 100644
+index aefc4c6..612e300 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"
++                  "elogind:    %s\n"
                    "UPower:     %s",
                    GTK_MAJOR_VERSION,
  #ifdef WITH_SYSTEMD
@@ -245,9 +275,9 @@ index aefc4c6..51ae519 100644
                    "no",
  #endif
 +#ifdef WITH_ELOGIND
-+                  "yes"
++                  "yes",
 +#else
-+                  "no"
++                  "no",
 +#endif
  #ifdef WITH_UPOWER
                    "yes"
diff --git a/x11-misc/light-locker/light-locker-1.9.0-r1.ebuild b/x11-misc/light-locker/light-locker-1.9.0-r2.ebuild
index 34e6e91e705d..34e6e91e705d 100644
--- a/x11-misc/light-locker/light-locker-1.9.0-r1.ebuild
+++ b/x11-misc/light-locker/light-locker-1.9.0-r2.ebuild
diff --git a/x11-misc/qtfm/Manifest b/x11-misc/qtfm/Manifest
index b8a8b124c07f..91865893a66b 100644
--- a/x11-misc/qtfm/Manifest
+++ b/x11-misc/qtfm/Manifest
@@ -1,7 +1,9 @@
+AUX qtfm-99999-cmake.patch 1480 BLAKE2B 47b7ece97e9d7851d425042b287a0b2f67ac816e1df92eb3f90b830303a672c71707abe7ee855a45630184da2fd1f58cec8a3319b520d7113ae9180646acb8a2 SHA512 c03941d097f70696b113500893abdab87f58de139da13c83a90355b6760908d7e78434190f86d2105d9978f03d7a931a851fbcf25e87b131d1aca5ee508770af
 DIST qtfm-6.1.5.tar.gz 217207 BLAKE2B 3a818458e6f3d1dfe91860681eb77b809a455d16eef7810aa06e73b9600e6d032c178624c1dbde6d609353eb79ad43e65205f3c3ba84f21b854b8ef93b65be72 SHA512 10a0e1fc8f8948b0564a9b78967403c4a10639c10194879b48bbe086110af0d611a310ab185a2351043df879dbba1e7849a03dde54b6554b74004cbcc27f3788
 DIST qtfm-6.1.9.tar.gz 248313 BLAKE2B 4c9970754925de3210cc688f8f9ad8caea753b78e8e8377ee8a0a6dec014ab3c4459f20882b00c6d16c7bc36878cf8f483b38af0e9102d097679b12a6a6e0db9 SHA512 44765e219f4774f30e43027056fde04d23579e8c91b72215432ff4718fc702f85ddb9752b166eef8aa1aa89ab7bcc6a14585fce05f447c264087ee8274d4bfea
 DIST qtfm-6.2.0.tar.gz 411064 BLAKE2B dce16b79753de31c58b36aa51b2f5555a12e19778ce81ca980bb5775f694d5315df97f4ac7b060653748a3ec2bc69b0f88599bca44696ce8b6a8026b30abbf9f SHA512 44bcef3d9e4111388aa93fd8c51d65a5210e969071d79336a4451a78ec7503867d8c667325eeafa5f85ee922dd787746e6ac94e17a61c07914c12364cfa8951d
 EBUILD qtfm-6.1.5.ebuild 974 BLAKE2B 3d7249409b2be57539da80d0f8f704b02421d6899acad39a5d872cd51ea8c8bac02e1798236e365cf42ff8533698d6f505ab07aff0687faaecf3f9871ee45fad SHA512 b89233b56aa90bceab362084d284e224760b3c127ea34388d5e5717fd7cf42a9f1957fffded546fa02a3330801567aeaa39214875065c54528343dfb0f621233
 EBUILD qtfm-6.1.9.ebuild 849 BLAKE2B 046fa2ff66eeaccf6d6196bdd0b18bc63d70b39c69e830b6dab9dd89d220231938f8f96d4c0b8b6bce843b59160f9b5e54c25a2168c721fb760c1a05f3b9daf7 SHA512 e81f70437fbecde940af03f50be928fb231c4bfafec22abf21d27da5b77b1ee2fd764745a147f497074930cbafb530628c7c8eb4bc1b293f0b678f0a3f3f0ce8
-EBUILD qtfm-6.2.0.ebuild 1004 BLAKE2B 70d82537fb67e5891dc8091169332e454b47becb72124f8c948ff8cb0192e979ef1d2f8d2f3ee66877e31683522dc0649b2b0b013dfba33b5e41613ec32e86d8 SHA512 d7a6be3cb9b67cce16734f2a9aa245972f458f6269283356d28c715a44ff3dfa2874e77cf9a4d935048666e1fc3e92d0f9a87290ffc54ad1b2afeed75baf8e79
-MISC metadata.xml 463 BLAKE2B a44c41a05360291bb3be4933267cb36d2135e513aea6f6b2b1f564130f2946dc150f972fc6300db9f50961a0461151e6bdce8269189e71dcecd0e6da827f2de0 SHA512 69e6f714837cbac98d318ac9b0e8f50804d5522f38a52785e2afe90125dbcae9082fc863cbe62f1e3b7ada3b66b41aac4b9471433836de0b7fbd1a1f4117ef78
+EBUILD qtfm-6.2.0.ebuild 1065 BLAKE2B 995db393d18c4b3d4c914da2c0f447e2010ebd988cb7f58f985534c56718375614523ded5e2c892aea02205bf397f8062691689cdde3402f9f3efef66f613416 SHA512 f40f47446a8c16faf7bb67ac56b159e3f7daa747080e87737641d9448ec2b0f302ade8d3318e904a3a36021c6e0cd5deac653b44be5b856784cd09e07c329f1a
+EBUILD qtfm-99999.ebuild 1030 BLAKE2B 34b38de342c95c52f8aec35b9124ce13d06444f4a8a4ca31815e7cd6b931f2a8c301e4411cb5d4a578d171636dc32854f5fc5c3d99cf3db2f6aa0ffa648f41ca SHA512 18826a59a8698f7d07cd40a60fae10c8692301b3dfd993f908e1c8ade01f49f965390d2f87a9f2173aab4f49ec8b7e4a03a08348fe52d25c1b040aee133ba3b5
+MISC metadata.xml 535 BLAKE2B aecaf2f611f0c47f5ec04b5fab8d45d7d0cf4c3b029a4605f2dadcf11237fd3fce56d10e8fab1611e716c70f303ca93deba25c3f884aeb7c798b9e411be7a024 SHA512 28844f26bfd8c62e896340bbe7f8466903eecf97e8eba6f5003c407258692ac76fc2799836c7a27643b1c4f9a5ba7033366414acc8f60b4f72b352e740026a7b
diff --git a/x11-misc/qtfm/files/qtfm-99999-cmake.patch b/x11-misc/qtfm/files/qtfm-99999-cmake.patch
new file mode 100644
index 000000000000..a89d090510df
--- /dev/null
+++ b/x11-misc/qtfm/files/qtfm-99999-cmake.patch
@@ -0,0 +1,47 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -36,7 +36,7 @@
+         add_definitions(-DMAGICK7)
+     endif()
+     find_package(PkgConfig REQUIRED)
+-    pkg_check_modules(MAGICK REQUIRED ImageMagick++)
++    pkg_check_modules(MAGICK REQUIRED Magick++)
+     # ffmpeg
+     if(ENABLE_FFMPEG)
+         pkg_check_modules(AVDEVICE REQUIRED libavdevice)
+@@ -66,7 +66,7 @@
+ find_package(Qt5Concurrent REQUIRED)
+ 
+ # inotify
+-if("${CMAKE_SYSTEM}" NOT MATCHES "Linux")
++if(NOT "${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
+     find_package(PkgConfig REQUIRED)
+     pkg_check_modules(NOTIFY REQUIRED libinotify)
+ endif()
+@@ -123,7 +123,7 @@
+     ${PROJECT_VERSION_MAJOR}
+ )
+ if(ENABLE_MAGICK OR ENABLE_MAGICK7)
+-    target_compile_definitions(QtFM PRIVATE ${MAGICK_CFLAGS_OTHER})
++    target_compile_options(QtFM PRIVATE ${MAGICK_CFLAGS_OTHER})
+     target_link_libraries(QtFM ${MAGICK_LIBRARIES})
+     if(ENABLE_FFMPEG)
+         target_include_directories(QtFM
+@@ -161,7 +161,7 @@
+ if(ENABLE_DBUS)
+     target_link_libraries(QtFM Qt5::DBus QtFMBus)
+ endif()
+-if("${CMAKE_SYSTEM}" NOT MATCHES "Linux")
++if(NOT "${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
+     target_link_libraries(QtFM ${NOTIFY_LIBRARIES})
+ endif()
+ if(APPLE)
+@@ -192,7 +192,7 @@
+ if(ENABLE_DBUS)
+     target_link_libraries(${PROJECT_NAME} Qt5::DBus)
+ endif()
+-if("${CMAKE_SYSTEM}" NOT MATCHES "Linux")
++if(NOT "${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
+     target_link_libraries(${PROJECT_NAME} ${NOTIFY_LIBRARIES})
+ endif()
+ if(APPLE)
diff --git a/x11-misc/qtfm/metadata.xml b/x11-misc/qtfm/metadata.xml
index 9c25f5fe1917..004b55d08e68 100644
--- a/x11-misc/qtfm/metadata.xml
+++ b/x11-misc/qtfm/metadata.xml
@@ -10,6 +10,7 @@
 	<name>Gentoo Desktop Miscellaneous Project</name>
 </maintainer>
 <use>
+<flag name='dbus'>Install the qtfm-tray removable device manager</flag>
 <flag name='shared'>Install the libQtFM shared library and headers</flag>
 </use>
 </pkgmetadata>
diff --git a/x11-misc/qtfm/qtfm-6.2.0.ebuild b/x11-misc/qtfm/qtfm-6.2.0.ebuild
index 866fd51c7eca..e330a1bea393 100644
--- a/x11-misc/qtfm/qtfm-6.2.0.ebuild
+++ b/x11-misc/qtfm/qtfm-6.2.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit multilib xdg-utils qmake-utils
+inherit xdg-utils qmake-utils
 
 DESCRIPTION="A small, lightweight file manager for desktops based on pure Qt"
 HOMEPAGE="https://qtfm.eu/"
@@ -11,16 +11,16 @@ SRC_URI="https://github.com/rodlie/qtfm/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="shared"
+IUSE="+dbus shared"
 
 RDEPEND="
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtwidgets:5
 	sys-apps/file
+	dbus? ( dev-qt/qtdbus:5 )
 "
 DEPEND="
 	${RDEPEND}
@@ -30,6 +30,7 @@ DEPEND="
 
 src_configure() {
 	eqmake5 \
+		$(usex dbus '' 'CONFIG+=no_dbus CONFIG+=no_tray') \
 		$(usex shared 'CONFIG+=sharedlib' '') \
 		$(usex shared 'CONFIG+=with_includes' '') \
 		LIBDIR="/usr/$(get_libdir)" \
diff --git a/x11-misc/qtfm/qtfm-99999.ebuild b/x11-misc/qtfm/qtfm-99999.ebuild
new file mode 100644
index 000000000000..012984f236ab
--- /dev/null
+++ b/x11-misc/qtfm/qtfm-99999.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit git-r3 xdg-utils cmake-utils
+
+DESCRIPTION="A small, lightweight file manager for desktops based on pure Qt"
+HOMEPAGE="https://qtfm.eu/"
+EGIT_REPO_URI="https://github.com/rodlie/qtfm/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS=""
+IUSE="+dbus ffmpeg imagemagick"
+
+RDEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	sys-apps/file
+	dbus? ( dev-qt/qtdbus:5 )
+	ffmpeg? ( virtual/ffmpeg )
+	imagemagick? ( >=media-gfx/imagemagick-7:= )
+"
+DEPEND="
+	${RDEPEND}
+	app-arch/unzip
+	dev-qt/linguist-tools:5
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-99999-cmake.patch
+)
+
+src_configure() {
+	mycmakeargs=(
+		-DENABLE_DBUS="$(usex dbus)"
+		-DENABLE_FFMPEG="$(usex ffmpeg)"
+		-DENABLE_MAGICK7="$(usex imagemagick)"
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/x11-misc/util-macros/Manifest b/x11-misc/util-macros/Manifest
index 3be1053629c8..f9548392fcf6 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 705 BLAKE2B 6e868deab5192160a281099d15718c9c436dec8c52142af96e0279678fe68f31bde3d88108ef8780c9d99c43c43e34e6d8fef9bce188b38c1fea0c770bcdab7b SHA512 011687842894d5392c259137624a492ad262bb1362d475888ee2b6f597e776122ba50907d59134e4d058fc3b1d3ae5f15fa4a2551f5700a44b91e9091fb3819e
+EBUILD util-macros-1.19.2-r1.ebuild 717 BLAKE2B d833a239ec516771db4094f2686af764cd51f007598edaee0e8aa167ea366468cfc60b7f01077abed7b80f7cfacc97bd9d529a4adc3eac207e34a210f01abef6 SHA512 e0caa3fe5cc62e060798d14e429815333ee6b885833718114f1b0b48c1dce0b570ed812a31a402572205ee270e6f79ac3c68622e038069c2ee9cfa758b36182f
 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 18a2a719c4ef..30b7160e06ab 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="mirror://xorg/util/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~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 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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/xdotool/Manifest b/x11-misc/xdotool/Manifest
index 604ad3938254..dd33925a83e0 100644
--- a/x11-misc/xdotool/Manifest
+++ b/x11-misc/xdotool/Manifest
@@ -1,5 +1,5 @@
 DIST xdotool-3.20150503.1.tar.gz 102125 BLAKE2B 3b34b69ab7843d49a5cc76129dca96664b8e548abd01acda03399d06b1a146169c78dff302932000fe72c578be60bc774e3e503980b408cab4bf17d71630151c SHA512 d8eb411490d2f4936d63cd459e3319f76faf6dd415a3c2c68446b5a98d24290794dbffd22fbccfef5acc7d8aec6ce92b2135ecb3e1178607fc7d5b1e1767ede1
 DIST xdotool-3.20160805.1.tar.gz 105388 BLAKE2B b836bd9c408bc4f7de562a1dd1fe18142155dc486b01912462b6d1cebc5f3f4094a407556c9f50cafb4ca3a17149e6f69303706730aabdaf94abc6d4b817d351 SHA512 e27b1029ee954ea17643ed489a00a1856e5687b03772c0f10a8e50cde3c3c957b57a3ba9890005474a744a228ef4827a83770d6890479c37a1f98f4fd7b1ff6c
 EBUILD xdotool-3.20150503.1-r1.ebuild 1296 BLAKE2B 2254e8e361b00d268b515fc5c9bb0b964cf800109d9b642d7fa892f37f18e4cde8cc962757a2fb5032240c7b18ea4f6281891b08e22064cb38ea5f684adf7cb9 SHA512 b6adda51b715bb0a1171b9c1ba515c03a960e2cd46522625c4d701b318e35efbcad9927e0a9aa0653e51635b4f41d84bfc4f7e3f0f6fafc0d25d37e3e65cc0ed
-EBUILD xdotool-3.20160805.1.ebuild 1351 BLAKE2B 00fd7f6f259827339c43949557726bf7bc4acdd4171201d0f64f4e22a2d3fd6ec033d20c8ae48af37c6e05cdd34b005eafcc7ada5268a45eef14d316261ba4f0 SHA512 d27b83b5a93be4f1952c75927de0775304bf474b2e491eff781339b000297c7f01f345353849336f03405df3a173916b59becdc63927995ff734b24a9da9582f
+EBUILD xdotool-3.20160805.1.ebuild 1350 BLAKE2B 40f5a3d18293cfd1aef97b74b1916494b380065f910126b8f71849734bc0fcd33d638fff988e827269c00de4ac37dcc5a7bb28d71ecc18f9afe9f97a86ff5d83 SHA512 1c26297aabcc3e86b1392756da3fbef93132030bad486d907f73458574941479975fe4b88f9a6ee9b673192b765973c2699a2b130eaadf860f347fce0beb60d3
 MISC metadata.xml 583 BLAKE2B 72181c8dfd9d575229c2e86ad0041311325f9103715be568d45915c3a69bc44ef30919146fcae3f74ea2dbf844cd62d94dc7fe5e0ef1969b84a764b4ccd30cc1 SHA512 7c09064d2334d1f6b4d488bd9aaf091e0b27a7e674f151c62bea6e988d58c71996cf20f5d63587e14903a80b5f93e77305d493b94fe03a68ab24fbf1a438df76
diff --git a/x11-misc/xdotool/xdotool-3.20160805.1.ebuild b/x11-misc/xdotool/xdotool-3.20160805.1.ebuild
index 8dc6d7406c21..fcd7fd283af2 100644
--- a/x11-misc/xdotool/xdotool-3.20160805.1.ebuild
+++ b/x11-misc/xdotool/xdotool-3.20160805.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jordansissel/xdotool/releases/download/v${PV}/${P}.t
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/x11-misc/xfe/Manifest b/x11-misc/xfe/Manifest
index 9dc883022622..4d63bcd2c16e 100644
--- a/x11-misc/xfe/Manifest
+++ b/x11-misc/xfe/Manifest
@@ -1,8 +1,8 @@
 AUX xfe-1.42-use_pkgconfig_for_freetype_and_xft.patch 1733 BLAKE2B 7f0425ff2e5725197a5daef832d3d802daadd8fce4453447d5c6200e2334e0077d324c7e59952be540d1ba442ccea376c3c6959473cb8a0139c7e87c727b86a1 SHA512 e10baef321890342a949ed0cd4ec24bb6794f8b2ade2cb135a85491fe23287fe395da4056d36f4c7ff70218dfafd4db74e6c0bae457568e05f3095608b3ccc2a
 DIST xfe-1.42.tar.gz 2727833 BLAKE2B fbca14c77b04cb367173907dd4ae9c210cd88768276e5b7391338b29dc988288f866419f57d1189db6235941e4e2f91608835351000a42d46ed3e7c4c236c69f SHA512 858dd761e45ff09d32d2a230304be0817eab4b6a772376b08d778bb8e1eef681228e5d88e53c441f9b8722d8b7eeae96980e30f8c5e8bb603d4d9a3b3d267351
 DIST xfe-1.43.1.tar.gz 2776237 BLAKE2B fc82e2ea21643ecc3875512538af24daddb0db0e8829ce23c7589dc90d68e896282f70d771dcf885ea746acfa88adbb7abe6a0c354e74afa5f722dcfacf77350 SHA512 3c697ff5d0246c8bab86c9824dd4a3475ed3775d2933c63eb8e78f02b4455edb4ca98f86123eac77f611eee6ad660bf0a909c4c2791af19506a4f1744395008e
-DIST xfe-1.43.tar.gz 2775098 BLAKE2B 41a9d36da0bd2c58de8c928daf5714c90cd24952934ba22550651a7e6829b4f3386fd7ef89c93907eb2b28f2c7086ced1c8b5282b00beaa3ad79c9443f12e5b2 SHA512 e1b8e2d1509de913ceb76d05c7480842ae7c5389df2f02d39c1f80bd7387ce6ff77e82a95f0f1853a976e27ceb5380024337e261621ea3233996d2dec48f82a3
+DIST xfe-1.43.2.tar.gz 2834576 BLAKE2B 5ac7ebf229febb75a99e4829a38a3675d6674ec6eced13dc5be70d2b68ce88f6394621dffec2d8359e72da7eace582883b72491e90597ab4a8925685cb577fcb SHA512 ad7b450d0828747f801219c23824b0751fc2a7f0eea791369c4adb3090ffe1279056fa8804ef97b25a2f810e00d37357efc962dc9d4087c3d7cc5f8ffb37d51d
 EBUILD xfe-1.42.ebuild 1602 BLAKE2B 9b2e59f05bf959868b6be3fbc4d819095b153baf87a9bc57fac2bedf2c80ebafe5704f815bdc4a692ad941f96ba67070be42b28c80438814527a8d896f2a21df SHA512 a87c6c76316e9e7f49799b29bb1562c2fc7dafb6688d5e87dbee28de19af542fae385e80eaed4b9d16d842eab93ff797c76a5dc7e5f717603bfa58352416441c
 EBUILD xfe-1.43.1.ebuild 1484 BLAKE2B 0a672eb1a69c898ecb3db3f7acbc75d8e320fa12190e8a90eeada387c93d3cce49f237ec21c2dff88bb81f42252f50be639de1e8f3e9b88907a118d40437280e SHA512 65101a757dd262226f697f3c0943ff23fbf0e7893682c8654e04ab9aa0c468410cb2fc4d929a160225851f8ddc69bcde1eeca8edbd750e6d16205830eb511fcc
-EBUILD xfe-1.43.ebuild 1379 BLAKE2B cc7625f7fd20519107d080ea9b14c7ec29151d233c1a391a1866d6a1aaf484b59a97b3dbb455d0717031dfa0a7365adf506ada625ea9d7690ea6de609c2596cf SHA512 39721bbce302592b417d35efd969398e1d4120d950cb95d6a3ab67209cd377cbae4517b585d376c31bedfd969b7b37430b7d3c726423cd66728584460d92157b
+EBUILD xfe-1.43.2.ebuild 1481 BLAKE2B e6702a7bd7ba18e78778011fe59640b62be2cb6b52a4e58eaac01a798de6c9f2bcab0c048040ed03a51da01f4224bb7786a3f151c9a4c5591ab32200cca77ce4 SHA512 dfb9097ca3558c9324ac857080ac5bebdbe9ef04c17fd406f9a802c72d33b91bc4f375750b8cb4956a52a79b9906cd20c1ea8877853eb79eabbea5346b9762dd
 MISC metadata.xml 349 BLAKE2B 1f855ee2a581396591ea01b3b1d00fe0dba88e564d38186f738d797eb50554593c2d2bf396f8a616329855ebe829b1da5461705965e252b2994545353e26f475 SHA512 08958aec505d6e35611988ed33f184112fecea69197b2f2e5d784d2db216a0b643d27c6ac24ca265fd89d612b67586925d6b768bdf86aa0060919c96ecda48cb
diff --git a/x11-misc/xfe/xfe-1.43.ebuild b/x11-misc/xfe/xfe-1.43.2.ebuild
index 46f9ac9b1d80..57333f1ae0f0 100644
--- a/x11-misc/xfe/xfe-1.43.ebuild
+++ b/x11-misc/xfe/xfe-1.43.2.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
+EAPI=7
 PLOCALES="
 	bs ca cs da de el es_AR es_CO es fr hu it ja nl no pl pt_BR pt_PT ru sv tr
 	zh_CN zh_TW
 "
-inherit l10n
+inherit l10n xdg-utils
 
 DESCRIPTION="MS-Explorer-like minimalist file manager for X"
 HOMEPAGE="http://roland65.free.fr/xfe"
@@ -66,3 +65,11 @@ src_configure() {
 		$(use_enable startup-notification sn) \
 		--enable-minimalflags
 }
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/x11-misc/xiccd/Manifest b/x11-misc/xiccd/Manifest
index ffcbc58f7d51..c3c5f1e5bd15 100644
--- a/x11-misc/xiccd/Manifest
+++ b/x11-misc/xiccd/Manifest
@@ -1,3 +1,5 @@
 DIST xiccd-0.2.4.tar.gz 30981 BLAKE2B 079b743f88308b3fff5826bccef125c90636182cf1e6311166e91a337b24be824ac564696f1c65d112fccf737bfbff968ce3d96a2a31ba29cca1069377e16695 SHA512 40101467a38e9369b171b44d5d7fd4b07968dfcd74ace89e15f3dfad32131a3dc3b26249af2340e408908bd3df766785b46e885a3b68ff26b24ed2627a40cd2c
+DIST xiccd-0.3.0.tar.gz 31676 BLAKE2B a6ef614a5f34827011196474fdf73c0cebfdd6af25f0ee8925edadf4e3338dbb17a43c2da3cb1fee3531f4bbb3cbd760fe350e3860451e7188452cdfd595674e SHA512 d507d91ba1a6d702c0ca63d1583e0ba330210e8c143ec72b866fd042ed9b8987820fb793fa8100077d59f4c01bc068eff68b8377ed4156956ad44c07f448a45f
 EBUILD xiccd-0.2.4.ebuild 506 BLAKE2B db85d071ff8660d93c41c25c3c0fe250c971a172c0704a076310bf309f0694a70a250ebca714c0767fb2b0703e860a275d812631b2a99efd878c3602bc4d2bb1 SHA512 776fc5065dc15bb18fa735aec32d30bdff4c1d1c6f78ffea2774076fc05ada353ea5c9ef7db912f45f3ed7a9cb050c6b3405e23da0b5c3b41f3b66832841c6ec
+EBUILD xiccd-0.3.0.ebuild 503 BLAKE2B a066dd0112e9d6affabcd8d57913115adc1bec2dea1246673b046427e8e126e4e1889f33cd38153cd9e894ca0be35b0620efb61fecb63485a7db4b93071f21ad SHA512 58129d49c22a3f9f92974e38a67f31bb77457471c1112e416cfe3492c5a602fc4bc3869f76fece4f9149286f8675a54260aa49eafb624245f321340e0b177990
 MISC metadata.xml 764 BLAKE2B 386c639b7452560295dc0b25e0dfafe126c868d4749711125faf5aa57c027d45ac69ce658d09f775504eea2a8ee9d1ef89cb821ccf695d17506fe14639d847f8 SHA512 91b048281b6c4ca83e6ba61e870e5f04b90bae2668727edf18946c1ee703284b48a4caf4a1f259c80106fcdcaba91c10048c9f4569a2a5b45110a8acd2e1b2db
diff --git a/x11-misc/xiccd/xiccd-0.3.0.ebuild b/x11-misc/xiccd/xiccd-0.3.0.ebuild
new file mode 100644
index 000000000000..2a0748e9c409
--- /dev/null
+++ b/x11-misc/xiccd/xiccd-0.3.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="A desktop environment-independent bridge between colord and X"
+HOMEPAGE="https://github.com/agalakhov/xiccd"
+SRC_URI="https://github.com/agalakhov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-libs/glib:2
+	x11-apps/xrandr
+	x11-misc/colord"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/x11-misc/xwallpaper/Manifest b/x11-misc/xwallpaper/Manifest
index 24c2ec2432bd..09aa2fb482b0 100644
--- a/x11-misc/xwallpaper/Manifest
+++ b/x11-misc/xwallpaper/Manifest
@@ -1,8 +1,6 @@
-DIST xwallpaper-0.3.0.tar.gz 104300 BLAKE2B 23ec3b4ccbaf910c9ba4afbd1d9237223654a85c90b0a147141b017a9b3917316f745e1dd70a89e385110d380d5bbba8ee7c2d1ed4188d87a98ba0e94c5a7b6c SHA512 c73583fdbd573329951178d7db36fb1ae18a4294207de85dfb93e367be0ed103e8de7e2dd8ec61a0a23541457c930e8b0e5eb12dd5024808de3e02ddefb6b4a3
-DIST xwallpaper-0.4.1.tar.gz 106110 BLAKE2B 13d40274910b5a82271207292ef7b5d5aeb21fe015c0f3a9780d164d805b9f212a017b4aea8cc8c92ad3a9392eb01c3ea5cddf66888ac4ec146d12109675bdd8 SHA512 febfca202d3356c5a2f584921eace61a6f16e19bf0b0812604bccb441b11a0748c997d0818fb8d9f6a37f502a0a38f13b78f7f61c2de2768a85807a8725c070c
 DIST xwallpaper-0.5.0.tar.xz 81000 BLAKE2B bb30871d24538b3fb04e1158df75bc82701ed184d3b8f60179990f60d91e03eb974ab3c72446c8f0bacbf3aa27d0cbe4446cf38e34d484a46dcaa66fcfe9682c SHA512 92cf424fb90dbdbe8e47ea7cc3650200da9f480afaef605e2ddbd7a828361f61754c2ed93c9be099c340f80eb60f8c1aa2f44004512cbe846401cb8ef73403a2
-EBUILD xwallpaper-0.3.0.ebuild 984 BLAKE2B 57285f28d6321e391eb65d1263dc41e65d6a393451aa25ae1601b7ae0ac89d56e3c756e5967eee7ade1b1cc1e7b219b9b99046a6a2e544663ca65bd3d9c475aa SHA512 64b915f529ce987bceac1d59b86dbfec49dd4b7e67725beb7b11c5607de5213ea6743af0d1f24225a35405557eb0e808b3c2f07ea188a6a7508a073a63490299
-EBUILD xwallpaper-0.4.1.ebuild 1005 BLAKE2B e053f2c80c6f2c7cc798d50fcf6bba88bba1010eea6ec835d68ae755d606b94478c2d3e64a92e17255acb1b2b65aa0c1423724e17f78c4f3c706ca001f8c95e9 SHA512 3bf25c83d68210492483489e315c6d05c3197bc7dad49c3b76172516b5adb14b8037f370cecdcbd4d79b08fae53470a3918dc47532660b48fc29453363287b06
-EBUILD xwallpaper-0.5.0.ebuild 1007 BLAKE2B c05b3bc12edd182d58435d736fec6c0e124823e28497be48e66e1ad5cb43b407c7caea5ea2c8a97bf4780e5f070360340c2196c4c9f38347fb857d6d2996894d SHA512 70645eb1d04c6393032394cb983c7b5f255cc93b5308e4a23cb890fd6429a79642827720836c5fb9575a7ca4399b657732eff1047c80c54e15e3fcdb5e479e67
-EBUILD xwallpaper-9999.ebuild 1007 BLAKE2B c05b3bc12edd182d58435d736fec6c0e124823e28497be48e66e1ad5cb43b407c7caea5ea2c8a97bf4780e5f070360340c2196c4c9f38347fb857d6d2996894d SHA512 70645eb1d04c6393032394cb983c7b5f255cc93b5308e4a23cb890fd6429a79642827720836c5fb9575a7ca4399b657732eff1047c80c54e15e3fcdb5e479e67
+DIST xwallpaper-0.6.0.tar.xz 82100 BLAKE2B afb8760c6725904f574040652683e028a107bf269428b7986b4571e6ae61575a4b80fefff9f1dce64c95ebbdc03a206146dc4a8bad2032aa44ad0f2ff9b0a01b SHA512 18cd4997d8a0de49e4f663ffe9028516fd9703c0da61426ee9b98f1c15c4770275dd1712b17385be7ccc7bc984f02c9692e41b9d55b1ab803ead3de08fe304bf
+EBUILD xwallpaper-0.5.0.ebuild 1005 BLAKE2B 346e16f3017d2b140929cee2d7f6da504115d38e5015abe10eec01fcf4f8a7517510f9cf8c73b189e647fd9698569cbe7889a4013f00615cff9529791c36dea4 SHA512 01ec7d939398b039cd08a287c9e2f0f0b5ff35a3c73dd413977a6d99fb74ead5a4774f439e85eedd6710874547c32081a26f4c427014836f89c310cd085e8d20
+EBUILD xwallpaper-0.6.0.ebuild 1007 BLAKE2B dfdbeee6c49ef759b223c62b70dcf3192243e872771f5d1744058a4384e436216429860d083327b6a5056dae3c5b0b057ad3c82ac3c6d4fa52adad2bd77d80e7 SHA512 f51fd88c19c73bf278abfb6f437159285ca793f7cd024dbd837f5d044dc7c62b8feb67c19ff43713e9fbd7f893e91a17d71b300e3f52f03ca736532b17224c78
+EBUILD xwallpaper-9999.ebuild 1007 BLAKE2B dfdbeee6c49ef759b223c62b70dcf3192243e872771f5d1744058a4384e436216429860d083327b6a5056dae3c5b0b057ad3c82ac3c6d4fa52adad2bd77d80e7 SHA512 f51fd88c19c73bf278abfb6f437159285ca793f7cd024dbd837f5d044dc7c62b8feb67c19ff43713e9fbd7f893e91a17d71b300e3f52f03ca736532b17224c78
 MISC metadata.xml 804 BLAKE2B db3ea33826679dd19ae2631256fb9570b190fed70efd5084059cd7b23d620f632e654658062ddb1d92ec1ac31a67285c2610282e2c5d0af0806e4c1b554dada2 SHA512 ecd6a763905744ab6a8aae1772027401810e0d18e806147a0bec305722a2a4dae39cc9fa5e400db6933b636ec9787b80fd0f1b0e2c0eaa4f5c87d2e3f4cb4991
diff --git a/x11-misc/xwallpaper/xwallpaper-0.3.0.ebuild b/x11-misc/xwallpaper/xwallpaper-0.3.0.ebuild
deleted file mode 100644
index 914adac64a90..000000000000
--- a/x11-misc/xwallpaper/xwallpaper-0.3.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="ISC"
-SLOT="0"
-IUSE="jpeg png seccomp xpm"
-
-DEPEND="
-	x11-libs/pixman
-	x11-libs/xcb-util
-	x11-libs/xcb-util-image
-	jpeg? ( virtual/jpeg:0= )
-	png? ( media-libs/libpng:0= )
-	seccomp? ( >=sys-libs/libseccomp-2.3.1:0= )
-	xpm? ( x11-libs/libXpm )"
-
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-src_configure() {
-	local myconf=(
-		$(use_with jpeg)
-		$(use_with png)
-		$(use_with seccomp)
-		$(use_with xpm)
-		--with-randr
-		--with-zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
-	)
-	econf "${myconf[@]}"
-}
diff --git a/x11-misc/xwallpaper/xwallpaper-0.5.0.ebuild b/x11-misc/xwallpaper/xwallpaper-0.5.0.ebuild
index bcf9073e961d..2c976e02c0ca 100644
--- a/x11-misc/xwallpaper/xwallpaper-0.5.0.ebuild
+++ b/x11-misc/xwallpaper/xwallpaper-0.5.0.ebuild
@@ -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 x86"
 fi
 
 LICENSE="ISC"
diff --git a/x11-misc/xwallpaper/xwallpaper-0.4.1.ebuild b/x11-misc/xwallpaper/xwallpaper-0.6.0.ebuild
index f6075177a910..1424bee1d7b7 100644
--- a/x11-misc/xwallpaper/xwallpaper-0.4.1.ebuild
+++ b/x11-misc/xwallpaper/xwallpaper-0.6.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
@@ -12,8 +12,8 @@ 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.gz"
-	KEYWORDS="amd64 x86"
+	SRC_URI="https://github.com/stoeckmann/${PN}/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="ISC"
diff --git a/x11-misc/xwallpaper/xwallpaper-9999.ebuild b/x11-misc/xwallpaper/xwallpaper-9999.ebuild
index bcf9073e961d..1424bee1d7b7 100644
--- a/x11-misc/xwallpaper/xwallpaper-9999.ebuild
+++ b/x11-misc/xwallpaper/xwallpaper-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
author	V3n3RiX <venerix@redcorelinux.org>	2019-06-16 21:23:20 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-06-16 21:23:20 +0100
commit	fab849d1daed0ba7f2ac497d07985c3dbb692543 (patch)
tree	10baa743a5340b42ad538dd19d48669ccac209b1 /x11-misc
parent	73c318acdaf6f8309d68bd266051e6dd1f1bd787 (diff)