gentoo resync : 15.12.2019

4 files changed, 70 insertions, 65 deletions

diff --git a/kde-apps/ksystemlog/Manifest b/kde-apps/ksystemlog/Manifest
index 6f90b62e4007..1825d6358081 100644
--- a/kde-apps/ksystemlog/Manifest
+++ b/kde-apps/ksystemlog/Manifest
@@ -1,5 +1,5 @@
-DIST ksystemlog-19.04.3.tar.xz 1922176 BLAKE2B b8feba3e3907e974a8690eca92d8959814cc67dcd7d95701ed3ec795499eb2305198ee3636b4cd2768c09fabda73a68448443b98ce4f6fc87228455a9159813a SHA512 13654dfc5844b5aaefe209f1bc96198e7552eb42445b2f34bf97e2804f088076f95ef8ea10fa3784f718803af72b5c6ec7833429d86d79b250f1bb732431b4b3
 DIST ksystemlog-19.08.3.tar.xz 1928428 BLAKE2B 77efcc19726a9af47a009317196d062fd78bf689618f8b9005fbf41b096e7f3ff76fc0451579163d69336fbfc2b3e9e6b9eea409a5933ed24adf82e5cfd29d6a SHA512 bc2f1f73a04b417579d12351d78a0c66a2814590cffaa191c3d5158e3f0819aa7a24bb69603b6883e4ea753944444fdd2986393c9c8ed83dca81408cd56a655d
-EBUILD ksystemlog-19.04.3.ebuild 1582 BLAKE2B 695fe6a4cca0b38fb8427e7ad45a31b10d481d547cc9b247241357db0f8a842d89980063c0ff0585e950e2a6bcac5b49d15a081ef4927df2dc92541c6eed6789 SHA512 be23a4585943f54666770800577dd11929f003ebe592b27affa1fd44c5f43a1fd6ac848a7eafd7266da5600835c0d8402ba148333902a38619efc1d0d94c1ac3
-EBUILD ksystemlog-19.08.3.ebuild 1751 BLAKE2B 7a4b9689205668b7125f6020c644381cc047a8af0e61dae5a4153b5795350d73370f3e57c1e0fe419831bb6857978882b8be0c004d062c109552ddf423054ac8 SHA512 2ec5702a840aa0f74ad714e3453dd918fae3b1e02da41cbaf2c9c8fc829be294d366d00b3e120a7dd63749e6b220866725fa0593ad9901cd357bfca4739df869
+DIST ksystemlog-19.12.0.tar.xz 1927480 BLAKE2B 708e918315bdac7ad9273d23485c641dcfa4df3f249c4680359d2ada5b3f63c65a59f52def26cd58520455cf92f5a04597c97a7d8db843e22074e9ce96a17905 SHA512 6648e1635e6bec0da9e91c5d2dda879fad9c99c0e2f48bd5273f227466669aef7d31d33652cd20ccdef2ea205b9921161c1d46f0c6385f9bd064a6bf20e78557
+EBUILD ksystemlog-19.08.3.ebuild 1748 BLAKE2B c227d0a27161818aafcb4dc5d51ae78149b9c8bf731317e4331ece98913803444e12b5a847e27ece1d552ac4aa0a769493d52c44c9715ca7ec294fa2a0c58b75 SHA512 8640e37870ef4034bfb78fb3d0a527a1e3d420d59fdf2c99bbf22f310af3fc0e8b082632679c2e73957491342b66677df1ea7d1d31bbd973887e65c4e2c8e08e
+EBUILD ksystemlog-19.12.0.ebuild 1753 BLAKE2B 4c2ac9b89efd3eed49bb3d7d2da035a0c9199d8c09eb4c5aab0afe8b9e05e09a562b0d4c093df19698620741bc846697446ebf512bee3d0215757b30e84914e3 SHA512 df64720a269f6cfaab65387a19fbd1da18525f5d9b9c3d92212448820283d3422d36abdd65f1d076087dc6d3f4b952f75c85a5e9bbd07980cf42e5ce26a13dbe
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksystemlog/ksystemlog-19.04.3.ebuild b/kde-apps/ksystemlog/ksystemlog-19.04.3.ebuild
deleted file mode 100644
index 4ec83ce775bf..000000000000
--- a/kde-apps/ksystemlog/ksystemlog-19.04.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="System log viewer by KDE"
-HOMEPAGE="https://kde.org/applications/system/ksystemlog/"
-KEYWORDS="amd64 arm64 x86"
-IUSE="systemd"
-
-# bug 378101
-RESTRICT+=" test"
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	systemd? ( sys-apps/systemd )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	kde5_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
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package systemd Journald)
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/ksystemlog/ksystemlog-19.08.3.ebuild b/kde-apps/ksystemlog/ksystemlog-19.08.3.ebuild
index ea0ec1797f1b..eda448fa7d9f 100644
--- a/kde-apps/ksystemlog/ksystemlog-19.08.3.ebuild
+++ b/kde-apps/ksystemlog/ksystemlog-19.08.3.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="System log viewer by KDE"
 HOMEPAGE="https://kde.org/applications/system/ksystemlog/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="systemd"
 
 # bug 378101
diff --git a/kde-apps/ksystemlog/ksystemlog-19.12.0.ebuild b/kde-apps/ksystemlog/ksystemlog-19.12.0.ebuild
new file mode 100644
index 000000000000..3ecf0122a78f
--- /dev/null
+++ b/kde-apps/ksystemlog/ksystemlog-19.12.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.63.0
+QTMIN=5.12.3
+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 ~x86"
+IUSE="systemd"
+
+# bug 378101
+RESTRICT+=" test"
+
+DEPEND="
+	>=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
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	systemd? ( sys-apps/systemd )
+"
+RDEPEND="${DEPEND}"
+
+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
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package systemd Journald)
+	)
+	ecm_src_configure
+}