axs 14/07/29 20:43:02 Modified: mozconfig-v4.eclass Log: ChangeLog
Revision Changes Path 1.2 eclass/mozconfig-v4.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mozconfig-v4.eclass?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mozconfig-v4.eclass?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mozconfig-v4.eclass?r1=1.1&r2=1.2 Index: mozconfig-v4.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/mozconfig-v4.eclass,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mozconfig-v4.eclass 28 Jul 2014 20:59:07 -0000 1.1 +++ mozconfig-v4.eclass 29 Jul 2014 20:43:02 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig-v4.eclass,v 1.1 2014/07/28 20:59:07 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig-v4.eclass,v 1.2 2014/07/29 20:43:02 axs Exp $ # # mozconfig-v4.eclass: the new mozilla.eclass @@ -12,7 +12,7 @@ RDEPEND=">=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libevent-1.4.7 - >=x11-libs/cairo-1.10[X] + >=x11-libs/cairo-1.12[X] >=x11-libs/gtk+-2.10:2 >=x11-libs/pango-1.22.0 media-libs/alsa-lib @@ -20,6 +20,7 @@ dbus? ( >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( >=sys-apps/dbus-0.60 + >=dev-libs/dbus-glib-0.72 net-wireless/wireless-tools ) >=dev-libs/glib-2.26:2" @@ -47,14 +48,18 @@ mozconfig_use_enable startup-notification - if has wifi ${IUSE} && use wifi; then - if ! use dbus; then + if has wifi ${IUSE} ; then + # wifi pulls in dbus so manage both here + mozconfig_use_enable wifi necko-wifi + if use wifi && ! use dbus; then echo "Enabling dbus support due to wifi request" - mozconfig_annotate wifi --enable-necko-wifi - mozconfig_annotate dbus --enable-dbus + mozconfig_annotate 'dbus required by necko-wifi' --enable-dbus else - mozconfig_annotate wifi --enable-necko-wifi + mozconfig_use_enable dbus fi + else + mozconfig_use_enable dbus + mozconfig_annotate 'disabled' --disable-necko-wifi fi mozconfig_annotate 'required' --enable-ogg @@ -65,8 +70,6 @@ mozconfig_use_enable jit yarr-jit fi - mozconfig_use_enable dbus - # These are enabled by default in all mozilla applications mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${EPREFIX}"/usr mozconfig_annotate '' --with-system-nss --with-nss-prefix="${EPREFIX}"/usr
