gentoo resync : 18.12.2020

32 files changed, 575 insertions, 46 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 6791c7e24014..b86625b89146 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/cbatticon/Manifest b/x11-misc/cbatticon/Manifest
index dde36e73a498..eeb0d4104161 100644
--- a/x11-misc/cbatticon/Manifest
+++ b/x11-misc/cbatticon/Manifest
@@ -1,5 +1,5 @@
 DIST cbatticon-1.6.10.tar.gz 32402 BLAKE2B 91ba6eb581b4cd0b31ae5a49b12970fc7d02d1ba790bffc80886c05ad2b0573ee1aca479d90591498dd6d816bb7e24bee6918e5a8fa8823cf376a3a3da598993 SHA512 cf499eb7ac1d775918a7af01700a9e8eeefd9e31a44fd63c9f38bff83945cea9fb21dde960052768f8d0a0c004caeea115f2d80cb3838789859d43e432eae055
 DIST cbatticon-1.6.5.tar.gz 27951 BLAKE2B 41d43bd7bfd5741e37365bed1541c88e255998a4ba69143f80a9c59ac4f51c280b7d07f3f9aba95063a8c3779c9637f7b4e27b771fade0e6092215b529813bd7 SHA512 5e1648cf3b31fe42aefd0a5e79c4e5dc22c3ce4b6f594f0933229494ca6f2e28e44a7e078ef839de1df0b8c1ba494fce8a58866ad70d056799320f4dea32713b
-EBUILD cbatticon-1.6.10.ebuild 878 BLAKE2B 9b945387edf685253a18343e0b3f24ea97951142ba100e1f001493a5a8c76025c96ec91e70b92203655c31593c60e22035c36fa97a81f8ff15a162e4d3319506 SHA512 7ecf438312aede920da7dccb57ef6daecf0349e1b37c8582890940d95e2bbc584ce8ce7533ced3dd180975e317ff1e4fe6ad7b817eb32365e4a8a4e51a46752e
+EBUILD cbatticon-1.6.10.ebuild 877 BLAKE2B bdd4ede897dde39c98210a79040e7a74dc4f5536e47a906d5dd00409d764c936ee93715438bc7a76b18dd41b0d0eaa8ae177c92046a055de7c7882d17099f3f1 SHA512 ff70f2c925cf4115f591e27cdbfe776ec4bd797579f909b67e76c883c38196e2bd17a78acab251fd460f8d9db818273b99188a579db1ff28370451cd45025e0c
 EBUILD cbatticon-1.6.5.ebuild 861 BLAKE2B 2aa73a0b824ce558392943ec003d97f4cf15e736676a890f9f6fc474321410c11849cb306deec6c585c6174421f1a6f797f97fe4c5a34804941bb189a57aead7 SHA512 cbc37a6d09c1a8be7b0f9436a5d97d210b884d8e439570650339a60bd2a5ba2e9dc903c730979e4f7bb4166906a540209d5586d7610e47cce61ed94426438225
 MISC metadata.xml 324 BLAKE2B ee4a0b4dfc25fe37375a21699d236f5a72bc07b5bb6c4dd8990866a5ea3a271aaa19aa5f778ebcfe9f52eb9e7269d1c65267254f9faabcf84d413cb9e0638f22 SHA512 34dfc3da47adc4cdbaa8ffe5dac31f91664a37266599495ec64a819f8afb634373b03bc6a44687dddad86f8b12758a0338679bf290df8a686c6cdc252c21cf8d
diff --git a/x11-misc/cbatticon/cbatticon-1.6.10.ebuild b/x11-misc/cbatticon/cbatticon-1.6.10.ebuild
index 98aa41f159d1..e8b92011dab8 100644
--- a/x11-misc/cbatticon/cbatticon-1.6.10.ebuild
+++ b/x11-misc/cbatticon/cbatticon-1.6.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/valr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="libnotify"
 
 RDEPEND="
diff --git a/x11-misc/hsetroot/Manifest b/x11-misc/hsetroot/Manifest
index 4d83bec7e87b..ddc9a91579d9 100644
--- a/x11-misc/hsetroot/Manifest
+++ b/x11-misc/hsetroot/Manifest
@@ -3,5 +3,5 @@ AUX hsetroot-1.0.5-XOpenDisplay.patch 346 BLAKE2B 975ebe306ce78411912d676b8334b3
 DIST hsetroot-1.0.2.tar.gz 125535 BLAKE2B 351c022e11e3d82118db451eb6d64ff765018a09fe1ac9cc3b437f7a351d575fca66619fde9671d297b346af7c7f265442d18115388d984554bf1f9af9fbe82d SHA512 51788a6b579b82368ef5e11255ff56e2db978a02f7ad752ba64ec33c56ae5f27c1f0ef3452725d1c7bdb9d97b8a3a5b64422031c9c75a7279c407b8772d5edc3
 DIST hsetroot-1.0.5.tar.gz 12878 BLAKE2B 54e80f00d140a83a950d98663db6555a00ac770bd85826b17d8293e3af27cba2a45c2da5e4c185ca90c6adc35bbf2ccdaa3722d015b31654d5e35f4e65a61366 SHA512 b43f7cd75886e72cb6134446d383d7d9a684c818f2d8a0f829670c8dfca5eaaa1eb6c25f30dda41f3483609b25e8a44a3a3cb3a969bba7f77a9b9df712fa2167
 EBUILD hsetroot-1.0.2.ebuild 741 BLAKE2B ef440b29711e148c34e1f067d7269005afd3ab326c470c9f181d06719c699092219c93737e0f13b2dad111544169f3b6bf280a81b0fb2ba925f934a54d62ea84 SHA512 d46a6a728b029768ff522fbc39067c8f267bd5f27228ef944c82aca9102c5901c56390d2554b709b21e3a007d7ab5f5eb25e860209abd84159e91eaa307acd47
-EBUILD hsetroot-1.0.5.ebuild 1104 BLAKE2B 4021e14ee5845fc57ad4836410f9fe512491e06fe276a30ceaca88768a89c63a50e40b9f4bf1fd3292a370447c39bc2a48c607f0851d7e40ff2c26453e8d393a SHA512 f62b16509e03bfbc4779dcb1ba8dbe485deb38390beefa6a2c9f169949751373f283a415b2090a44608a41a64d6e25d1e59860ccac54b5b572286d2f0f2b9365
+EBUILD hsetroot-1.0.5.ebuild 1103 BLAKE2B 4cfabda38cb594baa6d5482bc3f093a63652c9aed6021c2e15860369a6d7c87e796239012815e7d933e422ccd6e2a72cdaed07cb54440307fbbfd731abc72db9 SHA512 0c2ce2f371d7d14394452f28a705f21552c9201ecebf55c7b529c1607dd2fe688d1b5088862f6ee2a3e065e867dea905cdc949ca8e719f5236d81ec65f72fe87
 MISC metadata.xml 1162 BLAKE2B 2a21b9cf3ba91825ce65b577154d19ad0275219373e4d4a9560ab3651a4509ccb1f21ccd1d32abd5e2799a60b0aef21fcc7b27f49b79995d5cf15a4ea90966b4 SHA512 66a8c4cc58859f3a7fca586428330b045056c7557be0186f18f2492ef5b5cedf854e1810622505a3902e6c9bb5e13318d219924e13af9cb2513eb9b52eb3d6a9
diff --git a/x11-misc/hsetroot/hsetroot-1.0.5.ebuild b/x11-misc/hsetroot/hsetroot-1.0.5.ebuild
index 515cd6e49130..0596a0349b4e 100644
--- a/x11-misc/hsetroot/hsetroot-1.0.5.ebuild
+++ b/x11-misc/hsetroot/hsetroot-1.0.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/himdel/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 RDEPEND=">=media-libs/imlib2-1.0.6.2003[X]
 	x11-libs/libX11
diff --git a/x11-misc/i3status/Manifest b/x11-misc/i3status/Manifest
index bfb9ddddec5a..9e6a5ca5dd1f 100644
--- a/x11-misc/i3status/Manifest
+++ b/x11-misc/i3status/Manifest
@@ -1,3 +1,11 @@
+AUX 0001-Extend-battery-handling-on-OpenBSD-351.patch 3319 BLAKE2B 3043b557d6951d74c92bab9f0a7cd92a891bdb79f0d19d2e41fbdaa51e6eeb974cf332ee95a5fb45c018efbbfd21d94ebeb8487e94edb18c2c53d7b798cb6889 SHA512 0dffb7d01def05f5088208b0d5223816ff86a3e6a906ab3222b18aa4a619c73d69552567716761ade292c98f8bcf072c703c7260cf6852a05c57880b57abe654
+AUX 0002-Fix-headers-meant-for-OpenBSD-but-snuck-in-for-FreeB.patch 832 BLAKE2B 07a4cc347b3e4f0e0fa4be059078c76d7638692e3450fe1569c8d5ac76effbf99700926063fc5786907e5a9e40e9253e853f2bd9bedd1ca58aa751e05befec7b SHA512 269c5bcec10f97f8480a33c5daa5f5e07afeab8283a7cb710ff841de0ce9db98097dd5c4b0b61c2bd703708ee41cc1734220bd8adb5fa2a4b1e4dd4063709a0f
+AUX 0003-conditionally-compile-pulse.c-only-when-using-pulsea.patch 1321 BLAKE2B 973221caa851de52afc2ebaa51ea58245ccf4c27b4fc674ffd1ac75913dc2657bfa72a88a2732a521771614058d11ee38867ae756974fdbb64b7485bc02678cc SHA512 f125377bd30dbd90fa489683f5cba963423f8f3e6a88db8f2a68b82c4d59edf0eb4d2b9604f5de46012cd503291bf14e22274d7cd524eb270b15adf9e269c6d5
+AUX 0004-battery-include-sys-sysctl.h-on-OpenBSD.patch 698 BLAKE2B 3fb43ae91f5d8819fc11d330a1e1434a69c5859d44c3d5712d3b7194605739758a05bb0e664648fa39f491d3a369ce3fa995ea9e042b39044b5b58213751023d SHA512 2bb49d2053bf5fe6901502b701f8ff047cf14b79bd632bafd19c48b27099d98825fd9457838e48c7fd82c33e45e36c88d9fbed3e8dac4546d855f8e7a73bd260
+AUX 0005-configure-disable-pulse-on-OpenBSD-and-DragonFlyBSD.patch 1463 BLAKE2B 552f3956d673b841b99a7ffa030d4c6aeb55c46f54b6933787834ce3b9664542eb475505150c807f1c616dd3fbaff523fa43230ed8fdbcd9273aaf1b26e79d98 SHA512 9d59317b178147e84515b5a5008276db5c693f98aa43b84d0abf1ff6c0a08efa576efea072bc99119e71a622e20a4bb64583bc923a225cf8a84928afc734d28a
+AUX 0006-On-NetBSD-include-sys-socket.h-for-AF_INET-6.patch 636 BLAKE2B 0aa1c55badb28a220e949a96227f0ab43e1508754187040853141e90fb2d946af5a74e586f993dd57305babb01cd1a9e474c860242bd61d78816e2ed952fdf40 SHA512 8c3a220c95fa4ef2d270e70fc922933d3ab0b8cf16f49746bb784b43033424f94937ebeea5c4162d52db1e990f3c2662ce23477ffb64597a31a17a13fc368019
+AUX 0007-make-pulseaudio-an-optional-dependency-follow-best-p.patch 3810 BLAKE2B b6e08d130fd4ba4ecd3c851edb01acfbf976f8a8134a5116115330b6ead2ae04c53fafba82ce2b006203221737a494276f82dde5140113fabec70cd0aee6b4a1 SHA512 c89341483ae97d43e58ea66324b0f8691bfe3cf849ebb3dfa4c76d4456c3bc1f2239692f2a3fa3b0cef5980ffa807e9c0c9809b16af2755b7cb71c39869a8e83
 DIST i3status-2.13.tar.bz2 201409 BLAKE2B e087d69e2df3ae9348cb55739023b2164dfa3543551d173b138c72e574714069d8397716b95e92c4315aa538ea31b33aa73532d6d0f75bbc38d7db54e1f665bc SHA512 6dadff19e53499d169ba4f491e1f821014b4f92fc3c93d7947c85cbbbdeaba538d02bd8ab98fe266a8f80756a287fd5803ec77a8cd874d50082b5cad309875c2
+EBUILD i3status-2.13-r1.ebuild 1591 BLAKE2B 1a0d3ee2139387cefa4fc3e63ca77e440c4b3ea2fbf1d7aeaff90f82f2f7697da047261ede6b61936867f0e4da00ff585c28796e8223c50357ad2068bfae0225 SHA512 1037bd5785a7e9353bbe8fab6a177e5cb6d062e5a9a4e8533d72582ba2792ba95a395cdadae25881fc3d4549d636c738123794edcac5dbf5cf63c2e0b0571b5b
 EBUILD i3status-2.13.ebuild 920 BLAKE2B d8259edb35966d55a19871a8727b744c3a353d76edf243ac25049fa8992477eb599ffafc68e94138f48e82bea036e43efb997729205b55aa77fa10eb8c4a51a4 SHA512 27845022d890ff5fa2feee8978082944dab85043160b1330215458e77366469e36a056fcdd33aa5bb235ae9781b5bbbc6f3cbcc5318831b173e1bd9e53f404bf
 MISC metadata.xml 1035 BLAKE2B 0ab04f4037e04d28ccf2e2305775eb7dd15583e3fa6af85f7ad31d442bdf06db20820855297eedd9630b374fdf4a096e8c15ecf994e516a27a28b29fc132ff14 SHA512 7ad11f6cc4e572f43f6cfb6812b04886888f9b71bba7e6c38523713ee6856f36fd82eb525b5d36d97f77e1f96c93d0b6887865fc867531ba5a884f614e577ab5
diff --git a/x11-misc/i3status/files/0001-Extend-battery-handling-on-OpenBSD-351.patch b/x11-misc/i3status/files/0001-Extend-battery-handling-on-OpenBSD-351.patch
new file mode 100644
index 000000000000..32a0358b4211
--- /dev/null
+++ b/x11-misc/i3status/files/0001-Extend-battery-handling-on-OpenBSD-351.patch
@@ -0,0 +1,98 @@
+From 3a51673c05142b99f8db6a0bd9b8e4b806efeb72 Mon Sep 17 00:00:00 2001
+From: Jasper Lievisse Adriaanse <jasper@humppa.nl>
+Date: Mon, 8 Jul 2019 17:53:25 +0200
+Subject: [PATCH 1/7] Extend battery handling on OpenBSD (#351)
+
+If acpibat watts value is not available, try current (for batteries
+that report in amps), then convert to watts.
+
+originally submitted by @jcs
+---
+ src/print_battery_info.c | 47 ++++++++++++++++++++++++++++++++++++++--
+ 1 file changed, 45 insertions(+), 2 deletions(-)
+
+diff --git a/src/print_battery_info.c b/src/print_battery_info.c
+index 1c51624..e2a790c 100644
+--- a/src/print_battery_info.c
++++ b/src/print_battery_info.c
+@@ -20,6 +20,8 @@
+ #include <dev/acpica/acpiio.h>
+ #include <sys/sysctl.h>
+ #include <sys/types.h>
++#include <sys/sysctl.h>
++#include <sys/sensors.h>
+ #endif
+ 
+ #if defined(__DragonFly__)
+@@ -31,6 +33,7 @@
+ #include <sys/fcntl.h>
+ #include <sys/ioctl.h>
+ #include <sys/types.h>
++#include <sys/sensors.h>
+ #endif
+ 
+ #if defined(__NetBSD__)
+@@ -269,11 +272,16 @@ static bool slurp_battery_info(struct battery_info *batt_info, yajl_gen json_gen
+ #elif defined(__OpenBSD__)
+     /*
+ 	 * We're using apm(4) here, which is the interface to acpi(4) on amd64/i386 and
+-	 * the generic interface on macppc/sparc64/zaurus, instead of using sysctl(3) and
+-	 * probing acpi(4) devices.
++	 * the generic interface on macppc/sparc64/zaurus.  Machines that have ACPI
++	 * battery sensors gain some extra information.
+ 	 */
+     struct apm_power_info apm_info;
++    struct sensordev sensordev;
++    struct sensor sensor;
++    size_t sdlen, slen;
+     int apm_fd;
++    int dev, mib[5] = {CTL_HW, HW_SENSORS, 0, 0, 0};
++    int volts = 0;
+ 
+     apm_fd = open("/dev/apm", O_RDONLY);
+     if (apm_fd < 0) {
+@@ -311,6 +319,41 @@ static bool slurp_battery_info(struct battery_info *batt_info, yajl_gen json_gen
+     if (batt_info->status != CS_CHARGING) {
+         batt_info->seconds_remaining = apm_info.minutes_left * 60;
+     }
++
++    /* If acpibat* are present, check sensors for data not present via APM. */
++    batt_info->present_rate = 0;
++    sdlen = sizeof(sensordev);
++    slen = sizeof(sensor);
++
++    for (dev = 0;; dev++) {
++        mib[2] = dev;
++        if (sysctl(mib, 3, &sensordev, &sdlen, NULL, 0) == -1) {
++            break;
++        }
++        /* 'path' is the node within the full path */
++        if (BEGINS_WITH(sensordev.xname, "acpibat")) {
++            /* power0 */
++            mib[3] = SENSOR_WATTS;
++            mib[4] = 0;
++            if (sysctl(mib, 5, &sensor, &slen, NULL, 0) == -1) {
++                /* try current0 */
++                mib[3] = SENSOR_AMPS;
++                if (sysctl(mib, 5, &sensor, &slen, NULL, 0) == -1)
++                    continue;
++                volts = sensor.value;
++
++                /* we also need current voltage to convert amps to watts */
++                mib[3] = SENSOR_VOLTS_DC;
++                mib[4] = 1;
++                if (sysctl(mib, 5, &sensor, &slen, NULL, 0) == -1)
++                    continue;
++
++                batt_info->present_rate += (((float)volts / 1000.0) * ((float)sensor.value / 1000.0));
++            } else {
++                batt_info->present_rate += sensor.value;
++            }
++        }
++    }
+ #elif defined(__NetBSD__)
+     /*
+      * Using envsys(4) via sysmon(4).
+-- 
+2.26.2
+
diff --git a/x11-misc/i3status/files/0002-Fix-headers-meant-for-OpenBSD-but-snuck-in-for-FreeB.patch b/x11-misc/i3status/files/0002-Fix-headers-meant-for-OpenBSD-but-snuck-in-for-FreeB.patch
new file mode 100644
index 000000000000..be9a08e32cc0
--- /dev/null
+++ b/x11-misc/i3status/files/0002-Fix-headers-meant-for-OpenBSD-but-snuck-in-for-FreeB.patch
@@ -0,0 +1,33 @@
+From 70b954b122c1dae1d21593d6a5239d38fde1fd55 Mon Sep 17 00:00:00 2001
+From: Jasper Lievisse Adriaanse <jasper@humppa.nl>
+Date: Mon, 8 Jul 2019 20:14:59 +0200
+Subject: [PATCH 2/7] Fix headers meant for OpenBSD, but snuck in for FreeBSD
+
+---
+ src/print_battery_info.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/print_battery_info.c b/src/print_battery_info.c
+index e2a790c..1768bc5 100644
+--- a/src/print_battery_info.c
++++ b/src/print_battery_info.c
+@@ -20,8 +20,6 @@
+ #include <dev/acpica/acpiio.h>
+ #include <sys/sysctl.h>
+ #include <sys/types.h>
+-#include <sys/sysctl.h>
+-#include <sys/sensors.h>
+ #endif
+ 
+ #if defined(__DragonFly__)
+@@ -33,6 +31,7 @@
+ #include <sys/fcntl.h>
+ #include <sys/ioctl.h>
+ #include <sys/types.h>
++#include <sys/sysctl.h>
+ #include <sys/sensors.h>
+ #endif
+ 
+-- 
+2.26.2
+
diff --git a/x11-misc/i3status/files/0003-conditionally-compile-pulse.c-only-when-using-pulsea.patch b/x11-misc/i3status/files/0003-conditionally-compile-pulse.c-only-when-using-pulsea.patch
new file mode 100644
index 000000000000..a1ac91ff8f21
--- /dev/null
+++ b/x11-misc/i3status/files/0003-conditionally-compile-pulse.c-only-when-using-pulsea.patch
@@ -0,0 +1,56 @@
+From 1999d5cf555c6f373549840d40f8565dcabad93b Mon Sep 17 00:00:00 2001
+From: Michael Stapelberg <michael@stapelberg.de>
+Date: Thu, 11 Jul 2019 15:23:08 +0200
+Subject: [PATCH 3/7] conditionally compile pulse.c only when using pulseaudio
+
+fixes #352
+---
+ Makefile.am  | 7 +++++--
+ configure.ac | 3 +++
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index bb251f0..c2c1c0a 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -68,8 +68,11 @@ i3status_SOURCES = \
+ 	src/print_volume.c \
+ 	src/print_wireless_info.c \
+ 	src/print_file_contents.c \
+-	src/process_runs.c \
+-	src/pulse.c
++	src/process_runs.c
++
++if PULSE
++i3status_SOURCES += src/pulse.c
++endif
+ 
+ dist_sysconf_DATA = \
+ 	i3status.conf
+diff --git a/configure.ac b/configure.ac
+index cf9e430..95009ac 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -80,16 +80,19 @@ AC_CANONICAL_HOST
+ PKG_CHECK_MODULES([CONFUSE], [libconfuse])
+ PKG_CHECK_MODULES([YAJL], [yajl])
+ 
++pulse=false
+ case $host_os in
+ 	linux*)
+ 	PKG_CHECK_MODULES([NLGENL], [libnl-genl-3.0])
+ 	PKG_CHECK_MODULES([ALSA], [alsa])
+ 	PKG_CHECK_MODULES([PULSE], [libpulse])
++	pulse=true
+ 	;;
+ 	netbsd*)
+ 	AC_SEARCH_LIBS([prop_string_create], [prop])
+ 	;;
+ esac
++AM_CONDITIONAL([PULSE], [test x$pulse = xtrue])
+ 
+ dnl TODO: check for libbsd for GNU/kFreeBSD
+ 
+-- 
+2.26.2
+
diff --git a/x11-misc/i3status/files/0004-battery-include-sys-sysctl.h-on-OpenBSD.patch b/x11-misc/i3status/files/0004-battery-include-sys-sysctl.h-on-OpenBSD.patch
new file mode 100644
index 000000000000..579c74e7e09c
--- /dev/null
+++ b/x11-misc/i3status/files/0004-battery-include-sys-sysctl.h-on-OpenBSD.patch
@@ -0,0 +1,26 @@
+From 02a47cd19641a04f6cf8d486cbb8882a1819c661 Mon Sep 17 00:00:00 2001
+From: Michael Stapelberg <michael@stapelberg.de>
+Date: Fri, 12 Jul 2019 14:38:43 +0200
+Subject: [PATCH 4/7] battery: include sys/sysctl.h on OpenBSD
+
+This is required so that CTL_HW and others are defined (ran into this on OpenBSD
+6.5).
+---
+ src/print_battery_info.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/print_battery_info.c b/src/print_battery_info.c
+index e2a790c..a36b05f 100644
+--- a/src/print_battery_info.c
++++ b/src/print_battery_info.c
+@@ -34,6 +34,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/types.h>
+ #include <sys/sensors.h>
++#include <sys/sysctl.h>
+ #endif
+ 
+ #if defined(__NetBSD__)
+-- 
+2.26.2
+
diff --git a/x11-misc/i3status/files/0005-configure-disable-pulse-on-OpenBSD-and-DragonFlyBSD.patch b/x11-misc/i3status/files/0005-configure-disable-pulse-on-OpenBSD-and-DragonFlyBSD.patch
new file mode 100644
index 000000000000..8ebb296f7ed0
--- /dev/null
+++ b/x11-misc/i3status/files/0005-configure-disable-pulse-on-OpenBSD-and-DragonFlyBSD.patch
@@ -0,0 +1,56 @@
+From 54e798e3a6dcf5747c3e943b376ae441ee0534a4 Mon Sep 17 00:00:00 2001
+From: Michael Stapelberg <michael@stapelberg.de>
+Date: Fri, 12 Jul 2019 14:45:34 +0200
+Subject: [PATCH 5/7] configure: disable pulse on OpenBSD and DragonFlyBSD
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This matches the conditional compilation in the code and is more correct than
+distinguishing linux vs. non-linux (which breaks on Debian’s kFreeBSD and hurd
+variants).
+
+Thanks to sdk for providing an OpenBSD 6.5 environment for verification. This
+has not been tested on DragonFlyBSD.
+
+related to #352
+---
+ configure.ac | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 95009ac..a6c31d7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -80,19 +80,25 @@ AC_CANONICAL_HOST
+ PKG_CHECK_MODULES([CONFUSE], [libconfuse])
+ PKG_CHECK_MODULES([YAJL], [yajl])
+ 
+-pulse=false
++pulse=true
+ case $host_os in
+ 	linux*)
+ 	PKG_CHECK_MODULES([NLGENL], [libnl-genl-3.0])
+ 	PKG_CHECK_MODULES([ALSA], [alsa])
+-	PKG_CHECK_MODULES([PULSE], [libpulse])
+-	pulse=true
++	;;
++	openbsd*)
++	pulse=false
++	;;
++	dragonfly*)
++	pulse=false
+ 	;;
+ 	netbsd*)
+ 	AC_SEARCH_LIBS([prop_string_create], [prop])
+ 	;;
+ esac
+ AM_CONDITIONAL([PULSE], [test x$pulse = xtrue])
++AS_IF([test x"$pulse" = x"true"],
++      [PKG_CHECK_MODULES([PULSE], [libpulse])])
+ 
+ dnl TODO: check for libbsd for GNU/kFreeBSD
+ 
+-- 
+2.26.2
+
diff --git a/x11-misc/i3status/files/0006-On-NetBSD-include-sys-socket.h-for-AF_INET-6.patch b/x11-misc/i3status/files/0006-On-NetBSD-include-sys-socket.h-for-AF_INET-6.patch
new file mode 100644
index 000000000000..171a1c39cfd2
--- /dev/null
+++ b/x11-misc/i3status/files/0006-On-NetBSD-include-sys-socket.h-for-AF_INET-6.patch
@@ -0,0 +1,24 @@
+From 667e38ababb69b68ddcd3c453bd78f022198559a Mon Sep 17 00:00:00 2001
+From: Thomas Klausner <tk@giga.or.at>
+Date: Sun, 21 Jul 2019 21:17:59 +0200
+Subject: [PATCH 6/7] On NetBSD, include sys/socket.h for AF_INET{,6}.
+
+---
+ src/print_wireless_info.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/print_wireless_info.c b/src/print_wireless_info.c
+index 8b2d210..6215704 100644
+--- a/src/print_wireless_info.c
++++ b/src/print_wireless_info.c
+@@ -61,6 +61,7 @@
+ 
+ #ifdef __NetBSD__
+ #include <sys/types.h>
++#include <sys/socket.h>
+ #include <net80211/ieee80211.h>
+ #define IW_ESSID_MAX_SIZE IEEE80211_NWID_LEN
+ #endif
+-- 
+2.26.2
+
diff --git a/x11-misc/i3status/files/0007-make-pulseaudio-an-optional-dependency-follow-best-p.patch b/x11-misc/i3status/files/0007-make-pulseaudio-an-optional-dependency-follow-best-p.patch
new file mode 100644
index 000000000000..e60a1375fec1
--- /dev/null
+++ b/x11-misc/i3status/files/0007-make-pulseaudio-an-optional-dependency-follow-best-p.patch
@@ -0,0 +1,119 @@
+From 23da59920c4c911ee08498eb283b69bdef80fd65 Mon Sep 17 00:00:00 2001
+From: Michael Stapelberg <michael@stapelberg.de>
+Date: Mon, 29 Jul 2019 20:57:48 +0200
+Subject: [PATCH 7/7] make pulseaudio an optional dependency, follow best
+ practices
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+For my thoughts about optional dependencies, see
+https://michael.stapelberg.ch/posts/2019-05-23-optional-dependencies/
+
+This commit follows the best practices outlined in that article:
+
+1. The travis config was modified to verify both code paths build and link/don’t
+   link against pulseaudio.
+
+2. If pulseaudio is missing, the build fails until packagers explicitly pass a
+   --disable flag. In practice, I think the only situation when this flag should
+   be set is in source-based linux distributions where users can express
+   package-level compilation preferences (e.g. Gentoo USE flags).
+
+3. The --version output now reflects the status of the optional dependency.
+
+fixes #359
+---
+ .travis.yml        |  5 +++--
+ configure.ac       | 25 +++++++++++++++----------
+ i3status.c         |  8 +++++++-
+ src/print_volume.c |  2 +-
+ 4 files changed, 26 insertions(+), 14 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index a6c31d7..11caa33 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -80,25 +80,29 @@ AC_CANONICAL_HOST
+ PKG_CHECK_MODULES([CONFUSE], [libconfuse])
+ PKG_CHECK_MODULES([YAJL], [yajl])
+ 
+-pulse=true
++AC_ARG_ENABLE(pulseaudio,
++  AS_HELP_STRING(
++    [--disable-pulseaudio],
++    [build without pulseaudio support]),
++  [ax_pulse=$enableval],
++  [ax_pulse=yes])
++AM_CONDITIONAL([PULSE], [test x$ax_pulse = xyes])
++AS_IF([test x"$ax_pulse" = x"yes"],
++      [PKG_CHECK_MODULES([PULSE], [libpulse])])
++pulse_def=0
++AS_IF([test x"$ax_pulse" = x"yes"],
++      [pulse_def=1])
++AC_DEFINE_UNQUOTED([HAS_PULSEAUDIO], [$pulse_def], [Build with pulseaudio])
++
+ case $host_os in
+ 	linux*)
+ 	PKG_CHECK_MODULES([NLGENL], [libnl-genl-3.0])
+ 	PKG_CHECK_MODULES([ALSA], [alsa])
+ 	;;
+-	openbsd*)
+-	pulse=false
+-	;;
+-	dragonfly*)
+-	pulse=false
+-	;;
+ 	netbsd*)
+ 	AC_SEARCH_LIBS([prop_string_create], [prop])
+ 	;;
+ esac
+-AM_CONDITIONAL([PULSE], [test x$pulse = xtrue])
+-AS_IF([test x"$pulse" = x"true"],
+-      [PKG_CHECK_MODULES([PULSE], [libpulse])])
+ 
+ dnl TODO: check for libbsd for GNU/kFreeBSD
+ 
+@@ -160,6 +164,7 @@ AS_HELP_STRING([is release version:], [${is_release}])
+ AS_HELP_STRING([enable debug flags:], [${ax_enable_debug}])
+ AS_HELP_STRING([code coverage:], [${CODE_COVERAGE_ENABLED}])
+ AS_HELP_STRING([enabled sanitizers:], [${ax_enabled_sanitizers}])
++AS_HELP_STRING([pulseaudio support:], [${ax_pulse}])
+ 
+ To compile, run:
+ 
+diff --git a/i3status.c b/i3status.c
+index 0898da3..1ab8400 100644
+--- a/i3status.c
++++ b/i3status.c
+@@ -565,7 +565,13 @@ int main(int argc, char *argv[]) {
+                 return 0;
+                 break;
+             case 'v':
+-                printf("i3status " VERSION " © 2008 Michael Stapelberg and contributors\n");
++                printf("i3status " VERSION " © 2008 Michael Stapelberg and contributors\n"
++#if HAS_PULSEAUDIO
++                       "Built with pulseaudio support\n"
++#else
++                       "Built without pulseaudio support\n"
++#endif
++                       );
+                 return 0;
+                 break;
+             case 0:
+diff --git a/src/print_volume.c b/src/print_volume.c
+index 91e8ce2..7364d47 100644
+--- a/src/print_volume.c
++++ b/src/print_volume.c
+@@ -86,7 +86,7 @@ void print_volume(yajl_gen json_gen, char *buffer, const char *fmt, const char *
+         free(instance);
+     }
+ 
+-#if !defined(__DragonFly__) && !defined(__OpenBSD__)
++#if HAS_PULSEAUDIO
+     /* Try PulseAudio first */
+ 
+     /* If the device name has the format "pulse[:N]" where N is the
+-- 
+2.26.2
+
diff --git a/x11-misc/i3status/i3status-2.13-r1.ebuild b/x11-misc/i3status/i3status-2.13-r1.ebuild
new file mode 100644
index 000000000000..9107ec983b70
--- /dev/null
+++ b/x11-misc/i3status/i3status-2.13-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit fcaps autotools
+
+DESCRIPTION="generates a status bar for dzen2, xmobar or similar"
+HOMEPAGE="https://i3wm.org/i3status/"
+SRC_URI="https://i3wm.org/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="pulseaudio"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	>=dev-libs/yajl-2.0.2
+	dev-libs/confuse:=
+	dev-libs/libnl:3
+	media-libs/alsa-lib
+	pulseaudio? ( || ( media-sound/pulseaudio media-sound/apulse[sdk] ) )
+"
+
+DEPEND="
+	${RDEPEND}
+	app-text/asciidoc
+	app-text/xmlto
+"
+
+PATCHES=(
+	"${FILESDIR}/0001-Extend-battery-handling-on-OpenBSD-351.patch"
+	"${FILESDIR}/0002-Fix-headers-meant-for-OpenBSD-but-snuck-in-for-FreeB.patch"
+	"${FILESDIR}/0003-conditionally-compile-pulse.c-only-when-using-pulsea.patch"
+	"${FILESDIR}/0004-battery-include-sys-sysctl.h-on-OpenBSD.patch"
+	"${FILESDIR}/0005-configure-disable-pulse-on-OpenBSD-and-DragonFlyBSD.patch"
+	"${FILESDIR}/0006-On-NetBSD-include-sys-socket.h-for-AF_INET-6.patch"
+	"${FILESDIR}/0007-make-pulseaudio-an-optional-dependency-follow-best-p.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable pulseaudio)
+}
+
+src_compile() {
+	pushd "${S}/${CHOST}" || die
+	default
+}
+
+src_install() {
+	pushd "${S}/${CHOST}" || die
+	default
+}
+
+pkg_postinst() {
+	fcaps cap_net_admin usr/bin/${PN}
+
+	elog "${PN} can be used with any of the following programs:"
+	elog "   i3bar (x11-wm/i3)"
+	elog "   x11-misc/xmobar"
+	elog "   x11-misc/dzen"
+	elog "Please refer to manual: man ${PN}"
+}
diff --git a/x11-misc/menulibre/Manifest b/x11-misc/menulibre/Manifest
index 32a777c3d9a3..75338414a1b1 100644
--- a/x11-misc/menulibre/Manifest
+++ b/x11-misc/menulibre/Manifest
@@ -1,3 +1,3 @@
 DIST menulibre-2.2.1.tar.gz 453217 BLAKE2B 86b3d2d8b20bfc7dcfcba380f656ec1e99f1d5dbc3779eadb9e7cc3a2b8c96afc0c2efe72802d0c93833f6c705c67d05a4ba6cc6cf9b95e0c9b9850ae4424fee SHA512 cf1425d604af26b7bde92106aa758a1f7dcc66ad1fbcdcd4c23db90bc7b6de5fe1160b917035f1d949daa1af8ba6b1145d7376ae637c8937a25cb108bf8cd15f
-EBUILD menulibre-2.2.1-r2.ebuild 1831 BLAKE2B 658b37f8e1e218b488040b32048ba99489590c2575f59ef261a8afb5edbf9b5d22ecdfc4e47e48cca992dbebc7ff024715eab51e0ab956205e3c9558875a2534 SHA512 abbcb4f26c42eb1ab48790428cce295819f803474ba2ee63b6e75a3b4ae799d623ce4d2f57b1953c255e8ee2815d14d9c614a27b1e8d35313d6a90576dcb7ee3
+EBUILD menulibre-2.2.1-r2.ebuild 1761 BLAKE2B e213f6e9c2f08c8fc7a58fa3288421fc272e65d7ce6cefec6dd603469bbd62e814f09456e1066c72e99628201f0f6144b41e8ac5b9db6a2f726857aefbfede12 SHA512 258e65a499d85a7316db78120e7bbd262713eb105fe0f585bc990a62598a2bb51f2ff9893e9f535705aa0cbcbcd7e7b1f28c69e64f3bf3d27a7acb477e011703
 MISC metadata.xml 244 BLAKE2B 074f1e921f4d984a8bb58f3ff2800ddc85868c9d33c331dfd7a19503c02563f9e291876e99a3f4bc9afd171fcd8299e5c22d46bc24ec9ca475fa88d1535fb112 SHA512 0929c8d7177ffd5ac6e346f4bbfcafa764105312388307b7a8cf240d72f385437beb275aa530b4ad0248e807e5f42fa4f5437affdc94557baa1ece5a9f5586fc
diff --git a/x11-misc/menulibre/menulibre-2.2.1-r2.ebuild b/x11-misc/menulibre/menulibre-2.2.1-r2.ebuild
index 809ec3163aee..c7b8666c45ba 100644
--- a/x11-misc/menulibre/menulibre-2.2.1-r2.ebuild
+++ b/x11-misc/menulibre/menulibre-2.2.1-r2.ebuild
@@ -25,13 +25,8 @@ RDEPEND="
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	dev-python/pyxdg[${PYTHON_USEDEP}]
 	gnome-base/gnome-menus[introspection]
-	|| (
-		(
-			x11-libs/gdk-pixbuf-xlib
-			>=x11-libs/gdk-pixbuf-2.42.0:2[introspection]
-		)
-		<x11-libs/gdk-pixbuf-2.42.0:2[X,introspection]
-	)
+	x11-libs/gdk-pixbuf-xlib
+	>=x11-libs/gdk-pixbuf-2.42.0:2[introspection]
 	x11-libs/gtk+:3[X,introspection]
 	x11-libs/gtksourceview:3.0[introspection]
 	x11-themes/hicolor-icon-theme
diff --git a/x11-misc/notification-daemon/Manifest b/x11-misc/notification-daemon/Manifest
index 13d53ea2dd4a..cca7ea45eea2 100644
--- a/x11-misc/notification-daemon/Manifest
+++ b/x11-misc/notification-daemon/Manifest
@@ -1,6 +1,6 @@
 AUX notification-daemon-0.5.0-libnotify-0.7.patch 948 BLAKE2B 9da54db70a628988b5f5b3e34dd71a7bbf8357a58be1e7c9de863d719619b6376ca311c4963e0974f77c08671f03efd28693d90f97a852ee68393e3b11b550fc SHA512 e828d89197c29c3b8e2b6b2e616d6fd63952f8b8ac23f4a0b7a8f6a75722e011d1684302b711ee530506e4e17aae6c7949f12f58a113ca6bb254a29d146d5870
 AUX notification-daemon-0.5.0-underlinking.patch 277 BLAKE2B ef30fae7ca0d8a26c18acc5f98e5a2bd4db53293f302fdba3bf3fbc362c435931d81482e174fbff5396ecee04768068e51c48a8e19be3f881803ae4af77e3637 SHA512 e370ed9435b474fddf0b884d6781bdbfb1cb68dd7f851e72f525d6153235d39f77d28257c6d720f3de63df8ac29a7bf9100669813f4edda177a9dbf21afa3e5e
 DIST notification-daemon-3.20.0.tar.xz 340752 BLAKE2B 9ded1efdb38de0097495ff570b9b91eb151e5eb030fcb9364a5ac04a4a5631c0a8483dc4068dd806d54ef0a096062ca92f9783f2030edb57f681b82015cf8584 SHA512 d9311c71a2915cb6e55bd1408e60b4d7b7fc24114410b8bd8cb358fe86c100198567099843b967f7e01ca03c91afe3f3980fb30b7f2c138bdab949e0e196a0f8
-EBUILD notification-daemon-3.20.0-r1.ebuild 854 BLAKE2B 98f8d5c1dd5486b54296abe4417a295aadbe2fc63d8427bab65e9bc30b02d1808ac5b34fce35aa1861aff0b577f8a4083fe8d459e5a1d30ab1b4a7418f7d985f SHA512 4e122f144f1118d56b7cc7645c49e792ef605f502dd07164f08bac1bad96f01b261e1b696b9672ca492ad633649eaaad4b2d01a59b5af22efcdf3ac441855c6d
+EBUILD notification-daemon-3.20.0-r1.ebuild 853 BLAKE2B 9ef447d35fb61ac435591e991ce5a1fbb534652e55a48cd06f149016dc22ec7fed03859acb224007db417ff340143c2c36f2ff948a6f0f94dc40917ae034fb1f SHA512 7aa0e5a1781a337db6f5882fb000f285dcdece72af8d0f271af8dd508a37da56ea3d10774f0d350dc0a0ad47edd42a556192e7dc3680c20b841c8b620dc647a2
 EBUILD notification-daemon-3.20.0.ebuild 933 BLAKE2B 6b6723c0fb6eb6d0bb651cf89391044caec710a62c646ce14c449dfadba8bac667260ab134ac3441e908fe66061db130e3a7a35f76cbb48ed56ad35258d7d58e SHA512 5ede8f81fb46b783f0d2f323d95724db34405bc5b9339afd36faea803453bd3b76c47c09b8c8525dd821637d1069572f645593c50d18c4e4b266166a7eac373a
 MISC metadata.xml 270 BLAKE2B 9c2dafa0390cfc7b94b5c44505d72021bf57cf8ffb35be7a3327f4316c3e4b2dbbfa0325d97243a8ea933440a5678cc5d35c639f5aa210b1d5ceb8ab65eb5d90 SHA512 92c366ec57074ced42e6f9960f97d1cd1a022dba7450b51f3617a6a5e00c755496dfa84aa4ac259f4b00c676366b1eaa3ec30eeb9bcb0bf41253d1910005db2f
diff --git a/x11-misc/notification-daemon/notification-daemon-3.20.0-r1.ebuild b/x11-misc/notification-daemon/notification-daemon-3.20.0-r1.ebuild
index 36fe6823fe63..06a28a94b8b9 100644
--- a/x11-misc/notification-daemon/notification-daemon-3.20.0-r1.ebuild
+++ b/x11-misc/notification-daemon/notification-daemon-3.20.0-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/notification-daemon/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.28:2
diff --git a/x11-misc/polybar/Manifest b/x11-misc/polybar/Manifest
index bd97fe927793..9bf476f04fd8 100644
--- a/x11-misc/polybar/Manifest
+++ b/x11-misc/polybar/Manifest
@@ -1,9 +1,9 @@
 DIST i3ipcpp-21ce9060ac7c502225fdbd2f200b1cbdd8eca08d.tar.gz 191599 BLAKE2B 85488a6c2ab9c6f653b499ceaa6d8e803dd8b32cd701a7fbbe151f7f3ea2dc30555c520ded53f023a21b119be97c2b07ae1ab413479cfde677e2073f3d48e36b SHA512 0000ba136bd531899ce9e87d458bd6f7d16f45509def37e4fd7aafc16d0e122fe5f56d0eb9dbc3e722dbb6c9812913a7aafa4b749a9c727ab0988908b1e2a425
 DIST i3ipcpp-cb008b30fc5f3febfe467884cb0211ee3c16386b.tar.gz 43681 BLAKE2B a17c9764f429edd4a65d173ff43c139083a8831d9ee68d3024c033f039409efd486178a6225d06e3313642a9918298b1b60da1da75d49243973f8e2dd1fc855f SHA512 27a90d80f2de45743c2347be5ec5c88db58c4f3bb2aa44093c2a1e3178bfd5761ec806bdec9c6b6a4de6d1e67d5f14d4518e99611bf7e2984cfc880898357133
 DIST polybar-3.4.3.tar.gz 253207 BLAKE2B 213b5ea67cc337c47f62afcdce9cacf66516e6f410d2d93570567cddf9f0f5b93764f16e3eaf7c03c56a5ddad62ade92bd83fcfe30c6b91d067c2343f7264342 SHA512 20ac34375da4634a7fd596f38e98a245186c94f8fd624d1dfdcd6633a3c8470fcc57946a50a59177e9d34689aeb5f6cde49e95b30ad699239a2aabbf0635d31a
-DIST polybar-3.5.1.tar.gz 282038 BLAKE2B 2b252c3bea296581160af74412485a6a19201c1a6666ef688c496294823380503574e8b912be4b9eb822214b6a696954ccfc3e3ca29303f751bfa6640988593a SHA512 835decbdfcf398d6920d871beace2aa3883977bec89c7d87f3bd650d05ef267cfa17d1df7fd79bcf685c79ea0c5c9d1d46c4ab32cffbfd85d44a273f0ae8b906
+DIST polybar-3.5.2.tar.gz 282025 BLAKE2B 9d9dbd94ff998d9e44fa52739f585dc3c602ef7fa05ac8c4e3d2a0ed9d62adf5a19aadbc2b923b51c57d5a6108807eaf1614987b6d2887dcd47b0e41bc07c1c6 SHA512 0dcd7ce1c7fd67839ce7ee16061aef760c1cce06cea370834aa1055b22cb40dcb8e059fd9f80b87223a76aad1d7967610318a64139f5adbd9d90790a6a4b0b3a
 DIST xpp-044e69d05db7f89339bda1ccd1efe0263b01c8f6.tar.gz 84121 BLAKE2B dea2384773803bbc5de2ec971ed0cf769b0af8b987bbcf918718647e4787b4713af54a358c029e9603c28c5424488731f76ecc430b6b124bcd9255aef893431f SHA512 646e159d47d6dac8f08a27a1cb54e2ef48e42cff952b55b3906c2021c424e015c070a31a7a1e70b62e0edc7a8b42b935a23b9a922eaab138d3f6929bc1fdb8d4
 DIST xpp-8c019e6d7fefd2468791bc1cbf90d68ff7c1ba33.tar.gz 83974 BLAKE2B 6ea8599136288c006b6993bd6c704ec32d82773153733b4bc6a9c3f326eaf6f3b155d92f270eeb14d57b399f7b5ea0f6bdd5cee41bb5bdf4c1650f337b77f857 SHA512 92874b25305b3be777e739122ff82f1ba16b8e2e445e8ee4891918074ea8ea371f2016d7901cfc477d0286a9e15910c4cee431a11eb71e32728bfbf561313e4f
 EBUILD polybar-3.4.3.ebuild 1808 BLAKE2B 383e0c9b63385237bf1ecf2b0650f3bdcdb8df85cd72b8fbcbdab391b509de5736592de7d9684209c332be857f79cbeec0f51a3d04b2a5ec3b1783a01bc3e846 SHA512 170c1bfe1a8b80b7feed829496724fd3f90a6a0ade553ca828ef06552f1e38cc78180ff2eeed0690b0072f7d2c82494835fb23a76a6d4eeaddb152d9c5381f01
-EBUILD polybar-3.5.1.ebuild 1816 BLAKE2B 2d5179fc6cdbeac9f5b4593fc8dfb8a4b4f5f8c7326ff8819bc5b46297b82f57e7ff1c6c94af7d505f56d6a24f2c4721e2906981690975436632bdd4a763327e SHA512 cc92006e5abf400cdfef1c64a81eb82a9129608b0bb67102d745ffa91b5ff75ea7a90de470d79ac7a4fb4aad5e12b786eacef93980850d2a8419af1c69fb4969
+EBUILD polybar-3.5.2.ebuild 1816 BLAKE2B 2d5179fc6cdbeac9f5b4593fc8dfb8a4b4f5f8c7326ff8819bc5b46297b82f57e7ff1c6c94af7d505f56d6a24f2c4721e2906981690975436632bdd4a763327e SHA512 cc92006e5abf400cdfef1c64a81eb82a9129608b0bb67102d745ffa91b5ff75ea7a90de470d79ac7a4fb4aad5e12b786eacef93980850d2a8419af1c69fb4969
 MISC metadata.xml 813 BLAKE2B f620aa54849e10ab8a6f14e78bb00b2cb17ec9309d032025833fef0aa3e339fe3236ca3a83abed185fa2f3098b1c3127f09bed4ff75d1f4de1999097112f8f26 SHA512 b7a4b4143245837dbfc14270b008f1b48b2b7c0746d16180cabe569d562709f41229d7028397c3eca64a5a07319441d69e3affe2b0851e5a6c33f5727608989d
diff --git a/x11-misc/polybar/polybar-3.5.1.ebuild b/x11-misc/polybar/polybar-3.5.2.ebuild
index 876307caf15b..876307caf15b 100644
--- a/x11-misc/polybar/polybar-3.5.1.ebuild
+++ b/x11-misc/polybar/polybar-3.5.2.ebuild
diff --git a/x11-misc/rofi/Manifest b/x11-misc/rofi/Manifest
index fc4f76a4ddb4..138f5981c5ef 100644
--- a/x11-misc/rofi/Manifest
+++ b/x11-misc/rofi/Manifest
@@ -2,7 +2,9 @@ AUX rofi-0.15.12-Werror.patch 437 BLAKE2B 6f230755bb2bcf5c91c354d4d2afec1c9e78a3
 AUX rofi-1.5.0-gtk-settings-test.patch 322 BLAKE2B 652e0c20262bc18abadc8e540d4b9374fe412a97ff6b82b545ec4f050e087b8982b4e16ebf9553c71e5b6c145e8a3b8b469b1b107def04f443c01c57efe9e947 SHA512 75431eac4c6eac56716a6e2ec0ca4f5fd88aa38761b758b58c5f8c3f3fd6eb4a111af9c74b2d7c14fc3e66cbc7f361b2b3bc8658cfb31fb827e01cf19a58df67
 DIST rofi-1.5.4.tar.gz 535259 BLAKE2B 8560dfee631c66a6f2178c0af6926ef317ed6d2cfe3ae46264e5b1ce429113ce810e4fed4c86a81acbbd51c85ad2593f40a39d982d7da0aa8ccc55537cadd2bb SHA512 181dedb0905bfab76f7ad313d299f4c80ee4efb11a2c6345b16044b7fb3f54bc7e304ee9352e562932e55108e328e5f6bd2c1d7fd9bcdec3d8022c2dc4f8d394
 DIST rofi-1.6.0.tar.gz 558808 BLAKE2B 45849f71becd3ab69b85dae64af34ad42199c20976304b89b013405f1d7fbbfa8fdf7d3ac4c26563cc2f5924fad64d45da1ba7dcad8857fb127eaf4b40c08824 SHA512 a993b0d49681eae4bc4aa84277f6daf1467e53bc40fa43e97ccf3f834763a3c9a1ed8b5d1d628158febc9e8b339be3fb745ae5b4e1d86e9f84b7af4b6a30ea23
+DIST rofi-1.6.1.tar.gz 569262 BLAKE2B 938b45f8326b5a28e349ac9f7028c476274faa4f932a773acc350d5e1dc8d5c05c7cfb7ec10f1ab5d8c83590074424c3379768671d37ee799d78e508b8c4a4cb SHA512 b54e75818a98fa9262a3016260051837de189d49beff4f4a158cb2e7f41438641377e11d75c164f423e6a86d8b8fca3b76e2630611678525465d06c21b393f60
 EBUILD rofi-1.5.4-r1.ebuild 1081 BLAKE2B 57e62dbf8e19448372d23438ffea0840144651434e6235798bc558be24d785d03d0e2143cab08b83abb39d3308446f42c46706f9aaa9edb690da1a9a7055a078 SHA512 456f687515cf00aa7826111d393056aea01159aacc88a408d66d5aef493a154ea9c823b57cd6b73ee593c0776d6f6e3d5a2ce94ccd7e97f523514d175778b236
 EBUILD rofi-1.6.0.ebuild 1127 BLAKE2B c279ac1a739c9dd30bbc1a87856e4f3b4e787a20f3f857d805a7775b2a7b363fb1a59d6f7fd7e8ab2ae904f57a8d98ed0d17201876426015ce2bd0de68ee0516 SHA512 c0cd9be17f855fcc119fd58e614aee41d1ab9b368de322f903652360bfa1ba7a166f47d2c3d09a655dec32edfbeafb5f85e0e1ae2484986524c982f3d6a6bc1a
+EBUILD rofi-1.6.1.ebuild 1138 BLAKE2B 9cec65567ecf6a1bed874188de2ce47043a700781bcf3448d8b2d286e37f267842d1c57f5436635809566a9945bcfab001a304339074b2533b33c9117e3493dd SHA512 e66d595ef431b05de35f79016df9680bb82eb907591ef7e3520acfa6aae91b2c5086fc9c295b717c5a572a771487eef0ba3f31b4ac07ad2c8bdd98e05a977861
 EBUILD rofi-99999.ebuild 1042 BLAKE2B 0c684ffbeef5366d83b4689a2e8ab9f27072e82d936985fe1a7d128a65cc8b3edcf6a42b09e85866496b280143af8d5f4ece9d8db452bdf1eae020a93302d10c SHA512 1a08b9ded70d742ef6fe5c9250291a6ff74b1efcb767594c4546bb5f7217d1c50cc04d259a55834b12d3c91b3262d82edfcd5c2ffb5ded4ac8718e54a3ea27a1
 MISC metadata.xml 475 BLAKE2B 6ca3375d564b137bf9e6b9f71dd725c5602a24e2184e420002c161681e314bb0ba4547e171e18e3f036637447001fd8af41e46f7f6b7ca9795020bdfacbd8a57 SHA512 0adff749d0effa8e97ebd8e00714c8f854bd5d71c07f7c83be79da5b80bb9910b06d14a7df7145d92b2aab2d905692c5b3b9481007bb47dc0b7f17f59ef781bf
diff --git a/x11-misc/rofi/rofi-1.6.1.ebuild b/x11-misc/rofi/rofi-1.6.1.ebuild
new file mode 100644
index 000000000000..44eda2ab0a9a
--- /dev/null
+++ b/x11-misc/rofi/rofi-1.6.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="A window switcher, run dialog and dmenu replacement"
+HOMEPAGE="https://github.com/davatorium/rofi"
+SRC_URI="https://github.com/davatorium/rofi/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+drun test +windowmode"
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	dev-libs/glib:2
+	gnome-base/librsvg:2
+	media-libs/freetype
+	virtual/jpeg
+	x11-libs/cairo[X,xcb(+)]
+	x11-libs/libXft
+	x11-libs/libXinerama
+	x11-libs/libxcb
+	x11-libs/libxkbcommon[X]
+	x11-libs/pango[X]
+	x11-libs/startup-notification
+	x11-libs/xcb-util
+	x11-libs/xcb-util-wm
+	x11-libs/xcb-util-xrm
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+	test? ( >=dev-libs/check-0.11 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.15.12-Werror.patch
+	"${FILESDIR}"/${PN}-1.5.0-gtk-settings-test.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC
+
+	econf \
+		$(use_enable drun) \
+		$(use_enable test check) \
+		$(use_enable windowmode)
+}
diff --git a/x11-misc/x11vnc/Manifest b/x11-misc/x11vnc/Manifest
index b293d50f60a4..7d6ec3d000fd 100644
--- a/x11-misc/x11vnc/Manifest
+++ b/x11-misc/x11vnc/Manifest
@@ -8,5 +8,5 @@ AUX x11vnc.init.d 1728 BLAKE2B 45680af6aad530a9b36f29adc61c1f90ad272bd7201c30f29
 DIST x11vnc-0.9.16.tar.gz 1708009 BLAKE2B a8789f95ef421a78a83703748e1d80fd45539dff24f80493fd75e357bc22378213915853f9d114248c172cd83977880e1e4e8a3f8df0771017e9988d83b7307d SHA512 69f65ee312f8dede6051b401304987502a213c6c28c7f41e855734f11de1fae14d5d493dc9c28b2e4b7c0be55f8dbd3b35dd2610aae910183772c3e626736fec
 EBUILD x11vnc-0.9.16-r2.ebuild 1942 BLAKE2B 72cb2940aefc086db989a74155fa48fe27a27593ba04c14af7b83a67fd2da64eb2c0354a1565ba9ddfa744b804869f5f3a102a54e87f949b9efa5ca1c01d6e63 SHA512 7d5b4399b806d4059bb5a0aff470671c8b4591febf562c003e57e7ca6c2bc429fa416ef09f6885cc9b764677c38e44041cbf5b4f911a723a98c5a13f5e795103
 EBUILD x11vnc-0.9.16-r3.ebuild 2014 BLAKE2B e85b366cab4ceb65ffc8c7b644b5814da9db6f8070c180526f66f917d291809ea9c4ddfefc921de89ef216cc03e6391df170e3435e3ddce858ebdba7432fc026 SHA512 d79f267e41843d1cf7c40814baddabea3729608d0d2dfc4f28543de459ff559b39a19221f60fcc808992c0cb0bae86126203700bcd8b181e9199bee5f8a5b2c9
-EBUILD x11vnc-0.9.16-r4.ebuild 2050 BLAKE2B 4e1b446da52ffb86258432cde295536d5f431ca80a411d5657dcffc64a975252aa12255fd61a15cf401ae948a27285ec76f11fe4b642ef3b01a6e30b53961c6b SHA512 2a0563c2c2d767c0dfe65fb5a3108dfc4cfd71f0ec8c628fa6c3c18b2cd09348302416e15d0a307a208a3eb4d7f40dec703464f5eb3e22c4798f378b9b79790f
+EBUILD x11vnc-0.9.16-r4.ebuild 2049 BLAKE2B 70251f73469627e347c411f9de285bb2691448251deac7029f7e6fa4f682d19ed8c07c17a8b51531a83e4baaeb5a2f93a7f63ec9ff8f83037ff53ef481af1a23 SHA512 0a95a6d066e96fddc25a5024ffdf1ff886d8e936dbac5e3924f15b3aa5921a76d347b7e5f9ffe06ab01fb397b1ae637049d85758e9db4a5c6ae496d4daf8fba2
 MISC metadata.xml 922 BLAKE2B 02740589fa0091f604e1fff99ace802d4b179a35afd2c40d4ae25d40d41af0425a6e16cdb5951b4968813478a5066c6a241d49beba811dc296f125ba2aaddd13 SHA512 b46e3d0b379cf9967ec878e57d0a21b677ca869921546224f6f663eca4da8f2d57a97d07dac9da90999454584f6ea1c80748adf12663ff03b286292603aef2c6
diff --git a/x11-misc/x11vnc/x11vnc-0.9.16-r4.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r4.ebuild
index 077b2fc02915..85403ad5c8bb 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.16-r4.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.16-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/LibVNC/x11vnc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+-with-openssl-exception"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="crypt fbcon libressl ssl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf"
 
 COMMON_DEPEND="
diff --git a/x11-misc/xdg-utils/Manifest b/x11-misc/xdg-utils/Manifest
index 5e46489ed357..024b554461ff 100644
--- a/x11-misc/xdg-utils/Manifest
+++ b/x11-misc/xdg-utils/Manifest
@@ -2,6 +2,6 @@ AUX xdg-utils-1.1.3-xdg-open-pcmanfm.patch 702 BLAKE2B 1adcb274c1a5fcca4a99178bf
 DIST xdg-utils-1.1.3.tar.gz 297170 BLAKE2B bd281df73d8c966d11b502dd7ec88d96dbc9683503f54b043ae4842f146b6847bd3dd6902cf993771848d9fcb55d26d67f032af2b8aa0795a6d9855535e57d5b SHA512 d1f819a211eb4104a90dfdc6fedcb640fd46b15ccfc8762266f8f538c49d74cb00027b8c1af991fb2a200acb4379986ae375700e06a2aa08fb41a38f883acb3e
 DIST xdg-utils-1.1.3_p20200220.tar.bz2 287080 BLAKE2B eb9067527d5073f290d10ad36bcda24d4b813f3c98776b57955a7f254956795c26f1536c858ac104259f68f755746976d2cfc3aeccb9b9b35eaca5ea5eb89806 SHA512 8445109e87fb9e92edeebbf6b07a41b79344bc5016eb7224f5f2b7e599c6d075363337c81dd2ddf8f3007c633debba7f814631188c02db3ae002f622b4c323ec
 EBUILD xdg-utils-1.1.3-r1.ebuild 2131 BLAKE2B a6d2abd3b268a4bbc14d5a5cd3c88c0ab4083458f294f8a09354f95947b1526f06659c9bfc36dee0d1c6aed7654d2edd5394e0435e57e837401e5e7b2a74fc05 SHA512 688c267446e41feda372828a0443f71c00aa2008b6626b5785eb0b7a94d8be589427f6fa0d709924c0446ab8cc3d7fccdbff580db2c3e1d17e2a5cd8fd926010
-EBUILD xdg-utils-1.1.3_p20200220-r1.ebuild 2035 BLAKE2B 182f2f54a9e3c59cbad10c16d5c9896116e376e03a65b401a66041b0b3a2be3a291a84651b95f0660758867e5f4aeb0e58a65fd1f266549712f2c5403d56eb44 SHA512 68df6b6e005a734788e9bbbb40f1f6fb5bdf80332fd6772466310ef01046c9e7ea25a238973e2793d4f83de654a708e3e93107a6564cb3b1f788dcceac2c1aea
+EBUILD xdg-utils-1.1.3_p20200220-r1.ebuild 2034 BLAKE2B 54f04b21a136314798ba8561b2ba37c9aefef98692b0933f764ce58b9dda7e613307afad1517f32fa67b91aa388b451ea32396a590861f68738be020b37cc5cb SHA512 0a46b855d28732bbb8004a3e24750eed1faf5c2472b048274aba1cf236a084d8fae531c1b0804aaec91e2847a9af591b0b21e83b485d9ad3167a1dab2ffd1727
 EBUILD xdg-utils-1.1.3_p20200220.ebuild 1960 BLAKE2B ebc017c0c4d725cc5ad9e4fe6d899ac52eb4c3d4826e32e0ce7cec91dd36a715ffd1d052f79481098fcf72e9c340ce046381bd7802958c42fa0268fc8595c57f SHA512 7bc08447c7374a1878f0d83b272ff8a380e4c8bea6916c8d8562519760456f6415880a9ddedadb1ce008488e215368715aaa28b6b1d6396464b343d809a3c52d
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220-r1.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220-r1.ebuild
index 2fc95ee7016c..814cd4ad8541 100644
--- a/x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220-r1.ebuild
+++ b/x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220-r1.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/xdg-utils-${EGIT_COMMIT}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="dbus doc gnome"
 REQUIRED_USE="gnome? ( dbus )"
 
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index b78f177ea55c..c51b62e3b1d1 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -15,7 +15,7 @@ AUX xscreensaver-remove-libXxf86misc-dep.patch 1879 BLAKE2B fa3f562edf921dded7a1
 DIST xscreensaver-5.38.tar.gz 10712548 BLAKE2B 02630aa7daa3faf8aa7ff453218bed5e3db287b7c4d9b564a6d8822db8b2e1ae6be7843342d585f2d2900d2bd0e7fd2a12d49748d81bf10818fa5bc4254f6ef8 SHA512 9014571505afd3a116f541334ea37737659f63f4cbb267a56be451e2c353d9e57218119670a44297d36d140672ea423d0682433401b17749138ab6baf6507561
 DIST xscreensaver-5.43-r1.tar.gz 26973508 BLAKE2B 67b57214e8a41ba895df6e9efcac3e712f24be06ee7914b38d3a8e639d4945c927c4ac28469d2180bc4a3999a4b89d2a60e633799ac5204c42fa17ad76dd21fc SHA512 7ccaf30fb05ae2110f742f1a5c99f83cd4c8e6749124066b5a418cf3e0ba1b8ff09858eeec29c11b0c8ea428b95b2916481c50cee6a5d952ec941b3ad1b6adcd
 DIST xscreensaver-5.44.tar.gz 27001826 BLAKE2B 102025aa2f57672ed3547f0e9bab989566fb8e50ecae8b9e4078ec5ee5de3cad09fec107695335ef236ad9fe19b2638978366a180a998d77b0ce8a2a5d1ebde3 SHA512 9d9144dec6f075c2d6a1c3cd45123a98d6d0cd732d6c3e3389e97b3f802b8f8765a188d1e35f97f123ca0a64661ea616b7b710577063c311da3d99d8439f1dae
-EBUILD xscreensaver-5.38-r2.ebuild 3499 BLAKE2B 4b64b1a22663fa8de879ea2a2dd92c94fcd6d6c3f1fbae60f75c145b9e77ae859d21dcc98fa429cbaa1aa17325e24f370ebc070c5465347f9fc789f7dc443ec0 SHA512 bd68c95113b0ae1beb5ace3a4fe42ca0aa059b0280889003f07b29a6ba68cb06a2000365edba3184eb95729641b15702a763ebbd843fb02f68fcf6d8a6f0ffc6
-EBUILD xscreensaver-5.43-r4.ebuild 3538 BLAKE2B 74500e2edc9c1e519ac669434b323104cb5b1aeac190811dccf7dbc2614451aecea78c800c64565d08aa484ea6dea47562bc95616db82a2a096c959e83fa22b2 SHA512 6386c97e86e9f15fe1c3203200c4031cb326575bec6ca4ec4a46507891e3de1c82a61cab7e7c348621a11f8de836c1ad6e1d7a35f78a3431c06bcd849c3b2b6f
-EBUILD xscreensaver-5.44-r3.ebuild 3862 BLAKE2B 8b3ee49a2059c8ec19624a8d10e28d8858bb6d6c88e92dea2a052fa146d30b65b5c2f8c69d0e1a85ef3e4dc6b1becab55de43eca1e0600fdb1f62f58b611993b SHA512 39ab8b1472e4313c22d151dc225da887e0574ccf10afbf648efe2081dc692e5c68c230bcde9783d08e2312467bf5bce10cad92a870a50f43fefa5974cc3af600
+EBUILD xscreensaver-5.38-r2.ebuild 3443 BLAKE2B 2a5fa4a422890e3e3ea18f6ee10dff40a2dfbed586ac458b9f18f05b8d996021897f6fe67e48a6dc96db4fd0afc8f054c82603afb3f42fcd65f72f1c1962bc6d SHA512 560287aff28cd946857648601711b6ee1e341568a82747a1545909a77b7b24b580d1302a381e422cbaa372190e73e04c99f54778301720676c3a36c72a22f1e6
+EBUILD xscreensaver-5.43-r4.ebuild 3482 BLAKE2B 44140f2417a75ff86d13e39cf855815136748b44dcd1e7ea1409dd9a4a8354d59dce77b91d28cf3eb83d0fc2391644ae954afe158546ff24199cf655f418515e SHA512 e388a0290a3ddf446e91115d84e50e447835abc88d871d280cb3ae3d073527965dee2dd5b9d82502697fe35d4c8c29a2233310d4832aaa40cae26008720ffa3a
+EBUILD xscreensaver-5.44-r3.ebuild 3801 BLAKE2B 27a96c054cc1084d2244094d06ca40438a2e3448db0b98a4fca7357ea70c8ab217a35a4ea2de9ed3a8361de22339b9b96e541a443eac4a45a52a6b565034016c SHA512 d1353b7a0998419adbdaa9707c35365b64e3cd10d1302a11bc1d58ff45aa572cfbd8487230e3ea326582ed3af7cb4ae08c7d1e74fdfc04eec96acd4bf58e763c
 MISC metadata.xml 870 BLAKE2B 222f0b24d94c2d9884848813bc9927312e23c670cb03d6427af4018c469b7ca81ab5d0887fa469ad60d05aff97f3b8b2df88158638213fbce24ea6d90c7d9f1a SHA512 0743dbc932e97530aede3f34519e1785bd186662619f46d212f4b4ae0b53bfa01875a3a58d2a30e7f7e6d93f1723211e5cf95018b86dd8e5ede5a37e4c238592
diff --git a/x11-misc/xscreensaver/xscreensaver-5.38-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-5.38-r2.ebuild
index c45519def6dc..a71b8a78af4e 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.38-r2.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.38-r2.ebuild
@@ -21,13 +21,8 @@ COMMON_DEPEND="
 	media-libs/netpbm
 	x11-apps/appres
 	x11-apps/xwininfo
-	|| (
-		(
-			x11-libs/gdk-pixbuf-xlib
-			>=x11-libs/gdk-pixbuf-2.42.0:2
-		)
-		<x11-libs/gdk-pixbuf-2.42.0:2[X]
-	)
+	x11-libs/gdk-pixbuf-xlib
+	>=x11-libs/gdk-pixbuf-2.42.0:2
 	x11-libs/gtk+:2
 	x11-libs/libX11
 	x11-libs/libXext
diff --git a/x11-misc/xscreensaver/xscreensaver-5.43-r4.ebuild b/x11-misc/xscreensaver/xscreensaver-5.43-r4.ebuild
index 4e00075ec571..e80dbdef6208 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.43-r4.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.43-r4.ebuild
@@ -21,13 +21,8 @@ COMMON_DEPEND="
 	media-libs/netpbm
 	x11-apps/appres
 	x11-apps/xwininfo
-	|| (
-		(
-			x11-libs/gdk-pixbuf-xlib
-			>=x11-libs/gdk-pixbuf-2.42.0:2
-		)
-		<x11-libs/gdk-pixbuf-2.42.0:2[X]
-	)
+	x11-libs/gdk-pixbuf-xlib
+	>=x11-libs/gdk-pixbuf-2.42.0:2
 	x11-libs/gtk+:2
 	x11-libs/libX11
 	x11-libs/libXext
diff --git a/x11-misc/xscreensaver/xscreensaver-5.44-r3.ebuild b/x11-misc/xscreensaver/xscreensaver-5.44-r3.ebuild
index 90d0de319c50..94304df08055 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.44-r3.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.44-r3.ebuild
@@ -34,13 +34,8 @@ COMMON_DEPEND="
 	x11-libs/libXxf86vm
 	caps? ( sys-libs/libcap )
 	gdk-pixbuf? (
-		|| (
-			(
-				x11-libs/gdk-pixbuf-xlib
-				>=x11-libs/gdk-pixbuf-2.42.0:2
-			)
-			<x11-libs/gdk-pixbuf-2.42.0:2[X]
-		)
+		x11-libs/gdk-pixbuf-xlib
+		>=x11-libs/gdk-pixbuf-2.42.0:2
 	)
 	gtk? ( x11-libs/gtk+:2 )
 	jpeg? ( virtual/jpeg:0 )
diff --git a/x11-misc/xsnow/Manifest b/x11-misc/xsnow/Manifest
index f03d6dcbf4bf..d72f69686d04 100644
--- a/x11-misc/xsnow/Manifest
+++ b/x11-misc/xsnow/Manifest
@@ -2,5 +2,5 @@ AUX xsnow-3.0.7-gamesdir.patch 317 BLAKE2B 747eb31910be55b1086e05f685d39118e274c
 DIST xsnow-1.42.tar.gz 56752 BLAKE2B b6feefa4aabc464097b099a0e48d27b9bd5d1b82bc02ca187ffd8ab810f3562c1d11ad01f18f79994699e1fb1fa520269976a35634388fbab2838e2e2bb122bd SHA512 7833f3c1834d64944a578dc71bbf09966d47a1b4878fb826cf121606e76c69544d96d73665572b45c47e0e017dd0cb0bf49f76799aeb859c1dc72348da4ff257
 DIST xsnow-3.0.7.tar.gz 322314 BLAKE2B 21c754daddb989a2f0771199d15342d0c08d23669525bbd9672537c200f7ff06d92708c256f2f89b483bb91947374195e4e95c2291425e630883cfe3b9898563 SHA512 1bc58d8c4542839ccc80c7612e472754f7471d2d72c61785b27d8a89d5e6826d40b892628bcea8c7dcfcf22e4c13db76a825a8c580a32f1ea74785f6c478fb79
 EBUILD xsnow-1.42-r2.ebuild 840 BLAKE2B 26e9758f489b23dc14b0bd8fb36a99f70ef559bfa0ecddfa53c30ea103cdfdd1caf739ad4644acce8ea6ac678a33cf23e93235a8aa03dc32df71855502fa4e90 SHA512 92e50bb5485cb268bac62d773447a40a696feffb7ad3ec05f7a5feed52812298cefb58a7a24bac341de7448c777d7607b2d277c9dad4d1d397af1d36696be476
-EBUILD xsnow-3.0.7.ebuild 654 BLAKE2B 045eacf2da33856e15119899be8f9b855be6595dbfd833738dd0ca0dc58b2e530df57f25f965734808af4e6efc55582eb486aef136c77ecf75cad2740a62e835 SHA512 fb96cf34290b6e8e94083490dc4dc19fcbc49406bb398ec6da55b70dd228a9e217a0d29db88ec563a2f769a4af43f8122bd4b847c580878ce6bdb80cdbd1bf74
+EBUILD xsnow-3.0.7.ebuild 653 BLAKE2B 9aa2d2ece2d50a442984d421e7b1f70dd0411c61f4f86d02f8f5f13ddc75b3303ba1e5def1b466f29d9901d08b076113323b231bd83be4c3a931391d86040467 SHA512 e0ee72b552ae33421680fddeb7c5cc3b6a2bd61e19209550bf72828af2f55f917f1da39f58ba6f4021fb0d6bf32df3f646db07bb249acdcf4cd25a2ab15f4b87
 MISC metadata.xml 220 BLAKE2B a2c3e050477292c8000b5bb0ffa26d84a57fb435ba5c96dac5c5f4d6f3e823c07116520102eacefd24227a4490dd340c7836cf8d1ba28d23fc76eeaadf04c7b9 SHA512 594861f664581733d740d9f501b84c56f9c9c67f932e97f5905a37d4f19b5a19ef4045c50571a412fbc64d318f3ad1d403ed37c61449b37e74df3d5753aedda8
diff --git a/x11-misc/xsnow/xsnow-3.0.7.ebuild b/x11-misc/xsnow/xsnow-3.0.7.ebuild
index 27ecfa5b733a..a45296577c28 100644
--- a/x11-misc/xsnow/xsnow-3.0.7.ebuild
+++ b/x11-misc/xsnow/xsnow-3.0.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 
 RDEPEND="
 	dev-libs/glib:2