gentoo auto-resync : 23:11:2023 - 16:28:43

7 files changed, 170 insertions, 30 deletions

diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index cdf006bd3968..412c71cba004 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 41180aeaafb8..3c398fc4c3ef 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -15,10 +15,10 @@ EBUILD clang-common-14.0.6.ebuild 541 BLAKE2B 87b158e874cf600e23591a8095e0edb4d3
 EBUILD clang-common-15.0.7-r5.ebuild 5090 BLAKE2B 39974630209630607d10903585223df68cd809fb390fc9eb2a80c4235ce70ae21120083f8eaf749c769a93f738c4e971e31e978dd637a0b87d07260281db4b83 SHA512 6cb37a7eb373d300d165e851e3643fd35e11d78a6a88617b4a8c0063b83558d10d307c32861e9ba2d0ac902c1cd2069ece6bd1446e309a6753f13adf8cd8fa2c
 EBUILD clang-common-15.0.7-r7.ebuild 5462 BLAKE2B 098697c65115e672a1e878167997d820c93cad6a71c5a1dc17c731a031d37f20e50ef41e2f1d3238bc91065ba23bab5db4ab48e8274be9db3cb086ec6cdf7868 SHA512 7500bf0c4fde82b90aac68d09b95a49c241fae8b0d2340f7780e9baed1c85d855e45c4296a7daaa0b831a07f442e0be4faf6510a335fa5c979b3061e28fdb99d
 EBUILD clang-common-16.0.6-r2.ebuild 4972 BLAKE2B 7ce71ef4c5ca19ef5847c90a23662b30e028d97fba045ec64976a3093c94e65bc8b5b04535d2ecf9ec51526fedc6b2b264135162acedcfb6df88cf426ce36357 SHA512 490b4afdc3ebbac15152d8da7cb86b3f2030e7ea1c70b09542f8bfd839d0194b97ee979fffcfb19fba8cca97ecfe565a5e77968b9afd618851772d7ccf444624
-EBUILD clang-common-17.0.4.ebuild 6852 BLAKE2B 8b41372a6e3ac538829ce3672f00cd28b813ebd79d610796beb10829c1353fd76562f0241ed3308a9986ac1560a5a3ed04549f857d2892070686d1b7d0ebda08 SHA512 f2ecd649e818eb1580c22e1b622f69b57cd11124da06934424c871126792318c114c67775671991e7d2f3e885394c2c7aa6f11480e58c12c67f0664f60cb11d5
-EBUILD clang-common-17.0.5.ebuild 6852 BLAKE2B 8b41372a6e3ac538829ce3672f00cd28b813ebd79d610796beb10829c1353fd76562f0241ed3308a9986ac1560a5a3ed04549f857d2892070686d1b7d0ebda08 SHA512 f2ecd649e818eb1580c22e1b622f69b57cd11124da06934424c871126792318c114c67775671991e7d2f3e885394c2c7aa6f11480e58c12c67f0664f60cb11d5
-EBUILD clang-common-18.0.0.9999.ebuild 6752 BLAKE2B 2284a2924d3a95030282729976e2b501b4965534a3401dbce2dae1ea95a10a82a927dad62426be98805d9c1b6aff67af6eac079d0e402c509e66766ca339a84f SHA512 d4ade666fc2dac27ed30099565b3defcd69457d29e9156d9e4034b6fa51ce9a6229e767cb319b18f5ec3c18df4905efa75f98c56f242341094aeffbe53547b9c
-EBUILD clang-common-18.0.0_pre20231104.ebuild 6752 BLAKE2B 2284a2924d3a95030282729976e2b501b4965534a3401dbce2dae1ea95a10a82a927dad62426be98805d9c1b6aff67af6eac079d0e402c509e66766ca339a84f SHA512 d4ade666fc2dac27ed30099565b3defcd69457d29e9156d9e4034b6fa51ce9a6229e767cb319b18f5ec3c18df4905efa75f98c56f242341094aeffbe53547b9c
-EBUILD clang-common-18.0.0_pre20231111.ebuild 6752 BLAKE2B 2284a2924d3a95030282729976e2b501b4965534a3401dbce2dae1ea95a10a82a927dad62426be98805d9c1b6aff67af6eac079d0e402c509e66766ca339a84f SHA512 d4ade666fc2dac27ed30099565b3defcd69457d29e9156d9e4034b6fa51ce9a6229e767cb319b18f5ec3c18df4905efa75f98c56f242341094aeffbe53547b9c
+EBUILD clang-common-17.0.4-r1.ebuild 7636 BLAKE2B 93b061d1a20fef63437ce3385c32b5a5c1dac613154b02e266e0763385d5553ac46ca972b8ebb8e84dafcc76e37084f0d60b8e910ec6599e2c798656d61b065a SHA512 88458c8325b9a60eda9e031d1773f1a5dbeabe4da39d3a306bdfab0908143759d1db64b46231089f2b4c4a5da337542c3c250b9c937d82df54058e04560e891a
+EBUILD clang-common-17.0.5-r1.ebuild 7636 BLAKE2B 93b061d1a20fef63437ce3385c32b5a5c1dac613154b02e266e0763385d5553ac46ca972b8ebb8e84dafcc76e37084f0d60b8e910ec6599e2c798656d61b065a SHA512 88458c8325b9a60eda9e031d1773f1a5dbeabe4da39d3a306bdfab0908143759d1db64b46231089f2b4c4a5da337542c3c250b9c937d82df54058e04560e891a
+EBUILD clang-common-18.0.0.9999.ebuild 7536 BLAKE2B c0e8010200824a7b6bd2c63682ae1a8ef3bfbc95a6188b6c585e74cdf4013c3082adb640ef2a9d6fe22caca6e685709e38ebfe7089e79a88996b123717089cee SHA512 d85cb3ef7d366b9dcc3163002fd4ccbe59dd03cdc80e2baeb5b1f13bce78204799236e9ddbde4fc0698ab016fb9d287fa174ad068c29eed09e40377eaf898646
+EBUILD clang-common-18.0.0_pre20231104-r1.ebuild 7536 BLAKE2B c0e8010200824a7b6bd2c63682ae1a8ef3bfbc95a6188b6c585e74cdf4013c3082adb640ef2a9d6fe22caca6e685709e38ebfe7089e79a88996b123717089cee SHA512 d85cb3ef7d366b9dcc3163002fd4ccbe59dd03cdc80e2baeb5b1f13bce78204799236e9ddbde4fc0698ab016fb9d287fa174ad068c29eed09e40377eaf898646
+EBUILD clang-common-18.0.0_pre20231111-r1.ebuild 7536 BLAKE2B c0e8010200824a7b6bd2c63682ae1a8ef3bfbc95a6188b6c585e74cdf4013c3082adb640ef2a9d6fe22caca6e685709e38ebfe7089e79a88996b123717089cee SHA512 d85cb3ef7d366b9dcc3163002fd4ccbe59dd03cdc80e2baeb5b1f13bce78204799236e9ddbde4fc0698ab016fb9d287fa174ad068c29eed09e40377eaf898646
 EBUILD clang-common-18.0.0_pre20231119.ebuild 6752 BLAKE2B 2284a2924d3a95030282729976e2b501b4965534a3401dbce2dae1ea95a10a82a927dad62426be98805d9c1b6aff67af6eac079d0e402c509e66766ca339a84f SHA512 d4ade666fc2dac27ed30099565b3defcd69457d29e9156d9e4034b6fa51ce9a6229e767cb319b18f5ec3c18df4905efa75f98c56f242341094aeffbe53547b9c
 MISC metadata.xml 735 BLAKE2B 12ea133df3d7eb9367a65e572ef91893e654d5b77caa27c66e4b5b41ba90ebc5e619eb78dfff2a67183d2c1cbfcf35fa903b2bb75604ce153d5cedfce5346e3c SHA512 8ed6b12d4f2aa1985897a8d81ce898dbc0d14ac222f3d0f259cbe80fbb8b2349dff7677627daeaf39a422f290200da4fac6348abc81c9e35da0ca73a11cfdd83
diff --git a/sys-devel/clang-common/clang-common-17.0.4.ebuild b/sys-devel/clang-common/clang-common-17.0.4-r1.ebuild
index 696ae8ee4996..99047721833e 100644
--- a/sys-devel/clang-common/clang-common-17.0.4.ebuild
+++ b/sys-devel/clang-common/clang-common-17.0.4-r1.ebuild
@@ -63,7 +63,7 @@ pkg_pretend() {
 	fi
 }
 
-doclang_cfg() {
+_doclang_cfg() {
 	local triple="${1}"
 
 	local tool
@@ -93,6 +93,37 @@ doclang_cfg() {
 	done
 }
 
+doclang_cfg() {
+	local triple="${1}"
+
+	_doclang_cfg ${triple}
+
+	# LLVM may have different arch names in some cases. For example in x86
+	# profiles the triple uses i686, but llvm will prefer i386 if invoked
+	# with "clang" on x86 or "clang -m32" on x86_64. The gentoo triple will
+	# be used if invoked through ${CHOST}-clang{,++,-cpp} though.
+	#
+	# To make sure the correct triples are installed,
+	# see Triple::getArchTypeName() in llvm/lib/TargetParser/Triple.cpp
+	# and compare with CHOST values in profiles.
+
+	local abi=${triple%%-*}
+	case ${abi} in
+		armv4l|armv4t|armv5tel|armv6j|armv7a)
+			_doclang_cfg ${triple/${abi}/arm}
+			;;
+		i686)
+			_doclang_cfg ${triple/${abi}/i386}
+			;;
+		sparc)
+			_doclang_cfg ${triple/${abi}/sparcel}
+			;;
+		sparc64)
+			_doclang_cfg ${triple/${abi}/sparcv9}
+			;;
+	esac
+}
+
 src_install() {
 	newbashcomp bash-autocomplete.sh clang
 
@@ -204,10 +235,7 @@ src_install() {
 
 	# We only install config files for supported ABIs because unprefixed tools
 	# might be used for crosscompilation where e.g. PIE may not be supported.
-	# See bug #912237 and bug #901247.
-	doclang_cfg "${CHOST}"
-
-	# Just ${CHOST} won't do due to bug #912685.
+	# See bug #912237 and bug #901247. Just ${CHOST} won't do due to bug #912685.
 	local abi
 	for abi in $(get_all_abis); do
 		local abi_chost=$(get_abi_CHOST "${abi}")
diff --git a/sys-devel/clang-common/clang-common-17.0.5.ebuild b/sys-devel/clang-common/clang-common-17.0.5-r1.ebuild
index 696ae8ee4996..99047721833e 100644
--- a/sys-devel/clang-common/clang-common-17.0.5.ebuild
+++ b/sys-devel/clang-common/clang-common-17.0.5-r1.ebuild
@@ -63,7 +63,7 @@ pkg_pretend() {
 	fi
 }
 
-doclang_cfg() {
+_doclang_cfg() {
 	local triple="${1}"
 
 	local tool
@@ -93,6 +93,37 @@ doclang_cfg() {
 	done
 }
 
+doclang_cfg() {
+	local triple="${1}"
+
+	_doclang_cfg ${triple}
+
+	# LLVM may have different arch names in some cases. For example in x86
+	# profiles the triple uses i686, but llvm will prefer i386 if invoked
+	# with "clang" on x86 or "clang -m32" on x86_64. The gentoo triple will
+	# be used if invoked through ${CHOST}-clang{,++,-cpp} though.
+	#
+	# To make sure the correct triples are installed,
+	# see Triple::getArchTypeName() in llvm/lib/TargetParser/Triple.cpp
+	# and compare with CHOST values in profiles.
+
+	local abi=${triple%%-*}
+	case ${abi} in
+		armv4l|armv4t|armv5tel|armv6j|armv7a)
+			_doclang_cfg ${triple/${abi}/arm}
+			;;
+		i686)
+			_doclang_cfg ${triple/${abi}/i386}
+			;;
+		sparc)
+			_doclang_cfg ${triple/${abi}/sparcel}
+			;;
+		sparc64)
+			_doclang_cfg ${triple/${abi}/sparcv9}
+			;;
+	esac
+}
+
 src_install() {
 	newbashcomp bash-autocomplete.sh clang
 
@@ -204,10 +235,7 @@ src_install() {
 
 	# We only install config files for supported ABIs because unprefixed tools
 	# might be used for crosscompilation where e.g. PIE may not be supported.
-	# See bug #912237 and bug #901247.
-	doclang_cfg "${CHOST}"
-
-	# Just ${CHOST} won't do due to bug #912685.
+	# See bug #912237 and bug #901247. Just ${CHOST} won't do due to bug #912685.
 	local abi
 	for abi in $(get_all_abis); do
 		local abi_chost=$(get_abi_CHOST "${abi}")
diff --git a/sys-devel/clang-common/clang-common-18.0.0.9999.ebuild b/sys-devel/clang-common/clang-common-18.0.0.9999.ebuild
index b58ed6b486c2..c70a4d8bd045 100644
--- a/sys-devel/clang-common/clang-common-18.0.0.9999.ebuild
+++ b/sys-devel/clang-common/clang-common-18.0.0.9999.ebuild
@@ -62,7 +62,7 @@ pkg_pretend() {
 	fi
 }
 
-doclang_cfg() {
+_doclang_cfg() {
 	local triple="${1}"
 
 	local tool
@@ -92,6 +92,37 @@ doclang_cfg() {
 	done
 }
 
+doclang_cfg() {
+	local triple="${1}"
+
+	_doclang_cfg ${triple}
+
+	# LLVM may have different arch names in some cases. For example in x86
+	# profiles the triple uses i686, but llvm will prefer i386 if invoked
+	# with "clang" on x86 or "clang -m32" on x86_64. The gentoo triple will
+	# be used if invoked through ${CHOST}-clang{,++,-cpp} though.
+	#
+	# To make sure the correct triples are installed,
+	# see Triple::getArchTypeName() in llvm/lib/TargetParser/Triple.cpp
+	# and compare with CHOST values in profiles.
+
+	local abi=${triple%%-*}
+	case ${abi} in
+		armv4l|armv4t|armv5tel|armv6j|armv7a)
+			_doclang_cfg ${triple/${abi}/arm}
+			;;
+		i686)
+			_doclang_cfg ${triple/${abi}/i386}
+			;;
+		sparc)
+			_doclang_cfg ${triple/${abi}/sparcel}
+			;;
+		sparc64)
+			_doclang_cfg ${triple/${abi}/sparcv9}
+			;;
+	esac
+}
+
 src_install() {
 	newbashcomp bash-autocomplete.sh clang
 
@@ -203,10 +234,7 @@ src_install() {
 
 	# We only install config files for supported ABIs because unprefixed tools
 	# might be used for crosscompilation where e.g. PIE may not be supported.
-	# See bug #912237 and bug #901247.
-	doclang_cfg "${CHOST}"
-
-	# Just ${CHOST} won't do due to bug #912685.
+	# See bug #912237 and bug #901247. Just ${CHOST} won't do due to bug #912685.
 	local abi
 	for abi in $(get_all_abis); do
 		local abi_chost=$(get_abi_CHOST "${abi}")
diff --git a/sys-devel/clang-common/clang-common-18.0.0_pre20231104.ebuild b/sys-devel/clang-common/clang-common-18.0.0_pre20231104-r1.ebuild
index b58ed6b486c2..c70a4d8bd045 100644
--- a/sys-devel/clang-common/clang-common-18.0.0_pre20231104.ebuild
+++ b/sys-devel/clang-common/clang-common-18.0.0_pre20231104-r1.ebuild
@@ -62,7 +62,7 @@ pkg_pretend() {
 	fi
 }
 
-doclang_cfg() {
+_doclang_cfg() {
 	local triple="${1}"
 
 	local tool
@@ -92,6 +92,37 @@ doclang_cfg() {
 	done
 }
 
+doclang_cfg() {
+	local triple="${1}"
+
+	_doclang_cfg ${triple}
+
+	# LLVM may have different arch names in some cases. For example in x86
+	# profiles the triple uses i686, but llvm will prefer i386 if invoked
+	# with "clang" on x86 or "clang -m32" on x86_64. The gentoo triple will
+	# be used if invoked through ${CHOST}-clang{,++,-cpp} though.
+	#
+	# To make sure the correct triples are installed,
+	# see Triple::getArchTypeName() in llvm/lib/TargetParser/Triple.cpp
+	# and compare with CHOST values in profiles.
+
+	local abi=${triple%%-*}
+	case ${abi} in
+		armv4l|armv4t|armv5tel|armv6j|armv7a)
+			_doclang_cfg ${triple/${abi}/arm}
+			;;
+		i686)
+			_doclang_cfg ${triple/${abi}/i386}
+			;;
+		sparc)
+			_doclang_cfg ${triple/${abi}/sparcel}
+			;;
+		sparc64)
+			_doclang_cfg ${triple/${abi}/sparcv9}
+			;;
+	esac
+}
+
 src_install() {
 	newbashcomp bash-autocomplete.sh clang
 
@@ -203,10 +234,7 @@ src_install() {
 
 	# We only install config files for supported ABIs because unprefixed tools
 	# might be used for crosscompilation where e.g. PIE may not be supported.
-	# See bug #912237 and bug #901247.
-	doclang_cfg "${CHOST}"
-
-	# Just ${CHOST} won't do due to bug #912685.
+	# See bug #912237 and bug #901247. Just ${CHOST} won't do due to bug #912685.
 	local abi
 	for abi in $(get_all_abis); do
 		local abi_chost=$(get_abi_CHOST "${abi}")
diff --git a/sys-devel/clang-common/clang-common-18.0.0_pre20231111.ebuild b/sys-devel/clang-common/clang-common-18.0.0_pre20231111-r1.ebuild
index b58ed6b486c2..c70a4d8bd045 100644
--- a/sys-devel/clang-common/clang-common-18.0.0_pre20231111.ebuild
+++ b/sys-devel/clang-common/clang-common-18.0.0_pre20231111-r1.ebuild
@@ -62,7 +62,7 @@ pkg_pretend() {
 	fi
 }
 
-doclang_cfg() {
+_doclang_cfg() {
 	local triple="${1}"
 
 	local tool
@@ -92,6 +92,37 @@ doclang_cfg() {
 	done
 }
 
+doclang_cfg() {
+	local triple="${1}"
+
+	_doclang_cfg ${triple}
+
+	# LLVM may have different arch names in some cases. For example in x86
+	# profiles the triple uses i686, but llvm will prefer i386 if invoked
+	# with "clang" on x86 or "clang -m32" on x86_64. The gentoo triple will
+	# be used if invoked through ${CHOST}-clang{,++,-cpp} though.
+	#
+	# To make sure the correct triples are installed,
+	# see Triple::getArchTypeName() in llvm/lib/TargetParser/Triple.cpp
+	# and compare with CHOST values in profiles.
+
+	local abi=${triple%%-*}
+	case ${abi} in
+		armv4l|armv4t|armv5tel|armv6j|armv7a)
+			_doclang_cfg ${triple/${abi}/arm}
+			;;
+		i686)
+			_doclang_cfg ${triple/${abi}/i386}
+			;;
+		sparc)
+			_doclang_cfg ${triple/${abi}/sparcel}
+			;;
+		sparc64)
+			_doclang_cfg ${triple/${abi}/sparcv9}
+			;;
+	esac
+}
+
 src_install() {
 	newbashcomp bash-autocomplete.sh clang
 
@@ -203,10 +234,7 @@ src_install() {
 
 	# We only install config files for supported ABIs because unprefixed tools
 	# might be used for crosscompilation where e.g. PIE may not be supported.
-	# See bug #912237 and bug #901247.
-	doclang_cfg "${CHOST}"
-
-	# Just ${CHOST} won't do due to bug #912685.
+	# See bug #912237 and bug #901247. Just ${CHOST} won't do due to bug #912685.
 	local abi
 	for abi in $(get_all_abis); do
 		local abi_chost=$(get_abi_CHOST "${abi}")