Revbumped to enigmail-1.3. Removed old

(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)

4 files changed, 55 insertions, 32 deletions

diff --git a/www-client/seamonkey/ChangeLog b/www-client/seamonkey/ChangeLog
index 6c5e4e3cd300..b94db375df59 100644
--- a/www-client/seamonkey/ChangeLog
+++ b/www-client/seamonkey/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/seamonkey
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.327 2011/08/16 04:50:01 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.328 2011/08/17 16:51:46 polynomial-c Exp $
+
+*seamonkey-2.3-r1 (17 Aug 2011)
+
+  17 Aug 2011; Lars Wendler <polynomial-c@gentoo.org>
+  -files/enigmail/enigmail-1.2-seamonkey-2.1-lowercaseequalsliteralfix.patch,
+  -seamonkey-2.1.ebuild, +seamonkey-2.3-r1.ebuild:
+  Revbumped to enigmail-1.3. Removed 2.1 version.
 
   16 Aug 2011; Lars Wendler <polynomial-c@gentoo.org> seamonkey-2.3.ebuild:
   Fixed dependency on nss and nspr (bug #379341).
diff --git a/www-client/seamonkey/files/enigmail/enigmail-1.2-seamonkey-2.1-lowercaseequalsliteralfix.patch b/www-client/seamonkey/files/enigmail/enigmail-1.2-seamonkey-2.1-lowercaseequalsliteralfix.patch
deleted file mode 100644
index 7fdd20fe4d37..000000000000
--- a/www-client/seamonkey/files/enigmail/enigmail-1.2-seamonkey-2.1-lowercaseequalsliteralfix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- enigmail/src/nsEnigMsgCompose.cpp	2011-07-03 10:45:45.000000000 +0200
-+++ enigmail/src/nsEnigMsgCompose.cpp	2011-07-03 10:45:17.000000000 +0200
-@@ -1092,7 +1092,8 @@
-       nsCString left(tmpStr);
-       left.SetLength(15);
- 
--      if (left.LowerCaseEqualsLiteral("x-mozilla-keys:")) {
-+      ToLowerCase(left);
-+      if (left.EqualsLiteral("x-mozilla-keys:")) {
-         DEBUG_LOG(("nsEnigMimeWriter::OnDataAvailable: workaround for 'X-Mozilla-Keys:' header\n"));
- 
-         tmpStr.StripWhitespace();
diff --git a/www-client/seamonkey/metadata.xml b/www-client/seamonkey/metadata.xml
index 735e11adb723..1602652d13fb 100644
--- a/www-client/seamonkey/metadata.xml
+++ b/www-client/seamonkey/metadata.xml
@@ -11,8 +11,6 @@
 	<flag name='custom-optimization'>Fine-tune custom compiler
 		optimizations</flag>
 	<flag name='composer'>Build Mozilla's HTML editor component (default on)</flag>
-	<flag name="gconf">Add support for setting of default browser using
-		<pkg>gnome-base/gconf</pkg>. Useful only for GNOME 2 users.</flag>
 	<flag name='mailclient'>Build Mozilla's Mail client (default on)</flag>
 	<flag name="methodjit">Enable JIT for JavaScript using MethodJIT for faster
 		JS performance. Hardened users can disable this USE-flag to use MPROTECT
diff --git a/www-client/seamonkey/seamonkey-2.1.ebuild b/www-client/seamonkey/seamonkey-2.3-r1.ebuild
index c9bd6575e794..fcebb606adf0 100644
--- a/www-client/seamonkey/seamonkey-2.1.ebuild
+++ b/www-client/seamonkey/seamonkey-2.3-r1.ebuild
@@ -1,16 +1,16 @@
 # 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.1.ebuild,v 1.5 2011/07/26 12:27:51 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.3-r1.ebuild,v 1.1 2011/08/17 16:51:46 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.1-patches-01"
-EMVER="1.2"
+PATCH="${PN}-2.3-patches-01"
+EMVER="1.3"
 
-LANGS="be ca cs de en en-GB en-US es-AR es-ES fi fr it ja lt nb-NO nl pl pt-PT ru sk sv-SE tr"
+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*}"
@@ -21,17 +21,25 @@ 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="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
@@ -41,9 +49,9 @@ HOMEPAGE="http://www.seamonkey-project.org"
 
 SLOT="0"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="+alsa +chatzilla +crypt gconf +roaming +webm"
+IUSE="+alsa +chatzilla +crypt +methodjit +roaming system-sqlite +webm"
 
-SRC_URI="${REL_URI}/source/${MY_P}.source.tar.bz2
+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 )"
 
@@ -51,14 +59,14 @@ if ${HAS_LANGS} ; then
 	for X in ${LANGS} ; do
 		if [ "${X}" != "en" ] ; then
 			SRC_URI="${SRC_URI}
-				linguas_${X/-/_}? ( ${REL_URI/build?/build1}/langpack/${MY_P}.${X}.langpack.xpi -> ${MY_P}-${X}.xpi )"
+				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%%-*}? ( ${REL_URI/build?/build1}/langpack/${MY_P}.${X}.langpack.xpi -> ${MY_P}-${X}.xpi )"
+					linguas_${X%%-*}? ( ${LANG_URI}/${LANGPACK_PREFIX}${X}${LANGPACK_SUFFIX}.xpi -> ${P}-${X}.xpi )"
 			#fi
 			IUSE="${IUSE} linguas_${X%%-*}"
 		fi
@@ -67,13 +75,16 @@ 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.9
-	>=dev-libs/nspr-4.8.7
+	>=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
 	dev-libs/libffi
 	system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete,unlock-notify,debug=] )
-	gconf? ( >=gnome-base/gconf-1.2.1:2 )
 	crypt? ( >=app-crypt/gnupg-1.4 )
 	webm? ( media-libs/libvpx
 		media-libs/alsa-lib )"
@@ -83,7 +94,11 @@ DEPEND="${RDEPEND}
 	webm? ( amd64? ( ${ASM_DEPEND} )
 		x86? ( ${ASM_DEPEND} ) )"
 
-S="${WORKDIR}/comm-2.0"
+if [[ ${PV} == *beta* ]] ; then
+	S="${WORKDIR}/comm-beta"
+else
+	S="${WORKDIR}/comm-release"
+fi
 
 linguas() {
 	local LANG SLANG
@@ -114,7 +129,7 @@ src_unpack() {
 		linguas
 		for X in ${linguas}; do
 			# FIXME: Add support for unpacking xpis to portage
-			[[ ${X} != "en" ]] && xpi_unpack "${MY_P}-${X}.xpi"
+			[[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi"
 		done
 		if [[ ${linguas} != "" && ${linguas} != "en" ]]; then
 			einfo "Selected language packs (first will be default): ${linguas}"
@@ -130,6 +145,12 @@ pkg_setup() {
 	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() {
@@ -141,13 +162,16 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.1b3-restore-tabbar-scrolling-from-2.1b2.diff \
 		"${FILESDIR}"/${PN}-2.2-curl7217-includes-fix.patch
 
+	# mailnews patches go here
+	#pushd "${S}"/mailnews &>/dev/null || die
+	#popd &>/dev/null || die
+
 	# 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
-		epatch "${FILESDIR}"/enigmail/enigmail-1.2-seamonkey-2.1-lowercaseequalsliteralfix.patch
 		./makemake -r 2&>/dev/null
 		sed -e 's:@srcdir@:${S}/mailnews/extensions/enigmail:' \
 			-i Makefile.in || die
@@ -193,11 +217,13 @@ src_configure() {
 	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_use_enable gconf
+	mozconfig_use_enable system-sqlite
+	mozconfig_use_enable methodjit
 
 	if use crypt ; then
 		mozconfig_annotate "mail crypt" --enable-chrome-format=jar
@@ -210,6 +236,10 @@ src_configure() {
 
 	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
 
 	####################################
@@ -259,7 +289,7 @@ src_install() {
 	if ${HAS_LANGS} ; then
 		linguas
 		for X in ${linguas}; do
-			[[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${MY_P}-${X}"
+			[[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P}-${X}"
 		done
 	fi