From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 15660159C9B for ; Wed, 7 Aug 2024 19:43:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 52C612BC117; Wed, 7 Aug 2024 19:43:11 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 303A62BC117 for ; Wed, 7 Aug 2024 19:43:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6033A3430C1 for ; Wed, 7 Aug 2024 19:43:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 995B21DCA for ; Wed, 7 Aug 2024 19:43:08 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1723059706.2bd8c8d788eb1045a7b08b225108f10bb21deb2d.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: media-gfx/digikam/ X-VCS-Repository: proj/kde X-VCS-Files: media-gfx/digikam/digikam-9999.ebuild X-VCS-Directories: media-gfx/digikam/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 2bd8c8d788eb1045a7b08b225108f10bb21deb2d X-VCS-Branch: master Date: Wed, 7 Aug 2024 19:43:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 65e082dd-5f18-4c1a-a748-33d9e5cccebd X-Archives-Hash: 9fae01749251f2e1ecf5507b6d952138 commit: 2bd8c8d788eb1045a7b08b225108f10bb21deb2d Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Aug 7 19:38:00 2024 +0000 Commit: Andreas Sturmlechner gentoo 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 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)