[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

[Andreas Sturmlechner]

commit:     23fe04e8b4e04658c111b418a8fb11ed7a8f6b43
Author:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 29 22:47:30 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <chiitoo <AT> gentoo.org>
(cherry picked from commit 7064af6a1dceefb550fcc9c43ba9ccfbff2c5187)
Signed-off-by: Andreas Sturmlechner <asturm <AT> 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
 }