gentoo resync : 25.11.2020

3 files changed, 8 insertions, 65 deletions

diff --git a/kde-apps/pim-data-exporter/Manifest b/kde-apps/pim-data-exporter/Manifest
index 3a43aa0cd1f8..f4c2be80688f 100644
--- a/kde-apps/pim-data-exporter/Manifest
+++ b/kde-apps/pim-data-exporter/Manifest
@@ -1,5 +1,3 @@
-DIST pim-data-exporter-20.04.3.tar.xz 277704 BLAKE2B 2de56a09a23440b40fcdd98a2c41f440e5e082c9d2f6adc13e04d54cb7db65320d922cd1daeabcfa0902ac1a27560f831f310e0e40cb6006bef0a902212ef9df SHA512 5d66108ef9a445de932eaf6d99a7534ee7ca6a83db015d715ce0b815c1c51b796ff5b987aab416035a18bbfde823c92119eef7708a91ff2c7dc586ddf7ecb0bc
-DIST pim-data-exporter-20.08.1.tar.xz 399256 BLAKE2B 625b4c36ffe49aab11451e648052d9892325fda4f158cd7a75e9bd7bd5598d0186b01f90b37144f14fbffc314b0fa169b8e55eed2be2391cdc6968f8d4f67976 SHA512 279e006bb4347b1603aecf1f3bd6f424668af52e6b7fbc3c662b21b957c68dec169c3a5d8dbec799b1254cf02d5c90741e3b745dbad4f5afd16d5f111e0089b8
-EBUILD pim-data-exporter-20.04.3.ebuild 1580 BLAKE2B e53109b33384aac992f2556da34aee1c4ee6733c17ff37e1695b161d62581498ae695429edaaa465a8699d5fbdd9590006d0a198806cef2c387ecb26061c8b68 SHA512 2aa3b94325c246e50d045cba7958431b0ded4ea13277d263add85c177d1c5ac75d1dcb370b7d250de8fe1eca098fa5fe16dae08ee40628d7a47d51b25c9e707f
-EBUILD pim-data-exporter-20.08.1.ebuild 1583 BLAKE2B 0da0c98bbb4437ce0290b08f5a6be92bbbb026c2556fd1f30f198a8f221e5012c22646f599b75f3568aba522204f3c3b1becd92b35129804ce979abe38c0d662 SHA512 9f572405527d10077c5d483dec8232e73376374605fa28d61dfb49b27cb4431989c3eeb32a633a75c843fefaa4d5a450df90defb77010d02474628948433f5cf
+DIST pim-data-exporter-20.08.3.tar.xz 399520 BLAKE2B 770af04d616d3c4c397074ebf3702c98b9ab1566428a0dadf7ac416c2167a465b06be0d4047f3a6acfa4e97d5fb46039e2efa0fe3dec43e5011d5484ebc39bb8 SHA512 70459c941204cafb60c1c77c107208f32b41b3d50902c8ee9d10d40f126265c8ad4745ddbaa2b3e50537248acd6883d71a568105f5a90d94bcc7b5fa9004339a
+EBUILD pim-data-exporter-20.08.3.ebuild 1613 BLAKE2B 674ca6a9f260cc73f15500b623c72112f96223df32427d8404d90c0328e36c223cf5722cefbe2f0d7ef0d6d64468394cdf79f28d168c1f3b41f0f659db2d0ada SHA512 ed4dffaf2ab60f026985f824499ffd033986fe587552ce3cc6fc4cc9fbf35dc577c2a1a521c8fea9efc76efec2e5bbcf0301af09e2c13bc9da6b5254b185f44e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-20.08.1.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-20.08.1.ebuild
deleted file mode 100644
index 6121fb8a0a5a..000000000000
--- a/kde-apps/pim-data-exporter/pim-data-exporter-20.08.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.72.0
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Assistant to backup and archive PIM data and configuration"
-HOMEPAGE="https://kde.org/applications/internet/org.kde.pimdataexporter
-https://userbase.kde.org/KMail/Backup_Options"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="telemetry"
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/mailcommon-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	telemetry? ( dev-libs/kuserfeedback:5 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-20.04.3.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-20.08.3.ebuild
index b20c1dd9ad53..dd9808d39d5d 100644
--- a/kde-apps/pim-data-exporter/pim-data-exporter-20.04.3.ebuild
+++ b/kde-apps/pim-data-exporter/pim-data-exporter-20.08.3.ebuild
@@ -6,18 +6,18 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.14.2
+KFMIN=5.74.0
+QTMIN=5.15.1
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="Assistant to backup and archive PIM data and configuration"
-HOMEPAGE="https://kde.org/applications/internet/org.kde.pimdataexporter
+HOMEPAGE="https://apps.kde.org/en/pimdataexporter
 https://userbase.kde.org/KMail/Backup_Options"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="telemetry"
 
 DEPEND="
@@ -48,6 +48,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+RESTRICT+=" test" # 11 out of 21 tests fail...
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package telemetry KUserFeedback)