[gentoo-commits] proj/mozilla:master commit in: www-client/firefox/, www-client/seamonkey/, eclass/, net-libs/xulrunner/

[gentoo-commits] proj/mozilla:master commit in: www-client/firefox/, www-client/seamonkey/, eclass/, net-libs/xulrunner/

[Nirbheek Chauhan]

commit:     f288122be8debd7d8bd0da8e1c0f620ec24f0b63
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 21 20:13:05 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 20:13:05 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=f288122b

xul/fx/sm: add USE=+webm and USE-dep on webm?, eclasses moved to tree

---
 eclass/mozconfig-3.eclass                       |   95 --------
 eclass/mozcoreconf-2.eclass                     |  279 -----------------------
 net-libs/xulrunner/Manifest                     |    2 +-
 net-libs/xulrunner/xulrunner-2.0_rc2.ebuild     |    8 +-
 www-client/firefox/Manifest                     |    2 +-
 www-client/firefox/firefox-4.0_rc2.ebuild       |    7 +-
 www-client/seamonkey/Manifest                   |    2 +-
 www-client/seamonkey/seamonkey-2.1_beta2.ebuild |    7 +-
 8 files changed, 19 insertions(+), 383 deletions(-)

diff --git a/eclass/mozconfig-3.eclass b/eclass/mozconfig-3.eclass
deleted file mode 100644
index 0b81bd1..0000000
--- a/eclass/mozconfig-3.eclass
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2011 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
-
-# use-flags common among all mozilla ebuilds
-IUSE="+alsa +dbus debug 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 )
-	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() {
-	mozconfig_annotate '' --enable-default-toolkit=cairo-gtk2
-
-	if has bindist ${IUSE}; then
-		mozconfig_use_enable !bindist official-branding
-	fi
-
-	mozconfig_use_enable alsa ogg
-	mozconfig_use_enable alsa wave
-	if has crashreporter ${IUSE} ; then
-		mozconfig_use_enable crashreporter
-	fi
-	mozconfig_use_enable dbus
-	mozconfig_use_enable debug
-	mozconfig_use_enable debug tests
-	mozconfig_use_enable debug debugger-info-modeules
-	if has ipc ${IUSE}; then
-		mozconfig_use_enable ipc
-	fi
-	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 [[ ${PN} == xulrunner ]] ; then
-		mozconfig_annotate 'mozjs' --enable-shared-js
-	fi
-
-	if [[ ${PN} != thunderbird ]]; 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
-
-		if use amd64 || use x86 || use arm || use sparc; then
-			mozconfig_annotate '' --enable-tracejit
-		fi
-	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 '' --with-system-libevent="${EPREFIX}"/usr
-	mozconfig_annotate '' --enable-system-hunspell
-	mozconfig_annotate '' --disable-gnomevfs
-	mozconfig_annotate '' --enable-gio
-	if [[ ${PN} != thunderbird ]] ; then
-		mozconfig_annotate 'places' --enable-storage --enable-places --enable-places_bookmarks
-		mozconfig_annotate '' --enable-oji --enable-mathml
-		mozconfig_annotate 'broken' --disable-mochitest
-	fi
-}

diff --git a/eclass/mozcoreconf-2.eclass b/eclass/mozcoreconf-2.eclass
deleted file mode 100644
index b0739f8..0000000
--- a/eclass/mozcoreconf-2.eclass
+++ /dev/null
@@ -1,279 +0,0 @@
-# Copyright 1999-2011 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
-}
-
-makemake2() {
-	for m in $(find ../ -name Makefile.in); do
-		topdir=$(echo "$m" | sed -r 's:[^/]+:..:g')
-		sed -e "s:@srcdir@:.:g" -e "s:@top_srcdir@:${topdir}:g" \
-			< ${m} > ${m%.in} || die "sed ${m} failed"
-	done
-}
-
-# 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/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
index c1ddd07..7c32515 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.0rc2.source.tar.bz2 66022050 RMD160 be75b75f8d58fae2a781c52bc59fcc1960ce6da3 SHA1 0fb0d7c9b185959dd6c41c80a77f71e806a4742b SHA256 d38d94b66568c549bd4046838e61da783a7d4f53eb040a10fbad3e4811ce9c54
 DIST xulrunner-2.0-patches-1.2.tar.bz2 50296 RMD160 55efe05cd37f3a49d4e6bc25ea0e0e2a50eab02a SHA1 1a56906b94f30e33885b568041d1bdd53ad2b5b6 SHA256 e6b63b4c94f4a44c35aab34e6d15998c5a812eedcc4856a662f5c8eb35a4e6d9
-EBUILD xulrunner-2.0_rc2.ebuild 5454 RMD160 322d178211ffb426771096e9fbad13545d9591ef SHA1 c28a94cc0b2fe59f7ff80371054cc81f32b018a4 SHA256 78f9c9a5cf7d741a5c13aac3a3fff0a149e0744fbabaa3f72e638c62bf46c495
+EBUILD xulrunner-2.0_rc2.ebuild 5513 RMD160 0aeb86958f79d654dd5dbee4982e59edd2ffd5ae SHA1 16d37d5f294e2e26e0d2a32564e28d89587668f8 SHA256 6fbdbd5a4f3b8d632510ff03b48a9c38f8fb68d59dce208f3b3a24fe8614fce2

diff --git a/net-libs/xulrunner/xulrunner-2.0_rc2.ebuild b/net-libs/xulrunner/xulrunner-2.0_rc2.ebuild
index 309f3e4..011dd2a 100644
--- a/net-libs/xulrunner/xulrunner-2.0_rc2.ebuild
+++ b/net-libs/xulrunner/xulrunner-2.0_rc2.ebuild
@@ -22,8 +22,9 @@ 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 +ipc"
+IUSE="+crashreporter +ipc +webm"
 
+REL_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases"
 # More URIs appended below...
 SRC_URI="http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2"
 
@@ -33,6 +34,10 @@ RDEPEND="
 	>=dev-libs/nspr-4.8.7
 	x11-libs/pango[X]
 	media-libs/libpng[apng]
+
+	webm? ( media-libs/libvpx 
+		media-libs/alsa-lib )
+
 	!www-plugins/weave"
 
 DEPEND="${RDEPEND}
@@ -45,7 +50,6 @@ if [[ ${PV} =~ alpha|beta ]]; then
 		http://dev.gentoo.org/~anarchy/mozilla/firefox/firefox-${FF_PV}_${CHANGESET}.source.tar.bz2"
 	S="${WORKDIR}/mozilla-central"
 else
-	REL_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases"
 	SRC_URI="${SRC_URI}
 		${REL_URI}/${FF_PV}/source/firefox-${FF_PV}.source.tar.bz2"
 	S="${WORKDIR}/mozilla-${MAJ_XUL_PV}"

diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 61ad553..153d9f0 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -78,4 +78,4 @@ DIST firefox-4.0_rc2-uk.xpi 260129 RMD160 4a7cda6a1ae6dd31d3b089b05e6bc4f85d0b0a
 DIST firefox-4.0_rc2-vi.xpi 239966 RMD160 94f90afd4a26b6f9b220a1f096f4259f1c4339ed SHA1 7b5602a5b9e0e67b31b27bc125eb3a62e0c71319 SHA256 9927c8bd3bbd796805bd70eb5a4b37d113715333542b7a262623e0f09b8aa2a6
 DIST firefox-4.0_rc2-zu.xpi 227605 RMD160 56d91ea40c9983dc28db96af51a18cdd0b22a50d SHA1 a73c237b85bbb17924a2a2fc8499db380caa0f03 SHA256 474dfa2edf6cd692dbc05c9569d263ea326b02d91feb335a1e2e360117f524ae
 DIST firefox-4.0rc2.source.tar.bz2 66022050 RMD160 be75b75f8d58fae2a781c52bc59fcc1960ce6da3 SHA1 0fb0d7c9b185959dd6c41c80a77f71e806a4742b SHA256 d38d94b66568c549bd4046838e61da783a7d4f53eb040a10fbad3e4811ce9c54
-EBUILD firefox-4.0_rc2.ebuild 7294 RMD160 8ee20776acb0a01cc27824efc1f4908f97e03436 SHA1 db7177d1a13756205ed08d1be48cc33b1595d15f SHA256 3a199a00d751944127c0e35eefff79a578f430e77b0bfb8061811d6b3435da19
+EBUILD firefox-4.0_rc2.ebuild 7354 RMD160 0945ea6cbf34813f2b6d37d443dcd7959f2be06c SHA1 27affcb305f46130550b42e26fdb386f4855c5da SHA256 866a86e49f26594b8fbdc6c22c040c713e6c8a2da79eae94c1ba69492b6d228f

diff --git a/www-client/firefox/firefox-4.0_rc2.ebuild b/www-client/firefox/firefox-4.0_rc2.ebuild
index 204c6c0..16b7516 100644
--- a/www-client/firefox/firefox-4.0_rc2.ebuild
+++ b/www-client/firefox/firefox-4.0_rc2.ebuild
@@ -22,7 +22,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 +ipc"
+IUSE="bindist +ipc +webm"
 
 REL_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases"
 # More URIs appended below...
@@ -34,7 +34,10 @@ RDEPEND="
 	>=dev-libs/nspr-4.8.7
 	x11-libs/pango[X]
 	media-libs/libpng[apng]
-	~net-libs/xulrunner-${XUL_PV}[wifi=,libnotify=,system-sqlite=,webm=]"
+	~net-libs/xulrunner-${XUL_PV}[wifi=,libnotify=,system-sqlite=,webm=]
+	
+	webm? ( media-libs/libvpx 
+		media-libs/alsa-lib )"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig

diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index 74beb87..8e50d77 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 9744 RMD160 03bc6a866e2f5c9b6731cb4f807a09165e240814 SHA1 e4c73014e3940fa1fa1d04f466a7e85ea62923af SHA256 872d52c22b2728b09046f4a521a4b499b9f0de295c807da1e7a4ac3767bf72c4
+EBUILD seamonkey-2.1_beta2.ebuild 9803 RMD160 e3ce63315f5593ac199542d8f3ac0b6199be74c1 SHA1 c08369a38f332835aecf6f2f771322ab9bf1ed96 SHA256 26a55525b54cc839c2cc01fb762f35ba96f092535287eb0998fc3b06f7b8ccae

diff --git a/www-client/seamonkey/seamonkey-2.1_beta2.ebuild b/www-client/seamonkey/seamonkey-2.1_beta2.ebuild
index 9375939..5a7ddbb 100644
--- a/www-client/seamonkey/seamonkey-2.1_beta2.ebuild
+++ b/www-client/seamonkey/seamonkey-2.1_beta2.ebuild
@@ -41,7 +41,7 @@ HOMEPAGE="http://www.seamonkey-project.org"
 
 SLOT="0"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="+alsa +chatzilla +composer +crypt ldap +mailclient +roaming"
+IUSE="+alsa +chatzilla +composer +crypt ldap +mailclient +roaming +webm"
 
 SRC_URI="${REL_URI}/source/${MY_P}.source.tar.bz2
 	http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.bz2
@@ -70,7 +70,10 @@ RDEPEND=">=sys-devel/binutils-2.16.1
 	>=dev-libs/nspr-4.8.7
 	>=media-libs/libpng-1.4.1[apng]
 	>=x11-libs/pango-1.14.0[X]
-	crypt? ( mailclient? ( >=app-crypt/gnupg-1.4 ) )"
+
+	crypt? ( mailclient? ( >=app-crypt/gnupg-1.4 ) )
+	webm? ( media-libs/libvpx 
+		media-libs/alsa-lib )"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig