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

5 files changed, 45 insertions, 19 deletions

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