gentoo auto-resync : 05:03:2023 - 23:52:45

7 files changed, 119 insertions, 3 deletions

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index c45db1f11a68..7e6f0195ed03 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index 640306dd2b13..7bd1583caf1b 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -4,6 +4,7 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
+DIST llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz 180523586 BLAKE2B cf918d1e23f922d201a44531c9765b7d8ec2b3b8499ea7954845abcd5fa2687e85b3a34819a583c4f4a6d6e1baa49dbac0b4450cd6b9b322b0f13c88cd7da93c SHA512 18cb00e93d819993a925ae0467d382bc952d82c1eb92dbbb5bb3cdf87043269948670713734ddc3ea4ec50544e54dd11b6747496f7eaa02479374ab9ad075aa5
 DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
 EBUILD llvm-ocaml-14.0.6.ebuild 2594 BLAKE2B 40fea3429bbf2e22f45598a679d9e5c6fa06343081a3a0a7c238bcbc8c3f270fea924ad57cab4f580adef66fe269eec188e6ed9f46772907063267805b7b51c7 SHA512 da649915c4804091ac68d9011a2370560f71e88952d13975a5f882e2c485d561fa0a5a43c61dd48f196534eae1e10aa6e46a9a9f6959d998ca850128c75a2615
 EBUILD llvm-ocaml-15.0.7.ebuild 2598 BLAKE2B 22f3c86bea3a17027f4513685ddb9077800918dbe8dc74dd17e7d8ccfb729c11baf6eb60915d6795170d4dd5ee66b5c19d16653044a0ad7bb34f18161db06848 SHA512 04de6e60fc31644b6e99af4277f5300cdcee1f8e35f9038b490ed7841fd0c92e71bdaa423cdedbc5cccbd219e32857c8d1d0e09dfdfe4919b165ee73670efbfe
@@ -11,4 +12,5 @@ EBUILD llvm-ocaml-16.0.0.9999.ebuild 2516 BLAKE2B 76d79ec543029a6509d80817106cc9
 EBUILD llvm-ocaml-16.0.0_rc3.ebuild 2516 BLAKE2B 76d79ec543029a6509d80817106cc94f880844269c65d5f648c5fc3623fc837b668cc1f7071cf04fa9cce36f8c7a35b238b553a3f2428f01ad76123fa3e9d6b7 SHA512 d42973449686da7c3e94db660026991293d997ef4705580c01903432fae1a990e96e96100dd8ce27cb7ef126d24e003f4f1be997f5abbecdf273db5b4fde6c4e
 EBUILD llvm-ocaml-17.0.0.9999.ebuild 2516 BLAKE2B 76d79ec543029a6509d80817106cc94f880844269c65d5f648c5fc3623fc837b668cc1f7071cf04fa9cce36f8c7a35b238b553a3f2428f01ad76123fa3e9d6b7 SHA512 d42973449686da7c3e94db660026991293d997ef4705580c01903432fae1a990e96e96100dd8ce27cb7ef126d24e003f4f1be997f5abbecdf273db5b4fde6c4e
 EBUILD llvm-ocaml-17.0.0_pre20230225.ebuild 2516 BLAKE2B 76d79ec543029a6509d80817106cc94f880844269c65d5f648c5fc3623fc837b668cc1f7071cf04fa9cce36f8c7a35b238b553a3f2428f01ad76123fa3e9d6b7 SHA512 d42973449686da7c3e94db660026991293d997ef4705580c01903432fae1a990e96e96100dd8ce27cb7ef126d24e003f4f1be997f5abbecdf273db5b4fde6c4e
+EBUILD llvm-ocaml-17.0.0_pre20230304.ebuild 2516 BLAKE2B 76d79ec543029a6509d80817106cc94f880844269c65d5f648c5fc3623fc837b668cc1f7071cf04fa9cce36f8c7a35b238b553a3f2428f01ad76123fa3e9d6b7 SHA512 d42973449686da7c3e94db660026991293d997ef4705580c01903432fae1a990e96e96100dd8ce27cb7ef126d24e003f4f1be997f5abbecdf273db5b4fde6c4e
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-17.0.0_pre20230304.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-17.0.0_pre20230304.ebuild
new file mode 100644
index 000000000000..aee649edd10c
--- /dev/null
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-17.0.0_pre20230304.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake llvm llvm.org python-any-r1
+
+DESCRIPTION="OCaml bindings for LLVM"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0/${PV}"
+KEYWORDS=""
+IUSE="debug test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.00.0:0=
+	dev-ml/ocaml-ctypes:=
+	~sys-devel/llvm-${PV}:=[debug?]
+	!sys-devel/llvm[ocaml(-)]
+"
+
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-lang/perl
+	dev-ml/findlib
+	>=dev-util/cmake-3.16
+"
+
+LLVM_COMPONENTS=( llvm cmake third-party )
+LLVM_USE_TARGETS=llvm
+llvm.org_set_globals
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	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
+}
diff --git a/dev-ml/odoc/Manifest b/dev-ml/odoc/Manifest
index e184813b3c9a..7319439e5f5d 100644
--- a/dev-ml/odoc/Manifest
+++ b/dev-ml/odoc/Manifest
@@ -1,3 +1,3 @@
 DIST odoc-2.2.0.tbz 1548871 BLAKE2B 251c823e5f93e8080d52486e9d048a0c31651b6ea9d4bfdc3202488d7bcd750f9c2899189b943500253bf1e6041cf0283ed5e57c34d1a7d538c7c3710fb9a260 SHA512 9f8fc2ee6b25629474e8aa69dd460becab9277261578af0f7b97f7f779cc5f1056d1b5f14ab583b9b94ea097e5df2d6e35040f2a4887021209705486f9d44a22
-EBUILD odoc-2.2.0-r1.ebuild 567 BLAKE2B 2e4dcc03b3746d6ffa1fb484669eb24cf9db47adbb68918e65eed974c59af0ff57063c16e90de34c438ffcb0b50441fde664930ef50872994700b7cf8b2ee703 SHA512 c1f9292c3758fa145f10625af013faf70009f6f193ab0b1fb9268505ff0a3822db2eda526596d254223d6a5eadfcc3d85d2e7eec632849bb2707a6fa6f574a58
+EBUILD odoc-2.2.0-r2.ebuild 584 BLAKE2B 663ac5582b30ad58555bf5bd69a0b2c60fe7f1b0be4eaa844926fbbc0ce96d3ec992097949e19b73d6582e0bd1290fd6f37fe588732f815b7b5e71979c692999 SHA512 bcc972d027c14203daf7f2c05ca1633618642973d9b7bfc71e39fa616721577ead3c6b2f262fb371eaf3139bdaaa4a0d15d6f3f44fa4e6442afd1aa7c094580a
 MISC metadata.xml 522 BLAKE2B 04acd17984b96b5fdf41120b46c1f15ab1a2b9ccac7312ee27e41da5985cbed08786aa9349cec268f224bc660ea3fd902874bd029f37355685b2fcc8b7093b07 SHA512 d969745657f9335411b45ca5efe110da0d017dac7efe5d5357bdc6f99852c279d116aaa02101b443ef45229c1b9c809db65cfcd719ae48ddf198d5b2923b9f57
diff --git a/dev-ml/odoc/odoc-2.2.0-r1.ebuild b/dev-ml/odoc/odoc-2.2.0-r2.ebuild
index 5028b9801081..24702587b03d 100644
--- a/dev-ml/odoc/odoc-2.2.0-r1.ebuild
+++ b/dev-ml/odoc/odoc-2.2.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,6 +16,7 @@ IUSE="+ocamlopt test"
 RESTRICT="test" # ocaml-crunch not in the tree
 
 RDEPEND="
+	>=dev-ml/dune-3
 	dev-ml/astring:=
 	dev-ml/cmdliner:=
 	dev-ml/cppo:=
diff --git a/dev-ml/zed/Manifest b/dev-ml/zed/Manifest
index 0fd66534d797..58a07a82c218 100644
--- a/dev-ml/zed/Manifest
+++ b/dev-ml/zed/Manifest
@@ -1,5 +1,5 @@
 DIST zed-3.1.0.tar.gz 45535 BLAKE2B 8c8898f01add91807fa282baae1c5ee34e77c5234e87e4c79c17a9f55756d3b4c2af5f0b01deb9414a657f63ea6cf6db44af7249adb0f2b147e923b4112a7dd7 SHA512 d4457af15f970adb7b1ed543017e590fa0ecc47171d6dd520a1397f21ce0219caa30a9db7bedb76c0602d4f6d0f0684012cc33feafe18b848d3261a460dea10a
 DIST zed-3.2.1.tar.gz 43683 BLAKE2B 311fc78674116df9e1f9119102dbd6a882b305c22db0e6b59332d1a71f5a85f7169ba860f7064a72c0825e745e1f0a14f6bb247403a90ebc66a6bcec6c0d25fe SHA512 a1de65684d04d5d44ca4396365c98bfa070cf7c78318b53c3ad3ecca2b411450158ef7644b235490d879b37fe983f1707fef527b69af0c2958e45fd1e7a30f11
 EBUILD zed-3.1.0.ebuild 481 BLAKE2B 601461c875758a110f37dbae328bbd1d60bd83aa3716c367bb5cfb293b41f643f684c1ad2d6575a550986befca0c77aa7e1de33b4ff7cf843bb2507ced796588 SHA512 50b8d34ecfab53c921fc4c03afade28de347d77adc074c6cf6de757894cb7f9aeb21b7123b20904dcfda4fc744bdf190bdbfcecdc11b8ed7a494125f7101f1fa
-EBUILD zed-3.2.1-r1.ebuild 517 BLAKE2B 9bc6bdde6aa282d65eb1c117f4b2f989151fcb78f32cfdde03cb95b04ccc4db448e15feabf877ef1a182359d6b8ed6f1df27b54f1493515c85fce2a26ea629dc SHA512 d774b958a780f4a1853638f53eef11f1cf4ccef0d8dde0ac11f99bc38359fce1dfd4fb2cc82083dd3a5b2fb4930233061b95aaa32d46fc0fb52d6348fdff2efd
+EBUILD zed-3.2.1-r2.ebuild 534 BLAKE2B 80956cd106eb1140378fbe2e2f7c82a1572c4b2da7782cbcf33a7291af8b17535f1d98afc4fe647127d5bca50da65999bf4e14a365154387b2228a06ba9a3160 SHA512 134e118d35f86a6b540d17799e16e2b73f1f9ab43f61affd4f1a69a15cf4e7fe65d52e4ba11d274401dcf42c15111a72e58cb6ef9271374776a80e3f051cb914
 MISC metadata.xml 954 BLAKE2B d34a05ffaf2d7469b3ae6b65399a316279748536b93b9868f83484d0d719db9af3f1ec7fd834c7fd06902292231c3a964df8d94ad7c7b1044c614bbfae41bf53 SHA512 a44ecc312b950eeb782987e69bff55687be570ef304ae8689c8f1d5afd29d3990a54245a0229c1cff1964cd42e343350350fae30037b8f6856dd254893af8690
diff --git a/dev-ml/zed/zed-3.2.1-r1.ebuild b/dev-ml/zed/zed-3.2.1-r2.ebuild
index 3caadbbe9b7c..066ffd88b927 100644
--- a/dev-ml/zed/zed-3.2.1-r1.ebuild
+++ b/dev-ml/zed/zed-3.2.1-r2.ebuild
@@ -16,6 +16,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
+	>=dev-ml/dune-3
 	dev-ml/react:=
 	dev-ml/result:=
 	dev-ml/uchar:=