[gentoo-commits] proj/mozilla:master commit in: eclass/

[Ian Stakenvicius]

commit:     93760cbf69c5accdeff8f6fd93b62665519d11fe
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 16 16:14:54 2015 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Thu Jul 16 16:14:54 2015 +0000
URL:        https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=93760cbf

a tiny bit of code cleanup in mozconfig-v6

 eclass/mozconfig-v6.38.eclass | 10 ++++------
 eclass/mozconfig-v6.39.eclass | 10 ++++------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/eclass/mozconfig-v6.38.eclass b/eclass/mozconfig-v6.38.eclass
index e2d0d47..a696828 100644
--- a/eclass/mozconfig-v6.38.eclass
+++ b/eclass/mozconfig-v6.38.eclass
@@ -221,12 +221,10 @@ mozconfig_config() {
        mozconfig_annotate '' --target="${CTARGET:-${CHOST}}"
        mozconfig_annotate '' --build="${CTARGET:-${CHOST}}"
 
-       if use gstreamer || use gstreamer-0 ; then
-               if use gstreamer-0 ; then
-                       mozconfig_annotate '+gstreamer-0' 
--enable-gstreamer=0.10
-               else
-                       mozconfig_annotate '+gstreamer' --enable-gstreamer=1.0
-               fi
+       if use gstreamer ; then
+               mozconfig_annotate '+gstreamer' --enable-gstreamer=1.0
+       elif use gstreamer-0 ; then
+               mozconfig_annotate '+gstreamer-0' --enable-gstreamer=0.10
        else
                mozconfig_annotate '' --disable-gstreamer
        fi

diff --git a/eclass/mozconfig-v6.39.eclass b/eclass/mozconfig-v6.39.eclass
index ec387d7..a2fab0d 100644
--- a/eclass/mozconfig-v6.39.eclass
+++ b/eclass/mozconfig-v6.39.eclass
@@ -222,12 +222,10 @@ mozconfig_config() {
        mozconfig_annotate '' --target="${CTARGET:-${CHOST}}"
        mozconfig_annotate '' --build="${CTARGET:-${CHOST}}"
 
-       if use gstreamer || use gstreamer-0 ; then
-               if use gstreamer-0 ; then
-                       mozconfig_annotate '+gstreamer-0' 
--enable-gstreamer=0.10
-               else
-                       mozconfig_annotate '+gstreamer' --enable-gstreamer=1.0
-               fi
+       if use gstreamer ; then
+               mozconfig_annotate '+gstreamer' --enable-gstreamer=1.0
+       elif use gstreamer-0 ; then
+               mozconfig_annotate '+gstreamer-0' --enable-gstreamer=0.10
        else
                mozconfig_annotate '' --disable-gstreamer
        fi