Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: app-office/kmymoney/
Date: Sun, 28 Jun 2020 16:46:18
Message-Id: 1593362238.f988947a9600a9d4a9ae03ee1c5e62d98d05ee85.asturm@gentoo
1 commit: f988947a9600a9d4a9ae03ee1c5e62d98d05ee85
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jun 28 16:28:28 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Jun 28 16:37:18 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f988947a
7
8 app-office/kmymoney: Drop IUSE=ofx, now unconditional
9
10 Upstream commit 487f8758987edb72e616a602706f100cafa877d8
11
12 Bug: https://bugs.gentoo.org/728236
13 Package-Manager: Portage-2.3.103, Repoman-2.3.23
14 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
15
16 app-office/kmymoney/kmymoney-5.1.9999.ebuild | 8 ++++----
17 app-office/kmymoney/kmymoney-9999.ebuild | 8 ++++----
18 2 files changed, 8 insertions(+), 8 deletions(-)
19
20 diff --git a/app-office/kmymoney/kmymoney-5.1.9999.ebuild b/app-office/kmymoney/kmymoney-5.1.9999.ebuild
21 index 6045861940..d74f9ccbd5 100644
22 --- a/app-office/kmymoney/kmymoney-5.1.9999.ebuild
23 +++ b/app-office/kmymoney/kmymoney-5.1.9999.ebuild
24 @@ -22,7 +22,7 @@ fi
25
26 LICENSE="GPL-2"
27 SLOT="5"
28 -IUSE="activities addressbook calendar hbci holidays ofx quotes webkit"
29 +IUSE="activities addressbook calendar hbci holidays quotes webkit"
30 [[ ${KDE_BUILD_TYPE} = live ]] && IUSE+=" experimental"
31
32 BDEPEND="virtual/pkgconfig"
33 @@ -32,6 +32,7 @@ COMMON_DEPEND="
34 dev-libs/gmp:0=[cxx]
35 dev-libs/kdiagram:5
36 dev-libs/libgpg-error
37 + dev-libs/libofx:=
38 >=dev-qt/qtdbus-${QTMIN}:5
39 >=dev-qt/qtgui-${QTMIN}:5
40 >=dev-qt/qtnetwork-${QTMIN}:5
41 @@ -72,7 +73,6 @@ COMMON_DEPEND="
42 >=sys-libs/gwenhywfar-5.1.2:=[qt5]
43 )
44 holidays? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
45 - ofx? ( dev-libs/libofx )
46 webkit? (
47 >=dev-qt/qtwebkit-5.212.0_pre20180120:5
48 >=kde-frameworks/kdewebkit-${KFMIN}:5
49 @@ -98,6 +98,8 @@ pkg_setup() {
50
51 src_configure() {
52 local mycmakeargs=(
53 + -DENABLE_OFXIMPORTER=ON
54 + -DENABLE_WEBOOB=OFF
55 -DUSE_QT_DESIGNER=OFF
56 $(cmake_use_find_package activities KF5Activities)
57 $(cmake_use_find_package addressbook KF5Akonadi)
58 @@ -106,9 +108,7 @@ src_configure() {
59 -DENABLE_LIBICAL=$(usex calendar)
60 -DENABLE_KBANKING=$(usex hbci)
61 $(cmake_use_find_package holidays KF5Holidays)
62 - -DENABLE_OFXIMPORTER=$(usex ofx)
63 -DENABLE_WEBENGINE=$(usex !webkit)
64 - -DENABLE_WEBOOB=OFF
65 )
66 [[ ${KDE_BUILD_TYPE} = live ]] &&
67 mycmakeargs+=( -DENABLE_UNFINISHEDFEATURES=$(usex experimental) )
68
69 diff --git a/app-office/kmymoney/kmymoney-9999.ebuild b/app-office/kmymoney/kmymoney-9999.ebuild
70 index ab6d25ea15..15611bdb25 100644
71 --- a/app-office/kmymoney/kmymoney-9999.ebuild
72 +++ b/app-office/kmymoney/kmymoney-9999.ebuild
73 @@ -21,7 +21,7 @@ fi
74
75 LICENSE="GPL-2"
76 SLOT="5"
77 -IUSE="activities addressbook calendar hbci holidays ofx quotes webkit"
78 +IUSE="activities addressbook calendar hbci holidays quotes webkit"
79 [[ ${KDE_BUILD_TYPE} = live ]] && IUSE+=" experimental"
80
81 BDEPEND="virtual/pkgconfig"
82 @@ -31,6 +31,7 @@ COMMON_DEPEND="
83 dev-libs/gmp:0=[cxx]
84 dev-libs/kdiagram:5
85 dev-libs/libgpg-error
86 + dev-libs/libofx:=
87 >=dev-qt/qtdbus-${QTMIN}:5
88 >=dev-qt/qtgui-${QTMIN}:5
89 >=dev-qt/qtnetwork-${QTMIN}:5
90 @@ -71,7 +72,6 @@ COMMON_DEPEND="
91 >=sys-libs/gwenhywfar-5.1.2:=[qt5]
92 )
93 holidays? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
94 - ofx? ( dev-libs/libofx )
95 webkit? (
96 >=dev-qt/qtwebkit-5.212.0_pre20180120:5
97 >=kde-frameworks/kdewebkit-${KFMIN}:5
98 @@ -97,6 +97,8 @@ pkg_setup() {
99
100 src_configure() {
101 local mycmakeargs=(
102 + -DENABLE_OFXIMPORTER=ON
103 + -DENABLE_WEBOOB=OFF
104 -DUSE_QT_DESIGNER=OFF
105 $(cmake_use_find_package activities KF5Activities)
106 $(cmake_use_find_package addressbook KF5Akonadi)
107 @@ -105,9 +107,7 @@ src_configure() {
108 -DENABLE_LIBICAL=$(usex calendar)
109 -DENABLE_KBANKING=$(usex hbci)
110 $(cmake_use_find_package holidays KF5Holidays)
111 - -DENABLE_OFXIMPORTER=$(usex ofx)
112 -DENABLE_WEBENGINE=$(usex !webkit)
113 - -DENABLE_WEBOOB=OFF
114 )
115 [[ ${KDE_BUILD_TYPE} = live ]] &&
116 mycmakeargs+=( -DENABLE_UNFINISHEDFEATURES=$(usex experimental) )