From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1063466-garchives=archives.gentoo.org@lists.gentoo.org>
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 8B789138335
for <garchives@archives.gentoo.org>; Sun, 23 Dec 2018 17:19:33 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 9BB2CE09EA;
Sun, 23 Dec 2018 17:19:32 +0000 (UTC)
Received: from smtp.gentoo.org (dev.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 5CAA3E09E7
for <gentoo-commits@lists.gentoo.org>; Sun, 23 Dec 2018 17:19:32 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(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 C15FA335C9F
for <gentoo-commits@lists.gentoo.org>; Sun, 23 Dec 2018 17:19:30 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 0E3994F7
for <gentoo-commits@lists.gentoo.org>; Sun, 23 Dec 2018 17:19:29 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
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" <asturm@gentoo.org>
Message-ID: <1545585087.4e961ccf114b39d9167fb6de16a9b9749a089dec.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: 4e961ccf114b39d9167fb6de16a9b9749a089dec
X-VCS-Branch: master
Date: Sun, 23 Dec 2018 17:19:29 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 16200ae1-a127-4150-ac65-6d1005e0230d
X-Archives-Hash: 176de6ba10c75e3f13b7f86416af520f
commit: 4e961ccf114b39d9167fb6de16a9b9749a089dec
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 23 16:06:35 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 23 17:11:27 2018 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=4e961ccf
media-gfx/digikam: Add USE webkit
Upstream commit 101b1170ef8484df732ccbff235dc28fc91f1a26
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/digikam/digikam-9999.ebuild | 6 ++++--
media-gfx/digikam/metadata.xml | 1 +
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/media-gfx/digikam/digikam-9999.ebuild b/media-gfx/digikam/digikam-9999.ebuild
index 72acbd4d92..9a6f6f4a29 100644
--- a/media-gfx/digikam/digikam-9999.ebuild
+++ b/media-gfx/digikam/digikam-9999.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Digital photo management application"
HOMEPAGE="https://www.digikam.org/"
LICENSE="GPL-2"
-IUSE="addressbook calendar gphoto2 jpeg2k +lensfun libav marble mediaplayer semantic-desktop mysql opengl openmp +panorama scanner X"
+IUSE="addressbook calendar gphoto2 jpeg2k +lensfun libav marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop webkit X"
if [[ ${KDE_BUILD_TYPE} != live ]]; then
KEYWORDS="~amd64 ~x86"
@@ -45,7 +45,6 @@ COMMON_DEPEND="
$(add_qt_dep qtgui '-gles2')
$(add_qt_dep qtprintsupport)
$(add_qt_dep qtsql 'mysql?')
- $(add_qt_dep qtwebkit)
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
$(add_qt_dep qtxmlpatterns)
@@ -83,6 +82,8 @@ COMMON_DEPEND="
panorama? ( $(add_frameworks_dep threadweaver) )
scanner? ( $(add_kdeapps_dep libksane) )
semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
+ !webkit? ( $(add_qt_dep qtwebengine 'widgets') )
+ webkit? ( $(add_qt_dep qtwebkit) )
X? (
$(add_qt_dep qtx11extras)
x11-libs/libX11
@@ -160,6 +161,7 @@ src_configure() {
$(cmake-utils_use_find_package panorama KF5ThreadWeaver)
$(cmake-utils_use_find_package scanner KF5Sane)
$(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
+ -DENABLE_QWEBENGINE=$(usex !webkit)
$(cmake-utils_use_find_package X X11)
)
diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml
index 5521adfea1..cfd72c2d6f 100644
--- a/media-gfx/digikam/metadata.xml
+++ b/media-gfx/digikam/metadata.xml
@@ -15,5 +15,6 @@
<flag name="mediaplayer">Enable support for media player using <pkg>media-libs/qtav</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>
+ <flag name="webkit">Build with <pkg>dev-qt/qtwebkit</pkg> instead of <pkg>dev-qt/qtwebengine</pkg></flag>
</use>
</pkgmetadata>