gentoo auto-resync : 12:10:2022 - 13:40:16

3 files changed, 43 insertions, 1 deletions

diff --git a/dev-ml/dune-private-libs/Manifest b/dev-ml/dune-private-libs/Manifest
index 8317e894d966..64525049778e 100644
--- a/dev-ml/dune-private-libs/Manifest
+++ b/dev-ml/dune-private-libs/Manifest
@@ -1,7 +1,8 @@
+AUX dune-private-libs-2.9.3-test.patch 951 BLAKE2B 92a7e9838cdc0e57219956fe8d9f3fe5c8d617ff2ddccd1b331a6c7823216fb910e30ba5fc9e50790eb437f6fdd6af176dd27ad3743a00fecf0c384c9e0537b6 SHA512 bc2a204345e30bd5a40c4a41bdb40243dc6f30cf172443735115979640d1d68571d232a4fa530e981416f03df6a0abcb600cc6e531a33c4c3892cff731fd85c2
 DIST dune-2.8.4.tar.gz 1372925 BLAKE2B 5b6d6738a0dc701d852e6cc59a1998f64c006d233f43a804b0b9b677a6eadda25aa20f52799c90910d361e4bc565636a50d218ad5d0a9927239adc5be36b3889 SHA512 13b36eb6a943f9513987a23dab467b2e449cc3a4de35227f8323c3c724b27f19daac500602141ab22a04579243333c8484ce27a7f73e46a72e796d30fb1c3253
 DIST dune-2.9.1.tar.gz 1385381 BLAKE2B 27224f803547d02f7110dcfc486ef41f9a4586f6f862ef7f8bbf05cc1f3f6dc8ea03fca99c01842f4226ea3d08f4127daa0e5811dd46cc00f1b96ad7eaafe43d SHA512 4fcff34de4acc4429dd73864ca90e695d8ba436839fd679608f7db292e44be70c3db455a58f59477f2055f84ce497bfa8e90e485ed9536acad3c1b3be3d4be77
 DIST dune-2.9.3.tar.gz 1387667 BLAKE2B 3db54c780b9d13f40c774f53c3fe471dba4a640e7cb5aa5d70ef1dc20a217b95a66149ca5f99f07f3a20450577d622e0cda149f656f06f5a42231b89667c1152 SHA512 df6e06a9beebf41f3ed375384be781b5c87c7949048995cc0bbad13dd65c96bd8b27415cd41e43b1112bd86524a59a7dd418e14b5c72b4f1f8fd4ac5ca2d1494
 EBUILD dune-private-libs-2.8.4.ebuild 4114 BLAKE2B fade94617c408e800bcc4abbf6adf312307d620172a8dfd39215add9b487c559f83829d442d9da4763e6f33e68011518751ff6fa7222b410953e42aa5377d94a SHA512 76da3dd2a3c2d6fb9ca5f3433cf0315c9cd7664f5f0cb57daffaabf87b2f12eca779fa5feddf5483c59aa90b091c3715a1e49e3b61eb1e03297ccec655d0c0ca
 EBUILD dune-private-libs-2.9.1.ebuild 4115 BLAKE2B 6af9fcd40c24f75a11decb2f5d51250af5ab97b50449989910e3248cb3e4b4ef0196b1c9d2f0a9c2ac4b9ddf90f09b4179d763caf60ea7ac7fe6dc84140860f6 SHA512 5d4c3930f84b78f4ca45de2f220cf3dda10eb818decb7cc8a6fb0fb75988a763adfb036c8d8dc834254d733faad506f3be5662d6dcba581af4278205b296ee12
-EBUILD dune-private-libs-2.9.3.ebuild 4126 BLAKE2B 973f7b286d6dd062c716ef178b65f17c6fd0d2dbad3dfd025238a2ad3510509de5b77fa9d084ccf94f2d334460787fa917a48496000962d46ba63660af6e77d0 SHA512 54a424e4c581273613cfd198721687a9d70bda83dd63a4aa6bc86959ef4d3c44e3fd4138387ab4b67fdb7ac74c06a23956beaf3d8aaa8087fe9401c9d2313ade
+EBUILD dune-private-libs-2.9.3.ebuild 4430 BLAKE2B a77324e882f89eb08a241ebc17a4de86851851d513a6d210d4cd78ee21519e85316fec5da2c3b67ccf781423da46bbcff6ce0fe58221f1538aa72a14199af40c SHA512 d47796ff2cc00fa9eaa9f58433be4288c6401c0f95a8ebb1ccc3e4514f11c512e26c5e354168312df2b3d6f43cc44e4e23de0006d5d1db09689d04293a873d9d
 MISC metadata.xml 413 BLAKE2B 68bcbe6d091780d3ea48707a42b402cfcc075b1ca0c58a8e145bc8ae6e89806361325f772e9e8b05484fc258f09e33c18fa329a494881e3275f534c65b283c15 SHA512 6520ccff6f2071125a07d0e6bc365c8a919ff32791af97fc633ef68b351de8295454884126334e182da7233744d489acfeb2519c3935990ad21eb20da3f5a1f9
diff --git a/dev-ml/dune-private-libs/dune-private-libs-2.9.3.ebuild b/dev-ml/dune-private-libs/dune-private-libs-2.9.3.ebuild
index 051a8304752e..c518302b4ac9 100644
--- a/dev-ml/dune-private-libs/dune-private-libs-2.9.3.ebuild
+++ b/dev-ml/dune-private-libs/dune-private-libs-2.9.3.ebuild
@@ -32,6 +32,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}"/${P}-test.patch )
+
 # TODO for test deps:
 # Add cram?
 # Add dev-ml/js_of_ocaml once dev-ml/ocaml-base64 is ported to Dune
@@ -71,6 +73,11 @@ src_prepare() {
 		test/blackbox-tests/test-cases/merlin/server.t
 		test/blackbox-tests/test-cases/github1946.t
 		test/blackbox-tests/test-cases/github759.t
+		test/blackbox-tests/test-cases/merlin/default-based-context.t
+		otherlibs/site/test/run.t
+
+		# Deprecated warnings
+		test/blackbox-tests/test-cases/toplevel-integration.t
 
 		# Wants nodejs!
 		test/blackbox-tests/test-cases/jsoo/simple.t
@@ -90,6 +97,8 @@ src_prepare() {
 		test/blackbox-tests/test-cases/coq/ml-lib.t
 		test/blackbox-tests/test-cases/coq/extract.t
 		test/blackbox-tests/test-cases/coq/compose-plugin.t
+		test/blackbox-tests/test-cases/coq/flags.t
+		test/blackbox-tests/test-cases/coq/env.t
 
 		# Unpackaged dependencies (a rabbit hole for now)
 		# utop -> lambda-term, zed
diff --git a/dev-ml/dune-private-libs/files/dune-private-libs-2.9.3-test.patch b/dev-ml/dune-private-libs/files/dune-private-libs-2.9.3-test.patch
new file mode 100644
index 000000000000..661ed791473a
--- /dev/null
+++ b/dev-ml/dune-private-libs/files/dune-private-libs-2.9.3-test.patch
@@ -0,0 +1,32 @@
+From 4a8fa5757277be6e9bbd3698fd4d4336dadae520 Mon Sep 17 00:00:00 2001
+From: Rudi Grinberg <me@rgrinberg.com>
+Date: Sat, 26 Jun 2021 21:54:55 -0700
+Subject: [PATCH] Fix test bug_4219.t
+
+It was missing EOF end markers
+
+Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
+---
+ otherlibs/site/test/bug_4219.t | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/otherlibs/site/test/bug_4219.t b/otherlibs/site/test/bug_4219.t
+index 96d4794f43..eab868d676 100644
+--- a/otherlibs/site/test/bug_4219.t
++++ b/otherlibs/site/test/bug_4219.t
+@@ -7,6 +7,7 @@ Test when sites name which are ocaml keyword
+   > (package
+   >  (name my-package)
+   >  (sites (lib include)))
++  > EOF
+ 
+   $ cat >dune <<EOF
+   > (library (name lib) (libraries dune-site dune-site.plugins))
+@@ -14,6 +15,6 @@ Test when sites name which are ocaml keyword
+   > (generate_sites_module
+   >  (module sites)
+   >  (plugins (my-package include)))
+-
++  > EOF
+ 
+   $ dune build