gentoo resync : 22.04.2018

3 files changed, 97 insertions, 0 deletions

diff --git a/kde-apps/ksystemlog/Manifest b/kde-apps/ksystemlog/Manifest
index 5109539f87ca..e491fbdcd1ec 100644
--- a/kde-apps/ksystemlog/Manifest
+++ b/kde-apps/ksystemlog/Manifest
@@ -1,3 +1,6 @@
+AUX ksystemlog-18.04.0-qt-5.11.patch 831 BLAKE2B a607688e0bf621519ab9fbc15a18b2abe8330c6f44a2b206bb425bf650b535bd763ebd781e7373c9aef27824332149f1b5766b5c886a8664efc67a7bacf89e28 SHA512 1e5d1ec492ace0b996e9c4c4b4c622955810e37be414f2fbdb158bdca544c743fb57b568e2e8a96c1873569fc8a6d218ad28be38a9aff10404a377ba8bede3cf
 DIST ksystemlog-17.12.3.tar.xz 1782044 BLAKE2B 0679e1f79edf65dc99958932d1e60cf4e5979d02786a97b0f5181a819b289ceb3dd219b4678dd84537df4fabec0560a6cf112fd55adb1155da2060b826acdd39 SHA512 b9f1a56a4ec0c26cae5556f3454d69fb7f186762affe95008ee4403071a42d1c76cc2b8451fdd19b3d0302fb0f2b1e7c8e04f84b0efae6fda3ceac90d83d9b61
+DIST ksystemlog-18.04.0.tar.xz 1781444 BLAKE2B da505697b4dfb1924d30b94504f76b78a1048bfbeeffc48b26a9e6017fcda729c4b809f14ff35aa50292c3127b15d38f9998593aabcd28d929152e9f23de11ff SHA512 b23a748f3e1fb46a56f469cd9fd3fffa21c5614af1a96cab142d247545dc00f2c17c50495086c7e5694a7259e8ce6944f25e580a743143089b1332f8e1378e56
 EBUILD ksystemlog-17.12.3.ebuild 1564 BLAKE2B 3c90337a6c5caca3d546aeb611e8545be0cb9fc2d840bcb5bb1b41f837b7faaf1dfc8537ce60e3de21bec325173a5e968b3d55612b1d2173f2af69aa65f0fedd SHA512 ef1ae57fd6276bcc9bb529b2a142b3f83774f58fe93f727320c5ec8ca696d1b6d5ff8a2a8f7a7ff4268408516050f989c6467ed623075a84d6db26dbad12a77b
+EBUILD ksystemlog-18.04.0.ebuild 1612 BLAKE2B ac2e47c3a4cff00ea4f72800d6d54a25c87fb69fac2a96871d9513e64f3a53607304b0ff7807cdb1182a43d95db6279a73376563cde46f7d3a984d58ba04449d SHA512 f71e9445e7dfcf500ee7409945e7d9167547224b12fd30bde002189b8fef0e3dd732672a083f8195913ab862d3663559c83a0d34a17aeb569723e0659482eb35
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksystemlog/files/ksystemlog-18.04.0-qt-5.11.patch b/kde-apps/ksystemlog/files/ksystemlog-18.04.0-qt-5.11.patch
new file mode 100644
index 000000000000..efed562efe60
--- /dev/null
+++ b/kde-apps/ksystemlog/files/ksystemlog-18.04.0-qt-5.11.patch
@@ -0,0 +1,32 @@
+From 3ab2bd7564bcb9518892704e47634053875fac14 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 14 Apr 2018 01:18:05 +0200
+Subject: [PATCH] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
+
+---
+ src/lib/CMakeLists.txt | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
+index 5cabcba..30b97f0 100644
+--- a/src/lib/CMakeLists.txt
++++ b/src/lib/CMakeLists.txt
+@@ -49,7 +49,8 @@ add_dependencies(
+ 
+ target_link_libraries(ksystemlog_lib
+     ksystemlog_config
+-
++    Qt5::Widgets
++    Qt5::PrintSupport
+     KF5::I18n
+     KF5::Archive
+     KF5::ConfigWidgets
+@@ -58,5 +59,3 @@ target_link_libraries(ksystemlog_lib
+     KF5::KIOCore
+     KF5::Completion
+ )
+-
+-qt5_use_modules(ksystemlog_lib Widgets PrintSupport)
+-- 
+2.17.0
+
diff --git a/kde-apps/ksystemlog/ksystemlog-18.04.0.ebuild b/kde-apps/ksystemlog/ksystemlog-18.04.0.ebuild
new file mode 100644
index 000000000000..0c60ccb04012
--- /dev/null
+++ b/kde-apps/ksystemlog/ksystemlog-18.04.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="System log viewer by KDE"
+HOMEPAGE="https://www.kde.org/applications/system/ksystemlog/"
+KEYWORDS="~amd64 ~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}"
+
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
+
+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
+
+		# one test consistently fails, so comment it out for the moment
+		sed -e "s:systemAnalyzerTest:# dont run systemAnalyzerTest:g" -i ksystemlog/tests/CMakeLists.txt
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package systemd Journald)
+	)
+	kde5_src_configure
+}