gentoo resync : 25.08.2020

3 files changed, 19 insertions, 20 deletions

diff --git a/kde-apps/kate/Manifest b/kde-apps/kate/Manifest
index 2be70bdd52d0..3dc1af7be035 100644
--- a/kde-apps/kate/Manifest
+++ b/kde-apps/kate/Manifest
@@ -1,5 +1,5 @@
-DIST kate-19.12.3.tar.xz 5795816 BLAKE2B 567b0c37f0b50533eeb19a527f7527ae050b62c8a50d46bbfac06226f109cd024b7626abc7defa32b9a654e231f6f04246a3410ace92f40fc25fb22a6f893c82 SHA512 aa6a2c44a8c5892e61ac80df676da6059e61dd93f5e2934e0547040d89379f9f3ae90f46b8e043edf463228ef5b0ab3f795b8ab3dd6c488d0ba0c55cf20bd817
-DIST kate-20.04.2.tar.xz 5829952 BLAKE2B 839a069bac00ecc7e7158875570a9d7bf95e5f10cc2041b6178c47ccd3c3ee6ac7426a55da72d468657fbd09694714bd44e0be97411b1bbc0ab58582c0f0df95 SHA512 eee887549ed22b5d0bab966936f1d509bb47a79cad4162cf44ef5a44b97f9c4ea5aac2316e234def6bbf6cae506347e309b26fb24e20c7ac1cc582c12ad6f911
-EBUILD kate-19.12.3.ebuild 2907 BLAKE2B 667e2e48fe90d3bf6ab65e56bfa0b4e2203aa5a68b63a18f8ea6c3b70165bc8fc109bbcdfd5d58066736c41bf1a9bd64e340b41179e19947695b158071248cf6 SHA512 03b619016c8eaee8e26a44a7af5111e00bd3c3e6134cb31767a15d33e5b3caecea74f4eeb7871b5b673d7461f3f0e12150fee5147145de8b62ff268669bcda92
-EBUILD kate-20.04.2.ebuild 3083 BLAKE2B 74741f37689e75288e94dbb203ef1ae3413af7b308e3bc2a173c1b253b5474f9d1b43781f04120e191b53552558ce947cc9e59431c40face1a156773cdcafbea SHA512 d20c2bd342735a5e98381fd619d582f3df15f331c0bd494b44a5f7ddf1ec348c97f69f3ed7aa300722e53856d4b9663d58fa629f906df6314439e5ead368513b
+DIST kate-20.04.3.tar.xz 5813840 BLAKE2B bc078ddb20edb282f3779f3f989cfc1e00444484667e80ab8b93d02a488ffa2308196243df44cc3738300ad6e8ecbf09d58d373c81c484ee3250e90ae617c622 SHA512 b2c850a94f8d07d4df29156c710d492422a021a75dceae53c9452fc2f569534b627646c39141dc39182d2d8c1d13691240f2c586220f6aa1ba7d1605903f04f9
+DIST kate-20.08.0.tar.xz 5848668 BLAKE2B ceec76208df253fd3a80f9c2ed905daee4265e63af9a7aac5708d5024044511c6e9c2895a956b38f4b7b367f11cdcefd0cfa4d9fc5d900e7a3bca194b06bef52 SHA512 223b90e9e17a4b3e41df64cb923b9d62783e49215d4e68722cfd81db0278b122aea5be61cc6fdd9ba87051992c1f3cf2fe3a74042f8d1b4b9a225e7fa93b6e41
+EBUILD kate-20.04.3.ebuild 3043 BLAKE2B adf1b3adadb353804a5b653ddbcf2f00d7e9c1e8a603d1865b78167d6725281127f2cd80eb7ee237bf62bb0896c017b5ae824da242b37e29efff9e14c85030ea SHA512 62d509a8a1ada4b22d7fb61f576fcfa3573c3823d4b7688ab6ca0cbd3b3954a3b9d00ed53e36eb36dc68bad1270ed50606845b7f26d8e6557755adbf898515e7
+EBUILD kate-20.08.0.ebuild 3046 BLAKE2B cfc31955a4740d12b3339fc3c3a2858e751902381ebbaf9157f051458701a8e29a4c93ed0f71551a1bd23b4bbc86cc5f3038489ecfceeca197fb0bbb85d8b8c5 SHA512 6f63e5500d04e59bdb26413cd9c67d7a80b7dbcad3c7430a1aedb2ea7a4a099971012d455709ae6e61361ce766d9c278128d6c0e1d81a50d4df516f7ea4579c4
 MISC metadata.xml 862 BLAKE2B 9b27a2dc759d83a85b1be9a5afc2dedc77caab98255575d493f4af6961d9b5bb19699eb69858082e1bc05dd8ff14f5c0c9212e5e146ff13ec1a3685008fd837d SHA512 d1a90d55277f25dbbad445d8d591da5fa5ddf3bb65aa0ae2d70ba6626abe7deebb56cbcb8a3718c43ad136da2de1b06a017c9740493504b446f33fbeac2734a7
diff --git a/kde-apps/kate/kate-19.12.3.ebuild b/kde-apps/kate/kate-20.04.3.ebuild
index 423bc7036763..3e907e5a01cc 100644
--- a/kde-apps/kate/kate-19.12.3.ebuild
+++ b/kde-apps/kate/kate-20.04.3.ebuild
@@ -5,8 +5,8 @@ EAPI=7
 
 ECM_HANDBOOK="optional"
 ECM_TEST="true"
-KFMIN=5.63.0
-QTMIN=5.12.3
+KFMIN=5.70.0
+QTMIN=5.14.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -17,9 +17,14 @@ https://kde.org/applications/utilities/org.kde.kate"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="activities +filebrowser lspclient +projects plasma +snippets sql"
+IUSE="activities +filebrowser lspclient +projects plasma +snippets sql telemetry"
 
+# only addons/externaltools depends on kiconthemes, too small for USE
 DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
 	>=kde-frameworks/kcodecs-${KFMIN}:5
 	>=kde-frameworks/kcompletion-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
@@ -40,10 +45,6 @@ DEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
 	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
 	filebrowser? ( >=kde-frameworks/kbookmarks-${KFMIN}:5 )
 	lspclient? ( >=kde-frameworks/kitemmodels-${KFMIN}:5 )
@@ -54,13 +55,12 @@ DEPEND="
 	)
 	snippets? ( >=kde-frameworks/knewstuff-${KFMIN}:5 )
 	sql? (
-		>=kde-frameworks/kwallet-${KFMIN}:5
 		>=dev-qt/qtsql-${QTMIN}:5
+		>=kde-frameworks/kwallet-${KFMIN}:5
 	)
+	telemetry? ( dev-libs/kuserfeedback:5 )
 "
-RDEPEND="${DEPEND}
-	!kde-misc/ktexteditorpreviewplugin
-"
+RDEPEND="${DEPEND}"
 
 src_prepare() {
 	ecm_src_prepare
@@ -82,6 +82,7 @@ src_configure() {
 		-DBUILD_snippets=$(usex snippets)
 		-DBUILD_katesql=$(usex sql)
 		-DBUILD_kwrite=FALSE
+		$(cmake_use_find_package telemetry KUserFeedback)
 	)
 
 	ecm_src_configure
diff --git a/kde-apps/kate/kate-20.04.2.ebuild b/kde-apps/kate/kate-20.08.0.ebuild
index 8e01ce44b3eb..e57af7865969 100644
--- a/kde-apps/kate/kate-20.04.2.ebuild
+++ b/kde-apps/kate/kate-20.08.0.ebuild
@@ -5,8 +5,8 @@ EAPI=7
 
 ECM_HANDBOOK="optional"
 ECM_TEST="true"
-KFMIN=5.70.0
-QTMIN=5.14.1
+KFMIN=5.72.0
+QTMIN=5.14.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -60,9 +60,7 @@ DEPEND="
 	)
 	telemetry? ( dev-libs/kuserfeedback:5 )
 "
-RDEPEND="${DEPEND}
-	!kde-misc/ktexteditorpreviewplugin
-"
+RDEPEND="${DEPEND}"
 
 src_prepare() {
 	ecm_src_prepare