[gentoo-commits] repo/gentoo:master commit in: www-client/firefox/

["Joonas Niilola" <juippis@gentoo.org>]

commit:     bca7c74a7cbf5d9a8dc14d73c7ef148d6615ab43
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  3 06:07:41 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Jun  3 06:09:04 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bca7c74a

www-client/firefox: enable llvm-16 support via rust:0/llvm-16 on 113

 - another take with upstream llvm-16 patch added.

Bug: https://bugs.gentoo.org/903061
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 www-client/firefox/Manifest               |  1 +
 www-client/firefox/firefox-113.0.2.ebuild | 36 ++++++++++++++++++++++---------
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index ede2144ce568..8f40e43c59df 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -98,6 +98,7 @@ DIST firefox-102.11.0esr-zh-TW.xpi 614572 BLAKE2B f9d82541a8eb2b67427d1e18da1153
 DIST firefox-102.11.0esr.source.tar.xz 477769716 BLAKE2B b19db1b35e6c652e2cd44ec5219bd5c42aacd55987962dbcaf50b5ec54d2ac5066290264f938ba3d45ef111779b9f27b06736ae7df11fa62478ab2179acfe723 SHA512 fdfed404c87f33001c0ab50f9899fa80c897fac645be8ed832e426f412aafbf1468b1c8301bad463b3f5535b6d6f2005a96a748b6e2d6bf5afbc3b5bc10983d6
 DIST firefox-102esr-patches-10j.tar.xz 21744 BLAKE2B 326f206dfcd5b6ea2f06f5f537505e23d358f6d7930f7e72fd8e54af88d97172170999c246af888278143810df42be9414541e47feb48b60732565a4ee38579e SHA512 5efa50b221abedbb84c1b3d19d8ac089ac5752448e8c90c6aed9f43bf3eee876b7e7050a1678bca65f6b23734c4945b016bf059a3921ad7290b0150538111bbd
 DIST firefox-113-patches-01.tar.xz 14160 BLAKE2B 46820caddb8c64ce66a3837081176ef30770145ad059eaba18f6eb14592a9b6bd38dd49b57b3d28f11ade90e397afa9232f85390b601a27a8788e0b8765e9cd5 SHA512 19fff6115c33906daf81a0e3a44cbfd9479689b7c5738f0fab730fff293d6a0a004a06d5fd32dafb85868c7e19bf0eac23acfd21000cf1d0b07de00ac5121b7e
+DIST firefox-113-patches-02.tar.xz 15672 BLAKE2B 6e863e333dbbc1f738a6a5560166dc5357bd2f3191ad90db7d01d5d30532ff5a83d5bd42407c03062059e6979b82da18d069f6b8a5725be2c35e15f1c556af8e SHA512 690f06d04e0d06537aa3330d0e2ce8b42c88390447c1fcc6b59eef878b483338f065eac45e899622c5970ee14c7cb777cc28e754a81bd01778185ef37156bbb2
 DIST firefox-113.0.1-ach.xpi 460938 BLAKE2B 9b0f52e9e7ca34054d4478f9f654a4612c8ec439aa8da00ba389f175453a78cd4fe9703fa803ce0292fe09ce7907a5ae21091d9333abc61f286b1b39369033f9 SHA512 b8dea2aca103e99e648b76e34051a89eabb3c03e206a7d7632481b32ac622a019046d94693f39d7759fd4da28e1f61544043cb0401fd9e81fac1d2313608226c
 DIST firefox-113.0.1-af.xpi 424031 BLAKE2B be16167f496815fedc58ddd1817ca48f9ad5f8b97e2e5095143c160d2874c5c68791aacfc459d0a78e260970090de0ca9e05dab3619d10ebd2b470f0895b6f14 SHA512 b98c5e4c9bb8f267ef09f7c8945b30aa2d4be918d5340e67d9cefd45e72e877c651827c2972d33bfccb93b2193cd0ee951f7f2f4c4b34d0ae373b58e1a815ec3
 DIST firefox-113.0.1-an.xpi 505343 BLAKE2B 80c3b1dbec0dc5ef34e52f167576537f7bbe2e74c651b25e12620155f38747adf8c4c7fb5df072f54dc98525cf7480f2d38b7542a1dfeac01520589be31dd004 SHA512 8d6fccb70f0f760c623d57a6a7525c26c1a9dacacba902be9a853884af66426a2a152f029577ab6168812ca5e8e00179f46a9baa0bc3be28c9394732756ddbe3

diff --git a/www-client/firefox/firefox-113.0.2.ebuild b/www-client/firefox/firefox-113.0.2.ebuild
index c0b560f16e62..d94b3e7a7a51 100644
--- a/www-client/firefox/firefox-113.0.2.ebuild
+++ b/www-client/firefox/firefox-113.0.2.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=8
 
-FIREFOX_PATCHSET="firefox-113-patches-01.tar.xz"
+FIREFOX_PATCHSET="firefox-113-patches-02.tar.xz"
 
-LLVM_MAX_SLOT=15
+LLVM_MAX_SLOT=16
 
 PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE="ncurses,sqlite,ssl"
@@ -80,15 +80,31 @@ FF_ONLY_DEPEND="!www-client/firefox:0
 	screencast? ( media-video/pipewire:= )
 	selinux? ( sec-policy/selinux-mozilla )"
 BDEPEND="${PYTHON_DEPS}
-	sys-devel/clang:15
-	sys-devel/llvm:15
-	clang? (
-		|| (
-			sys-devel/lld:15
-			sys-devel/mold
+	|| (
+		(
+			sys-devel/clang:16
+			sys-devel/llvm:16
+			clang? (
+				|| (
+					sys-devel/lld:16
+					sys-devel/mold
+				)
+				virtual/rust:0/llvm-16
+				pgo? ( =sys-libs/compiler-rt-sanitizers-16*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:15
+			sys-devel/llvm:15
+			clang? (
+				|| (
+					sys-devel/lld:15
+					sys-devel/mold
+				)
+				virtual/rust:0/llvm-15
+				pgo? ( =sys-libs/compiler-rt-sanitizers-15*[profile] )
+			)
 		)
-		virtual/rust:0/llvm-15
-		pgo? ( =sys-libs/compiler-rt-sanitizers-15*[profile] )
 	)
 	app-alternatives/awk
 	app-arch/unzip