From 800c4c398cad9dd837da33062e71ccc84114fe05 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Tue, 20 Sep 2022 17:24:07 +0100
Subject: gentoo auto-resync : 20:09:2022 - 17:24:07

---
 sys-devel/lld/Manifest                      | 11 ++--
 sys-devel/lld/lld-15.0.1.9999.ebuild        |  3 ++
 sys-devel/lld/lld-15.0.1.ebuild             | 81 +++++++++++++++++++++++++++++
 sys-devel/lld/lld-16.0.0.9999.ebuild        |  3 ++
 sys-devel/lld/lld-16.0.0_pre20220915.ebuild | 78 ---------------------------
 sys-devel/lld/lld-16.0.0_pre20220918.ebuild |  3 ++
 6 files changed, 96 insertions(+), 83 deletions(-)
 create mode 100644 sys-devel/lld/lld-15.0.1.ebuild
 delete mode 100644 sys-devel/lld/lld-16.0.0_pre20220915.ebuild

(limited to 'sys-devel/lld')

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-15.0.1.ebuild b/sys-devel/lld/lld-15.0.1.ebuild
new file mode 100644
index 000000000000..01b41935b823
--- /dev/null
+++ b/sys-devel/lld/lld-15.0.1.ebuild
@@ -0,0 +1,81 @@
+# 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="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="debug test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	~sys-devel/llvm-${PV}
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	test? (
+		>=dev-util/cmake-3.16
+		$(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} )
+llvm.org_set_globals
+
+python_check_deps() {
+	python_has_version "~dev-python/lit-${PV}[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} 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=(
+		-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-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_pre20220915.ebuild b/sys-devel/lld/lld-16.0.0_pre20220915.ebuild
deleted file mode 100644
index 76bdcb369c4b..000000000000
--- a/sys-devel/lld/lld-16.0.0_pre20220915.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# 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="0"
-KEYWORDS=""
-IUSE="debug test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	~sys-devel/llvm-${PV}
-"
-RDEPEND="
-	${DEPEND}
-"
-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=${PV%%.*} 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=(
-		-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-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} )
-- 
cgit v1.2.3