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

[Lars Wendler]

commit:     16a2699dc7dbefa791f0cf51f2258518a92bd011
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 21 15:53:59 2011 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Nov 21 15:54:35 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=16a2699d

seamonkey: Minor ebuild improvements. Removed old...

---
 www-client/seamonkey/Manifest                   |   28 +--
 www-client/seamonkey/seamonkey-2.5_beta3.ebuild |  359 -----------------------
 www-client/seamonkey/seamonkey-2.5_beta4.ebuild |    7 +-
 3 files changed, 2 insertions(+), 392 deletions(-)

diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index 1ebd564..9f7acea 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -4,31 +4,6 @@ AUX icon/seamonkey.png 4172 RMD160 d296c4d4e0920e4476f4c6c607946434202ad521 SHA1
 AUX seamonkey-2.3.1-scrollbar-mouse-interaction-improvement.patch 3768 RMD160 48d6849a54d73054dde7f76e2e0aff4ebcd24926 SHA1 744f5d981e2219843ddba47341053ed74463ef11 SHA256 eed1c52b02b89d97328aa25b9c825d5b76d833bad87ce98f6fed5c32da91b5ac
 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_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
-DIST seamonkey-2.5_beta3-de.xpi 859794 RMD160 627b5496c7af2e299c37cbc318f18a6019a53e76 SHA1 f832db9f8be35c34a2d1a0814f8a087c29697135 SHA256 47ca2d801b89258d7b4cfb6fd7e11db636ffec7139c0b005940f07835751865f
-DIST seamonkey-2.5_beta3-en-GB.xpi 789630 RMD160 aee500dd941ea224a2e25903f37e0839ff4f8b4d SHA1 98f9988485039753b1486544464c0b1e268eb9f9 SHA256 2091e741900faf135e4c787a69a654a0466d58e787605ab04c743bdf3084238a
-DIST seamonkey-2.5_beta3-en-US.xpi 789287 RMD160 684e9b4c1f88b36b2336da2b6a6b3c19e237db56 SHA1 841ee0f71f54d17994c61fe2f05a5976e8a2d176 SHA256 63ffb5a409a174a8b4dc2c72794c41acde3621d701a2010c5d4fe07eba7fbb2c
-DIST seamonkey-2.5_beta3-es-AR.xpi 859119 RMD160 752b502d2b29a6c5cc80435dc0d5d7e586a9434b SHA1 aa10eb5102e381d3c5799a9cdec4345a7256dcf4 SHA256 621d30c907fe49bfcfb9ab694ff7c30cb89619be6d352feca431234053799879
-DIST seamonkey-2.5_beta3-es-ES.xpi 787408 RMD160 cc10417b500b8a03dee7e1078f8a174e8f75c293 SHA1 02d76fdba5388deee6dac73c5844c2809fed2bab SHA256 139cbcf142587ff115d70fddd12ee0546d8462773ad38986ec89a4c40f6aa458
-DIST seamonkey-2.5_beta3-fi.xpi 809364 RMD160 2f4d15e1ada754f4b211d558cde2cfb2ec2a916d SHA1 60694ff4da3c4fdeac22b4112e7d0eb21b6ea9f9 SHA256 e7597a916c0c7c3a4c7f036773a36a331f757a78b3d6b1d85d8461f41b21a04a
-DIST seamonkey-2.5_beta3-fr.xpi 814852 RMD160 080401059ee728c3a74cca91249ad55d55337ec7 SHA1 c7e66edf619f507135420a77e673a8ccb36f059b SHA256 34c71047f56b22a7d11072097dc39815d294179c74195eee108a956f33d14f6b
-DIST seamonkey-2.5_beta3-gl.xpi 809259 RMD160 4400e4bb4febdd98ca64c51039e04fa29140628e SHA1 08afaf0b9c6503d1902a5c7e1d3cb877dd925932 SHA256 c738a4f97fe8e47b091165aaff877e5f7fd66bc40501ee050236e06d941d2caf
-DIST seamonkey-2.5_beta3-hu.xpi 831865 RMD160 3467ace8dcbeb89fb892edc665a1ee0b87e205f1 SHA1 f3b0a71d447700908686e93358a6b4b1506d1726 SHA256 04c11f9b5d89fb7811167aeebbc84fea85ca6546e4af7923c632838f43161ad4
-DIST seamonkey-2.5_beta3-it.xpi 737810 RMD160 8ab7dfde44597fec7f5cbcbeeb2e4a7251520d8b SHA1 955d37a60988afc82a8ab03db053f6e28a11528a SHA256 5d399eaa2aa55c225896cc2b61b78d2963a14dc4254a8ad43362bfb6cee618b4
-DIST seamonkey-2.5_beta3-ja.xpi 864229 RMD160 bc928ea7f4f3880aa372bb0bce3fc6a2352bf703 SHA1 50a37eedf4b5c2782dad90154dc38731fb18415f SHA256 80c3396d78d63d582a23121bd4ccfbbfa026adeb10059c75668e904c3233f2b7
-DIST seamonkey-2.5_beta3-lt.xpi 961779 RMD160 47db4176f487624fd995acaf206875977f2be370 SHA1 9f7fce4be38588baf5fdcd60c03084c2bfd6da7c SHA256 0a64424565a65fc07c3eeea8ebc70a6d3540535c1a6f5ec7874935712ca64a87
-DIST seamonkey-2.5_beta3-nb-NO.xpi 807793 RMD160 f5a4904ca99c8bc98400d5b42929769c74380619 SHA1 d2bcebd6b8d020ddce49f99fc58e3dbbb542ac8f SHA256 b89a8d7b092d957afa793afb402042f8f4c5b49343c35526ad21bd1e1a8c9632
-DIST seamonkey-2.5_beta3-nl.xpi 806319 RMD160 654977f90828d0ae9b488aebd44bb9c4ad36289c SHA1 4f0dfd66b41ba32a4140d55c76909ffaa39d08fd SHA256 46514a808ce2ad1a831fc5cee969ee04894ad8c4e315cf508fad65fba2080e8a
-DIST seamonkey-2.5_beta3-pl.xpi 828798 RMD160 ee01d786549b779c8e51350b504ea7c39a54bdc7 SHA1 d9228bf9a7ca597a6cb25fb57572735d7794990f SHA256 2ad70c8fb553039c6359735a51418ceb0380b83499bf20a9fd028b599f627d30
-DIST seamonkey-2.5_beta3-pt-PT.xpi 844864 RMD160 292bf9072c6940a170261814c87a91561907b8b3 SHA1 af3dd4d6eb23f50a7d3606c73f6364924f1bd707 SHA256 53e8fc016ba21841612dbc9dc26be26a8e2b34c31d5922b4c687ed259a7a2fa7
-DIST seamonkey-2.5_beta3-ru.xpi 891481 RMD160 e5ad65e6b85dd1b10b2c702fe66b343f88173cda SHA1 5ae88971bfb50763fa20862d0fe533541a95d456 SHA256 c5365b58e02c504ce14b77b4b4f81bbc9e9e75e28396df62b97021f46420bc15
-DIST seamonkey-2.5_beta3-sk.xpi 842552 RMD160 7c7951c15d3fb5c802745fa0a457fdc2c1ac91be SHA1 4bf67f5891bf0ed6d982e534a227248786cbe420 SHA256 bce6e0f5daf6478672b931c115aaebc1e5a7188e0a2e3631e556ba526e6869d7
-DIST seamonkey-2.5_beta3-sv-SE.xpi 871535 RMD160 84228b28027149cf17a2ae0372d578977a36558d SHA1 df98315588462849a3c56160267002deb140f651 SHA256 fadf07dc26bd784ac814f6f5c58c7f74a6a72729cbeb2eac4d773e0a5b58f303
-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
 DIST seamonkey-2.5_beta4-be.xpi 795233 RMD160 1ccef5ea0eee9dd4234bc4dc3c187c69e388722d SHA1 9135fb90c9f3d12291a711a582db3d147ac17dbe SHA256 0beec11e97474981822c0b4f2e36921f8db800d4ad4ddea6876da30756984877
 DIST seamonkey-2.5_beta4-ca.xpi 813814 RMD160 531ba953ae5fa511358f7030be481d0d231b3576 SHA1 e359589bb3a9434f22bcc22953c183a4823af9ff SHA256 5b9d767cb95961d5c7cf4e2a69a1f20bb3ab2fc2483362a81f8729ee98b482e6
 DIST seamonkey-2.5_beta4-cs.xpi 819090 RMD160 dc07d055f56e519f312fa5cb969ccd4284a31ed5 SHA1 89b98acab14662da728e22fe6a03898a5ed065c4 SHA256 74dfb6ff94da82e2ef631703c25f16319dd84aa6ba4b3ed57224f6388bb6128d
@@ -54,5 +29,4 @@ DIST seamonkey-2.5_beta4-sv-SE.xpi 871535 RMD160 6a0a7eeee3a7054b7989f1ffa853d8d
 DIST seamonkey-2.5_beta4-tr.xpi 807205 RMD160 541bac93d2a5310594f40e4bf28af68dc402d05e SHA1 07e4695723b2852c9463a95843bc93cf38d87f57 SHA256 0c0a655ea10bcf9b86d25d9b58c9a8cae7fdae191c02fb63359d8f2fc14b9902
 DIST seamonkey-2.5_beta4-zh-CN.xpi 837986 RMD160 6f45ba71684339b3c2de6db5413934e1ad56e687 SHA1 e63de8518475adf66b1b938a0cad7faca0879e21 SHA256 75952433c1268f3b0b8f363be774ed17f747b6dd7b7103df48c373343c2a0525
 DIST seamonkey-2.5_beta4.source.tar.bz2 89481907 RMD160 1ed9a59457b7bafe2aed2071908822b98225dddc SHA1 74b8b9a415b97e4e3242db516fa57ed8b9f43dfe SHA256 10031a49b84542641bc93b40c3e8c3a56dd3aee90db47b49880ec1d100302231
-EBUILD seamonkey-2.5_beta3.ebuild 10311 RMD160 731a0c4967d112ee14ef712af15641c7598c70d0 SHA1 3cb60c8837b3ccfca6748b4bb9a59d092625a3f1 SHA256 bb1e3f3b6802d148289c1dfb639ae3c6c52ae957fe05f4eb5166e17fc1fa5d95
-EBUILD seamonkey-2.5_beta4.ebuild 10311 RMD160 731a0c4967d112ee14ef712af15641c7598c70d0 SHA1 3cb60c8837b3ccfca6748b4bb9a59d092625a3f1 SHA256 bb1e3f3b6802d148289c1dfb639ae3c6c52ae957fe05f4eb5166e17fc1fa5d95
+EBUILD seamonkey-2.5_beta4.ebuild 10089 RMD160 b65455a71643afc3a84d10a3bbfb048433db92f1 SHA1 f8a3e41795b8899b1b3d7a5e2c8ffbfea4ba7c7a SHA256 e0e124ed31eca4ad0ac1a488fbbd2704fee3ee47d0f4d74d1246ffc7e868c6ce

diff --git a/www-client/seamonkey/seamonkey-2.5_beta3.ebuild b/www-client/seamonkey/seamonkey-2.5_beta3.ebuild
deleted file mode 100644
index 82b4652..0000000
--- a/www-client/seamonkey/seamonkey-2.5_beta3.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.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"
-
-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_beta4.ebuild b/www-client/seamonkey/seamonkey-2.5_beta4.ebuild
index 82b4652..d9ea39d 100644
--- a/www-client/seamonkey/seamonkey-2.5_beta4.ebuild
+++ b/www-client/seamonkey/seamonkey-2.5_beta4.ebuild
@@ -209,10 +209,6 @@ src_prepare() {
 		|| die "Failed to remove gnomevfs extension"
 
 	eautoreconf
-	cd "${S}"/mozilla || die
-	eautoreconf
-	cd "${S}"/mozilla/js/src || die
-	eautoreconf
 }
 
 src_configure() {
@@ -332,8 +328,7 @@ src_install() {
 			|| 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
+	share_plugins_dir
 
 	doman "${S}"/suite/app/${PN}.1 || die
 }