gentoo auto-resync : 19:09:2023 - 23:10:29

8 files changed, 124 insertions, 12 deletions

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 7642d7f27d77..e0e112f4b197 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 d3147baa94c9..c9683fadf93e 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -6,12 +6,15 @@ DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db3659
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-17.0.0rc4.src.tar.xz 127838724 BLAKE2B e3bf524e55db5e4305099ecdff09c0d3eab7957a5f8729eefe636e361460f405fbfd569af38aa39eea3b6c1e024feaa0400f8bc092194f2c3b54c695e7962591 SHA512 be7b5ad136d03864dbd11a589ca9e8b0b04a4226ebcffcc123b3ba72992f704bab4f9550d03eb2ac1d21fb8b73ac7824398b4cb4c9cec2118efb112babfe0f65
 DIST llvm-project-17.0.0rc4.src.tar.xz.sig 438 BLAKE2B 2cda35b4a3ebddfdbe6828459c8bd8fdfaa8e04d2d1c4f2faf16f5c66909186d2dd73e6a163cf733d8955c007249cf3f62f237855d5a76b1b61f3bfa30e4972d SHA512 5f713e05b7c58fab6e9cc43f2f3f69120482c9b60008146da0cddb266d1a5c9b9a77e1e338fce4e15624b332ac53a90c5c4a6f62c58a77f2122a015b4f0ebed2
+DIST llvm-project-17.0.1.src.tar.xz 127830376 BLAKE2B bb3b9f7358df9006307f5eeccfc5c5ee5497498c4f091347924911cb6534e8d930024c35387456af24bf647d9e24a3d927aa49199036fb475018a610b5d792c7 SHA512 6fc1d5ff4fec49ef5bb495ba9d8f9ee9052c10999ec9d3ac8f825c718e3cdd64abd95408c4e5bb7f67eb9a7bfac9e26d2a949c4da9f163b5646c02e8a670ead5
+DIST llvm-project-17.0.1.src.tar.xz.sig 438 BLAKE2B 3182e3c3a48635fdec39b945ee3b782d7c9c2a07911d9ede2e3421031bb1b4959bd495c5e39d094aeaf555579b9fe3eb834c1449077c154c629f5db605375e7c SHA512 301a6e6c46d6fee13c86dec1a021c35f6bf3a97e5d6b0aa7b7eac34e7ca52f6cefffc25a9e376250b1eb721a65a5852f2f1948abd432698363a81dd7ee19d81c
 DIST llvm-project-7e5809e7e7bc9a828427b6540a51d45884d8bbbb.tar.gz 197275742 BLAKE2B 17df09155cf3451deffcdd71a4b0602211a4638ad961eb351802028f4fd1b8db870bef817430adb709ea7c1e85f545d7507c06d7fca26869f8a10e6ac6b03967 SHA512 e84aa041aadf3e50376cffd1e92c1447acdca0a2cf8e7df9cca9d0337dfeccb1d022da3a229bb0cfdc9c5fb87215682a1e4f474208b09b8800f30aa0c6e36c4b
 EBUILD llvm-ocaml-14.0.6.ebuild 2594 BLAKE2B 40fea3429bbf2e22f45598a679d9e5c6fa06343081a3a0a7c238bcbc8c3f270fea924ad57cab4f580adef66fe269eec188e6ed9f46772907063267805b7b51c7 SHA512 da649915c4804091ac68d9011a2370560f71e88952d13975a5f882e2c485d561fa0a5a43c61dd48f196534eae1e10aa6e46a9a9f6959d998ca850128c75a2615
 EBUILD llvm-ocaml-15.0.7.ebuild 2598 BLAKE2B 22f3c86bea3a17027f4513685ddb9077800918dbe8dc74dd17e7d8ccfb729c11baf6eb60915d6795170d4dd5ee66b5c19d16653044a0ad7bb34f18161db06848 SHA512 04de6e60fc31644b6e99af4277f5300cdcee1f8e35f9038b490ed7841fd0c92e71bdaa423cdedbc5cccbd219e32857c8d1d0e09dfdfe4919b165ee73670efbfe
 EBUILD llvm-ocaml-16.0.6.ebuild 2533 BLAKE2B 598e42d89fce0b0a85a01b41166de25343dd6da9a6b422ff9f35f0cf515b759f85a180c25108df9ffbd8b773daad310851f05a11489e0af423c13a09b16c4585 SHA512 10809b6cdc64d70d9976a694123102de10804f65a5a9ea1e051638929c31e343f64388340307b500acd760ebbc2187ac6340336c39d6ae1280c34c5de5ce386d
 EBUILD llvm-ocaml-17.0.0_rc4.ebuild 2518 BLAKE2B 73efb3edd502e713d1ed57d5387532ed7b4dd10831b705339eecd8c5df936ee31ff02f877ad36e0b30564f9837ec8c9535bfcbfc41af01ccaae1e4149e5a574e SHA512 42f7cbba2c706ae1c8198d1e2c1ef4771baa631d2cae65ce957c7ad726a7c43d79ce278c39813781ac72ee7c527543514c1b895b5db24f172893b8796210877f
 EBUILD llvm-ocaml-17.0.1.9999.ebuild 2518 BLAKE2B 73efb3edd502e713d1ed57d5387532ed7b4dd10831b705339eecd8c5df936ee31ff02f877ad36e0b30564f9837ec8c9535bfcbfc41af01ccaae1e4149e5a574e SHA512 42f7cbba2c706ae1c8198d1e2c1ef4771baa631d2cae65ce957c7ad726a7c43d79ce278c39813781ac72ee7c527543514c1b895b5db24f172893b8796210877f
+EBUILD llvm-ocaml-17.0.1.ebuild 2533 BLAKE2B 598e42d89fce0b0a85a01b41166de25343dd6da9a6b422ff9f35f0cf515b759f85a180c25108df9ffbd8b773daad310851f05a11489e0af423c13a09b16c4585 SHA512 10809b6cdc64d70d9976a694123102de10804f65a5a9ea1e051638929c31e343f64388340307b500acd760ebbc2187ac6340336c39d6ae1280c34c5de5ce386d
 EBUILD llvm-ocaml-18.0.0.9999.ebuild 2518 BLAKE2B 73efb3edd502e713d1ed57d5387532ed7b4dd10831b705339eecd8c5df936ee31ff02f877ad36e0b30564f9837ec8c9535bfcbfc41af01ccaae1e4149e5a574e SHA512 42f7cbba2c706ae1c8198d1e2c1ef4771baa631d2cae65ce957c7ad726a7c43d79ce278c39813781ac72ee7c527543514c1b895b5db24f172893b8796210877f
 EBUILD llvm-ocaml-18.0.0_pre20230906.ebuild 2518 BLAKE2B 73efb3edd502e713d1ed57d5387532ed7b4dd10831b705339eecd8c5df936ee31ff02f877ad36e0b30564f9837ec8c9535bfcbfc41af01ccaae1e4149e5a574e SHA512 42f7cbba2c706ae1c8198d1e2c1ef4771baa631d2cae65ce957c7ad726a7c43d79ce278c39813781ac72ee7c527543514c1b895b5db24f172893b8796210877f
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-17.0.1.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-17.0.1.ebuild
new file mode 100644
index 000000000000..a496042b570e
--- /dev/null
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-17.0.1.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_{10..12} )
+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="~amd64 ~arm ~x86"
+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/ppx_deriving/Manifest b/dev-ml/ppx_deriving/Manifest
index 09a3d1ed16a1..f0b6b2b57e9b 100644
--- a/dev-ml/ppx_deriving/Manifest
+++ b/dev-ml/ppx_deriving/Manifest
@@ -1,5 +1,5 @@
 DIST ppx_deriving-5.2.1.tar.gz 46148 BLAKE2B 75c5f95841e4e54d5a58221c27d4a904347fb2b20ff0189bbe99bcc200eefd4abb94a476a120b6c6c7d0eba3b2233054875868a71064d032815cc8907919371d SHA512 01d2eb920f3375960a9228138ccb5f2af49bfba1111894795c24b3c37d5a021d6bc95e9de1d867c35d03645334300ccc89f1fca0cb75007ec62e5620f328e078
 DIST ppx_deriving-5.2.tar.gz 45766 BLAKE2B 67d041b69ad675873500844f8ef638797e271c3a3a82467407914a073e6eb9ff84f911d128ccf507be051fb89c7c85991987793067046b0dd1ecdc534b658b05 SHA512 0daf7d0050b8e2b18b441da994e8cf1f05e37f7d88d1f4512204979f19ac4d116a6c72f683c615b091e0340a4d380684f9b2ed1b70d84fae6ca928843ed3f479
-EBUILD ppx_deriving-5.2.1.ebuild 692 BLAKE2B 8c0d5668083bb4be8f45b1dc70127d1b72db81bf7576596debd12ab479adb50ed80434ca350c0c67b95ee56e8a8231e87f35fb60435f0a50c6efb5d7b62d6e5d SHA512 a1bdc9d994df0f99e89b9a24b6ce370a021638e0e39a21aa6fb0727853f8d3c52d6eb261cc54d4beab2e2d39f6d2a72c9d1935e81bf9526d444884a071817586
-EBUILD ppx_deriving-5.2.ebuild 657 BLAKE2B 7a8b29acdb993ea00b23bfa2c44d9ca4f0b4b3b232f73d5bf3c2dcd25e91b1fbadc208cd82ea33eb96399bccfc839ad05a33aec11284d5dc34e7e824077f12aa SHA512 aaaf59686dc348c264e8276a466406487d5c3d59316597d1013bcb49dace07136270aacce6ebe9138269e2dadaec9d408f30cebadb8ba000ce93172f6697db27
+EBUILD ppx_deriving-5.2-r1.ebuild 638 BLAKE2B d4af358d1d233909d59247c5c25e47a401ede109e213c90ced0437bc2b16b1448440ed47f5cb59150e0e5c6e905dfbe888ce06277ad378cc807124ce8f693841 SHA512 19ac5d0702b7d54e81775ec82b6266c71f9e4ba507c1dc36747e6f9c383b831a99379a09484e5cb5086d75dcdf5eaa70e464e164062d57153cdb1dc6e7bdfdec
+EBUILD ppx_deriving-5.2.1-r1.ebuild 673 BLAKE2B 92cd9ad3f4c1144948538c9fc4d94d796a569d479369e66e0c5670c2da452dea4c32d45bc25b2eaeec2468a8850fdf9198c285ac5d17425de76aa48799f22be2 SHA512 7b78db5f178f79abe4b853e7c81c6af09aa061b1f01ca4f907933890caec418a301a3d6268d32d8f3574d8eceb6815dbb5e127fe50fbbc38d02f86d26a52b12c
 MISC metadata.xml 425 BLAKE2B 7205cca257094cbfeea975ceac94d102dad9d7a165cf1cee31fe9828d1c2b356424e473dbbcad8e4b6fc554146ec188a19c29cb2a564227db9b363a775bda360 SHA512 1283b517100b3960c2dd796654db9960869760617dffb64b719e36e263c2cfb5571e3e8f039d8f64a94f2f776f06e317290452f9f6eed0becd99587c61024b5b
diff --git a/dev-ml/ppx_deriving/ppx_deriving-5.2.ebuild b/dev-ml/ppx_deriving/ppx_deriving-5.2-r1.ebuild
index 73a1495d16a7..698ff16486b4 100644
--- a/dev-ml/ppx_deriving/ppx_deriving-5.2.ebuild
+++ b/dev-ml/ppx_deriving/ppx_deriving-5.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,14 +15,13 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
-DEPEND="
+RDEPEND="
 	dev-ml/ppx_tools:=
 	dev-ml/ocaml-migrate-parsetree:=
 	dev-ml/ppx_derivers:=
 	>=dev-ml/ppxlib-0.20.0:=
 	dev-ml/result:=
 "
-RDEPEND="${DEPEND}"
 DEPEND="${RDEPEND}
 	dev-ml/cppo
 	test? ( dev-ml/ounit2 )"
diff --git a/dev-ml/ppx_deriving/ppx_deriving-5.2.1.ebuild b/dev-ml/ppx_deriving/ppx_deriving-5.2.1-r1.ebuild
index a368a22178b2..a62e03fa377d 100644
--- a/dev-ml/ppx_deriving/ppx_deriving-5.2.1.ebuild
+++ b/dev-ml/ppx_deriving/ppx_deriving-5.2.1-r1.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=7
@@ -15,7 +15,7 @@ KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
-DEPEND="
+RDEPEND="
 	dev-ml/ppx_tools:=
 	dev-ml/ocaml-migrate-parsetree:=
 	dev-ml/ppx_derivers:=
@@ -24,7 +24,6 @@ DEPEND="
 	dev-ml/result:=
 	dev-ml/sexplib0:=
 "
-RDEPEND="${DEPEND}"
 DEPEND="${RDEPEND}
 	dev-ml/cppo
 	test? ( dev-ml/ounit2 )"
diff --git a/dev-ml/stdcompat/Manifest b/dev-ml/stdcompat/Manifest
index 5712e9cadb33..15ed075fbb7b 100644
--- a/dev-ml/stdcompat/Manifest
+++ b/dev-ml/stdcompat/Manifest
@@ -1,3 +1,3 @@
 DIST stdcompat-19.tar.gz 530511 BLAKE2B 4af97c355b98f63366d647a4a375bde43ffbf959a2c02132ab57457db4213b8f98a972bf99667dd53603b28235b4f853470c2117270ce42c6aa579a21dd148fb SHA512 25582731170f2f80eed281c48af4904d1d00ef88a38d1b17853395c19a326d7b11e42c17b69f639402c467ff6f9b83a2e9d4dbab7255ac25d466b85a55674bd0
-EBUILD stdcompat-19.ebuild 712 BLAKE2B f451c4f307d8709a8b2f828cda11ac614334589378d03d94286f66fcc2a63cb6afc56442a1b362a281976ec9baaf5e1ad92c4a3e77a0c6149a5ab896db137f6a SHA512 d822561d432e5b66012060a64f52b0882d5765a4ebd4594f650eee4f86561c23f6ef13ca0478e601968e0bdcdbc920fbb55a1fb76c1e38ad499c57a443b97b6a
+EBUILD stdcompat-19.ebuild 708 BLAKE2B b0cb67f82b0ebc7a530f5d447eb4cdb8fe7d02650d6e83528d0a11e457856a6f7ac5a691f2496333066ec39d68d9d486c81376eb65597af147e85e2596811509 SHA512 5c0a08b3642c492d122937b0c55d89a659671daf9352a645dbfc8cd5e245be0035d4b0f56faf3ddf9aeb3c05bc5e0e7d469da56c9885be5cb7f514d79715c399
 MISC metadata.xml 577 BLAKE2B b6857bd7760fbdc5988d1a545e2f128c9d13ea18d43a341af0757a227958594ed314b9472c9994fae54f7aba2f57ebee06b6f9cc4bb5a1428218dcdda2745507 SHA512 859f88d95b52a4e159fb4241ccaca2ba7777eda999623e281fd36e6b1ab2273407931f9ca89971f86b7563889bb704d7e353605f808aab868cb09a0468687419
diff --git a/dev-ml/stdcompat/stdcompat-19.ebuild b/dev-ml/stdcompat/stdcompat-19.ebuild
index bba75839ea6b..edb7ebbf80a0 100644
--- a/dev-ml/stdcompat/stdcompat-19.ebuild
+++ b/dev-ml/stdcompat/stdcompat-19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,9 +8,8 @@ HOMEPAGE="https://github.com/thierry-martinez/stdcompat"
 SRC_URI="https://github.com/thierry-martinez/stdcompat/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
 SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
 
 DEPEND="dev-lang/ocaml:=[ocamlopt]
 	dev-ml/result:=[ocamlopt]