gentoo resync : 25.08.2020

3 files changed, 30 insertions, 20 deletions

diff --git a/kde-apps/pim-data-exporter/Manifest b/kde-apps/pim-data-exporter/Manifest
index b48b130f778d..fcb05dc19ff2 100644
--- a/kde-apps/pim-data-exporter/Manifest
+++ b/kde-apps/pim-data-exporter/Manifest
@@ -1,5 +1,5 @@
-DIST pim-data-exporter-19.12.3.tar.xz 205544 BLAKE2B 47a49d495c2de7c329e9c11d9b3ea3ce9f96001105c4f36f0372c6727abff0296e70e95998f37a23c03d24bd86c12d7e5a7f68c1823cf0cbc9d4f148b3c4d944 SHA512 0b3268da97008c4708ca6e8ac9c2006055f6ef60c6e1c38d5e17b02de1c6d15fb0952d990ec804523b545448ef8c1dad3aab97bb7d6f077a8203bc4dcb3c8d97
-DIST pim-data-exporter-20.04.2.tar.xz 278028 BLAKE2B f48878ede1d889c160c1cdae10ae684b57b5f63d987c54832a48fe822345c61bbab4e1e52417a4485f2889bc1e9380f3d193ddb85ba51bea9e2d09b3202d29d3 SHA512 a4ded3cc18a85010bdc64fd6861310c73e22f2b4c9951f657a679529fcd835f8d832c245cd7ab1f786081f37010ef0e196ed0bfd1f25cc98c3471a4b90ab6bba
-EBUILD pim-data-exporter-19.12.3.ebuild 1353 BLAKE2B a086506de8663938ad52c367b8de5c6bc3d559ef2c842742941f2b9512a36458bda024f3f6d4d273ef3663001e6e31a1c766c0169f4541314284a4f61102959e SHA512 0458ca9e08e2fa39c99e80635eabc97e572ba3e03d923dd673ff6c2ef3af1a4f91f560c528808ce80e3deaf06d191e30e812fbdf66943debe3338702b9eec9e8
-EBUILD pim-data-exporter-20.04.2.ebuild 1583 BLAKE2B fda3d5c6f73069ce107dcd21cc62ccc6cf7f259b0239b3a11220ddd380ca671df62bc45a90d551c0b9311530c7a55265bd997679513904d2ae5b74b73224df5f SHA512 0a3c8f7b86ae13adeb2d48b5ce62c8d93e6979032e373f096e6f294bf8b51b89d1c56f022d5d6f072f441d4bb0343856b2ee8f4bfcf3ce99e4be8627a9a7987d
+DIST pim-data-exporter-20.04.3.tar.xz 277704 BLAKE2B 2de56a09a23440b40fcdd98a2c41f440e5e082c9d2f6adc13e04d54cb7db65320d922cd1daeabcfa0902ac1a27560f831f310e0e40cb6006bef0a902212ef9df SHA512 5d66108ef9a445de932eaf6d99a7534ee7ca6a83db015d715ce0b815c1c51b796ff5b987aab416035a18bbfde823c92119eef7708a91ff2c7dc586ddf7ecb0bc
+DIST pim-data-exporter-20.08.0.tar.xz 399172 BLAKE2B 2f783969f066f368c7bc22adc9512c12b8aea3a035cb31ad07096c7c52f3ee5cc373845e1c2e9e2a261cd779308692747c1726f8fc0820120eb38fe1575885bb SHA512 8be1adb31d7b672c18de354bed3f0501f78d8a833e8740dbfc4327b6d9a0a2085e1d10020129578d23b532492e8b73eb0fdb01638cb2dc641b625ef346f20e08
+EBUILD pim-data-exporter-20.04.3.ebuild 1580 BLAKE2B e53109b33384aac992f2556da34aee1c4ee6733c17ff37e1695b161d62581498ae695429edaaa465a8699d5fbdd9590006d0a198806cef2c387ecb26061c8b68 SHA512 2aa3b94325c246e50d045cba7958431b0ded4ea13277d263add85c177d1c5ac75d1dcb370b7d250de8fe1eca098fa5fe16dae08ee40628d7a47d51b25c9e707f
+EBUILD pim-data-exporter-20.08.0.ebuild 1583 BLAKE2B 0da0c98bbb4437ce0290b08f5a6be92bbbb026c2556fd1f30f198a8f221e5012c22646f599b75f3568aba522204f3c3b1becd92b35129804ce979abe38c0d662 SHA512 9f572405527d10077c5d483dec8232e73376374605fa28d61dfb49b27cb4431989c3eeb32a633a75c843fefaa4d5a450df90defb77010d02474628948433f5cf
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-19.12.3.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-20.04.3.ebuild
index 6290b04dc197..b20c1dd9ad53 100644
--- a/kde-apps/pim-data-exporter/pim-data-exporter-19.12.3.ebuild
+++ b/kde-apps/pim-data-exporter/pim-data-exporter-20.04.3.ebuild
@@ -6,20 +6,31 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.63.0
-QTMIN=5.12.3
+KFMIN=5.70.0
+QTMIN=5.14.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="Assistant to backup and archive PIM data and configuration"
-HOMEPAGE+=" https://userbase.kde.org/Kmail/Backup_Options"
+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=""
+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
@@ -33,15 +44,14 @@ DEPEND="
 	>=kde-frameworks/knotifications-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}: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
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}: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.2.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-20.08.0.ebuild
index c0d6276522e5..6121fb8a0a5a 100644
--- a/kde-apps/pim-data-exporter/pim-data-exporter-20.04.2.ebuild
+++ b/kde-apps/pim-data-exporter/pim-data-exporter-20.08.0.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.14.1
+KFMIN=5.72.0
+QTMIN=5.14.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org