gentoo resync : 05.02.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-02-05 18:44:56 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-02-05 18:44:56 +0000
commit: 29aabba0ea759c6a2864ff5631735b67ee38e5e0 (patch)
tree: ab466b4dfa7abecb401b2f8039d08af4689306bb /x11-misc
parent: d42200bec37eef2a7478d88988ff00addd0a9202 (diff)
164 files changed, 1408 insertions, 340 deletions
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 06c37e16719c..e434794a7f3d 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/arandr/Manifest b/x11-misc/arandr/Manifest
index 6435a881ae14..fe7676338206 100644
--- a/x11-misc/arandr/Manifest
+++ b/x11-misc/arandr/Manifest
@@ -1,5 +1,3 @@
 DIST arandr-0.1.10.tar.gz 100203 BLAKE2B b5754dda4c4f9c5e957a9fc75b7236480417b899c2705bc5aee514899c664d39b5902921c69ac425aff99f3a6ea512bfc0c2c0259519c1a6e0fc553f6e367cc2 SHA512 12c2fe5b36f8d8e688d990e352c1cfa3e8512c0b647b78a8af93f9472704e4867fac4c56c207465fb7b420c9022dc545dea8ad8a29af3037758ab4587dcd38ba
-DIST arandr_0.1.9.orig.tar.gz 90437 BLAKE2B 0782bfd5ebffc1cbfbdaaded623b89559176acbbb363310abfac1fb1af9f64f285eff74de2a2a7b4c36722cde2970f852fccc2cb4d4a49f2d29bc7fc48a2b780 SHA512 0b2bd62665a9680cf29132ddf0a1ba8eda6bc403b98245727e4c4613ac3e2a694d9268426a14bab35b8e79c7c9191cc224627fca56349acf20546a93d749f006
-EBUILD arandr-0.1.10.ebuild 1079 BLAKE2B 1e231873abcb2e793c5946ff7770371f44521fcef817cd8fa3f15583234f346fd139bf80388fa6497467df253bac45aa9fe7365878cafed26264a02d1256462f SHA512 639453435ad6eacbe91dea5adff1e08f6110ec7a37107b7c5efb42d70ce1b256601df09a0cacc988413394ffa9e79334549334c6a26b996e351e175a0efe47be
-EBUILD arandr-0.1.9.ebuild 980 BLAKE2B 89f37618b87d23dc76bc267e0ce47758b4cf2fb32310a8347e4914fbb6c405538b7ca926303bd70c74f5d707eb555caa0ca366e1493f4176169261d7ef75493b SHA512 967d804b33a1ff5aa33de670e01f9cfd13bc22e571ca7c741a6421c3304b1220ff98dbf2d985c68107f2a7dbe3fd9f208530810723cb438ac752819fcf0c4b6c
+EBUILD arandr-0.1.10.ebuild 1077 BLAKE2B 276258e1b0eaf8817794ad3a22e49097590653e6b5b3f65dacd743fe99ad575991e235163f677e01c5d112566d19b69282c0ea20a3766d68071324000e048849 SHA512 7ca1bdf3d1c7f7c15b1957c21e2c2d78246889236e316305689d40afa1dd919fb16526562359aab862f4f21eb55c6344e96bc022960d1668c204bd6c8603782d
 MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
diff --git a/x11-misc/arandr/arandr-0.1.10.ebuild b/x11-misc/arandr/arandr-0.1.10.ebuild
index e5aa388809f6..dc86e38022b2 100644
--- a/x11-misc/arandr/arandr-0.1.10.ebuild
+++ b/x11-misc/arandr/arandr-0.1.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://christian.amsuess.com/tools/arandr/files/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/pygobject:3=[${PYTHON_USEDEP}]
diff --git a/x11-misc/arandr/arandr-0.1.9.ebuild b/x11-misc/arandr/arandr-0.1.9.ebuild
deleted file mode 100644
index 3bd1c5f9bbac..000000000000
--- a/x11-misc/arandr/arandr-0.1.9.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils distutils-r1
-
-DESCRIPTION="Another XRandR GUI"
-HOMEPAGE="http://christian.amsuess.com/tools/arandr/"
-SRC_URI="http://christian.amsuess.com/tools/${PN}/files/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	>=dev-python/pygtk-2[${PYTHON_USEDEP}]
-	x11-apps/xrandr
-"
-DEPEND="
-	>=dev-python/docutils-0.6[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
-	local i p
-	# simulate gettext behavior:
-	#  LINGUAS unset => install all
-	#  LINGUAS="" => install none
-	#  LINGUAS="de fr" => install de and fr
-	if [[ -n "${LINGUAS+x}" ]] ; then # if LINGUAS is set
-		for i in $(cd "${S}"/data/po ; for p in *.po ; do echo ${p%.po} ; done) ; do # for every supported language
-			if ! has ${i} ${LINGUAS} ; then # if language is disabled
-				rm data/po/${i}.po || die
-			fi
-		done
-	fi
-
-	distutils-r1_src_prepare
-}
diff --git a/x11-misc/bbrun/Manifest b/x11-misc/bbrun/Manifest
index 3a09f6d7cce5..4daf2ac6ce12 100644
--- a/x11-misc/bbrun/Manifest
+++ b/x11-misc/bbrun/Manifest
@@ -1,5 +1,6 @@
+AUX bbrun-1.6-gcc-10.patch 549 BLAKE2B 20e9015a8a24b06ab8ff93a26a4682fac50e4711add88afe0d23b7477225ac83663ad812eb29e5863f62eb284d089529d8a8daef0a48c2795f29ac4eabf0b88f SHA512 f83e51e4c6f67f78264bccab600c6ecb8d897dd78a44a196c3f4fa9690e2cc5ffb761030443d4a782f4156c3a3f017a034f075dcb5652bdafa5e46a2cd45d565
 AUX bbrun-1.6-list.patch 2699 BLAKE2B dac9b37a925f628da5826388000ce9a3103814ecd1eb77d7077145e5e4911d0c7e9ed2700f4acc4d103faf8b479446e6e36b00d0d7dcb640b6e04e34f415f881 SHA512 718e4f133ce148af5f707cc7f8642a45a81f229d77d7ffc1a522d793167840f0b7c1a673f93ce14ed93315171f1545539264d3de6266a1b4fd258a13e6c12104
 AUX bbrun-1.6-makefile.patch 734 BLAKE2B 18f9a94e6c058c73868268ca9549db555838f11e660de5f89ae0fb661d803b05f4491cd45212dc50f191f6bc743b11d8072ca800874ae4c6b0656e8a7b90acaa SHA512 bcbdef094b7bc223300548dfbcc4a880a9a8e8e76e94cecca6436119b0cb5889f09c35abaf2b8ed41cec86c6ca507cca3de925e0c668ef0d0d9993ef356e3823
 DIST bbrun-1.6.tar.gz 21132 BLAKE2B 77b7cc5d55e6021f2a4347b2600c34f5168ec5fe2edc16fd2cdbb826e4ebf6ec1cb8cca04f2404b7698e6938b20fe588bcb6d70a23bd331b28b9e591cee8aa08 SHA512 7dfa73f90775ff5826b67c977184e617521cc1308f64e1445061e6b16f1cdadc81e3b12d16e1f2cb6ff0b58e59af6608c07dc0cb483c1c60794da3213e0bfe21
-EBUILD bbrun-1.6-r1.ebuild 673 BLAKE2B 6422d8b85986c7cca55625035355b43b077d89b0d2a0c651cee45914d4f73e8713c2f822d6e9bdd32eba87e646b06b3d3457c9f6944ef07bde46bd140a4d481d SHA512 c904789a34eb14b9f3ec1cea6d7787329f82e7c77651eb4d11be35285b308031eb269cf34c25ca9018b1f5b1b1e342c1ff43c129813ec6ed4691974ff33cf894
+EBUILD bbrun-1.6-r1.ebuild 706 BLAKE2B 5c0657787c7e9e08f2bdd979bb1954f682fa2c7cc4c941253e386c35f572e43bdd2928438820b240b4b9f8a5d85b08bfc7ca4561fa821b5c64eb438a4d1496f4 SHA512 8464ee955d1f612d66349a2f700ac10c54ca4b73f021e94ff89e605b3f79662ace321be4d1d8373bb14a4d908671a6b9e166b9bec52f5a4a6bb5695262097fe0
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-misc/bbrun/bbrun-1.6-r1.ebuild b/x11-misc/bbrun/bbrun-1.6-r1.ebuild
index f9bd99cef70b..0ae88b552435 100644
--- a/x11-misc/bbrun/bbrun-1.6-r1.ebuild
+++ b/x11-misc/bbrun/bbrun-1.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,6 +26,7 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${P}-makefile.patch
 	"${FILESDIR}"/${P}-list.patch
+	"${FILESDIR}"/${P}-gcc-10.patch
 )
 
 src_compile() {
diff --git a/x11-misc/bbrun/files/bbrun-1.6-gcc-10.patch b/x11-misc/bbrun/files/bbrun-1.6-gcc-10.patch
new file mode 100644
index 000000000000..ef23d1152ada
--- /dev/null
+++ b/x11-misc/bbrun/files/bbrun-1.6-gcc-10.patch
@@ -0,0 +1,23 @@
+--- a/wmgeneral/wmgeneral.c
++++ b/wmgeneral/wmgeneral.c
+@@ -70,6 +70,7 @@ Window		iconwin, win;
+ GC			NormalGC;
+ XpmIcon		wmgen;
+ Pixmap		pixmask;
++Display		*display;
+ 
+   /*****************/
+  /* Mouse Regions */
+diff --git a/wmgeneral/wmgeneral.h b/wmgeneral/wmgeneral.h
+index e9d6ca6..cad4f38 100644
+--- a/wmgeneral/wmgeneral.h
++++ b/wmgeneral/wmgeneral.h
+@@ -36,7 +36,7 @@ typedef struct {
+  /* Global variable */
+ /*******************/
+ 
+-Display		*display;
++extern Display		*display;
+ 
+   /***********************/
+  /* Function Prototypes */
diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest
index cd9885638675..df6e2d7b23f5 100644
--- a/x11-misc/colord/Manifest
+++ b/x11-misc/colord/Manifest
@@ -1,3 +1,3 @@
 DIST colord-1.3.5.tar.xz 1263488 BLAKE2B de70f3f76e81d3cec826f444e4c6a1603c03b7d97fedcd04a0b9e1977d1e487d7e1327c8b2738b3cf74e9717fb6803d543786c749d3a244faa1a6480e77e3436 SHA512 a0084ad2c08ae88c8023b8bade68f6cf25e13c77a6a37ef127b2914e86b06e6a7a783f9ab3585243d975dbbe1120d5daae13bdb586aefe519bf675458683025f
-EBUILD colord-1.3.5.ebuild 4341 BLAKE2B c239dd6bfe44d503ae2179975ff2a1fad78693f713a923ee1895ed67c20ebc32f6eedee35ae73191426bdf591c2e0fb4f7d6ab3963e8d73e33341d0ca9185d38 SHA512 edaea01b5ea268247cd77a520eaa273250b6531ddf6d10aea7b3db879d8d51799ef09d808926fbc0d9d8b55d10c511708d7aa8c1a1f2bcab3a1f5e6d70084d39
+EBUILD colord-1.3.5.ebuild 4342 BLAKE2B 85e65c4029856838ff77371cef85ce88e6117fc1842b58bd46d6e2c7696647812beccfacc426f18e597c2bdb047b794680db0052c1b0cabe1b6dc87e596c6a4b SHA512 00f67271c31f54a07a83e98bed9d2c96fd1bdfdf8d3a3c1db07ace863fd9664fd328ad4f912f7d4fb18963fd3165e97b2d5380fd190f5800721c794e89a601a7
 MISC metadata.xml 563 BLAKE2B b35a641da198a98fc9dc69dc0a49b0796060df467dfda31fa7cb1dab328a618e283f5ee9e05d7ad34742052e9441780b243f62f71329d88c1d93dfa83acc46a0 SHA512 e358961e8d31c2e9582d93875bdabe119e574b62d674e5b16028cccfa2e0604d39384fc2c5683aa343b9cf6d543f8fc35d2eef35662de43ea97fd0f50536df3a
diff --git a/x11-misc/colord/colord-1.3.5.ebuild b/x11-misc/colord/colord-1.3.5.ebuild
index e440c9471305..356f902345a1 100644
--- a/x11-misc/colord/colord-1.3.5.ebuild
+++ b/x11-misc/colord/colord-1.3.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.freedesktop.org/software/colord/releases/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0/2" # subslot = libcolord soname version
-KEYWORDS="alpha amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 
 # We prefer policykit enabled by default, bug #448058
 IUSE="argyllcms examples extra-print-profiles +gusb +introspection +policykit scanner systemd +udev vala"
diff --git a/x11-misc/devilspie/Manifest b/x11-misc/devilspie/Manifest
index a69e57cf0593..6797f585e4ca 100644
--- a/x11-misc/devilspie/Manifest
+++ b/x11-misc/devilspie/Manifest
@@ -1,4 +1,4 @@
 DIST devilspie-0.23.tar.xz 130984 BLAKE2B 86b1b472d23ba49fdcc27c1d5a48ef95e3edd1c236569a3d25e23c8947ed41d91ce35969939cefc8ee1b74eb65594f91617172d35350e873977f4e8856e71ce4 SHA512 6ea6c79d317b0f35d943ecafa010e8c6011870796d83ff0a24a4853ad0ebad93608173dd1c4b645254d53c5c182c667e6eba42a20f764f258c211ee2bcd19174
 EBUILD devilspie-0.23-r1.ebuild 1028 BLAKE2B df241aeff50c518c512954e6ef83aac0a7ee9a8bd1b2bc01989ad92ab2de613d9ecde62f4649e3f8d92f319123a050414b35c594608de29b0fedf32f79d142a6 SHA512 69e3078752ee90f39ae4d220d002e9b5330ccae8b2feeb73e76ad7b19f5310483da989ed6e3e8f238782c8deb53fdd3d7398705572638b90e65a4a17dbc7a06c
-EBUILD devilspie-0.23.ebuild 968 BLAKE2B 6fee124f115a544c395736050439aacdb5ffa05511009de8e2d3c78038e31c9ae6ef90aa68b919e8d10fb066affa149d1748d3e2d9e5a0a10ea874ac0ab42868 SHA512 08710e5deb4136cf8b8591c24d375d34657575f51d6b56208b6caf6ba51b8fb069c551ae32341589b7b817cb078587cdb2f2188bf3632df874914d0090b942ed
+EBUILD devilspie-0.23.ebuild 969 BLAKE2B 375a3265c23813e110c69c945e2f5986fad175f1c1b30dd9830ae11006a7bd2ebeab8c5b9f667ead3a5bdf0db714f3e2e8590760d9339e8ab2ebe849c0099770 SHA512 39ca76d6af334b809817d50e4a8aa586aa7de7f616501c47920aa2e5b4c69264c6b6fc8f8a25516565489e1b20d5848cec1ecc88413bf4bd0177c40df2367f2a
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/devilspie/devilspie-0.23.ebuild b/x11-misc/devilspie/devilspie-0.23.ebuild
index ef185b8f810e..e219c734a14e 100644
--- a/x11-misc/devilspie/devilspie-0.23.ebuild
+++ b/x11-misc/devilspie/devilspie-0.23.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.burtonini.com/computing/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/efax-gtk/Manifest b/x11-misc/efax-gtk/Manifest
index 26f4079092af..014e9f3f4435 100644
--- a/x11-misc/efax-gtk/Manifest
+++ b/x11-misc/efax-gtk/Manifest
@@ -1,5 +1,7 @@
+AUX efax-gtk-3.2.13-fno-common.patch 890 BLAKE2B b21b9e622b33f0691b5cb5d32deaa2beb9b86720b9c41f34f68080a5347066942e34c8cd62d867b182a0b6199304b226ca406b6edade3d74fd5c998c8bb44f90 SHA512 723713ba260ecf77886a5888ed28f3eae48f26461c178787707a888bf910e9bf238256816c659cb9534f0765cc056cc5dd15581d905435ba7d778488e189ead8
 DIST efax-gtk-3.2.13.src.tgz 1245015 BLAKE2B 3de1e6eb75173d1fb8901e648ba98dee847f1c4171dfdb4cb8b3eb31094b44a736f4b34a988ff95011323a31db39d75135be2959c44d0f20ea0e219a8c652aaf SHA512 dde0f79df444bdaf5250eae1dc0a94184c0b32e319b04943e81178d2a744bb6e387b5aa0f2379bd23dd4c18d28c30c60083c0cda5819e5c853c1b7bdc4f5b64f
 DIST efax-gtk-3.2.9.src.tgz 1176921 BLAKE2B 327ee205a747bc6f3909143b79ae9754009bb29ca35a755581d7a1a6604a76deb0b17ae9c3a679652d2216668c540e2074432c88bb31ef5322d9723c8382fa2f SHA512 a2a4a648b95f9143f8ad3b42c3f8f86323a2b312fed87616eddeaebe06742a5a4ae841d79f3078bf9e819288252ad4d79ec429a66116c1d2b8df8a8a13cac806
+EBUILD efax-gtk-3.2.13-r1.ebuild 1201 BLAKE2B 692c8484abf6af95bcb7c993ff17dfe30a7b365930ee5d127e17614c855ad17eeab53a92ede35caf1cbb7e2a8bb337427696267a85a526d24ebc482099a1c627 SHA512 7ff07a8547d5d9acd71423234b4723eb5f6a22b580ee6fd4df94609a1f43ad8b3785b94df7bb5f9cc82966abc84ae01affc0aa1c7827ed07f2fc28125238475e
 EBUILD efax-gtk-3.2.13.ebuild 1194 BLAKE2B aaa54409f108bac119cfd54b839303af902ddeb7b429891627906b2ea895865c8e91ef86b00d18995d3be5eac1994ee63a36d2b402ac20e68fdc5bb4914db68d SHA512 abd4f161dca129c2ce5a23b84eb0cd4b6db310e31e5925f3d3f3e4606cc5f8a937e7f5ca903ac67b3688e6f9289d10294989e8195806a5917a39473c5d18299b
 EBUILD efax-gtk-3.2.9.ebuild 1209 BLAKE2B f49936691e5286b360fe284130d14ba1a61e64502d9ffa6c502c49ce5b8e21e0ced3ffdad62ccdc7167ead726312bb04158a667133aed43e9bfaaa15047e35c3 SHA512 c2e20282c1dc1a7b59dfb7088da0ab6dda7f10027e63e90655207456136bf108f45d28ad8e20480e9ef17e22df3aa461bb4016a3c77719c42f6205b938baccc6
 MISC metadata.xml 354 BLAKE2B c4168be07b9ff9bb2a00459999ce4cd94ce8a0e2da7253df4c3a9c2ceed596e46e589d508dd4b561869ead4cda8c503a88de2256eec027e95be4191c7fc7aecd SHA512 6b32fac40a7eeabdbc54a4416d05fbe7d516b95056d00b4ecf5f707a667b53994fe519f653dbc2c00b48354698602c5b961684f9cfa67e1e6bc75faaabf3941f
diff --git a/x11-misc/efax-gtk/efax-gtk-3.2.13-r1.ebuild b/x11-misc/efax-gtk/efax-gtk-3.2.13-r1.ebuild
new file mode 100644
index 000000000000..226321974658
--- /dev/null
+++ b/x11-misc/efax-gtk/efax-gtk-3.2.13-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A graphical frontend for the 'efax' application"
+HOMEPAGE="http://efax-gtk.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.src.tgz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.10
+	media-libs/tiff:0=
+	x11-libs/libX11
+	x11-libs/c++-gtk-utils:0[gtk]
+	x11-libs/gtk+:3
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/gettext
+"
+
+DOCS="AUTHORS BUGS ChangeLog README"
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.2.13-fno-common.patch
+)
+
+src_prepare() {
+	default
+	# Prevent sandbox violation with chown/chgrp and existing spooldir
+	sed -i -e '/ch.*lp.*spooldir/d' efax-gtk-faxfilter/Makefile.in || die
+
+	sed -i \
+		-e '/^Categories/s:Office;::' \
+		${PN}.desktop || die
+}
+
+src_configure() {
+	econf \
+		--with-gtk-version=gtk3
+}
+
+src_install() {
+	default
+	# File collision with net-misc/efax wrt #401221
+	mv "${ED}"/usr/share/man/man1/efax{,-0.9a}.1 || die
+	mv "${ED}"/usr/share/man/man1/efix{,-0.9a}.1 || die
+}
+
+pkg_postinst() {
+	local spooldir="${EROOT}"/var/spool/fax
+	[[ -d ${spooldir} ]] && chown lp:lp "${spooldir}"
+}
diff --git a/x11-misc/efax-gtk/files/efax-gtk-3.2.13-fno-common.patch b/x11-misc/efax-gtk/files/efax-gtk-3.2.13-fno-common.patch
new file mode 100644
index 000000000000..4cfd79afd164
--- /dev/null
+++ b/x11-misc/efax-gtk/files/efax-gtk-3.2.13-fno-common.patch
@@ -0,0 +1,35 @@
+--- a/efax/efaxos.h
++++ b/efax/efaxos.h
+@@ -11,10 +11,6 @@
+ #define UNIXSIGS  SIGHUP, SIGQUIT, SIGIOT, SIGALRM
+ #define CATCHSIGS ANSISIGS, UNIXSIGS
+ 
+-/* Bit order reversal table. */
+-
+-extern unsigned char normalbits [ ] ;
+-
+ typedef enum ttymodes		/* serial port modes:  */
+ {
+     COMMAND,			/*   19200 8N1, no f/c, DTR high */
+--- a/efax/efaxlib.h
++++ b/efax/efaxlib.h
+@@ -208,7 +208,7 @@
+ /* Bit reversal lookup tables (note that the `normalbits' array
+    is the one actually used for the bit reversal.  */
+ 
+-uchar reversebits [ 256 ], normalbits [ 256 ] ;
++extern uchar reversebits [ 256 ], normalbits [ 256 ] ;
+ 
+ void initbittab(void) ;
+ 
+--- a/efax/efaxlib.c
++++ b/efax/efaxlib.c
+@@ -48,6 +48,8 @@
+   return n < 0 ;
+ }
+ 
++uchar reversebits [ 256 ], normalbits [ 256 ] ;
++
+ /* Provide dummy gettext() function if there is no internationalisation support */
+ 
+ #ifndef ENABLE_NLS
diff --git a/x11-misc/fbpanel/Manifest b/x11-misc/fbpanel/Manifest
index 194fa97cd782..9cb0c2ca416a 100644
--- a/x11-misc/fbpanel/Manifest
+++ b/x11-misc/fbpanel/Manifest
@@ -1,8 +1,9 @@
 AUX fbpanel-6.1-underlinking.patch 789 BLAKE2B f0995b59f54eb5da7a7b74d470604abaee5072a82735f86d5feb3fedabdc1fa8a0d0c66df09598b10d4921c572240dee36cb798b056f66fe4491e0316ef71ccd SHA512 9c19199bc4f24ffe967b14dbee5165f78dccd120bc73f22e4846f083b4be3b92b60855f5ad08bdcb6d3b55b33a070a54e904cfdcc36786211d7d252dc7faac04
 AUX fbpanel-7.0-clang.patch 2596 BLAKE2B cb9e42fb7afaf007d49c54270ee6e09a551ee5c538d82b4cf4eb1c79663b6bc517e3d4da0117c4fbc5030df0c907289ef843cf59ca3dec69ba8f5ad3e8a1aab5 SHA512 78dfea33f3a29b857768b64bc6ea61404dee3cb75587500e98e17aeecf92a310abf1796577d433e13aab4a5524ce2400906d0e6ce2ab468a488dbae03857902f
+AUX fbpanel-7.0-fno-common.patch 440 BLAKE2B ef20f4055b21b77f15e1946a3c94eb7dd1a74f85922ebd0059b74b7503467930b352888768948f0ca46c2966103b65b746bd2c095c03f77af7859d27bcaf3013 SHA512 a62c4514749d26bd2e77d5d0ed1eae3f83af765957ec5d5e94679f9787db3eadf192eccadfcb67dc087688d6d59303cd1f6ff0448dbca11dc8524cd3079c1d4c
 AUX fbpanel-7.0-images.patch 274 BLAKE2B f587453d0e66c5fb8c93ad936dbf1cd1291d6dd652dde29f6e995947663eae8f20da3f022e494bbc6406db48ed3acdc71a38d973638b6ec11fb63e7117efd41a SHA512 432884c3d397c24e28e909bb3626ebd29ce3023c4e1aa68ccc9defdd81b59e29f72e8d090b54a04e501852b6cda91b1e8157e49092c7562184d787c8085f3ec0
 AUX fbpanel-7.0-shebangs.patch 2348 BLAKE2B 8a68eb84f0d4c28e23483724c2600e10375e6bd96bbe640f6d1ff4ef47c17ae140873229e95322de2fd825cf5dd54d6eca6a08a4058e70d3b185f4f8b1d3440f SHA512 547367bc298548b0936e4b83e8ddccc9c9e689f5aac8a7aac1ef5e09050ce33936dba4c39d971c4f3ff5065daa55bc28989588cb08e8277ca9e201ca6994eec7
 DIST fbpanel-7.0.tar.gz 3746477 BLAKE2B 6bc8ef39d44768b5fc9fc4c58ea0b89c723f0e5239198d3b1a5f6fe27252bf22c87fec5beb13fa3371af6c218e592d67d04644bd82cc62f357def610680fc2d2 SHA512 9706a96569c41241de4dbd250c9d6a473b53a5e26e880f4c782041b2b91c7570046e1bee3070059fd2d333fb7159490732ef397b86701c72d4c65c0784948874
-EBUILD fbpanel-7.0-r1.ebuild 1385 BLAKE2B 406c98a8f2fc48524a3fc0316cbe3f64171e2285d0e4525795a805a91e68e3ecb6ca10f934971c7439bdb2632d8a11f5d47d165420c2b44a843bbcbcb0b9f5c3 SHA512 d16f0c567c164a5dd2d63fc3c374602e28780b9066fd2425008302c4f12779ec8ae5ee924a39c266ef8285912863197b23bf4374b5d2bfa9bfbb4743808996e9
+EBUILD fbpanel-7.0-r1.ebuild 1427 BLAKE2B 08a3742360ffe73505eb75d96aa64d662f935ce88a1ebece48bcb5c6f862920d5636fc7ebbcf752cebc7e3bdc9a6fd77c311ded7b9a8786d63278a16838558e3 SHA512 3161ec424feebf681fbae71432207348d0a41d834e8f7bbaca834b4e5c827206525d1841dffc129225b8e6a3a8693157ed9dd4610f2becd03e0e28b201a88a76
 EBUILD fbpanel-7.0.ebuild 1334 BLAKE2B 2bc40160ddc4e6b4543527fb273ec0006a06006fb2571294c5d5a87be1c39bc26d688479bc78bc135cf8482edf7d91a3baf5a380c2f6e493f8595f405dcb9314 SHA512 e5506238b3c62e5e3ce86d3b75883f6dee9e6a87fa1fddea8ca8163ccc71116e2d4080d0fb636b4e9302d135dff013e4c7fea2a7594d36b0e3ee923d907fa57e
 MISC metadata.xml 421 BLAKE2B bec71cdd70517d1087d289c1124ed74c9540601d34de83aef4e2d45c0c3c1d3c6f6cef080edd7dd6641f146752c81a12a5c34658f8f097b940bf67ea9c024a96 SHA512 6e50dcf1443603726214701d8187864db64227db01b5c19f630d703864faec0d4692a5967a6286bd5fcd0b4762997a2bcb8ad6d4742ae5b2dc33bfe38d808fbe
diff --git a/x11-misc/fbpanel/fbpanel-7.0-r1.ebuild b/x11-misc/fbpanel/fbpanel-7.0-r1.ebuild
index 9acb74d5c5ff..b468b2a537e8 100644
--- a/x11-misc/fbpanel/fbpanel-7.0-r1.ebuild
+++ b/x11-misc/fbpanel/fbpanel-7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -34,6 +34,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-7.0-clang.patch
 	"${FILESDIR}"/${PN}-7.0-images.patch
 	"${FILESDIR}"/${PN}-7.0-shebangs.patch
+	"${FILESDIR}"/${PN}-7.0-fno-common.patch
 )
 
 src_configure() {
diff --git a/x11-misc/fbpanel/files/fbpanel-7.0-fno-common.patch b/x11-misc/fbpanel/files/fbpanel-7.0-fno-common.patch
new file mode 100644
index 000000000000..aafd8c4cc67b
--- /dev/null
+++ b/x11-misc/fbpanel/files/fbpanel-7.0-fno-common.patch
@@ -0,0 +1,21 @@
+--- a/panel/plugin.c
++++ b/panel/plugin.c
+@@ -22,6 +22,7 @@
+ /**************************************************************/
+ static GHashTable *class_ht;
+ 
++struct _plugin_instance *stam;
+ 
+ void
+ class_register(plugin_class *p)
+--- a/panel/plugin.h
++++ b/panel/plugin.h
+@@ -9,7 +9,7 @@
+ #include <stdio.h>
+ #include "panel.h"
+ 
+-struct _plugin_instance *stam;
++extern struct _plugin_instance *stam;
+ 
+ typedef struct {
+     /* common */
diff --git a/x11-misc/gccmakedep/Manifest b/x11-misc/gccmakedep/Manifest
index f00bc68f4835..3239c131d90e 100644
--- a/x11-misc/gccmakedep/Manifest
+++ b/x11-misc/gccmakedep/Manifest
@@ -1,4 +1,4 @@
 DIST gccmakedep-1.0.3.tar.bz2 104766 BLAKE2B 4da8c3d4423f55fa110b1be748e9488b713a36b575f065f58d68c24eb4fdfc337aa9c715b82dfaac6eaaf8cb2037ab4d0355297a61c39f7e7672f136bb1395d8 SHA512 563b2897770a4df2792ea3eae8183a1f9e78192b7efc9c8296ee68d1cba6e72fa962a88e3251bb780df776e2aa7e80d74d5096675c61526c232aefa4f9e6a5fc
-EBUILD gccmakedep-1.0.3-r1.ebuild 973 BLAKE2B c14817b3f0f619815be87e4b4fc3bbd18a96c1d24cbfc5a3bd665e6ac5d44ee22b385625b76e28b9f9f4f9cd1ffa0735cc094c30503244d79a9e95e0daf31508 SHA512 071d407df847a7c341eea723cfcf577f8545de7ba8a01361241ad86f1e9eab3895fb0523c2ec61db819cfd727f85d8520d7643aafbcfcb099acd86ea46415cd8
+EBUILD gccmakedep-1.0.3-r1.ebuild 974 BLAKE2B e286aea1204e8447cbec367a486beefefd1210c669f826e3fd142a022f39ec93fee409bda2337cf880737f7623b2f5c3dd08f50bd1f2fd14b6d1d90c107ce995 SHA512 178d1c843efe9f4545037ee9c7a4b46d1d6dfa67e9d2df7bdd87d7b7441d1d463a0f430e8515f134d35dc5871ad97887af1e5c4f20253ca4871aca289ed12c06
 EBUILD gccmakedep-9999.ebuild 983 BLAKE2B 61da2435abe08bf6c47a57b2f6405b2c31fe2cb89ae58179a4abeb5520f382e81141032624dceaaf28d0fe9140c14a0fd616e1015c3e8f183e64d8a8281ffc1a SHA512 7f611f405a342884af259517e430d3aecfd1ba34b436e3109d13c709aff661899ca039cac6c85b6a627d3a620cfc44f3da0e0108107705218690a5b2818e30c4
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/gccmakedep/gccmakedep-1.0.3-r1.ebuild b/x11-misc/gccmakedep/gccmakedep-1.0.3-r1.ebuild
index 49ae6de71d79..f5b6acc495ea 100644
--- a/x11-misc/gccmakedep/gccmakedep-1.0.3-r1.ebuild
+++ b/x11-misc/gccmakedep/gccmakedep-1.0.3-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
 else
 	SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/x11-misc/gtkdialog/Manifest b/x11-misc/gtkdialog/Manifest
index cc3946e090ff..72d2cde0c5e1 100644
--- a/x11-misc/gtkdialog/Manifest
+++ b/x11-misc/gtkdialog/Manifest
@@ -1,5 +1,9 @@
+AUX gtkdialog-0.8.3-fno-common.patch 1535 BLAKE2B 1a881d8827c0ac815791b5bd482d1160158bbbce8a2b5a57235e1ba3131d8cb4c591f10b67fff35c5f1a632f097fa751749702b32696f1b86469629a4b4238f4 SHA512 5812ee6272bc7ffa85ea506bce9b64451c5d9a716c87272b7c5e0c166b85ac7ba7f1a8cf9c687df194b20fe0db942084b2d199cbf51093b05d204c217ea6e65c
 AUX gtkdialog-0.8.3-optdeps.patch 1573 BLAKE2B 1db31db450da622f91920611c93bd4d8cec0378ab2baab27dbb0f3ea750a6ca83ac6e0bb14ba6f4b4043ab80205d140d4b5fad6e9a120445499a4c0984577956 SHA512 a26d46716b46a909c4346c3fc3d9999991c98649ce4fc97cb6f0010dd768c81c62fec6561210dad89ef3911d2fe751c1cf321df60d5e6321647b818f8ed91475
 DIST gtkdialog-0.8.3.tar.gz 571974 BLAKE2B cfd5062ec6c255ade5467b9d6435d7529c5a55f911db8e549b19c26032aebcd1b83f2cf4ac7e2bcc9c71f9f37725c9285bbb22505ec021e7eded28ab7d382113 SHA512 fd8a93d576917efd650e38e31f261065c0a0c3f9213338ed4bd457d310993d8efbe8deabb2c1451f491d14c8d38cbcd5d4cb0c9f289c6fd462f7a06754b89da7
-EBUILD gtkdialog-0.8.3-r2.ebuild 856 BLAKE2B 11c7acc7942c656985102486fcce90e2ddc694a705164af85d5f47bb769d1e737fb88e31ef4d6c8d82766977561d39a7114b51c61ea1bc6c9708a57079926cac SHA512 b8e4bb6409b96a671b35f22f298340e28e1cdca2489b4e9e0f6eceadb965cbfea5b82fcb19142937fa2398c0b540d289c690f19ae34af48c4d2ba1b6fc2b9f04
-EBUILD gtkdialog-99999.ebuild 844 BLAKE2B 104a0056c4d2c2f2e27a139de0744c0e88d4189028b401753a47ceab2107abce147bdc9239f91cf9f3eeb2a2b36d9893f438a4d16d5154dfc71d3a56c7aadd86 SHA512 4f7ffb05409162b010dfb1adbd1cec27aab26e8c7546bd738c6e2db34ceab82532584c72b98357a7fc6da6e7e03575a3419b8abd26a8c7115233c96b99d7fe34
-MISC metadata.xml 1061 BLAKE2B bda57a1f52134507775d030d4fbf19704ab69b138635ad6001e12e13a779390f7d8b3640dcab4696da1bfd267db4b772d5e5ff233b7ec1d0ff2feee90e9648ab SHA512 90b0871d127602aef6b3066f32c8b7abca20634afdd4879ca06fbfd1971ff3ea0d03165e076912cabd1ae0b730f1621999c220ce9fe195700a778a11c71adb36
+DIST gtkdialog-0.8.3_p20200202.tar.xz 356312 BLAKE2B 77358e0b04ddb484e3e3a093084776a2c799fa52b90849bdde3bce56a7c042c2cbe28d699f0c4dcc14cc69872d496b89fc5c8aa7140669560e01448d9c57c15d SHA512 9120ac515eace168e4a3987b6cf3a1b3aa0e7617e837ade21d5ffea25cc3f3abbff598bb4c33914fb800416ea687f0ec7dea2b24c8acc0c71734aa6b2b385bfe
+EBUILD gtkdialog-0.8.3-r2.ebuild 897 BLAKE2B 6d445aefb7cc5825df30d4ba7e9157710bbd2266fc047efe47e8525a2899eb75879b878f9f122f067f9c4f974922c340b22e5ba6c952c5dd91d2981a030e41d6 SHA512 294e88293061c8cae807fcb95529a46b54e3a3357b28de2f67cfaaa17af8b237946871ed9fdc10f334a23fe0944190a5c7981e7e001ee104b9c6e0b6f1c57b2b
+EBUILD gtkdialog-0.8.3-r3.ebuild 994 BLAKE2B 53e7ad93fa84c2776552f11365411cf64d19a9329986501717dc4a824af23072f7acb39d1e8003eaaca714087ab39a028ee09213fe3d2792d67e551150e6c9b2 SHA512 aff4969b5d95b6a0a3a19cd37f41c8f7dd554a83fb3a0522fbedece6f1fdcfb37363f6887d2dfabb6ed3c239a72d2f7e152cf87827c9bbdebb3aba22facc1a82
+EBUILD gtkdialog-0.8.3_p20200202.ebuild 1020 BLAKE2B 4aa2b78907c9fa0c09174c279da06d3a029cb17a0de7eeefecb04665850a05a505b1e5136640ea8b8442f76d903efcf4e4aba0646254905b4cce528d1d2875cd SHA512 81ea7caabf698da80587b5814c2ad908c35636d1291d97f281ef1adb9fcd74d56663553c4e2011d5d8b065a8bfe7dbf65ce06916233128cc0214842bab45a2d4
+EBUILD gtkdialog-99999.ebuild 1015 BLAKE2B f1573ba5e470253ef5bdd2b279d9aacbbf63d3e45e96410f9370eecdb35ebeb412b817ef4be6dc494dfda2e6f60963150e0b8c366e54b7e2980fc46d010cdc2a SHA512 5d31e2026a186436166cf0eee9a322dec5b71e05807db275d7d736f03780c6df45f77af28d40ea12d89ce87e4bb3ca975f4e4186f72d13e0627a8879e513400f
+MISC metadata.xml 1061 BLAKE2B 0befbe35090efdcd6567b30df2263e2e9de09921b98e78ac829705d5dd667c02074b0e45816be46919cd0a4fa7e97f8b16dd619f0449257b9038daed4a10dc56 SHA512 d58b989f9601950b77e9711ba86e127c7bbe7e770322fb02cf9db26742f43d6e7f80b40cf1f59f086a7c26d1453c78a5c4143e5bb99213819167b1c602f4c11c
diff --git a/x11-misc/gtkdialog/files/gtkdialog-0.8.3-fno-common.patch b/x11-misc/gtkdialog/files/gtkdialog-0.8.3-fno-common.patch
new file mode 100644
index 000000000000..86fa6a9700a4
--- /dev/null
+++ b/x11-misc/gtkdialog/files/gtkdialog-0.8.3-fno-common.patch
@@ -0,0 +1,51 @@
+--- a/src/gtkdialog.h
++++ b/src/gtkdialog.h
+@@ -40,24 +40,24 @@
+ #define GTKD_FUNCTION_SIGNALS_BLOCK (function_signals_block++)
+ #define GTKD_FUNCTION_SIGNALS_UNBLOCK (function_signals_block--)
+ #define GTKD_FUNCTION_SIGNALS_RESET (function_signals_block = FALSE)
+-gint function_signals_block;
++extern gint function_signals_block;
+ 
+ /* Thunor: Used to control/override the widget packing expand and fill
+  * states at the project level */
+-gint project_space_expand;
+-gint project_space_fill;
++extern gint project_space_expand;
++extern gint project_space_fill;
+ 
+ /* The most recently created radiobutton widget (used for grouping) */
+-GtkWidget *lastradiowidget;
++extern GtkWidget *lastradiowidget;
+ 
+ /* An accumulated list of menu accelerator groups to be added to the window */
+-GList *accel_groups;
++extern GList *accel_groups;
+ 
+ /* A list of widgets to hide and to show */
+-GList *widget_hide_list, *widget_show_list;
++extern GList *widget_hide_list, *widget_show_list;
+ 
+ /* An auto-incremented unique id for each window created */
+-gint window_id;
++extern gint window_id;
+ 
+ void reset_program_source(void);
+ //Redundant: gint set_program_source(gchar *name);
+--- a/src/gtkdialog.c
++++ b/src/gtkdialog.c
+@@ -82,6 +82,14 @@
+ gint geometry_x = 0;
+ gint geometry_y = 0;
+ 
++gint function_signals_block;
++gint project_space_expand;
++gint project_space_fill;
++GtkWidget *lastradiowidget;
++GList *accel_groups;
++GList *widget_hide_list, *widget_show_list;
++gint window_id;
++
+ static gboolean 
+ get_geometry(const char *argument)
+ {
diff --git a/x11-misc/gtkdialog/gtkdialog-0.8.3-r2.ebuild b/x11-misc/gtkdialog/gtkdialog-0.8.3-r2.ebuild
index bf0610c4fd83..5e5b48165a4b 100644
--- a/x11-misc/gtkdialog/gtkdialog-0.8.3-r2.ebuild
+++ b/x11-misc/gtkdialog/gtkdialog-0.8.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,6 +26,7 @@ DEPEND="
 "
 
 PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.3-fno-common.patch
 	"${FILESDIR}"/${PN}-0.8.3-optdeps.patch
 )
 
diff --git a/x11-misc/gtkdialog/gtkdialog-0.8.3-r3.ebuild b/x11-misc/gtkdialog/gtkdialog-0.8.3-r3.ebuild
new file mode 100644
index 000000000000..f6947de49587
--- /dev/null
+++ b/x11-misc/gtkdialog/gtkdialog-0.8.3-r3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools xdg-utils
+
+DESCRIPTION="A small utility for fast and easy GUI building"
+HOMEPAGE="https://code.google.com/p/gtkdialog/"
+SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="glade vte"
+
+RDEPEND="
+	x11-libs/gtk+:2
+	glade? ( gnome-base/libglade )
+	vte? ( x11-libs/vte:0= )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/flex
+	virtual/yacc
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.3-fno-common.patch
+	"${FILESDIR}"/${PN}-0.8.3-optdeps.patch
+)
+
+src_prepare() {
+	mv configure.{in,ac} || die
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with glade) $(use_with vte)
+}
+
+src_install() {
+	# Stop make install from running gtk-update-icon-cache
+	emake DESTDIR="${D}" UPDATE_ICON_CACHE=true install
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202.ebuild b/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202.ebuild
new file mode 100644
index 000000000000..5c51b9d790bf
--- /dev/null
+++ b/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools xdg-utils
+
+DESCRIPTION="A small utility for fast and easy GUI building"
+HOMEPAGE="https://github.com/oshazard/gtkdialog"
+SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gtk2"
+
+RDEPEND="
+	gtk2? (
+		x11-libs/gtk+:2
+		x11-libs/vte:0=
+	)
+	!gtk2? (
+		x11-libs/gtk+:3
+		x11-libs/vte:2.91=
+	)
+"
+DEPEND="
+	${RDEPEND}
+	sys-apps/texinfo
+	sys-devel/flex
+	virtual/pkgconfig
+	virtual/yacc
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.3-fno-common.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(usex gtk2 --disable-gtk3  --enable-gtk3)
+}
+
+src_compile() {
+	emake -C doc stamp-vti
+	default
+}
+
+src_install() {
+	# Stop make install from running gtk-update-icon-cache
+	emake DESTDIR="${D}" UPDATE_ICON_CACHE=true install
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/x11-misc/gtkdialog/gtkdialog-99999.ebuild b/x11-misc/gtkdialog/gtkdialog-99999.ebuild
index d90e208f2ef6..131519d09a46 100644
--- a/x11-misc/gtkdialog/gtkdialog-99999.ebuild
+++ b/x11-misc/gtkdialog/gtkdialog-99999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools git-r3
+EAPI=7
+inherit autotools git-r3 xdg-utils
 
 DESCRIPTION="A small utility for fast and easy GUI building"
 HOMEPAGE="https://github.com/oshazard/gtkdialog"
@@ -11,14 +11,14 @@ EGIT_REPO_URI="https://github.com/oshazard/gtkdialog"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="gtk3"
+IUSE="gtk2"
 
 RDEPEND="
-	!gtk3? (
+	gtk2? (
 		x11-libs/gtk+:2
 		x11-libs/vte:0=
 	)
-	gtk3? (
+	!gtk2? (
 		x11-libs/gtk+:3
 		x11-libs/vte:2.91=
 	)
@@ -30,6 +30,9 @@ DEPEND="
 	virtual/pkgconfig
 	virtual/yacc
 "
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.3-fno-common.patch
+)
 
 src_prepare() {
 	default
@@ -38,7 +41,7 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		$(use_enable gtk3)
+		$(usex gtk2 --disable-gtk3  --enable-gtk3)
 }
 
 src_compile() {
@@ -51,3 +54,11 @@ src_install() {
 	emake DESTDIR="${D}" UPDATE_ICON_CACHE=true install
 	einstalldocs
 }
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/x11-misc/gtkdialog/metadata.xml b/x11-misc/gtkdialog/metadata.xml
index 2de333f9467d..7d0ca79e2c46 100644
--- a/x11-misc/gtkdialog/metadata.xml
+++ b/x11-misc/gtkdialog/metadata.xml
@@ -19,7 +19,7 @@ provided.
 </upstream>
 <use>
 <flag name="glade">Enable support for <pkg>gnome-base/libglade</pkg></flag>
-<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
+<flag name="gtk2">Build with GTK+2 instead of GTK+3</flag>
 <flag name="vte">Enable support for <pkg>x11-libs/vte</pkg></flag>
 </use>
 </pkgmetadata>
diff --git a/x11-misc/gxmessage/Manifest b/x11-misc/gxmessage/Manifest
index aff54f47395f..ec9333bdd6a7 100644
--- a/x11-misc/gxmessage/Manifest
+++ b/x11-misc/gxmessage/Manifest
@@ -1,5 +1,7 @@
 DIST gxmessage-2.20.3.tar.gz 274110 BLAKE2B 9863e680b1d23ba3d69c35e2de826106f1078f585c0be36d1ad51946abbeef8637bc2f872f9fee20738c978146adebfbe47548de48be6b12b92c314ed93d9c32 SHA512 8f677d0ee899c88a40c912ba68b59ba9a21a0ae21db467c64756daea41fbf2a7fb566e26c74e72f89e6009b1e8029af9bd5748f92099f681346399fe7e9d8e27
+DIST gxmessage-2.20.4.tar.gz 274356 BLAKE2B f3325f870e63429934514d2e1bf3debd2827591e776c43213aae84543623484f912b61f7541e37622a28b1e4dfd5044f0b85e664cae2cb8610b3f77c32a9f4be SHA512 43891fc44d9125921150f9330c7ebafd9086866bde27a635ef0f6b30f2d2fa49b01dcd9a6bf65d6dcdec11de07748993057871c77387f51894c150550e3c160f
 DIST gxmessage-3.4.3.tar.gz 275354 BLAKE2B 2801944c3a6542d250f91388a90736ba781013e5c370e42783db620387a07b315b176bac60e30af6e623d4f664291fdf567786e66a1f9e8c383dc772a64547e6 SHA512 4e3c455595db723e2d78060c4913f1a87b8f0c5cb6017427d48cd02652655592bf8aa1001adfbfecd5598cc0c613c78a74d71a59a7f1f0787acc29774328e93a
 EBUILD gxmessage-2.20.3.ebuild 841 BLAKE2B 26fde7e4dbc1b331f9cae6775ac56b4261e4deade272bb43441372ee982605c61a1d41ea9bbcd2070a857c1f467a0213fb55a6cd6ff9252893e9bd99f351818e SHA512 320cf1739969fc9c5d82c5c40892a99706ee0b94fed71df842f6465b904d785fc7cfe351e915f533e3169461e087e6198faa31e188e9ed7499774c0a0aeba82a
+EBUILD gxmessage-2.20.4.ebuild 672 BLAKE2B 344b10d688a284f7dd9e3d5deb38604b4430382661191a267c76186848fba6ce30f0d8a1e8d02281ef5e6dc3ea45663c74dc634a7125bb8aeb52f53e0099fe7f SHA512 6ec50529591320c38091991fa9f8f30ed7f5ad02339b85e84e81d52ffe7785cf11018dc355d65a4944048e8fac0d220f0e8acb09848a504fc15f383e26a849d9
 EBUILD gxmessage-3.4.3.ebuild 867 BLAKE2B f8b771ad4cd8490bbd3bcb6ebd8a19847bf8c57a80c25ef40e5df2a9e08958aaa3be06dc2597bfa6436e971bba042e440a8be97a56c65b958fdbc3fbe53bfcdc SHA512 e35a84714028debd44d59ce5e54305a90a556d12af2dcfd5257b7a3b4081e02331d79ced5029c9e179148f2f207f3edbd49f85fc6ff9eb32458a0b9966c59a3f
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/gxmessage/gxmessage-2.20.4.ebuild b/x11-misc/gxmessage/gxmessage-2.20.4.ebuild
new file mode 100644
index 000000000000..e02454624a6c
--- /dev/null
+++ b/x11-misc/gxmessage/gxmessage-2.20.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit xdg-utils
+
+DESCRIPTION="A GTK+ based xmessage clone"
+HOMEPAGE="https://savannah.gnu.org/projects/gxmessage/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3 public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND="
+	>=x11-libs/gtk+-2.20:2
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-util/intltool-0.40.1
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+DOCS=( AUTHORS ChangeLog HACKING NEWS README TODO )
+
+src_install() {
+	default
+
+	docinto examples
+	dodoc examples/*
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/x11-misc/habak/Manifest b/x11-misc/habak/Manifest
index d003a2b0e9b1..d154e43468fe 100644
--- a/x11-misc/habak/Manifest
+++ b/x11-misc/habak/Manifest
@@ -1,7 +1,8 @@
 AUX README.en 6729 BLAKE2B e7c97c01b774d6813bb87373b8634000b71094ad6668e6402805d8fd5ee6ec1cea523bd4239f0ae1b7d4f53fecfc7545c4990a172b87a13a8a0615d53b81ecc8 SHA512 2857284f10734223fc03c57150f796bad07ecdcf9fd687893155f16b3633903df322d397be7f5e51f2c5ac87ae27d246549dd098b36e061ffa2d2dd3ae610e58
+AUX habak-0.2.5-fno-common.patch 586 BLAKE2B c6ad2d23f671ceee49059a87b50ba8405110c215961b0a89290224a470b7774c729d025e27cca98cc20d774ba47250e0f3fbcb9b6daca28699614fa28ad2ba55 SHA512 0e6ac0ba7555bfe9a8ca721575f7ae86331a6d31d76c28f1a52194cefd73646e6e52d90c5ca4601e3a8baea9ceb4c3cce08f75607fd65244ff4798fe668fcec3
 AUX habak-0.2.5-gentoo.patch 796 BLAKE2B 901f4673a8509029fde736c4dea5f809c268682b8a1800f51b21da40eb052a537e199193546c46169cb2d2914e61dbd8861b6e792f7618d8deba1122a2cf9a34 SHA512 0e18a2186dc533fe6defbb089e31999d16b1da3ed18a1315c6c54ea20b52641114a94cdc62d952d9dfe33f2a03899028aef4d6552141e79fb9399e9e42b396ca
 DIST habak-0.2.5-sourceforge.tar.gz 28747 BLAKE2B 60c6f60e0a16dca2091f41c9e4f419e5fb4be88a3ce44de98d91740f94e468fb7bd64bbf0b399b64035c21547b50fccf2e40954e0ff59ab1f1c0ce8dc6e56670 SHA512 4b1ff1484c65f74441b297e558360a8f2ea8f12ac63c4b74f846e41328dd84a1d619bde55e81224c3bd527897625e17bc07a6bb0d4cc3bd0eec6f4e787201277
 DIST habak-0.2.5.tar.bz2 22657 BLAKE2B 10b3c4808251b255bcf26935974514a2df5946520bd4bc080b9bdc551c727925c8b9a7485124013303654769b9daacff42d54fc0e5d567b26d99c5a75a0a50c2 SHA512 256ac24a3b322397b6cdbd2ca8add5938c77d166092a783234baa6186c3b4e01aeffd0b890749c7ac14aa39961e5fc6326f614ceb04eadfc5e4af282d04b7188
-EBUILD habak-0.2.5-r2.ebuild 955 BLAKE2B ce9836d9b21573542341bc80036cd83b0e5305be8e2fb446cb8896820dcd1beb375b5d5d41769660729248483ff7202c957703015c3d94b46c0ad56a78fa4590 SHA512 32324ee7e7f9401b99e3186d6f684581ec9855e1f9ebaf18fda0d016abfb5d7a7347d91fe68e5aeadac3e76c35aa17416652f2fb00d2dc168284d2b0ab3a6bd6
-EBUILD habak-0.2.5-r3.ebuild 787 BLAKE2B e792615c561d5433f74719d61440daf69544d3a343254da0218d0c70c6730b49ae8c8237cd74d9d380aa8cb6f0d518f4a421fc8dcfb5d4bdef9f7e646835b69f SHA512 cf414a9b0b5acf812d518a08683115550f24df563e00d916fb06328bdc477ae0984f04c98e4247e01e7f1ed8bffecb495b4b82868eefafea076fc400697b7364
+EBUILD habak-0.2.5-r2.ebuild 956 BLAKE2B 0c27836b12bcad965a56827eba474bbbe2f8d171e13d4decfdf27134f4f130d4c117ac3a870d627995b0b498eeba69a306689bf945dc991c22d879d89ec1f1d3 SHA512 04888da2afaeff9d95e7feec77fac246954039349b0f1de668b61b71499b448ebeb45b2a85795c1d53743cc8a08b80b3829167493882297e4ed4271c9265c2b3
+EBUILD habak-0.2.5-r3.ebuild 824 BLAKE2B 082076f0220dc405bf34ca692b4fb20d919b467a1c2f1aeb9fea58dd855059a11f11fbb48a22609d0b56c7520cecc4bac9f1be76aa1f53650be6ff6749ae4da0 SHA512 2aa8fde84208f8c979690386d2ffa4294b9f568ae3206a03587841265d3db821d67500b57a401ff60e39867a2ab7e92f42388362d4c9d2cadef3bf794879a475
 MISC metadata.xml 272 BLAKE2B 4dbd2b5ae92564a97b2a06ab0ec6562e8dce2dd636aaf0788ee09f8688ca5d5b6483084a65366dfbe6d144d30170e5558bc5759adecb96abb405ea96a5147285 SHA512 ebe67da08587903b5b82fc194aa3c8f1ab65371f60d2c134928362e089550d9e9fd9531bffe8b676a345b5bf0ab209ce7f50d37d98201a88176f002e17582493
diff --git a/x11-misc/habak/files/habak-0.2.5-fno-common.patch b/x11-misc/habak/files/habak-0.2.5-fno-common.patch
new file mode 100644
index 000000000000..0fad5f4df563
--- /dev/null
+++ b/x11-misc/habak/files/habak-0.2.5-fno-common.patch
@@ -0,0 +1,33 @@
+--- a/src/random.c
++++ b/src/random.c
+@@ -8,12 +8,15 @@
+ #include <regex.h>
+ 
+ #include <errno.h>
++
++#include "i.h"
++
+ extern int errno;
+ int syserr;
+ 
+ #define ALLOC_STEP 1000
+ regex_t regexp;
+-int size_files=0, used_files=0, i=0;
++int size_files=0, used_files=0;
+ char **files, *wyjscie;
+ regmatch_t matchpos;
+ 
+--- a/src/habak.c
++++ b/src/habak.c
+@@ -14,6 +14,7 @@
+ #include <Imlib2.h>
+ #include "types.h"
+ #include "proto.h"
++#include "i.h"
+ 
+ habak_l *current_list_item=NULL, *first_list_item=NULL;
+ habak_t *current_habak;
+--- /dev/null
++++ b/src/i.h
+@@ -0,0 +1 @@
++extern int i;
diff --git a/x11-misc/habak/habak-0.2.5-r2.ebuild b/x11-misc/habak/habak-0.2.5-r2.ebuild
index 0fe95e372ed3..eccf2565b00a 100644
--- a/x11-misc/habak/habak-0.2.5-r2.ebuild
+++ b/x11-misc/habak/habak-0.2.5-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.gna.org/fvwm-crystal/${PN}/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="media-libs/imlib2[X]
diff --git a/x11-misc/habak/habak-0.2.5-r3.ebuild b/x11-misc/habak/habak-0.2.5-r3.ebuild
index 1dcc37e3e714..4279398d92db 100644
--- a/x11-misc/habak/habak-0.2.5-r3.ebuild
+++ b/x11-misc/habak/habak-0.2.5-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,6 +23,7 @@ DEPEND="
 "
 DOCS=( ChangeLog README TODO "${FILESDIR}"/README.en )
 PATCHES=(
+	"${FILESDIR}"/${P}-fno-common.patch
 	"${FILESDIR}"/${P}-gentoo.patch
 )
 
diff --git a/x11-misc/icon-naming-utils/Manifest b/x11-misc/icon-naming-utils/Manifest
index 5d2c47497d92..3717225aa106 100644
--- a/x11-misc/icon-naming-utils/Manifest
+++ b/x11-misc/icon-naming-utils/Manifest
@@ -1,3 +1,3 @@
 DIST icon-naming-utils-0.8.90.tar.gz 70321 BLAKE2B e4944c6a279ffe38c8966783c799b1a84ba626a0611c3c29a7bccc982dfd45c7ae9d38d8b99f2e796466812a98a9216a440e871058b73aad537a0f2f4339d5ec SHA512 6c23f6138e053f9fc6de9d56f94b80849f29f9fde46cdf54b705720cb48b0c660f315484fb36fb9936d4ceade7768aad2d17280545a4b392aa56185c9452999d
-EBUILD icon-naming-utils-0.8.90-r1.ebuild 564 BLAKE2B 738a7ae383a25570420c28ccbf13f1f04bfc14868dfe9fc7932456dd70572cd0c87ce3733c68757e94044ce22cc109df226866188688e2bea1a0f1fe49cafe3c SHA512 dcccd159a7e145f05fa13f68cffbafb8684567169b0c9077696fe53de19cc63e57ad2f5fbfd3b2dd661c4d43265b765493c3a56534e05b916f0a26d5260b9965
+EBUILD icon-naming-utils-0.8.90-r1.ebuild 565 BLAKE2B e80d0b7d15f440fe1d003b66485012763a3081d11bcb2c216078f57bd9238bf97686ff78bcbda03b4d0c679888287d3932dfd6b4b60aa33d801210c8a10a3113 SHA512 7e11785d1e520217845e30cc599c74f2032d6349dea79a62c41e4fbc2faf31f9b3523e1054549ef10fcef7643cf96197451fe1e6b4cf83cb60caedee2d673221
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90-r1.ebuild b/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90-r1.ebuild
index e44c11d26098..08c8f0c7c82b 100644
--- a/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90-r1.ebuild
+++ b/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://tango.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-perl/XML-Simple-2
diff --git a/x11-misc/idesk/Manifest b/x11-misc/idesk/Manifest
index 50bbb5f9c282..c292377071d1 100644
--- a/x11-misc/idesk/Manifest
+++ b/x11-misc/idesk/Manifest
@@ -1,4 +1,4 @@
 AUX idesk-0.7.5-glibc-2.12.patch 544 BLAKE2B 460044772e452f1b583513c8926e99d1021e80a3906cdcde918f7177da415ac9d898d2097088d37a223b424444d25d3e0fadac489549a85ac1b1a812525fb16e SHA512 f21f419d7facc62990a35b67e57bec2f9b46c76a6026a267348edfbd0207c14682cf1a3b8ca0ab4d508668a0c4dc9cc8ad06921b3218f077225bafc3f1ae9fc6
 DIST idesk-0.7.5.tar.bz2 185858 BLAKE2B b1cc2e423ff7f9f9db12fcfd46c0d9b03e29ad6b4b44f79ab6fca76b356b7df798532261364e30991dfacef9d377b69bf3dc9b5f44baf817b44629eb3805f3e6 SHA512 42c15cecc6e2cf6546420542fc4480902fd33c26c19ffc32e65eb04d09116d3b80f5539cde4ca86d4bec30ce96417752bfe7416ec83c531235d9064d06ec0475
-EBUILD idesk-0.7.5-r3.ebuild 771 BLAKE2B 910fea494d02cba66fd2a7770116075413d82990e54e1c5a2d6d0d503d2e0bf13d7c2689e929b0c608ca46c3c238f24fb831548e21eb9843fd423f1aaf150245 SHA512 a2dc376a5faa6c342d6ff3dfca473bc91a8810ec063a9300225857696e773117422fb5a035994eabd67b349849664cb4dfcbf4a2a63f6829791700e7ef14108b
+EBUILD idesk-0.7.5-r3.ebuild 772 BLAKE2B a612ee88d3ab007ca4ae66203fa5080905025ff9ec404e278b55c3d8d397a1524e890c52c51a66c1f52618d0a31ff41a809bfcf555a650601ef58c0e48d4e010 SHA512 b39fd400fed81186612c255c1508ab52947e578e4da9ca81839737c9559c752dc9dd77ec04a6313ecdf78b760b231ca48a7bbb7d907f1f43a5dbf3f6d22d6974
 MISC metadata.xml 351 BLAKE2B 057803e3853f27e027d449303e5c8a326d453e0d6d701946bc008dd34581e5cfb037b79c0c0eaf44f48ade1d65e88ba84affc5ad643e42a0339b29214a5f26df SHA512 038678d7cde9b7ec4365e763f7a5759a36eb125b7852d9e110f31e1737ee04c1043c73dee482f998c4284176f8d46cc7ee8a1a2e044651e9945e56d6523c39e2
diff --git a/x11-misc/idesk/idesk-0.7.5-r3.ebuild b/x11-misc/idesk/idesk-0.7.5-r3.ebuild
index 0ca01640be47..6969b99b185c 100644
--- a/x11-misc/idesk/idesk-0.7.5-r3.ebuild
+++ b/x11-misc/idesk/idesk-0.7.5-r3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/imake/Manifest b/x11-misc/imake/Manifest
index 3270017d2d24..33ab2372063e 100644
--- a/x11-misc/imake/Manifest
+++ b/x11-misc/imake/Manifest
@@ -1,3 +1,3 @@
 DIST imake-1.0.8.tar.bz2 159398 BLAKE2B 2ea03a06daab883a35ac4ef5c5598db89c84b2bbc41105902f64ffaf66a2e5cebaa28bef0ee7d258eb7279eaa95671b8798701423cafffe87d8feced5bc1b63d SHA512 5352b0148664506c8eb7ba80f95fced146d150398673547ba0b2c7c966a382bc21de43dfb8e0d74e38a0a563f16ddbec48bf8c8e6daa1a0899a95403579d7728
-EBUILD imake-1.0.8.ebuild 462 BLAKE2B c7ead61231b46222e6dd648e695cd042a101315bc299f84836bce4b8917fb3103345c46dc72751ed3cc8e5c14ffeb3cf9753852eda251433ffbe10a63fb08ce0 SHA512 755e3ee7bdbf8ab319f63716a7e5231fe12beb9132bc0f3ef58f599f3393bc83963a10594dc3f238160df32a1b787702b29ced478f4a30d96ca4d39e4c529901
+EBUILD imake-1.0.8.ebuild 463 BLAKE2B cb63502b4e76f63a6a8a8732769639822ed0278d9983ed83e649c4490fefd4fa253e4e9f58bb9439fd227aac8b0a1861badb35ae48ccabd614cb16d832a59041 SHA512 1657ed6cd216a7803d4ebf7cc3af09c65a5fbe8631219c85ff119d45038e912a304ae23cfeae71126acd069d331a8771d3cba725466f81401784293ca12103fa
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/imake/imake-1.0.8.ebuild b/x11-misc/imake/imake-1.0.8.ebuild
index 01a81c36cb19..b18b8b9f7624 100644
--- a/x11-misc/imake/imake-1.0.8.ebuild
+++ b/x11-misc/imake/imake-1.0.8.ebuild
@@ -7,7 +7,7 @@ XORG_STATIC=no
 inherit xorg-3
 
 DESCRIPTION="C preprocessor interface to the make utility"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-misc/xorg-cf-files"
diff --git a/x11-misc/lineakd/Manifest b/x11-misc/lineakd/Manifest
index ee9c777a819e..4d01e7352a48 100644
--- a/x11-misc/lineakd/Manifest
+++ b/x11-misc/lineakd/Manifest
@@ -2,4 +2,5 @@ AUX lineakd-0.9.0-DELL-XPS-M1330-XOrg-1_5.patch 795 BLAKE2B ebf8e451208c38cd77ba
 AUX lineakd-0.9.0-gcc43.patch 772 BLAKE2B 48346e5d1a3978be0964dd6844991c58da30a036fdb12bec9b1970c3aac9d130f81891e69ed59ef772ca4b6dbfbd71effdc2556b800f6008505322c8aaa67c91 SHA512 0ade361637b26db613c5a3915d8b364cf14eda14eb744618c03440ead5f0774f853dba7c0518432ae4f872e201d5bb0503fa7e4b5eadd71d049adf5b654c8407
 DIST lineakd-0.9.tar.gz 991376 BLAKE2B 70c19d446b814562a4d9efa90b4492cc5a3fa63c8d252e6e2bcd418c1fee177924e61ec7ebfb0471fdd18eee5f7f3e4ed0fda17bff5b216cad9caffd06d68783 SHA512 e30a2e111832e3f08bbff858647536aaeb75d20008618b8c7555836104fd5a66d8e3173d0f9da76906caf13e9c9753c9140cd22dbb96fde464ed5d5f254d721e
 EBUILD lineakd-0.9.0-r2.ebuild 1056 BLAKE2B 7b946b432e8be57f06641b60767ad848325d1da54fb384a363e2bc4b85f6c9e4c977a209ae89a356e6c35289b14fcf7e09b64a7d170ac770406bb2923e22c0b1 SHA512 e070f0225b51bbbf618fc9fdce573da8f09abb0d64cedf7275724e33fb4611e87d59af2542f6addd0fce672ad1b888ba6006ecfc7ec254f4e52f7c8fc174a450
+EBUILD lineakd-0.9.0-r3.ebuild 1140 BLAKE2B a01c354739a0391425b854ecb653dfb1033b0bb5faf66433e5bf373f36200e62e1b1cbd69584194e8c548e00b63c55c5559be9b20ae1492d3a417ee8868d3fe5 SHA512 5c370ad18e0a90126601e7e7bce6e9deec5c4e9fff440d95cd544f6ff53c7a11c22ce458f3c0076b0cb316c8381b650df3ff1a040ddd31c812aaa5723c65bf64
 MISC metadata.xml 352 BLAKE2B 4110d9b5e116df93d0d52f464d392dc4b55d95615b20db7c92e8792ff684e60c84ed9c9703272eb7ce70688de54ce1943c99d90b2f6d81ed8342898fbe710346 SHA512 1abdaf434e7034702a0dfceff233083abc0bdaea90e215687ace13b6d005502da7193794cdc7beda708e741c5562313b93fd41677fa07d4f68bf8ef7cfa81939
diff --git a/x11-misc/lineakd/lineakd-0.9.0-r3.ebuild b/x11-misc/lineakd/lineakd-0.9.0-r3.ebuild
new file mode 100644
index 000000000000..4848da2c45c0
--- /dev/null
+++ b/x11-misc/lineakd/lineakd-0.9.0-r3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib
+
+MY_P=${P/.0/}
+
+DESCRIPTION="Linux support for Easy Access and Internet Keyboards"
+HOMEPAGE="http://lineak.sourceforge.net"
+SRC_URI="mirror://sourceforge/lineak/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="debug"
+
+RDEPEND="
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+	x11-libs/libxkbfile
+	x11-libs/libXt
+	x11-libs/libXtst
+"
+
+S=${WORKDIR}/${MY_P}
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc43.patch
+	"${FILESDIR}"/${P}-DELL-XPS-M1330-XOrg-1_5.patch
+)
+
+src_configure() {
+	econf $(use_enable debug) --with-x
+}
+
+src_install() {
+	sed -i -e 's:$(DESTDIR)${DESTDIR}:$(DESTDIR):' lineakd/Makefile
+
+	dodir /usr/share/man/man8
+
+	emake -j1 DESTDIR="${D}" install
+
+	dodoc AUTHORS README TODO
+
+	keepdir /usr/$(get_libdir)/lineakd/plugins
+
+	insinto /etc/lineak
+	doins lineakd.conf.example lineakd.conf.kde.example
+
+	find "${ED}"/usr/share/man -name '*.bz2' -exec bunzip2 {} \; || die
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/x11-misc/macopix/Manifest b/x11-misc/macopix/Manifest
index 5265b7de90bf..004f264833e8 100644
--- a/x11-misc/macopix/Manifest
+++ b/x11-misc/macopix/Manifest
@@ -11,5 +11,5 @@ DIST macopix-mascot-pia2-euc-ja-1.02.tar.gz 191520 BLAKE2B 7fa81c34df02751563fff
 DIST macopix-mascot-triangle_heart-euc-ja-1.02.tar.gz 310099 BLAKE2B f52f2ad14cd9c76f32eb8c582bd07886f50eb6ae2615766306081ea1850b51b205b5177831ca30ab4049fd07081ff42d5dc7c9858efa49ab79a6acf2135ff9b1 SHA512 133a3446a3713192ffef84cd381065b2a99db2eb0dd18692d54e7974eb26aa63eef6d051466ddf89152f6baa8e4625ae6e7e975cf944dd12e0b6cc17c56e5673
 DIST macopix-mascot-tsukihime-euc-ja-1.02.tar.gz 616138 BLAKE2B 8616fb0f3b8e4b72c6576dfada3794dc3e387d250e3a6f64eb2b290ef793f62c43f20ef9c03d2b309f4fd3860ce828a562f28ec37ca55ce8e2831315ccbd8a63 SHA512 226a175846a1f81a5aeedab6d7b85e38903d3b85a88a4a2c9a91365ba8a149a9ee54d6174bf8c4595cbe6542d3afcebd440a4185402c2139310664059515a2c5
 EBUILD macopix-1.7.4-r1.ebuild 1813 BLAKE2B 91da4479a1a1385166ad0553b27610061e100486dd23b54dbfcdf97543aa6e180282b2f8283cbef50b3567308e9a1a3d5f611b104e46b3614083959cdcef0e97 SHA512 0d5f63840612f49787422e1a670b840db03f381d38cb686873a0bbd8e6cc86f2525b5dc826f4d003c769c03ec801920d389684fc7fa37838d78ddb4a2155f809
-EBUILD macopix-1.7.4-r2.ebuild 1770 BLAKE2B f707f59869697cb0650f4ea63571fa7ca71730bda7131b4b43adc4272bcd073f745f96544bcd30263f43646ee434c7df46689a10c3af07c1793ded2ae9a621d1 SHA512 35e71d8325425b5e7be9303ca0a822e8f46b2a36fe1470e7bbfd215f0227b8a5dbe4b0ca19d07c92110e760a086c9c41d09f5827efa2c7b937d04c5e987c3642
+EBUILD macopix-1.7.4-r2.ebuild 1794 BLAKE2B 77e5701b7376e7dd6bdca55bb0428091ccfee074db21885b1768c192f54056462afe11bafd88d6883c7c83d1b655d11b9ce1a6b20699a0b40d250de5ecf1794b SHA512 570bbe33da66bbd83c7d8292dde3033cd89c45482e4b2bffc6dedb12d1b2fc5aadf2f2eead9d1dfb4ca3f6cf1f0bfada9efa15eaeeabfbb444c7ed199b980301
 MISC metadata.xml 272 BLAKE2B 4dbd2b5ae92564a97b2a06ab0ec6562e8dce2dd636aaf0788ee09f8688ca5d5b6483084a65366dfbe6d144d30170e5558bc5759adecb96abb405ea96a5147285 SHA512 ebe67da08587903b5b82fc194aa3c8f1ab65371f60d2c134928362e089550d9e9fd9531bffe8b676a345b5bf0ab209ce7f50d37d98201a88176f002e17582493
diff --git a/x11-misc/macopix/macopix-1.7.4-r2.ebuild b/x11-misc/macopix/macopix-1.7.4-r2.ebuild
index a862222fef25..21fa93789d0b 100644
--- a/x11-misc/macopix/macopix-1.7.4-r2.ebuild
+++ b/x11-misc/macopix/macopix-1.7.4-r2.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
@@ -58,6 +58,7 @@ src_prepare() {
 }
 
 src_configure() {
+	append-cflags -fcommon
 	append-libs -lX11
 
 	econf $(use_with gnutls)
diff --git a/x11-misc/makedepend/Manifest b/x11-misc/makedepend/Manifest
index 6d65664667e3..443b43d32d2a 100644
--- a/x11-misc/makedepend/Manifest
+++ b/x11-misc/makedepend/Manifest
@@ -1,3 +1,3 @@
 DIST makedepend-1.0.6.tar.bz2 147616 BLAKE2B 6e9538e435d602ab3bcfb35a5398d6f11a23e4c9fa19bb2e3f651967d3fb1945557af2a5d84fae3e46112aae9ec411894cf8605e4856a46b120b660ff4b95ea4 SHA512 eb0e8ee8ab7515806d7d98a060cdcd392ec38e4225e5e05db26daa6651f185d0b764aab403edeea904d4d23211b1f7db20daeee6eafce8abe65225784ed0aa42
-EBUILD makedepend-1.0.6.ebuild 416 BLAKE2B 276863a05377d0d45994fe7a8f5afa9cd571ac0645578e60c60c8b68f627905a512b6eb5b696ccde94a7dcc3da13cba5354fd6107e55282579e8a56d854c6e4f SHA512 db57a74ca5f9b163e53fd85dbff1338874446b87f1b7d51a505211fa9d449dc78d1e0a16064038c3811a6ec37fad99942c41513449f56eacaf80d5669abd0199
+EBUILD makedepend-1.0.6.ebuild 417 BLAKE2B edb5a2a19bcc31bcc8d93a1788cd4014ca67f7b92e20b2062b2353b564401ea191ed0eb231864e7a065da93325b53b9834458f16f665e0923486f55a5d3c5561 SHA512 3445da5e5ac077e9f8a8d9ea36ce0e5626b19e39f5763fc8cd1b662be95793ae72a245b93620a0de8e771608cd0c656b8bf6cc3d3d7809a3bf9614ebafda8c36
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/makedepend/makedepend-1.0.6.ebuild b/x11-misc/makedepend/makedepend-1.0.6.ebuild
index 2b5e681677d1..913edc6187a1 100644
--- a/x11-misc/makedepend/makedepend-1.0.6.ebuild
+++ b/x11-misc/makedepend/makedepend-1.0.6.ebuild
@@ -6,7 +6,7 @@ XORG_STATIC=no
 inherit xorg-3
 
 DESCRIPTION="create dependencies in makefiles"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-misc/menulibre/Manifest b/x11-misc/menulibre/Manifest
index eda2a33fd16c..bebcd49456fc 100644
--- a/x11-misc/menulibre/Manifest
+++ b/x11-misc/menulibre/Manifest
@@ -3,5 +3,5 @@ DIST menulibre-2.2.0.tar.gz 430567 BLAKE2B 7910f9f8e23b2ca3254b5a83a7c16315620be
 DIST menulibre-2.2.1.tar.gz 453217 BLAKE2B 86b3d2d8b20bfc7dcfcba380f656ec1e99f1d5dbc3779eadb9e7cc3a2b8c96afc0c2efe72802d0c93833f6c705c67d05a4ba6cc6cf9b95e0c9b9850ae4424fee SHA512 cf1425d604af26b7bde92106aa758a1f7dcc66ad1fbcdcd4c23db90bc7b6de5fe1160b917035f1d949daa1af8ba6b1145d7376ae637c8937a25cb108bf8cd15f
 EBUILD menulibre-2.1.3.ebuild 1717 BLAKE2B 468e64d1c96d0d32c127795dd9dbf5e133806868ef3c30b2d7cb03572ed27ef3654509559b467a544901376aab71360bef1cb1ad24faa577b6d1ae5981e9795c SHA512 ea0726869f8ef164ee0babdc6fcc976ddf4ab3557bc88798e50573242e68edfaa016b0e7d5abd7e9d93a8ce8652304d14a6d6bde0fdb96bb41126dda805f6837
 EBUILD menulibre-2.2.0.ebuild 1743 BLAKE2B 67db6f33c8cdf804133357962238dec8fcca7ec860516a5414b45af49d847c0d50bb5ae1d57b7525bb9e498c5d98363233327ad9bb63345b50aa9299e6a9562c SHA512 c9d4c9a0031dcac581eadfa60ca9130cbb1d66b63d368e19e082bb653a5253cdec8924a8678755a13e0d417d48b59ba6a32e6ea71d7f2e11a9cbc20ec63a0158
-EBUILD menulibre-2.2.1.ebuild 1704 BLAKE2B b3382ae8b5e5cfed9759091386c8acabdfcdc85939017e5d1869df483d6c0a75b4dcdb4be42a349257b3ea65aa4e5f8b65c65424f816ac47a3ab68f6da9c75ca SHA512 dcc59ca9b391f63de30c0d81e75a94157b723b230f08e1ff37cf6c01be89c544261a20c1d981d1dcb19606b1fb9f6c6f65b51f2b674774f9dea8c7d59ad17420
+EBUILD menulibre-2.2.1-r1.ebuild 1721 BLAKE2B eb66414a140e9c6164a83942b5be814c90451d8fe274158e40788da1c895fdf9432096ca041576dd8af1ea2330896408b48caa64d01e039a36544bee11d45106 SHA512 26b47e0fc065cd0d5779f2c4c88e89db4e14300f2c5c236aeb41b54ab1d0d0aa65ab2d246a3794d646dcdbcd3c7b3a6ab962a72b9e948bb024c62a482189103a
 MISC metadata.xml 353 BLAKE2B 6064836036ff045dce0bc62fe8b822aefcd75b1cbb5746e12c2a2c5399802c1412b4f6bb9f9582785d5f8cff63d61f9f0c71505fd593e649e26c30f7c7019d6a SHA512 256e7ca3b20708caea270d07348c477b3d9e8300739092ad80468f4ab60e5e85b21246cf906d51a1929e627d27ed62bcf23136a3b8edc684c4ba1b53e3282454
diff --git a/x11-misc/menulibre/menulibre-2.2.1.ebuild b/x11-misc/menulibre/menulibre-2.2.1-r1.ebuild
index 95d8dcfbf47a..22d9bf1344ac 100644
--- a/x11-misc/menulibre/menulibre-2.2.1.ebuild
+++ b/x11-misc/menulibre/menulibre-2.2.1-r1.ebuild
@@ -54,6 +54,7 @@ python_prepare_all() {
 
 python_install_all() {
 	distutils-r1_python_install_all
+	python_optimize
 	rm -r "${ED}"/usr/share/doc/${PN} || die
 }
 
diff --git a/x11-misc/mugshot/Manifest b/x11-misc/mugshot/Manifest
index 0ee229dcc4d4..01a3a0b11eee 100644
--- a/x11-misc/mugshot/Manifest
+++ b/x11-misc/mugshot/Manifest
@@ -3,5 +3,5 @@ AUX mugshot-0.4.1-use_office_phone.patch 996 BLAKE2B 4c8647647f424775a1557f176b2
 DIST mugshot-0.4.1.tar.gz 121660 BLAKE2B ce0c0d4b76184f35e4ba5204b984393412924c0288b09fe51ec0e6635b1556e24ed98ce4a893ae57f25810bb39ce035fb40b6990e1b6516406cb0f670acdbac0 SHA512 f7790b3f80fc98d9b19e9b9dd74eafc41ae7598e38f70e148502056b4bd375922271cc72cf4664280f1449b2f5e1d89052ecc5d37c6dc453041e5312f736bbbe
 DIST mugshot-0.4.2.tar.gz 121020 BLAKE2B c092e25273dbd8ef9cbfbc001fb5f86b134ed8f9bf5d84993d5f46664f17eb74eda5c121ee70b5f0c4b0adb5aa1fc4d21d8c59d3f0cf4a4f67991d06690f5aa5 SHA512 721629cf4a7e4d84fd8505279cf88c88ac88c7b6c995ac84a2fd6a9b978c92716bbe20d7b0301ca70e99c007698e4cddf41b6cf1111bf496eec4d39591cd9ed1
 EBUILD mugshot-0.4.1.ebuild 1379 BLAKE2B 37f3ac78d45003c6ea1ff7ae2962df1b8570bede4855fb3c31dd3e3efd7f62b111b23ee84277ebb1648d9b2e996231b9897c38e2d7c3a3f4b7808bfcbc3807d6 SHA512 d17b643af0187e52ab4749c0e02059f4b814ac6ab6adeb3401d0574c8137fb7568df8e4966d522cc79b8a695d0c4039b997b90ac4fb5bd0dd9dc6133b9827ae6
-EBUILD mugshot-0.4.2-r1.ebuild 1536 BLAKE2B 5129a2242d861d424a3fb107571c4f142d1d59f2d075ea1c494e486a58ef05db3cfda550ff35a6566994e4983438eb0333a8b13993ec07d1cdd8b0ce798a8546 SHA512 3322e88933e34ab441819b531d34f198eb2a588a21eda7c51539211865acf433b15008d47714c653661c05e8be096ab630c0cdead13496ab8d43826ffa226e82
+EBUILD mugshot-0.4.2-r1.ebuild 1535 BLAKE2B 350e700b586efa542926143101f4fe664125faf7fff5c4b0900219ac0542a2dbe70e09f1278eb40a9f168336a0bb41f9dfe4e67bbc8ddcd49dc0fc9e84e29efc SHA512 d452547817dafd12c8c51eeef333969ddb939ef55af28e689377ea87a1c64939eda40dc483c92343f8e4717f829df341f95706809a9239833ace3e79cbd25f86
 MISC metadata.xml 943 BLAKE2B b39c09aa84b6a1f25d001e073b2c369af9ebebb7448fff5b3abc83898516963e117c33d1c03fb6db72422e4b20c065ed78e711326f28912e1ed5321b232bbee1 SHA512 3b4e66543245b2db7d1c255adf30112834935ab552a7d6773921838510417e000fd41c63fcab7e6be8df043f3daeab1cfcbebccaebf44f6185abfcb47898a3f2
diff --git a/x11-misc/mugshot/mugshot-0.4.2-r1.ebuild b/x11-misc/mugshot/mugshot-0.4.2-r1.ebuild
index 2341865d2256..bd4ac251e3f1 100644
--- a/x11-misc/mugshot/mugshot-0.4.2-r1.ebuild
+++ b/x11-misc/mugshot/mugshot-0.4.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/bluesabre/${PN}/archive/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="gnome libreoffice webcam"
 
 COMMON_DEPEND="
diff --git a/x11-misc/notification-daemon/Manifest b/x11-misc/notification-daemon/Manifest
index 22ca03e5575d..12e275d35e36 100644
--- a/x11-misc/notification-daemon/Manifest
+++ b/x11-misc/notification-daemon/Manifest
@@ -5,7 +5,7 @@ DIST notification-daemon-3.14.1.tar.xz 280344 BLAKE2B 8e965cd52f97129f8f6116c9e2
 DIST notification-daemon-3.18.2.tar.xz 329196 BLAKE2B cc4b00474ea20435fa412c1c27a95614baea06bfc00bf09c25b539e44ec8c41621eb7903a9245407e23a2a098290160d970e66dfe9cabc3bdf1ce3663a418f06 SHA512 962d84eb1970451d12d07027d4ee6843a96dc42c7d954dcb79bac55cd9918dcc84a2903b4ee032a0fd8f25d269e5e965a1deaab3da34b4181ea304df2adbae3c
 DIST notification-daemon-3.20.0.tar.xz 340752 BLAKE2B 9ded1efdb38de0097495ff570b9b91eb151e5eb030fcb9364a5ac04a4a5631c0a8483dc4068dd806d54ef0a096062ca92f9783f2030edb57f681b82015cf8584 SHA512 d9311c71a2915cb6e55bd1408e60b4d7b7fc24114410b8bd8cb358fe86c100198567099843b967f7e01ca03c91afe3f3980fb30b7f2c138bdab949e0e196a0f8
 EBUILD notification-daemon-0.5.0.ebuild 969 BLAKE2B 2a68f40ddd286ffe671223695c6787b72572a20e5e65f1ec613c06a56b2acdd23c4ea3729b2fc6d3a17778756e057be117819349ab8eed9145a364526997f35b SHA512 c280d0805d07355a65b7dfc6de6f028eb73d153968a31cf3e41139b0dde29820b7ae8fa69542b6ec81618044113e783f63990f380b55567508dff9a321bfda3b
-EBUILD notification-daemon-3.14.1.ebuild 966 BLAKE2B 3f67ad0660fbb59b9e89a08b287bb2824206b0acbeb61ebb6483bc807c11ca1ccd2e98d66f1fcc0d6e9ce16dfa393887fe8f014c6351b91868b5a9a76935307d SHA512 3d08e510c89430f9b00f4a711909eed031ea7d5e699c69d91af331cd609ee5ccde3d78b3e197715fa9add92e505d8007d6b3a9739c1f73e7483cb081dd25d08c
+EBUILD notification-daemon-3.14.1.ebuild 967 BLAKE2B 9aedc9b5ec39126c8f578fb40a41d70d0592e309d3933bbd343c2a9db32a05a89544de3bcb650f1f53057255d16b8d8bc16c6f83f0741370fb17c0104c195087 SHA512 c4f2f48ca15beb048a51200e00fa525abd59dd6f0ecec0b942d59efd76cd5ad926d3258f9ff49c7c68d5b82ec678d727c52f71319f756e60a5d16b89f7872b22
 EBUILD notification-daemon-3.18.2.ebuild 940 BLAKE2B d265bca0c9bf017e0804e1315518dd2b9fe0d388aa07371ef21d9c67772f2d2d6a2a632da907133de90f3bc1a706da085fafd836632ba807dd9da3a33a13f8ea SHA512 ea61831fda3a51c6e06e4100f3a4cecc7c4ebd9e5f3f97b84ad5b14f3bf16910920d29724051d84a4cdf73345fdc098b15f937290e9962bfe84d5675a2a77d79
-EBUILD notification-daemon-3.20.0.ebuild 935 BLAKE2B 2a6564545b2787298fd503e2a40798aa58cf49be73dbc57ba3b86826eb0f3ff7f342a3cabbcc2494c66e38de454c1c7e698eceb6272ccaf5e5adfba18661ded4 SHA512 c361641e82d40c238bacd3e2c0fc286e2abc9d85110afe16804b37f9ad6cce661071cdd5b45cc0c668004f5b08b78b53e4b99358bc5927a4124b5122d7b0c5ca
+EBUILD notification-daemon-3.20.0.ebuild 936 BLAKE2B 841509ec88bbb98d93b3d865d31c0102819dd50eaa0e5187b4beb9d782cb1e98df477459c6746364d91af817a394b603d9f4d6e457cf3a9bb80f3553df82b832 SHA512 e290c9a7badcaae905414094cbc54c6296c694552300fab1e1129a5b49695ef2f77ef6a7040e838c8f7f2484bd1bd33a99c5c8f7d1febbe1328721f67a21946d
 MISC metadata.xml 270 BLAKE2B 9c2dafa0390cfc7b94b5c44505d72021bf57cf8ffb35be7a3327f4316c3e4b2dbbfa0325d97243a8ea933440a5678cc5d35c639f5aa210b1d5ceb8ab65eb5d90 SHA512 92c366ec57074ced42e6f9960f97d1cd1a022dba7450b51f3617a6a5e00c755496dfa84aa4ac259f4b00c676366b1eaa3ec30eeb9bcb0bf41253d1910005db2f
diff --git a/x11-misc/notification-daemon/notification-daemon-3.14.1.ebuild b/x11-misc/notification-daemon/notification-daemon-3.14.1.ebuild
index 320c2bac021a..eda0c0779781 100644
--- a/x11-misc/notification-daemon/notification-daemon-3.14.1.ebuild
+++ b/x11-misc/notification-daemon/notification-daemon-3.14.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/notification-daemon/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/notification-daemon/notification-daemon-3.20.0.ebuild b/x11-misc/notification-daemon/notification-daemon-3.20.0.ebuild
index 96e4bd4b1523..0f26e99ae1df 100644
--- a/x11-misc/notification-daemon/notification-daemon-3.20.0.ebuild
+++ b/x11-misc/notification-daemon/notification-daemon-3.20.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/notification-daemon/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/numlockx/Manifest b/x11-misc/numlockx/Manifest
index 6073b7d65fc8..2e78cdaab02e 100644
--- a/x11-misc/numlockx/Manifest
+++ b/x11-misc/numlockx/Manifest
@@ -1,3 +1,3 @@
 DIST numlockx-1.2.tar.gz 82703 BLAKE2B e874671fca1991c541022859bae6606d550fed66b4f40ffdd1bc2cbd74ce65f8148845014d7290db7fe7a333aad526ec186197cca989bac2b519915aa374214f SHA512 efaaa67e8b2723cb1e8461dde664f1f8e9b21f34edfe2e1135a6b756fa2843aed1a386f2f9d70bd62ddae9aedfeeff856a18da8b542f2cff440f93b38e5a853e
-EBUILD numlockx-1.2.ebuild 681 BLAKE2B 9f83ee3c064dd8dd3bec5b5ce8459117bc5debe9159b7951e36c70a29cda44b272131ac792bb3e080a3403defc6d0c3cc71e455bfa0905404b686896e9a0ae47 SHA512 ef109217e4f607ddc7886f0c74dde604f6ce6a7ba462ae7866de6fdd29f8f9014e88dfeea3d7f943798830e239ee98713e4e762244f942f8711d0fc6088d0b50
+EBUILD numlockx-1.2.ebuild 682 BLAKE2B 625a041261a7027cc1c177f51d00101fcdaa32c299183eca8386353478dc4b4828f6e78c79f9661cb2c2d0505b2012fb0e60e22b26c083cbbd240bfb35009855 SHA512 079a38d5a44f72e96d94680a1588093252400c746ab52a5aa99c59a73f75b6b8a0e03caf163d025717562901e0ca2c72cdf84d6ce6980a0bc4fc5658a02322ac
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/numlockx/numlockx-1.2.ebuild b/x11-misc/numlockx/numlockx-1.2.ebuild
index 68050e42c963..e5e160a7dfd2 100644
--- a/x11-misc/numlockx/numlockx-1.2.ebuild
+++ b/x11-misc/numlockx/numlockx-1.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/obconf/Manifest b/x11-misc/obconf/Manifest
index 0eabfdf2203a..e384ff4e1104 100644
--- a/x11-misc/obconf/Manifest
+++ b/x11-misc/obconf/Manifest
@@ -1,4 +1,4 @@
 DIST obconf-2.0.4.tar.gz 456523 BLAKE2B ef3b3e4664ccd1095f5e1cd468fa3d021cd469a641930309a41c7b1cf418b9d87b2d8f4420342363dc4781d8e3aca3e8ffc0b9aac0151a2399579c5ff0997cc8 SHA512 b8cf6f363fa8c2f1d21142a3f79687a72f683f564285b05751c822ddf7a421b09c3440cbc5b08eb09d151601c6ada835ff5cc940bf5abeec2210cca26b552294
-EBUILD obconf-2.0.4.ebuild 802 BLAKE2B 1fa01f1a08903165185929b71048be1e2f0bb9a5a3dcbe954d5a6e242a2ac97c3af4f16fa688ff38e11aca5ecff33248712877451ee73a534cabb7fef53e7b3e SHA512 f4fa7f8bda2cd099e1992cd752836e9016f13b1c0f7d0a90ae49ed1de5cc9629b333b1bb879928d485b072262ac1d8bd07addce4ea68919b80fabfb9cf400548
+EBUILD obconf-2.0.4.ebuild 803 BLAKE2B 026c0b16d24f3fdd2bb96b30028ec13058abc73d7cdb54cc243e8bd988e9576a524794e13d6e6d688a06885cec376ddb8c29818d9427e24febc834b6b3eaa4ee SHA512 60627587db8700ab9cdc3adb0c5085ed326d2dfa4b7b742017f06b39d67b16c007b15c16d2b5bed3913dac46f4b5f2d41ed49179107173b5f5c56939720cbf1d
 EBUILD obconf-9999.ebuild 767 BLAKE2B 83d6d4c188108b33926b8afa8f1115a00dff7fb0ac2d3f4ccd94f0930567305ca2bd626f5159ed5e0683a6b2619e9bf6b0c6f563268a7db6be2bb218a861a364 SHA512 cc71a7f24edc705f8155ddc52e368027beef8bce3f5abc063ff1a7a6f71e8baa0bdddbcd66d95a79be6a64b682d27b8aa607771bd6ce90abbefaf667072cf71c
 MISC metadata.xml 245 BLAKE2B 26bf988c73d073000ab8d21ea881c4088b90e7081410938828744375bfa8de31cce2c78154ccfc61105c853c1f24f4994ca4e5cbb80c4c89dfd489bbd10a09ee SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4
diff --git a/x11-misc/obconf/obconf-2.0.4.ebuild b/x11-misc/obconf/obconf-2.0.4.ebuild
index 1db86b9bcd5e..ee142e7660bd 100644
--- a/x11-misc/obconf/obconf-2.0.4.ebuild
+++ b/x11-misc/obconf/obconf-2.0.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://openbox.org/dist/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~x86-linux"
 IUSE="nls"
 
 RDEPEND="gnome-base/libglade:2.0
diff --git a/x11-misc/pathfinder/Manifest b/x11-misc/pathfinder/Manifest
deleted file mode 100644
index 739a49adeaa6..000000000000
--- a/x11-misc/pathfinder/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fox-1.7.67.tar.gz 5689421 BLAKE2B 60f2d8e887a41f1e234cd31c1bd2702bcedae0f1b47cb7b9832c317e34a9b517cb603033d28e5ed66c4b97c85deaf3caa8dd40a508eaf715d63772e6ef0020b0 SHA512 a45db7ea9453e2afe0ff61ed6608925e94f9202dc1fbee5e2b88a5a1c16310019cb4611090f8234ad6ebc46a6519a36085683c4553d47bc9c21b8ef0c13ab540
-EBUILD pathfinder-1.7.67.ebuild 568 BLAKE2B eb7e6e8fc114121fa40f1362e89798dfd51342a71649aab128e7a35101589d3c5bdea62364f21f8ce988cea44f01d7902c145c4ab5d30da0e63485202f499291 SHA512 5a5964ab30b37d8edfbf082c3c21d70648701ff2dd8ce96c307f632c661e9b27411c998c64361126f6de6d2bc1dbf10104465f531366f03935fc174a6bb87aab
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/x11-misc/pathfinder/metadata.xml b/x11-misc/pathfinder/metadata.xml
deleted file mode 100644
index 7a38bb900964..000000000000
--- a/x11-misc/pathfinder/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/x11-misc/pathfinder/pathfinder-1.7.67.ebuild b/x11-misc/pathfinder/pathfinder-1.7.67.ebuild
deleted file mode 100644
index 935f2ec1c020..000000000000
--- a/x11-misc/pathfinder/pathfinder-1.7.67.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit fox
-
-DESCRIPTION="File manager based on the FOX Toolkit"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+jpeg +png +tiff"
-
-DEPEND="
-	x11-libs/fox:1.7
-	x11-libs/libICE
-	x11-libs/libSM
-	jpeg? ( virtual/jpeg )
-	png? ( media-libs/libpng:0 )
-	tiff? ( media-libs/tiff:0 )"
-
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	FOXCONF="$(use_enable jpeg) \
-		$(use_enable png) \
-		$(use_enable tiff)" fox_src_configure
-}
diff --git a/x11-misc/peksystray/Manifest b/x11-misc/peksystray/Manifest
index d02bcca5fe1f..f3c78de2c674 100644
--- a/x11-misc/peksystray/Manifest
+++ b/x11-misc/peksystray/Manifest
@@ -1,4 +1,4 @@
 AUX peksystray-0.4.0-asneeded.patch 798 BLAKE2B fa17b9f091ccb94dc11c6086bc1bf648b08b4da3e192fa1998f09375e747cab854f25b72614998ec5289e2992ae1dcbd06dc47ffce5acb299bb4106dab35863e SHA512 d3f4c392d38b2e0f143d7e7dfa7a12ecb82e8d93f6651e254ee17d078487f6d95316f88d66a125ffc25abd2574a053f9a2b0e946bbba7f8a7d5b12903dbc8f21
 DIST peksystray-0.4.0.tar.bz2 73810 BLAKE2B 4ac452f14acff5afb8e14fc07a18d5efe6b68696c7063d8cd337c14b9bc0cdcb573ff830f9cc7e3b7057154a3e2a179da26977696101fbb56750320a3913b3d3 SHA512 9dc5d1df630b7447575011e971a9657a5987bdd6098c81444b7579c46bfd7747f4df18fa00376e70b046c52ae7ca95d6cb66ce8a57070795f2f8d497fa025341
-EBUILD peksystray-0.4.0.ebuild 547 BLAKE2B 42c4115b62a092d851564ab0601a8722cbcf980bbc46035a571c5113de0a29a12c276f0cac21783b3dde562d9e93887ed6dcd20656f2eb00ec2885050817ff0e SHA512 4ff02d178772e466f82105a23556170ac74f7f8b1420cd6cf6006e0faf40001108cc5a98faa650d013978dbc759bfce2c8ba7992a946f6abb140d20a11f281c7
+EBUILD peksystray-0.4.0.ebuild 548 BLAKE2B e246349c24cd710960efdd14abaa4ee75b6870f82e7cba93174a6233edf0ade68a005eeabdb152f1477fae6b1d9660df41a2fb625132270308971a14239e4267 SHA512 44253681bf63aa07b5b49597b6f1910abd2d57a3997c521f1ed096a3693438103d45e22a49f67dd32e9c7c0185bc721d0e97e3a1da1f81ed15f67f5d88b65b64
 MISC metadata.xml 300 BLAKE2B 750e120260f327b198e47b84c2ebfafad92c8e0e4565bf01b06df63ee8ba8c092d1a7f2474bc9b422d786393521c4a2439fdad56f7e5a90974872b904ec55eb0 SHA512 9a298c4fd2d42e5f14b22502fc97899123eb6bfa42143a1efd7df086c2bd97030ab04a731839e787774b216e08cbf829d7c9802b15a0a9ed412e94455e52f484
diff --git a/x11-misc/peksystray/peksystray-0.4.0.ebuild b/x11-misc/peksystray/peksystray-0.4.0.ebuild
index 470c7f0efdc0..b2184bceeae3 100644
--- a/x11-misc/peksystray/peksystray-0.4.0.ebuild
+++ b/x11-misc/peksystray/peksystray-0.4.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc x86"
+KEYWORDS="~alpha amd64 ppc x86"
 IUSE=""
 
 DEPEND="x11-libs/libX11
diff --git a/x11-misc/read-edid/Manifest b/x11-misc/read-edid/Manifest
index 9704ff010160..8c43aec842c8 100644
--- a/x11-misc/read-edid/Manifest
+++ b/x11-misc/read-edid/Manifest
@@ -1,5 +1,5 @@
 DIST read-edid-1.4.2.tar.gz 84138 BLAKE2B 300d2bf71477ffaf4a3ee2a100f6935635e17db3bd8419ea13e6d7c7fafc2e2d9476bdeadb231c73a71e299ecf9e62dfe7830187167ac40b92ef6e65e54c509c SHA512 b52c763a7713661a542f707d48251257c9540c4b1ad517b7ddbbc051edf919600cf27f93c13e32d5d6d148dd08327dc91f11eecc0b6db82179d044cef5b52550
 DIST read-edid-3.0.2.tar.gz 17508 BLAKE2B bd27f01fba0b9bf5ca5e5d8d4af422cc14120ce280ec1abe047f31e11f85fbe1b8a8e729b97ef2272e2ab3354871175e91bc11f8c15b2aec0cd10d37aceba392 SHA512 779ebe7f1ffb6e7952762b5f886e07974f2c0fe5fa9be0722b928559466b56aae450f741817bb91bb2e33ca66ab27af39cea3c7af220c99b85dae81734138aac
-EBUILD read-edid-1.4.2.ebuild 400 BLAKE2B 0c5fdcb34750b780f21f8513694e1c847d1253cb1929191ff37b4c1049fa068473bc87d2ffc0bd095b8918c836e52989df74abdbfe39febdb5c4d19273becbb5 SHA512 e38bdc0f35d86af70be326ae546dcd8b08aa0b23ffe14f45daeef57ae47bf20ebb4e0925928ef0224dedecd46d95ad66e799ed4be55361b8356fff0f716e5ae7
-EBUILD read-edid-3.0.2.ebuild 551 BLAKE2B 8541c5618c393db44d2539493359f208bf93bedda9caf459bfc747a90efbccfc4b7ecd3a2745da05e8f024f3e39e85e02fb6ca64f5e3c102051e4e27f7f2b415 SHA512 6eaa79e6baba59e7d25b0be19ec1dffac224fd906ba3eaebafb9235f89ab9a931436a637dbbdefe7d77b56439494264f7a6c8fa62ff2757091d295aa509942f3
+EBUILD read-edid-1.4.2.ebuild 401 BLAKE2B f7264eb99d7585d7b1537f4bffc4a72ddb096adb1d5f8dab7f5d670c99d79927575aa783acbe2e5710133d8561267ab6394806232055e42a38ec6ad7b2f2e6a3 SHA512 d06aec5078245a35e27e57ff58b49037c872fc5b88c32199fd640a52853995cfaab40744cb26401af43a66a74d5a341a80ec70b46696812d13365b068b400ba5
+EBUILD read-edid-3.0.2.ebuild 632 BLAKE2B 37ead5344183f471899083553305170e9d436f865bc79d2d974a5638dea0641b4d61a7a248c75807f65a4cd35de6e8d3dbffc9b9c2f3b76c1b24fbb72963f9e9 SHA512 600f885382be075b3b8742c7b55303316f2d0707be5195304d21778a5e4646cf8cabf65f38f4489da401bbdb6cbd49155228af9728b30e0b0e2cbbeb46981338
 MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
diff --git a/x11-misc/read-edid/read-edid-1.4.2.ebuild b/x11-misc/read-edid/read-edid-1.4.2.ebuild
index a84c9594c75b..a264ba58121b 100644
--- a/x11-misc/read-edid/read-edid-1.4.2.ebuild
+++ b/x11-misc/read-edid/read-edid-1.4.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.polypux.org/projects/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~sparc x86"
 
 src_configure() {
 	econf --mandir=/usr/share/man
diff --git a/x11-misc/read-edid/read-edid-3.0.2.ebuild b/x11-misc/read-edid/read-edid-3.0.2.ebuild
index f55ccb264aa2..cef6d33015a8 100644
--- a/x11-misc/read-edid/read-edid-3.0.2.ebuild
+++ b/x11-misc/read-edid/read-edid-3.0.2.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-
-inherit cmake-utils
+inherit cmake-utils flag-o-matic
 
 DESCRIPTION="Program that can get information from a PnP monitor"
 HOMEPAGE="http://www.polypux.org/projects/read-edid/"
@@ -21,3 +20,8 @@ src_prepare() {
 		CMakeLists.txt || die
 	cmake-utils_src_prepare
 }
+
+src_configure() {
+	append-cflags -fcommon
+	cmake-utils_src_configure
+}
diff --git a/x11-misc/shared-mime-info/Manifest b/x11-misc/shared-mime-info/Manifest
index ea728047790b..05f61a9def9f 100644
--- a/x11-misc/shared-mime-info/Manifest
+++ b/x11-misc/shared-mime-info/Manifest
@@ -1,4 +1,4 @@
 DIST shared-mime-info-1.10.tar.xz 616800 BLAKE2B a63c97aba9184e7926db01968aef2a741ef089a46ab9365eb8dad5a78f585f90171751baeaa3bc62ed0a37eed6e93d60598fbe1e7e63168106fc8aa05f2f5cc8 SHA512 efc2b63cae11e6b0332f8607ba57a885dec68a23ac299bbda3eb6e2c7ed071c7c40dba73e9cf23ab675fcaa86ea3777fa931a9f25000a08ec6a748734c88beda
-EBUILD shared-mime-info-1.10-r1.ebuild 1775 BLAKE2B 55b933b231e745b1175bf9a8d9e80351dfef2be0f5b86a6ce1cd0f7104b083f2b29a0b8d537c4e638dea502d4ef704a76e1d35f611a819040f3f57fdce4169cb SHA512 11ab7fef615e959483bcb701d307ae0e28b571c6f63cb918671b22aaaf07210b9258dfbe718b45ebf5c73a7a1eaf01ebc575bae81478540f4b012910d0492e81
-EBUILD shared-mime-info-1.10.ebuild 1499 BLAKE2B 12ac9176a31d1ff61eb6a0b4b90a51b2e8dea042250e92e0a4d4cc4c688eb023bdb909970e33ac80de7dd0bd41dcfb9621bada4f2fe3e38ad88fd2d299a25fed SHA512 f0586ad64518021ee917dab3750aa03e068193b3bc569b7626d6ae99e701b2c989ac4aa9b8550f8a1bd3bc58fbc6860819da5c675c119e6f44ad0f4613ce38a2
+EBUILD shared-mime-info-1.10-r1.ebuild 1776 BLAKE2B 1b67fd0050fe9772ec0840e21085df67d8aad9098ca597e9d7ef810cad6f94b11dfbc38c1b2bd91e733bce7da32bdd02671c3d35c4a20a8437661c0cb0018c5f SHA512 e6367649c301f16df14b14b71145bf6ad96574c45d1da11e838b9de985810bc89889ed8bd455ebc69746e371ce166b0edf54f63354496b6fabd37b3e26ca072b
+EBUILD shared-mime-info-1.10.ebuild 1500 BLAKE2B 3525e8973832d961653323714fbe15760c78042c4a4663917003d6b1dedee69e77780403829c08749821a5c546e0bd3d2b92b5d8f0761ead654f6a217395a8ad SHA512 ff01a5b571d705fbb56026638196790231d9ddfbc77cd6762421d341c82be4418d30a6e081aec412b2a26ee6422e460d14d1ea2722804f910b1edca93f58255c
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.10-r1.ebuild b/x11-misc/shared-mime-info/shared-mime-info-1.10-r1.ebuild
index e93e11841859..fbb5f11b8992 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-1.10-r1.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-1.10-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://people.freedesktop.org/~hadess/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.10.ebuild b/x11-misc/shared-mime-info/shared-mime-info-1.10.ebuild
index 68717bcfbdec..5915f6df3131 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-1.10.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-1.10.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://people.freedesktop.org/~hadess/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-misc/shutterbug/Manifest b/x11-misc/shutterbug/Manifest
deleted file mode 100644
index a53af51d146b..000000000000
--- a/x11-misc/shutterbug/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fox-1.7.67.tar.gz 5689421 BLAKE2B 60f2d8e887a41f1e234cd31c1bd2702bcedae0f1b47cb7b9832c317e34a9b517cb603033d28e5ed66c4b97c85deaf3caa8dd40a508eaf715d63772e6ef0020b0 SHA512 a45db7ea9453e2afe0ff61ed6608925e94f9202dc1fbee5e2b88a5a1c16310019cb4611090f8234ad6ebc46a6519a36085683c4553d47bc9c21b8ef0c13ab540
-EBUILD shutterbug-1.7.67.ebuild 574 BLAKE2B 3a8b503c2723c4074853723cd1dc826d8ab60a6159a8aba67f5b7d2488f782b79b8d25bff3270847d102c43081135758cde8a4fa6be7e7cba7158df70238cc53 SHA512 ae4fef558bfe92ebc4a1600b4a6110fce32272969e9e2e644d1a85a17b8018e529d70fbd2427a2af50a72787a3c6f3a5f2972fd1e7fce53458d26e48ad318978
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/x11-misc/shutterbug/metadata.xml b/x11-misc/shutterbug/metadata.xml
deleted file mode 100644
index 7a38bb900964..000000000000
--- a/x11-misc/shutterbug/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/x11-misc/shutterbug/shutterbug-1.7.67.ebuild b/x11-misc/shutterbug/shutterbug-1.7.67.ebuild
deleted file mode 100644
index 814e72d94df1..000000000000
--- a/x11-misc/shutterbug/shutterbug-1.7.67.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit fox
-
-DESCRIPTION="Screenshot utility based on the FOX Toolkit"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+jpeg +png +tiff"
-
-DEPEND="
-	x11-libs/fox:1.7
-	x11-libs/libICE
-	x11-libs/libSM
-	jpeg? ( virtual/jpeg )
-	png? ( media-libs/libpng:0 )
-	tiff? ( media-libs/tiff:0 )"
-
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	FOXCONF="$(use_enable jpeg) \
-		$(use_enable png) \
-		$(use_enable tiff)" fox_src_configure
-}
diff --git a/x11-misc/skippy/Manifest b/x11-misc/skippy/Manifest
index 1ba7e12efe82..cf938dd3e71e 100644
--- a/x11-misc/skippy/Manifest
+++ b/x11-misc/skippy/Manifest
@@ -1,5 +1,6 @@
 AUX skippy-0.5.0-Makefile.patch 972 BLAKE2B 7e596feb633fc5fdd65340cdcfb497e5909a5a08fc7006ec8c2a6afa60ed4e71db95e6e509ca640db61ab0686f9e5570b72069fce9cd74c104c4326150f7f1af SHA512 c94db12a8b21016923968ac179d43b6d57cc1a9cfc1fa45e3c2432aa7f8fa223a1aae41467b1756c309a209280667190c4b26c512430f5398e36e8af6d5b7150
+AUX skippy-0.5.0-fno-common.patch 1275 BLAKE2B 1a3916d5bc6c96c6cccfe0a63798ddb5edc2bd3bf7752471e13d8dd49a61308c3303f79199bcd31854827a4bd7be06f51e2673c2ae971d6d5ff373331f1ac037 SHA512 08269caadc94ff2b4b61dd7d6c19f0dfd4c4e4236553089402cf54ae5d96f09d721ddc167a9ceec9ad5e98583cec755f63650b9451077ab2fa79cec9f6d457d0
 AUX skippy-pointer-size.patch 208 BLAKE2B 5fa1ad3bcae18c18e4ae06835694ddc5ec41f1c6e4002a225ea1ea79f52bec69083281bec20e36eb08261897f17e28c63bd996afc882fe5b9ddd34e6ab2e5beb SHA512 b922e816ec7f2ba672cc528a3ca5adfbb8af9ca8744deb6a2f6bfd40928a62e0937c4f453f046a87e23bc34f5a67ca9109cc46076c12454ab7097591059c847e
 DIST skippy-0.5.0.tar.bz2 23722 BLAKE2B 087ad99a0d7e074532a7ed9999f6c4ba792d25ea33bfbb43af351ecbf904a5fb77a4e5a5935bcffc62b8d70539692f37b2b3b89ad3c16a91a39266bec4990af5 SHA512 516e648e23a6a92e37f4d712b36f65ad640e299bd18677e30d4aa565929629c7749e64124b97da590d947daaa4e0de819cdcc3aec99c524833dea4c7955a7770
-EBUILD skippy-0.5.0-r1.ebuild 945 BLAKE2B 4ccc2ea3eeca81df5b544c4ed9f579957f0992e6f27f2662f363aab059f6e8870c6ff04eb89034184e80f1e39c159ff140b9b045938231a387a0c7af6d6855b4 SHA512 73240b9c790b7430fd47c64153b102f9a99c2393cc1c5430faf8bd27d1c4fa45891d768a0ff40676fedb181d5a3384b8d098f017b063b743d61546d008538dc6
+EBUILD skippy-0.5.0-r1.ebuild 980 BLAKE2B 47ecc4ca86b56e63640cfe3fcf250fafbfb4f4aefa947db100c23223aac18509b19372e4dd155d785fb375fc878a6c00ada6818bfdd0197b333beb792fd09ea2 SHA512 5dd99cfdf524029ab9394bafa88db597b835d783a662feeb6382a3f8c850aeadd5c23b0cd5c1c4a2271b30b2a7bb013eb28c838edc0e9dc0227818cd1800db8f
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/skippy/files/skippy-0.5.0-fno-common.patch b/x11-misc/skippy/files/skippy-0.5.0-fno-common.patch
new file mode 100644
index 000000000000..3275ff2439a5
--- /dev/null
+++ b/x11-misc/skippy/files/skippy-0.5.0-fno-common.patch
@@ -0,0 +1,60 @@
+--- a/wm.h
++++ b/wm.h
+@@ -20,7 +20,7 @@
+ #ifndef SKIPPY_WM_H
+ #define SKIPPY_WM_H
+ 
+-Atom
++extern Atom
+ 	/* Generic atoms */
+ 	XA_WM_STATE,
+ 	WM_CLIENT_LEADER,
+--- a/wm.c
++++ b/wm.c
+@@ -43,6 +43,46 @@
+ #define WIN_STATE_FIXED_POSITION  (1<<8) /*window is fixed in position even*/
+ #define WIN_STATE_ARRANGE_IGNORE  (1<<9) /*ignore for auto arranging*/
+ 
++Atom
++	/* Generic atoms */
++	XA_WM_STATE,
++	WM_CLIENT_LEADER,
++	XA_UTF8_STRING,
++	
++	/* Root pixmap / wallpaper atoms */
++	_XROOTPMAP_ID,
++	ESETROOT_PMAP_ID,
++	
++	/* NetWM atoms */
++	_NET_SUPPORTING_WM_CHECK,
++	_NET_SUPPORTED,
++	_NET_NUMBER_OF_DESKTOPS,
++	_NET_CLIENT_LIST,
++	_NET_CLIENT_LIST_STACKING,
++	_NET_CURRENT_DESKTOP,
++	_NET_WM_DESKTOP,
++	_NET_WM_STATE,
++	_NET_WM_STATE_HIDDEN,
++	_NET_WM_STATE_SKIP_TASKBAR,
++	_NET_WM_STATE_SKIP_PAGER,
++	_NET_WM_STATE_FULLSCREEN,
++	_NET_WM_STATE_SHADED,
++	_NET_WM_STATE_ABOVE,
++	_NET_WM_STATE_STICKY,
++	_NET_WM_WINDOW_TYPE,
++	_NET_WM_WINDOW_TYPE_DESKTOP,
++	_NET_WM_WINDOW_TYPE_DOCK,
++	_NET_WM_VISIBLE_NAME,
++	_NET_WM_NAME,
++	
++	/* Old gnome atoms */
++	_WIN_SUPPORTING_WM_CHECK,
++	_WIN_WORKSPACE,
++	_WIN_WORKSPACE_COUNT,
++	_WIN_PROTOCOLS,
++	_WIN_CLIENT_LIST,
++	_WIN_STATE,
++	_WIN_HINTS;
+ 
+ static int WM_PERSONALITY = WM_PERSONALITY_NETWM,
+            NETWM_HAS_FULLSCREEN = 0,
diff --git a/x11-misc/skippy/skippy-0.5.0-r1.ebuild b/x11-misc/skippy/skippy-0.5.0-r1.ebuild
index 1b63a8fe60e7..d8db07312cfc 100644
--- a/x11-misc/skippy/skippy-0.5.0-r1.ebuild
+++ b/x11-misc/skippy/skippy-0.5.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="A full-screen task-switcher providing Apple Expose-like functionality"
@@ -23,8 +23,10 @@ DEPEND="${RDEPEND}
 	x11-base/xorg-proto
 	virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}"/${PN}-pointer-size.patch
+PATCHES=(
+	"${FILESDIR}"/${PN}-pointer-size.patch
 	"${FILESDIR}"/${P}-Makefile.patch
+	"${FILESDIR}"/${P}-fno-common.patch
 )
 
 DOCS=( CHANGELOG skippyrc-default )
diff --git a/x11-misc/spnavcfg/Manifest b/x11-misc/spnavcfg/Manifest
index c429da60c487..af23c29d8faa 100644
--- a/x11-misc/spnavcfg/Manifest
+++ b/x11-misc/spnavcfg/Manifest
@@ -1,4 +1,4 @@
 AUX spnavcfg-0.3-custom-flags.patch 1568 BLAKE2B b4280b99137f36d9c3a191f25ea9a55785878a004fdf6d581ade55161e1cbd15bd5895ad8d61844a3a19f56e3ba6d226ad49ae6f31550317be0a5894e9e5c6bf SHA512 eaa831d7ef10227bf35b26f5ba32f793b382f6af7b14a147084ac93f4669e8018655cc1df711ed4ae5d0c560b34ea59abb1c1998c4fdb37a362f8130fed80632
 DIST spnavcfg-0.3.tar.gz 214774 BLAKE2B aee45a796bd95761e4a7fe922cc5b65185c894e2fa366dea6d7677fc5ac3b7e0345b89eedef7bf8e446c598d66f161bb66fa695c07b433f5a6b7dce5055b6256 SHA512 a3411c32a6c7de2fd1cfa7960e1b0dade88e8c37435a39ded864b4b6f12fd3c8f518dad7a4ac5b465517484e74b3586f12d47e780f655fd7e4c3fea8d6186c80
 EBUILD spnavcfg-0.3.ebuild 625 BLAKE2B 6b2af2cb0be40861e6f944463fd63d74cf0e3d42e6c5c4bc969a1542440e960b5d73a2ca103ff9ec24e865fb05c9c3480ca63201d689ed063861463785966248 SHA512 6d4ec044c9b9d9318b4645e759436e7577179c0fba5934cda57850c6dca2da24bca939583aee098b746aafc5cfc2697f3f2cbb17ecda2f53628c165b395b11a2
-MISC metadata.xml 453 BLAKE2B 4c8ef802efbd4de680f3ad9c9cdaa03456fb455e935f5a7ac7420ed0b9daf2bc85cd2b0ee0341730f61f6d17347fc044d55cc5cd02014a7acc91d199d60cde2a SHA512 842fe244bf67c8faf15dba7bd13903c5051ca26d1627eb8c0dd9d1096973249f8f86163454fcdea38071c4fc9d9c43faf3076c1c4aea66e1b555725a4e251c66
+MISC metadata.xml 513 BLAKE2B 5730394269a90ee628138e0a865b15053c020dea720f442c4718baed6d6bcf7d2ba55f567085d730ccb04907c2019dcadfb2d226b53e2f91a8bd549e28ab6462 SHA512 4aee293da64f4e77b69be1c4c937787e3e1794d51ef22e3d37a5f6c20e6a3507d27c87b75495406429fdd98cd4ef3ed0d85ec9a7418c13b42422b61beb1b5a04
diff --git a/x11-misc/spnavcfg/metadata.xml b/x11-misc/spnavcfg/metadata.xml
index 6367108ce053..6dca9970b454 100644
--- a/x11-misc/spnavcfg/metadata.xml
+++ b/x11-misc/spnavcfg/metadata.xml
@@ -6,8 +6,9 @@
 		<name>Sebastian Pipping</name>
 	</maintainer>
 	<longdescription>
-		The spnavcfg is the GTK-based configuration GUI for
+		spnavcfg is a GTK-based configuration GUI for
 		<pkg>app-misc/spacenavd</pkg>.
+		It allows convenient configuration of a space navigator device.
 	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">spacenav</remote-id>
diff --git a/x11-misc/sux/Manifest b/x11-misc/sux/Manifest
index 2a6b31f2d081..57407b104815 100644
--- a/x11-misc/sux/Manifest
+++ b/x11-misc/sux/Manifest
@@ -2,5 +2,5 @@ AUX sux-1.0-dash.patch 279 BLAKE2B c878e89af286f239beefd8f7a2deb9c7783b410c291ba
 AUX sux-1.0-r1.patch 1695 BLAKE2B 0ad2d5b021aed37904871904e135ef416a5c102557621ee158dbac946890b1e24263b5bb238e02816b96cf0d061d80aa03c78f9862804dc0b5c1bd1fdce251a4 SHA512 10e6b34aa1eb26bb51e33534a9c6c32ffb72c8b4eab86aec13087d915f49eda0bd6d6b6ec393ec8a1ec2f170f7fe00557019a235a10ae08f3d15f5a3c105f26f
 AUX sux-X11R6.patch 810 BLAKE2B f9844e65997e4c75dc9d5b41f9733b72bb072db13169d62f6986b28c89a027c8a91766cf4a03785f80b1d28cbeb22943ccb4ea3f9b5d2fa29c6cb171df8a6316 SHA512 5f34860c054c0eca0e7d2626cac3ff449c52310993628b756cebb96d589c9acb7b6fc726cb303d97f17233362bf7ed8c68fb836be529ef05aa1a7d9de71256a5
 DIST sux 9403 BLAKE2B 26df0f3759b4f4f70479d1532459e3e04da05098045bed7b1066a89f6c636a1200f28866c7ba251d54c24d621b658686889f2306ed797719dfb95a55fb7b3430 SHA512 cf1afb736299e349a14837f89f0feb6a5beb1af35be8e6baef74d03e7278a9d9c331d2759ec21e5cf8b43197734f96464b82ff5904968428bc43a45d2ad0c598
-EBUILD sux-1.0-r4.ebuild 606 BLAKE2B f641a13916782f25f59ee7902c8604d279fdc51c1333d68404455dd602f49b99dcf639db8a626bd798403e6b007db3f655b3c67d9809529abdf127af65db81de SHA512 55139409624514d9735262bfa18573e1e39fb27bf23b6274fc400a72cb1b4a00a81da26d8616a9857f97b9ed2f9acf024b7d9110f270b9535a36deefc26f8745
+EBUILD sux-1.0-r4.ebuild 607 BLAKE2B 26858b5f66f342912c7b846d5bded043381182c9ab80354ead20d2adddcaab7db96d2d245da51c1bbe25c51cc4b6658ea55bc325b24e480933ea0854bb9bc73f SHA512 3007aae2586bd8eeb39713b860493563061c1f3174d2b26873e372e1dcaab3bbbcafe2a2fd419b76344fbf14e0a6059e79575a8cca36f43c153c5cab5083b63d
 MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
diff --git a/x11-misc/sux/sux-1.0-r4.ebuild b/x11-misc/sux/sux-1.0-r4.ebuild
index edbd4293cfea..7ea02c18f10f 100644
--- a/x11-misc/sux/sux-1.0-r4.ebuild
+++ b/x11-misc/sux/sux-1.0-r4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://fgouget.free.fr/sux/sux"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ppc sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ppc sparc x86"
 IUSE=""
 
 S="${WORKDIR}"
diff --git a/x11-misc/trayer-srg/Manifest b/x11-misc/trayer-srg/Manifest
index f4883d21a3c4..cf738c9f6a58 100644
--- a/x11-misc/trayer-srg/Manifest
+++ b/x11-misc/trayer-srg/Manifest
@@ -1,3 +1,5 @@
 DIST trayer-srg-1.1.7.tar.gz 27987 BLAKE2B aaaa1609bebe91c7b2d3934d68075fa16f393896b7f9300dd6aecd7aa8666a7f3474711fbbc9dae5f72ed5ba8b63d0275f590a5a82ea4547b640a75a81012fc5 SHA512 5bb049af01c3f3f62dc8a5c1932985b92c98e4e2083aebd1dc09256746e097239be54ebc739801773878882a5c8f168a4a13bdac292388f79079ad52c41b2cad
+DIST trayer-srg-1.1.8.tar.gz 28025 BLAKE2B 3eca8faf7237e1941a611a85a4460310dda1a8d89cb96ae2ac7d77c47a7f8b4fa4bb1a2bcc549fef285ca14a74dce23d9af1b349bb5b0ff9d3bf4abe1ed06351 SHA512 5ae92fdcee64ad1ca59846874dcd4bd4859adeeb80a86f1ed97d62e6306f8ec62d1ee26dba251257242dc25d158a6a550e69f2fcc8739242a2311e37fe1ce310
 EBUILD trayer-srg-1.1.7.ebuild 751 BLAKE2B ca5874b16f3a731b57227673e02877d726c0ab61a71c52877bbb03201c4fc3bb81103a433dc0efebe2c65721e05552f193befacedc98864a4214a921df76bc89 SHA512 99772b9da40ea7b900826842aed0423cc0196f1e7eb6b7c033cadc896e5751d29eb327384a923179f9e624ce57a03f1500c9164f13800c6e98ad09ec9a9838d7
+EBUILD trayer-srg-1.1.8.ebuild 753 BLAKE2B a3168f1b77ac80cde3aa9fc3fb3815c0693102851497c205ea057493c9fe3d1d39f5db0e19e1fb37667238b1047b9a1c48150b178790693c6a9c157b98ab5f7f SHA512 cb976fd7a951a3ca4f3903a452f99ed1ea72dd251bf98a6550be72b94d6358b63a5181c0b0a437291ec0173560d0d529ed1b844df09a9b65ff7aa0eaf6293f58
 MISC metadata.xml 249 BLAKE2B b308f3f4e67b02a37d7df053cda2ce801a2e355f212a680126aa3338811fc6127838aaceaafe156f9afb871de57a301056dd9af8d0cccd32fdc79e2abce4b56f SHA512 a354c9b99e5ee4dbc44e534e5764479ab0f2cac37ce7d9699f0bd668653352c25c630be27239a3a1c3e3ae391891df7c3855e08dac224b510f0feff0c060ea4f
diff --git a/x11-misc/trayer-srg/trayer-srg-1.1.8.ebuild b/x11-misc/trayer-srg/trayer-srg-1.1.8.ebuild
new file mode 100644
index 000000000000..8a9b9e21d068
--- /dev/null
+++ b/x11-misc/trayer-srg/trayer-srg-1.1.8.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="trayer fork with multi monitor support and cleaned up codebase"
+HOMEPAGE="https://github.com/sargon/trayer-srg"
+SRC_URI="https://github.com/sargon/${PN}/archive/${P/-srg/}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}"/${PN}-trayer-${PV}
+
+src_configure() {
+	# Custom configure script
+	./configure --prefix="${EPREFIX}" || die
+}
+
+src_compile() {
+	emake DEVEL=1 TARGET=${PN} CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin ${PN}
+	einstalldocs
+}
diff --git a/x11-misc/trayer/Manifest b/x11-misc/trayer/Manifest
index 33f012b18337..06b1d6987eea 100644
--- a/x11-misc/trayer/Manifest
+++ b/x11-misc/trayer/Manifest
@@ -1,9 +1,10 @@
 AUX trayer-1.0-as-needed-and-pre-stripped.patch 300 BLAKE2B d941ab99841ed60de03866e53be1ea517dd6a7fc10bd10aed053b8ef378cd85e2b65e5da1fa1cb0701970d6d3a287777ed292118486d48af7de0bb32999f4f65 SHA512 5dac4a877f32fa63d18013c8c67666520ceac51de55a2e42c5f03db60487e82b7aac2f43e07ba40e7f2ff48e7fca56f11eee6eb90759db37cd0722164f14cc9f
 AUX trayer-1.0-dont-include-gdk-pixbuf-xlib.patch 745 BLAKE2B 8fc70b5b9bf8d0764e0da5138cb89a57874e5987f2531ea72837aeaf152db98312d774bb1c7692c3e935ccf90133c05f3dd5bdaac1db0092bdaa528c0a401db7 SHA512 48efbf9de7c608fa4981e658eb815ef5d40e113ef85363bd09db7ed8a09ea807b38b359380f8f5499e4e9e996cd1a6d3f26dce4a5348a654aa67a6a6d0e75d73
 AUX trayer-1.0-dont-include-libXmu.patch 190 BLAKE2B 34460fc49d3c6836bb9a41840a808c16b0ca6400face67330b0e3feeeb633a25f8e6ecc542f3fba59d9b48b2673c3162e4c3797fd29b32aba77af110d6432f44 SHA512 b17ea529431e36e82c5aaab6548410a1f839d978ece5ca42ac90732ca899012b9b871a5b9a37d3b2ee05238222c02b1ac4c6edbdb70f6a04e39267fce1c2fba0
+AUX trayer-1.0-fno-common.patch 167 BLAKE2B 31ec6428dc5732fba6f165e71483573668dd6efa658785cbe6d1f7a52cf030ee1ce288ced90b673210b49302c57cb62471f95d3be16a41d350d3273064f64027 SHA512 9a15a1905e33676bef0eee7426a07223a8ee59089ab63888e35c8035b1c7dcdeabdffd59e9df55369b7e1475cda1b341725fc9e3dfae31dd26101fb7c922da55
 AUX trayer.1 4448 BLAKE2B 663b00da3409d8366fc110fd2f67876f9b6cba4059410ac4d280c647022fd763a6e999dd953e02fec0d7130e16c5034b0c865766c0fd6c8bfd7ddf648c6ca258 SHA512 c55299fbec8f9bfcaeb262a3d2833af4ec111354c4e18bce219568b4a788b298d3d762f657c2fcc787c6ac8959934e9d459f6a808e618cc4769e2989c59659a1
 DIST trayer-1.0-sourceforge.tar.gz 29713 BLAKE2B 6a874781979c512e4fea06b0dcef30be73821e502553ebdad38ab2e152d070f6633dd6f8059d5532a51648ea10cbdfd752a65da11d2a992687a6f3ee4d289d01 SHA512 9903a78a1c185515e87552732449937daa23187d54a3ccbf19bc9fc569d6a440600c879fe78edbea3eff6b66a1f3fc5054d474dfeaca53af3521a6f18b454049
 DIST trayer-1.0.tar.gz 30445 BLAKE2B f95df1496392064b803e712e57a4ec76ed6e9a62dadb254eb044954e38620590cd486dc37d46d56598a7f2db5f27051db47e78df2d788092ccf3cdb7707978e0 SHA512 c46093ee18908b7cf8e52d2f10adeb0eefc90562b87862a5459cc4563e53528107ee1dba47b1cb88e378bdac40d64a1d8cb9ecbf014aef997c44f242b49534f7
 EBUILD trayer-1.0-r3.ebuild 844 BLAKE2B 362597df72f4d78bdb9284b02477714292b90115eb95fe5581ed009328679762800653cd3daf345e4844ac814524ecb84e1d255183f801d085f26e6a95205add SHA512 cb43354e391789acc533667d1a0a7aa84b8f39ac2b21c1bbb2b59bb08a36036c18fbbe52ad07d6df87db8c2253063b943d22f4823044ebfff2a4a3c08751e5e5
-EBUILD trayer-1.0-r4.ebuild 998 BLAKE2B 587eef597495479d1d355f0983036c4f8eddbfde46bca935bbb739e0ed161a1c276c1d0ef0de7ba1cd575bbd7162c63bc698362deefd15203194bde6e4afcb72 SHA512 d63de02bc9027c2e5aad524cceaadd9c715d6ecd148617202c3a2aec8039abdfb12c0a890faed702431683242558588f0ed56fcc5f291b6eff9682694f8191d5
+EBUILD trayer-1.0-r4.ebuild 1035 BLAKE2B 4f884781c6fb340c038ea7fe74a4e94f61c3acf9408bd0b93a727f03700e8c687c24d0f7b7cfecb25621abe4dedb9b682f9d75c9dc2eb3b5ed025f1338a74767 SHA512 efb873cbee285a6836ae301f560ae02a4da3ace31317f1f0bcbfb43d5601b4016a9b44a00e525d3c33e33ed307af243b63d2079021f379ccfdfc15452ff39946
 MISC metadata.xml 220 BLAKE2B 11299b6e9582bb55f5decff226d1917da6e8d665c1ff3f95a035963a51f1ab529c28963908fda5a64b9ba0e0b608b354a36d605ef5826cf1698937316c8b4932 SHA512 8e96ee3f78ee96ef4b61c89b6c82a43f03d0a96dcd3af136fbabd1cd2635a27d98d9ffdbe9a87d9fda9b0feca21c7d223cdbd89d35b1a096e7fe3655a9621607
diff --git a/x11-misc/trayer/files/trayer-1.0-fno-common.patch b/x11-misc/trayer/files/trayer-1.0-fno-common.patch
new file mode 100644
index 000000000000..c8fd20a6ceeb
--- /dev/null
+++ b/x11-misc/trayer/files/trayer-1.0-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/plugin.h
++++ b/plugin.h
+@@ -9,8 +9,6 @@
+ #include <stdio.h>
+ #include "panel.h"
+ 
+-struct _plugin *stam;
+-
+ typedef struct {
+     /* common */
+     char *fname;
diff --git a/x11-misc/trayer/trayer-1.0-r4.ebuild b/x11-misc/trayer/trayer-1.0-r4.ebuild
index eab20e264425..db168a56b03e 100644
--- a/x11-misc/trayer/trayer-1.0-r4.ebuild
+++ b/x11-misc/trayer/trayer-1.0-r4.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
@@ -27,6 +27,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-dont-include-gdk-pixbuf-xlib.patch
 	"${FILESDIR}"/${P}-dont-include-libXmu.patch
 	"${FILESDIR}"/${P}-as-needed-and-pre-stripped.patch
+	"${FILESDIR}"/${P}-fno-common.patch
 )
 
 src_compile() {
diff --git a/x11-misc/unclutter/Manifest b/x11-misc/unclutter/Manifest
index dcb4f6d0f4a4..dbd7adfa03ce 100644
--- a/x11-misc/unclutter/Manifest
+++ b/x11-misc/unclutter/Manifest
@@ -1,5 +1,5 @@
 AUX unclutter-8-FocusOut.patch 525 BLAKE2B 4e1c89a6d7bd91483a91683d1ad1f0cc8c873e778673a2c72b7632c833f28bd97b7b4e6fafdca0eb3ff503ce96134198c43ea5ac54a6a9691c2c80d2328b403f SHA512 4ab3cab96574a545595a643e79dca102ace5bb4b853f514bc8a34457a14a4ee68bc89f5c8171d23b7f4e29cd951a60cdb47cc07901327984bdd39ef33f57877e
 AUX unclutter-8-include.patch 183 BLAKE2B bdbab7861a4baad3fcebdbec9082242398385186b9098cdf37f90c7b5c657407b225722711fbab1ab26d42331af18dbdb0c33f9ec922225e5fdc0e7ed88bf600 SHA512 726437d5cb6e813930b661bb47d2f15f3e37fc050f670a2125cc330f29b0ebcb97325886af21bab788d17e264e9e7c20d2c087d5b184730d3c06409304317bfa
 DIST unclutter-8.tar.Z 12344 BLAKE2B 10090ec2f3772c17d00cbcb27f416fb528b75641b7d57eeb36ab7e19af2510ebc5901a0394c0ee590a38afb8bf64d4b2b2ed069b0b1a44edcb9b37701f89c9b5 SHA512 9a64e6eceae685cf34b1ea85818735f8f85514ba1eea262476653886d74e469cfd6b9a39edbd098b138a5c89e6b97b42cf251bee59272c76cbeba190979744b4
-EBUILD unclutter-8-r4.ebuild 761 BLAKE2B f6f9045e9d717a1cf65cc3719cde5f6226981784afc51a4609821b6ea9e2d7be7402bd4354a1f2f66c375088b39f6e9b953f475722c41d5013dfc600626e0a8e SHA512 9291f8885fea05d314d12763ae0dd5c0278b9da02fd6544ae4aa5d06df58b2fa8064ecfd258b2f28541f9bdc7c30dbef0bfa2c93885a83134cef7bd3b4b1e6b8
+EBUILD unclutter-8-r4.ebuild 762 BLAKE2B 40544a580dacb18605861e14d3676621d35ed4472d7bd8bbb29c41d59cba816f8714fda1f0ba3ae608e557fd4dabe5acd4c0d6041a3add0641809877d5988920 SHA512 b504bcd7ed37613f3b7cf23ab19c0c4ab5a05163b0ad661e6864fc21997e68a46d08c079454ffe791b544191fdea777d2b645d897883c5bfebac2222514c19d4
 MISC metadata.xml 272 BLAKE2B 4dbd2b5ae92564a97b2a06ab0ec6562e8dce2dd636aaf0788ee09f8688ca5d5b6483084a65366dfbe6d144d30170e5558bc5759adecb96abb405ea96a5147285 SHA512 ebe67da08587903b5b82fc194aa3c8f1ab65371f60d2c134928362e089550d9e9fd9531bffe8b676a345b5bf0ab209ce7f50d37d98201a88176f002e17582493
diff --git a/x11-misc/unclutter/unclutter-8-r4.ebuild b/x11-misc/unclutter/unclutter-8-r4.ebuild
index 55f953d0b10c..f41fb381cf43 100644
--- a/x11-misc/unclutter/unclutter-8-r4.ebuild
+++ b/x11-misc/unclutter/unclutter-8-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.x.org/contrib/utilities/${P}.tar.Z"
 
 SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 hppa ~mips ppc ppc64 ~sparc x86"
 
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}
diff --git a/x11-misc/util-macros/Manifest b/x11-misc/util-macros/Manifest
index 7ebc1e1406a2..fdb5215bbc6d 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 719 BLAKE2B 2b7a5d86eacfb4c9f94817ef472d044312e411a824613e96d6bff9ebbcba98cc9fb94ab637e2916b88968476f52580e0e75a52ac8e8ee6b828f814402ec0d066 SHA512 622aa9111132abd629d742054d267f0c60c73f361fcb68f23ddd3dac982518dafe2d705bd7afbd897b61655467004cea87d284566b2fc3003b396e311321ca29
+EBUILD util-macros-1.19.2-r1.ebuild 720 BLAKE2B 8b30500b7ea3a7b229b8f3c0618f54f1b7e420add3e2bfe5440d903a8201fc9dcd9693e9061ef8dad57cdba19870c0a38efae61710dd1de7d936873ed45a3b5f SHA512 63b86270b3acf193722a62464776be40d1f82fb9f62b8da6a5464495a05d0bd56695e478b6cd7a8d7c05146f8db71c3c4b5895b2c58eb2a2a6b4d9c2f1c71729
 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 b70d210e8079..db84a6536401 100644
--- a/x11-misc/util-macros/util-macros-1.19.2-r1.ebuild
+++ b/x11-misc/util-macros/util-macros-1.19.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # there is nothing to compile for this package, all its contents are produced by
diff --git a/x11-misc/wayv/Manifest b/x11-misc/wayv/Manifest
index 0e2b172f9573..d370af82041c 100644
--- a/x11-misc/wayv/Manifest
+++ b/x11-misc/wayv/Manifest
@@ -1,3 +1,7 @@
+AUX wayv-0.3-autoconf.patch 320 BLAKE2B 38db31b413ae832cf0fb41fc4734a0f77a2eba0ea20f39ea0d4b91c7c741d2e5fdb72f396081ca6bc6f23acc5e63cd9a4f1779a0fc85b20887314ae06061c5a7 SHA512 62efa78fa15e1c33c4b57c2139b841127b5a94bf15a5612eabd051fcb2de51f7040dd67ad598a82248209f4c3e2e0bc90b380597276f40977613d0a9ce6e4003
+AUX wayv-0.3-flags.patch 357 BLAKE2B 20312ebce59bb6bc0f356f34ee321b2dcfaa434fe0ac9e3b89f8693d1750d7fa0892d0a1ea79cf45cab5279aaeb9d75100e1f737c5b635298b4b30e1b72e4e92 SHA512 c6c0116e2cbb1e6de795040bd09d42fa962fecf16933185920101464bfbbfd818fc368940cfb2415bfc5fe68771ca256207109758b16eb19016cbc3e6948d9b2
+AUX wayv-0.3-fno-common.patch 549 BLAKE2B 8e6e07a690c4613f87de41c0fa83ad6a98b60eada9c7ec8582807ce28ecf2e89e021a2a1bad742ceef1cfd2b5464bd71908ab8eabfd940464ad1bf377c752349 SHA512 972c0bab4f9b5345d68235c0f03683d5c16d910c2e19a8ce4f1176661d6cba2ff7dd7c7f46a0e494570479e63a121c69ecd27d5f54325f612ba82a47f705a357
 DIST wayv-0.3.tar.gz 139197 BLAKE2B 88fac982c3647e4fb61fdda7febad3fa57b4a5dd5c0bdb9a2ec85a1a45fd8bff0b9472c161d08b7e9921928f36ead147a9846df12a414f41e28df096bf7361f2 SHA512 dda4dafc63c4393a726175597ae734b321e3c91ab6acd1b4b0ecae5861fa7c87ce83b68ae4a8bb92be9039b22ddb86f7e9ba87559d35095784eb98a5eda14681
 EBUILD wayv-0.3-r2.ebuild 608 BLAKE2B f53094ac474898f1c7ec3b374826aa5fea27687a0cd137d7e36b9e47768d84ca1051bc8a7f9c369cadc0918238aa856337fd7a49a620e7e036fcdb627e9be6b1 SHA512 9b16c9ed56dba7b584080c4e244560e14f5132f4ffa32f18d1a8d55688f67e3d65565de2654c51dece91f06b36f6f31792ea8062580f0f41af3b3b80696ce5bd
+EBUILD wayv-0.3-r3.ebuild 683 BLAKE2B 1c215cef91a7e10a4c30e2c50375f00e5c2bafff9e50981429ccda94340b856d306084f3828410181d56af59489b404f407ee1de70393dc460c9cf53f4078512 SHA512 5ca09ce6ac65250b95152d61bf29b8aa7a040977e2829a25f59baf63eae472157da99e5468030fb5b2e75a1a214df1c0f83070c861570f6adfc74346124066f5
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/wayv/files/wayv-0.3-autoconf.patch b/x11-misc/wayv/files/wayv-0.3-autoconf.patch
new file mode 100644
index 000000000000..edec6bd5974d
--- /dev/null
+++ b/x11-misc/wayv/files/wayv-0.3-autoconf.patch
@@ -0,0 +1,13 @@
+--- a/configure.in
++++ b/configure.in
+@@ -1,7 +1,7 @@
+ dnl Process this file with autoconf to produce a configure script.
+-AC_INIT(src/defines.h)
+-AM_INIT_AUTOMAKE(wayv, `cat VERSION`)
+-AM_CONFIG_HEADER(config.h)
++AC_INIT(wayv, 0.3)
++AM_INIT_AUTOMAKE
++AC_CONFIG_HEADERS(config.h)
+ 
+ dnl Checks for programs.
+ AC_PROG_CC
diff --git a/x11-misc/wayv/files/wayv-0.3-flags.patch b/x11-misc/wayv/files/wayv-0.3-flags.patch
new file mode 100644
index 000000000000..ac6ea62ec006
--- /dev/null
+++ b/x11-misc/wayv/files/wayv-0.3-flags.patch
@@ -0,0 +1,10 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -3,6 +3,6 @@
+ bin_PROGRAMS = wayv
+ data_DATA = wayv.conf DEFAULT.wkey
+ wayv_SOURCES = ai.c aimath.c backend.c display.c gesture.c process.c setup.c misc.c
+-CFLAGS = -Wall -O2 -DSETUPPATH=\"@datadir@\"
++AM_CFLAGS = -DSETUPPATH=\"@datadir@\"
+ wayv_LDADD = @X_LIBS@
+ wayv_LDFLAGS = -I@x_includes@ -L@x_libraries@
diff --git a/x11-misc/wayv/files/wayv-0.3-fno-common.patch b/x11-misc/wayv/files/wayv-0.3-fno-common.patch
new file mode 100644
index 000000000000..394cb67c1d6d
--- /dev/null
+++ b/x11-misc/wayv/files/wayv-0.3-fno-common.patch
@@ -0,0 +1,21 @@
+--- a/src/process.c
++++ b/src/process.c
+@@ -53,6 +53,7 @@
+ */
+ void performAction(WSETUP *wayv, WGESTURE *gesture, GDISPLAY *video, GPOINT *gpoints) {
+ 	int i, n, a, b;
++	pid_t child = 0;
+ 	char **temp, *single, *comp;
+ 
+ 	/* Action names have to be at least one character in length */
+--- a/src/process.h
++++ b/src/process.h
+@@ -27,8 +27,6 @@
+ #include "display.h"
+ #include "gesture.h"
+ 
+-int child;
+-
+ void performAction(WSETUP *, WGESTURE *, GDISPLAY *, GPOINT *);
+ void destroyZombies(int);
+ char **createCmdLine(char *, GDISPLAY *, GPOINT *);
diff --git a/x11-misc/wayv/wayv-0.3-r3.ebuild b/x11-misc/wayv/wayv-0.3-r3.ebuild
new file mode 100644
index 000000000000..cfda0bef6e80
--- /dev/null
+++ b/x11-misc/wayv/wayv-0.3-r3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="Wayv is hand-writing/gesturing recognition software for X"
+HOMEPAGE="http://www.stressbunny.com/wayv"
+SRC_URI="http://www.stressbunny.com/gimme/wayv/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXtst
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3-autoconf.patch
+	"${FILESDIR}"/${PN}-0.3-flags.patch
+	"${FILESDIR}"/${PN}-0.3-fno-common.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	cd doc
+	default
+	dodoc HOWTO*
+}
diff --git a/x11-misc/wbarconf/Manifest b/x11-misc/wbarconf/Manifest
index 4a0a8b4aff7d..a452fca885df 100644
--- a/x11-misc/wbarconf/Manifest
+++ b/x11-misc/wbarconf/Manifest
@@ -1,4 +1,5 @@
 AUX wbarconf-0.7.2.2-install.patch 2843 BLAKE2B 5d794bda0b1ee7f4ed2f2d7bfc26ad7a9d361260bc2e828d236f5c8c2c949e5335aeb70267a470d4d8838fc7cdc3751427b016695796f6d3f15b8070748001b3 SHA512 496392ec3236c4330f4c2d09ecc29a5dd0dc89a40adacbb3b27c4dce4b7170e05f22ca083fb10d045cc21253f5e460ba4a73e632d68056df3fe64ea8fd954c7c
 DIST wbarconf-0.7.2.2.tar.gz 764073 BLAKE2B d2dbd517d31332179fef612b8a6dc863976e27eda18e27f917f8e2cc7c9a3cfe9499e82fc6ada8f36491454dc57fa56dc43b7b62bb358aaa69f358ed3d51aa82 SHA512 9be4fe4ccceb8432d601806e4e10c19d4072502b63648e1111537e8a693a64d78f2a08f12598bd7ab0b356a1a24ccf138bcd893cb0cccb5bf7fbf80caf9d9eba
 EBUILD wbarconf-0.7.2.2-r2.ebuild 767 BLAKE2B 4fe1efd267816b2c081166f66da5b603d6ef35d4206a5dfba44522085814f69a5cb48f3f69c45a594651e513f37d724b0d326dca114e83bcb22da24474fd2559 SHA512 522491806c81ee6942881b0998da7be66e646c3e070a75b5224469f8b2136b503f49d9f0bf0e547dce174c6419cc03c565b406269d44b05dc858c7ec87eec879
+EBUILD wbarconf-0.7.2.2-r3.ebuild 844 BLAKE2B c59ac072c034cc975924f509681f7bd078f691015c5e1705a3b3ebd55ebd9f566362ee53a6c1448f15f3b2c4c44f2007280dd5aa09811e676bfe7aa6c86fe60e SHA512 46924c9c15a9fb93f59bdbf4ed64f1e45a149edad4c112151b6eb50dbc5a871d84a6a660c698df96ee8bf66000c3b1688e49797ca7cc90c1632bfc46c849de99
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/wbarconf/wbarconf-0.7.2.2-r3.ebuild b/x11-misc/wbarconf/wbarconf-0.7.2.2-r3.ebuild
new file mode 100644
index 000000000000..2c5f19167c25
--- /dev/null
+++ b/x11-misc/wbarconf/wbarconf-0.7.2.2-r3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1
+
+DESCRIPTION="Configuration GUI for x11-misc/wbar"
+HOMEPAGE="http://koti.kapsi.fi/ighea/wbarconf/"
+SRC_URI="http://koti.kapsi.fi/ighea/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	sys-devel/gettext
+"
+RDEPEND="
+	${PYTHON_DEPS}
+	>=x11-misc/wbar-1.3.3
+	dev-python/pygobject:2[${PYTHON_USEDEP}]
+	dev-python/pygtk:2[${PYTHON_USEDEP}]
+"
+PATCHES=(
+	"${FILESDIR}"/${P}-install.patch
+)
+S="${WORKDIR}/${PN}"
+
+src_compile() {
+	python_fix_shebang wbarconf
+}
+
+src_install() {
+	./install.sh "${ED%/}/usr" || die "./install.sh failed"
+	if [[ "${P}" != "${PF}" ]]; then
+		mv "${ED}"/usr/share/doc/{${P},${PF}} || die
+	fi
+}
diff --git a/x11-misc/wdm/Manifest b/x11-misc/wdm/Manifest
index 313c6669bbfe..1b72349d5915 100644
--- a/x11-misc/wdm/Manifest
+++ b/x11-misc/wdm/Manifest
@@ -3,6 +3,6 @@ AUX wdm-1.28-pkg_config.patch 779 BLAKE2B 9455f411e2f1884522836033ba104ec588fe88
 AUX wdm-1.28-remove-fakehome.patch 950 BLAKE2B 127755e61a73772d20625c32e9263f386a26f3b6b9103765d4597d77e0d8d5afa6c81023e3f096747b7020e3ce536a05781ca13120c4abc358ed02419d3538fc SHA512 55ce47472f0d7ba03bef88af52ace7db88ded7f45862d884a7bb3409a122ec17002a40195cef078f57bcaba24cfcb881d156e990bc856ca7c4f1f4dabbb6764c
 AUX wdm-1.28-terminateServer.patch 422 BLAKE2B 6d85344c1b045a8dfc206c6b0b4f5375be3d62fcb69335c628e1d63b131d62cf54784a9f84a27d49e7ed1c0aa48982bb4c5fa95249bfe6e0203991e1e6c0b381 SHA512 f00685ce1ff38f34df57864d05dd52b7148d27a81177f2c560157a470b089bd9b981ae73bcc6da8c1995822d8b74c6dffdb6166dff33adcf4cd4daa2bc9dc8cf
 DIST wdm-1.28.tar.bz2 381522 BLAKE2B 72105e949c5bc8043967f5b36838c171e32728a40d2ef5f6fe618b04337e3f37329696a7f9f1cee591bf1a037de4ca4168f270a316375e27fd7ce0c919880833 SHA512 393ace12d3975e978c05b90be691a7c27921e7e2db0bdef5f4fe06b324da56edea4936200dc123130c6de9e45af5dac6175559d641957fec104d66bad67c03a1
-EBUILD wdm-1.28-r4.ebuild 963 BLAKE2B 2b6cd7d943b89e17d6ce0ab0d838b50d0855491ebde34caaeaa5c80eea7bfc033583007ab0293cdeb4dc34eb6e01f694c6fc4f84a9f084f60115a33a33022da9 SHA512 950e638fa97548441418fd01e2d7bcc294551db59f28c5301ae066159dac33c54bebfbe4dbd32b512190f6fff2e8e6f8d85ae15286b0368b654aa82c8d223dea
+EBUILD wdm-1.28-r4.ebuild 964 BLAKE2B b2714b4eb0a0ab4316d3b2d2d6700c1cd8262346494aec00db40b7ddb9bb037cd289ccdaf64c1db612cf7b67ce6fb16f59acc86c248ba2bc61b40f9056e9915e SHA512 9a0df70e77c7d40681cb44291f0ba2132a00ccdf90ebe430f62896ae65cca766d31d921b5d8d2f9b0d540a7caa08c4650b1a2684710fe56c00e307540833df6c
 EBUILD wdm-1.28-r5.ebuild 1139 BLAKE2B 095ce6dfef68e23c0df67a6c407b72219a4f5dfca5e15454d24b3204798061012e60c84087c0c587871472f41403adc6d15f4aef09986333b8ac01bd6b45da2f SHA512 69ef29063c09cf477ffb0625cca76cb904c37949f6e286dbd371d023a1870a229f9baacc16cd1ffce427c79eade9db658358ea44309b5e52b3217ffe6b94c28b
 MISC metadata.xml 350 BLAKE2B 1b1cab426ff16f13bed9114bca2d0d543457d97400f739a78cc1a1975683a7ae7c48630af6033f9f94268fa61f9382b6caa056346b2eb3038a83523261b4c8cf SHA512 deecfc72a65212b6498334be4dc9abc35d9f22b64f041181474bbeca8fd71d1e3ebdcccf9a98f57ccc57bd37958b206944c9f520bc7c4cd2d8329f9ce14a0b19
diff --git a/x11-misc/wdm/wdm-1.28-r4.ebuild b/x11-misc/wdm/wdm-1.28-r4.ebuild
index 9c93686627a8..ae46e201100e 100644
--- a/x11-misc/wdm/wdm-1.28-r4.ebuild
+++ b/x11-misc/wdm/wdm-1.28-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://voins.program.ru/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
 IUSE="pam selinux truetype"
 
 COMMON_DEPEND=">=x11-wm/windowmaker-0.70.0
diff --git a/x11-misc/x11vnc/Manifest b/x11-misc/x11vnc/Manifest
index c00dcd126b0b..cbe95dac36d2 100644
--- a/x11-misc/x11vnc/Manifest
+++ b/x11-misc/x11vnc/Manifest
@@ -1,9 +1,10 @@
 AUX x11vnc-0.9.16-anonymous-ssl.patch 841 BLAKE2B d037f4f784fe12cedca33be6a638524785342d4da9c2cd73acf138b64978d8303ee45fe08cc7516dd7baeed596bf53647db82caf693022cceb2e0b43c94f5dab SHA512 8c56c76758eb117db590415debaa18eec441ef952dac607ab77182f414e0e5f76d4a1dd2e543e0542a0fd413a8ec5dc2661f1dbabb27a4d6b36eacb09327ce2c
 AUX x11vnc-0.9.16-crypto.patch 645 BLAKE2B a821861e4e4807e5e019c787d07791912083a3ae2d1e4c77eb3264adee65a68ea51c35fdfcd0d71b996f4af42ff8481c877f5f324180139857e5cfc7d0ac3db3 SHA512 6e9ec1eb5aba65999dda9048fb01e13c55cbbf6f3e226c23e20ee906891487a5c94efd09f54ac765ca1ed99290357403a0b2caa3a7226fc967b0e8ecf19360a6
+AUX x11vnc-0.9.16-fno-common.patch 1079 BLAKE2B eb1cbe8e959eeea0940b44d3804406d2b9a18261a279b05fa54dff1240674d51dc44ce4fff9ea64a6644e532c80499287bbb1025b06b47d3b2546eb76f32fbce SHA512 3acaa4e57921673aef14ce2e9931880bcbc8c3d73708124599b8ffc79be6c4fa43713184f01983f4f432e29137c3628902681aed275ca98c7a6f32cb10bc54ca
 AUX x11vnc-0.9.16-libressl.patch 4083 BLAKE2B 0b95dad69a0f7180edfe71da6df2c9e6025ba57ac984a04dc118e642b1ee2a6757c11d400a2e3641e71b367e4ea42d7557d48ba932d55ef839f122ea9170aab2 SHA512 041f57dc654bbf18c9fc741d42d9cc6f0646f619b2d3a473898b2e5d20609e7f475a7abfbd1e0fb9ed01017474aab0241ce04c37cec2e8acbd813f8ee678ee53
 AUX x11vnc.conf.d 1435 BLAKE2B 8403d61a4941c56127e869d6ac90d4f85237af9af786f864d32afbedf3e736528b74c8c83fcf3491794b9e62db6ef2a354dccd61f368c8e9251f915e2bd683f8 SHA512 dedc94fab89a06ca6025b99c2c944cabe77640487c8fc761a6420e5be7062ee4c1c383f3846c17bed434ad4f3ec3b994badb493919acb99da3f61caa40c60246
 AUX x11vnc.init.d 1728 BLAKE2B 45680af6aad530a9b36f29adc61c1f90ad272bd7201c30f29b3d6c5b980012ddb299c878ae1bb20734496c4f2b8b1e1c507cadee875305167e3f298993947a9e SHA512 8de7966b79b5acc83c8cebc3c2ef0819196f5a33eabad619991d04c7c059a68afbf44d0ece6b0db33cea1f525402a601b25db220733f0ff69c0fff48d3c50ac2
 DIST x11vnc-0.9.16.tar.gz 1708009 BLAKE2B a8789f95ef421a78a83703748e1d80fd45539dff24f80493fd75e357bc22378213915853f9d114248c172cd83977880e1e4e8a3f8df0771017e9988d83b7307d SHA512 69f65ee312f8dede6051b401304987502a213c6c28c7f41e855734f11de1fae14d5d493dc9c28b2e4b7c0be55f8dbd3b35dd2610aae910183772c3e626736fec
-EBUILD x11vnc-0.9.16-r2.ebuild 1944 BLAKE2B 3ca58abe014beca12f8730d584a8ef39f37d63b74fc9ea352cd660a02475f00fc8565439fb31762f99f15392254879a70ee071733691838d2f09ebbcc185ea6b SHA512 d57b8f88ee2006f3dac2e34b1a87abba349b36abf45ef01acae6fcc8986049ac17115d7ed514280039da2ae396c3b74022cd56e1a4a215d76eda6096d639ef2d
-EBUILD x11vnc-0.9.16-r3.ebuild 1981 BLAKE2B c191fda01a3cba54e271cbf54edbe97d9d90fc8815c38c1634561716c405697300a12c1976438f54c724cb9b35b279cf269c20d43e8e9a5be5a79880b31dbbe0 SHA512 f483e7675fa4809ae8682136e3a70f3be840528eb190782a0a5e7d5e44fe2c460ad37c490e21b22543404c89161174b96185f1e89e3565b63303596a6f42223c
+EBUILD x11vnc-0.9.16-r2.ebuild 1945 BLAKE2B 7d53666e2cd1eeefa24d3180d0ee3ec5ecf51c8cc0f88969908dbed99310b4f6d41239f3d59e3fff321d0465c0886745fc2067e250d70ee8db87ab2f386c5927 SHA512 8e52237d36411de7f608c93e275d950811742c54b21d138e604205f55890fa65dfd5f2ff851dbb8ee8208f136f3e48b273ed38385d39cf57d11041e32e2e91f5
+EBUILD x11vnc-0.9.16-r3.ebuild 2018 BLAKE2B 4fb6d3eb92944a31a679a8768f236ad8d5d27a972a131b4b44cb482ba8dca324deac586d75b429b3bed8b1d4e25a16f2c63ac650e911c7d8407296edc0a4ec49 SHA512 f2d2ab618df8fe75a3d8ca060666e5fba9af1919909da73b59c9d0c7a2a0adcdfe1ab51ef081f1ddfd252a020c375a2675b7344ac5973b83d2e7e3d306af2d64
 MISC metadata.xml 922 BLAKE2B 02740589fa0091f604e1fff99ace802d4b179a35afd2c40d4ae25d40d41af0425a6e16cdb5951b4968813478a5066c6a241d49beba811dc296f125ba2aaddd13 SHA512 b46e3d0b379cf9967ec878e57d0a21b677ca869921546224f6f663eca4da8f2d57a97d07dac9da90999454584f6ea1c80748adf12663ff03b286292603aef2c6
diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.16-fno-common.patch b/x11-misc/x11vnc/files/x11vnc-0.9.16-fno-common.patch
new file mode 100644
index 000000000000..504159efe92f
--- /dev/null
+++ b/x11-misc/x11vnc/files/x11vnc-0.9.16-fno-common.patch
@@ -0,0 +1,45 @@
+From a48b0b1cd887d7f3ae67f525d7d334bd2feffe60 Mon Sep 17 00:00:00 2001
+From: Alexander Tsoy <alexander@tsoy.me>
+Date: Tue, 28 Jan 2020 22:21:01 +0300
+Subject: [PATCH] Fix build with -fno-common
+
+GCC 10 defaults to -fno-common
+---
+ src/util.c | 3 +++
+ src/util.h | 6 +++---
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/src/util.c b/src/util.c
+index a82a1a4..6a52ebf 100644
+--- a/src/util.c
++++ b/src/util.c
+@@ -47,6 +47,9 @@ int hxl = 0;
+ #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
+ MUTEX(x11Mutex);
+ MUTEX(scrollMutex);
++MUTEX(clientMutex);
++MUTEX(inputMutex);
++MUTEX(pointerMutex);
+ #endif
+ 
+ int nfix(int i, int n);
+diff --git a/src/util.h b/src/util.h
+index 35c1afd..99b5dd1 100644
+--- a/src/util.h
++++ b/src/util.h
+@@ -102,9 +102,9 @@ extern struct timeval _mysleep;
+ #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
+ extern MUTEX(x11Mutex);
+ extern MUTEX(scrollMutex);
+-MUTEX(clientMutex);
+-MUTEX(inputMutex);
+-MUTEX(pointerMutex);
++extern MUTEX(clientMutex);
++extern MUTEX(inputMutex);
++extern MUTEX(pointerMutex);
+ #endif
+ 
+ #define X_INIT INIT_MUTEX(x11Mutex)
+-- 
+2.24.1
+
diff --git a/x11-misc/x11vnc/x11vnc-0.9.16-r2.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r2.ebuild
index 9a8042ec4c5b..df61dda679f6 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.16-r2.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.16-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/LibVNC/x11vnc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="crypt fbcon libressl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf"
 
 COMMON_DEPEND="
diff --git a/x11-misc/x11vnc/x11vnc-0.9.16-r3.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r3.ebuild
index bc16d70cde2d..f01cd79f6bad 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.16-r3.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.16-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -44,6 +44,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-crypto.patch # https://github.com/LibVNC/x11vnc/issues/86
 	"${FILESDIR}"/${P}-anonymous-ssl.patch # https://github.com/LibVNC/x11vnc/pull/85
 	"${FILESDIR}"/${P}-libressl.patch
+	"${FILESDIR}"/${P}-fno-common.patch
 )
 
 src_prepare() {
diff --git a/x11-misc/x2vnc/Manifest b/x11-misc/x2vnc/Manifest
index 58a2ad86c958..3967e46b5861 100644
--- a/x11-misc/x2vnc/Manifest
+++ b/x11-misc/x2vnc/Manifest
@@ -1,4 +1,4 @@
 AUX expectk.patch 410 BLAKE2B 4e3f8882adbc64fc6c152394cdeed792a9630637e9962803a6ba5fbe9da5daa792024663cbe6192089a11bf18c51c088ef85d5d5928b174bc0caeb194f591183 SHA512 bb1dacf7d14e4a2d12ddcbe46029b912f781970f054f3127a23574bb290d26688d4a6fdc894dd5ef8d5d29474e5cae4b478e8618d2d2ccbf4043c9df7919312d
 DIST x2vnc-1.7.2.tar.gz 82258 BLAKE2B 4eebf2f33a38ac3fefc4b5a2a527977ad5dc73d0e3e8c289bffb2c0be1ca01117bbef5c312e186f295c910cbed0c71bea82cba8aaedb2cbbb192795d8eac9133 SHA512 f9bb9f8b95a6172758d1fd8b97f235088f0815afa21f2e11db77e59b36f8b3fe2fa2d8b922b14ccde1c589851d80489c9fd81d9f734ca9b053e4bc4019eade0b
-EBUILD x2vnc-1.7.2-r1.ebuild 679 BLAKE2B 10e92c07c08c03c2ef2de0cf852117af8625defe292f77d7aadf99c6bda08ff5b6a8df3cf68d2313f6fff601cede0b21922bad96b679c1e8c27c0199da8640c1 SHA512 f488dbdd3b18da6b23a15f8a701a04791aaf498e1be49ba8910e6a7029fa95a0498c8dc46c5996843ae5287282ca0c5c684555b9d53810c459c2985b82e59e68
+EBUILD x2vnc-1.7.2-r1.ebuild 680 BLAKE2B e43d3a5bbffd14939a468c08879be65b1c612fa5408874655fcf9cc9daec41adf5616b1fcf173a723efd26c670c81ac29489202eac9cc85cc6c8729f119ea88c SHA512 71c2573bdd42312c654185bbb90d4fa79e982c2db288d13c8ef3118d0423a53d61d01274b67c1c975b751fa7ed224ce97d0dab07d5dd31b9b64d48ce0fe0663f
 MISC metadata.xml 272 BLAKE2B 4dbd2b5ae92564a97b2a06ab0ec6562e8dce2dd636aaf0788ee09f8688ca5d5b6483084a65366dfbe6d144d30170e5558bc5759adecb96abb405ea96a5147285 SHA512 ebe67da08587903b5b82fc194aa3c8f1ab65371f60d2c134928362e089550d9e9fd9531bffe8b676a345b5bf0ab209ce7f50d37d98201a88176f002e17582493
diff --git a/x11-misc/x2vnc/x2vnc-1.7.2-r1.ebuild b/x11-misc/x2vnc/x2vnc-1.7.2-r1.ebuild
index 31f6fe487ba8..1eaeee22af22 100644
--- a/x11-misc/x2vnc/x2vnc-1.7.2-r1.ebuild
+++ b/x11-misc/x2vnc/x2vnc-1.7.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://fredrik.hubbe.net/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc sparc x86"
+KEYWORDS="~alpha amd64 ppc sparc x86"
 IUSE="tk"
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-misc/xbitmaps/Manifest b/x11-misc/xbitmaps/Manifest
index d98f184a3f30..3436ba2017ad 100644
--- a/x11-misc/xbitmaps/Manifest
+++ b/x11-misc/xbitmaps/Manifest
@@ -1,3 +1,3 @@
 DIST xbitmaps-1.1.2.tar.bz2 129435 BLAKE2B eff2f1e2efbabf447cbe98db09f81db96dc1442d4cce01b570774fb4e3e7323a40385d7821685724a9d9c69219528da980b2ecf01b0d3b822be8879e4d7f3e9c SHA512 eed5e2fce9fc6c532984e6ed1262e440591e311ca6c61a7fe7a5c877df84bfc2d7aff388fb9c894fc098785b8e5352f0bd7c918252247a040cf123874847450d
-EBUILD xbitmaps-1.1.2-r1.ebuild 672 BLAKE2B 007ce30b78de8b50ee1a3cc23a5a8c270d8d8c16a4e2700d83b6147c6dd4674aaa7fbfcd76447bcf9877fe277fd200e7abbb5afe7ab7b3a1b8a8d12f6d24d6d2 SHA512 b9e8bc95664038dc91c9f64c6b1416a6a8f79399e9ee7492bb98d3321773a15a10dbe45bb20d61841a0c9d0cfaeac7381ac0bcfa7fa7325461067d36320c1a4a
+EBUILD xbitmaps-1.1.2-r1.ebuild 673 BLAKE2B f5c39e1c77f55586ae467d7136377d5fe83bcc587428dd1979fdf810821ca564b3a90bdf663b844141d25b1a23d3fca62320a9cc64bb6d7fbcf4c6a20f543c0a SHA512 2677574e93e0b6d23be6d2b736cb762dd5bbf9f689ea0e57da18fd0d6f0bc59895b02d4ca12ba28afc8c12c19f220c11c1f173aa332f8b9d83eda53313d01084
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/xbitmaps/xbitmaps-1.1.2-r1.ebuild b/x11-misc/xbitmaps/xbitmaps-1.1.2-r1.ebuild
index 146b4687763b..2cdc19623b5d 100644
--- a/x11-misc/xbitmaps/xbitmaps-1.1.2-r1.ebuild
+++ b/x11-misc/xbitmaps/xbitmaps-1.1.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.x.org/releases/individual/data/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-misc/xcalendar/Manifest b/x11-misc/xcalendar/Manifest
index d5c813dfd241..74946f43c7dc 100644
--- a/x11-misc/xcalendar/Manifest
+++ b/x11-misc/xcalendar/Manifest
@@ -1,5 +1,5 @@
 AUX xcalendar-4.0-implicits.patch 381 BLAKE2B ea6ad6617227900cf7cfd67957109d28b5e820ae87c0796367808c2442865cc94dee718ac91550f392947b77a52bca1f952e9faac14178da4b0b90cf1ede6e63 SHA512 56c68560d2f2d75b5e7427e870189771f85994e934f7d813eaa89e34002d769b9aa1e24ab49a84a395d1535963802a249171e423e47c5d0e741e1a6e9a07fbc2
 AUX xcalendar-4.0-motif-gentoo.diff 1104 BLAKE2B 3176c538d92a776faef7fbaa02985964a64609eb5e3d79edd97d095309c2fec3e6cc0f621cadc97a09ed3e10fbeb35e627214c9f7ad758486125f1d61bef3fd1 SHA512 b6f15a68e2698a1d3f8dca2be8cc0751dae447268c6bca76aeccaa5a919dc31d3675fbb8d49d7d0d3293c50835b2628346f1ea5f7eb1da6152bb1ac73282ad59
 DIST xcalendar-4.0+i18n.tar.gz 48635 BLAKE2B 939880d749dc36973d69d6ed6f1d2c36dfeccea6d17a9ce77bde122af8c3a19bdf683b0c1838ba11a769ef4a8977a93cc1e67c40dacac4c87d2cb7a565e3ba60 SHA512 c9b3756bf857e4956360cb3efa1e185bdc09d6053e1b8db040822c73320589ef825330184fa3a8b949f94a89a6ef56438927886b3740922a4bca7dbab9285a4d
-EBUILD xcalendar-4.0-r2.ebuild 1262 BLAKE2B c25b5e5f3e5f213260abbdcd39e04b225627751bd05a6464bdd10f148565c0d9e82b8154b2b811ca4ad6e6ad45630982e3c4b4175d2e74661e6e5e7fdb6d91c6 SHA512 1e1d7a70b3feedc7824cfb5c0ba75d252fcdfd424feeef96325f3325b50b29118789fdcc46f5df7c40c626ec2b804518413c58190fa4394f5cfcd277bb7d1cdd
+EBUILD xcalendar-4.0-r2.ebuild 1263 BLAKE2B 28899b5cf610c6856ff813e130a0886377ce6c211e8d4352f83a8517700f063ed264be3511e812db292143e6f223c20f85997938fa5dc4c2b4c56dc079c4dd26 SHA512 a7efb4cadbad808ecb5faae7ba4df545410d65d72e486cbffc28f621db57f974c6c10c723773fc26d99ebb6ff5d5fd79fbff4779145f7c755c6fc84e124fd879
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xcalendar/xcalendar-4.0-r2.ebuild b/x11-misc/xcalendar/xcalendar-4.0-r2.ebuild
index 97f2790918e1..84c0e28b160f 100644
--- a/x11-misc/xcalendar/xcalendar-4.0-r2.ebuild
+++ b/x11-misc/xcalendar/xcalendar-4.0-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://daemon.jp.FreeBSD.org/pub/FreeBSD-jp/ports-jp/LOCAL_PORTS/${P}+i1
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 x86"
+KEYWORDS="~alpha amd64 ppc ppc64 x86"
 IUSE="motif"
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-misc/xcave/Manifest b/x11-misc/xcave/Manifest
index 8b81cd1094f9..5e0df57a26b1 100644
--- a/x11-misc/xcave/Manifest
+++ b/x11-misc/xcave/Manifest
@@ -1,3 +1,6 @@
+AUX xcave-2.4.0-pkg-config.patch 201 BLAKE2B 0546786150f51852ecc3618a6f384de44b099837ece50393697273c374525deaf3c26aadfe5076aa4e91aa989756d1a3131aa68c5b3ac8e6f5f5411ad0cc19ed SHA512 c326bc4ac74ff764b7c77d17abc37ef03afe0fc2e20f7018cda242e49e767c2ccb1e05250f57a567c6b14a2069df6e57bc2bc87d0f4e8e031dfe8c14e3782f5f
 DIST xcave-2.4.0.tar.gz 817356 BLAKE2B 2a80eb20d484fe37ee5871e4bbf443fb87170adf8a02d4ebc059bcc4f907b2b4442a0b9858719e1c656d0293e55c470aba1bcf83c899ba079a2f201d93b84cb2 SHA512 cdba5ad8b7634004a9439fd87a8eb8ed45137e78cb119310c6b7df9352aa979682edaae6440200804e23953c822d377c95cf459cc37ce227d1a41885a91afba4
-EBUILD xcave-2.4.0.ebuild 549 BLAKE2B 63966d96d1e7ddf58f9eb5bcd6d2d442df81188d4decdfb52e8a2b159358fbc7313699b369e651a6a555e7aafdd6b08125f1b62be212f73b6d5e1f3c59839349 SHA512 38293dba305bb92736618a34542d623edae3b795979ae659a3a6b96abcb98977f02188b28f688c4488d82e8ea710ec25f21083ed365681e52cebccbfd0bf987e
+DIST xcave-2.5.1.tar.gz 786853 BLAKE2B e3b2290b01c16bff4dbe8d5167b4bed75fbe4225555e3ee3856115302329878550cbb4c35286c717eb46c3fd12b4d66323895cdbb292cc6f054360b53c3f9c1a SHA512 6095c06d75f7c5d87a6d0f1c4c3a52071ffc1912d60ba07c95d9b8d84f0027ba24476f941828c4eecf801d7ca7f0bc168ddd2d162b3e863fc31ee6b4c9144cd4
+EBUILD xcave-2.4.0.ebuild 752 BLAKE2B 4c0ac0c3cef59e0a98df06d099b50c06bf05cb7403414ea9ba048c860fbea072e87bd3ef5d5d35f8ad745cc30359a85c1fd6eeed66fe0cbd8fd30079bee9ae78 SHA512 f828e14ef719f72a52be2de76607b8c5abcb87b2a85e7775bb71b5e6597cf6c3a299e54421f487491d0119a146b2f82ea5ad517e1370e679eb85911d9d160537
+EBUILD xcave-2.5.1.ebuild 627 BLAKE2B fa3f56245fa802e538f64a800a88b0029f86a6d31c13ebf5fa5663fe7319e2b90621b3090f23e00e8781b250f2dd27255c43e100d1f00897d6f0277f11bae571 SHA512 0cb4191bb0718310974cbd6d4fcf6efdfde84c17985131a5bae1d63d8c9cc0ebddeb19020f280239a8a4c894b2e509d9c25254700a37f69f1fa1cc518abf7bda
 MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
diff --git a/x11-misc/xcave/files/xcave-2.4.0-pkg-config.patch b/x11-misc/xcave/files/xcave-2.4.0-pkg-config.patch
new file mode 100644
index 000000000000..f0e331dccfe2
--- /dev/null
+++ b/x11-misc/xcave/files/xcave-2.4.0-pkg-config.patch
@@ -0,0 +1,13 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -49,10 +49,6 @@
+ 
+ 
+ 
+-PKG_CHECK_MODULES(libxml-2.0, libxml-2.0)
+-AC_SUBST(libxml-2.0_CFLAGS)
+-AC_SUBST(libxml-2.0_LIBS)
+-
+ AC_OUTPUT([
+ Makefile
+ src/Makefile
diff --git a/x11-misc/xcave/xcave-2.4.0.ebuild b/x11-misc/xcave/xcave-2.4.0.ebuild
index 3e6245d4498d..96c74893f67f 100644
--- a/x11-misc/xcave/xcave-2.4.0.ebuild
+++ b/x11-misc/xcave/xcave-2.4.0.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+inherit autotools flag-o-matic
 
 DESCRIPTION="View and manage contents of your wine cellar"
 HOMEPAGE="http://xcave.free.fr/index-en.php"
@@ -14,13 +15,30 @@ RESTRICT="test"
 
 RDEPEND="
 	x11-libs/gtk+:2
-	dev-libs/libxml2:2"
-DEPEND="${RDEPEND}"
+	dev-libs/libxml2:2
+"
+DEPEND="
+	${RDEPEND}
+"
 BDEPEND="
 	dev-util/intltool
 	sys-devel/gettext
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4.0-pkg-config.patch
+)
 
+src_prepare() {
+	mkdir m4 || die
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-cflags -fcommon
+	default
+}
 src_install() {
 	default
 
diff --git a/x11-misc/xcave/xcave-2.5.1.ebuild b/x11-misc/xcave/xcave-2.5.1.ebuild
new file mode 100644
index 000000000000..21223817b379
--- /dev/null
+++ b/x11-misc/xcave/xcave-2.5.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic
+
+DESCRIPTION="View and manage contents of your wine cellar"
+HOMEPAGE="http://xcave.free.fr/index-en.php"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+
+RDEPEND="
+	dev-libs/libxml2:2
+	gnome-base/libglade
+	x11-libs/gtk+:2
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	append-cflags -fcommon
+	default
+}
+src_install() {
+	default
+	rm -rv "${ED}"/usr/doc || die
+}
diff --git a/x11-misc/xcb/Manifest b/x11-misc/xcb/Manifest
index 5b67f90a6d5b..83773dd13586 100644
--- a/x11-misc/xcb/Manifest
+++ b/x11-misc/xcb/Manifest
@@ -1,3 +1,3 @@
 DIST xcb-2.4.tar.gz 19830 BLAKE2B 7808021c2781421e4d609c27516f8a45195999bd75c82935c84048852f08e2656d6693abd3993e919b9740b11252da5cb15dcbe73602d715390839391ca75cb4 SHA512 cc612231cd61507a1af1a12fab7684b074ec99ec87e82bcba13dba215d4569c0605d3861f40d858f87da9b027c440a02f03b18a968c1d73ab08b8ee41e644948
-EBUILD xcb-2.4-r1.ebuild 969 BLAKE2B 538b68f416ec6ce40b4bd3293e4f786db3ab36f862df874b1095063239486e7f8e10b82631b7d129f1969d7b16d9acebc4241ef44847a92572f060d1c469e8d2 SHA512 33d562d5692e38d837b79e6cd0e8250c42d4b52243bedb25a1248351ecaec0736ca5d27da34a7c7d9fc8e2a3569b8890134ff6505f48ab4781a1be13aed0a73f
+EBUILD xcb-2.4-r1.ebuild 970 BLAKE2B 570f0d6e8aa7a359bde139f52943a7755a92a103dc55ce053d6e841bb332e535a65ddcd1788a9774b78ec87761150f21a028a3ab58e66c53e579ab1d8e1eacfe SHA512 124d543551f6ca9076a9d77188ebe59078b17c10a4a5018a5981268ef1f3991ce8edfeff49bd8c6c2662c458d78c59f25fb4aea14b5e27f01c09f6337404b76f
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xcb/xcb-2.4-r1.ebuild b/x11-misc/xcb/xcb-2.4-r1.ebuild
index 5813bf01dd29..0dc3ffca68bd 100644
--- a/x11-misc/xcb/xcb-2.4-r1.ebuild
+++ b/x11-misc/xcb/xcb-2.4-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://oldhome.schmorp.de/marc/data/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~ppc x86"
+KEYWORDS="~alpha amd64 ~ppc x86"
 IUSE="motif"
 
 RDEPEND="
diff --git a/x11-misc/xclip/Manifest b/x11-misc/xclip/Manifest
index a6ca83a82565..4b74bd146015 100644
--- a/x11-misc/xclip/Manifest
+++ b/x11-misc/xclip/Manifest
@@ -1,3 +1,4 @@
 DIST xclip-0.13.tar.gz 30461 BLAKE2B e5249c81aceca59f71eeee985ab4a4c9006b6afef98f3f6addd7adc590abea47d3e9df8110ccb6c0c065cf4356a2a2a0866e08604adbac75e3589bb97403aaa0 SHA512 191a86194a1503a47c6641a55855dc4aaa8c2c99d2e6f1d46e727feec85a6639041f37ec2265c05c178c0c7d791d3e88bde89223f879effa878812f078485ed2
-EBUILD xclip-0.13.ebuild 553 BLAKE2B 494e481b3a7775aa952314fb749c24c6c499736dc3a34a80f6e638f2f1267e9cfa27bc6cdbd65f4e23003dbf0bda80ecdf19bf14550e36fc26d211a942368b8f SHA512 e528678fc5f2ba4e2eaf4d5ed4eab0a318be59955df83db0131b645db9653df9b23ce264744a02e3fc6da88fc9d34593eb689d909a306f1692bb349ca3166de4
+EBUILD xclip-0.13.ebuild 554 BLAKE2B 6f2a902af2b85dde2b255032a7243e17a1b808214f7762a59f91c49e316a7e8bed015b3d4b47fab010b01867002f6a1e297ab631a1edbd5730e2403cffe76190 SHA512 3e58743b5e307cbe02f6445c9b1d703d25aa21078bc041e638840ff728592c8580da3d4754ada305ec927b0fa9c990d500df63a30c0e361a6f521d292fe16906
+EBUILD xclip-9999.ebuild 456 BLAKE2B 7c2fce6b884fcbdd0705a300bf2756bfe0c5466eace338a129ca220076bff3d0ad256d25df37ccebfa11f27526388d0e8563b032e2db8344242ef9fd335026c1 SHA512 cddad35c477142f3efee940c37d59c7b6191d91dc19e17d1a2902ba4ef3ac6bbdb57dd07f4f52a0af64b02b5659f19b7543094d7a44c4a1bcefa9f8451a4e1f6
 MISC metadata.xml 364 BLAKE2B feee6d00129ab16e53f20b00c4a69d5def638b3231316079b63354b089817e3c84d300ec2da1966593a51339f941232ec466d6f99d5e0f365260306287121d2b SHA512 fb7dd60c82f3d739a58c1451434d15d14906249ef5bc350dcda11ee6d5366f04981d93a98a290e653b8271269c3f21978ed50894da0bf5da9fdaaa9b2def4cf1
diff --git a/x11-misc/xclip/xclip-0.13.ebuild b/x11-misc/xclip/xclip-0.13.ebuild
index 026629726c6e..25342571bf9d 100644
--- a/x11-misc/xclip/xclip-0.13.ebuild
+++ b/x11-misc/xclip/xclip-0.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/astrand/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-misc/xclip/xclip-9999.ebuild b/x11-misc/xclip/xclip-9999.ebuild
new file mode 100644
index 000000000000..12a50d1de869
--- /dev/null
+++ b/x11-misc/xclip/xclip-9999.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools git-r3
+
+DESCRIPTION="Copy data from standard input to X clipboard"
+HOMEPAGE="https://github.com/astrand/xclip"
+EGIT_REPO_URI="https://github.com/astrand/${PN}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXmu
+"
+
+DEPEND="
+	${RDEPEND}
+	x11-libs/libXt
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/x11-misc/xdg-user-dirs-gtk/Manifest b/x11-misc/xdg-user-dirs-gtk/Manifest
index e61b7a8d9ee1..ab9f290fcbd8 100644
--- a/x11-misc/xdg-user-dirs-gtk/Manifest
+++ b/x11-misc/xdg-user-dirs-gtk/Manifest
@@ -1,3 +1,3 @@
 DIST xdg-user-dirs-gtk-0.10.tar.xz 116528 BLAKE2B f86237859636046ecc72bdd62ee5c6a3726ad701aabe04f14bff6541554d3e9de82265cb95b353714adba5d6c8742f94150df9b6f3e4043db9e6885e61e569c1 SHA512 c3ef070244cd1c87312c2c2602dbe7bc3dd26eed632b0d8d779580d7ee6259efdda453ab7bdf4415cc72fad7a74d9dd36476189fe446d5627e4db75d905302f5
-EBUILD xdg-user-dirs-gtk-0.10-r1.ebuild 1108 BLAKE2B 4bace2999015ce067378841b06811c175b455712966b2597fda6476a60d485ccd9b6b89a13b38c04409cfe869f357b005cb314bfb1dc60e97427221b54367bdf SHA512 2e4155d5313c9b41273749bb00cbc0d7aab9cb42934520cfcb482aacd24fbf7dbdca336202453d1969c8a5464d0ed817e713eb02cd4c497e2481a6c3c768b0a6
+EBUILD xdg-user-dirs-gtk-0.10-r1.ebuild 1109 BLAKE2B 49bb8dd17a44bcfd5f0a8a6c0b059c670613f3ca32099cf3102dbaad785fd462bf8be857decce6120fdd2985ee432777c08fd6d49506470e2de419435c0fae02 SHA512 da7676ac521af50196434bd442b8534a7db42785e6c47fd20dd27f3314635cca8083493a097f9197cf69e0a71ea68457a54d8e48377e842652a242395c409cfa
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild b/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild
index 0eaccb82918f..62e640ff2d57 100644
--- a/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild
+++ b/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/xdg-user-dirs"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/xdg-user-dirs/Manifest b/x11-misc/xdg-user-dirs/Manifest
index 32587fde370f..b72122909d07 100644
--- a/x11-misc/xdg-user-dirs/Manifest
+++ b/x11-misc/xdg-user-dirs/Manifest
@@ -1,4 +1,4 @@
 AUX xdg-user-dirs-0.15-libiconv.patch 298 BLAKE2B 5028bfcafccc0310c192894cbeee12627b5b599cc5b612b6a38dcec45e36b9aa1f4ab2cdc31f29899b278088e61776bff51b5216adbf6c2497370c7966b17a50 SHA512 227b134d0782067f8c8688832036da8cb1afbcda247349db3502867e3f1b1eaa09885f2419762712ab9ce82655d4bb9a7ec17f63afdb9f00be5efcfd895ca7d4
 DIST xdg-user-dirs-0.17.tar.gz 257291 BLAKE2B 75b44a841b7961977824581dbbc760282fa3a5eed0a5496746ff6e09cabe4dec022d0f6fb129a877d8310c1fb214035f1e917c0e327dd5267bb83c47bbe00d5f SHA512 a02cc251f2d0a8bd0dad498901c8c6fbe8dae0e0e156abcaf27b1ded376a1ed369c2e59201d56ab4e38c9d521026fa39199177f3868c30e5c50cc03665dc335f
-EBUILD xdg-user-dirs-0.17.ebuild 944 BLAKE2B 75518fa529ea2dc8c8bf089d6a93520864e7106d3d38974cabf7496271fc4ce5ceaaa152b3b704fc6ac9043c7705db0d4d171a23572f491a15cab50896a4e619 SHA512 c5fe0fc52fa4d0f5f252e0437d031f76f51656e1e81b2f057928b2f11b572ea6269fe5ca70936f4366f053c3d22667afe604ed51a4e5d1510419d1e65fff8576
+EBUILD xdg-user-dirs-0.17.ebuild 945 BLAKE2B 78867a24ba49526c0cdebb513101190cefa137dbacc901e6d4ccde0894525fd5facfda63ae11124770ea3ccae570df22a6b8127e7f719905050dc388914cb469 SHA512 913f19c3a6705bfd9b22f114ef4a69e9da2af8b89cdb12b403037f88a7910aef2c1fc81c40d812d2290882dde699006becbcccb8b6a415482f58813ebcacf5ec
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.17.ebuild b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.17.ebuild
index 390f308666a4..a6760e0cd1ad 100644
--- a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.17.ebuild
+++ b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.17.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://user-dirs.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="gtk"
 
 RDEPEND=""
diff --git a/x11-misc/xdg-utils/Manifest b/x11-misc/xdg-utils/Manifest
index a6e35aa5f65e..0841ef8e6e08 100644
--- a/x11-misc/xdg-utils/Manifest
+++ b/x11-misc/xdg-utils/Manifest
@@ -1,4 +1,4 @@
 AUX xdg-utils-1.1.3-xdg-open-pcmanfm.patch 702 BLAKE2B 1adcb274c1a5fcca4a99178bfe38d70e5b1d1f792c20ea4de166096137d0c393a38b4958e1044aa2a6afd4437b9e4eb40d1223ea6b7dd905e93e0499a88478a3 SHA512 fd30975e48a3a7607a812bcc87d5a9595875695693609d477acbe9826a52c53b14c66a4118888eb6d8fcb63630c5f614250f4c8640d1ea99710b26714920c019
 DIST xdg-utils-1.1.3.tar.gz 297170 BLAKE2B bd281df73d8c966d11b502dd7ec88d96dbc9683503f54b043ae4842f146b6847bd3dd6902cf993771848d9fcb55d26d67f032af2b8aa0795a6d9855535e57d5b SHA512 d1f819a211eb4104a90dfdc6fedcb640fd46b15ccfc8762266f8f538c49d74cb00027b8c1af991fb2a200acb4379986ae375700e06a2aa08fb41a38f883acb3e
-EBUILD xdg-utils-1.1.3-r1.ebuild 2157 BLAKE2B fe36df854985cc47bcf5c637bef41c4233edbe3345892ee77fea4638f3dc29dc88a590cd53b0ae668d9dea2cb5a48d3231f448ba55cc6119a533c1c383ec3b82 SHA512 32f9d27d6c6cbfcd34afe52bbe782c4dc2338b2643ff1dfa11f5b772340511191947f748993eb22692787407c2b92326e0e07f61ce35483e5dda271a5b46d912
+EBUILD xdg-utils-1.1.3-r1.ebuild 2158 BLAKE2B c2d985ff1f7330d9273e93d12396979efc041eab5f3ca37b4cef8b4daf2b302d89659de413a2c64a484a0784817e85e95724d2d633980f181971230064cdf3af SHA512 db7eab2504383d51d328199a870c605d8a15b3cb179c4a7bb2a24a424fda29a59dd5c76162b1b35fa575cefbaed65ba46c0de3322ea7ab9765dca8c6709013a9
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.3-r1.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.3-r1.ebuild
index 9dc2cd3e4b6c..9be5e5e9519a 100644
--- a/x11-misc/xdg-utils/xdg-utils-1.1.3-r1.ebuild
+++ b/x11-misc/xdg-utils/xdg-utils-1.1.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://portland.freedesktop.org/download/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris"
 IUSE="doc"
 
 RDEPEND="
diff --git a/x11-misc/xdialog/Manifest b/x11-misc/xdialog/Manifest
index b5e8cbe6d41b..70966ae4752f 100644
--- a/x11-misc/xdialog/Manifest
+++ b/x11-misc/xdialog/Manifest
@@ -1,5 +1,5 @@
 AUX xdialog-2.3.1-install.patch 347 BLAKE2B 4635818c220dafd96ed2a9131d0639ebf47933b66dea33d618b94f797eaa33f055ae7daf73a515ffab598fdf0746da3c12e60f6ecaac1779837e38f06c988b2a SHA512 756aec03d9ee6ba0fa2f567d6c3db69916290a3b65474c2f1dd912d6f11095343c2d74a8ab60fc7d9d861165058e8ad8bbb8fc2827e663927e85747b9538ed05
 AUX xdialog-2.3.1-no-strip.patch 1449 BLAKE2B 30beb344c1ae3bb074bec78d334ad329ab6af8291639c40bdfa6ada510155120a7629fc4805c543af29c719f6f9ca80a2f158c4de98779e361351d4b14901528 SHA512 352ea269be3d48aaec50ff6ec49524da80a5df837ef13851646f0cf4d38e5901e639881b4106112b3d515f764042dce70f423d501ea1dda2493b4061dbba9ea6
 DIST Xdialog-2.3.1.tar.bz2 457938 BLAKE2B d532bf9d25a349865baa3b9f484ca86d5bd7d946ca7e5b786f29eb65d297dafd9e58aa333ba671b836906d9620b900148d203be961d5ca3754977d01fc128fac SHA512 2a0f6e15297ae3ef54a41da1b1fe2ef376d28757d47433df2b8e9918cd4f95871a630b94ec544bd848e518df7f86934030a71bf0371a1466286bf7d912335525
-EBUILD xdialog-2.3.1.ebuild 921 BLAKE2B f77d502410731e0d89f422374eb59d749cc3ee9f332c142f91ed4d254dd90bfd8269b3475cf914db1703b26bbb4ec66ef751adf5b04e6cd068e72c373cb8ec30 SHA512 bc74ed8f3bc7e434c9c43d5c1c28d78a33ec7a965b484e4909d6c3fe4bc8d19eb1b283855b1819d8cf8aafed924c4c911b1cff1c997d93d8895d875fc188dbe0
+EBUILD xdialog-2.3.1.ebuild 922 BLAKE2B 2836dac104938459767747bfa813dcb6cd947aa3548a888e7e626eda253e473a82d7dc4658df18cc5e72f9a666a3ef5729e04a9221fbbdd978204d0aefe91d58 SHA512 2648a93f306e1aff48e00532679cb802a09e57e28c07097db9a4a48d06cc1f3e008faab933cf2759aa867c816956b4ffd88f9b582319bfb5c405bd8d783d9afe
 MISC metadata.xml 272 BLAKE2B 4dbd2b5ae92564a97b2a06ab0ec6562e8dce2dd636aaf0788ee09f8688ca5d5b6483084a65366dfbe6d144d30170e5558bc5759adecb96abb405ea96a5147285 SHA512 ebe67da08587903b5b82fc194aa3c8f1ab65371f60d2c134928362e089550d9e9fd9531bffe8b676a345b5bf0ab209ce7f50d37d98201a88176f002e17582493
diff --git a/x11-misc/xdialog/xdialog-2.3.1.ebuild b/x11-misc/xdialog/xdialog-2.3.1.ebuild
index b98cd8fbe72b..0a4ae8b179fb 100644
--- a/x11-misc/xdialog/xdialog-2.3.1.ebuild
+++ b/x11-misc/xdialog/xdialog-2.3.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://${PN}.free.fr/Xdialog-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ppc x86"
+KEYWORDS="~alpha amd64 ~hppa ppc x86"
 IUSE="doc examples nls"
 
 RDEPEND="
diff --git a/x11-misc/xdotool/Manifest b/x11-misc/xdotool/Manifest
index dd33925a83e0..5c5093b31531 100644
--- a/x11-misc/xdotool/Manifest
+++ b/x11-misc/xdotool/Manifest
@@ -1,5 +1,3 @@
-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 1350 BLAKE2B 40f5a3d18293cfd1aef97b74b1916494b380065f910126b8f71849734bc0fcd33d638fff988e827269c00de4ac37dcc5a7bb28d71ecc18f9afe9f97a86ff5d83 SHA512 1c26297aabcc3e86b1392756da3fbef93132030bad486d907f73458574941479975fe4b88f9a6ee9b673192b765973c2699a2b130eaadf860f347fce0beb60d3
 MISC metadata.xml 583 BLAKE2B 72181c8dfd9d575229c2e86ad0041311325f9103715be568d45915c3a69bc44ef30919146fcae3f74ea2dbf844cd62d94dc7fe5e0ef1969b84a764b4ccd30cc1 SHA512 7c09064d2334d1f6b4d488bd9aaf091e0b27a7e674f151c62bea6e988d58c71996cf20f5d63587e14903a80b5f93e77305d493b94fe03a68ab24fbf1a438df76
diff --git a/x11-misc/xdotool/xdotool-3.20150503.1-r1.ebuild b/x11-misc/xdotool/xdotool-3.20150503.1-r1.ebuild
deleted file mode 100644
index eebea7adaabf..000000000000
--- a/x11-misc/xdotool/xdotool-3.20150503.1-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic multilib
-
-DESCRIPTION="Simulate keyboard input and mouse activity, move and resize windows"
-HOMEPAGE="https://www.semicomplete.com/projects/xdotool/"
-SRC_URI="https://github.com/jordansissel/xdotool/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm ppc x86"
-IUSE="examples"
-
-RDEPEND="x11-libs/libXtst
-	x11-libs/libX11
-	x11-libs/libXinerama
-	x11-libs/libxkbcommon"
-DEPEND="${RDEPEND}"
-
-# The test wants to manualy start Xvfb, wont use VirtualX and it tries
-# to run a full gnome-session. For such a tiny application i consider
-# it overkill to rewrite the test scripts to not use it's own X server
-# and add a full blown gnome just to run the tests.
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s/installheader post-install$/installheader/" \
-		-e 's:\<pkg-config\>:$(PKG_CONFIG):' \
-		Makefile || die "sed failed"
-}
-
-src_compile() {
-	tc-export CC LD PKG_CONFIG
-	default
-}
-
-src_install() {
-	emake PREFIX="${D}usr" INSTALLMAN="${D}usr/share/man" INSTALLLIB="${D}usr/$(get_libdir)" install
-
-	dodoc CHANGELIST README
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*
-	fi
-}
diff --git a/x11-misc/xearth/Manifest b/x11-misc/xearth/Manifest
index df57e37bb66e..3c78e7ed09c7 100644
--- a/x11-misc/xearth/Manifest
+++ b/x11-misc/xearth/Manifest
@@ -1,4 +1,4 @@
 AUX xearth-1.1-include.patch 231 BLAKE2B 803cdd036a1018ab85bd3acc30a6f6168a3596c04dd7de7196983b6c53b10e443d2ed043f61faa35b1ab87f28496f5865f128008b604efed41a74af3effc0d0e SHA512 9e4fd1d44eeda5c79ab22ceeb20fd005cab71869bcadd17adcb1cee10157c35145e7c7aa6d3c62f3da1be83cc79763b9ad77cfaddd4021dbcb56c8efcbccadb7
 DIST xearth-1.1.tar.gz 157887 BLAKE2B 2dfc43b1a8fadeb7d30a4234496f44171cd138975e84b295e60d0f9855c1f3b011340b2b3aecb98d75fde2a71fdddb4e959ba84e89204f246915b7cd1a76efc1 SHA512 ab1c146385a0e61f6208a0218cabc8a10902f52feb50f328a330cdbddc5d2eff2c3efdf6719b625bcc07171ed2fd6201230ad8a71cd77a451ad9c81383bfd46e
-EBUILD xearth-1.1-r1.ebuild 874 BLAKE2B 158de12d2947d146352adbde232d6288b5254828f19de4aba72797d1a6c02819a0dd7f6da45f8bace07f1ff68c80bd53f12359875ffa652dc5c8cade2536a595 SHA512 fedc6d408dfe111d4fc3960f3cec61e1c76bb10f3b80fae64f1e0a6049bd2d78dacf4258114cee766542a2051e43e003d6f37b91a284b1b41af5b62aa88e9575
+EBUILD xearth-1.1-r1.ebuild 875 BLAKE2B 662215a03cd81cfe24d1ccc381844f080e78ddae943e53c61248c5a33b8c710a2cc686d4ef8565694babb9c3486e53f058b3321678399853d7922ef2b23553c8 SHA512 dbcbe8e4f43a75fe5d21d8f0fd1bdfad08e848de4dbb894107e6fcb2b3ea0e15a2c61975be01ac4c168b8ea5a39c98b6afa874ba4493766228bddbf3d7b79e22
 MISC metadata.xml 318 BLAKE2B e2fde4c35c72439790ea9e4c0e403f1a0666a7ebc8e9f350b29138d01c171765fac8cd6adee54667bbc19921e6fc976a427c3429464769a02d9e8dc8c83a8925 SHA512 7d56445a5c7fffdc1104633cdd30eafa17588079b8a1f4cb226984b1aad4e41fe84320608681143dc01c5f1ac5f104cf0717e8183164031644220f9c61086a3b
diff --git a/x11-misc/xearth/xearth-1.1-r1.ebuild b/x11-misc/xearth/xearth-1.1-r1.ebuild
index be7b038c09fe..b9d039179128 100644
--- a/x11-misc/xearth/xearth-1.1-r1.ebuild
+++ b/x11-misc/xearth/xearth-1.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://cag.lcs.mit.edu/pub/tuna/${P}.tar.gz
 
 SLOT="0"
 LICENSE="xearth"
-KEYWORDS="alpha amd64 ppc ppc64 x86"
+KEYWORDS="~alpha amd64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index b891be925ded..cdadc929787f 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,4 +1,6 @@
 DIST xkeyboard-config-2.28.tar.bz2 1682987 BLAKE2B 8883787119bb46e4351d4023aee0f1a495b6acc87755b408ffa51d5082f84f4b1a083a8a0ee640b00afd35777bc8e8e0ef2187cd0bbb2600db81da8fef19298f SHA512 be38e61a7d3a1c03f9dc92fed5aada65fdb8b42272e874e01156a39de07f2a7c81846e9ba449aeb95661587f8d05217d549a1315ee0dd92facbb6158362e68ae
-EBUILD xkeyboard-config-2.28.ebuild 1258 BLAKE2B 1098f824b448d3b6beab9657f9589bd71cd0111bd58a968bb139301231d1ac677c5b21f2aaf231eb245cd6159f4ba7ffc9e7ca5adfdcff8f7744290bcabddff7 SHA512 3ccb42a720e2304539d4d09f1523b703629303c08616ce84dba5ccfbcfcc5bd459e8ad7f7af3280ee473ccf587026e8425536008f7becb44b3296f09e5a96a51
-EBUILD xkeyboard-config-9999.ebuild 1216 BLAKE2B 59e22f817504c8a13afb331880a98b300cd4b76797f1dd1b713833f699733548f5d2fd54f28bc3e4fa541a150e261e3ef39276648c1eccbfe42304101f922a1d SHA512 9a2f7ea4d02157d28979c6564c07b864f1be22ea3acb73e054ed8cf69a89e527b301a480f0e9e600d5b334fcc6bdfdb188bac65afdc7e081c68d2338cbccaadb
+DIST xkeyboard-config-2.29.tar.bz2 1707176 BLAKE2B 436f2e8f4c7bea5a96e551daf01cdf6f7eeb2468dbacd28b977be003e159d0af9f233f17749fb5379444ce84c8d5c78f1c949e4bddfa3db6d39338ae01f0aefe SHA512 202255af097f3063d76341d1b4a7672662dc645f9bcd7afa87bc966a41db4c20fc6b8f4fbe2fcaec99b6bc458eac10129141a866a165857c46282f6705b78670
+EBUILD xkeyboard-config-2.28.ebuild 1259 BLAKE2B 089507e83606f70d0a1091a45da09c8359484d05f6415e65bfb074e6bf59dca2d584789dea15d7ebebaffb5c22b1a2d233d14c87c2b36d8fdc3931fc5c1c0922 SHA512 cb8a8a032239aadd8663f23a360edba592b6ece8e3bbe26ff6642f9c72701bc5b8872b4df85240864626c5f76675a00014f1146113f7dfc633cd72f20e62e4de
+EBUILD xkeyboard-config-2.29.ebuild 1233 BLAKE2B 8e4e631f47f021b410d03c9d0ee7f7c55848b895a94c4a0725011d57e3c1e375955d8e7021dfe98e2fc1375b6a4e774a96703497e3a7e13be6bbc416a89f7b58 SHA512 912b4fabe79b3164b716fbb6986dba42e1f4a233442ea1a00a56f5ad78fc5019f7212c06670d0d233fd238da13c434ad8ad288d3955f33c3d916aefc52762f70
+EBUILD xkeyboard-config-9999.ebuild 1233 BLAKE2B 8e4e631f47f021b410d03c9d0ee7f7c55848b895a94c4a0725011d57e3c1e375955d8e7021dfe98e2fc1375b6a4e774a96703497e3a7e13be6bbc416a89f7b58 SHA512 912b4fabe79b3164b716fbb6986dba42e1f4a233442ea1a00a56f5ad78fc5019f7212c06670d0d233fd238da13c434ad8ad288d3955f33c3d916aefc52762f70
 MISC metadata.xml 337 BLAKE2B ab0893146e71b0d96879e7ec41c7c4e057cb92570227daef015b6fa1a24c55709cd3d19e16df5afe80f706995e12a44a9fc29826a552bd436b1e9381e44acde5 SHA512 6a43f86407638d3f156d4ae64caee882878dbd1ee7c23991c8f378d55cfb0afe016202866f95c328d8b4e59186efa6a7cb7335a1c86e3fbdda4c16a96e175cf0
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.28.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.28.ebuild
index 0cc5883a831f..d39b0ceaa6af 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.28.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.28.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
 else
 	SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.29.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.29.ebuild
new file mode 100644
index 000000000000..95509d07acfc
--- /dev/null
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.29.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="X keyboard configuration database"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config.git"
+	inherit autotools git-r3
+	# x11-misc/util-macros only required on live ebuilds
+	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
+else
+	SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+RDEPEND=""
+DEPEND="${LIVE_DEPEND}"
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	local econfargs=(
+		--with-xkb-base="${EPREFIX}/usr/share/X11/xkb"
+		--enable-compat-rules
+		# do not check for runtime deps
+		--disable-runtime-deps
+		--with-xkb-rules-symlink=xorg
+	)
+
+	econf "${econfargs[@]}"
+}
+
+src_test() {
+	:;
+}
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
index 65c25664dd43..95509d07acfc 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
@@ -26,9 +26,7 @@ BDEPEND="
 	virtual/pkgconfig
 "
 RDEPEND=""
-DEPEND="
-	${LIVE_DEPEND}
-"
+DEPEND="${LIVE_DEPEND}"
 
 src_prepare() {
 	default
@@ -46,3 +44,7 @@ src_configure() {
 
 	econf "${econfargs[@]}"
 }
+
+src_test() {
+	:;
+}
diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index b4ad7bfa1c1d..07bc37dfc4ad 100644
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -4,7 +4,9 @@ AUX xlockmore-5.47-strip.patch 2048 BLAKE2B 0f0f00a38e1d3b5edebf40416698ad3b8732
 DIST xlockmore-5.50.tar.xz 1632968 BLAKE2B 2e692d16d70e3186ec1f31c192414b286f8815f2f428a6f7f43b3de0117c51c4ad2fbdfb91debe2ecb75c8683212b5d33bee62d81374552703d578b02d3af036 SHA512 627a905c4641d6083676a766931f23c06e2ac5af9b43447ccf03143d329d24b786aac6b248318929399b5fae98f1ec17e676466b5cbd09f180377c483694c569
 DIST xlockmore-5.59.tar.xz 1935296 BLAKE2B 3a7027dad227179dfe3917108f8960a751cc16481fef541e80c656f99832de6d203cad1815f0f31f66aa2338d06035a99dce18664af2bc0b8e4610ef25339d20 SHA512 02758869ba597ef32ed1e594fa88141644264bbbc8edfe9ae8742a4508fa3e38d059c9ffbb9fa9bcc323b92e1763f96c8b6d054494849df465a08bc6be71bf33
 DIST xlockmore-5.61.tar.xz 1936312 BLAKE2B f4d12f1dbd5da1d8cef16690e393fdd9ba4162722398c8239c0091f2cd46cc3f401c1a62ed1910bf37fc0d98f0bf0723ca9003caf507e3d8a6a83f7b51228f35 SHA512 be64b3dc22f1c0c310ed4a085fcaf9f7ed96c5d2a97f3359966201df54fc5acfc3e5d94cb0616a28a217e0cc6954f9a519198c238e40202263a7c03438771a7d
-EBUILD xlockmore-5.50.ebuild 2165 BLAKE2B 12008f0ca6933760f3a1dcdff60708dfd2e73ee22df4a469ba1b91ca372f315da8badebec3628d6ef75e0bc8319a2c5fd3265648ff9ed5b5012ab66a65312b9b SHA512 8130ac6f135a2642b18ba0f41d4660c4ac954e999dbf339e51d2a655ec74715071aa20e1fd2d69dd658f3b9325fea651f8ef4a7006ad8647ff380aabeb2b440c
+DIST xlockmore-5.62ALPHA0.tar.xz 1942228 BLAKE2B 3b40c3d7c29a4e285dca7b6ade8555f0946872c65920be691cff859558abd825709d5adf9b9abc95bede94a6905845910562552734817711a8e3d1dc99bb2f7e SHA512 095a5d9e382ea61f77d5888fe2e38b216991e47cbe9e9739a4ccd06a8e7992284bd2ec85d73ea3a1ed07e57e3fa29938732f813360db2d146efa9e21fecac7d0
+EBUILD xlockmore-5.50.ebuild 2166 BLAKE2B d16a6e03566a9d6317c30770a4db9ac4cac59a40969a39441407452f1384e536a25efd6aa6bea54d496714de03ac52c511b0b2ec4340977c151460e61d72a405 SHA512 25f71e1a893560db9f82c91214f375d9957fa658205f856686dc407ab59473a15355866255ad0a2ac3f50a5ed1047fe97d4770ffbcd712577d5eeccdb94cccd7
 EBUILD xlockmore-5.59.ebuild 2215 BLAKE2B 23d6084ca97979ba699487f1676a53cd3f5e68d9b7e41ac5d70ed45cb7eadc6009f52d83a9a7af12cfc1dc87c40ce6f0285b1d14b4e3a0282b321dc8fd22b7d1 SHA512 bfed1a62f23710eba0f57570a1a43533400eefef3b7d556a9063f0fb8803b227c39290101bd83ea371dc8c4be53898b1f79c0b43cea0227a661369a1015d3704
 EBUILD xlockmore-5.61.ebuild 2215 BLAKE2B 23d6084ca97979ba699487f1676a53cd3f5e68d9b7e41ac5d70ed45cb7eadc6009f52d83a9a7af12cfc1dc87c40ce6f0285b1d14b4e3a0282b321dc8fd22b7d1 SHA512 bfed1a62f23710eba0f57570a1a43533400eefef3b7d556a9063f0fb8803b227c39290101bd83ea371dc8c4be53898b1f79c0b43cea0227a661369a1015d3704
+EBUILD xlockmore-5.62_alpha0.ebuild 2215 BLAKE2B 23d6084ca97979ba699487f1676a53cd3f5e68d9b7e41ac5d70ed45cb7eadc6009f52d83a9a7af12cfc1dc87c40ce6f0285b1d14b4e3a0282b321dc8fd22b7d1 SHA512 bfed1a62f23710eba0f57570a1a43533400eefef3b7d556a9063f0fb8803b227c39290101bd83ea371dc8c4be53898b1f79c0b43cea0227a661369a1015d3704
 MISC metadata.xml 446 BLAKE2B d638ac6f12a203ae9ada10ae4c33e3a3d9901e350b6e6925c50078d66b29343cae42a67f84d5334182c1e816bddb05d062eb7b7e47c9125b273db118c4de573b SHA512 c8fafb010e63c39beeee5b53ad37354d19e98ac4cf33f29606b0af379811a0738c9c70d1fb7c31a5673d4a6365fb658a6a8bf49135b748bea9069a690ce543ed
diff --git a/x11-misc/xlockmore/xlockmore-5.50.ebuild b/x11-misc/xlockmore/xlockmore-5.50.ebuild
index 5aec6deace74..729d7622d2d6 100644
--- a/x11-misc/xlockmore/xlockmore-5.50.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.50.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.sillycycle.com/xlock/${P}.tar.xz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 sparc x86"
 IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock"
 
 REQUIRED_USE="
diff --git a/x11-misc/xlockmore/xlockmore-5.62_alpha0.ebuild b/x11-misc/xlockmore/xlockmore-5.62_alpha0.ebuild
new file mode 100644
index 000000000000..b993e74bcdd2
--- /dev/null
+++ b/x11-misc/xlockmore/xlockmore-5.62_alpha0.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic pam
+
+DESCRIPTION="Just another screensaver application for X"
+HOMEPAGE="https://www.sillycycle.com/xlockmore.html"
+SRC_URI="
+	https://www.sillycycle.com/xlock/${P/_alpha/ALPHA}.tar.xz
+"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock"
+
+REQUIRED_USE="
+	|| ( crypt pam )
+	pam? ( !xlockrc )
+	xlockrc? ( !pam )
+"
+RDEPEND="
+	gtk? ( x11-libs/gtk+:2 )
+	imagemagick? ( media-gfx/imagemagick:= )
+	motif? ( >=x11-libs/motif-2.3:0 )
+	nas? ( media-libs/nas )
+	opengl? (
+		virtual/opengl
+		virtual/glu
+		truetype? ( >=media-libs/ftgl-2.1.3_rc5 )
+	)
+	pam? ( sys-libs/pam )
+	truetype? ( media-libs/freetype:2 )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.46-freetype261.patch
+	"${FILESDIR}"/${PN}-5.47-CXX.patch
+	"${FILESDIR}"/${PN}-5.47-strip.patch
+)
+S=${WORKDIR}/${P/_alpha/ALPHA}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=()
+
+	if use opengl && use truetype; then
+			myconf=( --with-ftgl )
+			append-cppflags -DFTGL213
+		else
+			myconf=( --without-ftgl )
+	fi
+
+	myconf+=(
+		$(use_enable pam)
+		$(use_enable xlockrc)
+		$(use_enable vtlock)
+		$(use_with crypt)
+		$(use_with debug editres)
+		$(use_with gtk gtk2)
+		$(use_with imagemagick magick)
+		$(use_with motif)
+		$(use_with nas)
+		$(use_with opengl mesa)
+		$(use_with opengl)
+		$(use_with truetype freetype)
+		$(use_with truetype ttf)
+		$(use_with xinerama)
+		--disable-mb
+		--enable-appdefaultdir=/usr/share/X11/app-defaults
+		--enable-syslog
+		--enable-vtlock
+		--without-esound
+		--without-gtk
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	local DOCS=( README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO} )
+	default
+
+	pamd_mimic_system xlock auth
+
+	if use pam; then
+		fperms 755 /usr/bin/xlock
+	else
+		fperms 4755 /usr/bin/xlock
+	fi
+
+	docinto html
+	dodoc docs/xlock.html
+}
diff --git a/x11-misc/xmountains/Manifest b/x11-misc/xmountains/Manifest
index cfdae3010630..9854483c3df9 100644
--- a/x11-misc/xmountains/Manifest
+++ b/x11-misc/xmountains/Manifest
@@ -1,3 +1,7 @@
+AUX xmountains-2.9-fno-common.patch 532 BLAKE2B 01985319fdc0781ece1714ab3ee3a2caac6826cc49d733e1c85cbe6435a8cce797a2f1893051f2b391364bf420c604471138a9d337e3c0af621149f4b2b67a00 SHA512 b7e8d74ae1f90bfc032a132b4cf7d04a25995cc2154b561e5bfec3ee5bfe6598792e0ae169eb1b14a4e69fff4f3e2049f442d7812ff98eeb38d8953b5b487468
+AUX xmountains-2.9-global.patch 984 BLAKE2B ba8154a70f9e6bd96a0e70750ab36deb3d4663df6e5681d287273db195ee2049dc2f448769013f7c517e89fdf11bcef3802c62b7662bb814ee6e4a86dad53baa SHA512 8e0ff0972d143bdbe1f761d9b6c45ecbcb383ce256b8788f86ef4ea73557090edecc19516644f22ca4e8632fd9c9cb47e8f9dfd459c6f8a4eb839bd3300fe450
+AUX xmountains-2.9-main.patch 183 BLAKE2B 1b7e21c1b29b2dd90723b6781a720822b09f9e962f917822c6009dd537464bf6d0b8a2814ff6d58eb0cfc007ee6ab0f4ce374ecf5e0b2264db7c72d910aef757 SHA512 f249c0c9003b82ddde41b19759e9f744157362bfaf444e6106142f92d56564f5f4efe4666508aa08ec7de9d2293448b7b067498eb7c2987683cf97f98e5025e6
+AUX xmountains-2.9-string.patch 206 BLAKE2B 107932b5dc3fae88a0d046eca8f37e2094ad48bc98a4afbaab335237dac500797ce6bda5244ee29e52f2f16cbf1d344a2cff2c183efefd643a275aed8a65e59a SHA512 e40870b0ff1cbefbcfdf38e90515b0d02b1283fc5517d0c016f85b3e3d42c26148d1e323665b731949266eeebf8f8625586537ff489d7920dc0e4ec369245e91
 DIST xmountains_2.9.tar.gz 27951 BLAKE2B f540196fab487dd7e73c3b39dd5233807fdc0f9c9409e6f68c56cabb26e0cc9287865ab497b08dbdc56661a3bcc0f6df03eed87b80f8ded56b2b9e4bd5cc9287 SHA512 635fe9ae6a53996bcc5c537499d3c74d8fef9a6d2a422fa7469637a6a20fb52de9fb20e265becc0d2dae3a1d1793a7fa7f33c9d4de62837639142b37b431b898
-EBUILD xmountains-2.9-r1.ebuild 920 BLAKE2B af4730cbe9db68d560a6470c9651e37e0b12c7ee956fc4f4c8b40f5187168f35a3e1bb2af09702ac16dbefdd30326bed9a4c2cd5f0be38dbf7ef8b652b6cd48e SHA512 411764768b7d1547df42288a4a0200d19180aae0fb5faf4a9ee0167bf68f5da6323c961922f04ad893b24c5d1f2fe43c086a9a5c51f9c1ebc6bde825e6a6f44e
+EBUILD xmountains-2.9-r1.ebuild 844 BLAKE2B 8b0da5c5483c09d573222fe6738e9f06a59a529d6a177cf24b881cb9c959b13339ca56077a3f5438a4892ade284d80a777fec7f78f2cba3737342aae4938b97a SHA512 89c351970a453b5ec8811de87f12bcb4baa3ef79ef057b9a4661b861041214ca8925b8d2dc7b3cfd4ef2388a660fb8648bfe5607d0ab47c12f7749593467142b
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xmountains/files/xmountains-2.9-fno-common.patch b/x11-misc/xmountains/files/xmountains-2.9-fno-common.patch
new file mode 100644
index 000000000000..e7140ca4fada
--- /dev/null
+++ b/x11-misc/xmountains/files/xmountains-2.9-fno-common.patch
@@ -0,0 +1,20 @@
+--- a/X_graphics.c
++++ b/X_graphics.c
+@@ -10,7 +10,6 @@
+ #include "paint.h"
+ char X_graphics_Id[]="$Id: X_graphics.c,v 1.26 2009/08/28 09:09:17 spb Exp $";
+ 
+-char *display=NULL;       /* name of display to open, NULL for default */
+ char *geom=NULL;          /* geometry of window, NULL for default */
+ 
+ Atom wm_protocols;
+@@ -264,7 +263,8 @@
+   graph_height = gptr->graph_height;
+ /*{{{open display*/
+ 
+-  dpy = XOpenDisplay(display);
++/* display to open, NULL for default */
++  dpy = XOpenDisplay(NULL);
+   
+   if( ! dpy )
+   {
diff --git a/x11-misc/xmountains/files/xmountains-2.9-global.patch b/x11-misc/xmountains/files/xmountains-2.9-global.patch
new file mode 100644
index 000000000000..65ef65fa2040
--- /dev/null
+++ b/x11-misc/xmountains/files/xmountains-2.9-global.patch
@@ -0,0 +1,26 @@
+--- a/Makefile.alt
++++ b/Makefile.alt
+@@ -8,17 +8,17 @@
+ 
+ LOCAL_LIBRARIES = -lX11 
+   SYS_LIBRARIES = -lm
+-           SRCS = calcalt.c random.c  artist.c global.c xmountains.c X_graphics.c print_alg.c
+-           OBJS = calcalt.o random.o  artist.o global.o xmountains.o X_graphics.o print_alg.o
+-           HDRS = crinkle.h global.h paint.h patchlevel.h copyright.h
++           SRCS = calcalt.c random.c  artist.c  xmountains.c X_graphics.c print_alg.c
++           OBJS = calcalt.o random.o  artist.o  xmountains.o X_graphics.o print_alg.o
++           HDRS = crinkle.h  paint.h patchlevel.h copyright.h
+ 
+ xmountains: $(OBJS)
+ 	$(CC) $(LDFLAGS) -o xmountains $(OBJS) -lX11 -lm
+ 
+ 
+ calcalt.o: crinkle.h
+-artist.o: global.h paint.h crinkle.h
+-global.o: crinkle.h paint.h
+-xmountains.o: paint.h global.h patchlevel.h copyright.h crinkle.h
++artist.o:  paint.h crinkle.h
++: crinkle.h paint.h
++xmountains.o: paint.h  patchlevel.h copyright.h crinkle.h
+ X_graphics.o: paint.h crinkle.h
+ 
diff --git a/x11-misc/xmountains/files/xmountains-2.9-main.patch b/x11-misc/xmountains/files/xmountains-2.9-main.patch
new file mode 100644
index 000000000000..26297783c7ee
--- /dev/null
+++ b/x11-misc/xmountains/files/xmountains-2.9-main.patch
@@ -0,0 +1,11 @@
+--- a/xmountains.c
++++ b/xmountains.c
+@@ -144,7 +144,7 @@
+ void seed_uni(int ijkl);
+ void plot_column(Graph *g);
+ 
+-main (argc,argv)
++int main (argc,argv)
+ int argc;
+ char **argv;
+ {
diff --git a/x11-misc/xmountains/files/xmountains-2.9-string.patch b/x11-misc/xmountains/files/xmountains-2.9-string.patch
new file mode 100644
index 000000000000..97540b2792e7
--- /dev/null
+++ b/x11-misc/xmountains/files/xmountains-2.9-string.patch
@@ -0,0 +1,11 @@
+--- a/xmountains.c
++++ b/xmountains.c
+@@ -1,7 +1,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <strings.h>
++#include <string.h>
+ #include <signal.h>
+ #include <sys/types.h>
+ #include <unistd.h>
diff --git a/x11-misc/xmountains/xmountains-2.9-r1.ebuild b/x11-misc/xmountains/xmountains-2.9-r1.ebuild
index 712987fe73bd..3ba1649dc3fd 100644
--- a/x11-misc/xmountains/xmountains-2.9-r1.ebuild
+++ b/x11-misc/xmountains/xmountains-2.9-r1.ebuild
@@ -1,43 +1,39 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
+EAPI=7
 inherit toolchain-funcs
 
-MY_P=${P/-/_}
-
 DESCRIPTION="Fractal terrains of snow-capped mountains near water"
 HOMEPAGE="https://spbooth.github.io/xmountains/"
-SRC_URI="http://www.epcc.ed.ac.uk/~spb/${PN}/${MY_P}.tar.gz"
+SRC_URI="http://www.epcc.ed.ac.uk/~spb/${PN}/${P/-/_}.tar.gz"
 
 LICENSE="HPND"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
 
 RDEPEND="
 	x11-libs/libX11
-	x11-misc/xbitmaps"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
+	x11-misc/xbitmaps
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.9-fno-common.patch
+	"${FILESDIR}"/${PN}-2.9-global.patch
+	"${FILESDIR}"/${PN}-2.9-main.patch
+	"${FILESDIR}"/${PN}-2.9-string.patch
+)
 S=${WORKDIR}
 
-src_prepare() {
-	default
-	# add missing include for strcmp
-	sed -i xmountains.c -e '1a#include <string.h> /* strcmp() */' || die
-	# remove obsolete references to global.*
-	sed -i Makefile.alt README -e 's|global\..||g' || die
-}
-
 src_compile() {
 	emake \
 		-f Makefile.alt \
 		CC="$(tc-getCC)" \
 		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
+		LDFLAGS="${CFLAGS} ${LDFLAGS}" \
 		${PN}
 }
 
diff --git a/x11-misc/xnee/Manifest b/x11-misc/xnee/Manifest
index 18cfe706c8ea..334a44f73444 100644
--- a/x11-misc/xnee/Manifest
+++ b/x11-misc/xnee/Manifest
@@ -1,4 +1,4 @@
 AUX xnee-3.18-linker.patch 273 BLAKE2B 11c8552d2543879edf599dc0d9b820d5283abeba0edbc850079f268a92e95a26c28f90b119dff4f461d181b18dbad7493751b6964d20a9e1dcff6ba7d6ae8601 SHA512 2223bcd952b828d0704b3e3a0f3d55742a9837753187e4a8df84b6fa40a272174506de9341894b56024d9ac81ab1fff326012c13a3dedd0921dc7802e36761f0
 DIST xnee-3.19.tar.gz 1893109 BLAKE2B 17f416d06dac092c79d4c9838e0f69219e617d695d7c56bee8c84cdf6a5de7e3f02eb1dc9f9f278e78ebf4090893557ede30b2cd5039acafcd743cff11e5602b SHA512 a4a82839a4597b0d7f5b65ad76092f03eb5c665d36298505a320475daacbf66f30b022c04284ce8795360e4481fdfb1d9138f0b8b173b66d23b7f1542d0acbe8
-EBUILD xnee-3.19-r1.ebuild 1448 BLAKE2B 5818a26e18da1a3e8788d1574013077d505fcb38cef0f93ea190f5f29abfe9d49fed0734fa8e8d545eb80fcd59608b32ee8ce12b0556ca6490800ae8e35afc3d SHA512 5a0c1f17656e8edd3f907e7f70709430dc0e6f69bb0e1148dcc646f78a9dd4989a5a0548f7e3eb05b4136361a757a4686e4edbbb9c0bd1f8f78c19e74ff75184
+EBUILD xnee-3.19-r1.ebuild 1489 BLAKE2B c10e91bde193dd4dc73034ae58f25153e1e8ce5de9a5e83e8650bb5fe74a8f38b928d378807bc8f228fe5e50836e318eff5a371cdc4f3c1a2b368411770ebcfa SHA512 98abc0d6dba1739e42aa063a1527e6c9f550b8bbbbfa8a38d7b05cdc0f4b949cda36fc85ca031e25ff2bf5def00b0647e63dbb9f1155228e42ee7a58e60658c5
 MISC metadata.xml 318 BLAKE2B e2fde4c35c72439790ea9e4c0e403f1a0666a7ebc8e9f350b29138d01c171765fac8cd6adee54667bbc19921e6fc976a427c3429464769a02d9e8dc8c83a8925 SHA512 7d56445a5c7fffdc1104633cdd30eafa17588079b8a1f4cb226984b1aad4e41fe84320608681143dc01c5f1ac5f104cf0717e8183164031644220f9c61086a3b
diff --git a/x11-misc/xnee/xnee-3.19-r1.ebuild b/x11-misc/xnee/xnee-3.19-r1.ebuild
index 9e2f128b15f3..0d71add730d5 100644
--- a/x11-misc/xnee/xnee-3.19-r1.ebuild
+++ b/x11-misc/xnee/xnee-3.19-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools eutils
+EAPI=7
+inherit autotools desktop flag-o-matic
 
 DESCRIPTION="Program suite to record, replay and distribute user actions"
-HOMEPAGE="http://www.sandklef.com/xnee/"
+HOMEPAGE="https://xnee.wordpress.com/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
@@ -27,7 +27,8 @@ RDEPEND="
 		>=gnome-base/gconf-2
 	)
 "
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	x11-base/xorg-proto
 	virtual/pkgconfig
 	sys-devel/gettext
@@ -37,13 +38,17 @@ DEPEND="${RDEPEND}
 # This needs RECORD extension from X.org server which isn't necessarily
 # enabled. Xlib: extension "RECORD" missing on display ":0.0".
 RESTRICT="test"
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.18-linker.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.18-linker.patch
+	default
 	eautoreconf
 }
 
 src_configure() {
+	append-cflags -fcommon
 	econf \
 		$(use_enable gnome gui) \
 		$(use_enable static-libs static) \
@@ -64,5 +69,5 @@ src_install() {
 	default
 	dodoc AUTHORS BUGS ChangeLog FAQ NEWS README TODO
 	use gnome && make_desktop_entry gnee Gnee ${PN} "Utility;GTK"
-	use static-libs || rm -f "${ED}"usr/lib*/lib*.la
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/x11-misc/xorg-cf-files/Manifest b/x11-misc/xorg-cf-files/Manifest
index eb2dc5da1478..d73f75bc0b22 100644
--- a/x11-misc/xorg-cf-files/Manifest
+++ b/x11-misc/xorg-cf-files/Manifest
@@ -1,4 +1,4 @@
 DIST xorg-cf-files-1.0.6-solaris-prefix.patch.bz2 4364 BLAKE2B 219911bf7fb6907762b70062c43842f116bb0c8ff033569d3a033918b004d89514eda43d1f478c7f0dc1b18adb17f5792990cc8d15cb9770b57e555c0b362f10 SHA512 159d55da274decdac934cded63f33164f5866dc81e853b1a205abdbe56fba4099ab4278e2fb5ff855c0b76784ba2b3fa89e6db2b4fdc9647111698e2c77da4a3
 DIST xorg-cf-files-1.0.6.tar.bz2 337859 BLAKE2B aab1495a699e6236095585c94151b3bc2edbff9e2b1f414fc916e09eca8d5dd4a5492ee9c69f8b21bf7d6c6ef1ab0639ba0d96be02b6736968b13b9d4d6f4a26 SHA512 1749a5fbcda2c15c300028abce79a3304cfb10f215bf98cf30558144eb64f9fa06a69203159f44405224ed567ac5bc0ff1222e3656367f69acc99f44871424fa
-EBUILD xorg-cf-files-1.0.6-r1.ebuild 2097 BLAKE2B 8cbad7ba6a2b5ffba4106e3b73ec2e9a2e14db51577e67e67f98afe5c25826254e0ce2b3796760b90d04682af15726ca32a8e9a3f8b39768d845970c6715b957 SHA512 a50ac56f487f2d5a6ac522957f97a62e63703719f817c5fcfbdf7f0cbaf46e1825764307b960327683b4045db41387992e4822694bf817595f98b7f8eb46fbe8
+EBUILD xorg-cf-files-1.0.6-r1.ebuild 2094 BLAKE2B 8d513dca5c2408fe9f50bad494af3ce7c0b7effe93adf61071c5b54cc0f3a23a21c389d5b0329676d2d446d5f913d2b9ce2f39370adc6dccda8af05af859bf1e SHA512 5cadecc76351c68b2709ee15f7bd2e663b53efa94d02bcdf4488598f4c64e51337b5954256787c646347ffef90b68be6ee594ea8ab442c4855f38e51c329e956
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
index f9404180f913..f8abfd300744 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 BDEPEND="
@@ -34,13 +34,13 @@ src_configure() {
 
 src_install() {
 	default
-	echo "#define ManDirectoryRoot ${EPREFIX%/}/usr/share/man" >> \
+	echo "#define ManDirectoryRoot ${EPREFIX}/usr/share/man" >> \
 		"${ED}"/usr/$(get_libdir)/X11/config/host.def || die
 	sed -i -e "s/LibDirName *lib$/LibDirName $(get_libdir)/" \
 		"${ED}"/usr/$(get_libdir)/X11/config/Imake.tmpl || die "failed libdir sed"
 	sed -i -e "s|LibDir Concat(ProjectRoot,/lib/X11)|LibDir Concat(ProjectRoot,/$(get_libdir)/X11)|" \
 		"${ED}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed libdir sed"
-	sed -i -e "s|\(EtcX11Directory \)\(/etc/X11$\)|\1${EPREFIX%/}\2|" \
+	sed -i -e "s|\(EtcX11Directory \)\(/etc/X11$\)|\1${EPREFIX}\2|" \
 		"${ED}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed etcx11dir sed"
 	sed -i -e "/#  define Solaris64bitSubdir/d" \
 		"${ED}"/usr/$(get_libdir)/X11/config/sun.cf || die
diff --git a/x11-misc/xrestop/Manifest b/x11-misc/xrestop/Manifest
index 61f370778ace..246cf3f0f807 100644
--- a/x11-misc/xrestop/Manifest
+++ b/x11-misc/xrestop/Manifest
@@ -1,4 +1,4 @@
 AUX xrestop-0.4-tinfo.patch 291 BLAKE2B b96d892c87a8133987baa94e5cb4917bc5d743c24ec11a2ec67afafc7206654b88c17f54377f2d1bf0c9fb92df8de16c99e4d0f9a15ff80a9417da2de31bc6fa SHA512 21993ada033d4ec744b55faa71afd736a99423f12071a64e1445958de979631ce42a908e14ef194e819de98766c92a2c2470b2c88d172879ec5fc4c20212566f
 DIST xrestop-0.4.tar.gz 92308 BLAKE2B 5bfe6e9ccd49038e7884be8379e79f3de2bc960588dc21fbbe40d2acb89c6505efd78a9415e0ba8feb24986f11f066ce641b9c933f241776bbc1b3e59fd520f0 SHA512 eb7bf2f3ab7b73708c96d56fd466cb362d711242dd46992fa3e693af2d26995e9baa91075eb445ef227e1342deec5e0e22b37139e80399e4051c9f5cad8fd9b6
-EBUILD xrestop-0.4.ebuild 657 BLAKE2B e8b1ccac9d1a06c1555d819b5b89700a0649a4b10d7162ac54329ea0c520b9a18e205262c60c659c563dd5601fa30c886e806abbec13851adcbd4d5f22847df4 SHA512 d9ec647bf3f1f5f292ccaa42e7859b8e3ade11bd7e77e6493ecdab56458d5f6c29e0c1109e88cc91bb6c4b7fc64acea90a4cf4efac7c990ef6f83f464e340924
+EBUILD xrestop-0.4.ebuild 658 BLAKE2B 54edb0036c42399097b5fc5c868b12b8fd91a6a59806f3e22726e59f521b3187e76670ddcbf66662641c4bde13ddf7b77cdd032396572ae9d7c4061eb16e2bc4 SHA512 35be9ab7412f90aa879b56ca3540c9bcb08277ed50efc3547fb513a9c90f80f7f0425938a93d77ff1306e088c910a15fc9f784a178b6f4d9532d1f6280002e0d
 MISC metadata.xml 318 BLAKE2B e2fde4c35c72439790ea9e4c0e403f1a0666a7ebc8e9f350b29138d01c171765fac8cd6adee54667bbc19921e6fc976a427c3429464769a02d9e8dc8c83a8925 SHA512 7d56445a5c7fffdc1104633cdd30eafa17588079b8a1f4cb226984b1aad4e41fe84320608681143dc01c5f1ac5f104cf0717e8183164031644220f9c61086a3b
diff --git a/x11-misc/xrestop/xrestop-0.4.ebuild b/x11-misc/xrestop/xrestop-0.4.ebuild
index 3e4efec61250..ab87ca70fa4b 100644
--- a/x11-misc/xrestop/xrestop-0.4.ebuild
+++ b/x11-misc/xrestop/xrestop-0.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://projects.o-hand.com/sources/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ppc ~ppc64 sparc x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 3ea700680b84..6c87c5553e5f 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -12,8 +12,8 @@ AUX xscreensaver-5.43-offensive.patch 1799 BLAKE2B f85d26a07ba2712855567a0779eaf
 DIST xscreensaver-5.38.tar.gz 10712548 BLAKE2B 02630aa7daa3faf8aa7ff453218bed5e3db287b7c4d9b564a6d8822db8b2e1ae6be7843342d585f2d2900d2bd0e7fd2a12d49748d81bf10818fa5bc4254f6ef8 SHA512 9014571505afd3a116f541334ea37737659f63f4cbb267a56be451e2c353d9e57218119670a44297d36d140672ea423d0682433401b17749138ab6baf6507561
 DIST xscreensaver-5.42.tar.gz 26903469 BLAKE2B a82716a3f1f19f85eb1bc7a8ba1981221ac2ad47c1411687f1043da7e50edada73ab9c7465d655546f8a9015db69ab4f35ef8ff2a0b3d79f5a59d3e02aa2f819 SHA512 84cde9364c933de720acd51a0bf75eb4d0642d60f62b92de89d932233eb5abb51e1edb53cd413b2dc4801a02cb68652a28d7d1f83cdaa8d8cdd1fee7d651eefd
 DIST xscreensaver-5.43-r1.tar.gz 26973508 BLAKE2B 67b57214e8a41ba895df6e9efcac3e712f24be06ee7914b38d3a8e639d4945c927c4ac28469d2180bc4a3999a4b89d2a60e633799ac5204c42fa17ad76dd21fc SHA512 7ccaf30fb05ae2110f742f1a5c99f83cd4c8e6749124066b5a418cf3e0ba1b8ff09858eeec29c11b0c8ea428b95b2916481c50cee6a5d952ec941b3ad1b6adcd
-EBUILD xscreensaver-5.38.ebuild 3407 BLAKE2B 1700af11e8e9fd1452e3690951863162d0a73cabe05f05627a25b4720ae1807e953f26d980a289ee194382c809d5326bdce1d8ab324555f4d4862c1c62819d70 SHA512 1df48bdc0afceaae93e9ad12ce8ca5186afcc793cb6c19a1f3337a4d48ce881d0e3d89b98adc495148f66773e9568a52be2608280648d7b4920791437a63542d
+EBUILD xscreensaver-5.38.ebuild 3408 BLAKE2B 85e26671a2162ef909b6f7567cf70cde5dac8bdd5fab8e3757fd8493d8ebf44b382b4983f35e61548ced9d6f315b16e20e5878df63cd9d5e1ac8116d7b41e855 SHA512 32b8695b9402fff813b002f59083b638ac3a181c16b8051a8b959d628f530424d098276401c892ff474898ae0ede9e5c72f057403c7a221d285152a6569da7a3
 EBUILD xscreensaver-5.42.ebuild 3401 BLAKE2B 6008a494b624d49bd69f7fbb6b2d155d75d7f4ff0bd848e70193fd906884b2a1342aad80a0d93719892e73d4fa776e7e92bfa0aed1f6588dd3ee1764612d4129 SHA512 b20cb44c72af6f55796a269bf233f8c557ccaed2e6a3242fad8fa5ca0d175e1ab26586672fd7a2a0870247b15443084412ad69b592d0360514c094c84bf59673
 EBUILD xscreensaver-5.43-r1.ebuild 3442 BLAKE2B 7cb5c74a413cff4c95b649be15cf08d930dbc10e393557eb5987fad058f7ed49cbf71b20f15a8eaf4d1d3620ba8501d175b777ffdd246393d8e34d049fee9e0d SHA512 cdaf898566a3b00015aeb1f73c909ad817be9ff9087468bab74223351def40bbe1ee477335dc455c157d82f33f9b735d0f57eefb09cdc57d97476a2f1852495d
-EBUILD xscreensaver-5.43-r2.ebuild 3447 BLAKE2B e5639b3a828298a202d8157b06eb39ba9623d043982b2980f8eabe2a8bce0695ca8b94cc1627d3351f927c4144e3ae572fa9413d755cbedfea2ce8145a86b695 SHA512 c74a05ac217c7dbcab97210ac7111f56aa8efbba2c24f2717da7b5e482d3aa664bc35f104ee8469f466d514f0d79d3be520babba5f4ea588f84dc20874b7c443
+EBUILD xscreensaver-5.43-r2.ebuild 3444 BLAKE2B c86e25198d52538c0234da6d3157c687f899f41b70c78dc7b728e1f7f7d660e271054d0b31d313dfc33ba2da3fbdb95125501719f874fe471a068d4d4f246847 SHA512 1812eb23c921e09663bf4471d2591d9ddd30ad9209b9ecba146d180f3ef1d8bcdecf603c4eb8225e4904188b3d119ace66d963101817ea08d9edbaf319e044b1
 MISC metadata.xml 660 BLAKE2B f720a7df804148568927cc909ec46013c8de0087f2ab5751bd3852cf310161c328d43f29db22105e46b4c142db3e84fa5a2c943bae63779156bfe569726bf12b SHA512 ecc2b0423bd77d7713db654875f5d112c90c278653248298c877a84104db40430fcdaffaac2cbb972bb6ae6ce970b498d4d086278ba85c519dedeb3586bcd41b
diff --git a/x11-misc/xscreensaver/xscreensaver-5.38.ebuild b/x11-misc/xscreensaver/xscreensaver-5.38.ebuild
index 30dd12d15e73..eca91dfbc852 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.38.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.38.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
 
 COMMON_DEPEND="
diff --git a/x11-misc/xscreensaver/xscreensaver-5.43-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-5.43-r2.ebuild
index 31c271493a21..f9b66cd52c59 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.43-r2.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.43-r2.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
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="caps gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
 
 COMMON_DEPEND="
diff --git a/x11-misc/xsensors/Manifest b/x11-misc/xsensors/Manifest
index 5e535bc30a28..9cdbf4fd2fcc 100644
--- a/x11-misc/xsensors/Manifest
+++ b/x11-misc/xsensors/Manifest
@@ -1,4 +1,4 @@
 AUX xsensors-0.70-gtk220.patch 1566 BLAKE2B a36a31d4a7810d77d5ee3d451936a111204570863c253d7a6afdd7d058b87ea58efa494a048f32b29cb152b30025a1f23d5bad18d0a14ee481ee909f373b692a SHA512 24196915ebde6264a5ec364539ede4827459a87e675dff3e187a556d4adb24ee0efb41db49fe2ae0c94e5ab467eb3caff205df28d30c15c8bca9f78641324199
 DIST xsensors-0.70.tar.gz 115430 BLAKE2B af18fa723a9e6b84df62d0ea0397d7b30ab800816b84449f91357aa75d99944796ae8164171bd217118dd93ef713d286fe435354614baef7947f3f851b368df9 SHA512 34f038b192f3cecb2e7587e19c4837b795a2705e6d0e9ea2bd3ead6d3259a1dded364fcfc70fa5e37d64f32c879e1dd9c6e43dcf32fa9aeb73ee5cc49bf290a4
-EBUILD xsensors-0.70-r1.ebuild 708 BLAKE2B d4f5951126d6dd67f0f93d5ef6bfaf1ddb508a1fc38769ffb4c1d99cd8bb72a1892834dada4a72adbf7ff278caa5f343a4313577ed0645f1c00aac36b73257bf SHA512 846d49b4ba76bb7a46f40068f1ea522d6590bdcc18b64796d9d54523a8d2694d55112030e3254a3d70b78286c69d8b2fcd713c7c5480967d836907261659a5f0
+EBUILD xsensors-0.70-r1.ebuild 696 BLAKE2B f8301d03329e2339b23679b11bd6a0752e1b30bb67da54b54caba8089893d07f3ff09081a455fbc9aca70734e62a0e76c0776cfb7dfde4079027ae2f41f3e3e0 SHA512 eeead03d0ca6b8216097301b7af41b655a2d081fc8e32c91d25c0d3fdaa6ef20db5e293b1ddc618f5ee4c474ae3f26087da6f420e431dadf7a5793fa44ef00f5
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xsensors/xsensors-0.70-r1.ebuild b/x11-misc/xsensors/xsensors-0.70-r1.ebuild
index bcca5da249e8..38fde9b5deb9 100644
--- a/x11-misc/xsensors/xsensors-0.70-r1.ebuild
+++ b/x11-misc/xsensors/xsensors-0.70-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,13 +6,12 @@ EAPI=6
 inherit autotools
 
 DESCRIPTION="A hardware health information viewer, interface to lm-sensors"
-HOMEPAGE="http://www.linuxhardware.org/xsensors/"
-SRC_URI="http://www.linuxhardware.org/xsensors/${P}.tar.gz"
+HOMEPAGE="https://www.linuxhardware.org/xsensors/"
+SRC_URI="https://www.linuxhardware.org/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
 
 RDEPEND="x11-libs/gtk+:2
 	>=sys-apps/lm-sensors-3"
diff --git a/x11-misc/xsetleds/Manifest b/x11-misc/xsetleds/Manifest
index dba0b11a591c..64a21f487dff 100644
--- a/x11-misc/xsetleds/Manifest
+++ b/x11-misc/xsetleds/Manifest
@@ -1,6 +1,6 @@
 AUX xsetleds-0.1.3-assignment.patch 208 BLAKE2B a1f5d7814e17fac4ca1a3f0e02e17be063d7dd61316bfa7c5899a3d1812d3bae3aaed25b5bd6512c22fd0d36e0ea0f19cca837a7e0ef655fef09ba164d05f57b SHA512 8434fecb410cdfa35de8e1b93b4c3021df0629fa8d44a05b484e0d9ced597811fdbfd740acc70f9900af7e38b6f866eb3c9fc0173664dfa260d5a3ccef5aa2bd
 AUX xsetleds-0.1.3-isalpha.patch 236 BLAKE2B 0a4599f5f4f0a56521967c30ceee7d79e65d7321b2f99065e42b77e94baf9cfd53611d192326a3e574c57f7de1df3a459ddd0905bb37c8013de21c65068d6ad6 SHA512 5191fc8ed447d921dfd0a47514de03e03dc744f17b22a1ac3973b1c91104c015c7881cc156c4e2e073f3ba18e17187b34b5db80359489ffc372a07c1e6bcbb10
 DIST xsetleds-0.1.3.tar.gz 221399 BLAKE2B 11311f972abc0f0c83ec47dbfe2743d4220daa4fe445c4c0f4a5d7c827d690549611bd373577882d1ac75b853e468ce36d3a6a447873a523a530676528bbd011 SHA512 7fe6baa77b4b2c8f57dfc331776bb457520facdb2f54a5c101764c590d7c5556cd00477e56d36e64cb7264a8de28698422b99ec4852798069189fbe6c1c19f72
-EBUILD xsetleds-0.1.3-r1.ebuild 688 BLAKE2B 0d81343f13eb7cc5151418894eec1b91f6b2cee998682b8f85412551a7d7a18434daf18851da9aa44058ecb9a32ccc979a6dfbdc4a7a15c41801eaa27deb6a4f SHA512 145f655da2102532b30482390bda38756d3551b265bb520de9ac84f18de8409ed6715098e72f6e8ef2287d97dbe342319dc10c3c957d0955371d98de02720e84
+EBUILD xsetleds-0.1.3-r1.ebuild 689 BLAKE2B 3f587dc2619c0aed5d214965def67a62fbd948944b1ea928b962fc2f3828eabd579fa12365577a6a38c9047e5faf603ed811763a604f97bba1fa0bcfa761e87d SHA512 28202dfa67608630574bd33812cd63f96f7d2fb705ace3b8f4cbd3779115b566129c5b10a5acc685479a85d9090141fbf85587c9eda365da176d2aa40a6a460c
 EBUILD xsetleds-0.1.3-r2.ebuild 730 BLAKE2B ee81de0d3ce760f04eefd6fa5ba60f585b4f31fd07ade86df7b4b2f19b9a3fbf5803690f91d7b8e3c2b988960abf8281f9db96ca287d16896c08f30e3a803c01 SHA512 cea531f0016ac1b2e760bf5f5f4a34dca858a08af9940794eea18bc49efa8c58cc30bd180e68c61d3760836be1da5eb5e7f6460e3076371de2b85cef0103bd4e
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xsetleds/xsetleds-0.1.3-r1.ebuild b/x11-misc/xsetleds/xsetleds-0.1.3-r1.ebuild
index d0105b2c7f9f..ca2a8fced8a6 100644
--- a/x11-misc/xsetleds/xsetleds-0.1.3-r1.ebuild
+++ b/x11-misc/xsetleds/xsetleds-0.1.3-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.unix-ag.org/user/bmeurer/xsetleds/src/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc sparc x86"
+KEYWORDS="~alpha amd64 hppa ia64 ~mips ppc sparc x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-misc/xsnap/Manifest b/x11-misc/xsnap/Manifest
index 1eb8a31b7599..2676c9718283 100644
--- a/x11-misc/xsnap/Manifest
+++ b/x11-misc/xsnap/Manifest
@@ -1,4 +1,5 @@
 AUX xsnap-1.5.15-root_name.patch 228 BLAKE2B 5a05da8ed5f708811a1792162bbc2dc1ea01a3666391c861296fb05706d3d1a4998764d3cd98c2847cd36573f0841966d0c16bb6fb22531055ec01fcc3d49354 SHA512 965a26474cdbe809a26559ac431aa9acdbc20ff5469e58f8b95b9da0eb58e278040f233bdc42fd54aea6f556fa2a801f6f0ca610a2ed4caa100172cb9ead4ed1
 DIST xsnap-1.5.15.tar.bz2 46574 BLAKE2B 4d0f67adea6f456bd92031752a307293d736b9ce14aa35435359ed7bdb9d774827130e95f526f363bc7f0bb3c8e3e637c3e4abdf7f9c157f15f7559bae3eba99 SHA512 898914dd0bfec93b641815cc07522d4ea6168266a7f5efe75715cf68555e8959a72b40b0a02e75244348afc6aa77d267fbe7ee60670da5f33e6db2f6c4476dac
 EBUILD xsnap-1.5.15-r1.ebuild 1331 BLAKE2B c56655e4177ab76e08cd59d11b7e20625a9f980e5282d1d2934e7566e488afeb6a8050a270415d955e55cab4f8184cd276fe128ce912aaf1c91041807fe430c1 SHA512 b7030789a07943202a3e376b1b2b3fe4aca968b54c3c13dcee98334186b693dd18c229eaef49ee35fb4b8086050f25dbb73560be9b4074863d2344a67f20c48b
+EBUILD xsnap-1.5.15-r2.ebuild 1413 BLAKE2B 24d77de7831af6df8031e56abc05a8390466e01af4afda57ee59c2f034fb3afbd7681152ef6f9eb4fb425a6df202a886762dcc489cd4f905601e5246461a1857 SHA512 2a1d54b7a350377cbe5a278a257d4098ca5edb7c6bb5af2f7d889ecbc07101ee16075d44f2ed5ff6976867cb11b37d8da186c9709e16da56b85bce8a15d021ef
 MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
diff --git a/x11-misc/xsnap/xsnap-1.5.15-r2.ebuild b/x11-misc/xsnap/xsnap-1.5.15-r2.ebuild
new file mode 100644
index 000000000000..920e4a2ffcc9
--- /dev/null
+++ b/x11-misc/xsnap/xsnap-1.5.15-r2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="Program to interactively take a 'snapshot' of a region of the screen"
+HOMEPAGE="ftp://ftp.ac-grenoble.fr/ge/Xutils/"
+SRC_URI="ftp://ftp.ac-grenoble.fr/ge/Xutils/${P}.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
+IUSE=""
+
+COMMON_DEPEND="
+	media-libs/libpng:0
+	virtual/jpeg:0
+	x11-libs/libX11
+	x11-libs/libXft
+	x11-libs/libXpm
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	media-fonts/font-misc-misc
+"
+DEPEND="
+	${COMMON_DEPEND}
+	app-text/rman
+	dev-lang/perl
+	x11-base/xorg-proto
+	x11-misc/imake
+"
+DOCS=( AUTHORS Changelog README )
+PATCHES=( "${FILESDIR}"/${P}-root_name.patch )
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's|/usr/share/locale|$(LOCALEDIR)|g' \
+		-e 's|/usr/share/man/man1|$(MANDIR)|g' \
+		-e '/cd po.*install/s|cd.*|$(MAKE) -C po LOCALEDIR=$(LOCALEDIR) install|' \
+		-e '21s|.*|LOCALEDIR = /usr/share/locale|' \
+		Imakefile || die
+	sed -i \
+		-e '/^LOCALEDIR=/d' \
+		po/Makefile || die
+
+	xmkmf || die
+
+	sed -i \
+		-e '/ CC = /d' \
+		-e '/ LD = /d' \
+		-e '/ CDEBUGFLAGS = /d' \
+		-e '/ CCOPTIONS = /d' \
+		-e 's|CPP = cpp|CPP = $(CC)|g' \
+		Makefile || die
+}
+
+src_compile() {
+	tc-export CC
+	emake CCOPTIONS="${CFLAGS}" EXTRA_LDOPTIONS="${LDFLAGS}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.1.gz' -exec gunzip {} \; || die
+}
diff --git a/x11-misc/xstroke/Manifest b/x11-misc/xstroke/Manifest
index a066fe822cd3..baec8126558a 100644
--- a/x11-misc/xstroke/Manifest
+++ b/x11-misc/xstroke/Manifest
@@ -1,5 +1,5 @@
 AUX xstroke-0.6-sigsegv_sprintf.patch 438 BLAKE2B 2fd171ebaa99bdb4201e04c885f40f848b3d81a5c2f5b131621d6560109afc9994ebfe0dcb8b979eb6ee65fd74c70d4353cb9da30135253540b43d12ba182cd7 SHA512 6ac7fd2b4b64021926c9ec6999df6fd7142b7d42f31012a63ca31ffd6db9848c9687875af508b0f63e7c49dc1cd01057f2073c0bd99409998ec578c44d61f384
 AUX xstroke-0.6-underlinking.patch 443 BLAKE2B 2fe878bae0e5081eda6f2c9855c142ccb706860b17961a564d91fbfa534b971a370e2c76cd247f82a9437af40fe03439e3df8fa7f61a6ca77f37294d10579585 SHA512 ef219a2d56bf52df8187cbfee704d1e0dd91f7f742fc2b83c63dd469eb1f6f2297dc8cd09ab2444ad18f94aff5c95bfbff0055084202363426434f3185074c84
 DIST xstroke-0.6.tar.bz2 140237 BLAKE2B 0419c0375e8579d758730d129c2d2db0de8ecc2f0c73a026b08db8e18818dc2c4d1c4ffff6e9794c48bd645176decbce2e477e182cf78402fc859234438266a3 SHA512 0fb75f20dfcb8db68bb17d50a9dea2906e17ee1d8675bb7b4dea964189aa69c8bfcc101d7e7fac22209da3f83fc0d0afd569d443d3f585bffa2d62ce11ad772a
-EBUILD xstroke-0.6-r1.ebuild 713 BLAKE2B 29f043d85154824a1da9e8266a393198fe39ab05cc9d01f58fd2180540634904f955c11dcd368cd76d897226e50e89b52c4c1fd8f0cbe4af07534c4be7532706 SHA512 b06071caf3c8dc76f8e3df6262e208d5d1b12e997ab898dce1bde5022f3102b488f29a70e9b3cbbf35d9ffd169d4eda49ede78b57f001f07c50929597d1a72be
+EBUILD xstroke-0.6-r1.ebuild 714 BLAKE2B d6fed6c105224bddafd03248c55ab4b25c69901a25f3930a641819e1a68865a15c3923b5001471ecb26030b193529ebda8b4aa661574e7305367dbe53278c2da SHA512 ba66660b490dd8435547185bc65a17b9791621e6896934a9234355aca91bdf4e2357003c201d0ad0480461991153477c37b9b635f9e8b838115e09a9321d904c
 MISC metadata.xml 351 BLAKE2B 86fcbcc77c2532340f1cf6841caa8328012f5d475cb7acc6d3efd69f7c2d758a4fc8a5053622bc61f7d8183beb4be4897a1c96face70a232b1e50688a71d2c8a SHA512 ad9389409b86bb91a79c9706d3662f0794507ee881b689e310b77cc50fcf8079b32340ff0b4231a5584365e9417b4331bd326c99ad3e514e8b44549072991319
diff --git a/x11-misc/xstroke/xstroke-0.6-r1.ebuild b/x11-misc/xstroke/xstroke-0.6-r1.ebuild
index 63e05e04026d..b9d7c27ba6df 100644
--- a/x11-misc/xstroke/xstroke-0.6-r1.ebuild
+++ b/x11-misc/xstroke/xstroke-0.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 hppa ~mips ppc sparc x86"
+KEYWORDS="~alpha ~amd64 hppa ~mips ppc sparc x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-misc/xtermcontrol/Manifest b/x11-misc/xtermcontrol/Manifest
index 1a7061b6fec2..589b6ebcc6d7 100644
--- a/x11-misc/xtermcontrol/Manifest
+++ b/x11-misc/xtermcontrol/Manifest
@@ -1,3 +1,3 @@
 DIST xtermcontrol-3.7.tar.gz 151984 BLAKE2B 246b17e0b38540cfe022321129d76ae196c8d0b50b2a2fffbb523029321c5e8fde093fc5af16e5a550fc39eb2fcaf1fca4882de2948c45397c9bd4a9a11a06cb SHA512 b23da5dd07ea8fc59717752e937cffb36038870f3ad486d43b8d0477826916255ae8f00f894293efb2dead46ff9122c7e27200d5fc15b7bd91d9df1b649e2081
-EBUILD xtermcontrol-3.7.ebuild 370 BLAKE2B 0e55dbc82660db653840c812a47e3d3183551502e3fa4336239f56c54d0a06d728dcb0e1e1d99823f143c90d330333aed48218adedf1f8b73ddbdff4cdc10d1c SHA512 ffb6634b1cfd7036765afcf75c263128460f2001ac71df8898297b63c05fb059e50b612799bd1f6c68acfd0b3481458e61fbb728d78fb2a58057580ceae0ea92
+EBUILD xtermcontrol-3.7.ebuild 371 BLAKE2B 18869fb7610e8e8a72a188d452e4670d50dd0bd3c1fb8357b98170f97b44a12638ba61edebe4ae3ddaa17850d1711b9229a22e30193c65b5d12bb40f2b10076e SHA512 c9914c5e65b902ce888cda817205b409df886f7937906beb1f3669842c16a3a617167d0d41e8831ae6f7d37d9e87e2986d8ce5bf080f9f1317a424f12ccf567c
 MISC metadata.xml 689 BLAKE2B fce013dc9ec9488e94202966a807b7e28491fc553fc243008846f845462034a8645a68a2122832c2118a3911856c0e0fce13c563ead4da707375eaa16cc81fe4 SHA512 ee635786fb7c6876636390fac2aa50cf01946dcbead809021f7bb795ef713bf21ee04123f574d4d7d12402f93c9262f3bcae46fdd0580dd316321cb42421687e
diff --git a/x11-misc/xtermcontrol/xtermcontrol-3.7.ebuild b/x11-misc/xtermcontrol/xtermcontrol-3.7.ebuild
index ad070f650616..0b8f492875f1 100644
--- a/x11-misc/xtermcontrol/xtermcontrol-3.7.ebuild
+++ b/x11-misc/xtermcontrol/xtermcontrol-3.7.ebuild
@@ -9,5 +9,5 @@ SRC_URI="https://www.thrysoee.dk/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86"
+KEYWORDS="~alpha amd64 ia64 ppc sparc x86"
 IUSE=""
diff --git a/x11-misc/xtrlock/Manifest b/x11-misc/xtrlock/Manifest
index fe5e49103b22..78164f69ce21 100644
--- a/x11-misc/xtrlock/Manifest
+++ b/x11-misc/xtrlock/Manifest
@@ -1,3 +1,3 @@
-DIST xtrlock_2.8.tar.gz 21125 BLAKE2B cd5ec919866b074ad7207756a10a0fdd23bf963e9252ff7afa30a1f1d9af4b015e9010036e9920b15d382993870c6909f4689e231e1b29bfe3d48b6271f20354 SHA512 a1388250430f7cb7bfe875aae938c332098f9e88ab7a17d68634b36726acfa7a459bf40f71e6df3c6b1256fb4574a62b2fc72357c6e779c1bc55f10204634068
-EBUILD xtrlock-2.8.ebuild 715 BLAKE2B e0bdebd25639f8c5bd46b1f8f69227de52c6efc2b335a215fc249126f28a04b0adb83c8c0c5c05673919be43cef1d3387b54af35d9ba15157c4abd13a53d7721 SHA512 a2fccecd00eecf617e42b267ca6d7f1a0e6b7dca2f234d5a0804944d8b2dd515aabe866e1379c749da1a320c08099d63477fc70fdcf11d84196afb200f5b9591
+DIST xtrlock_2.12.tar.xz 20620 BLAKE2B d40599f5fec67b8e89f1028dafc929a9b21d6ae1f6e094658d07859e7f74e4686d338e1e03393f9981a62030839969b57493a8655e225b963df8dc04cf6b62f6 SHA512 8392a8c254726e99d2324415bfdac6e577f725942d4e7fd39c915637f87814f1737aefa903a1502632272cabbb10182070dc15ec5d3e5268c9c1b53218d00f36
+EBUILD xtrlock-2.12.ebuild 712 BLAKE2B 5968bbe4c0c16a3a5c693a1a7db79077c2937839a5b7f2ad48c9cc0656d04ca61395708c3b2500ab2495f648864545529ad745ff8851b04ce50d1960a5659237 SHA512 9d521a618c686ca417c0c3727f7f278ba0e76c75bddf173124056af30340ceb0fb004a59b04d1307bd552d87bc9936a3bf947e585d98ed48e5ab252a4adc71b4
 MISC metadata.xml 318 BLAKE2B e2fde4c35c72439790ea9e4c0e403f1a0666a7ebc8e9f350b29138d01c171765fac8cd6adee54667bbc19921e6fc976a427c3429464769a02d9e8dc8c83a8925 SHA512 7d56445a5c7fffdc1104633cdd30eafa17588079b8a1f4cb226984b1aad4e41fe84320608681143dc01c5f1ac5f104cf0717e8183164031644220f9c61086a3b
diff --git a/x11-misc/xtrlock/xtrlock-2.8.ebuild b/x11-misc/xtrlock/xtrlock-2.12.ebuild
index b84dce881f7b..d7bea7933844 100644
--- a/x11-misc/xtrlock/xtrlock-2.8.ebuild
+++ b/x11-misc/xtrlock/xtrlock-2.12.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="A simplistic screen locking program for X"
 HOMEPAGE="http://ftp.debian.org/debian/pool/main/x/xtrlock/"
-SRC_URI="mirror://debian/pool/main/x/${PN}/${P/-/_}.tar.gz"
+SRC_URI="mirror://debian/pool/main/x/${PN}/${P/-/_}.tar.xz"
 
 SLOT="0"
 LICENSE="GPL-3"
diff --git a/x11-misc/xvkbd/Manifest b/x11-misc/xvkbd/Manifest
index d3625910b7b4..340f71cc2d53 100644
--- a/x11-misc/xvkbd/Manifest
+++ b/x11-misc/xvkbd/Manifest
@@ -1,9 +1,10 @@
 AUX xvkbd-3.6-last_altgr_mask.patch 202 BLAKE2B d980f06b4975bf5dadd6e6e656fd3471fbfc651cfee7f4c118010b1c38d41f7597f7bd6d7e07e6c261f7fed0b07efefdfd4f09fcee38029f0047ed5fc2a1317f SHA512 d3d58b1ba3a7dc71a0240ba3240fd06cc1719ac35ab8f1b119f7d79823fddcdbe1605a457722ec75d4b74804f0a68ec221c5ec3d6c15bd2c4130ce96c01f771e
 AUX xvkbd-4.0-destdir.patch 1026 BLAKE2B 473a1499bff1f00846ae81de75973bc77f63f456d071ebd70fc1d112d254345bda108d34d6934075268e1f5c6e02bcc0107bbd1565380ad01dc1c08ce9b243ef SHA512 8c675dd76eb2f126c48cc669dbb5bf87e337816ef4ac5d6c4730f4259862353e4de1dfc255fda36e35f9a93b507add5922595f53e7c91257996e4c5ee6c8043b
+AUX xvkbd-4.0-fno-common.patch 510 BLAKE2B c324653ddf0638f7806a4488a0dd5474097c60c9bf476d3437208aa7b827047b08bad347b2dfef470c0a1198e2341e157c823de0a5c87fdb076793503d2e680c SHA512 62d90307834cc7dfd04c6e1cf6fa0c6e7526d6ca7dccb897c137686e3a4e5d30afffbbba6c8500d144c5ec3dd49691660573957fe6c0b89c1aaedd9183f02797
 DIST xvkbd-3.7.tar.gz 81645 BLAKE2B 9133b3b8e176034f2c39deb3ad9b334f553c834ba3285aaed59ab2a6f531c0184879c7bfe8c702313c9b0d4089883603c2f8430160f3c2af243705e5328b4ed0 SHA512 19ac5e78c34889d80571bb9feea65582fa413cdce0ba2f949840a08e70c900d720ca789d90d1118aa9667d32183b0f1edb33b7b0029ef5abb1d6faf058134385
 DIST xvkbd-3.9.tar.gz 88440 BLAKE2B d024e97c3e134fd4270db07b1eb54c45380b74bdbffb3fbcf7778e839b51ad8a74a7a236e440215eaea38062ae321db866c5344ecb7eaf2ed9ce15d663cbde9a SHA512 f85d94f9b8012023eb4e901c1962ea39a491df2af67b617efb0817023eb93c460446ab9414fb20dcaee02e270cb9cb7b058a83ae96ffae73291b799f15a04b98
 DIST xvkbd-4.0.tar.gz 408256 BLAKE2B 12f18dc6af9636021a9a067528b9ee2387c43aec0d7a23e01e7e4979273ccfa1eae7752cd2814465da906eeada44a31ff70a3f00f030e87ff66db35e3f3c7f5a SHA512 17fe50b86974f21f1456c522cec107f42a8915fa4ffa60849e03d56a3eb8b600aba46becfde458799e30b073d435c60ee8b3b61d79f4c0d86575770cb4bfd951
 EBUILD xvkbd-3.7.ebuild 1061 BLAKE2B b93561aff4c95187a7a2fa2bba18a28800f2099804997e84e0499b0f310eace201f137126cf0ef030a914c846b0e236d170b6dff429fbda25f576adf6005fcdd SHA512 518d2ea8ee07e0b14803ba7d56fc33fa7883bfc7482f690fe92bed8871916af1578e2bec40b95889f79d587d81d11998fa4bc9887e1a1c5e7c706909f0a2fe59
 EBUILD xvkbd-3.9.ebuild 1029 BLAKE2B f15cff69ce8ab41c543e51a14f9c98faede3070ba989bce08c92f7a642da2de1f6378fe94c1628951c09e3418159fb4048967b4948ff21b28445af7a8505c82c SHA512 3ac63e7c7c1d0c21da167e30cbe101bc473ed6a5efbea3c5ad91a77f679dc82606e8548e6ae549924197ab2e2b60f89761bbb2930821f83ee5c2dfdf8b68d057
-EBUILD xvkbd-4.0.ebuild 728 BLAKE2B 4724c2d1d17d391fafb7fc5aa081afceab6056404db966b70860fa83c49a1fba2b1d999b308f4ca8ab71dd477a50e745b227d07bdc57277c1d8dde95143d6360 SHA512 a36feccc2dacfd76b9e6f16f87479c787c39fcc8566edba09fc9169ec3291ecc98a8beee3f230ceb8350e249a3ae29df4b21a4adb8b9d7aa2a554391a9c5873b
+EBUILD xvkbd-4.0.ebuild 770 BLAKE2B e9ee8979ec4892f4202d5ce888029596362e08727f540b5db0f5a17b7933441cda3617f22d16249d85905df39459f54d675cb94d6c4527395e5403eb9cdef3e0 SHA512 6700a6a773290a24dd083bc5fe34b036b0d907c718dc827d2565f8aac3f493475ec2f0f985ae9d6f7a7f663018e813b4c4134b42a1a42a99b14ad3af8e70233b
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xvkbd/files/xvkbd-4.0-fno-common.patch b/x11-misc/xvkbd/files/xvkbd-4.0-fno-common.patch
new file mode 100644
index 000000000000..1ca0db048566
--- /dev/null
+++ b/x11-misc/xvkbd/files/xvkbd-4.0-fno-common.patch
@@ -0,0 +1,22 @@
+--- a/resources.h
++++ b/resources.h
+@@ -19,7 +19,7 @@
+ # define PROGRAM_NAME "xvkbd"
+ #endif
+ 
+-struct appres_struct {
++extern struct appres_struct {
+   String description;
+   String show_manual_command;
+ 
+--- a/xvkbd.c
++++ b/xvkbd.c
+@@ -500,6 +500,8 @@
+ 
+ static Pixmap xvkbd_pixmap = None;
+ 
++struct appres_struct appres;
++
+ static int AddKeysym(KeySym keysym, Boolean top);  /* forward */
+ static void MakeKeyboard(Boolean remake);
+ static void MakeKeypad(Widget form, Widget from_vert, Widget from_horiz);
diff --git a/x11-misc/xvkbd/xvkbd-4.0.ebuild b/x11-misc/xvkbd/xvkbd-4.0.ebuild
index 90d49c1f04fe..90be10d40308 100644
--- a/x11-misc/xvkbd/xvkbd-4.0.ebuild
+++ b/x11-misc/xvkbd/xvkbd-4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -27,6 +27,7 @@ DEPEND="
 "
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.0-destdir.patch
+	"${FILESDIR}"/${PN}-4.0-fno-common.patch
 )
 
 src_prepare() {
diff --git a/x11-misc/xwit/Manifest b/x11-misc/xwit/Manifest
index 9a53e50c56f7..018cd03c8563 100644
--- a/x11-misc/xwit/Manifest
+++ b/x11-misc/xwit/Manifest
@@ -1,4 +1,6 @@
 DIST xwit_3.4-15.debian.tar.gz 20722 BLAKE2B fcec4b3cdfa0f4d0b90e172f4539bfb622e77c902e351d9423555bbb43706c79e3d2cb15bb83021151a4876cc2c3bdacb62f074d6af50e2896a55b20b31df5e1 SHA512 047e00e5ff0282729495f39c7cb264837306da46d24e4d95e835d6d0060acd0bfa8f8cedff37ab8c503f267d8c5d42e5af0120cba6260e6eb9dd8c9a3a9dab46
+DIST xwit_3.4-16.debian.tar.xz 17840 BLAKE2B 05e772134c4c2c97c81b2367cdcbd73b21c5a4498a482b52dbbbc081426a623f242c3c77c73af3d6e6dbf46c1f1a7240b3677700006a691717402c309ccea644 SHA512 09086d375bb4c7b87c468a3ddad0ae62ad58e168c7875ea9e29bc37e599b193c7e8ff167ac471bb49f836b216876279430d03f462b62286130ed5c3ad0859263
 DIST xwit_3.4.orig.tar.gz 14557 BLAKE2B d023b89d02c8520421b35a69c3834d0493a1ab771b160c6c0592e9e43684062a7da9ed56491e90ba2948ba51b2d36f7b0c26ededdfa61a684b2a010d71865a56 SHA512 265114f81ede19e477685373e39deed3cf7cd3fd9dbb445362f34ea96dac6d9686d1c55cf882636f7d02598c83f5ee1ca2688fcbd01f6fc7ef34cac75691df94
 EBUILD xwit-3.4_p15.ebuild 785 BLAKE2B f94c601e4d3eda61e1c743a22f230bcfd30a47536ec962ea31ec07c38af2c69fd340983106bf6adffd807108836b4bfa8fdad1ea13f2526beda02f300ab8d087 SHA512 b5db114caa9cda0568c25653da150d303099bcc403c11886d131d33aa7948c7ca80f7797f4acdb16fb266db5cd158fc161e77b0ccd70fa4fc4282a96df05dc12
+EBUILD xwit-3.4_p16.ebuild 795 BLAKE2B 5d4da652da13809638b305050c15c190825a6864ef26b8d439014d6f31d829bea7a1b1a2fab7d56ba183e80a6b953d6475d3ecd66f84edcc2176b9ff87fa577e SHA512 10566c593b0d3eb9860e12063457eb3896e24922101a912487b7f59d67453f569c6a0a261d96c625da45b4a87440a16c01a3faaf4681e0437a1780c8962cec5a
 MISC metadata.xml 318 BLAKE2B e2fde4c35c72439790ea9e4c0e403f1a0666a7ebc8e9f350b29138d01c171765fac8cd6adee54667bbc19921e6fc976a427c3429464769a02d9e8dc8c83a8925 SHA512 7d56445a5c7fffdc1104633cdd30eafa17588079b8a1f4cb226984b1aad4e41fe84320608681143dc01c5f1ac5f104cf0717e8183164031644220f9c61086a3b
diff --git a/x11-misc/xwit/xwit-3.4_p16.ebuild b/x11-misc/xwit/xwit-3.4_p16.ebuild
new file mode 100644
index 000000000000..cc910e726870
--- /dev/null
+++ b/x11-misc/xwit/xwit-3.4_p16.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="A collection of simple routines to call some of those X11 functions"
+HOMEPAGE="https://tracker.debian.org/pkg/xwit"
+SRC_URI="
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*/}.orig.tar.gz
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p/-}.debian.tar.xz
+"
+
+LICENSE="public-domain HPND"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	x11-libs/libX11
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+S=${WORKDIR}/${P/_p*/}.orig
+PATCHES=( "${WORKDIR}"/debian/patches )
+
+src_prepare() {
+	default
+	sed -i \
+		-e 's|gcc|${CC}|g' \
+		Makefile || die
+	tc-export CC
+}
+
+src_install() {
+	dobin xwit
+	newman xwit.man xwit.1
+	einstalldocs
+}
author	V3n3RiX <venerix@redcorelinux.org>	2020-02-05 18:44:56 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-02-05 18:44:56 +0000
commit	29aabba0ea759c6a2864ff5631735b67ee38e5e0 (patch)
tree	ab466b4dfa7abecb401b2f8039d08af4689306bb /x11-misc
parent	d42200bec37eef2a7478d88988ff00addd0a9202 (diff)