gentoo resync : 25.08.2020

3 files changed, 43 insertions, 36 deletions

diff --git a/kde-apps/kmail/Manifest b/kde-apps/kmail/Manifest
index 0583f9a468b3..41bce2835142 100644
--- a/kde-apps/kmail/Manifest
+++ b/kde-apps/kmail/Manifest
@@ -1,5 +1,5 @@
-DIST kmail-19.12.3.tar.xz 4711336 BLAKE2B 781c12d9f6e3ef975aad9915e006b0a9bed465c3da26d48c733636179b12c062d9446660bb3fe3283a31632d67b4841626c2b7d046b8ba50309fc3466d40f874 SHA512 274c2675da6ddf97732dfe0c2b7f9daff1df88735711291f52ee3d359c07ad349686b498909a358c4a091aa70bd7dc77d239536f9757093979bebc9328dc7601
-DIST kmail-20.04.2.tar.xz 4721788 BLAKE2B c889b86890a6dc39759ff1050f3009b2076ac649c43412e7f6226f6b49156c327377f742865e1f37bdef52e0122a43def674020ed8e529e2f2ee042afe6389d7 SHA512 96d510b12fb1806f878261571ffac03193d67b2707b9d4195ab278bdf96f81a60d07e0c35ef431ecb939425d72ecf5a4154a3acb609f02461fcc4020411ea368
-EBUILD kmail-19.12.3.ebuild 3676 BLAKE2B ca9e7b65f095436a7a92bf3e0e9e8235e9042ecb77f2276f730f87df1e1df90454abb67e753d7b5c42c01460e2823a4a08850f2c45f9d154cd7a5440f530abb3 SHA512 26b15eb2198db1ee133046f392c680e372fb2c005bc3dbac4b28d1980f110af86d5574fe983529785ae0704e725a62435ce972e9b721d39a55f00b6e150d6642
-EBUILD kmail-20.04.2.ebuild 3846 BLAKE2B b329001d858c9d57dc7f09264c498f67dc07cdd046442fb0102b47b41eba6f39927c559f64bc8fc4735d38dbe3bfc2c90a12e964278db3d43f9a0e417fa52b89 SHA512 62776ec20b692c7f3d2ddeaf716dcd7471f9ded92bd6058e18f3a4efd12e67e74f5aac4b371f103c4e28a65f491faa102fb250af043e59bd674ad1f5b3a42d7f
+DIST kmail-20.04.3.tar.xz 4719852 BLAKE2B 4e116a47a4335c1322de6f54e4b8f8e7e060d531bbf2daf93778fb2892c6a20ba6854668655f9a7d25aa79e564aa2f4b26b9147dd163948fd3efbe7f829367eb SHA512 d0dd10bad186c6c03222909089ca46c046807eb3c2a0b5193560c6117990681adbdc95ef56a10e8bbbf64d4999420e451a892758250a6851eaac7c9fffa238a2
+DIST kmail-20.08.0.tar.xz 5154068 BLAKE2B fd92dec7ac4850f3740613ae6886d1c570a4c5675c615155b5900c483bacb5fcb382084727bb5d8da3cdc9c1d8f2eb4bab6e9b1413cc3f45f41956029c858200 SHA512 8f4bbb0c4d83137aeb554fa001ab486831ec67837c936146e1fd0d218c7e12f0c3fe99ba8a1c150713711569eba8b678829588dad1aece65c5a1fd02e39515cb
+EBUILD kmail-20.04.3.ebuild 3843 BLAKE2B 93510a5cbaa7c61afcd23ba13951448801bdf4ec7918a2f433d977d06b436638aa1c2530ac0d4b62a0e1d6d372799c9d1720ac60be8588780541d779d4f3ea4a SHA512 b950108635efaa73f15c7883d5a0a4a8c7ac41ea4bda53c33a343aa988d348068e5e1296eeb991267cef682a2ef496dc737e9f36a3c482fb0ab937d4c51ef24f
+EBUILD kmail-20.08.0.ebuild 3748 BLAKE2B 424b3fe5ae820d2ddc52ac065e0a67a5a5a8b3a4bce0c85647a71f31abdb8b193dd6068feb9983c73c80dff7627ee91422b9d3db1200ff0c9f134edf21738ae8 SHA512 53f9ea8e6fdb7a7e178d31b49cd7a31d60b6c5a18e4d80e974bdc8d8253f4becef13ba7b027306c4394c03c5214ca0a719a9f86de27c3e83981841fce8128b2a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmail/kmail-20.04.2.ebuild b/kde-apps/kmail/kmail-20.04.3.ebuild
index 72e1c1bc4cdb..c8e0a062850f 100644
--- a/kde-apps/kmail/kmail-20.04.2.ebuild
+++ b/kde-apps/kmail/kmail-20.04.3.ebuild
@@ -7,7 +7,7 @@ ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
 KFMIN=5.70.0
-QTMIN=5.14.1
+QTMIN=5.14.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -17,7 +17,7 @@ https://kontact.kde.org/components/kmail.html"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="telemetry"
 
 # drop qtcore subslot operator when QT_MINIMAL >= 5.15.0
diff --git a/kde-apps/kmail/kmail-19.12.3.ebuild b/kde-apps/kmail/kmail-20.08.0.ebuild
index 20614edb0c5c..8ad93218578e 100644
--- a/kde-apps/kmail/kmail-19.12.3.ebuild
+++ b/kde-apps/kmail/kmail-20.08.0.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.63.0
-QTMIN=5.12.3
+KFMIN=5.72.0
+QTMIN=5.14.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -17,15 +17,38 @@ https://kontact.kde.org/components/kmail.html"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="telemetry"
 
-# drop qtcore subslot operator when QT_MINIMAL >= 5.14.0
 BDEPEND="
 	dev-libs/libxslt
 	test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
 "
 COMMON_DEPEND="
+	>=app-crypt/gpgme-1.11.1[cxx,qt5]
+	>=dev-qt/qtcore-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-contacts-${PVCUT}:5
+	>=kde-apps/akonadi-mime-${PVCUT}:5
+	>=kde-apps/akonadi-search-${PVCUT}:5
+	>=kde-apps/kidentitymanagement-${PVCUT}:5
+	>=kde-apps/kmailtransport-${PVCUT}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=kde-apps/kontactinterface-${PVCUT}:5
+	>=kde-apps/kpimtextedit-${PVCUT}:5
+	>=kde-apps/libgravatar-${PVCUT}:5
+	>=kde-apps/libkdepim-${PVCUT}:5
+	>=kde-apps/libkleo-${PVCUT}:5
+	>=kde-apps/libksieve-${PVCUT}:5
+	>=kde-apps/libktnef-${PVCUT}:5
+	>=kde-apps/mailcommon-${PVCUT}:5
+	>=kde-apps/messagelib-${PVCUT}:5
+	>=kde-apps/pimcommon-${PVCUT}:5
 	>=kde-frameworks/kbookmarks-${KFMIN}:5
 	>=kde-frameworks/kcalendarcore-${KFMIN}:5
 	>=kde-frameworks/kcmutils-${KFMIN}:5
@@ -52,31 +75,7 @@ COMMON_DEPEND="
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-frameworks/sonnet-${KFMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/akonadi-search-${PVCUT}:5
-	>=kde-apps/kdepim-apps-libs-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kontactinterface-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libgravatar-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
-	>=kde-apps/libksieve-${PVCUT}:5
-	>=kde-apps/libktnef-${PVCUT}:5
-	>=kde-apps/mailcommon-${PVCUT}:5
-	>=kde-apps/messagelib-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=dev-qt/qtcore-${QTMIN}:5=
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=app-crypt/gpgme-1.11.1[cxx,qt5]
+	telemetry? ( dev-libs/kuserfeedback:5 )
 "
 DEPEND="${COMMON_DEPEND}
 	>=kde-apps/kcalutils-${PVCUT}:5
@@ -98,6 +97,14 @@ src_prepare() {
 	fi
 }
 
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package telemetry KUserFeedback)
+	)
+
+	ecm_src_configure
+}
+
 pkg_postinst() {
 	ecm_pkg_postinst