gentoo auto-resync : 01:05:2023 - 23:21:29

4 files changed, 22 insertions, 3 deletions

diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 2ee35712fc5e..1b9a3159e7af 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 8ab2dc83484c..28d8e66edd6b 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -411,6 +411,6 @@ DIST firefox-112.0.2.source.tar.xz 504773576 BLAKE2B 44f2fae6c7260a1a6cad24ee31b
 DIST firefox-112.0.source.tar.xz 497250760 BLAKE2B 6233ee202d000ddd5b0a2eafff09226abf2cf097ea3e1184442ad34e92f6fd408f1891a2063e459d419ba074218596f48c95c860246d4c46d2a4fca3df27a78a SHA512 6b2bc8c0c93f3109da27168fe7e8f734c6ab4efb4ca56ff2d5e3a52659da71173bba2104037a000623833be8338621fca482f39f836e3910fe2996e6d0a68b39
 EBUILD firefox-102.10.0.ebuild 36945 BLAKE2B 7fa69a1943348e1dddb8143d3012a185054f66cb5d5147a9e69f502c7e29267c5e4ac06b6bad86e55122fb155c176912568fac3e8ef2daaac66ce4d9988a4575 SHA512 4f475808715fde3565fe415d0e8321ae38aba1c253824b6ee8f5fb1041beb935c516fe4ef034ca3ab736db968b99024ff2ee891d8cd30b5dd588e31439a0d6c2
 EBUILD firefox-112.0.1.ebuild 40684 BLAKE2B 2d747b16e4e22dd382cf2d2507e7f676ceafb35806db9a3e8497f94419f0c286e2f2520c8a8db02b3c6117461fd477769cae072c5dbdfa3686ff52b1c47e8731 SHA512 8a580129447ddba7f4c8f5e9821d7259ddba0e27c9e907fbe3f418dbf6b760e9eec0fb953f258f4de6e6499e1d78997d484333a57fb49a97981b785d469e33ae
-EBUILD firefox-112.0.2.ebuild 40663 BLAKE2B 091ee9cb2e986383560932d24b5e5b3a16a5aaee0c1d960dc3f6b729eaa72a6a6d9cecb155a797f143a2de15e9b0ee34afd2dd59f83c683cf556c3f584776135 SHA512 18c41e5b5d89fdd190553ca7129c993e6c683d802e2e1c909c55c104748ba94a143093177c7a466e44e2f379164eb798139201c04bf6f9e23390b6077939a90a
+EBUILD firefox-112.0.2.ebuild 41584 BLAKE2B 5c80e2066305c2e3f56fc54a8ee56c119b075fb37e35e85f738470299d0c7772859a8f89636ca2fa4865b4e67d5c9f08cfb268320b8a48708d834ba5fc3b95a1 SHA512 b791c0e310cbb4ef4522f4d384be70ab0333f7f46dd8b7d4bb14129a7b8fd942e86fdea1fb3830a9dadb5d4fa20400563db8d2213e66e186ae82069769807796
 EBUILD firefox-112.0.ebuild 40323 BLAKE2B caa6d90fe78953e687a6ec6ef08ee1a4ceb77e05788064797bcc16b26386d48c5de09e7cd56b5b76946e4b4c2f60d6bc711a567c50b3908c7c062386b754a1ed SHA512 4c699107ec5e65a234dcf97eaaa4ded39a9f07382a06f2b51ac98a9a9c7dd63f8cb2fcd5be1f1f7eb22013685e87de7f3bde535722df66d1885abfbcdee24828
-MISC metadata.xml 2219 BLAKE2B 064f486eecd2a66ef4c9cccef46803f877039bf16bc40b699a48e28e04e816d0ad434ce65ae2e056e1a4126a67a7dd7eff16040276159c1f5aa8966b1c0d7b6c SHA512 522b09ffc2857553e240b1e7c82c11ccc281dd87c720c6292ec9314b91319e0a55ca2838f17e878f5c1e58e4f22caa1b0c3b90506b65b350beff06f3f397d897
+MISC metadata.xml 2349 BLAKE2B 28d361b31232cb633877c0229f923638614b369caf92d392d9f0a1d51a5a1596b9ee7817076673de381fcbc708d9038da967dfe2440f4d21c1658b6dea2783cf SHA512 61bc9614c7d56a68fdfbd0ffbc2c828002a0be6b56523109dfb482d73f7739b934dcf407088fb5cca0f0c1c89b56a2c8d9afd836d39bf4108d3510a81814135c
diff --git a/www-client/firefox/firefox-112.0.2.ebuild b/www-client/firefox/firefox-112.0.2.ebuild
index b7c280646a74..9b8d6211fc3a 100644
--- a/www-client/firefox/firefox-112.0.2.ebuild
+++ b/www-client/firefox/firefox-112.0.2.ebuild
@@ -63,7 +63,7 @@ SLOT="rapid"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
 
 IUSE="+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel"
-IUSE+=" jack libproxy lto +openh264 pgo pulseaudio sndio selinux"
+IUSE+=" jack +jumbo-build libproxy lto +openh264 pgo pulseaudio sndio selinux"
 IUSE+=" +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png system-python-libs +system-webp"
 IUSE+=" +telemetry wayland wifi +X"
 
@@ -664,8 +664,24 @@ src_prepare() {
 		|| die "sed failed to disable ccache stats call"
 
 	einfo "Removing pre-built binaries ..."
+
 	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
 
+	# Respect choice for "jumbo-build"
+	# Changing the value for FILES_PER_UNIFIED_FILE may not work, see #905431
+	if use jumbo-build; then
+		local my_files_per_unified_file=${FILES_PER_UNIFIED_FILE:=16}
+		elog ""
+		elog "jumbo-build enabled with ${my_files_per_unified_file}."
+		elog "if you get a build failure, try -jumbo-build before opening a bug report."
+		elog ""
+
+		sed -i -e "s/\"FILES_PER_UNIFIED_FILE\", 16/\"FILES_PER_UNIFIED_FILE\", "${my_files_per_unified_file}"/" python/mozbuild/mozbuild/frontend/data.py ||
+			die "Failed to adjust FILES_PER_UNIFIED_FILE in python/mozbuild/mozbuild/frontend/data.py"
+		sed -i -e "s/FILES_PER_UNIFIED_FILE = 6/FILES_PER_UNIFIED_FILE = "${my_files_per_unified_file}"/" js/src/moz.build ||
+			die "Failed to adjust FILES_PER_UNIFIED_FILE in js/src/moz.build"
+	fi
+
 	# Create build dir
 	BUILD_DIR="${WORKDIR}/${PN}_build"
 	mkdir -p "${BUILD_DIR}" || die
@@ -873,6 +889,8 @@ src_configure() {
 
 	mozconfig_use_enable wifi necko-wifi
 
+	! use jumbo-build && mozconfig_add_options_ac '--disable-unified-build' --disable-unified-build
+
 	if use X && use wayland ; then
 		mozconfig_add_options_ac '+x11+wayland' --enable-default-toolkit=cairo-gtk3-x11-wayland
 	elif ! use X && use wayland ; then
diff --git a/www-client/firefox/metadata.xml b/www-client/firefox/metadata.xml
index f1207e1b8b77..4da06e8a17fe 100644
--- a/www-client/firefox/metadata.xml
+++ b/www-client/firefox/metadata.xml
@@ -12,6 +12,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="hwaccel">Force-enable hardware-accelerated rendering (Mozilla bug 594876)</flag>
+	<flag name="jumbo-build">Enable unified build - combines source files to speed up build process, but requires more memory</flag>
 	<flag name="libproxy">Enable libproxy support</flag>
 	<flag name="lto">Enable Link Time Optimization (LTO)</flag>
 	<flag name="openh264">Use <pkg>media-libs/openh264</pkg> for H264 support