gentoo auto-resync : 14:10:2022 - 19:44:42

11 files changed, 383 insertions, 10 deletions

diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 2fd184f3d234..28a49df7c487 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/lld-toolchain-symlinks/Manifest b/sys-devel/lld-toolchain-symlinks/Manifest
index 32aeb6cac174..611faeb84726 100644
--- a/sys-devel/lld-toolchain-symlinks/Manifest
+++ b/sys-devel/lld-toolchain-symlinks/Manifest
@@ -1,4 +1,7 @@
 EBUILD lld-toolchain-symlinks-14-r1.ebuild 825 BLAKE2B df81d2b414d0e924a20296f2a8eceb49b81a3763b89558a40f47b5a66e76f685656d6c8bd06c4ec21ee6e5c14f70fae40db1c966eb8ce3e11f55ca611ed7cb1e SHA512 a456988c082fa942248aeeb60aac4a4784396fcfd1096c911a8d6449185774d360d0ebf28262510642157c8a59efc6e612ee3a053d2ad233a54ce9a108dfcdba
+EBUILD lld-toolchain-symlinks-14-r2.ebuild 801 BLAKE2B 9d503356ed85fd996a922f531782550dc9d9fb8f8f70b6298083abb4bda017b4015932add186a9e55c54e55135913b2cb83f571b115de09e704c936435f53f02 SHA512 7280dff33d642c0b1d4a6f23fbca4d412fc90693b7a9b825d0044f41694d2d4438b0c270277851999688dd7f04c4e67393c435b087d837abdd1f59011f3eb7ae
 EBUILD lld-toolchain-symlinks-15-r1.ebuild 825 BLAKE2B df81d2b414d0e924a20296f2a8eceb49b81a3763b89558a40f47b5a66e76f685656d6c8bd06c4ec21ee6e5c14f70fae40db1c966eb8ce3e11f55ca611ed7cb1e SHA512 a456988c082fa942248aeeb60aac4a4784396fcfd1096c911a8d6449185774d360d0ebf28262510642157c8a59efc6e612ee3a053d2ad233a54ce9a108dfcdba
+EBUILD lld-toolchain-symlinks-15-r2.ebuild 801 BLAKE2B 9d503356ed85fd996a922f531782550dc9d9fb8f8f70b6298083abb4bda017b4015932add186a9e55c54e55135913b2cb83f571b115de09e704c936435f53f02 SHA512 7280dff33d642c0b1d4a6f23fbca4d412fc90693b7a9b825d0044f41694d2d4438b0c270277851999688dd7f04c4e67393c435b087d837abdd1f59011f3eb7ae
 EBUILD lld-toolchain-symlinks-16-r1.ebuild 801 BLAKE2B a539e9788b4cf4a758a5bd7209e69ff5b664029dac6bb3f4c0323efc4926d6e1de0c662d6361b8dfae4f45ee254ba559b0095f95bbc23404b28bd31a8b576073 SHA512 9e5ee806aa46d0d4b8ef2af27fac32ac146d12df5223a3b4b613400d2a47306068ebd8c9474c7b2f030d2e3d3fa1a309427afc03f096e60df04afe54ac0e1996
+EBUILD lld-toolchain-symlinks-16-r2.ebuild 777 BLAKE2B 7717e8a4bcedfacfb4c8e857345a8d57b7dedaa7986ce6e3f835e72089bf45d4904fe2f6aa50ed407d1b3b75e7fa293e3071cdef70c4b63a0002cf7a34c1e6ed SHA512 1163038de439599cc078642a4650f2b318d41ce92c25401e1c7a811e1eb15ea69f0877110d2a02c23700ac559255dfa55e02f0c079d9c1ba4679c3cd296be211
 MISC metadata.xml 784 BLAKE2B 044eebb87ddac511186e137d9e255cb3ead2d53aeffafc641cc9a53556b833f06cae439907de8e8ead1090d54f7cc4bcacdbfff52449b6fab5908aa6d354a110 SHA512 50a9ac94efe64f8f6533049f496a19c37e375803ea3920a3729c93f346117ea5b662978570db27e8fffcfaf78f990691c4ab5aaf7dd48a7e2931f713eddedb4b
diff --git a/sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-14-r2.ebuild b/sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-14-r2.ebuild
new file mode 100644
index 000000000000..ee8671571c75
--- /dev/null
+++ b/sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-14-r2.ebuild
@@ -0,0 +1,39 @@
+# 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="multilib-symlinks +native-symlinks"
+
+RDEPEND="
+	sys-devel/lld:${SLOT}
+"
+
+src_install() {
+	use native-symlinks || return
+
+	local chosts=( "${CHOST}" )
+	if use multilib-symlinks; then
+		local abi
+		for abi in $(get_all_abis); do
+			chosts+=( "$(get_abi_CHOST "${abi}")" )
+		done
+	fi
+
+	local dest=/usr/lib/llvm/${SLOT}/bin
+	dodir "${dest}"
+	dosym ld.lld "${dest}/ld"
+	for chost in "${chosts[@]}"; do
+		dosym ld.lld "${dest}/${chost}-ld"
+	done
+}
diff --git a/sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-15-r2.ebuild b/sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-15-r2.ebuild
new file mode 100644
index 000000000000..ee8671571c75
--- /dev/null
+++ b/sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-15-r2.ebuild
@@ -0,0 +1,39 @@
+# 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="multilib-symlinks +native-symlinks"
+
+RDEPEND="
+	sys-devel/lld:${SLOT}
+"
+
+src_install() {
+	use native-symlinks || return
+
+	local chosts=( "${CHOST}" )
+	if use multilib-symlinks; then
+		local abi
+		for abi in $(get_all_abis); do
+			chosts+=( "$(get_abi_CHOST "${abi}")" )
+		done
+	fi
+
+	local dest=/usr/lib/llvm/${SLOT}/bin
+	dodir "${dest}"
+	dosym ld.lld "${dest}/ld"
+	for chost in "${chosts[@]}"; do
+		dosym ld.lld "${dest}/${chost}-ld"
+	done
+}
diff --git a/sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-16-r2.ebuild b/sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-16-r2.ebuild
new file mode 100644
index 000000000000..75dc4a1de3c4
--- /dev/null
+++ b/sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-16-r2.ebuild
@@ -0,0 +1,40 @@
+# 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="multilib-symlinks +native-symlinks"
+
+RDEPEND="
+	sys-devel/lld:${SLOT}
+"
+
+src_install() {
+	use native-symlinks || return
+
+	local chosts=( "${CHOST}" )
+	if use multilib-symlinks; then
+		local abi
+		for abi in $(get_all_abis); do
+			chosts+=( "$(get_abi_CHOST "${abi}")" )
+		done
+	fi
+
+	local dest=/usr/lib/llvm/${SLOT}/bin
+	dodir "${dest}"
+	dosym ld.lld "${dest}/ld"
+	for chost in "${chosts[@]}"; do
+		dosym ld.lld "${dest}/${chost}-ld"
+	done
+}
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index 763bc900c0d5..a34f60c29f3e 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -5,9 +5,12 @@ DIST llvm-project-15.0.2.src.tar.xz.sig 438 BLAKE2B 37a3a7fbc2d74db9060e85f04e15
 DIST llvm-project-ebb258d3b0785f6dcc65e1f277d0690891ddc94d.tar.gz 168823463 BLAKE2B 111afe0f6ba6cef28c3d0162c9c650d15239f981949030768780ebe308418346d0ad367e0e58417832ae43e57b27bccaf56415f81e8221c6c5e78d1113f5617b SHA512 80351d7eeac77a15bf5613b289c71d718ecaccd8a6a4ea6736ed8bfc15c8154099c771564f99ea6c8b491f99bf1ca3a45fac977d638f6a03d7f7b42ba522fa20
 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-r1.ebuild 2014 BLAKE2B cc9fe38292d98e136ec49b7c42e440cc66a6b3a83c9b587066f110ad3d5389b1e771f26bc6f6b7ebd93efbb8fb85d9b24536d6e12b383cb054172aaf802cb270 SHA512 6a53b78cbe58eac99f40f74f9f80772aea8d52522ee124f13c677bfc69f3a513afa3d2beca14b575447a6167db52fae6e8d946b71dcaaa0b79b76a6226b26e80
 EBUILD lld-14.0.6.ebuild 1894 BLAKE2B 8f5922031c9b64b0cf246800fd26b1802bdcc1fd84aae911106bd0c5a6d9482ff7c92571b7cc7f988e0b8b0b679eb94fa6c62685d69fdf9cc2b697ae29252e09 SHA512 4959af6727591bbd411861f4717ffd523b9a026c33c4de3b035230b1b5dc1067d9fa5c539455ea16fd7a294c95b9019be1e85638448afb0d900dedbb4284a30a
+EBUILD lld-15.0.2-r1.ebuild 2082 BLAKE2B 29db136bcaa9d462e7e742b2ad95a88c2e1a7989d6dcf98d5d967504842cd87c87fac6c18f3f813116cf8d8788d1a55ea35e0ffd9d7d3d3c167f03fcbe3a9a73 SHA512 a5370a95e195e29acc7fa6b308be61183a8b9fbe0199b4773da8e0b6e8e3f2671ce4dde3c3dd221477fabab482eb3bd160a8b8d83c82083759047c2ceb9f7a18
 EBUILD lld-15.0.2.ebuild 1955 BLAKE2B c8fb954351f0d80d5ee905cbfbcb7d2430bd73e7644ec54afae902ced60bf6a166e5a76c83ba6f18be062fce439a7c3cda5ecd9c1d5f6acb777673a30a1c40e2 SHA512 1b33c0821d40023b026e088b26772e2f851ba53f7c5eef5335a737fbb584120bc527d2711c685556c2b2e106e855aeb69411bf5fce829e33d973ab9ab8562271
-EBUILD lld-15.0.3.9999.ebuild 1935 BLAKE2B 43e79cf29759aa4a88c7e2f5439c291d3d11e1c83841d84f42a2a708f7ac894964135a1dc921bf9e69c956c991c98bd91fd8eb529134fb3292dc87fcd46627a2 SHA512 2400dd982f080ce6c6f5e60f279366e3016634b673f5c893ad60977900be08ec7d46f1e16f22fec1522b7304cffade31b49d8b339c513b5e528df9d946ebe36f
-EBUILD lld-16.0.0.9999.ebuild 1910 BLAKE2B 1f1ba0aa1007edbfaec9f547e9890197a8266eb2416995f2689c1b466c7c897088a4ef1a7a335ac52db5d38d7bd25f5540b9e4894e690c040b9a4a449f819cc4 SHA512 8ed262c5874c7bc211e0f8f8169a819cec8ebed59295b24b4572f567cdf16f4703bf8e7c524498e72a17e574460bf0a82d73d0286f66f4ae3e5b0bdb4ef8c26c
+EBUILD lld-15.0.3.9999.ebuild 2040 BLAKE2B 07d59bd4b7c1ff9065abb62cbace96d69fd3e4b29d933756c781ff0381e3e3a1c3c4476c61bd10079326ed54c7b19a664a3d9deb020540136a563f29fb52089a SHA512 f1e80f7372999263d0039ec636856cfe6158b0599f644126efc34860704b862c43f2095f919dd6697a47b7573120bb43f50887e667357aed60f368826f2ff67d
+EBUILD lld-16.0.0.9999.ebuild 2015 BLAKE2B d5463c38e3da39061b882b4e8b69f3f22846b4928814322d6b9ba103e434200c25b96407227950107d120f3f7186eb89e35af3a10cedf86c0f1fd1e5b51e6015 SHA512 ff5fa87fdd8bf91ae1e750ebc43b72fb4f17d09a3d3972b0d42928221a47e6b25d9f53c05fb50ab81b7a93e86509d7dcfd5a334b2414f484365bad608167e7e2
+EBUILD lld-16.0.0_pre20221010-r1.ebuild 2015 BLAKE2B d5463c38e3da39061b882b4e8b69f3f22846b4928814322d6b9ba103e434200c25b96407227950107d120f3f7186eb89e35af3a10cedf86c0f1fd1e5b51e6015 SHA512 ff5fa87fdd8bf91ae1e750ebc43b72fb4f17d09a3d3972b0d42928221a47e6b25d9f53c05fb50ab81b7a93e86509d7dcfd5a334b2414f484365bad608167e7e2
 EBUILD lld-16.0.0_pre20221010.ebuild 1910 BLAKE2B 1f1ba0aa1007edbfaec9f547e9890197a8266eb2416995f2689c1b466c7c897088a4ef1a7a335ac52db5d38d7bd25f5540b9e4894e690c040b9a4a449f819cc4 SHA512 8ed262c5874c7bc211e0f8f8169a819cec8ebed59295b24b4572f567cdf16f4703bf8e7c524498e72a17e574460bf0a82d73d0286f66f4ae3e5b0bdb4ef8c26c
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/sys-devel/lld/lld-14.0.6-r1.ebuild b/sys-devel/lld/lld-14.0.6-r1.ebuild
new file mode 100644
index 000000000000..7aca35dc3546
--- /dev/null
+++ b/sys-devel/lld/lld-14.0.6-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake flag-o-matic llvm llvm.org python-any-r1
+
+DESCRIPTION="The LLVM linker (link editor)"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="debug test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	~sys-devel/llvm-${PV}
+"
+RDEPEND="
+	${DEPEND}
+	!sys-devel/lld:0
+"
+BDEPEND="
+	test? (
+		>=dev-util/cmake-3.16
+		$(python_gen_any_dep ">=dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
+	)
+"
+
+LLVM_COMPONENTS=( lld cmake libunwind/include/mach-o )
+LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
+llvm.org_set_globals
+
+python_check_deps() {
+	python_has_version ">=dev-python/lit-${PV}[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	llvm.org_src_unpack
+
+	# Directory ${WORKDIR}/llvm does not exist with USE="-test",
+	# but LLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" is set below,
+	# and ${LLVM_MAIN_SRC_DIR}/../libunwind/include is used by build system
+	# (lld/MachO/CMakeLists.txt) and is expected to be resolvable
+	# to existent directory ${WORKDIR}/libunwind/include.
+	mkdir -p "${WORKDIR}/llvm" || die
+}
+
+src_configure() {
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
+		-DBUILD_SHARED_LIBS=ON
+		-DLLVM_INCLUDE_TESTS=$(usex test)
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_BUILD_TESTS=ON
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-lld
+}
diff --git a/sys-devel/lld/lld-15.0.2-r1.ebuild b/sys-devel/lld/lld-15.0.2-r1.ebuild
new file mode 100644
index 000000000000..8372cc0466ed
--- /dev/null
+++ b/sys-devel/lld/lld-15.0.2-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit cmake flag-o-matic llvm llvm.org python-any-r1
+
+DESCRIPTION="The LLVM linker (link editor)"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="debug test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	~sys-devel/llvm-${PV}
+"
+RDEPEND="
+	${DEPEND}
+	!sys-devel/lld:0
+"
+BDEPEND="
+	test? (
+		>=dev-util/cmake-3.16
+		$(python_gen_any_dep ">=dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
+	)
+"
+PDEPEND="
+	>=sys-devel/lld-toolchain-symlinks-15-r2:${LLVM_MAJOR}
+"
+
+LLVM_COMPONENTS=( lld cmake libunwind/include/mach-o )
+LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
+llvm.org_set_globals
+
+python_check_deps() {
+	python_has_version ">=dev-python/lit-${PV}[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	llvm.org_src_unpack
+
+	# Directory ${WORKDIR}/llvm does not exist with USE="-test",
+	# but LLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" is set below,
+	# and ${LLVM_MAIN_SRC_DIR}/../libunwind/include is used by build system
+	# (lld/MachO/CMakeLists.txt) and is expected to be resolvable
+	# to existent directory ${WORKDIR}/libunwind/include.
+	mkdir -p "${WORKDIR}/llvm" || die
+}
+
+src_configure() {
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
+		-DBUILD_SHARED_LIBS=ON
+		-DLLVM_INCLUDE_TESTS=$(usex test)
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_BUILD_TESTS=ON
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-lld
+}
diff --git a/sys-devel/lld/lld-15.0.3.9999.ebuild b/sys-devel/lld/lld-15.0.3.9999.ebuild
index ab883859a6e3..39bcff1a7b13 100644
--- a/sys-devel/lld/lld-15.0.3.9999.ebuild
+++ b/sys-devel/lld/lld-15.0.3.9999.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="The LLVM linker (link editor)"
 HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${LLVM_SOABI}"
+SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
 KEYWORDS=""
 IUSE="debug test"
 RESTRICT="!test? ( test )"
@@ -20,15 +20,16 @@ DEPEND="
 "
 RDEPEND="
 	${DEPEND}
+	!sys-devel/lld:0
 "
 BDEPEND="
 	test? (
 		>=dev-util/cmake-3.16
-		$(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
+		$(python_gen_any_dep ">=dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
 	)
 "
 PDEPEND="
-	sys-devel/lld-toolchain-symlinks:${LLVM_MAJOR}
+	>=sys-devel/lld-toolchain-symlinks-15-r2:${LLVM_MAJOR}
 "
 
 LLVM_COMPONENTS=( lld cmake libunwind/include/mach-o )
@@ -36,7 +37,7 @@ LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
 llvm.org_set_globals
 
 python_check_deps() {
-	python_has_version "~dev-python/lit-${PV}[${PYTHON_USEDEP}]"
+	python_has_version ">=dev-python/lit-${PV}[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
@@ -62,6 +63,7 @@ src_configure() {
 	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
 
 	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
 		-DBUILD_SHARED_LIBS=ON
 		-DLLVM_INCLUDE_TESTS=$(usex test)
 		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
diff --git a/sys-devel/lld/lld-16.0.0.9999.ebuild b/sys-devel/lld/lld-16.0.0.9999.ebuild
index 7eaee12b2222..8af0d07d7df2 100644
--- a/sys-devel/lld/lld-16.0.0.9999.ebuild
+++ b/sys-devel/lld/lld-16.0.0.9999.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="The LLVM linker (link editor)"
 HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${LLVM_SOABI}"
+SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
 KEYWORDS=""
 IUSE="debug test zstd"
 RESTRICT="!test? ( test )"
@@ -21,15 +21,16 @@ DEPEND="
 "
 RDEPEND="
 	${DEPEND}
+	!sys-devel/lld:0
 "
 BDEPEND="
 	test? (
 		>=dev-util/cmake-3.16
-		$(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
+		$(python_gen_any_dep ">=dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
 	)
 "
 PDEPEND="
-	sys-devel/lld-toolchain-symlinks:${LLVM_MAJOR}
+	>=sys-devel/lld-toolchain-symlinks-16-r2:${LLVM_MAJOR}
 "
 
 LLVM_COMPONENTS=( lld cmake libunwind/include/mach-o )
@@ -37,7 +38,7 @@ LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
 llvm.org_set_globals
 
 python_check_deps() {
-	python_has_version "~dev-python/lit-${PV}[${PYTHON_USEDEP}]"
+	python_has_version ">=dev-python/lit-${PV}[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
@@ -63,6 +64,7 @@ src_configure() {
 	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
 
 	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
 		-DBUILD_SHARED_LIBS=ON
 		-DLLVM_INCLUDE_TESTS=$(usex test)
 	)
diff --git a/sys-devel/lld/lld-16.0.0_pre20221010-r1.ebuild b/sys-devel/lld/lld-16.0.0_pre20221010-r1.ebuild
new file mode 100644
index 000000000000..8af0d07d7df2
--- /dev/null
+++ b/sys-devel/lld/lld-16.0.0_pre20221010-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit cmake flag-o-matic llvm llvm.org python-any-r1
+
+DESCRIPTION="The LLVM linker (link editor)"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
+KEYWORDS=""
+IUSE="debug test zstd"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	~sys-devel/llvm-${PV}[zstd=]
+	zstd? ( app-arch/zstd:= )
+"
+RDEPEND="
+	${DEPEND}
+	!sys-devel/lld:0
+"
+BDEPEND="
+	test? (
+		>=dev-util/cmake-3.16
+		$(python_gen_any_dep ">=dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
+	)
+"
+PDEPEND="
+	>=sys-devel/lld-toolchain-symlinks-16-r2:${LLVM_MAJOR}
+"
+
+LLVM_COMPONENTS=( lld cmake libunwind/include/mach-o )
+LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
+llvm.org_set_globals
+
+python_check_deps() {
+	python_has_version ">=dev-python/lit-${PV}[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	llvm.org_src_unpack
+
+	# Directory ${WORKDIR}/llvm does not exist with USE="-test",
+	# but LLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" is set below,
+	# and ${LLVM_MAIN_SRC_DIR}/../libunwind/include is used by build system
+	# (lld/MachO/CMakeLists.txt) and is expected to be resolvable
+	# to existent directory ${WORKDIR}/libunwind/include.
+	mkdir -p "${WORKDIR}/llvm" || die
+}
+
+src_configure() {
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
+		-DBUILD_SHARED_LIBS=ON
+		-DLLVM_INCLUDE_TESTS=$(usex test)
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-lld
+}