[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     192ef7abd7a7a62d1326896888e9ed695921ef6d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 26 12:51:48 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Mar 26 12:54:16 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=192ef7ab

media-gfx/digikam: Drop IUSE marble, add IUSE geolocation

Upstream commits:
99dce91a6165b7d91a19e070a5a1498cca016e7e "tinymarble++"
... a lot of garbage commit messages in between ...
72ae68dcdc27ba7cf4b55d6b9d0945c15fb6ad57 "add new option to enable or disable geolocation support"
071e151ff6c65aa28b749f0eed48bea48c184bbc "HAVE_MARBLE -> HAVE_GEOLOCATION"

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

 media-gfx/digikam/digikam-9999.ebuild | 9 ++-------
 media-gfx/digikam/metadata.xml        | 1 -
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/media-gfx/digikam/digikam-9999.ebuild b/media-gfx/digikam/digikam-9999.ebuild
index 5b11866565..1b651216d0 100644
--- a/media-gfx/digikam/digikam-9999.ebuild
+++ b/media-gfx/digikam/digikam-9999.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="https://www.digikam.org/"
 
 LICENSE="GPL-2"
 SLOT="5"
-IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble mysql opengl openmp +panorama scanner semantic-desktop spell"
+IUSE="addressbook calendar geolocation gphoto2 heif +imagemagick +lensfun mysql opengl openmp +panorama scanner semantic-desktop spell"
 
 # bug 366505
 RESTRICT="test"
@@ -73,11 +73,6 @@ COMMON_DEPEND="
 	)
 	imagemagick? ( media-gfx/imagemagick:= )
 	lensfun? ( media-libs/lensfun )
-	marble? (
-		>=dev-qt/qtconcurrent-${QTMIN}:5
-		>=kde-apps/marble-23.08.3:5
-		>=kde-frameworks/kbookmarks-${KFMIN}:5
-	)
 	opengl? (
 		>=dev-qt/qtopengl-${QTMIN}:5
 		virtual/opengl
@@ -129,11 +124,11 @@ src_configure() {
 		-DENABLE_QWEBENGINE=ON
 		-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
 		$(cmake_use_find_package calendar KF5CalendarCore)
+		-DENABLE_GEOLOCATION=$(usex geolocation)
 		$(cmake_use_find_package gphoto2 Gphoto2)
 		$(cmake_use_find_package heif Libheif)
 		$(cmake_use_find_package imagemagick ImageMagick)
 		$(cmake_use_find_package lensfun LensFun)
-		$(cmake_use_find_package marble Marble)
 		-DENABLE_MYSQLSUPPORT=$(usex mysql)
 		-DENABLE_INTERNALMYSQL=$(usex mysql)
 		$(cmake_use_find_package opengl OpenGL)

diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml
index 4c55a9727c..0a97204254 100644
--- a/media-gfx/digikam/metadata.xml
+++ b/media-gfx/digikam/metadata.xml
@@ -16,7 +16,6 @@
 		<flag name="addressbook">Enable akonadi contact integration</flag>
 		<flag name="imagemagick">Enable support for additional image formats such as XCF, FITS, HEIC etc.</flag>
 		<flag name="lensfun">Enable support for <pkg>media-libs/lensfun</pkg></flag>
-		<flag name="marble">Enable support for geolocation using <pkg>kde-apps/marble</pkg></flag>
 		<flag name="panorama">Build the panorama plugin which requires <pkg>media-gfx/hugin</pkg></flag>
 		<flag name="semantic-desktop">Enable <pkg>kde-frameworks/kfilemetadata</pkg> support</flag>
 	</use>