kde-apps/gwenview: Drop IUSE annotate

It's actually required. Follow-up to 0af99b556a8a5c1b6aa37b70c7295d4278e4a329

Upstream commit 8f3bf87bcda2f678a15a48a5cefdca912d80dff8

Bug: https://bugs.gentoo.org/868333
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

3 files changed, 6 insertions, 7 deletions

diff --git a/kde-apps/gwenview/gwenview-22.08.49.9999.ebuild b/kde-apps/gwenview/gwenview-22.08.49.9999.ebuild
index 3d2c2ec21a9..b08f2f71c81 100644
--- a/kde-apps/gwenview/gwenview-22.08.49.9999.ebuild
+++ b/kde-apps/gwenview/gwenview-22.08.49.9999.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/gwenview/ https://userbase.kde.org/Gwenview"
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
 SLOT="5"
 KEYWORDS=""
-IUSE="activities +annotate fits +mpris raw semantic-desktop share X"
+IUSE="activities fits +mpris raw semantic-desktop share X"
 
 # requires running environment
 RESTRICT="test"
@@ -44,13 +44,14 @@ COMMON_DEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-frameworks/solid-${KFMIN}:5
 	media-gfx/exiv2:=
+	media-libs/kcolorpicker
+	>=media-libs/kimageannotator-0.5.0
 	media-libs/lcms:2
 	media-libs/libjpeg-turbo:=
 	media-libs/libpng:0=
 	>=media-libs/phonon-4.11.0
 	media-libs/tiff
 	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
-	annotate? ( >=media-libs/kimageannotator-0.5.0 )
 	fits? ( sci-libs/cfitsio )
 	mpris? ( >=dev-qt/qtdbus-${QTMIN}:5 )
 	raw? ( >=kde-apps/libkdcraw-${PVCUT}:5 )
@@ -84,7 +85,6 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package activities KF5Activities)
-		$(cmake_use_find_package annotate kImageAnnotator)
 		$(cmake_use_find_package fits CFitsio)
 		$(cmake_use_find_package raw KF5KDcraw)
 		-DGWENVIEW_SEMANTICINFO_BACKEND=$(usex semantic-desktop Baloo None)
diff --git a/kde-apps/gwenview/gwenview-9999.ebuild b/kde-apps/gwenview/gwenview-9999.ebuild
index 3d2c2ec21a9..b08f2f71c81 100644
--- a/kde-apps/gwenview/gwenview-9999.ebuild
+++ b/kde-apps/gwenview/gwenview-9999.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/gwenview/ https://userbase.kde.org/Gwenview"
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
 SLOT="5"
 KEYWORDS=""
-IUSE="activities +annotate fits +mpris raw semantic-desktop share X"
+IUSE="activities fits +mpris raw semantic-desktop share X"
 
 # requires running environment
 RESTRICT="test"
@@ -44,13 +44,14 @@ COMMON_DEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-frameworks/solid-${KFMIN}:5
 	media-gfx/exiv2:=
+	media-libs/kcolorpicker
+	>=media-libs/kimageannotator-0.5.0
 	media-libs/lcms:2
 	media-libs/libjpeg-turbo:=
 	media-libs/libpng:0=
 	>=media-libs/phonon-4.11.0
 	media-libs/tiff
 	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
-	annotate? ( >=media-libs/kimageannotator-0.5.0 )
 	fits? ( sci-libs/cfitsio )
 	mpris? ( >=dev-qt/qtdbus-${QTMIN}:5 )
 	raw? ( >=kde-apps/libkdcraw-${PVCUT}:5 )
@@ -84,7 +85,6 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package activities KF5Activities)
-		$(cmake_use_find_package annotate kImageAnnotator)
 		$(cmake_use_find_package fits CFitsio)
 		$(cmake_use_find_package raw KF5KDcraw)
 		-DGWENVIEW_SEMANTICINFO_BACKEND=$(usex semantic-desktop Baloo None)
diff --git a/kde-apps/gwenview/metadata.xml b/kde-apps/gwenview/metadata.xml
index b0e63c7843d..4e5e4b8b858 100644
--- a/kde-apps/gwenview/metadata.xml
+++ b/kde-apps/gwenview/metadata.xml
@@ -10,7 +10,6 @@
 	</upstream>
 	<use>
 		<flag name="activities">Enable kactivities support</flag>
-		<flag name="annotate">Enable support for image annotations using <pkg>media-libs/kimageannotator</pkg></flag>
 		<flag name="fits">Enable support for NASA's <pkg>sci-libs/cfitsio</pkg> library</flag>
 		<flag name="mpris">Enable support for MPRIS2 interface, requiring <pkg>dev-qt/qtdbus</pkg> as dependency.</flag>
 		<flag name="share">Enable support for a share menu using <pkg>kde-frameworks/purpose</pkg></flag>