diff options
Diffstat (limited to 'dev-ml')
83 files changed, 233 insertions, 2249 deletions
diff --git a/dev-ml/camlp4/camlp4-4.09_p1-r2.ebuild b/dev-ml/camlp4/camlp4-4.09_p1-r2.ebuild index 81cf455621fd..05a4cf801fd7 100644 --- a/dev-ml/camlp4/camlp4-4.09_p1-r2.ebuild +++ b/dev-ml/camlp4/camlp4-4.09_p1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SRC_URI="https://github.com/camlp4/camlp4/archive/${MY_PV}.tar.gz -> ${P}.tar.gz LICENSE="LGPL-2-with-linking-exception" SLOT="0/${PV}" -KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 x86 ~amd64-linux ~x86-linux" IUSE="+ocamlopt" RDEPEND="dev-lang/ocaml:0/4.09[ocamlopt?]" diff --git a/dev-ml/camlp4/camlp4-4.10_p1-r3.ebuild b/dev-ml/camlp4/camlp4-4.10_p1-r3.ebuild index 64641f012733..f5fc29bf853a 100644 --- a/dev-ml/camlp4/camlp4-4.10_p1-r3.ebuild +++ b/dev-ml/camlp4/camlp4-4.10_p1-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SRC_URI="https://github.com/camlp4/camlp4/archive/${MY_PV}.tar.gz -> ${P}.tar.gz LICENSE="LGPL-2-with-linking-exception" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" IUSE="+ocamlopt" RDEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]" diff --git a/dev-ml/camlp4/camlp4-4.11_p1-r3.ebuild b/dev-ml/camlp4/camlp4-4.11_p1-r3.ebuild index b3c8eb765030..37fcd6a79b2a 100644 --- a/dev-ml/camlp4/camlp4-4.11_p1-r3.ebuild +++ b/dev-ml/camlp4/camlp4-4.11_p1-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SRC_URI="https://github.com/camlp4/camlp4/archive/${MY_PV}.tar.gz -> ${P}.tar.gz LICENSE="LGPL-2-with-linking-exception" SLOT="0/${PV}" -KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 x86 ~amd64-linux ~x86-linux" IUSE="+ocamlopt" RDEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]" diff --git a/dev-ml/camlp4/camlp4-4.12-r2.ebuild b/dev-ml/camlp4/camlp4-4.12-r2.ebuild index 64641f012733..f5fc29bf853a 100644 --- a/dev-ml/camlp4/camlp4-4.12-r2.ebuild +++ b/dev-ml/camlp4/camlp4-4.12-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SRC_URI="https://github.com/camlp4/camlp4/archive/${MY_PV}.tar.gz -> ${P}.tar.gz LICENSE="LGPL-2-with-linking-exception" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" IUSE="+ocamlopt" RDEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]" diff --git a/dev-ml/camlp4/camlp4-4.13-r2.ebuild b/dev-ml/camlp4/camlp4-4.13-r2.ebuild index 64641f012733..f5fc29bf853a 100644 --- a/dev-ml/camlp4/camlp4-4.13-r2.ebuild +++ b/dev-ml/camlp4/camlp4-4.13-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SRC_URI="https://github.com/camlp4/camlp4/archive/${MY_PV}.tar.gz -> ${P}.tar.gz LICENSE="LGPL-2-with-linking-exception" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" IUSE="+ocamlopt" RDEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]" diff --git a/dev-ml/camlp4/camlp4-4.14_p1-r2.ebuild b/dev-ml/camlp4/camlp4-4.14_p1-r2.ebuild index 9f7b215b7642..d46fb9fb9a43 100644 --- a/dev-ml/camlp4/camlp4-4.14_p1-r2.ebuild +++ b/dev-ml/camlp4/camlp4-4.14_p1-r2.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}"/${P/_p/-} LICENSE="LGPL-2-with-linking-exception" SLOT="0/${PV}" -KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 x86 ~amd64-linux ~x86-linux" IUSE="+ocamlopt" RDEPEND="=dev-lang/ocaml-4.14*:=[ocamlopt?]" diff --git a/dev-ml/camlpdf/Manifest b/dev-ml/camlpdf/Manifest index fce797256b8e..ee79105caf4e 100644 --- a/dev-ml/camlpdf/Manifest +++ b/dev-ml/camlpdf/Manifest @@ -1 +1 @@ -DIST camlpdf-2.3.1.tar.gz 601531 BLAKE2B 9534baf9165e7dc48ae37a3fcaabb236e437845ef4e0a60a1c08874a2b240c9b1e96de5bbd6028a3ca87992221773dea34c31b0fa24e9c143632756954baf132 SHA512 0b8d91b6090221f996aee52f22f153a4b74cb85a127bbd5f84492ede8a0a581971a2349281b3879d6c37f4d5d267da583e7e8871372d97a3d636abc3231cb007 +DIST camlpdf-2.7.1.tar.gz 841886 BLAKE2B 30215949fab2517e00cf520ef4f79a6fbf49173e7e2643ac1a47d0dd945063908de2928f7181d2182ad4fe51945bb3f6a89a54aa236a889ea392cd126ef856c8 SHA512 2480a282a6ce09444ed14a3f41561375ecf7e3c57f7559a48ad9791d9f824e59820bfd39aa36910ff6bdc9b160cef76ab90dbbfe628c836c3f5c5081dfd5e452 diff --git a/dev-ml/camlpdf/camlpdf-2.3.1.ebuild b/dev-ml/camlpdf/camlpdf-2.7.1.ebuild index 965e0ef70c14..1aada1b8ee02 100644 --- a/dev-ml/camlpdf/camlpdf-2.3.1.ebuild +++ b/dev-ml/camlpdf/camlpdf-2.7.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit findlib @@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/johnwhitington/camlpdf/" SRC_URI="https://github.com/johnwhitington/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" # technically LGPL-2.1+ with linking exception -LICENSE="LGPL-2.1-with-linking-exception" +LICENSE="LGPL-2.1-with-linking-exception LGPL-2.1+" SLOT="0/${PV}" KEYWORDS="~amd64 ~x86" IUSE="doc examples" diff --git a/dev-ml/camlpdf/metadata.xml b/dev-ml/camlpdf/metadata.xml index fce9dcd784fb..930714b49b52 100644 --- a/dev-ml/camlpdf/metadata.xml +++ b/dev-ml/camlpdf/metadata.xml @@ -1,7 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person" proxied="yes"> + <email>ivan.lloro.boada@gmail.com</email> + <name>Ivan Lloro</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <upstream> <remote-id type="github">johnwhitington/camlpdf</remote-id> </upstream> diff --git a/dev-ml/coq-menhirlib/Manifest b/dev-ml/coq-menhirlib/Manifest index 0b5871c9537f..9d973d98196d 100644 --- a/dev-ml/coq-menhirlib/Manifest +++ b/dev-ml/coq-menhirlib/Manifest @@ -1,2 +1,2 @@ -DIST menhir-20220210.tar.bz2 1160357 BLAKE2B a9401b50db4dfdfe56c5c10919d4d385cbb7bf27d1518932e55d6757c08989407cda17c65f72d20e21738618e4f97f20b10098c9185f3882b3391aab7f9f8bc9 SHA512 8a852e995cab57b16adc1b7708d3acdf5f8b65d13dbf907a4155ff45d71dccc65868fe369590b48a3f06d8319f74777ce2e9be05caa9dbe060c0ae3a2b37943f DIST menhir-20231231.tar.bz2 1245465 BLAKE2B 4ac27f693c9b0f34cf6f9c60343cba6c81cc5b4dc278df4da5c16de8484438238efc6e3e985b9f03676f72cc74a0153ea81fd93d057dd2914b86fe1f558d1f9f SHA512 6bcc3d32b9085e407d7ed7abc87bbbb7dcde52da7f5f343cbcf136df4aa2a9b640a94c3b809a125773d186d03bf9b806f9430dbc4a39ded7dd8ef685b1b1a65d +DIST menhir-20240715.tar.bz2 1245971 BLAKE2B b5f1a1fb234dd53e1d3f77b095e2721f8d2af354a3aa36da2b993dc9f699767bb7c98aae13316ff3405b8bcf80f9ba3addc824ace59f5548613f0f93d105adf7 SHA512 b18da35517702dbdab0d9f5819ad711f61f2ed13ec9e51db71b92fa2d6604cbf28aa6d684c36a41364324694ebbc5dc6aaed4dbb3779c14b399e49ded6fd5db6 diff --git a/dev-ml/coq-menhirlib/coq-menhirlib-20220210.ebuild b/dev-ml/coq-menhirlib/coq-menhirlib-20220210.ebuild deleted file mode 100644 index f0f543ec6276..000000000000 --- a/dev-ml/coq-menhirlib/coq-menhirlib-20220210.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit dune - -DESCRIPTION="A support library for verified Coq parsers produced by Menhir" -HOMEPAGE="http://gallium.inria.fr/~fpottier/menhir/" -SRC_URI="https://gitlab.inria.fr/fpottier/menhir/-/archive/${PV}/menhir-${PV}.tar.bz2" -S="${WORKDIR}"/menhir-${PV} - -LICENSE="GPL-2 LGPL-2-with-linking-exception" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="+ocamlopt" - -RDEPEND=" - >=dev-ml/menhir-${PV}:= - sci-mathematics/coq:= -" -DEPEND="${RDEPEND}" - -src_compile() { - emake -C ${PN} - dune build @install --profile release -p ${PN} || die -} - -src_install() { - emake -C ${PN} DESTDIR="${D}" install - dune_src_install ${PN} - - dodoc ${PN}/CHANGES.md ${PN}/README.md -} diff --git a/dev-ml/coq-menhirlib/coq-menhirlib-20231231-r1.ebuild b/dev-ml/coq-menhirlib/coq-menhirlib-20231231-r1.ebuild new file mode 100644 index 000000000000..c4426fec14fc --- /dev/null +++ b/dev-ml/coq-menhirlib/coq-menhirlib-20231231-r1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="A support library for verified Coq parsers produced by Menhir" +HOMEPAGE="http://gallium.inria.fr/~fpottier/menhir/" + +if [[ "${PV}" == *9999* ]] ; then + inherit git-r3 + + EGIT_REPO_URI="https://gitlab.inria.fr/fpottier/menhir.git" +else + SRC_URI="https://gitlab.inria.fr/fpottier/menhir/-/archive/${PV}/menhir-${PV}.tar.bz2" + S="${WORKDIR}/menhir-${PV}" + + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-2 LGPL-2-with-linking-exception" +SLOT="0/${PV}" +IUSE="+ocamlopt" + +RDEPEND=" + <sci-mathematics/coq-8.20.0:= + >=dev-ml/menhir-${PV}:= +" +DEPEND=" + ${RDEPEND} +" + +src_compile() { + emake -C "${PN}" + edune build @install --profile release -p "${PN}" || die +} + +src_install() { + emake -C "${PN}" DESTDIR="${D}" install + dune_src_install + + dodoc "${PN}/CHANGES.md" "${PN}/README.md" +} diff --git a/dev-ml/coq-menhirlib/coq-menhirlib-20231231.ebuild b/dev-ml/coq-menhirlib/coq-menhirlib-20240715.ebuild index dbad929b5119..dbad929b5119 100644 --- a/dev-ml/coq-menhirlib/coq-menhirlib-20231231.ebuild +++ b/dev-ml/coq-menhirlib/coq-menhirlib-20240715.ebuild diff --git a/dev-ml/dune-build-info/Manifest b/dev-ml/dune-build-info/Manifest index b1a8f56fd48a..11a5b6eec098 100644 --- a/dev-ml/dune-build-info/Manifest +++ b/dev-ml/dune-build-info/Manifest @@ -1,8 +1,3 @@ DIST dune-2.9.1.tar.gz 1385381 BLAKE2B 27224f803547d02f7110dcfc486ef41f9a4586f6f862ef7f8bbf05cc1f3f6dc8ea03fca99c01842f4226ea3d08f4127daa0e5811dd46cc00f1b96ad7eaafe43d SHA512 4fcff34de4acc4429dd73864ca90e695d8ba436839fd679608f7db292e44be70c3db455a58f59477f2055f84ce497bfa8e90e485ed9536acad3c1b3be3d4be77 DIST dune-2.9.3.tar.gz 1387667 BLAKE2B 3db54c780b9d13f40c774f53c3fe471dba4a640e7cb5aa5d70ef1dc20a217b95a66149ca5f99f07f3a20450577d622e0cda149f656f06f5a42231b89667c1152 SHA512 df6e06a9beebf41f3ed375384be781b5c87c7949048995cc0bbad13dd65c96bd8b27415cd41e43b1112bd86524a59a7dd418e14b5c72b4f1f8fd4ac5ca2d1494 -DIST dune-3.10.0.tar.gz 2640800 BLAKE2B 5fc479a91ee6792f07a4fb61af530d55f46dea56b2fd5919975c0bfb231229395e7d0769bdae88419a89d378b8d7e2b229f7410ce7a34414629aa5117e606230 SHA512 2884a4eaaa44164ce911286ca6670b548a4a564e2b5040f05405d1d2729af84083fbfdde7c92db4f6f7a54d15a43fc9dddcec19d8d79d5a66221b2be861473de -DIST dune-3.11.1.tar.gz 2753844 BLAKE2B de80e4be355fe7c6f04f0004fbf28dac18c803fb055bd74a1c30a8983f8a234a487244561bd622f3330cfb55670163355c2a1647e847d2e3966690a62a10b644 SHA512 8d2eef71ae04a95b1d69784311726cafc3b275e1f202851eb116d6e7740015ce2453ec00278ef3b28c0b1544b10dbff36d942b063d7bb0ebc0a03a9a5f8261d4 -DIST dune-3.13.1.tar.gz 2891852 BLAKE2B 88cee2428134ddcd6b929915b6bbeb2d17be8b8190f963919a74c63ffcf80f596fb1556f88c41ee602b2386e02fdf396596a6b2097d67c720bd00e16cdda3a57 SHA512 910d4ddd55a91ee65d8ea35b8915506db74c924eb3b67f7b0715da5599ee5088ea3edec81ce6735addd5b17234e445608e59fa353b83e991c14768d83c97a2b5 DIST dune-3.16.0.tar.gz 2999701 BLAKE2B 5e371fa1003cec31273aeeb1a830036f48d3734588bd7a980b57aaae30d4984a34dec6f9be0ee9985c72dee08c2c6d456a789eab83cfce42c142a3abc6951b2e SHA512 3b1d041907128b6598e0f6150fe300a4a69098822f823ceead63b46e1005a21485738c6fa92641dd940c9f9cde48ae141ea51959a9b250bee3cbeb06ba788e23 -DIST dune-3.6.1.tar.gz 1843804 BLAKE2B 1e7bf67b596f60a553f00cfd8287ce36ef4ff5b8d8f16465df3f3b7b6d332ceef5101057df9389aeb9ceb4dc7f23bc69320412aebba7587deeb933a0f8ddca46 SHA512 2db83116a3d0995c8d0dfd6a1581d214f657a7d90c30dea04d5370327e13c575fed6ce74106a79c2e2fe0c02aa2912ae7a9f4e49c36985fb613b6a41de0700c9 -DIST dune-3.7.1.tar.gz 2011275 BLAKE2B dd0f473a720fc65ac550a2aab64930ff472a9bd306d603f088d813817df56148f676abe2a56ff3458bb1ed887784e565154eee08988bf984585b35bc9333d929 SHA512 d741b2a92e970f9747240d4356045f46447238f7c8d8c47ba0b1cad96b8194461a47fa315d86a1eef2033a4d38001c999e6033c31b0c75a311367fb78ea12b6b diff --git a/dev-ml/dune-build-info/dune-build-info-3.10.0.ebuild b/dev-ml/dune-build-info/dune-build-info-3.10.0.ebuild deleted file mode 100644 index 454c8af30a23..000000000000 --- a/dev-ml/dune-build-info/dune-build-info-3.10.0.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit dune multiprocessing - -DESCRIPTION="Embed locations informations inside executable and libraries" -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 ppc64 x86" -IUSE="+ocamlopt" -RESTRICT="test" - -RDEPEND=">=dev-ml/dune-3.5" -DEPEND="${RDEPEND}" - -src_configure() { - : -} - -src_compile() { - dune build -p ${PN} @install --display short -j $(makeopts_jobs) || die -} diff --git a/dev-ml/dune-build-info/dune-build-info-3.11.1.ebuild b/dev-ml/dune-build-info/dune-build-info-3.11.1.ebuild deleted file mode 100644 index 71d9ca2ca130..000000000000 --- a/dev-ml/dune-build-info/dune-build-info-3.11.1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit dune - -DESCRIPTION="Embed locations informations inside executable and libraries" -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 ~ppc64 ~x86" -IUSE="+ocamlopt" -RESTRICT="test" - -RDEPEND=">=dev-ml/dune-3.5" -DEPEND="${RDEPEND}" - -src_configure() { - : -} - -src_compile() { - dune-compile ${PN} -} diff --git a/dev-ml/dune-build-info/dune-build-info-3.13.1.ebuild b/dev-ml/dune-build-info/dune-build-info-3.13.1.ebuild deleted file mode 100644 index 71d9ca2ca130..000000000000 --- a/dev-ml/dune-build-info/dune-build-info-3.13.1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit dune - -DESCRIPTION="Embed locations informations inside executable and libraries" -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 ~ppc64 ~x86" -IUSE="+ocamlopt" -RESTRICT="test" - -RDEPEND=">=dev-ml/dune-3.5" -DEPEND="${RDEPEND}" - -src_configure() { - : -} - -src_compile() { - dune-compile ${PN} -} diff --git a/dev-ml/dune-build-info/dune-build-info-3.16.0.ebuild b/dev-ml/dune-build-info/dune-build-info-3.16.0.ebuild index a3661b549fcb..cc218b53551f 100644 --- a/dev-ml/dune-build-info/dune-build-info-3.16.0.ebuild +++ b/dev-ml/dune-build-info/dune-build-info-3.16.0.ebuild @@ -12,7 +12,7 @@ S="${WORKDIR}/dune-${PV}" LICENSE="MIT" SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc64 ~x86" +KEYWORDS="amd64 ppc64 x86" IUSE="+ocamlopt" RESTRICT="test" diff --git a/dev-ml/dune-build-info/dune-build-info-3.6.1.ebuild b/dev-ml/dune-build-info/dune-build-info-3.6.1.ebuild deleted file mode 100644 index a45a35cb43fa..000000000000 --- a/dev-ml/dune-build-info/dune-build-info-3.6.1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit dune multiprocessing - -DESCRIPTION="Embed locations informations inside executable and libraries" -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 x86" -IUSE="+ocamlopt" -RESTRICT="test" - -RDEPEND=">=dev-ml/dune-3.5" -DEPEND="${RDEPEND}" - -src_configure() { - : -} - -src_compile() { - dune build -p ${PN} @install --display short -j $(makeopts_jobs) || die -} diff --git a/dev-ml/dune-build-info/dune-build-info-3.7.1.ebuild b/dev-ml/dune-build-info/dune-build-info-3.7.1.ebuild deleted file mode 100644 index 961e37103360..000000000000 --- a/dev-ml/dune-build-info/dune-build-info-3.7.1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit dune multiprocessing - -DESCRIPTION="Embed locations informations inside executable and libraries" -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 ~x86" -IUSE="+ocamlopt" -RESTRICT="test" - -RDEPEND=">=dev-ml/dune-3.5" -DEPEND="${RDEPEND}" - -src_configure() { - : -} - -src_compile() { - dune build -p ${PN} @install --display short -j $(makeopts_jobs) || die -} diff --git a/dev-ml/dune-configurator/Manifest b/dev-ml/dune-configurator/Manifest index b1a8f56fd48a..11a5b6eec098 100644 --- a/dev-ml/dune-configurator/Manifest +++ b/dev-ml/dune-configurator/Manifest @@ -1,8 +1,3 @@ DIST dune-2.9.1.tar.gz 1385381 BLAKE2B 27224f803547d02f7110dcfc486ef41f9a4586f6f862ef7f8bbf05cc1f3f6dc8ea03fca99c01842f4226ea3d08f4127daa0e5811dd46cc00f1b96ad7eaafe43d SHA512 4fcff34de4acc4429dd73864ca90e695d8ba436839fd679608f7db292e44be70c3db455a58f59477f2055f84ce497bfa8e90e485ed9536acad3c1b3be3d4be77 DIST dune-2.9.3.tar.gz 1387667 BLAKE2B 3db54c780b9d13f40c774f53c3fe471dba4a640e7cb5aa5d70ef1dc20a217b95a66149ca5f99f07f3a20450577d622e0cda149f656f06f5a42231b89667c1152 SHA512 df6e06a9beebf41f3ed375384be781b5c87c7949048995cc0bbad13dd65c96bd8b27415cd41e43b1112bd86524a59a7dd418e14b5c72b4f1f8fd4ac5ca2d1494 -DIST dune-3.10.0.tar.gz 2640800 BLAKE2B 5fc479a91ee6792f07a4fb61af530d55f46dea56b2fd5919975c0bfb231229395e7d0769bdae88419a89d378b8d7e2b229f7410ce7a34414629aa5117e606230 SHA512 2884a4eaaa44164ce911286ca6670b548a4a564e2b5040f05405d1d2729af84083fbfdde7c92db4f6f7a54d15a43fc9dddcec19d8d79d5a66221b2be861473de -DIST dune-3.11.1.tar.gz 2753844 BLAKE2B de80e4be355fe7c6f04f0004fbf28dac18c803fb055bd74a1c30a8983f8a234a487244561bd622f3330cfb55670163355c2a1647e847d2e3966690a62a10b644 SHA512 8d2eef71ae04a95b1d69784311726cafc3b275e1f202851eb116d6e7740015ce2453ec00278ef3b28c0b1544b10dbff36d942b063d7bb0ebc0a03a9a5f8261d4 -DIST dune-3.13.1.tar.gz 2891852 BLAKE2B 88cee2428134ddcd6b929915b6bbeb2d17be8b8190f963919a74c63ffcf80f596fb1556f88c41ee602b2386e02fdf396596a6b2097d67c720bd00e16cdda3a57 SHA512 910d4ddd55a91ee65d8ea35b8915506db74c924eb3b67f7b0715da5599ee5088ea3edec81ce6735addd5b17234e445608e59fa353b83e991c14768d83c97a2b5 DIST dune-3.16.0.tar.gz 2999701 BLAKE2B 5e371fa1003cec31273aeeb1a830036f48d3734588bd7a980b57aaae30d4984a34dec6f9be0ee9985c72dee08c2c6d456a789eab83cfce42c142a3abc6951b2e SHA512 3b1d041907128b6598e0f6150fe300a4a69098822f823ceead63b46e1005a21485738c6fa92641dd940c9f9cde48ae141ea51959a9b250bee3cbeb06ba788e23 -DIST dune-3.6.1.tar.gz 1843804 BLAKE2B 1e7bf67b596f60a553f00cfd8287ce36ef4ff5b8d8f16465df3f3b7b6d332ceef5101057df9389aeb9ceb4dc7f23bc69320412aebba7587deeb933a0f8ddca46 SHA512 2db83116a3d0995c8d0dfd6a1581d214f657a7d90c30dea04d5370327e13c575fed6ce74106a79c2e2fe0c02aa2912ae7a9f4e49c36985fb613b6a41de0700c9 -DIST dune-3.7.1.tar.gz 2011275 BLAKE2B dd0f473a720fc65ac550a2aab64930ff472a9bd306d603f088d813817df56148f676abe2a56ff3458bb1ed887784e565154eee08988bf984585b35bc9333d929 SHA512 d741b2a92e970f9747240d4356045f46447238f7c8d8c47ba0b1cad96b8194461a47fa315d86a1eef2033a4d38001c999e6033c31b0c75a311367fb78ea12b6b diff --git a/dev-ml/dune-configurator/dune-configurator-3.10.0.ebuild b/dev-ml/dune-configurator/dune-configurator-3.10.0.ebuild deleted file mode 100644 index 61c47864a4a6..000000000000 --- a/dev-ml/dune-configurator/dune-configurator-3.10.0.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit dune multiprocessing - -DESCRIPTION="Helper library for gathering system configuration" -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 ~riscv x86" -IUSE="+ocamlopt" -RESTRICT="test" - -BDEPEND=">=dev-ml/dune-3.5" -DEPEND=" - >=dev-ml/csexp-1.5:=[ocamlopt?] -" -RDEPEND="${DEPEND}" - -src_prepare() { - default - - # This enables dune-configurator to use the vendored csexp module - sed -i 's/stdune.csexp/dune-configurator.csexp/' \ - vendor/csexp/src/dune || die -} - -src_configure() { - : -} - -src_compile() { - dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die -} diff --git a/dev-ml/dune-configurator/dune-configurator-3.11.1.ebuild b/dev-ml/dune-configurator/dune-configurator-3.11.1.ebuild deleted file mode 100644 index 14b792f18034..000000000000 --- a/dev-ml/dune-configurator/dune-configurator-3.11.1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit dune - -DESCRIPTION="Helper library for gathering system configuration" -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 ~riscv ~x86" -IUSE="+ocamlopt" -RESTRICT="test" - -BDEPEND=">=dev-ml/dune-3.5" -DEPEND=" - >=dev-ml/csexp-1.5:=[ocamlopt?] -" -RDEPEND="${DEPEND}" - -src_prepare() { - default - - # This enables dune-configurator to use the vendored csexp module - sed -i 's/stdune.csexp/dune-configurator.csexp/' \ - vendor/csexp/src/dune || die -} - -src_configure() { - : -} - -src_compile() { - dune-compile ${PN} -} diff --git a/dev-ml/dune-configurator/dune-configurator-3.13.1.ebuild b/dev-ml/dune-configurator/dune-configurator-3.13.1.ebuild deleted file mode 100644 index 14b792f18034..000000000000 --- a/dev-ml/dune-configurator/dune-configurator-3.13.1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit dune - -DESCRIPTION="Helper library for gathering system configuration" -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 ~riscv ~x86" -IUSE="+ocamlopt" -RESTRICT="test" - -BDEPEND=">=dev-ml/dune-3.5" -DEPEND=" - >=dev-ml/csexp-1.5:=[ocamlopt?] -" -RDEPEND="${DEPEND}" - -src_prepare() { - default - - # This enables dune-configurator to use the vendored csexp module - sed -i 's/stdune.csexp/dune-configurator.csexp/' \ - vendor/csexp/src/dune || die -} - -src_configure() { - : -} - -src_compile() { - dune-compile ${PN} -} diff --git a/dev-ml/dune-configurator/dune-configurator-3.16.0.ebuild b/dev-ml/dune-configurator/dune-configurator-3.16.0-r1.ebuild index 72cb74746f80..64655885dfcc 100644 --- a/dev-ml/dune-configurator/dune-configurator-3.16.0.ebuild +++ b/dev-ml/dune-configurator/dune-configurator-3.16.0-r1.ebuild @@ -12,7 +12,7 @@ S="${WORKDIR}/dune-${PV}" LICENSE="Apache-2.0" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" IUSE="+ocamlopt" RESTRICT="test" diff --git a/dev-ml/dune-configurator/dune-configurator-3.6.1.ebuild b/dev-ml/dune-configurator/dune-configurator-3.6.1.ebuild deleted file mode 100644 index 8b85e3fa414c..000000000000 --- a/dev-ml/dune-configurator/dune-configurator-3.6.1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit dune multiprocessing - -DESCRIPTION="Helper library for gathering system configuration" -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 ~riscv x86" -IUSE="+ocamlopt" -RESTRICT="test" - -BDEPEND=">=dev-ml/dune-3.5" -DEPEND=" - >=dev-ml/csexp-1.5:=[ocamlopt?] -" -RDEPEND="${DEPEND}" - -src_prepare() { - default - - # This enables dune-configurator to use the vendored csexp module - sed -i 's/stdune.csexp/dune-configurator.csexp/' \ - vendor/csexp/src/dune || die -} - -src_configure() { - : -} - -src_compile() { - dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die -} diff --git a/dev-ml/dune-configurator/dune-configurator-3.7.1.ebuild b/dev-ml/dune-configurator/dune-configurator-3.7.1.ebuild deleted file mode 100644 index 07cd96f97d34..000000000000 --- a/dev-ml/dune-configurator/dune-configurator-3.7.1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit dune multiprocessing - -DESCRIPTION="Helper library for gathering system configuration" -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 ~riscv ~x86" -IUSE="+ocamlopt" -RESTRICT="test" - -BDEPEND=">=dev-ml/dune-3.5" -DEPEND=" - >=dev-ml/csexp-1.5:=[ocamlopt?] -" -RDEPEND="${DEPEND}" - -src_prepare() { - default - - # This enables dune-configurator to use the vendored csexp module - sed -i 's/stdune.csexp/dune-configurator.csexp/' \ - vendor/csexp/src/dune || die -} - -src_configure() { - : -} - -src_compile() { - dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die -} diff --git a/dev-ml/dune-private-libs/Manifest b/dev-ml/dune-private-libs/Manifest index 4f329369c670..11a5b6eec098 100644 --- a/dev-ml/dune-private-libs/Manifest +++ b/dev-ml/dune-private-libs/Manifest @@ -1,9 +1,3 @@ -DIST dune-2.8.4.tar.gz 1372925 BLAKE2B 5b6d6738a0dc701d852e6cc59a1998f64c006d233f43a804b0b9b677a6eadda25aa20f52799c90910d361e4bc565636a50d218ad5d0a9927239adc5be36b3889 SHA512 13b36eb6a943f9513987a23dab467b2e449cc3a4de35227f8323c3c724b27f19daac500602141ab22a04579243333c8484ce27a7f73e46a72e796d30fb1c3253 DIST dune-2.9.1.tar.gz 1385381 BLAKE2B 27224f803547d02f7110dcfc486ef41f9a4586f6f862ef7f8bbf05cc1f3f6dc8ea03fca99c01842f4226ea3d08f4127daa0e5811dd46cc00f1b96ad7eaafe43d SHA512 4fcff34de4acc4429dd73864ca90e695d8ba436839fd679608f7db292e44be70c3db455a58f59477f2055f84ce497bfa8e90e485ed9536acad3c1b3be3d4be77 DIST dune-2.9.3.tar.gz 1387667 BLAKE2B 3db54c780b9d13f40c774f53c3fe471dba4a640e7cb5aa5d70ef1dc20a217b95a66149ca5f99f07f3a20450577d622e0cda149f656f06f5a42231b89667c1152 SHA512 df6e06a9beebf41f3ed375384be781b5c87c7949048995cc0bbad13dd65c96bd8b27415cd41e43b1112bd86524a59a7dd418e14b5c72b4f1f8fd4ac5ca2d1494 -DIST dune-3.10.0.tar.gz 2640800 BLAKE2B 5fc479a91ee6792f07a4fb61af530d55f46dea56b2fd5919975c0bfb231229395e7d0769bdae88419a89d378b8d7e2b229f7410ce7a34414629aa5117e606230 SHA512 2884a4eaaa44164ce911286ca6670b548a4a564e2b5040f05405d1d2729af84083fbfdde7c92db4f6f7a54d15a43fc9dddcec19d8d79d5a66221b2be861473de -DIST dune-3.11.1.tar.gz 2753844 BLAKE2B de80e4be355fe7c6f04f0004fbf28dac18c803fb055bd74a1c30a8983f8a234a487244561bd622f3330cfb55670163355c2a1647e847d2e3966690a62a10b644 SHA512 8d2eef71ae04a95b1d69784311726cafc3b275e1f202851eb116d6e7740015ce2453ec00278ef3b28c0b1544b10dbff36d942b063d7bb0ebc0a03a9a5f8261d4 -DIST dune-3.13.1.tar.gz 2891852 BLAKE2B 88cee2428134ddcd6b929915b6bbeb2d17be8b8190f963919a74c63ffcf80f596fb1556f88c41ee602b2386e02fdf396596a6b2097d67c720bd00e16cdda3a57 SHA512 910d4ddd55a91ee65d8ea35b8915506db74c924eb3b67f7b0715da5599ee5088ea3edec81ce6735addd5b17234e445608e59fa353b83e991c14768d83c97a2b5 DIST dune-3.16.0.tar.gz 2999701 BLAKE2B 5e371fa1003cec31273aeeb1a830036f48d3734588bd7a980b57aaae30d4984a34dec6f9be0ee9985c72dee08c2c6d456a789eab83cfce42c142a3abc6951b2e SHA512 3b1d041907128b6598e0f6150fe300a4a69098822f823ceead63b46e1005a21485738c6fa92641dd940c9f9cde48ae141ea51959a9b250bee3cbeb06ba788e23 -DIST dune-3.6.2.tar.gz 1906058 BLAKE2B 7bbf1f346805432015a0e2a20bbeb1d94bbdc9f10537d31129c70466f88713d6659fddae18ab48c95d1a97f5e7931d8a5505eb08b89a27b6193b82b059f1c29e SHA512 636f6cbccca588b576f36840b752fc17d4a46b4c0625262a43c10f948bbb9820bdbee752a8d9a5cf7d5b79987bf824bdef9a44ecf49696959c9f597c4950d7be -DIST dune-3.7.1.tar.gz 2011275 BLAKE2B dd0f473a720fc65ac550a2aab64930ff472a9bd306d603f088d813817df56148f676abe2a56ff3458bb1ed887784e565154eee08988bf984585b35bc9333d929 SHA512 d741b2a92e970f9747240d4356045f46447238f7c8d8c47ba0b1cad96b8194461a47fa315d86a1eef2033a4d38001c999e6033c31b0c75a311367fb78ea12b6b 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 deleted file mode 100644 index 17169982c7f9..000000000000 --- a/dev-ml/dune-private-libs/dune-private-libs-2.8.4.ebuild +++ /dev/null @@ -1,119 +0,0 @@ -# Copyright 1999-2022 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() { - : -} diff --git a/dev-ml/dune-private-libs/dune-private-libs-3.10.0.ebuild b/dev-ml/dune-private-libs/dune-private-libs-3.10.0.ebuild deleted file mode 100644 index b8d5b743c22b..000000000000 --- a/dev-ml/dune-private-libs/dune-private-libs-3.10.0.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit dune multiprocessing - -DESCRIPTION="Private libraries of Dune" -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 ~riscv x86" -IUSE="+ocamlopt" -RESTRICT="test" - -BDEPEND=">=dev-ml/dune-3.5" -DEPEND=" - >=dev-ml/csexp-1.5:=[ocamlopt?] - dev-ml/pp:=[ocamlopt?] - ~dev-ml/dyn-${PV}:=[ocamlopt?] - ~dev-ml/stdune-${PV}:=[ocamlopt?] - >=dev-lang/ocaml-4.08 -" -RDEPEND="${DEPEND}" - -src_configure() { - : -} - -src_compile() { - dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die -} diff --git a/dev-ml/dune-private-libs/dune-private-libs-3.11.1-r3.ebuild b/dev-ml/dune-private-libs/dune-private-libs-3.11.1-r3.ebuild deleted file mode 100644 index b8de85c41fbe..000000000000 --- a/dev-ml/dune-private-libs/dune-private-libs-3.11.1-r3.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit dune - -DESCRIPTION="Private libraries of Dune" -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 ~riscv ~x86" -IUSE="+ocamlopt" -RESTRICT="test" - -BDEPEND=">=dev-ml/dune-3.5" -DEPEND=" - dev-ml/csexp:=[ocamlopt?] -" -RDEPEND="${DEPEND} - !dev-ml/stdune - !dev-ml/dyn - !dev-ml/ordering -" - -src_configure() { - : -} - -src_compile() { - dune-compile ordering dyn stdune ${PN} -} - -src_install() { - dune-install ordering dyn stdune ${PN} -} diff --git a/dev-ml/dune-private-libs/dune-private-libs-3.13.1-r3.ebuild b/dev-ml/dune-private-libs/dune-private-libs-3.13.1-r3.ebuild deleted file mode 100644 index b8de85c41fbe..000000000000 --- a/dev-ml/dune-private-libs/dune-private-libs-3.13.1-r3.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit dune - -DESCRIPTION="Private libraries of Dune" -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 ~riscv ~x86" -IUSE="+ocamlopt" -RESTRICT="test" - -BDEPEND=">=dev-ml/dune-3.5" -DEPEND=" - dev-ml/csexp:=[ocamlopt?] -" -RDEPEND="${DEPEND} - !dev-ml/stdune - !dev-ml/dyn - !dev-ml/ordering -" - -src_configure() { - : -} - -src_compile() { - dune-compile ordering dyn stdune ${PN} -} - -src_install() { - dune-install ordering dyn stdune ${PN} -} diff --git a/dev-ml/dune-private-libs/dune-private-libs-3.16.0-r3.ebuild b/dev-ml/dune-private-libs/dune-private-libs-3.16.0-r4.ebuild index 073bf6fdcb07..5f18338cf9ee 100644 --- a/dev-ml/dune-private-libs/dune-private-libs-3.16.0-r3.ebuild +++ b/dev-ml/dune-private-libs/dune-private-libs-3.16.0-r4.ebuild @@ -13,7 +13,7 @@ S="${WORKDIR}/dune-${PV}" LICENSE="Apache-2.0" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" IUSE="+ocamlopt" RESTRICT="test" diff --git a/dev-ml/dune-private-libs/dune-private-libs-3.6.2.ebuild b/dev-ml/dune-private-libs/dune-private-libs-3.6.2.ebuild deleted file mode 100644 index 771cab1c65a7..000000000000 --- a/dev-ml/dune-private-libs/dune-private-libs-3.6.2.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit dune multiprocessing - -DESCRIPTION="Private libraries of Dune" -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 ~riscv x86" -IUSE="+ocamlopt" -RESTRICT="test" - -BDEPEND=">=dev-ml/dune-3.5" -DEPEND=" - >=dev-ml/csexp-1.5:=[ocamlopt?] - dev-ml/pp:=[ocamlopt?] - ~dev-ml/dyn-${PV}:=[ocamlopt?] - ~dev-ml/stdune-${PV}:=[ocamlopt?] - >=dev-lang/ocaml-4.08 -" -RDEPEND="${DEPEND}" - -src_configure() { - : -} - -src_compile() { - dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die -} diff --git a/dev-ml/dune-private-libs/dune-private-libs-3.7.1.ebuild b/dev-ml/dune-private-libs/dune-private-libs-3.7.1.ebuild deleted file mode 100644 index d78578db0848..000000000000 --- a/dev-ml/dune-private-libs/dune-private-libs-3.7.1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit dune multiprocessing - -DESCRIPTION="Private libraries of Dune" -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 ~riscv ~x86" -IUSE="+ocamlopt" -RESTRICT="test" - -BDEPEND=">=dev-ml/dune-3.5" -DEPEND=" - >=dev-ml/csexp-1.5:=[ocamlopt?] - dev-ml/pp:=[ocamlopt?] - ~dev-ml/dyn-${PV}:=[ocamlopt?] - ~dev-ml/stdune-${PV}:=[ocamlopt?] - >=dev-lang/ocaml-4.08 -" -RDEPEND="${DEPEND}" - -src_configure() { - : -} - -src_compile() { - dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die -} diff --git a/dev-ml/dune-site/Manifest b/dev-ml/dune-site/Manifest index 2b3b5583f199..0c7a900e152e 100644 --- a/dev-ml/dune-site/Manifest +++ b/dev-ml/dune-site/Manifest @@ -1,7 +1,2 @@ DIST dune-2.9.3.tar.gz 1387667 BLAKE2B 3db54c780b9d13f40c774f53c3fe471dba4a640e7cb5aa5d70ef1dc20a217b95a66149ca5f99f07f3a20450577d622e0cda149f656f06f5a42231b89667c1152 SHA512 df6e06a9beebf41f3ed375384be781b5c87c7949048995cc0bbad13dd65c96bd8b27415cd41e43b1112bd86524a59a7dd418e14b5c72b4f1f8fd4ac5ca2d1494 -DIST dune-3.10.0.tar.gz 2640800 BLAKE2B 5fc479a91ee6792f07a4fb61af530d55f46dea56b2fd5919975c0bfb231229395e7d0769bdae88419a89d378b8d7e2b229f7410ce7a34414629aa5117e606230 SHA512 2884a4eaaa44164ce911286ca6670b548a4a564e2b5040f05405d1d2729af84083fbfdde7c92db4f6f7a54d15a43fc9dddcec19d8d79d5a66221b2be861473de -DIST dune-3.11.1.tar.gz 2753844 BLAKE2B de80e4be355fe7c6f04f0004fbf28dac18c803fb055bd74a1c30a8983f8a234a487244561bd622f3330cfb55670163355c2a1647e847d2e3966690a62a10b644 SHA512 8d2eef71ae04a95b1d69784311726cafc3b275e1f202851eb116d6e7740015ce2453ec00278ef3b28c0b1544b10dbff36d942b063d7bb0ebc0a03a9a5f8261d4 -DIST dune-3.13.1.tar.gz 2891852 BLAKE2B 88cee2428134ddcd6b929915b6bbeb2d17be8b8190f963919a74c63ffcf80f596fb1556f88c41ee602b2386e02fdf396596a6b2097d67c720bd00e16cdda3a57 SHA512 910d4ddd55a91ee65d8ea35b8915506db74c924eb3b67f7b0715da5599ee5088ea3edec81ce6735addd5b17234e445608e59fa353b83e991c14768d83c97a2b5 DIST dune-3.16.0.tar.gz 2999701 BLAKE2B 5e371fa1003cec31273aeeb1a830036f48d3734588bd7a980b57aaae30d4984a34dec6f9be0ee9985c72dee08c2c6d456a789eab83cfce42c142a3abc6951b2e SHA512 3b1d041907128b6598e0f6150fe300a4a69098822f823ceead63b46e1005a21485738c6fa92641dd940c9f9cde48ae141ea51959a9b250bee3cbeb06ba788e23 -DIST dune-3.6.2.tar.gz 1906058 BLAKE2B 7bbf1f346805432015a0e2a20bbeb1d94bbdc9f10537d31129c70466f88713d6659fddae18ab48c95d1a97f5e7931d8a5505eb08b89a27b6193b82b059f1c29e SHA512 636f6cbccca588b576f36840b752fc17d4a46b4c0625262a43c10f948bbb9820bdbee752a8d9a5cf7d5b79987bf824bdef9a44ecf49696959c9f597c4950d7be -DIST dune-3.7.1.tar.gz 2011275 BLAKE2B dd0f473a720fc65ac550a2aab64930ff472a9bd306d603f088d813817df56148f676abe2a56ff3458bb1ed887784e565154eee08988bf984585b35bc9333d929 SHA512 d741b2a92e970f9747240d4356045f46447238f7c8d8c47ba0b1cad96b8194461a47fa315d86a1eef2033a4d38001c999e6033c31b0c75a311367fb78ea12b6b diff --git a/dev-ml/dune-site/dune-site-3.10.0.ebuild b/dev-ml/dune-site/dune-site-3.10.0.ebuild deleted file mode 100644 index 026b796bf660..000000000000 --- a/dev-ml/dune-site/dune-site-3.10.0.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit dune multiprocessing - -DESCRIPTION="Embed locations informations inside executable and libraries" -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" -RESTRICT="test" - -RDEPEND=" - ~dev-ml/dune-private-libs-${PV}:=[ocamlopt=] -" -DEPEND="${RDEPEND}" - -src_configure() { - : -} - -src_compile() { - dune build -p ${PN} @install -j $(makeopts_jobs) --display short || die -} diff --git a/dev-ml/dune-site/dune-site-3.11.1.ebuild b/dev-ml/dune-site/dune-site-3.11.1.ebuild deleted file mode 100644 index 189a22209544..000000000000 --- a/dev-ml/dune-site/dune-site-3.11.1.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit dune - -DESCRIPTION="Embed locations informations inside executable and libraries" -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" -RESTRICT="test" - -RDEPEND=" - ~dev-ml/dune-private-libs-${PV}:=[ocamlopt=] -" -DEPEND="${RDEPEND}" - -src_configure() { - : -} - -src_compile() { - dune-compile ${PN} -} diff --git a/dev-ml/dune-site/dune-site-3.13.1.ebuild b/dev-ml/dune-site/dune-site-3.13.1.ebuild deleted file mode 100644 index c4983f46bea7..000000000000 --- a/dev-ml/dune-site/dune-site-3.13.1.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit dune - -DESCRIPTION="Embed locations informations inside executable and libraries" -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" -RESTRICT="test" - -RDEPEND=" - >=dev-ml/dune-3.5 - ~dev-ml/dune-private-libs-${PV}:=[ocamlopt=] -" -DEPEND="${RDEPEND}" - -src_configure() { - : -} - -src_compile() { - dune-compile ${PN} -} diff --git a/dev-ml/dune-site/dune-site-3.16.0.ebuild b/dev-ml/dune-site/dune-site-3.16.0.ebuild index c36b83bf0449..ab76bac02f92 100644 --- a/dev-ml/dune-site/dune-site-3.16.0.ebuild +++ b/dev-ml/dune-site/dune-site-3.16.0.ebuild @@ -13,7 +13,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" RESTRICT="test" diff --git a/dev-ml/dune-site/dune-site-3.6.2.ebuild b/dev-ml/dune-site/dune-site-3.6.2.ebuild deleted file mode 100644 index d93c7b05f97d..000000000000 --- a/dev-ml/dune-site/dune-site-3.6.2.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit dune multiprocessing - -DESCRIPTION="Embed locations informations inside executable and libraries" -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 x86" -IUSE="+ocamlopt" -RESTRICT="test" - -RDEPEND=" - ~dev-ml/dune-private-libs-${PV}:=[ocamlopt=] -" -DEPEND="${RDEPEND}" - -src_configure() { - : -} - -src_compile() { - dune build -p ${PN} @install -j $(makeopts_jobs) --display short || die -} diff --git a/dev-ml/dune-site/dune-site-3.7.1.ebuild b/dev-ml/dune-site/dune-site-3.7.1.ebuild deleted file mode 100644 index 77728bf4e61b..000000000000 --- a/dev-ml/dune-site/dune-site-3.7.1.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit dune multiprocessing - -DESCRIPTION="Embed locations informations inside executable and libraries" -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" -RESTRICT="test" - -RDEPEND=" - ~dev-ml/dune-private-libs-${PV}:=[ocamlopt=] -" -DEPEND="${RDEPEND}" - -src_configure() { - : -} - -src_compile() { - dune build -p ${PN} @install -j $(makeopts_jobs) --display short || die -} diff --git a/dev-ml/dune/Manifest b/dev-ml/dune/Manifest index 41b50422137b..90b337f874e8 100644 --- a/dev-ml/dune/Manifest +++ b/dev-ml/dune/Manifest @@ -1,10 +1,5 @@ DIST dune-2.8.4.tar.gz 1372925 BLAKE2B 5b6d6738a0dc701d852e6cc59a1998f64c006d233f43a804b0b9b677a6eadda25aa20f52799c90910d361e4bc565636a50d218ad5d0a9927239adc5be36b3889 SHA512 13b36eb6a943f9513987a23dab467b2e449cc3a4de35227f8323c3c724b27f19daac500602141ab22a04579243333c8484ce27a7f73e46a72e796d30fb1c3253 DIST dune-2.9.1.tar.gz 1385381 BLAKE2B 27224f803547d02f7110dcfc486ef41f9a4586f6f862ef7f8bbf05cc1f3f6dc8ea03fca99c01842f4226ea3d08f4127daa0e5811dd46cc00f1b96ad7eaafe43d SHA512 4fcff34de4acc4429dd73864ca90e695d8ba436839fd679608f7db292e44be70c3db455a58f59477f2055f84ce497bfa8e90e485ed9536acad3c1b3be3d4be77 DIST dune-2.9.3.tar.gz 1387667 BLAKE2B 3db54c780b9d13f40c774f53c3fe471dba4a640e7cb5aa5d70ef1dc20a217b95a66149ca5f99f07f3a20450577d622e0cda149f656f06f5a42231b89667c1152 SHA512 df6e06a9beebf41f3ed375384be781b5c87c7949048995cc0bbad13dd65c96bd8b27415cd41e43b1112bd86524a59a7dd418e14b5c72b4f1f8fd4ac5ca2d1494 -DIST dune-3.10.0.tar.gz 2640800 BLAKE2B 5fc479a91ee6792f07a4fb61af530d55f46dea56b2fd5919975c0bfb231229395e7d0769bdae88419a89d378b8d7e2b229f7410ce7a34414629aa5117e606230 SHA512 2884a4eaaa44164ce911286ca6670b548a4a564e2b5040f05405d1d2729af84083fbfdde7c92db4f6f7a54d15a43fc9dddcec19d8d79d5a66221b2be861473de -DIST dune-3.11.1.tar.gz 2753844 BLAKE2B de80e4be355fe7c6f04f0004fbf28dac18c803fb055bd74a1c30a8983f8a234a487244561bd622f3330cfb55670163355c2a1647e847d2e3966690a62a10b644 SHA512 8d2eef71ae04a95b1d69784311726cafc3b275e1f202851eb116d6e7740015ce2453ec00278ef3b28c0b1544b10dbff36d942b063d7bb0ebc0a03a9a5f8261d4 DIST dune-3.13.1.tar.gz 2891852 BLAKE2B 88cee2428134ddcd6b929915b6bbeb2d17be8b8190f963919a74c63ffcf80f596fb1556f88c41ee602b2386e02fdf396596a6b2097d67c720bd00e16cdda3a57 SHA512 910d4ddd55a91ee65d8ea35b8915506db74c924eb3b67f7b0715da5599ee5088ea3edec81ce6735addd5b17234e445608e59fa353b83e991c14768d83c97a2b5 DIST dune-3.16.0.tar.gz 2999701 BLAKE2B 5e371fa1003cec31273aeeb1a830036f48d3734588bd7a980b57aaae30d4984a34dec6f9be0ee9985c72dee08c2c6d456a789eab83cfce42c142a3abc6951b2e SHA512 3b1d041907128b6598e0f6150fe300a4a69098822f823ceead63b46e1005a21485738c6fa92641dd940c9f9cde48ae141ea51959a9b250bee3cbeb06ba788e23 -DIST dune-3.6.2.tar.gz 1906058 BLAKE2B 7bbf1f346805432015a0e2a20bbeb1d94bbdc9f10537d31129c70466f88713d6659fddae18ab48c95d1a97f5e7931d8a5505eb08b89a27b6193b82b059f1c29e SHA512 636f6cbccca588b576f36840b752fc17d4a46b4c0625262a43c10f948bbb9820bdbee752a8d9a5cf7d5b79987bf824bdef9a44ecf49696959c9f597c4950d7be -DIST dune-3.7.0.tar.gz 2010139 BLAKE2B 045fc6ee033325b074aac869c32b55f243bc561b796adfb83011f7ef95352bc0d8161fbb563744286ef145323b59a2854534c4e366532894a1ba5ff78a615f32 SHA512 f83d55939513cf292d89cbc38dbe2431cf453c5d5cfdab2239946e2845d10ea57be8643bb8047fe82499bb21561e861dcd8b749c55a1ba18377996c6a0b48239 -DIST dune-3.7.1.tar.gz 2011275 BLAKE2B dd0f473a720fc65ac550a2aab64930ff472a9bd306d603f088d813817df56148f676abe2a56ff3458bb1ed887784e565154eee08988bf984585b35bc9333d929 SHA512 d741b2a92e970f9747240d4356045f46447238f7c8d8c47ba0b1cad96b8194461a47fa315d86a1eef2033a4d38001c999e6033c31b0c75a311367fb78ea12b6b diff --git a/dev-ml/dune/dune-3.10.0.ebuild b/dev-ml/dune/dune-3.10.0.ebuild deleted file mode 100644 index 7ce496828320..000000000000 --- a/dev-ml/dune/dune-3.10.0.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit multiprocessing elisp-common - -DESCRIPTION="A composable build system for OCaml" -HOMEPAGE="https://github.com/ocaml/dune" -SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" -IUSE="emacs" -RESTRICT="strip test" - -RDEPEND=" - >=dev-lang/ocaml-4.08:= - emacs? ( >=app-editors/emacs-23.1:* ) -" -DEPEND="${RDEPEND}" - -QA_FLAGS_IGNORED="usr/bin/dune" - -BYTECOMPFLAGS="-L ${S}/editor-integration/emacs" -SITEFILE="50${PN}-gentoo.el" - -src_prepare() { - default - - # This allows `dune --version` to output the correct version - # instead of "n/a" - sed -i "/^(name dune)/a (version ${PV})" dune-project || die -} - -src_configure() { - ./configure \ - --libdir="$(ocamlc -where)" \ - --mandir=/usr/share/man \ - --docdir=/usr/doc \ - --etcdir=/etc \ - --datadir=/usr/share \ - --sbindir=/usr/sbin \ - --bindir=/usr/bin \ - || die -} - -src_compile() { - ocaml boot/bootstrap.ml -j $(makeopts_jobs) --verbose || die - ./_boot/dune.exe build @install -p "${PN}" --profile dune-bootstrap \ - -j $(makeopts_jobs) --display short || die - - use emacs && elisp-compile editor-integration/emacs/*.el -} - -src_install() { - # OCaml generates textrels on 32-bit arches - if use arm || use ppc || use x86 ; then - export QA_TEXTRELS='.*' - fi - default - - dodir /usr/share/doc - mv "${ED}"/usr/doc/dune "${ED}"/usr/share/doc/${PF} || die - rmdir "${ED}"/usr/doc || die - - if use emacs ; then - elisp-install ${PN} editor-integration/emacs/*.el{,c} - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi -} diff --git a/dev-ml/dune/dune-3.11.1.ebuild b/dev-ml/dune/dune-3.11.1.ebuild deleted file mode 100644 index e2e51c3abce7..000000000000 --- a/dev-ml/dune/dune-3.11.1.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit multiprocessing elisp-common - -DESCRIPTION="A composable build system for OCaml" -HOMEPAGE="https://github.com/ocaml/dune" -SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" -IUSE="emacs" -RESTRICT="strip test" - -RDEPEND=" - >=dev-lang/ocaml-4.08:= - emacs? ( >=app-editors/emacs-23.1:* ) -" -DEPEND="${RDEPEND}" - -QA_FLAGS_IGNORED="usr/bin/dune" - -BYTECOMPFLAGS="-L ${S}/editor-integration/emacs" -SITEFILE="50${PN}-gentoo.el" - -src_prepare() { - default - - # This allows `dune --version` to output the correct version - # instead of "n/a" - sed -i "/^(name dune)/a (version ${PV})" dune-project || die -} - -src_configure() { - ./configure \ - --libdir="$(ocamlc -where)" \ - --mandir=/usr/share/man \ - --docdir=/usr/share/doc \ - --etcdir=/etc \ - --datadir=/usr/share \ - --sbindir=/usr/sbin \ - --bindir=/usr/bin \ - || die -} - -src_compile() { - ocaml boot/bootstrap.ml -j $(makeopts_jobs) --verbose || die - ./_boot/dune.exe build @install -p "${PN}" --profile dune-bootstrap \ - -j $(makeopts_jobs) --display short || die - - use emacs && elisp-compile editor-integration/emacs/*.el -} - -src_install() { - # OCaml generates textrels on 32-bit arches - if use arm || use ppc || use x86 ; then - export QA_TEXTRELS='.*' - fi - default - - mv "${ED}"/usr/share/doc/dune "${ED}"/usr/share/doc/${PF} || die - - if use emacs ; then - elisp-install ${PN} editor-integration/emacs/*.el{,c} - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi -} diff --git a/dev-ml/dune/dune-3.16.0.ebuild b/dev-ml/dune/dune-3.16.0.ebuild index e2e51c3abce7..a829fd201684 100644 --- a/dev-ml/dune/dune-3.16.0.ebuild +++ b/dev-ml/dune/dune-3.16.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" IUSE="emacs" RESTRICT="strip test" diff --git a/dev-ml/dune/dune-3.6.2.ebuild b/dev-ml/dune/dune-3.6.2.ebuild deleted file mode 100644 index fdcf2b0e013d..000000000000 --- a/dev-ml/dune/dune-3.6.2.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit multiprocessing elisp-common - -DESCRIPTION="A composable build system for OCaml" -HOMEPAGE="https://github.com/ocaml/dune" -SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" -IUSE="emacs" -RESTRICT="strip test" - -RDEPEND=" - >=dev-lang/ocaml-4.08:= - emacs? ( >=app-editors/emacs-23.1:* ) -" -DEPEND="${RDEPEND}" - -QA_FLAGS_IGNORED="usr/bin/dune" - -BYTECOMPFLAGS="-L ${S}/editor-integration/emacs" -SITEFILE="50${PN}-gentoo.el" - -src_prepare() { - default - - # This allows `dune --version` to output the correct version - # instead of "n/a" - sed -i "/^(name dune)/a (version ${PV})" dune-project || die -} - -src_configure() { - ./configure \ - --libdir="$(ocamlc -where)" \ - --mandir=/usr/share/man \ - --docdir=/usr/doc \ - --etcdir=/etc \ - --datadir=/usr/share \ - --sbindir=/usr/sbin \ - --bindir=/usr/bin \ - || die -} - -src_compile() { - ocaml boot/bootstrap.ml -j $(makeopts_jobs) --verbose || die - ./_boot/dune.exe build @install -p "${PN}" --profile dune-bootstrap \ - -j $(makeopts_jobs) --display short || die - - use emacs && elisp-compile editor-integration/emacs/*.el -} - -src_install() { - default - - dodir /usr/share/doc - mv "${ED}"/usr/doc/dune "${ED}"/usr/share/doc/${PF} || die - rmdir "${ED}"/usr/doc || die - - if use emacs ; then - elisp-install ${PN} editor-integration/emacs/*.el{,c} - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi -} diff --git a/dev-ml/dune/dune-3.7.0.ebuild b/dev-ml/dune/dune-3.7.0.ebuild deleted file mode 100644 index fdcf2b0e013d..000000000000 --- a/dev-ml/dune/dune-3.7.0.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit multiprocessing elisp-common - -DESCRIPTION="A composable build system for OCaml" -HOMEPAGE="https://github.com/ocaml/dune" -SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" -IUSE="emacs" -RESTRICT="strip test" - -RDEPEND=" - >=dev-lang/ocaml-4.08:= - emacs? ( >=app-editors/emacs-23.1:* ) -" -DEPEND="${RDEPEND}" - -QA_FLAGS_IGNORED="usr/bin/dune" - -BYTECOMPFLAGS="-L ${S}/editor-integration/emacs" -SITEFILE="50${PN}-gentoo.el" - -src_prepare() { - default - - # This allows `dune --version` to output the correct version - # instead of "n/a" - sed -i "/^(name dune)/a (version ${PV})" dune-project || die -} - -src_configure() { - ./configure \ - --libdir="$(ocamlc -where)" \ - --mandir=/usr/share/man \ - --docdir=/usr/doc \ - --etcdir=/etc \ - --datadir=/usr/share \ - --sbindir=/usr/sbin \ - --bindir=/usr/bin \ - || die -} - -src_compile() { - ocaml boot/bootstrap.ml -j $(makeopts_jobs) --verbose || die - ./_boot/dune.exe build @install -p "${PN}" --profile dune-bootstrap \ - -j $(makeopts_jobs) --display short || die - - use emacs && elisp-compile editor-integration/emacs/*.el -} - -src_install() { - default - - dodir /usr/share/doc - mv "${ED}"/usr/doc/dune "${ED}"/usr/share/doc/${PF} || die - rmdir "${ED}"/usr/doc || die - - if use emacs ; then - elisp-install ${PN} editor-integration/emacs/*.el{,c} - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi -} diff --git a/dev-ml/dune/dune-3.7.1.ebuild b/dev-ml/dune/dune-3.7.1.ebuild deleted file mode 100644 index 794b4c3542f2..000000000000 --- a/dev-ml/dune/dune-3.7.1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit multiprocessing elisp-common - -DESCRIPTION="A composable build system for OCaml" -HOMEPAGE="https://github.com/ocaml/dune" -SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" -IUSE="emacs" -RESTRICT="strip test" - -RDEPEND=" - >=dev-lang/ocaml-4.08:= - emacs? ( >=app-editors/emacs-23.1:* ) -" -DEPEND="${RDEPEND}" - -QA_FLAGS_IGNORED="usr/bin/dune" - -BYTECOMPFLAGS="-L ${S}/editor-integration/emacs" -SITEFILE="50${PN}-gentoo.el" - -src_prepare() { - default - - # This allows `dune --version` to output the correct version - # instead of "n/a" - sed -i "/^(name dune)/a (version ${PV})" dune-project || die -} - -src_configure() { - ./configure \ - --libdir="$(ocamlc -where)" \ - --mandir=/usr/share/man \ - --docdir=/usr/doc \ - --etcdir=/etc \ - --datadir=/usr/share \ - --sbindir=/usr/sbin \ - --bindir=/usr/bin \ - || die -} - -src_compile() { - ocaml boot/bootstrap.ml -j $(makeopts_jobs) --verbose || die - ./_boot/dune.exe build @install -p "${PN}" --profile dune-bootstrap \ - -j $(makeopts_jobs) --display short || die - - use emacs && elisp-compile editor-integration/emacs/*.el -} - -src_install() { - default - - dodir /usr/share/doc - mv "${ED}"/usr/doc/dune "${ED}"/usr/share/doc/${PF} || die - rmdir "${ED}"/usr/doc || die - - if use emacs ; then - elisp-install ${PN} editor-integration/emacs/*.el{,c} - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi -} diff --git a/dev-ml/findlib/findlib-1.8.1-r2.ebuild b/dev-ml/findlib/findlib-1.8.1-r2.ebuild index 5ff4e23161ab..742f380f547b 100644 --- a/dev-ml/findlib/findlib-1.8.1-r2.ebuild +++ b/dev-ml/findlib/findlib-1.8.1-r2.ebuild @@ -9,7 +9,7 @@ SRC_URI="http://download.camlcity.org/download/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="doc +ocamlopt tk" DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?] diff --git a/dev-ml/findlib/findlib-1.9.3.ebuild b/dev-ml/findlib/findlib-1.9.3.ebuild index 96186048ba26..802ff15902ce 100644 --- a/dev-ml/findlib/findlib-1.9.3.ebuild +++ b/dev-ml/findlib/findlib-1.9.3.ebuild @@ -9,7 +9,7 @@ SRC_URI="http://download.camlcity.org/download/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="doc +ocamlopt tk" DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?] diff --git a/dev-ml/findlib/findlib-1.9.5.ebuild b/dev-ml/findlib/findlib-1.9.5.ebuild index c25719598182..d6ca898b5093 100644 --- a/dev-ml/findlib/findlib-1.9.5.ebuild +++ b/dev-ml/findlib/findlib-1.9.5.ebuild @@ -9,7 +9,7 @@ SRC_URI="http://download.camlcity.org/download/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="doc +ocamlopt tk" DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?] diff --git a/dev-ml/findlib/findlib-1.9.6-r1.ebuild b/dev-ml/findlib/findlib-1.9.6-r1.ebuild index 265ac12c7f5c..9f49f0d6c20b 100644 --- a/dev-ml/findlib/findlib-1.9.6-r1.ebuild +++ b/dev-ml/findlib/findlib-1.9.6-r1.ebuild @@ -9,7 +9,7 @@ SRC_URI="http://download.camlcity.org/download/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="doc +ocamlopt tk" DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?] diff --git a/dev-ml/lablgl/lablgl-1.06-r1.ebuild b/dev-ml/lablgl/lablgl-1.06-r1.ebuild index ad423b758d54..02fdc47b1948 100644 --- a/dev-ml/lablgl/lablgl-1.06-r1.ebuild +++ b/dev-ml/lablgl/lablgl-1.06-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/garrigue/lablgl/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 x86 ~amd64-linux ~x86-linux" IUSE="doc glut +ocamlopt tk" RDEPEND=" diff --git a/dev-ml/lablgtk/lablgtk-2.18.10.ebuild b/dev-ml/lablgtk/lablgtk-2.18.10.ebuild index b19033a9bf51..583f5faaa2a1 100644 --- a/dev-ml/lablgtk/lablgtk-2.18.10.ebuild +++ b/dev-ml/lablgtk/lablgtk-2.18.10.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://github.com/garrigue/lablgtk/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="LGPL-2.1-with-linking-exception examples? ( lablgtk-examples )" SLOT="2/${PV}" -KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux" IUSE="debug examples glade gnomecanvas +ocamlopt sourceview spell svg" DEPEND=">=dev-lang/ocaml-4.05:=[ocamlopt?] diff --git a/dev-ml/lablgtk/lablgtk-2.18.13.ebuild b/dev-ml/lablgtk/lablgtk-2.18.13.ebuild index 3b62d5b68ad4..b959c4131e94 100644 --- a/dev-ml/lablgtk/lablgtk-2.18.13.ebuild +++ b/dev-ml/lablgtk/lablgtk-2.18.13.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://github.com/garrigue/lablgtk/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="LGPL-2.1-with-linking-exception examples? ( lablgtk-examples )" SLOT="2/${PV}" -KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux" IUSE="debug examples glade gnomecanvas +ocamlopt sourceview spell svg" DEPEND=">=dev-lang/ocaml-4.05:=[ocamlopt?] diff --git a/dev-ml/labltk/labltk-8.06.10-r1.ebuild b/dev-ml/labltk/labltk-8.06.10-r1.ebuild index e6d19e54776b..df02654b0011 100644 --- a/dev-ml/labltk/labltk-8.06.10-r1.ebuild +++ b/dev-ml/labltk/labltk-8.06.10-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-warnings LICENSE="QPL-1.0 LGPL-2" SLOT="0/${PV}" -KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 x86 ~amd64-linux ~x86-linux" IUSE="+ocamlopt X" RDEPEND="dev-lang/tk:= diff --git a/dev-ml/labltk/labltk-8.06.11-r1.ebuild b/dev-ml/labltk/labltk-8.06.11-r1.ebuild index 12f8405e4461..59c59df0ecee 100644 --- a/dev-ml/labltk/labltk-8.06.11-r1.ebuild +++ b/dev-ml/labltk/labltk-8.06.11-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/garrigue/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="QPL-1.0 LGPL-2" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" IUSE="+ocamlopt X" RDEPEND="dev-lang/tk:= diff --git a/dev-ml/labltk/labltk-8.06.12-r2.ebuild b/dev-ml/labltk/labltk-8.06.12-r2.ebuild index 4086f1f797c1..afa9197af4d6 100644 --- a/dev-ml/labltk/labltk-8.06.12-r2.ebuild +++ b/dev-ml/labltk/labltk-8.06.12-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/garrigue/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="QPL-1.0 LGPL-2" SLOT="0/${PV}" -KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux" IUSE="+ocamlopt X" RDEPEND="dev-lang/tk:= diff --git a/dev-ml/labltk/labltk-8.06.14.ebuild b/dev-ml/labltk/labltk-8.06.14.ebuild index 230eca287bba..5a4f7d3574ab 100644 --- a/dev-ml/labltk/labltk-8.06.14.ebuild +++ b/dev-ml/labltk/labltk-8.06.14.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/garrigue/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="QPL-1.0 LGPL-2" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" IUSE="+ocamlopt X" RDEPEND="dev-lang/tk:= diff --git a/dev-ml/labltk/labltk-8.06.7-r1.ebuild b/dev-ml/labltk/labltk-8.06.7-r1.ebuild index 58a37bddca04..56f6ff5cfec9 100644 --- a/dev-ml/labltk/labltk-8.06.7-r1.ebuild +++ b/dev-ml/labltk/labltk-8.06.7-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/garrigue/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="QPL-1.0 LGPL-2" SLOT="0/${PV}" -KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 x86 ~amd64-linux ~x86-linux" IUSE="+ocamlopt X" RDEPEND=">=dev-lang/tk-8.0.3:= diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest index e96e91af93d0..313d6bb898a9 100644 --- a/dev-ml/llvm-ocaml/Manifest +++ b/dev-ml/llvm-ocaml/Manifest @@ -6,6 +6,7 @@ DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e06541 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340 DIST llvm-project-18.1.8.src.tar.xz 132067260 BLAKE2B a950492f1dbfb874dff63b1ffef86468169ba2f211a9733ec2d4cf30040f7f277ef00f048bb44dee9f97d7d762f0f241f19e5a2a7b0b49217d3821ddfc8c354f SHA512 25eeee9984c8b4d0fbc240df90f33cbb000d3b0414baff5c8982beafcc5e59e7ef18f6f85d95b3a5f60cb3d4cd4f877c80487b5768bc21bc833f107698ad93db DIST llvm-project-18.1.8.src.tar.xz.sig 566 BLAKE2B 6ab0efc5b38d4483f4e32e8b85774b2edd5d88fdf29f23b88eb0b5130a7a7f0e80549612b025f927e92de4a08ff7c292cff224dbda91a5d598244e98f7ad0fbd SHA512 ddfd1e8a06756759af6cbe488c82a6d6a62ba91f3e8a0eb4cece561321824f5d165b08ed91010588790b76e19790931d2651b24dba8567e3b151d3cb43bec25b -DIST llvm-project-19.1.0-rc2.src.tar.xz 141264388 BLAKE2B 690b4912d9e4a8019b7990934dd6486362337ccb303dca119c0e75aa1063ad452222be1ee965e43b160dfcea20e491a20c289344152666b618712a1d76dc4780 SHA512 508a401e8433b1ac9a399246eb1a3c18faed7c3d41d8c118e77cefbb64cc6d6e171bd41a3e5584f6c84df141ba6819f1a1cce75b5c1ef33e3d2ac239e662d07c -DIST llvm-project-19.1.0-rc2.src.tar.xz.sig 438 BLAKE2B 1eaf10a1419ecf009c033a8f6ecb6eec86107d81621d5b4665c8d929b05f4845ce0c432017343d7b06f33e6ff6384df9e1d8fc7b9c6efe7f10ef69798891b7e5 SHA512 b46e9a1d40f891c5f3544d8cc6295900bff5dda9a4a526b8db55a42a37ae90deb216b316d2117984e82f4e918d15343e75b3b9e6d6c773866707c3398e032826 -DIST llvm-project-fd7d7882e7fa5a38d4bfde426120d4663718beb4.tar.gz 218217769 BLAKE2B a6c2aa012c342e31527b7e9f85e8fea3549d52530d8f87cd699e094a0aa768d099f9fd2631161ff7f53b4a5011937ed6d1f52b8fa1d23aa34183be1f487d4277 SHA512 c4863fab1a3c03f7f9c42f3501d3a75cebb491343515d77d30b26e5cbd720fc3fd628052099d87ed638e8c424bcbe7a1d066ed857f73da6f243d3d5a76b0e6c5 +DIST llvm-project-19.1.1.src.tar.xz 141244648 BLAKE2B 7c9250f99c8e5ae2097e89269ebf5bfdfb0fba8f67ab934377d24030c985013fe5475d0c9bd6d60a679e169772ad1723bc6e44ff9e4c7aed5627b9f1f1a2477a SHA512 84adab40ffb9ec236dbf203d86c08a0c2c651f98278a9d0936490c7901159eb26eabd3db9316013886b549426d4acb43b75d866f7dc670ab299bf93ba35b1891 +DIST llvm-project-19.1.1.src.tar.xz.sig 438 BLAKE2B 6967194abf6939291abc716f862a46ea7c5e195b98eebc26928a57dbd5034f82a8ecb5b7cc1b7c2428168309308b19df1c7db828703e80d3f7bf578e3542874d SHA512 07bb7bffb2b035417d702ca47be9d5759250f1a2cd57606855027d458ceb972a293b45d3d93bcda195588986acbb5eace60524f4aecdc0da7aeb3a8414c37c31 +DIST llvm-project-b837c9e289dab93c7f8a06876e3f70b6864f40ab.tar.gz 219631219 BLAKE2B d8a5d7de537ad91e94fc85dc0f624eba92f31cab2a345706250a66ad424fff151d5b86c430d993a35fd938095774411080cee4cab47a8258af348743dc145b56 SHA512 fe23f72b73553e3755af335a2a2a2225eafdcf2ed93191c9f4ac7bcf7b5b5391f73c2dccbb082279e0c7389a8f12b889a8d061389785cf9219ca861a8d4b41cc +DIST llvm-project-cde7b30268a85a3e7900a31534a97e7eb4de9236.tar.gz 219048549 BLAKE2B 53bdfea814b2cdf60bfdd27f6135b9f9d5156bdc78d22a361214399c5101b6fafaaefb9109377c1d977c67ebcb1feed69d6aaee0f2e38881480d68ac8be9b3d9 SHA512 0def6da5c2443753f37ba40a893b41dd5c7676b7be57102a5a6e820fe4fe235cad1da9a1c0eff1abc4c4ed5cc188522cae23afeddeee1876ea8ffde5c4f33b9f diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-19.1.1.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-19.1.1.ebuild new file mode 100644 index 000000000000..84bd71875fac --- /dev/null +++ b/dev-ml/llvm-ocaml/llvm-ocaml-19.1.1.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) +inherit cmake llvm.org llvm-utils python-any-r1 + +DESCRIPTION="OCaml bindings for LLVM" +HOMEPAGE="https://llvm.org/" + +LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="debug test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-lang/ocaml-4.00.0:0= + dev-ml/ocaml-ctypes:= + ~sys-devel/llvm-${PV}:=[debug?] + !sys-devel/llvm[ocaml(-)] +" + +DEPEND=" + ${RDEPEND} +" +BDEPEND=" + ${PYTHON_DEPS} + dev-lang/perl + dev-ml/findlib +" + +LLVM_COMPONENTS=( llvm cmake third-party ) +LLVM_USE_TARGETS=llvm +llvm.org_set_globals + +src_configure() { + llvm_prepend_path "${LLVM_MAJOR}" + + local libdir=$(get_libdir) + local mycmakeargs=( + -DLLVM_LIBDIR_SUFFIX=${libdir#lib} + + -DBUILD_SHARED_LIBS=OFF + -DLLVM_BUILD_LLVM_DYLIB=ON + -DLLVM_LINK_LLVM_DYLIB=ON + -DLLVM_OCAML_OUT_OF_TREE=ON + + # cheap hack: LLVM combines both anyway, and the only difference + # is that the former list is explicitly verified at cmake time + -DLLVM_TARGETS_TO_BUILD="" + -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}" + -DLLVM_BUILD_TESTS=$(usex test) + + # disable various irrelevant deps and settings + -DLLVM_ENABLE_FFI=OFF + -DLLVM_ENABLE_TERMINFO=OFF + -DHAVE_HISTEDIT_H=NO + -DLLVM_ENABLE_ASSERTIONS=$(usex debug) + -DLLVM_ENABLE_EH=ON + -DLLVM_ENABLE_RTTI=ON + + -DLLVM_HOST_TRIPLE="${CHOST}" + + -DPython3_EXECUTABLE="${PYTHON}" + + # TODO: ocamldoc + ) + + use test && mycmakeargs+=( + -DLLVM_LIT_ARGS="$(get_lit_flags)" + ) + + # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844 + # also: custom rules for OCaml do not work for CPPFLAGS + use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG" + cmake_src_configure + + local llvm_libdir=$(llvm-config --libdir) + # an ugly hack; TODO: figure out a way to pass -L to ocaml... + cd "${BUILD_DIR}/${libdir}" || die + ln -s "${llvm_libdir}"/*.so . || die + + if use test; then + local llvm_bindir=$(llvm-config --bindir) + # Force using system-installed tools. + sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \ + "${BUILD_DIR}"/test/lit.site.cfg.py || die + fi +} + +src_compile() { + cmake_build ocaml_all +} + +src_test() { + # respect TMPDIR! + local -x LIT_PRESERVES_TMP=1 + cmake_build check-llvm-bindings-ocaml +} + +src_install() { + DESTDIR="${D}" \ + cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die + + dodoc bindings/ocaml/README.txt +} diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-19.1.0_rc2.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-20.0.0_pre20240924.ebuild index 36b3716c0372..36b3716c0372 100644 --- a/dev-ml/llvm-ocaml/llvm-ocaml-19.1.0_rc2.ebuild +++ b/dev-ml/llvm-ocaml/llvm-ocaml-20.0.0_pre20240924.ebuild diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-20.0.0_pre20240808.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-20.0.0_pre20241004.ebuild index 36b3716c0372..36b3716c0372 100644 --- a/dev-ml/llvm-ocaml/llvm-ocaml-20.0.0_pre20240808.ebuild +++ b/dev-ml/llvm-ocaml/llvm-ocaml-20.0.0_pre20241004.ebuild diff --git a/dev-ml/mccs/mccs-1.1.17.ebuild b/dev-ml/mccs/mccs-1.1.17.ebuild index 6a857778b7e0..1aaea5e5d372 100644 --- a/dev-ml/mccs/mccs-1.1.17.ebuild +++ b/dev-ml/mccs/mccs-1.1.17.ebuild @@ -14,7 +14,7 @@ S="${WORKDIR}"/ocaml-${PN}-$(ver_rs 2 '-') LICENSE="|| ( LGPL-2.1 BSD GPL-3 )" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" IUSE="+ocamlopt test" RESTRICT="!test? ( test )" diff --git a/dev-ml/memtrace/memtrace-0.2.3.ebuild b/dev-ml/memtrace/memtrace-0.2.3.ebuild index 69511ccb9837..a67584bb3de2 100644 --- a/dev-ml/memtrace/memtrace-0.2.3.ebuild +++ b/dev-ml/memtrace/memtrace-0.2.3.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 inherit dune -DESCRIPTION="Streaming client for OCaml's Memprof " +DESCRIPTION="Streaming client for OCaml's Memprof" HOMEPAGE="https://github.com/janestreet/memtrace/" if [[ "${PV}" == *9999* ]] ; then diff --git a/dev-ml/memtrace/metadata.xml b/dev-ml/memtrace/metadata.xml index 52496b943271..7cafa41116e6 100644 --- a/dev-ml/memtrace/metadata.xml +++ b/dev-ml/memtrace/metadata.xml @@ -7,7 +7,7 @@ <name>ML</name> </maintainer> <upstream> - <bugs-to>https://gitlab.com/janestreet/memtrace/issues/</bugs-to> + <bugs-to>https://github.com/janestreet/memtrace/issues/</bugs-to> <remote-id type="github">janestreet/memtrace</remote-id> </upstream> </pkgmetadata> diff --git a/dev-ml/menhir/Manifest b/dev-ml/menhir/Manifest index 740a9a2896b1..47c773467fe6 100644 --- a/dev-ml/menhir/Manifest +++ b/dev-ml/menhir/Manifest @@ -1,2 +1,3 @@ DIST menhir-20230608.tar.bz2 1195032 BLAKE2B 6d39fb89a7e5dd862cbb868170d5d7156ccab6a3524fee711535497775bc65074256f2e228da532d3365473be7577e174b7ea075fd3b5b716a402ca575c401ae SHA512 6af16eeb1e43c89a2c60ed38da100cb591726e029e58d5313c05f81a317d63511c5e15c5aa334d1e96db182b51235bfa0a9905804d8232d868e1684a630af007 DIST menhir-20231231.tar.bz2 1245465 BLAKE2B 4ac27f693c9b0f34cf6f9c60343cba6c81cc5b4dc278df4da5c16de8484438238efc6e3e985b9f03676f72cc74a0153ea81fd93d057dd2914b86fe1f558d1f9f SHA512 6bcc3d32b9085e407d7ed7abc87bbbb7dcde52da7f5f343cbcf136df4aa2a9b640a94c3b809a125773d186d03bf9b806f9430dbc4a39ded7dd8ef685b1b1a65d +DIST menhir-20240715.tar.bz2 1245971 BLAKE2B b5f1a1fb234dd53e1d3f77b095e2721f8d2af354a3aa36da2b993dc9f699767bb7c98aae13316ff3405b8bcf80f9ba3addc824ace59f5548613f0f93d105adf7 SHA512 b18da35517702dbdab0d9f5819ad711f61f2ed13ec9e51db71b92fa2d6604cbf28aa6d684c36a41364324694ebbc5dc6aaed4dbb3779c14b399e49ded6fd5db6 diff --git a/dev-ml/menhir/menhir-20240715.ebuild b/dev-ml/menhir/menhir-20240715.ebuild new file mode 100644 index 000000000000..32130b511247 --- /dev/null +++ b/dev-ml/menhir/menhir-20240715.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="LR(1) parser generator for the OCaml language" +HOMEPAGE="http://gallium.inria.fr/~fpottier/menhir/" +SRC_URI="https://gitlab.inria.fr/fpottier/${PN}/-/archive/${PV}/${P}.tar.bz2" + +LICENSE="GPL-2 LGPL-2-with-linking-exception" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +src_install() { + dune_src_install menhir + dune_src_install menhirLib + dune_src_install menhirSdk +} diff --git a/dev-ml/merlin/merlin-4.13-r3.ebuild b/dev-ml/merlin/merlin-4.13-r4.ebuild index 18c16155ded7..d7c237c47237 100644 --- a/dev-ml/merlin/merlin-4.13-r3.ebuild +++ b/dev-ml/merlin/merlin-4.13-r4.ebuild @@ -22,11 +22,11 @@ RESTRICT="test" RDEPEND=" <dev-lang/ocaml-5 >=dev-lang/ocaml-4.14.1 - dev-lang/ocaml:=[ocamlopt?] + <dev-ml/menhir-20240715:= >=dev-ml/dune-2.9:= >=dev-ml/yojson-2.0.0:= + dev-lang/ocaml:=[ocamlopt?] dev-ml/csexp:= - dev-ml/menhir:= emacs? ( >=app-editors/emacs-23.1:* app-emacs/auto-complete diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.14.2-r1.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.14.2-r1.ebuild index 99a412886ea8..3ad1a0cb932c 100644 --- a/dev-ml/ocamlbuild/ocamlbuild-0.14.2-r1.ebuild +++ b/dev-ml/ocamlbuild/ocamlbuild-0.14.2-r1.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://github.com/ocaml/ocamlbuild/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="LGPL-2.1-with-linking-exception" SLOT="0/${PV}" -KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux" IUSE="+ocamlopt" RESTRICT="test" # Tests fail diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.14.3.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.14.3.ebuild index 43c87eabc97a..46636e4cf94c 100644 --- a/dev-ml/ocamlbuild/ocamlbuild-0.14.3.ebuild +++ b/dev-ml/ocamlbuild/ocamlbuild-0.14.3.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://github.com/ocaml/ocamlbuild/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="LGPL-2.1-with-linking-exception" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" IUSE="+ocamlopt" RESTRICT="test" # Tests fail diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.15.0.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.15.0.ebuild index 43c87eabc97a..46636e4cf94c 100644 --- a/dev-ml/ocamlbuild/ocamlbuild-0.15.0.ebuild +++ b/dev-ml/ocamlbuild/ocamlbuild-0.15.0.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://github.com/ocaml/ocamlbuild/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="LGPL-2.1-with-linking-exception" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" IUSE="+ocamlopt" RESTRICT="test" # Tests fail diff --git a/dev-ml/opam-client/files/debian-Port-to-Dose3-6.0.1.patch b/dev-ml/opam-client/files/debian-Port-to-Dose3-6.0.1.patch deleted file mode 100644 index a8af27416df1..000000000000 --- a/dev-ml/opam-client/files/debian-Port-to-Dose3-6.0.1.patch +++ /dev/null @@ -1,142 +0,0 @@ -From: Mehdi Dogguy <mehdi@debian.org> -Date: Sun, 28 Feb 2021 19:27:24 +0100 -Subject: Port to Dose3 6.0.1 - ---- - src/client/opamAdminCheck.ml | 2 ++ - src/client/opamAdminRepoUpgrade.ml | 2 ++ - src/solver/opamBuiltinMccs.ml.real | 2 +- - src/solver/opamCudf.ml | 5 ++++- - src/solver/opamCudf.mli | 4 ++-- - src/solver/opamCudfSolver.ml | 4 ++-- - src/solver/opamSolver.ml | 4 +++- - 7 files changed, 16 insertions(+), 7 deletions(-) - -diff --git a/src/client/opamAdminCheck.ml b/src/client/opamAdminCheck.ml -index 05543a2..f23bfc4 100644 ---- a/src/client/opamAdminCheck.ml -+++ b/src/client/opamAdminCheck.ml -@@ -8,6 +8,8 @@ - (* *) - (**************************************************************************) - -+module Algo = Dose_algo -+ - open OpamTypes - open OpamPackage.Set.Op - -diff --git a/src/client/opamAdminRepoUpgrade.ml b/src/client/opamAdminRepoUpgrade.ml -index 0be53b2..635e792 100644 ---- a/src/client/opamAdminRepoUpgrade.ml -+++ b/src/client/opamAdminRepoUpgrade.ml -@@ -8,6 +8,8 @@ - (* *) - (**************************************************************************) - -+module Algo = Dose_algo -+ - open OpamTypes - open OpamProcess.Job.Op - open OpamStd.Option.Op -diff --git a/src/solver/opamBuiltinMccs.ml.real b/src/solver/opamBuiltinMccs.ml.real -index ab39ab3..2b41982 100644 ---- a/src/solver/opamBuiltinMccs.ml.real -+++ b/src/solver/opamBuiltinMccs.ml.real -@@ -35,7 +35,7 @@ let call solver_backend ext ~criteria ?timeout cudf = - ~verbose:OpamCoreConfig.(!r.debug_level >= 2) - ?timeout criteria cudf - with -- | None -> raise Common.CudfSolver.Unsat -+ | None -> raise Dose_common.CudfSolver.Unsat - | Some (preamble, univ) -> Some preamble, univ - | exception Mccs.Timeout -> raise Timeout - -diff --git a/src/solver/opamCudf.ml b/src/solver/opamCudf.ml -index e07ff54..ad7293c 100644 ---- a/src/solver/opamCudf.ml -+++ b/src/solver/opamCudf.ml -@@ -9,6 +9,9 @@ - (* *) - (**************************************************************************) - -+module Common = Dose_common -+module Algo = Dose_algo -+ - open OpamTypes - open OpamTypesBase - -@@ -634,7 +637,7 @@ let call_external_solver ~version_map univ req = - let r = - Algo.Depsolver.check_request_using - ~call_solver:(OpamSolverConfig.call_solver ~criteria) -- ~criteria ~explain:true cudf_request -+ ~explain:true cudf_request - in - log "Solver call done in %.3f" (chrono ()); - r -diff --git a/src/solver/opamCudf.mli b/src/solver/opamCudf.mli -index cb8158d..c928ccf 100644 ---- a/src/solver/opamCudf.mli -+++ b/src/solver/opamCudf.mli -@@ -24,7 +24,7 @@ module Map: OpamStd.MAP with type key = Cudf.package - module Graph: sig - (** Graph of cudf packages *) - -- include module type of Algo.Defaultgraphs.PackageGraph.G -+ include module type of Dose_algo.Defaultgraphs.PackageGraph.G - - (** Build a graph from a CUDF universe. Warning: dependency edges are towards - the dependency, which is the reverse of what happens in the action -@@ -180,7 +180,7 @@ val string_of_vpkgs: Cudf_types.vpkg list -> string - - val make_conflicts: - version_map:int package_map -> Cudf.universe -> -- Algo.Diagnostic.diagnosis -> ('a, conflict) result -+ Dose_algo.Diagnostic.diagnosis -> ('a, conflict) result - val cycle_conflict: - version_map:int package_map -> Cudf.universe -> - string list list -> ('a, conflict) result -diff --git a/src/solver/opamCudfSolver.ml b/src/solver/opamCudfSolver.ml -index 03486f1..2651373 100644 ---- a/src/solver/opamCudfSolver.ml -+++ b/src/solver/opamCudfSolver.ml -@@ -57,7 +57,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) = - in - OpamFilename.remove solver_in; - if not (OpamFilename.exists solver_out) then -- raise (Common.CudfSolver.Error "no output") -+ raise (Dose_common.CudfSolver.Error "no output") - else if - (let ic = OpamFilename.open_in solver_out in - try -@@ -65,7 +65,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) = - i = "FAIL" - with End_of_file -> close_in ic; false) - then -- raise Common.CudfSolver.Unsat -+ raise Dose_common.CudfSolver.Unsat - else - let r = - Cudf_parser.load_solution_from_file -diff --git a/src/solver/opamSolver.ml b/src/solver/opamSolver.ml -index 3748e75..bbf995f 100644 ---- a/src/solver/opamSolver.ml -+++ b/src/solver/opamSolver.ml -@@ -9,6 +9,8 @@ - (* *) - (**************************************************************************) - -+module Algo = Dose_algo -+ - open OpamTypes - open OpamTypesBase - open OpamPackage.Set.Op -@@ -84,7 +86,7 @@ let cudf_versions_map universe packages = - pmap OpamPackage.Map.empty - - let name_to_cudf name = -- Common.CudfAdd.encode (OpamPackage.Name.to_string name) -+ Dose_common.CudfAdd.encode (OpamPackage.Name.to_string name) - - let constraint_to_cudf version_map name (op,v) = - let nv = OpamPackage.create name v in diff --git a/dev-ml/opam-format/files/debian-Port-to-Dose3-6.0.1.patch b/dev-ml/opam-format/files/debian-Port-to-Dose3-6.0.1.patch deleted file mode 100644 index a8af27416df1..000000000000 --- a/dev-ml/opam-format/files/debian-Port-to-Dose3-6.0.1.patch +++ /dev/null @@ -1,142 +0,0 @@ -From: Mehdi Dogguy <mehdi@debian.org> -Date: Sun, 28 Feb 2021 19:27:24 +0100 -Subject: Port to Dose3 6.0.1 - ---- - src/client/opamAdminCheck.ml | 2 ++ - src/client/opamAdminRepoUpgrade.ml | 2 ++ - src/solver/opamBuiltinMccs.ml.real | 2 +- - src/solver/opamCudf.ml | 5 ++++- - src/solver/opamCudf.mli | 4 ++-- - src/solver/opamCudfSolver.ml | 4 ++-- - src/solver/opamSolver.ml | 4 +++- - 7 files changed, 16 insertions(+), 7 deletions(-) - -diff --git a/src/client/opamAdminCheck.ml b/src/client/opamAdminCheck.ml -index 05543a2..f23bfc4 100644 ---- a/src/client/opamAdminCheck.ml -+++ b/src/client/opamAdminCheck.ml -@@ -8,6 +8,8 @@ - (* *) - (**************************************************************************) - -+module Algo = Dose_algo -+ - open OpamTypes - open OpamPackage.Set.Op - -diff --git a/src/client/opamAdminRepoUpgrade.ml b/src/client/opamAdminRepoUpgrade.ml -index 0be53b2..635e792 100644 ---- a/src/client/opamAdminRepoUpgrade.ml -+++ b/src/client/opamAdminRepoUpgrade.ml -@@ -8,6 +8,8 @@ - (* *) - (**************************************************************************) - -+module Algo = Dose_algo -+ - open OpamTypes - open OpamProcess.Job.Op - open OpamStd.Option.Op -diff --git a/src/solver/opamBuiltinMccs.ml.real b/src/solver/opamBuiltinMccs.ml.real -index ab39ab3..2b41982 100644 ---- a/src/solver/opamBuiltinMccs.ml.real -+++ b/src/solver/opamBuiltinMccs.ml.real -@@ -35,7 +35,7 @@ let call solver_backend ext ~criteria ?timeout cudf = - ~verbose:OpamCoreConfig.(!r.debug_level >= 2) - ?timeout criteria cudf - with -- | None -> raise Common.CudfSolver.Unsat -+ | None -> raise Dose_common.CudfSolver.Unsat - | Some (preamble, univ) -> Some preamble, univ - | exception Mccs.Timeout -> raise Timeout - -diff --git a/src/solver/opamCudf.ml b/src/solver/opamCudf.ml -index e07ff54..ad7293c 100644 ---- a/src/solver/opamCudf.ml -+++ b/src/solver/opamCudf.ml -@@ -9,6 +9,9 @@ - (* *) - (**************************************************************************) - -+module Common = Dose_common -+module Algo = Dose_algo -+ - open OpamTypes - open OpamTypesBase - -@@ -634,7 +637,7 @@ let call_external_solver ~version_map univ req = - let r = - Algo.Depsolver.check_request_using - ~call_solver:(OpamSolverConfig.call_solver ~criteria) -- ~criteria ~explain:true cudf_request -+ ~explain:true cudf_request - in - log "Solver call done in %.3f" (chrono ()); - r -diff --git a/src/solver/opamCudf.mli b/src/solver/opamCudf.mli -index cb8158d..c928ccf 100644 ---- a/src/solver/opamCudf.mli -+++ b/src/solver/opamCudf.mli -@@ -24,7 +24,7 @@ module Map: OpamStd.MAP with type key = Cudf.package - module Graph: sig - (** Graph of cudf packages *) - -- include module type of Algo.Defaultgraphs.PackageGraph.G -+ include module type of Dose_algo.Defaultgraphs.PackageGraph.G - - (** Build a graph from a CUDF universe. Warning: dependency edges are towards - the dependency, which is the reverse of what happens in the action -@@ -180,7 +180,7 @@ val string_of_vpkgs: Cudf_types.vpkg list -> string - - val make_conflicts: - version_map:int package_map -> Cudf.universe -> -- Algo.Diagnostic.diagnosis -> ('a, conflict) result -+ Dose_algo.Diagnostic.diagnosis -> ('a, conflict) result - val cycle_conflict: - version_map:int package_map -> Cudf.universe -> - string list list -> ('a, conflict) result -diff --git a/src/solver/opamCudfSolver.ml b/src/solver/opamCudfSolver.ml -index 03486f1..2651373 100644 ---- a/src/solver/opamCudfSolver.ml -+++ b/src/solver/opamCudfSolver.ml -@@ -57,7 +57,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) = - in - OpamFilename.remove solver_in; - if not (OpamFilename.exists solver_out) then -- raise (Common.CudfSolver.Error "no output") -+ raise (Dose_common.CudfSolver.Error "no output") - else if - (let ic = OpamFilename.open_in solver_out in - try -@@ -65,7 +65,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) = - i = "FAIL" - with End_of_file -> close_in ic; false) - then -- raise Common.CudfSolver.Unsat -+ raise Dose_common.CudfSolver.Unsat - else - let r = - Cudf_parser.load_solution_from_file -diff --git a/src/solver/opamSolver.ml b/src/solver/opamSolver.ml -index 3748e75..bbf995f 100644 ---- a/src/solver/opamSolver.ml -+++ b/src/solver/opamSolver.ml -@@ -9,6 +9,8 @@ - (* *) - (**************************************************************************) - -+module Algo = Dose_algo -+ - open OpamTypes - open OpamTypesBase - open OpamPackage.Set.Op -@@ -84,7 +86,7 @@ let cudf_versions_map universe packages = - pmap OpamPackage.Map.empty - - let name_to_cudf name = -- Common.CudfAdd.encode (OpamPackage.Name.to_string name) -+ Dose_common.CudfAdd.encode (OpamPackage.Name.to_string name) - - let constraint_to_cudf version_map name (op,v) = - let nv = OpamPackage.create name v in diff --git a/dev-ml/opam-installer/files/debian-Port-to-Dose3-6.0.1.patch b/dev-ml/opam-installer/files/debian-Port-to-Dose3-6.0.1.patch deleted file mode 100644 index a8af27416df1..000000000000 --- a/dev-ml/opam-installer/files/debian-Port-to-Dose3-6.0.1.patch +++ /dev/null @@ -1,142 +0,0 @@ -From: Mehdi Dogguy <mehdi@debian.org> -Date: Sun, 28 Feb 2021 19:27:24 +0100 -Subject: Port to Dose3 6.0.1 - ---- - src/client/opamAdminCheck.ml | 2 ++ - src/client/opamAdminRepoUpgrade.ml | 2 ++ - src/solver/opamBuiltinMccs.ml.real | 2 +- - src/solver/opamCudf.ml | 5 ++++- - src/solver/opamCudf.mli | 4 ++-- - src/solver/opamCudfSolver.ml | 4 ++-- - src/solver/opamSolver.ml | 4 +++- - 7 files changed, 16 insertions(+), 7 deletions(-) - -diff --git a/src/client/opamAdminCheck.ml b/src/client/opamAdminCheck.ml -index 05543a2..f23bfc4 100644 ---- a/src/client/opamAdminCheck.ml -+++ b/src/client/opamAdminCheck.ml -@@ -8,6 +8,8 @@ - (* *) - (**************************************************************************) - -+module Algo = Dose_algo -+ - open OpamTypes - open OpamPackage.Set.Op - -diff --git a/src/client/opamAdminRepoUpgrade.ml b/src/client/opamAdminRepoUpgrade.ml -index 0be53b2..635e792 100644 ---- a/src/client/opamAdminRepoUpgrade.ml -+++ b/src/client/opamAdminRepoUpgrade.ml -@@ -8,6 +8,8 @@ - (* *) - (**************************************************************************) - -+module Algo = Dose_algo -+ - open OpamTypes - open OpamProcess.Job.Op - open OpamStd.Option.Op -diff --git a/src/solver/opamBuiltinMccs.ml.real b/src/solver/opamBuiltinMccs.ml.real -index ab39ab3..2b41982 100644 ---- a/src/solver/opamBuiltinMccs.ml.real -+++ b/src/solver/opamBuiltinMccs.ml.real -@@ -35,7 +35,7 @@ let call solver_backend ext ~criteria ?timeout cudf = - ~verbose:OpamCoreConfig.(!r.debug_level >= 2) - ?timeout criteria cudf - with -- | None -> raise Common.CudfSolver.Unsat -+ | None -> raise Dose_common.CudfSolver.Unsat - | Some (preamble, univ) -> Some preamble, univ - | exception Mccs.Timeout -> raise Timeout - -diff --git a/src/solver/opamCudf.ml b/src/solver/opamCudf.ml -index e07ff54..ad7293c 100644 ---- a/src/solver/opamCudf.ml -+++ b/src/solver/opamCudf.ml -@@ -9,6 +9,9 @@ - (* *) - (**************************************************************************) - -+module Common = Dose_common -+module Algo = Dose_algo -+ - open OpamTypes - open OpamTypesBase - -@@ -634,7 +637,7 @@ let call_external_solver ~version_map univ req = - let r = - Algo.Depsolver.check_request_using - ~call_solver:(OpamSolverConfig.call_solver ~criteria) -- ~criteria ~explain:true cudf_request -+ ~explain:true cudf_request - in - log "Solver call done in %.3f" (chrono ()); - r -diff --git a/src/solver/opamCudf.mli b/src/solver/opamCudf.mli -index cb8158d..c928ccf 100644 ---- a/src/solver/opamCudf.mli -+++ b/src/solver/opamCudf.mli -@@ -24,7 +24,7 @@ module Map: OpamStd.MAP with type key = Cudf.package - module Graph: sig - (** Graph of cudf packages *) - -- include module type of Algo.Defaultgraphs.PackageGraph.G -+ include module type of Dose_algo.Defaultgraphs.PackageGraph.G - - (** Build a graph from a CUDF universe. Warning: dependency edges are towards - the dependency, which is the reverse of what happens in the action -@@ -180,7 +180,7 @@ val string_of_vpkgs: Cudf_types.vpkg list -> string - - val make_conflicts: - version_map:int package_map -> Cudf.universe -> -- Algo.Diagnostic.diagnosis -> ('a, conflict) result -+ Dose_algo.Diagnostic.diagnosis -> ('a, conflict) result - val cycle_conflict: - version_map:int package_map -> Cudf.universe -> - string list list -> ('a, conflict) result -diff --git a/src/solver/opamCudfSolver.ml b/src/solver/opamCudfSolver.ml -index 03486f1..2651373 100644 ---- a/src/solver/opamCudfSolver.ml -+++ b/src/solver/opamCudfSolver.ml -@@ -57,7 +57,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) = - in - OpamFilename.remove solver_in; - if not (OpamFilename.exists solver_out) then -- raise (Common.CudfSolver.Error "no output") -+ raise (Dose_common.CudfSolver.Error "no output") - else if - (let ic = OpamFilename.open_in solver_out in - try -@@ -65,7 +65,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) = - i = "FAIL" - with End_of_file -> close_in ic; false) - then -- raise Common.CudfSolver.Unsat -+ raise Dose_common.CudfSolver.Unsat - else - let r = - Cudf_parser.load_solution_from_file -diff --git a/src/solver/opamSolver.ml b/src/solver/opamSolver.ml -index 3748e75..bbf995f 100644 ---- a/src/solver/opamSolver.ml -+++ b/src/solver/opamSolver.ml -@@ -9,6 +9,8 @@ - (* *) - (**************************************************************************) - -+module Algo = Dose_algo -+ - open OpamTypes - open OpamTypesBase - open OpamPackage.Set.Op -@@ -84,7 +86,7 @@ let cudf_versions_map universe packages = - pmap OpamPackage.Map.empty - - let name_to_cudf name = -- Common.CudfAdd.encode (OpamPackage.Name.to_string name) -+ Dose_common.CudfAdd.encode (OpamPackage.Name.to_string name) - - let constraint_to_cudf version_map name (op,v) = - let nv = OpamPackage.create name v in diff --git a/dev-ml/opam-installer/opam-installer-2.1.6.ebuild b/dev-ml/opam-installer/opam-installer-2.1.6.ebuild index c8d56c6f4111..930678168270 100644 --- a/dev-ml/opam-installer/opam-installer-2.1.6.ebuild +++ b/dev-ml/opam-installer/opam-installer-2.1.6.ebuild @@ -16,7 +16,7 @@ OPAM_INSTALLER="${S}/_build/install/default/bin/opam-installer" LICENSE="LGPL-2.1" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" IUSE="+ocamlopt" RESTRICT="test" # sandbox not working diff --git a/dev-ml/opam-repository/files/debian-Port-to-Dose3-6.0.1.patch b/dev-ml/opam-repository/files/debian-Port-to-Dose3-6.0.1.patch deleted file mode 100644 index a8af27416df1..000000000000 --- a/dev-ml/opam-repository/files/debian-Port-to-Dose3-6.0.1.patch +++ /dev/null @@ -1,142 +0,0 @@ -From: Mehdi Dogguy <mehdi@debian.org> -Date: Sun, 28 Feb 2021 19:27:24 +0100 -Subject: Port to Dose3 6.0.1 - ---- - src/client/opamAdminCheck.ml | 2 ++ - src/client/opamAdminRepoUpgrade.ml | 2 ++ - src/solver/opamBuiltinMccs.ml.real | 2 +- - src/solver/opamCudf.ml | 5 ++++- - src/solver/opamCudf.mli | 4 ++-- - src/solver/opamCudfSolver.ml | 4 ++-- - src/solver/opamSolver.ml | 4 +++- - 7 files changed, 16 insertions(+), 7 deletions(-) - -diff --git a/src/client/opamAdminCheck.ml b/src/client/opamAdminCheck.ml -index 05543a2..f23bfc4 100644 ---- a/src/client/opamAdminCheck.ml -+++ b/src/client/opamAdminCheck.ml -@@ -8,6 +8,8 @@ - (* *) - (**************************************************************************) - -+module Algo = Dose_algo -+ - open OpamTypes - open OpamPackage.Set.Op - -diff --git a/src/client/opamAdminRepoUpgrade.ml b/src/client/opamAdminRepoUpgrade.ml -index 0be53b2..635e792 100644 ---- a/src/client/opamAdminRepoUpgrade.ml -+++ b/src/client/opamAdminRepoUpgrade.ml -@@ -8,6 +8,8 @@ - (* *) - (**************************************************************************) - -+module Algo = Dose_algo -+ - open OpamTypes - open OpamProcess.Job.Op - open OpamStd.Option.Op -diff --git a/src/solver/opamBuiltinMccs.ml.real b/src/solver/opamBuiltinMccs.ml.real -index ab39ab3..2b41982 100644 ---- a/src/solver/opamBuiltinMccs.ml.real -+++ b/src/solver/opamBuiltinMccs.ml.real -@@ -35,7 +35,7 @@ let call solver_backend ext ~criteria ?timeout cudf = - ~verbose:OpamCoreConfig.(!r.debug_level >= 2) - ?timeout criteria cudf - with -- | None -> raise Common.CudfSolver.Unsat -+ | None -> raise Dose_common.CudfSolver.Unsat - | Some (preamble, univ) -> Some preamble, univ - | exception Mccs.Timeout -> raise Timeout - -diff --git a/src/solver/opamCudf.ml b/src/solver/opamCudf.ml -index e07ff54..ad7293c 100644 ---- a/src/solver/opamCudf.ml -+++ b/src/solver/opamCudf.ml -@@ -9,6 +9,9 @@ - (* *) - (**************************************************************************) - -+module Common = Dose_common -+module Algo = Dose_algo -+ - open OpamTypes - open OpamTypesBase - -@@ -634,7 +637,7 @@ let call_external_solver ~version_map univ req = - let r = - Algo.Depsolver.check_request_using - ~call_solver:(OpamSolverConfig.call_solver ~criteria) -- ~criteria ~explain:true cudf_request -+ ~explain:true cudf_request - in - log "Solver call done in %.3f" (chrono ()); - r -diff --git a/src/solver/opamCudf.mli b/src/solver/opamCudf.mli -index cb8158d..c928ccf 100644 ---- a/src/solver/opamCudf.mli -+++ b/src/solver/opamCudf.mli -@@ -24,7 +24,7 @@ module Map: OpamStd.MAP with type key = Cudf.package - module Graph: sig - (** Graph of cudf packages *) - -- include module type of Algo.Defaultgraphs.PackageGraph.G -+ include module type of Dose_algo.Defaultgraphs.PackageGraph.G - - (** Build a graph from a CUDF universe. Warning: dependency edges are towards - the dependency, which is the reverse of what happens in the action -@@ -180,7 +180,7 @@ val string_of_vpkgs: Cudf_types.vpkg list -> string - - val make_conflicts: - version_map:int package_map -> Cudf.universe -> -- Algo.Diagnostic.diagnosis -> ('a, conflict) result -+ Dose_algo.Diagnostic.diagnosis -> ('a, conflict) result - val cycle_conflict: - version_map:int package_map -> Cudf.universe -> - string list list -> ('a, conflict) result -diff --git a/src/solver/opamCudfSolver.ml b/src/solver/opamCudfSolver.ml -index 03486f1..2651373 100644 ---- a/src/solver/opamCudfSolver.ml -+++ b/src/solver/opamCudfSolver.ml -@@ -57,7 +57,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) = - in - OpamFilename.remove solver_in; - if not (OpamFilename.exists solver_out) then -- raise (Common.CudfSolver.Error "no output") -+ raise (Dose_common.CudfSolver.Error "no output") - else if - (let ic = OpamFilename.open_in solver_out in - try -@@ -65,7 +65,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) = - i = "FAIL" - with End_of_file -> close_in ic; false) - then -- raise Common.CudfSolver.Unsat -+ raise Dose_common.CudfSolver.Unsat - else - let r = - Cudf_parser.load_solution_from_file -diff --git a/src/solver/opamSolver.ml b/src/solver/opamSolver.ml -index 3748e75..bbf995f 100644 ---- a/src/solver/opamSolver.ml -+++ b/src/solver/opamSolver.ml -@@ -9,6 +9,8 @@ - (* *) - (**************************************************************************) - -+module Algo = Dose_algo -+ - open OpamTypes - open OpamTypesBase - open OpamPackage.Set.Op -@@ -84,7 +86,7 @@ let cudf_versions_map universe packages = - pmap OpamPackage.Map.empty - - let name_to_cudf name = -- Common.CudfAdd.encode (OpamPackage.Name.to_string name) -+ Dose_common.CudfAdd.encode (OpamPackage.Name.to_string name) - - let constraint_to_cudf version_map name (op,v) = - let nv = OpamPackage.create name v in diff --git a/dev-ml/opam-solver/files/debian-Port-to-Dose3-6.0.1.patch b/dev-ml/opam-solver/files/debian-Port-to-Dose3-6.0.1.patch deleted file mode 100644 index a8af27416df1..000000000000 --- a/dev-ml/opam-solver/files/debian-Port-to-Dose3-6.0.1.patch +++ /dev/null @@ -1,142 +0,0 @@ -From: Mehdi Dogguy <mehdi@debian.org> -Date: Sun, 28 Feb 2021 19:27:24 +0100 -Subject: Port to Dose3 6.0.1 - ---- - src/client/opamAdminCheck.ml | 2 ++ - src/client/opamAdminRepoUpgrade.ml | 2 ++ - src/solver/opamBuiltinMccs.ml.real | 2 +- - src/solver/opamCudf.ml | 5 ++++- - src/solver/opamCudf.mli | 4 ++-- - src/solver/opamCudfSolver.ml | 4 ++-- - src/solver/opamSolver.ml | 4 +++- - 7 files changed, 16 insertions(+), 7 deletions(-) - -diff --git a/src/client/opamAdminCheck.ml b/src/client/opamAdminCheck.ml -index 05543a2..f23bfc4 100644 ---- a/src/client/opamAdminCheck.ml -+++ b/src/client/opamAdminCheck.ml -@@ -8,6 +8,8 @@ - (* *) - (**************************************************************************) - -+module Algo = Dose_algo -+ - open OpamTypes - open OpamPackage.Set.Op - -diff --git a/src/client/opamAdminRepoUpgrade.ml b/src/client/opamAdminRepoUpgrade.ml -index 0be53b2..635e792 100644 ---- a/src/client/opamAdminRepoUpgrade.ml -+++ b/src/client/opamAdminRepoUpgrade.ml -@@ -8,6 +8,8 @@ - (* *) - (**************************************************************************) - -+module Algo = Dose_algo -+ - open OpamTypes - open OpamProcess.Job.Op - open OpamStd.Option.Op -diff --git a/src/solver/opamBuiltinMccs.ml.real b/src/solver/opamBuiltinMccs.ml.real -index ab39ab3..2b41982 100644 ---- a/src/solver/opamBuiltinMccs.ml.real -+++ b/src/solver/opamBuiltinMccs.ml.real -@@ -35,7 +35,7 @@ let call solver_backend ext ~criteria ?timeout cudf = - ~verbose:OpamCoreConfig.(!r.debug_level >= 2) - ?timeout criteria cudf - with -- | None -> raise Common.CudfSolver.Unsat -+ | None -> raise Dose_common.CudfSolver.Unsat - | Some (preamble, univ) -> Some preamble, univ - | exception Mccs.Timeout -> raise Timeout - -diff --git a/src/solver/opamCudf.ml b/src/solver/opamCudf.ml -index e07ff54..ad7293c 100644 ---- a/src/solver/opamCudf.ml -+++ b/src/solver/opamCudf.ml -@@ -9,6 +9,9 @@ - (* *) - (**************************************************************************) - -+module Common = Dose_common -+module Algo = Dose_algo -+ - open OpamTypes - open OpamTypesBase - -@@ -634,7 +637,7 @@ let call_external_solver ~version_map univ req = - let r = - Algo.Depsolver.check_request_using - ~call_solver:(OpamSolverConfig.call_solver ~criteria) -- ~criteria ~explain:true cudf_request -+ ~explain:true cudf_request - in - log "Solver call done in %.3f" (chrono ()); - r -diff --git a/src/solver/opamCudf.mli b/src/solver/opamCudf.mli -index cb8158d..c928ccf 100644 ---- a/src/solver/opamCudf.mli -+++ b/src/solver/opamCudf.mli -@@ -24,7 +24,7 @@ module Map: OpamStd.MAP with type key = Cudf.package - module Graph: sig - (** Graph of cudf packages *) - -- include module type of Algo.Defaultgraphs.PackageGraph.G -+ include module type of Dose_algo.Defaultgraphs.PackageGraph.G - - (** Build a graph from a CUDF universe. Warning: dependency edges are towards - the dependency, which is the reverse of what happens in the action -@@ -180,7 +180,7 @@ val string_of_vpkgs: Cudf_types.vpkg list -> string - - val make_conflicts: - version_map:int package_map -> Cudf.universe -> -- Algo.Diagnostic.diagnosis -> ('a, conflict) result -+ Dose_algo.Diagnostic.diagnosis -> ('a, conflict) result - val cycle_conflict: - version_map:int package_map -> Cudf.universe -> - string list list -> ('a, conflict) result -diff --git a/src/solver/opamCudfSolver.ml b/src/solver/opamCudfSolver.ml -index 03486f1..2651373 100644 ---- a/src/solver/opamCudfSolver.ml -+++ b/src/solver/opamCudfSolver.ml -@@ -57,7 +57,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) = - in - OpamFilename.remove solver_in; - if not (OpamFilename.exists solver_out) then -- raise (Common.CudfSolver.Error "no output") -+ raise (Dose_common.CudfSolver.Error "no output") - else if - (let ic = OpamFilename.open_in solver_out in - try -@@ -65,7 +65,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) = - i = "FAIL" - with End_of_file -> close_in ic; false) - then -- raise Common.CudfSolver.Unsat -+ raise Dose_common.CudfSolver.Unsat - else - let r = - Cudf_parser.load_solution_from_file -diff --git a/src/solver/opamSolver.ml b/src/solver/opamSolver.ml -index 3748e75..bbf995f 100644 ---- a/src/solver/opamSolver.ml -+++ b/src/solver/opamSolver.ml -@@ -9,6 +9,8 @@ - (* *) - (**************************************************************************) - -+module Algo = Dose_algo -+ - open OpamTypes - open OpamTypesBase - open OpamPackage.Set.Op -@@ -84,7 +86,7 @@ let cudf_versions_map universe packages = - pmap OpamPackage.Map.empty - - let name_to_cudf name = -- Common.CudfAdd.encode (OpamPackage.Name.to_string name) -+ Dose_common.CudfAdd.encode (OpamPackage.Name.to_string name) - - let constraint_to_cudf version_map name (op,v) = - let nv = OpamPackage.create name v in diff --git a/dev-ml/opam-state/files/debian-Port-to-Dose3-6.0.1.patch b/dev-ml/opam-state/files/debian-Port-to-Dose3-6.0.1.patch deleted file mode 100644 index a8af27416df1..000000000000 --- a/dev-ml/opam-state/files/debian-Port-to-Dose3-6.0.1.patch +++ /dev/null @@ -1,142 +0,0 @@ -From: Mehdi Dogguy <mehdi@debian.org> -Date: Sun, 28 Feb 2021 19:27:24 +0100 -Subject: Port to Dose3 6.0.1 - ---- - src/client/opamAdminCheck.ml | 2 ++ - src/client/opamAdminRepoUpgrade.ml | 2 ++ - src/solver/opamBuiltinMccs.ml.real | 2 +- - src/solver/opamCudf.ml | 5 ++++- - src/solver/opamCudf.mli | 4 ++-- - src/solver/opamCudfSolver.ml | 4 ++-- - src/solver/opamSolver.ml | 4 +++- - 7 files changed, 16 insertions(+), 7 deletions(-) - -diff --git a/src/client/opamAdminCheck.ml b/src/client/opamAdminCheck.ml -index 05543a2..f23bfc4 100644 ---- a/src/client/opamAdminCheck.ml -+++ b/src/client/opamAdminCheck.ml -@@ -8,6 +8,8 @@ - (* *) - (**************************************************************************) - -+module Algo = Dose_algo -+ - open OpamTypes - open OpamPackage.Set.Op - -diff --git a/src/client/opamAdminRepoUpgrade.ml b/src/client/opamAdminRepoUpgrade.ml -index 0be53b2..635e792 100644 ---- a/src/client/opamAdminRepoUpgrade.ml -+++ b/src/client/opamAdminRepoUpgrade.ml -@@ -8,6 +8,8 @@ - (* *) - (**************************************************************************) - -+module Algo = Dose_algo -+ - open OpamTypes - open OpamProcess.Job.Op - open OpamStd.Option.Op -diff --git a/src/solver/opamBuiltinMccs.ml.real b/src/solver/opamBuiltinMccs.ml.real -index ab39ab3..2b41982 100644 ---- a/src/solver/opamBuiltinMccs.ml.real -+++ b/src/solver/opamBuiltinMccs.ml.real -@@ -35,7 +35,7 @@ let call solver_backend ext ~criteria ?timeout cudf = - ~verbose:OpamCoreConfig.(!r.debug_level >= 2) - ?timeout criteria cudf - with -- | None -> raise Common.CudfSolver.Unsat -+ | None -> raise Dose_common.CudfSolver.Unsat - | Some (preamble, univ) -> Some preamble, univ - | exception Mccs.Timeout -> raise Timeout - -diff --git a/src/solver/opamCudf.ml b/src/solver/opamCudf.ml -index e07ff54..ad7293c 100644 ---- a/src/solver/opamCudf.ml -+++ b/src/solver/opamCudf.ml -@@ -9,6 +9,9 @@ - (* *) - (**************************************************************************) - -+module Common = Dose_common -+module Algo = Dose_algo -+ - open OpamTypes - open OpamTypesBase - -@@ -634,7 +637,7 @@ let call_external_solver ~version_map univ req = - let r = - Algo.Depsolver.check_request_using - ~call_solver:(OpamSolverConfig.call_solver ~criteria) -- ~criteria ~explain:true cudf_request -+ ~explain:true cudf_request - in - log "Solver call done in %.3f" (chrono ()); - r -diff --git a/src/solver/opamCudf.mli b/src/solver/opamCudf.mli -index cb8158d..c928ccf 100644 ---- a/src/solver/opamCudf.mli -+++ b/src/solver/opamCudf.mli -@@ -24,7 +24,7 @@ module Map: OpamStd.MAP with type key = Cudf.package - module Graph: sig - (** Graph of cudf packages *) - -- include module type of Algo.Defaultgraphs.PackageGraph.G -+ include module type of Dose_algo.Defaultgraphs.PackageGraph.G - - (** Build a graph from a CUDF universe. Warning: dependency edges are towards - the dependency, which is the reverse of what happens in the action -@@ -180,7 +180,7 @@ val string_of_vpkgs: Cudf_types.vpkg list -> string - - val make_conflicts: - version_map:int package_map -> Cudf.universe -> -- Algo.Diagnostic.diagnosis -> ('a, conflict) result -+ Dose_algo.Diagnostic.diagnosis -> ('a, conflict) result - val cycle_conflict: - version_map:int package_map -> Cudf.universe -> - string list list -> ('a, conflict) result -diff --git a/src/solver/opamCudfSolver.ml b/src/solver/opamCudfSolver.ml -index 03486f1..2651373 100644 ---- a/src/solver/opamCudfSolver.ml -+++ b/src/solver/opamCudfSolver.ml -@@ -57,7 +57,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) = - in - OpamFilename.remove solver_in; - if not (OpamFilename.exists solver_out) then -- raise (Common.CudfSolver.Error "no output") -+ raise (Dose_common.CudfSolver.Error "no output") - else if - (let ic = OpamFilename.open_in solver_out in - try -@@ -65,7 +65,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) = - i = "FAIL" - with End_of_file -> close_in ic; false) - then -- raise Common.CudfSolver.Unsat -+ raise Dose_common.CudfSolver.Unsat - else - let r = - Cudf_parser.load_solution_from_file -diff --git a/src/solver/opamSolver.ml b/src/solver/opamSolver.ml -index 3748e75..bbf995f 100644 ---- a/src/solver/opamSolver.ml -+++ b/src/solver/opamSolver.ml -@@ -9,6 +9,8 @@ - (* *) - (**************************************************************************) - -+module Algo = Dose_algo -+ - open OpamTypes - open OpamTypesBase - open OpamPackage.Set.Op -@@ -84,7 +86,7 @@ let cudf_versions_map universe packages = - pmap OpamPackage.Map.empty - - let name_to_cudf name = -- Common.CudfAdd.encode (OpamPackage.Name.to_string name) -+ Dose_common.CudfAdd.encode (OpamPackage.Name.to_string name) - - let constraint_to_cudf version_map name (op,v) = - let nv = OpamPackage.create name v in diff --git a/dev-ml/opam/files/debian-Port-to-Dose3-6.0.1.patch b/dev-ml/opam/files/debian-Port-to-Dose3-6.0.1.patch deleted file mode 100644 index a8af27416df1..000000000000 --- a/dev-ml/opam/files/debian-Port-to-Dose3-6.0.1.patch +++ /dev/null @@ -1,142 +0,0 @@ -From: Mehdi Dogguy <mehdi@debian.org> -Date: Sun, 28 Feb 2021 19:27:24 +0100 -Subject: Port to Dose3 6.0.1 - ---- - src/client/opamAdminCheck.ml | 2 ++ - src/client/opamAdminRepoUpgrade.ml | 2 ++ - src/solver/opamBuiltinMccs.ml.real | 2 +- - src/solver/opamCudf.ml | 5 ++++- - src/solver/opamCudf.mli | 4 ++-- - src/solver/opamCudfSolver.ml | 4 ++-- - src/solver/opamSolver.ml | 4 +++- - 7 files changed, 16 insertions(+), 7 deletions(-) - -diff --git a/src/client/opamAdminCheck.ml b/src/client/opamAdminCheck.ml -index 05543a2..f23bfc4 100644 ---- a/src/client/opamAdminCheck.ml -+++ b/src/client/opamAdminCheck.ml -@@ -8,6 +8,8 @@ - (* *) - (**************************************************************************) - -+module Algo = Dose_algo -+ - open OpamTypes - open OpamPackage.Set.Op - -diff --git a/src/client/opamAdminRepoUpgrade.ml b/src/client/opamAdminRepoUpgrade.ml -index 0be53b2..635e792 100644 ---- a/src/client/opamAdminRepoUpgrade.ml -+++ b/src/client/opamAdminRepoUpgrade.ml -@@ -8,6 +8,8 @@ - (* *) - (**************************************************************************) - -+module Algo = Dose_algo -+ - open OpamTypes - open OpamProcess.Job.Op - open OpamStd.Option.Op -diff --git a/src/solver/opamBuiltinMccs.ml.real b/src/solver/opamBuiltinMccs.ml.real -index ab39ab3..2b41982 100644 ---- a/src/solver/opamBuiltinMccs.ml.real -+++ b/src/solver/opamBuiltinMccs.ml.real -@@ -35,7 +35,7 @@ let call solver_backend ext ~criteria ?timeout cudf = - ~verbose:OpamCoreConfig.(!r.debug_level >= 2) - ?timeout criteria cudf - with -- | None -> raise Common.CudfSolver.Unsat -+ | None -> raise Dose_common.CudfSolver.Unsat - | Some (preamble, univ) -> Some preamble, univ - | exception Mccs.Timeout -> raise Timeout - -diff --git a/src/solver/opamCudf.ml b/src/solver/opamCudf.ml -index e07ff54..ad7293c 100644 ---- a/src/solver/opamCudf.ml -+++ b/src/solver/opamCudf.ml -@@ -9,6 +9,9 @@ - (* *) - (**************************************************************************) - -+module Common = Dose_common -+module Algo = Dose_algo -+ - open OpamTypes - open OpamTypesBase - -@@ -634,7 +637,7 @@ let call_external_solver ~version_map univ req = - let r = - Algo.Depsolver.check_request_using - ~call_solver:(OpamSolverConfig.call_solver ~criteria) -- ~criteria ~explain:true cudf_request -+ ~explain:true cudf_request - in - log "Solver call done in %.3f" (chrono ()); - r -diff --git a/src/solver/opamCudf.mli b/src/solver/opamCudf.mli -index cb8158d..c928ccf 100644 ---- a/src/solver/opamCudf.mli -+++ b/src/solver/opamCudf.mli -@@ -24,7 +24,7 @@ module Map: OpamStd.MAP with type key = Cudf.package - module Graph: sig - (** Graph of cudf packages *) - -- include module type of Algo.Defaultgraphs.PackageGraph.G -+ include module type of Dose_algo.Defaultgraphs.PackageGraph.G - - (** Build a graph from a CUDF universe. Warning: dependency edges are towards - the dependency, which is the reverse of what happens in the action -@@ -180,7 +180,7 @@ val string_of_vpkgs: Cudf_types.vpkg list -> string - - val make_conflicts: - version_map:int package_map -> Cudf.universe -> -- Algo.Diagnostic.diagnosis -> ('a, conflict) result -+ Dose_algo.Diagnostic.diagnosis -> ('a, conflict) result - val cycle_conflict: - version_map:int package_map -> Cudf.universe -> - string list list -> ('a, conflict) result -diff --git a/src/solver/opamCudfSolver.ml b/src/solver/opamCudfSolver.ml -index 03486f1..2651373 100644 ---- a/src/solver/opamCudfSolver.ml -+++ b/src/solver/opamCudfSolver.ml -@@ -57,7 +57,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) = - in - OpamFilename.remove solver_in; - if not (OpamFilename.exists solver_out) then -- raise (Common.CudfSolver.Error "no output") -+ raise (Dose_common.CudfSolver.Error "no output") - else if - (let ic = OpamFilename.open_in solver_out in - try -@@ -65,7 +65,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) = - i = "FAIL" - with End_of_file -> close_in ic; false) - then -- raise Common.CudfSolver.Unsat -+ raise Dose_common.CudfSolver.Unsat - else - let r = - Cudf_parser.load_solution_from_file -diff --git a/src/solver/opamSolver.ml b/src/solver/opamSolver.ml -index 3748e75..bbf995f 100644 ---- a/src/solver/opamSolver.ml -+++ b/src/solver/opamSolver.ml -@@ -9,6 +9,8 @@ - (* *) - (**************************************************************************) - -+module Algo = Dose_algo -+ - open OpamTypes - open OpamTypesBase - open OpamPackage.Set.Op -@@ -84,7 +86,7 @@ let cudf_versions_map universe packages = - pmap OpamPackage.Map.empty - - let name_to_cudf name = -- Common.CudfAdd.encode (OpamPackage.Name.to_string name) -+ Dose_common.CudfAdd.encode (OpamPackage.Name.to_string name) - - let constraint_to_cudf version_map name (op,v) = - let nv = OpamPackage.create name v in diff --git a/dev-ml/opam/opam-2.1.6.ebuild b/dev-ml/opam/opam-2.1.6.ebuild index fa7540b2dd30..58aca89af1dc 100644 --- a/dev-ml/opam/opam-2.1.6.ebuild +++ b/dev-ml/opam/opam-2.1.6.ebuild @@ -13,7 +13,7 @@ S="${WORKDIR}/opam-${PV/_/-}" LICENSE="LGPL-2.1-with-linking-exception" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" IUSE="+ocamlopt" RESTRICT="test" #see bugs 838658 |