gentoo auto-resync : 29:01:2023 - 14:55:22

5 files changed, 608 insertions, 11 deletions

diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index ac4346f2c72b..185645be9b99 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 3c0c8735bece..4e2b359385f2 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -405,5 +405,5 @@ DIST firefox-109.0.source.tar.xz 493231972 BLAKE2B 56ec8c49f0dd1cb4ba29afb5d68fd
 EBUILD firefox-102.6.0.ebuild 36637 BLAKE2B b390983bf08385b01f66d76a1f08c97342991312bc76d24f11cf4cb94736d6749d5f75f5b9081069fc4b17ccbdfc58b9bbe8c2caf03563d4676a82150c692b8d SHA512 214f554cc976202bfe9cae0bf79c16e4017b9b08f4342ed9f62145d237602c8ffa7204f51d8b3838214481088ca333da34a1ca8e779f0a48503377ef95f9fbcf
 EBUILD firefox-102.7.0.ebuild 36564 BLAKE2B 0890f800154cb95683ec3a4d14fee8e716bb77b8d8a47a3cf244b5cf074fe19e512032dc949ff816bdd4a2d6054c4f02c210ffc33ffb72265d1269af89ed0dfd SHA512 41b506e8e7c29421152cc61555f86f520f97b9ef207386a4a3a07451629abef6426b0283d355f177cad296d260a79bb6854f38e8a574ace80be52c6ec698062d
 EBUILD firefox-108.0.2.ebuild 38414 BLAKE2B 002d5abf568068610b4fe03ab8a63bffa8fb803d921dfba84bb952cef6fb1a591ceecc1ab6adabcb176deee3d24deb797930a3fec0841bb1f6e729e662351fae SHA512 aa0001426a0d8e9d969d14085da57c3cb54ea35218eae7ec2d69918d5ff61099a1c5fcc82214b25e9dfbfe04b408afe4db9b54624f401cfe8cb4a49ea6a33d3d
-EBUILD firefox-109.0.ebuild 38533 BLAKE2B 6f692c77ad77dd0c3f0864167f11f959ff119b07ca246acb75272066c09706ff20bbc58cfff989b653ad19ca3eb4450b8f4a6f7272b82deaebc18f8c7688af5a SHA512 68d5ad5a2b2e4f939637c59b60f6882b553e98b724e376f93f67dccabe9bed6351efc3e33a84829b68f985e568869fe783204bce3e3aaf6f95e54b69b26cb814
+EBUILD firefox-109.0.ebuild 40057 BLAKE2B 4680ff111100df6cd9ad3bb2b02b88b88e0d23d4f4bd0b452986080410ac9fb850dfaad802b122d6e5f30cc9f69f5de182174715fcbf073f3eb6ff41d59e4021 SHA512 51101827b2b94bf18de52c49541747a0b0a775a84d6d458db02f5b3f45c3682ebc59af71d365708958efec58905b0dd864f9efeb7aa6a722c1784357b5f9f859
 MISC metadata.xml 2219 BLAKE2B 064f486eecd2a66ef4c9cccef46803f877039bf16bc40b699a48e28e04e816d0ad434ce65ae2e056e1a4126a67a7dd7eff16040276159c1f5aa8966b1c0d7b6c SHA512 522b09ffc2857553e240b1e7c82c11ccc281dd87c720c6292ec9314b91319e0a55ca2838f17e878f5c1e58e4f22caa1b0c3b90506b65b350beff06f3f397d897
diff --git a/www-client/firefox/firefox-109.0.ebuild b/www-client/firefox/firefox-109.0.ebuild
index c2e92bead6a2..e6d4ce7a40de 100644
--- a/www-client/firefox/firefox-109.0.ebuild
+++ b/www-client/firefox/firefox-109.0.ebuild
@@ -88,7 +88,10 @@ BDEPEND="${PYTHON_DEPS}
 			sys-devel/clang:15
 			sys-devel/llvm:15
 			clang? (
-				sys-devel/lld:15
+				|| (
+					sys-devel/lld:15
+					sys-devel/mold
+				)
 				virtual/rust:0/llvm-15
 				pgo? ( =sys-libs/compiler-rt-sanitizers-15*[profile] )
 			)
@@ -97,7 +100,10 @@ BDEPEND="${PYTHON_DEPS}
 			sys-devel/clang:14
 			sys-devel/llvm:14
 			clang? (
-				sys-devel/lld:14
+				|| (
+					sys-devel/lld:14
+					sys-devel/mold
+				)
 				virtual/rust:0/llvm-14
 				pgo? ( =sys-libs/compiler-rt-sanitizers-14*[profile] )
 			)
@@ -227,7 +233,7 @@ llvm_check_deps() {
 		return 1
 	fi
 
-	if use clang ; then
+	if use clang && tc-ld-is-lld ; then
 		if ! has_version -b "sys-devel/lld:${LLVM_SLOT}" ; then
 			einfo "sys-devel/lld:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
 			return 1
@@ -427,6 +433,40 @@ mozconfig_use_with() {
 	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
 }
 
+# This is a straight copypaste from toolchain-funcs.eclass's 'tc-ld-is-lld', and is temporarily
+# placed here until toolchain-funcs.eclass gets an official support for mold linker.
+# Please see:
+# https://github.com/gentoo/gentoo/pull/28366 ||
+# https://github.com/gentoo/gentoo/pull/28355
+tc-ld-is-mold() {
+	local out
+
+	# Ensure ld output is in English.
+	local -x LC_ALL=C
+
+	# First check the linker directly.
+	out=$($(tc-getLD "$@") --version 2>&1)
+	if [[ ${out} == *"mold"* ]] ; then
+		return 0
+	fi
+
+	# Then see if they're selecting mold via compiler flags.
+	# Note: We're assuming they're using LDFLAGS to hold the
+	# options and not CFLAGS/CXXFLAGS.
+	local base="${T}/test-tc-linker"
+	cat <<-EOF > "${base}.c"
+	int main() { return 0; }
+	EOF
+	out=$($(tc-getCC "$@") ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -Wl,--version "${base}.c" -o "${base}" 2>&1)
+	rm -f "${base}"*
+	if [[ ${out} == *"mold"* ]] ; then
+		return 0
+	fi
+
+	# No mold here!
+	return 1
+}
+
 virtwl() {
 	debug-print-function ${FUNCNAME} "$@"
 
@@ -486,7 +526,7 @@ pkg_setup() {
 
 		llvm_pkg_setup
 
-		if use clang && use lto ; then
+		if use clang && use lto && tc-ld-is-lld ; then
 			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
 			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
 			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
@@ -856,13 +896,18 @@ src_configure() {
 
 	if use lto ; then
 		if use clang ; then
-			# Upstream only supports lld when using clang
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
+			# Upstream only supports lld or mold when using clang.
+			if tc-ld-is-mold ; then
+				mozconfig_add_options_ac "using ld=mold due to system selection" --enable-linker=mold
+			else
+				mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
+			fi
 
 			mozconfig_add_options_ac '+lto' --enable-lto=cross
 
 		else
-			# ThinLTO is currently broken, see bmo#1644409
+			# ThinLTO is currently broken, see bmo#1644409.
+			# mold does not support gcc+lto combination.
 			mozconfig_add_options_ac '+lto' --enable-lto=full
 			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
 		fi
@@ -878,10 +923,19 @@ src_configure() {
 	else
 		# Avoid auto-magic on linker
 		if use clang ; then
-			# This is upstream's default
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
+			# lld is upstream's default
+			if tc-ld-is-mold ; then
+				mozconfig_add_options_ac "using ld=mold due to system selection" --enable-linker=mold
+			else
+				mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
+			fi
+
 		else
-			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
+			if tc-ld-is-mold ; then
+				mozconfig_add_options_ac "using ld=mold due to system selection" --enable-linker=mold
+			else
+				mozconfig_add_options_ac "linker is set to bfd due to USE=-clang" --enable-linker=bfd
+			fi
 		fi
 	fi
 
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index b88fe0cdb3df..865595fb30cd 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -3,5 +3,9 @@ AUX seamonkey.desktop 307 BLAKE2B 81aaa9a69dc60ae0872ebdfe796d3a6afbd4bd15c1c83c
 DIST seamonkey-2.53.14-patches.tar.gz 64614 BLAKE2B b63a3ebfea69f27a3057a21871f64f5b3088e1050d8676577a3bdd4dbf290462665e8d4fcfa730ee89451f155c9893cbe9fecc2bfddc0c367cb46bd6c30f0a5d SHA512 52b19663881bf46a8303d64e9d315342b72ea5709f842ef62ce64dfefc334a05c814f1a3f1857bcb43ddbc3465bb6937e22452caead6677b95071fa83f677569
 DIST seamonkey-2.53.14.source-l10n.tar.xz 13656176 BLAKE2B daa2697d51ea74ef085a5e610cdce35c256e2d052ff7c557af47d0204bfe49b08c62de963574c22427b6ccbdab484fc8b7f122eeb7f1dc171514c2626b3a794c SHA512 18cd269df9d603a319f83f9e8a90182fdcdb44c3f4fc606abe2d30a5706a0a00f8f488b574e59b1885eecd2b0490c679222ebaaf77b60aa432e2412a61d34dfc
 DIST seamonkey-2.53.14.source.tar.xz 256277216 BLAKE2B baf48d89ae84d19c3accb0045658bad9e265e402ddbe7325a1df37682ea54bae1c09336e44312cf66dae037ec89672e8078ffb285e3f8588e42f6f484a7fd5c6 SHA512 19b35d7301b3a3c4cff41ea90bd401f9b41ec8ea1207e8ccd738eb2f52068cc39b4838eabb60a04596926035a143472656a291cab8adcea608bd569b30b5b7e3
+DIST seamonkey-2.53.15-patches.tar.gz 31196 BLAKE2B 58fb85091e1077fee1bd5c71cbfd90cf5f942e414bec5678c6f3c6e9b6355ded80455f38685b878eabdb76cd01b63f4aab96b2f98fdee1568162232c6a92772a SHA512 68beea38cb9e22e7ab503fb436209aabb049a61286fdc321a4feb96c47c8dae297185aa24248cf2c4ed76c8a1989fa2bff4c914cae7b74d85dee7f35afd5e3ed
+DIST seamonkey-2.53.15.source-l10n.tar.xz 13657060 BLAKE2B 128de12ad087be2f0c9f8e2622c837144bc2422f692f16babca7f69daf45432bb3ee547ec75cd3ddc1464818eb36ded09e6f3613a9d4f86b867328e4213e76f2 SHA512 91a3be1dfcd6c06953430afd2d07036c525b73e0132690575275430bca5ffe3082cb5c30df4cd921d961aa79333b6cefb6eace157fc65368254f4099ae879131
+DIST seamonkey-2.53.15.source.tar.xz 260787300 BLAKE2B 1efa2a0fd3e4b2fa4d264eb2f373ec1208d3009b69e907cafab216b539b69598948dd8646e4c6365caaf764a00d6212b870f23dfa33fe6fd87df757ff5f115f3 SHA512 f4735af98be0e27a935852de9d309317e1639a420189b0432cb7bdf9707bab706ceec65e96b94953a6e4285b4501dcd25745fb9250b8bf30845d2b855dcc8b13
 EBUILD seamonkey-2.53.14-r2.ebuild 16926 BLAKE2B ce5511071053cb37484f436e22b59079c930a854d7ff2d1060b704b7bcef83b3becd169fd20bd7ddc0f3a4b4a7ced72742c55fd3b6ce8645c9ab580fadac1c8e SHA512 2a1e9f8275f7e1f2380c35e588c6ac0dcc9273cd856739a2a9790770f02b27d9b7584a2013ed246235756d25740801ebdd195f7f32c4097b86a511b67404c359
+EBUILD seamonkey-2.53.15.ebuild 16591 BLAKE2B ee0c163e802681ea8e1a17b1ac13459e1716ee5862c70fefeed35e688b108549de7912e06157aad45a4e00efb89154487bbb73cb3d1242396a865d0af44c9957 SHA512 da729b27419f741ac54d77e1f2a327832710dbd11c7df7117c4fa4d57f98b7779758fc78679f2845d4beab9f98450e7f1d5834b7100c0ca34b9541daab022ee0
 MISC metadata.xml 2085 BLAKE2B bdc1da446f817a45f519f41f0eaba8c8437e81a1c4387cd94e168ed35548692b0b137e98a890cdd3cbb10fe3876820123fa22f64f69be8cb2fde31548184eca2 SHA512 50d64f3eba08f582c723328d7face922a67f62c08e3f23e719fe49092584e2e59e3e5e6a82e4b7bae6f9b05180f70e2e3cd5246315bd980a89207bb9172ed230
diff --git a/www-client/seamonkey/seamonkey-2.53.15.ebuild b/www-client/seamonkey/seamonkey-2.53.15.ebuild
new file mode 100644
index 000000000000..c3bf97fbf198
--- /dev/null
+++ b/www-client/seamonkey/seamonkey-2.53.15.ebuild
@@ -0,0 +1,539 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WANT_AUTOCONF="2.1"
+
+PYTHON_COMPAT=( python3_{9..10} )
+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_P="${P}"
+MY_MOZ_P="${PN}-${MOZ_PV}"
+PATCH="${P}-patches"
+
+if [[ ${PV} == *_pre* ]] ; then
+	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_pre}"
+else
+	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases/${MOZ_PV}"
+fi
+
+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
+	https://github.com/BioMike/gentoo-${PN}-patches/archive/refs/tags/${PV}.tar.gz -> ${PATCH}.tar.gz"
+
+S="${WORKDIR}/${MY_MOZ_P}"
+
+MOZ_GENERATE_LANGPACKS=1
+MOZ_L10N_SOURCEDIR="${S}/${P}-l10n"
+inherit autotools check-reqs desktop edos2unix flag-o-matic mozcoreconf-v6 mozlinguas-v2 pax-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="Seamonkey Web Browser"
+HOMEPAGE="https://www.seamonkey-project.org/"
+
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+SLOT="0"
+SYSTEM_IUSE=( +system-{av1,harfbuzz,icu,jpeg,libevent,libvpx,png,sqlite} )
+IUSE="+chatzilla cpu_flags_arm_neon dbus +gmp-autoupdate +ipc jack
+lto pulseaudio selinux startup-notification test webrtc wifi"
+IUSE+=" ${SYSTEM_IUSE[@]}"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-arch/unzip
+	app-arch/zip
+	>=dev-lang/nasm-2.13
+	dev-lang/perl
+	dev-util/cbindgen
+	>=sys-devel/binutils-2.16.1
+	virtual/pkgconfig
+	virtual/rust
+	amd64? ( >=dev-lang/yasm-1.1 )
+	lto? ( sys-devel/binutils[gold] )
+	x86? ( >=dev-lang/yasm-1.1 )
+"
+COMMON_DEPEND="
+	app-arch/bzip2
+	>=app-text/hunspell-1.5.4:=
+	dev-libs/atk
+	>=dev-libs/glib-2.26:2
+	>=dev-libs/libffi-3.0.10:=
+	>=dev-libs/nspr-4.23
+	>=dev-libs/nss-3.47.1
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	>=media-libs/mesa-10.2:=
+	>=sys-libs/zlib-1.2.3
+	>=x11-libs/cairo-1.10[X]
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3[X]
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/libxcb:=
+	>=x11-libs/pango-1.22.0
+	x11-libs/pixman
+	media-video/ffmpeg
+	virtual/freedesktop-icon-theme
+	dbus? (
+		>=dev-libs/dbus-glib-0.72
+		>=sys-apps/dbus-0.60
+	)
+	jack? ( virtual/jack )
+	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
+	pulseaudio? ( || (
+		media-sound/pulseaudio
+		>=media-sound/apulse-0.1.9
+	) )
+	startup-notification? ( >=x11-libs/startup-notification-0.8 )
+	system-av1? (
+		>=media-libs/dav1d-0.3.0:=
+		>=media-libs/libaom-1.0.0:=
+	)
+	system-harfbuzz? (
+		>=media-gfx/graphite2-1.3.9-r1
+		>=media-libs/harfbuzz-1.3.3:0=
+	)
+	system-icu? ( >=dev-libs/icu-59.1:= )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
+	system-libevent? ( >=dev-libs/libevent-2.0:0= )
+	system-libvpx? ( >=media-libs/libvpx-1.8.0:0=[postproc] )
+	system-png? ( >=media-libs/libpng-1.6.31:0=[apng] )
+	system-sqlite? ( >=dev-db/sqlite-3.38.2:3[secure-delete] )
+	wifi? (
+		kernel_linux? (
+			>=dev-libs/dbus-glib-0.72
+			net-misc/networkmanager
+			>=sys-apps/dbus-0.60
+		)
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	selinux? ( sec-policy/selinux-mozilla )
+"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+	amd64? ( virtual/opengl )
+	x86? ( virtual/opengl )
+"
+
+# allow GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+[[ -z ${GMP_PLUGIN_LIST} ]] && GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+
+BUILD_OBJ_DIR="${S}/seamonk"
+
+pkg_setup() {
+	if [[ ${PV} == *_beta* ]] || [[ ${PV} == *_pre* ]] ; then
+		ewarn
+		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 lto || use test ; then
+		CHECKREQS_DISK_BUILD="16G"
+	else
+		CHECKREQS_DISK_BUILD="12G"
+	fi
+	check-reqs_pkg_setup
+}
+
+spkg_setup() {
+	# Ensure we have enough disk space to compile
+	if use lto || use test ; then
+		CHECKREQS_DISK_BUILD="16G"
+	else
+		CHECKREQS_DISK_BUILD="12G"
+	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}"/gentoo-${PN}-patches-${PV}/${PN}
+
+	# 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
+
+	use system-libvpx && eapply -p2 "${WORKDIR}"/gentoo-${PN}-patches-${PV}/USE_flag/1009_seamonkey-2.53.3-system_libvpx-1.8.patch
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	# Fix wrong include, as suggested by SM upstream.
+	sed -e 's|#include \"RemoteSpellCheckEngineChild.h\"|#include \"mozilla/RemoteSpellCheckEngineChild.h\"|' \
+		-i extensions/spellcheck/src/mozSpellChecker.h || die
+
+	# Ensure that are plugins dir is enabled as default
+	sed -i -e "s:/usr/$(get_libdir)/mozilla/plugins:/usr/$(get_libdir)/${PN}/plugins:" \
+		xpcom/io/nsAppFileLocationProvider.cpp || die
+
+	# Don't exit with error when some libs are missing which we have in
+	# system.
+	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
+		-i comm/suite/installer/Makefile.in || die
+	# Don't error out when there's no files to be removed:
+	sed 's@\(xargs rm\)$@\1 -f@' \
+		-i 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 comm/suite/locales/Makefile.in || die
+	fi
+
+	eautoreconf old-configure.in
+	cd js/src || die
+	eautoconf old-configure.in
+}
+
+src_configure() {
+	# 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
+
+	##################################
+	# Former mozconfig_config() part #
+	##################################
+
+	# Migrated from mozcoreconf-2
+	mozconfig_annotate 'system_libs' --with-system-bz2
+	mozconfig_annotate 'system_libs' --with-system-zlib
+	mozconfig_annotate 'system_libs' --enable-system-pixman
+
+	# Disable for testing purposes only
+	mozconfig_annotate 'Upstream bug 1341234' --disable-stylo
+
+	# Must pass release in order to properly select linker via gold useflag
+	mozconfig_annotate 'Enable by Gentoo' --enable-release
+
+	# Broken on PPC64, but outdated and should not be used according to upstream.
+	mozconfig_annotate 'Outdated and broken, disabled' --disable-jemalloc
+
+	# Must pass --enable-gold if using ld.gold
+	if tc-ld-is-gold ; then
+		mozconfig_annotate 'tc-ld-is-gold=true' --enable-gold
+	else
+		mozconfig_annotate 'tc-ld-is-gold=false' --disable-gold
+	fi
+
+	# Enable position independent executables
+	mozconfig_annotate 'enabled by Gentoo' --enable-pie
+
+	# Debug is broken, disable debug symbols
+	mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
+
+	mozconfig_use_enable startup-notification
+
+	# wifi pulls in dbus so manage both here
+	mozconfig_use_enable wifi necko-wifi
+	if use kernel_linux && use wifi && ! use dbus ; then
+		echo "Enabling dbus support due to wifi request"
+		mozconfig_annotate 'dbus required by necko-wifi on linux' --enable-dbus
+	else
+		mozconfig_use_enable dbus
+		mozconfig_annotate 'disabled' --disable-necko-wifi
+	fi
+
+	# These are enabled by default in all mozilla applications
+	mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${ESYSROOT}"/usr
+	mozconfig_annotate '' --with-system-nss --with-nss-prefix="${ESYSROOT}"/usr
+	mozconfig_annotate '' --x-includes="${ESYSROOT}"/usr/include --x-libraries="${ESYSROOT}"/usr/$(get_libdir)
+	if use system-libevent ; then
+		mozconfig_annotate '' --with-system-libevent="${ESYSROOT}"/usr
+	fi
+	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
+	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
+	mozconfig_annotate 'Gentoo default' --enable-system-hunspell
+	mozconfig_annotate '' --disable-crashreporter
+	mozconfig_annotate '' --enable-system-ffi
+	mozconfig_annotate '' --disable-gconf
+	mozconfig_annotate '' --with-intl-api
+
+	# default toolkit is cairo-gtk3, optional use flags can change this
+	mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3
+
+	# Instead of the standard --build= and --host=, mozilla uses --host instead
+	# of --build, and --target intstead of --host.
+	# Note, mozilla also has --build but it does not do what you think it does.
+	# Set both --target and --host as mozilla uses python to guess values otherwise
+	mozconfig_annotate '' --target="${CHOST}"
+	mozconfig_annotate '' --host="${CBUILD:-${CHOST}}"
+
+	mozconfig_use_enable pulseaudio
+	# force the deprecated alsa sound code if pulseaudio is disabled
+	if use kernel_linux && ! use pulseaudio ; then
+		mozconfig_annotate '-pulseaudio' --enable-alsa
+	fi
+
+	# For testing purpose only
+	mozconfig_annotate 'Sandbox' --enable-content-sandbox
+
+	mozconfig_use_enable system-sqlite
+	mozconfig_use_with system-jpeg
+	mozconfig_use_with system-icu
+	mozconfig_use_with system-libvpx
+	mozconfig_use_with system-png
+	mozconfig_use_with system-harfbuzz
+	mozconfig_use_with system-harfbuzz system-graphite2
+	mozconfig_use_with system-av1
+
+	# Modifications to better support ARM, bug 553364
+	if use cpu_flags_arm_neon ; then
+		mozconfig_annotate '' --with-fpu=neon
+		mozconfig_annotate '' --with-thumb=yes
+		mozconfig_annotate '' --with-thumb-interwork=no
+	fi
+	if [[ ${CHOST} == armv* ]] ; then
+		mozconfig_annotate '' --with-float-abi=hard
+		if ! use system-libvpx ; then
+			sed -i -e "s|softfp|hard|" media/libvpx/moz.build || die
+		fi
+	fi
+
+	if use lto ; then
+		# Linking only works when using ld.gold when LTO is enabled
+		mozconfig_annotate "forcing ld=gold due to USE=lto" --enable-linker=gold
+		# ThinLTO is currently broken, see bmo#1644409
+		mozconfig_annotate '+lto' --enable-lto=full
+	else
+		if tc-ld-is-gold ; then
+			mozconfig_annotate "linker is set to gold" --enable-linker=gold
+		else
+			mozconfig_annotate "linker is set to bfd" --enable-linker=bfd
+		fi
+	fi
+	# LTO flag was handled via configure
+	filter-flags '-flto*'
+
+	##################################
+	# Former mozconfig_config() end  #
+	##################################
+
+	# enable JACK, bug 600002
+	mozconfig_use_enable jack
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Linking fails without this due to memory exhaustion
+	use x86 && append-ldflags "-Wl,--no-keep-memory"
+
+	# Setup api key for location services
+	printf '%s' "${_google_api_key}" > "${S}"/google-api-key
+	mozconfig_annotate '' --with-google-location-service-api-keyfile="${S}/google-api-key"
+	mozconfig_annotate '' --with-google-safebrowsing-api-keyfile="${S}/google-api-key"
+
+	mozconfig_use_enable chatzilla irc
+	mozconfig_annotate '' --enable-dominspector
+
+	# use startup-cache for faster startup time
+	mozconfig_annotate '' --enable-startupcache
+
+	# Elf-hack is known to be broken on multiple archs.
+	# Disable it by default, because on the archs that still work,
+	# it also gives more problems than it solves.
+	# https://bugs.gentoo.org/851933
+	# https://bugzilla.mozilla.org/show_bug.cgi?id=1706264
+	if use x86 || use arm64 || use arm || use amd64 ; then
+		mozconfig_annotate 'elf-hack is broken' --disable-elf-hack
+	fi
+
+	# Disabled by default. See bug 836319 , comment 17.
+	if ! use webrtc ; then
+	    mozconfig_annotate "disabled by Gentoo" --disable-webrtc
+	fi
+
+	# Use an objdir to keep things organized.
+	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig || die
+	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig || die
+
+	mozlinguas_mozconfig
+
+	# Finalize and report settings
+	mozconfig_final
+
+	# Work around breakage in makeopts with --no-print-directory
+	MAKEOPTS="${MAKEOPTS/--no-print-directory/}"
+
+	if use amd64 || use x86 ; then
+		append-flags -mno-avx
+	fi
+
+	# Pass $MAKEOPTS to build system
+	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
+	# Use system's Python environment
+	export MACH_USE_SYSTEM_PYTHON=1
+	# Disable notification when build system has finished
+	export MOZ_NOSPAM=1
+
+	# workaround for funky/broken upstream configure...
+	export SHELL="${SHELL:-${EPREFIX}/bin/bash}"
+	#emake V=1 -f client.mk configure
+	./mach configure || die
+}
+
+src_compile() {
+	#MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
+	#emake V=1 -f client.mk
+	./mach build --verbose || die
+
+	mozlinguas_src_compile
+}
+
+src_install() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	DICTPATH="\"${EPREFIX}/usr/share/myspell\""
+
+	local emid
+	pushd "${BUILD_OBJ_DIR}" &>/dev/null || die
+
+	# Pax mark xpcshell for hardened support, only used for startupcache creation.
+	pax-mark m dist/bin/xpcshell
+
+	# Copy our preference before omnijar is created.
+	sed "s|SEAMONKEY_PVR|${PVR}|" "${FILESDIR}"/all-gentoo-1.js > \
+		dist/bin/defaults/pref/all-gentoo.js \
+		|| die
+
+	# Set default path to search for dictionaries.
+	echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
+		>> dist/bin/defaults/pref/all-gentoo.js \
+		|| die
+
+	echo 'pref("extensions.autoDisableScopes", 3);' >> \
+		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);" >> \
+				dist/bin/defaults/pref/all-gentoo.js || die
+		done
+	fi
+
+	popd &>/dev/null || die
+
+	#MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
+	#emake DESTDIR="${D}" install
+	DESTDIR="${D}" ./mach install || die
+	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;|' \
+		-i "${T}"/${PN}.desktop || die
+	sed 's|^\(Categories=.*\)$|\1Email;|' -i "${T}"/${PN}.desktop \
+		|| die
+
+	# Install icon and .desktop for menu entry
+	newicon "${S}"/comm/suite/branding/${PN}/default64.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 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}/extensions/${emid}.xpi ]] ; then
+			rm -f "${ED}"/${MOZILLA_FIVE_HOME}/extensions/${emid}.xpi || die
+		fi
+
+		# merge the extra locales into the main extension
+		mozlinguas_xpistage_langpacks dist/xpi-stage/chatzilla
+
+		# install the merged extension
+		mkdir -p "${T}/${emid}" || die
+		cp -RLp -t "${T}/${emid}" dist/xpi-stage/chatzilla/* || die
+		insinto ${MOZILLA_FIVE_HOME}/extensions
+		doins -r "${T}/${emid}"
+	fi
+
+	# Provide a place for plugins
+	keepdir "${MOZILLA_FIVE_HOME}/plugins"
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}*" >> "${T}"/11${PN} || die
+	doins "${T}"/11${PN}
+}
+
+pkg_preinst() {
+	SEAMONKEY_PLUGINS_DIR="${EROOT}/usr/$(get_libdir)/${PN}/plugins"
+
+	if [[ -L "${SEAMONKEY_PLUGINS_DIR}" ]] ; then
+		rm "${SEAMONKEY_PLUGINS_DIR}" || die
+	fi
+}
+
+pkg_postinst() {
+	# 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
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}