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 }
