public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog mozconfig-v4.eclass
@ 2014-07-28 20:59 Ian Stakenvicius (axs)
  0 siblings, 0 replies; 2+ messages in thread
From: Ian Stakenvicius (axs) @ 2014-07-28 20:59 UTC (permalink / raw
  To: gentoo-commits

axs         14/07/28 20:59:07

  Modified:             ChangeLog
  Added:                mozconfig-v4.eclass
  Log:
  committed new mozconfig eclass for mozilla31 and later

Revision  Changes    Path
1.1328               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1328&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1328&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1327&r2=1.1328

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1327
retrieving revision 1.1328
diff -u -r1.1327 -r1.1328
--- ChangeLog	28 Jul 2014 14:13:50 -0000	1.1327
+++ ChangeLog	28 Jul 2014 20:59:07 -0000	1.1328
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1327 2014/07/28 14:13:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1328 2014/07/28 20:59:07 axs Exp $
+
+  28 Jul 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org> +mozconfig-v4.eclass:
+  committed new mozconfig eclass for mozilla31 and later
 
   28 Jul 2014; Michał Górny <mgorny@gentoo.org> git-r3.eclass:
   Mention git-clone man page for URI syntax, bug #511636.



1.1                  eclass/mozconfig-v4.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mozconfig-v4.eclass?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mozconfig-v4.eclass?rev=1.1&content-type=text/plain

Index: mozconfig-v4.eclass
===================================================================
# 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 $
#
# mozconfig-v4.eclass: the new mozilla.eclass

inherit multilib flag-o-matic mozcoreconf-2

# use-flags common among all mozilla ebuilds
IUSE="dbus debug startup-notification"

RDEPEND=">=app-text/hunspell-1.2
	dev-libs/expat
	>=dev-libs/libevent-1.4.7
	>=x11-libs/cairo-1.10[X]
	>=x11-libs/gtk+-2.10:2
	>=x11-libs/pango-1.22.0
	media-libs/alsa-lib
	virtual/freedesktop-icon-theme
	dbus? ( >=dev-libs/dbus-glib-0.72 )
	startup-notification? ( >=x11-libs/startup-notification-0.8 )
	wifi? ( >=sys-apps/dbus-0.60
		net-wireless/wireless-tools )
	>=dev-libs/glib-2.26:2"

DEPEND="app-arch/zip
	app-arch/unzip
	${RDEPEND}"

mozconfig_config() {

	mozconfig_annotate '' --enable-default-toolkit=cairo-gtk2

	if has bindist ${IUSE}; then
		mozconfig_use_enable !bindist official-branding
		if [[ ${PN} == firefox ]] && use bindist ; then
			mozconfig_annotate '' --with-branding=browser/branding/aurora
		fi
	fi

	mozconfig_use_enable debug
	mozconfig_use_enable debug tests

	if ! use debug ; then
		mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
	fi

	mozconfig_use_enable startup-notification

	if has wifi ${IUSE} && use wifi; then
		if ! use dbus; then
			echo "Enabling dbus support due to wifi request"
			mozconfig_annotate wifi --enable-necko-wifi
			mozconfig_annotate dbus --enable-dbus
		else
			mozconfig_annotate wifi --enable-necko-wifi
		fi
	fi

	mozconfig_annotate 'required' --enable-ogg
	mozconfig_annotate 'required' --enable-wave

	if has jit ${IUSE}; then
		mozconfig_use_enable jit ion
		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
	mozconfig_annotate '' --x-includes="${EPREFIX}"/usr/include --x-libraries="${EPREFIX}"/usr/$(get_libdir)
	mozconfig_annotate '' --with-system-libevent="${EPREFIX}"/usr
	mozconfig_annotate '' --enable-system-hunspell
	mozconfig_annotate '' --disable-gnomevfs
	mozconfig_annotate '' --disable-gnomeui
	mozconfig_annotate '' --enable-gio
	mozconfig_annotate '' --disable-crashreporter
}





^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog mozconfig-v4.eclass
@ 2014-08-01 16:32 Ian Stakenvicius (axs)
  0 siblings, 0 replies; 2+ messages in thread
From: Ian Stakenvicius (axs) @ 2014-08-01 16:32 UTC (permalink / raw
  To: gentoo-commits

axs         14/08/01 16:32:16

  Modified:             ChangeLog mozconfig-v4.eclass
  Log:
  Updated mozconfig-v4.eclass to properly support optional IUSE=wifi

Revision  Changes    Path
1.1336               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1336&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1336&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1335&r2=1.1336

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1335
retrieving revision 1.1336
diff -u -r1.1335 -r1.1336
--- ChangeLog	31 Jul 2014 22:26:07 -0000	1.1335
+++ ChangeLog	1 Aug 2014 16:32:16 -0000	1.1336
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1335 2014/07/31 22:26:07 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1336 2014/08/01 16:32:16 axs Exp $
+
+  01 Aug 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org> mozconfig-v4.eclass:
+  Updated mozconfig-v4.eclass to properly support optional IUSE=wifi
 
   31 Jul 2014; Brian Evans <grknight@gentoo.org> mysql-cmake.eclass,
   mysql-multilib.eclass:



1.3                  eclass/mozconfig-v4.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mozconfig-v4.eclass?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mozconfig-v4.eclass?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mozconfig-v4.eclass?r1=1.2&r2=1.3

Index: mozconfig-v4.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mozconfig-v4.eclass,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mozconfig-v4.eclass	29 Jul 2014 20:43:02 -0000	1.2
+++ mozconfig-v4.eclass	1 Aug 2014 16:32:16 -0000	1.3
@@ -1,11 +1,36 @@
 # 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.2 2014/07/29 20:43:02 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig-v4.eclass,v 1.3 2014/08/01 16:32:16 axs Exp $
 #
 # mozconfig-v4.eclass: the new mozilla.eclass
 
 inherit multilib flag-o-matic mozcoreconf-2
 
+# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_WIFI
+# @DESCRIPTION:
+# Set this variable before the inherit line, when an ebuild needs to provide
+# optional necko-wifi support via IUSE="wifi".  Currently this would include
+# ebuilds for firefox, and potentially seamonkey.
+#
+# Leave the variable UNSET if necko-wifi support should not be available.
+
+# @FUNCTION: mozconfig_config
+# @DESCRIPTION:
+# Set common configure options for mozilla packages.
+# Call this within src_configure() phase, after mozconfig_init
+#
+# Example:
+#
+# inherit mozconfig-v4
+#
+# src_configure() {
+# 	mozconfig_init
+# 	mozconfig_config
+#	# ... misc ebuild-unique settings via calls to
+#	# ... mozconfig_{annotate,use_with,use_enable}
+#	mozconfig_final
+# }
+
 # use-flags common among all mozilla ebuilds
 IUSE="dbus debug startup-notification"
 
@@ -15,14 +40,19 @@
 	>=x11-libs/cairo-1.12[X]
 	>=x11-libs/gtk+-2.10:2
 	>=x11-libs/pango-1.22.0
-	media-libs/alsa-lib
+	kernel_linux? ( media-libs/alsa-lib )
 	virtual/freedesktop-icon-theme
 	dbus? ( >=dev-libs/dbus-glib-0.72 )
 	startup-notification? ( >=x11-libs/startup-notification-0.8 )
+	>=dev-libs/glib-2.26:2"
+
+if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]]; then
+IUSE+=" wifi"
+RDEPEND+="
 	wifi? ( >=sys-apps/dbus-0.60
 		>=dev-libs/dbus-glib-0.72
-		net-wireless/wireless-tools )
-	>=dev-libs/glib-2.26:2"
+		net-wireless/wireless-tools )"
+fi
 
 DEPEND="app-arch/zip
 	app-arch/unzip





^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2014-08-01 16:32 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-28 20:59 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog mozconfig-v4.eclass Ian Stakenvicius (axs)
  -- strict thread matches above, loose matches on Subject: below --
2014-08-01 16:32 Ian Stakenvicius (axs)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox