gentoo resync : 25.08.2020

5 files changed, 48 insertions, 65 deletions

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
 }