gentoo resync : 08.10.2021

2 files changed, 119 insertions, 0 deletions

diff --git a/dev-ml/dune-configurator/Manifest b/dev-ml/dune-configurator/Manifest
index bdd0c17aa421..4da3fc8ac227 100644
--- a/dev-ml/dune-configurator/Manifest
+++ b/dev-ml/dune-configurator/Manifest
@@ -1,7 +1,9 @@
 DIST dune-2.8.2.tar.gz 1369417 BLAKE2B d846d35675a18abc3ccc57a52574d81a8fb4f082d9935912f035061c1107b47be8752daeb9c49bb2af4877e419a6c8bc30f846db6d773cf5267d3d761272a872 SHA512 fcbe45ea59492517e0868bf1f801c2bd2f3b1b30234e36d789c33e7ee48bd724726beb211697f3820609bbc27923c8c37d7be89dcbd059558014743360f2d0b7
 DIST dune-2.8.4.tar.gz 1372925 BLAKE2B 5b6d6738a0dc701d852e6cc59a1998f64c006d233f43a804b0b9b677a6eadda25aa20f52799c90910d361e4bc565636a50d218ad5d0a9927239adc5be36b3889 SHA512 13b36eb6a943f9513987a23dab467b2e449cc3a4de35227f8323c3c724b27f19daac500602141ab22a04579243333c8484ce27a7f73e46a72e796d30fb1c3253
 DIST dune-2.9.0.tar.gz 1385143 BLAKE2B c973e4b2c5780a3e4902c31c030b2560fe5be313338a5188edc9b7ff97b63968baba267966d095076bed4f1527a8b8b5a0f980e74f53476d70ec53f20dc661a6 SHA512 1c3b64746b00215cd97b36c0f1c6e2416c9d15c795265634240e9da37e2c2fce02ab3c309a0cb967f9f20a5c6df14e943c3c2942c1a8f4743c3a19c699f4eb24
+DIST dune-2.9.1.tar.gz 1385381 BLAKE2B 27224f803547d02f7110dcfc486ef41f9a4586f6f862ef7f8bbf05cc1f3f6dc8ea03fca99c01842f4226ea3d08f4127daa0e5811dd46cc00f1b96ad7eaafe43d SHA512 4fcff34de4acc4429dd73864ca90e695d8ba436839fd679608f7db292e44be70c3db455a58f59477f2055f84ce497bfa8e90e485ed9536acad3c1b3be3d4be77
 EBUILD dune-configurator-2.8.2-r1.ebuild 3691 BLAKE2B 6cceed0e264b8c1a8a6bc19b4fd790426f68556bf17b0fa80d8e3ec4f129aac627301f4dc61005e9bda9706f5d60425d1576044ef4a6c14e20e1a16c4e1790e4 SHA512 2d7b330a4fa3fb4ad8ddef912aa05f2b2d83123d434189a48b1a6f5b058ac3d80541e51d7ea53d5b85316c61914d1dfe7b814f773621522f52e23481bd7d3bc2
 EBUILD dune-configurator-2.8.4.ebuild 4113 BLAKE2B a7b7a6dd0339659e6a1f7a2a1e3ca9a086d849860164c1fda0f3f605208ba2fc71226688f87ffc29a8aef0db03713b2ce135ff8ba80b1e6b555d04c7b630460b SHA512 248672c231a7c1971ee4fb15ec5bc9c73b90a470dd2c41f6e69c1e8a1aa79cf1d77a4a7fde288a6ecfa3d798ca8ea70957a8925652b527920d3f7546e1edd53d
 EBUILD dune-configurator-2.9.0.ebuild 4119 BLAKE2B 41ee9db5c9e79840dae7e1cf2489f83f154ba64a90e32260fdb0af5b738e046a0d4d9912c59301fbf9567f3beb502e0164a7a9a7abaf3a4d0fc4f87949663b2f SHA512 17f1777fbacebca4abbf2636a6b6ff46a5b58fa32d28fee2cd6b9e9168f2200ba31f1b998ff3f4fd9b59a6b1df7afb4320f82ae5197a32c5a3d15a3aaf9cdacd
+EBUILD dune-configurator-2.9.1.ebuild 4119 BLAKE2B 41ee9db5c9e79840dae7e1cf2489f83f154ba64a90e32260fdb0af5b738e046a0d4d9912c59301fbf9567f3beb502e0164a7a9a7abaf3a4d0fc4f87949663b2f SHA512 17f1777fbacebca4abbf2636a6b6ff46a5b58fa32d28fee2cd6b9e9168f2200ba31f1b998ff3f4fd9b59a6b1df7afb4320f82ae5197a32c5a3d15a3aaf9cdacd
 MISC metadata.xml 413 BLAKE2B 68bcbe6d091780d3ea48707a42b402cfcc075b1ca0c58a8e145bc8ae6e89806361325f772e9e8b05484fc258f09e33c18fa329a494881e3275f534c65b283c15 SHA512 6520ccff6f2071125a07d0e6bc365c8a919ff32791af97fc633ef68b351de8295454884126334e182da7233744d489acfeb2519c3935990ad21eb20da3f5a1f9
diff --git a/dev-ml/dune-configurator/dune-configurator-2.9.1.ebuild b/dev-ml/dune-configurator/dune-configurator-2.9.1.ebuild
new file mode 100644
index 000000000000..87edcf4c3a33
--- /dev/null
+++ b/dev-ml/dune-configurator/dune-configurator-2.9.1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="A composable build system for OCaml"
+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="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	~dev-ml/dune-private-libs-${PV}:=[ocamlopt=]
+	dev-ml/csexp:=[ocamlopt=]
+	dev-ml/result:=[ocamlopt=]
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+	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"
+}
+
+src_configure() {
+	:
+}