[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/

[Michael Palimaka]

commit:     b47b669dbbf90f33161cbfddceffd078beaf0635
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 23 08:35:56 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jul 23 08:36:06 2017 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=b47b669d

dev-qt/qtwebkit: remove support for dead and vulnerable gstreamer:0.10

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild    | 13 +++----------
 dev-qt/qtwebkit/qtwebkit-5.9.9999.ebuild | 13 +++----------
 dev-qt/qtwebkit/qtwebkit-5.9999.ebuild   | 13 +++----------
 3 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
index 7d26b519..7e11e4b2 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
@@ -13,8 +13,8 @@ fi
 
 # TODO: qttestlib
 
-IUSE="geolocation gstreamer gstreamer010 +jit multimedia opengl orientation 
printsupport qml webchannel webp"
-REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )"
+IUSE="geolocation gstreamer +jit multimedia opengl orientation printsupport 
qml webchannel webp"
+REQUIRED_USE="?? ( gstreamer multimedia )"
 
 RDEPEND="
        dev-db/sqlite:3
@@ -41,11 +41,6 @@ RDEPEND="
                media-libs/gstreamer:1.0
                media-libs/gst-plugins-base:1.0
        )
-       gstreamer010? (
-               dev-libs/glib:2
-               media-libs/gstreamer:0.10
-               media-libs/gst-plugins-base:0.10
-       )
        multimedia? ( ~dev-qt/qtmultimedia-${PV}[widgets] )
        opengl? ( ~dev-qt/qtopengl-${PV} )
        orientation? ( ~dev-qt/qtsensors-${PV} )
@@ -86,9 +81,7 @@ src_prepare() {
                Source/WebKit2/Target.pri \
                Source/WebKit2/WebKit2.pri
 
-       if use gstreamer010; then
-               PATCHES+=("${FILESDIR}/${PN}-5.8.0-use-gstreamer010.patch")
-       elif ! use gstreamer; then
+       if ! use gstreamer; then
                PATCHES+=("${FILESDIR}/${PN}-5.8.0-disable-gstreamer.patch")
        fi
 

diff --git a/dev-qt/qtwebkit/qtwebkit-5.9.9999.ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.9.9999.ebuild
index 7d26b519..7e11e4b2 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.9.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9.9999.ebuild
@@ -13,8 +13,8 @@ fi
 
 # TODO: qttestlib
 
-IUSE="geolocation gstreamer gstreamer010 +jit multimedia opengl orientation 
printsupport qml webchannel webp"
-REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )"
+IUSE="geolocation gstreamer +jit multimedia opengl orientation printsupport 
qml webchannel webp"
+REQUIRED_USE="?? ( gstreamer multimedia )"
 
 RDEPEND="
        dev-db/sqlite:3
@@ -41,11 +41,6 @@ RDEPEND="
                media-libs/gstreamer:1.0
                media-libs/gst-plugins-base:1.0
        )
-       gstreamer010? (
-               dev-libs/glib:2
-               media-libs/gstreamer:0.10
-               media-libs/gst-plugins-base:0.10
-       )
        multimedia? ( ~dev-qt/qtmultimedia-${PV}[widgets] )
        opengl? ( ~dev-qt/qtopengl-${PV} )
        orientation? ( ~dev-qt/qtsensors-${PV} )
@@ -86,9 +81,7 @@ src_prepare() {
                Source/WebKit2/Target.pri \
                Source/WebKit2/WebKit2.pri
 
-       if use gstreamer010; then
-               PATCHES+=("${FILESDIR}/${PN}-5.8.0-use-gstreamer010.patch")
-       elif ! use gstreamer; then
+       if ! use gstreamer; then
                PATCHES+=("${FILESDIR}/${PN}-5.8.0-disable-gstreamer.patch")
        fi
 

diff --git a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
index 7d26b519..7e11e4b2 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
@@ -13,8 +13,8 @@ fi
 
 # TODO: qttestlib
 
-IUSE="geolocation gstreamer gstreamer010 +jit multimedia opengl orientation 
printsupport qml webchannel webp"
-REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )"
+IUSE="geolocation gstreamer +jit multimedia opengl orientation printsupport 
qml webchannel webp"
+REQUIRED_USE="?? ( gstreamer multimedia )"
 
 RDEPEND="
        dev-db/sqlite:3
@@ -41,11 +41,6 @@ RDEPEND="
                media-libs/gstreamer:1.0
                media-libs/gst-plugins-base:1.0
        )
-       gstreamer010? (
-               dev-libs/glib:2
-               media-libs/gstreamer:0.10
-               media-libs/gst-plugins-base:0.10
-       )
        multimedia? ( ~dev-qt/qtmultimedia-${PV}[widgets] )
        opengl? ( ~dev-qt/qtopengl-${PV} )
        orientation? ( ~dev-qt/qtsensors-${PV} )
@@ -86,9 +81,7 @@ src_prepare() {
                Source/WebKit2/Target.pri \
                Source/WebKit2/WebKit2.pri
 
-       if use gstreamer010; then
-               PATCHES+=("${FILESDIR}/${PN}-5.8.0-use-gstreamer010.patch")
-       elif ! use gstreamer; then
+       if ! use gstreamer; then
                PATCHES+=("${FILESDIR}/${PN}-5.8.0-disable-gstreamer.patch")
        fi