dev-libs/kuserfeedback: pkgmove to kde-frameworks/kuserfeedback

See also:
https://mail.kde.org/pipermail/kde-frameworks-devel/2023-November/123319.html

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

26 files changed, 35 insertions, 35 deletions

diff --git a/kde-apps/akregator/akregator-23.08.49.9999.ebuild b/kde-apps/akregator/akregator-23.08.49.9999.ebuild
index 0b3b7b05c23..6f19d630019 100644
--- a/kde-apps/akregator/akregator-23.08.49.9999.ebuild
+++ b/kde-apps/akregator/akregator-23.08.49.9999.ebuild
@@ -48,7 +48,7 @@ RDEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-frameworks/syndication-${KFMIN}:5
-	telemetry? ( >=dev-libs/kuserfeedback-1.2.0:5 )
+	telemetry? ( >=kde-frameworks/kuserfeedback-1.2.0:5 )
 "
 DEPEND="${RDEPEND}"
 
diff --git a/kde-apps/akregator/akregator-9999.ebuild b/kde-apps/akregator/akregator-9999.ebuild
index 0b3b7b05c23..6f19d630019 100644
--- a/kde-apps/akregator/akregator-9999.ebuild
+++ b/kde-apps/akregator/akregator-9999.ebuild
@@ -48,7 +48,7 @@ RDEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-frameworks/syndication-${KFMIN}:5
-	telemetry? ( >=dev-libs/kuserfeedback-1.2.0:5 )
+	telemetry? ( >=kde-frameworks/kuserfeedback-1.2.0:5 )
 "
 DEPEND="${RDEPEND}"
 
diff --git a/kde-apps/dolphin/dolphin-23.08.49.9999.ebuild b/kde-apps/dolphin/dolphin-23.08.49.9999.ebuild
index abf9d25451d..a531bb5d7cb 100644
--- a/kde-apps/dolphin/dolphin-23.08.49.9999.ebuild
+++ b/kde-apps/dolphin/dolphin-23.08.49.9999.ebuild
@@ -55,7 +55,7 @@ DEPEND="
 		>=kde-frameworks/baloo-${KFMIN}:5
 		>=kde-frameworks/kfilemetadata-${KFMIN}:5
 	)
-	telemetry? ( dev-libs/kuserfeedback:5 )
+	telemetry? ( kde-frameworks/kuserfeedback:5 )
 "
 RDEPEND="${DEPEND}
 	>=kde-apps/kio-extras-${PVCUT}:5
diff --git a/kde-apps/dolphin/dolphin-9999.ebuild b/kde-apps/dolphin/dolphin-9999.ebuild
index abf9d25451d..a531bb5d7cb 100644
--- a/kde-apps/dolphin/dolphin-9999.ebuild
+++ b/kde-apps/dolphin/dolphin-9999.ebuild
@@ -55,7 +55,7 @@ DEPEND="
 		>=kde-frameworks/baloo-${KFMIN}:5
 		>=kde-frameworks/kfilemetadata-${KFMIN}:5
 	)
-	telemetry? ( dev-libs/kuserfeedback:5 )
+	telemetry? ( kde-frameworks/kuserfeedback:5 )
 "
 RDEPEND="${DEPEND}
 	>=kde-apps/kio-extras-${PVCUT}:5
diff --git a/kde-apps/kaddressbook/kaddressbook-23.08.49.9999.ebuild b/kde-apps/kaddressbook/kaddressbook-23.08.49.9999.ebuild
index ae7b3b7876a..91a5aad658f 100644
--- a/kde-apps/kaddressbook/kaddressbook-23.08.49.9999.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-23.08.49.9999.ebuild
@@ -49,7 +49,7 @@ DEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-frameworks/prison-${KFMIN}:5
-	telemetry? ( >=dev-libs/kuserfeedback-1.2.0:5 )
+	telemetry? ( >=kde-frameworks/kuserfeedback-1.2.0:5 )
 "
 RDEPEND="${DEPEND}
 	>=kde-apps/kdepim-runtime-${PVCUT}:5
diff --git a/kde-apps/kaddressbook/kaddressbook-9999.ebuild b/kde-apps/kaddressbook/kaddressbook-9999.ebuild
index ae7b3b7876a..91a5aad658f 100644
--- a/kde-apps/kaddressbook/kaddressbook-9999.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-9999.ebuild
@@ -49,7 +49,7 @@ DEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-frameworks/prison-${KFMIN}:5
-	telemetry? ( >=dev-libs/kuserfeedback-1.2.0:5 )
+	telemetry? ( >=kde-frameworks/kuserfeedback-1.2.0:5 )
 "
 RDEPEND="${DEPEND}
 	>=kde-apps/kdepim-runtime-${PVCUT}:5
diff --git a/kde-apps/kate-lib/kate-lib-23.08.49.9999.ebuild b/kde-apps/kate-lib/kate-lib-23.08.49.9999.ebuild
index cb372d9537d..623ab8be4fc 100644
--- a/kde-apps/kate-lib/kate-lib-23.08.49.9999.ebuild
+++ b/kde-apps/kate-lib/kate-lib-23.08.49.9999.ebuild
@@ -40,7 +40,7 @@ DEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
 	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
-	telemetry? ( dev-libs/kuserfeedback:5 )
+	telemetry? ( kde-frameworks/kuserfeedback:5 )
 "
 RDEPEND="${DEPEND}
 	!<kde-apps/kate-22.08.0:5
diff --git a/kde-apps/kate-lib/kate-lib-9999.ebuild b/kde-apps/kate-lib/kate-lib-9999.ebuild
index cb372d9537d..623ab8be4fc 100644
--- a/kde-apps/kate-lib/kate-lib-9999.ebuild
+++ b/kde-apps/kate-lib/kate-lib-9999.ebuild
@@ -40,7 +40,7 @@ DEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
 	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
-	telemetry? ( dev-libs/kuserfeedback:5 )
+	telemetry? ( kde-frameworks/kuserfeedback:5 )
 "
 RDEPEND="${DEPEND}
 	!<kde-apps/kate-22.08.0:5
diff --git a/kde-apps/kmail/kmail-23.08.49.9999.ebuild b/kde-apps/kmail/kmail-23.08.49.9999.ebuild
index 5892213bdc5..9cff5376152 100644
--- a/kde-apps/kmail/kmail-23.08.49.9999.ebuild
+++ b/kde-apps/kmail/kmail-23.08.49.9999.ebuild
@@ -73,7 +73,7 @@ COMMON_DEPEND="
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-frameworks/sonnet-${KFMIN}:5
-	telemetry? ( >=dev-libs/kuserfeedback-1.2.0:5 )
+	telemetry? ( >=kde-frameworks/kuserfeedback-1.2.0:5 )
 "
 DEPEND="${COMMON_DEPEND}
 	>=kde-apps/kcalutils-${PVCUT}:5
diff --git a/kde-apps/kmail/kmail-9999.ebuild b/kde-apps/kmail/kmail-9999.ebuild
index 5892213bdc5..9cff5376152 100644
--- a/kde-apps/kmail/kmail-9999.ebuild
+++ b/kde-apps/kmail/kmail-9999.ebuild
@@ -73,7 +73,7 @@ COMMON_DEPEND="
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-frameworks/sonnet-${KFMIN}:5
-	telemetry? ( >=dev-libs/kuserfeedback-1.2.0:5 )
+	telemetry? ( >=kde-frameworks/kuserfeedback-1.2.0:5 )
 "
 DEPEND="${COMMON_DEPEND}
 	>=kde-apps/kcalutils-${PVCUT}:5
diff --git a/kde-apps/korganizer/korganizer-23.08.49.9999.ebuild b/kde-apps/korganizer/korganizer-23.08.49.9999.ebuild
index ec7dedcc579..138fdc87ec5 100644
--- a/kde-apps/korganizer/korganizer-23.08.49.9999.ebuild
+++ b/kde-apps/korganizer/korganizer-23.08.49.9999.ebuild
@@ -62,7 +62,7 @@ COMMON_DEPEND="
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	x11-libs/libX11
-	telemetry? ( >=dev-libs/kuserfeedback-1.2.0:5 )
+	telemetry? ( >=kde-frameworks/kuserfeedback-1.2.0:5 )
 "
 DEPEND="${COMMON_DEPEND}
 	>=dev-qt/designer-${QTMIN}:5
diff --git a/kde-apps/korganizer/korganizer-9999.ebuild b/kde-apps/korganizer/korganizer-9999.ebuild
index ec7dedcc579..138fdc87ec5 100644
--- a/kde-apps/korganizer/korganizer-9999.ebuild
+++ b/kde-apps/korganizer/korganizer-9999.ebuild
@@ -62,7 +62,7 @@ COMMON_DEPEND="
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	x11-libs/libX11
-	telemetry? ( >=dev-libs/kuserfeedback-1.2.0:5 )
+	telemetry? ( >=kde-frameworks/kuserfeedback-1.2.0:5 )
 "
 DEPEND="${COMMON_DEPEND}
 	>=dev-qt/designer-${QTMIN}:5
diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-23.08.49.9999.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-23.08.49.9999.ebuild
index c41a80adb88..365a2e378ef 100644
--- a/kde-apps/pim-data-exporter/pim-data-exporter-23.08.49.9999.ebuild
+++ b/kde-apps/pim-data-exporter/pim-data-exporter-23.08.49.9999.ebuild
@@ -44,7 +44,7 @@ DEPEND="
 	>=kde-frameworks/knotifications-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	telemetry? ( >=dev-libs/kuserfeedback-1.2.0:5 )
+	telemetry? ( >=kde-frameworks/kuserfeedback-1.2.0:5 )
 "
 RDEPEND="${DEPEND}"
 
diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-9999.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-9999.ebuild
index c41a80adb88..365a2e378ef 100644
--- a/kde-apps/pim-data-exporter/pim-data-exporter-9999.ebuild
+++ b/kde-apps/pim-data-exporter/pim-data-exporter-9999.ebuild
@@ -44,7 +44,7 @@ DEPEND="
 	>=kde-frameworks/knotifications-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	telemetry? ( >=dev-libs/kuserfeedback-1.2.0:5 )
+	telemetry? ( >=kde-frameworks/kuserfeedback-1.2.0:5 )
 "
 RDEPEND="${DEPEND}"
 
diff --git a/kde-apps/pim-sieve-editor/pim-sieve-editor-23.08.49.9999.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-23.08.49.9999.ebuild
index 3a490d17b47..2323d6d641a 100644
--- a/kde-apps/pim-sieve-editor/pim-sieve-editor-23.08.49.9999.ebuild
+++ b/kde-apps/pim-sieve-editor/pim-sieve-editor-23.08.49.9999.ebuild
@@ -40,7 +40,7 @@ DEPEND="
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	telemetry? ( >=dev-libs/kuserfeedback-1.2.0:5 )
+	telemetry? ( >=kde-frameworks/kuserfeedback-1.2.0:5 )
 "
 RDEPEND="${DEPEND}"
 
diff --git a/kde-apps/pim-sieve-editor/pim-sieve-editor-9999.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-9999.ebuild
index 3a490d17b47..2323d6d641a 100644
--- a/kde-apps/pim-sieve-editor/pim-sieve-editor-9999.ebuild
+++ b/kde-apps/pim-sieve-editor/pim-sieve-editor-9999.ebuild
@@ -40,7 +40,7 @@ DEPEND="
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	telemetry? ( >=dev-libs/kuserfeedback-1.2.0:5 )
+	telemetry? ( >=kde-frameworks/kuserfeedback-1.2.0:5 )
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-libs/kuserfeedback/kuserfeedback-9999.ebuild b/kde-frameworks/kuserfeedback/kuserfeedback-5.9999.ebuild
index fff77378e44..9e97b440850 100644
--- a/dev-libs/kuserfeedback/kuserfeedback-9999.ebuild
+++ b/kde-frameworks/kuserfeedback/kuserfeedback-5.9999.ebuild
@@ -3,19 +3,17 @@
 
 EAPI=8
 
+ECM_QTHELP="false"
 ECM_TEST="forceoptional"
-KFMIN=5.106.0
+PVCUT=$(ver_cut 1-2)
 QTMIN=5.15.9
-inherit ecm kde.org
+inherit ecm frameworks.kde.org
 
 DESCRIPTION="Framework to collect user feedback for applications via telemetry and surveys"
+EGIT_BRANCH="master" # TODO: drop on move to 9999
 
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-fi
 LICENSE="MIT"
-SLOT="5"
+KEYWORDS=""
 IUSE="doc"
 
 DEPEND="
@@ -27,11 +25,11 @@ DEPEND="
 	>=dev-qt/qtsql-${QTMIN}:5
 	>=dev-qt/qtsvg-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kconfig-${PVCUT}:5
+	>=kde-frameworks/kcoreaddons-${PVCUT}:5
+	>=kde-frameworks/kdeclarative-${PVCUT}:5
+	>=kde-frameworks/kguiaddons-${PVCUT}:5
+	>=kde-frameworks/kwidgetsaddons-${PVCUT}:5
 "
 RDEPEND="${DEPEND}"
 BDEPEND="
diff --git a/dev-libs/kuserfeedback/metadata.xml b/kde-frameworks/kuserfeedback/metadata.xml
index d925f243975..8dc2c044b2d 100644
--- a/dev-libs/kuserfeedback/metadata.xml
+++ b/kde-frameworks/kuserfeedback/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="kde-invent">frameworks/kuserfeedback</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/kde-plasma/discover/discover-5.27.49.9999.ebuild b/kde-plasma/discover/discover-5.27.49.9999.ebuild
index d4256630d65..b589d228eb3 100644
--- a/kde-plasma/discover/discover-5.27.49.9999.ebuild
+++ b/kde-plasma/discover/discover-5.27.49.9999.ebuild
@@ -45,7 +45,7 @@ DEPEND="
 	firmware? ( >=sys-apps/fwupd-1.5.0 )
 	flatpak? ( sys-apps/flatpak )
 	snap? ( sys-libs/snapd-glib:=[qt5] )
-	telemetry? ( dev-libs/kuserfeedback:5 )
+	telemetry? ( kde-frameworks/kuserfeedback:5 )
 	webengine? ( >=dev-qt/qtwebview-${QTMIN}:5 )
 "
 RDEPEND="${DEPEND}
diff --git a/kde-plasma/discover/discover-9999.ebuild b/kde-plasma/discover/discover-9999.ebuild
index d4256630d65..b589d228eb3 100644
--- a/kde-plasma/discover/discover-9999.ebuild
+++ b/kde-plasma/discover/discover-9999.ebuild
@@ -45,7 +45,7 @@ DEPEND="
 	firmware? ( >=sys-apps/fwupd-1.5.0 )
 	flatpak? ( sys-apps/flatpak )
 	snap? ( sys-libs/snapd-glib:=[qt5] )
-	telemetry? ( dev-libs/kuserfeedback:5 )
+	telemetry? ( kde-frameworks/kuserfeedback:5 )
 	webengine? ( >=dev-qt/qtwebview-${QTMIN}:5 )
 "
 RDEPEND="${DEPEND}
diff --git a/kde-plasma/plasma-welcome/plasma-welcome-5.27.49.9999.ebuild b/kde-plasma/plasma-welcome/plasma-welcome-5.27.49.9999.ebuild
index 84957d4665c..83d01c48ca1 100644
--- a/kde-plasma/plasma-welcome/plasma-welcome-5.27.49.9999.ebuild
+++ b/kde-plasma/plasma-welcome/plasma-welcome-5.27.49.9999.ebuild
@@ -34,7 +34,7 @@ DEPEND="
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 	>=kde-frameworks/plasma-${KFMIN}:5
 	kaccounts? ( kde-apps/kaccounts-integration:5 )
-	telemetry? ( dev-libs/kuserfeedback:5 )
+	telemetry? ( kde-frameworks/kuserfeedback:5 )
 "
 RDEPEND="${DEPEND}
 	discover? ( kde-plasma/discover:5 )
diff --git a/kde-plasma/plasma-welcome/plasma-welcome-9999.ebuild b/kde-plasma/plasma-welcome/plasma-welcome-9999.ebuild
index 7d300e11a33..113729ea93f 100644
--- a/kde-plasma/plasma-welcome/plasma-welcome-9999.ebuild
+++ b/kde-plasma/plasma-welcome/plasma-welcome-9999.ebuild
@@ -34,7 +34,7 @@ DEPEND="
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 	>=kde-frameworks/plasma-${KFMIN}:5
 	kaccounts? ( kde-apps/kaccounts-integration:5 )
-	telemetry? ( dev-libs/kuserfeedback:5 )
+	telemetry? ( kde-frameworks/kuserfeedback:5 )
 "
 RDEPEND="${DEPEND}
 	discover? ( kde-plasma/discover:5 )
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.27.49.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.27.49.9999.ebuild
index 06909de1e87..a1ff60b7b0b 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.27.49.9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.27.49.9999.ebuild
@@ -121,7 +121,7 @@ COMMON_DEPEND="
 		x11-libs/libdrm
 	)
 	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
-	telemetry? ( dev-libs/kuserfeedback:5 )
+	telemetry? ( kde-frameworks/kuserfeedback:5 )
 	wallpaper-metadata? ( kde-apps/libkexiv2:5 )
 "
 DEPEND="${COMMON_DEPEND}
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
index 06909de1e87..a1ff60b7b0b 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
@@ -121,7 +121,7 @@ COMMON_DEPEND="
 		x11-libs/libdrm
 	)
 	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
-	telemetry? ( dev-libs/kuserfeedback:5 )
+	telemetry? ( kde-frameworks/kuserfeedback:5 )
 	wallpaper-metadata? ( kde-apps/libkexiv2:5 )
 "
 DEPEND="${COMMON_DEPEND}
diff --git a/profiles/updates/4Q-2023 b/profiles/updates/4Q-2023
index dead021c389..fe78e7566bb 100644
--- a/profiles/updates/4Q-2023
+++ b/profiles/updates/4Q-2023
@@ -1,3 +1,4 @@
 move app-office/kalendar app-office/merkuro
 move kde-misc/wacomtablet kde-plasma/wacomtablet
 move kde-apps/print-manager kde-plasma/print-manager
+move dev-libs/kuserfeedback kde-frameworks/kuserfeedback
diff --git a/sets/kde-frameworks-5-tier1 b/sets/kde-frameworks-5-tier1
index 74e76e8027f..16dec22468f 100644
--- a/sets/kde-frameworks-5-tier1
+++ b/sets/kde-frameworks-5-tier1
@@ -23,7 +23,7 @@ kde-frameworks/kitemmodels:5
 kde-frameworks/kitemviews:5
 kde-frameworks/kplotting:5
 kde-frameworks/kquickcharts:5
-# TODO: future: dev-libs/kuserfeedback
+# FIXME: uncomment: kde-frameworks/kuserfeedback:6
 kde-frameworks/kwayland:5
 kde-frameworks/kwidgetsaddons:5
 kde-frameworks/kwindowsystem:5