commit:     76ba029240aef45cc30230d866775c12ddaf3476
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Jun 15 16:01:54 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Jun 15 18:23:02 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=76ba0292

[app-office/skrooge] Frameworks merged to master

Package-Manager: portage-2.2.20

 app-office/skrooge/skrooge-5.9999.ebuild | 89 --------------------------------
 app-office/skrooge/skrooge-9999.ebuild   | 78 ++++++++++++++++++++++------
 2 files changed, 61 insertions(+), 106 deletions(-)

diff --git a/app-office/skrooge/skrooge-5.9999.ebuild 
b/app-office/skrooge/skrooge-5.9999.ebuild
deleted file mode 100644
index 6c7e462..0000000
--- a/app-office/skrooge/skrooge-5.9999.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-EGIT_BRANCH="kf5"
-KDE_LINGUAS="bg bs ca ca@valencia cs da de el en_GB eo es et fi fr ga gl hu ia
-it ja ko lt mr ms nb nds nl pl pt pt_BR ro ru sk sv tr ug uk zh_CN zh_TW"
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="Personal finances manager, aiming at being simple and intuitive"
-HOMEPAGE="http://www.skrooge.org/";
-
-LICENSE="GPL-2"
-KEYWORDS=""
-IUSE="activities ofx"
-
-RDEPEND="
-       $(add_frameworks_dep karchive)
-       $(add_frameworks_dep kconfig)
-       $(add_frameworks_dep kconfigwidgets)
-       $(add_frameworks_dep kcoreaddons)
-       $(add_frameworks_dep kdbusaddons)
-       $(add_frameworks_dep kdelibs4support)
-       $(add_frameworks_dep kdesignerplugin)
-       $(add_frameworks_dep kguiaddons)
-       $(add_frameworks_dep ki18n)
-       $(add_frameworks_dep kiconthemes)
-       $(add_frameworks_dep kio)
-       $(add_frameworks_dep kitemviews)
-       $(add_frameworks_dep kjobwidgets)
-       $(add_frameworks_dep knewstuff)
-       $(add_frameworks_dep knotifications)
-       $(add_frameworks_dep knotifyconfig)
-       $(add_frameworks_dep kparts)
-       $(add_frameworks_dep kwallet)
-       $(add_frameworks_dep kwidgetsaddons)
-       $(add_frameworks_dep kwindowsystem)
-       $(add_frameworks_dep kxmlgui)
-       $(add_frameworks_dep plasma)
-       app-crypt/qca:2[qt5]
-       dev-db/sqlite:3
-       dev-libs/grantlee:5
-       dev-libs/libxslt
-       dev-libs/qjson
-       dev-qt/designer:5
-       dev-qt/qtconcurrent:5
-       dev-qt/qtdbus:5
-       dev-qt/qtdeclarative:5
-       dev-qt/qtgui:5
-       dev-qt/qtprintsupport:5
-       dev-qt/qtscript:5
-       dev-qt/qtsql:5
-       dev-qt/qtsvg:5
-       dev-qt/qtwebkit:5
-       dev-qt/qtwidgets:5
-       dev-qt/qtxml:5
-       x11-misc/shared-mime-info
-       activities? ( $(add_frameworks_dep kactivities) )
-       ofx? ( >=dev-libs/libofx-0.9.1 )
-"
-DEPEND="${RDEPEND}
-       dev-libs/boost
-"
-
-# upstream does not ship tests in releases
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-       RESTRICT="test"
-fi
-
-DOCS=( AUTHORS CHANGELOG README TODO )
-
-src_configure() {
-       local mycmakeargs=(
-               $(cmake-utils_use_find_package activities KF5Activities)
-               $(cmake-utils_use_find_package ofx LibOfx)
-       )
-
-       kde5_src_configure
-}
-
-src_test() {
-       local mycmakeargs=(
-               -DSKG_BUILD_TEST=ON
-       )
-       kde5_src_test
-}

diff --git a/app-office/skrooge/skrooge-9999.ebuild 
b/app-office/skrooge/skrooge-9999.ebuild
index 6057ea9..74ece56 100644
--- a/app-office/skrooge/skrooge-9999.ebuild
+++ b/app-office/skrooge/skrooge-9999.ebuild
@@ -4,31 +4,66 @@
 
 EAPI=5
 
-KDE_LINGUAS="ast bg bs ca ca@valencia cs da de el en_GB eo es et fi fr ga gl hu
-ia it ja ko lt mr ms nb nds nl pl pt pt_BR ro ru sk sv tr ug uk zh_CN zh_TW"
-KDE_HANDBOOK="optional"
-inherit kde4-base
+KDE_LINGUAS="bg bs ca ca@valencia cs da de el en_GB eo es et fi fr ga gl hu ia
+it ja ko lt mr ms nb nds nl pl pt pt_BR ro ru sk sv tr ug uk zh_CN zh_TW"
+KDE_HANDBOOK="true"
+inherit kde5
 
-DESCRIPTION="Personal finances manager for KDE4, aiming at being simple and 
intuitive"
+DESCRIPTION="Personal finances manager, aiming at being simple and intuitive"
 HOMEPAGE="http://www.skrooge.org/";
 
 LICENSE="GPL-2"
-SLOT="4"
 KEYWORDS=""
-IUSE="debug"
+IUSE="activities ofx"
 
-DEPEND="
-       $(add_kdebase_dep kactivities)
-       $(add_kdebase_dep kdepimlibs)
-       app-crypt/qca:2[qt4]
+RDEPEND="
+       $(add_frameworks_dep karchive)
+       $(add_frameworks_dep kcompletion)
+       $(add_frameworks_dep kconfig)
+       $(add_frameworks_dep kconfigwidgets)
+       $(add_frameworks_dep kcoreaddons)
+       $(add_frameworks_dep kdbusaddons)
+       $(add_frameworks_dep kdelibs4support)
+       $(add_frameworks_dep kdesignerplugin)
+       $(add_frameworks_dep kguiaddons)
+       $(add_frameworks_dep ki18n)
+       $(add_frameworks_dep kiconthemes)
+       $(add_frameworks_dep kio)
+       $(add_frameworks_dep kitemviews)
+       $(add_frameworks_dep kjobwidgets)
+       $(add_frameworks_dep knewstuff)
+       $(add_frameworks_dep knotifications)
+       $(add_frameworks_dep knotifyconfig)
+       $(add_frameworks_dep kparts)
+       $(add_frameworks_dep krunner)
+       $(add_frameworks_dep kwallet)
+       $(add_frameworks_dep kwidgetsaddons)
+       $(add_frameworks_dep kwindowsystem)
+       $(add_frameworks_dep kxmlgui)
+       app-crypt/qca:2[qt5]
        dev-db/sqlite:3
-       dev-libs/grantlee:0
-       >=dev-libs/libofx-0.9.1
+       dev-libs/grantlee:5
+       dev-libs/libxslt
        dev-libs/qjson
-       dev-qt/qtsql:4[sqlite]
+       dev-qt/designer:5
+       dev-qt/qtconcurrent:5
+       dev-qt/qtdbus:5
+       dev-qt/qtdeclarative:5
+       dev-qt/qtgui:5
+       dev-qt/qtnetwork:5
+       dev-qt/qtprintsupport:5
+       dev-qt/qtscript:5
+       dev-qt/qtsql:5
+       dev-qt/qtsvg:5
+       dev-qt/qtwebkit:5
+       dev-qt/qtwidgets:5
+       dev-qt/qtxml:5
+       x11-misc/shared-mime-info
+       activities? ( $(add_frameworks_dep kactivities) )
+       ofx? ( >=dev-libs/libofx-0.9.1 )
 "
-RDEPEND="${DEPEND}
-       $(add_kdeapps_dep kde-dev-scripts)
+DEPEND="${RDEPEND}
+       dev-libs/boost
 "
 
 # upstream does not ship tests in releases
@@ -38,9 +73,18 @@ fi
 
 DOCS=( AUTHORS CHANGELOG README TODO )
 
+src_configure() {
+       local mycmakeargs=(
+               $(cmake-utils_use_find_package activities KF5Activities)
+               $(cmake-utils_use_find_package ofx LibOfx)
+       )
+
+       kde5_src_configure
+}
+
 src_test() {
        local mycmakeargs=(
                -DSKG_BUILD_TEST=ON
        )
-       kde4-base_src_test
+       kde5_src_test
 }

Reply via email to