gentoo auto-resync : 17:11:2022 - 12:56:42

4 files changed, 20 insertions, 26 deletions

diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index c90b02ee977a..457fc5a18280 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index b1559ca2c4f0..d50309d71286 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -403,7 +403,7 @@ DIST firefox-107.0-zh-CN.xpi 585092 BLAKE2B d1b48117604df85a097f6f46c4554f0ddcdf
 DIST firefox-107.0-zh-TW.xpi 586218 BLAKE2B 2ed318648e4fe0371c43860a67c72a005c52470759562788ef8ce68eab118db16c55580173106f287131b8888ff597664d40a819ca30d0c125ae8a43ca087866 SHA512 4e44e5937717ffc71680cc33aa144e0c8270f1dd085aaeafd3482c8da38012c3a24535e9cc5a9997ca8924ef037aa98269476947a69b86c7ddbfc5e395d51235
 DIST firefox-107.0.source.tar.xz 510848468 BLAKE2B 3266e1dafb3e0befe746f6ae33679474e70335b32baafc25981c7a13f385d6080a313887c7828d76a47d2e456056c6d93140b84f1eee502dc9590247d31ecff2 SHA512 4b442631079a13e1d11223499b1d8daf622d9d84b38898f9084670ddcb5738b73e0d967a5050d5930bf862aa69e8d46ebf6d751ac6d0f075a1d75ff4738bdb6e
 EBUILD firefox-102.4.0.ebuild 36296 BLAKE2B 88c04e1bae9e61ba54656820a2995abc0df2a3af32db11ebb56be70884e35c379ed3289a70060a490ca5beea29634f8548eb4ba7635e9fc5b7d4338ad67d5f26 SHA512 2bdd22e1ce0f451e517878783acc8227c926f31ea20a4dd79877a4d5c683ea7b97782781ff785632c02a4c1209bedccf65e52337d30e54d3fddad8f0374abc6a
-EBUILD firefox-102.5.0.ebuild 37084 BLAKE2B c3cf6d0fc337c7b4aa5660c7ab714ef99025a9e78f20a8871819cebedc5dc02a8e4e703eaa563a6d0c6c92dac3b2225ee13a40895312e2a226ed0fdad279d5da SHA512 b6e411fa4dfcafff17b5f236846a315b5330fb0b0f331f4af827ef7e74633398eb6774b1e0017b7b47f672c13d95942628d3ca6cff8e4a900bcd9ebe537759e5
+EBUILD firefox-102.5.0.ebuild 36768 BLAKE2B 2a57388a1f1c4ee2ccbce4f38e3a912079e7c5d19e5bb0825b85898e5e5c33390e1d58f0877e68403c3af3ba938cc6c0c1226e515f2f4e1869908b955ca04eef SHA512 3fe56f6f69e9532009598220efe0198e75c0dd0414bf443e5b59ffad956364b3b922ada9c15d2b09a632949e01ab2b5fb319c4264e02d1092ffc62c458acf078
 EBUILD firefox-106.0.5.ebuild 38130 BLAKE2B ae8396647f85a7a3abe6df686602c1d47ad0778f20df714ff9a7f7a5889c3ac80527002c538011612e9fcafcbb109bc5ee95b2117f691b4f1e47115165e439b7 SHA512 d8b1d453f862fa1707e986f8b098cd54f3c6a4dbbfb11bbd4b89632ea835d282913d42f9fda22bc6ea0a761114f14ecc31a7b1878125c19a63884b440338e6f7
-EBUILD firefox-107.0.ebuild 38068 BLAKE2B ed9856f6a43339c7bdb0b06a81ad6b6c4c65decc5d9a982462bffe0cbb629a62486934152e1736eb4405a2af475a68e0578faa1463731823f36d45146a403651 SHA512 3870981635f38d17c4e9a8135afd7999e79f08da7979a3c11ea319cb34277f264b907b4ed22e134ddbaded7f516991e6f864e5d85685a5e5cbce9e7f8c58a855
+EBUILD firefox-107.0.ebuild 38287 BLAKE2B 5b8c70e083ec44853c0469c29dcad6c3c4bd19705ce9e87040ab15a615a08f293eac686bd426f1f314193fdffd603e3dacdb7bfad5c9141dfd8c31775c2167c5 SHA512 bf7fd7fb176a119e5236ca70a2470fbaea6c437160fb148d6a627795097ab2206b8e64c4f6db1ba1d3ccea1a204f2d6a9401bae42d0e3e5960632d10191cf1eb
 MISC metadata.xml 2219 BLAKE2B 064f486eecd2a66ef4c9cccef46803f877039bf16bc40b699a48e28e04e816d0ad434ce65ae2e056e1a4126a67a7dd7eff16040276159c1f5aa8966b1c0d7b6c SHA512 522b09ffc2857553e240b1e7c82c11ccc281dd87c720c6292ec9314b91319e0a55ca2838f17e878f5c1e58e4f22caa1b0c3b90506b65b350beff06f3f397d897
diff --git a/www-client/firefox/firefox-102.5.0.ebuild b/www-client/firefox/firefox-102.5.0.ebuild
index 03abcbf6fefe..a147b671f476 100644
--- a/www-client/firefox/firefox-102.5.0.ebuild
+++ b/www-client/firefox/firefox-102.5.0.ebuild
@@ -89,6 +89,7 @@ BDEPEND="${PYTHON_DEPS}
 			sys-devel/llvm:15
 			clang? (
 				sys-devel/lld:15
+				virtual/rust:0/llvm-15
 				pgo? ( =sys-libs/compiler-rt-sanitizers-15*[profile] )
 			)
 		)
@@ -97,19 +98,17 @@ BDEPEND="${PYTHON_DEPS}
 			sys-devel/llvm:14
 			clang? (
 				sys-devel/lld:14
+				virtual/rust:0/llvm-14
 				pgo? ( =sys-libs/compiler-rt-sanitizers-14*[profile] )
 			)
 		)
 	)
-	|| (
-		virtual/rust:0/llvm-15
-		virtual/rust:0/llvm-14
-	)
 	app-arch/unzip
 	app-arch/zip
 	>=dev-util/cbindgen-0.24.3
 	net-libs/nodejs
 	virtual/pkgconfig
+	!clang? ( virtual/rust )
 	amd64? ( >=dev-lang/nasm-2.14 )
 	x86? ( >=dev-lang/nasm-2.14 )"
 
@@ -219,6 +218,11 @@ llvm_check_deps() {
 			return 1
 		fi
 
+		if ! has_version -b "virtual/rust:0/llvm-${LLVM_SLOT}" ; then
+			einfo "virtual/rust:0/llvm-${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+
 		if use pgo ; then
 			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile]" ; then
 				einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile] is missing! Cannot use LLVM slot ${LLVM_SLOT} ... Please try emerge -1av =sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* with profile use flag on!" >&2
@@ -444,20 +448,6 @@ pkg_setup() {
 
 		check-reqs_pkg_setup
 
-		# Attempt to force a specific llvm/clang/lld with multiple llvm toolchain slots installed.
-		local LLVM_USE_SLOT=${LLVM_MAX_SLOT}
-		if $(has_version "virtual/rust:0/llvm-${LLVM_USE_SLOT}"); then
-			:
-		else
-			((LLVM_USE_SLOT=LLVM_USE_SLOT-1))
-			if $(has_version "virtual/rust:0/llvm-${LLVM_USE_SLOT}"); then
-				:
-			else
-				die "Couldn't find virtual/rust:0/llvm-${LLVM_MAX_SLOT} or virtual/rust:0/llvm-${LLVM_USE_SLOT}. Check your virtual/rust installation."
-			fi
-		fi
-
-		local LLVM_MAX_SLOT=${LLVM_USE_SLOT}
 		llvm_pkg_setup
 
 		if use clang && use lto ; then
diff --git a/www-client/firefox/firefox-107.0.ebuild b/www-client/firefox/firefox-107.0.ebuild
index 9e3ee21d03b8..71eb99bd7b77 100644
--- a/www-client/firefox/firefox-107.0.ebuild
+++ b/www-client/firefox/firefox-107.0.ebuild
@@ -89,6 +89,7 @@ BDEPEND="${PYTHON_DEPS}
 			sys-devel/llvm:15
 			clang? (
 				sys-devel/lld:15
+				virtual/rust:0/llvm-15
 				pgo? ( =sys-libs/compiler-rt-sanitizers-15*[profile] )
 			)
 		)
@@ -97,19 +98,17 @@ BDEPEND="${PYTHON_DEPS}
 			sys-devel/llvm:14
 			clang? (
 				sys-devel/lld:14
+				virtual/rust:0/llvm-14
 				pgo? ( =sys-libs/compiler-rt-sanitizers-14*[profile] )
 			)
 		)
 	)
-	|| (
-		virtual/rust:0/llvm-15
-		virtual/rust:0/llvm-14
-	)
 	app-arch/unzip
 	app-arch/zip
 	>=dev-util/cbindgen-0.24.3
 	net-libs/nodejs
 	virtual/pkgconfig
+	!clang? ( virtual/rust )
 	amd64? ( >=dev-lang/nasm-2.14 )
 	x86? ( >=dev-lang/nasm-2.14 )
 	pgo? (
@@ -234,9 +233,14 @@ llvm_check_deps() {
 			return 1
 		fi
 
+		if ! has_version -b "virtual/rust:0/llvm-${LLVM_SLOT}" ; then
+			einfo "virtual/rust:0/llvm-${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+
 		if use pgo ; then
-			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
-				einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile]" ; then
+				einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile] is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
 				return 1
 			fi
 		fi