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

5 files changed, 42 insertions, 19 deletions

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