gentoo resync : 25.08.2020

18 files changed, 132 insertions, 138 deletions

diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index f89622024048..284338bc32cb 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/radeon-profile-daemon/Manifest b/x11-apps/radeon-profile-daemon/Manifest
index c75e701c0de7..f220e33dcfe5 100644
--- a/x11-apps/radeon-profile-daemon/Manifest
+++ b/x11-apps/radeon-profile-daemon/Manifest
@@ -1,6 +1,6 @@
-AUX radeon-profile-daemon-20190603-secure_socket.patch 1006 BLAKE2B 19ed7c899c32b7630d7c5c14b85d98f77ae2aab6d22b5717cb0af2b1192c774a701ec04e60e7c57f5278538ce7311735a11e17415598b39e6373f52b01530db0 SHA512 92c634b365f0bc1614dbc8fb8a463dc7a15b984ca700a05ecb1a765898baccc1032dc87277c436f91e61585b15e3126d3ce3599cb0e5d430e39cbdcae61e3bc4
-AUX radeon-profile-daemon.initd-r1 473 BLAKE2B 039c48a1f16dad58942f709569805ed7102fef347d83771819c4bd0b3765bc453a0d28b85ccf2e6dd6d01fd4ec43d18f3b8e88acff8df5e5c67b8c26b009eab7 SHA512 b24bcdcafaf524f253e1052b910d001ac62014e128e786f69b5bf06dab63bada98823119d19a4040bf7062a8cbbb2d73f194a6fba6dba184eda3d6d09aec6a1e
+AUX radeon-profile-daemon-20190603-run_subdir.patch 1189 BLAKE2B b7963eeafcb3db1f48b9945ee797bf8582c0191f0e99a280cdbe3195e7e819f67ef42de11e585748c0de2575482a321243ca01a616f7fa799d3d769f1ea58627 SHA512 a5124700211cce6a506aa139310b48bee20c495c4bae9b60f7450538b2e3389d16ff02dbe802f778565bffe7c86615ea4a176aed296fe658b26f1758b06033df
+AUX radeon-profile-daemon.initd-r2 401 BLAKE2B 4965be70c3df07bbb02710f257fa10c43802a681f927792718f693e8369b8f1d6d000cbbf431485ce03ef26bcb4e38326e7430c15bfc9a578dab9008afa11a2f SHA512 f92822b59b17788cfb06a9560176e383c6c978c4e3cdeee3e4af8110e71beeb43308b8887063dff903704ea2a0e69ee4abe0e4e21e4921d030da0f9c8fd91f2d
 DIST radeon-profile-daemon-20190603.tar.gz 12232 BLAKE2B 3ff02f76178c2a30c8f094a2589aaed7d9e2c8ecc4cd0c8d3b6be1e38dddad39bbb4996ef9b7f87ef999890fbdade6ba3c6bcc39de6ae84bf1c224152a8249f1 SHA512 1c58008400f5acc5bd39353c6e2c109adecc4eb2b5d7976ce240d372cc60996ee93ce50630292ce85b9a1ae92d82e6cce49fd0ccb28f574bc668d212c50a54ab
-EBUILD radeon-profile-daemon-20190603.ebuild 1224 BLAKE2B 9c4b42cc95eb1828ab0ba3b5da384aaa1b17c0154a3d424f653132aafe5959e1427f6677d7a397af0fd5d4e866f53df9aa7849f0a52201eee36a4aafec90b8d1 SHA512 6aef53947d4f4c649167bbf9d660011e1bc65cf401c1e0b3a764150a8ad0a85b15d1bc01a450996edf8d7d870177efdd6a40bed123d0724d024d7f504c426f90
-EBUILD radeon-profile-daemon-99999999.ebuild 1224 BLAKE2B 9c4b42cc95eb1828ab0ba3b5da384aaa1b17c0154a3d424f653132aafe5959e1427f6677d7a397af0fd5d4e866f53df9aa7849f0a52201eee36a4aafec90b8d1 SHA512 6aef53947d4f4c649167bbf9d660011e1bc65cf401c1e0b3a764150a8ad0a85b15d1bc01a450996edf8d7d870177efdd6a40bed123d0724d024d7f504c426f90
+EBUILD radeon-profile-daemon-20190603-r1.ebuild 1260 BLAKE2B eeb14f7d278d2d4628313c72e084a1469f4a90872a614855e6b630d1eb00f03f01c9750730be1a51006783ec33a2862fbbd35d7b924a24d7257e310e172a9b66 SHA512 58d65858e98719ab41f69e7bbbfb5954d438215e6f48d07051f715dd8f5cea816cb80136651fdadaba83c9da77b5afe8f5fcf08ce61d9a94a271dbbf9c6377de
+EBUILD radeon-profile-daemon-99999999.ebuild 1260 BLAKE2B eeb14f7d278d2d4628313c72e084a1469f4a90872a614855e6b630d1eb00f03f01c9750730be1a51006783ec33a2862fbbd35d7b924a24d7257e310e172a9b66 SHA512 58d65858e98719ab41f69e7bbbfb5954d438215e6f48d07051f715dd8f5cea816cb80136651fdadaba83c9da77b5afe8f5fcf08ce61d9a94a271dbbf9c6377de
 MISC metadata.xml 358 BLAKE2B 06e855ba85405499bf5eaf5908bdc1f4936021b0be784d647a6d48f5641badb3aa84687744ea834331ff33226b2588e57fbb53b225a9a249b92b1ce1e47426a5 SHA512 6d40ebc0fe08862dc3a2ff138f335ea02184d34f450858a3bc4f9939db147daf5e6d0c4507064fb262018edc74e1e90ed563f41e36a2b442f080556c3aed49f2
diff --git a/x11-apps/radeon-profile-daemon/files/radeon-profile-daemon-20190603-run_subdir.patch b/x11-apps/radeon-profile-daemon/files/radeon-profile-daemon-20190603-run_subdir.patch
new file mode 100644
index 000000000000..24bc134fdf92
--- /dev/null
+++ b/x11-apps/radeon-profile-daemon/files/radeon-profile-daemon-20190603-run_subdir.patch
@@ -0,0 +1,33 @@
+From 8aad288652cb7dc9c60eadd85d945ac43a712663 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Wed, 8 Jul 2020 16:08:24 +0200
+Subject: [PATCH] Move radeon-profile-daemon-server socket file into its own
+ subdir under /run
+
+The rationale here is that QT has no methods to run chown on some
+files but we do not want the socket being world readable. So instead of
+writing lenghty C++-code using chown, we simply move the socket file into a
+subdir which we can put our preferred permissions on during startup of the
+daemon.
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ radeon-profile-daemon/rpdthread.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/radeon-profile-daemon/rpdthread.h b/radeon-profile-daemon/rpdthread.h
+index 280fada..f05d031 100644
+--- a/radeon-profile-daemon/rpdthread.h
++++ b/radeon-profile-daemon/rpdthread.h
+@@ -31,7 +31,7 @@
+ #define SIGNAL_ALIVE '7'
+ 
+ const QString appVersion = "20190603";
+-const QString serverSocketPath = "/run/radeon-profile-daemon-server";
++const QString serverSocketPath = "/run/radeon-profile-daemon/radeon-profile-daemon-server";
+ 
+ class rpdThread : public QThread
+ {
+-- 
+2.27.0
+
diff --git a/x11-apps/radeon-profile-daemon/files/radeon-profile-daemon-20190603-secure_socket.patch b/x11-apps/radeon-profile-daemon/files/radeon-profile-daemon-20190603-secure_socket.patch
deleted file mode 100644
index 951e7d12e28f..000000000000
--- a/x11-apps/radeon-profile-daemon/files/radeon-profile-daemon-20190603-secure_socket.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 47ddfbb7b85c3e99eb0d132078c989c0dfa2ea9b Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Thu, 13 Jun 2019 15:58:44 +0200
-Subject: [PATCH] Don't make the socket world writable
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- radeon-profile-daemon/rpdthread.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/radeon-profile-daemon/rpdthread.cpp b/radeon-profile-daemon/rpdthread.cpp
-index 8785efa..94a0d6f 100644
---- a/radeon-profile-daemon/rpdthread.cpp
-+++ b/radeon-profile-daemon/rpdthread.cpp
-@@ -47,7 +47,7 @@ void rpdThread::createServer()
- 
-     QLocalServer::removeServer(serverSocketPath);
-     daemonServer.listen(serverSocketPath);
--    QFile::setPermissions(serverSocketPath, QFile(serverSocketPath).permissions() | QFile::WriteOther | QFile::ReadOther);
-+    QFile::setPermissions(serverSocketPath, QFile(serverSocketPath).permissions() | QFile::WriteGroup | QFile::ReadGroup);
- }
- 
- void rpdThread::closeConnection()
--- 
-2.22.0
-
diff --git a/x11-apps/radeon-profile-daemon/files/radeon-profile-daemon.initd-r1 b/x11-apps/radeon-profile-daemon/files/radeon-profile-daemon.initd-r1
deleted file mode 100644
index 813ab9515aeb..000000000000
--- a/x11-apps/radeon-profile-daemon/files/radeon-profile-daemon.initd-r1
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-description="Daemon for radeon-profile GUI"
-
-command="/usr/sbin/radeon-profile-daemon"
-command_background="true"
-pidfile="/run/${SVCNAME}.pid"
-
-radeon_socket="/run/radeon-profile-daemon-server"
-
-start_post() {
-	if ewaitfile 10 ${radeon_socket} ; then
-		chgrp video ${radeon_socket}
-	else
-		eerror "Failed to find socket file ${radeon_socket}"
-	fi
-}
diff --git a/x11-apps/radeon-profile-daemon/files/radeon-profile-daemon.initd-r2 b/x11-apps/radeon-profile-daemon/files/radeon-profile-daemon.initd-r2
new file mode 100644
index 000000000000..28ed19d4e846
--- /dev/null
+++ b/x11-apps/radeon-profile-daemon/files/radeon-profile-daemon.initd-r2
@@ -0,0 +1,15 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="Daemon for radeon-profile GUI"
+
+command="/usr/sbin/radeon-profile-daemon"
+command_background="true"
+pidfile="/run/${SVCNAME}/${SVCNAME}.pid"
+
+radeon_socket="/run/${SVCNAME}/${SVCNAME}-server"
+
+start_pre() {
+	checkpath -q -d -o root:video -m 0750 /run/${SVCNAME}
+}
diff --git a/x11-apps/radeon-profile-daemon/radeon-profile-daemon-20190603.ebuild b/x11-apps/radeon-profile-daemon/radeon-profile-daemon-20190603-r1.ebuild
index 77f7239752b9..dc4d37cb3a89 100644
--- a/x11-apps/radeon-profile-daemon/radeon-profile-daemon-20190603.ebuild
+++ b/x11-apps/radeon-profile-daemon/radeon-profile-daemon-20190603-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
@@ -20,6 +20,7 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
+	!<x11-apps/radeon-profile-20200504-r1
 	dev-qt/qtcore:5
 	dev-qt/qtnetwork:5
 "
@@ -28,7 +29,7 @@ DEPEND="${RDEPEND}"
 S="${WORKDIR}/${P}/${PN}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-20190603-secure_socket.patch"
+	"${FILESDIR}/${PN}-20190603-run_subdir.patch"
 )
 
 src_prepare() {
@@ -51,7 +52,7 @@ src_configure() {
 src_install() {
 	emake INSTALL_ROOT="${D}" install
 
-	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd-r2 ${PN}
 }
 
 pkg_postinst() {
diff --git a/x11-apps/radeon-profile-daemon/radeon-profile-daemon-99999999.ebuild b/x11-apps/radeon-profile-daemon/radeon-profile-daemon-99999999.ebuild
index 77f7239752b9..dc4d37cb3a89 100644
--- a/x11-apps/radeon-profile-daemon/radeon-profile-daemon-99999999.ebuild
+++ b/x11-apps/radeon-profile-daemon/radeon-profile-daemon-99999999.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
@@ -20,6 +20,7 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
+	!<x11-apps/radeon-profile-20200504-r1
 	dev-qt/qtcore:5
 	dev-qt/qtnetwork:5
 "
@@ -28,7 +29,7 @@ DEPEND="${RDEPEND}"
 S="${WORKDIR}/${P}/${PN}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-20190603-secure_socket.patch"
+	"${FILESDIR}/${PN}-20190603-run_subdir.patch"
 )
 
 src_prepare() {
@@ -51,7 +52,7 @@ src_configure() {
 src_install() {
 	emake INSTALL_ROOT="${D}" install
 
-	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd-r2 ${PN}
 }
 
 pkg_postinst() {
diff --git a/x11-apps/radeon-profile/Manifest b/x11-apps/radeon-profile/Manifest
index 5bed094644ae..2e85e72566fd 100644
--- a/x11-apps/radeon-profile/Manifest
+++ b/x11-apps/radeon-profile/Manifest
@@ -1,6 +1,5 @@
-DIST radeon-profile-20190903.tar.gz 383822 BLAKE2B d6551bb8e504147104a106cd2f1b4e5115d650d70b77e89e95f1915ba2d59bcda5b0d726260f905f953596cd673d61bcc9b563ddff0147edf981bec40d5ff2e2 SHA512 8417ddb53fb31cd753c8b7adf42390220eba401e424eff6ea82b8535832ddf9e7f59cb9083d51a003f0453ebdf91a594fbadfd37da1c47b7b0e87447e1f600f3
+AUX radeon-profile-20200504-run_subdir.patch 1094 BLAKE2B 46b28649ae72b6e158df117dbff356213c14eaccba4547f1740b9b3c3c3469b816868d3b85acc3e32bde081b586e459e8b96f9df02e0f66717f7d88ccf047a66 SHA512 f8040a93e065292cc696ec94fa1076e438bdca5fd5f032062f4f3e8abcbeec9d4f814fb535474608fcbb352f554f5ce82244995977b7f4322b24a125df8a4847
 DIST radeon-profile-20200504.tar.gz 395674 BLAKE2B 6435dfcf9d2ce25789f429f12071cdb1c3f85050654b7fdec45c51a59d562d60369b28cfcd2854dfd5841e4af8f9166afed266e0a48d9010619972b653e0d4a8 SHA512 73f7eb59369af57aba5f067202fb1f772e48260c42ad194876926c29d278022daa86235f8d591bc763b8c6d80682553fe9a55f848137a8ec1de1bf9531c162c6
-EBUILD radeon-profile-20190903.ebuild 1110 BLAKE2B 3baabee798f25dcb245be9891df0514a7e38f5df4a7f7f2b3bffdcd2c4359f2f1118c157afd6d87181c700d333db84ccf26c728092bdfe031f9042dbf922a179 SHA512 83cfbd6c8473cb2fc3dae3f592b65b484b2985fb892c6531bbba44c6cc455d7b42ecaadffaf3da71baaee1dab25d7ea5aadf823b5ef88bb9420f8cb7389cf80b
-EBUILD radeon-profile-20200504.ebuild 1110 BLAKE2B 4d8889767cd00610a5c30544cb6378cab53f1f68b806060fb7fbf1ce7eda59bbdeb95419bd956fee5eee58ce3b879b478a034d93b31e6bcc8e1606f0b6c21e29 SHA512 7197ab783431d3b69d80b32f3e11433d748f4a75738981cb6b6c3badda6ad7910fb62c076dab9ad09dd8769f02c5c648a151de9c47838f3a0d5a6a7e0d0efcac
-EBUILD radeon-profile-99999999.ebuild 1110 BLAKE2B 3baabee798f25dcb245be9891df0514a7e38f5df4a7f7f2b3bffdcd2c4359f2f1118c157afd6d87181c700d333db84ccf26c728092bdfe031f9042dbf922a179 SHA512 83cfbd6c8473cb2fc3dae3f592b65b484b2985fb892c6531bbba44c6cc455d7b42ecaadffaf3da71baaee1dab25d7ea5aadf823b5ef88bb9420f8cb7389cf80b
+EBUILD radeon-profile-20200504-r1.ebuild 1248 BLAKE2B ec70477c0942ac99cb44c40d0e081d60fe7e7d47af5113e2a7062cab86fdfc3edac66e4792b6abeaf17aef745d065bbe10cf8ffa398d7f75e5634c34a7952a2e SHA512 b2ca93c74ed62e3ff271040d725fd2801a3215c5e8898f6855dd3ae41d07fa69212afdc4a77bb5a236d0089d49a09d86635e16c9ab49dc347fd24f2f4832cfa0
+EBUILD radeon-profile-99999999.ebuild 1248 BLAKE2B ec70477c0942ac99cb44c40d0e081d60fe7e7d47af5113e2a7062cab86fdfc3edac66e4792b6abeaf17aef745d065bbe10cf8ffa398d7f75e5634c34a7952a2e SHA512 b2ca93c74ed62e3ff271040d725fd2801a3215c5e8898f6855dd3ae41d07fa69212afdc4a77bb5a236d0089d49a09d86635e16c9ab49dc347fd24f2f4832cfa0
 MISC metadata.xml 351 BLAKE2B 9bd8e162fadd4298b4cad8421104f7a75fcbfd41afba232789443b55e7a0c5befa8da030dc2fdccddedcab6296f51963158bf822e272182d98bf47dde9e63936 SHA512 0dd848bf98523b34bfb961b5711314bfda5294b2e7292a2b9a38c45c3bbb8f3d71ee22640a00068aadf97ee6aec3bf393a288f9d0b0533b7d5c9fa83aeacc2b1
diff --git a/x11-apps/radeon-profile/files/radeon-profile-20200504-run_subdir.patch b/x11-apps/radeon-profile/files/radeon-profile-20200504-run_subdir.patch
new file mode 100644
index 000000000000..052a143e793f
--- /dev/null
+++ b/x11-apps/radeon-profile/files/radeon-profile-20200504-run_subdir.patch
@@ -0,0 +1,30 @@
+From 576d03da0e33cdc31535cd724daaf1cdde3ac902 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Wed, 8 Jul 2020 16:33:38 +0200
+Subject: [PATCH] Read radeon-profile-daemon-server socket from
+ /run/radeon-profile-daemon/
+
+Gentoo has moved the radeon-profile-daemon-server socket file into that
+subdir in order to provide secure access permissions.
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ radeon-profile/daemonComm.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/radeon-profile/daemonComm.cpp b/radeon-profile/daemonComm.cpp
+index 21ec38f..dff00a0 100644
+--- a/radeon-profile/daemonComm.cpp
++++ b/radeon-profile/daemonComm.cpp
+@@ -34,7 +34,7 @@ void DaemonComm::sendConnectionConfirmation() {
+ void DaemonComm::connectToDaemon() {
+     qDebug() << "Connecting to daemon...";
+     signalSender->abort();
+-    signalSender->connectToServer("/run/radeon-profile-daemon-server");
++    signalSender->connectToServer("/run/radeon-profile-daemon/radeon-profile-daemon-server");
+ }
+ 
+ void DaemonComm::disconnectDaemon() {
+-- 
+2.27.0
+
diff --git a/x11-apps/radeon-profile/radeon-profile-20190903.ebuild b/x11-apps/radeon-profile/radeon-profile-20190903.ebuild
deleted file mode 100644
index ad6e34fec998..000000000000
--- a/x11-apps/radeon-profile/radeon-profile-20190903.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils
-
-DESCRIPTION="Read current clocks of ATi/AMD Radeon cards"
-HOMEPAGE="https://github.com/marazmista/radeon-profile"
-if [[ "${PV}" == 99999999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/marazmista/radeon-profile.git"
-else
-	SRC_URI="https://github.com/marazmista/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE=""
-
-S="${WORKDIR}/${P}/${PN}"
-
-RDEPEND="
-	dev-qt/qtcharts:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	x11-libs/libX11
-	x11-libs/libXrandr
-"
-
-DEPEND="
-	${RDEPEND}
-	dev-qt/qtconcurrent:5
-	media-libs/mesa[X(+)]
-	x11-libs/libdrm
-"
-
-src_prepare() {
-	default
-	sed 's@TrayIcon;@@' -i extra/${PN}.desktop || die
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-}
-
-pkg_postinst() {
-	elog "In order to run ${PN} as non-root user, the"
-	elog "  x11-apps/radeon-profile-daemon"
-	elog "package needs to be installed and the daemon must run."
-}
diff --git a/x11-apps/radeon-profile/radeon-profile-20200504.ebuild b/x11-apps/radeon-profile/radeon-profile-20200504-r1.ebuild
index 830f17504e3f..d836b3ad1f83 100644
--- a/x11-apps/radeon-profile/radeon-profile-20200504.ebuild
+++ b/x11-apps/radeon-profile/radeon-profile-20200504-r1.ebuild
@@ -22,6 +22,7 @@ IUSE=""
 S="${WORKDIR}/${P}/${PN}"
 
 RDEPEND="
+	!<x11-apps/radeon-profile-daemon-20190603-r1
 	dev-qt/qtcharts:5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
@@ -38,8 +39,13 @@ DEPEND="
 	x11-libs/libdrm
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-20200504-run_subdir.patch"
+)
+
 src_prepare() {
-	default
+	eapply -p2 "${PATCHES[@]}"
+	eapply_user
 	sed 's@TrayIcon;@@' -i extra/${PN}.desktop || die
 }
 
diff --git a/x11-apps/radeon-profile/radeon-profile-99999999.ebuild b/x11-apps/radeon-profile/radeon-profile-99999999.ebuild
index ad6e34fec998..d836b3ad1f83 100644
--- a/x11-apps/radeon-profile/radeon-profile-99999999.ebuild
+++ b/x11-apps/radeon-profile/radeon-profile-99999999.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
@@ -22,6 +22,7 @@ IUSE=""
 S="${WORKDIR}/${P}/${PN}"
 
 RDEPEND="
+	!<x11-apps/radeon-profile-daemon-20190603-r1
 	dev-qt/qtcharts:5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
@@ -38,8 +39,13 @@ DEPEND="
 	x11-libs/libdrm
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-20200504-run_subdir.patch"
+)
+
 src_prepare() {
-	default
+	eapply -p2 "${PATCHES[@]}"
+	eapply_user
 	sed 's@TrayIcon;@@' -i extra/${PN}.desktop || die
 }
 
diff --git a/x11-apps/xauth/Manifest b/x11-apps/xauth/Manifest
index 05aec33d1d4d..c5ba750f40f9 100644
--- a/x11-apps/xauth/Manifest
+++ b/x11-apps/xauth/Manifest
@@ -1,4 +1,4 @@
 DIST xauth-1.1.tar.bz2 163510 BLAKE2B 0b55ee9ec35ca436c36effe2ba4eee55f76a311a5482d1d72e80e5afea30c682de3f686b2956d17278721e190dd9bec4d93db6507853841a633c931312df745d SHA512 b6ecd59a853a491ef45bf8cfbff63bed36645f81cb79ae9d18458b57f7502bccf92f0d979d3337578518646f680ad379e67b1dac15a927cbb11372733e7a3a0c
-EBUILD xauth-1.1.ebuild 661 BLAKE2B 2b5ff1093ae0554947872c5b52d374d9e75cc7bbff0c55e6f156a74c5bab6c2c02d23918778d3ca45835b56658cee531982583a7f407679e663f7dacf5aec007 SHA512 432af5fd00341e8c81a8b82c366e604e491dc037ccd704cb5a05f8ad485f3d2ec159e8db7bb654d2172c723564cd0bc1a7520d37d09f3508e688745a7e9bb9d5
-EBUILD xauth-9999.ebuild 670 BLAKE2B 2596b147bd26f4a4e63585455990c5070df6ab99d47dec64cc3c803458f681b8e43c70048aa3200f5948118ec699ec98ac6b7bcf6c001c3a4085e1e0abe4ed9d SHA512 c7a074fa9f8215a314437a21c064c364a1c1a518272d2449975013f92d71782ea7369eba9a964b55896c854cce1421c4db66c7b7ce2e7e65bfd5701f81bf0d27
+EBUILD xauth-1.1.ebuild 587 BLAKE2B 699f1a1a17f0d6b17dd4d83b593447cb360803c67bc197b3a2ba9cd460b017b14389dafde331603f64c2a7aa2d597fb414a972d193bbfe22cc186324c4454ebf SHA512 13858b01039775a2bec8fb77c97695350e4d7ca0e23ecf29809efb15506b2d338e2ad96f9eb70fa3ed991a66fd6597505a527076dd879909ed243045fdbfe23f
+EBUILD xauth-9999.ebuild 596 BLAKE2B e9747b6e1e2b3a3cc828c3ec739323322a747ffb00a6967a09bba5e2e42d27ef5826f70b114f17f16bb0a609cf3ca15df25ce7e63fb728b3ee7f18f54baaf601 SHA512 9e4f6c135735eafbb0b09c03ba39b372360f559529c02c1402d090a3f4c7a406b17cd300a756d8c1d142d0f01afb1d4216be654f6f19e4c5adac1c4179f81b49
 MISC metadata.xml 234 BLAKE2B b45f6795dbd73dfcee2a68f93ec5460509b15a69401467bc8f4af9505eeb04a2aa35a2b144eb88781df4abd4e15d2b88fc728daf033c6d646762170ffb00b1a7 SHA512 fabcd59aeede4ac93d66552746edacc44fd565551aafaca67185aff7f8e6a4c0fa21f3d54e4fccd7def948ec57b90489631bd779fb992cd9322132b0a3aa503b
diff --git a/x11-apps/xauth/xauth-1.1.ebuild b/x11-apps/xauth/xauth-1.1.ebuild
index 838c880146d3..bde249ad877b 100644
--- a/x11-apps/xauth/xauth-1.1.ebuild
+++ b/x11-apps/xauth/xauth-1.1.ebuild
@@ -12,8 +12,8 @@ else
 fi
 
 DESCRIPTION="X authority file utility"
-IUSE="ipv6 test"
-RESTRICT="!test? ( test )"
+IUSE="ipv6"
+RESTRICT="test" # Depends on dead cmdtest package
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXau
@@ -21,15 +21,9 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXmu"
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
-BDEPEND="test? ( dev-util/cmdtest )"
 
 pkg_setup() {
 	XORG_CONFIGURE_OPTIONS=(
 		$(use_enable ipv6)
 	)
 }
-
-src_test() {
-	addwrite /proc/self/comm
-	emake check
-}
diff --git a/x11-apps/xauth/xauth-9999.ebuild b/x11-apps/xauth/xauth-9999.ebuild
index 303aa1063e26..f46da39bc300 100644
--- a/x11-apps/xauth/xauth-9999.ebuild
+++ b/x11-apps/xauth/xauth-9999.ebuild
@@ -12,8 +12,8 @@ else
 fi
 
 DESCRIPTION="X authority file utility"
-IUSE="ipv6 test"
-RESTRICT="!test? ( test )"
+IUSE="ipv6"
+RESTRICT="test" # Depends on dead cmdtest package
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXau
@@ -21,15 +21,9 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXmu"
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
-BDEPEND="test? ( dev-util/cmdtest )"
 
 pkg_setup() {
 	XORG_CONFIGURE_OPTIONS=(
 		$(use_enable ipv6)
 	)
 }
-
-src_test() {
-	addwrite /proc/self/comm
-	emake check
-}
diff --git a/x11-apps/xev/Manifest b/x11-apps/xev/Manifest
index 4a286e065b5b..474ad822dd20 100644
--- a/x11-apps/xev/Manifest
+++ b/x11-apps/xev/Manifest
@@ -1,3 +1,5 @@
 DIST xev-1.2.3.tar.bz2 134866 BLAKE2B 9ff8bdb1e75754a5390115d10dd5851f71b2319ad7ff02299ff28284aa23c14cd1ad3ee9eea81718ed355fc31983e4f7ec0312b31e3f86d3691bb52ebbe0cc4e SHA512 47cc7ac096e77cfa4e687914d767263cf3e1dca5bffd0f68c7ba0fe751b248c8a16525bd2da4d6efa0ea8d637831c893d41c9687cace4aaa9c0909a45ef1943e
+DIST xev-1.2.4.tar.bz2 136792 BLAKE2B 46b38d7295f8a11509598758ece9d880f9c3d303064de5cb6ef12aa9d0b066e78aefd3aa5e0c94ea4af7633936209474be362f9e38c0994eefe798662c2e4c6c SHA512 383472ddbfad639ba46a69080ecdd11a514a0578fd32c463fae18da02e0265c944589eebf12a858994f5fd601c02a0d51517e9b3ff61c6afe740d374f02781ca
 EBUILD xev-1.2.3.ebuild 380 BLAKE2B 74260776f579a9b4fef66c5a5e3e4fd8ee86c2bd690846808b20db7f772533fc602b215632ca0a1161bdebc17589fd8231aeee1934a1369f38d7a85f29e3a32d SHA512 8ec4b6ea8c7a665338da71a07dd51cc9d1bde482ce26e2b5ba2f9c3179bab99cd07885e1b57bfcb0cc3c248c522a7f6c03e28d453e56fe5ea967c5a3acf63eae
+EBUILD xev-1.2.4.ebuild 387 BLAKE2B 9f6ee34a1e7fd928b84f3595363060aa5f4c673bf7cbf9d92bf967c823755cd0d3ae348e16bf52462a27e76bb18e5da4bb1d18329e82a6ab0599f4a7c4cfd7e4 SHA512 c53fa7c25b1e95b875514eb03f686559405173785034a3791e947f540c3fbbd7611b418b192797d6e906cf988e94527df64c3f00010dd5fd1ea4077a5d5ddbe3
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xev/xev-1.2.4.ebuild b/x11-apps/xev/xev-1.2.4.ebuild
new file mode 100644
index 000000000000..da4f5f642ee7
--- /dev/null
+++ b/x11-apps/xev/xev-1.2.4.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="Print contents of X events"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-winnt"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXrandr"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"