gentoo auto-resync : 17:03:2025 - 00:29:37

3 files changed, 3 insertions, 110 deletions

diff --git a/dev-ml/llvm/Manifest b/dev-ml/llvm/Manifest
index 873a3f3f3586..2f373762f15b 100644
--- a/dev-ml/llvm/Manifest
+++ b/dev-ml/llvm/Manifest
@@ -12,7 +12,6 @@ DIST llvm-project-19.1.7.src.tar.xz 141249332 BLAKE2B 1259ed7f9aca7b35e89d818bef
 DIST llvm-project-19.1.7.src.tar.xz.sig 438 BLAKE2B 4015140f4ba77de45039bdbdfbaf6f30e75705123d067ea97175d91d7a5b6a75008df01d99ae7aa16aaa3b101f3f41e38d01f04158f95a261d617b3ede0254cd SHA512 195797b06ac80a742e0ccbc03a50dc06dd2e04377d783d5474e3e72c5a75203b60292b047929312a411d22b137a239943fba414a4d136a2be14cbff978eb6bda
 DIST llvm-project-20.1.0.src.tar.xz 147206476 BLAKE2B 8e8bd8aa995a84d17ac7d634098a6b72a47c30f1752029b620f4541a2de4039edf09117286094ae7bc59c4e84374dcffb8e5ee6ef5feaf4ea7ddb58dd04ea803 SHA512 c90fbc43c40e148357912adc40d799a79cce3d3a929136c137421f6342ed7338659e651f1dedfa8e10b94b9f2897e25b2962e17709add02857f89f10615a2397
 DIST llvm-project-20.1.0.src.tar.xz.sig 566 BLAKE2B 98979ce89f3fe6e95eef6096066cf855245a585608e7d1fddb5bbb2c73077f3ee28204260e18d7e45e3051daae3639520c39bc3d0dc51524873ac213e2511456 SHA512 68da1c2a13aaa48a67bbb9e716f9f030cf372edc651bca2861453378a6a9172a207ff59e29b175001f042888bf1f9c118fbf938f757e1f4c966943baa7e2696a
-DIST llvm-project-7e8a06cfa4a2951b8ee77e19e34926e6e535b4d1.tar.gz 228792296 BLAKE2B cd9357bdca9342770820f9fadfbd0b129a83324847f18e2ebac1fed8df4afb101aba2dc19d90264ae1e2d5692e34149ca24ef82a4973e7aeddb157268bb411b6 SHA512 9821a34a559e1db596940d76ce9388360baea43c1a9de814f567bfcf1428a0c6e3ced61b1e07537058454785d9c3aa3f443cbcf742a01fb40dd20b476a906442
 DIST llvm-project-cb7298f66d62a3548fcf3bd230304067ecf30d17.tar.gz 229200711 BLAKE2B 1910569812e7423cf566b0dec67269404ba8db8232ab293bc603a88914f2b756e3088bf2133c0fca612cc58d39691c7b813b3c5839a7ac9a3d177fe6bde766c6 SHA512 07c3f6ce34e7d32c5ebce1d2efb77e6a1dde49f9eedf7191733a20bdcb6ffd0c03f8fc8de85fd00bd9465b209f140639a68a367d2218c028bfa6e06067cc3e14
 EBUILD llvm-15.0.7.ebuild 2576 BLAKE2B 077f5cee93e3f92e808856559add99b5fb94c03316493329fcc5067065c44d2216420fb411c9a52fb303fd33c9d4a4edb19d4b6f20ee10ac2e86d518f3ff500a SHA512 ca1d7158d86040261105d93632a2e0f23753990e8a0a268aef2b103c1c2cc81f0497bf243301839ab7c5b00051337bc20d7d9bb1f35c844a7a06d5b02603c72a
 EBUILD llvm-16.0.6.ebuild 2510 BLAKE2B a1877c6ac0e8e2063ab386eb063224b0059a1b8c956e26f5ac1b5daf4902a7bf221b1591be144df618a3598e5634ca80fa43ed3b734b8c096845f34649e9f125 SHA512 cfefe80cf361a5e98be33cdf75b1fc4c226496a68caf7ab19dc47bac3c2b91bbbb5c09c2447b0271e2149d2c5aded7a28e14e57f072ee8abc04cabef11a7fabc
@@ -21,7 +20,6 @@ EBUILD llvm-18.1.8.ebuild 2466 BLAKE2B daa9646cc6b01f6de1ca0dfb13f8851b179985334
 EBUILD llvm-19.1.4.ebuild 2466 BLAKE2B daa9646cc6b01f6de1ca0dfb13f8851b179985334b80cb5610fe11eb87be08129bc81ea6ab424e319c4eeca69bb9b29da19a36225eb79a1d6d9121e4c878b6b4 SHA512 30321d67dc080c88cc351959ec5b8ae63f1201559b0101c555420afada30ba21927f79907019ed6550242f613d2bc27668a4ff750e89f569fd200e1bb9c475ea
 EBUILD llvm-19.1.7.ebuild 2466 BLAKE2B 095155ffec474c2b2c6d7a241f7e8026f316d5e7e194920221480530493e72808f5d43907ef9a520e5c4501e8f8b744712a407d106739de7ff313bce774ab4f9 SHA512 5faba05a88385260585b1e41a69d329efba70bfc836e5e3ba1dac89ed52e48567891cc8c399485b9322a8f8fc038a908ea09bac0fb8e3db6275d4c91434fad80
 EBUILD llvm-20.1.0.ebuild 2466 BLAKE2B 095155ffec474c2b2c6d7a241f7e8026f316d5e7e194920221480530493e72808f5d43907ef9a520e5c4501e8f8b744712a407d106739de7ff313bce774ab4f9 SHA512 5faba05a88385260585b1e41a69d329efba70bfc836e5e3ba1dac89ed52e48567891cc8c399485b9322a8f8fc038a908ea09bac0fb8e3db6275d4c91434fad80
-EBUILD llvm-21.0.0.9999.ebuild 2439 BLAKE2B e980cfeebc7324b180115fa4a8ecf6ab005c554bbc4d15a99e9ecbc8a22f1061193ffb02fd376f1be3cfc812e51124afd81e438e9da1e81a6cf1ab672e8beb51 SHA512 b9ef630e6c6513883ff57ba9f8a3a0c117588fa72d170dde29d5b06e39e8e322aff99d183835bfae2048d09572ed2b2a80279ba452766d8cc088e3b212b3ecce
-EBUILD llvm-21.0.0_pre20250301.ebuild 2439 BLAKE2B e980cfeebc7324b180115fa4a8ecf6ab005c554bbc4d15a99e9ecbc8a22f1061193ffb02fd376f1be3cfc812e51124afd81e438e9da1e81a6cf1ab672e8beb51 SHA512 b9ef630e6c6513883ff57ba9f8a3a0c117588fa72d170dde29d5b06e39e8e322aff99d183835bfae2048d09572ed2b2a80279ba452766d8cc088e3b212b3ecce
+EBUILD llvm-21.0.0.9999.ebuild 2543 BLAKE2B b553bdaa2193f304a661fad3ac8210d1beb66a37f2d1a29b8327b3c9e74d3f80b935927345c4852231979bc5c10cb4c08e18b5a575eac1710e2cc7a9a0b3ed4a SHA512 2192ec78a96dff5617e68f9534b5416db705e0d6f3eb13c250b21158376a87f4f88a6936f1737f479ffe2c5ef846c0cfbdceff4e8bd3cc8c8173d2b8441d91d7
 EBUILD llvm-21.0.0_pre20250311.ebuild 2439 BLAKE2B e980cfeebc7324b180115fa4a8ecf6ab005c554bbc4d15a99e9ecbc8a22f1061193ffb02fd376f1be3cfc812e51124afd81e438e9da1e81a6cf1ab672e8beb51 SHA512 b9ef630e6c6513883ff57ba9f8a3a0c117588fa72d170dde29d5b06e39e8e322aff99d183835bfae2048d09572ed2b2a80279ba452766d8cc088e3b212b3ecce
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-ml/llvm/llvm-21.0.0.9999.ebuild b/dev-ml/llvm/llvm-21.0.0.9999.ebuild
index bacc5c89fa79..3d0b7490e879 100644
--- a/dev-ml/llvm/llvm-21.0.0.9999.ebuild
+++ b/dev-ml/llvm/llvm-21.0.0.9999.ebuild
@@ -96,6 +96,8 @@ src_compile() {
 src_test() {
 	# respect TMPDIR!
 	local -x LIT_PRESERVES_TMP=1
+	# https://github.com/llvm/llvm-project/issues/131115
+	local -x LIT_XFAIL="Bindings/OCaml/debuginfo.ml"
 	cmake_build check-llvm-bindings-ocaml
 }
 
diff --git a/dev-ml/llvm/llvm-21.0.0_pre20250301.ebuild b/dev-ml/llvm/llvm-21.0.0_pre20250301.ebuild
deleted file mode 100644
index bacc5c89fa79..000000000000
--- a/dev-ml/llvm/llvm-21.0.0_pre20250301.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake llvm.org llvm-utils python-any-r1
-
-DESCRIPTION="OCaml bindings for LLVM"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${PV}"
-IUSE="+debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.00.0:0=
-	dev-ml/ocaml-ctypes:=
-	~llvm-core/llvm-${PV}:=[debug?]
-	!llvm-core/llvm[ocaml(-)]
-"
-
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/perl
-	dev-ml/findlib
-"
-
-LLVM_COMPONENTS=( llvm cmake third-party )
-LLVM_USE_TARGETS=llvm
-llvm.org_set_globals
-
-src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DLLVM_BUILD_LLVM_DYLIB=ON
-		-DLLVM_LINK_LLVM_DYLIB=ON
-		-DLLVM_OCAML_OUT_OF_TREE=ON
-
-		# cheap hack: LLVM combines both anyway, and the only difference
-		# is that the former list is explicitly verified at cmake time
-		-DLLVM_TARGETS_TO_BUILD=""
-		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		# disable various irrelevant deps and settings
-		-DLLVM_ENABLE_FFI=OFF
-		-DLLVM_ENABLE_TERMINFO=OFF
-		-DHAVE_HISTEDIT_H=NO
-		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-
-		# TODO: ocamldoc
-	)
-
-	use test && mycmakeargs+=(
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	# also: custom rules for OCaml do not work for CPPFLAGS
-	use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
-	cmake_src_configure
-
-	local llvm_libdir=$(llvm-config --libdir)
-	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
-	cd "${BUILD_DIR}/${libdir}" || die
-	ln -s "${llvm_libdir}"/*.so . || die
-
-	if use test; then
-		local llvm_bindir=$(llvm-config --bindir)
-		# Force using system-installed tools.
-		sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
-			"${BUILD_DIR}"/test/lit.site.cfg.py || die
-	fi
-}
-
-src_compile() {
-	cmake_build ocaml_all
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-llvm-bindings-ocaml
-}
-
-src_install() {
-	DESTDIR="${D}" \
-	cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
-
-	dodoc bindings/ocaml/README.txt
-}