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 14DE815813A for ; Sun, 12 Jan 2025 15:51:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ED60AE0839; Sun, 12 Jan 2025 15:50:58 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 D7326E0839 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 29CC6342FB5 for ; Sun, 12 Jan 2025 15:50:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 95A152041 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.1d6cb6f3704de0798c36c40c8df4f33eab38c15a.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-5.1.9999.ebuild app-office/kmymoney/kmymoney-5.2.9999.ebuild X-VCS-Directories: app-office/kmymoney/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 1d6cb6f3704de0798c36c40c8df4f33eab38c15a 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: 6ecfd62c-fbd6-4e75-a22f-640e3e7d2628 X-Archives-Hash: 91f0d1a5a59526c69aed69c1046908e2 commit: 1d6cb6f3704de0798c36c40c8df4f33eab38c15a Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jan 12 12:55:24 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=1d6cb6f3 app-office/kmymoney: Update deps, mv 5.1.9999 -> 5.2.9999 (KF5 git master) Pin down app-office/libalkimia to =8.2.* which will remain Qt5-based for now. In preparation of a new release coming soon. 9999 will be for KF6-based git master instead. Upstream commits: 7f01093c82a3527028e89212c471e1f179c197e2 59058fe0e7e89272b9a8214a35a31ef3bd265a82 80a6a4b251e4e5efaecccc11a990e739708879d2 685231cffb5027a2072e4b1622a7f2c69b8969ef 3f85a37a9a62ae1134aced7d07b1d374ef310ebd 1365a8cf827c5bce1fd35e4ac48e401d8d6b88fc 5a036ac410b1a041fa66be309774a41a68d3651e Bug: https://bugs.gentoo.org/947737 Signed-off-by: Andreas Sturmlechner gentoo.org> ...ey-5.1.9999.ebuild => kmymoney-5.2.9999.ebuild} | 43 ++++++++-------------- 1 file changed, 16 insertions(+), 27 deletions(-) diff --git a/app-office/kmymoney/kmymoney-5.1.9999.ebuild b/app-office/kmymoney/kmymoney-5.2.9999.ebuild similarity index 69% rename from app-office/kmymoney/kmymoney-5.1.9999.ebuild rename to app-office/kmymoney/kmymoney-5.2.9999.ebuild index 14090a186f..c25e82e14b 100644 --- a/app-office/kmymoney/kmymoney-5.1.9999.ebuild +++ b/app-office/kmymoney/kmymoney-5.2.9999.ebuild @@ -1,9 +1,8 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -EGIT_BRANCH="5.1" ECM_HANDBOOK="optional" ECM_TEST="forceoptional" KFMIN=5.115.0 @@ -21,29 +20,24 @@ fi LICENSE="GPL-2" SLOT="5" -IUSE="activities calendar hbci holidays" # addressbook +IUSE="activities calendar hbci holidays" [[ ${KDE_BUILD_TYPE} = live ]] && IUSE+=" experimental" -# addressbook? ( -# >=kde-apps/akonadi-23.04:5 -# >=kde-apps/kidentitymanagement-23.04:5 -# >=kde-frameworks/kcontacts-${KFMIN}:5 -# ) RDEPEND=" - >=app-crypt/gpgme-1.7.1-r1:=[cxx] - >=app-office/libalkimia-7.0.0:= + >=app-crypt/gpgme-1.23.1-r1:=[cxx,qt5(-)] + =app-office/libalkimia-8.2*:= dev-db/sqlcipher dev-libs/gmp:0=[cxx(+)] dev-libs/kdiagram:5 dev-libs/libgpg-error dev-libs/libofx:= + >=dev-libs/qtkeychain-0.14.2:=[qt5(-)] >=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/qtwebengine-${QTMIN}:5[widgets] >=dev-qt/qtwidgets-${QTMIN}:5 >=dev-qt/qtxml-${QTMIN}:5 >=kde-frameworks/karchive-${KFMIN}:5 @@ -54,7 +48,6 @@ RDEPEND=" >=kde-frameworks/kconfigwidgets-${KFMIN}:5 >=kde-frameworks/kcoreaddons-${KFMIN}:5 >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 >=kde-frameworks/kio-${KFMIN}:5 >=kde-frameworks/kitemmodels-${KFMIN}:5 >=kde-frameworks/kitemviews-${KFMIN}:5 @@ -62,7 +55,6 @@ RDEPEND=" >=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 @@ -70,8 +62,8 @@ RDEPEND=" calendar? ( dev-libs/libical:= ) hbci? ( >=dev-qt/qtdeclarative-${QTMIN}:5 - >=net-libs/aqbanking-6.0.1 - >=sys-libs/gwenhywfar-5.1.2:=[qt5] + >=net-libs/aqbanking-6.5.0 + >=sys-libs/gwenhywfar-5.10.1:=[qt5(-)] ) holidays? ( >=kde-frameworks/kholidays-${KFMIN}:5 ) " @@ -89,22 +81,25 @@ 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 - -DENABLE_WEBENGINE=ON -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) -DENABLE_LIBICAL=$(usex calendar) -DENABLE_KBANKING=$(usex hbci) $(cmake_use_find_package holidays KF5Holidays) ) [[ ${KDE_BUILD_TYPE} = live ]] && - mycmakeargs+=( -DENABLE_UNFINISHEDFEATURES=$(usex experimental) ) + mycmakeargs+=( -DENABLE_COSTCENTER=$(usex experimental) ) ecm_src_configure } @@ -122,11 +117,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 }