gentoo resync : 29.01.2021

3 files changed, 114 insertions, 3 deletions

diff --git a/dev-ml/dune-private-libs/Manifest b/dev-ml/dune-private-libs/Manifest
index 9af4d889ab85..4270363761b9 100644
--- a/dev-ml/dune-private-libs/Manifest
+++ b/dev-ml/dune-private-libs/Manifest
@@ -1,3 +1,5 @@
 DIST dune-2.7.1.tar.gz 1290915 BLAKE2B 85a2dee92d1ead03b43b80742c291f4470dd9e1d843fdb257754c567e2329c101d11b42573da19de537f0d8591ebdacfcaab1099e0f46bdeebcd8421eb1bbcb2 SHA512 b77d0e207263107365e5a6e94423e8ab4ddbab1f920872d915e4014b7cc69915274b53fe946bb4b29dfe3de2bf5573ab3b2bffb4db8eb50b472e7dfb6cab88b7
-EBUILD dune-private-libs-2.7.1.ebuild 900 BLAKE2B 175aefff20978b07dbf58d82f724a2dc5b3751de43994f433161e1148ef8dad307519ccb6136ee255623fdd501ff31f3cc62f4d1165af7c160cb0162b2a38385 SHA512 16b9ec86e3310e985517ce53813787f5d7c2a4a2c4273c5697e6703fec3be4057df6bb894526dc680c520efa83d33f9daf7b55793eadb03139301a3a4ae87216
+DIST dune-2.8.2.tar.gz 1369417 BLAKE2B d846d35675a18abc3ccc57a52574d81a8fb4f082d9935912f035061c1107b47be8752daeb9c49bb2af4877e419a6c8bc30f846db6d773cf5267d3d761272a872 SHA512 fcbe45ea59492517e0868bf1f801c2bd2f3b1b30234e36d789c33e7ee48bd724726beb211697f3820609bbc27923c8c37d7be89dcbd059558014743360f2d0b7
+EBUILD dune-private-libs-2.7.1.ebuild 900 BLAKE2B b3e7d5f8a27eb33f9b4043ed5da7ef126b512b6269fce527b8d2679b2b4638fbd26a6a0b736e5deee6df82fcf6fcf6e22aff2646be4c459f8933ffe6afef52e8 SHA512 2a084b0eb6c6b24c54d6ce50a47aa134e996c9198d308ba5852166c111a1329136ff22d375592b4d3212597303ac84548f5f013bf5353de984395a9f205d6049
+EBUILD dune-private-libs-2.8.2-r1.ebuild 3660 BLAKE2B 5d7bb728bedf2273474605c149b806692dbdf1ddc70fa81cd1c2e2916b4f3f49506446b3c80b86c3e6e525154679828930600690e1c36db764835783204ca5b2 SHA512 d161cc7efc8bb6f0043d1b4405e7fa0c4d27a7b1d94e57d97c0354502954fb0a3bcf82d21109c7fb40d8e1fb9343d0c6ecf27048c62cf98980466bedfb7951f6
 MISC metadata.xml 319 BLAKE2B 65741bb0181ac6f6fb28019dc60386a5d47a2071131d8496adb14af1eff40000b59b2410acdf8ffa14fd4ad1d0bd6efacc1c67f68c162ed10e847a00db457aaf SHA512 8178e2c48fdd360ab7860dde1666bd2d0d0223f51275c58005aaab2d14946d4bb1e1e6be55a74d98afd6ef0acac515e2ebd0f7f44adbc9d2d7efbfcde641bd65
diff --git a/dev-ml/dune-private-libs/dune-private-libs-2.7.1.ebuild b/dev-ml/dune-private-libs/dune-private-libs-2.7.1.ebuild
index 605aee40ddff..2c70da8f045b 100644
--- a/dev-ml/dune-private-libs/dune-private-libs-2.7.1.ebuild
+++ b/dev-ml/dune-private-libs/dune-private-libs-2.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
-	~dev-ml/dune-2.7.1
+	~dev-ml/dune-${PV}
 	test? (
 		dev-ml/ppx_expect
 	)"
diff --git a/dev-ml/dune-private-libs/dune-private-libs-2.8.2-r1.ebuild b/dev-ml/dune-private-libs/dune-private-libs-2.8.2-r1.ebuild
new file mode 100644
index 000000000000..3ae039e8db0d
--- /dev/null
+++ b/dev-ml/dune-private-libs/dune-private-libs-2.8.2-r1.ebuild
@@ -0,0 +1,109 @@
+# 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="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	~dev-ml/dune-${PV}
+	test? (
+		dev-ml/core_bench
+		dev-ml/menhir
+		dev-ml/opam
+		dev-ml/ppx_expect
+	)
+"
+DEPEND="
+	dev-ml/csexp:=[ocamlopt=]
+	dev-ml/findlib:=[ocamlopt=]
+"
+RDEPEND="${DEPEND}"
+
+# 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-configurator
+	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
+
+		# 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() {
+	:
+}