gentoo auto-resync : 13:10:2022 - 19:42:47

21 files changed, 133 insertions, 71 deletions

diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 71252a75922d..0ad01ad23681 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/clang-common/Manifest b/sys-devel/clang-common/Manifest
index a26873e10b16..0de25c5b65f6 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -6,8 +6,8 @@ DIST llvm-project-ebb258d3b0785f6dcc65e1f277d0690891ddc94d.tar.gz 168823463 BLAK
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD clang-common-13.0.1.ebuild 593 BLAKE2B f7d78facc226d949240f31d10bb01f6a2bbe3c806d7f7c22a78d715d29de74723bedccdeefd029d309b090afe63821e10a1bd27662ff156640820fbca1896bab SHA512 48e5c5f3d4716c15018aa246cf61fbf898c4c459b1f04710da155084a8cf5b8a6df7697c300d297ac48ee1a8a8cff9bc9b4fca712455032f78cb26e9f77ef955
 EBUILD clang-common-14.0.6.ebuild 541 BLAKE2B 87b158e874cf600e23591a8095e0edb4d30d4482600ef8fe38984e9ba9559e6e2226107cd482f355d950392a6a452e1a8ae79d297d5afc3951a7f1c8f6227b5f SHA512 1bd0481468c278f131ec9f87243927b60a59752f4229450559bf8016e9599155a52593810fcdc1cf0aecd4aa1529e8df300d95123a53de18eb326152caafbbef
-EBUILD clang-common-15.0.2-r1.ebuild 3471 BLAKE2B 68df3824bf21e83707f13de4459650a9f97952b8be25caf03a1454bf68d67991b13563adf8fa50d15e83f8fee09db259d35191f59853c5008cceb60ad4d807fa SHA512 7e35269545d4cf7674dafb50a7d6cf692c853d0d84c5e7e4b7f6ddf6ddbfe8b065058657f71e0a8589b36d0c6ce9fae5aa05818e9cbf636096a187c891b752dc
-EBUILD clang-common-15.0.3.9999.ebuild 3528 BLAKE2B 6639808d0d4f71acb2a968a0acaecfd9bed29aad4b210e528c7210f22ef65e12db49389516cf2cf824eb9b18f86a9762cd85ad0648feffd1966f6155f5b88ef8 SHA512 69551c8125d7a140481c79e1c1e1cb37d8f96c39fe95f02f76b82e389d585d49f47dc239cbb56fb16d28390cf836c7af99258fc6c2bc11afe0c3de6d96354fc4
-EBUILD clang-common-16.0.0.9999.ebuild 3528 BLAKE2B 6639808d0d4f71acb2a968a0acaecfd9bed29aad4b210e528c7210f22ef65e12db49389516cf2cf824eb9b18f86a9762cd85ad0648feffd1966f6155f5b88ef8 SHA512 69551c8125d7a140481c79e1c1e1cb37d8f96c39fe95f02f76b82e389d585d49f47dc239cbb56fb16d28390cf836c7af99258fc6c2bc11afe0c3de6d96354fc4
-EBUILD clang-common-16.0.0_pre20221010-r1.ebuild 3528 BLAKE2B 6639808d0d4f71acb2a968a0acaecfd9bed29aad4b210e528c7210f22ef65e12db49389516cf2cf824eb9b18f86a9762cd85ad0648feffd1966f6155f5b88ef8 SHA512 69551c8125d7a140481c79e1c1e1cb37d8f96c39fe95f02f76b82e389d585d49f47dc239cbb56fb16d28390cf836c7af99258fc6c2bc11afe0c3de6d96354fc4
+EBUILD clang-common-15.0.2-r2.ebuild 3442 BLAKE2B b51dd6931cea2ea1334394f858aa8be703f310bc7351a59b028e5d5f3e6dbc50e974bf4c8975df85961363b37f2e9471ab255da43e655212a630c91625b45138 SHA512 c5c90d338187c536351a950785ed2224be5bceece75dca1419fbe1f4986b35e54bc5a2281222e3297a9f5eb8ec0ea9c6f926ed25e159b7b662aaec41acccd597
+EBUILD clang-common-15.0.3.9999.ebuild 3499 BLAKE2B e646b6cc44fdd8543ff74724a2e8fb02276fd9c591ae2334cf28abbd022c044be82d9fbe6385553f7b175ac8fb57f876e36ae79bdd304a87a3bd8ce5fe97f44a SHA512 0f98a23302a878350e8df9a0d181f3b2ed9df0c29666171c48fbb37204b93e236a79649759c8dc3eb72b7bc965bc3c890716d5d3b3814415528556273ccc6450
+EBUILD clang-common-16.0.0.9999.ebuild 3432 BLAKE2B 92679a03e3a45df587198ce70dfaebbc674c47229b14040c93353dd4c384636df7ff6591138c8aedf00fcee0f75edef3fc9f3257058f1d8fcdcade0c2be8c244 SHA512 e33fd7582bbe2d3ad4ed3405a92db98d7365d040df39f7e32d2f75b093e346ec88230813c607983398f9c310bc0925b61d9b438905e8177665db123e1b7d064c
+EBUILD clang-common-16.0.0_pre20221010-r1.ebuild 3432 BLAKE2B 92679a03e3a45df587198ce70dfaebbc674c47229b14040c93353dd4c384636df7ff6591138c8aedf00fcee0f75edef3fc9f3257058f1d8fcdcade0c2be8c244 SHA512 e33fd7582bbe2d3ad4ed3405a92db98d7365d040df39f7e32d2f75b093e346ec88230813c607983398f9c310bc0925b61d9b438905e8177665db123e1b7d064c
 MISC metadata.xml 735 BLAKE2B 12ea133df3d7eb9367a65e572ef91893e654d5b77caa27c66e4b5b41ba90ebc5e619eb78dfff2a67183d2c1cbfcf35fa903b2bb75604ce153d5cedfce5346e3c SHA512 8ed6b12d4f2aa1985897a8d81ce898dbc0d14ac222f3d0f259cbe80fbb8b2349dff7677627daeaf39a422f290200da4fac6348abc81c9e35da0ca73a11cfdd83
diff --git a/sys-devel/clang-common/clang-common-15.0.2-r1.ebuild b/sys-devel/clang-common/clang-common-15.0.2-r2.ebuild
index 515cb176e7bd..40df6f0ec79b 100644
--- a/sys-devel/clang-common/clang-common-15.0.2-r1.ebuild
+++ b/sys-devel/clang-common/clang-common-15.0.2-r2.ebuild
@@ -100,7 +100,6 @@ src_install() {
 			-Werror=incompatible-function-pointer-types
 
 			# constructs banned by C2x
-			-Werror=strict-prototypes
 			-Werror=deprecated-non-prototype
 		EOF
 
diff --git a/sys-devel/clang-common/clang-common-15.0.3.9999.ebuild b/sys-devel/clang-common/clang-common-15.0.3.9999.ebuild
index 841ceedb1077..d5e7941a5fc8 100644
--- a/sys-devel/clang-common/clang-common-15.0.3.9999.ebuild
+++ b/sys-devel/clang-common/clang-common-15.0.3.9999.ebuild
@@ -99,7 +99,6 @@ src_install() {
 			-Werror=incompatible-function-pointer-types
 
 			# constructs banned by C2x
-			-Werror=strict-prototypes
 			-Werror=deprecated-non-prototype
 		EOF
 
diff --git a/sys-devel/clang-common/clang-common-16.0.0.9999.ebuild b/sys-devel/clang-common/clang-common-16.0.0.9999.ebuild
index 841ceedb1077..3e43f51a0aab 100644
--- a/sys-devel/clang-common/clang-common-16.0.0.9999.ebuild
+++ b/sys-devel/clang-common/clang-common-16.0.0.9999.ebuild
@@ -97,10 +97,6 @@ src_install() {
 			-Werror=implicit-function-declaration
 			-Werror=implicit-int
 			-Werror=incompatible-function-pointer-types
-
-			# constructs banned by C2x
-			-Werror=strict-prototypes
-			-Werror=deprecated-non-prototype
 		EOF
 
 		cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
diff --git a/sys-devel/clang-common/clang-common-16.0.0_pre20221010-r1.ebuild b/sys-devel/clang-common/clang-common-16.0.0_pre20221010-r1.ebuild
index 841ceedb1077..3e43f51a0aab 100644
--- a/sys-devel/clang-common/clang-common-16.0.0_pre20221010-r1.ebuild
+++ b/sys-devel/clang-common/clang-common-16.0.0_pre20221010-r1.ebuild
@@ -97,10 +97,6 @@ src_install() {
 			-Werror=implicit-function-declaration
 			-Werror=implicit-int
 			-Werror=incompatible-function-pointer-types
-
-			# constructs banned by C2x
-			-Werror=strict-prototypes
-			-Werror=deprecated-non-prototype
 		EOF
 
 		cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
diff --git a/sys-devel/clang-toolchain-symlinks/Manifest b/sys-devel/clang-toolchain-symlinks/Manifest
index 289ab376c6fc..4f4e856dad4b 100644
--- a/sys-devel/clang-toolchain-symlinks/Manifest
+++ b/sys-devel/clang-toolchain-symlinks/Manifest
@@ -1,4 +1,4 @@
-EBUILD clang-toolchain-symlinks-14-r1.ebuild 1020 BLAKE2B 06d17fd5dfaf7ebe96ebe3d2c1a11130cd5c44c5e4db38e05da8a0048f8c3968cf85bd46a24d7450bc92a971beaa6e074fc1ee7909eaf9fca9c5377366a98d12 SHA512 3040cf53b7e7d101b3e55eba2c19ed38cd696d37c20f36a2ebf870ae288c64d7cd69de692eaccee8a9aea1585d36a60cc005079642255b8f07e32dd6daa51969
-EBUILD clang-toolchain-symlinks-15-r1.ebuild 1020 BLAKE2B 06d17fd5dfaf7ebe96ebe3d2c1a11130cd5c44c5e4db38e05da8a0048f8c3968cf85bd46a24d7450bc92a971beaa6e074fc1ee7909eaf9fca9c5377366a98d12 SHA512 3040cf53b7e7d101b3e55eba2c19ed38cd696d37c20f36a2ebf870ae288c64d7cd69de692eaccee8a9aea1585d36a60cc005079642255b8f07e32dd6daa51969
-EBUILD clang-toolchain-symlinks-16-r1.ebuild 965 BLAKE2B a0e1ed464b80158446413a4b38bd972dda6aaa93a13c5d6f61d10cedd3549b3467b3c7f181abc5df9fba6adeecf2fca01a15b466596537a9b6e1ecf22a81cd14 SHA512 296482800145e75d689ecf3da036b22ffc4b957c09482c6d005f3824534819bc6ea143a31c3ac7a4506aaa114e70dff2e1b4f6a4499c9f948c72b6e4411cb4b3
-MISC metadata.xml 683 BLAKE2B 09136e24c691f67003491e09ee7210b7a7259f410c200d7af9aac75cb8b08ff67ea338b4fa741d6d4e58d257c3685b8ed76749fbb06f0cfe8c15641abd14e185 SHA512 0fa115233dc1d374f017caa0ffcef436b5e95d2a6b69afc94e0c2055bb67715dd529adb6359088d9078ae4c501fc4da1412186efd8d852ffd1ac42c42787eadc
+EBUILD clang-toolchain-symlinks-14-r2.ebuild 1154 BLAKE2B 1da81bdc43afd21ad3f45e3ede1decf1f2eb0aa0dd5a451b28b06a74837cb1354e785784d723a770b7fd3e4dfaeb3b7d095d8579ea07cc798c33d65f9fd6fb9f SHA512 f02f2c7c21def93692503fceae45f8aa6abd608ad99b3be0a63a85f80b54899b201457ee56666161c87d0039bc512eef2bbf6f819807f236e52ac2d88f4bbe54
+EBUILD clang-toolchain-symlinks-15-r2.ebuild 1154 BLAKE2B 1da81bdc43afd21ad3f45e3ede1decf1f2eb0aa0dd5a451b28b06a74837cb1354e785784d723a770b7fd3e4dfaeb3b7d095d8579ea07cc798c33d65f9fd6fb9f SHA512 f02f2c7c21def93692503fceae45f8aa6abd608ad99b3be0a63a85f80b54899b201457ee56666161c87d0039bc512eef2bbf6f819807f236e52ac2d88f4bbe54
+EBUILD clang-toolchain-symlinks-16-r2.ebuild 1099 BLAKE2B 427a21d153852b4964b2ac1707513765f64501fd20102c64aa14eb6514ec33804fef15caeea234fe205d313f8fc9a4757e8c3bb0c092e2cee19a371a15afe407 SHA512 4df541a68c2c40496ad02c30e5cf8fbe442421cf2d5ffc5c43bfc0ba709c64cab307591522d432eb26f977bbcf14ddf6ecede867697b979a283e8ff64e720b30
+MISC metadata.xml 904 BLAKE2B d2c8a31355b0f3bea6c5b4c72d198f40bf14b6908f5a3f765b48fffb2ba3e4f09a8bb37c87ea4e7d9b4e1de0a3ad2c80bdca6feb45538c973119f27ba6329ad8 SHA512 846548593c071d6905b56984c6924086d5f03929c813be986c89c57a6924d1976975b29769ee60a2796287753aa3453608794af8d36cf48b76c55920778c27d4
diff --git a/sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-14-r1.ebuild b/sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-14-r2.ebuild
index 8a29178bf131..e8399381397f 100644
--- a/sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-14-r1.ebuild
+++ b/sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-14-r2.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}
 LICENSE="public-domain"
 SLOT="${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x64-macos"
-IUSE="gcc-symlinks +native-symlinks"
+IUSE="gcc-symlinks multilib-symlinks +native-symlinks"
 
 # Blocker for bug #872416
 RDEPEND="
@@ -38,16 +38,23 @@ src_install() {
 		)
 	fi
 
-	local abi t
+	local chosts=( "${CHOST}" )
+	if use multilib-symlinks; then
+		local abi
+		for abi in $(get_all_abis); do
+			chosts+=( "$(get_abi_CHOST "${abi}")" )
+		done
+	fi
+
+	local chost t
 	local dest=/usr/lib/llvm/${SLOT}/bin
 	dodir "${dest}"
 	for t in "${tools[@]}"; do
 		dosym "${t#*:}" "${dest}/${t%:*}"
 	done
-	for abi in $(get_all_abis); do
-		local abi_chost=$(get_abi_CHOST "${abi}")
+	for chost in "${chosts[@]}"; do
 		for t in "${tools[@]}"; do
-			dosym "${t#*:}" "${dest}/${abi_chost}-${t%:*}"
+			dosym "${t#*:}" "${dest}/${chost}-${t%:*}"
 		done
 	done
 }
diff --git a/sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-15-r1.ebuild b/sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-15-r2.ebuild
index 8a29178bf131..e8399381397f 100644
--- a/sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-15-r1.ebuild
+++ b/sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-15-r2.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}
 LICENSE="public-domain"
 SLOT="${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x64-macos"
-IUSE="gcc-symlinks +native-symlinks"
+IUSE="gcc-symlinks multilib-symlinks +native-symlinks"
 
 # Blocker for bug #872416
 RDEPEND="
@@ -38,16 +38,23 @@ src_install() {
 		)
 	fi
 
-	local abi t
+	local chosts=( "${CHOST}" )
+	if use multilib-symlinks; then
+		local abi
+		for abi in $(get_all_abis); do
+			chosts+=( "$(get_abi_CHOST "${abi}")" )
+		done
+	fi
+
+	local chost t
 	local dest=/usr/lib/llvm/${SLOT}/bin
 	dodir "${dest}"
 	for t in "${tools[@]}"; do
 		dosym "${t#*:}" "${dest}/${t%:*}"
 	done
-	for abi in $(get_all_abis); do
-		local abi_chost=$(get_abi_CHOST "${abi}")
+	for chost in "${chosts[@]}"; do
 		for t in "${tools[@]}"; do
-			dosym "${t#*:}" "${dest}/${abi_chost}-${t%:*}"
+			dosym "${t#*:}" "${dest}/${chost}-${t%:*}"
 		done
 	done
 }
diff --git a/sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-16-r1.ebuild b/sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-16-r2.ebuild
index 096e1f029ed9..f75afa7088b4 100644
--- a/sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-16-r1.ebuild
+++ b/sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-16-r2.ebuild
@@ -14,7 +14,7 @@ LICENSE="public-domain"
 SLOT="${PV}"
 KEYWORDS=""
 PROPERTIES="live"
-IUSE="gcc-symlinks +native-symlinks"
+IUSE="gcc-symlinks multilib-symlinks +native-symlinks"
 
 # Blocker for bug #872416
 RDEPEND="
@@ -39,16 +39,23 @@ src_install() {
 		)
 	fi
 
-	local abi t
+	local chosts=( "${CHOST}" )
+	if use multilib-symlinks; then
+		local abi
+		for abi in $(get_all_abis); do
+			chosts+=( "$(get_abi_CHOST "${abi}")" )
+		done
+	fi
+
+	local chost t
 	local dest=/usr/lib/llvm/${SLOT}/bin
 	dodir "${dest}"
 	for t in "${tools[@]}"; do
 		dosym "${t#*:}" "${dest}/${t%:*}"
 	done
-	for abi in $(get_all_abis); do
-		local abi_chost=$(get_abi_CHOST "${abi}")
+	for chost in "${chosts[@]}"; do
 		for t in "${tools[@]}"; do
-			dosym "${t#*:}" "${dest}/${abi_chost}-${t%:*}"
+			dosym "${t#*:}" "${dest}/${chost}-${t%:*}"
 		done
 	done
 }
diff --git a/sys-devel/clang-toolchain-symlinks/metadata.xml b/sys-devel/clang-toolchain-symlinks/metadata.xml
index 58c5027c2994..bf4e9fc6a6ca 100644
--- a/sys-devel/clang-toolchain-symlinks/metadata.xml
+++ b/sys-devel/clang-toolchain-symlinks/metadata.xml
@@ -9,6 +9,11 @@
 			Install symlinks for 'gcc' and 'g++' for extra
 			compatibility.
 		</flag>
+		<flag name="multilib-symlinks">
+			Install symlinks for all ABI CHOSTs. Note that this can
+			result in gcc being overrode for native builds, as well
+			as conflict with crossdev if used for the same targets.
+		</flag>
 		<flag name="native-symlinks">
 			Install generic tool symlinks like 'cc' and 'c++',
 			as well as ${CTARGET}-*. These symlinks are installed
diff --git a/sys-devel/lld-toolchain-symlinks/Manifest b/sys-devel/lld-toolchain-symlinks/Manifest
index ab73405c87f0..32aeb6cac174 100644
--- a/sys-devel/lld-toolchain-symlinks/Manifest
+++ b/sys-devel/lld-toolchain-symlinks/Manifest
@@ -1,4 +1,4 @@
-EBUILD lld-toolchain-symlinks-14.ebuild 704 BLAKE2B 5376b8dfec0b1ee11dda47aa926251777650584cb2a94bade825d98c1744438863da9a6ad2241e0e66a9571d28d21d68efbe29390a24259b8fe697031ed3a8b9 SHA512 90818f456b5eff65ae0c42dded617f099f23952b98ef2e0c825d8a8632b31609ba86f7caed0b1de6ae6f37319b0f9eb0ecd65b25cbfecc6fd68584c6ae61432f
-EBUILD lld-toolchain-symlinks-15.ebuild 704 BLAKE2B 5376b8dfec0b1ee11dda47aa926251777650584cb2a94bade825d98c1744438863da9a6ad2241e0e66a9571d28d21d68efbe29390a24259b8fe697031ed3a8b9 SHA512 90818f456b5eff65ae0c42dded617f099f23952b98ef2e0c825d8a8632b31609ba86f7caed0b1de6ae6f37319b0f9eb0ecd65b25cbfecc6fd68584c6ae61432f
-EBUILD lld-toolchain-symlinks-16.ebuild 680 BLAKE2B aabdf13fea2015a33d328124c006898af026ebeb9fffa57bdcf6804843b7e3b7202b5686ab95b8861d58fe1760a6b968acb997473f4f6cab0860e987091b54bb SHA512 472d11b11123c0d7da0c4f023c59c60734989db39660558a983f25ed06217d11a8e0da316c257dd3df48b6667367638bdd75c6d6ca3167ee39ff1de5b796827e
-MISC metadata.xml 563 BLAKE2B 112eb290a6af8d9bebf920d0ef9fc3cee28bc5d179176860fb27f069437fa0979b129890f694846e568eaa0ba17b7d4ee4d714bfcb2145425a5af5dd7edba65a SHA512 73f1a843d9281edc1a9697b6578d82fdbfb7c4cc30087786be98478cc27195594eee0b95a175be67b0cc8424d35a075934e0696b89b22f7cea561272b1898688
+EBUILD lld-toolchain-symlinks-14-r1.ebuild 825 BLAKE2B df81d2b414d0e924a20296f2a8eceb49b81a3763b89558a40f47b5a66e76f685656d6c8bd06c4ec21ee6e5c14f70fae40db1c966eb8ce3e11f55ca611ed7cb1e SHA512 a456988c082fa942248aeeb60aac4a4784396fcfd1096c911a8d6449185774d360d0ebf28262510642157c8a59efc6e612ee3a053d2ad233a54ce9a108dfcdba
+EBUILD lld-toolchain-symlinks-15-r1.ebuild 825 BLAKE2B df81d2b414d0e924a20296f2a8eceb49b81a3763b89558a40f47b5a66e76f685656d6c8bd06c4ec21ee6e5c14f70fae40db1c966eb8ce3e11f55ca611ed7cb1e SHA512 a456988c082fa942248aeeb60aac4a4784396fcfd1096c911a8d6449185774d360d0ebf28262510642157c8a59efc6e612ee3a053d2ad233a54ce9a108dfcdba
+EBUILD lld-toolchain-symlinks-16-r1.ebuild 801 BLAKE2B a539e9788b4cf4a758a5bd7209e69ff5b664029dac6bb3f4c0323efc4926d6e1de0c662d6361b8dfae4f45ee254ba559b0095f95bbc23404b28bd31a8b576073 SHA512 9e5ee806aa46d0d4b8ef2af27fac32ac146d12df5223a3b4b613400d2a47306068ebd8c9474c7b2f030d2e3d3fa1a309427afc03f096e60df04afe54ac0e1996
+MISC metadata.xml 784 BLAKE2B 044eebb87ddac511186e137d9e255cb3ead2d53aeffafc641cc9a53556b833f06cae439907de8e8ead1090d54f7cc4bcacdbfff52449b6fab5908aa6d354a110 SHA512 50a9ac94efe64f8f6533049f496a19c37e375803ea3920a3729c93f346117ea5b662978570db27e8fffcfaf78f990691c4ab5aaf7dd48a7e2931f713eddedb4b
diff --git a/sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-14.ebuild b/sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-14-r1.ebuild
index 75ee3dd007f7..c1a6e31f926c 100644
--- a/sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-14.ebuild
+++ b/sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-14-r1.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}
 LICENSE="public-domain"
 SLOT="${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+native-symlinks"
+IUSE="multilib-symlinks +native-symlinks"
 
 RDEPEND="
 	sys-devel/lld
@@ -22,12 +22,18 @@ RDEPEND="
 src_install() {
 	use native-symlinks || return
 
-	local abi
+	local chosts=( "${CHOST}" )
+	if use multilib-symlinks; then
+		local abi
+		for abi in $(get_all_abis); do
+			chosts+=( "$(get_abi_CHOST "${abi}")" )
+		done
+	fi
+
 	local dest=/usr/lib/llvm/${SLOT}/bin
 	dodir "${dest}"
 	dosym ../../../../bin/ld.lld "${dest}/ld"
-	for abi in $(get_all_abis); do
-		local abi_chost=$(get_abi_CHOST "${abi}")
-		dosym ../../../../bin/ld.lld "${dest}/${abi_chost}-ld"
+	for chost in "${chosts[@]}"; do
+		dosym ../../../../bin/ld.lld "${dest}/${chost}-ld"
 	done
 }
diff --git a/sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-15.ebuild b/sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-15-r1.ebuild
index 75ee3dd007f7..c1a6e31f926c 100644
--- a/sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-15.ebuild
+++ b/sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-15-r1.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}
 LICENSE="public-domain"
 SLOT="${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+native-symlinks"
+IUSE="multilib-symlinks +native-symlinks"
 
 RDEPEND="
 	sys-devel/lld
@@ -22,12 +22,18 @@ RDEPEND="
 src_install() {
 	use native-symlinks || return
 
-	local abi
+	local chosts=( "${CHOST}" )
+	if use multilib-symlinks; then
+		local abi
+		for abi in $(get_all_abis); do
+			chosts+=( "$(get_abi_CHOST "${abi}")" )
+		done
+	fi
+
 	local dest=/usr/lib/llvm/${SLOT}/bin
 	dodir "${dest}"
 	dosym ../../../../bin/ld.lld "${dest}/ld"
-	for abi in $(get_all_abis); do
-		local abi_chost=$(get_abi_CHOST "${abi}")
-		dosym ../../../../bin/ld.lld "${dest}/${abi_chost}-ld"
+	for chost in "${chosts[@]}"; do
+		dosym ../../../../bin/ld.lld "${dest}/${chost}-ld"
 	done
 }
diff --git a/sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-16.ebuild b/sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-16-r1.ebuild
index aefb59aafa0d..0fc37704b2b3 100644
--- a/sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-16.ebuild
+++ b/sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-16-r1.ebuild
@@ -14,7 +14,7 @@ LICENSE="public-domain"
 SLOT="${PV}"
 KEYWORDS=""
 PROPERTIES="live"
-IUSE="+native-symlinks"
+IUSE="multilib-symlinks +native-symlinks"
 
 RDEPEND="
 	sys-devel/lld
@@ -23,12 +23,18 @@ RDEPEND="
 src_install() {
 	use native-symlinks || return
 
-	local abi
+	local chosts=( "${CHOST}" )
+	if use multilib-symlinks; then
+		local abi
+		for abi in $(get_all_abis); do
+			chosts+=( "$(get_abi_CHOST "${abi}")" )
+		done
+	fi
+
 	local dest=/usr/lib/llvm/${SLOT}/bin
 	dodir "${dest}"
 	dosym ../../../../bin/ld.lld "${dest}/ld"
-	for abi in $(get_all_abis); do
-		local abi_chost=$(get_abi_CHOST "${abi}")
-		dosym ../../../../bin/ld.lld "${dest}/${abi_chost}-ld"
+	for chost in "${chosts[@]}"; do
+		dosym ../../../../bin/ld.lld "${dest}/${chost}-ld"
 	done
 }
diff --git a/sys-devel/lld-toolchain-symlinks/metadata.xml b/sys-devel/lld-toolchain-symlinks/metadata.xml
index 1583779e583b..69ca87c01788 100644
--- a/sys-devel/lld-toolchain-symlinks/metadata.xml
+++ b/sys-devel/lld-toolchain-symlinks/metadata.xml
@@ -5,6 +5,11 @@
 		<email>llvm@gentoo.org</email>
 	</maintainer>
 	<use>
+		<flag name="multilib-symlinks">
+			Install symlinks for all ABI CHOSTs. Note that this can
+			result in gcc being overrode for native builds, as well
+			as conflict with crossdev if used for the same targets.
+		</flag>
 		<flag name="native-symlinks">
 			Install generic 'ld' symlink, as well as ${CTARGET}-ld.
 			These symlinks are installed into slotted LLVM bindir,
diff --git a/sys-devel/llvm-toolchain-symlinks/Manifest b/sys-devel/llvm-toolchain-symlinks/Manifest
index f29d5fc977e7..adb58933044a 100644
--- a/sys-devel/llvm-toolchain-symlinks/Manifest
+++ b/sys-devel/llvm-toolchain-symlinks/Manifest
@@ -1,4 +1,4 @@
-EBUILD llvm-toolchain-symlinks-14.ebuild 917 BLAKE2B 19c6d2107750e3bd1c0bfea92fb37bb894732ca4a1ccf09cc9d794a6797934623f90bebad9c3ba1845d4525cedef0e1174b5dd4b5d7463f522cf051e79b9b4d1 SHA512 4c939580faabf5c2fd14dd7c3ab7ca12cd3359771d591634fcd71b9dd1ec14f4d928b9ac5e90ab384f9093d6abfd7addd88ae9b92a8feb45f7a5ef105ddcf56e
-EBUILD llvm-toolchain-symlinks-15.ebuild 917 BLAKE2B 19c6d2107750e3bd1c0bfea92fb37bb894732ca4a1ccf09cc9d794a6797934623f90bebad9c3ba1845d4525cedef0e1174b5dd4b5d7463f522cf051e79b9b4d1 SHA512 4c939580faabf5c2fd14dd7c3ab7ca12cd3359771d591634fcd71b9dd1ec14f4d928b9ac5e90ab384f9093d6abfd7addd88ae9b92a8feb45f7a5ef105ddcf56e
-EBUILD llvm-toolchain-symlinks-16.ebuild 851 BLAKE2B 2797a5b4010a5ebbf97bb7c017c07e9fb993a8dcde01830379e2e6674b2643866402b799472137e99ed75be40777c48c2a10695de50f0cb7ebe93e791e8a69bb SHA512 be367a045de61e28dc50b5b01406a2c5ac2b7e4c0588f90e6848088aea16389fb34dfa7e2066f69853ada07d17550c1384d36c05b913abec0e28980de8a1ebc5
-MISC metadata.xml 594 BLAKE2B 6de5c87920c45523712844b099b80ca9e4ad337ccc1d84013554811af39ff28bd83aa94742c5c385804f1054362bcdc060f8ba1ff92e98f2ffd27cf7b90c9455 SHA512 15b353f3a4d0bd05ee57acd2d25a1aae15dafa52665ca2e8e563d8e71f4888ab482cf118329bdfd635c8e5aa9685d51f4a23e39d1f6f6905994c0d7672e91d6b
+EBUILD llvm-toolchain-symlinks-14-r1.ebuild 1050 BLAKE2B 2e1e3a23812823c1a747a2b09d006f874b3a192c92b1ed275988bd84740df5ed68283f638fa36232d780eec817c26163d4d76335ad1dc2e0c5780b96dddd88bd SHA512 f54178846a398792a753174cd6b067f63b22bef13dba49485b14cc7f909a1da2a8d9bb2657a0b485ccfb5a3830388a855d52e8dea7a62e766a3bd65bb6602923
+EBUILD llvm-toolchain-symlinks-15-r1.ebuild 1050 BLAKE2B 2e1e3a23812823c1a747a2b09d006f874b3a192c92b1ed275988bd84740df5ed68283f638fa36232d780eec817c26163d4d76335ad1dc2e0c5780b96dddd88bd SHA512 f54178846a398792a753174cd6b067f63b22bef13dba49485b14cc7f909a1da2a8d9bb2657a0b485ccfb5a3830388a855d52e8dea7a62e766a3bd65bb6602923
+EBUILD llvm-toolchain-symlinks-16-r1.ebuild 984 BLAKE2B 2e75f61e728d2143dd9b3199cab0147f4b81a1762fcefffeae9c7ce812492eed1002e516c2ea0ff17aa4af2d389ea5b58c6d04033e1c6b070aa85c5827816b3a SHA512 8f65d67b9fdffed53ea16787229ea5b3c81e771bf7231739e3723d7b20d16ff4d5445a191e851cba006f5698cb362d8928825c591fd39d7e634cf14d679d2216
+MISC metadata.xml 815 BLAKE2B 963f1b8425495144d04659d2d8cdabab910f15f9861634bf436a82ccb70b27682b44c47415ca6884956097e92294457d09b5c44e7a2f108c93abb79df8884aa7 SHA512 940a6c63c4c13a1c78c041c02df9bd3d2ac0f19eb552fcfb8134784386a2197956b1dd4950c760ca6ac9e8fb154eb550d59fc6ab1aea9c9236e7e005882d556a
diff --git a/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-14.ebuild b/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-14-r1.ebuild
index 9cc42ef77e31..8d59c568c625 100644
--- a/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-14.ebuild
+++ b/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-14-r1.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}
 LICENSE="public-domain"
 SLOT="${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
-IUSE="+native-symlinks"
+IUSE="multilib-symlinks +native-symlinks"
 
 RDEPEND="
 	sys-devel/llvm:${SLOT}
@@ -26,17 +26,23 @@ src_install() {
 		addr2line ar dlltool nm objcopy objdump ranlib readelf size
 		strings strip windres
 	)
+	local chosts=( "${CHOST}" )
+	if use multilib-symlinks; then
+		local abi
+		for abi in $(get_all_abis); do
+			chosts+=( "$(get_abi_CHOST "${abi}")" )
+		done
+	fi
 
-	local abi t
+	local chost t
 	local dest=/usr/lib/llvm/${SLOT}/bin
 	dodir "${dest}"
 	for t in "${tools[@]}"; do
 		dosym "llvm-${t}" "${dest}/${t}"
 	done
-	for abi in $(get_all_abis); do
-		local abi_chost=$(get_abi_CHOST "${abi}")
+	for chost in "${chosts[@]}"; do
 		for t in "${tools[@]}"; do
-			dosym "llvm-${t}" "${dest}/${abi_chost}-${t}"
+			dosym "llvm-${t}" "${dest}/${chost}-${t}"
 		done
 	done
 }
diff --git a/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-15.ebuild b/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-15-r1.ebuild
index 9cc42ef77e31..8d59c568c625 100644
--- a/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-15.ebuild
+++ b/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-15-r1.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}
 LICENSE="public-domain"
 SLOT="${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
-IUSE="+native-symlinks"
+IUSE="multilib-symlinks +native-symlinks"
 
 RDEPEND="
 	sys-devel/llvm:${SLOT}
@@ -26,17 +26,23 @@ src_install() {
 		addr2line ar dlltool nm objcopy objdump ranlib readelf size
 		strings strip windres
 	)
+	local chosts=( "${CHOST}" )
+	if use multilib-symlinks; then
+		local abi
+		for abi in $(get_all_abis); do
+			chosts+=( "$(get_abi_CHOST "${abi}")" )
+		done
+	fi
 
-	local abi t
+	local chost t
 	local dest=/usr/lib/llvm/${SLOT}/bin
 	dodir "${dest}"
 	for t in "${tools[@]}"; do
 		dosym "llvm-${t}" "${dest}/${t}"
 	done
-	for abi in $(get_all_abis); do
-		local abi_chost=$(get_abi_CHOST "${abi}")
+	for chost in "${chosts[@]}"; do
 		for t in "${tools[@]}"; do
-			dosym "llvm-${t}" "${dest}/${abi_chost}-${t}"
+			dosym "llvm-${t}" "${dest}/${chost}-${t}"
 		done
 	done
 }
diff --git a/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-16.ebuild b/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-16-r1.ebuild
index 117dff32e17b..10c6367152de 100644
--- a/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-16.ebuild
+++ b/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-16-r1.ebuild
@@ -14,7 +14,7 @@ LICENSE="public-domain"
 SLOT="${PV}"
 KEYWORDS=""
 PROPERTIES="live"
-IUSE="+native-symlinks"
+IUSE="multilib-symlinks +native-symlinks"
 
 RDEPEND="
 	sys-devel/llvm:${SLOT}
@@ -27,17 +27,23 @@ src_install() {
 		addr2line ar dlltool nm objcopy objdump ranlib readelf size
 		strings strip windres
 	)
+	local chosts=( "${CHOST}" )
+	if use multilib-symlinks; then
+		local abi
+		for abi in $(get_all_abis); do
+			chosts+=( "$(get_abi_CHOST "${abi}")" )
+		done
+	fi
 
-	local abi t
+	local chost t
 	local dest=/usr/lib/llvm/${SLOT}/bin
 	dodir "${dest}"
 	for t in "${tools[@]}"; do
 		dosym "llvm-${t}" "${dest}/${t}"
 	done
-	for abi in $(get_all_abis); do
-		local abi_chost=$(get_abi_CHOST "${abi}")
+	for chost in "${chosts[@]}"; do
 		for t in "${tools[@]}"; do
-			dosym "llvm-${t}" "${dest}/${abi_chost}-${t}"
+			dosym "llvm-${t}" "${dest}/${chost}-${t}"
 		done
 	done
 }
diff --git a/sys-devel/llvm-toolchain-symlinks/metadata.xml b/sys-devel/llvm-toolchain-symlinks/metadata.xml
index c6260bb7fb74..d62775dfc3a3 100644
--- a/sys-devel/llvm-toolchain-symlinks/metadata.xml
+++ b/sys-devel/llvm-toolchain-symlinks/metadata.xml
@@ -5,6 +5,11 @@
 		<email>llvm@gentoo.org</email>
 	</maintainer>
 	<use>
+		<flag name="multilib-symlinks">
+			Install symlinks for all ABI CHOSTs. Note that this can
+			result in gcc being overrode for native builds, as well
+			as conflict with crossdev if used for the same targets.
+		</flag>
 		<flag name="native-symlinks">
 			Install generic tool symlinks like 'objdump' and 'ranlib',
 			as well as ${CTARGET}-*. These symlinks are installed