commit: fc5574f4b5907bdab5485f3e8c8b8a10bad78d95 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> AuthorDate: Wed Oct 14 22:48:57 2015 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Thu Oct 15 08:14:24 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=fc5574f4
kde-apps/ksystemlog: Frameworks merged to master Package-Manager: portage-2.2.20.1 kde-apps/ksystemlog/ksystemlog-5.9999.ebuild | 55 ---------------------------- kde-apps/ksystemlog/ksystemlog-9999.ebuild | 43 +++++++++++++++++++--- 2 files changed, 37 insertions(+), 61 deletions(-) diff --git a/kde-apps/ksystemlog/ksystemlog-5.9999.ebuild b/kde-apps/ksystemlog/ksystemlog-5.9999.ebuild deleted file mode 100644 index 053fc2b..0000000 --- a/kde-apps/ksystemlog/ksystemlog-5.9999.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -KDE_HANDBOOK=true -KDE_TEST=true -VIRTUALX_REQUIRED=test -EGIT_BRANCH="frameworks" -inherit kde5 - -DESCRIPTION="System log viewer by KDE" -HOMEPAGE="https://www.kde.org/applications/system/ksystemlog/"; -KEYWORDS="" -IUSE="" - -# 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) - dev-qt/qtgui:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 -" - -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 - - # 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 -} diff --git a/kde-apps/ksystemlog/ksystemlog-9999.ebuild b/kde-apps/ksystemlog/ksystemlog-9999.ebuild index fa0fa39..56666f7 100644 --- a/kde-apps/ksystemlog/ksystemlog-9999.ebuild +++ b/kde-apps/ksystemlog/ksystemlog-9999.ebuild @@ -4,20 +4,44 @@ EAPI=5 -KDE_HANDBOOK="optional" +KDE_DOXYGEN=true +KDE_HANDBOOK=true +KDE_TEST=true VIRTUALX_REQUIRED=test -inherit kde4-base +inherit kde5 -DESCRIPTION="KDE system log viewer" +DESCRIPTION="System log viewer by KDE" HOMEPAGE="https://www.kde.org/applications/system/ksystemlog/"; KEYWORDS="" -IUSE="debug test" +IUSE="systemd" -RESTRICT=test # 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) + dev-qt/qtgui:5 + dev-qt/qtprintsupport:5 + dev-qt/qtwidgets:5 + systemd? ( sys-apps/systemd ) +" + +RDEPEND="${DEPEND}" src_prepare() { - kde4-base_src_prepare + kde5_src_prepare if use test; then # beat this stupid test into shape: the test files contain no year, so @@ -30,3 +54,10 @@ src_prepare() { 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 +}
