gentoo resync : 14.05.2020

4 files changed, 9 insertions, 397 deletions

diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index 7ab3d3a0834d..436c3b8fa3ba 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -1,11 +1,7 @@
 AUX all-gentoo-1.js 1008 BLAKE2B 50418db37f55b9b9e53049abb95af79a5ee5137df9aab3ef6d1791e51a0c2f35d78b390982c5c20f4a57acebfaa013139276d0343cd4733a925510c8a5567c69 SHA512 5d1c9331db3c988f79be7756b57254bb3d2cb56cf10c7e79878d9968f882713cdcca0013d3507c4d69fcc7e99164a27b05ffbbb5ce78ee86b91ecce366a997c4
 AUX seamonkey.desktop 307 BLAKE2B 81aaa9a69dc60ae0872ebdfe796d3a6afbd4bd15c1c83c14abc06579c15bed2e48114e3fb374bab0ba7d9d4de28109b215601a2d6bd56af3aa9e82a4d0baaa91 SHA512 081d8ec12e9e2035fc8020238803ab9df98dac4350ce90a29e9e65a38efa13bb14cba0fbc2e68a2a857c5046142c68ecc8ab4535da4f284c0e04a3879afc429f
-DIST seamonkey-2.49.5-patches-01.tar.xz 14488 BLAKE2B 6619f5d8e034e72cac37ba2421ebcdd62a23054b118c40e0daabe6943a45b8b98ee3cfeb46ac60280d34d5bef5facc7bdadb01af23ad54631ad4dd2021d5b8d3 SHA512 f39cd1518d060a384fb2fcac1e394329ef3728f121a0b777233e1d2887cecc0a0df64530de344edfad098a462f048c031a4cd01828d9fe4a9e45f88035536196
-DIST seamonkey-2.49.5.source-l10n.tar.xz 11706060 BLAKE2B 24b8185cc958ac82433d7bbaab48f4ce4b6d18fd5299a6d2e24f804178f162edc9b29664e0f8437a69b767b8e3e6d0b860301de25daa89b4181af58ef1053c37 SHA512 eda23c334123e7fb060e93a5495b061e96a71944ce4216eee1dbf017d4803310da0882ff9fcf2c986e016ac8bbcca1fe7c2837dd04ea8208fe7127bf6e92afc5
-DIST seamonkey-2.49.5.source.tar.xz 231748204 BLAKE2B eeae383fabb596fdc25ab3a68f1c1161b6bb3aa2d1086b53b2f843047182e68cf9f8a0ce689e4b037068f08a0467b7911947415bc9f141b6c0ddc52e0a749d88 SHA512 31309def1ad4276f13ecb343e936c7cade4b6850db88d9d84700f86bff7024b2b217b9e50fc3756b1d1beea483ceaa2a5a3afd053da00f6ac06e3795e9116789
-DIST seamonkey-2.53.1-patches-02.tar.xz 73596 BLAKE2B 79136ce3ffb93bd76ada89458df7a1ef360dc59f68716a987a63ed8074963a2673d766d63e99947120fc000e3809377a7bf852feb3f6ea385f52ee1c9a44772a SHA512 80a23c65f4dbef05e3cc16bc4ffe4dd3e8f5312641dc02b5f92de70e322771a702aa9ae486e5e5e5b5a659aec46b5b931dc8c6f575612cbd5e6aaa0c0ee43fe7
-DIST seamonkey-2.53.1.source-l10n.tar.xz 11423472 BLAKE2B ce577c8fd5ff10fdfe5a9f8725cacf2801ed2d4fc66f9535ec1a57e2a613d87925bbccd1293aef8d86c329a221d6f0a5f694b16c8762e2aceed1b4c60cf5883c SHA512 52bc7d82e935abb67778a6fcdab6a9e6d66a196d0962c59ddddae4ae854e1cd0e923016b13afa55df7a3f3997014fc38e729605d449a170a7ff96b905c7ea084
-DIST seamonkey-2.53.1.source.tar.xz 290149116 BLAKE2B 613625df9f364550b1456a8f4afad012469e0740d3e084cf2d4e94b22389d2a8de5fa5012bcb8c6139e092054cfd2214d3d93e562a522f76009b6e5e3b5f406d SHA512 67c8a5343070948a88f1184a4f0c6ec720f9d43910165812b05a2a1bed8b698de2860d75b4bbf831f23c750fb521f50afa44ddc13835047f517a1407892ede3f
-EBUILD seamonkey-2.49.5-r1.ebuild 11558 BLAKE2B 9dba0413ff9ecddcc9c190d34987aa1119a76f804149eb0f79d2057cc8995510046d2a651db276663422a8159bad2b5e1cb3b5883854ff0b8d2e8113e1653429 SHA512 c37771b9629ef6256a74d7517daebc7ffb99d3ffe025b51fb20757dfec3885bbaf3afe98a24ae1c535feac31852203fed22367766314c9c4b655c03d3e71226b
-EBUILD seamonkey-2.53.1.ebuild 16318 BLAKE2B f15244401ae5a01cdc063c6ae98b0de8362a7fe3b25709f3e08ec7bb1e64c75311365c818218de1f3d15f1c30ee47b011928f813f3c7f983ae89f5602230d4b7 SHA512 5a8797d55dfeb25914d45606300e9a221cd984b039cf8a5d29830ddbce8f49b866fe961fa22dd72bf6f0983ebc8cf38c7ff7895f670bd147842003a783c7611f
-MISC metadata.xml 1824 BLAKE2B 877054e919c97e12d11882714747601b9f455dc73304be2656583fc2875ae68a2178b2afd4d4adbd25c1f13b938c24d6f7d07c4808d85c70c4753dda1dd2677c SHA512 b5a1ea2051d02dc8ccd79d36c7d7b169dbb4fa694d1319596386b93cc9c695cde8aeac15741ff668f6e6ec6e1b77e3140c260f81579a91ca4e581107b51749c6
+DIST seamonkey-2.53.2-patches-01.tar.xz 41408 BLAKE2B f59ef0b85a85c69363c5d510fb4b81f562bcaa3cf6f3a2f45c6471b8498d7e19455bada6e8571609aa1869b9ea17b827290b9769fd02137e61b70cccf45558f9 SHA512 3304ce6d0c1cfa82f99c795456068664561ebe48ecdb0a4411b1b476e633c9beafac617ac45c6bbe633874c2627811235235d3c1a10db34d7dd37365347947d5
+DIST seamonkey-2.53.2.source-l10n.tar.xz 12117368 BLAKE2B def32428c93f8c00318140a4e18458242166d5a2f96d40335dea89f7e3932249b14f97dfc309c7ef6af4274e43ad69ee9b8ceb30a5991c9819e85b72c9f9ba5d SHA512 47489182eeb31fdf103570cdbb7490a0a6c3ac5b48385e517bfc27cff600fd6d8c77ac1bd0e323ad50041e5b01659c00cba401ab5bd7baeb7634db909865584e
+DIST seamonkey-2.53.2.source.tar.xz 291744036 BLAKE2B 23908f875a70fba1a8034a447e838dbbe362b5ba6527d2e0617c0c2e896c0566150fcaba8a4af5a2a5ba157492f95fefe6a8045492e38f10614edd6450ce0eb6 SHA512 58dd605a916ef7fb9cad112bb54fffc837690e458e1254b685f21df1bc8808a9b53d27147cad1064294c789d1f77f17c9f6adecf2be906afa44128496f72a805
+EBUILD seamonkey-2.53.2.ebuild 16112 BLAKE2B 64747f0c98ef23afcea4325c81126b661c68cfd96a24625650cb0367b363fadcdbd44d47aeeddbde5068bfb65357d60ad360131f242b869c9e153bab2c2b4105 SHA512 8b48733f06bc03d2f3ee53ce6720cd369c272532346170af11c972830fd6dc51f18090964c308c942d4ce3f65e24bb0deb959b4a83430bf2ba1a6b5db73c84f0
+MISC metadata.xml 1762 BLAKE2B dde9738ba4c4b065806ce8d7eafe14a3def18c30cc32f78967ef015441a7c594e3776a202e289b6879aedc02314d8e000d5e35800e490ddb8446ae29b4d6be68 SHA512 9caf3a4ea297a544452a64bf73659d6ac005d400047d260cfa521bba157e63fc5cd9b74b6786a2553e0ff2b67e59a9a8598486be2815703ed7197601b9d470e2
diff --git a/www-client/seamonkey/metadata.xml b/www-client/seamonkey/metadata.xml
index b240cff91141..eaa0d9c3da6a 100644
--- a/www-client/seamonkey/metadata.xml
+++ b/www-client/seamonkey/metadata.xml
@@ -14,10 +14,9 @@
 		<flag name="chatzilla">Build Mozilla's IRC client (default on)</flag>
 		<flag name="custom-optimization">Build with user-specified compiler optimizations (-Os, -O0, -O1, -O2, -O3) from CFLAGS (unsupported)</flag>
 		<flag name="gmp-autoupdate">Allow Gecko Media Plugins (binary blobs) to be automatically downloaded and kept up-to-date in user profiles</flag>
-		<flag name="force-gtk3">Use the cairo-gtk3 rendering engine</flag>
 		<flag name="ipc">Use inter-process communication between tabs and plugins. Allows for greater stability in case of plugin crashes</flag>
 		<flag name="roaming">Build roaming extension support (default on)</flag>
-		<flag name="system-cairo">Use the system-wide <pkg>x11-libs/cairo</pkg> instead of bundled</flag>
+		<!-- flag name="system-cairo">Use the system-wide <pkg>x11-libs/cairo</pkg> instead of bundled</flag -->
 		<flag name="system-harfbuzz">Use the system-wide <pkg>media-libs/harfbuzz</pkg> instead of bundled</flag>
 		<flag name="system-icu">Use the sytem-wide <pkg>dev-libs/icu</pkg> instead of bundled</flag>
 		<flag name="system-jpeg">Use the system-wide <pkg>media-libs/libjpeg-turbo</pkg> instead of bundled</flag>
diff --git a/www-client/seamonkey/seamonkey-2.49.5-r1.ebuild b/www-client/seamonkey/seamonkey-2.49.5-r1.ebuild
deleted file mode 100644
index 643eef5a7612..000000000000
--- a/www-client/seamonkey/seamonkey-2.49.5-r1.ebuild
+++ /dev/null
@@ -1,376 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WANT_AUTOCONF="2.1"
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
-
-# This list can be updated with scripts/get_langs.sh from the mozilla overlay
-# note - could not roll langpacks for: ca fi
-#MOZ_LANGS=(ca cs de en-GB es-AR es-ES fi fr gl hu it ja lt nb-NO nl pl pt-PT
-#	    ru sk sv-SE tr uk zh-CN zh-TW)
-MOZ_LANGS=(cs de en-GB es-AR es-ES fr hu it ja lt nl pl pt-PT
-	    ru sk sv-SE zh-CN zh-TW)
-
-MOZ_PV="${PV/_pre*}"
-MOZ_PV="${MOZ_PV/_alpha/a}"
-MOZ_PV="${MOZ_PV/_beta/b}"
-MOZ_PV="${MOZ_PV/_rc/rc}"
-MOZ_PV="${MOZ_PV/_p[0-9]}"
-MOZ_P="${P}"
-MY_MOZ_P="${PN}-${MOZ_PV}"
-
-if [[ ${PV} == *_pre* ]] ; then
-	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_pre}"
-	#MOZ_LANGPACK_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases/2.49.4"
-	#MOZ_LANGPACK_PREFIX="linux-i686/xpi/"
-	SRC_URI+=" ${MOZ_HTTP_URI}/source/${MY_MOZ_P}.source.tar.xz -> ${P}.source.tar.xz
-		${MOZ_HTTP_URI}/source/${MY_MOZ_P}.source-l10n.tar.xz -> ${P}.source-l10n.tar.xz"
-	S="${WORKDIR}/${MY_MOZ_P}"
-else
-	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases/${MOZ_PV}"
-	#MOZ_LANGPACK_PREFIX="langpack/${MY_MOZ_P}."
-	#MOZ_LANGPACK_SUFFIX=".langpack.xpi"
-	S="${WORKDIR}/${PN}-${MOZ_PV}"
-	SRC_URI+=" ${MOZ_HTTP_URI}/source/${MY_MOZ_P}.source.tar.xz -> ${P}.source.tar.xz
-		${MOZ_HTTP_URI}/source/${MY_MOZ_P}.source-l10n.tar.xz -> ${P}.source-l10n.tar.xz"
-fi
-
-MOZCONFIG_OPTIONAL_WIFI=1
-MOZ_GENERATE_LANGPACKS=1
-MOZ_L10N_SOURCEDIR="${S}/${P}-l10n"
-MOZCONFIG_OPTIONAL_GTK3=enabled
-inherit check-reqs flag-o-matic toolchain-funcs eutils mozconfig-v6.52 pax-utils xdg-utils autotools mozextension nsplugins mozlinguas-v2
-
-PATCH="${PN}-2.49.5-patches-01"
-
-DESCRIPTION="Seamonkey Web Browser"
-HOMEPAGE="http://www.seamonkey-project.org"
-KEYWORDS="amd64 ~ppc64 x86"
-
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="+calendar +chatzilla +crypt +gmp-autoupdate +ipc jack minimal pulseaudio +roaming selinux test"
-RESTRICT="!test? ( test )"
-
-SRC_URI+="
-	https://dev.gentoo.org/~axs/mozilla/patchsets/${PATCH}.tar.xz
-	https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz
-"
-
-ASM_DEPEND=">=dev-lang/yasm-1.1"
-
-RDEPEND="
-	>=dev-libs/nss-3.28.3
-	>=dev-libs/nspr-4.13.1
-	jack? ( virtual/jack )
-	crypt? ( <x11-plugins/enigmail-2.1.0 )
-"
-
-DEPEND="
-	${RDEPEND}
-	!elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( dev-libs/libexecinfo ) ) )
-	amd64? ( ${ASM_DEPEND}
-		virtual/opengl )
-	x86? ( ${ASM_DEPEND}
-		virtual/opengl )
-"
-
-# allow GMP_PLUGIN_LIST to be set in an eclass or
-# overridden in the enviromnent (advanced hackers only)
-if [[ -z $GMP_PLUGIN_LIST ]] ; then
-	GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
-fi
-
-BUILD_OBJ_DIR="${S}/seamonk"
-
-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
-}
-
-pkg_pretend() {
-	# Ensure we have enough disk space to compile
-	if use debug || use test ; then
-		CHECKREQS_DISK_BUILD="8G"
-	else
-		CHECKREQS_DISK_BUILD="4G"
-	fi
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	local l10n_sources="${P}.source-l10n.tar.xz"
-	unpack ${A/ ${l10n_sources}}
-
-	mkdir "${S}/${P}-l10n" || die
-	cd "${S}/${P}-l10n" || die
-	unpack ${l10n_sources}
-}
-
-src_prepare() {
-	# Apply our patches
-	eapply "${WORKDIR}"/seamonkey
-
-	# browser patches go here
-	pushd "${S}"/mozilla &>/dev/null || die
-	rm -f "${WORKDIR}"/firefox/1000_gentoo_install_dir.patch \
-		"${WORKDIR}"/firefox/1001_disable_sdk_install.patch
-	eapply "${WORKDIR}"/firefox
-	popd &>/dev/null || die
-
-	if grep -q '^sdkdir.*$(MOZ_APP_NAME)-devel' mozilla/config/baseconfig.mk ; then
-		sed '/^sdkdir/s@-devel@@' \
-			-i mozilla/config/baseconfig.mk || die
-	else
-		einfo "baseconfig.mk hackery no longer needed."
-	fi
-
-	# Shell scripts sometimes contain DOS line endings; bug 391889
-	grep -rlZ --include="*.sh" $'\r$' . |
-	while read -r -d $'\0' file ; do
-		einfo edos2unix "${file}"
-		edos2unix "${file}"
-	done
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	local ms="${S}/mozilla"
-
-	# Don't error for format with gcc-9
-	grep -rl -- '-Werror=format' | xargs sed -i 's/error=format/no-&/' || die "sed failed"
-
-	# Enable gnomebreakpad
-	if use debug ; then
-		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
-			"${ms}"/build/unix/run-mozilla.sh || die "sed failed!"
-	fi
-
-	# Ensure that are plugins dir is enabled as default
-	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
-		"${ms}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
-	sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
-		"${ms}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
-
-	# Don't exit with error when some libs are missing which we have in
-	# system.
-	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
-		-i "${S}"/suite/installer/Makefile.in || die
-	# Don't error out when there's no files to be removed:
-	sed 's@\(xargs rm\)$@\1 -f@' \
-		-i "${ms}"/toolkit/mozapps/installer/packager.mk || die
-
-	# Don't build libs-% locale files for chatzilla if we are not building chatzilla
-	# (this is hard-coded in the build system at present rather than being based on configuration)
-	if ! use chatzilla ; then
-		sed '/extensions\/irc\/locales libs-/s@^@#@' \
-			-i "${S}"/suite/locales/Makefile.in || die
-	fi
-
-	eautoreconf old-configure.in
-	cd "${S}"/mozilla || die
-	eautoconf old-configure.in
-	cd "${S}"/mozilla/js/src || die
-	eautoconf old-configure.in
-	cd "${S}"/mozilla/memory/jemalloc/src || die
-	WANT_AUTOCONF= eautoconf
-}
-
-src_configure() {
-	MEXTENSIONS="default"
-	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
-	# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-	# get your own set of keys.
-	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-	mozconfig_config
-
-	# enable JACK, bug 600002
-	mozconfig_use_enable jack
-
-	# 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
-
-	# Setup api key for location services
-	echo -n "${_google_api_key}" > "${S}"/google-api-key
-	mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key"
-
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-
-	# Other sm-specific settings
-	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-	mozconfig_annotate '' --enable-safe-browsing
-	mozconfig_use_enable calendar
-
-	# Use an objdir to keep things organized.
-	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
-	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
-
-	mozlinguas_mozconfig
-
-	# Finalize and report settings
-	mozconfig_final
-
-	# Required until seamonkey-2.53 is available
-	sed \
-		-e '/--enable-application/s@comm/suite@suite@' \
-		-e '/--enable-linker/d' \
-		-i .mozconfig || die
-
-	# Work around breakage in makeopts with --no-print-directory
-	MAKEOPTS="${MAKEOPTS/--no-print-directory/}"
-
-	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
-
-	# workaround for funky/broken upstream configure...
-	SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
-	emake V=1 -f client.mk configure
-}
-
-src_compile() {
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
-	emake V=1 -f client.mk
-
-	mozlinguas_src_compile
-}
-
-src_install() {
-	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	DICTPATH="\"${EPREFIX}/usr/share/myspell\""
-
-	local emid
-	cd "${BUILD_OBJ_DIR}" || die
-
-	# Pax mark xpcshell for hardened support, only used for startupcache creation.
-	pax-mark m "${BUILD_OBJ_DIR}/dist/bin/xpcshell"
-
-	# Copy our preference before omnijar is created.
-	sed "s|SEAMONKEY_PVR|${PVR}|" "${FILESDIR}"/all-gentoo-1.js > \
-		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
-		|| die
-
-	# Set default path to search for dictionaries.
-	echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
-		>> "${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
-		|| die
-
-	echo 'pref("extensions.autoDisableScopes", 3);' >> \
-		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
-		|| die
-
-	local plugin
-	if ! use gmp-autoupdate ; then
-		for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
-			echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
-				"${S}/${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-				|| dir
-		done
-	fi
-
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
-	emake DESTDIR="${D}" install
-	MOZ_P="${P/_*}" mozlinguas_src_install
-	cp "${FILESDIR}"/${PN}.desktop "${T}" || die
-
-	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
-
-	# Add StartupNotify=true bug 290401
-	if use startup-notification ; then
-		echo "StartupNotify=true" >> "${T}"/${PN}.desktop || die
-	fi
-
-	# Install icon and .desktop for menu entry
-	newicon "${S}"/suite/branding/nightly/content/icon64.png ${PN}.png
-	domenu "${T}"/${PN}.desktop
-
-	# Required in order to use plugins and even run seamonkey on hardened.
-	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{seamonkey,seamonkey-bin,plugin-container}
-
-	if use minimal ; then
-		rm -rf "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk}
-	fi
-
-	if use chatzilla ; then
-		local emid='{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}'
-
-		# remove the en_US-only xpi file so a version with all requested locales can be installed
-		if [[ -e "${ED}"${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi ]]; then
-			rm -f "${ED}"${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi || die
-		fi
-
-		# merge the extra locales into the main extension
-		mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/chatzilla
-
-		# install the merged extension
-		mkdir -p "${T}/${emid}" || die
-		cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/chatzilla/* || die
-		insinto ${MOZILLA_FIVE_HOME}/distribution/extensions
-		doins -r "${T}/${emid}"
-	fi
-
-	# Handle plugins dir through nsplugins.eclass
-	share_plugins_dir
-
-	# revdep-rebuild entry
-	insinto /etc/revdep-rebuild
-	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}*" >> ${T}/11${PN}
-	doins "${T}"/11${PN}
-}
-
-pkg_preinst() {
-	MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/${PN}"
-
-	if [ -d ${MOZILLA_FIVE_HOME}/plugins ] ; then
-		rm ${MOZILLA_FIVE_HOME}/plugins -rf
-	fi
-}
-
-pkg_postinst() {
-	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
-	# Update mimedb for the new .desktop file
-	xdg_desktop_database_update
-
-	if ! use gmp-autoupdate ; then
-		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
-		elog "installing into new profiles:"
-		local plugin
-		for plugin in "${GMP_PLUGIN_LIST[@]}"; do elog "\t ${plugin}" ; done
-	fi
-
-	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.53.1.ebuild b/www-client/seamonkey/seamonkey-2.53.2.ebuild
index 52d455c9477c..d958570cb1e7 100644
--- a/www-client/seamonkey/seamonkey-2.53.1.ebuild
+++ b/www-client/seamonkey/seamonkey-2.53.2.ebuild
@@ -36,7 +36,7 @@ MOZ_GENERATE_LANGPACKS=1
 MOZ_L10N_SOURCEDIR="${S}/${P}-l10n"
 inherit autotools check-reqs flag-o-matic mozcoreconf-v6 mozextension mozlinguas-v2 nsplugins pax-utils toolchain-funcs xdg-utils
 
-PATCH="${PN}-2.53.1-patches-02"
+PATCH="${PN}-2.53.2-patches-01"
 
 DESCRIPTION="Seamonkey Web Browser"
 HOMEPAGE="http://www.seamonkey-project.org"
@@ -80,7 +80,7 @@ DEPEND="
 	x11-libs/libXt
 	>=x11-libs/pango-1.22.0
 	>=x11-libs/pixman-0.19.2
-	virtual/ffmpeg
+	media-video/ffmpeg
 	virtual/freedesktop-icon-theme
 	dbus? (
 		>=dev-libs/dbus-glib-0.72
@@ -180,13 +180,6 @@ src_prepare() {
 	eapply "${WORKDIR}"/firefox
 	popd &>/dev/null || die
 
-	if grep -q '^sdkdir.*$(MOZ_APP_NAME)-devel' mozilla/config/baseconfig.mk ; then
-		sed '/^sdkdir/s@-devel@@' \
-			-i mozilla/config/baseconfig.mk || die
-	else
-		einfo "baseconfig.mk hackery no longer needed."
-	fi
-
 	# Shell scripts sometimes contain DOS line endings; bug 391889
 	grep -rlZ --include="*.sh" $'\r$' . |
 	while read -r -d $'\0' file ; do
@@ -460,7 +453,7 @@ src_install() {
 
 	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
 	emake DESTDIR="${D}" install
-	MOZ_P="${P/_*}" mozlinguas_src_install
+	MOZ_P="${MY_MOZ_P}" mozlinguas_src_install
 	cp "${FILESDIR}"/${PN}.desktop "${T}" || die
 
 	sed 's|^\(MimeType=.*\)$|\1text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;|' \