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

[Michael Palimaka]

commit:     fc848ac4a96c83dbad878d952d5c496bbf93374b
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  9 16:04:40 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Oct  9 16:05:00 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=fc848ac4

dev-qt/qtmultimedia: remove opengl USE flag

Gentoo-bug: 559182

Package-Manager: portage-2.2.20.1

 dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild    | 7 ++-----
 dev-qt/qtmultimedia/qtmultimedia-5.5.9999.ebuild | 7 ++-----
 dev-qt/qtmultimedia/qtmultimedia-5.6.9999.ebuild | 7 ++-----
 dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild   | 7 ++-----
 4 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild 
b/dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild
index a27967d..cac4c48 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
        KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
-IUSE="alsa +gstreamer openal opengl pulseaudio qml widgets"
+IUSE="alsa +gstreamer openal pulseaudio qml widgets"
 
 RDEPEND="
        >=dev-qt/qtcore-${PV}:5
@@ -29,8 +29,8 @@ RDEPEND="
                openal? ( media-libs/openal )
        )
        widgets? (
+               >=dev-qt/qtopengl-${PV}:5
                >=dev-qt/qtwidgets-${PV}:5
-               opengl? ( >=dev-qt/qtopengl-${PV}:5 )
        )
 "
 DEPEND="${RDEPEND}
@@ -47,9 +47,6 @@ src_prepare() {
        qt_use_compile_test openal
        qt_use_compile_test pulseaudio
 
-       qt_use_disable_mod opengl opengl \
-               src/multimediawidgets/multimediawidgets.pro
-
        qt_use_disable_mod qml quick \
                src/src.pro \
                src/plugins/plugins.pro

diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.5.9999.ebuild 
b/dev-qt/qtmultimedia/qtmultimedia-5.5.9999.ebuild
index a27967d..cac4c48 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.5.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.5.9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
        KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
-IUSE="alsa +gstreamer openal opengl pulseaudio qml widgets"
+IUSE="alsa +gstreamer openal pulseaudio qml widgets"
 
 RDEPEND="
        >=dev-qt/qtcore-${PV}:5
@@ -29,8 +29,8 @@ RDEPEND="
                openal? ( media-libs/openal )
        )
        widgets? (
+               >=dev-qt/qtopengl-${PV}:5
                >=dev-qt/qtwidgets-${PV}:5
-               opengl? ( >=dev-qt/qtopengl-${PV}:5 )
        )
 "
 DEPEND="${RDEPEND}
@@ -47,9 +47,6 @@ src_prepare() {
        qt_use_compile_test openal
        qt_use_compile_test pulseaudio
 
-       qt_use_disable_mod opengl opengl \
-               src/multimediawidgets/multimediawidgets.pro
-
        qt_use_disable_mod qml quick \
                src/src.pro \
                src/plugins/plugins.pro

diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.6.9999.ebuild 
b/dev-qt/qtmultimedia/qtmultimedia-5.6.9999.ebuild
index a27967d..cac4c48 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.6.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.6.9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
        KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
-IUSE="alsa +gstreamer openal opengl pulseaudio qml widgets"
+IUSE="alsa +gstreamer openal pulseaudio qml widgets"
 
 RDEPEND="
        >=dev-qt/qtcore-${PV}:5
@@ -29,8 +29,8 @@ RDEPEND="
                openal? ( media-libs/openal )
        )
        widgets? (
+               >=dev-qt/qtopengl-${PV}:5
                >=dev-qt/qtwidgets-${PV}:5
-               opengl? ( >=dev-qt/qtopengl-${PV}:5 )
        )
 "
 DEPEND="${RDEPEND}
@@ -47,9 +47,6 @@ src_prepare() {
        qt_use_compile_test openal
        qt_use_compile_test pulseaudio
 
-       qt_use_disable_mod opengl opengl \
-               src/multimediawidgets/multimediawidgets.pro
-
        qt_use_disable_mod qml quick \
                src/src.pro \
                src/plugins/plugins.pro

diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild 
b/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild
index a27967d..cac4c48 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
        KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
-IUSE="alsa +gstreamer openal opengl pulseaudio qml widgets"
+IUSE="alsa +gstreamer openal pulseaudio qml widgets"
 
 RDEPEND="
        >=dev-qt/qtcore-${PV}:5
@@ -29,8 +29,8 @@ RDEPEND="
                openal? ( media-libs/openal )
        )
        widgets? (
+               >=dev-qt/qtopengl-${PV}:5
                >=dev-qt/qtwidgets-${PV}:5
-               opengl? ( >=dev-qt/qtopengl-${PV}:5 )
        )
 "
 DEPEND="${RDEPEND}
@@ -47,9 +47,6 @@ src_prepare() {
        qt_use_compile_test openal
        qt_use_compile_test pulseaudio
 
-       qt_use_disable_mod opengl opengl \
-               src/multimediawidgets/multimediawidgets.pro
-
        qt_use_disable_mod qml quick \
                src/src.pro \
                src/plugins/plugins.pro