From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1010943-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 6558E1382C5
for <garchives@archives.gentoo.org>; Mon, 19 Mar 2018 19:46:10 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 4BECEE087C;
Mon, 19 Mar 2018 19:46:09 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 14BD2E087C
for <gentoo-commits@lists.gentoo.org>; Mon, 19 Mar 2018 19:46:08 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id B4DC2335C0C
for <gentoo-commits@lists.gentoo.org>; Mon, 19 Mar 2018 19:46:06 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 085EE25A
for <gentoo-commits@lists.gentoo.org>; Mon, 19 Mar 2018 19:46:05 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org>
Message-ID: <1521488740.a91f9008b4d09bc96a53efc59ce7533d3fc6a296.asturm@gentoo>
Subject: [gentoo-commits] proj/kde:master commit in: app-office/kmymoney/
X-VCS-Repository: proj/kde
X-VCS-Files: app-office/kmymoney/kmymoney-5.0.9999.ebuild app-office/kmymoney/kmymoney-9999.ebuild
X-VCS-Directories: app-office/kmymoney/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: a91f9008b4d09bc96a53efc59ce7533d3fc6a296
X-VCS-Branch: master
Date: Mon, 19 Mar 2018 19:46:05 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 6ab01df1-f6b2-4efa-aae0-f975414f747d
X-Archives-Hash: 05825ad9aef7d682570d93ba4a0cc0eb
commit: a91f9008b4d09bc96a53efc59ce7533d3fc6a296
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 19 17:00:58 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 19 19:45:40 2018 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=a91f9008
app-office/kmymoney: Fix USE=weboob
Package-Manager: Portage-2.3.24, Repoman-2.3.6
app-office/kmymoney/kmymoney-5.0.9999.ebuild | 16 +++++++++++++---
app-office/kmymoney/kmymoney-9999.ebuild | 17 ++++++++++++++---
2 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/app-office/kmymoney/kmymoney-5.0.9999.ebuild b/app-office/kmymoney/kmymoney-5.0.9999.ebuild
index 5e06e63f04..c1782017e9 100644
--- a/app-office/kmymoney/kmymoney-5.0.9999.ebuild
+++ b/app-office/kmymoney/kmymoney-5.0.9999.ebuild
@@ -4,13 +4,15 @@
EAPI=6
EGIT_BRANCH="5.0"
+PYTHON_COMPAT=( python2_7 )
+
KDE_GCC_MINIMAL="6.4"
KDE_HANDBOOK="optional"
KDE_TEST="forceoptional"
QT_MINIMAL="5.9.3"
VIRTUALX_REQUIRED="test"
VIRTUALDBUS_TEST="true"
-inherit kde5
+inherit kde5 python-r1
DESCRIPTION="Personal finance manager based on KDE Frameworks"
HOMEPAGE="https://kmymoney.org"
@@ -22,6 +24,8 @@ LICENSE="GPL-2"
KEYWORDS=""
IUSE="activities addressbook calendar hbci holidays ofx quotes webkit weboob"
+REQUIRED_USE="weboob? ( ${PYTHON_REQUIRED_USE} )"
+
COMMON_DEPEND="
$(add_frameworks_dep karchive)
$(add_frameworks_dep kcmutils)
@@ -76,7 +80,8 @@ COMMON_DEPEND="
)
!webkit? ( $(add_qt_dep qtwebengine 'widgets') )
weboob? (
- $(add_frameworks_dep kross)
+ ${PYTHON_DEPS}
+ $(add_qt_dep qtconcurrent)
www-client/weboob
)
"
@@ -89,6 +94,11 @@ RDEPEND="${COMMON_DEPEND}
quotes? ( dev-perl/Finance-Quote )
"
+pkg_setup() {
+ use weboob && python-setup
+ kde5_pkg_setup
+}
+
src_configure() {
local mycmakeargs=(
-DUSE_QT_DESIGNER=OFF
@@ -102,7 +112,7 @@ src_configure() {
-DENABLE_OFXIMPORTER=$(usex ofx)
-DENABLE_WEBENGINE=$(usex !webkit)
-DENABLE_WEBOOB=$(usex weboob)
- $(cmake-utils_use_find_package weboob KF5Kross)
+ $(cmake-utils_use_find_package weboob PythonLibs)
)
kde5_src_configure
}
diff --git a/app-office/kmymoney/kmymoney-9999.ebuild b/app-office/kmymoney/kmymoney-9999.ebuild
index 1fc5b1e56d..c1782017e9 100644
--- a/app-office/kmymoney/kmymoney-9999.ebuild
+++ b/app-office/kmymoney/kmymoney-9999.ebuild
@@ -3,13 +3,16 @@
EAPI=6
+EGIT_BRANCH="5.0"
+PYTHON_COMPAT=( python2_7 )
+
KDE_GCC_MINIMAL="6.4"
KDE_HANDBOOK="optional"
KDE_TEST="forceoptional"
QT_MINIMAL="5.9.3"
VIRTUALX_REQUIRED="test"
VIRTUALDBUS_TEST="true"
-inherit kde5
+inherit kde5 python-r1
DESCRIPTION="Personal finance manager based on KDE Frameworks"
HOMEPAGE="https://kmymoney.org"
@@ -21,6 +24,8 @@ LICENSE="GPL-2"
KEYWORDS=""
IUSE="activities addressbook calendar hbci holidays ofx quotes webkit weboob"
+REQUIRED_USE="weboob? ( ${PYTHON_REQUIRED_USE} )"
+
COMMON_DEPEND="
$(add_frameworks_dep karchive)
$(add_frameworks_dep kcmutils)
@@ -75,7 +80,8 @@ COMMON_DEPEND="
)
!webkit? ( $(add_qt_dep qtwebengine 'widgets') )
weboob? (
- $(add_frameworks_dep kross)
+ ${PYTHON_DEPS}
+ $(add_qt_dep qtconcurrent)
www-client/weboob
)
"
@@ -88,6 +94,11 @@ RDEPEND="${COMMON_DEPEND}
quotes? ( dev-perl/Finance-Quote )
"
+pkg_setup() {
+ use weboob && python-setup
+ kde5_pkg_setup
+}
+
src_configure() {
local mycmakeargs=(
-DUSE_QT_DESIGNER=OFF
@@ -101,7 +112,7 @@ src_configure() {
-DENABLE_OFXIMPORTER=$(usex ofx)
-DENABLE_WEBENGINE=$(usex !webkit)
-DENABLE_WEBOOB=$(usex weboob)
- $(cmake-utils_use_find_package weboob KF5Kross)
+ $(cmake-utils_use_find_package weboob PythonLibs)
)
kde5_src_configure
}