gentoo resync : 25.11.2020

6 files changed, 104 insertions, 103 deletions

diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index c38fac7c6bd6..3490c35fa1b2 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -1,17 +1,18 @@
 AUX all-gentoo-1.js 1008 BLAKE2B 50418db37f55b9b9e53049abb95af79a5ee5137df9aab3ef6d1791e51a0c2f35d78b390982c5c20f4a57acebfaa013139276d0343cd4733a925510c8a5567c69 SHA512 5d1c9331db3c988f79be7756b57254bb3d2cb56cf10c7e79878d9968f882713cdcca0013d3507c4d69fcc7e99164a27b05ffbbb5ce78ee86b91ecce366a997c4
 AUX seamonkey-2.53.2-sysctl.patch 465 BLAKE2B 6b0bf4f97b6f603d196a8a34c77820389719e9ba300837d5fc826b001794571fb0dada62a85241d99ab84de7ef1cefa3593a2f184101e1f63202a6b766fc7d8c SHA512 3c7b2ee7896f66f370996ee7ccd6961a17c0e1748bde7b0f7bfc1acfaba3ea9c4de6b9980aa4bb83a21961d0e7b3972bf8a96e47e147432c676ede70ba23a399
-AUX seamonkey-2.53.3-rust-1.45.0.patch 863 BLAKE2B 80a4aceecdfe47adfcc0c632dcf87ed0f2d111103bd825d36981bca30980ce8655ef1bc07bfcd251f0190168c45bf19e24b34ff9ef58d54738092e4f7c86760e SHA512 d3df83cf19c84652559fa24dea8b251c8459e79a6d745a7b1bac5c27b4aa14b8da5a62c0af72b0fedf78f1c63173e74e642e4d4707f4ed253b2020e3eec0e81b
 AUX seamonkey.desktop 307 BLAKE2B 81aaa9a69dc60ae0872ebdfe796d3a6afbd4bd15c1c83c14abc06579c15bed2e48114e3fb374bab0ba7d9d4de28109b215601a2d6bd56af3aa9e82a4d0baaa91 SHA512 081d8ec12e9e2035fc8020238803ab9df98dac4350ce90a29e9e65a38efa13bb14cba0fbc2e68a2a857c5046142c68ecc8ab4535da4f284c0e04a3879afc429f
-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
 DIST seamonkey-2.53.3-system_libvpx-1.8.patch.xz 3128 BLAKE2B f73802d2715a11964a4b4d34b582a2999ab42cff9ed005c5ca8c002ae745a973fbb682c3e568f6727a7fe93dc2d7a5ba3367adc4e1d256b8ab0cf8d940fceb8a SHA512 80b87c260445af181d1a0d39de9f95ac7c93f76e12328c1799e8607f50ca9e2a20bc4f15de3f32efbbabb444fd5352612b2629fee61875fa0acd6d050df338a2
-DIST seamonkey-2.53.3.source-l10n.tar.xz 12086368 BLAKE2B 29901a62bdd65b4e49419ae65687fcff35de87d3b1d80df5d6914f9276b00b323e07fd521b2636320c5a8da0b3d42eea623df45de6c2beed8ac68d5baf8ed7a4 SHA512 4431d716cb4fc2a57dbc44aeefe52c3e0f7dad989b2c057692702eed764f1021a2c81ff86279231cad533810abc2917fab9c637e039d843a4502f73bb6f57830
-DIST seamonkey-2.53.3.source.tar.xz 294208732 BLAKE2B 459c31859e7a91eaddf6dfd6f3e84f57ef3b686dd2868413fbda5e05c7a84d49ffad631531840dd25236075be2ab8bd84e1bdbe836b7667e036ca9bbdb62a5f6 SHA512 f9465fdf3925d517d8b5dd9d4dd5162b50f39e5a35f61383f4dec89784b5fc4273724195ae98abe30bfb6458ab615f6ac9dcd3a233e7add211fbfdaad0ff5328
 DIST seamonkey-2.53.4.source-l10n.tar.xz 12110188 BLAKE2B 6bf25f25bd72e35252824221d6ecf43f910cae65e21e2e15b628d9340256a3196b11a20522ce6284cee28a92141907ddcd5366427c356e57fb1a0015a064a2c2 SHA512 a5ac165412d3391206b7bcb2e7112693ce272e47e6cd2da321a60f52799fb04ac0d1ea84fb535ba73ef8d9faf5d582b314d2890768fd440136c830f3c88777cd
 DIST seamonkey-2.53.4.source.tar.xz 294513316 BLAKE2B 79425b0d15f99e30bd70871c28636ed8c567703b7048a46534fa971debbfeb90dd05880feca49354cb818c4a127cbc1f3ff17729784f90de91ba82db6da5fa59 SHA512 3450d6251f309bee96aa792cdce66b946d841089e0031ccbcf606845b1e0c951d58a8117a9e61e2d2435c1df614110944e5eac7ae9bd08429146bfe7334137fb
 DIST seamonkey-2.53.4_beta1-patches-01.tar.xz 39676 BLAKE2B de7742e6c286ca21403d003e22e3eba56e4d59c3f628c9768b47bac148abefbabfcd0510c89cc319c29e0775e316922c680d3de3dbfc542cae4f1f4942773124 SHA512 e97d6de074041f17cfe935995ce7116dee4249dc736315c82ed3878a92189d09542f141f65499ecdfd8621638d130b6d5786ab6033f3f794a805e136acefec3d
-EBUILD seamonkey-2.53.2.ebuild 16112 BLAKE2B 64747f0c98ef23afcea4325c81126b661c68cfd96a24625650cb0367b363fadcdbd44d47aeeddbde5068bfb65357d60ad360131f242b869c9e153bab2c2b4105 SHA512 8b48733f06bc03d2f3ee53ce6720cd369c272532346170af11c972830fd6dc51f18090964c308c942d4ce3f65e24bb0deb959b4a83430bf2ba1a6b5db73c84f0
-EBUILD seamonkey-2.53.3.ebuild 16421 BLAKE2B fa516b2c6e6e34572197957454a157d1a390693b2e9ed8ca2663ee631c0352bb06272516a945c95bf766c3f22197224a3e433d0d96bdb236e689a19429006cd4 SHA512 4feb9eac17035364393d45631179c81a79007b96380e07e2318eac68132d4d788c0b880f7e066cf7f712327035a7b51e97e23020b3e13ceaa7f158f826dace5d
-EBUILD seamonkey-2.53.4.ebuild 16360 BLAKE2B 1b24570296ff33e09688045ca21d52f48dbd92ccf9110117f0aec561644d9b297541682da1bcfe3f73a2e282091cd19968587becb4c06a6e0c5a1b44141e6288 SHA512 8a31ca02344deb8e406f8a377b58365b27e2ba2cd7a224e8e8f94bc5d25cd570bffa5ccd7fdc25e538d5c470ddd8b2daa4aa93a72008475274b4405bce06d799
-MISC metadata.xml 1762 BLAKE2B dde9738ba4c4b065806ce8d7eafe14a3def18c30cc32f78967ef015441a7c594e3776a202e289b6879aedc02314d8e000d5e35800e490ddb8446ae29b4d6be68 SHA512 9caf3a4ea297a544452a64bf73659d6ac005d400047d260cfa521bba157e63fc5cd9b74b6786a2553e0ff2b67e59a9a8598486be2815703ed7197601b9d470e2
+DIST seamonkey-2.53.5.1-rust148-packed_simd.patch 45781 BLAKE2B f028f56c68d03ee5231457dd233fe046cae7170d808a3db1c27a7c11f5cc97539df22ab1c05f305fed918d0a8a9ad2be53a9972b42607811ea2e60e3b56d6015 SHA512 74eec456b7aa872d682962b7585f74705b4ad4cbd27cfa11f5c6c2dfef303706dac414e72df882ba106df31305db79ff73158cdeba960bf74cad962e02fa3931
+DIST seamonkey-2.53.5.1.source-l10n.tar.xz 12108000 BLAKE2B f8e3b3bcdadf92decaa2cffacac937a6c219017a205385136e98fa6fa13d5176dc000ee00ac910951d1e623c82241b1ed3d0b0b6754c5c5e0d2cf315c9bd097a SHA512 6532465d0ffbe2f36e5db0b54a801bf3b5d5481a1f39933620bea641e7faf8fcc0a04f5ff1e72272f119954835663e6d1fdb3d0595468a2fbb336b71d0290ce6
+DIST seamonkey-2.53.5.1.source.tar.xz 285624492 BLAKE2B 1785872f9b5e3fdd92cc9d9b53f503e923451af116cc8c0581b6e61cf542d8fff7a4139f57c6d3db55865caa2f1292eaaa8125fe05ca1e18cc0ee02376c5644a SHA512 6ee8a1c5b81ede02cabcfc7b650805bab661b2898fd0f6d7c0ae1f99da19930efb69f25ce7374888cac6333e669ec79d72705fec69cfe617054b9daacd31297c
+DIST seamonkey-2.53.5.source-l10n.tar.xz 12108000 BLAKE2B f8e3b3bcdadf92decaa2cffacac937a6c219017a205385136e98fa6fa13d5176dc000ee00ac910951d1e623c82241b1ed3d0b0b6754c5c5e0d2cf315c9bd097a SHA512 6532465d0ffbe2f36e5db0b54a801bf3b5d5481a1f39933620bea641e7faf8fcc0a04f5ff1e72272f119954835663e6d1fdb3d0595468a2fbb336b71d0290ce6
+DIST seamonkey-2.53.5.source.tar.xz 285387556 BLAKE2B 34f0a0b24f15f13bd8b7975a863a9351e2d29494bc374f5d525d3c2720a834fe328320aaea88556abb76e6b131c756a107c3ee9275c2a65da582a6beecdc94f8 SHA512 d2722a8864bcdb58851447802576877198e1b71a76a0be04df9ccabd449bdbdd200402ca10041bcab21eca757edc8e6a1c3dc7ec3244cca119f2d1c8979d3a9b
+DIST seamonkey-2.53.5_beta1-patches-02.tar.xz 44096 BLAKE2B e0c31af11b3bf88f572703403f186bda71af0c26cd52a99b773dfd765961c430f2d516bba266871b28e5848d5c0f9e9df1a074b05f4b5da7323fd9042c25054e SHA512 434e4cad74d659f46a051207bf43087ad780e40c29b465a9c4c8e7366e9d8b197da20e5ffbafadb8ddb3f1754ad81b75f3d7a899adadd3bb8a7b83e501cfaf9a
+DIST seamonkey-2.53.5_beta1-perf-guide_checksum.patch 40647 BLAKE2B e94e892e5b696a57087a91060c79de649bd0bc053ad5d9158017870e37b3b478e5e30cace2fb07c72d6e29954c7678dcfea7f2039369c78a390b6e29d7419d07 SHA512 1f77ca1109d454db3065fe0af7ad87f7bc69995ec9f4141858746019623608f09f3c30510bd5a1a9123cafdaa328fdbc98750875daa727a98590cb0537343b51
+EBUILD seamonkey-2.53.4.ebuild 16358 BLAKE2B 1161161dc7dff0a25d2aed4db14f37d11f597762e331a9ae0cda7ef2c0ea7f34b0355597709cbf173ae1a3ffb5092aa7142046dd7bfcd768119386073270c276 SHA512 a09ae794c9e4d54f207d959973177675e2b88c976b0915cc3472ad7efbd83793520618d2f3eb6866c83f67adaadcf601f7713dc7b397fd78f42f430e1612bb2b
+EBUILD seamonkey-2.53.5.1.ebuild 16676 BLAKE2B 7a2c5d288dc388d35ec8a8b481d76c93e04676682e1dee78eeea2fe9594e196be63b3e177c82a3b53d705ed5fbc8aa9cc754732f24c8b1b63fd7ada637e0790e SHA512 8029da2f784304981eadd3dc66a4a278d943a36336792dc0cf5eb2c33c69010b74af198fb7abbea998d9135841d2372d8bf641869b86c97675735dd5ec723cda
+EBUILD seamonkey-2.53.5.ebuild 16684 BLAKE2B 51b990b4745c2e0bc7886edf133a59f47d56915604da3d5b45f03dc58d3ed35cc1255c5d536f3f716e9974fda5c882559e4444ffecddb8ef5694a3bc70b2479f SHA512 4d1ced80caa86c6b2eb94c0134a34d72b47f441094e3dd2d976cc8ced4bdcdbed12a4bc1d8b384527d07ba7913fadb0400ff39c1a1ec7b07e8d6e37ab6a0627f
+MISC metadata.xml 1903 BLAKE2B 24d0d1914eb2965b065dca44093fd7162a735190082874f1230f090ba1f5c7728531a5e5c5bbec6e23036d51a1d71fc0d95d19ebca3fd68e82261e981b7fe402 SHA512 98c0c07a83d496ff6ab274787d6d76379fbfdd352bb58177f20dc53055ef6d426819cf67860b5e6d57941c9cd3d6f439365d135c7235cecb8d654733b0bb2799
diff --git a/www-client/seamonkey/files/seamonkey-2.53.3-rust-1.45.0.patch b/www-client/seamonkey/files/seamonkey-2.53.3-rust-1.45.0.patch
deleted file mode 100644
index 8aee245ef18f..000000000000
--- a/www-client/seamonkey/files/seamonkey-2.53.3-rust-1.45.0.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/mozilla/config/rules.mk
-+++ b/mozilla/config/rules.mk
-@@ -870,16 +870,20 @@ endif
- 
- # These flags are passed via `cargo rustc` and only apply to the final rustc
- # invocation (i.e., only the top-level crate, not its dependencies).
- cargo_rustc_flags = $(CARGO_RUSTCFLAGS)
- ifndef DEVELOPER_OPTIONS
- ifndef MOZ_DEBUG_RUST
- # Enable link-time optimization for release builds.
- cargo_rustc_flags += -C lto
-+# Versions of rust >= 1.45 need -Cembed-bitcode=yes for all crates when using -Clto.
-+ifeq (,$(filter 1.3% 1.40.% 1.41.% 1.42.% 1.43.% 1.44.%,$(RUSTC_VERSION)))
-+RUSTFLAGS += -Cembed-bitcode=yes
-+endif
- endif
- endif
- 
- rustflags_override = RUSTFLAGS='$(MOZ_RUST_DEFAULT_FLAGS) $(RUSTFLAGS)'
- 
- ifdef MOZ_MSVCBITS
- # If we are building a MozillaBuild shell, we want to clear out the
- # vcvars.bat environment variables for cargo builds. This is because
diff --git a/www-client/seamonkey/metadata.xml b/www-client/seamonkey/metadata.xml
index eaa0d9c3da6a..1d714b2e631f 100644
--- a/www-client/seamonkey/metadata.xml
+++ b/www-client/seamonkey/metadata.xml
@@ -16,6 +16,7 @@
 		<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="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-av1">Use the system-wide <pkg>media-libs/dav1d</pkg> and <pkg>media-libs/libaom</pkg> library 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>
diff --git a/www-client/seamonkey/seamonkey-2.53.4.ebuild b/www-client/seamonkey/seamonkey-2.53.4.ebuild
index 5952eb2130de..ccb1e27b3bd4 100644
--- a/www-client/seamonkey/seamonkey-2.53.4.ebuild
+++ b/www-client/seamonkey/seamonkey-2.53.4.ebuild
@@ -39,7 +39,7 @@ PATCH="${PN}-2.53.4_beta1-patches-01"
 
 DESCRIPTION="Seamonkey Web Browser"
 HOMEPAGE="http://www.seamonkey-project.org"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
diff --git a/www-client/seamonkey/seamonkey-2.53.3.ebuild b/www-client/seamonkey/seamonkey-2.53.5.1.ebuild
index d7475ba27e0f..4f900ed860ae 100644
--- a/www-client/seamonkey/seamonkey-2.53.3.ebuild
+++ b/www-client/seamonkey/seamonkey-2.53.5.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 WANT_AUTOCONF="2.1"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
 
 # This list can be updated with scripts/get_langs.sh from the mozilla overlay
@@ -18,7 +18,6 @@ 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}"
 
@@ -36,7 +35,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.2-patches-01"
+PATCH="${PN}-2.53.5_beta1-patches-02"
 
 DESCRIPTION="Seamonkey Web Browser"
 HOMEPAGE="http://www.seamonkey-project.org"
@@ -44,19 +43,38 @@ KEYWORDS="~amd64 ~ppc64 ~x86"
 
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+SYSTEM_IUSE=( +system-{av1,harfbuzz,icu,jpeg,libevent,sqlite,libvpx} )
 IUSE="+calendar +chatzilla +crypt dbus debug +gmp-autoupdate +ipc jack minimal
-neon pulseaudio +roaming selinux startup-notification system-harfbuzz system-icu
-system-jpeg system-libevent system-sqlite system-libvpx test wifi"
+neon pulseaudio +roaming selinux startup-notification ${SYSTEM_IUSE[@]} test
+wifi"
 RESTRICT="!test? ( test )"
 
 SRC_URI+="
 	https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz
+	https://dev.gentoo.org/~polynomial-c/mozilla/${PN}-2.53.5.1-rust148-packed_simd.patch
 	system-libvpx? ( https://dev.gentoo.org/~polynomial-c/mozilla/${PN}-2.53.3-system_libvpx-1.8.patch.xz )
 "
 
 ASM_DEPEND=">=dev-lang/yasm-1.1"
 
+# Convert to BDEPEND once the ebuild goes EAPI-7
 DEPEND="
+	app-arch/unzip
+	app-arch/zip
+	dev-lang/perl
+	sys-apps/findutils
+	>=sys-devel/binutils-2.16.1
+	virtual/pkgconfig
+	>=virtual/rust-1.34.0
+	amd64? (
+		${ASM_DEPEND}
+	)
+	x86? (
+		${ASM_DEPEND}
+	)
+"
+
+CDEPEND="
 	>=app-text/hunspell-1.5.4:=
 	dev-libs/atk
 	>=dev-libs/glib-2.26:2
@@ -95,6 +113,10 @@ DEPEND="
 		>=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=
@@ -113,38 +135,24 @@ DEPEND="
 	)
 "
 RDEPEND="
-	${DEPEND}
+	${CDEPEND}
 	selinux? ( sec-policy/selinux-mozilla )
 "
-# Convert to BDEPEND once the ebuild goes EAPI-7
-DEPEND+="
-	app-arch/unzip
-	app-arch/zip
-	dev-lang/perl
-	sys-apps/findutils
-	>=sys-devel/binutils-2.16.1
-	virtual/pkgconfig
-	>=virtual/rust-1.34.0
-	amd64? (
-		${ASM_DEPEND}
-		virtual/opengl
-	)
-	x86? (
-		${ASM_DEPEND}
-		virtual/opengl
-	)
+DEPEND+="${CDEPEND}
+	amd64? ( virtual/opengl )
+	x86? ( 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
+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
+	if [[ ${PV} == *_beta* ]] || [[ ${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"
@@ -176,11 +184,11 @@ src_prepare() {
 	# Apply our patches
 	eapply "${WORKDIR}"/seamonkey
 
-	rm "${WORKDIR}/firefox/2005_rust-1.33.0-missing-docs.patch" || die
-
+	rm "${WORKDIR}"/firefox/4000_sysctl.patch || die
 	# browser patches go here
 	pushd "${S}"/mozilla &>/dev/null || die
 	eapply "${WORKDIR}"/firefox
+	eapply "${DISTDIR}"/${PN}-2.53.5.1-rust148-packed_simd.patch
 	popd &>/dev/null || die
 
 	# Shell scripts sometimes contain DOS line endings; bug 391889
@@ -190,7 +198,6 @@ src_prepare() {
 		edos2unix "${file}"
 	done
 
-	eapply "${FILESDIR}/${PN}-2.53.3-rust-1.45.0.patch"
 	use system-libvpx && eapply "${WORKDIR}/${PN}-2.53.3-system_libvpx-1.8.patch"
 
 	# Allow user to apply any additional patches without modifing ebuild
@@ -295,14 +302,14 @@ src_configure() {
 	fi
 
 	# These are enabled by default in all mozilla applications
-	mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${SYSROOT}${EPREFIX}"/usr
-	mozconfig_annotate '' --with-system-nss --with-nss-prefix="${SYSROOT}${EPREFIX}"/usr
-	mozconfig_annotate '' --x-includes="${SYSROOT}${EPREFIX}"/usr/include --x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir)
+	mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${SYSROOT}${EPREFIX%/}"/usr
+	mozconfig_annotate '' --with-system-nss --with-nss-prefix="${SYSROOT}${EPREFIX%/}"/usr
+	mozconfig_annotate '' --x-includes="${SYSROOT}${EPREFIX%/}"/usr/include --x-libraries="${SYSROOT}${EPREFIX%/}"/usr/$(get_libdir)
 	if use system-libevent ; then
-		mozconfig_annotate '' --with-system-libevent="${SYSROOT}${EPREFIX}"/usr
+		mozconfig_annotate '' --with-system-libevent="${SYSROOT}${EPREFIX%/}"/usr
 	fi
-	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
-	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
+	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 'Gentoo default' --with-system-png
@@ -342,6 +349,7 @@ src_configure() {
 	mozconfig_use_with system-libvpx
 	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 neon ; then
@@ -426,7 +434,7 @@ src_compile() {
 
 src_install() {
 	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	DICTPATH="\"${EPREFIX}/usr/share/myspell\""
+	DICTPATH="\"${EPREFIX%/}/usr/share/myspell\""
 
 	local emid
 	cd "${BUILD_OBJ_DIR}" || die
diff --git a/www-client/seamonkey/seamonkey-2.53.2.ebuild b/www-client/seamonkey/seamonkey-2.53.5.ebuild
index d958570cb1e7..4043d78b6ead 100644
--- a/www-client/seamonkey/seamonkey-2.53.2.ebuild
+++ b/www-client/seamonkey/seamonkey-2.53.5.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 WANT_AUTOCONF="2.1"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
 
 # This list can be updated with scripts/get_langs.sh from the mozilla overlay
@@ -18,7 +18,6 @@ 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}"
 
@@ -36,26 +35,46 @@ 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.2-patches-01"
+PATCH="${PN}-2.53.5_beta1-patches-02"
 
 DESCRIPTION="Seamonkey Web Browser"
 HOMEPAGE="http://www.seamonkey-project.org"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+SYSTEM_IUSE=( +system-{av1,harfbuzz,icu,jpeg,libevent,sqlite,libvpx} )
 IUSE="+calendar +chatzilla +crypt dbus debug +gmp-autoupdate +ipc jack minimal
-neon pulseaudio +roaming selinux startup-notification system-harfbuzz system-icu
-system-jpeg system-libevent system-sqlite system-libvpx test wifi"
+neon pulseaudio +roaming selinux startup-notification ${SYSTEM_IUSE[@]} test
+wifi"
 RESTRICT="!test? ( test )"
 
 SRC_URI+="
 	https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz
+	https://dev.gentoo.org/~polynomial-c/mozilla/${PN}-2.53.5_beta1-perf-guide_checksum.patch
+	system-libvpx? ( https://dev.gentoo.org/~polynomial-c/mozilla/${PN}-2.53.3-system_libvpx-1.8.patch.xz )
 "
 
 ASM_DEPEND=">=dev-lang/yasm-1.1"
 
+# Convert to BDEPEND once the ebuild goes EAPI-7
 DEPEND="
+	app-arch/unzip
+	app-arch/zip
+	dev-lang/perl
+	sys-apps/findutils
+	>=sys-devel/binutils-2.16.1
+	virtual/pkgconfig
+	>=virtual/rust-1.34.0
+	amd64? (
+		${ASM_DEPEND}
+	)
+	x86? (
+		${ASM_DEPEND}
+	)
+"
+
+CDEPEND="
 	>=app-text/hunspell-1.5.4:=
 	dev-libs/atk
 	>=dev-libs/glib-2.26:2
@@ -94,6 +113,10 @@ DEPEND="
 		>=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=
@@ -101,7 +124,7 @@ DEPEND="
 	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.5.0:0=[postproc] )
+	system-libvpx? ( >=media-libs/libvpx-1.8.0:0=[postproc] )
 	system-sqlite? ( >=dev-db/sqlite-3.19.3:3[secure-delete,debug=] )
 	wifi? (
 		kernel_linux? (
@@ -112,38 +135,24 @@ DEPEND="
 	)
 "
 RDEPEND="
-	${DEPEND}
+	${CDEPEND}
 	selinux? ( sec-policy/selinux-mozilla )
 "
-# Convert to BDEPEND once the ebuild goes EAPI-7
-DEPEND+="
-	app-arch/unzip
-	app-arch/zip
-	dev-lang/perl
-	sys-apps/findutils
-	>=sys-devel/binutils-2.16.1
-	virtual/pkgconfig
-	>=virtual/rust-1.34.0
-	amd64? (
-		${ASM_DEPEND}
-		virtual/opengl
-	)
-	x86? (
-		${ASM_DEPEND}
-		virtual/opengl
-	)
+DEPEND+="${CDEPEND}
+	amd64? ( virtual/opengl )
+	x86? ( 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
+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
+	if [[ ${PV} == *_beta* ]] || [[ ${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"
@@ -175,6 +184,7 @@ src_prepare() {
 	# Apply our patches
 	eapply "${WORKDIR}"/seamonkey
 
+	rm "${WORKDIR}"/firefox/4000_sysctl.patch || die
 	# browser patches go here
 	pushd "${S}"/mozilla &>/dev/null || die
 	eapply "${WORKDIR}"/firefox
@@ -187,6 +197,9 @@ src_prepare() {
 		edos2unix "${file}"
 	done
 
+	use system-libvpx && eapply "${WORKDIR}/${PN}-2.53.3-system_libvpx-1.8.patch"
+	eapply "${DISTDIR}/${PN}-2.53.5_beta1-perf-guide_checksum.patch"
+
 	# Allow user to apply any additional patches without modifing ebuild
 	eapply_user
 
@@ -289,14 +302,14 @@ src_configure() {
 	fi
 
 	# These are enabled by default in all mozilla applications
-	mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${SYSROOT}${EPREFIX}"/usr
-	mozconfig_annotate '' --with-system-nss --with-nss-prefix="${SYSROOT}${EPREFIX}"/usr
-	mozconfig_annotate '' --x-includes="${SYSROOT}${EPREFIX}"/usr/include --x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir)
+	mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${SYSROOT}${EPREFIX%/}"/usr
+	mozconfig_annotate '' --with-system-nss --with-nss-prefix="${SYSROOT}${EPREFIX%/}"/usr
+	mozconfig_annotate '' --x-includes="${SYSROOT}${EPREFIX%/}"/usr/include --x-libraries="${SYSROOT}${EPREFIX%/}"/usr/$(get_libdir)
 	if use system-libevent ; then
-		mozconfig_annotate '' --with-system-libevent="${SYSROOT}${EPREFIX}"/usr
+		mozconfig_annotate '' --with-system-libevent="${SYSROOT}${EPREFIX%/}"/usr
 	fi
-	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
-	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
+	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 'Gentoo default' --with-system-png
@@ -336,6 +349,7 @@ src_configure() {
 	mozconfig_use_with system-libvpx
 	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 neon ; then
@@ -420,7 +434,7 @@ src_compile() {
 
 src_install() {
 	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	DICTPATH="\"${EPREFIX}/usr/share/myspell\""
+	DICTPATH="\"${EPREFIX%/}/usr/share/myspell\""
 
 	local emid
 	cd "${BUILD_OBJ_DIR}" || die