public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/, www-client/firefox/, eclass/, net-libs/xulrunner/
@ 2011-03-06 18:54 Jory Pratt
  0 siblings, 0 replies; 2+ messages in thread
From: Jory Pratt @ 2011-03-06 18:54 UTC (permalink / raw
  To: gentoo-commits

commit:     38ecfcab09cda8f3c0d9ae759ebf9aada2b1dcaa
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  6 18:52:14 2011 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sun Mar  6 18:52:14 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=38ecfcab

major modifications to eclasses, we now support gio over gnome-vfs

---
 eclass/mozconfig-3.eclass                          |   95 +++++++
 eclass/mozcoreconf-2.eclass                        |  271 ++++++++++++++++++++
 mail-client/thunderbird/Manifest                   |    4 +-
 mail-client/thunderbird/thunderbird-3.1.9.ebuild   |   31 +--
 .../thunderbird/thunderbird-3.3_alpha2.ebuild      |   32 +--
 net-libs/xulrunner/Manifest                        |    2 +-
 net-libs/xulrunner/xulrunner-2.0_beta13_pre.ebuild |   79 +------
 www-client/firefox/Manifest                        |    2 +-
 www-client/firefox/firefox-4.0_beta13_pre.ebuild   |   67 +-----
 9 files changed, 389 insertions(+), 194 deletions(-)

diff --git a/eclass/mozconfig-3.eclass b/eclass/mozconfig-3.eclass
new file mode 100644
index 0000000..5705b0a
--- /dev/null
+++ b/eclass/mozconfig-3.eclass
@@ -0,0 +1,95 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+#
+# mozconfig.eclass: the new mozilla.eclass
+
+inherit multilib flag-o-matic mozcoreconf-2
+
+IUSE="+alsa bindist gnome +dbus debug +ipc libnotify startup-notification system-sqlite +webm wifi"
+
+RDEPEND="app-arch/zip
+	app-arch/unzip
+	>=app-text/hunspell-1.2
+	dev-libs/expat
+	>=dev-libs/glib-2.26
+	>=dev-libs/libIDL-0.8.0
+	>=dev-libs/libevent-1.4.7
+	!<x11-base/xorg-x11-6.7.0-r2
+	>=x11-libs/cairo-1.10.2[X]
+	>=x11-libs/gtk+-2.8.6
+	>=x11-libs/pango-1.10.1
+	virtual/jpeg
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( >=dev-libs/dbus-glib-0.72 )
+	gnome? ( libnotify? ( >=x11-libs/libnotify-0.4 ) )
+	startup-notification? ( >=x11-libs/startup-notification-0.8 )
+	system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete,unlock-notify,debug=] )
+	webm? ( media-libs/libvpx 
+		media-libs/alsa-lib )
+	wifi? ( net-wireless/wireless-tools )"
+
+DEPEND="${RDEPEND}"
+
+mozconfig_config() {
+	if ${SM} || ${XUL} || ${TB} || ${FF} || ${IC}; then
+	    mozconfig_annotate thebes --enable-default-toolkit=cairo-gtk2
+	else
+	    mozconfig_annotate -thebes --enable-default-toolkit=gtk2
+	fi
+
+	if [[ ${PN} = firefox || ${PN} = thunderbird ]]; then
+		mozconfig_use_enable !bindist official-branding
+	fi
+
+	mozconfig_use_enable alsa ogg
+	mozconfig_use_enable alsa wave
+	mozconfig_use_enable dbus
+	mozconfig_use_enable debug
+	mozconfig_use_enable debug tests
+	mozconfig_use_enable debug debugger-info-modeules
+	mozconfig_use_enable ipc
+	mozconfig_use_enable libnotify
+	mozconfig_use_enable startup-notification
+	mozconfig_use_enable system-sqlite
+	if use system-sqlite; then
+		mozconfig_annotate '' --with-sqlite-prefix="${EPREFIX}"/usr
+	fi
+	mozconfig_use_enable wifi necko-wifi
+
+	if ${SM} || ${XUL} || ${FF} || ${IC}; then
+		if use webm && ! use alsa; then
+			echo "Enabling alsa support due to webm request"
+			mozconfig_annotate '+webm -alsa' --enable-ogg
+			mozconfig_annotate '+webm -alsa' --enable-wave
+			mozconfig_annotate '+webm' --enable-webm
+		else
+			mozconfig_use_enable webm
+			mozconfig_use_with webm system-libvpx
+		fi
+	fi
+
+	if ${SM} || ${XUL} || ${FF} || ${IC}; then
+		if use amd64 || use x86 || use arm || use sparc; then
+			mozconfig_annotate '' --enable-tracejit
+		fi
+	fi
+
+	if ${SM} || ${TB} || ${XUL}; then
+		MEXTENSIONS="default"
+		mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+	fi
+
+	# 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 'broken' --disable-crashreporter
+	mozconfig_annotate '' --enable-system-hunspell
+	mozconfig_annotate '' --disable-gnomevfs
+	mozconfig_annotate '' --enable-gio
+	mozconfig_annotate '' --with-system-libevent="${EPREFIX}"/usr
+	mozconfig_annotate 'places' --enable-storage --enable-places --enable-places_bookmarks
+	mozconfig_annotate '' --enable-oji --enable-mathml
+	mozconfig_annotate 'broken' --disable-mochitest
+}

diff --git a/eclass/mozcoreconf-2.eclass b/eclass/mozcoreconf-2.eclass
new file mode 100644
index 0000000..634b7d0
--- /dev/null
+++ b/eclass/mozcoreconf-2.eclass
@@ -0,0 +1,271 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+#
+# mozcoreconf.eclass : core options for mozilla
+# inherit mozconfig-2 if you need USE flags
+
+inherit multilib flag-o-matic python
+
+IUSE="${IUSE} custom-optimization"
+
+RDEPEND="x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/libXmu
+	>=sys-libs/zlib-1.1.4"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	=dev-lang/python-2*[threads]"
+
+# mozconfig_annotate: add an annotated line to .mozconfig
+#
+# Example:
+# mozconfig_annotate "building on ultrasparc" --enable-js-ultrasparc
+# => ac_add_options --enable-js-ultrasparc # building on ultrasparc
+mozconfig_annotate() {
+	declare reason=$1 x ; shift
+	[[ $# -gt 0 ]] || die "mozconfig_annotate missing flags for ${reason}\!"
+	for x in ${*}; do
+		echo "ac_add_options ${x} # ${reason}" >>.mozconfig
+	done
+}
+
+# mozconfig_use_enable: add a line to .mozconfig based on a USE-flag
+#
+# Example:
+# mozconfig_use_enable truetype freetype2
+# => ac_add_options --enable-freetype2 # +truetype
+mozconfig_use_enable() {
+	declare flag=$(use_enable "$@")
+	mozconfig_annotate "$(useq $1 && echo +$1 || echo -$1)" "${flag}"
+}
+
+# mozconfig_use_with: add a line to .mozconfig based on a USE-flag
+#
+# Example:
+# mozconfig_use_with kerberos gss-api /usr/$(get_libdir)
+# => ac_add_options --with-gss-api=/usr/lib # +kerberos
+mozconfig_use_with() {
+	declare flag=$(use_with "$@")
+	mozconfig_annotate "$(useq $1 && echo +$1 || echo -$1)" "${flag}"
+}
+
+# mozconfig_use_extension: enable or disable an extension based on a USE-flag
+#
+# Example:
+# mozconfig_use_extension gnome gnomevfs
+# => ac_add_options --enable-extensions=gnomevfs
+mozconfig_use_extension() {
+	declare minus=$(useq $1 || echo -)
+	mozconfig_annotate "${minus:-+}$1" --enable-extensions=${minus}${2}
+}
+
+moz_pkgsetup() {
+	# Ensure we use C locale when building
+	export LANG="C"
+	export LC_ALL="C"
+	export LC_MESSAGES="C"
+	export LC_CTYPE="C"
+
+	# Ensure that we have a sane build enviroment
+	export MOZILLA_CLIENT=1
+	export BUILD_OPT=1
+	export NO_STATIC_LIB=1
+	export USE_PTHREADS=1
+	export ALDFLAGS=${LDFLAGS}
+
+	python_set_active_version 2
+}
+
+mozconfig_init() {
+	declare enable_optimize pango_version myext x
+	declare XUL=$([[ ${PN} == *xulrunner ]] && echo true || echo false)
+	declare FF=$([[ ${PN} == *firefox ]] && echo true || echo false)
+	declare IC=$([[ ${PN} == *icecat ]] && echo true || echo false)
+	declare SM=$([[ ${PN} == seamonkey ]] && echo true || echo false)
+	declare TB=$([[ ${PN} == *thunderbird ]] && echo true || echo false)
+	declare EM=$([[ ${PN} == enigmail ]] && echo true || echo false)
+
+
+	####################################
+	#
+	# Setup the initial .mozconfig
+	# See http://www.mozilla.org/build/configure-build.html
+	#
+	####################################
+
+	case ${PN} in
+		*xulrunner)
+			cp xulrunner/config/mozconfig .mozconfig \
+				|| die "cp xulrunner/config/mozconfig failed" ;;
+		*firefox)
+			cp browser/config/mozconfig .mozconfig \
+				|| die "cp browser/config/mozconfig failed" ;;
+		*icecat)
+			cp browser/config/mozconfig .mozconfig \
+				|| die "cp browser/config/mozconfig failed" ;;
+		seamonkey)
+			# Must create the initial mozconfig to enable application
+			: >.mozconfig || die "initial mozconfig creation failed"
+			mozconfig_annotate "" --enable-application=suite ;;
+		*thunderbird)
+			# Must create the initial mozconfig to enable application
+			: >.mozconfig || die "initial mozconfig creation failed"
+			mozconfig_annotate "" --enable-application=mail ;;
+		enigmail)
+			cp mail/config/mozconfig .mozconfig \
+				|| die "cp mail/config/mozconfig failed" ;;
+	esac
+
+	####################################
+	#
+	# CFLAGS setup and ARCH support
+	#
+	####################################
+
+	# Set optimization level
+	if [[ ${ARCH} == x86 ]]; then
+		mozconfig_annotate "less then -O2 causes a segfault on x86" --enable-optimize=-O2
+	elif use custom-optimization || [[ ${ARCH} =~ (alpha|ia64) ]]; then
+		# Set optimization level based on CFLAGS
+		if is-flag -O0; then
+			mozconfig_annotate "from CFLAGS" --enable-optimize=-O0
+		elif [[ ${ARCH} == ppc ]] && has_version '>=sys-libs/glibc-2.8'; then
+			mozconfig_annotate "more than -O1 segfaults on ppc with glibc-2.8" --enable-optimize=-O1
+		elif is-flag -O1; then
+			mozconfig_annotate "from CFLAGS" --enable-optimize=-O1
+		elif is-flag -Os; then
+			mozconfig_annotate "from CFLAGS" --enable-optimize=-Os
+		else
+			mozconfig_annotate "Gentoo's default optimization" --enable-optimize=-O2
+		fi
+	else
+		# Enable Mozilla's default
+		mozconfig_annotate "mozilla default" --enable-optimize
+	fi
+
+	# Strip optimization so it does not end up in compile string
+	filter-flags '-O*'
+
+	# Strip over-aggressive CFLAGS 
+	strip-flags
+
+	# Additional ARCH support
+	case "${ARCH}" in
+	alpha)
+		# Historically we have needed to add -fPIC manually for 64-bit.
+		# Additionally, alpha should *always* build with -mieee for correct math
+		# operation
+		append-flags -fPIC -mieee
+		;;
+
+	ia64)
+		# Historically we have needed to add this manually for 64-bit
+		append-flags -fPIC
+		;;
+
+	ppc64)
+		append-flags -fPIC -mminimal-toc
+		;;
+
+	ppc)
+		# Fix to avoid gcc-3.3.x micompilation issues.
+		if [[ $(gcc-major-version).$(gcc-minor-version) == 3.3 ]]; then
+			append-flags -fno-strict-aliasing
+		fi
+		;;
+
+	x86)
+		if [[ $(gcc-major-version) -eq 3 ]]; then
+			# gcc-3 prior to 3.2.3 doesn't work well for pentium4
+			# see bug 25332
+			if [[ $(gcc-minor-version) -lt 2 ||
+				( $(gcc-minor-version) -eq 2 && $(gcc-micro-version) -lt 3 ) ]]
+			then
+				replace-flags -march=pentium4 -march=pentium3
+				filter-flags -msse2
+			fi
+		fi
+		;;
+	esac
+
+	if [[ $(gcc-major-version) -eq 3 ]]; then
+		# Enable us to use flash, etc plugins compiled with gcc-2.95.3
+		mozconfig_annotate "building with >=gcc-3" --enable-old-abi-compat-wrappers
+
+		# Needed to build without warnings on gcc-3
+		CXXFLAGS="${CXXFLAGS} -Wno-deprecated"
+	fi
+
+	# Go a little faster; use less RAM
+	append-flags "$MAKEEDIT_FLAGS"
+
+	####################################
+	#
+	# mozconfig setup
+	#
+	####################################
+
+	mozconfig_annotate system_libs \
+		--with-system-jpeg \
+		--with-system-zlib \
+		--enable-pango \
+		--enable-svg \
+		--enable-system-cairo
+		# Requires libpng with apng support
+		#--with-system-png \
+
+	mozconfig_annotate disable_update_strip \
+		--disable-installer \
+		--disable-pedantic \
+		--disable-updater \
+		--disable-strip \
+		--disable-strip-libs \
+		--disable-install-strip
+
+
+
+	if [[ ${PN} != seamonkey ]]; then
+		mozconfig_annotate basic_profile \
+			--enable-single-profile \
+			--disable-profilesharing \
+			--disable-profilelocking
+	fi
+
+	# Here is a strange one...
+	if is-flag '-mcpu=ultrasparc*' || is-flag '-mtune=ultrasparc*'; then
+		mozconfig_annotate "building on ultrasparc" --enable-js-ultrasparc
+	fi
+
+	# Currently --enable-elf-dynstr-gc only works for x86,
+	# thanks to Jason Wever <weeve@gentoo.org> for the fix.
+	if use x86 && [[ ${enable_optimize} != -O0 ]]; then
+		mozconfig_annotate "${ARCH} optimized build" --enable-elf-dynstr-gc
+	fi
+
+	# jemalloc won't build with older glibc
+	! has_version ">=sys-libs/glibc-2.4" && mozconfig_annotate "we have old glibc" --disable-jemalloc
+}
+
+# mozconfig_final: display a table describing all configuration options paired
+# with reasons, then clean up extensions list
+mozconfig_final() {
+	declare ac opt hash reason
+	echo
+	echo "=========================================================="
+	echo "Building ${PF} with the following configuration"
+	grep ^ac_add_options .mozconfig | while read ac opt hash reason; do
+		[[ -z ${hash} || ${hash} == \# ]] \
+			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
+		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
+	done
+	echo "=========================================================="
+	echo
+
+	# Resolve multiple --enable-extensions down to one
+	declare exts=$(sed -n 's/^ac_add_options --enable-extensions=\([^ ]*\).*/\1/p' \
+		.mozconfig | xargs)
+	sed -i '/^ac_add_options --enable-extensions/d' .mozconfig
+	echo "ac_add_options --enable-extensions=${exts// /,}" >> .mozconfig
+}

diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 1a177b7..09df85d 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -57,5 +57,5 @@ DIST thunderbird-3.1.9-zh-CN.xpi 219646 RMD160 a48694168186adec3841840390bbffd77
 DIST thunderbird-3.1.9-zh-TW.xpi 220577 RMD160 d13efbae626df159e32e17b40134f082451d013d SHA1 41f064ed29960c57f4e0d2c9676d3e8557f43a2b SHA256 029e44c508e71056c9e6ce9045cc935cba40c714840755dff99bc9efc131a70a
 DIST thunderbird-3.1.9.source.tar.bz2 68760361 RMD160 9c85e4b76929792a7c2c8cbc0435c86cb9961a4d SHA1 22b153102939430180ae1873ce15ef52286ff08d SHA256 8b499ec3d81d3242b0cc2de27effb1891a07259adf7e5e4c06150f8c9f5254c2
 DIST thunderbird-3.3a2.source.tar.bz2 81657866 RMD160 c3378e9b97992665e3f2a152c058fb2fa1a2fb6f SHA1 e9fb755875b49b0fb42554065840c59ddf6389be SHA256 226f3406e934f82085897671d042b7c0b2b07bfe697f49086f71d8a13e646b12
-EBUILD thunderbird-3.1.9.ebuild 7958 RMD160 5f232ad9c77030a5dff3c3a6e96486cbfa484bd2 SHA1 1104d693f074aa195b93d178cb26fd4e9a50e2b3 SHA256 4200f0a8ba78a249929633ac62088bca31f5d61383c6391d9d7cf4da375463ef
-EBUILD thunderbird-3.3_alpha2.ebuild 9012 RMD160 cde9f6ee68cb9131a4a283bd4a812c7a669aefbc SHA1 60e856047581cbfe114bedfc89a1746541dbeac1 SHA256 6c63434315103e587dc87d11eb3d8691eb9c45a750c40b295baefb6cf72074e7
+EBUILD thunderbird-3.1.9.ebuild 6843 RMD160 3cc4f7fcf528f1abd648f470039be917380af07e SHA1 be50da72ee4fae3e8684bedfee171368fc5ad6cf SHA256 a8f7adaef9d42b024c3eb31d08c3f0ae9e4ac4cc8d157253f86f7a3c6ff96a74
+EBUILD thunderbird-3.3_alpha2.ebuild 7866 RMD160 107cde4ce5d701ea1730876fafcd2ee37612ae14 SHA1 e2b51c8ba265085dbd34a44ff8c773f333e064d5 SHA256 98a0ca9cc2292a9d20637c9473ae4b2cefce17b378b63fff6fcf0357d0ece4a7

diff --git a/mail-client/thunderbird/thunderbird-3.1.9.ebuild b/mail-client/thunderbird/thunderbird-3.1.9.ebuild
index 6720195..a202dac 100644
--- a/mail-client/thunderbird/thunderbird-3.1.9.ebuild
+++ b/mail-client/thunderbird/thunderbird-3.1.9.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 SLOT="0"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="+alsa ldap +crypt bindist libnotify +lightning mozdom system-sqlite wifi"
+IUSE="ldap +crypt +lightning mozdom"
 PATCH="${PN}-3.1-patches-1.2"
 
 REL_URI="http://releases.mozilla.org/pub/mozilla.org/${PN}/releases"
@@ -48,18 +48,11 @@ done
 RDEPEND=">=sys-devel/binutils-2.16.1
 	>=dev-libs/nss-3.12.8
 	>=dev-libs/nspr-4.8.6
-	>=app-text/hunspell-1.2
-	x11-libs/cairo[X]
 	x11-libs/pango[X]
 	media-libs/libpng[apng]
-	alsa? ( media-libs/alsa-lib )
-	libnotify? ( >=x11-libs/libnotify-0.4 )
-	system-sqlite? ( >=dev-db/sqlite-3.7.1[fts3,secure-delete,threadsafe] )
-	wifi? ( net-wireless/wireless-tools )
 	!x11-plugins/lightning"
 
-DEPEND="${RDEPEND}
-	=dev-lang/python-2*[threads]"
+DEPEND="${RDEPEND}"
 
 PDEPEND="crypt? ( >=x11-plugins/enigmail-1.1 )"
 
@@ -88,9 +81,7 @@ linguas() {
 }
 
 pkg_setup() {
-	export BUILD_OFFICIAL=1
-	export MOZILLA_OFFICIAL=1
-	export ALDFLAGS=${LDFLAGS}
+	moz_pkgsetup
 
 	if ! use bindist; then
 		elog "You are enabling official branding. You may not redistribute this build"
@@ -98,8 +89,6 @@ pkg_setup() {
 		elog "a legal problem with Mozilla Foundation"
 		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
 	fi
-
-	python_set_active_version 2
 }
 
 src_unpack() {
@@ -147,7 +136,6 @@ src_configure() {
 	#
 	####################################
 
-	touch mail/config/mozconfig
 	mozconfig_init
 	mozconfig_config
 
@@ -155,27 +143,14 @@ src_configure() {
 	use alpha && append-ldflags "-Wl,--no-relax"
 
 	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-	mozconfig_annotate '' --enable-application=mail
 	mozconfig_annotate '' --with-default-mozilla-five-home="${EPREFIX}${MOZILLA_FIVE_HOME}"
 	mozconfig_annotate '' --with-user-appdir=.thunderbird
 	mozconfig_annotate '' --with-system-png
-	mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${EPREFIX}"/usr
-	mozconfig_annotate '' --with-system-nss --with-nss-prefix="${EPREFIX}"/usr
-	mozconfig_annotate '' --with-sqlite-prefix="${EPREFIX}"/usr
-	mozconfig_annotate '' --x-includes="${EPREFIX}"/usr/include --x-libraries="${EPREFIX}"/usr/$(get_libdir)
-	mozconfig_annotate 'broken' --disable-crashreporter
-	mozconfig_annotate '' --enable-system-hunspell
 
 	# Use enable features
 	mozconfig_use_enable ldap
 	mozconfig_use_enable ldap ldap-experimental
-	mozconfig_use_enable libnotify
 	mozconfig_use_enable lightning calendar
-	mozconfig_use_enable wifi necko-wifi
-	mozconfig_use_enable system-sqlite
-	mozconfig_use_enable !bindist official-branding
-	mozconfig_use_enable alsa ogg
-	mozconfig_use_enable alsa wave
 
 	# Bug #72667
 	if use mozdom; then

diff --git a/mail-client/thunderbird/thunderbird-3.3_alpha2.ebuild b/mail-client/thunderbird/thunderbird-3.3_alpha2.ebuild
index 4f75023..3e0ff66 100644
--- a/mail-client/thunderbird/thunderbird-3.3_alpha2.ebuild
+++ b/mail-client/thunderbird/thunderbird-3.3_alpha2.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 SLOT="0"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="+alsa +crypt bindist libnotify +lightning mozdom system-sqlite wifi"
+IUSE="+crypt +lightning mozdom"
 #PATCH="${PN}-3.1-patches-1.2"
 
 REL_URI="http://releases.mozilla.org/pub/mozilla.org/${PN}/releases"
@@ -50,14 +50,7 @@ SRC_URI="${REL_URI}/${MY_PV}/source/${MY_P}.source.tar.bz2
 RDEPEND=">=sys-devel/binutils-2.16.1
 	>=dev-libs/nss-3.12.9
 	>=dev-libs/nspr-4.8.7
-	>=app-text/hunspell-1.2
-	>=x11-libs/cairo-1.10.2[X]
-	x11-libs/pango[X]
 	media-libs/libpng[apng]
-	alsa? ( media-libs/alsa-lib )
-	libnotify? ( >=x11-libs/libnotify-0.4 )
-	system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete,unlock-notify] )
-	wifi? ( net-wireless/wireless-tools )
 	!x11-plugins/lightning
 	!x11-plugins/enigmail
 	crypt?  ( || (
@@ -70,8 +63,7 @@ RDEPEND=">=sys-devel/binutils-2.16.1
 		=app-crypt/gnupg-1.4*
 	) )"
 
-DEPEND="${RDEPEND}
-	=dev-lang/python-2*[threads]"
+DEPEND="${RDEPEND}"
 
 S="${WORKDIR}"/comm-central
 
@@ -98,9 +90,7 @@ S="${WORKDIR}"/comm-central
 #}
 
 pkg_setup() {
-	export BUILD_OFFICIAL=1
-	export MOZILLA_OFFICIAL=1
-	export ALDFLAGS=${LDFLAGS}
+	moz_pkgsetup
 
 	if ! use bindist; then
 		elog "You are enabling official branding. You may not redistribute this build"
@@ -108,8 +98,6 @@ pkg_setup() {
 		elog "a legal problem with Mozilla Foundation"
 		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
 	fi
-
-	python_set_active_version 2
 }
 
 src_unpack() {
@@ -161,7 +149,6 @@ src_configure() {
 	#
 	####################################
 
-	touch mail/config/mozconfig
 	mozconfig_init
 	mozconfig_config
 
@@ -173,25 +160,12 @@ src_configure() {
 		mozconfig_annotate '' --enable-chrome-format=jar
 	fi
 	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-	mozconfig_annotate '' --enable-application=mail
 	mozconfig_annotate '' --with-default-mozilla-five-home="${EPREFIX}${MOZILLA_FIVE_HOME}"
 	mozconfig_annotate '' --with-user-appdir=.thunderbird
 	mozconfig_annotate '' --with-system-png
-	mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${EPREFIX}"/usr
-	mozconfig_annotate '' --with-system-nss --with-nss-prefix="${EPREFIX}"/usr
-	mozconfig_annotate '' --with-sqlite-prefix="${EPREFIX}"/usr
-	mozconfig_annotate '' --x-includes="${EPREFIX}"/usr/include --x-libraries="${EPREFIX}"/usr/$(get_libdir)
-	mozconfig_annotate 'broken' --disable-crashreporter
-	mozconfig_annotate '' --enable-system-hunspell
 
 	# Use enable features
-	mozconfig_use_enable libnotify
 	mozconfig_use_enable lightning calendar
-	mozconfig_use_enable wifi necko-wifi
-	mozconfig_use_enable system-sqlite
-	mozconfig_use_enable !bindist official-branding
-	mozconfig_use_enable alsa ogg
-	mozconfig_use_enable alsa wave
 
 	# Bug #72667
 	if use mozdom; then

diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
index 3844424..22e7171 100644
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/Manifest
@@ -1,4 +1,4 @@
 AUX xulrunner-default-prefs.js 709 RMD160 a4d062f75c17552545267ec3fe2f6b54073dafbd SHA1 580128e9edf8021fdbbca2c91abf63cb83bab2c7 SHA256 e6850b0a22f7d3889b49ec4a79a3c4d3d077edd98c8f0ffdc26e30bc70bb4b09
 DIST firefox-4.0b13_pre_e56ecd8b3a68.source.tar.bz2 64806723 RMD160 e6f4690bf63f648a7260ab1dcf648a43be93490f SHA1 814314c2e425049a0646b4d77e5ef8f4e7738303 SHA256 f817fb4eede8216259ac1a23b92a05bb3088e4d2b6d00b8b5a9303884a69568c
 DIST xulrunner-2.0-patches-1.2.tar.bz2 50296 RMD160 55efe05cd37f3a49d4e6bc25ea0e0e2a50eab02a SHA1 1a56906b94f30e33885b568041d1bdd53ad2b5b6 SHA256 e6b63b4c94f4a44c35aab34e6d15998c5a812eedcc4856a662f5c8eb35a4e6d9
-EBUILD xulrunner-2.0_beta13_pre.ebuild 7851 RMD160 4f334b61a0f6855cfd8a43210ff75400bd2ee1bd SHA1 c0ca182981c991596bd983bea0e80c47b77b3b90 SHA256 aee2deda38cf1f2ae02910cc742e0cb8f9388e34f2e42f6b5951e48e1e1b1008
+EBUILD xulrunner-2.0_beta13_pre.ebuild 5387 RMD160 f23018d13f275b9722dcebe436c77d2d7521a61b SHA1 d2b300454388c1d2c3a16442b36de50fa1f2d1c2 SHA256 ddac6f714b23ee07c0293d7046492ced3bac0f3989a6209ece7c3f2a68d244da

diff --git a/net-libs/xulrunner/xulrunner-2.0_beta13_pre.ebuild b/net-libs/xulrunner/xulrunner-2.0_beta13_pre.ebuild
index 172ec4b..431aea1 100644
--- a/net-libs/xulrunner/xulrunner-2.0_beta13_pre.ebuild
+++ b/net-libs/xulrunner/xulrunner-2.0_beta13_pre.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="http://developer.mozilla.org/en/docs/XULRunner"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="1.9"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="+alsa debug +ipc libnotify system-sqlite +webm wifi"
+IUSE=""
 
 # More URIs appended below...
 SRC_URI="http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2"
@@ -30,22 +30,11 @@ RDEPEND="
 	>=sys-devel/binutils-2.16.1
 	>=dev-libs/nss-3.12.9
 	>=dev-libs/nspr-4.8.7
-	>=app-text/hunspell-1.2
-	>=x11-libs/cairo-1.10.2[X]
-	>=dev-libs/libevent-1.4.7
 	x11-libs/pango[X]
 	media-libs/libpng[apng]
-	x11-libs/libXt
-	x11-libs/pixman
-	webm? ( media-libs/libvpx )
-	alsa? ( media-libs/alsa-lib )
-	libnotify? ( >=x11-libs/libnotify-0.4 )
-	system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete,unlock-notify,debug=] )
-	wifi? ( net-wireless/wireless-tools )
 	!www-plugins/weave"
 
 DEPEND="${RDEPEND}
-	=dev-lang/python-2*[threads]
 	dev-util/pkgconfig
 	dev-lang/yasm"
 
@@ -62,13 +51,7 @@ else
 fi
 
 pkg_setup() {
-	# Ensure we always build with C locale.
-	export LANG="C"
-	export LC_ALL="C"
-	export LC_MESSAGES="C"
-	export LC_CTYPE="C"
-
-	python_set_active_version 2
+	moz_pkgsetup
 }
 
 src_prepare() {
@@ -104,6 +87,10 @@ src_prepare() {
 			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
 	fi
 
+	# Disable gnomevfs extension
+	sed -i -e "s:gnomevfs::" "${S}/"xulrunner/confvars.sh \
+		|| die "Failed to remove gnomevfs extension"
+
 	eautoreconf
 
 	cd js/src
@@ -129,64 +116,10 @@ src_configure() {
 
 	mozconfig_annotate '' --with-default-mozilla-five-home="${MOZLIBDIR}"
 	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-	mozconfig_annotate '' --enable-application=xulrunner
 	mozconfig_annotate '' --disable-mailnews
-	mozconfig_annotate 'broken' --disable-crashreporter
 	mozconfig_annotate '' --enable-canvas
-	mozconfig_annotate 'gtk' --enable-default-toolkit=cairo-gtk2
-
-	# Bug 60668: Galeon doesn't build without oji enabled, so enable it
-	# regardless of java setting.
-	mozconfig_annotate '' --enable-oji --enable-mathml
-	mozconfig_annotate 'places' --enable-storage --enable-places
 	mozconfig_annotate '' --enable-safe-browsing
-	# This will be removed when packages moving to webkit complete their move
-	mozconfig_annotate '' --enable-shared-js
-
-	# System-wide install specs
-	mozconfig_annotate '' --disable-installer
-	mozconfig_annotate '' --disable-updater
-	mozconfig_annotate '' --disable-strip
-	mozconfig_annotate '' --disable-install-strip
-
-	# Use system libraries
-	mozconfig_annotate '' --enable-system-cairo
-	mozconfig_annotate '' --enable-system-hunspell
-	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-bz2
-	mozconfig_annotate '' --with-system-libevent="${EPREFIX}"/usr
 	mozconfig_annotate '' --with-system-png
-	if use webm ; then
-		mozconfig_annotate '' --with-system-libvpx
-	fi
-
-	mozconfig_use_enable ipc # +ipc, upstream default
-	mozconfig_use_enable libnotify
-	mozconfig_use_enable wifi necko-wifi
-	mozconfig_use_enable alsa ogg
-	mozconfig_use_enable alsa wave
-	mozconfig_use_enable system-sqlite
-	mozconfig_use_enable webm
-
-	# NOTE: Uses internal copy of libvpx
-	if use webm && ! use alsa; then
-		ewarn "USE=webm needs USE=alsa, disabling WebM support."
-		mozconfig_annotate '+webm -alsa' --disable-webm
-	fi
-
-	if use amd64 || use x86 || use arm || use sparc; then
-		mozconfig_annotate 'tracejit' --enable-tracejit
-	fi
-
-	# Debug
-	if use debug ; then
-		mozconfig_annotate 'debug' --disable-optimize
-		mozconfig_annotate 'debug' --enable-debug=-ggdb
-		mozconfig_annotate 'debug' --enable-debug-modules=all
-		mozconfig_annotate 'debug' --enable-debugger-info-modules
-	fi
 
 	# Finalize and report settings
 	mozconfig_final

diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 4a333bd..b835eb9 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -3,4 +3,4 @@ AUX icon/firefox-1.5-unbranded.desktop 303 RMD160 e9cb808302b7fbd7d4eb84aeb0a438
 AUX icon/firefox-1.5.desktop 300 RMD160 df437e79147897b0ec52b44edc42ad4ef270eda5 SHA1 b60d51629ba58992f6d9ae9ad8c29ffc6630de4d SHA256 bc6f84004032afab5c078d8dc7c4ffe36abc45738c119fad3fcfa5de89dd5dae
 DIST firefox-4.0-patches-0.7.tar.bz2 4101 RMD160 6e006b1a047c1b750b7deb7449651b4bc30173e0 SHA1 9e47ce491edb9d12d9384949a73ea92377601542 SHA256 9fa9d0b407a084d7f0f9887d054263404626eda46dc560ccd5ffd5d8c91fa707
 DIST firefox-4.0b13_pre_e56ecd8b3a68.source.tar.bz2 64806723 RMD160 e6f4690bf63f648a7260ab1dcf648a43be93490f SHA1 814314c2e425049a0646b4d77e5ef8f4e7738303 SHA256 f817fb4eede8216259ac1a23b92a05bb3088e4d2b6d00b8b5a9303884a69568c
-EBUILD firefox-4.0_beta13_pre.ebuild 9455 RMD160 f6e1c735bb83b77ac5fe8834c428ff215fe41473 SHA1 15815aa4df05374fc21b1a44beaf8b5b7949c013 SHA256 ec5d7c031e729c41850f391d31089d24bdaf3c3439734d42db9fafbc40d56a7b
+EBUILD firefox-4.0_beta13_pre.ebuild 7432 RMD160 5cdfcfa204472b2f7b3bb91296ef4bb673a3bef2 SHA1 285564c4b2f1bbe77f0da874a57b4f02185fce7d SHA256 5fef389418cf8f01292bd5a8751c040ec0820d19c265e041754f5419aec16736

diff --git a/www-client/firefox/firefox-4.0_beta13_pre.ebuild b/www-client/firefox/firefox-4.0_beta13_pre.ebuild
index 3d4484f..805f9d4 100644
--- a/www-client/firefox/firefox-4.0_beta13_pre.ebuild
+++ b/www-client/firefox/firefox-4.0_beta13_pre.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="http://www.mozilla.com/firefox"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="+alsa bindist +ipc libnotify system-sqlite +webm wifi"
+IUSE=""
 
 REL_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases"
 # More URIs appended below...
@@ -31,15 +31,8 @@ RDEPEND="
 	>=sys-devel/binutils-2.16.1
 	>=dev-libs/nss-3.12.9
 	>=dev-libs/nspr-4.8.7
-	>=app-text/hunspell-1.2
-	>=x11-libs/cairo-1.8.8[X]
 	x11-libs/pango[X]
 	media-libs/libpng[apng]
-	webm? ( media-libs/libvpx )
-	alsa? ( media-libs/alsa-lib )
-	libnotify? ( >=x11-libs/libnotify-0.4 )
-	system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete,unlock-notify] )
-	wifi? ( net-wireless/wireless-tools )
 	~net-libs/xulrunner-${XUL_PV}[wifi=,libnotify=,system-sqlite=,webm=]"
 
 DEPEND="${RDEPEND}
@@ -108,11 +101,7 @@ linguas() {
 }
 
 pkg_setup() {
-	# Ensure we always build with C locale.
-	export LANG="C"
-	export LC_ALL="C"
-	export LC_MESSAGES="C"
-	export LC_CTYPE="C"
+	moz_pkgsetup
 
 	if ! use bindist ; then
 		einfo
@@ -121,8 +110,6 @@ pkg_setup() {
 		elog "a legal problem with Mozilla Foundation"
 		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
 	fi
-
-	python_set_active_version 2
 }
 
 src_unpack() {
@@ -144,6 +131,10 @@ src_prepare() {
 	# Allow user to apply any additional patches without modifing ebuild
 	epatch_user
 
+	# Disable gnomevfs extension
+	sed -i -e "s:gnomevfs::" "${S}/"browser/confvars.sh \
+		|| die "Failed to remove gnomevfs extension"
+
 	eautoreconf
 
 	cd js/src
@@ -167,58 +158,14 @@ src_configure() {
 	use alpha && append-ldflags "-Wl,--no-relax"
 
 	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-	mozconfig_annotate '' --enable-application=browser
 	mozconfig_annotate '' --disable-mailnews
-	mozconfig_annotate '' --disable-crashreporter
-	mozconfig_annotate '' --enable-image-encoder=all
 	mozconfig_annotate '' --enable-canvas
-	mozconfig_annotate 'gtk' --enable-default-toolkit=cairo-gtk2
-
-	# Bug 60668: Galeon doesn't build without oji enabled, so enable it
-	# regardless of java setting.
-	mozconfig_annotate '' --enable-oji --enable-mathml
-	mozconfig_annotate 'places' --enable-storage --enable-places
 	mozconfig_annotate '' --enable-safe-browsing
-
-	# System-wide install specs
-	mozconfig_annotate '' --disable-installer
-	mozconfig_annotate '' --disable-updater
-	mozconfig_annotate '' --disable-strip
-	mozconfig_annotate '' --disable-install-strip
-
-	# Use system libraries
-	mozconfig_annotate '' --enable-system-cairo
-	mozconfig_annotate '' --enable-system-hunspell
-	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-bz2
 	mozconfig_annotate '' --with-system-png
-	if use webm ; then
-		mozconfig_annotate '' --with-system-libvpx
-	fi
+
 	mozconfig_annotate '' --with-system-libxul
 	mozconfig_annotate '' --with-libxul-sdk="${EPREFIX}"/usr/$(get_libdir)/xulrunner-devel-${MAJ_XUL_PV}
 
-	mozconfig_use_enable ipc # +ipc, upstream default
-	mozconfig_use_enable libnotify
-	mozconfig_use_enable wifi necko-wifi
-	mozconfig_use_enable alsa ogg
-	mozconfig_use_enable alsa wave
-	mozconfig_use_enable system-sqlite
-	mozconfig_use_enable webm
-	mozconfig_use_enable !bindist official-branding
-
-	# NOTE: Uses internal copy of libvpx
-	if use webm && ! use alsa; then
-		ewarn "USE=webm needs USE=alsa, disabling WebM support."
-		mozconfig_annotate '+webm -alsa' --disable-webm
-	fi
-
-	if use amd64 || use x86 || use arm || use sparc; then
-		mozconfig_annotate '' --enable-tracejit
-	fi
-
 	# Other ff-specific settings
 	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
 



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

* [gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/, www-client/firefox/, eclass/, net-libs/xulrunner/
@ 2011-03-11  3:13 Jory Pratt
  0 siblings, 0 replies; 2+ messages in thread
From: Jory Pratt @ 2011-03-11  3:13 UTC (permalink / raw
  To: gentoo-commits

commit:     96abddc88d3c5cf7cc9d1f03aa874a2548ad7383
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 11 03:12:44 2011 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Fri Mar 11 03:12:44 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=96abddc8

change ipc handing to ebuilds IUSE instead of eclass.

---
 eclass/mozconfig-3.eclass                          |    8 ++++----
 mail-client/thunderbird/Manifest                   |    2 +-
 .../thunderbird/thunderbird-3.3_alpha2.ebuild      |    2 +-
 net-libs/xulrunner/Manifest                        |    2 +-
 net-libs/xulrunner/xulrunner-2.0_beta13_pre.ebuild |    2 +-
 www-client/firefox/Manifest                        |    2 +-
 www-client/firefox/firefox-4.0_beta13_pre.ebuild   |    2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/eclass/mozconfig-3.eclass b/eclass/mozconfig-3.eclass
index 55c3c68..8fd4c1b 100644
--- a/eclass/mozconfig-3.eclass
+++ b/eclass/mozconfig-3.eclass
@@ -7,7 +7,7 @@
 inherit multilib flag-o-matic mozcoreconf-2
 
 # use-flags common among all mozilla ebuilds
-IUSE="+alsa +dbus debug +ipc libnotify startup-notification system-sqlite +webm wifi"
+IUSE="+alsa +dbus debug libnotify startup-notification system-sqlite +webm wifi"
 
 RDEPEND="app-arch/zip
 	app-arch/unzip
@@ -48,7 +48,9 @@ mozconfig_config() {
 	mozconfig_use_enable debug
 	mozconfig_use_enable debug tests
 	mozconfig_use_enable debug debugger-info-modeules
-	mozconfig_use_enable ipc
+	if has ipc ${IUSE}; then
+		mozconfig_use_enable ipc
+	fi
 	mozconfig_use_enable libnotify
 	mozconfig_use_enable startup-notification
 	mozconfig_use_enable system-sqlite
@@ -67,9 +69,7 @@ mozconfig_config() {
 			mozconfig_use_enable webm
 			mozconfig_use_with webm system-libvpx
 		fi
-	fi
 
-	if ${SM} || ${XUL} || ${FF} || ${IC}; then
 		if use amd64 || use x86 || use arm || use sparc; then
 			mozconfig_annotate '' --enable-tracejit
 		fi

diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 21ea340..371caac 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -58,4 +58,4 @@ DIST thunderbird-3.1.9-zh-TW.xpi 220577 RMD160 d13efbae626df159e32e17b40134f0824
 DIST thunderbird-3.1.9.source.tar.bz2 68760361 RMD160 9c85e4b76929792a7c2c8cbc0435c86cb9961a4d SHA1 22b153102939430180ae1873ce15ef52286ff08d SHA256 8b499ec3d81d3242b0cc2de27effb1891a07259adf7e5e4c06150f8c9f5254c2
 DIST thunderbird-3.3a2.source.tar.bz2 81657866 RMD160 c3378e9b97992665e3f2a152c058fb2fa1a2fb6f SHA1 e9fb755875b49b0fb42554065840c59ddf6389be SHA256 226f3406e934f82085897671d042b7c0b2b07bfe697f49086f71d8a13e646b12
 EBUILD thunderbird-3.1.9.ebuild 6843 RMD160 3cc4f7fcf528f1abd648f470039be917380af07e SHA1 be50da72ee4fae3e8684bedfee171368fc5ad6cf SHA256 a8f7adaef9d42b024c3eb31d08c3f0ae9e4ac4cc8d157253f86f7a3c6ff96a74
-EBUILD thunderbird-3.3_alpha2.ebuild 7734 RMD160 dc4b2e4643f4ca4b343ac5cdc05f7379daef5198 SHA1 52c9c057fd6496fe1be39e13f39d6eafdadeb959 SHA256 50c5e9b5c6e40095636db62a67b1aa2a6f57262e48e1d03d00e25ec55e1ead77
+EBUILD thunderbird-3.3_alpha2.ebuild 7739 RMD160 059321abb2457c8ad4244400cf422edd3964f55d SHA1 c5104679cab923de804c192fdb0f5720df84a1a0 SHA256 e94d2bd1e37b887be2a6b5b823d65bf9a210d688314340da62b2e0d81ccd7c36

diff --git a/mail-client/thunderbird/thunderbird-3.3_alpha2.ebuild b/mail-client/thunderbird/thunderbird-3.3_alpha2.ebuild
index 252cb9a..1bb60ca 100644
--- a/mail-client/thunderbird/thunderbird-3.3_alpha2.ebuild
+++ b/mail-client/thunderbird/thunderbird-3.3_alpha2.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 SLOT="0"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="bindist +crashreporter +crypt +lightning mozdom"
+IUSE="bindist +crashreporter +crypt +ipc +lightning mozdom"
 #PATCH="${PN}-3.1-patches-1.2"
 
 REL_URI="http://releases.mozilla.org/pub/mozilla.org/${PN}/releases"

diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
index 473ac64..76c7227 100644
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/Manifest
@@ -1,4 +1,4 @@
 AUX xulrunner-default-prefs.js 709 RMD160 a4d062f75c17552545267ec3fe2f6b54073dafbd SHA1 580128e9edf8021fdbbca2c91abf63cb83bab2c7 SHA256 e6850b0a22f7d3889b49ec4a79a3c4d3d077edd98c8f0ffdc26e30bc70bb4b09
 DIST firefox-4.0b13_pre_e56ecd8b3a68.source.tar.bz2 64806723 RMD160 e6f4690bf63f648a7260ab1dcf648a43be93490f SHA1 814314c2e425049a0646b4d77e5ef8f4e7738303 SHA256 f817fb4eede8216259ac1a23b92a05bb3088e4d2b6d00b8b5a9303884a69568c
 DIST xulrunner-2.0-patches-1.2.tar.bz2 50296 RMD160 55efe05cd37f3a49d4e6bc25ea0e0e2a50eab02a SHA1 1a56906b94f30e33885b568041d1bdd53ad2b5b6 SHA256 e6b63b4c94f4a44c35aab34e6d15998c5a812eedcc4856a662f5c8eb35a4e6d9
-EBUILD xulrunner-2.0_beta13_pre.ebuild 5401 RMD160 1386e988bd63c5694ed937a0055a5fe0bc7360f5 SHA1 9521cc1287599c94a3d17b2d8a3bf5c4a56b5e4f SHA256 eb83048137a24f50572cddc46e1082aacdb5b6918b2813d804148b054f7a8236
+EBUILD xulrunner-2.0_beta13_pre.ebuild 5406 RMD160 e089468b3982f4a867511814a284d5a4fceee8c6 SHA1 7061118cf34a20e9f481e64f9656fe1dc0b76a69 SHA256 46aec8d5c3f1119bd5bfa16a9f7fff700d70b5df06747e8d8dc5d3468ca0c2f5

diff --git a/net-libs/xulrunner/xulrunner-2.0_beta13_pre.ebuild b/net-libs/xulrunner/xulrunner-2.0_beta13_pre.ebuild
index 782d89c..6b0fe8d 100644
--- a/net-libs/xulrunner/xulrunner-2.0_beta13_pre.ebuild
+++ b/net-libs/xulrunner/xulrunner-2.0_beta13_pre.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="http://developer.mozilla.org/en/docs/XULRunner"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="1.9"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="+crashreporter"
+IUSE="+crashreporter +ipc"
 
 # More URIs appended below...
 SRC_URI="http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2"

diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 3a9ce0b..63e53fe 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -3,4 +3,4 @@ AUX icon/firefox-1.5-unbranded.desktop 303 RMD160 e9cb808302b7fbd7d4eb84aeb0a438
 AUX icon/firefox-1.5.desktop 300 RMD160 df437e79147897b0ec52b44edc42ad4ef270eda5 SHA1 b60d51629ba58992f6d9ae9ad8c29ffc6630de4d SHA256 bc6f84004032afab5c078d8dc7c4ffe36abc45738c119fad3fcfa5de89dd5dae
 DIST firefox-4.0-patches-0.7.tar.bz2 4101 RMD160 6e006b1a047c1b750b7deb7449651b4bc30173e0 SHA1 9e47ce491edb9d12d9384949a73ea92377601542 SHA256 9fa9d0b407a084d7f0f9887d054263404626eda46dc560ccd5ffd5d8c91fa707
 DIST firefox-4.0b13_pre_e56ecd8b3a68.source.tar.bz2 64806723 RMD160 e6f4690bf63f648a7260ab1dcf648a43be93490f SHA1 814314c2e425049a0646b4d77e5ef8f4e7738303 SHA256 f817fb4eede8216259ac1a23b92a05bb3088e4d2b6d00b8b5a9303884a69568c
-EBUILD firefox-4.0_beta13_pre.ebuild 7251 RMD160 583afac44c2b7b279f5d34d44a5ddfc54388f35b SHA1 c59e4cf50f27b7ed61ed5bdb1fd705f2c81ae821 SHA256 240cf9cb0b385405cc6cb03c045293ee602091a3e1f33c5a75b4f8a2e67b3585
+EBUILD firefox-4.0_beta13_pre.ebuild 7256 RMD160 80f1945ac347037ddf13d7b1ba807b3bfc7ef2b2 SHA1 5b8a8eed89a45bef32c882a996d1dc7097598056 SHA256 5013be39b8719664aec2754b7d9ae1db8301955ca454beea6887222ad5562c85

diff --git a/www-client/firefox/firefox-4.0_beta13_pre.ebuild b/www-client/firefox/firefox-4.0_beta13_pre.ebuild
index 1187a27..ebc3630 100644
--- a/www-client/firefox/firefox-4.0_beta13_pre.ebuild
+++ b/www-client/firefox/firefox-4.0_beta13_pre.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="http://www.mozilla.com/firefox"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="bindist"
+IUSE="bindist +ipc"
 
 REL_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases"
 # More URIs appended below...



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

end of thread, other threads:[~2011-03-11  3:13 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-06 18:54 [gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/, www-client/firefox/, eclass/, net-libs/xulrunner/ Jory Pratt
  -- strict thread matches above, loose matches on Subject: below --
2011-03-11  3:13 Jory Pratt

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