summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2016-12-01 09:49:51 +0100
committerLars Wendler <polynomial-c@gentoo.org>2016-12-01 09:51:36 +0100
commit00b1fa774f05e16d855dbf39e42d2eb6a7483ab7 (patch)
tree57d88be2257b6c6f8bd2f8a79c885106bd890c43 /eclass
parentwww-client/firefox-bin: Sec bump to versions 45.5.1 and 50.0.2 (bug #601320). (diff)
downloadgentoo-00b1fa774f05e16d855dbf39e42d2eb6a7483ab7.tar.gz
gentoo-00b1fa774f05e16d855dbf39e42d2eb6a7483ab7.tar.bz2
gentoo-00b1fa774f05e16d855dbf39e42d2eb6a7483ab7.zip
mozconfig-v6.49.eclass: Make dependency on gtk+:2 optional (bug #601326).
Diffstat (limited to 'eclass')
-rw-r--r--eclass/mozconfig-v6.49.eclass8
1 files changed, 6 insertions, 2 deletions
diff --git a/eclass/mozconfig-v6.49.eclass b/eclass/mozconfig-v6.49.eclass
index 283aecda9b8..495cf540f81 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