commit:     e89a583378434c2e961ecb2ca355e24da4ac5170
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Oct  8 21:31:35 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Oct  9 14:56:02 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e89a5833

app-office/skrooge: Add USE=designer,kde; KDE_HANDBOOK=optional

QT_MINIMAL=5.7.0 allows to drop kdelibs4support and make the KDE_HANDBOOK
change.

Package-Manager: portage-2.3.0

 app-office/skrooge/metadata.xml        |  1 +
 app-office/skrooge/skrooge-9999.ebuild | 20 +++++++++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/app-office/skrooge/metadata.xml b/app-office/skrooge/metadata.xml
index fd15ec3..330eaf6 100644
--- a/app-office/skrooge/metadata.xml
+++ b/app-office/skrooge/metadata.xml
@@ -8,5 +8,6 @@
        <use>
                <flag name="activities">Enable kactivities support</flag>
                <flag name="crypt">Enable encryption using 
<pkg>dev-db/sqlcipher</pkg></flag>
+               <flag name="designer">Build plugins for 
<pkg>dev-qt/designer</pkg></flag>
        </use>
 </pkgmetadata>

diff --git a/app-office/skrooge/skrooge-9999.ebuild 
b/app-office/skrooge/skrooge-9999.ebuild
index 81fd308..2ff9248 100644
--- a/app-office/skrooge/skrooge-9999.ebuild
+++ b/app-office/skrooge/skrooge-9999.ebuild
@@ -5,8 +5,9 @@
 EAPI=6
 
 KDE_GCC_MINIMAL="4.9"
-KDE_HANDBOOK="forceoptional"
+KDE_HANDBOOK="optional"
 KDE_TEST="forceoptional"
+QT_MINIMAL="5.7.0"
 VIRTUALX_REQUIRED="test"
 inherit kde5
 
@@ -16,7 +17,7 @@ HOMEPAGE="http://www.skrooge.org/";
 
 LICENSE="GPL-2"
 KEYWORDS=""
-IUSE="activities crypt ofx"
+IUSE="activities crypt designer kde ofx"
 
 COMMON_DEPEND="
        $(add_frameworks_dep karchive)
@@ -25,7 +26,6 @@ COMMON_DEPEND="
        $(add_frameworks_dep kconfigwidgets)
        $(add_frameworks_dep kcoreaddons)
        $(add_frameworks_dep kdbusaddons)
-       $(add_frameworks_dep kdelibs4support)
        $(add_frameworks_dep ki18n)
        $(add_frameworks_dep kiconthemes)
        $(add_frameworks_dep kio)
@@ -34,7 +34,6 @@ COMMON_DEPEND="
        $(add_frameworks_dep knotifications)
        $(add_frameworks_dep knotifyconfig)
        $(add_frameworks_dep kparts)
-       $(add_frameworks_dep krunner)
        $(add_frameworks_dep kservice)
        $(add_frameworks_dep ktextwidgets)
        $(add_frameworks_dep kwallet)
@@ -56,24 +55,29 @@ COMMON_DEPEND="
        activities? ( $(add_frameworks_dep kactivities) )
        crypt? ( dev-db/sqlcipher )
        !crypt? ( dev-db/sqlite:3 )
+       kde? ( $(add_frameworks_dep krunner) )
        ofx? ( >=dev-libs/libofx-0.9.1 )
 "
 DEPEND="${COMMON_DEPEND}
-       $(add_frameworks_dep kdesignerplugin)
        $(add_frameworks_dep kguiaddons)
        $(add_frameworks_dep kjobwidgets)
        $(add_frameworks_dep kwindowsystem)
-       $(add_qt_dep designer)
        dev-libs/libxslt
        virtual/pkgconfig
        x11-misc/shared-mime-info
+       designer? (
+               $(add_frameworks_dep kdesignerplugin)
+               $(add_qt_dep designer)
+       )
 "
 RDEPEND="${COMMON_DEPEND}
        !app-office/skrooge:4
 "
 
+REQUIRED_USE="test? ( designer )"
+
 # hangs + installs files
-RESTRICT="test"
+RESTRICT+=" test"
 
 DOCS=( AUTHORS CHANGELOG README TODO )
 
@@ -81,7 +85,9 @@ src_configure() {
        local mycmakeargs=(
                -DSKG_BUILD_TEST=$(usex test)
                -DSKG_CIPHER=$(usex crypt)
+               -DSKG_DESIGNER=$(usex designer)
                $(cmake-utils_use_find_package activities KF5Activities)
+               $(cmake-utils_use_find_package kde KF5Runner)
                $(cmake-utils_use_find_package ofx LibOfx)
        )
 

Reply via email to