gentoo auto-resync : 01:10:2024 - 01:26:02

6 files changed, 5 insertions, 57 deletions

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index b15a71b5e1c4..7bfe7ae87eaa 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/dune-configurator/Manifest b/dev-ml/dune-configurator/Manifest
index a9e3f011a464..d26eb032ed20 100644
--- a/dev-ml/dune-configurator/Manifest
+++ b/dev-ml/dune-configurator/Manifest
@@ -3,5 +3,5 @@ DIST dune-2.9.3.tar.gz 1387667 BLAKE2B 3db54c780b9d13f40c774f53c3fe471dba4a640e7
 DIST dune-3.16.0.tar.gz 2999701 BLAKE2B 5e371fa1003cec31273aeeb1a830036f48d3734588bd7a980b57aaae30d4984a34dec6f9be0ee9985c72dee08c2c6d456a789eab83cfce42c142a3abc6951b2e SHA512 3b1d041907128b6598e0f6150fe300a4a69098822f823ceead63b46e1005a21485738c6fa92641dd940c9f9cde48ae141ea51959a9b250bee3cbeb06ba788e23
 EBUILD dune-configurator-2.9.1.ebuild 4096 BLAKE2B e5a5aa47665e30b13f1a158149f235156ec8e0b0e3172fb4629532f991b9bc86080d1d303f734e0fb215502151911d41fbed9cddd53d86ae13e7e70e11c8d7ab SHA512 bb7f6f2acb81a18fc9e0c3c67819a1724cbc2f643405c447e67d1bc17ea3e3a9e9194cdceeff0cf04dcf38bc154d31650a203beefc87dea9b8fa74e9f5d17873
 EBUILD dune-configurator-2.9.3.ebuild 639 BLAKE2B 3f1a161b5e255cf5f3d4ada3aa15778afc5c3f4d43f524f3328e2c2d9c9b932ac9ceb213234008a3fb7380bb8986d607e6a6092a2e279da17a16962818e248b7 SHA512 1f7c44c3b4292568b4be8382efcfe71bb903b5d7a25ddf6b988de3e0c0a95a643348a4ada4e65e03b451dc278658d076d927fb0930d9855311e2dd2323a7537c
-EBUILD dune-configurator-3.16.0-r1.ebuild 677 BLAKE2B 7f12fc8e5dd65a4bc11949cfff6f483d0d4a6fe0e0fa4e79098269b40d347cbef601c69cfb7c379357cfe2a9dc740de4ae7126ef618c234a2f68d941412394be SHA512 f1667454e5de6f70f07478961bf411baf8fa0b37b1f1b3fd3b5c6d96326b91726e3ee4da57a3d1e4f2153a8c341a6e79d06075a996a8edd7b16399e8ce4d0f7b
+EBUILD dune-configurator-3.16.0-r1.ebuild 795 BLAKE2B 9daa6cae80d648e4499d6ebded2bb091b79d9d00d15085c03dcdafd886b2ccc3eb64438fad38045b95c823f025f58f382aa723438d73ec2a21417f2ec2b3b056 SHA512 a72601633b60aeb7dc2b74bac0d597b9421c490288e951f173fd42a479d4e066d702221164f36e91f7c4f2f993f9d4a6af00b9603d916e2ea5be146dce6805c0
 MISC metadata.xml 308 BLAKE2B 555692890c7fe4dee18d07e140384b70278e2a4a0230916a01ab9e5306776e0ed0d979e9a3487423fa1779a166da3038dca13273811e36593bb2b821b60cdfe0 SHA512 e50e28cb6f41fda295f12af1b94aba12dda8a7091322c0e7093d19ee60615d449bc1806354043e572d70aff1284e16b644b188911adbca60a2a5c8299fcee748
diff --git a/dev-ml/dune-configurator/dune-configurator-3.16.0-r1.ebuild b/dev-ml/dune-configurator/dune-configurator-3.16.0-r1.ebuild
index e843054dad74..64655885dfcc 100644
--- a/dev-ml/dune-configurator/dune-configurator-3.16.0-r1.ebuild
+++ b/dev-ml/dune-configurator/dune-configurator-3.16.0-r1.ebuild
@@ -25,7 +25,9 @@ RDEPEND="${DEPEND}"
 src_prepare() {
 	default
 
-	rm -r vendor/{csexp,pp} || die
+	# This enables dune-configurator to use the vendored csexp module
+	sed -i 's/stdune.csexp/dune-configurator.csexp/' \
+		vendor/csexp/src/dune || die
 }
 
 src_configure() {
diff --git a/dev-ml/dune-private-libs/Manifest b/dev-ml/dune-private-libs/Manifest
index e13d6ffc2b3b..79fbe52bb3a5 100644
--- a/dev-ml/dune-private-libs/Manifest
+++ b/dev-ml/dune-private-libs/Manifest
@@ -4,6 +4,5 @@ DIST dune-2.9.3.tar.gz 1387667 BLAKE2B 3db54c780b9d13f40c774f53c3fe471dba4a640e7
 DIST dune-3.16.0.tar.gz 2999701 BLAKE2B 5e371fa1003cec31273aeeb1a830036f48d3734588bd7a980b57aaae30d4984a34dec6f9be0ee9985c72dee08c2c6d456a789eab83cfce42c142a3abc6951b2e SHA512 3b1d041907128b6598e0f6150fe300a4a69098822f823ceead63b46e1005a21485738c6fa92641dd940c9f9cde48ae141ea51959a9b250bee3cbeb06ba788e23
 EBUILD dune-private-libs-2.9.1.ebuild 4114 BLAKE2B fade94617c408e800bcc4abbf6adf312307d620172a8dfd39215add9b487c559f83829d442d9da4763e6f33e68011518751ff6fa7222b410953e42aa5377d94a SHA512 76da3dd2a3c2d6fb9ca5f3433cf0315c9cd7664f5f0cb57daffaabf87b2f12eca779fa5feddf5483c59aa90b091c3715a1e49e3b61eb1e03297ccec655d0c0ca
 EBUILD dune-private-libs-2.9.3.ebuild 4426 BLAKE2B c890e269face1e352e76f48307a3b411b46e67cd2bb81038094d714b01c8e45e4783688fb499ecb2db10039082f69e6389c3be01391de206a486f51d746b1009 SHA512 5c1c99d797c4e48ff059051597ee1912fcc296d5c5934cdf801f976da9d34ccc3023d14c8606be44e554ee44fdd47197384ddff6075ebb05b73c9341f5ae7521
-EBUILD dune-private-libs-3.16.0-r4.ebuild 770 BLAKE2B 9efb7d9fadc7b71032e6ad1fd847a555316f0e959cbe0f4fb4003a6568eb2ff198ef2b451d4d87931dd91f76b37840e9059edc2e2c39b18c58952b271fb1e3fc SHA512 c6d2c6a03dee26af4f6b071e6a4790bfaf07c9631a73e84aecc0684c584a8ef0346e25daad3df5a8da0aa6dd3e66dac8e267085db6a243722341720256ff4eaa
-EBUILD dune-private-libs-3.16.0-r5.ebuild 812 BLAKE2B e6e9f0199a8f0b810bb2180518bee15f38cae15ce76f30991ccb3b6622c400831cd49ed8c12f58c01af59a11078da84073dc44ed6e3ce54515b37b0332db5e80 SHA512 e48b0c9578c5a119e08cbb4e3a0b6d55866f9b6f3c46f44ab01b6ad163b2120f0d01b5ecfefcd3aa58cc0f90bb774bd8ef25007a11ee5d36e2ef84c324bac32e
+EBUILD dune-private-libs-3.16.0-r4.ebuild 714 BLAKE2B 89c6df39062e643f3940efeefc6f687c2127fa4ff647727c83be7ef1dd4476d4758d46661a1fa63319c26bb4df3fee50039242f103784cbbd4cc88bd0d70ecf9 SHA512 d3e28eb9ec176ca2c172d64c7fffd80f6d203d002ee595897b316eab93f829563fab9dff5c3230e71e2a054143c0a86532dd184912e7b88e7a0c8f1b6ad3414c
 MISC metadata.xml 308 BLAKE2B 555692890c7fe4dee18d07e140384b70278e2a4a0230916a01ab9e5306776e0ed0d979e9a3487423fa1779a166da3038dca13273811e36593bb2b821b60cdfe0 SHA512 e50e28cb6f41fda295f12af1b94aba12dda8a7091322c0e7093d19ee60615d449bc1806354043e572d70aff1284e16b644b188911adbca60a2a5c8299fcee748
diff --git a/dev-ml/dune-private-libs/dune-private-libs-3.16.0-r4.ebuild b/dev-ml/dune-private-libs/dune-private-libs-3.16.0-r4.ebuild
index c8fea8c3b226..5f18338cf9ee 100644
--- a/dev-ml/dune-private-libs/dune-private-libs-3.16.0-r4.ebuild
+++ b/dev-ml/dune-private-libs/dune-private-libs-3.16.0-r4.ebuild
@@ -27,12 +27,6 @@ RDEPEND="${DEPEND}
 	!dev-ml/ordering
 "
 
-src_prepare() {
-	default
-
-	rm -r vendor/csexp || die
-}
-
 src_configure() {
 	:
 }
diff --git a/dev-ml/dune-private-libs/dune-private-libs-3.16.0-r5.ebuild b/dev-ml/dune-private-libs/dune-private-libs-3.16.0-r5.ebuild
deleted file mode 100644
index 5a3292540d63..000000000000
--- a/dev-ml/dune-private-libs/dune-private-libs-3.16.0-r5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune
-
-DESCRIPTION="Private libraries of Dune"
-HOMEPAGE="https://github.com/ocaml/dune"
-SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz
-	-> dune-${PV}.tar.gz"
-S="${WORKDIR}/dune-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+ocamlopt"
-RESTRICT="test"
-
-BDEPEND=">=dev-ml/dune-3.12"
-DEPEND="
-	dev-ml/csexp:=[ocamlopt?]
-	>=dev-ml/pp-1.2.0:=[ocamlopt?]
-"
-RDEPEND="${DEPEND}
-	!dev-ml/stdune
-	!dev-ml/dyn
-	!dev-ml/ordering
-"
-
-src_prepare() {
-	default
-
-	rm -r vendor/{csexp,pp} || die
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	dune-compile ordering dyn stdune ${PN}
-}
-
-src_install() {
-	dune-install ordering dyn stdune ${PN}
-}