gentoo auto-resync : 24:10:2024 - 04:04:24

9 files changed, 145 insertions, 26 deletions

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index d2ea094ae3d9..6a182874f0ed 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 3fcca716be36..9c1d1d6eb0e1 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -1,3 +1,4 @@
+DIST llvm-project-0cb80c4f00689ca00a85e1f38bc6ae9dd0bf980e.tar.gz 220327440 BLAKE2B b58d9fe8527d5849266c56400d451faff3b9138ee7d71f24d904c146dfcf05a1734e1234bab1b4035b55a9588633f05264ebf87886aab27a2a2f18a945869041 SHA512 d0d443bc4b21c9b32bd079d0538702737bb4cb4218edfdfd24164e9b14ee25d5809e7aa840f6c1bb0e3d73cd1fe59053aff041df93274fdbcf436ae57cef99ae
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db365965f1c00bfea6c2d653b3996bd2acef8a2b37e37f6fc8a9d2b65711ad72657e0ef52c42f733053cf65051e7822f27396c30406d SHA512 89a67ebfbbc764cc456e8825ecfa90707741f8835b1b2adffae0b227ab1fe5ca9cce75b0efaffc9ca8431cae528dc54fd838867a56a2b645344d9e82d19ab1b7
@@ -16,4 +17,5 @@ EBUILD llvm-ocaml-18.1.8.ebuild 2466 BLAKE2B 7480f9140cbdd2ec337cd08924013f1f975
 EBUILD llvm-ocaml-19.1.2.ebuild 2466 BLAKE2B 7480f9140cbdd2ec337cd08924013f1f9751bc34c3223b3f5be441e4d06d131f74aca0cb0115c71ebacb3909240e42d4608dddf98bb6f69e371d5e86e19141f5 SHA512 b7c05d3be29399eb9fb4267537a450daf00b7d8f6bd2be472e5802d4072e3a805db8d5f4fa2830ec46655170a7f2fc1119825327b2d4008af8364772fc215f65
 EBUILD llvm-ocaml-20.0.0.9999.ebuild 2439 BLAKE2B 78ec9994e7e03caf7e32e36c1c8b697039e1c8bcaaf89289ccfc53ccb286d8f3f855048162452782292c2f67e1c4476fa24898c595a55f89aabeef83283fc23a SHA512 b36e82afdfeff73650c86ee1ca59a6c1796a7445a34cc9711d65841380c5a023f661dfd723f4311b537ab5047d4a4bef497ca20e106b1cc0832851674677391b
 EBUILD llvm-ocaml-20.0.0_pre20241015.ebuild 2439 BLAKE2B 78ec9994e7e03caf7e32e36c1c8b697039e1c8bcaaf89289ccfc53ccb286d8f3f855048162452782292c2f67e1c4476fa24898c595a55f89aabeef83283fc23a SHA512 b36e82afdfeff73650c86ee1ca59a6c1796a7445a34cc9711d65841380c5a023f661dfd723f4311b537ab5047d4a4bef497ca20e106b1cc0832851674677391b
+EBUILD llvm-ocaml-20.0.0_pre20241023.ebuild 2439 BLAKE2B 78ec9994e7e03caf7e32e36c1c8b697039e1c8bcaaf89289ccfc53ccb286d8f3f855048162452782292c2f67e1c4476fa24898c595a55f89aabeef83283fc23a SHA512 b36e82afdfeff73650c86ee1ca59a6c1796a7445a34cc9711d65841380c5a023f661dfd723f4311b537ab5047d4a4bef497ca20e106b1cc0832851674677391b
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-20.0.0_pre20241023.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-20.0.0_pre20241023.ebuild
new file mode 100644
index 000000000000..36b3716c0372
--- /dev/null
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-20.0.0_pre20241023.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2024 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:=
+	~sys-devel/llvm-${PV}:=[debug?]
+	!sys-devel/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
+}
diff --git a/dev-ml/ocamlnet/Manifest b/dev-ml/ocamlnet/Manifest
index 6be13f55a3c5..b3d0743f8157 100644
--- a/dev-ml/ocamlnet/Manifest
+++ b/dev-ml/ocamlnet/Manifest
@@ -1,7 +1,8 @@
+AUX ocamlnet-4.1.9-noWhich.patch 393 BLAKE2B a1f0dc4c65994976cd7c918da57f68c834513f8d2b9bfcff2bc3c04260016769656a7842df2e435539dd7b3ac1280c25759770fe66790153809f7f5074644cfa SHA512 543980129792164c1c0ccc3b64bfc0eae9aa5238f9baf19f322f7b6de547de0bd582d88d9b128c99b71121fa9007501a96bbbfa2782475905739c544ff7318d1
 AUX ocamlnet-4.1.9-shuffle.patch 390 BLAKE2B 2cdb5c3674cf74df8d7a5f9b6aa2cdca3aa7daee1336470c42e4eff08e1a434122f486b9999402ab0b4e32d2ccb58f38912e4ed61881a7b7e100d12e2fcfbc6c SHA512 e022d43cac713471b4db397e17aaffbcc837d0a798932bc0b67971185c1fd3e155586f02ee7ff6b72945660bd7381042ce2c02dde8dedb4d2321297e869a1444
 AUX ocamlnet-4.1.9-unboundLexer.patch 284 BLAKE2B 8d934f1aa24d19f3065dd4501c6656c78e53f373028e315b2fb969bab495e3f94fb80af33cac6f5da92ab0c185d7537d0d9d07be0abd8cd618708e9b400323a4 SHA512 9110449c98975c5894fffad28372a0daae48de7cf7a775b43ad14989e99840a49d1b5170317b36fb9ed303a2c1fa9ff0a52d569d1bdd74879c8ee1f29bdfdbc3
 DIST ocamlnet-4.1.8.tar.gz 4620065 BLAKE2B 8f84ce4d79de5f4a1f26d4e45f68327042b0adc22717e56eeaca03ee6371e9251c01e8736d3afe5c00a1c65ef0286d56a04c57e80377402bb19ff87955ae98d9 SHA512 e238235968b9546c60568a38e68e354378d30e7137973332dcb10da21fa775ab7b367889fc51f5bd7cb00e51582834cafe2a0c4706b0bc77a44d4571a6f22815
 DIST ocamlnet-4.1.9.tar.gz 4628747 BLAKE2B 40e41edee79ba5957d297506cdf1b907adc8d44a33f25f25b8b1a18487f5ec379fb328c86d6283f7da7cedd8d35b80809e1cd5224522d51afa3e5f2402ac8663 SHA512 a251724deb35e756c81d2d3ac836d413b659acdce6c0acf479a4fca48934ab62ad399a884197d00dbb7e7558132a56be1c8efd553c0a644d329418272f809a46
 EBUILD ocamlnet-4.1.8-r1.ebuild 1636 BLAKE2B 96ff9aeb5b1012aa0544a36ac7c3cccb24cf23e79911118b2fe0d7cabd3fd6ad435503ffe43e05e1d1ecedb8821649b2720b2040c9b074fd6ac8017c3167336e SHA512 ff2b81572d3dd298af654bd9bc43d55c951b0f8f6a417521b1cec8d489cbd6d0b1f407194d93b2d8176b08fdc374051557bc47c1df6e4d2040be3e7a633373e6
-EBUILD ocamlnet-4.1.9-r1.ebuild 1821 BLAKE2B 43f21c47ee2ca7baa674787f6452e21b2376a8488de6042499b8779ded92c2a63b87b36d159a39876975a9970984517b58d89068cce311c5617f48a31fa29ea7 SHA512 c32ba5271cd3e6a94a8a5d2ecac01e2cbb6102020e3bf68de523c50fe19d184e016182a508e984a300ab86efde173f7fdc54e2d5caaab6fa535eb179f90a08bd
+EBUILD ocamlnet-4.1.9-r1.ebuild 1855 BLAKE2B 94608e27cdbc5d2dbbf2dd96a879f32d8eaea8623124ee54b5691c720bdec390da270dd5f890ac33ac829119d2b15401d71bcf12a12cfad35cc5d66b9d2a616c SHA512 89545783277a2d54a08ee9438ae3bece58af71431d2cc52eb244b78914bfee5f8cc1721c8ed1859b186f4180b05c86054370ccc636d0973a5a2f560523f2cb79
 MISC metadata.xml 406 BLAKE2B 765eb184895dcb4d3769fc590facc0435ca84a33a1954b8c33b2f1f40f775fd165aa7e1d86b3f874a8c83c8020c094f73d3174d46d94c1c455d54069ff431414 SHA512 911bd8206d13c92e78ceb3ea00c71ddebc1ab83459bd2d209f2209b81e7952b69ee6ee53003806c8c674dd083c300cd0b243ccfc7449c2a8678a3d459c434879
diff --git a/dev-ml/ocamlnet/files/ocamlnet-4.1.9-noWhich.patch b/dev-ml/ocamlnet/files/ocamlnet-4.1.9-noWhich.patch
new file mode 100644
index 000000000000..9baed9842292
--- /dev/null
+++ b/dev-ml/ocamlnet/files/ocamlnet-4.1.9-noWhich.patch
@@ -0,0 +1,16 @@
+--- a/configure	2024-10-23 21:15:13.597333850 +0200
++++ b/configure	2024-10-23 21:15:34.527082731 +0200
+@@ -1106,11 +1106,11 @@
+ printf "%s" "Checking for make utility... "
+ if [ -z "$MAKE" ]
+ then
+-  if which gmake >/dev/null
++  if command -v gmake >/dev/null
+   then
+     make=gmake
+   else
+-    if which make >/dev/null
++    if command -v make >/dev/null
+     then
+       make=make
+     fi
diff --git a/dev-ml/ocamlnet/ocamlnet-4.1.9-r1.ebuild b/dev-ml/ocamlnet/ocamlnet-4.1.9-r1.ebuild
index 60b4eea78ebf..791b193f2a11 100644
--- a/dev-ml/ocamlnet/ocamlnet-4.1.9-r1.ebuild
+++ b/dev-ml/ocamlnet/ocamlnet-4.1.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -38,6 +38,7 @@ DEPEND="${RDEPEND}"
 PATCHES=(
 	"${FILESDIR}"/${P}-unboundLexer.patch
 	"${FILESDIR}"/${P}-shuffle.patch
+	"${FILESDIR}"/${P}-noWhich.patch
 )
 
 ocamlnet_use_with() {
diff --git a/dev-ml/reason/Manifest b/dev-ml/reason/Manifest
index 53ad191dbd16..07d65c3379e2 100644
--- a/dev-ml/reason/Manifest
+++ b/dev-ml/reason/Manifest
@@ -1,7 +1,6 @@
-AUX reason-3.10.0-fake-git-version.patch 432 BLAKE2B 042e55d31a7d1501575f75fa0161f13679e56561c738a5b00e6d91e29e65923344816e0c6de7369b5fab269970c0248c2601eb4ac86e32e6a20556d088474304 SHA512 f11f6f3ef634acd31e3713774c2653f20ab92c188e3eda9c67873c6861b1fd921119fd9b52e6fd51583e0ae3ee559d4ccc69c7b5ab484a7bfe0a9a8418410dd8
 AUX reason-3.12.0-fake-git-version.patch 531 BLAKE2B fe8ce1099ba339a5b5a43d281b0665e867c90d3bfa8d076b2fb7a455b7f102dd060190a21066f5459ec820866100e7fe9cec96a689264b3c67df0b61071dd897 SHA512 c46fb97ad420fce3d316ab19252638b746d4981bb6ccb8c4ed838a46237a40c6e68e8fa256b09de813e7b84a1725cf9867aef21286083c9ed0d9c91ce7b29090
-DIST reason-3.11.0.tar.gz 699692 BLAKE2B c377e7ccb222ade2f0a5a9b50147a045fb10a95d7e3a8a9ce91674f76a3174ef169f5575ecde7004db2a43350ac8e7cc73315eefcda57b98c9b3d6cc83ed13bd SHA512 71b70e06afbc193c1c4b379c570347e4f971ed001d60e73cf4a745a9bc110e78d329d5ce5334b59aacb7dbe8d2f12f50b7c6786c9a35fff445da0d26f6a87f7d
 DIST reason-3.12.0.tar.gz 661530 BLAKE2B e2855359595f6240055577f4477975cbe4a836801f5db2431d9b243cc583938c401fcdb36a0e8636aa8ee1368f3565625580c10bef679f520a92fb937571b717 SHA512 4258ee4c6bdc20ff3034458e923e58db7da792d8e22a8ab0b281ea2d6bb503cad30356346e255ad9fcac6fbf4e6bf9bf8cacca08b37ece73f3311d9ef821f9f5
-EBUILD reason-3.11.0.ebuild 887 BLAKE2B c109b43d4163884d4b432c12cf6bbdd5230dfa16ff30a70845c4b00315e546d8b519537b8234c80b5d90ab3453432cd56dcf3a2a0164f23b5dbe81af26ad0dc2 SHA512 ed9e18d079b62940f3e3e372ae8da80c83f0f1fd547f8b72d0108f87d2897e552e30fac65c5c63a4bc1ba28c02370a10bd84792243e6badcd17e38d6b58bc9f9
+DIST reason-3.13.0.tar.gz 667524 BLAKE2B 2f27bc6ade3b1826687e6eed67c600603efd087ac2fa1e5b17560ff77233f9e77bccc98fafa142ff82291b8eb6aaa397557964b7c9be0c050ce8a5b9d33748d7 SHA512 afd7a714f836f38c5a7343a85a565ca5f20b109910973518d88befddd6c8fec0f2f3a2c54eebfb53f4bb52dcb45fdd30bb41663c7d979bca4f17aa1139ba5ce0
 EBUILD reason-3.12.0.ebuild 922 BLAKE2B 9cd5d9c1cf930c73715ff265ced6ac2c22f0325cc649836cc2c037de0c348a394788b119c76b503cf2cd738eca34687d72e85b47efe8bc9b489c31084ff899cb SHA512 e30a12825204eaaa5692a72a973c272256026daf3252ecd292d364a9f3099c069c00a6ec364bad2d9c30d6d43f47dd7e17884533cff8e75630610e08fd677f99
+EBUILD reason-3.13.0.ebuild 935 BLAKE2B 59bd4406d9f2fe30fef7fd77e673a1a97ad5304a6bae6f00969c94010f79c1e1614aad92be70046839b7517116731e7cde9b3c22e331ceb8621ff0fffa1c7123 SHA512 49cedd3ce6db6486694be05ae24bd2ce72b0d100045de072a90b3d9aac8cc7fe9b05fe37284b125c535151f36ab48eb30e992906e3f10c4adb43c8fb3930c22a
 MISC metadata.xml 583 BLAKE2B f5c1da34708a350aea239b28e65a07903409ca72d4fb530dc6192a820c27fa2da8f2a0fdc2f5716d4ea98b7501e963a904b7299e6f3118e92b3418afa6ae1d6b SHA512 cfcd0f1819698d0563f0b7885d8f7173554c5af1cebcd541b82c304e06806a5b8682cc8f3daf40212cd28f994ec06b6a342bd79c0c90c6726bc7bf853e3883ce
diff --git a/dev-ml/reason/files/reason-3.10.0-fake-git-version.patch b/dev-ml/reason/files/reason-3.10.0-fake-git-version.patch
deleted file mode 100644
index f4be44e80e2f..000000000000
--- a/dev-ml/reason/files/reason-3.10.0-fake-git-version.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/refmt/dune
-+++ b/src/refmt/dune
-@@ -10,5 +10,5 @@
-   (with-stdout-to
-    %{targets}
-    (progn
--    (bash "echo let version = \\\"$(git rev-parse --verify HEAD)\\\"")
--    (bash "echo let short_version = \\\"$(git rev-parse --short HEAD)\\\"")))))
-+    (bash "echo let version = \\\"0000000000000000000000000000000000000000\\\"")
-+    (bash "echo let short_version = \\\"0000000000000000000000000000000000000000\\\"")))))
diff --git a/dev-ml/reason/reason-3.11.0.ebuild b/dev-ml/reason/reason-3.13.0.ebuild
index d9655ff84950..2dae216689fa 100644
--- a/dev-ml/reason/reason-3.11.0.ebuild
+++ b/dev-ml/reason/reason-3.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,10 +11,12 @@ HOMEPAGE="https://reasonml.github.io/
 
 if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
+
 	EGIT_REPO_URI="https://github.com/reasonml/${PN}.git"
 else
 	SRC_URI="https://github.com/reasonml/${PN}/archive/${PV}.tar.gz
 		-> ${P}.tar.gz"
+
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -23,18 +25,19 @@ SLOT="0/${PV}"
 IUSE="+ocamlopt"
 
 RDEPEND="
-	dev-ml/dune-build-info:=
-	dev-ml/fix:=
-	dev-ml/menhir:=
-	dev-ml/merlin-extend:=
-	dev-ml/ocaml-migrate-parsetree:=
-	dev-ml/ppx_derivers:=
-	dev-ml/ppxlib:=
-	dev-ml/utop:=
+	dev-ml/dune-build-info:=[ocamlopt?]
+	dev-ml/fix:=[ocamlopt?]
+	dev-ml/menhir:=[ocamlopt?]
+	dev-ml/merlin-extend:=[ocamlopt?]
+	dev-ml/ppx_derivers:=[ocamlopt?]
+	dev-ml/ppxlib:=[ocamlopt?]
+	dev-ml/utop:=[ocamlopt?]
+"
+DEPEND="
+	${RDEPEND}
 "
-DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-3.10.0-fake-git-version.patch" )
+PATCHES=( "${FILESDIR}/${PN}-3.12.0-fake-git-version.patch" )
 
 src_install() {
 	dune-install reason rtop