gentoo resync : 25.04.2020

7 files changed, 11 insertions, 12 deletions

diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index de16ffb0be6b..5feaa58e1950 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest
index 16d303906243..22c1f9cd8554 100644
--- a/kde-plasma/discover/Manifest
+++ b/kde-plasma/discover/Manifest
@@ -1,5 +1,5 @@
 DIST discover-5.17.5.tar.xz 10449596 BLAKE2B 473a93fb66183253c814932e86be7d5a5f454a6146cd202cb2b43d60223f8e15370622b3eb572c27ce041c8fbd9f095ce9733ffa5464d386bdd419cd80db2e75 SHA512 8d8d6675a894f1f50094021f93d38b7bc6d2927fb8434c002e816c1c322ca25134cd73a1b9fce22bb07ae091ccfb156c22399896f47ef1223b8233febb45f866
 DIST discover-5.18.4.1.tar.xz 10475044 BLAKE2B 2fd687ec858d172b69226eede7b808b7f8d5ee59a2c2e913d228825c02c21044a316e77daf532bbe00d4f152afedc79a3edccc7b3cb6d2feff1550ecff27be84 SHA512 bcd3d4e0e8452b9f2bcffa7a2779b7c4721c3e013f451a018d231a463c1d374539fe6b4c95377006adb15c31e562fb67cbb203be1f311bde375b67aa76eb8eb9
 EBUILD discover-5.17.5.ebuild 1890 BLAKE2B f9d2cdf3353a5ffa4a354e2581b0dcec2437ed0d41a1c11a911eaa0181b1e6af28d361a5e70385b0049be721055e826f7889c2c32fe7a66ee5a04a1d0bf1014a SHA512 d179b2a47a5cba53aaacee961bd6ac80ed69b564bc18309a706a45d281ca241307a3008f6f6175a307cebd3e2437ac5ebd84bd81506cd2780bbbc1a3ffb6ca70
-EBUILD discover-5.18.4.1.ebuild 1994 BLAKE2B eb4ca2be2f90412e02f6ec05b8863cde528f1dbc9684c3631d2e8f68ca379ceb75113dbcab3d6f476f0eacd4942896fa893cc5a051c7f9f1a10e44c23fdcae1f SHA512 766c2260fde9a1cb783b7c9bf62f67bbebd6047d20e77450f07ca7d5f875eeb3e2708237800176ec60cc5a12b5da052d80fd5356ae59a1130f4e807137b88bfd
-MISC metadata.xml 476 BLAKE2B 8ca1ce36e2d2cfa0f936b97554434cbb203600c07d479eda0572647f91890559d7f9f7f45a1d8f0f0f1dccce9cc184f1290275b0e9f9b88f21982b1afdd062d3 SHA512 eab82904670cc9e94f685fae0e3755b8065c3f4a39acb0fd5a786da74d751e09850bd3153d3f1daf23b1d59f242066464ec42ec936b4d60fb6ea0e35444088c0
+EBUILD discover-5.18.4.1.ebuild 1997 BLAKE2B 4a06546aaccf4ebe33d1f336cf9078664ca17500ba9cbf955eb28551ee3a6791246b1042d007effa4c1e08ea8920fb54bef664d89175ab34d7728a735881db79 SHA512 75ba6f719ebc767010d3d2f2714fd938a435c786ece464b7c80edad06116563e47d0285599b73c18bf9e865c657de6798667ebff5d94144c0d833d5f553f7775
+MISC metadata.xml 364 BLAKE2B 4ed8b5937febc1af9515c186ab7eefbfb7d7520c8befc9a6397e6bc69bb355715e1a1b536909a7966962d0791a7a272c5591facee0901256862322d2d984a4f0 SHA512 27da3a4431c2f81e442980f8044f93276f7c4e005d5fc2dc92ebc6ec008fa25a441b03185426587f6357da764262c305cbbf998de2fe6c82b3f56a903d88e15b
diff --git a/kde-plasma/discover/discover-5.18.4.1.ebuild b/kde-plasma/discover/discover-5.18.4.1.ebuild
index 26ac53731bc3..d576b1e64597 100644
--- a/kde-plasma/discover/discover-5.18.4.1.ebuild
+++ b/kde-plasma/discover/discover-5.18.4.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://userbase.kde.org/Discover"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="+firmware feedback"
+IUSE="+firmware telemetry"
 
 # libmarkdown (app-text/discount) only used in PackageKitBackend
 DEPEND="
@@ -42,8 +42,8 @@ DEPEND="
 	>=dev-qt/qtnetwork-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=dev-qt/qtxml-${QTMIN}:5
-	feedback? ( dev-libs/kuserfeedback:5 )
 	firmware? ( sys-apps/fwupd )
+	telemetry? ( dev-libs/kuserfeedback:5 )
 "
 RDEPEND="${DEPEND}
 	>=kde-frameworks/kirigami-${KFMIN}:5
@@ -61,8 +61,8 @@ src_configure() {
 		-DCMAKE_DISABLE_FIND_PACKAGE_AppStreamQt=ON
 		-DCMAKE_DISABLE_FIND_PACKAGE_Snapd=ON
 		-DBUILD_FlatpakBackend=OFF
-		$(cmake_use_find_package feedback KUserFeedback)
 		-DBUILD_FwupdBackend=$(usex firmware)
+		$(cmake_use_find_package telemetry KUserFeedback)
 	)
 
 	ecm_src_configure
diff --git a/kde-plasma/discover/metadata.xml b/kde-plasma/discover/metadata.xml
index e917da1f9f25..59d0ace33b0b 100644
--- a/kde-plasma/discover/metadata.xml
+++ b/kde-plasma/discover/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<use>
-		<flag name="feedback">Send anonymized usage information to KDE so they can better understand our users</flag>
 		<flag name="firmware">Enable support for firmware upgrades using <pkg>sys-apps/fwupd</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index fde7d71be44c..45c74baeec7e 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -6,5 +6,5 @@ AUX plasma-workspace-5.17.5-disable-autoscaling-on-qt-5.14.patch 1806 BLAKE2B f1
 DIST plasma-workspace-5.17.5.tar.xz 4962336 BLAKE2B d7c91130d303b612cae09627947547919d44ce91f31340bea4b8987ecc688728e0d937364c76710e0989554282688765bba58308cbb36c889e6729a6fbb7043a SHA512 b8a3f3a1a79d7254deecfb5228749abf15bc6f58ab17eb6d19e9010c74930491439aefa6589980dc0ae53858e4bef6be7edb66a15d3f227c5dfff458c1ca5d1a
 DIST plasma-workspace-5.18.4.1.tar.xz 5696208 BLAKE2B 66dcee693d7755c378971f10ca1a0f8a3020c33df688628d8c3298d5a09aa84f0fc12d5cc5e102dc727a838b3a71114a05dddaf17aaef2ea5d48d71119bfc836 SHA512 683a97a83361149560d866f3d064448a43783c6ea715e9a5e0764ef9ec6dc8bd26e4c7a49023f913b8a649abef39614e5bd3b9e000477949584921c3f1754ab7
 EBUILD plasma-workspace-5.17.5-r1.ebuild 6858 BLAKE2B 7115b9c493a4d5db004042b73eedfe0b91fbc88d100decf3cf94efb14c29ba6828896e7772bf0f1eeadd13419cd4f45b042f2fafc1021db4dbfaa60618c2834e SHA512 2df5bbbc37f0a370d857ae4f8295cca61409c63124f5f4a23f72fd834eb0d4706b7d9b5dc443e4ea7decf982198427af647bd7d28bcc788669c5707eaca09a10
-EBUILD plasma-workspace-5.18.4.1.ebuild 6891 BLAKE2B ec8fff5474d31185f3542c886073777c592d9a364446080536e619ff3f869f8617d90b39e39f735e0adedfb64e7acd88afb53d9876881974c35f11639f622496 SHA512 ab12badff3ce6b2309a63b53687105e8c0bd8a239c4f649ab13ce307d2f3a8fea2c64263a2fdb42a3dbbffd041c3ce8938e3a4fdc2b9ba7d7509b00549576274
-MISC metadata.xml 751 BLAKE2B df3d21257d5343c9c2562f63b889417efd68e64befbf4de841ab6a857c53ea87f6cfb424110e405ba195748c991b8fc4d19ba3e76149e0b80ebbde7c820dc769 SHA512 3eec53a9fbcc444d5d05ca423d90c1b03ac2db94b5703eb65303817f3f4d7276174e2a584c6bab677b348ff660ed77d6317402a890e5dbd6c95ee1fb214cffbc
+EBUILD plasma-workspace-5.18.4.1.ebuild 6894 BLAKE2B 5240f4375d20fa5f02d365b98b7a4359ccae30142f23cf748f68ff007c6cb620141d6b41df6cf19e985c9799269e0b412bda2b92f285199ebedf3b70540b2c6f SHA512 41b5490dcd371a47f6b07d5f452efe4310d67e652ca981c5c9c4fcdfd20d60d75c226060b7e956ed4e8679f815bd033eab87c341dcb4d9e0590dc1b0d4f397a5
+MISC metadata.xml 752 BLAKE2B cd21241fe0de70e075d26290b647b72126b451e8da5f174c5b3616fe4c509fa7cc2beb090ad05e1eef6d4357ac5fa2b6c2425cc71403e0ff576611bf6916bbda SHA512 cc8629cb747580ae01c0fd102859055f93fd70b0d515e646e03e5d832447a0a4ae663f86cfa756b7c30ce7d49a29a513da8a243cfdfcfa1cff0f84234699097e
diff --git a/kde-plasma/plasma-workspace/metadata.xml b/kde-plasma/plasma-workspace/metadata.xml
index 418be213772d..81b172506439 100644
--- a/kde-plasma/plasma-workspace/metadata.xml
+++ b/kde-plasma/plasma-workspace/metadata.xml
@@ -7,9 +7,9 @@
 	</maintainer>
 	<use>
 		<flag name="appstream">Enable AppStream software metadata support</flag>
-		<flag name="feedback">Enable User Feedback control module for <pkg>kde-plasma/systemsettings</pkg></flag>
 		<flag name="geolocation">Enables dataengine providing location information</flag>
 		<flag name="qalculate">Enable Qalculate runner using <pkg>sci-libs/libqalculate</pkg></flag>
 		<flag name="qrcode">Enable support for creating QR codes from clipboard data using <pkg>kde-frameworks/prison</pkg></flag>
+		<flag name="telemetry">Enable User Feedback control module for <pkg>kde-plasma/systemsettings</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.18.4.1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.18.4.1.ebuild
index 86e79d857083..c71af205dabb 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.18.4.1.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.18.4.1.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="KDE Plasma workspace"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="appstream +calendar feedback geolocation gps qalculate qrcode +semantic-desktop systemd"
+IUSE="appstream +calendar geolocation gps qalculate qrcode +semantic-desktop systemd telemetry"
 
 REQUIRED_USE="gps? ( geolocation )"
 
@@ -87,12 +87,12 @@ COMMON_DEPEND="
 	x11-libs/xcb-util-image
 	appstream? ( dev-libs/appstream[qt5] )
 	calendar? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
-	feedback? ( dev-libs/kuserfeedback:5 )
 	geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
 	gps? ( sci-geosciences/gpsd )
 	qalculate? ( sci-libs/libqalculate:= )
 	qrcode? ( >=kde-frameworks/prison-${KFMIN}:5 )
 	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
+	telemetry? ( dev-libs/kuserfeedback:5 )
 "
 DEPEND="${COMMON_DEPEND}
 	>=dev-qt/qtconcurrent-${QTMIN}:5
@@ -176,11 +176,11 @@ src_configure() {
 		-DBUILD_xembed-sni-proxy=OFF
 		$(cmake_use_find_package appstream AppStreamQt)
 		$(cmake_use_find_package calendar KF5Holidays)
-		$(cmake_use_find_package feedback KUserFeedback)
 		$(cmake_use_find_package geolocation KF5NetworkManagerQt)
 		$(cmake_use_find_package qalculate Qalculate)
 		$(cmake_use_find_package qrcode KF5Prison)
 		$(cmake_use_find_package semantic-desktop KF5Baloo)
+		$(cmake_use_find_package telemetry KUserFeedback)
 	)
 
 	use geolocation && mycmakeargs+=( $(cmake_use_find_package gps libgps) )