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

[Davide Pesavento]

commit:     5b951c9cb07ded35eb21306416942bc1c716929c
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  4 21:39:58 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Aug  4 21:39:58 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=5b951c9c

[dev-qt/qtmultimedia] Use myqmakeargs to specify GST_VERSION.

Should also fix bug #555484.

Package-Manager: portage-2.2.20

 dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild    | 9 ++++-----
 dev-qt/qtmultimedia/qtmultimedia-5.5.9999.ebuild | 9 ++++-----
 dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild   | 9 ++++-----
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild 
b/dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild
index aeeb522..9972640 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild
@@ -63,9 +63,8 @@ src_prepare() {
 }
 
 src_configure() {
-       if use gstreamer; then
-               qt5_qmake GST_VERSION=0.10
-       else
-               qt5-build_src_configure
-       fi
+       local myqmakeargs=(
+               $(usex gstreamer 'GST_VERSION=0.10' '')
+       )
+       qt5-build_src_configure
 }

diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.5.9999.ebuild 
b/dev-qt/qtmultimedia/qtmultimedia-5.5.9999.ebuild
index aeeb522..9972640 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.5.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.5.9999.ebuild
@@ -63,9 +63,8 @@ src_prepare() {
 }
 
 src_configure() {
-       if use gstreamer; then
-               qt5_qmake GST_VERSION=0.10
-       else
-               qt5-build_src_configure
-       fi
+       local myqmakeargs=(
+               $(usex gstreamer 'GST_VERSION=0.10' '')
+       )
+       qt5-build_src_configure
 }

diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild 
b/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild
index aeeb522..9972640 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild
@@ -63,9 +63,8 @@ src_prepare() {
 }
 
 src_configure() {
-       if use gstreamer; then
-               qt5_qmake GST_VERSION=0.10
-       else
-               qt5-build_src_configure
-       fi
+       local myqmakeargs=(
+               $(usex gstreamer 'GST_VERSION=0.10' '')
+       )
+       qt5-build_src_configure
 }