[gentoo-commits] repo/gentoo:master commit in: eclass/

[Lars Wendler]

commit:     00b1fa774f05e16d855dbf39e42d2eb6a7483ab7
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  1 08:49:51 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Dec  1 08:51:36 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00b1fa77

mozconfig-v6.49.eclass: Make dependency on gtk+:2 optional (bug #601326).

 eclass/mozconfig-v6.49.eclass | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/eclass/mozconfig-v6.49.eclass b/eclass/mozconfig-v6.49.eclass
index 283aecd..495cf54 100644
--- a/eclass/mozconfig-v6.49.eclass
+++ b/eclass/mozconfig-v6.49.eclass
@@ -94,7 +94,6 @@ RDEPEND=">=app-text/hunspell-1.2:=
        dev-libs/atk
        dev-libs/expat
        >=x11-libs/cairo-1.10[X]
-       >=x11-libs/gtk+-2.18:2
        x11-libs/gdk-pixbuf
        >=x11-libs/pango-1.22.0
        >=media-libs/libpng-1.6.21:0=[apng]
@@ -135,7 +134,8 @@ if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then
                IUSE+=" gtk3"
        fi
        RDEPEND+="
-       gtk3? ( >=x11-libs/gtk+-3.4.0:3 )"
+       gtk3? ( >=x11-libs/gtk+-3.4.0:3 )
+       !gtk3? ( >=x11-libs/gtk+-2.18:2 )"
 elif [[ -n ${MOZCONFIG_OPTIONAL_GTK2ONLY} ]]; then
        if [[ ${MOZCONFIG_OPTIONAL_GTK2ONLY} = "enabled" ]]; then
                IUSE+=" +gtk2"
@@ -143,7 +143,11 @@ elif [[ -n ${MOZCONFIG_OPTIONAL_GTK2ONLY} ]]; then
                IUSE+=" gtk2"
        fi
        RDEPEND+="
+       gtk2? ( >=x11-libs/gtk+-2.18:2 )
        !gtk2? ( >=x11-libs/gtk+-3.4.0:3 )"
+else
+       RDEPEND+="
+               >=x11-libs/gtk+-2.18:2"
 fi
 if [[ -n ${MOZCONFIG_OPTIONAL_QT5} ]]; then
        inherit qmake-utils