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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 420A1138359 for ; Tue, 18 Aug 2020 19:36:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 92A22E0894; Tue, 18 Aug 2020 19:36:08 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E98D8E0875 for ; Tue, 18 Aug 2020 19:36:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2FEF734ED70 for ; Tue, 18 Aug 2020 19:36:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A0227324 for ; Tue, 18 Aug 2020 19:36:04 +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: <1597775706.4d87fa70cd168a98c523932d9d8c43b8cf74d319.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 media-gfx/digikam/metadata.xml X-VCS-Directories: media-gfx/digikam/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 4d87fa70cd168a98c523932d9d8c43b8cf74d319 X-VCS-Branch: master Date: Tue, 18 Aug 2020 19:36:04 +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: 76c92994-35d5-43dc-92b7-b10e69f9e733 X-Archives-Hash: 2c1866a968d50d5ab2ddf39bfbfa8a27 commit: 4d87fa70cd168a98c523932d9d8c43b8cf74d319 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Aug 18 18:34:38 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Aug 18 18:35:06 2020 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=4d87fa70 media-gfx/digikam: Drop IUSE=webkit Package-Manager: Portage-3.0.3, Repoman-3.0.0 Signed-off-by: Andreas Sturmlechner gentoo.org> media-gfx/digikam/digikam-9999.ebuild | 7 +++---- media-gfx/digikam/metadata.xml | 1 - 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/media-gfx/digikam/digikam-9999.ebuild b/media-gfx/digikam/digikam-9999.ebuild index f96bf0ae40..d630d405fe 100644 --- a/media-gfx/digikam/digikam-9999.ebuild +++ b/media-gfx/digikam/digikam-9999.ebuild @@ -24,7 +24,7 @@ HOMEPAGE="https://www.digikam.org/" LICENSE="GPL-2" SLOT="5" -IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop webkit X" +IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop X" BDEPEND=" >=dev-util/cmake-3.14.3 @@ -42,6 +42,7 @@ COMMON_DEPEND=" >=dev-qt/qtnetwork-${QTMIN}:5 >=dev-qt/qtprintsupport-${QTMIN}:5 >=dev-qt/qtsql-${QTMIN}:5[mysql?] + >=dev-qt/qtwebengine-${QTMIN}:5[widgets] >=dev-qt/qtwidgets-${QTMIN}:5 >=dev-qt/qtxml-${QTMIN}:5 >=dev-qt/qtxmlpatterns-${QTMIN}:5 @@ -90,8 +91,6 @@ COMMON_DEPEND=" panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:5 ) scanner? ( >=kde-apps/libksane-19.04.3:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 ) - !webkit? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] ) - webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) X? ( >=dev-qt/qtx11extras-${QTMIN}:5 x11-libs/libX11 @@ -125,6 +124,7 @@ src_configure() { -DBUILD_TESTING=OFF # bug 698192 -DENABLE_APPSTYLES=ON -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON + -DENABLE_QWEBENGINE=ON -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook) $(cmake_use_find_package calendar KF5CalendarCore) $(cmake_use_find_package gphoto2 Gphoto2) @@ -140,7 +140,6 @@ src_configure() { $(cmake_use_find_package panorama KF5ThreadWeaver) $(cmake_use_find_package scanner KF5Sane) $(cmake_use_find_package semantic-desktop KF5FileMetaData) - -DENABLE_QWEBENGINE=$(usex !webkit) $(cmake_use_find_package X X11) ) diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml index f08d859d16..518cc8835a 100644 --- a/media-gfx/digikam/metadata.xml +++ b/media-gfx/digikam/metadata.xml @@ -17,6 +17,5 @@ Enable support for media player using media-libs/qtav Build the panorama plugin which requires media-gfx/hugin Enable kde-frameworks/kfilemetadata support - Build with dev-qt/qtwebkit instead of dev-qt/qtwebengine