| 1 |
axs 14/07/29 20:43:02 |
| 2 |
|
| 3 |
Modified: mozconfig-v4.eclass |
| 4 |
Log: |
| 5 |
ChangeLog |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.2 eclass/mozconfig-v4.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mozconfig-v4.eclass?rev=1.2&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mozconfig-v4.eclass?rev=1.2&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mozconfig-v4.eclass?r1=1.1&r2=1.2 |
| 13 |
|
| 14 |
Index: mozconfig-v4.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/mozconfig-v4.eclass,v |
| 17 |
retrieving revision 1.1 |
| 18 |
retrieving revision 1.2 |
| 19 |
diff -u -r1.1 -r1.2 |
| 20 |
--- mozconfig-v4.eclass 28 Jul 2014 20:59:07 -0000 1.1 |
| 21 |
+++ mozconfig-v4.eclass 29 Jul 2014 20:43:02 -0000 1.2 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2014 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig-v4.eclass,v 1.1 2014/07/28 20:59:07 axs Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig-v4.eclass,v 1.2 2014/07/29 20:43:02 axs Exp $ |
| 27 |
# |
| 28 |
# mozconfig-v4.eclass: the new mozilla.eclass |
| 29 |
|
| 30 |
@@ -12,7 +12,7 @@ |
| 31 |
RDEPEND=">=app-text/hunspell-1.2 |
| 32 |
dev-libs/expat |
| 33 |
>=dev-libs/libevent-1.4.7 |
| 34 |
- >=x11-libs/cairo-1.10[X] |
| 35 |
+ >=x11-libs/cairo-1.12[X] |
| 36 |
>=x11-libs/gtk+-2.10:2 |
| 37 |
>=x11-libs/pango-1.22.0 |
| 38 |
media-libs/alsa-lib |
| 39 |
@@ -20,6 +20,7 @@ |
| 40 |
dbus? ( >=dev-libs/dbus-glib-0.72 ) |
| 41 |
startup-notification? ( >=x11-libs/startup-notification-0.8 ) |
| 42 |
wifi? ( >=sys-apps/dbus-0.60 |
| 43 |
+ >=dev-libs/dbus-glib-0.72 |
| 44 |
net-wireless/wireless-tools ) |
| 45 |
>=dev-libs/glib-2.26:2" |
| 46 |
|
| 47 |
@@ -47,14 +48,18 @@ |
| 48 |
|
| 49 |
mozconfig_use_enable startup-notification |
| 50 |
|
| 51 |
- if has wifi ${IUSE} && use wifi; then |
| 52 |
- if ! use dbus; then |
| 53 |
+ if has wifi ${IUSE} ; then |
| 54 |
+ # wifi pulls in dbus so manage both here |
| 55 |
+ mozconfig_use_enable wifi necko-wifi |
| 56 |
+ if use wifi && ! use dbus; then |
| 57 |
echo "Enabling dbus support due to wifi request" |
| 58 |
- mozconfig_annotate wifi --enable-necko-wifi |
| 59 |
- mozconfig_annotate dbus --enable-dbus |
| 60 |
+ mozconfig_annotate 'dbus required by necko-wifi' --enable-dbus |
| 61 |
else |
| 62 |
- mozconfig_annotate wifi --enable-necko-wifi |
| 63 |
+ mozconfig_use_enable dbus |
| 64 |
fi |
| 65 |
+ else |
| 66 |
+ mozconfig_use_enable dbus |
| 67 |
+ mozconfig_annotate 'disabled' --disable-necko-wifi |
| 68 |
fi |
| 69 |
|
| 70 |
mozconfig_annotate 'required' --enable-ogg |
| 71 |
@@ -65,8 +70,6 @@ |
| 72 |
mozconfig_use_enable jit yarr-jit |
| 73 |
fi |
| 74 |
|
| 75 |
- mozconfig_use_enable dbus |
| 76 |
- |
| 77 |
# These are enabled by default in all mozilla applications |
| 78 |
mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${EPREFIX}"/usr |
| 79 |
mozconfig_annotate '' --with-system-nss --with-nss-prefix="${EPREFIX}"/usr |
Archives