gentoo resync : 25.10.2021

3 files changed, 31 insertions, 9 deletions

diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 4c7c3a57d59c..6e4bd3f54879 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -105,8 +105,8 @@ DIST firefox-78.15.0esr-xh.xpi 427847 BLAKE2B aaf667de15953c99c580766047afe082e4
 DIST firefox-78.15.0esr-zh-CN.xpi 564764 BLAKE2B df0b207411e7731c9238dd069fd42e47c7ecd0477089e0673a98fc879e76db566dc6f92c60a515938a831c0e0ef116f4f75f9a0b37350ce2f04be4fd72e53677 SHA512 072aba4d663091121118ecf6978129ad3cad28ae16eea7e1f680831ae0326d8ad5e0f853cac25827719229d7eb51635d1d8ed33e6fec01a48ce05875e15db2f3
 DIST firefox-78.15.0esr-zh-TW.xpi 564733 BLAKE2B dfcc1df31227d62486a8a36428c413523e2b6a81f96fc91481fc35fa65744bdb06f92ec1b259a1b79d1e5b43f1cb16c6fefb0a74fe2d4b33538783755b165453 SHA512 b5b9c3c6a4d717fef8ca250e6ccc636be2de0b22988f3f1da634266622ee0304b59a10a194f424d2b6693ce3262658172fe2a015474de600e1686950f8b90370
 DIST firefox-78.15.0esr.source.tar.xz 330819568 BLAKE2B dc8785613c2f72c55d484642c89c2545765a9efbd609bc7c2cf57b4a3a06a2ea22e6959e42b5b8af867db782e8b2097a67dec858796b744e47008a8e575e2316 SHA512 ac3de735b246ce4f0e1619cd2664321ffa374240ce6843e785d79a350dc30c967996bbcc5e3b301cb3d822ca981cbea116758fc4122f1738d75ddfd1165b6378
-DIST firefox-78esr-patches-18.tar.xz 55968 BLAKE2B f32fe8e0086e4bf74fd43127b9fe136a0e0ad6e51cb8a2398f6e8f9fe585de1574c745dd3f50440cf62b626f9fa24d368284c563fb75acbacc5238f9bc8d099f SHA512 99a51a241d91aa00c64550f2a521528f6134c8812e379eaf95cd1287fd51d00346de8d41f2d2f55a83332580531b31c4e814a47d7f69da6e3512613e8e98bb31
-DIST firefox-93-patches-01.tar.xz 21604 BLAKE2B fa9b993f7a5c95fc8a72c81c65c3167e896e4ab6517f5e3c4f543b6fc15714105d8486680557d82482f2ee5a99be23c831564e38ad8fb06f9a1c95d164d1dfb0 SHA512 ef982215b720ae9484229140a2bbfc5d2c606b888203a82113e566409b34451b7edd184e46f3ac500d2f371ecc1ec58f28610395d90f17db30fa58cb638d19fd
+DIST firefox-78esr-patches-19.tar.xz 88424 BLAKE2B fdc7bf8f28b3e799551a70f1cec7a695f52c4712f3b28733648fcd7dac5a599613f4c3d2cfa169266dc62b65619b7f28c0e06d32317adb8ec0056ca79c87e9f6 SHA512 3c81dadc9bf74207c4e361605127ef6141d77700c5c54f1f9cd5ad3be13df9f73c6eec2f51d779558e4bdad1e7395c6aa8943a93415bd1786d461042bc03550a
+DIST firefox-93-patches-02.tar.xz 32064 BLAKE2B a99ebed6fb2e3af8c3d1ef60182e56636f68c596fcddb0450853eaca7b65fa786ce3187dae9d1c5fbce0b9d8de0b2a60d441b38a26d6b1dcad8881c46c11d913 SHA512 7f51f30815dc2386afa1349f512d156d2da3cb2a50cd9c14e763cfdf00535c78bff82f25820977252c3e5c086fe31d59a753dce2d3758ebe4f30dcda7a41056b
 DIST firefox-93.0-ach.xpi 452270 BLAKE2B c7fd81469026d99e21553ec59d0d005e906915483b3765898beba694cf31c02aef3c15789a5c2e2e2d1ee242aef323ca7fa1c142912917ec2ca02a8cb9c604fa SHA512 9a4c7f880801eb1c4391a57107e88e3d43e6ce0a1bd617ba4d11951957e2d62116f102e55bb62db22378460c68d2ecb3a9b9b0285951c46846920ae02360749b
 DIST firefox-93.0-af.xpi 425657 BLAKE2B 8f0f1df2ddc330f386d831696dbbbd15f639b0d95ae4d85b268924116f93f1bce22adc10b6053873f0ed6d69f9067515774b7904f7595c89a25edffde2e25e97 SHA512 f8c122c624c139c0afea5920f063b981665771ae107d32b654206dc0d00a8173230a357ca72649bc636d02825f1af90d291b5e09f9b7044d05b4af1ce39f6e6f
 DIST firefox-93.0-an.xpi 498005 BLAKE2B d0830dfa4f7a0ea4c85a5a3a7a1e90714e2e476024b77d0b8b44ce4ad241f0df1f0090eb4263caca3d05a66c8885c3c75bf167ccb7055716d7efc01ba4554515 SHA512 df7853f86853cc457eb85b8130f7b2ebf7be97ce28f23f963eb9b05b16dae605c5d3f3b925c98a0aa252dcd84e172e42f87256feac042af57294f8cdd3e69383
@@ -205,6 +205,6 @@ DIST firefox-93.0-xh.xpi 426899 BLAKE2B d089a23aa56a881db5a5092bf6da2133c001802c
 DIST firefox-93.0-zh-CN.xpi 567752 BLAKE2B f21d32140357de5cb98da2c75f5d8511c4d98e8405178b7c54553bfeb043aa372c796a79ac6b33704a64427edafa511ce40f69d8b7267d72f4c2037199972f20 SHA512 17c1f6cb48fec384a61ad60b0da4a93648bbd6da9a752be8db1f076dab13efaf5c22fbf539b89b4106427cb310e26aa0f708164f8eb13e045cfeba4e30d048cd
 DIST firefox-93.0-zh-TW.xpi 568218 BLAKE2B 4d842b6492967fa0a4e5cfd2fd46091e5f683df3b0cbc4dd13b4693023e79652a21eda449690acbced52df9e302e50ea32533420929baf76ca70cad416fc1a13 SHA512 11baeb65242512faccb1f4e813b62de681647e246268af1c0763e5a801e8d73dd741eb58b30a0a368f354f4a708dac88f7a1ad32a0497e98b67eb57ab0ef654d
 DIST firefox-93.0.source.tar.xz 382181136 BLAKE2B f4315a81ea5709fbf622ea39a4b259e44e8bafad95468d3f41fa8413dd1d5d92e260f549aacafe8b6af04f0c036fb9d59fe8531f0e2fa8de5dffcc403b33f2e1 SHA512 b29890e331819d47201b599b9feaaa7eaa0b02088fcbf980efc4f289d43da4f73970bf35ba2f763a2a892fd5318deb68cb9a66e71e9bc0c603642434c7e32e91
-EBUILD firefox-78.15.0.ebuild 34230 BLAKE2B 6109618c8154dd2a2e92655b5d410c48c94a554a191cf3f4a38b8de68670081643addb2be3e3ff51eaf42725a6d28fdfa5fa63b39a27232bf8d65f7ff65163a9 SHA512 2ab103310bf4b729ba53198c7395ba53fe64d7118120b07f0b0ea44e9450eab1944fbfd147f9abcd7d821f6ea1b8a9a13963b43feb5ae8cc503cb6a6803797b9
-EBUILD firefox-93.0.ebuild 33601 BLAKE2B 68df23062f94facddf5b98d3ff397d38ae03af4ea45c6c056d92b04c5bcb038e1f3bf4b67de1eb2cf0f818cf8a2a9852e1f5a491dbf77c179172b308def6ccf8 SHA512 aa271bb31770068a0d5d53346e2cf7f626c4d4d86c60d6e1ac0e31896aa564c45bb15efa04c73bfb252b7aed88554a9cea359c853441b35625b08f23ef7c7c84
+EBUILD firefox-78.15.0.ebuild 34443 BLAKE2B 568b5626c717137be77371545016e0bfbe22e0b362eb3a6d8654f838c323b48e1f62581f7e90d6d40ae2bdbe13826acefd52c7d426587f8fb1f9b7070fb105bf SHA512 9e8cf9e5f4977dfe4cb0dfeb2a82e481b87a7a6bf3b1ef250966a3c07dee6e43dc44fade1b45e46af8e2eadf6758ed2170214529823654ac83030d14de7d63f9
+EBUILD firefox-93.0.ebuild 33813 BLAKE2B ef1d5db89c7e39ff7313f922c5a77007553ee3dccc6f4585e3ac9d23f6ea5be7abec9da0464ff2b45ee9a076e3edbbd59a7c5428a0f9b6968f7eb9da1f4e1f79 SHA512 6d1177807e810d75fee3de1bdf3e6c9dcbfb0a66f5fbef1415644707946e6bba292eecb4201ec9d51f3de74e8fd8b30e129902bf7785ac0f3c567fe5946aca78
 MISC metadata.xml 2151 BLAKE2B 0dd5df0e78dee99abb7d7fc5a384126ac9920f8f39e886932c894328ab4c235aabf0e7fe401c6859973bb8c55f29bb64ec8cc571b58aa427325cd4b98a89fbf4 SHA512 14e367bb16402e3c3efbed5ed6cf2acd776fd725f4f29f5cbf20f4351ddbb59c89103b9d051fb56912bea461f994fe47741afb6da3b072710eaead0004da2c58
diff --git a/www-client/firefox/firefox-78.15.0.ebuild b/www-client/firefox/firefox-78.15.0.ebuild
index 17c94954432f..413da4c11ab6 100644
--- a/www-client/firefox/firefox-78.15.0.ebuild
+++ b/www-client/firefox/firefox-78.15.0.ebuild
@@ -3,11 +3,11 @@
 
 EAPI="7"
 
-FIREFOX_PATCHSET="firefox-78esr-patches-18.tar.xz"
+FIREFOX_PATCHSET="firefox-78esr-patches-19.tar.xz"
 
-LLVM_MAX_SLOT=12
+LLVM_MAX_SLOT=13
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 PYTHON_REQ_USE="ncurses,sqlite,ssl"
 
 WANT_AUTOCONF="2.1"
@@ -79,6 +79,14 @@ BDEPEND="${PYTHON_DEPS}
 	>=virtual/rust-1.41.0
 	|| (
 		(
+			sys-devel/clang:13
+			sys-devel/llvm:13
+			clang? (
+				=sys-devel/lld-13*
+				pgo? ( =sys-libs/compiler-rt-sanitizers-13*[profile] )
+			)
+		)
+		(
 			sys-devel/clang:12
 			sys-devel/llvm:12
 			clang? (
@@ -597,6 +605,9 @@ src_configure() {
 	# python/mach/mach/mixin/process.py fails to detect SHELL
 	export SHELL="${EPREFIX}/bin/bash"
 
+	# Set state path
+	export MOZBUILD_STATE_PATH="${BUILD_DIR}"
+
 	# Set MOZCONFIG
 	export MOZCONFIG="${S}/.mozconfig"
 
diff --git a/www-client/firefox/firefox-93.0.ebuild b/www-client/firefox/firefox-93.0.ebuild
index 00f330717b92..0a7fa6f83161 100644
--- a/www-client/firefox/firefox-93.0.ebuild
+++ b/www-client/firefox/firefox-93.0.ebuild
@@ -3,9 +3,9 @@
 
 EAPI="7"
 
-FIREFOX_PATCHSET="firefox-93-patches-01.tar.xz"
+FIREFOX_PATCHSET="firefox-93-patches-02.tar.xz"
 
-LLVM_MAX_SLOT=12
+LLVM_MAX_SLOT=13
 
 PYTHON_COMPAT=( python3_{7..10} )
 PYTHON_REQ_USE="ncurses,sqlite,ssl"
@@ -78,6 +78,14 @@ BDEPEND="${PYTHON_DEPS}
 	>=virtual/rust-1.51.0
 	|| (
 		(
+			sys-devel/clang:13
+			sys-devel/llvm:13
+			clang? (
+				=sys-devel/lld-13*
+				pgo? ( =sys-libs/compiler-rt-sanitizers-13*[profile] )
+			)
+		)
+		(
 			sys-devel/clang:12
 			sys-devel/llvm:12
 			clang? (
@@ -597,6 +605,9 @@ src_configure() {
 	# python/mach/mach/mixin/process.py fails to detect SHELL
 	export SHELL="${EPREFIX}/bin/bash"
 
+	# Set state path
+	export MOZBUILD_STATE_PATH="${BUILD_DIR}"
+
 	# Set MOZCONFIG
 	export MOZCONFIG="${S}/.mozconfig"