gentoo auto-resync : 03:02:2023 - 09:09:48

12 files changed, 81 insertions, 19 deletions

diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index d5674b413829..e144494e4406 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/autoconf-wrapper/Manifest b/sys-devel/autoconf-wrapper/Manifest
index b46deebfc707..1e949c83bbd6 100644
--- a/sys-devel/autoconf-wrapper/Manifest
+++ b/sys-devel/autoconf-wrapper/Manifest
@@ -1,6 +1,6 @@
 DIST autotools-wrappers-at-20220130.tar.gz 3625 BLAKE2B c587d778a0c3331d14498308ae720dabdbcf27349ef0a3a2d5db56bb0ef597a5b1ab43388f1456e7888b40f043d68b0d89b420ac7404008f9a813ef78ae7e96f SHA512 700204b6024636dc808339aac15fb19bb645b654d4777ba8bf0febded5eb6af98659d04ed23819a8a638b6ee905e62292995bf2f838c30dedacb1a6bc0d04f1a
 DIST autotools-wrappers-at-20221207.tar.gz 3646 BLAKE2B 82bec40e03ae5ec133252fd3c05c3fed537bb415e800918df9c9d783d48a9d76cbe60c53dd7daf6d94653d79fc52be8c089183dda996e8a72dd03ffa83098613 SHA512 12ea99721e6fc60a3ed7351d6c228aaf6e4eef0bd0444eda8cd742f74fa91150ef07bb52f6bcad4a350269e8032f5d4e204d2f2108b0d9c441ddd7f9755862b7
 EBUILD autoconf-wrapper-20220130.ebuild 945 BLAKE2B 9f744ebf1622278f53e0224f7d2e21df6764aba9a8e9c6d4746cc60c700db0a489bc7739090d760de2614830a18da29e3bc551b10a40c2db47e3f51f8cd42e45 SHA512 fa3ed3e1c15b5fb2f208f428dbba6a5e81b80cd535b5d0ac74396950c3f514ac09a6cd1e4451dbb9fd675098f8f2bdbb0991e2fd20575cfc095ec6c685507ecd
-EBUILD autoconf-wrapper-20221207.ebuild 1080 BLAKE2B 8df0b09fd36bc8e9394df57d677378d3bcbd24cea716bcee699d84a09fd6182ff54f0cdc95eeec96e3349917977c12c1c6893205de43ba1cff952e578d212575 SHA512 94e409054ed65f091815ce586b6e31c3e0375346f7bc15b6d6a94b92c396cc1e5c47d3a49108ee39873ac5e1f54c84ce2f40d5ce0ad54c066d9e7e624b3afc87
-EBUILD autoconf-wrapper-99999999.ebuild 1078 BLAKE2B 06182881c24259b94874eebcfe7f03da856be629f92dd7764f357749829f4d1e67f86d9a72a4e73a901588d3acd2b532c6144c4ed8ed6f56c77926756e8d5f19 SHA512 2fcb6b2db06b43e18951cfb0d8596653d329c99f95026f4f93f568b0b0b99b1d5ff910b9def94769e13e901262b1227acbce15b5e4cd67ce33923f44ea1038fc
+EBUILD autoconf-wrapper-20221207.ebuild 1068 BLAKE2B 65816c1c1c259e6220ed7e65c1c5213b092297ef95c66e791de8742655e09573a66dda9a885430c8d704909794f37e0ced60c57151eed46b04eea3d429f286dd SHA512 e4dc261840f74f2491b69b730bd3393bc6093bf44f9bc514a193c91f1926bdd685bd93f8d14c300fada78f5f39216a0ee554f578a9af336cc392e6b962db990d
+EBUILD autoconf-wrapper-99999999.ebuild 1130 BLAKE2B 60fd665efa017705a3f6f6d91e2f165a92233fd23e49b1ee3097e3750addd22e482430abf916782e9facbb42e6aac293c030e72d6400101e8ed1ff9334169ef9 SHA512 3eb04dea97a8a59600bd2061be7722a1344be2c70598448f9eb65cdefe9f20e4a297812f5da0531deaf6d1b37bf2296829e3acf3145b3794b2b74e2882a09a02
 MISC metadata.xml 435 BLAKE2B 006f03645ce3cb9a4f7cad6411f3487500f58f351bbacfb6e1e3de494214fccb8b478a2cea35d289ee0a487fa7eaf31ca444cbf82d1d9eeee1822928e223009b SHA512 3b699336ca3dbf40bcfddb1db91f8d3803574c9c6765b477b93e50d756ac3c441e5bedfbbc71fcbea697a2f31b9a41fcbbb01a38d5acc8d29b48779a405f8f6c
diff --git a/sys-devel/autoconf-wrapper/autoconf-wrapper-20221207.ebuild b/sys-devel/autoconf-wrapper/autoconf-wrapper-20221207.ebuild
index 9788b3e841eb..3b2a7a8ff475 100644
--- a/sys-devel/autoconf-wrapper/autoconf-wrapper-20221207.ebuild
+++ b/sys-devel/autoconf-wrapper/autoconf-wrapper-20221207.ebuild
@@ -9,11 +9,13 @@ DESCRIPTION="Wrapper for autoconf to manage multiple autoconf versions"
 HOMEPAGE="https://gitweb.gentoo.org/proj/autotools-wrappers.git"
 
 if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI=" https://anongit.gentoo.org/git/proj/autotools-wrappers.git"
+	EGIT_REPO_URI="
+		https://anongit.gentoo.org/git/proj/autotools-wrappers.git
+		https://github.com/gentoo/autotools-wrappers
+	"
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/autotools-wrappers.git/snapshot/${MY_P}.tar.gz"
-	#SRC_URI="https://dev.gentoo.org/~vapier/dist/${MY_P}.tar.gz"
 	S="${WORKDIR}/${MY_P}"
 
 	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/sys-devel/autoconf-wrapper/autoconf-wrapper-99999999.ebuild b/sys-devel/autoconf-wrapper/autoconf-wrapper-99999999.ebuild
index 00ae3761530d..6fe1847e6d0a 100644
--- a/sys-devel/autoconf-wrapper/autoconf-wrapper-99999999.ebuild
+++ b/sys-devel/autoconf-wrapper/autoconf-wrapper-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,10 @@ DESCRIPTION="Wrapper for autoconf to manage multiple autoconf versions"
 HOMEPAGE="https://gitweb.gentoo.org/proj/autotools-wrappers.git"
 
 if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/autotools-wrappers.git"
+	EGIT_REPO_URI="
+		https://anongit.gentoo.org/git/proj/autotools-wrappers.git
+		https://github.com/gentoo/autotools-wrappers
+	"
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/autotools-wrappers.git/snapshot/${MY_P}.tar.gz"
diff --git a/sys-devel/automake-wrapper/Manifest b/sys-devel/automake-wrapper/Manifest
index c04a5b1b928b..c8f7335f8434 100644
--- a/sys-devel/automake-wrapper/Manifest
+++ b/sys-devel/automake-wrapper/Manifest
@@ -1,4 +1,6 @@
 AUX am-wrapper-11.sh 4626 BLAKE2B 2a96abc5b93db360a3ce074d84b21d7f875ff42d54f99030d8589b84efc94b411d8fb1a707716a060dc4a66c59f2a84d1e50a70f681faa62358fc7ae7a5a7d77 SHA512 452c0c52ef65b1ad5ad8d8f5c9c12cb9ff18eb03faaf7217c52a7dcf2a9832c7d4a59dbd8cc6325a0035a6650cc913f9b842615d053bd0f0c5c5177e660dbfca
+DIST autotools-wrappers-at-20221207.tar.gz 3646 BLAKE2B 82bec40e03ae5ec133252fd3c05c3fed537bb415e800918df9c9d783d48a9d76cbe60c53dd7daf6d94653d79fc52be8c089183dda996e8a72dd03ffa83098613 SHA512 12ea99721e6fc60a3ed7351d6c228aaf6e4eef0bd0444eda8cd742f74fa91150ef07bb52f6bcad4a350269e8032f5d4e204d2f2108b0d9c441ddd7f9755862b7
 EBUILD automake-wrapper-11-r1.ebuild 879 BLAKE2B a26400af5a88b61752e86de8530adebe83b82233b82395412558172eaaef1304e8103f1aeeba65e73964a549a401cca15e56fad3ab0cea429fe05915c3a90fb8 SHA512 31f849c9a06e10adb2a8e9096d69abf5e70aef467ba5ff14ad86104363d4b9ad45ae2a8f9128f7777abf5134d8fb0c373f611fd98e36a69a01aaff35b0241b84
-EBUILD automake-wrapper-99999999.ebuild 1128 BLAKE2B adbcb1de2e8604db478f99f4b55d23833087c96ea44c575fe96581649deb871789c500d2a5aa81fa728736529733ec079dbdd3d499ba38a0fa1a464b0fbbdb28 SHA512 c19cea67a98aeff25aeaf982c17e38f7f4ab38851bdfe6b5d89cd927f49de0124cff3f95ffe18820bf24d3bc1ffe294aaa3eb835b4ab174769b1ebf07da24b3b
+EBUILD automake-wrapper-20221207.ebuild 1232 BLAKE2B 687c81360c28325284c8aea8c9b6c4c9763460625c2b8bfc24880c825421e051c133530eb3f03d132fb2162ead4769b500809bec15e80327ed3b1a6a34626e7b SHA512 8811454c9a8f76e6d13ff15c039ce3b00af914e6f48f4a36074d18c0cc0b43a1dd6fb4f21c25c45bffe866f946da6af0fc6f078c5718c264d1ba3d3fcb7c8c66
+EBUILD automake-wrapper-99999999.ebuild 1232 BLAKE2B 687c81360c28325284c8aea8c9b6c4c9763460625c2b8bfc24880c825421e051c133530eb3f03d132fb2162ead4769b500809bec15e80327ed3b1a6a34626e7b SHA512 8811454c9a8f76e6d13ff15c039ce3b00af914e6f48f4a36074d18c0cc0b43a1dd6fb4f21c25c45bffe866f946da6af0fc6f078c5718c264d1ba3d3fcb7c8c66
 MISC metadata.xml 435 BLAKE2B 006f03645ce3cb9a4f7cad6411f3487500f58f351bbacfb6e1e3de494214fccb8b478a2cea35d289ee0a487fa7eaf31ca444cbf82d1d9eeee1822928e223009b SHA512 3b699336ca3dbf40bcfddb1db91f8d3803574c9c6765b477b93e50d756ac3c441e5bedfbbc71fcbea697a2f31b9a41fcbbb01a38d5acc8d29b48779a405f8f6c
diff --git a/sys-devel/automake-wrapper/automake-wrapper-20221207.ebuild b/sys-devel/automake-wrapper/automake-wrapper-20221207.ebuild
new file mode 100644
index 000000000000..2c7e8833a582
--- /dev/null
+++ b/sys-devel/automake-wrapper/automake-wrapper-20221207.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="autotools-wrappers-at-${PV}"
+
+DESCRIPTION="Wrapper for automake to manage multiple automake versions"
+HOMEPAGE="https://gitweb.gentoo.org/proj/autotools-wrappers.git"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="
+		https://anongit.gentoo.org/git/proj/autotools-wrappers.git
+		https://github.com/gentoo/autotools-wrappers
+	"
+	inherit git-r3
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/autotools-wrappers.git/snapshot/${MY_P}.tar.gz"
+	S="${WORKDIR}"/${MY_P}
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+src_prepare() {
+	default
+
+	# usr/bin/aclocal: bad substitution -> /bin/sh != POSIX shell
+	if use prefix ; then
+		sed -i -e '1c\#!'"${EPREFIX}"'/bin/sh' am-wrapper-${PV}.sh || die
+	fi
+}
+
+src_install() {
+	exeinto /usr/$(get_libdir)/misc
+	doexe am-wrapper.sh
+
+	local x=
+	for x in automake aclocal ; do
+		dosym -r /usr/$(get_libdir)/misc/am-wrapper.sh /usr/bin/${x}
+	done
+
+	keepdir /usr/share/aclocal
+}
diff --git a/sys-devel/automake-wrapper/automake-wrapper-99999999.ebuild b/sys-devel/automake-wrapper/automake-wrapper-99999999.ebuild
index ecb9a1b0530c..2c7e8833a582 100644
--- a/sys-devel/automake-wrapper/automake-wrapper-99999999.ebuild
+++ b/sys-devel/automake-wrapper/automake-wrapper-99999999.ebuild
@@ -1,19 +1,24 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
+MY_P="autotools-wrappers-at-${PV}"
+
 DESCRIPTION="Wrapper for automake to manage multiple automake versions"
 HOMEPAGE="https://gitweb.gentoo.org/proj/autotools-wrappers.git"
 
 if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/autotools-wrappers.git"
+	EGIT_REPO_URI="
+		https://anongit.gentoo.org/git/proj/autotools-wrappers.git
+		https://github.com/gentoo/autotools-wrappers
+	"
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/autotools-wrappers.git/snapshot/${MY_P}.tar.gz"
+	S="${WORKDIR}"/${MY_P}
 
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	S="${WORKDIR}"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-devel/clang-common/Manifest b/sys-devel/clang-common/Manifest
index ed76d6187243..1c7746c01d3b 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -7,10 +7,10 @@ DIST llvm-project-16.0.0rc1.src.tar.xz.sig 566 BLAKE2B 29a593f74b05ef6268f0b2ee5
 DIST llvm-project-46d5a57801bc37e5ebb1a4d6b2acc0fa99c01e8d.tar.gz 180436731 BLAKE2B 51c30c3f11dd55a225b8ebe4ded752ce9e8eb58751e7458c29901dbdd3673f94892d337d111d696e779e3f7ef0bca6c7d79709e2072a4bf3a001d8813125d571 SHA512 ebbe0f8becac39d63433dcc3de474c40f1215fc8faab94fa2ba869d28e66b27e4fe088377bd7ae64575a6d7b07017b88bf92e5488a3185a753e647d8da352bbf
 DIST llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz 175208511 BLAKE2B cf87cf7e9bf7c74aab8ccda0f153369cb81798047fdd48025c3c7030857b128babbaafb667385a5c8e9916e16038b14fee39f1623d329471e73c39c2f2d7bbfa SHA512 e6dc0cacd6c079be8a00364e4c244782d764d9a8d514d65f9078427cb4a0c1663ff88761bfbc1e955a1a990451439110497c2cb7af7f56b2c91f2e9db4389894
 EBUILD clang-common-14.0.6.ebuild 541 BLAKE2B 87b158e874cf600e23591a8095e0edb4d30d4482600ef8fe38984e9ba9559e6e2226107cd482f355d950392a6a452e1a8ae79d297d5afc3951a7f1c8f6227b5f SHA512 1bd0481468c278f131ec9f87243927b60a59752f4229450559bf8016e9599155a52593810fcdc1cf0aecd4aa1529e8df300d95123a53de18eb326152caafbbef
-EBUILD clang-common-15.0.7-r1.ebuild 4626 BLAKE2B edaacc5b0fed376e342377e2e433838ddf150dc77aea27f32a172e2b23219d9fc3e01ec3cf8e0efb3991987a34b79ab857b9687856bc97119f97eb7e6d8adeb6 SHA512 8ff4b1129e45271e4281813e0bb970e19d74bbe560eb63238eaabeec11a1907cbe24a7252cfcad5fa566c49d95c85212507c1eb0b7be093d6ad2995d966025d4
+EBUILD clang-common-15.0.7-r2.ebuild 4709 BLAKE2B 45c3f8fc620d93c68140ec3f86744524b706555213599fdfaf8ee6d1109cf71ca15d09400e3d080d7099355b4ac3c83a645c7d17f5ff9967cd77147f2b4fb890 SHA512 130d2f15aef579a2942bf61d6b8062dfba930c3413910b4634bc8032c452ef4627fadbb930b3a4c76fe57d870fe21b1c812f58945b9eea4c63bd6a821e2377dc
 EBUILD clang-common-16.0.0.9999.ebuild 4686 BLAKE2B c2bf510db70a7708d56746c035eebe20b332ace167138ae5260375dc5bfe15e2b8478692636cca60cebd9ebc2e418324377e3d17ebb49db7e30ecd6ad11e6db3 SHA512 abb81468747c4f83554c35792f6fd1e282b0edfa02a34157c0594cefef42b91c95092b35a88b7b4b7abfb17bff95029065b86f2c2724df5badb5924f915fd63e
-EBUILD clang-common-16.0.0_pre20230107-r1.ebuild 4692 BLAKE2B 0628160af123d42ea6cc9a2d39d0115ccc3d0f4461f2bc3b13946d3fb587a100092df73ba512aa016bf359283cf8790cf465cdbf7a230f1cd02e536d570424cd SHA512 08f8ef115f59f74a3b845af7563dbd43819c4fb37ed27a2fc0c65ce3c0f7c7e61eb3617b1e8c54c598d5cff0a1b8988d0ed32f8fa40c6b4428545a5f8f1bf05a
-EBUILD clang-common-16.0.0_pre20230127.ebuild 4686 BLAKE2B c2bf510db70a7708d56746c035eebe20b332ace167138ae5260375dc5bfe15e2b8478692636cca60cebd9ebc2e418324377e3d17ebb49db7e30ecd6ad11e6db3 SHA512 abb81468747c4f83554c35792f6fd1e282b0edfa02a34157c0594cefef42b91c95092b35a88b7b4b7abfb17bff95029065b86f2c2724df5badb5924f915fd63e
-EBUILD clang-common-16.0.0_rc1.ebuild 4692 BLAKE2B 0628160af123d42ea6cc9a2d39d0115ccc3d0f4461f2bc3b13946d3fb587a100092df73ba512aa016bf359283cf8790cf465cdbf7a230f1cd02e536d570424cd SHA512 08f8ef115f59f74a3b845af7563dbd43819c4fb37ed27a2fc0c65ce3c0f7c7e61eb3617b1e8c54c598d5cff0a1b8988d0ed32f8fa40c6b4428545a5f8f1bf05a
+EBUILD clang-common-16.0.0_pre20230107-r2.ebuild 4775 BLAKE2B a447dc18e3e97c9cac00ba882fc3c37aa6fefd58592c9b0b389ebf67a9faf64f1872cb868f8c0154d644eb2c7df32860b3c032d464ee2414d186a35cf8135151 SHA512 e763587e1bd2954c0c813295b1e08ca944041346b99904bc05857dbc086832606b62738d122f1328804c9616cfd90827397c82b510c9291c78b797071e525932
+EBUILD clang-common-16.0.0_pre20230127-r1.ebuild 4769 BLAKE2B 3896d2e63855bc296138b7a9eff2cd7ff21ecb184e1ae9f152def1c5eb9158becd3d1d8c557cf6b9db42aa53273df81c402f31a78c9f8502caec9938b493040d SHA512 65f2b422c0953218b85fe3dbf316692929edfe62a345e75888fe81d82506b9e1c3ce18948401efefb97ef335a40e527a0887eb58531bf9e4c9c350d816740db3
+EBUILD clang-common-16.0.0_rc1-r1.ebuild 4775 BLAKE2B a447dc18e3e97c9cac00ba882fc3c37aa6fefd58592c9b0b389ebf67a9faf64f1872cb868f8c0154d644eb2c7df32860b3c032d464ee2414d186a35cf8135151 SHA512 e763587e1bd2954c0c813295b1e08ca944041346b99904bc05857dbc086832606b62738d122f1328804c9616cfd90827397c82b510c9291c78b797071e525932
 EBUILD clang-common-17.0.0.9999.ebuild 4686 BLAKE2B c2bf510db70a7708d56746c035eebe20b332ace167138ae5260375dc5bfe15e2b8478692636cca60cebd9ebc2e418324377e3d17ebb49db7e30ecd6ad11e6db3 SHA512 abb81468747c4f83554c35792f6fd1e282b0edfa02a34157c0594cefef42b91c95092b35a88b7b4b7abfb17bff95029065b86f2c2724df5badb5924f915fd63e
 MISC metadata.xml 735 BLAKE2B 12ea133df3d7eb9367a65e572ef91893e654d5b77caa27c66e4b5b41ba90ebc5e619eb78dfff2a67183d2c1cbfcf35fa903b2bb75604ce153d5cedfce5346e3c SHA512 8ed6b12d4f2aa1985897a8d81ce898dbc0d14ac222f3d0f259cbe80fbb8b2349dff7677627daeaf39a422f290200da4fac6348abc81c9e35da0ca73a11cfdd83
diff --git a/sys-devel/clang-common/clang-common-15.0.7-r1.ebuild b/sys-devel/clang-common/clang-common-15.0.7-r2.ebuild
index 651827d21197..2adff08df36d 100644
--- a/sys-devel/clang-common/clang-common-15.0.7-r1.ebuild
+++ b/sys-devel/clang-common/clang-common-15.0.7-r2.ebuild
@@ -90,10 +90,11 @@ src_install() {
 	EOF
 
 	# Baseline hardening (bug #851111)
+	# (-fstack-clash-protection is omitted because of a possible Clang bug,
+	# see bug #892537 and bug #865339.)
 	newins - gentoo-hardened.cfg <<-EOF
 		# Some of these options are added unconditionally, regardless of
 		# USE=hardened, for parity with sys-devel/gcc.
-		-fstack-clash-protection
 		-fstack-protector-strong
 		-fPIE
 		-include "${EPREFIX}/usr/include/gentoo/fortify.h"
diff --git a/sys-devel/clang-common/clang-common-16.0.0_pre20230107-r1.ebuild b/sys-devel/clang-common/clang-common-16.0.0_pre20230107-r2.ebuild
index 3c407f5a1af6..d5df949d5d96 100644
--- a/sys-devel/clang-common/clang-common-16.0.0_pre20230107-r1.ebuild
+++ b/sys-devel/clang-common/clang-common-16.0.0_pre20230107-r2.ebuild
@@ -90,10 +90,11 @@ src_install() {
 	EOF
 
 	# Baseline hardening (bug #851111)
+	# (-fstack-clash-protection is omitted because of a possible Clang bug,
+	# see bug #892537 and bug #865339.)
 	newins - gentoo-hardened.cfg <<-EOF
 		# Some of these options are added unconditionally, regardless of
 		# USE=hardened, for parity with sys-devel/gcc.
-		-fstack-clash-protection
 		-fstack-protector-strong
 		-fPIE
 		-include "${EPREFIX}/usr/include/gentoo/fortify.h"
diff --git a/sys-devel/clang-common/clang-common-16.0.0_pre20230127.ebuild b/sys-devel/clang-common/clang-common-16.0.0_pre20230127-r1.ebuild
index be17e87b775a..c04c266d94c8 100644
--- a/sys-devel/clang-common/clang-common-16.0.0_pre20230127.ebuild
+++ b/sys-devel/clang-common/clang-common-16.0.0_pre20230127-r1.ebuild
@@ -90,10 +90,11 @@ src_install() {
 	EOF
 
 	# Baseline hardening (bug #851111)
+	# (-fstack-clash-protection is omitted because of a possible Clang bug,
+	# see bug #892537 and bug #865339.)
 	newins - gentoo-hardened.cfg <<-EOF
 		# Some of these options are added unconditionally, regardless of
 		# USE=hardened, for parity with sys-devel/gcc.
-		-fstack-clash-protection
 		-fstack-protector-strong
 		-fPIE
 		-include "${EPREFIX}/usr/include/gentoo/fortify.h"
diff --git a/sys-devel/clang-common/clang-common-16.0.0_rc1.ebuild b/sys-devel/clang-common/clang-common-16.0.0_rc1-r1.ebuild
index 3c407f5a1af6..d5df949d5d96 100644
--- a/sys-devel/clang-common/clang-common-16.0.0_rc1.ebuild
+++ b/sys-devel/clang-common/clang-common-16.0.0_rc1-r1.ebuild
@@ -90,10 +90,11 @@ src_install() {
 	EOF
 
 	# Baseline hardening (bug #851111)
+	# (-fstack-clash-protection is omitted because of a possible Clang bug,
+	# see bug #892537 and bug #865339.)
 	newins - gentoo-hardened.cfg <<-EOF
 		# Some of these options are added unconditionally, regardless of
 		# USE=hardened, for parity with sys-devel/gcc.
-		-fstack-clash-protection
 		-fstack-protector-strong
 		-fPIE
 		-include "${EPREFIX}/usr/include/gentoo/fortify.h"