gentoo resync : 23.09.2020

4 files changed, 34 insertions, 19 deletions

diff --git a/kde-apps/ksystemlog/Manifest b/kde-apps/ksystemlog/Manifest
index 3eebfb0fcc23..1b7e0248dff8 100644
--- a/kde-apps/ksystemlog/Manifest
+++ b/kde-apps/ksystemlog/Manifest
@@ -1,5 +1,5 @@
 DIST ksystemlog-20.04.3.tar.xz 1931340 BLAKE2B 76546f9b19c9113e770b6a26d1911a2a97405bc600e138ee74ad8e233d0d77c871fe232eb3a5ddcffa10fe1a112b258a05d65c86ba51673a18b758a3c6e7cb48 SHA512 05a358eac885d1ca2ca8ea0f2a49fc98b6310ff17c9e830f2a931e5c20ba38bbbf0b7597029549ff4ee9a2bd7e769da5b3bb7ed57b9a304be9202ebea20eca2e
 DIST ksystemlog-20.08.1.tar.xz 1935748 BLAKE2B 8b9cd5c79d630052cf165f5184228c4a94bbd24202ab6fcadaf76b9aab72d4db3969472026e92e22dd366e6477e7f37fc12e6cf690c59a41d9db884153b603e3 SHA512 eef230567d062ba860bb59fc102c5546f1ebf15ab98f0042703fe49de6ba41409e010574fe44210fa649034756611b7c88ef87fef8882e4fd91d18ef8fdbcf0e
-EBUILD ksystemlog-20.04.3.ebuild 1757 BLAKE2B 7dfb7f1317e0f088bb149557d26441cd649c342c9b14522e25977507c7bd4f82d0e6be198d48f383c88a150baa88d79daadaa3973807bdcaf1e28b9760aad4cd SHA512 b2c47dfccf8347f631e208b5a75e8cad0765d91c3f8d51a0621c61e779ae185464145132bb2f1bf96035fd75934ea44e917435b3f6f386f039b9db65564a6bd6
-EBUILD ksystemlog-20.08.1.ebuild 1172 BLAKE2B 1f8c0d727348a3ef2dfbb9eed420d29d367729c30dbf8c389602af3f9f47afa6df2daf29fa89ca1c0c28d64604305e6ab0b77f1e71b2a0c5c3d342c73b9aef66 SHA512 aba04de44018d8e589d1cb1f45dcdf587036daec0dc674aac1e787b4fd9fa4c09c8d65fa7fc4c7414ec111d9f0e5a3d7d1ccd7c37b219525becc003f39758576
-MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
+EBUILD ksystemlog-20.04.3-r1.ebuild 1630 BLAKE2B 3c76a3d14d07553307d9779c2bf0b84b01a846a7e843a6cc62dc6d34f81dbf534891e97b8eb6bde4238914c289c19196a78879afc4c20cf49ee4e57249c36f29 SHA512 de840d6f57c8e3fff9964cbd7c459d1f7caf982e4284ae482ba9039a0cefdeadc11a63eb2c389db30cc182b39f43c5d15a6c81e529348adc4a9525f5f38388dd
+EBUILD ksystemlog-20.08.1-r1.ebuild 1546 BLAKE2B af9b4d29f75fecb5463794966b37fc5916af5c58656d7cd2606121eaa5db6f32ee67e336235fdb17bba76faf17da6dd63167212cfa5d5054c015d09107685773 SHA512 d011c92e5616b59641624789b05a030c4cf162b76eae1cef988331cb2b2862985e6ad6a1a53700890b89de3feb7a74dac648d5f1cbd5ce1ce1c9879b03e29c8b
+MISC metadata.xml 357 BLAKE2B 2004a9f41fec27cb3e4f75c4248fbc4b46a4ab7c52f2d23fbcaa3085e1580b0dfe9ad9980c2b7af0670a7b56860111235fbc21298a2647d5bafa0d2be0bf95c0 SHA512 ba2d8f62d75eee5e8edf3368ad54c0d4b347b92279c2de5a4d326536bf670c82e419490a3972731b698bff84ff10908c939ba7a416f4ce4de335eb914df4a701
diff --git a/kde-apps/ksystemlog/ksystemlog-20.04.3.ebuild b/kde-apps/ksystemlog/ksystemlog-20.04.3-r1.ebuild
index 3c015a822d8e..5578b9e66917 100644
--- a/kde-apps/ksystemlog/ksystemlog-20.04.3.ebuild
+++ b/kde-apps/ksystemlog/ksystemlog-20.04.3-r1.ebuild
@@ -16,10 +16,7 @@ HOMEPAGE="https://kde.org/applications/system/org.kde.ksystemlog"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="systemd"
-
-# bug 378101
-RESTRICT+=" test"
+IUSE="kdesu systemd"
 
 DEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5
@@ -40,21 +37,16 @@ DEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	systemd? ( sys-apps/systemd )
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	kdesu? ( kde-plasma/kde-cli-tools[kdesu] )
+"
 
 src_prepare() {
 	ecm_src_prepare
 
-	if use test; then
-		# beat this stupid test into shape: the test files contain no year, so
-		# comparison succeeds only in 2007 !!!
-		local theyear=$(date +%Y)
-		einfo Setting the current year as ${theyear} in the test files
-		sed -e "s:2007:${theyear}:g" -i tests/systemAnalyzerTest.cpp || die
-
-		# one test consistently fails, so comment it out for the moment
-		sed -e "s:systemAnalyzerTest:# dont run systemAnalyzerTest:g" \
-			-i ksystemlog/tests/CMakeLists.txt || die
+	if ! use kdesu; then
+		sed -e "/^X-KDE-SubstituteUID/s:true:false:" \
+			-i src/org.kde.ksystemlog.desktop || die
 	fi
 }
 
@@ -64,3 +56,9 @@ src_configure() {
 	)
 	ecm_src_configure
 }
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	use kdesu || elog "Will show only user readable logs without USE=kdesu (only in X)."
+	use kdesu && elog "Cannot be launched from application menu in Wayland with USE=kdesu."
+}
diff --git a/kde-apps/ksystemlog/ksystemlog-20.08.1.ebuild b/kde-apps/ksystemlog/ksystemlog-20.08.1-r1.ebuild
index e62fbabe06a1..421207a4525c 100644
--- a/kde-apps/ksystemlog/ksystemlog-20.08.1.ebuild
+++ b/kde-apps/ksystemlog/ksystemlog-20.08.1-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://kde.org/applications/system/org.kde.ksystemlog"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="systemd"
+IUSE="kdesu systemd"
 
 DEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5
@@ -38,9 +38,23 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+	ecm_src_prepare
+	if ! use kdesu; then
+		sed -e "/^X-KDE-SubstituteUID/s:true:false:" \
+			-i src/org.kde.ksystemlog.desktop || die
+	fi
+}
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package systemd Journald)
 	)
 	ecm_src_configure
 }
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	use kdesu || elog "Will show only user readable logs without USE=kdesu (only in X)."
+	use kdesu && elog "Cannot be launched from application menu in Wayland with USE=kdesu."
+}
diff --git a/kde-apps/ksystemlog/metadata.xml b/kde-apps/ksystemlog/metadata.xml
index 2fdbf33d963d..c86984db68b9 100644
--- a/kde-apps/ksystemlog/metadata.xml
+++ b/kde-apps/ksystemlog/metadata.xml
@@ -5,4 +5,7 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
+	<use>
+		<flag name="kdesu">Run as root using kdesu from <pkg>kde-plasma/kde-cli-tools</pkg></flag>
+	</use>
 </pkgmetadata>