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

[Lars Wendler]

commit:     081f59bd225a9e862df9650016d924eec8802036
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 30 03:39:34 2011 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat Apr 30 03:39:34 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=081f59bd

seamonkey: Minor ebuild improvements. Removed old.

---
 www-client/seamonkey/Manifest                      |    6 +-
 .../2.1/seamonkey-2.1b2-gconf-config-update.patch  |   50 ---
 .../seamonkey/files/2.1/xulrunner-libpng15.patch   |   48 ---
 www-client/seamonkey/seamonkey-2.1_beta3-r1.ebuild |  329 --------------------
 www-client/seamonkey/seamonkey-2.1_beta3-r2.ebuild |   18 +-
 5 files changed, 11 insertions(+), 440 deletions(-)

diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index fe5ca6c..3dd45a4 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -1,7 +1,5 @@
 AUX 2.1/seamonkey-2.1b1-configure-fix.patch 690 RMD160 854bf17b5b5b5806c4936f80fbbd971e822a88e0 SHA1 10c39ddf76e3638fced4e48bbc2443b4eb88078c SHA256 f4b4a786ff743e9618d663832fbe7f21b36b0f84e1bf04cd0dae106da18fd2f4
-AUX 2.1/seamonkey-2.1b2-gconf-config-update.patch 1569 RMD160 e237530c4d95de84aa295927fd1c703d8a54b9a9 SHA1 6f78524f88fd7b3f4fef4eec1666eabe96c89992 SHA256 9da47f2752f7bb353297b93be3aaecf2d6004af3c91717d22e35a347ee6cf2a2
 AUX 2.1/seamonkey-2.1b3-restore-tabbar-scrolling-from-2.1b2.diff 1708 RMD160 cbafdeb503985052a5f589eb5f1e142c5e5fdfb1 SHA1 fa7be6cabfd58db2fa1d79c70332b3f06c383b83 SHA256 ae6cafc054b803713c3c3d72f0d34035272ba9af775e16132be92edf6c9f0600
-AUX 2.1/xulrunner-libpng15.patch 1713 RMD160 7883785e5794afeec27ab98fb71803ca82b4eb8d SHA1 8a3bdbbf587f65595a8d1718747843565d5cda31 SHA256 cbc44327ae5fcb4cba67bfa9fa4fdcb597969fbe0118af5e6d9eb73c504d4f87
 AUX all-gentoo.js 788 RMD160 08464d4a78e2126dce9e482988af1720d54a087d SHA1 74aed071070a8d896b655fd975da67329939339c SHA256 3ca0cbee6ca3d8857e7afadcfe76f65bd9c4130936602a1dbabb484406df0f45
 AUX enigmail/enigmail-1.1.2-20110124-makefile.diff 1572 RMD160 3840707bebdc8785ea08689cc95e0b762ca116f5 SHA1 0b607adf7af0d4d9a969b2c14abb19e1c9e94888 SHA256 9fc6c5d59864d53536ff755a2245ec60c61a4ffa2a81920c869687e5604f3144
 AUX enigmail/enigmail-1.1.2-seamonkey-2.1b2-versionfix.patch 388 RMD160 978e6888f0dd25fae9f59e594c800c64626607dd SHA1 08261cf1027d10723fa74d2e00f20b734d679983 SHA256 3ed44f737ad3eb89eb58bb03cb375579b2002d0ac06982b0d17f281041c42959
@@ -9,7 +7,6 @@ AUX enigmail/enigmail-1.1.2-seamonkey-2.1b3-versionfix.patch 388 RMD160 50285565
 AUX icon/seamonkey.desktop 285 RMD160 b684a071867d4d66799dd6b08187c6b66fa789bb SHA1 e95f4f7ab1d2c436e3b641768ce6514367992f56 SHA256 a95d1da8080d4e83f399b0ffeefa20d0a6fd0dc8a3da8edc41cd8cedb34557f7
 AUX icon/seamonkey.png 4172 RMD160 d296c4d4e0920e4476f4c6c607946434202ad521 SHA1 f76213195e2dc002ff2e411ed0247d2624ce7b09 SHA256 7ffc1911a62b526702f3c991365dd8f18b6427c7e173456a101db4fb4c43ae59
 DIST enigmail-1.1.2-20110410.tar.bz2 875049 RMD160 f313acc509fc2dddcb925736a7561ffd0ed5eb86 SHA1 0fe932987924887604c5cac3be0107bc49df70d5 SHA256 2d66c34cfe5df1ecf4362b97ac52cb2937dd568ee3ab3de35842c03a4d3e24dd
-DIST seamonkey-2.0.5-patches-01.tar.bz2 14905 RMD160 b9323ffc75c31343982b37151a879129fe37dc9b SHA1 5bb55b2fc707f84157af181aa9e30a3b7d839dbc SHA256 288ea43820b8c1f5380024f751fa23e59bc9bafba9d506678968ac7e40ea9dc5
 DIST seamonkey-2.1b3-be.xpi 796295 RMD160 48a297dd46f682c16a6c7f189d2a15978639fa90 SHA1 614becae97d2467099f456a55ab0b617b29f65bf SHA256 d72f903266722b463c4fa86cfbfa3f5bea10def5cef7d7690b4ff644cd9203ac
 DIST seamonkey-2.1b3-cs.xpi 818132 RMD160 2c6b63459186139e493ce6f3efb0220ba288aba2 SHA1 eda81a00822ea5cc50f06faf5ca24e90e6582d21 SHA256 b580d360f5210ecb86c00abd8cf261917e769a0a1ce090b2f984a0d2ae240dc6
 DIST seamonkey-2.1b3-de.xpi 856917 RMD160 954b07a35daa099ed92dc5d99c749a8a918a17f6 SHA1 7ba0c04dcc41e2c9b094af7f15e36152cf831746 SHA256 a8a00579ae969bd176d7b00eadd5771312a51432952c0e0261b47941aa32e43b
@@ -25,5 +22,4 @@ DIST seamonkey-2.1b3-pt-PT.xpi 845362 RMD160 847939fad173f1359210a36685d528af622
 DIST seamonkey-2.1b3-ru.xpi 891638 RMD160 58ea86a0c9552ec939782ae07245e6fb65bdf201 SHA1 9da64d0a0c20cf15f1dff177b0cf79cca9c1a7a9 SHA256 7b6e332e9bc77d294675c773ce0bc09a7f1b0515313d24e108bda1ca5408d0f6
 DIST seamonkey-2.1b3-sk.xpi 843090 RMD160 32f1c70a1bb5635c7e57d6b7862601398ba31594 SHA1 9d87f6882d2548a68df190d8f47ed0f63a2c0431 SHA256 01d4a0e2aae52ee6acc7388e16cbb5b00f370a30d9e2335ed22c23fb7e9d9f6a
 DIST seamonkey-2.1b3.source.tar.bz2 84193584 RMD160 6d4f1d224d680e6fed773ba5306cbabcbae4ca62 SHA1 7b4ba58cf5df42cec8e840f2f0416604a1ad87d9 SHA256 97afefa90d86c873d3e78238bab44f57efedba296291fe0320458b26df9d9ec9
-EBUILD seamonkey-2.1_beta3-r1.ebuild 9819 RMD160 0e7cd56fe3f37ea5770adf4e386d1d8873cb09ab SHA1 f8d63347e7d4b63112adb15823573bfcc4346349 SHA256 1ab19daef0fcd52a37229a1981ab758eb5a5caa2d5811ec862968adb7d7fe2db
-EBUILD seamonkey-2.1_beta3-r2.ebuild 9501 RMD160 e898b7b3d0f52c6fab542b7706324f358a48550f SHA1 8a6b1da8d528ccf62c632a993cde6184a8c5f816 SHA256 ded45509fb5822cac0c1bba0d7f185b5740e70cda6bba66964311c9451d0c2d6
+EBUILD seamonkey-2.1_beta3-r2.ebuild 9381 RMD160 30bd0b589669ca1f829f209800c81db294d81dbe SHA1 38d810515f4e7cbff51ada0f306c616d9a5cacd5 SHA256 14746b1cf783ce376effa725a4912d2dee59ec6a5d4dbcc7d9ceeb50b792b122

diff --git a/www-client/seamonkey/files/2.1/seamonkey-2.1b2-gconf-config-update.patch b/www-client/seamonkey/files/2.1/seamonkey-2.1b2-gconf-config-update.patch
deleted file mode 100644
index 8bb7237..0000000
--- a/www-client/seamonkey/files/2.1/seamonkey-2.1b2-gconf-config-update.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff --git a/configure.in b/configure.in
---- a/configure.in
-+++ b/configure.in
-@@ -5031,16 +5031,21 @@ then
-             fi
-             MOZ_ENABLE_GIO=
-         ])
-     fi
- 
-     dnl ========================================================
-     dnl = GConf support module
-     dnl ========================================================
-+    MOZ_ARG_DISABLE_BOOL(gconf,
-+    [  --disable-gconf      Disable Gconf support ],
-+        MOZ_ENABLE_GCONF=,
-+        MOZ_ENABLE_GCONF=force)
-+
-     if test "$MOZ_ENABLE_GCONF"
-     then
-         PKG_CHECK_MODULES(MOZ_GCONF, gconf-2.0 >= $GCONF_VERSION gobject-2.0 ,[
-             MOZ_ENABLE_GCONF=1
-         ],[
-             MOZ_ENABLE_GCONF=
-         ])
-      fi
-diff --git a/mozilla/configure.in b/mozilla/configure.in
---- a/mozilla/configure.in
-+++ b/mozilla/configure.in
-@@ -5701,16 +5701,21 @@ then
- 
-     AC_SUBST(MOZ_ENABLE_GIO)
-     AC_SUBST(MOZ_GIO_CFLAGS)
-     AC_SUBST(MOZ_GIO_LIBS)
-    
-     dnl ========================================================
-     dnl = GConf support module
-     dnl ========================================================
-+    MOZ_ARG_DISABLE_BOOL(gconf,
-+    [  --disable-gconf      Disable Gconf support ],
-+        MOZ_ENABLE_GCONF=,
-+        MOZ_ENABLE_GCONF=force)
-+
-     if test "$MOZ_ENABLE_GCONF"
-     then
-         PKG_CHECK_MODULES(MOZ_GCONF, gconf-2.0 >= $GCONF_VERSION gobject-2.0 ,[
-             MOZ_GCONF_LIBS=`echo $MOZ_GCONF_LIBS | sed 's/-llinc\>//'`
-             MOZ_ENABLE_GCONF=1
-         ],[
-             if test "$MOZ_ENABLE_GCONF" = "force"
-             then

diff --git a/www-client/seamonkey/files/2.1/xulrunner-libpng15.patch b/www-client/seamonkey/files/2.1/xulrunner-libpng15.patch
deleted file mode 100644
index 850140e..0000000
--- a/www-client/seamonkey/files/2.1/xulrunner-libpng15.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-
-# HG changeset patch
-# User Glenn Randers-Pehrson <glennrp+bmo@×××××.com>
-# Date 1301357640 14400
-# Node ID a60e842a1561ee51bf6eb3f27dc71ea3f840fa03
-# Parent  c88a58ccb0af893431816e55a1bb0b00012db197
-Bug 645519 - Firefox-4.0 compile fails if "--with-system-png" is ON; r=joe
-
-diff --git a/modules/libpr0n/decoders/nsPNGDecoder.cpp b/modules/libpr0n/decoders/nsPNGDecoder.cpp
---- mozilla/modules/libpr0n/decoders/nsPNGDecoder.cpp
-+++ mozilla/modules/libpr0n/decoders/nsPNGDecoder.cpp
-@@ -381,23 +381,34 @@ PNGGetColorProfile(png_structp png_ptr, 
-                    int color_type, qcms_data_type *inType, PRUint32 *intent)
- {
-   qcms_profile *profile = nsnull;
-   *intent = QCMS_INTENT_PERCEPTUAL; // Our default
- 
-   // First try to see if iCCP chunk is present
-   if (png_get_valid(png_ptr, info_ptr, PNG_INFO_iCCP)) {
-     png_uint_32 profileLen;
-+#if (PNG_LIBPNG_VER < 10500)
-     char *profileData, *profileName;
-+#else
-+    png_bytep profileData;
-+    png_charp profileName;
-+#endif
-     int compression;
- 
-     png_get_iCCP(png_ptr, info_ptr, &profileName, &compression,
-                  &profileData, &profileLen);
- 
--    profile = qcms_profile_from_memory(profileData, profileLen);
-+    profile = qcms_profile_from_memory(
-+#if (PNG_LIBPNG_VER < 10500)
-+                                       profileData,
-+#else
-+                                       (char *)profileData,
-+#endif
-+                                       profileLen);
-     if (profile) {
-       PRUint32 profileSpace = qcms_profile_get_color_space(profile);
- 
-       PRBool mismatch = PR_FALSE;
-       if (color_type & PNG_COLOR_MASK_COLOR) {
-         if (profileSpace != icSigRgbData)
-           mismatch = PR_TRUE;
-       } else {
-

diff --git a/www-client/seamonkey/seamonkey-2.1_beta3-r1.ebuild b/www-client/seamonkey/seamonkey-2.1_beta3-r1.ebuild
deleted file mode 100644
index 451c241..0000000
--- a/www-client/seamonkey/seamonkey-2.1_beta3-r1.ebuild
+++ /dev/null
@@ -1,329 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.0.4-r1.ebuild,v 1.1 2010/04/09 03:56:59 polynomial-c Exp $
-
-EAPI="2"
-WANT_AUTOCONF="2.1"
-
-inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib fdo-mime autotools mozextension python
-
-PATCH="${PN}-2.0.5-patches-01"
-EMVER="1.1.2"
-
-LANGS="be cs de en en-US es-AR es-ES fr lt nl pl pt-PT ru sk"
-NOSHORTLANGS="es-AR es-ES"
-
-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}"
-
-[[ ${MY_PV} == 2.1b3 ]] && MY_PV="${MY_PV}-real"
-
-# release versions usually have language packs. So be careful with changing this.
-HAS_LANGS="true"
-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}"
-	#KEYWORDS=""
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~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}"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~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 +composer +crypt gconf 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
-	crypt? ( mailclient? ( http://dev.gentoo.org/~polynomial-c/mozilla/enigmail-${EMVER}-20110410.tar.bz2 ) )"
-
-if ${HAS_LANGS} ; then
-	for X in ${LANGS} ; do
-		if [ "${X}" != "en" ] ; then
-			SRC_URI="${SRC_URI}
-				linguas_${X/-/_}? ( ${REL_URI}/langpack/${MY_P}.${X}.langpack.xpi -> ${MY_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%%-*}? ( ${REL_URI}/langpack/${MY_P}.${X}.langpack.xpi -> ${MY_P}-${X}.xpi )"
-			#fi
-			IUSE="${IUSE} linguas_${X%%-*}"
-		fi
-	done
-fi
-
-RDEPEND=">=sys-devel/binutils-2.16.1
-	>=dev-libs/nss-3.12.9
-	>=dev-libs/nspr-4.8.7
-	>=media-libs/libpng-1.4.1[apng]
-	>=x11-libs/pango-1.14.0[X]
-	gconf? ( >=gnome-base/gconf-1.2.1:2 )
-	crypt? ( mailclient? ( >=app-crypt/gnupg-1.4 ) )
-	webm? ( media-libs/libvpx
-		media-libs/alsa-lib )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-lang/yasm"
-
-S="${WORKDIR}/comm-central"
-
-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 "${MY_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
-}
-
-src_prepare() {
-	# Apply our patches
-	EPATCH_EXCLUDE="1002_fix-system-hunspell-dict-detections.patch
-			104-no_dynamic_nss_softokn.patch
-			118-bz467766_att351173-dont-reset-user-prefs-on-upgrade.patch
-			310-gecko-1.9.1-cairo-1.8.10-crash-fix.patch" \
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}"
-
-	epatch "${FILESDIR}"/2.1/${PN}-2.1b1-configure-fix.patch \
-		"${FILESDIR}"/2.1/xulrunner-libpng15.patch \
-		"${FILESDIR}"/2.1/${PN}-2.1b2-gconf-config-update.patch
-
-	EPATCH_OPTS="-R" \
-	epatch "${FILESDIR}"/2.1/${PN}-2.1b3-restore-tabbar-scrolling-from-2.1b2.diff
-
-	if use crypt && use mailclient ; then
-		mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail
-		cd "${S}"/mailnews/extensions/enigmail || die
-		epatch "${FILESDIR}"/enigmail/enigmail-1.1.2-seamonkey-2.1b3-versionfix.patch
-		epatch "${FILESDIR}"/enigmail/enigmail-1.1.2-20110124-makefile.diff
-		eautomake
-		makemake2
-		sed -e 's:@srcdir@:${S}/mailnews/extensions/enigmail:' \
-			-i Makefile.in || die
-		cd "${S}"
-	fi
-
-	#pushd "${S}"/mozilla &>/dev/null || die pushd
-	#popd &>/dev/null || die popd
-
-	#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="${MEXTENSIONS},-irc"
-	fi
-	if ! use roaming ; then
-		MEXTENSIONS="${MEXTENSIONS},-sroaming"
-	fi
-
-	if ! use composer ; then
-		if ! use chatzilla && ! use mailclient ; then
-			mozconfig_annotate '-composer' --disable-composer
-		fi
-	fi
-
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-	mozconfig_annotate '' --enable-jsd
-	mozconfig_annotate '' --enable-canvas
-	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-
-	mozconfig_use_enable gconf
-	mozconfig_use_enable ldap
-	mozconfig_use_enable ldap ldap-experimental
-	mozconfig_use_enable mailclient mailnews
-
-	if use mailclient && use crypt ; then
-		mozconfig_annotate "mail crypt" --enable-chrome-format=jar
-	fi
-
-        # ZOMG! Mozilla guys wanna have APNG in libpng if building with
-        # system-libpng. Kids, leave your fingers from drugs that make you
-        # do such nasty "extensions"!!!
-        # See https://bugs.gentoo.org/183370 for details.
-        mozconfig_annotate '' --with-system-png
-
-	# Finalize and report settings
-	mozconfig_final
-
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		append-cxxflags -fno-stack-protector
-	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() {
-	# Should the build use multiprocessing? Not enabled by default, as it tends to break.
-	[ "${WANT_MP}" = "true" ] && jobs=${MAKEOPTS} || jobs="-j1"
-	emake ${jobs} || die
-
-	# Only build enigmail extension if conditions are met.
-	if use crypt && use mailclient ; 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/seamonkey.desktop "${T}" || die
-
-	if use crypt && use mailclient ; 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
-
-		sed 's|^\(MimeType=.*\)$|\1MimeType=text/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
-	fi
-
-	if ${HAS_LANGS} ; then
-		linguas
-		for X in ${linguas}; do
-			[[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${MY_P}-${X}"
-		done
-	fi
-
-	# Install icon and .desktop for menu entry
-	newicon "${S}"/suite/branding/nightly/content/icon64.png seamonkey.png \
-		|| die
-	domenu "${T}"/seamonkey.desktop || die
-
-	# Add StartupNotify=true bug 290401
-	if use startup-notification ; then
-		echo "StartupNotify=true" >> "${D}"/usr/share/applications/seamonkey.desktop
-	fi
-
-	# 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.1_beta3-r2.ebuild b/www-client/seamonkey/seamonkey-2.1_beta3-r2.ebuild
index da68314..04d695d 100644
--- a/www-client/seamonkey/seamonkey-2.1_beta3-r2.ebuild
+++ b/www-client/seamonkey/seamonkey-2.1_beta3-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.0.4-r1.ebuild,v 1.1 2010/04/09 03:56:59 polynomial-c Exp $
+# $Header: $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
@@ -266,8 +266,10 @@ src_install() {
 		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=.*\)$|\1MimeType=text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;|' \
+	if use mailclient ; then
+		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
@@ -280,16 +282,16 @@ src_install() {
 		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 seamonkey.png \
 		|| die
 	domenu "${T}"/seamonkey.desktop || die
 
-	# Add StartupNotify=true bug 290401
-	if use startup-notification ; then
-		echo "StartupNotify=true" >> "${D}"/usr/share/applications/seamonkey.desktop
-	fi
-
 	# Add our default prefs
 	sed "s|SEAMONKEY_PVR|${PVR}|" "${FILESDIR}"/all-gentoo.js \
 		> "${D}"${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js \