gentoo auto-resync : 16:09:2022 - 11:14:45

4 files changed, 2 insertions, 178 deletions

diff --git a/app-office/kmymoney/Manifest b/app-office/kmymoney/Manifest
index b3c76ca03c27..cc53bdc16cd6 100644
--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@@ -1,7 +1,4 @@
-AUX kmymoney-5.1.2-akonadi-21.12.0.patch 1170 BLAKE2B e23115c09e36d1c57f9bd315ce305d27756165eae8f0293387b47c3b167ba05dd420301bd644bd4e90550ccf1a94198763296eaf2ad008ef8c6572d4e1295e69 SHA512 440d55bad9ccd4fe5b9346d755feec403d0ab067b6aa86195b07c4923a332e546b7dc7336301604fb82bb21abe987c63fc26be7d8da4d6df87fc0958afc8a2a6
 AUX kmymoney-5.1.3-cmake.patch 862 BLAKE2B 9cd3e8be514bb4b4bee50639de1d7bf3729c7836ee48dd7ee9859bc3114c15adb0f57043a063052ce56e1c7bad17e89e40d6a00b559b15336b6dfa442c24bc1e SHA512 7b39d65f8e151327e38d6f1f0640578e1beb1591e5eb7ad62f319294afab80c835e1bc53b3342858ed16d2336f5f7ec8d16531455e9e8d46002d839d26adc428
-DIST kmymoney-5.1.2.tar.xz 12640912 BLAKE2B 72abd190914eef258e6745ca9835de14bdb2060b0d025f8bdb1bc0e12b773fc891b143fe36adb8b7afcc86498601f6e1a7f9485f9a11c875f4c75bfe01d93738 SHA512 38c60998be4e3ffb49091eb2085b293c2d5265f6582e980d2dc60a66a00862b6afd3e2152c752a9fb14a7bf8b6255a0c39b69b65e2f5c976f23d965e3a1cdf46
 DIST kmymoney-5.1.3.tar.xz 12647372 BLAKE2B 09580873985bb41c39c649bdb863ee25f4356dfea18b64d45f3b6bd528fd57fc2b5fd32a6541c10ed519da0e905bf6853589e7cab0f4c3b4f2945cd7a3181dba SHA512 2003f25b7df77691e5d3d0f450e0139b1e68336f59a4fc78af751c5b94ecfaf17a39ee1f58ed0c2cda642195c5277fbb63c87e857ebe9a6495dc7f88b9a38794
-EBUILD kmymoney-5.1.2-r1.ebuild 3921 BLAKE2B ac3177a99ccee4a7bdc4dbcfaf526436110062e2f14c4f135b133c051e91b1131978a87066cb19e76d4aef9a0d55891e3250a68eae03e27847fbcc4a51884ef4 SHA512 1bfdad853d3ad1d7c58eb1e4e72ceaae04574bdf6a4b412214ddeab187540d61ea7fd341254211a692ce80a315bf1bdc7bf82a8dc86dfb761d61f8bbfe3f923c
-EBUILD kmymoney-5.1.3.ebuild 3910 BLAKE2B d4a6dbfdb6cbe9cfc4dc8f2b8b37396769fc3534975afb745166cc8276d16a0983d735c5cfca13968d1feee80b75f92077a7dcd9180d8fdc929e23703ac5d37c SHA512 bb1947cb27b4f8efef56b1c679f2b8f303ecae722da0583347a90861aa814b7f53b62c312537880569bf44008f5e2c41e52882318c5ff474ebe109ea7574b0c5
+EBUILD kmymoney-5.1.3.ebuild 3909 BLAKE2B fdc3aab2dfbd9b0cc47046aead3d1d4ac0244176f38b167b52fc5fee83eff0ab48946c3483926e1d5fea65d139f87e5fb797b2af9cb49e46087bcd1a19a5a5a7 SHA512 975793e66242afbfa07f6b73e5e06e41467fee4bb0f22deeade7158e9cbec502780701110c12d537c8c2d995208f614cd90ff951006abf11448c5fd8dbd38886
 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
deleted file mode 100644
index 2af212241ca6..000000000000
--- a/app-office/kmymoney/files/kmymoney-5.1.2-akonadi-21.12.0.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From a06d2fe154f755c3af1e7f261cd631929b9da998 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=96mer=20Fad=C4=B1l=20USTA?= <omerusta@gmail.com>
-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 <KIdentityManagement/IdentityManager>
- #include <KIdentityManagement/Identity>
-+#include <KIdentityManagement/IdentityManager>
-+#include <akonadi_version.h>
-+
-+#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
-+#include <Akonadi/Collection>
-+#include <Akonadi/ItemFetchScope>
-+#include <Akonadi/RecursiveItemFetchJob>
-+#else
- #include <AkonadiCore/RecursiveItemFetchJob>
- #include <AkonadiCore/ItemFetchScope>
- #include <AkonadiCore/Collection>
-+#endif
-+
- #include <KContacts/Addressee>
- #include <QRegularExpression>
- #endif
--- 
-GitLab
-
diff --git a/app-office/kmymoney/kmymoney-5.1.2-r1.ebuild b/app-office/kmymoney/kmymoney-5.1.2-r1.ebuild
deleted file mode 100644
index 44c995198e83..000000000000
--- a/app-office/kmymoney/kmymoney-5.1.2-r1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# 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.3.ebuild b/app-office/kmymoney/kmymoney-5.1.3.ebuild
index 9ae2c2066d94..b5e6046e32a1 100644
--- a/app-office/kmymoney/kmymoney-5.1.3.ebuild
+++ b/app-office/kmymoney/kmymoney-5.1.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://kmymoney.org/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"