gentoo resync : 25.08.2020

3 files changed, 28 insertions, 19 deletions

diff --git a/kde-apps/pim-sieve-editor/Manifest b/kde-apps/pim-sieve-editor/Manifest
index 0243bcc9264e..832ec91491d9 100644
--- a/kde-apps/pim-sieve-editor/Manifest
+++ b/kde-apps/pim-sieve-editor/Manifest
@@ -1,5 +1,5 @@
-DIST pim-sieve-editor-19.12.3.tar.xz 451404 BLAKE2B 40c0d9593b8b106a3d3990ed46a174e1b2a066b1aeb29807102d4127086f055daed48fe56c81802749dbc51dbb46ed1ad5828047c9c4d9ebd4aadd6a4fedef7c SHA512 e21c52d62a98b228aa1d1065911c8739d59b5e23c8486ddbd6360ac0a52d5a08873422bf7da4b0d12000463d16d08f8c6ef028ac12a04b69f49d4616bcea810a
-DIST pim-sieve-editor-20.04.2.tar.xz 452988 BLAKE2B fd1d450bee388f747dcacb555e857d2cc360a76504c68ea12171fe607e7ad410b324b8cac9fbf338e7dda3e6e107cf252698634b449c37f738c1f855dde5c53c SHA512 382e1d7cc915b33eb64fd3233611dc24606157cd072a92338aa975d370bad432ed36849bd5864fbe2499b33069cc7fc57b1e96cd5838968a788b2f7565b3f95b
-EBUILD pim-sieve-editor-19.12.3.ebuild 1286 BLAKE2B 5c3367085cf91319da74567182224b1ae0fc6e0bd8571316f84ad53cbd651615aafadac21a22c7cc59365d9ee83fa32dae2d31b25ab0db74c079522bad08ac3d SHA512 550b17dec7c73d315550f96312174bfbb33fbdd1863a01a71e4c0441432cf1cc818c6f0f93ac046f07738afc8d53b17b08fb9f157a7338f678870d4ef7034fab
-EBUILD pim-sieve-editor-20.04.2.ebuild 1456 BLAKE2B a866e89834ad7ee0568448cd959dc7b8305707f5a2c50f5c44e99c1ccc6f41a49b80e83e79466270d962b307d4404e1b04539c6669b3e562930bf3e453a2189c SHA512 8a81ee408bc5ddc6d00aebdd50aeb37a5d423ff7f27fcd502bf73c9b7c671ccd587e6f5a3b1edb7a66df3eb31d491b03397cdf34deaa40f6e7ba461083b96a3c
+DIST pim-sieve-editor-20.04.3.tar.xz 452796 BLAKE2B ee888665646a1021e956ea5749bfaf78560269f0444c182cc4925c4ec1b16f0a53f8b54ceb5cb2d426553d5c94ac4ee63ce657d18caa412a68b9a1112476345c SHA512 dfdb1dd7edee2fe5b1a59cc02c7d8942bd5fc5fae2f40784ee7b6105bf551050533de93a6df9119bff5941dc236959d6b3eb5aa450deabecb3f6620180a933cd
+DIST pim-sieve-editor-20.08.0.tar.xz 454436 BLAKE2B 9782d2d0b55b7abde647cb54f335d8ca13f06dda3dfa3fa9f94d24e20b68931146f98e7cddd3535cd6e6fc3e523f99527a54774136d9cac050a15d435d6b6f6f SHA512 660302b57a3563e018feabc55571dfc0415c0e7fd88f3ffb78c14b928a5c9ef9efb93520e88d484f425e415bc63eaf793f293200c67bb7577bdf49e942360b1e
+EBUILD pim-sieve-editor-20.04.3.ebuild 1453 BLAKE2B dedf9549937aaae9d1fc04fe7d36b3889ec8cc4d0a43a89f26288c3465db19b32eda28edb94f81f83ed38fdd1b2ef9ff4ab90bd1d07c26334850f96926542172 SHA512 8605c51b2b3c5a3a551c8f947fba7cf17359e20d824d620009359c7348ebecd34997732c97b44b41ddbe2f83e86b74f9a09a3740fbebc558103a804c2bf84df8
+EBUILD pim-sieve-editor-20.08.0.ebuild 1456 BLAKE2B 9a8c337d17aa27399edcc7086e101d50282ea71fbe41accf3c427af839df7a0cfe0ded706a97d6e5f0a3a23c75f50dd4c2c717ef5b0755bac4c8a105b6dea15b SHA512 b5104988fb2f68695b3eb87731528be03bd470ef1300b6229168ae15897a257abbfc3a4be8abae40bd1ee7dd782e52fd2a1ad4d5bf7557cee8c0f49a0daf3ed8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/pim-sieve-editor/pim-sieve-editor-19.12.3.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-20.04.3.ebuild
index 38ed622c3c5f..5890a8f846fa 100644
--- a/kde-apps/pim-sieve-editor/pim-sieve-editor-19.12.3.ebuild
+++ b/kde-apps/pim-sieve-editor/pim-sieve-editor-20.04.3.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.70.0
+QTMIN=5.14.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -16,9 +16,19 @@ DESCRIPTION="Assistant for editing IMAP Sieve filters"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
 KEYWORDS="amd64 arm64 x86"
-IUSE=""
+IUSE="telemetry"
 
 DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-contacts-${PVCUT}:5
+	>=kde-apps/akonadi-mime-${PVCUT}:5
+	>=kde-apps/calendarsupport-${PVCUT}:5
+	>=kde-apps/kmailtransport-${PVCUT}:5
+	>=kde-apps/libksieve-${PVCUT}:5
+	>=kde-apps/pimcommon-${PVCUT}:5
 	>=kde-frameworks/kbookmarks-${KFMIN}:5
 	>=kde-frameworks/kcalendarcore-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
@@ -32,15 +42,14 @@ DEPEND="
 	>=kde-frameworks/kwallet-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/calendarsupport-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/libksieve-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${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-sieve-editor/pim-sieve-editor-20.04.2.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-20.08.0.ebuild
index 11b6d5ee4f27..64bc24fa5b08 100644
--- a/kde-apps/pim-sieve-editor/pim-sieve-editor-20.04.2.ebuild
+++ b/kde-apps/pim-sieve-editor/pim-sieve-editor-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