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

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

commit:     f08daee02ae4218017dc9deef5247b1614ad46d6
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  7 14:21:46 2011 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Nov  7 14:21:46 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=f08daee0

seamonkey: Removed old version. Bumped enigmail version,

---
 www-client/seamonkey/Manifest                   |   30 +--
 www-client/seamonkey/seamonkey-2.5_beta2.ebuild |  359 -----------------------
 www-client/seamonkey/seamonkey-2.5_beta3.ebuild |    2 +-
 3 files changed, 3 insertions(+), 388 deletions(-)

diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index 7518181..84ca3c6 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -2,33 +2,8 @@ AUX all-gentoo.js 712 RMD160 9c8352b0780ee3ac1e6f372dccb15975dfa09212 SHA1 5825d
 AUX icon/seamonkey.desktop 288 RMD160 c9f56aed280a3ff68f0c40ae453fc24351daeea6 SHA1 87254c3cbfad672309e4b1fa408d08b74be31056 SHA256 524ae39ffc10b2a950aa344ae6c3f3d9b4a21009697edfd52ec47aa850d795d0
 AUX icon/seamonkey.png 4172 RMD160 d296c4d4e0920e4476f4c6c607946434202ad521 SHA1 f76213195e2dc002ff2e411ed0247d2624ce7b09 SHA256 7ffc1911a62b526702f3c991365dd8f18b6427c7e173456a101db4fb4c43ae59
 AUX seamonkey-2.3.1-scrollbar-mouse-interaction-improvement.patch 3768 RMD160 48d6849a54d73054dde7f76e2e0aff4ebcd24926 SHA1 744f5d981e2219843ddba47341053ed74463ef11 SHA256 eed1c52b02b89d97328aa25b9c825d5b76d833bad87ce98f6fed5c32da91b5ac
-DIST enigmail-1.3.2.tar.gz 1371388 RMD160 f9320279e67767a8023ac863b8d089e370018201 SHA1 8bf39664f22e383d026c07d4acd714a1ccfd9d6d SHA256 46ffa074829472ba6714e1ada37b8cc083d0dd4e16c21ad0c2893c5eef68893d
+DIST enigmail-1.3.3.tar.gz 1367995 RMD160 4c7ab726052b566f913612cfbdd767714486bf9c SHA1 a6d61b6dbdcfdb0dc4eaa8aac1b6277fed65c8c5 SHA256 7110d2f0eea8a9a7580ddc13ab56c262bbd33776ebdc34ab19ec90143f010be6
 DIST seamonkey-2.4.1-patches-01.tar.xz 15108 RMD160 cacdc06de2c3d76ff4ae85f8cc3e13a25d8f1ac5 SHA1 518d1df4bad0e28f1d3bdfcb7deb1b4c3cc960dc SHA256 8713bdad0f5523e32abd80292da4759c0664fb24f3ec56cc523d8b104e701306
-DIST seamonkey-2.5_beta2-be.xpi 795234 RMD160 d46a98f27038822da11789c08a6b782964d9b9b7 SHA1 9dc164bcf35af85be99fdc0d3a8764f7278d16e1 SHA256 8ae8a8c3650af052ec0458f7c8578080bb0fe74eba8da43f6d9fd4f32d8a25c0
-DIST seamonkey-2.5_beta2-ca.xpi 813814 RMD160 35d7b058a485d054ce6c6b0ccd76bdc4de653d0a SHA1 5875b483c46617396718b8e588ff61bfdf5cf2de SHA256 4b62783b861b2e891c9eefcbe3ebf2d41d31eeb17b88aae0b58989b04e24ddf1
-DIST seamonkey-2.5_beta2-cs.xpi 819090 RMD160 04872b6a99658f55755a9a99b8d8f9d0c10aa527 SHA1 859b3c73a8c5b068d3aecf7199335c4b9fafa8d6 SHA256 6804ed1b58e3acfb4b9ada755aab6fce2a4c2fa59fd275caf120dda4a3b5588f
-DIST seamonkey-2.5_beta2-de.xpi 859794 RMD160 6ffd6c2660eaeb902b1c8825a49fbad40ed5fa4c SHA1 35a3f168a473c51ac9a80ed4f86b9e8dbc902bc6 SHA256 1abd6e8e95fdedcd7f0cc669e4d9bc4eb1f29064144f91247241875669b5aac4
-DIST seamonkey-2.5_beta2-en-GB.xpi 789630 RMD160 7f69cd2c900b729a3b3fdae88442ec1d4645c67d SHA1 df47f613a42b9e46c80dafb545f2b0a031a26582 SHA256 ee9a6842426bad93afb0e787bf5ea8a50c216d5270a6b005da20785439014af0
-DIST seamonkey-2.5_beta2-en-US.xpi 789287 RMD160 2c1508b49f92810d3107e32663db69cdbec3966e SHA1 99b404836f215155180d8c4d52c2594b67529718 SHA256 f2c228b711122ca2e9c2db5fb0954caa1e237006fa70153cbceccec88dbd3c86
-DIST seamonkey-2.5_beta2-es-AR.xpi 859119 RMD160 2506e8dbd2e382721b090cd28890fd91249eb985 SHA1 b485da9822b557f9ca19e546485f880639610e0a SHA256 bd70696cdd2934591ab2fbefebf67d752ddbba056e44574bb11fb43fa2d51645
-DIST seamonkey-2.5_beta2-es-ES.xpi 787408 RMD160 d6622e777505e3abcfcd87dc35bcdfa08b1d8630 SHA1 e21ee960f9d92b280c3bdd260bcddca3730a87f6 SHA256 745ebbc9aac1727fbd262f19228449390107ff05c1354e5787cf28a87327ef97
-DIST seamonkey-2.5_beta2-fi.xpi 809364 RMD160 2cf2ba2fb903ecb1eec4af0921e5de79026f77b1 SHA1 684c08e1f8aa94693a16112b32eeba50ae452c79 SHA256 7a3d597011c88a479187dd077470147ef75ef6e498711b82599ff176dd8c9386
-DIST seamonkey-2.5_beta2-fr.xpi 814852 RMD160 b50edf6ef10ee7ed3ae46a3c3779fe8f0151aede SHA1 55e071f3122e1697c886d16d07f9c3d648ed3a95 SHA256 5b5adece63c9559ab11e322e1aaf250ab6af11d946a0a1096b5487d134ca8256
-DIST seamonkey-2.5_beta2-gl.xpi 809259 RMD160 57019f0f5458877e23953f099d6fc47b52df7462 SHA1 43a175eb7e5b519814f2b4b58439e8bcc839e90c SHA256 82c91dda34a0208bec2f0c12d49898b9031afc6fb6635a96730531d942f291d2
-DIST seamonkey-2.5_beta2-hu.xpi 831865 RMD160 deb80a974730b54d6d02d41f04bef530f4cb1247 SHA1 6e8131ab4e222e1e5d46a8b556a76aebfd1772e3 SHA256 b565ab337ebb4c1661f676b2c6fbd55dc25eb632e93b530ce5520e1f9d09bf1e
-DIST seamonkey-2.5_beta2-it.xpi 737810 RMD160 33a81c379fde63dc1a786d693f5c71d522cba449 SHA1 debcdd031a480337d2173877c175e876959c327e SHA256 871dc6bf8dd518c18f07eb41dfea408600ea2b0a28ac6a092d085b50955203cc
-DIST seamonkey-2.5_beta2-ja.xpi 864229 RMD160 d9732c4e9087496666a428792b6184d13df0f57f SHA1 c5e794be440b76338f50c74c95125d3b70b1b2e8 SHA256 d8843ba30a3772954361bc930de62d28d5dbe3bd6f8022e353dbdafdfba5d416
-DIST seamonkey-2.5_beta2-lt.xpi 961779 RMD160 0ad2dcc031efd89f3e6a32c8eeea1d271e5d6a60 SHA1 086c5614ac61c85afaa0bb6148444f361c7c7691 SHA256 6d670a4624bc675f2551ee0beb49d291dd95ca1c86633771d34c7adbbee12dd2
-DIST seamonkey-2.5_beta2-nb-NO.xpi 807793 RMD160 4f1cbd76c6b0dc445925cf2bd5ed62c1575be17f SHA1 0ac3f570de42bf0f93625a6b7a312fbe2fa62f0f SHA256 cde9e580ca906b26ec05ebc1decbca51ef2f1971d1f56b52b0234962df8e8662
-DIST seamonkey-2.5_beta2-nl.xpi 806319 RMD160 dbdc1c1fbd873e3583c26c359e08490c84ffcab4 SHA1 7c8ec4178eceed9bd48c7fd7f09e2271a18ce121 SHA256 c913eaf04e6b1bdc0e73ce0241e3550d7dfe851c6cda842484c3ff541403bd10
-DIST seamonkey-2.5_beta2-pl.xpi 828798 RMD160 1e207870420addddb74179b1ab521cf40bfb4dd3 SHA1 f6e678306884c774553469b293609fc0a9a6fea5 SHA256 cac039c8124dade9b1c0b6bb648f2c86ccc5fa09d8538f3752ef5202db3bfe09
-DIST seamonkey-2.5_beta2-pt-PT.xpi 844864 RMD160 85551db785eda23dd2aa3f03ea4812e887b0606a SHA1 1f255f6c01a084f34d7568e52a0bd2fc29bd7584 SHA256 fc8cce30472fd3d912fa312e1aac724221b837a9218a8369c17354e302ec4ed0
-DIST seamonkey-2.5_beta2-ru.xpi 891481 RMD160 f50e54cb35ed405c5534dfb7c54c5cdc73d34b87 SHA1 c7993736ac66d5ea128d80b159001710d283a36e SHA256 7aa6b994b258103cbf17e57b8bb038607c74f1be303dc5989e338b90b6564026
-DIST seamonkey-2.5_beta2-sk.xpi 842552 RMD160 c4a666f3092b5aa8482e890d2f172f1bf232444c SHA1 753a47ae85bdc82efbfa8eb95fdc5c1df6d81782 SHA256 4b9d3b835f473685dc83cb8d681e45ebd88dad5520f831edf6848b08624d4cd0
-DIST seamonkey-2.5_beta2-sv-SE.xpi 871535 RMD160 e1d2d390773b6b461a26996cf29325216f89b904 SHA1 7b116f21c5d9980dc1307d68dda02e2edfb4fd03 SHA256 b94776e6cfee523f4e3c385104a8433c33a942c9f2cfed91f90a6e7e3ad40504
-DIST seamonkey-2.5_beta2-tr.xpi 807205 RMD160 0fa593dbd6a15d6ec9a58ba103bda9e435721c05 SHA1 9c3e9520ce70fecee102037c0703a014fc20fd1d SHA256 10118c16c683608e8cdec2c3a44746e38bc9f0fae3228a68d4a9b82f89560824
-DIST seamonkey-2.5_beta2-zh-CN.xpi 837986 RMD160 fe9ac76a36b2ac8f3db7d40c48ef9801b085acc0 SHA1 5a033da8986f178605bea8e5938735b6f3655843 SHA256 7635bb98bc980114918be97bd118daa9300c35540c01a00004148f800c5f9c5d
-DIST seamonkey-2.5_beta2.source.tar.bz2 89842528 RMD160 bec94211b0965fc1552f61fff6a5228e5b9aa5f7 SHA1 7112f505dc8a773284b5702478fe1d052355a551 SHA256 c62ef2b6b1ed9d48cbed46b806dd9ef39c0149c9b413edae71eec1da07e32aff
 DIST seamonkey-2.5_beta3-be.xpi 795234 RMD160 6ce558c1b011a47e3e8e571f44d74631d78bbe3b SHA1 42ef0ec67d08a5e9a0245d40d1950440db3decbd SHA256 36a0cdedf26de244297db78279dc19ce5c1e691769d34a07a6495f2a341b981e
 DIST seamonkey-2.5_beta3-ca.xpi 813814 RMD160 e818298f68d6710ab5821331de362f0e8c96ff41 SHA1 3c9ac1281178a579e037cad0e2926089ba78b4d2 SHA256 fd7c799d8ebeb74631d3c840e7c21051652d2f856e4b9766fb73ffcc608c4cfc
 DIST seamonkey-2.5_beta3-cs.xpi 819090 RMD160 bb1902acfe32fecd9eb71858d549534160bded96 SHA1 5b3aaf071fa52b8d528c7f0ae8d4f719dcb59e7d SHA256 a1e38eba72b216d70287fe1238665f36bf41202d96831fa966341a127ca02d3a
@@ -54,5 +29,4 @@ DIST seamonkey-2.5_beta3-sv-SE.xpi 871535 RMD160 84228b28027149cf17a2ae0372d5789
 DIST seamonkey-2.5_beta3-tr.xpi 807205 RMD160 b8cb63ac1bc7635487129479eb3aa9ad649f0b95 SHA1 01f7c5b5049be61b234c49e6247c322d7e0bbda6 SHA256 c31f613645db29aa7daa3ea1ad938422cf92827892d672af5f33c7c5524070cf
 DIST seamonkey-2.5_beta3-zh-CN.xpi 837986 RMD160 ac99e4f3363c8308f78d4f43d7960532132ac0ef SHA1 807c14726c16180f1be2764fa251dfc3957eae09 SHA256 9151c92dcb293985a3e30014e99dcfbafda6d44dc43ff4692f32e7be7bd01a6e
 DIST seamonkey-2.5_beta3.source.tar.bz2 90077131 RMD160 dfbbb2b85063c87180d4acfd5680a845ccbb2790 SHA1 40a4c9947b947ddcd30d429465a3ba7417c53b22 SHA256 ecdcb8bbe549149145af50409427974065840bf8ad8d4d0ff0a4e551ce36bf41
-EBUILD seamonkey-2.5_beta2.ebuild 10311 RMD160 a65020e2d62cef427f9bf07ffca855d3c4949f45 SHA1 2b1b95de978ec4adb6efee5a4e4fd22fd72ab82b SHA256 b8bb5accd543b4318c9b2a42ccbd5d14376f9640771a7605af61562ea1c65c75
-EBUILD seamonkey-2.5_beta3.ebuild 10311 RMD160 a65020e2d62cef427f9bf07ffca855d3c4949f45 SHA1 2b1b95de978ec4adb6efee5a4e4fd22fd72ab82b SHA256 b8bb5accd543b4318c9b2a42ccbd5d14376f9640771a7605af61562ea1c65c75
+EBUILD seamonkey-2.5_beta3.ebuild 10311 RMD160 731a0c4967d112ee14ef712af15641c7598c70d0 SHA1 3cb60c8837b3ccfca6748b4bb9a59d092625a3f1 SHA256 bb1e3f3b6802d148289c1dfb639ae3c6c52ae957fe05f4eb5166e17fc1fa5d95

diff --git a/www-client/seamonkey/seamonkey-2.5_beta2.ebuild b/www-client/seamonkey/seamonkey-2.5_beta2.ebuild
deleted file mode 100644
index 3a261af..0000000
--- a/www-client/seamonkey/seamonkey-2.5_beta2.ebuild
+++ /dev/null
@@ -1,359 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.4.1.ebuild,v 1.1 2011/09/30 21:33:19 polynomial-c Exp $
-
-EAPI="3"
-WANT_AUTOCONF="2.1"
-
-inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib fdo-mime autotools mozextension python
-
-PATCH="${PN}-2.4.1-patches-01"
-EMVER="1.3.2"
-
-LANGS="be ca cs de en en-GB en-US es-AR es-ES fi fr gl hu it ja lt nb-NO nl pl pt-PT ru sk sv-SE tr zh-CN"
-NOSHORTLANGS="en-GB en-US es-AR"
-
-MY_PV="${PV/_pre*}"
-MY_PV="${MY_PV/_alpha/a}"
-MY_PV="${MY_PV/_beta/b}"
-MY_PV="${MY_PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-# release versions usually have language packs. So be careful with changing this.
-HAS_LANGS="true"
-LANGPACK_PREFIX="${MY_P}."
-LANGPACK_SUFFIX=".langpack"
-if [[ ${PV} == *_pre* ]] ; then
-	# pre-releases. No need for arch teams to change KEYWORDS here.
-
-	REL_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${PN}/nightly/${MY_PV}-candidates/build${PV##*_pre}"
-	#LANG_URI="${REL_URI}/langpack"
-	LANG_URI="${REL_URI}/linux-i686/xpi"
-	LANGPACK_PREFIX=""
-	LANGPACK_SUFFIX=""
-	#KEYWORDS=""
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-	#HAS_LANGS="false"
-else
-	# This is where arch teams should change the KEYWORDS.
-
-	#REL_URI="http://releases.mozilla.org/pub/mozilla.org/${PN}/releases/${MY_PV}"
-	REL_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/${MY_PV}"
-	LANG_URI="${REL_URI}/langpack"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-	[[ ${PV} == *alpha* ]] && HAS_LANGS="false"
-fi
-
-DESCRIPTION="Seamonkey Web Browser"
-HOMEPAGE="http://www.seamonkey-project.org"
-
-SLOT="0"
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="+alsa +chatzilla +crypt +ipc +methodjit +roaming system-sqlite +webm"
-
-SRC_URI="${REL_URI}/source/${MY_P}.source.tar.bz2 -> ${P}.source.tar.bz2
-	http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz
-	crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-${EMVER}.tar.gz )"
-
-if ${HAS_LANGS} ; then
-	for X in ${LANGS} ; do
-		if [ "${X}" != "en" ] ; then
-			SRC_URI="${SRC_URI}
-				linguas_${X/-/_}? ( ${LANG_URI}/${LANGPACK_PREFIX}${X}${LANGPACK_SUFFIX}.xpi -> ${P}-${X}.xpi )"
-		fi
-		IUSE="${IUSE} linguas_${X/-/_}"
-		# english is handled internally
-		if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then
-			#if [ "${X}" != "en-US" ]; then
-				SRC_URI="${SRC_URI}
-					linguas_${X%%-*}? ( ${LANG_URI}/${LANGPACK_PREFIX}${X}${LANGPACK_SUFFIX}.xpi -> ${P}-${X}.xpi )"
-			#fi
-			IUSE="${IUSE} linguas_${X%%-*}"
-		fi
-	done
-fi
-
-ASM_DEPEND=">=dev-lang/yasm-1.1"
-
-# Mesa 7.10 needed for WebGL + bugfixes
-RDEPEND=">=sys-devel/binutils-2.16.1
-	>=dev-libs/nss-3.12.10
-	>=dev-libs/nspr-4.8.8
-	>=dev-libs/glib-2.26
-	>=media-libs/mesa-7.10
-	>=media-libs/libpng-1.4.1[apng]
-	>=x11-libs/cairo-1.10
-	>=x11-libs/pango-1.14.0
-	>=x11-libs/gtk+-2.14
-	virtual/libffi
-	system-sqlite? ( >=dev-db/sqlite-3.7.5[fts3,secure-delete,unlock-notify,debug=] )
-	crypt? ( >=app-crypt/gnupg-1.4 )
-	webm? ( media-libs/libvpx
-		media-libs/alsa-lib )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	webm? ( amd64? ( ${ASM_DEPEND} )
-		x86? ( ${ASM_DEPEND} ) )"
-
-if [[ ${PV} == *beta* ]] ; then
-	S="${WORKDIR}/comm-beta"
-else
-	S="${WORKDIR}/comm-release"
-fi
-
-linguas() {
-	local LANG SLANG
-	for LANG in ${LINGUAS}; do
-		if has ${LANG} en en_US; then
-			has en ${linguas} || linguas="${linguas:+"${linguas} "}en"
-			continue
-		elif has ${LANG} ${LANGS//-/_}; then
-			has ${LANG//_/-} ${linguas} || linguas="${linguas:+"${linguas} "}${LANG//_/-}"
-			continue
-		elif [[ " ${LANGS} " == *" ${LANG}-"* ]]; then
-			for X in ${LANGS}; do
-				if [[ "${X}" == "${LANG}-"* ]] && \
-					[[ " ${NOSHORTLANGS} " != *" ${X} "* ]]; then
-					has ${X} ${linguas} || linguas="${linguas:+"${linguas} "}${X}"
-					continue 2
-				fi
-			done
-		fi
-		ewarn "Sorry, but ${PN} does not support the ${LANG} LINGUA"
-	done
-}
-
-src_unpack() {
-	unpack ${A}
-
-	if ${HAS_LANGS} ; then
-		linguas
-		for X in ${linguas}; do
-			# FIXME: Add support for unpacking xpis to portage
-			[[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi"
-		done
-		if [[ ${linguas} != "" && ${linguas} != "en" ]]; then
-			einfo "Selected language packs (first will be default): ${linguas}"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${PV} == *_pre* ]] ; then
-		ewarn "You're using an unofficial release of ${PN}. Don't file any bug in"
-		ewarn "Gentoo's Bugtracker against this package in case it breaks for you."
-		ewarn "Those belong to upstream: https://bugzilla.mozilla.org"
-	fi
-
-	moz_pkgsetup
-
-	if ! use methodjit ; then
-		einfo
-		ewarn "You are disabling the method-based JIT in JägerMonkey."
-		ewarn "This will greatly slowdown JavaScript in ${PN}!"
-	fi
-}
-
-src_prepare() {
-	# Apply our patches
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/_seamonkey"
-
-	# browser patches go here
-	pushd "${S}"/mozilla &>/dev/null || die
-	EPATCH_EXCLUDE="5005_do_not_call_openunshareddatabse.patch
-			5006_use_system_libffi.patch
-			5006_initialize_ns_xp_come_library_file_from_ns.patch
-			5007_allow_to_pass_an_application_directory.patch
-			5008_always_load_gre_defaults_pref.patch
-			5009_provide_ns_app_pre_defaults_dir.patch
-			5011_build_fix_for_ENABLE_YARR_JIT-0.patch
-			5012_workaround_recent_arm_gnu_ld_bug.patch
-			5014_allow_to_build_yuv_convert_arm.patch
-			5017_enable_system_ffi.patch
-			5018_enable_system_ffi_part2.patch" \
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/_mozilla"
-	popd &>/dev/null || die
-
-	# mailnews patches go here
-	pushd "${S}"/mailnews &>/dev/null || die
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/_mailnews"
-	popd &>/dev/null || die
-
-	epatch "${FILESDIR}"/${PN}-2.3.1-scrollbar-mouse-interaction-improvement.patch
-
-	# Allow user to apply any additional patches without modifing ebuild
-	epatch_user
-
-	if use crypt ; then
-		mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail
-		cd "${S}"/mailnews/extensions/enigmail || die
-		./makemake -r 2&>/dev/null
-		sed -e 's:@srcdir@:${S}/mailnews/extensions/enigmail:' \
-			-i Makefile.in || die
-		cd "${S}"
-	fi
-
-	#Ensure we disable javaxpcom by default to prevent configure breakage
-	sed -i -e s:MOZ_JAVAXPCOM\=1::g "${S}"/mozilla/xulrunner/confvars.sh \
-		|| die "sed javaxpcom"
-
-	# Disable gnomevfs extension
-	sed -i -e "s:gnomevfs::" "${S}/"suite/confvars.sh \
-		|| die "Failed to remove gnomevfs extension"
-
-	eautoreconf
-	cd "${S}"/mozilla || die
-	eautoreconf
-	cd "${S}"/mozilla/js/src || die
-	eautoreconf
-}
-
-src_configure() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	MEXTENSIONS=""
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-	mozconfig_config
-
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	if ! use chatzilla ; then
-		MEXTENSIONS+=",-irc"
-	fi
-	if ! use roaming ; then
-		MEXTENSIONS+=",-sroaming"
-	fi
-
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-	mozconfig_annotate '' --disable-gconf
-	mozconfig_annotate '' --enable-jsd
-	mozconfig_annotate '' --enable-canvas
-	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-	mozconfig_annotate '' --enable-system-ffi
-
-	mozconfig_use_enable system-sqlite
-	mozconfig_use_enable methodjit
-
-	if use crypt ; then
-		mozconfig_annotate "mail crypt" --enable-chrome-format=jar
-	fi
-
-	mozconfig_annotate '' --with-system-png
-
-	# Finalize and report settings
-	mozconfig_final
-
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		append-cxxflags -fno-stack-protector
-	elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]]; then
-		if use amd64 || use x86; then
-			append-flags -mno-avx
-		fi
-	fi
-
-	####################################
-	#
-	#  Configure and build
-	#
-	####################################
-
-	# Work around breakage in makeopts with --no-print-directory
-	MAKEOPTS="${MAKEOPTS/--no-print-directory/}"
-
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" PYTHON="$(PYTHON)" econf
-}
-
-src_compile() {
-	emake || die
-
-	# Only build enigmail extension if conditions are met.
-	if use crypt ; then
-		emake -C "${S}"/mailnews/extensions/enigmail || die "make enigmail failed"
-		emake -j1 -C "${S}"/mailnews/extensions/enigmail xpi || die "make enigmail xpi failed"
-	fi
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	declare emid
-
-	emake DESTDIR="${D}" install || die "emake install failed"
-	cp -f "${FILESDIR}"/icon/${PN}.desktop "${T}" || die
-
-	if use crypt ; then
-		cd "${T}" || die
-		unzip "${S}"/mozilla/dist/bin/enigmail*.xpi install.rdf || die
-		emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf)
-
-		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} || die
-		cd "${D}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die
-		unzip "${S}"/mozilla/dist/bin/enigmail*.xpi || die
-	fi
-
-	sed 's|^\(MimeType=.*\)$|\1text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;|' \
-		-i "${T}"/${PN}.desktop || die
-	sed 's|^\(Categories=.*\)$|\1Email;|' -i "${T}"/${PN}.desktop \
-		|| die
-
-	if ${HAS_LANGS} ; then
-		linguas
-		for X in ${linguas}; do
-			[[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P}-${X}"
-		done
-	fi
-
-	# Add StartupNotify=true bug 290401
-	if use startup-notification ; then
-		echo "StartupNotify=true" >> "${T}"/${PN}.desktop
-	fi
-
-	# Install icon and .desktop for menu entry
-	newicon "${S}"/suite/branding/nightly/content/icon64.png ${PN}.png \
-		|| die
-	domenu "${T}"/${PN}.desktop || die
-
-	# Add our default prefs
-	sed "s|SEAMONKEY_PVR|${PVR}|" "${FILESDIR}"/all-gentoo.js \
-		> "${D}"${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js \
-			|| die
-
-	# Plugins dir
-	rm -rf "${D}"${MOZILLA_FIVE_HOME}/plugins || die "failed to remove existing plugins dir"
-	dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}"/plugins || die
-
-	doman "${S}"/suite/app/${PN}.1 || die
-}
-
-pkg_preinst() {
-	declare MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/${PN}"
-
-	if [ -d ${MOZILLA_FIVE_HOME}/plugins ] ; then
-		rm ${MOZILLA_FIVE_HOME}/plugins -rf
-	fi
-}
-
-pkg_postinst() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
-	# Update mimedb for the new .desktop file
-	fdo-mime_desktop_database_update
-
-	if use chatzilla ; then
-		elog "chatzilla is now an extension which can be en-/disabled and configured via"
-		elog "the Add-on manager."
-	fi
-}

diff --git a/www-client/seamonkey/seamonkey-2.5_beta3.ebuild b/www-client/seamonkey/seamonkey-2.5_beta3.ebuild
index 3a261af..82b4652 100644
--- a/www-client/seamonkey/seamonkey-2.5_beta3.ebuild
+++ b/www-client/seamonkey/seamonkey-2.5_beta3.ebuild
@@ -8,7 +8,7 @@ WANT_AUTOCONF="2.1"
 inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib fdo-mime autotools mozextension python
 
 PATCH="${PN}-2.4.1-patches-01"
-EMVER="1.3.2"
+EMVER="1.3.3"
 
 LANGS="be ca cs de en en-GB en-US es-AR es-ES fi fr gl hu it ja lt nb-NO nl pl pt-PT ru sk sv-SE tr zh-CN"
 NOSHORTLANGS="en-GB en-US es-AR"