gentoo resync : 30.09.2020

3 files changed, 75 insertions, 3 deletions

diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index 401f5530ea4e..b828ae715bbf 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -1,11 +1,13 @@
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0-rc3.tar.gz 122766783 BLAKE2B 052fdc864fed52692141284ebdc41d52d21fbeaf24ac5ed3e67701537baa683bae61b1c06de68322e0578a27a1f5a8856088cdc001d2b8d34d2ec88ae65ff739 SHA512 a28ce74775373c63fe23b3116cd25db0efb95c6fdb60e56f2522659a404a59576f3d9429a109cb0f90534927259289aa1c712673f36f92272d642bf8dce5699f
+DIST llvmorg-11.0.0-rc4.tar.gz 122768150 BLAKE2B e92417b6e1775a10c196534518036de6393e3cb9e0e656d4f864e7870be8fb0dad3f4cf170345e653ba60f36172df117977d5dfebe3d9ee7ec2c160d3dc9c5cd SHA512 ed2aee9f6d0bb887f27840158e9f95d94c9ad3981a0388a33fcd3e405f5072134a02999075238b6a2b8803149aa08ac790214605b186c2cc2d4827ba53c00de1
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD lld-10.0.0.ebuild 1478 BLAKE2B b91fbc24f88a6365b543ef20b6e80398545e921bf0ea8431a3b450a77cf1fa637506513d43d023b25a665a2a9324582e78adbce0df709f237b4e8a542181fa02 SHA512 8b45bf02033c78110eef573a2d7018972527637352bf097166f7a8fe6966fea9cf934e22f7aee62a9390e859d28fadca1c74dd0bc87874d0d5a3d6a720caef82
 EBUILD lld-10.0.1.ebuild 1329 BLAKE2B 24ef8612fe55b962e16117b59c8bffb9b587b0608579c3b0a930b3d3ae1457377ebb22fbd50b979c6dda436dcbdad57f6fcea7bdad209d6afbf02c80a02e70a6 SHA512 6352bb20b21e2234fbf5d3089b9318333b4c7ca0b5724cc3740d09720acffb56b628df18bc9a7178c7989c9085440ee5150f0bf87a620d67d3f69c2d9c6e41a6
 EBUILD lld-11.0.0.9999.ebuild 1302 BLAKE2B 281b468babbfd01037253f479a0fe50b67fa5643f514a20f6a77acaacc21324f7e9efd85e8a4dd2e7bc9534fcd290a0392241c17d23b3c1417485c0ef553ef01 SHA512 18d7cb6d3fd2d5d7798e96edcf3cdddd8f40768b12d02f3d2d1946e39c72d94a2da028e3740650dcf8c827e1423a49060940c062fad8f668401530281db18c31
 EBUILD lld-11.0.0_rc3.ebuild 1302 BLAKE2B 281b468babbfd01037253f479a0fe50b67fa5643f514a20f6a77acaacc21324f7e9efd85e8a4dd2e7bc9534fcd290a0392241c17d23b3c1417485c0ef553ef01 SHA512 18d7cb6d3fd2d5d7798e96edcf3cdddd8f40768b12d02f3d2d1946e39c72d94a2da028e3740650dcf8c827e1423a49060940c062fad8f668401530281db18c31
-EBUILD lld-12.0.0.9999.ebuild 1302 BLAKE2B 281b468babbfd01037253f479a0fe50b67fa5643f514a20f6a77acaacc21324f7e9efd85e8a4dd2e7bc9534fcd290a0392241c17d23b3c1417485c0ef553ef01 SHA512 18d7cb6d3fd2d5d7798e96edcf3cdddd8f40768b12d02f3d2d1946e39c72d94a2da028e3740650dcf8c827e1423a49060940c062fad8f668401530281db18c31
+EBUILD lld-11.0.0_rc4.ebuild 1302 BLAKE2B 281b468babbfd01037253f479a0fe50b67fa5643f514a20f6a77acaacc21324f7e9efd85e8a4dd2e7bc9534fcd290a0392241c17d23b3c1417485c0ef553ef01 SHA512 18d7cb6d3fd2d5d7798e96edcf3cdddd8f40768b12d02f3d2d1946e39c72d94a2da028e3740650dcf8c827e1423a49060940c062fad8f668401530281db18c31
+EBUILD lld-12.0.0.9999.ebuild 1712 BLAKE2B 3474cccbcab21eb1f7f0b5853465c8867c05ce9f0251a8e0f3b91f49c4491e2609f1d4a68e262dacae04d6d1786e0144a1a4a0864756b4183c5e39a55dfb5447 SHA512 5ce94b6b59396739cc0d4e6c7ffccc0ae23d9586b683705603f255accb5d1d1114c3082113853fe5c84a8692a46af42d208b70810b38a638243e113882646e68
 EBUILD lld-9.0.1.ebuild 1323 BLAKE2B 042f875208515a2b9c39289239601e9b573aa2d9603f2bd58652612d44ff9e62b5776a2370eac1b6933f38f6dd085d3ba24749509eeb2084416e78dc4b5f8fe2 SHA512 d0a352fa95f0e5c47edce97ed4344555ee56d09b70db50b79f2b0ce50ab41e71aaa427dd4218f7239bfa56a439d04b9e99d4eabaa07f573617d55ac259721b55
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/lld/lld-11.0.0_rc4.ebuild b/sys-devel/lld/lld-11.0.0_rc4.ebuild
new file mode 100644
index 000000000000..7b627c88cf1b
--- /dev/null
+++ b/sys-devel/lld/lld-11.0.0_rc4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm llvm.org python-any-r1
+
+DESCRIPTION="The LLVM linker (link editor)"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( lld )
+LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="~sys-devel/llvm-${PV}"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") )"
+
+python_check_deps() {
+	has_version -b "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=OFF
+
+		-DLLVM_INCLUDE_TESTS=$(usex test)
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_BUILD_TESTS=ON
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-lld
+}
+
+src_install() {
+	cmake_src_install
+	# LLD has no shared libraries, so strip it all for the time being
+	rm -r "${ED}"/usr/{include,lib*} || die
+}
diff --git a/sys-devel/lld/lld-12.0.0.9999.ebuild b/sys-devel/lld/lld-12.0.0.9999.ebuild
index 7b627c88cf1b..88c1fe13f11f 100644
--- a/sys-devel/lld/lld-12.0.0.9999.ebuild
+++ b/sys-devel/lld/lld-12.0.0.9999.ebuild
@@ -8,7 +8,7 @@ inherit cmake llvm llvm.org python-any-r1
 
 DESCRIPTION="The LLVM linker (link editor)"
 HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( lld )
+LLVM_COMPONENTS=( lld libunwind/include/mach-o )
 LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
 llvm.org_set_globals
 
@@ -31,15 +31,26 @@ 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() {
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=OFF
 
 		-DLLVM_INCLUDE_TESTS=$(usex test)
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
 	)
 	use test && mycmakeargs+=(
 		-DLLVM_BUILD_TESTS=ON
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
 		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
 		-DLLVM_LIT_ARGS="$(get_lit_flags)"
 	)