summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorIan Stakenvicius <axs@gentoo.org>2016-12-02 12:08:55 -0500
committerIan Stakenvicius <axs@gentoo.org>2016-12-02 12:08:55 -0500
commitc9062f132a1738f716f898757a6c91b3f701ced9 (patch)
treeb4f780e1fa39d1e0d5b4cd423255e29aa98433df /eclass
parentapp-misc/ca-certificates: Revbump to add new certs. (diff)
downloadgentoo-c9062f132a1738f716f898757a6c91b3f701ced9.tar.gz
gentoo-c9062f132a1738f716f898757a6c91b3f701ced9.tar.bz2
gentoo-c9062f132a1738f716f898757a6c91b3f701ced9.zip
Revert "mozconfig-v6.49.eclass: Make dependency on gtk+:2 optional (bug #601326)."
This reverts commit 00b1fa774f05e16d855dbf39e42d2eb6a7483ab7. At this time the gtk+:2 dependencies are still required.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/mozconfig-v6.49.eclass8
1 files changed, 2 insertions, 6 deletions
diff --git a/eclass/mozconfig-v6.49.eclass b/eclass/mozconfig-v6.49.eclass
index 495cf540f81..283aecda9b8 100644
--- a/eclass/mozconfig-v6.49.eclass
+++ b/eclass/mozconfig-v6.49.eclass
@@ -94,6 +94,7 @@ 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]
@@ -134,8 +135,7 @@ if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then
IUSE+=" gtk3"
fi
RDEPEND+="
- gtk3? ( >=x11-libs/gtk+-3.4.0:3 )
- !gtk3? ( >=x11-libs/gtk+-2.18:2 )"
+ gtk3? ( >=x11-libs/gtk+-3.4.0:3 )"
elif [[ -n ${MOZCONFIG_OPTIONAL_GTK2ONLY} ]]; then
if [[ ${MOZCONFIG_OPTIONAL_GTK2ONLY} = "enabled" ]]; then
IUSE+=" +gtk2"
@@ -143,11 +143,7 @@ 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