gentoo resync : 15.01.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
commit: 21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree: e1810a4b135afce04b34862ef0fab2bfaeb8aeca /x11-misc
parent: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)
208 files changed, 816 insertions, 1603 deletions
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 01ac8b6b0e83..15f6c75454b2 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/arandr/Manifest b/x11-misc/arandr/Manifest
index 716d34bb98d7..6435a881ae14 100644
--- a/x11-misc/arandr/Manifest
+++ b/x11-misc/arandr/Manifest
@@ -1,5 +1,5 @@
 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 1046 BLAKE2B 155a3c9861a0feb30a9b62e6ae6a1ef3a7fff3f2be691621df35936f2f80d3ae069b6e839d604953968c02de61bb796e2861c0aa4e99961903fd65db6eb395b8 SHA512 ae0386a1ed39a2c007ae7c616452d473becde17801e8a5756043a1ebaa81567df2b168a2135f5b9f1d081db32e7a614b02c94f3f257ce8c8a9b9bdb7fe5db2ea
+EBUILD arandr-0.1.10.ebuild 1079 BLAKE2B 1e231873abcb2e793c5946ff7770371f44521fcef817cd8fa3f15583234f346fd139bf80388fa6497467df253bac45aa9fe7365878cafed26264a02d1256462f SHA512 639453435ad6eacbe91dea5adff1e08f6110ec7a37107b7c5efb42d70ce1b256601df09a0cacc988413394ffa9e79334549334c6a26b996e351e175a0efe47be
 EBUILD arandr-0.1.9.ebuild 980 BLAKE2B 89f37618b87d23dc76bc267e0ce47758b4cf2fb32310a8347e4914fbb6c405538b7ca926303bd70c74f5d707eb555caa0ca366e1493f4176169261d7ef75493b SHA512 967d804b33a1ff5aa33de670e01f9cfd13bc22e571ca7c741a6421c3304b1220ff98dbf2d985c68107f2a7dbe3fd9f208530810723cb438ac752819fcf0c4b6c
 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 6025bf9d41d0..e5aa388809f6 100644
--- a/x11-misc/arandr/arandr-0.1.10.ebuild
+++ b/x11-misc/arandr/arandr-0.1.10.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Another XRandR GUI"
 HOMEPAGE="https://christian.amsuess.com/tools/arandr/"
-SRC_URI="${HOMEPAGE}/files/${P}.tar.gz"
+SRC_URI="https://christian.amsuess.com/tools/arandr/files/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
diff --git a/x11-misc/bbdate/Manifest b/x11-misc/bbdate/Manifest
index 18b7a79b4056..0a4e6fe6d51e 100644
--- a/x11-misc/bbdate/Manifest
+++ b/x11-misc/bbdate/Manifest
@@ -1,4 +1,4 @@
 AUX bbdate-0.2.4-as-needed.patch 619 BLAKE2B 61672a67abade794501141c897f602c9d1bf865d56aa822383f84eda68db04c53b5bd60d0faa6947abc88f903ecf61f6bf526de0203c310e4d69683c234e87d2 SHA512 eb533f3802c64a557ebd791dc93e42f62eff0808ca49c07244396b4fc6ee22b59b7f75091b1e0f60403e0e1d1945a0e42953da071213a389c4a6f61447c3db10
 DIST bbdate-0.2.4.tar.gz 60644 BLAKE2B f8e55a9c4c041abb6ce8155c46653034f1d1380d3e65851b80898a93fab6b988db6c9e3b20663f4e1fd6cd6427ff0738cb1ca35766a47c7805c171e36ae31ab9 SHA512 90c51249a6ad0b90aea640b1f94cee4e9feb3ca46e4407ab3be645f92a32e7c3f1879c58a236c487dd7bfb24aae1f6a03da0a535c9218fbcbcdbd1e6f043d041
-EBUILD bbdate-0.2.4-r2.ebuild 929 BLAKE2B cd68fb740988e3f765142f20c1565f965bf31edcc53f62226d0d9682bbc240418adf6544bb44da13e4559b147449d57f5f1a2d90bdc439c2cf0a552d8912565c SHA512 3d6460ac7b435576dc6bf67d3b0ba348c8b67b5e7d5e616291ca1c9ebdc063368f16af38fe9b90e508e46b0f6f916337bcdd3ff54e955219770acb373f3fb407
+EBUILD bbdate-0.2.4-r2.ebuild 925 BLAKE2B b9f4bc82f450361ba9a80ea4cdb7219b83cea10982eaf1f356d2bfefe4327a2c0a89862e1ed34d13f2364fae9afd0274e1651aed48232c118f224e2c903639fa SHA512 99c5512097be8145fdcac94fdab28351dfee9eb0b305b0dcc4ff50c3b7475a7f5e5dd0d3965791ac078165f491029542d182b641adb54d29b5fe4676b52166a5
 MISC metadata.xml 309 BLAKE2B d09efeb368e3d2d88b9a68da9e3b24ecae3408ba9fb458e77ff856fdfd0c9d4faf70b8756fdaf7238ebb2ac326d6af9d46ccd6217fdcb69f87161752be0960d3 SHA512 ee8557b2406913cb007554644e1b510229de4aa8428af35dce200754dbbb5ea8d2bd3e3f044b039cb403d894d713ae76eca87e224bff6be093ea4473a8979c07
diff --git a/x11-misc/bbdate/bbdate-0.2.4-r2.ebuild b/x11-misc/bbdate/bbdate-0.2.4-r2.ebuild
index c1edcb8f5506..cda60822193f 100644
--- a/x11-misc/bbdate/bbdate-0.2.4-r2.ebuild
+++ b/x11-misc/bbdate/bbdate-0.2.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -34,5 +34,5 @@ src_install () {
 	# since multiple bbtools packages provide this file, install
 	# it in /usr/share/doc/${PF}
 	mv "${ED%/}"/usr/share/bbtools/bbtoolsrc.in \
-		"${ED%/}"/usr/share/doc/${PF}/bbtoolsrc.example || die
+		"${ED%/}"/usr/share/doc/${PF}/bbtoolsrc.example || die
 }
diff --git a/x11-misc/bbkeys/Manifest b/x11-misc/bbkeys/Manifest
index 026005c0f1ce..057896a24fcc 100644
--- a/x11-misc/bbkeys/Manifest
+++ b/x11-misc/bbkeys/Manifest
@@ -1,3 +1,3 @@
 DIST bbkeys-0.9.1.tar.gz 226941 BLAKE2B 43a946210f25679dfe7d5a383fbd3f938ae71b19a635a288590b958fc47f3588c690a1e901b44fdb1b31eb1a8ee7252ceeee85b5d012585b261de61cc0f012ab SHA512 c8643d51dbb8f080cf70149d545f33160d15f00a0c3cefdd6d3856dfdee224ff3f63fce0988669036249c75f70878be63711a697dfaa45d4357d2141a28b13bd
-EBUILD bbkeys-0.9.1-r1.ebuild 607 BLAKE2B 182c46ffe49e0ba9a6bed1839e2c24e7ab93328722fab4c0db963a2b59b743b959bba0184e41e11059315c88e7afe2376f6bbe4648617a085cbfd983046285ba SHA512 ab113543bc7396c1702d3da34ba6e54ad8b17a92daa1af2daff5e906346e7b2ce42f8fee4c1e9057422c44e176be63b65ae1bc9983aa557294155685a3413fe2
+EBUILD bbkeys-0.9.1-r1.ebuild 602 BLAKE2B 8d032d2bee58ad01f326f34383803f5c379713ff83cc543bf2bc2e3290cf896b700ebe4787c6180c625c6dd21f2ad493afb8383a82f08cc76f835fba225e232a SHA512 6acad4c8b8e3e219561db3e6b3b4ee8a30e9555d3d029b9b930eb81a73fb631672a7257b3fed6c2b1427f89b72c104c9e9a48b8bfc5d3bbedd81b485bbaba52c
 MISC metadata.xml 318 BLAKE2B 21dea9539e3c3d2449806722447884e705f11482ef597b931d3d0ed513fe25045cd72905e885e98b4ca096e7a7b412e8ebe8fabfb432a889e7bbc6eee3d4415c SHA512 346baeec555112d1e81cdfb8304d0b9efb91ef1f507d12c52a2ab68cb9d82a3f873922b57ce40ba4f247b28c831ddb420647303e09ddbae82b4e561282532005
diff --git a/x11-misc/bbkeys/bbkeys-0.9.1-r1.ebuild b/x11-misc/bbkeys/bbkeys-0.9.1-r1.ebuild
index 1ea30179adf6..642de9a75e6e 100644
--- a/x11-misc/bbkeys/bbkeys-0.9.1-r1.ebuild
+++ b/x11-misc/bbkeys/bbkeys-0.9.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,9 +18,9 @@ DEPEND="${RDEPEND}
 
 src_install() {
 	emake DESTDIR="${D}" install
-	rm -rf "${ED%/}"/usr/share/doc || die
+	rm -rf "${ED%/}"/usr/share/doc || die
 	einstalldocs
 
-	echo PRELINK_PATH_MASK=\""${EPREFIX}"/usr/bin/bbkeys\" > "${T}"/99bbkeys || die
+	echo PRELINK_PATH_MASK=\""${EPREFIX}"/usr/bin/bbkeys\" > "${T}"/99bbkeys || die
 	doenvd "${T}"/99bbkeys
 }
diff --git a/x11-misc/bbppp/Manifest b/x11-misc/bbppp/Manifest
index 610d01b3fe38..9ef0a4947ebe 100644
--- a/x11-misc/bbppp/Manifest
+++ b/x11-misc/bbppp/Manifest
@@ -1,6 +1,6 @@
-AUX bbppp-0.2.5-gcc3-multiline.patch 2749 BLAKE2B 78e2a36cd3fd05fcc4b1804037f73f63b27f1296e7e2958ad3514906b38e35438b4f311931c3646f981da5b819b7a240094c9ba1131d739338fb8f6923034874 SHA512 123c119dabd8be474abc28e8584c9d537bf299472806d168b67e9fb5daa010cdf3555d777c3a4e4c9b5b21dfe6d012a929ba600af928406edc37dcaa4ad8e424
+AUX bbppp-0.2.5-gcc3-multiline.patch 2759 BLAKE2B 883dc1f412f6b3c7bd33b95d27dd7971018a1c62394a025657a3e02d0106d52317bf40ebcaa4a155c1419debd4342d0d5ea15c28e69942fd956b1788feb7a24f SHA512 736eb14dd7eb027e2a7c2a1cab73bba3a59410a502e6f6670617ca85b40cb64f01291a6882de5081f7847c97ab7db18a0bd7edb130432b78138da288cb1e8da7
 AUX bbppp-0.2.5-overflows.patch 453 BLAKE2B 45dcee17e6d725b3ba2e2197a75139d5b8dd86ae7b706f88069eda2ef1cf29236fc878a8de363904e88d4269302f9f9c6c49bf0ac2de607df3feeb53656a5420 SHA512 044755d73415d171ec2e0c61fe0affea912ab40dedd567f3e4f29938ca97825c1ab36be9bea50dc7c40227a06e5e2ea2541d0cdf71e5dc8013fef38a6db920eb
-AUX bbppp-asneeded.patch 1054 BLAKE2B b12c871818b5a26cd8f710ee7ee682fb652d8e7c138f4c9e9574f3beff30c2627d573aff393e473057179f006570005cded6ed4ea6d51c7b1a8ce1c0fabb8845 SHA512 96d243ce1b372d718649a8c4d1e14b3210f8e679aa1c6a5dfeb373aced866676bfb0622e639d65c8cfedf8e2ae072e01253a1013c9dbfb682957936b97547347
+AUX bbppp-asneeded.patch 1062 BLAKE2B 73be09e58f573c58e2cc0afe2c316e737af0ac4a0308975f955002a3b70bb1fd68641725b62a68ca6fc7e8d8a6a1fc23446a5a7bb5b3d19721ac73ceff996091 SHA512 892a7f18ce55c099b86fbb129eee9a0750852d5f152d0619a3e79bf70f9e9a1524c52d9aec53bbb0b65999bd6248cc4eee4b341f5ad0d8f636a7dfacb3fef993
 DIST bbppp-0.2.5.tar.gz 83421 BLAKE2B 3fe18ce71617b792f9430b2bbe123af78b498be9a663fc782246550ed936b81278d27f06b9b454bc47ff6db193fa2a949e97f0fd970532399c3f0b0f335beda1 SHA512 55d1e4d1a2c97ac5a5d34a48cd877891d8d6acf32083d7bfa90e4941cfbc18a91d056a0ec6b7a96182f72be440f6609caf3bc82c9071c6d0bcfbe95577f04930
-EBUILD bbppp-0.2.5-r1.ebuild 1023 BLAKE2B 3b69a48dbf5b9ef56a6d804f0c64699af218f5fe187ecfd7cb247d398fa97588b83a9a1acec651b2d81fd2f4aed2a0de3bdaaea739b54f162ce135b138dc62fe SHA512 dd1948d7753fe055cbf5c374ff2306c3fde98168d093207394ebbaba8388e83873805b58bc3d76e05e96a1691fc3c906933ca841fbf8ad97578c2390cb3ba60d
+EBUILD bbppp-0.2.5-r1.ebuild 1015 BLAKE2B aaf3d1fc51511463cf22c3dfd405997ddb4f0169156bfc8f647ae34aaf4491df960f177300bd838c44cd598ee2974afdddf29d641c93b820134dd060cf5804c8 SHA512 d5fa3b2042fb1a6e202c58aaefc3b4ac20394c243a4c8e54d382a44de9901483113d860aa8b3789c538d4a77ee518f662873a04d6abe4696504426ca7f3713fa
 MISC metadata.xml 329 BLAKE2B 314294a4fe076008891426b44fdcd92a5fd0b8f04aeb0240fda6f52f7e4a09300b2d46efa23f7f910559089611139d2262c60e588354081b2af97a7aceae2b32 SHA512 1b2b0c0055b4f8f44734697036fe3b470d8a60bba3de1972e7a8e6e21083a9a36356d9afa1e661ccbbbb686b5db6d3c8a57dd4dbba11217eee28010af18b82cc
diff --git a/x11-misc/bbppp/bbppp-0.2.5-r1.ebuild b/x11-misc/bbppp/bbppp-0.2.5-r1.ebuild
index ec064c74c16f..a8e1a0cdbba4 100644
--- a/x11-misc/bbppp/bbppp-0.2.5-r1.ebuild
+++ b/x11-misc/bbppp/bbppp-0.2.5-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit autotools eutils
+inherit autotools
 
 DESCRIPTION="blackbox ppp frontend/monitor"
 HOMEPAGE="https://sourceforge.net/projects/bbtools/"
@@ -12,30 +12,34 @@ SRC_URI="mirror://sourceforge/bbtools/${PN}/${P}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
 
 DEPEND="x11-libs/libX11"
 RDEPEND="${DEPEND}
 	media-fonts/font-adobe-100dpi"
 
-DOCS=( README AUTHORS BUGS ChangeLog NEWS TODO data/README.bbppp )
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc3-multiline.patch
+	"${FILESDIR}"/${PN}-asneeded.patch
+	"${FILESDIR}"/${P}-overflows.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc3-multiline.patch \
-		"${FILESDIR}"/${PN}-asneeded.patch \
-		"${FILESDIR}"/${P}-overflows.patch
+	default
+	mv configure.{in,ac} || die
 	eautoreconf
 }
 
-src_install () {
+src_install() {
 	default
-	rm "${D}"/usr/share/bbtools/README.bbppp
+	dodoc BUGS data/README.bbppp
+
+	rm "${ED}"/usr/share/bbtools/README.bbppp || die
 }
 
 pkg_postinst() {
 	# don't assume blackbox exists because virtual/blackbox is installed
-	if [[ -x ${ROOT}/usr/bin/blackbox ]] ; then
-		if ! grep bbppp "${ROOT}"/usr/bin/blackbox &>/dev/null ; then
+	if [[ -x ${EROOT}/usr/bin/blackbox ]] ; then
+		if ! grep bbppp "${EROOT}"/usr/bin/blackbox &>/dev/null ; then
 			sed -e "s/.*blackbox/exec \/usr\/bin\/bbppp \&\n&/" blackbox | cat > blackbox
 		fi
 	fi
diff --git a/x11-misc/bbppp/files/bbppp-0.2.5-gcc3-multiline.patch b/x11-misc/bbppp/files/bbppp-0.2.5-gcc3-multiline.patch
index ef2072faa9af..1aff6b167847 100644
--- a/x11-misc/bbppp/files/bbppp-0.2.5-gcc3-multiline.patch
+++ b/x11-misc/bbppp/files/bbppp-0.2.5-gcc3-multiline.patch
@@ -1,5 +1,5 @@
---- main.cc
-+++ main.cc
+--- a/main.cc
++++ b/main.cc
 @@ -24,25 +24,24 @@
  
  void Usage()
@@ -19,7 +19,7 @@
 -	                      -com[pact]                  Display buttons in compact style\n\
 -	                      -notime                     Dont display time window\n\
 -	                      -nosecs                     Show uptime in old-style hh:mm format\n\n"};
-+	char* usageOptions = {"Options:\n"
++	const char* usageOptions = {"Options:\n"
 +	                     "-display <display name>     X server to connect to\n"
 +	                     "-c[onfig] <filename>        Alternate config file\n"
 +	                     "-n[obb]                     Fall back on default configuration\n"
diff --git a/x11-misc/bbppp/files/bbppp-asneeded.patch b/x11-misc/bbppp/files/bbppp-asneeded.patch
index 7e8c2b8bcfd4..5feb8bcd11c0 100644
--- a/x11-misc/bbppp/files/bbppp-asneeded.patch
+++ b/x11-misc/bbppp/files/bbppp-asneeded.patch
@@ -2,8 +2,8 @@ Fixing build with as-needed
 
 https://bugs.gentoo.org/show_bug.cgi?id=248552
 
---- configure.in
-+++ configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -86,14 +86,9 @@
  AC_PATH_X
  AC_PATH_XTRA
@@ -21,8 +21,8 @@ https://bugs.gentoo.org/show_bug.cgi?id=248552
  
  dnl Checks for header files.
  AC_HEADER_STDC
---- Makefile.am
-+++ Makefile.am
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -1,4 +1,4 @@
 -CPPFLAGS =	@CPPFLAGS@ @INTERLACE@ @ISDN@\
 +AM_CPPFLAGS =	 @INTERLACE@ @ISDN@\
diff --git a/x11-misc/bbrun/Manifest b/x11-misc/bbrun/Manifest
index 00ad89b7beab..3a09f6d7cce5 100644
--- a/x11-misc/bbrun/Manifest
+++ b/x11-misc/bbrun/Manifest
@@ -1,5 +1,5 @@
-AUX bbrun-1.6-list.patch 2945 BLAKE2B f8cad837778fb0d197605227d751247b71e14176a6b40ed303d2a8797db84d6e89f9ad13f7c96d9afdffc3e0697ae0c4035792b4c27bf864a057eed98dd4f3a6 SHA512 9cece93b2f75891f12a39f23bafca2ae48c7ef5344b63f7fb0e36c52013ccb236c1c8398eff8a271fbee5661abba561d3152bfee5ee437e3cee42f44f125fde7
-AUX bbrun-1.6-makefile.patch 730 BLAKE2B b70a72c4337059c277e2d4cd221fceb9714e91dd435609a1962bafc9fb02864db67c8aa047fa33a8cfc5f0111521e8ce1649b03f532b36d225459ae32b33427b SHA512 c4f3d4b13fbfd8a13279a3a3cab293b251f5e89b9eedff58bd681729ed571ea4efcbaecedd972706006a263b1140c76addac0b8c6f62f7be9c344f1c12a6dc6a
+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 646 BLAKE2B 66bf76c657050e31b118820ace1f3e0e12c8ceb6709da68907ff9612ba9cd6e71874ba18ff7343a7f2db374eabb3c9d33bdefe14341b5c4f19883d78b691483b SHA512 5dcf48c35ab9443f1bbe02a54247f98e20e9c3fcd0fcf2c63204efa76062b2b2ddb350e30ae69565625c6795db710c8c7a74203b7b623a03d579307494a7b4ac
+EBUILD bbrun-1.6-r1.ebuild 673 BLAKE2B 6422d8b85986c7cca55625035355b43b077d89b0d2a0c651cee45914d4f73e8713c2f822d6e9bdd32eba87e646b06b3d3457c9f6944ef07bde46bd140a4d481d SHA512 c904789a34eb14b9f3ec1cea6d7787329f82e7c77651eb4d11be35285b308031eb269cf34c25ca9018b1f5b1b1e342c1ff43c129813ec6ed4691974ff33cf894
 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 07fa033e05dc..f9bd99cef70b 100644
--- a/x11-misc/bbrun/bbrun-1.6-r1.ebuild
+++ b/x11-misc/bbrun/bbrun-1.6-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="blackbox program execution dialog box"
 HOMEPAGE="http://www.darkops.net/bbrun"
@@ -12,17 +12,21 @@ SRC_URI="http://www.darkops.net/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
 
-RDEPEND="x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	x11-libs/libXpm
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	epatch "${FILESDIR}"/${P}-list.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-list.patch
+)
 
 src_compile() {
 	emake -C ${PN} CC="$(tc-getCC)"
diff --git a/x11-misc/bbrun/files/bbrun-1.6-list.patch b/x11-misc/bbrun/files/bbrun-1.6-list.patch
index 654b4f68144e..d487efc3d5a7 100644
--- a/x11-misc/bbrun/files/bbrun-1.6-list.patch
+++ b/x11-misc/bbrun/files/bbrun-1.6-list.patch
@@ -1,6 +1,5 @@
-diff -Naur wmgeneral.orig/list.c wmgeneral/list.c
---- wmgeneral.orig/list.c	2002-02-05 18:36:19.000000000 +0100
-+++ wmgeneral/list.c	2016-01-04 12:54:39.666670005 +0100
+--- a/wmgeneral/list.c
++++ b/wmgeneral/list.c
 @@ -38,7 +38,7 @@
  
  /* Return a cons cell produced from (head . tail) */
@@ -82,9 +81,8 @@ diff -Naur wmgeneral.orig/list.c wmgeneral/list.c
  list_mapcar(LinkedList* list, void(*function)(void*))
  {
    while(list)
-diff -Naur wmgeneral.orig/list.h wmgeneral/list.h
---- wmgeneral.orig/list.h	2002-02-05 18:36:19.000000000 +0100
-+++ wmgeneral/list.h	2016-01-04 12:54:39.666670005 +0100
+--- a/wmgeneral/list.h
++++ b/wmgeneral/list.h
 @@ -29,31 +29,25 @@
  #ifndef __LIST_H_
  #define __LIST_H_
diff --git a/x11-misc/bbrun/files/bbrun-1.6-makefile.patch b/x11-misc/bbrun/files/bbrun-1.6-makefile.patch
index cf89b96df6f3..21e855746d09 100644
--- a/x11-misc/bbrun/files/bbrun-1.6-makefile.patch
+++ b/x11-misc/bbrun/files/bbrun-1.6-makefile.patch
@@ -2,8 +2,8 @@ Respect {C,LD}FLAGS, fix underlinking
 
 http://bugs.gentoo.org/367853
 
---- bbrun/Makefile
-+++ bbrun/Makefile
+--- a/bbrun/Makefile
++++ b/bbrun/Makefile
 @@ -1,7 +1,7 @@
  CC     = gcc
  LIBDIR = -L/usr/lib -L/usr/X11R6/lib
diff --git a/x11-misc/calise/Manifest b/x11-misc/calise/Manifest
deleted file mode 100644
index db637bc12794..000000000000
--- a/x11-misc/calise/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST calise-0.4.2.tar.gz 102792 BLAKE2B cedc0b8edd31f4b6b414a593d94b1454fed2844a63f8417b42e8fad616735a1eea728afbfc55668bb1b5964de5f470cd6ab267cf3cc7f41421dd5963bd9fdf00 SHA512 b08722083447780dbfe6a3614cf0891eed791819adc6c434b878c55cbad6fa122d3c2042274fe9acbc0c68a2acb3ca7835422ec6d2d1f867d6fd9ec806a4f750
-EBUILD calise-0.4.2.ebuild 1506 BLAKE2B c84196cb5eecf22deb6a2241a5f8115ff56f9e8f927c42e963bd9f89971877d0b4a82ae0dc7760c302f89d901ef0399ac3a6a232b3e3c71345655283ddf820a1 SHA512 3e4a437d98ca82d716864a085d678c433235867401f17648d5a8a3b437d19c367bd5b90521ec84d2f09e9819e5f754dc04a5ae7a468eff800e87bf036ff402c3
-MISC metadata.xml 243 BLAKE2B ff834c240baa749df9aefcce72bf41c1f1665f083db9df2abbf27ae7a195a73a2cf185e2c54845bb78405ba69094314f863425ecc343fb411d80c70a1dcd96a8 SHA512 fdee944e8f6e963d436f23f1de055a5071b87b3c3921f296ad61c9d15b006ebd09b35fe05541e90af79e7088b161d2a186d766f9ff9576177e161607b625a8bb
diff --git a/x11-misc/calise/calise-0.4.2.ebuild b/x11-misc/calise/calise-0.4.2.ebuild
deleted file mode 100644
index e09f3e679903..000000000000
--- a/x11-misc/calise/calise-0.4.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1 linux-info systemd
-
-DESCRIPTION="Computes ambient brightness and sets screen's correct backlight using a webcam"
-HOMEPAGE="http://calise.sourceforge.net/"
-SRC_URI="https://sourceforge.net/projects/${PN}/files/${PN}-beta/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-CDEPEND="${RDEPEND}
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pygobject[${PYTHON_USEDEP}]
-	sci-astronomy/pyephem[${PYTHON_USEDEP}]
-	x11-themes/hicolor-icon-theme"
-DEPEND="${CDEPEND}
-	dev-python/python-distutils-extra[${PYTHON_USEDEP}]
-	dev-util/intltool
-	sys-kernel/linux-headers
-	x11-libs/libX11"
-RDEPEND="${CDEPEND}"
-
-CONFIG_CHECK="~BACKLIGHT_CLASS_DEVICE"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	# Add missing trailing ; to desktop file.
-	sed -i 's/^\(Categories=Utility\)$/\1;/' \
-		share/applications/calise.desktop.in || die
-
-	# Fix up bashisms.
-	sed -i 's:&>/dev/null:2>\&1 >/dev/null:' \
-		other/init_scripts/init.d/${PN}d || die
-}
-
-src_install() {
-	doconfd other/init_scripts/conf.d/${PN}d
-	doinitd other/init_scripts/init.d/${PN}d
-	systemd_dounit other/systemd_scripts/${PN}d.service
-
-	install -D -m755 other/pm-utils_scripts/53${PN}d "${D}"/usr/lib/pm-utils/sleep.d/53${PN}d
-
-	distutils-r1_src_install
-}
-
-pkg_postinst() {
-	einfo "Optional runtime dependency: dev-python/PyQt4 for GUI"
-}
diff --git a/x11-misc/compton/Manifest b/x11-misc/compton/Manifest
index 4b0c108815f3..0e5318dc922b 100644
--- a/x11-misc/compton/Manifest
+++ b/x11-misc/compton/Manifest
@@ -1,4 +1,3 @@
 DIST compton-0.1_beta2.tar.gz 144239 BLAKE2B 993c091aa0eab4171740a26c4ea8e9da66368fbcddbbdf9c466dd2cb2dbe0a685dc6c2027a5b56d08df4fd42d21784dd2cbb7cf56869feb1b74b4854db20a5f8 SHA512 c3a019d90e32559d44e3a4969bcc15a15837db9c9519ce8cc70b1bd3d0cb16d29449f68cc2f6a8d834569c9620ec6533ab85c1586da957c69b1ae341d9584535
-EBUILD compton-0.1_beta2.ebuild 1616 BLAKE2B a90f758aca2f89ba4ed9186d23fe54b654a7d256bd64e14024bb0f62ca353145360383990f035334397edeabe95927c377d4a93e2d1e8f954baaf969f0f3f808 SHA512 00bfd8b08b6752b250ebd1dc7695dc118cac68b64a04d3ec20967c69b4143eec61f97d6032e72c1cb92bca46c3ad6884bb1dd3c631629eee5607eba0e26062a6
-EBUILD compton-9999.ebuild 1532 BLAKE2B 5d057277a01c432d816b0198b79363215a1e342854d7d65feaf3e53b6d94ec38841a47729799b7ac71e06c7620c31532f9f2800bea7977d6b4156b46b61ae923 SHA512 cf6f7d09ee30d94f400eb5aa608a915913e0b20b5b461d03aa6d9e05b4c825abec091cbe0a0a6fe78d80cdd491358a79b5ad83bb52315df53ef4641bc18cfe88
+EBUILD compton-0.1_beta2.ebuild 1612 BLAKE2B c2bb025332d6e10ad0b8e9f862b2276f70d9ba8ff4001659a961424859d3615837e40be4c1da718f2c7d710760a227a18260c6cadadbcf21efe8c43dabdb01ce SHA512 9602222cc536892d0f1538b59bb768b379f093eb45641fb362f28ff5013dee6e8715039f0256ef075706998871ce06bdb9673d9edf748abb1004926aa1a5cf5c
 MISC metadata.xml 484 BLAKE2B 903744ba49b9aaae86cec59c83f96f02da325d17813d6ceaedd88eab1450ae76eac7a40c9e1b44086651efd21e5580b605b9095925625fa3bb1e6c708ed8809f SHA512 d01d17901f47f7e2c0201c0a6665d0e27693ac42b27ef8dce8a78763ec775a41fed88b4565db434351a2c9d01e762121bca3f347f467e77e71bde66f019640cb
diff --git a/x11-misc/compton/compton-0.1_beta2.ebuild b/x11-misc/compton/compton-0.1_beta2.ebuild
index 74466afd44e4..feff59e96fab 100644
--- a/x11-misc/compton/compton-0.1_beta2.ebuild
+++ b/x11-misc/compton/compton-0.1_beta2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit toolchain-funcs python-r1
 
 DESCRIPTION="A compositor for X, and a fork of xcompmgr-dana"
diff --git a/x11-misc/compton/compton-9999.ebuild b/x11-misc/compton/compton-9999.ebuild
deleted file mode 100644
index 0c8bdd5513e1..000000000000
--- a/x11-misc/compton/compton-9999.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6} )
-inherit toolchain-funcs python-r1 git-r3
-
-DESCRIPTION="A compositor for X, and a fork of xcompmgr-dana"
-HOMEPAGE="https://github.com/chjj/compton"
-SRC_URI=""
-
-EGIT_REPO_URI="https://github.com/chjj/compton.git"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS=""
-IUSE="dbus +drm opengl +pcre xinerama"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-libs/libconfig:=
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	dbus? ( sys-apps/dbus )
-	opengl? ( virtual/opengl )
-	pcre? ( dev-libs/libpcre:3 )
-	xinerama? ( x11-libs/libXinerama )"
-RDEPEND="${COMMON_DEPEND}
-	x11-apps/xprop
-	x11-apps/xwininfo"
-DEPEND="${COMMON_DEPEND}
-	app-text/asciidoc
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	drm? ( x11-libs/libdrm )"
-
-nobuildit() { use $1 || echo yes ; }
-
-src_compile() {
-	tc-export CC
-	emake docs
-
-	NO_DBUS=$(nobuildit dbus) \
-	NO_XINERAMA=$(nobuildit xinerama) \
-	NO_VSYNC_DRM=$(nobuildit drm) \
-	NO_VSYNC_OPENGL=$(nobuildit opengl) \
-	NO_REGEX_PCRE=$(nobuildit pcre) \
-		emake compton
-}
-
-src_install() {
-	NO_DBUS=$(nobuildit dbus) \
-	NO_VSYNC_DRM=$(nobuildit drm) \
-	NO_VSYNC_OPENGL=$(nobuildit opengl) \
-	NO_REGEX_PCRE=$(nobuildit pcre) \
-		default
-	docinto examples
-	dodoc compton.sample.conf dbus-examples/*
-	python_foreach_impl python_newscript bin/compton-convgen.py compton-convgen
-}
diff --git a/x11-misc/dex/Manifest b/x11-misc/dex/Manifest
index e1cbf31f89d6..2c46cf3dc683 100644
--- a/x11-misc/dex/Manifest
+++ b/x11-misc/dex/Manifest
@@ -1,5 +1,5 @@
 DIST dex-0.7.tar.gz 7679 BLAKE2B 7ebed8194158b273e8a0980f7070c615081052eef7ee2023784ce3123a2004b5e7dc402bead2f985d3a6898509f978404f8c093f668d74569577c7d7759ee121 SHA512 ee1f8c6ef0b374aadf6ad0ee6482bb23f740f67888994839c381b71b3655d0cbd7d3d5c99abe5f3bce856cb767a1b4bffdbcdf6c70969226b44a59ee76943bce
 DIST dex-0.8.0.tar.gz 8665 BLAKE2B de62557d207d257286cc706c07969b10b0d753b197333f1d24c0c0a22a897fb2e3c64a25f71770424e6cc365d028c9a1e994fcf35c68c96be7281d24ce19b1e3 SHA512 d87a7306b931736aa302dc883cbd9c635397eda2c119133a3ae8028869a4302ce3713b43cc85fdb2f804d1a74ab2499ef32a2680d5d6be039831006e617aa70a
-EBUILD dex-0.7.ebuild 648 BLAKE2B 0373aa70c622c182dab26b97ca4c28e2c080ddf4ab747b140f57b346cf739ee36f034ce1ef13605fc7de8702e3db78600fccf229f6245aed6898cbf1f5830a76 SHA512 08c78b33e12b04b061894a9e0771a086446e64943450811256291435737c3089d6c9edf28f4a5810f13bf2e488dd0afa728f46642f34b372bc7e827054761450
-EBUILD dex-0.8.0.ebuild 757 BLAKE2B 90de8752a8d1d49216d8140b7426f199108a826bde7cc2164e9adec17aba7b5435003811a368585a9eafaedccd2a153b2a60987cb102217d097fd0f46410a9b1 SHA512 1d792a33b9ddde5d89e6875b8c41a5299ed85489cf49763c4566b27b97aea2e24131aa84173e79f8693f3a93ada27809e364888dbc6ebacda2f51553f4835ddc
+EBUILD dex-0.7.ebuild 644 BLAKE2B e233c3e290dcdb99af24aeff52ab2ebe7db416bd7bb34d04f93816559c92684ebf8ee51e2ccda6937d0ed7148161d095802dd616c474681eb1e97e628986b3a5 SHA512 b0636773607f2189154c9527ab710b3292925465af3b62c9ca2a46ee6d35cbb1080fbae2ee448440c83337126ba64f92c479dc3f7c59e66575968bef208844c1
+EBUILD dex-0.8.0.ebuild 753 BLAKE2B fef1e7dadb8839b799d538c3017efc6acf58ed0508b4d048f3b5396c3f8a2596b888c80f409698ce18e1dc612696384b824cebc0190316073ef8aef0aa0ee00c SHA512 b11274c611a4c39562738fb559ca3904f2e6e14a7b8f75c8ad9e5342888c0221f84e4ef49bd1b455f5ca2f7d6257d85aeea8ca0868efb6e798c3a1cb6d9b8629
 MISC metadata.xml 320 BLAKE2B 13f35e27d7da69c6167f9187b75cf012fe33359467336f422478e113814b062bbbde0fe5bd4d25b3eac41cde9a45e55b61f912425049365e82afc0557371e818 SHA512 18ef7b2115ecf22f12afbeb064823e3cf2faba91730748d53fc182e557d5f1efa371fca86266fa58ce88d5c249785e2b6b6c9b29f7d504ac3867cebc55860fb6
diff --git a/x11-misc/dex/dex-0.7.ebuild b/x11-misc/dex/dex-0.7.ebuild
index 6a33b5291fc0..e52e252fa36f 100644
--- a/x11-misc/dex/dex-0.7.ebuild
+++ b/x11-misc/dex/dex-0.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit eutils python-r1
 
diff --git a/x11-misc/dex/dex-0.8.0.ebuild b/x11-misc/dex/dex-0.8.0.ebuild
index 884e68324b45..5a6949640992 100644
--- a/x11-misc/dex/dex-0.8.0.ebuild
+++ b/x11-misc/dex/dex-0.8.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit python-r1
 
diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest
index 87413e2e401f..074e820b3249 100644
--- a/x11-misc/dmenu/Manifest
+++ b/x11-misc/dmenu/Manifest
@@ -1,7 +1,6 @@
 AUX dmenu-4.6-gentoo.patch 1134 BLAKE2B 4df80fcec2f35777ff25e0600798e1101bcc7f1c9cbbe45b59bd88cef6290d119ba45f9a53f5a54bbc9240440807fffe6a5a3400e3cfc6042651a26de5ef11cc SHA512 50e236783df1d27f3968c182a32689ddc33c45cce5c9dad91e8a2d1e1515b2e03113d0f2b9c67b0d239625198f35918b46bebeb6454ae7c2649c58b5943d4481
 AUX dmenu-4.7-gentoo.patch 1153 BLAKE2B eebeac590f6fd759a5524c2613419ef65ddc6f9c4b3f8c24ed9e734a244ae14c8787dbd67c1a6d8d4d94f09f8b6cd73f2672dd321761beba82e7425086f1479c SHA512 14e286b582895985403babc6084b096075f759e0e4a8acf231508cbf4fd5a70e95638f9f99aa35bef72e656b85642bb088f5b4052d703a2b852a787902b23e27
 AUX dmenu-4.9-gentoo.patch 759 BLAKE2B 965ebf79e580466fd98c3621d4d3b0cb9ea961a9f0f27cf1b91a82362aa49939469509929a66a0ef1e7a1be2a9919b2ab821882fa0d6b28e0821194e48e3c739 SHA512 15f379af1133ffa2724a1b5191108a85231f10db16850e14e1a8935f47cb3326061bed3c4854c8aba7bc1076211f1154c5927ff42e46e905b09a695666bbb576
-AUX dmenu-9999-gentoo.patch 561 BLAKE2B 6c0d69737040068fae1ed2286902d2afea9e4ce6be4f3a1682bae4de8477953e50f92b137a0b347434027ec9f31dc635a0980aa12ac2f59ca16862284eed56e9 SHA512 4896a7fa15630650c028073a45856d0680c8e84c14dcf6b5bb0fc02b2303f460d4ee91730ddfb7684ac6c46e24d1651a46539b080feb61d130944dc47fa14af4
 DIST dmenu-4.6.tar.gz 15057 BLAKE2B 87469e86400fc5d99c6c62666f6903c2dee6221739a52aab0facd4e417b1ddc88b138440b62e410d8230e7dec89ace1c684348eaab223fc7027eda0b6712e495 SHA512 e54fd10c0b1274eb90173aea442f0bfc496f4dda861a36d94f939e1fd835594f9aa12f3d0f90043d64e519d919b9a5273ab65012230ac022f727ee6bb64862e3
 DIST dmenu-4.8.tar.gz 15658 BLAKE2B 8e027905a3c32d0db20f22ac911bcd69c39d00b2c426c1fa79a9b6253c13223ddc79413b9f8ecf38f3258aada3d7c4a91535fb930a5d2a9fb239f398a6b6af07 SHA512 fa2700018cfb912a21f867ef3ca771a58a25c2cb8e1fb37acef046bb15d8d8b92dcc5bfce486befae0f143495d0283910988e181a9eb143be3bb1b5be9738d77
 DIST dmenu-4.9.tar.gz 15972 BLAKE2B 56ba03a3dfd24e2fb0f45feaaaac53e441b63a0d72adbc36499a97e2eab7c524da2088e3a15c6599c513bb35a6a049663b97220e671e03bd577baaaf711f228a SHA512 c2779209fe012de8ca1cdd72923da6d594f4a8368c85c3c0e0afd4ae489a95fe0e6f05a947d115b6b389aa7170ab14c2c645a2031353b0a08f38327ab461fe65
diff --git a/x11-misc/dmenu/files/dmenu-9999-gentoo.patch b/x11-misc/dmenu/files/dmenu-9999-gentoo.patch
deleted file mode 100644
index c22e9b78fe08..000000000000
--- a/x11-misc/dmenu/files/dmenu-9999-gentoo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/config.mk
-+++ b/config.mk
-@@ -23,9 +23,9 @@
- LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS)
- 
- # flags
--CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS)
--CFLAGS   = -std=c99 -pedantic -Wall -Os $(INCS) $(CPPFLAGS)
--LDFLAGS  = $(LIBS)
-+CPPFLAGS += -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\"
-+CFLAGS   += -std=c99 -pedantic -Wall $(INCS) $(CPPFLAGS)
-+LDFLAGS  += $(LIBS)
- 
- # compiler and linker
- CC = cc
diff --git a/x11-misc/dzen/Manifest b/x11-misc/dzen/Manifest
index 205be111f55c..614fd65c2a97 100644
--- a/x11-misc/dzen/Manifest
+++ b/x11-misc/dzen/Manifest
@@ -5,5 +5,5 @@ AUX dzen-0.9.5_p1-unused-but-set.patch 2024 BLAKE2B 6dbcb15ac1e62f34a54f96a0a391
 DIST dzen-0.9.5.tar.gz 38167 BLAKE2B 92297cceca2215d812aa4536bd7421ab992a372667ca832de70a2bf43faea4b5e7beb147a454d7ced5be4e53085f4eaf15d752888ee019d799cd3bb8fcbdb6ba SHA512 ed4eb5d657d8f3822d8fbf224da5c2d415852c340959840051ec9cfc63f90361e09b9d36cb8221cf046ae66af02b9fab67f4f16c834c5895e801d452e4f8a916
 DIST dzen-0.9.5_p1.tar.gz 38178 BLAKE2B 9ec81747d6eec9b7cca58b11096e00548cdca7ba21a179599979cf9b22ff84100d266d98e7a3e419960a56fee788ae96158650884a1b1322def6a98a70d6683b SHA512 239acfcacbc871ded5755ee0d5cca3185fcd93142bcf81552974f2ffc19d9f5ebdc02956108931f58b35c68ac57ec6e748bdb9cdbf7791ec6e224ef270bda300
 EBUILD dzen-0.9.5-r1.ebuild 1578 BLAKE2B d67c414c9ecfa47316f9f8df899928f2c0c0cf5eaa34898b2445be7c1923bc74c7896425969b96ee13b173efce4653e04a11016a8b97cf11bb38ee584b097925 SHA512 e5f07cb9df6dd14af89441659de778470924cc4c681feaa176e9282a05f03186e0e7d14b7782d4fe2334471f19995658c80a11411240fa06a9d80f1a455a513c
-EBUILD dzen-0.9.5_p1.ebuild 1447 BLAKE2B a1b3a79419d6b508893c7b3f9c008cc2383865c4364c00bf15dfd8e6509316341647f021bb0314944959153cf7fdd28d16717280b21d90c9afabe6afdb598743 SHA512 a9c5ed171ef2112945658a6f4d6e9c81443c04ed5cf5eed6cdda2f42ea538ed676bfe65d6dfa7c3679dd4a51c54301cc260586ae0848897ee4449befbd3c7a28
+EBUILD dzen-0.9.5_p1.ebuild 1465 BLAKE2B 7a1b4332f1001bfb4a01cd7f431a3d5a95214b3f3c5366a12aec84c7e6cd6a4e247fc526837bb8beee5430e3ff9def819cd79c6bcfa457c5b93ab097183cd236 SHA512 d634a77533d3a9c1517b11f0497d5b7a13b91a6e625a972e4f1cc593785f2ef81f5de11fe39313b24eba784a8b922551b34c382bb6510c0a858a0b44b3edf1a1
 MISC metadata.xml 642 BLAKE2B 28355993f6f8edc43e8af4717523ae4dc0b249f88ee5a85bc20e23d4942084dfc29d43a71c9163f2a3bfa4555dca5648bd7682429527124502be4f2eef10288d SHA512 3f7b850582bdc314f4bbf795a3171f27ac8e9c41eeb56221106cb70f039ce37e62b43b2a09c21862cb6efe50e22ddfa45b711c809ba8347c52010188c2207e81
diff --git a/x11-misc/dzen/dzen-0.9.5_p1.ebuild b/x11-misc/dzen/dzen-0.9.5_p1.ebuild
index 38e2ad7461cd..f8b22d1c4b8d 100644
--- a/x11-misc/dzen/dzen-0.9.5_p1.ebuild
+++ b/x11-misc/dzen/dzen-0.9.5_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ COMMITID="488ab66019f475e35e067646621827c18a879ba1"
 
 DESCRIPTION="A general purpose messaging, notification and menuing program for X11"
 HOMEPAGE="https://github.com/robm/dzen"
-SRC_URI="${HOMEPAGE}/tarball/${COMMITID} -> ${P}.tar.gz"
+SRC_URI="https://github.com/robm/${PN}/tarball/${COMMITID} -> ${P}.tar.gz"
 
 LICENSE="MIT"
 KEYWORDS="~amd64 ~x86"
diff --git a/x11-misc/fbpanel/Manifest b/x11-misc/fbpanel/Manifest
index 4b8b7fddc963..194fa97cd782 100644
--- a/x11-misc/fbpanel/Manifest
+++ b/x11-misc/fbpanel/Manifest
@@ -3,6 +3,6 @@ AUX fbpanel-7.0-clang.patch 2596 BLAKE2B cb9e42fb7afaf007d49c54270ee6e09a551ee5c
 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 1362 BLAKE2B 7112c6973427fce7e21c758ee501e9bcf5d5e36d402426c2f1fba0d9ba3619d261a9285f8708c398138095b636d48f7e2cabb1196be55c4378838482b8ec235c SHA512 e749d3faf04576960808ace7adfb5c57fb9837caa0c877d6dca76a691b10fd7c66fd8ebcf3f0909dac15bceefd3044d4bc13acd2daf4828978709fcb85fda79c
-EBUILD fbpanel-7.0.ebuild 1338 BLAKE2B 04c909c0eddf4b032751e16e259fc90899f42d6b086515ebda1400722ce63ba66e0fb08bbafe19038fb0ac3e191e42d89272e046b7e30d16af97fc4b483b767e SHA512 114809d18d273bc6c69e951ebb537d3fe0e5addee25d7fdce480d019a08b2951a93caf4aaf141882e1a28f626048dd105ac3d42f7d1c9e3b34bb5ccd1d50c0db
+EBUILD fbpanel-7.0-r1.ebuild 1385 BLAKE2B 406c98a8f2fc48524a3fc0316cbe3f64171e2285d0e4525795a805a91e68e3ecb6ca10f934971c7439bdb2632d8a11f5d47d165420c2b44a843bbcbcb0b9f5c3 SHA512 d16f0c567c164a5dd2d63fc3c374602e28780b9066fd2425008302c4f12779ec8ae5ee924a39c266ef8285912863197b23bf4374b5d2bfa9bfbb4743808996e9
+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 4fa276907256..9acb74d5c5ff 100644
--- a/x11-misc/fbpanel/fbpanel-7.0-r1.ebuild
+++ b/x11-misc/fbpanel/fbpanel-7.0-r1.ebuild
@@ -8,7 +8,7 @@ inherit python-any-r1 toolchain-funcs
 
 DESCRIPTION="light-weight X11 desktop panel"
 HOMEPAGE="https://aanatoly.github.io/fbpanel/"
-SRC_URI="${HOMEPAGE}archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://aanatoly.github.io/fbpanel/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -48,7 +48,7 @@ src_configure() {
 		$(usex alsa --sound --no-sound)
 	)
 	echo ${myconfigure[@]} || die
-	${myconfigure[@]} || die
+	${myconfigure[@]} || die
 }
 
 pkg_postinst() {
diff --git a/x11-misc/fbpanel/fbpanel-7.0.ebuild b/x11-misc/fbpanel/fbpanel-7.0.ebuild
index 60b62d30aa6f..81e254f58b80 100644
--- a/x11-misc/fbpanel/fbpanel-7.0.ebuild
+++ b/x11-misc/fbpanel/fbpanel-7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -47,7 +47,7 @@ src_configure() {
 		$(usex alsa --sound --no-sound)
 	)
 	echo ${myconfigure[@]} || die
-	${myconfigure[@]} || die
+	${myconfigure[@]} || die
 }
 
 pkg_postinst() {
diff --git a/x11-misc/flow-pomodoro/Manifest b/x11-misc/flow-pomodoro/Manifest
index 233f3fde096b..69c9c98ef5fb 100644
--- a/x11-misc/flow-pomodoro/Manifest
+++ b/x11-misc/flow-pomodoro/Manifest
@@ -1,4 +1,4 @@
 AUX flow-pomodoro-1.2.0-qt-5.12.patch 1256 BLAKE2B b1316ed42f71418a2ce94421f8abb1f4ad560b6c39a686891e8ebc950c333e4bc9057a526fa7f408e2a75399e51daaa880cf22f266236b1def2b1d4a6a39b405 SHA512 ea42b0a7e66e3a1f6fd28f738fd0a1d78a41e506fa6e280e0f96162dd8890e669fa893c2e692f2ac259bcd9e6c9f8f6af68596895c48104ec733c2d7531c0b23
 DIST flow-pomodoro-1.2.0.tar.gz 661888 BLAKE2B 776322a4c7bac37a7c5db7e3776838c8e7365745df87fcda557611055890d586b4fd1baa285d33bbf2bb1c77923c8d4751787dfe88c32dcd7d36827e8f9ff80f SHA512 1f347a679fe85e4751166c6aa8af3fda06c57844c0be7116266b2203d061abd1631cb994c0942f3fea9209064d9a49a230248ac101156132aa66a519438acccc
-EBUILD flow-pomodoro-1.2.0-r1.ebuild 609 BLAKE2B f7b94f1b39e31f6239eb09440dd6a224bce9555ea57f52d0c9059f2be6b9fbbb957a475752480d5f7b29bb219c595ad8939c3ef0275316f9db293f72a1bc223b SHA512 707f974e6380e8a5e17359f2a91641342f0d09ceb5ceeeb9771927e4f93ca576348931fc4960e403bfaae0543cee62c74aa6fc7e46f3503de51902d3d6166aa5
+EBUILD flow-pomodoro-1.2.0-r1.ebuild 603 BLAKE2B 83e6e623975a609027661bb7263eaea00d8c2093318e4c30873eeb91b7cc39f82f1ddf177aa04fc9b7720213836a09e9299fe6203b3bfd5f27167771cfdc94d6 SHA512 2e8ad96bbd9f9ea199017eb2f73de6b29e91eb2e1b736b1326179fbe1fe7a507adae5cbce632ce2c9be56376a66750c0e91226164e0d1c5ca31a00980d45cf1b
 MISC metadata.xml 255 BLAKE2B 5c67c73b2cd0f3e2c0018103d3b5102c4cabdc35284f694385460e3b6ee7e2a1b9697b1e43e09ef601a14990fae3fd011314f5260a50398c9d878adf2adfab4f SHA512 e132f603e6f94db054583ec2884465f2bc459af138fb1263e49f454166ea4bb750c2c4591e0ed8c385382dbfc5f246316c3b2995aebe094131103cac53046b3b
diff --git a/x11-misc/flow-pomodoro/flow-pomodoro-1.2.0-r1.ebuild b/x11-misc/flow-pomodoro/flow-pomodoro-1.2.0-r1.ebuild
index 4285248dec78..f0895523101e 100644
--- a/x11-misc/flow-pomodoro/flow-pomodoro-1.2.0-r1.ebuild
+++ b/x11-misc/flow-pomodoro/flow-pomodoro-1.2.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="A pomodoro app that blocks distractions while you work"
 HOMEPAGE="https://github.com/iamsergio/flow-pomodoro"
diff --git a/x11-misc/gtkdialog/Manifest b/x11-misc/gtkdialog/Manifest
index 4189aa34c6e2..cc3946e090ff 100644
--- a/x11-misc/gtkdialog/Manifest
+++ b/x11-misc/gtkdialog/Manifest
@@ -1,5 +1,5 @@
 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 818 BLAKE2B d0821fb5d6470c1a8996e7f69be5c779c06001f7bccc7d280f90cfa1d6aa6ea1d4a70964a30275ce96bb566088e935c5680ed651e09fea8931f0142a0b00cd5a SHA512 7db7be5b52ac5be6532fc9d0e51f009d4c6dac85c19c73a35069ac5a3acda275d5821880c8cee2bb806dd442ec901dc2f120fdb7b0de10267e30ec49f6cc4947
+EBUILD gtkdialog-99999.ebuild 844 BLAKE2B 104a0056c4d2c2f2e27a139de0744c0e88d4189028b401753a47ceab2107abce147bdc9239f91cf9f3eeb2a2b36d9893f438a4d16d5154dfc71d3a56c7aadd86 SHA512 4f7ffb05409162b010dfb1adbd1cec27aab26e8c7546bd738c6e2db34ceab82532584c72b98357a7fc6da6e7e03575a3419b8abd26a8c7115233c96b99d7fe34
 MISC metadata.xml 1061 BLAKE2B bda57a1f52134507775d030d4fbf19704ab69b138635ad6001e12e13a779390f7d8b3640dcab4696da1bfd267db4b772d5e5ff233b7ec1d0ff2feee90e9648ab SHA512 90b0871d127602aef6b3066f32c8b7abca20634afdd4879ca06fbfd1971ff3ea0d03165e076912cabd1ae0b730f1621999c220ce9fe195700a778a11c71adb36
diff --git a/x11-misc/gtkdialog/gtkdialog-99999.ebuild b/x11-misc/gtkdialog/gtkdialog-99999.ebuild
index b9843533462f..d90e208f2ef6 100644
--- a/x11-misc/gtkdialog/gtkdialog-99999.ebuild
+++ b/x11-misc/gtkdialog/gtkdialog-99999.ebuild
@@ -6,7 +6,7 @@ inherit autotools git-r3
 
 DESCRIPTION="A small utility for fast and easy GUI building"
 HOMEPAGE="https://github.com/oshazard/gtkdialog"
-EGIT_REPO_URI="${HOMEPAGE}"
+EGIT_REPO_URI="https://github.com/oshazard/gtkdialog"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-misc/i3lock/Manifest b/x11-misc/i3lock/Manifest
index e75c367fec5b..b4257d1b738b 100644
--- a/x11-misc/i3lock/Manifest
+++ b/x11-misc/i3lock/Manifest
@@ -2,7 +2,7 @@ AUX i3lock-2.11-version.patch 395 BLAKE2B dee64a9c8b255e3cbadd27419929da66a8fe66
 DIST i3lock-2.10.tar.bz2 23171 BLAKE2B 1c1d0f8e3a85dcebe4a9ee181e399a4ff447ececfbdf5f9488df849316e47233118b7436c269a986fed4e907e6162f3758c8bdad2d20ac156e95a8be185a744c SHA512 ea865b202668212b58d0b97d0263171847e1bd0c529e2fd3d26c15ef253861b9a8357ff2efaa6a4f342c4d0d1ab03bc00f95f4d4008760ec8e0767ac29195517
 DIST i3lock-2.11.1.tar.bz2 145434 BLAKE2B 9a2ff0be922162710f9dbbf597f93ad939684641d2264c6ed38dc8a7eeb77c253f61aa1a2e873f03de2c8cc6d661e79ff166e4302c423261a65f66582749c962 SHA512 8b779aa0a560884adc1a508e1f07f712bdf043f72c377c24d5e7e186a6b97f34a5bda7aa67de41f5e15a1a541f4a2c2d28bc284057926a5833d70b67437d073c
 DIST i3lock-2.12.tar.bz2 147521 BLAKE2B 38ae5b4d6a92f918bc432e425301e8d04f9cc3bf8569e5f4e443dafed5aba19abf6604bfa102bc00ea5db87052583f1e9927a4f8e55906545b501829d95081e7 SHA512 84f1558368381bcad9a64f41ab6134a6614dea453d1ee5ecfe886185b9e1baebeeca446c4635158deb8dae5b25c09d47d3990239d76c44e5325ca5bfaad9b2ad
-EBUILD i3lock-2.10.ebuild 668 BLAKE2B 00d134bee246cfba1f0298b643567b7391957ab1b14f6af870be4bb652ddf946af7e5dede7d6e2c3d633e7f8d73ea227cbd7064664caa12b69d3c91ecbe8d5d1 SHA512 1bd9ef51ad54be02c1a4453a3f475d5a31b7cdfc86894a9209bdddc377161b28839b7e2a78f0f6bc0f33df6978b3349f146c7ddc8c31761e3916a7953c098ecd
-EBUILD i3lock-2.11.1.ebuild 790 BLAKE2B 8a311c12cc01d3e28eeb46bfc11de3780d3104f10404b292c2de6a6c5ea9f71f9ae01d3a4d97c54f03b50d2b3f2bfd541b246bf5f74f261ef44e87f935d545af SHA512 77586791aa53395f6827ebbd848bc7815c158f3f4f1ab388515406aca200372e02d153cb252539dd6a73b87fa0b98d1cee4dd18ce396eea2aaed7fa2761d36b0
-EBUILD i3lock-2.12.ebuild 738 BLAKE2B cf3794a2ddb8bcd09bae4eb505715d07a236ced7584a034c90b418e628be093549c437db8b4440f6e6380fdf9ee8c22a94b9c7dc03d2a55e917bfc79ecbfdae5 SHA512 0271a8fe2098bad84dd51369248b08451fd433f7e9194ebba9969aa21990de23e52da9a5b07539475e63f338a3cae0b7ccba035b48d529a2ae6e077004b5bf78
+EBUILD i3lock-2.10-r1.ebuild 673 BLAKE2B 1706e64f32323b9d697ece1413703ca9b460b593520c6421dcf9d8736a969e03d562679f6eb558071d3fcbaa8128b69a010c5c4780239fc0ed5db50d3a6240e5 SHA512 f9dcf41c09e2339f78de5c05877e8d7555a857d0084b8f5e72215fe15c0ed72c1e75378e8afcaf117b92a2ef22d3ebde33142b5f341eb67e7b6eafd12e09295a
+EBUILD i3lock-2.11.1-r1.ebuild 795 BLAKE2B da18598d18c47b6642cf2e3dc70e136fefb066165ede2eb7bd2fdac87dffc59d5a51d55903b81d0d9083b4fb7ddfcbc528ccb743d0b7ed1fb67e0a5772ced37a SHA512 b4b1e34a2eaddd28a7b13c363548b4ed0008a39bd9d02018e06943ce7b65db1d3beafd966ec7d5f534aea2e9b915d7dde9f8108ce8b47c900f9604b9c07a41ab
+EBUILD i3lock-2.12-r1.ebuild 750 BLAKE2B f34e40403d027603c8cc2b4f1c246dc4c26f5e1de54c462c9e6a3b95bd36613cc1812591ec36094cdd16fbef2d2b7853aad08ec8797f5f85c42dec4dc9d92754 SHA512 be305300b6e01a7a381d2b2954f36d355907296fbedc5da698c77be9d3e8d6cf03178b50ce6169d9aa4708fd6e94a5d517744624f49b0cca5aefe6371e3381da
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/i3lock/i3lock-2.10.ebuild b/x11-misc/i3lock/i3lock-2.10-r1.ebuild
index 327b500143e5..7d7b4a6ef2dc 100644
--- a/x11-misc/i3lock/i3lock-2.10.ebuild
+++ b/x11-misc/i3lock/i3lock-2.10-r1.ebuild
@@ -18,7 +18,7 @@ RDEPEND="
 	>=x11-libs/libxkbcommon-0.5.0[X]
 	dev-libs/libev
 	sys-libs/pam
-	x11-libs/cairo[xcb]
+	x11-libs/cairo[X,xcb(+)]
 	x11-libs/libxcb[xkb]
 	x11-libs/xcb-util
 "
diff --git a/x11-misc/i3lock/i3lock-2.11.1.ebuild b/x11-misc/i3lock/i3lock-2.11.1-r1.ebuild
index 855ba37b6d0c..494b93dbda3d 100644
--- a/x11-misc/i3lock/i3lock-2.11.1.ebuild
+++ b/x11-misc/i3lock/i3lock-2.11.1-r1.ebuild
@@ -16,7 +16,7 @@ RDEPEND="
 	>=x11-libs/libxkbcommon-0.5.0[X]
 	dev-libs/libev
 	sys-libs/pam
-	x11-libs/cairo[xcb]
+	x11-libs/cairo[X,xcb(+)]
 	x11-libs/libxcb[xkb]
 	x11-libs/xcb-util
 	x11-libs/xcb-util-xrm
diff --git a/x11-misc/i3lock/i3lock-2.12.ebuild b/x11-misc/i3lock/i3lock-2.12-r1.ebuild
index e1d59ce65c9b..abd8afdc45a9 100644
--- a/x11-misc/i3lock/i3lock-2.12.ebuild
+++ b/x11-misc/i3lock/i3lock-2.12-r1.ebuild
@@ -10,13 +10,13 @@ SRC_URI="https://i3wm.org/${PN}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 RDEPEND="
 	>=x11-libs/libxkbcommon-0.5.0[X]
 	dev-libs/libev
 	sys-libs/pam
-	x11-libs/cairo[xcb]
+	x11-libs/cairo[X,xcb(+)]
 	x11-libs/libxcb[xkb]
 	x11-libs/xcb-util
 	x11-libs/xcb-util-xrm
diff --git a/x11-misc/i855crt/Manifest b/x11-misc/i855crt/Manifest
index 668a2e70c16c..247d69747a01 100644
--- a/x11-misc/i855crt/Manifest
+++ b/x11-misc/i855crt/Manifest
@@ -1,4 +1,5 @@
+AUX i855crt-0.4-makefile.patch 351 BLAKE2B ef060908432899a333a29fe12d393d3d2d99d76d0619b071c0457b592c17edc0bf9af6f6994bfbcd73fdfd4bacd580387be1483e7a851ec88a38df532babb3b2 SHA512 41a96234b1864d04089c64a7859ec25f1388af519e107c5760954366d497a13dc6d623c5d26e870d52bcc8748e23b760662101a4205b2489aa002f25306155ac
 AUX i855crt-i915support.diff 2128 BLAKE2B 1fc795cafb494e084d2233bdebe74cb1881a9d14e2c78662a6ec4d7e24554734938a8f58cc723e2bbd4f70b5e2aa7080b13b7a2806291f9b5e934fbb5e3d9ea5 SHA512 96049b926a2007915bdaf71ba2252bb6556711d66b45eac69ee3223557e892ba8d742b520406a6f7fd20f3091f194015aec59613624abc1efaee5caad090caf4
 DIST i855crt-0.4.tar.gz 65209 BLAKE2B a7c8e041cb66cd711e1cdf7ac1ee0d6d218377b5c1183c11c658d3345de814a21b9eab0c4579c56db316a3b5fb3e430774174100f989c921e86650bc59adc1ee SHA512 8bd6d05334bcbe75f85c128ffe1179368fcf94bb0ba07c2ea7ce9b6ed38252ffc5dcd7a3208f6524be064bea595abda5a29f6a2960ad9f2f7b6f6ba528c36290
-EBUILD i855crt-0.4-r1.ebuild 788 BLAKE2B 5694078bf6622ddc2869feeb536152f9beb18679cef296997ef6f1609e017c8eec96ccdd942f9a6869e248f4c7ebce4cad76e2838f5e46b3a493cfaa36433c2c SHA512 b2991656fa107019087e67ec6619b6c32900d602ef0a281785f44f2364b789cdb6927a2f2f9e99e8663ab78280c06bf1bd923d532b42b56a63033aed849eacc8
+EBUILD i855crt-0.4-r1.ebuild 719 BLAKE2B 47c38eb6e2af17e18d18c0c8432632abc63af1667f0dc86c9fe0c91d49adfa9936a92515465454baade689e8860611c5d1d56d9129ca631a4353ababfc03f34d SHA512 69dd89bc2b25da213a1fb33d0e19d99cf4b2e6ca28d64de321bce4dafdfd1fd77359e067211aca9fdd0c13458bda6be00ddc0a6cf668d0090e3c1d72607ee3bc
 MISC metadata.xml 522 BLAKE2B 8fa6ae297d63f47e01804550dc1868c715638989f87eedd2e0d49b07c00e2cd96657ae533724ab07a21e451cb3d9c83a1a6574273e3f063fd6c66f820d8dd1c4 SHA512 9d25abeb609fb82b751a8efd9f386ffd877bf959705436c28c0caf772838124afe37c6a4f6fbb10ac827de01de33748583283cc5c0518a842a2feb1040d7f36b
diff --git a/x11-misc/i855crt/files/i855crt-0.4-makefile.patch b/x11-misc/i855crt/files/i855crt-0.4-makefile.patch
new file mode 100644
index 000000000000..e7deffb4d30a
--- /dev/null
+++ b/x11-misc/i855crt/files/i855crt-0.4-makefile.patch
@@ -0,0 +1,16 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,11 +1,6 @@
+-i855crt: i855crt.o vmodes.o
+-	gcc $(LDFLAGS) -o i855crt i855crt.o vmodes.o -L /usr/X11R6/lib -lXext -lXv
++LDLIBS = -lXv -lX11
+ 
+-i855crt.o: i855crt.c i855crt.h vmodes.h hw.h
+-	gcc $(CFLAGS) -c i855crt.c
+-
+-vmodes.o: vmodes.c vmodes.h
+-	gcc $(CFLAGS) -c vmodes.c
++i855crt: vmodes.o
+ 
+ clean:
+ 	rm *.o -f
diff --git a/x11-misc/i855crt/i855crt-0.4-r1.ebuild b/x11-misc/i855crt/i855crt-0.4-r1.ebuild
index 1b8581227cd6..25df8327c91c 100644
--- a/x11-misc/i855crt/i855crt-0.4-r1.ebuild
+++ b/x11-misc/i855crt/i855crt-0.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Intel Montara 855GM CRT out auxiliary driver"
 HOMEPAGE="http://i855crt.sourceforge.net/"
@@ -12,30 +12,31 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE=""
 
-DEPEND="
+RDEPEND="
 	x11-libs/libX11
-	x11-libs/libXv
-"
-RDEPEND="${DEPEND}"
+	x11-libs/libXv"
+DEPEND="${RDEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-i915support.diff
+PATCHES=(
+	"${FILESDIR}"/${PN}-i915support.diff
+	"${FILESDIR}"/${PN}-0.4-makefile.patch
+)
 
-	# respect CC, fix underlinking
-	sed -i Makefile \
-		-e 's|gcc|$(CC)|g;/LDFLAGS/{s|$| -lX11|g};s|-lXext||g' \
-		|| die
-	export LIBS="-lX11"
-	tc-export CC
+src_prepare() {
+	default
 
 	# upstream ships it with the binary, we want to make sure we compile it
 	emake clean
 }
 
+src_configure() {
+	tc-export CC
+}
+
 src_install() {
 	dobin i855crt
 	insinto /etc
 	doins i855crt.conf
+	einstalldocs
 }
diff --git a/x11-misc/iconbox/Manifest b/x11-misc/iconbox/Manifest
index f31491593472..5f558e45b1cf 100644
--- a/x11-misc/iconbox/Manifest
+++ b/x11-misc/iconbox/Manifest
@@ -1,3 +1,3 @@
 DIST iconbox_0.2.tar.gz 14739 BLAKE2B f4f69ab84fef88de31767a57cac16883c0ca405581e50041d2426c005d16ae2aca82f76ae1fe78c5c53473e2a85667609deca6397bc8ef8912f5730921f1770c SHA512 66b83fad9535667221ecab7fba0e47ecad0ddcc6d67d9baae8e855545bb6ae50ddfa890157ebd0f43fecda384e95ac85bb5b4d47bd0902cc0f47e270b9331b6b
-EBUILD iconbox-0.2.ebuild 496 BLAKE2B 28c3750d63c9154b8981b08a70e4810d90c0c6b65cf938aae53354eae2c99ff8637664efead7610e31e34a5770da2e9a6724ac1fe6f4c718a815f542f7e1e674 SHA512 f6bb3c2b01252749c7ee02d25cddf8bc45e0e38640d427cbbebe60f2b8168b4e583eab0becf35c1d8e883af9e2deb397adb7e345774eebae31d87eb5c4e7cbc8
+EBUILD iconbox-0.2.ebuild 473 BLAKE2B 4eb398d56035c4f1dd1f9c26283734ed17d09e0cd3073d4c6860bea97f1495b58a5e0f05664ed62054c318f0d44303bc49d06962c52feaa55dba9686ff88941a SHA512 86687f7754adf047cef301f41944f9d3a023a3ddccb9f9e03fabbb5e5422918430ee8238e243ffa3f27582ce147bc2585cdff7e081f78b85ba7b26525fe5c5cd
 MISC metadata.xml 672 BLAKE2B 64903bdc6bdc4a86ce339d07118376ff503f42fa413c23b5a5eecb967b8f577915a6da5c4869dd15d9fa336543301215fe5fcec3c64e6ebdfdbcd1392b186801 SHA512 f82da2066609c52030b0f546e9a1cefa5f6030015744f686f0dc59523ea76d55679993979d403127381b0f1ea87600878d22359ccf422d7d34e9d44c7cdec9f7
diff --git a/x11-misc/iconbox/iconbox-0.2.ebuild b/x11-misc/iconbox/iconbox-0.2.ebuild
index 7a1b08baee65..5e38129b6e8d 100644
--- a/x11-misc/iconbox/iconbox-0.2.ebuild
+++ b/x11-misc/iconbox/iconbox-0.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 MY_P=${P/-/_}
 
@@ -12,16 +12,17 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
 
-RDEPEND="x11-libs/gtk+:2
-	dev-perl/Gtk2"
-DEPEND="${RDEPEND}"
+RDEPEND="
+	dev-lang/perl
+	dev-perl/Gtk2
+	x11-libs/gtk+:2"
 
 src_compile() { :; }
 
 src_install() {
 	dobin iconbox{,conf}
-	dodoc Changelog README
+
+	einstalldocs
 	doman *.1
 }
diff --git a/x11-misc/j4-dmenu-desktop/Manifest b/x11-misc/j4-dmenu-desktop/Manifest
index 9fb69656fde3..05469706d543 100644
--- a/x11-misc/j4-dmenu-desktop/Manifest
+++ b/x11-misc/j4-dmenu-desktop/Manifest
@@ -1,3 +1,3 @@
 DIST j4-dmenu-desktop-2.17.tar.gz 33531 BLAKE2B c1dd82a444efdbbf2af644ee6cdba6746a81228c5f6b2d212d5ea248628855f1cd1c4dff091ae278eb8c6458db4934b60acd8e2dd9a9c88b32537e76878824b3 SHA512 7a41bb60a6b3afa7bf6229f08674d5f31e0152d0788a17edc210986d1b1f0d4fad13ffaa13c58ed7a0c5d2e67f8f95bb2a0f6556aeb0f2cc24c7d885b346325e
 EBUILD j4-dmenu-desktop-2.17.ebuild 844 BLAKE2B c7a6cd3d14f91e26e27012b8d47828753d3c966d146a10feb177aab0153cc6870266f7bc2b14cd24032ecaed9516c14ae3adddcd49b100d2b686df227fc6d3e4 SHA512 74f3fb875e880382c82077aafbb2a9c2174befb17456cf8601f18ff21604805c44a6152fe07513137b3d08c86411257a79832d5e82b750165a0c54e66d769070
-MISC metadata.xml 816 BLAKE2B cb61f2be4ec787970ee3d4493c8ff12582909778f99b2825bd6fd8305c8af9027aaa81ad7dc63d41562eb4aa4d0a176c0e20c8b6d2943121a8adb05da69489ce SHA512 b497342b293354d1928ac44072b2e5cda1ebc7f7027b346e6c55326e69ad843da0828abbd5e1b40e091d628c4f00f9889936c0474433bdd515e856d551dd372a
+MISC metadata.xml 590 BLAKE2B b2f14516c9e17b71672913561ff260cb2cf7ff25d54eccacdbbfd4419224518815c0990ac2c29d7de087b86dac7c5b25be31f25993fb8a8f5b004ad5fe7cc5f3 SHA512 131576f1a9f0ccaa9cc79659e3889371df0a200d7184d1a8efa365ee089353fab875e55bd14d0a01e92c32583f3cafaacd18e8f8282300480d9cf67ad587d3ae
diff --git a/x11-misc/j4-dmenu-desktop/metadata.xml b/x11-misc/j4-dmenu-desktop/metadata.xml
index 6e9c2be5fb2b..4e3a92938dfe 100644
--- a/x11-misc/j4-dmenu-desktop/metadata.xml
+++ b/x11-misc/j4-dmenu-desktop/metadata.xml
@@ -5,14 +5,6 @@
 		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>sir.suriv@gmail.com</email>
-		<name>Diogo Pereira</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		j4-dmenu-desktop is a replacement for i3-dmenu-desktop.
 		The purpose is to find .desktop files,
diff --git a/x11-misc/kdocker/Manifest b/x11-misc/kdocker/Manifest
index 7c8dce740d3c..8924001c2c7e 100644
--- a/x11-misc/kdocker/Manifest
+++ b/x11-misc/kdocker/Manifest
@@ -1,7 +1,6 @@
-DIST KDocker-5.1.tar.gz 173340 BLAKE2B a15b833fba2a2d1e3f1b55ad4d115cb09f55a57981076332fc86b1e607bac470705b8bc909d15ddd912b43d301e8c217b1fd175947879f053b250d8684556424 SHA512 df5880e1c19a436ef6b8ee92426f989b77f4dfd11f3a6a2357f425419ea61cd69f51250a10e92962a893611f0a14504f698ccef09322d62d20f5d49a506c4a12
+AUX qt-5.14.patch 1037 BLAKE2B a6169aa7146a7e387cfba090177dea98a42d2311fd912deff98926b57f48c86bb39fa48ede81438a735f96de28eae0ec8e41f54641f03f9e67d06f7effda66ce SHA512 8c25af73914b2070aea45c173aad5f4a833e861d734d1d449d28ed595c542c001430af7f324489c6cc895adb7e580d98f41300c6d292eaa3ef3eb8148c3c4abb
 DIST KDocker-5.2.tar.gz 173508 BLAKE2B e44a924a085c2d237c113028f40a98cfa8a8a5398525aea4e38fadabd23a10cc91648a55f800afd2ad398b744ad450d9c7bc26dd5bae994603f6ea4b322b5804 SHA512 1a98bf7b6360f4ce042b3e5330798076d42bd463c16e41b259706811f11516a34acfb0ace59f2c10c07aa6b2ff8fc57b1b1fa3ccdd33d452e220ec46446e8b64
 DIST kdocker-5.0.tar.gz 152222 BLAKE2B b4e60a28f497476503f2a40aee4a776ece3a052adce4d29cb75095d9056ba0d6e4993838d6f771fad08532a3fb6d4022a07684f47cbd72289d34bce7196347aa SHA512 7c7702000621204d7e4acab295d43d05f71982af91524bc237878bdc9aa8851dc01a718bbe32412f46c718a1e358de8e710489a4beba9ef5b39359fe43662ba3
 EBUILD kdocker-5.0-r1.ebuild 964 BLAKE2B 34d68d6a6ce1518555e1312026e10aa8e92835c0e6600ad3d3a70b369650df76a568711e3a33727d1700db7dc9efaa7976ed0c7ad0a9633b3f497ba54c546044 SHA512 81d41b24645b5afab09d08f983fe29733ddaa8859df52e357d78258659cbe2e585f5fb3e47cb30cadb1138e3c1d6a5de3d7abbd046ecaf25134bda295eca2634
-EBUILD kdocker-5.1.ebuild 1085 BLAKE2B af70e64fad198e5689fb2a3ee7c0be8a72afe716cd783ea1254ecd6745f62dafae1c2822818d5012b1602c817b5cfc7bf8b8fb8c5e65c07abd4ae378ef429340 SHA512 d3c4319dadfa7353c3ccf8244868aea2e2db2246f981214e7fb725c9b12a9b51499902a02032d675af629b5e858460838b7c6c5025053d38020f20fc9c2fb8e1
-EBUILD kdocker-5.2.ebuild 1085 BLAKE2B ff54c8cf21bc4630b291121ba7f4775b80dd50c419b3296fb8c7c3f11c59470b30b45ff955aa852eb457366145dfcf4f7d0f2ebf84530eb79cca9125f5760494 SHA512 b768dcd72dea6333b4408823e9b57dc6f92d413f52f5122a29cb8fc5c7811abc754363fed72cd5f3d36830a7864a7ae4c9cddcc6e688af0a826b5167ce22e43b
+EBUILD kdocker-5.2.ebuild 1025 BLAKE2B 8d3687ad7c32b7718d80a7f7b8e6c3f47774ebe4bddf36ac6859fa50c1fda78f870bf82b089433a0b372bab874ee63d4fd6bcd62a793be9582ffd8e839a18ec8 SHA512 285ef72f1cd6e018edf7bae87b439e9c05d2be0668449661bc99525471b114ae9a071ce4709d078557dff57c37ce51db812c32f22c6b7f763934e0612d530507
 MISC metadata.xml 513 BLAKE2B 74790e6c3a0503c7092152bc6b74850ef0c2ae5fedc71a1ac887775054b5965a8c13aace575792488ee443552d17a5f2f5732d92255600a00082911857c9541f SHA512 51f230ff4133f037ad1d92a18224004d27d0382efe842cd9c3d012f4589c611f9788d333c5bdd33936964aabcce4d96d790a4045b6a3cbbd37fd11597a3a5ea0
diff --git a/x11-misc/kdocker/files/qt-5.14.patch b/x11-misc/kdocker/files/qt-5.14.patch
new file mode 100644
index 000000000000..ca1237965aaf
--- /dev/null
+++ b/x11-misc/kdocker/files/qt-5.14.patch
@@ -0,0 +1,38 @@
+From 1579ee388749a7b056ccdd8ef2d4deafe21bd3e7 Mon Sep 17 00:00:00 2001
+From: Nikos Chantziaras <realnc@gmail.com>
+Date: Mon, 30 Dec 2019 16:03:16 +0200
+Subject: [PATCH] Fix building with Qt 5.14
+
+Qt 5.14 introduced QActionGroup::ExclusionPolicy::None, but <X.h> defines a
+'None' macro. Work around the resulting mess by temporarily undefining the
+macro.
+---
+ src/trayitem.h | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/trayitem.h b/src/trayitem.h
+index 7698ea4..4b54cdd 100644
+--- a/src/trayitem.h
++++ b/src/trayitem.h
+@@ -21,6 +21,10 @@
+ #ifndef _TRAYITEM_H
+ #define	_TRAYITEM_H
+ 
++// Qt 5.14 introduced QActionGroup::ExclusionPolicy::None, but <X.h> defines a 'None' macro.
++#pragma push_macro("None")
++#undef None
++
+ #include <QAction>
+ #include <QEvent>
+ #include <QIcon>
+@@ -32,6 +36,10 @@
+ 
+ #include "xlibutil.h"
+ 
++#ifndef None
++#pragma pop_macro("None")
++#endif
++
+ #define DEFAULT_CustomIcon        QString()
+ #define DEFAULT_BalloonTimeout    4000       // 4 seconds
+ #define DEFAULT_SkipTaskbar       false
diff --git a/x11-misc/kdocker/kdocker-5.1.ebuild b/x11-misc/kdocker/kdocker-5.1.ebuild
deleted file mode 100644
index cc8d8ab4af6c..000000000000
--- a/x11-misc/kdocker/kdocker-5.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 qmake-utils gnome2-utils
-
-MY_P=KDocker-${PV}
-DESCRIPTION="Helper to dock any application into the system tray"
-HOMEPAGE="https://github.com/user-none/KDocker"
-SRC_URI="https://github.com/user-none/KDocker/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtsingleapplication[qt5(+),X]
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libXpm
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS BUGS ChangeLog CREDITS README.md TODO )
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	default
-
-	sed -i -e "/completion.path/s%/etc/bash_completion.d%$(get_bashcompdir)%" \
-		kdocker.pro || die "sed failed"
-}
-
-src_configure() {
-	eqmake5 PREFIX="${EPREFIX}/usr" SYSTEMQTSA=1
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/x11-misc/kdocker/kdocker-5.2.ebuild b/x11-misc/kdocker/kdocker-5.2.ebuild
index 43c6d71eef65..a97ab33e91ee 100644
--- a/x11-misc/kdocker/kdocker-5.2.ebuild
+++ b/x11-misc/kdocker/kdocker-5.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit bash-completion-r1 gnome2-utils qmake-utils
+inherit bash-completion-r1 qmake-utils xdg
 
 MY_P=KDocker-${PV}
 DESCRIPTION="Helper to dock any application into the system tray"
@@ -29,6 +29,10 @@ RDEPEND="${DEPEND}"
 
 DOCS=( AUTHORS BUGS ChangeLog CREDITS README.md TODO )
 
+PATCHES=(
+	"${FILESDIR}"/qt-5.14.patch
+)
+
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
@@ -46,11 +50,3 @@ src_install() {
 	emake INSTALL_ROOT="${D}" install
 	einstalldocs
 }
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/x11-misc/kronometer/Manifest b/x11-misc/kronometer/Manifest
index 51bf75a65de3..9acd47d71215 100644
--- a/x11-misc/kronometer/Manifest
+++ b/x11-misc/kronometer/Manifest
@@ -1,3 +1,3 @@
 DIST kronometer-2.2.3.tar.xz 124208 BLAKE2B f9d91bf19ba64e2c337b8181e2529b409a450c1e821c6b1358a1d57627959c65b5c4db0acd15a4c8f4cd3fb12197ce6a1bf3b95d4dc4922409223b528f5f62aa SHA512 77f948ae3a03b15a0cd49bc1048897bff0788a4831beff8f336270d8af6ee1a245d2174f5a3adc224257e9f319958197af7900ce8389b312f8fe7cd6c53a71d1
-EBUILD kronometer-2.2.3.ebuild 780 BLAKE2B d36bcba9f9214a0b621587ef5849bb8c1479589ca6bb782814c3ef99a703938cb1cc46ddc3a67e3c8a647bdb78a3b0802867da2010ac526086a343e88fb1d2ae SHA512 2dbbcb04fe9d530cb9c5f05d47ee3943ec727c61f4c805d3f3341444c4d3e0d8a20a4124f18a3878e76f3b85f83fad38eff5215761d806423395fa5f775d34d4
+EBUILD kronometer-2.2.3.ebuild 874 BLAKE2B 4e94f281f159d711a4265b23b5a9db01af692336797d15f23232cf08e3d62cc61a7c0c8400a2e4d6ce462564a545f9e7e64c8c00f2027cc88faf7a5836a8c60a SHA512 a7aac849975850ebb17cb057fc6f39a2719e6ea51450192de4062c80a6e55181e1c1134bdcdb754be860b27ba71dd4edcc647511c90757befe506ea6af754d77
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/x11-misc/kronometer/kronometer-2.2.3.ebuild b/x11-misc/kronometer/kronometer-2.2.3.ebuild
index 906074ce0a76..f4e6e80c584b 100644
--- a/x11-misc/kronometer/kronometer-2.2.3.ebuild
+++ b/x11-misc/kronometer/kronometer-2.2.3.ebuild
@@ -1,31 +1,33 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
 VIRTUALX_REQUIRED="test"
-inherit kde5
+inherit ecm kde.org
 
 DESCRIPTION="Stopwatch application"
 HOMEPAGE="https://kde.org/applications/utilities/org.kde.kronometer https://userbase.kde.org/Kronometer"
 SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
 
 LICENSE="GPL-2+"
+SLOT="5"
 KEYWORDS="amd64"
-IUSE=""
 
 DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
 "
 RDEPEND="${DEPEND}"
diff --git a/x11-misc/libinput-gestures/Manifest b/x11-misc/libinput-gestures/Manifest
index bfb9e13a21b9..6d1061c519b7 100644
--- a/x11-misc/libinput-gestures/Manifest
+++ b/x11-misc/libinput-gestures/Manifest
@@ -1,8 +1,4 @@
-DIST libinput-gestures-2.41.tar.gz 18098 BLAKE2B 792ebab29cb5ea24cbb696eac6ed651632db4079d8470784f45a1055d99c9672f8bfa7e8ddc08b80417c91a47f540fdf13f7a071c73bb7a654ce66508f181a38 SHA512 7f718275d5b4b722df52adb597f0344427500ca730c154cf6fd3de2f06d7081e6214cc954addc34594f17f10c70d081fecbfc1a22d16726b6ea820019dae6d83
-DIST libinput-gestures-2.45.tar.gz 18645 BLAKE2B 555556e683eac1944407e169d7ad9cac23fe3b91b781dbba9367b86bd73556d3e0aa550008563c4c7f6726a12dc6ac4a458f9dae5782db0d8a23dc2f12a897f8 SHA512 27eac34826c3f02a16bb5c6c892e2bcc12ed27a8a1cb64bde945e869161f30701240deebbd278318f418319f1c98be13dc90eb95f9354f624939af4b7471762f
 DIST libinput-gestures-2.48.tar.gz 22858 BLAKE2B 67fada253a0d02791e14c6c2175f37f75c2e4ff04b04360070d1c045cf064a9d7b362c28a1e8130e6cc435bd487370c69ded3af41d53b935f7024d722aca9593 SHA512 6ad510f2067ab6cef9c9a94f1c300fe91aa811904a0e85209dc06b3afdd4a2be8ae7bda8ccb40210cc59c3758e3b14b53285f7c3c29c6982a3894952b678a840
-EBUILD libinput-gestures-2.41.ebuild 1302 BLAKE2B 5e9c5767d82dee15a9dedfecccfe06ed93b1c828e39926f883ab28d08afc3c8aec63020cb23f18e54fe57baa8f48694cc3a2f1e59c820c47204633c835d4eacc SHA512 a594e23bb52e4ceda5a35c03df6dc392d777d717e055c9eca58e442ea516a74ee0aa47500cf264e79b335776d0498b659e39392c61ccdf4a9eb710cc6a839c65
-EBUILD libinput-gestures-2.45.ebuild 1293 BLAKE2B 61bdc8a6c7dbc604b3359f576bac1964bd260d54da3e7d255aba5d48ab191f4e753445fc58fb2230e77b2d9fdf3d7ffacac78b9cb8561f673f9f9e32435049ea SHA512 fc74cecde6abffe6929d140e6d307533e389b8841c02323785492fc6b22d976be786df3acbd7dd69ac8d6f1f7964debc562077f8ad6e1e7a8cb9da4d6c9eeaa2
-EBUILD libinput-gestures-2.48.ebuild 1293 BLAKE2B 0e10f5dcb9384c9365a1b37cd3d0bf3edd5f95f5468b40f965ac01fdfaa74d526f81752347563633b4c4a4d9d5c7be391b2c8cb0271594f6581dfdc6dfb1473f SHA512 0490fe3da3b88e2ea14462633fc1071759d174315cb276bc89f6468f07d6585a6089b8346f70e9b24fcc5067c1babcfa77c806da85bfd69668d059bad6a1cbd0
-EBUILD libinput-gestures-9999.ebuild 1293 BLAKE2B 0e10f5dcb9384c9365a1b37cd3d0bf3edd5f95f5468b40f965ac01fdfaa74d526f81752347563633b4c4a4d9d5c7be391b2c8cb0271594f6581dfdc6dfb1473f SHA512 0490fe3da3b88e2ea14462633fc1071759d174315cb276bc89f6468f07d6585a6089b8346f70e9b24fcc5067c1babcfa77c806da85bfd69668d059bad6a1cbd0
+EBUILD libinput-gestures-2.48.ebuild 1339 BLAKE2B 95965c98d19555134dce9e75caacea6621a8a8466d317264dbffe53fe89dcf977d9b8fe1830c82705b594a85757483c093fc2056264f0ee7e730b9474e59771b SHA512 061b1feedde28609ea7da4afa240c7ce7d15cf9b5eaf961b40bd4822375f9a4e6e9c963836906253b5df89cce9b11538dfc3a3f71a3703626a4afbba4a3f82ae
+EBUILD libinput-gestures-9999.ebuild 1339 BLAKE2B 95965c98d19555134dce9e75caacea6621a8a8466d317264dbffe53fe89dcf977d9b8fe1830c82705b594a85757483c093fc2056264f0ee7e730b9474e59771b SHA512 061b1feedde28609ea7da4afa240c7ce7d15cf9b5eaf961b40bd4822375f9a4e6e9c963836906253b5df89cce9b11538dfc3a3f71a3703626a4afbba4a3f82ae
 MISC metadata.xml 825 BLAKE2B 2c2b255745088a09c94810f34d5540b437428582a8b4e67fa31c47ae7257ded169b8047c2ebce98e090092063d9d3086f60cf6f04accc6c50a62313d1c14528b SHA512 9ed80c1c4113a9539366f66ddcc1a0169d42252e0cf347693085d89dee2259c9c120f4e864e35d42a1af9f86019ef944c27bd2ba71cba6ff6eba8509281807c5
diff --git a/x11-misc/libinput-gestures/libinput-gestures-2.41.ebuild b/x11-misc/libinput-gestures/libinput-gestures-2.41.ebuild
deleted file mode 100644
index 73b3a4132933..000000000000
--- a/x11-misc/libinput-gestures/libinput-gestures-2.41.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5..7} )
-
-inherit gnome2-utils python-single-r1
-
-DESCRIPTION="Actions gestures on your touchpad using libinput"
-HOMEPAGE="https://github.com/bulletmark/libinput-gestures"
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/bulletmark/${PN}.git"
-else
-	SRC_URI="https://github.com/bulletmark/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/libinput-1.8.0
-	x11-misc/xdotool
-	x11-misc/wmctrl"
-DEPEND=">=dev-libs/libinput-1.8.0
-	dev-util/desktop-file-utils"
-
-src_prepare() {
-	default
-
-	# Fix docdir installation path
-	sed '/^DOCDIR/s@$NAME@${PF}@' -i libinput-gestures-setup || die
-}
-
-src_test() { :; }
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	elog "You must be in the input group to read the touchpad device."
-
-	if ! has_version x11-libs/gtk+:3 ; then
-		elog "${PN}-setup script supports Gnome 3 via x11-libs/gtk+:3."
-	fi
-	if ! has_version kde-plasma/kde-cli-tools:5 ; then
-		elog "${PN}-setup script supports Plasma 5 via kde-plasma/kde-cli-tools:5."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/x11-misc/libinput-gestures/libinput-gestures-2.45.ebuild b/x11-misc/libinput-gestures/libinput-gestures-2.45.ebuild
deleted file mode 100644
index 213fbc54cfab..000000000000
--- a/x11-misc/libinput-gestures/libinput-gestures-2.45.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5..7} )
-
-inherit python-single-r1 xdg-utils
-
-DESCRIPTION="Actions gestures on your touchpad using libinput"
-HOMEPAGE="https://github.com/bulletmark/libinput-gestures"
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/bulletmark/${PN}.git"
-else
-	SRC_URI="https://github.com/bulletmark/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/libinput-1.8.0
-	x11-misc/xdotool
-	x11-misc/wmctrl"
-DEPEND=">=dev-libs/libinput-1.8.0
-	dev-util/desktop-file-utils"
-
-src_prepare() {
-	default
-
-	# Fix docdir installation path
-	sed '/^DOCDIR/s@$NAME@${PF}@' -i libinput-gestures-setup || die
-}
-
-src_test() { :; }
-
-pkg_postinst() {
-	xdg_icon_cache_update
-
-	elog "You must be in the input group to read the touchpad device."
-
-	if ! has_version x11-libs/gtk+:3 ; then
-		elog "${PN}-setup script supports Gnome 3 via x11-libs/gtk+:3."
-	fi
-	if ! has_version kde-plasma/kde-cli-tools:5 ; then
-		elog "${PN}-setup script supports Plasma 5 via kde-plasma/kde-cli-tools:5."
-	fi
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/x11-misc/libinput-gestures/libinput-gestures-2.48.ebuild b/x11-misc/libinput-gestures/libinput-gestures-2.48.ebuild
index 2f4a08da79af..e1af99e98ebe 100644
--- a/x11-misc/libinput-gestures/libinput-gestures-2.48.ebuild
+++ b/x11-misc/libinput-gestures/libinput-gestures-2.48.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5..7} )
+PYTHON_COMPAT=( python3_{6..7} )
 
 inherit python-single-r1 xdg-utils
 
@@ -33,7 +33,8 @@ src_prepare() {
 	default
 
 	# Fix docdir installation path
-	sed '/^DOCDIR/s@$NAME@${PF}@' -i libinput-gestures-setup || die
+	sed -i "/^DOCDIR/s@\$NAME@${PF}@" libinput-gestures-setup \
+		|| die "sed failed for libinput-gestures-setup"
 }
 
 src_test() { :; }
diff --git a/x11-misc/libinput-gestures/libinput-gestures-9999.ebuild b/x11-misc/libinput-gestures/libinput-gestures-9999.ebuild
index 2f4a08da79af..e1af99e98ebe 100644
--- a/x11-misc/libinput-gestures/libinput-gestures-9999.ebuild
+++ b/x11-misc/libinput-gestures/libinput-gestures-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5..7} )
+PYTHON_COMPAT=( python3_{6..7} )
 
 inherit python-single-r1 xdg-utils
 
@@ -33,7 +33,8 @@ src_prepare() {
 	default
 
 	# Fix docdir installation path
-	sed '/^DOCDIR/s@$NAME@${PF}@' -i libinput-gestures-setup || die
+	sed -i "/^DOCDIR/s@\$NAME@${PF}@" libinput-gestures-setup \
+		|| die "sed failed for libinput-gestures-setup"
 }
 
 src_test() { :; }
diff --git a/x11-misc/light-locker/Manifest b/x11-misc/light-locker/Manifest
index 96825a635028..6c6677a6e9f7 100644
--- a/x11-misc/light-locker/Manifest
+++ b/x11-misc/light-locker/Manifest
@@ -2,6 +2,6 @@ AUX light-locker-1.8.0-elogind.patch 9190 BLAKE2B c60e166a853aaee5de2ffcbb708dd0
 AUX light-locker-1.9.0-elogind.patch 9704 BLAKE2B ead5c1767ac6772477e977bc57bb63392080be397a094dabbf4f4ac779b274f27f045447609c7ce39c6a1602dd2d046d84eff21688e1e4c98c29376e579b7830 SHA512 580a32670e63979691cd1a2102f49e4af23677f4bff1c597c6a87196235844fd1ba3c8d30e148f83b99466a77908f3204e35b57bb01c25fef949e0e3e37cf2f2
 DIST light-locker-1.8.0.tar.bz2 449898 BLAKE2B d5ff454958138ec535b94492a9646dd5a4fc8196095ef3ae933d661e44eb62960ca49fe070fd88a794e2a9c5a6586317845b0d55d8cfd65107e49e31206a727a SHA512 bbad73c0b82a50ddca240d5e1bd325a99d0c60364d136fe6d9d52f196319953373c9d03cf38ebd75d4498d080e96702e09fc97c35b4b69cbe963f065719549d5
 DIST light-locker-1.9.0.tar.gz 124753 BLAKE2B 510447a5fa107988a06e92cc99d7750bc0df526356630694c5dc718460bd437879bbdcb69e0778bdb58d399aafdbea762bfda53d2e2205a1c4bade27dbff78c5 SHA512 c6f84b38affa20cf0bd7d2341f5a8eff36891ed55401955715a68a011c84c7f2300db670abb95a320eb40aee90885fe044ddf0a721e418ee4724af3e4f6a61a4
-EBUILD light-locker-1.8.0-r1.ebuild 1617 BLAKE2B 340b6658d7bbe2567a4d0786476b77d3979f0aae1c0d9a6c3fe5ce798d7c8aa30d7e0fc97688ed0ade1785c1707f768ddd57402a8e2bf2a946f529da44183505 SHA512 186ae4504e45b0b6f4914e93c009ef7c2cc954cff6632c91a2d3b6ebc81aaef099340e67a59292e1adfd4d7fb68be672f9bc9ad550f464e6e4f9e8c39cd66a55
-EBUILD light-locker-1.9.0-r2.ebuild 1565 BLAKE2B c30a4b419691d87823ec2c9876ffa5c51d48701c714e582ca80a89ff8db08bef7d585d20771f2d1809c127d9a37008888924256854d3eccfee10e53d9a7eb151 SHA512 2725cc37c34e81beca17d2db2679e92b15783c654fc779fe32cc4abc1842a1c9c7a49f6f8c01e9f535ee3b352497da42461b840529fe8542c704db76e8956a7f
+EBUILD light-locker-1.8.0-r1.ebuild 1649 BLAKE2B 25e6e1f4d9edf1e7beb716ab2a84f04849141a278626fde33821f4a8e19235e4d23db278ee786c2501f54ba620b59f9435945edaff29a4ef47f26fe92f8ab2be SHA512 23fa713de23fc1ae94d4eae543deac6d7082a516682e6bc86a3ac3c6fb56e7e9acc00923f5d69f2d91c35807684670b0f781b47fd161ce83d26deda215c077a6
+EBUILD light-locker-1.9.0-r2.ebuild 1597 BLAKE2B 6e572fa4ac94cb4af9c47d6c0af8e36866c5692f51d16251e19f86f6c21358c499109b4ff74f0f7a4fb4239ac8431e5540e6e979e39c1256924569fdc57d017c SHA512 844786be3545ea40e3adca4ca226df7ef56dd2485e8e6c8d4f695ed71a7854d88df0cbdee21f81ca423d8350bd174a925876d35f3b92958532ca9bc5d9ff8bc6
 MISC metadata.xml 698 BLAKE2B a8f5e435f66bea6fab128e600e4bfce575c819c2de03c141e9d5ba72880dc58017fce9e4355d700c01d441c4eec56d19f0f2ec8d27027700decedc685a8a2d38 SHA512 583d1108a9be5b71a9e3867b60b20dba60a1c999fe7a27634456b9102af8193dc22e6b7a5410c520f5aa13482a290d4e6cf6bdcde070788fd7ce8d2b74ece144
diff --git a/x11-misc/light-locker/light-locker-1.8.0-r1.ebuild b/x11-misc/light-locker/light-locker-1.8.0-r1.ebuild
index eab1233af0ca..4c88306092b7 100644
--- a/x11-misc/light-locker/light-locker-1.8.0-r1.ebuild
+++ b/x11-misc/light-locker/light-locker-1.8.0-r1.ebuild
@@ -7,7 +7,7 @@ inherit autotools gnome2-utils
 
 DESCRIPTION="A simple locker using lightdm"
 HOMEPAGE="https://github.com/the-cavalry/light-locker"
-SRC_URI="${HOMEPAGE}/releases/download/v${PV}/${P}.tar.bz2"
+SRC_URI="https://github.com/the-cavalry/light-locker/releases/download/v${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
diff --git a/x11-misc/light-locker/light-locker-1.9.0-r2.ebuild b/x11-misc/light-locker/light-locker-1.9.0-r2.ebuild
index 34e6e91e705d..01750c8a0df6 100644
--- a/x11-misc/light-locker/light-locker-1.9.0-r2.ebuild
+++ b/x11-misc/light-locker/light-locker-1.9.0-r2.ebuild
@@ -7,7 +7,7 @@ inherit autotools gnome2-utils
 
 DESCRIPTION="A simple locker using lightdm"
 HOMEPAGE="https://github.com/the-cavalry/light-locker"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/the-cavalry/light-locker/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
diff --git a/x11-misc/magick-rotation/Manifest b/x11-misc/magick-rotation/Manifest
deleted file mode 100644
index ba65e2a51b82..000000000000
--- a/x11-misc/magick-rotation/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST magick-rotation-1.6.2.tar.bz2 103389 BLAKE2B 9ff85d53d33b381b79fdcb725a663001e583fce46ba36efab561d16f6dcdd50fec7c9d54c1ad9284eae590c2c589622259a5814ffd295a02e6458994ff588c96 SHA512 40252c4b57d304244f8f7a8b08448cb498efd9044406235f2d728a89c8b4888009c4e7a9f50cbb61b5620336eedf1abb1591e68e94a57b051f4d823acbcdff5f
-EBUILD magick-rotation-1.6.2-r2.ebuild 2424 BLAKE2B a3a0d1db2df01840eb62a30e605e430229b45cb0260adb1e353ed35b5ae31f2fd996163ec55ff4dfd30a8bbe697ada641a3a502c8ff6babf60f2532d2f89ac38 SHA512 22187c36505f55c33d1e2cef0ea78b601c64b221fb4fc68988f96bc92457c7ca4b1fd17dc1d011000b67e2fb464f5cf3f2c5b94b3131f4830c9c573faa6f910e
-MISC metadata.xml 444 BLAKE2B 9a22f781b09c79acfa976b54f3aeae01bbc6617fba6c95f6c859e60d3af720651c8a17b89de9c3c6a55b6c35b0d5e5639149818bf0b58910c1174e3f9904838e SHA512 8a6601959b4a32d8e8391d5696edb61bf3457a62ca5a47e25880319963e01b418c28f4994ebbe3864eaa8343cb7c6bc6544b6db1b5777b43c1ecc8dabf87864f
diff --git a/x11-misc/magick-rotation/magick-rotation-1.6.2-r2.ebuild b/x11-misc/magick-rotation/magick-rotation-1.6.2-r2.ebuild
deleted file mode 100644
index 43a71929ba58..000000000000
--- a/x11-misc/magick-rotation/magick-rotation-1.6.2-r2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-inherit eutils python-single-r1 toolchain-funcs udev user versionator
-
-MY_PV=$(get_version_component_range 1-2)
-
-DESCRIPTION="Application that rotates tablet pc's screen automatically, based on orientation"
-HOMEPAGE="https://launchpad.net/magick-rotation"
-SRC_URI="https://launchpad.net/magick-rotation/trunk/${MY_PV}/+download/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	x11-libs/libX11
-	x11-libs/libXrandr"
-
-RDEPEND="${DEPEND}
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	dev-python/py-notify[${PYTHON_USEDEP}]
-	x11-apps/xinput"
-
-# there are no tests in package, default 'make check' does wrong things, bug #453672
-RESTRICT="test"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	enewgroup magick
-}
-
-src_prepare() {
-	# Remove unneeded files
-	rm -r apt_* installer_gtk.py MAGICK-INSTALL gset_addkeyval.py MagickIcons/MagickSplash.png MagickUninstall || die 'removing unneeded files failed'
-
-	# Fix Python shebangs
-	python_fix_shebang "${S}"
-
-	epatch_user
-}
-
-src_compile() {
-	my_compile() {
-		echo $(tc-getCC) $*
-		$(tc-getCC) $* || die 'compilation failed'
-	}
-
-	local suffix=
-	if use amd64; then
-		suffix=64
-	else
-		suffix=32
-	fi
-	my_compile "${CFLAGS} ${LDFLAGS} check.c -lX11 -lXrandr -o checkmagick${suffix}"
-}
-
-src_install() {
-	#TODO: add installation of GNOME Shell 3.2 extension
-	dobin checkmagick*
-
-	udev_dorules 62-magick.rules
-
-	python_moduleinto /usr/share/${PN}
-	python_domodule *.py
-
-	insinto /usr/share/${PN}/MagickIcons
-	doins MagickIcons/*.png
-
-	python_scriptinto /usr/share/${PN}
-	python_doscript magick-rotation xrotate.py
-
-	dodoc *.txt ChangeLog
-
-	make_desktop_entry /usr/share/${PN}/${PN} "Magick Rotation" /usr/share/${PN}/MagickIcons/magick-rotation-enabled.png "System;Utility;"
-}
-
-pkg_postinst() {
-	echo
-	elog "In order to use Magick Rotation with an on-screen keyboard and handwriting,"
-	elog "the following additional package may also be installed for use at run-time:"
-	elog
-	optfeature "Magick Rotation's default onscreen keyboard" media-gfx/cellwriter
-	echo
-
-	ewarn "in order to use Magick Rotation you have to be in the 'magick' group."
-	ewarn "Just run 'gpasswd -a <USER> magick', then have <USER> re-login."
-}
diff --git a/x11-misc/menulibre/Manifest b/x11-misc/menulibre/Manifest
index 73c5132b59c8..eda2a33fd16c 100644
--- a/x11-misc/menulibre/Manifest
+++ b/x11-misc/menulibre/Manifest
@@ -1,7 +1,7 @@
 DIST menulibre-2.1.3.tar.gz 231336 BLAKE2B f15f962b41071f40cebdaa3fbab082932f1acad30026b89bb2b4672a860b4f7cc3caa668eadee48195a091783b6a8d5558ca44ed05034640247cad02394d3b93 SHA512 0a9040bcb311fe993238e5d1fc459db2400466c538c729ecd5bf2ff20cf9c7300ef2543c56ae4ef7cfa44cd66768ee9a9001ab997fd2507d8d74a246b2029c7a
 DIST menulibre-2.2.0.tar.gz 430567 BLAKE2B 7910f9f8e23b2ca3254b5a83a7c16315620bec38ff458a2fe3f65328b8b08ba424d853abb1fdb7334fd2b38da54b632a8d5b178a7cf876873d52c1903adcdab2 SHA512 d08d61fee3c5a9716581716c116d5b82c3221dff24093c765f6ad72d9dc17fde40ebdd2f17bcee7952b22bc4c78bdf1057cbc57af3c4651dfa6dc01cbd3ecbeb
 DIST menulibre-2.2.1.tar.gz 453217 BLAKE2B 86b3d2d8b20bfc7dcfcba380f656ec1e99f1d5dbc3779eadb9e7cc3a2b8c96afc0c2efe72802d0c93833f6c705c67d05a4ba6cc6cf9b95e0c9b9850ae4424fee SHA512 cf1425d604af26b7bde92106aa758a1f7dcc66ad1fbcdcd4c23db90bc7b6de5fe1160b917035f1d949daa1af8ba6b1145d7376ae637c8937a25cb108bf8cd15f
-EBUILD menulibre-2.1.3.ebuild 1721 BLAKE2B ce36a304c02ab5bcd8fe7d726cd2177e691aaad42a5e3c9045a6889c106f1db7af1d24380eb8359b7c48c5620423eafadda65567a945c9e2842c52dba3d246ba SHA512 a8f5203ff12c28e6fec86ddeea2f893e6c06a2d357829894da600cf9e6cc52d89fe895e886055e1e526e8917b897c90eacf5d4fda6e15b67e80ca55b97c53a14
-EBUILD menulibre-2.2.0.ebuild 1747 BLAKE2B 2d2ac9931f476ec15dd7f832f46e688165767280d4fa5f11aa90610fe715d9fa71130927180fe92dc4ccd1208d67c28af0130df64609266129cf1000b67a56c5 SHA512 0b3ac7dd75e67c4d7d7184f55277a0bca97047f0b31b153f2e0e8a38fa7218aa052d66c3ed3710b1f78e66d29042f23932961ee2a4dc88d2cf2349206c7abdc5
-EBUILD menulibre-2.2.1.ebuild 1708 BLAKE2B 4063a5556b18b5585789fe6e0e19294aa4eaa94735d6ff79938ec8a4998a2b8e5b4e99ef5b17a75e1e2bd5ee406d0f6348879a132b0226a518206da6199a6dd3 SHA512 d1eb66ffc400e73a3a3d3883b8bc4a464bdd74f002f777d1be7e718de1013626bd92f2ba46861179e98d368eee6522df90b44cc100a97651054a607c11ddf654
+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
 MISC metadata.xml 353 BLAKE2B 6064836036ff045dce0bc62fe8b822aefcd75b1cbb5746e12c2a2c5399802c1412b4f6bb9f9582785d5f8cff63d61f9f0c71505fd593e649e26c30f7c7019d6a SHA512 256e7ca3b20708caea270d07348c477b3d9e8300739092ad80468f4ab60e5e85b21246cf906d51a1929e627d27ed62bcf23136a3b8edc684c4ba1b53e3282454
diff --git a/x11-misc/menulibre/menulibre-2.1.3.ebuild b/x11-misc/menulibre/menulibre-2.1.3.ebuild
index 0ab8c17daeec..f13ed5126411 100644
--- a/x11-misc/menulibre/menulibre-2.1.3.ebuild
+++ b/x11-misc/menulibre/menulibre-2.1.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="xml"
 DISTUTILS_IN_SOURCE_BUILD=1
 inherit distutils-r1 eutils gnome2-utils versionator
diff --git a/x11-misc/menulibre/menulibre-2.2.0.ebuild b/x11-misc/menulibre/menulibre-2.2.0.ebuild
index 97b0e080e86e..a64c550a85f0 100644
--- a/x11-misc/menulibre/menulibre-2.2.0.ebuild
+++ b/x11-misc/menulibre/menulibre-2.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="xml"
 DISTUTILS_IN_SOURCE_BUILD=1
 inherit distutils-r1 eutils gnome2-utils versionator
diff --git a/x11-misc/menulibre/menulibre-2.2.1.ebuild b/x11-misc/menulibre/menulibre-2.2.1.ebuild
index c0aa8ef2a8d2..95d8dcfbf47a 100644
--- a/x11-misc/menulibre/menulibre-2.2.1.ebuild
+++ b/x11-misc/menulibre/menulibre-2.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="xml"
 DISTUTILS_IN_SOURCE_BUILD=1
 inherit desktop distutils-r1 xdg-utils
diff --git a/x11-misc/menumaker/Manifest b/x11-misc/menumaker/Manifest
index 82924169bda2..6db94e6c86c0 100644
--- a/x11-misc/menumaker/Manifest
+++ b/x11-misc/menumaker/Manifest
@@ -2,6 +2,6 @@ AUX menumaker-0.99.10-AM_PATH_PYTHON.patch 2517 BLAKE2B 45fc07e14f0b89106464b925
 AUX menumaker-0.99.11-AM_PATH_PYTHON.patch 2579 BLAKE2B 67b3924544429c998229b439cdaac12aaf6e24aeaf647fd604a9602a25d24250a59c398d7c403744445adf81cf0dc4dcaeb88a07edb0f6181104e0e81aae175d SHA512 f36c5d30981c2e39b37a626eb235f7e9117de18bd774e91058350cceb9859ed9f99a11233f9a72a8acff7a7f84bf657a25e86935623a65986d63ce86734b3c3b
 DIST menumaker-0.99.10.tar.gz 202580 BLAKE2B 2fb53359a6e4b14fe8966c3fbb6d0f381a3ad9e52463d37edbef47a409b0ecf4f17bd7221395987d4cd49f363007aa97f0d6182595a571f1baab4e7977c06bff SHA512 e7a731ac848089cbdb845fdb0e344b48e70d3bb7220870127d3616549d31fa62b61a48e3efff52d7767b597a4407a8548e776c16976072d0aa7f5c96740cd207
 DIST menumaker-0.99.11.tar.gz 205196 BLAKE2B 5f1fa9cbf4fd739499db86f9173fbbea2c96900597d13185f2a2f2b5746a0a2c05d12b115782488cb5b1df1f48638bb831dbee4bb14c414fc11328f43d241c46 SHA512 b45b8f2de4e63bad673bf4463ac074b068d4889cf37644962d51e1514d07bef827679d060d1503e59ea4bfc460fdc643d850921b3a02babd1ea57249511ffa5a
-EBUILD menumaker-0.99.10.ebuild 1104 BLAKE2B 2782727d4c1dd000ef0faca3582247a635fa038a044662affd70acb5d20d2a6b687910244c133bf338191d0585c2c464b89c576603baddcac82ad05879578e29 SHA512 e2acb93e90ad017f234cf2da40461fa0c1d23b1db87e77f6d929eb2ef9119e05af49428e3343fbcedc45e11b756960344178a3d69fc3d8af6a10a5847f962ce8
-EBUILD menumaker-0.99.11.ebuild 1099 BLAKE2B 5a3ba34a96916299b2910b565f4362bc94a137c3d282e1055e0a62c8c307afc03fd19675c55a72d0dc7b1c5d885f163f09a8174080d41e7a2173b1672e64121c SHA512 03f7074d8c386ffb60b8dbf6608e7db9cc41f9e09c0d19f6458b3c27f6f977f16d68a836f9e0a24ecb97c43338b807005ed5396124b9f7a9e4461cbceaaedf4c
+EBUILD menumaker-0.99.10.ebuild 1100 BLAKE2B e6d9adbf0c505feba1b29407f41b7090ea3054ee86f212938afd423eea0bed4f97eddd068de0b0727ad33f4e18a36eed63abf1802bd7ddb7ca813d2f84b550a2 SHA512 e983655deb0a1edc632fe105a196930c43cace1bade95dae883f27af30de63540d7c4910ccb8ee316068b69f3b3f8c8725916fdd909a09db4875ab808f4d948c
+EBUILD menumaker-0.99.11.ebuild 1097 BLAKE2B d979be0b052ea479151b61a57d2ec154e1dd52a9c19f2c39d58317ee9783d3836b215fdbb1fd06541f55fded2d31db203e1ca087cb59037aebf482068f65e5dc SHA512 c2b6d2f7010eaef0a17d0c499500149d560e636adf021a71303610eeffac2e9fb6369531c1a651dd68c8c8351f0705bbc444860d7703a5032a57f57373797c81
 MISC metadata.xml 439 BLAKE2B cee25e15ca49508e651ba46d0598ee61f0c959bdf46a28337ab0d6071683e6779e8e0d50e36d9aa84ef761f251773ea101eae4dbf1a3b7494d08d2f8778f90e4 SHA512 5f68ee720bbfc364f200335a1045982b4c82aab73e24a8e5143d8a776919b6b676088c5af49ea74cdb09d09cf1f055b596471915f173ab6afbb17bc553a6b07c
diff --git a/x11-misc/menumaker/menumaker-0.99.10.ebuild b/x11-misc/menumaker/menumaker-0.99.10.ebuild
index c2950bbcf4ae..b531cdbc0e18 100644
--- a/x11-misc/menumaker/menumaker-0.99.10.ebuild
+++ b/x11-misc/menumaker/menumaker-0.99.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit autotools python-r1
 
diff --git a/x11-misc/menumaker/menumaker-0.99.11.ebuild b/x11-misc/menumaker/menumaker-0.99.11.ebuild
index 81798732faf1..21e963349547 100644
--- a/x11-misc/menumaker/menumaker-0.99.11.ebuild
+++ b/x11-misc/menumaker/menumaker-0.99.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 inherit autotools python-r1
 
diff --git a/x11-misc/mozo/Manifest b/x11-misc/mozo/Manifest
index 54cceeed03e9..cba11b6dc621 100644
--- a/x11-misc/mozo/Manifest
+++ b/x11-misc/mozo/Manifest
@@ -1,5 +1,5 @@
 DIST mozo-1.22.0.tar.xz 178924 BLAKE2B 6cc74cbdb7342d926483948391798cc9b0be66b63bba758b7ec8cea3f5555ae01f1ecf279053612ed060a283076bdac1a9ef8bd15e3cfe61d96685aeee168ae0 SHA512 f3d60e94d9bf5fdd435320856563622f0687cc2844a3d51473bcef5c442f4938a4030533271ead2fd88fb0ce805c16b40d629e5a69fc642e7e670a1afd5745db
 DIST mozo-1.22.1.tar.xz 171976 BLAKE2B c4a1166b605d3fed68b71987dbf70b7f908aabc2c7266415b0d7ce4c8ccb93ad690c72ce83a708f9d3518cfba66128d2cd4bc5413432133299595cf4d2c5a43c SHA512 6cd4ed04d43ae064077fc78ed59644bf6efe4c65c26995742166c57333d470fbe95ca4f4037e786f16dc076e75d938868948e8c2e5c662f35d971b36992f1a9b
-EBUILD mozo-1.22.0.ebuild 1279 BLAKE2B 35c97cf13ab5d94ee02b4eedf407e4d2a1aca0db32a21efd3620f92072fbef091da3f10bf3380651e2343db32e0c58f63c007264911d68fc4bec8732d254d7ba SHA512 ce95203f31463a73f20309a8652e971acd8e0f903c8bff8509c03ada0abd934b20cca21a85e2d3ac84e7ca3236a70473eea88ea76bd95fb74432b57802254085
-EBUILD mozo-1.22.1.ebuild 1281 BLAKE2B 9363e08f061a6263bc6a0998aae8e31d42c544173c06f35d785cd257f6516a18b23c982a1c741d0feba7648e2f5169f41894e24a544db5d7d22d97c0a0742e39 SHA512 c5bc0fe3e604c44e265c2642c50a51334113543e1b510d3e7cdd28a5e45f6e7672360c16e26dc34f3b2cca6492e9df76b042f12d958c8eba8ebb80dd7b7a2c4f
+EBUILD mozo-1.22.0.ebuild 1275 BLAKE2B 7fbc5742a571aa0160d352298152cc3152fd567387a0e8d43b9724b31395e5cb6681a9fc6e50b30fda0b342c286528641c44dff7db939ec98416e284f3b57349 SHA512 f63067430e440ffecbc47f35da67552b05f19e812c3c185820e85ea0f9f79bdef3f72a8b9af4f1ae8f8b54e86971a4842e34d1341fd811bfb81b57e7bc21bf0e
+EBUILD mozo-1.22.1.ebuild 1277 BLAKE2B 7ce23b40c20a76644dba8216a8c1689eb3aa50455536f1e4621972fa34be97e8a60e6a0281aa0975095d4886d037df2695c35c519758c9ebce47f3aaa21b6b58 SHA512 fa7495d64a0e77f4fef860380e84b2b6ea235edc31a1c6110df348bb239e75c2a45314ad59f72ffb7ddeda59901aaddcd598146958c22b01c4a5ebbfe9d58f1d
 MISC metadata.xml 333 BLAKE2B 9901ffa7d882f0f741c95670130db70920ebbe94af75b8d9b72f48f8eb1b48d9425b7ff49dafbe001e5287ff3eafd2d60a8760a262ab6601fecc63642e242591 SHA512 eb3bc4b3cf1cfde5f96cd414138790deae0435e8ba41576e1e44b150defd5fdda0b921d4dbb0798b9653ad5aa7690247fb69cd25d03752f8bde8017419596a76
diff --git a/x11-misc/mozo/mozo-1.22.0.ebuild b/x11-misc/mozo/mozo-1.22.0.ebuild
index 8becd64fa9d0..e6c4de3fb470 100644
--- a/x11-misc/mozo/mozo-1.22.0.ebuild
+++ b/x11-misc/mozo/mozo-1.22.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="xml"
 
 inherit python-r1 mate
diff --git a/x11-misc/mozo/mozo-1.22.1.ebuild b/x11-misc/mozo/mozo-1.22.1.ebuild
index dec4df03ee1f..a8fcc6e410aa 100644
--- a/x11-misc/mozo/mozo-1.22.1.ebuild
+++ b/x11-misc/mozo/mozo-1.22.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="xml"
 
 inherit python-r1 mate
diff --git a/x11-misc/mugshot/Manifest b/x11-misc/mugshot/Manifest
index 65b1f8210d37..0ee229dcc4d4 100644
--- a/x11-misc/mugshot/Manifest
+++ b/x11-misc/mugshot/Manifest
@@ -2,6 +2,6 @@ AUX mugshot-0.4.1-missing_default_face.patch 782 BLAKE2B be9ef8633839b505c37ae13
 AUX mugshot-0.4.1-use_office_phone.patch 996 BLAKE2B 4c8647647f424775a1557f176b271e7f23d5df99a4db3246c37f7d108640a1d18bb6a8185f1e1bdd2f31bba2cbc62fc4d39df5172edc72e3142dd3954afee329 SHA512 488f99fde5c09aa2e15bf9b78bb19b6e244476a1b0e8053f3af5e0e6ef70febbc92d3970f774332dd961af7893e29a5fab7cc7e964d24ffc46d67c9567e2579c
 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 1383 BLAKE2B 56ab49a4fce25c48c20501c836e912a2428ad94fd433c578250ce7ef5d1cabb745b321df330d0197b09b9a59a44a48d768ce71916a72a809dd4ce273f0cf17a4 SHA512 3b1d071637e5bf52803f6eafdfe4d1d182a1759d58700bc26e2bf165b0f7d1f93abde45ca7810714b72b74cdcaabb10b03a9c16d2439b1c92e27192af4dcbbcd
-EBUILD mugshot-0.4.2-r1.ebuild 1538 BLAKE2B d18c836d77b8271af443274cc3e012590b17e895f3e02cb3d41e2c190371b69acbbeb1bde1211ce25768e73346545b43c200bb86eb63abf99b7e8a86cf2eee01 SHA512 9a9141b1202c67c46119ca878766e1fd9a14689832939cfa53b294ead19f1b133164df9ed0d560dfdf4106c487ac6b6494ead718c8c059c758fdf85beb70cf1c
+EBUILD mugshot-0.4.1.ebuild 1379 BLAKE2B 37f3ac78d45003c6ea1ff7ae2962df1b8570bede4855fb3c31dd3e3efd7f62b111b23ee84277ebb1648d9b2e996231b9897c38e2d7c3a3f4b7808bfcbc3807d6 SHA512 d17b643af0187e52ab4749c0e02059f4b814ac6ab6adeb3401d0574c8137fb7568df8e4966d522cc79b8a695d0c4039b997b90ac4fb5bd0dd9dc6133b9827ae6
+EBUILD mugshot-0.4.2-r1.ebuild 1536 BLAKE2B 5129a2242d861d424a3fb107571c4f142d1d59f2d075ea1c494e486a58ef05db3cfda550ff35a6566994e4983438eb0333a8b13993ec07d1cdd8b0ce798a8546 SHA512 3322e88933e34ab441819b531d34f198eb2a588a21eda7c51539211865acf433b15008d47714c653661c05e8be096ab630c0cdead13496ab8d43826ffa226e82
 MISC metadata.xml 943 BLAKE2B b39c09aa84b6a1f25d001e073b2c369af9ebebb7448fff5b3abc83898516963e117c33d1c03fb6db72422e4b20c065ed78e711326f28912e1ed5321b232bbee1 SHA512 3b4e66543245b2db7d1c255adf30112834935ab552a7d6773921838510417e000fd41c63fcab7e6be8df043f3daeab1cfcbebccaebf44f6185abfcb47898a3f2
diff --git a/x11-misc/mugshot/mugshot-0.4.1.ebuild b/x11-misc/mugshot/mugshot-0.4.1.ebuild
index ca234d9d97cc..b64746d894fc 100644
--- a/x11-misc/mugshot/mugshot-0.4.1.ebuild
+++ b/x11-misc/mugshot/mugshot-0.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 eapi7-ver gnome2-utils
 
diff --git a/x11-misc/mugshot/mugshot-0.4.2-r1.ebuild b/x11-misc/mugshot/mugshot-0.4.2-r1.ebuild
index d73d30cc473e..2341865d2256 100644
--- a/x11-misc/mugshot/mugshot-0.4.2-r1.ebuild
+++ b/x11-misc/mugshot/mugshot-0.4.2-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS="no"
-PYTHON_COMPAT=( python3_{5,6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1 gnome2-utils xdg-utils
 
diff --git a/x11-misc/nitrogen/Manifest b/x11-misc/nitrogen/Manifest
index 52c94a763fac..266e112fe517 100644
--- a/x11-misc/nitrogen/Manifest
+++ b/x11-misc/nitrogen/Manifest
@@ -1,5 +1,5 @@
 DIST nitrogen-1.6.1.tar.gz 314332 BLAKE2B 4e2ce39a770434e35250cc2ff2bff792f3943eef489a0dc9b897b47fb98c3791cf633974ded2481b6e29ceb00f26964115254cc047041e77954563e82c7cd44b SHA512 125bb62162da95c3aab8c146f93113162c171512ffd3e8e6011fff22f1a1b841d1ffc9b4df4fd1b0b62a3731c68cd30c8448dbc836e9861216f50068d8b08c9c
-EBUILD nitrogen-1.6.1-r1.ebuild 990 BLAKE2B 9112f03b3711858c11d82b5ef9b7a3affdc87c0bedcfcbc0bc00bdbc3660c419dbfb7e1fd8e748fe0ec54e3fac9b7f59280a54b6d1deddb18df5e2eefd457859 SHA512 a7429f2f9678801dd8af97761da0d248fadb39f71959db026bc834f5c58f510df6d8e3364d2fde5c146b09610a2a5afa7a49e61404be31a7339dadb5c083b77a
+EBUILD nitrogen-1.6.1-r1.ebuild 1011 BLAKE2B 23956b8a04f03497b4563f75a2f9ae773fff728b3034b79cdeac5e05cee4017038800b26acd79f1dfe7f38780c9695ee9108aeaf705ee8842de5f9ab32e69de8 SHA512 70b45ed62d72ed9480816b7b4961842b20948ff7f3aa1afa507356ca86b23c59900692ff6c83ee5df9eb99fb84ab64fe4f4e9bd3a524903625f7a2aaeba6867e
 EBUILD nitrogen-1.6.1.ebuild 930 BLAKE2B 79555c78a52cb219eb57879ea93c6bd42bf6ac3aa73c7b91e1c8170d0d7245bfbcf469ea0a482f0bf855a392a9378258800109d669d123a60e4f9add088b2e04 SHA512 8c27a5ff194a32869eff972bf3754add2f0b65d2b3b3c1aa07d960f0e55f1c6a1ca7207e03b574b3640b10605f60ee4dbce2980417d6f8446b64d270d31974dc
 EBUILD nitrogen-99999.ebuild 951 BLAKE2B 593d5517c0a3cfdd367dbe884302708c9d63ad83b7c0cabceda61d2ec4a5fcc15f5aad86163bcb51e71a6603cd3630214826fcf9af66aac42fbc630d323c3f70 SHA512 dfb30c112a5bbf409ad322dc084ae9d0c6ec15e001b19c21735d1d416486528c7d7a47f1a767fd49e514789ee20e0e8f0acc3157495150a2eacd11647fd98acd
 MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
diff --git a/x11-misc/nitrogen/nitrogen-1.6.1-r1.ebuild b/x11-misc/nitrogen/nitrogen-1.6.1-r1.ebuild
index a43c24a1d2b3..3c7230cca8c2 100644
--- a/x11-misc/nitrogen/nitrogen-1.6.1-r1.ebuild
+++ b/x11-misc/nitrogen/nitrogen-1.6.1-r1.ebuild
@@ -6,7 +6,7 @@ inherit autotools flag-o-matic gnome2-utils xdg-utils
 
 DESCRIPTION="A background browser and setter for X"
 HOMEPAGE="https://github.com/l3ib/nitrogen"
-SRC_URI="${HOMEPAGE}/releases/download/${PV}/${P}.tar.gz"
+SRC_URI="https://github.com/l3ib/nitrogen/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-misc/nts/Manifest b/x11-misc/nts/Manifest
index 5a24aafe9c19..aee0bffb9b0c 100644
--- a/x11-misc/nts/Manifest
+++ b/x11-misc/nts/Manifest
@@ -1,3 +1,3 @@
 DIST nts-82.tar.gz 155819 BLAKE2B f5f6ab561b754c450f41a8e929fe54d59de6430adfefe65fee17ab1a71766c6f4dd16ed8f4a6ae1e927814f42e6461eaca5744ad8fdf3143771949cd76c3fb5c SHA512 03ec801a550668c8654240823f63e4793d54d12630181e38031872f8d5e6cf01e151be1a5762c7013941701a679d361951f271e0f4cf0d90da54ed1db2ea61fd
-EBUILD nts-82-r1.ebuild 533 BLAKE2B e41098b919419f258a1e8c8641e957f1580d524deb633e72a245ee666d056a95552181a10cfc4f39ef93e68a70bf4222fb26f37708abfd912027bd569bf64692 SHA512 c625796516db8827736f37fc861c03d71ac21265285bff84b1b838cb7083d489d8db046a74e385f7106fd6b2f031aa914251e902c507a1ac1e20e94fccfb70e3
+EBUILD nts-82-r1.ebuild 554 BLAKE2B ae4bd2dd8ce6db97bd0036734c9d925d077c06e81240872c1e121292c499a7d4a1bfbc1a3460e81f9974f319beb043fc4894534376f6ac6e87b79c402064dd4d SHA512 b967f5e61f4f3857d1ca63ed603dbf59d467e29a1ffda0711f5cec8ae015d9db540e8795d2cc472ed125c240c983877e2750614d55cca5da9ef6257f72fa702b
 MISC metadata.xml 615 BLAKE2B 03e6681fd844456cd6693e1e5787d226f6077a84ee6f64eb184cb010e6e6958eeddfd35380a1984773b3fbfc0323b3d0788d60fc2ec663770699ffcf88f75548 SHA512 8e52c5501a6dd3e2c941cab91635ef15dbd93287070b4b3bb6eca6fc2c250923e624269388d88a75737e7322ce40f71c2cc916f10cc365d3e65f42dcd8657404
diff --git a/x11-misc/nts/nts-82-r1.ebuild b/x11-misc/nts/nts-82-r1.ebuild
index 96a6ccd36825..38a03f592b1b 100644
--- a/x11-misc/nts/nts-82-r1.ebuild
+++ b/x11-misc/nts/nts-82-r1.ebuild
@@ -7,7 +7,7 @@ inherit distutils-r1
 
 DESCRIPTION="Note Taking made Simple, an intuitive note taking application"
 HOMEPAGE="http://www.duke.edu/~dgraham/NTS/"
-SRC_URI="${HOMEPAGE}/${P}.tar.gz"
+SRC_URI="http://www.duke.edu/~dgraham/NTS/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/x11-misc/obconf-qt/Manifest b/x11-misc/obconf-qt/Manifest
index c2576118db18..3a3ad5d2cc60 100644
--- a/x11-misc/obconf-qt/Manifest
+++ b/x11-misc/obconf-qt/Manifest
@@ -1,3 +1,3 @@
 DIST obconf-qt-0.14.1.tar.xz 97032 BLAKE2B 8bfe93325d37bdcca40b38f99f635cddf39ad1781e694f002676f6ff6fd0d6c708908ca458a051f63509f572b247b4de5778a1451e763c4372038ef99a1594d7 SHA512 7ae4feb8daa3853f768e9cb613fc99046f98744e03efc673ee9e5cb3d4ffa2861f2a9f762acd9c54ef2b9ca3f288d2901cdcce5c09db84689dd186006b8e26ed
-EBUILD obconf-qt-0.14.1.ebuild 904 BLAKE2B 7e3123553f5345d7872a41d975a7dc1c2fb5135b93e925574427d65162ade6c0fc3d9492c7d661d8dec20230cb9ae0e7234b6f3cf492f95b8c8631cf51bc19bf SHA512 de4040bc6ba5e72d7ec639d35cc116d7d4376db8b6e33214a8ae9263131163bc0096404a991d864449568f9061c01ea48ca9659e9c524530acd615d5c9ea7e36
+EBUILD obconf-qt-0.14.1.ebuild 898 BLAKE2B 9bc86cbb65762633fbfb15cceb95e07657fd0f5aec46ead8447dc57cfc6a56f0338c9ffc381531a17104f73ce844d02dc579154d35a47a0a7067bc15f72a45ea SHA512 e17583b682360452e3992b1688cb3d470d44fff3932165861fddc8c04a725910c54ce8e7ac7769f6e5310fc3e8e3500a9b404fb37f0c48001960d0d079544ea9
 MISC metadata.xml 315 BLAKE2B aba8e92e822b0a8f7213a6a2a723ada9cc5be720aa857152cfb2e395b8cae65dac8ce4c13e36e3ba774e22d800890c5ec7878f0266157b92e4f0332fd2ff8dc0 SHA512 b210ddb7b5f688fc122fead9a5fbac67653099db7671e442c53cf5246f091c8f58a6db94f2be7d3250a8fe24a619c6c9269b31f6c52f62049c40963dd8a6212a
diff --git a/x11-misc/obconf-qt/obconf-qt-0.14.1.ebuild b/x11-misc/obconf-qt/obconf-qt-0.14.1.ebuild
index 11fa1f32bb9a..7242f202bdd2 100644
--- a/x11-misc/obconf-qt/obconf-qt-0.14.1.ebuild
+++ b/x11-misc/obconf-qt/obconf-qt-0.14.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 
 DESCRIPTION="Openbox window manager configuration tool"
 HOMEPAGE="https://lxqt.org/"
diff --git a/x11-misc/obmenu-generator/Manifest b/x11-misc/obmenu-generator/Manifest
index ab22c8845851..c3341db78aac 100644
--- a/x11-misc/obmenu-generator/Manifest
+++ b/x11-misc/obmenu-generator/Manifest
@@ -1,3 +1,3 @@
 DIST obmenu-generator-0.85.tar.gz 20558 BLAKE2B 526657eb9fc7ed0adc3681809d0f8b763f5faf7b2cb578962e1c2ab2e2bd488f386bcd6e7bf45e5752a2d339048af37f05bf31ef3947c2a9642f15e99db00eac SHA512 d6925ec8c2b75eec12bc23840799cedf4b882787b62a6b8814ca6c8b3bc5d22d2b8a4510fa6829d66541923caf3163a85eefc068a96ead631a3200467c563545
-EBUILD obmenu-generator-0.85.ebuild 559 BLAKE2B 94563f4460da98eb4bb7fcce5e2b79a6dca8567009dd965e34a168d913e593ce74f2483106c418c2529cee3ac2015f77de77287eefa0438ddb3c7f32c892b913 SHA512 d37cd81fa57d761a3481c445ec868f8286f9903f111cbac4ad72fe9cf9d6d554ae921761794bb5f95abeec9e60825f0780e4249c88b92fb19482f738ce875976
+EBUILD obmenu-generator-0.85.ebuild 590 BLAKE2B 8624e8cd51b61092dfc045ac6bf864171ae209e1c52e109c0d2798b6e8e300e8cddb67554b9bb2e1f41e52f628adee955c79bc8ccb0d0fcc61cfc8a1c762a874 SHA512 87fab8c46ac4773e348a6e16968c4fc8b64422f189e1c6d2f66bcbf6335de85e31c25a9837f805f1e3dc1fc11d97581d28594b22a8a038b41047f8050fc46836
 MISC metadata.xml 366 BLAKE2B b86e2366a6df0199a2fc48e10a6aea3f0d2c12a60013adb4f1308b18a082e90f0b21a28fa539f36eb8fd575c7f645e5b53422c8d553810cdb82a626593dbbd5c SHA512 7bb0e3571b601e324a4634f33eae29592d3a76d9636d3dbfa6bf2e486386672d6c1cac041e95028b76ff107877fba18f66fbbeef8eb72ab9348de97d6e91853b
diff --git a/x11-misc/obmenu-generator/obmenu-generator-0.85.ebuild b/x11-misc/obmenu-generator/obmenu-generator-0.85.ebuild
index b8277e4215f3..e97a79d66f24 100644
--- a/x11-misc/obmenu-generator/obmenu-generator-0.85.ebuild
+++ b/x11-misc/obmenu-generator/obmenu-generator-0.85.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="A fast pipe/static menu generator for the Openbox Window Manager"
 HOMEPAGE="https://github.com/trizen/obmenu-generator"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/trizen/obmenu-generator/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
diff --git a/x11-misc/pathfinder/Manifest b/x11-misc/pathfinder/Manifest
index 9e5112d82763..739a49adeaa6 100644
--- a/x11-misc/pathfinder/Manifest
+++ b/x11-misc/pathfinder/Manifest
@@ -1,3 +1,3 @@
-DIST fox-1.7.49.tar.gz 5336321 BLAKE2B 0fc905c77bcf32783a04b573a18ef79b9017e92126028bf7ec344fc388d3935fabab3d988787c08ea26e2783eb81418d84168e1c1eb733297624a0169a5b45f7 SHA512 da6c3478370f1e72091675e49f8458a6722eca4735bf89052b2b7ef02f4e74ee41f10c9fcc39a24a1571dd0bb1cdf779e9dea5bf15be20722ca783c9d59eb6e9
-EBUILD pathfinder-1.7.49.ebuild 565 BLAKE2B e7cf3856c66cfef3b9484a41ab3e478e2fc1f2867f73bad6a5d18c56ce068422affcc92c33a97dc9fcaef5524b00fd164fa577cd9a303e2df7a74e3d097a4f66 SHA512 33996f8d8b34cac1f25dddab363e124f57017de653c62af0812fbd28b9dbef6619247b8efe2fd0eb2678e5f59193a211598798e8868cebd156c8579ff4a28f15
+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/pathfinder-1.7.49.ebuild b/x11-misc/pathfinder/pathfinder-1.7.67.ebuild
index 2f71efdff41c..935f2ec1c020 100644
--- a/x11-misc/pathfinder/pathfinder-1.7.49.ebuild
+++ b/x11-misc/pathfinder/pathfinder-1.7.67.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="File manager based on the FOX Toolkit"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+jpeg +png +tiff"
 
 DEPEND="
diff --git a/x11-misc/pcmanfm-qt/Manifest b/x11-misc/pcmanfm-qt/Manifest
index eb51f23193df..7e5a399eca82 100644
--- a/x11-misc/pcmanfm-qt/Manifest
+++ b/x11-misc/pcmanfm-qt/Manifest
@@ -1,3 +1,3 @@
 DIST pcmanfm-qt-0.14.1.tar.xz 227360 BLAKE2B 2401238ad53838c9f6e45d596c43b09eecf555bfe069a5cef633c0442867f04b636bebf29241cae8b5a1161a9dad5648390badcd6a3d8b756ac6438acac4961f SHA512 f3d170ab8344332f740a3245cc549ea0c3bddc97a45472dcd46208d59413dd42d3571821f309184417a34a627d2cb093fcaa335f782cf6e526eef3fcad212b3e
-EBUILD pcmanfm-qt-0.14.1-r1.ebuild 1148 BLAKE2B 7f7a8ea754802481b8a629ef30a242a9a60e3ed00efc62990f02782dc8ced3973e656ff2f5f927de63eb73ea6bcb466938d96ad625cf716ac2f28709054dc381 SHA512 cbd12006fb135f4ee897914b2364d48229e84c09560931ac268d93d6b3d1ca652246b42a38584e92a1cedb3d9f66572caa00bba0797a225be2c0cac6c851c4a3
+EBUILD pcmanfm-qt-0.14.1-r1.ebuild 1142 BLAKE2B 1a4466c1d2f6e09d18e9547345b0687640e242c20896cd786e953ce41e3a17099629c8ce100e2746f3fc815524722695f2f21e90f9d2f896625f8665b628fa60 SHA512 b6e7fa2a89710cb5309ffef5d3196a7391f03adc4cbf95f4ef1ee863e7efc715add8c164d93c7c49cacced54acda6911e799b7a09ff19bfdd651453a5446af40
 MISC metadata.xml 316 BLAKE2B 1dc58d42a91390bd5c19ee7dccf75687a2b612f7af9569f4f3a731e8eec49eba2e244c1ced6107ed51cdd377f8d026cf6589a49c3314c60d38f58a68d7e82415 SHA512 910454c7d138693e0020b922b7b32749fdb70bb6057f4f16c7d72e3385cf278ce0dbddb0d75e57a90d5cdc14b10c0bad740d77c085d2f8d14b25b100b594a597
diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.14.1-r1.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.14.1-r1.ebuild
index 5e94807c6144..b0d721048556 100644
--- a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.14.1-r1.ebuild
+++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.14.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 
 if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
diff --git a/x11-misc/picom/Manifest b/x11-misc/picom/Manifest
index a04e33105123..8c4bed07146a 100644
--- a/x11-misc/picom/Manifest
+++ b/x11-misc/picom/Manifest
@@ -1,5 +1,5 @@
 AUX picom-7.5-no_opengl.patch 680 BLAKE2B d0d0e9cf752ac003bc312b736dd64388924b6a0371180da0aac7578a85b988c554c7d30a4e419b930775020b99480fed2c1fbd95868989c94ad9997727fdacfc SHA512 b15c5a471bf343667d3fbc14d16d04789eaadcb2cb906668f6235a085c3a91c2bf0e1f0822a5dc5bab5272ca7b1dd3de97087faa6916526ca49e703ae69772d1
 DIST picom-7.5.tar.gz 219456 BLAKE2B 54113547b575ad6aa1329e92ae331b7d49207fdcdc6b49d31d8ab125f7335730a7e53b260c6a6c33d5350bec1e9e6357fd34023dc7837de165289446f8f492b8 SHA512 6535e5eab1a243bbee62448bc48830b7ea3566f94b2c45d9ca76fd8b8056e1f00e55f0e4b58110364d2c4f56652cc005622d644c1db1db41d2811ecc19e6d44a
-EBUILD picom-7.5.ebuild 1319 BLAKE2B 3eedb0c1c067387f223bee4876ef26d6a4398edfe799ddb8e0863fbc95b7710473a7c1221e74d130ac24f60b567c6d64f53b8c13d4f058b159297a56a5207b10 SHA512 d83a6f837462b0853f9ff0e42497440be1008914209ee609cf48c0e96bec1531d79155192dcf5621b5ade55fb9e837d789ec93a8dcb68808fb93fb388ab82c36
-EBUILD picom-9999.ebuild 1037 BLAKE2B e56f67c6bfaddb20669f4a298cdafbb96870757ce2ac9659b05758f82c8dc893f3188b606150b859b7def9c61abc9acf20b2c62d4b4a623fb3c3dd841ee8e88a SHA512 3102f7c837005513855a3ca06d4f219cf3fe816b1e546e9c0e98f913fef6acb980979efcd5b1decd759f799ee2178a9b37a2bb5487caecbbd57a7365a27dbb4a
-MISC metadata.xml 577 BLAKE2B 03bf133766c29ef57009d5f5ccec8d6557dbf2acde1a234dadcd6a49fdb20f0b59c2dc4c6aaca4dc9f668e31d067e98491916c040c1992e6e845c0efae9dda10 SHA512 46f801d5a03d4dd377232a866a40d90316f5f93746cdb89e179df65c0dc333d338e49070dcc5f49eeac6625c1376c678fbdc326e140902c0bb28cff4ea4c515b
+EBUILD picom-7.5-r1.ebuild 1337 BLAKE2B b182183e4f925658e829d85e5f8ac7338e1163c7346fff50659a92a713ed97a3a215b0cbc018732144920c9823b365e7a7ceb9b1e598df38fbbd2d769d0d73e2 SHA512 81d006790296018f0057098f9485a74f25b867a1685a189f7b26a1f43bdab80539aeef41c35d6a4a5d381f399bf84e5c1df5c08c6ba7da488295b8c69649592c
+EBUILD picom-9999.ebuild 1057 BLAKE2B e5d700777b0e76cbec5967e0149f61842c79de34372f861fe9ea0256d079aa20004a6f77eeba74655f9e63de8b24e9548816dae5a12648bf7fa0a8410da086fe SHA512 9e60499fcb059bbc8a846ca532daf07ba0cc02e7b56fbf956a5f52a3b84cd75e1049349be779f5ba31f87275ca6010a9df8f3f5fdbc0b45df4df0aef76613e4d
+MISC metadata.xml 677 BLAKE2B 3d9d1ca23a81c30ac451c45ecad35c3cfbc63ea0a1d5c2cfed587990b33158ca8b3c188fe611aa51b77d2c66a270f8cc95ea5f38cb6270bd1ebf92411cb8ba8f SHA512 9a77cc79578426ae9e1e89e471d4368ef662f3bff757015d4cb48f08e2cbec446753ad16233bafde8ae1c61da0ec1bbd8539534c6097c7525c5905532c8cc9a5
diff --git a/x11-misc/picom/metadata.xml b/x11-misc/picom/metadata.xml
index 1cda4a2c157c..4cd1bd6f8bcb 100644
--- a/x11-misc/picom/metadata.xml
+++ b/x11-misc/picom/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="config-file">Enable config file support</flag>
+		<flag name="doc">Build documentation and man pages (requires <pkg>app-text/asciidoc</pkg>)</flag>
 		<flag name="drm">Enable support for using drm for vsync</flag>
 		<flag name="opengl">Enable features that require opengl (opengl backend, and opengl vsync methods)</flag>
 	</use>
diff --git a/x11-misc/picom/picom-7.5.ebuild b/x11-misc/picom/picom-7.5-r1.ebuild
index 5c07720ed5f7..23b072007fae 100644
--- a/x11-misc/picom/picom-7.5.ebuild
+++ b/x11-misc/picom/picom-7.5-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit meson python-r1 xdg
 
 DESCRIPTION="A lightweight compositor for X11 (previously a compton fork)"
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/yshui/picom/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MPL-2.0 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+config-file dbus doc +drm opengl pcre"
+IUSE="+config-file dbus +doc +drm opengl pcre"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -33,7 +33,8 @@ RDEPEND="${PYTHON_DEPS}
 	dbus? ( sys-apps/dbus )
 	drm? ( x11-libs/libdrm )
 	opengl? ( virtual/opengl )
-	pcre? ( dev-libs/libpcre )"
+	pcre? ( dev-libs/libpcre )
+	!x11-misc/compton"
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 BDEPEND="virtual/pkgconfig
diff --git a/x11-misc/picom/picom-9999.ebuild b/x11-misc/picom/picom-9999.ebuild
index 2141a6126a2d..34d4a6e2fb59 100644
--- a/x11-misc/picom/picom-9999.ebuild
+++ b/x11-misc/picom/picom-9999.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 @@ EGIT_REPO_URI="https://github.com/yshui/picom.git"
 LICENSE="MPL-2.0 MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="+config-file dbus doc +drm opengl pcre"
+IUSE="+config-file dbus +doc +drm opengl pcre"
 
 RDEPEND="dev-libs/libev
 	dev-libs/uthash
@@ -29,7 +29,8 @@ RDEPEND="dev-libs/libev
 	dbus? ( sys-apps/dbus )
 	drm? ( x11-libs/libdrm )
 	opengl? ( virtual/opengl )
-	pcre? ( dev-libs/libpcre )"
+	pcre? ( dev-libs/libpcre )
+	!x11-misc/compton"
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 BDEPEND="virtual/pkgconfig
diff --git a/x11-misc/polybar/Manifest b/x11-misc/polybar/Manifest
index 2fba58e7f19f..ce766ea8a915 100644
--- a/x11-misc/polybar/Manifest
+++ b/x11-misc/polybar/Manifest
@@ -3,10 +3,11 @@ AUX polybar-3.3.1-gcc9.patch 1363 BLAKE2B 77c1880a87790218fbb4550e2f09c968574c52
 AUX polybar-3.3.1-i3ipcpp-gcc9.patch 1107 BLAKE2B 9fae68b6d05387c12fe9eb039fb503e704a6686d117b210bad924ca20e601b6ceb00749a5625c975315609b7c754af612983f45674fae1e652717e274ca6942e SHA512 fb695c4aebf5a8660b4ef756c6f434d220d6eb6f3ce905dfed8a7451fc6424c776dc4418ba81a717b9ad6a71c6b165b6740d56fb01afb4cc2e0c3a18a8d53f91
 AUX polybar-3.3.1-xpp-gcc9.patch 736 BLAKE2B e041631bcd110768edf6c56864d574082436f23419bc058f4640e6e19f04ee00301480b9638dc078be4feb1e0430010f6b74cb05205f2d35b9f599bf9523d023 SHA512 cc84e00c13f42b36791e63ae0fad0a51ec3035dc2ebc7d56d7eb0cb895c172741a3173283ded6291cdbea890fd6fb0aedd7aad97d15cfb91ec725e61d9ee9c27
 DIST i3ipcpp-0.7.1.tar.gz 191417 BLAKE2B 62b76a0921c78f374309d26856c01d1467b8bd181ce922fd47daec406afda9d76eea9a1f473b4899e22f99e2ef36fc70f72db1bb17eb1f3e71a8431c2634b915 SHA512 ef9f591bb4436916ad038bcb0c15ea3415d1978ff264fb276108ddac89c98515c464fbf252429f6a76589cb78e1434adba2efefb5a844dadad0e261f3806fb72
-DIST polybar-3.2.1.tar.gz 242327 BLAKE2B eb7bfe6e6d58fb4389016b8e5c73feea3984ce3ccefdb1acf202c6d2873a634e4d096658b850e8534c5c8c56e42ac66b3b8e80dabf5625491e5f56523b043ddf SHA512 e93c33738029b2e56a5dda75cbf3ee804c0d89c406444da6991ea8a5dd00e5544ef51d20f3d67ec293fc55ab7095e8e3057aaf8d1c08af61cf0531297e55a18d
+DIST i3ipcpp-21ce9060ac7c502225fdbd2f200b1cbdd8eca08d.tar.gz 191599 BLAKE2B 85488a6c2ab9c6f653b499ceaa6d8e803dd8b32cd701a7fbbe151f7f3ea2dc30555c520ded53f023a21b119be97c2b07ae1ab413479cfde677e2073f3d48e36b SHA512 0000ba136bd531899ce9e87d458bd6f7d16f45509def37e4fd7aafc16d0e122fe5f56d0eb9dbc3e722dbb6c9812913a7aafa4b749a9c727ab0988908b1e2a425
 DIST polybar-3.3.1.tar.gz 248790 BLAKE2B 30c2cd2ff537f3a2fe2fe7ce489b5a0ab76a54cd42bbdf8b3727e5f4298898e289c6ea10a460385d8bcdc8ab11749255573bf7d728a01eae895a1ed8a2214c27 SHA512 c0bfaf99dcd19f8fcca8bd041c0f9e5f11fb822c92cf12edc2c59e67896f566ee46d1a0d75f5583d393af3a1958c3244a4eb28224f6336e9eaa98a50d740f834
+DIST polybar-3.4.2.tar.gz 253194 BLAKE2B 136dd32d524902fccbf9db2b2fa8ed582d45565aa0e834af9610e6f692ef70d3e5e066c6021060df9cedf2e1aa2c92753e4fc4ce9c0935795ef4b0056c273687 SHA512 2205847ebc03040e8d2a2581d2c70e940157c5dba71e0c2d086c0f0971a6ffd83c42846a85dd93165512f35710e3f3af8b4494bcd695f71ef0ac501f74753dfd
 DIST xpp-1.4.0.tar.gz 84095 BLAKE2B 2af4221953abe7f40473c55cd50c608b54ebc85a62be65af987ed5e6c5eaf56fbd92531788becf39ba5ad52099ac78f36e9b2a2515b473f4d86ed5fda3fa5065 SHA512 d34cbbe2391db36db7dffac0415d26b7487536e97c4d7efd472ab0aeffa4c8e757ee030b05e2aa1cfa8a591ee591bb96a6db7eb9fa5850027f958e92f078739c
-EBUILD polybar-3.2.1.ebuild 1788 BLAKE2B c44044b3a7e3db34d10c9e018e52f192920f8a42fa6ea93e27c3cd0109143d8331c5f28e74958ed90fd569c632aa88257132c61625b0f5fb30cdfdb09f91b460 SHA512 db2abec6f14c08ed7beeff4fe90b2d832b5f249b64e5b0e4897316de597675bf06e4704ae8aa8635ec40fb3eca0e9be81c38889e82ddb7e98b73d99a69529980
-EBUILD polybar-3.3.1.ebuild 1995 BLAKE2B fd192654a14c2843fb90b0e18260923f74e443d1350a7b0cac97ac8d38c980537d160626a92f4ada943ab6f5e083b899c02804b16cb0b1005d763bb64186edee SHA512 4fc06d174eed2b8a0483c5f1dc179e5553985e5f6dec2283d093d7a676282005c5e94ebadc7d174f2ddf34e6e83847cc74d0a72b9b52d300bfa0c377b1e39023
-EBUILD polybar-9999.ebuild 1841 BLAKE2B a87b383b2af09f0f3bea7e62625c3308b6584f0c251fda9cdf7e1c71532e61dc89a3fa246fbbcf7a6a2dd231f67c2d28d4f5cbef535fbab769b04bf915f0e39e SHA512 2f0c7459c3a8cde6c492bfebf73df841aed24580ab3e6ab7df8582930dfb76912a1aa768d1e6c3b37a701d6d29ad013207298ba6811361636105ffc8ccb7ae76
-MISC metadata.xml 580 BLAKE2B 965fdbd2a3799e0c8a9b6f03bfb7e21f1f413a226bd4748d860f4711d60bfadc2d6c2fdb37f3bf9933f2c494e7e6e0c0705c9a0ebef943ec2978f3aaf65c0176 SHA512 15b64a04e588b5edeec9aa5e579881c3e7c5a7f3fb66ed4443f32d50b850c437f65bc9050960710f2bb1e80ea52ccca9ecb19e8bf68fe66edddc8896a58aeeb9
+DIST xpp-8c019e6d7fefd2468791bc1cbf90d68ff7c1ba33.tar.gz 83974 BLAKE2B 6ea8599136288c006b6993bd6c704ec32d82773153733b4bc6a9c3f326eaf6f3b155d92f270eeb14d57b399f7b5ea0f6bdd5cee41bb5bdf4c1650f337b77f857 SHA512 92874b25305b3be777e739122ff82f1ba16b8e2e445e8ee4891918074ea8ea371f2016d7901cfc477d0286a9e15910c4cee431a11eb71e32728bfbf561313e4f
+EBUILD polybar-3.3.1-r1.ebuild 2000 BLAKE2B 25e5a1a09aebc6cf22e708fe0143855b3fe8e88e6245cf756226b5df99f6b6bfcea1cc69b25a05b4802d0a2a3cd66cb660f5f8dfd32622890a9c1dd63c87f84b SHA512 8c1561a3aea06fc221c1a9040b0ae9ac9ecee29ed906db5135e87374ef36fa3a3b3d02941a8f20818692e5bfc557475af63ecbec11ffc5fa9fad609af81d7a56
+EBUILD polybar-3.4.2-r1.ebuild 1777 BLAKE2B 4ae2551bec85db3081df235a8ec2c611d0f1308dcd6bdceaa55fa0abacb500bcf5d62123ce0ab3042e6760dbc9fb8a152b8d37ea051213cc8f3615c457b4c8b8 SHA512 7b44b4d2687f95f11585ce062797346db58a98e93a235b73dddd7e05fb578a07c2f5093a1ff25ac3df1d07d5204195ba593ffbc8c776b403a2c937be70fa125a
+MISC metadata.xml 582 BLAKE2B bd70511d8795f71413b5134b7f2203882a3f7ef8e190ef05b109baf9d1164a47fd4ec9f3f955076cf3634fea7469990b1a725bf151f03a0112604113633262a9 SHA512 447e0e0dfa1cc9563ef6399d6fbd4c1bc49db4eac60263ce6abc1d7b488f3881247b74e16f421ef73061ebbd285491d271554cc468e4a44a9c9f9f25b08e1b3a
diff --git a/x11-misc/polybar/metadata.xml b/x11-misc/polybar/metadata.xml
index 7a2477b509ec..39fc36198607 100644
--- a/x11-misc/polybar/metadata.xml
+++ b/x11-misc/polybar/metadata.xml
@@ -12,6 +12,6 @@
 		<flag name="network">Enable network support</flag>
 	</use>
 	<upstream>
-		<remote-id type="github">jaagr/polybar</remote-id>
+		<remote-id type="github">polybar/polybar</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/polybar/polybar-3.3.1.ebuild b/x11-misc/polybar/polybar-3.3.1-r1.ebuild
index 9601feaf9222..38ba2d04f079 100644
--- a/x11-misc/polybar/polybar-3.3.1.ebuild
+++ b/x11-misc/polybar/polybar-3.3.1-r1.ebuild
@@ -31,7 +31,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 DEPEND="
 	${PYTHON_DEPS}
 	x11-base/xcb-proto
-	x11-libs/cairo[xcb]
+	x11-libs/cairo[X,xcb(+)]
 	x11-libs/libxcb[xkb]
 	x11-libs/xcb-util-image
 	x11-libs/xcb-util-wm
diff --git a/x11-misc/polybar/polybar-3.2.1.ebuild b/x11-misc/polybar/polybar-3.4.2-r1.ebuild
index 480c094886de..0c63677028ce 100644
--- a/x11-misc/polybar/polybar-3.2.1.ebuild
+++ b/x11-misc/polybar/polybar-3.4.2-r1.ebuild
@@ -1,24 +1,22 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
+EAPI=7
 
+PYTHON_COMPAT=( python3_{6,7,8} )
+XPP_COMMIT="8c019e6d7fefd2468791bc1cbf90d68ff7c1ba33"
+I3IPCPP_COMMIT="21ce9060ac7c502225fdbd2f200b1cbdd8eca08d"
 inherit cmake-utils python-single-r1
 
-XPP_VERSION="1.4.0"
-I3IPCPP_VERSION="0.7.1"
-
 DESCRIPTION="A fast and easy-to-use tool for creating status bars"
-HOMEPAGE="https://github.com/jaagr/polybar"
-SRC_URI="https://github.com/jaagr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/jaagr/xpp/archive/${XPP_VERSION}.tar.gz -> xpp-${XPP_VERSION}.tar.gz
-	https://github.com/jaagr/i3ipcpp/archive/v${I3IPCPP_VERSION}.tar.gz -> i3ipcpp-${I3IPCPP_VERSION}.tar.gz
-"
+HOMEPAGE="https://github.com/polybar/polybar"
+SRC_URI="https://github.com/polybar/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/polybar/xpp/archive/${XPP_COMMIT}.tar.gz -> xpp-${XPP_COMMIT}.tar.gz
+	https://github.com/polybar/i3ipcpp/archive/${I3IPCPP_COMMIT}.tar.gz -> i3ipcpp-${I3IPCPP_COMMIT}.tar.gz"
 
+KEYWORDS="~amd64 ~x86"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
 
 IUSE="alsa curl i3wm ipc mpd network pulseaudio"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -26,14 +24,17 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 DEPEND="
 	${PYTHON_DEPS}
 	x11-base/xcb-proto
-	x11-libs/cairo[xcb]
+	x11-libs/cairo[X,xcb(+)]
 	x11-libs/libxcb[xkb]
 	x11-libs/xcb-util-image
 	x11-libs/xcb-util-wm
 	x11-libs/xcb-util-xrm
 	alsa? ( media-libs/alsa-lib )
 	curl? ( net-misc/curl )
-	i3wm? ( dev-libs/jsoncpp )
+	i3wm? (
+		dev-libs/jsoncpp
+		|| ( x11-wm/i3 x11-wm/i3-gaps )
+	)
 	mpd? ( media-libs/libmpdclient )
 	network? ( net-wireless/wireless-tools )
 	pulseaudio? ( media-sound/pulseaudio )
@@ -42,15 +43,13 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	cmake-utils_src_prepare
-
 	rmdir "${S}"/lib/xpp || die
-	mv "${WORKDIR}"/xpp-$XPP_VERSION "${S}"/lib/xpp || die
+	mv "${WORKDIR}"/xpp-$XPP_COMMIT "${S}"/lib/xpp || die
 
 	rmdir "${S}"/lib/i3ipcpp || die
-	mv "${WORKDIR}"/i3ipcpp-$I3IPCPP_VERSION "${S}"/lib/i3ipcpp || die
+	mv "${WORKDIR}"/i3ipcpp-$I3IPCPP_COMMIT "${S}"/lib/i3ipcpp || die
 
-	sed -i "s/.*cpp_error,.*/&\n\t  'eventstruct'   : lambda x, y: None,/" lib/xpp/generators/cpp_client.py || die "sed failed"
+	cmake-utils_src_prepare
 }
 
 src_configure() {
@@ -63,5 +62,6 @@ src_configure() {
 		-DENABLE_NETWORK="$(usex network)"
 		-DENABLE_PULSEAUDIO="$(usex pulseaudio)"
 	)
+
 	cmake-utils_src_configure
 }
diff --git a/x11-misc/polybar/polybar-9999.ebuild b/x11-misc/polybar/polybar-9999.ebuild
deleted file mode 100644
index adddc936af65..000000000000
--- a/x11-misc/polybar/polybar-9999.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit cmake-utils python-single-r1
-
-DESCRIPTION="A fast and easy-to-use tool for creating status bars"
-HOMEPAGE="https://github.com/jaagr/polybar"
-
-if [[ ${PV} != *9999* ]]; then
-	XPP_VERSION="1.4.0"
-	I3IPCPP_VERSION="0.7.1"
-	SRC_URI="https://github.com/jaagr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-		https://github.com/jaagr/xpp/archive/${XPP_VERSION}.tar.gz -> xpp-${XPP_VERSION}.tar.gz
-		https://github.com/jaagr/i3ipcpp/archive/v${I3IPCPP_VERSION}.tar.gz -> i3ipcpp-${I3IPCPP_VERSION}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/jaagr/${PN}.git"
-	EGIT_CLONE_TYPE="shallow"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-IUSE="alsa curl i3wm ipc mpd network pulseaudio"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	${PYTHON_DEPS}
-	x11-base/xcb-proto
-	x11-libs/cairo[xcb]
-	x11-libs/libxcb[xkb]
-	x11-libs/xcb-util-image
-	x11-libs/xcb-util-wm
-	x11-libs/xcb-util-xrm
-	alsa? ( media-libs/alsa-lib )
-	curl? ( net-misc/curl )
-	i3wm? ( dev-libs/jsoncpp )
-	mpd? ( media-libs/libmpdclient )
-	network? ( net-wireless/wireless-tools )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	if [[ ${PV} != *9999* ]]; then
-		rmdir "${S}"/lib/xpp || die
-		mv "${WORKDIR}"/xpp-$XPP_VERSION "${S}"/lib/xpp || die
-
-		rmdir "${S}"/lib/i3ipcpp || die
-		mv "${WORKDIR}"/i3ipcpp-$I3IPCPP_VERSION "${S}"/lib/i3ipcpp || die
-	fi
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_ALSA="$(usex alsa)"
-		-DENABLE_CURL="$(usex curl)"
-		-DENABLE_I3="$(usex i3wm)"
-		-DBUILD_IPC_MSG="$(usex ipc)"
-		-DENABLE_MPD="$(usex mpd)"
-		-DENABLE_NETWORK="$(usex network)"
-		-DENABLE_PULSEAUDIO="$(usex pulseaudio)"
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/x11-misc/py3status/Manifest b/x11-misc/py3status/Manifest
index 8bfb6ad6b49c..7b1ebd40a110 100644
--- a/x11-misc/py3status/Manifest
+++ b/x11-misc/py3status/Manifest
@@ -1,3 +1,3 @@
-DIST py3status-3.22.tar.gz 399414 BLAKE2B eb7da2c86dbebf59ff62f29ca81e697e4c326e36a130513b64cd03de5d79dcf5354a676405242cd0149af6acd43dc561aec6818bf4d6417fdcf8a67bfdf9cad2 SHA512 5139d494bc101cf8f29eb058fa4ae00f7876adeac83d300e342a0566f0b553b60e971bbca4180bf713ec9c4e9d4b2cfec36920f7c6dfc9dbbe8d9f329d62e0cf
-EBUILD py3status-3.22.ebuild 727 BLAKE2B bb056869027dd91f5608fde7b83ee4771bace3171bec976007b436ff84ee09d21f198dc354120655faa7cbbefdd949519140a09803c3069e7dd022eda0ce3456 SHA512 b93f5666683892101224570bc15e63ab77cb8430c892c3dab13aa1a095d0886bc67c230ccafe00e7175f7403241df98fd191731c15c52c80568c00d8f7947ac9
+DIST py3status-3.24.tar.gz 403557 BLAKE2B 1b1b0ceafaaf757fa06a4c9637b4efcec7315662b55e61812af8100048832d5f104f11f36dbe9cbe8e9fd7bc8b8f6f5a0e0a5398aed38b35b249ba47b5418f31 SHA512 4e3aebc314498ba0ebe740455c2cf179715e65cfa72ed690d0d44fa9c2a8c3cf17b5785cd1163481afb8232fbb5e22d47ba60d95479472feb56fcf6e6b1b1eab
+EBUILD py3status-3.24.ebuild 723 BLAKE2B a4fdd260b5153ca22d22a456a6565e74bca40196afe4da5a6eb24f2240c08b97ff22f2bac2f704a0cb45bacbe931611ca0bbb87d8921ceb71448777c7d3b6967 SHA512 3d13a14382b80a7c1306de839a36c18822f6982860f9fe9bd342424a632d83ec818411b933087b3fb06e23beceecea0baf2c4d278e707f33377d3b959bfb476b
 MISC metadata.xml 742 BLAKE2B fb30bc364ed1b07670aaff51142a99a185c06b7f20661e3ed9cab9b3a21040fcbc15db807102af9c580a6c80071267c6883fe4d5a152c109e14f9d03e213f2ec SHA512 2a30e73f6450a2227574cda7f1f0d10a6eaa6f5919fac21c51578e025efe02a831582237013648b66b1061241c51f6598ac6f0c31e6edc9d05a4d5be8417f2de
diff --git a/x11-misc/py3status/py3status-3.22.ebuild b/x11-misc/py3status/py3status-3.24.ebuild
index e0e182b53d5d..9a663f1dbd32 100644
--- a/x11-misc/py3status/py3status-3.22.ebuild
+++ b/x11-misc/py3status/py3status-3.24.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 SRC_URI="https://github.com/ultrabug/py3status/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/x11-misc/qlipper/Manifest b/x11-misc/qlipper/Manifest
index 4cf81b517d59..23b98fbd3ec1 100644
--- a/x11-misc/qlipper/Manifest
+++ b/x11-misc/qlipper/Manifest
@@ -2,5 +2,5 @@ AUX qlipper-5.0.0-build.patch 1690 BLAKE2B 904b17740275aba865f5dc619a4dd95862f2c
 DIST qlipper-5.0.0.tar.gz 94281 BLAKE2B 04834165a70d71fad2ee945c0b8389ffefef110554d234e0b1f25f02f7b33a0c8cf809cafd7f7a74a2845f949d35a6ad8045d23981efdd9e6c091c5e61ac9367 SHA512 d2bd834f33531a175201244bdd6e9436da16c6f77e1fdc79616c8c3faef531ae50d4cc3b072074fd5efa494cc7be30ffe617912cf54494a66a72420095b0c642
 DIST qlipper-5.1.2.tar.gz 104652 BLAKE2B 841b984d4720dfe7d69424a79beee8d84f5d66109ac1afb75c39cf16ff27da309d929f91eab2222e43a547d4d010809f31d59adb321c9f9f0ae19fb580cff0a2 SHA512 1ad49424855abf5f446026856178291b6ed8c1152338013f2228bbe5a923bc2e989754fe41e8b03f069f815c3850073eb1063842b5f40462005693a9029b187b
 EBUILD qlipper-5.0.0.ebuild 774 BLAKE2B d416c001338ac1b644282e4d2ab6c9153030a77c6d73d9ed27c55f98120f11d09a4bfbf6440b64c5352ae58f7b6d59b7d3fb0e9426d6b714d4d7308a8346ec4c SHA512 214ef740bea26e7646f77fee465aba7f25f566783503e5b66556e537cfb29cdca6588614a4de1645c01d84fb7fdfd6830d0285f77d1debf1c6c80e8f6dff0b51
-EBUILD qlipper-5.1.2.ebuild 677 BLAKE2B 376cebca925e412e1703692c4d2a15d6938fd77e22e79487f49f21c46cc4b889476332e364dd5a04494501891243be69e18969be27e3a953a0a01dbb1fdf9934 SHA512 682e947c392351738edd067eae01cf3821fa10f1f07682772c979bea828e71243356eff716c19dca1dfe6bdc38de5b603c2d712a80f558f3b411e3c904d57078
+EBUILD qlipper-5.1.2.ebuild 671 BLAKE2B a0fe5b0260495a908d09d4705501217a7c89e24f1e0bc5d89583de072aa5e7567fa26137a3fff7ac8619544a72e7a75bdb744db8186dfe4bf1454f3fe3daa7d2 SHA512 0f8941454f8227e3392db067595613e8ea97fd55b8a6fe2878c862af9713713483d2ae265e9660920507d6b6834d0bde6df1f691446fc11371b1452598a4e169
 MISC metadata.xml 326 BLAKE2B 345890725be13fba9c48c60bcdf1be0b14d41d803820fa1d7fa170d44c442a60c50454552697386ddd3732b3d5226f8c96e66fea9bd1b75a1a7c48a08d8e3520 SHA512 5a8bfb530bd363777d529b7b70eec99ba70e6ee41ad9f6fb5ba7fd4c9259ffd381d4343d7a1c6dce34fc1566f5cab4fd474bc3726bbee49edc92d78250d87775
diff --git a/x11-misc/qlipper/qlipper-5.1.2.ebuild b/x11-misc/qlipper/qlipper-5.1.2.ebuild
index 412e6dbec0e2..d4b0e226ba39 100644
--- a/x11-misc/qlipper/qlipper-5.1.2.ebuild
+++ b/x11-misc/qlipper/qlipper-5.1.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 
 DESCRIPTION="Lightweight and cross-platform clipboard history applet"
 HOMEPAGE="https://github.com/pvanek/qlipper"
diff --git a/x11-misc/qps/Manifest b/x11-misc/qps/Manifest
index 4c9d36c51766..2997a6bcb6f9 100644
--- a/x11-misc/qps/Manifest
+++ b/x11-misc/qps/Manifest
@@ -1,3 +1,3 @@
 DIST qps-1.10.20.tar.xz 209588 BLAKE2B abf50904a97e9d2f5755bfc25509266de9c4b5a941a1010f93f475f02e8801b970ba112b01727e076c7b232cf23f50f6b8f7d2fe7acf2d8b273686f6a92404f3 SHA512 407130ac12f1e68da3e22543634d101c7a8353363ff1d9c6edbf98ce5d48f149aa5d937985f00109b40bd3cdb0b9a8e9745e845dd921be4aaf119022632bb9ef
-EBUILD qps-1.10.20.ebuild 733 BLAKE2B 3bcfc79c88a00a88edd387b315cb8358cacb6a6916ccdeedf54bd349e29b4f2c900625a9958b0b832de0b8fb7b77715c3ff43222629dfb20e45df17e2b2a6ea9 SHA512 3a42d60777cbfb5ed9fa465c456a47c6192c1afcd352e3fe81ca7846b4b39c517b937b600ab1b7016f3d90226505bddcac1877e7e1be26896a8444915889c90f
+EBUILD qps-1.10.20.ebuild 727 BLAKE2B 847407026d32e6c3dd083a20a597d10c5a0a71d6c223d73c6934267a67090e716ddb367b349305941a8db361315a1baa5d7f57fa75d90e14c6fbb5a87018a794 SHA512 e99a6f6c61b0f1caf3e4f408f3e44f163d98775ec13933f48528f433d6ab806d6b80d36ae7a7aa3581c9fb162629499425e3d77ff046b75f74c7f75f99fbcfd2
 MISC metadata.xml 320 BLAKE2B 7a6824c87e5ee071bd4219df12554d6363050a126b5838af05dc627134e57d2452eab17569b3e144dcb476ec35dc41649da438b8eb7b45d9e695b2ad900581fa SHA512 b0c5950c5803e5bb765271787eab2bb755cd681f50ab183a2bb06b9f773d0dc8c959e7d9c3f15d23692b3c106d6a0bfd0db43f439225539a3a019b7dceb33292
diff --git a/x11-misc/qps/qps-1.10.20.ebuild b/x11-misc/qps/qps-1.10.20.ebuild
index 707dc0fadb37..b585aaca7eb8 100644
--- a/x11-misc/qps/qps-1.10.20.ebuild
+++ b/x11-misc/qps/qps-1.10.20.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 
 DESCRIPTION="Visual process manager - Qt version of ps/top"
 HOMEPAGE="https://lxqt.org/"
diff --git a/x11-misc/qt5ct/Manifest b/x11-misc/qt5ct/Manifest
index 68baebc976ae..e72a73a913aa 100644
--- a/x11-misc/qt5ct/Manifest
+++ b/x11-misc/qt5ct/Manifest
@@ -1,8 +1,3 @@
-AUX qt5ct-0.35-fix-qtdbus-automagic.patch 1194 BLAKE2B 7a076ca63cdbcae61a517f91c501eeb48a93dd484b6472d95fca2e4ffcbd7240b2169d316e9f5f10385c7fadcfd89195ed13ab673b2de8769d71520e7f594874 SHA512 e90688a59a3fe81cb8ffcce290d061728dcc662b3763e258745361e2eea2a6b32efd51e0e338378b83d2fe5ba73c7984e8d5f858e8ad772ffc19246b4465de60
-DIST qt5ct-0.35.tar.bz2 62547 BLAKE2B dd61f151e1c6c58095889b90cb30bb2baaf21fd8f181af37ee43c1d00404655d57c941cee905e737aff29122ae3f588d5c7ba46dc80ca76d749cc2dd66f35d57 SHA512 2bd24221d391c420e73488738ff10762d27eb21fb28dc69da27dcbfface0cd0f16049768b55867a059c93da07eddb76da1bc63aefd516e07e5049c847da3970a
-DIST qt5ct-0.36.tar.bz2 68181 BLAKE2B b2bf21a1e3f4c6045af5f2e633c2a839bdb49165eb7f3a7d84021faa1c178e4ab84556460c2aa5e2b530fa32fdf29e0f7d3b37c9c839b7bbc7cfc8b77dffbb70 SHA512 dfd6f85328fe8f14c8f2349bc0cac698e549350e2c000a73ac26474ca38ec5f44fd4ebed9b6976fc3423dda8322fd80355eafa6ecbec17495d1e2278c3189a88
 DIST qt5ct-0.41.tar.bz2 73009 BLAKE2B de6360feb16a82b262c13e6a3cbe226b7be7c3e95b1f1262b3802de59fc3bb8820c935b170a15a88e80164e6167f6259777c65fda6a3f8fbf1d115a63ddcc1f2 SHA512 a94f9996dc2198d3c8c9af8610912d12b915b8c547a49c36f7bc083b6f237b318d7903e91fb6fcfe06996a319c361104c1923e6d0c49446b6fb66a1e44fae009
-EBUILD qt5ct-0.35.ebuild 1092 BLAKE2B e429fdfa2eb628ad2b6ca420258dc45873fb1b4d3d904905c06dd9489bb69a913b8c69c6e5136e0f422700c8c9f32717b36c4ba3dd8d6e4bdc29096d09f88578 SHA512 57ae70772ae917725776b4debcd2a90264655d2c4c5705fb7c07c12da2fba77917152f47832dcb537990803649e0152e16a09ad25750a2c954868ea2b612f600
-EBUILD qt5ct-0.36.ebuild 1006 BLAKE2B 8fa017e3c33f1b112eea963812b79d68e631e4ba7a80f4feab0d9c9d3ed9bdc864d4d7c80f096372f5a39e181224c98c2deb4d2261c4a9aebc1aa1959e32284b SHA512 6ead937acf5c95faeb93cd4d4cebfbf97dfeea957c603b0e17860434596d67f53be5fe479726da3cbdbed67268bfe9cc91e71aca6ad67cd75b68f73ef56d91cc
-EBUILD qt5ct-0.41.ebuild 1028 BLAKE2B 2181cc64c94ab108d01ac515edc841c49d590cdd913e546e81f04cc2be1490799209714b68360560903f9d239a20d34af669a885bb5f983b5b3e82e7758208ce SHA512 e80db966a56257d75f7e3c13f708b05682701902d877d4ee4a3b1ae8cc8f86a70a2282b93e4bbdb672192083407a0a574b391beddcb9f56d07d501e14169b3f5
+EBUILD qt5ct-0.41.ebuild 1026 BLAKE2B 64c305e03b1bb2d1b534cb1fae06816821606bf28fedda93c326e0c7b7c23c49f846a3ab08be11cab61a45a75c3e7644d60c0605b353ddac582f4ad6a6321a49 SHA512 9a58316f68fe1c57b1e94594c47504bb0cbc4091e403b86fccf0be6ff74e745703d7d2f7b60c511cd7078da73e10d228fe6f2fabf49331b1c4bd3ae3de0be23d
 MISC metadata.xml 566 BLAKE2B dbb30222ccd1079489ce54e50d5d4ce9a3b9e9acf38d4cc30a402f81418685a3cf86f1adae23d85a409f9866ca11ec1321e543e14bd37ed13a45d02a32accc15 SHA512 d40c24dd0cc2d0b2c79251cf1fb2540dbec484653817469198f4ad7e41164a8c518442c5d11764f0c8aa53bd7ae9758629acc7ba4a4c9f2a374af13cbdaf67c1
diff --git a/x11-misc/qt5ct/files/qt5ct-0.35-fix-qtdbus-automagic.patch b/x11-misc/qt5ct/files/qt5ct-0.35-fix-qtdbus-automagic.patch
deleted file mode 100644
index 2363e559370a..000000000000
--- a/x11-misc/qt5ct/files/qt5ct-0.35-fix-qtdbus-automagic.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: src/qt5ct/qt5ct.pro
-===================================================================
-diff --git a/src/qt5ct/qt5ct.pro b/src/qt5ct/qt5ct.pro
---- a/src/qt5ct/qt5ct.pro	(revision 485)
-+++ b/src/qt5ct/qt5ct.pro	(revision 486)
-@@ -5,7 +5,7 @@
- QT += widgets
-
- greaterThan(QT_MINOR_VERSION, 8) {
--  QT += gui-private theme_support-private
-+  QT += gui-private
- }
-
- SOURCES += \
-Index: src/qt5ct-qtplugin/qt5ct-qtplugin.pro
-===================================================================
-diff --git a/src/qt5ct-qtplugin/qt5ct-qtplugin.pro b/src/qt5ct-qtplugin/qt5ct-qtplugin.pro
---- a/src/qt5ct-qtplugin/qt5ct-qtplugin.pro	(revision 485)
-+++ b/src/qt5ct-qtplugin/qt5ct-qtplugin.pro	(revision 486)
-@@ -4,13 +4,14 @@
- TARGET = qt5ct
- CONFIG += plugin
-
--greaterThan(QT_MINOR_VERSION, 7) {
--  QT += gui-private theme_support-private
--} else {
--  QT += gui-private platformsupport-private
--}
-+QT += gui-private
-
- !equals(DISABLE_DBUS, 1):qtHaveModule(dbus):greaterThan(QT_MINOR_VERSION, 5) {
-+    greaterThan(QT_MINOR_VERSION, 7) {
-+        QT += theme_support-private
-+    } else {
-+        QT += platformsupport-private
-+    }
-     QT += dbus
-     message(D-Bus support: Enabled)
- } else {
diff --git a/x11-misc/qt5ct/qt5ct-0.35.ebuild b/x11-misc/qt5ct/qt5ct-0.35.ebuild
deleted file mode 100644
index 267aa5d98901..000000000000
--- a/x11-misc/qt5ct/qt5ct-0.35.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-
-DESCRIPTION="Qt5 configuration tool, similar to qtconfig for Qt4"
-HOMEPAGE="https://sourceforge.net/projects/qt5ct/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="+dbus"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5=
-	dev-qt/qtwidgets:5
-	dbus? (
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5[dbus]
-	)
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-"
-
-PATCHES=( "${FILESDIR}/${P}-fix-qtdbus-automagic.patch" )
-
-src_configure() {
-	eqmake5 DISABLE_DBUS=$(usex !dbus 1 0)
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-
-	echo 'QT_QPA_PLATFORMTHEME=qt5ct' > "${T}"/98${PN} || die
-	doenvd "${T}"/98${PN}
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		ewarn "qt5ct configuration won't be applied to the currently running sessions."
-		ewarn "Please relogin."
-	fi
-	if ! has_version 'dev-qt/qtsvg:5'; then
-		elog
-		elog "For SVG icon themes, please install 'dev-qt/qtsvg:5'."
-		elog
-	fi
-}
diff --git a/x11-misc/qt5ct/qt5ct-0.36.ebuild b/x11-misc/qt5ct/qt5ct-0.36.ebuild
deleted file mode 100644
index d69df2963cda..000000000000
--- a/x11-misc/qt5ct/qt5ct-0.36.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-
-DESCRIPTION="Qt5 configuration tool, similar to qtconfig for Qt4"
-HOMEPAGE="https://sourceforge.net/projects/qt5ct/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+dbus"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5=
-	dev-qt/qtwidgets:5
-	dbus? (
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5[dbus]
-	)
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-"
-
-src_configure() {
-	eqmake5 DISABLE_DBUS=$(usex !dbus 1 0)
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-
-	newenvd - 98${PN} <<< 'QT_QPA_PLATFORMTHEME=qt5ct'
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		ewarn "qt5ct configuration won't be applied to the currently running sessions."
-		ewarn "Please relogin."
-	fi
-	if ! has_version 'dev-qt/qtsvg:5'; then
-		elog
-		elog "For SVG icon themes, please install 'dev-qt/qtsvg:5'."
-		elog
-	fi
-}
diff --git a/x11-misc/qt5ct/qt5ct-0.41.ebuild b/x11-misc/qt5ct/qt5ct-0.41.ebuild
index cb755d5ac746..575ed6982d0c 100644
--- a/x11-misc/qt5ct/qt5ct-0.41.ebuild
+++ b/x11-misc/qt5ct/qt5ct-0.41.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+dbus"
 
 RDEPEND="
diff --git a/x11-misc/qtfm/Manifest b/x11-misc/qtfm/Manifest
index 0dd1a7cf8114..6de2d58ca508 100644
--- a/x11-misc/qtfm/Manifest
+++ b/x11-misc/qtfm/Manifest
@@ -1,5 +1,5 @@
 AUX qtfm-99999-cmake.patch 323 BLAKE2B 023794991cc9a91792388e8d56d54542f50cf42ebe0d3a4bbf534d59acb869ada9465ab216b0e2a7978dd60d7ab9a15198f3e272707400d5d6f14b823ef1ac6b SHA512 74ee9c0e39bd826bc73aedfb79208e18bfc1348a49e7c0290d7a96375f3c56ec5d074d463bcf8256cb6ee5155b2d88f7c4c20544193c574db30356260c74bc52
 DIST qtfm-6.2.0.tar.gz 411064 BLAKE2B dce16b79753de31c58b36aa51b2f5555a12e19778ce81ca980bb5775f694d5315df97f4ac7b060653748a3ec2bc69b0f88599bca44696ce8b6a8026b30abbf9f SHA512 44bcef3d9e4111388aa93fd8c51d65a5210e969071d79336a4451a78ec7503867d8c667325eeafa5f85ee922dd787746e6ac94e17a61c07914c12364cfa8951d
 EBUILD qtfm-6.2.0.ebuild 1063 BLAKE2B 11a90f7c2a39a1d13376d0dd811476c74e612c3465ad377c324c486d333b5d4454ad98f99d1c90099e27f509acf054832662adee2a878b14a88995b3a9dc1cec SHA512 cae5d0cc10fb49a56cc60fc256daaf332c5b114472eabf9a9d59368711d06fd550904bcef6115627c2d076928de28dc2d80ff87685fa6929b23d951cea1236c9
-EBUILD qtfm-99999.ebuild 1029 BLAKE2B 954d8340cd54e00502ea6d53a178d398aa897cac6bce74e4ab3361850c07dffc9a864b21462ea7c699b2c3ec34d65a801b6c95d58159fd87d449a9a35d979751 SHA512 711343c211d1e4892baa76c6a441aa12fb383e3ccd8d07c49879d4f03a54690f27ce925e2abf411c178d0411bf1ec659309b48d4449273285d8f7e96d66b5007
+EBUILD qtfm-99999.ebuild 1017 BLAKE2B 332bffa3f90e617f118fac4985d95839b39779d4b300492d956504df39591cf722a3cfa3fdc5c35e78465356670be37f4e358cf6f3b6a45156a6258adf83d112 SHA512 ce70bfe872fa10760601c61392a5a5751d48379810e4f9e26661fe04144ac137f359836d0cf69691ff83d555d80ea95a2e8a61c09dd966353feee586a872a7d7
 MISC metadata.xml 535 BLAKE2B aecaf2f611f0c47f5ec04b5fab8d45d7d0cf4c3b029a4605f2dadcf11237fd3fce56d10e8fab1611e716c70f303ca93deba25c3f884aeb7c798b9e411be7a024 SHA512 28844f26bfd8c62e896340bbe7f8466903eecf97e8eba6f5003c407258692ac76fc2799836c7a27643b1c4f9a5ba7033366414acc8f60b4f72b352e740026a7b
diff --git a/x11-misc/qtfm/qtfm-99999.ebuild b/x11-misc/qtfm/qtfm-99999.ebuild
index 61cdeb65e860..5d0ee8acd421 100644
--- a/x11-misc/qtfm/qtfm-99999.ebuild
+++ b/x11-misc/qtfm/qtfm-99999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit git-r3 xdg-utils cmake-utils
+inherit git-r3 xdg-utils cmake
 
 DESCRIPTION="A small, lightweight file manager for desktops based on pure Qt"
 HOMEPAGE="https://qtfm.eu/"
@@ -39,7 +39,7 @@ src_configure() {
 		-DENABLE_FFMPEG="$(usex ffmpeg)"
 		-DENABLE_MAGICK="$(usex imagemagick)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {
diff --git a/x11-misc/redshift/Manifest b/x11-misc/redshift/Manifest
index 8c6024cbedf8..7ce6f1d64239 100644
--- a/x11-misc/redshift/Manifest
+++ b/x11-misc/redshift/Manifest
@@ -1,3 +1,3 @@
 DIST redshift-1.12.tar.gz 659019 BLAKE2B 09339a57fee192e3428ba4387cbea498f2f9f97eb75a418588cdda3289cfa7b7fada4cb299e983e9e6d2ffe3822c8235082e67bdfa542716b6dee9fc853a8dc1 SHA512 6763f6964b577fc146191af1c67a283a60df5bbdd3a74bfc94f66d5f9f3bef8835a479c6ec8a648b650b83a0e245928884a0f628606ace8c3f58d8319d35036f
-EBUILD redshift-1.12-r3.ebuild 1979 BLAKE2B c8477ee501a0f20c4eaa47a493b1dd9d57479cbbfbe138da5b4130267cfe35b08ed15f3b043e6c7ee706d9632dd5eda6ac343756d731e5b12e3e8fe9f88ee181 SHA512 75925f7e15c02cb83c9d2861e3d696699c4ac64350332eb650e1a801c99b84df4dc126303daf6f16e7ad9b369a200a892d2c06f582cc144cddd54114a3d2a349
+EBUILD redshift-1.12-r3.ebuild 1977 BLAKE2B fca45eb9eb3a3f6002ed981764da972d1c77b7d7a6ac4c8cf84d3aaa48ff33f16c283692318d0ad98c7c5f2b6958a08fc718f15e4b8dbdee35dce48b53330440 SHA512 e6a511a1e6457b38eee0d28f42350b195d1a863e2db07ee812f0f00dfb7f7d31edd18026f363e2f393b0ac112c7826ba89744fe03bdc58e719e706f3b5e7ea81
 MISC metadata.xml 545 BLAKE2B db060df8f3a667a05c9517ed4181b722e4c2f987d7f5aa0085e3d8adf8a0d652fee0ca6901fcab4e75344f3337df4eb1ea15c7555fa2034709c185049155cd06 SHA512 5eb06d120a80deb3d70b3007a4bc8983b276cfb87a5471ca062675770e1e575e29e5b28562e53521976c9ba7c4cd6c95aee7fffb56aa2b1faaed098de42a2bc3
diff --git a/x11-misc/redshift/redshift-1.12-r3.ebuild b/x11-misc/redshift/redshift-1.12-r3.ebuild
index b0a34731e938..609b219706ae 100644
--- a/x11-misc/redshift/redshift-1.12-r3.ebuild
+++ b/x11-misc/redshift/redshift-1.12-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit systemd autotools eutils gnome2-utils python-r1
 
diff --git a/x11-misc/rofi-calc/Manifest b/x11-misc/rofi-calc/Manifest
new file mode 100644
index 000000000000..76ef48bd276d
--- /dev/null
+++ b/x11-misc/rofi-calc/Manifest
@@ -0,0 +1,4 @@
+DIST rofi-calc-1.5.tar.gz 1693385 BLAKE2B 7ff21873ee298c4295f2766917318796d6327959e63d99adc86857d2e05534e77062c9546ba8c6cf645a12ae46147e4583a61fc95dbc6953ee642449ff108d40 SHA512 04213b6489cd9e3c5085a88cee07ee9413819c19d4ee08f6e2eef3ad418d21b5acaf1d4ef21f1495d81694e5706f93598c91ada65f1bcc83ce94a6cf5d50ea0c
+EBUILD rofi-calc-1.5.ebuild 487 BLAKE2B 7e5ebe0a0f34d2fd09d0d6bf5181de919961f24c1dd38ad40e3c80cd249518b097448d2dc1c0cd8177d2d8323595f4e52788b010f93800cd6c10ca269b2aa8b0 SHA512 0abfc58d30bbbe41472a45cac711d0edfb6a9bfe94c7678b0929e79d5ff0fddc0fef320f7369f43a31647b68f9aaaa48d1b68d7839dd665bab84a9e0efe97bf9
+EBUILD rofi-calc-9999.ebuild 467 BLAKE2B fc14f1346f9e5ee3a4199d3f346b0be73ba077311efa515abfef36cecaa6e4299949a6027a0de6190c8ecde529904abb76b2ba2afcf3a605a6433170f66faa34 SHA512 96a703783182f67fb241919b540a5ef2f961a2eed5db80118679bb47eac2c508b695fa1ec389ceaf964860ee9758f878546bf4303e667f9b03757d2289acf2a8
+MISC metadata.xml 370 BLAKE2B 3cab19850ebeec65545fceeda7d1f4be4eec58c742c903e2ebbdb7d9a89540253dbe4be6b368d22f93e66b36f5bf81d5addec44174b23d45dcd4935d62c31597 SHA512 781da549ae0e70ab7dbeada77a20c1ccaaabff1f19629c4affec054880fbdb3c7142ab0a58d2ad2f0f8a297d04f06c842bbc01f8152563d1a7c3d590fe6a9c5e
diff --git a/x11-misc/magick-rotation/metadata.xml b/x11-misc/rofi-calc/metadata.xml
index 081d53a12fb9..08400951b2bf 100644
--- a/x11-misc/magick-rotation/metadata.xml
+++ b/x11-misc/rofi-calc/metadata.xml
@@ -2,14 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>evadim@evadim.ru</email>
-		<name>Vadim Efimov</name>
+		<email>robin@hallabro.nu</email>
+		<name>Robin Hallabro-Kokko</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="launchpad">magick-rotation</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/rofi-calc/rofi-calc-1.5.ebuild b/x11-misc/rofi-calc/rofi-calc-1.5.ebuild
new file mode 100644
index 000000000000..a267871cd50b
--- /dev/null
+++ b/x11-misc/rofi-calc/rofi-calc-1.5.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Do live calculations in rofi!"
+HOMEPAGE="https://github.com/svenstaro/rofi-calc"
+SRC_URI="https://github.com/svenstaro/rofi-calc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	x11-misc/rofi
+	>=sci-libs/libqalculate-2.0
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	eautoreconf -i
+}
diff --git a/x11-misc/rofi-calc/rofi-calc-9999.ebuild b/x11-misc/rofi-calc/rofi-calc-9999.ebuild
new file mode 100644
index 000000000000..c70193f7e119
--- /dev/null
+++ b/x11-misc/rofi-calc/rofi-calc-9999.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit git-r3 autotools
+
+DESCRIPTION="Do live calculations in rofi!"
+HOMEPAGE="https://github.com/svenstaro/rofi-calc"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/svenstaro/rofi-calc.git"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+DEPEND="
+	x11-misc/rofi
+	>=sci-libs/libqalculate-2.0
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	eautoreconf -i
+}
diff --git a/x11-misc/rofi/Manifest b/x11-misc/rofi/Manifest
index 144baeef9006..0bbb28d5e78d 100644
--- a/x11-misc/rofi/Manifest
+++ b/x11-misc/rofi/Manifest
@@ -3,8 +3,8 @@ AUX rofi-1.5.0-gtk-settings-test.patch 322 BLAKE2B 652e0c20262bc18abadc8e540d4b9
 DIST rofi-1.5.2.tar.xz 377732 BLAKE2B 560c5a4d30d143cbb5ca9030086d614a8f56a5e17b75c1b3f3a2e57bbd16de304b733bc4fd6093e716c993051e238811e9e65ffbf165d2ae4723f0bde1b15b42 SHA512 8fbbcaa040148d204878380f7cb96fa31228f72b68a97a5bcf8d8cd69740f6b185f5e5d2bc2e1d35e267a84b21576eb356c33be827fd1b767460665493360c16
 DIST rofi-1.5.3.tar.xz 383016 BLAKE2B 8898af3df161b668b506e5d56a031081c911efc2be37f2dc687e068b58afe906cf9d4186bb166fa953de98eb758d4d125443c6122ccd5c2a861b25cd0473f70c SHA512 6dc4b3c2818f4606e42e8185032788d40c4dae9e67596b3b7f767e8f6ca2963b85602baa4287474520ecdb8e333ae211fce5e7252f3b95e0f90b862040aad117
 DIST rofi-1.5.4.tar.gz 535259 BLAKE2B 8560dfee631c66a6f2178c0af6926ef317ed6d2cfe3ae46264e5b1ce429113ce810e4fed4c86a81acbbd51c85ad2593f40a39d982d7da0aa8ccc55537cadd2bb SHA512 181dedb0905bfab76f7ad313d299f4c80ee4efb11a2c6345b16044b7fb3f54bc7e304ee9352e562932e55108e328e5f6bd2c1d7fd9bcdec3d8022c2dc4f8d394
-EBUILD rofi-1.5.2.ebuild 1053 BLAKE2B afee9e957584e67ded803e89aa986369bd29ef33405c29bc9e351609775d12f943df0b29bb8e518d5f739b5b02e4ae072d9c845bc94a3731802f157b43857082 SHA512 8668478992eecfc9de41dba312507a1a6da6efb2397757c495bd11e7d03f96aad7a6031ba1ed71dbc208274e39f1ffe0adfb3aa7158d37911cccabf9e6ecaf3e
-EBUILD rofi-1.5.3.ebuild 1055 BLAKE2B a96e23febe9caad878d7451f3fee8f40b990d195f88bb6d4fb1e9af61e1820a67cc08e9beb33f096f35009144ce1a3701995ba4f9ed12ab9e7e0f044c7130dc3 SHA512 0df25001fb622679aa08792ed630a47d8fd1a9374d51f063ff41c891ebe42dd435ab11160dc926906d1311e319421a8a56ab8067926312a0273bb1f6efd3b7b1
-EBUILD rofi-1.5.4.ebuild 1055 BLAKE2B 7b1911c35a0a3fb7b2531d3529d6297f55e013fa42659d064fc1fc4a73bdd03c1c09568207692f70bcc707586719ba4f7e5326eda67903052ae0a7bfef57416b SHA512 1e17936aeabcdd1dd1c854976a4a41799a7a825183b93e8f245587baf908199360668921f4a6d3356f9a1c15c22078672a975a4c970b909ce9df635071c149de
-EBUILD rofi-99999.ebuild 1014 BLAKE2B e14a555da1dd4b72fb5b885e2f6dcef028f9e245cde72e9c323d3d9b78d73838c79f8cc092ab2e7817468d5da98a246836fcd30a68840c101682d19075269bb8 SHA512 09cecb99658f34c2024508b098be0b0416eaf454c9e9ae892131370768f9a87bdde2b675160b3020e65ace72653614132ade104f739a9a0726f440fc69377059
+EBUILD rofi-1.5.2-r1.ebuild 1081 BLAKE2B 641d5c54db41f33ab5af9517e90e3e490c7252451e713f112a6402bc6fc26b439422dd9e3be0e0c817dfce48a4a9fff9867d0aa5dd4cbf20eb80be77ea8d1a79 SHA512 4dc08ac1432671ffc5082c09d08e7f40fc19c68862db1b0aebb77c4ae9a37e4e985d41cf18b3005eee29eb3c060c3088b6bff4439ac07ac67557bad470b9e8ad
+EBUILD rofi-1.5.3-r1.ebuild 1083 BLAKE2B 6b7aa2ea9455df9474cbc4a4689b4df3edd5a868edde2fbd7624a9e87b8ffe68cf852c92eda272eecf27a2ae2faf31e30e3ac41fdebf86675bc419cf89621fc3 SHA512 95a62f9b6e453bd040983f87077c3627ca917936c935eb4637f59fde5e64dd5f692872057995e25d3f5c529741736ddbd054b2c542034ec9b8b66e19122e3d16
+EBUILD rofi-1.5.4-r1.ebuild 1083 BLAKE2B bd26a1e03668fdf881439b00fd9f4301b247c86df777e9a860c3b14f45eb0c0a4ad9e53cb9d2a2bf83db1aa97a94760f0616c1daa0490e7f1d1dd054e0ad3b38 SHA512 f3adbc65a8eadd2cd0e8c3e798b228a85d069f656e92bbfd1b20eaab72c81b77f75684d15cb85a6941de1c5176e5aae24a3d5e50f3d59d829e517292193edb85
+EBUILD rofi-99999.ebuild 1042 BLAKE2B 86d9f5a16bcb1badb899263302409d32fd049347648b255f5bd349c548e4acd72485a386b907236fe3cc97511a25e2d2a743e32dc1f1f71c39881fdeeeedd275 SHA512 981cd25e3025dfe0a2801ebde587c9786f61ca40fe7affc79ee9c3614286e6b23e4b2e9d06441fbdc63de1199b5f6b5c168863df9eaf89088813a41f2c0c6a7f
 MISC metadata.xml 495 BLAKE2B 0a6c59c1d1db2ae103cf8165f39dfda9beb4dad681379f6f6bed7cf3f0a44f06e9cbd77457dfea4bcb0c42e3df8c6e2c7c83ea4a9185e1a4131db214d26058cd SHA512 afcce018b90e20d190e8da510c57b27b92508a40972fc5e573c185561dd0daa3ce3fd57c689c2ec65902087aaec7d1273ed151abdc5c6be76706f694c1c9510f
diff --git a/x11-misc/rofi/rofi-1.5.2.ebuild b/x11-misc/rofi/rofi-1.5.2-r1.ebuild
index 0c49e367f508..5e2e6bf96b48 100644
--- a/x11-misc/rofi/rofi-1.5.2.ebuild
+++ b/x11-misc/rofi/rofi-1.5.2-r1.ebuild
@@ -6,7 +6,7 @@ inherit autotools toolchain-funcs
 
 DESCRIPTION="A window switcher, run dialog and dmenu replacement"
 HOMEPAGE="https://github.com/davatorium/rofi"
-SRC_URI="${HOMEPAGE}/releases/download/${PV}/${P}.tar.xz"
+SRC_URI="https://github.com/davatorium/rofi/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
@@ -18,7 +18,7 @@ RDEPEND="
 	dev-libs/glib:2
 	gnome-base/librsvg:2
 	media-libs/freetype
-	x11-libs/cairo[xcb]
+	x11-libs/cairo[X,xcb(+)]
 	x11-libs/libXft
 	x11-libs/libXinerama
 	x11-libs/libxcb
diff --git a/x11-misc/rofi/rofi-1.5.3.ebuild b/x11-misc/rofi/rofi-1.5.3-r1.ebuild
index b6894cba5a94..22201929529a 100644
--- a/x11-misc/rofi/rofi-1.5.3.ebuild
+++ b/x11-misc/rofi/rofi-1.5.3-r1.ebuild
@@ -6,7 +6,7 @@ inherit autotools toolchain-funcs
 
 DESCRIPTION="A window switcher, run dialog and dmenu replacement"
 HOMEPAGE="https://github.com/davatorium/rofi"
-SRC_URI="${HOMEPAGE}/releases/download/${PV}/${P}.tar.xz"
+SRC_URI="https://github.com/davatorium/rofi/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
@@ -18,7 +18,7 @@ RDEPEND="
 	dev-libs/glib:2
 	gnome-base/librsvg:2
 	media-libs/freetype
-	x11-libs/cairo[xcb]
+	x11-libs/cairo[X,xcb(+)]
 	x11-libs/libXft
 	x11-libs/libXinerama
 	x11-libs/libxcb
diff --git a/x11-misc/rofi/rofi-1.5.4.ebuild b/x11-misc/rofi/rofi-1.5.4-r1.ebuild
index ba83a26d19f7..11a4a5097e37 100644
--- a/x11-misc/rofi/rofi-1.5.4.ebuild
+++ b/x11-misc/rofi/rofi-1.5.4-r1.ebuild
@@ -6,7 +6,7 @@ inherit autotools toolchain-funcs
 
 DESCRIPTION="A window switcher, run dialog and dmenu replacement"
 HOMEPAGE="https://github.com/davatorium/rofi"
-SRC_URI="${HOMEPAGE}/releases/download/${PV}/${P}.tar.gz"
+SRC_URI="https://github.com/davatorium/rofi/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
@@ -18,7 +18,7 @@ RDEPEND="
 	dev-libs/glib:2
 	gnome-base/librsvg:2
 	media-libs/freetype
-	x11-libs/cairo[xcb]
+	x11-libs/cairo[X,xcb(+)]
 	x11-libs/libXft
 	x11-libs/libXinerama
 	x11-libs/libxcb
diff --git a/x11-misc/rofi/rofi-99999.ebuild b/x11-misc/rofi/rofi-99999.ebuild
index 04b40fd1fc7e..4af827b67782 100644
--- a/x11-misc/rofi/rofi-99999.ebuild
+++ b/x11-misc/rofi/rofi-99999.ebuild
@@ -6,7 +6,7 @@ inherit autotools git-r3 toolchain-funcs
 
 DESCRIPTION="A window switcher, run dialog and dmenu replacement"
 HOMEPAGE="https://github.com/davatorium/rofi"
-EGIT_REPO_URI="${HOMEPAGE}"
+EGIT_REPO_URI="https://github.com/davatorium/rofi"
 
 LICENSE="MIT"
 SLOT="0"
@@ -18,7 +18,7 @@ RDEPEND="
 	dev-libs/glib:2
 	gnome-base/librsvg:2
 	media-libs/freetype
-	x11-libs/cairo[xcb]
+	x11-libs/cairo[X,xcb(+)]
 	x11-libs/libXft
 	x11-libs/libXinerama
 	x11-libs/libxcb
diff --git a/x11-misc/safeeyes/Manifest b/x11-misc/safeeyes/Manifest
index f11c97cb9c70..6afd1a86f03e 100644
--- a/x11-misc/safeeyes/Manifest
+++ b/x11-misc/safeeyes/Manifest
@@ -1,7 +1,7 @@
 DIST safeeyes-2.0.8.1.tar.gz 314379 BLAKE2B 9a54dfcda3027ecb12261b5e90f5526c4011ddc07bcaa8f80357b60738a5a03673136c5597e0f1414894b548d10a52da13f7cac4bd418c0534c341bcf3b5397a SHA512 06b53d6baad479e4143ae65cc37d01367ff73875083817511903692f493f01f5704a1f37ac95c4ec4aaa66040ec0aa1424e6a76fbea0676584fd531c1547b0a7
 DIST safeeyes-2.0.8.tar.gz 304438 BLAKE2B 5f6b36ae0d214e33035d1a3f7856c2eacd8407b2586365f7c914d69a5744a4d1488f5bcbc1d1c7112b9f237ccdbfa7839c426048e88d2e19e56cf550da33ecfa SHA512 6e7669d9ee6b2167c23307108544b3a3b4a4161fe819569fc7920a7e24af94701b053a2e147f83ce0300a0112e2a66d500055fc722eba89208b6c0cd86b49f38
 DIST safeeyes-2.0.9.tar.gz 291147 BLAKE2B 61f56b7c73964f1663eff4da7965c54ff413535d55fcb3c4dbe2b5caef6f1d8e7330d5191711b87f274cbbf4458d0dff2c0dd6f5531755c556d81455438b46cc SHA512 6a168686faa716bc1da9966250bb55654ccab926775207ff1c2104b2da802ccbd50f916ed9f7cec55ffe2b5b12ea63b5bdefcfbf35f044a7fb9ba9cb4918b2b2
-EBUILD safeeyes-2.0.8.1.ebuild 1006 BLAKE2B e40e2a4ae85d99ed796457fc491362deef24714b21297ed10d665d4bb391c9108c49e8cefa50f4c35744bb5388fa25493fbaf9bdbfe7e01cff4aee658506fc6f SHA512 1c47df7a35b673d655e6a6db0a346c3aa80c8fa2a29ab3bc8966bc42be3492f55355e477695f53743d57d94c5fb8ff0faf60aa1d86fceff3a2e41ad1be93fb6e
-EBUILD safeeyes-2.0.8.ebuild 1006 BLAKE2B e40e2a4ae85d99ed796457fc491362deef24714b21297ed10d665d4bb391c9108c49e8cefa50f4c35744bb5388fa25493fbaf9bdbfe7e01cff4aee658506fc6f SHA512 1c47df7a35b673d655e6a6db0a346c3aa80c8fa2a29ab3bc8966bc42be3492f55355e477695f53743d57d94c5fb8ff0faf60aa1d86fceff3a2e41ad1be93fb6e
-EBUILD safeeyes-2.0.9.ebuild 1006 BLAKE2B e40e2a4ae85d99ed796457fc491362deef24714b21297ed10d665d4bb391c9108c49e8cefa50f4c35744bb5388fa25493fbaf9bdbfe7e01cff4aee658506fc6f SHA512 1c47df7a35b673d655e6a6db0a346c3aa80c8fa2a29ab3bc8966bc42be3492f55355e477695f53743d57d94c5fb8ff0faf60aa1d86fceff3a2e41ad1be93fb6e
+EBUILD safeeyes-2.0.8.1.ebuild 1004 BLAKE2B 4c9d76c967fee8b434334c1f86bccb7737374c5a48c1c450318d86e0fe4dbd394b6c913d41eb1ecb45acdcb5a7d8da277ed50bbb0d16b1c23731d471658e6198 SHA512 78b4a731f0ae6b24b7048f734f12771a13ca9d39cd1f53344a5bcf6d53c9e122717a1da7f16aa89c5f6f102d6b8806f904da483e6a0c6c347984bf44a5dc8009
+EBUILD safeeyes-2.0.8.ebuild 1004 BLAKE2B 4c9d76c967fee8b434334c1f86bccb7737374c5a48c1c450318d86e0fe4dbd394b6c913d41eb1ecb45acdcb5a7d8da277ed50bbb0d16b1c23731d471658e6198 SHA512 78b4a731f0ae6b24b7048f734f12771a13ca9d39cd1f53344a5bcf6d53c9e122717a1da7f16aa89c5f6f102d6b8806f904da483e6a0c6c347984bf44a5dc8009
+EBUILD safeeyes-2.0.9.ebuild 1004 BLAKE2B 4c9d76c967fee8b434334c1f86bccb7737374c5a48c1c450318d86e0fe4dbd394b6c913d41eb1ecb45acdcb5a7d8da277ed50bbb0d16b1c23731d471658e6198 SHA512 78b4a731f0ae6b24b7048f734f12771a13ca9d39cd1f53344a5bcf6d53c9e122717a1da7f16aa89c5f6f102d6b8806f904da483e6a0c6c347984bf44a5dc8009
 MISC metadata.xml 346 BLAKE2B 317884987f99b4eb097fbd1b7166eefab1a7e565340c6dd28a8d485cf926cc8dc8b610a57bb39d6ccf03896bb09b50bff440c1066bf00cbfd059b7219fc4b5af SHA512 f73ca2191cf257ffe2fe79094187eee3cb8eb9eef4108f29e52713ab1e3ccab1148fb28a73e09c7cc723523fcf3b5fadd15528ca015864b38967207dcfb68609
diff --git a/x11-misc/safeeyes/safeeyes-2.0.8.1.ebuild b/x11-misc/safeeyes/safeeyes-2.0.8.1.ebuild
index aac9bb4a3101..583b24353a25 100644
--- a/x11-misc/safeeyes/safeeyes-2.0.8.1.ebuild
+++ b/x11-misc/safeeyes/safeeyes-2.0.8.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit gnome2-utils xdg distutils-r1
 
 DESCRIPTION="Linux alternative to EyeLeo"
diff --git a/x11-misc/safeeyes/safeeyes-2.0.8.ebuild b/x11-misc/safeeyes/safeeyes-2.0.8.ebuild
index aac9bb4a3101..583b24353a25 100644
--- a/x11-misc/safeeyes/safeeyes-2.0.8.ebuild
+++ b/x11-misc/safeeyes/safeeyes-2.0.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit gnome2-utils xdg distutils-r1
 
 DESCRIPTION="Linux alternative to EyeLeo"
diff --git a/x11-misc/safeeyes/safeeyes-2.0.9.ebuild b/x11-misc/safeeyes/safeeyes-2.0.9.ebuild
index aac9bb4a3101..583b24353a25 100644
--- a/x11-misc/safeeyes/safeeyes-2.0.9.ebuild
+++ b/x11-misc/safeeyes/safeeyes-2.0.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit gnome2-utils xdg distutils-r1
 
 DESCRIPTION="Linux alternative to EyeLeo"
diff --git a/x11-misc/screengrab/Manifest b/x11-misc/screengrab/Manifest
index e9a583c2890b..4155b6ba498e 100644
--- a/x11-misc/screengrab/Manifest
+++ b/x11-misc/screengrab/Manifest
@@ -1,3 +1,3 @@
 DIST screengrab-1.101.tar.xz 130248 BLAKE2B 0a81b80249322a8c6b4767b9bae70d43eaa41619927fdd799179d6dc9e15fe0cfb8ef50794890d9f9c84787bb88b447f84452b64f88e114aa3393466b1cf443c SHA512 f253c4015f9c9ae6b53bb4919c0301cc843b0d6f6ab0b8ad88befbd397004aa4838d5900d1af86ed348cbba45fa352ded5192d494bd738c2f2b314e9ad73fb13
-EBUILD screengrab-1.101.ebuild 791 BLAKE2B 26914efb383da59a51edd7dd52d5658c9d06f8260774a00008c69df922da7260a10150452b99c7abf2d2cdc61910875d3259a90b6b258af5617c16c0a7f7f45a SHA512 a8022bb1a01a389c7c682c9563312a9a7b8d1d3caaa618980964c644224758f9d339cd6a6646700d1c9a522e7bc645ddeb643d01868be4d68831c6d354a007b6
+EBUILD screengrab-1.101.ebuild 785 BLAKE2B 18cd2442b3d5e54a0c6a068495f9eed9aad80c3f93090371e9a0f5643f0b7e42f756c62f193a00e7e2927d1e21adf082d17f0ad6cb43e5555d826e895f678921 SHA512 f893303d92d346c78e4ad087f4d4c1597c01b7bedec494a39c8a395d39b4d58a4dabb03f33c6fef8565d205341a99b5150215f5c0c4f7aef6d25869fd4772ef5
 MISC metadata.xml 439 BLAKE2B 87d0955baa4cf7c8587121cb9cbe863bffd94cf8886019b9c97153fdd034aa10425d71e5fbc172be6605534a45cf838b2c04aace8a63e1cf4c6adc91251e2e63 SHA512 991791fce13ef70f4eb0c0916150d0d46ac49dbf5b56b4644cc6b399f6fbbf7f7391ad9359f22f3ffee03759fb3fea1e88905a2f444ede1b37e9a4136f3f6e58
diff --git a/x11-misc/screengrab/screengrab-1.101.ebuild b/x11-misc/screengrab/screengrab-1.101.ebuild
index 250095281d0a..a8de9640bb18 100644
--- a/x11-misc/screengrab/screengrab-1.101.ebuild
+++ b/x11-misc/screengrab/screengrab-1.101.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 
 DESCRIPTION="Qt application for getting screenshots"
 HOMEPAGE="https://lxqt.org/"
diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index df33e1db87fa..69af021eeb12 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -9,5 +9,5 @@ AUX sddm-0.18.1-revert-honor-PAM-supplemental-groups.patch 3616 BLAKE2B 71a4c6f5
 DIST sddm-0.15.0.tar.gz 3520188 BLAKE2B b29a994a0ea2fbbda3f5eaf16885fdfa513a759e5db4d879eed2a7cae1472b90124d2ca65404edae8727a047a9d761b72382dc9ddb206f8dc35b5101856cf377 SHA512 4440acfc6f98ab8efe8e3a441e8dc9ee98615c3544f8adc899bc4f0334e4f1b0d37c1ef823b32cc466adc8fac942cd188b33eb49795e0468a136a959c65c7566
 DIST sddm-0.18.1.tar.xz 3402972 BLAKE2B 99ab43d374e9a3d318f692a6d496d8a6d68927af3c8e8fc2208d7355ec90649a14758b39f5733dd32f942ed569de88085576d4f5f8666f4f97079e0fb6dcb99e SHA512 ff0637600cda2f4da1f643f047f8ee822bd9651ae4ccbb614b9804175c97360ada7af93e07a7b63832f014ef6e7d1b5380ab2b8959f8024ea520fa5ff17efd60
 EBUILD sddm-0.15.0.ebuild 1576 BLAKE2B bcdb6f67b661a3c87b7fe403918ac60cc6dba303e879c8a12e2a0708596c37c5152d406b092cc85a5bacca7c36ef46e942ed054969eb526382662c918bd394e1 SHA512 48839e26239bd57053717ca81a5b6b285677384ce081652fcb774e573a37bb3d56c42489732fdec5d8442550483f3cb2b4b1b936947e3554641bd1e00c17dd45
-EBUILD sddm-0.18.1-r1.ebuild 3142 BLAKE2B 5bd177c229306976db79f0725b0fab2b100a2090673500865641d66ced0f4037cb721ad17f0155773b691d21446fdb01c34b8f3266daba2f459aae382e4d3dbc SHA512 f6f3aeecf9384a18cca3d2b26f90542ca6d947f59738e274e8d77c5ab9ceb9fd82e22a7fd7d1ce370aeb762fef399ed1a6823b16ac9b2ec8b615484dae40de47
+EBUILD sddm-0.18.1-r1.ebuild 3118 BLAKE2B 8df5d8193b5678e03486ab63b03964a3d121699fcbec96c8cd77b296e6bd6134a1f88314ba2c4f4a441ff2db10faad234b6549600174f1a83f0e806e9df08136 SHA512 64234a14d8bec91ecd8fbb26a3ad06d452d702666a24cbb541f19614c6ab950a5ad0f258f44c4dc790275731561f0b33ff8fa6b511422ba853af6b25dce000ce
 MISC metadata.xml 943 BLAKE2B 6bfdf54b23210c7e0d781c2f96358036ac7281825e71e4a8e9cf5fc6d43faf5525cc0ac267c7be2f5eadb08ca830350cf102425d30e19e5e4f92a3a57fc5affa SHA512 8a6b888910d68d5209c070c17e0c2e9dc5d64cf9d70cbf5ce945cfae763f864787fb998eb5544f4e6710c36b0045530780fb27f01944b60d71f60f09e8ecb516
diff --git a/x11-misc/sddm/sddm-0.18.1-r1.ebuild b/x11-misc/sddm/sddm-0.18.1-r1.ebuild
index bc72ee39cb81..f237ad81fa54 100644
--- a/x11-misc/sddm/sddm-0.18.1-r1.ebuild
+++ b/x11-misc/sddm/sddm-0.18.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PLOCALES="ar bn ca cs da de es et fi fr hi_IN hu is it ja kk ko lt lv nb nl nn pl pt_BR pt_PT ro ru sk sr sr@ijekavian sr@ijekavianlatin sr@latin sv tr uk zh_CN zh_TW"
-inherit cmake-utils l10n systemd user
+inherit cmake l10n systemd user
 
 DESCRIPTION="Simple Desktop Display Manager"
 HOMEPAGE="https://github.com/sddm/sddm"
@@ -56,7 +56,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	disable_locale() {
 		sed -e "/${1}\.ts/d" -i data/translations/CMakeLists.txt || die
@@ -78,11 +78,11 @@ src_configure() {
 		-DBUILD_MAN_PAGES=ON
 		-DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	# Create a default.conf as upstream dropped /etc/sddm.conf w/o replacement
 	local confd="/usr/share/sddm/sddm.conf.d"
diff --git a/x11-misc/shutterbug/Manifest b/x11-misc/shutterbug/Manifest
index e29fcfaed3b7..a53af51d146b 100644
--- a/x11-misc/shutterbug/Manifest
+++ b/x11-misc/shutterbug/Manifest
@@ -1,3 +1,3 @@
-DIST fox-1.7.49.tar.gz 5336321 BLAKE2B 0fc905c77bcf32783a04b573a18ef79b9017e92126028bf7ec344fc388d3935fabab3d988787c08ea26e2783eb81418d84168e1c1eb733297624a0169a5b45f7 SHA512 da6c3478370f1e72091675e49f8458a6722eca4735bf89052b2b7ef02f4e74ee41f10c9fcc39a24a1571dd0bb1cdf779e9dea5bf15be20722ca783c9d59eb6e9
-EBUILD shutterbug-1.7.49.ebuild 571 BLAKE2B 77383793a87fb273244218fd17d1564348d08a83c33e8e4a8143814289fab9af3051590526e4174566492dbc08002b9bc512696d20680e72bf94b352b958891d SHA512 1ca55aa86a6139571c461cc26e7a36f83743c4efe361bd1c6adfb26c674084c2d154acd3c97b206c056d32c0884cae671be323f25a722062fffe505eaddab818
+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/shutterbug-1.7.49.ebuild b/x11-misc/shutterbug/shutterbug-1.7.67.ebuild
index 97de0d1eef96..814e72d94df1 100644
--- a/x11-misc/shutterbug/shutterbug-1.7.49.ebuild
+++ b/x11-misc/shutterbug/shutterbug-1.7.67.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Screenshot utility based on the FOX Toolkit"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+jpeg +png +tiff"
 
 DEPEND="
diff --git a/x11-misc/simpleswitcher/Manifest b/x11-misc/simpleswitcher/Manifest
index c044d6af321c..d921b306d7c0 100644
--- a/x11-misc/simpleswitcher/Manifest
+++ b/x11-misc/simpleswitcher/Manifest
@@ -1,4 +1,4 @@
 DIST simpleswitcher-20140219-cbc89a71a61fd2d164c3fdc3ef4d3fa809c1741a.tar.gz 16370 BLAKE2B 5bc23dcb26a99857c943b52b857f227043f3062337815f9d9f7feef05120abcdec31c3d756433e763b984cc8df506c9667954de200f19edff72a7a9efab9dbde SHA512 1c17e1858855d587a85a2ba2c0000ddc3e6da0e8bfdb6703de04a7bceaa575d2db0b8a032f3833c1f08c0ce413eaa1908fa62c6b6c98dba367668a7bceec467c
-EBUILD simpleswitcher-20140219.ebuild 686 BLAKE2B a5faddd8c4afd278d4460ba14a0f4a212330320894d2fe217734180ad8df390d5dc2c2c659c62772603d67c249fe870f66e50ecc59e9c271f81d1274aacb2521 SHA512 b5ffe284c1882792d9623647590c005ef952323d03db315510a081429959c2bbf36de8bff18314c0f096575ec4ba2c3d513f4ec2f4b6eebbe2ec6de84ec67dee
-EBUILD simpleswitcher-99999999.ebuild 559 BLAKE2B 9aa32f29c3e9ceb9bc23597f42164856ebdb91f1701ac10a2f68c2f007757f9609a0b3f68aecf9cfc88b12b0110b32f118e7760070e57f7bac03d7fbe34ba405 SHA512 955d281daac6c34be0e41a13de1c2bd618a24e8605ce10bc15dbdd5971dbd39ebbe02979631cb437d5f8813f05badf439a27bfe30313edd45b7254313b85be4a
+EBUILD simpleswitcher-20140219.ebuild 720 BLAKE2B 2897d763971c7a58cb81ee127f1cb9feb56c96c28ce2db20e6e97e37337215f5dbcada22be11a1bc378d9c129e4b72842cebabd237a497b1dee471e46b612ea9 SHA512 eab556fdb687cc36009ba45633f91c113771f960b5aefec8e6a319c19a9ab1c83fc4a8170e8576a7566e611f614265d7515ab8705184d6044cab724098651704
+EBUILD simpleswitcher-99999999.ebuild 593 BLAKE2B 5a91d509d3241ff7ef2ba1b5f4b5b6b52cefea58b0a085d6734f4ed1e1b3f3151d8500179016f7e96f6f32197ea5db5e6447360c5f5b813f784c2aecf40336de SHA512 39f26d86e6010f84189767c4a618930c7c5e72e1c6379db9829846e4af58abf8f078bfddaab0183050825b889ebefd52e81f74133ad372b55799d6c7738cbfc7
 MISC metadata.xml 307 BLAKE2B e6baba19f9e851500948d66078b74d9f0d1aa06000b8fb13e4de54a43c5d1206a02033375e554995497dff2b431158788d1dd86dafa780a3fcd454ac7a14a8d4 SHA512 3f110a2d7c7a233ee80fd3d7cb3e5a315a04011fd13251d785cbcace59c5b5be3734d3c52eed2c4ad89454b21f3b039a89ae5d80e63735370f581d9e9b0478cb
diff --git a/x11-misc/simpleswitcher/simpleswitcher-20140219.ebuild b/x11-misc/simpleswitcher/simpleswitcher-20140219.ebuild
index 6088df3f2461..bb22d6925991 100644
--- a/x11-misc/simpleswitcher/simpleswitcher-20140219.ebuild
+++ b/x11-misc/simpleswitcher/simpleswitcher-20140219.ebuild
@@ -7,7 +7,7 @@ inherit toolchain-funcs
 SSHASH="cbc89a71a61fd2d164c3fdc3ef4d3fa809c1741a"
 DESCRIPTION="lightweight EWMH window switcher with features and looks of dmenu"
 HOMEPAGE="https://github.com/seanpringle/simpleswitcher"
-SRC_URI="${HOMEPAGE}/archive/${SSHASH}.tar.gz -> ${P}-${SSHASH}.tar.gz"
+SRC_URI="https://github.com/seanpringle/simpleswitcher/archive/${SSHASH}.tar.gz -> ${P}-${SSHASH}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/x11-misc/simpleswitcher/simpleswitcher-99999999.ebuild b/x11-misc/simpleswitcher/simpleswitcher-99999999.ebuild
index 3430c6607dc1..b6f527a178c2 100644
--- a/x11-misc/simpleswitcher/simpleswitcher-99999999.ebuild
+++ b/x11-misc/simpleswitcher/simpleswitcher-99999999.ebuild
@@ -6,7 +6,7 @@ inherit git-r3 toolchain-funcs
 
 DESCRIPTION="lightweight EWMH window switcher with features and looks of dmenu"
 HOMEPAGE="https://github.com/seanpringle/simpleswitcher"
-EGIT_REPO_URI="${HOMEPAGE}"
+EGIT_REPO_URI="https://github.com/seanpringle/simpleswitcher"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/x11-misc/slop/Manifest b/x11-misc/slop/Manifest
index 042f6c548228..d7070526e109 100644
--- a/x11-misc/slop/Manifest
+++ b/x11-misc/slop/Manifest
@@ -1,4 +1,4 @@
 DIST slop-7.4.tar.gz 50079 BLAKE2B 20815270bf1bffe0ef26630fd31d0d4cc7261633cef389e64c232a89033b6e8b5e1651fb5c882e2870808107734c4c088123b85675fa2aae932570d770344dc8 SHA512 13d09c2c9f05760ee0a273edb6d40da8a87989d3f071a8c868a0c7e535ba89b9eb934c79d56212cd689687f86e3683cef1b749ef7b37be3805ea8eb05c796e58
 EBUILD slop-7.4.ebuild 841 BLAKE2B e9d7a1c367746cf7755c53e6e67b49350636a9e492fb4925227301e3bbd75b7fff0305cdcb5d44c0d68545677770b5cc286e9762c68da9175379bb4b0856cb04 SHA512 2d488df26b6f1c39539d9eba88baa621a6166b53b30ec30d68bda1eb617dbd9da5b17d74a2fffc5193012141e1e3a68c180ed6d62d3703dd26d35eab4410e078
-EBUILD slop-9999.ebuild 797 BLAKE2B 78e0a6bb8ed79c037cd209671a436e47410aeea2550494b6667a64c6cb32754edabc2c5aaec61ce49254e2b74a018f69f293e37c37c4701c2807a485e80d6b2a SHA512 a22aface2e5fac1b91800f5eae0aaa6e4a7747396a652e1928d2d9949b09c30f6557f6e7944e1f0a18a728b2477e4d3835b63f2ab99c6a70010232b4120f9074
+EBUILD slop-9999.ebuild 785 BLAKE2B c61b4f4211e3b7422e8c8dd4e66e6a67400a376625cb310107086ea39f1c9f4373e049ed7f3ddf9de882be2273ceb83c04cb0735bb8edf3eae0248737b5c8d24 SHA512 abb85f52dcbebb07eab88e596771be6549bb96eba5a09dc3f2912991ac01ab9c67a80c8b86b17cb97ce1f30b47cb2d1e2dffb98a6ae37661abe3be4b0d4bfbc1
 MISC metadata.xml 630 BLAKE2B dbf7d848908c12d7104c7cd18cd2ca16114073803bd4600e10906a1fc4f86ddeb646359d26885551d998a279d1e11f0d74ad21b135e14a2bea827ef21ade15f7 SHA512 98eea5cce0e8a692076b5cb423a2f0522151d716ef0c9f346e915bfee8590d32dab59c183180ea7f87561bfb92e3840ad710f890a734640173bbcd471d779b0e
diff --git a/x11-misc/slop/slop-9999.ebuild b/x11-misc/slop/slop-9999.ebuild
index efec20aaad05..59a8423ff8f0 100644
--- a/x11-misc/slop/slop-9999.ebuild
+++ b/x11-misc/slop/slop-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Application that queries the user for a selection for printing"
 HOMEPAGE="https://github.com/naelstrof/slop"
@@ -37,5 +37,5 @@ src_configure() {
 	local mycmakeargs=(
 		-DSLOP_OPENGL=$(usex opengl)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/x11-misc/sw-notify-send/Manifest b/x11-misc/sw-notify-send/Manifest
index e286eb54480a..a380bb6ab495 100644
--- a/x11-misc/sw-notify-send/Manifest
+++ b/x11-misc/sw-notify-send/Manifest
@@ -1,4 +1,4 @@
 DIST tinynotify-send-1.2.1.tar.bz2 266078 BLAKE2B ac3c9510d89fdfd50f70fbfad14476e95e14616cfff9d29c9976af5459e2c73a8ddcf5cb578284b177e78743c46594126343933ae87f78a380bca3ce2350aaa9 SHA512 f416db09fa95f04d771610af7ae8953192027b8606c53f54efe514c4d33b59e8dc362676004a036c2dd7e7c7cf03b077ee9b753839efbcb181c5724f43efa58d
-EBUILD sw-notify-send-1.2.1.ebuild 714 BLAKE2B 04b2286af85e64f1be714f5adee1ff201e401417ebd600686a3d4fe31624f999c56c5cd626ab3c7f20b9eb689a68a81b13f8d056471f91078a808f30edb0db47 SHA512 6dd0e80d1acd0e9e72b8135700406333ec8350a952f41dfe1372d010ce6b2bf1eced42ff93656c08f670f7a4890d1317d24a0aad96bbf23142f49156bbdca54d
-EBUILD sw-notify-send-9999.ebuild 729 BLAKE2B f3ba326161e1ee84d3ad61ea7a462057a6c06ee6addef1c44b7a382e2f02573e543b2b6ff6b8ed0bb62ada576785e35205aab796ab8966cdfa41474fbec0ffa4 SHA512 e4e9bc7dceda9c679cc26bdfb9a7a2ef003fa0427572818e099032976e315cd1feaade0e507f62fa8d6425f71ad2dbff4b5084a731937d5ec5289d6399aa95cb
+EBUILD sw-notify-send-1.2.1.ebuild 711 BLAKE2B 455edb6ea90b7304acd1d3263f18a5d5f226a7c55a56cd7c9172b82f2687f7e4747996c605cadad0236fe6eaf597d650048fab6df8be31a5714d53acfdb3f458 SHA512 14484fa318c6682dc47b38569237099420f0ad629dde420f4742b0a861927eeefa592b4ec4083e2b3d4ecf59c5d406783def3211fe6386f95fc6cf4b612c177a
+EBUILD sw-notify-send-9999.ebuild 726 BLAKE2B 432f123092336d4a8946f7ecedfc672284b3c63d142142055e0f4c6ba024d3b6b5d048d2d3b6e5d917354ac9181f2c355bc1730b32802b0506c67c622699c5a1 SHA512 18f29526f09619e3c750711d08b416fe39140f0ef9d5522c928af477180933a2e207b53d295f0fea9cb0ad6b2c183d950093c069cf8d768359a77a4b1f6649f0
 MISC metadata.xml 519 BLAKE2B c7261240f7af182251afbbd993149a71f3a8f70415d07cc7563de754317e80d658e2c4757f9a344a840e2f6afb09ab092f53a4166e494e91b6bb5ae537aab22e SHA512 06ce4c0f2e7b95504cad6f060befa1775845344d085f474497b2f65dc158a3fd6d37cb98317f5fc6d6fd9ebd3f2383b74e6357639a5ab038bb221519342c9bdf
diff --git a/x11-misc/sw-notify-send/sw-notify-send-1.2.1.ebuild b/x11-misc/sw-notify-send/sw-notify-send-1.2.1.ebuild
index 67c06dc2d15d..89f5d2ea4b6e 100644
--- a/x11-misc/sw-notify-send/sw-notify-send-1.2.1.ebuild
+++ b/x11-misc/sw-notify-send/sw-notify-send-1.2.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=tinynotify-send-${PV}
 DESCRIPTION="A system-wide variant of tinynotify-send"
diff --git a/x11-misc/sw-notify-send/sw-notify-send-9999.ebuild b/x11-misc/sw-notify-send/sw-notify-send-9999.ebuild
index c0ac15bb55ec..a7650200395f 100644
--- a/x11-misc/sw-notify-send/sw-notify-send-9999.ebuild
+++ b/x11-misc/sw-notify-send/sw-notify-send-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 EGIT_REPO_URI="https://github.com/mgorny/tinynotify-send.git"
 inherit autotools git-r3
diff --git a/x11-misc/sxhkd/Manifest b/x11-misc/sxhkd/Manifest
index 7adc6d3505a8..5844f4315422 100644
--- a/x11-misc/sxhkd/Manifest
+++ b/x11-misc/sxhkd/Manifest
@@ -1,3 +1,3 @@
 DIST sxhkd-0.6.1.tar.gz 34808 BLAKE2B b25ff934d0a7f28b3950152ef800da90c5f990f2efd92e9178fef8a77939dc1ed1bbde55bb5a990c33fd3d0be7490dfb2e799ca56abf3c3c6f20c258169eb100 SHA512 d8cd6166ff7e7bc800ed79c5d63cbdfad4f9824c5a5e19b6a315b2ec570295150600651376265932f5fde8b6127f629a553337c6454a1c78c62b3395aaeb55a2
-EBUILD sxhkd-0.6.1.ebuild 618 BLAKE2B 5251bee57da1c1b07e00c7b2936cb72dfab1566ae1515c71014e0626c567ce1ce4d4bcfd1c685b000e73a44722cb77d1ff968467d1c88c7abbe016b8ebbe6bfd SHA512 fbf6e5f5e8f72e7653e314670576ff1b650af3d8a604b959a5175c1ffcb723d0ae9019860db05459d74dee48c6129757b3e596a0ce566b01addaffb503ad1d2f
-MISC metadata.xml 249 BLAKE2B 0b2bc12f7ae01111ebb5607fbb98288f43bb8034d466adb84de626c4d98018c737afcd1a3704731096b356d47c20d28d2ba137c693ddd667e3e819a6f2904ee2 SHA512 904ccd204edf617d6951cf8d7afc075b71730802b11debb45b85f7c8892fcbf27fee1811b4d3bafef1805b5fcff271e73a4c4616a9819b209d576a8ec47cc1ef
+EBUILD sxhkd-0.6.1.ebuild 617 BLAKE2B 855913b42866ff8bac062f42d6215bf60b95ff76b120c795fc9288cb0e5719ca647b8668e0afcd7750a7e4be93a6e2a3b3c94e330b1fa1f61490256304656046 SHA512 4a31ec97909773124d3fb04bf3b704b232c09d3f0221a4e1e25eb2ef24f2052b5fb7e19d96b3f2bc1fc41ece9e7e1debb3a13f7af9dff87bd681437b977eee38
+MISC metadata.xml 327 BLAKE2B 2f3ca988674ff92fd3295c19c9ea30c7d55f1ca7527a5a92a677c4eaaa8d1030dad4acf3589ea9c6d1d81499abc74d8d125a915e02b108bbab8b38d56023a671 SHA512 ccb2545217cf7ca34ec62c6b1c41aa02209bfa8d4d2dcced53df8755850c109ffeefb1a1b7c3824efe1de28778cdfa4460ba22e08d58bab795817390231061fd
diff --git a/x11-misc/sxhkd/metadata.xml b/x11-misc/sxhkd/metadata.xml
index 72883d191be2..0b9bd4061f6d 100644
--- a/x11-misc/sxhkd/metadata.xml
+++ b/x11-misc/sxhkd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>johu@gentoo.org</email>
+		<name>Johannes Huber</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">baskerville/sxhkd</remote-id>
 	</upstream>
diff --git a/x11-misc/sxhkd/sxhkd-0.6.1.ebuild b/x11-misc/sxhkd/sxhkd-0.6.1.ebuild
index 72d597e89864..fcdc146ee0ca 100644
--- a/x11-misc/sxhkd/sxhkd-0.6.1.ebuild
+++ b/x11-misc/sxhkd/sxhkd-0.6.1.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
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/baskerville/sxhkd/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="x11-libs/libxcb
 	x11-libs/xcb-util-keysyms"
diff --git a/x11-misc/tdrop/Manifest b/x11-misc/tdrop/Manifest
new file mode 100644
index 000000000000..138d55180cce
--- /dev/null
+++ b/x11-misc/tdrop/Manifest
@@ -0,0 +1,4 @@
+DIST tdrop-0.3.0.tar.gz 19495 BLAKE2B 5f72090e6ccacaa4f708715cb1a2eb43bb8acec79f43301da67dbe0a8d81637806603d06b9ad0b2815e8aea1f481271f5b8f8adddba60079ad48ec621f8e8e8f SHA512 3e1c30e42ce96570fabd43b89fd9f17a23d74c4943ef9ab5d1edb4967ffa6c4c0259df4449ef2a18b396d1057f4a19a413fec817ff708d3e41906695cebb67ca
+EBUILD tdrop-0.3.0.ebuild 651 BLAKE2B c7843a495947365d6b79c223f564144f02aece7c935ef112df23d43d9a7e4c9f388f96dbc430e3483d0a865663343de835f14cceb5d4fc8443421e526cdbd8f1 SHA512 e4765fe0fc68f0050b154b247643265552745e2662717cea86cbbace80487c6cbf7bf47105dc796a4d5f00b6e5dad510ad0d3cd46a0a0b83efa40bcf85bd3026
+EBUILD tdrop-9999.ebuild 651 BLAKE2B c7843a495947365d6b79c223f564144f02aece7c935ef112df23d43d9a7e4c9f388f96dbc430e3483d0a865663343de835f14cceb5d4fc8443421e526cdbd8f1 SHA512 e4765fe0fc68f0050b154b247643265552745e2662717cea86cbbace80487c6cbf7bf47105dc796a4d5f00b6e5dad510ad0d3cd46a0a0b83efa40bcf85bd3026
+MISC metadata.xml 328 BLAKE2B ae4f7167469dea0110c2f60a6853d8418bbff6ddeda3f9750175ade25f750a9e3d165aa5882b697ed35b93749ccae82dadce5b7a6b9c7c5656929286519fbe6b SHA512 9c27673aca0b343a620efad5cdb0dbdc1216cd839672abc94d37066fa4a4e095e2d86464495acc79d391f4d1de207ca9d17bbd705066fcd636b66bc6e8a3b1dc
diff --git a/x11-misc/calise/metadata.xml b/x11-misc/tdrop/metadata.xml
index 9c7ac3781950..e22c540bc283 100644
--- a/x11-misc/calise/metadata.xml
+++ b/x11-misc/tdrop/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge">calise</remote-id>
+		<remote-id type="github">octuid/tdrop</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/tdrop/tdrop-0.3.0.ebuild b/x11-misc/tdrop/tdrop-0.3.0.ebuild
new file mode 100644
index 000000000000..1031384a291e
--- /dev/null
+++ b/x11-misc/tdrop/tdrop-0.3.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="WM-Independent Dropdown Creator"
+HOMEPAGE="https://github.com/noctuid/tdrop"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/noctuid/tdrop"
+else
+	SRC_URI="https://github.com/noctuid/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc64"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	app-shells/bash
+	sys-process/procps
+	x11-apps/xprop
+	x11-apps/xrandr
+	x11-apps/xwininfo
+	x11-misc/xdotool
+"
+
+src_compile() {
+	:
+}
+
+src_install() {
+	dobin tdrop
+	doman tdrop.1
+	dodoc README.org
+}
diff --git a/x11-misc/tdrop/tdrop-9999.ebuild b/x11-misc/tdrop/tdrop-9999.ebuild
new file mode 100644
index 000000000000..1031384a291e
--- /dev/null
+++ b/x11-misc/tdrop/tdrop-9999.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="WM-Independent Dropdown Creator"
+HOMEPAGE="https://github.com/noctuid/tdrop"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/noctuid/tdrop"
+else
+	SRC_URI="https://github.com/noctuid/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc64"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	app-shells/bash
+	sys-process/procps
+	x11-apps/xprop
+	x11-apps/xrandr
+	x11-apps/xwininfo
+	x11-misc/xdotool
+"
+
+src_compile() {
+	:
+}
+
+src_install() {
+	dobin tdrop
+	doman tdrop.1
+	dodoc README.org
+}
diff --git a/x11-misc/urxvt-perls/Manifest b/x11-misc/urxvt-perls/Manifest
index 32b426c68334..ffb22230091b 100644
--- a/x11-misc/urxvt-perls/Manifest
+++ b/x11-misc/urxvt-perls/Manifest
@@ -1,5 +1,3 @@
-DIST urxvt-perls-2.2.tar.gz 14300 BLAKE2B 9b7502b6e4078f4d789e3f3c36881123ea2472c4b86972985b87e7ba88b61bfad637fe6235a8791f31e422da1abe9d07d21b8cbeca8f42056fbb2ce1bfaab5b4 SHA512 3b6c9b71ee2bc6a64762c2c9255ce52c489282797fb2859c17bb83eacae44bbbdf7f22d47de1bb0492753e7cd685fe4bc44c71421a19e162185ad60331b84d89
 DIST urxvt-perls-2.3.tar.gz 14717 BLAKE2B 312f9bb46839b9bd1e702ca80a6ab02c64db3f74345c9dd7a8abf6b7e66126e6ddbc27e85a4046f745b084780e4c7fb0877729764f860471c9ba80104d3493ac SHA512 d941acb6353b0a7a34cefc94064466ee6b9e879a02cb76a10cd14c37e616d05d6e36a156aeb63191dbc0876c00ee927a3b48949d833a9d12b4676cfb0417bae6
-EBUILD urxvt-perls-2.2.ebuild 538 BLAKE2B 83beec57734cdbb0858e4ddf90a70cf8179be9c400e9f61d6ce78a44c6fa74109f47a0d4794ca8ee9dc538980571516c9c88d51c6573a839f544358a95724190 SHA512 9dafeeb6af3469b6e0e7b83875f20c752e255a8393dfce776817bcdbea7e8d9c1b1f745f6d8435d6ce220a37096cabbead2f70434d1a277cb26bce2f6ebcd713
-EBUILD urxvt-perls-2.3.ebuild 498 BLAKE2B 1da9328fdd16f5f189d22d1f381686da40373ef439ed5819f324ca4c79e4c1adee503d65ae080e4d36a74b7167fba6625f7b363ab8fc2fd460e2b78d42694325 SHA512 016516f96ea623c91bb23bb8a1d318d63014d3dae4d8cab9950881d8369a81509afdea4b7a2445d9f6ca91dc40346b1e3c060dfa7cc40bf8adc28515570649ae
+EBUILD urxvt-perls-2.3.ebuild 496 BLAKE2B dd2fca5bb8b61cbb662f8ebc76967766f0e56bac32ce8763a6f1cec62181d695a860118e76f9357e65a397b6b026bf76824488dbd031e553f9542663067dc5ca SHA512 a661577b249964ccfa3b96053ec10cc07cb951c297233022c32ffaba969a324fe123f2bdd6c0d6fb3bf3c1ee7f5c3d2cea5870faae5c43ba53b639f67d1342e9
 MISC metadata.xml 343 BLAKE2B 47097c29ad26e39a51ba211011f592a6893edb60021ffc723615624e48fe1768decf5caa4ac362b2718ee26a8d214b028cf411be088221e8b3f49728de84fc90 SHA512 b95747387d85d46ebbdf0dbca69d091d01124b69c8a758223c247be91944d44c01343d4d46eb97cc138093fd2cbf9abf27ecda76d432b45fe4f3e6981049adad
diff --git a/x11-misc/urxvt-perls/urxvt-perls-2.2.ebuild b/x11-misc/urxvt-perls/urxvt-perls-2.2.ebuild
deleted file mode 100644
index 197cc127f826..000000000000
--- a/x11-misc/urxvt-perls/urxvt-perls-2.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib
-
-DESCRIPTION="Perl extensions for rxvt-unicode"
-HOMEPAGE="https://github.com/muennich/urxvt-perls"
-SRC_URI="https://github.com/muennich/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-
-RDEPEND="x11-misc/xsel
-	x11-terms/rxvt-unicode[perl]"
-
-src_install() {
-	insinto /usr/$(get_libdir)/urxvt/perl
-	doins clipboard keyboard-select url-select
-	dodoc README.md
-}
diff --git a/x11-misc/urxvt-perls/urxvt-perls-2.3.ebuild b/x11-misc/urxvt-perls/urxvt-perls-2.3.ebuild
index 9374ceb4c882..b35147bce410 100644
--- a/x11-misc/urxvt-perls/urxvt-perls-2.3.ebuild
+++ b/x11-misc/urxvt-perls/urxvt-perls-2.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/muennich/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 
 RDEPEND="x11-misc/xsel
 	x11-terms/rxvt-unicode[perl]"
diff --git a/x11-misc/vdpauinfo/Manifest b/x11-misc/vdpauinfo/Manifest
index 3871570b803c..3c21739540b9 100644
--- a/x11-misc/vdpauinfo/Manifest
+++ b/x11-misc/vdpauinfo/Manifest
@@ -1,6 +1,4 @@
-DIST vdpauinfo-1.0.tar.gz 88567 BLAKE2B 6f0834bf6a8fb83204b70858ac529010ab69c55de4b2c6b8b8864ea33aed385bb9125ad12a82a28086dac43f39f06c2b757718142d800b5de2263513e9c5f02e SHA512 54c177424bdae65374a13c0546ecda0e25e7357f9e779fb48dc018a9c11593039f87715ea18b320684dca22455df9b41a4eea6b0f977956efb6ab85b8b99297e
 DIST vdpauinfo-1.3.tar.gz 12159 BLAKE2B 41dc31ef2f45272221e2eea969d7801cc9c8bfd693e64f7d157b17645da654b7f50d780df698736b3e2ea9c55c7d3b6e7ce75f96aacd50bbaa4032dfc753a43f SHA512 2271053c17d389ea600742ffe14e863921f18e504e07cb5db33c98745d2f71aece908408bca0161b3c2fa9cd67de8c741c132a774a4fd9443c7124168a4da79f
-EBUILD vdpauinfo-1.0.ebuild 468 BLAKE2B c05da34e957445e60eb712db339defb72093fd0ce39fcb56c93dee9d67002d9d57507da439e54aed3fb9b89db7f8555fb9e67e63e90aa940a6bbcb8ea84f0d88 SHA512 5e6c58eb2a50a1a7040ed6355016730443dcfddb3a76da8efb38e235974466fa31d8fcbfb12cfc9f9fff7fe175a7651cadc8df3a44a01aaf8cfe71ef936e5bdf
-EBUILD vdpauinfo-1.3.ebuild 581 BLAKE2B 1bfd459d35d74308dafcacfee48795845dd08481d2686e2acddf60ba947b8541955f52dc56403e4f6ced403f269f130163d1151071c352bc700ba33d90e97323 SHA512 92ee9230e5b4e7ab1efebe3bd408236f7f89c46e62df2709aac2bfc01df86f5b4d8abe1adcba1e04b64f841921249ef5ea1a47cb2700b60fff7f19c29ee5a16c
+EBUILD vdpauinfo-1.3.ebuild 579 BLAKE2B bd17879fe0cbb595de06b973bce5ead8f0443d8d993a2626cefc6651259589cf25c3f795a40634c04cc67bd6dba98c714b2fdff927dc66f505f1f94e1aef5c3b SHA512 b2616a840b284e040fcbc84d067b54be3bf771f0efa6da92a63f2d4fb7379c8fee047b79c38fac6c721a95d86d0afba95c794548e95dac8df028093e5257dfb8
 EBUILD vdpauinfo-99999.ebuild 515 BLAKE2B c350d4c00d47de2ee887f1f2054afc61c3952740f08b6d8bbd366f61181868d462528c8e05120820232f12cb38a6336dcd622cbb59021aee22260e2664ad18bd SHA512 0f638788bf19f242501804988f27118cf49cd5aba4b219f01013f2f7d414a6031dc9079d524c6343421120de41c0ec406c0468dd599f9510ddf7d4beef2c14ba
 MISC metadata.xml 210 BLAKE2B 5fe5983d28e12b1e05d7cdaea69fdd87becfb2dd9a9b0353caab5f617a2f806227181e7100f623c8c814be524625c2739db8a93226b35b3cd9ec6d72db9895e6 SHA512 267d83ef7ae9579f44c22fe568d6d2064e426acdd07c00a69c735801e588ae0fb1988ae60199e349d444ddb5393a6a0a6836df89b2205fc85e25144ecbf56148
diff --git a/x11-misc/vdpauinfo/vdpauinfo-1.0.ebuild b/x11-misc/vdpauinfo/vdpauinfo-1.0.ebuild
deleted file mode 100644
index eec56d67179c..000000000000
--- a/x11-misc/vdpauinfo/vdpauinfo-1.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Displays info about your card's VDPAU support"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/VDPAU"
-SRC_URI="https://people.freedesktop.org/~aplattner/vdpau/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	x11-libs/libX11
-	>=x11-libs/libvdpau-1.0
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
diff --git a/x11-misc/vdpauinfo/vdpauinfo-1.3.ebuild b/x11-misc/vdpauinfo/vdpauinfo-1.3.ebuild
index a862c8c71559..6c12128cc543 100644
--- a/x11-misc/vdpauinfo/vdpauinfo-1.3.ebuild
+++ b/x11-misc/vdpauinfo/vdpauinfo-1.3.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
@@ -10,7 +10,7 @@ SRC_URI="https://gitlab.freedesktop.org/vdpau/${PN}/-/archive/${P}/${PN}-${P}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index 2e2e40c8e0ea..42f29b8458a2 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -2,8 +2,7 @@ AUX vgl-helper.sh 881 BLAKE2B 5373592a2fb784e38c1542aadb4f150937a69f51284bf21337
 AUX vgl.confd-r2 629 BLAKE2B 9794409221cc6a95b2f7a48e02063d3c6bcfd66c6b3e1929073947b3794ab1f9e69c76be47b9d06fa4ec9404e3ec4b4f7cc3f0395fc3d09684f346304db6202f SHA512 bab0ad095a2f075a1923f1b58531101bce634c89b30e77c239ee224b58eac3083c7eba4d21bd997a4dc8b6e4cfb0be7b013732bdf37a27a16a3301a098d60c29
 AUX vgl.initd-r3 856 BLAKE2B df423f82debf67ef0611c603bf38aa76173044012d3bc5a6276d1325e0d706fc6ff868957d7bc4ea1e14171a7000dabfef4acf3f736e22f9a40c3bdbb4ac0033 SHA512 fcc6c02265e0e2bb1faa00e5da2246b56a7bd8c730faa912904953f5c67eae12bffa99fe57f2a76d199c22956fc1b6ca940fba40972b2afbf73ae7f4f2a0fc7d
 AUX vgl.service 254 BLAKE2B 0a0e73228821019a764b1bc3ff61a752b15001018f704739d86eebbf326ee3a0612475cf7a0c360993e1a27c87815626290dfe4d85fc7e1aaa3897ce41f787c2 SHA512 18615552301c52c272bc47f942c47121100c175651b3957ddf996ca40e755d96dd51194ecb599c92e62fbdba3b9245e999ef488c889833009f8eba1c038c38f9
-AUX virtualgl-2.5.2-openssl-1.1-compat-a974c22141d0ded9ff60a0b903f81e6b484d6ba4.patch 5047 BLAKE2B 75dadf6d80456a702a3591b04b771410768e65c009da576502ada0fd192f480b20c6e0b12e470950be3306df7944f3b6bd890d0f4f97b778052eda63309cc0ea SHA512 a7d7dfc54f1fb00c00e8ae3011c7a28b4029f20049b9d792e2e8833fba79eb64f57c6ca6778d6d8bf4f383a2b08013e0d3b3db869ed8c08da549c89f095c4d3d
 DIST VirtualGL-2.6.1.tar.gz 1278335 BLAKE2B 62abb082eb8c82fecff33dd5b5036ebaead99b837cf0dc42581790863f09814858fd7a23a479c0c4ac5e59a4cc99af58903016a5109a6636191ce98d6da3d0bd SHA512 36580e55e11ba3e93945d62e865fe0b63ecd5aa1ee3889fb4d0940c68da06737fff4689a77638f5c8c57dbc9d020ba821bdec9aa2f6b2f0f144b18f1c3d8c5e5
-EBUILD virtualgl-2.6.1-r1.ebuild 2710 BLAKE2B 922ca3fa4e9230db03968aeacd5bdbce1560ef81404deaf39e528bf334d80f8bdc7759c340601543ce1007180820c9a990e2f3b4a1eba3a3ccd1b9e9ba27cf13 SHA512 603c12da0ccf3f1a9fde29470b30230c878f061497df85954db2376620d9f962ac5da86f40b599dde8913e404e80d9b7bb0ab944105bf253080e0439a692b6eb
-EBUILD virtualgl-9999.ebuild 2712 BLAKE2B d5ae149a1bfa905ff96a6caa40d0daea92e825b70303591595834bb43948bf2994ea6c56c33fc3cf47cec890bbefa7d95b623d2b6bda568dec56f8f897a695fa SHA512 ff1fda99385b88521420c738b0b2467b76dd4b2a6be47b13e8351e246d01cc923b4b87eed53a81e23d72826f27fb24f8b23e86eb9b3541325a25446006649d55
+EBUILD virtualgl-2.6.1-r1.ebuild 2709 BLAKE2B 95b4f319aeae46ee30ddd72eed37956bf465857e25e0397c8837a6e86689c2803513ab2d13385cd7e8ad879a78a5567fc33e3f0070a69d0ad26688c9a0694aed SHA512 2981a1b63d890e16159ae292e70a34e50deb363183eaa9910ff1501a15de61d279eb77bdf2cf5e0fc39100ad7dcff841a07f426eb60f6bf2d0cd5da25e4cdc01
+EBUILD virtualgl-9999.ebuild 2711 BLAKE2B 6e80ffef02dbb840712e2d8767a3de5acde047a119e3550ad341174d7206ebb811b86a2fade4af739a66363d681106811c6b78a55d8e01160d59ee85a58e6cbd SHA512 53dc4e4e1bd74c0866d165e8e76cc36717081408046ebb798cf31abfcca27d0b93048ebb9a66c513a5914a8f455127d89b667ad210696eb849380f85457bcc10
 MISC metadata.xml 736 BLAKE2B b0fef33f453e573f7742dff774acdd66aae3a8ed586718eb2c88fb5776c8c8040a94285971022ea52a47a702911a6d0f0f669e0cc8facac09d127a73ab6d083d SHA512 b1d37b1974a1db8cb9080279863708a6c1e50a86114ccfb17540980c178093ae6617b1bdfa470e73899277b44af231e41ec2b28504da5e335c0e34d509457600
diff --git a/x11-misc/virtualgl/files/virtualgl-2.5.2-openssl-1.1-compat-a974c22141d0ded9ff60a0b903f81e6b484d6ba4.patch b/x11-misc/virtualgl/files/virtualgl-2.5.2-openssl-1.1-compat-a974c22141d0ded9ff60a0b903f81e6b484d6ba4.patch
deleted file mode 100644
index d5d923f89d1b..000000000000
--- a/x11-misc/virtualgl/files/virtualgl-2.5.2-openssl-1.1-compat-a974c22141d0ded9ff60a0b903f81e6b484d6ba4.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-Patch modified to apply to VirtualGL 2.5.2, before
-1b82bceb3723b24ea5dc32edffbe019a8a37ab39 reformatted whitespace
-
-
-From a974c22141d0ded9ff60a0b903f81e6b484d6ba4 Mon Sep 17 00:00:00 2001
-From: DRC <information@virtualgl.org>
-Date: Mon, 16 Apr 2018 15:06:07 -0500
-Subject: [PATCH] OpenSSL improvements
-
-- Fix build issues with OpenSSL 1.1 (OpenSSL 1.1 and later no longer
-  provides CRYPTO_set_locking_callback(), since locking is now performed
-  internally.)
-- Detect whether the platform has /dev/urandom at compile time, rather
-  than assuming that all Sun and SGI machines don't have it (Solaris 10
-  and later supports /dev/urandom.)
----
- ChangeLog.md        |  2 ++
- include/Socket.h    |  8 ++++++--
- util/CMakeLists.txt |  5 +++++
- util/Socket.cpp     | 25 ++++++++++++++++---------
- 4 files changed, 29 insertions(+), 11 deletions(-)
-
-diff --git a/ChangeLog.md b/ChangeLog.md
-index 3632c1d8..5c9bff84 100644
---- a/ChangeLog.md
-+++ b/ChangeLog.md
-@@ -52,6 +52,8 @@ a subsequent segfault when VTK tried to call `glBlendFuncSeparate()`.
- VirtualGL's implementation of `glXGetVisualFromFBConfig()` now returns NULL
- unless the FB config has a corresponding visual on the 3D X server.
- 
-+6. VirtualGL can now be built and run with OpenSSL 1.1.
-+
- 
- 2.5.2
- =====
-diff --git a/include/Socket.h b/include/Socket.h
-index dfe45e3a..f7409956 100644
---- a/include/Socket.h
-+++ b/include/Socket.h
-@@ -1,6 +1,6 @@
- /* Copyright (C)2004 Landmark Graphics Corporation
-  * Copyright (C)2005 Sun Microsystems, Inc.
-- * Copyright (C)2014, 2016 D. R. Commander
-+ * Copyright (C)2014, 2016, 2018 D. R. Commander
-  *
-  * This library is free software and may be redistributed and/or modified under
-  * the terms of the wxWindows Library License, Version 3.1 or (at your option)
-@@ -23,7 +23,7 @@
- #endif
- #include <openssl/ssl.h>
- #include <openssl/err.h>
--#if defined(sun) || defined(sgi)
-+#if !defined(HAVE_DEVURANDOM) && !defined(_WIN32)
- #include <openssl/rand.h>
- #endif
- #endif
-@@ -161,15 +161,19 @@ namespace vglutil
- 
- 			#ifdef USESSL
- 
-+			#if OPENSSL_VERSION_NUMBER < 0x10100000L
- 			static void lockingCallback(int mode, int type, const char *file,
- 				int line)
- 			{
- 				if(mode&CRYPTO_LOCK) cryptoLock[type].lock();
- 				else cryptoLock[type].unlock();
- 			}
-+			#endif
- 
- 			static bool sslInit;
-+			#if OPENSSL_VERSION_NUMBER < 0x10100000L
- 			static CriticalSection cryptoLock[CRYPTO_NUM_LOCKS];
-+			#endif
- 			bool doSSL;  SSL_CTX *sslctx;  SSL *ssl;
- 
- 			#endif
-diff --git a/util/CMakeLists.txt b/util/CMakeLists.txt
-index 65ef59e7..ed1dfb39 100644
---- a/util/CMakeLists.txt
-+++ b/util/CMakeLists.txt
-@@ -13,6 +13,11 @@ target_link_libraries(bmptest vglutil)
- add_executable(pftest pftest.c)
- target_link_libraries(pftest vglutil)
- 
-+if(EXISTS /dev/urandom)
-+	message(STATUS "Using /dev/urandom for random number generation")
-+	add_definitions(-DHAVE_DEVURANDOM)
-+endif()
-+
- add_library(vglsocket STATIC Socket.cpp)
- target_link_libraries(vglsocket vglutil)
- if(WIN32)
-diff --git a/util/Socket.cpp b/util/Socket.cpp
-index 0d230841..b41c25e9 100644
---- a/util/Socket.cpp
-+++ b/util/Socket.cpp
-@@ -1,6 +1,6 @@
- /* Copyright (C)2004 Landmark Graphics Corporation
-  * Copyright (C)2005 Sun Microsystems, Inc.
-- * Copyright (C)2014, 2016 D. R. Commander
-+ * Copyright (C)2014, 2016, 2018 D. R. Commander
-  *
-  * This library is free software and may be redistributed and/or modified under
-  * the terms of the wxWindows Library License, Version 3.1 or (at your option)
-@@ -43,32 +43,37 @@ typedef socklen_t SOCKLEN_T;
- 
- #ifdef USESSL
- bool Socket::sslInit=false;
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- CriticalSection Socket::cryptoLock[CRYPTO_NUM_LOCKS];
- #endif
-+#endif
- CriticalSection Socket::mutex;
- int Socket::instanceCount=0;
- 
- 
- #ifdef USESSL
- 
--static void progressCallback(int p, int n, void *arg)
--{
--}
--
--
- static EVP_PKEY *newPrivateKey(int bits)
- {
-+	BIGNUM *bn = NULL;
-+	RSA *rsa = NULL;
- 	EVP_PKEY *pk=NULL;
- 
- 	try
- 	{
-+		if(!(bn = BN_new())) _throwssl();
-+		if(!BN_set_word(bn, RSA_F4)) _throwssl();
-+		if(!(rsa = RSA_new())) _throwssl();
-+		if(!RSA_generate_key_ex(rsa, bits, bn, NULL)) _throwssl();
- 		if(!(pk=EVP_PKEY_new())) _throwssl();
--		if(!EVP_PKEY_assign_RSA(pk, RSA_generate_key(bits, 0x10001,
--			progressCallback, NULL))) _throwssl();
-+		if(!EVP_PKEY_assign_RSA(pk, rsa)) _throwssl();
-+		BN_free(bn);
- 		return pk;
- 	}
- 	catch (...)
- 	{
-+		if(bn) BN_free(bn);
-+		if(rsa) RSA_free(rsa);
- 		if(pk) EVP_PKEY_free(pk);
- 		throw;
- 	}
-@@ -147,7 +152,7 @@ Socket::Socket(bool doSSL_)
- 	#ifdef USESSL
- 	if(!sslInit && doSSL)
- 	{
--		#if defined(sun) || defined(sgi)
-+		#if !defined(HAVE_DEVURANDOM) && !defined(_WIN32)
- 		char buf[128];  int i;
- 		srandom(getpid());
- 		for(i = 0; i < 128; i++)
-@@ -158,7 +163,9 @@ Socket::Socket(bool doSSL_)
- 		SSL_load_error_strings();
- 		ERR_load_crypto_strings();
- 		CRYPTO_set_id_callback(Thread::threadID);
-+		#if OPENSSL_VERSION_NUMBER < 0x10100000L
- 		CRYPTO_set_locking_callback(lockingCallback);
-+		#endif
- 		SSL_library_init();
- 		sslInit = true;
- 		char *env = NULL;
diff --git a/x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild b/x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild
index 90a64046885d..15a2ad641c5e 100644
--- a/x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit cmake-multilib flag-o-matic multilib systemd
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib flag-o-matic systemd
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/VirtualGL/${PN}.git"
@@ -51,7 +53,7 @@ src_prepare() {
 	sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html doc/advancedopengl.txt \
 		server/vglrun.in server/vglgenkey server/vglserver_config || die
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -68,7 +70,7 @@ src_configure() {
 			-DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
 			-DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
 		)
-		cmake-utils_src_configure
+		cmake_src_configure
 	}
 	multilib_parallel_foreach_abi abi_configure
 }
diff --git a/x11-misc/virtualgl/virtualgl-9999.ebuild b/x11-misc/virtualgl/virtualgl-9999.ebuild
index baca3aa94532..b1f2ed56343a 100644
--- a/x11-misc/virtualgl/virtualgl-9999.ebuild
+++ b/x11-misc/virtualgl/virtualgl-9999.ebuild
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit cmake-multilib flag-o-matic multilib systemd
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib flag-o-matic systemd
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/VirtualGL/${PN}.git"
@@ -51,7 +53,7 @@ src_prepare() {
 	sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html doc/advancedopengl.txt \
 		server/vglrun.in server/vglgenkey server/vglserver_config || die
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -68,7 +70,7 @@ src_configure() {
 			-DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
 			-DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
 		)
-		cmake-utils_src_configure
+		cmake_src_configure
 	}
 	multilib_parallel_foreach_abi abi_configure
 }
diff --git a/x11-misc/vym/Manifest b/x11-misc/vym/Manifest
index abe8fd341f70..389034b842db 100644
--- a/x11-misc/vym/Manifest
+++ b/x11-misc/vym/Manifest
@@ -1,4 +1,4 @@
 DIST vym-2.7.1.tar.bz2 6718924 BLAKE2B d7be8f2d40cedabb1bfaa3b89aac64de5e579f56ebfd757c22d4393ee712c4c4f5bf4747037683e4c6640ab0556ce4ef34bac5b27ecb747a15e58443d57f229f SHA512 985dbf18f743c36b484050ae24e4392eeae701c6c72fca6bd3dc5b70b38a283211946e279804c66253b5a394a642683ca4e3a66a7288400a9193fbcbfd8c9582
-EBUILD vym-2.7.1.ebuild 1430 BLAKE2B d1a9b288dcd069e383da292d4b14ca824e55e71211f379672ee48924818e96fcf668971458b7846e73d231b463443929ecadfb075bfb6e06a0c797652aca25d4 SHA512 cb114cd235eb1670fb35e229cc6b68adc1c6448c48b8414eff33cca06b768d359cd6fd15c52923bc31cdd67f7ab0fafd544645b3f6ffe94221399e6d392b40c1
-EBUILD vym-9999.ebuild 1389 BLAKE2B acc59d6a479129646d31b4e9693ca90a2317ddef792c5a76af2399090e30a69fcb6c09788b3d53b2b6b599192996ca8738433aba0488df32edf6ef7507660181 SHA512 421995c8d0379b65330a6d1e52c57322632bf883e8d628b9ddc60767385e158619f187ba9860a2bb405e297b7cbf67f8330bbfd2dc4f9a88a3494e67f44e6c60
+EBUILD vym-2.7.1.ebuild 1429 BLAKE2B d3ee61a8cafb79ccb70ed2713181ee5f12c7b1b13f13a2a965b728a4344397c4c8207bb183e0efc4c98f97ec765bca2219604c671562f7e7cf01bf59beb07829 SHA512 a057035a887357c453e2eac96c6f8772b0d5854d5b80e1163a3392ee0b23d6deecdc0b6b28648d9ea55dfd98e6b29fd5e85a39aa0c7a7827baadbafcabce587b
+EBUILD vym-9999.ebuild 1388 BLAKE2B c49fcb6d039410cdbc29537fa2a206dc2b2f61fa0a0779ae885a1a8cd23d65f937b5ba5a8a9838f363ae17031feffd72f7fb7343725c168ec6e093ab35cf9808 SHA512 d612a14413c47864ddffeb4aba5c4e52f67581a2e90aeff352002a4ed6e50a4abf755cbe37b39367dd93af427ea5fb390a776a43198988979bd40aa3298eba47
 MISC metadata.xml 349 BLAKE2B 2cddfba3480871cb020e1ea5ac3c8af1f0c5be07b9e41880fbf5a36301cd283e941e8c7d8ac47dc27613364e2a003784811c721d31ce2c768d83ea7d86dd2982 SHA512 968e3560ba95072811086fd007ec5397467a9e520ec3bb368c7c3617b94d222fbb3c3929b5b9694e1bebc6af9e736dd17a43321e38e1999c562192687561cca9
diff --git a/x11-misc/vym/vym-2.7.1.ebuild b/x11-misc/vym/vym-2.7.1.ebuild
index 55b9262e9329..7dec5336b1ef 100644
--- a/x11-misc/vym/vym-2.7.1.ebuild
+++ b/x11-misc/vym/vym-2.7.1.ebuild
@@ -42,7 +42,7 @@ src_prepare() {
 	remove_locale() {
 		sed -i \
 			-e "/TRANSLATIONS += lang\/vym.${1}.ts/d" \
-			vym.pro || die
+			vym.pro || die
 	}
 
 	gunzip doc/vym.1.gz || die
diff --git a/x11-misc/vym/vym-9999.ebuild b/x11-misc/vym/vym-9999.ebuild
index 60da3ed21f61..539db055b531 100644
--- a/x11-misc/vym/vym-9999.ebuild
+++ b/x11-misc/vym/vym-9999.ebuild
@@ -41,7 +41,7 @@ src_prepare() {
 	remove_locale() {
 		sed -i \
 			-e "/TRANSLATIONS += lang\/vym.${1}.ts/d" \
-			vym.pro || die
+			vym.pro || die
 	}
 
 	gunzip doc/vym.1.gz || die
diff --git a/x11-misc/xautolock/Manifest b/x11-misc/xautolock/Manifest
index 9b5aa9ca1870..6eff46a7d6e9 100644
--- a/x11-misc/xautolock/Manifest
+++ b/x11-misc/xautolock/Manifest
@@ -2,7 +2,7 @@ AUX xautolock-2.2_p5_p1-waitpid.patch 777 BLAKE2B 82031ddb959208db99472a72db6c1e
 DIST xautolock-2.2.tgz 35288 BLAKE2B 0cd709470002d7a6852a41a56e9f6b540405e172f30e3243a93b578e362f117a3ddd3b6ff15e653eb5466d15e7ff1d5505c19ccfd27d6e7d6ccae4c826a689ac SHA512 5f9dcc25cda706610e77a74235c4b421ca3a833d154b1a269057f0774579e1c6ec36fe0e5be5fadd6942ce8c1640a760f891397586b162e6024b524635153d04
 DIST xautolock_2.2-5.1.debian.tar.xz 5828 BLAKE2B 6a664d30b993986e70af853c037738da0576ca5ee3a0452329d4dffd3132899d1099b5bcc5bbf68ab688240b388396335b0d5227b140a74deca313112d0088cd SHA512 315f27518b89fa6633e3ce157423cd271f3db3b797fc59febc35aa8b33379bd6eda55ac9c7ccdf996c2d9d50bb6bef3b15add84b39236ace425740238de77e59
 DIST xautolock_2.2-5.2.debian.tar.xz 6216 BLAKE2B bda8c7a084e8975d268d626cc5aa02c87c7e6b0ae92351375f298cde4fabd8e48a0578c7c4bf32a280e2ecf13d82b7dcd73a874863616c0f9812ea98ffbe27e8 SHA512 807c9c7da51b16ed3a6600732f8d3b606d2f6c628238df0e6d975ea176ddce3d0e321779b19662f693ed1811b288ddae1b45228c0939e0728c122c1a2e556391
-EBUILD xautolock-2.2_p5_p1-r1.ebuild 1239 BLAKE2B b1121134e2e9e4da0397ec4a01e321664faf086410a96f0d5f73c04a3a924fab4ab9e037ecaf2cb0d27b5fa50667fc7a16369f2df17e4f146a71508d06c15339 SHA512 fa6f130ffc11cd59ff0b81d1de4835fa5f37c9a5fd33fe9d6697da23dd14c66f6641b227ac346b4f494f410c8f1d0e5a19510fa3da975b320dff235d0e28248b
-EBUILD xautolock-2.2_p5_p1.ebuild 1377 BLAKE2B 57065aa8645601ef4047d84633226029a324fbfe057ca231db535169c8726c74ad47dacdf894bfba558d374c209b55c5eea51eddd0448cedead839a280ec8099 SHA512 4f2acd15acfb25139ae95d12e5755909364a0b6c60e83d1c7266ba46406f64ad19d03db775b9890dd5b786545db9c0871c98ac05c4f678c1bac06dd7817eb11e
-EBUILD xautolock-2.2_p5_p2.ebuild 1001 BLAKE2B 36c80761ab99443c1a29ecc3e3bf80018c2228982284008c6d3fedf214f843ec11d005c99112df379ebf7ecbb5d7d329ad8fc46e01b14813a16646cda91e8d51 SHA512 28c65f06bafcf5afa3e817299ce7f3dcf107d2d0ad196a0aa671b9eac48de8734b46b74063dd6ba5c07218f2281004f48b51becffc3fe0418b0135ac40a21f67
+EBUILD xautolock-2.2_p5_p1-r1.ebuild 1277 BLAKE2B 28a19d97ea508f043bb2368db541afdb18a3b87bc05e8175f4a4deec09c7ddbf40f3f33fa7c63836553edc35060b1bfd662b4a8961e822d07b22528a69f9b4d1 SHA512 e92c9879872e987d912c56b8384e7c4223ca4d10e357b8cb4997cac4c1bd9d5f80d567910c8c32f01c2f9f15a1e87530bc3c1be2d47eb0258a597ea6c0a4084a
+EBUILD xautolock-2.2_p5_p1.ebuild 1415 BLAKE2B 163d244078aa6b11586132895a4d85f3e9e73615850c6b950b089eddb650e2d173687da15f00495571895d0b73ce341b077bb9144c11b2084d4f7d6e1e0b7c61 SHA512 8439a1c168327deeddc6fd076d014cc77f3b1441f033238e6bee1662be1201e73acfc015f424f0f0f32f358cae5010d49194ddc864becb255f0deae82772487d
+EBUILD xautolock-2.2_p5_p2.ebuild 1039 BLAKE2B 24546d6ea7ffe5b982b180bcfc08d076b0fa12b5c37349c9503eaef6274645cb18f2805ac71157c132691f152efd52a23195ee836b15c82ae75d1cc40c3d8487 SHA512 fc5ced15eca3a42a07e39379a577fa587aa76e20b169b5c25e5c076e90c16e9209615fbbaa962f7b81eb82cebe46e0b420fc05be42f51e1df0993ac701663faa
 MISC metadata.xml 637 BLAKE2B d1b4ecdd6eda1ba1db1550aa7187e1cd90b6093fd257600b4b3506ffb560946ceefe52bedd4364c0506be586daeebbdb1467197047db7a72f23aee9f41680e64 SHA512 62dcaa38a5e6ed4b9f020379fedb6d59f87628ea036b74acb73f600b89d0eab640548c18b104306df3d56c055ce39adbadf49683eaa46ece7ca26c79539c32d9
diff --git a/x11-misc/xautolock/xautolock-2.2_p5_p1-r1.ebuild b/x11-misc/xautolock/xautolock-2.2_p5_p1-r1.ebuild
index 63dd3677304c..e2c8e3ed635c 100644
--- a/x11-misc/xautolock/xautolock-2.2_p5_p1-r1.ebuild
+++ b/x11-misc/xautolock/xautolock-2.2_p5_p1-r1.ebuild
@@ -11,7 +11,7 @@ DEB_REV_MAJ="$(get_version_component_range 3)"
 DEB_REV_MIN="$(get_version_component_range 4)"
 DEB_REVISION="${DEB_REV_MAJ/p}.${DEB_REV_MIN/p}"
 SRC_URI="
-	${HOMEPAGE}/${P/_p*/}.tgz
+	http://www.ibiblio.org/pub/Linux/X11/screensavers/${P/_p*/}.tgz
 	mirror://debian/pool/main/x/${PN}/${PN}_${PV/_p*/}-${DEB_REVISION}.debian.tar.xz
 "
 LICENSE="GPL-2"
diff --git a/x11-misc/xautolock/xautolock-2.2_p5_p1.ebuild b/x11-misc/xautolock/xautolock-2.2_p5_p1.ebuild
index 4367a147b013..bbf08af74ffd 100644
--- a/x11-misc/xautolock/xautolock-2.2_p5_p1.ebuild
+++ b/x11-misc/xautolock/xautolock-2.2_p5_p1.ebuild
@@ -11,7 +11,7 @@ DEB_REV_MAJ="$(get_version_component_range 3)"
 DEB_REV_MIN="$(get_version_component_range 4)"
 DEB_REVISION="${DEB_REV_MAJ/p}.${DEB_REV_MIN/p}"
 SRC_URI="
-	${HOMEPAGE}/${P/_p*/}.tgz
+	http://www.ibiblio.org/pub/Linux/X11/screensavers/${P/_p*/}.tgz
 	mirror://debian/pool/main/x/${PN}/${PN}_${PV/_p*/}-${DEB_REVISION}.debian.tar.xz
 "
 LICENSE="GPL-2"
diff --git a/x11-misc/xautolock/xautolock-2.2_p5_p2.ebuild b/x11-misc/xautolock/xautolock-2.2_p5_p2.ebuild
index b83b2f63ac43..82c57e7ae58b 100644
--- a/x11-misc/xautolock/xautolock-2.2_p5_p2.ebuild
+++ b/x11-misc/xautolock/xautolock-2.2_p5_p2.ebuild
@@ -11,7 +11,7 @@ DEB_REV_MAJ="$(ver_cut 4)"
 DEB_REV_MIN="$(ver_cut 6)"
 DEB_REVISION="${DEB_REV_MAJ/p}.${DEB_REV_MIN/p}"
 SRC_URI="
-	${HOMEPAGE}/${P/_p*/}.tgz
+	http://www.ibiblio.org/pub/Linux/X11/screensavers/${P/_p*/}.tgz
 	mirror://debian/pool/main/x/${PN}/${PN}_${PV/_p*/}-${DEB_REVISION}.debian.tar.xz
 "
 LICENSE="GPL-2"
diff --git a/x11-misc/xbattbar/Manifest b/x11-misc/xbattbar/Manifest
index 42f180679589..cd5c0178963d 100644
--- a/x11-misc/xbattbar/Manifest
+++ b/x11-misc/xbattbar/Manifest
@@ -1,5 +1,7 @@
 AUX xbattbar-1.4.5.patch 1427 BLAKE2B 06142c445fbce221b8ca871c2717790e1bbe6b56f50d3003e82eb024ad012fc2677cbc4cbebaac7284e3291a9e95754c19f773fc3cfc1dd3ad9ee8c15b4dd451 SHA512 190df4894fcb29f5b2b5387523429947b967e48fb710ad256f8ba31bf33d22e04b4325ba3d6b3228aee14257e241815a5b99c4284d1cedb6b4e977e47a9c54df
 AUX xbattbar-1.4.8-const.patch 303 BLAKE2B d33ff7f8bc273e1ef3e493e2411b4aff025a36316163b31df52299a77c6409023b069a7ef2d2f55a189e2848b8e73d37a54a8957c9f71fdc3e51b6a48a179bda SHA512 987116af9d8e50b6ef96924199e5d348a9910030adbe2b2a8de0425107eee93cfe04740b343542c97edc6ed846bcff05724470b6fff1f5209c92c42e8648af0b
 DIST xbattbar_1.4.8.orig.tar.gz 16254 BLAKE2B 3e2215bcee10f140a078266e128ae17185e5900090b057e845f966098c69371ab5115d3cdc620a87e27e2dd223a83ab33e5fef55119cdbac68491c0e88e63585 SHA512 1ec535ba997da4aa08b225b61b22eb87d74fc15c522d30f5361e1f56db6fd774f4230a95afdb7f1170144c0939724a80118c7289ea50d027a76649fa20164191
+DIST xbattbar_1.4.9.orig.tar.gz 19105 BLAKE2B e33631f02266150fc494312c0a78cba145813e3f19ffa4a8fd46ce3adde3e50cb820617e5118a9bb6935fb7be26840e6a9525bf95e2f2fbf585e4e2542d35228 SHA512 e6d0efe0a97b2cb7d0c8a992b7a68a26155dfb625649a5fc8abc4bc37b2c286224185b57d6b2d3671f571690d278970976da5380c1d1bbcd9212e2001f9c40b8
 EBUILD xbattbar-1.4.8.ebuild 1085 BLAKE2B e546287ae2c16206eb9ba5d81ad0950ff82b8cfca610c9ede4b6e511be31cf38cce352bb0d0846f58e06a89e7ef628f90f8ffa1f15c2304241b52258a956f1cd SHA512 f2447d4f3bd865106114fc467828dab08c0940e3de7cc465af046dc203f02f4d2373e97609978d68c741cffd91d9657e34f13c4323abfe9a6ca6979d5661b4de
+EBUILD xbattbar-1.4.9.ebuild 937 BLAKE2B a8ad829e8e42ad36c2fb29b836c0a120f1c8185b41e29fd1617625d72338b05ab15663b2ab8d63f81255e10d1dec93ff37c8b7a6422fe1b9e8d2fc1ce37ab4f9 SHA512 2e2e53ec6d8b6ce20a1a719bb2fe8eead3fad7502c061835175899666d03f91ca3b144a8b30ab91ec0b447d1e95112a151b59d70d4ceacc0e6d41156681219b9
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xbattbar/xbattbar-1.4.9.ebuild b/x11-misc/xbattbar/xbattbar-1.4.9.ebuild
new file mode 100644
index 000000000000..e246e6005e66
--- /dev/null
+++ b/x11-misc/xbattbar/xbattbar-1.4.9.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="Advanced Power Management battery status display for X"
+HOMEPAGE="https://packages.qa.debian.org/x/xbattbar.html"
+SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="
+	dev-lang/perl
+	x11-libs/libX11
+"
+RDEPEND="
+	${DEPEND}
+	!ppc? ( >=sys-power/acpi-1.5 )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.5.patch
+	"${FILESDIR}"/${PN}-1.4.8-const.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s:usr/lib:usr/$(get_libdir):" \
+		xbattbar.c || die
+
+	tc-export PKG_CONFIG
+}
+
+src_compile() {
+	use kernel_linux && append-flags -Dlinux
+
+	emake \
+		CC=$(tc-getCC) \
+		LIBDIR="$(get_libdir)" \
+		LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" LIBDIR="$(get_libdir)" install
+	dodoc README
+}
diff --git a/x11-misc/xcalib/Manifest b/x11-misc/xcalib/Manifest
index 7db76654276d..08f31dfb7c84 100644
--- a/x11-misc/xcalib/Manifest
+++ b/x11-misc/xcalib/Manifest
@@ -1,3 +1,3 @@
 DIST xcalib-0.10.tar.gz 36769 BLAKE2B 419bcbe4c87bd8af5869537d334ec08e1e1d262d8a3ef550a5e99451ccfebce37025b95e7044ca782faac6f933e5a0a5b65c8ced10ea1f5aab8f3bc93290d959 SHA512 c52252c903125bf95592d35a75c818be196dd92a86ceab39e0a933162e04e160f2303d20e5892e72a23a7e8067c1e8d785381b4c327980a6fab22ed093c28f41
-EBUILD xcalib-0.10.ebuild 519 BLAKE2B 9e0e3803ff3015619ef732f0d4f7151cbc0d04ea0efed4185fbf2dc24e00e8a4bf69ef03761a92d89a92eb16d8a3546ac0f5c57b58626ad44ccc18d11170e632 SHA512 8b1972faa23fb8ca876d263bd401a97fde64d479f026238d6059b1f665aab331458258375f3578364dcb3b506440906261d673210bb18ba0f7e30d825ca2e703
+EBUILD xcalib-0.10.ebuild 513 BLAKE2B e1449791b700ac56695f05e02d2abb27362e370197d87bb5e08420381bfa6a46eb592f373aab301a63667cef88f1b94a2706143a44c99fb6da60f325a6f1d025 SHA512 5353f4513bcbcf20b21f23d9dbd26bc896e822cd035f8f28cc10a666c7d7aeab4a935b47880230fb1a68271dce6b85fa5108328a2085bd66bdb99e9ec21a959a
 MISC metadata.xml 261 BLAKE2B 42a18dafa16eda94e27fadafc73f3f15f247cc12ba0073ea96d0f1abd24860b2c2ad943174178d4ff96b8e05300570eae7550ae33f4048b8587e58e876479f85 SHA512 998e9c0c2f1a166088ec7e42ad68edc520448dcaf96eeac2eeaf329e5064ae216d025a483be6dfd9b22bb434e8675fe93a4e49beb745ef5b673a3670686caa28
diff --git a/x11-misc/xcalib/xcalib-0.10.ebuild b/x11-misc/xcalib/xcalib-0.10.ebuild
index b97a56578667..e312c0156bf0 100644
--- a/x11-misc/xcalib/xcalib-0.10.ebuild
+++ b/x11-misc/xcalib/xcalib-0.10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Tiny monitor calibration loader for X.org"
 HOMEPAGE="https://github.com/OpenICC/xcalib"
diff --git a/x11-misc/xcave/Manifest b/x11-misc/xcave/Manifest
index 26cd9e025b80..8b81cd1094f9 100644
--- a/x11-misc/xcave/Manifest
+++ b/x11-misc/xcave/Manifest
@@ -1,3 +1,3 @@
 DIST xcave-2.4.0.tar.gz 817356 BLAKE2B 2a80eb20d484fe37ee5871e4bbf443fb87170adf8a02d4ebc059bcc4f907b2b4442a0b9858719e1c656d0293e55c470aba1bcf83c899ba079a2f201d93b84cb2 SHA512 cdba5ad8b7634004a9439fd87a8eb8ed45137e78cb119310c6b7df9352aa979682edaae6440200804e23953c822d377c95cf459cc37ce227d1a41885a91afba4
-EBUILD xcave-2.4.0.ebuild 565 BLAKE2B 3d1627135878127d14391cddc4eb3cb932e2b2f1643d5ade915cb08aa4b69ce1e57a25b952fcbdd4669f44fdd59af3bc13da60205f6625959f97ad0049784b50 SHA512 d381cfa8a33476d4246e3364288d99d952c451267721f559fb2e1a5f2515c84fb127c978e214ea1cbd6636ecf58e828129e6ec86e859077d4799aae27f534040
+EBUILD xcave-2.4.0.ebuild 549 BLAKE2B 63966d96d1e7ddf58f9eb5bcd6d2d442df81188d4decdfb52e8a2b159358fbc7313699b369e651a6a555e7aafdd6b08125f1b62be212f73b6d5e1f3c59839349 SHA512 38293dba305bb92736618a34542d623edae3b795979ae659a3a6b96abcb98977f02188b28f688c4488d82e8ea710ec25f21083ed365681e52cebccbfd0bf987e
 MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
diff --git a/x11-misc/xcave/xcave-2.4.0.ebuild b/x11-misc/xcave/xcave-2.4.0.ebuild
index 656794b7c4d5..3e6245d4498d 100644
--- a/x11-misc/xcave/xcave-2.4.0.ebuild
+++ b/x11-misc/xcave/xcave-2.4.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 DESCRIPTION="View and manage contents of your wine cellar"
 HOMEPAGE="http://xcave.free.fr/index-en.php"
@@ -10,18 +10,19 @@ SRC_URI="http://${PN}.free.fr/backbone.php?what=download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 RESTRICT="test"
 
-RDEPEND=">=x11-libs/gtk+-2.8:2
-	dev-libs/libxml2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
+RDEPEND="
+	x11-libs/gtk+:2
+	dev-libs/libxml2:2"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/intltool
 	sys-devel/gettext
-	dev-util/intltool"
+	virtual/pkgconfig"
 
 src_install() {
 	default
-	dodoc ChangeLog TODO
-	rm -rfv "${D}"/usr/doc
+
+	rm -rv "${ED}"/usr/doc || die
 }
diff --git a/x11-misc/xdaliclock/Manifest b/x11-misc/xdaliclock/Manifest
index 976b6a68ea34..03358e59d3e0 100644
--- a/x11-misc/xdaliclock/Manifest
+++ b/x11-misc/xdaliclock/Manifest
@@ -1,5 +1,5 @@
 DIST xdaliclock-2.43.tar.gz 2300886 BLAKE2B 91b5f6ad0eff544ffde213d575c84a9b6c05b62c6bd26332eefb28b0d064ac8b5314a60e70fa82ebf6270e022b079ce4e86197ee5e8a713c34d84227c00dd94f SHA512 4906632148599254d9b29b032d846fcea1a568de8156cfe9556aa1603e063015d7e3422ba9ce4f47c2877f144837a660964456584a643f274b78422c12c0c923
 DIST xdaliclock-2.44.tar.gz 17727649 BLAKE2B 170f1a7f9e5c10799b62b2ae76b33ab64230e4ade8f0b79c2aff7481536009e3e4e0f19239dd806d7b16c69225744fa381f5aabbeec6e0e92d8b875bd8ca0aeb SHA512 82082a8e16a85c7115bdd0a44e7845aedfad93f94226a14cf606493564829c7ffe55eb4d17cb43c41bd0e6c97c090457d6aa2d184f60462cea3a89f47ef72e00
 EBUILD xdaliclock-2.43.ebuild 568 BLAKE2B 6e32d2fe4563dcb1d4167cf46952505d0bbd3895170a58e06157d8754584f08f2f5339788ee15a623b863456c6428a7f56177b907283e4ebc715b2a3b91ae479 SHA512 f903a5087a9d35a42fc7bc025ac5c08210e2d09a53dbe29a3a635a5779275ba1ac6c269252042779af6c5d2aa694d14c0ecfd4c275f28c2aacac2373ee13b6eb
-EBUILD xdaliclock-2.44.ebuild 549 BLAKE2B 238d328f097866e51bb3eaff594a0aa0ad27f433e3cafb499ffb307b46c4a6dbf1fa686325bb8544cb182e0d7b9ca99fb01614fe3cdd096ccab9995ff08024db SHA512 608fae0b75c212122542e41c9861581fdef596198e55f211e081885e84e9ee112138ef4826d8023d22c331a2488be617da173e84a8b7a6f228a66d16674655c4
+EBUILD xdaliclock-2.44.ebuild 568 BLAKE2B 22776abad55bdd3c26b0a511bc629dfdb1c9d40c391a112fa851901cc441a91e3423bcf3c110671f05e43cfc257d4cb8cbaaa93f1067f2375cf66a8dbe29aa89 SHA512 47e648a0085cc69b5d552edc77a7fc4456db7f4851a900ec28df4ca6da1d8e4ad21268e966fe9a821279564efa54b9d75af256583a5f08c3eda018e2d80d3866
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xdaliclock/xdaliclock-2.44.ebuild b/x11-misc/xdaliclock/xdaliclock-2.44.ebuild
index 921988dc2b9a..6fc8105397d4 100644
--- a/x11-misc/xdaliclock/xdaliclock-2.44.ebuild
+++ b/x11-misc/xdaliclock/xdaliclock-2.44.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Dali Clock is a digital clock. When a digit changes, it melts into its new shape"
 HOMEPAGE="https://www.jwz.org/xdaliclock"
-SRC_URI="${HOMEPAGE}/${P}.tar.gz"
+SRC_URI="https://www.jwz.org/xdaliclock/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/x11-misc/xdiskusage/Manifest b/x11-misc/xdiskusage/Manifest
index b37a7af0bb95..4eae1e2a4378 100644
--- a/x11-misc/xdiskusage/Manifest
+++ b/x11-misc/xdiskusage/Manifest
@@ -1,3 +1,3 @@
 DIST xdiskusage-1.51.tgz 54248 BLAKE2B a1e41eef4e3d303c7bc02cb485ab2ca33bb03c57f9713459b68621a611751f5af35be9918bbef86294e70ddcc8e2fb678b5dfa9baa237954a46fd12120bbf96f SHA512 73335bbd5dc3e1f753efb84e7921fe7568f83daae7c4026c8b23fbacc4257b885de56f4dc8f682b03663a56f7def1227b8a4b6abf419aff8ecdd26ae51d4885a
-EBUILD xdiskusage-1.51.ebuild 566 BLAKE2B d5a7462228f3755b2b4ac8f8eeaa90e49e3f13d5e3a1e733545c75b3790e09f30ce900f71c26b8374e1a1cb3a0338c8663693843ffa88b31e5912224ae19bc4d SHA512 3f85c6d2d4f1e8a5ff0107498b166d95494935d6d3d69d3f0679b3e5f217b4e9bf0ce5ecfb60e4aa658fca726313990e2c80cb2583fa8e9546d6f75e259aa5ad
+EBUILD xdiskusage-1.51.ebuild 589 BLAKE2B e96bcf2c19850c8903df97b128d609ea20c3cac182fcc648e72e65f3ca84ac8c42291425057f740f1497bf5641104a4bd531ed96edb93fe63343432841fe3530 SHA512 f5c39528cf7c9f487a165b8dc85fe6a3ca1fd0e60157223b0c7540f0194a5d5961a8a650aa10b3c7a9f4085c8f8102928644bdfb24608a5d4eb7a8f6959440e2
 MISC metadata.xml 366 BLAKE2B 740f17c401fabc3c0a47e332dbcda1c7d6501bf52140a32c3f552dbf05e278394df9c96da54dfd17d366633b091279e144b34199e1999a4c613b9a1d8c68edf6 SHA512 70a6112f01001d3b6d064a925c778eac80c45ff1e8f5fa5474b9c21f4f27062f3eb94cf244e3996a271ab1dd1e6d28f51a201db49cb23f38f579adff27f8aad7
diff --git a/x11-misc/xdiskusage/xdiskusage-1.51.ebuild b/x11-misc/xdiskusage/xdiskusage-1.51.ebuild
index 9cb3de113c7d..d1726589fb4e 100644
--- a/x11-misc/xdiskusage/xdiskusage-1.51.ebuild
+++ b/x11-misc/xdiskusage/xdiskusage-1.51.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="user-friendly program to show you what is using up all your disk space"
 HOMEPAGE="http://xdiskusage.sourceforge.net/"
-SRC_URI="${HOMEPAGE}${P}.tgz"
+SRC_URI="http://xdiskusage.sourceforge.net/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-misc/xfe/Manifest b/x11-misc/xfe/Manifest
index 4d63bcd2c16e..5f16d80b1590 100644
--- a/x11-misc/xfe/Manifest
+++ b/x11-misc/xfe/Manifest
@@ -2,7 +2,7 @@ AUX xfe-1.42-use_pkgconfig_for_freetype_and_xft.patch 1733 BLAKE2B 7f0425ff2e572
 DIST xfe-1.42.tar.gz 2727833 BLAKE2B fbca14c77b04cb367173907dd4ae9c210cd88768276e5b7391338b29dc988288f866419f57d1189db6235941e4e2f91608835351000a42d46ed3e7c4c236c69f SHA512 858dd761e45ff09d32d2a230304be0817eab4b6a772376b08d778bb8e1eef681228e5d88e53c441f9b8722d8b7eeae96980e30f8c5e8bb603d4d9a3b3d267351
 DIST xfe-1.43.1.tar.gz 2776237 BLAKE2B fc82e2ea21643ecc3875512538af24daddb0db0e8829ce23c7589dc90d68e896282f70d771dcf885ea746acfa88adbb7abe6a0c354e74afa5f722dcfacf77350 SHA512 3c697ff5d0246c8bab86c9824dd4a3475ed3775d2933c63eb8e78f02b4455edb4ca98f86123eac77f611eee6ad660bf0a909c4c2791af19506a4f1744395008e
 DIST xfe-1.43.2.tar.gz 2834576 BLAKE2B 5ac7ebf229febb75a99e4829a38a3675d6674ec6eced13dc5be70d2b68ce88f6394621dffec2d8359e72da7eace582883b72491e90597ab4a8925685cb577fcb SHA512 ad7b450d0828747f801219c23824b0751fc2a7f0eea791369c4adb3090ffe1279056fa8804ef97b25a2f810e00d37357efc962dc9d4087c3d7cc5f8ffb37d51d
-EBUILD xfe-1.42.ebuild 1602 BLAKE2B 9b2e59f05bf959868b6be3fbc4d819095b153baf87a9bc57fac2bedf2c80ebafe5704f815bdc4a692ad941f96ba67070be42b28c80438814527a8d896f2a21df SHA512 a87c6c76316e9e7f49799b29bb1562c2fc7dafb6688d5e87dbee28de19af542fae385e80eaed4b9d16d842eab93ff797c76a5dc7e5f717603bfa58352416441c
+EBUILD xfe-1.42.ebuild 1603 BLAKE2B 2512a91efc1ceb4ef89666f2f474a08fb4d53f8041413e3c415acc61d70eec1c9446cbc837d0c7e8638c56e5169a11a55f11e2e7ba0fc8a47d14101a7d019452 SHA512 e29f38f11e5764ea7b6d8b3a484477cf3c14f6bfe1975f6cbc249912a1f6abfdc79b23fe48180c6fb158012ae468ce8b76e8973a5273d3ba2405a04a6ec4bc69
 EBUILD xfe-1.43.1.ebuild 1484 BLAKE2B 0a672eb1a69c898ecb3db3f7acbc75d8e320fa12190e8a90eeada387c93d3cce49f237ec21c2dff88bb81f42252f50be639de1e8f3e9b88907a118d40437280e SHA512 65101a757dd262226f697f3c0943ff23fbf0e7893682c8654e04ab9aa0c468410cb2fc4d929a160225851f8ddc69bcde1eeca8edbd750e6d16205830eb511fcc
 EBUILD xfe-1.43.2.ebuild 1481 BLAKE2B e6702a7bd7ba18e78778011fe59640b62be2cb6b52a4e58eaac01a798de6c9f2bcab0c048040ed03a51da01f4224bb7786a3f151c9a4c5591ab32200cca77ce4 SHA512 dfb9097ca3558c9324ac857080ac5bebdbe9ef04c17fd406f9a802c72d33b91bc4f375750b8cb4956a52a79b9906cd20c1ea8877853eb79eabbea5346b9762dd
 MISC metadata.xml 349 BLAKE2B 1f855ee2a581396591ea01b3b1d00fe0dba88e564d38186f738d797eb50554593c2d2bf396f8a616329855ebe829b1da5461705965e252b2994545353e26f475 SHA512 08958aec505d6e35611988ed33f184112fecea69197b2f2e5d784d2db216a0b643d27c6ac24ca265fd89d612b67586925d6b768bdf86aa0060919c96ecda48cb
diff --git a/x11-misc/xfe/xfe-1.42.ebuild b/x11-misc/xfe/xfe-1.42.ebuild
index dd6e5a79a2de..c2619c850ccb 100644
--- a/x11-misc/xfe/xfe-1.42.ebuild
+++ b/x11-misc/xfe/xfe-1.42.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug nls startup-notification"
 
 RDEPEND="
diff --git a/x11-misc/xflux-gui/Manifest b/x11-misc/xflux-gui/Manifest
index 76e010f5805c..6de97af3415c 100644
--- a/x11-misc/xflux-gui/Manifest
+++ b/x11-misc/xflux-gui/Manifest
@@ -1,4 +1,4 @@
 AUX xflux-gui-1.2.0-disable-gschemas-compiled.patch 1540 BLAKE2B c1071aecced986b9bf8662de558ce8cd3c822ebfcc7d3d6601eba9ec30438bfcbc763e26eb31113b00b75e07f463125872ed8897c490ddd32cf96b0798e72557 SHA512 bd03efe531f0b55df89bbf2b6e6dbdbf7c48c214b9969d3c458d093a13603011b956efc0cc6695401abc7abfea18ed29be6501784a66edcf63f8ebd6793b3c15
 DIST xflux-gui-1.2.0.tar.gz 31831 BLAKE2B ad6b29f75cf5c287efdb4c1eaa12610a6fd2d4515e7f77cb991f0140d9de1128981ae274a1503f7c5bb83ff84f8dc124ba64e5abdd2e97c1d7157c84df51bead SHA512 244c11efbf58112d3d84209142faafbbe46b33df1edf13e122945ff767fc6a394c147979c0086bd88cb41ee7c80b5bd87016b3e158f3a959f3aca8bda47707d2
-EBUILD xflux-gui-1.2.0-r1.ebuild 1039 BLAKE2B eb128a1ee771ce8a69a687299e362073263e942e378a033a2757078de1e00c22c3c27288fd657dc7d5426991a9f389d3cc692fbecc679cfab7652aa357f358b8 SHA512 4b48755c2347c868e2b23e099d7a3035c057e3c3c1269d7f3b85ab2e8973326869c22b86a0ca06e84c958e9891b12845a9fa999720c18666fdbfa0a16a2f855c
+EBUILD xflux-gui-1.2.0-r1.ebuild 1042 BLAKE2B c18449765fc796f296fe3c874c96d5a603ec3f34a872713a4945a063db74954ab81b5957a269635fdfe95ba4fe902430e7b9a1a5e75e241a72ffb0777d093b5f SHA512 d40f59ffcd8f9761034f0169ee282d14e3d999238281afd1b64074f4cdd1cba00c98394ef3cbcbdc148ccebe6a2199b3dc04f10f5509ca7c2399e57f94838dac
 MISC metadata.xml 737 BLAKE2B d576868e8ee0b92e6439103d674d5a87e72d3794d202d1d8d1d200e5d479abdee76d31211520c5c04a53ed6a4567c0c6396cd2d08da0a82b3fe85c7b2c0f32d6 SHA512 60dacd24dfe19906d233434a547e0ef87d33ef5cfc9b3175df28ac65b9744fdf653bf449c4fdcc754950bdf5e859985735e889cd7755d7fae0458d067a5aba13
diff --git a/x11-misc/xflux-gui/xflux-gui-1.2.0-r1.ebuild b/x11-misc/xflux-gui/xflux-gui-1.2.0-r1.ebuild
index 9c62c28fe9a8..0efff0431536 100644
--- a/x11-misc/xflux-gui/xflux-gui-1.2.0-r1.ebuild
+++ b/x11-misc/xflux-gui/xflux-gui-1.2.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1 gnome2-utils xdg-utils
 
@@ -29,7 +29,8 @@ RDEPEND="
 S="${WORKDIR}/fluxgui-${PV}"
 
 python_install() {
-	# Don't let the package compiling the schemas, as this could cause a file collision
+	# Don't let the package compiling the schemas,
+	# as this could cause a file collision
 	export DISABLE_GSCHEMAS_COMPILED="true"
 
 	distutils-r1_python_install
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 177e10f73fb5..b891be925ded 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,4 +1,4 @@
 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 1268 BLAKE2B b3cf4dac632e36c230bb384c245785483b253e773e04b0bdb46aa6b2414ff465d854dda76a180c997b4b25fa04657424f1e322f7da1d5b7a2b38a42ee0cf4dcb SHA512 510a440ad821c65813f9ba1904d2cd0615a595c1c8ddb4b0f3a7812bfd7869eb81646aba3eb9233c4b8cd4ba48b81af2675fd818190d805f281b417fa631d87d
+EBUILD xkeyboard-config-9999.ebuild 1216 BLAKE2B 59e22f817504c8a13afb331880a98b300cd4b76797f1dd1b713833f699733548f5d2fd54f28bc3e4fa541a150e261e3ef39276648c1eccbfe42304101f922a1d SHA512 9a2f7ea4d02157d28979c6564c07b864f1be22ea3acb73e054ed8cf69a89e527b301a480f0e9e600d5b334fcc6bdfdb188bac65afdc7e081c68d2338cbccaadb
 MISC metadata.xml 337 BLAKE2B ab0893146e71b0d96879e7ec41c7c4e057cb92570227daef015b6fa1a24c55709cd3d19e16df5afe80f706995e12a44a9fc29826a552bd436b1e9381e44acde5 SHA512 6a43f86407638d3f156d4ae64caee882878dbd1ee7c23991c8f378d55cfb0afe016202866f95c328d8b4e59186efa6a7cb7335a1c86e3fbdda4c16a96e175cf0
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
index d2d56f95cc31..65c25664dd43 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
@@ -25,10 +25,7 @@ BDEPEND="
 	sys-devel/gettext
 	virtual/pkgconfig
 "
-RDEPEND="
-	!<x11-apps/xkbcomp-1.2.3
-	!<x11-libs/libX11-1.4.3
-"
+RDEPEND=""
 DEPEND="
 	${LIVE_DEPEND}
 "
diff --git a/x11-misc/xkeycaps/Manifest b/x11-misc/xkeycaps/Manifest
index 219f386dbf95..e22699ccd6fb 100644
--- a/x11-misc/xkeycaps/Manifest
+++ b/x11-misc/xkeycaps/Manifest
@@ -1,5 +1,7 @@
-AUX xkeycaps-2.47-Imakefile.patch 758 BLAKE2B c8f06c0c61f3c57f29c818d2ea139538e14fbcf654bfb9d099bf680cfff38e2c870694afc026f20a8b45b8f6274f0530c84def8a4d36b6ff0f37f055cf18a573 SHA512 f3bef8615e6a040ab05fc71cf45323515f752ffc8cc1914098b1a8433a77c91c0f9aaba11e73bc984c808d1e5421f94c5dab4562e5f442a8558d2987145928a5
+AUX xkeycaps-2.47-Imakefile.patch 595 BLAKE2B a4ecbb62eb308357b77a7633eb8c1eb0a8fe25d17e6e912e416120003996438b51684ab60cbe840c5be7b217ce0c283890f40a5c997b952d8d31ab23a4a58c5a SHA512 3412fd9db48460a97c5630a9641bbf147e905b5c5ce357627d6f65e669d044cfb88f271506767a26fd3a6791d5ffa06af85eeb7ebfdb932c20dfcd088c7b2307
 AUX xkeycaps-2.47-man.patch 639 BLAKE2B 4c554a83d65598544d2fb2853c523503b4be9a52d56a6a488aec933600fa39d2e050028ed907d0ea19bf1bf2898113a6c68c2b965c43840abd2dd905ccdfcd8e SHA512 6eab220c2c5c274ae5bfdc5bcf9c028409a3f0ee1b764aaaae81b2b7496fea48e64ea6fbcba0bf175ee10bcc81309ddcaeed3c4b9b831b9f8d8341df20a9c950
+DIST xkeycaps_2.47-7.debian.tar.xz 7268 BLAKE2B 86ddfd8b2ec8761b8e4a4c4de93fcfd0b88c018125c20f987bf5f47ea77edb5b996a3ed45c3fb2452c7647d6f1a3a2583bdd17f0442435d83afa3dbbc280d285 SHA512 85d72cbd4012299ab60ab700049862c1ab514c904acb8e3810fd7886cacb0712c3849fbc52dee499007d97ce8aa301a34d901120a46ba15a32151986121fbbbc
 DIST xkeycaps_2.47.orig.tar.gz 351418 BLAKE2B 0dfd53e6b7af6c14057e56071b70edf3479a55ab4e6ed9651cd5acec68c1db8096264dc8d5b578ccb62b331ad6f14ec8f1b8d0363b614d14b0ba9ce60492b55b SHA512 f5f5ecdf83c2bd86eb3d8b8a28b26af25a2dc9ff0a9c44091d8eb154d617b4373191a2e4479bb0e3025c023d6e5d785a088c64bc269c1c43431a3d2fc91c1a7e
 EBUILD xkeycaps-2.47-r2.ebuild 945 BLAKE2B eaff6b3515acdb863da736e3f0e3ec5491542004c4331cdbdb63515544e827ae809f95ebd1cec0b194d1bc0ce7263aec2a0c26101cc868d5cce038bc9f382ada SHA512 0a441513d785a471094849d2f9cc1c60702f5c15301790a309d66fc516db8d738679105520dce617c76c820242d30904411704d95f6f40b2fc0a9bb4ba63de07
+EBUILD xkeycaps-2.47_p7.ebuild 1164 BLAKE2B 37f4c04e2956ddb2878bf666f7f8e57667779bab439ec0d16083f0804198d5e9552d6dc99f6c2e4849fc7b03d962a514c8a428876037d96bb4c63be0c4432207 SHA512 5ef642f12fc742ea0d70ba91df2bee7fab15ec52029530dd584c07331124ed07a4e627904f33f2a0518fe48872f7822a032e8e5e894831ba317a32099f28363e
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xkeycaps/files/xkeycaps-2.47-Imakefile.patch b/x11-misc/xkeycaps/files/xkeycaps-2.47-Imakefile.patch
index 42f7ab6e344d..9a562a72d473 100644
--- a/x11-misc/xkeycaps/files/xkeycaps-2.47-Imakefile.patch
+++ b/x11-misc/xkeycaps/files/xkeycaps-2.47-Imakefile.patch
@@ -1,6 +1,5 @@
-diff -ur xkeycaps-2.47.orig/Imakefile xkeycaps-2.47/Imakefile
---- xkeycaps-2.47.orig/Imakefile	2005-02-23 00:33:15.000000000 +0200
-+++ xkeycaps-2.47/Imakefile	2008-12-07 22:55:24.000000000 +0200
+--- a/Imakefile
++++ b/Imakefile
 @@ -1,5 +1,5 @@
 -/**/# Imakefile for xkeycaps;
 -/**/# Copyright (c) 1991, 1992, 1993, 1994, 1995, 1999 Jamie Zawinski.
diff --git a/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild b/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild
new file mode 100644
index 000000000000..3ed56c7b259f
--- /dev/null
+++ b/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="GUI frontend to xmodmap"
+HOMEPAGE="https://packages.qa.debian.org/x/xkeycaps.html"
+SRC_URI="
+	mirror://debian/pool/main/x/${PN}/${PN}_${PV/_p*}.orig.tar.gz
+	mirror://debian/pool/main/x/${PN}/${PN}_${PV/_p/-}.debian.tar.xz
+"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-misc/xbitmaps
+"
+DEPEND="
+	${RDEPEND}
+	>=sys-apps/sed-4
+	x11-base/xorg-proto
+	x11-misc/imake
+"
+
+DOCS=( README defining.txt hierarchy.txt sgi-microsoft.txt )
+PATCHES=(
+	"${FILESDIR}"/${P/_p*}-Imakefile.patch
+)
+S=${WORKDIR}/${P/_p*}
+
+src_prepare() {
+	eapply $(
+		for file in $(cat "${WORKDIR}"/debian/patches/series)
+			do echo "${WORKDIR}"/debian/patches/${file}
+		done
+	)
+	default
+}
+
+src_configure() {
+	xmkmf || die
+	sed -i \
+		-e "s,all:: xkeycaps.\$(MANSUFFIX).html,all:: ,g" \
+		Makefile || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CDEBUGFLAGS="${CFLAGS}"
+}
+
+src_install () {
+	default
+	newman ${PN}.man ${PN}.1
+}
diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index 08e6689e7d3a..6541c40ca796 100644
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -3,11 +3,9 @@ AUX xlockmore-5.47-CXX.patch 613 BLAKE2B ace9eb868bcdf4fa7fda07d5a0dfc316f992fd1
 AUX xlockmore-5.47-strip.patch 2048 BLAKE2B 0f0f00a38e1d3b5edebf40416698ad3b87323ce9167e7a3e0a44ca2fca853b16e9c1ff59ff74b0bf50b3484e25722a3ee840b312f2f249644614aef55095bfcc SHA512 2de24cbacab2a54e7a41f4604625096030763ad6212ec30b34be2c2fc4035b44f146bfb9d0a34df9c9ce4fa96a0eb1c9c7701b512a917fdf3eb56a5195c8585e
 DIST ax_pthread.m4.xz 6356 BLAKE2B 784bfa3fcae2499230acba588cea5591f62229d721cac357012c5d19b0a506c2d77201145eb90cdb15217190926cdad09cf5897e49dc3644be41ccac30e60ee2 SHA512 04dddd91a98a4f544d065de1b70340e6835657015385959d98c3c5eedea175f58657db73b60011af181a8cf2ff5d48d533cedfa6020943d8b41770bdc4aae329
 DIST xlockmore-5.50.tar.xz 1632968 BLAKE2B 2e692d16d70e3186ec1f31c192414b286f8815f2f428a6f7f43b3de0117c51c4ad2fbdfb91debe2ecb75c8683212b5d33bee62d81374552703d578b02d3af036 SHA512 627a905c4641d6083676a766931f23c06e2ac5af9b43447ccf03143d329d24b786aac6b248318929399b5fae98f1ec17e676466b5cbd09f180377c483694c569
-DIST xlockmore-5.58.tar.xz 1878452 BLAKE2B 90b19c7c7c99188b056e69d80c0e89a0030faba46f942bd5e278403cde00ba66fe626f457dcf03e049280c0eff1af0dd3e598dda8e2d8d7eee194e38e97124b5 SHA512 470107a9f00c94db8f1ce20c33d04a3b0cbd3d5616aeffa42f98d3a75053cfd8a05a63e38349a88cfc3056fb7bdf3beeaa4277dc83121c35bcff071955ed9511
 DIST xlockmore-5.59.tar.xz 1935296 BLAKE2B 3a7027dad227179dfe3917108f8960a751cc16481fef541e80c656f99832de6d203cad1815f0f31f66aa2338d06035a99dce18664af2bc0b8e4610ef25339d20 SHA512 02758869ba597ef32ed1e594fa88141644264bbbc8edfe9ae8742a4508fa3e38d059c9ffbb9fa9bcc323b92e1763f96c8b6d054494849df465a08bc6be71bf33
-DIST xlockmore-5.61ALPHA1.tar.xz 1936260 BLAKE2B d943647b61ded11aadaf4d9e7038c4ff6d622222f44b6d2221b40b9ae238ed679c0bc612437d07e97e293fe856f16ffd39a0fc612d723d0530e99587ffa31b94 SHA512 9e5c7bb9396d883324c35fbf906066784326bfbd9d6c378be9d6293f091de5d56ada41661c4cf52869a2d1b36ec7bba2fdc38b3748f62f84d2d498a8936a2b53
+DIST xlockmore-5.61.tar.xz 1936312 BLAKE2B f4d12f1dbd5da1d8cef16690e393fdd9ba4162722398c8239c0091f2cd46cc3f401c1a62ed1910bf37fc0d98f0bf0723ca9003caf507e3d8a6a83f7b51228f35 SHA512 be64b3dc22f1c0c310ed4a085fcaf9f7ed96c5d2a97f3359966201df54fc5acfc3e5d94cb0616a28a217e0cc6954f9a519198c238e40202263a7c03438771a7d
 EBUILD xlockmore-5.50.ebuild 2165 BLAKE2B 12008f0ca6933760f3a1dcdff60708dfd2e73ee22df4a469ba1b91ca372f315da8badebec3628d6ef75e0bc8319a2c5fd3265648ff9ed5b5012ab66a65312b9b SHA512 8130ac6f135a2642b18ba0f41d4660c4ac954e999dbf339e51d2a655ec74715071aa20e1fd2d69dd658f3b9325fea651f8ef4a7006ad8647ff380aabeb2b440c
-EBUILD xlockmore-5.58.ebuild 2377 BLAKE2B 3db2db0790d565d2ab3d28f505eac181c7da13bfda528c3c9ea95663ac6929f9f19e9ad6a4b46039f2b7d7e747c2c4d26dff92d489214f4f789282f435c73a3c SHA512 42f8a540350375ff0a9224d43224a849bf0bb763e4f27fc32499e394558963bf57d62dee1fe7efadd2be4d808910d3a70ae3a5a23ee2adf45c506b5595e14d85
 EBUILD xlockmore-5.59.ebuild 2380 BLAKE2B 4f5eb6ff4fb36e92ffb3a74a54bcb7af70f7b37dba71cca054461dbad53219ed78a9b8ac4584b3fbf19a9651213454e468a348a4235f6f1bdf8f3c17696959fd SHA512 d205325482f4141043c428f023907cfd4ce1d57fe57a62d6401409f96ab64d5b62e9ceffeece92d86ad2911ed8ae15b04a40399f7a5f0f186b368b1f1e5ef76f
-EBUILD xlockmore-5.61_alpha1.ebuild 2380 BLAKE2B 4f5eb6ff4fb36e92ffb3a74a54bcb7af70f7b37dba71cca054461dbad53219ed78a9b8ac4584b3fbf19a9651213454e468a348a4235f6f1bdf8f3c17696959fd SHA512 d205325482f4141043c428f023907cfd4ce1d57fe57a62d6401409f96ab64d5b62e9ceffeece92d86ad2911ed8ae15b04a40399f7a5f0f186b368b1f1e5ef76f
+EBUILD xlockmore-5.61.ebuild 2380 BLAKE2B 4f5eb6ff4fb36e92ffb3a74a54bcb7af70f7b37dba71cca054461dbad53219ed78a9b8ac4584b3fbf19a9651213454e468a348a4235f6f1bdf8f3c17696959fd SHA512 d205325482f4141043c428f023907cfd4ce1d57fe57a62d6401409f96ab64d5b62e9ceffeece92d86ad2911ed8ae15b04a40399f7a5f0f186b368b1f1e5ef76f
 MISC metadata.xml 446 BLAKE2B d638ac6f12a203ae9ada10ae4c33e3a3d9901e350b6e6925c50078d66b29343cae42a67f84d5334182c1e816bddb05d062eb7b7e47c9125b273db118c4de573b SHA512 c8fafb010e63c39beeee5b53ad37354d19e98ac4cf33f29606b0af379811a0738c9c70d1fb7c31a5673d4a6365fb658a6a8bf49135b748bea9069a690ce543ed
diff --git a/x11-misc/xlockmore/xlockmore-5.58.ebuild b/x11-misc/xlockmore/xlockmore-5.58.ebuild
deleted file mode 100644
index 24bb3f710e8c..000000000000
--- a/x11-misc/xlockmore/xlockmore-5.58.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2019 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
-	https://dev.gentoo.org/~jer/ax_pthread.m4.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_unpack() {
-	unpack ${P/_alpha/ALPHA}.tar.xz
-	xz -cd "${DISTDIR}"/ax_pthread.m4.xz > "${S}"/ax_pthread.m4 || die
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=()
-
-	if use opengl && use truetype; then
-			myconf=( --with-ftgl )
-			append-flags -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/xlockmore/xlockmore-5.61_alpha1.ebuild b/x11-misc/xlockmore/xlockmore-5.61.ebuild
index a342f90d3df7..a342f90d3df7 100644
--- a/x11-misc/xlockmore/xlockmore-5.61_alpha1.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.61.ebuild
diff --git a/x11-misc/xplanetFX/Manifest b/x11-misc/xplanetFX/Manifest
index 41752baf6c9a..a574bb17ad50 100644
--- a/x11-misc/xplanetFX/Manifest
+++ b/x11-misc/xplanetFX/Manifest
@@ -1,8 +1,4 @@
 AUX xplanetFX-2.6.4-gentoo-path.patch 1525 BLAKE2B b36d03fa5b1222e0ce16d83f2d17b20378e1cbda23467f738d9b4c3996ec4687631f8feedcd011fd9c18cc13eaa632541055ccef4fa4a173497f81fd3d50e20d SHA512 73b479936ec210e80c9e15e9a963ab41526b4da879ddc67d4083a710cc5aeb89929d261644131fe3a169aa4d65b297201eb1c08b674219a770cf9c1182b5d143
-DIST xplanetfx-2.6.12_all.tar.gz 36874773 BLAKE2B 12a3fb093584a978f559c64ca64ec567ebbb25faf081ca2b2bb4365aa187693b1dd5f1a3d88a57aa6c901b1c812c19fd6f717ca096093b02760af62d8a8f0fcc SHA512 b2d76f9a8341ab5098a3b09f27f7844673850275f4c577cef344199cdc72f93060eb05786a9111a1fb9f120d747f12cc5793dba6a249141e284a3bff59d4e0fe
-DIST xplanetfx-2.6.13_all.tar.gz 36874849 BLAKE2B 276fbb61d6f90e5e0ed13eb7292d8f853eee8a8d92691d1b5502de6e51e526b36f916f5469eddf411ac8c8b876787c0989d82e8685d6374b36f385b1cb11f47b SHA512 dddc3666dd0f802cafd7b917eb513dd662b94617701622eabaaff18cf9277e3faf206eb602eb2af7c117a212b14e1cdbc4a8c11bded8243571ae4afa86f3fe72
 DIST xplanetfx-2.6.14_all.tar.gz 36874844 BLAKE2B ee02daa55fe2e0a64b4691c95e8bac1b95d99d0ddd1e83036d723d46140b54be8d859619815929e205bc386fd5dbe5ffdc8ca3995da73497e93ee79cccee1dfe SHA512 479c297906785f304178cd3ff41eaf955be6b6a50437c02528528f2328cc726bdcc54fedc107df02b346144c2f06a4325a40b94f03f7923081bed48baf0238b5
-EBUILD xplanetFX-2.6.12.ebuild 1563 BLAKE2B aeb56ee4a438ccd6d571048938bd3106d322cceebad1e82ee1fc273efb5ce74822436d8bc299beba52823219d55dfb0cd3720d9969d9a554112013cbca449e98 SHA512 74c7676caf4c877e1bf3225210e6498ae17cfd65821ab5efd4c385ca6ee9e0ec55b6d140544113270fbff9a875e5a4df0e393d9a423ec7be79fc198dd0b82237
-EBUILD xplanetFX-2.6.13.ebuild 1563 BLAKE2B aeb56ee4a438ccd6d571048938bd3106d322cceebad1e82ee1fc273efb5ce74822436d8bc299beba52823219d55dfb0cd3720d9969d9a554112013cbca449e98 SHA512 74c7676caf4c877e1bf3225210e6498ae17cfd65821ab5efd4c385ca6ee9e0ec55b6d140544113270fbff9a875e5a4df0e393d9a423ec7be79fc198dd0b82237
-EBUILD xplanetFX-2.6.14.ebuild 1563 BLAKE2B c412f7cd73029dec959d83c4110ac12e0d9fa0c07d6ec4f9d1e3e697668131641095ce9c94bd55ced9e4f3f0bebe468db8b7be08f321c235042f11ef38bb9f48 SHA512 2f4213022dd5aa13e3e6265624591b86aac8063de91dc94406cb1f8c4dc68f719b2cde19fdd227a7ca8468c7a79e8da6cfc6ad400b4b5c2a122cc8016baaee26
+EBUILD xplanetFX-2.6.14.ebuild 1536 BLAKE2B 7e7bb87b04ca154cb43f45630d26452b2b403793b144ddd3df819985dde9593c861c18b65ccb573787bdd8f044ecaef85b4f8fa4b1556f0d8d9932c62c285c02 SHA512 62cb5bcd9f571510b055915531ea67425324d8a5a2d3c1e27339ce5edbbc276a127efbe6fed4f4fd612c062168d1c9e9898d364b86562ba5bce6d1d4d6957d55
 MISC metadata.xml 1176 BLAKE2B 873f695dae98cf38ba08a4017205ae2c9b999350782dd20dbcbcd63fc419432a438236670b692f8b6e221ae6bdf2b19d53f76eb4707b173b99a7838c143a623c SHA512 1e81e9920d7407a9cd88b83599282ab1f8079878fdee6739c5a763b0d6781c9dc2dd91c49e7811cd53b32ff6b50db3a77a4ab3d58e296c4f51b478141e61f771
diff --git a/x11-misc/xplanetFX/xplanetFX-2.6.12.ebuild b/x11-misc/xplanetFX/xplanetFX-2.6.12.ebuild
deleted file mode 100644
index ef8d834ced6e..000000000000
--- a/x11-misc/xplanetFX/xplanetFX-2.6.12.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-r1
-
-DESCRIPTION="GUI to configure, run or daemonize xplanet with HQ capabilities"
-HOMEPAGE="http://mein-neues-blog.de/xplanetFX/"
-SRC_URI="http://repository.mein-neues-blog.de:9000/archive/${P/FX/fx}_all.tar.gz"
-
-LICENSE="WTFPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libnotify"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	dev-python/pygtk[${PYTHON_USEDEP}]
-	media-gfx/imagemagick
-	sys-devel/bc
-	x11-misc/xplanet
-	libnotify? ( x11-libs/libnotify )"
-#python
-
-S="${WORKDIR}/usr"
-
-src_prepare() {
-	default
-
-	eapply "${FILESDIR}"/${PN}-2.6.4-gentoo-path.patch
-	sed -e "s/Application;//" -i share/applications/*desktop || die
-
-	# These will be installed separately
-	mkdir gentoo || die
-	mv share/${PN}/{autostart,flipview.py,stars/catalog.py,xplanetFX_gtk,xplanetFX_tray} \
-		gentoo || die
-}
-
-src_install() {
-	dobin bin/${PN}
-	insinto /usr/share/applications
-	doins share/applications/${PN}.desktop
-	insinto /usr/share/pixmaps
-	doins share/pixmaps/*
-	insinto /usr/share/${PN}
-	doins -r share/${PN}/*
-
-	exeinto /usr/share/${PN}
-	doexe gentoo/autostart
-
-	dodoc share/doc/${PN}/{changelog,README}
-
-	python_scriptinto /usr/share/${PN}/stars
-	python_foreach_impl python_doscript gentoo/catalog.py
-	python_scriptinto /usr/share/${PN}
-	python_foreach_impl python_doscript gentoo/{xplanetFX_gtk,xplanetFX_tray}
-	python_foreach_impl python_domodule gentoo/flipview.py
-}
diff --git a/x11-misc/xplanetFX/xplanetFX-2.6.13.ebuild b/x11-misc/xplanetFX/xplanetFX-2.6.13.ebuild
deleted file mode 100644
index ef8d834ced6e..000000000000
--- a/x11-misc/xplanetFX/xplanetFX-2.6.13.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-r1
-
-DESCRIPTION="GUI to configure, run or daemonize xplanet with HQ capabilities"
-HOMEPAGE="http://mein-neues-blog.de/xplanetFX/"
-SRC_URI="http://repository.mein-neues-blog.de:9000/archive/${P/FX/fx}_all.tar.gz"
-
-LICENSE="WTFPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libnotify"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	dev-python/pygtk[${PYTHON_USEDEP}]
-	media-gfx/imagemagick
-	sys-devel/bc
-	x11-misc/xplanet
-	libnotify? ( x11-libs/libnotify )"
-#python
-
-S="${WORKDIR}/usr"
-
-src_prepare() {
-	default
-
-	eapply "${FILESDIR}"/${PN}-2.6.4-gentoo-path.patch
-	sed -e "s/Application;//" -i share/applications/*desktop || die
-
-	# These will be installed separately
-	mkdir gentoo || die
-	mv share/${PN}/{autostart,flipview.py,stars/catalog.py,xplanetFX_gtk,xplanetFX_tray} \
-		gentoo || die
-}
-
-src_install() {
-	dobin bin/${PN}
-	insinto /usr/share/applications
-	doins share/applications/${PN}.desktop
-	insinto /usr/share/pixmaps
-	doins share/pixmaps/*
-	insinto /usr/share/${PN}
-	doins -r share/${PN}/*
-
-	exeinto /usr/share/${PN}
-	doexe gentoo/autostart
-
-	dodoc share/doc/${PN}/{changelog,README}
-
-	python_scriptinto /usr/share/${PN}/stars
-	python_foreach_impl python_doscript gentoo/catalog.py
-	python_scriptinto /usr/share/${PN}
-	python_foreach_impl python_doscript gentoo/{xplanetFX_gtk,xplanetFX_tray}
-	python_foreach_impl python_domodule gentoo/flipview.py
-}
diff --git a/x11-misc/xplanetFX/xplanetFX-2.6.14.ebuild b/x11-misc/xplanetFX/xplanetFX-2.6.14.ebuild
index 5a7eba008ee4..b8f5f2c89686 100644
--- a/x11-misc/xplanetFX/xplanetFX-2.6.14.ebuild
+++ b/x11-misc/xplanetFX/xplanetFX-2.6.14.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit eutils python-r1
+inherit desktop eutils python-r1
 
 DESCRIPTION="GUI to configure, run or daemonize xplanet with HQ capabilities"
 HOMEPAGE="http://mein-neues-blog.de/xplanetFX/"
@@ -42,8 +42,7 @@ src_prepare() {
 
 src_install() {
 	dobin bin/${PN}
-	insinto /usr/share/applications
-	doins share/applications/${PN}.desktop
+	domenu share/applications/${PN}.desktop
 	insinto /usr/share/pixmaps
 	doins share/pixmaps/*
 	insinto /usr/share/${PN}
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index cc47e5a91541..3ea700680b84 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 3385 BLAKE2B e3de5033620cba11adac6b1c60ad110ced71228f6186e78632a871230bd5a1fa71ad89692bccee58836d10c1602bcd83aca1798a8565381920f65f94ff499100 SHA512 a51df05efd08870545ed04afa71e01608560a680958956d8a1a1e4c31e2c1aee0c7fba9e92b7e3d868845cf4769621338206fbf7bfcc4511223244f7d78d864d
-EBUILD xscreensaver-5.42.ebuild 3379 BLAKE2B d1c4caaa30884a7246c779a9395ac5b75edc83fca264bbe1878054d8e5843e8cc8973269ea4ba7dca1795f59be5a769b07e466d028648cfebac05cf9ffe6424c SHA512 31be7e3ff82e3d5427c8fbc2aca4cbfbf70ec448b6e856b5a78811116d3fd322c37d4669f3f65ecf30a5f343f7b731f09328b1356620bb94cab2a758f539667c
-EBUILD xscreensaver-5.43-r1.ebuild 3420 BLAKE2B 3222b8554ece3427fddbfd0aa5ec2d25f50141697a96cbc8b25bbaf7bd50384b0673554b873ef4503643f95eaf71265a0f385ed8dc858b05e1e48ed8ddc6a9bb SHA512 6aec191f0ff65feb864a8571240c39c4272cace6be74ff598431316163f653e528dc5a84c9d81afe5736ac7db9fa02f755327d4247784e2591e35c9d929a5da1
+EBUILD xscreensaver-5.38.ebuild 3407 BLAKE2B 1700af11e8e9fd1452e3690951863162d0a73cabe05f05627a25b4720ae1807e953f26d980a289ee194382c809d5326bdce1d8ab324555f4d4862c1c62819d70 SHA512 1df48bdc0afceaae93e9ad12ce8ca5186afcc793cb6c19a1f3337a4d48ce881d0e3d89b98adc495148f66773e9568a52be2608280648d7b4920791437a63542d
+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
 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 eada3a1f922f..30dd12d15e73 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.38.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.38.ebuild
@@ -7,7 +7,7 @@ inherit autotools eutils flag-o-matic multilib pam
 DESCRIPTION="A modular screen saver and locker for the X Window System"
 HOMEPAGE="https://www.jwz.org/xscreensaver/"
 SRC_URI="
-	${HOMEPAGE}${P}.tar.gz
+	https://www.jwz.org/xscreensaver/${P}.tar.gz
 "
 
 LICENSE="BSD"
diff --git a/x11-misc/xscreensaver/xscreensaver-5.42.ebuild b/x11-misc/xscreensaver/xscreensaver-5.42.ebuild
index be48a4d7e724..d3224ffad7b0 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.42.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.42.ebuild
@@ -7,7 +7,7 @@ inherit autotools desktop flag-o-matic multilib pam
 DESCRIPTION="A modular screen saver and locker for the X Window System"
 HOMEPAGE="https://www.jwz.org/xscreensaver/"
 SRC_URI="
-	${HOMEPAGE}${P}.tar.gz
+	https://www.jwz.org/xscreensaver/${P}.tar.gz
 "
 
 LICENSE="BSD"
diff --git a/x11-misc/xscreensaver/xscreensaver-5.43-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-5.43-r1.ebuild
index 0e7b5548e757..626d74e50e27 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.43-r1.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.43-r1.ebuild
@@ -7,7 +7,7 @@ inherit autotools desktop flag-o-matic multilib pam
 DESCRIPTION="A modular screen saver and locker for the X Window System"
 HOMEPAGE="https://www.jwz.org/xscreensaver/"
 SRC_URI="
-	${HOMEPAGE}${P}.tar.gz -> ${PF}.tar.gz
+	https://www.jwz.org/xscreensaver/${P}.tar.gz -> ${PF}.tar.gz
 "
 
 LICENSE="BSD"
diff --git a/x11-misc/xsnow/Manifest b/x11-misc/xsnow/Manifest
index 2777c3a10402..e7aee4c3052e 100644
--- a/x11-misc/xsnow/Manifest
+++ b/x11-misc/xsnow/Manifest
@@ -1,3 +1,3 @@
 DIST xsnow-1.42.tar.gz 56752 BLAKE2B b6feefa4aabc464097b099a0e48d27b9bd5d1b82bc02ca187ffd8ab810f3562c1d11ad01f18f79994699e1fb1fa520269976a35634388fbab2838e2e2bb122bd SHA512 7833f3c1834d64944a578dc71bbf09966d47a1b4878fb826cf121606e76c69544d96d73665572b45c47e0e017dd0cb0bf49f76799aeb859c1dc72348da4ff257
-EBUILD xsnow-1.42-r2.ebuild 816 BLAKE2B 955873b2043aa44b2008a0967e1676639357cd3b06a89baaa64b4397d591cdcbc44d63b40fa2b665d4f745992dd9f08cd23c727ad8f7cb40b6957b6317e614f1 SHA512 df34b242879a4521fdfb59c6c719e93d38133b47152311dc7c4050d48efb1bb0247d3cce7ae6096444df4a954f70a360234e3125ead1fc4809620aa3b2fb6939
+EBUILD xsnow-1.42-r2.ebuild 843 BLAKE2B d84d87a6e7c13f17ac7671a6b3d31f7ccd6e8964c650ec8e3678bd3592713f70c3d10bc9d8bcdae6956d97da23554678de5706278905185d950e873eb4fa8636 SHA512 dd17bc7808218dd0d9b2d610c6a9e0235d73f7c042fff2af118e77932a997fcb312adfde2c5cee45445ab1603d0aa01a2824722f262e5ad0251374ac15c7e3de
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xsnow/xsnow-1.42-r2.ebuild b/x11-misc/xsnow/xsnow-1.42-r2.ebuild
index eb75c118fa4c..212e4eb8e16f 100644
--- a/x11-misc/xsnow/xsnow-1.42-r2.ebuild
+++ b/x11-misc/xsnow/xsnow-1.42-r2.ebuild
@@ -6,7 +6,7 @@ inherit toolchain-funcs
 
 DESCRIPTION="let it snow on your desktop and windows"
 HOMEPAGE="https://janswaal.home.xs4all.nl/Xsnow/"
-SRC_URI="${HOMEPAGE}${P}.tar.gz"
+SRC_URI="https://janswaal.home.xs4all.nl/Xsnow/${P}.tar.gz"
 
 LICENSE="freedist"
 SLOT="0"
diff --git a/x11-misc/xstroke/Manifest b/x11-misc/xstroke/Manifest
index 5f5b99077009..a066fe822cd3 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 811 BLAKE2B 7927a47c1914a7c72e5c06c5525066f4bc827c95e9e17204920bca864579de80c757188f44f6318c4e286c85ecbbed2757ecc73d5f6268d1b2dd5fed7d40fdac SHA512 f78c82eaa4790a819f5b4bc59f2debaf913be0b40851bbdd1129b1a07e5e264b06d808f1f0bc83c6498bfd74c58bc52cb6d9ab8087544b9928c81e54a4855626
+EBUILD xstroke-0.6-r1.ebuild 713 BLAKE2B 29f043d85154824a1da9e8266a393198fe39ab05cc9d01f58fd2180540634904f955c11dcd368cd76d897226e50e89b52c4c1fd8f0cbe4af07534c4be7532706 SHA512 b06071caf3c8dc76f8e3df6262e208d5d1b12e997ab898dce1bde5022f3102b488f29a70e9b3cbbf35d9ffd169d4eda49ede78b57f001f07c50929597d1a72be
 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 c797405cf802..63e05e04026d 100644
--- a/x11-misc/xstroke/xstroke-0.6-r1.ebuild
+++ b/x11-misc/xstroke/xstroke-0.6-r1.ebuild
@@ -1,19 +1,17 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit autotools eutils
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="Gesture/Handwriting recognition engine for X"
-# Dead upstream?
-#HOMEPAGE="http://www.xstroke.org/"
 HOMEPAGE="http://freshmeat.net/projects/xstroke/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha ~amd64 hppa ~mips ppc sparc x86"
-IUSE=""
 
 RDEPEND="
 	x11-libs/libX11
@@ -21,21 +19,21 @@ RDEPEND="
 	x11-libs/libXft
 	x11-libs/libXpm
 	x11-libs/libXrender
-	x11-libs/libXtst
-"
+	x11-libs/libXtst"
 DEPEND="
 	${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="
 	sys-devel/flex
 	virtual/pkgconfig
-	virtual/yacc
-	x11-base/xorg-proto
-"
+	virtual/yacc"
 
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
+PATCHES=(
+	"${FILESDIR}"/${P}-sigsegv_sprintf.patch
+	"${FILESDIR}"/${P}-underlinking.patch
+)
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-sigsegv_sprintf.patch \
-		"${FILESDIR}"/${P}-underlinking.patch
+	default
 	eautoreconf
 }
diff --git a/x11-misc/xtoolwait/Manifest b/x11-misc/xtoolwait/Manifest
index cc3653bf0109..07b16f5fe35c 100644
--- a/x11-misc/xtoolwait/Manifest
+++ b/x11-misc/xtoolwait/Manifest
@@ -1,3 +1,3 @@
 DIST xtoolwait-1.3.tar.gz 14315 BLAKE2B 7ebf1f6713308ae74510430e07c29e638e8c9549eba79f03bc42278dd88ce7036f4ed8c21854dbfd9d4706574c4c0982be87a56d001c71d98920f31401a32408 SHA512 36c8446dd7076c18de8f6c582db45cbdc6b7ddc733993ddb08c8bd5c5045621597ae1b3144b92461feabeb14bd50a759f86023848302436ab915faa8c10ebdaa
-EBUILD xtoolwait-1.3-r2.ebuild 893 BLAKE2B 6e7678d415b2862f2de059b3b3c4a618b52648bc417ffa5f660a216d92c8b04161e4a73fa3e76caefb6875427b44f602ac4f0f93f2d4ec74cbe034eefa5a516b SHA512 b52c40d7cce97b8fc4d35ed5acb00ff439b63399f5977dfe3862f5cfd5442722daadd75a753e9196dacbb46989888798a6bc8f6c6d6b0381243c204b6c204995
+EBUILD xtoolwait-1.3-r2.ebuild 926 BLAKE2B e23ba235c2fede1100c4bf7f19031091ddff54cba38fc147f5629b7e7989d3cf6fbceb19fde8ac945cb3275eba0734d45bcdbe843d1e8857a95c0622d33a0526 SHA512 6104bdb97f614aa1060193e7780fb115f84a49ea6d42b41a24ae1d2a6cc12b841f58d37956a30f4afe4a3e649bd2078470b147d45f8e60af2701856dd7f797d4
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild b/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild
index b1878e8d3e44..386962ee9765 100644
--- a/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild
+++ b/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
+
 inherit toolchain-funcs
 
 DESCRIPTION="Xtoolwait notably decreases the startup time of an X session"
@@ -11,16 +12,17 @@ SRC_URI="http://ftp.x.org/contrib/utilities/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
 
-RDEPEND="x11-libs/libX11
+RDEPEND="
+	x11-libs/libX11
 	x11-libs/libXext"
 DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="
 	app-text/rman
-	x11-base/xorg-proto
 	x11-misc/imake"
 
-src_prepare() {
+src_configure() {
 	xmkmf || die
 	sed -i \
 		-e '/CC = /d' -e '/EXTRA_LDOPTIONS = /d' \
@@ -36,11 +38,11 @@ src_compile() {
 
 src_install() {
 	emake \
-		BINDIR=/usr/bin \
-		MANPATH=/usr/share/man \
-		DOCDIR=/usr/share/doc/${PF} \
+		BINDIR="${EPREFIX}"/usr/bin \
+		MANPATH="${EPREFIX}"/usr/share/man \
+		DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
 		DESTDIR="${D}" \
 		install{,.man}
 
-	dodoc CHANGES README
+	einstalldocs
 }
diff --git a/x11-misc/xvkbd/Manifest b/x11-misc/xvkbd/Manifest
index 3b7b4c8733d2..d3625910b7b4 100644
--- a/x11-misc/xvkbd/Manifest
+++ b/x11-misc/xvkbd/Manifest
@@ -3,7 +3,7 @@ AUX xvkbd-4.0-destdir.patch 1026 BLAKE2B 473a1499bff1f00846ae81de75973bc77f63f45
 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 1039 BLAKE2B 0e1530b3eb6453dea3da454de2012414831c5108bccc208f69ee6514ff27e66f9d6c8b2a0d0c1cb4e2ad30ddba08921b1e1107643241701bfa1a24623e7e35fa SHA512 a33d41cf74553169337716e060398061397e4d399696234a214a1887efa3326761fe36b0c351d25dfa8e42d1bff6885ff287df91ac587964b5c6d84adea38e15
-EBUILD xvkbd-3.9.ebuild 1007 BLAKE2B 4b2ed2fd51d0c4f569bb3712870e8b1cec359e1da441b5f54a114533bc1dcb489c3bffcbf7697021222512d964224868ae59a9cab3c9d13493f6abd074649782 SHA512 486c7453c758d5374be0c8bfc5e59faf7a8a335de67ed1eee07fabf74c1357d6d569de7d681f37ea8ee0393f24910a8ed41ce2d7bf28272df9178ef5d9f62486
-EBUILD xvkbd-4.0.ebuild 706 BLAKE2B 1ce003b13e95fb0f3152e148e774ece79b7a76eb1a1c74e5f02f961ed48188249fc00449f4f407fbc5af610591b8a67fafa03b8b276720d285f68c832591e57f SHA512 dd41fb0962c6538163cbc34493806148a4c741947c86a5e01977f011399559c3ebecf1f4b01be175c673cb4d93eb3a824dde68e8f7a04980f93b25dfc1dde88b
+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
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xvkbd/xvkbd-3.7.ebuild b/x11-misc/xvkbd/xvkbd-3.7.ebuild
index 777c7043cb89..d096aa2ffbe0 100644
--- a/x11-misc/xvkbd/xvkbd-3.7.ebuild
+++ b/x11-misc/xvkbd/xvkbd-3.7.ebuild
@@ -6,7 +6,7 @@ inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="virtual keyboard for X window system"
 HOMEPAGE="http://t-sato.in.coocan.jp/xvkbd/"
-SRC_URI="${HOMEPAGE}${P}.tar.gz"
+SRC_URI="http://t-sato.in.coocan.jp/xvkbd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-misc/xvkbd/xvkbd-3.9.ebuild b/x11-misc/xvkbd/xvkbd-3.9.ebuild
index 3033ea4d6dd8..e541e25ff792 100644
--- a/x11-misc/xvkbd/xvkbd-3.9.ebuild
+++ b/x11-misc/xvkbd/xvkbd-3.9.ebuild
@@ -6,7 +6,7 @@ inherit multilib toolchain-funcs
 
 DESCRIPTION="virtual keyboard for X window system"
 HOMEPAGE="http://t-sato.in.coocan.jp/xvkbd/"
-SRC_URI="${HOMEPAGE}${P}.tar.gz"
+SRC_URI="http://t-sato.in.coocan.jp/xvkbd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-misc/xvkbd/xvkbd-4.0.ebuild b/x11-misc/xvkbd/xvkbd-4.0.ebuild
index 52f200bc9b23..90d49c1f04fe 100644
--- a/x11-misc/xvkbd/xvkbd-4.0.ebuild
+++ b/x11-misc/xvkbd/xvkbd-4.0.ebuild
@@ -6,7 +6,7 @@ inherit autotools
 
 DESCRIPTION="virtual keyboard for X window system"
 HOMEPAGE="http://t-sato.in.coocan.jp/xvkbd/"
-SRC_URI="${HOMEPAGE}${P}.tar.gz"
+SRC_URI="http://t-sato.in.coocan.jp/xvkbd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-misc/yabar/Manifest b/x11-misc/yabar/Manifest
index e178c15c11f8..65b9f4bdeb9d 100644
--- a/x11-misc/yabar/Manifest
+++ b/x11-misc/yabar/Manifest
@@ -1,3 +1,3 @@
 DIST yabar-0.4.0_p20190316.tar.gz 892725 BLAKE2B eb14b06327533034756885c68ab03b1ff049c987d1dac6d083c553646cd178210429d9457c1067db3211fcb39e9814a260aed201dea4e6410544b9247c5dee93 SHA512 f93250605c5b56d64c7ec6a7e7faa6120cdc06191ddafb13822875fd98b1b7a1822d9b93b62c49c302b1d4bffb14a200feed937efb0b11711de7159ce83eb7c5
-EBUILD yabar-0.4.0_p20190316.ebuild 1408 BLAKE2B e828f9dd0a7b6bc16eca292b6b8202974d23e314c72ad2ca23c7238f7c8fa526450f6771afdd94e5d3fc6ef7f3bac848f875fa1a1474661f4e6750ac8adf5c66 SHA512 d95dbcb0b464aa297460368e2ed8703663edcd2c82bd2841a240469d308f71b903aa0f03adabdbc7c7574b9d2ea516042bd6aae198f88b1d1f4c8d97b861de11
+EBUILD yabar-0.4.0_p20190316-r1.ebuild 1413 BLAKE2B ebcd6fa5bda57ea705e58af7c0ac0abc0fbe17ff01c2773c00eb00632d78d50d5ad8e77882a2b9485a8c196cd8856a541c59f9ec1a2368ef3ff34c2fdb4b85ab SHA512 89546ff20da158cc860f54ab9a46267c8111bf1685878bc91fd83e573b3749e746231bde464e7a796251f0a1efcf7f4b75f5ea7a8ae056c168a875601004bbf9
 MISC metadata.xml 585 BLAKE2B 4d79040e69737a752069c4fc672996c9121347e6813a6f4ec31202685968d1bca500cf428e0ce601f63570abf64dd23eba1fe625b31552602f29809a0776d9c0 SHA512 8974255efba23f15dd84b4a158b82bf2a958de54f09b4ec8a85021d771814fddc482447b1df366227224981d7bd12d13c50b0b1f80b57db83ba023f55c177a2b
diff --git a/x11-misc/yabar/yabar-0.4.0_p20190316.ebuild b/x11-misc/yabar/yabar-0.4.0_p20190316-r1.ebuild
index b9fe19029872..421f3a8a30b6 100644
--- a/x11-misc/yabar/yabar-0.4.0_p20190316.ebuild
+++ b/x11-misc/yabar/yabar-0.4.0_p20190316-r1.ebuild
@@ -18,7 +18,7 @@ DEPEND="
 	dev-libs/libconfig:=
 	media-libs/alsa-lib
 	net-wireless/wireless-tools
-	x11-libs/cairo[xcb]
+	x11-libs/cairo[X,xcb(+)]
 	x11-libs/gdk-pixbuf:2
 	x11-libs/libxkbcommon[X]
 	x11-libs/pango
diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index 43831ddf3e7a..ba1e92e010c7 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -1,8 +1,8 @@
 AUX zim-0.60-remove-ubuntu-theme.patch 669 BLAKE2B fbb3fe0082e7567f4ae9d0bd031096cf2bcbd4d4cb86b31ceff18dda880b5cf1f8441e452642dd28275c9ce6e20c7da0a3a77b4157da13d5d4bbe9b6a30a9086 SHA512 a2e202986c77490898c15f6c4e647667fd6662422e8bbd638624a52a33989cd4259f95b37f488ff4a947f04354704ee9df7b9d60aae2fcc928f1f3186955ea1a
-DIST zim-0.65.tar.gz 1899614 BLAKE2B e7989d91120f2ffe0668c996b5abd61cc1cb12b2a5acf9023dfd87819b4c8834bba09f2211c901512d9fe186eee7939e44a5f098c09ef65f1d28cc55eb97e9b7 SHA512 dee652087d3d986b80353e9087abe363392354f40db11f8819d0b3f3c6f133c08c66c651a92ed77c1656f1135998ac02622eca08ac2e28c8fb3149a724a0f7fb
 DIST zim-0.71.1.tar.gz 2883082 BLAKE2B 66d1c571a67e12d8d38cbc6d8bd32918f98f47bff0aa34971986896b3aeec91170cd1f2a87a411a8fccda502addd3de8176cc70ebfbafedc87c462a751e87036 SHA512 0da59955f730cc0bbee033a292c7e531b1a302c950773aed68bd8a18bf1485826086522c4144f24f500e9240ebcb9b592b33dda390923ca0eba6ab57273c0896
 DIST zim-0.72.0.tar.gz 2590406 BLAKE2B 0d77052e9eaa62b855be30eee64863197498ee54949f8610528ccd86cf32e7c9c55fb2faca719a4d92e0568941dc6b100299e76a33f8c49bddc5e367ec98d923 SHA512 60f59c2cf2ebb920515ecbc77e7fb1ddb9b0a6f6179503176b582b6b87ada759707ec4ccee929896a8a7d489f25ff13f7a6ff61fa637ecdb3d02640182cda0b9
-EBUILD zim-0.65.ebuild 1801 BLAKE2B 46fdc83458bf3f3ad8b21962b20431773390d24847407ca0f22ffa73ab015b6badd91da80eee16f628d7343095db563e2de047d002c7f8da8f4ce8fdeaf226b6 SHA512 56606b28d7ce853dca3509c93c95672b36a5bf760d0535bd1f37a19f41d7c59890ccfaadbe0eba770e0fdba6551bd63f6ed43203fe3ab76d57b827d48de4bf79
-EBUILD zim-0.71.1.ebuild 1912 BLAKE2B 453cfa5a308a9e00622a508b27aae0f0511b241a8f1ca9f3555964defec514617430e3b88e92c10b2814e2ce727c8f975e273315dfbbcb8759fc4d85e593a1dd SHA512 a6b3845fb5a20895e96027221e2fdc4a23958e2ee9a7cd8e220037c30294288bc7bc5a353ce6b9a5e46cc8a2c6cb9c1221382b3fafe4ae7a3d38db175a4777ac
-EBUILD zim-0.72.0.ebuild 1895 BLAKE2B 066acc255bb356c9841b4e7eae17b3baa632b4b9c7ad9dba8ec926ba1590484a87f0525ab8e73dadbb9bdf92c624da37e84ef117bbca2e03ed9449695799826e SHA512 8d05dbf1c1db89f4dbbc0de727b8be11a6c908bd08b11f9b4601af9feb78a6e80422bc8dd3a11869abdd73295ce48d4bc3bf9eb86238b48a55288ef786a8f5ae
+DIST zim-0.72.1.tar.gz 2596910 BLAKE2B cdc6c875ed316dcd5655d75c280b46189d9b7068922ea0cc05606bce8f5bd0ef7d92b7965ee0af067add28ef75f53363e864b3ca43d216dbf99fe2cac6e19a73 SHA512 3b74388eb9272e6c5c89e752d784428b18ffc6cbc76311162aa8f42f2de434ad8e9f9c6932b8aaa62e2a3abdb879a31c982cc3103e7eaa3a5407a02cb6750bfc
+EBUILD zim-0.71.1.ebuild 1908 BLAKE2B 7f7ccbb6757d758096d682d813cdf26352042ff9b0025a288fd20fc555bc2e78a762cc5af1e5216d85240ae58ca722566443212d118563e27807f96737aa0305 SHA512 5401f6bff60e4518f5f5df667da340b8da29b7955b3095a94896d72f9a36c1589bdb7493bc91c9295b56ac65e781c797fddf64713e68de41ade1f2ec3a6a603d
+EBUILD zim-0.72.0.ebuild 1891 BLAKE2B bf456447163aa74af87dc9034c3318c5107f7c4d100ee3b2ea67d6c6836df6378add13ee45d79dec06af20257f10f466adda9c84d4f32dc443e308d902ccbc85 SHA512 9ec423255032328da8756fb7d762fa818cebf9c4da83f8358b91c386ea5ba959108ff15cbc1637d7a18501c0ac62808849dda7e420adf2b18b87121fa88ed0f7
+EBUILD zim-0.72.1.ebuild 1891 BLAKE2B bf456447163aa74af87dc9034c3318c5107f7c4d100ee3b2ea67d6c6836df6378add13ee45d79dec06af20257f10f466adda9c84d4f32dc443e308d902ccbc85 SHA512 9ec423255032328da8756fb7d762fa818cebf9c4da83f8358b91c386ea5ba959108ff15cbc1637d7a18501c0ac62808849dda7e420adf2b18b87121fa88ed0f7
 MISC metadata.xml 824 BLAKE2B a6ac745b62015073844af9a8aae0ef1d6ca6b7c28e881c7b85d31e00c808076fa944feec5980cdefc72b5ddfa2cecb98fc96b4745df12743212a4d572679408d SHA512 26a4774e75f0a06bfedc2c26f4ca688f9a2644935302e0674ba5a5308af88bc90f291a01f5b10bba62ac0f0a46561d63bfd9289de67bc53c4be454542ea76816
diff --git a/x11-misc/zim/zim-0.65.ebuild b/x11-misc/zim/zim-0.65.ebuild
deleted file mode 100644
index 0c5e544634d3..000000000000
--- a/x11-misc/zim/zim-0.65.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 gnome2-utils virtualx xdg-utils
-
-DESCRIPTION="A desktop wiki"
-HOMEPAGE="http://zim-wiki.org/"
-SRC_URI="http://zim-wiki.org/downloads/${P}.tar.gz"
-
-LICENSE="BSD GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/pygtk[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	x11-misc/xdg-utils
-	test? (
-		dev-vcs/bzr
-		dev-vcs/git
-		dev-vcs/mercurial )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch
-)
-
-python_prepare() {
-	sed -i -e "s/'USER'/'LOGNAME'/g" zim/__init__.py zim/fs.py || die
-
-	if [[ ${LINGUAS} ]]; then
-		local lingua
-		for lingua in translations/*.po; do
-			lingua=${lingua/.po}
-			lingua=${lingua/translations\/}
-			has ${lingua} ${LINGUAS} || \
-				{ rm translations/${lingua}.po || die; }
-		done
-	fi
-
-	distutils-r1_python_prepare
-}
-
-python_test() {
-	VIRTUALX_COMMAND="${PYTHON}" virtualmake test.py
-}
-
-python_install() {
-	distutils-r1_python_install --skip-xdg-cmd
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-	if ! has_version ${CATEGORY}/${PN}; then
-		einfo "Please emerge these packages for additional functionality"
-		einfo "    dev-lang/R"
-		einfo "    dev-python/gtkspell-python"
-		einfo "    dev-vcs/bzr"
-		einfo "    media-gfx/graphviz"
-		einfo "    media-gfx/imagemagick"
-		einfo "    media-gfx/scrot"
-		einfo "    media-sound/lilypond"
-		einfo "    sci-visualization/gnuplot"
-		einfo "    virtual/latex-base app-text/dvipng"
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/x11-misc/zim/zim-0.71.1.ebuild b/x11-misc/zim/zim-0.71.1.ebuild
index 99b03d91550e..17560f2d59f1 100644
--- a/x11-misc/zim/zim-0.71.1.ebuild
+++ b/x11-misc/zim/zim-0.71.1.ebuild
@@ -1,8 +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
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="sqlite"
 DISTUTILS_SINGLE_IMPL=1
 inherit xdg-utils distutils-r1 gnome2-utils virtualx
diff --git a/x11-misc/zim/zim-0.72.0.ebuild b/x11-misc/zim/zim-0.72.0.ebuild
index 1dbe5acb22de..7d6ec427d216 100644
--- a/x11-misc/zim/zim-0.72.0.ebuild
+++ b/x11-misc/zim/zim-0.72.0.ebuild
@@ -1,8 +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
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="sqlite"
 DISTUTILS_SINGLE_IMPL=1
 inherit xdg-utils distutils-r1 virtualx
diff --git a/x11-misc/zim/zim-0.72.1.ebuild b/x11-misc/zim/zim-0.72.1.ebuild
new file mode 100644
index 000000000000..7d6ec427d216
--- /dev/null
+++ b/x11-misc/zim/zim-0.72.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_6 )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_SINGLE_IMPL=1
+inherit xdg-utils distutils-r1 virtualx
+
+DESCRIPTION="A desktop wiki"
+HOMEPAGE="
+	https://zim-wiki.org/
+	https://github.com/zim-desktop-wiki/zim-desktop-wiki
+"
+SRC_URI="https://github.com/${PN}-desktop-wiki/${PN}-desktop-wiki/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	x11-libs/gtk+:3[introspection]
+	x11-misc/xdg-utils
+"
+DEPEND="
+	${RDEPEND}
+"
+DOCS=( CHANGELOG.md CONTRIBUTING.md PLUGIN_WRITING.md README.md )
+PATCHES=( "${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch )
+S=${WORKDIR}/${PN}-desktop-wiki-${PV/_/-}
+
+python_prepare_all() {
+	sed -i -e "s/'USER'/'LOGNAME'/g" zim/__init__.py zim/fs.py || die
+
+	if [[ ${LINGUAS} ]]; then
+		local lingua
+		for lingua in translations/*.po; do
+			lingua=${lingua/.po}
+			lingua=${lingua/translations\/}
+			has ${lingua} ${LINGUAS} || \
+				{ rm translations/${lingua}.po || die; }
+		done
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_install() {
+	distutils-r1_python_install
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	if ! has_version ${CATEGORY}/${PN}; then
+		elog "Please install these packages for additional functionality"
+		elog "    dev-lang/R"
+		elog "    dev-python/gtkspell-python"
+		elog "    dev-vcs/bzr"
+		elog "    media-gfx/graphviz"
+		elog "    media-gfx/imagemagick"
+		elog "    media-gfx/scrot"
+		elog "    media-sound/lilypond"
+		elog "    sci-visualization/gnuplot"
+		elog "    virtual/latex-base app-text/dvipng"
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
author	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
commit	21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree	e1810a4b135afce04b34862ef0fab2bfaeb8aeca /x11-misc
parent	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)