commit:     2bd8c8d788eb1045a7b08b225108f10bb21deb2d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  7 19:38:00 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug  7 19:41:46 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=2bd8c8d7

media-gfx/digikam: Add missing dependencies, drop IUSE opengl

Drop ~x86 since dev-qt/qtwebengine:6 is not optional.

Upstream commits:
092c60231a3d7171bebfee6d6f35a1e4c726419f
9f3319fefa1ceaae04e326eb5361b53ce6823623
6de61920616c6bc0d8eddc054042c74c0baa4697

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

 media-gfx/digikam/digikam-9999.ebuild | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/media-gfx/digikam/digikam-9999.ebuild 
b/media-gfx/digikam/digikam-9999.ebuild
index 69dfaa98ae..76e40575bd 100644
--- a/media-gfx/digikam/digikam-9999.ebuild
+++ b/media-gfx/digikam/digikam-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
        else
                SRC_URI="mirror://kde/stable/${PN}/${PV}/${TARNAME}.tar.xz"
        fi
-       KEYWORDS="~amd64 ~arm64 ~x86"
+       KEYWORDS="~amd64 ~arm64"
 fi
 
 DESCRIPTION="Digital photo management application"
@@ -22,15 +22,17 @@ HOMEPAGE="https://www.digikam.org/";
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="addressbook calendar geolocation gphoto2 heif +imagemagick jpegxl 
+lensfun mysql opengl openmp +panorama scanner semantic-desktop spell video"
+IUSE="addressbook calendar geolocation gphoto2 heif +imagemagick jpegxl 
+lensfun mysql openmp +panorama scanner semantic-desktop spell video"
 
 # bug 366505
 RESTRICT="test"
 
 COMMON_DEPEND="
        dev-libs/expat
-       
>=dev-qt/qtbase-${QTMIN}:6[concurrent,dbus,-gles2-only,gui,mysql?,network,sql,widgets,xml]
+       
>=dev-qt/qtbase-${QTMIN}:6[concurrent,dbus,-gles2-only,gui,mysql?,network,opengl,sql,widgets,xml]
        >=dev-qt/qtnetworkauth-${QTMIN}:6
+       >=dev-qt/qtscxml-${QTMIN}:6
+       >=dev-qt/qtsvg-${QTMIN}:6
        >=dev-qt/qtwebengine-${QTMIN}:6[widgets]
        >=kde-frameworks/kconfig-${KFMIN}:6
        >=kde-frameworks/kconfigwidgets-${KFMIN}:6
@@ -52,6 +54,7 @@ COMMON_DEPEND="
        media-libs/libpng:=
        >=media-libs/opencv-3.3.0:=[contrib,contribdnn,features2d]
        media-libs/tiff:=
+       virtual/opengl
        x11-libs/libX11
        addressbook? (
                >=kde-apps/akonadi-contacts-24.05.2:6
@@ -66,10 +69,6 @@ COMMON_DEPEND="
        imagemagick? ( media-gfx/imagemagick:= )
        jpegxl? ( media-libs/libjxl:= )
        lensfun? ( media-libs/lensfun )
-       opengl? (
-               >=dev-qt/qtbase-${QTMIN}:6[opengl]
-               virtual/opengl
-       )
        panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:6 )
        scanner? ( >=kde-apps/libksane-24.05.2:6 )
        semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:6 )
@@ -128,7 +127,6 @@ src_configure() {
                $(cmake_use_find_package lensfun LensFun)
                -DENABLE_MYSQLSUPPORT=$(usex mysql)
                -DENABLE_INTERNALMYSQL=$(usex mysql)
-               $(cmake_use_find_package opengl OpenGL)
                $(cmake_use_find_package panorama KF6ThreadWeaver)
                $(cmake_use_find_package scanner KSaneWidgets6)
                -DENABLE_KFILEMETADATASUPPORT=$(usex semantic-desktop)

Reply via email to