gentoo resync : 23.09.2020

7 files changed, 36 insertions, 21 deletions

diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 89c5c64aebcf..687d76bd64b8 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/kig/Manifest b/kde-apps/kig/Manifest
index fd0cd853c39d..844d782836d1 100644
--- a/kde-apps/kig/Manifest
+++ b/kde-apps/kig/Manifest
@@ -4,4 +4,4 @@ DIST kig-20.04.3.tar.xz 3482876 BLAKE2B d56c3c03f1c90df991377ed1cf43fa734fd5d295
 DIST kig-20.08.1.tar.xz 3490284 BLAKE2B 86f9ab6743fb92fcc4ffda26d435df8f2478875b8065bf84eb724c9e6e59daee3dee9a1f247c1547cbf9cf9adde7be89d856376064d9f5f98def8624da38eddc SHA512 2fa0b0ebf88159d8df8cc4d02264680d2fbe81f7c6fd7a177ac6784a8c6348b00843d09a3ac88eab6f8a9817129fff9e57ab5aa906e1a34b1981687cdcfe3d9e
 EBUILD kig-20.04.3.ebuild 1720 BLAKE2B b0a48bb08473bbb7f43341ee8ea86908a994d82762b77a0996b3df8f65c14740651019d9f3882395bdaee99213b8e1e3f4fdc72f5e4cbe1a6c2741e8f4e59dbd SHA512 daf6fef631f30e2f79af6db5e6517cab96d2f4219ce89b083e3746086dfc22882828c2462c24e497c6036311e47c2e9ba48705a2cc70a6215d3461ecc92ac67f
 EBUILD kig-20.08.1.ebuild 1772 BLAKE2B b3c8d6fc3df5b22a64b6ffd6615be83eb561ffba2f8cba17f7de98e8d681d056bc622028aac5c85b003be1055e89d0bc6c9de3be47bac50b244a9e83030fb156 SHA512 e8e3879d20a484af5bd47bc1862668195b385136f5d60d1974faff2410286d5c77fb427f79690921b0c5dad9e9d2f5af47989eaf818bcd6e81d6c6238b4d1580
-MISC metadata.xml 413 BLAKE2B 5e95d76858bd4fcc87af9e0d4646b6b52458c2946c792eda4ad7dae5e85165cab5f3135b6659cf76548cb79694d73307706ae3c1b6f197b5e824bb81ce69a63d SHA512 0275eb140eb39e300efe6cb2998698034397e8e1770a94129d716fb48b910a65b6f23f86f347e12e3fe71634adee7de6350ae7de47892e93d5416668338686c9
+MISC metadata.xml 417 BLAKE2B e9b8762ae43f4e8e449b2a649d89d6e909bd34529bffaf6b0c4683a927b5b89486e7b94de5a34bebe5ceb580289b0ffbead4d3f8db19d0c79f95a93126b17f51 SHA512 9a87c6e27600a5bad58df8fc2de4696a6e2a81e1474cae08201e4861d7961537eba510463e3522ff0bf7a1bcdb77aa84804f0fb956e0d0cf096ffd8f523f1ace
diff --git a/kde-apps/kig/metadata.xml b/kde-apps/kig/metadata.xml
index dced816a5d5e..d6455ebcf839 100644
--- a/kde-apps/kig/metadata.xml
+++ b/kde-apps/kig/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<use>
-		<flag name="geogebra">Support files created by <pkg>sci-mathematics/geogebra</pkg></flag>
+		<flag name="geogebra">Support files created by <pkg>sci-mathematics/geogebra-bin</pkg></flag>
 		<flag name="scripting">Support Python scripting</flag>
 	</use>
 </pkgmetadata>
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>