dev-qt/qtwebengine: sync

Package-Manager: portage-2.2.28

5 files changed, 50 insertions, 59 deletions

diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.6.0-icu.patch b/dev-qt/qtwebengine/files/qtwebengine-5.6.0-icu.patch
deleted file mode 100644
index 0b367c72..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.6.0-icu.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Solves issue with trying to locate icudtl.dat in /usr/share/qt5/ when built
-with system-icu.
-
-Patch from Fedora.
-
---- a/src/core/config/linux.pri
-+++ b/src/core/config/linux.pri
-@@ -40,6 +40,6 @@
- use?(system_snappy):   GYP_CONFIG += use_system_snappy=1
- use?(system_speex):    GYP_CONFIG += use_system_speex=1
- use?(system_vpx):      GYP_CONFIG += use_system_libvpx=1
--use?(system_icu):      GYP_CONFIG += use_system_icu=1
-+use?(system_icu):      GYP_CONFIG += use_system_icu=1 icu_use_data_file_flag=0
- use?(system_ffmpeg):   GYP_CONFIG += use_system_ffmpeg=1
- 
diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
index 3d547175..1e517975 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
@@ -25,8 +25,8 @@ RDEPEND="
 	~dev-qt/qtnetwork-${PV}
 	~dev-qt/qtwebchannel-${PV}[qml]
 	dev-libs/expat
-	dev-libs/jsoncpp
-	dev-libs/libevent
+	dev-libs/jsoncpp:=
+	dev-libs/libevent:=
 	dev-libs/libxml2
 	dev-libs/libxslt
 	media-libs/alsa-lib
@@ -35,15 +35,17 @@ RDEPEND="
 	media-libs/freetype
 	media-libs/harfbuzz:=
 	media-libs/libpng:0=
-	>=media-libs/libvpx-1.4
-	media-libs/libwebp
+	>=media-libs/libvpx-1.4:=
+	media-libs/libwebp:=
+	media-libs/mesa
 	media-libs/opus
 	media-libs/speex
-	net-libs/libsrtp
+	net-libs/libsrtp:=
 	sys-apps/dbus
 	sys-apps/pciutils
 	sys-libs/libcap
-	sys-libs/zlib
+	sys-libs/zlib[minizip]
+	x11-libs/libdrm
 	x11-libs/libX11
 	x11-libs/libXcomposite
 	x11-libs/libXcursor
@@ -72,15 +74,15 @@ src_prepare() {
 	qt_use_disable_mod geolocation positioning \
 		src/core/core_common.pri \
 		src/core/core_gyp_generator.pro
-	qt_use_disable_mod widgets widgets \
-		src/src.pro \
-		tests/quicktestbrowser/quicktestbrowser.pro
+
+	qt_use_disable_mod widgets widgets src/src.pro
 
 	qt5-build_src_prepare
 }
 
 src_configure() {
-	export NINJA_PATH="/usr/bin/ninja"
+	export NINJA_PATH=/usr/bin/ninja
+
 	local myqmakeargs=(
 		$(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs')
 		$(usex system-ffmpeg 'WEBENGINE_CONFIG+=use_system_ffmpeg' '')
diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.0_beta.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.0_beta.ebuild
index d1fa59f5..1e517975 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.7.0_beta.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.7.0_beta.ebuild
@@ -25,8 +25,8 @@ RDEPEND="
 	~dev-qt/qtnetwork-${PV}
 	~dev-qt/qtwebchannel-${PV}[qml]
 	dev-libs/expat
-	dev-libs/jsoncpp
-	dev-libs/libevent
+	dev-libs/jsoncpp:=
+	dev-libs/libevent:=
 	dev-libs/libxml2
 	dev-libs/libxslt
 	media-libs/alsa-lib
@@ -35,15 +35,17 @@ RDEPEND="
 	media-libs/freetype
 	media-libs/harfbuzz:=
 	media-libs/libpng:0=
-	>=media-libs/libvpx-1.4
-	media-libs/libwebp
+	>=media-libs/libvpx-1.4:=
+	media-libs/libwebp:=
+	media-libs/mesa
 	media-libs/opus
 	media-libs/speex
-	net-libs/libsrtp
+	net-libs/libsrtp:=
 	sys-apps/dbus
 	sys-apps/pciutils
 	sys-libs/libcap
-	sys-libs/zlib
+	sys-libs/zlib[minizip]
+	x11-libs/libdrm
 	x11-libs/libX11
 	x11-libs/libXcomposite
 	x11-libs/libXcursor
@@ -56,7 +58,7 @@ RDEPEND="
 	x11-libs/libXScrnSaver
 	x11-libs/libXtst
 	geolocation? ( ~dev-qt/qtpositioning-${PV} )
-	system-ffmpeg? ( media-video/ffmpeg:= )
+	system-ffmpeg? ( =media-video/ffmpeg-2*:= )
 	system-icu? ( dev-libs/icu:= )
 	widgets? ( ~dev-qt/qtwidgets-${PV} )
 "
@@ -72,15 +74,15 @@ src_prepare() {
 	qt_use_disable_mod geolocation positioning \
 		src/core/core_common.pri \
 		src/core/core_gyp_generator.pro
-	qt_use_disable_mod widgets widgets \
-		src/src.pro \
-		tests/quicktestbrowser/quicktestbrowser.pro
+
+	qt_use_disable_mod widgets widgets src/src.pro
 
 	qt5-build_src_prepare
 }
 
 src_configure() {
-	export NINJA_PATH="/usr/bin/ninja"
+	export NINJA_PATH=/usr/bin/ninja
+
 	local myqmakeargs=(
 		$(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs')
 		$(usex system-ffmpeg 'WEBENGINE_CONFIG+=use_system_ffmpeg' '')
diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
index d1fa59f5..1e517975 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
@@ -25,8 +25,8 @@ RDEPEND="
 	~dev-qt/qtnetwork-${PV}
 	~dev-qt/qtwebchannel-${PV}[qml]
 	dev-libs/expat
-	dev-libs/jsoncpp
-	dev-libs/libevent
+	dev-libs/jsoncpp:=
+	dev-libs/libevent:=
 	dev-libs/libxml2
 	dev-libs/libxslt
 	media-libs/alsa-lib
@@ -35,15 +35,17 @@ RDEPEND="
 	media-libs/freetype
 	media-libs/harfbuzz:=
 	media-libs/libpng:0=
-	>=media-libs/libvpx-1.4
-	media-libs/libwebp
+	>=media-libs/libvpx-1.4:=
+	media-libs/libwebp:=
+	media-libs/mesa
 	media-libs/opus
 	media-libs/speex
-	net-libs/libsrtp
+	net-libs/libsrtp:=
 	sys-apps/dbus
 	sys-apps/pciutils
 	sys-libs/libcap
-	sys-libs/zlib
+	sys-libs/zlib[minizip]
+	x11-libs/libdrm
 	x11-libs/libX11
 	x11-libs/libXcomposite
 	x11-libs/libXcursor
@@ -56,7 +58,7 @@ RDEPEND="
 	x11-libs/libXScrnSaver
 	x11-libs/libXtst
 	geolocation? ( ~dev-qt/qtpositioning-${PV} )
-	system-ffmpeg? ( media-video/ffmpeg:= )
+	system-ffmpeg? ( =media-video/ffmpeg-2*:= )
 	system-icu? ( dev-libs/icu:= )
 	widgets? ( ~dev-qt/qtwidgets-${PV} )
 "
@@ -72,15 +74,15 @@ src_prepare() {
 	qt_use_disable_mod geolocation positioning \
 		src/core/core_common.pri \
 		src/core/core_gyp_generator.pro
-	qt_use_disable_mod widgets widgets \
-		src/src.pro \
-		tests/quicktestbrowser/quicktestbrowser.pro
+
+	qt_use_disable_mod widgets widgets src/src.pro
 
 	qt5-build_src_prepare
 }
 
 src_configure() {
-	export NINJA_PATH="/usr/bin/ninja"
+	export NINJA_PATH=/usr/bin/ninja
+
 	local myqmakeargs=(
 		$(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs')
 		$(usex system-ffmpeg 'WEBENGINE_CONFIG+=use_system_ffmpeg' '')
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 344dc642..78ea5183 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -25,8 +25,8 @@ RDEPEND="
 	~dev-qt/qtnetwork-${PV}
 	~dev-qt/qtwebchannel-${PV}[qml]
 	dev-libs/expat
-	dev-libs/jsoncpp
-	dev-libs/libevent
+	dev-libs/jsoncpp:=
+	dev-libs/libevent:=
 	dev-libs/libxml2
 	dev-libs/libxslt
 	media-libs/alsa-lib
@@ -35,15 +35,17 @@ RDEPEND="
 	media-libs/freetype
 	media-libs/harfbuzz:=
 	media-libs/libpng:0=
-	>=media-libs/libvpx-1.4
-	media-libs/libwebp
+	>=media-libs/libvpx-1.4:=
+	media-libs/libwebp:=
+	media-libs/mesa
 	media-libs/opus
 	media-libs/speex
-	net-libs/libsrtp
+	net-libs/libsrtp:=
 	sys-apps/dbus
 	sys-apps/pciutils
 	sys-libs/libcap
-	sys-libs/zlib
+	sys-libs/zlib[minizip]
+	x11-libs/libdrm
 	x11-libs/libX11
 	x11-libs/libXcomposite
 	x11-libs/libXcursor
@@ -68,21 +70,19 @@ DEPEND="${RDEPEND}
 	sys-devel/bison
 "
 
-PATCHES=( "${FILESDIR}/${PN}-5.6.0-icu.patch" )
-
 src_prepare() {
 	qt_use_disable_mod geolocation positioning \
 		src/core/core_common.pri \
 		src/core/core_gyp_generator.pro
-	qt_use_disable_mod widgets widgets \
-		src/src.pro \
-		tests/quicktestbrowser/quicktestbrowser.pro
+
+	qt_use_disable_mod widgets widgets src/src.pro
 
 	qt5-build_src_prepare
 }
 
 src_configure() {
-	export NINJA_PATH="/usr/bin/ninja"
+	export NINJA_PATH=/usr/bin/ninja
+
 	local myqmakeargs=(
 		$(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs')
 		$(usex system-ffmpeg 'WEBENGINE_CONFIG+=use_system_ffmpeg' '')