gentoo auto-resync : 24:01:2023 - 12:57:16

7 files changed, 22 insertions, 118 deletions

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index f8124cebd47d..57ae2a99aded 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 03a050a01664..f5e0794c4a8f 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -5,13 +5,11 @@ DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257
 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-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz 175208511 BLAKE2B cf87cf7e9bf7c74aab8ccda0f153369cb81798047fdd48025c3c7030857b128babbaafb667385a5c8e9916e16038b14fee39f1623d329471e73c39c2f2d7bbfa SHA512 e6dc0cacd6c079be8a00364e4c244782d764d9a8d514d65f9078427cb4a0c1663ff88761bfbc1e955a1a990451439110497c2cb7af7f56b2c91f2e9db4389894
-DIST llvm-project-b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz 175044630 BLAKE2B f9a955e8413b57067fb697792316fb0c1e3eac00b1af208ba5d29db01a9acc96b88c7edca12c43762b1425c71a716a7c74d5d7edad45a442f32ba73f88f548b6 SHA512 5133c32d7856c8280bfeb47c3e5a9c0d8c1c291aad29af93586523110f95b08e582ff416fc6be02241eabfe80c35ad4f0334de5ead2a41bc6504616b1c6fd15a
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD llvm-ocaml-13.0.1.ebuild 2596 BLAKE2B ea2f01c1534a1d3bdb2f92d9593ec8476ce203c3862abb8e6fbbc3e1a9ced480fe53513da4d12e105a4ab62e8c1bce016822a3e7227357659f491eabf1118a46 SHA512 66f7fc112517469cded9b22fe844674aa16b9c6aa8360bbc034f9aa5de2c6fa945f1a2bb1d5a46f14690323bee85cd6669888ba7bbd7b64649454bf7a50f8d86
 EBUILD llvm-ocaml-14.0.6.ebuild 2594 BLAKE2B 40fea3429bbf2e22f45598a679d9e5c6fa06343081a3a0a7c238bcbc8c3f270fea924ad57cab4f580adef66fe269eec188e6ed9f46772907063267805b7b51c7 SHA512 da649915c4804091ac68d9011a2370560f71e88952d13975a5f882e2c485d561fa0a5a43c61dd48f196534eae1e10aa6e46a9a9f6959d998ca850128c75a2615
 EBUILD llvm-ocaml-15.0.6.ebuild 2598 BLAKE2B 22f3c86bea3a17027f4513685ddb9077800918dbe8dc74dd17e7d8ccfb729c11baf6eb60915d6795170d4dd5ee66b5c19d16653044a0ad7bb34f18161db06848 SHA512 04de6e60fc31644b6e99af4277f5300cdcee1f8e35f9038b490ed7841fd0c92e71bdaa423cdedbc5cccbd219e32857c8d1d0e09dfdfe4919b165ee73670efbfe
 EBUILD llvm-ocaml-15.0.7.ebuild 2598 BLAKE2B 22f3c86bea3a17027f4513685ddb9077800918dbe8dc74dd17e7d8ccfb729c11baf6eb60915d6795170d4dd5ee66b5c19d16653044a0ad7bb34f18161db06848 SHA512 04de6e60fc31644b6e99af4277f5300cdcee1f8e35f9038b490ed7841fd0c92e71bdaa423cdedbc5cccbd219e32857c8d1d0e09dfdfe4919b165ee73670efbfe
 EBUILD llvm-ocaml-16.0.0.9999.ebuild 2516 BLAKE2B 76d79ec543029a6509d80817106cc94f880844269c65d5f648c5fc3623fc837b668cc1f7071cf04fa9cce36f8c7a35b238b553a3f2428f01ad76123fa3e9d6b7 SHA512 d42973449686da7c3e94db660026991293d997ef4705580c01903432fae1a990e96e96100dd8ce27cb7ef126d24e003f4f1be997f5abbecdf273db5b4fde6c4e
-EBUILD llvm-ocaml-16.0.0_pre20230101.ebuild 2516 BLAKE2B 76d79ec543029a6509d80817106cc94f880844269c65d5f648c5fc3623fc837b668cc1f7071cf04fa9cce36f8c7a35b238b553a3f2428f01ad76123fa3e9d6b7 SHA512 d42973449686da7c3e94db660026991293d997ef4705580c01903432fae1a990e96e96100dd8ce27cb7ef126d24e003f4f1be997f5abbecdf273db5b4fde6c4e
 EBUILD llvm-ocaml-16.0.0_pre20230107.ebuild 2516 BLAKE2B 76d79ec543029a6509d80817106cc94f880844269c65d5f648c5fc3623fc837b668cc1f7071cf04fa9cce36f8c7a35b238b553a3f2428f01ad76123fa3e9d6b7 SHA512 d42973449686da7c3e94db660026991293d997ef4705580c01903432fae1a990e96e96100dd8ce27cb7ef126d24e003f4f1be997f5abbecdf273db5b4fde6c4e
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-16.0.0_pre20230101.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-16.0.0_pre20230101.ebuild
deleted file mode 100644
index aee649edd10c..000000000000
--- a/dev-ml/llvm-ocaml/llvm-ocaml-16.0.0_pre20230101.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# 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/ocaml-ctypes/Manifest b/dev-ml/ocaml-ctypes/Manifest
index 319510eb154e..1288f2f1e589 100644
--- a/dev-ml/ocaml-ctypes/Manifest
+++ b/dev-ml/ocaml-ctypes/Manifest
@@ -1,7 +1,8 @@
+AUX ocaml-ctypes-0.20.0-shuffle.patch 418 BLAKE2B c09ca77e4ff46ed98280a30fd24e8f24532dafb99c54209291345806c93fa05d70fcc98c4b1fbcfcee20c7b9016c6fad361b5cb0edbdfac28c1426fe04eaf932 SHA512 bacc28ada0d4b6b49dc6f11d28f9756461bdef7b7df8ee5b52844f26d4acaf61b5784bfcdec4bdc124f4fc6b45fa4709374d19c86222adc3c9f416b52858bf5b
 DIST ocaml-ctypes-0.17.1.tar.gz 208101 BLAKE2B b9fe6632058a670c988ba9f1ae81b75aa5373de7231cef04d5e2ede61a44cbaa0324c04197a0a202847599a9bbe7dccd18fd3279f3f351493aaec4959caf3ada SHA512 1e197009f7e6b29b43944f757e987934337ebfa11bb2ff2ca8ba3ebc607e37cf1259d07a90d7faf4b91b49ee20d5c65357ad305f34ada0a8d336a3904233150e
 DIST ocaml-ctypes-0.20.0.tar.gz 206559 BLAKE2B d9bf1c3f5ae7544e3950766f7eb9bac2c9dbf84130f69b2b8807e55c6a7d659c46d9ba2227d53d578e4e49283730932213eea4c7487beffe4540432b3e700c81 SHA512 605ae95b0233f1157749475526ef00ade2f97649d06a782e8fcf97b604cb86a0dcc8f27c4ac6baec11a41b9ef5becb0e5ae55e30f1ee61b30d4ae17a0d1545c2
 DIST ocaml-ctypes-0.20.1.tar.gz 206863 BLAKE2B a101872991d4bd83464d26e79fa5052c9dadbd10da1ae734fda8976199640091939777a1ba391d2aab84d7e14fafec6f713681e2ea52f6717f5f36d26e8aa225 SHA512 f95e65ce5003a07634afcbee431cb23c54c8335f926074615fc8d76ab777b9d2fce8f75bb25bbb6ed9550a7d6237fb377aa9ad65a426d2d7e387f86c1158fe4a
 EBUILD ocaml-ctypes-0.17.1-r1.ebuild 814 BLAKE2B 3a5bab91cdb4045286fd81c2fa5e6665eee9563de65008100d1f12c7930763ce0c32829cc908d1d9fe58ce6384267378a70a413b8c66368c89a0b9d21c9f4626 SHA512 b855d0975c4faef9516d0ea261f53cd913c314ce58a2dc18183686f2de17e8ec8e33be7b5529b933d070c8c6afaf00561fa5011e406688367be782ddbf555dfe
-EBUILD ocaml-ctypes-0.20.0.ebuild 862 BLAKE2B ab245d24be123751eee7d1e6f8114eed2ac5c004abd2387da3ae13ef3cb9a52c70541a18e7cdd81c041e354c377be4c9728fe8a524d27e827117f2cbc0dfeb13 SHA512 7eb381777d9144c30af6cf39715fafc17829f4fe63db42d49e077847ee34b86374636f50026b2e622249fa97d57871c4e37109cb58faa17e4fc921010edae8dc
-EBUILD ocaml-ctypes-0.20.1.ebuild 863 BLAKE2B cc5fb2102a72d6af4695b9ca79dec3227ebdcd1a6702428b6b6c8aacd9f160fc015648067f861398757d579d8750313b65716af84900db9034cc92a5260eb36f SHA512 ebad39d93bfc440e1ca89537f9a6278bf6ead73bac5366376e6c9525af4c69482e02108b9837fdb0b54c260f57e3207d8af64994171466ce2a3fd13afc74c7e3
+EBUILD ocaml-ctypes-0.20.0.ebuild 908 BLAKE2B 18279ce659d023b2c256ea7aef01220851fba9b3e871e1bdb50305977c40cb0e8304a021f4965dd9a0a832a3fc19841a368ec5cb84c885812680351fcf588ec5 SHA512 bd6fcc9f8b186bea5313451f4ecba179f9b28ca079cc29e1ad9c90f6fe9447f40424575684bf7dd326dfa65434d70125bafdba7e9e061c6dd1530a9c56597562
+EBUILD ocaml-ctypes-0.20.1.ebuild 917 BLAKE2B 7e9d51dae5c10796cb4b89ca95c1b3edd305d5700bfc3023df3c260685cc44c7baee5850f37a4b08c80d73982ac5963c47ac205b5fbad1d40dc832a1928a0609 SHA512 fd0d4a6d9ab5a19acfae92886f331f1ea1af72eb148c3f335a4f30bdc8c43da1377171cceb4ee8ced914a7053888708892b83a59475a2f23a8bb5d6d549c2a1d
 MISC metadata.xml 425 BLAKE2B 3bdffed177ca8fc13a9f6428824f1a97e646449037b4fa5b8053b68edd66c7c8c6bef3c7bb1135e4d76ec42812059408195c3a9cdd45573e571576175e3c9add SHA512 6bd73ddc160b2c5ba8f0630e7aa1045992ff77ece38df06538a2b6b49206c51b14abbcd27367d1b7fe9b192ebf11736e6f0e60dce8df6d475d7a4986edd2547b
diff --git a/dev-ml/ocaml-ctypes/files/ocaml-ctypes-0.20.0-shuffle.patch b/dev-ml/ocaml-ctypes/files/ocaml-ctypes-0.20.0-shuffle.patch
new file mode 100644
index 000000000000..51bad2efdd7c
--- /dev/null
+++ b/dev-ml/ocaml-ctypes/files/ocaml-ctypes-0.20.0-shuffle.patch
@@ -0,0 +1,13 @@
+--- a/Makefile	2023-01-24 08:35:02.515456277 +0100
++++ b/Makefile	2023-01-24 08:35:45.459755298 +0100
+@@ -161,7 +161,9 @@
+                    $(INSTALL_HEADERS) \
+                    $(if $(filter yes,$($(PROJECT).install_native_objects)),$(NATIVE_OBJECTS)))
+ 
+-install: META-install $(PROJECTS:%=install-%)
++install:
++	$(MAKE) META-install
++	$(MAKE) $(PROJECTS:%=install-%)
+ 
+ uninstall:
+ 	$(OCAMLFIND) remove ctypes
diff --git a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.20.0.ebuild b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.20.0.ebuild
index a3fbc4c28994..46407af9f60c 100644
--- a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.20.0.ebuild
+++ b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.20.0.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
@@ -25,6 +25,8 @@ DEPEND="${RDEPEND}
 	test? ( dev-ml/ounit2 dev-ml/lwt )"
 REQUIRED_USE="ocamlopt"
 
+PATCHES=( "${FILESDIR}"/${P}-shuffle.patch )
+
 src_prepare() {
 	sed -e 's/oUnit/ounit2/g' -i Makefile.tests || die
 	default
diff --git a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.20.1.ebuild b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.20.1.ebuild
index 3b3fce5d0eaf..78e08ed8b8f7 100644
--- a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.20.1.ebuild
+++ b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.20.1.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
@@ -25,6 +25,8 @@ DEPEND="${RDEPEND}
 	test? ( dev-ml/ounit2 dev-ml/lwt )"
 REQUIRED_USE="ocamlopt"
 
+PATCHES=( "${FILESDIR}"/${PN}-0.20.0-shuffle.patch )
+
 src_prepare() {
 	sed -e 's/oUnit/ounit2/g' -i Makefile.tests || die
 	default