From 4cbcc855382a06088e2f016f62cafdbcb7e40665 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 Mar 2022 00:40:44 +0000 Subject: gentoo resync : 20.03.2022 --- app-office/kmymoney/Manifest | 3 +- .../files/kmymoney-5.1.2-akonadi-21.12.0.patch | 38 ++++++ app-office/kmymoney/kmymoney-5.1.2-r1.ebuild | 135 +++++++++++++++++++++ app-office/kmymoney/kmymoney-5.1.2.ebuild | 133 -------------------- 4 files changed, 175 insertions(+), 134 deletions(-) create mode 100644 app-office/kmymoney/files/kmymoney-5.1.2-akonadi-21.12.0.patch create mode 100644 app-office/kmymoney/kmymoney-5.1.2-r1.ebuild delete mode 100644 app-office/kmymoney/kmymoney-5.1.2.ebuild (limited to 'app-office/kmymoney') diff --git a/app-office/kmymoney/Manifest b/app-office/kmymoney/Manifest index 55542a0bfa4a..584c6b53e464 100644 --- a/app-office/kmymoney/Manifest +++ b/app-office/kmymoney/Manifest @@ -1,3 +1,4 @@ +AUX kmymoney-5.1.2-akonadi-21.12.0.patch 1170 BLAKE2B e23115c09e36d1c57f9bd315ce305d27756165eae8f0293387b47c3b167ba05dd420301bd644bd4e90550ccf1a94198763296eaf2ad008ef8c6572d4e1295e69 SHA512 440d55bad9ccd4fe5b9346d755feec403d0ab067b6aa86195b07c4923a332e546b7dc7336301604fb82bb21abe987c63fc26be7d8da4d6df87fc0958afc8a2a6 DIST kmymoney-5.1.2.tar.xz 12640912 BLAKE2B 72abd190914eef258e6745ca9835de14bdb2060b0d025f8bdb1bc0e12b773fc891b143fe36adb8b7afcc86498601f6e1a7f9485f9a11c875f4c75bfe01d93738 SHA512 38c60998be4e3ffb49091eb2085b293c2d5265f6582e980d2dc60a66a00862b6afd3e2152c752a9fb14a7bf8b6255a0c39b69b65e2f5c976f23d965e3a1cdf46 -EBUILD kmymoney-5.1.2.ebuild 3865 BLAKE2B e9bd3badb3fae742a3f599fcf5408fd6c7c0edc1a60d4df444523e5f901b26bdd3e26a8ebdc255e48e84d267d72e83cadfa996f2a5bee14ba8d18ee47ae8b6a1 SHA512 635023f3c1abf7ff3373d9f35d662e7842bde44c58ac4e77dce1822262ba58f8a9f215e373e8b1a5b77fefe7942c12f9b7865ad267968a677d8fecaf0da8e345 +EBUILD kmymoney-5.1.2-r1.ebuild 3921 BLAKE2B ac3177a99ccee4a7bdc4dbcfaf526436110062e2f14c4f135b133c051e91b1131978a87066cb19e76d4aef9a0d55891e3250a68eae03e27847fbcc4a51884ef4 SHA512 1bfdad853d3ad1d7c58eb1e4e72ceaae04574bdf6a4b412214ddeab187540d61ea7fd341254211a692ce80a315bf1bdc7bf82a8dc86dfb761d61f8bbfe3f923c MISC metadata.xml 681 BLAKE2B 453cabf72a1e3623123e61e00fdbc589b9b46052fb2ac5b8baaea0bccd8b0fec522eb685ca6846cc273935532ff938c94b7204b4c5c5c828ef48bb07f54d9bef SHA512 4027bcb02e1b2736c8de15aac851c7b44374020ee06794c7a8460f0a580a2cf0fd3b7af5407f915589a2245f3cedd2bc942a838fff8a6622f132893bfcd0e492 diff --git a/app-office/kmymoney/files/kmymoney-5.1.2-akonadi-21.12.0.patch b/app-office/kmymoney/files/kmymoney-5.1.2-akonadi-21.12.0.patch new file mode 100644 index 000000000000..2af212241ca6 --- /dev/null +++ b/app-office/kmymoney/files/kmymoney-5.1.2-akonadi-21.12.0.patch @@ -0,0 +1,38 @@ +From a06d2fe154f755c3af1e7f261cd631929b9da998 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=96mer=20Fad=C4=B1l=20USTA?= +Date: Sat, 2 Oct 2021 22:16:06 +0300 +Subject: [PATCH] Fix Compile for Newer Akonadi Builds + +--- + kmymoney/mymoney/mymoneycontact.cpp | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/kmymoney/mymoney/mymoneycontact.cpp b/kmymoney/mymoney/mymoneycontact.cpp +index acc3575ef..a32357290 100644 +--- a/kmymoney/mymoney/mymoneycontact.cpp ++++ b/kmymoney/mymoney/mymoneycontact.cpp +@@ -8,11 +8,20 @@ + #include "mymoneycontact.h" + + #ifdef ENABLE_ADDRESSBOOK +-#include + #include ++#include ++#include ++ ++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) ++#include ++#include ++#include ++#else + #include + #include + #include ++#endif ++ + #include + #include + #endif +-- +GitLab + diff --git a/app-office/kmymoney/kmymoney-5.1.2-r1.ebuild b/app-office/kmymoney/kmymoney-5.1.2-r1.ebuild new file mode 100644 index 000000000000..44c995198e83 --- /dev/null +++ b/app-office/kmymoney/kmymoney-5.1.2-r1.ebuild @@ -0,0 +1,135 @@ +# Copyright 1999-2022 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.74.0 +QTMIN=5.15.2 +VIRTUALX_REQUIRED="test" +VIRTUALDBUS_TEST="true" +inherit ecm kde.org optfeature + +DESCRIPTION="Personal finance manager based on KDE Frameworks" +HOMEPAGE="https://kmymoney.org/" + +if [[ ${KDE_BUILD_TYPE} = release ]]; then + SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz" + KEYWORDS="amd64 x86" +fi + +LICENSE="GPL-2" +SLOT="5" +IUSE="activities addressbook calendar hbci holidays" +[[ ${KDE_BUILD_TYPE} = live ]] && IUSE+=" experimental" + +RDEPEND=" + >=app-crypt/gpgme-1.7.1-r1:=[cxx] + >=app-office/libalkimia-7.0.0:= + dev-db/sqlcipher + 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 + >=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 + >=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/kiconthemes-${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-frameworks/kactivities-${KFMIN}:5 ) + addressbook? ( + kde-apps/akonadi:5 + kde-apps/kidentitymanagement:5 + >=kde-frameworks/kcontacts-${KFMIN}:5 + ) + calendar? ( dev-libs/libical:= ) + hbci? ( + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=net-libs/aqbanking-6.0.1 + >=sys-libs/gwenhywfar-5.1.2:=[qt5] + ) + holidays? ( >=kde-frameworks/kholidays-${KFMIN}:5 ) +" +DEPEND="${RDEPEND} + dev-libs/boost +" +BDEPEND="virtual/pkgconfig" + +PATCHES=( "${FILESDIR}/${P}-akonadi-21.12.0.patch" ) + +pkg_setup() { + ecm_pkg_setup + + if [[ ${KDE_BUILD_TYPE} = live ]] && use experimental; then + ewarn "USE experimental set: Building unfinished features." + ewarn "This *will* chew up your data. You have been warned." + fi +} + +src_configure() { + local mycmakeargs=( + -DENABLE_OFXIMPORTER=ON + -DENABLE_WEBENGINE=ON + -DENABLE_WEBOOB=OFF # ported to Py3; not yet re-added in Gentoo + -DUSE_QT_DESIGNER=OFF + $(cmake_use_find_package activities KF5Activities) + $(cmake_use_find_package addressbook KF5Akonadi) + $(cmake_use_find_package addressbook KF5Contacts) + $(cmake_use_find_package addressbook KF5IdentityManagement) + -DENABLE_LIBICAL=$(usex calendar) + -DENABLE_KBANKING=$(usex hbci) + $(cmake_use_find_package holidays KF5Holidays) + ) + [[ ${KDE_BUILD_TYPE} = live ]] && + mycmakeargs+=( -DENABLE_UNFINISHEDFEATURES=$(usex experimental) ) + + ecm_src_configure +} + +src_test() { + # bug 652636; bug 673052: needs kmymoney installed to succeed + local myctestargs=( + -E "(reports-chart-test|qsqlcipher-test)" + ) + + ecm_src_test +} + +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 +} diff --git a/app-office/kmymoney/kmymoney-5.1.2.ebuild b/app-office/kmymoney/kmymoney-5.1.2.ebuild deleted file mode 100644 index 6ad28d6b1537..000000000000 --- a/app-office/kmymoney/kmymoney-5.1.2.ebuild +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -EGIT_BRANCH="5.1" -ECM_HANDBOOK="optional" -ECM_TEST="forceoptional" -KFMIN=5.74.0 -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -VIRTUALDBUS_TEST="true" -inherit ecm kde.org optfeature - -DESCRIPTION="Personal finance manager based on KDE Frameworks" -HOMEPAGE="https://kmymoney.org/" - -if [[ ${KDE_BUILD_TYPE} = release ]]; then - SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz" - KEYWORDS="amd64 x86" -fi - -LICENSE="GPL-2" -SLOT="5" -IUSE="activities addressbook calendar hbci holidays" -[[ ${KDE_BUILD_TYPE} = live ]] && IUSE+=" experimental" - -RDEPEND=" - >=app-crypt/gpgme-1.7.1-r1[cxx] - >=app-office/libalkimia-7.0.0:= - dev-db/sqlcipher - 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 - >=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 - >=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/kiconthemes-${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-frameworks/kactivities-${KFMIN}:5 ) - addressbook? ( - kde-apps/akonadi:5 - kde-apps/kidentitymanagement:5 - >=kde-frameworks/kcontacts-${KFMIN}:5 - ) - calendar? ( dev-libs/libical:= ) - hbci? ( - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=net-libs/aqbanking-6.0.1 - >=sys-libs/gwenhywfar-5.1.2:=[qt5] - ) - holidays? ( >=kde-frameworks/kholidays-${KFMIN}:5 ) -" -DEPEND="${RDEPEND} - dev-libs/boost -" -BDEPEND="virtual/pkgconfig" - -pkg_setup() { - ecm_pkg_setup - - if [[ ${KDE_BUILD_TYPE} = live ]] && use experimental; then - ewarn "USE experimental set: Building unfinished features." - ewarn "This *will* chew up your data. You have been warned." - fi -} - -src_configure() { - local mycmakeargs=( - -DENABLE_OFXIMPORTER=ON - -DENABLE_WEBENGINE=ON - -DENABLE_WEBOOB=OFF # ported to Py3; not yet re-added in Gentoo - -DUSE_QT_DESIGNER=OFF - $(cmake_use_find_package activities KF5Activities) - $(cmake_use_find_package addressbook KF5Akonadi) - $(cmake_use_find_package addressbook KF5Contacts) - $(cmake_use_find_package addressbook KF5IdentityManagement) - -DENABLE_LIBICAL=$(usex calendar) - -DENABLE_KBANKING=$(usex hbci) - $(cmake_use_find_package holidays KF5Holidays) - ) - [[ ${KDE_BUILD_TYPE} = live ]] && - mycmakeargs+=( -DENABLE_UNFINISHEDFEATURES=$(usex experimental) ) - - ecm_src_configure -} - -src_test() { - # bug 652636; bug 673052: needs kmymoney installed to succeed - local myctestargs=( - -E "(reports-chart-test|qsqlcipher-test)" - ) - - ecm_src_test -} - -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 -} -- cgit v1.2.3