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

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

commit:     61de6f14b7a4d5b405d66afc0e487a090e326b73
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri May 13 09:43:36 2011 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri May 13 09:43:36 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=61de6f14

seamonkey: revbump to 2.1rc1

---
 www-client/seamonkey/Manifest                 |   22 ++
 www-client/seamonkey/seamonkey-2.1_rc1.ebuild |  323 +++++++++++++++++++++++++
 2 files changed, 345 insertions(+), 0 deletions(-)

diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index 3dd45a4..1487de6 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -22,4 +22,26 @@ 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
+DIST seamonkey-2.1rc1-be.xpi 795039 RMD160 ae13ce2749a87c03d306b4f7c762428cae0c7f07 SHA1 712ee3a7bd909925e239bf220db1377645b27b2b SHA256 bb7f435fa46fb0425c3a441ca77358980bfc96cb919ab88efa39139d9996c50b
+DIST seamonkey-2.1rc1-ca.xpi 814609 RMD160 6de0aad02c30da71b169819b928badfa077eb94d SHA1 c8c521ec6ddbbe4571181c3f265f6f70bdfdb4be SHA256 539b87141ddc38cf4b65cd1af7b0f38aceaf3e4bdf7c2a3d4229bebbe1e66434
+DIST seamonkey-2.1rc1-cs.xpi 818136 RMD160 0df7cc70daeee6a246f441ec78f086bad306ad1a SHA1 e6a9c8308917427de34414850614fd5ebf0d043e SHA256 6ac079d71559db14b65d4d9d8c6e2cb9c97b1ade48c4aa4167ca2422aab229a6
+DIST seamonkey-2.1rc1-de.xpi 860216 RMD160 39a6c5f62ed328b95d6cac9d40de8bc5f6b04fa9 SHA1 59377c1def21b7b5ca8711caf4dc4e8715045025 SHA256 79873e960f588e23da52c9d0f109f31e3b8f4f0c0e700f3846185566e8da68f6
+DIST seamonkey-2.1rc1-en-US.xpi 789807 RMD160 bdaefcaa866410212b3afa71bb132d304a7945b1 SHA1 da8791e4122401e10b04df21dee99d1a7376cc46 SHA256 9669512d61df718b855284b16bfea1d546e43ee52b8bef1b3869c0be8bd6f6fc
+DIST seamonkey-2.1rc1-es-AR.xpi 818679 RMD160 a3747d5220c34bb9320c935f091ca269bd02bce7 SHA1 97e0ca10aeff15f031cd61ec4eaa8366e86998ad SHA256 7e7b19fab420faa816c34a3b16551102de39d0e9c042ff3f63d394d090aa1d4a
+DIST seamonkey-2.1rc1-es-ES.xpi 795742 RMD160 7d39b865b2a7684e9806022a198724a6d1df4da7 SHA1 c91023cb07a4122d5c90afba521b93e93a4b1f66 SHA256 a1a367f0b0dad0d4fe2a634fe5620d36e720214704c04beab42c9bf2fcd020c1
+DIST seamonkey-2.1rc1-fi.xpi 810128 RMD160 bb8515a194c72117894dbeaac08db9ddb67c4fbf SHA1 dc24c5e2af9b37d0281b45cd47ee61d7df258abb SHA256 29d3b2a87e6a27dfcc058a3bc06c56ad898188aa2fa926d7b834410149eeb516
+DIST seamonkey-2.1rc1-fr.xpi 899043 RMD160 9f79d4ea86a5ce9be84e5f08841d19d3964379c9 SHA1 3d49c806c1cd5724432eccebba25f0240a31b673 SHA256 5db2c1c1f901f9e0f164187edf9d4f861f6cc04c0ee05a7d70e078b848883ecd
+DIST seamonkey-2.1rc1-it.xpi 741721 RMD160 8388fd5941c248442f8707a2b631b7bf6ace0f85 SHA1 deef1b7ab452230a1aa21e4abd903348afe1b4ed SHA256 757a9fbfcf94231f1f42f1efbf03aa21b4dc8d0260b77d7dc8b9abe567aab4db
+DIST seamonkey-2.1rc1-ja.xpi 864361 RMD160 7942c4c79f5fc18f5fc5460ded56a6754163ad22 SHA1 37394c7e9e7c0dd9d5ccefc8d658dc585a018788 SHA256 041acc0262709bb4d4240a3371759f47d6efa2fcbca454fc3470fc96074a1568
+DIST seamonkey-2.1rc1-lt.xpi 962406 RMD160 d29ce642804a6413075253c0ac4ec4cddd8939ff SHA1 ad286309d8d72e918e929ebc0541e4678b8d3d90 SHA256 3f70e810c9548cb0dd5aa26e6f4c4b3e9bbc007b5a24b511c0290e364ca9700a
+DIST seamonkey-2.1rc1-nb-NO.xpi 809401 RMD160 35ce3b31117acf99c8bf50feb133c0fa2c689ca9 SHA1 ca1793921ab640e802126973d7ae1b795b9c5b9e SHA256 548a96a4f5a97841358e0b35e4b1d4de82a5e955c1eb89b7d369cb421de1070f
+DIST seamonkey-2.1rc1-nl.xpi 807185 RMD160 f14ac20844e69ac6cc5e1c608937bfdd2e47e494 SHA1 9401def81f68da03543e1e75b2b0c50c0cc2647e SHA256 7a158d93a81ae5f0822fa493cb4a235fe4b423bacffc14e2b96d7b47dbc87242
+DIST seamonkey-2.1rc1-patches-01.tar.xz 62816 RMD160 ade4744c36b6ce2778c44c0ae4b5fc6254cddee1 SHA1 68cb19b0d658e065d379e393f8aec88158657952 SHA256 eeb80ba57b786c8516d1892c6379047d1613a28710cadc300736bdf0c36ae818
+DIST seamonkey-2.1rc1-pl.xpi 828384 RMD160 390371f3927bab34b9a1c742ba6242fc4e3de62d SHA1 d5e1726df9a6a179fecaa186b374ff989ef7c1e2 SHA256 7f68c8d4753e633d62ad78c67d65c0515b2b7e55c9261125794a05f23c9014a3
+DIST seamonkey-2.1rc1-pt-PT.xpi 845399 RMD160 c1e61c63818b7441700e312d4f98f6ec38446785 SHA1 c8a13052c3c691ab2e7406c32df9e164474d709b SHA256 382c782ec459bedb3c51053d23243f8ba76b38b9f0c5361a56717647b3f824bd
+DIST seamonkey-2.1rc1-ru.xpi 891792 RMD160 12c88f52dcd091b720061f85a5035104fa9b54c4 SHA1 658a018c3340828435759dd9b346352af349692e SHA256 47223fc4ac3aee8f1089dbd0a469d5bee049283a5d92fddf4857a63968ca89f4
+DIST seamonkey-2.1rc1-sk.xpi 843122 RMD160 ea331606e9b8271597c3ccd89e0639c600f751d9 SHA1 876dcd4f37a04161f71edfccf564189f088b7183 SHA256 fbc4ef72372cefc5b22b2ba65df7fd6389ddad5d91e2a28499bf9a063401e324
+DIST seamonkey-2.1rc1-sv-SE.xpi 872349 RMD160 01e80f05ee332e1a56ef027e75e99a051d3b1d8e SHA1 b9e0c29f8df2316ce07ec656371b3ad8a0685b12 SHA256 fc47d569ff3e39bbcf0690b106f1c64d868b962217a59622565eba14f7849d96
+DIST seamonkey-2.1rc1.source.tar.bz2 83956672 RMD160 dcf2536b8917109fafe5e4a0a9d933659cd317b0 SHA1 63a97e528d18ee19121c041dd83027a82ea0b500 SHA256 d5c60822b3dcef814de768fa8b9e76e5520e003d3a3d23ebd8c3c1c75c993831
 EBUILD seamonkey-2.1_beta3-r2.ebuild 9381 RMD160 30bd0b589669ca1f829f209800c81db294d81dbe SHA1 38d810515f4e7cbff51ada0f306c616d9a5cacd5 SHA256 14746b1cf783ce376effa725a4912d2dee59ec6a5d4dbcc7d9ceeb50b792b122
+EBUILD seamonkey-2.1_rc1.ebuild 9340 RMD160 6b92de16debf1e8d32b10c41b878f4115929146f SHA1 72e9fd9bb9976605d528112fa7b5e08c4fb3807f SHA256 3dfcfb693e6ac2cea9c8d0538a280e75db58ba1f7442b758129413eef9099fa2

diff --git a/www-client/seamonkey/seamonkey-2.1_rc1.ebuild b/www-client/seamonkey/seamonkey-2.1_rc1.ebuild
new file mode 100644
index 0000000..7ca1070
--- /dev/null
+++ b/www-client/seamonkey/seamonkey-2.1_rc1.ebuild
@@ -0,0 +1,323 @@
+# 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.1rc1-patches-01"
+EMVER="1.1.2"
+
+LANGS="be ca cs de en en-US es-AR es-ES fi fr it ja lt nb-NO nl pl pt-PT ru sk sv-SE"
+NOSHORTLANGS="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"
+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.xz
+	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-2.0"
+
+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_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}/patch"
+
+	epatch "${FILESDIR}"/2.1/${PN}-2.1b1-configure-fix.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/${PN}.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
+	fi
+
+	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
+	fi
+
+	if ${HAS_LANGS} ; then
+		linguas
+		for X in ${linguas}; do
+			[[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${MY_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
+}