gentoo auto-resync : 08:05:2024 - 00:00:57

4 files changed, 17 insertions, 135 deletions

diff --git a/dev-libs/castxml/Manifest b/dev-libs/castxml/Manifest
index b1e92ef85d9b..b4dc781ffc7f 100644
--- a/dev-libs/castxml/Manifest
+++ b/dev-libs/castxml/Manifest
@@ -1,12 +1,8 @@
 AUX castxml-fix-tests.patch 950 BLAKE2B b4161b47cc611abaa6b62b7b657149854f505a72a0a0b611630f2671b8361ffe573e3b80004c2e26b179db9eb522ebe51a528e2aaf71b70425a666bc49547549 SHA512 b9925211ecc83695ee0effcd19c848379208c510d92e79ba41d6ca3d44fb928b10d2856f681e5f9c30f3ebe02c4808f3533c0f2c8b510f6c62f97c65cd4f896c
 DIST CastXML-0.6.5.tar.gz 121667 BLAKE2B 820a96dfb9f2763c00f22028ff4c232c15bf587f376aa11effd59d8d1014581d8dff4e8a01a6420a8e8e720e72f072da4ed5d0600171718d42e352d0439371eb SHA512 1f6759242fd6097fc97df34b1689ae6660e42d64717be90fa2d2f251847a465e26e17d6ff5318d82c47981005c826dad0fe65b3536b13d9192b9bccf61097f10
+DIST CastXML-0.6.6.tar.gz 122349 BLAKE2B ab2d928386e3128cd05fcc60c02799508e671883cffd33f952eb81167672e4c76057be21d3ba6b3f327051b015894914c83ad66b5ce87e43fa1b251dea5c5371 SHA512 6ba62b91193eb3458cbd0a0838a626528f66972661cc33c6ef87b760f8baa985afe998a467d07fd7d28c1363f5ba74300f5d49c182830d217a4e051a97a4a913
 DIST castxml-0.5.1.tar.gz 106918 BLAKE2B 9268f149ea5a511d24cbbd0c7faec5bff5eade5a511961d3bb120409691bf2b8aca7f2978e048a759419c097d9d97219a61a122bd37d4f835c1d86827bfb07e3 SHA512 1dff8f5cc6932a159e1132c0b283a28414ea6007c942cac4ae15a1c31789f5bd29efd65a6b5b63d7bc48b3d68c3550804f31bee2658e51082269fc5ecc15590e
-DIST castxml-0.6.1.tar.gz 119089 BLAKE2B 8e7ea8254debc05fb2d145a1945228607bb7f903dd7748d81f7647f16f0814d331f98f4be1ab430bbb509afdb18c998be998496ef2a8a2e563169747cae1c91c SHA512 0477209979679ca5cae05d99e3ae9c2850f19a39a310a376047570d9e14b37e32aa2ebdea41d000194343e6ec9a27f21b0fcdf633d8b74733e655d9de70bc2a5
-DIST castxml-0.6.2.tar.gz 119190 BLAKE2B fd3522a19898d96fbcbf7044d8d4c03ec7a5192df0ec28e04eecee753367aca76e53e7320f788877b449ca90ee4f441ade76e833ec6fdc1a73ad4f5dfa64c0e0 SHA512 eec6495b8ed837031b5d41cb09b8f70c497c865fbef47bc51b5f296fb9db852ded0bd13c45c3f3017d7d1eb5976557634e52369a24ddbf1f2cf9705c321bac3b
-DIST castxml-0.6.4.tar.gz 121583 BLAKE2B 9e4992306bc1380b92ff4d8fcfcf24934036aaf4ecbf2b4db4dfb942ce16152c385b64f96ec0559e6e175f06cf15da0635e61324f92ed6fd0cefc7c83326885d SHA512 3494b7a31a397b390c412a5f445e40d92b3f02840a3eaf9fd94cef2c10fdd52b3621b3990056f2d0619a7d09de448a6988160406d3286472a8db5322a9b1caeb
 EBUILD castxml-0.5.1-r1.ebuild 1050 BLAKE2B cdcd6465f0e262f29207746ceab9a078cca51ee5d3ebc61dba4dc3e59211c1eacf1a3086cd2be4aecb5809c9946692f5f93112c5eb95edeac553de3eff38c263 SHA512 afef30f626dfca77c2822dbea14136f67f9f21d6869e6cf3e5601b96d2602229eafe359b8b00b36e7b8e1eb054ff6019ca687e86da99208ddc27e40960f8e187
-EBUILD castxml-0.6.1.ebuild 1051 BLAKE2B ab1ce42c504eba5bb76a1f5d85847e75b2a0ee2c32b6d2e645d33112f06d624b7bc4ee857e9ede37bf5d70021fd38ff34e09a9634756d0526cc13f83d0fa46f4 SHA512 b199ece1deb67c0e71e4090b79075a7f3182f7931e11bb9be0148ecb02ce8140398be1b5681ab8523a384aef136241235ffeae6a72bc5b8807fb18be09af8e81
-EBUILD castxml-0.6.2.ebuild 1367 BLAKE2B a49f82ae335b8e2f1c839e87848615d3bfa875414427e0a8953215cab51f885b6eb676d951237906fd6c4e851828398a4a59456d2d6422c92620175c5745c20f SHA512 4203b93ced8c53766e99a7a971c6e933d75c0035bc47cc0251929668905c64f60df44c8f22fd4b7a8b79b0ab81ba18354dc134e9727512a82dba9f0e26f82bb0
-EBUILD castxml-0.6.4.ebuild 1367 BLAKE2B feaa13cf5c6e611afda086c30b4c176addb4b739a5878ee107091e7491de2db706ba390ec06d6569b69edbbc174476f9df988ced94201215b707047c381db7dc SHA512 b6366b49743c12cd718288e0ac78abefa98377d68dfd133686b0a5af6d00e0b84e6356c243b9fb392d3c8cc9899597d641ce59bdf09ccd49069455b6466599d0
 EBUILD castxml-0.6.5.ebuild 1187 BLAKE2B 6dac0c95865b2beeaf172091fde3ab9d57f5c9a0c714d2e0e8c697552101a7c38ed973ade0948da740857c14073b2ea290864a8c432743af4ac6b1fd5ec4a203 SHA512 67a101468e82bd12fdec2f35bd004aa1393e40f3f23c4a6061dd07e0cde92b46d409cb09d2f66f718c9f87e7e321c24bac9cfaacabdec031becd651f871b7b90
+EBUILD castxml-0.6.6.ebuild 1187 BLAKE2B 6dac0c95865b2beeaf172091fde3ab9d57f5c9a0c714d2e0e8c697552101a7c38ed973ade0948da740857c14073b2ea290864a8c432743af4ac6b1fd5ec4a203 SHA512 67a101468e82bd12fdec2f35bd004aa1393e40f3f23c4a6061dd07e0cde92b46d409cb09d2f66f718c9f87e7e321c24bac9cfaacabdec031becd651f871b7b90
 MISC metadata.xml 593 BLAKE2B dd9a10d726b1d46a88ca87601f17372ad6a10e8cd3ad6a7463c0aa7753dc7103694ac5d3120fc009cfcd3ddcfd4290d1ddd61763018addf1639520eaca493396 SHA512 5b01620d07eb9d11894a599515e70ea8d61862c4bdeae85aa2965801c26cde2b32461ba6c52b3019ae80cb05b975806bca302b6d01f7f51bd94a500dc13c77a2
diff --git a/dev-libs/castxml/castxml-0.6.1.ebuild b/dev-libs/castxml/castxml-0.6.1.ebuild
deleted file mode 100644
index 61e6bb8b1dff..000000000000
--- a/dev-libs/castxml/castxml-0.6.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_MAX_SLOT=16
-inherit cmake llvm
-
-DESCRIPTION="C-family abstract syntax tree XML output tool"
-HOMEPAGE="https://github.com/CastXML/CastXML"
-SRC_URI="https://github.com/CastXML/CastXML/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/CastXML-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~riscv ~x86"
-IUSE="+man test"
-RESTRICT="!test? ( test )"
-
-# See comment in llvm.eclass for why we don't depend on LLVM if we already
-# depend on Clang.
-RDEPEND="
-	<sys-devel/clang-$((LLVM_MAX_SLOT + 1)):=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${RDEPEND}
-	man? ( dev-python/sphinx )
-"
-
-PATCHES=(
-#	"${FILESDIR}"/${PN}-fix-tests.patch
-)
-
-llvm_check_deps() {
-	has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCastXML_INSTALL_DOC_DIR="share/doc/${PF}"
-		-DCastXML_INSTALL_MAN_DIR="share/man"
-		-DSPHINX_MAN="$(usex man)"
-		-DSPHINX_HTML=OFF
-		-DBUILD_TESTING="$(usex test)"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/castxml/castxml-0.6.2.ebuild b/dev-libs/castxml/castxml-0.6.2.ebuild
deleted file mode 100644
index 167ac162e324..000000000000
--- a/dev-libs/castxml/castxml-0.6.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_MAX_SLOT=17
-inherit cmake llvm
-
-DESCRIPTION="C-family abstract syntax tree XML output tool"
-HOMEPAGE="https://github.com/CastXML/CastXML"
-SRC_URI="https://github.com/CastXML/CastXML/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/CastXML-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~riscv ~x86"
-IUSE="+man test"
-RESTRICT="!test? ( test )"
-
-# See comment in llvm.eclass for why we don't depend on LLVM if we already
-# depend on Clang.
-RDEPEND="
-	<sys-devel/clang-$((LLVM_MAX_SLOT + 1)):=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${RDEPEND}
-	man? ( dev-python/sphinx )
-"
-
-PATCHES=(
-#	"${FILESDIR}"/${PN}-fix-tests.patch
-)
-
-llvm_check_deps() {
-	has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCastXML_INSTALL_DOC_DIR="share/doc/${PF}"
-		-DCastXML_INSTALL_MAN_DIR="share/man"
-		-DSPHINX_MAN="$(usex man)"
-		-DSPHINX_HTML=OFF
-		-DBUILD_TESTING="$(usex test)"
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	local CMAKE_SKIP_TESTS=(
-		# Regex doesn't match the full build path
-		cmd.input-missing
-		cmd.rsp-missing
-
-		# Gets confused by extra #defines we set for hardening etc (bug #891813)
-		cmd.cc-gnu-src-cxx-E
-		cmd.cc-gnu-src-cxx-cmd
-		cmd.cc-gnu-c-src-c-E
-		cmd.cc-gnu-c-src-c-cmd
-	)
-
-	cmake_src_test
-}
diff --git a/dev-libs/castxml/castxml-0.6.4.ebuild b/dev-libs/castxml/castxml-0.6.6.ebuild
index 415f275dcc3f..894410252a94 100644
--- a/dev-libs/castxml/castxml-0.6.4.ebuild
+++ b/dev-libs/castxml/castxml-0.6.6.ebuild
@@ -3,13 +3,18 @@
 
 EAPI=8
 
-LLVM_MAX_SLOT=17
-inherit cmake llvm
+LLVM_COMPAT=( {17..19} )
 
+inherit cmake llvm-r1
+
+MY_P=CastXML-${PV}
 DESCRIPTION="C-family abstract syntax tree XML output tool"
 HOMEPAGE="https://github.com/CastXML/CastXML"
-SRC_URI="https://github.com/CastXML/CastXML/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/CastXML-${PV}"
+SRC_URI="
+	https://github.com/CastXML/CastXML/archive/v${PV}.tar.gz
+		-> ${MY_P}.tar.gz
+"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -17,25 +22,18 @@ KEYWORDS="~amd64 ~arm ~riscv ~x86"
 IUSE="+man test"
 RESTRICT="!test? ( test )"
 
-# See comment in llvm.eclass for why we don't depend on LLVM if we already
-# depend on Clang.
+DEPEND="
+	$(llvm_gen_dep '
+		sys-devel/clang:${LLVM_SLOT}=
+	')
+"
 RDEPEND="
-	<sys-devel/clang-$((LLVM_MAX_SLOT + 1)):=
+	${DEPEND}
 "
-DEPEND="${RDEPEND}"
 BDEPEND="
-	${RDEPEND}
 	man? ( dev-python/sphinx )
 "
 
-PATCHES=(
-#	"${FILESDIR}"/${PN}-fix-tests.patch
-)
-
-llvm_check_deps() {
-	has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DCastXML_INSTALL_DOC_DIR="share/doc/${PF}"