gentoo auto-resync : 21:11:2022 - 19:04:59

8 files changed, 93 insertions, 4 deletions

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index a2b892bdebed..f7e65f674170 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 99964a186869..82e90f6b0693 100644
--- a/dev-ml/dune-configurator/Manifest
+++ b/dev-ml/dune-configurator/Manifest
@@ -5,5 +5,5 @@ DIST dune-3.0.3.tar.gz 1725788 BLAKE2B 2de93c085f642c8381642a08b18bc21ad48097f32
 EBUILD dune-configurator-2.8.4.ebuild 4096 BLAKE2B e5a5aa47665e30b13f1a158149f235156ec8e0b0e3172fb4629532f991b9bc86080d1d303f734e0fb215502151911d41fbed9cddd53d86ae13e7e70e11c8d7ab SHA512 bb7f6f2acb81a18fc9e0c3c67819a1724cbc2f643405c447e67d1bc17ea3e3a9e9194cdceeff0cf04dcf38bc154d31650a203beefc87dea9b8fa74e9f5d17873
 EBUILD dune-configurator-2.9.1.ebuild 4096 BLAKE2B e5a5aa47665e30b13f1a158149f235156ec8e0b0e3172fb4629532f991b9bc86080d1d303f734e0fb215502151911d41fbed9cddd53d86ae13e7e70e11c8d7ab SHA512 bb7f6f2acb81a18fc9e0c3c67819a1724cbc2f643405c447e67d1bc17ea3e3a9e9194cdceeff0cf04dcf38bc154d31650a203beefc87dea9b8fa74e9f5d17873
 EBUILD dune-configurator-2.9.3.ebuild 643 BLAKE2B 0e18709fb1ff06bd620b2a0b10e2a7dc5105d81d14972808b6c078c9dfdaadfe9311cb04100a8e6a4c05d7661b1e821fb4ab7af34ef1f354c512a2690dc5ea6d SHA512 1c480745ba59a78a6a7123414b057f0546616b235f5e2db7fed25e65d4c399edc6fb24cbe613a0ee253c0734b9fabd17695ebdbf5e195f53f1da39a51b642654
-EBUILD dune-configurator-3.0.3.ebuild 936 BLAKE2B 60fb6b7768aacbe017e8f3c8197d0ca2cd58752ee5ab87c29834d27dd40430d23e4aff29cef58dbd4c25b13dbba54b7f5c6cf924b5d89034b660535b98e6f677 SHA512 1b5fafc47dba7302833811d277422b9d40ee260d1c2217e801b81df3df8380d9c58e93afdf3f3cbdc25aef2e8f39f06798e5fd3297171078fbfa8c05a8e71165
+EBUILD dune-configurator-3.0.3-r1.ebuild 939 BLAKE2B 269e8132c92e240ed5e718c4fc3b8505ab2716abaddc9ab1419ffd349f6aab7a5ede87e2c35da588c161d60b7048aec4e1ede65e936feabbdc7abdd753f349bd SHA512 d3e60cc3481bd91a827c0639fa16310a130f99f5267f28eda775f0b3764b521e545501d9c07f1b6a44a932ef39c16464c574d4335165dda898865e9f39b7d745
 MISC metadata.xml 413 BLAKE2B 68bcbe6d091780d3ea48707a42b402cfcc075b1ca0c58a8e145bc8ae6e89806361325f772e9e8b05484fc258f09e33c18fa329a494881e3275f534c65b283c15 SHA512 6520ccff6f2071125a07d0e6bc365c8a919ff32791af97fc633ef68b351de8295454884126334e182da7233744d489acfeb2519c3935990ad21eb20da3f5a1f9
diff --git a/dev-ml/dune-configurator/dune-configurator-3.0.3.ebuild b/dev-ml/dune-configurator/dune-configurator-3.0.3-r1.ebuild
index ee56b94f49e5..277a4f000fd9 100644
--- a/dev-ml/dune-configurator/dune-configurator-3.0.3.ebuild
+++ b/dev-ml/dune-configurator/dune-configurator-3.0.3-r1.ebuild
@@ -16,9 +16,9 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="+ocamlopt"
 RESTRICT="test"
 
-BDEPEND="~dev-ml/dune-${PV}"
+BDEPEND=">=dev-ml/dune-3"
 DEPEND="
-	dev-ml/csexp:=[ocamlopt?]
+	>=dev-ml/csexp-1.5:=[ocamlopt?]
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-ml/dune/Manifest b/dev-ml/dune/Manifest
index a42cc547b33a..b53a3d5bbc52 100644
--- a/dev-ml/dune/Manifest
+++ b/dev-ml/dune/Manifest
@@ -3,8 +3,10 @@ DIST dune-2.8.4.tar.gz 1372925 BLAKE2B 5b6d6738a0dc701d852e6cc59a1998f64c006d233
 DIST dune-2.9.1.tar.gz 1385381 BLAKE2B 27224f803547d02f7110dcfc486ef41f9a4586f6f862ef7f8bbf05cc1f3f6dc8ea03fca99c01842f4226ea3d08f4127daa0e5811dd46cc00f1b96ad7eaafe43d SHA512 4fcff34de4acc4429dd73864ca90e695d8ba436839fd679608f7db292e44be70c3db455a58f59477f2055f84ce497bfa8e90e485ed9536acad3c1b3be3d4be77
 DIST dune-2.9.3.tar.gz 1387667 BLAKE2B 3db54c780b9d13f40c774f53c3fe471dba4a640e7cb5aa5d70ef1dc20a217b95a66149ca5f99f07f3a20450577d622e0cda149f656f06f5a42231b89667c1152 SHA512 df6e06a9beebf41f3ed375384be781b5c87c7949048995cc0bbad13dd65c96bd8b27415cd41e43b1112bd86524a59a7dd418e14b5c72b4f1f8fd4ac5ca2d1494
 DIST dune-3.0.3.tar.gz 1725788 BLAKE2B 2de93c085f642c8381642a08b18bc21ad48097f32397b3eddab9725deb267b089849b649705e1b72bb1b5b37f7531fd9e0cfb134174f0cb3a8ee2595c7dcf8ce SHA512 839e942bcf8189763d0d9b01614333bb2f036bce68c82959e51d2e9145b57067cb862b66781912391c1a0f531b8dddf2ffeafcee71c626169a437fe40feba155
+DIST dune-3.1.1.tar.gz 1738713 BLAKE2B 29e2034a551f9fbc57aeb1056f934ee5b69d38743178743f9b4f9cfa9e43a805ef7eb904a25f5ff6b4944d47032ccb1c8fb420b48f85dd14bdd14350cc53f77c SHA512 3a99a66c449f9e6bf12bb21d2d6871f4d34677a8c0c63e47b3687e2af3d8c62ab4ab62809c5885f2d61a1ed93a88f90cadc0f8db0c95442410c0a964892bd3b8
 EBUILD dune-2.8.4.ebuild 925 BLAKE2B aaf039c23fdec35db8eafa1362e05e0a0007b4d5a59483726cffdd4c3f2738ab53cae26451001fa051fe46444f29d08ffd3e22233acaa3280db2c761822c1295 SHA512 175a4b03a248ade24a4a0fc232d13364f5332f9cd686056710dd1fce04b27ac59d81b3844ef1476867f3c5f646167dc40ada4609afc5594ac721ca5f216670a7
 EBUILD dune-2.9.1.ebuild 904 BLAKE2B f98314d3cd1daa6fd08610daee2695a30b4c751bc1d060aad8b99b8e3e138fbe9751a92b5df3e1d1f62a8235b509ed884c75f2e11673d8a8a3cb50ddc414bdd2 SHA512 10a59aa34098669ca0d6d6a568cc63d124fd174850bb66591e9798b452629cc7647d6204050a4fbda2db394782c17590155467d798783018ff1205cde4b92e0e
 EBUILD dune-2.9.3-r3.ebuild 1268 BLAKE2B b1a9b83a1a02159c5c48c2025c0819bbb725529b78d26fbc34953e75762edf1c0dd95954fd9046d1d76fdd8a65430ac90909c2d6994ee608db304bdd27da1ad7 SHA512 fbae16298c1bfd19ab66722cf122745065817a08839deaf408bdd734b4870f0934bf5c977a844f5dc123a4173e51fec769d59cc3c857757d8857746ce5bea3ad
 EBUILD dune-3.0.3-r1.ebuild 1519 BLAKE2B 73794b43fe622a63df00e38fb732d391ac8f8f062dc065e8df859b2f403d3beb65fd0c1ec2e99ba9cda22600f8120c846b3551dad6af33ea1ce462fd02a15d35 SHA512 ad686f9a6af18fa26bd49c1e3b7e03c48cbadb07ec45fba560b713677b6101dfd76003575911a7ec0c7585b284ca9e53127399367e010b9ad811d0c5e928d28c
+EBUILD dune-3.1.1.ebuild 1519 BLAKE2B 73794b43fe622a63df00e38fb732d391ac8f8f062dc065e8df859b2f403d3beb65fd0c1ec2e99ba9cda22600f8120c846b3551dad6af33ea1ce462fd02a15d35 SHA512 ad686f9a6af18fa26bd49c1e3b7e03c48cbadb07ec45fba560b713677b6101dfd76003575911a7ec0c7585b284ca9e53127399367e010b9ad811d0c5e928d28c
 MISC metadata.xml 413 BLAKE2B 68bcbe6d091780d3ea48707a42b402cfcc075b1ca0c58a8e145bc8ae6e89806361325f772e9e8b05484fc258f09e33c18fa329a494881e3275f534c65b283c15 SHA512 6520ccff6f2071125a07d0e6bc365c8a919ff32791af97fc633ef68b351de8295454884126334e182da7233744d489acfeb2519c3935990ad21eb20da3f5a1f9
diff --git a/dev-ml/dune/dune-3.1.1.ebuild b/dev-ml/dune/dune-3.1.1.ebuild
new file mode 100644
index 000000000000..4021856b5e95
--- /dev/null
+++ b/dev-ml/dune/dune-3.1.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multiprocessing elisp-common
+
+DESCRIPTION="A composable build system for OCaml"
+HOMEPAGE="https://github.com/ocaml/dune"
+SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="emacs"
+RESTRICT="strip test"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.08:=
+	emacs? ( >=app-editors/emacs-23.1:* )
+"
+DEPEND="${RDEPEND}"
+
+QA_FLAGS_IGNORED="usr/bin/dune"
+
+BYTECOMPFLAGS="-L ${S}/editor-integration/emacs"
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	default
+
+	# This allows `dune --version` to output the correct version
+	# instead of "n/a"
+	sed -i "/^(name dune)/a (version ${PV})" dune-project || die
+}
+
+src_configure() {
+	./configure \
+		--libdir="$(ocamlc -where)" \
+		--mandir="/usr/share/man" \
+		|| die
+}
+
+src_compile() {
+	ocaml bootstrap.ml -j $(makeopts_jobs) || die
+	./dune.exe build -p "${PN}" --profile dune-bootstrap -j $(makeopts_jobs) \
+		--display short || die
+
+	use emacs && elisp-compile editor-integration/emacs/*.el
+}
+
+src_install() {
+	./dune.exe install --destdir="${D}" --prefix=/usr/ \
+		--libdir=$(ocamlc -where) "${PN}" \
+		|| die
+
+	dodir /usr/share/doc
+	mv "${ED}"/usr/doc/dune "${ED}"/usr/share/doc/${PF} || die
+	rmdir "${ED}"/usr/doc || die
+
+	if use emacs ; then
+		elisp-install ${PN} editor-integration/emacs/*.el{,c}
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
diff --git a/dev-ml/ounit2/Manifest b/dev-ml/ounit2/Manifest
index a3f145bc22b0..d8bbfb0c87a4 100644
--- a/dev-ml/ounit2/Manifest
+++ b/dev-ml/ounit2/Manifest
@@ -1,7 +1,8 @@
+AUX ounit2-2.2.6-dune.patch 489 BLAKE2B 9dd4273ef79e4da3a595fc6479c44168f4b4eb12e2610c0f5987cd14e563111137cc9c7b1c872a0e1c0b15b16a41df6745720fea146d80a74184a0d264d6539d SHA512 a172b4bb366a8f5e6d9bddb7c11e3e0c484a2a309c36cf6ce39a1a07894d44f5333f4dd14e685d853f293debbba69fd90826dbc0bc82a26ba4bd391d6dbc2c37
 DIST ounit-v2.2.3.tbz 57449 BLAKE2B cf4742c4800ff66551416e243285ae0264f94d1665f795039cd37ad717b09fa3ba5cdfb2380169dfcddea5a27a82373ae892adf11155147a081d734091bf39d8 SHA512 dff04859d263e5f80a1606156d07493d0320a2756d0a7f134c63c53078550c7b056587486922bc66a288413af30c59a7e47157636502c6dd10626cf75587f981
 DIST ounit-v2.2.4.tbz 57558 BLAKE2B 5cb1eaa1233102af49155b46a1a95742c3c6c584901536ce755e6f6386d0d645639b98fdbab236fe20c93c3bde2632bbfc31c5a076f61cc6b9a7f408ac032643 SHA512 d69dc501a360c31f7854322b5e2c2abcb1e43890737e1cc00c167ee104d5dee471b6b8d8186f8044b0482c91a8f15210a25d833a1e03ed7baabfba923815962f
 DIST ounit2-2.2.6.tar.gz 69910 BLAKE2B 7833738e94990c7e67d27665e994c9e3c1505dcb45e2faaba58ef7de9eccc8fc19437fa983da058b1fa2c464e74d90a4eec22380ebfa01ae5e5a9616faf6ada3 SHA512 4d808866dc4f9de6493a17910fafb2452398aef45cb29add54ed25e15a10ec7715bdd52d40190f618e77fe351d8bb67fbe12c1df6a6736c501792a57f6b3768a
 EBUILD ounit2-2.2.3.ebuild 503 BLAKE2B 6de41b834e56cf7e51c97c10f21ce476fc96df609ba9ec2e308ee077078c92f766777f66982d37210d8bfbb15c540659273061debd255adc5c23dd990f07f7c2 SHA512 4a08cc0dc1d2d6ae4c290184ffc5a9d0e1d2d2180883632cc74376ed2809a1ffee4c7c5179230bc537ee911583ff2212400ab47c607c5441d14536bd6a3f1b2e
 EBUILD ounit2-2.2.4.ebuild 498 BLAKE2B b5b21b2d27eba15291a0009de501de051e8214ff845bcb5b7f7432809793aa80df2ccfbcc1ddd0abc94ddb128f1df9c23c1f2f4a22dc8cbd23b8bc92ceb00f18 SHA512 62f31733d78021e5cb3a9ec59bbe4f15a399fc57558d04ac1c60e87a8009286bf9c952e104c37708cb0807fb9942b2731fd6c5e54b57373517fe329bb5e9f085
-EBUILD ounit2-2.2.6.ebuild 548 BLAKE2B 8e80b2ee48c44ee97b62ad05ff16536fe92d2afb5d9d10c6090e81d1f8a50dea8276a3d5507086106f40a87fd429b0a4b79c55c9627948d6385c100c7a7fbd0c SHA512 fdc41ce987d7cf984b6c6f9951c4a40540fed15120fcdc7db682e25a3c0425198c686d399a995bcfeb0df6047490f691c0fddfa4f765cf807c985ca161a54b23
+EBUILD ounit2-2.2.6.ebuild 591 BLAKE2B a52dfedc46ac0a201bd9e0ca1047bcb75e43043bc3cf19c3a1960c3debbb6add28f9f7f86aea2378eb0ef283467f1426b5a912404af3b5ec4db8fb8c3b15b9ed SHA512 c9abd7c343b13bb2aa5472e25a408ece1f89c1234aad2a2193b27c79ebdca8848cddcdcff89ce8833b1884e8fdd394aaff082548536a93c0f8ab708cf35e656f
 MISC metadata.xml 418 BLAKE2B 96fa6f7441ac0051ee08a91ab0639196a97b66025938df081ac052182c87a9095fc17ca56e29f1b07f28e21c9ba65640748ff2284e9eb3c95eba9df37adaeed8 SHA512 029b97ddc0f6e0a850df66b6c484ff937f47e774d323ab6e463eb6dee3d6c994885644fa51c0e66fcf5559dc3afcabc3162ccebf201d66c762ca11660a229de9
diff --git a/dev-ml/ounit2/files/ounit2-2.2.6-dune.patch b/dev-ml/ounit2/files/ounit2-2.2.6-dune.patch
new file mode 100644
index 000000000000..9ef29326f6d0
--- /dev/null
+++ b/dev-ml/ounit2/files/ounit2-2.2.6-dune.patch
@@ -0,0 +1,19 @@
+--- a/src/lib/ounit2/dune
++++ b/src/lib/ounit2/dune
+@@ -2,7 +2,7 @@
+   (name oUnit)
+   (public_name ounit2)
+   (wrapped false)
+-  (libraries unix seq ounit2.advanced))
++  (libraries unix ounit2.advanced))
+ 
+ (documentation
+   (package ounit2)
+--- a/src/lib/ounit2/advanced/dune
++++ b/src/lib/ounit2/advanced/dune
+@@ -7,4 +7,4 @@
+   (name oUnitAdvanced)
+   (public_name ounit2.advanced)
+   (wrapped false)
+-  (libraries unix bytes seq stdlib-shims))
++  (libraries unix bytes stdlib-shims))
diff --git a/dev-ml/ounit2/ounit2-2.2.6.ebuild b/dev-ml/ounit2/ounit2-2.2.6.ebuild
index d86216a306f2..4658b3fb40bb 100644
--- a/dev-ml/ounit2/ounit2-2.2.6.ebuild
+++ b/dev-ml/ounit2/ounit2-2.2.6.ebuild
@@ -21,6 +21,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}"/${P}-dune.patch )
+
 src_install() {
 	dune-install ${PN} ${PN}-lwt
 }