commit: 002688e3ad55158c839784b490dee69977fbf09d
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Aug 29 19:35:50 2015 +0000
Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Thu Sep 17 08:36:20 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=002688e3
app-office/skrooge: Add USE=crypt, fix DEPENDs, add gcc check
Package does not build with <gcc-4.9
Package-Manager: portage-2.2.20.1
app-office/skrooge/metadata.xml | 1 +
app-office/skrooge/skrooge-9999.ebuild | 43 +++++++++++++++++++++++-----------
2 files changed, 30 insertions(+), 14 deletions(-)
diff --git a/app-office/skrooge/metadata.xml b/app-office/skrooge/metadata.xml
index 65184d3..4febf40 100644
--- a/app-office/skrooge/metadata.xml
+++ b/app-office/skrooge/metadata.xml
@@ -4,5 +4,6 @@
<herd>kde</herd>
<use>
<flag name="activities">Enable kactivities support</flag>
+ <flag name="crypt">Enable encryption using
<pkg>dev-db/sqlcipher</pkg></flag>
</use>
</pkgmetadata>
diff --git a/app-office/skrooge/skrooge-9999.ebuild
b/app-office/skrooge/skrooge-9999.ebuild
index 1f9cd36..3fb08e6 100644
--- a/app-office/skrooge/skrooge-9999.ebuild
+++ b/app-office/skrooge/skrooge-9999.ebuild
@@ -15,9 +15,9 @@ HOMEPAGE="http://www.skrooge.org/";
LICENSE="GPL-2"
KEYWORDS=""
-IUSE="activities ofx"
+IUSE="activities crypt ofx"
-RDEPEND="
+COMMON_DEPEND="
$(add_frameworks_dep karchive)
$(add_frameworks_dep kcompletion)
$(add_frameworks_dep kconfig)
@@ -25,33 +25,26 @@ RDEPEND="
$(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 kservice)
+ $(add_frameworks_dep ktextwidgets)
$(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: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/qtnetwork:5
dev-qt/qtprintsupport:5
dev-qt/qtscript:5
dev-qt/qtsql:5
@@ -59,13 +52,26 @@ RDEPEND="
dev-qt/qtwebkit:5
dev-qt/qtwidgets:5
dev-qt/qtxml:5
- x11-misc/shared-mime-info
activities? ( $(add_frameworks_dep kactivities) )
+ crypt? ( dev-db/sqlcipher )
+ !crypt? ( dev-db/sqlite:3 )
ofx? ( >=dev-libs/libofx-0.9.1 )
- !app-office/skrooge:4
"
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
+ $(add_frameworks_dep kdesignerplugin)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep kwindowsystem)
dev-libs/boost
+ dev-libs/libxslt
+ dev-libs/qjson
+ dev-qt/designer:5
+ dev-qt/qtnetwork:5
+ virtual/pkgconfig
+ x11-misc/shared-mime-info
+"
+RDEPEND="${COMMON_DEPEND}
+ !app-office/skrooge:4
"
# upstream does not ship tests in releases
@@ -75,8 +81,17 @@ fi
DOCS=( AUTHORS CHANGELOG README TODO )
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != binary && $(tc-getCC) == *gcc* ]]; then
+ if [[ $(gcc-major-version) -lt 4 || $(gcc-major-version) == 4
&& $(gcc-minor-version) -lt 9 ]] ; then
+ die 'The active compiler needs to be gcc 4.9 (or newer)'
+ fi
+ fi
+}
+
src_configure() {
local mycmakeargs=(
+ -DSKG_CIPHER=$(usex crypt)
$(cmake-utils_use_find_package activities KF5Activities)
$(cmake-utils_use_find_package ofx LibOfx)
)
