1 |
commit: d3c8e2368a60cb467e290fffa3804da9fda4a391 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Dec 1 08:49:51 2016 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Dec 1 08:54:51 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=d3c8e236 |
7 |
|
8 |
mozconfig-v6.49.eclass: Make dependency on gtk+:2 optional (bug #601326). |
9 |
|
10 |
eclass/mozconfig-v6.49.eclass | 8 ++++++-- |
11 |
1 file changed, 6 insertions(+), 2 deletions(-) |
12 |
|
13 |
diff --git a/eclass/mozconfig-v6.49.eclass b/eclass/mozconfig-v6.49.eclass |
14 |
index 1b52c1a..7f9ed15 100644 |
15 |
--- a/eclass/mozconfig-v6.49.eclass |
16 |
+++ b/eclass/mozconfig-v6.49.eclass |
17 |
@@ -94,7 +94,6 @@ RDEPEND=">=app-text/hunspell-1.2:= |
18 |
dev-libs/atk |
19 |
dev-libs/expat |
20 |
>=x11-libs/cairo-1.10[X] |
21 |
- >=x11-libs/gtk+-2.18:2 |
22 |
x11-libs/gdk-pixbuf |
23 |
>=x11-libs/pango-1.22.0 |
24 |
>=media-libs/libpng-1.6.21:0=[apng] |
25 |
@@ -135,7 +134,8 @@ if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then |
26 |
IUSE+=" gtk3" |
27 |
fi |
28 |
RDEPEND+=" |
29 |
- gtk3? ( >=x11-libs/gtk+-3.4.0:3 )" |
30 |
+ gtk3? ( >=x11-libs/gtk+-3.4.0:3 ) |
31 |
+ !gtk3? ( >=x11-libs/gtk+-2.18:2 )" |
32 |
elif [[ -n ${MOZCONFIG_OPTIONAL_GTK2ONLY} ]]; then |
33 |
if [[ ${MOZCONFIG_OPTIONAL_GTK2ONLY} = "enabled" ]]; then |
34 |
IUSE+=" +gtk2" |
35 |
@@ -143,7 +143,11 @@ elif [[ -n ${MOZCONFIG_OPTIONAL_GTK2ONLY} ]]; then |
36 |
IUSE+=" gtk2" |
37 |
fi |
38 |
RDEPEND+=" |
39 |
+ gtk2? ( >=x11-libs/gtk+-2.18:2 ) |
40 |
!gtk2? ( >=x11-libs/gtk+-3.4.0:3 )" |
41 |
+else |
42 |
+ RDEPEND+=" |
43 |
+ >=x11-libs/gtk+-2.18:2" |
44 |
fi |
45 |
if [[ -n ${MOZCONFIG_OPTIONAL_QT5} ]]; then |
46 |
inherit qmake-utils |