From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 991261393F1 for ; Thu, 17 Sep 2015 08:36:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 165E421C008; Thu, 17 Sep 2015 08:36:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9EAD621C008 for ; Thu, 17 Sep 2015 08:36:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9AC8D340784 for ; Thu, 17 Sep 2015 08:36:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 03FE6178 for ; Thu, 17 Sep 2015 08:36:40 +0000 (UTC) From: "Manuel Rüger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Manuel Rüger" Message-ID: <1442478980.002688e3ad55158c839784b490dee69977fbf09d.mrueg@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: app-office/skrooge/ X-VCS-Repository: proj/kde X-VCS-Files: app-office/skrooge/metadata.xml app-office/skrooge/skrooge-9999.ebuild X-VCS-Directories: app-office/skrooge/ X-VCS-Committer: mrueg X-VCS-Committer-Name: Manuel Rüger X-VCS-Revision: 002688e3ad55158c839784b490dee69977fbf09d X-VCS-Branch: master Date: Thu, 17 Sep 2015 08:36:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: cbe1b144-ec3f-448e-8578-713df983455e X-Archives-Hash: 73532c17087f2eb26aa4b475d23afbf1 commit: 002688e3ad55158c839784b490dee69977fbf09d Author: Andreas Sturmlechner gmail com> AuthorDate: Sat Aug 29 19:35:50 2015 +0000 Commit: Manuel Rüger gentoo 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 kde Enable kactivities support + Enable encryption using dev-db/sqlcipher 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) )