gentoo resync : 25.08.2020

3 files changed, 33 insertions, 4 deletions

diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index 7212a567dd19..a8efec088053 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -1,10 +1,12 @@
 AUX all-gentoo-1.js 1008 BLAKE2B 50418db37f55b9b9e53049abb95af79a5ee5137df9aab3ef6d1791e51a0c2f35d78b390982c5c20f4a57acebfaa013139276d0343cd4733a925510c8a5567c69 SHA512 5d1c9331db3c988f79be7756b57254bb3d2cb56cf10c7e79878d9968f882713cdcca0013d3507c4d69fcc7e99164a27b05ffbbb5ce78ee86b91ecce366a997c4
+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_beta1.source-l10n.tar.xz 12088948 BLAKE2B 5f3d2f3d0cf70d923d47a0536f1bfa873c6d852e3db2f7a9a381b85117c22df8c18e98f15dc87bf046915248766d001d08abfc48f318d0427326d33bd6e17816 SHA512 c4f8773cb9d3f526fa54cd767e88173e0794aea615958fae60d3241ece37b52fe36db1739252bc75d5e59bbf7f4c292393059b7dee8d4e46ba044a58ff60e7b6
-DIST seamonkey-2.53.3_beta1.source.tar.xz 294211732 BLAKE2B 6223a283dcaa873e990bbc6cec97f9d23033f7c9dd79c8f2c6d029376374c5159155898e00649e90cb4e001c26702f815fed030cf8ed23b5bc30addf7519f9ab SHA512 14d55a8f6594f42c582a2c9520da5475ce0a19ad6260a268d5908073909a34ab7b17a2aaf436721bbaff32700db8f94404f4326011ac599c93757d41df451465
+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
 EBUILD seamonkey-2.53.2.ebuild 16112 BLAKE2B 64747f0c98ef23afcea4325c81126b661c68cfd96a24625650cb0367b363fadcdbd44d47aeeddbde5068bfb65357d60ad360131f242b869c9e153bab2c2b4105 SHA512 8b48733f06bc03d2f3ee53ce6720cd369c272532346170af11c972830fd6dc51f18090964c308c942d4ce3f65e24bb0deb959b4a83430bf2ba1a6b5db73c84f0
-EBUILD seamonkey-2.53.3_beta1.ebuild 16183 BLAKE2B a034c503eb1423ef5b06a1259471b874a6da8c28200ce0b614278c6fa3acfa07096f5de2843cbb1660d7dffb37f1535329565f8b330b56be45f9e606f9a788ea SHA512 ed12c1285027cee033a0be775de0e92a92ba776d09454753344dd213abf3b0abe4bd1343c1afeae8d23dd38cab700a68eb23db3aa56a1bec7a4ec711e002b3c4
+EBUILD seamonkey-2.53.3.ebuild 16421 BLAKE2B fa516b2c6e6e34572197957454a157d1a390693b2e9ed8ca2663ee631c0352bb06272516a945c95bf766c3f22197224a3e433d0d96bdb236e689a19429006cd4 SHA512 4feb9eac17035364393d45631179c81a79007b96380e07e2318eac68132d4d788c0b880f7e066cf7f712327035a7b51e97e23020b3e13ceaa7f158f826dace5d
 MISC metadata.xml 1762 BLAKE2B dde9738ba4c4b065806ce8d7eafe14a3def18c30cc32f78967ef015441a7c594e3776a202e289b6879aedc02314d8e000d5e35800e490ddb8446ae29b4d6be68 SHA512 9caf3a4ea297a544452a64bf73659d6ac005d400047d260cfa521bba157e63fc5cd9b74b6786a2553e0ff2b67e59a9a8598486be2815703ed7197601b9d470e2
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
new file mode 100644
index 000000000000..8aee245ef18f
--- /dev/null
+++ b/www-client/seamonkey/files/seamonkey-2.53.3-rust-1.45.0.patch
@@ -0,0 +1,23 @@
+--- 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/seamonkey-2.53.3_beta1.ebuild b/www-client/seamonkey/seamonkey-2.53.3.ebuild
index 8d4b46d1b783..d7475ba27e0f 100644
--- a/www-client/seamonkey/seamonkey-2.53.3_beta1.ebuild
+++ b/www-client/seamonkey/seamonkey-2.53.3.ebuild
@@ -51,6 +51,7 @@ RESTRICT="!test? ( test )"
 
 SRC_URI+="
 	https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz
+	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"
@@ -101,7 +102,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? (
@@ -189,6 +190,9 @@ 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
 	eapply_user