From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9614015813A for ; Sun, 12 Jan 2025 15:50:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C6552E0837; Sun, 12 Jan 2025 15:50:58 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A5220E0837 for ; Sun, 12 Jan 2025 15:50:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BC3EE341B52 for ; Sun, 12 Jan 2025 15:50:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BE51F204B for ; Sun, 12 Jan 2025 15:50:54 +0000 (UTC) From: "Andreas Sturmlechner" 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" Message-ID: <1736697040.2ac1a3f2d2d9cae3cc5808bd52ee505681f33ebe.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-9999.ebuild X-VCS-Directories: app-office/kmymoney/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 2ac1a3f2d2d9cae3cc5808bd52ee505681f33ebe X-VCS-Branch: master Date: Sun, 12 Jan 2025 15:50:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ad6f66da-0a72-4ad1-bb9b-e928532d59ac X-Archives-Hash: 0dfd08dbb67e049ec4bc8ef9d19a7124 commit: 2ac1a3f2d2d9cae3cc5808bd52ee505681f33ebe Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jan 12 15:15:50 2025 +0000 Commit: Andreas Sturmlechner gentoo 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 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 }