www-client/firefox: 97.0 fixes

 - also export the 2nd MACH_SYSTEM_ASSERTED_COMPATIBLE variable,
 - disable sandbox feature with ppc64, as it's currently only
   supported for amd64, arm, arm64 and x86,
 - include the skip-pip-check.patch in the full patch set.

Bug: https://bugs.gentoo.org/832975
Bug: https://bugs.gentoo.org/828999
Closes: https://bugs.gentoo.org/833001
Signed-off-by: Joonas Niilola <juippis@gentoo.org>

3 files changed, 12 insertions, 20 deletions

diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 35b0432339fe..b6f0256c2718 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -393,7 +393,7 @@ DIST firefox-96.0.3-xh.xpi 424482 BLAKE2B 992b037fb299c6fb9a4336e5f0c42180e31db8
 DIST firefox-96.0.3-zh-CN.xpi 576718 BLAKE2B 5f3f90d0b882284e7792837fdf69a0013318a1f620f2ee6cc808b8978073a939e62082050876ae84c553470b699fef04994a37436db1b7b1bb3578ee0cf84823 SHA512 ffdba2148ddda29ce31a5bc550cb1a520de5e3b4be21a324d28ae5259175dc034293380b84bb1cc89a6b3dc2aa866aeed916f1785029bb861ed538225721b43f
 DIST firefox-96.0.3-zh-TW.xpi 577835 BLAKE2B 6e7dcd8ee056afd73f3270d1d337b4900134241fc14ba1f0c0850f61a7196912b0b7de59869fd6bf7712aabcfcb043c5e161d159bc4c72b2b22b2242b4c8d966 SHA512 aaa2b1cfec87e2fc6450b427ebbe4474320acd6a54b16a15a9d8118528f7856155e01acca884afedf75b9b98e13fab81f10c2fb85d9f899f417f5cfdcc02acc2
 DIST firefox-96.0.3.source.tar.xz 406721708 BLAKE2B 93f5f6258fb76323c45b21d15415d30069bcf2347d37b939b90d0f51d592224bd811972844848f1e1f9dab0f055e140b07693b4d9bb9e9f375358d2a56d00fcb SHA512 3dd5fbc96e369d5f4fb3eca778c2bd3e2313d089f867de9fac3556810a797e9b5629ef1b8840fb2f22a18df7de95ea1993eee052f691d861a555cea544b05966
-DIST firefox-97-patches-01j.tar.xz 16772 BLAKE2B adc0370358cfee820a8a74f81aca35591f6e61e7795b786f357fb93b1972c8b5f4506224a499560cb4d7ba3adee88a8b46a64aa411b4eef80c6789df25d69be9 SHA512 f82996a07d6218f9a507a42fb079d8d8e0c3ca661d8ea554b50f7a08989e130f42082b57b248eecfd6bb6a25febcf67657c6a31df89883031463053e9cc6ae8c
+DIST firefox-97-patches-02j.tar.xz 17004 BLAKE2B ecf13fcf814de06e6e93f6f81e3ac3046c51ed576eed13386299630f4a3fb171d380c6dc955a2d785916714a8e8b53919449d1dfffa5d82e786fec4080f92cef SHA512 5dc145f026893180ab07c46a4fedc5885ff08d7212a5bc59fab7bdd4edf29f6b8ab244e32a1ac8d9dd528fa0f146f20aa00b1c0631f55f9d23509de8dbdf6efd
 DIST firefox-97.0-ach.xpi 453065 BLAKE2B ae6a2ff0b39659d8b6367388bbbeadef61ea7cf91ae85fe594a87476a2402af5500d93f07d6bf1edf24da22de0198050b8fd44bd905cb840e971099be64a0c25 SHA512 82ccb67bfca8e402467d7cfe3b0c95e5eece0b85625a2232cb8c21df8ec8d6a91c9643736dac4cbcac8a54de87b7bf7a22586e1d89a798a7c4b1246d60870361
 DIST firefox-97.0-af.xpi 419749 BLAKE2B 6efd866c643327868539d500aa51ebe0a044033a9be9cf1465f63c60b6e99a4c090574379b6f7fb917b4b3348696e47c640fcea37a4e90866f09753c4aa29715 SHA512 f1e3e016dd880f65600c3c161dd56a3d1cf9014c7eaee87eb58e294213df30aa12fbb65745861418bd05bb71098db42264cfd7e3f2314dbeb98fd07ce930b4fc
 DIST firefox-97.0-an.xpi 499584 BLAKE2B 8696e412eb40458a90a590247ebee524a8713091277f2d4c8fe8a8fbd74b7ffe97cca85993435ef5b8eee6ef724b14004762cc8033391627699dd061d27afa8f SHA512 0651eb1b317dba01b5954741bbe3319a693e58be91216b730423c6fb4b9ab2a7463900bfe007e9b232daaea17e5f9bfbadde3fa1e87ff8db1555060cf9f462e3
diff --git a/www-client/firefox/files/firefox-skip-pip-check.patch b/www-client/firefox/files/firefox-skip-pip-check.patch
deleted file mode 100644
index dba1056baf94..000000000000
--- a/www-client/firefox/files/firefox-skip-pip-check.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/python/mach/mach/site.py b/python/mach/mach/site.py
-index 8fef9bfaf8..61c3101c11 100644
---- a/python/mach/mach/site.py
-+++ b/python/mach/mach/site.py
-@@ -940,6 +940,9 @@ def _assert_pip_check(topsrcdir, pthfile_lines, virtualenv_name):
-     If there's an incompatibility, raise an exception and allow it to bubble up since
-     it will require user intervention to resolve.
-     """
-+
-+    return True
-+
-     if os.environ.get(
-         f"MACH_SYSTEM_ASSERTED_COMPATIBLE_WITH_{virtualenv_name.upper()}_SITE", None
-     ):
diff --git a/www-client/firefox/firefox-97.0.ebuild b/www-client/firefox/firefox-97.0.ebuild
index 1e4506d759ef..89c1930260dc 100644
--- a/www-client/firefox/firefox-97.0.ebuild
+++ b/www-client/firefox/firefox-97.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-FIREFOX_PATCHSET="firefox-97-patches-01j.tar.xz"
+FIREFOX_PATCHSET="firefox-97-patches-02j.tar.xz"
 
 LLVM_MAX_SLOT=13
 
@@ -579,9 +579,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	# Don't run pip check on the host that builds firefox.
-	eapply "${FILESDIR}"/firefox-skip-pip-check.patch
-
 	use lto && rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch
 	eapply "${WORKDIR}/firefox-patches"
 
@@ -707,7 +704,6 @@ src_configure() {
 		--enable-new-pass-manager \
 		--enable-official-branding \
 		--enable-release \
-		--enable-sandbox \
 		--enable-system-ffi \
 		--enable-system-pixman \
 		--host="${CBUILD:-${CHOST}}" \
@@ -735,6 +731,15 @@ src_configure() {
 		mozconfig_add_options_ac '' --enable-rust-simd
 	fi
 
+	# For future keywording: This is currently (97.0) only supported on:
+	# amd64, arm, arm64 & x86.
+	# Might want to flip the logic around if Firefox is to support more arches.
+	if use ppc64; then
+		mozconfig_add_options_ac '' --disable-sandbox
+	else
+		mozconfig_add_options_ac '' --enable-sandbox
+	fi
+
 	if [[ -s "${S}/api-google.key" ]] ; then
 		local key_origin="Gentoo default"
 		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
@@ -968,6 +973,7 @@ src_configure() {
 	# Use system's Python environment
 	export MACH_USE_SYSTEM_PYTHON=1
 	export MACH_SYSTEM_ASSERTED_COMPATIBLE_WITH_MACH_SITE=1
+	export MACH_SYSTEM_ASSERTED_COMPATIBLE_WITH_BUILD_SITE=1
 	export PIP_NO_CACHE_DIR=off
 
 	# Disable notification when build system has finished