diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-03-20 14:27:17 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-03-20 14:27:17 +0000 |
commit | 5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 (patch) | |
tree | 66e860a5099bcad013f1cf667255dc372a7c11b3 /dev-ml/dune-private-libs | |
parent | 7218e1b46bceac05841e90472501742d905fb3fc (diff) |
gentoo resync : 20.03.2021
Diffstat (limited to 'dev-ml/dune-private-libs')
4 files changed, 123 insertions, 48 deletions
diff --git a/dev-ml/dune-private-libs/Manifest b/dev-ml/dune-private-libs/Manifest index ba14a23a431c..213b61788364 100644 --- a/dev-ml/dune-private-libs/Manifest +++ b/dev-ml/dune-private-libs/Manifest @@ -1,5 +1,5 @@ -DIST dune-2.7.1.tar.gz 1290915 BLAKE2B 85a2dee92d1ead03b43b80742c291f4470dd9e1d843fdb257754c567e2329c101d11b42573da19de537f0d8591ebdacfcaab1099e0f46bdeebcd8421eb1bbcb2 SHA512 b77d0e207263107365e5a6e94423e8ab4ddbab1f920872d915e4014b7cc69915274b53fe946bb4b29dfe3de2bf5573ab3b2bffb4db8eb50b472e7dfb6cab88b7 DIST dune-2.8.2.tar.gz 1369417 BLAKE2B d846d35675a18abc3ccc57a52574d81a8fb4f082d9935912f035061c1107b47be8752daeb9c49bb2af4877e419a6c8bc30f846db6d773cf5267d3d761272a872 SHA512 fcbe45ea59492517e0868bf1f801c2bd2f3b1b30234e36d789c33e7ee48bd724726beb211697f3820609bbc27923c8c37d7be89dcbd059558014743360f2d0b7 -EBUILD dune-private-libs-2.7.1.ebuild 896 BLAKE2B be729dae693c543d389e2a53d0c1a839482fb2d7020e8c114965602adc3dd2f1bfc5f1379416730b1afd1d0a985aa989bbd18f51d066c399b4ae3bcfe5720fff SHA512 649d123e1d8acf922244f296541ebed1a0e85741a23cf537b1a259df9da2937b7256d5740c105199a851bcc06fb8bfa161c4c0b15747c1d867cedee7f924de91 -EBUILD dune-private-libs-2.8.2-r1.ebuild 3694 BLAKE2B a3d5cc680b6e126711f92621cff6b8747454ebf398f63370a0c4555e956ee565130e32564ea5af99016e39cf61e743b4d63c0b565cfb9975fad9d465e1731e31 SHA512 f1258d55a3464673f02e476c663d09c6df28caef16588c52b89356194266b870a9c40abd0c65b589342929b61fe3a5c6f10f4875bf7558bdae7e88d9d3fd5699 +DIST dune-2.8.4.tar.gz 1372925 BLAKE2B 5b6d6738a0dc701d852e6cc59a1998f64c006d233f43a804b0b9b677a6eadda25aa20f52799c90910d361e4bc565636a50d218ad5d0a9927239adc5be36b3889 SHA512 13b36eb6a943f9513987a23dab467b2e449cc3a4de35227f8323c3c724b27f19daac500602141ab22a04579243333c8484ce27a7f73e46a72e796d30fb1c3253 +EBUILD dune-private-libs-2.8.2-r1.ebuild 3691 BLAKE2B 7275871c01c4f1c68db72e7c0fe976103dd916007fee23c901f5007783b84a113f30857fb1106f64e0e01a3b4db2cae19115cd29a921ccf7a7c4527234c21d3f SHA512 846081c97aa0fd064e2089fc9d17b87ca6ca2c247341ddd1704bd53170c829151a8a3b4fa9404b71eed99705e4d437c31baff7be7835c1150750900940617d7a +EBUILD dune-private-libs-2.8.4.ebuild 4119 BLAKE2B eaea1ebab708adcbd6d1807cb2a14010e3cac7d7dbaeaa12c291ea2d2c4dc804a5e34a4a2c02ac342f73d98f09156ceb5bee510fe0d15dc91bbfdf7afd70dc2e SHA512 458293150214b84f21c2aa64923bf04fe49e7f7d1bd075219e12bed6ccf989bc2af492c15e0b18979e85483c15e13a35d481c3a1f18540b27a14d3302105f49a MISC metadata.xml 412 BLAKE2B 1ac46aa4fe2b5f531debe5c283c36db66a98d2120ceaa389bb2fe5c9c989a8185d0c66df879bfcd65f89e6e304359beadd632e445220a633887237bc9159ad8d SHA512 74df6c8368d4283dbda004fba147e5fa5c82165dc6a7553bf61f49d93ef7283160f6c193505d42f4043e2d3ac3227d4d29ee99827845726f146603088a61d76a 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 deleted file mode 100644 index 73b61f709cff..000000000000 --- a/dev-ml/dune-private-libs/dune-private-libs-2.7.1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# 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" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86" -IUSE="+ocamlopt test" -RESTRICT="!test? ( test )" - -BDEPEND=" - ~dev-ml/dune-${PV} - test? ( - dev-ml/ppx_expect - )" -DEPEND=" - dev-ml/csexp:= - dev-ml/findlib:= -" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/dune-${PV}" - -src_prepare() { - default - # remove tests that run git - rm -f \ - test/blackbox-tests/test-cases/dune-project-meta/main.t/run.t \ - test/blackbox-tests/test-cases/meta-template-version-bug.t \ - test/blackbox-tests/test-cases/subst.t/run.t \ - test/expect-tests/vcs_tests.ml \ - || die -} - -src_configure(){ - : -} 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 index b7c3752f9529..3af456b42d85 100644 --- 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 @@ -12,7 +12,7 @@ S="${WORKDIR}/dune-${PV}" LICENSE="Apache-2.0" SLOT="0/${PV}" -KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86" +KEYWORDS="amd64 arm arm64 ppc ppc64 x86" IUSE="+ocamlopt test" RESTRICT="!test? ( test )" diff --git a/dev-ml/dune-private-libs/dune-private-libs-2.8.4.ebuild b/dev-ml/dune-private-libs/dune-private-libs-2.8.4.ebuild new file mode 100644 index 000000000000..7b6b59feb352 --- /dev/null +++ b/dev-ml/dune-private-libs/dune-private-libs-2.8.4.ebuild @@ -0,0 +1,119 @@ +# 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 ~ppc ~ppc64 ~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=] + >=dev-lang/ocaml-4.09:= +" +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 + + # 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() { + : +} |