gentoo resync : 07.08.2021

3 files changed, 2 insertions, 136 deletions

diff --git a/app-office/kmymoney/Manifest b/app-office/kmymoney/Manifest
index 5acb8589b55f..27ff21bea757 100644
--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@@ -1,5 +1,3 @@
-DIST kmymoney-5.1.1.tar.xz 12059768 BLAKE2B 8b41bce8804d757ba9c801c7b1eeb214a8983c4686a9663a4b5255460139593b7f70e29f08294df810a02eab4190dc6de852be091760981fd84ff8191fda82a3 SHA512 2ed3e47b2e65c9d9e5a11b55f0d425192331b21d64f8a4a4f8921fdd67eac219bf3ae1418026071218d823acc9a36905dc5c499cb0ae2af4ced0e32d1720bf59
 DIST kmymoney-5.1.2.tar.xz 12640912 BLAKE2B 72abd190914eef258e6745ca9835de14bdb2060b0d025f8bdb1bc0e12b773fc891b143fe36adb8b7afcc86498601f6e1a7f9485f9a11c875f4c75bfe01d93738 SHA512 38c60998be4e3ffb49091eb2085b293c2d5265f6582e980d2dc60a66a00862b6afd3e2152c752a9fb14a7bf8b6255a0c39b69b65e2f5c976f23d965e3a1cdf46
-EBUILD kmymoney-5.1.1-r1.ebuild 3785 BLAKE2B 2c27db7f0e3904a03446c47b35073f8cb6dccc83098f2d8372b2e9704a81a4ab46863506818f08d80739da9b3f07ea2941fc66d2fa837d652f824ab8e2e15f72 SHA512 22df2e85e40d63ba93df70510257fd0376c8f4766f61606b7031ef64a486d37101bcb007c6fa322ee440a0e1881dd1e5183ee0e7552420572d471d26a9e9228a
-EBUILD kmymoney-5.1.2.ebuild 3867 BLAKE2B cf1d79f2a9879db2da8463ab3fc771c5f8c8251b97f1156d3342ab8f57cde35568fd470c21b9cd817bb32ec328a7b9f5dc939a58ea703a5515c0147f5f1741b9 SHA512 e4d9910fe880a077b744ce6a9baaf45d662b47b5e5d1ee3c4c0a25de492895c2343572db466cc4682ce550b756a4e4b412de2616234d4d1adc6362d84f24fb66
+EBUILD kmymoney-5.1.2.ebuild 3865 BLAKE2B e9bd3badb3fae742a3f599fcf5408fd6c7c0edc1a60d4df444523e5f901b26bdd3e26a8ebdc255e48e84d267d72e83cadfa996f2a5bee14ba8d18ee47ae8b6a1 SHA512 635023f3c1abf7ff3373d9f35d662e7842bde44c58ac4e77dce1822262ba58f8a9f215e373e8b1a5b77fefe7942c12f9b7865ad267968a677d8fecaf0da8e345
 MISC metadata.xml 612 BLAKE2B 693f4ae569b54f8e2bc6c5a3844db95e3791accba94be3174e11eb9dce42f4766334880fff00b5a0a2515b78ec8a6c298cf03efefa8fb49ae95309ea3648f479 SHA512 a580d659890251263b82938adbf80ae3a072d4d00c1f87e5faf76d6f88a80e0bd210bc4e5a40ea9f6662580892b77510644b35c90385438c3ad77bd191a0a398
diff --git a/app-office/kmymoney/kmymoney-5.1.1-r1.ebuild b/app-office/kmymoney/kmymoney-5.1.1-r1.ebuild
deleted file mode 100644
index 3129ca411a0d..000000000000
--- a/app-office/kmymoney/kmymoney-5.1.1-r1.ebuild
+++ /dev/null
@@ -1,132 +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.1
-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"
-
-BDEPEND="virtual/pkgconfig"
-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? (
-		>=net-libs/aqbanking-6.0.1
-		>=sys-libs/gwenhywfar-5.1.2:=[qt5]
-	)
-	holidays? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-"
-
-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
-		-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
index e8053a4a0dd7..6ad28d6b1537 100644
--- a/app-office/kmymoney/kmymoney-5.1.2.ebuild
+++ b/app-office/kmymoney/kmymoney-5.1.2.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"