gentoo resync : 25.08.2020

4 files changed, 3 insertions, 135 deletions

diff --git a/app-office/kmymoney/Manifest b/app-office/kmymoney/Manifest
index 6d8ebef4984d..1fa083b1721e 100644
--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@@ -1,5 +1,3 @@
-DIST kmymoney-5.0.8.tar.xz 11753276 BLAKE2B 0c4967b3f39ec675b9bd7e8e81e230c7f5efa574671138db57396984add802d9b6c28e383eaaddb4ee8d486e6dcc2b0ac54f5cf1129aa4dafb9bd1cf4235914f SHA512 f332327dd40cc5667cd0141bd8e0c9cd81a2d996a4d482b2976f6bbd258cc27c73b2190d4631b8e0b9ee9d435ef8934312da399234830eb51b3e4ec942350988
 DIST kmymoney-5.1.0.tar.xz 12005824 BLAKE2B 4eaeefba29d4df85c485d8d94db80b418c0086f6cac81295f1251e3d4883a78c71d0401286a918831ee2a39571a70583675ee303775bffdb3333e11d5624bbf6 SHA512 143161efd708ae05923d68510945c24f08d85cd6482b3e6015c6061bc28c80e095ca56b768e595bfae50ea3340855e021dde5c715546c0641f94adcd91639334
-EBUILD kmymoney-5.0.8-r1.ebuild 3462 BLAKE2B 331250e84ccd0c2529f9fa2a403d4ace132291cec1464e4e04c21e8403b3775d351c34510aefcaa893cf915ee4e1501cef2e28b90c73b49d86be05ad58a585c2 SHA512 ed3ac3d35531752656a072b610fe201a5a365447d2e10d209835e66538db12b23cc61a6f0c0af97556a3651643effb25caf2999875b88457e44e5c56a73abbde
-EBUILD kmymoney-5.1.0.ebuild 3500 BLAKE2B 85c2940dccb780a454a4854df2b319e94025da6b593963020a563e994b5b775c57bb7a4f41291b8022239d65c33e6869a793e1185182cea6dd7a995beba81ee7 SHA512 39e70bbfe80617711071e4bccf120bb80f3054f01f0377801c861d67f35e7eae29d0bf745d01dd12a8502b39e56f730d2af3bc8171f0d12c3f44dd6129300433
-MISC metadata.xml 793 BLAKE2B 0ecca47b6d189eb9d19c4b61d43579429def819e075267f203a382fe3fb55cedfc14faeb409efed1e975688df260e3574bf03c29601e102f9cce662ecc15d81c SHA512 5c52ef57a4c75b2b439036ba561fed505a9bb331e1eac61a0816287b068687cfe3c22c260baba788aae68c0a304ad9e6aa72599d12a1fb511765d9722749e06c
+EBUILD kmymoney-5.1.0.ebuild 3498 BLAKE2B c7db2eb105dd2c370045cc8ca7845e738675b864ca912c25d7451373e2ab77d585ec20d6658c7bea473252ac9d1cee9d9b6d8784f483d325365bc8ae71cbe90c SHA512 2a81a7aab57e4dad9548c1f097aa3dd26783010535c27bf203843aa01524e61b2f5b99e274e728e417fac772d36e372f89bfc927155ed177831edd64048946e8
+MISC metadata.xml 677 BLAKE2B 64f8cdbad4f22f9203f04bbe4a93da432fb7689fc9bbdb072c9f0d16e71b2908ddd95bc452e2fd561981f60cca8638275ef740c00c9a5e1ad020077b0afae97f SHA512 5908450c3761f8bdbfbcc58c3aae5e80737a07ac43107f9c16ba06ee9acae07c60ccbc12f70db7562a807e38e597510cef790220c13204e6e39746528f3fd0c3
diff --git a/app-office/kmymoney/kmymoney-5.0.8-r1.ebuild b/app-office/kmymoney/kmymoney-5.0.8-r1.ebuild
deleted file mode 100644
index 51b2398057d0..000000000000
--- a/app-office/kmymoney/kmymoney-5.0.8-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-ECM_HANDBOOK="optional"
-ECM_TEST="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-VIRTUALDBUS_TEST="true"
-inherit ecm kde.org python-single-r1
-
-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 ofx quotes webkit weboob"
-
-REQUIRED_USE="weboob? ( ${PYTHON_REQUIRED_USE} )"
-
-BDEPEND="virtual/pkgconfig"
-COMMON_DEPEND="
-	>=app-crypt/gpgme-1.7.1-r1[cxx]
-	>=app-office/libalkimia-7.0.0:=
-	dev-libs/gmp:0=[cxx]
-	dev-libs/kdiagram:5
-	dev-libs/libgpg-error
-	>=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/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${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/kiconthemes-${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-frameworks/kcontacts-${KFMIN}:5
-		kde-apps/akonadi:5
-		kde-apps/kidentitymanagement: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 )
-	ofx? ( dev-libs/libofx )
-	webkit? (
-		>=kde-frameworks/kdewebkit-${KFMIN}:5
-		>=dev-qt/qtwebkit-5.212.0_pre20180120:5
-	)
-	!webkit? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] )
-	weboob? (
-		${PYTHON_DEPS}
-		>=dev-qt/qtconcurrent-${QTMIN}:5
-		$(python_gen_cond_dep '
-			www-client/weboob[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-"
-RDEPEND="${COMMON_DEPEND}
-	!app-office/kmymoney:4
-	quotes? ( dev-perl/Finance-Quote )
-"
-
-pkg_setup() {
-	use weboob && python_setup
-	ecm_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-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)
-		-DENABLE_OFXIMPORTER=$(usex ofx)
-		-DENABLE_WEBENGINE=$(usex !webkit)
-		-DENABLE_WEBOOB=$(usex weboob)
-		$(cmake_use_find_package weboob PythonLibs)
-	)
-	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
-}
diff --git a/app-office/kmymoney/kmymoney-5.1.0.ebuild b/app-office/kmymoney/kmymoney-5.1.0.ebuild
index f43a35d8d49f..b4054dec6101 100644
--- a/app-office/kmymoney/kmymoney-5.1.0.ebuild
+++ b/app-office/kmymoney/kmymoney-5.1.0.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"
diff --git a/app-office/kmymoney/metadata.xml b/app-office/kmymoney/metadata.xml
index 34cd0358c540..d9c0e04abc20 100644
--- a/app-office/kmymoney/metadata.xml
+++ b/app-office/kmymoney/metadata.xml
@@ -11,6 +11,5 @@
 		<flag name="hbci">Enable HBCI support using <pkg>net-libs/aqbanking</pkg></flag>
 		<flag name="holidays">Enable <pkg>kde-frameworks/kholidays</pkg> integration</flag>
 		<flag name="quotes">Enable Online Stock Quote retrieval</flag>
-		<flag name="weboob">Enable import of online banking transactions extracted by <pkg>www-client/weboob</pkg></flag>
 	</use>
 </pkgmetadata>