gentoo auto-resync : 11:11:2022 - 21:30:43

2 files changed, 11 insertions, 11 deletions

diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest
index b52e02ba368c..9e9af8876752 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -16,6 +16,6 @@ EBUILD compiler-rt-sanitizers-14.0.6.ebuild 6381 BLAKE2B 010ce621c56c1568eaddeb6
 EBUILD compiler-rt-sanitizers-15.0.3.ebuild 6433 BLAKE2B 25dfdd2696b3c861dce89b740c12a382e6eae2a726d6302b7d2ccb609721be4add79169e129a917a88e8396f90112b2ec96e77eb7e1f64f4e65395d54f964dc0 SHA512 8418f40cd19e862ecf69475aeb26aface57f1e548de75760f474d4e03d52d6df3926f7a68eb11460d369b1465580c01c7e47c59b8b3d08571b60f454e5cab46a
 EBUILD compiler-rt-sanitizers-15.0.4.9999.ebuild 6363 BLAKE2B 640625391bc73444ed357c25028b641351e5e4f2661271e2d762a9d0a8bbf70a916018c82ddabb25f95679121eea1f35726e011f12d99bb88f1aa6aafef9f5ba SHA512 0c9b3e50c61cb6129fcc20e2fc08f7d32fd2ee180d2bad3e6ed9c7b71819320af9c74457332afac8c14b476d18b47ce7a353813e7bb29e0a568771d314f9c46a
 EBUILD compiler-rt-sanitizers-15.0.4.ebuild 6438 BLAKE2B 365a74be34dd43bb83e1eb3be7e643899baea439b56fca5b497ca3e92e001343de9a03d592b956c279d4994c805a5d975601f5f7750c8d099e2d446ed7e8b2eb SHA512 7a3836f239bf8053a07b38e112056506e3e3da363874fcb70d7a74bc72bea6a0298f08e97f3a73b5d3c1c4af57fdb692567fdff7775e5bcdff01eabfd2f962cb
-EBUILD compiler-rt-sanitizers-16.0.0.9999.ebuild 6322 BLAKE2B a6c3057587f87750a2ef204d1504ef86e579bb1c8eccbb366563a4c5899ee9357ed211affe9190c44bfbe397ee54dc7b05622a693acae8aa32ea2b4ef36c33be SHA512 bdf5995cf3973ccf9f5d5dd4baa1a8424fa01d9f95cf44a4c656e66bb98e81359a794b95603f29532675c5247b3f472b1c1fdb79066dfde8e7a383ab5929bf13
+EBUILD compiler-rt-sanitizers-16.0.0.9999.ebuild 6296 BLAKE2B 2633a58f735a8fddd7a83c0fdc7f68800153c34034bf3f28ec758a89188b7ccf5403c9d3ac00b3d7fb664631b56f79528207da5ed536663ac6541dc86c56fa15 SHA512 82be981c99e2313032cd2a1bcc45fb859b65189a94e2ac2811c153fe459320bfebdd2c3649583f31318b0d7af29234e2dd43eea821e112308bcde2fc26ba0294
 EBUILD compiler-rt-sanitizers-16.0.0_pre20221104.ebuild 6322 BLAKE2B a6c3057587f87750a2ef204d1504ef86e579bb1c8eccbb366563a4c5899ee9357ed211affe9190c44bfbe397ee54dc7b05622a693acae8aa32ea2b4ef36c33be SHA512 bdf5995cf3973ccf9f5d5dd4baa1a8424fa01d9f95cf44a4c656e66bb98e81359a794b95603f29532675c5247b3f472b1c1fdb79066dfde8e7a383ab5929bf13
 MISC metadata.xml 1412 BLAKE2B 75675507000fa6a6b8182e6b45a08a2716ae7fb9a7e3428dc8420464e4c1d1bdb5bea62cc2f553c579de5a4faa752b35cb3529d980fb07a055ff4ddf6e752707 SHA512 f05ea5168b923db72f4f5b53e9b748ebbcdae9eff09d86323313055933b47fc0089e1b2d73cd997d73dcfb2dca032344955816425fbddc09d27ca751463aadbb
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.0.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.0.9999.ebuild
index ca5ba940552f..b2d4ab2d467e 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.0.9999.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.0.9999.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
 HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="${LLVM_VERSION}"
+SLOT="${LLVM_MAJOR}"
 KEYWORDS=""
 IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
 # base targets
@@ -46,7 +46,7 @@ BDEPEND="
 		!!<sys-apps/sandbox-2.13
 		$(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
 		=sys-devel/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
-		sys-libs/compiler-rt:${LLVM_VERSION}
+		sys-libs/compiler-rt:${LLVM_MAJOR}
 	)
 	!test? (
 		${PYTHON_DEPS}
@@ -54,7 +54,7 @@ BDEPEND="
 "
 
 LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
-LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
 LLVM_PATCHSET=9999-1
 llvm.org_set_globals
 
@@ -125,10 +125,10 @@ src_configure() {
 	done
 
 	local mycmakeargs=(
-		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_VERSION}"
+		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}"
 		# use a build dir structure consistent with install
 		# this makes it possible to easily deploy test-friendly clang
-		-DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${LLVM_VERSION}"
+		-DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${LLVM_MAJOR}"
 
 		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
 		# builtins & crt installed by sys-libs/compiler-rt
@@ -185,19 +185,19 @@ src_configure() {
 	cmake_src_configure
 
 	if use test; then
-		local sys_dir=( "${EPREFIX}"/usr/lib/clang/${LLVM_VERSION}/lib/* )
+		local sys_dir=( "${EPREFIX}"/usr/lib/clang/${LLVM_MAJOR}/lib/* )
 		[[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}"
 		[[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic compiler-rt install: ${sys_dir[*]}"
 
 		# copy clang over since resource_dir is located relatively to binary
 		# therefore, we can put our new libraries in it
-		mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_MAJOR}/{bin,$(get_libdir)},clang/${LLVM_VERSION}/include} || die
+		mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_MAJOR}/{bin,$(get_libdir)},clang/${LLVM_MAJOR}/include} || die
 		cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/bin/clang{,++} \
 			"${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/bin/ || die
-		cp "${EPREFIX}"/usr/lib/clang/${LLVM_VERSION}/include/*.h \
-			"${BUILD_DIR}"/lib/clang/${LLVM_VERSION}/include/ || die
+		cp "${EPREFIX}"/usr/lib/clang/${LLVM_MAJOR}/include/*.h \
+			"${BUILD_DIR}"/lib/clang/${LLVM_MAJOR}/include/ || die
 		cp "${sys_dir}"/*builtins*.a \
-			"${BUILD_DIR}/lib/clang/${LLVM_VERSION}/lib/${sys_dir##*/}/" || die
+			"${BUILD_DIR}/lib/clang/${LLVM_MAJOR}/lib/${sys_dir##*/}/" || die
 		# we also need LLVMgold.so for gold-based tests
 		if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so ]]; then
 			ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so \