gentoo auto-resync : 13:10:2022 - 01:41:21

3 files changed, 4 insertions, 92 deletions

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 51260e834a42..af01b6302542 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 c64c31ea0858..0f76c57bcbe8 100644
--- a/dev-ml/dune-configurator/Manifest
+++ b/dev-ml/dune-configurator/Manifest
@@ -3,5 +3,5 @@ DIST dune-2.9.1.tar.gz 1385381 BLAKE2B 27224f803547d02f7110dcfc486ef41f9a4586f6f
 DIST dune-2.9.3.tar.gz 1387667 BLAKE2B 3db54c780b9d13f40c774f53c3fe471dba4a640e7cb5aa5d70ef1dc20a217b95a66149ca5f99f07f3a20450577d622e0cda149f656f06f5a42231b89667c1152 SHA512 df6e06a9beebf41f3ed375384be781b5c87c7949048995cc0bbad13dd65c96bd8b27415cd41e43b1112bd86524a59a7dd418e14b5c72b4f1f8fd4ac5ca2d1494
 EBUILD dune-configurator-2.8.4.ebuild 4096 BLAKE2B e5a5aa47665e30b13f1a158149f235156ec8e0b0e3172fb4629532f991b9bc86080d1d303f734e0fb215502151911d41fbed9cddd53d86ae13e7e70e11c8d7ab SHA512 bb7f6f2acb81a18fc9e0c3c67819a1724cbc2f643405c447e67d1bc17ea3e3a9e9194cdceeff0cf04dcf38bc154d31650a203beefc87dea9b8fa74e9f5d17873
 EBUILD dune-configurator-2.9.1.ebuild 4097 BLAKE2B 00fd8af27ed27321fc506d177f4ac3f822783f30fc612bb97891192ca4cc046aed50da0a87878a5a7dfd8dee1ad24b68acada59a55ed7b733290222723e4c86a SHA512 dae9de72741c9f5e1e3c48e32727d4779e9ccc739df6c6d2fbfd3b526406eff78fa2cf42217d0b99ee0fae6109abee0cc71990619fa56ab5b5f8ae039bc29a4e
-EBUILD dune-configurator-2.9.3.ebuild 4108 BLAKE2B b8a4f5272c4233c2240c45cd9b91cd24ed090a05c8ab86c119c9451c4b145517db3fb32760cdf5610a578a2d8afd88702183fd9a9c81ac08cd99f0c245e1ea7b SHA512 03087f5418c27bc21d1785c943ba44356c0b90d565ef24a9734e300c0ff74c1b7ce4842fe5eb7321f503a443a80460fd3276630af5a7a68ca3161927dde96823
+EBUILD dune-configurator-2.9.3.ebuild 643 BLAKE2B 0e18709fb1ff06bd620b2a0b10e2a7dc5105d81d14972808b6c078c9dfdaadfe9311cb04100a8e6a4c05d7661b1e821fb4ab7af34ef1f354c512a2690dc5ea6d SHA512 1c480745ba59a78a6a7123414b057f0546616b235f5e2db7fed25e65d4c399edc6fb24cbe613a0ee253c0734b9fabd17695ebdbf5e195f53f1da39a51b642654
 MISC metadata.xml 413 BLAKE2B 68bcbe6d091780d3ea48707a42b402cfcc075b1ca0c58a8e145bc8ae6e89806361325f772e9e8b05484fc258f09e33c18fa329a494881e3275f534c65b283c15 SHA512 6520ccff6f2071125a07d0e6bc365c8a919ff32791af97fc633ef68b351de8295454884126334e182da7233744d489acfeb2519c3935990ad21eb20da3f5a1f9
diff --git a/dev-ml/dune-configurator/dune-configurator-2.9.3.ebuild b/dev-ml/dune-configurator/dune-configurator-2.9.3.ebuild
index 289317f1072a..b2716c4b3f5c 100644
--- a/dev-ml/dune-configurator/dune-configurator-2.9.3.ebuild
+++ b/dev-ml/dune-configurator/dune-configurator-2.9.3.ebuild
@@ -13,103 +13,15 @@ S="${WORKDIR}/dune-${PV}"
 LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
+IUSE="+ocamlopt"
+RESTRICT="test" #test run within dev-ml/dune-private-libs
 
 RDEPEND="
 	~dev-ml/dune-private-libs-${PV}:=[ocamlopt?]
 	dev-ml/csexp:=[ocamlopt?]
 	dev-ml/result:=[ocamlopt?]
 "
-DEPEND="${RDEPEND}
-	test? (
-		dev-ml/core_bench
-		dev-ml/menhir
-		dev-ml/opam
-		dev-ml/ppx_expect
-	)
-"
-# TODO for test deps:
-# Add cram?
-# Add dev-ml/js_of_ocaml once dev-ml/ocaml-base64 is ported to Dune
-# Add coq?
-
-src_prepare() {
-	default
-
-	# Keep this list in sync with dev-ml/dune-private-libs
-	local bad_tests=(
-		# List of tests calling git, mercurial, etc
-		test/blackbox-tests/test-cases/dune-project-meta/main.t
-		test/blackbox-tests/test-cases/meta-template-version-bug.t
-		test/blackbox-tests/test-cases/subst/project-name-restriction.t
-		test/blackbox-tests/test-cases/subst/with-opam-file.t
-		test/blackbox-tests/test-cases/subst.t
-		test/blackbox-tests/test-cases/subst/unicode.t
-		test/blackbox-tests/test-cases/subst/from-project-file.t
-		test/blackbox-tests/test-cases/trace-file.t
-		otherlibs/build-info/test/run.t
-		test/expect-tests/vcs_tests.ml
-
-		# Strange failures, seemingly from newer versions of deps
-		test/blackbox-tests/test-cases/merlin/allow_approximate_merlin_warn.t
-		test/blackbox-tests/test-cases/merlin/merlin-tests.t
-		test/blackbox-tests/test-cases/merlin/github4125.t
-		test/blackbox-tests/test-cases/install-dry-run.t
-		test/blackbox-tests/test-cases/c-flags.t
-		test/blackbox-tests/test-cases/install-libdir.t
-		test/blackbox-tests/test-cases/dune-cache/trim.t
-
-		# Strange failures about opam not being initialised
-		test/blackbox-tests/test-cases/merlin/merlin-from-subdir.t
-		test/blackbox-tests/test-cases/merlin/symlinks.t
-		test/blackbox-tests/test-cases/merlin/src-dirs-of-deps.t
-		test/blackbox-tests/test-cases/merlin/per-module-pp.t
-		test/blackbox-tests/test-cases/merlin/server.t
-		test/blackbox-tests/test-cases/github1946.t
-		test/blackbox-tests/test-cases/github759.t
-
-		# Wants nodejs!
-		test/blackbox-tests/test-cases/jsoo/simple.t
-		test/blackbox-tests/test-cases/jsoo/inline-tests.t
-		test/blackbox-tests/test-cases/jsoo/github3622.t
-		# Wants js_of_ocaml (can't include yet b/c of ocaml-base64 porting)
-		test/blackbox-tests/test-cases/jsoo/explicit-js-mode-specified.t
-
-		# Wants coq which doesn't build for me right now
-		test/blackbox-tests/test-cases/coq/rec-module.t
-		test/blackbox-tests/test-cases/coq/compose-sub-theory.t
-		test/blackbox-tests/test-cases/coq/native-compose.t
-		test/blackbox-tests/test-cases/coq/base-unsound.t
-		test/blackbox-tests/test-cases/coq/base.t
-		test/blackbox-tests/test-cases/coq/native-single.t
-		test/blackbox-tests/test-cases/coq/compose-simple.t
-		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
-
-		# Unpackaged dependencies (a rabbit hole for now)
-		# utop -> lambda-term, zed
-		test/blackbox-tests/test-cases/utop/github3188.t
-		test/blackbox-tests/test-cases/utop/utop-simple.t
-		test/blackbox-tests/test-cases/utop/utop-default.t
-		test/blackbox-tests/test-cases/utop/utop-default-implementation.t
-		test/blackbox-tests/test-cases/utop/utop-ppx-rewriters.t
-		# ocamlformat
-		test/blackbox-tests/test-cases/formatting.t
-		# mdx
-		test/blackbox-tests/test-cases/mdx-stanza.t
-		# odoc
-		test/blackbox-tests/test-cases/odoc/odoc-simple.t
-		test/blackbox-tests/test-cases/odoc/odoc-package-mld-link.t
-		test/blackbox-tests/test-cases/odoc/multiple-private-libs.t
-		test/blackbox-tests/test-cases/odoc/odoc-unique-mlds.t
-		test/blackbox-tests/test-cases/odoc/github717-odoc-index.t
-		test/blackbox-tests/test-cases/odoc/warnings.t
-	)
-
-	rm -r ${bad_tests[@]} || die "Failed to remove broken/inappropriate tests"
-}
+DEPEND="${RDEPEND}"
 
 src_configure() {
 	: