gentoo resync : 06.04.2022

5 files changed, 33 insertions, 18 deletions

diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index c75368066860..35c28dc97d73 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -7,7 +7,7 @@ DIST llvm-gentoo-patchset-11.1.0-1.tar.xz 4032 BLAKE2B e69138a422e315b31a3d9c11f
 DIST llvm-gentoo-patchset-12.0.1.tar.xz 5280 BLAKE2B 963d005bc7b636570be90eb841ac5bcaeb927538cc7de27683167111a17d6496677c7517de2ecfaf14b5d8ac22bad357be490b8a2ed9aba502fd5f447ecc99e9 SHA512 fc7c38e671555751650299c3a8bee44d5c7f26e11b68d5538c507fb7fe9ff2d349bdcd43bce90a448a747f082d523b3849d6bcda5e3ae2e998edcb926d6aa249
 DIST llvm-gentoo-patchset-13.0.0.tar.xz 5012 BLAKE2B 6760c78c086aaf6629143fd920b0a2c68cad9278628fbea8164dfeb59db95984a5b5d6b3505b510c697e8c95bf8d2be782c6b73c01622d52f2da9b07ecff39e0 SHA512 7764d49343b795b6bebae64f646ba27e3e6cc2a20b8a1aee645ce0d8474633c34acfbb73c08546fee415755dd4ea5a98c1d84db5e394cf5f4fc802eb61148ab6
 DIST llvm-gentoo-patchset-13.0.1.tar.xz 6288 BLAKE2B 899222b962486e924e4f8a2b574d285531a3f87af9385ff68c81db92aa224a0cde6d4ee049b5405056bedb4b232b50e1d5840024071a4a215f6311853304c92d SHA512 b2805337f1deca626768a44c5e7ac9ed16e0c31bead1647d44a493a8123c1b8e8f1c8ceee3536bcc6fa87fdd3fcec408229f701adf30eff07e7ef9889b847b01
-DIST llvm-gentoo-patchset-14.0.0.tar.xz 4076 BLAKE2B dc114e53fb878ca74489c420506b9dd9c417e2b97dff4d9441d78a0a256ca1e7243ea2ce38b8665d37b0f24436f9ea5771cd05d9b13887e7370a19ec5e05ba20 SHA512 7f7d08fc762d634692fb251a51c0d73a4a9098907f25451b9ca9453315b603331b65a454b2d631cfecbb3fbc11ab3a36f644c0d7b03e1bb8e96ce4aa08d60615
+DIST llvm-gentoo-patchset-14.0.0-r1.tar.xz 5500 BLAKE2B b8ddbf41f70fbe9293a9fb81617e0893647233a61c4e34f8861f37526325893188cdf734b5349c7d06f5f23311536b95a3232af39eb4eb4f509386d022747842 SHA512 a0c93137ce0ae1bd111276c114f24c248cb800eb6d3c6cbc7b2c9658fbcde20d66c060b05535d9ae40d046e37cae81a27b8a4f7c27f718ccb39b3314f92577cd
 DIST llvm-gentoo-patchset-9999-r3.tar.xz 4076 BLAKE2B 30bdf740606a1718ae45d850803385d425b656fbbe0250f587cad54f55272e3617d5ee0d04f534a58f87408b0a2dea322ebf1bb8cd653a2beba21d0bc5778c62 SHA512 2c7080ffd09d7dcf4c72a97044a5c63ab895250721d60270bc51c2095aef5f9039781892b4c0d14e942611686153f874a1f52a1c854bb8ca093383c08bdc005a
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
@@ -17,8 +17,8 @@ DIST llvmorg-14.0.0.tar.gz 158057350 BLAKE2B 7052684c620a5eaf52beeee4591adf58cfe
 EBUILD clang-11.1.0.ebuild 11573 BLAKE2B adb4fc733f04605c63c711d3b9c9ce3358108efd013bcda58fe776dd5be0f978475dc686bfa2ca1c22bece3e13f60e412e33ebcd907e1e08d27932e254f6996a SHA512 a6fe29ca8c599f022147aae1fe8c0af8aacf33de2f02c19c9850bc06147f968cb579070c2a6763615cf04740c131719e17495b07b8f2ba9d32874587a2e20784
 EBUILD clang-12.0.1.ebuild 11726 BLAKE2B 2dca51da0a8683bac8cf7b0d3a45cbe97e829b6699b25c477245fa7c891b899ae2cdc40a0e628f4f3830fb18bfeb2ce5b9493651c6498c841986018f5ded69b6 SHA512 c7e81f72c28ea11e698ecfab7bc3075002503105df65d938a87079b1d28ced24dbce23fdb9acfbc7c2972d9dca69205f102635f5cba62110c02c8ac8bc8b8764
 EBUILD clang-13.0.0.ebuild 11288 BLAKE2B 6a49d6681c081e713e17679ea3ae1d87ee98a3229426a0f3e6d481c1a8fb78a00d267402687373ffcab3c48b4b8888fb8509779cb118ff63d4cb2f10306439e7 SHA512 e17c03e45d1c522e837e76f3ef5ebbbf6ec91c4b248cd874e4b0fe1dbb2f3ee4264fd318ebabb4d466929bd4f087922609356d3212ce696741e98faa2fd9ee47
-EBUILD clang-13.0.1.ebuild 11304 BLAKE2B d274cbb907b3ae41f3755146242a1da3f98dedf405b245056294294d71b6c3e521f81631b16c2c589d068766ae9c7f2b3dcd03100e052d842c22b81b8d83accc SHA512 5e367d1ede076032041c58cd8ef558e7c67a148c9a602f6bf17db7af355ce6eb3873973ae3f324da240d6ab6682e824909f059d3c5991daf6d98d258f8ea6a45
-EBUILD clang-14.0.0.9999.ebuild 11352 BLAKE2B 5f6e9f05b99f03b181b8ae341f614f9cf3c0b8c384e0e6fb9a2b8ba6c746112d88a1507f69685425f55f7d37a0577e90c6447fe04a675d993a379e870395c30d SHA512 137bd65b74ed4380c454bd153c81cc68fbd4d17f857e05256672e018c0fa82b0745f4042ea8630aba9cc62c19063c03df9b4c8c6158567e95709b9e7e7b63b9b
-EBUILD clang-14.0.0.ebuild 11434 BLAKE2B 0b04b8d93270190de0b8d5bec68abbd225afc60020c37a5c0ae0a20594d249e63022b4d9008b1a31a5f31c50da4520f31d553e84daa70182a27baa3c18ff9f81 SHA512 ec95c300e9d730484083162d326cc3fb660d306ba8d45fd705b79dabddcf508402a846aac804376791ed9c82b1b6e7cc4b2716839c563cee8bd7ed94fcae5c11
-EBUILD clang-15.0.0.9999.ebuild 11352 BLAKE2B 5f6e9f05b99f03b181b8ae341f614f9cf3c0b8c384e0e6fb9a2b8ba6c746112d88a1507f69685425f55f7d37a0577e90c6447fe04a675d993a379e870395c30d SHA512 137bd65b74ed4380c454bd153c81cc68fbd4d17f857e05256672e018c0fa82b0745f4042ea8630aba9cc62c19063c03df9b4c8c6158567e95709b9e7e7b63b9b
+EBUILD clang-13.0.1.ebuild 11303 BLAKE2B 0fc98007c76c642736919936ca62907d0e1081956f3897b352965ddeb97c238c67ac224293658654dad1032803a9c509da619f9d8fcad74db0174deb154093fe SHA512 963990f22a1a839f292c6a0d22da6d9e31278f953c8713c56f18db6870433f2e9ab4295c96d7d756ce82cb996c841ed515c056eece0ccd1c3a28ce920c490edf
+EBUILD clang-14.0.0-r1.ebuild 11529 BLAKE2B 948bdbcf950375a78f238b530de8dde4c2582a89cc385ef419f855c36c253064526b3f9d86c1b36b1364497ad8450327cea774344097c787fb4887b22b53e502 SHA512 c65ccfb25f2f538c98c5a9305251b45a6dd8ab2a4bb55fc4b28186b8c97fed64f5c4075af79f20a2248de5780443163ed74a7982e762eb9cb03b0fd69095d4f4
+EBUILD clang-14.0.0.9999.ebuild 11644 BLAKE2B 4dda8010914a82e7a9f775e535477dd7e970b684d329d5b1d62bbde49f03670916b47ba77071805cf0287f5bdb9053cff10057ad22f1b4ae03bd38f3a79e1d5c SHA512 f9a7ad6cf75cdca1cc4eccfdc1fe260f9b60f2012d77f2a29a5154484d80f06919317d8025ec1a01576bce8e7faf2a178248c1d325b440b0092222373d25ca8e
+EBUILD clang-15.0.0.9999.ebuild 11644 BLAKE2B 4dda8010914a82e7a9f775e535477dd7e970b684d329d5b1d62bbde49f03670916b47ba77071805cf0287f5bdb9053cff10057ad22f1b4ae03bd38f3a79e1d5c SHA512 f9a7ad6cf75cdca1cc4eccfdc1fe260f9b60f2012d77f2a29a5154484d80f06919317d8025ec1a01576bce8e7faf2a178248c1d325b440b0092222373d25ca8e
 MISC metadata.xml 1337 BLAKE2B 5e4f7d63cd9f3b03600801cbe3b2963a1e6b2fb48e36fdb12862f467829222c182f5958d35b535d8fa8467ebaad05c9641cd645294706e3a0f4a078dc9c2f8cf SHA512 50c1a7c33414f9d6294873478f1017dfb21311b36c916e15a8b068cf2a968fe8d774b51515f61c3632d2b204f103cc7ae6853b14d582291087a0fb8e15c0b35a
diff --git a/sys-devel/clang/clang-13.0.1.ebuild b/sys-devel/clang/clang-13.0.1.ebuild
index 2aa75d0f943a..97b2f78365f2 100644
--- a/sys-devel/clang/clang-13.0.1.ebuild
+++ b/sys-devel/clang/clang-13.0.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x64-macos"
 IUSE="debug default-compiler-rt default-libcxx default-lld
 	doc llvm-libunwind +static-analyzer test xml"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sys-devel/clang/clang-14.0.0.ebuild b/sys-devel/clang/clang-14.0.0-r1.ebuild
index 43eab1f8e735..e625b4c694ba 100644
--- a/sys-devel/clang/clang-14.0.0.ebuild
+++ b/sys-devel/clang/clang-14.0.0-r1.ebuild
@@ -30,7 +30,10 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	>=dev-util/cmake-3.16
-	doc? ( dev-python/sphinx )
+	doc? ( $(python_gen_cond_dep '
+		dev-python/recommonmark[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	') )
 	xml? ( virtual/pkgconfig )
 	${PYTHON_DEPS}"
 PDEPEND="
@@ -54,7 +57,7 @@ LLVM_TEST_COMPONENTS=(
 	llvm/utils/{lit,llvm-lit,unittest}
 	llvm/utils/{UpdateTestChecks,update_cc_test_checks.py}
 )
-LLVM_PATCHSET=${PV/_/-}
+LLVM_PATCHSET=${PV/_/-}-r1
 LLVM_USE_TARGETS=llvm
 llvm.org_set_globals
 
diff --git a/sys-devel/clang/clang-14.0.0.9999.ebuild b/sys-devel/clang/clang-14.0.0.9999.ebuild
index 81598e69a80e..4cb70129b171 100644
--- a/sys-devel/clang/clang-14.0.0.9999.ebuild
+++ b/sys-devel/clang/clang-14.0.0.9999.ebuild
@@ -30,7 +30,10 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	>=dev-util/cmake-3.16
-	doc? ( dev-python/sphinx )
+	doc? ( $(python_gen_cond_dep '
+		dev-python/recommonmark[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	') )
 	xml? ( virtual/pkgconfig )
 	${PYTHON_DEPS}"
 PDEPEND="
@@ -102,10 +105,6 @@ check_distribution_components() {
 					clang-libraries|distribution)
 						continue
 						;;
-					# headers for clang-tidy static library
-					clang-tidy-headers)
-						continue
-						;;
 					# tools
 					clang|clangd|clang-*)
 						;;
@@ -191,6 +190,7 @@ get_distribution_components() {
 			clang-query
 			clang-reorder-fields
 			clang-tidy
+			clang-tidy-headers
 			clangd
 			find-all-symbols
 			modularize
@@ -347,6 +347,7 @@ src_install() {
 	# Move runtime headers to /usr/lib/clang, where they belong
 	mv "${ED}"/usr/include/clangrt "${ED}"/usr/lib/clang || die
 	# move (remaining) wrapped headers back
+	mv "${T}"/clang-tidy "${ED}"/usr/include/ || die
 	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${SLOT}/include || die
 
 	# Apply CHOST and version suffix to clang tools
@@ -392,6 +393,11 @@ multilib_src_install() {
 	rm -rf "${ED}"/usr/include || die
 	mv "${ED}"/usr/lib/llvm/${SLOT}/include "${ED}"/usr/include || die
 	mv "${ED}"/usr/lib/llvm/${SLOT}/$(get_libdir)/clang "${ED}"/usr/include/clangrt || die
+	if multilib_is_native_abi; then
+		# don't wrap clang-tidy headers, the list is too long
+		# (they're fine for non-native ABI but enabling the targets is problematic)
+		mv "${ED}"/usr/include/clang-tidy "${T}/" || die
+	fi
 }
 
 multilib_src_install_all() {
diff --git a/sys-devel/clang/clang-15.0.0.9999.ebuild b/sys-devel/clang/clang-15.0.0.9999.ebuild
index 81598e69a80e..4cb70129b171 100644
--- a/sys-devel/clang/clang-15.0.0.9999.ebuild
+++ b/sys-devel/clang/clang-15.0.0.9999.ebuild
@@ -30,7 +30,10 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	>=dev-util/cmake-3.16
-	doc? ( dev-python/sphinx )
+	doc? ( $(python_gen_cond_dep '
+		dev-python/recommonmark[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	') )
 	xml? ( virtual/pkgconfig )
 	${PYTHON_DEPS}"
 PDEPEND="
@@ -102,10 +105,6 @@ check_distribution_components() {
 					clang-libraries|distribution)
 						continue
 						;;
-					# headers for clang-tidy static library
-					clang-tidy-headers)
-						continue
-						;;
 					# tools
 					clang|clangd|clang-*)
 						;;
@@ -191,6 +190,7 @@ get_distribution_components() {
 			clang-query
 			clang-reorder-fields
 			clang-tidy
+			clang-tidy-headers
 			clangd
 			find-all-symbols
 			modularize
@@ -347,6 +347,7 @@ src_install() {
 	# Move runtime headers to /usr/lib/clang, where they belong
 	mv "${ED}"/usr/include/clangrt "${ED}"/usr/lib/clang || die
 	# move (remaining) wrapped headers back
+	mv "${T}"/clang-tidy "${ED}"/usr/include/ || die
 	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${SLOT}/include || die
 
 	# Apply CHOST and version suffix to clang tools
@@ -392,6 +393,11 @@ multilib_src_install() {
 	rm -rf "${ED}"/usr/include || die
 	mv "${ED}"/usr/lib/llvm/${SLOT}/include "${ED}"/usr/include || die
 	mv "${ED}"/usr/lib/llvm/${SLOT}/$(get_libdir)/clang "${ED}"/usr/include/clangrt || die
+	if multilib_is_native_abi; then
+		# don't wrap clang-tidy headers, the list is too long
+		# (they're fine for non-native ABI but enabling the targets is problematic)
+		mv "${ED}"/usr/include/clang-tidy "${T}/" || die
+	fi
 }
 
 multilib_src_install_all() {