gentoo resync : 04.07.2020

19 files changed, 174 insertions, 148 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 25d8bd969bb0..6594d51710f5 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/alacarte/Manifest b/x11-misc/alacarte/Manifest
index ab1a41e75362..1f1ae40022dc 100644
--- a/x11-misc/alacarte/Manifest
+++ b/x11-misc/alacarte/Manifest
@@ -1,5 +1,5 @@
 DIST alacarte-3.11.91.tar.xz 199128 BLAKE2B 711baf87d48b79cf52ad41bc9292c848a0f69477388580b9dddc068c8184178ae1e3c455a5b9ac6d99ef442d4b36544a45852aa134744379fc14b6c69c6a77df SHA512 b4b5ead4ba0b9742ea0530ecb5362afa970125d29750aaf147be6fd477f238b9c360307ce1df2a56330a69cd9c849a0dde4be44b36bf55377f42e30429411935
 DIST alacarte-3.36.0.tar.xz 201088 BLAKE2B 26c924a8a88c014358db38496cb8a20eca82e9b3d514a9feefa64db3674527cef454346c538a1cdb04ebbb384a64dee395738d8d2a19f4d2445e887f5714f8d6 SHA512 7406fef4c59f94f26d52ad6b52ddd8a5183e9ceb50834aecd5e83f60d996ab4efd09ecbc9d3568d65fe1dd9290e446b5c5c5f6ad89c7e81b0ef304d2a10476b9
 EBUILD alacarte-3.11.91.ebuild 1335 BLAKE2B baa5b6b922f92788c6dbe63ad969f6e512d66edd3fa62f821b6f0e3775861d32377af03132347e5ac610deb0e2170342f548d9f341f7aea2f60aaa8aa13a4b39 SHA512 9bf1bc0ce59f8ff04ec425850d720c7e8f9ec3d3bdfec7dbd1068d292b7fb332bfcb1185a8edcb5a16f8d1a2233b83ddd36290b6550ee5b2cd7ed65fdd14da53
-EBUILD alacarte-3.36.0.ebuild 816 BLAKE2B be5aae8b74cbd4103f05444f74e128b18f1cd92a4a3d7c50bd4b1e992382cdb48ed9c80cb493792a066fe4e88f2bfd96be85a44f55ae580fc1ee5d32f2efeb36 SHA512 5a9fb6fb699a72127fc505a4fc7b748a79903b9b01977adde6cc99de9dbb88507aa666db9fa59451d04f9fdc454adfae6468bd3d8b2f36636af5b35baa8b646c
+EBUILD alacarte-3.36.0.ebuild 815 BLAKE2B b3d51e668b90d5873f54e3efdbb172532b3319bc5bc7f2773b58f9f3d073a0dc5e80073a2efdf3dfca7ee131d427b97fece62d6b8974b7b5c0db8e156fc53ac6 SHA512 e7ec4db8ce9d82f9dc76fdd00fd58184286c9999861b7eba58f680c55d0500fbb89f74fb9610edc53007c6cbb0806a452c37eb5d978193d1142baacb79756976
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-misc/alacarte/alacarte-3.36.0.ebuild b/x11-misc/alacarte/alacarte-3.36.0.ebuild
index e0e0b3da6b06..f6c2b3f3d3a7 100644
--- a/x11-misc/alacarte/alacarte-3.36.0.ebuild
+++ b/x11-misc/alacarte/alacarte-3.36.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/alacarte"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index 0d630542b1e2..a27e7f1b1e0f 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -1,8 +1,8 @@
 AUX README.gentoo 494 BLAKE2B 8a92171cbc9e8a93cc5e73101bf478b27945e85f843ef244daea881f0aa061820645c425e52dd6a75adc0bd09c95126a059694bc7d5f6084e4f0222fc5e8ab85 SHA512 07e35ef0ac603b2b817c33fd2bc06b9b254a2e3fee16e7ec8fc0c86d27330c795b8d1eae660c42c414de4d721faea2cab1d41c5950ca7a1032d758626011ae3c
-AUX Xsession 1819 BLAKE2B 3d0502ca0d353c4bf16aec063dacde3a57da0062595821aaebd783fb568368b540cf1dfb2f9f888b3131238abac70e970081e59fed74e19f2380729c7f3de2b4 SHA512 f1f9264ef6103e66ced2d94bdb24dafb71a37ed8286b35536fa992d774f288bb9b8e338e184c955b39f0448da91af5d7c2d12c5536521186d8ee5db832e20e7e
+AUX Xsession 1921 BLAKE2B 9127e95c28d2a22f6a1d5f2997edf5997315667d20522c7a8b839fe492d576e0e69cf280ce2fea1fb8d4df61e3b254a38782dbd3c78fdc4ef79924b224311306 SHA512 efa046db5445464e7deb3c5aa43b1a2e1abb7ec0537d4040567d4d9932f15b954866cdd9c3a2bd703de9d7818d4fccff76008426061bc97dc342f7805cb645c1
 AUX lightdm-autologin 155 BLAKE2B 0236489d922c07cc84e17b403e746af052b9fcec1671c4b41184a26399ff8b310083c17959327eb752f8ff9ada04a7ff012ed6708c7ff50324dd0a3cef42efd8 SHA512 d09be0a61b7eea18a5c5977182362226e82a39b238c401f636bdf0a83381b97a16efc19e67be10b76854c95186dd65f539431d2352ce87a4e35dd1d40e388064
 AUX lightdm.service 279 BLAKE2B 92a9602d1d1c10fedfabd58b0794a68a278939d905f4d790ea9c2a0632abe8238a6187b3e01b4296a1187349864b30291853889ceaa519f5a12a98b2aecbb1ea SHA512 5b60788e35ebd7918b21ab52dc3f5cc29dd3aa45ddf6cfe75a72d1c541620f0438378a9bd681e2c151a465cf981e803b399f61b48ff5d0f2e1a3cc950c30d23a
 DIST introspection-20110205.m4.tar.bz2 1220 BLAKE2B 01483c1a7b73568e01cc4d84b43c4cd946aaaac0b5fa13aa27805fa17297112bfaabb1c5a34bd83d2ecdef2033b622dbd5e63914baacb8f6edf488a7396d26d9 SHA512 5c49239935b93d86cce68b577b43d1a56d8749ab5747029bfcfa67339697134be24ef29ba6c3d133b8c03e867864637c8eb61491a4b7f6bb1e56386ed66cb9be
 DIST lightdm-1.30.0.tar.xz 509220 BLAKE2B 5b6fcc6b955d7a7eb3a810a7e28707a812810d7f2568d6985a4411b1bf6f06b35ff721bd8a9388a85a4e4a64a39f5e30e86a9dbaa6d344e898ae49e9f39785ff SHA512 bca25a0aa73caf7d51e5882889a1707d2527470a170658c1be98ecfb96c8f85fd616494fc5bed658e744f91b9f8b0a98d2a0cf42f9c030242ae470c8a27145ce
-EBUILD lightdm-1.30.0.ebuild 4267 BLAKE2B a68f01ea8c9dc1725c859a7ba74627f57230c22669d4a090ac8704b28fdd56233d71a031ca0e7dd2e65ae5bdc9994b88fcc5707b2afd134f956b7d93782d0942 SHA512 782a2ab3242a1fbb202989f380cc6a625be99aea157f150a649ae41599dc00be941d70be1e0af32314db48445e00d783c6d3b54c4cc486286bc3ae837cf3a4ff
+EBUILD lightdm-1.30.0-r1.ebuild 4267 BLAKE2B a68f01ea8c9dc1725c859a7ba74627f57230c22669d4a090ac8704b28fdd56233d71a031ca0e7dd2e65ae5bdc9994b88fcc5707b2afd134f956b7d93782d0942 SHA512 782a2ab3242a1fbb202989f380cc6a625be99aea157f150a649ae41599dc00be941d70be1e0af32314db48445e00d783c6d3b54c4cc486286bc3ae837cf3a4ff
 MISC metadata.xml 462 BLAKE2B 8360d85d185558b5d6c3b2d18d5210c532537d1cc93007b0f0b91d37b388d02c966dda14c298ff8c3b47bd39696b332f989fffa6e1a68001116ddd69141b21d6 SHA512 d76a144235e233e46103c3f10ee64d3b5306b82220366e006671851dc725027ddbf600ca8fab8370c7fca3b09182cd7c85b458d79e7ddca681f279909f4737ba
diff --git a/x11-misc/lightdm/files/Xsession b/x11-misc/lightdm/files/Xsession
index 50ce80fd3e19..1fe0110c9d9b 100644
--- a/x11-misc/lightdm/files/Xsession
+++ b/x11-misc/lightdm/files/Xsession
@@ -5,36 +5,36 @@
 echo "Running X session wrapper"
 
 # Load profile
-for file in "/etc/profile" "$HOME/.profile" "/etc/xprofile" "$HOME/.xprofile"; do
-    if [ -f "$file" ]; then
-        echo "Loading profile from $file";
-        . "$file"
+for file in "/etc/profile" "${HOME}/.profile" "/etc/xprofile" "${HOME}/.xprofile" ; do
+    if [ -f "${file}" ] ; then
+        echo "Loading profile from ${file}";
+        . "${file}"
     fi
 done
 
 # Load resources
-for file in "/etc/X11/Xresources" "$HOME/.Xresources"; do
-    if [ -f "$file" ]; then
-        echo "Loading resource: $file"
-        xrdb -nocpp -merge "$file"
+for file in "/etc/X11/Xresources" "${HOME}/.Xresources" ; do
+    if [ -f "${file}" ] ; then
+        echo "Loading resource: ${file}"
+        xrdb -nocpp -merge "${file}"
     fi
 done
 
 # Load keymaps
-for file in "/etc/X11/Xkbmap" "$HOME/.Xkbmap"; do
-    if [ -f "$file" ]; then
-        echo "Loading keymap: $file"
-        setxkbmap `cat "$file"`
+for file in "/etc/X11/Xkbmap" "${HOME}/.Xkbmap" ; do
+    if [ -f "${file}" ] ; then
+        echo "Loading keymap: ${file}"
+        setxkbmap $(cat "${file}")
         XKB_IN_USE=yes
     fi
 done
 
 # Load xmodmap if not using XKB
-if [ -z "$XKB_IN_USE" ]; then
-    for file in "/etc/X11/Xmodmap" "$HOME/.Xmodmap"; do
-        if [ -f "$file" ]; then
-           echo "Loading modmap: $file"
-           xmodmap "$file"
+if [ -z "${XKB_IN_USE}" ] ; then
+    for file in "/etc/X11/Xmodmap" "${HOME}/.Xmodmap" ; do
+        if [ -f "${file}" ] ; then
+           echo "Loading modmap: ${file}"
+           xmodmap "${file}"
         fi
     done
 fi
@@ -48,27 +48,27 @@ command="$@"
 
 # Run all system xinitrc shell scripts.
 xinitdir="/etc/X11/xinit/xinitrc.d"
-if [ -d "$xinitdir" ]; then
-    for script in $xinitdir/*; do
-        echo "Loading xinit script $script"
-        if [ -x "$script" -a ! -d "$script" ]; then
-            . "$script"
+if [ -d "${xinitdir}" ] ; then
+    for script in ${xinitdir}/* ; do
+        if [ -x "${script}" ] && [ ! -d "${script}" ] ; then
+            echo "Loading xinit script ${script}"
+            . "${script}"
         fi
     done
 fi
 
 # Load Xsession scripts
 xsessionddir="/etc/X11/Xsession.d"
-if [ -d "$xsessionddir" ]; then
-    for i in `ls $xsessionddir`; do
-        script="$xsessionddir/$i"
-        echo "Loading X session script $script"
-        if [ -r "$script"  -a -f "$script" ] && expr "$i" : '^[[:alnum:]_-]\+$' > /dev/null; then
-            . "$script"
+if [ -d "${xsessionddir}" ] ; then
+    for i in $(ls ${xsessionddir}) ; do
+        script="${xsessionddir}/${i}"
+        if [ -r "${script}" ] && [ -f "${script}" ] && expr "${i}" : '^[[:alnum:]_-]\+$' > /dev/null ; then
+            echo "Loading X session script ${script}"
+            . "${script}"
         fi
     done
 fi
 
-echo "X session wrapper complete, running session $@"
+echo "X session wrapper complete, running session ${@}"
 
-exec $command
+exec ${command}
diff --git a/x11-misc/lightdm/lightdm-1.30.0.ebuild b/x11-misc/lightdm/lightdm-1.30.0-r1.ebuild
index ea3868227341..ea3868227341 100644
--- a/x11-misc/lightdm/lightdm-1.30.0.ebuild
+++ b/x11-misc/lightdm/lightdm-1.30.0-r1.ebuild
diff --git a/x11-misc/obmenu-generator/Manifest b/x11-misc/obmenu-generator/Manifest
index 9cfd350f42d1..184eb982372f 100644
--- a/x11-misc/obmenu-generator/Manifest
+++ b/x11-misc/obmenu-generator/Manifest
@@ -1,7 +1,3 @@
-DIST obmenu-generator-0.85.tar.gz 20558 BLAKE2B 526657eb9fc7ed0adc3681809d0f8b763f5faf7b2cb578962e1c2ab2e2bd488f386bcd6e7bf45e5752a2d339048af37f05bf31ef3947c2a9642f15e99db00eac SHA512 d6925ec8c2b75eec12bc23840799cedf4b882787b62a6b8814ca6c8b3bc5d22d2b8a4510fa6829d66541923caf3163a85eefc068a96ead631a3200467c563545
-DIST obmenu-generator-0.87.tar.gz 20648 BLAKE2B ba4f223c61cc380aa510d02c640e0694a6235a06cd44db0b6f929730747ff8f7f62842c545a8684a00fe31fa990ec7ce8488f8b2efd45cbd5852803c3c81ce99 SHA512 dfbe9e2f1565c7f02c08885ac9980fd35e6d698208f813d62cf97a34befe16987e0fca29429fce006bafbb8bd04a05c63e1a109d70bb757240199b8a970ba55e
 DIST obmenu-generator-0.88.tar.gz 20569 BLAKE2B 0b17a3d379f6a92e08dd1f2e6d943e4d30f669c11847ad1354f44c41e8d3714b174fe6194a4b952664e9cc8408080ba236871b83e9f2498f5d337bc6498e92ec SHA512 650915562792b20cb39175cf2e7d11141eba24e3345cb54e5400a18f324f6fdacc4008d57d091a3ee64a36ebcf4548d0c8328e6a2dbc62613c7001b97e10332a
-EBUILD obmenu-generator-0.85-r1.ebuild 611 BLAKE2B f1ba98e0e35fe7e5c64a1104ad84649a0b4b7d74115ed0b3ede21cf63aa684188cdbd3117c3c4cfeef5f355b0d5efb594e49eba3e5bb28f2addb3e86fb72202c SHA512 1812382a1700870dead875fea637f784215b0a5602b5605c8f80246b0526f8bde03cfdf5dc8a774169feca204a39b66c60735261a1ed24d4a8223b1b34441f7b
-EBUILD obmenu-generator-0.87.ebuild 803 BLAKE2B d5820e0ebad344ab6fab057998f1d49c4cd34cddb3185652c7fe53d54722770544963f5e805199572ef19b0f905cd0b6dabf23fe4e9059cdd48f802fd938c8c1 SHA512 eeea5f32515a83c28c2e707db14b82f71b54decf37d9f002f41dbb5e42cd187f0ec590929c67cfa71d3c67477f1beedebe6a9cd8fc412fa8566d6cd376c4d02e
 EBUILD obmenu-generator-0.88.ebuild 803 BLAKE2B d5820e0ebad344ab6fab057998f1d49c4cd34cddb3185652c7fe53d54722770544963f5e805199572ef19b0f905cd0b6dabf23fe4e9059cdd48f802fd938c8c1 SHA512 eeea5f32515a83c28c2e707db14b82f71b54decf37d9f002f41dbb5e42cd187f0ec590929c67cfa71d3c67477f1beedebe6a9cd8fc412fa8566d6cd376c4d02e
 MISC metadata.xml 445 BLAKE2B 6f47ae8ef7c079b03a0e8769bcf6ea35b0743dfb8f94f7ee99eba54f0dd1e66ac12a1d9198ffa246601965d02a0260ef667c4b48bac243fa1c82afe0e094be1d SHA512 8cf342329f67576b238d72043cc6485628f78874ee2a0ec54c0cba8e99ed5eeb0348c75396f035c82f6d3dbb501e338d090cca8bacd0a9c8ac969cf9e4de9d67
diff --git a/x11-misc/obmenu-generator/obmenu-generator-0.85-r1.ebuild b/x11-misc/obmenu-generator/obmenu-generator-0.85-r1.ebuild
deleted file mode 100644
index aa0f48f2db97..000000000000
--- a/x11-misc/obmenu-generator/obmenu-generator-0.85-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A fast pipe/static menu generator for the Openbox Window Manager"
-HOMEPAGE="https://github.com/trizen/obmenu-generator"
-SRC_URI="https://github.com/trizen/obmenu-generator/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-lang/perl[gdbm]
-	dev-perl/Data-Dump
-	dev-perl/Gtk2
-	>=dev-perl/Linux-DesktopFiles-0.90.0
-	x11-wm/openbox
-"
-
-src_install() {
-	dobin ${PN}
-
-	insinto /etc/xdg/obmenu-generator
-	doins schema.pl
-
-	dodoc README.md
-}
diff --git a/x11-misc/obmenu-generator/obmenu-generator-0.87.ebuild b/x11-misc/obmenu-generator/obmenu-generator-0.87.ebuild
deleted file mode 100644
index d00c2b742b88..000000000000
--- a/x11-misc/obmenu-generator/obmenu-generator-0.87.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils
-
-DESCRIPTION="A fast pipe/static menu generator for the Openbox Window Manager"
-HOMEPAGE="https://github.com/trizen/obmenu-generator"
-SRC_URI="https://github.com/trizen/obmenu-generator/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-lang/perl[gdbm]
-	dev-perl/Data-Dump
-	>=dev-perl/Linux-DesktopFiles-0.90.0
-	x11-wm/openbox
-"
-
-src_install() {
-	dobin ${PN}
-
-	insinto /etc/xdg/obmenu-generator
-	doins schema.pl
-
-	dodoc README.md
-}
-
-pkg_postinst() {
-	elog "For icon (-i) functionality, install:"
-	optfeature "support via gtk+:2 (default)" dev-perl/Gtk2
-	optfeature "support via gtk+:3 (enabled via config)" dev-perl/Gtk3
-}
diff --git a/x11-misc/projecteur/Manifest b/x11-misc/projecteur/Manifest
index d8145dd612fb..6c033e3ef455 100644
--- a/x11-misc/projecteur/Manifest
+++ b/x11-misc/projecteur/Manifest
@@ -1,6 +1,6 @@
 AUX projecteur-0.7-fix-git-detection.patch 1740 BLAKE2B 18087fca44642910cc7b16902d10f295b55e00965d1104a5a293728d2ef5514cd2da0f0e1535662ce5385c604111d6b8ba56835b28a5e11811d59c51a76c0ff7 SHA512 f45928c0787e107c49364d2a9bf207f39f55f16278888baee5335a50ec6ec98e7c49f4734da65cf729482396b2d4297acdcef72ee101ac4113f0870bb9357918
 DIST projecteur-0.7.tar.gz 296252 BLAKE2B fb20de48ee5f89e66701fc8d6cad036aed48ed862994b82431a8a14f3ec95dccb863c4c35a5de01c932150b3b311511ef01af093ddbcd23a2413ebb882152bab SHA512 9af54e47883cd3d9368edef173b9c0eb522f947f7d72f759388e2ecdf275524bdf56d3562506a383bba32c0fd2ec5c76c232a7b523e13b79caeb4d6d76bbbac0
 DIST projecteur-0.8.tar.gz 379203 BLAKE2B b2171bd6120c9f6245c129519e33adbb4661ea4cd0df5f30c6c90fbefb8b7c5024da5c6d920d4e162b818bc0fc6417731dcf0c540103ed6f12976123c45c69eb SHA512 e892e87f442cfa7f0102efa01b43e63ed7ea9c30c875496dd3d683ee769de66f0a4ccfae149f060924e5613dfd7758a0b19d565232fb6db75b9228cee4a956de
-EBUILD projecteur-0.7-r2.ebuild 856 BLAKE2B 52b26bc65c88c0a8bc4d178f91c5c1ea263e928a440689def22c55e55529c6d59a00aeab3ab04aee41106d4d7b6f3e3abd3b3966157c1c152b29b1b90966c50b SHA512 fe93fa0857c2b633965dde8ac1f3cc2df5578e3fd5aab4b763dc78017b93f4decf257b9551e2ff3e958dc849e9b3d06fc2dc9a9d997e2321e73befd8f6cd7a3d
+EBUILD projecteur-0.7-r2.ebuild 855 BLAKE2B 4cf9f3ff4809e03d5aeab30f10c96dc20c134eb1e5c81baa075583f01d0b62a669a385501f107d606825865f5cac38963b8f3033aaf77ddbd3937d3a0f08c6a1 SHA512 f5a8e094d1e181a3437f41b1f1b9a9028667c2e7d7d5dfe1fc2ebb923c810fe9a675b7b94c947cb9d477a14721994cd873d0a0828cdece8f1793bf4b86165335
 EBUILD projecteur-0.8.ebuild 805 BLAKE2B 1ba5091382d294db067f0e4eb6c8e728d29a4d885e6db4d4ccd9aab31dbec9844edded5d0a4beadcb7c219b441a27aae52fd876a79bbfc33c0cbc720d44bd82a SHA512 4cd17f53e08c7caf60ae5a82d3f669dc4c52e8d20caf69b9ab16954ad071de646dc71c5911ff5a799561d8b0f2decb2f4049a3fc5aaa2b8654e79e64188dd0e5
 MISC metadata.xml 612 BLAKE2B 84ebf5cc3be489a0f7483e81b43dcee7067ec325a8a6c58f2350107921d0844bc7d084d7a35cddc95296c2f1046c4e098fed2b8748f0834df90c152dcd70e91e SHA512 d51be761cc4f93a47230bb63685fb367d7b0846b048733d192c6e36e9ac87f49cfcc28631ab4980dbc50213a9bbe23d3b0db665c5257e1e0e79804d9752e822c
diff --git a/x11-misc/projecteur/projecteur-0.7-r2.ebuild b/x11-misc/projecteur/projecteur-0.7-r2.ebuild
index 63ce3fd4425e..26072768e67e 100644
--- a/x11-misc/projecteur/projecteur-0.7-r2.ebuild
+++ b/x11-misc/projecteur/projecteur-0.7-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jahnf/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 
diff --git a/x11-misc/splatmoji/Manifest b/x11-misc/splatmoji/Manifest
index a2f893561514..586ae685fe87 100644
--- a/x11-misc/splatmoji/Manifest
+++ b/x11-misc/splatmoji/Manifest
@@ -1,4 +1,3 @@
 DIST splatmoji-1.0.tar.gz 407506 BLAKE2B 5e2ac158501c29b013249eb9e4e509afd5b2418ce3975bc1f4e1739ac92227ca135ade6e4bd328400d337414befc7e413f76ce5a87a9cedcfcaec293e2439d1d SHA512 71d7d1895570cd85c5cc7896d165b8aa7444a89eb8d99c2e10a977bec38853e03ba707231551bc763add260d3c3bc8e0553b561204cb8f88d384870b7dba7fa0
 EBUILD splatmoji-1.0.ebuild 567 BLAKE2B 9e2ff2c4af3c9b4226c53fcc98fb2ff9d4437299dd9519705ade5ab66944b2b606c481f6055bc1f1344046a2505684d60dce1c4083fb1483bb6934854e1660ef SHA512 6883d0bb93191fb26aa5238a481a0eaca5409b77fbeab690b546f46156901b4846d2c6d558434154f2477f88862bad2541219961372eae97ed1ab6a34938224c
-EBUILD splatmoji-9999.ebuild 534 BLAKE2B aa860eb6c7c9f470faa2056533802f9ce4c6f5d32e9b9308939a5b50779d47170e20a87a8932666c7c1a430553ce251557b94f5c2d5752c7839c66ba60eb4cea SHA512 f32babfbbda126e11e367a8b56a6a55e575d86eb6913ee9adeca25a6a3688e9e8fe47b2740ab4af007028887d891899217fe9cf19bbde2ab5f09e18de6ab78fd
 MISC metadata.xml 612 BLAKE2B ca9e33ad1b59ef01ed77aa8c09053544b1e184009bf499fa105ce7cf23d87baa2943b44549f27c77e02f2f4fd58dbfcbbf8412b06d6364df3d45404f256fc231 SHA512 8a2e21d68bb4e70b8899c91f2a47276808130f57037d91373356077643c653736639e72f24c2c6aba0f8154f3dfe636b9eedeb5b8d16108e767f066a89b1c21b
diff --git a/x11-misc/splatmoji/splatmoji-9999.ebuild b/x11-misc/splatmoji/splatmoji-9999.ebuild
deleted file mode 100644
index fddb2298aa4c..000000000000
--- a/x11-misc/splatmoji/splatmoji-9999.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Quickly look up and input emoji and/or emoticons"
-HOMEPAGE="https://github.com/cspeterson/splatmoji/"
-EGIT_REPO_URI="https://github.com/cspeterson/splatmoji.git"
-
-LICENSE="MIT"
-KEYWORDS=""
-SLOT="0"
-
-RDEPEND="
-	app-shells/bash
-	x11-misc/rofi
-	x11-misc/xdotool
-	x11-misc/xsel"
-
-src_install() {
-	dobin splatmoji
-	insinto /etc/xdg/splatmoji
-	doins splatmoji.config
-	insinto /usr/share/splatmoji
-	doins -r data
-}
diff --git a/x11-misc/sunflower/Manifest b/x11-misc/sunflower/Manifest
index 93409ddfd5a6..2697dd0284fd 100644
--- a/x11-misc/sunflower/Manifest
+++ b/x11-misc/sunflower/Manifest
@@ -1,6 +1,6 @@
 AUX sunflower 82 BLAKE2B f0ff1d683ac90ce80d4c9aa168681829f44cbdf94d95bc35441fc82d3fe2db57ece7a4e564d99990de901e6a01e7b8013a840717a67ef798d34a08c9ebea03d4 SHA512 5e9685e8e2d8933e9b3bb2f3dc92ad677f38b63766bdb407cef7373590ed8d0e73aebd1ed6e489b39c8b1477c50657df499a7b5e50c09df1e675448dcad7f62c
 DIST sunflower-0.2-59.tgz 790126 BLAKE2B 32df1ced73ba0bf5e814e52010eefbbd10657bdbb602dd3a48dc08b865195c3d1efa631bfe2d421f0a12a2f01521a2c6248fe5b9ca8fcc268423f0c9aa3d252d SHA512 e97076eb1c57d52b8fd95501259acaaa9a429f9daacc30ef587cce2f3419433f5aa4554e0e86beeceda208b4be425b98c64c6ced04e36e86b2b4f803176c37f9
 DIST sunflower-0.3.61.tar.gz 975053 BLAKE2B 5845ce0e81cf98b7488c9c34b8a3b6702e01abe9976bd4186691ce3804164d707d3ca999896e3f8d60e5253891d94f39e2fabdb50170afa8ec0f937df141db89 SHA512 f55c2fb15889f903375776f989498827dcab287e87d4015c50f12780dd2f0271e1e127533a10ca94f44ebd44727018917cf92e828bbe82b7653d8ed559ee1cc3
-EBUILD sunflower-0.2_alpha59.ebuild 2181 BLAKE2B 227baca89b619f4a135b4512c89870fd6f8da2f3a283ca92da0cc6ecbb1e2302e1a08406bc9cdc07a4d1cbeb78b91cecf9b8f7dd1c425053bb7b32807337d3b2 SHA512 3797f36f11bcfc52ca8609302535ef9630005a9ba3ef44be50e2cc9aeea70ba226c1f6d61af3b1a9929c7c168b35c0b23dc038cf5c20151c07f55bbb16cf347f
-EBUILD sunflower-0.3.61.ebuild 2246 BLAKE2B df05d167049622e22af106eda9da2c6b059da3b6c99a43b512a5ff8344e73fef6a7e7d4b2223660e60ec9b6ff35449ef38d746a3d9e93a9b0168d6b82dc11020 SHA512 69d28c2d545b004b4a8d89eb9e0db9997ccc5d1d84a6b248317ccc18430220776fa1630946d24b2ad0c090132d503553284c19509659e3f5bde07d166187d269
+EBUILD sunflower-0.2_alpha59.ebuild 2179 BLAKE2B 9190ab3dc2703b4dd1b56e3a3bd0067335d9497a4be13e8a343355c7d16d2fe3608b21a6ca1e5b4b3e3de302de79779e3a5a8436903de14a582222e396e86369 SHA512 eb5ca2f8be41572ba390286c60c687aa6b91c48bb1babdf8535e92fc1a93f496d4174e352593bb07385a9df550893a23700e0ae91f83171355f1dd7ba4f720eb
+EBUILD sunflower-0.3.61.ebuild 2247 BLAKE2B 2ed58a4bd560cd12594c7b366c593831b16c06ff54c41cda233b42fb4ec612430748089fe946c4f7b5dafc7913f6c3c827a71c8ea718a5b708ec3d6b352b5cc3 SHA512 d9134e077c77b072f1bbcb95d672d06e669f3d38b155d4f53474f3f9b9364081b0dac992e2a1f63436d4b0b269ba456fa79675bb62f59bcaaecbcd060cd7055b
 MISC metadata.xml 331 BLAKE2B 16f51cce07665f2b4c089d6831dc0b4640e7b21d2415f4bdf644afbd19242cf4c7b45fd62ea937fb75b30d8b948940ad66f1fdead711bbd83ef50a2638b401d2 SHA512 dab5d495adda997004324ba91ded752f50eaaf1c6392f8943d48d54c5cd3363137dd4d742a7b939e5affe3d3e805ed393c9397797dce1c820d4e596f7f2aeaf8
diff --git a/x11-misc/sunflower/sunflower-0.2_alpha59.ebuild b/x11-misc/sunflower/sunflower-0.2_alpha59.ebuild
index 848b84a56f6f..d1fea9c5a0c7 100644
--- a/x11-misc/sunflower/sunflower-0.2_alpha59.ebuild
+++ b/x11-misc/sunflower/sunflower-0.2_alpha59.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit gnome2-utils python-r1 xdg-utils
 MY_PN="Sunflower"
 DESCRIPTION="Small and highly customizable twin-panel file manager with plugin-support"
 HOMEPAGE="https://github.com/MeanEYE/Sunflower
-	http://sunflower-fm.org/"
+	https://sunflower-fm.org/"
 SRC_URI="http://sunflower-fm.org/pub/sunflower-${PV/_alpha/-}.tgz"
 
 LICENSE="GPL-3"
diff --git a/x11-misc/sunflower/sunflower-0.3.61.ebuild b/x11-misc/sunflower/sunflower-0.3.61.ebuild
index a556eff77ba3..e632d371fb25 100644
--- a/x11-misc/sunflower/sunflower-0.3.61.ebuild
+++ b/x11-misc/sunflower/sunflower-0.3.61.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ MY_PV=$(ver_rs 2 '-')
 
 DESCRIPTION="Small and highly customizable twin-panel file manager with plugin-support"
 HOMEPAGE="https://github.com/MeanEYE/Sunflower
-	http://sunflower-fm.org/"
+	https://sunflower-fm.org/"
 SRC_URI="https://github.com/MeanEYE/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/x11-misc/xnee/Manifest b/x11-misc/xnee/Manifest
index 334a44f73444..e6bdcd40f148 100644
--- a/x11-misc/xnee/Manifest
+++ b/x11-misc/xnee/Manifest
@@ -1,4 +1,5 @@
 AUX xnee-3.18-linker.patch 273 BLAKE2B 11c8552d2543879edf599dc0d9b820d5283abeba0edbc850079f268a92e95a26c28f90b119dff4f461d181b18dbad7493751b6964d20a9e1dcff6ba7d6ae8601 SHA512 2223bcd952b828d0704b3e3a0f3d55742a9837753187e4a8df84b6fa40a272174506de9341894b56024d9ac81ab1fff326012c13a3dedd0921dc7802e36761f0
+AUX xnee-3.19-libgnomeui-only-for-applets.patch 3491 BLAKE2B e11ab2405e5321b30c10b35b581a4c621fd17275f1384286cc6a398cd638e6d4e99b2bc0d8a10fe409ee66ae12a15291ab19a7610bb65e724d36c77896de5de7 SHA512 7c6557957c44ce546983a1c900eb37979d44b99606414fe1338716d9775374c5e24bfc279beccdf8be03ce3534819e736401747c7f9c38e2b0feba1fc7e2cfe8
 DIST xnee-3.19.tar.gz 1893109 BLAKE2B 17f416d06dac092c79d4c9838e0f69219e617d695d7c56bee8c84cdf6a5de7e3f02eb1dc9f9f278e78ebf4090893557ede30b2cd5039acafcd743cff11e5602b SHA512 a4a82839a4597b0d7f5b65ad76092f03eb5c665d36298505a320475daacbf66f30b022c04284ce8795360e4481fdfb1d9138f0b8b173b66d23b7f1542d0acbe8
-EBUILD xnee-3.19-r1.ebuild 1489 BLAKE2B c10e91bde193dd4dc73034ae58f25153e1e8ce5de9a5e83e8650bb5fe74a8f38b928d378807bc8f228fe5e50836e318eff5a371cdc4f3c1a2b368411770ebcfa SHA512 98abc0d6dba1739e42aa063a1527e6c9f550b8bbbbfa8a38d7b05cdc0f4b949cda36fc85ca031e25ff2bf5def00b0647e63dbb9f1155228e42ee7a58e60658c5
+EBUILD xnee-3.19-r2.ebuild 1508 BLAKE2B ad53866e527588047339dcfcf4e71b04783fecd828f6d388948d784b0c7bb26fce71d513db1f9b7444e068f566abfc296fdba15841d11a6aa807ab052820e6e5 SHA512 479ac8adac9e6f4863836a7c2e49a695f933a5a42383b6f72a1732e0dc4e17683c733c823f903567cb8fe648e686aa100806e038192d30f80fce353d2249b679
 MISC metadata.xml 318 BLAKE2B e2fde4c35c72439790ea9e4c0e403f1a0666a7ebc8e9f350b29138d01c171765fac8cd6adee54667bbc19921e6fc976a427c3429464769a02d9e8dc8c83a8925 SHA512 7d56445a5c7fffdc1104633cdd30eafa17588079b8a1f4cb226984b1aad4e41fe84320608681143dc01c5f1ac5f104cf0717e8183164031644220f9c61086a3b
diff --git a/x11-misc/xnee/files/xnee-3.19-libgnomeui-only-for-applets.patch b/x11-misc/xnee/files/xnee-3.19-libgnomeui-only-for-applets.patch
new file mode 100644
index 000000000000..4e80dacd20b0
--- /dev/null
+++ b/x11-misc/xnee/files/xnee-3.19-libgnomeui-only-for-applets.patch
@@ -0,0 +1,117 @@
+--- a/configure.in	2014/05/06 14:13:59	1.134
++++ b/configure.in	2018/01/01 23:06:56	1.135
+@@ -382,62 +382,63 @@
+     fi
+ 
+ 
+-    GNOMEUI2_MODULE="libgnomeui-2.0"
+-    GNOMEUI2_VERSION="2.0.0"
+-
+-
+-    if `$PKGCFG --exists  $GNOMEUI2_MODULE >= $GNOMEUI2_VERSION`
+-    then	
+-	GTK_MODULES="$GTK_MODULES $GNOMEUI2_MODULE" 
+-	GTK_ERR=1
+-    fi
+-
+-    libgnomeui_CFLAGS=`$PKGCFG --cflags $GNOMEUI2_MODULE `
+-    libgnomeui_LIBS=`$PKGCFG --libs $GNOMEUI2_MODULE `
+-
+-
+-    AC_SUBST(libgnomeui_CFLAGS)
+-    AC_SUBST(libgnomeui_LIBS)
+-
+     PIXMAP_DIR=pixmap
+ 
+-
+-    if test x$buildgapplet = xtrue ; 
++    if test x$buildgapplet = xtrue; 
+     then   
+-    
+-      if test x$GTKCONF = x ; 
+-      then
+-  	echo " **************************************** "
+-  	echo " * WARNING, missing program: gtk-config *"
+-  	echo " **************************************** "
+-  	echo ""
+-  	echo "     On Debian based distros, install sth like: libgtk2.0-dev"
+-  	echo ""
+-  	echo "However, I will try my best to continue without gtk-config. "
+-  	echo "Will not be able to check for gtk/gnome header files properly"
+-  	echo "On most platforms this implies no problem"
+-  	echo ""
+-      else	
+-        GTK_PREFIX=`$GTKCONF --prefix`
+-        GTK_INC_PATH=$GTK_PREFIX/include/$GNOMEUI2_MODULE/
+-        GNOME_H_FILE=$GTK_INC_PATH/gnome.h
+-  
+-        ls -l $GNOME_H_FILE 2>/dev/null >/dev/null
+-
+-        MISSING_GNOME_H=$?
+ 
+-        if test x$MISSING_GNOME_H != x0  ; 
++        GNOMEUI2_MODULE="libgnomeui-2.0"
++        GNOMEUI2_VERSION="2.0.0"
++        
++        
++        if `$PKGCFG --exists  $GNOMEUI2_MODULE >= $GNOMEUI2_VERSION`
++        then	
++	    GTK_MODULES="$GTK_MODULES $GNOMEUI2_MODULE" 
++	    GTK_ERR=1
++        fi
++        
++        libgnomeui_CFLAGS=`$PKGCFG --cflags $GNOMEUI2_MODULE `
++        libgnomeui_LIBS=`$PKGCFG --libs $GNOMEUI2_MODULE `
++
++        
++        AC_SUBST(libgnomeui_CFLAGS)
++        AC_SUBST(libgnomeui_LIBS)
++        
++        
++        
++        if test x$GTKCONF = x ; 
+         then
+-  	  echo "Missing GNOME header file (gnome.h), you need to install development packages"
+-	  echo "On a Debian based distro system do:"
+-  	  echo ""
+-  	  echo "     sudo apt-get install libgnome2-dev"
+-  	  echo ""
+-echo  	  exit 1
+-        fi	
+-      fi
+-  
+-  fi
++  	    echo " **************************************** "
++  	    echo " * WARNING, missing program: gtk-config *"
++  	    echo " **************************************** "
++  	    echo ""
++  	    echo "     On Debian based distros, install sth like: libgtk2.0-dev"
++  	    echo ""
++  	    echo "However, I will try my best to continue without gtk-config. "
++  	    echo "Will not be able to check for gtk/gnome header files properly"
++  	    echo "On most platforms this implies no problem"
++  	    echo ""
++        else	
++            GTK_PREFIX=`$GTKCONF --prefix`
++            GTK_INC_PATH=$GTK_PREFIX/include/$GNOMEUI2_MODULE/
++            GNOME_H_FILE=$GTK_INC_PATH/gnome.h
++            
++            ls -l $GNOME_H_FILE 2>/dev/null >/dev/null
++            
++            MISSING_GNOME_H=$?
++            
++            if test x$MISSING_GNOME_H != x0  ; 
++            then
++  	        echo "Missing GNOME header file (gnome.h), you need to install development packages"
++	        echo "On a Debian based distro system do:"
++  	        echo ""
++  	        echo "     sudo apt-get install libgnome2-dev"
++  	        echo ""
++                echo  	  exit 1
++            fi	
++        fi
++        
++    fi
+ fi
+ 
+ 
diff --git a/x11-misc/xnee/xnee-3.19-r1.ebuild b/x11-misc/xnee/xnee-3.19-r2.ebuild
index 0d71add730d5..0a3540a531d3 100644
--- a/x11-misc/xnee/xnee-3.19-r1.ebuild
+++ b/x11-misc/xnee/xnee-3.19-r2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools desktop flag-o-matic
 
 DESCRIPTION="Program suite to record, replay and distribute user actions"
@@ -10,8 +11,8 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="gnome static-libs xosd"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnome xosd"
 
 RDEPEND="
 	x11-libs/libX11
@@ -22,14 +23,14 @@ RDEPEND="
 	x11-libs/libXtst
 	x11-libs/libxcb
 	gnome? (
-		x11-libs/gtk+:2
-		>=gnome-base/libgnomeui-2
 		>=gnome-base/gconf-2
+		x11-libs/gtk+:2
 	)
 "
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}
 	x11-base/xorg-proto
+"
+BDEPEND="
 	virtual/pkgconfig
 	sys-devel/gettext
 	gnome? ( virtual/imagemagick-tools[jpeg,png] )
@@ -38,8 +39,12 @@ DEPEND="
 # This needs RECORD extension from X.org server which isn't necessarily
 # enabled. Xlib: extension "RECORD" missing on display ":0.0".
 RESTRICT="test"
+
+DOCS=( AUTHORS BUGS ChangeLog FAQ NEWS README TODO )
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.18-linker.patch
+	"${FILESDIR}"/${P}-libgnomeui-only-for-applets.patch
 )
 
 src_prepare() {
@@ -51,23 +56,22 @@ src_configure() {
 	append-cflags -fcommon
 	econf \
 		$(use_enable gnome gui) \
-		$(use_enable static-libs static) \
 		$(use_enable xosd buffer_verbose) \
 		$(use_enable xosd verbose) \
 		$(use_enable xosd) \
 		--disable-gnome-applet \
+		--disable-static \
 		--disable-static-programs \
 		--enable-cli \
 		--enable-lib
 }
 
 src_test() {
-	Xemake check
+	virtx emake check
 }
 
 src_install() {
 	default
-	dodoc AUTHORS BUGS ChangeLog FAQ NEWS README TODO
 	use gnome && make_desktop_entry gnee Gnee ${PN} "Utility;GTK"
 	find "${ED}" -name '*.la' -delete || die
 }