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

[Lars Wendler]

commit:     89a634ecb83adc599918e110630225a935bbaafb
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  5 16:54:21 2011 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Jul  5 16:54:21 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=89a634ec

seamonkey: First pre release of 2.2 final.

---
 www-client/seamonkey/Manifest                  |   22 ++
 www-client/seamonkey/seamonkey-2.2_pre1.ebuild |  311 ++++++++++++++++++++++++
 2 files changed, 333 insertions(+), 0 deletions(-)

diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index 8fa3857..11762b7 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -25,5 +25,27 @@ DIST seamonkey-2.2_beta3-sk.xpi 840212 RMD160 11b1836d17f623ca112c697abf091d0156
 DIST seamonkey-2.2_beta3-sv-SE.xpi 869508 RMD160 14612bf5878c8b2045cbc48f794b33378f2f3efc SHA1 20194241f522aa076d3c737f7b42b7cad0e12a64 SHA256 ffd7831356adf92cda03ccbd0c0ca123adcb0a9d6dce4a14b3441f67c25a8ca7
 DIST seamonkey-2.2_beta3-tr.xpi 805151 RMD160 5c436f4ca05300d3d552a875a0f2f371eaec9e23 SHA1 06ca655bb4bde870ac25a635f77c7d53b158bd71 SHA256 6149ee4f6d18bff788b423e69316438f2a5cb2598195528306a5f3ca8164b14e
 DIST seamonkey-2.2_beta3.source.tar.bz2 87651163 RMD160 b37b691f56ec9a5741d99bbbe36176ba5c40fe5d SHA1 acc0f628087fb2b8bc5db24fb1b502e7eff896d5 SHA256 a75c48e0ad8b47f1965099594aaf2ae922dc7349f32a027f883d65c279dc2954
+DIST seamonkey-2.2_pre1-ca.xpi 811514 RMD160 b347be1636186a08233dc9d4b4bd1315e672f523 SHA1 fb0217b04325ef3bdf5ea2b40485292812097272 SHA256 e188bd6a2e502015f22b0eca22788801b571c37ef095a94b3bd42d3b45600869
+DIST seamonkey-2.2_pre1-cs.xpi 814944 RMD160 4ab3ff1830f71456f30e5a290dda60d4c8595b97 SHA1 51d13c1f2a3c3a25ca8cc7e12c94f25a646fe9a2 SHA256 bdcf8d7c5d5f3a1717858302659742e45e91b5e29926e531779dc0296575eaf3
+DIST seamonkey-2.2_pre1-de.xpi 857283 RMD160 600a8de7c6ea902d487528c9ff0e77ccf427e774 SHA1 f562908fa3345cda27bcab31b1f2ce6d7926b2a6 SHA256 e633c6aa008832478965b045de76413a38959b5b08ebfbe5b32a4d7585aa2b5a
+DIST seamonkey-2.2_pre1-en-GB.xpi 787529 RMD160 f0f9fda1b529805eb5397ab6258a24b1dd91aaa1 SHA1 4a1e6fa0e6ef9df66ff4fc6bf082c302424feb11 SHA256 35b81e07e7eff19825ab432f0d4c3f2414847470fd7abe1eadf4af326ad5b371
+DIST seamonkey-2.2_pre1-en-US.xpi 786992 RMD160 1210e6d8bab9fa1434d317969670c8f71146a4cc SHA1 3e48b3a6c13509e792482b4058b038d65772d8f7 SHA256 d4fa3ccc07c89c8997082d3e384649de0d2a0f401b1ea2d1bded8bfefcf9946c
+DIST seamonkey-2.2_pre1-es-AR.xpi 813118 RMD160 33c24abd9969ea037849f3fb5435506e112c987c SHA1 d9af5d59e8ba0eed44bc48a1fdbe039458f26d75 SHA256 df6b0569db9bd12663438cea94356075348795b6a96d2d02e4fa472b0ecaf426
+DIST seamonkey-2.2_pre1-es-ES.xpi 785711 RMD160 89cfe9543eb75022d5f88fc49be713d7e6eb6488 SHA1 698fc8b98a8ad39fbe6241f2ef8417328cc4b84a SHA256 9ab5f1cf125046288db9d177c6adea3ada827f92dc8e913c8698d9e8a7aa0a10
+DIST seamonkey-2.2_pre1-fi.xpi 807217 RMD160 8f43e8b9f05d4f90c64419fe999a7cd943ca9730 SHA1 0298c1e803b9325723c20980112d7bc8076b4cda SHA256 9c465af89b24f26e4894b7ca225b258d7457ed7b4f1c0bc99d08dc5fd19d41c8
+DIST seamonkey-2.2_pre1-fr.xpi 896109 RMD160 7ccb2c64e2c80b12df92f57930b2bec99e9290a8 SHA1 2a848a7c669319510200890ac60b37d7fb799ef2 SHA256 b6d05c73dca20873e0237316054ef30ca04dd7b58c5bcd9c8ca1e520b55353e7
+DIST seamonkey-2.2_pre1-hu.xpi 827308 RMD160 0479b9c34f6e86fd211f67ce74493aae5409013a SHA1 74ca05ce8f1c0065ad8a13687f5521eeade425ee SHA256 b194c9f245d83431ce346d6a53c957c638c81701d13c365369f3e4c7dedaa653
+DIST seamonkey-2.2_pre1-it.xpi 739672 RMD160 ab92407f98ac9ee3b451e1839c06ba888d79d237 SHA1 d444a8125322a696191f68d0150053bdefc3a565 SHA256 4083c243554588ddc138c45419f4299bcb6f4b2f58609da12c676c1bef2688ba
+DIST seamonkey-2.2_pre1-ja.xpi 861377 RMD160 ed10c4891683a9969eabe848c3e67664e052528d SHA1 fc43d7fbe558053c9299605bb07d7d3b983a5fc1 SHA256 995cb767c5bde1ab8bc2ba4dccd20edd517d15c55ef564be2b38abebcf2f2b36
+DIST seamonkey-2.2_pre1-lt.xpi 959540 RMD160 b73f393e8cff549d8ad61ef29c3329b20da051c6 SHA1 f916eeb3c38bc969936c371752b54d3d6c41ff16 SHA256 d852ac5f1d14319f2a1622aae42c9bb5c0fb3ed476c77aa724af6736aad6bcaa
+DIST seamonkey-2.2_pre1-nl.xpi 804311 RMD160 3152f7858a2c7ee1b7884829da8be1a07b9bb062 SHA1 342e820d13a56781505ce205ed9f93ccc5b25406 SHA256 e4de37961a39f173ee6e35f3b3e573c3e169af87c1fcfb97aa6bc84eebdd84f1
+DIST seamonkey-2.2_pre1-pl.xpi 825438 RMD160 36670711251ef73afa5d155b9d18720cb04180ea SHA1 3cb1e4ace433840c836ea4f46c85dc286beef9b6 SHA256 08d327437027e8a4c1623479db0360a1aa57dca132f2360a0969b68dd0ea7367
+DIST seamonkey-2.2_pre1-pt-PT.xpi 842511 RMD160 d37117428cde901af08db80ad1ef3daec51cf60f SHA1 07242d4f59d365ebcaceb0fde74145d4ff8e12e6 SHA256 f55583699ab1357c3ade96ca6b1805791dc2437cb9cd25c65eb9814b86fa5bb0
+DIST seamonkey-2.2_pre1-ru.xpi 889516 RMD160 8de38b4ca247e47ced6ddfb0790185477dce94f9 SHA1 391d515b3e19d3c0b597bad63017aa24ada414ca SHA256 291cc0204e78c3f157b9e868f9700f633dedd60d7645281ad8cfd9767bf551a5
+DIST seamonkey-2.2_pre1-sk.xpi 840212 RMD160 c3507a4eb61e93d46240c396aab757ec08c15e88 SHA1 99c07841520850245e1b600851cabc904922ea1b SHA256 335393b00bbf1e60fee8aab4f042c681505056fac86fb43c9af21affe9b41004
+DIST seamonkey-2.2_pre1-sv-SE.xpi 869508 RMD160 123d063acbf085413616c166a872b6300bc94536 SHA1 2f411188457790deca0f1ede825075a13c7006ef SHA256 40db9d5bcaf8b7453fa146a3b3514fece8ba48da39b724a09784876e36d9a374
+DIST seamonkey-2.2_pre1-tr.xpi 805151 RMD160 7a9c1ec9eb889b922db47128b8d800a000d7205a SHA1 e4e7f5ad6443659c33efc548fff672d92ae40ede SHA256 30575edfe7e75acb2182398b32ba129a83b86e8377095f7067144a990f1015ef
+DIST seamonkey-2.2_pre1.source.tar.bz2 87479412 RMD160 711e616edf1168b81410cb6066d807fd02034c4d SHA1 0cc9dc0e5e6b46db8d350b9b3bb6fdfe7e819e47 SHA256 1041a4aea09007747f67ca97fafe0469a9dd1d7c25b422c308e8d62f7b16f96e
 DIST seamonkey-2.2b1-patches-01.tar.xz 17104 RMD160 d82c7d464be8bd3f593570529910bcb371797a6a SHA1 3c5584a1fe22a8cb5b69423499c32d25a0335606 SHA256 c4704e8959f65e02e6b10546de43c16cbbf57a28289a5f7e7084925439442278
 EBUILD seamonkey-2.2_beta3.ebuild 8743 RMD160 1764d37d93f90cc593fb299833a8290806eb8c6b SHA1 7d425dbed19653a0bce216dd9e486c5f3207c62b SHA256 7b3a33c1419bdb847d54d7c49193fcc58f0c0a354ca9cdc20c33e99b75a612a4
+EBUILD seamonkey-2.2_pre1.ebuild 8741 RMD160 c03698691cf4ad43615da86d7d16d2daa6e7165b SHA1 5b51c52499b8d96d2cc280fd8c50241981d6a7f7 SHA256 6ccb8a8c6712bec7a231cf7ecf2bd5f0fe0be9566ae68b287ba31c055281bbeb

diff --git a/www-client/seamonkey/seamonkey-2.2_pre1.ebuild b/www-client/seamonkey/seamonkey-2.2_pre1.ebuild
new file mode 100644
index 0000000..49545df
--- /dev/null
+++ b/www-client/seamonkey/seamonkey-2.2_pre1.ebuild
@@ -0,0 +1,311 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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.2b1-patches-01"
+EMVER="1.2"
+
+LANGS="ca cs de en en-GB en-US es-AR es-ES fi fr hu it ja lt nl pl pt-PT ru sk sv-SE tr"
+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 ~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}"
+	LANG_URI="${REL_URI}/langpack"
+	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 +crypt gconf +roaming +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"
+
+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]
+	gconf? ( >=gnome-base/gconf-1.2.1:2 )
+	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} ) )"
+
+S="${WORKDIR}/comm-beta"
+
+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
+}
+
+src_prepare() {
+	# Apply our patches
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}/patch"
+
+	epatch "${FILESDIR}"/${PN}-2.1b3-restore-tabbar-scrolling-from-2.1b2.diff
+
+	# 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.2-versionfix.patch
+		./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="${MEXTENSIONS},-irc"
+	fi
+	if ! use roaming ; then
+		MEXTENSIONS="${MEXTENSIONS},-sroaming"
+	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
+
+	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
+	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.
+	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
+}