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 C9403138350 for ; Mon, 10 Feb 2020 06:52:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F056FE08FF; Mon, 10 Feb 2020 06:52:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 D54D9E08FF for ; Mon, 10 Feb 2020 06:52:56 +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 5AE4834E983 for ; Mon, 10 Feb 2020 06:52:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 612E435 for ; Mon, 10 Feb 2020 06:52:53 +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: <1581317562.23fe04e8b4e04658c111b418a8fb11ed7a8f6b43.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild X-VCS-Directories: dev-qt/qtwebengine/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 23fe04e8b4e04658c111b418a8fb11ed7a8f6b43 X-VCS-Branch: master Date: Mon, 10 Feb 2020 06:52:53 +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: cbe93008-55d1-4962-9799-ad1917c3e8ca X-Archives-Hash: 507789cfc436fe9913346a190022007e commit: 23fe04e8b4e04658c111b418a8fb11ed7a8f6b43 Author: Jimi Huotari gentoo org> AuthorDate: Wed Jan 29 22:47:30 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Feb 10 06:52:42 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23fe04e8 dev-qt/qtwebengine: Re-add USE geolocation Package-Manager: Portage-2.3.86, Repoman-2.3.20 Signed-off-by: Jimi Huotari gentoo.org> (cherry picked from commit 7064af6a1dceefb550fcc9c43ba9ccfbff2c5187) Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild index 1152cf4edeb..92e75c3c12e 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild @@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi -IUSE="alsa bindist designer jumbo-build pulseaudio +system-ffmpeg +system-icu widgets" +IUSE="alsa bindist designer geolocation jumbo-build pulseaudio +system-ffmpeg +system-icu widgets" REQUIRED_USE="designer? ( widgets )" RDEPEND=" @@ -24,7 +24,6 @@ RDEPEND=" ~dev-qt/qtdeclarative-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} - ~dev-qt/qtpositioning-${PV} ~dev-qt/qtprintsupport-${PV} ~dev-qt/qtwebchannel-${PV}[qml] dev-libs/expat @@ -60,6 +59,7 @@ RDEPEND=" x11-libs/libXtst alsa? ( media-libs/alsa-lib ) designer? ( ~dev-qt/designer-${PV} ) + geolocation? ( ~dev-qt/qtpositioning-${PV} ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( >=dev-libs/icu-60.2:= ) @@ -106,14 +106,15 @@ src_configure() { local myqmakeargs=( -- - -opus -printing-and-pdf - -webp - $(usex alsa '-alsa' '') - $(usex bindist '' '-proprietary-codecs') - $(usex pulseaudio '-pulseaudio' '') - $(usex system-ffmpeg '-ffmpeg' '') - $(usex system-icu '-webengine-icu' '') + -system-opus + -system-webp + $(usex alsa '-alsa' '-no-alsa') + $(usex bindist '-no-proprietary-codecs' '-proprietary-codecs') + $(usex geolocation '-webengine-geolocation' '-no-webengine-geolocation') + $(usex pulseaudio '-pulseaudio' '-no-pulseaudio') + $(usex system-ffmpeg '-system-ffmpeg' '-qt-ffmpeg') + $(usex system-icu '-webengine-icu' '-no-webengine-icu') ) qt5-build_src_configure }