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

["Davide Pesavento" <pesa@gentoo.org>]

commit:     0a3e292d14ae4b74a92f8886588444535d044188
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 10 12:08:28 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Apr 10 12:08:56 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=0a3e292d

dev-qt/qtmultimedia: really fix egl/gles2 handling

The videonode plugin requires both egl and gles2, therefore depending
on [-gles2] is enough to disable the plugin, and makes much more sense
than depending on [-egl], since the USE flag is called 'gles2'.
Thanks to rhill for pointing this out.

While at it, use a [gles2=] dependency on both qtgui and qtwidgets,
like we do everywhere else in the Qt stack.

Gentoo-Bug: 576636
Package-Manager: portage-2.2.28

 dev-qt/qtmultimedia/qtmultimedia-5.6.0.ebuild       | 7 +++----
 dev-qt/qtmultimedia/qtmultimedia-5.6.9999.ebuild    | 7 +++----
 dev-qt/qtmultimedia/qtmultimedia-5.7.0_alpha.ebuild | 7 +++----
 dev-qt/qtmultimedia/qtmultimedia-5.7.9999.ebuild    | 7 +++----
 dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild      | 7 +++----
 5 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.6.0.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.6.0.ebuild
index cc48647..1a2ca34 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.6.0.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.6.0.ebuild
@@ -16,7 +16,7 @@ REQUIRED_USE="?? ( gstreamer gstreamer010 )"
 
 RDEPEND="
 	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
+	~dev-qt/qtgui-${PV}[gles2=]
 	~dev-qt/qtnetwork-${PV}
 	alsa? ( media-libs/alsa-lib )
 	gstreamer? (
@@ -34,13 +34,12 @@ RDEPEND="
 	pulseaudio? ( media-sound/pulseaudio )
 	qml? (
 		~dev-qt/qtdeclarative-${PV}
-		gles2? ( ~dev-qt/qtgui-${PV}[egl,gles2] )
-		!gles2? ( ~dev-qt/qtgui-${PV}[-egl] )
+		gles2? ( ~dev-qt/qtgui-${PV}[egl] )
 		openal? ( media-libs/openal )
 	)
 	widgets? (
 		~dev-qt/qtopengl-${PV}
-		~dev-qt/qtwidgets-${PV}
+		~dev-qt/qtwidgets-${PV}[gles2=]
 	)
 "
 DEPEND="${RDEPEND}

diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.6.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.6.9999.ebuild
index cc48647..1a2ca34 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.6.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.6.9999.ebuild
@@ -16,7 +16,7 @@ REQUIRED_USE="?? ( gstreamer gstreamer010 )"
 
 RDEPEND="
 	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
+	~dev-qt/qtgui-${PV}[gles2=]
 	~dev-qt/qtnetwork-${PV}
 	alsa? ( media-libs/alsa-lib )
 	gstreamer? (
@@ -34,13 +34,12 @@ RDEPEND="
 	pulseaudio? ( media-sound/pulseaudio )
 	qml? (
 		~dev-qt/qtdeclarative-${PV}
-		gles2? ( ~dev-qt/qtgui-${PV}[egl,gles2] )
-		!gles2? ( ~dev-qt/qtgui-${PV}[-egl] )
+		gles2? ( ~dev-qt/qtgui-${PV}[egl] )
 		openal? ( media-libs/openal )
 	)
 	widgets? (
 		~dev-qt/qtopengl-${PV}
-		~dev-qt/qtwidgets-${PV}
+		~dev-qt/qtwidgets-${PV}[gles2=]
 	)
 "
 DEPEND="${RDEPEND}

diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.7.0_alpha.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.7.0_alpha.ebuild
index cc48647..1a2ca34 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.7.0_alpha.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.7.0_alpha.ebuild
@@ -16,7 +16,7 @@ REQUIRED_USE="?? ( gstreamer gstreamer010 )"
 
 RDEPEND="
 	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
+	~dev-qt/qtgui-${PV}[gles2=]
 	~dev-qt/qtnetwork-${PV}
 	alsa? ( media-libs/alsa-lib )
 	gstreamer? (
@@ -34,13 +34,12 @@ RDEPEND="
 	pulseaudio? ( media-sound/pulseaudio )
 	qml? (
 		~dev-qt/qtdeclarative-${PV}
-		gles2? ( ~dev-qt/qtgui-${PV}[egl,gles2] )
-		!gles2? ( ~dev-qt/qtgui-${PV}[-egl] )
+		gles2? ( ~dev-qt/qtgui-${PV}[egl] )
 		openal? ( media-libs/openal )
 	)
 	widgets? (
 		~dev-qt/qtopengl-${PV}
-		~dev-qt/qtwidgets-${PV}
+		~dev-qt/qtwidgets-${PV}[gles2=]
 	)
 "
 DEPEND="${RDEPEND}

diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.7.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.7.9999.ebuild
index cc48647..1a2ca34 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.7.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.7.9999.ebuild
@@ -16,7 +16,7 @@ REQUIRED_USE="?? ( gstreamer gstreamer010 )"
 
 RDEPEND="
 	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
+	~dev-qt/qtgui-${PV}[gles2=]
 	~dev-qt/qtnetwork-${PV}
 	alsa? ( media-libs/alsa-lib )
 	gstreamer? (
@@ -34,13 +34,12 @@ RDEPEND="
 	pulseaudio? ( media-sound/pulseaudio )
 	qml? (
 		~dev-qt/qtdeclarative-${PV}
-		gles2? ( ~dev-qt/qtgui-${PV}[egl,gles2] )
-		!gles2? ( ~dev-qt/qtgui-${PV}[-egl] )
+		gles2? ( ~dev-qt/qtgui-${PV}[egl] )
 		openal? ( media-libs/openal )
 	)
 	widgets? (
 		~dev-qt/qtopengl-${PV}
-		~dev-qt/qtwidgets-${PV}
+		~dev-qt/qtwidgets-${PV}[gles2=]
 	)
 "
 DEPEND="${RDEPEND}

diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild
index cc48647..1a2ca34 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild
@@ -16,7 +16,7 @@ REQUIRED_USE="?? ( gstreamer gstreamer010 )"
 
 RDEPEND="
 	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
+	~dev-qt/qtgui-${PV}[gles2=]
 	~dev-qt/qtnetwork-${PV}
 	alsa? ( media-libs/alsa-lib )
 	gstreamer? (
@@ -34,13 +34,12 @@ RDEPEND="
 	pulseaudio? ( media-sound/pulseaudio )
 	qml? (
 		~dev-qt/qtdeclarative-${PV}
-		gles2? ( ~dev-qt/qtgui-${PV}[egl,gles2] )
-		!gles2? ( ~dev-qt/qtgui-${PV}[-egl] )
+		gles2? ( ~dev-qt/qtgui-${PV}[egl] )
 		openal? ( media-libs/openal )
 	)
 	widgets? (
 		~dev-qt/qtopengl-${PV}
-		~dev-qt/qtwidgets-${PV}
+		~dev-qt/qtwidgets-${PV}[gles2=]
 	)
 "
 DEPEND="${RDEPEND}