diff options
Diffstat (limited to 'dev-ml/dune-configurator')
4 files changed, 121 insertions, 35 deletions
diff --git a/dev-ml/dune-configurator/Manifest b/dev-ml/dune-configurator/Manifest index d7c241c816e1..779fff7323c4 100644 --- a/dev-ml/dune-configurator/Manifest +++ b/dev-ml/dune-configurator/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-configurator-2.7.1.ebuild 612 BLAKE2B 777cb99c81ba218e6c8b366343b7d0a407cbcdc9716cd073367c8c1cc2573b79e11e2e31827e28fef89195db4546273174a8ea6d88dc9dde5c6aa9e342e4c578 SHA512 9c77c244f844686c8b4c558c623196549da678c65ab83e515953ef2c036b8c27a2796c2dbd906c93cc7563d875b78714d8620647471e011c7f104f6aad57753b -EBUILD dune-configurator-2.8.2-r1.ebuild 3693 BLAKE2B 6e16c2ec039f3d0a97e19dfb688bd23c035c4d6fcdf06708fa63ae552337b8cc51520c64db2bea6bd16f9b1ed1ad61c0d075dd8e394acdc97ed824eac332ac74 SHA512 1487a0136c1f0e515c2eb07771ea10e3b281cc878de49c1099a6d357061c2efc3f99706bbd48ca149c8973be2b700eeea35805d3c4896f40274df4ee89803b3f +DIST dune-2.8.4.tar.gz 1372925 BLAKE2B 5b6d6738a0dc701d852e6cc59a1998f64c006d233f43a804b0b9b677a6eadda25aa20f52799c90910d361e4bc565636a50d218ad5d0a9927239adc5be36b3889 SHA512 13b36eb6a943f9513987a23dab467b2e449cc3a4de35227f8323c3c724b27f19daac500602141ab22a04579243333c8484ce27a7f73e46a72e796d30fb1c3253 +EBUILD dune-configurator-2.8.2-r1.ebuild 3690 BLAKE2B 9924f03dfcb3aea4d18f6aad506875adcac52853279895dd02d334e9453a813cda55d9dd03ef75cf4f28c26a985644f16e359c31f1b4344d0a0d0d63280e71ab SHA512 da7e364dab740d7210662f626dc1160a3ff83a81a880fd6a4132bc64a749f07e44a1a127961c930027cd600e76dbe2438f1b284a9400310d09d6fa0ab1605b08 +EBUILD dune-configurator-2.8.4.ebuild 4118 BLAKE2B 1754774ccc4d32b252bb6fcf33b735051d8a6eb811bf520ccae53db0bcc28ef7b626cb5d543fda9fe0d08b8106afaad7d1490cf5c312e71f481c7dca55aa6bcc SHA512 af6f4ed4d33ef40018356f9dac5acce992ca8f4dcb34e566da2a1a3801490490df28ed3308656d60edf763059490d7a0f8834f9ac17763ecde2f7a6e7a02600d MISC metadata.xml 412 BLAKE2B 1ac46aa4fe2b5f531debe5c283c36db66a98d2120ceaa389bb2fe5c9c989a8185d0c66df879bfcd65f89e6e304359beadd632e445220a633887237bc9159ad8d SHA512 74df6c8368d4283dbda004fba147e5fa5c82165dc6a7553bf61f49d93ef7283160f6c193505d42f4043e2d3ac3227d4d29ee99827845726f146603088a61d76a diff --git a/dev-ml/dune-configurator/dune-configurator-2.7.1.ebuild b/dev-ml/dune-configurator/dune-configurator-2.7.1.ebuild deleted file mode 100644 index 1238e8b1367f..000000000000 --- a/dev-ml/dune-configurator/dune-configurator-2.7.1.ebuild +++ /dev/null @@ -1,31 +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" -S="${WORKDIR}/dune-${PV}" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86" -IUSE="+ocamlopt test" -RESTRICT="!test? ( test )" - -DEPEND=" - ~dev-ml/dune-private-libs-${PV}:= - dev-ml/csexp:= -" -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} - test? ( - dev-ml/ppx_expect - )" - -src_configure(){ - : -} diff --git a/dev-ml/dune-configurator/dune-configurator-2.8.2-r1.ebuild b/dev-ml/dune-configurator/dune-configurator-2.8.2-r1.ebuild index 332128aa98c0..acd4036fd3ae 100644 --- a/dev-ml/dune-configurator/dune-configurator-2.8.2-r1.ebuild +++ b/dev-ml/dune-configurator/dune-configurator-2.8.2-r1.ebuild @@ -12,7 +12,7 @@ S="${WORKDIR}/dune-${PV}" LICENSE="MIT" 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-configurator/dune-configurator-2.8.4.ebuild b/dev-ml/dune-configurator/dune-configurator-2.8.4.ebuild new file mode 100644 index 000000000000..56fa50bd7cf5 --- /dev/null +++ b/dev-ml/dune-configurator/dune-configurator-2.8.4.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(){ + : +} |