gentoo resync : 21.06.2020

35 files changed, 667 insertions, 113 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index f586ddcaafdd..ed74cea9e13d 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/birdtray/Manifest b/x11-misc/birdtray/Manifest
index 79afdb6853b3..9f1d8852cc98 100644
--- a/x11-misc/birdtray/Manifest
+++ b/x11-misc/birdtray/Manifest
@@ -1,7 +1,8 @@
 AUX birdtray-1.7.0-desktop_file_deprecated_category.patch 263 BLAKE2B 9a456d55e242112726f00bcf87041720b9ee56097c50d71e4bf3f318f49a8ad78224954c7eff764d31cd3ba520fb8c895984776a27a3f1b354837e77382cf023 SHA512 186cd5a80d5d2f32c82708f48d137a06aad506fd44bb6b188ec80cd6041e68bfbd33a16f123b79d67bb977836b2815893e221cc60a3e35388e34c3a45abecfe5
+AUX birdtray-1.8.1_qt515.patch 569 BLAKE2B 9575631ce63a01ead03240779f88ef2ea32e7a7467716cc185d01dcc698c6349d47a11d8b8926434926d52cb1d9166e3ac542861c50f1814dcdf8dcdf1e569e0 SHA512 7d0fd09166ad242beecc0319e639016701493605d85363070247ec558c218e5b8736778aa1f821c33ac0be9083a2ad01f7ec4a572fd21dee40363ce0eb041645
 DIST birdtray-1.7.0.tar.gz 398153 BLAKE2B 87e583ab55b828213f5da97a61c3fc710b381b46ab688f02b6d1c4d01a2577451375d7366f0406cf685f1366497204e985de7905b1635161e252c11b9456da61 SHA512 3c2940a3a0e405d3fce1cd0411437ffa56f76c458e42ea059de1bd3fca802621643be39c1a0df3fc3fb0deac2aa53f7631c4bee191efd4b48e591dd05b30a6ab
-DIST birdtray-1.8.0.tar.gz 737802 BLAKE2B b3c52c4380a7d88cb7ab7abdc08979c03f1429564dfb568743c3698f6b7cc630b482181e0f3049fb3fc6e871cea23bf3e400e77ec17da7724f300bbb12f992c4 SHA512 6596b5e8c06b414b18b3256c3194d868ed42aab88486fa174b644d48640c15d2e33b198962e91e5b74e501c33f345cf3e160176a6928c789013076cce91a6eba
+DIST birdtray-1.8.1.tar.gz 767821 BLAKE2B 343fb902381396df2a9d49b619a6eaea620447276ee1c6261b8bb9667ea40d945da37522e1ddeac529d032549f3ca3288d6b780ff95b6adbc98a1dbea8fdeb10 SHA512 464bdaf1820cecb0bb9b41721389f24ce447c65e25f857998c4de5d3fb2aa53f03223938974e9bbdbfd4d719fb6aaecdf8a27c6e2ab7075b451bc8e73d8f07e7
 EBUILD birdtray-1.7.0-r1.ebuild 862 BLAKE2B 21c440df982cf6ed61053fc37571c2fa960a29a9d638c88b5bcde64fb3b13ace13035af186db2da7dd0f52871cbd6e97033dda8ea3118f38744177fa8db1a36a SHA512 1516790487053f202f379551554b9cccf96b1c2eb6d84037e60dabd1384df817f7c07a7acfebdbdfc070aa8795c43938a3ca098f9419f12a7ab2770cad91d9af
-EBUILD birdtray-1.8.0.ebuild 739 BLAKE2B 5e86f0dda25dc8ba671cf1fea88f8defac4c051c7ae05004fbfe78950ddfe4131f0929bd7a7ed82731adcb48c225a56ad597306815ac6e9be3bac22a3779f86f SHA512 309b5a63ba487d1e0cfd52032c4395600120ca42bc4f599d77f81c6709b2fbe2ab0744e9bb658e85ff18fa086505e189acf3b0f2c7c117fddc9bf1ad54f352d7
+EBUILD birdtray-1.8.1.ebuild 784 BLAKE2B 727c0d72b465fba168061ca5996f2bd160de992938d4ea2aa910fd6fb0eb5551cb733649bfc3785f77ced8cf0745ef22462bba896be592ddb8f8af0038838866 SHA512 e6b0ed12114660c95f89e06a149f438fe1412828ab5b89d17ba4316bb39cad67fe66918108025d46cf4f05f5e23a3806d8bdb9fee19e5875be2b7692678b5759
 EBUILD birdtray-9999.ebuild 739 BLAKE2B 5e86f0dda25dc8ba671cf1fea88f8defac4c051c7ae05004fbfe78950ddfe4131f0929bd7a7ed82731adcb48c225a56ad597306815ac6e9be3bac22a3779f86f SHA512 309b5a63ba487d1e0cfd52032c4395600120ca42bc4f599d77f81c6709b2fbe2ab0744e9bb658e85ff18fa086505e189acf3b0f2c7c117fddc9bf1ad54f352d7
 MISC metadata.xml 449 BLAKE2B 1ab261352fabefe2d9c47dfe96681579a5291dd41fbe49df4571a0184c2429680c576bfbc270bb27bf1700b60a7019faf7b87e94fd06a5eaf2f4e8595dc13ca2 SHA512 8504f728cf157d2493e622a8091bae108fbb24cba21f2c00d3bab79f778afa485ba08c225f5964dbe7e586693fefc24721b023a51439fe1a1ffb22e5bdec5f16
diff --git a/x11-misc/birdtray/birdtray-1.8.0.ebuild b/x11-misc/birdtray/birdtray-1.8.1.ebuild
index 4820733d2bcb..bb684e4e0580 100644
--- a/x11-misc/birdtray/birdtray-1.8.0.ebuild
+++ b/x11-misc/birdtray/birdtray-1.8.1.ebuild
@@ -29,6 +29,10 @@ RDEPEND="dev-db/sqlite:=
 
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}_qt515.patch
+)
+
 pkg_postinst() {
 	xdg_icon_cache_update
 }
diff --git a/x11-misc/birdtray/files/birdtray-1.8.1_qt515.patch b/x11-misc/birdtray/files/birdtray-1.8.1_qt515.patch
new file mode 100644
index 000000000000..a7384f02a6d8
--- /dev/null
+++ b/x11-misc/birdtray/files/birdtray-1.8.1_qt515.patch
@@ -0,0 +1,21 @@
+From 38b333b5ff9318ae136d719c5fdd4c790c294833 Mon Sep 17 00:00:00 2001
+From: George Yunaev <gyunaev@ulduzsoft.com>
+Date: Sun, 31 May 2020 13:36:14 -0700
+Subject: [PATCH] Fixed compilation on Qt 5.15 - fixes #375
+
+---
+ src/trayicon.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/trayicon.cpp b/src/trayicon.cpp
+index 210c5da..72d80d2 100644
+--- a/src/trayicon.cpp
++++ b/src/trayicon.cpp
+@@ -3,6 +3,7 @@
+ #include <QPainter>
+ #include <QProcess>
+ #include <QMessageBox>
++#include <QPainterPath>
+ #include <QtNetwork/QNetworkSession>
+ 
+ #include "trayicon.h"
diff --git a/x11-misc/bumblebee/Manifest b/x11-misc/bumblebee/Manifest
index 065bf2b40d57..758f165dec70 100644
--- a/x11-misc/bumblebee/Manifest
+++ b/x11-misc/bumblebee/Manifest
@@ -1,11 +1,10 @@
+AUX bumblebee-3.2.1_p20190421-gcc10.patch 2006 BLAKE2B 136c9f5aa38269efa2ef59f410668f1ce5e9976eb377036596a455e27188a88691099eeb7e14b7de92ce0621fc1d36ca32d8301e982fdfe41c138aa7fffc017b SHA512 da2330ca2c915349899a6d7dd525308b02f3ed527b18496ea48889a41f4b4299260d53dab85c78f14a7778576dea47e2d140690c68b61de715cbe0e8722f2031
 AUX bumblebee.confd 60 BLAKE2B 68cfe5dd4db512e10cf82977556336e7bb8eb7ab3f397a2ba5b75c4d5e0856d957a126e741d2c3a45f3453479b42e0b1b42b9aab411eb80de9afc73f3c2ff8bd SHA512 4c773002e372e1696c0922bda91a104ea0ee244eb6beac84a4e7ad2ff1aee265aa248e63c3ad55ea75cabbd36b03d9efa3f8ec3ef708346837ab6a10d6652251
 AUX bumblebee.envd 127 BLAKE2B 2a993cd77706c2da4f90a3a77b4a6d0014b1322c584ae8970d75539b04b5d6a23adac7067a511f4f9d9a47797ac1d55f836c3242d26d0c464f6ea3833dc30ae5 SHA512 f42bd5992a8c80d045036a689e3c33cc2bdb7d54afb03bb7f33a80fa6a9c1e05f583cdec5b3da42021c48c1b59db4664e9c850e48ada47a1887327f7b11633af
 AUX bumblebee.initd 485 BLAKE2B 7583befe5a3e3b699bf895f1e4ac445dbe1bbbb172ef0c9e4d38a6c347699e80aca7a450f95cde9d8fe0f033d5d5a80716c9f17155f7d5ebdfa286b533fc4ab5 SHA512 12c4d28bb0dfa17239c7bf488408f3ca5e672a2167664b7d9f5501fcb878fe679c351bbe037f31b762e8e9a911088d08d66814cd8cc6b257fd973cc6c54ee10f
-DIST bumblebee-3.2.1.tar.gz 143110 BLAKE2B 537fe96e061f229c4c1e7748aef89e4eec040536d7a3161b449a34752c19078d3b4da6703f1c11268b4bb0e6590f94168bab5917fceac0eb73825b3c233548f0 SHA512 6f016f75d199577215ff00c059e196829e9d3efeb0fb6eebe6c3fad6176e330332e1ef25875a22ac9892895683d95899ea44f1ec1f85d31300ad83cb1fe0310a
 DIST bumblebee-3.2.1_p20170130.tar.gz 63428 BLAKE2B 33a2fbbd6e6cbc6cd026b87714d06e54d8803cc75e997cc1bd1aa1d1263c3fe9602f822b92c67fa7e76632bb19daaae11e591b88d087889a970d374f6316e847 SHA512 b457e8ce197782bd1b1fabd3c0c67e4ec26cdb90a3715bbe7a8e1550cdde19134151567cfa0c73d800c30e5d303b30bc1261d5f3cbceaa64d559416e4d541070
 DIST bumblebee-3.2.1_p20190421.tar.gz 63640 BLAKE2B 62bf3e7556b3cc3651f0e1f9fabd22501b82e78c0820b5ae113fddc24816cefd9c788a33d506944dc971092ae22dc3389ced79da6284a5e812ffad909bb03ebd SHA512 e24de3b60e55828ccbbd85774b9a776ba01b62850489b9d7952c4bf807f080b68d084f11de540a65d1bf78f6a35ce89d35f868de14e7ab9d768cdf21a1d422ec
-EBUILD bumblebee-3.2.1.ebuild 2005 BLAKE2B 3201a0ec6fc11d8b66090654b57cf79fbc504079819db90a303fb476bf99c5a7ca74183547b69b948c83a4285093c3ae8aa708d73440f2d0c23647d0d9b001d8 SHA512 02a045d7d3ed89c39b4b354d81e988cf015c873ece37ce4733405fc699e94e14935e8b395ab6a1fee32b3dfc7e186f908546766146a2f19f5702b83a201560aa
 EBUILD bumblebee-3.2.1_p20170130.ebuild 2219 BLAKE2B d422665f2e8033f644162a7ade48b83f7416747ce29a3dcaca58190054510e445bc72515d36e435dcf6990960ea1db852b3dab8b4cdc9ff42da54f6d1c174b93 SHA512 38bd8fe978bed7807f5fda4d6d48fbd97e648cd47e022efd5b11f5805aea5c175cb091eca7ae4f0da8faf67d8e27c49eae89691516932c63805258e85b080e28
-EBUILD bumblebee-3.2.1_p20190421.ebuild 2203 BLAKE2B d433d4c37f678fde7457ae4452a865ec6d4a77e6cd1ee9c7addd4c0b247acac3ad05ec7c72e02fcb3802ca3545b9d0df0ae474031abef3a051fb545d7525a9dd SHA512 6bb4be55bbcdf8f910b68d70ffca2e3fc4ed9f212d889cd6fedf505034f9df84afc3527d5dc2ca15144167843b99bb0cc215350714a2137544ebb7326da6ff5b
+EBUILD bumblebee-3.2.1_p20190421.ebuild 2310 BLAKE2B f6440bdfdc01b6c9d40b9fd0ffce6eab1bd2ba63f0987d508e8fbbcbb560f6c6a5cc91afb0413a9eb327346874ba533f79bdfb294a42345d10e6ce47a3d7e172 SHA512 62beb1f2f3a134251c4657985edf1b0eda809f021cd8470089533a92b01b46433ef51b644c2f267b0cbd59c78708f6ea1c8976d100d41424583283b961da1b50
 EBUILD bumblebee-9999.ebuild 2215 BLAKE2B f9f61a4183cc43c2c1442101b433fec6a3477d6062da340d8421e0e63398927c5767177ea4d3c98ef87bd261de39b821d003d7a67e209de21b47c57c5e7aed21 SHA512 7da89e2bf3ee757b29fde2757dba5e63c157ff0b15b59d244df8ec43ce9a25adcd00b6f149b694488a916eb7d293b6a59d48e40c18eb94b4be1e9fa35c26a69d
 MISC metadata.xml 1111 BLAKE2B 9f9bcd089280889ccb6990617f6b470c0c69a8b77b2af849d5bde7ff45ec94e121569d2c217a87d7375e19503bf0d90de775c514e7b400c0dd2a6fbc897c21b4 SHA512 dc2f37b1def7e302fc3d82325d3179b0c64c96b2fa609f6cf5196cb97b89854fade361005327ee2f8ccc5927e0aefe1c997cf5e6f9862cc18ef09deb3a2aa814
diff --git a/x11-misc/bumblebee/bumblebee-3.2.1.ebuild b/x11-misc/bumblebee/bumblebee-3.2.1.ebuild
deleted file mode 100644
index a0904a9a887f..000000000000
--- a/x11-misc/bumblebee/bumblebee-3.2.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils multilib readme.gentoo systemd user
-
-DESCRIPTION="Service providing elegant and stable means of managing Optimus graphics chipsets"
-HOMEPAGE="https://bumblebee-project.org https://github.com/Bumblebee-Project/Bumblebee"
-SRC_URI="https://bumblebee-project.org/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="amd64 x86"
-
-IUSE="+bbswitch video_cards_nouveau video_cards_nvidia"
-
-RDEPEND="
-	dev-libs/libbsd
-	virtual/opengl
-	x11-base/xorg-drivers[video_cards_nvidia?,video_cards_nouveau?]
-	x11-misc/virtualgl:=
-	bbswitch? ( sys-power/bbswitch )
-"
-DEPEND="${RDEPEND}
-	dev-libs/glib:2
-	sys-apps/help2man
-	virtual/pkgconfig
-	x11-libs/libX11
-"
-
-REQUIRED_USE="|| ( video_cards_nouveau video_cards_nvidia )"
-
-src_prepare() {
-	epatch_user
-}
-
-src_configure() {
-	DOC_CONTENTS="In order to use Bumblebee, add your user to 'bumblebee' group.
-		You may need to setup your /etc/bumblebee/bumblebee.conf"
-
-	if use video_cards_nvidia ; then
-		# Get paths to GL libs for all ABIs
-		local nvlib=""
-		for i in  $(get_all_libdirs) ; do
-			nvlib="${nvlib}:/usr/${i}/opengl/nvidia/lib"
-		done
-
-		local nvpref="/usr/$(get_libdir)/opengl/nvidia"
-		local xorgpref="/usr/$(get_libdir)/xorg/modules"
-		ECONF_PARAMS="CONF_DRIVER=nvidia CONF_DRIVER_MODULE_NVIDIA=nvidia \
-			CONF_LDPATH_NVIDIA=${nvlib#:} \
-			CONF_MODPATH_NVIDIA=${nvpref}/lib,${nvpref}/extensions,${xorgpref}/drivers,${xorgpref}"
-	fi
-
-	econf \
-		--docdir=/usr/share/doc/"${PF}" \
-		${ECONF_PARAMS}
-}
-
-src_install() {
-	newconfd "${FILESDIR}"/bumblebee.confd bumblebee
-	newinitd "${FILESDIR}"/bumblebee.initd bumblebee
-	newenvd  "${FILESDIR}"/bumblebee.envd 99bumblebee
-	systemd_dounit scripts/systemd/bumblebeed.service
-
-	readme.gentoo_create_doc
-
-	default
-}
-
-pkg_preinst() {
-	use video_cards_nvidia || rm "${ED}"/etc/bumblebee/xorg.conf.nvidia
-	use video_cards_nouveau || rm "${ED}"/etc/bumblebee/xorg.conf.nouveau
-
-	enewgroup bumblebee
-}
diff --git a/x11-misc/bumblebee/bumblebee-3.2.1_p20190421.ebuild b/x11-misc/bumblebee/bumblebee-3.2.1_p20190421.ebuild
index ecedcc95c494..eb6477c36832 100644
--- a/x11-misc/bumblebee/bumblebee-3.2.1_p20190421.ebuild
+++ b/x11-misc/bumblebee/bumblebee-3.2.1_p20190421.ebuild
@@ -53,6 +53,11 @@ PDEPEND="
 
 REQUIRED_USE="|| ( video_cards_nouveau video_cards_nvidia )"
 
+PATCHES=(
+	# https://github.com/Bumblebee-Project/Bumblebee/issues/1058
+	"${FILESDIR}/${P}-gcc10.patch"
+)
+
 pkg_setup() {
 	enewgroup bumblebee
 }
diff --git a/x11-misc/bumblebee/files/bumblebee-3.2.1_p20190421-gcc10.patch b/x11-misc/bumblebee/files/bumblebee-3.2.1_p20190421-gcc10.patch
new file mode 100644
index 000000000000..7d02226521e4
--- /dev/null
+++ b/x11-misc/bumblebee/files/bumblebee-3.2.1_p20190421-gcc10.patch
@@ -0,0 +1,66 @@
+Author: Andreas Beckmann <anbe@debian.org>
+Description: fix FTBFS with gcc-10
+ gcc-10 defaults to -fno-common
+ see https://gcc.gnu.org/gcc-10/porting_to.html
+Bug-Debian: https://bugs.debian.org/957058
+
+--- a/src/bbconfig.h
++++ b/src/bbconfig.h
+@@ -103,7 +103,7 @@ enum bb_pm_method {
+     PM_VGASWITCHEROO,
+     PM_METHODS_COUNT /* not a method but a marker for the end */
+ };
+-const char *bb_pm_method_string[PM_METHODS_COUNT];
++extern const char *bb_pm_method_string[PM_METHODS_COUNT];
+ 
+ /* String buffer size */
+ #define BUFFER_SIZE 1024
+--- a/src/switch/switching.h
++++ b/src/switch/switching.h
+@@ -60,10 +60,10 @@ void switcheroo_off(void);
+ 
+ /* number of switchers as defined in switching.c */
+ #define SWITCHERS_COUNT 2
+-struct switching_method switching_methods[SWITCHERS_COUNT];
++extern struct switching_method switching_methods[SWITCHERS_COUNT];
+ 
+ /* A switching method that can be used or NULL if none */
+-struct switching_method *switcher;
++extern struct switching_method *switcher;
+ 
+ struct switching_method *switcher_detect(const char *name, struct switch_info);
+ enum switch_state switch_status(void);
+--- a/src/bbsecondary.h
++++ b/src/bbsecondary.h
+@@ -21,7 +21,7 @@
+ #pragma once
+ 
+ /* PCI Bus ID of the discrete video card */
+-struct pci_bus_id *pci_bus_id_discrete;
++extern struct pci_bus_id *pci_bus_id_discrete;
+ 
+ /// Start the X server by fork-exec, turn card on if needed.
+ bool start_secondary(bool);
+--- a/src/switch/switching.c
++++ b/src/switch/switching.c
+@@ -31,6 +31,8 @@ struct switching_method switching_method
+           switcheroo_on, switcheroo_off}
+ };
+ 
++struct switching_method *switcher = NULL;
++
+ /**
+  * Enumerates through available switching methods and try a method
+  * 
+--- a/src/bbsecondary.c
++++ b/src/bbsecondary.c
+@@ -37,6 +37,9 @@
+ #include "pci.h"
+ #include "module.h"
+ 
++/* PCI Bus ID of the discrete video card */
++struct pci_bus_id *pci_bus_id_discrete;
++
+ /**
+  * Substitutes DRIVER in the passed path
+  * @param x_conf_file A path to be processed
diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest
index 5c74bcaebc6d..9ac26daaddf2 100644
--- a/x11-misc/colord/Manifest
+++ b/x11-misc/colord/Manifest
@@ -1,3 +1,3 @@
 DIST colord-1.3.5.tar.xz 1263488 BLAKE2B de70f3f76e81d3cec826f444e4c6a1603c03b7d97fedcd04a0b9e1977d1e487d7e1327c8b2738b3cf74e9717fb6803d543786c749d3a244faa1a6480e77e3436 SHA512 a0084ad2c08ae88c8023b8bade68f6cf25e13c77a6a37ef127b2914e86b06e6a7a783f9ab3585243d975dbbe1120d5daae13bdb586aefe519bf675458683025f
-EBUILD colord-1.3.5.ebuild 4343 BLAKE2B 5ba2495eed05e6ed33f64d4c9565c0944d98256dfebb0bc90d12f7549101584ebc3638310d9f42c778e4a0ee435f2d35050d843f4c5bc1fc03aba71b3635043d SHA512 3f89274c4f2f416372664b4fb414aa91ce6505c07bc7f745b3085e41347f40da14919a9c335f131f3b87c177c9b5fb222d3789566e7444a63eae88aa0d8f0e57
+EBUILD colord-1.3.5.ebuild 4323 BLAKE2B 26e19311b6da6e6716bcc45ae7e62d3cc82afe09435895c3a952dc388cbfb5b18731e8e480c9ce31076616956b740a4a82ac1d6e20e5a903a99f0ebe793700f9 SHA512 0f90dc576eb52f5bcd9965ebbab05dc3e52a3020f25a69209e2b9f8a836e18777452e4e6ee444c61dc4b1515791e811b45a2ad197abec171a9638ffab4c2f7a3
 MISC metadata.xml 563 BLAKE2B b35a641da198a98fc9dc69dc0a49b0796060df467dfda31fa7cb1dab328a618e283f5ee9e05d7ad34742052e9441780b243f62f71329d88c1d93dfa83acc46a0 SHA512 e358961e8d31c2e9582d93875bdabe119e574b62d674e5b16028cccfa2e0604d39384fc2c5683aa343b9cf6d543f8fc35d2eef35662de43ea97fd0f50536df3a
diff --git a/x11-misc/colord/colord-1.3.5.ebuild b/x11-misc/colord/colord-1.3.5.ebuild
index d6c1e1ec1a85..b6b210a9e649 100644
--- a/x11-misc/colord/colord-1.3.5.ebuild
+++ b/x11-misc/colord/colord-1.3.5.ebuild
@@ -50,7 +50,7 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/gtk-doc-am-1.9
 	>=dev-util/intltool-0.35
 	>=sys-devel/gettext-0.17
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 	extra-print-profiles? ( media-gfx/argyllcms )
 	vala? ( $(vala_depend) )
 "
diff --git a/x11-misc/compton/Manifest b/x11-misc/compton/Manifest
index 0e5318dc922b..f2a548b81aea 100644
--- a/x11-misc/compton/Manifest
+++ b/x11-misc/compton/Manifest
@@ -1,3 +1,4 @@
 DIST compton-0.1_beta2.tar.gz 144239 BLAKE2B 993c091aa0eab4171740a26c4ea8e9da66368fbcddbbdf9c466dd2cb2dbe0a685dc6c2027a5b56d08df4fd42d21784dd2cbb7cf56869feb1b74b4854db20a5f8 SHA512 c3a019d90e32559d44e3a4969bcc15a15837db9c9519ce8cc70b1bd3d0cb16d29449f68cc2f6a8d834569c9620ec6533ab85c1586da957c69b1ae341d9584535
+EBUILD compton-0.1_beta2-r1.ebuild 1622 BLAKE2B bc94eb7180dc20d20d20cdc8dbc85180ebfe2b94ef73637b215fbd8c138bcaddf6c0f87db7417710e73f46b9bea8631e04d958775306deabc5ee69860fa13fb1 SHA512 eb576faf20ff968a86bfe6a09530b7284870e31eab7eac31185ff34f07c8e6cadccdb4fde039556c77bf72fd7b588b8ab58984d78938862a29961dce9153d0e4
 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-r1.ebuild b/x11-misc/compton/compton-0.1_beta2-r1.ebuild
new file mode 100644
index 000000000000..1b4cdd3e8453
--- /dev/null
+++ b/x11-misc/compton/compton-0.1_beta2-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+inherit toolchain-funcs python-r1
+
+DESCRIPTION="A compositor for X, and a fork of xcompmgr-dana"
+HOMEPAGE="https://github.com/chjj/compton"
+SRC_URI="https://github.com/chjj/compton/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+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 ; }
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		tc-export CC
+	fi
+}
+
+src_compile() {
+	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/projecteur/Manifest b/x11-misc/projecteur/Manifest
index 2d89911155b7..2e0750716bab 100644
--- a/x11-misc/projecteur/Manifest
+++ b/x11-misc/projecteur/Manifest
@@ -1,4 +1,6 @@
 AUX projecteur-0.7-fix-git-detection.patch 1740 BLAKE2B 18087fca44642910cc7b16902d10f295b55e00965d1104a5a293728d2ef5514cd2da0f0e1535662ce5385c604111d6b8ba56835b28a5e11811d59c51a76c0ff7 SHA512 f45928c0787e107c49364d2a9bf207f39f55f16278888baee5335a50ec6ec98e7c49f4734da65cf729482396b2d4297acdcef72ee101ac4113f0870bb9357918
 DIST projecteur-0.7.tar.gz 296252 BLAKE2B fb20de48ee5f89e66701fc8d6cad036aed48ed862994b82431a8a14f3ec95dccb863c4c35a5de01c932150b3b311511ef01af093ddbcd23a2413ebb882152bab SHA512 9af54e47883cd3d9368edef173b9c0eb522f947f7d72f759388e2ecdf275524bdf56d3562506a383bba32c0fd2ec5c76c232a7b523e13b79caeb4d6d76bbbac0
+DIST projecteur-0.8.tar.gz 379203 BLAKE2B b2171bd6120c9f6245c129519e33adbb4661ea4cd0df5f30c6c90fbefb8b7c5024da5c6d920d4e162b818bc0fc6417731dcf0c540103ed6f12976123c45c69eb SHA512 e892e87f442cfa7f0102efa01b43e63ed7ea9c30c875496dd3d683ee769de66f0a4ccfae149f060924e5613dfd7758a0b19d565232fb6db75b9228cee4a956de
 EBUILD projecteur-0.7-r2.ebuild 857 BLAKE2B 470cd4868b3f706f0d13cbb705463bb8acb9e02d3b780ef276c7799b042a36dfe2b9028f25ee3f671f0914175e38f1b59bdefa149d2a52fd66e792686e5fd50f SHA512 1da45091da76c22343e3bf2caed66ab2f6f7d7eb03d7489b2c53e402f7ad376de1666eaade8ace6c7d948200a8ed74679012c849a479774359a96c040d8dc079
+EBUILD projecteur-0.8.ebuild 805 BLAKE2B 1ba5091382d294db067f0e4eb6c8e728d29a4d885e6db4d4ccd9aab31dbec9844edded5d0a4beadcb7c219b441a27aae52fd876a79bbfc33c0cbc720d44bd82a SHA512 4cd17f53e08c7caf60ae5a82d3f669dc4c52e8d20caf69b9ab16954ad071de646dc71c5911ff5a799561d8b0f2decb2f4049a3fc5aaa2b8654e79e64188dd0e5
 MISC metadata.xml 612 BLAKE2B 84ebf5cc3be489a0f7483e81b43dcee7067ec325a8a6c58f2350107921d0844bc7d084d7a35cddc95296c2f1046c4e098fed2b8748f0834df90c152dcd70e91e SHA512 d51be761cc4f93a47230bb63685fb367d7b0846b048733d192c6e36e9ac87f49cfcc28631ab4980dbc50213a9bbe23d3b0db665c5257e1e0e79804d9752e822c
diff --git a/x11-misc/projecteur/projecteur-0.8.ebuild b/x11-misc/projecteur/projecteur-0.8.ebuild
new file mode 100644
index 000000000000..d727e882f0f2
--- /dev/null
+++ b/x11-misc/projecteur/projecteur-0.8.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN/p/P}"
+
+inherit cmake udev xdg-utils
+
+DESCRIPTION="Linux Desktop Application for the Logitech Spotlight device"
+HOMEPAGE="https://github.com/jahnf/Projecteur"
+SRC_URI="https://github.com/jahnf/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	|| (
+		dev-qt/qtgui:5[X(-)]
+		dev-qt/qtgui:5[xcb(-)]
+	)
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	virtual/udev
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+pkg_postinst() {
+	udev_reload
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	udev_reload
+	xdg_icon_cache_update
+}
diff --git a/x11-misc/qps/Manifest b/x11-misc/qps/Manifest
index f260e1c71bbe..f0a10b65a4af 100644
--- a/x11-misc/qps/Manifest
+++ b/x11-misc/qps/Manifest
@@ -3,5 +3,5 @@ DIST qps-2.0.0.tar.xz 211452 BLAKE2B 9b8501f3e57939b33ea54daf58d84cf37b6b66a0c4a
 DIST qps-2.1.0.tar.xz 197352 BLAKE2B c607fde920973c21e85b74e9408f7827ad4354d95b5b16cc95c22bc4143579f1dcddf68bcf9904f4df12236d49f786f457bdf3ce809f37549211f297bab18205 SHA512 e5601657be94d4c21e189fc1113f4678a4bad70ca3c9c3882492625b37339d079d1e8240120bdb467bc47ca95a1b26f8e2da022c271377cf0dbf98e390bc8ac2
 EBUILD qps-1.10.20.ebuild 733 BLAKE2B 414d9ea3e21681785e5d1911e8c51e2d840bd23b7b88578b836f6ef0010ae249aed1d445fea5e6fee1c85a0910844f6fe78d3ed846c4743042a669ba8cd1ed3f SHA512 f734a5219314d961c1ab6631e1997820bb5e6000ad7a1e0982b4fe33e3516c6f95f1c42a2cb0fb891e3b5a7c76dd0c90f47a9985ed0004f4d586b5dfd5c94361
 EBUILD qps-2.0.0.ebuild 735 BLAKE2B e0500670a8aaafd62cefb11faceb54123a0eebe49886f5f2e7813dd1016a5a03b2dc6d2bace95a519c99dbc7f3e5389a0b0f72996b911777493bd3aec3223ce6 SHA512 fb3c9d64dfc2badb8ec2b787ec33df6e886f560209a7f321f8d1be95d47b169afdc16c3d598b5d9c9bd8854d109b126fa058a62233d4321969ba6e8af75d0164
-EBUILD qps-2.1.0.ebuild 710 BLAKE2B 5fa26e1db3d2d4615fa5cd71627b011c098853d973c1bc084131caa444e99b47c3ee2828b7b391cf7da7d6e92d4545408be8102857c2a80a068f67e7c2a9c50b SHA512 df03dbc72b3f474c28946aa86a104ac3f7a2a87c2b14151c9addf86ee62ede9708bfa6b81da33d837b717dc715d4e9f9336871031fabc5f9e163cd88b409cbc9
+EBUILD qps-2.1.0-r1.ebuild 738 BLAKE2B dcbc8b48c426fa17a06dd9d7e1aad24af119aa509bee3a3c7a2bcbbd5da382bf4f4afc21c5f070e83ae710204a4620a5ca2df1c39aca7c04063afe0410f70713 SHA512 41bcaa6cb338f1f2b396c94c91daa8b62bb33c7d86901145f6a2ed37e0c99758bc60c54230c01974e3c5d308f76f972c4b2998dfa5f37cff006b97114a7859fa
 MISC metadata.xml 320 BLAKE2B 7a6824c87e5ee071bd4219df12554d6363050a126b5838af05dc627134e57d2452eab17569b3e144dcb476ec35dc41649da438b8eb7b45d9e695b2ad900581fa SHA512 b0c5950c5803e5bb765271787eab2bb755cd681f50ab183a2bb06b9f773d0dc8c959e7d9c3f15d23692b3c106d6a0bfd0db43f439225539a3a019b7dceb33292
diff --git a/x11-misc/qps/qps-2.1.0.ebuild b/x11-misc/qps/qps-2.1.0-r1.ebuild
index 37493153b2d0..0a414be68936 100644
--- a/x11-misc/qps/qps-2.1.0.ebuild
+++ b/x11-misc/qps/qps-2.1.0-r1.ebuild
@@ -23,6 +23,7 @@ DEPEND="
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
+	>=lxqt-base/liblxqt-0.15.0
 "
 RDEPEND="${DEPEND}"
 
diff --git a/x11-misc/qt5ct/Manifest b/x11-misc/qt5ct/Manifest
index e72a73a913aa..13ed4304fb96 100644
--- a/x11-misc/qt5ct/Manifest
+++ b/x11-misc/qt5ct/Manifest
@@ -1,3 +1,5 @@
 DIST qt5ct-0.41.tar.bz2 73009 BLAKE2B de6360feb16a82b262c13e6a3cbe226b7be7c3e95b1f1262b3802de59fc3bb8820c935b170a15a88e80164e6167f6259777c65fda6a3f8fbf1d115a63ddcc1f2 SHA512 a94f9996dc2198d3c8c9af8610912d12b915b8c547a49c36f7bc083b6f237b318d7903e91fb6fcfe06996a319c361104c1923e6d0c49446b6fb66a1e44fae009
+DIST qt5ct-1.0.tar.bz2 73360 BLAKE2B a2a37534434102f08d0f225017c5b835bc22ac2d86592505d4dcc8823a8ed34fd54085a581e86e83ecaec04141e90f4c6e87b9aaed027b68e29ed9a773108263 SHA512 f650362c90782128e1b3ddb61e73d0295bc5b108a75c8a10d085ce9df7dc0926ac40baf80705136b39cc779212fc97e121757c440f2728aab12b761caace78b2
 EBUILD qt5ct-0.41.ebuild 1026 BLAKE2B 64c305e03b1bb2d1b534cb1fae06816821606bf28fedda93c326e0c7b7c23c49f846a3ab08be11cab61a45a75c3e7644d60c0605b353ddac582f4ad6a6321a49 SHA512 9a58316f68fe1c57b1e94594c47504bb0cbc4091e403b86fccf0be6ff74e745703d7d2f7b60c511cd7078da73e10d228fe6f2fabf49331b1c4bd3ae3de0be23d
+EBUILD qt5ct-1.0.ebuild 1040 BLAKE2B 16822020b9fca286f10dded558b938d81725c04f8f91e21a2a7b400b2f8919264e62e6ae13136e711c618f1efbc7c1bb8f70f77a26c7a8dafa4730cd72317288 SHA512 b35f92581b02ef5ff241a74f8210b7093b784ebee3272a42985b36af487c0bcfdaba88383176997dc16425e8200d91e306a7e6d76951fd25268921ef884a6e0a
 MISC metadata.xml 566 BLAKE2B dbb30222ccd1079489ce54e50d5d4ce9a3b9e9acf38d4cc30a402f81418685a3cf86f1adae23d85a409f9866ca11ec1321e543e14bd37ed13a45d02a32accc15 SHA512 d40c24dd0cc2d0b2c79251cf1fb2540dbec484653817469198f4ad7e41164a8c518442c5d11764f0c8aa53bd7ae9758629acc7ba4a4c9f2a374af13cbdaf67c1
diff --git a/x11-misc/qt5ct/qt5ct-1.0.ebuild b/x11-misc/qt5ct/qt5ct-1.0.ebuild
new file mode 100644
index 000000000000..9f615edb3db0
--- /dev/null
+++ b/x11-misc/qt5ct/qt5ct-1.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils
+
+DESCRIPTION="Qt5 configuration tool, similar to qtconfig for Qt4"
+HOMEPAGE="https://sourceforge.net/projects/qt5ct/"
+SRC_URI="https://download.sourceforge.net/qt5ct/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+dbus"
+
+RDEPEND="
+	dev-qt/qtconcurrent:5
+	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 0 1)
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+
+	newenvd - 98qt5ct <<< '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/qtfm/Manifest b/x11-misc/qtfm/Manifest
index b248d6e669c9..86c5151aea21 100644
--- a/x11-misc/qtfm/Manifest
+++ b/x11-misc/qtfm/Manifest
@@ -1,5 +1,6 @@
+AUX qtfm-6.2.0-qt-5.15.patch 1037 BLAKE2B cb48575cb9097b84ed1bb739c0f6254d1bf88196d08e5ceee7b43ebae71f45dd0bf68dadfd0dce7b7f94958453d9d40f1750f291049a6c2936d24c79d2943ebe SHA512 19ffb3a4d322b1fce676819c75e13ef2952dd50182e3162c55dde26badf90f29cb4db1f388b894699cf55f7c123b6bb810864f2f603ab6c01116ceac78bfabba
 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 1021 BLAKE2B a842a5bd39efd90d37c227232177f5e59c9845e22c640b04b6802d57ee20f8bdf2c1f213f8160cd1268a365f1fcac345abd83cb79f641bd16dbcb74b118ca13e SHA512 db9bee8e1a655ffe5e94bfe9f40f40f63dfb5303fecb6e5f5fc88b88fda6682a7c7041e040f366a57f3f93593d717c0658f7c7db52bf7707ceaf34f43e9736ee
+EBUILD qtfm-6.2.0.ebuild 1104 BLAKE2B 761437994d50ca6f4a9bc7165238f41e434d33290d4fe566423be1c1133ea62a1baa877eb8a1cb9a6d92ec91b2a11d8b9ed873fd7831f2dd8fefebf4c976a691 SHA512 c64343feebb7c46cd7ad67b98a9f1386144b39e43fd80cef811e2ea1d110e998563d7cbbc5e731560561bf6bcb138ab5674ba6df4d9a0c7c5983b77334af791f
+EBUILD qtfm-99999.ebuild 1016 BLAKE2B 4c85b061cd9b00363ae50c83a2da79b81bf52e394a2d7e8e9f5d2cd47058992d1b8966805d35c458ad78bb14b53d9e52ac24a35f6604c1eb83c7cf98e82f53de SHA512 c68b2e850ccea6ef67be140bf10f87f4178ee4e73d022e33df680814e63ea2d4bf994a1a1a5a6e78f8dad553618de9c383b0898c88b02acc086e6a30cfd3fb40
 MISC metadata.xml 535 BLAKE2B aecaf2f611f0c47f5ec04b5fab8d45d7d0cf4c3b029a4605f2dadcf11237fd3fce56d10e8fab1611e716c70f303ca93deba25c3f884aeb7c798b9e411be7a024 SHA512 28844f26bfd8c62e896340bbe7f8466903eecf97e8eba6f5003c407258692ac76fc2799836c7a27643b1c4f9a5ba7033366414acc8f60b4f72b352e740026a7b
diff --git a/x11-misc/qtfm/files/qtfm-6.2.0-qt-5.15.patch b/x11-misc/qtfm/files/qtfm-6.2.0-qt-5.15.patch
new file mode 100644
index 000000000000..783d33d42328
--- /dev/null
+++ b/x11-misc/qtfm/files/qtfm-6.2.0-qt-5.15.patch
@@ -0,0 +1,38 @@
+From c80a7f7e89f5810fab889dc2660d078438727c05 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 14 Jun 2020 20:25:46 +0200
+Subject: [PATCH] Fix build with Qt 5.15 (missing QPainterPath include)
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ libfm/iconlist.cpp | 2 ++
+ libfm/iconview.cpp | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/libfm/iconlist.cpp b/libfm/iconlist.cpp
+index ca72f2e..9b25dd2 100644
+--- a/libfm/iconlist.cpp
++++ b/libfm/iconlist.cpp
+@@ -1,5 +1,7 @@
+ #include "iconlist.h"
+ 
++#include <QPainterPath>
++
+ QSize IconListDelegate::sizeHint(const QStyleOptionViewItem &option,
+                                  const QModelIndex &index) const
+ {
+diff --git a/libfm/iconview.cpp b/libfm/iconview.cpp
+index 7b72bfb..f1abbd2 100644
+--- a/libfm/iconview.cpp
++++ b/libfm/iconview.cpp
+@@ -1,5 +1,7 @@
+ #include "iconview.h"
+ 
++#include <QPainterPath>
++
+ bool IconViewDelegate::eventFilter(QObject *object,
+                                    QEvent *event)
+ {
+-- 
+2.27.0
+
diff --git a/x11-misc/qtfm/qtfm-6.2.0.ebuild b/x11-misc/qtfm/qtfm-6.2.0.ebuild
index 8ec496a5bd70..2701a220c7e8 100644
--- a/x11-misc/qtfm/qtfm-6.2.0.ebuild
+++ b/x11-misc/qtfm/qtfm-6.2.0.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit xdg-utils qmake-utils
 
-DESCRIPTION="A small, lightweight file manager for desktops based on pure Qt"
+inherit qmake-utils xdg-utils
+
+DESCRIPTION="Small, lightweight file manager based on pure Qt"
 HOMEPAGE="https://qtfm.eu/"
 SRC_URI="https://github.com/rodlie/qtfm/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
@@ -13,6 +14,10 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="+dbus shared"
 
+BDEPEND="
+	app-arch/unzip
+	dev-qt/linguist-tools:5
+"
 RDEPEND="
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
@@ -22,11 +27,9 @@ RDEPEND="
 	sys-apps/file
 	dbus? ( dev-qt/qtdbus:5 )
 "
-DEPEND="
-	${RDEPEND}
-	app-arch/unzip
-	dev-qt/linguist-tools:5
-"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-qt-5.15.patch )
 
 src_configure() {
 	eqmake5 \
diff --git a/x11-misc/qtfm/qtfm-99999.ebuild b/x11-misc/qtfm/qtfm-99999.ebuild
index 4bdc1441aaa0..d61d41015c7a 100644
--- a/x11-misc/qtfm/qtfm-99999.ebuild
+++ b/x11-misc/qtfm/qtfm-99999.ebuild
@@ -2,9 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit git-r3 xdg-utils cmake
 
-DESCRIPTION="A small, lightweight file manager for desktops based on pure Qt"
+inherit cmake git-r3 xdg-utils
+
+DESCRIPTION="Small, lightweight file manager based on pure Qt"
 HOMEPAGE="https://qtfm.eu/"
 EGIT_REPO_URI="https://github.com/rodlie/qtfm/"
 
@@ -13,6 +14,10 @@ SLOT="0"
 KEYWORDS=""
 IUSE="+dbus ffmpeg imagemagick"
 
+BDEPEND="
+	app-arch/unzip
+	dev-qt/linguist-tools:5
+"
 RDEPEND="
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
@@ -24,20 +29,15 @@ RDEPEND="
 	ffmpeg? ( media-video/ffmpeg )
 	imagemagick? ( >=media-gfx/imagemagick-7:= )
 "
-DEPEND="
-	${RDEPEND}
-	app-arch/unzip
-	dev-qt/linguist-tools:5
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-99999-cmake.patch
-)
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-99999-cmake.patch )
 
 src_configure() {
-	mycmakeargs=(
-		-DENABLE_DBUS="$(usex dbus)"
-		-DENABLE_FFMPEG="$(usex ffmpeg)"
-		-DENABLE_MAGICK="$(usex imagemagick)"
+	local mycmakeargs=(
+		-DENABLE_DBUS=$(usex dbus)
+		-DENABLE_FFMPEG=$(usex ffmpeg)
+		-DENABLE_MAGICK=$(usex imagemagick)
 	)
 	cmake_src_configure
 }
diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index 69af021eeb12..126ef78dca38 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -1,3 +1,4 @@
+AUX pam-1.4-substack.patch 1126 BLAKE2B 61bcfc324b603ed4d9c23ede30f2d6215acdd043c6385c6230f95748b79e9746206525bbfba873272ef2559b605123c727c41de17cd713b31ce706a3cead9798 SHA512 0f08eb5c7904cfee570329bb42621bcbeba6e700e667dcaf956d3359792f7938c6fe4a9a3a56a471b5eb512adde0ce7b92cdaca9108a1cc9307e839c1ee3339a
 AUX sddm-0.12.0-respect-user-flags.patch 779 BLAKE2B 3ea539e4e426fa745be2ae6c59f6bd96e42d864ddba9942681397a2cdae69528d837001535502e83e6ef50a9ca65a30b62601af76a11465a5b42feffef348edf SHA512 77e3f2ec4dff122e40428444055ed7cbbb177242c9c3c034b1934dda7a3ff2345dd8fcee4b927b797f66163bffc23a5760dd55c2fa24f2c614cd7dec88ffde88
 AUX sddm-0.14.0-consolekit.patch 322 BLAKE2B ace6c045ab0282eca8bf8a11aa8aa2690fac3ce7f712cd71e48bc9ec8f04dc18b9afd997d04550ade8a37a24a66e430f6b5ae8e752345c7c132cb95ae61b2e73 SHA512 aa53338c3e154982388b2e98101cd49e607f1744acee28f46892e3a6848f06de4ba8a8bf204128da1a7b22df9efe5d95bb6ac1cd5dedb8a301f8587af381253a
 AUX sddm-0.16.0-ck2-revert.patch 918 BLAKE2B 803f3370260ce40a4b46d3d7a9f2f7529db90baba039c080606f9333e4933c6e3a219331d57dbc577e6a32567fedade3a4aec8bd1706bfb5887a0c281d37c2fb SHA512 f9b49390f656d3ba9528c9fecaff044bab7f4933293bd439fc3ccec873aae9899b4f8b93fa769d506948de2be1d3275dafc96795b1c20caf547cbf474ee12b60
@@ -9,5 +10,6 @@ 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 3118 BLAKE2B 8df5d8193b5678e03486ab63b03964a3d121699fcbec96c8cd77b296e6bd6134a1f88314ba2c4f4a441ff2db10faad234b6549600174f1a83f0e806e9df08136 SHA512 64234a14d8bec91ecd8fbb26a3ad06d452d702666a24cbb541f19614c6ab950a5ad0f258f44c4dc790275731561f0b33ff8fa6b511422ba853af6b25dce000ce
+EBUILD sddm-0.18.1-r1.ebuild 3139 BLAKE2B 471d8656f2b28d7410f8015ad880998f0766726ae4ee93b158f03d5114bccca9ec8c3c59375a00a1812f2aafa44d1bcebc74ad9e45112914512b938ac6198a2e SHA512 4432a55ca883c650d73cd0c0755349b1a69f9141fa8917a70a10b93c063a3d8bb2e5b4910368fa4a5f238a56d881cdb7cca203d5a6afd8180a10e286dd686bf7
+EBUILD sddm-0.18.1-r3.ebuild 3159 BLAKE2B dd6e5db19e9e5210bc0073c98d867934f87e0d151b5080919b01908701b39a3b9bfc040ffb0ec7f682aa4c2e74e3ad36c4c82608e70765faf0136d7fe3a810c0 SHA512 a5e36435a6920dbf8ab4cc2a44ebae93b0734964f0e3527defc01fcb2bd073af311af985a551b0f04016d7aff971eee362e6597e58b927ac6a862bca50a3bf92
 MISC metadata.xml 943 BLAKE2B 6bfdf54b23210c7e0d781c2f96358036ac7281825e71e4a8e9cf5fc6d43faf5525cc0ac267c7be2f5eadb08ca830350cf102425d30e19e5e4f92a3a57fc5affa SHA512 8a6b888910d68d5209c070c17e0c2e9dc5d64cf9d70cbf5ce945cfae763f864787fb998eb5544f4e6710c36b0045530780fb27f01944b60d71f60f09e8ecb516
diff --git a/x11-misc/sddm/files/pam-1.4-substack.patch b/x11-misc/sddm/files/pam-1.4-substack.patch
new file mode 100644
index 000000000000..b0467b268228
--- /dev/null
+++ b/x11-misc/sddm/files/pam-1.4-substack.patch
@@ -0,0 +1,31 @@
+--- sddm-0.18.1/services/sddm-autologin.pam.bak	2020-06-19 22:27:57.305580696 +0200
++++ sddm-0.18.1/services/sddm-autologin.pam	2020-06-19 22:30:50.513583973 +0200
+@@ -1,6 +1,5 @@
+ #%PAM-1.0
+ auth        required    pam_env.so
+-auth        required    pam_tally.so file=/var/log/faillog onerr=succeed
+ auth        required    pam_shells.so
+ auth        required    pam_nologin.so
+ auth        required    pam_permit.so
+--- sddm-0.18.1/services/sddm.pam.bak	2020-06-19 22:27:26.721580117 +0200
++++ sddm-0.18.1/services/sddm.pam	2020-06-19 22:27:48.729580533 +0200
+@@ -1,15 +1,15 @@
+ #%PAM-1.0
+ 
+-auth		include		system-login
++auth		substack		system-login
+ -auth		optional	pam_gnome_keyring.so
+ -auth   optional  pam_kwallet5.so
+ 
+-account		include		system-login
++account		substack		system-login
+ 
+-password	include		system-login
++password	substack		system-login
+ -password	optional	pam_gnome_keyring.so use_authtok
+ 
+ session		optional	pam_keyinit.so force revoke
+-session		include		system-login
++session		substack		system-login
+ -session		optional	pam_gnome_keyring.so auto_start
+ -session  optional  pam_kwallet5.so auto_start
\ No newline at end of file
diff --git a/x11-misc/sddm/sddm-0.18.1-r1.ebuild b/x11-misc/sddm/sddm-0.18.1-r1.ebuild
index f237ad81fa54..bb3da55d933b 100644
--- a/x11-misc/sddm/sddm-0.18.1-r1.ebuild
+++ b/x11-misc/sddm/sddm-0.18.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -34,7 +34,7 @@ RDEPEND="
 	x11-libs/libxcb[xkb]
 	consolekit? ( >=sys-auth/consolekit-0.9.4 )
 	elogind? ( sys-auth/elogind )
-	pam? ( sys-libs/pam )
+	pam? ( <=sys-libs/pam-1.3.1_p20200128-r1 )
 	systemd? ( sys-apps/systemd:= )
 	!systemd? ( sys-power/upower )
 "
diff --git a/x11-misc/sddm/sddm-0.18.1-r3.ebuild b/x11-misc/sddm/sddm-0.18.1-r3.ebuild
new file mode 100644
index 000000000000..ddadebe514b0
--- /dev/null
+++ b/x11-misc/sddm/sddm-0.18.1-r3.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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 l10n systemd user
+
+DESCRIPTION="Simple Desktop Display Manager"
+HOMEPAGE="https://github.com/sddm/sddm"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="consolekit elogind +pam systemd test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="?? ( elogind systemd )"
+
+BDEPEND="
+	dev-python/docutils
+	>=dev-qt/linguist-tools-5.9.4:5
+	kde-frameworks/extra-cmake-modules:5
+	virtual/pkgconfig
+"
+RDEPEND="
+	>=dev-qt/qtcore-5.9.4:5
+	>=dev-qt/qtdbus-5.9.4:5
+	>=dev-qt/qtdeclarative-5.9.4:5
+	>=dev-qt/qtgui-5.9.4:5
+	>=dev-qt/qtnetwork-5.9.4:5
+	>=x11-base/xorg-server-1.15.1
+	x11-libs/libxcb[xkb]
+	consolekit? ( >=sys-auth/consolekit-0.9.4 )
+	elogind? ( sys-auth/elogind )
+	pam? ( sys-libs/pam )
+	systemd? ( sys-apps/systemd:= )
+	!systemd? ( sys-power/upower )
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qttest-5.9.4:5 )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch"
+	"${FILESDIR}/${PN}-0.18.0-Xsession.patch" # bug 611210
+	"${FILESDIR}/${PN}-0.18.0-sddmconfdir.patch"
+	# fix for groups: https://github.com/sddm/sddm/issues/1159
+	"${FILESDIR}/${P}-revert-honor-PAM-supplemental-groups.patch"
+	"${FILESDIR}/${P}-honor-PAM-supplemental-groups-v2.patch"
+	# fix for ReuseSession=true
+	"${FILESDIR}/${P}-only-reuse-online-sessions.patch"
+	# TODO: fix properly
+	"${FILESDIR}/${PN}-0.16.0-ck2-revert.patch" # bug 633920
+	"${FILESDIR}/pam-1.4-substack.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	disable_locale() {
+		sed -e "/${1}\.ts/d" -i data/translations/CMakeLists.txt || die
+	}
+	l10n_find_plocales_changes "data/translations" "" ".ts"
+	l10n_for_each_disabled_locale_do disable_locale
+
+	if ! use test; then
+		sed -e "/^find_package/s/ Test//" -i CMakeLists.txt || die
+		cmake_comment_add_subdirectory test
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_PAM=$(usex pam)
+		-DNO_SYSTEMD=$(usex '!systemd')
+		-DUSE_ELOGIND=$(usex 'elogind')
+		-DBUILD_MAN_PAGES=ON
+		-DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
+	)
+	cmake_src_configure
+}
+
+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"
+	dodir ${confd}
+	"${D}"/usr/bin/sddm --example-config > "${D}/${confd}"/00default.conf \
+		|| die "Failed to create 00default.conf"
+
+	sed -e "/^InputMethod/s/qtvirtualkeyboard//" \
+		-e "/^ReuseSession/s/false/true/" \
+		-e "/^EnableHiDPI/s/false/true/" \
+		-i "${D}/${confd}"/00default.conf || die
+}
+
+pkg_postinst() {
+	elog "Starting with 0.18.0, SDDM no longer installs /etc/sddm.conf"
+	elog "Use it to override specific options. SDDM defaults are now"
+	elog "found in: /usr/share/sddm/sddm.conf.d/00default.conf"
+
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video
+
+	systemd_reenable sddm.service
+}
diff --git a/x11-misc/shared-mime-info/Manifest b/x11-misc/shared-mime-info/Manifest
index c2af318fc842..a0c74a29121f 100644
--- a/x11-misc/shared-mime-info/Manifest
+++ b/x11-misc/shared-mime-info/Manifest
@@ -1,5 +1,8 @@
+AUX shared-mime-info-2.0-pkgconfig_install_path.patch 623 BLAKE2B 3ee4845d1c8c7c0b8d63e2b4948fa8bab96b33addd2d4b2ed7dd86bed73b1e14bc4d2cab80308a7fffe56f49f6d14503bcbdf62ec695512d3d1fae5dc3ff3d9f SHA512 b1472ad604b7c5770272dba0a41fcf5e828218db84106327b7b04b3c947e80aa667c4fbcffeeb3b6922eea0f8c929278beef811604978bf6d3bb028239790266
 DIST shared-mime-info-1.10.tar.xz 616800 BLAKE2B a63c97aba9184e7926db01968aef2a741ef089a46ab9365eb8dad5a78f585f90171751baeaa3bc62ed0a37eed6e93d60598fbe1e7e63168106fc8aa05f2f5cc8 SHA512 efc2b63cae11e6b0332f8607ba57a885dec68a23ac299bbda3eb6e2c7ed071c7c40dba73e9cf23ab675fcaa86ea3777fa931a9f25000a08ec6a748734c88beda
 DIST shared-mime-info-1.15.tar.xz 772708 BLAKE2B 763c7b5f1128882cb8a027ee7fb35daa5d141ccab07ba7aeae5139b94c1ed1c5702741b30c8803b7796bb6eb66fa02fde41d14e078b1960003bd3ba5e0de4e1a SHA512 3666aa500dfa6a28bd0524400c47fa16d90ae61f8c80f350fd895972319ec2f511618b8a7fa3cbde621edee46fde19e4506bda62f0bd2d0ede1b08d7bdb9aef2
+DIST shared-mime-info-2.0.tar.xz 5015272 BLAKE2B 8bac4790177f8b72a8c74799d7abca360ad11a922635aa1207eead78674192b300cf0096f5943a65aa3991c8403b145adb24f5e7746db7ea6ceeab64978608c3 SHA512 f4a1ea9a408ffcff325e57585dec5862405e9fd6c79e444048039f3061676501c40168cecf8935d002644a702a21f08f0f7c680ef6a65fdf188e0d892f3cc085
 EBUILD shared-mime-info-1.10-r1.ebuild 1773 BLAKE2B bd008173ac18b6b06be56cfad43cddaf9e0495853c5f7526f1b236e81cd1e2f7c0730148bb020dd414e42c106e51825d02ee5c6d0234c36a33a361a290424dea SHA512 cdd5dfbc93748884a3defb0447afb0bf24283c06df886085f6880400018bdbd5b764cf056d8b4ef9c60066c16b0f08b4085f3400d7379b5eb48968df40dca453
 EBUILD shared-mime-info-1.15.ebuild 1274 BLAKE2B 0c17cc9a27afbf1f678dae46af667d3f661c408a8738b199579e5084212a7a65b81da72716eb4530504cf4927802f8e13f31bd7656fda9d4dc4e0a9f97b3d1ed SHA512 5a108f4bfc9fc34e35f16849dc183ddac0296ede5166eb86c961b0da409e2a9e4516e97c0f25a3d6e6ace8fb3e21348e1909ce1a5c623ad8a33f0f54bdc021d9
+EBUILD shared-mime-info-2.0-r2.ebuild 1374 BLAKE2B 310af59675fd8f6e9d43805c53014b3f73281a67efed48f31960ba534aa103c4c496084aea712a1018a0bd5bb0049ab18ae00296655d9f33839382a000b210db SHA512 aa7225bbfcf2048749a47ff4bf6e238bf24a92a87d90220e6b57723e09b2e71fdfcab959c4f16f140425b00b78947e18df46bb3cde6a67ee6045ea5292267e00
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/x11-misc/shared-mime-info/files/shared-mime-info-2.0-pkgconfig_install_path.patch b/x11-misc/shared-mime-info/files/shared-mime-info-2.0-pkgconfig_install_path.patch
new file mode 100644
index 000000000000..e694928728f4
--- /dev/null
+++ b/x11-misc/shared-mime-info/files/shared-mime-info-2.0-pkgconfig_install_path.patch
@@ -0,0 +1,22 @@
+From 6bf9e4ff0fb7eff11a02bd937045bf5dc291841a Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Wed, 6 May 2020 16:48:47 +0200
+Subject: [PATCH] data: Fix pkg-config installation path
+
+---
+ data/meson.build | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/data/meson.build b/data/meson.build
+index 25ce031..e22b544 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -38,4 +38,5 @@ pkgconfig.generate(
+     name: 'shared-mime-info',
+     description: 'Freedesktop common MIME database',
+     version: meson.project_version(),
++    install_dir: get_option('datadir') / 'pkgconfig'
+ )
+-- 
+2.26.2
+
diff --git a/x11-misc/shared-mime-info/shared-mime-info-2.0-r2.ebuild b/x11-misc/shared-mime-info/shared-mime-info-2.0-r2.ebuild
new file mode 100644
index 000000000000..714f445d6525
--- /dev/null
+++ b/x11-misc/shared-mime-info/shared-mime-info-2.0-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+HASH=0440063a2e6823a4b1a6fb2f2af8350f # don't forget to update on version bumps
+inherit meson xdg-utils
+
+DESCRIPTION="The Shared MIME-info Database specification"
+HOMEPAGE="https://gitlab.freedesktop.org/xdg/shared-mime-info"
+SRC_URI="https://gitlab.freedesktop.org/xdg/${PN}/uploads/${HASH}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# requires installed xdgmime binary
+RESTRICT="test"
+
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/xmlto
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/libxml2
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( HACKING.md NEWS README.md )
+
+PATCHES=(
+	"${FILESDIR}/${P}-pkgconfig_install_path.patch" #728404
+)
+
+src_install() {
+	meson_src_install
+
+	# in prefix, install an env.d entry such that prefix patch is used/added
+	if use prefix; then
+		echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share\"" > "${T}"/50mimeinfo || die
+		doenvd "${T}"/50mimeinfo
+	fi
+}
+
+pkg_postinst() {
+	use prefix && export XDG_DATA_DIRS="${EPREFIX}"/usr/share
+	xdg_mimeinfo_database_update
+}
diff --git a/x11-misc/xdiskusage/Manifest b/x11-misc/xdiskusage/Manifest
index 2c0857a9df4f..a277ba7cb8c5 100644
--- a/x11-misc/xdiskusage/Manifest
+++ b/x11-misc/xdiskusage/Manifest
@@ -1,3 +1,7 @@
+AUX xdiskusage-1.52-flags-order.patch 1544 BLAKE2B c4a639648cc32e76ab3aa50e3733abe38ce34cd17bc183f6e4e0687b65930f9c50b07bbec58be5ba4ccf3625b027851bae4e7e299169b73c5096bbd5f8727932 SHA512 76d8910ecf96af79e2405dff1307e79343078dd125810b20024f5c6b82fc8d46dfea9ab0a332af3918f37801b1bd59501363dd3edc1cf79c583d1c59f2eef23d
+AUX xdiskusage-1.52-pathbuf.patch 334 BLAKE2B f37d93288cff512a198c05759f50570c09a9e358d93667737198909d3507204f48bd47b549d8393f327ab5fd84d90471968f1517aee4301336db35036a016812 SHA512 09687a437bb99d478de119a3c46398e272fbf0db5d0cd3391858e72b364cc54ea96cd5512789ed00f115fc0e9565eaa6471db3669b9169e39583131563b1c85c
 DIST xdiskusage-1.51.tgz 54248 BLAKE2B a1e41eef4e3d303c7bc02cb485ab2ca33bb03c57f9713459b68621a611751f5af35be9918bbef86294e70ddcc8e2fb678b5dfa9baa237954a46fd12120bbf96f SHA512 73335bbd5dc3e1f753efb84e7921fe7568f83daae7c4026c8b23fbacc4257b885de56f4dc8f682b03663a56f7def1227b8a4b6abf419aff8ecdd26ae51d4885a
+DIST xdiskusage-1.52.tgz 54458 BLAKE2B 6e91402c4e43e1dfafbd2e689282aea1305ac309a491fd410b16502b2176cfe9a8b17a7379eef5ddea074cc550e7801d91c13db0a7b119b3ab48f32f786f0e5b SHA512 d561f84ca2c8ff73a9abe8c6e34baed430aaa6c6793064b2aa5856249dd4b309d50c3f6b19824a8c948aa8a71f7a3056771937fdce3f3fcb8f2fc8b0f39cdf54
 EBUILD xdiskusage-1.51.ebuild 586 BLAKE2B 5ec139ccb463bf6bd0a6aee0764911cf5bc558cc953b5c17aeab83042288f974995d9c96ea68fe0eceacc1991c5e445b1d152667d47b86378db69fd1eb74a9b6 SHA512 aa6921eb15f6748483dbc3631c99c0c95a9b3133ec7188ebf9c13ace3c84ee15c3bb99b0c18d7193cac18b03f0ca91b6eaf16671cf7a26ed6bb28ab2eacb748c
+EBUILD xdiskusage-1.52.ebuild 675 BLAKE2B bcc0b178091a6b2bc7ae3e30ffb585c504d767b0a6e4024bfa7a68a5ecda637ada2934d5f5184575f7de9e921bfe5e15269073df55dc244907b004c69ae7b102 SHA512 b1b53a166537e46f2b85853f059bb4bc98ef7d25ad0d07e47a84c63505a7f0a70ea45a80863859da2bb7e4c625d2536f9601e8b2295ec5705db58aba6ce6e22e
 MISC metadata.xml 366 BLAKE2B 740f17c401fabc3c0a47e332dbcda1c7d6501bf52140a32c3f552dbf05e278394df9c96da54dfd17d366633b091279e144b34199e1999a4c613b9a1d8c68edf6 SHA512 70a6112f01001d3b6d064a925c778eac80c45ff1e8f5fa5474b9c21f4f27062f3eb94cf244e3996a271ab1dd1e6d28f51a201db49cb23f38f579adff27f8aad7
diff --git a/x11-misc/xdiskusage/files/xdiskusage-1.52-flags-order.patch b/x11-misc/xdiskusage/files/xdiskusage-1.52-flags-order.patch
new file mode 100644
index 000000000000..6d0e204e8b52
--- /dev/null
+++ b/x11-misc/xdiskusage/files/xdiskusage-1.52-flags-order.patch
@@ -0,0 +1,49 @@
+--- a/Makefile
++++ b/Makefile
+@@ -17,7 +17,7 @@
+ all:	$(PROGRAM)
+ 
+ $(PROGRAM) : $(OBJECTS)
+-	$(CXX) -o $(PROGRAM) $(OBJECTS) `fltk-config --ldflags` $(CXXFLAGS) $(LDFLAGS)
++	$(CXX) -o $(PROGRAM) $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) `fltk-config --ldflags`
+ 
+ configure: configure.in
+ 	autoconf
+@@ -29,9 +29,9 @@
+ .SUFFIXES : .fl .do .C .c .H
+ 
+ .C.o :
+-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $<
++	$(CXX) $(CXXFLAGS) `fltk-config --cxxflags` -c $<
+ .C :
+-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $<
++	$(CXX) $(CXXFLAGS) `fltk-config --cxxflags` -c $<
+ .fl.C :
+ 	-fluid -c $<
+ .fl.H :
+@@ -42,7 +42,7 @@
+ 	@touch makedepend
+ 
+ depend:
+-	$(MAKEDEPEND) -I.. $(CPPFLAGS) $(CXXFILES) $(CFILES) > makedepend
++	$(MAKEDEPEND) -I.. $(CXXFLAGS) `fltk-config --cxxflags` $(CXXFILES) $(CFILES) > makedepend
+ makedepend:
+ 	touch makedepend
+ include makedepend
+@@ -73,13 +73,13 @@
+ OBJECTS_D = $(CXXFILES:.C=.do) $(CFILES:.c=.do)
+ 
+ .C.do :
+-	$(CXX) $(CPPFLAGS) $(CXXFLAGS_D) -c -o $@ $<
++	$(CXX) $(CXXFLAGS) `fltk-config --cxxflags` $(CXXFLAGS_D) -c -o $@ $<
+ .c.do :
+ 	$(CC) $(CFLAGS_D) -c -o $@ $<
+ 
+ $(PROGRAM_D) : $(OBJECTS_D)
+-	$(CXX) -o $(PROGRAM_D) $(OBJECTS_D) `fltk-config --ldflags` $(CXXFLAGS_D) $(LDFLAGS)
++	$(CXX) -o $(PROGRAM_D) $(CXXFLAGS_D) $(LDFLAGS) $(OBJECTS_D) `fltk-config --ldflags`
+ 
+ # Used to make the version that is gzipped and uploaded to web site
+ static : $(OBJECTS)
+-	$(CXX) -o $(PROGRAM) $(OBJECTS) `fltk-config --ldstaticflags` $(CXXFLAGS) $(LDFLAGS)
++	$(CXX) -o $(PROGRAM) $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) `fltk-config --ldstaticflags`
diff --git a/x11-misc/xdiskusage/files/xdiskusage-1.52-pathbuf.patch b/x11-misc/xdiskusage/files/xdiskusage-1.52-pathbuf.patch
new file mode 100644
index 000000000000..a78372c050c4
--- /dev/null
+++ b/x11-misc/xdiskusage/files/xdiskusage-1.52-pathbuf.patch
@@ -0,0 +1,11 @@
+--- a/xdiskusage.C
++++ b/xdiskusage.C
+@@ -458,7 +458,7 @@
+   } else {
+     if (!disk) {
+       // follow all symbolic links...
+-      strncpy(pathbuf, path, 1024);
++      strncpy(pathbuf, path, 1024 -1);
+       for (int i=0; i<10; i++) {
+ 	char *p = (char*)fl_filename_name(pathbuf);
+ 	int j = readlink(pathbuf, p, 1024-(p-pathbuf));
diff --git a/x11-misc/xdiskusage/xdiskusage-1.52.ebuild b/x11-misc/xdiskusage/xdiskusage-1.52.ebuild
new file mode 100644
index 000000000000..7449a2fa676e
--- /dev/null
+++ b/x11-misc/xdiskusage/xdiskusage-1.52.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="user-friendly program to show you what is using up all your disk space"
+HOMEPAGE="http://xdiskusage.sourceforge.net/"
+SRC_URI="http://xdiskusage.sourceforge.net/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	>=x11-libs/fltk-1.3:1
+"
+BDEPEND="
+	${RDEPEND}
+"
+DEPEND="
+	${RDEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.52-flags-order.patch
+	"${FILESDIR}"/${PN}-1.52-pathbuf.patch
+)
+
+src_compile() {
+	# override FLAGS set by configure
+	emake CXXFLAGS="${CXXFLAGS}"
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	dodoc README
+}
diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index fc3026664dee..9908b3c163b2 100644
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -5,9 +5,9 @@ AUX xlockmore-5.64_alpha0-LDFLAGS.patch 906 BLAKE2B 477e2fa3b3e74ef3bcb93d0f87f8
 DIST xlockmore-5.50.tar.xz 1632968 BLAKE2B 2e692d16d70e3186ec1f31c192414b286f8815f2f428a6f7f43b3de0117c51c4ad2fbdfb91debe2ecb75c8683212b5d33bee62d81374552703d578b02d3af036 SHA512 627a905c4641d6083676a766931f23c06e2ac5af9b43447ccf03143d329d24b786aac6b248318929399b5fae98f1ec17e676466b5cbd09f180377c483694c569
 DIST xlockmore-5.62.tar.xz 1943836 BLAKE2B 6ce9b9ad709881a50eba0e32ae1e7524414a5e92e34daeff1ce68b6bb4738117155543d15219723ab514d520064601824a22d438541a699c742ab0c620285c64 SHA512 fc7c63a8ce781ba1a9598b5e3d585cc85051da864dbd59e3232b2fa6b6529743f9244e52bdf588ae438c02a2e1e745eb81b372234189e73ae6698cc962c387c2
 DIST xlockmore-5.63.tar.xz 1944624 BLAKE2B 8ee27c5cc88a7088705b7a017563698fa4bf99418bf3237594a1237547fa1eb9d5274327672f33344e97d2333eca71f95e51f760f0548abef06f8006a97c55c0 SHA512 0b067ced9afe0c5498f0b1e19bf163b0363bbb4bc2bc2007c1c0416328cdc2d528d664b122ef68322c38f2bcc37a15665b31ee6e8ce2369bad9e50528b93a047
-DIST xlockmore-5.64ALPHA0.tar.xz 1944032 BLAKE2B 859561b8a4986ffc34c1a229b95779253618739d77538e1bb1cf1d3c3af473a666d2fc1ea8c64938db191b3cf2d2fde19785c0fbc3bb0f5a7eb55fa01f3aecda SHA512 b4fa3826ba63de4f118955fbd8a2e6e8f4384ba02d3aae7e900d9d4c488527845eb99fceb4192c59341eb4a3e2bb80eaae768c3f136fd636c75a495417089b34
+DIST xlockmore-5.64.tar.xz 1944496 BLAKE2B 1b2c0337950bcf7ba094012c70c6c8578523b81a6af6dd68a0373425f87d7da28a770a8f7453019cc1527501a417390f013f43b3da2ddfc7d44380c512f9b4c9 SHA512 4946e8e9f895c0433c09e1cd639389d26020a764d62b08b329ce5d9e5de4bb6438f024639b2068c94f21cb0ebb5a6f94dffff6f606c6c3e2372a5102768e7f39
 EBUILD xlockmore-5.50.ebuild 2231 BLAKE2B 3accf80283ec7705cfafe4531bc38c1694d9d27381c9aa375bb14a1d59e865dd1c2aa8c99d1cdd26a93fe929b3302ca4646fe93f740feb56c86b70ca9362ed6c SHA512 f0116108dcbae364e4a7c391054890fca090fc182b8bd11c613e84bc91ccb07904e5bd14c515b934e2895c9e6bd2f82762d09719de4e648f6077338e3f05ff97
 EBUILD xlockmore-5.62.ebuild 2290 BLAKE2B 684053c5ea68511e810fdddff942f61ad18ffcdffa32a1b6eb68ed4269def2d03b82a70b75c3e37500615c5816077a49944b93858a53b9e07b8eba27c68bcba0 SHA512 e7818da25a25f015a06aec1f8096a3394981bc4c68a73f7a6a178fff6e278a91f088b02423eaf937aea0d9e33b5115973f23e714e78b12ae5458977012efb22f
 EBUILD xlockmore-5.63.ebuild 2284 BLAKE2B 5dfca5003f797a6765b33f14a91664b40559441812611677f392b2291a7e29297c254fb29ec3ea895df6e903f98e5926215b74d2ea0b342527da35eb045cc2f0 SHA512 0ec91c240df64f0a3e6c3c0aa7fbf35bdb889cb4d4cc76825223802cf3dd807067f228980838e1d813214f20ba8269d1cc9df96548dc14d2dca4b2d8ee102671
-EBUILD xlockmore-5.64_alpha0.ebuild 2337 BLAKE2B 73ba42d7fc570be8efda9ce39f50174fdfb2ff653f64b4ac5ede455d737c7d248d5a128cee3433eb00bd8973a3dc525a212bd5bac6f92474034b0ec7c2a2cb46 SHA512 e1996a03cc088f2e07fd077fb4c5209607d3ea288935ed6469356af6edff47739a99fac2dec4d8d98583591167ff81f9d7da1bf60418ff47c6046c667af76f07
+EBUILD xlockmore-5.64.ebuild 2337 BLAKE2B 73ba42d7fc570be8efda9ce39f50174fdfb2ff653f64b4ac5ede455d737c7d248d5a128cee3433eb00bd8973a3dc525a212bd5bac6f92474034b0ec7c2a2cb46 SHA512 e1996a03cc088f2e07fd077fb4c5209607d3ea288935ed6469356af6edff47739a99fac2dec4d8d98583591167ff81f9d7da1bf60418ff47c6046c667af76f07
 MISC metadata.xml 446 BLAKE2B d638ac6f12a203ae9ada10ae4c33e3a3d9901e350b6e6925c50078d66b29343cae42a67f84d5334182c1e816bddb05d062eb7b7e47c9125b273db118c4de573b SHA512 c8fafb010e63c39beeee5b53ad37354d19e98ac4cf33f29606b0af379811a0738c9c70d1fb7c31a5673d4a6365fb658a6a8bf49135b748bea9069a690ce543ed
diff --git a/x11-misc/xlockmore/xlockmore-5.64_alpha0.ebuild b/x11-misc/xlockmore/xlockmore-5.64.ebuild
index 26cf0a2b0721..26cf0a2b0721 100644
--- a/x11-misc/xlockmore/xlockmore-5.64_alpha0.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.64.ebuild