media-libs/phonon-gstreamer: introduce dev-qt/qtwebkit:4[gstreamer] blocker

dev-qt/qtwebkit:4[gstreamer] uses media-libs/gstreamer:0.10, while later
versions of media-libs/phonon-gstreamer use media-libs/gstreamer:1.0.

This can cause both gstreamer libraries to get loaded at once, resulting in a
crash due to symbol collision.

Gentoo-bug: 522880

Package-Manager: portage-2.3.0

diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.8.2.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.8.2.ebuild
index 4c6c7fdab159f6534b735408a6c46824a281f8f6..ad1eeeea47776421ef2197d8023e6a18cf297280 100644 (file)
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-4.8.2.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-4.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -46,6 +46,7 @@ RDEPEND="
        )
        virtual/opengl
        network? ( media-plugins/gst-plugins-soup:1.0 )
+       !dev-qt/qtwebkit:4[gstreamer]
 "
 DEPEND="${RDEPEND}
        qt4? ( >=dev-util/automoc-0.9.87 )

diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0.ebuild
index 6f9d2dffbbb73a672abfa7be94df83b9fcc0c1de..70f8a2032b0628d3a7fa8a7e26e91a4ef1134788 100644 (file)
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0.ebuild
@@ -47,6 +47,7 @@ RDEPEND="
        )
        virtual/opengl
        network? ( media-plugins/gst-plugins-soup:1.0 )
+       !dev-qt/qtwebkit:4[gstreamer]
 "
 DEPEND="${RDEPEND}
        virtual/pkgconfig

diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild
index 6d575e7e666141763ab6dfec52bb976599ebcfb5..7ceaa4d613977908ffaa0b9afd51a76cee2b1935 100644 (file)
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild
@@ -47,6 +47,7 @@ RDEPEND="
        )
        virtual/opengl
        network? ( media-plugins/gst-plugins-soup:1.0 )
+       !dev-qt/qtwebkit:4[gstreamer]
 "
 DEPEND="${RDEPEND}
        virtual/pkgconfig