gentoo resync : 25.11.2020

3 files changed, 6 insertions, 72 deletions

diff --git a/kde-apps/ksystemlog/Manifest b/kde-apps/ksystemlog/Manifest
index 1b7e0248dff8..1bf9226f8d6a 100644
--- a/kde-apps/ksystemlog/Manifest
+++ b/kde-apps/ksystemlog/Manifest
@@ -1,5 +1,3 @@
-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-r1.ebuild 1630 BLAKE2B 3c76a3d14d07553307d9779c2bf0b84b01a846a7e843a6cc62dc6d34f81dbf534891e97b8eb6bde4238914c289c19196a78879afc4c20cf49ee4e57249c36f29 SHA512 de840d6f57c8e3fff9964cbd7c459d1f7caf982e4284ae482ba9039a0cefdeadc11a63eb2c389db30cc182b39f43c5d15a6c81e529348adc4a9525f5f38388dd
-EBUILD ksystemlog-20.08.1-r1.ebuild 1546 BLAKE2B af9b4d29f75fecb5463794966b37fc5916af5c58656d7cd2606121eaa5db6f32ee67e336235fdb17bba76faf17da6dd63167212cfa5d5054c015d09107685773 SHA512 d011c92e5616b59641624789b05a030c4cf162b76eae1cef988331cb2b2862985e6ad6a1a53700890b89de3feb7a74dac648d5f1cbd5ce1ce1c9879b03e29c8b
+DIST ksystemlog-20.08.3.tar.xz 1936020 BLAKE2B 3d1ab5dee63dabf2219705f9c24afd3f1cba9b4e2b43d7f0344fd2d64354bb32e39aeb142ef09266bfc4f7382e048c1f27c7ca560e310d3cb11c56f80e51279f SHA512 8b5d3e787e17470caa8df1b616fa944efc1216570acdfa8266c0a25921f90c6205ba4f2aeed42b1164c46e069a6a4607949b3a3c4d15531b8cf050eebceace0b
+EBUILD ksystemlog-20.08.3.ebuild 1523 BLAKE2B 7f3bd70c18f49cf1a0fd227b4d71fcf8584d5d942c8635ee14ec5157d1f8c6321e979e61d488420a527de6845befb2a4bdc4a680bf01fe0a4486807bc24e8dd7 SHA512 c961a47adc69fdf6ad9d4ddf267ab8522d1083d0b51f4425348bdff07542abcb31feffa40fb332b5e5859b7ffc8af4be8cfe60d79e00a4f842296ed91d55b33b
 MISC metadata.xml 357 BLAKE2B 2004a9f41fec27cb3e4f75c4248fbc4b46a4ab7c52f2d23fbcaa3085e1580b0dfe9ad9980c2b7af0670a7b56860111235fbc21298a2647d5bafa0d2be0bf95c0 SHA512 ba2d8f62d75eee5e8edf3368ad54c0d4b347b92279c2de5a4d326536bf670c82e419490a3972731b698bff84ff10908c939ba7a416f4ce4de335eb914df4a701
diff --git a/kde-apps/ksystemlog/ksystemlog-20.04.3-r1.ebuild b/kde-apps/ksystemlog/ksystemlog-20.04.3-r1.ebuild
deleted file mode 100644
index 5578b9e66917..000000000000
--- a/kde-apps/ksystemlog/ksystemlog-20.04.3-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.70.0
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="System log viewer by KDE"
-HOMEPAGE="https://kde.org/applications/system/org.kde.ksystemlog"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="kdesu systemd"
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	systemd? ( sys-apps/systemd )
-"
-RDEPEND="${DEPEND}
-	kdesu? ( kde-plasma/kde-cli-tools[kdesu] )
-"
-
-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/ksystemlog-20.08.1-r1.ebuild b/kde-apps/ksystemlog/ksystemlog-20.08.3.ebuild
index 421207a4525c..edde82dbf5a7 100644
--- a/kde-apps/ksystemlog/ksystemlog-20.08.1-r1.ebuild
+++ b/kde-apps/ksystemlog/ksystemlog-20.08.3.ebuild
@@ -5,17 +5,17 @@ EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
-KFMIN=5.72.0
-QTMIN=5.14.2
+KFMIN=5.74.0
+QTMIN=5.15.1
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="System log viewer by KDE"
-HOMEPAGE="https://kde.org/applications/system/org.kde.ksystemlog"
+HOMEPAGE="https://apps.kde.org/en/ksystemlog"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="kdesu systemd"
 
 DEPEND="