[gentoo-commits] proj/mozilla:master commit in: www-client/seamonkey/

["Lars Wendler" <polynomial-c@gentoo.org>]

commit:     8b2880d90b565da3b1b7c125be1cbd7f5ccbc9b6
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 14 20:43:39 2011 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Mar 14 20:43:39 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=8b2880d9

Adjusted ebuild for new mozilla eclasses.

---
 www-client/seamonkey/Manifest                   |    2 +-
 www-client/seamonkey/seamonkey-2.1_beta2.ebuild |   67 +++--------------------
 2 files changed, 9 insertions(+), 60 deletions(-)

diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index 9ee97b2..fbbef6b 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -24,4 +24,4 @@ DIST seamonkey-2.1b2-ru.xpi 885903 RMD160 7a2a6d60609521013fe2380d5ab67f59490730
 DIST seamonkey-2.1b2-sk.xpi 835935 RMD160 6ab9dcc723d2bb147a23d84532eaf13ca94eea07 SHA1 b3ef9378fd13566bd3443f9e3507c7ba96a8391a SHA256 78a5a655567e4fed278911b99443c23c671065a6a864aebfbb29fbafa4fae0f0
 DIST seamonkey-2.1b2-sv-SE.xpi 867156 RMD160 6d3ca2aab099e6bc6c57c641b20a1ab10751a31e SHA1 ec46f7c052ed388d3022ad7ffeb4c6a6c0e8b0aa SHA256 abb1bff1771543d6202fc520f66acec930be02dec1d2c75b329b96955ec6815c
 DIST seamonkey-2.1b2.source.tar.bz2 83425193 RMD160 d7a9a61fd470a58e19f4e9b2d2c7a00eaf1362ac SHA1 c94fd66240fd9d77a73fdeec271131c23fd6cf98 SHA256 9f9e59303b1d39dc97aa943f49018a572d41b5e566c66e176f1f012e2e9d898a
-EBUILD seamonkey-2.1_beta2.ebuild 11509 RMD160 53059d098eba0d51303bcfd5eafef109a6d9d017 SHA1 5c27af8e030445bef3ff83dcd549a080bcb38047 SHA256 1768c2d87bdf28dd4f3ddf2b179eec9417130858fb0fa693ae096747e98867d4
+EBUILD seamonkey-2.1_beta2.ebuild 9778 RMD160 7c0a2d53b7516505d7e10e91b09fd7cae5dcfca2 SHA1 cbf0d3bebcdf90fbbd9a8b23ed95ff9e8f218891 SHA256 faeefc49162e2d9a9c5a0c9c1ec2ffee21e23d408dd7d9a3322d26966bb68ad3

diff --git a/www-client/seamonkey/seamonkey-2.1_beta2.ebuild b/www-client/seamonkey/seamonkey-2.1_beta2.ebuild
index 5b059d0..8e769b9 100644
--- a/www-client/seamonkey/seamonkey-2.1_beta2.ebuild
+++ b/www-client/seamonkey/seamonkey-2.1_beta2.ebuild
@@ -68,23 +68,13 @@ fi
 RDEPEND=">=sys-devel/binutils-2.16.1
 	>=dev-libs/nss-3.12.9
 	>=dev-libs/nspr-4.8.7
-	alsa? ( media-libs/alsa-lib )
-	system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete,unlock-notify] )
 	>=media-libs/libpng-1.4.1[apng]
-	>=app-text/hunspell-1.2
-	>=x11-libs/gtk+-2.10.0
-	>=x11-libs/cairo-1.10.0[X]
 	>=x11-libs/pango-1.14.0[X]
-	libnotify? ( >=x11-libs/libnotify-0.4 )
-	crypt? ( mailclient? ( >=app-crypt/gnupg-1.4 ) )
-	vpx? ( media-libs/libvpx )
-	wifi? ( net-wireless/wireless-tools )"
-	#vpx? ( media-libs/libvpx )
+	crypt? ( mailclient? ( >=app-crypt/gnupg-1.4 ) )"
 
 DEPEND="${RDEPEND}
-	=dev-lang/python-2*[threads]
 	dev-util/pkgconfig
-	vpx? ( dev-lang/yasm )"
+	dev-lang/yasm"
 
 S="${WORKDIR}/comm-central"
 
@@ -132,16 +122,7 @@ pkg_setup() {
 		ewarn "Those belong to upstream: https://bugzilla.mozilla.org"
 	fi
 
-	# Ensure we always build with C locale.
-	export LANG="C"
-	export LC_ALL="C"
-	export LC_MESSAGES="C"
-	export LC_CTYPE="C"
-
-	export BUILD_OFFICIAL=1
-	export MOZILLA_OFFICIAL=1
-
-	python_set_active_version 2
+	moz_pkgsetup
 }
 
 src_prepare() {
@@ -185,6 +166,11 @@ src_prepare() {
 	cd "${S}"/mozilla || die
 	eautoreconf
 	cd "${S}"/mozilla/js/src || die
+
+	# Disable gnomevfs extension
+	sed -i -e "s:gnomevfs::" "${S}/"suite/confvars.sh \
+		|| die "Failed to remove gnomevfs extension"
+
 	eautoreconf
 }
 
@@ -211,10 +197,6 @@ src_configure() {
 		MEXTENSIONS="${MEXTENSIONS},-sroaming"
 	fi
 
-	if ! use gnome ; then
-		MEXTENSIONS="${MEXTENSIONS},-gnomevfs"
-	fi
-
 	if ! use composer ; then
 		if ! use chatzilla && ! use mailclient ; then
 			mozconfig_annotate '-composer' --disable-composer
@@ -222,46 +204,13 @@ src_configure() {
 	fi
 
 	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-	mozconfig_annotate '' --enable-application=suite
-	mozconfig_annotate 'broken' --disable-mochitest
-	mozconfig_annotate 'broken' --disable-crashreporter
-	mozconfig_annotate '' --enable-system-hunspell
 	mozconfig_annotate '' --enable-jsd
-	mozconfig_annotate '' --enable-image-encoder=all
 	mozconfig_annotate '' --enable-canvas
-	mozconfig_annotate '' --with-system-nspr
-	mozconfig_annotate '' --with-system-nss
-	mozconfig_annotate '' --with-system-bz2
-	mozconfig_annotate '' --enable-oji --enable-mathml
-	mozconfig_annotate 'places' --enable-storage --enable-places --enable-places_bookmarks
-	mozconfig_annotate '' --disable-installer
 	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-	mozconfig_annotate '' --enable-printing
 
-	# Enable/Disable based on USE flags
-	mozconfig_use_enable alsa ogg
-	mozconfig_use_enable alsa wave
-	mozconfig_use_enable libnotify
 	mozconfig_use_enable ldap
 	mozconfig_use_enable ldap ldap-experimental
-	#if use ldap ; then
-	#	mozconfig_annotate 'ldap' --enable-ldap
-	#	mozconfig_annotate 'ldap' --enable-ldap-experimental
-	#fi
 	mozconfig_use_enable mailclient mailnews
-	mozconfig_use_enable system-sqlite
-	mozconfig_use_enable vpx webm
-	#mozconfig_use_with vpx system-vpx
-	mozconfig_use_enable wifi necko-wifi
-
-	if use vpx && ! use alsa; then
-		ewarn "USE=vpx 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
 
 	if use mailclient && use crypt ; then
 		mozconfig_annotate "mail crypt" --enable-chrome-format=jar