gentoo auto-resync : 07:10:2022 - 01:22:59

4 files changed, 115 insertions, 18 deletions

diff --git a/sys-devel/clang-common/Manifest b/sys-devel/clang-common/Manifest
index 84e1498430b4..e9c6fb2f134a 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -5,12 +5,14 @@ DIST llvm-project-15.0.1.src.tar.xz.sig 438 BLAKE2B d8f634adab531bb19178fb27bc83
 DIST llvm-project-15.0.2.src.tar.xz 112071864 BLAKE2B 96f2884d6c1007260d71e5dd41951eed029e8f50ff78f3c90f7194df13e1d4fb80ab7705c51c45a3e6b2a7714a98d9c5919fc7064d1d5f7c675e65b9b4229b65 SHA512 a0e815369c15bb4f8e8aa0fede29c3d557fcc5c8f2b39d457c03f1ef1d860082a41027238571b2aee9a158a87eb118deb08dc2ba94ce750320837a84e9908b8c
 DIST llvm-project-15.0.2.src.tar.xz.sig 438 BLAKE2B 37a3a7fbc2d74db9060e85f04e159b475cf818c95a6fe2e9f5f038eb990f414d94833ecac2f9c826825a69b752876399e37e70e6934def06363f7ccb18be033a SHA512 cfe3bc400a64536ad9181c2ede7227a0953a8632fdc777d1ea1d9225c1fc4e699d90ce0b99e057ee5b87c1272d5810c4b52fb0cac167ddd2aad88f1f3ef46ee8
 DIST llvm-project-215c9fa4deac9ec6b4e504843830551f03b60620.tar.gz 168942763 BLAKE2B 545c7c372c38667b7d811753464e91134aae600060d9054979eab8735d535a72d6bbb33a6008dc81f3b14513f58791ca3b8c3068e62ff146ccb14f32abb41a32 SHA512 d0c244357650ef5d56bc7afd836cd747cc2cce92d5f7fb4ddec3414e5bafe4e611acb2a7ff42343c184caad14a30fa9a6ced7e493df3ceb06fe8f9445aeb5a9b
+DIST llvm-project-5a0722e0469894564dd9b0ee1d4f8c291d09c776.tar.gz 169164627 BLAKE2B c9a8672cac0faa747baa366545d21f91b50e7611e062eb95042cbccc2dc00b74f44c5c2fcccda49b44975320dfadca5916585766235a406dfbd7321afba03025 SHA512 bad4043fab0e4f9c633bc0aa74df1f1ea886f1d20c1c7a2704bd8317371cf6325e70a770623307d7a455e815cce8c5f00be1ed4ec3f06a7b69038a2784f73243
 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.1.ebuild 547 BLAKE2B bb30fa507d6383b92417c55f10a7233e0d48ab7a3ff07b811e135e5f828a2332eafdbee2ee738050a7536b6f956cf8285f0e6d8f40511891580278b2434414d6 SHA512 e70dbbf7bb64ef672de7349d423c41b9ef88471c22be0e3ae326ee1506f3c764f3ca0e695a9953273411c70e4f7ec903533749d030ec37c381819b1850679dd8
-EBUILD clang-common-15.0.2.9999.ebuild 2600 BLAKE2B 3451865716f9b09f9371679cfd0b398b2816d0d3e99c050cbe2390583853910d5b86afc324f8352d68a53c606c0f2ab475c44e31655fc41be2ccefddabc90fca SHA512 dfd705b4c37db8012090fb1c0c14f1b237a4e67b2b60089117fffbab8d97ca4dc25254ce7c1797ec644090ef02695d716ed7be954f36f4ca90f3bef736a74821
+EBUILD clang-common-15.0.2.9999.ebuild 2741 BLAKE2B 8ba3b62cc60cbe38228f62f3ddadf2ba35ad0b024953fb7dbcf55d964f9b1d3033d7babc91f19635483eefd799f989fd76bd0fd9b4c324a2cf82f68c8363afc0 SHA512 eb073d1c8ee1d02b27fa412c043a4bd8521279d375ebb8b61dee0795e3526ba0365d1c523f41b4873cd4c5a7f2b7c2c57a309cc4810c9440333c09c5835a976f
 EBUILD clang-common-15.0.2.ebuild 2684 BLAKE2B ab8d1644b728a536e151efc2c5e3c8757ad7554aca938d5bdb6e8f63b9d73affdddee2170134b3df182cba59923f182d199e6f247256a6af124a41595fe4e091 SHA512 8e9efa9e69a235e2e072b73729bb0ef1306c94ab868eaecdfdcca5e2169d19dcf0fa4d9be107b7716cdd6ff5aeec69edafac6a477f18076ee5a23b78dce70cd1
-EBUILD clang-common-16.0.0.9999.ebuild 2600 BLAKE2B 3451865716f9b09f9371679cfd0b398b2816d0d3e99c050cbe2390583853910d5b86afc324f8352d68a53c606c0f2ab475c44e31655fc41be2ccefddabc90fca SHA512 dfd705b4c37db8012090fb1c0c14f1b237a4e67b2b60089117fffbab8d97ca4dc25254ce7c1797ec644090ef02695d716ed7be954f36f4ca90f3bef736a74821
+EBUILD clang-common-16.0.0.9999.ebuild 2741 BLAKE2B 8ba3b62cc60cbe38228f62f3ddadf2ba35ad0b024953fb7dbcf55d964f9b1d3033d7babc91f19635483eefd799f989fd76bd0fd9b4c324a2cf82f68c8363afc0 SHA512 eb073d1c8ee1d02b27fa412c043a4bd8521279d375ebb8b61dee0795e3526ba0365d1c523f41b4873cd4c5a7f2b7c2c57a309cc4810c9440333c09c5835a976f
 EBUILD clang-common-16.0.0_pre20220930.ebuild 2600 BLAKE2B 3451865716f9b09f9371679cfd0b398b2816d0d3e99c050cbe2390583853910d5b86afc324f8352d68a53c606c0f2ab475c44e31655fc41be2ccefddabc90fca SHA512 dfd705b4c37db8012090fb1c0c14f1b237a4e67b2b60089117fffbab8d97ca4dc25254ce7c1797ec644090ef02695d716ed7be954f36f4ca90f3bef736a74821
+EBUILD clang-common-16.0.0_pre20221006.ebuild 2741 BLAKE2B 8ba3b62cc60cbe38228f62f3ddadf2ba35ad0b024953fb7dbcf55d964f9b1d3033d7babc91f19635483eefd799f989fd76bd0fd9b4c324a2cf82f68c8363afc0 SHA512 eb073d1c8ee1d02b27fa412c043a4bd8521279d375ebb8b61dee0795e3526ba0365d1c523f41b4873cd4c5a7f2b7c2c57a309cc4810c9440333c09c5835a976f
 MISC metadata.xml 608 BLAKE2B 5a93acbaeaf3144187e9814fd17e1e45d9e83ebd3930b0838b622b4d94c450d87529e1302cb228af5482b689c01e1c0eb066a82100ed96c9f324fc494f1f1905 SHA512 7f39ee901fb543ef1904a70108fd40d5ed0e719874327f8875eb6c7abb25c65026d9f691cf3d71f608ed2f1d9a5858b927ed2cd7732b419f61a22fd3d1c80908
diff --git a/sys-devel/clang-common/clang-common-15.0.2.9999.ebuild b/sys-devel/clang-common/clang-common-15.0.2.9999.ebuild
index db83638be497..7fc966f60858 100644
--- a/sys-devel/clang-common/clang-common-15.0.2.9999.ebuild
+++ b/sys-devel/clang-common/clang-common-15.0.2.9999.ebuild
@@ -20,8 +20,11 @@ PDEPEND="
 		llvm-libunwind? ( sys-libs/llvm-libunwind )
 		!llvm-libunwind? ( sys-libs/libunwind )
 	)
+	!default-compiler-rt? ( sys-devel/gcc )
 	default-libcxx? ( >=sys-libs/libcxx-${PV} )
+	!default-libcxx? ( sys-devel/gcc )
 	default-lld? ( sys-devel/lld )
+	!default-lld? ( sys-devel/binutils )
 "
 
 LLVM_COMPONENTS=( clang/utils )
@@ -53,10 +56,6 @@ pkg_pretend() {
 	fi
 }
 
-usec() {
-	usex "default-${1}" "" "# "
-}
-
 src_install() {
 	newbashcomp bash-autocomplete.sh clang
 
@@ -65,10 +64,10 @@ src_install() {
 		# This file is initially generated by sys-devel/clang-runtime.
 		# It is used to control the default runtimes using by clang.
 
-		$(usec compiler-rt)-rtlib=compiler-rt
-		$(usec compiler-rt)-unwindlib=libunwind
-		$(usec libcxx)-stdlib=libc++
-		$(usec lld)-fuse-ld=lld
+		--rtlib=$(usex default-compiler-rt compiler-rt libgcc)
+		--unwindlib=$(usex default-compiler-rt libunwind libgcc)
+		--stdlib=$(usex default-libcxx libc++ libstdc++)
+		-fuse-ld=$(usex default-lld lld bfd)
 	EOF
 
 	newins - gentoo-gcc-install.cfg <<-EOF
diff --git a/sys-devel/clang-common/clang-common-16.0.0.9999.ebuild b/sys-devel/clang-common/clang-common-16.0.0.9999.ebuild
index db83638be497..7fc966f60858 100644
--- a/sys-devel/clang-common/clang-common-16.0.0.9999.ebuild
+++ b/sys-devel/clang-common/clang-common-16.0.0.9999.ebuild
@@ -20,8 +20,11 @@ PDEPEND="
 		llvm-libunwind? ( sys-libs/llvm-libunwind )
 		!llvm-libunwind? ( sys-libs/libunwind )
 	)
+	!default-compiler-rt? ( sys-devel/gcc )
 	default-libcxx? ( >=sys-libs/libcxx-${PV} )
+	!default-libcxx? ( sys-devel/gcc )
 	default-lld? ( sys-devel/lld )
+	!default-lld? ( sys-devel/binutils )
 "
 
 LLVM_COMPONENTS=( clang/utils )
@@ -53,10 +56,6 @@ pkg_pretend() {
 	fi
 }
 
-usec() {
-	usex "default-${1}" "" "# "
-}
-
 src_install() {
 	newbashcomp bash-autocomplete.sh clang
 
@@ -65,10 +64,10 @@ src_install() {
 		# This file is initially generated by sys-devel/clang-runtime.
 		# It is used to control the default runtimes using by clang.
 
-		$(usec compiler-rt)-rtlib=compiler-rt
-		$(usec compiler-rt)-unwindlib=libunwind
-		$(usec libcxx)-stdlib=libc++
-		$(usec lld)-fuse-ld=lld
+		--rtlib=$(usex default-compiler-rt compiler-rt libgcc)
+		--unwindlib=$(usex default-compiler-rt libunwind libgcc)
+		--stdlib=$(usex default-libcxx libc++ libstdc++)
+		-fuse-ld=$(usex default-lld lld bfd)
 	EOF
 
 	newins - gentoo-gcc-install.cfg <<-EOF
diff --git a/sys-devel/clang-common/clang-common-16.0.0_pre20221006.ebuild b/sys-devel/clang-common/clang-common-16.0.0_pre20221006.ebuild
new file mode 100644
index 000000000000..7fc966f60858
--- /dev/null
+++ b/sys-devel/clang-common/clang-common-16.0.0_pre20221006.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 llvm.org
+
+DESCRIPTION="Common files shared between multiple slots of clang"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="default-compiler-rt default-libcxx default-lld llvm-libunwind"
+
+PDEPEND="
+	sys-devel/clang:*
+	default-compiler-rt? (
+		=sys-libs/compiler-rt-${PV%_*}*
+		llvm-libunwind? ( sys-libs/llvm-libunwind )
+		!llvm-libunwind? ( sys-libs/libunwind )
+	)
+	!default-compiler-rt? ( sys-devel/gcc )
+	default-libcxx? ( >=sys-libs/libcxx-${PV} )
+	!default-libcxx? ( sys-devel/gcc )
+	default-lld? ( sys-devel/lld )
+	!default-lld? ( sys-devel/binutils )
+"
+
+LLVM_COMPONENTS=( clang/utils )
+llvm.org_set_globals
+
+pkg_pretend() {
+	[[ ${CLANG_IGNORE_DEFAULT_RUNTIMES} ]] && return
+
+	local flag missing_flags=()
+	for flag in default-{compiler-rt,libcxx,lld}; do
+		if ! use "${flag}" && has_version "sys-devel/clang[${flag}]"; then
+			missing_flags+=( "${flag}" )
+		fi
+	done
+
+	if [[ ${missing_flags[@]} ]]; then
+		eerror "It seems that you have the following flags set on sys-devel/clang:"
+		eerror
+		eerror "  ${missing_flags[*]}"
+		eerror
+		eerror "The default runtimes are now set via flags on sys-devel/clang-common."
+		eerror "The build is being aborted to prevent breakage.  Please either set"
+		eerror "the respective flags on this ebuild, e.g.:"
+		eerror
+		eerror "  sys-devel/clang-common ${missing_flags[*]}"
+		eerror
+		eerror "or build with CLANG_IGNORE_DEFAULT_RUNTIMES=1."
+		die "Mismatched defaults detected between sys-devel/clang and sys-devel/clang-common"
+	fi
+}
+
+src_install() {
+	newbashcomp bash-autocomplete.sh clang
+
+	insinto /etc/clang
+	newins - gentoo-runtimes.cfg <<-EOF
+		# This file is initially generated by sys-devel/clang-runtime.
+		# It is used to control the default runtimes using by clang.
+
+		--rtlib=$(usex default-compiler-rt compiler-rt libgcc)
+		--unwindlib=$(usex default-compiler-rt libunwind libgcc)
+		--stdlib=$(usex default-libcxx libc++ libstdc++)
+		-fuse-ld=$(usex default-lld lld bfd)
+	EOF
+
+	newins - gentoo-gcc-install.cfg <<-EOF
+		# This file is maintained by gcc-config.
+		# It is used to specify the selected GCC installation.
+	EOF
+
+	local tool
+	for tool in clang{,++,-cpp}; do
+		newins - "${tool}.cfg" <<-EOF
+			# This configuration file is used by ${tool} driver.
+			@gentoo-runtimes.cfg
+			@gentoo-gcc-install.cfg
+		EOF
+	done
+}
+
+pkg_preinst() {
+	# TODO: move this to gcc-config and call it here?
+
+	local gcc_path=$(gcc-config --get-lib-path 2>/dev/null)
+	if [[ -n ${gcc_path} ]]; then
+		cat >> "${ED}/etc/clang/gentoo-gcc-install.cfg" <<-EOF
+			--gcc-install-dir=${gcc_path%%:*}
+		EOF
+	fi
+}