gentoo auto-resync : 20:09:2022 - 17:24:07

35 files changed, 401 insertions, 71 deletions

diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index a53cef2d52af..3e832f909e1f 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 30498c970820..324ee8d07973 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -1,15 +1,16 @@
-DIST llvm-project-02a27b38909edc46c41732f79a837c95c9992d5a.tar.gz 167414990 BLAKE2B cd9c4be6d3155a4cbf1abff9d8246b9d6fea98e29459c226bda36df250cc22883f08175514fce037d146866d521a56669678b5c35b5163b38532b8c2920b25a6 SHA512 e862e148b8f053d8f4d40de8db9a4db587cb0c7b4120fe433d769aa2772a1aabd697c3c3f8ee34f547ee12c4bc4355116d5694d5f451264f8719d4af0fb32cb0
 DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.0.src.tar.xz 112062796 BLAKE2B 947917b6c75cbd8882133dc01f57013523274962371ac5ae4a22b010f8a7d5d31288c1d9847bf19ba919fa3110fe34a8ff937107fe19bd064ed87bf4d08d8a51 SHA512 e5aacbe7574dcec62017cc03c9fa2ee4cf075125a3d6c3975c38f06e91adcebb1ff92bcf40c6dd67db087813c60b15a04f1424c713d751199518b58025ce87fc
 DIST llvm-project-15.0.0.src.tar.xz.sig 438 BLAKE2B 8eb12c259f94d8f867a31dbe05128adc1f9cc7ec8bcbdbe1738d2fad461f5d214e674f080f7f29b639a7a75f9c5b56c0f959f538697d647b94b97dc56b036e5f SHA512 4096464a46e07575b7cff448ff8bbc38fe972505f366b744419a06339cf32b93266b0fae5390879859041ce6710e4b675ed3ea7561d6a817623d7ece0e969661
+DIST llvm-project-15.0.1.src.tar.xz 112068688 BLAKE2B 8fd6690445f7cbc8b47a7c1dd1f2c4fbc39f9a97f9d4a0015d466726454b090b0d1ff9b0d926eba7065e84782901687f74e6540a36dc6656a93f3c92c7bc7e06 SHA512 cef84bc173118a30db3ece5e5c6f874bf689c77afc40a4792fdcb7556555ac14a8e6de1dc811755405e5d162d63bc69abaecba30d220a42765160d69f0073fda
+DIST llvm-project-15.0.1.src.tar.xz.sig 438 BLAKE2B d8f634adab531bb19178fb27bc83b3a90c856e9402dd5af700f9af43813f68d20c21b9112dd95e9f6f10609ee51ed5aaf77edb96ca16fb93136b8aea432affd3 SHA512 cbf2570840d8dc12f6436c495a23cf9d439ee195755c01a6d1d5bcc20133599dc956dc43a0f5016698e3c9a960826f5f3c2840a73f993467e275856a67999fda
 DIST llvm-project-303526ef3aa211c1930be2885deae15eeeda3b18.tar.gz 167503164 BLAKE2B 143c72c58517b3e40ee74c1a0df47bfd0d0f9e71926bc8c39a007e674a08df95d0ffe05f523f97e4409b248349e13719cabbc7ac6938feebe702959e84a07243 SHA512 9aa5c86de6c6be1d26c085eb29ea283429e41330e937e5fdbd545bb3f5b996ac82cd6268701fcbbd202e89ee35f2b67e595fc595bb7383778e9ad5fd52ca10a0
 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.0.ebuild 547 BLAKE2B bb30fa507d6383b92417c55f10a7233e0d48ab7a3ff07b811e135e5f828a2332eafdbee2ee738050a7536b6f956cf8285f0e6d8f40511891580278b2434414d6 SHA512 e70dbbf7bb64ef672de7349d423c41b9ef88471c22be0e3ae326ee1506f3c764f3ca0e695a9953273411c70e4f7ec903533749d030ec37c381819b1850679dd8
 EBUILD clang-common-15.0.1.9999.ebuild 463 BLAKE2B 78e3106b33b6a5b776a1ae91541ec295e08f284b9017684ea1481097be14084bea03013103163b9a1d059dcd261f85469e34f9e730b34cc957078fa645886f9a SHA512 94970664f46768b3373443c17a1cbdfccc6a75d5343f6effee228284931997129214bf0cc9ffcaa386878e7b405dfd7c876ca303bd1686e72197027ede6d37c8
+EBUILD clang-common-15.0.1.ebuild 547 BLAKE2B bb30fa507d6383b92417c55f10a7233e0d48ab7a3ff07b811e135e5f828a2332eafdbee2ee738050a7536b6f956cf8285f0e6d8f40511891580278b2434414d6 SHA512 e70dbbf7bb64ef672de7349d423c41b9ef88471c22be0e3ae326ee1506f3c764f3ca0e695a9953273411c70e4f7ec903533749d030ec37c381819b1850679dd8
 EBUILD clang-common-16.0.0.9999.ebuild 463 BLAKE2B 78e3106b33b6a5b776a1ae91541ec295e08f284b9017684ea1481097be14084bea03013103163b9a1d059dcd261f85469e34f9e730b34cc957078fa645886f9a SHA512 94970664f46768b3373443c17a1cbdfccc6a75d5343f6effee228284931997129214bf0cc9ffcaa386878e7b405dfd7c876ca303bd1686e72197027ede6d37c8
-EBUILD clang-common-16.0.0_pre20220915.ebuild 463 BLAKE2B 78e3106b33b6a5b776a1ae91541ec295e08f284b9017684ea1481097be14084bea03013103163b9a1d059dcd261f85469e34f9e730b34cc957078fa645886f9a SHA512 94970664f46768b3373443c17a1cbdfccc6a75d5343f6effee228284931997129214bf0cc9ffcaa386878e7b405dfd7c876ca303bd1686e72197027ede6d37c8
 EBUILD clang-common-16.0.0_pre20220918.ebuild 463 BLAKE2B 78e3106b33b6a5b776a1ae91541ec295e08f284b9017684ea1481097be14084bea03013103163b9a1d059dcd261f85469e34f9e730b34cc957078fa645886f9a SHA512 94970664f46768b3373443c17a1cbdfccc6a75d5343f6effee228284931997129214bf0cc9ffcaa386878e7b405dfd7c876ca303bd1686e72197027ede6d37c8
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/sys-devel/clang-common/clang-common-16.0.0_pre20220915.ebuild b/sys-devel/clang-common/clang-common-15.0.1.ebuild
index 1285500128bb..798f9e9fb858 100644
--- a/sys-devel/clang-common/clang-common-16.0.0_pre20220915.ebuild
+++ b/sys-devel/clang-common/clang-common-15.0.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
 
 PDEPEND="
 	sys-devel/clang:*
diff --git a/sys-devel/clang-runtime/Manifest b/sys-devel/clang-runtime/Manifest
index 748d81e15a84..9d4ea85ab0b7 100644
--- a/sys-devel/clang-runtime/Manifest
+++ b/sys-devel/clang-runtime/Manifest
@@ -2,7 +2,7 @@ EBUILD clang-runtime-13.0.1.ebuild 704 BLAKE2B a75c3997e7f744e1c50f7672bcd356422
 EBUILD clang-runtime-14.0.6.ebuild 760 BLAKE2B 0f6cfb8536569ffe2a09305e71056309690ad1c8e92543e64025bd5e009eac35018ec22b2c0f80c12f3a527cc7e0bfe4ec1bfcb2dd9dea54106abf46b13e5592 SHA512 580efee12fe0e53447f5644fad248ebded8ae6cd8cb5871cb38bb3148091886b6fb9a57ac712d3158d5c3fc38c043b0bfbf62fc550a609752a42c23e605b0ded
 EBUILD clang-runtime-15.0.0-r1.ebuild 766 BLAKE2B db9c38e5d06c9e20d002696b879f61cf79cfe43059224f4a30d9e472a0ecd4a9298d03767e82ac29abcfba283754cb06c1b460e759763dcad130446323af4ff8 SHA512 475cd0538899a4d2a0132f79efbe7fd928a41e7e11798a35b5ba10b3bfcb9bff01b471af5a611f40d3981d2b9d9902fa1bc223199429685de475c38396ffa53e
 EBUILD clang-runtime-15.0.1.9999.ebuild 700 BLAKE2B fc3ea6d50378cd569aa9a2a30cae69dfe59524f7c9edf5a4f6e39d5d07568224625ad286e857d7d852aef95903cfe9804f54e83aa093269ca2287f57fba2ebb2 SHA512 0b88353d5a7fda68a034017bac76c37ef36d8477b52f4446e81ff01861d50f1140933b54058ad3a3bfa5cade8d8ad2c86cfe5c580b682a9bb03f2e471d3e99ed
+EBUILD clang-runtime-15.0.1.ebuild 766 BLAKE2B db9c38e5d06c9e20d002696b879f61cf79cfe43059224f4a30d9e472a0ecd4a9298d03767e82ac29abcfba283754cb06c1b460e759763dcad130446323af4ff8 SHA512 475cd0538899a4d2a0132f79efbe7fd928a41e7e11798a35b5ba10b3bfcb9bff01b471af5a611f40d3981d2b9d9902fa1bc223199429685de475c38396ffa53e
 EBUILD clang-runtime-16.0.0.9999.ebuild 1374 BLAKE2B 9699c87947cae5b33b56d8d2edfc7eb1128f3f9355986f74874e4e8b481fb513e8a52523c8b97cf56db364dff311f7d07afa0acb04d37ba30be2918f24226a81 SHA512 cc6a00e72f472b8d1144dc61ec773b41268ed69fa56330e59185775d6fa242a3b884bc8cd539a80375deb22d42bbf53a30d0bf074e0afb706089e20a23c513f0
-EBUILD clang-runtime-16.0.0_pre20220915.ebuild 1374 BLAKE2B 9699c87947cae5b33b56d8d2edfc7eb1128f3f9355986f74874e4e8b481fb513e8a52523c8b97cf56db364dff311f7d07afa0acb04d37ba30be2918f24226a81 SHA512 cc6a00e72f472b8d1144dc61ec773b41268ed69fa56330e59185775d6fa242a3b884bc8cd539a80375deb22d42bbf53a30d0bf074e0afb706089e20a23c513f0
 EBUILD clang-runtime-16.0.0_pre20220918.ebuild 1374 BLAKE2B 9699c87947cae5b33b56d8d2edfc7eb1128f3f9355986f74874e4e8b481fb513e8a52523c8b97cf56db364dff311f7d07afa0acb04d37ba30be2918f24226a81 SHA512 cc6a00e72f472b8d1144dc61ec773b41268ed69fa56330e59185775d6fa242a3b884bc8cd539a80375deb22d42bbf53a30d0bf074e0afb706089e20a23c513f0
 MISC metadata.xml 661 BLAKE2B 24688c511713ea102b83c71d226d519981b3aee0e05ef7a56d6a80be829efd843194e45cb4fd801f0bb976b6f1976386d6a2b05d2bc907fe2aa42b22b85b7d1f SHA512 2b5ab8783c90795f2e7d1673d876048ed9745f4911fb7a860df56deac13a6dfeba4581a84562eae54eff757c45042ca3fab75c7800313ae61df9ce69780a9294
diff --git a/sys-devel/clang-runtime/clang-runtime-15.0.1.ebuild b/sys-devel/clang-runtime/clang-runtime-15.0.1.ebuild
new file mode 100644
index 000000000000..f0ec98510540
--- /dev/null
+++ b/sys-devel/clang-runtime/clang-runtime-15.0.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-build
+
+DESCRIPTION="Meta-ebuild for clang runtime libraries"
+HOMEPAGE="https://clang.llvm.org/"
+
+LICENSE="metapackage"
+SLOT="$(ver_cut 1-3)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+IUSE="+compiler-rt libcxx openmp +sanitize"
+REQUIRED_USE="sanitize? ( compiler-rt )"
+
+RDEPEND="
+	compiler-rt? (
+		~sys-libs/compiler-rt-${PV}:${SLOT}[abi_x86_32(+)?,abi_x86_64(+)?]
+		sanitize? (
+			~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT}[abi_x86_32(+)?,abi_x86_64(+)?]
+		)
+	)
+	libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] )
+	openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] )
+"
diff --git a/sys-devel/clang-runtime/clang-runtime-16.0.0_pre20220915.ebuild b/sys-devel/clang-runtime/clang-runtime-16.0.0_pre20220915.ebuild
deleted file mode 100644
index 3cb2769d40af..000000000000
--- a/sys-devel/clang-runtime/clang-runtime-16.0.0_pre20220915.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multilib-build toolchain-funcs
-
-DESCRIPTION="Meta-ebuild for clang runtime libraries"
-HOMEPAGE="https://clang.llvm.org/"
-
-LICENSE="metapackage"
-SLOT="$(ver_cut 1-3)"
-KEYWORDS=""
-IUSE="+compiler-rt libcxx openmp +sanitize"
-REQUIRED_USE="sanitize? ( compiler-rt )"
-PROPERTIES="live"
-
-RDEPEND="
-	compiler-rt? (
-		~sys-libs/compiler-rt-${PV}:${SLOT}[abi_x86_32(+)?,abi_x86_64(+)?]
-		sanitize? (
-			~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT}[abi_x86_32(+)?,abi_x86_64(+)?]
-		)
-	)
-	libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] )
-	openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] )
-"
-
-pkg_pretend() {
-	if tc-is-clang; then
-		ewarn "You seem to be using clang as a system compiler.  As of clang-16,"
-		ewarn "upstream has turned a few warnings that commonly occur during"
-		ewarn "configure script runs into errors by default.  This causes some"
-		ewarn "configure tests to start failing, sometimes resulting in silent"
-		ewarn "breakage, missing functionality or runtime misbehavior.  It is"
-		ewarn "not yet clear whether the change will remain or be reverted."
-		ewarn
-		ewarn "For more information, please see:"
-		ewarn "https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213"
-	fi
-}
diff --git a/sys-devel/clang-toolchain-symlinks/Manifest b/sys-devel/clang-toolchain-symlinks/Manifest
new file mode 100644
index 000000000000..a9a037e1b376
--- /dev/null
+++ b/sys-devel/clang-toolchain-symlinks/Manifest
@@ -0,0 +1,3 @@
+EBUILD clang-toolchain-symlinks-15.ebuild 966 BLAKE2B 6f9446b3421c03fe2bf81b488303c251fd4c3afbb717b95585a401c1ac625be8391388e52f65ea6012ae0d1a509d7fe2717e2caccd44908cb68e774b9c0ada40 SHA512 8669d75ddf72c00aa150f7285524d5600f684db2391ef6174f914fa13a8b4eeff56fcc0773d0e70ed57e0ff5f8fec8df60e48a14febec5e7140777dbd579971b
+EBUILD clang-toolchain-symlinks-16.ebuild 911 BLAKE2B 30a2b8e73ebf35c10744373a43d0927e2a156c624f8786854e7fc3d0d775d129706d3e0796768c225403710183d5bdb979f341efef73f1f06ac57b42e34e6fd8 SHA512 071ec5674184e8f54a5aaa2c5b1156990df9f0240da7b178ba5d04589fb6aa19b4648362a5c5349b9d9c987bf94c972cbae706de7a6611c259edcfacb4e56fa1
+MISC metadata.xml 683 BLAKE2B 09136e24c691f67003491e09ee7210b7a7259f410c200d7af9aac75cb8b08ff67ea338b4fa741d6d4e58d257c3685b8ed76749fbb06f0cfe8c15641abd14e185 SHA512 0fa115233dc1d374f017caa0ffcef436b5e95d2a6b69afc94e0c2055bb67715dd529adb6359088d9078ae4c501fc4da1412186efd8d852ffd1ac42c42787eadc
diff --git a/sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-15.ebuild b/sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-15.ebuild
new file mode 100644
index 000000000000..d8ea28f5257f
--- /dev/null
+++ b/sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-15.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib
+
+DESCRIPTION="Symlinks to use Clang on GCC-free system"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:LLVM"
+SRC_URI=""
+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"
+
+RDEPEND="
+	sys-devel/clang:${SLOT}
+"
+
+src_install() {
+	local tools=()
+
+	if use native-symlinks; then
+		tools+=(
+			cc:clang
+			cpp:clang-cpp
+			c++:clang++
+		)
+	fi
+	if use gcc-symlinks; then
+		tools+=(
+			gcc:clang
+			g++:clang++
+		)
+	fi
+
+	local abi 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 t in "${tools[@]}"; do
+			dosym "${t#*:}" "${dest}/${abi_chost}-${t%:*}"
+		done
+	done
+}
diff --git a/sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-16.ebuild b/sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-16.ebuild
new file mode 100644
index 000000000000..980427e31a5e
--- /dev/null
+++ b/sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-16.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib
+
+DESCRIPTION="Symlinks to use Clang on GCC-free system"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:LLVM"
+SRC_URI=""
+S=${WORKDIR}
+
+LICENSE="public-domain"
+SLOT="${PV}"
+KEYWORDS=""
+PROPERTIES="live"
+IUSE="gcc-symlinks +native-symlinks"
+
+RDEPEND="
+	sys-devel/clang:${SLOT}
+"
+
+src_install() {
+	local tools=()
+
+	if use native-symlinks; then
+		tools+=(
+			cc:clang
+			cpp:clang-cpp
+			c++:clang++
+		)
+	fi
+	if use gcc-symlinks; then
+		tools+=(
+			gcc:clang
+			g++:clang++
+		)
+	fi
+
+	local abi 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 t in "${tools[@]}"; do
+			dosym "${t#*:}" "${dest}/${abi_chost}-${t%:*}"
+		done
+	done
+}
diff --git a/sys-devel/clang-toolchain-symlinks/metadata.xml b/sys-devel/clang-toolchain-symlinks/metadata.xml
new file mode 100644
index 000000000000..58c5027c2994
--- /dev/null
+++ b/sys-devel/clang-toolchain-symlinks/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>llvm@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="gcc-symlinks">
+			Install symlinks for 'gcc' and 'g++' for extra
+			compatibility.
+		</flag>
+		<flag name="native-symlinks">
+			Install generic tool symlinks like 'cc' and 'c++',
+			as well as ${CTARGET}-*. These symlinks are installed
+			into slotted LLVM bindir, so they should not take precedence
+			over symlinks installed into /usr/bin
+			by <pkg>sys-devel/gcc-config</pkg> but they can be helpful
+			for GCC-free setups.
+		</flag>
+	</use>
+</pkgmetadata>
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index fc619e83b11d..01419c8d6c30 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -1,26 +1,28 @@
 DIST llvm-13.0.1-manpages.tar.bz2 202187 BLAKE2B 32a761426dbe4c3c355d30660254305cd88b6d513faee04c78e370cea9d38761108a9be4c4b4ac39b6a74400af1f9d37ffd11ab05acd7340175c8d66845ae7d9 SHA512 9495e1daf588540fdb8b9ee905a9b6be4693bd70b7f42c8e8a0d667242fc24dc853c45918d3bc09d02f0761ad61541bc9749c1498e312da129abdab638a0d572
 DIST llvm-14.0.6-manpages.tar.bz2 218186 BLAKE2B 4491296e490936a2d7b518e19a0ff6312b89abeef3fbe5da5d0b93bb2add1088ddf64a0b00ec8846062d19b1ad31e53eadee7ce03c9034aab554e183d1baccf6 SHA512 f8328dc2ec1e8d941d47e583ee31fae7bdcebb3f854b5c8a4a84bd19a79bf5427ad204012c81349bc05a291e41cf48e5129b4578bbd5d4490dd01e1c0b5823bf
 DIST llvm-15.0.0-manpages.tar.bz2 226153 BLAKE2B 60535fce25935f4475148f91fbac810b3f20b09486822aa98008dc3ba9fae72dd307c53b5086e9bb010d49e72b50fa7e7f40eb4bc081315fd314bac7e8b45de6 SHA512 f45d58d928457323e276c942f970e999515df546c5c133e1ee2eb1e9be39b1b4721c09a0a90b9a434cac7212ac3b394d8d631bc65fe2a6eeeeba811d4f037ea5
+DIST llvm-15.0.1-manpages.tar.bz2 228787 BLAKE2B 7a43d98cf8546457b6c8557d47c5439900b584111e314c9a38671d20f12244314c56af6a8e7427345eea7e48a9b0d51aff88b2f7ae97be5f7122c068d92a9f3e SHA512 f08620768f632b85d1ad624c1dd6f93743069113411603583fa3b540072b05a44123e8149ed2a36340ca3973e99f84291281bc8ddd0fca159a4a5509fbadd3d7
 DIST llvm-gentoo-patchset-13.0.1.tar.xz 6288 BLAKE2B 899222b962486e924e4f8a2b574d285531a3f87af9385ff68c81db92aa224a0cde6d4ee049b5405056bedb4b232b50e1d5840024071a4a215f6311853304c92d SHA512 b2805337f1deca626768a44c5e7ac9ed16e0c31bead1647d44a493a8123c1b8e8f1c8ceee3536bcc6fa87fdd3fcec408229f701adf30eff07e7ef9889b847b01
 DIST llvm-gentoo-patchset-14.0.6-r2.tar.xz 16120 BLAKE2B e12e522fdb7ba505693c679cb09cc8e00e6a954df195c86c2af4dbf1b68334a405b8dcc45f2e28b5e5e0b7e9d5eb7ba907337027927371b7a3b7784ff8aae7e0 SHA512 8a5ea71c30fc0727cc855dd812bbcb6d5f51c80c98eb3d5b80258d5c5eaab1310edc9d53ae63c2ca827abec68e2912c4b69ef0da351ff883fb30545a61e1d09c
 DIST llvm-gentoo-patchset-15.0.0-r1.tar.xz 4952 BLAKE2B 915aa1db9b16c3a6b7ae26c9935d862e4bda1d11595eee16475ca372beef0ae9a853e64e39bd82f80e95fa7eff18d415c6683b8f6def9734cd7cb9da04caaa7a SHA512 98b2d9dbc1d66e9f1447a121ffe0dd04e6dbccea734ba68e2495cf572314e3faf42645b65cc3906abb49e59ec1007b0b12fd7a78216b447b154d8ec2abbdb6f8
 DIST llvm-gentoo-patchset-15.0.0-r4.tar.xz 16196 BLAKE2B 227a7d9feb1facef886b04580fdff706ec3e9cb79187c8210b493a8e1a22f94642201b8067bf65636ddd315561ae06520eb3cab907b413afeb898d4f75b58e06 SHA512 1f717f85f630af8db1e3bafe30a1a5c447cdddd9d355d44728a72bc2e6a61fe3a82726fce3b43fc459f626a89d1fc651df2301a485371a5a3d921e8e7e1a906b
-DIST llvm-gentoo-patchset-16.0.0_pre20220915.tar.xz 4692 BLAKE2B a5ea9b9d7dcb2b715a22d3c1e4bbda92bb710eddd50a9a3dd07ef3f23841fe76359ddb5fe585115926ee202bf91ccda7b0ea008576faba9fc00bdbcfec2f21a3 SHA512 489692969bc9364f123eb693e577e7796eee6d2d63e15dc92b355e7d1410bbcbb49fc3140df202b242f9c003aac1d8f492ef7f723eaa7c1cfe807fc90758711d
+DIST llvm-gentoo-patchset-15.0.1.tar.xz 3516 BLAKE2B 1bc54df5272eb743b5f736cca2bd5a90cf371ee759ba3aa787910ce6cc58c5c61c3eae226a0619aa9c4e9b8639149d53582cf52fad4014e65a83f52eaeaf5b61 SHA512 380ed5ffdeacf97bf76d49bec90f8f46c53f50fdd46983ab77afda4aaa6bdc671c0e179fe9dca1d8e50e377080675575f72ca2b05582349f8710e1b3c2dc76a6
 DIST llvm-gentoo-patchset-9999-r3.tar.xz 4076 BLAKE2B 30bdf740606a1718ae45d850803385d425b656fbbe0250f587cad54f55272e3617d5ee0d04f534a58f87408b0a2dea322ebf1bb8cd653a2beba21d0bc5778c62 SHA512 2c7080ffd09d7dcf4c72a97044a5c63ab895250721d60270bc51c2095aef5f9039781892b4c0d14e942611686153f874a1f52a1c854bb8ca093383c08bdc005a
 DIST llvm-gentoo-patchset-9999-r4.tar.xz 4120 BLAKE2B 0d45763a36b711e336bf1e36c361c68df5d679837e0b1cb1f9cc26bb52bf769f3c6683f56a01a7ea2bddcbf044a883ea504360a2414ad8dab1f696b8bdd61bfa SHA512 a02b08faf2fa59302161e7ac8f129592fde2e6c6ad5b273c948fa0d68e6a76f14fecc2850cec43f9a9505d483066240eaa3787c77e6bf75bbaa2c4dcacda2d16
-DIST llvm-project-02a27b38909edc46c41732f79a837c95c9992d5a.tar.gz 167414990 BLAKE2B cd9c4be6d3155a4cbf1abff9d8246b9d6fea98e29459c226bda36df250cc22883f08175514fce037d146866d521a56669678b5c35b5163b38532b8c2920b25a6 SHA512 e862e148b8f053d8f4d40de8db9a4db587cb0c7b4120fe433d769aa2772a1aabd697c3c3f8ee34f547ee12c4bc4355116d5694d5f451264f8719d4af0fb32cb0
 DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.0.src.tar.xz 112062796 BLAKE2B 947917b6c75cbd8882133dc01f57013523274962371ac5ae4a22b010f8a7d5d31288c1d9847bf19ba919fa3110fe34a8ff937107fe19bd064ed87bf4d08d8a51 SHA512 e5aacbe7574dcec62017cc03c9fa2ee4cf075125a3d6c3975c38f06e91adcebb1ff92bcf40c6dd67db087813c60b15a04f1424c713d751199518b58025ce87fc
 DIST llvm-project-15.0.0.src.tar.xz.sig 438 BLAKE2B 8eb12c259f94d8f867a31dbe05128adc1f9cc7ec8bcbdbe1738d2fad461f5d214e674f080f7f29b639a7a75f9c5b56c0f959f538697d647b94b97dc56b036e5f SHA512 4096464a46e07575b7cff448ff8bbc38fe972505f366b744419a06339cf32b93266b0fae5390879859041ce6710e4b675ed3ea7561d6a817623d7ece0e969661
+DIST llvm-project-15.0.1.src.tar.xz 112068688 BLAKE2B 8fd6690445f7cbc8b47a7c1dd1f2c4fbc39f9a97f9d4a0015d466726454b090b0d1ff9b0d926eba7065e84782901687f74e6540a36dc6656a93f3c92c7bc7e06 SHA512 cef84bc173118a30db3ece5e5c6f874bf689c77afc40a4792fdcb7556555ac14a8e6de1dc811755405e5d162d63bc69abaecba30d220a42765160d69f0073fda
+DIST llvm-project-15.0.1.src.tar.xz.sig 438 BLAKE2B d8f634adab531bb19178fb27bc83b3a90c856e9402dd5af700f9af43813f68d20c21b9112dd95e9f6f10609ee51ed5aaf77edb96ca16fb93136b8aea432affd3 SHA512 cbf2570840d8dc12f6436c495a23cf9d439ee195755c01a6d1d5bcc20133599dc956dc43a0f5016698e3c9a960826f5f3c2840a73f993467e275856a67999fda
 DIST llvm-project-303526ef3aa211c1930be2885deae15eeeda3b18.tar.gz 167503164 BLAKE2B 143c72c58517b3e40ee74c1a0df47bfd0d0f9e71926bc8c39a007e674a08df95d0ffe05f523f97e4409b248349e13719cabbc7ac6938feebe702959e84a07243 SHA512 9aa5c86de6c6be1d26c085eb29ea283429e41330e937e5fdbd545bb3f5b996ac82cd6268701fcbbd202e89ee35f2b67e595fc595bb7383778e9ad5fd52ca10a0
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD clang-13.0.1.ebuild 11294 BLAKE2B 33760cbd488068389efed5c011b15288021d1f93a371d5114301a5f86e815b3a1e9ae21ed6304d90916778f2312db17339d85b6d76e5e8255614706ddc3a7cf6 SHA512 b49773a02c15c4e869682664bd5703d7e08f60be9558fdbd78da19be5d5a1158093729260106cffe4cd8a6295ba740e42cc43d07da00ed8ead14dc45899ce80a
 EBUILD clang-14.0.6-r1.ebuild 11719 BLAKE2B 743e26b68f15e8b4aa7acfe4f7abd095fe42a3ba6dafdff278d0bfe06f57679490e0940a1029f97d5cc3f6d4ac8b44ea63283bbad1052623ee0048fdbbeb54e0 SHA512 ec6da9dcbed9f078307e8265362a5b39dac9d97d8aadbba16395ee7ddb442d34d1d2a1e9e880da41dbdb51fcf3c741c33ac469e5f6ffa4d091adb4d1743fa12b
 EBUILD clang-15.0.0-r1.ebuild 12282 BLAKE2B 5d8a99fad9c19be7d7711dc1905ae10bf358e095160e3842614300985674fbc5c0b451bb10d1e613a804ef73ea5fb9ead3e6ac894e25bb50c738bca858668dd2 SHA512 1a2c683c0dac377fbdea508b708f3d3ec21267df17fc91c1309e799912f99fa366e18105286759add4cdfcdc770b01e0260293e9f70732714b0ef463dd5a1b04
 EBUILD clang-15.0.0.ebuild 12282 BLAKE2B d206ca8cfa40ac284f35638a45cb290692ac9eea50dfa09a87d3dd68906d8edad26ac69fe96a57605ea114d70205419061197192176d1e55cc2367648f899cfb SHA512 b48b9a7b45b707f28c401fc4a9d3eca259f3982274960823459a44b67dbf3cda17a815aaa882447a1ab9e650280d709d186e7929c7229f5491b819c6a1beddef
-EBUILD clang-15.0.1.9999.ebuild 12204 BLAKE2B e4a9fbefeca8967edd37366d0eb8836694da5b08064e8e0e7a0ffb1c49abca2ee76e58a12f42497aa2b2f608a60a869a9cfcbe310e5cf66f70c46cd3f076a485 SHA512 8326ae79c6c60db0b63645aab3f5d1a22b44be27f86a1b4306a6a88db8af985d2af4ef840e69203c87f68be2b1e874596556993eb344b10c6ba19ca66f97c436
-EBUILD clang-16.0.0.9999.ebuild 12179 BLAKE2B a23438c74a85834bcaba124e3865cbd46714422e0f813257a2466e27303ee1e447ad0148766df66136eda6b2590f0446c038b83f024efeb88b73855cec66b7eb SHA512 0be8b3a659c4c0cc1d44b95460ddab56875f0720c0f5b1f499c30058d5da1a1346adc24eb5c995349bd48a89ad1088bf690c0bcb75bbebca246d0b64887ca1ee
-EBUILD clang-16.0.0_pre20220915.ebuild 12177 BLAKE2B 829d44b98dd73b5d0e279a80f38895cdba238083fc8bc43ee5bb459094d7e3fdb6303e7ffa16d987675fb655d36e3d91b3226a1ad7685459f83e2d871c182066 SHA512 c7128887fbd524b3cdd13060d94a7fb46b43eeab0ea99b9c7f81f80bb77379a5d7a357f4594b1cb638b25fe9cfb75f3d9ffd130d126dea84930f595aee26160f
-EBUILD clang-16.0.0_pre20220918.ebuild 12179 BLAKE2B a23438c74a85834bcaba124e3865cbd46714422e0f813257a2466e27303ee1e447ad0148766df66136eda6b2590f0446c038b83f024efeb88b73855cec66b7eb SHA512 0be8b3a659c4c0cc1d44b95460ddab56875f0720c0f5b1f499c30058d5da1a1346adc24eb5c995349bd48a89ad1088bf690c0bcb75bbebca246d0b64887ca1ee
+EBUILD clang-15.0.1.9999.ebuild 12248 BLAKE2B c39472865cd0f8c5084ae63e294a3960b0c98afa28c20a3077f6d887a58297b2213beca41a164ffaad63d34441af14f5781d13aa440d95c4be84c45af466aaae SHA512 6eb63fb2f88d26a3e8926dd015fdffc6cef2437196775c284b530cc4f18834894317ea3f56ef8545ceb647a940442cc2f9170a9f6fa19d234e97daedc9ba33e4
+EBUILD clang-15.0.1.ebuild 12323 BLAKE2B ebf632eb0d92e1b6f28c10124e4cd196cf4e44e7c19da12344c7a68c2c8f680d7588f75d8d39671513f615ca45487e3a2cd2149f08f08c01bc7f8007cade8222 SHA512 386c70514dbf87a8177fd3f10f5022cd4d4ac8f876fe9558dd03ab979ce266c6dd5444ea0e43c7720f3b848297ce34ddb8ea53c561598376464000375fa7ccac
+EBUILD clang-16.0.0.9999.ebuild 12223 BLAKE2B a135fbca2e75c6af8c7e611c36fa127ed8b5ed1ec10fc0a8af1f0e4f57ea67701b0b4d4b4c0f161831b8d8b18479bc8ffdb28ad02cedbfa23655641edc3a2b52 SHA512 898eb6cc5d87d173032f1820773dfee607b682458787c2ae149c0fca546d20dcce7fddc229ec273e3a019c7b75c724d4a0ef462e01839bcea203e11950298356
+EBUILD clang-16.0.0_pre20220918.ebuild 12223 BLAKE2B a135fbca2e75c6af8c7e611c36fa127ed8b5ed1ec10fc0a8af1f0e4f57ea67701b0b4d4b4c0f161831b8d8b18479bc8ffdb28ad02cedbfa23655641edc3a2b52 SHA512 898eb6cc5d87d173032f1820773dfee607b682458787c2ae149c0fca546d20dcce7fddc229ec273e3a019c7b75c724d4a0ef462e01839bcea203e11950298356
 MISC metadata.xml 1419 BLAKE2B 67e54312c45894825e644eec3b17f9d788a31beb8d8acf9fd5dfb604a02e35f01a0825d71547716e78b8aad9d4f7ca4d7f6a9085afc3235e3e4ed16dd46d526e SHA512 04981d6d909c239a8183cff0cd87418d88a1b3bb4c3848a88cb82164d0c5e234ab766d9a3339293502543c3ce92f7ab4fa9c3202fb45833429511e0f9d9ad584
diff --git a/sys-devel/clang/clang-15.0.1.9999.ebuild b/sys-devel/clang/clang-15.0.1.9999.ebuild
index ce8bd9ade187..ca2b0df55f46 100644
--- a/sys-devel/clang/clang-15.0.1.9999.ebuild
+++ b/sys-devel/clang/clang-15.0.1.9999.ebuild
@@ -44,6 +44,7 @@ BDEPEND="
 "
 PDEPEND="
 	sys-devel/clang-common
+	sys-devel/clang-toolchain-symlinks:${SLOT}
 	~sys-devel/clang-runtime-${PV}
 	default-compiler-rt? (
 		=sys-libs/compiler-rt-${PV%_*}*
diff --git a/sys-devel/clang/clang-16.0.0_pre20220915.ebuild b/sys-devel/clang/clang-15.0.1.ebuild
index 3d7aeece559c..63702176d2d3 100644
--- a/sys-devel/clang/clang-16.0.0_pre20220915.ebuild
+++ b/sys-devel/clang/clang-15.0.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x64-macos"
 IUSE="
 	debug default-compiler-rt default-libcxx default-lld doc
 	llvm-libunwind +pie +static-analyzer test xml
@@ -44,6 +44,7 @@ BDEPEND="
 "
 PDEPEND="
 	sys-devel/clang-common
+	sys-devel/clang-toolchain-symlinks:${SLOT}
 	~sys-devel/clang-runtime-${PV}
 	default-compiler-rt? (
 		=sys-libs/compiler-rt-${PV%_*}*
@@ -64,7 +65,7 @@ LLVM_TEST_COMPONENTS=(
 	llvm/utils/{lit,llvm-lit,unittest}
 	llvm/utils/{UpdateTestChecks,update_cc_test_checks.py}
 )
-LLVM_PATCHSET=${PV}
+LLVM_PATCHSET=${PV/_/-}
 LLVM_USE_TARGETS=llvm
 llvm.org_set_globals
 
@@ -202,6 +203,7 @@ get_distribution_components() {
 			clang-format
 			clang-offload-bundler
 			clang-offload-packager
+			clang-offload-wrapper
 			clang-pseudo
 			clang-refactor
 			clang-repl
diff --git a/sys-devel/clang/clang-16.0.0.9999.ebuild b/sys-devel/clang/clang-16.0.0.9999.ebuild
index 3fbc52c7a132..5baa52268eff 100644
--- a/sys-devel/clang/clang-16.0.0.9999.ebuild
+++ b/sys-devel/clang/clang-16.0.0.9999.ebuild
@@ -44,6 +44,7 @@ BDEPEND="
 "
 PDEPEND="
 	sys-devel/clang-common
+	sys-devel/clang-toolchain-symlinks:${SLOT}
 	~sys-devel/clang-runtime-${PV}
 	default-compiler-rt? (
 		=sys-libs/compiler-rt-${PV%_*}*
diff --git a/sys-devel/clang/clang-16.0.0_pre20220918.ebuild b/sys-devel/clang/clang-16.0.0_pre20220918.ebuild
index 3fbc52c7a132..5baa52268eff 100644
--- a/sys-devel/clang/clang-16.0.0_pre20220918.ebuild
+++ b/sys-devel/clang/clang-16.0.0_pre20220918.ebuild
@@ -44,6 +44,7 @@ BDEPEND="
 "
 PDEPEND="
 	sys-devel/clang-common
+	sys-devel/clang-toolchain-symlinks:${SLOT}
 	~sys-devel/clang-runtime-${PV}
 	default-compiler-rt? (
 		=sys-libs/compiler-rt-${PV%_*}*
diff --git a/sys-devel/lld-toolchain-symlinks/Manifest b/sys-devel/lld-toolchain-symlinks/Manifest
new file mode 100644
index 000000000000..9a3f38bf6f35
--- /dev/null
+++ b/sys-devel/lld-toolchain-symlinks/Manifest
@@ -0,0 +1,3 @@
+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
diff --git a/sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-15.ebuild b/sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-15.ebuild
new file mode 100644
index 000000000000..75ee3dd007f7
--- /dev/null
+++ b/sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-15.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib
+
+DESCRIPTION="Symlinks to use LLD on binutils-free system"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:LLVM"
+SRC_URI=""
+S=${WORKDIR}
+
+LICENSE="public-domain"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+native-symlinks"
+
+RDEPEND="
+	sys-devel/lld
+"
+
+src_install() {
+	use native-symlinks || return
+
+	local abi
+	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"
+	done
+}
diff --git a/sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-16.ebuild b/sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-16.ebuild
new file mode 100644
index 000000000000..aefb59aafa0d
--- /dev/null
+++ b/sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-16.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib
+
+DESCRIPTION="Symlinks to use LLD on binutils-free system"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:LLVM"
+SRC_URI=""
+S=${WORKDIR}
+
+LICENSE="public-domain"
+SLOT="${PV}"
+KEYWORDS=""
+PROPERTIES="live"
+IUSE="+native-symlinks"
+
+RDEPEND="
+	sys-devel/lld
+"
+
+src_install() {
+	use native-symlinks || return
+
+	local abi
+	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"
+	done
+}
diff --git a/sys-devel/lld-toolchain-symlinks/metadata.xml b/sys-devel/lld-toolchain-symlinks/metadata.xml
new file mode 100644
index 000000000000..1583779e583b
--- /dev/null
+++ b/sys-devel/lld-toolchain-symlinks/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>llvm@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="native-symlinks">
+			Install generic 'ld' symlink, as well as ${CTARGET}-ld.
+			These symlinks are installed into slotted LLVM bindir,
+			so they should not take precedence over symlinks installed
+			into /usr/bin by <pkg>sys-devel/binutils-config</pkg>
+			but they can be helpful for binutils-free setups.
+		</flag>
+	</use>
+</pkgmetadata>
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index dfe54980cd8a..2d46b73e5252 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -1,15 +1,16 @@
-DIST llvm-project-02a27b38909edc46c41732f79a837c95c9992d5a.tar.gz 167414990 BLAKE2B cd9c4be6d3155a4cbf1abff9d8246b9d6fea98e29459c226bda36df250cc22883f08175514fce037d146866d521a56669678b5c35b5163b38532b8c2920b25a6 SHA512 e862e148b8f053d8f4d40de8db9a4db587cb0c7b4120fe433d769aa2772a1aabd697c3c3f8ee34f547ee12c4bc4355116d5694d5f451264f8719d4af0fb32cb0
 DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.0.src.tar.xz 112062796 BLAKE2B 947917b6c75cbd8882133dc01f57013523274962371ac5ae4a22b010f8a7d5d31288c1d9847bf19ba919fa3110fe34a8ff937107fe19bd064ed87bf4d08d8a51 SHA512 e5aacbe7574dcec62017cc03c9fa2ee4cf075125a3d6c3975c38f06e91adcebb1ff92bcf40c6dd67db087813c60b15a04f1424c713d751199518b58025ce87fc
 DIST llvm-project-15.0.0.src.tar.xz.sig 438 BLAKE2B 8eb12c259f94d8f867a31dbe05128adc1f9cc7ec8bcbdbe1738d2fad461f5d214e674f080f7f29b639a7a75f9c5b56c0f959f538697d647b94b97dc56b036e5f SHA512 4096464a46e07575b7cff448ff8bbc38fe972505f366b744419a06339cf32b93266b0fae5390879859041ce6710e4b675ed3ea7561d6a817623d7ece0e969661
+DIST llvm-project-15.0.1.src.tar.xz 112068688 BLAKE2B 8fd6690445f7cbc8b47a7c1dd1f2c4fbc39f9a97f9d4a0015d466726454b090b0d1ff9b0d926eba7065e84782901687f74e6540a36dc6656a93f3c92c7bc7e06 SHA512 cef84bc173118a30db3ece5e5c6f874bf689c77afc40a4792fdcb7556555ac14a8e6de1dc811755405e5d162d63bc69abaecba30d220a42765160d69f0073fda
+DIST llvm-project-15.0.1.src.tar.xz.sig 438 BLAKE2B d8f634adab531bb19178fb27bc83b3a90c856e9402dd5af700f9af43813f68d20c21b9112dd95e9f6f10609ee51ed5aaf77edb96ca16fb93136b8aea432affd3 SHA512 cbf2570840d8dc12f6436c495a23cf9d439ee195755c01a6d1d5bcc20133599dc956dc43a0f5016698e3c9a960826f5f3c2840a73f993467e275856a67999fda
 DIST llvm-project-303526ef3aa211c1930be2885deae15eeeda3b18.tar.gz 167503164 BLAKE2B 143c72c58517b3e40ee74c1a0df47bfd0d0f9e71926bc8c39a007e674a08df95d0ffe05f523f97e4409b248349e13719cabbc7ac6938feebe702959e84a07243 SHA512 9aa5c86de6c6be1d26c085eb29ea283429e41330e937e5fdbd545bb3f5b996ac82cd6268701fcbbd202e89ee35f2b67e595fc595bb7383778e9ad5fd52ca10a0
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD lld-13.0.1.ebuild 1882 BLAKE2B 1a5207649cc769c725f4825ebb6c070eb2b43ffa53ce4c3a04297e5c8e11e9f8cc2df88de51dccefc48a7ad045caadf95b22e747b3760c2d0961f6adba6ff422 SHA512 9f098fda60de3570cd04200babd163d940606a96ff5f7a6f3e8bf31ce054dd50636f47cc25c945cc46e5b4c7646763f58d2799b4940dbee412bad76f73de8dee
 EBUILD lld-14.0.6.ebuild 1894 BLAKE2B 8f5922031c9b64b0cf246800fd26b1802bdcc1fd84aae911106bd0c5a6d9482ff7c92571b7cc7f988e0b8b0b679eb94fa6c62685d69fdf9cc2b697ae29252e09 SHA512 4959af6727591bbd411861f4717ffd523b9a026c33c4de3b035230b1b5dc1067d9fa5c539455ea16fd7a294c95b9019be1e85638448afb0d900dedbb4284a30a
 EBUILD lld-15.0.0.ebuild 1899 BLAKE2B 678b82e050b25e1ff144cba699fad5476b2e41bc16270cb812a0d3b35091baf9bd1ce2365f13a2e0f99b874236f3119765d124a6ad472e12d5a538f36f4048b4 SHA512 4e8117d603205e305c11e15b8776778e1ae0cb04908064b917d3227777f684459318e1766e98cb86746f6d2c0f61f65d690ce518fd4a302104ad52d88c511991
-EBUILD lld-15.0.1.9999.ebuild 1857 BLAKE2B d50e5b40aca9f43d860247f497f2f4ae7539be215002cbf0e64879d526f79bfff8e8adbba7afb5e9ec18813d0e2923bfc8389f8b03d92d48d03b357bd9adb4ad SHA512 4fd89852998e6d52492a28271d75824c90ecddbae6feec7fce597c31039d4f6e033b4521f3aaf0e60c4df36b2a8c00630d8bddfac46f4936fc0376139baaa416
-EBUILD lld-16.0.0.9999.ebuild 1857 BLAKE2B d50e5b40aca9f43d860247f497f2f4ae7539be215002cbf0e64879d526f79bfff8e8adbba7afb5e9ec18813d0e2923bfc8389f8b03d92d48d03b357bd9adb4ad SHA512 4fd89852998e6d52492a28271d75824c90ecddbae6feec7fce597c31039d4f6e033b4521f3aaf0e60c4df36b2a8c00630d8bddfac46f4936fc0376139baaa416
-EBUILD lld-16.0.0_pre20220915.ebuild 1857 BLAKE2B d50e5b40aca9f43d860247f497f2f4ae7539be215002cbf0e64879d526f79bfff8e8adbba7afb5e9ec18813d0e2923bfc8389f8b03d92d48d03b357bd9adb4ad SHA512 4fd89852998e6d52492a28271d75824c90ecddbae6feec7fce597c31039d4f6e033b4521f3aaf0e60c4df36b2a8c00630d8bddfac46f4936fc0376139baaa416
-EBUILD lld-16.0.0_pre20220918.ebuild 1857 BLAKE2B d50e5b40aca9f43d860247f497f2f4ae7539be215002cbf0e64879d526f79bfff8e8adbba7afb5e9ec18813d0e2923bfc8389f8b03d92d48d03b357bd9adb4ad SHA512 4fd89852998e6d52492a28271d75824c90ecddbae6feec7fce597c31039d4f6e033b4521f3aaf0e60c4df36b2a8c00630d8bddfac46f4936fc0376139baaa416
+EBUILD lld-15.0.1.9999.ebuild 1913 BLAKE2B 722b8a6072d6cf0c8949b382ac89096ecdd9f9d9581f087b9417ed9b11b9d7e45e0f7b697cda76544201ca1fccda6ca7566185fd4041573272121565b89e0ba5 SHA512 d1910b9da9f0e90d423c9c97b7c1b1309941a30fe11a08d14c92d58fae873d2e1cd5beaf52613389874826e11c652f3043b6cb843d4f54e367c8652375e93dbf
+EBUILD lld-15.0.1.ebuild 1955 BLAKE2B c8fb954351f0d80d5ee905cbfbcb7d2430bd73e7644ec54afae902ced60bf6a166e5a76c83ba6f18be062fce439a7c3cda5ecd9c1d5f6acb777673a30a1c40e2 SHA512 1b33c0821d40023b026e088b26772e2f851ba53f7c5eef5335a737fbb584120bc527d2711c685556c2b2e106e855aeb69411bf5fce829e33d973ab9ab8562271
+EBUILD lld-16.0.0.9999.ebuild 1913 BLAKE2B 722b8a6072d6cf0c8949b382ac89096ecdd9f9d9581f087b9417ed9b11b9d7e45e0f7b697cda76544201ca1fccda6ca7566185fd4041573272121565b89e0ba5 SHA512 d1910b9da9f0e90d423c9c97b7c1b1309941a30fe11a08d14c92d58fae873d2e1cd5beaf52613389874826e11c652f3043b6cb843d4f54e367c8652375e93dbf
+EBUILD lld-16.0.0_pre20220918.ebuild 1913 BLAKE2B 722b8a6072d6cf0c8949b382ac89096ecdd9f9d9581f087b9417ed9b11b9d7e45e0f7b697cda76544201ca1fccda6ca7566185fd4041573272121565b89e0ba5 SHA512 d1910b9da9f0e90d423c9c97b7c1b1309941a30fe11a08d14c92d58fae873d2e1cd5beaf52613389874826e11c652f3043b6cb843d4f54e367c8652375e93dbf
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/sys-devel/lld/lld-15.0.1.9999.ebuild b/sys-devel/lld/lld-15.0.1.9999.ebuild
index 76bdcb369c4b..f8773e9ca849 100644
--- a/sys-devel/lld/lld-15.0.1.9999.ebuild
+++ b/sys-devel/lld/lld-15.0.1.9999.ebuild
@@ -27,6 +27,9 @@ BDEPEND="
 		$(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
 	)
 "
+PDEPEND="
+	sys-devel/lld-toolchain-symlinks:${PV%%.*}
+"
 
 LLVM_COMPONENTS=( lld cmake libunwind/include/mach-o )
 LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
diff --git a/sys-devel/lld/lld-16.0.0_pre20220915.ebuild b/sys-devel/lld/lld-15.0.1.ebuild
index 76bdcb369c4b..01b41935b823 100644
--- a/sys-devel/lld/lld-16.0.0_pre20220915.ebuild
+++ b/sys-devel/lld/lld-15.0.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="debug test"
 RESTRICT="!test? ( test )"
 
@@ -27,6 +27,9 @@ BDEPEND="
 		$(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
 	)
 "
+PDEPEND="
+	sys-devel/lld-toolchain-symlinks:${PV%%.*}
+"
 
 LLVM_COMPONENTS=( lld cmake libunwind/include/mach-o )
 LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
diff --git a/sys-devel/lld/lld-16.0.0.9999.ebuild b/sys-devel/lld/lld-16.0.0.9999.ebuild
index 76bdcb369c4b..f8773e9ca849 100644
--- a/sys-devel/lld/lld-16.0.0.9999.ebuild
+++ b/sys-devel/lld/lld-16.0.0.9999.ebuild
@@ -27,6 +27,9 @@ BDEPEND="
 		$(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
 	)
 "
+PDEPEND="
+	sys-devel/lld-toolchain-symlinks:${PV%%.*}
+"
 
 LLVM_COMPONENTS=( lld cmake libunwind/include/mach-o )
 LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
diff --git a/sys-devel/lld/lld-16.0.0_pre20220918.ebuild b/sys-devel/lld/lld-16.0.0_pre20220918.ebuild
index 76bdcb369c4b..f8773e9ca849 100644
--- a/sys-devel/lld/lld-16.0.0_pre20220918.ebuild
+++ b/sys-devel/lld/lld-16.0.0_pre20220918.ebuild
@@ -27,6 +27,9 @@ BDEPEND="
 		$(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
 	)
 "
+PDEPEND="
+	sys-devel/lld-toolchain-symlinks:${PV%%.*}
+"
 
 LLVM_COMPONENTS=( lld cmake libunwind/include/mach-o )
 LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
diff --git a/sys-devel/llvm-common/Manifest b/sys-devel/llvm-common/Manifest
index e3cd859af234..b64ebc5bae74 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -1,15 +1,16 @@
-DIST llvm-project-02a27b38909edc46c41732f79a837c95c9992d5a.tar.gz 167414990 BLAKE2B cd9c4be6d3155a4cbf1abff9d8246b9d6fea98e29459c226bda36df250cc22883f08175514fce037d146866d521a56669678b5c35b5163b38532b8c2920b25a6 SHA512 e862e148b8f053d8f4d40de8db9a4db587cb0c7b4120fe433d769aa2772a1aabd697c3c3f8ee34f547ee12c4bc4355116d5694d5f451264f8719d4af0fb32cb0
 DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.0.src.tar.xz 112062796 BLAKE2B 947917b6c75cbd8882133dc01f57013523274962371ac5ae4a22b010f8a7d5d31288c1d9847bf19ba919fa3110fe34a8ff937107fe19bd064ed87bf4d08d8a51 SHA512 e5aacbe7574dcec62017cc03c9fa2ee4cf075125a3d6c3975c38f06e91adcebb1ff92bcf40c6dd67db087813c60b15a04f1424c713d751199518b58025ce87fc
 DIST llvm-project-15.0.0.src.tar.xz.sig 438 BLAKE2B 8eb12c259f94d8f867a31dbe05128adc1f9cc7ec8bcbdbe1738d2fad461f5d214e674f080f7f29b639a7a75f9c5b56c0f959f538697d647b94b97dc56b036e5f SHA512 4096464a46e07575b7cff448ff8bbc38fe972505f366b744419a06339cf32b93266b0fae5390879859041ce6710e4b675ed3ea7561d6a817623d7ece0e969661
+DIST llvm-project-15.0.1.src.tar.xz 112068688 BLAKE2B 8fd6690445f7cbc8b47a7c1dd1f2c4fbc39f9a97f9d4a0015d466726454b090b0d1ff9b0d926eba7065e84782901687f74e6540a36dc6656a93f3c92c7bc7e06 SHA512 cef84bc173118a30db3ece5e5c6f874bf689c77afc40a4792fdcb7556555ac14a8e6de1dc811755405e5d162d63bc69abaecba30d220a42765160d69f0073fda
+DIST llvm-project-15.0.1.src.tar.xz.sig 438 BLAKE2B d8f634adab531bb19178fb27bc83b3a90c856e9402dd5af700f9af43813f68d20c21b9112dd95e9f6f10609ee51ed5aaf77edb96ca16fb93136b8aea432affd3 SHA512 cbf2570840d8dc12f6436c495a23cf9d439ee195755c01a6d1d5bcc20133599dc956dc43a0f5016698e3c9a960826f5f3c2840a73f993467e275856a67999fda
 DIST llvm-project-303526ef3aa211c1930be2885deae15eeeda3b18.tar.gz 167503164 BLAKE2B 143c72c58517b3e40ee74c1a0df47bfd0d0f9e71926bc8c39a007e674a08df95d0ffe05f523f97e4409b248349e13719cabbc7ac6938feebe702959e84a07243 SHA512 9aa5c86de6c6be1d26c085eb29ea283429e41330e937e5fdbd545bb3f5b996ac82cd6268701fcbbd202e89ee35f2b67e595fc595bb7383778e9ad5fd52ca10a0
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD llvm-common-13.0.1.ebuild 608 BLAKE2B 1dfa0b25955f1f044b9980fb80f9d38eb9732a15f9bc1b352a0e75b809ad6d43db16fde3718c569b9152bfbbe2b0f71b7f9ff5306d5ae4b57a380ba003c98c86 SHA512 0702b3222f9733532ddd115f37268713ec2ebbb187b6a02e3423c1e966e594373e38c3c6f6f8eda549afae52922a3decb3126850ca0861cc3d4c8e7c0bdc5921
 EBUILD llvm-common-14.0.6.ebuild 602 BLAKE2B ef26d6ac2606e9a316ddcce442da1762f578ade0346ba2a947fdace5e2020e8841c63d173e42506d23abf6efc062a2edfac0be98a3eefe1f7a29c88702e9f1d5 SHA512 789dad6fdcf9a930ddc1046e7e98ebc1e05b2dd3713bb1ec5b8a5711690d779691c91d1000d9776720b21ed241d2f12c0ae9a8dba0e6a17d0ddf563cdfbe657f
 EBUILD llvm-common-15.0.0.ebuild 608 BLAKE2B 020a3c91ad189fe674f9b5c24b22365b087b4875114dd8928d38f4ed0bbfaf4fcfab2a07f2154c70d9ad137ed41daf6eca5adbdb31802fb40218893898629fa5 SHA512 5fab7e184f76587ab37f878d8c6a103740c43e29c4b6c533da6856e8656ac49e297c885477f0b0e37efa49cf1f232f39a4084741405bb71acb8e6745c0edda33
 EBUILD llvm-common-15.0.1.9999.ebuild 524 BLAKE2B 1864e7c6a8578fe3ad74718368deca408757c501726fd3a2941087756f50bbf9ed83a6a635ef264150c86b577f373b5d391df4cbc6ff3e3e6a561bcc41b2c5f1 SHA512 feab4cb373d2384ce018d26b480024060b89c6a5475e7e7d475124b9a20a2c55470d98799067c437540b6ec6e7471f712534005ec426f76a247b8767edff6164
+EBUILD llvm-common-15.0.1.ebuild 608 BLAKE2B 020a3c91ad189fe674f9b5c24b22365b087b4875114dd8928d38f4ed0bbfaf4fcfab2a07f2154c70d9ad137ed41daf6eca5adbdb31802fb40218893898629fa5 SHA512 5fab7e184f76587ab37f878d8c6a103740c43e29c4b6c533da6856e8656ac49e297c885477f0b0e37efa49cf1f232f39a4084741405bb71acb8e6745c0edda33
 EBUILD llvm-common-16.0.0.9999.ebuild 524 BLAKE2B 1864e7c6a8578fe3ad74718368deca408757c501726fd3a2941087756f50bbf9ed83a6a635ef264150c86b577f373b5d391df4cbc6ff3e3e6a561bcc41b2c5f1 SHA512 feab4cb373d2384ce018d26b480024060b89c6a5475e7e7d475124b9a20a2c55470d98799067c437540b6ec6e7471f712534005ec426f76a247b8767edff6164
-EBUILD llvm-common-16.0.0_pre20220915.ebuild 524 BLAKE2B 1864e7c6a8578fe3ad74718368deca408757c501726fd3a2941087756f50bbf9ed83a6a635ef264150c86b577f373b5d391df4cbc6ff3e3e6a561bcc41b2c5f1 SHA512 feab4cb373d2384ce018d26b480024060b89c6a5475e7e7d475124b9a20a2c55470d98799067c437540b6ec6e7471f712534005ec426f76a247b8767edff6164
 EBUILD llvm-common-16.0.0_pre20220918.ebuild 524 BLAKE2B 1864e7c6a8578fe3ad74718368deca408757c501726fd3a2941087756f50bbf9ed83a6a635ef264150c86b577f373b5d391df4cbc6ff3e3e6a561bcc41b2c5f1 SHA512 feab4cb373d2384ce018d26b480024060b89c6a5475e7e7d475124b9a20a2c55470d98799067c437540b6ec6e7471f712534005ec426f76a247b8767edff6164
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/sys-devel/llvm-common/llvm-common-16.0.0_pre20220915.ebuild b/sys-devel/llvm-common/llvm-common-15.0.1.ebuild
index df37476f6fbc..104c8747bbee 100644
--- a/sys-devel/llvm-common/llvm-common-16.0.0_pre20220915.ebuild
+++ b/sys-devel/llvm-common/llvm-common-15.0.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="
 	!sys-devel/llvm:0
diff --git a/sys-devel/llvm-toolchain-symlinks/Manifest b/sys-devel/llvm-toolchain-symlinks/Manifest
new file mode 100644
index 000000000000..7fc025eeb893
--- /dev/null
+++ b/sys-devel/llvm-toolchain-symlinks/Manifest
@@ -0,0 +1,3 @@
+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
diff --git a/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-15.ebuild b/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-15.ebuild
new file mode 100644
index 000000000000..9cc42ef77e31
--- /dev/null
+++ b/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-15.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib
+
+DESCRIPTION="Symlinks to use LLVM on binutils-free system"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:LLVM"
+SRC_URI=""
+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"
+
+RDEPEND="
+	sys-devel/llvm:${SLOT}
+"
+
+src_install() {
+	use native-symlinks || return
+
+	local tools=(
+		addr2line ar dlltool nm objcopy objdump ranlib readelf size
+		strings strip windres
+	)
+
+	local abi 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 t in "${tools[@]}"; do
+			dosym "llvm-${t}" "${dest}/${abi_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.ebuild
new file mode 100644
index 000000000000..117dff32e17b
--- /dev/null
+++ b/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-16.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib
+
+DESCRIPTION="Symlinks to use LLVM on binutils-free system"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:LLVM"
+SRC_URI=""
+S=${WORKDIR}
+
+LICENSE="public-domain"
+SLOT="${PV}"
+KEYWORDS=""
+PROPERTIES="live"
+IUSE="+native-symlinks"
+
+RDEPEND="
+	sys-devel/llvm:${SLOT}
+"
+
+src_install() {
+	use native-symlinks || return
+
+	local tools=(
+		addr2line ar dlltool nm objcopy objdump ranlib readelf size
+		strings strip windres
+	)
+
+	local abi 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 t in "${tools[@]}"; do
+			dosym "llvm-${t}" "${dest}/${abi_chost}-${t}"
+		done
+	done
+}
diff --git a/sys-devel/llvm-toolchain-symlinks/metadata.xml b/sys-devel/llvm-toolchain-symlinks/metadata.xml
new file mode 100644
index 000000000000..c6260bb7fb74
--- /dev/null
+++ b/sys-devel/llvm-toolchain-symlinks/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>llvm@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="native-symlinks">
+			Install generic tool symlinks like 'objdump' and 'ranlib',
+			as well as ${CTARGET}-*. These symlinks are installed
+			into slotted LLVM bindir, so they should not take precedence
+			over symlinks installed into /usr/bin
+			by <pkg>sys-devel/binutils-config</pkg> but they can be
+			helpful for binutils-free setups.
+		</flag>
+	</use>
+</pkgmetadata>
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 3eaf9dc9bc02..c657e0416784 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -1,23 +1,25 @@
 DIST llvm-13.0.1-manpages.tar.bz2 202187 BLAKE2B 32a761426dbe4c3c355d30660254305cd88b6d513faee04c78e370cea9d38761108a9be4c4b4ac39b6a74400af1f9d37ffd11ab05acd7340175c8d66845ae7d9 SHA512 9495e1daf588540fdb8b9ee905a9b6be4693bd70b7f42c8e8a0d667242fc24dc853c45918d3bc09d02f0761ad61541bc9749c1498e312da129abdab638a0d572
 DIST llvm-14.0.6-manpages.tar.bz2 218186 BLAKE2B 4491296e490936a2d7b518e19a0ff6312b89abeef3fbe5da5d0b93bb2add1088ddf64a0b00ec8846062d19b1ad31e53eadee7ce03c9034aab554e183d1baccf6 SHA512 f8328dc2ec1e8d941d47e583ee31fae7bdcebb3f854b5c8a4a84bd19a79bf5427ad204012c81349bc05a291e41cf48e5129b4578bbd5d4490dd01e1c0b5823bf
 DIST llvm-15.0.0-manpages.tar.bz2 226153 BLAKE2B 60535fce25935f4475148f91fbac810b3f20b09486822aa98008dc3ba9fae72dd307c53b5086e9bb010d49e72b50fa7e7f40eb4bc081315fd314bac7e8b45de6 SHA512 f45d58d928457323e276c942f970e999515df546c5c133e1ee2eb1e9be39b1b4721c09a0a90b9a434cac7212ac3b394d8d631bc65fe2a6eeeeba811d4f037ea5
+DIST llvm-15.0.1-manpages.tar.bz2 228787 BLAKE2B 7a43d98cf8546457b6c8557d47c5439900b584111e314c9a38671d20f12244314c56af6a8e7427345eea7e48a9b0d51aff88b2f7ae97be5f7122c068d92a9f3e SHA512 f08620768f632b85d1ad624c1dd6f93743069113411603583fa3b540072b05a44123e8149ed2a36340ca3973e99f84291281bc8ddd0fca159a4a5509fbadd3d7
 DIST llvm-gentoo-patchset-13.0.1.tar.xz 6288 BLAKE2B 899222b962486e924e4f8a2b574d285531a3f87af9385ff68c81db92aa224a0cde6d4ee049b5405056bedb4b232b50e1d5840024071a4a215f6311853304c92d SHA512 b2805337f1deca626768a44c5e7ac9ed16e0c31bead1647d44a493a8123c1b8e8f1c8ceee3536bcc6fa87fdd3fcec408229f701adf30eff07e7ef9889b847b01
 DIST llvm-gentoo-patchset-14.0.6-r2.tar.xz 16120 BLAKE2B e12e522fdb7ba505693c679cb09cc8e00e6a954df195c86c2af4dbf1b68334a405b8dcc45f2e28b5e5e0b7e9d5eb7ba907337027927371b7a3b7784ff8aae7e0 SHA512 8a5ea71c30fc0727cc855dd812bbcb6d5f51c80c98eb3d5b80258d5c5eaab1310edc9d53ae63c2ca827abec68e2912c4b69ef0da351ff883fb30545a61e1d09c
 DIST llvm-gentoo-patchset-15.0.0-r1.tar.xz 4952 BLAKE2B 915aa1db9b16c3a6b7ae26c9935d862e4bda1d11595eee16475ca372beef0ae9a853e64e39bd82f80e95fa7eff18d415c6683b8f6def9734cd7cb9da04caaa7a SHA512 98b2d9dbc1d66e9f1447a121ffe0dd04e6dbccea734ba68e2495cf572314e3faf42645b65cc3906abb49e59ec1007b0b12fd7a78216b447b154d8ec2abbdb6f8
-DIST llvm-gentoo-patchset-16.0.0_pre20220915.tar.xz 4692 BLAKE2B a5ea9b9d7dcb2b715a22d3c1e4bbda92bb710eddd50a9a3dd07ef3f23841fe76359ddb5fe585115926ee202bf91ccda7b0ea008576faba9fc00bdbcfec2f21a3 SHA512 489692969bc9364f123eb693e577e7796eee6d2d63e15dc92b355e7d1410bbcbb49fc3140df202b242f9c003aac1d8f492ef7f723eaa7c1cfe807fc90758711d
+DIST llvm-gentoo-patchset-15.0.1.tar.xz 3516 BLAKE2B 1bc54df5272eb743b5f736cca2bd5a90cf371ee759ba3aa787910ce6cc58c5c61c3eae226a0619aa9c4e9b8639149d53582cf52fad4014e65a83f52eaeaf5b61 SHA512 380ed5ffdeacf97bf76d49bec90f8f46c53f50fdd46983ab77afda4aaa6bdc671c0e179fe9dca1d8e50e377080675575f72ca2b05582349f8710e1b3c2dc76a6
 DIST llvm-gentoo-patchset-9999-r3.tar.xz 4076 BLAKE2B 30bdf740606a1718ae45d850803385d425b656fbbe0250f587cad54f55272e3617d5ee0d04f534a58f87408b0a2dea322ebf1bb8cd653a2beba21d0bc5778c62 SHA512 2c7080ffd09d7dcf4c72a97044a5c63ab895250721d60270bc51c2095aef5f9039781892b4c0d14e942611686153f874a1f52a1c854bb8ca093383c08bdc005a
-DIST llvm-project-02a27b38909edc46c41732f79a837c95c9992d5a.tar.gz 167414990 BLAKE2B cd9c4be6d3155a4cbf1abff9d8246b9d6fea98e29459c226bda36df250cc22883f08175514fce037d146866d521a56669678b5c35b5163b38532b8c2920b25a6 SHA512 e862e148b8f053d8f4d40de8db9a4db587cb0c7b4120fe433d769aa2772a1aabd697c3c3f8ee34f547ee12c4bc4355116d5694d5f451264f8719d4af0fb32cb0
 DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.0.src.tar.xz 112062796 BLAKE2B 947917b6c75cbd8882133dc01f57013523274962371ac5ae4a22b010f8a7d5d31288c1d9847bf19ba919fa3110fe34a8ff937107fe19bd064ed87bf4d08d8a51 SHA512 e5aacbe7574dcec62017cc03c9fa2ee4cf075125a3d6c3975c38f06e91adcebb1ff92bcf40c6dd67db087813c60b15a04f1424c713d751199518b58025ce87fc
 DIST llvm-project-15.0.0.src.tar.xz.sig 438 BLAKE2B 8eb12c259f94d8f867a31dbe05128adc1f9cc7ec8bcbdbe1738d2fad461f5d214e674f080f7f29b639a7a75f9c5b56c0f959f538697d647b94b97dc56b036e5f SHA512 4096464a46e07575b7cff448ff8bbc38fe972505f366b744419a06339cf32b93266b0fae5390879859041ce6710e4b675ed3ea7561d6a817623d7ece0e969661
+DIST llvm-project-15.0.1.src.tar.xz 112068688 BLAKE2B 8fd6690445f7cbc8b47a7c1dd1f2c4fbc39f9a97f9d4a0015d466726454b090b0d1ff9b0d926eba7065e84782901687f74e6540a36dc6656a93f3c92c7bc7e06 SHA512 cef84bc173118a30db3ece5e5c6f874bf689c77afc40a4792fdcb7556555ac14a8e6de1dc811755405e5d162d63bc69abaecba30d220a42765160d69f0073fda
+DIST llvm-project-15.0.1.src.tar.xz.sig 438 BLAKE2B d8f634adab531bb19178fb27bc83b3a90c856e9402dd5af700f9af43813f68d20c21b9112dd95e9f6f10609ee51ed5aaf77edb96ca16fb93136b8aea432affd3 SHA512 cbf2570840d8dc12f6436c495a23cf9d439ee195755c01a6d1d5bcc20133599dc956dc43a0f5016698e3c9a960826f5f3c2840a73f993467e275856a67999fda
 DIST llvm-project-303526ef3aa211c1930be2885deae15eeeda3b18.tar.gz 167503164 BLAKE2B 143c72c58517b3e40ee74c1a0df47bfd0d0f9e71926bc8c39a007e674a08df95d0ffe05f523f97e4409b248349e13719cabbc7ac6938feebe702959e84a07243 SHA512 9aa5c86de6c6be1d26c085eb29ea283429e41330e937e5fdbd545bb3f5b996ac82cd6268701fcbbd202e89ee35f2b67e595fc595bb7383778e9ad5fd52ca10a0
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD llvm-13.0.1.ebuild 12256 BLAKE2B 83ef68f6be3b12fa62709fb23820300e6f464f687e326fa82dca6b04c08f6f0271e4f03ff11f16e9e3c4fc43c0ee98180961ef0f6c0f856e1bb4029c7edf2481 SHA512 42fe5df50c6abd3dafefea09a46533a225ba5aa713f791438a546503b62af89f5fc10da9fa470ee7527aed3f6c2d22295ad4c33baec39dd56516ab9327e60ee7
 EBUILD llvm-14.0.6-r2.ebuild 12630 BLAKE2B c02086c457a56c1fed1919284cd241325cdcf842f09767f1679e20fe9ffb61e20bb119e90dd3fb1b182720d6db972e0a7a3025b26fc67728af99b8981eb4d3db SHA512 244d61c979ef1187e3036fe066e16d42776375bbf9a0d6e0c08b0dbb0a71d6c44245a1ee5439f60cf5bab573f57d38980d115561a24a3e5f01373a90df2f2429
 EBUILD llvm-15.0.0.ebuild 12555 BLAKE2B 7e09bd8c8a3f7419dc83da6a3b6aaea83281638ca0f554580a8b3fbdb7a9827de060cb8fd6f210644efe8564e3e49c833726b8bbde51f8cb617113b4de599dac SHA512 f16d09650912953d2ec9d39598fe48d24b484c8ea6de49197ea8d7208d7166bc66ccb3afb94800abdb2e319349066a1636b6cce0397dcd21dcda79c2c76233ad
-EBUILD llvm-15.0.1.9999.ebuild 12466 BLAKE2B 5341af08398b78d3018bd19697fe7086efa78f6dadeb02eca671562562b7161c63b8fb2b8998f6897193d2869078f65920aeda16b951924c2ebabb1e0a44bbb6 SHA512 a4e296ac4be0827f7cea66f0710406f0296102c4df1be9a4e0c155c2fe07fd5b93520aa5183fc2acc13098805fb193aee6eb7262cb668dbbd0a8de52fc47dc43
-EBUILD llvm-16.0.0.9999.ebuild 12485 BLAKE2B 4bb06cebf1417b1fb2341b8b0b029986245c153c2e6523805499aab5b04b4517bc18eafb02e46d7be51ee95c31795e4071c00826e40ecc55641afe88bf9d4c49 SHA512 94695fc7a21574b1eb3aa0387c040470561ad79d0f4d36adca52bf81c695955fb9581a8f9d949dfa079793ce4c1200c83e34c3bed5cbf9d4f52e0bd1af372cae
-EBUILD llvm-16.0.0_pre20220915.ebuild 12483 BLAKE2B 22ceb69d94ceb948060556d1e04e22f0ae4c37c551701ee63c9fc21b6108f13c051dab1c285c76112b8e34de952fd2857d6ff26678eaccca63affb3510e52c36 SHA512 0ae49b8bd318699b9312d399c9a9ff24d495425ac66f220eeaea262eed070e0edc41c97a0133815e7db2ac96ec6e92501865c53278e515e3cd8d44451d923258
-EBUILD llvm-16.0.0_pre20220918.ebuild 12485 BLAKE2B 4bb06cebf1417b1fb2341b8b0b029986245c153c2e6523805499aab5b04b4517bc18eafb02e46d7be51ee95c31795e4071c00826e40ecc55641afe88bf9d4c49 SHA512 94695fc7a21574b1eb3aa0387c040470561ad79d0f4d36adca52bf81c695955fb9581a8f9d949dfa079793ce4c1200c83e34c3bed5cbf9d4f52e0bd1af372cae
+EBUILD llvm-15.0.1.9999.ebuild 12509 BLAKE2B 25e2f036db2aa6f4f4bc512267407550e64dfb20f051ec97495c723a0517e9b66ee1fcf90a2481e1f0c37a3b95399da131f139a2d662d5e6648bf82c9dcd1339 SHA512 e1975cfbce9072a28ad9939514a158f3612bf19046f422e01e04ee959dfa6f54a771e6d5d8587d27d988dc77f0256c6a211e80de59c1559a6f91577d4ccc98a8
+EBUILD llvm-15.0.1.ebuild 12595 BLAKE2B f1fd0288090cf729ed26b8ca11443ef85d916940a3aa67da1c10e5f65a7401ea4dff08124c57a824bdb701424a792c97ebe88fa9994d736c6a9f997f7fcee49f SHA512 1383347d01cb3562b78b53e8e7dea5f9c70422b5b769e646b647d5cee0610c0283b46940384bdfa3408918d1313884b6690a7121d76e635156daf60ca215ca3a
+EBUILD llvm-16.0.0.9999.ebuild 12528 BLAKE2B 23fb236fd0786542f232b35e47e2aefd4f2936bdae2a33518a971ff8cc98a66d118feccf93e70cef1a1d4bfae560c37b1ea2b33913e1a6596207356f955274cd SHA512 8ee94533ddba67ded2a2670aeed817f83f1050ecbdc9331d793a152c99da766009b5fac614ea60712cc4b74737a3cc7c02c2ea0274d1d2a6b7331faca0b4efbf
+EBUILD llvm-16.0.0_pre20220918.ebuild 12528 BLAKE2B 23fb236fd0786542f232b35e47e2aefd4f2936bdae2a33518a971ff8cc98a66d118feccf93e70cef1a1d4bfae560c37b1ea2b33913e1a6596207356f955274cd SHA512 8ee94533ddba67ded2a2670aeed817f83f1050ecbdc9331d793a152c99da766009b5fac614ea60712cc4b74737a3cc7c02c2ea0274d1d2a6b7331faca0b4efbf
 MISC metadata.xml 2654 BLAKE2B c27983265b6c9b33200ee42565648f30a6cc9c51be53a1cb82a3353d7c1f7aa9c9501c58254280c2880ff2d4992b4834e4b5e2f1c9b1c60e9b21945f234b9973 SHA512 b331d9186908762907f5713b00e357785b62afbee83afefac8701beb1a20f7ebd68df4a030bb82c6f9164719d4ccfcaf16c189833ad40e9f5900c36247d9cff2
diff --git a/sys-devel/llvm/llvm-15.0.1.9999.ebuild b/sys-devel/llvm/llvm-15.0.1.9999.ebuild
index a28eef0e4888..0adf1193a4ea 100644
--- a/sys-devel/llvm/llvm-15.0.1.9999.ebuild
+++ b/sys-devel/llvm/llvm-15.0.1.9999.ebuild
@@ -60,6 +60,7 @@ RDEPEND="
 "
 PDEPEND="
 	sys-devel/llvm-common
+	sys-devel/llvm-toolchain-symlinks:${SLOT}
 	binutils-plugin? ( >=sys-devel/llvmgold-${SLOT} )
 "
 
diff --git a/sys-devel/llvm/llvm-16.0.0_pre20220915.ebuild b/sys-devel/llvm/llvm-15.0.1.ebuild
index 63a6413a34cd..dcf7c0df4cf8 100644
--- a/sys-devel/llvm/llvm-16.0.0_pre20220915.ebuild
+++ b/sys-devel/llvm/llvm-15.0.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
 SLOT="$(ver_cut 1)"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar xml z3"
 RESTRICT="!test? ( test )"
 
@@ -60,12 +60,13 @@ RDEPEND="
 "
 PDEPEND="
 	sys-devel/llvm-common
+	sys-devel/llvm-toolchain-symlinks:${SLOT}
 	binutils-plugin? ( >=sys-devel/llvmgold-${SLOT} )
 "
 
 LLVM_COMPONENTS=( llvm cmake third-party )
 LLVM_MANPAGES=1
-LLVM_PATCHSET=${PV}
+LLVM_PATCHSET=${PV/_/-}
 LLVM_USE_TARGETS=provide
 llvm.org_set_globals
 
@@ -284,7 +285,6 @@ get_distribution_components() {
 			llvm-readobj
 			llvm-reduce
 			llvm-remark-size-diff
-			llvm-remarkutil
 			llvm-rtdyld
 			llvm-sim
 			llvm-size
diff --git a/sys-devel/llvm/llvm-16.0.0.9999.ebuild b/sys-devel/llvm/llvm-16.0.0.9999.ebuild
index 67a9c4587fdd..9171387473ba 100644
--- a/sys-devel/llvm/llvm-16.0.0.9999.ebuild
+++ b/sys-devel/llvm/llvm-16.0.0.9999.ebuild
@@ -60,6 +60,7 @@ RDEPEND="
 "
 PDEPEND="
 	sys-devel/llvm-common
+	sys-devel/llvm-toolchain-symlinks:${SLOT}
 	binutils-plugin? ( >=sys-devel/llvmgold-${SLOT} )
 "
 
diff --git a/sys-devel/llvm/llvm-16.0.0_pre20220918.ebuild b/sys-devel/llvm/llvm-16.0.0_pre20220918.ebuild
index 67a9c4587fdd..9171387473ba 100644
--- a/sys-devel/llvm/llvm-16.0.0_pre20220918.ebuild
+++ b/sys-devel/llvm/llvm-16.0.0_pre20220918.ebuild
@@ -60,6 +60,7 @@ RDEPEND="
 "
 PDEPEND="
 	sys-devel/llvm-common
+	sys-devel/llvm-toolchain-symlinks:${SLOT}
 	binutils-plugin? ( >=sys-devel/llvmgold-${SLOT} )
 "