public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: app-office/kmymoney/
Date: Sun, 12 Jan 2025 15:50:54 +0000 (UTC)	[thread overview]
Message-ID: <1736697040.2ac1a3f2d2d9cae3cc5808bd52ee505681f33ebe.asturm@gentoo> (raw)

commit:     2ac1a3f2d2d9cae3cc5808bd52ee505681f33ebe
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 12 15:15:50 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 12 15:50:40 2025 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=2ac1a3f2

app-office/kmymoney: Port to KF6

It's in git master, although pending further work before officially supported
by some future release.

See also:
https://invent.kde.org/office/kmymoney/-/issues/49

Upstream commits:
27106a64bf2233ad83c28f11cd562b062a792e24
fe9c9c3748286a73e3e83f274ecb9ea4b1375757

Bug: https://bugs.gentoo.org/947339
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-office/kmymoney/kmymoney-9999.ebuild | 126 +++++++++++++++----------------
 1 file changed, 63 insertions(+), 63 deletions(-)

diff --git a/app-office/kmymoney/kmymoney-9999.ebuild b/app-office/kmymoney/kmymoney-9999.ebuild
index d522eee525..bc00b148e8 100644
--- a/app-office/kmymoney/kmymoney-9999.ebuild
+++ b/app-office/kmymoney/kmymoney-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 ECM_HANDBOOK="optional"
 ECM_TEST="forceoptional"
-KFMIN=5.115.0
-QTMIN=5.15.12
+KFMIN=6.5.0
+QTMIN=6.7.2
 VIRTUALDBUS_TEST="true"
 inherit ecm kde.org optfeature
 
@@ -19,62 +19,59 @@ if [[ ${KDE_BUILD_TYPE} = release ]]; then
 fi
 
 LICENSE="GPL-2"
-SLOT="5"
-IUSE="activities calendar hbci holidays" # addressbook
+SLOT="0"
+IUSE="activities calendar holidays sql sqlcipher"
 [[ ${KDE_BUILD_TYPE} = live ]] && IUSE+=" experimental"
 
-# 	addressbook? (
-# 		>=kde-apps/akonadi-23.04:5
-# 		>=kde-apps/kidentitymanagement-23.04:5
-# 		>=kde-frameworks/kcontacts-${KFMIN}:5
+REQUIRED_USE="sqlcipher? ( sql )"
+
+# IUSE="hbci" # aqbanking, gwenhywfar not yet ported to Qt6
+# 	hbci? (
+# 		>=dev-qt/qtdeclarative-${QTMIN}:6
+# 		>=net-libs/aqbanking-6.5.0
+# 		>=sys-libs/gwenhywfar-5.10.1:=[qt6(+)]
 # 	)
-RDEPEND="
-	>=app-crypt/gpgme-1.7.1-r1:=[cxx]
-	>=app-office/libalkimia-7.0.0:=
-	dev-db/sqlcipher
+COMMON_DEPEND="
+	>=app-crypt/gpgme-1.23.1-r1:=[cxx,qt6(+)]
+	=app-office/libalkimia-9999*:=
 	dev-libs/gmp:0=[cxx(+)]
-	dev-libs/kdiagram:5
+	dev-libs/kdiagram:6
 	dev-libs/libgpg-error
 	dev-libs/libofx:=
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	activities? ( >=kde-plasma/plasma-activities-${KFMIN}:5 )
+	>=dev-libs/qtkeychain-0.14.2:=[qt6(+)]
+	>=dev-qt/qt5compat-${QTMIN}:6
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,sql?,widgets,xml]
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/kitemviews-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/sonnet-${KFMIN}:6
+	activities? ( kde-plasma/plasma-activities:6 )
 	calendar? ( dev-libs/libical:= )
-	hbci? (
-		>=dev-qt/qtdeclarative-${QTMIN}:5
-		>=net-libs/aqbanking-6.2.5
-		>=sys-libs/gwenhywfar-5.4.1:=[qt5]
-	)
-	holidays? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
+	holidays? ( >=kde-frameworks/kholidays-${KFMIN}:6 )
+	sql? ( >=dev-qt/qtbase-${QTMIN}:6[sqlite] )
+	sqlcipher? ( dev-db/sqlcipher )
 "
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
 	dev-libs/boost
 "
+RDEPEND="${COMMON_DEPEND}
+	!${CATEGORY}/${PN}:5
+"
 BDEPEND="virtual/pkgconfig"
 
 pkg_setup() {
@@ -86,21 +83,30 @@ pkg_setup() {
 	fi
 }
 
+src_prepare() {
+	ecm_src_prepare
+
+	sed -e "/find_program.*CCACHE_PROGRAM/s/^/# /" \
+		-e "/if.*CCACHE_PROGRAM/s/CCACHE_PROGRAM/0/" \
+		-i CMakeLists.txt # no, no no.
+}
+
 src_configure() {
 	local mycmakeargs=(
-		-DENABLE_OFXIMPORTER=ON
+		-DBUILD_WITH_QT6=ON # high level CMake fix
+		-DBUILD_WITH_QT6_CONFIRMED=ON # I have no words ...
 		-DENABLE_WOOB=OFF # ported to Py3; not yet re-added in Gentoo
 		-DUSE_QT_DESIGNER=OFF
-		$(cmake_use_find_package activities KF5Activities)
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF5Contacts=ON # $(usex addressbook)
-		-DCMAKE_DISABLE_FIND_PACKAGE_KPim5Akonadi=ON # $(usex addressbook)
-		-DCMAKE_DISABLE_FIND_PACKAGE_KPim5IdentityManagement=ON # $(usex addressbook)
+		$(cmake_use_find_package activities PlasmaActivities)
 		-DENABLE_LIBICAL=$(usex calendar)
-		-DENABLE_KBANKING=$(usex hbci)
-		$(cmake_use_find_package holidays KF5Holidays)
+# 		-DENABLE_KBANKING=$(usex hbci)
+		$(cmake_use_find_package holidays KF6Holidays)
+		-DENABLE_SQLSTORAGE=$(usex sql)
+		$(cmake_use_find_package sql Qt6Sql)
+		-DENABLE_SQLCIPHER=$(usex sqlcipher)
 	)
 	[[ ${KDE_BUILD_TYPE} = live ]] &&
-		mycmakeargs+=( -DENABLE_UNFINISHEDFEATURES=$(usex experimental) )
+		mycmakeargs+=( -DENABLE_COSTCENTER=$(usex experimental) )
 
 	ecm_src_configure
 }
@@ -118,11 +124,5 @@ pkg_postinst() {
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
 		optfeature "more options for online stock quote retrieval" dev-perl/Finance-Quote
 	fi
-	if has_version "app-office/kmymoney[quotes]"; then
-		elog "Please note: IUSE=quotes flag is gone in ${PN}-5.1.1. ${PN} still"
-		elog "does online stock quote retrieval without it, but dev-perl/Finance-Quote"
-		elog "may provide additional sources. To keep the functionality, run:"
-		elog "  emerge --noreplace dev-perl/Finance-Quote"
-	fi
 	ecm_pkg_postinst
 }


             reply	other threads:[~2025-01-12 15:50 UTC|newest]

Thread overview: 73+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-01-12 15:50 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-03-26 20:30 [gentoo-commits] proj/kde:master commit in: app-office/kmymoney/ Andreas Sturmlechner
2025-03-26 20:30 Andreas Sturmlechner
2025-01-12 15:50 Andreas Sturmlechner
2025-01-12 15:50 Andreas Sturmlechner
2025-01-12 15:50 Andreas Sturmlechner
2024-11-23 13:48 Andreas Sturmlechner
2024-10-21 19:07 Andreas Sturmlechner
2023-09-16 15:04 Andreas Sturmlechner
2023-09-16 15:04 Andreas Sturmlechner
2022-07-09 12:52 Andreas Sturmlechner
2022-02-17 19:00 Sam James
2021-06-20 18:46 Andreas Sturmlechner
2021-04-15 22:32 Andreas Sturmlechner
2021-04-11 20:03 Andreas Sturmlechner
2021-04-04 19:21 Andreas Sturmlechner
2020-12-25 21:51 Andreas Sturmlechner
2020-12-22 11:10 Andreas Sturmlechner
2020-09-17 20:07 Andreas Sturmlechner
2020-08-09  9:45 Andreas Sturmlechner
2020-08-09  9:45 Andreas Sturmlechner
2020-06-28 16:46 Andreas Sturmlechner
2020-06-28 16:46 Andreas Sturmlechner
2020-06-05 23:25 Andreas Sturmlechner
2020-06-05 23:25 Andreas Sturmlechner
2020-06-05 23:25 Andreas Sturmlechner
2020-03-26 21:57 Andreas Sturmlechner
2020-02-09 18:06 Andreas Sturmlechner
2020-01-26 22:23 Andreas Sturmlechner
2020-01-26 22:21 Andreas Sturmlechner
2020-01-26 21:16 Andreas Sturmlechner
2020-01-19 22:12 Andreas Sturmlechner
2020-01-15 19:56 Andreas Sturmlechner
2019-11-13  2:00 Andreas Sturmlechner
2019-10-28 22:52 Andreas Sturmlechner
2019-09-18 18:15 Andreas Sturmlechner
2019-08-25 15:58 Andreas Sturmlechner
2019-08-22 16:43 Andreas Sturmlechner
2019-08-22 16:39 Andreas Sturmlechner
2019-08-22 16:39 Andreas Sturmlechner
2019-06-05 19:06 Andreas Sturmlechner
2019-01-26 20:29 Andreas Sturmlechner
2018-03-30 20:09 Andreas Sturmlechner
2018-03-22 17:09 Andreas Sturmlechner
2018-03-22 12:30 Andreas Sturmlechner
2018-03-19 19:46 Andreas Sturmlechner
2018-03-12  3:00 Michael Palimaka
2018-01-07 18:30 Andreas Sturmlechner
2017-12-31 21:40 Andreas Sturmlechner
2017-12-31 18:01 Andreas Sturmlechner
2017-10-14 16:01 Andreas Sturmlechner
2017-10-08  8:10 Johannes Huber
2017-08-26 23:16 Andreas Sturmlechner
2017-08-08 23:49 Andreas Sturmlechner
2017-08-02 19:56 Andreas Sturmlechner
2016-12-23 10:11 Johannes Huber
2016-11-12 13:23 Michael Palimaka
2016-11-12 13:23 Michael Palimaka
2016-11-12 13:23 Michael Palimaka
2016-08-07 16:27 Michael Palimaka
2016-03-22 12:33 Johannes Huber
2016-03-08 14:41 Michael Palimaka
2015-12-02 11:03 Michael Palimaka
2015-10-14 12:51 Michael Palimaka
2015-05-15 17:08 Michael Palimaka
2014-11-27  7:53 Michael Palimaka
2014-06-22 18:04 Michael Palimaka
2013-10-17 18:51 Johannes Huber
2013-03-03 16:14 Michael Palimaka
2013-02-02 15:47 Michael Palimaka
2012-05-08 11:04 Johannes Huber
2012-05-07 12:42 Johannes Huber
2012-05-07 12:42 Johannes Huber

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1736697040.2ac1a3f2d2d9cae3cc5808bd52ee505681f33ebe.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox