[gentoo-commits] proj/kde:master commit in: app-office/kmymoney/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     f988947a9600a9d4a9ae03ee1c5e62d98d05ee85
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 28 16:28:28 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 28 16:37:18 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f988947a

app-office/kmymoney: Drop IUSE=ofx, now unconditional

Upstream commit 487f8758987edb72e616a602706f100cafa877d8

Bug: https://bugs.gentoo.org/728236
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-office/kmymoney/kmymoney-5.1.9999.ebuild | 8 ++++----
 app-office/kmymoney/kmymoney-9999.ebuild     | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app-office/kmymoney/kmymoney-5.1.9999.ebuild b/app-office/kmymoney/kmymoney-5.1.9999.ebuild
index 6045861940..d74f9ccbd5 100644
--- a/app-office/kmymoney/kmymoney-5.1.9999.ebuild
+++ b/app-office/kmymoney/kmymoney-5.1.9999.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="5"
-IUSE="activities addressbook calendar hbci holidays ofx quotes webkit"
+IUSE="activities addressbook calendar hbci holidays quotes webkit"
 [[ ${KDE_BUILD_TYPE} = live ]] && IUSE+=" experimental"
 
 BDEPEND="virtual/pkgconfig"
@@ -32,6 +32,7 @@ COMMON_DEPEND="
 	dev-libs/gmp:0=[cxx]
 	dev-libs/kdiagram:5
 	dev-libs/libgpg-error
+	dev-libs/libofx:=
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtnetwork-${QTMIN}:5
@@ -72,7 +73,6 @@ COMMON_DEPEND="
 		>=sys-libs/gwenhywfar-5.1.2:=[qt5]
 	)
 	holidays? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
-	ofx? ( dev-libs/libofx )
 	webkit? (
 		>=dev-qt/qtwebkit-5.212.0_pre20180120:5
 		>=kde-frameworks/kdewebkit-${KFMIN}:5
@@ -98,6 +98,8 @@ pkg_setup() {
 
 src_configure() {
 	local mycmakeargs=(
+		-DENABLE_OFXIMPORTER=ON
+		-DENABLE_WEBOOB=OFF
 		-DUSE_QT_DESIGNER=OFF
 		$(cmake_use_find_package activities KF5Activities)
 		$(cmake_use_find_package addressbook KF5Akonadi)
@@ -106,9 +108,7 @@ src_configure() {
 		-DENABLE_LIBICAL=$(usex calendar)
 		-DENABLE_KBANKING=$(usex hbci)
 		$(cmake_use_find_package holidays KF5Holidays)
-		-DENABLE_OFXIMPORTER=$(usex ofx)
 		-DENABLE_WEBENGINE=$(usex !webkit)
-		-DENABLE_WEBOOB=OFF
 	)
 	[[ ${KDE_BUILD_TYPE} = live ]] &&
 		mycmakeargs+=( -DENABLE_UNFINISHEDFEATURES=$(usex experimental) )

diff --git a/app-office/kmymoney/kmymoney-9999.ebuild b/app-office/kmymoney/kmymoney-9999.ebuild
index ab6d25ea15..15611bdb25 100644
--- a/app-office/kmymoney/kmymoney-9999.ebuild
+++ b/app-office/kmymoney/kmymoney-9999.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="5"
-IUSE="activities addressbook calendar hbci holidays ofx quotes webkit"
+IUSE="activities addressbook calendar hbci holidays quotes webkit"
 [[ ${KDE_BUILD_TYPE} = live ]] && IUSE+=" experimental"
 
 BDEPEND="virtual/pkgconfig"
@@ -31,6 +31,7 @@ COMMON_DEPEND="
 	dev-libs/gmp:0=[cxx]
 	dev-libs/kdiagram:5
 	dev-libs/libgpg-error
+	dev-libs/libofx:=
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtnetwork-${QTMIN}:5
@@ -71,7 +72,6 @@ COMMON_DEPEND="
 		>=sys-libs/gwenhywfar-5.1.2:=[qt5]
 	)
 	holidays? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
-	ofx? ( dev-libs/libofx )
 	webkit? (
 		>=dev-qt/qtwebkit-5.212.0_pre20180120:5
 		>=kde-frameworks/kdewebkit-${KFMIN}:5
@@ -97,6 +97,8 @@ pkg_setup() {
 
 src_configure() {
 	local mycmakeargs=(
+		-DENABLE_OFXIMPORTER=ON
+		-DENABLE_WEBOOB=OFF
 		-DUSE_QT_DESIGNER=OFF
 		$(cmake_use_find_package activities KF5Activities)
 		$(cmake_use_find_package addressbook KF5Akonadi)
@@ -105,9 +107,7 @@ src_configure() {
 		-DENABLE_LIBICAL=$(usex calendar)
 		-DENABLE_KBANKING=$(usex hbci)
 		$(cmake_use_find_package holidays KF5Holidays)
-		-DENABLE_OFXIMPORTER=$(usex ofx)
 		-DENABLE_WEBENGINE=$(usex !webkit)
-		-DENABLE_WEBOOB=OFF
 	)
 	[[ ${KDE_BUILD_TYPE} = live ]] &&
 		mycmakeargs+=( -DENABLE_UNFINISHEDFEATURES=$(usex experimental) )