diff options
Diffstat (limited to 'dev-ml')
1711 files changed, 25480 insertions, 14943 deletions
diff --git a/dev-ml/ANSITerminal/ANSITerminal-0.6.5.ebuild b/dev-ml/ANSITerminal/ANSITerminal-0.6.5.ebuild deleted file mode 100644 index 4403189644da..000000000000 --- a/dev-ml/ANSITerminal/ANSITerminal-0.6.5.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -OASIS_BUILD_DOCS=1 - -inherit oasis eutils - -DESCRIPTION="Module which offers basic control of ANSI compliant terminals" -HOMEPAGE="http://forge.ocamlcore.org/projects/ansiterminal/" -SRC_URI="http://forge.ocamlcore.org/frs/download.php/1206/${P}.tar.gz" -LICENSE="LGPL-3-with-linking-exception" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -DEPEND="" -RDEPEND="${DEPEND}" -IUSE="" - -DOCS=( "README.txt" "AUTHORS.txt" ) diff --git a/dev-ml/ANSITerminal/ANSITerminal-0.7.ebuild b/dev-ml/ANSITerminal/ANSITerminal-0.7.ebuild deleted file mode 100644 index 64ca0743656f..000000000000 --- a/dev-ml/ANSITerminal/ANSITerminal-0.7.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -OASIS_BUILD_DOCS=1 - -inherit oasis eutils - -DESCRIPTION="Module which offers basic control of ANSI compliant terminals" -HOMEPAGE="https://github.com/Chris00/ANSITerminal" -SRC_URI="https://github.com/Chris00/ANSITerminal/archive/${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="LGPL-3-with-linking-exception" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -RDEPEND="" -DEPEND="${DEPEND} dev-ml/oasis" -IUSE="" - -DOCS=( "README.txt" "AUTHORS.txt" ) - -src_prepare() { - epatch "${FILESDIR}/oasis.patch" - oasis setup || die -} diff --git a/dev-ml/ANSITerminal/ANSITerminal-0.8.5.ebuild b/dev-ml/ANSITerminal/ANSITerminal-0.8.5.ebuild new file mode 100644 index 000000000000..0894dee59864 --- /dev/null +++ b/dev-ml/ANSITerminal/ANSITerminal-0.8.5.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Basic control of ANSI compliant terminals and the windows shell" +HOMEPAGE="https://github.com/Chris00/ANSITerminal/" +SRC_URI="https://github.com/Chris00/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-3-with-linking-exception" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="+ocamlopt" diff --git a/dev-ml/ANSITerminal/Manifest b/dev-ml/ANSITerminal/Manifest index 4f8b0eed08d2..f4150c70c35b 100644 --- a/dev-ml/ANSITerminal/Manifest +++ b/dev-ml/ANSITerminal/Manifest @@ -1,2 +1 @@ -DIST ANSITerminal-0.6.5.tar.gz 52473 BLAKE2B 1f7f5b8dc1e7f9c2434a7e4eea1cec848f019a82a4137f744008532fac85016d3908890f2dd4cf5e8fb5c9f4aaad69cba4d56e75ab7ab57354ff7a4988a5cfe8 SHA512 43a059cc2a947a70409e19b8c6d01e1b5aa495290967f984a6d707e5ff329dd88e82ba68e08b6262da4a19bb24be2e61154fcf8781ee5cbad98240276d7b060d -DIST ANSITerminal-0.7.tar.gz 16763 BLAKE2B 5d25cdfe02f3b6f155995208897a11a21535105caa8db682f60a1215113e507ccac294037177d0fcd52431e3853aa655ead14e2054ada1369754d39c8db9448b SHA512 986f9d7fd862741ac7039cbd92c19b847d7b2d03edfb2d0851fe46ecc9678bf4617d1e687a61af3d3b28e2cfe347a80312f9bf5c84f957de0d6c169ca4209566 +DIST ANSITerminal-0.8.5.tar.gz 15121 BLAKE2B 08426f33e160a6cb076c40028d47de81c4e58b49544c7bdb3f61cb6d321b5779c40d99012af8d213cfebd8e25ea311c69254a153b50dbcfa93744cb29806d75c SHA512 df5ce287a7f8134172ae439f77b6b31edf897ced9481d7a2ecf55a56e01f271ff97c37c1a018b74b4af5668ce7dd2d4870436de09869f021dd10700021bc7b0f diff --git a/dev-ml/ANSITerminal/files/oasis.patch b/dev-ml/ANSITerminal/files/oasis.patch deleted file mode 100644 index d95b446a0407..000000000000 --- a/dev-ml/ANSITerminal/files/oasis.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: ANSITerminal-0.7/_oasis -=================================================================== ---- ANSITerminal-0.7.orig/_oasis -+++ ANSITerminal-0.7/_oasis -@@ -19,7 +19,7 @@ Library "ANSITerminal" - InternalModules: ANSITerminal_common - CSources: ANSITerminal_stubs.c - BuildDepends: unix, bytes -- -+ - Document API - Title: API reference for ANSITerminal - Type: OCamlbuild (0.3) diff --git a/dev-ml/ANSITerminal/metadata.xml b/dev-ml/ANSITerminal/metadata.xml index 73a1d1721344..44afbd2bdbe6 100644 --- a/dev-ml/ANSITerminal/metadata.xml +++ b/dev-ml/ANSITerminal/metadata.xml @@ -1,11 +1,13 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> + <pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">Chris00/ANSITerminal</remote-id> - </upstream> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <bugs-to>https://github.com/Chris00/ANSITerminal/issues/</bugs-to> + <remote-id type="github">Chris00/ANSITerminal</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-ml/OCaml-ImageMagick/Manifest b/dev-ml/OCaml-ImageMagick/Manifest deleted file mode 100644 index e3ba136b022a..000000000000 --- a/dev-ml/OCaml-ImageMagick/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST OCaml-ImageMagick-0.34-imagemagick7.patch.bz2 15950 BLAKE2B 009ea1a988acb117768e60a30e7443165018aa58715eab83e6155d8c9e6772454f4d432afad9be6c07333701e1a78490c1b16c3f687c381f4ddc134ce42cecc8 SHA512 a5d1eb7baa001144cc618532b6446cae30974ee7f95455fb18de287731f1867ba767812a876510c0fc7944aa5259f4e60e9f68fa1364fac3a2dfb8f8c1f6a219 -DIST OCaml-ImageMagick-0.34.tgz 64219 BLAKE2B 2260f1fa3521d1c930fdc8380bc007aa9fb555e484887faf3a63f00cd0b82b71a6c0e061299c31c686dd651def9089b3f7e2d97642f2a7c60421eb0f25cad5b1 SHA512 cf1f979aed0aad1fb27dd6817adbc22c2f7c0d6d8c96a48d9532ce89c128b046ea7ac38ad96a5267a5920fccd0cd3631844e428e933143a405522ed5ebcbee39 diff --git a/dev-ml/OCaml-ImageMagick/OCaml-ImageMagick-0.34-r1.ebuild b/dev-ml/OCaml-ImageMagick/OCaml-ImageMagick-0.34-r1.ebuild deleted file mode 100644 index e779844d33b2..000000000000 --- a/dev-ml/OCaml-ImageMagick/OCaml-ImageMagick-0.34-r1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit findlib toolchain-funcs eutils - -DESCRIPTION="Provide the ImageMagick methods to OCaml" -HOMEPAGE="http://www.linux-nantes.org/~fmonnier/OCaml/ImageMagick/" -SRC_URI="http://www.linux-nantes.org/~fmonnier/OCaml/ImageMagick/ImageMagick/${P}.tgz - mirror://gentoo/${P}-imagemagick7.patch.bz2 -" - -LICENSE="MIT" -SLOT="0/7${PV}" -KEYWORDS="~amd64" -IUSE="" -# interactive tests -RESTRICT="test" - -DEPEND=">=media-gfx/imagemagick-7:= - dev-lang/ocaml:=[ocamlopt]" -RDEPEND="${DEPEND}" - -src_prepare() { - epatch "${WORKDIR}/${P}-imagemagick7.patch" - default -} - -src_configure() { - sed -e "s/gcc/$(tc-getCC)/" -i Makefile || die -} - -src_install() { - findlib_src_preinst - emake find_install - dodoc README.txt -} diff --git a/dev-ml/OCaml-ImageMagick/metadata.xml b/dev-ml/OCaml-ImageMagick/metadata.xml deleted file mode 100644 index ffac4d7ebc01..000000000000 --- a/dev-ml/OCaml-ImageMagick/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> -</maintainer> -</pkgmetadata> diff --git a/dev-ml/alcotest/Manifest b/dev-ml/alcotest/Manifest index e1a56dcbf4a3..c7b896928f81 100644 --- a/dev-ml/alcotest/Manifest +++ b/dev-ml/alcotest/Manifest @@ -1,2 +1,5 @@ -DIST alcotest-0.8.1.tar.gz 24358 BLAKE2B 4f905cb478183015355b7bed85b2b20de6880b64d6425a4804cf050dd95fe024e83d9c2f6b57f908bdf7eac650cd2133811219fd30de0c45fa0e66caa3178980 SHA512 76224df2d4923e666fd844a0735f2a23035454bb3c3aeb6a6f8d19376342f0f94f39a401d6225af3f90cddd2f65aa779ce87e42ee8d82e6b3ca33730d4277253 -DIST alcotest-0.8.2.tar.gz 25456 BLAKE2B 6f3362dd83d127600710a9efcf5428ce1d960a2a8798a533c3216d7c8934dadd38f672f383e45c0a0ab441e723b4c6477a3c92905e2351e81bbfda324e373e69 SHA512 df1cf5ab42e91a66cae2913504d6825f842169332b8673047faea769966f62d61cb1c288325a840211df0b22c31208566cf754b0816bfdf5d8ef34e8c5127668 +DIST alcotest-1.2.3.tar.gz 274177 BLAKE2B 1c38baf8932fe16ec3899cd1dd747099065cf93677271aad5ec33706ed7b6fd82dac84f9ed7518c56d178bf1f98a0b131d5e0f4745d47b07021f0fef932fde28 SHA512 0f3e2a5f56a17b6ddf5173d490b8a1aa2b23382bd0535d9d8be09fb8d4dd02dd1b92f9d00b957b11843d671262469e28b3be4f987538e373eb5e1f30c3a406a3 +DIST alcotest-1.4.0.tar.gz 279675 BLAKE2B 3cc50ab37a16948ceca9b5e6aa885fa50bbe0722c6132ed4991fb64c568253d9913287d1b9e5547f59a210d6803e2a83565f02950fb12cb91ed9f8e24d7864c1 SHA512 adb73c8b2be6f47cb406bbc49dba7dc86e990a60e2e68302592a24dcc24e11e76e2aa6fc2f003c1e4fdbb79744df6ab601daff9540cd7b0096ac9f9bff18098c +DIST alcotest-1.5.0.tar.gz 288227 BLAKE2B 6af28f2516888273903bbb7750ba583778c54447157ece29ad8053323492dddfde9b901699be26c868f1f3835ad89d6f163176033f52ffdccc82fa2609e57b64 SHA512 9f496d1b14a78a9cba5dfde71cbda41d3090d2083bc9895dc9d9f54876b86630079219e678f13f6ffd382deb2a1a298b61b2a222fc65d25d4a242d8c280b4784 +DIST alcotest-1.6.0.tar.gz 288586 BLAKE2B 6e7ab4618d899346de3d8ef63c1b81f92d9cdca06e9df03bf2ea5f0a6b7d5b8ae5a231dc92aca5ebc268e3fda93d448f6edd12333ad6c657ef5361921e31f838 SHA512 58079596334c193d00f22c5fc708952f01b40593eabb26cf9725d51250fc5b816d0bf40c70bab50e9b88a973008a9889f95601127731e8c1583e4ef17173fe9e +DIST alcotest-1.7.0.tar.gz 293433 BLAKE2B 83a9b1bb3a6d9ec09de739e77a6e1085bbca328f5be39f6ab28931a7bc16d223d571917f924598ddcc399910f986df95eb72ae61f28512221d9de6174ffe3988 SHA512 6e29cc39109f5d83a175578f48ff1b48fdf13913b7cdd332823a660c681ab0cd5dec41b10322226102b023d7c74620decf964458926abed56ae835e4e565014e diff --git a/dev-ml/alcotest/alcotest-0.8.1.ebuild b/dev-ml/alcotest/alcotest-0.8.1.ebuild deleted file mode 100644 index 40aa58ad9a07..000000000000 --- a/dev-ml/alcotest/alcotest-0.8.1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit opam - -DESCRIPTION="A lightweight and colourful test framework" -HOMEPAGE="https://github.com/mirage/alcotest/" -SRC_URI="https://github.com/mirage/alcotest/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="ISC" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="test" - -RDEPEND=" - dev-ml/fmt:= - dev-ml/astring:= - dev-ml/cmdliner:= - dev-ml/result:= -" -DEPEND="${RDEPEND} - dev-ml/jbuilder - dev-ml/findlib" - -src_compile() { - jbuilder build -p alcotest || die -} - -src_test() { - jbuilder runtest -p alcotest || die -} diff --git a/dev-ml/alcotest/alcotest-1.2.3-r4.ebuild b/dev-ml/alcotest/alcotest-1.2.3-r4.ebuild new file mode 100644 index 000000000000..38ceb8300287 --- /dev/null +++ b/dev-ml/alcotest/alcotest-1.2.3-r4.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="A lightweight and colourful test framework" +HOMEPAGE="https://github.com/mirage/alcotest/" +SRC_URI="https://github.com/mirage/alcotest/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="ISC" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt" + +RDEPEND=" + dev-ml/astring:= + dev-ml/async_unix:= + <dev-ml/cmdliner-1.1.0:= + <dev-ml/core-0.15:= + dev-ml/core_kernel:= + dev-ml/duration:= + >=dev-ml/fmt-0.8.9:= + dev-ml/lwt:= + dev-ml/mirage-clock:= + dev-ml/re:= + dev-ml/result:= + dev-ml/logs:= + dev-ml/uutf:= + dev-ml/uuidm:= +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/alcotest/alcotest-0.8.2.ebuild b/dev-ml/alcotest/alcotest-1.4.0-r1.ebuild index 40aa58ad9a07..dc71e978a2ab 100644 --- a/dev-ml/alcotest/alcotest-0.8.2.ebuild +++ b/dev-ml/alcotest/alcotest-1.4.0-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=7 -inherit opam +inherit dune DESCRIPTION="A lightweight and colourful test framework" HOMEPAGE="https://github.com/mirage/alcotest/" @@ -11,23 +11,23 @@ SRC_URI="https://github.com/mirage/alcotest/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="ISC" SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="test" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt" RDEPEND=" - dev-ml/fmt:= dev-ml/astring:= + dev-ml/async_unix:= dev-ml/cmdliner:= + <dev-ml/core-0.15:= + dev-ml/core_kernel:= + dev-ml/duration:= + >=dev-ml/fmt-0.8.9:= + dev-ml/lwt:= + dev-ml/mirage-clock:= + dev-ml/re:= dev-ml/result:= + dev-ml/logs:= + dev-ml/uutf:= + dev-ml/uuidm:= " -DEPEND="${RDEPEND} - dev-ml/jbuilder - dev-ml/findlib" - -src_compile() { - jbuilder build -p alcotest || die -} - -src_test() { - jbuilder runtest -p alcotest || die -} +DEPEND="${RDEPEND}" diff --git a/dev-ml/alcotest/alcotest-1.5.0-r3.ebuild b/dev-ml/alcotest/alcotest-1.5.0-r3.ebuild new file mode 100644 index 000000000000..a5d841de974a --- /dev/null +++ b/dev-ml/alcotest/alcotest-1.5.0-r3.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="A lightweight and colourful test framework" +HOMEPAGE="https://github.com/mirage/alcotest/" +SRC_URI="https://github.com/mirage/alcotest/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="ISC" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-ml/dune-2.8:= + dev-ml/astring:= + dev-ml/async_unix:0/0.14.0 + dev-ml/cmdliner:= + <dev-ml/core-0.15:= + dev-ml/core_kernel:= + dev-ml/duration:= + >=dev-ml/fmt-0.8.9:= + dev-ml/lwt:= + dev-ml/mirage-clock:= + dev-ml/re:= + dev-ml/result:= + dev-ml/logs:= + dev-ml/uutf:= + dev-ml/uuidm:= +" +DEPEND="${RDEPEND}" +BDEPEND="test? ( >=dev-ml/cmdliner-1.1.0 )" + +src_prepare() { + cp "${FILESDIR}"/unknown_option.processed \ + test/e2e/alcotest/failing/unknown_option.expected \ + || die + default +} diff --git a/dev-ml/alcotest/alcotest-1.6.0-r2.ebuild b/dev-ml/alcotest/alcotest-1.6.0-r2.ebuild new file mode 100644 index 000000000000..76ddf6ebc43f --- /dev/null +++ b/dev-ml/alcotest/alcotest-1.6.0-r2.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="A lightweight and colourful test framework" +HOMEPAGE="https://github.com/mirage/alcotest/" +SRC_URI="https://github.com/mirage/alcotest/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="ISC" +SLOT="0/${PV}" +KEYWORDS="amd64 ~arm ~arm64 ~x86" +IUSE="+ocamlopt" + +RDEPEND=" + >=dev-ml/dune-2.8:= + dev-ml/astring:= + dev-ml/async_kernel:= + dev-ml/async:= + >=dev-ml/async_unix-0.15.0:= + dev-ml/base:= + dev-ml/cmdliner:= + >=dev-ml/core-0.15.0:= + dev-ml/core_unix:0/0.15 + dev-ml/duration:= + >=dev-ml/fmt-0.8.9:= + dev-ml/lwt:= + dev-ml/mirage-clock:= + dev-ml/re:= + dev-ml/result:= + dev-ml/logs:= + dev-ml/uutf:= + dev-ml/uuidm:= +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/alcotest/alcotest-1.7.0.ebuild b/dev-ml/alcotest/alcotest-1.7.0.ebuild new file mode 100644 index 000000000000..8c39a207fc4e --- /dev/null +++ b/dev-ml/alcotest/alcotest-1.7.0.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="A lightweight and colourful test framework" +HOMEPAGE="https://github.com/mirage/alcotest/" +SRC_URI="https://github.com/mirage/alcotest/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="ISC" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86" +IUSE="+ocamlopt" + +RDEPEND=" + >=dev-ml/dune-3.0:= + dev-ml/astring:= + dev-ml/async_kernel:= + dev-ml/async:= + >=dev-ml/async_unix-0.15.0:= + dev-ml/base:= + dev-ml/cmdliner:= + >=dev-ml/core-0.15.0:= + dev-ml/core_unix:0/0.15 + dev-ml/duration:= + >=dev-ml/fmt-0.8.9:= + dev-ml/lwt:= + dev-ml/mirage-clock:= + dev-ml/re:= + dev-ml/result:= + dev-ml/logs:= + dev-ml/uutf:= + dev-ml/uuidm:= +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/alcotest/files/unknown_option.processed b/dev-ml/alcotest/files/unknown_option.processed new file mode 100644 index 000000000000..fc26b53daeb6 --- /dev/null +++ b/dev-ml/alcotest/files/unknown_option.processed @@ -0,0 +1,3 @@ +unknown_option.<ext>: unknown option '--dry-runn'. +Usage: unknown_option.<ext> [COMMAND] … +Try 'unknown_option.<ext> --help' for more information. diff --git a/dev-ml/alcotest/metadata.xml b/dev-ml/alcotest/metadata.xml index ffac9af607a7..33063c514b9c 100644 --- a/dev-ml/alcotest/metadata.xml +++ b/dev-ml/alcotest/metadata.xml @@ -1,9 +1,9 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">mirage/alcotest</remote-id> diff --git a/dev-ml/angstrom-async/Manifest b/dev-ml/angstrom-async/Manifest deleted file mode 100644 index c11fa486a8a6..000000000000 --- a/dev-ml/angstrom-async/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST angstrom-0.7.0.tar.gz 106216 BLAKE2B 4f11a3b7b2f36bf1e5eaea68cb6b4fc0ca6e8ae608fa5dbb80e51a011157acf43ba649bf336158c43cab16b9935aac4e9bdd6f7baa5568ef930149c45de4460b SHA512 c4980e38b45dae9d9584ca7a248870b5966e8d2286ea137acf4e61b981ff2584a3952be8be66a06885e72ae3d326fabe837cdb391a3001f04f66d7823b93d528 diff --git a/dev-ml/angstrom-async/angstrom-async-0.7.0.ebuild b/dev-ml/angstrom-async/angstrom-async-0.7.0.ebuild deleted file mode 100644 index d67309411be2..000000000000 --- a/dev-ml/angstrom-async/angstrom-async-0.7.0.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit opam - -DESCRIPTION="Parser combinators built for speed and memory efficiency" -HOMEPAGE="https://github.com/inhabitedtype/angstrom" -SRC_URI="https://github.com/inhabitedtype/angstrom/archive/${PV}.tar.gz -> angstrom-${PV}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND=" - dev-lang/ocaml:= - dev-ml/angstrom:= - dev-ml/async:= -" -DEPEND="${RDEPEND} - dev-ml/jbuilder" - -S="${WORKDIR}/angstrom-${PV}" - -src_compile() { - jbuilder build -p ${PN} || die -} - -src_test() { - jbuilder runtest -p ${PN} -} diff --git a/dev-ml/angstrom-lwt-unix/Manifest b/dev-ml/angstrom-lwt-unix/Manifest deleted file mode 100644 index c11fa486a8a6..000000000000 --- a/dev-ml/angstrom-lwt-unix/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST angstrom-0.7.0.tar.gz 106216 BLAKE2B 4f11a3b7b2f36bf1e5eaea68cb6b4fc0ca6e8ae608fa5dbb80e51a011157acf43ba649bf336158c43cab16b9935aac4e9bdd6f7baa5568ef930149c45de4460b SHA512 c4980e38b45dae9d9584ca7a248870b5966e8d2286ea137acf4e61b981ff2584a3952be8be66a06885e72ae3d326fabe837cdb391a3001f04f66d7823b93d528 diff --git a/dev-ml/angstrom-lwt-unix/angstrom-lwt-unix-0.7.0.ebuild b/dev-ml/angstrom-lwt-unix/angstrom-lwt-unix-0.7.0.ebuild deleted file mode 100644 index d746325abfcc..000000000000 --- a/dev-ml/angstrom-lwt-unix/angstrom-lwt-unix-0.7.0.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit opam - -DESCRIPTION="Parser combinators built for speed and memory efficiency" -HOMEPAGE="https://github.com/inhabitedtype/angstrom" -SRC_URI="https://github.com/inhabitedtype/angstrom/archive/${PV}.tar.gz -> angstrom-${PV}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND=" - dev-lang/ocaml:= - dev-ml/angstrom:= - dev-ml/lwt:= -" -DEPEND="${RDEPEND} - dev-ml/jbuilder" - -S="${WORKDIR}/angstrom-${PV}" - -src_compile() { - jbuilder build -p ${PN} || die -} - -src_test() { - jbuilder runtest -p ${PN} -} diff --git a/dev-ml/angstrom-lwt-unix/metadata.xml b/dev-ml/angstrom-lwt-unix/metadata.xml deleted file mode 100644 index cd1f003b6403..000000000000 --- a/dev-ml/angstrom-lwt-unix/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">inhabitedtype/angstrom</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/angstrom-unix/Manifest b/dev-ml/angstrom-unix/Manifest deleted file mode 100644 index c11fa486a8a6..000000000000 --- a/dev-ml/angstrom-unix/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST angstrom-0.7.0.tar.gz 106216 BLAKE2B 4f11a3b7b2f36bf1e5eaea68cb6b4fc0ca6e8ae608fa5dbb80e51a011157acf43ba649bf336158c43cab16b9935aac4e9bdd6f7baa5568ef930149c45de4460b SHA512 c4980e38b45dae9d9584ca7a248870b5966e8d2286ea137acf4e61b981ff2584a3952be8be66a06885e72ae3d326fabe837cdb391a3001f04f66d7823b93d528 diff --git a/dev-ml/angstrom-unix/angstrom-unix-0.7.0.ebuild b/dev-ml/angstrom-unix/angstrom-unix-0.7.0.ebuild deleted file mode 100644 index 40d81a856586..000000000000 --- a/dev-ml/angstrom-unix/angstrom-unix-0.7.0.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit opam - -DESCRIPTION="Parser combinators built for speed and memory efficiency" -HOMEPAGE="https://github.com/inhabitedtype/angstrom" -SRC_URI="https://github.com/inhabitedtype/angstrom/archive/${PV}.tar.gz -> angstrom-${PV}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND="dev-ml/angstrom:=" -DEPEND="${RDEPEND} - dev-ml/jbuilder" - -S="${WORKDIR}/angstrom-${PV}" - -src_compile() { - jbuilder build -p ${PN} || die -} - -src_test() { - jbuilder runtest -p ${PN} -} diff --git a/dev-ml/angstrom-unix/metadata.xml b/dev-ml/angstrom-unix/metadata.xml deleted file mode 100644 index cd1f003b6403..000000000000 --- a/dev-ml/angstrom-unix/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">inhabitedtype/angstrom</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/angstrom/Manifest b/dev-ml/angstrom/Manifest deleted file mode 100644 index c11fa486a8a6..000000000000 --- a/dev-ml/angstrom/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST angstrom-0.7.0.tar.gz 106216 BLAKE2B 4f11a3b7b2f36bf1e5eaea68cb6b4fc0ca6e8ae608fa5dbb80e51a011157acf43ba649bf336158c43cab16b9935aac4e9bdd6f7baa5568ef930149c45de4460b SHA512 c4980e38b45dae9d9584ca7a248870b5966e8d2286ea137acf4e61b981ff2584a3952be8be66a06885e72ae3d326fabe837cdb391a3001f04f66d7823b93d528 diff --git a/dev-ml/angstrom/angstrom-0.7.0.ebuild b/dev-ml/angstrom/angstrom-0.7.0.ebuild deleted file mode 100644 index 29b53a837077..000000000000 --- a/dev-ml/angstrom/angstrom-0.7.0.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit opam - -DESCRIPTION="Parser combinators built for speed and memory efficiency" -HOMEPAGE="https://github.com/inhabitedtype/angstrom" -SRC_URI="https://github.com/inhabitedtype/angstrom/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="test" - -RDEPEND="dev-ml/result:=" -DEPEND="${RDEPEND} - dev-ml/jbuilder - test? ( dev-ml/alcotest )" - -src_compile() { - jbuilder build -p ${PN} || die -} - -src_test() { - jbuilder runtest -p ${PN} -} diff --git a/dev-ml/astring/Manifest b/dev-ml/astring/Manifest index 90ced5f53e69..9de5e69087a9 100644 --- a/dev-ml/astring/Manifest +++ b/dev-ml/astring/Manifest @@ -1 +1 @@ -DIST astring-0.8.3.tbz 38710 BLAKE2B 253fe07b51996eb7b5f84e18d171b0f65cbb5abba9b241a02aa679765f3190edc636c1ba989910fde374a20c7615db1887eb73d8607f3bb8311e20ab6e67f670 SHA512 c7230e47b7ef14e6040fb18284a3d5aa8da1428b721cf91a7f17104cfb853be24b9c2aaa0b118bf3e050158aa8748311435417c6cf9014d260fb4379e4ead3e1 +DIST astring-0.8.5.tbz 37499 BLAKE2B bff0b9a295da9e33e0cc4bf1a5a0c3cec4010f477d67a39650bbb8e61f12e517cd5734f1e869d35448e4e555a04d0223b76181f29ee299ef9f19359c7d59e69a SHA512 b40634cc2053d651bce5c1974996b352ffa48ecac429919113840b2a807efb34387d950f12accb346afd5e40514cb90219d70b00109c30e1450c4e99f65c9856 diff --git a/dev-ml/astring/astring-0.8.3.ebuild b/dev-ml/astring/astring-0.8.3.ebuild deleted file mode 100644 index cd17e8514586..000000000000 --- a/dev-ml/astring/astring-0.8.3.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit opam - -DESCRIPTION="Alternative String module for OCaml" -HOMEPAGE="http://erratique.ch/software/astring https://github.com/dbuenzli/astring" -SRC_URI="http://erratique.ch/software/astring/releases/${P}.tbz" - -LICENSE="ISC" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND="dev-lang/ocaml:=[ocamlopt]" -DEPEND="${RDEPEND} - dev-ml/topkg - dev-ml/ocamlbuild - dev-ml/findlib" - -src_compile() { - ocaml pkg/pkg.ml build || die -} diff --git a/dev-ml/astring/astring-0.8.5.ebuild b/dev-ml/astring/astring-0.8.5.ebuild new file mode 100644 index 000000000000..d6aaf301a39f --- /dev/null +++ b/dev-ml/astring/astring-0.8.5.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit opam + +DESCRIPTION="Alternative String module for OCaml" +HOMEPAGE="https://erratique.ch/software/astring https://github.com/dbuenzli/astring" +SRC_URI="https://erratique.ch/software/astring/releases/${P}.tbz" + +LICENSE="ISC" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" + +OCAML_DEP=">=dev-lang/ocaml-4.05.0:=" +BDEPEND=" + dev-ml/ocamlbuild + dev-ml/findlib + dev-ml/topkg + ${OCAML_DEP} +" +RDEPEND="${OCAML_DEP}" + +src_compile() { + ocaml pkg/pkg.ml build || die +} diff --git a/dev-ml/astring/metadata.xml b/dev-ml/astring/metadata.xml index 7f44ca0a6b88..77058ca4dd9c 100644 --- a/dev-ml/astring/metadata.xml +++ b/dev-ml/astring/metadata.xml @@ -1,11 +1,9 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">dbuenzli/astring</remote-id> + <changelog>https://github.com/dbuenzli/astring/blob/master/CHANGES.md</changelog> </upstream> </pkgmetadata> diff --git a/dev-ml/async/Manifest b/dev-ml/async/Manifest index d0c778ae6386..a95b1ffaa0de 100644 --- a/dev-ml/async/Manifest +++ b/dev-ml/async/Manifest @@ -1 +1,3 @@ -DIST async-0.9.0.tar.gz 17856 BLAKE2B b7206641936aa430ddc35091b89c465fe0abd98883c9206f3a978372dc016a35f41a228adf906def56f894eafabdb223463a77fc690e373bbd5284c590871924 SHA512 93c0fa4d6e7d1c4dff1f460db8ec95b3eea1d7c19fda117bb9efc8711f4908d2922467c33f66659395169ead9b37931da16a85a031d6073fc9296c218f2c55bb +DIST async-0.14.0.tar.gz 65025 BLAKE2B 39e2bef8df12a9733b9ff11ce1bba22b095f79532ff27999e617db5c145e57ab2e1f7f9435a5952312a84dd75b24d76fd4279c524be933e8ded5be7b00d6729a SHA512 3e57ea742ab28d008e1c0b39a6fc6d0ac3ca78b644f678f79b9ceb8d9acb23fcd45fed52f744906ab6d9b87955a27a8e4512043db45a7c836323d96433124b5c +DIST async-0.15.0.tar.gz 73958 BLAKE2B 696e175c9f67760da7723ec93670a7360ffb59bd192eb2632172c76018b9964cfa005878af9a00a6adc09db99ca7d1cfda2eb286a2e4337e3d4986cdabec5d78 SHA512 61d83e23394f819f02df0e4702a7cd6f82418da3a8ef62513d99fb7c9c1052fcf80f90f95ab41977aebf3b54e09a0595768131a9b61a5d28f47a920492bca0bb +DIST async-0.16.0.tar.gz 77022 BLAKE2B 0df5cc12772b013f780c1a8b146f65442d11dce61b762fe0aff3f45ef67190ab786e5149fa568156d31410def6bf62f8cfa6d943b40a4720f1d84f03883a5d3b SHA512 4668387de903654e9a73eb8218c9a70d5652d7e8ee255e0dfa6f86c4ba99260e9303499b97ff288c8184ba7e77c47964bfce2ce27bbbab4e4d59d2c9f6863505 diff --git a/dev-ml/async/async-0.9.0.ebuild b/dev-ml/async/async-0.14.0.ebuild index e1ba15eb9c98..5f2a17b7ce82 100644 --- a/dev-ml/async/async-0.9.0.ebuild +++ b/dev-ml/async/async-0.14.0.ebuild @@ -1,26 +1,30 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit opam +inherit dune DESCRIPTION="Jane Street Capital's asynchronous execution library" HOMEPAGE="https://github.com/janestreet/async" SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="Apache-2.0" +LICENSE="MIT" SLOT="0/${PV}" KEYWORDS="~amd64" -IUSE="" +IUSE="+ocamlopt" + +# Need qtest_lib, netkit_sockets +# Unpackaged test deps +RESTRICT="test" RDEPEND=" dev-ml/async_extra:= dev-ml/async_kernel:= dev-ml/async_unix:= dev-ml/core:= - dev-ml/ppx_driver:= + dev-ml/core_kernel:= dev-ml/ppx_jane:= - dev-ml/ocaml-migrate-parsetree:= + dev-ml/textutils:= " -DEPEND="${RDEPEND} dev-ml/jbuilder" +DEPEND="${RDEPEND}" diff --git a/dev-ml/async/async-0.15.0.ebuild b/dev-ml/async/async-0.15.0.ebuild new file mode 100644 index 000000000000..d5b3b17e5e67 --- /dev/null +++ b/dev-ml/async/async-0.15.0.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Jane Street Capital's asynchronous execution library" +HOMEPAGE="https://github.com/janestreet/async" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86" +IUSE="+ocamlopt" + +# Need qtest_lib, netkit_sockets +# Unpackaged test deps +RESTRICT="test" + +RDEPEND=" + dev-ml/async_rpc_kernel:${SLOT} + dev-ml/async_unix:${SLOT} + dev-ml/textutils:${SLOT} +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/async/async-0.16.0.ebuild b/dev-ml/async/async-0.16.0.ebuild new file mode 100644 index 000000000000..3bd14cb8c36e --- /dev/null +++ b/dev-ml/async/async-0.16.0.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Jane Street Capital's asynchronous execution library" +HOMEPAGE="https://github.com/janestreet/async" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="+ocamlopt" + +# Need qtest_lib, netkit_sockets +# Unpackaged test deps +RESTRICT="test" + +RDEPEND=" + >=dev-lang/ocaml-4.14 + dev-ml/async_kernel:${SLOT} + dev-ml/async_rpc_kernel:${SLOT} + dev-ml/async_unix:${SLOT} + dev-ml/core:${SLOT} + dev-ml/core_kernel:${SLOT} + dev-ml/core_unix:${SLOT} + dev-ml/ppx_jane:${SLOT} + dev-ml/ppx_log:${SLOT} + dev-ml/ppx_module_timer:= + dev-ml/textutils:${SLOT} +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/async/metadata.xml b/dev-ml/async/metadata.xml index c444611196e7..2077842c47b0 100644 --- a/dev-ml/async/metadata.xml +++ b/dev-ml/async/metadata.xml @@ -1,9 +1,9 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">janestreet/async</remote-id> diff --git a/dev-ml/async_extra/Manifest b/dev-ml/async_extra/Manifest index ded955faf4de..67871c5a2a3a 100644 --- a/dev-ml/async_extra/Manifest +++ b/dev-ml/async_extra/Manifest @@ -1 +1,2 @@ -DIST async_extra-0.9.0.tar.gz 105722 BLAKE2B 5c371478b1507ddd63bbafb26858752f483a970cbdad174d62032a102fc8ded517ed87581a81b265cce82c9c27a85e09ca6df3209dbe86a35e71cbf35e027d39 SHA512 6f0d69a389e66e47cd0a3cf288c2b0242299e5c3befa77f7a656bc30dfb63f78e5287c4de5e80473c1ce2ee5fed038bf0b4d2b94eb73f045b20f40b14868fa1a +DIST async_extra-0.14.0.tar.gz 17746 BLAKE2B 46367dfb909ea02100be7718edbee8deac1c9019232723af6d80cf2567b2d17b316ae2355ffd9c9cd7897c3409c50cd4a7105a44a153eac02fa6326c195f237d SHA512 c646d9f69dac06aba973a837e295502b45bcda3ffbf3971f283035f2f60b5f92777fa105a08827971e8eae563b12b019341b29f30703b6490fec38d276a74199 +DIST async_extra-0.15.0.tar.gz 18236 BLAKE2B d780885e26fe49499f616d70acfafeff5022c9f6a6bcb0a6f89149162e10c5f921edf250bf31556fa5d845a1d1e95a91f650a00f8d8c23931742d70f183f7dc8 SHA512 d54c324b615dd6575024a1694790e247f1982949399aaab4b75a8918d819798c64c6d3a5fafd17274d3a3b0b45b7e3b022b4e263aad9701c2eecce3c25d032b7 diff --git a/dev-ml/async_extra/async_extra-0.9.0.ebuild b/dev-ml/async_extra/async_extra-0.14.0.ebuild index 06c9100af230..c053cf2c1f9f 100644 --- a/dev-ml/async_extra/async_extra-0.9.0.ebuild +++ b/dev-ml/async_extra/async_extra-0.14.0.ebuild @@ -1,32 +1,24 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 + +inherit dune DESCRIPTION="Jane Street Capital's asynchronous execution library (extra)" HOMEPAGE="https://github.com/janestreet/async_extra" SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="Apache-2.0" +LICENSE="MIT" SLOT="0/${PV}" KEYWORDS="~amd64" -IUSE="" +IUSE="+ocamlopt" -RDEPEND=">=dev-lang/ocaml-4.02.0:= +RDEPEND=" dev-ml/async_kernel:= dev-ml/async_rpc_kernel:= dev-ml/async_unix:= - dev-ml/core:= - dev-ml/ppx_driver:= + dev-ml/core_kernel:= dev-ml/ppx_jane:= - dev-ml/ocaml-migrate-parsetree:= " -DEPEND="${RDEPEND} dev-ml/opam dev-ml/jbuilder" - -src_install() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - ${PN}.install || die -} +DEPEND="${RDEPEND}" diff --git a/dev-ml/async_extra/async_extra-0.15.0.ebuild b/dev-ml/async_extra/async_extra-0.15.0.ebuild new file mode 100644 index 000000000000..eeeca95a16e6 --- /dev/null +++ b/dev-ml/async_extra/async_extra-0.15.0.ebuild @@ -0,0 +1,18 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Jane Street Capital's asynchronous execution library (extra)" +HOMEPAGE="https://github.com/janestreet/async_extra" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" +IUSE="+ocamlopt" + +RDEPEND="dev-ml/async_kernel:${SLOT}" +DEPEND="${RDEPEND}" diff --git a/dev-ml/async_extra/metadata.xml b/dev-ml/async_extra/metadata.xml index e8e993916222..4f2433f3e01b 100644 --- a/dev-ml/async_extra/metadata.xml +++ b/dev-ml/async_extra/metadata.xml @@ -1,10 +1,7 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">janestreet/async_extra</remote-id> </upstream> diff --git a/dev-ml/async_js/Manifest b/dev-ml/async_js/Manifest deleted file mode 100644 index c7213bfe06a2..000000000000 --- a/dev-ml/async_js/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST async_js-0.9.0.tar.gz 13597 BLAKE2B 6c2ee0820c0291d3b292f7fac629d3bd19fa4a07385b1805842c41cf96510e67c104e98064419c64cf74a70d79cecc9dff575f16b12162fee36dfc94ce3f080e SHA512 f188a023e105d409c10ff1517eba5f7c543ed1bdb9e81863569c34d911379cc00b704b8b9081e0041dac2e63dc48efc01763f199de5e5b8693533d2815fe2b4b diff --git a/dev-ml/async_js/async_js-0.9.0.ebuild b/dev-ml/async_js/async_js-0.9.0.ebuild deleted file mode 100644 index fecdc074310d..000000000000 --- a/dev-ml/async_js/async_js-0.9.0.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Async support for JavaScript platforms" -HOMEPAGE="https://github.com/janestreet/async_js" -SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND=" - dev-lang/ocaml:= - dev-ml/async_kernel:= - dev-ml/async_rpc_kernel:= - dev-ml/ppx_driver:= - dev-ml/ppx_jane:= - dev-ml/js_of_ocaml:= - dev-ml/ocaml-migrate-parsetree:= -" -DEPEND="${RDEPEND} - dev-ml/opam - dev-ml/jbuilder -" - -src_install() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - ${PN}.install || die -} diff --git a/dev-ml/async_js/metadata.xml b/dev-ml/async_js/metadata.xml deleted file mode 100644 index bdd4090e1b9c..000000000000 --- a/dev-ml/async_js/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">janestreet/async_js</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/async_kernel/Manifest b/dev-ml/async_kernel/Manifest index 091c80e7f7ea..6e4a320ead96 100644 --- a/dev-ml/async_kernel/Manifest +++ b/dev-ml/async_kernel/Manifest @@ -1 +1,3 @@ -DIST async_kernel-0.9.0.tar.gz 132837 BLAKE2B cbd1748459bca8691a6051b54beb177858707e166350c9f431d48cab1379adc557a4240f66efa0557cfef9c9ffa00fb458cb8d83a5466651ac40d01228524ed7 SHA512 a2aaa28cce736509bd77041694cbce482f698274144acebabd5db9f3186e0c0bab32196634f5fb19e3921141e0a2b849df8bc0d67e843292cbe3fd301848e519 +DIST async_kernel-0.14.0.tar.gz 138191 BLAKE2B 0f8096eb1cfabcdb4b3148f8d2cb3d5f8c858da74986ac107e7592195dab6e6563c0adb8f39f22a8d3b279b994c937e345b6c56d03a5767672913c7316ecd1fb SHA512 9324f17527311e3c112203b7caa2b0b7dfea15bdb30d02d7218c7b8d8c930d4893d83043016ad064265cedc191985400dbaf2d0af448f840c98ef98326aac8ff +DIST async_kernel-0.15.0.tar.gz 148527 BLAKE2B 535a64a204332bcc41e6c4ef5ff78fa81ec785bb29404b278ba93e093452354b045aacde98b0f2e6598bcd5fe29a86ee476f2f48f018c69acb7d217d4ba9a60b SHA512 35bf6561b0dfcfd1bfd786de9f47a78deee5718fb449de648f9b1cfd2568c00cd7044b33dce12ce48d1ed704e61fefe3f2d2b1681c9f73c6fced0aefb0423b63 +DIST async_kernel-0.16.0.tar.gz 155521 BLAKE2B 9968e15fba844b35c595811cfc953aff71adfbcd26765060dcf8733907d1e71c771ed8eff27ae10967ee287d25c0af6a8945afbcf40eccb239d00212264c0c13 SHA512 8fb53e1802d5992698dcc8ce56b04e898bc3c9402a04462a63854754a7d2900a0760d09c5526e92114fc5eca3857757613deb9ef88552c020f04a1956590f13a diff --git a/dev-ml/async_kernel/async_kernel-0.14.0.ebuild b/dev-ml/async_kernel/async_kernel-0.14.0.ebuild new file mode 100644 index 000000000000..dc737edb9688 --- /dev/null +++ b/dev-ml/async_kernel/async_kernel-0.14.0.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Jane Street Capital's asynchronous execution library (core)" +HOMEPAGE="https://github.com/janestreet/async_kernel" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +RDEPEND=" + dev-ml/core_kernel:= + dev-ml/ppx_jane:= +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/async_kernel/async_kernel-0.15.0.ebuild b/dev-ml/async_kernel/async_kernel-0.15.0.ebuild new file mode 100644 index 000000000000..d14b497e220b --- /dev/null +++ b/dev-ml/async_kernel/async_kernel-0.15.0.ebuild @@ -0,0 +1,18 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Jane Street Capital's asynchronous execution library (core)" +HOMEPAGE="https://github.com/janestreet/async_kernel" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86" +IUSE="+ocamlopt" + +RDEPEND="dev-ml/core_kernel:${SLOT}" +DEPEND="${RDEPEND}" diff --git a/dev-ml/async_kernel/async_kernel-0.16.0.ebuild b/dev-ml/async_kernel/async_kernel-0.16.0.ebuild new file mode 100644 index 000000000000..3ae6dc07bd49 --- /dev/null +++ b/dev-ml/async_kernel/async_kernel-0.16.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Jane Street Capital's asynchronous execution library (core)" +HOMEPAGE="https://github.com/janestreet/async_kernel" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +RDEPEND=" + >=dev-lang/ocaml-4.14 + dev-ml/core:${SLOT} + dev-ml/core_kernel:${SLOT} + dev-ml/ppx_jane:${SLOT} +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/async_kernel/async_kernel-0.9.0.ebuild b/dev-ml/async_kernel/async_kernel-0.9.0.ebuild deleted file mode 100644 index e563147731ce..000000000000 --- a/dev-ml/async_kernel/async_kernel-0.9.0.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Jane Street Capital's asynchronous execution library (core)" -HOMEPAGE="https://github.com/janestreet/async_kernel" -SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND=">=dev-lang/ocaml-4.02.0:= - dev-ml/core_kernel:= - dev-ml/ppx_driver:= - dev-ml/ppx_jane:= - dev-ml/ocaml-migrate-parsetree:= -" -DEPEND="${RDEPEND} dev-ml/opam dev-ml/jbuilder" - -src_install() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - ${PN}.install || die -} diff --git a/dev-ml/async_kernel/metadata.xml b/dev-ml/async_kernel/metadata.xml index c67db9f27c24..84b93df47b35 100644 --- a/dev-ml/async_kernel/metadata.xml +++ b/dev-ml/async_kernel/metadata.xml @@ -1,9 +1,9 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">janestreet/async_kernel</remote-id> diff --git a/dev-ml/async_rpc_kernel/Manifest b/dev-ml/async_rpc_kernel/Manifest index 92905a071a71..b17268e641e0 100644 --- a/dev-ml/async_rpc_kernel/Manifest +++ b/dev-ml/async_rpc_kernel/Manifest @@ -1 +1,3 @@ -DIST async_rpc_kernel-0.9.0.tar.gz 57411 BLAKE2B 43d07ed0d8e529daf63bf7ee9ff109d765bba0aa2c849e72eb2b60e27d1d1f465fe41ee39b8bc883c6eb63c83c43dde8abc7d7734737bc9819a870d91de18e9e SHA512 4c93165f78a92ae4904503b18072a775ea3ab0f49e460404741bd4daf3f6c483da3dfa987f7013a41dce348a8e95664b4784d175256ccd52a2d8df8e89d3c136 +DIST async_rpc_kernel-0.14.0.tar.gz 61643 BLAKE2B d80159c598470718196fe33893a3346d4ac3f7a781ef453e9eaa90cbeede83c97b9333625cd3d0552ea5b14ae039f98c204c4f658dd7810ea4ae449b967f755f SHA512 991b7cdb71b0363355a93fca009cd5d982de4d749c356b208987d1ae9c9b48fce5c59c4b4697042034135ad4c1a9467eb1a5d1f43237c5b081ab3aba2d72bb10 +DIST async_rpc_kernel-0.15.0.tar.gz 65182 BLAKE2B bd809bcdb17de6fe2765bc536b26c6c6daa9125c64a9dccdc80417136000624c3eeff36fc404d1e3f04535fb6f256af8ac7eec5e5547147f2f343104095e50ce SHA512 29ddd5cffd53acd02de1dfac2291d74e69673c6fab6586e8ed2d0edff98b176dbe05b80da0839d394e7601e1a33aec5bafb9678a46665c847878567378e2e648 +DIST async_rpc_kernel-0.16.0.tar.gz 76163 BLAKE2B 14a293ee65f207b28a755799162cd66346ec54bedd01c1cfb7b9d413a4c278c332ee7724320c688aea19148935aad6f5cc2d96a3f653de0d8ff32cbb568cc4a7 SHA512 62381da44300df9f2c422fb1e439fe00316a5017963c2a3fb5d8b52f6268944cc52ec4b6b2cd694798717eaee2282e3bb10c59a7dc76ac41b2d319595e658e0f diff --git a/dev-ml/async_rpc_kernel/async_rpc_kernel-0.9.0.ebuild b/dev-ml/async_rpc_kernel/async_rpc_kernel-0.14.0-r1.ebuild index efbafe69d388..bbaa645aa090 100644 --- a/dev-ml/async_rpc_kernel/async_rpc_kernel-0.9.0.ebuild +++ b/dev-ml/async_rpc_kernel/async_rpc_kernel-0.14.0-r1.ebuild @@ -1,31 +1,23 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 + +inherit dune DESCRIPTION="Platform-independent core of Async RPC library" HOMEPAGE="https://github.com/janestreet/async_rpc_kernel" SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="Apache-2.0" +LICENSE="MIT" SLOT="0/${PV}" KEYWORDS="~amd64" -IUSE="" +IUSE="+ocamlopt" RDEPEND=" - dev-lang/ocaml:= dev-ml/async_kernel:= dev-ml/core_kernel:= - dev-ml/ppx_driver:= dev-ml/ppx_jane:= - dev-ml/ocaml-migrate-parsetree:= + dev-ml/protocol_version_header:= " -DEPEND="${RDEPEND} dev-ml/opam dev-ml/jbuilder" - -src_install() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - ${PN}.install || die -} +DEPEND="${RDEPEND}" diff --git a/dev-ml/async_rpc_kernel/async_rpc_kernel-0.15.0.ebuild b/dev-ml/async_rpc_kernel/async_rpc_kernel-0.15.0.ebuild new file mode 100644 index 000000000000..7fed53908152 --- /dev/null +++ b/dev-ml/async_rpc_kernel/async_rpc_kernel-0.15.0.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Platform-independent core of Async RPC library" +HOMEPAGE="https://github.com/janestreet/async_rpc_kernel" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86" +IUSE="+ocamlopt" + +RDEPEND=" + dev-ml/async_kernel:${SLOT} + dev-ml/protocol_version_header:${SLOT} +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/async_rpc_kernel/async_rpc_kernel-0.16.0.ebuild b/dev-ml/async_rpc_kernel/async_rpc_kernel-0.16.0.ebuild new file mode 100644 index 000000000000..8e3831a5982a --- /dev/null +++ b/dev-ml/async_rpc_kernel/async_rpc_kernel-0.16.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Platform-independent core of Async RPC library" +HOMEPAGE="https://github.com/janestreet/async_rpc_kernel" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +RDEPEND=" + >=dev-lang/ocaml-4.14 + dev-ml/async_kernel:${SLOT} + dev-ml/core:${SLOT} + dev-ml/protocol_version_header:${SLOT} +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/async_rpc_kernel/metadata.xml b/dev-ml/async_rpc_kernel/metadata.xml index e2129d2f8804..233f090c52ee 100644 --- a/dev-ml/async_rpc_kernel/metadata.xml +++ b/dev-ml/async_rpc_kernel/metadata.xml @@ -1,12 +1,12 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="bitbucket">yminsky/ocaml-core</remote-id> - <remote-id type="github">janestreet/async_rpc_kernel</remote-id> - </upstream> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="bitbucket">yminsky/ocaml-core</remote-id> + <remote-id type="github">janestreet/async_rpc_kernel</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-ml/async_ssl/Manifest b/dev-ml/async_ssl/Manifest deleted file mode 100644 index 24567712360b..000000000000 --- a/dev-ml/async_ssl/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST async_ssl-0.9.0.tar.gz 28227 BLAKE2B e916e196964d085312836d773e290ac52c950c5ceb084347557d72776c7b6b9548ad2bd01c5fc6fa701d18c55fff62e48af5459bf5897478252f8d27dd6687fc SHA512 bb023e0c60f9f04368f2e2a4aea80700a60853a03fe1550fe48a9defe42ec66736a6cc0cf40c6a472cd3f8b5b30d79711e4fd714b53ebd4ba7f3f3c22eb7a15e -DIST async_ssl-0.9.1.tar.gz 28162 BLAKE2B 74987fcad26dcb641687e044ef76531cfa88e2bb62524d0eddf5ce3fe4f4dc9c7b07f13de63e9cdddd4a5db2e7e20f2a7f3a8543b17678a342e2890ed816189a SHA512 5e20d3c2a46e81d725076a80347047de90d00d6a0956457656ffd629d80b7a65958fd8a831d407dd11e3a3583662ed1e04242e71580ab7e982dc579ee69bface diff --git a/dev-ml/async_ssl/async_ssl-0.9.0.ebuild b/dev-ml/async_ssl/async_ssl-0.9.0.ebuild deleted file mode 100644 index 92946fd066df..000000000000 --- a/dev-ml/async_ssl/async_ssl-0.9.0.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="An Async-pipe-based interface with OpenSSL." -HOMEPAGE="https://github.com/janestreet/async_ssl" -SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND=" - dev-lang/ocaml:= - dev-ml/async:= - dev-ml/base:= - dev-ml/configurator:= - dev-ml/core:= - dev-ml/ppx_driver:= - dev-ml/ppx_jane:= - dev-ml/stdio:= - dev-ml/ocaml-ctypes:= - dev-libs/openssl:0= - dev-ml/ocaml-migrate-parsetree:= -" -DEPEND="${RDEPEND} - dev-ml/opam - dev-ml/jbuilder -" - -src_install() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - ${PN}.install || die -} diff --git a/dev-ml/async_ssl/async_ssl-0.9.1.ebuild b/dev-ml/async_ssl/async_ssl-0.9.1.ebuild deleted file mode 100644 index aece7ea02729..000000000000 --- a/dev-ml/async_ssl/async_ssl-0.9.1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="An Async-pipe-based interface with OpenSSL." -HOMEPAGE="https://github.com/janestreet/async_ssl" -SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND=" - dev-lang/ocaml:= - dev-ml/async:= - dev-ml/base:= - dev-ml/configurator:= - dev-ml/core:= - dev-ml/ppx_driver:= - dev-ml/ppx_jane:= - dev-ml/stdio:= - dev-ml/ocaml-ctypes:= - dev-libs/openssl:0= - dev-ml/ocaml-migrate-parsetree:= -" -DEPEND="${RDEPEND} - dev-ml/opam - dev-ml/jbuilder -" - -src_install() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - ${PN}.install || die -} diff --git a/dev-ml/async_ssl/metadata.xml b/dev-ml/async_ssl/metadata.xml deleted file mode 100644 index 630439141b0e..000000000000 --- a/dev-ml/async_ssl/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">janestreet/async_ssl</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/async_unix/Manifest b/dev-ml/async_unix/Manifest index c549f2c3b3bf..225fadb32619 100644 --- a/dev-ml/async_unix/Manifest +++ b/dev-ml/async_unix/Manifest @@ -1 +1,3 @@ -DIST async_unix-0.9.0.tar.gz 156717 BLAKE2B cce40cb1074ae7a6f38fa8df80dc4787be24a500ed9576bd737fc5db8d1d3f31ccc14cad9b134bccc8257004e421201c410b7c3b19373a282b50817b3ccebd7c SHA512 cd3fb43ffcde8fe01386a0460beb52e2530786dc0abce318c5241243e123ebd57fbf4cff8c91300483f33ae5dc1c0cc591992dc55286dc6ec550be62afb33b42 +DIST async_unix-0.14.0.tar.gz 171624 BLAKE2B 4c55b6c8ba8cd59ede4b214ec84d8689700e46b918a96e145f94ebd011c32de6c2ab40c35a4c821ac58872259740b752e045eb2ac7954ecb0b988ceaf1b75ff2 SHA512 d90713d1d35445a648392e9104eedd25d4c7e6a10a46d0442539c1521349dcbee4118e852cc8335c8c03ba4d1050f199eb91a6e3c3c827dca8eee59501f379be +DIST async_unix-0.15.0.tar.gz 178320 BLAKE2B 825efe071ecfb39ff0d5586cd8981c31a4692ee5b44727fdb22d68bfc08f9f1e296a363b87c308bef7cdd557dc9124da21bd1e772fe47dcde917b6bc5024500d SHA512 d6bb561ca06b3232c11c10bfe9dbd689020d52dc90f13f01751abf31f968649c7c8664f5f58de95c89f012de00c789efa9c0ca230ba32b9105c609d1afca2a51 +DIST async_unix-0.16.0.tar.gz 186267 BLAKE2B 1f4be6e324658d50554c7ba252de4f85c9439492ed35a3e453113c443b848bef63684b1ae752f70994b5b224e00110364442ea032a345f9f3982542e306d47e6 SHA512 9fe8f61cb3a27e9974aefa40596df744dad75aca037b0b8347c87f86f63832a993f8306c0b0e7cbf7affcedc50a53ae32bdf3be40cee04d1e41653e3697bd991 diff --git a/dev-ml/async_unix/async_unix-0.14.0.ebuild b/dev-ml/async_unix/async_unix-0.14.0.ebuild new file mode 100644 index 000000000000..21ea506bd4f5 --- /dev/null +++ b/dev-ml/async_unix/async_unix-0.14.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Jane Street Capital's asynchronous execution library (unix)" +HOMEPAGE="https://github.com/janestreet/async_unix" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +RDEPEND=" + dev-ml/async_kernel:= + =dev-ml/core-0.14*:= + dev-ml/core_kernel:= + dev-ml/ppx_jane:= +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/async_unix/async_unix-0.15.0.ebuild b/dev-ml/async_unix/async_unix-0.15.0.ebuild new file mode 100644 index 000000000000..152bc4e66e5d --- /dev/null +++ b/dev-ml/async_unix/async_unix-0.15.0.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Jane Street Capital's asynchronous execution library (unix)" +HOMEPAGE="https://github.com/janestreet/async_unix" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86" +IUSE="+ocamlopt" + +RDEPEND=" + dev-ml/async_kernel:${SLOT} + dev-ml/core_unix:${SLOT} +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/async_unix/async_unix-0.16.0.ebuild b/dev-ml/async_unix/async_unix-0.16.0.ebuild new file mode 100644 index 000000000000..c8ec8cfad6cf --- /dev/null +++ b/dev-ml/async_unix/async_unix-0.16.0.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Jane Street Capital's asynchronous execution library (unix)" +HOMEPAGE="https://github.com/janestreet/async_unix" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="+ocamlopt" + +RDEPEND=" + >=dev-lang/ocaml-4.14 + dev-ml/async_kernel:${SLOT} + dev-ml/core:${SLOT} + dev-ml/core_kernel:${SLOT} + dev-ml/core_unix:${SLOT} + dev-ml/ppx_jane:${SLOT} +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/async_unix/async_unix-0.9.0.ebuild b/dev-ml/async_unix/async_unix-0.9.0.ebuild deleted file mode 100644 index aac9eccd0f0a..000000000000 --- a/dev-ml/async_unix/async_unix-0.9.0.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Jane Street Capital's asynchronous execution library (unix)" -HOMEPAGE="https://github.com/janestreet/async_unix" -SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND=" - >=dev-lang/ocaml-4.02.0:= - dev-ml/async_kernel:= - dev-ml/core:= - dev-ml/ppx_driver:= - dev-ml/ppx_jane:= - dev-ml/ocaml-migrate-parsetree:= - <dev-ml/ppx_driver-100 - <dev-ml/ppx_jane-100 -" -DEPEND="${RDEPEND} dev-ml/opam dev-ml/jbuilder" - -src_install() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - ${PN}.install || die -} diff --git a/dev-ml/async_unix/metadata.xml b/dev-ml/async_unix/metadata.xml index 59be8f51a754..517a5e2afdfd 100644 --- a/dev-ml/async_unix/metadata.xml +++ b/dev-ml/async_unix/metadata.xml @@ -1,9 +1,9 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">janestreet/async_unix</remote-id> diff --git a/dev-ml/atd/Manifest b/dev-ml/atd/Manifest index 606465ee2142..42ed8f1b5c85 100644 --- a/dev-ml/atd/Manifest +++ b/dev-ml/atd/Manifest @@ -1,3 +1,2 @@ -DIST atd-1.12.0.tar.gz 145428 BLAKE2B d9cc3b98567383e1a5dbb068165f144fb033e17030f979eb20963837b96f93d9b950943d59d1d0f348fed28ec05c5906ce6672f848d428193379670f5c4b51c4 SHA512 c24601b276da7837bc896bb42b2e0fa91ebfbf07759560c2490ed44bef722dcf8d586aaba1e62abff262805cab89996835611ab9fb68aa096dfc84bb55365475 -DIST atd-1.2.0.tar.gz 41300 BLAKE2B 3919de0a2ca5b071d2cfdab8b74c6f528bc6c1b6965e6a29d8ddfda89ac6db0fd2b6e1012e052370a9ca555c392176f68339c193076b082c79ebbedcd4146817 SHA512 a52824c9784ac0f4d6f314972fa1d92be14730de3c6bde04032004579ac27408385bd4fa7d926f9d564657eb62050fd732a032f364bada62a1dc7a8acfacb727 -DIST atd-1.2.1.tar.gz 39018 BLAKE2B 313a3019428f187051209e8eb2bec99f9a8fdefdb4da342c50bd54b42378c0c5eda988e13413c567765f8504ee24599fc440fdad6b8a3e728189df0f3b9f1939 SHA512 5dde8dd1e6ca53ae2ff7efc873211079678a824ae7a9d4182d58e3e10ce50a9dcd705de7168a8cfb12ea3d030a0d01b2485d436e77bfa48c14df7628b47161dc +DIST atd-2.12.0.tar.gz 3302788 BLAKE2B 12688b6971eb600106a56ae4e75228c562d6f482867114737d8037ab1543daa8b3f9dce85732f79f57b7f8d917641a165c2bbc40474e7e39427a97286f0a5c9b SHA512 96a0cb809bc1a063104b9941d1552ce2906cd1ed6348b8350cd4b095251c1f3a189f2e696ee28bce1a71a8601d906d22f600fa381ac318c0b7d7b2f84c328037 +DIST atd-2.15.0.tar.gz 3352231 BLAKE2B 4e5ca04bef5f534da3191ee740b1879ffa6a7886498eb988e3124e85daf35942ce81954e7e08e4074c75bc8c528237c16d24bd44b9576f03ea3a90b7fad4d437 SHA512 e9a777d9453ccc8f41f907d130bbf3d094ab373bbb89eb6ee02b24f046cbc3a0881a33b9bf3b01674cbae3e586589eeae50a64ad7c7877b50fc764d05abd12fe diff --git a/dev-ml/atd/atd-1.12.0.ebuild b/dev-ml/atd/atd-1.12.0.ebuild deleted file mode 100644 index 5095732e9dd9..000000000000 --- a/dev-ml/atd/atd-1.12.0.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit findlib - -DESCRIPTION="Syntax for cross-language type definitions" -HOMEPAGE="https://github.com/mjambon/atd" -SRC_URI="https://github.com/mjambon/atd/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="+ocamlopt test" - -DEPEND=" - dev-lang/ocaml:=[ocamlopt?] - dev-ml/easy-format:=[ocamlopt?] - dev-ml/menhir:=[ocamlopt?] -" -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} - dev-ml/jbuilder - dev-ml/opam - test? ( - dev-ml/biniou - dev-ml/yojson - ) -" - -src_compile() { - jbuilder build -p atd || die -} - -oinstall() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - ${1}.install || die -} - -src_install() { - oinstall atd -} diff --git a/dev-ml/atd/atd-1.2.0.ebuild b/dev-ml/atd/atd-1.2.0.ebuild deleted file mode 100644 index 8f343658f391..000000000000 --- a/dev-ml/atd/atd-1.2.0.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit findlib - -DESCRIPTION="Syntax for cross-language type definitions" -HOMEPAGE="https://github.com/mjambon/atd" -SRC_URI="https://github.com/mjambon/atd/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="+ocamlopt" - -DEPEND=" - dev-lang/ocaml:=[ocamlopt?] - dev-ml/easy-format:=[ocamlopt?] - dev-ml/menhir:=[ocamlopt?] -" -RDEPEND="${DEPEND}" - -src_compile() { - emake -j1 all - use ocamlopt && emake opt -} - -src_install() { - dodir /usr/bin - PREFIX="${ED}/usr" findlib_src_install - dodoc README.md -} diff --git a/dev-ml/atd/atd-1.2.1.ebuild b/dev-ml/atd/atd-1.2.1.ebuild deleted file mode 100644 index d57bf461c6d4..000000000000 --- a/dev-ml/atd/atd-1.2.1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit findlib - -DESCRIPTION="Syntax for cross-language type definitions" -HOMEPAGE="https://github.com/mjambon/atd" -SRC_URI="https://github.com/mjambon/atd/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="+ocamlopt" - -DEPEND=" - dev-lang/ocaml:=[ocamlopt?] - dev-ml/easy-format:=[ocamlopt?] - dev-ml/menhir:=[ocamlopt?] -" -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} - dev-ml/jbuilder - dev-ml/opam -" - -src_install() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - ${PN}.install || die -} diff --git a/dev-ml/atd/atd-2.12.0.ebuild b/dev-ml/atd/atd-2.12.0.ebuild new file mode 100644 index 000000000000..8cbc489b2d4c --- /dev/null +++ b/dev-ml/atd/atd-2.12.0.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Static types for JSON APIs" +HOMEPAGE="https://github.com/ahrefs/atd/" +SRC_URI="https://github.com/ahrefs/atd/archive/${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64" +IUSE="+ocamlopt" +RESTRICT="test" + +RDEPEND=" + >=dev-lang/ocaml-4.08:=[ocamlopt?] + >=dev-ml/cmdliner-1.1.1:= + >=dev-ml/yojson-2.0.2:= + dev-ml/biniou:= + dev-ml/easy-format:= + dev-ml/menhir:= + dev-ml/re:= +" +DEPEND="${RDEPEND}" + +src_install() { + dune-install atd \ + atdgen \ + atdgen-codec-runtime \ + atdgen-runtime \ + atdj \ + atdpy \ + atds \ + atdts + + dodoc CHANGES.md CONTRIBUTING.md README.md +} diff --git a/dev-ml/atd/atd-2.15.0.ebuild b/dev-ml/atd/atd-2.15.0.ebuild new file mode 100644 index 000000000000..8cbc489b2d4c --- /dev/null +++ b/dev-ml/atd/atd-2.15.0.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Static types for JSON APIs" +HOMEPAGE="https://github.com/ahrefs/atd/" +SRC_URI="https://github.com/ahrefs/atd/archive/${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64" +IUSE="+ocamlopt" +RESTRICT="test" + +RDEPEND=" + >=dev-lang/ocaml-4.08:=[ocamlopt?] + >=dev-ml/cmdliner-1.1.1:= + >=dev-ml/yojson-2.0.2:= + dev-ml/biniou:= + dev-ml/easy-format:= + dev-ml/menhir:= + dev-ml/re:= +" +DEPEND="${RDEPEND}" + +src_install() { + dune-install atd \ + atdgen \ + atdgen-codec-runtime \ + atdgen-runtime \ + atdj \ + atdpy \ + atds \ + atdts + + dodoc CHANGES.md CONTRIBUTING.md README.md +} diff --git a/dev-ml/atd/metadata.xml b/dev-ml/atd/metadata.xml index 42629fd4a5b4..870e84707bdb 100644 --- a/dev-ml/atd/metadata.xml +++ b/dev-ml/atd/metadata.xml @@ -1,11 +1,18 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> + <pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">mjambon/atd</remote-id> - </upstream> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <longdescription> + ATD stands for Adaptable Type Definitions. It is a syntax for defining + cross-language data types. It is used as input to generate efficient and + type-safe serializers, deserializers and validators. + </longdescription> + <upstream> + <bugs-to>https://github.com/ahrefs/atd/issues/</bugs-to> + <remote-id type="github">ahrefs/atd</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-ml/atdgen/Manifest b/dev-ml/atdgen/Manifest deleted file mode 100644 index d394f61ac7be..000000000000 --- a/dev-ml/atdgen/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST atd-1.12.0.tar.gz 145428 BLAKE2B d9cc3b98567383e1a5dbb068165f144fb033e17030f979eb20963837b96f93d9b950943d59d1d0f348fed28ec05c5906ce6672f848d428193379670f5c4b51c4 SHA512 c24601b276da7837bc896bb42b2e0fa91ebfbf07759560c2490ed44bef722dcf8d586aaba1e62abff262805cab89996835611ab9fb68aa096dfc84bb55365475 -DIST atdgen-1.10.0.tar.gz 75447 BLAKE2B a3867f931b678ea4a5f7141447ed25418fb9b0b8154c5ab86320803badbcfaf98ceb453569837c88b12c76b37d0c405333fecf5894b0810fa7bc555370b7bbe0 SHA512 2dba16a0955b591a972bbd790a5344cf7f79c9485b5a064d3206643defe6c56413678aea389d831892ae1c72ff2fcb3a667731a236a7510fa7e9b4a60a128fb8 -DIST atdgen-1.10.2.tar.gz 73418 BLAKE2B 9b460fed859596c73fa24ebfb16bccecf7d95a1b1b627f43ed8ff32da7a37304df14d2641580cd0d38029ef344aa2132bac56c02e33034ac29b99d3adf1ea30a SHA512 5912e339c61516f942e7c80775faf4832007a96e5841e91115d120323a07fdd3945698b39876da3c25302da25ce30ecbab79a6920dd1496b9de4e30f4a2be73a diff --git a/dev-ml/atdgen/atdgen-1.10.0.ebuild b/dev-ml/atdgen/atdgen-1.10.0.ebuild deleted file mode 100644 index 3460991bad5f..000000000000 --- a/dev-ml/atdgen/atdgen-1.10.0.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit findlib - -DESCRIPTION="Generates boilerplate OCaml code for JSON and Biniou IO from type definitions" -HOMEPAGE="https://github.com/mjambon/atdgen" -SRC_URI="https://github.com/mjambon/atdgen/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="+ocamlopt" - -DEPEND=" - dev-lang/ocaml:=[ocamlopt?] - dev-ml/atd:=[ocamlopt?] - dev-ml/biniou:=[ocamlopt?] - dev-ml/yojson:= -" -RDEPEND="${DEPEND}" - -src_compile() { - emake -j1 all - use ocamlopt && emake opt -} - -src_install() { - dodir /usr/bin - PREFIX="${ED}/usr" findlib_src_install - dodoc README.md -} diff --git a/dev-ml/atdgen/atdgen-1.10.2.ebuild b/dev-ml/atdgen/atdgen-1.10.2.ebuild deleted file mode 100644 index e9694f441a7b..000000000000 --- a/dev-ml/atdgen/atdgen-1.10.2.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit findlib - -DESCRIPTION="Generates boilerplate OCaml code for JSON and Biniou IO from type definitions" -HOMEPAGE="https://github.com/mjambon/atdgen" -SRC_URI="https://github.com/mjambon/atdgen/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="+ocamlopt" - -DEPEND=" - dev-lang/ocaml:=[ocamlopt?] - dev-ml/atd:=[ocamlopt?] - dev-ml/biniou:=[ocamlopt?] - dev-ml/yojson:= -" -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} - dev-ml/jbuilder - dev-ml/opam -" - -src_install() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - ${PN}.install || die -} diff --git a/dev-ml/atdgen/atdgen-1.12.0.ebuild b/dev-ml/atdgen/atdgen-1.12.0.ebuild deleted file mode 100644 index 84fa4a2c68a5..000000000000 --- a/dev-ml/atdgen/atdgen-1.12.0.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit findlib - -DESCRIPTION="Generates boilerplate OCaml code for JSON and Biniou IO from type definitions" -HOMEPAGE="https://github.com/mjambon/atd" -SRC_URI="https://github.com/mjambon/atd/archive/v${PV}.tar.gz -> atd-${PV}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="+ocamlopt" - -DEPEND=" - dev-lang/ocaml:=[ocamlopt?] - dev-ml/atd:= - dev-ml/biniou:= - dev-ml/yojson:= -" -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} - dev-ml/jbuilder - dev-ml/opam -" - -S="${WORKDIR}/atd-${PV}" - -src_compile() { - jbuilder build -p atdgen || die -} - -oinstall() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - ${1}.install || die -} - -src_install() { - oinstall atdgen -} diff --git a/dev-ml/atdgen/metadata.xml b/dev-ml/atdgen/metadata.xml deleted file mode 100644 index 3bc3fdf37cf0..000000000000 --- a/dev-ml/atdgen/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">mjambon/atdgen</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/base/Manifest b/dev-ml/base/Manifest index 09f0e633b064..f15c6de0fb50 100644 --- a/dev-ml/base/Manifest +++ b/dev-ml/base/Manifest @@ -1,4 +1,4 @@ -DIST base-0.9.1.tar.gz 286498 BLAKE2B fc2b8b3894af1ee142e5f46f89fbc508aa0a57dd50624598137364f6e6c7bda33864d8131f84838840a86ed8b3dd0d14f3833484c29e6fe3a2ffabefc89cd9e9 SHA512 e1eb26eb07ee3489c8f42a886e2131bcc5eb5e965727eb29910e3aa37cdab6d23bfbf71421e16b77d9fe20a69392f9313ad6189c9618013794f0ed7df8c76c52 -DIST base-0.9.2.tar.gz 286533 BLAKE2B 851472c23c5a79436ee02cf45c0f797de21efbe52b7ca0a9dd8a4244b1808ff9f14b8e364654ebbbfb6d21bd7532f9ee1df0d2728a23154601d4abf69f916dd8 SHA512 9eae093c18e4fcbc02eb970b73bb7e49a94e0ccdd3fd6509d0668035b454ad8b5894bdbd10027a83681e993b4e1dec97db213b7fdfc293cb9737bae303002e11 -DIST base-0.9.3.tar.gz 286655 BLAKE2B 05a53a528a321fb627a2aba1521028b59741ce2de5e24a87cc4a448dedeb788bace907a6d7d49521ff90d56e1c302135dacfa32ff8ab4525e9f0c476fc376bd2 SHA512 7c7ca4439479230a6d338ce51b14c93225b71fd98242f47d82e06c08cbec092a33faa7385db8d21ce0302e7f4f3cf5d659a704e2d85ab3391e046c7d7ea3b62b -DIST base-0.9.4.tar.gz 286689 BLAKE2B adf0da9f82aaa8884a99db2d307e72a40a232dbc2517b371af65671966d488f9f77e86c32425077cd513075b8a3546727f3f596eac7c46876b25198a46ac373b SHA512 9e25caee46ec09c835aa74857f415ac61adeb1ae8d6773334fa1b28699b9ebbac9ef95a698b1f324d0ad59c27ea52fea0e0df86bf4908b6ba3e5121eb8e26076 +DIST base-0.14.0.tar.gz 385265 BLAKE2B f3a49b22bb63919bcdc522fbce14a24fd6eaddf39b921ba956cb82eb664ccc6919c9a9feb799dea318f1d8bdf1bd1983180b7ce38d9a43e118794057a9fec6a3 SHA512 c713c9aaf369bc042afb1ead53dc5a34a6eb3c97abc7fef99868e3be8e976adc6297f34d13cfc314adf2182fc64b0cde9c9a05aeeb0f51380255aa1f8e0edf16 +DIST base-0.14.3.tar.gz 385390 BLAKE2B e951fcf90f1181720346be0dc048bdb3d3f0b6417c954106aa035d807bff4a8bb85e97b11efbb296be92b24c257e8c83284c5419842b2d2f587a7ceee214e31f SHA512 56499ffd630bc8d09a18f49851d950ad54c376d4441b50ce60141f58aadece16f175a5b57492e8ddd997a6289d8671368dc0a58b01b6bbd2374acf45e7882e66 +DIST base-0.15.1.tar.gz 414911 BLAKE2B 4f0955374213bed241214451cb930c939bfed7208668b2b6676786a37c60f14b671b50e9a8893555693068dc2272e21f63e4def938dbe064b4ecb143925a8aab SHA512 4ac43829229765c19d8af98d45783c098abffd026328b03f5dc4390911b26cf6b65879d4084d30dd4b0b4f5a1d23079270e9bb10b1aeccf575ee70c7e16021ec +DIST base-0.16.3.tar.gz 442632 BLAKE2B 533a04b197bb1065a8b8772aa227bbe3be2c47d536722dfa7d1df366ad05e40fdd47f3a842654ee9bde1e3527ff34adaf155057af68596d4c02c8108505c9108 SHA512 69380ed392faf4495459f97f70a10a6959fce71d2e6ba093472fc272141646307fd7872407de855dfa48ef0435f6587eae5aa50f4a67eac40a9e1946d0c3c070 diff --git a/dev-ml/base/base-0.14.0-r2.ebuild b/dev-ml/base/base-0.14.0-r2.ebuild new file mode 100644 index 000000000000..b297736ade18 --- /dev/null +++ b/dev-ml/base/base-0.14.0-r2.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Standard library for OCaml" +HOMEPAGE="https://github.com/janestreet/base" +SRC_URI="https://github.com/janestreet/base/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt" + +RDEPEND=" + <dev-lang/ocaml-4.12 + >=dev-ml/sexplib0-0.14.0:=[ocamlopt?] <dev-ml/sexplib0-0.15.0:= + dev-ml/dune-configurator:=[ocamlopt?] +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/base/base-0.14.3-r2.ebuild b/dev-ml/base/base-0.14.3-r2.ebuild new file mode 100644 index 000000000000..7977bf74941e --- /dev/null +++ b/dev-ml/base/base-0.14.3-r2.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Standard library for OCaml" +HOMEPAGE="https://github.com/janestreet/base" +SRC_URI="https://github.com/janestreet/base/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +RDEPEND=" + >=dev-ml/sexplib0-0.14.0:=[ocamlopt?] <dev-ml/sexplib0-0.15.0:= + dev-ml/dune-configurator:=[ocamlopt?] +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/base/base-0.15.1-r2.ebuild b/dev-ml/base/base-0.15.1-r2.ebuild new file mode 100644 index 000000000000..536909da83bd --- /dev/null +++ b/dev-ml/base/base-0.15.1-r2.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Standard library for OCaml" +HOMEPAGE="https://github.com/janestreet/base" +SRC_URI="https://github.com/janestreet/base/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +RDEPEND=" + >=dev-lang/ocaml-4.10.0 + =dev-ml/sexplib0-0.15*:=[ocamlopt?] + dev-ml/dune-configurator:=[ocamlopt?] +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/base/base-0.16.3-r1.ebuild b/dev-ml/base/base-0.16.3-r1.ebuild new file mode 100644 index 000000000000..0842c57f20db --- /dev/null +++ b/dev-ml/base/base-0.16.3-r1.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Standard library for OCaml" +HOMEPAGE="https://github.com/janestreet/base" +SRC_URI="https://github.com/janestreet/base/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +RDEPEND=" + >=dev-lang/ocaml-4.14.0 + =dev-ml/sexplib0-0.16*:=[ocamlopt?] + dev-ml/dune-configurator:=[ocamlopt?] +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/base/base-0.9.1.ebuild b/dev-ml/base/base-0.9.1.ebuild deleted file mode 100644 index b6a07e3d5965..000000000000 --- a/dev-ml/base/base-0.9.1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Standard library for OCaml" -HOMEPAGE="https://github.com/janestreet/base" -SRC_URI="https://github.com/janestreet/base/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND=" - dev-lang/ocaml:= - dev-ml/sexplib:= - <dev-ml/sexplib-100 -" -DEPEND="${RDEPEND} dev-ml/opam dev-ml/jbuilder" - -src_test() { - jbuilder runtest || die -} - -src_install() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - ${PN}.install || die - dodoc ROADMAP.md README.org -} diff --git a/dev-ml/base/base-0.9.2.ebuild b/dev-ml/base/base-0.9.2.ebuild deleted file mode 100644 index b6a07e3d5965..000000000000 --- a/dev-ml/base/base-0.9.2.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Standard library for OCaml" -HOMEPAGE="https://github.com/janestreet/base" -SRC_URI="https://github.com/janestreet/base/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND=" - dev-lang/ocaml:= - dev-ml/sexplib:= - <dev-ml/sexplib-100 -" -DEPEND="${RDEPEND} dev-ml/opam dev-ml/jbuilder" - -src_test() { - jbuilder runtest || die -} - -src_install() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - ${PN}.install || die - dodoc ROADMAP.md README.org -} diff --git a/dev-ml/base/base-0.9.3.ebuild b/dev-ml/base/base-0.9.3.ebuild deleted file mode 100644 index 05dc737ee91d..000000000000 --- a/dev-ml/base/base-0.9.3.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Standard library for OCaml" -HOMEPAGE="https://github.com/janestreet/base" -SRC_URI="https://github.com/janestreet/base/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" - -RDEPEND=" - dev-lang/ocaml:= - dev-ml/sexplib:= - <dev-ml/sexplib-100 -" -DEPEND="${RDEPEND} dev-ml/opam dev-ml/jbuilder" - -src_test() { - jbuilder runtest || die -} - -src_install() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - ${PN}.install || die - dodoc ROADMAP.md README.org -} diff --git a/dev-ml/base/base-0.9.4.ebuild b/dev-ml/base/base-0.9.4.ebuild deleted file mode 100644 index 05dc737ee91d..000000000000 --- a/dev-ml/base/base-0.9.4.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Standard library for OCaml" -HOMEPAGE="https://github.com/janestreet/base" -SRC_URI="https://github.com/janestreet/base/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" - -RDEPEND=" - dev-lang/ocaml:= - dev-ml/sexplib:= - <dev-ml/sexplib-100 -" -DEPEND="${RDEPEND} dev-ml/opam dev-ml/jbuilder" - -src_test() { - jbuilder runtest || die -} - -src_install() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - ${PN}.install || die - dodoc ROADMAP.md README.org -} diff --git a/dev-ml/base/metadata.xml b/dev-ml/base/metadata.xml index 08acd8ba03fa..baca109c81ea 100644 --- a/dev-ml/base/metadata.xml +++ b/dev-ml/base/metadata.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">janestreet/base</remote-id> diff --git a/dev-ml/base_bigstring/Manifest b/dev-ml/base_bigstring/Manifest new file mode 100644 index 000000000000..6ec13bfdbba5 --- /dev/null +++ b/dev-ml/base_bigstring/Manifest @@ -0,0 +1,3 @@ +DIST base_bigstring-0.14.0.tar.gz 16579 BLAKE2B 4708fc425b9a4fb534b10b3536eca11bfd4ed8374319f9be09aa981d1a2a24433a25b62cb3faae459a0a633a2ebe6c15a28c2c15251f2ec9505c35528715de16 SHA512 d60bfd1989a29e4c1359722d4c0e2ec382c6d4f3c763b9b80980f38b51419bdf9d30bd9f8ca9cfbc33064458415e227c9f4077d9746ffc13cb4cd5ec8e221fc4 +DIST base_bigstring-0.15.0.tar.gz 17266 BLAKE2B f557fd8d46ad33afb89f50f914c76b287b19c8ee33a620c6a1def5379d59dd7f73b531c4077a3c7ce9e2cefbf6f71c7e49b3dd21213c68507bd19b0c90c44bf5 SHA512 d8311312ea1b3dc3a1a30c87ba4984438ca2c81f8da9cbb7f111dd74fb9b16ad8226166ae2fc2b572a989af15099b07294a667646b0ab22130de4406da53230b +DIST base_bigstring-0.16.0.tar.gz 19275 BLAKE2B 380b82c397f8cc8ddc6c5d33ebab13845eedbafc8c479eb2a03289d0bea929a0b442363729f706d0ff886f1686ee2b7e31aac97e3f7477809f13a5b0eebcdccc SHA512 95297f201ed8229feb974e6389f2aa955391d4716d6bc81b9b8ea06daf2722a950bd623fd35267fcbcde064ec49a5e06f51ef5b12f5c30793da937ca1c3c8bf5 diff --git a/dev-ml/base_bigstring/base_bigstring-0.14.0.ebuild b/dev-ml/base_bigstring/base_bigstring-0.14.0.ebuild new file mode 100644 index 000000000000..e1836a43e908 --- /dev/null +++ b/dev-ml/base_bigstring/base_bigstring-0.14.0.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="String type based on Bigarray, for use in I/O and C-bindings" +HOMEPAGE="https://github.com/janestreet/base_bigstring" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-lang/ocaml-4.08.0:=[ocamlopt=] + dev-ml/base:= + dev-ml/base_quickcheck:= + dev-ml/ppx_bench:= + dev-ml/ppx_bin_prot:= + =dev-ml/ppx_compare-0.14*:= + dev-ml/ppx_custom_printf:= + dev-ml/ppx_expect:= + dev-ml/ppx_fields_conv:= + dev-ml/ppx_fixed_literal:= + dev-ml/ppx_jane:= + dev-ml/ppx_let:= + dev-ml/ppx_module_timer:= + dev-ml/ppx_optional:= + dev-ml/ppx_pipebang:= + dev-ml/ppx_sexp_message:= + dev-ml/ppx_sexp_value:= + dev-ml/ppx_stable:= + dev-ml/ppx_string:= + dev-ml/ppx_typerep_conv:= + dev-ml/ppx_variants_conv:= + dev-ml/sexplib0:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/base_bigstring/base_bigstring-0.15.0-r1.ebuild b/dev-ml/base_bigstring/base_bigstring-0.15.0-r1.ebuild new file mode 100644 index 000000000000..91ee8b8951cd --- /dev/null +++ b/dev-ml/base_bigstring/base_bigstring-0.15.0-r1.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="String type based on Bigarray, for use in I/O and C-bindings" +HOMEPAGE="https://github.com/janestreet/base_bigstring" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86" +IUSE="+ocamlopt" + +DEPEND=" + dev-ml/base:= + dev-ml/int_repr:${SLOT} +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/base_bigstring/base_bigstring-0.16.0.ebuild b/dev-ml/base_bigstring/base_bigstring-0.16.0.ebuild new file mode 100644 index 000000000000..5893bd93f8ab --- /dev/null +++ b/dev-ml/base_bigstring/base_bigstring-0.16.0.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="String type based on Bigarray, for use in I/O and C-bindings" +HOMEPAGE="https://github.com/janestreet/base_bigstring" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-lang/ocaml-4.14 + dev-ml/base:${SLOT} + dev-ml/int_repr:${SLOT} +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/flow_parser/metadata.xml b/dev-ml/base_bigstring/metadata.xml index 44ea2b169869..9749d2e03e16 100644 --- a/dev-ml/flow_parser/metadata.xml +++ b/dev-ml/base_bigstring/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> - <remote-id type="github">facebook/flow</remote-id> + <remote-id type="github">janestreet/base_bigstring</remote-id> </upstream> </pkgmetadata> diff --git a/dev-ml/base_quickcheck/Manifest b/dev-ml/base_quickcheck/Manifest new file mode 100644 index 000000000000..fc38fa1c0eb6 --- /dev/null +++ b/dev-ml/base_quickcheck/Manifest @@ -0,0 +1,4 @@ +DIST base_quickcheck-0.14.0.tar.gz 66736 BLAKE2B eeaa92ec0eec4736be911128f46b8e4698034b2cb8afa131b31ee96a6edb5db0f28cfd611c101e4417305ee5a1babc2f869f4690b266218562a8fc50f5830acf SHA512 52333bee2591531665b8f8ad0fac1cdaa607b448d0a33b9b905cf98e00df5a700bf0a4ee3cdf3c06d7fcb2b5190363dd5908cc743b2854af9ce5c8d743e3fd58 +DIST base_quickcheck-0.14.1.tar.gz 66827 BLAKE2B 2a274fc0edab3daf7e3d671f7ea24912ecf273cf2b4cb4ab2bd74171a8848163526f97ed860b44aeaa9f3f3faabb22f4598bf604b33c8401733faa22ca7a3c93 SHA512 5d5a3a070a6903ffdd1e13754721d48a9df164f78bd569d3a18b3fd808354550e4603b76d5e48eaa6a4c4d3433f18bb29888478d640fde9ea004619448c3d7d0 +DIST base_quickcheck-0.15.0.tar.gz 73702 BLAKE2B 0f671b6e48d38ac92b8e5150c1b6f7c4a1326cf12fcf3c14edf7ef376ca1769f8d708755a3b6cfc69a4d74de8d84affbc14838fc9385f487f2053936f1f116fa SHA512 e5362d70469c085239efaabbca6ca2558cb1609dfd2c3715d5c31047c8ae34b8304b9d28636806305f226929b0f9e3518b409de08f42f389963378f2aee6b351 +DIST base_quickcheck-0.16.0.tar.gz 76738 BLAKE2B b54fac86332bfe06b767345898c2e1a7a6f70de26cb06d16467d634eee3117d7ab571f611d17f692776c519dfa4ab7de9c948b08e44016e1e05fdff565a16246 SHA512 c859f2982140ec72b3377e3f167117df43f8cb14b62d3949e92ecf479cb27b4c31bb2dfa9111da24ce42f969452582ba076aef868d304b97c08f2918759cc291 diff --git a/dev-ml/base_quickcheck/base_quickcheck-0.14.0-r1.ebuild b/dev-ml/base_quickcheck/base_quickcheck-0.14.0-r1.ebuild new file mode 100644 index 000000000000..2edb781f920b --- /dev/null +++ b/dev-ml/base_quickcheck/base_quickcheck-0.14.0-r1.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Randomized testing framework, designed for compatibility with Base" +HOMEPAGE="https://github.com/janestreet/base_quickcheck" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-ml/base-0.14.0:= + >=dev-ml/ppx_base-0.14.0:= + >=dev-ml/ppx_fields_conv-0.14.1:= + >=dev-ml/ppx_let-0.14.0:= + >=dev-ml/ppx_sexp_message-0.14.0:= + >=dev-ml/ppx_sexp_value-0.14.0:= + dev-ml/splittable_random:= + >=dev-ml/ppxlib-0.18.0:= + <dev-ml/ppxlib-0.22.0:= + >=dev-ml/ocaml-migrate-parsetree-2.0.0:= + dev-ml/cinaps:= + dev-ml/sexplib0:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/base_quickcheck/base_quickcheck-0.14.1-r2.ebuild b/dev-ml/base_quickcheck/base_quickcheck-0.14.1-r2.ebuild new file mode 100644 index 000000000000..13b91a9e745e --- /dev/null +++ b/dev-ml/base_quickcheck/base_quickcheck-0.14.1-r2.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Randomized testing framework, designed for compatibility with Base" +HOMEPAGE="https://github.com/janestreet/base_quickcheck" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-ml/base-0.14.0:= + >=dev-ml/ppx_base-0.14.0:= + >=dev-ml/ppx_fields_conv-0.14.1:= + >=dev-ml/ppx_let-0.14.0:= + >=dev-ml/ppx_sexp_message-0.14.0:= + >=dev-ml/ppx_sexp_value-0.14.0:= + dev-ml/splittable_random:= + >=dev-ml/ppxlib-0.22.0:= + >=dev-ml/ocaml-migrate-parsetree-2.0.0:= + dev-ml/cinaps:= + dev-ml/sexplib0:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/base_quickcheck/base_quickcheck-0.15.0-r2.ebuild b/dev-ml/base_quickcheck/base_quickcheck-0.15.0-r2.ebuild new file mode 100644 index 000000000000..cce4d7fe6742 --- /dev/null +++ b/dev-ml/base_quickcheck/base_quickcheck-0.15.0-r2.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Randomized testing framework, designed for compatibility with Base" +HOMEPAGE="https://github.com/janestreet/base_quickcheck" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +DEPEND=" + dev-ml/base:= + dev-ml/fieldslib:= + dev-ml/ppx_base:${SLOT} + dev-ml/ppx_fields_conv:${SLOT} + dev-ml/ppx_let:${SLOT} + dev-ml/ppx_sexp_value:${SLOT} + dev-ml/splittable_random:${SLOT} + >=dev-ml/ppxlib-0.23.0:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/base_quickcheck/base_quickcheck-0.16.0.ebuild b/dev-ml/base_quickcheck/base_quickcheck-0.16.0.ebuild new file mode 100644 index 000000000000..a867793e810b --- /dev/null +++ b/dev-ml/base_quickcheck/base_quickcheck-0.16.0.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Randomized testing framework, designed for compatibility with Base" +HOMEPAGE="https://github.com/janestreet/base_quickcheck" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-lang/ocaml-4.14 + dev-ml/base:${SLOT} + dev-ml/fieldslib:= + dev-ml/ppx_base:${SLOT} + dev-ml/ppx_compare:= + dev-ml/ppx_cold:= + dev-ml/ppx_enumerate:= + dev-ml/ppx_fields_conv:${SLOT} + dev-ml/ppx_globalize:= + dev-ml/ppx_let:${SLOT} + dev-ml/ppx_hash:= + dev-ml/ppx_here:= + dev-ml/ppx_sexp_conv:= + dev-ml/ppx_sexp_message:${SLOT} + dev-ml/ppx_sexp_value:${SLOT} + dev-ml/splittable_random:${SLOT} + >=dev-ml/ppxlib-0.28.0:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ocaml-extunix/metadata.xml b/dev-ml/base_quickcheck/metadata.xml index d986b72622e7..6de9275b1312 100644 --- a/dev-ml/ocaml-extunix/metadata.xml +++ b/dev-ml/base_quickcheck/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> - <remote-id type="github">ygrek/extunix</remote-id> + <remote-id type="github">janestreet/base_quickcheck</remote-id> </upstream> </pkgmetadata> diff --git a/dev-ml/batteries/Manifest b/dev-ml/batteries/Manifest index 7c84971b5de6..a88f53739235 100644 --- a/dev-ml/batteries/Manifest +++ b/dev-ml/batteries/Manifest @@ -1 +1,3 @@ -DIST batteries-2.7.0.tar.gz 768498 BLAKE2B ded30928d51bd6f6bc023803bb404a140a8bbc64d7dea3c6d63cd7ad4aacd470621a6179684772930c6e57530a57b3136711ca32df30332104db2081518f408c SHA512 ecb973c9cc535fce18db8efb1bfb9dfde73d7a7fc82cb6b0657547b6f7d173e9004015f698065ed5efeb9f89f1fcc1b548745b708139ce0d01eb6f63981421c9 +DIST batteries-3.5.1.tar.gz 835112 BLAKE2B 29602093e5d3789a2b80e1c36e2d5b29d9c286c1bcd272f84d71660eb2014b7dea82c25543c17656987f5d0870628a4af83eaace30f7edef960f8956b26eeb91 SHA512 36c8561079aa9fefc864c2f03bd8ae20aa05987bb67e7a9beac3ab4f440dbf7d44f141c172b05fddb1a5b618fc55a27962bb45fc39bd7b3a15d56e0ed3ff3870 +DIST batteries-3.6.0.tar.gz 796298 BLAKE2B a8d9b6f57019ff80367047393fb53014bd32bdcc87d93650eae2939210d90fe4a7977b3502d0ffed25e0e0cb4aa072b8174f01f08c6728d0536589b9abff0f35 SHA512 2a56611b09a5f1cba6457539f8b6bc87a5f2a5454b36cdb39f6e0d6a5dac6db179aab1ba87c74dd49cc41df31a9a96feb349028ea41df7371ecb47f4d9dfafc4 +DIST batteries-3.6.1.tar.gz 797562 BLAKE2B e50ffa073ee4bf0028f4fbe4eac1bfcc0bbbc43fbe17d711350c7ae403a3943a3a8a79356323eb0f3bb0e0b4d2b589dcd33ecb8ba0768f0ac9895d425caa95b1 SHA512 16fd3b541f2b9504d26e1387b1d8b7279746221136391857c90193d3cc5b2814535d87ce54abfa2f50856a26f69e1a7a67f9574d208ba2f8a39630de59bf3a64 diff --git a/dev-ml/batteries/batteries-2.7.0.ebuild b/dev-ml/batteries/batteries-2.7.0.ebuild deleted file mode 100644 index 7a5afefceaf9..000000000000 --- a/dev-ml/batteries/batteries-2.7.0.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit oasis eutils - -DESCRIPTION="The community-maintained foundation library for your OCaml projects" -HOMEPAGE="https://github.com/ocaml-batteries-team/batteries-included/" -SRC_URI="https://github.com/ocaml-batteries-team/batteries-included/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1-with-linking-exception" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="test" - -RDEPEND="dev-ml/camomile:=" -DEPEND="${RDEPEND} - test? ( dev-ml/ounit dev-ml/iTeML )" - -DOCS=( "ChangeLog" "FAQ" "README.folders" "README.md" ) - -S="${WORKDIR}/${PN}-included-${PV}" diff --git a/dev-ml/batteries/batteries-3.5.1.ebuild b/dev-ml/batteries/batteries-3.5.1.ebuild new file mode 100644 index 000000000000..3ba6fc834d33 --- /dev/null +++ b/dev-ml/batteries/batteries-3.5.1.ebuild @@ -0,0 +1,31 @@ +# Copyright 2021-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit findlib + +DESCRIPTION="A community-maintained standard library extension" +HOMEPAGE="https://github.com/ocaml-batteries-team/batteries-included/" +SRC_URI="https://github.com/ocaml-batteries-team/batteries-included/archive/v${PV}.tar.gz + -> ${P}.tar.gz" +S="${WORKDIR}"/batteries-included-${PV} + +LICENSE="LGPL-2.1-with-linking-exception" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +RESTRICT="test" + +RDEPEND=" + ${DEPEND} + dev-ml/num:= +" +BDEPEND="dev-ml/ocamlbuild" + +src_compile() { + emake BATTERIES_NATIVE=$(usex ocamlopt yes no) +} + +src_install() { + findlib_src_install BATTERIES_NATIVE=$(usex ocamlopt yes no) +} diff --git a/dev-ml/batteries/batteries-3.6.0-r1.ebuild b/dev-ml/batteries/batteries-3.6.0-r1.ebuild new file mode 100644 index 000000000000..f9dfcf4e2fb0 --- /dev/null +++ b/dev-ml/batteries/batteries-3.6.0-r1.ebuild @@ -0,0 +1,32 @@ +# Copyright 2021-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit findlib + +DESCRIPTION="A community-maintained standard library extension" +HOMEPAGE="https://github.com/ocaml-batteries-team/batteries-included/" +SRC_URI="https://github.com/ocaml-batteries-team/batteries-included/archive/v${PV}.tar.gz + -> ${P}.tar.gz" +S="${WORKDIR}"/batteries-included-${PV} + +LICENSE="LGPL-2.1-with-linking-exception" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +RESTRICT="test" + +RDEPEND=" + dev-ml/camlp-streams:= + dev-ml/num:= +" +DEPEND="${RDEPEND}" +BDEPEND="dev-ml/ocamlbuild" + +src_compile() { + emake BATTERIES_NATIVE=$(usex ocamlopt yes no) +} + +src_install() { + findlib_src_install BATTERIES_NATIVE=$(usex ocamlopt yes no) +} diff --git a/dev-ml/batteries/batteries-3.6.1.ebuild b/dev-ml/batteries/batteries-3.6.1.ebuild new file mode 100644 index 000000000000..620523f69008 --- /dev/null +++ b/dev-ml/batteries/batteries-3.6.1.ebuild @@ -0,0 +1,32 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit findlib + +DESCRIPTION="A community-maintained standard library extension" +HOMEPAGE="https://github.com/ocaml-batteries-team/batteries-included/" +SRC_URI="https://github.com/ocaml-batteries-team/batteries-included/archive/v${PV}.tar.gz + -> ${P}.tar.gz" +S="${WORKDIR}"/batteries-included-${PV} + +LICENSE="LGPL-2.1-with-linking-exception" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +RESTRICT="test" + +RDEPEND=" + dev-ml/camlp-streams:= + dev-ml/num:= +" +DEPEND="${RDEPEND}" +BDEPEND="dev-ml/ocamlbuild" + +src_compile() { + emake BATTERIES_NATIVE=$(usex ocamlopt yes no) +} + +src_install() { + findlib_src_install BATTERIES_NATIVE=$(usex ocamlopt yes no) +} diff --git a/dev-ml/batteries/metadata.xml b/dev-ml/batteries/metadata.xml index e1a9d13f792f..30d375ad112a 100644 --- a/dev-ml/batteries/metadata.xml +++ b/dev-ml/batteries/metadata.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">ocaml-batteries-team/batteries-included</remote-id> diff --git a/dev-ml/bigarray-compat/Manifest b/dev-ml/bigarray-compat/Manifest new file mode 100644 index 000000000000..6993333221a7 --- /dev/null +++ b/dev-ml/bigarray-compat/Manifest @@ -0,0 +1,2 @@ +DIST bigarray-compat-1.0.0.tar.gz 1385 BLAKE2B afa38fd206de8738db51742467b95df4aec3e4e713c946c2c1d041da7e19483bdb53dca440b50c9c1b3c3a5fd7ac71a63ccfe74a14a5743f10f35429838a1c14 SHA512 c365fee15582aca35d7b05268cde29e54774ad7df7be56762b4aad78ca1409d4326ad3b34af0f1cc2c7b872837290a9cd9ff43b47987c03bba7bba32fe8a030f +DIST bigarray-compat-1.1.0.tar.gz 2046 BLAKE2B a42ca96452106920a26e8cc95e1f31d887af57687243b6896f4ac80091c78c590ee37e7291c2319b5d9ef3f0fd72b8add463e2ef11f830cee169451f34930c1f SHA512 bbd9c2b319930db832ae8d41844ef81e74ced9f745f32981f2efcc9777220d55e1e5d6dc2965e9e1a6ed5e0d56ad27c672289f8dc28fbe2658f3230cbda5a800 diff --git a/dev-ml/bigarray-compat/bigarray-compat-1.0.0.ebuild b/dev-ml/bigarray-compat/bigarray-compat-1.0.0.ebuild new file mode 100644 index 000000000000..d3b997366abe --- /dev/null +++ b/dev-ml/bigarray-compat/bigarray-compat-1.0.0.ebuild @@ -0,0 +1,15 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Compatibility library to use Stdlib.Bigarray when possible" +HOMEPAGE="https://github.com/mirage/bigarray-compat" +SRC_URI="https://github.com/mirage/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="ISC" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="+ocamlopt" diff --git a/dev-ml/bigarray-compat/bigarray-compat-1.1.0.ebuild b/dev-ml/bigarray-compat/bigarray-compat-1.1.0.ebuild new file mode 100644 index 000000000000..bfcd9e9ea3ee --- /dev/null +++ b/dev-ml/bigarray-compat/bigarray-compat-1.1.0.ebuild @@ -0,0 +1,15 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Compatibility library to use Stdlib.Bigarray when possible" +HOMEPAGE="https://github.com/mirage/bigarray-compat" +SRC_URI="https://github.com/mirage/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="ISC" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" diff --git a/dev-ml/gd4o/metadata.xml b/dev-ml/bigarray-compat/metadata.xml index 253efdf99b59..4e31b18af813 100644 --- a/dev-ml/gd4o/metadata.xml +++ b/dev-ml/bigarray-compat/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> - <remote-id type="sourceforge">gd4o</remote-id> + <remote-id type="github">mirage/bigarray-compat</remote-id> </upstream> </pkgmetadata> diff --git a/dev-ml/bignum/Manifest b/dev-ml/bignum/Manifest deleted file mode 100644 index 400d751133ce..000000000000 --- a/dev-ml/bignum/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST bignum-0.9.0.tar.gz 28060 BLAKE2B c104d6040346464d9b8b3a97cb6a64298c93778225c149d3d6640562a32a1a728eaebe398a4044f1df5db2b40534ea18098e9aaaf948d8c5ddbac51d2515ab3e SHA512 ac80a9303cd177819db74ee6e3aaada76c4c97f9d654b902b99708b0123989b043e9c8db5f05e6d4bdf0453975b3826bed6fc18deff7e7c7ff194a7de908a5c5 diff --git a/dev-ml/bignum/bignum-0.9.0.ebuild b/dev-ml/bignum/bignum-0.9.0.ebuild deleted file mode 100644 index a2a5971bed66..000000000000 --- a/dev-ml/bignum/bignum-0.9.0.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Core-flavoured wrapper around zarith's arbitrary-precision rationals" -HOMEPAGE="https://github.com/janestreet/bignum" -SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND=" - dev-lang/ocaml:= - dev-ml/core_kernel:= - dev-ml/core_kernel:= - dev-ml/ppx_driver:= - dev-ml/ppx_jane:= - dev-ml/typerep:= - dev-ml/zarith:= - <dev-ml/ppx_driver-100 - <dev-ml/ppx_jane-100 -" -DEPEND="${RDEPEND} dev-ml/opam dev-ml/jbuilder" - -src_install() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - ${PN}.install || die -} diff --git a/dev-ml/bignum/metadata.xml b/dev-ml/bignum/metadata.xml deleted file mode 100644 index bf7e34454b29..000000000000 --- a/dev-ml/bignum/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">janestreet/bignum</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/bin-prot/Manifest b/dev-ml/bin-prot/Manifest deleted file mode 100644 index 56a42452c2b4..000000000000 --- a/dev-ml/bin-prot/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST bin-prot-0.9.0.tar.gz 338958 BLAKE2B 78b447f42f2c75d70d17dedd855c2c08b740ea847a489bdcff860b88f4ce3fbfd05d88f87d16d761b26314715507288035f708e5bb8267125a360abf4df70850 SHA512 111e0a9d07bdf22db6e3e7e9a165d196a264a3652e4cc363ec8f49c4ef385b8b76982a9d42fa8e0954e15a4a80c35ca6876c70fe6f20d7497fd8a2d53fab24c1 -DIST bin-prot-0.9.1.tar.gz 338969 BLAKE2B 249329c0093affc082a42b5a496f0f8861d761799104ef50d788331179e3a6965cb1cd03ee6530782a608677488a4970583e85f25e5ba220d2d179d3d16908c2 SHA512 6575f51931c6dfb0f640bc6eb8bb789fd1ca4b1ca95876df906bd5d5c3320dc8aebedd44b5c6feee6b66b40007bd0077da6cc628c791daba0c8cf806d7af7b9c -DIST bin-prot-0.9.2.tar.gz 339008 BLAKE2B 3fcad0d5a88393b49b22d42b4669da485ddd9a61938cdda4183658eca5b0369265480005945bdaeb53cc8af5c324cc7cb158b4208e4a7a7f821db5c045502910 SHA512 a4aa453ff4d2037b8ed0e53186fafa876a96ecb970ef25e99cf133afa4615b8fc53de75234454519a4f7c11f771f98e8117f8fa37682dbb8f73d4fda8a1805f7 diff --git a/dev-ml/bin-prot/bin-prot-0.9.0.ebuild b/dev-ml/bin-prot/bin-prot-0.9.0.ebuild deleted file mode 100644 index 5c2d435fef0b..000000000000 --- a/dev-ml/bin-prot/bin-prot-0.9.0.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Binary protocol generator" -HOMEPAGE="https://github.com/janestreet/bin_prot" -SRC_URI="https://github.com/janestreet/bin_prot/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND=" - dev-lang/ocaml:= - dev-ml/base:= - dev-ml/ppx_compare:= - dev-ml/ppx_custom_printf:= - dev-ml/ppx_core:= - dev-ml/ppx_driver:= - dev-ml/ppx_fields_conv:= - dev-ml/ppx_sexp_conv:= - dev-ml/ppx_type_conv:= - dev-ml/ppx_variants_conv:= - dev-ml/sexplib:= - dev-ml/ocaml-migrate-parsetree:= -" -DEPEND="${RDEPEND} dev-ml/opam dev-ml/jbuilder" - -S="${WORKDIR}/bin_prot-${PV}" - -src_test() { - jbuilder runtest || die -} - -src_install() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - ${PN/-/_}.install || die - dodoc CHANGES.md README.md -} diff --git a/dev-ml/bin-prot/bin-prot-0.9.1.ebuild b/dev-ml/bin-prot/bin-prot-0.9.1.ebuild deleted file mode 100644 index 5c2d435fef0b..000000000000 --- a/dev-ml/bin-prot/bin-prot-0.9.1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Binary protocol generator" -HOMEPAGE="https://github.com/janestreet/bin_prot" -SRC_URI="https://github.com/janestreet/bin_prot/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND=" - dev-lang/ocaml:= - dev-ml/base:= - dev-ml/ppx_compare:= - dev-ml/ppx_custom_printf:= - dev-ml/ppx_core:= - dev-ml/ppx_driver:= - dev-ml/ppx_fields_conv:= - dev-ml/ppx_sexp_conv:= - dev-ml/ppx_type_conv:= - dev-ml/ppx_variants_conv:= - dev-ml/sexplib:= - dev-ml/ocaml-migrate-parsetree:= -" -DEPEND="${RDEPEND} dev-ml/opam dev-ml/jbuilder" - -S="${WORKDIR}/bin_prot-${PV}" - -src_test() { - jbuilder runtest || die -} - -src_install() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - ${PN/-/_}.install || die - dodoc CHANGES.md README.md -} diff --git a/dev-ml/bin-prot/bin-prot-0.9.2.ebuild b/dev-ml/bin-prot/bin-prot-0.9.2.ebuild deleted file mode 100644 index 5c2d435fef0b..000000000000 --- a/dev-ml/bin-prot/bin-prot-0.9.2.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Binary protocol generator" -HOMEPAGE="https://github.com/janestreet/bin_prot" -SRC_URI="https://github.com/janestreet/bin_prot/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND=" - dev-lang/ocaml:= - dev-ml/base:= - dev-ml/ppx_compare:= - dev-ml/ppx_custom_printf:= - dev-ml/ppx_core:= - dev-ml/ppx_driver:= - dev-ml/ppx_fields_conv:= - dev-ml/ppx_sexp_conv:= - dev-ml/ppx_type_conv:= - dev-ml/ppx_variants_conv:= - dev-ml/sexplib:= - dev-ml/ocaml-migrate-parsetree:= -" -DEPEND="${RDEPEND} dev-ml/opam dev-ml/jbuilder" - -S="${WORKDIR}/bin_prot-${PV}" - -src_test() { - jbuilder runtest || die -} - -src_install() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - ${PN/-/_}.install || die - dodoc CHANGES.md README.md -} diff --git a/dev-ml/bin_prot/Manifest b/dev-ml/bin_prot/Manifest new file mode 100644 index 000000000000..d27a936f67e5 --- /dev/null +++ b/dev-ml/bin_prot/Manifest @@ -0,0 +1,3 @@ +DIST bin_prot-0.14.0.tar.gz 342884 BLAKE2B 9210ca230d9f42ce3dd6ad18e66b62e41eafccf83ac632a988cdc36c16f273076ccdd67ece333acb70e2604180084811319ae41decbd7ef6bba0ee16538c0cae SHA512 7e7bec7dc5ec49b7bc099687a90840620529c36d552e8985b45f2f9a2437396c8b41583081b8c6a75bf3b14bb3ab4db9134cebd12f70f2345c8fa74e1b8fa252 +DIST bin_prot-0.15.0.tar.gz 345362 BLAKE2B 654014d47cdf59374247bd904005972f60d24ee711da037fdfdfbd9d5318fcabbb5905df2ec7b401cadb9ce76fd5301917d3084002bae3fc61dc2debedab6024 SHA512 7adbb683ef09d9f3376cd8fff5d299c0d9cac350e14fbee5e2c9e038086e48c188bb115d0dc5701e82efc2076227a0656f49704cc8b783dc5a8d6c2a9735086b +DIST bin_prot-0.16.0.tar.gz 343886 BLAKE2B f13574daba74d813810afb844ebd300803279fb5ab0c067b64dc13230a0cf5d88b46809892465b7bea22e41696c962de40f5cb7c05099a98de7c01f0a7f96240 SHA512 e6e2b4c2984fc89fc7ceb57cae7b7f796e6a0441e4d37da1b6bc1f167d8900b1c4bc0174d5d9de5669b7539d9256293365242e9875ef78fccbda226635c63b5d diff --git a/dev-ml/bin_prot/bin_prot-0.14.0.ebuild b/dev-ml/bin_prot/bin_prot-0.14.0.ebuild new file mode 100644 index 000000000000..63bdeafb7060 --- /dev/null +++ b/dev-ml/bin_prot/bin_prot-0.14.0.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Binary protocol generator" +HOMEPAGE="https://github.com/janestreet/bin_prot" +SRC_URI="https://github.com/janestreet/bin_prot/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt" + +RDEPEND=" + >=dev-ml/base-0.14.0:= + dev-ml/findlib:= + >=dev-ml/ppx_compare-0.14.0:= + >=dev-ml/ppx_custom_printf-0.14.0:= + >=dev-ml/ppx_fields_conv-0.14.0:= + >=dev-ml/ppx_optcomp-0.14.0:= + >=dev-ml/ppx_sexp_conv-0.14.0:= + >=dev-ml/ppx_variants_conv-0.14.0:= +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/bin_prot/bin_prot-0.15.0-r2.ebuild b/dev-ml/bin_prot/bin_prot-0.15.0-r2.ebuild new file mode 100644 index 000000000000..8781d6b879a4 --- /dev/null +++ b/dev-ml/bin_prot/bin_prot-0.15.0-r2.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Binary protocol generator" +HOMEPAGE="https://github.com/janestreet/bin_prot" +SRC_URI="https://github.com/janestreet/bin_prot/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +RDEPEND=" + >=dev-ml/base-0.14.0:= + dev-ml/findlib:= + >=dev-ml/ppx_compare-0.14.0:= + >=dev-ml/ppx_custom_printf-0.14.0:= + >=dev-ml/ppx_fields_conv-0.14.0:= + >=dev-ml/ppx_optcomp-0.14.0:= + >=dev-ml/ppx_sexp_conv-0.14.0:= + >=dev-ml/ppx_variants_conv-0.14.0:= + dev-ml/variantslib:= +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/bin_prot/bin_prot-0.16.0.ebuild b/dev-ml/bin_prot/bin_prot-0.16.0.ebuild new file mode 100644 index 000000000000..a50282c1aedd --- /dev/null +++ b/dev-ml/bin_prot/bin_prot-0.16.0.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Binary protocol generator" +HOMEPAGE="https://github.com/janestreet/bin_prot" +SRC_URI="https://github.com/janestreet/bin_prot/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +RDEPEND=" + >=dev-lang/ocaml-4.14 + dev-ml/base:${SLOT} + dev-ml/findlib:= + dev-ml/ppx_compare:${SLOT} + dev-ml/ppx_custom_printf:${SLOT} + dev-ml/ppx_fields_conv:${SLOT} + dev-ml/ppx_optcomp:${SLOT} + dev-ml/ppx_sexp_conv:${SLOT} + dev-ml/ppx_stable_witness:${SLOT} + dev-ml/ppx_variants_conv:${SLOT} + dev-ml/variantslib:= +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/bin-prot/metadata.xml b/dev-ml/bin_prot/metadata.xml index ddec9f7c9b8b..7d447c8eb1d8 100644 --- a/dev-ml/bin-prot/metadata.xml +++ b/dev-ml/bin_prot/metadata.xml @@ -1,9 +1,9 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">janestreet/bin_prot</remote-id> diff --git a/dev-ml/biniou/Manifest b/dev-ml/biniou/Manifest index df9d861bd46d..a3b568c6658e 100644 --- a/dev-ml/biniou/Manifest +++ b/dev-ml/biniou/Manifest @@ -1,4 +1,2 @@ -DIST biniou-1.0.12.tar.gz 24262 BLAKE2B c7dd3ff0d7cf47f7c464cf379fa1ac84e11c284399730c55d803d0da1e5c10ed0b974b51705d22e0a29513bf7a4774139720aacd7094a52685b6d7bc17067ad8 SHA512 df729e4064f6726efa409ceb5e6ff1987923d9cd28339d6e1c4c185a07c0738b027cafba33a139483eeb8f88e58f66fbb6a57d8e748e7355073a7622fb4d7a07 -DIST biniou-1.0.13.tar.gz 24327 BLAKE2B 19a69665805b917c9bc02ad459c8a98b8cb64f707f3664e863d5315fd1444e0cb5545549220494dab136287cf4f8ffab8d5246a2068bb154c2ea10553b63737d SHA512 2fe109e83260f546181dd26ea175d2c4f63d0f6604c6d26fa44ee31925ba1fdaac0139a436cd0271a31294de9cd8ea65f8dde0981403c652d31de721ef696788 -DIST biniou-1.1.0.tar.gz 23432 BLAKE2B 601e160c828c32f520c7cd18d5b3ca1abfe629dcb53250d83e9dc658dacafcb7f54296b5c9604dc38b8a95acbaf64d79d283d82fe345391e593023d7dfbc2933 SHA512 755e3dcfe2a967c08b86db5a7dc917f75713611f5deb64b4fe3499aecf8e698813a1d0620eb78aa1e77c404719936c5ef5088c0c394c02fc2d7fe2629e985669 -DIST biniou-1.2.0.tar.gz 23611 BLAKE2B 01f5afada666d23b74f31cf12b5f578f3622c85311d7a1b6eb319843beac4c3ebe8e8e314a47ec14ee0ef6f5c1a5b6dd849dcf24b0c3cc8a38ca6a54d89e4c4d SHA512 04c04c2dd5e3e1237106db257567ba6900bd94759b07b02ba2e0d9209d1bbdc9ed629864e06d44a8b61f72d46fbcc7a0ffc86f82feb223d9d99ca41afc625fab +DIST biniou-1.2.1.tar.gz 23970 BLAKE2B 139f17e3fd31f3f834c8111d81cecfa5fa48f860fc4fc898f7896b6d39a9756989504fa88901efaa0f67a51de25cdf304bea2ecabf15ea9cace59b4b311c00e1 SHA512 f0166666559f3a767fdc6987bad45ec4a772b70b8880b6d769ef644c9bfd46962f089c7b5dfff368413015e765daf4bacffe253bdb3478d9a4d30a15f0d29589 +DIST biniou-1.2.2.tar.gz 24054 BLAKE2B e4ee5f28348cacbf5cc523d104188c003bca0deb04af188131c4ceeed36b9947a300fc866a51b3e6d11f15646fecc799beeec90dc8badb3dacf147a3190b62f5 SHA512 3e70b36e7e536ce65b6c2283b1372bd99207f3b55aa8c90266524e3ba028928b091595f5b92ba9870f915895673f4dca72963db71659deaadc129b7feb409cfc diff --git a/dev-ml/biniou/biniou-1.0.12.ebuild b/dev-ml/biniou/biniou-1.0.12.ebuild deleted file mode 100644 index 81346198c7f1..000000000000 --- a/dev-ml/biniou/biniou-1.0.12.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib - -DESCRIPTION="A binary data serialization format inspired by JSON for OCaml" -HOMEPAGE="https://github.com/mjambon/biniou" -SRC_URI="https://github.com/mjambon/biniou/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -SLOT="0/${PV}" -LICENSE="BSD" -KEYWORDS="~amd64" -IUSE="+ocamlopt" - -RDEPEND=">=dev-lang/ocaml-3.11:=[ocamlopt?] - dev-ml/easy-format:=[ocamlopt?] -" -DEPEND="${RDEPEND}" - -src_compile() { - emake all - use ocamlopt && emake opt -} - -src_install() { - use ocamlopt && dodir /usr/bin - findlib_src_install BINDIR="${ED}"/usr/bin - dodoc README.md Changes -} diff --git a/dev-ml/biniou/biniou-1.0.13.ebuild b/dev-ml/biniou/biniou-1.0.13.ebuild deleted file mode 100644 index 221435a17637..000000000000 --- a/dev-ml/biniou/biniou-1.0.13.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib - -DESCRIPTION="A binary data serialization format inspired by JSON for OCaml" -HOMEPAGE="https://github.com/mjambon/biniou" -SRC_URI="https://github.com/mjambon/biniou/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -SLOT="0/${PV}" -LICENSE="BSD" -KEYWORDS="~amd64" -IUSE="+ocamlopt" - -RDEPEND=">=dev-lang/ocaml-3.11:=[ocamlopt?] - dev-ml/easy-format:=[ocamlopt?] -" -DEPEND="${RDEPEND}" - -src_compile() { - emake all - use ocamlopt && emake opt -} - -src_install() { - use ocamlopt && dodir /usr/bin - findlib_src_install BINDIR="${ED}"/usr/bin - dodoc README.md Changes -} diff --git a/dev-ml/biniou/biniou-1.1.0.ebuild b/dev-ml/biniou/biniou-1.1.0.ebuild deleted file mode 100644 index 6a9705355a2a..000000000000 --- a/dev-ml/biniou/biniou-1.1.0.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib - -DESCRIPTION="A binary data serialization format inspired by JSON for OCaml" -HOMEPAGE="https://github.com/mjambon/biniou" -SRC_URI="https://github.com/mjambon/biniou/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -SLOT="0/${PV}" -LICENSE="BSD" -KEYWORDS="~amd64" -IUSE="+ocamlopt" - -RDEPEND=">=dev-lang/ocaml-3.11:=[ocamlopt?] - dev-ml/easy-format:=[ocamlopt?] -" -DEPEND="${RDEPEND} - dev-ml/jbuilder - dev-ml/opam -" - -src_install() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - --mandir="${ED}/usr/share/man" \ - ${PN}.install || die -} diff --git a/dev-ml/biniou/biniou-1.2.0.ebuild b/dev-ml/biniou/biniou-1.2.0.ebuild deleted file mode 100644 index 6a9705355a2a..000000000000 --- a/dev-ml/biniou/biniou-1.2.0.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib - -DESCRIPTION="A binary data serialization format inspired by JSON for OCaml" -HOMEPAGE="https://github.com/mjambon/biniou" -SRC_URI="https://github.com/mjambon/biniou/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -SLOT="0/${PV}" -LICENSE="BSD" -KEYWORDS="~amd64" -IUSE="+ocamlopt" - -RDEPEND=">=dev-lang/ocaml-3.11:=[ocamlopt?] - dev-ml/easy-format:=[ocamlopt?] -" -DEPEND="${RDEPEND} - dev-ml/jbuilder - dev-ml/opam -" - -src_install() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - --mandir="${ED}/usr/share/man" \ - ${PN}.install || die -} diff --git a/dev-ml/biniou/biniou-1.2.1.ebuild b/dev-ml/biniou/biniou-1.2.1.ebuild new file mode 100644 index 000000000000..c999d304653d --- /dev/null +++ b/dev-ml/biniou/biniou-1.2.1.ebuild @@ -0,0 +1,20 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="A binary data serialization format inspired by JSON for OCaml" +HOMEPAGE="https://github.com/ocaml-community/biniou/" +SRC_URI="https://github.com/ocaml-community/biniou/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="amd64" +IUSE="+ocamlopt" + +RDEPEND=">=dev-lang/ocaml-4.02.3:=[ocamlopt?] + dev-ml/easy-format:=[ocamlopt?] +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/biniou/biniou-1.2.2-r1.ebuild b/dev-ml/biniou/biniou-1.2.2-r1.ebuild new file mode 100644 index 000000000000..2bd2b9f03492 --- /dev/null +++ b/dev-ml/biniou/biniou-1.2.2-r1.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="A binary data serialization format inspired by JSON for OCaml" +HOMEPAGE="https://github.com/ocaml-community/biniou/" +SRC_URI="https://github.com/ocaml-community/biniou/archive/${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="amd64" +IUSE="+ocamlopt" + +RDEPEND=" + >=dev-lang/ocaml-4.02.3:=[ocamlopt?] + dev-ml/camlp-streams:=[ocamlopt?] + dev-ml/easy-format:=[ocamlopt?] +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/biniou/metadata.xml b/dev-ml/biniou/metadata.xml index 2def74f5ec58..981218bd78b5 100644 --- a/dev-ml/biniou/metadata.xml +++ b/dev-ml/biniou/metadata.xml @@ -1,11 +1,17 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> + <pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">mjambon/biniou</remote-id> - </upstream> + <maintainer type="person" proxied="yes"> + <name>François-Xavier Carton</name> + <email>fx.carton91@gmail.com</email> + </maintainer> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <bugs-to>https://github.com/mjambon/biniou/issues/</bugs-to> + <remote-id type="github">mjambon/biniou</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-ml/bolt/Manifest b/dev-ml/bolt/Manifest deleted file mode 100644 index 237a55cac49e..000000000000 --- a/dev-ml/bolt/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST bolt-1.4.tar.gz 638005 BLAKE2B 2d7c4266d3798b8f7d7c72ec6ea32324106fc845bfea1969538175225e74ff1e0bf65633bd1c5d260b4cf316f3216e32cfb1eab5ed61082ab56677e9de2141c2 SHA512 799ca80603fb4f0979ae7bf7ac5acdab7a0187713021a4277d5c3f5af31ffdea042ab312754a6d20a8849b90d36327aa0cad1d6efbc20cc07a3e86dd733e362e diff --git a/dev-ml/bolt/bolt-1.4.ebuild b/dev-ml/bolt/bolt-1.4.ebuild deleted file mode 100644 index bc070efc1e0b..000000000000 --- a/dev-ml/bolt/bolt-1.4.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib - -DESCRIPTION="Logging tool for the Objective Caml language" -HOMEPAGE="http://bolt.x9c.fr/" -SRC_URI="http://bolt.x9c.fr/distrib/${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="doc" - -RDEPEND=">=dev-lang/ocaml-3.11:=[ocamlopt] - dev-ml/camlp4:=" -DEPEND="${RDEPEND} - dev-ml/ocamlbuild -" - -src_configure() { - sh configure -} - -src_compile() { - emake all - use doc && emake doc -} - -src_test() { - emake tests -} - -src_install() { - findlib_src_install - dodoc README CHANGES FEATURES - use doc && dohtml ocamldoc/* -} diff --git a/dev-ml/bolt/metadata.xml b/dev-ml/bolt/metadata.xml deleted file mode 100644 index ffac4d7ebc01..000000000000 --- a/dev-ml/bolt/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> -</maintainer> -</pkgmetadata> diff --git a/dev-ml/bos/Manifest b/dev-ml/bos/Manifest index 1605b9165f82..3f2fdf2fcb3d 100644 --- a/dev-ml/bos/Manifest +++ b/dev-ml/bos/Manifest @@ -1 +1 @@ -DIST bos-0.1.6.tbz 39822 BLAKE2B 0e10eb14fb5d429b81c67659c936e8b700c4cd417d1f5be000c8bdb0304de8ad9130e597f6e2e7771380c29c148f4339817bacc458e72a8efa894be3b85965bf SHA512 f1f10a97a32da936a7d5a0c70632e723723ee523c79f9dfd23bc42c039a194e8d69658483e6e856c7911332b799a92bf8cabfe96cc387522d7450b8f3f8f8343 +DIST bos-0.2.1.tbz 42330 BLAKE2B c376428ef055555f09e4af24391b7bbcc388af955ac5192bd4c3999325757812a87b54e518fa2d5a3a81d1e8d0d65f2cb3b69d5f186129136855af7766e9ac13 SHA512 8daeb8a4c2dd1f2460f6274ada19f4f1b6ebe875ff83a938c93418ce0e6bdb74b8afc5c9a7d410c1c9df2dad030e4fa276b6ed2da580639484e8b5bc92610b1d diff --git a/dev-ml/bos/bos-0.1.6.ebuild b/dev-ml/bos/bos-0.2.1.ebuild index a3b7dc553e2e..165c9b986192 100644 --- a/dev-ml/bos/bos-0.1.6.ebuild +++ b/dev-ml/bos/bos-0.2.1.ebuild @@ -1,31 +1,31 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 DESCRIPTION="Basic OS interaction for OCaml" -HOMEPAGE="http://erratique.ch/software/bos https://github.com/dbuenzli/bos" -SRC_URI="http://erratique.ch/software/bos/releases/${P}.tbz" +HOMEPAGE="https://erratique.ch/software/bos https://github.com/dbuenzli/bos" +SRC_URI="https://erratique.ch/software/bos/releases/${P}.tbz" LICENSE="ISC" SLOT="0/${PV}" -KEYWORDS="~amd64" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" IUSE="test" +RESTRICT="!test? ( test )" -RDEPEND=" - dev-lang/ocaml:= +RDEPEND="dev-lang/ocaml:= dev-ml/rresult:= dev-ml/astring:= dev-ml/fpath:= dev-ml/fmt:= - dev-ml/logs:= -" -DEPEND="${RDEPEND} - dev-ml/findlib + dev-ml/mtime + dev-ml/logs:=[fmt]" +DEPEND="${RDEPEND}" +BDEPEND="dev-ml/findlib dev-ml/ocamlbuild - dev-ml/topkg - test? ( dev-ml/mtime ) -" + dev-ml/topkg" + +QA_FLAGS_IGNORED='.*' src_compile() { ocaml pkg/pkg.ml build --tests $(usex test true false) || die diff --git a/dev-ml/bos/metadata.xml b/dev-ml/bos/metadata.xml index 8ebac0e8d880..f6f0b1476383 100644 --- a/dev-ml/bos/metadata.xml +++ b/dev-ml/bos/metadata.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">dbuenzli/bos</remote-id> diff --git a/dev-ml/bson/Manifest b/dev-ml/bson/Manifest deleted file mode 100644 index 6b0d6dfef95f..000000000000 --- a/dev-ml/bson/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST bson-0.89.3.tar.gz 64461 BLAKE2B 0dd45738a30dea90aeb0971cfd927ea39651fcf1faa7b835bdd7db58f5b869336149a1635fa3868543d94e66ce485d136de4e63de3e5a00fad2f35d2aba44e2a SHA512 013f082a3f053525981d3cd6b0daabacfe094061ee37345927e040981d74735c2927af2c3b16f7c4734a13599eb04366f0c0fc40e4aa60f122bdfacfe0dc01d3 diff --git a/dev-ml/bson/bson-0.89.3.ebuild b/dev-ml/bson/bson-0.89.3.ebuild deleted file mode 100644 index bdf47aa26aa9..000000000000 --- a/dev-ml/bson/bson-0.89.3.ebuild +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit oasis - -DESCRIPTION="An ocaml implementation for bson" -HOMEPAGE="http://massd.github.io/" -SRC_URI="https://github.com/MassD/bson/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -DEPEND="dev-ml/camlp4:=" -RDEPEND="${DEPEND}" diff --git a/dev-ml/bson/metadata.xml b/dev-ml/bson/metadata.xml deleted file mode 100644 index 80a8bc536426..000000000000 --- a/dev-ml/bson/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">MassD/bson</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/cairo-ocaml/Manifest b/dev-ml/cairo-ocaml/Manifest deleted file mode 100644 index 88a09824bf8d..000000000000 --- a/dev-ml/cairo-ocaml/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST cairo-ocaml-1.2.0.tar.bz2 44483 BLAKE2B 49a8c811100e3167a8c32ca87a0a6c256862d276c3703082b944aa55f8def7b56d478c0ed44b9d7f5de9194603b688daa5e42949db00417b71daa7376e17410b SHA512 5cac319cf27b94d31e955885ae89b40342c2ae4ffd1aca7c52366f7c3679185f74e513e0c73bd01260f89da29d43bb420dadd059fa1cf5509997db8f935704b4 diff --git a/dev-ml/cairo-ocaml/cairo-ocaml-1.2.0.ebuild b/dev-ml/cairo-ocaml/cairo-ocaml-1.2.0.ebuild deleted file mode 100644 index c9c07c183718..000000000000 --- a/dev-ml/cairo-ocaml/cairo-ocaml-1.2.0.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils findlib autotools - -DESCRIPTION="Ocaml bindings for the cairo vector graphics library" -HOMEPAGE="https://www.cairographics.org/cairo-ocaml/" -SRC_URI="https://cgit.freedesktop.org/cairo-ocaml/snapshot/${P}.tar.bz2" - -LICENSE="LGPL-2.1" -SLOT="0/${PV}" -KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux" -IUSE="doc examples gtk pango" - -RDEPEND="dev-lang/ocaml:= - x11-libs/cairo - gtk? ( dev-ml/lablgtk:2= ) - pango? ( x11-libs/pango )" -DEPEND="${RDEPEND}" - -src_prepare() { - # 3 patches from debian and one for automagic on libsvg-cairo - epatch \ - "${FILESDIR}"/0001-Add-missing-libraries-used-by-the-stubs-to-CAIRO_LIB.patch \ - "${FILESDIR}"/0002-Fix-Makefile-to-avoid-recompiling-files-in-usr.patch \ - "${FILESDIR}"/0003-Fix-FTBFS-on-bytecode-architectures.patch \ - "${FILESDIR}"/0004-no-automagic.patch - AT_M4DIR=support eautoreconf -} - -src_configure() { - econf \ - $(use_with gtk) \ - $(use_with pango pango-cairo) \ - --without-svg-cairo -} - -src_compile() { - emake -j1 - use doc && emake doc -} - -src_install() { - findlib_src_install - dodoc README ChangeLog - if use examples; then - insinto /usr/share/doc/${PF}/examples - doins test/*.ml - fi - # ocamlfind support - cat <<-EOF > META - name = "${PN}" - description = "${DESCRIPTION}" - requires = "bigarray" - version = "${PV}" - archive(byte) = "cairo.cma" - archive(native) = "cairo.cmxa" - EOF - if use gtk; then - cat <<-EOF >> META - package "lablgtk2" ( - requires = "cairo lablgtk2" - archive(byte) = "cairo_lablgtk.cma" - archive(native) = "cairo_lablgtk.cmxa" - ) - EOF - fi - if use pango; then - cat <<-EOF >> META - package "pango" ( - requires = "cairo" - archive(byte) = "pango_cairo.cma" - archive(native) = "pango_cairo.cmxa" - ) - EOF - fi - insinto /usr/$(get_libdir)/ocaml/cairo - doins META -} diff --git a/dev-ml/cairo-ocaml/files/0001-Add-missing-libraries-used-by-the-stubs-to-CAIRO_LIB.patch b/dev-ml/cairo-ocaml/files/0001-Add-missing-libraries-used-by-the-stubs-to-CAIRO_LIB.patch deleted file mode 100644 index 6b42f6d4fd52..000000000000 --- a/dev-ml/cairo-ocaml/files/0001-Add-missing-libraries-used-by-the-stubs-to-CAIRO_LIB.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Stephane Glondu <steph@glondu.net> -Date: Sun, 27 Feb 2011 13:31:22 +0100 -Subject: Add missing libraries used by the stubs to CAIRO_LIBS - -The recent changes in DSO linking highlighted this, and were -preventing ocaml-melt from building. - -Signed-off-by: Stephane Glondu <steph@glondu.net> ---- - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 6c8c4e9..0cf1f11 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -6,7 +6,7 @@ AC_CONFIG_AUX_DIR(support) - AC_PROG_OCAML() - - # Check for cairo --PKG_CHECK_MODULES(CAIRO, cairo >= 1.2 freetype2) -+PKG_CHECK_MODULES(CAIRO, cairo >= 1.2 cairo-ft cairo-fc cairo-ps cairo-pdf freetype2) - - # Optional GTK support (for the X11 backend) - AC_ARG_WITH(gtk, --- diff --git a/dev-ml/cairo-ocaml/files/0002-Fix-Makefile-to-avoid-recompiling-files-in-usr.patch b/dev-ml/cairo-ocaml/files/0002-Fix-Makefile-to-avoid-recompiling-files-in-usr.patch deleted file mode 100644 index fcb0f0583227..000000000000 --- a/dev-ml/cairo-ocaml/files/0002-Fix-Makefile-to-avoid-recompiling-files-in-usr.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: Stephane Glondu <steph@glondu.net> -Date: Tue, 2 Aug 2011 15:34:21 +0200 -Subject: Fix Makefile to avoid recompiling files in /usr - -The "-I /path/to/lablgtk2" option should not be used when calling -ocamldep, otherwise files there are considered as possible targets by -the build system. - -Signed-off-by: Stephane Glondu <steph@glondu.net> ---- - src/Makefile | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/Makefile b/src/Makefile -index 46a62f6..c9c64b7 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -117,7 +117,7 @@ clean : - - .depend : $(wildcard *.ml *.mli) - @echo "making deps" -- @$(OCAMLDEP) $(if $(LABLGTKDIR),-I $(LABLGTKDIR)) $^ > $@ -+ @$(OCAMLDEP) $^ > $@ - - -include .depend - -include .depend_c --- diff --git a/dev-ml/cairo-ocaml/files/0003-Fix-FTBFS-on-bytecode-architectures.patch b/dev-ml/cairo-ocaml/files/0003-Fix-FTBFS-on-bytecode-architectures.patch deleted file mode 100644 index 8882ce0a4da8..000000000000 --- a/dev-ml/cairo-ocaml/files/0003-Fix-FTBFS-on-bytecode-architectures.patch +++ /dev/null @@ -1,39 +0,0 @@ -From: Stephane Glondu <steph@glondu.net> -Date: Tue, 2 Aug 2011 21:35:59 +0200 -Subject: Fix FTBFS on bytecode architectures - -The new ocaml.m4 defines OCAMLOPT to "no" (instead of not defining -it); adapt src/Makefile accordingly. - -Signed-off-by: Stephane Glondu <steph@glondu.net> ---- - src/Makefile | 8 ++++++-- - 1 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/src/Makefile b/src/Makefile -index c9c64b7..bc223c7 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -14,7 +14,11 @@ ifdef LIBPANGOCAIRO_CFLAGS - TARGETS += pangocairo - endif - --all : $(TARGETS) $(if $(OCAMLOPT),opt) -+ifneq ($(OCAMLOPT),no) -+OPT_TARGET = opt -+endif -+ -+all : $(TARGETS) $(OPT_TARGET) - opt : $(addsuffix .opt,$(TARGETS)) - - cairo : cairo.cma libmlcairo.a -@@ -89,7 +93,7 @@ $(call mloptobjs,$(pangocairo_SRC)) : INCFLAGS=-I $(LABLGTKDIR) - install: all - mkdir -p $(DESTDIR)$(INSTALLDIR) $(DESTDIR)$(OCAMLLIB)/stublibs - install -m 644 *.mli *.cmi *.cma lib*.a $(DESTDIR)$(INSTALLDIR) --ifdef OCAMLOPT -+ifneq ($(OCAMLOPT),no) - install -m644 *.cmxa *.a *.cmx $(DESTDIR)$(INSTALLDIR) - endif - install -m 755 dll*.so $(DESTDIR)$(INSTALLDIR) --- diff --git a/dev-ml/cairo-ocaml/files/0004-no-automagic.patch b/dev-ml/cairo-ocaml/files/0004-no-automagic.patch deleted file mode 100644 index 46b70013fa3a..000000000000 --- a/dev-ml/cairo-ocaml/files/0004-no-automagic.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- cairo-ocaml-1.2.0/configure.ac.orig 2012-06-17 20:58:38.000000000 +0100 -+++ cairo-ocaml-1.2.0/configure.ac 2012-06-17 21:05:49.000000000 +0100 -@@ -27,10 +27,20 @@ - fi - - # Optional libsvg-cairo support --PKG_CHECK_MODULES(LIBSVG_CAIRO, libsvg-cairo, use_libsvg_cairo=yes, use_libsvg_cairo=no) -+AC_ARG_WITH(svg-cairo, -+ AS_HELP_STRING([--with-svg-cairo],[libsvg-cairo support]), -+ use_libsvg_cairo=$withval, use_libsvg_cairo=no) -+if test x$use_libsvg_cairo != xno; then -+ PKG_CHECK_MODULES(LIBSVG_CAIRO, libsvg-cairo, use_libsvg_cairo=yes, use_libsvg_cairo=no) -+fi - - # Optional pango-cairo support --PKG_CHECK_MODULES(LIBPANGOCAIRO, pangocairo, use_libpangocairo=yes, use_libpangocairo=no) -+AC_ARG_WITH(pango-cairo, -+ AS_HELP_STRING([--with-pango-cairo],[pangocairo support]), -+ use_libpangocairo=$withval, use_libpangocairo=no) -+if test x$use_libpangocairo != xno; then -+ PKG_CHECK_MODULES(LIBPANGOCAIRO, pangocairo, use_libpangocairo=yes, use_libpangocairo=no) -+ fi - - echo - echo " GTK+ support: $use_gtk" diff --git a/dev-ml/cairo-ocaml/metadata.xml b/dev-ml/cairo-ocaml/metadata.xml deleted file mode 100644 index 0fedfcd6cbf8..000000000000 --- a/dev-ml/cairo-ocaml/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>sci@gentoo.org</email> - <name>Gentoo Science Project</name> -</maintainer> -<longdescription lang="en"> - This package contains all the development stuff you need to use Cairo in - your OCaml programs. The folowing backends are supported: PostScript, - PDF, PNG, In-memory images and X11. -</longdescription> -<use> - <flag name="pango">Enable support for <pkg>x11-libs/pango</pkg></flag> -</use> -</pkgmetadata> diff --git a/dev-ml/cairo2/Manifest b/dev-ml/cairo2/Manifest new file mode 100644 index 000000000000..d382cb8fa78f --- /dev/null +++ b/dev-ml/cairo2/Manifest @@ -0,0 +1,3 @@ +DIST cairo2-0.6.1.tbz 90006 BLAKE2B 78f1a998f821aad9b2a1d2deacffd9290920e6d351e0c66b6cc2a6f4f6140fef67c0dde9c1c317e743b5930e09d68d6c1830beb554d23ac9bcc95738a4091850 SHA512 d09274624854a45cf914ffbe984f1bcdd30db6283e7a0fd73aeec2a19226ff8f68d3f7139bbab72ca5698b58b840d6fd8a35570efc228391a7c5d031421f5c1f +DIST cairo2-0.6.2.tbz 90428 BLAKE2B a8c03e6ea8d4dcfc34a744f48b9a55a5e84b964602358f1c90aadcc5fdaed8eebecba2c851e71ef60066d42088d0baf9f4b90824541af93426e47f2539d6f41b SHA512 789b65428855c3b8fb71836ee6e607870c3140a6152fb01b8ba6e7d2e2f4842a62412061a5eff99023234d305587b605d0cbbacd29456c86a52e9df6466bd302 +DIST cairo2-0.6.4.tbz 90735 BLAKE2B d0e6617a1de99050553ebbb0ea9fa1567051923378b164f8ff073700cbda7275a7c5dc97ed74d9f891b18fe4a051b8da81450da4946364ea7c6e53ec10cc8ba0 SHA512 2fd755b32253a4c441146fb41d13bf7ad4ce3828bc479ece296fb58350e20c7349c22457ad99fa080407b5150ce337a753221043f18b7b641f4c5bc98e37e799 diff --git a/dev-ml/cairo2/cairo2-0.6.1-r2.ebuild b/dev-ml/cairo2/cairo2-0.6.1-r2.ebuild new file mode 100644 index 000000000000..50ed56346789 --- /dev/null +++ b/dev-ml/cairo2/cairo2-0.6.1-r2.ebuild @@ -0,0 +1,37 @@ +# Copyright 2019-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Binding to Cairo, a 2D Vector Graphics Library" +HOMEPAGE="https://github.com/Chris00/ocaml-cairo" +SRC_URI="https://github.com/Chris00/ocaml-cairo/releases/download/${PV}/cairo2-${PV}.tbz" + +LICENSE="LGPL-3" +SLOT="0/${PV}" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt" + +DEPEND=" + x11-libs/cairo:=[svg(+)] + dev-ml/dune-configurator:= +" +RDEPEND="${DEPEND}" +BDEPEND="" + +# >>> Test phase: dev-ml/cairo2-0.6.1 +# image_create alias tests/runtest (got signal SEGV) +# (cd _build/default/tests && ./image_create.exe) +# DESTROY bigarray 'data' +# Done: 70/72 (jobs: 1) * ERROR: dev-ml/cairo2-0.6.1::x-portage failed (test phase): +RESTRICT=test + +# Remove lablgtk2 dep https://github.com/Chris00/ocaml-cairo/issues/21 +# Fix compiler warnings, from: https://github.com/Chris00/ocaml-cairo/pull/22 +PATCHES=( + "${FILESDIR}"/${PN}-0.6.1-ignore-gtk-and-pango.patch + "${FILESDIR}"/${PN}-0.6.1-handle-safe-string.patch + "${FILESDIR}"/${PN}-0.6.1-Fix-multiple-definitions-of-variables.patch +) diff --git a/dev-ml/cairo2/cairo2-0.6.2-r2.ebuild b/dev-ml/cairo2/cairo2-0.6.2-r2.ebuild new file mode 100644 index 000000000000..d85b66777011 --- /dev/null +++ b/dev-ml/cairo2/cairo2-0.6.2-r2.ebuild @@ -0,0 +1,35 @@ +# Copyright 2019-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Binding to Cairo, a 2D Vector Graphics Library" +HOMEPAGE="https://github.com/Chris00/ocaml-cairo" +SRC_URI="https://github.com/Chris00/ocaml-cairo/releases/download/${PV}/cairo2-${PV}.tbz" + +LICENSE="LGPL-3" +SLOT="0/${PV}" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt" + +DEPEND=" + x11-libs/cairo:=[svg(+)] + dev-ml/dune-configurator:= +" +RDEPEND="${DEPEND}" +BDEPEND="" + +# >>> Test phase: dev-ml/cairo2-0.6.1 +# image_create alias tests/runtest (got signal SEGV) +# (cd _build/default/tests && ./image_create.exe) +# DESTROY bigarray 'data' +# Done: 70/72 (jobs: 1) * ERROR: dev-ml/cairo2-0.6.1::x-portage failed (test phase): +RESTRICT=test + +# Remove lablgtk2 dep https://github.com/Chris00/ocaml-cairo/issues/21 +# Fix compiler warnings, from: https://github.com/Chris00/ocaml-cairo/pull/22 +PATCHES=( + "${FILESDIR}"/${PN}-0.6.1-ignore-gtk-and-pango.patch +) diff --git a/dev-ml/cairo2/cairo2-0.6.4.ebuild b/dev-ml/cairo2/cairo2-0.6.4.ebuild new file mode 100644 index 000000000000..19d4414fad4a --- /dev/null +++ b/dev-ml/cairo2/cairo2-0.6.4.ebuild @@ -0,0 +1,35 @@ +# Copyright 2019-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Binding to Cairo, a 2D Vector Graphics Library" +HOMEPAGE="https://github.com/Chris00/ocaml-cairo" +SRC_URI="https://github.com/Chris00/ocaml-cairo/releases/download/${PV}/cairo2-${PV}.tbz" + +LICENSE="LGPL-3" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt" + +DEPEND=" + x11-libs/cairo:=[svg(+)] + dev-ml/dune-configurator:= +" +RDEPEND="${DEPEND}" +BDEPEND="" + +# >>> Test phase: dev-ml/cairo2-0.6.1 +# image_create alias tests/runtest (got signal SEGV) +# (cd _build/default/tests && ./image_create.exe) +# DESTROY bigarray 'data' +# Done: 70/72 (jobs: 1) * ERROR: dev-ml/cairo2-0.6.1::x-portage failed (test phase): +RESTRICT=test + +# Remove lablgtk2 dep https://github.com/Chris00/ocaml-cairo/issues/21 +# Fix compiler warnings, from: https://github.com/Chris00/ocaml-cairo/pull/22 +PATCHES=( + "${FILESDIR}"/${PN}-0.6.1-ignore-gtk-and-pango.patch +) diff --git a/dev-ml/cairo2/files/cairo2-0.6.1-Fix-multiple-definitions-of-variables.patch b/dev-ml/cairo2/files/cairo2-0.6.1-Fix-multiple-definitions-of-variables.patch new file mode 100644 index 000000000000..4f0eed297363 --- /dev/null +++ b/dev-ml/cairo2/files/cairo2-0.6.1-Fix-multiple-definitions-of-variables.patch @@ -0,0 +1,102 @@ +From: Stephane Glondu <steph@glondu.net> +Date: Sat, 15 Aug 2020 09:08:30 +0200 +Subject: Fix multiple definitions of variables + +Bug-Debian: https://bugs.debian.org/968427 +Bug: https://github.com/Chris00/ocaml-cairo/issues/23 +Forwarded: https://github.com/Chris00/ocaml-cairo/issues/23 +--- + src/cairo_ocaml.h.p | 18 +++++++++--------- + src/cairo_ocaml_types.h | 4 +++- + 2 files changed, 12 insertions(+), 10 deletions(-) + +diff --git a/src/cairo_ocaml.h.p b/src/cairo_ocaml.h.p +index 4192aed..1f05664 100644 +--- a/src/cairo_ocaml.h.p ++++ b/src/cairo_ocaml.h.p +@@ -25,7 +25,7 @@ + /* cairo_t + ***********************************************************************/ + #define CAIRO_VAL(v) (* (cairo_t **) Data_custom_val(v)) +-struct custom_operations caml_cairo_ops; ++extern struct custom_operations caml_cairo_ops; + + void caml_cairo_raise_Error(cairo_status_t status); + /* raise [Cairo.Error] if the status indicates a failure. */ +@@ -33,7 +33,7 @@ void caml_cairo_raise_Error(cairo_status_t status); + /* cairo_pattern_t + ***********************************************************************/ + #define PATTERN_VAL(v) (* (cairo_pattern_t **) Data_custom_val(v)) +-struct custom_operations caml_pattern_ops; ++extern struct custom_operations caml_pattern_ops; + + #define EXTEND_VAL(v) ((cairo_extend_t) Int_val(v)) + #define VAL_EXTEND(v) Val_int(v) +@@ -45,12 +45,12 @@ struct custom_operations caml_pattern_ops; + ***********************************************************************/ + + #define FONT_OPTIONS_VAL(v) (* (cairo_font_options_t**) Data_custom_val(v)) +-struct custom_operations caml_font_options_ops; ++extern struct custom_operations caml_font_options_ops; + + /* cairo_font_type_t + ***********************************************************************/ + +-value caml_cairo_font_type[5]; ++extern value caml_cairo_font_type[5]; + + cairo_font_type_t caml_cairo_font_type_val(value vft); + +@@ -61,13 +61,13 @@ cairo_font_type_t caml_cairo_font_type_val(value vft); + ***********************************************************************/ + + #define SCALED_FONT_VAL(v) (* (cairo_scaled_font_t**) Data_custom_val(v)) +-struct custom_operations caml_scaled_font_ops; ++extern struct custom_operations caml_scaled_font_ops; + + /* cairo_surface_t + ***********************************************************************/ + + #define SURFACE_VAL(v) (* (cairo_surface_t **) Data_custom_val(v)) +-struct custom_operations caml_surface_ops; ++extern struct custom_operations caml_surface_ops; + + /* Type cairo_content_t */ + +@@ -93,7 +93,7 @@ struct custom_operations caml_surface_ops; + ***********************************************************************/ + + #define PATH_VAL(v) (* (cairo_path_t **) Data_custom_val(v)) +-struct custom_operations caml_path_ops; ++extern struct custom_operations caml_path_ops; + + #define PATH_DATA_ASSIGN(vdata, data) \ + switch (data->header.type) { \ +@@ -151,10 +151,10 @@ struct custom_operations caml_path_ops; + #include <cairo-ft.h> + + #define FT_LIBRARY_VAL(v) (* (FT_Library*) Data_custom_val(v)) +-struct custom_operations caml_cairo_ft_library_ops; ++extern struct custom_operations caml_cairo_ft_library_ops; + + #define FT_FACE_VAL(v) (* (FT_Face*) Data_custom_val(v)) +-struct custom_operations caml_cairo_ft_face_ops; ++extern struct custom_operations caml_cairo_ft_face_ops; + + #endif /* OCAML_CAIRO_HAS_FT */ + +diff --git a/src/cairo_ocaml_types.h b/src/cairo_ocaml_types.h +index b850ae2..84dde3d 100644 +--- a/src/cairo_ocaml_types.h ++++ b/src/cairo_ocaml_types.h +@@ -276,7 +276,9 @@ struct custom_operations caml_font_options_ops = { + custom_deserialize_default }; + + +-/* caml_cairo_font_type is defined in "cairo_ocaml.h". */ ++/* caml_cairo_font_type is exported in "cairo_ocaml.h". */ ++value caml_cairo_font_type[5]; ++ + CAMLexport value caml_cairo_font_type_init(value unit) + { + /* noalloc */ diff --git a/dev-ml/cairo2/files/cairo2-0.6.1-handle-safe-string.patch b/dev-ml/cairo2/files/cairo2-0.6.1-handle-safe-string.patch new file mode 100644 index 000000000000..8571da4ea9fe --- /dev/null +++ b/dev-ml/cairo2/files/cairo2-0.6.1-handle-safe-string.patch @@ -0,0 +1,50 @@ +commit 9881f6c861ccf1150fffd6ccdb8b93181ad14263 (HEAD -> const, origin/const) +Author: Olaf Hering <olaf@aepfle.de> +Date: Fri Jul 17 15:47:59 2020 +0200 + + handle safe-string + + String_val() returns 'const char *'. + caml_named_value returns 'const value *'. + + Signed-off-by: Olaf Hering <olaf@aepfle.de> + +diff --git a/src/cairo_macros.h b/src/cairo_macros.h +index d952c10..1348b27 100644 +--- a/src/cairo_macros.h ++++ b/src/cairo_macros.h +@@ -173,7 +173,7 @@ + + /* holds the pointer to the Unavailable exception; shared several + functions. */ +-value * caml_cairo_Unavailable = NULL; ++const value * caml_cairo_Unavailable = NULL; + + #define RAISE_UNAVAILABLE(name, args ...) \ + CAMLexport value caml_##name(args) \ +diff --git a/src/cairo_ocaml_types.h b/src/cairo_ocaml_types.h +index b850ae2..267f657 100644 +--- a/src/cairo_ocaml_types.h ++++ b/src/cairo_ocaml_types.h +@@ -45,7 +45,7 @@ DEFINE_CUSTOM_OPERATIONS(cairo, cairo_destroy, CAIRO_VAL) + /* raise [Error] if the status indicates a failure. */ + void caml_cairo_raise_Error(cairo_status_t status) + { +- static value * exn = NULL; ++ static const value * exn = NULL; + + if (status != CAIRO_STATUS_SUCCESS) { + if (exn == NULL) { +diff --git a/src/cairo_stubs.c b/src/cairo_stubs.c +index de35aca..597c0bf 100644 +--- a/src/cairo_stubs.c ++++ b/src/cairo_stubs.c +@@ -1681,7 +1681,7 @@ static cairo_status_t caml_cairo_output_string + CAMLlocal2(s, r); + + s = caml_alloc_string(length); +- memmove(String_val(s), data, length); ++ memmove(&Byte(String_val(s), 0), data, length); + r = caml_callback_exn(* ((value *) fn), s); + if (Is_exception_result(r)) + CAMLreturn(CAIRO_STATUS_WRITE_ERROR); diff --git a/dev-ml/cairo2/files/cairo2-0.6.1-ignore-gtk-and-pango.patch b/dev-ml/cairo2/files/cairo2-0.6.1-ignore-gtk-and-pango.patch new file mode 100644 index 000000000000..90fc00f1ddcf --- /dev/null +++ b/dev-ml/cairo2/files/cairo2-0.6.1-ignore-gtk-and-pango.patch @@ -0,0 +1,82 @@ +From: Debian OCaml Maintainers <debian-ocaml-maint@lists.debian.org> +Date: Sat, 15 Aug 2020 08:56:03 +0200 +Subject: ignore-gtk-and-pango + +=================================================================== +--- + examples-gtk/dune | 8 -------- + examples-pango/dune | 8 -------- + gtk/dune | 13 ------------- + pango/dune | 13 ------------- + 4 files changed, 42 deletions(-) + delete mode 100644 examples-gtk/dune + delete mode 100644 examples-pango/dune + delete mode 100644 gtk/dune + delete mode 100644 pango/dune + +diff --git a/examples-gtk/dune b/examples-gtk/dune +deleted file mode 100644 +index 10d8fcb..0000000 +--- a/examples-gtk/dune ++++ /dev/null +@@ -1,8 +0,0 @@ +- +-(executables +- (names gtk_demo) +-(libraries cairo2-gtk)) +- +-(alias +- (name examples) +- (deps gtk_demo.exe)) +diff --git a/examples-pango/dune b/examples-pango/dune +deleted file mode 100644 +index c8ae49e..0000000 +--- a/examples-pango/dune ++++ /dev/null +@@ -1,8 +0,0 @@ +- +-(executables +- (names pango_demo rendering) +- (libraries cairo2-pango)) +- +-(alias +- (name examples) +- (deps pango_demo.exe rendering.exe)) +diff --git a/gtk/dune b/gtk/dune +deleted file mode 100644 +index 6ef367e..0000000 +--- a/gtk/dune ++++ /dev/null +@@ -1,13 +0,0 @@ +- +-(library +- (name cairo_gtk) +- (public_name cairo2-gtk) +- (c_names cairo_gtk_stubs) +- (c_flags :standard (:include c_flags.sexp)) +- (c_library_flags :standard (:include c_library_flags.sexp)) +- (libraries threads lablgtk2 cairo2) +- (synopsis "Rendering Cairo on Gtk canvas")) +- +-(rule +- (targets c_flags.sexp c_library_flags.sexp) +- (action (run ../config/discover.exe --gtk))) +diff --git a/pango/dune b/pango/dune +deleted file mode 100644 +index 816cc49..0000000 +--- a/pango/dune ++++ /dev/null +@@ -1,13 +0,0 @@ +- +-(library +- (name cairo_pango) +- (public_name cairo2-pango) +- (c_names cairo_pango_stubs) +- (c_flags :standard (:include c_flags.sexp)) +- (c_library_flags :standard (:include c_library_flags.sexp)) +- (libraries threads lablgtk2 cairo2) +- (synopsis "Interface between Cairo and Pango")) +- +-(rule +- (targets c_flags.sexp c_library_flags.sexp) +- (action (run ../config/discover.exe --gtk))) diff --git a/dev-ml/ocaml-cairo/metadata.xml b/dev-ml/cairo2/metadata.xml index 4f1aeadab838..fc2a957d4205 100644 --- a/dev-ml/ocaml-cairo/metadata.xml +++ b/dev-ml/cairo2/metadata.xml @@ -1,9 +1,9 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">Chris00/ocaml-cairo</remote-id> diff --git a/dev-ml/calendar/calendar-2.04.ebuild b/dev-ml/calendar/calendar-2.04.ebuild index 234cd57645b7..d1bf98476f13 100644 --- a/dev-ml/calendar/calendar-2.04.ebuild +++ b/dev-ml/calendar/calendar-2.04.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit findlib eutils +inherit findlib -DESCRIPTION="An Ocaml library to handle dates and time" -HOMEPAGE="http://forge.ocamlcore.org/projects/calendar/" -SRC_URI="http://forge.ocamlcore.org/frs/download.php/1481/${P}.tar.gz" +DESCRIPTION="Ocaml library to handle dates and time" +HOMEPAGE="https://forge.ocamlcore.org/projects/calendar/" +SRC_URI="https://download.ocamlcore.org/${PN}/${PN}/${PV}/${P}.tar.gz" LICENSE="LGPL-2.1-with-linking-exception" SLOT="0/${PV}" @@ -29,5 +29,9 @@ src_test() { src_install() { findlib_src_install dodoc README CHANGES - use doc && dohtml -r doc + + if use doc ; then + docinto html + dodoc -r doc + fi } diff --git a/dev-ml/calendar/metadata.xml b/dev-ml/calendar/metadata.xml index ffac4d7ebc01..85e4ed814fa2 100644 --- a/dev-ml/calendar/metadata.xml +++ b/dev-ml/calendar/metadata.xml @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> -</maintainer> +<!-- maintainer-needed --> </pkgmetadata> diff --git a/dev-ml/calendars/Manifest b/dev-ml/calendars/Manifest new file mode 100644 index 000000000000..e539c264aaef --- /dev/null +++ b/dev-ml/calendars/Manifest @@ -0,0 +1 @@ +DIST calendars-1.0.0.tar.gz 7374 BLAKE2B 8792bc8b9996ec4f71eec6d34570d5b3d4fa17ea40be3dbc6cb379f0318ae01897b50df20e8cbfe5d91450078231155547bcb2a25b1789efc0e6c9993b3d2c3d SHA512 84bcc9c96eab1a1821699ebd90ab04a14c3afa54d9f112001a5bde8efb3b8fe29baf6da133dde561e9ed290fec5babd673818e490779986725f6c5ab644c2391 diff --git a/dev-ml/calendars/calendars-1.0.0.ebuild b/dev-ml/calendars/calendars-1.0.0.ebuild new file mode 100644 index 000000000000..3b03bc654b4e --- /dev/null +++ b/dev-ml/calendars/calendars-1.0.0.ebuild @@ -0,0 +1,19 @@ +# Copyright 2019-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Convert dates between gregorian/julian/french/hebrew calendars" +HOMEPAGE="https://github.com/geneweb/calendars" +SRC_URI="https://github.com/geneweb/${PN}/archive/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0/${PV}" +KEYWORDS="amd64 x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +DEPEND="test? ( dev-ml/ounit2 )" diff --git a/dev-ml/ocaml-snappy/metadata.xml b/dev-ml/calendars/metadata.xml index ed271f5f83cf..eb6966491ecd 100644 --- a/dev-ml/ocaml-snappy/metadata.xml +++ b/dev-ml/calendars/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> - <remote-id type="github">ygrek/ocaml-snappy</remote-id> + <remote-id type="github">geneweb/calendars</remote-id> </upstream> </pkgmetadata> diff --git a/dev-ml/camlbz2/Manifest b/dev-ml/camlbz2/Manifest index 91a61a4d5f25..265beb0658ff 100644 --- a/dev-ml/camlbz2/Manifest +++ b/dev-ml/camlbz2/Manifest @@ -1 +1 @@ -DIST camlbz2-0.6.0.tar.gz 57771 BLAKE2B 5b4337ca547c37f6982c29c9b70f00ca3100983541a80bf16e8d549c2eabf64ef917ea3ba445c8bb5bbcdb1a652cc5cd586c95299d194a7abe8e68ea9f1a0599 SHA512 1052536bb08c9d9f9bdf4a063a5a01389445b55117ce423dd1732de00cd79db5e4befb4ce5c81c5db8a6d40b28a2ac4b897bb00598fdccf76ea92a2966592680 +DIST camlbz2-0.7.0.tar.bz2 21300 BLAKE2B 6b4830a957c98aafe2dfa164a5b9160724e3509dcc9686ee825224ede4b0a05eb5e8407707b4ee99e30417111552ca3023b79b0b4e6f93ef2e58212af9b4a46e SHA512 5f5c9e75014b2c869907150919ea1faa142d42868cc4f1d19feb19dfc586fbf8f871f21e3e77995e1253d01352827084619f7351bd960d76464e0cd8ad9dbaa7 diff --git a/dev-ml/camlbz2/camlbz2-0.6.0.ebuild b/dev-ml/camlbz2/camlbz2-0.6.0.ebuild deleted file mode 100644 index 15884ba324e3..000000000000 --- a/dev-ml/camlbz2/camlbz2-0.6.0.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib - -DESCRIPTION="OCaml bindings for libbz (AKA, bzip2)" -HOMEPAGE="http://camlbz2.forge.ocamlcore.org/" -SRC_URI="http://forge.ocamlcore.org/frs/download.php/72/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" -IUSE="doc" - -DEPEND="app-arch/bzip2 - >=dev-lang/ocaml-3.12:=[ocamlopt]" -RDEPEND="${DEPEND}" - -src_compile() { - emake -j1 -} - -src_install() { - findlib_src_preinst - emake DESTDIR="${OCAMLFIND_DESTDIR}" install - dodoc ChangeLog README ROADMAP BUGS - use doc && dohtml doc/* -} diff --git a/dev-ml/camlbz2/camlbz2-0.7.0.ebuild b/dev-ml/camlbz2/camlbz2-0.7.0.ebuild new file mode 100644 index 000000000000..950ee0959db1 --- /dev/null +++ b/dev-ml/camlbz2/camlbz2-0.7.0.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +AT_M4DIR="m4" +inherit autotools findlib + +DESCRIPTION="OCaml bindings for libbz (AKA, bzip2)" +HOMEPAGE="https://gitlab.com/irill/camlbz2" +SRC_URI="https://gitlab.com/irill/camlbz2/-/archive/${PV}/${P}.tar.bz2" + +LICENSE="LGPL-2.1" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" + +DEPEND=" + app-arch/bzip2 + >=dev-lang/ocaml-3.12:=[ocamlopt] +" +RDEPEND="${DEPEND}" + +src_prepare() { + default + + mkdir m4 || die + mv ocaml.m4 m4 || die + + eautoreconf +} + +src_compile() { + emake -j1 all +} + +src_install() { + findlib_src_preinst + emake DESTDIR="${OCAMLFIND_DESTDIR}" install +} diff --git a/dev-ml/camlbz2/metadata.xml b/dev-ml/camlbz2/metadata.xml index ffac4d7ebc01..9d0c1bff09f3 100644 --- a/dev-ml/camlbz2/metadata.xml +++ b/dev-ml/camlbz2/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> -</maintainer> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="gitlab">irill/camlbz2</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-ml/camldbm/Manifest b/dev-ml/camldbm/Manifest index 8540da892688..b81db05c293b 100644 --- a/dev-ml/camldbm/Manifest +++ b/dev-ml/camldbm/Manifest @@ -1 +1,2 @@ DIST camldbm-1.0.tgz 14397 BLAKE2B 9b6971e30815ad6984254591af793819beb3859ddbf7bbd95ee744a2b09ce04968ecad9c7ff954e1606776d82988b3499f2569154586a937a61eb6d5c7b9465b SHA512 d0b752754650efb400f13f957e83fddccf1fc9ac9e1d11f453af94e9aa599546a316eb110685b3728b593c99cbf859cdc7bcf924c878cf8b6dead3dc413ccfbf +DIST camldbm-1.2.tar.gz 14823 BLAKE2B b9eda65c56440b1d13562e0d184474e585b13826038e77901961df475cbd73df39c9923e4f73c891252f17416e78acb3c3b42accf01dc5d6f51a72bafa930084 SHA512 56d317db420179f96a0f6a453f8a34ea16942f3ca5ed09dd6955517348dad281ad105b861378f1ebd01ec5c8a1c07d5e5db1ab4d255f9572ece64a86559705f0 diff --git a/dev-ml/camldbm/camldbm-1.0.ebuild b/dev-ml/camldbm/camldbm-1.0.ebuild index c6af754862f9..cb2837d1ab20 100644 --- a/dev-ml/camldbm/camldbm-1.0.ebuild +++ b/dev-ml/camldbm/camldbm-1.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit base +inherit toolchain-funcs DESCRIPTION="OCaml binding to the NDBM/GDBM Unix databases" HOMEPAGE="http://forge.ocamlcore.org/projects/camldbm/" @@ -11,14 +11,24 @@ SRC_URI="http://forge.ocamlcore.org/frs/download.php/728/${P}.tgz" LICENSE="LGPL-2-with-linking-exception" SLOT="0/${PV}" -KEYWORDS="amd64 arm ppc x86 ~amd64-fbsd ~x86-fbsd" -IUSE="" +KEYWORDS="amd64 arm ~ppc x86" DEPEND=">=sys-libs/gdbm-1.9.1-r2[berkdb] >=dev-lang/ocaml-3.12:=[ocamlopt]" RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/hasgotfix.patch" "${FILESDIR}/include_fix.patch" ) +PATCHES=( + "${FILESDIR}/hasgotfix.patch" + "${FILESDIR}/include_fix.patch" +) + +src_prepare() { + sed -i \ + -e "s|ranlib|$(tc-getRANLIB)|g" \ + Makefile \ + || die + default +} src_install() { dodir "$(ocamlc -where)/stublibs" # required and makefile does not create it diff --git a/dev-ml/camldbm/camldbm-1.2.ebuild b/dev-ml/camldbm/camldbm-1.2.ebuild new file mode 100644 index 000000000000..5708dbeea498 --- /dev/null +++ b/dev-ml/camldbm/camldbm-1.2.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +DESCRIPTION="OCaml binding to the NDBM/GDBM Unix databases" +HOMEPAGE="https://github.com/ocaml/dbm" +SRC_URI="https://github.com/ocaml/dbm/archive/${P}.tar.gz" +S="${WORKDIR}/dbm-${P}" + +LICENSE="LGPL-2-with-linking-exception" +SLOT="0/${PV}" +KEYWORDS="amd64 arm ~ppc x86" + +DEPEND=">=sys-libs/gdbm-1.9.1-r2[berkdb] + >=dev-lang/ocaml-3.12:=[ocamlopt]" +RDEPEND="${DEPEND}" + +QA_FLAGS_IGNORED=( + /usr/'lib.*'/ocaml/dbm.cmxs + /usr/'lib.*'/ocaml/stublibs/dllcamldbm.so +) + +src_prepare() { + sed -i \ + -e "s|ranlib|$(tc-getRANLIB)|g" \ + Makefile \ + || die + default +} + +src_install() { + dodir "$(ocamlc -where)/stublibs" # required and makefile does not create it + emake LIBDIR="${D}/$(ocamlc -where)" install +} diff --git a/dev-ml/camldbm/metadata.xml b/dev-ml/camldbm/metadata.xml index ffac4d7ebc01..9866468afa01 100644 --- a/dev-ml/camldbm/metadata.xml +++ b/dev-ml/camldbm/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> -</maintainer> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">ocaml/dbm</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-ml/camlidl/Manifest b/dev-ml/camlidl/Manifest index 812a3761c903..5a8705c56ec1 100644 --- a/dev-ml/camlidl/Manifest +++ b/dev-ml/camlidl/Manifest @@ -1 +1,3 @@ DIST camlidl-1.05.tar.gz 100640 BLAKE2B 38cbcebd43ced26c44803608aabdacfbd33734357097a542ee2558223b9699d89cf7be388feba59630b10e4dc3977bffd08c669d3cf676d2136f54a6a8d52aab SHA512 e8857aca818a06f8c861e5f55dddd7e8e3ab1efae51647534460b4f092166709d86c6de1215c792a0489d668d72064ccfb7635e9a6d3854cd5a62f74541a9d18 +DIST camlidl109.tar.gz 125697 BLAKE2B c42e418525b9681a0e7042aea46fb581a1ffa93be416a9214325883407a62bcad7e8fd7a20fd997640deb42ddca394605f5569bc8f363721b8955629459ff49e SHA512 6cab1fa6bc2afba9b97874520eed2887c4fd341b59735854b120aa1ec8822710d9ebfadd1fecff56e629d4a1af7ee73befe6440c5462493f8408bdae8519a1fa +DIST camlidl111.tar.gz 182421 BLAKE2B 5bd4bf2e2eb73f632c5e99a271e13d6a1b4b815476f2a17aaa6a05a4ccf048f4c58b099219e46d36659711f0473dbf91d484d5dcb12ee2e08327afec92a66b66 SHA512 dfd99cb10ee96de4e8a9a2ee86834a33ce10ba362aea93a061c373336db872ddf4017f2601bc47d1662de2f5699e885166dc984a213ff1c4142d41d7c99d7a21 diff --git a/dev-ml/camlidl/camlidl-1.05-r1.ebuild b/dev-ml/camlidl/camlidl-1.05-r1.ebuild index 6dd3e9f5d3d3..d7cbca3f978e 100644 --- a/dev-ml/camlidl/camlidl-1.05-r1.ebuild +++ b/dev-ml/camlidl/camlidl-1.05-r1.ebuild @@ -1,49 +1,60 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit eutils toolchain-funcs +inherit toolchain-funcs DESCRIPTION="CamlIDL is a stub code generator for using C/C++ libraries from O'Caml" HOMEPAGE="http://caml.inria.fr/camlidl/" SRC_URI="http://caml.inria.fr/distrib/bazar-ocaml/${P}.tar.gz" + LICENSE="QPL-1.0 LGPL-2" SLOT="0/${PV}" KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux" -IUSE="" + DEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt]" RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}/tests.patch" + "${FILESDIR}/includes.patch" + "${FILESDIR}/nowarn.patch" +) + src_prepare() { - epatch "${FILESDIR}/tests.patch" - epatch "${FILESDIR}/includes.patch" - epatch "${FILESDIR}/nowarn.patch" + sed -i \ + -e "s|ar rc|$(tc-getAR) rc|g" \ + runtime/Makefile.unix \ + || die + default } src_compile() { # Use the UNIX makefile - libdir=`ocamlc -where` - sed -i -e "s|OCAMLLIB=.*|OCAMLLIB=${libdir}|" config/Makefile.unix - sed -i -e "s|BINDIR=.*|BINDIR=${EPREFIX}/usr/bin|" config/Makefile.unix - ln -s Makefile.unix config/Makefile + libdir=$(ocamlc -where || die) + + sed -i -e "s|OCAMLLIB=.*|OCAMLLIB=${libdir}|" config/Makefile.unix || die + sed -i -e "s|BINDIR=.*|BINDIR=${EPREFIX}/usr/bin|" config/Makefile.unix || die + ln -s Makefile.unix config/Makefile || die # Make - emake -j1 + emake -j1 RANLIB="$(tc-getRANLIB)" } src_test() { einfo "Running tests..." - cd tests + cd tests || die emake CCPP="$(tc-getCXX)" } src_install() { - libdir=`ocamlc -where` - dodir ${libdir#${EPREFIX}}/caml + libdir=$(ocamlc -where || die) + dodir "${libdir#${EPREFIX}}"/caml + dodir /usr/bin # Install - emake BINDIR="${ED}/usr/bin" OCAMLLIB="${D}${libdir}" install + emake BINDIR="${ED}/usr/bin" OCAMLLIB="${D}${libdir}" RANLIB="$(tc-getRANLIB)" install # Add package header sed -e "s/@VERSION/${P}/g" "${FILESDIR}/META.camlidl" > "${D}${libdir}/META.camlidl" || die diff --git a/dev-ml/camlidl/camlidl-1.09.ebuild b/dev-ml/camlidl/camlidl-1.09.ebuild new file mode 100644 index 000000000000..69fd815e015e --- /dev/null +++ b/dev-ml/camlidl/camlidl-1.09.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +DESCRIPTION="CamlIDL is a stub code generator for using C/C++ libraries from O'Caml" +HOMEPAGE="http://caml.inria.fr/camlidl/" +SRC_URI="https://github.com/xavierleroy/${PN}/archive/${PN}$(ver_rs 0-1 '').tar.gz" + +LICENSE="QPL-1.0 LGPL-2" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" + +DEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt]" +RDEPEND="${DEPEND}" + +S="${WORKDIR}"/${PN}-${PN}$(ver_rs 0-1 '') + +PATCHES=( + "${FILESDIR}/nowarn.patch" + "${FILESDIR}"/${P}.parallelMake.patch +) + +src_prepare() { + sed -i \ + -e "s|ar rc|$(tc-getAR) rc|g" \ + runtime/Makefile.unix \ + || die + default +} + +src_compile() { + # Use the UNIX makefile + libdir=$(ocamlc -where || die) + + sed -i -e "s|OCAMLLIB=.*|OCAMLLIB=${libdir}|" config/Makefile.unix || die + sed -i -e "s|BINDIR=.*|BINDIR=${EPREFIX}/usr/bin|" config/Makefile.unix || die + ln -s Makefile.unix config/Makefile || die + + # Make + emake depend + emake -j1 RANLIB="$(tc-getRANLIB)" CPP="$(tc-getPROG CPP cpp)" +} + +src_test() { + einfo "Running tests..." + cd tests || die + emake CCPP="$(tc-getCXX)" CC="$(tc-getCC)" +} + +src_install() { + libdir=$(ocamlc -where || die) + dodir "${libdir#${EPREFIX}}"/caml + + dodir /usr/bin + dodir /usr/$(get_libdir)/ocaml/stublibs + # Install + emake BINDIR="${ED}/usr/bin" OCAMLLIB="${D}${libdir}" RANLIB="$(tc-getRANLIB)" install + + # Add package header + sed -e "s/@VERSION/${P}/g" "${FILESDIR}/META.camlidl" > "${D}${libdir}/META.camlidl" || die + + # Documentation + dodoc README Changes +} diff --git a/dev-ml/camlidl/camlidl-1.11.ebuild b/dev-ml/camlidl/camlidl-1.11.ebuild new file mode 100644 index 000000000000..cf719ff1b91a --- /dev/null +++ b/dev-ml/camlidl/camlidl-1.11.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +DESCRIPTION="Stub code generator for OCaml" +HOMEPAGE="https://github.com/xavierleroy/camlidl" +SRC_URI="https://github.com/xavierleroy/${PN}/archive/${PN}$(ver_rs 0-1 '').tar.gz" + +LICENSE="QPL-1.0 LGPL-2" +SLOT="0/${PV}" +KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux" + +DEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt]" +RDEPEND="${DEPEND}" + +S="${WORKDIR}"/${PN}-${PN}$(ver_rs 0-1 '') + +PATCHES=( + "${FILESDIR}/nowarn.patch" +) + +src_prepare() { + sed -i \ + -e "s|ar rc|$(tc-getAR) rc|g" \ + runtime/Makefile.unix \ + || die + default +} + +src_compile() { + # Use the UNIX makefile + libdir=$(ocamlc -where || die) + + sed -i -e "s|OCAMLLIB=.*|OCAMLLIB=${libdir}|" config/Makefile.unix || die + sed -i -e "s|BINDIR=.*|BINDIR=${EPREFIX}/usr/bin|" config/Makefile.unix || die + ln -s Makefile.unix config/Makefile || die + + # Make + emake depend + emake -j1 RANLIB="$(tc-getRANLIB)" CPP="$(tc-getPROG CPP cpp)" +} + +src_test() { + einfo "Running tests..." + cd tests || die + emake CCPP="$(tc-getCXX)" CC="$(tc-getCC)" +} + +src_install() { + libdir=$(ocamlc -where || die) + dodir "${libdir#${EPREFIX}}"/caml + + dodir /usr/bin + dodir /usr/$(get_libdir)/ocaml/stublibs + # Install + emake BINDIR="${ED}/usr/bin" OCAMLLIB="${D}${libdir}" RANLIB="$(tc-getRANLIB)" install + + # Add package header + sed -e "s/@VERSION/${P}/g" "${FILESDIR}/META.camlidl" > "${D}${libdir}/META.camlidl" || die + + # Documentation + dodoc README Changes +} diff --git a/dev-ml/camlidl/files/camlidl-1.09.parallelMake.patch b/dev-ml/camlidl/files/camlidl-1.09.parallelMake.patch new file mode 100644 index 000000000000..1a6df0f21f5e --- /dev/null +++ b/dev-ml/camlidl/files/camlidl-1.09.parallelMake.patch @@ -0,0 +1,12 @@ +--- a/tests/Makefile 2023-01-19 21:02:36.678227862 +0100 ++++ b/tests/Makefile 2023-01-19 21:03:01.140832955 +0100 +@@ -11,7 +11,8 @@ + COMLIBS=$(COMLIBS_$(OSTYPE)) + COMLIBS_win32=advapi32.lib ole32.lib oleaut32.lib + +-all: ../caml/camlidlruntime.h $(TESTS:.idl=.$(OBJEXT)) testcomp ++all: ../caml/camlidlruntime.h ++ $(MAKE) $(TESTS:.idl=.$(OBJEXT)) testcomp + + $(TESTS:.idl=.$(OBJEXT)) component.$(OBJEXT): $(CAMLIDL) ../runtime/camlidlruntime.h + diff --git a/dev-ml/camlidl/files/includes.patch b/dev-ml/camlidl/files/includes.patch index 060aceefd0a5..077ba21d93da 100644 --- a/dev-ml/camlidl/files/includes.patch +++ b/dev-ml/camlidl/files/includes.patch @@ -1,7 +1,5 @@ -Index: camlidl-1.05/runtime/comerror.c -=================================================================== ---- camlidl-1.05.orig/runtime/comerror.c -+++ camlidl-1.05/runtime/comerror.c +--- a/runtime/comerror.c ++++ b/runtime/comerror.c @@ -22,6 +22,7 @@ #include <caml/callback.h> #include <caml/fail.h> diff --git a/dev-ml/camlidl/files/nowarn.patch b/dev-ml/camlidl/files/nowarn.patch index 8b457cf7ed1e..3d9a5bbbf8af 100644 --- a/dev-ml/camlidl/files/nowarn.patch +++ b/dev-ml/camlidl/files/nowarn.patch @@ -1,7 +1,5 @@ -Index: camlidl-1.05/compiler/Makefile -=================================================================== ---- camlidl-1.05.orig/compiler/Makefile -+++ camlidl-1.05/compiler/Makefile +--- a/compiler/Makefile ++++ b/compiler/Makefile @@ -29,7 +29,7 @@ PROG=camlidl$(EXE) all: $(PROG) diff --git a/dev-ml/camlidl/files/tests.patch b/dev-ml/camlidl/files/tests.patch index f7272424be80..f8c4595f9fbd 100644 --- a/dev-ml/camlidl/files/tests.patch +++ b/dev-ml/camlidl/files/tests.patch @@ -1,7 +1,5 @@ -Index: camlidl-1.05/tests/unix.idl -=================================================================== ---- camlidl-1.05.orig/tests/unix.idl -+++ camlidl-1.05/tests/unix.idl +--- a/tests/unix.idl ++++ b/tests/unix.idl @@ -15,16 +15,16 @@ quote (C, " union process_status { int code; }; diff --git a/dev-ml/camlidl/metadata.xml b/dev-ml/camlidl/metadata.xml index ffa6c6b4395b..9e499a2ca554 100644 --- a/dev-ml/camlidl/metadata.xml +++ b/dev-ml/camlidl/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">xavierleroy/camlidl</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-ml/camlimages/Manifest b/dev-ml/camlimages/Manifest deleted file mode 100644 index 857ba5041060..000000000000 --- a/dev-ml/camlimages/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST camlimages-4.2.2.tar.bz2 789441 BLAKE2B 003a451b1b070ed82e5d0a1857cbb448270f46a4b3948096f93a28aaaeb820c100b7ac73f8ca1f94cfe6b3aa0dd68dbb18b597d37fcf5ebd014179ccee509ab5 SHA512 672e192255a9335c45d208b7589a344f712baa798dfc7bc7ccee7d3bda71e603bc06c7b012761f9c6372c683560c67ffa9d2af2742552884211ad4ffb541e3dd -DIST camlimages-4.2.3.tar.bz2 789523 BLAKE2B 53bb5ea92d35855dd714e035734445ba100bd3ec4558edc8535a73af6911bf943558176e5c2919c337371df51ae255d97e3bfb1947f2bdfd275a3db9a269c737 SHA512 c67775394ab97d0c0111d3e4e49ceb8213a405d48e133c321db920e291dc2ad79e1e7876a0bdff8fe1ad3b3f27ea0effe79bd26d29f92d5bb1ebd74f03d13bd5 -DIST camlimages-4.2.4.tar.bz2 789623 BLAKE2B f10c34bdbb51ec1bff7d7557b49356eb57770715e42db1075f9306b1b07a67cdc219c4d98a1127b75e429361becb7199d3c557d7d756047dd898c31b761b71a0 SHA512 0c321c933d61df84456c56b0082dea80fbcb37e30dc616f84a7d12c5bfd36c157a2a9d31dc92da20b6bbfd0a87db8f4b14537ab56b1c5863b24c7cbb59f3e0e7 diff --git a/dev-ml/camlimages/camlimages-4.2.2.ebuild b/dev-ml/camlimages/camlimages-4.2.2.ebuild deleted file mode 100644 index 8f825c780a51..000000000000 --- a/dev-ml/camlimages/camlimages-4.2.2.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils vcs-snapshot findlib multilib - -DESCRIPTION="An image manipulation library for ocaml" -HOMEPAGE="http://gallium.inria.fr/camlimages/" -SRC_URI="https://bitbucket.org/camlspotter/camlimages/get/${PV}.tar.bz2 -> ${P}.tar.bz2" - -LICENSE="LGPL-2.1" -SLOT="0/${PV}" -KEYWORDS="~amd64 ppc x86" -IUSE="exif gif gtk jpeg png postscript tiff truetype X xpm" - -RDEPEND=">=dev-lang/ocaml-3.10.2:=[X?,ocamlopt] - exif? ( media-libs/libexif ) - gif? ( media-libs/giflib ) - gtk? ( dev-ml/lablgtk ) - jpeg? ( virtual/jpeg ) - tiff? ( media-libs/tiff ) - png? ( >=media-libs/libpng-1.4:0 ) - postscript? ( app-text/ghostscript-gpl ) - truetype? ( >=media-libs/freetype-2 ) - xpm? ( x11-libs/libXpm ) - X? ( x11-apps/rgb ) - sys-libs/zlib - " -DEPEND="${DEPEND} - dev-util/omake - virtual/pkgconfig - dev-ml/findlib" - -camlimages_arg_want() { - echo "ARG_WANT_${2}=$(usex $1 1 0)" -} - -src_compile() { - omake \ - $(camlimages_arg_want exif EXIF ) \ - $(camlimages_arg_want gif GIF ) \ - $(camlimages_arg_want png PNG ) \ - $(camlimages_arg_want jpeg JPEG ) \ - $(camlimages_arg_want tiff TIFF ) \ - $(camlimages_arg_want xpm XPM ) \ - $(camlimages_arg_want postscript GS ) \ - $(camlimages_arg_want gtk LABLGTK2) \ - $(camlimages_arg_want X GRAPHICS) \ - $(camlimages_arg_want truetype FREETYPE) \ - PATH_GS=/bin/true \ - --force-dotomake || die -} - -src_install() { - findlib_src_preinst - omake --force-dotomake DESTDIR="${D}" install || die - dodoc README.md -} diff --git a/dev-ml/camlimages/camlimages-4.2.3.ebuild b/dev-ml/camlimages/camlimages-4.2.3.ebuild deleted file mode 100644 index 9be34cb0db7b..000000000000 --- a/dev-ml/camlimages/camlimages-4.2.3.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils vcs-snapshot findlib multilib - -DESCRIPTION="An image manipulation library for ocaml" -HOMEPAGE="http://gallium.inria.fr/camlimages/" -SRC_URI="https://bitbucket.org/camlspotter/camlimages/get/${PV}.tar.bz2 -> ${P}.tar.bz2" - -LICENSE="LGPL-2.1" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="exif gif gtk jpeg png postscript tiff truetype X xpm" - -RDEPEND=">=dev-lang/ocaml-3.10.2:=[X?,ocamlopt] - exif? ( media-libs/libexif ) - gif? ( media-libs/giflib ) - gtk? ( dev-ml/lablgtk ) - jpeg? ( virtual/jpeg ) - tiff? ( media-libs/tiff ) - png? ( >=media-libs/libpng-1.4:0 ) - postscript? ( app-text/ghostscript-gpl ) - truetype? ( >=media-libs/freetype-2 ) - xpm? ( x11-libs/libXpm ) - X? ( x11-apps/rgb ) - sys-libs/zlib - " -DEPEND="${DEPEND} - dev-util/omake - virtual/pkgconfig - dev-ml/findlib" - -camlimages_arg_want() { - echo "ARG_WANT_${2}=$(usex $1 1 0)" -} - -src_compile() { - omake \ - $(camlimages_arg_want exif EXIF ) \ - $(camlimages_arg_want gif GIF ) \ - $(camlimages_arg_want png PNG ) \ - $(camlimages_arg_want jpeg JPEG ) \ - $(camlimages_arg_want tiff TIFF ) \ - $(camlimages_arg_want xpm XPM ) \ - $(camlimages_arg_want postscript GS ) \ - $(camlimages_arg_want gtk LABLGTK2) \ - $(camlimages_arg_want X GRAPHICS) \ - $(camlimages_arg_want truetype FREETYPE) \ - PATH_GS=/bin/true \ - --force-dotomake || die -} - -src_install() { - findlib_src_preinst - omake --force-dotomake DESTDIR="${D}" install || die - dodoc README.md -} diff --git a/dev-ml/camlimages/camlimages-4.2.4.ebuild b/dev-ml/camlimages/camlimages-4.2.4.ebuild deleted file mode 100644 index 9be34cb0db7b..000000000000 --- a/dev-ml/camlimages/camlimages-4.2.4.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils vcs-snapshot findlib multilib - -DESCRIPTION="An image manipulation library for ocaml" -HOMEPAGE="http://gallium.inria.fr/camlimages/" -SRC_URI="https://bitbucket.org/camlspotter/camlimages/get/${PV}.tar.bz2 -> ${P}.tar.bz2" - -LICENSE="LGPL-2.1" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="exif gif gtk jpeg png postscript tiff truetype X xpm" - -RDEPEND=">=dev-lang/ocaml-3.10.2:=[X?,ocamlopt] - exif? ( media-libs/libexif ) - gif? ( media-libs/giflib ) - gtk? ( dev-ml/lablgtk ) - jpeg? ( virtual/jpeg ) - tiff? ( media-libs/tiff ) - png? ( >=media-libs/libpng-1.4:0 ) - postscript? ( app-text/ghostscript-gpl ) - truetype? ( >=media-libs/freetype-2 ) - xpm? ( x11-libs/libXpm ) - X? ( x11-apps/rgb ) - sys-libs/zlib - " -DEPEND="${DEPEND} - dev-util/omake - virtual/pkgconfig - dev-ml/findlib" - -camlimages_arg_want() { - echo "ARG_WANT_${2}=$(usex $1 1 0)" -} - -src_compile() { - omake \ - $(camlimages_arg_want exif EXIF ) \ - $(camlimages_arg_want gif GIF ) \ - $(camlimages_arg_want png PNG ) \ - $(camlimages_arg_want jpeg JPEG ) \ - $(camlimages_arg_want tiff TIFF ) \ - $(camlimages_arg_want xpm XPM ) \ - $(camlimages_arg_want postscript GS ) \ - $(camlimages_arg_want gtk LABLGTK2) \ - $(camlimages_arg_want X GRAPHICS) \ - $(camlimages_arg_want truetype FREETYPE) \ - PATH_GS=/bin/true \ - --force-dotomake || die -} - -src_install() { - findlib_src_preinst - omake --force-dotomake DESTDIR="${D}" install || die - dodoc README.md -} diff --git a/dev-ml/camlimages/metadata.xml b/dev-ml/camlimages/metadata.xml deleted file mode 100644 index 76ac88771bc0..000000000000 --- a/dev-ml/camlimages/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="bitbucket">camlspotter/camlimages</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/camlp-streams/Manifest b/dev-ml/camlp-streams/Manifest new file mode 100644 index 000000000000..6973a627864a --- /dev/null +++ b/dev-ml/camlp-streams/Manifest @@ -0,0 +1 @@ +DIST camlp-streams-5.0.1.tar.gz 17392 BLAKE2B bec87a4b9717bcd05799317542533a83e43b5d7dcdc0d691595678613da4f091f087c00487e1499e088687cc9cf21381386c92e25db9d5f182200805452b43fd SHA512 2efa8dd4a636217c8d49bac1e4e7e5558fc2f45cfea66514140a59fd99dd08d61fb9f1e17804997ff648b71b13820a5d4a1eb70fed9d848aa2abd6e41f853c86 diff --git a/dev-ml/camlp-streams/camlp-streams-5.0.1.ebuild b/dev-ml/camlp-streams/camlp-streams-5.0.1.ebuild new file mode 100644 index 000000000000..22b50c2eea1b --- /dev/null +++ b/dev-ml/camlp-streams/camlp-streams-5.0.1.ebuild @@ -0,0 +1,17 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Stream and Genlex libraries for use with Camlp4 and Camlp5" +HOMEPAGE="https://github.com/ocaml/camlp-streams" +SRC_URI="https://github.com/ocaml/${PN}/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="LGPL-2-with-linking-exception" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" + +IUSE="+ocamlopt" diff --git a/dev-ml/camlp-streams/metadata.xml b/dev-ml/camlp-streams/metadata.xml new file mode 100644 index 000000000000..8e02f1e00978 --- /dev/null +++ b/dev-ml/camlp-streams/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">ocaml/camlp-streams</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/camlp4/Manifest b/dev-ml/camlp4/Manifest index 1f2104298bcd..932ed4319fdb 100644 --- a/dev-ml/camlp4/Manifest +++ b/dev-ml/camlp4/Manifest @@ -1,2 +1,7 @@ -DIST camlp4-4.04_p1.tar.gz 648320 BLAKE2B d383a366facaaa440b24184bb54a8e1c3bb22ae02387a0bc4f9ee4331ecdc60e5bf22715c1022c987041fb081eb448794a74026736df9f70e05c7213e08bfa44 SHA512 7db8eebcf3d230f60650ba62d9cb630c069394237e97b678a40b61d3dcaded752a2b7e089a50ff528f1ea0740d0291b722df123a072f2cee489cadc5201c6776 -DIST camlp4-4.05_p1.tar.gz 647566 BLAKE2B 068c1016a75616811787eb480b61349a32960997f03e0bc99d63e15357a8932a6019d9e7195541fd942ef99fc1d71c067fb5fcb0fd0c2c3efb77aac494589854 SHA512 0ee9720286d0d832fb7d2d21a8877856e0e47c94c86b1b58d28f8e757a18472eecb56a16e3a04ce815f240dd5048f5d597515461d084fd1cf4da1b121f97a3fe +DIST camlp4-4.09_p1.tar.gz 649702 BLAKE2B 2bf0fd0b4f22d21b9fa7e195a26f4dece56549c56d191480d5c874aac9422d2d4aa41e23e96c078f653f6da6bdbd186583cb02e857741fdb526b53b000b981bb SHA512 71a8eed173013bdea61f7a268c82acaa1f5215aebbf4b638efba137760e849f9fede82f801aa14e5d6cc334d6e67d752988b15a36557b363a8feaf9ba1d1add4 +DIST camlp4-4.10_p1.tar.gz 650092 BLAKE2B d7a6221dba5f6ec6963fe35236c29f39b8ae8f928618b5a58f72e7b1cc1f50d716b110f9684150716b56784cf703c0d8fcbc1aad32aeab638faca9c1bf2d5b9e SHA512 7ae0e20053a43399daa4ee9b93b6f4dbebc3e17c5ee79d069c4903cdfb2bf1cfc7d6badecf92fcf62e97a5f85f3be6ed82a62eb2a311bf6398b2792eacf763d8 +DIST camlp4-4.11_p1.tar.gz 650280 BLAKE2B 6fe46b49c1f2b2e5fc87fbbbdba3ccae795c555737495c298456b84f0dca79c750aa6e4ab2c23bbc7ba4724defdfb739e370f468a78658035474d2f3ad255995 SHA512 8e572602c1c465017a234565efa2249c935ba1ad3d399a6b264bfbec345958130a96311c79e437ac995e3ead9ff7b4f2d3fe6aa4a3a82431ae0cc6257a300f4c +DIST camlp4-4.12.tar.gz 650428 BLAKE2B 4957d3db73ec82fbac58dd95fa13c48f9f8480a70cd6bded43a00df0a182f9b9e31a43acef8264f9d940776667d10b0a5c46bded59ebf4a645719264628428fc SHA512 0a19bb596e47076a28a6bea62007f1d3b59c4d688075f6b723abaa205c555707feb4ea0624259994a4ba5251fdea9dc61cdc936dc13611b36937e755a4bc9b7b +DIST camlp4-4.13.tar.gz 650642 BLAKE2B 5bf70b21f47eefe4631227d0d30fdd08ab965020026d0183fc94b9dbfd1eee45626afbe62bf9507b1a887217cf9245901d40f25cce9430155eb9ec1ddc577554 SHA512 d3307bd11b813540d126719c0afe7e75a7740d0851b272be9bd1a28e8b1ab1ed9a7576109000c8d6cee7ece7f777122aa83917a48147d42ed8f4d72994397819 +DIST camlp4-4.14.tar.gz 653205 BLAKE2B 52978c3fc67ddc1ecf8f6e4fa956823bd1bca41f7a317e4a17936ec774171fd566e49140da69930750dceb5519657912cc2490ca725838c27bbe5ec987596d67 SHA512 1f06a5db82f556da8bfb2c7a699acb007173d4e685aa07a8349b1da91a8ac1a460bf9f98ac8f920357961c1da78ccc27814e178d466e270a4f00a1a9f00ea776 +DIST camlp4-4.14_p1.tar.gz 641790 BLAKE2B 3e1054a924956e9c23d43fb4ef00cf99fe09f6d2a5eb4216cb3d5079a439159d36703b6ae268789d73e51e87ed0329531b25c2e846df03c4ae99b1a6403b84c3 SHA512 1853ae0465a1366cf73d7aa9de56c037ef3d4bb5b341fe3eeb39677b5b08bda44316634b93d5d35d917a98dff8eb40da974937f714ab609818e7d25f716de811 diff --git a/dev-ml/camlp4/camlp4-4.05_p1.ebuild b/dev-ml/camlp4/camlp4-4.09_p1-r2.ebuild index 63a829b74226..81cf455621fd 100644 --- a/dev-ml/camlp4/camlp4-4.05_p1.ebuild +++ b/dev-ml/camlp4/camlp4-4.09_p1-r2.ebuild @@ -1,28 +1,29 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 MY_PV=${PV/_p/+} MY_P=${PN}-${MY_PV} DESCRIPTION="System for writing extensible parsers for programming languages" -HOMEPAGE="https://github.com/ocaml/camlp4" -SRC_URI="https://github.com/ocaml/camlp4/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" +HOMEPAGE="https://github.com/camlp4/camlp4" +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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux" IUSE="+ocamlopt" -DEPEND=">=dev-lang/ocaml-4.05_beta:=[ocamlopt?]" -RDEPEND="${DEPEND} - !<dev-lang/ocaml-4.02 - !<dev-ml/findlib-1.5.5-r1" -DEPEND="${DEPEND} - dev-ml/ocamlbuild" +RDEPEND="dev-lang/ocaml:0/4.09[ocamlopt?]" +DEPEND="${RDEPEND} + dev-ml/ocamlbuild[ocamlopt?] + dev-ml/findlib:=" + +QA_FLAGS_IGNORED='.*' S=${WORKDIR}/${P/_p/-} +PATCHES=( "${FILESDIR}/reload.patch" ) src_configure() { ./configure \ @@ -33,6 +34,8 @@ src_configure() { } src_compile() { + # Increase stack limit to 11GiB to avoid stack overflow error. + ulimit -s 11530000 emake byte use ocamlopt && emake native } diff --git a/dev-ml/camlp4/camlp4-4.10_p1-r3.ebuild b/dev-ml/camlp4/camlp4-4.10_p1-r3.ebuild new file mode 100644 index 000000000000..64641f012733 --- /dev/null +++ b/dev-ml/camlp4/camlp4-4.10_p1-r3.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_PV=${PV/_p/+} +MY_P=${PN}-${MY_PV} + +DESCRIPTION="System for writing extensible parsers for programming languages" +HOMEPAGE="https://github.com/camlp4/camlp4" +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" +IUSE="+ocamlopt" + +RDEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]" +DEPEND="${RDEPEND} + dev-ml/ocamlbuild[ocamlopt?] + dev-ml/findlib:=" + +QA_FLAGS_IGNORED='.*' + +S=${WORKDIR}/${P/_p/-} +PATCHES=( "${FILESDIR}/reload.patch" ) + +src_configure() { + ./configure \ + --bindir="${EPREFIX}/usr/bin" \ + --libdir="$(ocamlc -where)" \ + --pkgdir="$(ocamlc -where)" \ + || die +} + +src_compile() { + # Increase stack limit to 11GiB to avoid stack overflow error. + ulimit -s 11530000 + emake byte + use ocamlopt && emake native +} + +src_install() { + emake DESTDIR="${D}" install install-META + dodoc CHANGES.md README.md +} diff --git a/dev-ml/camlp4/camlp4-4.04_p1.ebuild b/dev-ml/camlp4/camlp4-4.11_p1-r3.ebuild index 9a5152d03f33..b3c8eb765030 100644 --- a/dev-ml/camlp4/camlp4-4.04_p1.ebuild +++ b/dev-ml/camlp4/camlp4-4.11_p1-r3.ebuild @@ -1,28 +1,29 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 MY_PV=${PV/_p/+} MY_P=${PN}-${MY_PV} DESCRIPTION="System for writing extensible parsers for programming languages" -HOMEPAGE="https://github.com/ocaml/camlp4" -SRC_URI="https://github.com/ocaml/camlp4/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" +HOMEPAGE="https://github.com/camlp4/camlp4" +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="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux" IUSE="+ocamlopt" -DEPEND=">=dev-lang/ocaml-4.04_beta:=[ocamlopt?]" -RDEPEND="${DEPEND} - !<dev-lang/ocaml-4.02 - !<dev-ml/findlib-1.5.5-r1" -DEPEND="${DEPEND} - dev-ml/ocamlbuild" +RDEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]" +DEPEND="${RDEPEND} + dev-ml/ocamlbuild[ocamlopt?] + dev-ml/findlib:=" + +QA_FLAGS_IGNORED='.*' S=${WORKDIR}/${P/_p/-} +PATCHES=( "${FILESDIR}/reload.patch" ) src_configure() { ./configure \ @@ -33,6 +34,8 @@ src_configure() { } src_compile() { + # Increase stack limit to 11GiB to avoid stack overflow error. + ulimit -s 11530000 emake byte use ocamlopt && emake native } diff --git a/dev-ml/camlp4/camlp4-4.12-r2.ebuild b/dev-ml/camlp4/camlp4-4.12-r2.ebuild new file mode 100644 index 000000000000..64641f012733 --- /dev/null +++ b/dev-ml/camlp4/camlp4-4.12-r2.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_PV=${PV/_p/+} +MY_P=${PN}-${MY_PV} + +DESCRIPTION="System for writing extensible parsers for programming languages" +HOMEPAGE="https://github.com/camlp4/camlp4" +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" +IUSE="+ocamlopt" + +RDEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]" +DEPEND="${RDEPEND} + dev-ml/ocamlbuild[ocamlopt?] + dev-ml/findlib:=" + +QA_FLAGS_IGNORED='.*' + +S=${WORKDIR}/${P/_p/-} +PATCHES=( "${FILESDIR}/reload.patch" ) + +src_configure() { + ./configure \ + --bindir="${EPREFIX}/usr/bin" \ + --libdir="$(ocamlc -where)" \ + --pkgdir="$(ocamlc -where)" \ + || die +} + +src_compile() { + # Increase stack limit to 11GiB to avoid stack overflow error. + ulimit -s 11530000 + emake byte + use ocamlopt && emake native +} + +src_install() { + emake DESTDIR="${D}" install install-META + dodoc CHANGES.md README.md +} diff --git a/dev-ml/camlp4/camlp4-4.13-r2.ebuild b/dev-ml/camlp4/camlp4-4.13-r2.ebuild new file mode 100644 index 000000000000..64641f012733 --- /dev/null +++ b/dev-ml/camlp4/camlp4-4.13-r2.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_PV=${PV/_p/+} +MY_P=${PN}-${MY_PV} + +DESCRIPTION="System for writing extensible parsers for programming languages" +HOMEPAGE="https://github.com/camlp4/camlp4" +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" +IUSE="+ocamlopt" + +RDEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]" +DEPEND="${RDEPEND} + dev-ml/ocamlbuild[ocamlopt?] + dev-ml/findlib:=" + +QA_FLAGS_IGNORED='.*' + +S=${WORKDIR}/${P/_p/-} +PATCHES=( "${FILESDIR}/reload.patch" ) + +src_configure() { + ./configure \ + --bindir="${EPREFIX}/usr/bin" \ + --libdir="$(ocamlc -where)" \ + --pkgdir="$(ocamlc -where)" \ + || die +} + +src_compile() { + # Increase stack limit to 11GiB to avoid stack overflow error. + ulimit -s 11530000 + emake byte + use ocamlopt && emake native +} + +src_install() { + emake DESTDIR="${D}" install install-META + dodoc CHANGES.md README.md +} diff --git a/dev-ml/camlp4/camlp4-4.14-r1.ebuild b/dev-ml/camlp4/camlp4-4.14-r1.ebuild new file mode 100644 index 000000000000..7d638e7619a8 --- /dev/null +++ b/dev-ml/camlp4/camlp4-4.14-r1.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PV=${PV/_p/+} +MY_P=${PN}-${MY_PV} + +inherit edo + +DESCRIPTION="System for writing extensible parsers for programming languages" +HOMEPAGE="https://github.com/camlp4/camlp4" +SRC_URI="https://github.com/camlp4/camlp4/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" +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" +IUSE="+ocamlopt" + +RDEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]" +DEPEND="${RDEPEND} + dev-ml/ocamlbuild[ocamlopt?] + dev-ml/findlib:=" + +QA_FLAGS_IGNORED='.*' + +PATCHES=( "${FILESDIR}/reload.patch" ) + +src_configure() { + edo ./configure \ + --bindir="${EPREFIX}/usr/bin" \ + --libdir="$(ocamlc -where)" \ + --pkgdir="$(ocamlc -where)" +} + +src_compile() { + # Increase stack limit to 11GiB to avoid stack overflow error. + ulimit -s 11530000 + + emake byte + use ocamlopt && emake native +} + +src_install() { + emake DESTDIR="${D}" install install-META + dodoc CHANGES.md README.md +} diff --git a/dev-ml/camlp4/camlp4-4.14_p1-r2.ebuild b/dev-ml/camlp4/camlp4-4.14_p1-r2.ebuild new file mode 100644 index 000000000000..bc9abed5b0d0 --- /dev/null +++ b/dev-ml/camlp4/camlp4-4.14_p1-r2.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PV=${PV/_p/+} +MY_P=${PN}-${MY_PV} + +inherit edo + +DESCRIPTION="System for writing extensible parsers for programming languages" +HOMEPAGE="https://github.com/camlp4/camlp4" +SRC_URI="https://github.com/camlp4/camlp4/archive/${MY_PV}.tar.gz + -> ${P}.tar.gz" +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" +IUSE="+ocamlopt" + +RDEPEND="=dev-lang/ocaml-4.14*:=[ocamlopt?]" +DEPEND=" + ${RDEPEND} + dev-ml/ocamlbuild[ocamlopt?] + dev-ml/findlib:= +" + +QA_FLAGS_IGNORED='.*' + +PATCHES=( "${FILESDIR}/reload.patch" ) + +src_configure() { + edo ./configure \ + --bindir="${EPREFIX}/usr/bin" \ + --libdir="$(ocamlc -where)" \ + --pkgdir="$(ocamlc -where)" +} + +src_compile() { + # Increase stack limit to 11GiB to avoid stack overflow error. + ulimit -s 11530000 + + emake byte + use ocamlopt && emake native +} + +src_install() { + emake DESTDIR="${D}" install install-META + dodoc CHANGES.md README.md +} diff --git a/dev-ml/camlp4/files/reload.patch b/dev-ml/camlp4/files/reload.patch new file mode 100644 index 000000000000..8fbc1c05532c --- /dev/null +++ b/dev-ml/camlp4/files/reload.patch @@ -0,0 +1,13 @@ +Index: camlp4-4.08-1/camlp4/Camlp4/Struct/DynLoader.ml +=================================================================== +--- camlp4-4.08-1.orig/camlp4/Camlp4/Struct/DynLoader.ml ++++ camlp4-4.08-1/camlp4/Camlp4/Struct/DynLoader.ml +@@ -76,7 +76,7 @@ value load = + [ Not_found -> raise (Error file "file not found in path") ] + in + try Dynlink.loadfile fname with +- [ Dynlink.Error e -> raise (Error fname (Dynlink.error_message e)) ] ++ [ Dynlink.Error (Module_already_loaded _ ) -> () | Dynlink.Error e -> raise (Error fname (Dynlink.error_message e)) ] + }; + + diff --git a/dev-ml/camlp4/metadata.xml b/dev-ml/camlp4/metadata.xml index 3cd96568fe64..7ff326998e1e 100644 --- a/dev-ml/camlp4/metadata.xml +++ b/dev-ml/camlp4/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">ocaml/camlp4</remote-id> - </upstream> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">camlp4/camlp4</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-ml/camlp5/Manifest b/dev-ml/camlp5/Manifest index 893ad6f7a26d..af6ca1792ee5 100644 --- a/dev-ml/camlp5/Manifest +++ b/dev-ml/camlp5/Manifest @@ -1,4 +1,11 @@ -DIST camlp5-6.17.tar.gz 718935 BLAKE2B b0a573e1110d6ce0654325a1a7310ebee8c815998df3f1a2bec514a4c4755dedfe68349a55dd227c97a667dbbf36c3d896bd17400e32b0f05e3e9801142aa204 SHA512 c4bf32eb79202d6127375b940fe77fc57c7dc5f8c6763b50ba23ab52ae9f3edb0ba15148109af2f6f4808619348d78e927cfdf29901bf1141b17de0d3fd8ff30 -DIST camlp5-7.00.tar.gz 755750 BLAKE2B b047422ff34c4d15c21b65bd7473ccdad8bfc1f484a0075f1beeaa50fdca72b2f900b437333c847a4e4fd7bb8ae5c37aa4ed984e3a850c4dcba045d8678502c4 SHA512 2d63451229f86fffeb287735ed26901ad43bb964b6ede1716cb82737001a5c1e4b77479a969509606f6a4f14bb6dbff32275d82f4a9640e0c16bb6594779e849 -DIST camlp5-7.01.tar.gz 757118 BLAKE2B 5d7c6f39f24bfee545552aae5c126305d2c767d06762aa516c21bcc5b327b312b7c38d742717eb507b92ae1e27de9c0fcde4d616754a7ce616b5f56689c8dc5a SHA512 9930957f707d9d2c8903f87f5f3444f71bad3d84c944436c7abc6de19209595c974098cd60a6a391f8ae87c4fb53b5122cba8e42e34fcf46d798dbdc28840008 -DIST camlp5-7.03.tar.gz 758136 BLAKE2B 4e1169adf7e119f1f659fe684a8b06c4730db3bcd7807169552de0e3fc115f8d45bc11961f3aee0a9c2d86e1130ec776a1bb7753d7d4e95f661d65d1f841406c SHA512 0c76d469c5f8c727088f3136107b6690349b50791ef8baefffdaa90141230907f977a7a886a9e8d88d39d8fa315637d882d0205c57d752e16575c888a8a1f54d +DIST camlp5-7.11.tar.gz 878224 BLAKE2B f384764da43653a2f75664681a4f202ec84497720470a0a33f99fc61a1ce7b4a9d494ffe6b523c74906c122ee04ae25a08bf1fcd356145e85a11e3e3095bbf7d SHA512 109a43f0a3aaa7a3ba9bd51b1fc1273b054d32787e189b138d69b39c42642b480c13abb9e91f15e6b6e889eaf4dc422ad3ff51e4dee298fb9d8cd9a2db99c159 +DIST camlp5-7.12.tar.gz 1008350 BLAKE2B 8f390f6d617a6ef029462aa74ca4d80c0e2eb267bb6957aac43fdecc425aae34dfc7f3e572c8a1f4ee6b032dd90b3b8262094f80a19ea0bb19b80a88d22d3f28 SHA512 233d973b0a968a7812b977e8a37da8e8daa0f3ef81ca7c473d83c1602380dae6c14f94daffb6bb799f8d90fab121238a46e89a233202cd6f622b0da2f728c0c0 +DIST camlp5-7.13.tar.gz 1031832 BLAKE2B 2afd7e269092d9c40f263e9ce92b3b9f66b0b3f0ae01da43e2094c6a919aa9f26790030f835b630547d51e7bb4a08e74ac8522e7f308864896fa0414370f8f2f SHA512 8ab94b951e6791be895c70e32b930e498229c9ba7bccc505a3e7c2a91ca12fe038b979b9d5822b43e9c74ee2bf552efa1af7a61f1d287100803efb540d5db8b2 +DIST camlp5-7.14.tar.gz 1044110 BLAKE2B c9aa5be80df8d2c376fc41c157b2cd86658dbb90e1babd346b7681afd7453649c7f3682f95f238e51b74b3b3a7a2c5b5a854be892b30a7d1e3b62c3272f5442e SHA512 1b39949c532ca622b01a8e800aa1dcad34f1c944ffe580003642bd742dedc158f3ee54602f3b05f89c0e259525d7feed101b971ebd589449b6d56046389a5bf6 +DIST camlp5-8.00.01.tar.gz 1321790 BLAKE2B df4403af56cd07f8e07745bdb73f698ddba24803cde22f11cfbeda425d4360f51be45a92b3f522c52a204f867bb3403dacebf20bfe463f6fd751901102ef2213 SHA512 f40e57845ac4a14cf260ddd9df616d12df09f67efaf6735e915598aee981721e8203bf9203fb83d08e34e43021c08003de64dbf3bdcd4d12fd079542fb7649aa +DIST camlp5-8.00.02.tar.gz 1340114 BLAKE2B a251973253a729fd568f9a8410d43e963ca4879b7298186358293869bec0eabe79e97f819cd4af3c771490fbd4a7bd8cb1d47482f4fe699720b3577bad8536f4 SHA512 b9950cac70e77d62f147dc8edac0aef2a2bb563ca7bbc709dcf030e2536a0973188414c8612f8b2441a6e05c4d09579bc474974513bf0c59ad4702a46a0cc7f6 +DIST camlp5-8.00.03.tar.gz 1217877 BLAKE2B 971bd45c2740586b9883bd92f42479ae432cc8ca08010cf37edc90174dd71e79f6495e9f3d11b2f2900bf79e44f495152d8a1015cf5c7dba29a19e8a75c15196 SHA512 a6259d2d491ed1f967dd383f03d3da65a3f383d28340111f57883c6d56cee2d267c0f752ba98bcdb72c24cf724a606718de26b6c55b84ad9b5f8f6d620f3cba1 +DIST camlp5-8.00.04.tar.gz 1232659 BLAKE2B 47dd18e9c518b0dccda62d054d7950dffa025a129c81eb673e6caf11f37c2af1644de861288af2ecb8e95ee4d21bf0a1d69da4fe9ed5b3d1cf3bf1012ea06d4c SHA512 0951a9528c8c9b4becf54b352a6f897cb1af26de437a137757d597a3a2ad8aef1160a3c326c9503f783bccd154d8c14a354d3a35baae2bb551611697ce4f5327 +DIST camlp5-8.00.05.tar.gz 1237587 BLAKE2B 1028b1e77a048a6b2e8df4ab58171d4e182a21aa1ca01113fc0cb8b7e6f61b5db58e8c3a2f149d05c056fbd48c0c0d97e597121e4b2b55d62f1f62d80e92312b SHA512 f4cee1fba85dc3a7479929facd79d0b88f23de575107886a8d4c41cd4a0bee21ccc72f2791712635e401ca10c3ec24cfea32558eca09ba6616e01e8433c57bbe +DIST camlp5-8.00.tar.gz 1321320 BLAKE2B 14957ea83e40f3e2f68c7cbbec1ab84325eba1057f38905a37f9516a99a009024ee0b463cf588880d23d94e710b027b835dd51153a429c8bda22be7fe95dc911 SHA512 6a0d19ced4d94cd3afebfbc373d344229c5faf088e8910dea32ed4dfa841dd9844c72849f8a6281e2bce55295665eae90391cf29d062a44b083761a9e04bce93 +DIST camlp5-8.02.00.tar.gz 1260249 BLAKE2B d205cf29207c925bc52098c9e1e74c76b851c71514bc7ae6f6c1ff3c7bf971f7cf6974625c484d2ddf252d0befc557e3b2dd7134e8f5bed270d59d40f15be9a8 SHA512 6e3caccc780f8de1d5804ae8f5700d29255f968f7f8ee3f9ef6f3456883d63aeb0abe797233823fd368b40b74feb1f537c3a61ce35d0c9c2737ab06743a09ddd diff --git a/dev-ml/camlp5/camlp5-6.17.ebuild b/dev-ml/camlp5/camlp5-6.17.ebuild deleted file mode 100644 index 1e3bd458fdcd..000000000000 --- a/dev-ml/camlp5/camlp5-6.17.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit multilib findlib eutils versionator - -MY_P=${P%_p*} -DESCRIPTION="A preprocessor-pretty-printer of ocaml" -HOMEPAGE="https://camlp5.github.io/" -SRC_URI="https://github.com/camlp5/camlp5/archive/rel$(replace_all_version_separators '').tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-rel$(replace_all_version_separators '')" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="alpha amd64 ppc x86 ~x86-fbsd" -IUSE="doc +ocamlopt" - -DEPEND=">=dev-lang/ocaml-3.10:=[ocamlopt?]" -RDEPEND="${DEPEND}" - -PATCHLEVEL=${PV#*_p} -PATCHLIST="" - -if [ "${PATCHLEVEL}" != "${PV}" ] ; then - for (( i=1; i<=PATCHLEVEL; i++ )) ; do - SRC_URI="${SRC_URI} - http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-${PV%_p*}-${i} -> ${MY_P}-patch-${i}.patch" - PATCHLIST="${PATCHLIST} ${MY_P}-patch-${i}.patch" - done -fi - -src_prepare() { - for i in ${PATCHLIST} ; do - epatch "${DISTDIR}/${i}" - done - # ocaml 4.04.2 support - cp -a ocaml_stuff/4.04.1 ocaml_stuff/4.04.2 || die - cp ocaml_src/lib/versdep/4.04.{1,2}.ml || die - sed -i -e 's/4.04.1/4.04.2/' ocaml_stuff/4.04.2/utils/pconfig.ml || die -} - -src_configure() { - ./configure \ - --strict \ - -prefix /usr \ - -bindir /usr/bin \ - -libdir /usr/$(get_libdir)/ocaml \ - -mandir /usr/share/man || die "configure failed" -} - -src_compile(){ - emake out - if use ocamlopt; then - emake opt - emake opt.opt - fi -} - -src_install() { - emake DESTDIR="${D}" install - # findlib support - insinto "$(ocamlfind printconf destdir)/${PN}" - doins etc/META - - use doc && dohtml -r doc/* - - dodoc CHANGES DEVEL ICHANGES README UPGRADING MODE -} diff --git a/dev-ml/camlp5/camlp5-7.00.ebuild b/dev-ml/camlp5/camlp5-7.00.ebuild deleted file mode 100644 index c0f52ab10e7f..000000000000 --- a/dev-ml/camlp5/camlp5-7.00.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit multilib findlib eutils versionator - -MY_P=${P%_p*} -DESCRIPTION="A preprocessor-pretty-printer of ocaml" -HOMEPAGE="https://camlp5.github.io/" -SRC_URI="https://github.com/camlp5/camlp5/archive/rel$(replace_all_version_separators '').tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-rel$(replace_all_version_separators '')" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~x86-fbsd" -IUSE="doc +ocamlopt" - -DEPEND=">=dev-lang/ocaml-3.10:=[ocamlopt?]" -RDEPEND="${DEPEND}" - -PATCHLEVEL=${PV#*_p} -PATCHLIST="" - -if [ "${PATCHLEVEL}" != "${PV}" ] ; then - for (( i=1; i<=PATCHLEVEL; i++ )) ; do - SRC_URI="${SRC_URI} - http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-${PV%_p*}-${i} -> ${MY_P}-patch-${i}.patch" - PATCHLIST="${PATCHLIST} ${MY_P}-patch-${i}.patch" - done -fi - -src_prepare() { - for i in ${PATCHLIST} ; do - epatch "${DISTDIR}/${i}" - done -} - -src_configure() { - ./configure \ - --strict \ - -prefix /usr \ - -bindir /usr/bin \ - -libdir /usr/$(get_libdir)/ocaml \ - -mandir /usr/share/man || die "configure failed" -} - -src_compile(){ - emake out - if use ocamlopt; then - emake opt - emake opt.opt - fi -} - -src_install() { - emake DESTDIR="${D}" install - # findlib support - insinto "$(ocamlfind printconf destdir)/${PN}" - doins etc/META - - use doc && dohtml -r doc/* - - dodoc CHANGES DEVEL ICHANGES README UPGRADING MODE -} diff --git a/dev-ml/camlp5/camlp5-7.01.ebuild b/dev-ml/camlp5/camlp5-7.01.ebuild deleted file mode 100644 index c0f52ab10e7f..000000000000 --- a/dev-ml/camlp5/camlp5-7.01.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit multilib findlib eutils versionator - -MY_P=${P%_p*} -DESCRIPTION="A preprocessor-pretty-printer of ocaml" -HOMEPAGE="https://camlp5.github.io/" -SRC_URI="https://github.com/camlp5/camlp5/archive/rel$(replace_all_version_separators '').tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-rel$(replace_all_version_separators '')" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~x86-fbsd" -IUSE="doc +ocamlopt" - -DEPEND=">=dev-lang/ocaml-3.10:=[ocamlopt?]" -RDEPEND="${DEPEND}" - -PATCHLEVEL=${PV#*_p} -PATCHLIST="" - -if [ "${PATCHLEVEL}" != "${PV}" ] ; then - for (( i=1; i<=PATCHLEVEL; i++ )) ; do - SRC_URI="${SRC_URI} - http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-${PV%_p*}-${i} -> ${MY_P}-patch-${i}.patch" - PATCHLIST="${PATCHLIST} ${MY_P}-patch-${i}.patch" - done -fi - -src_prepare() { - for i in ${PATCHLIST} ; do - epatch "${DISTDIR}/${i}" - done -} - -src_configure() { - ./configure \ - --strict \ - -prefix /usr \ - -bindir /usr/bin \ - -libdir /usr/$(get_libdir)/ocaml \ - -mandir /usr/share/man || die "configure failed" -} - -src_compile(){ - emake out - if use ocamlopt; then - emake opt - emake opt.opt - fi -} - -src_install() { - emake DESTDIR="${D}" install - # findlib support - insinto "$(ocamlfind printconf destdir)/${PN}" - doins etc/META - - use doc && dohtml -r doc/* - - dodoc CHANGES DEVEL ICHANGES README UPGRADING MODE -} diff --git a/dev-ml/camlp5/camlp5-7.03.ebuild b/dev-ml/camlp5/camlp5-7.03.ebuild deleted file mode 100644 index c0f52ab10e7f..000000000000 --- a/dev-ml/camlp5/camlp5-7.03.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit multilib findlib eutils versionator - -MY_P=${P%_p*} -DESCRIPTION="A preprocessor-pretty-printer of ocaml" -HOMEPAGE="https://camlp5.github.io/" -SRC_URI="https://github.com/camlp5/camlp5/archive/rel$(replace_all_version_separators '').tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-rel$(replace_all_version_separators '')" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~x86-fbsd" -IUSE="doc +ocamlopt" - -DEPEND=">=dev-lang/ocaml-3.10:=[ocamlopt?]" -RDEPEND="${DEPEND}" - -PATCHLEVEL=${PV#*_p} -PATCHLIST="" - -if [ "${PATCHLEVEL}" != "${PV}" ] ; then - for (( i=1; i<=PATCHLEVEL; i++ )) ; do - SRC_URI="${SRC_URI} - http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-${PV%_p*}-${i} -> ${MY_P}-patch-${i}.patch" - PATCHLIST="${PATCHLIST} ${MY_P}-patch-${i}.patch" - done -fi - -src_prepare() { - for i in ${PATCHLIST} ; do - epatch "${DISTDIR}/${i}" - done -} - -src_configure() { - ./configure \ - --strict \ - -prefix /usr \ - -bindir /usr/bin \ - -libdir /usr/$(get_libdir)/ocaml \ - -mandir /usr/share/man || die "configure failed" -} - -src_compile(){ - emake out - if use ocamlopt; then - emake opt - emake opt.opt - fi -} - -src_install() { - emake DESTDIR="${D}" install - # findlib support - insinto "$(ocamlfind printconf destdir)/${PN}" - doins etc/META - - use doc && dohtml -r doc/* - - dodoc CHANGES DEVEL ICHANGES README UPGRADING MODE -} diff --git a/dev-ml/camlp5/camlp5-7.11-r1.ebuild b/dev-ml/camlp5/camlp5-7.11-r1.ebuild new file mode 100644 index 000000000000..01c63a85041b --- /dev/null +++ b/dev-ml/camlp5/camlp5-7.11-r1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit findlib + +DESCRIPTION="A preprocessor-pretty-printer of ocaml" +HOMEPAGE="https://camlp5.github.io/" +SRC_URI="https://github.com/camlp5/camlp5/archive/rel$(ver_rs 1- '').tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-rel$(ver_rs 1- '')" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="amd64 ~ppc x86" +IUSE="doc +ocamlopt" + +DEPEND="<dev-lang/ocaml-4.11.0:=[ocamlopt?]" +RDEPEND="${DEPEND}" + +QA_FLAGS_IGNORED=( + /usr/bin/camlp5o.opt + /usr/bin/camlp5r.opt +) + +DOCS="CHANGES DEVEL ICHANGES README.md UPGRADING MODE" + +src_configure() { + ./configure \ + --strict \ + -prefix /usr \ + -bindir /usr/bin \ + -libdir /usr/$(get_libdir)/ocaml \ + -mandir /usr/share/man || die "configure failed" +} + +src_compile() { + ulimit -s 11530000 + emake out + if use ocamlopt; then + emake opt + emake opt.opt + fi +} + +src_install() { + use doc && HTML_DOCS="doc/*" + + default + + # findlib support + insinto "$(ocamlfind printconf destdir)/${PN}" + doins etc/META +} diff --git a/dev-ml/camlp5/camlp5-7.12.ebuild b/dev-ml/camlp5/camlp5-7.12.ebuild new file mode 100644 index 000000000000..8efd1340c1e7 --- /dev/null +++ b/dev-ml/camlp5/camlp5-7.12.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit findlib vcs-clean + +DESCRIPTION="A preprocessor-pretty-printer of ocaml" +HOMEPAGE="https://camlp5.github.io/" +SRC_URI="https://github.com/camlp5/camlp5/archive/rel$(ver_rs 1- '').tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-rel$(ver_rs 1- '')" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="doc +ocamlopt" + +DEPEND=" + <dev-lang/ocaml-4.11.2:=[ocamlopt?] +" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${PN}-7.12-destdir.patch" ) + +camlp5_hack_ocaml_support() { + ln -s "${1}" "ocaml_stuff/${2}" || die + ln -s "${1}.ml" "ocaml_src/lib/versdep/${2}.ml" || die +} + +src_prepare() { + egit_clean + default + camlp5_hack_ocaml_support 4.11.0 4.11.1 +} + +src_configure() { + ./configure \ + --strict \ + -prefix /usr \ + -bindir /usr/bin \ + -libdir /usr/$(get_libdir)/ocaml \ + -mandir /usr/share/man || die "configure failed" +} + +src_compile() { + emake out + if use ocamlopt; then + emake opt + emake opt.opt + fi +} + +src_install() { + emake DESTDIR="${D}" install + # findlib support + insinto "$(ocamlfind printconf destdir)/${PN}" + doins etc/META + + dodoc -r doc/* + dodoc CHANGES DEVEL ICHANGES README.md UPGRADING MODE +} diff --git a/dev-ml/camlp5/camlp5-7.13.ebuild b/dev-ml/camlp5/camlp5-7.13.ebuild new file mode 100644 index 000000000000..959865ec86f5 --- /dev/null +++ b/dev-ml/camlp5/camlp5-7.13.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit findlib vcs-clean + +DESCRIPTION="A preprocessor-pretty-printer of ocaml" +HOMEPAGE="https://camlp5.github.io/" +SRC_URI="https://github.com/camlp5/camlp5/archive/rel$(ver_rs 1- '').tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-rel$(ver_rs 1- '')" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="doc +ocamlopt" + +DEPEND=" + <dev-lang/ocaml-4.10.2:=[ocamlopt?] +" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${PN}-7.12-destdir.patch" ) + +src_prepare() { + egit_clean + default +} + +src_configure() { + ./configure \ + --strict \ + -prefix /usr \ + -bindir /usr/bin \ + -libdir /usr/$(get_libdir)/ocaml \ + -mandir /usr/share/man || die "configure failed" +} + +src_compile() { + emake out + if use ocamlopt; then + emake opt + emake opt.opt + fi +} + +src_install() { + emake DESTDIR="${ED}" install + # findlib support + insinto "$(ocamlfind printconf destdir)/${PN}" + doins etc/META + + dodoc -r doc/* + dodoc CHANGES DEVEL ICHANGES README.md UPGRADING MODE +} diff --git a/dev-ml/camlp5/camlp5-7.14.ebuild b/dev-ml/camlp5/camlp5-7.14.ebuild new file mode 100644 index 000000000000..c550b617f8f4 --- /dev/null +++ b/dev-ml/camlp5/camlp5-7.14.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit findlib vcs-clean + +DESCRIPTION="A preprocessor-pretty-printer of ocaml" +HOMEPAGE="https://camlp5.github.io/" +SRC_URI="https://github.com/camlp5/camlp5/archive/rel$(ver_rs 1- '').tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-rel$(ver_rs 1- '')" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86" +IUSE="doc +ocamlopt" + +DEPEND=" + <dev-lang/ocaml-4.13:=[ocamlopt?] +" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${PN}-7.12-destdir.patch" ) + +src_prepare() { + egit_clean + default +} + +src_configure() { + ./configure \ + --strict \ + -prefix /usr \ + -bindir /usr/bin \ + -libdir /usr/$(get_libdir)/ocaml \ + -mandir /usr/share/man || die "configure failed" +} + +src_compile() { + ulimit -s 11530000 + emake out + if use ocamlopt; then + emake opt + emake opt.opt + fi +} + +src_test() { + emake bootstrap +} + +src_install() { + emake DESTDIR="${ED}" install + # findlib support + insinto "$(ocamlfind printconf destdir)/${PN}" + doins etc/META + + dodoc -r doc/* + dodoc CHANGES DEVEL ICHANGES README.md UPGRADING MODE +} diff --git a/dev-ml/camlp5/camlp5-8.00.01.ebuild b/dev-ml/camlp5/camlp5-8.00.01.ebuild new file mode 100644 index 000000000000..1c40d3c4d766 --- /dev/null +++ b/dev-ml/camlp5/camlp5-8.00.01.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit findlib vcs-clean + +DESCRIPTION="A preprocessor-pretty-printer of ocaml" +HOMEPAGE="https://camlp5.github.io/" +SRC_URI="https://github.com/camlp5/camlp5/archive/rel${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-rel${PV}" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86" +IUSE="doc +ocamlopt" + +DEPEND=" + <dev-lang/ocaml-4.13:=[ocamlopt?] +" +RDEPEND="${DEPEND}" + +src_prepare() { + egit_clean + default +} + +src_configure() { + ./configure \ + --strict \ + -prefix /usr \ + -bindir /usr/bin \ + -libdir /usr/$(get_libdir)/ocaml \ + -mandir /usr/share/man || die "configure failed" +} + +src_compile() { + ulimit -s 11530000 + emake out + if use ocamlopt; then + emake opt + emake opt.opt + fi +} + +src_test() { + emake bootstrap +} + +src_install() { + emake DESTDIR="${ED}" install + # findlib support + insinto "$(ocamlfind printconf destdir)/${PN}" + doins etc/META + + dodoc -r doc/* + dodoc CHANGES DEVEL ICHANGES README.md UPGRADING MODE +} diff --git a/dev-ml/camlp5/camlp5-8.00.02.ebuild b/dev-ml/camlp5/camlp5-8.00.02.ebuild new file mode 100644 index 000000000000..3879135fbbfc --- /dev/null +++ b/dev-ml/camlp5/camlp5-8.00.02.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit findlib vcs-clean + +DESCRIPTION="A preprocessor-pretty-printer of ocaml" +HOMEPAGE="https://camlp5.github.io/" +SRC_URI="https://github.com/camlp5/camlp5/archive/rel${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-rel${PV}" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="doc +ocamlopt" + +DEPEND=" + <dev-lang/ocaml-4.14:=[ocamlopt?] +" +RDEPEND="${DEPEND}" + +src_prepare() { + egit_clean + default +} + +src_configure() { + ./configure \ + --strict \ + -prefix /usr \ + -bindir /usr/bin \ + -libdir /usr/$(get_libdir)/ocaml \ + -mandir /usr/share/man || die "configure failed" +} + +src_compile() { + ulimit -s 11530000 + emake out + if use ocamlopt; then + emake opt + emake opt.opt + fi +} + +src_test() { + emake bootstrap +} + +src_install() { + emake DESTDIR="${ED}" install + # findlib support + insinto "$(ocamlfind printconf destdir)/${PN}" + doins etc/META + + dodoc -r doc/* + dodoc CHANGES DEVEL ICHANGES README.md UPGRADING MODE +} diff --git a/dev-ml/camlp5/camlp5-8.00.03.ebuild b/dev-ml/camlp5/camlp5-8.00.03.ebuild new file mode 100644 index 000000000000..51e1576dbe88 --- /dev/null +++ b/dev-ml/camlp5/camlp5-8.00.03.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit findlib vcs-clean + +DESCRIPTION="A preprocessor-pretty-printer of ocaml" +HOMEPAGE="https://camlp5.github.io/" +SRC_URI="https://github.com/camlp5/camlp5/archive/rel${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-rel${PV}" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="doc +ocamlopt" + +RDEPEND="dev-ml/camlp-streams:=" + +src_prepare() { + egit_clean + default +} + +src_configure() { + ./configure \ + --strict \ + -prefix /usr \ + -bindir /usr/bin \ + -libdir /usr/$(get_libdir)/ocaml \ + -mandir /usr/share/man || die "configure failed" +} + +src_compile() { + ulimit -s 11530000 + emake out + if use ocamlopt; then + emake opt + emake opt.opt + fi +} + +src_test() { + emake bootstrap +} + +src_install() { + emake DESTDIR="${ED}" install + # findlib support + insinto "$(ocamlfind printconf destdir)/${PN}" + doins etc/META + + dodoc -r doc/* + dodoc CHANGES DEVEL ICHANGES README.md UPGRADING MODE +} diff --git a/dev-ml/camlp5/camlp5-8.00.04.ebuild b/dev-ml/camlp5/camlp5-8.00.04.ebuild new file mode 100644 index 000000000000..72fc5526dee9 --- /dev/null +++ b/dev-ml/camlp5/camlp5-8.00.04.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit findlib vcs-clean + +DESCRIPTION="A preprocessor-pretty-printer of ocaml" +HOMEPAGE="https://camlp5.github.io/" +SRC_URI="https://github.com/camlp5/camlp5/archive/rel${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-rel${PV}" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="doc +ocamlopt" + +RDEPEND="dev-ml/camlp-streams:=" + +src_prepare() { + egit_clean + default +} + +src_configure() { + ./configure \ + --strict \ + -prefix /usr \ + -bindir /usr/bin \ + -libdir /usr/$(get_libdir)/ocaml \ + -mandir /usr/share/man || die "configure failed" +} + +src_compile() { + ulimit -s 11530000 + emake out + if use ocamlopt; then + emake opt + emake opt.opt + fi +} + +src_test() { + emake bootstrap +} + +src_install() { + emake DESTDIR="${ED}" install + # findlib support + insinto "$(ocamlfind printconf destdir)/${PN}" + doins etc/META + + dodoc -r doc/* + dodoc CHANGES DEVEL ICHANGES README.md UPGRADING MODE +} diff --git a/dev-ml/camlp5/camlp5-8.00.05-r1.ebuild b/dev-ml/camlp5/camlp5-8.00.05-r1.ebuild new file mode 100644 index 000000000000..b5684025da2f --- /dev/null +++ b/dev-ml/camlp5/camlp5-8.00.05-r1.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit findlib vcs-clean + +DESCRIPTION="A preprocessor-pretty-printer of ocaml" +HOMEPAGE="https://camlp5.github.io/" +SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="doc +ocamlopt" + +RDEPEND=" + dev-ml/camlp-streams:= + dev-ml/rresult:= + dev-ml/bos:= + dev-ml/pcre-ocaml:= +" + +src_prepare() { + egit_clean + default +} + +src_configure() { + ./configure \ + --strict \ + -prefix /usr \ + -bindir /usr/bin \ + -libdir /usr/$(get_libdir)/ocaml \ + -mandir /usr/share/man || die "configure failed" +} + +src_compile() { + ulimit -s 11530000 + emake out + if use ocamlopt; then + emake opt + emake opt.opt + fi +} + +src_test() { + emake bootstrap +} + +src_install() { + emake DESTDIR="${ED}" install + # findlib support + insinto "$(ocamlfind printconf destdir)/${PN}" + doins etc/META + + dodoc -r doc/* + dodoc CHANGES DEVEL ICHANGES README.md UPGRADING MODE +} diff --git a/dev-ml/camlp5/camlp5-8.00.ebuild b/dev-ml/camlp5/camlp5-8.00.ebuild new file mode 100644 index 000000000000..a45ffdbce718 --- /dev/null +++ b/dev-ml/camlp5/camlp5-8.00.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit findlib vcs-clean + +DESCRIPTION="A preprocessor-pretty-printer of ocaml" +HOMEPAGE="https://camlp5.github.io/" +SRC_URI="https://github.com/camlp5/camlp5/archive/rel${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-rel${PV}" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="doc +ocamlopt" + +DEPEND=" + <dev-lang/ocaml-4.13:=[ocamlopt?] +" +RDEPEND="${DEPEND}" + +src_prepare() { + egit_clean + default +} + +src_configure() { + ./configure \ + --strict \ + -prefix /usr \ + -bindir /usr/bin \ + -libdir /usr/$(get_libdir)/ocaml \ + -mandir /usr/share/man || die "configure failed" +} + +src_compile() { + ulimit -s 11530000 + emake out + if use ocamlopt; then + emake opt + emake opt.opt + fi +} + +src_test() { + emake bootstrap +} + +src_install() { + emake DESTDIR="${ED}" install + # findlib support + insinto "$(ocamlfind printconf destdir)/${PN}" + doins etc/META + + dodoc -r doc/* + dodoc CHANGES DEVEL ICHANGES README.md UPGRADING MODE +} diff --git a/dev-ml/camlp5/camlp5-8.02.00.ebuild b/dev-ml/camlp5/camlp5-8.02.00.ebuild new file mode 100644 index 000000000000..3338ff08f328 --- /dev/null +++ b/dev-ml/camlp5/camlp5-8.02.00.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit findlib vcs-clean + +DESCRIPTION="A preprocessor-pretty-printer of ocaml" +HOMEPAGE="https://camlp5.github.io/" +SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="doc +ocamlopt" + +RDEPEND=" + dev-ml/camlp-streams:= + dev-ml/rresult:= + dev-ml/bos:= + dev-ml/pcre-ocaml:= +" + +src_prepare() { + egit_clean + default +} + +src_configure() { + ./configure \ + --strict \ + -prefix /usr \ + -bindir /usr/bin \ + -libdir /usr/$(get_libdir)/ocaml \ + -mandir /usr/share/man || die "configure failed" +} + +src_compile() { + ulimit -s 11530000 + emake out + if use ocamlopt; then + emake opt + emake opt.opt + fi +} + +src_test() { + emake bootstrap +} + +src_install() { + emake DESTDIR="${ED}" install + # findlib support + insinto "$(ocamlfind printconf destdir)/${PN}" + doins etc/META + + dodoc -r doc/* + dodoc CHANGES DEVEL ICHANGES README.md UPGRADING MODE +} diff --git a/dev-ml/camlp5/files/camlp5-7.12-destdir.patch b/dev-ml/camlp5/files/camlp5-7.12-destdir.patch new file mode 100644 index 000000000000..d43a29c97d3f --- /dev/null +++ b/dev-ml/camlp5/files/camlp5-7.12-destdir.patch @@ -0,0 +1,13 @@ +Index: camlp5-rel712/Makefile +=================================================================== +--- camlp5-rel712.orig/Makefile ++++ camlp5-rel712/Makefile +@@ -57,7 +57,7 @@ install: + for i in $(DIRS) compile; do \ + (cd $$i; $(MAKE) install DESTDIR=$(DESTDIR); cd ..); \ + done +- cp etc/topfind.camlp5 `ocamlc -where`/. || true ++ cp etc/topfind.camlp5 "$(DESTDIR)`ocamlc -where`/." || true + + uninstall: + @if test -z "$(LIBDIR)"; then \ diff --git a/dev-ml/camlp5/metadata.xml b/dev-ml/camlp5/metadata.xml index dc16ce3e1f12..2ab2337eab76 100644 --- a/dev-ml/camlp5/metadata.xml +++ b/dev-ml/camlp5/metadata.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">camlp5/camlp5</remote-id> diff --git a/dev-ml/camlpdf/Manifest b/dev-ml/camlpdf/Manifest index 2980c627bd18..fce797256b8e 100644 --- a/dev-ml/camlpdf/Manifest +++ b/dev-ml/camlpdf/Manifest @@ -1,2 +1 @@ -DIST camlpdf-2.1.1.tar.gz 563633 BLAKE2B 3ff7ec46bbac70eabe6695911e834a5f2122136fecba661ff708c86dfb8d928694d67054504028670c3138c600f7f770b540d87c4e1a0ed1e04c71e083afdc23 SHA512 db6f9f61c43113e1f4d8741d88766bacc489a45b8e7164e4619f8bb88c527bc7cbeebdaaa673a77ab16c60dc3c90d21a69844e9fed92c222fc8fe0424f328cf2 -DIST camlpdf-2.2.1.tar.gz 570782 BLAKE2B 218dc3f0de67eebd983a849769372daa5630b1c5b4f488f4eeb1c73defc8da76ce65c73e43dc6fed5474f78aa01331a93e83ae6289aa099d71e30cd6c13f0777 SHA512 7539294434479b529edb7b46017f324b98bc0b83d25c1254a52ab1b67f8e3e04c2b8709ba22c6a0ac5e4444c65ef37e4645a495ea3ee011d3e95cd3021d559c2 +DIST camlpdf-2.3.1.tar.gz 601531 BLAKE2B 9534baf9165e7dc48ae37a3fcaabb236e437845ef4e0a60a1c08874a2b240c9b1e96de5bbd6028a3ca87992221773dea34c31b0fa24e9c143632756954baf132 SHA512 0b8d91b6090221f996aee52f22f153a4b74cb85a127bbd5f84492ede8a0a581971a2349281b3879d6c37f4d5d267da583e7e8871372d97a3d636abc3231cb007 diff --git a/dev-ml/camlpdf/camlpdf-2.1.1.ebuild b/dev-ml/camlpdf/camlpdf-2.1.1.ebuild deleted file mode 100644 index e2be0d457ace..000000000000 --- a/dev-ml/camlpdf/camlpdf-2.1.1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib eutils - -DESCRIPTION="OCaml library for reading, writing, and modifying PDF files" -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" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="doc examples" - -RDEPEND="dev-lang/ocaml:=" -DEPEND="${RDEPEND}" - -src_prepare() { - has_version '>=dev-lang/ocaml-4.03.0_beta1' && epatch "${FILESDIR}/ocaml43.patch" -} - -src_compile() { - # parallel make bugs - emake -j1 -} - -src_install() { - findlib_src_install - dodoc Changes README.md - - if use doc ; then - dodoc introduction_to_camlpdf.pdf - dohtml doc/camlpdf/html/* - fi - - use examples && dodoc -r examples -} diff --git a/dev-ml/camlpdf/camlpdf-2.2.1.ebuild b/dev-ml/camlpdf/camlpdf-2.3.1.ebuild index f6709f295c68..965e0ef70c14 100644 --- a/dev-ml/camlpdf/camlpdf-2.2.1.ebuild +++ b/dev-ml/camlpdf/camlpdf-2.3.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 diff --git a/dev-ml/camlpdf/files/ocaml43.patch b/dev-ml/camlpdf/files/ocaml43.patch deleted file mode 100644 index 86ffbe23eb14..000000000000 --- a/dev-ml/camlpdf/files/ocaml43.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: camlpdf-2.1.1/flatestubs.c -=================================================================== ---- camlpdf-2.1.1.orig/flatestubs.c -+++ camlpdf-2.1.1/flatestubs.c -@@ -170,7 +170,7 @@ value camlzip_inflateEnd(value vzs) - - value camlzip_update_crc32(value crc, value buf, value pos, value len) - { -- return copy_int32(crc32((uint32) Int32_val(crc), -+ return copy_int32(crc32((uint32_t) Int32_val(crc), - &Byte_u(buf, Long_val(pos)), - Long_val(len))); - } diff --git a/dev-ml/camlpdf/metadata.xml b/dev-ml/camlpdf/metadata.xml index 1e93b8f9e9d6..fce9dcd784fb 100644 --- a/dev-ml/camlpdf/metadata.xml +++ b/dev-ml/camlpdf/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>radhermit@gentoo.org</email> - <name>Tim Harder</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">johnwhitington/camlpdf</remote-id> </upstream> diff --git a/dev-ml/camlzip/Manifest b/dev-ml/camlzip/Manifest index 7f733dd0ac0f..d6e4ea7f08f8 100644 --- a/dev-ml/camlzip/Manifest +++ b/dev-ml/camlzip/Manifest @@ -1,2 +1,2 @@ -DIST camlzip-1.06.tar.gz 26499 BLAKE2B a7a1dbe157c0dcb9847bcd6324bbb7cbaf39342d0fdbaed51d2c004ae7b03f8d655fb15da50dae6190b976675e405e28fa2d4fa35a2f4372c50519564d58f981 SHA512 5ef0172927106589620678897f12f054533503a5cf13df71bf4deda43f223d0cd6acce118977e87bce53afe289f367b851f192a8e693274c2bd13549121019dd -DIST camlzip-1.07.tar.gz 26652 BLAKE2B f373ac0427faa9b6a846e9db8f3e48c00ec6885b8a11cc09fae96b5a7656908f172fda73dbea8ddd1b3dbfd98bcfa3e2e67ce9faf2942d1e260fc0a804813a05 SHA512 b92e9db002b9b398fd132c6ecd8098fac4cc7ddb3f770cc412990dcdf4bd62ba358c762d31fb0b5cd6b32f20d3bf4b3410ca6e86c511a438b92ece940f9831bd +DIST camlzip-1.10.tar.gz 27335 BLAKE2B bbf24953634278589395dd9fcedf1e3becce8dad1f380393dc3ac59589143e1685dc14085ef566e12fb751c6f1a333dd368795a5083b94a43b71e058e86489f3 SHA512 5c42e0d808230e3820b2e7ef34b544ca51a7bf0a484ce4e1c8b1e4966133196bb3ff7c3ca85b9c50050aca389316eb52f0335f6e2ad60c000594a33171b9a9a9 +DIST camlzip-1.11.tar.gz 28483 BLAKE2B b270e2a764547117d87a18f9ccca82891bc0dce182ea84f76b693acb34488ff25d8975154b843787554798bfd34c16dc6a25c431f8674c8c59eb2c195167c12b SHA512 4d69ef900437e66e00cd345497ec70f407f28cd8344ee5f2fad685d3bfe356924597d1854b752f2841b4007f96d6e0307cfae7e13cfb6f74951ae3eba5198a06 diff --git a/dev-ml/camlzip/camlzip-1.06.ebuild b/dev-ml/camlzip/camlzip-1.06.ebuild deleted file mode 100644 index 360a11fbf5b7..000000000000 --- a/dev-ml/camlzip/camlzip-1.06.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit findlib eutils - -IUSE="+ocamlopt" - -DESCRIPTION="Compressed file access ML library (ZIP, GZIP and JAR)" -HOMEPAGE="http://forge.ocamlcore.org/projects/camlzip/" -SRC_URI="http://forge.ocamlcore.org/frs/download.php/1616/${P}.tar.gz" - -SLOT="1/${PV}" -LICENSE="LGPL-2.1" -KEYWORDS="amd64 ppc x86 ~x86-fbsd" - -RDEPEND=">=dev-lang/ocaml-4.02:=[ocamlopt?] - >=sys-libs/zlib-1.1.3" -DEPEND="${RDEPEND}" - -src_compile() { - emake all - if use ocamlopt; then - emake allopt - fi -} - -src_install() { - findlib_src_preinst - emake DESTDIR="${D}" install-findlib - - dodoc README Changes -} diff --git a/dev-ml/camlzip/camlzip-1.07.ebuild b/dev-ml/camlzip/camlzip-1.10.ebuild index 1300c18945f8..e56f3059d917 100644 --- a/dev-ml/camlzip/camlzip-1.07.ebuild +++ b/dev-ml/camlzip/camlzip-1.10.ebuild @@ -1,25 +1,28 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=7 -inherit findlib eutils versionator - -IUSE="+ocamlopt" +inherit findlib DESCRIPTION="Compressed file access ML library (ZIP, GZIP and JAR)" HOMEPAGE="https://github.com/xavierleroy/camlzip" -SRC_URI="https://github.com/xavierleroy/camlzip/archive/rel$(delete_all_version_separators ${PV}).tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/xavierleroy/camlzip/archive/rel$(ver_rs 1- '').tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-rel$(ver_rs 1- '')" SLOT="1/${PV}" LICENSE="LGPL-2.1" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86 ~x86-fbsd" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt" -RDEPEND=">=dev-lang/ocaml-4.02:=[ocamlopt?] +RDEPEND=">=dev-lang/ocaml-4.05:=[ocamlopt?] >=sys-libs/zlib-1.1.3" DEPEND="${RDEPEND}" -S="${WORKDIR}/${PN}-rel$(delete_all_version_separators ${PV})" +QA_FLAGS_IGNORED=( + "/usr/lib.*/ocaml/stublibs/dllcamlzip.so" + "/usr/lib.*/ocaml/zip/zip.cmxs" +) src_compile() { emake all @@ -30,7 +33,9 @@ src_compile() { src_install() { findlib_src_preinst + emake DESTDIR="${D}" install-findlib + dosym zip/libcamlzip.a /usr/$(get_libdir)/ocaml/libcamlzip.a dodoc README Changes } diff --git a/dev-ml/camlzip/camlzip-1.11.ebuild b/dev-ml/camlzip/camlzip-1.11.ebuild new file mode 100644 index 000000000000..c1a9d1ed1304 --- /dev/null +++ b/dev-ml/camlzip/camlzip-1.11.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit findlib + +DESCRIPTION="Compressed file access ML library (ZIP, GZIP and JAR)" +HOMEPAGE="https://github.com/xavierleroy/camlzip" +SRC_URI="https://github.com/xavierleroy/camlzip/archive/rel$(ver_rs 1- '').tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-rel$(ver_rs 1- '')" + +LICENSE="LGPL-2.1" +SLOT="1/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +RDEPEND=">=dev-lang/ocaml-4.07:=[ocamlopt?] + >=sys-libs/zlib-1.1.3" +DEPEND="${RDEPEND}" + +QA_FLAGS_IGNORED=( + "usr/lib.*/ocaml/stublibs/dllcamlzip.so" + "usr/lib.*/ocaml/zip/zip.cmxs" +) + +src_compile() { + emake allbyt + + if use ocamlopt; then + emake allopt + fi +} + +src_install() { + findlib_src_preinst + + emake DESTDIR="${D}" install-findlib + dosym zip/libcamlzip.a /usr/$(get_libdir)/ocaml/libcamlzip.a + + dodoc README.md Changes +} diff --git a/dev-ml/camlzip/metadata.xml b/dev-ml/camlzip/metadata.xml index a6ac295dcc2a..9e95733ad01b 100644 --- a/dev-ml/camlzip/metadata.xml +++ b/dev-ml/camlzip/metadata.xml @@ -1,9 +1,9 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">xavierleroy/camlzip</remote-id> diff --git a/dev-ml/camomile/Manifest b/dev-ml/camomile/Manifest index 23be6ef1a841..3766becc3b7d 100644 --- a/dev-ml/camomile/Manifest +++ b/dev-ml/camomile/Manifest @@ -1 +1,2 @@ -DIST camomile-0.8.5.tar.bz2 2607084 BLAKE2B 5e0ff51cdd6d7ce41ee024189a793f3d3e4bec1bd9849e7c01d2722ff22ca2cb5f0d5bd5f95820e741469ebda2996edf3611827535df5fe095d3f6617ecfdd42 SHA512 ef4da32f955e69e0b2958b4b2bf12ae94e210d8aa7cee5a9030607b79ac43a884758549f3164c223fb07d987a4a50b15f0bc5083ff67120270409f7fb9928014 +DIST camomile-1.0.2.tar.gz 7032339 BLAKE2B 8cd60c74821c2c8e7084e752d1e4d67428c935859e02a8630f3f5563b53b3ce444071fa26153950f6a410b2743073692c7061e4f1f902c23e5fa54c50a89383c SHA512 d62ecaa297058b52674f98e513a6d776148fe62651b2b4a2dac4bb3e05abb8b7684960e889f68c6dab60aee669fbab715a2d6a9206645e24d10d8aaaf7cedf0e +DIST camomile-2.0.0.tar.gz 7030383 BLAKE2B 795f6a0e482cbc2d5a38bcb1a9ca2f93f1d7ec437bc736dbc50ef39b6c072df925776dba315e04a9dd508fffe06ffcd2eaac10ef56da56727b8e85ca2f931e9a SHA512 b0ae3d921f65390e8ec88a04901dd097b568db9f9ae70fb328e9d3ddb2dd8922b9a8e8da9ace91ad9cb5f6a1310ae5b6ba502e287d6c828f4d60622289316ac8 diff --git a/dev-ml/camomile/camomile-0.8.5-r1.ebuild b/dev-ml/camomile/camomile-0.8.5-r1.ebuild deleted file mode 100644 index 68d9d15dcc3e..000000000000 --- a/dev-ml/camomile/camomile-0.8.5-r1.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib eutils - -DESCRIPTION="Camomile is a comprehensive Unicode library for ocaml" -HOMEPAGE="https://github.com/yoriyuki/Camomile/wiki" -SRC_URI="https://github.com/yoriyuki/Camomile/releases/download/rel-${PV}/${P}.tar.bz2" - -LICENSE="LGPL-2" -SLOT="0/${PV}" -KEYWORDS="amd64 ppc x86" -IUSE="debug +ocamlopt" - -RDEPEND=" - >=dev-lang/ocaml-3.10.2:=[ocamlopt?] - dev-ml/camlp4:= -" -DEPEND="${RDEPEND}" - -src_prepare() { - has_version '>=dev-lang/ocaml-4.05_beta' && epatch "${FILESDIR}/ocaml405.patch" -} - -src_configure() { - econf $(use_enable debug) -} - -src_compile() { - emake -j1 byte unidata unimaps charmap_data locale_data - if use ocamlopt; then - emake -j1 opt - fi -} - -src_install() { - dodir /usr/bin - findlib_src_install DATADIR="${D}/usr/share" BINDIR="${D}/usr/bin" -} diff --git a/dev-ml/camomile/camomile-1.0.2.ebuild b/dev-ml/camomile/camomile-1.0.2.ebuild new file mode 100644 index 000000000000..6f7461d804c4 --- /dev/null +++ b/dev-ml/camomile/camomile-1.0.2.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Camomile is a comprehensive Unicode library for ocaml" +HOMEPAGE="https://github.com/yoriyuki/Camomile/wiki" +SRC_URI="https://github.com/yoriyuki/Camomile/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${P^}" + +LICENSE="LGPL-2" +SLOT="0/${PV}" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" +IUSE="+ocamlopt" + +# Unbound module errors +RESTRICT="test" + +src_compile() { + # Amend standard dune_src_compile with -p camomile + # Needed to workaround: https://github.com/yoriyuki/Camomile/issues/83 + # (https://dune.readthedocs.io/en/stable/faq.html#how-to-make-warnings-non-fatal) + dune build -p camomile @install || die +} diff --git a/dev-ml/camomile/camomile-2.0.0.ebuild b/dev-ml/camomile/camomile-2.0.0.ebuild new file mode 100644 index 000000000000..08ff7859395f --- /dev/null +++ b/dev-ml/camomile/camomile-2.0.0.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Camomile is a comprehensive Unicode library for ocaml" +HOMEPAGE="https://github.com/savonet/Camomile" +SRC_URI="https://github.com/savonet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${P^}" + +LICENSE="LGPL-2" +SLOT="0/${PV}" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" +IUSE="+ocamlopt" + +# Unbound module errors +RESTRICT="test" + +RDEPEND=" + dev-ml/dune-site:= + dev-ml/camlp-streams:= +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/camomile/files/ocaml405.patch b/dev-ml/camomile/files/ocaml405.patch deleted file mode 100644 index 3fec6955a27c..000000000000 --- a/dev-ml/camomile/files/ocaml405.patch +++ /dev/null @@ -1,40 +0,0 @@ -commit 0fa0a19f15998e89e4b04150dd74529bbd406f42 -Author: Gabriel Scherer <gabriel.scherer@gmail.com> -Date: Fri Feb 24 22:30:23 2017 -0500 - - 4.05 compatibility: use explicit module signatures - - In 4.05, checking for non-generalizable inference variable ('_a) - (forbidden in toplevel modules and functors) happens before checking - the .ml file against the .mli signature, so non-generalizable - variables that were previously resolved through the .mli constraint - are now underspecified and result in a compilation failure - (see MPR#7414, GPR#929). This commit adds enough annotations to avoid - such underspecified variables in functors. - -diff --git a/Camomile/internal/unimap.ml b/Camomile/internal/unimap.ml -index b6fdbde..6a7cc30 100644 ---- a/Camomile/internal/unimap.ml -+++ b/Camomile/internal/unimap.ml -@@ -58,7 +58,7 @@ val of_name : string -> t - end - - --module Make (Config : ConfigInt.Type) = struct -+module Make (Config : ConfigInt.Type) : Type = struct - - type mapping = {no_char : int; tbl : Tbl31.Bytes.t} - -diff --git a/Camomile/public/uCharInfo.ml b/Camomile/public/uCharInfo.ml -index 69bf141..6a0337a 100644 ---- a/Camomile/public/uCharInfo.ml -+++ b/Camomile/public/uCharInfo.ml -@@ -298,7 +298,7 @@ val load_composition_exclusion_tbl : unit -> UCharTbl.Bool.t - - end - --module Make (Config : ConfigInt.Type) = struct -+module Make (Config : ConfigInt.Type) : Type = struct - include Unidata.Make(Config) - - (* General category *) diff --git a/dev-ml/camomile/metadata.xml b/dev-ml/camomile/metadata.xml index 82a7e9775c14..07d1d0e57508 100644 --- a/dev-ml/camomile/metadata.xml +++ b/dev-ml/camomile/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> - <remote-id type="github">yoriyuki/Camomile</remote-id> + <remote-id type="github">savonet/Camomile</remote-id> </upstream> </pkgmetadata> diff --git a/dev-ml/capnp-ocaml/Manifest b/dev-ml/capnp-ocaml/Manifest deleted file mode 100644 index 113a1a60e047..000000000000 --- a/dev-ml/capnp-ocaml/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST capnp-ocaml-3.0.0.tar.gz 140985 BLAKE2B 00d9bfec72ca60ae5b17730248554b5d5d7b0b85d007cc0dc3332043416125b1931e3d92b3d17ce12b40ae4094ff4ff212aaa327332588c6d00a853e31dea6a4 SHA512 5cdf678fa80e67c552f60123f1d04eb5facad81e6c29661c2234c06bbcb98312d1eba96f81f3e747fef0b4de986aff07b69aafcbfde60873ba40452a66d75075 -DIST capnp-ocaml-3.1.0.tar.gz 141189 BLAKE2B 503fa710f4940e4235b04d5090b29d5d43a351c057b6ec0dd07827c7b0f906261bf2ec3c8365b866190a6e202b9234e8b648d9846d8aaed8bb40b8601f8d9bcf SHA512 d3a24800ee334d5d0506a9b9f2db10994e475b205e347ae606d4f963cd846c7ab2ed8f60505495509cf2f3444c46b8aefe0501c6803874b5659b8b6429506b77 diff --git a/dev-ml/capnp-ocaml/capnp-ocaml-3.0.0.ebuild b/dev-ml/capnp-ocaml/capnp-ocaml-3.0.0.ebuild deleted file mode 100644 index 4d060a2a99a2..000000000000 --- a/dev-ml/capnp-ocaml/capnp-ocaml-3.0.0.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit opam - -DESCRIPTION="OCaml code generator plugin for the Cap'n Proto serialization framework" -HOMEPAGE="https://github.com/pelzlpj/capnp-ocaml" -SRC_URI="https://github.com/pelzlpj/capnp-ocaml/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD-2" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="test" - -RDEPEND=" - dev-ml/core_kernel:= - dev-ml/ocaml-extunix:= - dev-ml/ocplib-endian:= - dev-ml/res:= - dev-ml/ocaml-uint:= - dev-libs/capnproto:= -" -DEPEND="${RDEPEND} - test? ( dev-ml/core:= dev-ml/ounit ) - dev-ml/jbuilder -" - -src_compile() { - emake build -} - -src_install() { - opam_src_install capnp -} diff --git a/dev-ml/capnp-ocaml/capnp-ocaml-3.1.0.ebuild b/dev-ml/capnp-ocaml/capnp-ocaml-3.1.0.ebuild deleted file mode 100644 index 4d060a2a99a2..000000000000 --- a/dev-ml/capnp-ocaml/capnp-ocaml-3.1.0.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit opam - -DESCRIPTION="OCaml code generator plugin for the Cap'n Proto serialization framework" -HOMEPAGE="https://github.com/pelzlpj/capnp-ocaml" -SRC_URI="https://github.com/pelzlpj/capnp-ocaml/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD-2" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="test" - -RDEPEND=" - dev-ml/core_kernel:= - dev-ml/ocaml-extunix:= - dev-ml/ocplib-endian:= - dev-ml/res:= - dev-ml/ocaml-uint:= - dev-libs/capnproto:= -" -DEPEND="${RDEPEND} - test? ( dev-ml/core:= dev-ml/ounit ) - dev-ml/jbuilder -" - -src_compile() { - emake build -} - -src_install() { - opam_src_install capnp -} diff --git a/dev-ml/capnp-ocaml/metadata.xml b/dev-ml/capnp-ocaml/metadata.xml deleted file mode 100644 index d4602eeb2f4d..000000000000 --- a/dev-ml/capnp-ocaml/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">pelzlpj/capnp-ocaml</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/charinfo_width/Manifest b/dev-ml/charinfo_width/Manifest new file mode 100644 index 000000000000..6c9d7c85ff1c --- /dev/null +++ b/dev-ml/charinfo_width/Manifest @@ -0,0 +1 @@ +DIST charinfo_width-1.1.0.tar.gz 8307 BLAKE2B fcb37b82e2eb914322c78bcfebf901d713b55edc1c069b46cb157bbe1292b63aa69f4679f9077308a17e7d31d7c972e6b636ce7dad22fc963aedc33039dfbcfb SHA512 c8dac9eb6f520213de69b23433e2f0d6a21578c70ae69fb682065e707363968959395a6ddc6c88893e08372a138287318634b52a8b4fb70ac988b4ad4a18b140 diff --git a/dev-ml/charinfo_width/charinfo_width-1.1.0-r1.ebuild b/dev-ml/charinfo_width/charinfo_width-1.1.0-r1.ebuild new file mode 100644 index 000000000000..6191c758438e --- /dev/null +++ b/dev-ml/charinfo_width/charinfo_width-1.1.0-r1.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN="charInfo_width" +DUNE_PKG_NAME="${MY_PN}" + +inherit dune + +DESCRIPTION="Determine column width for a character" +HOMEPAGE="https://github.com/kandu/charInfo_width" +SRC_URI="https://github.com/kandu/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${MY_PN}-${PV}" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="+ocamlopt" + +RDEPEND=" + <dev-ml/camomile-2.0.0:= + dev-ml/ppx_expect:= + dev-ml/result:= +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/charinfo_width/metadata.xml b/dev-ml/charinfo_width/metadata.xml new file mode 100644 index 000000000000..f538049d8bf7 --- /dev/null +++ b/dev-ml/charinfo_width/metadata.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> + +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <bugs-to>https://github.com/kandu/charInfo_width/issues/</bugs-to> + <remote-id type="github">kandu/charInfo_width</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/cinaps/Manifest b/dev-ml/cinaps/Manifest new file mode 100644 index 000000000000..157125898bb8 --- /dev/null +++ b/dev-ml/cinaps/Manifest @@ -0,0 +1,3 @@ +DIST cinaps-0.14.0.tar.gz 9602 BLAKE2B 01d71b199dc966ac7653aca31d8a2e238102a5a29c4b6a1cf2ddd3f4624b41a4fd3e433025217951e7bd49b5eba21b6e4462217ef65a8755e6a4075683a55c5e SHA512 03f94ce7ab16d034edfc1976dd8fb83d533a1e5bc7f89dde3ea661553e05d6d8098c62c7e154013ef7814a283bb8cf535df0256891bcc6e0fdc847f6bf62aaf9 +DIST cinaps-0.15.0.tar.gz 9697 BLAKE2B b3c28b54269b7c35070b1a61b99087986aa5fead2792558597964a55d935544f09167aed269d6d68be65c1f588b7c0d645aabeed303885929a2f41628f6fabd9 SHA512 e69018c1b8ffc8895a5280c592bfbb0ac074b5a0367dc79392198819e751bf77dcbb67cf56e5f722e57939538a54b584bdb998cd8baedf6d01014a1f7d18a0c5 +DIST cinaps-0.15.1.tar.gz 9752 BLAKE2B 56b0a8fda6e0e420b3062001f853e187c78ca9adfba7a2204845f61f6480fc9984578db00a9aaba7cefa2bc41234d710a2079300b2dcdf6791d6e037d0a82f3d SHA512 ca53a9da8aa71ce7cddf7e24778e9c4d3f3e5784209da85a5a6b2d5af83cd8ad769fbe3009d2757ebf4a25ca39d76af00ebc693b1b01c3b53c8775ea479123a5 diff --git a/dev-ml/cinaps/cinaps-0.14.0.ebuild b/dev-ml/cinaps/cinaps-0.14.0.ebuild new file mode 100644 index 000000000000..0f71841c6bc8 --- /dev/null +++ b/dev-ml/cinaps/cinaps-0.14.0.ebuild @@ -0,0 +1,26 @@ +# Copyright 2020-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Trivial metaprogramming tool" +HOMEPAGE="https://github.com/ocaml-ppx/cinaps" +SRC_URI="https://github.com/ocaml-ppx/cinaps/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-ml/findlib:= + dev-ml/re:= +" +DEPEND="${RDEPEND} + test? ( + dev-ml/ppx_jane + ) +" diff --git a/dev-ml/cinaps/cinaps-0.15.0.ebuild b/dev-ml/cinaps/cinaps-0.15.0.ebuild new file mode 100644 index 000000000000..87242bd88dc3 --- /dev/null +++ b/dev-ml/cinaps/cinaps-0.15.0.ebuild @@ -0,0 +1,24 @@ +# Copyright 2020-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Trivial metaprogramming tool" +HOMEPAGE="https://github.com/ocaml-ppx/cinaps" +SRC_URI="https://github.com/ocaml-ppx/cinaps/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +DEPEND="dev-ml/re:=" +RDEPEND="${DEPEND}" +BDEPEND=" + test? ( + dev-ml/ppx_jane + ) +" diff --git a/dev-ml/cinaps/cinaps-0.15.1.ebuild b/dev-ml/cinaps/cinaps-0.15.1.ebuild new file mode 100644 index 000000000000..2dc682d7db39 --- /dev/null +++ b/dev-ml/cinaps/cinaps-0.15.1.ebuild @@ -0,0 +1,24 @@ +# Copyright 2020-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Trivial metaprogramming tool" +HOMEPAGE="https://github.com/ocaml-ppx/cinaps" +SRC_URI="https://github.com/ocaml-ppx/cinaps/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +DEPEND="dev-ml/re:=" +RDEPEND="${DEPEND}" +BDEPEND=" + test? ( + dev-ml/ppx_jane + ) +" diff --git a/dev-ml/cinaps/metadata.xml b/dev-ml/cinaps/metadata.xml new file mode 100644 index 000000000000..a4164f98e6b6 --- /dev/null +++ b/dev-ml/cinaps/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">ocaml-ppx/cinaps</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/cmdliner/Manifest b/dev-ml/cmdliner/Manifest index a40ae258b02c..691357382e1a 100644 --- a/dev-ml/cmdliner/Manifest +++ b/dev-ml/cmdliner/Manifest @@ -1,3 +1,3 @@ -DIST cmdliner-1.0.0.tbz 46542 BLAKE2B 7a667e218c298dbe4f5ba8ff034f15596e9b89b1a267fbdf7f6f811e42d61b103b08a2c8b9bd45e83bb249ae5ed078eb646630cd8a174af267354b25dc13ca54 SHA512 3fc87e49504167864ba4d81fde7bbaa01b7d58b06e2b68b36647857590f41fdc8b3bbd547418f8159b0e76628236b5c30301404b3d8d57e2ff3f082228eee73c -DIST cmdliner-1.0.1.tbz 46614 BLAKE2B 609220b8dbb0aa5ade9f504f420ed7c6ee1ad9aa1f9cd02b1edba60b86791e59a12faca0ebe6ed9cbb5fbeefdfe25b524509bf311f1611022b6c62ae38df01c1 SHA512 b792dab3a7f53f69d74d07acbb013e48235614e29a477b7e9e7d7b58013d47ff842fbaeef50acda305434185325855ef83d839d5acb0ccf460276f0ca880ee7b -DIST cmdliner-1.0.2.tbz 47350 BLAKE2B 226481c73e66fb45a69b563bef9f95c6a04b782072643fd8e66e4da4907f899a72e2b4e1217b46c3a1f417bf9e4be193c3528da09954808043e4abf47be4d5c2 SHA512 d718d9abe4fe0ea0e7453ed09e57de2a427cc450225cf2b56513d99af4b4218c3fe96ab08dcebd202b9ecf25a471bb7c67511262f35148dfe15684421be6d743 +DIST cmdliner-1.0.4.tbz 49558 BLAKE2B 8ea922a22d08fc4cce6c0aff1adff9a2fcdaee8e13b7bdfad4a08b459e8a6557761fa70c9e34100bc8baaa4113e5729f2daf297fc1f618bd8c30b9323bb87ba2 SHA512 4cd1cc0932b8bbd607160cc9816b35c12a68a358a35ffcb6827f547052dc517e871a91ddbaed0447cb1fa5fdf510cdf5d760e8e5c1e4548f82e1d523e2b3ecb3 +DIST cmdliner-1.1.1.tbz 58054 BLAKE2B 1c3d3c836d390490d0470cae1545a8ea6bd3ee2b10d33e02fbbad5c47cf5c1fb9104f05a32119580af57358e0cdd9b17fa319a7fe62a9de9f6b504d9f0300513 SHA512 5478ad833da254b5587b3746e3a8493e66e867a081ac0f653a901cc8a7d944f66e4387592215ce25d939be76f281c4785702f54d4a74b1700bc8838a62255c9e +DIST cmdliner-1.2.0.tbz 58504 BLAKE2B bc5be67fff2d83408b8537fbb7472c3811452df5cf89dd3d175fa052629339ac960d12e751cca3d8f750c6bd8bb43df645f976477597b9a5609577a73bbb00e0 SHA512 6fcd6a59a6fbc6986b1aecdc3e4ce7a0dc43c65a16b427d6caa5504b10b51384f6b0bc703af646b09f5f1caeb6827b37d4480ce350ca8006204c850785f2810b diff --git a/dev-ml/cmdliner/cmdliner-1.0.0.ebuild b/dev-ml/cmdliner/cmdliner-1.0.4.ebuild index 262192ca7b53..859d7ed16eb4 100644 --- a/dev-ml/cmdliner/cmdliner-1.0.0.ebuild +++ b/dev-ml/cmdliner/cmdliner-1.0.4.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 inherit findlib @@ -11,12 +11,14 @@ SRC_URI="http://erratique.ch/software/${PN}/releases/${P}.tbz" LICENSE="ISC" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" RDEPEND=" >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/result:= + dev-ml/findlib:= " DEPEND="${RDEPEND} dev-ml/topkg diff --git a/dev-ml/cmdliner/cmdliner-1.0.1.ebuild b/dev-ml/cmdliner/cmdliner-1.1.1.ebuild index 262192ca7b53..bd14ab21c63a 100644 --- a/dev-ml/cmdliner/cmdliner-1.0.1.ebuild +++ b/dev-ml/cmdliner/cmdliner-1.1.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 inherit findlib @@ -11,33 +11,32 @@ SRC_URI="http://erratique.ch/software/${PN}/releases/${P}.tbz" LICENSE="ISC" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" -IUSE="+ocamlopt test" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" RDEPEND=" - >=dev-lang/ocaml-4:=[ocamlopt?] + >=dev-lang/ocaml-4.08.00:=[ocamlopt?] dev-ml/result:= + dev-ml/findlib:= " DEPEND="${RDEPEND} dev-ml/topkg dev-ml/ocamlbuild" src_compile() { - ocaml pkg/pkg.ml build \ - --tests $(usex test true false) \ - || die -} - -src_test() { - ocaml pkg/pkg.ml test || die + emake build-byte + if use ocamlopt ; then + emake build-native-dynlink + emake build-native + fi } src_install() { # Can't use opam-installer here as it is an opam dep... findlib_src_preinst local nativelibs="" - use ocamlopt && nativelibs="$(echo _build/src/cmdliner.cm{x,xa,xs} _build/src/cmdliner.a)" - ocamlfind install cmdliner _build/pkg/META \ - _build/src/cmdliner.mli _build/src/cmdliner.cm{a,i} ${nativelibs} || die + use ocamlopt && nativelibs="$(echo _build/cmdliner.cm{x,xa,xs} _build/cmdliner.a)" + ocamlfind install cmdliner pkg/META \ + _build/cmdliner.mli _build/cmdliner.cm{a,i} ${nativelibs} || die dodoc README.md CHANGES.md } diff --git a/dev-ml/cmdliner/cmdliner-1.0.2.ebuild b/dev-ml/cmdliner/cmdliner-1.2.0.ebuild index 262192ca7b53..b8b42c2d8a4e 100644 --- a/dev-ml/cmdliner/cmdliner-1.0.2.ebuild +++ b/dev-ml/cmdliner/cmdliner-1.2.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=8 inherit findlib @@ -11,33 +11,32 @@ SRC_URI="http://erratique.ch/software/${PN}/releases/${P}.tbz" LICENSE="ISC" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" -IUSE="+ocamlopt test" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" RDEPEND=" - >=dev-lang/ocaml-4:=[ocamlopt?] + >=dev-lang/ocaml-4.08.00:=[ocamlopt?] dev-ml/result:= + dev-ml/findlib:= " DEPEND="${RDEPEND} dev-ml/topkg dev-ml/ocamlbuild" src_compile() { - ocaml pkg/pkg.ml build \ - --tests $(usex test true false) \ - || die -} - -src_test() { - ocaml pkg/pkg.ml test || die + emake build-byte + if use ocamlopt ; then + emake build-native-dynlink + emake build-native + fi } src_install() { # Can't use opam-installer here as it is an opam dep... findlib_src_preinst local nativelibs="" - use ocamlopt && nativelibs="$(echo _build/src/cmdliner.cm{x,xa,xs} _build/src/cmdliner.a)" - ocamlfind install cmdliner _build/pkg/META \ - _build/src/cmdliner.mli _build/src/cmdliner.cm{a,i} ${nativelibs} || die + use ocamlopt && nativelibs="$(echo _build/cmdliner.cm{x,xa,xs} _build/cmdliner.a)" + ocamlfind install cmdliner pkg/META \ + _build/cmdliner.mli _build/cmdliner.cm{a,i} ${nativelibs} || die dodoc README.md CHANGES.md } diff --git a/dev-ml/cmdliner/metadata.xml b/dev-ml/cmdliner/metadata.xml index ffac4d7ebc01..ff5a0cd1ae3d 100644 --- a/dev-ml/cmdliner/metadata.xml +++ b/dev-ml/cmdliner/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> -</maintainer> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> </pkgmetadata> diff --git a/dev-ml/configurator/Manifest b/dev-ml/configurator/Manifest deleted file mode 100644 index 0d0220486ac4..000000000000 --- a/dev-ml/configurator/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST configurator-0.9.1.tar.gz 10231 BLAKE2B e80deda7cf53a6fe2ef042696c5e815576a5f846e2cbe360b8b3e938ee2bd81b4e93f51141a1e10a18bb97a7b0ae41be64409bd85a9ad85eab4595ca36889ee2 SHA512 43d864d3317241dd66829747dd956ac42614cc687bbca23e2575cb1b3ab9d0c628dfbdd8f026bcd4d76cb87cf282d955d6a90f0e69543ee1ee1f01a1efa9b54b diff --git a/dev-ml/configurator/configurator-0.9.1.ebuild b/dev-ml/configurator/configurator-0.9.1.ebuild deleted file mode 100644 index 76c8abbab093..000000000000 --- a/dev-ml/configurator/configurator-0.9.1.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Helper library for gathering system configuration" -HOMEPAGE="https://github.com/janestreet/configurator" -SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" - -DEPEND=" - dev-lang/ocaml:= - dev-ml/base:= - dev-ml/ppx_base:= - dev-ml/ppx_driver:= - dev-ml/stdio:= - dev-ml/ocaml-migrate-parsetree:= - " -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} dev-ml/opam dev-ml/jbuilder" - -src_install() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - ${PN}.install || die -} diff --git a/dev-ml/configurator/metadata.xml b/dev-ml/configurator/metadata.xml deleted file mode 100644 index 24f2767a0bc5..000000000000 --- a/dev-ml/configurator/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">janestreet/configurator</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/coq-menhirlib/Manifest b/dev-ml/coq-menhirlib/Manifest new file mode 100644 index 000000000000..f8257d7817bc --- /dev/null +++ b/dev-ml/coq-menhirlib/Manifest @@ -0,0 +1 @@ +DIST menhir-20220210.tar.bz2 1160357 BLAKE2B a9401b50db4dfdfe56c5c10919d4d385cbb7bf27d1518932e55d6757c08989407cda17c65f72d20e21738618e4f97f20b10098c9185f3882b3391aab7f9f8bc9 SHA512 8a852e995cab57b16adc1b7708d3acdf5f8b65d13dbf907a4155ff45d71dccc65868fe369590b48a3f06d8319f74777ce2e9be05caa9dbe060c0ae3a2b37943f diff --git a/dev-ml/coq-menhirlib/coq-menhirlib-20220210.ebuild b/dev-ml/coq-menhirlib/coq-menhirlib-20220210.ebuild new file mode 100644 index 000000000000..f0f543ec6276 --- /dev/null +++ b/dev-ml/coq-menhirlib/coq-menhirlib-20220210.ebuild @@ -0,0 +1,34 @@ +# 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/ocamldsort/metadata.xml b/dev-ml/coq-menhirlib/metadata.xml index 75c9ea74812d..ff5a0cd1ae3d 100644 --- a/dev-ml/ocamldsort/metadata.xml +++ b/dev-ml/coq-menhirlib/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> </pkgmetadata> diff --git a/dev-ml/core/Manifest b/dev-ml/core/Manifest index 8c73a7fb09a2..144daecced49 100644 --- a/dev-ml/core/Manifest +++ b/dev-ml/core/Manifest @@ -1,2 +1,5 @@ -DIST core-0.9.1.tar.gz 735006 BLAKE2B a85b66c810656aca74fbe82fda37a9d73ca295534b1ea5b2a784aef90c5efb8d571fe449d8b8d1f6c7d7365ed5d20a0a04c4d43374831e358ddc1147cc51f583 SHA512 2d4a7ff753cb0415cc6a957fff53037aad65053d3c3531070663b4bcf4462982c811a586a39ea3a223aca02cae9212c300b6788266ac60213437dc99ecc0a29a -DIST core-0.9.2.tar.gz 735027 BLAKE2B d33b91d391446d8649ccb84d72f3533e72d2cdb5aca6359049dca0466ac6d23073dc59bc38bc1c9f7bbe47537731984d41a6ac67e4bf9f59ec7be47938bdfd71 SHA512 8cef59c353ff6f98b11bb007b99a583b64ee23f960a0de6559866c8ab59a58dd3ca4dae16275c87b780494b64ced7aaa24db8f9a6e6d309662e9d9206f04e335 +DIST core-0.14.0.tar.gz 361607 BLAKE2B 1602857bee142c23101380e6d54b6f8df1be8bb67e8f8baf7ca65c2f248d1ff9794e33d96cc58ca1f591b69e4a16b7873043549e01d38e2fc390c884d117d0a3 SHA512 fd3202c115ccda53aa32233f2eac223dcc3fb6272fd6327ea6aa5dcd3b7295936d86102640046c961a2af45d62aa3563a2701a2e0ef54f6cd2bfcb81609639f4 +DIST core-0.14.1.tar.gz 361679 BLAKE2B ca43016c760e620f9073defd84a07bacaa0557d42fd9a60d6c4c894187671526ae07e0b93d29bee961b3460e1b0ec5cb346cc711d583c71fde94a9bf9992bf7e SHA512 29482b1f611f2f15f11562bfed7f8a47d2926333601ed57867c8c134d4b10dbf2ba0309ceb6ae602fe8bca1e1f9324603dba37a5df3183cd0cb690104817ed3f +DIST core-0.15.0.tar.gz 522984 BLAKE2B b6fdc9d7fe133c504f89ba492e63d090e2ca4e413e96eb8c216213ea358d84ae89ef1d372525b53f701e8076e4e0670ea3535f399f3f735b3b7da383901def09 SHA512 a73a3c1c6f0ade9a9e49917bb896e62afc4fda44dd90ffa99ef9ba24debe7166b4fe1b374500a044cad8318d12f250de7fe2dd935015efde379cf91a2241f51b +DIST core-0.15.1.tar.gz 522517 BLAKE2B 1dc1245708f392161ce04ab121dfff550f13a8aa75b967bc3c32f474641b455355bbeb63ef1c7492947f46c3391cd877b96a8e35c083d0406135e840647715b2 SHA512 2c04fdd989d016faaa2dee4b13372d3e228f0011151ae5f747c1eb6206820a61779a87eb7e2ecc6e1ddf77872a69a07636a93d24df61b4a2ba2a1b745f499b16 +DIST core-0.16.1.tar.gz 542242 BLAKE2B ad0b3c1b55b960f040dc0ed82a2c3c19447dfe635d2d25adab63a0ea529867cd6692fe258af3c5896ea63b5438f96b75007b4e2e5ea1d34b3c13936a7b369aeb SHA512 5f9f4400b6e42b74ffd57223cb67884368d324739565bbb20162547ede8bd6d0ece3cc265503b674829f9cf373784e8036d4c73e26e9196aa5446de69b63e181 diff --git a/dev-ml/core/core-0.14.0-r4.ebuild b/dev-ml/core/core-0.14.0-r4.ebuild new file mode 100644 index 000000000000..f6d81379f69f --- /dev/null +++ b/dev-ml/core/core-0.14.0-r4.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Jane Street's alternative to the standard library" +HOMEPAGE="https://github.com/janestreet/core" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt" + +# TODO: Wants quickcheck_deprecated? +RESTRICT="test" + +RDEPEND=" + <dev-lang/ocaml-4.12 + dev-ml/base:= + <dev-ml/core_kernel-0.15:= + <dev-ml/jst-config-0.15:= + <dev-ml/ppx_jane-0.15:= + <dev-ml/sexplib-0.15:= + dev-ml/spawn:= + dev-ml/stdio:= + dev-ml/timezone:= +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/core/core-0.14.1-r1.ebuild b/dev-ml/core/core-0.14.1-r1.ebuild new file mode 100644 index 000000000000..6118d175bd4a --- /dev/null +++ b/dev-ml/core/core-0.14.1-r1.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Jane Street's alternative to the standard library" +HOMEPAGE="https://github.com/janestreet/core" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +# TODO: Wants quickcheck_deprecated? +RESTRICT="test" + +RDEPEND=" + dev-ml/base:= + <dev-ml/core_kernel-0.15:= + <dev-ml/jst-config-0.15:= + <dev-ml/ppx_jane-0.15:= + <dev-ml/sexplib-0.15:= + dev-ml/spawn:= + dev-ml/stdio:= + =dev-ml/timezone-0.14*:= + <dev-ml/jane-street-headers-0.15:= + !>=dev-ml/core_unix-0.15 +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/core/core-0.15.0.ebuild b/dev-ml/core/core-0.15.0.ebuild new file mode 100644 index 000000000000..0540bcd6def8 --- /dev/null +++ b/dev-ml/core/core-0.15.0.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Jane Street's alternative to the standard library" +HOMEPAGE="https://github.com/janestreet/core" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" +IUSE="+ocamlopt" + +# TODO: Wants quickcheck_deprecated? +RESTRICT="test" + +RDEPEND=" + dev-ml/base_bigstring:${SLOT} + dev-ml/ppx_jane:${SLOT} +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/core/core-0.15.1-r1.ebuild b/dev-ml/core/core-0.15.1-r1.ebuild new file mode 100644 index 000000000000..b090bc8654f4 --- /dev/null +++ b/dev-ml/core/core-0.15.1-r1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Jane Street's alternative to the standard library" +HOMEPAGE="https://github.com/janestreet/core" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86" +IUSE="+ocamlopt" + +# TODO: Wants quickcheck_deprecated? +RESTRICT="test" + +RDEPEND=" + >=dev-lang/ocaml-4.11 + >=dev-ml/base-0.15.1:${SLOT} + dev-ml/base_bigstring:${SLOT} + dev-ml/base_quickcheck:= + dev-ml/bin_prot:= + dev-ml/ppxlib:= + dev-ml/ppx_bin_prot:= + dev-ml/ppx_bench:= + dev-ml/ppx_custom_printf:= + dev-ml/ppx_disable_unused_warnings:= + dev-ml/ppx_fields_conv:= + dev-ml/ppx_fixed_literal:= + dev-ml/ppx_let:= + dev-ml/ppx_log:= + dev-ml/ppx_jane:${SLOT} + dev-ml/ppx_module_timer:= + dev-ml/ppx_optional:= + dev-ml/ppx_pipebang:= + dev-ml/ppx_sexp_message:= + dev-ml/ppx_sexp_value:= + dev-ml/ppx_stable:= + dev-ml/ppx_string:= + dev-ml/ppx_ignore_instrumentation:= + dev-ml/typerep:= +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/core/core-0.16.1.ebuild b/dev-ml/core/core-0.16.1.ebuild new file mode 100644 index 000000000000..dc2f2c901b50 --- /dev/null +++ b/dev-ml/core/core-0.16.1.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Jane Street's alternative to the standard library" +HOMEPAGE="https://github.com/janestreet/core" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +RDEPEND=" + >=dev-lang/ocaml-4.14 + dev-ml/base:${SLOT} + dev-ml/base_bigstring:${SLOT} + dev-ml/base_quickcheck:${SLOT} + dev-ml/bin_prot:${SLOT} + dev-ml/ppxlib:= + dev-ml/ppx_bin_prot:= + dev-ml/ppx_bench:= + dev-ml/ppx_custom_printf:= + dev-ml/ppx_disable_unused_warnings:= + dev-ml/ppx_fields_conv:= + dev-ml/ppx_fixed_literal:= + dev-ml/ppx_let:= + dev-ml/ppx_log:= + dev-ml/ppx_jane:${SLOT} + dev-ml/ppx_module_timer:= + dev-ml/ppx_optional:= + dev-ml/ppx_pipebang:= + dev-ml/ppx_sexp_message:${SLOT} + dev-ml/ppx_sexp_value:= + dev-ml/ppx_stable:= + dev-ml/ppx_string:= + dev-ml/ppx_ignore_instrumentation:= + dev-ml/typerep:${SLOT} +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/core/core-0.9.1-r1.ebuild b/dev-ml/core/core-0.9.1-r1.ebuild deleted file mode 100644 index 45cc74eb4553..000000000000 --- a/dev-ml/core/core-0.9.1-r1.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit opam - -DESCRIPTION="Jane Street's alternative to the standard library" -HOMEPAGE="https://github.com/janestreet/core" -SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND=" - dev-ml/base:= - dev-ml/configurator:= - dev-ml/core_kernel:= - dev-ml/ppx_assert:= - dev-ml/ppx_driver:= - dev-ml/ppx_jane:= - dev-ml/sexplib:= - dev-ml/spawn:= - dev-ml/stdio:= - dev-ml/ocaml-migrate-parsetree:= -" -DEPEND="${RDEPEND} dev-ml/jbuilder" -PATCHES=( "${FILESDIR}/glibc225.patch" ) diff --git a/dev-ml/core/core-0.9.2.ebuild b/dev-ml/core/core-0.9.2.ebuild deleted file mode 100644 index d2dbd9555d39..000000000000 --- a/dev-ml/core/core-0.9.2.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit opam - -DESCRIPTION="Jane Street's alternative to the standard library" -HOMEPAGE="https://github.com/janestreet/core" -SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND=" - dev-ml/base:= - dev-ml/configurator:= - dev-ml/core_kernel:= - dev-ml/ppx_assert:= - dev-ml/ppx_driver:= - dev-ml/ppx_jane:= - dev-ml/sexplib:= - dev-ml/spawn:= - dev-ml/stdio:= - dev-ml/ocaml-migrate-parsetree:= -" -DEPEND="${RDEPEND} dev-ml/jbuilder" diff --git a/dev-ml/core/files/glibc225.patch b/dev-ml/core/files/glibc225.patch deleted file mode 100644 index 1dd96c8b7b4b..000000000000 --- a/dev-ml/core/files/glibc225.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: core-0.9.1/src/unix_stubs.c -=================================================================== ---- core-0.9.1.orig/src/unix_stubs.c -+++ core-0.9.1/src/unix_stubs.c -@@ -40,6 +40,7 @@ - #include <arpa/inet.h> - #include <netdb.h> - #include <ifaddrs.h> -+#include <sys/sysmacros.h> - - #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) - #define stat64 stat diff --git a/dev-ml/core/metadata.xml b/dev-ml/core/metadata.xml index af16efe72137..bf187579da70 100644 --- a/dev-ml/core/metadata.xml +++ b/dev-ml/core/metadata.xml @@ -1,9 +1,9 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <longdescription lang="en"> Core is Jane Street Capital's Ocaml standard library overlay. It diff --git a/dev-ml/core_bench/Manifest b/dev-ml/core_bench/Manifest index fb961746e147..f2cd64662227 100644 --- a/dev-ml/core_bench/Manifest +++ b/dev-ml/core_bench/Manifest @@ -1 +1,3 @@ -DIST core_bench-0.9.0.tar.gz 43091 BLAKE2B 3b94caf4515a15f26679a76b332a260f37aaaa79a87c164ccc244bc808b215d8064e56c69dc107b5ec3c8b69fc5a27a023ab954205004546e37bfc1b06d8cb0e SHA512 4860143276ca8d7966519435c151923ed0f0767fc9a654e6ba75a777f24aa0a66d1ebc4b5b2f8bbcb20bc8e869220ea0c93ccc9c9b5764fa82ef87c17bec761e +DIST core_bench-0.14.0.tar.gz 42972 BLAKE2B a65585d2cae5080e23d9b8897d15f7ac6e42c36280a06ff21b5f46d5532f3265b672f7d6373573826b80f5f6dc93343b3e93bf8c3d5b471e6717162e9fac4025 SHA512 e86a04c12832ba281669139d74e942ab1ff8d7dc799ea1687cf57a50ef1c7b031191aa1cc44c50586fcfca8e83c3c6f1a8b1aeb40c724fbaaa0e0568c393d75a +DIST core_bench-0.15.0.tar.gz 46920 BLAKE2B 44ca0845abc8a593c5685305e2175b04dff32219488945f5ca7c00a6b139d9cf99bcdb865259b17625decb865916ef04eef4feff2d4ae8299986097ad7ec9d27 SHA512 eb8574d3f1444f4aad0ce73da372d6283a7d03aa636dc47fb6e918c1a2c47241fcffe52a6015e93b7ebd98f59e00a3d61f97fb7222400f4ca59f60a7ba430ec2 +DIST core_bench-0.16.0.tar.gz 47258 BLAKE2B 04ffc46994549e04f3ed8e6dfde72abfee8df6818cd42b5139aaaf5107a697a86167864cf0189be5708ed2a0148e3a810e562f89e27c4409530dc1f3bd566f01 SHA512 46fc0316dc345eb469bf0a5e2468fbf19babba76ed90bf90d74fa6de3d326b9a3f1b4f3949492c6b487aabce4b5f001d1db661069e15ca7c05b55eaeb9c382a7 diff --git a/dev-ml/core_bench/core_bench-0.14.0.ebuild b/dev-ml/core_bench/core_bench-0.14.0.ebuild new file mode 100644 index 000000000000..7f1c43e394ae --- /dev/null +++ b/dev-ml/core_bench/core_bench-0.14.0.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Micro-benchmarking library for OCaml" +HOMEPAGE="https://github.com/janestreet/core_bench" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-ml/core-0.14.0:= + >=dev-ml/core_kernel-0.14.0:= + >=dev-ml/ppx_jane-0.14.0:= + dev-ml/textutils:= + >=dev-ml/re-1.8.0:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/core_bench/core_bench-0.15.0.ebuild b/dev-ml/core_bench/core_bench-0.15.0.ebuild new file mode 100644 index 000000000000..1f818f547b21 --- /dev/null +++ b/dev-ml/core_bench/core_bench-0.15.0.ebuild @@ -0,0 +1,18 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Micro-benchmarking library for OCaml" +HOMEPAGE="https://github.com/janestreet/core_bench" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86" +IUSE="+ocamlopt" + +DEPEND="dev-ml/textutils:${SLOT}" +RDEPEND="${DEPEND}" diff --git a/dev-ml/core_bench/core_bench-0.16.0.ebuild b/dev-ml/core_bench/core_bench-0.16.0.ebuild new file mode 100644 index 000000000000..4e7da1d6882d --- /dev/null +++ b/dev-ml/core_bench/core_bench-0.16.0.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Micro-benchmarking library for OCaml" +HOMEPAGE="https://github.com/janestreet/core_bench" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-lang/ocaml-4.14 + dev-ml/core:${SLOT} + dev-ml/core_kernel:${SLOT} + dev-ml/core_unix:${SLOT} + dev-ml/ppx_compare:${SLOT} + dev-ml/ppx_jane:${SLOT} + dev-ml/ppx_let:${SLOT} + dev-ml/textutils:${SLOT} +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/core_bench/core_bench-0.9.0.ebuild b/dev-ml/core_bench/core_bench-0.9.0.ebuild deleted file mode 100644 index 3ef6f6506421..000000000000 --- a/dev-ml/core_bench/core_bench-0.9.0.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Micro-benchmarking library for OCaml" -HOMEPAGE="https://github.com/janestreet/core_bench" -SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND=" - dev-lang/ocaml:= - dev-ml/core:= - dev-ml/core_extended:= - dev-ml/ppx_driver:= - dev-ml/ppx_jane:= - dev-ml/textutils:= - dev-ml/ocaml-migrate-parsetree:= - dev-ml/ocaml-re:= -" -DEPEND="${RDEPEND} dev-ml/opam dev-ml/jbuilder" - -src_install() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - ${PN}.install || die -} diff --git a/dev-ml/core_bench/metadata.xml b/dev-ml/core_bench/metadata.xml index 3071b550bf68..494cd343b1f5 100644 --- a/dev-ml/core_bench/metadata.xml +++ b/dev-ml/core_bench/metadata.xml @@ -1,9 +1,9 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">janestreet/core_bench</remote-id> diff --git a/dev-ml/core_extended/Manifest b/dev-ml/core_extended/Manifest deleted file mode 100644 index 45315d77879d..000000000000 --- a/dev-ml/core_extended/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST core_extended-0.9.0.tar.gz 234944 BLAKE2B 9c6985b2c9a34ca3fd3bd6016240140d09ccfad2cdf264923e826d1399ead3d827674b5438c90e75dee9511ed4005d945d2e4b73bb5778475b55871c59231a50 SHA512 16e64ba2e3bbe31a6bde03c0ca65d238445f19d8f2aa1f11157efd4f4fab76adb28607329e853eafab04de549f303b033522cc46c3e179094ac68071ce797a5e diff --git a/dev-ml/core_extended/core_extended-0.9.0.ebuild b/dev-ml/core_extended/core_extended-0.9.0.ebuild deleted file mode 100644 index 4f17a7f52f95..000000000000 --- a/dev-ml/core_extended/core_extended-0.9.0.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Jane Street's alternative to the standard library" -HOMEPAGE="https://github.com/janestreet/core_extended" -SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND=" - dev-lang/ocaml:= - dev-ml/bin-prot:= - dev-ml/core:= - dev-ml/core_kernel:= - dev-ml/fieldslib:= - dev-ml/ppx_driver:= - dev-ml/ppx_jane:= - dev-ml/re2:= - dev-ml/sexplib:= - dev-ml/textutils:= - dev-ml/ocaml-migrate-parsetree:= - <dev-ml/ppx_jane-100 - <dev-ml/ppx_driver-100 - " -DEPEND="${RDEPEND} dev-ml/opam dev-ml/jbuilder" - -src_install() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - ${PN}.install || die -} diff --git a/dev-ml/core_extended/metadata.xml b/dev-ml/core_extended/metadata.xml deleted file mode 100644 index 66beb889dbaa..000000000000 --- a/dev-ml/core_extended/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">janestreet/core_extended</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/core_kernel/Manifest b/dev-ml/core_kernel/Manifest index 68e1a5aa3bd8..d979a60f691a 100644 --- a/dev-ml/core_kernel/Manifest +++ b/dev-ml/core_kernel/Manifest @@ -1,2 +1,4 @@ -DIST core_kernel-0.9.0.tar.gz 502937 BLAKE2B 88a4fdfae2dc0d45c794faf925bd97d7e59558231540a8614d548133d58c576eabf342d2af358ea792ba7e59a79317e4c66aad3a4ff0c2f4b94f012d73e98d7c SHA512 c262f25636d7a5105810c9588774a56e21e58cd156302781db3463898be0a42d9c8b1984ead739d0659d6f3eece4a305fc45c7cad4ed57149d26344affbdb668 -DIST core_kernel-0.9.1.tar.gz 502985 BLAKE2B c924b104f3e0c5bce84a01408f8ac773ec16eb37f6dddfd8261886355c08d8536af60e573ded56936a299af6d8a7a16f37147e9660d65fece5ac8aa7d42a7a95 SHA512 ec0c3f72c52b975ef3d28b89190e0de3d9a60a842cde13f9a71f2d90101af3ccced06b4640d061362b89127140fe761dc19733da3f7dfabab189faef78343b7b +DIST core_kernel-0.14.1.tar.gz 701832 BLAKE2B 0463641f8ab663f00dff59e1ac0b9693f15b71e4f9fa001b54d2449b8a18c8f618a7d7d3149084699d12d4c9834a20fcda6882549f4c69c219e3489ee1223dba SHA512 56488260fce8a066bba06efc349b4760c55d7d2fe38ed47dd7f37d0deb9ea05838a87713ec778df83d7805da5a54513a97d9e678640bb977bfd342bb748e7a33 +DIST core_kernel-0.14.2.tar.gz 701911 BLAKE2B e784d6d8f53df03ffb56075a43bdfc82d5099740c4eebdfdebe196cb3c97211b95892af18ab0f69b3143a873962fa74afe09a961ad851fb8eb4f30287e538157 SHA512 d0f719734d920d98c55ac7d1aa8ab5b3de7a3896f6cd8b1ffc5147c689f072361e79045a0b34c1f5359dbf492e612eabd613c4724fe60d45345c2944dcdcf6de +DIST core_kernel-0.15.0.tar.gz 265183 BLAKE2B b1e67e8a84e1abbb23ccfb65c8320e36b3b2f91be3c2aa02e73b53c411e80da65c34b69d538d027417a52fd1dbb1a2217b9020d86ae00237ebaf3e7c06b35e42 SHA512 da28f11374fda2e869b5ef3f7131461c6d896b52413654f2aeb7c74bc77ba4a8e2a25830eb3e3ef393e0bbae903db20f54773b356c53cab75c1bba1b9ce265bc +DIST core_kernel-0.16.0.tar.gz 276775 BLAKE2B 3e64ff9291c01b7f9d48a70e3106b09d96040b41720f36cc36d2067cf195451a0c948991f55b930bb6f58e28d75f47f21367785c2c06ac8459de0f72bf05f961 SHA512 a6cf486694514ea4393aa6b2bf688b4a21fd97238d22ddfa99af30ee478be23255d67f87c16115df03ceb3a7bf4726e92d0c01be0abb2308f36c027a5ab4bc04 diff --git a/dev-ml/core_kernel/core_kernel-0.9.0.ebuild b/dev-ml/core_kernel/core_kernel-0.14.1-r3.ebuild index e725deed96b8..aa497f6f9095 100644 --- a/dev-ml/core_kernel/core_kernel-0.9.0.ebuild +++ b/dev-ml/core_kernel/core_kernel-0.14.1-r3.ebuild @@ -1,7 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 + +inherit dune DESCRIPTION="System-independent part of Core" HOMEPAGE="https://github.com/janestreet/core_kernel" @@ -9,39 +11,34 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g LICENSE="LGPL-2.1-with-linking-exception" SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt" + +# Wants quickcheck_deprecated for now +RESTRICT="test" RDEPEND=" dev-lang/ocaml:= + <dev-ml/jst-config-0.15.0 dev-ml/base:= - dev-ml/bin-prot:= - dev-ml/configurator:= + =dev-ml/base_bigstring-0.14*:= + dev-ml/base_quickcheck:= + dev-ml/bin_prot:= dev-ml/fieldslib:= dev-ml/jane-street-headers:= - dev-ml/ppx_assert:= - dev-ml/ppx_base:= - dev-ml/ppx_driver:= - dev-ml/ppx_hash:= + dev-ml/ocaml-migrate-parsetree:= + =dev-ml/ppx_assert-0.14*:= + =dev-ml/ppx_base-0.14*:= + =dev-ml/ppx_hash-0.14*:= dev-ml/ppx_inline_test:= dev-ml/ppx_jane:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_sexp_message:= + dev-ml/splittable_random:= dev-ml/sexplib:= dev-ml/stdio:= + dev-ml/time_now:= dev-ml/typerep:= dev-ml/variantslib:= - dev-ml/ocaml-migrate-parsetree:= -" -DEPEND="${RDEPEND} - dev-ml/opam - dev-ml/jbuilder " - -src_install() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - ${PN}.install || die -} +DEPEND="${RDEPEND}" diff --git a/dev-ml/core_kernel/core_kernel-0.9.1.ebuild b/dev-ml/core_kernel/core_kernel-0.14.2-r1.ebuild index e725deed96b8..d06daee72080 100644 --- a/dev-ml/core_kernel/core_kernel-0.9.1.ebuild +++ b/dev-ml/core_kernel/core_kernel-0.14.2-r1.ebuild @@ -1,7 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + +inherit dune DESCRIPTION="System-independent part of Core" HOMEPAGE="https://github.com/janestreet/core_kernel" @@ -9,39 +11,35 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g LICENSE="LGPL-2.1-with-linking-exception" SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +# Wants quickcheck_deprecated for now +RESTRICT="test" RDEPEND=" dev-lang/ocaml:= + <dev-ml/jst-config-0.15.0 + >=dev-ml/ppx_optcomp-0.14.3:= dev-ml/base:= - dev-ml/bin-prot:= - dev-ml/configurator:= + =dev-ml/base_bigstring-0.14*:= + dev-ml/base_quickcheck:= + dev-ml/bin_prot:= dev-ml/fieldslib:= dev-ml/jane-street-headers:= - dev-ml/ppx_assert:= - dev-ml/ppx_base:= - dev-ml/ppx_driver:= - dev-ml/ppx_hash:= + dev-ml/ocaml-migrate-parsetree:= + =dev-ml/ppx_assert-0.14*:= + =dev-ml/ppx_base-0.14*:= + =dev-ml/ppx_hash-0.14*:= dev-ml/ppx_inline_test:= dev-ml/ppx_jane:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_sexp_message:= dev-ml/sexplib:= + dev-ml/splittable_random:= dev-ml/stdio:= + dev-ml/time_now:= dev-ml/typerep:= dev-ml/variantslib:= - dev-ml/ocaml-migrate-parsetree:= -" -DEPEND="${RDEPEND} - dev-ml/opam - dev-ml/jbuilder " - -src_install() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - ${PN}.install || die -} +DEPEND="${RDEPEND}" diff --git a/dev-ml/core_kernel/core_kernel-0.15.0.ebuild b/dev-ml/core_kernel/core_kernel-0.15.0.ebuild new file mode 100644 index 000000000000..cf9f6fff0981 --- /dev/null +++ b/dev-ml/core_kernel/core_kernel-0.15.0.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="System-independent part of Core" +HOMEPAGE="https://github.com/janestreet/core_kernel" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1-with-linking-exception" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86" +IUSE="+ocamlopt" + +# Wants quickcheck_deprecated for now +RESTRICT="test" + +RDEPEND=" + dev-ml/core:${SLOT} + dev-ml/int_repr:${SLOT} +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/core_kernel/core_kernel-0.16.0.ebuild b/dev-ml/core_kernel/core_kernel-0.16.0.ebuild new file mode 100644 index 000000000000..be1df007fb3c --- /dev/null +++ b/dev-ml/core_kernel/core_kernel-0.16.0.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="System-independent part of Core" +HOMEPAGE="https://github.com/janestreet/core_kernel" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1-with-linking-exception" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +# Wants quickcheck_deprecated for now +RESTRICT="test" + +RDEPEND=" + >=dev-lang/ocaml-4.14 + dev-ml/base_quickcheck:= + dev-ml/core:${SLOT} + dev-ml/int_repr:${SLOT} + dev-ml/ppx_assert:= + dev-ml/ppx_bench:= + dev-ml/ppx_bin_prot:= + dev-ml/ppx_cold:= + dev-ml/ppx_compare:= + dev-ml/ppx_custom_printf:= + dev-ml/ppx_disable_unused_warnings:= + dev-ml/ppx_enumerate:= + dev-ml/ppx_expect:= + dev-ml/ppx_fields_conv:= + dev-ml/ppx_fixed_literal:= + dev-ml/ppx_globalize:= + dev-ml/ppx_hash:= + dev-ml/ppx_here:= + dev-ml/ppx_ignore_instrumentation:= + dev-ml/ppx_inline_test:= + dev-ml/ppx_let:= + dev-ml/ppx_log:= + dev-ml/ppx_module_timer:= + dev-ml/ppx_optcomp:${SLOT} + dev-ml/ppx_optional:= + dev-ml/ppx_pipebang:= + dev-ml/ppx_sexp_conv:= + dev-ml/ppx_sexp_message:= + dev-ml/ppx_sexp_value:= + dev-ml/ppx_stable:= + dev-ml/ppx_stable_witness:= + dev-ml/ppx_string:= + dev-ml/ppx_tydi:= + dev-ml/ppx_typerep_conv:= + dev-ml/ppx_variants_conv:= + dev-ml/ppxlib:= +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/core_kernel/metadata.xml b/dev-ml/core_kernel/metadata.xml index ec7db9c9396f..0af84898d98d 100644 --- a/dev-ml/core_kernel/metadata.xml +++ b/dev-ml/core_kernel/metadata.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <longdescription lang="en"> Core_kernel is the system-independent part of Core. It is aimed for diff --git a/dev-ml/core_profiler/Manifest b/dev-ml/core_profiler/Manifest deleted file mode 100644 index 150d077f47f7..000000000000 --- a/dev-ml/core_profiler/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST core_profiler-0.9.0.tar.gz 60467 BLAKE2B 55880be45c1bbad1dd0277d966cbfaae76f54bf8dea7953ac78e98143160fba19bba5d355e0b5417e33f48bfaabe0b936a55defc0337efa252b11c279c2fc7db SHA512 6d3ad9cef7dd500642bf139503fc873668ca69733c29a4bcb224b27cad604422d87626431f38f29088807f577c4a6445fdc67531329bbcd842b0921976cbe5f9 diff --git a/dev-ml/core_profiler/core_profiler-0.9.0.ebuild b/dev-ml/core_profiler/core_profiler-0.9.0.ebuild deleted file mode 100644 index bf5b496ea736..000000000000 --- a/dev-ml/core_profiler/core_profiler-0.9.0.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Jane Street's profiling library" -HOMEPAGE="https://github.com/janestreet/core_profiler" -SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND=" - dev-lang/ocaml:= - dev-ml/core:= - dev-ml/core_extended:= - dev-ml/ppx_driver:= - dev-ml/ppx_jane:= - dev-ml/re2:= - dev-ml/textutils:= - dev-ml/ocaml-migrate-parsetree:= - " -DEPEND="${RDEPEND} dev-ml/opam dev-ml/jbuilder" - -src_install() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - ${PN}.install || die -} diff --git a/dev-ml/core_profiler/metadata.xml b/dev-ml/core_profiler/metadata.xml deleted file mode 100644 index 5547e488ffc3..000000000000 --- a/dev-ml/core_profiler/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">janestreet/core_profiler</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/core_unix/Manifest b/dev-ml/core_unix/Manifest new file mode 100644 index 000000000000..a6a26540f675 --- /dev/null +++ b/dev-ml/core_unix/Manifest @@ -0,0 +1,3 @@ +DIST core_unix-0.15.0.tar.gz 377928 BLAKE2B 49b58471a28c356bdf39f15e22bd21ec4363182cf744c0455847ffc15015fdad2928a428986c2a9edff647ebef9f2ad2059b184b393e979119c8f007f67ec140 SHA512 eeb53bd0c06a7d1facfb133f0a45a232d57941eff644d4ed6c2d5002acd4e6b323376ec9c05838f760ebd9da3fbc39332989ed50b3921191c175811c947fcbfe +DIST core_unix-0.15.2.tar.gz 377836 BLAKE2B 56551ab1509bfecc59ae4b45aaaa4d336415cffe9339932239c884bc86207bdb4066aace35144618509b78b461164bdfaaaa04030ecb1b3619de6f8fe5c3a7b9 SHA512 6d59c52111235f952f3052fb86af1d7380ff3d8d89b5c8d59a66d530a14d462fa4b06cdf29f2ee2b4356a574dbefef33b82f60f9fba512942bc0e6aad07f2b6f +DIST core_unix-0.16.0.tar.gz 391719 BLAKE2B 29105ee1b8342241dbea136207d221af04d9412a74412fb4fd532f08b22b842125a72e69a47d36129a99c04cd3a83e605bc42b970d79a52420b3e273bd9915d5 SHA512 e38a126af832360f0e0079919b930f3fa99b02935c35372b1ed8c7e174af335de2f4dcb8da90be8f9f524542752dd5c62ec6192eb327d7cc6313b7402b0f7f65 diff --git a/dev-ml/core_unix/core_unix-0.15.0.ebuild b/dev-ml/core_unix/core_unix-0.15.0.ebuild new file mode 100644 index 000000000000..8ab4e487041f --- /dev/null +++ b/dev-ml/core_unix/core_unix-0.15.0.ebuild @@ -0,0 +1,25 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit dune + +DESCRIPTION="Unix-specific portions of Core" +HOMEPAGE="https://github.com/janestreet/core_unix" +SRC_URI="https://github.com/janestreet/${PN}/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" +IUSE="+ocamlopt" + +DEPEND=" + dev-ml/core_kernel:${SLOT} + dev-ml/expect_test_helpers_core:${SLOT} + dev-ml/ocaml_intrinsics:${SLOT} + dev-ml/timezone:${SLOT} + dev-ml/spawn:${SLOT} +" +RDEPEND="${DEPEND}" +BDEPEND="" diff --git a/dev-ml/core_unix/core_unix-0.15.2-r1.ebuild b/dev-ml/core_unix/core_unix-0.15.2-r1.ebuild new file mode 100644 index 000000000000..3eda89d3b5f9 --- /dev/null +++ b/dev-ml/core_unix/core_unix-0.15.2-r1.ebuild @@ -0,0 +1,38 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit dune toolchain-funcs + +DESCRIPTION="Unix-specific portions of Core" +HOMEPAGE="https://github.com/janestreet/core_unix" +SRC_URI="https://github.com/janestreet/${PN}/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-lang/ocaml-4.09 + dev-ml/core:= + dev-ml/core_kernel:${SLOT} + dev-ml/expect_test_helpers_core:${SLOT} + dev-ml/ocaml_intrinsics:${SLOT} + dev-ml/spawn:${SLOT} + dev-ml/timezone:${SLOT} +" +RDEPEND="${DEPEND}" +BDEPEND="" + +PATCHES=( "${FILESDIR}"/${P}-musl.patch ) + +src_prepare() { + sed -i \ + -e "s:gcc:$(tc-getCC):" \ + unix_pseudo_terminal/src/discover.sh \ + || die + + default +} diff --git a/dev-ml/core_unix/core_unix-0.16.0-r1.ebuild b/dev-ml/core_unix/core_unix-0.16.0-r1.ebuild new file mode 100644 index 000000000000..1f91c21dfc4f --- /dev/null +++ b/dev-ml/core_unix/core_unix-0.16.0-r1.ebuild @@ -0,0 +1,39 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit dune toolchain-funcs + +DESCRIPTION="Unix-specific portions of Core" +HOMEPAGE="https://github.com/janestreet/core_unix" +SRC_URI="https://github.com/janestreet/${PN}/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-lang/ocaml-4.14 + dev-ml/core:= + dev-ml/core_kernel:${SLOT} + dev-ml/expect_test_helpers_core:${SLOT} + dev-ml/ocaml_intrinsics:${SLOT} + >=dev-ml/spawn-0.15:= + dev-ml/re:= + dev-ml/timezone:${SLOT} +" +RDEPEND="${DEPEND}" +BDEPEND="" + +PATCHES=( "${FILESDIR}"/${P}-musl.patch ) + +src_prepare() { + sed -i \ + -e "s:gcc:$(tc-getCC):" \ + unix_pseudo_terminal/src/discover.sh \ + || die + + default +} diff --git a/dev-ml/core_unix/files/core_unix-0.15.2-musl.patch b/dev-ml/core_unix/files/core_unix-0.15.2-musl.patch new file mode 100644 index 000000000000..fb1101426ba2 --- /dev/null +++ b/dev-ml/core_unix/files/core_unix-0.15.2-musl.patch @@ -0,0 +1,11 @@ +--- a/bigstring_unix/src/bigstring_unix_stubs.c 2023-04-20 21:13:23.374157594 +0200 ++++ b/bigstring_unix/src/bigstring_unix_stubs.c 2023-04-20 21:13:32.900011808 +0200 +@@ -699,7 +699,7 @@ + int count = Int_val(v_count); + size_t total_len = 0; + struct iovec *iovecs = copy_iovecs(&total_len, v_iovecs, count); +- struct msghdr msghdr = { NULL, 0, NULL, 0, NULL, 0, 0 }; ++ struct msghdr msghdr = { NULL }; + ssize_t ret; + if (total_len > THREAD_IO_CUTOFF || contains_mmapped(v_iovecs, count)) { + Begin_roots1(v_iovecs); diff --git a/dev-ml/core_unix/files/core_unix-0.16.0-musl.patch b/dev-ml/core_unix/files/core_unix-0.16.0-musl.patch new file mode 100644 index 000000000000..e37ad2f8454a --- /dev/null +++ b/dev-ml/core_unix/files/core_unix-0.16.0-musl.patch @@ -0,0 +1,11 @@ +--- a/bigstring_unix/src/bigstring_unix_stubs.c 2023-07-08 18:01:05.614573701 +0200 ++++ b/bigstring_unix/src/bigstring_unix_stubs.c 2023-07-08 18:01:20.505598860 +0200 +@@ -743,7 +743,7 @@ + int count = Int_val(v_count); + size_t total_len = 0; + struct iovec *iovecs = copy_iovecs(&total_len, v_iovecs, count); +- struct msghdr msghdr = {NULL, 0, NULL, 0, NULL, 0, 0}; ++ struct msghdr msghdr = {NULL}; + ssize_t ret; + if (total_len > THREAD_IO_CUTOFF || contains_mmapped(v_iovecs, count)) { + Begin_roots1(v_iovecs); diff --git a/dev-ml/core_unix/metadata.xml b/dev-ml/core_unix/metadata.xml new file mode 100644 index 000000000000..75a95cdd0266 --- /dev/null +++ b/dev-ml/core_unix/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">janestreet/core_unix</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/cppo/Manifest b/dev-ml/cppo/Manifest index 73332ee2ac20..c78c612361f0 100644 --- a/dev-ml/cppo/Manifest +++ b/dev-ml/cppo/Manifest @@ -1,2 +1,3 @@ -DIST cppo-1.4.1.tar.gz 26547 BLAKE2B a93802fb36cfb622de32a00f6ad6d0fbc7c1022a65ab70558273654b817ca16a988fb8ce8c5dd0751e80eef066f3fcb82f25fc572edb312f346cd20830c08f5a SHA512 efbc82d2eb31b9e16c43ffbd7a2a56a5356934c32bee62205f55295a9342e4747ce13b9ad6572f3180e656b215a9255d402712ff7bae1ef9e8eccdabb2d00c16 -DIST cppo-1.5.0.tar.gz 26963 BLAKE2B 4118637bd8bcfc2edae4c7bf0d839b82ba3402c2f4df9de81bcb28685e4112ff364cb607dc9dcdc3512cc4fdf8dfb4cb85ceca945230bd7cd5d04e525d4e6587 SHA512 2cc144815b818242b6bb1dee213aa65345620eaf1afe59b25d118399d9a02d577aa9dc61dd5756661e44411acccdb2fc0320a8984e5f0d2a7390fcc816bac7e0 +DIST cppo-1.6.7.tar.gz 29032 BLAKE2B cc02666ca5fbc903cf6a749ee08f7fe34bad4604635084bbf964afdde66783c01e3d48d515eb42a5188189fef67ebe7cf79c0205c60537c9d1a8b14f453fd248 SHA512 fb2865b4004fe3f17d5893659fca90c01557cf6be789500c54b06ac8e0d097181c9f6437f178aae6d786b3f6b639859bc68400f4a7c59e7acd4f296cf8271a9d +DIST cppo-1.6.8.tar.gz 29063 BLAKE2B 503c9dcc5f25cf69caa5057753ece9e107383a94d191a15f8056f7f417fa252147f2b2d3011493b80728aeca6979c0097e42b1d1af174784528959870366f5f9 SHA512 069bbe0ef09c03b0dc4b5795f909c3ef872fe99c6f1e6704a0fa97594b1570b3579226ec67fe11d696ccc349a4585055bbaf07c65eff423aa45af28abf38c858 +DIST cppo-1.6.9.tar.gz 31210 BLAKE2B 4e2d9bea57d705bb59de6d7ec990cdd44d2492b7d104d95c9f947172e7e46f5302a0a55f981ce19e5a2fd4b2de2209b4adae478235aca0729920dcba11c07b9b SHA512 26ff5a7b7f38c460661974b23ca190f0feae3a99f1974e0fd12ccf08745bd7d91b7bc168c70a5385b837bfff9530e0e4e41cf269f23dd8cf16ca658008244b44 diff --git a/dev-ml/cppo/cppo-1.4.1.ebuild b/dev-ml/cppo/cppo-1.4.1.ebuild deleted file mode 100644 index e9730dd44aa4..000000000000 --- a/dev-ml/cppo/cppo-1.4.1.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit findlib - -DESCRIPTION="An equivalent of the C preprocessor for OCaml programs" -HOMEPAGE="http://mjambon.com/cppo.html" -SRC_URI="https://github.com/mjambon/cppo/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -SLOT="0/${PV}" -LICENSE="BSD" -KEYWORDS="amd64 ~arm ppc x86" - -IUSE="examples" - -RDEPEND=">=dev-lang/ocaml-3.12:= - dev-ml/ocamlbuild:=" -DEPEND="${RDEPEND}" - -src_install() { - findlib_src_preinst - mkdir -p "${ED}"/usr/bin - emake PREFIX="${ED}"/usr install - dodoc README.md Changes - if use examples ; then - dodoc -r examples - docompress -x /usr/share/doc/${PF}/examples - fi -} diff --git a/dev-ml/cppo/cppo-1.5.0.ebuild b/dev-ml/cppo/cppo-1.5.0.ebuild deleted file mode 100644 index edc62efc16d9..000000000000 --- a/dev-ml/cppo/cppo-1.5.0.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit findlib - -DESCRIPTION="An equivalent of the C preprocessor for OCaml programs" -HOMEPAGE="http://mjambon.com/cppo.html https://github.com/mjambon/cppo/" -SRC_URI="https://github.com/mjambon/cppo/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -SLOT="0/${PV}" -LICENSE="BSD" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" - -IUSE="examples +ocamlopt" - -RDEPEND=" - >=dev-lang/ocaml-3.12:=[ocamlopt?] - dev-ml/ocamlbuild:=[ocamlopt?]" -DEPEND="${RDEPEND}" - -src_compile() { - use ocamlopt || sed -e 's/ocamlbuild_cppo.cmx/ocamlbuild_cppo.cmo/' -i Makefile - emake BEST="$(usex ocamlopt '.native' '.byte')" $(usex ocamlopt opt all) ocamlbuild -} - -src_install() { - findlib_src_preinst - mkdir -p "${ED}"/usr/bin - emake PREFIX="${ED}"/usr BEST="$(usex ocamlopt '.native' '.byte')" install - dodoc README.md Changes - if use examples ; then - dodoc -r examples - docompress -x /usr/share/doc/${PF}/examples - fi -} diff --git a/dev-ml/cppo/cppo-1.6.7-r1.ebuild b/dev-ml/cppo/cppo-1.6.7-r1.ebuild new file mode 100644 index 000000000000..1753b6f23aba --- /dev/null +++ b/dev-ml/cppo/cppo-1.6.7-r1.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="An equivalent of the C preprocessor for OCaml programs" +HOMEPAGE="https://github.com/ocaml-community/cppo/" +SRC_URI="https://github.com/ocaml-community/cppo/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +SLOT="0/${PV}" +LICENSE="BSD" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt" + +RDEPEND="dev-ml/ocamlbuild:= + dev-ml/findlib:=" +DEPEND="${RDEPEND}" diff --git a/dev-ml/cppo/cppo-1.6.8-r1.ebuild b/dev-ml/cppo/cppo-1.6.8-r1.ebuild new file mode 100644 index 000000000000..66030d3bfc18 --- /dev/null +++ b/dev-ml/cppo/cppo-1.6.8-r1.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="An equivalent of the C preprocessor for OCaml programs" +HOMEPAGE="https://github.com/ocaml-community/cppo/" +SRC_URI="https://github.com/ocaml-community/cppo/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +SLOT="0/${PV}" +LICENSE="BSD" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +RDEPEND="dev-ml/ocamlbuild:= + dev-ml/findlib:=" +DEPEND="${RDEPEND}" diff --git a/dev-ml/cppo/cppo-1.6.9-r1.ebuild b/dev-ml/cppo/cppo-1.6.9-r1.ebuild new file mode 100644 index 000000000000..fc0b069b6af4 --- /dev/null +++ b/dev-ml/cppo/cppo-1.6.9-r1.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="An equivalent of the C preprocessor for OCaml programs" +HOMEPAGE="https://github.com/ocaml-community/cppo/" +SRC_URI="https://github.com/ocaml-community/cppo/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +SLOT="0/${PV}" +LICENSE="BSD" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +RDEPEND="dev-ml/ocamlbuild:= + dev-ml/findlib:=" +DEPEND="${RDEPEND}" diff --git a/dev-ml/cppo/metadata.xml b/dev-ml/cppo/metadata.xml index 2edf61a57ad6..6232d0077e7f 100644 --- a/dev-ml/cppo/metadata.xml +++ b/dev-ml/cppo/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> - <remote-id type="github">mjambon/cppo</remote-id> + <remote-id type="github">ocaml-community/cppo</remote-id> </upstream> </pkgmetadata> diff --git a/dev-ml/cryptokit/Manifest b/dev-ml/cryptokit/Manifest index 7876c2395d34..9c7817ee97ca 100644 --- a/dev-ml/cryptokit/Manifest +++ b/dev-ml/cryptokit/Manifest @@ -1,3 +1 @@ -DIST cryptokit-1.10.tar.gz 152525 BLAKE2B 51c905757ad141292be89707bdab5c83a1f3e9e2665202cbf17e12b115591c57b77b759b4fa2967d1f00b4cf5bd87445a2189b4d222d5d1613e19c32e1054189 SHA512 22564e0151c492963d75fb81780b3a884a0bf613ad09380d9b5365740fd9c4bbdaa1c21fed50a1a4934dce920d90f5c86dc014f90e52677544789311f7bded4f -DIST cryptokit-1.11.tar.gz 156905 BLAKE2B 3fc77321c0d525a32f5733d77963b5df4e618b3168f2f00aceeb1e13b16cc202e79b50afa93c0769f016b4e43061ff19851c8ba3f40ad7f8f0c9ff78a51d68e7 SHA512 cc641a05a67cd3d2e5ec481e8d426796db625ab60e89f79bde2e360730892c62f30ea2e37c4b028df16471220847e6d7ce4984deb9528fec6647a17fc4ae1b0d -DIST cryptokit-1.12.tar.gz 157920 BLAKE2B c26d0642f02cf19502bfce043bfb542bfb7a8e80ac2c7dfbecce48b57d44eddd5f279ceec1166fd2e81e1a8446bb52fa748d89a3f7506860fe1c545784087469 SHA512 f99c50578360c7671029a0c4603b355912899596ea7baf55cb2f94e039658646396f1307417a24b3d87a535d272bed90e79d5e027af034c2c742140c44ec61ff +DIST cryptokit-1.16.1.tar.gz 120607 BLAKE2B fbb89c4dabef8f09614003acc2b8173fdfdacb36793fd20f4415ebec04f3759537739eccd7b9d143df0163816b9db65c221c2b83408c9ac3aa7f9bf7b63876c6 SHA512 28913a7c35ae951a4c464287acc511ee1bdc9d03b5928e2243c5ae5cbb8b10afe8e84d7a73ba6478ed62657d01fdb6f02472739255c33de3671c4130b659da52 diff --git a/dev-ml/cryptokit/cryptokit-1.10.ebuild b/dev-ml/cryptokit/cryptokit-1.10.ebuild deleted file mode 100644 index e71c0d2103d8..000000000000 --- a/dev-ml/cryptokit/cryptokit-1.10.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -OASIS_BUILD_DOCS=1 -OASIS_BUILD_TESTS=1 - -inherit oasis - -DESCRIPTION="Cryptographic primitives library for Objective Caml" -HOMEPAGE="http://forge.ocamlcore.org/projects/cryptokit/" -SRC_URI="http://forge.ocamlcore.org/frs/download.php/1493/${P}.tar.gz" -LICENSE="LGPL-2" -SLOT="0/${PV}" -KEYWORDS="amd64 ppc x86 ~x86-fbsd" -IUSE="zlib" - -DEPEND="zlib? ( >=sys-libs/zlib-1.1 )" -RDEPEND="${DEPEND}" - -DOCS=( "Changes" "README.txt" "AUTHORS.txt" ) - -src_configure() { - oasis_configure_opts="$(use_enable zlib)" \ - oasis_src_configure -} - -pkg_postinst() { - elog "" - elog "This library uses the /dev/random device to generate " - elog "random data and RSA keys. The device should either be" - elog "built into the kernel or provided as a module. An" - elog "alternative is to use the Entropy Gathering Daemon" - elog "(http://egd.sourceforge.net). Please note that the" - elog "remainder of the library will still work even in the" - elog "absence of a one of these sources of randomness." - elog "" -} - -src_test() { - echo "" - einfo "You must have either /dev/random or the Entropy Gathering" - einfo "Daemon (EGD) for this test to succeed!" - echo "" - - oasis_src_test -} diff --git a/dev-ml/cryptokit/cryptokit-1.11.ebuild b/dev-ml/cryptokit/cryptokit-1.11.ebuild deleted file mode 100644 index bf0d90a57e84..000000000000 --- a/dev-ml/cryptokit/cryptokit-1.11.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -OASIS_BUILD_DOCS=1 -OASIS_BUILD_TESTS=1 - -inherit oasis - -DESCRIPTION="Cryptographic primitives library for Objective Caml" -HOMEPAGE="http://forge.ocamlcore.org/projects/cryptokit/" -SRC_URI="http://forge.ocamlcore.org/frs/download.php/1618/${P}.tar.gz" -LICENSE="LGPL-2" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd" -IUSE="zlib" - -DEPEND="zlib? ( >=sys-libs/zlib-1.1 ) - dev-ml/zarith:=" -RDEPEND="${DEPEND}" - -DOCS=( "Changes" "README.txt" "AUTHORS.txt" ) -REQUIRED_USE="test? ( ocamlopt )" - -src_configure() { - oasis_configure_opts="$(use_enable zlib)" \ - oasis_src_configure -} - -pkg_postinst() { - elog "" - elog "This library uses the /dev/random device to generate " - elog "random data and RSA keys. The device should either be" - elog "built into the kernel or provided as a module. An" - elog "alternative is to use the Entropy Gathering Daemon" - elog "(http://egd.sourceforge.net). Please note that the" - elog "remainder of the library will still work even in the" - elog "absence of a one of these sources of randomness." - elog "" -} - -src_test() { - echo "" - einfo "You must have either /dev/random or the Entropy Gathering" - einfo "Daemon (EGD) for this test to succeed!" - echo "" - - oasis_src_test -} diff --git a/dev-ml/cryptokit/cryptokit-1.12.ebuild b/dev-ml/cryptokit/cryptokit-1.16.1-r2.ebuild index e728f55a1dde..98b63a2cad4c 100644 --- a/dev-ml/cryptokit/cryptokit-1.12.ebuild +++ b/dev-ml/cryptokit/cryptokit-1.16.1-r2.ebuild @@ -1,33 +1,44 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=7 -OASIS_BUILD_DOCS=1 -OASIS_BUILD_TESTS=1 - -inherit oasis versionator +inherit dune +MY_PV="$(ver_rs 1- '')" DESCRIPTION="Cryptographic primitives library for Objective Caml" HOMEPAGE="https://github.com/xavierleroy/cryptokit" -SRC_URI="https://github.com/xavierleroy/cryptokit/archive/release$(replace_all_version_separators '').tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/xavierleroy/cryptokit/archive/release${MY_PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-release${MY_PV}" + LICENSE="LGPL-2" SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~x86-fbsd" -IUSE="zlib" - -DEPEND="zlib? ( >=sys-libs/zlib-1.1 ) - dev-ml/zarith:=" +KEYWORDS="amd64 ~arm ~arm64 ~ppc x86" +IUSE="cpu_flags_x86_aes +ocamlopt test zlib" +REQUIRED_USE="test? ( ocamlopt )" +RESTRICT="!test? ( test )" + +# We can't use mpir on zarith +# (until it gains mpz_powm_sec?) +# bug #750740 +DEPEND=" + dev-ml/dune-configurator + dev-ml/zarith:=[-mpir(-)] + zlib? ( >=sys-libs/zlib-1.1 ) +" RDEPEND="${DEPEND}" DOCS=( "Changes" "README.txt" "AUTHORS.txt" ) -REQUIRED_USE="test? ( ocamlopt )" - -S="${WORKDIR}/${PN}-release$(replace_all_version_separators '')" src_configure() { - oasis_configure_opts="$(use_enable zlib)" \ - oasis_src_configure + # Don't build in src_configure + sed -i -e 's:exit (Sys.command "dune build @configure --release")::' configure || die + + # It's not autotools (or even close), it's a Dune wrapper. + ./configure \ + $(use_enable cpu_flags_x86_aes hardwaresupport) \ + $(use_enable zlib) \ + || die } pkg_postinst() { @@ -48,5 +59,5 @@ src_test() { einfo "Daemon (EGD) for this test to succeed!" echo "" - oasis_src_test + dune_src_test } diff --git a/dev-ml/cryptokit/metadata.xml b/dev-ml/cryptokit/metadata.xml index fad2f6d52138..090898169d22 100644 --- a/dev-ml/cryptokit/metadata.xml +++ b/dev-ml/cryptokit/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">xavierleroy/cryptokit</remote-id> </upstream> diff --git a/dev-ml/csexp/Manifest b/dev-ml/csexp/Manifest new file mode 100644 index 000000000000..66dc0eff7c21 --- /dev/null +++ b/dev-ml/csexp/Manifest @@ -0,0 +1,3 @@ +DIST csexp-1.3.2.tbz 9775 BLAKE2B b1afea15558a5520abab214874653e9768ebbb22e064b51dab2f5bd5543460e357f9e1cba964341bcb24c5d53d8477de5458186e4d83db21d99a8ca45009d818 SHA512 ff1bd6a7c6bb3a73ca9ab0506c9ec1f357657deaa9ecc7eb32955817d9b0f266d976af3e2b8fc34c621cb0caf1fde55f9a609dd184e2054f500bf09afeb83026 +DIST csexp-1.5.1.tbz 10082 BLAKE2B 71d6844d5ae37d64c4b29ed8e2479869bda23bc8b352acc17a83a061acb6bb2dc223e3e9aba444c87949137123a716450a0c665c2c109bd98dcd702931e4a2be SHA512 d785bbabaff9f6bf601399149ef0a42e5e99647b54e27f97ef1625907793dda22a45bf83e0e8a1eba2c63634c5484b54739ff0904ef556f5fc592efa38af7505 +DIST csexp-1.5.2.tbz 11447 BLAKE2B 2c0481fa1e713e86f0146acdae132b645374deb813c085e0c65881c1edcee45ebfc863d13b9e5fa15d236f1a5634c4549248fe986afff71edf47ab9d648aa552 SHA512 be281018bcfc20d4db14894ef51c4b836d6338d2fdfe22e63d46f405f8dea7349e16f1c0ecd65f73d4c85a2a80e618cdbb8c9dafcbb9f229f04f1adca5b1973c diff --git a/dev-ml/csexp/csexp-1.3.2-r1.ebuild b/dev-ml/csexp/csexp-1.3.2-r1.ebuild new file mode 100644 index 000000000000..b7b8f4dc2420 --- /dev/null +++ b/dev-ml/csexp/csexp-1.3.2-r1.ebuild @@ -0,0 +1,20 @@ +# Copyright 2020-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Parsing and printing of S-expressions in Canonical form" +HOMEPAGE="https://github.com/ocaml-dune/csexp" +SRC_URI="https://github.com/ocaml-dune/csexp/releases/download/${PV}/${P}.tbz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=">=dev-ml/result-1.5:=[ocamlopt=]" +DEPEND="${RDEPEND} + test? ( dev-ml/ppx_expect )" diff --git a/dev-ml/csexp/csexp-1.5.1.ebuild b/dev-ml/csexp/csexp-1.5.1.ebuild new file mode 100644 index 000000000000..aecdb9a85427 --- /dev/null +++ b/dev-ml/csexp/csexp-1.5.1.ebuild @@ -0,0 +1,20 @@ +# Copyright 2020-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Parsing and printing of S-expressions in Canonical form" +HOMEPAGE="https://github.com/ocaml-dune/csexp" +SRC_URI="https://github.com/ocaml-dune/csexp/releases/download/${PV}/${P}.tbz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=">=dev-ml/result-1.5:=[ocamlopt=]" +DEPEND="${RDEPEND} + test? ( dev-ml/ppx_expect )" diff --git a/dev-ml/csexp/csexp-1.5.2.ebuild b/dev-ml/csexp/csexp-1.5.2.ebuild new file mode 100644 index 000000000000..ce18d6efa6e7 --- /dev/null +++ b/dev-ml/csexp/csexp-1.5.2.ebuild @@ -0,0 +1,20 @@ +# Copyright 2020-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Parsing and printing of S-expressions in Canonical form" +HOMEPAGE="https://github.com/ocaml-dune/csexp/" +SRC_URI="https://github.com/ocaml-dune/csexp/releases/download/${PV}/${P}.tbz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=">=dev-ml/result-1.5:=[ocamlopt=]" +DEPEND="${RDEPEND}" +BDEPEND="test? ( dev-ml/ppx_expect )" diff --git a/dev-ml/csexp/metadata.xml b/dev-ml/csexp/metadata.xml new file mode 100644 index 000000000000..91c7ff5fbe17 --- /dev/null +++ b/dev-ml/csexp/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">ocaml-dune/csexp</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/csv/Manifest b/dev-ml/csv/Manifest deleted file mode 100644 index 7a186cb5fe25..000000000000 --- a/dev-ml/csv/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST csv-1.5.tar.gz 83642 BLAKE2B e07303a4be8c4e75964b4ecc38da59de288e12b433ecb4a5d5450b21411b2343b38853cdf2737516185867d2f3963cc374c9ec34df96332b5844bbd850fb7c89 SHA512 1c8af0ce8abd8a5710115c194eee34928399964447309ee974665cf427396def42bca4f983904bfec706f7944aea419a87bf54bc6c379cb8b7372be801be4126 -DIST csv-1.6.tar.gz 98194 BLAKE2B 1c7975ec92bcd63cdeee369e8a3507b6ef95cf646cba2f5498983a18098f8147a26d7ae57a37904a3f1cc21085e7f2f2ffc9ec7bca836d6edc31a45d2de4c0a3 SHA512 689dae2dd57ec914ca1dd5e3d34ebd352aabb7d5da8933aa6c6fc9c6ec84dc538d1df8a1c46f3e172ab09e5917e9158be76afb2423ec8a92eef489ac5dfd5175 -DIST csv-1.7.tar.gz 45160 BLAKE2B 2f51f927d9099382a227e20471e60075f8796d7753152e266c121f705e4dab7036659937630302f152cd8f28d6db1aee3d5c72c339a45477292ee03c4bc461ab SHA512 cbe3d316e6f99318b3958bbfba3308225e709afb481a333d314adb66c20683171c23ac0565fc8d8e936b9dad13b9330b5208340b9fc671b4ccddf3a7d8b82b3e diff --git a/dev-ml/csv/csv-1.5.ebuild b/dev-ml/csv/csv-1.5.ebuild deleted file mode 100644 index 29be7c1a8b6c..000000000000 --- a/dev-ml/csv/csv-1.5.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -OASIS_BUILD_DOCS=1 -OASIS_BUILD_TESTS=1 - -inherit oasis - -DESCRIPTION="A pure OCaml library to read and write CSV files" -HOMEPAGE="https://github.com/Chris00/ocaml-csv" -SRC_URI="https://github.com/Chris00/ocaml-csv/releases/download/${PV}/${P}.tar.gz" - -LICENSE="LGPL-2.1-with-linking-exception" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND}" - -DOCS=( "README.txt" "AUTHORS.txt" ) diff --git a/dev-ml/csv/csv-1.6.ebuild b/dev-ml/csv/csv-1.6.ebuild deleted file mode 100644 index 1d0efd903991..000000000000 --- a/dev-ml/csv/csv-1.6.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -OASIS_BUILD_DOCS=1 -OASIS_BUILD_TESTS=1 - -inherit oasis - -DESCRIPTION="A pure OCaml library to read and write CSV files" -HOMEPAGE="https://github.com/Chris00/ocaml-csv" -SRC_URI="https://github.com/Chris00/ocaml-csv/releases/download/${PV}/${P}.tar.gz" - -LICENSE="LGPL-2.1-with-linking-exception" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="+lwt" - -DEPEND="lwt? ( dev-ml/lwt:= )" -RDEPEND="${DEPEND}" - -DOCS=( "README.txt" "AUTHORS.txt" ) - -src_configure() { - oasis_configure_opts="$(use_enable lwt)" \ - oasis_src_configure -} diff --git a/dev-ml/csv/csv-1.7.ebuild b/dev-ml/csv/csv-1.7.ebuild deleted file mode 100644 index 817e095edb27..000000000000 --- a/dev-ml/csv/csv-1.7.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -OASIS_BUILD_DOCS=1 -OASIS_BUILD_TESTS=1 - -inherit oasis - -DESCRIPTION="A pure OCaml library to read and write CSV files" -HOMEPAGE="https://github.com/Chris00/ocaml-csv" -SRC_URI="https://github.com/Chris00/ocaml-csv/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1-with-linking-exception" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="+lwt" - -DEPEND="lwt? ( dev-ml/lwt:= )" -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} - dev-ml/oasis" - -DOCS=( "README.txt" "AUTHORS.txt" ) - -S="${WORKDIR}/ocaml-${P}" - -src_prepare() { - default - oasis setup || die -} - -src_configure() { - oasis_configure_opts="$(use_enable lwt)" \ - oasis_src_configure -} diff --git a/dev-ml/csv/metadata.xml b/dev-ml/csv/metadata.xml deleted file mode 100644 index 5008ee553fa7..000000000000 --- a/dev-ml/csv/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">Chris00/ocaml-csv</remote-id> - </upstream> - <use> - <flag name="lwt">Enables the Lwt-based library for asynchronous operations.</flag> - </use> -</pkgmetadata> diff --git a/dev-ml/cudf/Manifest b/dev-ml/cudf/Manifest index ab42e9125e18..a07656110da7 100644 --- a/dev-ml/cudf/Manifest +++ b/dev-ml/cudf/Manifest @@ -1 +1,2 @@ -DIST cudf-0.8.tar.gz 55147 BLAKE2B c091a55e438979f73bfd5fd16f1e793ec984b24becc902e6eed856afea0f39586001174847b8626bbf162c2b51cbb98cdb60d9539c9aac0a1d651b693e686704 SHA512 cea9e51094076089b1beb657f6b2ccc6ac5f49660e06743f8ec646b277beb4c830f90156ae240a6903de55d09caee78fb0dc75efd76ca65fd2b40ab8756301e3 +DIST cudf-0.9.tar.gz 55124 BLAKE2B 013f97d13b732674a7d0f9188590bbb8150ae9dc32ce26b56fb04848629fb27a3c850aa327e687d6aa80eb62ba6f67af2fcf86a647520e73d7f76748871a79cc SHA512 4abdd1a5a3d616273abe9dda87450a922ecd69b64d32f34d8fa3086bbd07fd23ffb01c24b128bf4d1c0c817cfa1da8029e743d33b3ad6a04e7a8f706b098c427 +DIST cudf-v0.10.tar.bz2 47664 BLAKE2B 6ecdfc4243d80f12f6904b334f93ff47beb94535b6ba84992c6a31d244a7c2dcb6072e67828d96b31d4628bb244022fd962efcdcae5299f5a57694f3aa6c95a8 SHA512 b36ecad224070d2c07d4123fb7e39160390ddec4196505e66aad9fbd982bd7ca320ff5f0e771e7996da49bff22fb87fc057060277695b75cd68de19e57cb3855 diff --git a/dev-ml/cudf/cudf-0.10.ebuild b/dev-ml/cudf/cudf-0.10.ebuild new file mode 100644 index 000000000000..00c999757bff --- /dev/null +++ b/dev-ml/cudf/cudf-0.10.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune toolchain-funcs + +MYP=${PN}-v${PV} +DESCRIPTION="Library to parse, pretty print, and evaluate CUDF documents" +HOMEPAGE="http://www.mancoosi.org/cudf/" +SRC_URI="https://gitlab.com/irill/${PN}/-/archive/v${PV}/${MYP}.tar.bz2" + +LICENSE="LGPL-3" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt llvm-libunwind test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-lang/ocaml-3.12:=[ocamlopt?] + dev-ml/extlib:= + dev-ml/findlib:= + dev-libs/glib:2 + llvm-libunwind? ( sys-libs/llvm-libunwind:= ) + !llvm-libunwind? ( sys-libs/libunwind:= ) + sys-libs/ncurses:= +" +DEPEND="${RDEPEND} + test? ( dev-ml/ounit2 ) + dev-ml/ocamlbuild + dev-lang/perl +" +BDEPEND="virtual/pkgconfig" + +QA_FLAGS_IGNORED='.*' + +S="${WORKDIR}"/${MYP} + +src_prepare() { + default + + sed -i \ + -e 's|make|$(MAKE)|g' \ + Makefile || die + sed -i \ + -e 's|-lncurses|$(shell ${PKG_CONFIG} --libs ncurses glib-2.0) -lunwind|g' \ + -e "s|ar r|$(tc-getAR) r|g" \ + c-lib/Makefile || die + sed -i \ + -e 's|-lcurses|$(shell ${PKG_CONFIG} --libs ncurses glib-2.0) -lunwind|g' \ + c-lib/Makefile.variants || die + + tc-export CC PKG_CONFIG + + sed -i \ + -e "s|-lncurses|$( $(tc-getPKG_CONFIG) --libs ncurses)|g" \ + c-lib/cudf.pc.in || die +} + +src_compile() { + dune_src_compile + emake c-lib + if use ocamlopt ; then + emake c-lib-opt + fi +} + +src_test() { + dune_src_test + emake c-lib-test +} + +src_install() { + dune_src_install + mv "${ED}"/usr/share/doc/${PF}/{cudf/README,} || die + rmdir "${ED}"/usr/share/doc/${PF}/cudf || die + emake DESTDIR="${ED}" -C c-lib/ LIBDIR="/usr/$(get_libdir)" -e install + dodoc BUGS ChangeLog +} diff --git a/dev-ml/cudf/cudf-0.8-r1.ebuild b/dev-ml/cudf/cudf-0.8-r1.ebuild deleted file mode 100644 index 4798b763acc6..000000000000 --- a/dev-ml/cudf/cudf-0.8-r1.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit multilib toolchain-funcs - -DESCRIPTION="Library to parse, pretty print, and evaluate CUDF documents" -HOMEPAGE="http://www.mancoosi.org/cudf/" -SRC_URI="https://gforge.inria.fr/frs/download.php/file/34659/${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" -IUSE="+ocamlopt test" - -RDEPEND=" - >=dev-lang/ocaml-3.12:=[ocamlopt?] - dev-ml/extlib:= - dev-libs/glib:2 - dev-ml/camlp4:= - dev-ml/cppo:= -" -DEPEND="${RDEPEND} - test? ( dev-ml/ounit ) - dev-ml/findlib - dev-ml/ocamlbuild - dev-lang/perl -" - -src_prepare() { - sed -i \ - -e 's|make|$(MAKE)|g' \ - Makefile || die - sed -i \ - -e 's|-lncurses|$(shell ${PKG_CONFIG} --libs ncurses glib-2.0)|g' \ - c-lib/Makefile || die - sed -i \ - -e 's|-lcurses|$(shell ${PKG_CONFIG} --libs ncurses glib-2.0)|g' \ - c-lib/Makefile.variants || die - - tc-export CC PKG_CONFIG - - sed -i \ - -e "s|-lncurses|$( $(tc-getPKG_CONFIG) --libs ncurses)|g" \ - c-lib/cudf.pc.in || die -} - -src_compile() { - emake -j1 all - emake c-lib - if use ocamlopt ; then - emake -j1 opt - emake c-lib-opt - fi -} - -src_test() { - emake test - emake c-lib-test -} - -src_install() { - emake DESTDIR="${ED}" LIBDIR="/usr/$(get_libdir)" install - dodoc BUGS ChangeLog README TODO -} diff --git a/dev-ml/cudf/cudf-0.9-r2.ebuild b/dev-ml/cudf/cudf-0.9-r2.ebuild new file mode 100644 index 000000000000..8289f64c2ab2 --- /dev/null +++ b/dev-ml/cudf/cudf-0.9-r2.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +DESCRIPTION="Library to parse, pretty print, and evaluate CUDF documents" +HOMEPAGE="http://www.mancoosi.org/cudf/" +SRC_URI="https://gforge.inria.fr/frs/download.php/file/36602/${P}.tar.gz" + +LICENSE="LGPL-3" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt llvm-libunwind test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-lang/ocaml-3.12:=[ocamlopt?] + dev-ml/extlib:= + dev-ml/findlib:= + dev-libs/glib:2 + llvm-libunwind? ( sys-libs/llvm-libunwind:= ) + !llvm-libunwind? ( sys-libs/libunwind:= ) + sys-libs/ncurses:= +" +DEPEND="${RDEPEND} + test? ( dev-ml/ounit2 ) + dev-ml/ocamlbuild + dev-lang/perl +" +BDEPEND="virtual/pkgconfig" + +PATCHES=( "${FILESDIR}/ounit2.patch" ) + +QA_FLAGS_IGNORED='.*' + +src_prepare() { + default + + sed -i \ + -e 's|make|$(MAKE)|g' \ + Makefile || die + sed -i \ + -e 's|-lncurses|$(shell ${PKG_CONFIG} --libs ncurses glib-2.0) -lunwind|g' \ + -e "s|ar r|$(tc-getAR) r|g" \ + c-lib/Makefile || die + sed -i \ + -e 's|-lcurses|$(shell ${PKG_CONFIG} --libs ncurses glib-2.0) -lunwind|g' \ + c-lib/Makefile.variants || die + + tc-export CC PKG_CONFIG + + sed -i \ + -e "s|-lncurses|$( $(tc-getPKG_CONFIG) --libs ncurses)|g" \ + c-lib/cudf.pc.in || die +} + +src_compile() { + emake OCAMLBUILD="ocamlbuild -classic-display" -j1 all + emake OCAMLBUILD="ocamlbuild -classic-display" c-lib + if use ocamlopt ; then + emake OCAMLBUILD="ocamlbuild -classic-display" -j1 opt + emake OCAMLBUILD="ocamlbuild -classic-display" c-lib-opt + fi +} + +src_test() { + emake OCAMLBUILD="ocamlbuild -classic-display" test + emake OCAMLBUILD="ocamlbuild -classic-display" c-lib-test +} + +src_install() { + emake DESTDIR="${ED}" LIBDIR="/usr/$(get_libdir)" install + dodoc BUGS ChangeLog README TODO +} diff --git a/dev-ml/cudf/files/ounit2.patch b/dev-ml/cudf/files/ounit2.patch new file mode 100644 index 000000000000..5fbedbf26edf --- /dev/null +++ b/dev-ml/cudf/files/ounit2.patch @@ -0,0 +1,12 @@ +Index: cudf-0.9/_tags +=================================================================== +--- cudf-0.9.orig/_tags ++++ cudf-0.9/_tags +@@ -1,5 +1,5 @@ +-<test.ml> or <tests.ml> : pkg_oUnit +-<test.byte> or <test.native> : pkg_oUnit ++<test.ml> or <tests.ml> : pkg_ounit2 ++<test.byte> or <test.native> : pkg_ounit2 + + <*.ml> or <*.mli> : pkg_extlib + <*.byte> or <*.native> : pkg_extlib diff --git a/dev-ml/cudf/metadata.xml b/dev-ml/cudf/metadata.xml index ffac4d7ebc01..8d13239227d4 100644 --- a/dev-ml/cudf/metadata.xml +++ b/dev-ml/cudf/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> -</maintainer> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="gitlab">irill/cudf</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-ml/curses/Manifest b/dev-ml/curses/Manifest new file mode 100644 index 000000000000..4adfc30bb69e --- /dev/null +++ b/dev-ml/curses/Manifest @@ -0,0 +1,2 @@ +DIST curses-1.0.10.tbz 25780 BLAKE2B 62eba2e769571e73d22ed1cd698e64895be2a78fe53a98feffd98a0ee0914d765e8d9a997792721b7f2fb544d6db88c94e6e6946bf60cd1d3628a987a6891d60 SHA512 158626f3fd6931f30482a47ab149990ff49334c8c0dc966eb07d92f22e87faaab3fd48ed7788bbc5a77f82cb6163520588ce55ab53456bca22994f147c7e00c5 +DIST curses-1.0.11.tar.gz 28807 BLAKE2B dec943cbde1c4cc15572601e198872a8e17ae0de48f71923c6a8f110f65f2bc882ced5a343823ed83c98b9d30eae23564c013a49e05aa2d700702d4c239de6b2 SHA512 343113ab56ce339d8dc534087c27c88513a15a7d4337187f0d8e939c05730c6f2f4e6ddb2bfa6eed96b38d8e0271762d34be0ecf94bbfcbaeef29c12a362c672 diff --git a/dev-ml/curses/curses-1.0.10.ebuild b/dev-ml/curses/curses-1.0.10.ebuild new file mode 100644 index 000000000000..3e59eb4bb28b --- /dev/null +++ b/dev-ml/curses/curses-1.0.10.ebuild @@ -0,0 +1,19 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Bindings to ncurses" +HOMEPAGE="https://github.com/mbacarella/curses" +SRC_URI="https://github.com/mbacarella/${PN}/releases/download/${PV}/${P}.tbz" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+ocamlopt" + +BDEPEND="dev-ml/dune-configurator" + +PATCHES=( "${FILESDIR}"/${P}-CC.patch ) diff --git a/dev-ml/curses/curses-1.0.11.ebuild b/dev-ml/curses/curses-1.0.11.ebuild new file mode 100644 index 000000000000..4d4073b15f39 --- /dev/null +++ b/dev-ml/curses/curses-1.0.11.ebuild @@ -0,0 +1,18 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Bindings to ncurses" +HOMEPAGE="https://github.com/mbacarella/curses" +SRC_URI="https://github.com/mbacarella/${PN}/archive/refs/tags/${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+ocamlopt" + +BDEPEND="dev-ml/dune-configurator" diff --git a/dev-ml/curses/files/curses-1.0.10-CC.patch b/dev-ml/curses/files/curses-1.0.10-CC.patch new file mode 100644 index 000000000000..8acff01c5d9c --- /dev/null +++ b/dev-ml/curses/files/curses-1.0.10-CC.patch @@ -0,0 +1,11 @@ +--- a/dune 2022-03-21 21:07:36.326440959 +0100 ++++ b/dune 2022-03-21 21:07:46.650295407 +0100 +@@ -45,7 +45,7 @@ + %{workspace_root} + (with-stdout-to + %{target} +- (system "%{bin:gcc} -x c -E _curses.ml"))))) ++ (system "%{cc} -x c -E _curses.ml"))))) + + (rule + (targets c_flags.sexp c_library_flags.sexp config.ml _config.h) diff --git a/dev-ml/curses/metadata.xml b/dev-ml/curses/metadata.xml new file mode 100644 index 000000000000..eb7e88206e4c --- /dev/null +++ b/dev-ml/curses/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">mbacarella/curses</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/deriving/Manifest b/dev-ml/deriving/Manifest deleted file mode 100644 index 130b75eb26a3..000000000000 --- a/dev-ml/deriving/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST deriving-0.7.1.tar.gz 68550 BLAKE2B ded445dbc7f1b8402ae89742abd4f581754a6513aaeb0edcd08f3b0866e531e1731c235bcb50e587314929343fa6a4cfdd11aa9bd8527c03b0813c0a27949d98 SHA512 d4c4b38321f2fc5ed1a9ea7910ec4fae15b08485ae9067048a609d5b9d76188da02995cd18a034c561494cdd3aa8dbb57a1a1c69918b1f79d70f89c96a26d342 diff --git a/dev-ml/deriving/deriving-0.7.1.ebuild b/dev-ml/deriving/deriving-0.7.1.ebuild deleted file mode 100644 index 845c827a8b68..000000000000 --- a/dev-ml/deriving/deriving-0.7.1.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -OASIS_BUILD_TESTS=1 - -inherit oasis - -DESCRIPTION="A deriving library for Ocsigen" -HOMEPAGE="https://github.com/ocsigen/deriving" -SRC_URI="https://github.com/ocsigen/deriving/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND=" - >=dev-ml/type-conv-108:= - dev-ml/optcomp:= - dev-ml/findlib:= - dev-ml/camlp4:= -" -DEPEND="${RDEPEND} - dev-ml/oasis" - -DOCS=( CHANGES README.md ) -oasis_configure_opts="--enable-tc" -OASIS_SETUP_COMMAND="./setup.exe" - -src_configure() { - emake setup.exe - oasis_src_configure -} diff --git a/dev-ml/deriving/metadata.xml b/dev-ml/deriving/metadata.xml deleted file mode 100644 index 38747951f74a..000000000000 --- a/dev-ml/deriving/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">ocsigen/deriving</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/dns-async/Manifest b/dev-ml/dns-async/Manifest deleted file mode 100644 index 7755e3b6cb3b..000000000000 --- a/dev-ml/dns-async/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ocaml-dns-1.0.0.tar.gz 99161 BLAKE2B f0fa068296ac7eb5331ff7f5f88ee60a3010ac146f4b5bfeeffc8db014e6e5563da4f516ee1090365d290fb50b2754576b14167d55b2a33e125046103d485c1e SHA512 199653605e985851dcaafc94f1efeba5c261c29cd5e5f8eaebc9f7d25a05c43adcf7620efb291b22f9549f7c05f8ac3f6abfbcf40e0d7762bd2f7cd623ebcb1c diff --git a/dev-ml/dns-async/dns-async-1.0.0.ebuild b/dev-ml/dns-async/dns-async-1.0.0.ebuild deleted file mode 100644 index f7df7c7eccf3..000000000000 --- a/dev-ml/dns-async/dns-async-1.0.0.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib opam - -MY_P=ocaml-dns-${PV} - -DESCRIPTION="Async support of OCaml DNS" -HOMEPAGE="https://github.com/mirage/ocaml-dns https://mirage.io" -SRC_URI="https://github.com/mirage/ocaml-dns/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz" - -LICENSE="LGPL-2 LGPL-2.1-with-linking-exception ISC" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="test" - -RDEPEND=" - >=dev-lang/ocaml-4:= - dev-ml/async:= - dev-ml/dns:= -" -DEPEND=" - dev-ml/jbuilder - test? ( - dev-ml/dns-lwt-unix - ) - ${RDEPEND} -" -# Do not work -RESTRICT="test" - -S="${WORKDIR}/${MY_P}" - -src_compile() { - jbuilder build @install -p ${PN} || die -} - -src_test() { - jbuilder runtest -p ${PN} || die -} diff --git a/dev-ml/dns-async/metadata.xml b/dev-ml/dns-async/metadata.xml deleted file mode 100644 index 2f4ef14adaa5..000000000000 --- a/dev-ml/dns-async/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">mirage/ocaml-dns</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/dns-lwt-unix/Manifest b/dev-ml/dns-lwt-unix/Manifest deleted file mode 100644 index 7755e3b6cb3b..000000000000 --- a/dev-ml/dns-lwt-unix/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ocaml-dns-1.0.0.tar.gz 99161 BLAKE2B f0fa068296ac7eb5331ff7f5f88ee60a3010ac146f4b5bfeeffc8db014e6e5563da4f516ee1090365d290fb50b2754576b14167d55b2a33e125046103d485c1e SHA512 199653605e985851dcaafc94f1efeba5c261c29cd5e5f8eaebc9f7d25a05c43adcf7620efb291b22f9549f7c05f8ac3f6abfbcf40e0d7762bd2f7cd623ebcb1c diff --git a/dev-ml/dns-lwt-unix/dns-lwt-unix-1.0.0.ebuild b/dev-ml/dns-lwt-unix/dns-lwt-unix-1.0.0.ebuild deleted file mode 100644 index 0de745104dd6..000000000000 --- a/dev-ml/dns-lwt-unix/dns-lwt-unix-1.0.0.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib opam - -MY_P=ocaml-dns-${PV} - -DESCRIPTION="Lwt support of OCaml DNS" -HOMEPAGE="https://github.com/mirage/ocaml-dns https://mirage.io" -SRC_URI="https://github.com/mirage/ocaml-dns/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz" - -LICENSE="LGPL-2 LGPL-2.1-with-linking-exception ISC" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="test" - -RDEPEND=" - >=dev-lang/ocaml-4:= - dev-ml/dns-lwt:= - dev-ml/dns:= - dev-ml/cmdliner:= - dev-ml/mirage-profile:= - dev-ml/ocaml-ipaddr:= -" -DEPEND=" - dev-ml/jbuilder - test? ( - dev-ml/ounit - ) - ${RDEPEND} -" -# Do not work -RESTRICT="test" - -S="${WORKDIR}/${MY_P}" - -src_compile() { - jbuilder build @install -p ${PN} || die -} - -src_test() { - jbuilder runtest -p ${PN} || die -} diff --git a/dev-ml/dns-lwt-unix/metadata.xml b/dev-ml/dns-lwt-unix/metadata.xml deleted file mode 100644 index 2f4ef14adaa5..000000000000 --- a/dev-ml/dns-lwt-unix/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">mirage/ocaml-dns</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/dns-lwt/Manifest b/dev-ml/dns-lwt/Manifest deleted file mode 100644 index 7755e3b6cb3b..000000000000 --- a/dev-ml/dns-lwt/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ocaml-dns-1.0.0.tar.gz 99161 BLAKE2B f0fa068296ac7eb5331ff7f5f88ee60a3010ac146f4b5bfeeffc8db014e6e5563da4f516ee1090365d290fb50b2754576b14167d55b2a33e125046103d485c1e SHA512 199653605e985851dcaafc94f1efeba5c261c29cd5e5f8eaebc9f7d25a05c43adcf7620efb291b22f9549f7c05f8ac3f6abfbcf40e0d7762bd2f7cd623ebcb1c diff --git a/dev-ml/dns-lwt/dns-lwt-1.0.0.ebuild b/dev-ml/dns-lwt/dns-lwt-1.0.0.ebuild deleted file mode 100644 index 850c1001b9f1..000000000000 --- a/dev-ml/dns-lwt/dns-lwt-1.0.0.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib opam - -MY_P=ocaml-dns-${PV} - -DESCRIPTION="Lwt support of OCaml DNS" -HOMEPAGE="https://github.com/mirage/ocaml-dns https://mirage.io" -SRC_URI="https://github.com/mirage/ocaml-dns/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz" - -LICENSE="LGPL-2 LGPL-2.1-with-linking-exception ISC" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="test" - -RDEPEND=" - >=dev-lang/ocaml-4:= - dev-ml/lwt:= - dev-ml/dns:= - dev-ml/mirage-profile:= -" -DEPEND=" - dev-ml/jbuilder - test? ( - dev-ml/dns-lwt-unix - ) - ${RDEPEND} -" -# do not work -RESTRICT="test" - -S="${WORKDIR}/${MY_P}" - -src_compile() { - jbuilder build @install -p ${PN} || die -} - -src_test() { - jbuilder runtest -p ${PN} || die -} diff --git a/dev-ml/dns-lwt/metadata.xml b/dev-ml/dns-lwt/metadata.xml deleted file mode 100644 index 2f4ef14adaa5..000000000000 --- a/dev-ml/dns-lwt/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">mirage/ocaml-dns</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/dns/Manifest b/dev-ml/dns/Manifest deleted file mode 100644 index 7755e3b6cb3b..000000000000 --- a/dev-ml/dns/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ocaml-dns-1.0.0.tar.gz 99161 BLAKE2B f0fa068296ac7eb5331ff7f5f88ee60a3010ac146f4b5bfeeffc8db014e6e5563da4f516ee1090365d290fb50b2754576b14167d55b2a33e125046103d485c1e SHA512 199653605e985851dcaafc94f1efeba5c261c29cd5e5f8eaebc9f7d25a05c43adcf7620efb291b22f9549f7c05f8ac3f6abfbcf40e0d7762bd2f7cd623ebcb1c diff --git a/dev-ml/dns/dns-1.0.0.ebuild b/dev-ml/dns/dns-1.0.0.ebuild deleted file mode 100644 index 1780cf1361f4..000000000000 --- a/dev-ml/dns/dns-1.0.0.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib opam - -DESCRIPTION="A pure OCaml implementation of the DNS protocol" -HOMEPAGE="https://github.com/mirage/ocaml-dns https://mirage.io" -SRC_URI="https://github.com/mirage/${PN}/archive/v${PV}.tar.gz -> ocaml-${P}.tar.gz" - -LICENSE="LGPL-2 LGPL-2.1-with-linking-exception ISC" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND=" - >=dev-ml/ocaml-base64-2.0.0:= - >=dev-ml/ocaml-cstruct-3.0.2:=[ppx] - dev-ml/ocaml-hashcons:= - >=dev-ml/ocaml-ipaddr-2.6.0:= - dev-ml/ocaml-re:= - >=dev-ml/ocaml-uri-1.7.0:= - dev-ml/result:= - !dev-ml/odns -" -DEPEND=" - dev-ml/jbuilder - ${RDEPEND} -" - -# Do not work -RESTRICT="test" - -S="${WORKDIR}/ocaml-${P}" - -src_compile() { - jbuilder build @install -p dns || die -} - -src_test() { - jbuilder runtest -p dns || die -} diff --git a/dev-ml/dns/metadata.xml b/dev-ml/dns/metadata.xml deleted file mode 100644 index 2f4ef14adaa5..000000000000 --- a/dev-ml/dns/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">mirage/ocaml-dns</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/dose3/Manifest b/dev-ml/dose3/Manifest index 57bc6e62d881..364978c43c54 100644 --- a/dev-ml/dose3/Manifest +++ b/dev-ml/dose3/Manifest @@ -1 +1 @@ -DIST dose3-5.0.1.tar.gz 297433 BLAKE2B 74ae954604f26398f091b4f14d2a633132ae62102f52af13284af27e41cd7c47afb1b533b0821a8921ba33fa6658e94b3bb6bf5f104f48881a50e14517cd65e2 SHA512 e66526319446054041f138ee2633043d0832089f6a554cf566a28de899d10383acfb1aa6bf1a368811602939676510933a7d2404fd34dbeba15045b458f5af84 +DIST dose3-7.0.0.tar.bz2 1381598 BLAKE2B 8d34927a121c0baeac6b95424c8087f3da441b75468bcb1f385aa48d218b26cc168deec588ba348b62c97f76c0110fe16bdf5bd75738540dd5eda3a87ec02e05 SHA512 0752af050102cc7e7a2ae9a4e7a155e769ac961d716dd58b8d23201bc357678a1412ccc3a853bc38b69370ca863a7ad15d8cf9203938d813ccb9b71251632904 diff --git a/dev-ml/dose3/dose3-5.0.1.ebuild b/dev-ml/dose3/dose3-5.0.1.ebuild deleted file mode 100644 index 3d2b19a0b099..000000000000 --- a/dev-ml/dose3/dose3-5.0.1.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils - -MY_P="${P/_beta/-beta}" -DESCRIPTION="Library to perform analysis on package repositories" -HOMEPAGE="http://www.mancoosi.org/software/ https://gforge.inria.fr/projects/dose" -SRC_URI="https://gforge.inria.fr/frs/download.php/file/36063/${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" -IUSE="+ocamlopt parmap zip bzip2 xml curl rpm4 test" - -RDEPEND=" - >=dev-lang/ocaml-3.12:=[ocamlopt?] - dev-ml/cudf:= - >=dev-ml/extlib-1.7.0:= - dev-ml/ocaml-re:= - dev-ml/cppo:= - parmap? ( dev-ml/parmap:= ) - zip? ( dev-ml/camlzip:= ) - bzip2? ( dev-ml/camlbz2:= ) - >=dev-ml/ocamlgraph-1.8.6:= - xml? ( dev-ml/ocaml-expat:= dev-ml/xml-light:= ) - curl? ( dev-ml/ocurl:= ) - rpm4? ( app-arch/rpm ) -" -DEPEND="${RDEPEND} - dev-ml/findlib - dev-ml/ocamlbuild - test? ( dev-python/pyyaml[libyaml] ) -" -# missing test data -RESTRICT="test" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - sed -e 's/INSTALLOPTS=-s/INSTALLOPTS=/' -i Makefile.config.in || die -} - -src_configure() { - econf \ - $(use ocamlopt || echo "--with-bytecodeonly") \ - $(use parmap && echo "--with-parmap") \ - $(use zip && echo "--with-zip") \ - $(use bzip2 && echo "--with-bz2") \ - $(use xml && echo "--with-xml") \ - $(use curl && echo "--with-curl") \ - $(use rpm4 && echo "--with-rpm4") -} - -src_compile() { - emake -j1 -} - -src_install() { - emake DESTDIR="${D}" BINDIR="${ED}/usr/bin" install || die - dodoc CHANGES CREDITS README.architecture TODO -} diff --git a/dev-ml/dose3/dose3-7.0.0.ebuild b/dev-ml/dose3/dose3-7.0.0.ebuild new file mode 100644 index 000000000000..ac5f03ee7f7b --- /dev/null +++ b/dev-ml/dose3/dose3-7.0.0.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Library to perform analysis on package repositories" +HOMEPAGE="http://www.mancoosi.org/software/ https://gforge.inria.fr/projects/dose" +SRC_URI="https://gitlab.com/irill/${PN}/-/archive/${PV}/${P}.tar.bz2" +S="${WORKDIR}/${PN}-$(ver_cut 1-3)" + +LICENSE="LGPL-3" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +BDEPEND=" + dev-ml/findlib + dev-ml/ocamlbuild +" +RDEPEND=" + >=dev-lang/ocaml-4.03:=[ocamlopt=] + dev-ml/ocaml-base64:=[ocamlopt=] + >=dev-ml/cudf-0.7:=[ocamlopt=] + >=dev-ml/extlib-1.7.8:=[ocamlopt=] + >=dev-ml/ocamlgraph-2.0.0:=[ocamlopt=] + >=dev-ml/re-1.2.2:=[ocamlopt=] + dev-ml/parmap:=[ocamlopt=] + >=dev-ml/camlzip-1.08:=[ocamlopt=] + >=dev-ml/camlbz2-0.7.0:= + dev-ml/ocaml-expat:=[ocamlopt=] + dev-ml/xml-light:=[ocamlopt=] + app-arch/rpm +" +DEPEND="${RDEPEND}" + +# missing test data +RESTRICT="test" + +QA_FLAGS_IGNORED='.*' diff --git a/dev-ml/dose3/metadata.xml b/dev-ml/dose3/metadata.xml index e4749fd2b534..353924ec9e4e 100644 --- a/dev-ml/dose3/metadata.xml +++ b/dev-ml/dose3/metadata.xml @@ -1,13 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> - <use> - <flag name="parmap">Adds multi-core CPU support via <pkg>dev-ml/parmap</pkg>.</flag> - <flag name="zip">Adds support for handling zip files.</flag> - <flag name="rpm4">Adds support for handling rpm4 files.</flag> - </use> + <upstream> + <remote-id type="gitlab">irill/dose3</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-ml/dune-build-info/Manifest b/dev-ml/dune-build-info/Manifest new file mode 100644 index 000000000000..afa119a19617 --- /dev/null +++ b/dev-ml/dune-build-info/Manifest @@ -0,0 +1,10 @@ +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.2.0.tar.gz 1754664 BLAKE2B 97ba420a5bf9dd8e14ba74c0e91b6679924fd9ee7b8d9a9a2d4b282166d9172582a37adf408fd037972dab7525cd240c24729b6692f403c32029b2994044bd40 SHA512 a90ac689d97acab956fd96f16f7c6cfdc95d01785fc14f0d3c8ab39231ff78e8941d2db2fa8cbfaa39bbed8f865e11b628aacae1b22df49512a57d0263c0dca4 +DIST dune-3.6.1.tar.gz 1843804 BLAKE2B 1e7bf67b596f60a553f00cfd8287ce36ef4ff5b8d8f16465df3f3b7b6d332ceef5101057df9389aeb9ceb4dc7f23bc69320412aebba7587deeb933a0f8ddca46 SHA512 2db83116a3d0995c8d0dfd6a1581d214f657a7d90c30dea04d5370327e13c575fed6ce74106a79c2e2fe0c02aa2912ae7a9f4e49c36985fb613b6a41de0700c9 +DIST dune-3.7.0.tar.gz 2010139 BLAKE2B 045fc6ee033325b074aac869c32b55f243bc561b796adfb83011f7ef95352bc0d8161fbb563744286ef145323b59a2854534c4e366532894a1ba5ff78a615f32 SHA512 f83d55939513cf292d89cbc38dbe2431cf453c5d5cfdab2239946e2845d10ea57be8643bb8047fe82499bb21561e861dcd8b749c55a1ba18377996c6a0b48239 +DIST dune-3.7.1.tar.gz 2011275 BLAKE2B dd0f473a720fc65ac550a2aab64930ff472a9bd306d603f088d813817df56148f676abe2a56ff3458bb1ed887784e565154eee08988bf984585b35bc9333d929 SHA512 d741b2a92e970f9747240d4356045f46447238f7c8d8c47ba0b1cad96b8194461a47fa315d86a1eef2033a4d38001c999e6033c31b0c75a311367fb78ea12b6b +DIST dune-3.8.0.tar.gz 2564537 BLAKE2B 773a2643b187f37dd2e21df41f18818753e249e66c2d98a4cfee3d9997f528827b2cf3c60d2992ffdc51397c393ac1a0fcc5339bdec2d87f82252114394d2355 SHA512 bba32fb508265329a2a46c9bd2e8b7e5f3d6d84390e842382ff4790f0d3414c9ff1d005c1af88988daaca29749729f1ced7b388f2d96432f01f2f4ea4714be98 +DIST dune-3.9.0.tar.gz 2609923 BLAKE2B f9fe8fb3c2e002e1eec141f487709d592df969ab44d41012ebaa436f17b6ee679e2e763d479106ae722b8b61be03fceb701b314c40c001d5895db99e5fbbe4a6 SHA512 86cd66222553f8cd7c1d1fb9e4e55169f9cd6d92e0bde1c56846b5e0fb6ae8494ac15ebb68d9e8761240f46dcc9b480747e48b21b74cff86e52cc45d3d222070 +DIST dune-3.9.1.tar.gz 2610113 BLAKE2B 0b97f6a951bd013a156a1417f6b65df17324adf13d48ad3b8bf45a4133cc77195e2118ae95f0cb9da488c26378b58ce677db8eb4b3cb028a73c779be57b2d611 SHA512 c997ec2205fa5391acbca9e196387cec1af69d3aed4cebe21d82edbe66bd91fda0c742e7ff2e3ffb8df88e2e379bbff68028574664cf375d04f4d3f3f2102f3b diff --git a/dev-ml/dune-build-info/dune-build-info-2.9.1.ebuild b/dev-ml/dune-build-info/dune-build-info-2.9.1.ebuild new file mode 100644 index 000000000000..c23cca94315a --- /dev/null +++ b/dev-ml/dune-build-info/dune-build-info-2.9.1.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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 ~x86" +IUSE="+ocamlopt" +RESTRICT="test" + +src_configure() { + : +} + +src_compile() { + dune build -p ${PN} @install || die +} diff --git a/dev-ml/dune-build-info/dune-build-info-2.9.3.ebuild b/dev-ml/dune-build-info/dune-build-info-2.9.3.ebuild new file mode 100644 index 000000000000..4be7514794d3 --- /dev/null +++ b/dev-ml/dune-build-info/dune-build-info-2.9.3.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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 ppc64 x86" +IUSE="+ocamlopt" +RESTRICT="test" + +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.10.0.ebuild b/dev-ml/dune-build-info/dune-build-info-3.10.0.ebuild new file mode 100644 index 000000000000..3d78214334e6 --- /dev/null +++ b/dev-ml/dune-build-info/dune-build-info-3.10.0.ebuild @@ -0,0 +1,28 @@ +# 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 ~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.2.0.ebuild b/dev-ml/dune-build-info/dune-build-info-3.2.0.ebuild new file mode 100644 index 000000000000..b7bbc45378bb --- /dev/null +++ b/dev-ml/dune-build-info/dune-build-info-3.2.0.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2022 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.0" +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.6.1.ebuild b/dev-ml/dune-build-info/dune-build-info-3.6.1.ebuild new file mode 100644 index 000000000000..a45a35cb43fa --- /dev/null +++ b/dev-ml/dune-build-info/dune-build-info-3.6.1.ebuild @@ -0,0 +1,28 @@ +# 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.0.ebuild b/dev-ml/dune-build-info/dune-build-info-3.7.0.ebuild new file mode 100644 index 000000000000..2b60d3970e73 --- /dev/null +++ b/dev-ml/dune-build-info/dune-build-info-3.7.0.ebuild @@ -0,0 +1,28 @@ +# 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 new file mode 100644 index 000000000000..961e37103360 --- /dev/null +++ b/dev-ml/dune-build-info/dune-build-info-3.7.1.ebuild @@ -0,0 +1,28 @@ +# 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.8.0.ebuild b/dev-ml/dune-build-info/dune-build-info-3.8.0.ebuild new file mode 100644 index 000000000000..3d78214334e6 --- /dev/null +++ b/dev-ml/dune-build-info/dune-build-info-3.8.0.ebuild @@ -0,0 +1,28 @@ +# 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 ~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.9.0.ebuild b/dev-ml/dune-build-info/dune-build-info-3.9.0.ebuild new file mode 100644 index 000000000000..3d78214334e6 --- /dev/null +++ b/dev-ml/dune-build-info/dune-build-info-3.9.0.ebuild @@ -0,0 +1,28 @@ +# 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 ~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.9.1.ebuild b/dev-ml/dune-build-info/dune-build-info-3.9.1.ebuild new file mode 100644 index 000000000000..3d78214334e6 --- /dev/null +++ b/dev-ml/dune-build-info/dune-build-info-3.9.1.ebuild @@ -0,0 +1,28 @@ +# 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 ~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/metadata.xml b/dev-ml/dune-build-info/metadata.xml new file mode 100644 index 000000000000..3cf03b345ced --- /dev/null +++ b/dev-ml/dune-build-info/metadata.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> + +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <bugs-to>https://github.com/ocaml/dune/issues/</bugs-to> + <remote-id type="github">ocaml/dune</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/dune-configurator/Manifest b/dev-ml/dune-configurator/Manifest new file mode 100644 index 000000000000..5905768b5910 --- /dev/null +++ b/dev-ml/dune-configurator/Manifest @@ -0,0 +1,12 @@ +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.0.3.tar.gz 1725788 BLAKE2B 2de93c085f642c8381642a08b18bc21ad48097f32397b3eddab9725deb267b089849b649705e1b72bb1b5b37f7531fd9e0cfb134174f0cb3a8ee2595c7dcf8ce SHA512 839e942bcf8189763d0d9b01614333bb2f036bce68c82959e51d2e9145b57067cb862b66781912391c1a0f531b8dddf2ffeafcee71c626169a437fe40feba155 +DIST dune-3.10.0.tar.gz 2640800 BLAKE2B 5fc479a91ee6792f07a4fb61af530d55f46dea56b2fd5919975c0bfb231229395e7d0769bdae88419a89d378b8d7e2b229f7410ce7a34414629aa5117e606230 SHA512 2884a4eaaa44164ce911286ca6670b548a4a564e2b5040f05405d1d2729af84083fbfdde7c92db4f6f7a54d15a43fc9dddcec19d8d79d5a66221b2be861473de +DIST dune-3.2.0.tar.gz 1754664 BLAKE2B 97ba420a5bf9dd8e14ba74c0e91b6679924fd9ee7b8d9a9a2d4b282166d9172582a37adf408fd037972dab7525cd240c24729b6692f403c32029b2994044bd40 SHA512 a90ac689d97acab956fd96f16f7c6cfdc95d01785fc14f0d3c8ab39231ff78e8941d2db2fa8cbfaa39bbed8f865e11b628aacae1b22df49512a57d0263c0dca4 +DIST dune-3.6.1.tar.gz 1843804 BLAKE2B 1e7bf67b596f60a553f00cfd8287ce36ef4ff5b8d8f16465df3f3b7b6d332ceef5101057df9389aeb9ceb4dc7f23bc69320412aebba7587deeb933a0f8ddca46 SHA512 2db83116a3d0995c8d0dfd6a1581d214f657a7d90c30dea04d5370327e13c575fed6ce74106a79c2e2fe0c02aa2912ae7a9f4e49c36985fb613b6a41de0700c9 +DIST dune-3.7.0.tar.gz 2010139 BLAKE2B 045fc6ee033325b074aac869c32b55f243bc561b796adfb83011f7ef95352bc0d8161fbb563744286ef145323b59a2854534c4e366532894a1ba5ff78a615f32 SHA512 f83d55939513cf292d89cbc38dbe2431cf453c5d5cfdab2239946e2845d10ea57be8643bb8047fe82499bb21561e861dcd8b749c55a1ba18377996c6a0b48239 +DIST dune-3.7.1.tar.gz 2011275 BLAKE2B dd0f473a720fc65ac550a2aab64930ff472a9bd306d603f088d813817df56148f676abe2a56ff3458bb1ed887784e565154eee08988bf984585b35bc9333d929 SHA512 d741b2a92e970f9747240d4356045f46447238f7c8d8c47ba0b1cad96b8194461a47fa315d86a1eef2033a4d38001c999e6033c31b0c75a311367fb78ea12b6b +DIST dune-3.8.0.tar.gz 2564537 BLAKE2B 773a2643b187f37dd2e21df41f18818753e249e66c2d98a4cfee3d9997f528827b2cf3c60d2992ffdc51397c393ac1a0fcc5339bdec2d87f82252114394d2355 SHA512 bba32fb508265329a2a46c9bd2e8b7e5f3d6d84390e842382ff4790f0d3414c9ff1d005c1af88988daaca29749729f1ced7b388f2d96432f01f2f4ea4714be98 +DIST dune-3.9.0.tar.gz 2609923 BLAKE2B f9fe8fb3c2e002e1eec141f487709d592df969ab44d41012ebaa436f17b6ee679e2e763d479106ae722b8b61be03fceb701b314c40c001d5895db99e5fbbe4a6 SHA512 86cd66222553f8cd7c1d1fb9e4e55169f9cd6d92e0bde1c56846b5e0fb6ae8494ac15ebb68d9e8761240f46dcc9b480747e48b21b74cff86e52cc45d3d222070 +DIST dune-3.9.1.tar.gz 2610113 BLAKE2B 0b97f6a951bd013a156a1417f6b65df17324adf13d48ad3b8bf45a4133cc77195e2118ae95f0cb9da488c26378b58ce677db8eb4b3cb028a73c779be57b2d611 SHA512 c997ec2205fa5391acbca9e196387cec1af69d3aed4cebe21d82edbe66bd91fda0c742e7ff2e3ffb8df88e2e379bbff68028574664cf375d04f4d3f3f2102f3b diff --git a/dev-ml/dune-configurator/dune-configurator-2.8.4.ebuild b/dev-ml/dune-configurator/dune-configurator-2.8.4.ebuild new file mode 100644 index 000000000000..17c58e633847 --- /dev/null +++ b/dev-ml/dune-configurator/dune-configurator-2.8.4.ebuild @@ -0,0 +1,116 @@ +# 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="MIT" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + ~dev-ml/dune-private-libs-${PV}:=[ocamlopt?] + dev-ml/csexp:=[ocamlopt?] + dev-ml/result:=[ocamlopt?] +" +DEPEND="${RDEPEND} + test? ( + dev-ml/core_bench + dev-ml/menhir + dev-ml/opam + dev-ml/ppx_expect + ) +" +# TODO for test deps: +# Add cram? +# Add dev-ml/js_of_ocaml once dev-ml/ocaml-base64 is ported to Dune +# Add coq? + +src_prepare() { + default + + # Keep this list in sync with dev-ml/dune-private-libs + local bad_tests=( + # List of tests calling git, mercurial, etc + test/blackbox-tests/test-cases/dune-project-meta/main.t + test/blackbox-tests/test-cases/meta-template-version-bug.t + test/blackbox-tests/test-cases/subst/project-name-restriction.t + test/blackbox-tests/test-cases/subst/with-opam-file.t + test/blackbox-tests/test-cases/subst.t + test/blackbox-tests/test-cases/subst/unicode.t + test/blackbox-tests/test-cases/subst/from-project-file.t + test/blackbox-tests/test-cases/trace-file.t + otherlibs/build-info/test/run.t + test/expect-tests/vcs_tests.ml + + # Strange failures, seemingly from newer versions of deps + test/blackbox-tests/test-cases/merlin/allow_approximate_merlin_warn.t + test/blackbox-tests/test-cases/merlin/merlin-tests.t + test/blackbox-tests/test-cases/merlin/github4125.t + test/blackbox-tests/test-cases/install-dry-run.t + test/blackbox-tests/test-cases/c-flags.t + test/blackbox-tests/test-cases/install-libdir.t + test/blackbox-tests/test-cases/dune-cache/trim.t + + # Strange failures about opam not being initialised + test/blackbox-tests/test-cases/merlin/merlin-from-subdir.t + test/blackbox-tests/test-cases/merlin/symlinks.t + test/blackbox-tests/test-cases/merlin/src-dirs-of-deps.t + test/blackbox-tests/test-cases/merlin/per-module-pp.t + test/blackbox-tests/test-cases/merlin/server.t + test/blackbox-tests/test-cases/github1946.t + test/blackbox-tests/test-cases/github759.t + + # Wants nodejs! + test/blackbox-tests/test-cases/jsoo/simple.t + test/blackbox-tests/test-cases/jsoo/inline-tests.t + test/blackbox-tests/test-cases/jsoo/github3622.t + # Wants js_of_ocaml (can't include yet b/c of ocaml-base64 porting) + test/blackbox-tests/test-cases/jsoo/explicit-js-mode-specified.t + + # Wants coq which doesn't build for me right now + test/blackbox-tests/test-cases/coq/rec-module.t + test/blackbox-tests/test-cases/coq/compose-sub-theory.t + test/blackbox-tests/test-cases/coq/native-compose.t + test/blackbox-tests/test-cases/coq/base-unsound.t + test/blackbox-tests/test-cases/coq/base.t + test/blackbox-tests/test-cases/coq/native-single.t + test/blackbox-tests/test-cases/coq/compose-simple.t + test/blackbox-tests/test-cases/coq/ml-lib.t + test/blackbox-tests/test-cases/coq/extract.t + test/blackbox-tests/test-cases/coq/compose-plugin.t + + # Unpackaged dependencies (a rabbit hole for now) + # utop -> lambda-term, zed + test/blackbox-tests/test-cases/utop/github3188.t + test/blackbox-tests/test-cases/utop/utop-simple.t + test/blackbox-tests/test-cases/utop/utop-default.t + test/blackbox-tests/test-cases/utop/utop-default-implementation.t + test/blackbox-tests/test-cases/utop/utop-ppx-rewriters.t + # ocamlformat + test/blackbox-tests/test-cases/formatting.t + # mdx + test/blackbox-tests/test-cases/mdx-stanza.t + # odoc + test/blackbox-tests/test-cases/odoc/odoc-simple.t + test/blackbox-tests/test-cases/odoc/odoc-package-mld-link.t + test/blackbox-tests/test-cases/odoc/multiple-private-libs.t + test/blackbox-tests/test-cases/odoc/odoc-unique-mlds.t + test/blackbox-tests/test-cases/odoc/github717-odoc-index.t + test/blackbox-tests/test-cases/odoc/warnings.t + ) + + rm -r ${bad_tests[@]} || die "Failed to remove broken/inappropriate tests" +} + +src_configure() { + : +} diff --git a/dev-ml/dune-configurator/dune-configurator-2.9.1.ebuild b/dev-ml/dune-configurator/dune-configurator-2.9.1.ebuild new file mode 100644 index 000000000000..17c58e633847 --- /dev/null +++ b/dev-ml/dune-configurator/dune-configurator-2.9.1.ebuild @@ -0,0 +1,116 @@ +# 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="MIT" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + ~dev-ml/dune-private-libs-${PV}:=[ocamlopt?] + dev-ml/csexp:=[ocamlopt?] + dev-ml/result:=[ocamlopt?] +" +DEPEND="${RDEPEND} + test? ( + dev-ml/core_bench + dev-ml/menhir + dev-ml/opam + dev-ml/ppx_expect + ) +" +# TODO for test deps: +# Add cram? +# Add dev-ml/js_of_ocaml once dev-ml/ocaml-base64 is ported to Dune +# Add coq? + +src_prepare() { + default + + # Keep this list in sync with dev-ml/dune-private-libs + local bad_tests=( + # List of tests calling git, mercurial, etc + test/blackbox-tests/test-cases/dune-project-meta/main.t + test/blackbox-tests/test-cases/meta-template-version-bug.t + test/blackbox-tests/test-cases/subst/project-name-restriction.t + test/blackbox-tests/test-cases/subst/with-opam-file.t + test/blackbox-tests/test-cases/subst.t + test/blackbox-tests/test-cases/subst/unicode.t + test/blackbox-tests/test-cases/subst/from-project-file.t + test/blackbox-tests/test-cases/trace-file.t + otherlibs/build-info/test/run.t + test/expect-tests/vcs_tests.ml + + # Strange failures, seemingly from newer versions of deps + test/blackbox-tests/test-cases/merlin/allow_approximate_merlin_warn.t + test/blackbox-tests/test-cases/merlin/merlin-tests.t + test/blackbox-tests/test-cases/merlin/github4125.t + test/blackbox-tests/test-cases/install-dry-run.t + test/blackbox-tests/test-cases/c-flags.t + test/blackbox-tests/test-cases/install-libdir.t + test/blackbox-tests/test-cases/dune-cache/trim.t + + # Strange failures about opam not being initialised + test/blackbox-tests/test-cases/merlin/merlin-from-subdir.t + test/blackbox-tests/test-cases/merlin/symlinks.t + test/blackbox-tests/test-cases/merlin/src-dirs-of-deps.t + test/blackbox-tests/test-cases/merlin/per-module-pp.t + test/blackbox-tests/test-cases/merlin/server.t + test/blackbox-tests/test-cases/github1946.t + test/blackbox-tests/test-cases/github759.t + + # Wants nodejs! + test/blackbox-tests/test-cases/jsoo/simple.t + test/blackbox-tests/test-cases/jsoo/inline-tests.t + test/blackbox-tests/test-cases/jsoo/github3622.t + # Wants js_of_ocaml (can't include yet b/c of ocaml-base64 porting) + test/blackbox-tests/test-cases/jsoo/explicit-js-mode-specified.t + + # Wants coq which doesn't build for me right now + test/blackbox-tests/test-cases/coq/rec-module.t + test/blackbox-tests/test-cases/coq/compose-sub-theory.t + test/blackbox-tests/test-cases/coq/native-compose.t + test/blackbox-tests/test-cases/coq/base-unsound.t + test/blackbox-tests/test-cases/coq/base.t + test/blackbox-tests/test-cases/coq/native-single.t + test/blackbox-tests/test-cases/coq/compose-simple.t + test/blackbox-tests/test-cases/coq/ml-lib.t + test/blackbox-tests/test-cases/coq/extract.t + test/blackbox-tests/test-cases/coq/compose-plugin.t + + # Unpackaged dependencies (a rabbit hole for now) + # utop -> lambda-term, zed + test/blackbox-tests/test-cases/utop/github3188.t + test/blackbox-tests/test-cases/utop/utop-simple.t + test/blackbox-tests/test-cases/utop/utop-default.t + test/blackbox-tests/test-cases/utop/utop-default-implementation.t + test/blackbox-tests/test-cases/utop/utop-ppx-rewriters.t + # ocamlformat + test/blackbox-tests/test-cases/formatting.t + # mdx + test/blackbox-tests/test-cases/mdx-stanza.t + # odoc + test/blackbox-tests/test-cases/odoc/odoc-simple.t + test/blackbox-tests/test-cases/odoc/odoc-package-mld-link.t + test/blackbox-tests/test-cases/odoc/multiple-private-libs.t + test/blackbox-tests/test-cases/odoc/odoc-unique-mlds.t + test/blackbox-tests/test-cases/odoc/github717-odoc-index.t + test/blackbox-tests/test-cases/odoc/warnings.t + ) + + rm -r ${bad_tests[@]} || die "Failed to remove broken/inappropriate tests" +} + +src_configure() { + : +} diff --git a/dev-ml/dune-configurator/dune-configurator-2.9.3.ebuild b/dev-ml/dune-configurator/dune-configurator-2.9.3.ebuild new file mode 100644 index 000000000000..e2ffa5d6409e --- /dev/null +++ b/dev-ml/dune-configurator/dune-configurator-2.9.3.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="A composable build system for OCaml" +HOMEPAGE="https://github.com/ocaml/dune" +SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> dune-${PV}.tar.gz" +S="${WORKDIR}/dune-${PV}" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" +RESTRICT="test" #test run within dev-ml/dune-private-libs + +RDEPEND=" + ~dev-ml/dune-private-libs-${PV}:=[ocamlopt?] + dev-ml/csexp:=[ocamlopt?] + dev-ml/result:=[ocamlopt?] +" +DEPEND="${RDEPEND}" + +src_configure() { + : +} diff --git a/dev-ml/dune-configurator/dune-configurator-3.0.3-r1.ebuild b/dev-ml/dune-configurator/dune-configurator-3.0.3-r1.ebuild new file mode 100644 index 000000000000..277a4f000fd9 --- /dev/null +++ b/dev-ml/dune-configurator/dune-configurator-3.0.3-r1.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune multiprocessing + +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 ~riscv ~x86" +IUSE="+ocamlopt" +RESTRICT="test" + +BDEPEND=">=dev-ml/dune-3" +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() { + ./configure \ + --libdir="$(ocamlc -where)" \ + --mandir="/usr/share/man" \ + || die +} + +src_compile() { + dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die +} diff --git a/dev-ml/dune-configurator/dune-configurator-3.10.0.ebuild b/dev-ml/dune-configurator/dune-configurator-3.10.0.ebuild new file mode 100644 index 000000000000..2ef2249b6a21 --- /dev/null +++ b/dev-ml/dune-configurator/dune-configurator-3.10.0.ebuild @@ -0,0 +1,39 @@ +# 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.2.0.ebuild b/dev-ml/dune-configurator/dune-configurator-3.2.0.ebuild new file mode 100644 index 000000000000..9ec5f02be9fb --- /dev/null +++ b/dev-ml/dune-configurator/dune-configurator-3.2.0.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2022 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" +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.6.1.ebuild b/dev-ml/dune-configurator/dune-configurator-3.6.1.ebuild new file mode 100644 index 000000000000..8b85e3fa414c --- /dev/null +++ b/dev-ml/dune-configurator/dune-configurator-3.6.1.ebuild @@ -0,0 +1,39 @@ +# 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.0.ebuild b/dev-ml/dune-configurator/dune-configurator-3.7.0.ebuild new file mode 100644 index 000000000000..2ef2249b6a21 --- /dev/null +++ b/dev-ml/dune-configurator/dune-configurator-3.7.0.ebuild @@ -0,0 +1,39 @@ +# 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 new file mode 100644 index 000000000000..07cd96f97d34 --- /dev/null +++ b/dev-ml/dune-configurator/dune-configurator-3.7.1.ebuild @@ -0,0 +1,39 @@ +# 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.8.0.ebuild b/dev-ml/dune-configurator/dune-configurator-3.8.0.ebuild new file mode 100644 index 000000000000..2ef2249b6a21 --- /dev/null +++ b/dev-ml/dune-configurator/dune-configurator-3.8.0.ebuild @@ -0,0 +1,39 @@ +# 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.9.0.ebuild b/dev-ml/dune-configurator/dune-configurator-3.9.0.ebuild new file mode 100644 index 000000000000..2ef2249b6a21 --- /dev/null +++ b/dev-ml/dune-configurator/dune-configurator-3.9.0.ebuild @@ -0,0 +1,39 @@ +# 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.9.1.ebuild b/dev-ml/dune-configurator/dune-configurator-3.9.1.ebuild new file mode 100644 index 000000000000..2ef2249b6a21 --- /dev/null +++ b/dev-ml/dune-configurator/dune-configurator-3.9.1.ebuild @@ -0,0 +1,39 @@ +# 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/metadata.xml b/dev-ml/dune-configurator/metadata.xml new file mode 100644 index 000000000000..86dc156e664c --- /dev/null +++ b/dev-ml/dune-configurator/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">ocaml/dune</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/dune-private-libs/Manifest b/dev-ml/dune-private-libs/Manifest new file mode 100644 index 000000000000..2b2296c9dc76 --- /dev/null +++ b/dev-ml/dune-private-libs/Manifest @@ -0,0 +1,13 @@ +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.0.3.tar.gz 1725788 BLAKE2B 2de93c085f642c8381642a08b18bc21ad48097f32397b3eddab9725deb267b089849b649705e1b72bb1b5b37f7531fd9e0cfb134174f0cb3a8ee2595c7dcf8ce SHA512 839e942bcf8189763d0d9b01614333bb2f036bce68c82959e51d2e9145b57067cb862b66781912391c1a0f531b8dddf2ffeafcee71c626169a437fe40feba155 +DIST dune-3.10.0.tar.gz 2640800 BLAKE2B 5fc479a91ee6792f07a4fb61af530d55f46dea56b2fd5919975c0bfb231229395e7d0769bdae88419a89d378b8d7e2b229f7410ce7a34414629aa5117e606230 SHA512 2884a4eaaa44164ce911286ca6670b548a4a564e2b5040f05405d1d2729af84083fbfdde7c92db4f6f7a54d15a43fc9dddcec19d8d79d5a66221b2be861473de +DIST dune-3.2.0.tar.gz 1754664 BLAKE2B 97ba420a5bf9dd8e14ba74c0e91b6679924fd9ee7b8d9a9a2d4b282166d9172582a37adf408fd037972dab7525cd240c24729b6692f403c32029b2994044bd40 SHA512 a90ac689d97acab956fd96f16f7c6cfdc95d01785fc14f0d3c8ab39231ff78e8941d2db2fa8cbfaa39bbed8f865e11b628aacae1b22df49512a57d0263c0dca4 +DIST dune-3.6.1.tar.gz 1843804 BLAKE2B 1e7bf67b596f60a553f00cfd8287ce36ef4ff5b8d8f16465df3f3b7b6d332ceef5101057df9389aeb9ceb4dc7f23bc69320412aebba7587deeb933a0f8ddca46 SHA512 2db83116a3d0995c8d0dfd6a1581d214f657a7d90c30dea04d5370327e13c575fed6ce74106a79c2e2fe0c02aa2912ae7a9f4e49c36985fb613b6a41de0700c9 +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 +DIST dune-3.8.0.tar.gz 2564537 BLAKE2B 773a2643b187f37dd2e21df41f18818753e249e66c2d98a4cfee3d9997f528827b2cf3c60d2992ffdc51397c393ac1a0fcc5339bdec2d87f82252114394d2355 SHA512 bba32fb508265329a2a46c9bd2e8b7e5f3d6d84390e842382ff4790f0d3414c9ff1d005c1af88988daaca29749729f1ced7b388f2d96432f01f2f4ea4714be98 +DIST dune-3.9.0.tar.gz 2609923 BLAKE2B f9fe8fb3c2e002e1eec141f487709d592df969ab44d41012ebaa436f17b6ee679e2e763d479106ae722b8b61be03fceb701b314c40c001d5895db99e5fbbe4a6 SHA512 86cd66222553f8cd7c1d1fb9e4e55169f9cd6d92e0bde1c56846b5e0fb6ae8494ac15ebb68d9e8761240f46dcc9b480747e48b21b74cff86e52cc45d3d222070 +DIST dune-3.9.1.tar.gz 2610113 BLAKE2B 0b97f6a951bd013a156a1417f6b65df17324adf13d48ad3b8bf45a4133cc77195e2118ae95f0cb9da488c26378b58ce677db8eb4b3cb028a73c779be57b2d611 SHA512 c997ec2205fa5391acbca9e196387cec1af69d3aed4cebe21d82edbe66bd91fda0c742e7ff2e3ffb8df88e2e379bbff68028574664cf375d04f4d3f3f2102f3b diff --git a/dev-ml/dune-private-libs/dune-private-libs-2.8.4.ebuild b/dev-ml/dune-private-libs/dune-private-libs-2.8.4.ebuild new file mode 100644 index 000000000000..17169982c7f9 --- /dev/null +++ b/dev-ml/dune-private-libs/dune-private-libs-2.8.4.ebuild @@ -0,0 +1,119 @@ +# 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-2.9.1.ebuild b/dev-ml/dune-private-libs/dune-private-libs-2.9.1.ebuild new file mode 100644 index 000000000000..17169982c7f9 --- /dev/null +++ b/dev-ml/dune-private-libs/dune-private-libs-2.9.1.ebuild @@ -0,0 +1,119 @@ +# 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-2.9.3.ebuild b/dev-ml/dune-private-libs/dune-private-libs-2.9.3.ebuild new file mode 100644 index 000000000000..789f0584801f --- /dev/null +++ b/dev-ml/dune-private-libs/dune-private-libs-2.9.3.ebuild @@ -0,0 +1,128 @@ +# Copyright 1999-2023 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 ~riscv 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}" + +PATCHES=( "${FILESDIR}"/${P}-test.patch ) + +# 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 + test/blackbox-tests/test-cases/merlin/default-based-context.t + otherlibs/site/test/run.t + + # Deprecated warnings + test/blackbox-tests/test-cases/toplevel-integration.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 + test/blackbox-tests/test-cases/coq/flags.t + test/blackbox-tests/test-cases/coq/env.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.0.3-r1.ebuild b/dev-ml/dune-private-libs/dune-private-libs-3.0.3-r1.ebuild new file mode 100644 index 000000000000..5000ebb7def9 --- /dev/null +++ b/dev-ml/dune-private-libs/dune-private-libs-3.0.3-r1.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2022 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" +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() { + ./configure \ + --libdir="$(ocamlc -where)" \ + --mandir="/usr/share/man" \ + || die +} + +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.10.0.ebuild b/dev-ml/dune-private-libs/dune-private-libs-3.10.0.ebuild new file mode 100644 index 000000000000..797e233bbac6 --- /dev/null +++ b/dev-ml/dune-private-libs/dune-private-libs-3.10.0.ebuild @@ -0,0 +1,36 @@ +# 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.2.0.ebuild b/dev-ml/dune-private-libs/dune-private-libs-3.2.0.ebuild new file mode 100644 index 000000000000..40c7495b31a2 --- /dev/null +++ b/dev-ml/dune-private-libs/dune-private-libs-3.2.0.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2022 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" +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.6.1.ebuild b/dev-ml/dune-private-libs/dune-private-libs-3.6.1.ebuild new file mode 100644 index 000000000000..ed9004236c37 --- /dev/null +++ b/dev-ml/dune-private-libs/dune-private-libs-3.6.1.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2022 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.6.2.ebuild b/dev-ml/dune-private-libs/dune-private-libs-3.6.2.ebuild new file mode 100644 index 000000000000..771cab1c65a7 --- /dev/null +++ b/dev-ml/dune-private-libs/dune-private-libs-3.6.2.ebuild @@ -0,0 +1,36 @@ +# 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.0.ebuild b/dev-ml/dune-private-libs/dune-private-libs-3.7.0.ebuild new file mode 100644 index 000000000000..797e233bbac6 --- /dev/null +++ b/dev-ml/dune-private-libs/dune-private-libs-3.7.0.ebuild @@ -0,0 +1,36 @@ +# 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 new file mode 100644 index 000000000000..d78578db0848 --- /dev/null +++ b/dev-ml/dune-private-libs/dune-private-libs-3.7.1.ebuild @@ -0,0 +1,36 @@ +# 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.8.0.ebuild b/dev-ml/dune-private-libs/dune-private-libs-3.8.0.ebuild new file mode 100644 index 000000000000..797e233bbac6 --- /dev/null +++ b/dev-ml/dune-private-libs/dune-private-libs-3.8.0.ebuild @@ -0,0 +1,36 @@ +# 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.9.0.ebuild b/dev-ml/dune-private-libs/dune-private-libs-3.9.0.ebuild new file mode 100644 index 000000000000..797e233bbac6 --- /dev/null +++ b/dev-ml/dune-private-libs/dune-private-libs-3.9.0.ebuild @@ -0,0 +1,36 @@ +# 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.9.1.ebuild b/dev-ml/dune-private-libs/dune-private-libs-3.9.1.ebuild new file mode 100644 index 000000000000..797e233bbac6 --- /dev/null +++ b/dev-ml/dune-private-libs/dune-private-libs-3.9.1.ebuild @@ -0,0 +1,36 @@ +# 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/files/dune-private-libs-2.9.3-test.patch b/dev-ml/dune-private-libs/files/dune-private-libs-2.9.3-test.patch new file mode 100644 index 000000000000..661ed791473a --- /dev/null +++ b/dev-ml/dune-private-libs/files/dune-private-libs-2.9.3-test.patch @@ -0,0 +1,32 @@ +From 4a8fa5757277be6e9bbd3698fd4d4336dadae520 Mon Sep 17 00:00:00 2001 +From: Rudi Grinberg <me@rgrinberg.com> +Date: Sat, 26 Jun 2021 21:54:55 -0700 +Subject: [PATCH] Fix test bug_4219.t + +It was missing EOF end markers + +Signed-off-by: Rudi Grinberg <me@rgrinberg.com> +--- + otherlibs/site/test/bug_4219.t | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/otherlibs/site/test/bug_4219.t b/otherlibs/site/test/bug_4219.t +index 96d4794f43..eab868d676 100644 +--- a/otherlibs/site/test/bug_4219.t ++++ b/otherlibs/site/test/bug_4219.t +@@ -7,6 +7,7 @@ Test when sites name which are ocaml keyword + > (package + > (name my-package) + > (sites (lib include))) ++ > EOF + + $ cat >dune <<EOF + > (library (name lib) (libraries dune-site dune-site.plugins)) +@@ -14,6 +15,6 @@ Test when sites name which are ocaml keyword + > (generate_sites_module + > (module sites) + > (plugins (my-package include))) +- ++ > EOF + + $ dune build diff --git a/dev-ml/dune-private-libs/metadata.xml b/dev-ml/dune-private-libs/metadata.xml new file mode 100644 index 000000000000..86dc156e664c --- /dev/null +++ b/dev-ml/dune-private-libs/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">ocaml/dune</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/dune-site/Manifest b/dev-ml/dune-site/Manifest new file mode 100644 index 000000000000..d4da387ee36c --- /dev/null +++ b/dev-ml/dune-site/Manifest @@ -0,0 +1,12 @@ +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.0.3.tar.gz 1725788 BLAKE2B 2de93c085f642c8381642a08b18bc21ad48097f32397b3eddab9725deb267b089849b649705e1b72bb1b5b37f7531fd9e0cfb134174f0cb3a8ee2595c7dcf8ce SHA512 839e942bcf8189763d0d9b01614333bb2f036bce68c82959e51d2e9145b57067cb862b66781912391c1a0f531b8dddf2ffeafcee71c626169a437fe40feba155 +DIST dune-3.10.0.tar.gz 2640800 BLAKE2B 5fc479a91ee6792f07a4fb61af530d55f46dea56b2fd5919975c0bfb231229395e7d0769bdae88419a89d378b8d7e2b229f7410ce7a34414629aa5117e606230 SHA512 2884a4eaaa44164ce911286ca6670b548a4a564e2b5040f05405d1d2729af84083fbfdde7c92db4f6f7a54d15a43fc9dddcec19d8d79d5a66221b2be861473de +DIST dune-3.2.0.tar.gz 1754664 BLAKE2B 97ba420a5bf9dd8e14ba74c0e91b6679924fd9ee7b8d9a9a2d4b282166d9172582a37adf408fd037972dab7525cd240c24729b6692f403c32029b2994044bd40 SHA512 a90ac689d97acab956fd96f16f7c6cfdc95d01785fc14f0d3c8ab39231ff78e8941d2db2fa8cbfaa39bbed8f865e11b628aacae1b22df49512a57d0263c0dca4 +DIST dune-3.6.1.tar.gz 1843804 BLAKE2B 1e7bf67b596f60a553f00cfd8287ce36ef4ff5b8d8f16465df3f3b7b6d332ceef5101057df9389aeb9ceb4dc7f23bc69320412aebba7587deeb933a0f8ddca46 SHA512 2db83116a3d0995c8d0dfd6a1581d214f657a7d90c30dea04d5370327e13c575fed6ce74106a79c2e2fe0c02aa2912ae7a9f4e49c36985fb613b6a41de0700c9 +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 +DIST dune-3.8.0.tar.gz 2564537 BLAKE2B 773a2643b187f37dd2e21df41f18818753e249e66c2d98a4cfee3d9997f528827b2cf3c60d2992ffdc51397c393ac1a0fcc5339bdec2d87f82252114394d2355 SHA512 bba32fb508265329a2a46c9bd2e8b7e5f3d6d84390e842382ff4790f0d3414c9ff1d005c1af88988daaca29749729f1ced7b388f2d96432f01f2f4ea4714be98 +DIST dune-3.9.0.tar.gz 2609923 BLAKE2B f9fe8fb3c2e002e1eec141f487709d592df969ab44d41012ebaa436f17b6ee679e2e763d479106ae722b8b61be03fceb701b314c40c001d5895db99e5fbbe4a6 SHA512 86cd66222553f8cd7c1d1fb9e4e55169f9cd6d92e0bde1c56846b5e0fb6ae8494ac15ebb68d9e8761240f46dcc9b480747e48b21b74cff86e52cc45d3d222070 +DIST dune-3.9.1.tar.gz 2610113 BLAKE2B 0b97f6a951bd013a156a1417f6b65df17324adf13d48ad3b8bf45a4133cc77195e2118ae95f0cb9da488c26378b58ce677db8eb4b3cb028a73c779be57b2d611 SHA512 c997ec2205fa5391acbca9e196387cec1af69d3aed4cebe21d82edbe66bd91fda0c742e7ff2e3ffb8df88e2e379bbff68028574664cf375d04f4d3f3f2102f3b diff --git a/dev-ml/dune-site/dune-site-2.9.1.ebuild b/dev-ml/dune-site/dune-site-2.9.1.ebuild new file mode 100644 index 000000000000..25ec385655d8 --- /dev/null +++ b/dev-ml/dune-site/dune-site-2.9.1.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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 ~x86" +IUSE="+ocamlopt" +RESTRICT="test" + +RDEPEND=" + ~dev-ml/dune-private-libs-${PV}:=[ocamlopt=] +" +DEPEND="${RDEPEND}" + +src_configure() { + : +} + +src_compile() { + dune build -p ${PN} @install || die +} diff --git a/dev-ml/dune-site/dune-site-2.9.3.ebuild b/dev-ml/dune-site/dune-site-2.9.3.ebuild new file mode 100644 index 000000000000..c6e5eeef4d27 --- /dev/null +++ b/dev-ml/dune-site/dune-site-2.9.3.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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 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.0.3.ebuild b/dev-ml/dune-site/dune-site-3.0.3.ebuild new file mode 100644 index 000000000000..8a13e19dec66 --- /dev/null +++ b/dev-ml/dune-site/dune-site-3.0.3.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2022 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.10.0.ebuild b/dev-ml/dune-site/dune-site-3.10.0.ebuild new file mode 100644 index 000000000000..7bf2f44ff50c --- /dev/null +++ b/dev-ml/dune-site/dune-site-3.10.0.ebuild @@ -0,0 +1,31 @@ +# 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-site/dune-site-3.2.0.ebuild b/dev-ml/dune-site/dune-site-3.2.0.ebuild new file mode 100644 index 000000000000..89ead937045c --- /dev/null +++ b/dev-ml/dune-site/dune-site-3.2.0.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2022 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.6.1.ebuild b/dev-ml/dune-site/dune-site-3.6.1.ebuild new file mode 100644 index 000000000000..89ead937045c --- /dev/null +++ b/dev-ml/dune-site/dune-site-3.6.1.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2022 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.6.2.ebuild b/dev-ml/dune-site/dune-site-3.6.2.ebuild new file mode 100644 index 000000000000..d93c7b05f97d --- /dev/null +++ b/dev-ml/dune-site/dune-site-3.6.2.ebuild @@ -0,0 +1,31 @@ +# 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.0.ebuild b/dev-ml/dune-site/dune-site-3.7.0.ebuild new file mode 100644 index 000000000000..86c18b3cac7e --- /dev/null +++ b/dev-ml/dune-site/dune-site-3.7.0.ebuild @@ -0,0 +1,31 @@ +# 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 new file mode 100644 index 000000000000..77728bf4e61b --- /dev/null +++ b/dev-ml/dune-site/dune-site-3.7.1.ebuild @@ -0,0 +1,31 @@ +# 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-site/dune-site-3.8.0.ebuild b/dev-ml/dune-site/dune-site-3.8.0.ebuild new file mode 100644 index 000000000000..7bf2f44ff50c --- /dev/null +++ b/dev-ml/dune-site/dune-site-3.8.0.ebuild @@ -0,0 +1,31 @@ +# 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-site/dune-site-3.9.0.ebuild b/dev-ml/dune-site/dune-site-3.9.0.ebuild new file mode 100644 index 000000000000..7bf2f44ff50c --- /dev/null +++ b/dev-ml/dune-site/dune-site-3.9.0.ebuild @@ -0,0 +1,31 @@ +# 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-site/dune-site-3.9.1.ebuild b/dev-ml/dune-site/dune-site-3.9.1.ebuild new file mode 100644 index 000000000000..7bf2f44ff50c --- /dev/null +++ b/dev-ml/dune-site/dune-site-3.9.1.ebuild @@ -0,0 +1,31 @@ +# 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-site/metadata.xml b/dev-ml/dune-site/metadata.xml new file mode 100644 index 000000000000..3cf03b345ced --- /dev/null +++ b/dev-ml/dune-site/metadata.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> + +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <bugs-to>https://github.com/ocaml/dune/issues/</bugs-to> + <remote-id type="github">ocaml/dune</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/dune/Manifest b/dev-ml/dune/Manifest index 9d7e2b12a79e..4bd2e9683929 100644 --- a/dev-ml/dune/Manifest +++ b/dev-ml/dune/Manifest @@ -1 +1,15 @@ -DIST dune-1.7.2.tar.gz 666745 BLAKE2B 2edda7273f92bcb9c20b5cb9a8eee75ad33c3ce1bd88406dbd51256373c554b5442096fb74ba990ee2fcec784c19ab55099e70385f040e1055a30c925cf50987 SHA512 2d53fb910fdf8774fc9ef5343831311d1d4007fe5ef47a5084596b98dd8c89b7a404912e959753d6a8d7eb8b8a923d6a7bc74dad2cdb2c80d26b3fa48373658c +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.0.3.tar.gz 1725788 BLAKE2B 2de93c085f642c8381642a08b18bc21ad48097f32397b3eddab9725deb267b089849b649705e1b72bb1b5b37f7531fd9e0cfb134174f0cb3a8ee2595c7dcf8ce SHA512 839e942bcf8189763d0d9b01614333bb2f036bce68c82959e51d2e9145b57067cb862b66781912391c1a0f531b8dddf2ffeafcee71c626169a437fe40feba155 +DIST dune-3.1.1.tar.gz 1738713 BLAKE2B 29e2034a551f9fbc57aeb1056f934ee5b69d38743178743f9b4f9cfa9e43a805ef7eb904a25f5ff6b4944d47032ccb1c8fb420b48f85dd14bdd14350cc53f77c SHA512 3a99a66c449f9e6bf12bb21d2d6871f4d34677a8c0c63e47b3687e2af3d8c62ab4ab62809c5885f2d61a1ed93a88f90cadc0f8db0c95442410c0a964892bd3b8 +DIST dune-3.10.0.tar.gz 2640800 BLAKE2B 5fc479a91ee6792f07a4fb61af530d55f46dea56b2fd5919975c0bfb231229395e7d0769bdae88419a89d378b8d7e2b229f7410ce7a34414629aa5117e606230 SHA512 2884a4eaaa44164ce911286ca6670b548a4a564e2b5040f05405d1d2729af84083fbfdde7c92db4f6f7a54d15a43fc9dddcec19d8d79d5a66221b2be861473de +DIST dune-3.2.0.tar.gz 1754664 BLAKE2B 97ba420a5bf9dd8e14ba74c0e91b6679924fd9ee7b8d9a9a2d4b282166d9172582a37adf408fd037972dab7525cd240c24729b6692f403c32029b2994044bd40 SHA512 a90ac689d97acab956fd96f16f7c6cfdc95d01785fc14f0d3c8ab39231ff78e8941d2db2fa8cbfaa39bbed8f865e11b628aacae1b22df49512a57d0263c0dca4 +DIST dune-3.5.0.tar.gz 1801260 BLAKE2B 684c6540c3f5e9356e12f1b483b1adbf9f4a44bb24fdd8b79bc5d48efab05b479cef0c9449adb84e3e30be81f07913460073928d5e91647096fc02608f8e9709 SHA512 f1a94d867e1b82502aed3f7ae16adb48bd1f773c0045c3313303f29b70ec99bed4264d420c85fe7c4be2343ac970586d77705f6083049c6bec860b543fbd3c3c +DIST dune-3.6.1.tar.gz 1843804 BLAKE2B 1e7bf67b596f60a553f00cfd8287ce36ef4ff5b8d8f16465df3f3b7b6d332ceef5101057df9389aeb9ceb4dc7f23bc69320412aebba7587deeb933a0f8ddca46 SHA512 2db83116a3d0995c8d0dfd6a1581d214f657a7d90c30dea04d5370327e13c575fed6ce74106a79c2e2fe0c02aa2912ae7a9f4e49c36985fb613b6a41de0700c9 +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 +DIST dune-3.8.0.tar.gz 2564537 BLAKE2B 773a2643b187f37dd2e21df41f18818753e249e66c2d98a4cfee3d9997f528827b2cf3c60d2992ffdc51397c393ac1a0fcc5339bdec2d87f82252114394d2355 SHA512 bba32fb508265329a2a46c9bd2e8b7e5f3d6d84390e842382ff4790f0d3414c9ff1d005c1af88988daaca29749729f1ced7b388f2d96432f01f2f4ea4714be98 +DIST dune-3.9.0.tar.gz 2609923 BLAKE2B f9fe8fb3c2e002e1eec141f487709d592df969ab44d41012ebaa436f17b6ee679e2e763d479106ae722b8b61be03fceb701b314c40c001d5895db99e5fbbe4a6 SHA512 86cd66222553f8cd7c1d1fb9e4e55169f9cd6d92e0bde1c56846b5e0fb6ae8494ac15ebb68d9e8761240f46dcc9b480747e48b21b74cff86e52cc45d3d222070 +DIST dune-3.9.1.tar.gz 2610113 BLAKE2B 0b97f6a951bd013a156a1417f6b65df17324adf13d48ad3b8bf45a4133cc77195e2118ae95f0cb9da488c26378b58ce677db8eb4b3cb028a73c779be57b2d611 SHA512 c997ec2205fa5391acbca9e196387cec1af69d3aed4cebe21d82edbe66bd91fda0c742e7ff2e3ffb8df88e2e379bbff68028574664cf375d04f4d3f3f2102f3b diff --git a/dev-ml/dune/dune-1.7.2.ebuild b/dev-ml/dune/dune-1.7.2.ebuild deleted file mode 100644 index f771167311a4..000000000000 --- a/dev-ml/dune/dune-1.7.2.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multiprocessing - -DESCRIPTION="A composable build system for OCaml" -HOMEPAGE="https://github.com/ocaml/dune" -SRC_URI="https://github.com/ocaml/dune/archive/1.7.2.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" -IUSE="test" - -DEPEND="dev-lang/ocaml" -RDEPEND="${DEPEND} - !dev-ml/jbuilder" -BDEPEND="" - -RESTRICT="test" - -src_configure() { - ocaml configure.ml --libdir "${EPREFIX}/usr/$(get_libdir)/ocaml" || die -} - -src_compile() { - ocaml bootstrap.ml || die - ./boot.exe -j $(makeopts_jobs) || die -} - -src_install() { - default - mv "${D}"/usr/doc "${D}"/usr/share/doc/${PF} - mv "${D}"/usr/man "${D}"/usr/share/man -} diff --git a/dev-ml/dune/dune-2.8.4.ebuild b/dev-ml/dune/dune-2.8.4.ebuild new file mode 100644 index 000000000000..23186715e63b --- /dev/null +++ b/dev-ml/dune/dune-2.8.4.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit multiprocessing + +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 x86" +IUSE="test" +RESTRICT="strip !test? ( test )" + +RDEPEND=" + >=dev-lang/ocaml-4.08:= + <dev-lang/ocaml-4.13 + !dev-ml/jbuilder +" +DEPEND=" + ${RDEPEND} + dev-ml/findlib + test? ( + dev-ml/core_bench + dev-ml/ppx_bench + dev-ml/ppx_expect + ) +" + +QA_FLAGS_IGNORED=/usr/bin/dune + +src_configure() { + : +} + +src_compile() { + ocaml bootstrap.ml || die + ./dune.exe build -p "${PN}" --profile dune-bootstrap -j $(makeopts_jobs) || die +} + +src_install() { + default + mv "${ED}"/usr/doc "${ED}"/usr/share/doc/${PF} || die + mv "${ED}"/usr/man "${ED}"/usr/share/man || die +} diff --git a/dev-ml/dune/dune-2.9.1.ebuild b/dev-ml/dune/dune-2.9.1.ebuild new file mode 100644 index 000000000000..0d23840a9520 --- /dev/null +++ b/dev-ml/dune/dune-2.9.1.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit multiprocessing + +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 x86" +IUSE="test" +RESTRICT="strip !test? ( test )" + +RDEPEND=" + >=dev-lang/ocaml-4.08:= + !dev-ml/jbuilder +" +DEPEND=" + ${RDEPEND} + dev-ml/findlib + test? ( + dev-ml/core_bench + dev-ml/ppx_bench + dev-ml/ppx_expect + ) +" + +QA_FLAGS_IGNORED="usr/bin/dune" + +src_configure() { + : +} + +src_compile() { + ocaml bootstrap.ml || die + ./dune.exe build -p "${PN}" --profile dune-bootstrap -j $(makeopts_jobs) || die +} + +src_install() { + default + mv "${ED}"/usr/doc "${ED}"/usr/share/doc/${PF} || die + mv "${ED}"/usr/man "${ED}"/usr/share/man || die +} diff --git a/dev-ml/dune/dune-2.9.3-r3.ebuild b/dev-ml/dune/dune-2.9.3-r3.ebuild new file mode 100644 index 000000000000..db4028ad7886 --- /dev/null +++ b/dev-ml/dune/dune-2.9.3-r3.ebuild @@ -0,0 +1,58 @@ +# 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 test" +RESTRICT="strip !test? ( test )" + +RDEPEND=" + >=dev-lang/ocaml-4.08:= + emacs? ( >=app-editors/emacs-23.1:* ) +" +DEPEND=" + ${RDEPEND} + dev-ml/findlib + test? ( + dev-ml/core_bench + dev-ml/ppx_bench + dev-ml/ppx_expect + ) +" + +QA_FLAGS_IGNORED="usr/bin/dune" + +BYTECOMPFLAGS="-L ${S}/editor-integration/emacs" +SITEFILE="50${PN}-gentoo.el" + +src_configure() { + : +} + +src_compile() { + ocaml bootstrap.ml -j $(makeopts_jobs) || die + ./dune.exe build -p "${PN}" --profile dune-bootstrap -j $(makeopts_jobs) \ + --display short || die + + use emacs && elisp-compile editor-integration/emacs/*.el +} + +src_install() { + default + mv "${ED}"/usr/doc "${ED}"/usr/share/doc/${PF} || die + mv "${ED}"/usr/man "${ED}"/usr/share/man || 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.0.3-r1.ebuild b/dev-ml/dune/dune-3.0.3-r1.ebuild new file mode 100644 index 000000000000..4021856b5e95 --- /dev/null +++ b/dev-ml/dune/dune-3.0.3-r1.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2022 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" \ + || die +} + +src_compile() { + ocaml bootstrap.ml -j $(makeopts_jobs) || die + ./dune.exe build -p "${PN}" --profile dune-bootstrap -j $(makeopts_jobs) \ + --display short || die + + use emacs && elisp-compile editor-integration/emacs/*.el +} + +src_install() { + ./dune.exe install --destdir="${D}" --prefix=/usr/ \ + --libdir=$(ocamlc -where) "${PN}" \ + || die + + 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.1.1.ebuild b/dev-ml/dune/dune-3.1.1.ebuild new file mode 100644 index 000000000000..4021856b5e95 --- /dev/null +++ b/dev-ml/dune/dune-3.1.1.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2022 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" \ + || die +} + +src_compile() { + ocaml bootstrap.ml -j $(makeopts_jobs) || die + ./dune.exe build -p "${PN}" --profile dune-bootstrap -j $(makeopts_jobs) \ + --display short || die + + use emacs && elisp-compile editor-integration/emacs/*.el +} + +src_install() { + ./dune.exe install --destdir="${D}" --prefix=/usr/ \ + --libdir=$(ocamlc -where) "${PN}" \ + || die + + 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.10.0.ebuild b/dev-ml/dune/dune-3.10.0.ebuild new file mode 100644 index 000000000000..4055f5de2e82 --- /dev/null +++ b/dev-ml/dune/dune-3.10.0.ebuild @@ -0,0 +1,68 @@ +# 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.2.0.ebuild b/dev-ml/dune/dune-3.2.0.ebuild new file mode 100644 index 000000000000..b406b7f73f41 --- /dev/null +++ b/dev-ml/dune/dune-3.2.0.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2022 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 bootstrap.ml -j $(makeopts_jobs) || die + ./dune.exe build -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.5.0.ebuild b/dev-ml/dune/dune-3.5.0.ebuild new file mode 100644 index 000000000000..b406b7f73f41 --- /dev/null +++ b/dev-ml/dune/dune-3.5.0.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2022 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 bootstrap.ml -j $(makeopts_jobs) || die + ./dune.exe build -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.6.1.ebuild b/dev-ml/dune/dune-3.6.1.ebuild new file mode 100644 index 000000000000..14540849f84b --- /dev/null +++ b/dev-ml/dune/dune-3.6.1.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2022 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.6.2.ebuild b/dev-ml/dune/dune-3.6.2.ebuild new file mode 100644 index 000000000000..fdcf2b0e013d --- /dev/null +++ b/dev-ml/dune/dune-3.6.2.ebuild @@ -0,0 +1,68 @@ +# 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 new file mode 100644 index 000000000000..fdcf2b0e013d --- /dev/null +++ b/dev-ml/dune/dune-3.7.0.ebuild @@ -0,0 +1,68 @@ +# 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 new file mode 100644 index 000000000000..794b4c3542f2 --- /dev/null +++ b/dev-ml/dune/dune-3.7.1.ebuild @@ -0,0 +1,68 @@ +# 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.8.0.ebuild b/dev-ml/dune/dune-3.8.0.ebuild new file mode 100644 index 000000000000..4055f5de2e82 --- /dev/null +++ b/dev-ml/dune/dune-3.8.0.ebuild @@ -0,0 +1,68 @@ +# 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.9.0.ebuild b/dev-ml/dune/dune-3.9.0.ebuild new file mode 100644 index 000000000000..4055f5de2e82 --- /dev/null +++ b/dev-ml/dune/dune-3.9.0.ebuild @@ -0,0 +1,68 @@ +# 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.9.1.ebuild b/dev-ml/dune/dune-3.9.1.ebuild new file mode 100644 index 000000000000..4055f5de2e82 --- /dev/null +++ b/dev-ml/dune/dune-3.9.1.ebuild @@ -0,0 +1,68 @@ +# 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/files/50dune-gentoo.el b/dev-ml/dune/files/50dune-gentoo.el new file mode 100644 index 000000000000..87fd7c6b28a9 --- /dev/null +++ b/dev-ml/dune/files/50dune-gentoo.el @@ -0,0 +1,4 @@ +(add-to-list 'load-path "@SITELISP@") +(autoload 'dune-mode "dune" + "Major mode to edit dune files." t) +(add-to-list 'auto-mode-alist '("\\(?:\\`\\|/\\)dune\\(?:\\.inc\\|\\-project\\)?\\'" . dune-mode)) diff --git a/dev-ml/dune/metadata.xml b/dev-ml/dune/metadata.xml index c5012bdb96b4..86dc156e664c 100644 --- a/dev-ml/dune/metadata.xml +++ b/dev-ml/dune/metadata.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">ocaml/dune</remote-id> diff --git a/dev-ml/duration/Manifest b/dev-ml/duration/Manifest new file mode 100644 index 000000000000..4826df0bf3d6 --- /dev/null +++ b/dev-ml/duration/Manifest @@ -0,0 +1 @@ +DIST duration-0.1.3.tar.gz 4295 BLAKE2B 1bcf0d457e76c6dfe05308dbbdcd02e534abecb621d30d4d031e2218da48515e1086c0c71c3c91ea84350143dc3255ae368d66ba43ec9fb763932efbb3654128 SHA512 eeb219821e65d5cdee0b1038afd856b58f21633498e8cae37a7195d2a045cd0b11c4c817a6518d20c5a6c5f8c7ebfa9b84dae16bb847a658a8dc1aae5a9be5ab diff --git a/dev-ml/duration/duration-0.1.3.ebuild b/dev-ml/duration/duration-0.1.3.ebuild new file mode 100644 index 000000000000..cfab3bd98bbf --- /dev/null +++ b/dev-ml/duration/duration-0.1.3.ebuild @@ -0,0 +1,18 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Duration - conversions to various time units" +HOMEPAGE="https://github.com/hannesm/duration" +SRC_URI="https://github.com/hannesm/duration/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="ISC" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +DEPEND="test? ( dev-ml/alcotest )" diff --git a/dev-ml/duration/metadata.xml b/dev-ml/duration/metadata.xml new file mode 100644 index 000000000000..68075586e3a6 --- /dev/null +++ b/dev-ml/duration/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <!-- maintainer-needed --> + <upstream> + <remote-id type="github">mirage/alcotest</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/dyn/Manifest b/dev-ml/dyn/Manifest new file mode 100644 index 000000000000..f68aa6173e46 --- /dev/null +++ b/dev-ml/dyn/Manifest @@ -0,0 +1,10 @@ +DIST dune-3.0.3.tar.gz 1725788 BLAKE2B 2de93c085f642c8381642a08b18bc21ad48097f32397b3eddab9725deb267b089849b649705e1b72bb1b5b37f7531fd9e0cfb134174f0cb3a8ee2595c7dcf8ce SHA512 839e942bcf8189763d0d9b01614333bb2f036bce68c82959e51d2e9145b57067cb862b66781912391c1a0f531b8dddf2ffeafcee71c626169a437fe40feba155 +DIST dune-3.10.0.tar.gz 2640800 BLAKE2B 5fc479a91ee6792f07a4fb61af530d55f46dea56b2fd5919975c0bfb231229395e7d0769bdae88419a89d378b8d7e2b229f7410ce7a34414629aa5117e606230 SHA512 2884a4eaaa44164ce911286ca6670b548a4a564e2b5040f05405d1d2729af84083fbfdde7c92db4f6f7a54d15a43fc9dddcec19d8d79d5a66221b2be861473de +DIST dune-3.2.0.tar.gz 1754664 BLAKE2B 97ba420a5bf9dd8e14ba74c0e91b6679924fd9ee7b8d9a9a2d4b282166d9172582a37adf408fd037972dab7525cd240c24729b6692f403c32029b2994044bd40 SHA512 a90ac689d97acab956fd96f16f7c6cfdc95d01785fc14f0d3c8ab39231ff78e8941d2db2fa8cbfaa39bbed8f865e11b628aacae1b22df49512a57d0263c0dca4 +DIST dune-3.6.1.tar.gz 1843804 BLAKE2B 1e7bf67b596f60a553f00cfd8287ce36ef4ff5b8d8f16465df3f3b7b6d332ceef5101057df9389aeb9ceb4dc7f23bc69320412aebba7587deeb933a0f8ddca46 SHA512 2db83116a3d0995c8d0dfd6a1581d214f657a7d90c30dea04d5370327e13c575fed6ce74106a79c2e2fe0c02aa2912ae7a9f4e49c36985fb613b6a41de0700c9 +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 +DIST dune-3.8.0.tar.gz 2564537 BLAKE2B 773a2643b187f37dd2e21df41f18818753e249e66c2d98a4cfee3d9997f528827b2cf3c60d2992ffdc51397c393ac1a0fcc5339bdec2d87f82252114394d2355 SHA512 bba32fb508265329a2a46c9bd2e8b7e5f3d6d84390e842382ff4790f0d3414c9ff1d005c1af88988daaca29749729f1ced7b388f2d96432f01f2f4ea4714be98 +DIST dune-3.9.0.tar.gz 2609923 BLAKE2B f9fe8fb3c2e002e1eec141f487709d592df969ab44d41012ebaa436f17b6ee679e2e763d479106ae722b8b61be03fceb701b314c40c001d5895db99e5fbbe4a6 SHA512 86cd66222553f8cd7c1d1fb9e4e55169f9cd6d92e0bde1c56846b5e0fb6ae8494ac15ebb68d9e8761240f46dcc9b480747e48b21b74cff86e52cc45d3d222070 +DIST dune-3.9.1.tar.gz 2610113 BLAKE2B 0b97f6a951bd013a156a1417f6b65df17324adf13d48ad3b8bf45a4133cc77195e2118ae95f0cb9da488c26378b58ce677db8eb4b3cb028a73c779be57b2d611 SHA512 c997ec2205fa5391acbca9e196387cec1af69d3aed4cebe21d82edbe66bd91fda0c742e7ff2e3ffb8df88e2e379bbff68028574664cf375d04f4d3f3f2102f3b diff --git a/dev-ml/dyn/dyn-3.0.3-r1.ebuild b/dev-ml/dyn/dyn-3.0.3-r1.ebuild new file mode 100644 index 000000000000..c25478c40de7 --- /dev/null +++ b/dev-ml/dyn/dyn-3.0.3-r1.ebuild @@ -0,0 +1,33 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune multiprocessing + +DESCRIPTION="Dynamic type" +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" +DEPEND="~dev-ml/ordering-${PV}:= + dev-ml/pp:=" +RDEPEND="${DEPEND}" + +src_configure() { + ./configure \ + --libdir="$(ocamlc -where)" \ + --mandir="/usr/share/man" \ + || die +} + +src_compile() { + dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die +} diff --git a/dev-ml/dyn/dyn-3.10.0.ebuild b/dev-ml/dyn/dyn-3.10.0.ebuild new file mode 100644 index 000000000000..a3d55d2d7132 --- /dev/null +++ b/dev-ml/dyn/dyn-3.10.0.ebuild @@ -0,0 +1,31 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune multiprocessing + +DESCRIPTION="Dynamic type" +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/ordering-${PV}:= + dev-ml/pp:=" +RDEPEND="${DEPEND}" + +src_configure() { + : +} + +src_compile() { + dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die +} diff --git a/dev-ml/dyn/dyn-3.2.0.ebuild b/dev-ml/dyn/dyn-3.2.0.ebuild new file mode 100644 index 000000000000..2aac9b876c8a --- /dev/null +++ b/dev-ml/dyn/dyn-3.2.0.ebuild @@ -0,0 +1,31 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune multiprocessing + +DESCRIPTION="Dynamic type" +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" +DEPEND="~dev-ml/ordering-${PV}:= + dev-ml/pp:=" +RDEPEND="${DEPEND}" + +src_configure() { + : +} + +src_compile() { + dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die +} diff --git a/dev-ml/dyn/dyn-3.6.1.ebuild b/dev-ml/dyn/dyn-3.6.1.ebuild new file mode 100644 index 000000000000..2ae92252343d --- /dev/null +++ b/dev-ml/dyn/dyn-3.6.1.ebuild @@ -0,0 +1,31 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune multiprocessing + +DESCRIPTION="Dynamic type" +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/ordering-${PV}:= + dev-ml/pp:=" +RDEPEND="${DEPEND}" + +src_configure() { + : +} + +src_compile() { + dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die +} diff --git a/dev-ml/dyn/dyn-3.6.2.ebuild b/dev-ml/dyn/dyn-3.6.2.ebuild new file mode 100644 index 000000000000..a9cca0b78834 --- /dev/null +++ b/dev-ml/dyn/dyn-3.6.2.ebuild @@ -0,0 +1,31 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune multiprocessing + +DESCRIPTION="Dynamic type" +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/ordering-${PV}:= + dev-ml/pp:=" +RDEPEND="${DEPEND}" + +src_configure() { + : +} + +src_compile() { + dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die +} diff --git a/dev-ml/dyn/dyn-3.7.0.ebuild b/dev-ml/dyn/dyn-3.7.0.ebuild new file mode 100644 index 000000000000..a3d55d2d7132 --- /dev/null +++ b/dev-ml/dyn/dyn-3.7.0.ebuild @@ -0,0 +1,31 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune multiprocessing + +DESCRIPTION="Dynamic type" +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/ordering-${PV}:= + dev-ml/pp:=" +RDEPEND="${DEPEND}" + +src_configure() { + : +} + +src_compile() { + dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die +} diff --git a/dev-ml/dyn/dyn-3.7.1.ebuild b/dev-ml/dyn/dyn-3.7.1.ebuild new file mode 100644 index 000000000000..53cc7fe224bf --- /dev/null +++ b/dev-ml/dyn/dyn-3.7.1.ebuild @@ -0,0 +1,31 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune multiprocessing + +DESCRIPTION="Dynamic type" +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/ordering-${PV}:= + dev-ml/pp:=" +RDEPEND="${DEPEND}" + +src_configure() { + : +} + +src_compile() { + dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die +} diff --git a/dev-ml/dyn/dyn-3.8.0.ebuild b/dev-ml/dyn/dyn-3.8.0.ebuild new file mode 100644 index 000000000000..a3d55d2d7132 --- /dev/null +++ b/dev-ml/dyn/dyn-3.8.0.ebuild @@ -0,0 +1,31 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune multiprocessing + +DESCRIPTION="Dynamic type" +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/ordering-${PV}:= + dev-ml/pp:=" +RDEPEND="${DEPEND}" + +src_configure() { + : +} + +src_compile() { + dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die +} diff --git a/dev-ml/dyn/dyn-3.9.0.ebuild b/dev-ml/dyn/dyn-3.9.0.ebuild new file mode 100644 index 000000000000..a3d55d2d7132 --- /dev/null +++ b/dev-ml/dyn/dyn-3.9.0.ebuild @@ -0,0 +1,31 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune multiprocessing + +DESCRIPTION="Dynamic type" +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/ordering-${PV}:= + dev-ml/pp:=" +RDEPEND="${DEPEND}" + +src_configure() { + : +} + +src_compile() { + dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die +} diff --git a/dev-ml/dyn/dyn-3.9.1.ebuild b/dev-ml/dyn/dyn-3.9.1.ebuild new file mode 100644 index 000000000000..a3d55d2d7132 --- /dev/null +++ b/dev-ml/dyn/dyn-3.9.1.ebuild @@ -0,0 +1,31 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune multiprocessing + +DESCRIPTION="Dynamic type" +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/ordering-${PV}:= + dev-ml/pp:=" +RDEPEND="${DEPEND}" + +src_configure() { + : +} + +src_compile() { + dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die +} diff --git a/dev-ml/dyn/metadata.xml b/dev-ml/dyn/metadata.xml new file mode 100644 index 000000000000..86dc156e664c --- /dev/null +++ b/dev-ml/dyn/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">ocaml/dune</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/easy-format/Manifest b/dev-ml/easy-format/Manifest index ebc45c6e83bd..0d1ebc2d8a42 100644 --- a/dev-ml/easy-format/Manifest +++ b/dev-ml/easy-format/Manifest @@ -1,2 +1 @@ -DIST easy-format-1.0.2.tar.gz 13679 BLAKE2B 5f738e521ef8eb59edbcba92f599328ab6f5e497075d8144335191835906832ecb4e4a8c6233c65f6f7aa7c4105aadd1dc1e269ad59a2c3237c54af8b3856e41 SHA512 bb12c13b33a725f4a15616672f7a268398b50e6f054575203f1d26c49aa04978564233fa9fb88eec8b701d7fecbbaeda264422e8c31a60a52d0d8e64bfc5898f DIST easy-format-1.2.0.tar.gz 15632 BLAKE2B 0bf20b87050330e90f3ef5cbe47470049ddc470d22357240f6b0ddd75138d3297935306c071e4355f02ed2fdd01a3155461e90a91df1346fa33180833db77b57 SHA512 375849b1ecd2e37f4b32d1ee12197a95856b17a47e3eb06a7e7320a82234c241156c3c8bfb18ce17bbe73b93d31d755675478860505470aa7ab866277a99603f diff --git a/dev-ml/easy-format/easy-format-1.0.2.ebuild b/dev-ml/easy-format/easy-format-1.0.2.ebuild deleted file mode 100644 index db163f33fd49..000000000000 --- a/dev-ml/easy-format/easy-format-1.0.2.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib - -DESCRIPTION="Pretty-printing library for OCaml" -HOMEPAGE="http://mjambon.com/easy-format.html" -SRC_URI="http://mjambon.com/releases/${PN}/${P}.tar.gz" - -SLOT="0/${PV}" -LICENSE="BSD" -KEYWORDS="~amd64" - -IUSE="examples +ocamlopt" - -RDEPEND="dev-lang/ocaml:=[ocamlopt?]" -DEPEND="${RDEPEND}" - -src_compile() { - emake all - use ocamlopt && emake opt -} - -src_install() { - findlib_src_install - dodoc README.md Changes - if use examples ; then - dodoc -r examples - docompress -x /usr/share/doc/${PF}/examples - fi -} diff --git a/dev-ml/easy-format/easy-format-1.2.0.ebuild b/dev-ml/easy-format/easy-format-1.2.0.ebuild index 669c69092068..d04158aa9caf 100644 --- a/dev-ml/easy-format/easy-format-1.2.0.ebuild +++ b/dev-ml/easy-format/easy-format-1.2.0.ebuild @@ -1,18 +1,17 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 inherit findlib DESCRIPTION="Pretty-printing library for OCaml" -HOMEPAGE="https://github.com/mjambon/easy-format" -SRC_URI="https://github.com/mjambon/easy-format/archive/v${PV}.tar.gz -> ${P}.tar.gz" +HOMEPAGE="https://github.com/ocaml-community/easy-format" +SRC_URI="https://github.com/ocaml-community/easy-format/archive/v${PV}.tar.gz -> ${P}.tar.gz" SLOT="0/${PV}" LICENSE="BSD" -KEYWORDS="~amd64" - +KEYWORDS="amd64" IUSE="examples +ocamlopt" RDEPEND="dev-lang/ocaml:=[ocamlopt?]" diff --git a/dev-ml/easy-format/metadata.xml b/dev-ml/easy-format/metadata.xml index baf19ddebea0..1e91a54d3cde 100644 --- a/dev-ml/easy-format/metadata.xml +++ b/dev-ml/easy-format/metadata.xml @@ -1,11 +1,8 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> + <!-- maintainer-needed --> <upstream> - <remote-id type="github">mjambon/easy-format</remote-id> + <remote-id type="github">ocaml-community/easy-format</remote-id> </upstream> </pkgmetadata> diff --git a/dev-ml/eliom/Manifest b/dev-ml/eliom/Manifest deleted file mode 100644 index c477e6903d23..000000000000 --- a/dev-ml/eliom/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST eliom-6.2.0.tar.gz 724359 BLAKE2B f52805c83f71eb76e3a183637d9800690714dbe07cbe82ad1bac09ea02ac286cbae541b22dea73592bd8cfa095700264c2a8903ead5fae498e847c4f6bdc8d47 SHA512 02ea52c78470f222297dd9f82218e82427ea2d2d0c9f261d1a9c2decbe7644c0bf583b77b8cef2577d5662d363efd276755f400e7a4c29c89a2265e49ca850db diff --git a/dev-ml/eliom/eliom-6.2.0.ebuild b/dev-ml/eliom/eliom-6.2.0.ebuild deleted file mode 100644 index b97e4135966f..000000000000 --- a/dev-ml/eliom/eliom-6.2.0.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils multilib findlib - -DESCRIPTION="A web framework to program client/server applications" -HOMEPAGE="http://ocsigen.org/eliom/" - -if [ "${PV#9999}" != "${PV}" ] ; then - inherit git-r3 - SRC_URI="" - EGIT_REPO_URI="https://github.com/ocsigen/eliom" - KEYWORDS="" -else - SRC_URI="https://github.com/ocsigen/eliom/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" -fi - -LICENSE="LGPL-2.1-with-linking-exception" -SLOT="0/${PV}" -IUSE="doc +ocamlopt +ppx" - -RDEPEND=">=dev-lang/ocaml-4.03:=[ocamlopt?] - >=dev-ml/js_of_ocaml-2.8.2:=[xml] - >=www-servers/ocsigenserver-2.8:= - >=dev-ml/tyxml-4:= - >=dev-ml/deriving-0.6:= - >=dev-ml/reactiveData-0.2.1:= - dev-ml/ocaml-ipaddr:= - dev-ml/react:= - dev-ml/ocaml-ssl:= - >=dev-ml/lwt-2.5.0:= - dev-ml/lwt_react:= - dev-ml/camlp4:= - ppx? ( >=dev-ml/ppx_tools-0.99.3:= )" -DEPEND="${RDEPEND} - dev-ml/ocamlbuild - dev-ml/opam" - -src_prepare() { - epatch "${FILESDIR}/lwt3.patch" -} - -src_compile() { - if use ocamlopt ; then - emake PPX=$(usex ppx true false) all - else - emake PPX=$(usex ppx true false) byte - fi - use doc && emake doc - emake man -} - -src_install() { - opam-installer \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - --mandir="${ED}/usr/share/man" \ - || die - dodoc CHANGES README.md - if use doc ; then - docinto client/html - dodoc -r _build/src/lib/client/api.docdir/* - docinto server/html - dodoc -r _build/src/lib/server/api.docdir/* - fi -} diff --git a/dev-ml/eliom/eliom-9999.ebuild b/dev-ml/eliom/eliom-9999.ebuild deleted file mode 100644 index cffa1b2c77a6..000000000000 --- a/dev-ml/eliom/eliom-9999.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils multilib findlib - -DESCRIPTION="A web framework to program client/server applications" -HOMEPAGE="http://ocsigen.org/eliom/" - -if [ "${PV#9999}" != "${PV}" ] ; then - inherit git-r3 - SRC_URI="" - EGIT_REPO_URI="https://github.com/ocsigen/eliom" - KEYWORDS="" -else - SRC_URI="https://github.com/ocsigen/eliom/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" -fi - -LICENSE="LGPL-2.1-with-linking-exception" -SLOT="0/${PV}" -IUSE="doc +ocamlopt +ppx" - -RDEPEND=">=dev-lang/ocaml-4.03:=[ocamlopt?] - >=dev-ml/js_of_ocaml-2.8.2:=[xml] - >=www-servers/ocsigenserver-2.8:= - >=dev-ml/tyxml-4:= - >=dev-ml/deriving-0.6:= - >=dev-ml/reactiveData-0.2.1:= - dev-ml/ocaml-ipaddr:= - dev-ml/react:= - dev-ml/ocaml-ssl:= - >=dev-ml/lwt-2.5.0:= - dev-ml/lwt_react:= - dev-ml/camlp4:= - ppx? ( >=dev-ml/ppx_tools-0.99.3:= )" -DEPEND="${RDEPEND} - dev-ml/ocamlbuild - dev-ml/opam" - -src_compile() { - if use ocamlopt ; then - emake PPX=$(usex ppx true false) all - else - emake PPX=$(usex ppx true false) byte - fi - use doc && emake doc - emake man -} - -src_install() { - opam-installer \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - --mandir="${ED}/usr/share/man" \ - || die - dodoc CHANGES README.md - if use doc ; then - docinto client/html - dodoc -r _build/src/lib/client/api.docdir/* - docinto server/html - dodoc -r _build/src/lib/server/api.docdir/* - fi -} diff --git a/dev-ml/eliom/files/lwt3.patch b/dev-ml/eliom/files/lwt3.patch deleted file mode 100644 index 6b8d993fb687..000000000000 --- a/dev-ml/eliom/files/lwt3.patch +++ /dev/null @@ -1,44 +0,0 @@ -Index: eliom-6.2.0/pkg/META -=================================================================== ---- eliom-6.2.0.orig/pkg/META -+++ eliom-6.2.0/pkg/META -@@ -13,7 +13,7 @@ package "server" ( - react, - reactiveData, - tyxml, -- lwt.react, -+ lwt_react, - cryptokit, - reactiveData" - archive(byte) = "server.cma" -@@ -49,7 +49,7 @@ package "client" ( - js_of_ocaml.tyxml, - js_of_ocaml.log, - js_of_ocaml.weak, -- lwt.react, -+ lwt_react, - react, - reactiveData, - tyxml.functor" -Index: eliom-6.2.0/src/_tags -=================================================================== ---- eliom-6.2.0.orig/src/_tags -+++ eliom-6.2.0/src/_tags -@@ -11,7 +11,7 @@ true:keep_locs - - <lib/server/*.ml{,i}>:thread - <lib/server/*.ml{,i}>:package(lwt,ocsigenserver,ocsigenserver.ext,tyxml.functor) --<lib/server/*.ml{,i}>:package(react,js_of_ocaml) -+<lib/server/*.ml{,i}>:package(lwt_react,react,js_of_ocaml) - - <lib/server/*.ml{,i}>:package(js_of_ocaml.deriving.ppx) - -@@ -24,7 +24,7 @@ true:keep_locs - <lib/client/*.ml{,i}>: eliom_ppx - <lib/client/*.ml{,i}>:package(ocsigenserver.cookies,ocsigenserver.polytables,ocsigenserver.baselib.base) - <lib/client/*.ml{,i}>:package(deriving.runtime,js_of_ocaml.deriving) --<lib/client/*.ml{,i}>:package(lwt.react,tyxml.functor,js_of_ocaml.tyxml) -+<lib/client/*.ml{,i}>:package(lwt_react,tyxml.functor,js_of_ocaml.tyxml) - <lib/client/*.ml{,i}>:package(react,js_of_ocaml,reactiveData) - - <lib/client/*.ml{,i}>:package(js_of_ocaml.deriving.ppx) diff --git a/dev-ml/eliom/metadata.xml b/dev-ml/eliom/metadata.xml deleted file mode 100644 index 8cff44a8f0c9..000000000000 --- a/dev-ml/eliom/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">ocsigen/eliom</remote-id> - </upstream> - <use> - <flag name="ppx">Enable PPX syntax extension support.</flag> - </use> -</pkgmetadata> diff --git a/dev-ml/enumerate/Manifest b/dev-ml/enumerate/Manifest deleted file mode 100644 index 1bfc7c27ae0b..000000000000 --- a/dev-ml/enumerate/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST enumerate-111.08.00.tar.gz 52498 BLAKE2B 74a29099613fb83950d11d3e40298390f2c1675306b5cafea36560bb557088829c6165dfe6995a4221fa87c7aba8ec28f88d481e5e3199ae4299e67183faf6c9 SHA512 fdedc584923552e898e0932c75b9a9c48c7c90291239cf6b5b26860b0714f2f3582f1d00acc247fb28ecb8c6e26867fc1e56c7df18fefd70eb2910ef1dfdcc3c diff --git a/dev-ml/enumerate/enumerate-111.08.00-r1.ebuild b/dev-ml/enumerate/enumerate-111.08.00-r1.ebuild deleted file mode 100644 index 1ede1a690435..000000000000 --- a/dev-ml/enumerate/enumerate-111.08.00-r1.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit oasis - -MY_P=${PN/-/_}-${PV} -DESCRIPTION="Syntax extension to produce a list of all values of a type" -HOMEPAGE="http://www.janestreet.com/ocaml" -SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV%.*}.00/individual/${MY_P}.tar.gz - https://dev.gentoo.org/~aballier/distfiles/${MY_P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -DEPEND=" - >=dev-ml/type-conv-111.13:= - dev-ml/camlp4:=" - -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" -DOCS=( README.md ) diff --git a/dev-ml/enumerate/metadata.xml b/dev-ml/enumerate/metadata.xml deleted file mode 100644 index ffac4d7ebc01..000000000000 --- a/dev-ml/enumerate/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> -</maintainer> -</pkgmetadata> diff --git a/dev-ml/expect_test_helpers_core/Manifest b/dev-ml/expect_test_helpers_core/Manifest new file mode 100644 index 000000000000..802be1a6ca16 --- /dev/null +++ b/dev-ml/expect_test_helpers_core/Manifest @@ -0,0 +1,2 @@ +DIST expect_test_helpers_core-0.15.0.tar.gz 19807 BLAKE2B aca6103a7a50d7cf666ff6acb7b5430a5b0667efe039d200bc9ed2e430b91c4ed9a75378ceb0142e5d8d419ca6b3be508dc75c8e7fb5ff23101ebc012c70a9c0 SHA512 c08bda03c3bbc5c7ee1e970b5ba03e319826b7dd550d073f69b373bfa429c489ae1fcd388a2629f3d81729a96aac5614b4b1bcadd4040a290ffaab55b26bb9d6 +DIST expect_test_helpers_core-0.16.0.tar.gz 22549 BLAKE2B 2925c572a97a4bada839f98bea50f503d138d43550e1849ae23f4f553c5402c86135ad6ef1e57e9a5a382a2aae719bf88b8550399824294970350fbe0fa5d474 SHA512 057504994125e05c02264eef4766e58619d1f89039836b994487cc8627786c0e0d1491ab8a3ffa02ac19cb8d0754f4af88188a47d25cbe89c5a51b04ac002c95 diff --git a/dev-ml/expect_test_helpers_core/expect_test_helpers_core-0.15.0-r1.ebuild b/dev-ml/expect_test_helpers_core/expect_test_helpers_core-0.15.0-r1.ebuild new file mode 100644 index 000000000000..b9603a54f677 --- /dev/null +++ b/dev-ml/expect_test_helpers_core/expect_test_helpers_core-0.15.0-r1.ebuild @@ -0,0 +1,26 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Helpers for writing expectation tests" +HOMEPAGE="https://github.com/janestreet/expect_test_helpers_core" +SRC_URI="https://github.com/janestreet/${PN}/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86" +IUSE="+ocamlopt" + +DEPEND=" + dev-ml/base:${SLOT} + dev-ml/core:${SLOT} + dev-ml/ppx_jane:${SLOT} + dev-ml/stdio:${SLOT} + dev-ml/sexp_pretty:${SLOT} +" +RDEPEND="${DEPEND}" +BDEPEND="" diff --git a/dev-ml/expect_test_helpers_core/expect_test_helpers_core-0.16.0.ebuild b/dev-ml/expect_test_helpers_core/expect_test_helpers_core-0.16.0.ebuild new file mode 100644 index 000000000000..d9880e2ad159 --- /dev/null +++ b/dev-ml/expect_test_helpers_core/expect_test_helpers_core-0.16.0.ebuild @@ -0,0 +1,27 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Helpers for writing expectation tests" +HOMEPAGE="https://github.com/janestreet/expect_test_helpers_core" +SRC_URI="https://github.com/janestreet/${PN}/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-lang/ocaml-4.14 + dev-ml/base:${SLOT} + dev-ml/core:${SLOT} + dev-ml/ppx_jane:${SLOT} + dev-ml/stdio:${SLOT} + dev-ml/sexp_pretty:${SLOT} +" +RDEPEND="${DEPEND}" +BDEPEND="" diff --git a/dev-ml/jbuilder/metadata.xml b/dev-ml/expect_test_helpers_core/metadata.xml index 9f016f75c9de..75c2f2cf0a19 100644 --- a/dev-ml/jbuilder/metadata.xml +++ b/dev-ml/expect_test_helpers_core/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> - <remote-id type="github">janestreet/jbuilder</remote-id> + <remote-id type="github">janestreet/expect_test_helpers_core</remote-id> </upstream> </pkgmetadata> diff --git a/dev-ml/extlib/Manifest b/dev-ml/extlib/Manifest index fc8595fba34c..8680df81ceb4 100644 --- a/dev-ml/extlib/Manifest +++ b/dev-ml/extlib/Manifest @@ -1,2 +1,3 @@ -DIST extlib-1.7.1.tar.gz 85397 BLAKE2B f2e924f651cc43ca29914c95400a26bfd062ecb4e7379d169533d394497215906b56e8f57ba29358965f0b8c125c33dcb9a0a95c09488404fd348261d075457f SHA512 42ea1be22a57ab31e5857df0c4c0f98a07e1b5958b34181cd5ab7c83ded112c208315d22cd3dd178d53e75ca109a70cb47ae479e95be8c47ea2087b1a158dc4d -DIST extlib-1.7.2.tar.gz 85934 BLAKE2B fab7f5f99be414a83f46144bc8f2f54aeb545ef9041b62f227f9dafd267a3f8608b94388ffc39903b069ec7d481b4da8a6a2e9aa289c68263613cf64aa6a45e0 SHA512 d9f34f5bbd5e94a8dccc5bdbc1ec0e5015608675469c4f513461fa587a5eb7e1398542388fd885d7656591ca85ce30c0e2a9ee26b9722a9dd65189aac35d64ed +DIST extlib-1.7.7.tar.gz 88870 BLAKE2B fff84524ef227718d3908c5b65f4b781360cebc0dca3a8862aa11ea671499b45192c5106769e104d396118e3cdcd904ddce06df784f8fd0eadb7a2372ca3df94 SHA512 088a6c5bbe6530cd60e2276dc02592b69ad7ad685b752f0544c54b6246b8131238c6423ce7bfc81fe3ad1766f605ecf52fd3888d55cca63e22c947afedf610c5 +DIST extlib-1.7.8.tar.gz 90213 BLAKE2B cf78d819c542e84825bea3422d1b9afb46a3f72274ac40c704ae872a5889cbe0793f1e27f2dd8f38dee118590300d3bc6a336bfd29a16dfad00008a63ceeb17c SHA512 4a0d5d82da068c34286a1547e173f2634372d01c201823edfda2b8f72d3ff58fa26da29dde9a8b2fda28989cdb655d5a9cfd71310660e5c593026a75a833e6c6 +DIST extlib-1.7.9.tar.gz 91092 BLAKE2B 6d5f0dc01813357fd9b3efcbe0e4c4308eb538deb924cbff2919bc6e24b72e3fc631b428c1e67f90ea32005b87c16147265c80d61d8feb97df0223bc9b14736b SHA512 859cf5b9743589037f9e1b5f00ea77ae2401657b3dfc6897d21c89d5f8a1d7e7ac901eb6eaa16722e6b6a0266fa634c40320d13fcf7bdfad2863512b5f79e591 diff --git a/dev-ml/extlib/extlib-1.7.7-r1.ebuild b/dev-ml/extlib/extlib-1.7.7-r1.ebuild new file mode 100644 index 000000000000..b21b2aaa3217 --- /dev/null +++ b/dev-ml/extlib/extlib-1.7.7-r1.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit findlib vcs-clean + +DESCRIPTION="Standard library extensions for O'Caml" +HOMEPAGE="https://github.com/ygrek/ocaml-extlib" +SRC_URI="https://github.com/ygrek/ocaml-extlib/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="doc +ocamlopt" + +# See bug #704146 +BDEPEND=">=dev-ml/cppo-1.6.6" +RDEPEND="dev-lang/ocaml:=[ocamlopt?]" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-1.7.7-no-git.patch + "${FILESDIR}"/0001-Add-support-for-OCaml-4.12.patch + "${FILESDIR}"/0002-caml_hash_univ_param-was-removed-for-OCaml-pre-4.00-.patch +) + +S="${WORKDIR}/ocaml-${P}" + +src_prepare() { + default + egit_clean +} + +src_compile() { + cd src || die + emake -j1 all + if use ocamlopt; then + emake opt cmxs + fi + + if use doc; then + emake doc + fi +} + +src_test() { + emake -j1 test +} + +src_install() { + findlib_src_install + + # install documentation + dodoc README.md + + if use doc; then + dodoc -r src/doc/ + fi +} diff --git a/dev-ml/extlib/extlib-1.7.2.ebuild b/dev-ml/extlib/extlib-1.7.7.ebuild index 4f53ed7d6c4a..6eb7da423b2d 100644 --- a/dev-ml/extlib/extlib-1.7.2.ebuild +++ b/dev-ml/extlib/extlib-1.7.7.ebuild @@ -1,26 +1,37 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit findlib eutils +inherit findlib vcs-clean DESCRIPTION="Standard library extensions for O'Caml" HOMEPAGE="https://github.com/ygrek/ocaml-extlib" SRC_URI="https://github.com/ygrek/ocaml-extlib/archive/${PV}.tar.gz -> ${P}.tar.gz" + LICENSE="LGPL-2.1" -DEPEND=" - >=dev-lang/ocaml-3.10.2:=[ocamlopt?] - dev-ml/cppo:= -" -RDEPEND="${DEPEND}" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="doc +ocamlopt" + +# See bug #704146 +BDEPEND=">=dev-ml/cppo-1.6.6" +RDEPEND="dev-lang/ocaml:=[ocamlopt?]" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-1.7.7-no-git.patch +) + S="${WORKDIR}/ocaml-${P}" +src_prepare() { + default + egit_clean +} + src_compile() { - cd src + cd src || die emake -j1 all if use ocamlopt; then emake opt cmxs @@ -35,13 +46,13 @@ src_test() { emake -j1 test } -src_install () { +src_install() { findlib_src_install # install documentation dodoc README.md if use doc; then - dohtml src/doc/* + dodoc -r src/doc/ fi } diff --git a/dev-ml/extlib/extlib-1.7.1.ebuild b/dev-ml/extlib/extlib-1.7.8.ebuild index 33dffa043aaf..c30dcec272da 100644 --- a/dev-ml/extlib/extlib-1.7.1.ebuild +++ b/dev-ml/extlib/extlib-1.7.8.ebuild @@ -1,30 +1,32 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit findlib eutils +inherit findlib vcs-clean DESCRIPTION="Standard library extensions for O'Caml" HOMEPAGE="https://github.com/ygrek/ocaml-extlib" SRC_URI="https://github.com/ygrek/ocaml-extlib/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/ocaml-${P}" + LICENSE="LGPL-2.1" -DEPEND=" - >=dev-lang/ocaml-3.10.2:=[ocamlopt?] - dev-ml/cppo:= -" -RDEPEND="${DEPEND}" SLOT="0/${PV}" -KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="doc +ocamlopt" -S="${WORKDIR}/ocaml-${P}" + +# See bug #704146 +BDEPEND=">=dev-ml/cppo-1.6.6" +RDEPEND="dev-lang/ocaml:=[ocamlopt?]" +DEPEND="${RDEPEND}" src_prepare() { - epatch "${FILESDIR}/ocaml405.patch" + default + egit_clean } src_compile() { - cd src + cd src || die emake -j1 all if use ocamlopt; then emake opt cmxs @@ -39,13 +41,13 @@ src_test() { emake -j1 test } -src_install () { +src_install() { findlib_src_install # install documentation dodoc README.md if use doc; then - dohtml src/doc/* + dodoc -r src/doc/ fi } diff --git a/dev-ml/extlib/extlib-1.7.9.ebuild b/dev-ml/extlib/extlib-1.7.9.ebuild new file mode 100644 index 000000000000..841d9be0a9d8 --- /dev/null +++ b/dev-ml/extlib/extlib-1.7.9.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit findlib vcs-clean + +DESCRIPTION="Standard library extensions for O'Caml" +HOMEPAGE="https://github.com/ygrek/ocaml-extlib/" +SRC_URI="https://github.com/ygrek/ocaml-extlib/archive/${PV}.tar.gz + -> ${P}.tar.gz" +S="${WORKDIR}"/ocaml-${P} + +LICENSE="LGPL-2.1" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="doc +ocamlopt" + +# See bug #704146 +BDEPEND=">=dev-ml/cppo-1.6.6" +RDEPEND="dev-lang/ocaml:=[ocamlopt?]" +DEPEND="${RDEPEND}" + +src_prepare() { + default + + egit_clean +} + +src_compile() { + cd "${S}"/src || die + + emake -j1 all + + use ocamlopt && emake opt cmxs + use doc && emake doc +} + +src_test() { + emake -j1 test +} + +src_install() { + findlib_src_install + + dodoc README.md + + use doc && dodoc -r src/doc/ +} diff --git a/dev-ml/extlib/files/0001-Add-support-for-OCaml-4.12.patch b/dev-ml/extlib/files/0001-Add-support-for-OCaml-4.12.patch new file mode 100644 index 000000000000..8a2d076f8224 --- /dev/null +++ b/dev-ml/extlib/files/0001-Add-support-for-OCaml-4.12.patch @@ -0,0 +1,25 @@ +From 3b2073701aed50cd768e0a4cd3c776c7a3a54d7e Mon Sep 17 00:00:00 2001 +From: Kate <kit.ty.kate@disroot.org> +Date: Thu, 5 Nov 2020 22:17:24 +0000 +Subject: [PATCH 1/2] Add support for OCaml 4.12 + +--- + src/extList.ml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/extList.ml b/src/extList.ml +index 4f0057f..a1435ee 100644 +--- a/src/extList.ml ++++ b/src/extList.ml +@@ -380,7 +380,7 @@ let combine l1 l2 = + loop dummy l1 l2; + dummy.tl + +-let sort ?(cmp=compare) = List.sort cmp ++let sort ?(cmp=Pervasives.compare) = List.sort cmp + + #if OCAML < 406 + let rec init size f = +-- +2.30.0 + diff --git a/dev-ml/extlib/files/0002-caml_hash_univ_param-was-removed-for-OCaml-pre-4.00-.patch b/dev-ml/extlib/files/0002-caml_hash_univ_param-was-removed-for-OCaml-pre-4.00-.patch new file mode 100644 index 000000000000..59a6843f3a15 --- /dev/null +++ b/dev-ml/extlib/files/0002-caml_hash_univ_param-was-removed-for-OCaml-pre-4.00-.patch @@ -0,0 +1,38 @@ +From 574e8eae2d358b6db62c2d062b194a7aa06ac02c Mon Sep 17 00:00:00 2001 +From: Kate <kit.ty.kate@disroot.org> +Date: Fri, 6 Nov 2020 14:10:26 +0000 +Subject: [PATCH 2/2] caml_hash_univ_param was removed for OCaml (pre-4.00 + function) + +--- + src/extHashtbl.ml | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/extHashtbl.ml b/src/extHashtbl.ml +index 140e9c2..3c69df4 100644 +--- a/src/extHashtbl.ml ++++ b/src/extHashtbl.ml +@@ -22,7 +22,7 @@ + module Hashtbl = + struct + +-#if OCAML >= 400 ++#if OCAML >= 400 && OCAML < 412 + external old_hash_param : + int -> int -> 'a -> int = "caml_hash_univ_param" "noalloc" + #endif +@@ -114,7 +114,11 @@ module Hashtbl = + (* compatibility with old hash tables *) + if Obj.size (Obj.repr h) >= 3 + then (seeded_hash_param 10 100 (h_conv h).seed key) land (Array.length (h_conv h).data - 1) ++ #if OCAML >= 412 ++ else failwith "Old hash function not supported anymore" ++ #else + else (old_hash_param 10 100 key) mod (Array.length (h_conv h).data) ++ #endif + #else + let key_index h key = (hash key) mod (Array.length (h_conv h).data) + #endif +-- +2.30.0 + diff --git a/dev-ml/extlib/files/extlib-1.7.7-no-git.patch b/dev-ml/extlib/files/extlib-1.7.7-no-git.patch new file mode 100644 index 000000000000..058543455bce --- /dev/null +++ b/dev-ml/extlib/files/extlib-1.7.7-no-git.patch @@ -0,0 +1,9 @@ +--- ocaml-extlib-1.7.7-orig/Makefile 2020-04-25 07:55:13.000000000 +1000 ++++ ocaml-extlib-1.7.7/Makefile 2020-09-26 07:17:42.141178856 +1000 +@@ -1,5 +1,5 @@ + +-VERSION:=$(shell git --git-dir=.git describe --always --long) ++VERSION:=1.7.7-0-gbd9f453 + RELEASE:=1.7.7 + + ifndef VERSION diff --git a/dev-ml/extlib/files/ocaml405.patch b/dev-ml/extlib/files/ocaml405.patch deleted file mode 100644 index 4e3b04a1c8e5..000000000000 --- a/dev-ml/extlib/files/ocaml405.patch +++ /dev/null @@ -1,35 +0,0 @@ -Index: ocaml-extlib-1.7.1/src/configure.ml -=================================================================== ---- ocaml-extlib-1.7.1.orig/src/configure.ml -+++ ocaml-extlib-1.7.1/src/configure.ml -@@ -3,5 +3,6 @@ let () = - print_endline (if Sys.ocaml_version >= "4.02.0" then "-D OCAML4_02 " else ""); - print_endline (if Sys.ocaml_version >= "4.03.0" then "-D OCAML4_03 " else ""); - print_endline (if Sys.ocaml_version >= "4.04.0" then "-D OCAML4_04 " else ""); -+ print_endline (if Sys.ocaml_version >= "4.05.0" then "-D OCAML4_05 " else ""); - let (_:int) = Sys.command "ocamlfind query -format \"-D WITH_BYTES\" bytes" in (); - exit 0 -Index: ocaml-extlib-1.7.1/src/extHashtbl.mli -=================================================================== ---- ocaml-extlib-1.7.1.orig/src/extHashtbl.mli -+++ ocaml-extlib-1.7.1/src/extHashtbl.mli -@@ -132,6 +132,9 @@ module type S = - val add : 'a t -> key -> 'a -> unit - val remove : 'a t -> key -> unit - val find : 'a t -> key -> 'a -+#ifdef OCAML4_05 -+ val find_opt: 'a t -> key -> 'a option -+#endif - val find_all : 'a t -> key -> 'a list - val replace : 'a t -> key -> 'a -> unit - val mem : 'a t -> key -> bool -@@ -167,6 +170,9 @@ module type SeededS = - val add : 'a t -> key -> 'a -> unit - val remove : 'a t -> key -> unit - val find : 'a t -> key -> 'a -+#ifdef OCAML4_05 -+ val find_opt : 'a t -> key -> 'a option -+#endif - val find_all : 'a t -> key -> 'a list - val replace : 'a t -> key -> 'a -> unit - val mem : 'a t -> key -> bool diff --git a/dev-ml/extlib/metadata.xml b/dev-ml/extlib/metadata.xml index 69a0f75ce938..81020e2847ef 100644 --- a/dev-ml/extlib/metadata.xml +++ b/dev-ml/extlib/metadata.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="google-code">ocaml-extlib</remote-id> diff --git a/dev-ml/facile/Manifest b/dev-ml/facile/Manifest index 65406b20bc00..95ae8dfd8d61 100644 --- a/dev-ml/facile/Manifest +++ b/dev-ml/facile/Manifest @@ -1 +1 @@ -DIST facile-1.1.3.tar.gz 99656 BLAKE2B 19d81c48c39b96083628cc40eb9aca7e8ad7dea4ae81c884bfb22daa56135ac411698d57b68f3112829a1fc53d29612627809901c6e30eb4672776508eee57b2 SHA512 78d315188e661245eb7306b645e9baaca94db0b9511112b57dbc8597bf2f75cab5604c8f4cf850209464e802c636f592552c8b492730cb28896d2acd7f413346 +DIST facile-1.1.4.tbz 83874 BLAKE2B a0921615425124b6f1ba51a939bd4c89bcab71a0341e5b866f2c44d89863c077c42f269fcee2a8e302c580ce618c4e765f826fd9c4855f9e992c35cbdc8660db SHA512 b4484275ebf7f0bd271d865c6745bd1784e2260060470f64f86a18833a9663efbf56b089ae668c51f57bc8473281af4e92d461b87eefb2c62162fa7da60838f9 diff --git a/dev-ml/facile/facile-1.1.3.ebuild b/dev-ml/facile/facile-1.1.3.ebuild deleted file mode 100644 index 4bf113237c45..000000000000 --- a/dev-ml/facile/facile-1.1.3.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="OCaml constraint programming library on integer & integer set finite domains" -HOMEPAGE="http://opti.recherche.enac.fr/" -SRC_URI="http://opti.recherche.enac.fr/facile/distrib/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0/${PV}" - -KEYWORDS="alpha amd64 arm64 hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd" -IUSE="+ocamlopt" - -RDEPEND=">=dev-lang/ocaml-4:=[ocamlopt?]" -DEPEND="${RDEPEND} - sys-apps/sed -" - -DOCS=( README ) - -PATCHES=( "${FILESDIR}/${PN}"-1.1-make.patch ) # Fix building on FreeBSD - -src_prepare() { - default - - # Disable building native code objects if we dont have/want ocamlopt - if ! use ocamlopt; then - sed -i -e 's/\.opt//' src/Makefile || die "failed to change native code compiler to bytecode ones" - sed -i -e 's/ facile\.cmxa//' src/Makefile || die "failed to remove native code objects" - sed -i -e 's/\.opt/.out/g' \ - -e 's: src/facile\.cmxa::'\ - -e 's: src/facile\.a::'\ - -e 's:^.*facile\.cmxa::'\ - -e 's:^.*facile\.a::' Makefile || die "failed to remove native code objects" - fi -} - -src_configure(){ - # This is a custom configure script and it does not support standard options - ./configure --faciledir "${D}"$(ocamlc -where)/facile/ || die -} - -src_test() { - emake check -} - -src_install(){ - dodir $(ocamlc -where) - emake install - einstalldocs -} diff --git a/dev-ml/facile/facile-1.1.4.ebuild b/dev-ml/facile/facile-1.1.4.ebuild new file mode 100644 index 000000000000..41a016660704 --- /dev/null +++ b/dev-ml/facile/facile-1.1.4.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="OCaml constraint programming library on integer & integer set finite domains" +HOMEPAGE="http://opti.recherche.enac.fr/" +SRC_URI="https://github.com/Emmanuel-PLF/${PN}/releases/download/${PV}/${P}.tbz" + +LICENSE="LGPL-2.1" +SLOT="0/${PV}" + +KEYWORDS="amd64 arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt" + +RDEPEND=">=dev-lang/ocaml-4:=[ocamlopt?]" +DEPEND="${RDEPEND}" + +PATCHES=( "${FILESDIR}"/${P}-dune.patch ) diff --git a/dev-ml/facile/files/facile-1.1-make.patch b/dev-ml/facile/files/facile-1.1-make.patch deleted file mode 100644 index 7b77639d2277..000000000000 --- a/dev-ml/facile/files/facile-1.1-make.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -ur a/Makefile b/Makefile ---- a/Makefile 2004-09-08 10:51:02 +0100 -+++ b/Makefile 2007-10-23 13:11:28 +0100 -@@ -3,7 +3,7 @@ - include config_Makefile - - compile: -- cd src; make -+ cd src; $(MAKE) - - install: - if test -d $(FACILEDIR); then : ; else mkdir $(FACILEDIR); fi -@@ -14,10 +14,10 @@ - chmod a+r $(FACILEDIR)/facile.a - - clean: -- cd src; make clean -+ cd src; $(MAKE) clean - - distclean uninstall: - rm -fr $(FACILEDIR) - - check: -- cd examples; make FACILEDIR=../src queens.opt; ./queens.opt 8 -+ cd examples; $(MAKE) FACILEDIR=../src queens.opt; ./queens.opt 8 -diff -ur a/src/Makefile b/src/Makefile ---- a/src/Makefile 2004-09-08 10:51:02 +0100 -+++ b/src/Makefile 2007-10-23 13:10:34 +0100 -@@ -28,7 +28,7 @@ - # Version of the library to be linked with the -p (profiler) option - facile.p.cmxa : $(CSTR) - rm -fr $(CSTRCMX) -- make facile.cmxa OPTOPT=-p -+ $(MAKE) facile.cmxa OPTOPT=-p - rm -fr $(CSTRCMX) - mv facile.cmxa $@ - mv facile.a facile.p.a -@@ -41,8 +41,8 @@ - # Does not work with many modules (e.g. containing class expressions - facile.exp.cmxa : $(CSTR) - rm -fr $(CSTRCMX) -- make fcl_stak.cmx fcl_cstr.cmx fcl_inv.cmx fcl_reify.cmx fcl_arith.cmx fcl_goals.cmx fcl_fdArray.cmx fcl_gcc.cmx fcl_alldiff.cmx fcl_sorting.cmx fcl_interval.cmx facile.cmx -- make facile.cmxa OPTOPT="-pp inline_functors" -+ $(MAKE) fcl_stak.cmx fcl_cstr.cmx fcl_inv.cmx fcl_reify.cmx fcl_arith.cmx fcl_goals.cmx fcl_fdArray.cmx fcl_gcc.cmx fcl_alldiff.cmx fcl_sorting.cmx fcl_interval.cmx facile.cmx -+ $(MAKE) facile.cmxa OPTOPT="-pp inline_functors" - rm -fr $(CSTRCMX) - mv facile.cmxa $@ - mv facile.a facile.exp.a diff --git a/dev-ml/facile/files/facile-1.1.4-dune.patch b/dev-ml/facile/files/facile-1.1.4-dune.patch new file mode 100644 index 000000000000..f740a80c4cd5 --- /dev/null +++ b/dev-ml/facile/files/facile-1.1.4-dune.patch @@ -0,0 +1,41 @@ +diff --git a/dune-project b/dune-project +new file mode 100644 +index 0000000..7d8f2ba +--- /dev/null ++++ b/dune-project +@@ -0,0 +1,2 @@ ++(lang dune 2.9) ++(name facile) +diff --git a/examples/dune b/examples/dune +new file mode 100644 +index 0000000..b804a36 +--- /dev/null ++++ b/examples/dune +@@ -0,0 +1,4 @@ ++(executables ++ (libraries facile) ++ (names coins golf golomb jobshop magic marriage prolog seven_eleven tiles) ++) +diff --git a/lib/dune b/lib/dune +new file mode 100644 +index 0000000..d28179f +--- /dev/null ++++ b/lib/dune +@@ -0,0 +1,4 @@ ++(library ++ (public_name facile) ++ (ocamlopt_flags (-unsafe -noassert -inline 10)) ++) +diff --git a/lib_test/dune b/lib_test/dune +new file mode 100644 +index 0000000..e8993ee +--- /dev/null ++++ b/lib_test/dune +@@ -0,0 +1,7 @@ ++(executable ++ (libraries facile) ++ (name queens)) ++ ++(rule ++ (alias runtest) ++ (action (run ./queens.exe 8))) diff --git a/dev-ml/facile/metadata.xml b/dev-ml/facile/metadata.xml index 41bad2f652fd..6a07ccba4a46 100644 --- a/dev-ml/facile/metadata.xml +++ b/dev-ml/facile/metadata.xml @@ -1,12 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> - <email>kde@gentoo.org</email> - <name>Gentoo KDE Project</name> + <email>ml@gentoo.org</email> + <name>ML</name> </maintainer> <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <email>kde@gentoo.org</email> + <name>Gentoo KDE Project</name> </maintainer> + <upstream> + <remote-id type="github">Emmanuel-PLF/facile</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-ml/fieldslib/Manifest b/dev-ml/fieldslib/Manifest index 13f75a822274..fb60eb0293cf 100644 --- a/dev-ml/fieldslib/Manifest +++ b/dev-ml/fieldslib/Manifest @@ -1 +1,3 @@ -DIST fieldslib-0.9.0.tar.gz 5981 BLAKE2B 471e468bf731dfe2f8a237ba35df22dc3cfb5ee2e02c881dc0a82be577844a40607adbf807b9aadf3a120708687048e6219635b81216c92edc41c874118c8b63 SHA512 ac0ecbbb43f1d815462264ef5dd33b568aa8b479847789f0ac7eb5da5986849da6ca1c27db1c0643e64e83c625e98eb7abebb5e3045a95c4b7bf7384ea953720 +DIST fieldslib-0.14.0.tar.gz 3677 BLAKE2B 076fe0c83547a5276e6ab304409c1a636132738f8a95c4d9a4260e95f6a3c247341c3901e2cde4f63f1f4db417e3749d1e8cb128cf8c1711004e77f1d42472ef SHA512 245987817585222060c389a632fa229fa3c928090548a0b759e3b1eb06c868d06c0593b01bc41f453c209854a15115fa7650cc36888036f9e305cf2b79a5004c +DIST fieldslib-0.15.0.tar.gz 3680 BLAKE2B fc6f2ed845906c7956a202d60c49a3ec919a94cf1b8091a925dabceee4c76e22e74768f8c6f83d6f42369aa4ac0a035cc4f8be3828db24313cdb6777853eaadd SHA512 9bba75a93cd55f798f830409579092f96edbdb739808cbeb9c35b99d74baf7ebade5d0e95005cde550a80f337da13e4d088ba5eb26e597b7fc81b80a91037190 +DIST fieldslib-0.16.0.tar.gz 3711 BLAKE2B faf1ee760fb04f643bfb6d80a5f3ab1ac4b4aa2edb112f516fede7e0a6e66bbf48951615faf0aa9b86ce1f518ef24bedef77d7486ac22a24404ca4b009a8b8a0 SHA512 73a6d9fdd921eddbe766e933ef3dbb2d3866bf454a79a260c81406e069e0c1db689676e070214b38190ee1ddb369d0edd704a474186aec44eeabc8b0adee0f86 diff --git a/dev-ml/fieldslib/fieldslib-0.14.0.ebuild b/dev-ml/fieldslib/fieldslib-0.14.0.ebuild new file mode 100644 index 000000000000..dc5a439f230a --- /dev/null +++ b/dev-ml/fieldslib/fieldslib-0.14.0.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Folding over record fields" +HOMEPAGE="https://github.com/janestreet/fieldslib" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt" + +RDEPEND=" + >=dev-ml/base-0.14.0:= + dev-ml/findlib:= +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/fieldslib/fieldslib-0.15.0.ebuild b/dev-ml/fieldslib/fieldslib-0.15.0.ebuild new file mode 100644 index 000000000000..96feda059eac --- /dev/null +++ b/dev-ml/fieldslib/fieldslib-0.15.0.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Folding over record fields" +HOMEPAGE="https://github.com/janestreet/fieldslib" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +RDEPEND=" + >=dev-ml/base-0.14.0:= + dev-ml/findlib:= +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/fieldslib/fieldslib-0.16.0.ebuild b/dev-ml/fieldslib/fieldslib-0.16.0.ebuild new file mode 100644 index 000000000000..fe32ece0414e --- /dev/null +++ b/dev-ml/fieldslib/fieldslib-0.16.0.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Folding over record fields" +HOMEPAGE="https://github.com/janestreet/fieldslib" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +RDEPEND=" + >=dev-lang/ocaml-4.14 + dev-ml/base:${SLOT} + dev-ml/findlib:= +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/fieldslib/fieldslib-0.9.0.ebuild b/dev-ml/fieldslib/fieldslib-0.9.0.ebuild deleted file mode 100644 index 9f1092e48f00..000000000000 --- a/dev-ml/fieldslib/fieldslib-0.9.0.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Folding over record fields" -HOMEPAGE="https://github.com/janestreet/fieldslib" -SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND=" - dev-lang/ocaml:= - dev-ml/base:= - dev-ml/ppx_driver:= - dev-ml/ocaml-migrate-parsetree:= -" -DEPEND="${RDEPEND} dev-ml/opam dev-ml/jbuilder" - -src_install() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - ${PN}.install || die -} diff --git a/dev-ml/fieldslib/metadata.xml b/dev-ml/fieldslib/metadata.xml index 1ae462b1d075..d0ce884a493a 100644 --- a/dev-ml/fieldslib/metadata.xml +++ b/dev-ml/fieldslib/metadata.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <longdescription lang="en"> This library defines a syntax extension for OCaml using Camlp4 that diff --git a/dev-ml/findlib/Manifest b/dev-ml/findlib/Manifest index e5e66cb11bfb..8011c819d969 100644 --- a/dev-ml/findlib/Manifest +++ b/dev-ml/findlib/Manifest @@ -1,3 +1,4 @@ -DIST findlib-1.7.1.tar.gz 256883 BLAKE2B 7459082dee3cd04045e8dbf59bc82075eb1c24bb8daff4a58d0002d7962ab19c5635ebb0551f29f99f37f1e08acd8eaa4dcd99d213438ff7a77cfc36ddadedd1 SHA512 1c8002dc2ed1804afc78c2aa92ab55d2b6501fbb021a7ca46698b4de0dea8ad6485a64f7bf9ec5f3df888da1a420ab270efb5e26f1e408cc8b78fa3ccb981ba4 -DIST findlib-1.7.2.tar.gz 257747 BLAKE2B 826993e9d3e5a9dab9084b006347a0324c848aa50a42ba1daa0d76010a0cdbf6e1ae9f0754dd3bef84f043ee43c3bd9775284a73ee5b130b678834d14d4ddb1c SHA512 f2aadaf8630482785ebfe6788bfea6716defdd6ba94e7f4e3b743c3415fa5b169e31301d605857823e9c74f7bd2f774399ee32a8acb35e64ce0cba5e98e4dd2c -DIST findlib-1.7.3.tar.gz 257703 BLAKE2B d69687ee4b75bd7ba514c5507bd474764cfb76f0502ef613c3dd8d8e9e92b5f12704c101b9228d71f2d9f151ab5e63b4352b759a2c7a2694f23b10b6c4e724d2 SHA512 5fc8250c123e2f019406be487134523f964668d615b51b216551d74f6ec1999de43aa7babc9c2c75ebb87293b4b8c640548d562a98a6e5a6d7f663432869c886 +DIST findlib-1.8.1.tar.gz 261544 BLAKE2B acfa9d4e0d118ebbc0dd7b03da1fe5eaa994e5fec13dc54e60ba42f643d93968469a1a43fe4f832433dca6c3902e8846616fcf460c748bf037fe16cb2f93a847 SHA512 0d8e1ff21217fcc6823aab3ac71282789691e4ae8c3607703d0393468247f93e2d084bd4e2a8795b523f2c7f193521d3aae4b8122c934ebf8b58c3185a5bc9c1 +DIST findlib-1.9.3.tar.gz 264132 BLAKE2B 3779cb437c607d04ae6c7d8124270f36c9bd9baccce669f3785a9cd4a1a582302844019b69be14598ca807edecb26645d9d7b241e1d704c3f023ed039cad21f0 SHA512 27cc4ce141576bf477fb9d61a82ad65f55478740eed59fb43f43edb794140829fd2ff89ad27d8a890cfc336b54c073a06de05b31100fc7c01cacbd7d88e928ea +DIST findlib-1.9.5.tar.gz 271240 BLAKE2B 6f43281298a9e443f9b92bcb8996bc2a55c2be86df492540fe8b5fb3fbb199daf1daef68e14c981d153c885c443ebc4af9ffb957235dd14904b9d75ca387cfa2 SHA512 03514c618a16b02889db997c6c4789b3436b3ad7d974348d2c6dea53eb78898ab285ce5f10297c074bab4fd2c82931a8b7c5c113b994447a44abb30fca74c715 +DIST findlib-1.9.6.tar.gz 271246 BLAKE2B c9c98b9e92c0cf690e2c8794a1ed606c0288d49a016dfa08592c9f617be1020385f52bf37345a7cbcbc7f0fcb19750a6617036cbf90afef231eccdbc7132baf8 SHA512 cfaf1872d6ccda548f07d32cc6b90c3aafe136d2aa6539e03143702171ee0199add55269bba894c77115535dc46a5835901a5d7c75768999e72db503bfd83027 diff --git a/dev-ml/findlib/files/externalmeta4.patch b/dev-ml/findlib/files/externalmeta4.patch deleted file mode 100644 index a2bb4945f18c..000000000000 --- a/dev-ml/findlib/files/externalmeta4.patch +++ /dev/null @@ -1,16 +0,0 @@ -Avoid installing META files for labltk, camlp4 and ocamlbuild: Those are provided by their -respective packages now. - -Index: findlib-1.7.1/configure -=================================================================== ---- findlib-1.7.1.orig/configure -+++ findlib-1.7.1/configure -@@ -539,7 +539,7 @@ fi - - # Generate the META files now. - --l="$ldbm dynlink graphics num num-top str threads unix stdlib bigarray ocamldoc $llabltk $lcamlp4 $lobuild $lcomplibs $lbytes $lspacetime" -+l="$ldbm dynlink graphics num num-top str threads unix stdlib bigarray ocamldoc $lcomplibs $lbytes $lspacetime" - - for dir in site-lib-src/*; do - # We do not really know if $dir is a directory. diff --git a/dev-ml/findlib/files/externalmeta5.patch b/dev-ml/findlib/files/externalmeta5.patch deleted file mode 100644 index ac90722de3b3..000000000000 --- a/dev-ml/findlib/files/externalmeta5.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: findlib-1.7.2/configure -=================================================================== ---- findlib-1.7.2.orig/configure -+++ findlib-1.7.2/configure -@@ -557,7 +557,7 @@ fi - - # Generate the META files now. - --l="$ldbm dynlink graphics $lnum num-top str threads unix stdlib bigarray ocamldoc $llabltk $lcamlp4 $lobuild $lcomplibs $lbytes $lspacetime" -+l="$ldbm dynlink graphics $lnum num-top str threads unix stdlib bigarray ocamldoc $lcomplibs $lbytes $lspacetime" - - for dir in site-lib-src/*; do - # We do not really know if $dir is a directory. diff --git a/dev-ml/findlib/files/externalmeta6.patch b/dev-ml/findlib/files/externalmeta6.patch deleted file mode 100644 index 7dbe9aa48e00..000000000000 --- a/dev-ml/findlib/files/externalmeta6.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: findlib-1.7.2/configure -=================================================================== ---- findlib-1.7.2.orig/configure -+++ findlib-1.7.2/configure -@@ -557,7 +557,7 @@ fi - - # Generate the META files now. - --l="$ldbm dynlink graphics $lnum str threads unix stdlib bigarray ocamldoc $llabltk $lcamlp4 $lobuild $lcomplibs $lbytes $lspacetime" -+l="$ldbm dynlink graphics $lnum str threads unix stdlib bigarray ocamldoc $lcomplibs $lbytes $lspacetime" - - for dir in site-lib-src/*; do - # We do not really know if $dir is a directory. diff --git a/dev-ml/findlib/files/externalmeta7.patch b/dev-ml/findlib/files/externalmeta7.patch new file mode 100644 index 000000000000..8aa9fa566e59 --- /dev/null +++ b/dev-ml/findlib/files/externalmeta7.patch @@ -0,0 +1,13 @@ +Index: findlib-1.8.0/configure +=================================================================== +--- findlib-1.8.0.orig/configure ++++ findlib-1.8.0/configure +@@ -581,7 +581,7 @@ fi + + # Generate the META files now. + +-l="$ldbm dynlink $lgraphics $lnum str threads unix stdlib bigarray ocamldoc $llabltk $lcamlp4 $lobuild $lcomplibs $lbytes $lspacetime" ++l="dynlink str threads unix stdlib bigarray ocamldoc $lcomplibs $lbytes $lspacetime" + + for dir in site-lib-src/*; do + # We do not really know if $dir is a directory. diff --git a/dev-ml/findlib/findlib-1.7.1.ebuild b/dev-ml/findlib/findlib-1.8.1-r2.ebuild index b0e73f12c349..f85c3ea4696b 100644 --- a/dev-ml/findlib/findlib-1.7.1.ebuild +++ b/dev-ml/findlib/findlib-1.8.1-r2.ebuild @@ -1,26 +1,28 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 - -inherit multilib eutils +EAPI=7 DESCRIPTION="OCaml tool to find/use non-standard packages" HOMEPAGE="http://projects.camlcity.org/projects/findlib.html" SRC_URI="http://download.camlcity.org/download/${P}.tar.gz" -IUSE="doc +ocamlopt tk" LICENSE="MIT" - SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="doc +ocamlopt tk" DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?] + <dev-lang/ocaml-4.13 tk? ( dev-ml/labltk:= )" RDEPEND="${DEPEND}" +QA_FLAGS_IGNORED='.*' + +PATCHES=( "${FILESDIR}"/externalmeta7.patch ) + src_prepare() { - epatch "${FILESDIR}/externalmeta4.patch" + default export ocamlfind_destdir="${EPREFIX}/usr/$(get_libdir)/ocaml" export stublibs="${ocamlfind_destdir}/stublibs" } @@ -47,9 +49,12 @@ src_install() { dodir "${stublibs#${EPREFIX}}" - cd "${S}/doc" - dodoc QUICKSTART README DOCINFO - use doc && dohtml -r ref-html guide-html + if use doc; then + cd "${S}/doc" || die + dodoc QUICKSTART README DOCINFO + docinto html + dodoc -r ref-html guide-html + fi } check_stublibs() { diff --git a/dev-ml/findlib/findlib-1.7.2.ebuild b/dev-ml/findlib/findlib-1.9.3.ebuild index 3e2ddccc7ea3..96186048ba26 100644 --- a/dev-ml/findlib/findlib-1.7.2.ebuild +++ b/dev-ml/findlib/findlib-1.9.3.ebuild @@ -1,26 +1,25 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 - -inherit multilib eutils +EAPI=7 DESCRIPTION="OCaml tool to find/use non-standard packages" HOMEPAGE="http://projects.camlcity.org/projects/findlib.html" SRC_URI="http://download.camlcity.org/download/${P}.tar.gz" -IUSE="doc +ocamlopt tk" LICENSE="MIT" - SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="doc +ocamlopt tk" DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?] tk? ( dev-ml/labltk:= )" RDEPEND="${DEPEND}" +QA_FLAGS_IGNORED='.*' + src_prepare() { - epatch "${FILESDIR}/externalmeta5.patch" + default export ocamlfind_destdir="${EPREFIX}/usr/$(get_libdir)/ocaml" export stublibs="${ocamlfind_destdir}/stublibs" } @@ -47,9 +46,15 @@ src_install() { dodir "${stublibs#${EPREFIX}}" - cd "${S}/doc" - dodoc QUICKSTART README DOCINFO - use doc && dohtml -r ref-html guide-html + if use doc; then + cd "${S}/doc" || die + dodoc QUICKSTART README DOCINFO + docinto html + dodoc -r ref-html guide-html + fi + + # See bug #803275 and bug #833604 + rm -f "${ED}"/usr/$(get_libdir)/ocaml/{ocamlbuild,labltk}/META || die } check_stublibs() { diff --git a/dev-ml/findlib/findlib-1.7.3.ebuild b/dev-ml/findlib/findlib-1.9.5.ebuild index 584df36d4b12..c25719598182 100644 --- a/dev-ml/findlib/findlib-1.7.3.ebuild +++ b/dev-ml/findlib/findlib-1.9.5.ebuild @@ -1,26 +1,25 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 - -inherit multilib eutils +EAPI=8 DESCRIPTION="OCaml tool to find/use non-standard packages" HOMEPAGE="http://projects.camlcity.org/projects/findlib.html" SRC_URI="http://download.camlcity.org/download/${P}.tar.gz" -IUSE="doc +ocamlopt tk" LICENSE="MIT" - SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="doc +ocamlopt tk" DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?] tk? ( dev-ml/labltk:= )" RDEPEND="${DEPEND}" +QA_FLAGS_IGNORED='.*' + src_prepare() { - epatch "${FILESDIR}/externalmeta6.patch" + default export ocamlfind_destdir="${EPREFIX}/usr/$(get_libdir)/ocaml" export stublibs="${ocamlfind_destdir}/stublibs" } @@ -47,24 +46,28 @@ src_install() { dodir "${stublibs#${EPREFIX}}" - cd "${S}/doc" - dodoc QUICKSTART README DOCINFO - use doc && dohtml -r ref-html guide-html + if use doc; then + cd "${S}/doc" || die + dodoc QUICKSTART README DOCINFO + docinto html + dodoc -r ref-html guide-html + fi + + # See bug #803275 and bug #833604 + rm -f "${ED}"/usr/$(get_libdir)/ocaml/{ocamlbuild,labltk}/META || die } check_stublibs() { - local ocaml_stdlib=`ocamlc -where` + local ocaml_stdlib=$(ocamlc -where) local ldconf="${ocaml_stdlib}/ld.conf" - if [ ! -e ${ldconf} ] - then - echo "${ocaml_stdlib}" > ${ldconf} - echo "${ocaml_stdlib}/stublibs" >> ${ldconf} + if [[ ! -e ${ldconf} ]] ; then + echo "${ocaml_stdlib}" > ${ldconf} || die + echo "${ocaml_stdlib}/stublibs" >> ${ldconf} || die fi - if [ -z `grep -e ${stublibs} ${ldconf}` ] - then - echo ${stublibs} >> ${ldconf} + if ! grep -qe ${stublibs} ${ldconf} ; then + echo ${stublibs} >> ${ldconf} || die fi } diff --git a/dev-ml/findlib/findlib-1.9.6-r1.ebuild b/dev-ml/findlib/findlib-1.9.6-r1.ebuild new file mode 100644 index 000000000000..265ac12c7f5c --- /dev/null +++ b/dev-ml/findlib/findlib-1.9.6-r1.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="OCaml tool to find/use non-standard packages" +HOMEPAGE="http://projects.camlcity.org/projects/findlib.html" +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" +IUSE="doc +ocamlopt tk" + +DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?] + tk? ( dev-ml/labltk:= )" +RDEPEND="${DEPEND}" + +QA_FLAGS_IGNORED='.*' + +src_prepare() { + default + export ocamlfind_destdir="${EPREFIX}/usr/$(get_libdir)/ocaml" + export stublibs="${ocamlfind_destdir}/stublibs" + sed -i \ + -e "/dbm/d" \ + -e "/graphics/d" \ + -e "/ocamlbuild/d" \ + -e "/check_library num/d" \ + configure \ + || die +} + +src_configure() { + local myconf + use tk && myconf="-with-toolbox" + ./configure -bindir "${EPREFIX}"/usr/bin -mandir "${EPREFIX}"/usr/share/man \ + -sitelib ${ocamlfind_destdir} \ + -config ${ocamlfind_destdir}/findlib/findlib.conf \ + -no-custom \ + ${myconf} || die "configure failed" +} + +src_compile() { + emake -j1 all + if use ocamlopt; then + emake -j1 opt # optimized code + fi +} + +src_install() { + emake prefix="${D}" install + + dodir "${stublibs#${EPREFIX}}" + + if use doc; then + cd "${S}/doc" || die + dodoc QUICKSTART README DOCINFO + docinto html + dodoc -r ref-html guide-html + fi + + # See bug #803275 and bug #833604 + for x in camlp4 labltk; do + rm -rf "${ED}"/usr/$(get_libdir)/ocaml/${x} || die + done +} + +check_stublibs() { + local ocaml_stdlib=$(ocamlc -where) + local ldconf="${ocaml_stdlib}/ld.conf" + + if [[ ! -e ${ldconf} ]] ; then + echo "${ocaml_stdlib}" > ${ldconf} || die + echo "${ocaml_stdlib}/stublibs" >> ${ldconf} || die + fi + + if ! grep -qe ${stublibs} ${ldconf} ; then + echo ${stublibs} >> ${ldconf} || die + fi +} + +pkg_postinst() { + check_stublibs +} diff --git a/dev-ml/findlib/metadata.xml b/dev-ml/findlib/metadata.xml index 75c9ea74812d..6d84a1141660 100644 --- a/dev-ml/findlib/metadata.xml +++ b/dev-ml/findlib/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> + <upstream> + <remote-id type="github">ocaml/ocamlfind</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-ml/fix/Manifest b/dev-ml/fix/Manifest new file mode 100644 index 000000000000..acdff1ece7a0 --- /dev/null +++ b/dev-ml/fix/Manifest @@ -0,0 +1,2 @@ +DIST fix-20220121.tar.bz2 342191 BLAKE2B 58ea04bc8afd881346465185885f2261159670f5aa4f98f34326e16ad46393c072bcd5f8216824ddaa1556a390abce1e8cb8eb6220d930f1c992153e4db59a10 SHA512 7a4767529f233d14e3b20f2fbc418f1745ccdf5bb771e871a642757efb777400b3dc7efe6083166a24495c9e7b5a54acbeda1ae1eb8f220322eb1b4e404eccac +DIST fix-20230505.tar.bz2 355711 BLAKE2B fbcce6561610315969409d7f6ab2c3e7b3a6dd249d1496120765e5a787d51314efa96f63465098dfe9733a34c9587d6a7b16669b2e8923be9c10fe656f24db80 SHA512 2b4c7539ca3226d825ee2adceea5c8f1bc7c66d58d0e092847be9f1293c9f06cf50bcfd38f078fafdc79876191f3e546af8d3a835458f94c14c9202730bc2f1d diff --git a/dev-ml/fix/fix-20220121.ebuild b/dev-ml/fix/fix-20220121.ebuild new file mode 100644 index 000000000000..d10531a6a1d9 --- /dev/null +++ b/dev-ml/fix/fix-20220121.ebuild @@ -0,0 +1,16 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Facilities for memoization and fixed points" +HOMEPAGE="https://gitlab.inria.fr/fpottier/fix" +SRC_URI="https://gitlab.inria.fr/fpottier/fix/-/archive/${PV}/${P}.tar.bz2" + +LICENSE="LGPL-2" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="+ocamlopt" +RESTRICT="test" # regenerate & qcheck not yet packaged diff --git a/dev-ml/fix/fix-20230505.ebuild b/dev-ml/fix/fix-20230505.ebuild new file mode 100644 index 000000000000..8769e9a957ca --- /dev/null +++ b/dev-ml/fix/fix-20230505.ebuild @@ -0,0 +1,16 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Facilities for memoization and fixed points" +HOMEPAGE="https://gitlab.inria.fr/fpottier/fix" +SRC_URI="https://gitlab.inria.fr/fpottier/fix/-/archive/${PV}/${P}.tar.bz2" + +LICENSE="LGPL-2" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="+ocamlopt" +RESTRICT="test" # regenerate not yet packaged diff --git a/dev-ml/ocaml-re/metadata.xml b/dev-ml/fix/metadata.xml index abe6645e39bb..815c6a957a35 100644 --- a/dev-ml/ocaml-re/metadata.xml +++ b/dev-ml/fix/metadata.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> + <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> - <remote-id type="github">ocaml/ocaml-re</remote-id> + <bugs-to>https://gitlab.inria.fr/fpottier/fix/-/issues/</bugs-to> </upstream> </pkgmetadata> diff --git a/dev-ml/flow_parser/Manifest b/dev-ml/flow_parser/Manifest deleted file mode 100644 index 333aacdeaa05..000000000000 --- a/dev-ml/flow_parser/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST flow-0.50.0.tar.gz 2664071 BLAKE2B aa62952e956bf0c46e2a9b0b20d075a5178ee6ebbab13c64bb64c40b1dd0c67ca36340e3c795cfe2a233a26fba02de7f948c66d07d5ae181a544970bfc8fcdb6 SHA512 757adc6c07461ca71a132715a3f19e3dc36a08a165519793b94c667d116563eca9937593700db3efdd8d5cbb5709d5778a49345052de2392697f7bb2221e43e5 -DIST flow-0.51.0.tar.gz 2701608 BLAKE2B c4255b6d02d4f0064d08ea9d1b18eabaee8bbe7b935e4395bd4540d07f654846d9906f4225debd674dc8ad3cc0af3ffdc028f58502cae748e94f39df45061da9 SHA512 82422ff5e49b72c21a875461aa839e1217d369e632369f9c8fa375207da90d92eebbf653b2a0869ef08c8c1ffc07e11f729b77e8a791c9b44f5fc7daf71ec50a -DIST flow-0.52.0.tar.gz 2718344 BLAKE2B e688c98bea494475e36d98856a0335ce06b5f9c5f0fdc0b2c07d06a6bcfe730b45dcc5c9167e0659143a2f8197989ccd16e4dfbf0272834eb1dd7ab78d9ba944 SHA512 aad2aaeb56448d1bd9a26ab1c68b1f61f107729347f6eabe1e62828395a06d624bca67f0706f2267e62920c56bab99c06fd7bc6bbb484e7c921a28d725cde670 diff --git a/dev-ml/flow_parser/flow_parser-0.50.0.ebuild b/dev-ml/flow_parser/flow_parser-0.50.0.ebuild deleted file mode 100644 index a36131a0f030..000000000000 --- a/dev-ml/flow_parser/flow_parser-0.50.0.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit findlib - -DESCRIPTION="JavaScript parser written in OCaml" -HOMEPAGE="https://github.com/facebook/flow/tree/master/src/parser" -SRC_URI="https://github.com/facebook/flow/archive/v${PV}.tar.gz -> flow-${PV}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -DEPEND=" - dev-lang/ocaml:= - dev-ml/sedlex:= -" -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} - dev-ml/ocamlbuild" - -S="${WORKDIR}/flow-${PV}/src/parser" - -src_compile() { - emake build-parser -} - -src_test() { - emake test-ocaml -} - -src_install() { - findlib_src_preinst - emake ocamlfind-install - dodoc README.md -} diff --git a/dev-ml/flow_parser/flow_parser-0.51.0.ebuild b/dev-ml/flow_parser/flow_parser-0.51.0.ebuild deleted file mode 100644 index a36131a0f030..000000000000 --- a/dev-ml/flow_parser/flow_parser-0.51.0.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit findlib - -DESCRIPTION="JavaScript parser written in OCaml" -HOMEPAGE="https://github.com/facebook/flow/tree/master/src/parser" -SRC_URI="https://github.com/facebook/flow/archive/v${PV}.tar.gz -> flow-${PV}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -DEPEND=" - dev-lang/ocaml:= - dev-ml/sedlex:= -" -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} - dev-ml/ocamlbuild" - -S="${WORKDIR}/flow-${PV}/src/parser" - -src_compile() { - emake build-parser -} - -src_test() { - emake test-ocaml -} - -src_install() { - findlib_src_preinst - emake ocamlfind-install - dodoc README.md -} diff --git a/dev-ml/flow_parser/flow_parser-0.52.0.ebuild b/dev-ml/flow_parser/flow_parser-0.52.0.ebuild deleted file mode 100644 index a36131a0f030..000000000000 --- a/dev-ml/flow_parser/flow_parser-0.52.0.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit findlib - -DESCRIPTION="JavaScript parser written in OCaml" -HOMEPAGE="https://github.com/facebook/flow/tree/master/src/parser" -SRC_URI="https://github.com/facebook/flow/archive/v${PV}.tar.gz -> flow-${PV}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -DEPEND=" - dev-lang/ocaml:= - dev-ml/sedlex:= -" -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} - dev-ml/ocamlbuild" - -S="${WORKDIR}/flow-${PV}/src/parser" - -src_compile() { - emake build-parser -} - -src_test() { - emake test-ocaml -} - -src_install() { - findlib_src_preinst - emake ocamlfind-install - dodoc README.md -} diff --git a/dev-ml/fmt/Manifest b/dev-ml/fmt/Manifest index d92968186fd6..7199ca322bcc 100644 --- a/dev-ml/fmt/Manifest +++ b/dev-ml/fmt/Manifest @@ -1 +1,2 @@ -DIST fmt-0.8.4.tbz 14079 BLAKE2B c4b6fc35a27734e8d878ef1abfa900b659d4acafc20757b0413aec1404378aed6e57c6a1a0e5c7dbda7e60fdd911d38fa1fecc76d670299ddf6ed14930fbcc28 SHA512 d17407f15447172ad444fa288b9a16962b0e4829cb73f62004b0f8dad2bec60a7911ad11fd05545d61d7fdb88099e53694548c73368399ba183c53383e1dfd31 +DIST fmt-0.8.9.tbz 21469 BLAKE2B 4cddf626118c9bdea435f9db4e6a3c0b92b49b2c07d1b0f708ae7b82963453be666ad49df196d98b466236509d3fa5a519e191da6b2385a308d1019f1583f0b5 SHA512 19b97caf5d2dbe86cd75bec478707b8f4e4b899b2a11ce04790dc5acb5c9ed6ea98047de52ee50c6480231a16307af2541eabaa94d18d7d008f7a67496f5f626 +DIST fmt-0.9.0.tbz 22699 BLAKE2B 6c251b7c32093a5860b8e5c18f6a92573e664e8a20eb4b85dc6e601a04045d9c55c1e4a4f5cb879ccc92046c15c5ff97d1877ab78ecfaa2a4aa83a9f49fd409e SHA512 66cf4b8bb92232a091dfda5e94d1c178486a358cdc34b1eec516d48ea5acb6209c0dfcb416f0c516c50ddbddb3c94549a45e4a6d5c5fd1c81d3374dec823a83b diff --git a/dev-ml/fmt/fmt-0.8.4.ebuild b/dev-ml/fmt/fmt-0.8.9-r1.ebuild index 19b27b4284d0..c58ce2cbe52a 100644 --- a/dev-ml/fmt/fmt-0.8.4.ebuild +++ b/dev-ml/fmt/fmt-0.8.9-r1.ebuild @@ -1,27 +1,33 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=7 inherit findlib opam DESCRIPTION="Combinators to devise OCaml Format pretty-printing functions" -HOMEPAGE="http://erratique.ch/software/fmt https://github.com/dbuenzli/fmt" -SRC_URI="http://erratique.ch/software/fmt/releases/${P}.tbz" +HOMEPAGE="https://erratique.ch/software/fmt https://github.com/dbuenzli/fmt" +SRC_URI="https://erratique.ch/software/fmt/releases/${P}.tbz" LICENSE="ISC" SLOT="0/${PV}" -KEYWORDS="~amd64" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" IUSE="test" +RESTRICT="!test? ( test )" -RDEPEND="dev-ml/result:=[ocamlopt] +RDEPEND=" + dev-ml/cmdliner:=[ocamlopt] dev-lang/ocaml:=[ocamlopt] + dev-ml/result:=[ocamlopt] + dev-ml/stdlib-shims:=[ocamlopt] dev-ml/uchar:=[ocamlopt] - dev-ml/cmdliner:=[ocamlopt]" -DEPEND="${RDEPEND} +" +DEPEND="${RDEPEND}" +BDEPEND=" >=dev-ml/topkg-0.9 dev-ml/ocamlbuild - dev-ml/findlib" + dev-ml/findlib +" src_compile() { ocaml pkg/pkg.ml build --tests $(usex test 'true' 'false') || die diff --git a/dev-ml/fmt/fmt-0.9.0.ebuild b/dev-ml/fmt/fmt-0.9.0.ebuild new file mode 100644 index 000000000000..f1a370757e4c --- /dev/null +++ b/dev-ml/fmt/fmt-0.9.0.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit findlib opam + +DESCRIPTION="Combinators to devise OCaml Format pretty-printing functions" +HOMEPAGE="https://erratique.ch/software/fmt https://github.com/dbuenzli/fmt" +SRC_URI="https://erratique.ch/software/fmt/releases/${P}.tbz" + +LICENSE="ISC" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-ml/cmdliner:=[ocamlopt] + >=dev-lang/ocaml-4.08:=[ocamlopt] + dev-ml/result:=[ocamlopt] + dev-ml/stdlib-shims:=[ocamlopt] + dev-ml/uchar:=[ocamlopt] +" +DEPEND="${RDEPEND}" +BDEPEND=" + >=dev-ml/topkg-0.9 + dev-ml/ocamlbuild + dev-ml/findlib +" + +src_compile() { + ocaml pkg/pkg.ml build --tests $(usex test 'true' 'false') || die +} + +src_test() { + ocaml pkg/pkg.ml test _build/test/test.native || die +} diff --git a/dev-ml/fmt/metadata.xml b/dev-ml/fmt/metadata.xml index 655131108a30..52bd8afcdc32 100644 --- a/dev-ml/fmt/metadata.xml +++ b/dev-ml/fmt/metadata.xml @@ -1,10 +1,7 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">dbuenzli/fmt</remote-id> </upstream> diff --git a/dev-ml/fort/Manifest b/dev-ml/fort/Manifest deleted file mode 100644 index 6ff3ad7aa67d..000000000000 --- a/dev-ml/fort/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST fort-0.4.2.tar.gz 6828 BLAKE2B de8c414246f37fa002782c8db18669acfcef2a0c0fe93dea1dccc5fc205aac31ea6139d44791d42a475fa35b134938207813125bd0c15f64e02e4d69ff7afc0b SHA512 59659bcc885f8d71985121a2abcfef756078eb472cadbd74ff97aef3378cd3f2a2a6da3a41a0a015b3175c18d98775e7f6b26c7a76262eb044b25122679c15a8 diff --git a/dev-ml/fort/files/fort-0.4.2-ocaml4.patch b/dev-ml/fort/files/fort-0.4.2-ocaml4.patch deleted file mode 100644 index 1c688a995446..000000000000 --- a/dev-ml/fort/files/fort-0.4.2-ocaml4.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: fort-0.4.2/Makefile -=================================================================== ---- fort-0.4.2.orig/Makefile -+++ fort-0.4.2/Makefile -@@ -3,7 +3,7 @@ - - include Makefile.config - --OCAMLC := ocamlc -+OCAMLC := ocamlc -I +compiler-libs - - # FORT top-level interpreter - NAME := fort -@@ -16,7 +16,7 @@ LIBS := unix - EXECUTABLE := $(NAME)$(EXEC_SUFFIX) - - $(EXECUTABLE): $(OBJECTS) -- $(OCAMLC) -linkall -o $@ toplevellib.cma $(LIBS:%=%.cma) $(OBJECTS) -+ $(OCAMLC) -linkall -o $@ ocamlcommon.cma ocamlbytecomp.cma ocamltoplevel.cma $(LIBS:%=%.cma) $(OBJECTS) - - install: $(EXECUTABLE) $(OBJECTS) - mkdir -p $(DESTDIR)$(LIBDIR) diff --git a/dev-ml/fort/fort-0.4.2.ebuild b/dev-ml/fort/fort-0.4.2.ebuild deleted file mode 100644 index 7471bf89ba24..000000000000 --- a/dev-ml/fort/fort-0.4.2.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit multilib eutils - -DESCRIPTION="provides an environment for testing programs and Objective Caml modules" -HOMEPAGE="http://fort.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz" - -LICENSE="ZLIB" -SLOT="0/${PV}" -KEYWORDS="amd64 ~ppc x86" -IUSE="" - -DEPEND="dev-lang/ocaml:=" -RDEPEND="${DEPEND}" -DOCS=( README ) - -src_prepare() { - has_version '>=dev-lang/ocaml-4' && epatch "${FILESDIR}/${P}-ocaml4.patch" - sed -i -e "s:\$(BINDIR):\$(DESTDIR)&:"\ - -e "s:\$(LIBDIR):\$(DESTDIR)&:" Makefile || die -} - -src_configure() { - ./configure --bindir /usr/bin --libdir /usr/$(get_libdir)/ocaml || die -} diff --git a/dev-ml/fort/metadata.xml b/dev-ml/fort/metadata.xml deleted file mode 100644 index f597a4e671d2..000000000000 --- a/dev-ml/fort/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <longdescription> - FORT (Framework for Ocaml Regression Testing) provides - an environment for testing programs and Objective Caml modules. - </longdescription> - <upstream> - <remote-id type="sourceforge">fort</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/fpath/Manifest b/dev-ml/fpath/Manifest index 0f8bf4b12584..186a907c964a 100644 --- a/dev-ml/fpath/Manifest +++ b/dev-ml/fpath/Manifest @@ -1 +1 @@ -DIST fpath-0.7.2.tbz 24142 BLAKE2B 5aa22a33d0155c2a446c3622d6feef0748be3eaa72f07e7e2770fda1993794864072a5f50a052537b9724e39935064967c87f82d860a2da17fbc86279a1930ab SHA512 d8ab8d6f183a1742d74a3a3220cc1d62e7df38a6f3ca1c04fad18426a0897152255382305ad14d058b5b85ab55a27536c39a62deffac8d46984a730a2a18405d +DIST fpath-0.7.3.tbz 24345 BLAKE2B 5d4e68acebdafb6378422b31385e78decff2dfce1bedd102c7e6baac519f9843e0828629f4a15e075f506865e1af6f9cc7ece761e74fe6608d3476338cc556cb SHA512 acf4b379aee3c25305ef71d1b97b154faa6de1e8248a8e8d046cf11090a3e94f2dc048b961bb51725ca7384e784455f2893fbd51f26bf80571a9cc7e9475b945 diff --git a/dev-ml/fpath/fpath-0.7.2.ebuild b/dev-ml/fpath/fpath-0.7.2.ebuild deleted file mode 100644 index 8a7ca78a2291..000000000000 --- a/dev-ml/fpath/fpath-0.7.2.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit opam - -DESCRIPTION="File system paths for OCaml" -HOMEPAGE="http://erratique.ch/software/fpath https://github.com/dbuenzli/fpath" -SRC_URI="http://erratique.ch/software/fpath/releases/${P}.tbz" - -LICENSE="ISC" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND=" - dev-ml/result:= - dev-ml/astring:= -" -DEPEND="${RDEPEND} - dev-ml/topkg - dev-ml/ocamlbuild - dev-ml/findlib -" - -src_compile() { - ocaml pkg/pkg.ml build || die -} diff --git a/dev-ml/fpath/fpath-0.7.3.ebuild b/dev-ml/fpath/fpath-0.7.3.ebuild new file mode 100644 index 000000000000..499151a72256 --- /dev/null +++ b/dev-ml/fpath/fpath-0.7.3.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit opam + +DESCRIPTION="File system paths for OCaml" +HOMEPAGE="https://erratique.ch/software/fpath https://github.com/dbuenzli/fpath" +SRC_URI="https://erratique.ch/software/fpath/releases/${P}.tbz" + +LICENSE="ISC" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" + +RDEPEND="dev-ml/result:= + dev-ml/astring:= +" +DEPEND="${RDEPEND}" +BDEPEND="dev-ml/topkg + dev-ml/ocamlbuild + dev-ml/findlib" + +src_compile() { + ocaml pkg/pkg.ml build || die +} diff --git a/dev-ml/fpath/metadata.xml b/dev-ml/fpath/metadata.xml index 81ab008999ce..8e5dcf7722f4 100644 --- a/dev-ml/fpath/metadata.xml +++ b/dev-ml/fpath/metadata.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">dbuenzli/fpath</remote-id> diff --git a/dev-ml/gapi-ocaml/Manifest b/dev-ml/gapi-ocaml/Manifest new file mode 100644 index 000000000000..be5af9acfbdc --- /dev/null +++ b/dev-ml/gapi-ocaml/Manifest @@ -0,0 +1 @@ +DIST gapi-ocaml-0.4.4.tar.gz 473064 BLAKE2B 47f401c89107e24c07d3076a5e8dbb2b383270abc138470b78680347cc3d5759227a9a56956217324adf354996d9ea018926dc887cba2cd7ea2fdc43293dbaaa SHA512 3ff319f3563d1fb465cbd4151713c5c1bb3f3ce1f8a2c0d6f938eb99d91844f97cce7c127c52fe970f0f095ced513b3cc440837540631e76037d1882b6d9b820 diff --git a/dev-ml/gapi-ocaml/gapi-ocaml-0.4.4.ebuild b/dev-ml/gapi-ocaml/gapi-ocaml-0.4.4.ebuild new file mode 100644 index 000000000000..3b7a8af6966d --- /dev/null +++ b/dev-ml/gapi-ocaml/gapi-ocaml-0.4.4.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune findlib + +DESCRIPTION="A simple OCaml client for Google Services" +HOMEPAGE=" + https://opam.ocaml.org/packages/gapi-ocaml/ + https://github.com/astrada/gapi-ocaml +" + +SRC_URI="https://github.com/astrada/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64" +IUSE="ocamlopt test" + +RDEPEND=" + dev-ml/ocurl:= + >=dev-ml/ocamlnet-4.1.4:= + dev-ml/cryptokit:= + dev-ml/yojson:= +" +DEPEND=" + ${RDEPEND} + test? ( dev-ml/ounit2 ) +" + +RESTRICT="!test? ( test )" diff --git a/dev-ml/gapi-ocaml/metadata.xml b/dev-ml/gapi-ocaml/metadata.xml new file mode 100644 index 000000000000..ee96f3b94b11 --- /dev/null +++ b/dev-ml/gapi-ocaml/metadata.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <longdescription lang="en">gapi-ocaml is a simple, unofficial, OCaml client for Google Services. +The library supports ClientLogin, OAuth 1.0a, and OAuth 2.0 +authentication. Supported RESTful APIs: Calendar APIs v3, Google+ API +v1, Tasks API v1, APIs Discovery Service v1, URL Shortener API v1, +OAuth2 API v2, Custom Search API v1, Google Analytics API v3, Page +Speed Online API v1, Blogger API v2, Site Verification API v1, AdSense +Management API v1.4, BigQuery API v2, Drive API v2, Drive API v3, +Gmail API v1.</longdescription> + <upstream> + <bugs-to>https://github.com/astrada/gapi-ocaml/issues</bugs-to> + <remote-id type="github">astrada/gapi-ocaml</remote-id> + <maintainer> + <name>Alessandro Strada</name> + <email>alessandro.strada@gmail.com</email> + </maintainer> + </upstream> +</pkgmetadata> diff --git a/dev-ml/gd4o/Manifest b/dev-ml/gd4o/Manifest deleted file mode 100644 index 7d7d2b78002b..000000000000 --- a/dev-ml/gd4o/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST gd4o-1.0a5.tar.gz 885735 BLAKE2B e66a9de762bd6e0cce97fc47645edc7d91b6d01b3d7aad16bb7dcc9eae5604c134b14ddccacb11d83ec651676a9992340d032d63b5953940decd0abf6efaf72c SHA512 f582ff5dc4ece692b779c78ea97d1df90768564ab172a3933196bc0d9eedf31a53ca01c4745d7eacc81f977611b509dd2f912fac08b1bf0f70ec03605a40a85b diff --git a/dev-ml/gd4o/gd4o-1.0_alpha5.ebuild b/dev-ml/gd4o/gd4o-1.0_alpha5.ebuild deleted file mode 100644 index 2c4ae20f3100..000000000000 --- a/dev-ml/gd4o/gd4o-1.0_alpha5.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit toolchain-funcs findlib - -MY_P="${P/_alpha/a}" - -DESCRIPTION="OCaml interface to the GD graphics library" -HOMEPAGE="https://sourceforge.net/projects/gd4o/" -SRC_URI="mirror://sourceforge/gd4o/${MY_P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="doc +ocamlopt" - -DEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?] - media-libs/gd[jpeg,png] - virtual/jpeg:0 - sys-libs/zlib - media-libs/libpng:0= - media-libs/freetype:2" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - sed -i 's/CFLAGS =/CFLAGS += -fPIC/' Makefile || die -} - -src_compile() { - emake CC="$(tc-getCC)" - if use ocamlopt ; then - emake CC="$(tc-getCC)" opt - fi - if use doc ; then - emake docs - fi -} - -src_test() { - emake test - if use ocamlopt ; then - emake test.opt - fi -} - -src_install() { - findlib_src_install - dodoc BUGS CHANGES README* TODO doc/manual.txt - use doc && dohtml -r doc -} diff --git a/dev-ml/gen/Manifest b/dev-ml/gen/Manifest index ea298131c85f..d71df127b961 100644 --- a/dev-ml/gen/Manifest +++ b/dev-ml/gen/Manifest @@ -1 +1,3 @@ -DIST gen-0.4.0.1.tar.gz 72415 BLAKE2B 73fa4169b6c2c3790a7f455136be4fa3bc2ce328833b17293dba793383133f5f151c6e1a2372c3422c7f827ef29eb1c3925a69a28dba787af29f7609ec8c299d SHA512 30722cca6d9b360a9a7d4a97f7553935d5425d5e3d49a7ae265bd0aee5961628a20d182775767a125cf367e1cd218ce4e782f025951468a4f95975163a1f4d76 +DIST gen-0.5.3.tar.gz 30905 BLAKE2B a6b8351ec4a75dd986cc0b4e9ed60dbfa78c3b8e3625c1e294f8bc0253d92be1f5d27cc7162e1cfc4f6397bbe272df22d9b7b0d1dd410d7760f30cf4c36c4745 SHA512 192178de106d2ae5f936caead8b21b4b9ec1b8fe35ba56296825900ea15a4ea702caf8824ac34d4478d107b954e22c3dffd81f12d4c08fbd6d9760f49a0deb14 +DIST gen-1.0.tar.gz 32266 BLAKE2B 1be57d34e794e8dffae19322e8b2504b0ff10a72608cc1dec4bc55867b50b08a765c88d7e6ec7125884dc2b8ea6752d4eb9c5cd2bcb10c2515250ba04fb21bf7 SHA512 fb4ec2ab35a1aba0dcc8439b11f14a0a785d939f661f505aec88a6f2ca6ca87e14ddfda860d9c180b215190b76690de87040c144582f069224f7e58d37ef48a0 +DIST gen-1.1.tar.gz 32152 BLAKE2B f5314ecba43523ebde487740eae1df7e058ea0fa47ef676aa19d76e90f21b08464da6b1dafe8f0d10e7720dd48d72f6b7a40397545adf874698d6cddc47c0a72 SHA512 71a4b5c3666a7c11935398a78feea7383f61d2c549dfb96e324d40783ffa87b5ec492c5ec468803aabfb9b48e7d0ebaa30b24d2b974540afc7cca5feea3121c1 diff --git a/dev-ml/gen/gen-0.4.0.1.ebuild b/dev-ml/gen/gen-0.4.0.1.ebuild deleted file mode 100644 index 13385f56421c..000000000000 --- a/dev-ml/gen/gen-0.4.0.1.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -OASIS_BUILD_TESTS=1 -OASIS_BUILD_DOCS=1 - -inherit oasis - -DESCRIPTION="Simple, efficient iterators for OCaml" -HOMEPAGE="https://github.com/c-cube/gen" -SRC_URI="https://github.com/c-cube/gen/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND="" -DEPEND="${RDEPEND} - test? ( dev-ml/ounit dev-ml/iTeML ) -" -DOCS=( "README.md" "CHANGELOG.md" ) diff --git a/dev-ml/gen/gen-0.5.3-r1.ebuild b/dev-ml/gen/gen-0.5.3-r1.ebuild new file mode 100644 index 000000000000..7f2516150314 --- /dev/null +++ b/dev-ml/gen/gen-0.5.3-r1.ebuild @@ -0,0 +1,20 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Iterators for OCaml, both restartable and consumable" +HOMEPAGE="https://github.com/c-cube/gen/" +SRC_URI="https://github.com/c-cube/gen/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD-2" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="+ocamlopt" +RESTRICT="test" # tests fail > unused-open + +DEPEND="dev-ml/dune-configurator:=" +RDEPEND="${DEPEND}" +# BDEPEND="test? ( dev-ml/qtest )" diff --git a/dev-ml/gen/gen-1.0-r2.ebuild b/dev-ml/gen/gen-1.0-r2.ebuild new file mode 100644 index 000000000000..a4cf8cddd804 --- /dev/null +++ b/dev-ml/gen/gen-1.0-r2.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Iterators for OCaml, both restartable and consumable" +HOMEPAGE="https://github.com/c-cube/gen/" +SRC_URI="https://github.com/c-cube/gen/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD-2" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="+ocamlopt" +RESTRICT="test" # tests fail > unused-open + +RDEPEND=" + >=dev-lang/ocaml-4.07:=[ocamlopt?] + dev-ml/dune-configurator:= +" +DEPEND="${RDEPEND}" +# BDEPEND="test? ( dev-ml/qtest )" + +src_prepare() { + default + + sed -i \ + -e "s:(libraries bytes seq)::" \ + src/dune \ + || die +} diff --git a/dev-ml/gen/gen-1.1.ebuild b/dev-ml/gen/gen-1.1.ebuild new file mode 100644 index 000000000000..d84bb7e889a7 --- /dev/null +++ b/dev-ml/gen/gen-1.1.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Iterators for OCaml, both restartable and consumable" +HOMEPAGE="https://github.com/c-cube/gen/" +SRC_URI="https://github.com/c-cube/gen/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD-2" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="+ocamlopt" +RESTRICT="test" # tests fail > unused-open + +RDEPEND=" + >=dev-lang/ocaml-4.07:=[ocamlopt?] + dev-ml/dune-configurator:= +" +DEPEND="${RDEPEND}" +# BDEPEND="test? ( dev-ml/qtest )" + +src_prepare() { + default + + sed -i -e "s|(libraries seq)||" src/dune || die +} diff --git a/dev-ml/gen/metadata.xml b/dev-ml/gen/metadata.xml index dec7a98cbdca..41d347812c29 100644 --- a/dev-ml/gen/metadata.xml +++ b/dev-ml/gen/metadata.xml @@ -1,11 +1,13 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> + <pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">c-cube/gen</remote-id> - </upstream> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <bugs-to>https://github.com/c-cube/gen/issues/</bugs-to> + <remote-id type="github">c-cube/gen</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-ml/gen_js_api/Manifest b/dev-ml/gen_js_api/Manifest deleted file mode 100644 index 2c1e89d4f4fa..000000000000 --- a/dev-ml/gen_js_api/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST gen_js_api-1.0.3.tar.gz 39575 BLAKE2B 251c3a68897f6851d39cb980af5d49b4448ab5f932a1da8a3e8db10685de1cc7d5e89702edca4a2b6e7c8a8171ff6220d80c1096bb4004d9f0a854154a689732 SHA512 90526bc6cee02de9eed3110b4311f9cae52e61f2973f9127dc436c44016e663c195b571186eb260a261babe5f401ae8574c7683e431d3734820642299fc6ef82 -DIST gen_js_api-1.0.4.tar.gz 39593 BLAKE2B 81058c1eb215f98538283d5023013d9a72760208f8183512eb7e1f190d51e397b67dd5de0a147398f6ca749b4234e60c52e728edf9eb5df4ddbd76a27d76675d SHA512 db1599f349fa70c9797141fff0862e07a9a709097d713332ea9b1513a71e707b6022418a6c6980d12a3b215c09ed500eb74e4c62d0433740304fac306c49cdcb diff --git a/dev-ml/gen_js_api/gen_js_api-1.0.3.ebuild b/dev-ml/gen_js_api/gen_js_api-1.0.3.ebuild deleted file mode 100644 index 09b866b1233c..000000000000 --- a/dev-ml/gen_js_api/gen_js_api-1.0.3.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit findlib - -DESCRIPTION="Easy OCaml bindings for Javascript libraries" -HOMEPAGE="https://github.com/LexiFi/gen_js_api" -SRC_URI="https://github.com/LexiFi/gen_js_api/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -DEPEND="dev-lang/ocaml:=" -RDEPEND="${DEPEND}" - -src_install () { - findlib_src_install - dodoc CLASSES.md IMPLGEN.md LOW_LEVEL_BINDING.md NAMING.md PPX.md README.md TODO.md TYPES.md VALUES.md -} diff --git a/dev-ml/gen_js_api/gen_js_api-1.0.4.ebuild b/dev-ml/gen_js_api/gen_js_api-1.0.4.ebuild deleted file mode 100644 index 26b9dfbafdb9..000000000000 --- a/dev-ml/gen_js_api/gen_js_api-1.0.4.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit findlib - -DESCRIPTION="Easy OCaml bindings for Javascript libraries" -HOMEPAGE="https://github.com/LexiFi/gen_js_api" -SRC_URI="https://github.com/LexiFi/gen_js_api/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -DEPEND=">=dev-lang/ocaml-4.05:=" -RDEPEND="${DEPEND}" - -src_install () { - findlib_src_install - dodoc CLASSES.md IMPLGEN.md LOW_LEVEL_BINDING.md NAMING.md PPX.md README.md TODO.md TYPES.md VALUES.md -} diff --git a/dev-ml/gen_js_api/metadata.xml b/dev-ml/gen_js_api/metadata.xml deleted file mode 100644 index 92061115ba62..000000000000 --- a/dev-ml/gen_js_api/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">LexiFi/gen_js_api</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/graphics/Manifest b/dev-ml/graphics/Manifest new file mode 100644 index 000000000000..0911cd5d6477 --- /dev/null +++ b/dev-ml/graphics/Manifest @@ -0,0 +1,2 @@ +DIST graphics-5.1.1.tbz 58713 BLAKE2B 75f81b938be8a44f904418851ed747742ad63556ef94c533872f4b04705a0209a06f969add207bf332e1ab3d6a98a819c0ed2b0f50bdf1275f5d57ff6caa2fed SHA512 15adbe03211e7392a2fded2d9fd5e0cc2c532b4a1de3b6c90945e9e99cc4f419583a204f357f8c9fd92d1ffce48e13e1f146da1f009eb4645150b7394f799e0a +DIST graphics-5.1.2.tbz 58863 BLAKE2B 640a288759f5c233f3ded3c0e974329b0b8a41ab60772d0d41e6f89057432215a35c0f06facc552fcacf2e1fb8d0f5c47bc5d0aad5ca89dcf4ab71732a9b1c9f SHA512 1387c1ecf5dfd62c3927f1f8ce0bcc8b162ef22f15bfd41eba47c955091f7ce5f19395beab550d31cff38d22c4ad097350975381e60936a0004271e96f65b09b diff --git a/dev-ml/graphics/graphics-5.1.1-r1.ebuild b/dev-ml/graphics/graphics-5.1.1-r1.ebuild new file mode 100644 index 000000000000..32141f00e593 --- /dev/null +++ b/dev-ml/graphics/graphics-5.1.1-r1.ebuild @@ -0,0 +1,22 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="The OCaml graphics library" +HOMEPAGE="https://github.com/ocaml/graphics" +SRC_URI="https://github.com/ocaml/${PN}/releases/download/${PV}/${P}.tbz" + +LICENSE="LGPL-2.1-with-linking-exception" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" + +RDEPEND="dev-ml/dune-configurator:=[ocamlopt?] + >=dev-lang/ocaml-4.09:= + x11-libs/libX11:=" +DEPEND="${RDEPEND}" +BDEPEND="" + +IUSE="+ocamlopt" diff --git a/dev-ml/graphics/graphics-5.1.2.ebuild b/dev-ml/graphics/graphics-5.1.2.ebuild new file mode 100644 index 000000000000..5468f0fae9d2 --- /dev/null +++ b/dev-ml/graphics/graphics-5.1.2.ebuild @@ -0,0 +1,23 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="The OCaml graphics library" +HOMEPAGE="https://github.com/ocaml/graphics" +SRC_URI="https://github.com/ocaml/${PN}/releases/download/${PV}/${P}.tbz" + +LICENSE="LGPL-2.1-with-linking-exception" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" + +RDEPEND="dev-ml/dune-configurator:=[ocamlopt?] + >=dev-lang/ocaml-4.09:= + x11-libs/libX11:=" +DEPEND="${RDEPEND} + x11-base/xorg-proto" +BDEPEND="" + +IUSE="+ocamlopt" diff --git a/dev-ml/graphics/metadata.xml b/dev-ml/graphics/metadata.xml new file mode 100644 index 000000000000..3f010aa5cb51 --- /dev/null +++ b/dev-ml/graphics/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">ocaml/graphics</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/gsl-ocaml/Manifest b/dev-ml/gsl-ocaml/Manifest index f544670afdc0..e9ca31e4f6c1 100644 --- a/dev-ml/gsl-ocaml/Manifest +++ b/dev-ml/gsl-ocaml/Manifest @@ -1 +1 @@ -DIST gsl-ocaml-1.19.1.tar.gz 167549 BLAKE2B 17d559b31a2be9583fd616b273f1d5cac5a42bebc7df2cf4882ba5bf7ddf411971b4f49dc36eb3bcdb0265ea204d0ea0ba19bc6c63f49a6b8b6075715bd0a967 SHA512 be199d46479f07a16d2f667d7a29675171bc4ecc5a6e5948335bf98f72e6f12474d16455a22e6bfc73683f1d67de3a186d75f817f398f6621241b640c333e07d +DIST gsl-1.24.3.tbz 100642 BLAKE2B cf1bd63593901ba41ec33a8d073d923351e8cd6021f0402ce337242dd6b378408e740f2904a1c53f123453444dc08a05971921ab53e683b2ecf1e8a869f28e46 SHA512 c6e2578618591d1bef428693b69026cdea0f1606cd25d9f02d637a90256a5685eee70ecd0259d2595a1cd7b292c34e3c913c007e2706aa125af045d37e55d9c4 diff --git a/dev-ml/gsl-ocaml/gsl-ocaml-1.19.1.ebuild b/dev-ml/gsl-ocaml/gsl-ocaml-1.19.1.ebuild deleted file mode 100644 index 694f13126426..000000000000 --- a/dev-ml/gsl-ocaml/gsl-ocaml-1.19.1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -OASIS_BUILD_DOCS=1 -OASIS_BUILD_TESTS=1 - -inherit oasis - -DESCRIPTION="OCaml bindings for the GSL library (successor of dev-ml/ocamlgsl)" -HOMEPAGE="https://github.com/mmottl/gsl-ocaml" -SRC_URI="https://github.com/mmottl/${PN}/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="examples test" - -DEPEND=">=sci-libs/gsl-1.19" -RDEPEND="${DEPEND} - !dev-ml/ocamlgsl" - -DOCS=( CHANGES.txt README.md NOTES.md TODO.md ) - -src_prepare() { - oasis_configure_opts="$(use_enable examples)" -} diff --git a/dev-ml/gsl-ocaml/gsl-ocaml-1.24.3-r1.ebuild b/dev-ml/gsl-ocaml/gsl-ocaml-1.24.3-r1.ebuild new file mode 100644 index 000000000000..c72639216ff3 --- /dev/null +++ b/dev-ml/gsl-ocaml/gsl-ocaml-1.24.3-r1.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DUNE_PKG_NAME="gsl" +inherit dune + +MY_P=${P/-ocaml/} +DESCRIPTION="OCaml bindings for the GSL library (successor of dev-ml/ocamlgsl)" +HOMEPAGE="https://github.com/mmottl/gsl-ocaml" +SRC_URI="https://github.com/mmottl/${PN}/releases/download/${PV}/${MY_P}.tbz" +S="${WORKDIR}"/${MY_P} + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+ocamlopt" + +DEPEND=" + dev-ml/dune-configurator + >=sci-libs/gsl-1.19:=" +RDEPEND="${DEPEND} + !dev-ml/ocamlgsl" + +# DOCS=( CHANGES.txt README.md NOTES.md TODO.md ) diff --git a/dev-ml/gsl-ocaml/metadata.xml b/dev-ml/gsl-ocaml/metadata.xml index 52ba8df11dd3..0412d9a480ac 100644 --- a/dev-ml/gsl-ocaml/metadata.xml +++ b/dev-ml/gsl-ocaml/metadata.xml @@ -1,13 +1,10 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sci@gentoo.org</email> <name>Gentoo Science Project</name> </maintainer> - <longdescription lang="en"> -GSL interface for OCaml - </longdescription> <upstream> <remote-id type="bitbucket">mmottl/gsl-ocaml</remote-id> <remote-id type="github">mmottl/gsl-ocaml</remote-id> diff --git a/dev-ml/herelib/Manifest b/dev-ml/herelib/Manifest deleted file mode 100644 index 5e56ded7fb7d..000000000000 --- a/dev-ml/herelib/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST herelib-112.35.00.tar.gz 49201 BLAKE2B 6a5996b88e54473e3befc98c47b4f98c57d23b74a824301559ea2e4be1757627ab569bfe31f098da3854b5525eafc4490fee670634c38f133614df842ba0e91d SHA512 3b7fe743327e93526858004f90f102e5eb98cc493f22acea3d82e51bf99307679017389680456a143fb6fa9dce0a30bfd69abf90e5f0ea1367ec9c9c0726150f diff --git a/dev-ml/herelib/herelib-112.35.00.ebuild b/dev-ml/herelib/herelib-112.35.00.ebuild deleted file mode 100644 index 54579ed85a6b..000000000000 --- a/dev-ml/herelib/herelib-112.35.00.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit oasis - -MY_P=${PN/-/_}-${PV} -DESCRIPTION="Syntax extension for inserting the current location" -HOMEPAGE="http://www.janestreet.com/ocaml" -SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV%.*}/files/${MY_P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -DEPEND=" - >=dev-lang/ocaml-4.00.0:= - dev-ml/camlp4:= -" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" diff --git a/dev-ml/herelib/metadata.xml b/dev-ml/herelib/metadata.xml deleted file mode 100644 index ffac4d7ebc01..000000000000 --- a/dev-ml/herelib/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> -</maintainer> -</pkgmetadata> diff --git a/dev-ml/iTeML/Manifest b/dev-ml/iTeML/Manifest deleted file mode 100644 index a547c32355b0..000000000000 --- a/dev-ml/iTeML/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST iTeML-2.5.tar.gz 33750 BLAKE2B 362dcbd0a2e44842832ec5e2307eb2f291013344e80b791f1e2c3e5ffc43633f67c7e736ad3a6545197467700d043649080b5f8889b55e460748f769ca7f404b SHA512 b8a2f842f0076bdf3f30a71983f686b931ac3f7fde73ad83041dae1d33d8bca2c7695b71dcc53ef942fbdee7422e2e4d22994f69b70d54e2b4d62bc1c64395c9 -DIST iTeML-2.6.tar.gz 34822 BLAKE2B feb7a1d7973f1710b245cb5d859d443b4c30a6128137523659768864cdd23eb18606a2b6d418d9fb37784bf2fe53fc45a4558e1565186e2402574df560a4afc5 SHA512 6c42856d8a8d6b9e76002fe94e4be0db2a108c4a033fd3d19849772a6c1db9b792beb960b0ac02973d40dc9dda4c4cf5ba13ae9f05534798cc3ccc283f8d3567 -DIST iTeML-2.7.tar.gz 34866 BLAKE2B c3d2df6901ca1c5a804b8e5becf2960f6de10a0edc88fab86fadd39ec25d35143d5ccb3765a1bb5e4d55f28d1dc8942085b964b343dc1f8622ea4438b842e9a6 SHA512 477b55332ab4f733bb225fb15741e5129314fc857900715851027b132fd87f169f8d402987762bd9a07e0a644b1d2bbd49e2f21de7cc23edbe89ff8b3f2bda65 diff --git a/dev-ml/iTeML/iTeML-2.5.ebuild b/dev-ml/iTeML/iTeML-2.5.ebuild deleted file mode 100644 index 7047a3ea4d8d..000000000000 --- a/dev-ml/iTeML/iTeML-2.5.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib - -DESCRIPTION="Inline (Unit) Tests for OCaml" -HOMEPAGE="https://github.com/vincent-hugot/iTeML" -SRC_URI="https://github.com/vincent-hugot/iTeML/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="dev-ml/ounit:= - dev-lang/ocaml:=[ocamlopt] - >=dev-ml/qcheck-0.5:= -" -DEPEND="${RDEPEND} - dev-ml/ocamlbuild -" - -src_install() { - findlib_src_preinst - dodir /usr/bin - emake BIN="${ED}/usr/bin/" install - dodoc README.adoc HOWTO.adoc -} diff --git a/dev-ml/iTeML/iTeML-2.6.ebuild b/dev-ml/iTeML/iTeML-2.6.ebuild deleted file mode 100644 index 7047a3ea4d8d..000000000000 --- a/dev-ml/iTeML/iTeML-2.6.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib - -DESCRIPTION="Inline (Unit) Tests for OCaml" -HOMEPAGE="https://github.com/vincent-hugot/iTeML" -SRC_URI="https://github.com/vincent-hugot/iTeML/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="dev-ml/ounit:= - dev-lang/ocaml:=[ocamlopt] - >=dev-ml/qcheck-0.5:= -" -DEPEND="${RDEPEND} - dev-ml/ocamlbuild -" - -src_install() { - findlib_src_preinst - dodir /usr/bin - emake BIN="${ED}/usr/bin/" install - dodoc README.adoc HOWTO.adoc -} diff --git a/dev-ml/iTeML/iTeML-2.7.ebuild b/dev-ml/iTeML/iTeML-2.7.ebuild deleted file mode 100644 index 7047a3ea4d8d..000000000000 --- a/dev-ml/iTeML/iTeML-2.7.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib - -DESCRIPTION="Inline (Unit) Tests for OCaml" -HOMEPAGE="https://github.com/vincent-hugot/iTeML" -SRC_URI="https://github.com/vincent-hugot/iTeML/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="dev-ml/ounit:= - dev-lang/ocaml:=[ocamlopt] - >=dev-ml/qcheck-0.5:= -" -DEPEND="${RDEPEND} - dev-ml/ocamlbuild -" - -src_install() { - findlib_src_preinst - dodir /usr/bin - emake BIN="${ED}/usr/bin/" install - dodoc README.adoc HOWTO.adoc -} diff --git a/dev-ml/iTeML/metadata.xml b/dev-ml/iTeML/metadata.xml deleted file mode 100644 index 4e400b4f2b2a..000000000000 --- a/dev-ml/iTeML/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">vincent-hugot/iTeML</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/incremental/Manifest b/dev-ml/incremental/Manifest deleted file mode 100644 index f438627eac5c..000000000000 --- a/dev-ml/incremental/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST incremental-0.9.0.tar.gz 28822 BLAKE2B 0e369107c545e427609397d9d887a6d0eb295c222efa78fdd288bdf4e72000a79f49f3e40cacd593514f57dd94bfeaf23f2cb3fbecaee7bc09f3ede37165e3df SHA512 126b76e31920c56958b6c15319b636b5b5ea8bba56b8fab85c2b6fb2c3a4527b4759a05d0edfe3462e94e6348d7391e2578e82d35b160e31e6c88495c828f612 diff --git a/dev-ml/incremental/incremental-0.9.0.ebuild b/dev-ml/incremental/incremental-0.9.0.ebuild deleted file mode 100644 index 9137fce7860c..000000000000 --- a/dev-ml/incremental/incremental-0.9.0.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Library for incremental computations" -HOMEPAGE="https://github.com/janestreet/incremental" -SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -DEPEND=" - dev-lang/ocaml:= - dev-ml/core:= - dev-ml/incremental_kernel:= - dev-ml/ppx_driver:= - dev-ml/ppx_jane:= - dev-ml/ocaml-migrate-parsetree:= -" -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} dev-ml/opam dev-ml/jbuilder" - -src_install() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - ${PN}.install || die -} diff --git a/dev-ml/incremental/metadata.xml b/dev-ml/incremental/metadata.xml deleted file mode 100644 index a9552f869fb0..000000000000 --- a/dev-ml/incremental/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">janestreet/incremental</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/incremental_kernel/Manifest b/dev-ml/incremental_kernel/Manifest deleted file mode 100644 index ce9c5eab3b6d..000000000000 --- a/dev-ml/incremental_kernel/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST incremental_kernel-0.9.0.tar.gz 74255 BLAKE2B 160f3d3c91a54a0541ae7723bf6e5b34b0bc38d86425f066642b29e620159865b58f284c54ac1ed8b36756c5a84b8914c2fc50549fee5baa9860283b2f0d17b1 SHA512 e6e7abb736e838ef373153e0678965ad3b599cfe34299a3f2131b5afa198a1991b043be75ef348d0010f7b85babd407cbedca84efc43fa51b3abb016d721c52d diff --git a/dev-ml/incremental_kernel/incremental_kernel-0.9.0.ebuild b/dev-ml/incremental_kernel/incremental_kernel-0.9.0.ebuild deleted file mode 100644 index 051daef8f837..000000000000 --- a/dev-ml/incremental_kernel/incremental_kernel-0.9.0.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Library for incremental computations depending only on Core_kernel" -HOMEPAGE="https://github.com/janestreet/incremental_kernel" -SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -DEPEND=" - dev-lang/ocaml:= - dev-ml/core_kernel:= - dev-ml/ppx_driver:= - dev-ml/ppx_jane:= - dev-ml/ocaml-migrate-parsetree:= - <dev-ml/ppx_jane-100 - <dev-ml/ppx_driver-100 -" -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} dev-ml/opam dev-ml/jbuilder" - -src_install() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - ${PN}.install || die -} diff --git a/dev-ml/incremental_kernel/metadata.xml b/dev-ml/incremental_kernel/metadata.xml deleted file mode 100644 index f6b329b16d64..000000000000 --- a/dev-ml/incremental_kernel/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">janestreet/incremental_kernel</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/int_repr/Manifest b/dev-ml/int_repr/Manifest new file mode 100644 index 000000000000..719a48718198 --- /dev/null +++ b/dev-ml/int_repr/Manifest @@ -0,0 +1,2 @@ +DIST int_repr-0.15.0.tar.gz 9105 BLAKE2B a2a8197cdba7c4805c9eb9402e1c853619fc142bd057c4b42a578bcfdc97b417751634a31bab1ccd5c2e75cfbef46d33b6daf76da5ed4e3c9ec26d5c81fd3b73 SHA512 96537591fc597264347f967757df979344224f84594949bca96b40298e4ae1d7b28b40f3705ad4f85e3801724c6388fc048271216703b81fda0e56a314f3e88f +DIST int_repr-0.16.0.tar.gz 9227 BLAKE2B 4dfb7a21cfe2bbd27051005f7eb1452925cac30b86ce3b20aeecbc0b2cf52966cbabbd9d56fa1fadfdc3c3912b33c4a1b323cfaf46e6c027ef6c31b4893e8901 SHA512 1b395d2c5c2322a8948f09e2b1c53382902edb1a390bc4659baf8eb87d085c90e551ede171a0d4d4b3c6fec18210ff100b02565461b42cabaedc446551c79841 diff --git a/dev-ml/int_repr/int_repr-0.15.0.ebuild b/dev-ml/int_repr/int_repr-0.15.0.ebuild new file mode 100644 index 000000000000..2364f1913e0e --- /dev/null +++ b/dev-ml/int_repr/int_repr-0.15.0.ebuild @@ -0,0 +1,20 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Integers of various widths" +HOMEPAGE="https://github.com/janestreet/int_repr" +SRC_URI="https://github.com/janestreet/${PN}/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86" +IUSE="+ocamlopt" + +DEPEND="dev-ml/ppx_jane:${SLOT}" +RDEPEND="${DEPEND}" +BDEPEND="" diff --git a/dev-ml/int_repr/int_repr-0.16.0.ebuild b/dev-ml/int_repr/int_repr-0.16.0.ebuild new file mode 100644 index 000000000000..fffa9b22998e --- /dev/null +++ b/dev-ml/int_repr/int_repr-0.16.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Integers of various widths" +HOMEPAGE="https://github.com/janestreet/int_repr" +SRC_URI="https://github.com/janestreet/${PN}/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-lang/ocaml-4.14 + dev-ml/ppx_jane:${SLOT} +" +RDEPEND="${DEPEND}" +BDEPEND="" diff --git a/dev-ml/int_repr/metadata.xml b/dev-ml/int_repr/metadata.xml new file mode 100644 index 000000000000..762c50d1612f --- /dev/null +++ b/dev-ml/int_repr/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">janestreet/int_repr</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/integers/Manifest b/dev-ml/integers/Manifest index 65fc1855d930..63b75be95c44 100644 --- a/dev-ml/integers/Manifest +++ b/dev-ml/integers/Manifest @@ -1 +1,3 @@ -DIST integers-0.2.2.tbz 9155 BLAKE2B 7dcbf0a10cdd2f65683c590dcc18ab7a67540eb39b78500506b303afaf881d6322ac8014dff9a772d7b43cb9b4765dbf85cdb2d31a3a5a78cf5a8e674f18dfea SHA512 957ec87f385916a847eeccef1142d706cf2bf9024a4f0b97120f73a2eda4c049261078bc27227db14bfed53bf014da14a93ef75b515a851af72088bd8b04081a +DIST integers-0.4.0.tar.gz 9980 BLAKE2B ee67c39024d77f4ce20e9ba7e1564b3418397f1e98b9a5f30e238f5c161d7572701e3d824871b46d15b90887d5f3983a9ab440f46e22c4de8cbc68912daea5eb SHA512 73af64654579b27db18c612229044dba094064dc7d36a73f42ffd4ba7040ed326f859f588e7a764bce3b2fd6e9365f9e9f99330ef29bafbe77ca6dcb53d5ed79 +DIST integers-0.5.1.tar.gz 12687 BLAKE2B 37807cf0642ff4b85c91b82d7fa6ee46a242750970123b0d9d3bec7c532d0d6ceceb4b2365cc71e0664068b3fcb99e61e5c6621363cd527237cf3051da813791 SHA512 25d90c41d66a73ca18f2cfb5e13e9b3af57d1712dab108e45cb8e9eeb88f4a2f822e03f05e08832080d4764d46c7e5f116fe48bdf060c6ebd80c3e558de41983 +DIST integers-0.7.0.tar.gz 12758 BLAKE2B 26244bb4fd6556c4e8e493180211a778552b84ae2de269b02d3094960fe7ab059a83f01263ee9e654e2e0c83195087bae621d7b60efde5eac519f9aae3a962fa SHA512 f71bf73af2e4e0dd5bd039b28bce1fdabfb199ada1836d694814aa6d0c1c2d205531fbfc05581082b2dbb1e9cc0948e594915d5ad6a1cfa1dbffa9e44a7a7450 diff --git a/dev-ml/integers/integers-0.2.2.ebuild b/dev-ml/integers/integers-0.2.2.ebuild deleted file mode 100644 index 4c4999134304..000000000000 --- a/dev-ml/integers/integers-0.2.2.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Various signed and unsigned integer types for OCaml" -HOMEPAGE="https://github.com/ocamllabs/ocaml-integers" -SRC_URI="https://github.com/ocamllabs/ocaml-integers/releases/download/v${PV}/${P}.tbz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" -IUSE="" - -RDEPEND="dev-lang/ocaml:=" -DEPEND="${RDEPEND} - dev-ml/ocamlbuild - dev-ml/opam - dev-ml/topkg - dev-ml/findlib" - -src_compile() { - ocaml pkg/pkg.ml build || die -} - -src_install() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - ${PN}.install || die -} diff --git a/dev-ml/integers/integers-0.4.0.ebuild b/dev-ml/integers/integers-0.4.0.ebuild new file mode 100644 index 000000000000..909750219e9d --- /dev/null +++ b/dev-ml/integers/integers-0.4.0.ebuild @@ -0,0 +1,16 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Various signed and unsigned integer types for OCaml" +HOMEPAGE="https://github.com/ocamllabs/ocaml-integers" +SRC_URI="https://github.com/ocamllabs/ocaml-integers/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/ocaml-${P}" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ppc64 x86" +IUSE="+ocamlopt" diff --git a/dev-ml/integers/integers-0.5.1.ebuild b/dev-ml/integers/integers-0.5.1.ebuild new file mode 100644 index 000000000000..7e82273a8fcc --- /dev/null +++ b/dev-ml/integers/integers-0.5.1.ebuild @@ -0,0 +1,16 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Various signed and unsigned integer types for OCaml" +HOMEPAGE="https://github.com/ocamllabs/ocaml-integers" +SRC_URI="https://github.com/ocamllabs/ocaml-integers/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/ocaml-${P}" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" diff --git a/dev-ml/integers/integers-0.7.0.ebuild b/dev-ml/integers/integers-0.7.0.ebuild new file mode 100644 index 000000000000..69312d89a53d --- /dev/null +++ b/dev-ml/integers/integers-0.7.0.ebuild @@ -0,0 +1,20 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Various signed and unsigned integer types for OCaml" +HOMEPAGE="https://github.com/ocamllabs/ocaml-integers" +SRC_URI="https://github.com/ocamllabs/ocaml-integers/archive/${PV}.tar.gz + -> ${P}.tar.gz" +S="${WORKDIR}"/ocaml-${P} + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +RDEPEND="dev-ml/stdlib-shims:=" +DEPEND="${RDEPEND}" diff --git a/dev-ml/integers/metadata.xml b/dev-ml/integers/metadata.xml index 637f8241fbad..49e5b2610774 100644 --- a/dev-ml/integers/metadata.xml +++ b/dev-ml/integers/metadata.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">ocamllabs/ocaml-integers</remote-id> diff --git a/dev-ml/io-page/Manifest b/dev-ml/io-page/Manifest deleted file mode 100644 index 0d630ea1ead7..000000000000 --- a/dev-ml/io-page/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST io-page-1.6.0.tar.gz 53078 BLAKE2B 97bca15ef93b2a7af507642465efb34345c670fde7223b17b81e0486a99f59cdcd6c88e83a84b8480ec416a3ec901d659715a4c89ea30b376b2d1a81fc4ff37e SHA512 f20394b72cd4104be53a3639d22a287f8a5c32f05e60a31123c15d8deb1feb9ca28b77d953b186b9e5667332c8992ddecb8980883ad64c41f06d4f5b6cda7cb6 diff --git a/dev-ml/io-page/io-page-1.6.0.ebuild b/dev-ml/io-page/io-page-1.6.0.ebuild deleted file mode 100644 index 3811923910e4..000000000000 --- a/dev-ml/io-page/io-page-1.6.0.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -OASIS_BUILD_TESTS=1 - -inherit oasis - -DESCRIPTION="IO memory page library for Mirage backends" -HOMEPAGE="https://github.com/mirage/io-page https://mirage.io" -SRC_URI="https://github.com/mirage/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="ISC" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND=" - >=dev-lang/ocaml-4:= - >=dev-ml/ocaml-cstruct-1.1.0:= -" -DEPEND=" - test? ( dev-ml/ounit ) - ${RDEPEND} -" - -DOCS=( CHANGES README.md ) diff --git a/dev-ml/io-page/metadata.xml b/dev-ml/io-page/metadata.xml deleted file mode 100644 index fe15850868be..000000000000 --- a/dev-ml/io-page/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">mirage/io-page</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/jane-street-headers/Manifest b/dev-ml/jane-street-headers/Manifest index dd32a3bfc906..0bacd48796fd 100644 --- a/dev-ml/jane-street-headers/Manifest +++ b/dev-ml/jane-street-headers/Manifest @@ -1 +1,3 @@ -DIST jane-street-headers-0.9.0.tar.gz 6713 BLAKE2B fa8461922ad5e9c28fecb29bfb630d6b1578c8440ad82ab841da17c32ebdfef8ecac90ca66721aef06321a085e2b927904ced4c5a1c8ee6b3cc969dfcbf761bd SHA512 dbd1198b7eb45f06f7df6e9c5b66589b6004e9424f2ecdd50d20c3dc2f35048c42f9220f1d03b4b6564e7a79d00dbe3b3c9c767600e78d066266093b8d93ad46 +DIST jane-street-headers-0.14.0.tar.gz 4662 BLAKE2B 22a48e9c254005d28c03399dd9d9347b45b7e3def9c0efdd768162f80ff611be6249d629cd78fd8768c7e6ec5610684e9459b149f3de85da307b2f1e8525296d SHA512 9c80acc57016f98cd88455866523f2463a13d2b7e10cf0d63f5198747615321799a8b3442432b321fa4f33a051f404464e27972317d197ac9513651600673879 +DIST jane-street-headers-0.15.0.tar.gz 4865 BLAKE2B 932468266f6cd56ee2b484c5f4459919b2f0fa659a41d51132c169eda49734e5cc852e6aea5549173df6af603f3118de8bb8362b5d7ca5f27e00999d75eb8fa9 SHA512 83ea5e4cdbae6710c7071325164df06dcb652a69329698c5b0c8832057f4d7325e8a241e5818e78ad2f6b8daeb1d0635528d9bd3b6761c69f8370a7bdb773c1f +DIST jane-street-headers-0.16.0.tar.gz 4905 BLAKE2B 33301bd5221fb636a44a3e654ae1511d99645e0dbfea4f9765f5d2febf9cdab03d6a9a15f7cf1733ffa380e7c9fa5743d66487feda0e2e2088d1e748775e607c SHA512 05336733845b442e3594889ac6e8fe7048bb3fc23b5f8a05e48d42db6851e4aac561587a1e73b9d6fb1852b768dd66b949cd220b1a9effe83dd181707ea2ab24 diff --git a/dev-ml/jane-street-headers/jane-street-headers-0.14.0.ebuild b/dev-ml/jane-street-headers/jane-street-headers-0.14.0.ebuild new file mode 100644 index 000000000000..b0b52e902e53 --- /dev/null +++ b/dev-ml/jane-street-headers/jane-street-headers-0.14.0.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Jane Street header files" +HOMEPAGE="https://github.com/janestreet/jane-street-headers" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" diff --git a/dev-ml/jane-street-headers/jane-street-headers-0.15.0-r1.ebuild b/dev-ml/jane-street-headers/jane-street-headers-0.15.0-r1.ebuild new file mode 100644 index 000000000000..b42981a63c5c --- /dev/null +++ b/dev-ml/jane-street-headers/jane-street-headers-0.15.0-r1.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Jane Street header files" +HOMEPAGE="https://github.com/janestreet/jane-street-headers" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" diff --git a/dev-ml/jane-street-headers/jane-street-headers-0.16.0.ebuild b/dev-ml/jane-street-headers/jane-street-headers-0.16.0.ebuild new file mode 100644 index 000000000000..6d45dbd92106 --- /dev/null +++ b/dev-ml/jane-street-headers/jane-street-headers-0.16.0.ebuild @@ -0,0 +1,18 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Jane Street header files" +HOMEPAGE="https://github.com/janestreet/jane-street-headers" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +DEPEND=">=dev-lang/ocaml-4.14" +RDEPEND="${DEPEND}" diff --git a/dev-ml/jane-street-headers/jane-street-headers-0.9.0.ebuild b/dev-ml/jane-street-headers/jane-street-headers-0.9.0.ebuild deleted file mode 100644 index 66f7cb6cec81..000000000000 --- a/dev-ml/jane-street-headers/jane-street-headers-0.9.0.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Jane Street header files" -HOMEPAGE="https://github.com/janestreet/jane-street-headers" -SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -DEPEND=" - dev-lang/ocaml:= - " -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} dev-ml/opam dev-ml/jbuilder" - -src_install() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - ${PN}.install || die -} diff --git a/dev-ml/jane-street-headers/metadata.xml b/dev-ml/jane-street-headers/metadata.xml index 8da2fe7c5030..6ed2702997a2 100644 --- a/dev-ml/jane-street-headers/metadata.xml +++ b/dev-ml/jane-street-headers/metadata.xml @@ -1,9 +1,9 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">janestreet/jane-street-headers</remote-id> diff --git a/dev-ml/jbuilder/Manifest b/dev-ml/jbuilder/Manifest deleted file mode 100644 index d0867e24fc34..000000000000 --- a/dev-ml/jbuilder/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST jbuilder-1.0-beta14.tar.gz 268571 BLAKE2B 509fded43004426fa0bc0d692c50ef2fcc97dc3aa22010bf306f993a3964110cc3f5b3b0ae33a0ea64d00500d70e846450f73142edfef74af75931b99977e9fd SHA512 0258067b0b48dbd22c0d25b65fcb1fe9a7e65f9389031f954fab7cccf4e0791fe2242f85d441f23e284d13a0b1a3f4485546f94008211adef7b58fd14c4091d3 diff --git a/dev-ml/jbuilder/jbuilder-1.0_beta14.ebuild b/dev-ml/jbuilder/jbuilder-1.0_beta14.ebuild deleted file mode 100644 index 73b64735ff87..000000000000 --- a/dev-ml/jbuilder/jbuilder-1.0_beta14.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit opam - -MY_PV="${PV/_/+}" -MY_P="${PN}-${PV/_/-}" - -DESCRIPTION="A composable build system for OCaml" -HOMEPAGE="https://github.com/janestreet/jbuilder" -SRC_URI="https://github.com/janestreet/jbuilder/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" -IUSE="test" - -DEPEND="" -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} - test? ( dev-ml/menhir ) -" -OPAMSWITCH="system" - -S="${WORKDIR}/${MY_P}" -OPAMROOT="${D}" - -src_prepare() { - # Disable Werror like behavior, doesnt build with ocaml 4.05 otherwise - sed -i -e 's/--dev//' Makefile || die -} diff --git a/dev-ml/jingoo/Manifest b/dev-ml/jingoo/Manifest new file mode 100644 index 000000000000..9ea1662c15c1 --- /dev/null +++ b/dev-ml/jingoo/Manifest @@ -0,0 +1,2 @@ +DIST jingoo-1.4.2.tar.gz 67611 BLAKE2B 5d2ead117863a2edd18320da4fa7539a7ebd6c537509b5cd37df3778d90c3459dde73d03d3d97b0ed64cfa4b7ef46f620e5638dd75f7e5b290340cc53761deea SHA512 d54d9114b87efdf49b81931b28ee2b61edbd984792c8371f7498b42175f574da7d2774b7b28702b62eeae704168e18c7e9283c4618045abc559b2d1d680e92ad +DIST jingoo-1.4.4.tar.gz 68818 BLAKE2B d6049e06dee9ff9bf3a649ce46aafb3c281c5bce312fd7f9723ee682da641e3664c699cc9eca8fb5dbd55540f3ad74b64268fcbc0e56f46a8af36ef2b3c7b996 SHA512 bb46c2cfdb98f188319ce60e0623c0e1e980ff44235029788bd2fb14c2ec3650866deadea9004abdcfa14b031f42bd2327341a60623bd4d86fb0e37c34a7935a diff --git a/dev-ml/jingoo/jingoo-1.4.2.ebuild b/dev-ml/jingoo/jingoo-1.4.2.ebuild new file mode 100644 index 000000000000..bb5fe92b8b4f --- /dev/null +++ b/dev-ml/jingoo/jingoo-1.4.2.ebuild @@ -0,0 +1,34 @@ +# Copyright 2021-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="OCaml template engine almost compatible with Jinja2" +HOMEPAGE="https://github.com/tategakibunko/jingoo" +SRC_URI="https://github.com/tategakibunko/${PN}/archive/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="ISC" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND="dev-ml/ppx_deriving:= + dev-ml/ppxlib:= + dev-ml/uucp:= + dev-ml/uutf:= + dev-ml/re:= + dev-ml/ocaml-migrate-parsetree:= + dev-ml/menhir:=" +DEPEND="${RDEPEND} + test? ( dev-ml/ounit2 )" + +src_prepare() { + default + + # Port to dev-ml/ounit2 + sed -i -e 's/oUnit/ounit2/' tests/dune.in || die +} diff --git a/dev-ml/jingoo/jingoo-1.4.4.ebuild b/dev-ml/jingoo/jingoo-1.4.4.ebuild new file mode 100644 index 000000000000..801385ed4d64 --- /dev/null +++ b/dev-ml/jingoo/jingoo-1.4.4.ebuild @@ -0,0 +1,29 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="OCaml template engine almost compatible with Jinja2" +HOMEPAGE="https://github.com/tategakibunko/jingoo/" +SRC_URI="https://github.com/tategakibunko/${PN}/archive/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="ISC" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-ml/menhir:= + dev-ml/ocaml-migrate-parsetree:= + dev-ml/ppx_deriving:= + dev-ml/ppxlib:= + dev-ml/re:= + dev-ml/uucp:= + dev-ml/uutf:= +" +DEPEND="${RDEPEND}" +BDEPEND="test? ( dev-ml/ounit2 )" diff --git a/dev-ml/jingoo/metadata.xml b/dev-ml/jingoo/metadata.xml new file mode 100644 index 000000000000..ea773c8ddc23 --- /dev/null +++ b/dev-ml/jingoo/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">tategakibunko/jingoo</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/js-build-tools/Manifest b/dev-ml/js-build-tools/Manifest deleted file mode 100644 index ee2926aac20b..000000000000 --- a/dev-ml/js-build-tools/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST js-build-tools-113.33.04.tar.gz 53125 BLAKE2B a9754aae8bd4cc8a043d846ad3dfcf27d7bd18fca90c3a3ec470f3ec2b02361b84205fca68ebf5de3bac03cac94121f551c97815fd678584f87fa8681a17897e SHA512 80e5ec052a3957fe0871d3ddf5ce7cb18f6942360388508cf0afaa6fb251a3a37cdb72b8bf5ae05b390e781bec2e78cb546e460772aad4ef563a49137c5d378a -DIST js-build-tools-113.33.06.tar.gz 53942 BLAKE2B d8c09180781be5cf7998175d46678cc9d74299d6b2c95297e9b682b53961b9cd006e675ad72d944d7e773dd8cad6ab72dfe9840f18212ed29c2a14612bf871c0 SHA512 69e755843971cc8944033ff9539ca26b8c56a3492e11cb8778bb35a40e1af2cbacad30d67de1734ca70722e1aaa68d4d5d405794315f2848cec358dd9736b14c diff --git a/dev-ml/js-build-tools/js-build-tools-113.33.04.ebuild b/dev-ml/js-build-tools/js-build-tools-113.33.04.ebuild deleted file mode 100644 index a1e9e8f0ee66..000000000000 --- a/dev-ml/js-build-tools/js-build-tools-113.33.04.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -OASIS_BUILD_DOCS=1 -OASIS_BUILD_TESTS=1 - -inherit oasis - -DESCRIPTION="Collection of tools to help building Jane Street Packages" -HOMEPAGE="https://github.com/janestreet/js-build-tools" -SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV%.*}/files/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND="dev-ml/ocamlbuild:=" -DEPEND="${RDEPEND} dev-ml/opam" - -src_configure() { - emake setup.exe - OASIS_SETUP_COMMAND="./setup.exe" oasis_src_configure -} - -src_compile() { - emake -} - -src_install() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - ${PN}.install || die - dodoc README.md -} diff --git a/dev-ml/js-build-tools/js-build-tools-113.33.06.ebuild b/dev-ml/js-build-tools/js-build-tools-113.33.06.ebuild deleted file mode 100644 index a1e9e8f0ee66..000000000000 --- a/dev-ml/js-build-tools/js-build-tools-113.33.06.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -OASIS_BUILD_DOCS=1 -OASIS_BUILD_TESTS=1 - -inherit oasis - -DESCRIPTION="Collection of tools to help building Jane Street Packages" -HOMEPAGE="https://github.com/janestreet/js-build-tools" -SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV%.*}/files/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND="dev-ml/ocamlbuild:=" -DEPEND="${RDEPEND} dev-ml/opam" - -src_configure() { - emake setup.exe - OASIS_SETUP_COMMAND="./setup.exe" oasis_src_configure -} - -src_compile() { - emake -} - -src_install() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - ${PN}.install || die - dodoc README.md -} diff --git a/dev-ml/js-build-tools/metadata.xml b/dev-ml/js-build-tools/metadata.xml deleted file mode 100644 index 632af8452e65..000000000000 --- a/dev-ml/js-build-tools/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="bitbucket">yminsky/ocaml-core</remote-id> - <remote-id type="github">janestreet/js-build-tools</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/js_of_ocaml/Manifest b/dev-ml/js_of_ocaml/Manifest deleted file mode 100644 index 175cbf5c7101..000000000000 --- a/dev-ml/js_of_ocaml/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST js_of_ocaml-2.8.4.tar.gz 1344082 BLAKE2B f7f24e422a906d14ccf26b65de00c4d08726058cb14113c60527e337a14b6e2e65fc6dcda76dcffe3139c5fc7b5b2c1111ecb3ceaf820697581fed7cd35d097d SHA512 8dc65bac7d60f2d3534e31e0fddb061f1b97bfd8146b1a34b4a1a516574c6a39f66d115646aa9767b7e24a51ec76949b05841088601f97d76972c8899a50c4fd -DIST js_of_ocaml-3.0.0.tar.gz 1433377 BLAKE2B c4d696adc90c8caacf725f7b691b9f57199385f6137356da8562d63b95c5089317064e36d343f524713df600e07f04d8b530b591cb5532f0dffa4ae143dd8f4b SHA512 dc4bbbfdacb43338aa7f97b7012b6de8a2eac5d7c5f535ceb9565c477c961a212ce5b2a75b1719fcd9f2d57938ee2162f6f04d3364397a469d7a13d1fe4e3908 diff --git a/dev-ml/js_of_ocaml/files/ocaml405.patch b/dev-ml/js_of_ocaml/files/ocaml405.patch deleted file mode 100644 index 552dff425c46..000000000000 --- a/dev-ml/js_of_ocaml/files/ocaml405.patch +++ /dev/null @@ -1,41 +0,0 @@ -Index: js_of_ocaml-2.8.4/lib/ppx/ppx_js.ml -=================================================================== ---- js_of_ocaml-2.8.4.orig/lib/ppx/ppx_js.ml -+++ js_of_ocaml-2.8.4/lib/ppx/ppx_js.ml -@@ -162,7 +162,8 @@ let invoker ?(extra_types = []) uplift d - {[ fun (type res t0 t1 ..) arg1 arg2 -> e ]} - *) - let local_types = -- res :: List.map Arg.name (extra_types @ arguments) -+ List.map Location.mknoloc -+ (res :: List.map Arg.name (extra_types @ arguments)) - in - let result = List.fold_right Exp.newtype local_types invoker in - -@@ -210,7 +211,7 @@ let method_call ~loc obj meth args = - (Exp.fun_ ~loc ~attrs:[merlin_noloc] Label.nolabel None - (Pat.var ~loc ~attrs:[merlin_noloc] (Location.mknoloc "x")) - (Exp.send ~loc ~attrs:[merlin_noloc] -- (Exp.ident ~loc:gloc (lid ~loc:gloc "x")) meth))] -+ (Exp.ident ~loc:gloc (lid ~loc:gloc "x")) (Location.mknoloc meth)))] - ) - - (* {[ obj##.prop ]} generates -@@ -244,7 +245,7 @@ let prop_get ~loc:_ ~prop_loc obj prop = - (Exp.fun_ ~loc:gloc Label.nolabel None - (Pat.var ~loc:gloc ~attrs:[merlin_noloc] (Location.mknoloc "x")) - (Exp.send ~loc:prop_loc ~attrs:[merlin_noloc] -- (Exp.ident ~loc:gloc (lid ~loc:gloc "x")) prop)) -+ (Exp.ident ~loc:gloc (lid ~loc:gloc "x")) (Location.mknoloc prop))) - ] - ) - -@@ -289,7 +290,7 @@ let prop_set ~loc ~prop_loc obj prop val - (Exp.fun_ ~loc Label.nolabel None - (Pat.var ~loc:gloc ~attrs:[merlin_noloc] (Location.mknoloc "x")) - (Exp.send ~loc:prop_loc ~attrs:[merlin_noloc] -- (Exp.ident ~loc:gloc (lid ~loc:gloc "x")) prop)) -+ (Exp.ident ~loc:gloc (lid ~loc:gloc "x")) (Location.mknoloc prop))) - ] - ) - diff --git a/dev-ml/js_of_ocaml/files/ppx.patch b/dev-ml/js_of_ocaml/files/ppx.patch deleted file mode 100644 index c46293f546da..000000000000 --- a/dev-ml/js_of_ocaml/files/ppx.patch +++ /dev/null @@ -1,11 +0,0 @@ -Index: js_of_ocaml-2.8.4/lib/ppx_driver/ppx_js_driver.ml -=================================================================== ---- js_of_ocaml-2.8.4.orig/lib/ppx_driver/ppx_js_driver.ml -+++ js_of_ocaml-2.8.4/lib/ppx_driver/ppx_js_driver.ml -@@ -1,5 +1,5 @@ - let () = - let js_mapper = Ppx_js.js_mapper [] in -- Ppx_driver.register_transformation "js_of_ocaml" -+ Ppx_driver.register_transformation_using_ocaml_current_ast "js_of_ocaml" - ~impl:(js_mapper.Ast_mapper.structure js_mapper) - ~intf:(js_mapper.Ast_mapper.signature js_mapper) diff --git a/dev-ml/js_of_ocaml/js_of_ocaml-2.8.4-r2.ebuild b/dev-ml/js_of_ocaml/js_of_ocaml-2.8.4-r2.ebuild deleted file mode 100644 index ebc669e81c2a..000000000000 --- a/dev-ml/js_of_ocaml/js_of_ocaml-2.8.4-r2.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib eutils - -DESCRIPTION="A compiler from OCaml bytecode to javascript" -HOMEPAGE="http://ocsigen.org/js_of_ocaml/" - -if [ "${PV#9999}" != "${PV}" ] ; then - inherit git-r3 - SRC_URI="" - EGIT_REPO_URI="https://github.com/ocsigen/js_of_ocaml" - KEYWORDS="" -else - SRC_URI="https://github.com/ocsigen/js_of_ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" -fi - -LICENSE="LGPL-2.1-with-linking-exception" -SLOT="0/${PV}" -IUSE="+ocamlopt doc +deriving +ppx +react +xml X" - -RDEPEND=" - >=dev-lang/ocaml-3.12:=[ocamlopt?,X?] - >=dev-ml/lwt-2.4.4:=[camlp4(+)] - react? ( dev-ml/react:= dev-ml/reactiveData:= ) - xml? ( >=dev-ml/tyxml-4:= ) - ppx? ( dev-ml/ppx_tools:= dev-ml/ppx_deriving:= dev-ml/ppx_driver:= ) - dev-ml/cmdliner:= - dev-ml/menhir:= - dev-ml/ocaml-base64:= - dev-ml/camlp4:= - dev-ml/cppo:= - dev-ml/uchar:= - dev-ml/ocamlbuild:= - dev-ml/yojson:= - dev-ml/ocaml-migrate-parsetree:= - deriving? ( >=dev-ml/deriving-0.6:= )" -DEPEND="${RDEPEND}" - -src_prepare() { - epatch "${FILESDIR}/ppx.patch" - has_version '>=dev-lang/ocaml-4.05_rc' && epatch "${FILESDIR}/ocaml405.patch" -} - -src_configure() { - printf "\n\n" >> Makefile.conf - use ocamlopt || echo "BEST := byte" >> Makefile.conf - use ocamlopt || echo "NATDYNLINK := NO" >> Makefile.conf - use deriving || echo "WITH_DERIVING := NO" >> Makefile.conf - use X || echo "WITH_GRAPHICS := NO" >> Makefile.conf - use react || echo "WITH_REACT := NO" >> Makefile.conf - use ppx || echo "WITH_PPX := NO" >> Makefile.conf - use ppx || echo "WITH_PPX_DERIVING := NO" >> Makefile.conf - use ppx || echo "WITH_PPX_DRIVER := NO" >> Makefile.conf - echo "WITH_ASYNC := NO" >> Makefile.conf -} - -src_compile() { - emake -j1 - use doc && emake doc -} - -src_install() { - findlib_src_preinst - emake BINDIR="${ED}/usr/bin/" install - dodoc CHANGES README.md - use doc && dohtml -r doc/api/html/ -} diff --git a/dev-ml/js_of_ocaml/js_of_ocaml-3.0.0.ebuild b/dev-ml/js_of_ocaml/js_of_ocaml-3.0.0.ebuild deleted file mode 100644 index b7f93be62778..000000000000 --- a/dev-ml/js_of_ocaml/js_of_ocaml-3.0.0.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib eutils - -DESCRIPTION="A compiler from OCaml bytecode to javascript" -HOMEPAGE="http://ocsigen.org/js_of_ocaml/" - -if [ "${PV#9999}" != "${PV}" ] ; then - inherit git-r3 - SRC_URI="" - EGIT_REPO_URI="https://github.com/ocsigen/js_of_ocaml" - KEYWORDS="" -else - SRC_URI="https://github.com/ocsigen/js_of_ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz" - # Breaks dev-ml/eliom dev-ml/async_js dev-ml/ocsigen-toolkit - KEYWORDS="" - #KEYWORDS="~amd64" -fi - -LICENSE="LGPL-2.1-with-linking-exception" -SLOT="0/${PV}" -IUSE="+ocamlopt +camlp4 +lwt doc +deriving +ppx +xml test" - -RDEPEND=" - >=dev-lang/ocaml-3.12:=[ocamlopt?] - - camlp4? ( dev-ml/camlp4:= ) - - dev-ml/cmdliner:= - dev-ml/cppo:= - - lwt? ( >=dev-ml/lwt-2.4.4:= ) - - dev-ml/ocamlbuild:= - - dev-ml/ocaml-migrate-parsetree:= - dev-ml/ppx_tools_versioned:= - dev-ml/uchar:= - - ppx? ( dev-ml/ppx_tools:= dev-ml/ppx_deriving:= ) - - xml? ( >=dev-ml/tyxml-4:= dev-ml/reactiveData:= ) -" -DEPEND="${RDEPEND} - dev-ml/jbuilder - dev-ml/opam - test? ( dev-util/patdiff ) -" -REQUIRED_USE="xml? ( ppx )" - -src_compile() { - emake - use doc && emake doc -} - -oinstall() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - --mandir="${ED}/usr/share/man" \ - ${1}.install || die -} - -src_install() { - use camlp4 && oinstall js_of_ocaml-camlp4 - oinstall js_of_ocaml-compiler - use lwt && oinstall js_of_ocaml-lwt - oinstall js_of_ocaml-ocamlbuild - oinstall js_of_ocaml - use ppx && oinstall js_of_ocaml-ppx - use ppx && oinstall js_of_ocaml-toplevel - use xml && oinstall js_of_ocaml-tyxml -} diff --git a/dev-ml/js_of_ocaml/js_of_ocaml-9999.ebuild b/dev-ml/js_of_ocaml/js_of_ocaml-9999.ebuild deleted file mode 100644 index 9fe8dff84edd..000000000000 --- a/dev-ml/js_of_ocaml/js_of_ocaml-9999.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib eutils - -DESCRIPTION="A compiler from OCaml bytecode to javascript" -HOMEPAGE="http://ocsigen.org/js_of_ocaml/" - -if [ "${PV#9999}" != "${PV}" ] ; then - inherit git-r3 - SRC_URI="" - EGIT_REPO_URI="https://github.com/ocsigen/js_of_ocaml" - KEYWORDS="" -else - SRC_URI="https://github.com/ocsigen/js_of_ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" -fi - -LICENSE="LGPL-2.1-with-linking-exception" -SLOT="0/${PV}" -IUSE="+ocamlopt +camlp4 +lwt doc +deriving +ppx +xml test" - -RDEPEND=" - >=dev-lang/ocaml-3.12:=[ocamlopt?] - - camlp4? ( dev-ml/camlp4:= ) - - dev-ml/cmdliner:= - dev-ml/cppo:= - - lwt? ( >=dev-ml/lwt-2.4.4:= ) - - dev-ml/ocamlbuild:= - - dev-ml/ocaml-migrate-parsetree:= - dev-ml/ppx_tools_versioned:= - dev-ml/uchar:= - - ppx? ( dev-ml/ppx_tools:= dev-ml/ppx_deriving:= ) - - xml? ( >=dev-ml/tyxml-4:= dev-ml/reactiveData:= ) -" -DEPEND="${RDEPEND} - dev-ml/jbuilder - dev-ml/opam - test? ( dev-util/patdiff ) -" -REQUIRED_USE="xml? ( ppx )" - -src_compile() { - emake - use doc && emake doc -} - -oinstall() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - --mandir="${ED}/usr/share/man" \ - ${1}.install || die -} - -src_install() { - use camlp4 && oinstall js_of_ocaml-camlp4 - oinstall js_of_ocaml-compiler - use lwt && oinstall js_of_ocaml-lwt - oinstall js_of_ocaml-ocamlbuild - oinstall js_of_ocaml - use ppx && oinstall js_of_ocaml-ppx - use ppx && oinstall js_of_ocaml-toplevel - use xml && oinstall js_of_ocaml-tyxml -} diff --git a/dev-ml/js_of_ocaml/metadata.xml b/dev-ml/js_of_ocaml/metadata.xml deleted file mode 100644 index 0e7d31b0a342..000000000000 --- a/dev-ml/js_of_ocaml/metadata.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <use> - <flag name="camlp4">Build with camlp4 syntax extensions.</flag> - <flag name="deriving">Enable <pkg>dev-ml/deriving</pkg> support for improving the type safety.</flag> - <flag name="lwt">Enable <pkg>dev-ml/lwt</pkg> support.</flag> - <flag name="ppx">Enables the ppx syntax extension</flag> - <flag name="react">Enable functionnal reactive programming support.</flag> - </use> - <upstream> - <remote-id type="github">ocsigen/js_of_ocaml</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/jsonm/jsonm-1.0.1.ebuild b/dev-ml/jsonm/jsonm-1.0.1.ebuild index 301132978611..07992359e9a5 100644 --- a/dev-ml/jsonm/jsonm-1.0.1.ebuild +++ b/dev-ml/jsonm/jsonm-1.0.1.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=7 inherit findlib DESCRIPTION="Non-blocking streaming JSON codec for OCaml" -HOMEPAGE="http://erratique.ch/software/jsonm" -SRC_URI="http://erratique.ch/software/jsonm/releases/${P}.tbz" +HOMEPAGE="https://erratique.ch/software/jsonm" +SRC_URI="https://erratique.ch/software/jsonm/releases/${P}.tbz" LICENSE="ISC" SLOT="0/${PV}" @@ -31,8 +31,10 @@ src_compile() { src_install() { # Can't use opam-installer here as it is an opam dep... findlib_src_preinst + local nativelibs="$(echo _build/src/${PN}.cm{x,xa,xs,ti} _build/src/${PN}.a)" ocamlfind install ${PN} _build/pkg/META _build/src/${PN}.mli _build/src/${PN}.cm{a,i} ${nativelibs} || die + newbin _build/test/jsontrip.native jsontrip dodoc CHANGES.md TODO.md README.md } diff --git a/dev-ml/jsonm/metadata.xml b/dev-ml/jsonm/metadata.xml index ffac4d7ebc01..85e4ed814fa2 100644 --- a/dev-ml/jsonm/metadata.xml +++ b/dev-ml/jsonm/metadata.xml @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> -</maintainer> +<!-- maintainer-needed --> </pkgmetadata> diff --git a/dev-ml/jst-config/Manifest b/dev-ml/jst-config/Manifest new file mode 100644 index 000000000000..a5fcc308de30 --- /dev/null +++ b/dev-ml/jst-config/Manifest @@ -0,0 +1,5 @@ +DIST jst-config-0.14.0.tar.gz 4916 BLAKE2B e052cf9aad6e7bef737cd39643663b4577cffe9b9a8e116a8f23ce8d92ebb172d8c66eb20976c319593c217d95de253b4b7f86c05616bf665061896989f0908c SHA512 9d76f3394490762aaef36a3fd3ced4769da05e5a62176bb215379f18a29eab5089e65f599a3a3621937a5a79fcbda22cecf189e8e290acffef5b565e1b4d3b58 +DIST jst-config-0.14.1.tar.gz 4931 BLAKE2B b24aefa5f4e0b76c3cfd1ecbb9ae7789891db8ade236f6071b814dc3d4be6d94ad39b2d0808ca81a633f2b7a31db18b530c73a7a0c43c65f4ddc8abe90adddd6 SHA512 0a43ba941c2915afb30b3cdc09c3c83e05d5b1367bf89aaa4b3adb72878c8435e07838bcf345452c25482d7621d2a7277b92328a2a8842ec172d4bf73005d9c2 +DIST jst-config-0.15.0.tar.gz 4865 BLAKE2B 165a6aef50f20ed5e71c8211c2ba47dcc03ab7244c692bf3f369b02b8ce0dcfa61bce36d0c93fb5c95fd35883e94621532776c625483e3e692336812eb3183c9 SHA512 59482feb5b02dc09c2cff2154105bc7e162e5788ee357a8663dc8e76eb33ab729e9ba34b2f2a3e49b17fc6e279a6927c2024a32b081b4059b438de81fb1a3790 +DIST jst-config-0.15.1.tar.gz 4873 BLAKE2B 6ea2fb305a65f2db0b84dd0f3d9e4e4bb9ff1e10201b0a793bd16820448b04edd4d0b3d5ffc62e28cd177eafd6dea1714e8cadefd16dca1f5f7ab1683d0fb539 SHA512 389854aad6775756fd51374a036c748947f186eae4b48a4863549e7d8efafee25bdfc7c525dd2c466d9f0e0265b48a6e7b950042b6c9014051f8288393173147 +DIST jst-config-0.16.0.tar.gz 4952 BLAKE2B 1a4a99594b68ff9f78e0019fb4a788b638b5ac3ea4c570b31d219855db96e086c3ee44b00ab02fe787f0898225bedf311bc86c85f84dbb1cbf892290ea44cbd4 SHA512 379446360c454c90ee80ed08dda3c34aff05d7026e77f868c33eb2fe93921e1ae9412bb69a5c92d54179d5465e0a1aab38cbf8ad55a86b2d164784015152c4ac diff --git a/dev-ml/jst-config/jst-config-0.14.0.ebuild b/dev-ml/jst-config/jst-config-0.14.0.ebuild new file mode 100644 index 000000000000..e6c54ea2c160 --- /dev/null +++ b/dev-ml/jst-config/jst-config-0.14.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Compile-time configuration for Jane Street libraries" +HOMEPAGE="https://github.com/janestreet/jst-config" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +DEPEND=" + dev-ml/base:= + dev-ml/ppx_assert:= + dev-ml/stdio:= + dev-ml/dune-configurator:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/jst-config/jst-config-0.14.1.ebuild b/dev-ml/jst-config/jst-config-0.14.1.ebuild new file mode 100644 index 000000000000..060b6d0ab022 --- /dev/null +++ b/dev-ml/jst-config/jst-config-0.14.1.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Compile-time configuration for Jane Street libraries" +HOMEPAGE="https://github.com/janestreet/jst-config" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="+ocamlopt" + +DEPEND=" + =dev-ml/base-0.14*:= + dev-ml/ppx_assert:= + dev-ml/stdio:= + dev-ml/dune-configurator:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/jst-config/jst-config-0.15.0-r1.ebuild b/dev-ml/jst-config/jst-config-0.15.0-r1.ebuild new file mode 100644 index 000000000000..02eeef8ef889 --- /dev/null +++ b/dev-ml/jst-config/jst-config-0.15.0-r1.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Compile-time configuration for Jane Street libraries" +HOMEPAGE="https://github.com/janestreet/jst-config" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +DEPEND=" + dev-ml/base:= + dev-ml/ppx_assert:= + dev-ml/stdio:= + dev-ml/dune-configurator:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/jst-config/jst-config-0.15.1-r1.ebuild b/dev-ml/jst-config/jst-config-0.15.1-r1.ebuild new file mode 100644 index 000000000000..888c44d6605f --- /dev/null +++ b/dev-ml/jst-config/jst-config-0.15.1-r1.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Compile-time configuration for Jane Street libraries" +HOMEPAGE="https://github.com/janestreet/jst-config" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +DEPEND=" + dev-ml/base:= + dev-ml/dune-configurator:= + dev-ml/ppxlib:= + dev-ml/ppx_assert:= + dev-ml/ppx_compare:= + dev-ml/ppx_here:= + dev-ml/ppx_sexp_conv:= + dev-ml/stdio:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/jst-config/jst-config-0.16.0.ebuild b/dev-ml/jst-config/jst-config-0.16.0.ebuild new file mode 100644 index 000000000000..733b5faaf37a --- /dev/null +++ b/dev-ml/jst-config/jst-config-0.16.0.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Compile-time configuration for Jane Street libraries" +HOMEPAGE="https://github.com/janestreet/jst-config" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-lang/ocaml-4.14 + dev-ml/base:= + dev-ml/dune-configurator:= + dev-ml/ppxlib:= + dev-ml/ppx_assert:= + dev-ml/ppx_compare:= + dev-ml/ppx_here:= + dev-ml/ppx_sexp_conv:= + dev-ml/stdio:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/jst-config/metadata.xml b/dev-ml/jst-config/metadata.xml new file mode 100644 index 000000000000..53bf6613b160 --- /dev/null +++ b/dev-ml/jst-config/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">janestreet/jst-config</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/kaputt/Manifest b/dev-ml/kaputt/Manifest deleted file mode 100644 index 001e79b43c6b..000000000000 --- a/dev-ml/kaputt/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST kaputt-1.2.tar.gz 299828 BLAKE2B c38e5c1b92d7f4d2eff607833b171558b48685ae247d8fce2796328d9ee473771dd7a5702f3fb3a8efdc80d62fc844cf626b76504713814cefd6e899bf3f90de SHA512 7e30379410ac2e45e59462086956a510e4da06538cd27fd360999e3ff656dc82bfdae18e545699241a01612d9ec7ab28e298847b4a2f6178294dc6c2db8f8671 diff --git a/dev-ml/kaputt/kaputt-1.2.ebuild b/dev-ml/kaputt/kaputt-1.2.ebuild deleted file mode 100644 index 89ce7b66f515..000000000000 --- a/dev-ml/kaputt/kaputt-1.2.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib - -DESCRIPTION="Unit testing tool for the Objective Caml language" -HOMEPAGE="http://kaputt.x9c.fr/" -SRC_URI="http://kaputt.x9c.fr/distrib/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND=">=dev-lang/ocaml-3.11:=[ocamlopt]" -DEPEND="${RDEPEND} - dev-ml/ocamlbuild" - -src_configure() { - chmod +x configure - ./configure || die -} - -src_compile() { - emake all -} - -src_test() { - emake -j1 tests -} - -src_install() { - findlib_src_install - dodoc README FEATURES CHANGES -} diff --git a/dev-ml/kaputt/metadata.xml b/dev-ml/kaputt/metadata.xml deleted file mode 100644 index ffac4d7ebc01..000000000000 --- a/dev-ml/kaputt/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> -</maintainer> -</pkgmetadata> diff --git a/dev-ml/lablgl/Manifest b/dev-ml/lablgl/Manifest index 4f9c842e5906..ec64e13dd5df 100644 --- a/dev-ml/lablgl/Manifest +++ b/dev-ml/lablgl/Manifest @@ -1 +1 @@ -DIST lablgl-1.05.tar.gz 296597 BLAKE2B 01fff39607f0b4e965737c6fec53cbd3b154bb2df3528fd37626ac87c6cb46a29f97881a242206310b1bd576fb9dfc72ede1eb24cf287ddfc55194b8d55eb83d SHA512 e8bf7d993610912d50ec3a6c18a24d2ff7d0727a41fe102e745050bb83ee02a9995e8b1b8c7dbd94f6b2a8363145f22e9772e36253dced762a63ec3c6c54379d +DIST lablgl-1.06.tar.gz 567281 BLAKE2B 90e42d3f131b2a416b5a1fb9933fbf1178911aabfd571274e987c8e7da12a3c57673268b5e0300950f3b03ddb363626ad93fe3e647e5e7058ee48c0b130fcbfc SHA512 169ac4ed8eaf3635c107c57cd03a76a64fc16a8d3ba1ad261b7e4dcda985c0a83059421e72233f645aec21a1ec27b980530b4ffb7013fba31d446b16521b3f4c diff --git a/dev-ml/lablgl/files/lablgl-1.06-makefile.patch b/dev-ml/lablgl/files/lablgl-1.06-makefile.patch new file mode 100644 index 000000000000..1e336872ad5d --- /dev/null +++ b/dev-ml/lablgl/files/lablgl-1.06-makefile.patch @@ -0,0 +1,12 @@ +Make sure install dir exists before copying file to it. + +--- a/LablGlut/src/Makefile ++++ b/LablGlut/src/Makefile +@@ -68,6 +68,7 @@ + cd "$(INSTALLDIR)" && $(RANLIB) liblablglut$(XA) + @if test -f dlllablglut$(XS); then $(MAKE) installdll; \ + else $(MAKE) installtop; fi ++ mkdir -p "$(BINDIR)" + cp lablglut$(XB) "$(BINDIR)" + + real-install: preinstall diff --git a/dev-ml/lablgl/lablgl-1.05-r1.ebuild b/dev-ml/lablgl/lablgl-1.06-r1.ebuild index d5f3958cde19..ad423b758d54 100644 --- a/dev-ml/lablgl/lablgl-1.05-r1.ebuild +++ b/dev-ml/lablgl/lablgl-1.06-r1.ebuild @@ -1,15 +1,18 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=7 -inherit multilib eutils toolchain-funcs - -IUSE="doc glut +ocamlopt tk" +inherit toolchain-funcs DESCRIPTION="Objective CAML interface for OpenGL" -HOMEPAGE="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgl.html" +HOMEPAGE="https://github.com/garrigue/lablgl" +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" +IUSE="doc glut +ocamlopt tk" RDEPEND=" >=dev-lang/ocaml-3.10.2:=[ocamlopt?] @@ -18,37 +21,36 @@ RDEPEND=" x11-libs/libX11 virtual/opengl virtual/glu - dev-ml/camlp4:= glut? ( media-libs/freeglut ) tk? ( >=dev-lang/tcl-8.3:0= >=dev-lang/tk-8.3:0= dev-ml/labltk:= ) - " - +" DEPEND="${RDEPEND}" -SRC_URI="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/${P}.tar.gz" -SLOT="0/${PV}" -KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux" +PATCHES=( "${FILESDIR}"/${P}-makefile.patch ) src_configure() { # make configuration file - echo "BINDIR=/usr/bin" > Makefile.config - echo "GLLIBS = -lGL -lGLU" >> Makefile.config + echo "BINDIR=/usr/bin" > Makefile.config || die + echo "GLLIBS = -lGL -lGLU" >> Makefile.config || die if use glut; then - echo "GLUTLIBS = -lglut" >> Makefile.config + echo "GLUTLIBS = -lglut" >> Makefile.config || die else - echo "GLUTLIBS = " >> Makefile.config + echo "GLUTLIBS = " >> Makefile.config || die fi - echo "XLIBS = -lXext -lXmu -lX11" >> Makefile.config - echo "RANLIB = $(tc-getRANLIB)" >> Makefile.config - echo 'COPTS = -c -O $(CFLAGS)' >> Makefile.config - echo 'INCLUDES = $(TKINCLUDES) $(GLINCLUDES) $(XINCLUDES)' >> Makefile.config + echo "XLIBS = -lXext -lXmu -lX11" >> Makefile.config || die + echo "RANLIB = $(tc-getRANLIB)" >> Makefile.config || die + echo 'COPTS = -c -O $(CFLAGS)' >> Makefile.config || die + echo 'INCLUDES = $(TKINCLUDES) $(GLINCLUDES) $(XINCLUDES)' >> Makefile.config || die } src_compile() { + # Workaround for bug #834870 + MAKEOPTS+=" -j1" + if use tk; then emake togl if use ocamlopt; then @@ -69,26 +71,27 @@ src_compile() { fi } -src_install () { +src_install() { # Makefile do not use mkdir so the library is not installed # but copied as a 'stublibs' file. dodir /usr/$(get_libdir)/ocaml/stublibs # Same for lablglut's toplevel - dodir /usr/bin + if use tk ; then + dodir /usr/bin + fi - BINDIR=${ED}/usr/bin - BASE=${ED}/usr/$(get_libdir)/ocaml + BINDIR="${ED}/usr/bin" + BASE="${ED}/usr/$(get_libdir)/ocaml" emake BINDIR="${BINDIR}" INSTALLDIR="${BASE}/lablGL" DLLDIR="${BASE}/stublibs" install dodoc README CHANGES if use doc ; then - insinto /usr/share/doc/${PF} - mv Togl/examples{,.togl} - doins -r Togl/examples.togl + mv Togl/examples{,.togl} || die + dodoc -r Togl/examples.togl - mv LablGlut/examples{,.glut} - doins -r LablGlut/examples.glut + mv LablGlut/examples{,.glut} || die + dodoc -r LablGlut/examples.glut fi } diff --git a/dev-ml/lablgl/metadata.xml b/dev-ml/lablgl/metadata.xml index ffa6c6b4395b..29af13b64462 100644 --- a/dev-ml/lablgl/metadata.xml +++ b/dev-ml/lablgl/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> + <!-- maintainer-needed --> + <upstream> + <remote-id type="github">garrigue/lablgl</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-ml/lablgtk-sourceview/Manifest b/dev-ml/lablgtk-sourceview/Manifest new file mode 100644 index 000000000000..0820d1be18be --- /dev/null +++ b/dev-ml/lablgtk-sourceview/Manifest @@ -0,0 +1,3 @@ +DIST lablgtk-3.1.2.tar.gz 1042626 BLAKE2B 355ff285248129a063c041d3e64db33424ddbb71774128d7be980b8bd0b54cfa54b9d50b1c2f8527b8f6563836189ad72d30e4421b22d5938b888e61ada55056 SHA512 c63a492160f36685f65cb6bc0e72ff4939005acb2c65c56c0d9ba8f2112a618f24db84765e7b4416e49024048a36895028cfc5ef2c3e298dd4a309e902e34af5 +DIST lablgtk-3.1.3.tar.gz 1043246 BLAKE2B 639b1a7610ea420cbae893eb40fd0a20a7605ecc89e832387f3137a002fd4989342ca842c1c7e9057454e0b6cfac9099c5788b5ea14fa452bde54bacb18aeac2 SHA512 a14e07145a2844ebb039d7af459e2fac61888c27925ed14e508698f622aeb5ec3b0694f2b87fb7b5383d8979791a3e6fe8425f4bb509effe838d0a09dd9c50b9 +DIST lablgtk3-3.1.1.tbz 854720 BLAKE2B e6a916151fe1ca0746c14c2a66cd178f3b0c051976815a1d13daf801002f16bc76d9f4cb15625353f0cfbdc16b0a218857d72c4e57125050bbcffe67f7096ad0 SHA512 193c340d9941680869eb90bc89f5b27cc5bdf294f4635081a9ba56a99fa2982266c4ee2eb5fd04d3a3f6150082800de5df786def8c72a276a779d843d914e9e3 diff --git a/dev-ml/lablgtk-sourceview/lablgtk-sourceview-3.1.1.ebuild b/dev-ml/lablgtk-sourceview/lablgtk-sourceview-3.1.1.ebuild new file mode 100644 index 000000000000..1781a38687fd --- /dev/null +++ b/dev-ml/lablgtk-sourceview/lablgtk-sourceview-3.1.1.ebuild @@ -0,0 +1,28 @@ +# Copyright 2019-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_PN=lablgtk3 +MY_P="${MY_PN}-${PV}" +DUNE_PKG_NAME=${MY_PN}-sourceview3 +inherit dune + +DESCRIPTION="OCaml bindings to GTK-3" +HOMEPAGE="https://github.com/garrigue/lablgtk" +SRC_URI="https://github.com/garrigue/lablgtk/releases/download/${PV}/${MY_P}.tbz" + +LICENSE="LGPL-2.1-with-linking-exception" +SLOT="3/${PV}" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt" + +DEPEND=" + x11-libs/gtksourceview:3.0= + >=dev-ml/lablgtk-${PV}:3= + dev-ml/cairo2:= +" +RDEPEND="${DEPEND}" +BDEPEND="" + +S="${WORKDIR}/${MY_P}" diff --git a/dev-ml/lablgtk-sourceview/lablgtk-sourceview-3.1.2.ebuild b/dev-ml/lablgtk-sourceview/lablgtk-sourceview-3.1.2.ebuild new file mode 100644 index 000000000000..fd85ad9de73a --- /dev/null +++ b/dev-ml/lablgtk-sourceview/lablgtk-sourceview-3.1.2.ebuild @@ -0,0 +1,35 @@ +# Copyright 2019-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DUNE_PKG_NAME=lablgtk3-sourceview3 + +inherit dune + +DESCRIPTION="OCaml bindings to GTK-3" +HOMEPAGE="https://github.com/garrigue/lablgtk" +SRC_URI="https://github.com/garrigue/lablgtk/archive/${PV}.tar.gz + -> lablgtk-${PV}.tar.gz" +S="${WORKDIR}"/lablgtk-${PV} + +LICENSE="LGPL-2.1-with-linking-exception" +SLOT="3/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-ml/lablgtk-${PV}:3= + dev-ml/cairo2:= + x11-libs/gtksourceview:3.0= +" +RDEPEND="${DEPEND}" + +src_prepare() { + default + echo "(version ${PV})" >> "${S}"/dune-project || die +} + +src_compile() { + dune build --profile release -p ${DUNE_PKG_NAME} || die +} diff --git a/dev-ml/lablgtk-sourceview/lablgtk-sourceview-3.1.3.ebuild b/dev-ml/lablgtk-sourceview/lablgtk-sourceview-3.1.3.ebuild new file mode 100644 index 000000000000..6233bba46392 --- /dev/null +++ b/dev-ml/lablgtk-sourceview/lablgtk-sourceview-3.1.3.ebuild @@ -0,0 +1,30 @@ +# Copyright 2019-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DUNE_PKG_NAME=lablgtk3-sourceview3 + +inherit dune + +DESCRIPTION="OCaml bindings to GTK-3" +HOMEPAGE="https://github.com/garrigue/lablgtk" +SRC_URI="https://github.com/garrigue/lablgtk/archive/${PV}.tar.gz + -> lablgtk-${PV}.tar.gz" +S="${WORKDIR}"/lablgtk-${PV} + +LICENSE="LGPL-2.1-with-linking-exception" +SLOT="3/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-ml/lablgtk-${PV}:3= + dev-ml/cairo2:= + x11-libs/gtksourceview:3.0= +" +RDEPEND="${DEPEND}" + +src_compile() { + dune build --profile release -p ${DUNE_PKG_NAME} || die +} diff --git a/dev-ml/lablgtk-sourceview/metadata.xml b/dev-ml/lablgtk-sourceview/metadata.xml new file mode 100644 index 000000000000..8ee8dbb51969 --- /dev/null +++ b/dev-ml/lablgtk-sourceview/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">ocaml/opam</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/lablgtk/Manifest b/dev-ml/lablgtk/Manifest index 71a20eac5603..c365f27fa00e 100644 --- a/dev-ml/lablgtk/Manifest +++ b/dev-ml/lablgtk/Manifest @@ -1 +1,6 @@ -DIST lablgtk-2.18.5.tar.gz 808005 BLAKE2B 279fd9f018948438b616a12ab60fca3019330504a79d8b76c58fa0a99a7b36df9bf78f57f0e60c4eea6f0bad60f94c06b26490518ec25a5a72c342e4b7c42501 SHA512 7b6ba1a4dfa82cc3bbc502082ff4fccc23cc06ee4f30d01a2e423f3f99e945a4befe450d230b5aa19c5b810e9f46f2838655099d49da2db7c8a2e52eac213024 +DIST lablgtk-2.18.10.tar.gz 1068504 BLAKE2B 8f82cd8b31c136420bfbbeaf78ec2d7913b7c5fc16abd485c508f8de3ab587173b0b5c798cdbe851254b48754929c1f0063cfc9e3c5e0663b7cdebc380ec0e8a SHA512 73705aaa80db433d11a28df5f6f5d10bd282e477e90916152a87e71865ccfcd7dfbdbe77350ecadf61ba2ccc7a188de1c68f1e6385e20c75f167969001e8418d +DIST lablgtk-2.18.12.tar.gz 1066997 BLAKE2B fcdc74ae444af509b2c95929ac8df556aeea21187a95433a9c67ac3d7a515054d53c4955ea2e908297065fd005099fb5df45d52311cf015f63a72780c11cccb8 SHA512 284a1234ae817c4df49809d28c103ca5e64046da5ec9ff28c6edc0ce999e9d3e6e180dd053f8b1663d4fb3b7ba19570d53b9441c8fa622add924e8d85e41b813 +DIST lablgtk-2.18.13.tar.gz 1073083 BLAKE2B d3be54b0194e8b67b66eee9663d121e9007f6eb1d04cf322f83dfc5ddd5c3a27ad6f19204429ea5941d9cfe97ac9583af41ae713de5552b5d11245e4216ad5c1 SHA512 41deafbf8bbb9d15950d74a053e21c65aa0d2d4044a41d048f197e744a82ebbe159d43f67092fa19a8385bf0f7da0250ef2f0a532a0810e88f695d6f1fef4c48 +DIST lablgtk-3.1.2.tar.gz 1042626 BLAKE2B 355ff285248129a063c041d3e64db33424ddbb71774128d7be980b8bd0b54cfa54b9d50b1c2f8527b8f6563836189ad72d30e4421b22d5938b888e61ada55056 SHA512 c63a492160f36685f65cb6bc0e72ff4939005acb2c65c56c0d9ba8f2112a618f24db84765e7b4416e49024048a36895028cfc5ef2c3e298dd4a309e902e34af5 +DIST lablgtk-3.1.3.tar.gz 1043246 BLAKE2B 639b1a7610ea420cbae893eb40fd0a20a7605ecc89e832387f3137a002fd4989342ca842c1c7e9057454e0b6cfac9099c5788b5ea14fa452bde54bacb18aeac2 SHA512 a14e07145a2844ebb039d7af459e2fac61888c27925ed14e508698f622aeb5ec3b0694f2b87fb7b5383d8979791a3e6fe8425f4bb509effe838d0a09dd9c50b9 +DIST lablgtk3-3.1.1.tbz 854720 BLAKE2B e6a916151fe1ca0746c14c2a66cd178f3b0c051976815a1d13daf801002f16bc76d9f4cb15625353f0cfbdc16b0a218857d72c4e57125050bbcffe67f7096ad0 SHA512 193c340d9941680869eb90bc89f5b27cc5bdf294f4635081a9ba56a99fa2982266c4ee2eb5fd04d3a3f6150082800de5df786def8c72a276a779d843d914e9e3 diff --git a/dev-ml/lablgtk/files/lablgtk-2.18.10-cflags.patch b/dev-ml/lablgtk/files/lablgtk-2.18.10-cflags.patch new file mode 100644 index 000000000000..ca82491113b6 --- /dev/null +++ b/dev-ml/lablgtk/files/lablgtk-2.18.10-cflags.patch @@ -0,0 +1,98 @@ +--- a/src/Makefile 2020-05-14 22:01:09.565870733 +0200 ++++ b/src/Makefile 2020-05-14 22:06:49.081621996 +0200 +@@ -18,6 +18,7 @@ + + include $(CONFIG) + #GTKCFLAGS += -Werror -Wno-error=deprecated-declarations ++CFLAGS= + + TARGETS = varcc$(XE) lablgtktop$(XE) lablgtk2$(XB) gdk_pixbuf_mlsource$(XE) \ + $(THINITOBJS) build.ml +@@ -44,15 +45,13 @@ + endif + + ifdef DEBUG +-COMPILER += -warn-error A-52 +-CFLAGS = -g $(GTKCFLAGS) ++OCAMLCFLAGS = $(GTKCFLAGS) + CUSTOM = -custom + #MLLINK += -cclib -lcamlrund + MLBYTEFLAGS = -g -dtypes + else +-CFLAGS = -DG_DISABLE_ASSERT -DG_DISABLE_CAST_CHECKS $(GTKCFLAGS) ++OCAMLCFLAGS = -DG_DISABLE_ASSERT -DG_DISABLE_CAST_CHECKS $(GTKCFLAGS) + ifneq ($(TOOLCHAIN),msvc) +-CFLAGS += -O + endif + endif + +@@ -65,9 +65,9 @@ + THLINK = unix.cma threads.cma + + ifdef USE_CC +-CCOMPILER = $(CC) -c -I"$(LIBDIR)" $(CFLAGS) ++CCOMPILER = $(CC) -c -I"$(LIBDIR)" $(OCAMLCFLAGS) $(CFLAGS) + else +-CCOMPILER = $(CAMLC) -c -ccopt '$(CFLAGS)' -verbose ++CCOMPILER = $(CAMLC) -c -ccopt '$(OCAMLCFLAGS) $(CFLAGS)' -verbose + endif + + ifdef USE_GL +@@ -123,7 +123,7 @@ + CLIBS += liblablrsvg$(XA) + RSVGMLOBJS = rsvg.cmo + RSVGCOBJS = ml_rsvg$(XO) +-$(RSVGCOBJS) : CFLAGS+=$(HAVE_SVGZ) ++$(RSVGCOBJS) : OCAMLCFLAGS+=$(HAVE_SVGZ) + endif + + ifdef USE_GTKSPELL +@@ -140,7 +140,7 @@ + opt:: lablgtksourceview.cmxs + endif + +-ml_gtksourceview.o: CFLAGS=$(GTKSOURCEVIEWCFLAGS) ++ml_gtksourceview.o: OCAMLCFLAGS=$(GTKSOURCEVIEWCFLAGS) + GTKSOURCEVIEWMLOBJS = gtkSourceView.cmo gSourceView.cmo + GTKSOURCEVIEWCOBJS = ml_gtksourceview$(XO) + ml_gtksourceview.c: pango_tags.h +@@ -179,7 +179,7 @@ + endif + + ifdef USE_GTKQUARTZ +-CFLAGS += -DHAS_GTKQUARTZ ++OCAMLCFLAGS += -DHAS_GTKQUARTZ + endif + # Rules + .SUFFIXES: .ml .mli .cmo .cmi .cmx .cmxs .cmxa .c $(XO) .d$(XO) .var .h .opt .def .ml4 +@@ -188,7 +188,7 @@ + .cpp$(XO): + $(CCOMPILER) $< + .c.d$(XO): +- $(CAMLC) -c -ccopt '-MT -DCAML_DLL -Fo$@ $(CFLAGS)' $< ++ $(CAMLC) -c -ccopt '-MT -DCAML_DLL -Fo$@ $(OCAMLCFLAGS) $(CFLAGS)' $< + .ml.cmo: + $(COMPILER) $(PRINCIPAL) $< + .mli.cmi: +--- a/src/ml_gdk.h 2020-05-14 22:19:59.045394874 +0200 ++++ b/src/ml_gdk.h 2020-05-14 22:20:06.694277819 +0200 +@@ -102,7 +102,7 @@ + CAMLexport int OptFlags_GdkModifier_val (value); + CAMLexport int Flags_GdkModifier_val (value); + CAMLexport int Flags_Event_mask_val (value); +-CAMLexport lookup_info *ml_table_extension_events; ++extern lookup_info *ml_table_extension_events; + #define Extension_events_val(key) ml_lookup_to_c(ml_table_extension_events,key) + + #define GdkDragContext_val(val) check_cast(GDK_DRAG_CONTEXT,val) +--- a/src/ml_gdk.c 2020-05-14 22:21:39.244861128 +0200 ++++ b/src/ml_gdk.c 2020-05-14 22:21:57.571580518 +0200 +@@ -55,6 +55,8 @@ + #define GDK_WINDOW_TYPE_HINT_DOCK GDK_WINDOW_TYPE_HINT_NORMAL + #endif + ++lookup_info *ml_table_extension_events; ++ + CAMLprim void ml_raise_gdk (const char *errmsg) + { + static const value * exn = NULL; diff --git a/dev-ml/lablgtk/files/lablgtk-2.18.12-Makefile.patch b/dev-ml/lablgtk/files/lablgtk-2.18.12-Makefile.patch new file mode 100644 index 000000000000..eccbf30a3ea8 --- /dev/null +++ b/dev-ml/lablgtk/files/lablgtk-2.18.12-Makefile.patch @@ -0,0 +1,20 @@ +--- a/src/Makefile 2022-12-23 21:39:09.743150707 +0100 ++++ b/src/Makefile 2022-12-23 21:39:40.219667855 +0100 +@@ -23,7 +23,7 @@ + TARGETS = varcc$(XE) lablgtktop$(XE) lablgtk2$(XB) gdk_pixbuf_mlsource$(XE) \ + $(THINITOBJS) build.ml + +-all: dist byte ++all: dist byte sourceView2Enums.ml + world: dist byte $(CAMLBEST) + install: findlib-install + uninstall: findlib-uninstall +@@ -617,7 +617,7 @@ + gtk_tags.h gdk_tags.h ml_gtktext.h sourceView_tags.h wrappers.h + + $(GTKSOURCEVIEW2COBJS): ml_glib.h ml_gdk.h ml_gtk.h ml_gobject.h ml_gdkpixbuf.h ml_pango.h \ +- gtk_tags.h gdk_tags.h ml_gtktext.h sourceView2_tags.h wrappers.h ++ gtk_tags.h gdk_tags.h ml_gtktext.h pango_tags.h sourceView2_tags.h wrappers.h + + ml_glib$(XO): glib_tags.h ml_glib.h wrappers.h + ml_gobject$(XO): gobject_tags.h ml_gvaluecaml.h wrappers.h diff --git a/dev-ml/lablgtk/files/lablgtk-2.18.12-cflags.patch b/dev-ml/lablgtk/files/lablgtk-2.18.12-cflags.patch new file mode 100644 index 000000000000..aeef5c319a6d --- /dev/null +++ b/dev-ml/lablgtk/files/lablgtk-2.18.12-cflags.patch @@ -0,0 +1,76 @@ +diff -ur lablgtk-2.18.12.orig/src/Makefile lablgtk-2.18.12/src/Makefile +--- lablgtk-2.18.12.orig/src/Makefile 2021-12-25 02:23:31.000000000 +0100 ++++ lablgtk-2.18.12/src/Makefile 2022-03-04 08:12:28.151812474 +0100 +@@ -18,6 +18,7 @@ + + include $(CONFIG) + #GTKCFLAGS += -Werror -Wno-error=deprecated-declarations ++CFLAGS= + + TARGETS = varcc$(XE) lablgtktop$(XE) lablgtk2$(XB) gdk_pixbuf_mlsource$(XE) \ + $(THINITOBJS) build.ml +@@ -45,14 +46,13 @@ + + ifdef DEBUG + COMPILER += -warn-error A-52-6 +-CFLAGS = -g $(GTKCFLAGS) ++OCAMLCFLAGS = $(GTKCFLAGS) + CUSTOM = -custom + #MLLINK += -cclib -lcamlrund + MLBYTEFLAGS = -g -dtypes + else +-CFLAGS = -DG_DISABLE_ASSERT -DG_DISABLE_CAST_CHECKS $(GTKCFLAGS) ++OCAMLCFLAGS = -DG_DISABLE_ASSERT -DG_DISABLE_CAST_CHECKS $(GTKCFLAGS) + ifneq ($(TOOLCHAIN),msvc) +-CFLAGS += -O + endif + endif + +@@ -65,9 +65,9 @@ + THLINK = unix.cma threads.cma + + ifdef USE_CC +-CCOMPILER = $(CC) -c -I"$(LIBDIR)" $(CFLAGS) ++CCOMPILER = $(CC) -c -I"$(LIBDIR)" $(OCAMLCFLAGS) $(CFLAGS) + else +-CCOMPILER = $(CAMLC) -c -ccopt '$(CFLAGS)' -verbose ++CCOMPILER = $(CAMLC) -c -ccopt '$(OCAMLCFLAGS) $(CFLAGS)' -verbose + endif + + ifdef USE_GL +@@ -123,7 +123,7 @@ + CLIBS += liblablrsvg$(XA) + RSVGMLOBJS = rsvg.cmo + RSVGCOBJS = ml_rsvg$(XO) +-$(RSVGCOBJS) : CFLAGS+=$(HAVE_SVGZ) ++$(RSVGCOBJS) : OCAMLCFLAGS+=$(HAVE_SVGZ) + endif + + ifdef USE_GTKSPELL +@@ -140,7 +140,7 @@ + opt:: lablgtksourceview.cmxs + endif + +-ml_gtksourceview.o: CFLAGS=$(GTKSOURCEVIEWCFLAGS) ++ml_gtksourceview.o: OCAMLCFLAGS=$(GTKSOURCEVIEWCFLAGS) + GTKSOURCEVIEWMLOBJS = gtkSourceView.cmo gSourceView.cmo + GTKSOURCEVIEWCOBJS = ml_gtksourceview$(XO) + ml_gtksourceview.c: pango_tags.h +@@ -179,7 +179,7 @@ + endif + + ifdef USE_GTKQUARTZ +-CFLAGS += -DHAS_GTKQUARTZ ++OCAMLCFLAGS += -DHAS_GTKQUARTZ + endif + # Rules + .SUFFIXES: .ml .mli .cmo .cmi .cmx .cmxs .cmxa .c $(XO) .d$(XO) .var .h .opt .def .ml4 +@@ -188,7 +188,7 @@ + .cpp$(XO): + $(CCOMPILER) $< + .c.d$(XO): +- $(CAMLC) -c -ccopt '-MT -DCAML_DLL -Fo$@ $(CFLAGS)' $< ++ $(CAMLC) -c -ccopt '-MT -DCAML_DLL -Fo$@ $(OCAMLCFLAGS) $(CFLAGS)' $< + .ml.cmo: + $(COMPILER) $(PRINCIPAL) $< + .mli.cmi: diff --git a/dev-ml/lablgtk/files/lablgtk-2.18.12-depend.patch b/dev-ml/lablgtk/files/lablgtk-2.18.12-depend.patch new file mode 100644 index 000000000000..f707865ab293 --- /dev/null +++ b/dev-ml/lablgtk/files/lablgtk-2.18.12-depend.patch @@ -0,0 +1,11 @@ +--- a/src/.depend 2023-01-22 20:48:06.026147545 +0100 ++++ b/src/.depend 2023-01-22 20:49:11.170105871 +0100 +@@ -438,6 +438,8 @@ + ogtkBrokenProps.cmx : gtkSignal.cmx gtkBrokenProps.cmx gobject.cmx gData.cmx + ogtkAssistantProps.cmo : gtkSignal.cmi gtkAssistantProps.cmo gobject.cmi + ogtkAssistantProps.cmx : gtkSignal.cmx gtkAssistantProps.cmx gobject.cmx ++gtkThInit.cmo : gtkThread.cmi ++gtkThInit.cmx : gtkThread.cmx + gtkThread.cmo : gtkSignal.cmi gtkMain.cmo glib.cmi gtkThread.cmi + gtkThread.cmx : gtkSignal.cmx gtkMain.cmx glib.cmx gtkThread.cmi + gtkThTop.cmo : gtkThread.cmi diff --git a/dev-ml/lablgtk/lablgtk-2.18.10.ebuild b/dev-ml/lablgtk/lablgtk-2.18.10.ebuild new file mode 100644 index 000000000000..b19033a9bf51 --- /dev/null +++ b/dev-ml/lablgtk/lablgtk-2.18.10.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Objective CAML interface for Gtk+2" +HOMEPAGE="http://lablgtk.forge.ocamlcore.org" +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" +IUSE="debug examples glade gnomecanvas +ocamlopt sourceview spell svg" + +DEPEND=">=dev-lang/ocaml-4.05:=[ocamlopt?] + dev-ml/camlp4:= + x11-libs/gtk+:2 + glade? ( gnome-base/libglade ) + gnomecanvas? ( gnome-base/libgnomecanvas ) + sourceview? ( x11-libs/gtksourceview:2.0 ) + spell? ( app-text/gtkspell:2 ) + svg? ( gnome-base/librsvg:2 )" +RDEPEND="${DEPEND}" +BDEPEND="dev-ml/findlib + virtual/pkgconfig" + +DOCS=( CHANGES README CHANGES.API ) + +PATCHES=( + "${FILESDIR}"/${P}-cflags.patch +) + +src_configure() { + local myeconfargs=( + $(use_enable debug) + $(use_with svg rsvg) + $(use_with glade) + --without-gnomeui + --without-panel + # relies on EOL gtkglarea + --without-gl + $(use_with spell gtkspell) + --without-gtksourceview + $(use_with sourceview gtksourceview2) + $(use_with gnomecanvas) + ) + + econf "${myeconfargs[@]}" +} + +src_compile() { + # parallel build crashes + emake -j1 all CFLAGS="${CFLAGS}" + if use ocamlopt; then + emake -j1 opt CFLAGS="${CFLAGS}" + fi +} + +src_install() { + local destdir="$(ocamlfind printconf destdir || die)" + dodir "${destdir}/stublibs" + export OCAMLFIND_DESTDIR=${ED}"${destdir}" + export OCAMLPATH="${ED}${destdir}" + export OCAMLFIND_LDCONF=ignore + + default + rm "${ED}/usr/$(get_libdir)/ocaml/ld.conf" || die + dosym lablgtk2/liblablgtk2.a \ + /usr/$(get_libdir)/ocaml/liblablgtk2.a + use sourceview && \ + dosym lablgtk2/liblablgtksourceview2.a \ + /usr/$(get_libdir)/ocaml/liblablgtksourceview2.a + + if use examples; then + dodoc -r examples/ + docompress -x /usr/share/doc/${PF}/examples + fi +} diff --git a/dev-ml/lablgtk/lablgtk-2.18.12.ebuild b/dev-ml/lablgtk/lablgtk-2.18.12.ebuild new file mode 100644 index 000000000000..8e2a3b2e8793 --- /dev/null +++ b/dev-ml/lablgtk/lablgtk-2.18.12.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Objective CAML interface for Gtk+2" +HOMEPAGE="http://lablgtk.forge.ocamlcore.org" +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" +IUSE="debug examples glade gnomecanvas +ocamlopt sourceview spell svg" + +DEPEND=">=dev-lang/ocaml-4.05:=[ocamlopt?] + dev-ml/camlp4:= + x11-libs/gtk+:2 + glade? ( gnome-base/libglade ) + gnomecanvas? ( gnome-base/libgnomecanvas ) + sourceview? ( x11-libs/gtksourceview:2.0 ) + spell? ( app-text/gtkspell:2 ) + svg? ( gnome-base/librsvg:2 )" +RDEPEND="${DEPEND}" +BDEPEND="dev-ml/findlib + virtual/pkgconfig" + +DOCS=( CHANGES README CHANGES.API ) + +PATCHES=( + "${FILESDIR}"/${P}-cflags.patch + "${FILESDIR}"/${P}-Makefile.patch + "${FILESDIR}"/${P}-depend.patch +) + +src_configure() { + local myeconfargs=( + $(use_enable debug) + $(use_with svg rsvg) + $(use_with glade) + --without-gnomeui + --without-panel + # relies on EOL gtkglarea + --without-gl + $(use_with spell gtkspell) + --without-gtksourceview + $(use_with sourceview gtksourceview2) + $(use_with gnomecanvas) + ) + + econf "${myeconfargs[@]}" +} + +src_compile() { + # parallel build crashes + emake -j1 all CFLAGS="${CFLAGS}" + if use ocamlopt; then + emake -j1 opt CFLAGS="${CFLAGS}" + fi +} + +src_install() { + local destdir="$(ocamlfind printconf destdir || die)" + dodir "${destdir}/stublibs" + export OCAMLFIND_DESTDIR=${ED}"${destdir}" + export OCAMLPATH="${ED}${destdir}" + export OCAMLFIND_LDCONF=ignore + + default + rm "${ED}/usr/$(get_libdir)/ocaml/ld.conf" || die + dosym lablgtk2/liblablgtk2.a \ + /usr/$(get_libdir)/ocaml/liblablgtk2.a + use sourceview && \ + dosym lablgtk2/liblablgtksourceview2.a \ + /usr/$(get_libdir)/ocaml/liblablgtksourceview2.a + + if use examples; then + dodoc -r examples/ + docompress -x /usr/share/doc/${PF}/examples + fi +} diff --git a/dev-ml/lablgtk/lablgtk-2.18.13.ebuild b/dev-ml/lablgtk/lablgtk-2.18.13.ebuild new file mode 100644 index 000000000000..3b62d5b68ad4 --- /dev/null +++ b/dev-ml/lablgtk/lablgtk-2.18.13.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Objective CAML interface for Gtk+2" +HOMEPAGE="http://lablgtk.forge.ocamlcore.org" +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" +IUSE="debug examples glade gnomecanvas +ocamlopt sourceview spell svg" + +DEPEND=">=dev-lang/ocaml-4.05:=[ocamlopt?] + dev-ml/camlp4:= + x11-libs/gtk+:2 + glade? ( gnome-base/libglade ) + gnomecanvas? ( gnome-base/libgnomecanvas ) + sourceview? ( x11-libs/gtksourceview:2.0 ) + spell? ( app-text/gtkspell:2 ) + svg? ( gnome-base/librsvg:2 )" +RDEPEND="${DEPEND}" +BDEPEND="dev-ml/findlib + virtual/pkgconfig" + +DOCS=( CHANGES README CHANGES.API ) + +PATCHES=( + "${FILESDIR}"/${PN}-2.18.12-cflags.patch + "${FILESDIR}"/${PN}-2.18.12-Makefile.patch + "${FILESDIR}"/${PN}-2.18.12-depend.patch +) + +src_configure() { + local myeconfargs=( + $(use_enable debug) + $(use_with svg rsvg) + $(use_with glade) + --without-gnomeui + --without-panel + # relies on EOL gtkglarea + --without-gl + $(use_with spell gtkspell) + --without-gtksourceview + $(use_with sourceview gtksourceview2) + $(use_with gnomecanvas) + ) + + econf "${myeconfargs[@]}" +} + +src_compile() { + # parallel build crashes + emake -j1 all CFLAGS="${CFLAGS}" + if use ocamlopt; then + emake -j1 opt CFLAGS="${CFLAGS}" + fi +} + +src_install() { + local destdir="$(ocamlfind printconf destdir || die)" + dodir "${destdir}/stublibs" + export OCAMLFIND_DESTDIR=${ED}"${destdir}" + export OCAMLPATH="${ED}${destdir}" + export OCAMLFIND_LDCONF=ignore + + default + rm "${ED}/usr/$(get_libdir)/ocaml/ld.conf" || die + dosym lablgtk2/liblablgtk2.a \ + /usr/$(get_libdir)/ocaml/liblablgtk2.a + use sourceview && \ + dosym lablgtk2/liblablgtksourceview2.a \ + /usr/$(get_libdir)/ocaml/liblablgtksourceview2.a + + if use examples; then + dodoc -r examples/ + docompress -x /usr/share/doc/${PF}/examples + fi +} diff --git a/dev-ml/lablgtk/lablgtk-2.18.5.ebuild b/dev-ml/lablgtk/lablgtk-2.18.5.ebuild deleted file mode 100644 index 2fb8b47ff861..000000000000 --- a/dev-ml/lablgtk/lablgtk-2.18.5.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit multilib findlib - -IUSE="debug examples glade gnomecanvas sourceview +ocamlopt opengl spell svg" - -DESCRIPTION="Objective CAML interface for Gtk+2" -HOMEPAGE="http://lablgtk.forge.ocamlcore.org/" -SRC_URI="https://forge.ocamlcore.org/frs/download.php/1627/${P}.tar.gz" -LICENSE="LGPL-2.1-with-linking-exception examples? ( lablgtk-examples )" - -RDEPEND=">=x11-libs/gtk+-2.10:2 - >=dev-lang/ocaml-3.10:=[ocamlopt?] - svg? ( >=gnome-base/librsvg-2.2:2 ) - glade? ( >=gnome-base/libglade-2.0.1 ) - gnomecanvas? ( >=gnome-base/libgnomecanvas-2.2 ) - opengl? ( >=dev-ml/lablgl-0.98:= - >=x11-libs/gtkglarea-1.9:2 ) - spell? ( app-text/gtkspell:2 ) - sourceview? ( x11-libs/gtksourceview:2.0 ) - dev-ml/camlp4:= - " -DEPEND="${RDEPEND} - virtual/pkgconfig" - -SLOT="2/${PV}" -KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux" - -src_configure() { - econf $(use_enable debug) \ - $(use_with svg rsvg) \ - $(use_with glade) \ - --without-gnomeui \ - --without-panel \ - $(use_with opengl gl) \ - $(use_with spell gtkspell) \ - --without-gtksourceview \ - $(use_with sourceview gtksourceview2) \ - $(use_with gnomecanvas) -} - -src_compile() { - emake -j1 all - if use ocamlopt; then - emake -j1 opt - fi -} - -install_examples() { - insinto /usr/share/doc/${P}/examples - doins examples/*.ml examples/*.rgb examples/*.png examples/*.xpm - - # Install examples for optional components - use gnomecanvas && insinto /usr/share/doc/${PF}/examples/canvas && doins examples/canvas/*.ml examples/canvas/*.png - use svg && insinto /usr/share/doc/${PF}/examples/rsvg && doins examples/rsvg/*.ml examples/rsvg/*.svg - use glade && insinto /usr/share/doc/${PF}/examples/glade && doins examples/glade/*.ml examples/glade/*.glade* - use sourceview && insinto /usr/share/doc/${PF}/examples/sourceview && doins examples/sourceview/*.ml examples/sourceview/*.lang - use opengl && insinto /usr/share/doc/${PF}/examples/GL && doins examples/GL/*.ml - - docompress -x /usr/share/doc/${PF}/examples -} - -src_install () { - findlib_src_preinst - export OCAMLPATH="${OCAMLFIND_DESTDIR}" - emake install DESTDIR="${D}" - - rm -f "${ED}/usr/$(get_libdir)/ocaml/ld.conf" - - dodoc CHANGES README CHANGES.API - use examples && install_examples -} - -pkg_postinst () { - if use examples; then - elog "To run the examples you can use the lablgtk2 toplevel." - elog "e.g: lablgtk2 /usr/share/doc/${PF}/examples/testgtk.ml" - fi -} diff --git a/dev-ml/lablgtk/lablgtk-3.1.1.ebuild b/dev-ml/lablgtk/lablgtk-3.1.1.ebuild new file mode 100644 index 000000000000..cd15266b9eef --- /dev/null +++ b/dev-ml/lablgtk/lablgtk-3.1.1.ebuild @@ -0,0 +1,28 @@ +# Copyright 2019-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DUNE_PKG_NAME=lablgtk3 +inherit dune + +DESCRIPTION="OCaml bindings to GTK-3" +HOMEPAGE="https://github.com/garrigue/lablgtk" +SRC_URI="https://github.com/garrigue/lablgtk/releases/download/${PV}/${DUNE_PKG_NAME}-${PV}.tbz" + +LICENSE="LGPL-2.1-with-linking-exception" +SLOT="3/${PV}" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt sourceview" + +BDEPEND="dev-ml/camlp5" +DEPEND=" + app-text/gtkspell:3= + x11-libs/gtk+:3= + dev-ml/cairo2:= + x11-libs/gtksourceview:3.0= +" +RDEPEND="${DEPEND}" +PDEPEND="sourceview? ( dev-ml/lablgtk-sourceview:${SLOT} )" + +S="${WORKDIR}/${DUNE_PKG_NAME}-${PV}" diff --git a/dev-ml/lablgtk/lablgtk-3.1.2.ebuild b/dev-ml/lablgtk/lablgtk-3.1.2.ebuild new file mode 100644 index 000000000000..2e8609cd299a --- /dev/null +++ b/dev-ml/lablgtk/lablgtk-3.1.2.ebuild @@ -0,0 +1,36 @@ +# Copyright 2019-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DUNE_PKG_NAME=lablgtk3 + +inherit dune + +DESCRIPTION="OCaml bindings to GTK-3" +HOMEPAGE="https://github.com/garrigue/lablgtk" +SRC_URI="https://github.com/garrigue/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1-with-linking-exception" +SLOT="3/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="+ocamlopt sourceview" + +BDEPEND="dev-ml/camlp5" +DEPEND=" + app-text/gtkspell:3= + x11-libs/gtk+:3= + dev-ml/cairo2:= + x11-libs/gtksourceview:3.0= +" +RDEPEND="${DEPEND}" +PDEPEND="sourceview? ( dev-ml/lablgtk-sourceview:${SLOT} )" + +src_prepare() { + default + echo "(version ${PV})" >> "${S}"/dune-project || die +} + +src_compile() { + dune build --profile release -p ${DUNE_PKG_NAME} || die +} diff --git a/dev-ml/lablgtk/lablgtk-3.1.3.ebuild b/dev-ml/lablgtk/lablgtk-3.1.3.ebuild new file mode 100644 index 000000000000..5cf0ef9676a8 --- /dev/null +++ b/dev-ml/lablgtk/lablgtk-3.1.3.ebuild @@ -0,0 +1,31 @@ +# Copyright 2019-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DUNE_PKG_NAME=lablgtk3 + +inherit dune + +DESCRIPTION="OCaml bindings to GTK-3" +HOMEPAGE="https://github.com/garrigue/lablgtk" +SRC_URI="https://github.com/garrigue/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1-with-linking-exception" +SLOT="3/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt sourceview" + +BDEPEND="dev-ml/camlp5" +DEPEND=" + app-text/gtkspell:3= + x11-libs/gtk+:3= + dev-ml/cairo2:= + x11-libs/gtksourceview:3.0= +" +RDEPEND="${DEPEND}" +PDEPEND="sourceview? ( dev-ml/lablgtk-sourceview:${SLOT} )" + +src_compile() { + dune build --profile release -p ${DUNE_PKG_NAME} || die +} diff --git a/dev-ml/lablgtk/metadata.xml b/dev-ml/lablgtk/metadata.xml index 0775baadb151..42977a44992c 100644 --- a/dev-ml/lablgtk/metadata.xml +++ b/dev-ml/lablgtk/metadata.xml @@ -1,13 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <email>ml@gentoo.org</email> + <name>ML</name> </maintainer> -<use> - <flag name="glade">Enable libglade bindings compilation.</flag> - <flag name="gnomecanvas">Enable libgnomecanvas bindings compilation.</flag> - <flag name="sourceview">Enable GtkSourceView support</flag> -</use> + <use> + <flag name="glade" restrict="<dev-ml/lablgtk-3"> + Enable <pkg>gnome-base/libglade</pkg> bindings compilation + </flag> + <flag name="gnomecanvas" restrict="<dev-ml/lablgtk-3"> + Enable <pkg>gnome-base/libgnomecanvas</pkg> bindings compilation + </flag> + <flag name="sourceview"> + Enable GtkSourceView (<pkg>x11-libs/gtksourceview</pkg>) support + </flag> + </use> + <upstream> + <remote-id type="github">garrigue/lablgtk</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-ml/labltk/Manifest b/dev-ml/labltk/Manifest index fc7a5ca69778..a4d9da8b9c5d 100644 --- a/dev-ml/labltk/Manifest +++ b/dev-ml/labltk/Manifest @@ -1,2 +1,6 @@ -DIST labltk-8.06.2.tar.gz 369508 BLAKE2B df0a5fb1cf352c52bf3177e83be2cadde961c2a7ba0496f45dc515141931d13715b4c253f74e5f280f9a6c310488236e6bc598c0ceffc408028ef5f524f2bcf2 SHA512 d9342d49ba8769edd7a4ed051844f6ae5d3e62a7c2c76e895bfd1162d0433c4ea54f2314b29b708551fba63daec1123553b56f0abb6412807ab00d7bb40b73d6 -DIST labltk-8.06.3.tar.gz 369924 BLAKE2B fa8b974572826abccc42eb2b07cdc28e1d611178d683b3f5b270051602cc940d1281d15d93c02a56bb15cdba0580c1371c91f2516e6ebb72e4e824f9d3877622 SHA512 c2002d519c1fcfdd2b13ae6d5836880273dac2660f07f6ee0e7bb932e3fec6f5cc959202efdf712758a17d24dbe50c3f6697c7b125e3123fa8153130d7ece979 +DIST labltk-8.06.10-warnings.patch.bz2 4194 BLAKE2B 106e70dac1601a831a46a21a4013f70d2b9e17f910b8c09fc2c976840cd2e4d29dbc9be50cd7efa469d50be984cae82b56783a4e8d9a0bfa308d1d4466e44039 SHA512 eeea791a4e901335f6e010983da85d72e0a6f9fe24ab84bff5c0e46af941a5bb39995ad4d475894855ecb75d5ce26c1280a74d059e845301b30f6a386b2338f8 +DIST labltk-8.06.10.tar.gz 371871 BLAKE2B da67b13aa0a0c179c2fcefe6b03f68225b6e886a1233de77b9749be32b8efc845cac60244f9a8494241c8c77c7d6991786280c274becb70f5527ad891c3aac69 SHA512 ef797d21adac48ca5ed35d95ad05fee26f9b6c99b0510909f6087abb9580b8efd219ca65b1efddb170b5409567d83eaaac0473898f5f4db3e15ae4f39df364c8 +DIST labltk-8.06.11.tar.gz 372194 BLAKE2B ea81662201f6166cd6fb46fe1681ffdab94703dd3e338244079ad2c67df421969618d7fb2ba2b9b5eadb732eeb927c3de03f19fb5b3621c1461924aeb2f347d5 SHA512 a4ad5fa31cbc89066445bc71a0c1c016f7e299b6bf88a5f77d559c805bc78d90651988658c8a300770ca41514ad73272691feaa84179637fcc695c96bbf25dd6 +DIST labltk-8.06.12.tar.gz 372215 BLAKE2B 27718ad287954c11c0e77579239ad9ad53f4df308f3af3c482c40504e6426b4366d2c3de3acb36ca39e7fd404964fe5caa53a0b47702a0bc45ae1266765e90a0 SHA512 e1564ab2d8922276bd8ad586b37308d60ca2dd563bac3cdd992d8a6ba4de26e5499350a62a1d4cb2bbb9a5b7aff609b5187aad5fba118eb55d1b4c8355d2979a +DIST labltk-8.06.7.tar.gz 370870 BLAKE2B 2d836c824d9adbd4f03d0e7e81faa51669837eecb4f94f6c89c657966774fe7d6ed928459be3ccca7fd3e7cf67a54ee63f7d2d08dcc8b7e853f5ad64769b33a2 SHA512 3c7352d14bc337adfb1939e72bd2658bb5e60b463f10f3748779084d1b7a6e6225028c775b548e355d69984a8944b91580fa978ff904b20b8b762ba9046f5e7d +DIST labltk-8.06.9.tar.gz 371504 BLAKE2B 587ff01da120501f85f6d9921e46275858f1e1ce730eef205f9e7d7c64f6d3c0ea701cf832fdb8eb0746e1f0cff1151bccb077641740fb18811473b1553e2940 SHA512 fd6defa302d919f229394c486dcefab110b144534525a87082a27d2cab29c0af4ece3da821098fea25416850ad857f7af979d48790330d62dfb8d8db8f2bf6ca diff --git a/dev-ml/labltk/files/labltk-8.06.10-this-expression-has-type.patch b/dev-ml/labltk/files/labltk-8.06.10-this-expression-has-type.patch new file mode 100644 index 000000000000..8f9fde6bdd79 --- /dev/null +++ b/dev-ml/labltk/files/labltk-8.06.10-this-expression-has-type.patch @@ -0,0 +1,12 @@ +diff -urNp labltk-8.06.10-orig/browser/typecheck.ml labltk-8.06.10-dwok/browser/typecheck.ml +--- labltk-8.06.10-orig/browser/typecheck.ml 2020-08-25 07:50:47.000000000 +0200 ++++ labltk-8.06.10-dwok/browser/typecheck.ml 2021-02-26 01:55:00.000000000 +0100 +@@ -116,7 +116,7 @@ let f txt = + List.iter psl ~f: + begin function + Ptop_def pstr -> +- let str, sign, _names, env' = Typemod.type_structure !env pstr in ++ let str, sign, _names, env' = Typemod.type_structure !env pstr Location.none in + txt.structure <- txt.structure @ str.str_items; + txt.signature <- txt.signature @ sign; + env := env' diff --git a/dev-ml/labltk/files/labltk-8.06.12-c2x.patch b/dev-ml/labltk/files/labltk-8.06.12-c2x.patch new file mode 100644 index 000000000000..f495e532d590 --- /dev/null +++ b/dev-ml/labltk/files/labltk-8.06.12-c2x.patch @@ -0,0 +1,47 @@ +--- a/support/cltkWait.c 2023-01-25 19:38:41.920494229 +0100 ++++ b/support/cltkWait.c 2023-01-25 19:39:51.246347410 +0100 +@@ -44,9 +44,7 @@ + Tk_Window win; + }; + +-static void WaitVisibilityProc(clientData, eventPtr) +- ClientData clientData; +- XEvent *eventPtr; /* Information about event (not used). */ ++static void WaitVisibilityProc(ClientData clientData, XEvent *eventPtr) + { + struct WinCBData *vis = clientData; + value cbid = Val_int(vis->cbid); +--- a/support/cltkImg.c 2023-01-25 19:42:03.647173018 +0100 ++++ b/support/cltkImg.c 2023-01-25 19:42:49.290423395 +0100 +@@ -111,9 +111,7 @@ + return Val_int(0); + } + +-CAMLprim value camltk_setimgdata_bytecode(argv,argn) +- value *argv; +- int argn; ++CAMLprim value camltk_setimgdata_bytecode(value *argv, int argn) + { + return camltk_setimgdata_native(argv[0], argv[1], argv[2], argv[3], + argv[4], argv[5]); +--- a/support/cltkVar.c 2023-01-25 19:44:11.880066940 +0100 ++++ b/support/cltkVar.c 2023-01-25 19:46:16.580018764 +0100 +@@ -74,12 +74,12 @@ + typedef char *(Tcl_VarTraceProc) _ANSI_ARGS_((ClientData clientData, + Tcl_Interp *interp, char *part1, char *part2, int flags)); + */ +-static char * tracevar(clientdata, interp, name1, name2, flags) +- ClientData clientdata; +- Tcl_Interp *interp; /* Interpreter containing variable. */ +- char *name1; /* Name of variable. */ +- char *name2; /* Second part of variable name. */ +- int flags; /* Information about what happened. */ ++static char * tracevar(ClientData clientdata, Tcl_Interp *interp, ++ char *name1, char *name2, int flags) ++ /* interp -> Interpreter containing variable. */ ++ /* name1 -> Name of variable. */ ++ /* name2 -> Second part of variable name. */ ++ /* flags -> Information about what happened. */ + { + Tcl_UntraceVar2(interp, name1, name2, + TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS, diff --git a/dev-ml/labltk/files/labltk-8.06.12-shuffle.patch b/dev-ml/labltk/files/labltk-8.06.12-shuffle.patch new file mode 100644 index 000000000000..482b18370ad6 --- /dev/null +++ b/dev-ml/labltk/files/labltk-8.06.12-shuffle.patch @@ -0,0 +1,36 @@ +--- a/compiler/Makefile 2023-01-21 22:23:29.676828969 +0100 ++++ b/compiler/Makefile 2023-01-21 22:24:16.204141261 +0100 +@@ -73,6 +73,9 @@ + .ml.cmo: + $(CAMLCOMP) $(COMPFLAGS) -I ../support $< + ++maincompile.cmo: copyright.cmo ++maincompile.cmx: copyright.cmx ++ + depend: parser.ml parser.mli lexer.ml pplex.ml ppyac.ml ppyac.mli + $(CAMLDEP) *.mli *.ml > .depend + +--- a/browser/Makefile 2023-01-25 22:29:40.784044151 +0100 ++++ b/browser/Makefile 2023-01-25 22:29:56.579838693 +0100 +@@ -18,3 +18,6 @@ + + dummy.ml: + cp dummyUnix.ml dummy.ml ++ ++shell.cmo : dummy.cmo ++shell.cmx : dummy.cmx +--- a/browser/.depend 2023-03-09 11:54:40.849960961 +0100 ++++ b/browser/.depend 2023-03-09 11:55:21.041342177 +0100 +@@ -117,10 +117,12 @@ + shell.cmo : ../labltk/winfo.cmi ../labltk/toplevel.cmi ../labltk/tk.cmo \ + ../support/timer.cmi ../labltk/text.cmi ../labltk/menu.cmi list2.cmo \ + lexical.cmi jg_toplevel.cmo jg_tk.cmo jg_text.cmi jg_message.cmi \ ++ dummy.cmo \ + jg_menu.cmo jg_memo.cmi fileselect.cmi ../support/fileevent.cmi shell.cmi + shell.cmx : ../labltk/winfo.cmx ../labltk/toplevel.cmx ../labltk/tk.cmx \ + ../support/timer.cmx ../labltk/text.cmx ../labltk/menu.cmx list2.cmx \ + lexical.cmx jg_toplevel.cmx jg_tk.cmx jg_text.cmx jg_message.cmx \ ++ dummy.cmx \ + jg_menu.cmx jg_memo.cmx fileselect.cmx ../support/fileevent.cmx shell.cmi + typecheck.cmo : ../labltk/tk.cmo ../labltk/text.cmi mytypes.cmi jg_tk.cmo \ + jg_text.cmi jg_message.cmi typecheck.cmi diff --git a/dev-ml/labltk/files/labltk-8.06.7-configure.patch b/dev-ml/labltk/files/labltk-8.06.7-configure.patch new file mode 100644 index 000000000000..320f92f7ce45 --- /dev/null +++ b/dev-ml/labltk/files/labltk-8.06.7-configure.patch @@ -0,0 +1,27 @@ +https://bugs.gentoo.org/881841 +https://github.com/garrigue/labltk/commit/be8c977d320ed40cacb322658d4ceba5e583b3a6 + +From be8c977d320ed40cacb322658d4ceba5e583b3a6 Mon Sep 17 00:00:00 2001 +From: Jacques Garrigue <garrigue@math.nagoya-u.ac.jp> +Date: Mon, 24 Aug 2020 11:27:34 +0900 +Subject: [PATCH] Fix config/auto-aux/hasgot for clang 12 + +--- a/config/auto-aux/hasgot ++++ b/config/auto-aux/hasgot +@@ -30,7 +30,8 @@ while : ; do + shift + done + +-(echo "main() {" ++(for f in $*; do echo "int $f();"; done ++ echo "int main() {" + for f in $*; do echo " $f();"; done + echo "}") >> hasgot.c + +--- a/config/auto-aux/hasgot.c ++++ /dev/null +@@ -1,3 +0,0 @@ +-main() { +- Tk_SetGrid(); +-} + diff --git a/dev-ml/labltk/files/labltk-8.06.9-configure-clang16.patch b/dev-ml/labltk/files/labltk-8.06.9-configure-clang16.patch new file mode 100644 index 000000000000..bc7e04175f7f --- /dev/null +++ b/dev-ml/labltk/files/labltk-8.06.9-configure-clang16.patch @@ -0,0 +1,50 @@ +https://bugs.gentoo.org/881841 +https://github.com/garrigue/labltk/pull/17 + +From e1e850972c4190686a040574b91d61948cc559b5 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Sat, 19 Nov 2022 01:14:25 +0000 +Subject: [PATCH] config: Fix -Wimplicit-int, -Wstrict-prototypes (Clang 16) + +Followup to be8c977d320ed40cacb322658d4ceba5e583b3a6. + +Clang 16 makes -Wimplicit-int error by default. + +Unfortunately, this can lead to misconfiguration or miscompilation of software as configure +tests may then return the wrong result. + +We also fix -Wstrict-prototypes while here as it's easy to do and it prepares +us for C23. + +For more information, see LWN.net [0] or LLVM's Discourse [1], the Gentoo wiki [2], +or the (new) c-std-porting mailing list [3]. + +[0] https://lwn.net/Articles/913505/ +[1] https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213 +[2] https://wiki.gentoo.org/wiki/Modern_C_porting +[3] hosted at lists.linux.dev. + +Signed-off-by: Sam James <sam@gentoo.org> +--- a/config/auto-aux/hasgot ++++ b/config/auto-aux/hasgot +@@ -31,7 +31,7 @@ while : ; do + done + + (for f in $*; do echo "int $f();"; done +- echo "int main() {" ++ echo "int main(void) {" + for f in $*; do echo " $f();"; done + echo "}") >> hasgot.c + +--- a/config/auto-aux/tclversion.c ++++ b/config/auto-aux/tclversion.c +@@ -18,7 +18,7 @@ + #include <tcl.h> + #include <tk.h> + +-main () ++int main (void) + { + puts(TCL_VERSION); + } + diff --git a/dev-ml/labltk/files/ocaml405.patch b/dev-ml/labltk/files/ocaml405.patch deleted file mode 100644 index 8503646f71ec..000000000000 --- a/dev-ml/labltk/files/ocaml405.patch +++ /dev/null @@ -1,382 +0,0 @@ -Index: labltk-8.06.2/support/cltkCaml.c -=================================================================== ---- labltk-8.06.2.orig/support/cltkCaml.c -+++ labltk-8.06.2/support/cltkCaml.c -@@ -39,7 +39,7 @@ int CamlCBCmd(ClientData clientdata, Tcl - int id; - if (Tcl_GetInt(interp, argv[1], &id) != TCL_OK) - return TCL_ERROR; -- callback2(*handler_code,Val_int(id), -+ caml_callback2(*handler_code,Val_int(id), - copy_string_list(argc - 2,(char **)&argv[2])); - /* Never fails (OCaml would have raised an exception) */ - /* but result may have been set by callback */ -@@ -65,7 +65,7 @@ CAMLprim value camltk_return (value v) - /* Note: raise_with_string WILL copy the error message */ - CAMLprim void tk_error(const char *errmsg) - { -- raise_with_string(*tkerror_exn, errmsg); -+ caml_raise_with_string(*tkerror_exn, errmsg); - } - - -Index: labltk-8.06.2/support/cltkDMain.c -=================================================================== ---- labltk-8.06.2.orig/support/cltkDMain.c -+++ labltk-8.06.2/support/cltkDMain.c -@@ -56,7 +56,7 @@ void invoke_pending_caml_signals (client - /* Rearm timer */ - Tk_CreateTimerHandler(SIGNAL_INTERVAL, invoke_pending_caml_signals, NULL); - signal_events = 1; -- leave_blocking_section(); -+ caml_leave_blocking_section(); - } - /* The following is taken from byterun/startup.c */ - header_t atom_table[256]; -@@ -222,10 +222,10 @@ int Caml_Init(interp) - strcat(f, RCNAME); - if (0 == access(f,R_OK)) - if (TCL_OK != Tcl_EvalFile(cltclinterp,f)) { -- stat_free(f); -+ caml_stat_free(f); - tk_error(Tcl_GetStringResult(cltclinterp)); - }; -- stat_free(f); -+ caml_stat_free(f); - } - } - -Index: labltk-8.06.2/support/cltkEval.c -=================================================================== ---- labltk-8.06.2.orig/support/cltkEval.c -+++ labltk-8.06.2/support/cltkEval.c -@@ -45,7 +45,7 @@ value copy_string_list(int argc, char ** - for (i = argc-1; i >= 0; i--) { - oldres = res; - str = tcl_string_to_caml(argv[i]); -- res = alloc(2, 0); -+ res = caml_alloc(2, 0); - Field(res, 0) = str; - Field(res, 1) = oldres; - } -@@ -71,7 +71,7 @@ CAMLprim value camltk_tcl_eval(value str - Tcl_ResetResult(cltclinterp); - cmd = caml_string_to_tcl(str); - code = Tcl_Eval(cltclinterp, cmd); -- stat_free(cmd); -+ caml_stat_free(cmd); - - switch (code) { - case TCL_OK: -@@ -143,8 +143,8 @@ int fill_args (char **argv, int where, v - fill_args(tmpargv,0,Field(v,0)); - tmpargv[size] = NULL; - merged = Tcl_Merge(size,(const char *const*)tmpargv); -- for(i = 0; i<size; i++){ stat_free(tmpargv[i]); } -- stat_free((char *)tmpargv); -+ for(i = 0; i<size; i++){ caml_stat_free(tmpargv[i]); } -+ caml_stat_free((char *)tmpargv); - /* must be freed by stat_free */ - argv[where] = (char*)caml_stat_alloc(strlen(merged)+1); - strcpy(argv[where], merged); -@@ -227,10 +227,10 @@ CAMLprim value camltk_tcl_direct_eval(va - - /* Free the various things we allocated */ - for(i=0; i< size; i ++){ -- stat_free((char *) allocated[i]); -+ caml_stat_free((char *) allocated[i]); - } -- stat_free((char *)argv); -- stat_free((char *)allocated); -+ caml_stat_free((char *)argv); -+ caml_stat_free((char *)allocated); - - switch (result) { - case TCL_OK: -Index: labltk-8.06.2/support/cltkEvent.c -=================================================================== ---- labltk-8.06.2.orig/support/cltkEvent.c -+++ labltk-8.06.2/support/cltkEvent.c -@@ -49,6 +49,6 @@ CAMLprim value camltk_dooneevent(value f - - CheckInit(); - -- ret = Tk_DoOneEvent(convert_flag_list(flags, event_flag_table)); -+ ret = Tk_DoOneEvent(caml_convert_flag_list(flags, event_flag_table)); - return Val_int(ret); - } -Index: labltk-8.06.2/support/cltkFile.c -=================================================================== ---- labltk-8.06.2.orig/support/cltkFile.c -+++ labltk-8.06.2/support/cltkFile.c -@@ -33,7 +33,7 @@ - - void FileProc(ClientData clientdata, int mask) - { -- callback2(*handler_code,Val_int(clientdata),Val_int(0)); -+ caml_callback2(*handler_code,Val_int(clientdata),Val_int(0)); - } - - /* Map Unix.file_descr values to Tcl file handles */ -Index: labltk-8.06.2/support/cltkImg.c -=================================================================== ---- labltk-8.06.2.orig/support/cltkImg.c -+++ labltk-8.06.2/support/cltkImg.c -@@ -47,7 +47,7 @@ CAMLprim value camltk_getimgdata (value - - code = Tk_PhotoGetImage(ph,&pib); /* never fails ? */ - size = pib.width * pib.height * pib.pixelSize; -- res = alloc_string(size); -+ res = caml_alloc_string(size); - - /* no holes, default format ? */ - if ((pib.pixelSize == 3) && -Index: labltk-8.06.2/support/cltkMain.c -=================================================================== ---- labltk-8.06.2.orig/support/cltkMain.c -+++ labltk-8.06.2/support/cltkMain.c -@@ -51,11 +51,11 @@ int signal_events = 0; /* do we have a p - void invoke_pending_caml_signals (ClientData clientdata) - { - signal_events = 0; -- enter_blocking_section(); /* triggers signal handling */ -+ caml_enter_blocking_section(); /* triggers signal handling */ - /* Rearm timer */ - Tk_CreateTimerHandler(SIGNAL_INTERVAL, invoke_pending_caml_signals, NULL); - signal_events = 1; -- leave_blocking_section(); -+ caml_leave_blocking_section(); - } - - /* Now the real Tk stuff */ -@@ -77,7 +77,7 @@ CAMLprim value camltk_opentk(value argv) - tmp = Val_unit; - - if ( argv == Val_int(0) ){ -- failwith("camltk_opentk: argv is empty"); -+ caml_failwith("camltk_opentk: argv is empty"); - } - argv0 = String_val( Field( argv, 0 ) ); - -@@ -91,7 +91,7 @@ CAMLprim value camltk_opentk(value argv) - /* Register cltclinterp for use in other related extensions */ - value *interp = caml_named_value("cltclinterp"); - if (interp != NULL) -- Store_field(*interp,0,copy_nativeint((intnat)cltclinterp)); -+ Store_field(*interp,0,caml_copy_nativeint((intnat)cltclinterp)); - } - - if (Tcl_Init(cltclinterp) != TCL_OK) -@@ -128,7 +128,7 @@ CAMLprim value camltk_opentk(value argv) - args = Tcl_Merge(argc, (const char *const*)tkargv); /* args must be freed by Tcl_Free */ - Tcl_SetVar(cltclinterp, "argv", args, TCL_GLOBAL_ONLY); - Tcl_Free(args); -- stat_free( tkargv ); -+ caml_stat_free( tkargv ); - } - } - if (Tk_Init(cltclinterp) != TCL_OK) -@@ -164,10 +164,10 @@ CAMLprim value camltk_opentk(value argv) - strcat(f, RCNAME); - if (0 == access(f,R_OK)) - if (TCL_OK != Tcl_EvalFile(cltclinterp,f)) { -- stat_free(f); -+ caml_stat_free(f); - tk_error(Tcl_GetStringResult(cltclinterp)); - }; -- stat_free(f); -+ caml_stat_free(f); - } - } - -Index: labltk-8.06.2/support/cltkMisc.c -=================================================================== ---- labltk-8.06.2.orig/support/cltkMisc.c -+++ labltk-8.06.2/support/cltkMisc.c -@@ -41,12 +41,12 @@ CAMLprim value camltk_splitlist (value v - { value res = copy_string_list(argc,argv); - Tcl_Free((char *)argv); /* only one large block was allocated */ - /* argv points into utf: utf must be freed after argv are freed */ -- stat_free( utf ); -+ caml_stat_free( utf ); - return res; - } - case TCL_ERROR: - default: -- stat_free( utf ); -+ caml_stat_free( utf ); - tk_error(Tcl_GetStringResult(cltclinterp)); - } - } -@@ -54,7 +54,7 @@ CAMLprim value camltk_splitlist (value v - /* Copy an OCaml string to the C heap. Should deallocate with stat_free */ - char *string_to_c(value s) - { -- int l = string_length(s); -+ int l = caml_string_length(s); - char *res = caml_stat_alloc(l + 1); - memmove (res, String_val (s), l); - res[l] = '\0'; -Index: labltk-8.06.2/support/cltkTimer.c -=================================================================== ---- labltk-8.06.2.orig/support/cltkTimer.c -+++ labltk-8.06.2/support/cltkTimer.c -@@ -26,7 +26,7 @@ - /* Basically the same thing as FileProc */ - void TimerProc (ClientData clientdata) - { -- callback2(*handler_code,Val_long(clientdata),Val_int(0)); -+ caml_callback2(*handler_code,Val_long(clientdata),Val_int(0)); - } - - CAMLprim value camltk_add_timer(value milli, value cbid) -Index: labltk-8.06.2/support/cltkUtf.c -=================================================================== ---- labltk-8.06.2.orig/support/cltkUtf.c -+++ labltk-8.06.2/support/cltkUtf.c -@@ -76,14 +76,14 @@ value tcl_string_to_caml( const char *s - char *str; - - str = utf_to_external( s ); -- res = copy_string(str); -- stat_free(str); -+ res = caml_copy_string(str); -+ caml_stat_free(str); - CAMLreturn(res); - } - - #else - - char *caml_string_to_tcl(value s){ return string_to_c(s); } --value tcl_string_to_caml(char *s){ return copy_string(s); } -+value tcl_string_to_caml(char *s){ return caml_copy_string(s); } - - #endif -Index: labltk-8.06.2/support/cltkVar.c -=================================================================== ---- labltk-8.06.2.orig/support/cltkVar.c -+++ labltk-8.06.2/support/cltkVar.c -@@ -35,7 +35,7 @@ CAMLprim value camltk_getvar(value var) - stable_var = string_to_c(var); - s = (char *)Tcl_GetVar(cltclinterp,stable_var, - TCL_GLOBAL_ONLY|TCL_LEAVE_ERR_MSG); -- stat_free(stable_var); -+ caml_stat_free(stable_var); - - if (s == NULL) - tk_error(Tcl_GetStringResult(cltclinterp)); -@@ -57,11 +57,11 @@ CAMLprim value camltk_setvar(value var, - utf_contents = caml_string_to_tcl(contents); - s = (char *)Tcl_SetVar(cltclinterp,stable_var, utf_contents, - TCL_GLOBAL_ONLY|TCL_LEAVE_ERR_MSG); -- stat_free(stable_var); -+ caml_stat_free(stable_var); - if( s == utf_contents ){ - tk_error("camltk_setvar: Tcl_SetVar returned strange result. Call the author of mlTk!"); - } -- stat_free(utf_contents); -+ caml_stat_free(utf_contents); - - if (s == NULL) - tk_error(Tcl_GetStringResult(cltclinterp)); -@@ -84,7 +84,7 @@ static char * tracevar(clientdata, inter - Tcl_UntraceVar2(interp, name1, name2, - TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS, - tracevar, clientdata); -- callback2(*handler_code,Val_int(clientdata),Val_unit); -+ caml_callback2(*handler_code,Val_int(clientdata),Val_unit); - return (char *)NULL; - } - -@@ -103,10 +103,10 @@ CAMLprim value camltk_trace_var(value va - tracevar, - (ClientData) (Long_val(cbid))) - != TCL_OK) { -- stat_free(cvar); -+ caml_stat_free(cvar); - tk_error(Tcl_GetStringResult(cltclinterp)); - }; -- stat_free(cvar); -+ caml_stat_free(cvar); - return Val_unit; - } - -@@ -123,6 +123,6 @@ CAMLprim value camltk_untrace_var(value - TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS, - tracevar, - (ClientData) (Long_val(cbid))); -- stat_free(cvar); -+ caml_stat_free(cvar); - return Val_unit; - } -Index: labltk-8.06.2/support/cltkWait.c -=================================================================== ---- labltk-8.06.2.orig/support/cltkWait.c -+++ labltk-8.06.2/support/cltkWait.c -@@ -54,8 +54,8 @@ static void WaitVisibilityProc(clientDat - Tk_DeleteEventHandler(vis->win, VisibilityChangeMask, - WaitVisibilityProc, clientData); - -- stat_free((char *)vis); -- callback2(*handler_code,cbid,Val_int(0)); -+ caml_stat_free((char *)vis); -+ caml_callback2(*handler_code,cbid,Val_int(0)); - } - - /* Sets up a callback upon Visibility of a window */ -@@ -65,7 +65,7 @@ CAMLprim value camltk_wait_vis(value win - (struct WinCBData *)caml_stat_alloc(sizeof(struct WinCBData)); - vis->win = Tk_NameToWindow(cltclinterp, String_val(win), cltk_mainWindow); - if (vis -> win == NULL) { -- stat_free((char *)vis); -+ caml_stat_free((char *)vis); - tk_error(Tcl_GetStringResult(cltclinterp)); - }; - vis->cbid = Int_val(cbid); -@@ -79,9 +79,9 @@ static void WaitWindowProc(ClientData cl - if (eventPtr->type == DestroyNotify) { - struct WinCBData *vis = clientData; - value cbid = Val_int(vis->cbid); -- stat_free((char *)clientData); -+ caml_stat_free((char *)clientData); - /* The handler is destroyed by Tk itself */ -- callback2(*handler_code,cbid,Val_int(0)); -+ caml_callback2(*handler_code,cbid,Val_int(0)); - } - } - -@@ -92,7 +92,7 @@ CAMLprim value camltk_wait_des(value win - (struct WinCBData *)caml_stat_alloc(sizeof(struct WinCBData)); - vis->win = Tk_NameToWindow(cltclinterp, String_val(win), cltk_mainWindow); - if (vis -> win == NULL) { -- stat_free((char *)vis); -+ caml_stat_free((char *)vis); - tk_error(Tcl_GetStringResult(cltclinterp)); - }; - vis->cbid = Int_val(cbid); -Index: labltk-8.06.2/browser/searchpos.ml -=================================================================== ---- labltk-8.06.2.orig/browser/searchpos.ml -+++ labltk-8.06.2/browser/searchpos.ml -@@ -782,7 +782,7 @@ and search_pos_expr ~pos exp = - search_pos_expr exp' ~pos - end; - search_pos_expr exp ~pos -- | Texp_function (_, l, _) -> -+ | Texp_function { arg_label = _; param = _ ; cases = l; partial = _; } -> - List.iter l ~f:(search_case ~pos) - | Texp_apply (exp, l) -> - List.iter l ~f:(fun (_, x) -> Misc.may (search_pos_expr ~pos) x); -Index: labltk-8.06.2/jpf/fileselect.ml -=================================================================== ---- labltk-8.06.2.orig/jpf/fileselect.ml -+++ labltk-8.06.2/jpf/fileselect.ml -@@ -55,7 +55,7 @@ let myentry_create p ~variable = - let subshell cmd = - let r,w = pipe () in - match fork () with -- 0 -> close r; dup2 ~src:w ~dst:stdout; -+ 0 -> close r; dup2 ~cloexec:false ~src:w ~dst:stdout; - execv ~prog:"/bin/sh" ~args:[| "/bin/sh"; "-c"; cmd |] - | id -> - close w; diff --git a/dev-ml/labltk/labltk-8.06.10-r1.ebuild b/dev-ml/labltk/labltk-8.06.10-r1.ebuild new file mode 100644 index 000000000000..e6d19e54776b --- /dev/null +++ b/dev-ml/labltk/labltk-8.06.10-r1.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit findlib toolchain-funcs + +DESCRIPTION="OCaml interface to the Tcl/Tk GUI framework" +HOMEPAGE="https://garrigue.github.io/labltk/" +SRC_URI="https://github.com/garrigue/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-warnings.patch.bz2" + +LICENSE="QPL-1.0 LGPL-2" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux" +IUSE="+ocamlopt X" + +RDEPEND="dev-lang/tk:= + <dev-lang/ocaml-4.13 + >=dev-lang/ocaml-4.11:=[ocamlopt?,X(+)?]" +DEPEND="${RDEPEND} + dev-ml/findlib +" + +PATCHES=( + "${FILESDIR}/findlib.patch" + "${FILESDIR}"/${PN}-8.06.9-configure-clang16.patch + "${WORKDIR}"/${P}-warnings.patch +) + +src_prepare() { + has_version "dev-lang/ocaml:0/4.11" && \ + eapply "${FILESDIR}"/${P}-this-expression-has-type.patch + sed -i \ + -e "s|ranlib|$(tc-getRANLIB)|" \ + frx/Makefile \ + || die + default +} + +src_configure() { + ./configure --use-findlib --verbose $(usex X "--tk-x11" "--tk-no-x11") || die "configure failed!" +} + +src_compile() { + emake -j1 + use ocamlopt && emake -j1 opt +} + +src_install() { + findlib_src_preinst + dodir /usr/bin + emake \ + INSTALLDIR="${D}/$(ocamlc -where)/labltk" \ + INSTALLBINDIR="${ED}/usr/bin/" \ + install + dodoc Changes README.mlTk +} diff --git a/dev-ml/labltk/labltk-8.06.11-r1.ebuild b/dev-ml/labltk/labltk-8.06.11-r1.ebuild new file mode 100644 index 000000000000..12f8405e4461 --- /dev/null +++ b/dev-ml/labltk/labltk-8.06.11-r1.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit findlib toolchain-funcs + +DESCRIPTION="OCaml interface to the Tcl/Tk GUI framework" +HOMEPAGE="https://garrigue.github.io/labltk/" +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" +IUSE="+ocamlopt X" + +RDEPEND="dev-lang/tk:= + =dev-lang/ocaml-4.13*:=[ocamlopt?,X(+)?]" +DEPEND="${RDEPEND} + dev-ml/findlib +" + +PATCHES=( + "${FILESDIR}/findlib.patch" + "${FILESDIR}"/${PN}-8.06.9-configure-clang16.patch +) + +src_prepare() { + sed -i \ + -e "s|ranlib|$(tc-getRANLIB)|" \ + frx/Makefile \ + || die + default +} + +src_configure() { + ./configure --use-findlib --verbose $(usex X "--tk-x11" "--tk-no-x11") || die "configure failed!" +} + +src_compile() { + emake -j1 + use ocamlopt && emake -j1 opt +} + +src_install() { + findlib_src_preinst + dodir /usr/bin + emake \ + INSTALLDIR="${D}/$(ocamlc -where)/labltk" \ + INSTALLBINDIR="${ED}/usr/bin/" \ + install + dodoc Changes README.mlTk +} diff --git a/dev-ml/labltk/labltk-8.06.12-r2.ebuild b/dev-ml/labltk/labltk-8.06.12-r2.ebuild new file mode 100644 index 000000000000..8842a41bed31 --- /dev/null +++ b/dev-ml/labltk/labltk-8.06.12-r2.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit findlib toolchain-funcs + +DESCRIPTION="OCaml interface to the Tcl/Tk GUI framework" +HOMEPAGE="https://garrigue.github.io/labltk/" +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" +IUSE="+ocamlopt X" + +RDEPEND="dev-lang/tk:= + >=dev-lang/ocaml-4.14:=[ocamlopt?,X(+)?]" +DEPEND="${RDEPEND} + dev-ml/findlib +" + +PATCHES=( + "${FILESDIR}/findlib.patch" + "${FILESDIR}"/${PN}-8.06.9-configure-clang16.patch + "${FILESDIR}"/${P}-shuffle.patch + "${FILESDIR}"/${P}-c2x.patch +) + +src_prepare() { + sed -i \ + -e "s|ranlib|$(tc-getRANLIB)|" \ + frx/Makefile \ + || die + default +} + +src_configure() { + ./configure --use-findlib --verbose $(usex X "--tk-x11" "--tk-no-x11") || die "configure failed!" +} + +src_compile() { + emake -j1 all + use ocamlopt && emake -j1 opt +} + +src_install() { + findlib_src_preinst + dodir /usr/bin + emake \ + INSTALLDIR="${D}/$(ocamlc -where)/labltk" \ + INSTALLBINDIR="${ED}/usr/bin/" \ + RANLIB=$(tc-getRANLIB) \ + install + dodoc Changes README.mlTk +} diff --git a/dev-ml/labltk/labltk-8.06.2.ebuild b/dev-ml/labltk/labltk-8.06.2.ebuild deleted file mode 100644 index 8181f906cb12..000000000000 --- a/dev-ml/labltk/labltk-8.06.2.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib eutils - -DESCRIPTION="OCaml interface to the Tcl/Tk GUI framework" -HOMEPAGE="https://forge.ocamlcore.org/projects/labltk/" -SRC_URI="https://forge.ocamlcore.org/frs/download.php/1628/${P}.tar.gz" - -LICENSE="QPL-1.0 LGPL-2" -SLOT="0/${PV}" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" -IUSE="+ocamlopt X" - -RDEPEND=">=dev-lang/tk-8.0.3:= - >=dev-lang/ocaml-4.04:=[ocamlopt?,X?]" -DEPEND="${RDEPEND} - >=dev-ml/findlib-1.5.5-r1" - -src_prepare() { - epatch "${FILESDIR}/findlib.patch" - has_version '>=dev-lang/ocaml-4.05.0_beta' && epatch "${FILESDIR}/ocaml405.patch" -} - -src_configure() { - ./configure --use-findlib --verbose $(use X || echo "--tk-no-x11") || die "configure failed!" -} - -src_compile() { - emake -j1 - use ocamlopt && emake -j1 opt -} - -src_install() { - findlib_src_preinst - dodir /usr/bin - emake \ - INSTALLDIR="${D}$(ocamlc -where)/labltk" \ - INSTALLBINDIR="${ED}/usr/bin/" \ - install - dodoc Changes README.mlTk -} diff --git a/dev-ml/labltk/labltk-8.06.3.ebuild b/dev-ml/labltk/labltk-8.06.3.ebuild deleted file mode 100644 index 7bf520571181..000000000000 --- a/dev-ml/labltk/labltk-8.06.3.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib eutils - -DESCRIPTION="OCaml interface to the Tcl/Tk GUI framework" -HOMEPAGE="https://forge.ocamlcore.org/projects/labltk/" -SRC_URI="https://forge.ocamlcore.org/frs/download.php/1701/${P}.tar.gz" - -LICENSE="QPL-1.0 LGPL-2" -SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" -IUSE="+ocamlopt X" - -RDEPEND=">=dev-lang/tk-8.0.3:= - >=dev-lang/ocaml-4.04:=[ocamlopt?,X?]" -DEPEND="${RDEPEND} - >=dev-ml/findlib-1.5.5-r1" - -src_prepare() { - epatch "${FILESDIR}/findlib.patch" -} - -src_configure() { - ./configure --use-findlib --verbose $(use X || echo "--tk-no-x11") || die "configure failed!" -} - -src_compile() { - emake -j1 - use ocamlopt && emake -j1 opt -} - -src_install() { - findlib_src_preinst - dodir /usr/bin - emake \ - INSTALLDIR="${D}$(ocamlc -where)/labltk" \ - INSTALLBINDIR="${ED}/usr/bin/" \ - install - dodoc Changes README.mlTk -} diff --git a/dev-ml/labltk/labltk-8.06.7-r1.ebuild b/dev-ml/labltk/labltk-8.06.7-r1.ebuild new file mode 100644 index 000000000000..58a37bddca04 --- /dev/null +++ b/dev-ml/labltk/labltk-8.06.7-r1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit findlib toolchain-funcs + +DESCRIPTION="OCaml interface to the Tcl/Tk GUI framework" +HOMEPAGE="https://garrigue.github.io/labltk/" +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" +IUSE="+ocamlopt X" + +RDEPEND=">=dev-lang/tk-8.0.3:= + <dev-lang/ocaml-4.10 + >=dev-lang/ocaml-4.08:=[ocamlopt?,X(+)?]" +DEPEND="${RDEPEND} + >=dev-ml/findlib-1.5.5-r1" + +PATCHES=( + "${FILESDIR}/findlib.patch" + "${FILESDIR}"/${P}-configure.patch + "${FILESDIR}"/${PN}-8.06.9-configure-clang16.patch +) + +src_prepare() { + sed -i \ + -e "s|ranlib|$(tc-getRANLIB)|" \ + frx/Makefile \ + || die + default +} + +src_configure() { + ./configure --use-findlib --verbose $(usex X "--tk-x11" "--tk-no-x11") || die "configure failed!" +} + +src_compile() { + emake -j1 + use ocamlopt && emake -j1 opt +} + +src_install() { + findlib_src_preinst + dodir /usr/bin + emake \ + INSTALLDIR="${D}/$(ocamlc -where)/labltk" \ + INSTALLBINDIR="${ED}/usr/bin/" \ + install + dodoc Changes README.mlTk +} diff --git a/dev-ml/labltk/labltk-8.06.9-r1.ebuild b/dev-ml/labltk/labltk-8.06.9-r1.ebuild new file mode 100644 index 000000000000..a0a9443fbf18 --- /dev/null +++ b/dev-ml/labltk/labltk-8.06.9-r1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit findlib toolchain-funcs + +DESCRIPTION="OCaml interface to the Tcl/Tk GUI framework" +HOMEPAGE="https://garrigue.github.io/labltk/" +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" +IUSE="+ocamlopt X" + +RDEPEND="dev-lang/tk:= + <dev-lang/ocaml-4.12 + >=dev-lang/ocaml-4.11:=[ocamlopt?,X(+)?]" +DEPEND="${RDEPEND} + dev-ml/findlib +" + +PATCHES=( + "${FILESDIR}/findlib.patch" + "${FILESDIR}"/${PN}-8.06.9-configure-clang16.patch +) + +src_prepare() { + sed -i \ + -e "s|ranlib|$(tc-getRANLIB)|" \ + frx/Makefile \ + || die + default +} + +src_configure() { + ./configure --use-findlib --verbose $(usex X "--tk-x11" "--tk-no-x11") || die "configure failed!" +} + +src_compile() { + emake -j1 + use ocamlopt && emake -j1 opt +} + +src_install() { + findlib_src_preinst + dodir /usr/bin + emake \ + INSTALLDIR="${D}/$(ocamlc -where)/labltk" \ + INSTALLBINDIR="${ED}/usr/bin/" \ + install + dodoc Changes README.mlTk +} diff --git a/dev-ml/labltk/metadata.xml b/dev-ml/labltk/metadata.xml index ffac4d7ebc01..57230eb446c9 100644 --- a/dev-ml/labltk/metadata.xml +++ b/dev-ml/labltk/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> -</maintainer> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">garrigue/labltk</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-ml/lambda-term/Manifest b/dev-ml/lambda-term/Manifest index e891dbcdbb27..dc1f77caaece 100644 --- a/dev-ml/lambda-term/Manifest +++ b/dev-ml/lambda-term/Manifest @@ -1 +1,3 @@ -DIST lambda-term-1.11.tar.gz 125906 BLAKE2B ddaee0a10d7136c4a168eb833953f439fb17eb6329d523d3bc9e7efe8954b73f55ce4c3fd853afb6bcb06557dc6749d5c16411d9400748ddbfa7a87ef28140ed SHA512 38654effe668d36766047f9e0ef74117c39a9f720322b92b9b8dcc5262c58de63fa36730c6a9c7d4921bf7bfd147753ce5d5a2da1c6df6171ee604b5bb224c27 +DIST lambda-term-3.1.0.tar.gz 144714 BLAKE2B a84af472834f33ce0a88b0e21f13db66e5b28576a959c0c2e173da045d4c408c183c9eb9664678de7574b840bd129284e406af3d7392ceb0b8be3e53973214bd SHA512 b1601749214747504a248392ec81ce20f4cd44bddbf14424e40725e6d506d925320fc7ef7f4ce58e876769d858c5e3882664e27ca33a9dc74d29a4a22ed0d705 +DIST lambda-term-3.3.1.tar.gz 142511 BLAKE2B 43238adc5f2e780903edec79d190ebbee27dc719ec166f693354f76148d115cbe35877f469662025805bbc8585bd2e8d59e1bd52c90bcc5c201b70863effaa27 SHA512 0cbb35717012d648175cb74677e857973e40f153f3d85adb28bcbcfdaabb7b0f35c4b0ce88cd6f2158cedfab74d16acc1b3b987161a71dfda24892f34393b3ed +DIST lambda-term-3.3.2.tar.gz 142574 BLAKE2B 81192f9fc7a8db83d08c7342a7914d4aa14ace14ee09d5a0387e5927502b02e018bc4c7537e82342221bd53a9e08ac24057820d5d1a056e243383fbe065f12b6 SHA512 78648768644058337e22c79cf1fbb1a36472b24f11b1dc0461fc38419be6ec01b02d8d0ac45fed0bc99f91ba4c0f19d3bda113e834e064bee973b734527b9766 diff --git a/dev-ml/lambda-term/files/lwtreact.patch b/dev-ml/lambda-term/files/lwtreact.patch deleted file mode 100644 index b613d17595f5..000000000000 --- a/dev-ml/lambda-term/files/lwtreact.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: lambda-term-1.11/src/jbuild -=================================================================== ---- lambda-term-1.11.orig/src/jbuild -+++ lambda-term-1.11/src/jbuild -@@ -26,7 +26,7 @@ let () = - ((name lambda_term) - (public_name lambda-term) - (wrapped false) -- (libraries (lwt lwt.unix lwt.react zed)) -+ (libraries (lwt lwt.unix lwt_react zed)) - (synopsis "Cross-platform library for terminal manipulation") - (c_names (lTerm_term_stubs lTerm_unix_stubs lTerm_windows_stubs)) - %s)) diff --git a/dev-ml/lambda-term/lambda-term-1.11.ebuild b/dev-ml/lambda-term/lambda-term-1.11.ebuild deleted file mode 100644 index 040947b2c279..000000000000 --- a/dev-ml/lambda-term/lambda-term-1.11.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit opam - -DESCRIPTION="A cross-platform library for manipulating the terminal" -HOMEPAGE="https://github.com/diml/lambda-term" -SRC_URI="https://github.com/diml/lambda-term/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -DEPEND=" - dev-ml/lwt_react:= - >=dev-ml/lwt-2.4.0:= - >=dev-ml/zed-1.2:= - >=dev-ml/react-1.2:= -" -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} - dev-ml/jbuilder -" - -PATCHES=( "${FILESDIR}/lwtreact.patch" ) diff --git a/dev-ml/lambda-term/lambda-term-3.1.0.ebuild b/dev-ml/lambda-term/lambda-term-3.1.0.ebuild new file mode 100644 index 000000000000..899ce30cf1b4 --- /dev/null +++ b/dev-ml/lambda-term/lambda-term-3.1.0.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Terminal manipulation library for OCaml" +HOMEPAGE="https://github.com/ocaml-community/lambda-term" +SRC_URI="https://github.com/ocaml-community/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="+ocamlopt" + +RDEPEND=" + dev-ml/camomile:= + >=dev-ml/lwt-5.4:= + dev-ml/lwt_log:= + dev-ml/mew_vi:= + dev-ml/react:= + dev-ml/zed:= +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/lambda-term/lambda-term-3.3.1-r1.ebuild b/dev-ml/lambda-term/lambda-term-3.3.1-r1.ebuild new file mode 100644 index 000000000000..159371dcc35d --- /dev/null +++ b/dev-ml/lambda-term/lambda-term-3.3.1-r1.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Terminal manipulation library for OCaml" +HOMEPAGE="https://github.com/ocaml-community/lambda-term" +SRC_URI="https://github.com/ocaml-community/${PN}/archive/${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="+ocamlopt" + +RDEPEND=" + >=dev-ml/lwt-5.4:= + dev-ml/logs:=[lwt] + dev-ml/lwt_log:= + dev-ml/mew_vi:= + dev-ml/react:= + dev-ml/zed:= +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/lambda-term/lambda-term-3.3.2.ebuild b/dev-ml/lambda-term/lambda-term-3.3.2.ebuild new file mode 100644 index 000000000000..159371dcc35d --- /dev/null +++ b/dev-ml/lambda-term/lambda-term-3.3.2.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Terminal manipulation library for OCaml" +HOMEPAGE="https://github.com/ocaml-community/lambda-term" +SRC_URI="https://github.com/ocaml-community/${PN}/archive/${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="+ocamlopt" + +RDEPEND=" + >=dev-ml/lwt-5.4:= + dev-ml/logs:=[lwt] + dev-ml/lwt_log:= + dev-ml/mew_vi:= + dev-ml/react:= + dev-ml/zed:= +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/lambda-term/metadata.xml b/dev-ml/lambda-term/metadata.xml index 4088a549d92b..eb3167fb2014 100644 --- a/dev-ml/lambda-term/metadata.xml +++ b/dev-ml/lambda-term/metadata.xml @@ -1,11 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> + <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> + <longdescription> + Lambda-term is a cross-platform library for manipulating the terminal. + It provides an abstraction for keys, mouse events, colors, as well as a set + of widgets to write curses-like applications. The main objective of + lambda-term is to provide a higher level functional interface to terminal + manipulation than, for example, ncurses, by providing a native OCaml + interface instead of bindings to a C library. Lambda-term integrates with + zed to provide text edition facilities in console applications. + </longdescription> <upstream> - <remote-id type="github">diml/lambda-term</remote-id> + <bugs-to>https://github.com/ocaml-community/lambda-term/issues/</bugs-to> + <remote-id type="github">ocaml-community/lambda-term</remote-id> </upstream> </pkgmetadata> diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest index eadabb58124d..84158a6c4973 100644 --- a/dev-ml/llvm-ocaml/Manifest +++ b/dev-ml/llvm-ocaml/Manifest @@ -1,5 +1,13 @@ -DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9 -DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a -DIST llvm-8.0.0.src.tar.xz 30503732 BLAKE2B d89bdeb0ec7d885e49cfe5ae025da84f00502d409710c0807a3cdd58dbd47c50cf6a635593569483150f7f2ecb0de0310bd6785cb7625219bf9f6224a0d68e1c SHA512 1602343b451b964f5d8c2d6b0654d89384c80d45883498c5f0e2f4196168dd4a1ed2a4dadb752076020243df42ffe46cb31d82ffc145d8e5874163cbb9686a1f -DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16 -DIST llvm-9.0.0.src.tar.xz 32994768 BLAKE2B 7f09bff9bcada95ab9c920c78aef92b57e665d9188bab39c734084ceb03a801c942fed48ea77fabeeb6110c648cb69363c659a6ce93ebf67dbba5c187219b13b SHA512 1bb3341e1d231559b948f1505b33c2e2e03989f9b8bbfef0e0cdaff5ac43f85574c9ec5ac53399b914f497d6899425d861411024e8d7e1d1a338c1c6951ac658 +DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52 +DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2 +DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db365965f1c00bfea6c2d653b3996bd2acef8a2b37e37f6fc8a9d2b65711ad72657e0ef52c42f733053cf65051e7822f27396c30406d SHA512 89a67ebfbbc764cc456e8825ecfa90707741f8835b1b2adffae0b227ab1fe5ca9cce75b0efaffc9ca8431cae528dc54fd838867a56a2b645344d9e82d19ab1b7 +DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447 +DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e0654111941649e15794179641806f18919f1dc68c41ca0cabd5693b5096d05dccc3a391cd20d34af1137bf8af92ed3117a1ce84d1b2 SHA512 6d85bf749e0d77553cc215cbfa61cec4ac4f4f652847f56f946b6a892a99a5ea40b6ab8b39a9708a035001f007986941ccf17e4635260a8b0c1fa59e78d41e30 +DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340 +DIST llvm-project-18.1.4.src.tar.xz 132054668 BLAKE2B 94bbad3b185fd07cbace4eff79aba80fbdd5e072739250e3927fe1848bcf3f8d355eb1f384e57306707eb702acc7ab01b732590735be7950221607664d04b0a6 SHA512 b1b214ae91f3705d8ea345547ad53f1e5d7d884c1eb6958bc41c14ac4b3e407771ccc2b693686ff103c8232c2c3942731d6db9a9cb4f735e6c6a0674739d0b29 +DIST llvm-project-18.1.4.src.tar.xz.sig 566 BLAKE2B b74fd219d7bcdf197b4e711cfbb25c40e9d8d2c7341de0215d8c31f330f396e9c166ff63513829cdc9cef349f08238f66a4dc949fa97958a7af496abae369eaa SHA512 4f456edf4fb454815acaef6855b1a0991f229810a32e9369af83388e37f0ef8964308e1e93bd6216024cdd67e86caaadc8d5794467857cc6fe561c9fa6ca7386 +DIST llvm-project-18.1.5.src.tar.xz 132061072 BLAKE2B bfdd987d5992a4d94ae8b14792df3be67a8e8fdf1daef9834cdaa2132df1b7ddb72ba0aabbb34b171a73d0f3b2b0f61e7160f0b278a67fd4850e3f501fd21531 SHA512 9e2f1e251b3754a24a0b39676d78c98692887c05c85cf0bee50fd44d9635290019930d4dabd1ff4ba3c9c1067e7e0e09aa1bbcd3d76687f919a1d44ba85eee20 +DIST llvm-project-18.1.5.src.tar.xz.sig 566 BLAKE2B ad935db71ec3b9fc885d696af440764a71fe7cafc5b3ca0b25a2963100d9cb3790392daebcac1341716c95a8da3c6243f5a8667fea1ed18b93fc8baa495414c9 SHA512 3cbca1059d940f3bd7bd72d68f2828039b66304980cc5f43769649e5494fc7d71117bf8aba5cc7f7a2ffca52f60ba30fadf3b28f984fd49ddb14300e30b45237 +DIST llvm-project-338561657685c1831a53563b1bc36ffc7470239e.tar.gz 209715501 BLAKE2B 49152479d4f2cae430e783784d0cfcc129134f5cc0bf12c72701cd15e59cb3e1be2f61385ba9baa93d1d1193e89374ac8877b909650c163b681d1fcd26732cdc SHA512 d34bbe82e85c5b9d493029ad7b46e802f06f7e7a8a48515d0043c58c3251271f8f3e1e11c47eb91bd3db2477f819d33b43ddebb276eb9601c5ad141e463c9682 +DIST llvm-project-76aa042dde6ba9ba57c680950f5818259ee02690.tar.gz 210235525 BLAKE2B fbbb8e70e0a08bde1fa2277746f692399fa15015b69693f5e8d3297abf02dfb7b36c535880f5c6924c870652dd3106936776d57c34b22234a5419f75b3561bb7 SHA512 9107551ceb2b28aa735006144b3344801ea861d7b49eae4881831af507314fb8da2bf5e8a3a407aeebd2eee01fbfad2ca90269d2331fe43cca5c2cc49dd257b7 +DIST llvm-project-a7ee81e8279e0bf6e05617a4a638e5f2f8e45022.tar.gz 210384692 BLAKE2B 28b85b08a42c173e1c3bf530483112b1629c7e6684a83a016fbe9f132774f7b864d793581873a6529defeabb4479ad9a3d7c025b781b2fa4952c239b6d567b11 SHA512 1d593818347452f96611a62fa3aa22ce4355a4ee5d5dcfcb54a286a1aa980e9531d5fb6cbee3b0ee5943c6d0f4e2ba2245e13262fe7859e5b114f9c5d5cf1417 diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-15.0.7.ebuild index 5fb5269eb058..9bb647c198de 100644 --- a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0.9999.ebuild +++ b/dev-ml/llvm-ocaml/llvm-ocaml-15.0.7.ebuild @@ -1,72 +1,55 @@ -# 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 -: ${CMAKE_MAKEFILE_GENERATOR:=ninja} -# (needed due to CMAKE_BUILD_TYPE != Gentoo) -CMAKE_MIN_VERSION=3.7.0-r1 -PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) - -inherit cmake-utils git-r3 llvm multiprocessing python-any-r1 +PYTHON_COMPAT=( python3_{10..11} ) +inherit cmake llvm llvm.org python-any-r1 DESCRIPTION="OCaml bindings for LLVM" HOMEPAGE="https://llvm.org/" -SRC_URI="" -EGIT_REPO_URI="https://git.llvm.org/git/llvm.git - https://github.com/llvm-mirror/llvm.git" - -# Keep in sync with sys-devel/llvm -ALL_LLVM_EXPERIMENTAL_TARGETS=( AVR Nios2 ) -ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 - NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore - "${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" ) -ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) -LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?} LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" SLOT="0/${PV}" -KEYWORDS="" -IUSE="debug test ${ALL_LLVM_TARGETS[*]}" -REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )" +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}:=[${LLVM_TARGET_USEDEPS// /,},debug?] - !sys-devel/llvm[ocaml(-)]" -DEPEND="${RDEPEND}" -# configparser-3.2 breaks the build (3.3 or none at all are fine) + ~sys-devel/llvm-${PV}:=[debug?] + !sys-devel/llvm[ocaml(-)] +" + +DEPEND=" + ${RDEPEND} +" BDEPEND=" + ${PYTHON_DEPS} dev-lang/perl dev-ml/findlib - test? ( dev-ml/ounit ) - !!<dev-python/configparser-3.3.0.2 - ${PYTHON_DEPS}" +" -# least intrusive of all -CMAKE_BUILD_TYPE=RelWithDebInfo +LLVM_COMPONENTS=( llvm cmake third-party ) +LLVM_USE_TARGETS=llvm +llvm.org_set_globals pkg_setup() { - LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup + LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup python-any-r1_pkg_setup } -src_prepare() { - # Python is needed to run tests using lit - python_setup - - cmake-utils_src_prepare -} - src_configure() { local libdir=$(get_libdir) local mycmakeargs=( -DLLVM_LIBDIR_SUFFIX=${libdir#lib} - -DBUILD_SHARED_LIBS=ON + -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="" @@ -77,13 +60,14 @@ src_configure() { -DLLVM_ENABLE_FFI=OFF -DLLVM_ENABLE_TERMINFO=OFF -DHAVE_HISTEDIT_H=NO - -DWITH_POLLY=OFF -DLLVM_ENABLE_ASSERTIONS=$(usex debug) -DLLVM_ENABLE_EH=ON -DLLVM_ENABLE_RTTI=ON -DLLVM_HOST_TRIPLE="${CHOST}" + -DPython3_EXECUTABLE="${PYTHON}" + # disable go bindings -DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND @@ -91,13 +75,13 @@ src_configure() { ) use test && mycmakeargs+=( - -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" + -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-utils_src_configure + cmake_src_configure local llvm_libdir=$(llvm-config --libdir) # an ugly hack; TODO: figure out a way to pass -L to ocaml... @@ -113,13 +97,13 @@ src_configure() { } src_compile() { - cmake-utils_src_compile ocaml_all + cmake_build ocaml_all } src_test() { # respect TMPDIR! local -x LIT_PRESERVES_TMP=1 - cmake-utils_src_make check-llvm-bindings-ocaml + cmake_build check-llvm-bindings-ocaml } src_install() { diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-9.0.0.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-16.0.6.ebuild index 44c293f604cc..045b66d0d543 100644 --- a/dev-ml/llvm-ocaml/llvm-ocaml-9.0.0.ebuild +++ b/dev-ml/llvm-ocaml/llvm-ocaml-16.0.6.ebuild @@ -1,98 +1,84 @@ -# 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 -: ${CMAKE_MAKEFILE_GENERATOR:=ninja} -# (needed due to CMAKE_BUILD_TYPE != Gentoo) -CMAKE_MIN_VERSION=3.7.0-r1 -PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) +PYTHON_COMPAT=( python3_{10..12} ) +inherit cmake llvm llvm.org python-any-r1 -inherit cmake-utils llvm multiprocessing python-any-r1 - -MY_P=llvm-${PV/_/}.src DESCRIPTION="OCaml bindings for LLVM" HOMEPAGE="https://llvm.org/" -SRC_URI="https://releases.llvm.org/${PV}/${MY_P}.tar.xz" -S=${WORKDIR}/${MY_P} - -# Keep in sync with sys-devel/llvm -ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 - NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore ) -ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) -LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?} LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" SLOT="0/${PV}" KEYWORDS="~amd64 ~arm ~x86" -IUSE="debug test ${ALL_LLVM_TARGETS[*]}" -REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )" +IUSE="debug test" RESTRICT="!test? ( test )" RDEPEND=" >=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= - ~sys-devel/llvm-${PV}:=[${LLVM_TARGET_USEDEPS// /,},debug?] - !sys-devel/llvm[ocaml(-)]" -DEPEND="${RDEPEND}" -# configparser-3.2 breaks the build (3.3 or none at all are fine) + ~sys-devel/llvm-${PV}:=[debug?] + !sys-devel/llvm[ocaml(-)] +" + +DEPEND=" + ${RDEPEND} +" BDEPEND=" + ${PYTHON_DEPS} dev-lang/perl dev-ml/findlib - test? ( dev-ml/ounit ) - !!<dev-python/configparser-3.3.0.2 - ${PYTHON_DEPS}" +" -# least intrusive of all -CMAKE_BUILD_TYPE=RelWithDebInfo +LLVM_COMPONENTS=( llvm cmake third-party ) +LLVM_USE_TARGETS=llvm +llvm.org_set_globals pkg_setup() { - LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup + LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup python-any-r1_pkg_setup } -src_prepare() { - # Python is needed to run tests using lit - python_setup - - cmake-utils_src_prepare -} - src_configure() { local libdir=$(get_libdir) local mycmakeargs=( -DLLVM_LIBDIR_SUFFIX=${libdir#lib} - -DBUILD_SHARED_LIBS=ON + -DBUILD_SHARED_LIBS=OFF + -DLLVM_BUILD_LLVM_DYLIB=ON + -DLLVM_LINK_LLVM_DYLIB=ON -DLLVM_OCAML_OUT_OF_TREE=ON - -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}" + + # 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 - -DWITH_POLLY=OFF -DLLVM_ENABLE_ASSERTIONS=$(usex debug) -DLLVM_ENABLE_EH=ON -DLLVM_ENABLE_RTTI=ON -DLLVM_HOST_TRIPLE="${CHOST}" - # disable go bindings - -DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND + -DPython3_EXECUTABLE="${PYTHON}" # TODO: ocamldoc ) use test && mycmakeargs+=( - -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" + -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-utils_src_configure + cmake_src_configure local llvm_libdir=$(llvm-config --libdir) # an ugly hack; TODO: figure out a way to pass -L to ocaml... @@ -108,13 +94,13 @@ src_configure() { } src_compile() { - cmake-utils_src_compile ocaml_all + cmake_build ocaml_all } src_test() { # respect TMPDIR! local -x LIT_PRESERVES_TMP=1 - cmake-utils_src_make check-llvm-bindings-ocaml + cmake_build check-llvm-bindings-ocaml } src_install() { diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-7.1.0.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-17.0.6.ebuild index 8973393dd2af..045b66d0d543 100644 --- a/dev-ml/llvm-ocaml/llvm-ocaml-7.1.0.ebuild +++ b/dev-ml/llvm-ocaml/llvm-ocaml-17.0.6.ebuild @@ -1,99 +1,84 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -: ${CMAKE_MAKEFILE_GENERATOR:=ninja} -# (needed due to CMAKE_BUILD_TYPE != Gentoo) -CMAKE_MIN_VERSION=3.7.0-r1 -PYTHON_COMPAT=( python2_7 ) +PYTHON_COMPAT=( python3_{10..12} ) +inherit cmake llvm llvm.org python-any-r1 -inherit cmake-utils llvm multiprocessing python-any-r1 - -MY_P=llvm-${PV/_/}.src DESCRIPTION="OCaml bindings for LLVM" HOMEPAGE="https://llvm.org/" -SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz" - -# Keep in sync with sys-devel/llvm -ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 - NVPTX PowerPC Sparc SystemZ X86 XCore ) -ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) -LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?} -LICENSE="UoI-NCSA" +LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" SLOT="0/${PV}" KEYWORDS="~amd64 ~arm ~x86" -IUSE="debug test ${ALL_LLVM_TARGETS[*]}" +IUSE="debug test" RESTRICT="!test? ( test )" RDEPEND=" >=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= - ~sys-devel/llvm-${PV}:=[${LLVM_TARGET_USEDEPS// /,},debug?] - !sys-devel/llvm[ocaml(-)]" -# configparser-3.2 breaks the build (3.3 or none at all are fine) -DEPEND="${RDEPEND} + ~sys-devel/llvm-${PV}:=[debug?] + !sys-devel/llvm[ocaml(-)] +" + +DEPEND=" + ${RDEPEND} +" +BDEPEND=" + ${PYTHON_DEPS} dev-lang/perl dev-ml/findlib - test? ( dev-ml/ounit ) - !!<dev-python/configparser-3.3.0.2 - ${PYTHON_DEPS}" - -REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )" - -S=${WORKDIR}/${MY_P} +" -# least intrusive of all -CMAKE_BUILD_TYPE=RelWithDebInfo +LLVM_COMPONENTS=( llvm cmake third-party ) +LLVM_USE_TARGETS=llvm +llvm.org_set_globals pkg_setup() { - LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup + LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup python-any-r1_pkg_setup } -src_prepare() { - # Python is needed to run tests using lit - python_setup - - cmake-utils_src_prepare -} - src_configure() { local libdir=$(get_libdir) local mycmakeargs=( -DLLVM_LIBDIR_SUFFIX=${libdir#lib} - -DBUILD_SHARED_LIBS=ON + -DBUILD_SHARED_LIBS=OFF + -DLLVM_BUILD_LLVM_DYLIB=ON + -DLLVM_LINK_LLVM_DYLIB=ON -DLLVM_OCAML_OUT_OF_TREE=ON - -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}" + + # 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 - -DWITH_POLLY=OFF -DLLVM_ENABLE_ASSERTIONS=$(usex debug) -DLLVM_ENABLE_EH=ON -DLLVM_ENABLE_RTTI=ON -DLLVM_HOST_TRIPLE="${CHOST}" - # disable go bindings - -DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND + -DPython3_EXECUTABLE="${PYTHON}" # TODO: ocamldoc ) use test && mycmakeargs+=( - -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" + -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-utils_src_configure + cmake_src_configure local llvm_libdir=$(llvm-config --libdir) # an ugly hack; TODO: figure out a way to pass -L to ocaml... @@ -109,13 +94,13 @@ src_configure() { } src_compile() { - cmake-utils_src_compile ocaml_all + cmake_build ocaml_all } src_test() { # respect TMPDIR! local -x LIT_PRESERVES_TMP=1 - cmake-utils_src_make check-llvm-bindings-ocaml + cmake_build check-llvm-bindings-ocaml } src_install() { diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-6.0.1.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-18.1.4.ebuild index 8973393dd2af..abe0ff931561 100644 --- a/dev-ml/llvm-ocaml/llvm-ocaml-6.0.1.ebuild +++ b/dev-ml/llvm-ocaml/llvm-ocaml-18.1.4.ebuild @@ -1,99 +1,81 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -: ${CMAKE_MAKEFILE_GENERATOR:=ninja} -# (needed due to CMAKE_BUILD_TYPE != Gentoo) -CMAKE_MIN_VERSION=3.7.0-r1 -PYTHON_COMPAT=( python2_7 ) +PYTHON_COMPAT=( python3_{10..12} ) +inherit cmake llvm.org llvm-utils python-any-r1 -inherit cmake-utils llvm multiprocessing python-any-r1 - -MY_P=llvm-${PV/_/}.src DESCRIPTION="OCaml bindings for LLVM" HOMEPAGE="https://llvm.org/" -SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz" - -# Keep in sync with sys-devel/llvm -ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 - NVPTX PowerPC Sparc SystemZ X86 XCore ) -ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) -LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?} -LICENSE="UoI-NCSA" +LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" SLOT="0/${PV}" KEYWORDS="~amd64 ~arm ~x86" -IUSE="debug test ${ALL_LLVM_TARGETS[*]}" +IUSE="debug test" RESTRICT="!test? ( test )" RDEPEND=" >=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= - ~sys-devel/llvm-${PV}:=[${LLVM_TARGET_USEDEPS// /,},debug?] - !sys-devel/llvm[ocaml(-)]" -# configparser-3.2 breaks the build (3.3 or none at all are fine) -DEPEND="${RDEPEND} + ~sys-devel/llvm-${PV}:=[debug?] + !sys-devel/llvm[ocaml(-)] +" + +DEPEND=" + ${RDEPEND} +" +BDEPEND=" + ${PYTHON_DEPS} dev-lang/perl dev-ml/findlib - test? ( dev-ml/ounit ) - !!<dev-python/configparser-3.3.0.2 - ${PYTHON_DEPS}" - -REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )" +" -S=${WORKDIR}/${MY_P} - -# least intrusive of all -CMAKE_BUILD_TYPE=RelWithDebInfo - -pkg_setup() { - LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup - python-any-r1_pkg_setup -} - -src_prepare() { - # Python is needed to run tests using lit - python_setup - - cmake-utils_src_prepare -} +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=ON + -DBUILD_SHARED_LIBS=OFF + -DLLVM_BUILD_LLVM_DYLIB=ON + -DLLVM_LINK_LLVM_DYLIB=ON -DLLVM_OCAML_OUT_OF_TREE=ON - -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}" + + # 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 - -DWITH_POLLY=OFF -DLLVM_ENABLE_ASSERTIONS=$(usex debug) -DLLVM_ENABLE_EH=ON -DLLVM_ENABLE_RTTI=ON -DLLVM_HOST_TRIPLE="${CHOST}" - # disable go bindings - -DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND + -DPython3_EXECUTABLE="${PYTHON}" # TODO: ocamldoc ) use test && mycmakeargs+=( - -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" + -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-utils_src_configure + cmake_src_configure local llvm_libdir=$(llvm-config --libdir) # an ugly hack; TODO: figure out a way to pass -L to ocaml... @@ -109,13 +91,13 @@ src_configure() { } src_compile() { - cmake-utils_src_compile ocaml_all + cmake_build ocaml_all } src_test() { # respect TMPDIR! local -x LIT_PRESERVES_TMP=1 - cmake-utils_src_make check-llvm-bindings-ocaml + cmake_build check-llvm-bindings-ocaml } src_install() { diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-18.1.5.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-18.1.5.ebuild new file mode 100644 index 000000000000..abe0ff931561 --- /dev/null +++ b/dev-ml/llvm-ocaml/llvm-ocaml-18.1.5.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..12} ) +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-9.0.0.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-19.0.0.9999.ebuild index ea47038cb443..879c30db0807 100644 --- a/dev-ml/llvm-ocaml/llvm-ocaml-9.0.0.9999.ebuild +++ b/dev-ml/llvm-ocaml/llvm-ocaml-19.0.0.9999.ebuild @@ -1,99 +1,80 @@ -# 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 -: ${CMAKE_MAKEFILE_GENERATOR:=ninja} -# (needed due to CMAKE_BUILD_TYPE != Gentoo) -CMAKE_MIN_VERSION=3.7.0-r1 -PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) - -inherit cmake-utils git-r3 llvm multiprocessing python-any-r1 +PYTHON_COMPAT=( python3_{10..12} ) +inherit cmake llvm.org llvm-utils python-any-r1 DESCRIPTION="OCaml bindings for LLVM" HOMEPAGE="https://llvm.org/" -SRC_URI="" -EGIT_REPO_URI="https://git.llvm.org/git/llvm.git - https://github.com/llvm-mirror/llvm.git" -EGIT_BRANCH="release_90" - -# Keep in sync with sys-devel/llvm -ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 - NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore ) -ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) -LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?} LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" SLOT="0/${PV}" -KEYWORDS="" -IUSE="debug test ${ALL_LLVM_TARGETS[*]}" -REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )" +IUSE="+debug test" RESTRICT="!test? ( test )" RDEPEND=" >=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= - ~sys-devel/llvm-${PV}:=[${LLVM_TARGET_USEDEPS// /,},debug?] - !sys-devel/llvm[ocaml(-)]" -DEPEND="${RDEPEND}" -# configparser-3.2 breaks the build (3.3 or none at all are fine) + ~sys-devel/llvm-${PV}:=[debug?] + !sys-devel/llvm[ocaml(-)] +" + +DEPEND=" + ${RDEPEND} +" BDEPEND=" + ${PYTHON_DEPS} dev-lang/perl dev-ml/findlib - test? ( dev-ml/ounit ) - !!<dev-python/configparser-3.3.0.2 - ${PYTHON_DEPS}" - -# least intrusive of all -CMAKE_BUILD_TYPE=RelWithDebInfo - -pkg_setup() { - LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup - python-any-r1_pkg_setup -} - -src_prepare() { - # Python is needed to run tests using lit - python_setup +" - cmake-utils_src_prepare -} +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=ON + -DBUILD_SHARED_LIBS=OFF + -DLLVM_BUILD_LLVM_DYLIB=ON + -DLLVM_LINK_LLVM_DYLIB=ON -DLLVM_OCAML_OUT_OF_TREE=ON - -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}" + + # 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 - -DWITH_POLLY=OFF -DLLVM_ENABLE_ASSERTIONS=$(usex debug) -DLLVM_ENABLE_EH=ON -DLLVM_ENABLE_RTTI=ON -DLLVM_HOST_TRIPLE="${CHOST}" - # disable go bindings - -DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND + -DPython3_EXECUTABLE="${PYTHON}" # TODO: ocamldoc ) use test && mycmakeargs+=( - -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" + -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-utils_src_configure + cmake_src_configure local llvm_libdir=$(llvm-config --libdir) # an ugly hack; TODO: figure out a way to pass -L to ocaml... @@ -109,13 +90,13 @@ src_configure() { } src_compile() { - cmake-utils_src_compile ocaml_all + cmake_build ocaml_all } src_test() { # respect TMPDIR! local -x LIT_PRESERVES_TMP=1 - cmake-utils_src_make check-llvm-bindings-ocaml + cmake_build check-llvm-bindings-ocaml } src_install() { diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-19.0.0_pre20240427.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-19.0.0_pre20240427.ebuild new file mode 100644 index 000000000000..879c30db0807 --- /dev/null +++ b/dev-ml/llvm-ocaml/llvm-ocaml-19.0.0_pre20240427.ebuild @@ -0,0 +1,107 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +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}" +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.0.0_pre20240504.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-19.0.0_pre20240504.ebuild new file mode 100644 index 000000000000..879c30db0807 --- /dev/null +++ b/dev-ml/llvm-ocaml/llvm-ocaml-19.0.0_pre20240504.ebuild @@ -0,0 +1,107 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +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}" +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.0.0_pre20240509.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-19.0.0_pre20240509.ebuild new file mode 100644 index 000000000000..879c30db0807 --- /dev/null +++ b/dev-ml/llvm-ocaml/llvm-ocaml-19.0.0_pre20240509.ebuild @@ -0,0 +1,107 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +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}" +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-8.0.0.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-8.0.0.ebuild deleted file mode 100644 index 1604aeb371f4..000000000000 --- a/dev-ml/llvm-ocaml/llvm-ocaml-8.0.0.ebuild +++ /dev/null @@ -1,126 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -: ${CMAKE_MAKEFILE_GENERATOR:=ninja} -# (needed due to CMAKE_BUILD_TYPE != Gentoo) -CMAKE_MIN_VERSION=3.7.0-r1 -PYTHON_COMPAT=( python2_7 ) - -inherit cmake-utils llvm multiprocessing python-any-r1 - -MY_P=llvm-${PV/_/}.src -DESCRIPTION="OCaml bindings for LLVM" -HOMEPAGE="https://llvm.org/" -SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz" - -# Keep in sync with sys-devel/llvm -ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 - NVPTX PowerPC Sparc SystemZ WebAssembly X86 XCore ) -ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) -LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?} - -LICENSE="UoI-NCSA" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="debug test ${ALL_LLVM_TARGETS[*]}" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-lang/ocaml-4.00.0:0= - dev-ml/ocaml-ctypes:= - ~sys-devel/llvm-${PV}:=[${LLVM_TARGET_USEDEPS// /,},debug?] - !sys-devel/llvm[ocaml(-)]" -# configparser-3.2 breaks the build (3.3 or none at all are fine) -DEPEND="${RDEPEND} - dev-lang/perl - dev-ml/findlib - test? ( dev-ml/ounit ) - !!<dev-python/configparser-3.3.0.2 - ${PYTHON_DEPS}" - -REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )" - -S=${WORKDIR}/${MY_P} - -# least intrusive of all -CMAKE_BUILD_TYPE=RelWithDebInfo - -pkg_setup() { - LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup - python-any-r1_pkg_setup -} - -src_prepare() { - # Python is needed to run tests using lit - python_setup - - cmake-utils_src_prepare -} - -src_configure() { - local libdir=$(get_libdir) - local mycmakeargs=( - -DLLVM_LIBDIR_SUFFIX=${libdir#lib} - - -DBUILD_SHARED_LIBS=ON - -DLLVM_OCAML_OUT_OF_TREE=ON - -DLLVM_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 - -DWITH_POLLY=OFF - -DLLVM_ENABLE_ASSERTIONS=$(usex debug) - -DLLVM_ENABLE_EH=ON - -DLLVM_ENABLE_RTTI=ON - - -DLLVM_HOST_TRIPLE="${CHOST}" - - # disable go bindings - -DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND - - # TODO: ocamldoc - ) - - use test && mycmakeargs+=( - -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" - ) - - # 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-utils_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-utils_src_compile ocaml_all -} - -src_test() { - # respect TMPDIR! - local -x LIT_PRESERVES_TMP=1 - cmake-utils_src_make 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-8.0.1.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-8.0.1.ebuild deleted file mode 100644 index 154f485d0514..000000000000 --- a/dev-ml/llvm-ocaml/llvm-ocaml-8.0.1.ebuild +++ /dev/null @@ -1,126 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -: ${CMAKE_MAKEFILE_GENERATOR:=ninja} -# (needed due to CMAKE_BUILD_TYPE != Gentoo) -CMAKE_MIN_VERSION=3.7.0-r1 -PYTHON_COMPAT=( python2_7 ) - -inherit cmake-utils llvm multiprocessing python-any-r1 - -MY_P=llvm-${PV/_/}.src -DESCRIPTION="OCaml bindings for LLVM" -HOMEPAGE="https://llvm.org/" -SRC_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${MY_P}.tar.xz" - -# Keep in sync with sys-devel/llvm -ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 - NVPTX PowerPC Sparc SystemZ WebAssembly X86 XCore ) -ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) -LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?} - -LICENSE="UoI-NCSA" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="debug test ${ALL_LLVM_TARGETS[*]}" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-lang/ocaml-4.00.0:0= - dev-ml/ocaml-ctypes:= - ~sys-devel/llvm-${PV}:=[${LLVM_TARGET_USEDEPS// /,},debug?] - !sys-devel/llvm[ocaml(-)]" -# configparser-3.2 breaks the build (3.3 or none at all are fine) -DEPEND="${RDEPEND} - dev-lang/perl - dev-ml/findlib - test? ( dev-ml/ounit ) - !!<dev-python/configparser-3.3.0.2 - ${PYTHON_DEPS}" - -REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )" - -S=${WORKDIR}/${MY_P} - -# least intrusive of all -CMAKE_BUILD_TYPE=RelWithDebInfo - -pkg_setup() { - LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup - python-any-r1_pkg_setup -} - -src_prepare() { - # Python is needed to run tests using lit - python_setup - - cmake-utils_src_prepare -} - -src_configure() { - local libdir=$(get_libdir) - local mycmakeargs=( - -DLLVM_LIBDIR_SUFFIX=${libdir#lib} - - -DBUILD_SHARED_LIBS=ON - -DLLVM_OCAML_OUT_OF_TREE=ON - -DLLVM_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 - -DWITH_POLLY=OFF - -DLLVM_ENABLE_ASSERTIONS=$(usex debug) - -DLLVM_ENABLE_EH=ON - -DLLVM_ENABLE_RTTI=ON - - -DLLVM_HOST_TRIPLE="${CHOST}" - - # disable go bindings - -DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND - - # TODO: ocamldoc - ) - - use test && mycmakeargs+=( - -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" - ) - - # 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-utils_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-utils_src_compile ocaml_all -} - -src_test() { - # respect TMPDIR! - local -x LIT_PRESERVES_TMP=1 - cmake-utils_src_make 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/metadata.xml b/dev-ml/llvm-ocaml/metadata.xml index 89c4bdb96049..072910296ca3 100644 --- a/dev-ml/llvm-ocaml/metadata.xml +++ b/dev-ml/llvm-ocaml/metadata.xml @@ -1,7 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>llvm@gentoo.org</email> </maintainer> + <upstream> + <remote-id type="github">llvm/llvm-project</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-ml/logs/Manifest b/dev-ml/logs/Manifest index 136aad2e16fb..bc580c5435c6 100644 --- a/dev-ml/logs/Manifest +++ b/dev-ml/logs/Manifest @@ -1 +1 @@ -DIST logs-0.6.2.tbz 18558 BLAKE2B 824bad0b568c3cc08343cb99eab3848d6e8f7deca548599caf12a05f5980e5ecf78978480e5fd95e938ca4b06fb94cee8b4ecf241f4a0238c3d3851c4be8c9f5 SHA512 a669e373652bac6789626ad1d58e414c6d156c646bf0706c9d55b04151850113d45a5c28077707514d1a27d46fcc0f90b39b8652ce7a3980f79675e9874db8b4 +DIST logs-0.7.0.tbz 18458 BLAKE2B 091d1778166af0b67e17e932a775a73e31e5d167b94b1b378063a7112c21bf1ac935c7e51fe29bcc0121cd5e60ea46ed3c7381f4db5df400b463feedfbe89663 SHA512 657f66eeaf5788947a3ff4b2a179f7e192ad4ce086fc8968286066d4b83af476523b3befce50ee58abf2d9b8c8dc65573ba8ed62f9c5e7933db29a7fb769646a diff --git a/dev-ml/logs/logs-0.6.2.ebuild b/dev-ml/logs/logs-0.7.0-r1.ebuild index 65f024a9d4b1..7e84cf5b1c70 100644 --- a/dev-ml/logs/logs-0.6.2.ebuild +++ b/dev-ml/logs/logs-0.7.0-r1.ebuild @@ -1,42 +1,55 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=7 inherit findlib DESCRIPTION="Logging infrastructure for OCaml" -HOMEPAGE="http://erratique.ch/software/logs https://github.com/dbuenzli/logs" -SRC_URI="http://erratique.ch/software/logs/releases/${P}.tbz" +HOMEPAGE="https://erratique.ch/software/logs https://github.com/dbuenzli/logs" +SRC_URI="https://erratique.ch/software/logs/releases/${P}.tbz" LICENSE="ISC" SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="javascript +fmt cli +lwt test" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+fmt cli +lwt test" +RESTRICT="!test? ( test )" RDEPEND=" dev-ml/result:=[ocamlopt] dev-lang/ocaml:=[ocamlopt] - javascript? ( dev-ml/js_of_ocaml:= ) fmt? ( dev-ml/fmt:= ) cli? ( dev-ml/cmdliner:=[ocamlopt] ) lwt? ( dev-ml/lwt:= ) " -DEPEND="${RDEPEND} - dev-ml/opam - dev-ml/topkg - dev-ml/ocamlbuild +DEPEND="${RDEPEND}" +BDEPEND=" dev-ml/findlib + dev-ml/ocamlbuild + dev-ml/opam-installer + dev-ml/topkg test? ( dev-ml/mtime ) " +src_prepare() { + default + sed -i \ + -e "/test\/test_fmt/d" \ + -e "/test\/test_formatter/d" \ + -e "/test\/tool/d" \ + -e "/test\/test_lwt/d" \ + pkg/pkg.ml \ + || die +} + src_compile() { ocaml pkg/pkg.ml build \ - --with-js_of_ocaml $(usex javascript true false) \ + --with-js_of_ocaml false \ --with-fmt $(usex fmt true false) \ --with-cmdliner $(usex cli true false) \ - --with-lwt $(usex fmt true false) \ + --with-lwt $(usex lwt true false) \ --tests $(usex test true false) \ + --with-base-threads true \ || die } @@ -50,5 +63,6 @@ src_install() { --libdir="${D}/$(ocamlc -where)" \ --docdir="${ED}/usr/share/doc/${PF}" \ ${PN}.install || die - dodoc CHANGES.md README.md + + einstalldocs } diff --git a/dev-ml/logs/metadata.xml b/dev-ml/logs/metadata.xml index 181c271e3665..42a0d1c20433 100644 --- a/dev-ml/logs/metadata.xml +++ b/dev-ml/logs/metadata.xml @@ -1,9 +1,9 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <use> <flag name="cli">Enables the Logs_cli library that provides command line support for controlling Logs.</flag> diff --git a/dev-ml/luv/Manifest b/dev-ml/luv/Manifest new file mode 100644 index 000000000000..4e50b015b4b7 --- /dev/null +++ b/dev-ml/luv/Manifest @@ -0,0 +1,3 @@ +DIST luv-0.5.10.tar.gz 805333 BLAKE2B 23edd2bc870a2886e560d330d9a20b205a77ea7bc8ed631e00e43819474eeb75246b407113b59ed9c5f74462ad5f721338ac5a157a1fe0e443abf9ff88771089 SHA512 c50a0def366944b4ef6038503ecefe75d8e45f542311198531f01a355675c08b00370480141b455616429a883c3232d34628e6a67846db5864a1b0eabfe6311f +DIST luv-0.5.11.tar.gz 809549 BLAKE2B 932bf48cb2d9ca32777d3c3d7457db5f4fb9dbfd51a8efbdf9282a9ebd941c53c56d7c17cf5e502c0e742dea1d1d76623d4adad32476fb36a0c08efded331f98 SHA512 8d1d7842583b02b906d89fe14bda5a66809d8ef7185efbe95e0fe7df619b795ad89fcbf16bfe1c3e92cef8721fe3d4e6192cabe215f3fe13b33de7335783e5f3 +DIST luv-0.5.12.tar.gz 817528 BLAKE2B b61cea1bc3446a4c52a80712f430e40007d260e59562f1add7518bb03c51689df76e9c6240fc4dba230bf19459980d2acda4f6710f9895c7f4bd5617a1f2ec38 SHA512 c5213914a43e83ba879b068aa59d5bf0d86f36bd880a5adee45d301d41e7371954e426f50338deda3f0e5c66104c789d3dbc666ebabbe340ba0b76c561e909e1 diff --git a/dev-ml/luv/luv-0.5.10-r3.ebuild b/dev-ml/luv/luv-0.5.10-r3.ebuild new file mode 100644 index 000000000000..bab7576ca5ce --- /dev/null +++ b/dev-ml/luv/luv-0.5.10-r3.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Binding to libuv: cross-platform asynchronous I/O" +HOMEPAGE="https://github.com/aantron/luv" +SRC_URI="https://github.com/aantron/${PN}/releases/download/${PV}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + <=dev-lang/ocaml-4.13:=[ocamlopt?] + dev-libs/libuv:= + dev-ml/ocaml-ctypes:=[ocamlopt?] + dev-ml/result:=[ocamlopt?] +" +DEPEND="${RDEPEND}" +BDEPEND="sys-devel/gnuconfig + test? ( dev-ml/alcotest[ocamlopt?] )" + +src_prepare() { + default + + cp "${BROOT}"/usr/share/gnuconfig/config.{guess,sub} src/c/vendor/configure/ || die +} diff --git a/dev-ml/luv/luv-0.5.11-r2.ebuild b/dev-ml/luv/luv-0.5.11-r2.ebuild new file mode 100644 index 000000000000..fbf41308b054 --- /dev/null +++ b/dev-ml/luv/luv-0.5.11-r2.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Binding to libuv: cross-platform asynchronous I/O" +HOMEPAGE="https://github.com/aantron/luv" +SRC_URI="https://github.com/aantron/${PN}/releases/download/${PV}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-lang/ocaml:=[ocamlopt?] + dev-libs/libuv:= + dev-ml/ocaml-ctypes:=[ocamlopt?] + dev-ml/result:=[ocamlopt?] + dev-ml/integers:= +" +DEPEND="${RDEPEND}" +BDEPEND="sys-devel/gnuconfig + test? ( dev-ml/alcotest[ocamlopt?] )" + +src_prepare() { + default + + cp "${BROOT}"/usr/share/gnuconfig/config.{guess,sub} src/c/vendor/configure/ || die +} + +src_compile() { + LUV_USE_SYSTEM_LIBUV=yes dune_src_compile +} diff --git a/dev-ml/luv/luv-0.5.12.ebuild b/dev-ml/luv/luv-0.5.12.ebuild new file mode 100644 index 000000000000..e200e03cd337 --- /dev/null +++ b/dev-ml/luv/luv-0.5.12.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Binding to libuv: cross-platform asynchronous I/O" +HOMEPAGE="https://github.com/aantron/luv" + +if [[ ${PV} == *9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/aantron/${PN}.git" +else + SRC_URI="https://github.com/aantron/${PN}/releases/download/${PV}/${P}.tar.gz" + KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +fi + +LICENSE="MIT" +SLOT="0/${PV}" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-lang/ocaml:=[ocamlopt?] + dev-libs/libuv:= + dev-ml/ocaml-ctypes:=[ocamlopt?] + dev-ml/result:=[ocamlopt?] + dev-ml/integers:= +" +DEPEND="${RDEPEND}" +BDEPEND=" + sys-devel/gnuconfig + test? ( dev-ml/alcotest[ocamlopt?] ) +" + +src_prepare() { + default + + cp "${BROOT}"/usr/share/gnuconfig/config.{guess,sub} src/c/vendor/configure/ || die +} + +src_compile() { + LUV_USE_SYSTEM_LIBUV=yes dune_src_compile +} diff --git a/dev-ml/luv/metadata.xml b/dev-ml/luv/metadata.xml new file mode 100644 index 000000000000..60a30bc851c9 --- /dev/null +++ b/dev-ml/luv/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">aantron/luv</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/lwt/Manifest b/dev-ml/lwt/Manifest index b139eb1dc0aa..e431a404eeae 100644 --- a/dev-ml/lwt/Manifest +++ b/dev-ml/lwt/Manifest @@ -1,2 +1,4 @@ -DIST lwt-3.0.0.tar.gz 285864 BLAKE2B d14f8f8a9e71a61c57bd7c208575849667dab4a4770b56a0d94e93024b22be9b7d88d10c0fa24eb8060b67c75e72c2c8bbfa0362f3aa815c76c93575225ce056 SHA512 270a6dc2fc58950380eecf72767782c72a5d72226f4af0e9a4f9b0e70b788eeb1d2727348ab8da4411ee59374a19524a6a793b14a26fe7051d51f987ef0e42b8 -DIST lwt-3.1.0.tar.gz 285309 BLAKE2B ffc3a416491d4c7b7e7c0da67b48d9eeb5b7fa50e3637d4f0cfcd1689b75626b48c8dd6d91e87c93022047809a3774683c41ce620e07ee4d3e1409185e7f8d16 SHA512 0b2269e53f2e8a57e1ffd6f237c6b22de39a3b6b0d57276c7cb9371392aabc9fb6364b2617a6408ed0049ed64f71de0c540209cf83ce43899fd025295342eb0d +DIST lwt-5.3.0.tar.gz 298152 BLAKE2B a39494bf98fcca07bf4601a742f4bfdc1ea2a67e2babbab650c41d2df58296a859520509ddc080af9c4d55be76439b401174720765fb942586d7c866f80cc538 SHA512 9922c19944595b0c07da8e1bbdecb2cc7c5a7edcdc2224215efb819d9c735da8986388a2446bd0762e28533f5d9d386970f07a4f1b0d14255c6743f3a1d16cb6 +DIST lwt-5.4.2.tar.gz 304541 BLAKE2B d474b20538af382c6f64072da2caa25e285f431c9b161c9796a44d1c84475f72e50d81baccb22ae908f82594c9dcaac6a874f54fe6332de2550128774d1280fc SHA512 9f46fb2e56dc7bd57a12d5ab4dc68719947a1462f336087a95e991d087bb9b5b8dee2592d0f7d35abc507d9a641dd221c44c949c81d00e26c673a067d94ba3f4 +DIST lwt-5.6.1.tar.gz 316067 BLAKE2B a9cf6bc2b57a130a5df8aa745987f9b8516adf0fce040d50d3bfbd6d9f801917ca37d050eb7fd7a210c5b0ae5e5726dd21fc675c2e8ee8670d0475204dbcc3aa SHA512 698875bd3bfcd5baa47eb48e412f442d289f9972421321541860ebe110b9af1949c3fbc253768495726ec547fe4ba25483cd97ff39bc668496fba95b2ed9edd8 +DIST lwt-5.7.0.tar.gz 313632 BLAKE2B e1b401c70b7722b266085c0493ab4e081aeb58cdf0e3569f677ee3b66edb1b4dda9afd115143315562f301a80bf8efbb09ced3f09f641adcac01fe44b3670cdc SHA512 42e629920783428673b99c9d7a639237c9e6b35079b5d907bc67e7ea506acf9edadc48cec580bdcfd2410ed9412bf5e6bcc8b09de2fa7d35ce1490973d05ddd1 diff --git a/dev-ml/lwt/files/lwt-5.3.0-ocaml-4.12.patch b/dev-ml/lwt/files/lwt-5.3.0-ocaml-4.12.patch new file mode 100644 index 000000000000..048e28d1d6bc --- /dev/null +++ b/dev-ml/lwt/files/lwt-5.3.0-ocaml-4.12.patch @@ -0,0 +1,24 @@ +--- a/src/unix/lwt_unix.cppo.ml 2021-10-01 20:35:45.285987395 +0200 ++++ b/src/unix/lwt_unix.cppo.ml 2021-10-01 20:36:19.570493202 +0200 +@@ -1819,6 +1819,9 @@ + | SO_ACCEPTCONN + | TCP_NODELAY + | IPV6_ONLY ++#if OCAML_VERSION >= (4, 12, 0) ++ | SO_REUSEPORT ++#endif + + type socket_int_option = + Unix.socket_int_option = +--- a/src/unix/lwt_unix.cppo.mli 2021-10-01 20:33:57.558539065 +0200 ++++ b/src/unix/lwt_unix.cppo.mli 2021-10-01 20:35:30.393202008 +0200 +@@ -1008,6 +1008,9 @@ + | SO_ACCEPTCONN + | TCP_NODELAY + | IPV6_ONLY ++#if OCAML_VERSION >= (4, 12, 0) ++ | SO_REUSEPORT ++#endif + + type socket_int_option = + Unix.socket_int_option = diff --git a/dev-ml/lwt/files/lwt-5.3.0-ppxlib-0.18.0.patch b/dev-ml/lwt/files/lwt-5.3.0-ppxlib-0.18.0.patch new file mode 100644 index 000000000000..0bda140294a0 --- /dev/null +++ b/dev-ml/lwt/files/lwt-5.3.0-ppxlib-0.18.0.patch @@ -0,0 +1,401 @@ +--- lwt-5.3.0-orig/lwt_ppx.opam 2020-04-23 16:32:55.000000000 +1000 ++++ lwt-5.3.0/lwt_ppx.opam 2020-10-12 22:12:12.863159266 +1100 +@@ -20,8 +20,7 @@ + "dune" {>= "1.8.0"} + "lwt" + "ocaml" {>= "4.02.0"} +- "ocaml-migrate-parsetree" {>= "1.5.0"} +- "ppx_tools_versioned" {>= "5.3.0"} ++ "ppxlib" {>= "0.16.0"} + ] + + build: [ +--- lwt-5.3.0-orig/src/ppx/dune 2020-04-23 16:32:55.000000000 +1000 ++++ lwt-5.3.0/src/ppx/dune 2020-10-12 22:11:33.844038953 +1100 +@@ -13,10 +13,10 @@ + (public_name lwt_ppx) + (synopsis "Lwt PPX syntax extension") + (modules ppx_lwt) +- (libraries compiler-libs.common ocaml-migrate-parsetree ppx_tools_versioned) ++ (libraries compiler-libs.common ppxlib) + (ppx_runtime_libraries lwt) + (kind ppx_rewriter) +- (preprocess (pps ppx_tools_versioned.metaquot_410 |} ^ bisect_ppx ^ {|)) ++ (preprocess (pps ppxlib.metaquot|} ^ bisect_ppx ^ {|)) + (flags (:standard -w +A-4))) + + |} +--- lwt-5.3.0-orig/src/ppx/ppx_lwt.ml 2020-04-23 16:32:55.000000000 +1000 ++++ lwt-5.3.0/src/ppx/ppx_lwt.ml 2020-10-12 22:10:11.298784433 +1100 +@@ -1,16 +1,11 @@ +-open! Migrate_parsetree +-open! OCaml_410.Ast +-open Ast_mapper ++open! Ppxlib ++open Ast_builder.Default + open! Ast_helper +-open Asttypes +-open Parsetree +- +-open Ast_convenience_410 + + (** {2 Convenient stuff} *) + +-let with_loc f {txt ; loc = _loc} = +- (f txt) [@metaloc _loc] ++let with_loc f {txt ; loc } = ++ f ~loc txt + + (** Test if a case is a catchall. *) + let is_catchall case = +@@ -27,7 +22,7 @@ + List.exists is_catchall cases + in + if not has_wildcard +- then cases @ [Exp.case [%pat? exn] [%expr Lwt.fail exn]] [@metaloc Location.none] ++ then cases @ (let loc = Location.none in [Exp.case [%pat? exn] [%expr Lwt.fail exn]]) + else cases + + (** {3 Internal names} *) +@@ -73,34 +68,33 @@ + evar ~loc:binding.pvb_expr.pexp_loc (gen_name i) + in + let fun_ = +- [%expr (fun [%p binding.pvb_pat] -> [%e aux (i+1) t])] [@metaloc e_loc] ++ let loc = e_loc in ++ [%expr (fun [%p binding.pvb_pat] -> [%e aux (i+1) t])] + in + let new_exp = +- [%expr +- let module Reraise = struct external reraise : exn -> 'a = "%reraise" end in +- Lwt.backtrace_bind +- (fun exn -> try Reraise.reraise exn with exn -> exn) +- [%e name] +- [%e fun_] +- ] [@metaloc e_loc] ++ let loc = e_loc in ++ [%expr ++ let module Reraise = struct external reraise : exn -> 'a = "%reraise" end in ++ Lwt.backtrace_bind ++ (fun exn -> try Reraise.reraise exn with exn -> exn) ++ [%e name] ++ [%e fun_] ++ ] + in + { new_exp with pexp_attributes = binding.pvb_attributes } + in aux 0 l + +-(* Note: instances of [@metaloc !default_loc] below are workarounds for +- https://github.com/ocaml-ppx/ppx_tools_versioned/issues/21. *) +- + let lwt_sequence mapper ~exp ~lhs ~rhs ~ext_loc = +- let pat= [%pat? ()][@metaloc ext_loc] in +- let lhs, rhs = mapper.expr mapper lhs, mapper.expr mapper rhs in +- [%expr +- let module Reraise = struct external reraise : exn -> 'a = "%reraise" end in +- Lwt.backtrace_bind +- (fun exn -> try Reraise.reraise exn with exn -> exn) +- [%e lhs] +- (fun [%p pat] -> [%e rhs]) +- ] +- [@metaloc exp.pexp_loc] ++ let pat= let loc = ext_loc in [%pat? ()] in ++ let lhs, rhs = mapper#expression lhs, mapper#expression rhs in ++ let loc = exp.pexp_loc in ++ [%expr ++ let module Reraise = struct external reraise : exn -> 'a = "%reraise" end in ++ Lwt.backtrace_bind ++ (fun exn -> try Reraise.reraise exn with exn -> exn) ++ [%e lhs] ++ (fun [%p pat] -> [%e rhs]) ++ ] + + (** For expressions only *) + (* We only expand the first level after a %lwt. +@@ -121,7 +115,7 @@ + (gen_bindings vbl) + (gen_binds exp.pexp_loc vbl e) + in +- Some (mapper.expr mapper { new_exp with pexp_attributes }) ++ Some (mapper#expression { new_exp with pexp_attributes }) + + (* [match%lwt $e$ with $c$] ≡ [Lwt.bind $e$ (function $c$)] + [match%lwt $e$ with exception $x$ | $c$] ≡ +@@ -134,11 +128,8 @@ + | _ -> false) + in + if cases = [] then +- raise (Location.Error ( +- Location.errorf +- ~loc:exp.pexp_loc +- "match%%lwt must contain at least one non-exception pattern." +- )); ++ Location.raise_errorf ~loc:exp.pexp_loc ++ "match%%lwt must contain at least one non-exception pattern." ; + let exns = + exns |> List.map ( + function +@@ -150,22 +141,24 @@ + let new_exp = + match exns with + | [] -> +- [%expr Lwt.bind [%e e] [%e Exp.function_ cases]] [@metaloc !default_loc] +- | _ -> [%expr Lwt.try_bind (fun () -> [%e e]) +- [%e Exp.function_ cases] +- [%e Exp.function_ exns]] +- [@metaloc !default_loc] ++ let loc = !default_loc in ++ [%expr Lwt.bind [%e e] [%e Exp.function_ cases]] ++ | _ -> ++ let loc = !default_loc in ++ [%expr Lwt.try_bind (fun () -> [%e e]) ++ [%e Exp.function_ cases] ++ [%e Exp.function_ exns]] + in +- Some (mapper.expr mapper { new_exp with pexp_attributes }) ++ Some (mapper#expression { new_exp with pexp_attributes }) + + (* [assert%lwt $e$] ≡ + [try Lwt.return (assert $e$) with exn -> Lwt.fail exn] *) + | Pexp_assert e -> + let new_exp = ++ let loc = !default_loc in + [%expr try Lwt.return (assert [%e e]) with exn -> Lwt.fail exn] +- [@metaloc !default_loc] + in +- Some (mapper.expr mapper { new_exp with pexp_attributes }) ++ Some (mapper#expression { new_exp with pexp_attributes }) + + (* [while%lwt $cond$ do $body$ done] ≡ + [let rec __ppx_lwt_loop () = +@@ -175,15 +168,15 @@ + *) + | Pexp_while (cond, body) -> + let new_exp = ++ let loc = !default_loc in + [%expr + let rec __ppx_lwt_loop () = + if [%e cond] then Lwt.bind [%e body] __ppx_lwt_loop + else Lwt.return_unit + in __ppx_lwt_loop () + ] +- [@metaloc !default_loc] + in +- Some (mapper.expr mapper { new_exp with pexp_attributes }) ++ Some (mapper#expression { new_exp with pexp_attributes }) + + (* [for%lwt $p$ = $start$ (to|downto) $end$ do $body$ done] ≡ + [let __ppx_lwt_bound = $end$ in +@@ -193,16 +186,19 @@ + in __ppx_lwt_loop $start$] + *) + | Pexp_for ({ppat_desc = Ppat_var p_var; _} as p, start, bound, dir, body) -> +- let comp, op = match dir with +- | Upto -> evar ">", evar "+" +- | Downto -> evar "<", evar "-" ++ let comp, op = ++ let loc = !default_loc in ++ match dir with ++ | Upto -> evar ~loc ">", evar ~loc "+" ++ | Downto -> evar ~loc "<", evar ~loc "-" + in +- let p' = with_loc (fun s -> evar s) p_var in ++ let p' = with_loc evar p_var in + +- let exp_bound = [%expr __ppx_lwt_bound] [@metaloc bound.pexp_loc] in +- let pat_bound = [%pat? __ppx_lwt_bound] [@metaloc bound.pexp_loc] in ++ let exp_bound = let loc = bound.pexp_loc in [%expr __ppx_lwt_bound] in ++ let pat_bound = let loc = bound.pexp_loc in [%pat? __ppx_lwt_bound] in + + let new_exp = ++ let loc = !default_loc in + [%expr + let [%p pat_bound] : int = [%e bound] in + let rec __ppx_lwt_loop [%p p] = +@@ -210,9 +206,8 @@ + else Lwt.bind [%e body] (fun () -> __ppx_lwt_loop ([%e op] [%e p'] 1)) + in __ppx_lwt_loop [%e start] + ] +- [@metaloc !default_loc] + in +- Some (mapper.expr mapper { new_exp with pexp_attributes }) ++ Some (mapper#expression { new_exp with pexp_attributes }) + + + (* [try%lwt $e$ with $c$] ≡ +@@ -221,6 +216,7 @@ + | Pexp_try (expr, cases) -> + let cases = add_wildcard_case cases in + let new_exp = ++ let loc = !default_loc in + [%expr + let module Reraise = struct external reraise : exn -> 'a = "%reraise" end in + Lwt.backtrace_catch +@@ -228,9 +224,8 @@ + (fun () -> [%e expr]) + [%e Exp.function_ cases] + ] +- [@metaloc !default_loc] + in +- Some (mapper.expr mapper { new_exp with pexp_attributes }) ++ Some (mapper#expression { new_exp with pexp_attributes }) + + (* [if%lwt $c$ then $e1$ else $e2$] ≡ + [match%lwt $c$ with true -> $e1$ | false -> $e2$] +@@ -240,37 +235,37 @@ + | Pexp_ifthenelse (cond, e1, e2) -> + let e2 = + match e2 with +- | None -> [%expr Lwt.return_unit] [@metaloc !default_loc] ++ | None -> let loc = !default_loc in [%expr Lwt.return_unit] + | Some e -> e + in + let cases = ++ let loc = !default_loc in + [ +- Exp.case ([%pat? true] [@metaloc !default_loc]) e1 ; +- Exp.case ([%pat? false] [@metaloc !default_loc]) e2 ; ++ Exp.case [%pat? true] e1 ; ++ Exp.case [%pat? false] e2 ; + ] + in + let new_exp = ++ let loc = !default_loc in + [%expr Lwt.bind [%e cond] [%e Exp.function_ cases]] +- [@metaloc !default_loc] + in +- Some (mapper.expr mapper { new_exp with pexp_attributes }) ++ Some (mapper#expression { new_exp with pexp_attributes }) + + | _ -> + None + + let warned = ref false + +-let mapper = +- { default_mapper with ++class mapper = object (self) ++ inherit Ast_traverse.map as super + +- structure = begin fun mapper structure -> +- if !warned then +- default_mapper.structure mapper structure ++ method! structure = begin fun structure -> ++ if !warned then super#structure structure + + else begin + warned := true; +- let structure = default_mapper.structure mapper structure in +- let loc = Location.in_file !Location.input_name in ++ let structure = super#structure structure in ++ let loc = Location.in_file !Ocaml_common.Location.input_name in + + let warn_if condition message structure = + if condition then +@@ -287,9 +282,9 @@ + ("-no-sequence is a deprecated Lwt PPX option\n" ^ + " See https://github.com/ocsigen/lwt/issues/495") + end +- end; ++ end + +- expr = (fun mapper expr -> ++ method! expression = (fun expr -> + match expr with + | { pexp_desc= + Pexp_extension ( +@@ -297,7 +292,7 @@ + PStr[{pstr_desc= Pstr_eval (exp, _);_}]); + _ + }-> +- begin match lwt_expression mapper exp expr.pexp_attributes ext_loc with ++ begin match lwt_expression self exp expr.pexp_attributes ext_loc with + | Some expr' -> expr' + | None -> expr + end +@@ -306,47 +301,45 @@ + | [%expr [%e? exp ] [%finally [%e? finally]] ] + | [%expr [%e? exp ] [%lwt.finally [%e? finally]] ] -> + let new_exp = +- [%expr +- let module Reraise = struct external reraise : exn -> 'a = "%reraise" end in +- Lwt.backtrace_finalize +- (fun exn -> try Reraise.reraise exn with exn -> exn) +- (fun () -> [%e exp]) +- (fun () -> [%e finally]) +- ] +- [@metaloc !default_loc] ++ let loc = !default_loc in ++ [%expr ++ let module Reraise = struct external reraise : exn -> 'a = "%reraise" end in ++ Lwt.backtrace_finalize ++ (fun exn -> try Reraise.reraise exn with exn -> exn) ++ (fun () -> [%e exp]) ++ (fun () -> [%e finally]) ++ ] + in +- mapper.expr mapper ++ super#expression + { new_exp with + pexp_attributes = expr.pexp_attributes @ exp.pexp_attributes + } + + | [%expr [%finally [%e? _ ]]] + | [%expr [%lwt.finally [%e? _ ]]] -> +- raise (Location.Error ( +- Location.errorf +- ~loc:expr.pexp_loc +- "Lwt's finally should be used only with the syntax: \"(<expr>)[%%finally ...]\"." +- )) ++ Location.raise_errorf ~loc:expr.pexp_loc ++ "Lwt's finally should be used only with the syntax: \"(<expr>)[%%finally ...]\"." + + | _ -> +- default_mapper.expr mapper expr); +- structure_item = (fun mapper stri -> ++ super#expression expr) ++ ++ method! structure_item = (fun stri -> + default_loc := stri.pstr_loc; + match stri with + | [%stri let%lwt [%p? var] = [%e? exp]] -> + let warning = +- str ++ estring ~loc:!default_loc + ("let%lwt should not be used at the module item level.\n" ^ + "Replace let%lwt x = e by let x = Lwt_main.run (e)") + in ++ let loc = !default_loc in + [%stri + let [%p var] = + (Lwt_main.run [@ocaml.ppwarning [%e warning]]) +- [%e mapper.expr mapper exp]] +- [@metaloc !default_loc] ++ [%e super#expression exp]] + +- | x -> default_mapper.structure_item mapper x); +-} ++ | x -> super#structure_item x); ++end + + + let args = +@@ -361,5 +354,8 @@ + ] + + let () = +- Driver.register ~name:"ppx_lwt" ~args Versions.ocaml_410 +- (fun _config _cookies -> mapper) ++ let mapper = new mapper in ++ Driver.register_transformation "ppx_lwt" ++ ~impl:mapper#structure ++ ~intf:mapper#signature ; ++ List.iter (fun (key, spec, doc) -> Driver.add_arg key spec ~doc) args +--- lwt-5.3.0-orig/src/ppx/ppx_lwt.mli 2020-04-23 16:32:55.000000000 +1000 ++++ lwt-5.3.0/src/ppx/ppx_lwt.mli 2020-10-12 22:10:45.384889535 +1100 +@@ -161,4 +161,4 @@ + *) + + +-val mapper : Migrate_parsetree.OCaml_410.Ast.Ast_mapper.mapper ++class mapper : Ppxlib.Ast_traverse.map diff --git a/dev-ml/lwt/lwt-3.0.0.ebuild b/dev-ml/lwt/lwt-3.0.0.ebuild deleted file mode 100644 index e811ad86da8a..000000000000 --- a/dev-ml/lwt/lwt-3.0.0.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -OASIS_BUILD_TESTS=1 -OASIS_BUILD_DOCS=1 - -inherit oasis - -DESCRIPTION="Cooperative light-weight thread library for OCaml" -SRC_URI="https://github.com/ocsigen/lwt/archive/${PV}.tar.gz -> ${P}.tar.gz" -HOMEPAGE="http://ocsigen.org/lwt" - -IUSE="+camlp4 +ppx" - -DEPEND=" - dev-libs/libev - >=dev-lang/ocaml-4.02:= - dev-ml/result:= - ppx? ( dev-ml/ppx_tools:= ) - camlp4? ( dev-ml/camlp4:= )" - -RDEPEND="${DEPEND} - !<www-servers/ocsigen-1.1" -DEPEND="${DEPEND} - dev-ml/cppo" - -SLOT="0/${PV}" -LICENSE="LGPL-2.1-with-linking-exception" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-fbsd" - -DOCS=( "CHANGES" "README.md" ) - -src_configure() { - oasis_configure_opts=" - --disable-glib - --disable-react - --disable-ssl - $(use_enable camlp4) - $(use_enable ppx)" \ - oasis_src_configure -} diff --git a/dev-ml/lwt/lwt-3.1.0.ebuild b/dev-ml/lwt/lwt-3.1.0.ebuild deleted file mode 100644 index 98584bf66213..000000000000 --- a/dev-ml/lwt/lwt-3.1.0.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="Cooperative light-weight thread library for OCaml" -SRC_URI="https://github.com/ocsigen/lwt/archive/${PV}.tar.gz -> ${P}.tar.gz" -HOMEPAGE="http://ocsigen.org/lwt" - -IUSE="+camlp4 +libev" - -DEPEND=" - >=dev-lang/ocaml-4.02:= - dev-ml/result:= - dev-ml/ocaml-migrate-parsetree:= - dev-ml/ppx_tools_versioned:= - libev? ( dev-libs/libev ) - camlp4? ( dev-ml/camlp4:= )" - -RDEPEND="${DEPEND} - !<www-servers/ocsigen-1.1" -DEPEND="${DEPEND} - dev-ml/cppo - dev-ml/findlib - dev-ml/jbuilder - dev-ml/opam" - -SLOT="0/${PV}" -LICENSE="LGPL-2.1-with-linking-exception" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-fbsd" - -src_configure() { - ocaml src/util/configure.ml \ - -use-libev $(usex libev true false) \ - -use-camlp4 $(usex camlp4 true false) \ - || die -} - -src_compile() { - jbuilder build -p lwt || die - ocaml src/util/install_filter.ml || die -} - -src_test() { - jbuilder runtest -p lwt || die -} - -src_install() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - --mandir="${ED}/usr/share/man" \ - ${PN}.install || die -} diff --git a/dev-ml/lwt/lwt-5.3.0-r1.ebuild b/dev-ml/lwt/lwt-5.3.0-r1.ebuild new file mode 100644 index 000000000000..05b15f64a4a3 --- /dev/null +++ b/dev-ml/lwt/lwt-5.3.0-r1.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Cooperative light-weight thread library for OCaml" +SRC_URI="https://github.com/ocsigen/lwt/archive/${PV}.tar.gz -> ${P}.tar.gz" +HOMEPAGE="http://ocsigen.org/lwt" + +SLOT="0/${PV}" +LICENSE="LGPL-2.1-with-linking-exception" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt" + +DEPEND=" + dev-ml/seq:= + dev-ml/result:= + dev-ml/mmap:= + dev-ml/ocplib-endian:= + >=dev-ml/ppxlib-0.18.0:= + dev-ml/react:= + dev-ml/dune-configurator:= + dev-libs/libev" +RDEPEND="${DEPEND}" +BDEPEND=" + >=dev-ml/cppo-1.6.6 + dev-ml/findlib" + +# backported from https://github.com/ocsigen/lwt/pull/807 +PATCHES=( + "${FILESDIR}"/${PN}-5.3.0-ppxlib-0.18.0.patch + "${FILESDIR}"/${P}-ocaml-4.12.patch +) diff --git a/dev-ml/lwt/lwt-5.4.2-r1.ebuild b/dev-ml/lwt/lwt-5.4.2-r1.ebuild new file mode 100644 index 000000000000..37deef97464a --- /dev/null +++ b/dev-ml/lwt/lwt-5.4.2-r1.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Cooperative light-weight thread library for OCaml" +SRC_URI="https://github.com/ocsigen/lwt/archive/${PV}.tar.gz -> ${P}.tar.gz" +HOMEPAGE="http://ocsigen.org/lwt" + +SLOT="0/${PV}" +LICENSE="LGPL-2.1-with-linking-exception" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +DEPEND=" + dev-ml/result:= + dev-ml/mmap:= + dev-ml/ocplib-endian:= + dev-ml/ppxlib:= + dev-ml/react:= + dev-ml/luv:= + dev-libs/libev" +RDEPEND="${DEPEND}" +BDEPEND=" + dev-ml/cppo + dev-ml/findlib" + +src_prepare() { + sed -i \ + -e "s: seq::" \ + src/core/dune \ + die + default +} + +src_install() { + local i + for i in lwt lwt_luv lwt_ppx lwt_react ; do + dune_src_install ${i} + done + + einstalldocs +} diff --git a/dev-ml/lwt/lwt-5.6.1.ebuild b/dev-ml/lwt/lwt-5.6.1.ebuild new file mode 100644 index 000000000000..63160322fcc1 --- /dev/null +++ b/dev-ml/lwt/lwt-5.6.1.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Cooperative light-weight thread library for OCaml" +SRC_URI="https://github.com/ocsigen/lwt/archive/${PV}.tar.gz -> ${P}.tar.gz" +HOMEPAGE="http://ocsigen.org/lwt" + +SLOT="0/${PV}" +LICENSE="LGPL-2.1-with-linking-exception" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +DEPEND=" + dev-libs/libev + dev-ml/luv:= + dev-ml/mmap:= + dev-ml/ocplib-endian:= + dev-ml/ppx_let:= + dev-ml/ppxlib:= + dev-ml/react:= + dev-ml/result:= +" +RDEPEND="${DEPEND}" +BDEPEND=" + dev-ml/cppo + dev-ml/findlib +" + +# "domainslib" is unpackaged. +OCAML_SUBPACKAGES=( + lwt + lwt_luv + lwt_ppx + lwt_ppx_let + lwt_react +) + +src_prepare() { + sed -i "s| seq||" "${S}"/src/core/dune || die + + default +} + +src_compile() { + dune-compile ${OCAML_SUBPACKAGES[@]} +} + +src_test() { + dune-test ${OCAML_SUBPACKAGES[@]} +} + +src_install() { + dune-install ${OCAML_SUBPACKAGES[@]} + + einstalldocs +} diff --git a/dev-ml/lwt/lwt-5.7.0.ebuild b/dev-ml/lwt/lwt-5.7.0.ebuild new file mode 100644 index 000000000000..6229e3ef36b4 --- /dev/null +++ b/dev-ml/lwt/lwt-5.7.0.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Cooperative light-weight thread library for OCaml" +SRC_URI="https://github.com/ocsigen/lwt/archive/${PV}.tar.gz -> ${P}.tar.gz" +HOMEPAGE="http://ocsigen.org/lwt" + +SLOT="0/${PV}" +LICENSE="LGPL-2.1-with-linking-exception" +KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86" +IUSE="+ocamlopt" + +DEPEND=" + dev-libs/libev + dev-ml/luv:= + dev-ml/mmap:= + dev-ml/ocplib-endian:= + dev-ml/ppx_let:= + dev-ml/ppxlib:= + dev-ml/react:= + dev-ml/result:= +" +RDEPEND="${DEPEND}" +BDEPEND=" + dev-ml/cppo + dev-ml/findlib +" + +# "domainslib" is unpackaged. +OCAML_SUBPACKAGES=( + lwt + lwt_ppx + lwt_ppx_let + lwt_react +) + +src_prepare() { + sed -i "s| seq||" "${S}"/src/core/dune || die + + default +} + +src_compile() { + dune-compile ${OCAML_SUBPACKAGES[@]} +} + +src_test() { + dune-test ${OCAML_SUBPACKAGES[@]} +} + +src_install() { + dune-install ${OCAML_SUBPACKAGES[@]} + + einstalldocs +} diff --git a/dev-ml/lwt/metadata.xml b/dev-ml/lwt/metadata.xml index c3aa15b13c0c..83c7d13d18c9 100644 --- a/dev-ml/lwt/metadata.xml +++ b/dev-ml/lwt/metadata.xml @@ -1,15 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> - <use> - <flag name="camlp4">Enable camlp4 syntax extension</flag> - <flag name="libev">Enable the <pkg>dev-libs/libev</pkg>-based backend.</flag> - <flag name="ppx">Enables the ppx syntax extension</flag> - </use> <upstream> <remote-id type="github">ocsigen/lwt</remote-id> </upstream> diff --git a/dev-ml/lwt_glib/Manifest b/dev-ml/lwt_glib/Manifest deleted file mode 100644 index c37029f25923..000000000000 --- a/dev-ml/lwt_glib/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST lwt_glib-1.0.1.tar.gz 51837 BLAKE2B 0570bca2b697b7afd5072a938be4330e39fb6b1285690ddf44c7cf051fd29bd620e53f441cc03afa93f3c03e466fd8aceb9d4a200085e3797afd7346afbd0146 SHA512 b66057fcfd110808ebabe6ec0ab653ddbb11342614265c7af58201854078b4a6315aa56836e719c2b8b3edc3e4a87f9fede7913a9b462ef65d21ae3bb1dcbd6c diff --git a/dev-ml/lwt_glib/lwt_glib-1.0.1.ebuild b/dev-ml/lwt_glib/lwt_glib-1.0.1.ebuild deleted file mode 100644 index 0a45b425a40f..000000000000 --- a/dev-ml/lwt_glib/lwt_glib-1.0.1.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -OASIS_BUILD_DOCS=1 - -LWT_VER=3.0.0 - -inherit oasis - -DESCRIPTION="GLib integration for Lwt" -SRC_URI="https://github.com/ocsigen/lwt/releases/download/${LWT_VER}/${P}.tar.gz" -HOMEPAGE="http://ocsigen.org/lwt" - -IUSE="" - -DEPEND=" - >=dev-ml/lwt-${LWT_VER}:= - dev-libs/glib:2 -" - -RDEPEND="${DEPEND}" - -SLOT="0/${PV}" -LICENSE="LGPL-2.1-with-linking-exception" -KEYWORDS="~amd64 ~arm ~ppc ~x86-fbsd" diff --git a/dev-ml/lwt_glib/metadata.xml b/dev-ml/lwt_glib/metadata.xml deleted file mode 100644 index c3df6b569544..000000000000 --- a/dev-ml/lwt_glib/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">ocsigen/lwt</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/lwt_log/Manifest b/dev-ml/lwt_log/Manifest new file mode 100644 index 000000000000..adfbcf4704f6 --- /dev/null +++ b/dev-ml/lwt_log/Manifest @@ -0,0 +1,2 @@ +DIST lwt_log-1.1.1.tar.gz 24569 BLAKE2B c205382dcb17f9ce6f8037bb19f817138081c61b60f5253913d9346c009694c0a6f67228293fa1d63ea405c94950141ea2f383f1483fcf674771f8a9252f9eff SHA512 df3d171a7c72f37e96b756d252ab586767df9c13e01500faf13d4b2cee936b0602fd7c725c03db488d3737d8d92300af103d395a926dc654a2c44a5d6068f24a +DIST lwt_log-1.1.2.tar.gz 24567 BLAKE2B d555b2e54b327ddbb68d8fcf1f669eb8b74709673da8c0f0dc32ee5d58c5055ebda52c2f13d39ac37e0fda724e02c057872147b88921ed15dbed73b58c59962d SHA512 fb976d89c0f868b57434a9e0907ffae0842fe48fc747ddb860954d20f36722faea315ebb0b4dac202f9bf7203b0a09681614e9619f3bbd0dd59f8dd7bbd50575 diff --git a/dev-ml/lwt_log/lwt_log-1.1.1-r1.ebuild b/dev-ml/lwt_log/lwt_log-1.1.1-r1.ebuild new file mode 100644 index 000000000000..65e0d086940d --- /dev/null +++ b/dev-ml/lwt_log/lwt_log-1.1.1-r1.ebuild @@ -0,0 +1,18 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Cooperative light-weight thread library for OCaml" +HOMEPAGE="https://github.com/ocsigen/lwt_log" +SRC_URI="https://github.com/ocsigen/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +SLOT="0/${PV}" +LICENSE="LGPL-2" +KEYWORDS="~amd64 ~x86" +IUSE="+ocamlopt" + +RDEPEND="dev-ml/lwt:=" +DEPEND="${RDEPEND}" diff --git a/dev-ml/lwt_log/lwt_log-1.1.2.ebuild b/dev-ml/lwt_log/lwt_log-1.1.2.ebuild new file mode 100644 index 000000000000..dd13b97c8ce0 --- /dev/null +++ b/dev-ml/lwt_log/lwt_log-1.1.2.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Cooperative light-weight thread library for OCaml" +HOMEPAGE="https://github.com/ocsigen/lwt_log" +SRC_URI="https://github.com/ocsigen/${PN}/archive/${PV}.tar.gz + -> ${P}.tar.gz" + +SLOT="0/${PV}" +LICENSE="LGPL-2" +KEYWORDS="~amd64 ~x86" +IUSE="+ocamlopt" + +RDEPEND="dev-ml/lwt:=" +DEPEND="${RDEPEND}" diff --git a/dev-ml/lwt_log/metadata.xml b/dev-ml/lwt_log/metadata.xml new file mode 100644 index 000000000000..f49c7a0cb39f --- /dev/null +++ b/dev-ml/lwt_log/metadata.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> + +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <bugs-to>https://github.com/ocsigen/lwt_log/issues/</bugs-to> + <remote-id type="github">ocsigen/lwt_log</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/lwt_react/Manifest b/dev-ml/lwt_react/Manifest deleted file mode 100644 index 62977612e55a..000000000000 --- a/dev-ml/lwt_react/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST lwt_react-1.0.1.tar.gz 50329 BLAKE2B 30de048131a0b2b3cc2711efdfa3cd9832d676f7d279871e911c7cf7291dc8a30fb8351f8dc4ee42ca0d01b44fc1b370b5045aeee36dd28bae2f731f3da377f0 SHA512 cd2dcc32ca87a3d26d1771d5bf51bd9f444c75cba028f7ff71e96cb9bc12387d66d6d0c59b6c8d4bac84fb42c6e2e969c385ef1d2f6cbc8e912963304a49eda8 diff --git a/dev-ml/lwt_react/lwt_react-1.0.1.ebuild b/dev-ml/lwt_react/lwt_react-1.0.1.ebuild deleted file mode 100644 index 87b8ba33199a..000000000000 --- a/dev-ml/lwt_react/lwt_react-1.0.1.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -OASIS_BUILD_DOCS=1 - -LWT_VER=3.0.0 - -inherit oasis - -DESCRIPTION="GLib integration for Lwt" -SRC_URI="https://github.com/ocsigen/lwt/releases/download/${LWT_VER}/${P}.tar.gz" -HOMEPAGE="http://ocsigen.org/lwt" - -IUSE="" - -DEPEND=" - >=dev-ml/lwt-${LWT_VER}:= - >=dev-ml/react-1.2:= -" - -RDEPEND="${DEPEND}" - -SLOT="0/${PV}" -LICENSE="LGPL-2.1-with-linking-exception" -KEYWORDS="~amd64 ~arm ~ppc ~x86-fbsd" diff --git a/dev-ml/lwt_react/metadata.xml b/dev-ml/lwt_react/metadata.xml deleted file mode 100644 index c3df6b569544..000000000000 --- a/dev-ml/lwt_react/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">ocsigen/lwt</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/lwt_ssl/Manifest b/dev-ml/lwt_ssl/Manifest index a9120b7f2249..e2a7a8ed8b7b 100644 --- a/dev-ml/lwt_ssl/Manifest +++ b/dev-ml/lwt_ssl/Manifest @@ -1,2 +1,2 @@ -DIST lwt_ssl-1.0.1.tar.gz 48964 BLAKE2B deb6b48ef0249f7ab5c9bbb4507ce7be048c547c8aeeb9421a96cd1215c4292b6a4330ee6c6aeaf6ff092e7eaba0ef7f689ff0de2e97ff68b576cd27084719bf SHA512 429e2ee6b45e53b8f3347a0ad02531fa3ee6b3842dbf6475cf079a214f3a59bbb25f3c1c882ff32f01263711db034cc8900be827e27e6a8b0562812e4bd8e52d -DIST lwt_ssl-1.1.1.tar.gz 288603 BLAKE2B ba22a078597c71ed51142c91d215c339f5ab9aae3a4f94f8111985ad76fba7faf60878ed3e549d79983130d8203531326c408a2f18e0f902e6171b383f26abda SHA512 207ccf8ccde13d88eb58d4ff45279f7cbde90ed5c20a941e7efa9501d9c1b8a71d7655178960c826bb52c6403c348faa5053cefc0ac197ad690a96daa55d1a32 +DIST lwt_ssl-1.1.3.tar.gz 14785 BLAKE2B b131d821c0e1394fee749ad5fdb0c7394ea96ffdb17dd22646d365c86ed41e1ed4e2b64a351fd14cc60f0e656e43a35e74c1c369c84e23a342fd7f056d49d40c SHA512 1bcc610ccf660436be2ed068ef98d85d752aecd2f364eab585ef1553b0ef1561a0fd50b5edc15000cf4cffc78d0ba184f7ede53651de14f5227ad1b795e2240a +DIST lwt_ssl-1.2.0.tar.gz 14955 BLAKE2B 14c3d2160ba88147257fda953b298e8bdae5550edc4942eff6e90398eef1353e592e32ce2bd3e6d519fc48a48757015f5bf95af7d3eac283f49ea40206c4ddf4 SHA512 fee0fbc558e638917d626a0c7ce8c4701bc523141d9c3ebefef494fe8dd05cf8e4aeaf37abab1c9727be7677f353b429d31f2e8fe20b30a04a69f27beca22881 diff --git a/dev-ml/lwt_ssl/lwt_ssl-1.0.1.ebuild b/dev-ml/lwt_ssl/lwt_ssl-1.0.1.ebuild deleted file mode 100644 index bf1fd3c421be..000000000000 --- a/dev-ml/lwt_ssl/lwt_ssl-1.0.1.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -OASIS_BUILD_DOCS=1 - -LWT_VER=3.0.0 - -inherit oasis - -DESCRIPTION="GLib integration for Lwt" -SRC_URI="https://github.com/ocsigen/lwt/releases/download/${LWT_VER}/${P}.tar.gz" -HOMEPAGE="http://ocsigen.org/lwt" - -IUSE="" - -DEPEND=" - >=dev-ml/lwt-${LWT_VER}:= - >=dev-ml/ocaml-ssl-0.4.0:= -" - -RDEPEND="${DEPEND}" - -SLOT="0/${PV}" -LICENSE="LGPL-2.1-with-linking-exception" -KEYWORDS="~amd64 ~arm ~ppc ~x86-fbsd" diff --git a/dev-ml/lwt_ssl/lwt_ssl-1.1.1.ebuild b/dev-ml/lwt_ssl/lwt_ssl-1.1.1.ebuild deleted file mode 100644 index acc14d95595a..000000000000 --- a/dev-ml/lwt_ssl/lwt_ssl-1.1.1.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit opam - -DESCRIPTION="GLib integration for Lwt" -SRC_URI="https://github.com/ocsigen/lwt/archive/${P}.tar.gz" -HOMEPAGE="http://ocsigen.org/lwt" - -IUSE="" - -RDEPEND=" - >=dev-ml/lwt-3.1:= - >=dev-ml/ocaml-ssl-0.4.0:= -" -DEPEND="${RDEPEND} - dev-ml/jbuilder" - -SLOT="0/${PV}" -LICENSE="LGPL-2.1-with-linking-exception" -KEYWORDS="~amd64 ~arm ~ppc ~x86-fbsd" -S="${WORKDIR}/lwt-${P}/" - -src_compile() { - jbuilder build -p ${PN} || die -} - -src_test() { - jbuilder runtest -p ${PN} || die -} diff --git a/dev-ml/lwt_ssl/lwt_ssl-1.1.3.ebuild b/dev-ml/lwt_ssl/lwt_ssl-1.1.3.ebuild new file mode 100644 index 000000000000..0c1d74fa892a --- /dev/null +++ b/dev-ml/lwt_ssl/lwt_ssl-1.1.3.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="GLib integration for Lwt" +SRC_URI="https://github.com/ocsigen/lwt_ssl/archive/${PV}.tar.gz + -> ${P}.tar.gz" +HOMEPAGE="http://ocsigen.org/lwt_ssl" + +IUSE="+ocamlopt" + +SLOT="0/${PV}" +LICENSE="LGPL-2.1-with-linking-exception" +KEYWORDS="~amd64 ~arm ~ppc" + +RDEPEND=" + dev-ml/base + >=dev-ml/lwt-3.1:= + >=dev-ml/ocaml-ssl-0.4.0:= +" diff --git a/dev-ml/lwt_ssl/lwt_ssl-1.2.0.ebuild b/dev-ml/lwt_ssl/lwt_ssl-1.2.0.ebuild new file mode 100644 index 000000000000..c89e166b346e --- /dev/null +++ b/dev-ml/lwt_ssl/lwt_ssl-1.2.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="GLib integration for Lwt" +SRC_URI="https://github.com/ocsigen/lwt_ssl/archive/${PV}.tar.gz + -> ${P}.tar.gz" +HOMEPAGE="http://ocsigen.org/lwt_ssl" + +IUSE="+ocamlopt" + +SLOT="0/${PV}" +LICENSE="LGPL-2.1-with-linking-exception" +KEYWORDS="~amd64 ~arm ~ppc" + +RDEPEND=" + dev-ml/base + >=dev-ml/lwt-3.1:= + >=dev-ml/ocaml-ssl-0.5.13:= +" diff --git a/dev-ml/lwt_ssl/metadata.xml b/dev-ml/lwt_ssl/metadata.xml index c3df6b569544..83c7d13d18c9 100644 --- a/dev-ml/lwt_ssl/metadata.xml +++ b/dev-ml/lwt_ssl/metadata.xml @@ -1,9 +1,9 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">ocsigen/lwt</remote-id> diff --git a/dev-ml/macaque/Manifest b/dev-ml/macaque/Manifest deleted file mode 100644 index 30dd90e21fe0..000000000000 --- a/dev-ml/macaque/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST macaque-0.7.4.tar.gz 64896 BLAKE2B d0a0fcb09bd468cb5de75551ee62278282f98de4d4477c71b55c065d35bc1d6483614c578ba18f609e5cdc98bd52d93943efa9948d9c01a95b8a3d1608e246bb SHA512 db664226e58ad3db2dc00e920dcc757242b0bcc8d1b6406e6743afe6cdbe789546af131a00c07a5e2e63ed39b9017c2d8e2f5bbce63a741df58bf14633aae89a diff --git a/dev-ml/macaque/macaque-0.7.4.ebuild b/dev-ml/macaque/macaque-0.7.4.ebuild deleted file mode 100644 index f8b8e3fb069d..000000000000 --- a/dev-ml/macaque/macaque-0.7.4.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit oasis - -DESCRIPTION="DSL for SQL Queries in Caml" -HOMEPAGE="http://ocsigen.org/macaque/" -SRC_URI="https://github.com/ocsigen/macaque/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1-with-linking-exception" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND=">=dev-ml/pgocaml-2.1:= - dev-ml/camlp4:=" -DEPEND="${RDEPEND} - dev-ml/oasis" -DOCS=( Changelog README.md ) -OASIS_SETUP_COMMAND="./setup.exe" - -src_configure() { - emake setup.exe - oasis_src_configure -} diff --git a/dev-ml/macaque/metadata.xml b/dev-ml/macaque/metadata.xml deleted file mode 100644 index c4e0b775c9af..000000000000 --- a/dev-ml/macaque/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">ocsigen/macaque</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/markup/Manifest b/dev-ml/markup/Manifest index 490a2129a27d..0717eb30a587 100644 --- a/dev-ml/markup/Manifest +++ b/dev-ml/markup/Manifest @@ -1 +1,3 @@ -DIST markup-0.7.5.tar.gz 278654 BLAKE2B 5338d4b546c74ade522c84c5a0583ad08b09e4ca3ecb96712725dd33792e401f66f076e47cf24986047f36236c53134272cadcd2abe322307377bb79055bf39a SHA512 19350df7a3a619c479fa030b8772009bc32f3e9830494f5707e05f85b9ee9ff0ddf382d292c7a11bbd3b63c8c108e6a84b2d01f5e983f49d7cdf63ee3c4545c8 +DIST markup-1.0.0.tar.gz 280927 BLAKE2B cdf670e97c9f6e9b514d98f19a50bb4915c0c434a4ca27ac71be36f3893ed049eef8c0b5f48893e3f247938283272ff0c03d24743d679ef5e0296f7059131c58 SHA512 6383ed24fd86be0f6a64d9386b547d323fa0e763571ff3e7405119173c6ac6a7ed043bc0d35afd6e933101f22ed4b2f8baa08ba07d3df57a68015caaf79030ab +DIST markup-1.0.2.tar.gz 281957 BLAKE2B 04094edf2b6e7cec8de8e1d2ebc9c43b55aa18ccd7c38ee07217a7578764e1b919da8f30b3855d04deb75862be9c429ddf2c24c7a8a2baa2ed01921514f3b334 SHA512 6a04240da095a7557932e26b8f20979e0a8dc4ef2b5ce98aac7dfcaf82f0350397633120b638f76efd2a30a482a2381566b66a35c0585535e225f44004539b87 +DIST markup-1.0.3.tar.gz 281554 BLAKE2B 71e6719c83ea0b456bb72ac469f11f8aab849098728431cf65e63f3484d98957250cec95a6c78e1bb586768f07fdf91bd4a8dc8195815b0bee836ce7c59fd2c8 SHA512 1bb030fa2d79f7a7ac2d04c07c72a39e83620757b1d7d8a33eea1ec9b4c32883a67de45d1eea9bfa6533ae8076009fab9af5f180ad2be9c1fef66e3e5937048a diff --git a/dev-ml/markup/markup-0.7.5.ebuild b/dev-ml/markup/markup-0.7.5.ebuild deleted file mode 100644 index 66c1698789fe..000000000000 --- a/dev-ml/markup/markup-0.7.5.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib eutils - -DESCRIPTION="Error-recovering streaming HTML5 and XML parsers" -HOMEPAGE="https://github.com/aantron/markup.ml" -SRC_URI="https://github.com/aantron/markup.ml/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}p1" -KEYWORDS="~amd64" -IUSE="doc test" - -DEPEND=" - dev-lang/ocaml:=[ocamlopt] - dev-ml/lwt:=[ocamlopt(+)] - >=dev-ml/uutf-1.0:=[ocamlopt] -" -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} - test? ( dev-ml/ounit ) - dev-ml/ocamlbuild" -S="${WORKDIR}/${PN}.ml-${PV}" - -src_compile() { - emake - use doc && emake docs -} - -src_install() { - findlib_src_preinst - emake ocamlfind-install - dodoc README.md - use doc && dohtml doc/html/* -} diff --git a/dev-ml/markup/markup-1.0.0-r1.ebuild b/dev-ml/markup/markup-1.0.0-r1.ebuild new file mode 100644 index 000000000000..fdce883345f3 --- /dev/null +++ b/dev-ml/markup/markup-1.0.0-r1.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Error-recovering streaming HTML5 and XML parsers" +HOMEPAGE="https://github.com/aantron/markup.ml" +SRC_URI="https://github.com/aantron/markup.ml/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND="dev-ml/lwt:= + dev-ml/uutf:=" +DEPEND="${RDEPEND} + test? ( dev-ml/ounit2 )" + +S="${WORKDIR}/${PN}.ml-${PV}" diff --git a/dev-ml/markup/markup-1.0.2-r1.ebuild b/dev-ml/markup/markup-1.0.2-r1.ebuild new file mode 100644 index 000000000000..28d135faf971 --- /dev/null +++ b/dev-ml/markup/markup-1.0.2-r1.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Error-recovering streaming HTML5 and XML parsers" +HOMEPAGE="https://github.com/aantron/markup.ml" +SRC_URI="https://github.com/aantron/markup.ml/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="amd64 ~arm ~arm64 x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND="dev-ml/lwt:= + dev-ml/uutf:=" +DEPEND="${RDEPEND} + test? ( dev-ml/ounit2 )" + +S="${WORKDIR}/${PN}.ml-${PV}" diff --git a/dev-ml/markup/markup-1.0.3.ebuild b/dev-ml/markup/markup-1.0.3.ebuild new file mode 100644 index 000000000000..88b603d4d100 --- /dev/null +++ b/dev-ml/markup/markup-1.0.3.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Error-recovering streaming HTML5 and XML parsers" +HOMEPAGE="https://github.com/aantron/markup.ml" +SRC_URI="https://github.com/aantron/markup.ml/archive/${PV}.tar.gz + -> ${P}.tar.gz" +S="${WORKDIR}"/${PN}.ml-${PV} + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="amd64 ~arm ~arm64 x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-ml/lwt:= + dev-ml/uchar:= + dev-ml/uutf:= +" +DEPEND="${RDEPEND}" +BDEPEND="test? ( dev-ml/ounit2 )" diff --git a/dev-ml/markup/metadata.xml b/dev-ml/markup/metadata.xml index ecd1021328e1..72955463219e 100644 --- a/dev-ml/markup/metadata.xml +++ b/dev-ml/markup/metadata.xml @@ -1,9 +1,9 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">aantron/markup.ml</remote-id> diff --git a/dev-ml/mccs/Manifest b/dev-ml/mccs/Manifest index c1b524220338..309a250e3f9b 100644 --- a/dev-ml/mccs/Manifest +++ b/dev-ml/mccs/Manifest @@ -1 +1,2 @@ -DIST mccs-1.1.2c.tar.gz 54497 BLAKE2B 4d60942b83bd8c80c758abcd126726ff96b220d61c53b838d239f77e6509edc1c5e7287333eb2710e1402f671198df2dcacd4eed8f1b26565fd55be60dbd8a21 SHA512 53a96aab7abe02cc77ec35341f4e1ca3c5896fb13f7dc36902a014bfba29d50dfebe0457178abcc12dc065aa1e98b8175c2128fc9a799fd696d6ce9348b2281b +DIST mccs-1.1.13.tar.gz 1024449 BLAKE2B c653c7d0b5fb6f9ea8facd8bfab517d80c7ec8cfd1ca512d81b81760e1d21c6978696af1cac596f0b11014464851c0c32e3bb5c6f70d88ad1bb7ef0034b8ff7d SHA512 2c2bc3c0e82b53a0e20c2542704eba8e3a2a1884f31b1a0a0079dd22fc02be8a8a62e582bdbf501339be0e9d6824872d737087e0fe150073b29b374505de073d +DIST mccs-1.1.14.tar.gz 1024455 BLAKE2B 60a8170bcef250532f69d78df72906f944b392dc858c6b88e19fab367d71c19a4316c78f1285fbd120fb9212c2a3f15be3c3ec9bc2262aab80bed6b0dcc76cca SHA512 f7a50473efb7823f61dda2753be4887cebc6aa43c1cc9de2596a15b418fbc577ea60d96f66488a1008032f75bbc3b3b090017d5846d5558463bd8ca062270895 diff --git a/dev-ml/mccs/mccs-1.1.2c.ebuild b/dev-ml/mccs/mccs-1.1.13.ebuild index 3451a9f9423a..0fb1656753d4 100644 --- a/dev-ml/mccs/mccs-1.1.2c.ebuild +++ b/dev-ml/mccs/mccs-1.1.13.ebuild @@ -1,30 +1,29 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit versionator opam +inherit dune -MY_PV=$(replace_version_separator 2 '+') +MY_PV=$(ver_rs 2 '+') DESCRIPTION="Multi Criteria CUDF Solver" HOMEPAGE="http://www.i3s.unice.fr/~cpjm/misc/ https://github.com/AltGr/ocaml-mccs/issues" SRC_URI="https://github.com/AltGr/ocaml-mccs/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}"/ocaml-${PN}-$(ver_rs 2 '-') LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" RDEPEND=" dev-ml/cudf:= sci-mathematics/glpk:= " DEPEND="${RDEPEND} - dev-ml/jbuilder" - -S=${WORKDIR}/ocaml-${PN}-$(replace_version_separator 2 '-') - -src_compile() { - jbuilder build -p ${PN} || die -} + test? ( + dev-ml/extlib:= + ) +" diff --git a/dev-ml/mccs/mccs-1.1.14.ebuild b/dev-ml/mccs/mccs-1.1.14.ebuild new file mode 100644 index 000000000000..85495f2cda7f --- /dev/null +++ b/dev-ml/mccs/mccs-1.1.14.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +MY_PV=$(ver_rs 2 '+') + +DESCRIPTION="Multi Criteria CUDF Solver" +HOMEPAGE="http://www.i3s.unice.fr/~cpjm/misc/ https://github.com/AltGr/ocaml-mccs/issues" +SRC_URI="https://github.com/AltGr/ocaml-mccs/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}"/ocaml-${PN}-$(ver_rs 2 '-') + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-ml/cudf:= + sci-mathematics/glpk:= +" +DEPEND="${RDEPEND} + test? ( + dev-ml/extlib:= + ) +" diff --git a/dev-ml/mccs/metadata.xml b/dev-ml/mccs/metadata.xml index 966e8b481be6..993260c8c1ee 100644 --- a/dev-ml/mccs/metadata.xml +++ b/dev-ml/mccs/metadata.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">AltGr/ocaml-mccs</remote-id> diff --git a/dev-ml/memtrace/Manifest b/dev-ml/memtrace/Manifest new file mode 100644 index 000000000000..1b448e9e20b5 --- /dev/null +++ b/dev-ml/memtrace/Manifest @@ -0,0 +1 @@ +DIST memtrace-0.2.3.tar.gz 1237922 BLAKE2B 936761946c51db5681a53f1bcaa9768e7c0fcaf0777f06e6c85f997a807c3d71ae3766d41fe8913bf5c7ab77477f253661ae5341ddcc0c240ef01cc699e167af SHA512 53acbbe5e3b674982d36f58409e14e7f4cf9cbdd8e4f9fcf7901457750fb0754b8ec83cd412c07217cffcbd370c1696bd455039344a6331fb1330cf560eef454 diff --git a/dev-ml/memtrace/memtrace-0.2.3.ebuild b/dev-ml/memtrace/memtrace-0.2.3.ebuild new file mode 100644 index 000000000000..69511ccb9837 --- /dev/null +++ b/dev-ml/memtrace/memtrace-0.2.3.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Streaming client for OCaml's Memprof " +HOMEPAGE="https://github.com/janestreet/memtrace/" + +if [[ "${PV}" == *9999* ]] ; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/janestreet/${PN}.git" +else + SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz + -> ${P}.tar.gz" + + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="MIT" +SLOT="0" +IUSE="+ocamlopt" diff --git a/dev-ml/memtrace/metadata.xml b/dev-ml/memtrace/metadata.xml new file mode 100644 index 000000000000..52496b943271 --- /dev/null +++ b/dev-ml/memtrace/metadata.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> + +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <bugs-to>https://gitlab.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 d644e2fce441..363e3aa706e1 100644 --- a/dev-ml/menhir/Manifest +++ b/dev-ml/menhir/Manifest @@ -1,3 +1,2 @@ -DIST menhir-20170712.tar.gz 855262 BLAKE2B 259a165f30f18720ff2fb3457a8ee51dc63202860a9ad097ad6e49e2666480019b7011a11764f2c3780cf12a246c313058a35f07d100c891e07ba3ed7cb20cca SHA512 7850fa031a2bd69e9cf17db6d8f82f716ab5f9e60b34d1a53591a3ff46750fb01880f3282a7194465441abc4c2ba60f543646097f5f0eef6fe78b36266a3dbdc -DIST menhir-20171013.tar.gz 854000 BLAKE2B d50ce48d32d3bfd588520d6e5a8af4ea628089010fb286df6f87ee3f773273427f9ac6956b4b4bc1c27592aaea1f29447f0223b6b29d9cd0533c47d10eecb318 SHA512 ba6359c471aee62c996bd6495612f444e7ac226f7aad9991a76e4daa2df00cdec2387c488c6a29246ca48079bd8199b94de09a44f1fb05465cbeddff0b39df54 -DIST menhir-20181006.tar.gz 6665871 BLAKE2B 98820922c3dc9ffa27e0f9432d683aae3a1115cd5ba7d1114c57730c7dc679a918c14ef692d1287ca851c62d32aca50a034de1d4c6d4049ddf80e4694bbbae3e SHA512 a838c0b6411345ae64e21f8649367541a7e137af7e552e1dcc3da0c2212813de3d0c359dbd863d0130be897148063b406e0757fd2f18b42d43d3964963ebd4c7 +DIST menhir-20220210.tar.bz2 1160357 BLAKE2B a9401b50db4dfdfe56c5c10919d4d385cbb7bf27d1518932e55d6757c08989407cda17c65f72d20e21738618e4f97f20b10098c9185f3882b3391aab7f9f8bc9 SHA512 8a852e995cab57b16adc1b7708d3acdf5f8b65d13dbf907a4155ff45d71dccc65868fe369590b48a3f06d8319f74777ce2e9be05caa9dbe060c0ae3a2b37943f +DIST menhir-20230608.tar.bz2 1195032 BLAKE2B 6d39fb89a7e5dd862cbb868170d5d7156ccab6a3524fee711535497775bc65074256f2e228da532d3365473be7577e174b7ea075fd3b5b716a402ca575c401ae SHA512 6af16eeb1e43c89a2c60ed38da100cb591726e029e58d5313c05f81a317d63511c5e15c5aa334d1e96db182b51235bfa0a9905804d8232d868e1684a630af007 diff --git a/dev-ml/menhir/menhir-20170712.ebuild b/dev-ml/menhir/menhir-20170712.ebuild deleted file mode 100644 index 51e7184f445c..000000000000 --- a/dev-ml/menhir/menhir-20170712.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib eutils - -DESCRIPTION="LR(1) parser generator for the OCaml language" -HOMEPAGE="http://gallium.inria.fr/~fpottier/menhir/" -SRC_URI="http://gallium.inria.fr/~fpottier/menhir/${P}.tar.gz" - -LICENSE="GPL-2 LGPL-2-with-linking-exception" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" -IUSE="examples +ocamlopt" - -RDEPEND=">=dev-lang/ocaml-4.02:=[ocamlopt?]" -DEPEND="${RDEPEND} - dev-ml/ocamlbuild" - -src_configure() { - if ! use ocamlopt ; then - export TARGET=byte - fi -} - -src_compile() { - emake PREFIX="${EPREFIX}"/usr -j1 -} - -src_install() { - findlib_src_preinst - emake PREFIX="${ED}"/usr docdir="${ED}"/usr/share/doc/"${PF}" $(use examples || echo "DOCS=manual.pdf") install - use examples && docompress -x /usr/share/doc/${PF}/demos - dodoc README.md CHANGES.md -} diff --git a/dev-ml/menhir/menhir-20171013.ebuild b/dev-ml/menhir/menhir-20171013.ebuild deleted file mode 100644 index b34b8feeb563..000000000000 --- a/dev-ml/menhir/menhir-20171013.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib eutils - -DESCRIPTION="LR(1) parser generator for the OCaml language" -HOMEPAGE="http://gallium.inria.fr/~fpottier/menhir/" -SRC_URI="http://gallium.inria.fr/~fpottier/menhir/${P}.tar.gz" - -LICENSE="GPL-2 LGPL-2-with-linking-exception" -SLOT="0/${PV}" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86" -IUSE="examples +ocamlopt" - -RDEPEND=">=dev-lang/ocaml-4.02:=[ocamlopt?]" -DEPEND="${RDEPEND} - dev-ml/ocamlbuild" - -src_configure() { - if ! use ocamlopt ; then - export TARGET=byte - fi -} - -src_compile() { - emake PREFIX="${EPREFIX}"/usr -j1 -} - -src_install() { - findlib_src_preinst - emake PREFIX="${ED}"/usr docdir="${ED}"/usr/share/doc/"${PF}" $(use examples || echo "DOCS=manual.pdf") install - use examples && docompress -x /usr/share/doc/${PF}/demos - dodoc README.md CHANGES.md -} diff --git a/dev-ml/menhir/menhir-20181006.ebuild b/dev-ml/menhir/menhir-20181006.ebuild deleted file mode 100644 index 1ae3f25522f1..000000000000 --- a/dev-ml/menhir/menhir-20181006.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit findlib eutils - -DESCRIPTION="LR(1) parser generator for the OCaml language" -HOMEPAGE="http://gallium.inria.fr/~fpottier/menhir/" -SRC_URI="http://gallium.inria.fr/~fpottier/menhir/${P}.tar.gz" - -LICENSE="GPL-2 LGPL-2-with-linking-exception" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" -IUSE="examples +ocamlopt" - -RDEPEND=">=dev-lang/ocaml-4.02:=[ocamlopt?]" -DEPEND="${RDEPEND} - dev-ml/ocamlbuild" - -src_configure() { - if ! use ocamlopt ; then - export TARGET=byte - fi -} - -src_compile() { - emake PREFIX="${EPREFIX}"/usr -j1 -} - -src_install() { - findlib_src_preinst - emake PREFIX="${ED}"/usr docdir="${ED}"/usr/share/doc/"${PF}" $(use examples || echo "DOCS=manual.pdf") install - use examples && docompress -x /usr/share/doc/${PF}/demos - dodoc README.md CHANGES.md -} diff --git a/dev-ml/menhir/menhir-20220210.ebuild b/dev-ml/menhir/menhir-20220210.ebuild new file mode 100644 index 000000000000..9c9d242694a6 --- /dev/null +++ b/dev-ml/menhir/menhir-20220210.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2023 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/menhir/menhir-20230608.ebuild b/dev-ml/menhir/menhir-20230608.ebuild new file mode 100644 index 000000000000..9c9d242694a6 --- /dev/null +++ b/dev-ml/menhir/menhir-20230608.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2023 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/menhir/metadata.xml b/dev-ml/menhir/metadata.xml index ffac4d7ebc01..ff5a0cd1ae3d 100644 --- a/dev-ml/menhir/metadata.xml +++ b/dev-ml/menhir/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> -</maintainer> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> </pkgmetadata> diff --git a/dev-ml/merlin-extend/Manifest b/dev-ml/merlin-extend/Manifest index 11e157fd4b58..786e1c591ffa 100644 --- a/dev-ml/merlin-extend/Manifest +++ b/dev-ml/merlin-extend/Manifest @@ -1 +1,2 @@ -DIST merlin-extend-0.3.tar.gz 15422 BLAKE2B cfd658c9afa6f4500899c342c86c75399cbbef89fe5817c2a957ec93ba02c360fff66e01b81890d19c87a89380ba1cd352a2ffdc10a2dc53c7d535e8af5f720a SHA512 1e6436299b38c7fa57ae5b681a1409795545bc6f5956d6b1c37cbfdbdabfd90da476c030067fe2e016c823d60d1e5498c4536c869bf58425e1a6ff78295efba4 +DIST merlin-extend-0.6.1.tar.gz 8156 BLAKE2B d007bcfac004af48eafc8c806aabaff4f61d9bf7acd93273a991791144a7c9e8f7307cf61460551326ceb077bd838bb0b1d377aa134d45e2fd20109dc68f3213 SHA512 0d5041231b280dc1026d598cca8c75895a159e102f209be7c5a9a1ac9ab15da66c603d850a3f3f26880f9673e232765108e21984f2eb4dc92d9d1d7fb29b9382 +DIST merlin-extend-0.6.tar.gz 8098 BLAKE2B c8adb32c03a3fe423aa1bb9e10ed9d5041cfbbdc991ae656180debbcad6ee72404bdd7c03d8ee609b809aa27e8013f14785204c759221e33405182ef6c9d1616 SHA512 5cfe4bb1fe8804dcb52eb4cebea6176b5d50fdafbdcd4f5854726c74f196ad06fe3b1b46dde7622f2e5c99ce6bfea9efd070fb81e5fd5e2b5197f40cee109ea7 diff --git a/dev-ml/merlin-extend/merlin-extend-0.3.ebuild b/dev-ml/merlin-extend/merlin-extend-0.6-r1.ebuild index 66c4758edc08..89458b370bfa 100644 --- a/dev-ml/merlin-extend/merlin-extend-0.3.ebuild +++ b/dev-ml/merlin-extend/merlin-extend-0.6-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit findlib +inherit dune DESCRIPTION="SDK to extend Merlin" HOMEPAGE="https://github.com/let-def/merlin-extend" @@ -12,14 +12,8 @@ SRC_URI="https://github.com/let-def/merlin-extend/archive/v${PV}.tar.gz -> ${P}. LICENSE="MIT" SLOT="0/${PV}" KEYWORDS="~amd64" -IUSE="" +IUSE="+ocamlopt" -DEPEND="dev-lang/ocaml:=" -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} +RDEPEND="dev-lang/ocaml:=" +DEPEND="${RDEPEND} dev-ml/cppo" - -src_install() { - findlib_src_preinst - default -} diff --git a/dev-ml/merlin-extend/merlin-extend-0.6.1.ebuild b/dev-ml/merlin-extend/merlin-extend-0.6.1.ebuild new file mode 100644 index 000000000000..2e233f143af0 --- /dev/null +++ b/dev-ml/merlin-extend/merlin-extend-0.6.1.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="SDK to extend Merlin" +HOMEPAGE="https://github.com/let-def/merlin-extend/" +SRC_URI="https://github.com/let-def/merlin-extend/archive/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="+ocamlopt" + +RDEPEND="dev-lang/ocaml:=" +DEPEND=" + ${RDEPEND} + dev-ml/cppo +" diff --git a/dev-ml/merlin-extend/metadata.xml b/dev-ml/merlin-extend/metadata.xml index 6bdf083edd14..8a9aa7ffdc8f 100644 --- a/dev-ml/merlin-extend/metadata.xml +++ b/dev-ml/merlin-extend/metadata.xml @@ -1,9 +1,9 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">let-def/merlin-extend</remote-id> diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest index ae015dc37446..3714fde4055e 100644 --- a/dev-ml/merlin/Manifest +++ b/dev-ml/merlin/Manifest @@ -1,7 +1,2 @@ -DIST merlin-2.5.3.tar.gz 3090459 BLAKE2B a1f6dbbc1e903955100d3001bbe7485deda02fbef3cd50abd14e91fff6a0c7fbc1ba17ca9824b5cdaf983dfceecd9233b2c8ef97b357521d406a432c3e8e6358 SHA512 7399b8afc3cd6c0c26fab44aec80cc7614cbe148bafea3512be9a4165b0ba0c93bc738e2d7e5dcc4b51208c9b9f185cc83e408c484e38b2e72e357cefb9ad5f0 -DIST merlin-2.5.4.tar.gz 3094234 BLAKE2B c59f8a6257d33150ac51704454f09e4d24f448d94c13452a9f77489a409aaa8c2467eb173fc0fb106d305b465db1261e5c9c2022c06e0af3780bf6aeef9550e3 SHA512 ca6a1cc1da0b0211bac4f0e8b9c78b531fdd0ed97f7d978ae740b7bf7a97bb02d318bde97d8a9f143b6207b72bd47eb626748b86feebf6a60bcd222d5bddb759 -DIST merlin-2.5.5.tar.gz 3094071 BLAKE2B 5ed62b0fb02ed455f5302050488b6857cce27f399cad9654f081c1bcfc59ea0a5c710bbb79a9182e270ae9de5d78b6400183b4db6bdc7e6578f329abf962c079 SHA512 9ba79f2fd2e2cdefe94da60b52096696bf08dcfd332188496c35074377a106bb3987025069784a96846a6c1cef1c0793b0525781aed8192227dd0c67266baaf1 -DIST merlin-3.0.0.tar.gz 3971353 BLAKE2B 6122ede68af116549e63709fa71fa2647336431c83014cc81cd8d6555363d9b1ad9ac6273fb1b8a28252b05bedbe84cb7ddc3bfbc07f87ece7a58230df9d680d SHA512 674495c01d4afef8273e904f656475d1e05e6c06b9f8a39ce2e3eb8aacd870a2e721ba510dccd2d9d154f5b6fbfb42840603d189819a573d136a3bcc85ff4551 -DIST merlin-3.0.1.tar.gz 3971680 BLAKE2B 9e5962cab960dcec31c50187e0cef30027c8735e2e3e70e9b74bd8c49315c09b4df0ae6e6aa7d25ea37819d4abf0ffc59bcbb53f962dbbe21e1ebb47a1a47280 SHA512 7f6bedba954fde712b5eda80910c27f80f74f1346c67b0c29b896944c7d51dd268db0aa996610a1dda6edc0798b322369390bb3213f8c42584676790756542ec -DIST merlin-3.0.2.tar.gz 3971755 BLAKE2B 41d39679a7e7fe3ebed38ee40a074e95dd1d5f413ef88ed8a52f4009f401ca9b709d65efadcefd51f3659e94cb6e63f5cf3c98a6b19870d91984da203901b447 SHA512 3f7ae1981a95a58f694928a8b2d5186a304750219655e52d360f1f6fd6f832d5390f3346cf2c58c8618e6de34ab920f92a6c077d241fac5ce41241d7bed4476a -DIST merlin-3.0.3.tar.gz 3979949 BLAKE2B 49fe4f201bff44a3e62e119cae3ab470e4581cff64e9ac4600e94700c36b62ddea8b1a7328fac25492c471ec8c6e5dea9f169c4efefd14863222ce9f2b90dafb SHA512 54532c7e0c2e724d96bea4f60d5368b1aed2b9ac4dc4c81ebeb05486b2c649ef1b911610a7beddce03f81be807efa0bb13fbc1e7e0d598cd92217bf84e9f87f7 +DIST merlin-4.12-414.tbz 1991877 BLAKE2B d68a45efb29d7ed2dd8d2e377a7778fad5500064206e5ae27914a0be9f208f919f44f73f14be283aca653adf56462a782c4f5f895282e078478e60f13e9c09f1 SHA512 3bf4f5e4754def9818ce0abbdf2253fe9d5e0abec7e8814012e2ff9de6a174f288c257780eb9f8aa4d794c0b62a524848d579d2a3495a5747a0970ee9fbfff29 +DIST merlin-4.13-414.tbz 1993752 BLAKE2B 8b5704252f771ddac843340bf2aa24f62a2b490f6bb03c46a1daa2560fae72226b92fb5a9720b18c82f476571e7e6ffc7c30e695c8a0e1a3de6bd65ee58461e1 SHA512 cf7e292a515122756bd614eedbf11cc09108e6afab77cd5805428207b3ca5a98494ee43ad59fcfb667b48fe0874f0a8359882b3c14ee270769f99c41e176d455 diff --git a/dev-ml/merlin/files/50merlin-gentoo.el b/dev-ml/merlin/files/50merlin-gentoo.el new file mode 100644 index 000000000000..1da1f56402a5 --- /dev/null +++ b/dev-ml/merlin/files/50merlin-gentoo.el @@ -0,0 +1,4 @@ +(add-to-list 'load-path "@SITELISP@") +(autoload 'merlin-mode "merlin" "Merlin mode" t) +(add-hook 'tuareg-mode-hook 'merlin-mode) +(add-hook 'caml-mode-hook 'merlin-mode) diff --git a/dev-ml/merlin/merlin-2.5.3.ebuild b/dev-ml/merlin/merlin-2.5.3.ebuild deleted file mode 100644 index 609f9767e4cc..000000000000 --- a/dev-ml/merlin/merlin-2.5.3.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit findlib vim-plugin - -DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs" -HOMEPAGE="https://github.com/ocaml/merlin" -SRC_URI="https://github.com/ocaml/merlin/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -DEPEND=" - dev-lang/ocaml:= - dev-ml/yojson:= -" -RDEPEND="${DEPEND} - || ( app-editors/vim[python] app-editors/gvim[python] )" - -src_configure() { - ./configure \ - --prefix "${EPREFIX}/usr" \ - --vimdir "${EPREFIX}//usr/share/vim/vimfiles" \ - || die -} - -src_install() { - default -} diff --git a/dev-ml/merlin/merlin-2.5.4.ebuild b/dev-ml/merlin/merlin-2.5.4.ebuild deleted file mode 100644 index 609f9767e4cc..000000000000 --- a/dev-ml/merlin/merlin-2.5.4.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit findlib vim-plugin - -DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs" -HOMEPAGE="https://github.com/ocaml/merlin" -SRC_URI="https://github.com/ocaml/merlin/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -DEPEND=" - dev-lang/ocaml:= - dev-ml/yojson:= -" -RDEPEND="${DEPEND} - || ( app-editors/vim[python] app-editors/gvim[python] )" - -src_configure() { - ./configure \ - --prefix "${EPREFIX}/usr" \ - --vimdir "${EPREFIX}//usr/share/vim/vimfiles" \ - || die -} - -src_install() { - default -} diff --git a/dev-ml/merlin/merlin-2.5.5.ebuild b/dev-ml/merlin/merlin-2.5.5.ebuild deleted file mode 100644 index 609f9767e4cc..000000000000 --- a/dev-ml/merlin/merlin-2.5.5.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit findlib vim-plugin - -DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs" -HOMEPAGE="https://github.com/ocaml/merlin" -SRC_URI="https://github.com/ocaml/merlin/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -DEPEND=" - dev-lang/ocaml:= - dev-ml/yojson:= -" -RDEPEND="${DEPEND} - || ( app-editors/vim[python] app-editors/gvim[python] )" - -src_configure() { - ./configure \ - --prefix "${EPREFIX}/usr" \ - --vimdir "${EPREFIX}//usr/share/vim/vimfiles" \ - || die -} - -src_install() { - default -} diff --git a/dev-ml/merlin/merlin-3.0.0.ebuild b/dev-ml/merlin/merlin-3.0.0.ebuild deleted file mode 100644 index 609f9767e4cc..000000000000 --- a/dev-ml/merlin/merlin-3.0.0.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit findlib vim-plugin - -DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs" -HOMEPAGE="https://github.com/ocaml/merlin" -SRC_URI="https://github.com/ocaml/merlin/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -DEPEND=" - dev-lang/ocaml:= - dev-ml/yojson:= -" -RDEPEND="${DEPEND} - || ( app-editors/vim[python] app-editors/gvim[python] )" - -src_configure() { - ./configure \ - --prefix "${EPREFIX}/usr" \ - --vimdir "${EPREFIX}//usr/share/vim/vimfiles" \ - || die -} - -src_install() { - default -} diff --git a/dev-ml/merlin/merlin-3.0.1.ebuild b/dev-ml/merlin/merlin-3.0.1.ebuild deleted file mode 100644 index 609f9767e4cc..000000000000 --- a/dev-ml/merlin/merlin-3.0.1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit findlib vim-plugin - -DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs" -HOMEPAGE="https://github.com/ocaml/merlin" -SRC_URI="https://github.com/ocaml/merlin/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -DEPEND=" - dev-lang/ocaml:= - dev-ml/yojson:= -" -RDEPEND="${DEPEND} - || ( app-editors/vim[python] app-editors/gvim[python] )" - -src_configure() { - ./configure \ - --prefix "${EPREFIX}/usr" \ - --vimdir "${EPREFIX}//usr/share/vim/vimfiles" \ - || die -} - -src_install() { - default -} diff --git a/dev-ml/merlin/merlin-3.0.2.ebuild b/dev-ml/merlin/merlin-3.0.2.ebuild deleted file mode 100644 index 609f9767e4cc..000000000000 --- a/dev-ml/merlin/merlin-3.0.2.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit findlib vim-plugin - -DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs" -HOMEPAGE="https://github.com/ocaml/merlin" -SRC_URI="https://github.com/ocaml/merlin/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -DEPEND=" - dev-lang/ocaml:= - dev-ml/yojson:= -" -RDEPEND="${DEPEND} - || ( app-editors/vim[python] app-editors/gvim[python] )" - -src_configure() { - ./configure \ - --prefix "${EPREFIX}/usr" \ - --vimdir "${EPREFIX}//usr/share/vim/vimfiles" \ - || die -} - -src_install() { - default -} diff --git a/dev-ml/merlin/merlin-3.0.3.ebuild b/dev-ml/merlin/merlin-3.0.3.ebuild deleted file mode 100644 index 609f9767e4cc..000000000000 --- a/dev-ml/merlin/merlin-3.0.3.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit findlib vim-plugin - -DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs" -HOMEPAGE="https://github.com/ocaml/merlin" -SRC_URI="https://github.com/ocaml/merlin/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -DEPEND=" - dev-lang/ocaml:= - dev-ml/yojson:= -" -RDEPEND="${DEPEND} - || ( app-editors/vim[python] app-editors/gvim[python] )" - -src_configure() { - ./configure \ - --prefix "${EPREFIX}/usr" \ - --vimdir "${EPREFIX}//usr/share/vim/vimfiles" \ - || die -} - -src_install() { - default -} diff --git a/dev-ml/merlin/merlin-4.12.ebuild b/dev-ml/merlin/merlin-4.12.ebuild new file mode 100644 index 000000000000..3e4435149b42 --- /dev/null +++ b/dev-ml/merlin/merlin-4.12.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# TODO: vim-plugin, although it's not clear how to make it work here +inherit elisp-common dune + +DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs" +HOMEPAGE="https://github.com/ocaml/merlin/" +SRC_URI="https://github.com/ocaml/merlin/releases/download/v${PV}-414/${P}-414.tbz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64" +IUSE="emacs +ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-lang/ocaml:=[ocamlopt?] + dev-ml/csexp:= + >=dev-ml/yojson-2.0.0:= + dev-ml/menhir:= + >=dev-ml/dune-2.9:= + || ( + dev-lang/ocaml:0/4.14 + dev-lang/ocaml:0/4.14.1 + ) + emacs? ( + >=app-editors/emacs-23.1:* + app-emacs/auto-complete + app-emacs/company-mode + ) +" +DEPEND="${RDEPEND}" +# NOTICE: Block dev-ml/seq (which is a back-port of code to ocaml <4.07) +# because it breaks merlin builds. +# https://github.com/ocaml/merlin/issues/1500 +BDEPEND=" + !!<dev-ml/seq-0.3 + test? ( app-misc/jq ) +" + +SITEFILE="50${PN}-gentoo.el" + +src_unpack() { + default + + if has_version "dev-lang/ocaml:0/4.14" ; then + mv ${P}-414 "${S}" || die + elif has_version "dev-lang/ocaml:0/4.14.1" ; then + mv ${P}-414 "${S}" || die + fi +} + +src_prepare() { + default + + # Handle ELisp installation via the Emacs Eclass. + rm emacs/dune || die + + # This test runs only inside a git repo, + # it is not included in merlin release for ocaml 4.12. + if [[ -f tests/test-dirs/occurrences/issue1404.t ]] ; then + rm tests/test-dirs/occurrences/issue1404.t || die + fi + rm -r tests/test-dirs/locate/context-detection/cd-mod_constr.t || die + + # Remove seq references from dune build files. + sed -i 's|seq||g' src/frontend/ocamlmerlin/dune || die +} + +src_compile() { + edune build @install + + if use emacs ; then + # iedit isn't packaged yet + rm emacs/merlin-iedit.el || die + + BYTECOMPFLAGS="-L emacs" elisp-compile emacs/*.el + fi +} + +src_install() { + dune_src_install + + if use emacs ; then + elisp-install ${PN} emacs/*.el{,c} + elisp-site-file-install "${FILESDIR}/${SITEFILE}" + fi +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/dev-ml/merlin/merlin-4.13.ebuild b/dev-ml/merlin/merlin-4.13.ebuild new file mode 100644 index 000000000000..80b96bc1404a --- /dev/null +++ b/dev-ml/merlin/merlin-4.13.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# TODO: vim-plugin, although it's not clear how to make it work here +inherit elisp-common dune + +DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs" +HOMEPAGE="https://github.com/ocaml/merlin/" +SRC_URI="https://github.com/ocaml/merlin/releases/download/v${PV}-414/${P}-414.tbz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64" +IUSE="emacs +ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-lang/ocaml:=[ocamlopt?] + dev-ml/csexp:= + >=dev-ml/yojson-2.0.0:= + dev-ml/menhir:= + >=dev-ml/dune-2.9:= + || ( + dev-lang/ocaml:0/4.14 + dev-lang/ocaml:0/4.14.1 + ) + emacs? ( + >=app-editors/emacs-23.1:* + app-emacs/auto-complete + app-emacs/company-mode + ) +" +DEPEND="${RDEPEND}" +# NOTICE: Block dev-ml/seq (which is a back-port of code to ocaml <4.07) +# because it breaks merlin builds. +# https://github.com/ocaml/merlin/issues/1500 +BDEPEND=" + !!<dev-ml/seq-0.3 + test? ( + app-misc/jq + ) +" + +SITEFILE="50${PN}-gentoo.el" + +src_unpack() { + default + + if has_version "dev-lang/ocaml:0/4.14" ; then + mv ${P}-414 "${S}" || die + elif has_version "dev-lang/ocaml:0/4.14.1" ; then + mv ${P}-414 "${S}" || die + fi +} + +src_prepare() { + default + + # Handle ELisp installation via the Emacs Eclass. + rm emacs/dune || die + + # This test runs only inside a git repo, + # it is not included in merlin release for ocaml 4.12. + if [[ -f tests/test-dirs/occurrences/issue1404.t ]] ; then + rm tests/test-dirs/occurrences/issue1404.t || die + fi + rm -r tests/test-dirs/locate/context-detection/cd-mod_constr.t || die + + # Remove seq references from dune build files. + sed -i 's|seq||g' src/frontend/ocamlmerlin/dune || die +} + +src_compile() { + edune build --display=short @install + + if use emacs ; then + # iedit isn't packaged yet + rm emacs/merlin-iedit.el || die + + BYTECOMPFLAGS="-L emacs" elisp-compile emacs/*.el + fi +} + +src_install() { + dune_src_install + + if use emacs ; then + elisp-install ${PN} emacs/*.el{,c} + elisp-site-file-install "${FILESDIR}/${SITEFILE}" + fi +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/dev-ml/merlin/metadata.xml b/dev-ml/merlin/metadata.xml index 99e15dd27c26..48df2876cb6e 100644 --- a/dev-ml/merlin/metadata.xml +++ b/dev-ml/merlin/metadata.xml @@ -1,9 +1,9 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">ocaml/merlin</remote-id> diff --git a/dev-ml/metadata.xml b/dev-ml/metadata.xml index 54ef546c0f26..3e46743445fa 100644 --- a/dev-ml/metadata.xml +++ b/dev-ml/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE catmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <catmetadata> <longdescription lang="en"> The dev-ml category contains libraries and utilities relevant to the @@ -37,4 +37,3 @@ językiem programowania ML. </longdescription> </catmetadata> - diff --git a/dev-ml/mew/Manifest b/dev-ml/mew/Manifest new file mode 100644 index 000000000000..4f54866d6ad2 --- /dev/null +++ b/dev-ml/mew/Manifest @@ -0,0 +1 @@ +DIST mew-0.1.0.tar.gz 4309 BLAKE2B 7280369eb4d8d940c5f30b8d3485020b088bdca918e3c2992c54e9785ac4fcbd99a0552285c68742704d845b3764b0bd741592963095254cb744b621c2b1eb6d SHA512 77a68f6dc9f3edc729384d59247a29f32f969dc6d987ed2e6c88b9a64b655822dafa9c3cb424bf40e6cf9ed20cddf9c708738872db245f14a711770e8e938db3 diff --git a/dev-ml/mew/metadata.xml b/dev-ml/mew/metadata.xml new file mode 100644 index 000000000000..b99db26a4ae3 --- /dev/null +++ b/dev-ml/mew/metadata.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> + +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <bugs-to>https://github.com/kandu/mew/issues/</bugs-to> + <remote-id type="github">kandu/mew</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/mew/mew-0.1.0-r1.ebuild b/dev-ml/mew/mew-0.1.0-r1.ebuild new file mode 100644 index 000000000000..6298b8d0a721 --- /dev/null +++ b/dev-ml/mew/mew-0.1.0-r1.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="General modal editing engine generator" +HOMEPAGE="https://github.com/kandu/mew" +SRC_URI="https://github.com/kandu/mew/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-ml/result:= + dev-ml/trie:= +" +DEPEND="${RDEPEND}" +BDEPEND="test? ( dev-ml/ppx_expect )" diff --git a/dev-ml/mew_vi/Manifest b/dev-ml/mew_vi/Manifest new file mode 100644 index 000000000000..e8e4772e23c7 --- /dev/null +++ b/dev-ml/mew_vi/Manifest @@ -0,0 +1 @@ +DIST mew_vi-0.5.0.tar.gz 8605 BLAKE2B 30953927947b80391ccff3a7378bfc7d4edcff7164226225c5c1f0fc835312aa31220eedc2e29de663027dd32e316f4ac365494da0893f6d91094f35c036b0db SHA512 f6ee1375ceee60ccae1799d07a8bc55684fdbffc2275147ef19cf3c7d242663764e6630b9423287a78efacba17f410971e3fc397d202effb331f94dc00797eb0 diff --git a/dev-ml/mew_vi/metadata.xml b/dev-ml/mew_vi/metadata.xml new file mode 100644 index 000000000000..1f044b5af878 --- /dev/null +++ b/dev-ml/mew_vi/metadata.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> + +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <bugs-to>https://github.com/kandu/mew_vi/issues/</bugs-to> + <remote-id type="github">kandu/mew_vi</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/mew_vi/mew_vi-0.5.0.ebuild b/dev-ml/mew_vi/mew_vi-0.5.0.ebuild new file mode 100644 index 000000000000..7070943c97e6 --- /dev/null +++ b/dev-ml/mew_vi/mew_vi-0.5.0.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="A vi-like modal editing engine generator" +HOMEPAGE="https://github.com/kandu/mew_vi" +SRC_URI="https://github.com/kandu/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="+ocamlopt" + +RDEPEND=" + dev-ml/mew:= + dev-ml/react:= +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/mirage-clock/Manifest b/dev-ml/mirage-clock/Manifest new file mode 100644 index 000000000000..82acb7cc92fa --- /dev/null +++ b/dev-ml/mirage-clock/Manifest @@ -0,0 +1,2 @@ +DIST mirage-clock-3.1.0.tar.gz 8441 BLAKE2B a8cc3b1ab3f929c4c28ce5f0dfe30d316b1d9445f4fd053743d5e224e8b5630c9ae2d12804ca690488a238c6aa8cd8b197ca8ca7d9e49b902964570c78ed946b SHA512 e4518a6c47e18c7fd3fd910de2f68cacb18735d59bcfffc79b676c8526466f2134979805222c39496588ef6f16a8f6b1fb79fec478459a3ec474fb60118c5551 +DIST mirage-clock-4.2.0.tar.gz 8440 BLAKE2B 37c701a92ec8cdf71e9d297ec09992f313f1b3637146988b8fac3e7c6e21be4eb2ebe622fdf1ae52612b2cf51e6cbfa87750c62bf68f126d3e61789d461a4a31 SHA512 7c32adf30505fe35a1313c162731b96e283a883dbc18d530344830a1f76d3397a6dd3b76a4ac3024aa02ff917d228c953c9ebdfeeae1f48686e776007234edda diff --git a/dev-ml/mirage-clock/metadata.xml b/dev-ml/mirage-clock/metadata.xml new file mode 100644 index 000000000000..0be54068848e --- /dev/null +++ b/dev-ml/mirage-clock/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">mirage/mirage-clock</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/mirage-clock/mirage-clock-3.1.0.ebuild b/dev-ml/mirage-clock/mirage-clock-3.1.0.ebuild new file mode 100644 index 000000000000..f2e3d420d7a5 --- /dev/null +++ b/dev-ml/mirage-clock/mirage-clock-3.1.0.ebuild @@ -0,0 +1,17 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="A lightweight and colourful test framework" +HOMEPAGE="https://github.com/mirage/mirage-clock" +SRC_URI="https://github.com/mirage/mirage-clock/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="ISC" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +BDEPEND="dev-ml/dune-configurator" diff --git a/dev-ml/mirage-clock/mirage-clock-4.2.0.ebuild b/dev-ml/mirage-clock/mirage-clock-4.2.0.ebuild new file mode 100644 index 000000000000..b8d1773320c1 --- /dev/null +++ b/dev-ml/mirage-clock/mirage-clock-4.2.0.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Portable clock implementation for Unix and Xen" +HOMEPAGE="https://github.com/mirage/mirage-clock" +SRC_URI="https://github.com/mirage/mirage-clock/archive/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="ISC" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +BDEPEND="dev-ml/dune-configurator" + +src_install() { + dune-install mirage-clock mirage-clock-solo5 mirage-clock-unix +} diff --git a/dev-ml/mirage-profile/Manifest b/dev-ml/mirage-profile/Manifest deleted file mode 100644 index b8c573770758..000000000000 --- a/dev-ml/mirage-profile/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST mirage-profile-0.7.0.tar.gz 55531 BLAKE2B 1432d187b5e99723cd7135980495e03b7119f41686b1e8dc1c947227436154abce53eae3d17f8eceb8e87a0b01b03d5d995e85a566a3d566aee05ac7104bda30 SHA512 58a6224942f8395ec78936b29d1a0f39eb0228cdb6a139a942f4bf675b35e0e9157d3e57d0c8953cf168fc5ba4356158e339a31b3719cdaf534f52c51c7a0b47 diff --git a/dev-ml/mirage-profile/metadata.xml b/dev-ml/mirage-profile/metadata.xml deleted file mode 100644 index 6ed0938f83b5..000000000000 --- a/dev-ml/mirage-profile/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">mirage/mirage-profile</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/mirage-profile/mirage-profile-0.7.0-r1.ebuild b/dev-ml/mirage-profile/mirage-profile-0.7.0-r1.ebuild deleted file mode 100644 index 1757681ac744..000000000000 --- a/dev-ml/mirage-profile/mirage-profile-0.7.0-r1.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -OASIS_BUILD_TESTS=1 - -inherit oasis - -DESCRIPTION="Collect profiling information" -HOMEPAGE="https://github.com/mirage/mirage-profile https://mirage.io" -SRC_URI="https://github.com/mirage/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD-2" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" -# https://github.com/mirage/mirage-profile/issues/11 -RESTRICT="test" - -RDEPEND=" - >=dev-lang/ocaml-4:= - dev-ml/io-page:= - dev-ml/lwt:= - >=dev-ml/ocaml-cstruct-1.9.0:=[ppx(-)] - dev-ml/ppx_tools:= - dev-ml/ocplib-endian:= -" -DEPEND=" - ${RDEPEND} -" - -DOCS=( README.md ) diff --git a/dev-ml/mmap/Manifest b/dev-ml/mmap/Manifest new file mode 100644 index 000000000000..37d934ae0e02 --- /dev/null +++ b/dev-ml/mmap/Manifest @@ -0,0 +1,2 @@ +DIST mmap-1.2.0.tar.gz 15328 BLAKE2B d7ab07cb0883c7ca53827ad3d4402caf3beba765d6a7e5355f24fb77d6876676f0920bf19e38911b08dde222dbc5d404fa3d53d146bb20f3b807c8fb00ce968d SHA512 cef6c37953d62f2f7472147a03707d60401d92aaf4ddb2dbaa697ee4eee252f70d8068e8fe5c6a36e005d4cc738f61d2c5bea12d844f1e3a696fef2f6546d59c +DIST mmap-v1.1.0.tbz 12312 BLAKE2B 3f688f5649ef51fc2a0cee76519da46dcfecd72a065de3cdc72412e27bfa39c26c6bb54d35ea6e3b139db0ccc75e9460f8285826c40ecc894a3782f279366686 SHA512 15e4ec2634998f321f495de5372dc75a3f4059ab7512115603ae8fd99a619c91299d34c8a12a697aa36df4ce14c90c66746b873eddf004b7bbbeaef8ec7858f5 diff --git a/dev-ml/mmap/metadata.xml b/dev-ml/mmap/metadata.xml new file mode 100644 index 000000000000..d7b139089d5f --- /dev/null +++ b/dev-ml/mmap/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">mirage/mmap</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/mmap/mmap-1.1.0.ebuild b/dev-ml/mmap/mmap-1.1.0.ebuild new file mode 100644 index 000000000000..589b965a2041 --- /dev/null +++ b/dev-ml/mmap/mmap-1.1.0.ebuild @@ -0,0 +1,17 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="File mapping" +HOMEPAGE="https://github.com/mirage/mmap" +SRC_URI="https://github.com/mirage/mmap/releases/download/v${PV}/${PN}-v${PV}.tbz" + +LICENSE="LGPL-2.1" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +S="${WORKDIR}/${PN}-v${PV}" diff --git a/dev-ml/mmap/mmap-1.2.0-r1.ebuild b/dev-ml/mmap/mmap-1.2.0-r1.ebuild new file mode 100644 index 000000000000..b156fe62c30d --- /dev/null +++ b/dev-ml/mmap/mmap-1.2.0-r1.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="File mapping" +HOMEPAGE="https://github.com/mirage/mmap/" +SRC_URI="https://github.com/mirage/mmap/archive/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +RDEPEND="dev-ml/bigarray-compat:=" +DEPEND="${RDEPEND}" diff --git a/dev-ml/mongo/Manifest b/dev-ml/mongo/Manifest deleted file mode 100644 index 00ec9b8d3784..000000000000 --- a/dev-ml/mongo/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST mongo-0.67.2.tar.gz 81611 BLAKE2B 4ce07f7699d2a3a420dc453171b27887634078a2609658fa0cc6574bc493fb707d1f9495a5949dfbbc77e6e05e50d73dbf0fd540f67c7b3cc3e8e9872b61f21a SHA512 779e214b10eb50fe06b9336cd515566b8091bd678b86ad91f5d437dd25b81d3e6996f2f09226061b836fad5c994a9c30edafdb76b7ef5d617fb701d830191c9d diff --git a/dev-ml/mongo/files/noinstalltest.patch b/dev-ml/mongo/files/noinstalltest.patch deleted file mode 100644 index 4166a70fdb4b..000000000000 --- a/dev-ml/mongo/files/noinstalltest.patch +++ /dev/null @@ -1,9 +0,0 @@ -Index: mongo-0.67.2/_oasis -=================================================================== ---- mongo-0.67.2.orig/_oasis -+++ mongo-0.67.2/_oasis -@@ -51,3 +51,4 @@ Executable test - BuildTools: ocamlbuild - BuildDepends: unix, mongo, bson - CompiledObject: native -+ Install: false diff --git a/dev-ml/mongo/metadata.xml b/dev-ml/mongo/metadata.xml deleted file mode 100644 index 6179c498d658..000000000000 --- a/dev-ml/mongo/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">MassD/mongo</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/mongo/mongo-0.67.2.ebuild b/dev-ml/mongo/mongo-0.67.2.ebuild deleted file mode 100644 index 59c090ed88be..000000000000 --- a/dev-ml/mongo/mongo-0.67.2.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit oasis - -DESCRIPTION="An ocaml driver for mongodb" -HOMEPAGE="http://massd.github.io/" -SRC_URI="https://github.com/MassD/mongo/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND=" - dev-ml/bson:= - dev-ml/lwt:= -" -DEPEND="${RDEPEND} dev-ml/oasis" - -src_prepare() { - epatch "${FILESDIR}/noinstalltest.patch" - oasis setup || die -} diff --git a/dev-ml/mtime/Manifest b/dev-ml/mtime/Manifest index 5218f058d5c2..b9d8614b95c4 100644 --- a/dev-ml/mtime/Manifest +++ b/dev-ml/mtime/Manifest @@ -1 +1,3 @@ -DIST mtime-1.1.0.tbz 15467 BLAKE2B 975fdb01c6a4806035a5fbc256d192d6c2f45bdfb750045293b10a732c5613108d9bce897d3c1be660af60d6e9bafbf299dedbc0d872d1c09f65f47b11c9a6b6 SHA512 8ed5dae589dd27fc6e748218a9d9fb9d7d954d231fc2100d61c1b336e0ed38a215bc608cdea9965547729177c78c868c1de6a5ceac6735686a3de1c4a791746c +DIST mtime-1.2.0.tbz 16272 BLAKE2B 317201f8d5e7a55636e58748ffd269db5e88aed012e8dd7ed269d1f128f8d21ed0e707679b030b9c822bac98c9b76033e8d2402171c4ee758d8c936fbeee7ee9 SHA512 0f0ed220cd0f899643930814010f8592e1f47b6dc6c4dce8eebfb17a81b0abed093a3dbf9c02490af99bf81ea640372f73b4ab88fd8ef0e0c7c66920692a8778 +DIST mtime-1.4.0.tbz 15909 BLAKE2B 3c49deaf72d3873c8447f4a6d8ce89d55f3df60df108132ec078d81702a6fb9d532266efdf5290fe396d57a84de2d1912b48ad92f84db6d573d977492407b95b SHA512 0492fa5f5187b909fe2b0550363c7dcb8cffef963d51072272ef3d876b51e1ddf8de4c4e221cffb0144658fccf6a0dc584a5c8094a4b2208156e43bad5b269d4 +DIST mtime-2.0.0.tbz 16284 BLAKE2B de653a8ce5d53c53520f755f706d7eea8c13a53b0dcd27146d19b273b03bbc1582c77698f8e7b2148b4d1a3af63a37698978547945b06814fe9333c963619c08 SHA512 2ebec45218901c08f73420aa3318c506f155b6c0df713e9856682e59d3246696821ea477ce3682af0bf4cafd0491b1d66904f8c0256e2cf831e93a0aea322f04 diff --git a/dev-ml/mtime/metadata.xml b/dev-ml/mtime/metadata.xml index 1a0e75172ffb..bd6382d05138 100644 --- a/dev-ml/mtime/metadata.xml +++ b/dev-ml/mtime/metadata.xml @@ -1,9 +1,9 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">dbuenzli/mtime</remote-id> diff --git a/dev-ml/mtime/mtime-1.1.0.ebuild b/dev-ml/mtime/mtime-1.1.0.ebuild deleted file mode 100644 index 1c5185f3abd3..000000000000 --- a/dev-ml/mtime/mtime-1.1.0.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils opam - -DESCRIPTION="OCaml module to access monotonic wall-clock time" -HOMEPAGE="http://erratique.ch/software/mtime https://github.com/dbuenzli/mtime" -SRC_URI="http://erratique.ch/software/mtime/releases/${P}.tbz" - -LICENSE="ISC" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="javascript test" - -RDEPEND="dev-lang/ocaml:=[ocamlopt] - javascript? ( dev-ml/js_of_ocaml:= ) -" -DEPEND="${RDEPEND} - dev-ml/topkg - dev-ml/ocamlbuild - dev-ml/findlib" - -src_compile() { - ocaml pkg/pkg.ml build \ - --with-js_of_ocaml $(usex javascript true false) \ - --tests $(usex test true false) \ - || die -} - -src_test() { - ocaml pkg/pkg.ml test || die -} diff --git a/dev-ml/mtime/mtime-1.2.0.ebuild b/dev-ml/mtime/mtime-1.2.0.ebuild new file mode 100644 index 000000000000..70153205a2bd --- /dev/null +++ b/dev-ml/mtime/mtime-1.2.0.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit opam + +DESCRIPTION="OCaml module to access monotonic wall-clock time" +HOMEPAGE="https://erratique.ch/software/mtime https://github.com/dbuenzli/mtime" +SRC_URI="https://erratique.ch/software/mtime/releases/${P}.tbz" + +LICENSE="ISC" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND="dev-lang/ocaml:=[ocamlopt]" +DEPEND="${RDEPEND} + dev-ml/topkg + dev-ml/ocamlbuild + dev-ml/findlib" + +src_compile() { + ocaml pkg/pkg.ml build \ + --with-js_of_ocaml false \ + --tests $(usex test true false) \ + || die +} + +src_test() { + ocaml pkg/pkg.ml test || die +} diff --git a/dev-ml/mtime/mtime-1.4.0.ebuild b/dev-ml/mtime/mtime-1.4.0.ebuild new file mode 100644 index 000000000000..77f795ddaa20 --- /dev/null +++ b/dev-ml/mtime/mtime-1.4.0.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit edo opam + +DESCRIPTION="OCaml module to access monotonic wall-clock time" +HOMEPAGE="https://erratique.ch/software/mtime https://github.com/dbuenzli/mtime" +SRC_URI="https://erratique.ch/software/mtime/releases/${P}.tbz" + +LICENSE="ISC" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND="dev-lang/ocaml:=[ocamlopt]" +DEPEND="${RDEPEND} + dev-ml/topkg + dev-ml/ocamlbuild + dev-ml/findlib" + +src_compile() { + edo ocaml pkg/pkg.ml build \ + --tests $(usex test true false) +} + +src_test() { + edo ocaml pkg/pkg.ml test +} diff --git a/dev-ml/mtime/mtime-2.0.0.ebuild b/dev-ml/mtime/mtime-2.0.0.ebuild new file mode 100644 index 000000000000..56655aef9d3f --- /dev/null +++ b/dev-ml/mtime/mtime-2.0.0.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit edo opam + +DESCRIPTION="OCaml module to access monotonic wall-clock time" +HOMEPAGE="https://erratique.ch/software/mtime/ + https://github.com/dbuenzli/mtime/" +SRC_URI="https://erratique.ch/software/mtime/releases/${P}.tbz" + +LICENSE="ISC" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND="dev-lang/ocaml:=[ocamlopt]" +DEPEND=" + ${RDEPEND} + dev-ml/topkg + dev-ml/ocamlbuild + dev-ml/findlib +" + +src_compile() { + edo ocaml pkg/pkg.ml build \ + --tests $(usex test true false) +} + +src_test() { + edo ocaml pkg/pkg.ml test +} diff --git a/dev-ml/num/Manifest b/dev-ml/num/Manifest new file mode 100644 index 000000000000..c545fca9b107 --- /dev/null +++ b/dev-ml/num/Manifest @@ -0,0 +1,2 @@ +DIST num-1.3.tar.gz 66251 BLAKE2B d6fde246693c8aef3b881a4ebc2b601392e0f0bf561dc4f4d32a5e1f835a5186deba3ffa77c88c6c05cd6e837dc836567fcabffefae99ce1ccae94e1bdfc849a SHA512 c88310f8c45700990095e6b2e9abf24c27347711b9abfd1dde75e540fbbfc6a365e6713bd69f66009af305728fcb36dc61eb37fdd0be7d73824b0e92fbe8c031 +DIST num-1.4.tar.gz 66327 BLAKE2B 59eae642e19f452dd911ef6c32b89978f2034a5fcaece4a358f3da447c8d6cb2b2581c39d032eb117edaf7ecf942583281eb6e31716b06960e768c2a985e099e SHA512 0cc9be8ad95704bb683b4bf6698bada1ee9a40dc05924b72adc7b969685c33eeb68ccf174cc09f6a228c48c18fe94af06f28bebc086a24973a066da620db8e6f diff --git a/dev-ml/num/files/num-1.3-cflags.patch b/dev-ml/num/files/num-1.3-cflags.patch new file mode 100644 index 000000000000..771455c4f724 --- /dev/null +++ b/dev-ml/num/files/num-1.3-cflags.patch @@ -0,0 +1,11 @@ +--- a/src/Makefile 2020-05-21 18:54:31.176399032 +0200 ++++ b/src/Makefile 2020-05-21 18:55:27.881498310 +0200 +@@ -65,7 +65,7 @@ + %.cmx: %.ml + $(OCAMLOPT) $(CAMLOPTFLAGS) -c $*.ml + %.$(O): %.c +- $(OCAMLC) -ccopt -DBNG_ARCH_$(BNG_ARCH) -c $*.c ++ $(OCAMLC) -ccopt "-DBNG_ARCH_$(BNG_ARCH) $(CFLAGS)" -c $*.c + + # Legacy installation: files go into OCaml's stdlib directory; only META + # is installed via findlib diff --git a/dev-ml/num/files/num-1.4-ocamlopt.patch b/dev-ml/num/files/num-1.4-ocamlopt.patch new file mode 100644 index 000000000000..6db5015e1d9a --- /dev/null +++ b/dev-ml/num/files/num-1.4-ocamlopt.patch @@ -0,0 +1,27 @@ +--- a/src/Makefile 2022-01-12 19:58:54.655901110 +0100 ++++ b/src/Makefile 2022-01-12 19:59:25.446339664 +0100 +@@ -33,11 +33,10 @@ + + all:: libnums.$(A) nums.cma + ++ifeq "$(NATDYNLINK)" "true" + ifneq "$(ARCH)" "none" + all:: nums.cmxa + endif +- +-ifeq "$(NATDYNLINK)" "true" + all:: nums.cmxs + endif + +@@ -70,10 +70,10 @@ + # is installed via findlib + + TOINSTALL=nums.cma libnums.$(A) $(CMIS) $(CMIS:.cmi=.mli) $(CMIS:.cmi=.cmti) ++ifeq "$(NATDYNLINK)" "true" + ifneq "$(ARCH)" "none" + TOINSTALL+=nums.cmxa nums.$(A) $(CMXS) + endif +-ifeq "$(NATDYNLINK)" "true" + TOINSTALL+=nums.cmxs + endif + ifeq "$(SUPPORTS_SHARED_LIBRARIES)" "true" diff --git a/dev-ml/num/metadata.xml b/dev-ml/num/metadata.xml new file mode 100644 index 000000000000..85700a64a24e --- /dev/null +++ b/dev-ml/num/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">ocaml/num</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/num/num-1.3-r1.ebuild b/dev-ml/num/num-1.3-r1.ebuild new file mode 100644 index 000000000000..c61102b4acb1 --- /dev/null +++ b/dev-ml/num/num-1.3-r1.ebuild @@ -0,0 +1,32 @@ +# Copyright 2020-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit findlib + +DESCRIPTION="Library for arbitrary-precision integer and rational arithmetic" +HOMEPAGE="https://github.com/ocaml/num" +SRC_URI="https://github.com/ocaml/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1-with-linking-exception" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos" + +DEPEND=">=dev-lang/ocaml-4.09.0:=[ocamlopt] + >=dev-ml/findlib-1.8.1[ocamlopt]" +RDEPEND="${DEPEND}" +BDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-cflags.patch +) + +src_compile() { + emake CFLAGS="${CFLAGS}" +} + +src_install() { + findlib_src_preinst + OCAMLPATH="${OCAMLFIND_DESTDIR}" emake install DESTDIR="${D}" +} diff --git a/dev-ml/num/num-1.4-r3.ebuild b/dev-ml/num/num-1.4-r3.ebuild new file mode 100644 index 000000000000..d9a74072c775 --- /dev/null +++ b/dev-ml/num/num-1.4-r3.ebuild @@ -0,0 +1,40 @@ +# Copyright 2020-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# Not using dune for now, bug #775119 +inherit findlib + +DESCRIPTION="Library for arbitrary-precision integer and rational arithmetic" +HOMEPAGE="https://github.com/ocaml/num" +SRC_URI="https://github.com/ocaml/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1-with-linking-exception" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="+ocamlopt" + +RDEPEND="dev-lang/ocaml:=[ocamlopt?]" +BDEPEND="${RDEPEND}" +DEPEND="dev-ml/findlib:=[ocamlopt?]" + +PATCHES=( "${FILESDIR}"/${P}-ocamlopt.patch ) + +src_compile() { + emake CFLAGS="${CFLAGS}" NATDYNLINK="$(usex ocamlopt true false)" +} + +src_test() { + # Override needed to not use dune + emake test +} + +src_install() { + findlib_src_install NATDYNLINK="$(usex ocamlopt true false)" + + if has_version ">=dev-ml/findlib-1.9" ; then + # See bug #803275 + rm "${ED}/usr/$(get_libdir)/ocaml/num-top/META" || die + fi +} diff --git a/dev-ml/oasis/Manifest b/dev-ml/oasis/Manifest deleted file mode 100644 index e71acdc8409a..000000000000 --- a/dev-ml/oasis/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST oasis-0.4.10.tar.gz 394732 BLAKE2B 6347e532d595e33a3a62f63669625d6de0081e8be90568a0e9f334b9745a40ec2593e7c79d21174f3119728c4831393efff0a3ab6d1aeadc594a0f96e5112a72 SHA512 c173a3a774d13a7cb21ddb44f89dadef210d331ab5f3a1e7ff1705e815572f70e22815736cc3f3788b6d8f784c21a309b45c5bf5e984e583b31931847bf107fd -DIST oasis-0.4.8.tar.gz 389565 BLAKE2B 50103f261fd4c9d11fea1d7c26abc047fd0f30ab17b871672cb1ce0a89fd47d378fd4f31d48f1a6835361ddb74761a0ad9fe4bc5ca514e470a4cf3594f30c762 SHA512 e0baf0f048647c25eac5472db0d2a22d0fcaf85fe61ebd88ec5a101c20d4916ecfa9d10fae069ba4479abb22b90c44f18312b9252727a8c7c7de4aa2d8d72663 diff --git a/dev-ml/oasis/metadata.xml b/dev-ml/oasis/metadata.xml deleted file mode 100644 index 75c9ea74812d..000000000000 --- a/dev-ml/oasis/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> -</pkgmetadata> diff --git a/dev-ml/oasis/oasis-0.4.10.ebuild b/dev-ml/oasis/oasis-0.4.10.ebuild deleted file mode 100644 index 4a26f9bc6e6d..000000000000 --- a/dev-ml/oasis/oasis-0.4.10.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -OASIS_BUILD_TESTS=1 -OASIS_BUILD_DOCS=1 - -inherit oasis - -MY_P=${P/_/\~} -DESCRIPTION="Tool to integrate a configure, build and install system in OCaml project" -HOMEPAGE="http://oasis.forge.ocamlcore.org/index.php" -SRC_URI="http://forge.ocamlcore.org/frs/download.php/1694/${MY_P}.tar.gz" - -LICENSE="LGPL-2.1-with-linking-exception" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=">=dev-ml/ocaml-data-notation-0.0.11:= - dev-ml/ocamlbuild:=[ocamlopt] - dev-ml/camlp4:= -" -DEPEND="${RDEPEND} - >=dev-ml/findlib-1.3.1 - dev-ml/ocamlify - dev-ml/ocamlmod - !<sci-chemistry/oasis-4.0-r3 - test? ( - >=dev-ml/ocaml-fileutils-0.4.2 - >=dev-ml/ounit-2.0.0 - >=dev-ml/ocaml-expect-0.0.4 - dev-ml/pcre-ocaml - dev-ml/extlib - )" - -RESTRICT="strip" -S="${WORKDIR}/${MY_P}" -DOCS=( "README.md" "TODO.txt" "AUTHORS.md" "CHANGES.txt" ) diff --git a/dev-ml/oasis/oasis-0.4.8.ebuild b/dev-ml/oasis/oasis-0.4.8.ebuild deleted file mode 100644 index 0ed13d0087f5..000000000000 --- a/dev-ml/oasis/oasis-0.4.8.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -OASIS_BUILD_TESTS=1 -OASIS_BUILD_DOCS=1 - -inherit oasis - -MY_P=${P/_/\~} -DESCRIPTION="Tool to integrate a configure, build and install system in OCaml project" -HOMEPAGE="http://oasis.forge.ocamlcore.org/index.php" -SRC_URI="http://forge.ocamlcore.org/frs/download.php/1669/${MY_P}.tar.gz" - -LICENSE="LGPL-2.1-with-linking-exception" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=">=dev-ml/ocaml-data-notation-0.0.11:= - dev-ml/ocamlbuild:=[ocamlopt]" -DEPEND="${RDEPEND} - >=dev-ml/findlib-1.3.1 - dev-ml/ocamlify - dev-ml/ocamlmod - !<sci-chemistry/oasis-4.0-r3 - test? ( - >=dev-ml/ocaml-fileutils-0.4.2 - >=dev-ml/ounit-2.0.0 - >=dev-ml/ocaml-expect-0.0.4 - dev-ml/pcre-ocaml - dev-ml/extlib - )" - -RESTRICT="strip" -S="${WORKDIR}/${MY_P}" -DOCS=( "README.md" "TODO.txt" "AUTHORS.md" "CHANGES.txt" ) diff --git a/dev-ml/ocaml-augeas/Manifest b/dev-ml/ocaml-augeas/Manifest index 5384aa76d59c..d68bd91cd260 100644 --- a/dev-ml/ocaml-augeas/Manifest +++ b/dev-ml/ocaml-augeas/Manifest @@ -1 +1,2 @@ DIST ocaml-augeas-0.5.tar.gz 59908 BLAKE2B f9f51afa0aec82e95d7bd81811e93e10587f1f2c1905338c0bbe47de61d983c24c0e5ab77aff1ca319834bf2199040a482b453177fa3c774e24ab72c3a534c14 SHA512 dfbad89790c6b5ada0e1239d002cb61a56a15350b2687d0987e0c61108d905e0c03756c08db7a3121eac3966fbeed86500e6f3c3c416cea2b974d9f50b8adabf +DIST ocaml-augeas-0.6.tar.gz 65180 BLAKE2B d9959e1fbf5ceafabeb76e697abc405c31cffc4e085138613fa067b6e5a482e1fb9fe28b24d90b819cd9531e09d46e6dc0babf1c63dce3170a217631d6eb2487 SHA512 e747f5c09d3821b41d98e3f12c8dfe9bb13a69d6ccaaf954f4bb33e8e4d9d62603ae26fe9f93f10b2705872526b1863a1c20e0c8a53858fdf60f8cb8cbf50b7a diff --git a/dev-ml/ocaml-augeas/files/ocaml-augeas-0.6-flags.patch b/dev-ml/ocaml-augeas/files/ocaml-augeas-0.6-flags.patch new file mode 100644 index 000000000000..931324e5046d --- /dev/null +++ b/dev-ml/ocaml-augeas/files/ocaml-augeas-0.6-flags.patch @@ -0,0 +1,21 @@ +http://git.annexia.org/?p=ocaml-augeas.git;a=patch;h=56c0602e972f1fae336198eb9587d71f1e36daff + +From 56c0602e972f1fae336198eb9587d71f1e36daff Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" <rjones@redhat.com> +Date: Tue, 20 Aug 2019 15:06:57 +0100 +Subject: [PATCH] Use ocamlopt -g option. + +Originally from Fedora. +--- a/Makefile.in ++++ b/Makefile.in +@@ -34,8 +34,8 @@ LIBS = @AUGEAS_LIBS@ @LIBXML2_LIBS@ @LIBS@ + + OCAMLCFLAGS = -g + OCAMLCPACKAGES = +-OCAMLOPTFLAGS = +-OCAMLOPTPACKAGES = ++OCAMLOPTFLAGS = $(OCAMLCFLAGS) ++OCAMLOPTPACKAGES = $(OCAMLCPACKAGES) + + OCAMLDOCFLAGS = -html -sort + diff --git a/dev-ml/ocaml-augeas/files/ocaml-augeas-0.6-ocaml-4.09.patch b/dev-ml/ocaml-augeas/files/ocaml-augeas-0.6-ocaml-4.09.patch new file mode 100644 index 000000000000..937f1bb9c799 --- /dev/null +++ b/dev-ml/ocaml-augeas/files/ocaml-augeas-0.6-ocaml-4.09.patch @@ -0,0 +1,28 @@ +http://git.annexia.org/?p=ocaml-augeas.git;a=commit;h=1cf5aef99b26a46529ca797547c0b49627fffe78 +https://bugs.gentoo.org/750209 + +From 1cf5aef99b26a46529ca797547c0b49627fffe78 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" <rjones@redhat.com> +Date: Sat, 7 Dec 2019 11:08:54 +0000 +Subject: [PATCH] caml_named_value returns const value pointer in OCaml 4.09+ + +--- a/augeas-c.c ++++ b/augeas-c.c +@@ -86,7 +86,7 @@ static const int error_map_len = sizeof error_map / sizeof error_map[0]; + static void + raise_error_and_maybe_close (augeas_t t, const char *msg, bool close_handle) + { +- value *exn = caml_named_value ("Augeas.Error"); ++ const value *exn = caml_named_value ("Augeas.Error"); + value args[5]; + const int code = aug_error (t); + const char *aug_err_msg; +@@ -132,7 +132,7 @@ raise_error_and_maybe_close (augeas_t t, const char *msg, bool close_handle) + static void + raise_init_error (const char *msg) + { +- value *exn = caml_named_value ("Augeas.Error"); ++ const value *exn = caml_named_value ("Augeas.Error"); + value args[5]; + + args[0] = caml_alloc (1, 0); diff --git a/dev-ml/ocaml-augeas/metadata.xml b/dev-ml/ocaml-augeas/metadata.xml index 738d47c70f34..afa919e68fb5 100644 --- a/dev-ml/ocaml-augeas/metadata.xml +++ b/dev-ml/ocaml-augeas/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>prometheanfire@gentoo.org</email> </maintainer> -<longdescription lang="en"> -ocaml-augeas is a set of Ocaml bindings around augeas. -</longdescription> </pkgmetadata> diff --git a/dev-ml/ocaml-augeas/ocaml-augeas-0.5.ebuild b/dev-ml/ocaml-augeas/ocaml-augeas-0.5.ebuild index f0a89730569b..ab46abaca844 100644 --- a/dev-ml/ocaml-augeas/ocaml-augeas-0.5.ebuild +++ b/dev-ml/ocaml-augeas/ocaml-augeas-0.5.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=7 inherit findlib @@ -13,12 +13,11 @@ SRC_URI="https://people.redhat.com/~rjones/augeas/files/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" DEPEND="app-admin/augeas dev-ml/ocaml-autoconf dev-ml/findlib - dev-lang/ocaml" + dev-lang/ocaml[ocamlopt]" RDEPEND="${DEPEND}" src_install() { diff --git a/dev-ml/ocaml-augeas/ocaml-augeas-0.6.ebuild b/dev-ml/ocaml-augeas/ocaml-augeas-0.6.ebuild new file mode 100644 index 000000000000..86d56ae426d5 --- /dev/null +++ b/dev-ml/ocaml-augeas/ocaml-augeas-0.6.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit findlib + +DESCRIPTION="Ocaml bindings for Augeas" +HOMEPAGE="http://augeas.net/" +#SRC_URI="http://augeas.net/download/ocaml/${P}.tar.gz" +SRC_URI="https://people.redhat.com/~rjones/augeas/files/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND=" + app-admin/augeas + dev-libs/libxml2 +" +RDEPEND="${DEPEND}" +BDEPEND=" + dev-ml/findlib + dev-ml/ocaml-autoconf + dev-lang/ocaml[ocamlopt] +" + +PATCHES=( + "${FILESDIR}"/${P}-flags.patch + "${FILESDIR}"/${P}-ocaml-4.09.patch +) + +src_compile() { + emake -j1 +} + +src_install() { + findlib_src_install +} diff --git a/dev-ml/ocaml-autoconf/metadata.xml b/dev-ml/ocaml-autoconf/metadata.xml index ffac4d7ebc01..85e4ed814fa2 100644 --- a/dev-ml/ocaml-autoconf/metadata.xml +++ b/dev-ml/ocaml-autoconf/metadata.xml @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> -</maintainer> +<!-- maintainer-needed --> </pkgmetadata> diff --git a/dev-ml/ocaml-autoconf/ocaml-autoconf-1.1-r1.ebuild b/dev-ml/ocaml-autoconf/ocaml-autoconf-1.1-r1.ebuild index 7b2ab99fb8e2..a69cc73edf6b 100644 --- a/dev-ml/ocaml-autoconf/ocaml-autoconf-1.1-r1.ebuild +++ b/dev-ml/ocaml-autoconf/ocaml-autoconf-1.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="http://forge.ocamlcore.org/frs/download.php/282/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ppc x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" src_install() { emake DESTDIR="${D}" prefix="/usr" install diff --git a/dev-ml/ocaml-base64/Manifest b/dev-ml/ocaml-base64/Manifest index 4f8e3c8b2635..b5ab5e651d2a 100644 --- a/dev-ml/ocaml-base64/Manifest +++ b/dev-ml/ocaml-base64/Manifest @@ -1 +1,2 @@ -DIST ocaml-base64-2.2.0.tar.gz 5056 BLAKE2B c8a95d31646e5cad741dbece511e3f0fb736c31e5f90b560e2dffe5787810cd218966016840eef0c67517e790d0e4c67111c3382303c740791475647bac27de1 SHA512 0390c450076786777baeb596bc81bc3357074619894334a9608f958a2a10113e22afdbd3a2b368bc93c5c5636828fc2600818399847704309e2cc6092b10f3b0 +DIST ocaml-base64-3.5.0.tar.gz 18888 BLAKE2B e35d6331f163a066169455ea3dac304cedd7ca47fac0a2cbda26b8bd9620b4e49e144d5a06a8a2c6085501e531b2be98f6b24002880d83d6d57025ee055e0887 SHA512 a3886701943a9b165a74e45f66c3d8279b381927774217f5e042494811bc17a08f8933292335d4b76f01c6b1d3c496b4cfca650faa5848ddbf6150ac87386038 +DIST ocaml-base64-3.5.1.tar.gz 18986 BLAKE2B 797ace8ad35099dd56871564862804a492551b580f46d561abce8a18812296e3f3629f1845007660c388291cf3d420144dfdce556ccf5c50e0b169efd680d586 SHA512 d1d4e2403cf4f58bfe87150c7cc444a431f0ac53ee9fc85a4d64983e2d85f99e0bd35b9267231b1a40eaf5e4312797460dd1f6dcfc38e3b391e3dfe746878125 diff --git a/dev-ml/ocaml-base64/metadata.xml b/dev-ml/ocaml-base64/metadata.xml index 535fa8d4ec98..9152c2c8dcd7 100644 --- a/dev-ml/ocaml-base64/metadata.xml +++ b/dev-ml/ocaml-base64/metadata.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">mirage/ocaml-base64</remote-id> diff --git a/dev-ml/ocaml-base64/ocaml-base64-2.2.0.ebuild b/dev-ml/ocaml-base64/ocaml-base64-3.5.0.ebuild index 35d4f2abf2bf..95622eefd12b 100644 --- a/dev-ml/ocaml-base64/ocaml-base64-2.2.0.ebuild +++ b/dev-ml/ocaml-base64/ocaml-base64-3.5.0.ebuild @@ -1,9 +1,10 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 -inherit findlib opam +DUNE_PKG_NAME="base64" +inherit dune DESCRIPTION="Library for radix-64 representation (de)coding" HOMEPAGE="https://github.com/mirage/ocaml-base64" @@ -11,15 +12,8 @@ SRC_URI="https://github.com/mirage/ocaml-base64/archive/v${PV}.tar.gz -> ${P}.ta LICENSE="ISC" SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="test" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" -RDEPEND="" -DEPEND="${RDEPEND} - dev-ml/jbuilder - test? ( dev-ml/rresult dev-ml/bos dev-ml/alcotest ) -" - -src_install() { - opam_src_install base64 -} +DEPEND="test? ( dev-ml/rresult dev-ml/bos dev-ml/alcotest )" diff --git a/dev-ml/ocaml-base64/ocaml-base64-3.5.1.ebuild b/dev-ml/ocaml-base64/ocaml-base64-3.5.1.ebuild new file mode 100644 index 000000000000..98e4de02eba4 --- /dev/null +++ b/dev-ml/ocaml-base64/ocaml-base64-3.5.1.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DUNE_PKG_NAME="base64" +inherit dune + +DESCRIPTION="Library for radix-64 representation (de)coding" +HOMEPAGE="https://github.com/mirage/ocaml-base64" +SRC_URI="https://github.com/mirage/ocaml-base64/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="ISC" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +DEPEND="test? ( dev-ml/rresult dev-ml/bos dev-ml/alcotest )" diff --git a/dev-ml/ocaml-bigstring/Manifest b/dev-ml/ocaml-bigstring/Manifest deleted file mode 100644 index 2254b42c772c..000000000000 --- a/dev-ml/ocaml-bigstring/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ocaml-bigstring-0.1.1.tar.gz 7671 BLAKE2B 2754445a2eb6d2cfe52a07cdf55b970c736d007578962be730bdac3c793981565a3ba64b7429cae532aee21f72ae7f5cefabbecf554c6238fad791c45e4fc200 SHA512 96aee494b9407b556b6eb554b0da66e24622f77d88aae6d822da60a3fb21477da8e7ae120f95f4f3c742b085ca4838f10ca0c8b2bcc4d23e35fd7de6af8532b3 diff --git a/dev-ml/ocaml-bigstring/metadata.xml b/dev-ml/ocaml-bigstring/metadata.xml deleted file mode 100644 index 2e4acd905351..000000000000 --- a/dev-ml/ocaml-bigstring/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">c-cube/ocaml-bigstring</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/ocaml-bigstring/ocaml-bigstring-0.1.1.ebuild b/dev-ml/ocaml-bigstring/ocaml-bigstring-0.1.1.ebuild deleted file mode 100644 index 84098f18ecbe..000000000000 --- a/dev-ml/ocaml-bigstring/ocaml-bigstring-0.1.1.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit findlib - -DESCRIPTION="Overlay over bigarrays of chars" -HOMEPAGE="https://github.com/c-cube/ocaml-bigstring/" -SRC_URI="https://github.com/c-cube/ocaml-bigstring/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD-2" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="test" - -# ocamlfind: Package `QTest2Lib' not found -RESTRICT="test" - -RDEPEND=" - dev-lang/ocaml:= -" -DEPEND="${RDEPEND} - dev-ml/ocamlbuild - test? ( dev-ml/iTeML ) -" - -src_install() { - findlib_src_preinst - default -} diff --git a/dev-ml/ocaml-cairo/Manifest b/dev-ml/ocaml-cairo/Manifest deleted file mode 100644 index 49ab64f127dd..000000000000 --- a/dev-ml/ocaml-cairo/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ocaml-cairo-0.5.tar.gz 137433 BLAKE2B 81ed70630ae67f33cc5453e13c23eb0317cd62f9d9984b43580107d0ef57a57b824399aaeedae3656851813cfe863e32efef58a185d81f9dbea6f3dbcfdde199 SHA512 c946739e4d0e7ca1c7f2ffa547c138ad47265bc7f59da17242ee8a78a31b7a2ce777835dc3f4070963a7303891d2fba831171e0252a5bd908083e66515aba083 diff --git a/dev-ml/ocaml-cairo/ocaml-cairo-0.5.ebuild b/dev-ml/ocaml-cairo/ocaml-cairo-0.5.ebuild deleted file mode 100644 index 627d5f40b95a..000000000000 --- a/dev-ml/ocaml-cairo/ocaml-cairo-0.5.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -OASIS_BUILD_DOCS=1 - -inherit oasis - -DESCRIPTION="OCaml Binding to Cairo" -HOMEPAGE="https://github.com/Chris00/ocaml-cairo" -SRC_URI="https://github.com/Chris00/ocaml-cairo/releases/download/0.5/cairo2-${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-3-with-linking-exception" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="gtk" - -DEPEND=" - gtk? ( dev-ml/lablgtk:= ) - x11-libs/cairo[svg(+)] -" -RDEPEND="${DEPEND}" -DOCS=( README.md ) -S="${WORKDIR}/cairo2-${PV}/" - -src_configure() { - oasis_configure_opts="$(use_enable gtk lablgtk2)" oasis_src_configure -} diff --git a/dev-ml/ocaml-cohttp/Manifest b/dev-ml/ocaml-cohttp/Manifest deleted file mode 100644 index 667c5207f2b2..000000000000 --- a/dev-ml/ocaml-cohttp/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ocaml-cohttp-0.22.0.tar.gz 194568 BLAKE2B 220c291cdf50c1720e553cc224f6b3c7723add13a637cedd33deb162d4f420a8577b716f073c2b6a630de4458bdc9ac69d8eeeb1ccd44cb310b1a1262188c680 SHA512 60ae828a3e2085d5468f5d177f50a8e7a02ed47b8036af5548996ba3d36d8eef756662259abc65035c5d1f4158c9760762ac5f85376d6bfc76a7f027f01fa5b2 diff --git a/dev-ml/ocaml-cohttp/metadata.xml b/dev-ml/ocaml-cohttp/metadata.xml deleted file mode 100644 index 01cbb468ae34..000000000000 --- a/dev-ml/ocaml-cohttp/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <use> - <flag name="async">Enables support for the <pkg>dev-ml/async</pkg> asynchronous execution library.</flag> - <flag name="lwt">Enables support for the <pkg>dev-ml/lwt</pkg> cooperative light-weight thread library.</flag> - </use> - <upstream> - <remote-id type="github">mirage/ocaml-cohttp</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/ocaml-cohttp/ocaml-cohttp-0.22.0.ebuild b/dev-ml/ocaml-cohttp/ocaml-cohttp-0.22.0.ebuild deleted file mode 100644 index bb00e40e1629..000000000000 --- a/dev-ml/ocaml-cohttp/ocaml-cohttp-0.22.0.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -OASIS_BUILD_TESTS=1 -OASIS_BUILD_DOCS=1 - -inherit oasis - -DESCRIPTION="Very lightweight HTTP server using Lwt or Async" -HOMEPAGE="https://github.com/mirage/ocaml-cohttp" -SRC_URI="https://github.com/mirage/ocaml-cohttp/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="ISC" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="async javascript +lwt" - -DEPEND=" - dev-ml/ocaml-re:= - dev-ml/stringext:= - dev-ml/ocaml-uri:= - dev-ml/fieldslib:= - dev-ml/sexplib:= - dev-ml/ppx_fields_conv:= - dev-ml/ppx_sexp_conv:= - dev-ml/ocaml-base64:= - lwt? ( - dev-ml/lwt:= - dev-ml/logs:=[fmt,lwt] - dev-ml/cmdliner:= - dev-ml/ocaml-conduit:= - dev-ml/ocaml-magic-mime:= - ) - async? ( - dev-ml/ocaml-conduit:= - dev-ml/logs:=[fmt] - dev-ml/ocaml-magic-mime:= - dev-ml/fmt:= - ) - javascript? ( - dev-ml/js_of_ocaml:=[ppx] - ) -" -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} - test? ( - dev-ml/ounit - dev-ml/alcotest - ) -" -DOCS=( README.md CHANGES DESIGN.md TODO.md ) - -src_configure() { - local oasis_configure_opts=" - $(use_enable lwt) $(use_enable lwt lwt-unix) - $(use_enable async) - $(use_enable javascript js) - " - oasis_src_configure -} diff --git a/dev-ml/ocaml-compiler-libs/Manifest b/dev-ml/ocaml-compiler-libs/Manifest index bc5a18b49d93..fefe68183192 100644 --- a/dev-ml/ocaml-compiler-libs/Manifest +++ b/dev-ml/ocaml-compiler-libs/Manifest @@ -1 +1,2 @@ -DIST ocaml-compiler-libs-0.9.0.tar.gz 6937 BLAKE2B d53a8312ffabfed0b137d435497b4d7953239f57176481f522cbb70fd49a1a8045850d7572830455aefff1a91c6c461c03f40392b386bacb03afda3f72e39005 SHA512 ee0751bcfb9cb75d272f7af4f7da184c0a8e348384a2481da9dea0245a4133de908a23d0a324e0353397a4f0c5bfd71d40a6a46dbd8e4acea922bad7cdc5ef64 +DIST ocaml-compiler-libs-0.12.3.tar.gz 4982 BLAKE2B 83432cbb2707964f025b294a84cdcce77137156e409d85ce8615dd6e9a26ad085cd5de178ebeb7520cd95b19a15b3cfbf7ef9567d165b55e07850a231b68371c SHA512 748ae11fe4cedb12d153ef2e712a9899f6a7ab4a35ddb7c95c0ae25af979c3edf274046745dddb2253fc06be41d5b0029f11a5a823a17d1ee680ffb29c4bdc89 +DIST ocaml-compiler-libs-0.12.4.tar.gz 5435 BLAKE2B 2c7b3f79315945d094dd4102da748dda55265bdd36753606ec03eef6a39eb385b84e7bfd0f43a04583271bf7c53b15481e9dcbb48c362d472bb3f740ec48853a SHA512 cf08e8d4bf25fff26a16a05036f08247176f4845d9d9ada85944c3fa89b6df9a5092d7a1025415a3b2ce00dd45b544cc82247648cf3952be2304e5d9ebab121d diff --git a/dev-ml/ocaml-compiler-libs/metadata.xml b/dev-ml/ocaml-compiler-libs/metadata.xml index 9edbba42aa69..9da7a8207524 100644 --- a/dev-ml/ocaml-compiler-libs/metadata.xml +++ b/dev-ml/ocaml-compiler-libs/metadata.xml @@ -1,9 +1,9 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">janestreet/ocaml-compiler-libs</remote-id> diff --git a/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.9.0.ebuild b/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.3.ebuild index 05a9b54ea1de..6c06290ddd52 100644 --- a/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.9.0.ebuild +++ b/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.3.ebuild @@ -1,19 +1,15 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit opam +inherit dune DESCRIPTION="Repackage the OCaml compiler libs so they do not expose everything at toplevel" HOMEPAGE="https://github.com/janestreet/ocaml-compiler-libs" SRC_URI="https://github.com/janestreet/ocaml-compiler-libs/archive/v${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="Apache-2.0" +LICENSE="MIT" SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" - -RDEPEND="" -DEPEND="${RDEPEND} - dev-ml/jbuilder" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt" diff --git a/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.4.ebuild b/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.4.ebuild new file mode 100644 index 000000000000..9867417d2e6a --- /dev/null +++ b/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.4.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Repackage the OCaml compiler libs so they do not expose everything at toplevel" +HOMEPAGE="https://github.com/janestreet/ocaml-compiler-libs" +SRC_URI="https://github.com/janestreet/ocaml-compiler-libs/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" diff --git a/dev-ml/ocaml-conduit/Manifest b/dev-ml/ocaml-conduit/Manifest deleted file mode 100644 index be5f936e9154..000000000000 --- a/dev-ml/ocaml-conduit/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ocaml-conduit-0.15.4.tar.gz 38960 BLAKE2B 3f4631a6a67ab00ecc0d903f0f0b832035b61d3fceec57db50bea0f56454292b4fa3911f4eeb5e05f8fb9fb68f13ca0f9e6c3c078d3bd5d0a1bb7c4bcac18495 SHA512 12f61828c943cb60b2c9be080fb32c8fe5ba16d8bac46a8b788f2ea9b8b7a3a53563defbb05271d516365d18cddafe57051125391ac018328608c4f6537ec5b0 diff --git a/dev-ml/ocaml-conduit/metadata.xml b/dev-ml/ocaml-conduit/metadata.xml deleted file mode 100644 index 06a872f18368..000000000000 --- a/dev-ml/ocaml-conduit/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">mirage/ocaml-conduit</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/ocaml-conduit/ocaml-conduit-0.15.4.ebuild b/dev-ml/ocaml-conduit/ocaml-conduit-0.15.4.ebuild deleted file mode 100644 index 5690ccf9541d..000000000000 --- a/dev-ml/ocaml-conduit/ocaml-conduit-0.15.4.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib eutils - -DESCRIPTION="Dereference URIs into communication channels for Async or Lwt" -HOMEPAGE="https://github.com/mirage/ocaml-conduit" -SRC_URI="https://github.com/mirage/ocaml-conduit/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="ISC" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -DEPEND=" - dev-lang/ocaml:= - dev-ml/sexplib:= - dev-ml/stringext:= - dev-ml/ocaml-uri:= - dev-ml/logs:= - dev-ml/ocaml-cstruct:= - dev-ml/ocaml-ipaddr:= - - >=dev-ml/lwt-3:= - dev-ml/lwt_ssl:= - dev-ml/async:= - dev-ml/dns:= - dev-ml/ocaml-ssl:= -" -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} - dev-ml/findlib - dev-ml/ocamlbuild - dev-ml/ppx_driver - dev-ml/ppx_optcomp - dev-ml/ppx_sexp_conv -" - -DOCS=( TODO.md README.md CHANGES ) - -src_install() { - findlib_src_preinst - default -} diff --git a/dev-ml/ocaml-containers/Manifest b/dev-ml/ocaml-containers/Manifest deleted file mode 100644 index a7a9f3dd7061..000000000000 --- a/dev-ml/ocaml-containers/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ocaml-containers-1.3.tar.gz 299928 BLAKE2B f6c0c419e0696dc5f45bb1f1db76952aef3a9d39346a59370deaabfb787b4477e7dec2a446f5ebe8c06716ed47e0befd4dde23d8f82c6d79c80962d0e257bb02 SHA512 d4402be1d11fee883bdf2b4fcc339df6ef175ac2d6532ee865c36656473c4882290e45f2efd9b90af7298fc3ffa0ce27fb83d8c7166edeafff798ceccad929e8 -DIST ocaml-containers-1.4.tar.gz 302136 BLAKE2B abb70e4141443d84680090cf1610b293203839ab1a6daa77ebd4980ae6f60a25f63fd8206693612b1104e4f289c16a313e83901297c4104cbdd02ed2917903b3 SHA512 f96c83a139cc277bb60f572966965eb3b669afe6dadd926f9baf42e8effb5f47fb4ba7628ee91ce3896a270f12e5828bc4dd9364cc6f187e800b07305fadce75 diff --git a/dev-ml/ocaml-containers/metadata.xml b/dev-ml/ocaml-containers/metadata.xml deleted file mode 100644 index 6cc1172e3347..000000000000 --- a/dev-ml/ocaml-containers/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">c-cube/ocaml-containers</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/ocaml-containers/ocaml-containers-1.3.ebuild b/dev-ml/ocaml-containers/ocaml-containers-1.3.ebuild deleted file mode 100644 index 33e8871a4f73..000000000000 --- a/dev-ml/ocaml-containers/ocaml-containers-1.3.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -OASIS_BUILD_TESTS=1 -OASIS_BUILD_DOCS=1 - -inherit oasis - -DESCRIPTION="A modular standard library focused on data structures" -HOMEPAGE="https://github.com/c-cube/ocaml-containers" -SRC_URI="https://github.com/c-cube/ocaml-containers/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD-2" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="test" - -RDEPEND=" - dev-ml/result:= - >=dev-ml/sequence-0.9:= -" -DEPEND="${RDEPEND} dev-ml/cppo - test? ( dev-ml/iTeML dev-ml/ounit dev-ml/gen )" - -src_configure() { - oasis_configure_opts=" - --enable-unix - --disable-bench - " oasis_src_configure -} diff --git a/dev-ml/ocaml-containers/ocaml-containers-1.4.ebuild b/dev-ml/ocaml-containers/ocaml-containers-1.4.ebuild deleted file mode 100644 index 33e8871a4f73..000000000000 --- a/dev-ml/ocaml-containers/ocaml-containers-1.4.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -OASIS_BUILD_TESTS=1 -OASIS_BUILD_DOCS=1 - -inherit oasis - -DESCRIPTION="A modular standard library focused on data structures" -HOMEPAGE="https://github.com/c-cube/ocaml-containers" -SRC_URI="https://github.com/c-cube/ocaml-containers/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD-2" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="test" - -RDEPEND=" - dev-ml/result:= - >=dev-ml/sequence-0.9:= -" -DEPEND="${RDEPEND} dev-ml/cppo - test? ( dev-ml/iTeML dev-ml/ounit dev-ml/gen )" - -src_configure() { - oasis_configure_opts=" - --enable-unix - --disable-bench - " oasis_src_configure -} diff --git a/dev-ml/ocaml-cstruct/Manifest b/dev-ml/ocaml-cstruct/Manifest deleted file mode 100644 index 68f49f48f9e4..000000000000 --- a/dev-ml/ocaml-cstruct/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ocaml-cstruct-3.1.1.tar.gz 208725 BLAKE2B 2818c5695c4ab3d102cfa08a288e80e80d7fa4372a5d97aac831429f0681e21cb6b03baac245c7c1171a8efa23b8d6bca661ee74db0efe8c2649727d9be56505 SHA512 22ec8fe027dbebee537ff950c2aa9a494d0c4c000d8c4df848eae157b1c9502b73c208bb92c21fa4c13ba0291b7750de31e4c96b3a0571397402f841c3e01c21 diff --git a/dev-ml/ocaml-cstruct/metadata.xml b/dev-ml/ocaml-cstruct/metadata.xml deleted file mode 100644 index 3770faddf424..000000000000 --- a/dev-ml/ocaml-cstruct/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <use> - <flag name="async">Support for asynchronous execution</flag> - <flag name="lwt">Enable threads via lwt</flag> - <flag name="ppx">Enable the ppx syntax extension</flag> - </use> - <upstream> - <remote-id type="github">mirage/ocaml-cstruct</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/ocaml-cstruct/ocaml-cstruct-3.1.1.ebuild b/dev-ml/ocaml-cstruct/ocaml-cstruct-3.1.1.ebuild deleted file mode 100644 index 1b42677acb65..000000000000 --- a/dev-ml/ocaml-cstruct/ocaml-cstruct-3.1.1.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib opam - -DESCRIPTION="Map OCaml arrays onto C-like structs" -HOMEPAGE="https://github.com/mirage/ocaml-cstruct https://mirage.io" -SRC_URI="https://github.com/mirage/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="ISC" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="async +lwt +ppx test" - -RDEPEND=" - async? ( - dev-ml/async_kernel:= - dev-ml/async_unix:= - dev-ml/core_kernel:= - ) - lwt? ( dev-ml/lwt:= ) - ppx? ( - dev-ml/ppx_tools:= - dev-ml/ocaml-migrate-parsetree:= - >=dev-ml/ppx_tools_versioned-5.0.1:= - ) - dev-ml/ocplib-endian:= - dev-ml/sexplib:= - dev-ml/type-conv:= -" -DEPEND=" - dev-ml/jbuilder - test? ( - dev-ml/ounit - ppx? ( dev-ml/ppx_driver dev-ml/ppx_sexp_conv ) - ) - ${RDEPEND} -" - -get_targets() { - local tgt="cstruct,cstruct-unix" - use lwt && tgt+=",cstruct-lwt" - use async && tgt+=",cstruct-async" - use ppx && tgt+=",ppx_cstruct" - echo "${tgt}" -} - -src_compile() { - jbuilder build -p $(get_targets) || die -} - -src_test() { - jbuilder runtest -p $(get_targets) || die -} - -src_install() { - opam-install cstruct - opam-install cstruct-unix - use lwt && opam-install cstruct-lwt - use async && opam-install cstruct-async - use ppx && opam-install ppx_cstruct -} diff --git a/dev-ml/ocaml-ctypes/Manifest b/dev-ml/ocaml-ctypes/Manifest index dca907ace49c..61634628689c 100644 --- a/dev-ml/ocaml-ctypes/Manifest +++ b/dev-ml/ocaml-ctypes/Manifest @@ -1,4 +1,4 @@ -DIST ocaml-ctypes-0.11.2.tar.gz 203564 BLAKE2B 2a8c0ee8f8dcd78c3f93b506e92f2c3476c1505d8b58be9273405b4c198500d8e5ff4b0689f76599cc3e92ebb1f5db685c025e2f6a29f590ef21e36c4ac4c3ed SHA512 f3d75e9e596f68438733090fea8c675624c3b186a77c3adf1eca8f12cc2da336f0f5b1688c2ee788726e873bbb0c4dce1d237d53d1637d78e4ad6a8eae1f912a -DIST ocaml-ctypes-0.11.3.tar.gz 204959 BLAKE2B f3863e29d355479f9306c39786d56839ab05a119dfd5a64de1a784d71e8d931d5fad0f306402aadb50bc5e8147ab7668ac026b5bfbbaff2b6530d7a33f9f38cc SHA512 e7698954a6b683869a1482af8fe1bbeb5ccf693c2bb8583e2c19c5da92ed2730466e373c6f53d9ff9f09c2bdedf102da3f76b75511d7f9b7d266ac0765999f94 -DIST ocaml-ctypes-0.12.1.tar.gz 199686 BLAKE2B d131bb8ebe8448c6d252d32b6a6de2e555f4c7802bec0da83f33ac402d1fd1c73db9abb97fe9f7065fbeaddc782c0976bb05ef6ee6aa80e20b46074a48c343c3 SHA512 801c66395d843c9e410736a06ab5e03bbe22851a364dc9b9444f49dc133e0f5e0b7a1c31e88de56d23a21817cb35595a1b6743c430c8c1a689b7ae12adc8856f -DIST ocaml-ctypes-0.13.0.tar.gz 200959 BLAKE2B 9f7274099924bd5502fc8115a1e5ed32f9b56902ce284f5530710c948d6d735a2abfd30affa5f1f7803edb33e062c288963946846be29977af87f19f47dd0fbe SHA512 ba2e4cd77d42cf032d823e26f94a8cc37d81ac12bafd40c5d61685d66c97e18996a286dd8d486c94ad4a34e4214e55104e6283158962871e7f0722b2144f7a7d +DIST ocaml-ctypes-0.17.1.tar.gz 208101 BLAKE2B b9fe6632058a670c988ba9f1ae81b75aa5373de7231cef04d5e2ede61a44cbaa0324c04197a0a202847599a9bbe7dccd18fd3279f3f351493aaec4959caf3ada SHA512 1e197009f7e6b29b43944f757e987934337ebfa11bb2ff2ca8ba3ebc607e37cf1259d07a90d7faf4b91b49ee20d5c65357ad305f34ada0a8d336a3904233150e +DIST ocaml-ctypes-0.20.0.tar.gz 206559 BLAKE2B d9bf1c3f5ae7544e3950766f7eb9bac2c9dbf84130f69b2b8807e55c6a7d659c46d9ba2227d53d578e4e49283730932213eea4c7487beffe4540432b3e700c81 SHA512 605ae95b0233f1157749475526ef00ade2f97649d06a782e8fcf97b604cb86a0dcc8f27c4ac6baec11a41b9ef5becb0e5ae55e30f1ee61b30d4ae17a0d1545c2 +DIST ocaml-ctypes-0.20.1.tar.gz 206863 BLAKE2B a101872991d4bd83464d26e79fa5052c9dadbd10da1ae734fda8976199640091939777a1ba391d2aab84d7e14fafec6f713681e2ea52f6717f5f36d26e8aa225 SHA512 f95e65ce5003a07634afcbee431cb23c54c8335f926074615fc8d76ab777b9d2fce8f75bb25bbb6ed9550a7d6237fb377aa9ad65a426d2d7e387f86c1158fe4a +DIST ocaml-ctypes-0.21.1.tar.gz 200264 BLAKE2B c4539c8856c1919194f11ecaeb1b0649dc701a6c0dda62c4bb750cd64a9145f2e4a9e77392385e4e398e8e89d5ae91b7c5f68b6242f826563f0f32b78497dfe1 SHA512 3a64b29746360e7dda7725ce7af23ca64cd6a3fa585aa70188cdd143aace744f44c1bd13cdda5c9733ca53d4b874ed42749ca21aaff4f4d53636a390a2c7f94f diff --git a/dev-ml/ocaml-ctypes/files/ocaml-ctypes-0.20.0-shuffle.patch b/dev-ml/ocaml-ctypes/files/ocaml-ctypes-0.20.0-shuffle.patch new file mode 100644 index 000000000000..014b0437b1e8 --- /dev/null +++ b/dev-ml/ocaml-ctypes/files/ocaml-ctypes-0.20.0-shuffle.patch @@ -0,0 +1,23 @@ +--- a/Makefile 2023-01-24 08:35:02.515456277 +0100 ++++ b/Makefile 2023-01-24 08:35:45.459755298 +0100 +@@ -161,7 +161,9 @@ + $(INSTALL_HEADERS) \ + $(if $(filter yes,$($(PROJECT).install_native_objects)),$(NATIVE_OBJECTS))) + ++$(PROJECTS:%=install-%): META-install ++ + install: META-install $(PROJECTS:%=install-%) + + uninstall: + $(OCAMLFIND) remove ctypes +--- a/Makefile.rules 2023-01-24 22:19:00.571780005 +0100 ++++ b/Makefile.rules 2023-01-24 22:18:06.710631483 +0100 +@@ -99,7 +99,7 @@ + $(BUILDDIR)/dll%_stubs_xen$(EXTDLL): $$(XEN_OBJECTS) + $(OCAMLMKLIB) -o $(BUILDDIR)/$*_stubs_xen $^ $(OCAMLMKLIB_FLAGS) $(OCAMLMKLIB_EXTRA_FLAGS) + +-$(BUILDDIR)/%.cmxs : $$(NATIVE_OBJECTS) ++$(BUILDDIR)/%.cmxs : $$(NATIVE_OBJECTS) $(C_OBJECTS) + $(OCAMLFIND) opt -shared -linkall $(OCAMLFLAGS) $(THREAD_FLAG) $(OCAMLFIND_PACKAGE_FLAGS) -o $@ $(NATIVE_OBJECTS) $(C_OBJECTS) $(OCAML_LINK_FLAGS) + + $(BUILDDIR)/%.cma: $$(BYTE_OBJECTS) diff --git a/dev-ml/ocaml-ctypes/metadata.xml b/dev-ml/ocaml-ctypes/metadata.xml index 5a35bed8fb15..d16418ab6b99 100644 --- a/dev-ml/ocaml-ctypes/metadata.xml +++ b/dev-ml/ocaml-ctypes/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">ocamllabs/ocaml-ctypes</remote-id> - </upstream> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">yallop/ocaml-ctypes</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.11.2.ebuild b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.11.2.ebuild deleted file mode 100644 index b7c40ad550cd..000000000000 --- a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.11.2.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib - -DESCRIPTION="Library for binding to C libraries using pure OCaml" -HOMEPAGE="https://github.com/ocamllabs/ocaml-ctypes" -SRC_URI="https://github.com/ocamllabs/ocaml-ctypes/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="amd64 arm x86" -IUSE="test" - -RDEPEND=" - >=dev-lang/ocaml-4.02:=[ocamlopt] - virtual/libffi -" -DEPEND="${RDEPEND} - test? ( dev-ml/ounit )" - -src_compile() { - emake -j1 -} - -src_test() { - emake -j1 test -} - -src_install() { - findlib_src_install - dodoc CHANGES.md README.md -} diff --git a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.11.3.ebuild b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.11.3.ebuild deleted file mode 100644 index a46755cc0678..000000000000 --- a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.11.3.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib - -DESCRIPTION="Library for binding to C libraries using pure OCaml" -HOMEPAGE="https://github.com/ocamllabs/ocaml-ctypes" -SRC_URI="https://github.com/ocamllabs/ocaml-ctypes/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="test" - -RDEPEND=" - >=dev-lang/ocaml-4.02:=[ocamlopt] - virtual/libffi -" -DEPEND="${RDEPEND} - test? ( dev-ml/ounit )" - -src_compile() { - emake -j1 -} - -src_test() { - emake -j1 test -} - -src_install() { - findlib_src_install - dodoc CHANGES.md README.md -} diff --git a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.12.1.ebuild b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.17.1-r1.ebuild index f2c3d64f44a8..673fa173a3a8 100644 --- a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.12.1.ebuild +++ b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.17.1-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 inherit findlib @@ -11,16 +11,23 @@ SRC_URI="https://github.com/ocamllabs/ocaml-ctypes/archive/${PV}.tar.gz -> ${P}. LICENSE="MIT" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 arm ~arm64 x86" IUSE="test" +RESTRICT="!test? ( test )" RDEPEND=" - >=dev-lang/ocaml-4.02:=[ocamlopt] - virtual/libffi + >=dev-lang/ocaml-4.02:= + >=dev-libs/libffi-3.3_rc0:= dev-ml/integers:= " DEPEND="${RDEPEND} - test? ( dev-ml/ounit dev-ml/lwt )" + test? ( dev-ml/ounit2 dev-ml/lwt )" +REQUIRED_USE="ocamlopt" + +src_prepare() { + sed -e 's/oUnit/ounit2/g' -i Makefile.tests || die + default +} src_compile() { emake -j1 diff --git a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.13.0.ebuild b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.20.0.ebuild index f2c3d64f44a8..46407af9f60c 100644 --- a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.13.0.ebuild +++ b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.20.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 inherit findlib @@ -11,16 +11,26 @@ SRC_URI="https://github.com/ocamllabs/ocaml-ctypes/archive/${PV}.tar.gz -> ${P}. LICENSE="MIT" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" IUSE="test" +RESTRICT="!test? ( test )" RDEPEND=" - >=dev-lang/ocaml-4.02:=[ocamlopt] - virtual/libffi + >=dev-lang/ocaml-4.02:= + >=dev-libs/libffi-3.3_rc0:= + dev-ml/bigarray-compat:= dev-ml/integers:= " DEPEND="${RDEPEND} - test? ( dev-ml/ounit dev-ml/lwt )" + test? ( dev-ml/ounit2 dev-ml/lwt )" +REQUIRED_USE="ocamlopt" + +PATCHES=( "${FILESDIR}"/${P}-shuffle.patch ) + +src_prepare() { + sed -e 's/oUnit/ounit2/g' -i Makefile.tests || die + default +} src_compile() { emake -j1 diff --git a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.20.1.ebuild b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.20.1.ebuild new file mode 100644 index 000000000000..f321f7db9334 --- /dev/null +++ b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.20.1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit findlib + +DESCRIPTION="Library for binding to C libraries using pure OCaml" +HOMEPAGE="https://github.com/ocamllabs/ocaml-ctypes/" +SRC_URI="https://github.com/ocamllabs/ocaml-ctypes/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-lang/ocaml-4.02:= + >=dev-libs/libffi-3.3_rc0:= + dev-ml/bigarray-compat:= + dev-ml/integers:= +" +DEPEND="${RDEPEND} + test? ( dev-ml/ounit2 dev-ml/lwt )" +REQUIRED_USE="ocamlopt" + +PATCHES=( "${FILESDIR}"/${PN}-0.20.0-shuffle.patch ) + +src_prepare() { + sed -e 's/oUnit/ounit2/g' -i Makefile.tests || die + default +} + +src_compile() { + emake -j1 +} + +src_test() { + emake -j1 test +} + +src_install() { + findlib_src_install + dodoc CHANGES.md README.md +} diff --git a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.21.1-r2.ebuild b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.21.1-r2.ebuild new file mode 100644 index 000000000000..c837e0b3461e --- /dev/null +++ b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.21.1-r2.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DUNE_PKG_NAME=ctypes +inherit dune + +DESCRIPTION="Library for binding to C libraries using pure OCaml" +HOMEPAGE="https://github.com/yallop/ocaml-ctypes/" +SRC_URI="https://github.com/yallop/ocaml-ctypes/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-lang/ocaml-4.03:= + >=dev-libs/libffi-3.3_rc0:= + dev-ml/bigarray-compat:= + dev-ml/integers:= + dev-ml/dune-configurator:= +" +DEPEND="${RDEPEND} + test? ( dev-ml/ounit2 dev-ml/lwt )" +REQUIRED_USE="ocamlopt" + +src_install() { + dune-install ctypes ctypes-foreign +} diff --git a/dev-ml/ocaml-data-notation/Manifest b/dev-ml/ocaml-data-notation/Manifest deleted file mode 100644 index 0ee64b7f2284..000000000000 --- a/dev-ml/ocaml-data-notation/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ocaml-data-notation-0.0.11.tar.gz 63968 BLAKE2B bc01d71c6d98b5fa9aa2bbc5889e203f23b08e1e7b0c5bb5cd94170ad1be962aefb847ff6c263a52f93ec938a6ab2d2ebe7877b0c27e8018d8f05b170b13b67d SHA512 010c6105b0745c4dbf426186915078cd71d02d56e19ca01089a37f803c9d81c02a22e64184b9b4a42d44450834527a050ff20430f8c2d8a972610717f4c653d7 diff --git a/dev-ml/ocaml-data-notation/metadata.xml b/dev-ml/ocaml-data-notation/metadata.xml deleted file mode 100644 index ffac4d7ebc01..000000000000 --- a/dev-ml/ocaml-data-notation/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> -</maintainer> -</pkgmetadata> diff --git a/dev-ml/ocaml-data-notation/ocaml-data-notation-0.0.11-r1.ebuild b/dev-ml/ocaml-data-notation/ocaml-data-notation-0.0.11-r1.ebuild deleted file mode 100644 index 625122a633ef..000000000000 --- a/dev-ml/ocaml-data-notation/ocaml-data-notation-0.0.11-r1.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -OASIS_BUILD_TESTS=1 - -inherit oasis - -DESCRIPTION="Use type-conv to dump OCaml data structure using OCaml data notation" -HOMEPAGE="http://forge.ocamlcore.org/projects/odn" -SRC_URI="http://forge.ocamlcore.org/frs/download.php/1310/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=">=dev-ml/type-conv-108.07.01:= - dev-ml/camlp4:= - " -DEPEND="${RDEPEND} - test? ( >=dev-ml/ounit-2.0.0[ocamlopt?] dev-ml/ocaml-fileutils[ocamlopt?] )" - -DOCS=( "README.txt" "AUTHORS.txt" "CHANGES.txt" ) diff --git a/dev-ml/ocaml-dispatch/Manifest b/dev-ml/ocaml-dispatch/Manifest deleted file mode 100644 index d6eb8d0571b6..000000000000 --- a/dev-ml/ocaml-dispatch/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ocaml-dispatch-0.3.0.tar.gz 51453 BLAKE2B bd7965396a82a9f767abd05079496a5e0c1f12c3fe02d8c1d79b41db10010eefd89edf3351d8d05f132f0df3c3ab79533902a98752e571bfd09d4f2798f1db57 SHA512 0f09eae45a2ecae27d07e247b6a47f307e074342e337e7be262f5183f77090f0aef81fb5c0bf499732bd0a711d4d51775cbcea5e463011f43a1777582d78806b -DIST ocaml-dispatch-0.4.0.tar.gz 7554 BLAKE2B 9bbe102df8a27642cbf54ad876caa276ba966ca3b19af53ac8f957799d0ca98b030c0d5ec055cc2868b2c374d71371c6e91ef0b89f4b5a072fbe2c47133df919 SHA512 d5318bda4079c21820fce5b21d178ed88fd0535a5cdc559dd6ceeb4d06ffb08456ee5aec1e56efd40b6d4f456f7d5c7eda17dc728666e6514dc936898b605b36 diff --git a/dev-ml/ocaml-dispatch/metadata.xml b/dev-ml/ocaml-dispatch/metadata.xml deleted file mode 100644 index 44eccfc3febe..000000000000 --- a/dev-ml/ocaml-dispatch/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">inhabitedtype/ocaml-dispatch</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/ocaml-dispatch/ocaml-dispatch-0.3.0.ebuild b/dev-ml/ocaml-dispatch/ocaml-dispatch-0.3.0.ebuild deleted file mode 100644 index 0056e666f79f..000000000000 --- a/dev-ml/ocaml-dispatch/ocaml-dispatch-0.3.0.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -OASIS_BUILD_DOCS=1 -OASIS_BUILD_TESTS=1 - -inherit oasis - -DESCRIPTION="Path-based dispatching for client- and server-side applications" -HOMEPAGE="https://github.com/inhabitedtype/ocaml-dispatch" -SRC_URI="https://github.com/inhabitedtype/ocaml-dispatch/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="javascript" - -DEPEND=" - javascript? ( dev-ml/js_of_ocaml:=[ppx,ocamlopt?] ) - dev-ml/result:=[ocamlopt?] -" -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} - test? ( dev-ml/ounit[ocamlopt?] ) -" - -DOCS=( "README.md" ) - -src_configure() { - oasis_configure_opts="$(use_enable javascript js-of-ocaml)" \ - oasis_src_configure -} diff --git a/dev-ml/ocaml-dispatch/ocaml-dispatch-0.4.0.ebuild b/dev-ml/ocaml-dispatch/ocaml-dispatch-0.4.0.ebuild deleted file mode 100644 index 562ef548b9a1..000000000000 --- a/dev-ml/ocaml-dispatch/ocaml-dispatch-0.4.0.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib - -DESCRIPTION="Path-based dispatching for client- and server-side applications" -HOMEPAGE="https://github.com/inhabitedtype/ocaml-dispatch" -SRC_URI="https://github.com/inhabitedtype/ocaml-dispatch/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="test" - -DEPEND=" - dev-ml/result:= - dev-lang/ocaml:= -" -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} - dev-ml/jbuilder - dev-ml/opam - test? ( dev-ml/ounit ) -" - -src_compile() { - jbuilder build -p dispatch || die -} - -oinstall() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - --mandir="${ED}/usr/share/man" \ - ${1}.install || die -} - -src_install() { - oinstall dispatch -} diff --git a/dev-ml/ocaml-doc/metadata.xml b/dev-ml/ocaml-doc/metadata.xml index 75c9ea74812d..115e9d64a669 100644 --- a/dev-ml/ocaml-doc/metadata.xml +++ b/dev-ml/ocaml-doc/metadata.xml @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/dev-ml/ocaml-doc/ocaml-doc-4.04.ebuild b/dev-ml/ocaml-doc/ocaml-doc-4.04.ebuild index 46e0e0b6687c..b15602118ee4 100644 --- a/dev-ml/ocaml-doc/ocaml-doc-4.04.ebuild +++ b/dev-ml/ocaml-doc/ocaml-doc-4.04.ebuild @@ -1,24 +1,22 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 DESCRIPTION="Ocaml reference manual (html)" -HOMEPAGE="http://caml.inria.fr/pub/docs/manual-ocaml/" -SRC_URI="http://caml.inria.fr/pub/distrib/ocaml-${PV}/ocaml-${PV}-refman-html.tar.gz" -LICENSE="GPL-2" - -KEYWORDS="amd64 ~ppc x86" +HOMEPAGE="https://caml.inria.fr/pub/docs/manual-ocaml/" +SRC_URI="https://caml.inria.fr/pub/distrib/ocaml-${PV}/ocaml-${PV}-refman-html.tar.gz" +S="${WORKDIR}"/htmlman +LICENSE="GPL-2" SLOT="0" -IUSE="" - -S=${WORKDIR}/htmlman +KEYWORDS="amd64 ~ppc x86" src_install() { - dohtml -r * + docinto html + dodoc -r * } pkg_postinst() { - elog "This manual is available online at http://caml.inria.fr/pub/docs/manual-ocaml/" + elog "This manual is available online at https://caml.inria.fr/pub/docs/manual-ocaml/" } diff --git a/dev-ml/ocaml-doc/ocaml-doc-4.05.ebuild b/dev-ml/ocaml-doc/ocaml-doc-4.05.ebuild index 198cd811e65f..b15602118ee4 100644 --- a/dev-ml/ocaml-doc/ocaml-doc-4.05.ebuild +++ b/dev-ml/ocaml-doc/ocaml-doc-4.05.ebuild @@ -1,24 +1,22 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 DESCRIPTION="Ocaml reference manual (html)" -HOMEPAGE="http://caml.inria.fr/pub/docs/manual-ocaml/" -SRC_URI="http://caml.inria.fr/pub/distrib/ocaml-${PV}/ocaml-${PV}-refman-html.tar.gz" -LICENSE="GPL-2" - -KEYWORDS="~amd64 ~ppc ~x86" +HOMEPAGE="https://caml.inria.fr/pub/docs/manual-ocaml/" +SRC_URI="https://caml.inria.fr/pub/distrib/ocaml-${PV}/ocaml-${PV}-refman-html.tar.gz" +S="${WORKDIR}"/htmlman +LICENSE="GPL-2" SLOT="0" -IUSE="" - -S=${WORKDIR}/htmlman +KEYWORDS="amd64 ~ppc x86" src_install() { - dohtml -r * + docinto html + dodoc -r * } pkg_postinst() { - elog "This manual is available online at http://caml.inria.fr/pub/docs/manual-ocaml/" + elog "This manual is available online at https://caml.inria.fr/pub/docs/manual-ocaml/" } diff --git a/dev-ml/ocaml-expat/Manifest b/dev-ml/ocaml-expat/Manifest index 0315886c2e43..77ffcd4e2dec 100644 --- a/dev-ml/ocaml-expat/Manifest +++ b/dev-ml/ocaml-expat/Manifest @@ -1,2 +1,2 @@ -DIST ocaml-expat-1.0.0.tar.gz 58149 BLAKE2B 0bd99a8a5eb8f4fe1a04d1d53edc5dc662a51ae880c5297de9dbc93561896e5c3acf3db4b7edc5122a328be4c17fd924a66a2e0e08c9bd74aac704257f5dc569 SHA512 217d602ac8fabf7713dcd8fd274206b81ff467402a9bca5b15b13f3b1d68e8e5f2c2970adeafb2378c0993b39c7d98a420dee07f30ad9eb88fd40665a2f98897 DIST ocaml-expat-1.1.0.tar.gz 58318 BLAKE2B 137bc65c5c867180ba547de17041bd0f588da395928e92eabef45cdbb76a1d139d7cd0d80d33337e1fbff92c9fa3cab2339c0f340f50f467b8fe7d64cba10b1e SHA512 9407f91f5007d6835643719294d4e4907bfc40464d054911591ce80c31d173ddcc7b06157a19c0d3ddd78775806242dc68aea7847e588ca9fd1909def1df4d23 +DIST ocaml-expat-1.3.0.tar.gz 58331 BLAKE2B 4d56dd1354a31095afada7e4b0ccc9d1eb7fae4ed45f579d6b2eeb9366df7c0f5ae58680d4e917185bbce2e5e7c957f266cb4e89b7eb1e943f0fb9f68c28f94d SHA512 72a59c982179ebc2cbd4c0659ec81c1c7422de78f9fff4bd9feebda8739d3a50d2840bb5f058e075dd63a2d1af35727e04315361febca3af6c8605ee52e27498 diff --git a/dev-ml/ocaml-expat/files/ocaml-expat-1.1.0-cc.patch b/dev-ml/ocaml-expat/files/ocaml-expat-1.1.0-cc.patch new file mode 100644 index 000000000000..724d9935baac --- /dev/null +++ b/dev-ml/ocaml-expat/files/ocaml-expat-1.1.0-cc.patch @@ -0,0 +1,11 @@ +--- a/Makefile 2022-01-23 19:29:56.516323939 +0100 ++++ b/Makefile 2022-01-23 19:30:07.289143969 +0100 +@@ -41,7 +41,7 @@ + allopt: $(OPT_TARGETS) + + depend: *.c *.ml *.mli +- gcc -I $(OCAMLDIR) -MM *.c > depend ++ $(CC) -I $(OCAMLDIR) -MM *.c > depend + $(OCAMLDEP) *.mli *.ml >> depend + + ## Library creation diff --git a/dev-ml/ocaml-expat/files/ounit2.patch b/dev-ml/ocaml-expat/files/ounit2.patch new file mode 100644 index 000000000000..5cbcc4e12b98 --- /dev/null +++ b/dev-ml/ocaml-expat/files/ounit2.patch @@ -0,0 +1,17 @@ +Index: ocaml-expat-1.1.0/Makefile +=================================================================== +--- ocaml-expat-1.1.0.orig/Makefile ++++ ocaml-expat-1.1.0/Makefile +@@ -85,10 +85,10 @@ test: unittest + testopt: unittest.opt + ./unittest.opt + unittest: all unittest.ml +- $(OCAMLFIND) ocamlc -o unittest -package oUnit -ccopt -L. -linkpkg \ ++ $(OCAMLFIND) ocamlc -o unittest -package ounit2 -ccopt -L. -linkpkg \ + $(ARCHIVE) unittest.ml + unittest.opt: allopt unittest.ml +- $(OCAMLFIND) ocamlopt -o unittest.opt -package oUnit -ccopt -L. -linkpkg \ ++ $(OCAMLFIND) ocamlopt -o unittest.opt -package ounit2 -ccopt -L. -linkpkg \ + $(XARCHIVE) unittest.ml + + ## Cleaning up diff --git a/dev-ml/ocaml-expat/metadata.xml b/dev-ml/ocaml-expat/metadata.xml index 6b7290909864..6b99dafce31b 100644 --- a/dev-ml/ocaml-expat/metadata.xml +++ b/dev-ml/ocaml-expat/metadata.xml @@ -1,11 +1,11 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">whitequark/ocaml-expat</remote-id> - </upstream> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">whitequark/ocaml-expat</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-ml/ocaml-expat/ocaml-expat-1.0.0.ebuild b/dev-ml/ocaml-expat/ocaml-expat-1.1.0-r1.ebuild index 00eeb198ef8d..6f29b11e860b 100644 --- a/dev-ml/ocaml-expat/ocaml-expat-1.0.0.ebuild +++ b/dev-ml/ocaml-expat/ocaml-expat-1.1.0-r1.ebuild @@ -1,11 +1,12 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit findlib eutils +inherit findlib IUSE="doc +ocamlopt test" +RESTRICT="!test? ( test )" DESCRIPTION="OCaml bindings for expat" SRC_URI="https://github.com/whitequark/ocaml-expat/archive/v${PV}.tar.gz -> ${P}.tar.gz" @@ -15,11 +16,15 @@ RDEPEND="dev-libs/expat >=dev-lang/ocaml-3.10.2:=[ocamlopt?]" DEPEND="${RDEPEND} - test? ( dev-ml/ounit )" + test? ( dev-ml/ounit2 )" SLOT="0/${PV}" LICENSE="MIT" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +PATCHES=( + "${FILESDIR}/ounit2.patch" + "${FILESDIR}/${P}-cc.patch" +) src_compile() { emake depend @@ -27,6 +32,9 @@ src_compile() { if use ocamlopt; then emake allopt fi + if use doc; then + emake doc + fi } src_test() { @@ -40,7 +48,8 @@ src_install() { emake install if use doc ; then - dohtml -r doc/html/* + docinto html + dodoc -r doc/* fi dodoc README } diff --git a/dev-ml/ocaml-expat/ocaml-expat-1.1.0.ebuild b/dev-ml/ocaml-expat/ocaml-expat-1.3.0.ebuild index 00eeb198ef8d..0ef61122e622 100644 --- a/dev-ml/ocaml-expat/ocaml-expat-1.1.0.ebuild +++ b/dev-ml/ocaml-expat/ocaml-expat-1.3.0.ebuild @@ -1,25 +1,30 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=8 -inherit findlib eutils +inherit findlib IUSE="doc +ocamlopt test" +RESTRICT="!test? ( test )" DESCRIPTION="OCaml bindings for expat" SRC_URI="https://github.com/whitequark/ocaml-expat/archive/v${PV}.tar.gz -> ${P}.tar.gz" HOMEPAGE="https://github.com/whitequark/ocaml-expat" RDEPEND="dev-libs/expat - >=dev-lang/ocaml-3.10.2:=[ocamlopt?]" + >=dev-lang/ocaml-4.14.1:=[ocamlopt?]" DEPEND="${RDEPEND} - test? ( dev-ml/ounit )" + test? ( dev-ml/ounit2 )" SLOT="0/${PV}" LICENSE="MIT" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +PATCHES=( + "${FILESDIR}/ounit2.patch" + "${FILESDIR}/${PN}-1.1.0-cc.patch" +) src_compile() { emake depend @@ -27,6 +32,9 @@ src_compile() { if use ocamlopt; then emake allopt fi + if use doc; then + emake doc + fi } src_test() { @@ -40,7 +48,8 @@ src_install() { emake install if use doc ; then - dohtml -r doc/html/* + docinto html + dodoc -r doc/* fi dodoc README } diff --git a/dev-ml/ocaml-expect/Manifest b/dev-ml/ocaml-expect/Manifest deleted file mode 100644 index 75662617cbaf..000000000000 --- a/dev-ml/ocaml-expect/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ocaml-expect-0.0.5.tar.gz 63245 BLAKE2B 8435db55e74f4e245c38f75a686b91b9389e1050a515f674e86308fb270a1090827af40fa9890982ab60ab3e3c5df494accf1a54c232c06c274b36a9a8a2b1f4 SHA512 fbb2ae41c12e57db4440e67d80740380d4cd7bab0f8fdf59d3b69ff91eb6e35a82ca718cf32ad2c791ae76be8a08174a5b3a95e8910351413cc98afd3105a63c diff --git a/dev-ml/ocaml-expect/metadata.xml b/dev-ml/ocaml-expect/metadata.xml deleted file mode 100644 index ffac4d7ebc01..000000000000 --- a/dev-ml/ocaml-expect/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> -</maintainer> -</pkgmetadata> diff --git a/dev-ml/ocaml-expect/ocaml-expect-0.0.5.ebuild b/dev-ml/ocaml-expect/ocaml-expect-0.0.5.ebuild deleted file mode 100644 index 7fe5e81a48f6..000000000000 --- a/dev-ml/ocaml-expect/ocaml-expect-0.0.5.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -OASIS_BUILD_DOCS=1 -OASIS_BUILD_TESTS=1 - -inherit oasis - -DESCRIPTION="Ocaml implementation of expect to help building unitary testing" -HOMEPAGE="http://forge.ocamlcore.org/projects/ocaml-expect/" -SRC_URI="http://forge.ocamlcore.org/frs/download.php/1372/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="test" - -RDEPEND=" - dev-ml/batteries:= - dev-ml/pcre-ocaml:=" -DEPEND="${RDEPEND} - test? ( >=dev-ml/ounit-2.0.0 )" - -DOCS=( "README.txt" "CHANGES.txt" "AUTHORS.txt" ) diff --git a/dev-ml/ocaml-extunix/Manifest b/dev-ml/ocaml-extunix/Manifest deleted file mode 100644 index 6de7aff46e62..000000000000 --- a/dev-ml/ocaml-extunix/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ocaml-extunix-0.1.4.tar.gz 104306 BLAKE2B a1941b0456cce45ec750c0d98e7f0f29bf137335de777664cbe827653bc5003860d52d0c2cce1a31a0b9f7c7348fe5112e389973ff58cc13279289d4684193dc SHA512 a2226235a5aa527a588bb5cfc163fb0767b0d8eb888cd0c902f69d6084f2252d38695c9f98b74e72726ab55753d739483cf5b9a9387206fd35b0b0578a7c30df -DIST ocaml-extunix-0.1.5.tar.gz 109375 BLAKE2B 78ab5e29b8fe876be54fa79104f9d9bda3ad146b62aa1cf276d8c4ac5b3ae1301362044ded4138967560b15a27706855a391f7532171fe35ab0083f90a00af95 SHA512 8c6f519bcd076be056424a295c7fdc678c1aedd8faa3c5a74c9849236f8102bf074ac7fe0b55c819206e8ad2c24878fe61a9a8df7ca785e8f6c71bb6a92e503c diff --git a/dev-ml/ocaml-extunix/ocaml-extunix-0.1.4.ebuild b/dev-ml/ocaml-extunix/ocaml-extunix-0.1.4.ebuild deleted file mode 100644 index 13c89e4cce25..000000000000 --- a/dev-ml/ocaml-extunix/ocaml-extunix-0.1.4.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -OASIS_BUILD_TESTS=1 -OASIS_BUILD_DOCS=1 - -inherit oasis - -DESCRIPTION="Thin bindings to various low-level system APIs" -HOMEPAGE="http://extunix.forge.ocamlcore.org/" -SRC_URI="http://ygrek.org.ua/p/release/ocaml-extunix/${P}.tar.gz" - -LICENSE="LGPL-2.1-with-linking-exception" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND="dev-ml/camlp4:=" -DEPEND="${RDEPEND} - test? ( dev-ml/ounit )" -DOCS=( "README.md" "TODO" "CHANGES.txt" ) diff --git a/dev-ml/ocaml-extunix/ocaml-extunix-0.1.5.ebuild b/dev-ml/ocaml-extunix/ocaml-extunix-0.1.5.ebuild deleted file mode 100644 index e2f0e0c0cc9c..000000000000 --- a/dev-ml/ocaml-extunix/ocaml-extunix-0.1.5.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -OASIS_BUILD_TESTS=1 -OASIS_BUILD_DOCS=1 - -inherit oasis - -DESCRIPTION="Thin bindings to various low-level system APIs" -HOMEPAGE="http://ygrek.org.ua/p/ocaml-extunix/ https://github.com/ygrek/extunix" -SRC_URI="https://github.com/ygrek/extunix/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="LGPL-2.1-with-linking-exception" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND="dev-ml/camlp4:=" -DEPEND="${RDEPEND} - test? ( dev-ml/ounit )" -DOCS=( "README.md" "TODO" "CHANGES.txt" ) diff --git a/dev-ml/ocaml-fileutils/Manifest b/dev-ml/ocaml-fileutils/Manifest index 832f25999913..f519da53cadb 100644 --- a/dev-ml/ocaml-fileutils/Manifest +++ b/dev-ml/ocaml-fileutils/Manifest @@ -1,2 +1,2 @@ -DIST ocaml-fileutils-0.5.1.tar.gz 129639 BLAKE2B 12f4b33eb70caf3a106e87a484411f31d6924aae68c964350080698b723b39c7bae236d5a732a0546cd6a52b4215c9ddf2b46da613c171a1ef384ef5eee3d5fe SHA512 e2f60d16d9c25f43ea6bf5fcdf5810ae1722ef30a37e9ffcb6302a87bf3aa89777f3e3d43860258fb7c284861df1eafb4e5e2b6bd3f8d78d347ef8d139e460e8 -DIST ocaml-fileutils-0.5.2.tar.gz 129676 BLAKE2B 2534c28d134b297cf9f7838c6f33f6fe4a7fde6875cf7ae15990b1d2c2fd53be425ce8b37b6836642b26722fa0042f741e91d1c32211a2618e5f80345b6c63cb SHA512 264282c54ff693686ca9e60f371038f8ea9bce219d04556297dc7b6028c9f65c5a03b7cd263c3519cb212e29665200db1c95c88874bb2cb3d7b610e3b832018d +DIST ocaml-fileutils-0.6.3.tar.bz2 43157 BLAKE2B a9adf17d028abd664dbdec3fefa301a6b502941a6da4ef9c3ef02b876f187d224e404f6a9ffb5460035ba475154c60109a5218cb8b9bb36153ca791f8d218e7d SHA512 2c5e75b894e9f5e3b003d61977a87f5c6964a89d844949eedc55f97c5875cc52052182420bbb4e73925d306479c66400df74e4adfccc5b2102347d13e99505cf +DIST ocaml-fileutils-0.6.4.tar.bz2 43144 BLAKE2B e0024b93c17d11c9c3068da3141c7676bf70feb21fc886d79f793396194f6d5052be887734decd29fbd524d127e0b8afcd41790c9f378e000fcb92cd73e0a2ce SHA512 7053f8d92655d5631f1ec61ab7f9e3f6e3afedbe435038858dd9a026b9c769c6182afaa436491a398e7c4513b384a609e016718e030855996b2d9d54b461bd19 diff --git a/dev-ml/ocaml-fileutils/files/ocaml-fileutils-0.6.4-dune.patch b/dev-ml/ocaml-fileutils/files/ocaml-fileutils-0.6.4-dune.patch new file mode 100644 index 000000000000..5a0eb479bdbc --- /dev/null +++ b/dev-ml/ocaml-fileutils/files/ocaml-fileutils-0.6.4-dune.patch @@ -0,0 +1,8 @@ +--- a/src/lib/fileutils/dune ++++ b/src/lib/fileutils/dune +@@ -30,4 +30,4 @@ + fileUtilWHICH + unixPath + win32Path) +- (libraries unix seq stdlib-shims)) ++ (libraries unix stdlib-shims)) diff --git a/dev-ml/ocaml-fileutils/metadata.xml b/dev-ml/ocaml-fileutils/metadata.xml index ffac4d7ebc01..4c6f3e0e9c42 100644 --- a/dev-ml/ocaml-fileutils/metadata.xml +++ b/dev-ml/ocaml-fileutils/metadata.xml @@ -1,8 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> -</maintainer> + <longdescription> + POSIX-like file manipulation functions inspired by + GNU coreutils and filename manipulation functions + for OCaml. + </longdescription> + <maintainer type="person" proxied="yes"> + <email>rkitover@gmail.com</email> + <name>Rafael Kitover</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="github">gildor478/ocaml-fileutils</remote-id> + </upstream> + <use> + <flag name="ocamlopt"> + Whether the OCaml native code compiler is used. Must be set globally and + match <pkg>dev-lang/ocaml</pkg>. + </flag> + </use> </pkgmetadata> diff --git a/dev-ml/ocaml-fileutils/ocaml-fileutils-0.5.1.ebuild b/dev-ml/ocaml-fileutils/ocaml-fileutils-0.5.1.ebuild deleted file mode 100644 index 9e105e66a76c..000000000000 --- a/dev-ml/ocaml-fileutils/ocaml-fileutils-0.5.1.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -OASIS_BUILD_DOCS=1 -OASIS_BUILD_TESTS=1 - -inherit oasis - -DESCRIPTION="Pure OCaml functions to manipulate real file (POSIX like) and filename" -HOMEPAGE="http://forge.ocamlcore.org/projects/ocaml-fileutils" -SRC_URI="http://forge.ocamlcore.org/frs/download.php/1651/${P}.tar.gz" - -LICENSE="LGPL-2.1-with-linking-exception" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="" -DEPEND="${RDEPEND} - >=dev-ml/ounit-2.0.0" - -DOCS=( "AUTHORS.txt" "README.txt" "CHANGELOG.txt" "TODO.txt" ) diff --git a/dev-ml/ocaml-fileutils/ocaml-fileutils-0.5.2.ebuild b/dev-ml/ocaml-fileutils/ocaml-fileutils-0.5.2.ebuild deleted file mode 100644 index 40d4d20f42d6..000000000000 --- a/dev-ml/ocaml-fileutils/ocaml-fileutils-0.5.2.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -OASIS_BUILD_DOCS=1 -OASIS_BUILD_TESTS=1 - -inherit oasis - -DESCRIPTION="Pure OCaml functions to manipulate real file (POSIX like) and filename" -HOMEPAGE="http://forge.ocamlcore.org/projects/ocaml-fileutils" -SRC_URI="http://forge.ocamlcore.org/frs/download.php/1695/${P}.tar.gz" - -LICENSE="LGPL-2.1-with-linking-exception" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="" -DEPEND="${RDEPEND} - >=dev-ml/ounit-2.0.0" - -DOCS=( "AUTHORS.txt" "README.txt" "CHANGELOG.txt" "TODO.txt" ) diff --git a/dev-ml/ocaml-fileutils/ocaml-fileutils-0.6.3-r1.ebuild b/dev-ml/ocaml-fileutils/ocaml-fileutils-0.6.3-r1.ebuild new file mode 100644 index 000000000000..47ef18bc401e --- /dev/null +++ b/dev-ml/ocaml-fileutils/ocaml-fileutils-0.6.3-r1.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DUNE_PKG_NAME="fileutils" + +inherit dune + +DESCRIPTION="Pure OCaml functions to manipulate real file (POSIX like) and filename" +HOMEPAGE="https://github.com/gildor478/ocaml-fileutils" +SRC_URI="https://github.com/gildor478/${PN}/releases/download/v${PV}/${DUNE_PKG_NAME}-v${PV}.tbz -> ${P}.tar.bz2" + +LICENSE="LGPL-2.1-with-linking-exception" +SLOT="0" +KEYWORDS="amd64 ~x86" +IUSE="+ocamlopt" + +DEPEND=">=dev-ml/ounit2-2.0.0 + >=dev-ml/stdlib-shims-0.2.0" +RDEPEND="${DEPEND}" + +DOCS=( "README.md" "CHANGES.md" "LICENSE.txt" ) + +S="${WORKDIR}/${DUNE_PKG_NAME}-v${PV}" + +src_prepare() { + default + + # Port to dev-ml/ounit2 + sed -i -e 's/oUnit/ounit2/' test/dune || die +} diff --git a/dev-ml/ocaml-fileutils/ocaml-fileutils-0.6.4-r1.ebuild b/dev-ml/ocaml-fileutils/ocaml-fileutils-0.6.4-r1.ebuild new file mode 100644 index 000000000000..6e899ef261b7 --- /dev/null +++ b/dev-ml/ocaml-fileutils/ocaml-fileutils-0.6.4-r1.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DUNE_PKG_NAME=fileutils + +inherit dune + +DESCRIPTION="Pure OCaml functions to manipulate real file (POSIX like) and filename" +HOMEPAGE="https://github.com/gildor478/ocaml-fileutils" +SRC_URI="https://github.com/gildor478/${PN}/releases/download/v${PV}/${DUNE_PKG_NAME}-${PV}.tbz -> ${P}.tar.bz2" +S="${WORKDIR}"/${DUNE_PKG_NAME}-${PV} + +LICENSE="LGPL-2.1-with-linking-exception" +SLOT="0" +KEYWORDS="amd64 ~ppc64 ~x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +DEPEND="dev-ml/stdlib-shims:=" +RDEPEND="${DEPEND}" +BDEPEND="test? ( dev-ml/ounit2 )" + +PATCHES=( "${FILESDIR}"/${P}-dune.patch ) + +DOCS=( CHANGES.md LICENSE.txt README.md ) diff --git a/dev-ml/ocaml-gettext-camomile/Manifest b/dev-ml/ocaml-gettext-camomile/Manifest new file mode 100644 index 000000000000..839e7295801b --- /dev/null +++ b/dev-ml/ocaml-gettext-camomile/Manifest @@ -0,0 +1 @@ +DIST ocaml-gettext-0.4.2.tar.gz 110249 BLAKE2B 54a25ba9f8fb20194fdfaf651586222fab68f927ebfa711812f7c9a387ff40c19e1bf3f63124127356b32b0ca0be2c5ff4e1cdfaf5f3afe690b90c0ca96c470d SHA512 fb89be8d8d9e0ed9327b81a0c81c884ff3f1a97e46b475ef8084abded5c84a256de05d5aa0f42be94f43ab438276a4506af726b6950e4161359a9616fb5832ec diff --git a/dev-ml/ocaml-gettext-camomile/metadata.xml b/dev-ml/ocaml-gettext-camomile/metadata.xml new file mode 100644 index 000000000000..69bd315a05d9 --- /dev/null +++ b/dev-ml/ocaml-gettext-camomile/metadata.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>rkitover@gmail.com</email> + <name>Rafael Kitover</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="github">gildor478/ocaml-gettext</remote-id> + </upstream> + <use> + <flag name="ocamlopt"> + Whether the OCaml native code compiler is used. Must be set globally and + match <pkg>dev-lang/ocaml</pkg>. + </flag> + </use> +</pkgmetadata> diff --git a/dev-ml/ocaml-gettext-camomile/ocaml-gettext-camomile-0.4.2-r1.ebuild b/dev-ml/ocaml-gettext-camomile/ocaml-gettext-camomile-0.4.2-r1.ebuild new file mode 100644 index 000000000000..a9d71a8d2edf --- /dev/null +++ b/dev-ml/ocaml-gettext-camomile/ocaml-gettext-camomile-0.4.2-r1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN=${PN/-camomile/} +MY_P=${P/-camomile/} +DUNE_PKG_NAME="gettext-camomile" +inherit dune + +DESCRIPTION="Support for internationalization of OCaml programs using the Camomile library" +HOMEPAGE="https://github.com/gildor478/ocaml-gettext" +SRC_URI="https://github.com/gildor478/ocaml-gettext/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz" +S="${WORKDIR}/${MY_PN}-${PV}" + +LICENSE="LGPL-2.1-with-linking-exception" +SLOT="0/${PV}" +KEYWORDS="amd64" +IUSE="+ocamlopt test" +RESTRICT="test" # Tests fail + +BDEPEND=" + >=dev-ml/cppo-1.6.6 + dev-ml/dune-configurator +" +RDEPEND=" + dev-ml/base:= + <dev-ml/camomile-2.0.0:=[ocamlopt] + dev-ml/ocaml-gettext:= +" +DEPEND=" + ${RDEPEND} + test? ( + dev-ml/ounit2[ocamlopt=] + dev-ml/ocaml-fileutils + ) +" + +src_prepare() { + default + + # Port to dev-ml/ounit2 + sed -i -e 's/oUnit/ounit2/' test/{,common,test-camomile,test-stub}/dune || die +} diff --git a/dev-ml/ocaml-gettext-stub/Manifest b/dev-ml/ocaml-gettext-stub/Manifest new file mode 100644 index 000000000000..839e7295801b --- /dev/null +++ b/dev-ml/ocaml-gettext-stub/Manifest @@ -0,0 +1 @@ +DIST ocaml-gettext-0.4.2.tar.gz 110249 BLAKE2B 54a25ba9f8fb20194fdfaf651586222fab68f927ebfa711812f7c9a387ff40c19e1bf3f63124127356b32b0ca0be2c5ff4e1cdfaf5f3afe690b90c0ca96c470d SHA512 fb89be8d8d9e0ed9327b81a0c81c884ff3f1a97e46b475ef8084abded5c84a256de05d5aa0f42be94f43ab438276a4506af726b6950e4161359a9616fb5832ec diff --git a/dev-ml/ocaml-gettext-stub/metadata.xml b/dev-ml/ocaml-gettext-stub/metadata.xml new file mode 100644 index 000000000000..69bd315a05d9 --- /dev/null +++ b/dev-ml/ocaml-gettext-stub/metadata.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>rkitover@gmail.com</email> + <name>Rafael Kitover</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="github">gildor478/ocaml-gettext</remote-id> + </upstream> + <use> + <flag name="ocamlopt"> + Whether the OCaml native code compiler is used. Must be set globally and + match <pkg>dev-lang/ocaml</pkg>. + </flag> + </use> +</pkgmetadata> diff --git a/dev-ml/ocaml-gettext-stub/ocaml-gettext-stub-0.4.2-r2.ebuild b/dev-ml/ocaml-gettext-stub/ocaml-gettext-stub-0.4.2-r2.ebuild new file mode 100644 index 000000000000..eb6ff0d4a386 --- /dev/null +++ b/dev-ml/ocaml-gettext-stub/ocaml-gettext-stub-0.4.2-r2.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN=${PN/-stub/} +MY_P=${P/-stub/} + +DUNE_PKG_NAME="gettext-stub" + +inherit dune + +DESCRIPTION="Support for internationalization of OCaml programs using native gettext library" +HOMEPAGE="https://github.com/gildor478/ocaml-gettext" +SRC_URI="https://github.com/gildor478/ocaml-gettext/archive/v${PV}.tar.gz + -> ${MY_P}.tar.gz" +S="${WORKDIR}/${MY_PN}-${PV}" + +LICENSE="LGPL-2.1-with-linking-exception" +SLOT="0/${PV}" +KEYWORDS="amd64 ~ppc64" +IUSE="+ocamlopt test" +RESTRICT="test" # Tests fail. + +RDEPEND=" + dev-ml/base:= + dev-ml/ocaml-gettext:= + !<dev-ml/ocaml-gettext-0.4.2 +" +DEPEND="${RDEPEND}" +BDEPEND=" + >=dev-ml/cppo-1.6.6 + dev-ml/dune-configurator + test? ( + dev-ml/ocaml-fileutils + dev-ml/ounit2[ocamlopt=] + ) +" + +src_prepare() { + default + + # Remove dependency on camomile (see + # https://github.com/gildor478/ocaml-gettext/issues/14) + rm -r src/lib/gettext-camomile || die + rm -r test/test-camomile || die + + # Port to dev-ml/ounit2 + sed -i -e 's/oUnit/ounit2/' test/{,common,test-stub}/dune || die +} diff --git a/dev-ml/ocaml-gettext/Manifest b/dev-ml/ocaml-gettext/Manifest index 15b1d31599b0..045151ba25a0 100644 --- a/dev-ml/ocaml-gettext/Manifest +++ b/dev-ml/ocaml-gettext/Manifest @@ -1,2 +1,2 @@ -DIST ocaml-gettext-0.3.5.tar.gz 165238 BLAKE2B 3da80a80cf3e722dc2a765e005bff0e7613967a5810d13c9d3c0a5b70a919b092627d398dc777775dd2b51dfc7bbe12040b844c609027b4c60cb5d23eda47198 SHA512 a60d51c09dad3076415ef24a9bb3121f84ad649d7a9fa1b9a7da719dd385e4ed7cd9ffbabefbade7ea0daf7b0a5a5eb71b1d0ed21b369914b49f66d0d918c446 DIST ocaml-gettext-0.3.7.tar.gz 134316 BLAKE2B 9de6ef9e04afbb6001ddc5ef145a687ad88a20eef1c27d3a3e6136f81ad46100cc6496cb66e3edfbf0f7eacfa8abbccb44d846d2f676862c96b8ceb860d8f424 SHA512 1358320359b9d2f3fd97a47d69b2a619942a65605c1e5cbf25e33ef42a10273167b526bca15e6c9523b87d8ea9dfd3215334050ad8eb84a8c41d4feef880a27a +DIST ocaml-gettext-0.4.2.tar.gz 110249 BLAKE2B 54a25ba9f8fb20194fdfaf651586222fab68f927ebfa711812f7c9a387ff40c19e1bf3f63124127356b32b0ca0be2c5ff4e1cdfaf5f3afe690b90c0ca96c470d SHA512 fb89be8d8d9e0ed9327b81a0c81c884ff3f1a97e46b475ef8084abded5c84a256de05d5aa0f42be94f43ab438276a4506af726b6950e4161359a9616fb5832ec diff --git a/dev-ml/ocaml-gettext/files/oc43.patch b/dev-ml/ocaml-gettext/files/oc43.patch deleted file mode 100644 index 41996b941122..000000000000 --- a/dev-ml/ocaml-gettext/files/oc43.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: ocaml-gettext-0.3.5/ocaml-gettext/Makefile -=================================================================== ---- ocaml-gettext-0.3.5.orig/ocaml-gettext/Makefile -+++ ocaml-gettext-0.3.5/ocaml-gettext/Makefile -@@ -64,7 +64,6 @@ uninstall: ocaml-xgettext-uninstall - ocaml-xgettext: $(BUILDBIN) - $(OCAMLC) \ - -I +camlp4 dynlink.cma camlp4lib.cma \ -- unix.cma \ - `$(OCAMLFIND) query -r -predicates byte gettext.extract -i-format` \ - `$(OCAMLFIND) query -r -predicates byte gettext.extract -a-format` \ - `$(OCAMLFIND) query -r -predicates byte gettext.extract -o-format` \ diff --git a/dev-ml/ocaml-gettext/files/ocaml-unsafe-string.patch b/dev-ml/ocaml-gettext/files/ocaml-unsafe-string.patch new file mode 100644 index 000000000000..8d0a12c80d0e --- /dev/null +++ b/dev-ml/ocaml-gettext/files/ocaml-unsafe-string.patch @@ -0,0 +1,17 @@ +diff --git a/ConfMakefile.in b/ConfMakefile.in +index 5a1e9ea..b562698 100644 +--- a/ConfMakefile.in ++++ b/ConfMakefile.in +@@ -37,9 +37,9 @@ OCAMLLIB=@OCAMLLIB@ + OCAMLFIND_COMMANDS = "ocamlc=@OCAMLC@ \ + ocamlopt=@OCAMLOPT@ \ + ocamldep=@OCAMLDEP@" +-OCAMLC = @OCAMLFIND@ ocamlc +-OCAMLOPT = @OCAMLFIND@ ocamlopt +-OCAMLDEP = @OCAMLFIND@ ocamldep ++OCAMLC = @OCAMLFIND@ ocamlc -unsafe-string ++OCAMLOPT = @OCAMLFIND@ ocamlopt -unsafe-string ++OCAMLDEP = @OCAMLFIND@ ocamldep -unsafe-string + OCAMLBEST = @OCAMLBEST@ + OCAMLVERSION = @OCAMLVERSION@ + OCAMLFIND = @OCAMLFIND@ diff --git a/dev-ml/ocaml-gettext/metadata.xml b/dev-ml/ocaml-gettext/metadata.xml index 885b2e79d01d..69bd315a05d9 100644 --- a/dev-ml/ocaml-gettext/metadata.xml +++ b/dev-ml/ocaml-gettext/metadata.xml @@ -1,11 +1,21 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">gildor478/ocaml-gettext</remote-id> - </upstream> + <maintainer type="person" proxied="yes"> + <email>rkitover@gmail.com</email> + <name>Rafael Kitover</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="github">gildor478/ocaml-gettext</remote-id> + </upstream> + <use> + <flag name="ocamlopt"> + Whether the OCaml native code compiler is used. Must be set globally and + match <pkg>dev-lang/ocaml</pkg>. + </flag> + </use> </pkgmetadata> diff --git a/dev-ml/ocaml-gettext/ocaml-gettext-0.3.5-r1.ebuild b/dev-ml/ocaml-gettext/ocaml-gettext-0.3.5-r1.ebuild deleted file mode 100644 index bfa850f00bed..000000000000 --- a/dev-ml/ocaml-gettext/ocaml-gettext-0.3.5-r1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib eutils - -DESCRIPTION="Provides support for internationalization of OCaml program" -HOMEPAGE="http://forge.ocamlcore.org/projects/ocaml-gettext" -SRC_URI="http://forge.ocamlcore.org/frs/download.php/1433/${P}.tar.gz" - -LICENSE="LGPL-2.1-with-linking-exception" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="doc test" - -RDEPEND=">=dev-lang/ocaml-3.12.1:= - >=dev-ml/ocaml-fileutils-0.4.0:= - >=dev-ml/camomile-0.8.3:= - sys-devel/gettext - dev-ml/camlp4:= - " -DEPEND="${RDEPEND} - doc? ( app-text/docbook-xsl-stylesheets dev-libs/libxslt ) - test? ( dev-ml/ounit )" - -src_prepare() { - has_version '>=dev-lang/ocaml-4.03' && epatch "${FILESDIR}/oc43.patch" -} - -src_configure() { - econf \ - --with-docbook-stylesheet="${EPREFIX}/usr/share/sgml/docbook/xsl-stylesheets/" \ - $(use_enable doc) \ - $(use_enable test) -} - -src_compile() { - emake -j1 -} - -src_install() { - findlib_src_preinst - emake -j1 DESTDIR="${D}" \ - BINDIR="${ED}/usr/bin" \ - PODIR="${ED}/usr/share/locale/" \ - DOCDIR="${ED}/usr/share/doc/${PF}" \ - MANDIR="${ED}/usr/share/man" \ - install - dodoc CHANGELOG README THANKS TODO -} diff --git a/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7.ebuild b/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7-r3.ebuild index 90649dc623b9..bf25db3a74cf 100644 --- a/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7.ebuild +++ b/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7-r3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit findlib eutils autotools +inherit autotools findlib DESCRIPTION="Provides support for internationalization of OCaml program" HOMEPAGE="https://github.com/gildor478/ocaml-gettext" @@ -11,20 +11,45 @@ SRC_URI="https://github.com/gildor478/ocaml-gettext/archive/${PV}.tar.gz -> ${P} LICENSE="LGPL-2.1-with-linking-exception" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="doc test" +KEYWORDS="amd64 ~x86" +IUSE="doc +ocamlopt test" +RESTRICT="!test? ( test )" -RDEPEND=">=dev-lang/ocaml-3.12.1:= +PATCHES=( "${FILESDIR}"/ocaml-unsafe-string.patch ) + +BDEPEND=" + doc? ( + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + ) +" +# OCaml 4.10 does not support -unsafe-string by default +# bug #666149 +RDEPEND=" + >=dev-lang/ocaml-3.12.1:= + <dev-lang/ocaml-4.10.0:= >=dev-ml/ocaml-fileutils-0.4.0:= >=dev-ml/camomile-0.8.3:= sys-devel/gettext dev-ml/camlp4:= - " -DEPEND="${RDEPEND} - doc? ( app-text/docbook-xsl-stylesheets dev-libs/libxslt ) - test? ( dev-ml/ounit )" + !dev-ml/ocaml-gettext-stub +" +DEPEND=" + ${RDEPEND} + test? ( dev-ml/ounit2 ) +" src_prepare() { + default + + # Porting to dev-ml/ounit2 + sed -i \ + -e 's/OCAMLFIND_CHECK_MODULE(oUnit/OCAMLFIND_CHECK_MODULE(ounit2/' \ + configure.in || die + sed -i \ + -e 's/oUnit/ounit2/' \ + test/Makefile || die + eautoreconf } diff --git a/dev-ml/ocaml-gettext/ocaml-gettext-0.4.2-r1.ebuild b/dev-ml/ocaml-gettext/ocaml-gettext-0.4.2-r1.ebuild new file mode 100644 index 000000000000..1f12d2b9d7a0 --- /dev/null +++ b/dev-ml/ocaml-gettext/ocaml-gettext-0.4.2-r1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DUNE_PKG_NAME="gettext" +inherit dune + +DESCRIPTION="Provides support for internationalization of OCaml program" +HOMEPAGE="https://github.com/gildor478/ocaml-gettext" +SRC_URI="https://github.com/gildor478/ocaml-gettext/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1-with-linking-exception" +SLOT="0/${PV}" +KEYWORDS="amd64 ~ppc64 ~x86" +IUSE="+ocamlopt test" +RESTRICT="test" # Tests fail + +BDEPEND=" + >=dev-ml/cppo-1.6.6 + dev-ml/dune-configurator +" + +RDEPEND=" + dev-ml/base:= + >=dev-ml/ocaml-fileutils-0.4.0:=[ocamlopt=] + sys-devel/gettext +" +DEPEND=" + ${RDEPEND} + test? ( dev-ml/ounit2[ocamlopt=] ) +" + +src_prepare() { + default + + # Remove dependency on camomile (see + # https://github.com/gildor478/ocaml-gettext/issues/14) + rm -r src/lib/gettext-camomile || die + rm -r test/test-camomile || die + + # Port to dev-ml/ounit2 + sed -i -e 's/oUnit/ounit2/' test/{,common,test-stub}/dune || die +} diff --git a/dev-ml/ocaml-hashcons/Manifest b/dev-ml/ocaml-hashcons/Manifest index 4daf113868a8..45655278b828 100644 --- a/dev-ml/ocaml-hashcons/Manifest +++ b/dev-ml/ocaml-hashcons/Manifest @@ -1,2 +1 @@ -DIST ocaml-hashcons-1.2.tar.gz 19775 BLAKE2B 7bef506cb7de3177168cc582245f8e2ece3ca7e9da78985ff604a32be675bcd36901ed920c7898aa0e3087251494f425c164cd1125485549de0bbfd867bdbfa6 SHA512 167ed8d74c5080ef14af0ac1232ea16faee3f0e09e0a65cd72447266939ce7ed5416f4cf6a3021e5ca8215726df129d3f05c9e0c12dcd36f845b060fd93072b2 DIST ocaml-hashcons-1.3.tar.gz 19495 BLAKE2B 0d29a529fb1d6953e7294e3992e6f41c094e8b4ea607ed4f2f0d97c558b2c9a6e8703de0aca06727b845ad3f3989ef99c634e248f221c95fbffc2321cd73e961 SHA512 fd194d48a3231e72ca8bf3d324e5e1f6442d965da9149973a1763cf70aa82398805fa00648bdd12de3d3daada8e90bdc575c73886f949b5183e79bea75beadc8 diff --git a/dev-ml/ocaml-hashcons/metadata.xml b/dev-ml/ocaml-hashcons/metadata.xml index a079c25ecc03..31fdf2acd84c 100644 --- a/dev-ml/ocaml-hashcons/metadata.xml +++ b/dev-ml/ocaml-hashcons/metadata.xml @@ -1,10 +1,7 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">backtracking/ocaml-hashcons</remote-id> </upstream> diff --git a/dev-ml/ocaml-hashcons/ocaml-hashcons-1.2.ebuild b/dev-ml/ocaml-hashcons/ocaml-hashcons-1.2.ebuild deleted file mode 100644 index e2f3672faae6..000000000000 --- a/dev-ml/ocaml-hashcons/ocaml-hashcons-1.2.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools findlib - -DESCRIPTION="OCaml hash-consing library" -HOMEPAGE="https://github.com/backtracking/ocaml-hashcons" -SRC_URI="https://github.com/backtracking/ocaml-hashcons/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1-with-linking-exception" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="+ocamlopt" - -RDEPEND="dev-lang/ocaml:=[ocamlopt?]" -DEPEND="${RDEPEND}" - -src_prepare() { - eautoreconf - sed -i -e 's/$(OCAMLFIND) remove/#/' Makefile.in || die -} - -src_compile() { - if use ocamlopt; then - emake opt byte - else - emake byte - fi -} - -src_install() { - dodir "$(ocamlfind printconf destdir)/hashcons" - emake DESTDIR="-destdir ${D}/$(ocamlfind printconf destdir)/" $(usex ocamlopt install-opt install-byte) - dodoc README.md CHANGES -} diff --git a/dev-ml/ocaml-hashcons/ocaml-hashcons-1.3.ebuild b/dev-ml/ocaml-hashcons/ocaml-hashcons-1.3.ebuild index 7b027961ea87..e059ea1b1938 100644 --- a/dev-ml/ocaml-hashcons/ocaml-hashcons-1.3.ebuild +++ b/dev-ml/ocaml-hashcons/ocaml-hashcons-1.3.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 inherit autotools findlib @@ -18,7 +18,10 @@ RDEPEND="dev-lang/ocaml:=[ocamlopt?]" DEPEND="${RDEPEND}" src_prepare() { + default + eautoreconf + sed -i -e 's/$(OCAMLFIND) remove/#/' Makefile.in || die } @@ -31,7 +34,12 @@ src_compile() { } src_install() { - dodir "$(ocamlfind printconf destdir)/hashcons" - emake DESTDIR="-destdir ${D}/$(ocamlfind printconf destdir)/" $(usex ocamlopt install-opt install-byte) + local destdir=$(ocamlfind printconf destdir || die) + dodir ${destdir}/hashcons + + emake \ + DESTDIR="-destdir ${D}"/${destdir}/ \ + $(usex ocamlopt install-opt install-byte) + dodoc README.md CHANGES } diff --git a/dev-ml/ocaml-inifiles/Manifest b/dev-ml/ocaml-inifiles/Manifest new file mode 100644 index 000000000000..b1ede1dc79ec --- /dev/null +++ b/dev-ml/ocaml-inifiles/Manifest @@ -0,0 +1 @@ +DIST ocaml-inifiles_1.2.orig.tar.gz 11642 BLAKE2B 9970a5df9290c0532ad54eb8df6737f2e22385d5de6defd9681f115e2c0c62217e56dbf3bde91424e3a75f56d6e00daa698e2029ae457cb55a3495a8b2144490 SHA512 d57016e338caade7ceff416b698ad320da7e5ef376430d5bca9115ca0abc219a8072c9fddc8c8388c0b7ed404801e5158827d86577be49658611bd830e8814ef diff --git a/dev-ml/ocaml-inifiles/files/ocaml-inifiles-1.2-inifiles.ml.patch b/dev-ml/ocaml-inifiles/files/ocaml-inifiles-1.2-inifiles.ml.patch new file mode 100644 index 000000000000..17c060c8a208 --- /dev/null +++ b/dev-ml/ocaml-inifiles/files/ocaml-inifiles-1.2-inifiles.ml.patch @@ -0,0 +1,11 @@ +--- a/inifiles.ml ++++ b/inifiles.ml +@@ -257,7 +257,7 @@ + func + initial + (List.rev_map +- (new inifile) ++ (fun x -> new inifile x) + (List.filter + check_file + (List.rev_map diff --git a/dev-ml/ocaml-inifiles/files/ocaml-inifiles-1.2-shuffle.patch b/dev-ml/ocaml-inifiles/files/ocaml-inifiles-1.2-shuffle.patch new file mode 100644 index 000000000000..49a4626e0901 --- /dev/null +++ b/dev-ml/ocaml-inifiles/files/ocaml-inifiles-1.2-shuffle.patch @@ -0,0 +1,8 @@ +--- a/OCamlMakefile 2023-01-26 08:33:13.101689847 +0100 ++++ b/OCamlMakefile 2023-01-26 08:34:59.133050720 +0100 +@@ -1117,3 +1117,5 @@ + .PHONY: nobackup + nobackup: + rm -f *.bak *~ *.dup ++ ++inilexer.cmi : parseini.cmo diff --git a/dev-ml/ocaml-mysql/metadata.xml b/dev-ml/ocaml-inifiles/metadata.xml index ffa6c6b4395b..ddbdc793cf27 100644 --- a/dev-ml/ocaml-mysql/metadata.xml +++ b/dev-ml/ocaml-inifiles/metadata.xml @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> + <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> </pkgmetadata> diff --git a/dev-ml/ocaml-inifiles/ocaml-inifiles-1.2.ebuild b/dev-ml/ocaml-inifiles/ocaml-inifiles-1.2.ebuild new file mode 100644 index 000000000000..7611ae6b219e --- /dev/null +++ b/dev-ml/ocaml-inifiles/ocaml-inifiles-1.2.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit findlib + +DESCRIPTION="A small OCaml library to read and write .ini files" +HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" +SRC_URI="http://archive.ubuntu.com/ubuntu/pool/universe/o/${PN}/${PN}_${PV}.orig.tar.gz" +S="${WORKDIR}/inifiles-${PV}" + +LICENSE="LGPL-2.1+" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="+ocamlopt" + +RDEPEND="dev-ml/pcre-ocaml:=" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-inifiles.ml.patch + "${FILESDIR}"/${P}-shuffle.patch +) + +src_compile() { + emake -j1 + use ocamlopt && emake -j1 opt +} + +src_install() { + findlib_src_install +} diff --git a/dev-ml/ocaml-ipaddr/Manifest b/dev-ml/ocaml-ipaddr/Manifest deleted file mode 100644 index c088a0589139..000000000000 --- a/dev-ml/ocaml-ipaddr/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ocaml-ipaddr-2.8.0.tar.gz 22134 BLAKE2B b6e9d49fd6ac69bd4cd4884e97490a744e863541084270f55847768c2fe312334feb00fc9404028664864cc1dffccf8cf2df004a341429e78122dc64bfe0a087 SHA512 1714ee4d6b2afa17b987844f37a9896f01d7b674770fa6804b03222dba656130f9ee0d2d1409b67e770e21f973682c7d1d5c550abb0a5d94bc0c04a1a97e8e3c diff --git a/dev-ml/ocaml-ipaddr/ocaml-ipaddr-2.8.0.ebuild b/dev-ml/ocaml-ipaddr/ocaml-ipaddr-2.8.0.ebuild deleted file mode 100644 index c4a103f9a450..000000000000 --- a/dev-ml/ocaml-ipaddr/ocaml-ipaddr-2.8.0.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit opam - -DESCRIPTION="OCaml library for manipulation of IP (and MAC) address representations" -HOMEPAGE="https://github.com/mirage/ocaml-ipaddr" -SRC_URI="https://github.com/mirage/ocaml-ipaddr/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="ISC" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="+ocamlopt test" - -RDEPEND="dev-ml/sexplib:= - dev-ml/ppx_sexp_conv:= - dev-ml/ppx_core:= - dev-ml/ppx_type_conv:= - dev-lang/ocaml:=[ocamlopt?] -" -DEPEND="${RDEPEND} - dev-ml/jbuilder - dev-ml/findlib - test? ( dev-ml/ounit ) -" - -src_install() { - opam_src_install ipaddr -} diff --git a/dev-ml/ocaml-magic-mime/Manifest b/dev-ml/ocaml-magic-mime/Manifest deleted file mode 100644 index 9a97f5e304a2..000000000000 --- a/dev-ml/ocaml-magic-mime/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ocaml-magic-mime-1.0.0.tar.gz 53937 BLAKE2B 202968b4038f66e61b458b84d6505b1c143b8994ff32cd6c2e11d7feec31a4e99af26fddb84b72d19ce1a37cc01d6dd0bcf6e9648b6434f0a1509120fabda251 SHA512 e6a050e0adc465d174083b101b66805e3261b0498cd20d19bd4d2da52859d6c792f8e13e1c787d54f81e1ff65048f4fb3c38367f1a60c8e5c94367f5f685dc8e -DIST ocaml-magic-mime-1.1.0.tar.gz 13228 BLAKE2B 105f9fdd71a752bc5e0f660af40dc4f212a721964091e8719b55499f3ab046c6b40894b8a21defdca4cfc14ac2cbed874c189d96cb83633ad95fab7fd7e2d793 SHA512 41daa6d85a1398498f03dc54d6e5c5057c79c9c7e4063fb67e73c1b497e69a0c67796640c837fcf3715e8bea7590288f1cf84e41c7ab46d910c6d8d32156efe5 diff --git a/dev-ml/ocaml-magic-mime/metadata.xml b/dev-ml/ocaml-magic-mime/metadata.xml deleted file mode 100644 index ecc5aac550f5..000000000000 --- a/dev-ml/ocaml-magic-mime/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">mirage/ocaml-magic-mime</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/ocaml-magic-mime/ocaml-magic-mime-1.0.0.ebuild b/dev-ml/ocaml-magic-mime/ocaml-magic-mime-1.0.0.ebuild deleted file mode 100644 index 7693ae06464f..000000000000 --- a/dev-ml/ocaml-magic-mime/ocaml-magic-mime-1.0.0.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit oasis - -DESCRIPTION="Convert file extensions to MIME types" -HOMEPAGE="https://github.com/mirage/ocaml-magic-mime" -SRC_URI="https://github.com/mirage/ocaml-magic-mime/archive/v${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="ISC" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND}" diff --git a/dev-ml/ocaml-magic-mime/ocaml-magic-mime-1.1.0.ebuild b/dev-ml/ocaml-magic-mime/ocaml-magic-mime-1.1.0.ebuild deleted file mode 100644 index 17c16d0e2fa3..000000000000 --- a/dev-ml/ocaml-magic-mime/ocaml-magic-mime-1.1.0.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Convert file extensions to MIME types" -HOMEPAGE="https://github.com/mirage/ocaml-magic-mime" -SRC_URI="https://github.com/mirage/ocaml-magic-mime/archive/v${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="ISC" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND="dev-lang/ocaml:=" -DEPEND="${RDEPEND} - dev-ml/jbuilder - dev-ml/opam -" - -src_install() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - magic-mime.install || die -} diff --git a/dev-ml/ocaml-make/Manifest b/dev-ml/ocaml-make/Manifest deleted file mode 100644 index c4973e63ff3a..000000000000 --- a/dev-ml/ocaml-make/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ocaml-makefile-6.37.0.tar.gz 49202 BLAKE2B e636b3baf2e088507deb3b6c98f682cd21857988963801ede02a0b8acac4c9bec3f9ae48d76122ab96a6d16d3ede5bcda2a62e351f7f34c230497ee99a1081d8 SHA512 19d318f8b03116c3e999b61c1a2708f483873ab7ae9260225df79888a86eb39e77867fdefe0df23a50ac1fd422b3b774f96b5b58d9dec449710527df1075a36d -DIST ocaml-makefile-6.39.0.tbz 42477 BLAKE2B 35cffde17f8554f09da24aa1dbc0036b75fcf97516d87d727359899e48c2ccd512d4ae8fcac5319ff30c26e2c9ef813419926a8be103b9de4a9ad6418d1f253e SHA512 54a52c243ce23eba286502aa28ccdbb412aba7cf3ed90e3079ab1b187e61edc8a3197536d5c054b03a871eadbdd0e3b93c47904cb0594ccc2c4ce66ed31daa21 diff --git a/dev-ml/ocaml-make/metadata.xml b/dev-ml/ocaml-make/metadata.xml deleted file mode 100644 index c6bc6c199a22..000000000000 --- a/dev-ml/ocaml-make/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">mmottl/ocaml-makefile</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/ocaml-make/ocaml-make-6.37.0.ebuild b/dev-ml/ocaml-make/ocaml-make-6.37.0.ebuild deleted file mode 100644 index 35b705224bc0..000000000000 --- a/dev-ml/ocaml-make/ocaml-make-6.37.0.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -DESCRIPTION="Generic O'Caml Makefile for GNU Make" -HOMEPAGE="https://bitbucket.org/mmottl/ocaml-makefile" -LICENSE="LGPL-2.1" - -DEPEND="" -RDEPEND=">=dev-lang/ocaml-3.06-r1 - >=dev-ml/findlib-0.8" -SRC_URI="https://bitbucket.org/mmottl/ocaml-makefile/downloads/${PN}file-${PV}.tar.gz" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" -IUSE="examples" -S="${WORKDIR}/${PN}file-${PV}" - -src_install () { - # Just put the OCamlMakefile into /usr/include - # where GNU Make will automatically pick it up. - insinto /usr/include - doins OCamlMakefile - # install documentation - dodoc README.md CHANGES.txt - - if use examples; then - insinto /usr/share/doc/${PF} - doins -r calc camlp4 gtk idl threads - fi -} diff --git a/dev-ml/ocaml-make/ocaml-make-6.39.0.ebuild b/dev-ml/ocaml-make/ocaml-make-6.39.0.ebuild deleted file mode 100644 index e220e306ac95..000000000000 --- a/dev-ml/ocaml-make/ocaml-make-6.39.0.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -DESCRIPTION="Generic O'Caml Makefile for GNU Make" -HOMEPAGE="http://mmottl.github.io/ocaml-makefile/ https://github.com/mmottl/ocaml-makefile" -LICENSE="LGPL-2.1" - -DEPEND="" -RDEPEND=">=dev-lang/ocaml-3.06-r1 - >=dev-ml/findlib-0.8" -SRC_URI="https://github.com/mmottl/ocaml-makefile/releases/download/${PV}/ocaml-makefile-${PV}.tbz" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" -IUSE="examples" -S="${WORKDIR}/${PN}file-${PV}" - -src_install () { - # Just put the OCamlMakefile into /usr/include - # where GNU Make will automatically pick it up. - insinto /usr/include - doins OCamlMakefile - # install documentation - dodoc README.md CHANGES.md - - if use examples; then - insinto /usr/share/doc/${PF} - doins -r calc camlp4 gtk idl threads - fi -} diff --git a/dev-ml/ocaml-migrate-parsetree/Manifest b/dev-ml/ocaml-migrate-parsetree/Manifest index 8469270d5ce0..72573a110830 100644 --- a/dev-ml/ocaml-migrate-parsetree/Manifest +++ b/dev-ml/ocaml-migrate-parsetree/Manifest @@ -1,3 +1,5 @@ -DIST ocaml-migrate-parsetree-1.0.5.tar.gz 209078 BLAKE2B f56bd7c142280c3da6439f2e8d72ca43a9c2f5068775fb7ae5e4b73b8f8824ead04d9646b3dfcacc1db6acef2245038b7e4dcfc927c4e7d79e1e90229b143bf5 SHA512 eff87416eeb6175820bedfa3160160fa7328bcee3d05e066b5a94db25a476299f3f5ad07db22eb192f84e5b83804cf2e3a66d77561c984d658d9255c43660b90 -DIST ocaml-migrate-parsetree-1.0.6.tar.gz 209199 BLAKE2B 5682cf02ea17e53f352a9ed8d198bb5a8a8aceedac6754f3d60644a7f21e1fc9cd4daecc24cc8d65f790846cd8518daf874710a6e4ee9ef8c27aec0f7fd43162 SHA512 b44b9fc59cef787a0188245be357685fe7ecd5cc81368b5677b3389e8d09834e5e40f94a3cd7be762f3eb27657a628c0a228c4cefe4443ad1dc8ce012f2552b4 -DIST ocaml-migrate-parsetree-1.0.7.tar.gz 209251 BLAKE2B ad221fd6a3a91d546d3bc75495f32914b99eb0dcdcf3fbe6f76cb80f85a46346815a21bffa872f2aefe09109ab162d19f7019a8d0441d4f9f7ce22c0ada13f2e SHA512 3ba1bfe4840b2664b5053068b3659eb6a2ca216f29ece3f4522d1e7c5d87cb643bfb59ebe0563264cafdc31b9aa572007b4261fd3df8b27607fad47ff6168892 +DIST ocaml-migrate-parsetree-1.8.0.tar.gz 466241 BLAKE2B 0b2211ed3a2a2e4e5200a6da0eb288839620fb6397b3cb2b1b83ed7c9a6a23eb7505e1311d30a8449a198221888a5d3b44d528dc84b1f6cabc546adad4110c67 SHA512 25eefd57a23221c7e71025557c977159c2a831713a40188e9750af7ddb93f089163ad4d8b24c53667869839249f1f389ea7928f54777101d5c291684e76be1a1 +DIST ocaml-migrate-parsetree-2.1.0.tar.gz 169358 BLAKE2B 072ba6e1a879d5e308e7b40c55c323f353cd2187c8884bce25bffd35d7f5e64f2aa7070ae2766c1e41ef47ffbbf44218fdc8b823dbb33c6c11f0e262cd94ab83 SHA512 0fd9dc9ae9a4c0b50f100958c0df6d9bb33a4d3c2e4d9572aae52d4e7393c1432deca9f5812dbccc637150b1a8f58eabb433e87baf08c79af9e1ff3c58509a32 +DIST ocaml-migrate-parsetree-2.2.0.tar.gz 188265 BLAKE2B a551ab1abd9db751d5300cd6c570e2072fa8d242c6a58c9b84387b177211081f6747526ae787ad51817bd63162c3fed61cbd1e3af083a49a524c0e38c69546e1 SHA512 7c1eec4b1d66d6d7df685684b054d8e98de6d4bafb6601116affc9f05fa89fb098824005891f0002e12c2d83ade734cffde2070792db8c9bc2d79825b86b45c1 +DIST ocaml-migrate-parsetree-2.3.0.tar.gz 206750 BLAKE2B 47ffdf83d8329a5dc715f4d43f5440ee05bc88d2ebd1e7a11b8c45a2b1de64be77b2d0905f46a594fa84ca62785c64472b2b8bc1ee37440fca9b8dd5a56dbcc5 SHA512 f2000939eee0b2eac93d059292b0bc13aa809c9fe5e54b1e0bf412e41921647e9bc71ef23e0c6fba70e481891ece5a65763743932c69bf278a1036c437313219 +DIST ocaml-migrate-parsetree-2.4.0.tar.gz 207332 BLAKE2B cb8cae9eb30c09803944aae428cb0b5f8a52fdcb168beca956071507f9b3739664ee7fd99f823ca900ed61283422344ecebd96d1f526b76e6d334e3149e7e995 SHA512 9fb4fd69cc3eb64110127f9622cbb88ff1db3ecf45dc49377095d57c40ae2302b8e6928eda7e09b6e63f1820823c974ec479a8fa14b2a3f7da877faef0ca0414 diff --git a/dev-ml/ocaml-migrate-parsetree/metadata.xml b/dev-ml/ocaml-migrate-parsetree/metadata.xml index 9354118a9b53..dd1561f22cab 100644 --- a/dev-ml/ocaml-migrate-parsetree/metadata.xml +++ b/dev-ml/ocaml-migrate-parsetree/metadata.xml @@ -1,11 +1,11 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> - <remote-id type="github">let-def/ocaml-migrate-parsetree</remote-id> + <remote-id type="github">ocaml-ppx/ocaml-migrate-parsetree</remote-id> </upstream> </pkgmetadata> diff --git a/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-1.0.5.ebuild b/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-1.8.0-r1.ebuild index da28219a5424..9bad2ee3e9f3 100644 --- a/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-1.0.5.ebuild +++ b/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-1.8.0-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit findlib opam +inherit dune DESCRIPTION="Convert OCaml parsetrees between different major versions" HOMEPAGE="https://github.com/let-def/ocaml-migrate-parsetree" @@ -11,10 +11,11 @@ SRC_URI="https://github.com/let-def/ocaml-migrate-parsetree/archive/v${PV}.tar.g LICENSE="LGPL-2.1" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" -IUSE="" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" -DEPEND="dev-ml/result:=" +DEPEND="dev-ml/cinaps:= + dev-ml/ppx_derivers:= + <dev-lang/ocaml-4.13" RDEPEND="${DEPEND}" -DEPEND="${DEPEND} - dev-ml/jbuilder" diff --git a/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-1.0.7.ebuild b/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-2.1.0.ebuild index da28219a5424..f6e2d4b55f61 100644 --- a/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-1.0.7.ebuild +++ b/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-2.1.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit findlib opam +inherit dune DESCRIPTION="Convert OCaml parsetrees between different major versions" HOMEPAGE="https://github.com/let-def/ocaml-migrate-parsetree" @@ -11,10 +11,8 @@ SRC_URI="https://github.com/let-def/ocaml-migrate-parsetree/archive/v${PV}.tar.g LICENSE="LGPL-2.1" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" -IUSE="" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" -DEPEND="dev-ml/result:=" -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} - dev-ml/jbuilder" +DEPEND="test? ( dev-ml/cinaps )" diff --git a/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-1.0.6.ebuild b/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-2.2.0.ebuild index da28219a5424..fbf5d71d0151 100644 --- a/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-1.0.6.ebuild +++ b/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-2.2.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit findlib opam +inherit dune DESCRIPTION="Convert OCaml parsetrees between different major versions" HOMEPAGE="https://github.com/let-def/ocaml-migrate-parsetree" @@ -11,10 +11,9 @@ SRC_URI="https://github.com/let-def/ocaml-migrate-parsetree/archive/v${PV}.tar.g LICENSE="LGPL-2.1" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" -IUSE="" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test ) strip" -DEPEND="dev-ml/result:=" -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} - dev-ml/jbuilder" +DEPEND="test? ( dev-ml/cinaps )" +BDEPEND=">=dev-ml/dune-2.3" diff --git a/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-2.3.0.ebuild b/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-2.3.0.ebuild new file mode 100644 index 000000000000..3d455ffdd72a --- /dev/null +++ b/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-2.3.0.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Convert OCaml parsetrees between different major versions" +HOMEPAGE="https://github.com/let-def/ocaml-migrate-parsetree" +SRC_URI="https://github.com/let-def/ocaml-migrate-parsetree/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test ) strip" + +DEPEND="test? ( dev-ml/cinaps )" +BDEPEND=">=dev-ml/dune-2.3" diff --git a/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-2.4.0.ebuild b/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-2.4.0.ebuild new file mode 100644 index 000000000000..bcad667ef590 --- /dev/null +++ b/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-2.4.0.ebuild @@ -0,0 +1,20 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Convert OCaml parsetrees between different major versions" +HOMEPAGE="https://github.com/let-def/ocaml-migrate-parsetree/" +SRC_URI="https://github.com/let-def/ocaml-migrate-parsetree/archive/${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test ) strip" + +DEPEND="test? ( dev-ml/cinaps )" +BDEPEND=">=dev-ml/dune-2.3" diff --git a/dev-ml/ocaml-mysql/Manifest b/dev-ml/ocaml-mysql/Manifest deleted file mode 100644 index d37071e4153c..000000000000 --- a/dev-ml/ocaml-mysql/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ocaml-mysql-1.2.1.tar.gz 99250 BLAKE2B 576eb7cc7ccf9e747f207faa100adb7f10a17be2083dbd4f1fb352f8a023425eb7917d7bd4756ddafd663657375324207596e97d959f69c704fb1f5126b7d63d SHA512 bf9b4a1bfcc1a8d356a2d74ea9d8de8dd201973b9dc89c06349e814c2368871f5f6ccc2eca25b33fa5fabf4b6d19a5b4b436a1e055b90468f16f575257121e64 -DIST ocaml-mysql-1.2.2.tar.gz 99136 BLAKE2B dcc18b51514d7a9bd7bfdf97c3f410aa959cf1b2285bd6d347cd1ebdd51952f687222b16c250d8553f7b2235bff7201978bc8debe22996566412925373c3d9d7 SHA512 2af13de017b73a31c23e0536fd10679eaf5c0692741d19729b08ab58f4d2585f8f7faf0cfac1e3ccc3d3ceffcbd1740f62621ba678c50f545fc3a3a36a17742f diff --git a/dev-ml/ocaml-mysql/ocaml-mysql-1.2.1-r1.ebuild b/dev-ml/ocaml-mysql/ocaml-mysql-1.2.1-r1.ebuild deleted file mode 100644 index 74bddd8f624a..000000000000 --- a/dev-ml/ocaml-mysql/ocaml-mysql-1.2.1-r1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit findlib - -IUSE="+ocamlopt" - -DESCRIPTION="A package for ocaml that provides access to mysql databases" -SRC_URI="http://ygrek.org.ua/p/release/ocaml-mysql/${P}.tar.gz" -HOMEPAGE="http://ocaml-mysql.forge.ocamlcore.org/" - -DEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?] - sys-libs/zlib - dev-db/mysql-connector-c:0=" - -RDEPEND="$DEPEND" - -SLOT="0/${PV}" -LICENSE="LGPL-2" -KEYWORDS="~amd64 ~ppc ~x86" - -src_compile() -{ - emake all - if use ocamlopt; then - emake opt - fi -} - -src_install() -{ - findlib_src_preinst - emake install - - dodoc CHANGES README VERSION -} diff --git a/dev-ml/ocaml-mysql/ocaml-mysql-1.2.1.ebuild b/dev-ml/ocaml-mysql/ocaml-mysql-1.2.1.ebuild deleted file mode 100644 index 061aa0eae84e..000000000000 --- a/dev-ml/ocaml-mysql/ocaml-mysql-1.2.1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib eutils - -IUSE="+ocamlopt" - -DESCRIPTION="A package for ocaml that provides access to mysql databases" -SRC_URI="http://ygrek.org.ua/p/release/ocaml-mysql/${P}.tar.gz" -HOMEPAGE="http://ocaml-mysql.forge.ocamlcore.org/" - -DEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?] - sys-libs/zlib - >=virtual/mysql-4.0" - -RDEPEND="$DEPEND" - -SLOT="0/${PV}" -LICENSE="LGPL-2" -KEYWORDS="~amd64 ppc x86" - -src_compile() -{ - emake all - if use ocamlopt; then - emake opt - fi -} - -src_install() -{ - findlib_src_preinst - emake install - - dodoc CHANGES README VERSION || die -} diff --git a/dev-ml/ocaml-mysql/ocaml-mysql-1.2.2-r1.ebuild b/dev-ml/ocaml-mysql/ocaml-mysql-1.2.2-r1.ebuild deleted file mode 100644 index 87b9fd21e32f..000000000000 --- a/dev-ml/ocaml-mysql/ocaml-mysql-1.2.2-r1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit findlib - -IUSE="+ocamlopt" - -DESCRIPTION="A package for ocaml that provides access to mysql databases" -SRC_URI="http://ygrek.org.ua/p/release/ocaml-mysql/${P}.tar.gz" -HOMEPAGE="http://ocaml-mysql.forge.ocamlcore.org/" - -DEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?] - sys-libs/zlib - dev-db/mysql-connector-c:0=" - -RDEPEND="$DEPEND" - -SLOT="0/${PV}" -LICENSE="LGPL-2" -KEYWORDS="~amd64 ~ppc ~x86" - -src_compile() -{ - emake all - if use ocamlopt; then - emake -j1 opt - fi -} - -src_install() -{ - findlib_src_preinst - emake install - - dodoc CHANGES README VERSION -} diff --git a/dev-ml/ocaml-pcap/Manifest b/dev-ml/ocaml-pcap/Manifest deleted file mode 100644 index a68d48133917..000000000000 --- a/dev-ml/ocaml-pcap/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ocaml-pcap-0.4.0.tar.gz 52694 BLAKE2B f5d9777b836ea569819ef904d128a72d4782d1cbcb60c0ba98e39aa92d374a5f6355e8549108b5ca7166e3d0cb6e0297e7e93983851f10817897dda20c59156b SHA512 cbcd33d7a557f1a05e5f12013e8dbe226a81a64822689452614dffedeecf8641ce2498e9c9322f80066977ef56a4130ee016816911b6871609d11a988cfcad0e diff --git a/dev-ml/ocaml-pcap/metadata.xml b/dev-ml/ocaml-pcap/metadata.xml deleted file mode 100644 index 02d28ef415aa..000000000000 --- a/dev-ml/ocaml-pcap/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">mirage/ocaml-pcap</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/ocaml-pcap/ocaml-pcap-0.4.0.ebuild b/dev-ml/ocaml-pcap/ocaml-pcap-0.4.0.ebuild deleted file mode 100644 index 01eb83b0bfc0..000000000000 --- a/dev-ml/ocaml-pcap/ocaml-pcap-0.4.0.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -OASIS_BUILD_DOCS=1 -OASIS_BUILD_TESTS=1 - -inherit oasis - -DESCRIPTION="Read and write pcap-formatted network packet traces." -HOMEPAGE="https://github.com/mirage/ocaml-pcap https://mirage.io" -SRC_URI="https://github.com/mirage/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="ISC" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -# Blockers taken from opam file and only relevant -# if MirageOS should enter portage. -RDEPEND=" - dev-ml/ocaml-ipaddr:= - !dev-ml/mirage-net-socket - !<dev-ml/mirage-0.9.2 - >=dev-ml/ocaml-cstruct-0.6.0:=[ppx(-)] -" -DEPEND=" - test? ( dev-ml/ounit - >=dev-ml/lwt-2.4.0 ) - ${RDEPEND} -" - -DOCS=( CHANGES MAINTAINERS README.md ) diff --git a/dev-ml/ocaml-process/Manifest b/dev-ml/ocaml-process/Manifest new file mode 100644 index 000000000000..03a2a410140d --- /dev/null +++ b/dev-ml/ocaml-process/Manifest @@ -0,0 +1 @@ +DIST ocaml-process-0.2.1.tar.gz 5904 BLAKE2B 90a03e53e79adae559bbdcf4717db53d5e79cf22a22e7d6daad4c123a8b275f7b984ed40b7132653c31bb9b1d7c39c1918e0455597f70103ddb18b89ecf00d9a SHA512 0ca352a273797218e1785e1f6ed024448461cefeb54f143574230c844747a81355b97dd19fe9ddfe31d1a69c03dccf895fadc086f61a3d7a9f5397538432db92 diff --git a/dev-ml/ocaml-process/metadata.xml b/dev-ml/ocaml-process/metadata.xml new file mode 100644 index 000000000000..847d74e89378 --- /dev/null +++ b/dev-ml/ocaml-process/metadata.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> + +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <bugs-to>https://github.com/dsheets/ocaml-process/issues/</bugs-to> + <remote-id type="github">dsheets/ocaml-process</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/ocaml-process/ocaml-process-0.2.1-r1.ebuild b/dev-ml/ocaml-process/ocaml-process-0.2.1-r1.ebuild new file mode 100644 index 000000000000..14bb568133ff --- /dev/null +++ b/dev-ml/ocaml-process/ocaml-process-0.2.1-r1.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit findlib + +DESCRIPTION="Easy process control for OCaml" +HOMEPAGE="https://github.com/dsheets/ocaml-process" +SRC_URI="https://github.com/dsheets/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="ISC" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +BDEPEND=" + dev-ml/ocamlbuild + test? ( dev-ml/alcotest ) +" + +src_compile() { + exts=.cma + use ocamlopt && exts+=' .cmx .cmxa' + export pkgs + emake TARGETS="${exts}" +} + +src_test() { + emake -j1 TARGETS="${exts}" test +} + +src_install() { + local archives='' + use ocamlopt && archives='_build/lib/process.a' + findlib_src_install TARGETS="${exts}" ARCHIVES="${archives}" +} diff --git a/dev-ml/ocaml-re/Manifest b/dev-ml/ocaml-re/Manifest deleted file mode 100644 index 88b542338d5c..000000000000 --- a/dev-ml/ocaml-re/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ocaml-re-1.7.1.tar.gz 132948 BLAKE2B 79a3114cb6221742e7e26187080a7029c8e17f728066ce4f4420c0b69be6377bb651f143a97f55f7976074ce9e48913489a51c586f9c79ed6adbcb6c9a595924 SHA512 0df5b0db4c8ab7017576516adbd8edf2e7774afbdca63383cbdb0f2f2b023efb7215366a6679c8810f3b70d542e0181e6b6d4a212b30531cb5d0bef0a6033747 diff --git a/dev-ml/ocaml-re/ocaml-re-1.7.1.ebuild b/dev-ml/ocaml-re/ocaml-re-1.7.1.ebuild deleted file mode 100644 index c8cec900da50..000000000000 --- a/dev-ml/ocaml-re/ocaml-re-1.7.1.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -OASIS_BUILD_DOCS=1 -OASIS_BUILD_TESTS=1 - -inherit oasis - -DESCRIPTION="Regular expression library for OCaml" -HOMEPAGE="https://github.com/ocaml/ocaml-re" -SRC_URI="https://github.com/ocaml/ocaml-re/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2-with-linking-exception" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" -IUSE="test" - -RDEPEND=">=dev-lang/ocaml-4.02:=" -DEPEND="${RDEPEND} - test? ( dev-ml/ounit )" -DOCS=( "CHANGES" "TODO.txt" "README.md" ) diff --git a/dev-ml/ocaml-redis-lwt/Manifest b/dev-ml/ocaml-redis-lwt/Manifest deleted file mode 100644 index e82ef6f83030..000000000000 --- a/dev-ml/ocaml-redis-lwt/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ocaml-redis-0.3.5.tar.gz 31217 BLAKE2B 25b83a77526e430dc3df02e3646f838240b7e43de4990f04d699f813e5ecc5a5f5bb66e643759cf9f3dd4d3a041eebeeac74d72f1fe1e4fd61b78b5ddb7160bc SHA512 dfd2779635fddc73ab76cd66943267c3de984edeb471728f8d6d9506cd37e9cf4b1875519c7547b90de80fd876abc7fbe6a4c9c0674fcb6a00bbe91afa6c625d diff --git a/dev-ml/ocaml-redis-lwt/metadata.xml b/dev-ml/ocaml-redis-lwt/metadata.xml deleted file mode 100644 index 20d1ed52023f..000000000000 --- a/dev-ml/ocaml-redis-lwt/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">0xffea/ocaml-redis</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/ocaml-redis-lwt/ocaml-redis-lwt-0.3.5.ebuild b/dev-ml/ocaml-redis-lwt/ocaml-redis-lwt-0.3.5.ebuild deleted file mode 100644 index a5e2d5969dd5..000000000000 --- a/dev-ml/ocaml-redis-lwt/ocaml-redis-lwt-0.3.5.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib - -DESCRIPTION="Redis bindings for OCaml via Lwt" -HOMEPAGE="http://0xffea.github.io/ocaml-redis/ https://github.com/0xffea/ocaml-redis/" -SRC_URI="https://github.com/0xffea/ocaml-redis/archive/${PV}.tar.gz -> ocaml-redis-${PV}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="test" - -RDEPEND=" - dev-lang/ocaml:= - dev-ml/ocaml-redis:= - dev-ml/lwt:= -" -DEPEND="${RDEPEND} - dev-ml/jbuilder - dev-ml/opam - test? ( dev-ml/ounit )" - -S=${WORKDIR}/ocaml-redis-${PV} - -src_compile() { - jbuilder build -p redis-lwt || die -} - -src_test() { - jbuilder runtest || die -} - -src_install() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - redis-lwt.install || die -} diff --git a/dev-ml/ocaml-redis-sync/Manifest b/dev-ml/ocaml-redis-sync/Manifest deleted file mode 100644 index e82ef6f83030..000000000000 --- a/dev-ml/ocaml-redis-sync/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ocaml-redis-0.3.5.tar.gz 31217 BLAKE2B 25b83a77526e430dc3df02e3646f838240b7e43de4990f04d699f813e5ecc5a5f5bb66e643759cf9f3dd4d3a041eebeeac74d72f1fe1e4fd61b78b5ddb7160bc SHA512 dfd2779635fddc73ab76cd66943267c3de984edeb471728f8d6d9506cd37e9cf4b1875519c7547b90de80fd876abc7fbe6a4c9c0674fcb6a00bbe91afa6c625d diff --git a/dev-ml/ocaml-redis-sync/metadata.xml b/dev-ml/ocaml-redis-sync/metadata.xml deleted file mode 100644 index 20d1ed52023f..000000000000 --- a/dev-ml/ocaml-redis-sync/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">0xffea/ocaml-redis</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/ocaml-redis-sync/ocaml-redis-sync-0.3.5.ebuild b/dev-ml/ocaml-redis-sync/ocaml-redis-sync-0.3.5.ebuild deleted file mode 100644 index 54105358e9cd..000000000000 --- a/dev-ml/ocaml-redis-sync/ocaml-redis-sync-0.3.5.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib - -DESCRIPTION="Synchronous redis bindings for OCaml" -HOMEPAGE="http://0xffea.github.io/ocaml-redis/ https://github.com/0xffea/ocaml-redis/" -SRC_URI="https://github.com/0xffea/ocaml-redis/archive/${PV}.tar.gz -> ocaml-redis-${PV}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="test" - -RDEPEND=" - dev-lang/ocaml:= - dev-ml/ocaml-redis:= -" -DEPEND="${RDEPEND} - dev-ml/jbuilder - dev-ml/opam - test? ( dev-ml/ounit )" - -S=${WORKDIR}/ocaml-redis-${PV} - -src_compile() { - jbuilder build -p redis-sync || die -} - -src_test() { - jbuilder runtest || die -} - -src_install() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - redis-sync.install || die -} diff --git a/dev-ml/ocaml-redis/Manifest b/dev-ml/ocaml-redis/Manifest deleted file mode 100644 index e82ef6f83030..000000000000 --- a/dev-ml/ocaml-redis/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ocaml-redis-0.3.5.tar.gz 31217 BLAKE2B 25b83a77526e430dc3df02e3646f838240b7e43de4990f04d699f813e5ecc5a5f5bb66e643759cf9f3dd4d3a041eebeeac74d72f1fe1e4fd61b78b5ddb7160bc SHA512 dfd2779635fddc73ab76cd66943267c3de984edeb471728f8d6d9506cd37e9cf4b1875519c7547b90de80fd876abc7fbe6a4c9c0674fcb6a00bbe91afa6c625d diff --git a/dev-ml/ocaml-redis/metadata.xml b/dev-ml/ocaml-redis/metadata.xml deleted file mode 100644 index 20d1ed52023f..000000000000 --- a/dev-ml/ocaml-redis/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">0xffea/ocaml-redis</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/ocaml-redis/ocaml-redis-0.3.5.ebuild b/dev-ml/ocaml-redis/ocaml-redis-0.3.5.ebuild deleted file mode 100644 index 97c63e8a8de4..000000000000 --- a/dev-ml/ocaml-redis/ocaml-redis-0.3.5.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib opam - -DESCRIPTION="Redis bindings for OCaml" -HOMEPAGE="http://0xffea.github.io/ocaml-redis/ https://github.com/0xffea/ocaml-redis/" -SRC_URI="https://github.com/0xffea/ocaml-redis/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="test" - -RDEPEND=" - dev-lang/ocaml:= - dev-ml/ocaml-re:= - dev-ml/uuidm:= -" -DEPEND="${RDEPEND} - dev-ml/jbuilder - test? ( dev-ml/ounit dev-db/redis dev-ml/lwt )" - -src_compile() { - jbuilder build -p redis || die -} - -src_test() { - einfo "Starting test redis server" - local port=4567 - /usr/sbin/redis-server --port ${port} & - local rpid=$! - export OCAML_REDIS_TEST_PORT=${port} - sleep 1 - jbuilder runtest || { kill ${rpid}; die; } - kill ${rpid} || die -} - -src_install() { - opam_src_install redis -} diff --git a/dev-ml/ocaml-safepass/Manifest b/dev-ml/ocaml-safepass/Manifest deleted file mode 100644 index 9df4190020cb..000000000000 --- a/dev-ml/ocaml-safepass/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ocaml-safepass-2.0.tar.gz 72314 BLAKE2B 63ad0b61b287bc65f61da93a01f9742842c869f63dbe964c593194d2a9d71565a67f75c6763ef6e3b1786ebaa17c41b3a6ca943ef6c99359f16d927855611120 SHA512 a5475b9e1f7233393fc255ae52c44d4f4373fcddf99764bb17dafb86dfbd3b3c5fa01f74254e10fe9a9889e3e5d2ee8d190ed728aad0ed5f0fdfb71856c5754d diff --git a/dev-ml/ocaml-safepass/metadata.xml b/dev-ml/ocaml-safepass/metadata.xml deleted file mode 100644 index 230b5f6b744e..000000000000 --- a/dev-ml/ocaml-safepass/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">darioteixeira/ocaml-safepass</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/ocaml-safepass/ocaml-safepass-2.0.ebuild b/dev-ml/ocaml-safepass/ocaml-safepass-2.0.ebuild deleted file mode 100644 index e1b02155d572..000000000000 --- a/dev-ml/ocaml-safepass/ocaml-safepass-2.0.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -OASIS_BUILD_DOCS=1 - -inherit oasis - -DESCRIPTION="A library offering facilities for the safe storage of user passwords" -HOMEPAGE="http://ocaml-safepass.forge.ocamlcore.org/ https://github.com/darioteixeira/ocaml-safepass" -SRC_URI="https://github.com/darioteixeira/ocaml-safepass/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1-with-linking-exception" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND}" - -DOCS=( "README" "CHANGELOG" ) diff --git a/dev-ml/ocaml-sha/Manifest b/dev-ml/ocaml-sha/Manifest index eb74f9cb6ff0..046f52c7dfb3 100644 --- a/dev-ml/ocaml-sha/Manifest +++ b/dev-ml/ocaml-sha/Manifest @@ -1 +1,3 @@ -DIST ocaml-sha-v1.9.tar.gz 12872 BLAKE2B 382431814ef1fd4b88e69ff727fade617a7a6e2757a70e7538e2fc5b2708572a731b6800e9c36b7ddcb1c6103b57a1ccd14c5bc6886e83f56ebc388de9f67c90 SHA512 e49f725f0544a423c57199b2534519a005916f24a17bf7761e744ec963c5712b8b0b82b052d87c55fdfd3143f194f44283c7332ab08f480328c0c21642ae5778 +DIST ocaml-sha-1.15.1.tar.gz 15972 BLAKE2B c80fe4ba9a216fb88b0ca4cdf4f467450ad7225c9aa8fbb7389c85b8372de0a965683dc4a674c82ae4c2801b9f6a83777fbd3bfe5deb68af3d5e9193c058c9d9 SHA512 25af4f3fff6d5126e5e3b5f4dff4d6cc48396ffea48da186450236825bbb79110c7918a2bfa1c77dfaee9570965f9052d87c513d9f9da01208d95962b12cfd1c +DIST ocaml-sha-1.15.2.tar.gz 15700 BLAKE2B 7504d4302d54d94f6b8143efce6487dbc95c4f909baef515a85a7a6f7adcc5cff94225ae9231770193025312a82384b738e47001f1b6975cd39f4d21b8f6a162 SHA512 7ea47377747ef4c36791c4ed9ff88fe138ee14d012cc3f7b41fcc28776e57ea54c5ee5cc033adc6288177ed834afb73c44e60cfff01f1be28492a992f97a1d06 +DIST sha-1.15.4.tbz 17759 BLAKE2B 24ca05f6228aa3fce3bd4d0478115f7664569b6d1a3049298d4c4255b4e9ff0e91ac1d957236331fef275466744d539721251d9bfaf6790f55f438223e761581 SHA512 dbb31b523ba0bace023bc1b0558a8f572a0ec20fb3f19f783935be755cd161e09aba352eda2bcf7c4e5ab838c7f874cfbfaed9debf0813df25d9dbe7b9314fdf diff --git a/dev-ml/ocaml-sha/metadata.xml b/dev-ml/ocaml-sha/metadata.xml index 3499afc663c2..cad88d0d5d23 100644 --- a/dev-ml/ocaml-sha/metadata.xml +++ b/dev-ml/ocaml-sha/metadata.xml @@ -1,11 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> + <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> + <longdescription> + This is the binding for SHA interface code in OCaml. Offering the same + interface than the MD5 digest included in the OCaml standard library. + It's currently providing SHA1, SHA256 and SHA512 hash functions. + </longdescription> <upstream> - <remote-id type="github">vincenthz/ocaml-sha</remote-id> + <bugs-to>https://github.com/djs55/ocaml-sha/issues/</bugs-to> + <remote-id type="github">djs55/ocaml-sha</remote-id> </upstream> </pkgmetadata> diff --git a/dev-ml/ocaml-sha/ocaml-sha-1.15.1.ebuild b/dev-ml/ocaml-sha/ocaml-sha-1.15.1.ebuild new file mode 100644 index 000000000000..d6ab5623b0f4 --- /dev/null +++ b/dev-ml/ocaml-sha/ocaml-sha-1.15.1.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DUNE_PKG_NAME="sha" + +inherit dune + +DESCRIPTION="Binding to the SHA cryptographic functions" +HOMEPAGE="https://github.com/djs55/ocaml-sha" +SRC_URI="https://github.com/djs55/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="ISC" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND="dev-ml/stdlib-shims:=" +DEPEND="${RDEPEND}" +BDEPEND="test? ( dev-ml/ounit2 )" diff --git a/dev-ml/ocaml-sha/ocaml-sha-1.15.2.ebuild b/dev-ml/ocaml-sha/ocaml-sha-1.15.2.ebuild new file mode 100644 index 000000000000..dca25b58d530 --- /dev/null +++ b/dev-ml/ocaml-sha/ocaml-sha-1.15.2.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DUNE_PKG_NAME=sha + +inherit dune + +DESCRIPTION="Binding to the SHA cryptographic functions" +HOMEPAGE="https://github.com/djs55/ocaml-sha/" +SRC_URI="https://github.com/djs55/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="ISC" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND="dev-ml/stdlib-shims:=" +DEPEND="${RDEPEND}" +BDEPEND="test? ( dev-ml/ounit2 )" diff --git a/dev-ml/ocaml-sha/ocaml-sha-1.15.4.ebuild b/dev-ml/ocaml-sha/ocaml-sha-1.15.4.ebuild new file mode 100644 index 000000000000..3da8b2a1fbbe --- /dev/null +++ b/dev-ml/ocaml-sha/ocaml-sha-1.15.4.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DUNE_PKG_NAME=sha + +inherit dune + +MYP=sha-${PV} +DESCRIPTION="Binding to the SHA cryptographic functions" +HOMEPAGE="https://github.com/djs55/ocaml-sha/" +SRC_URI="https://github.com/djs55/${PN}/releases/download/v${PV}/${MYP}.tbz" + +LICENSE="ISC" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND="dev-ml/stdlib-shims:=" +DEPEND="${RDEPEND}" +BDEPEND="test? ( dev-ml/ounit2 )" + +S="${WORKDIR}"/${MYP} diff --git a/dev-ml/ocaml-sha/ocaml-sha-1.9.ebuild b/dev-ml/ocaml-sha/ocaml-sha-1.9.ebuild deleted file mode 100644 index d8d3f5e48761..000000000000 --- a/dev-ml/ocaml-sha/ocaml-sha-1.9.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib vcs-snapshot - -DESCRIPTION="A binding for SHA interface code in OCaml" -HOMEPAGE="https://github.com/vincenthz/ocaml-sha" -SRC_URI="https://github.com/vincenthz/ocaml-sha/archive/${PN}-v${PV}.tar.gz" - -LICENSE="LGPL-2.1-with-linking-exception" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -DEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt]" -RDEPEND="${DEPEND}" -S="${WORKDIR}/${PN}-v${PV}" - -src_compile() { - emake -j1 -} - -src_install() { - findlib_src_install - dodoc README -} diff --git a/dev-ml/ocaml-snappy/Manifest b/dev-ml/ocaml-snappy/Manifest deleted file mode 100644 index 284c7358ac04..000000000000 --- a/dev-ml/ocaml-snappy/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ocaml-snappy-0.1.0.tar.gz 41907 BLAKE2B 875b600ebcbaf1484282ccceda7193a5cb2d28fcdd783fd888a920dbccd53ee2ebce1e54ffb78a44f9844f0941f17d80525c227c15a4ca55c956830603b82c79 SHA512 2ff3db23eee90e3d9e61ab6a77e5d6c174486d5e54a8bb1206e63299929da6a3fad4a89ffdfaf5c6f8b97c33a7cbc00bd3c34d39dc0f7e8fbd0dc2b84fd9f3c2 diff --git a/dev-ml/ocaml-snappy/ocaml-snappy-0.1.0.ebuild b/dev-ml/ocaml-snappy/ocaml-snappy-0.1.0.ebuild deleted file mode 100644 index 65defc38b16d..000000000000 --- a/dev-ml/ocaml-snappy/ocaml-snappy-0.1.0.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -OASIS_BUILD_DOCS=1 - -inherit oasis - -DESCRIPTION="OCaml bindings to snappy fast compression/decompression library" -HOMEPAGE="http://ygrek.org.ua/p/ocaml-snappy/" -SRC_URI="https://github.com/ygrek/ocaml-snappy/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -DEPEND="app-arch/snappy:=" -RDEPEND="${DEPEND}" diff --git a/dev-ml/ocaml-sqlite3/Manifest b/dev-ml/ocaml-sqlite3/Manifest index 13b4402a8ce3..0ee70a05130b 100644 --- a/dev-ml/ocaml-sqlite3/Manifest +++ b/dev-ml/ocaml-sqlite3/Manifest @@ -1,4 +1 @@ -DIST sqlite3-4.2.0.tbz 22167 BLAKE2B b5f874f592fb7873060d3f33b82ea9282fe0a04aab8683f5355a96b0a7a78e19daefc6d3f72b9e796dcc718347f8b13bc210eb4a61622cf12460b263bf088c86 SHA512 3221ba03eae64c59c3ffa57271585a1fe76848504d56edf33e953fad270929ba300b5828788f6cbb3f145acf743ad51bc019d151ac68472f6dbf7ab43263ae86 -DIST sqlite3-4.3.0.tbz 22498 BLAKE2B c57d8edbc0897229cb415d48efb02ae41dff1d87fabc667a40b984807c5c5885201dca3d7f523872435b7e18b450c15707212eeeafc0a75f1ad28d7e7671b4c7 SHA512 f09d425830ac24ea835a403bc51d257c265b6e77b1dce01367c715545cbd98f3ad2694e6dfdbc7491d590aa809c0313329e81c9614228170f90197f2a94200c9 -DIST sqlite3-ocaml-4.1.2.tar.gz 76879 BLAKE2B be02c4df79f78b69e859fc465242e3e513d0b557364614e4fe73f78b6020e77fd971f274e45e4d2b79c99ea6e110358dc23ab2f79183915e242244b9ff6a6de8 SHA512 880f82fa9eba06114695bda56305245d2d9062f8136db85675463e97fbb8aee210df310d8d65d78e9eb1f882421581a97c4b7f20a790881f699b4d494be066f5 -DIST sqlite3-ocaml-4.1.3.tar.gz 76989 BLAKE2B d5f5e5c91faaf7308c47431d2f5292952e5c6ddf8854897aa2d54946b312bd3321f4ec6ecca7455778707b082e7af676ac50ab5b16686176623058c082973cc6 SHA512 59865b4c5d99d319ee6f5e1ecb8d71b4c07bd7f77876fafb73d3c882dbf434b67313f4caf7762f2194dc819f75af9582dd4df002f0f68cb8690996b857c08a1b +DIST ocaml-sqlite3-5.0.2.tar.gz 33077 BLAKE2B 3f34a930477880326179a3014575db49bd9d614d90bdea98fc14af83287b889c6e02b8375dd5817c5139fe51706d83b332e148ccc084e46abf6b06ec9015a7c8 SHA512 330ac34490cbe004e9b950d7bbded2728b6a938179f3a19fb0043075c6d9a4e14fd82acea6c5787c84f2634d80017644bf988fd00b7dbd1374142771485cffd0 diff --git a/dev-ml/ocaml-sqlite3/metadata.xml b/dev-ml/ocaml-sqlite3/metadata.xml index b46941e6674e..e224fe800acf 100644 --- a/dev-ml/ocaml-sqlite3/metadata.xml +++ b/dev-ml/ocaml-sqlite3/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">mmottl/sqlite3-ocaml</remote-id> <remote-id type="bitbucket">mmottl/sqlite3-ocaml</remote-id> diff --git a/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.1.2.ebuild b/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.1.2.ebuild deleted file mode 100644 index 87a48cacf8ba..000000000000 --- a/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.1.2.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -OASIS_BUILD_TESTS=1 -OASIS_BUILD_DOCS=1 - -inherit oasis - -MY_PN="sqlite3-ocaml" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="A package for ocaml that provides access to SQLite databases" -HOMEPAGE="http://mmottl.github.io/sqlite3-ocaml/" -SRC_URI="https://github.com/mmottl/sqlite3-ocaml/releases/download/v${PV}/${MY_P}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd" -IUSE="" - -DEPEND=">=dev-db/sqlite-3.3.3 - >=dev-ml/findlib-1.3.2" -RDEPEND="${DEPEND}" - -S=${WORKDIR}/${MY_P} -DOCS=( "AUTHORS.txt" "CHANGES.txt" "README.md" "TODO.md" ) diff --git a/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.1.3.ebuild b/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.1.3.ebuild deleted file mode 100644 index 87a48cacf8ba..000000000000 --- a/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.1.3.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -OASIS_BUILD_TESTS=1 -OASIS_BUILD_DOCS=1 - -inherit oasis - -MY_PN="sqlite3-ocaml" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="A package for ocaml that provides access to SQLite databases" -HOMEPAGE="http://mmottl.github.io/sqlite3-ocaml/" -SRC_URI="https://github.com/mmottl/sqlite3-ocaml/releases/download/v${PV}/${MY_P}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd" -IUSE="" - -DEPEND=">=dev-db/sqlite-3.3.3 - >=dev-ml/findlib-1.3.2" -RDEPEND="${DEPEND}" - -S=${WORKDIR}/${MY_P} -DOCS=( "AUTHORS.txt" "CHANGES.txt" "README.md" "TODO.md" ) diff --git a/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.2.0.ebuild b/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.2.0.ebuild deleted file mode 100644 index ba15673a0eb3..000000000000 --- a/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.2.0.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit opam - -MY_PN="sqlite3" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="A package for ocaml that provides access to SQLite databases" -HOMEPAGE="http://mmottl.github.io/sqlite3-ocaml/" -SRC_URI="https://github.com/mmottl/sqlite3-ocaml/releases/download/${PV}/${MY_P}.tbz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd" -IUSE="" - -RDEPEND=">=dev-db/sqlite-3.3.3" -DEPEND="${RDEPEND} - dev-ml/jbuilder - dev-ml/base - dev-ml/stdio - dev-ml/configurator - >=dev-ml/findlib-1.3.2" - -S=${WORKDIR}/${MY_P} - -src_compile() { - jbuilder build @install || die -} - -src_install() { - opam_src_install "${MY_PN}" -} diff --git a/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.3.0.ebuild b/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.3.0.ebuild deleted file mode 100644 index ba15673a0eb3..000000000000 --- a/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.3.0.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit opam - -MY_PN="sqlite3" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="A package for ocaml that provides access to SQLite databases" -HOMEPAGE="http://mmottl.github.io/sqlite3-ocaml/" -SRC_URI="https://github.com/mmottl/sqlite3-ocaml/releases/download/${PV}/${MY_P}.tbz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd" -IUSE="" - -RDEPEND=">=dev-db/sqlite-3.3.3" -DEPEND="${RDEPEND} - dev-ml/jbuilder - dev-ml/base - dev-ml/stdio - dev-ml/configurator - >=dev-ml/findlib-1.3.2" - -S=${WORKDIR}/${MY_P} - -src_compile() { - jbuilder build @install || die -} - -src_install() { - opam_src_install "${MY_PN}" -} diff --git a/dev-ml/ocaml-sqlite3/ocaml-sqlite3-5.0.2.ebuild b/dev-ml/ocaml-sqlite3/ocaml-sqlite3-5.0.2.ebuild new file mode 100644 index 000000000000..9c9e393e7533 --- /dev/null +++ b/dev-ml/ocaml-sqlite3/ocaml-sqlite3-5.0.2.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DUNE_PKG_NAME="sqlite3" +inherit dune + +DESCRIPTION="SQLite3 bindings for OCaml" +HOMEPAGE="http://mmottl.github.io/sqlite3-ocaml/" +SRC_URI="https://github.com/mmottl/sqlite3-ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/sqlite3-ocaml-${PV}" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=">=dev-db/sqlite-3.3.3" +BDEPEND=" + >=dev-lang/ocaml-4.06 + dev-ml/dune-configurator +" +DEPEND="${RDEPEND} + test? ( + dev-ml/ppx_inline_test + ) +" diff --git a/dev-ml/ocaml-ssl/Manifest b/dev-ml/ocaml-ssl/Manifest index 948a1bbf1e3c..4ee5c4065475 100644 --- a/dev-ml/ocaml-ssl/Manifest +++ b/dev-ml/ocaml-ssl/Manifest @@ -1,3 +1,2 @@ -DIST ocaml-ssl-0.5.3.tar.gz 125431 BLAKE2B e95b6757f27fcac16dda1087880bb49ad854108755719210aeeeebd0e14cfee9b6244986f21ddbf86a970ea4b4f9eb2bb8e0a5a888dafe2a7262f004194a26ba SHA512 c0dc38ab21c8adc104a42ec89b8a58de976205887a23a407f1ffee1181d526ddb8aa91877508f8a974c6df8583d6d8611558a995680e313fc78ad0cac184cf52 -DIST ocaml-ssl-0.5.4.tar.gz 125833 BLAKE2B 983f1c1301c2dd313d91c180e8654baef39b1de2f3f3688ba40d920d5c16fd1626b1cf9dc8a6f172045ab4b8cd75b4048b3956ff9835a57c534bacdb1ddce32d SHA512 4a221bd8f5c11871040f6f117d3152ec2fca28f0311dfcc2ac39d2ed55c66203e12ad3242368273d8f17f1ca87c1b5d929ab7fec8ec7a03a564c7c25ade3d289 -DIST ocaml-ssl-0.5.5.tar.gz 125778 BLAKE2B 7be315a349df7948adc69b64cce65d29ce0d7cc8b492d4f3948a3a72e64951c323b8f5d3fa48825fe0119ff5d8c94a03d95e36ec695768aae0751f5f3df4397b SHA512 4e3a78426bc2a5cec0ade43b1b324366b4bf0d93be6e7bc73f1152499f2ab0642d3edcf4484a519ea6ec0b44bc76c0c984b9bba59121f93bc065b1c0355969c0 +DIST ocaml-ssl-0.5.13.tar.gz 40604 BLAKE2B 289f631e360581ddfe2fa6572d1b8883853e65c438542593f5f0be5c23b1c8056c10fe6397ba8df577ebf7a9e22cbe4723d8fccabeb373de3efebee310293653 SHA512 ca1106642cb536672dba00ff4421ade2293de6f79c94a47df27520ce6f2ff4555f8e9794736afe4ce37e131a518658d0f8c57f3b106b0187216db1a461f99867 +DIST ocaml-ssl-0.7.0.tar.gz 56102 BLAKE2B b3e41eb91c3948dcd2396de0fee0b737e40a5ca076942908e6801e8ae333174ccc6068f201e69cab88989233407f3e1a690bf4635b304f89637a0460dd80d926 SHA512 969c4d64828449a49bdef26ca5f8faa72d2fe2a2304ccbf589a3ff097c2bf8ae9eb83ae1c90216f6b4d6f359e462ea47e0106a7386e26848d14910138fcb07f8 diff --git a/dev-ml/ocaml-ssl/metadata.xml b/dev-ml/ocaml-ssl/metadata.xml index 45ec17d6bfc4..261f69f24930 100644 --- a/dev-ml/ocaml-ssl/metadata.xml +++ b/dev-ml/ocaml-ssl/metadata.xml @@ -1,9 +1,9 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="sourceforge">savonet</remote-id> diff --git a/dev-ml/ocaml-ssl/ocaml-ssl-0.5.13.ebuild b/dev-ml/ocaml-ssl/ocaml-ssl-0.5.13.ebuild new file mode 100644 index 000000000000..ed24773db1af --- /dev/null +++ b/dev-ml/ocaml-ssl/ocaml-ssl-0.5.13.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DUNE_PKG_NAME=ssl + +inherit dune + +DESCRIPTION="OCaml bindings for OpenSSL" +HOMEPAGE="https://github.com/savonet/ocaml-ssl" +SRC_URI="https://github.com/savonet/ocaml-ssl/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0/${PV}" +KEYWORDS="amd64 ~arm ~arm64 ~ppc x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +DEPEND="dev-libs/openssl:0= + >=dev-lang/ocaml-3.10:=[ocamlopt?]" +RDEPEND="${DEPEND}" +BDEPEND=" + dev-ml/dune-configurator + test? ( dev-ml/alcotest ) +" + +src_install() { + dune_src_install + + dodoc CHANGES.md README.md +} diff --git a/dev-ml/ocaml-ssl/ocaml-ssl-0.5.3.ebuild b/dev-ml/ocaml-ssl/ocaml-ssl-0.5.3.ebuild deleted file mode 100644 index 30aa83fbba2e..000000000000 --- a/dev-ml/ocaml-ssl/ocaml-ssl-0.5.3.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib eutils - -IUSE="doc" - -DESCRIPTION="OCaml bindings for OpenSSL" -SRC_URI="https://github.com/savonet/ocaml-ssl/releases/download/${PV}/${P}.tar.gz" -HOMEPAGE="https://github.com/savonet/ocaml-ssl" - -DEPEND="dev-libs/openssl:0= - >=dev-lang/ocaml-3.10:=" -RDEPEND="${DEPEND}" - -SLOT="0/${PV}" -LICENSE="LGPL-2.1" -KEYWORDS="amd64 ~arm ppc x86 ~x86-fbsd" - -src_compile() { - emake -j1 -} - -src_install() { - findlib_src_preinst - emake install - - if use doc; then - dohtml -r doc/html/* - fi - dodoc CHANGES README.md -} diff --git a/dev-ml/ocaml-ssl/ocaml-ssl-0.5.4.ebuild b/dev-ml/ocaml-ssl/ocaml-ssl-0.5.4.ebuild deleted file mode 100644 index 93d736e30add..000000000000 --- a/dev-ml/ocaml-ssl/ocaml-ssl-0.5.4.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib eutils - -IUSE="doc" - -DESCRIPTION="OCaml bindings for OpenSSL" -SRC_URI="https://github.com/savonet/ocaml-ssl/releases/download/${PV}/${P}.tar.gz" -HOMEPAGE="https://github.com/savonet/ocaml-ssl" - -DEPEND="dev-libs/openssl:0= - >=dev-lang/ocaml-3.10:=" -RDEPEND="${DEPEND}" - -SLOT="0/${PV}" -LICENSE="LGPL-2.1" -KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd" - -src_compile() { - emake -j1 -} - -src_install() { - findlib_src_preinst - emake install - - if use doc; then - dohtml -r doc/html/* - fi - dodoc CHANGES README.md -} diff --git a/dev-ml/ocaml-ssl/ocaml-ssl-0.5.5.ebuild b/dev-ml/ocaml-ssl/ocaml-ssl-0.5.5.ebuild deleted file mode 100644 index 93d736e30add..000000000000 --- a/dev-ml/ocaml-ssl/ocaml-ssl-0.5.5.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib eutils - -IUSE="doc" - -DESCRIPTION="OCaml bindings for OpenSSL" -SRC_URI="https://github.com/savonet/ocaml-ssl/releases/download/${PV}/${P}.tar.gz" -HOMEPAGE="https://github.com/savonet/ocaml-ssl" - -DEPEND="dev-libs/openssl:0= - >=dev-lang/ocaml-3.10:=" -RDEPEND="${DEPEND}" - -SLOT="0/${PV}" -LICENSE="LGPL-2.1" -KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd" - -src_compile() { - emake -j1 -} - -src_install() { - findlib_src_preinst - emake install - - if use doc; then - dohtml -r doc/html/* - fi - dodoc CHANGES README.md -} diff --git a/dev-ml/ocaml-ssl/ocaml-ssl-0.7.0.ebuild b/dev-ml/ocaml-ssl/ocaml-ssl-0.7.0.ebuild new file mode 100644 index 000000000000..62d40f51f91d --- /dev/null +++ b/dev-ml/ocaml-ssl/ocaml-ssl-0.7.0.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DUNE_PKG_NAME=ssl + +inherit dune + +DESCRIPTION="OCaml bindings for OpenSSL" +HOMEPAGE="https://github.com/savonet/ocaml-ssl" + +if [[ ${PV} == *9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/savonet/${PN}.git" +else + SRC_URI="https://github.com/savonet/${PN}/archive/v${PV}.tar.gz + -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" +fi + +LICENSE="LGPL-2.1" +SLOT="0/${PV}" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/openssl:0= + dev-lang/ocaml +" +DEPEND=" + ${RDEPEND} +" +BDEPEND=" + dev-ml/dune-configurator + test? ( dev-ml/alcotest ) +" + +DOCS=( CHANGES.md README.md ) + +src_install() { + dune_src_install + + einstalldocs +} diff --git a/dev-ml/ocaml-stdint/Manifest b/dev-ml/ocaml-stdint/Manifest index c874bafe9ccb..4fbf6e2ea438 100644 --- a/dev-ml/ocaml-stdint/Manifest +++ b/dev-ml/ocaml-stdint/Manifest @@ -1,2 +1,2 @@ -DIST ocaml-stdint-0.4.2.tar.gz 79749 BLAKE2B 1edef2cab7a09025e9d5e91bce00f69c3727929961e15797020d53a9b50893f8094c94cb8067a6b6d9163e54d7a12d38d07410e6f21294f45c051407aa8b2351 SHA512 0663a54dca8951fadf1121b69db32590c6ec3fc26b3366271c7941841b0a95047d0a57b5f7337bc7fbc37d3730cb5ed20952c0a3d6ab71f273646bc197951125 -DIST ocaml-stdint-0.5.0.tar.gz 80106 BLAKE2B 00a201d7f0417ad4b568800d7a798a9a9008e4afdcf0b3a88edc315ebbb2ca45f7c82a9e42238ea7bce38d7cf8dd6accfd44e84e621c2d6bc7f5cbd528670784 SHA512 fa5470e587e445c0b1ba72ddb6e641db0e41c32490c3ca6dbffb73a8a39e14afe7395d55e9d22be8dddf1d4311257b5443b05cde05b25b7939600b4f74359a8e +DIST ocaml-stdint-0.7.0.tar.gz 34507 BLAKE2B d06768911798a6a3736b68395fc5ca2d53288fe0056953ed189938b10aeeb9469511fc1ece39e49c403954f4bd88034d63ec53d7e8b63d8e8c41ff0761ccb2e6 SHA512 5e0c4164cb1f55a63f0928f5c1868cc2bba61d356b63cc20cb6b066fd09824eb99d6d1fd577f52678155d6744a591fdd8377b4c44bbe015918462f4576b43529 +DIST ocaml-stdint-0.7.2.tar.gz 35444 BLAKE2B 2b6536b65304eb3c0f10fa30a4a0f41c46a0ebb936b6ba250cff4d8313a40145701f6cc0b3915437d1ff36f6c9fa6636801b6564c2695a03ac7c0dc7840dfa92 SHA512 facfa95c1ed1c7dbbda6ff9c4e72423269eccac106e8670ff988f5d32635e5e5a1f3cb8a61b15cdf0aeabbeb7ceb1159de67fbc4b4f54611e74e8e39d0ad98c3 diff --git a/dev-ml/ocaml-stdint/metadata.xml b/dev-ml/ocaml-stdint/metadata.xml index 39e337bfb000..c1d21fbd785f 100644 --- a/dev-ml/ocaml-stdint/metadata.xml +++ b/dev-ml/ocaml-stdint/metadata.xml @@ -1,11 +1,24 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> + <pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">andrenth/ocaml-stdint</remote-id> - </upstream> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <longdescription> + The stdint library provides signed and unsigned integer types of various + fixed widths: 8, 16, 24, 32, 40, 48, 56, 64 and 128 bit. + This interface is similar to Int32 and Int64 from the base library but + provides more functions and constants like arithmetic and bit-wise + operations, constants like maximum and minimum values, infix operators + conversion to and from every other integer type (including int, float and + nativeint), parsing from and conversion to readable strings (binary, octal, + decimal, hexademical), conversion to and from buffers in both big endian + and little endian byte order. + </longdescription> + <upstream> + <bugs-to>https://github.com/andrenth/ocaml-stdint/issues/</bugs-to> + <remote-id type="github">andrenth/ocaml-stdint</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-ml/ocaml-stdint/ocaml-stdint-0.4.2.ebuild b/dev-ml/ocaml-stdint/ocaml-stdint-0.4.2.ebuild deleted file mode 100644 index f2c7b3938e6b..000000000000 --- a/dev-ml/ocaml-stdint/ocaml-stdint-0.4.2.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -OASIS_BUILD_DOCS=1 - -inherit oasis - -DESCRIPTION="Various signed and unsigned integers for OCaml" -HOMEPAGE="https://github.com/andrenth/ocaml-stdint" -SRC_URI="https://github.com/andrenth/ocaml-stdint/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND}" diff --git a/dev-ml/ocaml-stdint/ocaml-stdint-0.5.0.ebuild b/dev-ml/ocaml-stdint/ocaml-stdint-0.5.0.ebuild deleted file mode 100644 index f2c7b3938e6b..000000000000 --- a/dev-ml/ocaml-stdint/ocaml-stdint-0.5.0.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -OASIS_BUILD_DOCS=1 - -inherit oasis - -DESCRIPTION="Various signed and unsigned integers for OCaml" -HOMEPAGE="https://github.com/andrenth/ocaml-stdint" -SRC_URI="https://github.com/andrenth/ocaml-stdint/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND}" diff --git a/dev-ml/ocaml-stdint/ocaml-stdint-0.7.0.ebuild b/dev-ml/ocaml-stdint/ocaml-stdint-0.7.0.ebuild new file mode 100644 index 000000000000..1dcb81d9a5d7 --- /dev/null +++ b/dev-ml/ocaml-stdint/ocaml-stdint-0.7.0.ebuild @@ -0,0 +1,18 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DUNE_PKG_NAME="stdint" + +inherit dune + +DESCRIPTION="Signed and unsigned integer types having specified widths" +HOMEPAGE="https://github.com/andrenth/ocaml-stdint" +SRC_URI="https://github.com/andrenth/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="+ocamlopt" +RESTRICT="test" # some tests fails diff --git a/dev-ml/ocaml-stdint/ocaml-stdint-0.7.2.ebuild b/dev-ml/ocaml-stdint/ocaml-stdint-0.7.2.ebuild new file mode 100644 index 000000000000..ea2718d47453 --- /dev/null +++ b/dev-ml/ocaml-stdint/ocaml-stdint-0.7.2.ebuild @@ -0,0 +1,18 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DUNE_PKG_NAME="stdint" + +inherit dune + +DESCRIPTION="Signed and unsigned integer types having specified widths" +HOMEPAGE="https://github.com/andrenth/ocaml-stdint" +SRC_URI="https://github.com/andrenth/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="+ocamlopt" +RESTRICT="test" # some tests fails diff --git a/dev-ml/ocaml-text/Manifest b/dev-ml/ocaml-text/Manifest deleted file mode 100644 index 4f2d3955022a..000000000000 --- a/dev-ml/ocaml-text/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ocaml-text-0.8.tar.gz 80898 BLAKE2B 9e7395e43a488e6371e04a21a24aaa81eff82bb82802428d0bd64937a8f9e0c7b19a543b99453713d6e99b9c39b9d0fad02b0e627819346800b18f3c22c8e4b8 SHA512 712afd21f615a81dc361ce7f5d89aff0c341ed91cd0e4cce6a2000361023b006b10731ce0cc6c025bde5f5fe7d07fa85ca2af65a8ad4d50647e8dfa8ff7ad81f diff --git a/dev-ml/ocaml-text/metadata.xml b/dev-ml/ocaml-text/metadata.xml deleted file mode 100644 index d5f4e9943f9a..000000000000 --- a/dev-ml/ocaml-text/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">vbmithr/ocaml-text</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/ocaml-text/ocaml-text-0.8.ebuild b/dev-ml/ocaml-text/ocaml-text-0.8.ebuild deleted file mode 100644 index ebcdda2a93f6..000000000000 --- a/dev-ml/ocaml-text/ocaml-text-0.8.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -OASIS_BUILD_DOCS=1 -OASIS_BUILD_TESTS=1 - -inherit oasis - -DESCRIPTION="Library for dealing with 'text'" -HOMEPAGE="https://github.com/vbmithr/ocaml-text/" -SRC_URI="https://github.com/vbmithr/ocaml-text/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="pcre" - -RDEPEND="virtual/libiconv - dev-ml/camlp4:= - pcre? ( dev-ml/pcre-ocaml:=[ocamlopt(+)?] )" -DEPEND="${RDEPEND} - doc? ( dev-tex/rubber virtual/latex-base )" - -DOCS=( "README" "CHANGES" ) - -src_configure() { - oasis_configure_opts="$(use_enable pcre)" \ - oasis_src_configure -} - -src_install() { - oasis_src_install - use doc && dodoc manual/*.pdf -} diff --git a/dev-ml/ocaml-uint/Manifest b/dev-ml/ocaml-uint/Manifest deleted file mode 100644 index 3b91b3e13184..000000000000 --- a/dev-ml/ocaml-uint/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ocaml-uint-1.2.0.tar.gz 53467 BLAKE2B 3fd50623f518a8c0e9d97e31dc089591d6183b6bbeeec3e6808479c27b825e9027139eca442790556eba102b1746159c7d4c034d83bcc4b2169bcd80b9dca360 SHA512 74209cd04fc61debe8b846e7ca60efb9d8f274e4066abac9878fa68e048e5a9822278cfd7a65527c5c1933b0301cd4a92d9815db673fbfa4eae90fb2ee4fb77b diff --git a/dev-ml/ocaml-uint/metadata.xml b/dev-ml/ocaml-uint/metadata.xml deleted file mode 100644 index ffac4d7ebc01..000000000000 --- a/dev-ml/ocaml-uint/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> -</maintainer> -</pkgmetadata> diff --git a/dev-ml/ocaml-uint/ocaml-uint-1.2.0.ebuild b/dev-ml/ocaml-uint/ocaml-uint-1.2.0.ebuild deleted file mode 100644 index b1ac5795a0c0..000000000000 --- a/dev-ml/ocaml-uint/ocaml-uint-1.2.0.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -OASIS_BUILD_DOCS=1 - -inherit oasis - -DESCRIPTION="Unsigned ints for OCaml" -HOMEPAGE="https://forge.ocamlcore.org/projects/ocaml-uint/" -SRC_URI="https://forge.ocamlcore.org/frs/download.php/1516/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND}" diff --git a/dev-ml/ocaml-uri/Manifest b/dev-ml/ocaml-uri/Manifest deleted file mode 100644 index fb9710722c65..000000000000 --- a/dev-ml/ocaml-uri/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ocaml-uri-1.9.4.tar.gz 213917 BLAKE2B 3b76ae2f39a7a97e581791e32e7ec302faacaf883ae82bb635497f205a7bb12b331f2ef34f834c4b22b56433fef75b6ba2c60db6b66f13997290e108f6f0f38b SHA512 c2314c55d1d89bb7824e6bd2aad57fa2bdc4889d5e6c0b4ce75f4ca33660d510d7ab125ff0f340f4688930f3ddac13193d34762f912cc70c4ce30aa206f32ddc diff --git a/dev-ml/ocaml-uri/metadata.xml b/dev-ml/ocaml-uri/metadata.xml deleted file mode 100644 index b6a6ada36e6c..000000000000 --- a/dev-ml/ocaml-uri/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">mirage/ocaml-uri</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/ocaml-uri/ocaml-uri-1.9.4.ebuild b/dev-ml/ocaml-uri/ocaml-uri-1.9.4.ebuild deleted file mode 100644 index 53b7fbd0612d..000000000000 --- a/dev-ml/ocaml-uri/ocaml-uri-1.9.4.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib opam - -DESCRIPTION="RFC3986 URI parsing library for OCaml" -HOMEPAGE="https://github.com/mirage/ocaml-uri https://mirage.io" -SRC_URI="https://github.com/mirage/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="ISC" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="test" - -RDEPEND=" - dev-ml/ocaml-re:= - dev-ml/sexplib:= - dev-ml/ppx_sexp_conv:= - dev-ml/ppx_core:= - dev-ml/ppx_type_conv:= - dev-ml/stringext:= - dev-ml/type-conv:= -" -DEPEND="${RDEPEND} - test? ( >=dev-ml/ounit-1.0.2 ) - dev-ml/jbuilder -" - -src_install() { - opam_src_install uri -} diff --git a/dev-ml/ocaml-webmachine/Manifest b/dev-ml/ocaml-webmachine/Manifest deleted file mode 100644 index 8fbad8eda6cb..000000000000 --- a/dev-ml/ocaml-webmachine/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ocaml-webmachine-0.4.0.tar.gz 74818 BLAKE2B cc9491a8761ebec463ec9c496e7cc84944d554bc6e43d8b20af55af9fd5d597783816f81a68bd9866a462e24dab09fd5da6c7ff327295177981677ddf91e6a08 SHA512 5ea06ae41f6c156786b72ea7a164bd0c96cf9b6fc7ae1e93044a928681f03b07cef39da1c4955317fe6762065bd189b3809ba521b3349ec9f6dde9191c857d31 diff --git a/dev-ml/ocaml-webmachine/metadata.xml b/dev-ml/ocaml-webmachine/metadata.xml deleted file mode 100644 index 16ee3a041382..000000000000 --- a/dev-ml/ocaml-webmachine/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">inhabitedtype/ocaml-webmachine</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/ocaml-webmachine/ocaml-webmachine-0.4.0.ebuild b/dev-ml/ocaml-webmachine/ocaml-webmachine-0.4.0.ebuild deleted file mode 100644 index 1f8b5e502946..000000000000 --- a/dev-ml/ocaml-webmachine/ocaml-webmachine-0.4.0.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -OASIS_BUILD_DOCS=1 -OASIS_BUILD_TESTS=1 - -inherit oasis - -DESCRIPTION="A REST toolkit for OCaml" -HOMEPAGE="https://github.com/inhabitedtype/ocaml-webmachine" -SRC_URI="https://github.com/inhabitedtype/ocaml-webmachine/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -DEPEND=" - dev-ml/calendar:= - dev-ml/ocaml-cohttp:=[ocamlopt?] - dev-ml/ocaml-dispatch:=[ocamlopt(+)?] - dev-ml/ocaml-re:=[ocamlopt?] - dev-ml/ocaml-uri:=[ocamlopt(+)?] -" -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} - test? ( dev-ml/ounit[ocamlopt?] ) -" - -DOCS=( README.md CONTRIBUTING.md ) diff --git a/dev-ml/ocaml-websocket/Manifest b/dev-ml/ocaml-websocket/Manifest deleted file mode 100644 index cb30aa1c56bd..000000000000 --- a/dev-ml/ocaml-websocket/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ocaml-websocket-2.9.tar.gz 23946 BLAKE2B adea61c5b163c995f3fcdc9789ef718bbfc5b22f3ef755795d54d0ba7357797fd5c358da88a7fbc5986c728b2705d5f34c7f3d4c8f2c2a9aa857a4b6add98b5f SHA512 eab5e4f971985c03ca70b46abb54ca8a09491e5ebc803b57ddf8447447b6926da2117fd882c7cb5a9a7282290e756f535e4584f09cbd21ce2554f20df1db7ae8 diff --git a/dev-ml/ocaml-websocket/metadata.xml b/dev-ml/ocaml-websocket/metadata.xml deleted file mode 100644 index 3e6d4b66b87e..000000000000 --- a/dev-ml/ocaml-websocket/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <use> - <flag name="async">Enables support for the <pkg>dev-ml/async</pkg> asynchronous execution library.</flag> - <flag name="lwt">Enables support for the <pkg>dev-ml/lwt</pkg> cooperative light-weight thread library.</flag> - </use> - <upstream> - <remote-id type="github">vbmithr/ocaml-websocket</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/ocaml-websocket/ocaml-websocket-2.9.ebuild b/dev-ml/ocaml-websocket/ocaml-websocket-2.9.ebuild deleted file mode 100644 index 359784d9c447..000000000000 --- a/dev-ml/ocaml-websocket/ocaml-websocket-2.9.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit opam - -DESCRIPTION="Websocket library for OCaml" -HOMEPAGE="https://github.com/vbmithr/ocaml-websocket" -SRC_URI="https://github.com/vbmithr/ocaml-websocket/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="ISC" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="+ocamlopt async +ssl lwt" - -DEPEND=" - dev-lang/ocaml:=[ocamlopt?] - dev-ml/astring:=[ocamlopt(+)?] - dev-ml/ocaml-cohttp:=[ocamlopt(+)?,async?,lwt?] - dev-ml/cppo:=[ocamlopt(+)?] - dev-ml/ocplib-endian:=[ocamlopt(+)?] - async? ( - dev-ml/async:=[ocamlopt(+)?] - ssl? ( dev-ml/async_ssl:=[ocamlopt(+)?] ) - ) - lwt? ( dev-ml/lwt:=[ocamlopt(+)?] ) - ssl? ( dev-ml/cryptokit:=[ocamlopt(+)?] ) - -" -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} - dev-ml/ocamlbuild" - -src_compile() { - ocaml pkg/build.ml \ - native=$(usex ocamlopt true false) \ - native-dynlink=$(usex ocamlopt true false) \ - lwt=$(usex lwt true false) \ - async=$(usex async true false) \ - async_ssl=$(usex async "$(usex ssl true false)" false) \ - nocrypto=false \ - cryptokit=$(usex ssl true false) \ - test=false \ - || die -} - -src_install() { - opam_src_install websocket - dodoc README CHANGES -} diff --git a/dev-ml/ocaml_intrinsics/Manifest b/dev-ml/ocaml_intrinsics/Manifest new file mode 100644 index 000000000000..76ee115558d3 --- /dev/null +++ b/dev-ml/ocaml_intrinsics/Manifest @@ -0,0 +1,3 @@ +DIST ocaml_intrinsics-0.15.1.tar.gz 24925 BLAKE2B 15d74ee891aced288aa734ef4d70a4816f2d2725d0d445620154bec7d1667d3ac06c5ddd778777d15858cbf198ecd978b22959fe68e159ddd9dbbd32304c3077 SHA512 cb0ac26bc34c97eb0429e6833342dbd9fca6f1f4a40b8121f9e6364bd2cdc40676a164d7405454727ced9a4455adb0e3cac5118beb7ab70206adbd3e7f7937e2 +DIST ocaml_intrinsics-0.15.2.tar.gz 24977 BLAKE2B eea2af5ff746cfd7b483df47a8f719c623eecc8bf82d852ed69395752e98ebb94a555ef2dd95271d45941a5582f7ff139f8e79d5dd8adf5389786aff756df7fe SHA512 21539fecd8b40420bdb45a3fe79f65cf4ff0deb103c3cb2b28bad24fddce159bdfab3f7aa6ade0028bebef1602f860b1f6cdf2cc06db1a89e232b221d8ff592b +DIST ocaml_intrinsics-0.16.0.tar.gz 35876 BLAKE2B fc9ead65244efe96ea130426265acb2cccc08105e53383ddfd7117bca461e28095f213f22dddafc1e3f6490ad2b4f0d4e9129a8dcf8dc207269ca83eb889acee SHA512 86bf6ac7cb1da5de03224cc053e174ec22af766b6c5ab4ca1fde3c028405858cb97feeae6968d9054a7d6994491b9f2cdb8e198ee837ad4242f9cd812873ceaa diff --git a/dev-ml/ocaml_intrinsics/metadata.xml b/dev-ml/ocaml_intrinsics/metadata.xml new file mode 100644 index 000000000000..fec13523d489 --- /dev/null +++ b/dev-ml/ocaml_intrinsics/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">janestreet/ocaml_instrinsics</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/ocaml_intrinsics/ocaml_intrinsics-0.15.1.ebuild b/dev-ml/ocaml_intrinsics/ocaml_intrinsics-0.15.1.ebuild new file mode 100644 index 000000000000..e4b6ad5d30b8 --- /dev/null +++ b/dev-ml/ocaml_intrinsics/ocaml_intrinsics-0.15.1.ebuild @@ -0,0 +1,23 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="invoke amd64 instructions (such as clz,popcnt,rdtsc,rdpmc)" +HOMEPAGE="https://github.com/janestreet/ocaml_intrinsics" +SRC_URI="https://github.com/janestreet/${PN}/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-lang/ocaml-4.08 + dev-ml/dune-configurator:= +" +RDEPEND="${DEPEND}" +BDEPEND="" diff --git a/dev-ml/ocaml_intrinsics/ocaml_intrinsics-0.15.2.ebuild b/dev-ml/ocaml_intrinsics/ocaml_intrinsics-0.15.2.ebuild new file mode 100644 index 000000000000..5935dfe6aa7d --- /dev/null +++ b/dev-ml/ocaml_intrinsics/ocaml_intrinsics-0.15.2.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Invoke amd64 instructions (such as clz, popcnt, rdtsc, rdpmc)" +HOMEPAGE="https://github.com/janestreet/ocaml_intrinsics/" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86" +IUSE="+ocamlopt" +RESTRICT="test" + +DEPEND=" + >=dev-lang/ocaml-4.08 + dev-ml/dune-configurator:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ocaml_intrinsics/ocaml_intrinsics-0.16.0.ebuild b/dev-ml/ocaml_intrinsics/ocaml_intrinsics-0.16.0.ebuild new file mode 100644 index 000000000000..7e383a4f2da6 --- /dev/null +++ b/dev-ml/ocaml_intrinsics/ocaml_intrinsics-0.16.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Invoke amd64 instructions (such as clz, popcnt, rdtsc, rdpmc)" +HOMEPAGE="https://github.com/janestreet/ocaml_intrinsics/" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="+ocamlopt" +RESTRICT="test" + +DEPEND=" + >=dev-lang/ocaml-4.14 + dev-ml/dune-configurator:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ocamlbuild/Manifest b/dev-ml/ocamlbuild/Manifest index bf2beb74a20b..12c241b94048 100644 --- a/dev-ml/ocamlbuild/Manifest +++ b/dev-ml/ocamlbuild/Manifest @@ -1,2 +1,3 @@ -DIST ocamlbuild-0.10.1.tar.gz 193263 BLAKE2B cee82997a6b691b3df9b92055b74f05af57d7663f5dbb84701e66dffefcfe6ec00c9721e1872d546f2aea9237068e37ba7d94463d0002a8356dd4d84bc1865c0 SHA512 6d74bdce7fe147bf1a5fd570b569925b36b5f443c7251d1c13a0525e3086417b393a768722bf7d4b23a7e3178b0b3c2511499725c5a755d69783b8d555663e3b -DIST ocamlbuild-0.11.0.tar.gz 195297 BLAKE2B 2d653c402edf58035fa6efb65c99c956fe78efc4759f29c8ddab8263310a5d243d25d37d4c1a4f0699f151afb6d4c6df4c1550f95d6e915963b3d86923877225 SHA512 14bc44cc63b6c99e711658a1145247bad8263632fbb4550238cef15e226a76b83e51b83575a7a96f16b96ec321dedd0ef23f36166c354838aec1922f58179efd +DIST ocamlbuild-0.14.0.tar.gz 198267 BLAKE2B 355d61ba68e61b9ee18a9fc0fbb9062405f44707b180ca7ad4bfec727ca3d3d2cc08f17be118ca3a4161c7789d975e7f431812e9139d4fde85a1a27ab68c8ac3 SHA512 ae60247396399dfd35644c8c1986ef7679e5a9964df82e3388bfc6dd4c5b88a13d6869a698d14a9ac70dc48e4ce1c003f543c85426d8c862ca31dea37a554b07 +DIST ocamlbuild-0.14.1.tar.gz 199103 BLAKE2B e29d5cf2b333dd45c0aa86cc1fa4ddb160079b8a7badfe6127039d9215d3e6ad655eeacc9410887eadf1d61615025a59ea008254cae5fd65c13eb2afc7937ec8 SHA512 1f5b43215b1d3dc427b9c64e005add9d423ed4bca9686d52c55912df8955647cb2d7d86622d44b41b14c4f0d657b770c27967c541c868eeb7c78e3bd35b827ad +DIST ocamlbuild-0.14.2.tar.gz 199293 BLAKE2B d81613878f93f27c6de41461e6b3cebe0744a5204297725263a608cb129a708aaf6f27b444b97d68f2bde844a760f8e78647641f10eed61e727ef3936562cdea SHA512 f568bf10431a1f701e8bd7554dc662400a0d978411038bbad93d44dceab02874490a8a5886a9b44e017347e7949997f13f5c3752f74e1eb5e273d2beb19a75fd diff --git a/dev-ml/ocamlbuild/files/ocamlbuild-0.14.0-Disable-tests-failing-with-OCaml-4.08.0.patch b/dev-ml/ocamlbuild/files/ocamlbuild-0.14.0-Disable-tests-failing-with-OCaml-4.08.0.patch new file mode 100644 index 000000000000..991f13238c05 --- /dev/null +++ b/dev-ml/ocamlbuild/files/ocamlbuild-0.14.0-Disable-tests-failing-with-OCaml-4.08.0.patch @@ -0,0 +1,39 @@ +From: Stephane Glondu <steph@glondu.net> +Date: Fri, 2 Aug 2019 13:08:55 +0200 +Subject: Disable tests failing with OCaml 4.08.0 + +--- + testsuite/internal.ml | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/testsuite/internal.ml b/testsuite/internal.ml +index d3c2004..a87f5e2 100644 +--- a/testsuite/internal.ml ++++ b/testsuite/internal.ml +@@ -200,7 +200,7 @@ let () = + "] + ~targets:("src/foo.cmxs",[]) ();; + +-let () = test "StrictSequenceFlag" ++let _ignored () = test "StrictSequenceFlag" + ~options:[`no_ocamlfind; `quiet] + ~description:"strict_sequence tag" + ~tree:[T.f "hello.ml" ~content:"let () = 1; ()"; +@@ -219,7 +219,7 @@ Command exited with code 2." + ) + ~targets:("hello.byte",[]) ();; + +-let () = test "StrictFormatsFlag" ++let _ignored () = test "StrictFormatsFlag" + ~options:[`no_ocamlfind; `quiet] + ~description:"strict_format tag" + ~tree:[T.f "hello.ml" ~content:"let _ = Printf.printf \"%.10s\""; +@@ -230,7 +230,7 @@ Error: invalid format \"%.10s\": at character number 0, \ + Command exited with code 2." + ~targets:("hello.byte",[]) ();; + +-let () = test "PrincipalFlag" ++let _ignored () = test "PrincipalFlag" + ~options:[`no_ocamlfind; `quiet] + ~description:"-principal tag" + ~tree:[T.f "hello.ml" diff --git a/dev-ml/ocamlbuild/metadata.xml b/dev-ml/ocamlbuild/metadata.xml index 02c0fb40425a..59996339418b 100644 --- a/dev-ml/ocamlbuild/metadata.xml +++ b/dev-ml/ocamlbuild/metadata.xml @@ -1,9 +1,9 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">ocaml/ocamlbuild</remote-id> diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild index 36621246391c..c581a219720e 100644 --- a/dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild +++ b/dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 DESCRIPTION="Generic build tool with built-in rules for building OCaml library and programs" HOMEPAGE="https://github.com/ocaml/ocamlbuild" @@ -9,15 +9,27 @@ 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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux" IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" +REQUIRED_USE="test? ( ocamlopt )" -DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]" -RDEPEND="${DEPEND} - !<dev-ml/findlib-1.6.1-r1 -" -DEPEND="${DEPEND} - test? ( dev-ml/findlib )" +RDEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]" +DEPEND="${RDEPEND} + dev-ml/findlib" + +PATCHES=( + "${FILESDIR}"/${PN}-0.14.0-Disable-tests-failing-with-OCaml-4.08.0.patch +) + +QA_FLAGS_IGNORED='.*' +src_prepare() { + sed -i \ + -e "/package_exists/s:camlp4.macro:xxxxxx:" \ + -e "/package_exists/s:menhirLib:xxxxxx:" \ + testsuite/external.ml || die + default +} src_configure() { emake -f configure.make Makefile.config \ @@ -29,6 +41,11 @@ src_configure() { NATDYNLINK=$(usex ocamlopt true false) } +src_compile() { + emake src/ocamlbuild_config.cmo + default +} + src_install() { emake CHECK_IF_PREINSTALLED=false DESTDIR="${D}" install dodoc Changes diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.14.1.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.14.1.ebuild new file mode 100644 index 000000000000..9a074afe9de9 --- /dev/null +++ b/dev-ml/ocamlbuild/ocamlbuild-0.14.1.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Generic build tool with built-in rules for building OCaml library and programs" +HOMEPAGE="https://github.com/ocaml/ocamlbuild" +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" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" +REQUIRED_USE="test? ( ocamlopt )" + +RDEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]" +DEPEND="${RDEPEND} + dev-ml/findlib" + +PATCHES=( + "${FILESDIR}"/${PN}-0.14.0-Disable-tests-failing-with-OCaml-4.08.0.patch +) + +QA_FLAGS_IGNORED='.*' +src_prepare() { + sed -i \ + -e "/package_exists/s:camlp4.macro:xxxxxx:" \ + -e "/package_exists/s:menhirLib:xxxxxx:" \ + testsuite/external.ml || die + default +} + +src_configure() { + emake -f configure.make Makefile.config \ + PREFIX="${EPREFIX}/usr" \ + BINDIR="${EPREFIX}/usr/bin" \ + LIBDIR="$(ocamlc -where)" \ + OCAML_NATIVE=$(usex ocamlopt true false) \ + OCAML_NATIVE_TOOLS=$(usex ocamlopt true false) \ + NATDYNLINK=$(usex ocamlopt true false) +} + +src_compile() { + emake src/ocamlbuild_config.cmo + default +} + +src_install() { + emake CHECK_IF_PREINSTALLED=false DESTDIR="${D}" install + dodoc Changes +} diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.10.1.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.14.2.ebuild index e0622a77a825..5f09bae5b202 100644 --- a/dev-ml/ocamlbuild/ocamlbuild-0.10.1.ebuild +++ b/dev-ml/ocamlbuild/ocamlbuild-0.14.2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=8 DESCRIPTION="Generic build tool with built-in rules for building OCaml library and programs" HOMEPAGE="https://github.com/ocaml/ocamlbuild" @@ -9,13 +9,22 @@ 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="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux" IUSE="+ocamlopt" +RESTRICT="test" # Tests fail -DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]" -RDEPEND="${DEPEND} - !<dev-ml/findlib-1.6.1-r1 -" +RDEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]" +DEPEND="${RDEPEND} + dev-ml/findlib" + +QA_FLAGS_IGNORED='.*' +src_prepare() { + sed -i \ + -e "/package_exists/s:camlp4.macro:xxxxxx:" \ + -e "/package_exists/s:menhirLib:xxxxxx:" \ + testsuite/external.ml || die + default +} src_configure() { emake -f configure.make Makefile.config \ @@ -27,6 +36,11 @@ src_configure() { NATDYNLINK=$(usex ocamlopt true false) } +src_compile() { + emake src/ocamlbuild_config.cmo + default +} + src_install() { emake CHECK_IF_PREINSTALLED=false DESTDIR="${D}" install dodoc Changes diff --git a/dev-ml/ocamldap/Manifest b/dev-ml/ocamldap/Manifest deleted file mode 100644 index 8dc74ba8e691..000000000000 --- a/dev-ml/ocamldap/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ocamldap-2.2.tar.gz 174204 BLAKE2B 38417bc5ee633db912cbaa299dea0def74a2b31ca54f70b798cb3380623764b27ceec04c708d3632b8d7a6ef42792668d1d9a9e6f910c6fe35b15569da2efda5 SHA512 e24e78497b7c9ed89b0ae73c5773cc9ec28c7c7d317b4b8b39f6b20536ff8f44e15c2657d6aba4bb4689afb5bb155fc7391bea6edab50d0855b22bc457982a2d diff --git a/dev-ml/ocamldap/files/ocaml-4.02.patch b/dev-ml/ocamldap/files/ocaml-4.02.patch deleted file mode 100644 index 959ddd0a5a4f..000000000000 --- a/dev-ml/ocamldap/files/ocaml-4.02.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/ldap_ooclient.ml b/src/ldap_ooclient.ml -index 79fd51d..7ffa39e 100644 ---- a/src/ldap_ooclient.ml -+++ b/src/ldap_ooclient.ml -@@ -23,7 +23,7 @@ - open Ldap_types - open Ldap_funclient - open Ldap_schemaparser --open String -+let lowercase = String.lowercase - - (* types used throughout the library *) - (* add types *) diff --git a/dev-ml/ocamldap/metadata.xml b/dev-ml/ocamldap/metadata.xml deleted file mode 100644 index 8b85d92a466d..000000000000 --- a/dev-ml/ocamldap/metadata.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <longdescription lang="en"> -Ocamldap is an implementation of the Light Weight Directory Access Protocol, -and a set of useful tools built around it. It includes high level libraries -for creating ldap clients and ldap servers. It also includes many of the -auxiliary tools needed for building intelligent solutions, and interoperating -with other directories. These include, an rfc2252 schema parser, and an schema -checker, an ldif parser and printer, a search filter parser (but no printer -yet), and a rudimentary ldap url parser. While including things already done -elsewhere is fun, ocamldap adds something as well. So it implements a concept -which tries to provide a basic unit of abstraction for managing directory data, -called a service. A service is a bit like a stored search filter that you give -a name. So you can ask ocamldap if an object satisfies its conditions, but -unlike a search filter you can also ask ocamldap to MAKE an object satisfy its -conditions. This can be really useful in distributed managment applications. -Needless to say, more on this in the Documentation section. - </longdescription> - <upstream> - <remote-id type="bitbucket">deplai_j/ocamldap</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/ocamldap/ocamldap-2.2.ebuild b/dev-ml/ocamldap/ocamldap-2.2.ebuild deleted file mode 100644 index a53115fc7a11..000000000000 --- a/dev-ml/ocamldap/ocamldap-2.2.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit oasis - -DESCRIPTION="an implementation of the Light Weight Directory Access Protocol" -HOMEPAGE="http://git-jpdeplaix.dyndns.org/libs/ocamldap.git/" -SRC_URI="https://bitbucket.org/deplai_j/${PN}/downloads/${P}.tar.gz" -LICENSE="LGPL-2.1" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="doc" - -DEPEND="dev-ml/pcre-ocaml:= - dev-ml/ocaml-ssl:= - dev-ml/ocamlnet:=" -RDEPEND="${DEPEND}" - -DOCS=( AUTHORS.txt Changelog INSTALL.txt README.txt ) - -PATCHES=( "${FILESDIR}/ocaml-4.02.patch" ) - -src_install() { - oasis_src_install - use doc && dohtml -r doc/ocamldap/html -} diff --git a/dev-ml/ocamldsort/Manifest b/dev-ml/ocamldsort/Manifest deleted file mode 100644 index 3593efc782d4..000000000000 --- a/dev-ml/ocamldsort/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ocamldsort-0.16.0.tar.gz 42388 BLAKE2B 84f9943237d126a105700b52879b358b202f196ce885b9d295baf3fcab8326520e4433839c375ab082460790d2855687a8cd11ca9a48e3b3dcfcaea27cea8e06 SHA512 3e43a4a7c4e7e91f141d93200ac7ba2d6de2321ea4af4cde63c2fbfff0042a556c55f1be9948ebf90a16778b2b6efc1757d6747cf01668155003e4a806d0773e diff --git a/dev-ml/ocamldsort/ocamldsort-0.16.0-r1.ebuild b/dev-ml/ocamldsort/ocamldsort-0.16.0-r1.ebuild deleted file mode 100644 index f7a9fbe05b45..000000000000 --- a/dev-ml/ocamldsort/ocamldsort-0.16.0-r1.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="A dependency sorter for OCaml source files" -HOMEPAGE="http://dimitri.mutu.net/ocaml.html" -SRC_URI="ftp://quatramaran.ens.fr/pub/ara/ocamldsort/${P}.tar.gz" -LICENSE="LGPL-2" - -SLOT="0" -KEYWORDS="~amd64 ppc x86" -IUSE="" - -DEPEND=">=dev-lang/ocaml-3.12:= - dev-ml/camlp4:=" -RDEPEND="${DEPEND}" - -src_compile() { - emake -j1 -} - -src_install() { - emake BINDIR="${ED}/usr/bin" MANDIR="${ED}/usr/share/man" install - dodoc README THANKS Changes -} diff --git a/dev-ml/ocamlfuse/Manifest b/dev-ml/ocamlfuse/Manifest new file mode 100644 index 000000000000..3a0975208f94 --- /dev/null +++ b/dev-ml/ocamlfuse/Manifest @@ -0,0 +1 @@ +DIST ocamlfuse-2.7.1_p7-r1.tar.gz 21469 BLAKE2B fa587d19124c2e2d320091bb42b098644d3112e39652dbf621c88f701effdab0ce15372b6f2461709eb3afe628e2888db3a7a0c9abeab8b8a136d09c69c84ac4 SHA512 342a6ce8a81ac05d47d4458ef6e9aa750e4e7643a89d28705664852f0549e1932643e8db5d93225ba496611654b3f11fef6aca1e6e40e8d4b30064fc9c65f7fd diff --git a/dev-ml/ocamlfuse/files/ocamlfuse-2.7.1_p7-unistd.patch b/dev-ml/ocamlfuse/files/ocamlfuse-2.7.1_p7-unistd.patch new file mode 100644 index 000000000000..b13f906a5ef3 --- /dev/null +++ b/dev-ml/ocamlfuse/files/ocamlfuse-2.7.1_p7-unistd.patch @@ -0,0 +1,10 @@ +--- a/lib/Unix_util_stubs.c 2022-09-20 19:53:44.445778566 +0200 ++++ b/lib/Unix_util_stubs.c 2022-09-20 19:54:03.521504343 +0200 +@@ -24,6 +24,7 @@ + vincenzo_ml@yahoo.it + */ + ++#include <unistd.h> + #include <stddef.h> + #include <string.h> + #include <errno.h> diff --git a/dev-ml/ocamlfuse/metadata.xml b/dev-ml/ocamlfuse/metadata.xml new file mode 100644 index 000000000000..5d0251ea61f5 --- /dev/null +++ b/dev-ml/ocamlfuse/metadata.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <longdescription lang="en">This is a binding to FUSE for the OCaml programming language, enabling +you to write multithreaded filesystems in the OCaml language. It has +been designed with simplicity as a goal, as you can see by looking at +example/fusexmp.ml. Efficiency has also been a separate goal. The +Bigarray library is used for read and writes, allowing the library to +do zero-copy in OCaml land.</longdescription> + <upstream> + <bugs-to>https://github.com/astrada/ocamlfuse/issues</bugs-to> + <remote-id type="github">astrada/ocamlfuse</remote-id> + <remote-id type="sourceforge">ocamlfuse</remote-id> + <maintainer> + <name>Alessandro Strada</name> + <email>alessandro.strada@gmail.com</email> + </maintainer> + </upstream> +</pkgmetadata> diff --git a/dev-ml/ocamlfuse/ocamlfuse-2.7.1_p7-r1.ebuild b/dev-ml/ocamlfuse/ocamlfuse-2.7.1_p7-r1.ebuild new file mode 100644 index 000000000000..63891abc2fe4 --- /dev/null +++ b/dev-ml/ocamlfuse/ocamlfuse-2.7.1_p7-r1.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune toolchain-funcs + +MYPV="${PV/_p/_cvs}" + +DESCRIPTION="OCaml binding for fuse" +HOMEPAGE=" + https://sourceforge.net/projects/ocamlfuse/ + https://github.com/astrada/ocamlfuse + https://opam.ocaml.org/packages/ocamlfuse +" +SRC_URI="https://github.com/astrada/${PN}/archive/v${MYPV}.tar.gz -> ${PF}.tar.gz" +S="${WORKDIR}/${PN}-${MYPV}" + +LICENSE="GPL-2" +SLOT="0/${PV}" +KEYWORDS="~amd64" +IUSE="ocamlopt" + +RDEPEND=" + dev-ml/camlidl:= + sys-fs/fuse:0 +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-ml/dune-configurator + dev-ml/opam +" + +PATCHES=( "${FILESDIR}"/${P}-unistd.patch ) + +src_compile() { + tc-export CPP + dune_src_compile +} diff --git a/dev-ml/ocamlgraph/Manifest b/dev-ml/ocamlgraph/Manifest index 1edb5afbb828..bb22ec3f3bd8 100644 --- a/dev-ml/ocamlgraph/Manifest +++ b/dev-ml/ocamlgraph/Manifest @@ -1,2 +1 @@ -DIST ocamlgraph-1.8.7.tar.gz 272625 BLAKE2B 18df3f78cfe66e2259c770cfc3671096b06a185e3f407b22eb0a21ff6e7f7df4b0b705a830d740c64f66609b88e2fb76aa91e200ca4c0fadc7ae2a1910641f3d SHA512 27559293bf576ecc9cf49090e24905c50d00ebaeb444a3c917826f3cfe1e7ceab34b43e30f98634811b1688b675d8747b590b5bb103a720d099304f5031feb2e -DIST ocamlgraph-1.8.8.tar.gz 282729 BLAKE2B 79fdbcdd86fc5b6f36ad3399c890c31831a20fec22f0b4faf6da1fb61a12d25a54587e4b3ed8f9266ad1ce37bfffe76d66cf7a7e765e8046429943ad3c555208 SHA512 ccb07d4a7fb0c3026ad2d4563e1ca0a88483ac3cf43c9378989ae5c031961853a11c9673c06b54a16733c5755d9c0a2783c5f475afdcc7692d2bf3d4778f5bc5 +DIST ocamlgraph-2.0.0.tbz 298912 BLAKE2B a4bb04c74f4dba8b0f37cdf8ab9a82ef5120b1e7f5b5570e67aac35de16e4553c93759acfa5c218e07dc7c036750d92d2c557c7d58247783718f691c5319ded8 SHA512 c4973ac03bdff52d1c8a1ed01c81e0fbe2f76486995e57ff4e4a11bcc7b1793556139d52a81ff14ee8c8de52f1b40e4bd359e60a2ae626cc630ebe8bccefb3f1 diff --git a/dev-ml/ocamlgraph/files/ocamlgraph-1.8.6-installfindlib.patch b/dev-ml/ocamlgraph/files/ocamlgraph-1.8.6-installfindlib.patch deleted file mode 100644 index cb980b6f19dc..000000000000 --- a/dev-ml/ocamlgraph/files/ocamlgraph-1.8.6-installfindlib.patch +++ /dev/null @@ -1,38 +0,0 @@ -Index: ocamlgraph-1.8.6/Makefile.in -=================================================================== ---- ocamlgraph-1.8.6.orig/Makefile.in -+++ ocamlgraph-1.8.6/Makefile.in -@@ -421,21 +421,25 @@ ifdef DESTDIR - OCAMLFINDDEST := -destdir $(DESTDIR) - endif - -+ifneq ($(WANT_OCAMLOPT),no) -+INSTALL_OPT=graph$(LIBEXT) graph.cmx $(CMXA) -+INSTALL_GTK_OPT=$(VIEWER_CMXLIB) $(VIEWER_CMXLIB:.cmx=.o) $(DGRAPH_CMXLIB) $(DGRAPH_CMXLIB:.cmx=.o) graph$(OBJEXT) -+endif -+ - install-findlib: META - ifdef OCAMLFIND --ifeq (@LABLGNOMECANVAS@,yes) -+ifeq ($(WANT_GTK),yes) - $(OCAMLFIND) install $(OCAMLFINDDEST) ocamlgraph META \ - $(SRCDIR)/*.mli $(VIEWER_DIR)/*.mli $(DGRAPH_DIR)/*.mli \ -- graph$(OBJEXT) graph$(LIBEXT) graph.cmx graph.cmo graph.cmi \ -- $(CMA) $(CMXA) \ -- $(VIEWER_CMXLIB) $(VIEWER_CMOLIB) $(VIEWER_CMILIB) \ -- $(VIEWER_CMXLIB:.cmx=.o) \ -- $(DGRAPH_CMXLIB) $(DGRAPH_CMOLIB) $(DGRAPH_CMILIB) \ -- $(DGRAPH_CMXLIB:.cmx=.o) -+ $(INSTALL_OPT) graph.cmo graph.cmi \ -+ $(CMA) \ -+ $(INSTALL_GTK_OPT) \ -+ $(VIEWER_CMOLIB) $(VIEWER_CMILIB) \ -+ $(DGRAPH_CMOLIB) $(DGRAPH_CMILIB) - else - $(OCAMLFIND) install $(OCAMLFINDDEST) ocamlgraph META \ - $(SRCDIR)/*.mli $(VIEWER_DIR)/*.mli $(DGRAPH_DIR)/*.mli \ -- graph$(LIBEXT) graph.cmx graph.cmo graph.cmi $(CMA) $(CMXA) -+ $(INSTALL_OPT) graph.cmo graph.cmi $(CMA) - endif - endif - diff --git a/dev-ml/ocamlgraph/files/ocamlgraph-1.8.7-test.patch b/dev-ml/ocamlgraph/files/ocamlgraph-1.8.7-test.patch deleted file mode 100644 index f0d370cfd94a..000000000000 --- a/dev-ml/ocamlgraph/files/ocamlgraph-1.8.7-test.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit 726e8d6e31224eb70f75655579da9a374e910b98 -Author: Jean-Christophe Filliatre <Jean-Christophe.Filliatre@lri.fr> -Date: Mon Feb 13 08:41:58 2017 +0100 - - fixed 'make check' - -diff --git a/Makefile.in b/Makefile.in -index 58b9e9c..9ce40df 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -360,7 +360,7 @@ bin/testunix.opt: $(CMXA) myTest/testunix.ml - $(OCAMLOPT) -unsafe -inline 100 -o $@ unix.cmxa $^ - - check: $(CMA) tests/check.ml bin/test-ts -- ocaml $(CMA) tests/test_clique.ml tests/check.ml -+ ocaml -I . $(CMA) tests/test_clique.ml tests/check.ml - bin/test-ts 10 - - # Additional rules diff --git a/dev-ml/ocamlgraph/metadata.xml b/dev-ml/ocamlgraph/metadata.xml index 7640c195a7fe..d153e13b620d 100644 --- a/dev-ml/ocamlgraph/metadata.xml +++ b/dev-ml/ocamlgraph/metadata.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">backtracking/ocamlgraph</remote-id> diff --git a/dev-ml/ocamlgraph/ocamlgraph-1.8.7.ebuild b/dev-ml/ocamlgraph/ocamlgraph-1.8.7.ebuild deleted file mode 100644 index 09d0810bef2b..000000000000 --- a/dev-ml/ocamlgraph/ocamlgraph-1.8.7.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib eutils - -DESCRIPTION="O'Caml Graph library" -HOMEPAGE="http://ocamlgraph.lri.fr/index.en.html" -SRC_URI="http://ocamlgraph.lri.fr/download/${P}.tar.gz" -LICENSE="LGPL-2.1" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ppc x86" -RDEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?] - gtk? ( dev-ml/lablgtk:=[gnomecanvas,ocamlopt?] )" -DEPEND="${RDEPEND} - doc? ( dev-tex/hevea dev-ml/ocamlweb )" -IUSE="doc examples gtk +ocamlopt" - -src_prepare() { - epatch "${FILESDIR}/${PN}-1.8.6-installfindlib.patch" - epatch "${FILESDIR}/${P}-test.patch" -} - -src_compile() { - emake byte - use ocamlopt && emake opt - - if use doc; then - emake doc - fi - - if use gtk; then - emake OCAMLBEST=$(usex ocamlopt opt byte) viewer dgraph editor - fi -} - -src_install() { - findlib_src_preinst - use ocamlopt || export WANT_OCAMLOPT=no - use gtk && export WANT_GTK=yes - emake install-findlib - - if use gtk ; then - local ext=byte - use ocamlopt && ext=opt - newbin dgraph/dgraph.${ext} ${PN}-dgraph - newbin editor/editor.${ext} ${PN}-editor - newbin view_graph/viewgraph.${ext} ${PN}-viewgraph - fi - - dodoc README.adoc CREDITS FAQ CHANGES - if use doc; then - dohtml doc/* - fi - - if use examples; then - insinto /usr/share/doc/${PF} - doins -r examples - docompress -x /usr/share/doc/${PF}/examples - fi -} diff --git a/dev-ml/ocamlgraph/ocamlgraph-1.8.8.ebuild b/dev-ml/ocamlgraph/ocamlgraph-1.8.8.ebuild deleted file mode 100644 index b653703ff09d..000000000000 --- a/dev-ml/ocamlgraph/ocamlgraph-1.8.8.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib - -DESCRIPTION="O'Caml Graph library" -HOMEPAGE="http://ocamlgraph.lri.fr/index.en.html" -SRC_URI="http://ocamlgraph.lri.fr/download/${P}.tar.gz" -LICENSE="LGPL-2.1" -SLOT="0/${PV}" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86" -RDEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?] - gtk? ( dev-ml/lablgtk:=[gnomecanvas,ocamlopt?] )" -DEPEND="${RDEPEND} - doc? ( dev-tex/hevea dev-ml/ocamlweb )" -IUSE="doc examples gtk +ocamlopt" - -src_compile() { - emake byte - use ocamlopt && emake opt - - if use doc; then - emake doc - fi - - if use gtk; then - emake OCAMLBEST=$(usex ocamlopt opt byte) viewer dgraph editor - fi -} - -src_install() { - findlib_src_preinst - use ocamlopt || export WANT_OCAMLOPT=no - use gtk && export WANT_GTK=yes - emake install-findlib - - if use gtk ; then - local ext=byte - use ocamlopt && ext=opt - newbin dgraph/dgraph.${ext} ${PN}-dgraph - newbin editor/editor.${ext} ${PN}-editor - newbin view_graph/viewgraph.${ext} ${PN}-viewgraph - fi - - dodoc README.adoc CREDITS FAQ CHANGES - if use doc; then - dohtml doc/* - fi - - if use examples; then - insinto /usr/share/doc/${PF} - doins -r examples - docompress -x /usr/share/doc/${PF}/examples - fi -} diff --git a/dev-ml/ocamlgraph/ocamlgraph-2.0.0-r1.ebuild b/dev-ml/ocamlgraph/ocamlgraph-2.0.0-r1.ebuild new file mode 100644 index 000000000000..492f93369dd5 --- /dev/null +++ b/dev-ml/ocamlgraph/ocamlgraph-2.0.0-r1.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="O'Caml Graph library" +HOMEPAGE="http://ocamlgraph.lri.fr/index.en.html" +SRC_URI="https://github.com/backtracking/${PN}/releases/download/${PV}/${P}.tbz" +LICENSE="LGPL-2.1" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +RDEPEND=" + dev-ml/stdlib-shims:=[ocamlopt?] + dev-ml/graphics:=[ocamlopt?]" +DEPEND="${RDEPEND}" +IUSE="+ocamlopt" + +src_compile() { + dune build --only-packages ocamlgraph @install || die +} diff --git a/dev-ml/ocamlify/Manifest b/dev-ml/ocamlify/Manifest deleted file mode 100644 index 81c035d6fc01..000000000000 --- a/dev-ml/ocamlify/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ocamlify-0.0.2.tar.gz 53184 BLAKE2B fff11edce964a0552f9a7f130872f393e764a9413ac526d643dd575969a47cbc6a0f9c5040c0fcd3e5beb11c42a8a3a35fe55898eab176b11c659bdd74729b90 SHA512 e36dd09de6163be1e4d1a54944bb66871a5d461b3ead9ee8393d91a624cf6f7d038be8d8b9db36b04786adff67eb830d9aa3e81475e774dc0dee73adb985079e diff --git a/dev-ml/ocamlify/metadata.xml b/dev-ml/ocamlify/metadata.xml deleted file mode 100644 index ffac4d7ebc01..000000000000 --- a/dev-ml/ocamlify/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> -</maintainer> -</pkgmetadata> diff --git a/dev-ml/ocamlify/ocamlify-0.0.2.ebuild b/dev-ml/ocamlify/ocamlify-0.0.2.ebuild deleted file mode 100644 index 0f54e07a5cc1..000000000000 --- a/dev-ml/ocamlify/ocamlify-0.0.2.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit oasis - -DESCRIPTION="OCamlify creates OCaml code by including files into strings or string lists" -HOMEPAGE="http://forge.ocamlcore.org/projects/ocamlify" -SRC_URI="http://forge.ocamlcore.org/frs/download.php/1209/${P}.tar.gz" - -LICENSE="LGPL-2.1-with-linking-exception" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND="" -DEPEND="${RDEPEND}" -IUSE="" - -DOCS=( "README.txt" "AUTHORS.txt" ) diff --git a/dev-ml/ocamlmod/Manifest b/dev-ml/ocamlmod/Manifest deleted file mode 100644 index 5345dc401b4b..000000000000 --- a/dev-ml/ocamlmod/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ocamlmod-0.0.8.tar.gz 48985 BLAKE2B a153b172b14216b8e69a51c47a25cd796e6bb2adb5d0c45dac49a5bab8e99f0b8511e5e1818abe2bf86ea5280b9b1c19aa21db23ed686387c3414c0df6f2667c SHA512 beb64c109c241965f33a60b4868f5215e6c112742a3be214d3b7a0503b9d29494c0453fa5f2551bbc1975cd4b123d0b917116aeeba968d2a7d2c6fb9651a64f4 -DIST ocamlmod-0.0.9.tar.gz 55025 BLAKE2B 26be662e814543b65a2fb293732257a803c0cfc544550d0339617ff3c59ce1cf44f2330582e6eeca313cf8e25984d7cbfc4fc1c1a3b830fc490a16551961974e SHA512 cf0d3671cf8fa83bdbd0e4b47888a50f9eab24691c71685c0612a9a8efaf36ba9fa66cee604c928a71f2d8da40b35453d2f2d3619f73141aba0f46de3bd97537 diff --git a/dev-ml/ocamlmod/metadata.xml b/dev-ml/ocamlmod/metadata.xml deleted file mode 100644 index ffac4d7ebc01..000000000000 --- a/dev-ml/ocamlmod/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> -</maintainer> -</pkgmetadata> diff --git a/dev-ml/ocamlmod/ocamlmod-0.0.8.ebuild b/dev-ml/ocamlmod/ocamlmod-0.0.8.ebuild deleted file mode 100644 index 6a49bd4c7cdb..000000000000 --- a/dev-ml/ocamlmod/ocamlmod-0.0.8.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -#OASIS_BUILD_TESTS=1 - -inherit oasis - -DESCRIPTION="Generate OCaml modules from source files" -HOMEPAGE="http://forge.ocamlcore.org/projects/ocamlmod/" -SRC_URI="https://forge.ocamlcore.org/frs/download.php/1544/ocamlmod-0.0.8.tar.gz" - -LICENSE="LGPL-2.1-with-linking-exception" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="" -DEPEND="${RDEPEND}" -# test? ( >=dev-ml/ounit-2.0.0 )" - -DOCS=( "AUTHORS.txt" "README.txt" ) diff --git a/dev-ml/ocamlmod/ocamlmod-0.0.9.ebuild b/dev-ml/ocamlmod/ocamlmod-0.0.9.ebuild deleted file mode 100644 index 8133a7a466f3..000000000000 --- a/dev-ml/ocamlmod/ocamlmod-0.0.9.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -OASIS_BUILD_TESTS=1 - -inherit oasis - -DESCRIPTION="Generate OCaml modules from source files" -HOMEPAGE="http://forge.ocamlcore.org/projects/ocamlmod/" -SRC_URI="http://forge.ocamlcore.org/frs/download.php/1702/ocamlmod-0.0.9.tar.gz" - -LICENSE="LGPL-2.1-with-linking-exception" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="" -DEPEND="${RDEPEND} - test? ( >=dev-ml/ounit-2.0.0 )" - -DOCS=( "AUTHORS.txt" "README.txt" ) diff --git a/dev-ml/ocamlnet/Manifest b/dev-ml/ocamlnet/Manifest index 07c535b63237..f8c4e062ea07 100644 --- a/dev-ml/ocamlnet/Manifest +++ b/dev-ml/ocamlnet/Manifest @@ -1,3 +1,2 @@ -DIST ocamlnet-4.1.2.tar.gz 4623183 BLAKE2B 7e8d5cdc823b9e924258f75f00957ba185d49555377ba2a2d960c47e2ea958059e1ab62e27be63770bb4f547e1fa0cb788a54c3e698180b2b15f0097fe84455a SHA512 69f42042a54efd662db2217224da53513fc7e72c7b2313d4a4a1128f1b4624f4f6298434f5b19f354b832119ff151abc81e85eb0108d6eb24f30f82d176e0b4d -DIST ocamlnet-4.1.3.tar.gz 4553037 BLAKE2B 177d2a3b947e6123bdef0ee180c612f832a22dfd90fe0c44b60ba2ebea3629103db9730eb1b926b7d7bf39b489934b8949b0fd08e5155c7f41e3c065c215558c SHA512 683ab6f529639c9da01478ba8ba7a1bf89a418ad3872331bb3e29067c0a75ddc0db996630ce5a5dd116967d6e3e756ade02d9a78b865bbc226f95d01af9e3956 -DIST ocamlnet-4.1.4.tar.gz 4552969 BLAKE2B 3dfedcd09eb91d1ca8e13b7a87dfe70cfb88d57d0b4fa970fe6179affa05ba3fdeaad0dfbb6ac267e7a6530c289408b1a8ad66a805226245f80fe66770addad5 SHA512 ca502444f81898ccda27d61760a357aad59624cf3c4c025d49dd1c2e7bc3ef497c199634247ba7731e016c234e5cd92d2599d1ef9ecd55c3b6e7a64fc4773ee0 +DIST ocamlnet-4.1.8.tar.gz 4620065 BLAKE2B 8f84ce4d79de5f4a1f26d4e45f68327042b0adc22717e56eeaca03ee6371e9251c01e8736d3afe5c00a1c65ef0286d56a04c57e80377402bb19ff87955ae98d9 SHA512 e238235968b9546c60568a38e68e354378d30e7137973332dcb10da21fa775ab7b367889fc51f5bd7cb00e51582834cafe2a0c4706b0bc77a44d4571a6f22815 +DIST ocamlnet-4.1.9.tar.gz 4628747 BLAKE2B 40e41edee79ba5957d297506cdf1b907adc8d44a33f25f25b8b1a18487f5ec379fb328c86d6283f7da7cedd8d35b80809e1cd5224522d51afa3e5f2402ac8663 SHA512 a251724deb35e756c81d2d3ac836d413b659acdce6c0acf479a4fca48934ab62ad399a884197d00dbb7e7558132a56be1c8efd553c0a644d329418272f809a46 diff --git a/dev-ml/ocamlnet/files/ocaml405.patch b/dev-ml/ocamlnet/files/ocaml405.patch deleted file mode 100644 index a112d1fb4473..000000000000 --- a/dev-ml/ocamlnet/files/ocaml405.patch +++ /dev/null @@ -1,145 +0,0 @@ -commit f3d451b81c4caa8cce7f55af6463ec685e79e227 -Author: Gerd Stolpmann <gerd@gerd-stolpmann.de> -Date: Sun Feb 26 21:04:49 2017 +0100 - - ocaml-4.05: support for O_KEEPEXEC - -diff --git a/code/src/netsys/Makefile b/code/src/netsys/Makefile -index cbc1ce2..cb70a09 100644 ---- a/code/src/netsys/Makefile -+++ b/code/src/netsys/Makefile -@@ -56,7 +56,7 @@ OCAMLC_OPTIONS_FOR_netsys_c_xdr.c = -ccopt -O - OCAMLC_OPTIONS += $(STRING_OPTS) - OCAMLOPT_OPTIONS += $(STRING_OPTS) - --PP_OPTIONS = -pp "$(CPPO) $(DEF_O_SHARE_DELETE) $(DEF_O_CLOEXEC) $(PP_BYTES) $(PP_DEPRECATED)" -+PP_OPTIONS = -pp "$(CPPO) $(DEF_O_SHARE_DELETE) $(DEF_O_CLOEXEC) $(DEF_O_KEEPEXEC) $(PP_BYTES) $(PP_DEPRECATED)" - - INSTALL_EXTRA += netsys_c_event.h $(OOH_OBJECT) - -diff --git a/code/src/netsys/configure b/code/src/netsys/configure -index 1325843..f4dbc09 100755 ---- a/code/src/netsys/configure -+++ b/code/src/netsys/configure -@@ -437,6 +437,21 @@ else - echo "no" - fi - -+###################################################################### -+ -+printf "Checking for O_KEEPEXEC... " -+mkdir -p tmp -+cat <<_EOF_ >tmp/t.ml -+let x = Unix.O_KEEPEXEC;; -+_EOF_ -+ -+def_o_keepexec="-D NO_O_KEEPEXEC" -+if ocaml unix.cma tmp/t.ml >/dev/null 2>/dev/null; then -+ echo "yes" -+ def_o_keepexec="-D HAVE_O_KEEPEXEC" -+else -+ echo "no" -+fi - - ###################################################################### - -@@ -445,6 +460,7 @@ cat <<EOF >Makefile.conf - NETSYS_LINK_OPTIONS = $netsys_link_options - DEF_O_SHARE_DELETE = $def_o_share_delete - DEF_O_CLOEXEC = $def_o_cloexec -+DEF_O_KEEPEXEC = $def_o_keepexec - OOH_OBJECT = $def_ooh_object - EOF - -diff --git a/code/src/netsys/netsys_c.c b/code/src/netsys/netsys_c.c -index a8b16be..4c30873 100644 ---- a/code/src/netsys/netsys_c.c -+++ b/code/src/netsys/netsys_c.c -@@ -448,32 +448,43 @@ static int at_flags_table[] = { - #ifndef O_RSYNC - #define O_RSYNC 0 - #endif --#ifndef O_CLOEXEC --#define NEED_CLOEXEC_EMULATION --#define O_CLOEXEC 0 --#endif - - static int open_flag_table[] = { - O_RDONLY, O_WRONLY, O_RDWR, O_NONBLOCK, O_APPEND, O_CREAT, O_TRUNC, O_EXCL, -- O_NOCTTY, O_DSYNC, O_SYNC, O_RSYNC, 0 /* O_SHARE_DELETE */, O_CLOEXEC -+ O_NOCTTY, O_DSYNC, O_SYNC, O_RSYNC, -+ 0 /* O_SHARE_DELETE */, 0 /* O_CLOEXEC */, 0 /* O_KEEPEXEC */ - }; - --#ifdef NEED_CLOEXEC_EMULATION -+enum { CLOEXEC = 1, KEEPEXEC = 2 }; -+ - static int open_cloexec_table[] = { -- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 -+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, CLOEXEC, KEEPEXEC - }; -+#ifndef HAVE_O_KEEPEXEC -+#define unix_cloexec_default 0 - #endif -+ - #endif - - CAMLprim value netsys_openat(value dirfd, value path, value flags, value perm) - { - #ifdef HAVE_AT - CAMLparam4(dirfd, path, flags, perm); -- int ret, cv_flags; -+ int ret, cv_flags, clo_flags, cloexec; - char * p; - - /* shamelessly copied from ocaml distro */ - cv_flags = convert_flag_list(flags, open_flag_table); -+ clo_flags = convert_flag_list(flags, open_cloexec_table); -+ if (clo_flags & CLOEXEC) -+ cloexec = 1; -+ else if (clo_flags & KEEPEXEC) -+ cloexec = 0; -+ else -+ cloexec = unix_cloexec_default; -+#if defined(O_CLOEXEC) -+ if (cloexec) cv_flags |= O_CLOEXEC; -+#endif - p = stat_alloc(string_length(path) + 1); - strcpy(p, String_val(path)); - enter_blocking_section(); -@@ -481,8 +492,8 @@ CAMLprim value netsys_openat(value dirfd, value path, value flags, value perm) - leave_blocking_section(); - stat_free(p); - if (ret == -1) uerror("openat", path); --#if defined(NEED_CLOEXEC_EMULATION) && defined(FD_CLOEXEC) -- if (convert_flag_list(flags, open_cloexec_table) != 0) { -+#if !defined(O_CLOEXEC) -+ { - int flags = fcntl(Int_val(dirfd), F_GETFD, 0); - if (flags == -1 || fcntl(Int_val(dirfd), F_SETFD, flags | FD_CLOEXEC) == -1) - uerror("openat", path); -diff --git a/code/src/netsys/netsys_posix.ml b/code/src/netsys/netsys_posix.ml -index 602ceae..3bf3e7c 100644 ---- a/code/src/netsys/netsys_posix.ml -+++ b/code/src/netsys/netsys_posix.ml -@@ -715,6 +715,12 @@ type at_flag = AT_EACCESS | AT_SYMLINK_NOFOLLOW | AT_SYMLINK_FOLLOW | - AT_REMOVEDIR - - (* The stubs assume these type definitions: *) -+#ifdef HAVE_O_KEEPEXEC -+type open_flag1 = Unix.open_flag = -+ O_RDONLY | O_WRONLY | O_RDWR | O_NONBLOCK | O_APPEND | O_CREAT | O_TRUNC -+ | O_EXCL | O_NOCTTY | O_DSYNC | O_SYNC | O_RSYNC | O_SHARE_DELETE -+ | O_CLOEXEC | O_KEEPEXEC -+#else - #ifdef HAVE_O_CLOEXEC - type open_flag1 = Unix.open_flag = - O_RDONLY | O_WRONLY | O_RDWR | O_NONBLOCK | O_APPEND | O_CREAT | O_TRUNC -@@ -731,6 +737,7 @@ type open_flag1 = Unix.open_flag = - | O_EXCL | O_NOCTTY | O_DSYNC | O_SYNC | O_RSYNC - #endif - #endif -+#endif - - type access_permission1 = Unix.access_permission = - R_OK | W_OK | X_OK | F_OK diff --git a/dev-ml/ocamlnet/files/ocamlnet-4.1.9-shuffle.patch b/dev-ml/ocamlnet/files/ocamlnet-4.1.9-shuffle.patch new file mode 100644 index 000000000000..6b7026faf1e0 --- /dev/null +++ b/dev-ml/ocamlnet/files/ocamlnet-4.1.9-shuffle.patch @@ -0,0 +1,11 @@ +--- a/Makefile.rules 2023-01-20 22:52:47.530898157 +0100 ++++ b/Makefile.rules 2023-01-20 22:53:09.370565670 +0100 +@@ -210,7 +210,7 @@ + # Set NODEP to "@true" in order to disable "depend". + + depend: $(DEP_FILES) +- $(NODEP) $(OCAMLDEP) *.ml *.mli >$@ || { rm -f $@; exit 1; } ++ $(NODEP) $(OCAMLDEP) -ml-synonym .mll *.ml *.mli >$@ || { rm -f $@; exit 1; } + + .PHONY: clean + clean:: genclean diff --git a/dev-ml/ocamlnet/files/ocamlnet-4.1.9-unboundLexer.patch b/dev-ml/ocamlnet/files/ocamlnet-4.1.9-unboundLexer.patch new file mode 100644 index 000000000000..416df217c035 --- /dev/null +++ b/dev-ml/ocamlnet/files/ocamlnet-4.1.9-unboundLexer.patch @@ -0,0 +1,10 @@ +--- a/src/rpc-generator/Makefile 2022-12-22 08:32:49.839794123 +0100 ++++ b/src/rpc-generator/Makefile 2022-12-22 08:34:48.185817182 +0100 +@@ -31,4 +31,7 @@ + rpcgen-packlist: + echo $(BINDIR)/ocamlrpcgen >rpcgen-packlist + ++main.cmo: lexer.cmo ++lexer.cmo: parser.cmo ++ + include depend diff --git a/dev-ml/ocamlnet/metadata.xml b/dev-ml/ocamlnet/metadata.xml index 196389cbbc7c..1cd5b462ca9d 100644 --- a/dev-ml/ocamlnet/metadata.xml +++ b/dev-ml/ocamlnet/metadata.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <email>ml@gentoo.org</email> + <name>ML</name> </maintainer> <use> <flag name="httpd">Enables net-httpd web server component</flag> diff --git a/dev-ml/ocamlnet/ocamlnet-4.1.4.ebuild b/dev-ml/ocamlnet/ocamlnet-4.1.4.ebuild deleted file mode 100644 index d6e4d239beb6..000000000000 --- a/dev-ml/ocamlnet/ocamlnet-4.1.4.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils findlib - -MY_P=${P/_beta/test} -DESCRIPTION="Modules for OCaml application-level Internet protocols" -HOMEPAGE="http://projects.camlcity.org/projects/ocamlnet.html" -SRC_URI="http://download.camlcity.org/download/${MY_P}.tar.gz" - -LICENSE="ZLIB GPL-2+" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd" -IUSE="gtk kerberos tk httpd +ocamlopt +pcre ssl zip" -RESTRICT="installsources strip" - -# the auth-dh compile flag has been disabled as well, since it depends on -# ocaml-cryptgps, which is not available. - -RDEPEND=">=dev-ml/findlib-1.0 - pcre? ( >=dev-ml/pcre-ocaml-5:= ) - >=dev-lang/ocaml-3.10.2:=[ocamlopt?] - tk? ( dev-ml/labltk:= ) - ssl? ( net-libs/gnutls:= ) - gtk? ( >=dev-ml/lablgtk-2:= ) - kerberos? ( virtual/krb5 ) - zip? ( dev-ml/camlzip:= ) - " -DEPEND="${RDEPEND} - virtual/pkgconfig -" - -S=${WORKDIR}/${MY_P} - -ocamlnet_use_with() { - if use $1; then - echo "-with-$2" - else - echo "-without-$2" - fi -} - -ocamlnet_use_enable() { - if use $1; then - echo "-enable-$2" - else - echo "-disable-$2" - fi -} - -src_configure() { - ./configure \ - -bindir /usr/bin \ - -datadir /usr/share/${PN} \ - $(ocamlnet_use_enable ssl gnutls) \ - $(ocamlnet_use_enable gtk gtk2) \ - $(ocamlnet_use_enable kerberos gssapi) \ - $(ocamlnet_use_enable pcre pcre) \ - $(ocamlnet_use_enable tk tcl) \ - $(ocamlnet_use_enable zip zip) \ - $(ocamlnet_use_with httpd nethttpd) \ - || die "Error : econf failed!" -} - -src_compile() { - emake -j1 all - if use ocamlopt; then - emake -j1 opt - fi -} diff --git a/dev-ml/ocamlnet/ocamlnet-4.1.3.ebuild b/dev-ml/ocamlnet/ocamlnet-4.1.8-r1.ebuild index d6e4d239beb6..5eb163cf9132 100644 --- a/dev-ml/ocamlnet/ocamlnet-4.1.3.ebuild +++ b/dev-ml/ocamlnet/ocamlnet-4.1.8-r1.ebuild @@ -1,38 +1,39 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=7 -inherit eutils findlib +inherit findlib toolchain-funcs MY_P=${P/_beta/test} DESCRIPTION="Modules for OCaml application-level Internet protocols" HOMEPAGE="http://projects.camlcity.org/projects/ocamlnet.html" SRC_URI="http://download.camlcity.org/download/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" LICENSE="ZLIB GPL-2+" SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd" -IUSE="gtk kerberos tk httpd +ocamlopt +pcre ssl zip" +KEYWORDS="amd64 ~ppc x86" +IUSE="kerberos tk httpd +ocamlopt +pcre ssl zip" RESTRICT="installsources strip" # the auth-dh compile flag has been disabled as well, since it depends on # ocaml-cryptgps, which is not available. -RDEPEND=">=dev-ml/findlib-1.0 - pcre? ( >=dev-ml/pcre-ocaml-5:= ) - >=dev-lang/ocaml-3.10.2:=[ocamlopt?] - tk? ( dev-ml/labltk:= ) - ssl? ( net-libs/gnutls:= ) - gtk? ( >=dev-ml/lablgtk-2:= ) - kerberos? ( virtual/krb5 ) - zip? ( dev-ml/camlzip:= ) - " -DEPEND="${RDEPEND} +BDEPEND=" + dev-ml/cppo virtual/pkgconfig " - -S=${WORKDIR}/${MY_P} +RDEPEND=" + >=dev-ml/findlib-1.0 + >=dev-lang/ocaml-3.10.2:=[ocamlopt?] + pcre? ( >=dev-ml/pcre-ocaml-5:= ) + tk? ( dev-ml/labltk:= ) + ssl? ( net-libs/gnutls:= ) + kerberos? ( virtual/krb5 ) + zip? ( dev-ml/camlzip:= ) +" +DEPEND="${RDEPEND}" ocamlnet_use_with() { if use $1; then @@ -55,13 +56,14 @@ src_configure() { -bindir /usr/bin \ -datadir /usr/share/${PN} \ $(ocamlnet_use_enable ssl gnutls) \ - $(ocamlnet_use_enable gtk gtk2) \ $(ocamlnet_use_enable kerberos gssapi) \ $(ocamlnet_use_enable pcre pcre) \ $(ocamlnet_use_enable tk tcl) \ $(ocamlnet_use_enable zip zip) \ $(ocamlnet_use_with httpd nethttpd) \ - || die "Error : econf failed!" + -cpp "$(tc-getPROG CPP cpp)" \ + -equeue-tcl-libs -ltcl \ + || die "Error: econf failed!" } src_compile() { @@ -70,3 +72,7 @@ src_compile() { emake -j1 opt fi } + +src_install() { + findlib_src_install +} diff --git a/dev-ml/ocamlnet/ocamlnet-4.1.2.ebuild b/dev-ml/ocamlnet/ocamlnet-4.1.9-r1.ebuild index a16de2e6b12f..60b4eea78ebf 100644 --- a/dev-ml/ocamlnet/ocamlnet-4.1.2.ebuild +++ b/dev-ml/ocamlnet/ocamlnet-4.1.9-r1.ebuild @@ -1,42 +1,44 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=7 -inherit eutils findlib +inherit findlib toolchain-funcs MY_P=${P/_beta/test} DESCRIPTION="Modules for OCaml application-level Internet protocols" HOMEPAGE="http://projects.camlcity.org/projects/ocamlnet.html" SRC_URI="http://download.camlcity.org/download/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" LICENSE="ZLIB GPL-2+" SLOT="0/${PV}" -KEYWORDS="amd64 ppc x86 x86-fbsd" -IUSE="gtk kerberos tk httpd +ocamlopt +pcre ssl zip" +KEYWORDS="amd64 ~ppc x86" +IUSE="kerberos tk httpd +ocamlopt +pcre ssl zip" RESTRICT="installsources strip" # the auth-dh compile flag has been disabled as well, since it depends on # ocaml-cryptgps, which is not available. -RDEPEND=">=dev-ml/findlib-1.0 - pcre? ( >=dev-ml/pcre-ocaml-5:= ) - >=dev-lang/ocaml-3.10.2:=[ocamlopt?] - tk? ( dev-ml/labltk:= ) - ssl? ( net-libs/gnutls:= ) - gtk? ( >=dev-ml/lablgtk-2:= ) - kerberos? ( virtual/krb5 ) - zip? ( dev-ml/camlzip:= ) - " -DEPEND="${RDEPEND} +BDEPEND=" + dev-ml/cppo virtual/pkgconfig " +RDEPEND=" + >=dev-ml/findlib-1.0 + >=dev-lang/ocaml-3.10.2:=[ocamlopt?] + pcre? ( >=dev-ml/pcre-ocaml-5:= ) + tk? ( dev-ml/labltk:= ) + ssl? ( net-libs/gnutls:= ) + kerberos? ( virtual/krb5 ) + zip? ( dev-ml/camlzip:= ) +" +DEPEND="${RDEPEND}" -S=${WORKDIR}/${MY_P} - -src_prepare() { - epatch "${FILESDIR}/ocaml405.patch" -} +PATCHES=( + "${FILESDIR}"/${P}-unboundLexer.patch + "${FILESDIR}"/${P}-shuffle.patch +) ocamlnet_use_with() { if use $1; then @@ -54,18 +56,27 @@ ocamlnet_use_enable() { fi } +src_prepare() { + sed -i \ + -e "s:^version.*$:version=${PV}:" \ + configure \ + || die + default +} + src_configure() { ./configure \ -bindir /usr/bin \ -datadir /usr/share/${PN} \ $(ocamlnet_use_enable ssl gnutls) \ - $(ocamlnet_use_enable gtk gtk2) \ $(ocamlnet_use_enable kerberos gssapi) \ $(ocamlnet_use_enable pcre pcre) \ $(ocamlnet_use_enable tk tcl) \ $(ocamlnet_use_enable zip zip) \ $(ocamlnet_use_with httpd nethttpd) \ - || die "Error : econf failed!" + -cpp "$(tc-getPROG CPP cpp)" \ + -equeue-tcl-libs -ltcl \ + || die "Error: econf failed!" } src_compile() { @@ -74,3 +85,7 @@ src_compile() { emake -j1 opt fi } + +src_install() { + findlib_src_install +} diff --git a/dev-ml/ocamlpam/Manifest b/dev-ml/ocamlpam/Manifest deleted file mode 100644 index 11bfb920c0ed..000000000000 --- a/dev-ml/ocamlpam/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ocamlpam-1.1.tar.gz 7739 BLAKE2B fcd6e7de8e948293f88a5fd8f7bda666334c80d580328dbbee1056a9dd5a788006a269adaf6eef419ef1f12a8641811f8c601146425a8ecbbc50dd25ed732fc8 SHA512 84199a1e94db93952fd058c3bf03865c058abc0bb5fe09b489717e7aa77687496d40d80ed00be99e59e58c13b044356a05cae5f5aebf4faec470b66696042762 diff --git a/dev-ml/ocamlpam/files/ocaml404.patch b/dev-ml/ocamlpam/files/ocaml404.patch deleted file mode 100644 index 4964edf951f4..000000000000 --- a/dev-ml/ocamlpam/files/ocaml404.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: ocamlpam-1.1/pam_stubs.c -=================================================================== ---- ocamlpam-1.1.orig/pam_stubs.c -+++ ocamlpam-1.1/pam_stubs.c -@@ -57,6 +57,7 @@ static int converse(int nMsg, const stru - struct pam_response * local_responses; - caml_pam_handle * h; - -+ CAMLparam0 (); - CAMLlocal1(ret); - - h = (caml_pam_handle *)data; diff --git a/dev-ml/ocamlpam/files/ocamlpam-1.1-makefile.patch b/dev-ml/ocamlpam/files/ocamlpam-1.1-makefile.patch deleted file mode 100644 index c9450b7f30dc..000000000000 --- a/dev-ml/ocamlpam/files/ocamlpam-1.1-makefile.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/Makefile 2012-09-14 22:46:11.508415083 +0200 -+++ b/Makefile 2012-09-14 22:46:34.526338371 +0200 -@@ -35,10 +35,13 @@ - - install: - install -d $(DESTDIR)/pam -- install -m 644 -t $(DESTDIR)/pam META *.mli *.cmi *.cmx *.cma *.cmxa *.a -+ install -m 644 -t $(DESTDIR)/pam META *.mli *.cmi *.cma *.a - install -d $(DESTDIR)/stublibs - install -m 644 -t $(DESTDIR)/stublibs dll$(BASENAME).so - -+install-opt: -+ install -m 644 -t $(DESTDIR)/pam *.cmx *.cmxa -+ - dist: clean - mkdir -p $(DISTNAME) - -cp * $(DISTNAME) diff --git a/dev-ml/ocamlpam/metadata.xml b/dev-ml/ocamlpam/metadata.xml deleted file mode 100644 index ffac4d7ebc01..000000000000 --- a/dev-ml/ocamlpam/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> -</maintainer> -</pkgmetadata> diff --git a/dev-ml/ocamlpam/ocamlpam-1.1.ebuild b/dev-ml/ocamlpam/ocamlpam-1.1.ebuild deleted file mode 100644 index 47682ef120aa..000000000000 --- a/dev-ml/ocamlpam/ocamlpam-1.1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib eutils - -DESCRIPTION="OCamlPAM - an OCaml library for PAM" -HOMEPAGE="http://sharvil.nanavati.net/projects/ocamlpam/" -SRC_URI="http://sharvil.nanavati.net/projects/${PN}/files/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="+ocamlopt" - -DEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?] - sys-libs/pam" -RDEPEND="${DEPEND}" - -src_prepare() { - epatch "${FILESDIR}/${P}-makefile.patch" - has_version '>=dev-lang/ocaml-4.04_beta' && epatch "${FILESDIR}/ocaml404.patch" -} - -src_compile() { - emake META - emake byte - use ocamlopt && emake opt -} - -src_install() { - findlib_src_preinst - emake DESTDIR="${OCAMLFIND_DESTDIR}" install - use ocamlopt && emake DESTDIR="${OCAMLFIND_DESTDIR}" install-opt - dodoc CHANGES README -} diff --git a/dev-ml/ocamlsdl/files/ocamlsdl-0.9.1-fix-ocaml-4.09.0-compilation.patch b/dev-ml/ocamlsdl/files/ocamlsdl-0.9.1-fix-ocaml-4.09.0-compilation.patch new file mode 100644 index 000000000000..d8085a8289bc --- /dev/null +++ b/dev-ml/ocamlsdl/files/ocamlsdl-0.9.1-fix-ocaml-4.09.0-compilation.patch @@ -0,0 +1,28 @@ +https://sources.debian.org/patches/ocamlsdl/0.9.1-3/0002-Fix-compilation-with-OCaml-4.08.0.patch/ +From: Stephane Glondu <steph@glondu.net> +Date: Fri, 6 Sep 2019 09:35:32 +0200 +Subject: Fix compilation with OCaml 4.08.0 + +--- + src/sdlmouse.ml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/sdlmouse.ml b/src/sdlmouse.ml +index 5d3120b..39cc58d 100644 +--- a/src/sdlmouse.ml ++++ b/src/sdlmouse.ml +@@ -49,12 +49,12 @@ external cursor_data : cursor -> cursor_data + = "ml_SDL_Cursor_data" + + let string_of_bits x = +- let s = String.make 8 ' ' in ++ let s = Bytes.make 8 ' ' in + for i=0 to 7 do + if x land (1 lsl i) <> 0 + then s.[7-i] <- '@' + done ; +- s ++ Bytes.to_string s + + let pprint_cursor c = + let { data = data ; mask = mask } = cursor_data c in diff --git a/dev-ml/ocamlsdl/files/ocamlopt.patch b/dev-ml/ocamlsdl/files/ocamlsdl-0.9.1-ocamlopt.patch index 603654dceffa..603654dceffa 100644 --- a/dev-ml/ocamlsdl/files/ocamlopt.patch +++ b/dev-ml/ocamlsdl/files/ocamlsdl-0.9.1-ocamlopt.patch diff --git a/dev-ml/ocamlsdl/metadata.xml b/dev-ml/ocamlsdl/metadata.xml index 1f516f3074c3..081e3c7960e1 100644 --- a/dev-ml/ocamlsdl/metadata.xml +++ b/dev-ml/ocamlsdl/metadata.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="sourceforge">ocamlsdl</remote-id> diff --git a/dev-ml/ocamlsdl/ocamlsdl-0.9.1.ebuild b/dev-ml/ocamlsdl/ocamlsdl-0.9.1.ebuild index a18399af37b0..ae6b805fe014 100644 --- a/dev-ml/ocamlsdl/ocamlsdl-0.9.1.ebuild +++ b/dev-ml/ocamlsdl/ocamlsdl-0.9.1.ebuild @@ -1,18 +1,17 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit findlib eutils +inherit findlib DESCRIPTION="OCaml SDL Bindings" - HOMEPAGE="http://ocamlsdl.sourceforge.net" -SRC_URI="mirror://sourceforge/ocamlsdl/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/ocamlsdl/${P}.tar.gz" LICENSE="LGPL-2" SLOT="0/${PV}" -KEYWORDS="~amd64 ppc x86" +KEYWORDS="~amd64 ~ppc x86" IUSE="doc +ocamlopt opengl truetype" #noimage nomixer RDEPEND=" @@ -25,18 +24,19 @@ RDEPEND=" " DEPEND="${RDEPEND}" -src_prepare() { - epatch "${FILESDIR}/ocamlopt.patch" -} +PATCHES=( + "${FILESDIR}/${PN}-0.9.1-ocamlopt.patch" + "${FILESDIR}/${PN}-0.9.1-fix-ocaml-4.09.0-compilation.patch" +) src_configure() { myconf="" if use opengl; then - destdir=`ocamlfind printconf destdir` - lablgldir=`find ${destdir} -name "lablgl" -or -name "lablGL"` + destdir=$(ocamlfind printconf destdir) + lablgldir=$(find ${destdir} -name "lablgl" -or -name "lablGL") if [ -z "${lablgldir}" ]; then - destdir=`ocamlc -where` - lablgldir=`find ${destdir} -name "lablgl" -or -name "lablGL"` + destdir=$(ocamlc -where) + lablgldir=$(find ${destdir} -name "lablgl" -or -name "lablGL") fi if [ ! -z "${lablgldir}" ]; then @@ -47,8 +47,15 @@ src_configure() { #use noimage && myconf="${myconf} --without-sdl-image" #use nomixer && myconf="${myconf} --without-sdl-mixer" - econf $myconf \ - `use_enable truetype sdl-ttf` + econf \ + $myconf \ + $(use_enable truetype sdl-ttf) + if ! use opengl; then + sed -i \ + -e 's:LABLGLDIR:FALSE:' \ + src/Makefile \ + || die + fi } src_install() { @@ -58,6 +65,7 @@ src_install() { doinfo doc/*.info* if use doc; then - dohtml doc/html/* + docinto html + dodoc doc/html/* fi } diff --git a/dev-ml/ocamlweb/Manifest b/dev-ml/ocamlweb/Manifest index ca1439647035..dfe53991c1d9 100644 --- a/dev-ml/ocamlweb/Manifest +++ b/dev-ml/ocamlweb/Manifest @@ -1 +1 @@ -DIST ocamlweb-1.39.tar.gz 141866 BLAKE2B 14ab9c595133d34d9711da2232fdf6a89a7b134ec2537e70d6ee6ecbfdb19a8bfb6a1a7aed6207cbb1bbe1f5e7b651d33fed35d8f26129d69e29dc5995d5c342 SHA512 f4e2d330222378b632ace70efb7062c93002a85db6dc9a821706a76a1e1c00da4d4e82e618f162584003b821bc72d2d11508ae22474db61cc4367ed528d21d50 +DIST ocamlweb-1.41.tar.gz 141844 BLAKE2B b89b20bdc8b99d34069b2e32a6bd8c9684e294fba667a4b74080b34f37c6d90432c61e71e27f4f1772cda8a26891655bd99a21defa584f4a1c68ae1e0d58d454 SHA512 7a6403f8b0de3feeef9657e8aff10e6f1fe29edc400ce3f11c6435d6350314423fb74e192e4275a9ad47170019d6a960daf74f245539f0f3f2a6072cc7195442 diff --git a/dev-ml/ocamlweb/files/ocamlweb-1.41-ocaml-4.08.0.patch b/dev-ml/ocamlweb/files/ocamlweb-1.41-ocaml-4.08.0.patch new file mode 100644 index 000000000000..b8da9e02b032 --- /dev/null +++ b/dev-ml/ocamlweb/files/ocamlweb-1.41-ocaml-4.08.0.patch @@ -0,0 +1,53 @@ +From: Stephane Glondu <steph@glondu.net> +Date: Fri, 6 Sep 2019 09:53:22 +0200 +Subject: Fix compilation with OCaml 4.08.0 + +--- + web.ml | 18 ++++++++++-------- + 1 file changed, 10 insertions(+), 8 deletions(-) + +diff --git a/web.ml b/web.ml +index 7dc1470..6f9ca51 100644 +--- a/web.ml ++++ b/web.ml +@@ -247,14 +247,16 @@ let norm_string s = + + let alpha_string s1 s2 = + match what_is_first_char s1, what_is_first_char s2 with +- | Symbol, Symbol -> s1 < s2 +- | Symbol, _ -> true +- | _, Symbol -> false +- | _,_ -> norm_string s1 < norm_string s2 ++ | Symbol, Symbol -> compare s1 s2 ++ | Symbol, _ -> -1 ++ | _, Symbol -> 1 ++ | _,_ -> compare (norm_string s1) (norm_string s2) ++ ++let ( ++ ) c1 c2 = ++ if c1 = 0 then c2 else c1 + + let order_entry e1 e2 = +- (alpha_string e1.e_name e2.e_name) || +- (e1.e_name = e2.e_name && e1.e_type < e2.e_type) ++ alpha_string e1.e_name e2.e_name ++ compare e1.e_type e2.e_type + + (*s The following function collects all the index entries and sort them + using [alpha_string], returning a list. *) +@@ -264,7 +266,7 @@ module Idset = Set.Make(struct type t = index_entry let compare = compare end) + let all_entries () = + let s = Idmap.fold (fun x _ s -> Idset.add x s) !used Idset.empty in + let s = Idmap.fold (fun x _ s -> Idset.add x s) !defined s in +- Sort.list order_entry (Idset.elements s) ++ List.sort order_entry (Idset.elements s) + + + (*s When we are in \LaTeX\ style, an index entry only consists in two lists +@@ -324,7 +326,7 @@ let list_in_table id t = + try + let l = Whereset.elements (Idmap.find id t) in + let l = map_succeed_nf find_where l in +- let l = Sort.list (fun x x' -> snd x < snd x') l in ++ let l = List.sort (fun x x' -> compare (snd x) (snd x')) l in + uniquize l + with Not_found -> + [] diff --git a/dev-ml/ocamlweb/files/ocamlweb-1.37-strip.patch b/dev-ml/ocamlweb/files/ocamlweb-1.41-strip.patch index 393391fe52ce..1cb407a4a51e 100644 --- a/dev-ml/ocamlweb/files/ocamlweb-1.37-strip.patch +++ b/dev-ml/ocamlweb/files/ocamlweb-1.41-strip.patch @@ -1,11 +1,9 @@ -Index: ocamlweb-1.37/Makefile.in -=================================================================== ---- ocamlweb-1.37.orig/Makefile.in -+++ ocamlweb-1.37/Makefile.in -@@ -61,14 +61,12 @@ byte: ocamlweb.byte +--- ocamlweb-1.41-orig/Makefile.in 2019-01-25 20:54:14.000000000 +1100 ++++ ocamlweb-1.41/Makefile.in 2020-10-12 19:49:20.490860201 +1100 +@@ -61,14 +61,12 @@ ocamlweb: $(CAML_CMX) $(CAMLLEX_CMX) $(CMX) - $(CAMLCOPT) $(OPTFLAGS) -o $@ $(CAML_CMX) $(CAMLLEX_CMX) $(CMX) + $(CAMLCOPT) $(OPTFLAGS) -o $@ -I +compiler-libs ocamloptcomp.cmxa $(CAML_CMX) $(CAMLLEX_CMX) $(CMX) - strip ocamlweb ocamlweb.byte: $(CAML_CMO) $(CAMLLEX_CMO) $(CMO) diff --git a/dev-ml/ocamlweb/metadata.xml b/dev-ml/ocamlweb/metadata.xml index ffac4d7ebc01..ff5a0cd1ae3d 100644 --- a/dev-ml/ocamlweb/metadata.xml +++ b/dev-ml/ocamlweb/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> -</maintainer> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> </pkgmetadata> diff --git a/dev-ml/ocamlweb/ocamlweb-1.39.ebuild b/dev-ml/ocamlweb/ocamlweb-1.39.ebuild deleted file mode 100644 index 96baba9aa4c2..000000000000 --- a/dev-ml/ocamlweb/ocamlweb-1.39.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit latex-package eutils base - -DESCRIPTION="O'Caml literate programming tool" -HOMEPAGE="http://www.lri.fr/~filliatr/ocamlweb/" -SRC_URI="http://www.lri.fr/~filliatr/ftp/ocamlweb/${P}.tar.gz" - -IUSE="" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ppc x86" - -DEPEND=">=dev-lang/ocaml-3.09:= - virtual/latex-base - dev-texlive/texlive-latexextra - " - -PATCHES=( - "${FILESDIR}/${PN}-1.37-strip.patch" - ) - -src_compile() { - emake -} - -src_install() { - emake UPDATETEX="" prefix="${D}/usr" MANDIR="${D}/usr/share/man" BASETEXDIR="${D}/${TEXMF}" install - dodoc README CHANGES -} diff --git a/dev-ml/ocamlweb/ocamlweb-1.41-r1.ebuild b/dev-ml/ocamlweb/ocamlweb-1.41-r1.ebuild new file mode 100644 index 000000000000..50d07a216410 --- /dev/null +++ b/dev-ml/ocamlweb/ocamlweb-1.41-r1.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit latex-package + +DESCRIPTION="O'Caml literate programming tool" +HOMEPAGE="https://www.lri.fr/~filliatr/ocamlweb/" +SRC_URI="https://www.lri.fr/~filliatr/ftp/ocamlweb/${P}.tar.gz" + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="test" + +RESTRICT="!test? ( test )" + +DEPEND=">=dev-lang/ocaml-4.08.0:= + virtual/latex-base + dev-texlive/texlive-latexextra" +RDEPEND="${DEPEND}" +BDEPEND="test? ( dev-tex/hevea )" + +PATCHES=( + "${FILESDIR}/${PN}-1.41-strip.patch" + "${FILESDIR}/${PN}-1.41-ocaml-4.08.0.patch" +) + +QA_FLAGS_IGNORED=/usr/bin/ocamlweb + +src_compile() { + default +} + +src_install() { + emake UPDATETEX="" prefix="${D}/usr" MANDIR="${D}/usr/share/man" BASETEXDIR="${D}/${TEXMF}" install + dodoc README CHANGES +} diff --git a/dev-ml/ocplib-endian/Manifest b/dev-ml/ocplib-endian/Manifest index 8add618f0052..2c8040fa1750 100644 --- a/dev-ml/ocplib-endian/Manifest +++ b/dev-ml/ocplib-endian/Manifest @@ -1 +1,2 @@ -DIST ocplib-endian-1.0.tar.gz 62753 BLAKE2B d343343eb22b7ff591219ad0d45502e3450cd4200d8f3cc7f8a4783bdd93752d015b686b57aa574f58344dc44cec751ba89e68f93770ca5df73a98d95a604b8d SHA512 a08fd58ec5e72510c40e8b75e0ee8327ee658f479e45dd4632bc04e3907d04aaa3684df3b993ab63fc2a6c1f1a4fb32784e9b5258730d3b89a716300522d8d7f +DIST ocplib-endian-1.1.tar.gz 17544 BLAKE2B 62e4b1cb998ac00fd3cfd7178939b6c9f8c1bebe7c0dc072fbb45b79172cb07f4466e5f1e6e93b41e3fb8c3df8020d2033eb24abfec4906d3ad003fa22bdcd27 SHA512 39351c666d1394770696fa89ac62f7c137ad1697d99888bfba2cc8de2c61df05dd8b3aa327c117bf38f3e29e081026d2c575c5ad0022bde92b3d43aba577d3f9 +DIST ocplib-endian-1.2.tar.gz 18061 BLAKE2B 25354888f80ec4d09b9605f293b121dd66d365a461d2e40d9c3d41afa56303562d5db03a469469c1d59d304dd0d47657381c2f42b9e4935005c2ce85fbd5b80a SHA512 2e70be5f3d6e377485c60664a0e235c3b9b24a8d6b6a03895d092c6e40d53810bfe1f292ee69e5181ce6daa8a582bfe3d59f3af889f417134f658812be5b8b85 diff --git a/dev-ml/ocplib-endian/metadata.xml b/dev-ml/ocplib-endian/metadata.xml index d9f3d24ca31c..dba7c4cb7a86 100644 --- a/dev-ml/ocplib-endian/metadata.xml +++ b/dev-ml/ocplib-endian/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">OCamlPro/ocplib-endian</remote-id> - </upstream> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">OCamlPro/ocplib-endian</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-ml/ocplib-endian/ocplib-endian-1.0.ebuild b/dev-ml/ocplib-endian/ocplib-endian-1.1-r1.ebuild index c3947fbc9c87..36f30adca481 100644 --- a/dev-ml/ocplib-endian/ocplib-endian-1.0.ebuild +++ b/dev-ml/ocplib-endian/ocplib-endian-1.1-r1.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -OASIS_BUILD_TESTS=1 +EAPI=7 -inherit oasis +inherit dune DESCRIPTION="Functions to read and write int16/32/64 from strings, bytes, and bigarrays" HOMEPAGE="https://github.com/OCamlPro/ocplib-endian" @@ -12,13 +11,10 @@ SRC_URI="https://github.com/OCamlPro/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="LGPL-2.1-with-linking-exception" SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt" -DEPEND=" - >=dev-lang/ocaml-4.01 - >=dev-ml/cppo-1.1.0 -" -RDEPEND="" +# 2 of 70 tests fail +RESTRICT="test" -DOCS=( CHANGES.md COPYING.txt README.md ) +BDEPEND=">=dev-ml/cppo-1.6.6" diff --git a/dev-ml/ocplib-endian/ocplib-endian-1.2.ebuild b/dev-ml/ocplib-endian/ocplib-endian-1.2.ebuild new file mode 100644 index 000000000000..7e02940b59a7 --- /dev/null +++ b/dev-ml/ocplib-endian/ocplib-endian-1.2.ebuild @@ -0,0 +1,20 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Functions to read and write int16/32/64 from strings, bytes, and bigarrays" +HOMEPAGE="https://github.com/OCamlPro/ocplib-endian" +SRC_URI="https://github.com/OCamlPro/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1-with-linking-exception" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +# 2 of 70 tests fail +RESTRICT="test" + +BDEPEND=">=dev-ml/cppo-1.6.6" diff --git a/dev-ml/ocplib-simplex/Manifest b/dev-ml/ocplib-simplex/Manifest index aba0025144b2..9ca9b54b0f34 100644 --- a/dev-ml/ocplib-simplex/Manifest +++ b/dev-ml/ocplib-simplex/Manifest @@ -1,2 +1,2 @@ -DIST ocplib-simplex-0.3.tar.gz 31013 BLAKE2B 30d1541f15bf9d2c55f51ed565f2feb63c2b0fbe0095c15849a22df0876ad992a3e6c15924dbbe5a798ab278c7e171e30cda815b1de2ec9bc19fc92bbe79ad95 SHA512 43373deb6e921a31526c27d33808c3520b4f375caf9e5237179db0e8d84b5be3bf43e061e2d991fc6de694958c64c7ede0b258400fb921c4139664e367958630 +DIST ocplib-simplex-0.4.1.tar.gz 31955 BLAKE2B bddcf1f83dfd64fd7da3564cbb3fcb9f8e50ad4106ec03b6881315edd6106bb2f691dbe8f288121c351fa7e861fdddb9a818ce4527ab960a9c7109af49d97761 SHA512 6436a904f4e0ec4efa13592185764b58142296816855562d9c2c6d360b64ab554bbd95314976e0462fbb2ed145f8915fd9c2f63f7bae66063efb4c51f74f3edb DIST ocplib-simplex-0.4.tar.gz 31784 BLAKE2B 89ebb43ba59debc658b1400b24379dcb717f44f484742a4ea2227e1692f2d1d359469add4e3c22bd15b7a5044e4d45877994b40e80f28ec8639989bf28565d9a SHA512 5eb80f0c8ad32291d24423255c0359e139cd85e2262b0cbbfaffcab66d9a7eb66c9bf04bb9d5d5c103574ec7041a72cde5412e6cb03fc9fe4a8fd257dab49a76 diff --git a/dev-ml/ocplib-simplex/files/ocplib-simplex-0.4-flags.patch b/dev-ml/ocplib-simplex/files/ocplib-simplex-0.4-flags.patch new file mode 100644 index 000000000000..ac76488238d4 --- /dev/null +++ b/dev-ml/ocplib-simplex/files/ocplib-simplex-0.4-flags.patch @@ -0,0 +1,48 @@ +--- a/Makefile.in 2020-06-13 22:27:11.971906805 +0200 ++++ b/Makefile.in 2020-06-13 22:28:14.193938195 +0200 +@@ -73,19 +73,19 @@ + opt: src/$(LIBNAME).cma src/$(LIBNAME).cmxa src/$(LIBNAME).cmxs + + src/$(LIBNAME).cma: src/$(LIBNAME).cmo +- $(OCAMLC) -a $(BFLAGS_LIGHT) -o $@ $^ ++ $(OCAMLC) -a $(BFLAGS_LIGHT) -ccopt "$(CFLAGS)" -o $@ $^ + + src/$(LIBNAME).cmxa: src/$(LIBNAME).cmx +- $(OCAMLOPT) -a $(OFLAGS_LIGHT) -o $@ $^ ++ $(OCAMLOPT) -a $(OFLAGS_LIGHT) -ccopt "$(CFLAGS)" -o $@ $^ + + src/$(LIBNAME).cmxs: src/$(LIBNAME).cmx +- $(OCAMLOPT) -shared $(OFLAGS_LIGHT) -o $@ $^ ++ $(OCAMLOPT) -shared $(OFLAGS_LIGHT) -ccopt "$(CFLAGS)" -cclib "$(LDFLAGS)" -o $@ $^ + + src/$(LIBNAME).cmo: $(CMO) # src/$(LIBNAME).cmi +- $(OCAMLC) $(BFLAGS_LIGHT) -pack -o src/$(LIBNAME).cmo $^ ++ $(OCAMLC) $(BFLAGS_LIGHT) -ccopt "$(CFLAGS)" -pack -o src/$(LIBNAME).cmo $^ + + src/$(LIBNAME).cmx: $(CMX) # src/$(LIBNAME).cmi +- $(OCAMLOPT) $(OFLAGS_LIGHT) -pack -o src/$(LIBNAME).cmx $^ ++ $(OCAMLOPT) $(OFLAGS_LIGHT) -pack -ccopt "$(CFLAGS)" -o src/$(LIBNAME).cmx $^ + + src/extSigs.ml: src/extSigs.mli + cp src/extSigs.mli src/extSigs.ml +@@ -125,16 +125,16 @@ + .SUFFIXES: .mli .ml .cmi .cmo .cmx .mll .mly .tex .dvi .ps .html + + .mli.cmi: +- $(OCAMLC) -c $(BFLAGS) $< ++ $(OCAMLC) -c $(BFLAGS) -ccopt "$(CFLAGS)" $< + + .ml.cmo: +- $(OCAMLC) -c $(BFLAGS) $< ++ $(OCAMLC) -c $(BFLAGS) -ccopt "$(CFLAGS)" $< + + .ml.o: +- $(OCAMLOPT) -c $(OFLAGS) $< ++ $(OCAMLOPT) -c $(OFLAGS) -ccopt "$(CFLAGS)" $< + + .ml.cmx: +- $(OCAMLOPT) -c $(OFLAGS) $< ++ $(OCAMLOPT) -c $(OFLAGS) -ccopt "$(CFLAGS)" $< + + .mll.ml: + $(OCAMLLEX) $< > /dev/null diff --git a/dev-ml/ocplib-simplex/metadata.xml b/dev-ml/ocplib-simplex/metadata.xml index 01c5e44dd808..56efe7f946ea 100644 --- a/dev-ml/ocplib-simplex/metadata.xml +++ b/dev-ml/ocplib-simplex/metadata.xml @@ -1,12 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>tupone@gentoo.org</email> - <name>Tupone Alfredo</name> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> </maintainer> <longdescription lang="en"> A library implementing a simplex algorithm, in a functional style, for solving systems of linear inequalities </longdescription> + <upstream> + <remote-id type="github">OCamlPro-Iguernlala/ocplib-simplex</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-ml/ocplib-simplex/ocplib-simplex-0.3.ebuild b/dev-ml/ocplib-simplex/ocplib-simplex-0.3.ebuild deleted file mode 100644 index f04ed1fed37c..000000000000 --- a/dev-ml/ocplib-simplex/ocplib-simplex-0.3.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools findlib multilib - -DESCRIPTION="A library implementing a simplex algorithm" -HOMEPAGE="https://github.com/OCamlPro-Iguernlala/ocplib-simplex" -SRC_URI="https://github.com/OCamlPro-Iguernlala/${PN}/archive/${PV}.tar.gz - -> ${P}.tar.gz" - -LICENSE="LGPL-2.1-with-linking-exception" -SLOT="0" -KEYWORDS="amd64" -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND}" - -DOCS="CHANGES.md README.md extra/simplex_invariants.txt extra/TODO.txt" - -src_prepare() { - default - mv configure.{in,ac} || die - sed -i -e "s:configure.in:configure.ac:g" \ - Makefile.in - eautoreconf -} - -src_install() { - findlib_src_install LIBDIR="${D}"usr/"$(get_libdir)"/ocaml -} diff --git a/dev-ml/ocplib-simplex/ocplib-simplex-0.4.1.ebuild b/dev-ml/ocplib-simplex/ocplib-simplex-0.4.1.ebuild new file mode 100644 index 000000000000..5eb51f246ca3 --- /dev/null +++ b/dev-ml/ocplib-simplex/ocplib-simplex-0.4.1.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools findlib + +DESCRIPTION="A library implementing a simplex algorithm" +HOMEPAGE="https://github.com/OCamlPro-Iguernlala/ocplib-simplex" +SRC_URI="https://github.com/OCamlPro-Iguernlala/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1-with-linking-exception" +SLOT="0" +KEYWORDS="amd64" + +DOCS=( CHANGES.md README.md extra/simplex_invariants.txt extra/TODO.txt ) + +PATCHES=( + "${FILESDIR}"/${PN}-0.4-flags.patch +) + +QA_FLAGS_IGNORED=( + /usr/lib64/ocaml/ocplib-simplex/ocplibSimplex.cmxs +) + +src_prepare() { + default + mv configure.{in,ac} || die + sed -i -e "s:configure.in:configure.ac:g" \ + Makefile.in || die + eautoreconf +} + +src_install() { + findlib_src_install LIBDIR="${D}"/usr/"$(get_libdir)"/ocaml +} diff --git a/dev-ml/ocplib-simplex/ocplib-simplex-0.4.ebuild b/dev-ml/ocplib-simplex/ocplib-simplex-0.4.ebuild index eb9269280d79..048bdf309541 100644 --- a/dev-ml/ocplib-simplex/ocplib-simplex-0.4.ebuild +++ b/dev-ml/ocplib-simplex/ocplib-simplex-0.4.ebuild @@ -1,30 +1,33 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools findlib multilib +inherit autotools findlib DESCRIPTION="A library implementing a simplex algorithm" HOMEPAGE="https://github.com/OCamlPro-Iguernlala/ocplib-simplex" -SRC_URI="https://github.com/OCamlPro-Iguernlala/${PN}/archive/v${PV}.tar.gz - -> ${P}.tar.gz" +SRC_URI="https://github.com/OCamlPro-Iguernlala/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="LGPL-2.1-with-linking-exception" SLOT="0" -KEYWORDS="~amd64" -IUSE="" +KEYWORDS="amd64" -DEPEND="" -RDEPEND="${DEPEND}" +DOCS=( CHANGES.md README.md extra/simplex_invariants.txt extra/TODO.txt ) -DOCS="CHANGES.md README.md extra/simplex_invariants.txt extra/TODO.txt" +PATCHES=( + "${FILESDIR}"/${P}-flags.patch +) + +QA_FLAGS_IGNORED=( + /usr/lib64/ocaml/ocplib-simplex/ocplibSimplex.cmxs +) src_prepare() { default mv configure.{in,ac} || die sed -i -e "s:configure.in:configure.ac:g" \ - Makefile.in + Makefile.in || die eautoreconf } diff --git a/dev-ml/ocsigen-i18n/Manifest b/dev-ml/ocsigen-i18n/Manifest deleted file mode 100644 index ec4ab56cf268..000000000000 --- a/dev-ml/ocsigen-i18n/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ocsigen-i18n-3.1.0.tar.gz 6066 BLAKE2B 80c905a8b332a0b83c6184581b97c4766dc1059770eb5832881eb00a0201b2d093bf15b48432c2ed17a26b719afe0ebb919ea971eb75a7b3f99b5e600c0e79d2 SHA512 a103c8da39ffadbe90ef183ee9ad3b68f3b5feb8dd5cf9d94f37880dcfedd495bbe799e218e739eb830e8dc7c8636edbd8c00ce9c0843ecf8047f9eb00b9f18f diff --git a/dev-ml/ocsigen-i18n/metadata.xml b/dev-ml/ocsigen-i18n/metadata.xml deleted file mode 100644 index d19446036e3e..000000000000 --- a/dev-ml/ocsigen-i18n/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">besport/ocsigen-i18n</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/ocsigen-i18n/ocsigen-i18n-3.1.0.ebuild b/dev-ml/ocsigen-i18n/ocsigen-i18n-3.1.0.ebuild deleted file mode 100644 index ab2fac7140f3..000000000000 --- a/dev-ml/ocsigen-i18n/ocsigen-i18n-3.1.0.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="I18n made easy for web sites written with eliom" -HOMEPAGE="https://github.com/besport/ocsigen-i18n" -SRC_URI="https://github.com/besport/ocsigen-i18n/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND="dev-lang/ocaml:=" -DEPEND="${RDEPEND} - dev-ml/findlib" - -src_install() { - dodir /usr/bin - emake bindir="${ED}/usr/bin" install || die - dodoc README.MD -} diff --git a/dev-ml/ocsigen-start/Manifest b/dev-ml/ocsigen-start/Manifest deleted file mode 100644 index 8f6da76bb99f..000000000000 --- a/dev-ml/ocsigen-start/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ocsigen-start-1.0.0.tar.gz 1024594 BLAKE2B d654c123eaa06525334109d1b826d0e7cbd89e73bd979e36d9d6f141d81de80b3b153e5a7c1bc81e166b3055f03c9792e3e3bc0918c262fcdd549b107cd2e5e9 SHA512 983253d7732f4b81919aed1f499a8c54d8a82b5595f33f324ad7218a332cdd8eb2de4c0e21f9d54919cc1b35b5dc2b6789a03c7cec11b909340f009e9facb3cf diff --git a/dev-ml/ocsigen-start/metadata.xml b/dev-ml/ocsigen-start/metadata.xml deleted file mode 100644 index 8757698182df..000000000000 --- a/dev-ml/ocsigen-start/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">ocsigen/ocsigen-start</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/ocsigen-start/ocsigen-start-1.0.0.ebuild b/dev-ml/ocsigen-start/ocsigen-start-1.0.0.ebuild deleted file mode 100644 index 0bc813010ad6..000000000000 --- a/dev-ml/ocsigen-start/ocsigen-start-1.0.0.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib - -DESCRIPTION="Eliom Base Application with users, (pre)registration, notifications, etc." -HOMEPAGE="https://github.com/ocsigen/ocsigen-start" - -LICENSE="LGPL-3" -SLOT="0/${PV}" -IUSE="" - -if [ "${PV#9999}" != "${PV}" ] ; then - inherit git-r3 - SRC_URI="" - EGIT_REPO_URI="https://github.com/ocsigen/ocsigen-start" - KEYWORDS="" -else - SRC_URI="https://github.com/ocsigen/ocsigen-start/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" -fi - -RDEPEND="dev-lang/ocaml:= - dev-ml/pgocaml:= - dev-ml/macaque:= - dev-ml/ocaml-safepass:= - >=dev-ml/eliom-6.2:= - dev-ml/ocsigen-toolkit:= - dev-ml/ppx_deriving:= - dev-ml/yojson:= - dev-ml/OCaml-ImageMagick:= -" -DEPEND="${RDEPEND}" - -src_install() { - findlib_src_preinst - DESTDIR="${ED}" OCAMLPATH="${OCAMLFIND_DESTDIR}" emake install - dodoc README.md -} diff --git a/dev-ml/ocsigen-start/ocsigen-start-9999.ebuild b/dev-ml/ocsigen-start/ocsigen-start-9999.ebuild deleted file mode 100644 index 0bc813010ad6..000000000000 --- a/dev-ml/ocsigen-start/ocsigen-start-9999.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib - -DESCRIPTION="Eliom Base Application with users, (pre)registration, notifications, etc." -HOMEPAGE="https://github.com/ocsigen/ocsigen-start" - -LICENSE="LGPL-3" -SLOT="0/${PV}" -IUSE="" - -if [ "${PV#9999}" != "${PV}" ] ; then - inherit git-r3 - SRC_URI="" - EGIT_REPO_URI="https://github.com/ocsigen/ocsigen-start" - KEYWORDS="" -else - SRC_URI="https://github.com/ocsigen/ocsigen-start/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" -fi - -RDEPEND="dev-lang/ocaml:= - dev-ml/pgocaml:= - dev-ml/macaque:= - dev-ml/ocaml-safepass:= - >=dev-ml/eliom-6.2:= - dev-ml/ocsigen-toolkit:= - dev-ml/ppx_deriving:= - dev-ml/yojson:= - dev-ml/OCaml-ImageMagick:= -" -DEPEND="${RDEPEND}" - -src_install() { - findlib_src_preinst - DESTDIR="${ED}" OCAMLPATH="${OCAMLFIND_DESTDIR}" emake install - dodoc README.md -} diff --git a/dev-ml/ocsigen-toolkit/Manifest b/dev-ml/ocsigen-toolkit/Manifest deleted file mode 100644 index bbece6655d0d..000000000000 --- a/dev-ml/ocsigen-toolkit/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ocsigen-toolkit-1.0.0.tar.gz 69175 BLAKE2B f23dd64a8f8a9c735db3bfd3d60cfe6306354a208fb4b1ee384271a0f8b2fc120afcaa522d1432553ebba90c80639a5980c09c820c6063cbb093998814520410 SHA512 4776dcceef822ac63fd6d57ce05e870f726c1e1d137bab239b8558acb4ef55f97b847825f621414334b01d30c066ea986d2b8180b80a09719b5b76cb3bb69a20 diff --git a/dev-ml/ocsigen-toolkit/metadata.xml b/dev-ml/ocsigen-toolkit/metadata.xml deleted file mode 100644 index 5539bc3ee579..000000000000 --- a/dev-ml/ocsigen-toolkit/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">ocsigen/ocsigen-toolkit</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/ocsigen-toolkit/ocsigen-toolkit-1.0.0.ebuild b/dev-ml/ocsigen-toolkit/ocsigen-toolkit-1.0.0.ebuild deleted file mode 100644 index 9a99adeda85b..000000000000 --- a/dev-ml/ocsigen-toolkit/ocsigen-toolkit-1.0.0.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit findlib opam - -DESCRIPTION="User interface widgets for Ocsigen applications" -HOMEPAGE="https://github.com/ocsigen/ocsigen-toolkit" - -LICENSE="LGPL-2.1-with-linking-exception" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="+ocamlopt debug" - -if [ "${PV#9999}" != "${PV}" ] ; then - inherit git-r3 - SRC_URI="" - EGIT_REPO_URI="https://github.com/ocsigen/ocsigen-toolkit" - KEYWORDS="" -else - SRC_URI="https://github.com/ocsigen/ocsigen-toolkit/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" -fi - -RDEPEND="dev-lang/ocaml:=[ocamlopt?] - >dev-ml/js_of_ocaml-2.7:= - >=dev-ml/eliom-5.1:=[ppx] - dev-ml/ppx_deriving:= - dev-ml/calendar:= - dev-ml/lwt:=" -DEPEND="${RDEPEND}" - -src_compile() { - emake \ - DEBUG="$(usex debug yes no)" \ - NATIVE="$(usex ocamlopt yes no)" \ - all -} - -src_install() { - findlib_src_preinst - OCAMLPATH="${OCAMLFIND_DESTDIR}" emake install - opam_src_install - dodoc README.md -} diff --git a/dev-ml/ocsigen-toolkit/ocsigen-toolkit-9999.ebuild b/dev-ml/ocsigen-toolkit/ocsigen-toolkit-9999.ebuild deleted file mode 100644 index 9a99adeda85b..000000000000 --- a/dev-ml/ocsigen-toolkit/ocsigen-toolkit-9999.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit findlib opam - -DESCRIPTION="User interface widgets for Ocsigen applications" -HOMEPAGE="https://github.com/ocsigen/ocsigen-toolkit" - -LICENSE="LGPL-2.1-with-linking-exception" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="+ocamlopt debug" - -if [ "${PV#9999}" != "${PV}" ] ; then - inherit git-r3 - SRC_URI="" - EGIT_REPO_URI="https://github.com/ocsigen/ocsigen-toolkit" - KEYWORDS="" -else - SRC_URI="https://github.com/ocsigen/ocsigen-toolkit/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" -fi - -RDEPEND="dev-lang/ocaml:=[ocamlopt?] - >dev-ml/js_of_ocaml-2.7:= - >=dev-ml/eliom-5.1:=[ppx] - dev-ml/ppx_deriving:= - dev-ml/calendar:= - dev-ml/lwt:=" -DEPEND="${RDEPEND}" - -src_compile() { - emake \ - DEBUG="$(usex debug yes no)" \ - NATIVE="$(usex ocamlopt yes no)" \ - all -} - -src_install() { - findlib_src_preinst - OCAMLPATH="${OCAMLFIND_DESTDIR}" emake install - opam_src_install - dodoc README.md -} diff --git a/dev-ml/octavius/Manifest b/dev-ml/octavius/Manifest index 43e1d879e4fa..a4df8983ebf2 100644 --- a/dev-ml/octavius/Manifest +++ b/dev-ml/octavius/Manifest @@ -1 +1 @@ -DIST octavius-1.1.0.tar.gz 13767 BLAKE2B ad6f7a252ff853eb26348ce66cfa6ce9afdc4a4655d4f0c79e0f5e1ab354bfed62da396c312ca8b402ebf116a5be70afce7b26810723c2b27be37656bc63406f SHA512 db1f7da7af07d9ff1a4b1c51dbd2861e4dddab13958e7bccdd0c42494fa95f0b4277b222652ef73198f5aeb2ac44de4204459c7d1085810864958da251d5ec09 +DIST octavius-1.2.2.tar.gz 14910 BLAKE2B ad2c6cc274e205918276ed8ab58032ce3f5fb5d564c1ad7cc33c2d73accf1952e972899bd872b9bcb190fcfa223ee4de7f74fbeba44720b3fe78725d1d4d2561 SHA512 57e40f0bd03599bf0b14d85b29bef2214f9b9393917c0a65acf60cf028fe028a730a804f3c0101fee1378cacd4feb7a4f2df3c8411ceeb6bb34d47f849b7a55e diff --git a/dev-ml/octavius/metadata.xml b/dev-ml/octavius/metadata.xml index 8f44d43f4434..0ad530d96119 100644 --- a/dev-ml/octavius/metadata.xml +++ b/dev-ml/octavius/metadata.xml @@ -1,9 +1,9 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">ocaml-doc/octavius</remote-id> diff --git a/dev-ml/octavius/octavius-1.1.0.ebuild b/dev-ml/octavius/octavius-1.2.2.ebuild index 36135a6e9f15..00dffc12cb9b 100644 --- a/dev-ml/octavius/octavius-1.1.0.ebuild +++ b/dev-ml/octavius/octavius-1.2.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit findlib opam +inherit dune DESCRIPTION="ocamldoc comment syntax parser" HOMEPAGE="https://github.com/ocaml-doc/octavius" @@ -11,10 +11,5 @@ SRC_URI="https://github.com/ocaml-doc/octavius/archive/v${PV}.tar.gz -> ${P}.tar LICENSE="ISC" SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" - -RDEPEND="" -DEPEND="${DEPEND} - dev-ml/jbuilder - dev-ml/ocamlbuild" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" diff --git a/dev-ml/ocurl/Manifest b/dev-ml/ocurl/Manifest index d1864ca58da1..4bc3d1319a6a 100644 --- a/dev-ml/ocurl/Manifest +++ b/dev-ml/ocurl/Manifest @@ -1,3 +1,2 @@ -DIST ocurl-0.6.1.tgz 101147 BLAKE2B db0ff240e58bc72fbbbbbb661ccc8222bf65db70e85632094c59b3edfeef63e6ff3f2b7df73e8b1662a159b4177c38714ff1a553193dd092e9aae336b90d9f9e SHA512 2c82c9b8e8d6ee26a85add7a2698ab1f61478777f9c7b0b217cacb6491067b619f508b41c22eaa54cf249147d287a77c62a00aef3b19ee6c135426c4559ab7f3 -DIST ocurl-0.7.10.tar.gz 108234 BLAKE2B 17b679e331fa266001744522457cc7f4a3656b97b4558fc9e4458c31abd8700fb0f55ce1f9049de7d95a1df41f6543aa36729bc10d9cb688e5e45c50960d5e3d SHA512 7e7adae7d32a39465d578c0e9a0b3b1d4baed76c41428337e9bdc86f7c948297db22c14bc61b58c28d02871a2f3359767e745891690663b63ee1334a839b49c8 -DIST ocurl-0.7.9.tar.gz 108242 BLAKE2B 0402757e9e08b115e322ad007d8b294127584ccd5470eeb3e1db667aba96dc269616e8a2782f1850ac4550533a51e49b58cdb82b077a8fd516f5c83e03fc616d SHA512 daa571279570fa1e4ecfa213b717149f6be3922c3c904a22912d04afcf01651702c8324b4b06cbff1fcc023a1f7663e8b1b1e7f14dc377e043ecf2ac09122877 +DIST ocurl-0.9.1.tar.gz 111393 BLAKE2B 83ec8f5e2e83b5cc519683556ca97818a092a80f41305394cc04088371c1179f256dee3d8a8e80597837fb156299698450c70ca00f1ec336ace46b02b84bb51e SHA512 f4acb596f213ce57e749c9805225330b532e17718f3b228745b438cd1fe6d89b37e56d401a11c329107729dd0e6bdd4a425d547f9a83dabe32edbf18aca585b5 +DIST ocurl-0.9.2.tar.gz 116659 BLAKE2B 3947cd82343cc9246c930f8fc89f7899f41a06f41358b5a014fbd05f5c85e70eb3df8c10690e62bd76d345c5738fdab63a936deed53fde0c8a3b040c5890129f SHA512 de9b06a2a4cbf804b6c947ef1011a75f45e3effbc29db054a9b72453920a0f554baa06d06b2a36eeee33090df7f9eb35280404237e2e3be219fb2dc98fe2bc82 diff --git a/dev-ml/ocurl/metadata.xml b/dev-ml/ocurl/metadata.xml index 5230237dc37b..367a88d8036b 100644 --- a/dev-ml/ocurl/metadata.xml +++ b/dev-ml/ocurl/metadata.xml @@ -1,10 +1,7 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">ygrek/ocurl</remote-id> </upstream> diff --git a/dev-ml/ocurl/ocurl-0.6.1.ebuild b/dev-ml/ocurl/ocurl-0.6.1.ebuild deleted file mode 100644 index 39c4fd5cab5f..000000000000 --- a/dev-ml/ocurl/ocurl-0.6.1.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib - -DESCRIPTION="OCaml interface to the libcurl library" -HOMEPAGE="http://forge.ocamlcore.org/projects/ocurl/" -LICENSE="MIT" -SRC_URI="https://forge.ocamlcore.org/frs/download.php/1374/${P}.tgz" - -SLOT="0/${PV}" -IUSE="examples" - -RDEPEND=">=net-misc/curl-7.9.8 - >=dev-lang/ocaml-3.12:=[ocamlopt]" -DEPEND="${RDEPEND} - virtual/pkgconfig" -KEYWORDS="amd64 ppc ~x86" - -src_compile() -{ - emake -j1 all -} - -src_install() -{ - findlib_src_install - dodoc CHANGES.txt README - if use examples; then - dodoc -r examples - docompress -x /usr/share/doc/${PF}/examples - fi -} diff --git a/dev-ml/ocurl/ocurl-0.7.9.ebuild b/dev-ml/ocurl/ocurl-0.9.1.ebuild index 978bdea229b6..490512b5c8b1 100644 --- a/dev-ml/ocurl/ocurl-0.7.9.ebuild +++ b/dev-ml/ocurl/ocurl-0.9.1.ebuild @@ -1,33 +1,31 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 inherit findlib DESCRIPTION="OCaml interface to the libcurl library" -HOMEPAGE="http://forge.ocamlcore.org/projects/ocurl/ https://github.com/ygrek/ocurl" +HOMEPAGE="https://forge.ocamlcore.org/projects/ocurl/ https://github.com/ygrek/ocurl" LICENSE="MIT" SRC_URI="https://github.com/ygrek/ocurl/archive/${PV}.tar.gz -> ${P}.tar.gz" SLOT="0/${PV}" -IUSE="examples" +IUSE="examples +ocamlopt" +BDEPEND="virtual/pkgconfig" RDEPEND=">=net-misc/curl-7.9.8 dev-ml/lwt:= dev-ml/camlp4:= - >=dev-lang/ocaml-3.12:=[ocamlopt]" -DEPEND="${RDEPEND} - virtual/pkgconfig" -KEYWORDS="~amd64 ~arm ~ppc ~x86" + >=dev-lang/ocaml-3.12:=[ocamlopt?]" +DEPEND="${RDEPEND}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" -src_compile() -{ +src_compile() { emake -j1 all } -src_install() -{ +src_install() { findlib_src_install dodoc CHANGES.txt README.md if use examples; then diff --git a/dev-ml/ocurl/ocurl-0.7.10.ebuild b/dev-ml/ocurl/ocurl-0.9.2.ebuild index a23d5e728f2d..9710966ae014 100644 --- a/dev-ml/ocurl/ocurl-0.7.10.ebuild +++ b/dev-ml/ocurl/ocurl-0.9.2.ebuild @@ -1,35 +1,35 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 inherit findlib DESCRIPTION="OCaml interface to the libcurl library" -HOMEPAGE="http://forge.ocamlcore.org/projects/ocurl/ https://github.com/ygrek/ocurl" -LICENSE="MIT" +HOMEPAGE="https://forge.ocamlcore.org/projects/ocurl/ https://github.com/ygrek/ocurl" SRC_URI="https://github.com/ygrek/ocurl/archive/${PV}.tar.gz -> ${P}.tar.gz" +LICENSE="MIT" SLOT="0/${PV}" -IUSE="examples" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="examples +ocamlopt" RDEPEND=">=net-misc/curl-7.9.8 dev-ml/lwt:= dev-ml/camlp4:= - >=dev-lang/ocaml-3.12:=[ocamlopt]" -DEPEND="${RDEPEND} - virtual/pkgconfig" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" + >=dev-lang/ocaml-3.12:=[ocamlopt?]" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" -src_compile() -{ +src_compile() { emake -j1 all } -src_install() -{ +src_install() { findlib_src_install + dodoc CHANGES.txt README.md + if use examples; then dodoc -r examples docompress -x /usr/share/doc/${PF}/examples diff --git a/dev-ml/odns/Manifest b/dev-ml/odns/Manifest deleted file mode 100644 index c2cf8733c683..000000000000 --- a/dev-ml/odns/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST odns-0.3.tar.gz 57616 BLAKE2B de6ac0fee68d1ae21fe279971da252647d30f5914ec2030cb0ecb5efb245ade254673b54b884d1987e673b0117bc58a10b0b6344689134924334dedb919eb888 SHA512 6d40d7fc882185500aaa58582112abd57faf72ee0a57fabc211ad4bf39739b39cb956e6cb109808e05d767560a942c3300e9ec0e6b28c13cec2a2b4dd0c3bf5d diff --git a/dev-ml/odns/files/odns-0.3-parmake.patch b/dev-ml/odns/files/odns-0.3-parmake.patch deleted file mode 100644 index 7034abd25cf2..000000000000 --- a/dev-ml/odns/files/odns-0.3-parmake.patch +++ /dev/null @@ -1,16 +0,0 @@ -fix parallel make -https://bugs.gentoo.org/show_bug.cgi?id=422683 - -Index: odns-0.3/OCamlMakefile -=================================================================== ---- odns-0.3.orig/OCamlMakefile -+++ odns-0.3/OCamlMakefile -@@ -1152,7 +1152,7 @@ $(BCDIDIR)/%.di $(NCDIDIR)/%.di: %.mli - $(DOC_DIR)/$(RESULT)/html: - mkdir -p $@ - --$(DOC_DIR)/$(RESULT)/html/index.html: $(DOC_DIR)/$(RESULT)/html $(DOC_FILES) -+$(DOC_DIR)/$(RESULT)/html/index.html: $(DOC_DIR)/$(RESULT)/html $(DOC_FILES) byte-code-library - rm -rf $</* - $(QUIET)pp=`sed -n -e '/^#/d' -e 's/(\*pp \([^*]*\) \*)/\1/p;q' $(FIRST_DOC_FILE)`; \ - if [ -z "$$pp" ]; then \ diff --git a/dev-ml/odns/metadata.xml b/dev-ml/odns/metadata.xml deleted file mode 100644 index ffac4d7ebc01..000000000000 --- a/dev-ml/odns/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> -</maintainer> -</pkgmetadata> diff --git a/dev-ml/odns/odns-0.3-r1.ebuild b/dev-ml/odns/odns-0.3-r1.ebuild deleted file mode 100644 index d330c21321f0..000000000000 --- a/dev-ml/odns/odns-0.3-r1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib eutils - -DESCRIPTION="OCaml library to query DNS servers" -HOMEPAGE="http://odns.tuxfamily.org/" -SRC_URI="http://download.tuxfamily.org/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -# It is ancient and upstream is dead. Consider using ocaml-dns instead. -RDEPEND=" - >=dev-lang/ocaml-3.10.2:=[ocamlopt] - !dev-ml/dns - !dev-ml/ocaml-dns -" -DEPEND="${RDEPEND}" - -CLIBS="" # Workaround for bug #422683 - -src_prepare() { - sed -i -e "s/version=\"0.2\"/version=\"${PV}\"/" META || die - epatch "${FILESDIR}/${P}-parmake.patch" -} - -src_compile() { - emake -j1 #453434 -} - -src_install() { - findlib_src_preinst - PREFIX="${D}/usr" emake install - dodoc AUTHORS README -} diff --git a/dev-ml/odoc-parser/Manifest b/dev-ml/odoc-parser/Manifest new file mode 100644 index 000000000000..05f96d89e115 --- /dev/null +++ b/dev-ml/odoc-parser/Manifest @@ -0,0 +1 @@ +DIST odoc-parser-2.0.0.tbz 34826 BLAKE2B 0d167fa7d768dfac3b45740707b0a84d300999ef4334ade70286675d906cd7d8c70fcd27e563fb0ab4450f6a0ff8097884af267b376b51e7a91ccfbecb8ac06c SHA512 d2bffa3e9f30471045682e390dcee7a2c1caf3831bca4bd57c16939e782c2e23434e6f1c9887580a1804800b3629ef4c4311a9d418fca5a939f324650d54006e diff --git a/dev-ml/odoc-parser/metadata.xml b/dev-ml/odoc-parser/metadata.xml new file mode 100644 index 000000000000..c62c1cd9bcf5 --- /dev/null +++ b/dev-ml/odoc-parser/metadata.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <longdescription> + Odoc_parser is a library for parsing the contents of OCaml + documentation comments, formatted using 'odoc' syntax, an extension + of the language understood by ocamldoc. + </longdescription> + <upstream> + <bugs-to>https://github.com/ocaml-doc/odoc-parser/issues/</bugs-to> + <remote-id type="github">ocaml-doc/odoc-parser</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/odoc-parser/odoc-parser-2.0.0.ebuild b/dev-ml/odoc-parser/odoc-parser-2.0.0.ebuild new file mode 100644 index 000000000000..70381f8c32d2 --- /dev/null +++ b/dev-ml/odoc-parser/odoc-parser-2.0.0.ebuild @@ -0,0 +1,26 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Parser for ocaml documentation comments" +HOMEPAGE="https://github.com/ocaml-doc/odoc-parser" +SRC_URI="https://github.com/ocaml-doc/odoc-parser/releases/download/${PV}/${P}.tbz" + +LICENSE="ISC" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-ml/astring:= + dev-ml/result:= + dev-ml/camlp-streams:= +" +DEPEND="${RDEPEND}" +BDEPEND="test? ( + dev-ml/ppx_expect +)" diff --git a/dev-ml/odoc/Manifest b/dev-ml/odoc/Manifest new file mode 100644 index 000000000000..798ea2e8dc4f --- /dev/null +++ b/dev-ml/odoc/Manifest @@ -0,0 +1,2 @@ +DIST odoc-2.2.0.tbz 1548871 BLAKE2B 251c823e5f93e8080d52486e9d048a0c31651b6ea9d4bfdc3202488d7bcd750f9c2899189b943500253bf1e6041cf0283ed5e57c34d1a7d538c7c3710fb9a260 SHA512 9f8fc2ee6b25629474e8aa69dd460becab9277261578af0f7b97f7f779cc5f1056d1b5f14ab583b9b94ea097e5df2d6e35040f2a4887021209705486f9d44a22 +DIST odoc-2.2.1.tbz 1548027 BLAKE2B 846890375debd70519879de261ab829b34dc4f7754ef9d32c2cf6fa07d86ed721a828987398549021ca7805a4e298fef516b5c6e0691e083f8849ccaa6d4184e SHA512 044e37eb3dcc77d9cc8124be558cce77a438723b90225273fb3401d3315c57c8c2f395a48ebd1b6aacc01b00cbfa4bd0be1923d2bd9bd3cc92d0604eadaabc4f diff --git a/dev-ml/odoc/metadata.xml b/dev-ml/odoc/metadata.xml new file mode 100644 index 000000000000..abc13e762b3e --- /dev/null +++ b/dev-ml/odoc/metadata.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <longdescription> + Odoc is a documentation generator for OCaml. It reads doc comments, + delimited with (** ... *), and outputs HTML + </longdescription> + <upstream> + <bugs-to>https://github.com/ocaml/odoc/issues/</bugs-to> + <remote-id type="github">ocaml/odoc</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/odoc/odoc-2.2.0-r2.ebuild b/dev-ml/odoc/odoc-2.2.0-r2.ebuild new file mode 100644 index 000000000000..24702587b03d --- /dev/null +++ b/dev-ml/odoc/odoc-2.2.0-r2.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="OCaml documentation generator" +HOMEPAGE="http://github.com/ocaml/odoc/" +SRC_URI="https://github.com/ocaml/${PN}/releases/download/${PV}/${P}.tbz" + +LICENSE="ISC" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+ocamlopt test" +RESTRICT="test" # ocaml-crunch not in the tree + +RDEPEND=" + >=dev-ml/dune-3 + dev-ml/astring:= + dev-ml/cmdliner:= + dev-ml/cppo:= + dev-ml/fmt:= + dev-ml/fpath:= + dev-ml/odoc-parser:= + dev-ml/result:= + dev-ml/tyxml:= +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/odoc/odoc-2.2.1.ebuild b/dev-ml/odoc/odoc-2.2.1.ebuild new file mode 100644 index 000000000000..24702587b03d --- /dev/null +++ b/dev-ml/odoc/odoc-2.2.1.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="OCaml documentation generator" +HOMEPAGE="http://github.com/ocaml/odoc/" +SRC_URI="https://github.com/ocaml/${PN}/releases/download/${PV}/${P}.tbz" + +LICENSE="ISC" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+ocamlopt test" +RESTRICT="test" # ocaml-crunch not in the tree + +RDEPEND=" + >=dev-ml/dune-3 + dev-ml/astring:= + dev-ml/cmdliner:= + dev-ml/cppo:= + dev-ml/fmt:= + dev-ml/fpath:= + dev-ml/odoc-parser:= + dev-ml/result:= + dev-ml/tyxml:= +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/ojquery/Manifest b/dev-ml/ojquery/Manifest deleted file mode 100644 index 6ded17139000..000000000000 --- a/dev-ml/ojquery/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ojquery-0.1.tar.gz 64335 BLAKE2B f6fc0377326a2eb4487f2e28ae8ed28be6518ea79b1a096cd90e1847d732878775105a3597ea13fde6b352611a39bd49f55792dd5b1f57a576eff80aa127c58e SHA512 57b0f7458fc44294df0993a1593f0f42d532834b7f6676e8093eb3c12d4c88a6084a99f831751fece69477d17ab84a0ebedd9873f5255aa8ee2a6d39996634d2 diff --git a/dev-ml/ojquery/metadata.xml b/dev-ml/ojquery/metadata.xml deleted file mode 100644 index 5349bc49c096..000000000000 --- a/dev-ml/ojquery/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">ocsigen/ojquery</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/ojquery/ojquery-0.1.ebuild b/dev-ml/ojquery/ojquery-0.1.ebuild deleted file mode 100644 index a14024cc5d57..000000000000 --- a/dev-ml/ojquery/ojquery-0.1.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit oasis - -DESCRIPTION="jQuery Binding for Eliom." -HOMEPAGE="https://github.com/ocsigen/ojquery" - -if [ "${PV#9999}" != "${PV}" ] ; then - inherit git-r3 - SRC_URI="" - EGIT_REPO_URI="https://github.com/ocsigen/ojquery" - KEYWORDS="" -else - SRC_URI="https://github.com/ocsigen/ojquery/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" -fi - -LICENSE="LGPL-3" -SLOT="0/${PV}" -IUSE="" - -RDEPEND="dev-ml/react:= - dev-ml/js_of_ocaml:= - dev-ml/lwt:=" -DEPEND="${RDEPEND} dev-ml/oasis" - -src_prepare() { - oasis setup || die -} diff --git a/dev-ml/ojquery/ojquery-9999.ebuild b/dev-ml/ojquery/ojquery-9999.ebuild deleted file mode 100644 index a14024cc5d57..000000000000 --- a/dev-ml/ojquery/ojquery-9999.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit oasis - -DESCRIPTION="jQuery Binding for Eliom." -HOMEPAGE="https://github.com/ocsigen/ojquery" - -if [ "${PV#9999}" != "${PV}" ] ; then - inherit git-r3 - SRC_URI="" - EGIT_REPO_URI="https://github.com/ocsigen/ojquery" - KEYWORDS="" -else - SRC_URI="https://github.com/ocsigen/ojquery/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" -fi - -LICENSE="LGPL-3" -SLOT="0/${PV}" -IUSE="" - -RDEPEND="dev-ml/react:= - dev-ml/js_of_ocaml:= - dev-ml/lwt:=" -DEPEND="${RDEPEND} dev-ml/oasis" - -src_prepare() { - oasis setup || die -} diff --git a/dev-ml/onanomsg/Manifest b/dev-ml/onanomsg/Manifest deleted file mode 100644 index f0e6b1134094..000000000000 --- a/dev-ml/onanomsg/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST onanomsg-1.0.tar.gz 13519 BLAKE2B c50fb053082e4adfa77f3c6809fb29e64ac8dce7bb9fe1c506f6b7bf0fcd67a6de97f756956f103828ae2f334633f2500a95859c955bd0b610be38163a8d77b5 SHA512 d940f842f795c9d681755795f83694aceab23eb87c7cb66f2b8f643147ca58f30b43049e8c035e3f08392d9c2f611a75254d4ba999b337cc84d7b52f8f36218f diff --git a/dev-ml/onanomsg/files/bigstring.patch b/dev-ml/onanomsg/files/bigstring.patch deleted file mode 100644 index 311fa2ee7495..000000000000 --- a/dev-ml/onanomsg/files/bigstring.patch +++ /dev/null @@ -1,218 +0,0 @@ -Index: onanomsg-1.0/lib/nanomsg.ml -=================================================================== ---- onanomsg-1.0.orig/lib/nanomsg.ml -+++ onanomsg-1.0/lib/nanomsg.ml -@@ -209,7 +209,7 @@ let recv_fd sock = - (Obj.magic fd : Unix.file_descr) - - let send_bigstring_buf ?(block=true) sock buf pos len = -- if pos < 0 || len < 0 || pos + len > CCBigstring.size buf -+ if pos < 0 || len < 0 || pos + len > Bigstring.size buf - then invalid_arg "bounds"; - let nn_buf = nn_allocmsg (size_of_int len) 0 in - match nn_buf with -@@ -218,12 +218,12 @@ let send_bigstring_buf ?(block=true) soc - let nn_buf_p = Ctypes.(allocate (ptr void) nn_buf) in - let ba = Ctypes.(bigarray_of_ptr array1 len - Bigarray.char @@ from_voidp char nn_buf) in -- CCBigstring.blit buf pos ba 0 len; -+ Bigstring.blit buf pos ba 0 len; - ignore @@ raise_notequal len - (fun () -> nn_send sock nn_buf_p nn_msg (int_of_bool block)) - - let send_bigstring ?(block=true) sock buf = -- send_bigstring_buf ~block sock buf 0 @@ CCBigstring.size buf -+ send_bigstring_buf ~block sock buf 0 @@ Bigstring.size buf - - let send_bytes_buf ?(block=true) sock buf pos len = - if pos < 0 || len < 0 || pos + len > Bytes.length buf -@@ -235,7 +235,7 @@ let send_bytes_buf ?(block=true) sock bu - let nn_buf_p = Ctypes.(allocate (ptr void) nn_buf) in - let ba = Ctypes.(bigarray_of_ptr array1 len - Bigarray.char @@ from_voidp char nn_buf) in -- CCBigstring.blit_of_bytes buf pos ba 0 len; -+ Bigstring.blit_of_bytes buf pos ba 0 len; - ignore @@ raise_notequal len - (fun () -> nn_send sock nn_buf_p nn_msg (int_of_bool block)) - -@@ -266,16 +266,16 @@ let recv ?(block=true) sock f = - let recv_bytes_buf ?(block=true) sock buf pos = - recv ~block sock - (fun ba -> -- let len = CCBigstring.size ba in -- CCBigstring.(blit_to_bytes ba 0 buf pos len); -+ let len = Bigstring.size ba in -+ Bigstring.(blit_to_bytes ba 0 buf pos len); - len - ) - - let recv_bytes ?(block=true) sock = - recv ~block sock (fun ba -> -- let len = CCBigstring.size ba in -+ let len = Bigstring.size ba in - let buf = Bytes.create len in -- CCBigstring.blit_to_bytes ba 0 buf 0 len; -+ Bigstring.blit_to_bytes ba 0 buf 0 len; - buf) - - let recv_string ?(block=true) sock = -Index: onanomsg-1.0/lib/nanomsg.mli -=================================================================== ---- onanomsg-1.0.orig/lib/nanomsg.mli -+++ onanomsg-1.0/lib/nanomsg.mli -@@ -45,8 +45,8 @@ val close : socket -> unit - - (** {2 Zero-copy I/O} *) - --val send_bigstring : ?block:bool -> socket -> CCBigstring.t -> unit --val send_bigstring_buf : ?block:bool -> socket -> CCBigstring.t -> int -> int -> unit -+val send_bigstring : ?block:bool -> socket -> Bigstring.t -> unit -+val send_bigstring_buf : ?block:bool -> socket -> Bigstring.t -> int -> int -> unit - - val send_string : ?block:bool -> socket -> string -> unit - val send_string_buf : ?block:bool -> socket -> string -> int -> int -> unit -@@ -54,7 +54,7 @@ val send_string_buf : ?block:bool -> soc - val send_bytes : ?block:bool -> socket -> Bytes.t -> unit - val send_bytes_buf : ?block:bool -> socket -> Bytes.t -> int -> int -> unit - --val recv : ?block:bool -> socket -> (CCBigstring.t -> 'a) -> 'a -+val recv : ?block:bool -> socket -> (Bigstring.t -> 'a) -> 'a - (** [recv ?block sock f] applies [f] to the received message. The - argument of [f] gets unallocated after [f] returns, so make sure - [f] {b never} let a reference to its argument escape. *) -Index: onanomsg-1.0/lib/nanomsg_lwt.ml -=================================================================== ---- onanomsg-1.0.orig/lib/nanomsg_lwt.ml -+++ onanomsg-1.0/lib/nanomsg_lwt.ml -@@ -25,7 +25,7 @@ let raise_negative sock io_event f = rai - let raise_notequal sock io_event v f = raise_if sock io_event (fun x -> x <> v) f - - let send_bigstring_buf sock buf pos len = -- if pos < 0 || len < 0 || pos + len > CCBigstring.size buf -+ if pos < 0 || len < 0 || pos + len > Bigstring.size buf - then invalid_arg "bounds"; - let nn_buf = nn_allocmsg (size_of_int len) 0 in - match nn_buf with -@@ -34,14 +34,14 @@ let send_bigstring_buf sock buf pos len - let nn_buf_p = Ctypes.(allocate (ptr void) nn_buf) in - let ba = Ctypes.(bigarray_of_ptr array1 len - Bigarray.char @@ from_voidp char nn_buf) in -- CCBigstring.blit buf pos ba 0 len; -+ Bigstring.blit buf pos ba 0 len; - raise_notequal sock Lwt_unix.Write len - (fun () -> nn_send (Obj.magic sock : int) nn_buf_p nn_msg - Symbol.(value_of_name_exn "NN_DONTWAIT")) >|= fun nb_written -> - ignore nb_written - - let send_bigstring sock buf = -- send_bigstring_buf sock buf 0 @@ CCBigstring.size buf -+ send_bigstring_buf sock buf 0 @@ Bigstring.size buf - - let send_bytes_buf sock buf pos len = - if pos < 0 || len < 0 || pos + len > Bytes.length buf -@@ -53,7 +53,7 @@ let send_bytes_buf sock buf pos len = - let nn_buf_p = Ctypes.(allocate (ptr void) nn_buf) in - let ba = Ctypes.(bigarray_of_ptr array1 len - Bigarray.char @@ from_voidp char nn_buf) in -- CCBigstring.blit_of_bytes buf pos ba 0 len; -+ Bigstring.blit_of_bytes buf pos ba 0 len; - raise_notequal sock Lwt_unix.Write len - (fun () -> nn_send (Obj.magic sock : int) nn_buf_p nn_msg - Symbol.(value_of_name_exn "NN_DONTWAIT")) >|= fun nb_written -> -@@ -84,16 +84,16 @@ let recv sock f = - - let recv_bytes_buf sock buf pos = - recv sock (fun ba -> -- let len = CCBigstring.size ba in -- CCBigstring.blit_to_bytes ba 0 buf pos len; -+ let len = Bigstring.size ba in -+ Bigstring.blit_to_bytes ba 0 buf pos len; - Lwt.return len - ) - - let recv_bytes sock = - recv sock (fun ba -> -- let len = CCBigstring.size ba in -+ let len = Bigstring.size ba in - let buf = Bytes.create len in -- CCBigstring.blit_to_bytes ba 0 buf 0 len; -+ Bigstring.blit_to_bytes ba 0 buf 0 len; - Lwt.return buf - ) - -Index: onanomsg-1.0/lib/nanomsg_lwt.mli -=================================================================== ---- onanomsg-1.0.orig/lib/nanomsg_lwt.mli -+++ onanomsg-1.0/lib/nanomsg_lwt.mli -@@ -4,8 +4,8 @@ open Nanomsg - - (** {2 Zero-copy I/O} *) - --val send_bigstring : socket -> CCBigstring.t -> unit Lwt.t --val send_bigstring_buf : socket -> CCBigstring.t -> int -> int -> unit Lwt.t -+val send_bigstring : socket -> Bigstring.t -> unit Lwt.t -+val send_bigstring_buf : socket -> Bigstring.t -> int -> int -> unit Lwt.t - - val send_string : socket -> string -> unit Lwt.t - val send_string_buf : socket -> string -> int -> int -> unit Lwt.t -@@ -13,7 +13,7 @@ val send_string_buf : socket -> string - - val send_bytes : socket -> Bytes.t -> unit Lwt.t - val send_bytes_buf : socket -> Bytes.t -> int -> int -> unit Lwt.t - --val recv : socket -> (CCBigstring.t -> 'a Lwt.t) -> 'a Lwt.t -+val recv : socket -> (Bigstring.t -> 'a Lwt.t) -> 'a Lwt.t - (** [recv sock f] applies [f] to the received message. The - argument of [f] gets unallocated after [f] returns, so make sure - [f] {b never} let a reference to its argument escape. *) -Index: onanomsg-1.0/_tags -=================================================================== ---- onanomsg-1.0.orig/_tags -+++ onanomsg-1.0/_tags -@@ -4,7 +4,7 @@ true: debug, bin_annot, safe_string - <lwt>: include - <lib_test>: include - --<lib/nanomsg*>: package(containers.bigarray), \ -+<lib/nanomsg*>: package(bigstring), \ - package(ctypes), \ - package(ipaddr), \ - package(ppx_deriving.std), \ -@@ -13,7 +13,7 @@ true: debug, bin_annot, safe_string - - <lib/nanomsg_lwt.*>: package(lwt.unix), package(lwt.ppx) - --<lib_test/*>: package(containers.bigarray), \ -+<lib_test/*>: package(bigstring), \ - package(ctypes.foreign), \ - package(ipaddr), \ - package(lwt.unix), \ -@@ -21,7 +21,7 @@ true: debug, bin_annot, safe_string - package(oUnit), \ - package(containers) - --<examples/*>: package(containers.bigarray), \ -+<examples/*>: package(bigstring), \ - package(ctypes.foreign), \ - package(ipaddr), \ -- package(containers) -\ No newline at end of file -+ package(containers) -Index: onanomsg-1.0/pkg/META -=================================================================== ---- onanomsg-1.0.orig/pkg/META -+++ onanomsg-1.0/pkg/META -@@ -1,6 +1,6 @@ - version = "1.0" - description = "Bindings to nanomsg" --requires = "ctypes.foreign ipaddr ppx_deriving.std containers containers.bigarray" -+requires = "ctypes.foreign ipaddr ppx_deriving.std containers bigstring" - archive(byte) = "nanomsg.cma" - archive(byte, plugin) = "nanomsg.cma" - archive(native) = "nanomsg.cmxa" -@@ -15,4 +15,4 @@ package "lwt" ( - archive(native) = "nanomsg_lwt.cmxa" - archive(native, plugin) = "nanomsg_lwt.cmxs" - exists_if = "nanomsg_lwt.cma" --) -\ No newline at end of file -+) diff --git a/dev-ml/onanomsg/files/testrun.patch b/dev-ml/onanomsg/files/testrun.patch deleted file mode 100644 index e78dadaf3625..000000000000 --- a/dev-ml/onanomsg/files/testrun.patch +++ /dev/null @@ -1,15 +0,0 @@ -Drop Surveyor / Respondant tests as they fail. - -Index: onanomsg-1.0/lib_test/suite.ml -=================================================================== ---- onanomsg-1.0.orig/lib_test/suite.ml -+++ onanomsg-1.0/lib_test/suite.ml -@@ -93,7 +93,7 @@ let connect_to_string_test ctx = - - let socket_test ctx = - let domains = [AF_SP; AF_SP_RAW] in -- let protos = [Pair; Pub; Sub; Req; Rep; Push; Pull; Surveyor; Respondant; Bus] in -+ let protos = [Pair; Pub; Sub; Req; Rep; Push; Pull; Bus] in - List.iter - (fun d -> - List.iter diff --git a/dev-ml/onanomsg/files/tests.patch b/dev-ml/onanomsg/files/tests.patch deleted file mode 100644 index f93d0ce51260..000000000000 --- a/dev-ml/onanomsg/files/tests.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: onanomsg-1.0/_tags -=================================================================== ---- onanomsg-1.0.orig/_tags -+++ onanomsg-1.0/_tags -@@ -19,6 +19,7 @@ true: debug, bin_annot, safe_string - package(lwt.unix), \ - package(lwt.ppx), \ - package(oUnit), \ -+ package(ppx_deriving), \ - package(containers) - - <examples/*>: package(bigstring), \ diff --git a/dev-ml/onanomsg/metadata.xml b/dev-ml/onanomsg/metadata.xml deleted file mode 100644 index d59abf5ddf60..000000000000 --- a/dev-ml/onanomsg/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <use> - <flag name="lwt">Enables lwt support.</flag> - </use> - <upstream> - <remote-id type="github">rgrinberg/onanomsg</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/onanomsg/onanomsg-1.0-r2.ebuild b/dev-ml/onanomsg/onanomsg-1.0-r2.ebuild deleted file mode 100644 index d67ffaa0a2ce..000000000000 --- a/dev-ml/onanomsg/onanomsg-1.0-r2.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit opam eutils - -DESCRIPTION="nanomsg bindings for OCaml" -HOMEPAGE="https://github.com/rgrinberg/onanomsg" -SRC_URI="https://github.com/rgrinberg/onanomsg/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="WTFPL-2" -SLOT="0/${PV}-bigstring" -KEYWORDS="~amd64" -IUSE="+lwt +ocamlopt test" - -RDEPEND=" - dev-libs/nanomsg:= - dev-lang/ocaml:=[ocamlopt?] - dev-ml/ocaml-ctypes:= - dev-ml/ocaml-ipaddr:=[ocamlopt?] - dev-ml/sexplib:= - dev-ml/ppx_deriving:=[ocamlopt?] - dev-ml/ocaml-containers:=[ocamlopt?] - dev-ml/ocaml-bigstring:= - lwt? ( dev-ml/lwt:=[ocamlopt(+)?] ) -" -DEPEND="${RDEPEND} - test? ( dev-ml/ounit ) -" - -src_prepare() { - epatch "${FILESDIR}/bigstring.patch" \ - "${FILESDIR}/tests.patch" \ - "${FILESDIR}/testrun.patch" - default -} - -src_compile() { - ocaml pkg/build.ml \ - native=$(usex ocamlopt true false) \ - native-dynlink=$(usex ocamlopt true false) \ - lwt=$(usex lwt true false) \ - ounit=$(usex test true false) \ - || die -} - -src_install() { - opam_src_install nanomsg - dodoc CHANGES README.md -} diff --git a/dev-ml/opam-client/Manifest b/dev-ml/opam-client/Manifest new file mode 100644 index 000000000000..13cb1b80d395 --- /dev/null +++ b/dev-ml/opam-client/Manifest @@ -0,0 +1,5 @@ +DIST opam-2.0.10.tar.gz 641739 BLAKE2B 7cd201fe6bed2ae81fc8d9d0a7063b284621e579713c2b8672a5ea37cd7516a030367664823c75594a789136ffe5b313818fa120fb64e499b8276706700df776 SHA512 49218a14c3b7e2f47052c1fb6907b54086f5af4adb43d120065c77f2c573d72136ac64f55f577a613eb43ebe29fbe14f9ac0e25756209ca7a572aa35a4410a5d +DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e513736a27904a4e471d1eaf432db72998251ac786cb8fbf1ad425fff42b772c5d26934e0929aae75c0946d4659 SHA512 0d8ee19ac0f3df9de4fd9cfa8daab1f7228f090f5e2e7e26bedf24d8c2ab377aade95048f2d7cd9ee9dbbe738729e26dc99f41f730fa2252df74953362464a22 +DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608 +DIST opam-2.1.2.tar.gz 818848 BLAKE2B ffb50f3cf1421aa9bff6877d636a3d1d1cc2c2e3961ecd60fcae8a35b069c8d22e7a36bf17cb8166533621a3c85a82195fd3fa646b2fd8dcea9e626b61d5b86c SHA512 bea6f75728a6ef25bcae4f8903dde7a297df7186208dccacb3f58bd6a0caec551c11b79e8544f0983feac038971dbe49481fc405a5962973a5f56ec811abe396 +DIST opam-2.1.3.tar.gz 832450 BLAKE2B c5e50c0a41b7197bc7645eaef0d8cba79c978b4432fc824aa6a4280df65ec7d59df52a22b76877da4949c8562a5fecb8da2a179ca67bd312bf9a514961bf4444 SHA512 040e4f58f93e962ff422617ce0d35ed45dd86921a9aac3505914c33dd942d0e5e5771e7e1774046504f9aa84f32bc4fbd6ac7720fbea862d48bf1ca29e02cefc 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 new file mode 100644 index 000000000000..a8af27416df1 --- /dev/null +++ b/dev-ml/opam-client/files/debian-Port-to-Dose3-6.0.1.patch @@ -0,0 +1,142 @@ +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-client/metadata.xml b/dev-ml/opam-client/metadata.xml new file mode 100644 index 000000000000..8ee8dbb51969 --- /dev/null +++ b/dev-ml/opam-client/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">ocaml/opam</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/opam-client/opam-client-2.0.10.ebuild b/dev-ml/opam-client/opam-client-2.0.10.ebuild new file mode 100644 index 000000000000..9c36b48336f0 --- /dev/null +++ b/dev-ml/opam-client/opam-client-2.0.10.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="opam client libraries" +HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam" +SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz" +S="${WORKDIR}/opam-${PV/_/-}" + +LICENSE="LGPL-2.1" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt" + +RDEPEND=" + dev-ml/cmdliner:= + ~dev-ml/opam-repository-${PV}:= + ~dev-ml/opam-state-${PV}:= + ~dev-ml/opam-solver-${PV}:= + dev-ml/opam-file-format:= + dev-ml/re:= +" +DEPEND="${RDEPEND}" + +# Cherry-picked from https://deb.debian.org/debian/pool/main/o/opam/opam_2.0.8-1.debian.tar.xz +PATCHES=( "${FILESDIR}/debian-Port-to-Dose3-6.0.1.patch" ) + +src_prepare() { + default + cat <<- EOF >> "${S}/dune" + (env + (dev + (flags (:standard -warn-error -3-9-33))) + (release + (flags (:standard -warn-error -3-9-33)))) + EOF +} diff --git a/dev-ml/opam-client/opam-client-2.0.9.ebuild b/dev-ml/opam-client/opam-client-2.0.9.ebuild new file mode 100644 index 000000000000..f9f4e4a70902 --- /dev/null +++ b/dev-ml/opam-client/opam-client-2.0.9.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="opam client libraries" +HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam" +SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz" +S="${WORKDIR}/opam-${PV/_/-}" + +LICENSE="LGPL-2.1" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-ml/cmdliner:= + ~dev-ml/opam-repository-${PV}:= + ~dev-ml/opam-state-${PV}:= + ~dev-ml/opam-solver-${PV}:= + dev-ml/opam-file-format:= + dev-ml/re:= +" +DEPEND="${RDEPEND}" +BDEPEND="test? ( sys-apps/bubblewrap )" + +# Cherry-picked from https://deb.debian.org/debian/pool/main/o/opam/opam_2.0.8-1.debian.tar.xz +PATCHES=( "${FILESDIR}/debian-Port-to-Dose3-6.0.1.patch" ) + +src_prepare() { + default + cat <<- EOF >> "${S}/dune" + (env + (dev + (flags (:standard -warn-error -3-9-33))) + (release + (flags (:standard -warn-error -3-9-33)))) + EOF +} diff --git a/dev-ml/opam-client/opam-client-2.1.2.ebuild b/dev-ml/opam-client/opam-client-2.1.2.ebuild new file mode 100644 index 000000000000..8146740b33f6 --- /dev/null +++ b/dev-ml/opam-client/opam-client-2.1.2.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="opam client libraries" +HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam" +SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz" +S="${WORKDIR}/opam-${PV/_/-}" + +LICENSE="LGPL-2.1" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-ml/cmdliner:= + ~dev-ml/opam-repository-${PV}:= + ~dev-ml/opam-state-${PV}:= + ~dev-ml/opam-solver-${PV}:= + dev-ml/opam-file-format:= + dev-ml/re:= +" +DEPEND="${RDEPEND}" +BDEPEND="test? ( sys-apps/bubblewrap )" + +PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch ) + +src_prepare() { + default + cat <<- EOF >> "${S}/dune" + (env + (dev + (flags (:standard -warn-error -3-9-33))) + (release + (flags (:standard -warn-error -3-9-33)))) + EOF +} diff --git a/dev-ml/opam-client/opam-client-2.1.3.ebuild b/dev-ml/opam-client/opam-client-2.1.3.ebuild new file mode 100644 index 000000000000..d0d95142c7ba --- /dev/null +++ b/dev-ml/opam-client/opam-client-2.1.3.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="opam client libraries" +HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam" +SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz" +S="${WORKDIR}/opam-${PV/_/-}" + +LICENSE="LGPL-2.1" +SLOT="0/${PV}" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt test" +RESTRICT="test" # sandbox not working + +RDEPEND=" + dev-ml/cmdliner:= + ~dev-ml/opam-repository-${PV}:= + ~dev-ml/opam-state-${PV}:= + ~dev-ml/opam-solver-${PV}:= + dev-ml/opam-file-format:= + dev-ml/re:= +" +DEPEND="${RDEPEND}" +BDEPEND="test? ( sys-apps/bubblewrap )" + +PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch ) + +src_prepare() { + default + cat <<- EOF >> "${S}/dune" + (env + (dev + (flags (:standard -warn-error -3-9-33))) + (release + (flags (:standard -warn-error -3-9-33)))) + EOF +} diff --git a/dev-ml/opam-core/Manifest b/dev-ml/opam-core/Manifest new file mode 100644 index 000000000000..13cb1b80d395 --- /dev/null +++ b/dev-ml/opam-core/Manifest @@ -0,0 +1,5 @@ +DIST opam-2.0.10.tar.gz 641739 BLAKE2B 7cd201fe6bed2ae81fc8d9d0a7063b284621e579713c2b8672a5ea37cd7516a030367664823c75594a789136ffe5b313818fa120fb64e499b8276706700df776 SHA512 49218a14c3b7e2f47052c1fb6907b54086f5af4adb43d120065c77f2c573d72136ac64f55f577a613eb43ebe29fbe14f9ac0e25756209ca7a572aa35a4410a5d +DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e513736a27904a4e471d1eaf432db72998251ac786cb8fbf1ad425fff42b772c5d26934e0929aae75c0946d4659 SHA512 0d8ee19ac0f3df9de4fd9cfa8daab1f7228f090f5e2e7e26bedf24d8c2ab377aade95048f2d7cd9ee9dbbe738729e26dc99f41f730fa2252df74953362464a22 +DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608 +DIST opam-2.1.2.tar.gz 818848 BLAKE2B ffb50f3cf1421aa9bff6877d636a3d1d1cc2c2e3961ecd60fcae8a35b069c8d22e7a36bf17cb8166533621a3c85a82195fd3fa646b2fd8dcea9e626b61d5b86c SHA512 bea6f75728a6ef25bcae4f8903dde7a297df7186208dccacb3f58bd6a0caec551c11b79e8544f0983feac038971dbe49481fc405a5962973a5f56ec811abe396 +DIST opam-2.1.3.tar.gz 832450 BLAKE2B c5e50c0a41b7197bc7645eaef0d8cba79c978b4432fc824aa6a4280df65ec7d59df52a22b76877da4949c8562a5fecb8da2a179ca67bd312bf9a514961bf4444 SHA512 040e4f58f93e962ff422617ce0d35ed45dd86921a9aac3505914c33dd942d0e5e5771e7e1774046504f9aa84f32bc4fbd6ac7720fbea862d48bf1ca29e02cefc diff --git a/dev-ml/opam-core/metadata.xml b/dev-ml/opam-core/metadata.xml new file mode 100644 index 000000000000..8ee8dbb51969 --- /dev/null +++ b/dev-ml/opam-core/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">ocaml/opam</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/opam-core/opam-core-2.0.10.ebuild b/dev-ml/opam-core/opam-core-2.0.10.ebuild new file mode 100644 index 000000000000..69c9be86d5be --- /dev/null +++ b/dev-ml/opam-core/opam-core-2.0.10.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# We are opam +OPAM_INSTALLER_DEP=" " +inherit opam + +DESCRIPTION="Core libraries for opam" +HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam" +SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz" +S="${WORKDIR}/opam-${PV}" +OPAM_INSTALLER="${S}/opam-installer" + +LICENSE="LGPL-2.1" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" + +RDEPEND=" + dev-ml/ocamlgraph:= + dev-ml/re:= + dev-ml/opam-file-format:= + dev-ml/cmdliner:= +" +DEPEND="${RDEPEND} + dev-ml/cppo" + +src_prepare() { + default + cat <<- EOF >> "${S}/dune" + (env + (dev + (flags (:standard -warn-error -3-9))) + (release + (flags (:standard -warn-error -3-9)))) + EOF +} + +src_compile() { + emake -j1 opam-installer + emake -j1 ${PN}.install +} diff --git a/dev-ml/opam-core/opam-core-2.0.9.ebuild b/dev-ml/opam-core/opam-core-2.0.9.ebuild new file mode 100644 index 000000000000..0628e243fadd --- /dev/null +++ b/dev-ml/opam-core/opam-core-2.0.9.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# We are opam +OPAM_INSTALLER_DEP=" " +inherit opam + +DESCRIPTION="Core libraries for opam" +HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam" +SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz" +S="${WORKDIR}/opam-${PV}" +OPAM_INSTALLER="${S}/opam-installer" + +LICENSE="LGPL-2.1" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" + +RDEPEND=" + dev-ml/ocamlgraph:= + dev-ml/re:= + dev-ml/opam-file-format:= + dev-ml/cmdliner:= +" +DEPEND="${RDEPEND} + <=dev-ml/dune-2.9 + dev-ml/cppo" + +src_prepare() { + default + cat <<- EOF >> "${S}/dune" + (env + (dev + (flags (:standard -warn-error -3-9))) + (release + (flags (:standard -warn-error -3-9)))) + EOF +} + +src_compile() { + emake -j1 opam-installer + emake -j1 ${PN}.install +} diff --git a/dev-ml/opam-core/opam-core-2.1.2.ebuild b/dev-ml/opam-core/opam-core-2.1.2.ebuild new file mode 100644 index 000000000000..c53cccb0cafb --- /dev/null +++ b/dev-ml/opam-core/opam-core-2.1.2.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# We are opam +OPAM_INSTALLER_DEP=" " +inherit opam + +DESCRIPTION="Core libraries for opam" +HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam" +SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz" +S="${WORKDIR}/opam-${PV}" +OPAM_INSTALLER="${S}/opam-installer" + +LICENSE="LGPL-2.1" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" + +RDEPEND=" + dev-ml/ocamlgraph:= + dev-ml/re:= + dev-ml/opam-file-format:= + dev-ml/cmdliner:= +" +DEPEND="${RDEPEND} + dev-ml/cppo" + +PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch ) + +src_prepare() { + default + cat <<- EOF >> "${S}/dune" + (env + (dev + (flags (:standard -warn-error -3-9))) + (release + (flags (:standard -warn-error -3-9)))) + EOF +} + +src_compile() { + emake -j1 opam-installer + emake -j1 ${PN}.install +} diff --git a/dev-ml/opam-core/opam-core-2.1.3.ebuild b/dev-ml/opam-core/opam-core-2.1.3.ebuild new file mode 100644 index 000000000000..d24631cb0935 --- /dev/null +++ b/dev-ml/opam-core/opam-core-2.1.3.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# We are opam +OPAM_INSTALLER_DEP=" " +inherit opam + +DESCRIPTION="Core libraries for opam" +HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam" +SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz" +S="${WORKDIR}/opam-${PV}" +OPAM_INSTALLER="${S}/opam-installer" + +LICENSE="LGPL-2.1" +SLOT="0/${PV}" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" + +RDEPEND=" + dev-ml/ocamlgraph:= + dev-ml/re:= + dev-ml/opam-file-format:= + dev-ml/cmdliner:= +" +DEPEND="${RDEPEND} + dev-ml/cppo" + +PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch ) + +src_prepare() { + default + cat <<- EOF >> "${S}/dune" + (env + (dev + (flags (:standard -warn-error -3-9))) + (release + (flags (:standard -warn-error -3-9)))) + EOF +} + +src_compile() { + emake -j1 opam-installer + emake -j1 ${PN}.install +} diff --git a/dev-ml/opam-file-format/Manifest b/dev-ml/opam-file-format/Manifest index 3223c3fa1c8f..0d5bedfdd433 100644 --- a/dev-ml/opam-file-format/Manifest +++ b/dev-ml/opam-file-format/Manifest @@ -1 +1,3 @@ -DIST opam-file-format-2.0.0_beta3.tar.gz 7654 BLAKE2B fa9ea04af0973fd52e0147d751116484e65ffb64369a19701740f0e1c81504e4f10574c3aeb5052f2cba02355d0c14875cea0f55694b74e70afffc20fccd7e88 SHA512 7f4989711e4dc183086b6dccc512ecfe78bfbbd98af954560d5a2c945b8b32416f3a01902203ef78932451cd99a5c1b1571edf70581bd14a2a94e32f5d4dd818 +DIST opam-file-format-2.1.3.tar.gz 36255 BLAKE2B eabd343d1ebb5708e57a125cf6f15105e263d0cc0885717df58249313de77cf1063efa2fc0f9b92d67a83649f3bdd8fa65c13077ca4b3814182ec750701570a1 SHA512 90da53a2b19eb97c17ec71d3ac00969863ef3458f421189413b3ec2d96f8822da9fba51ef95f55064bbb17f1729104a1fe4fed1d61d5006568b53165f0c6931f +DIST opam-file-format-2.1.5.tar.gz 36682 BLAKE2B 3766497f930db4f72e2c7968684b53038846dfd5ef609846b455dcc946d7f6b71a843fc684ba4b16c8e06176d57089d56d9d333423349491f9a4d7d947a0a9dc SHA512 9bb9daa31877e1555b75c6d91566bceee175397f37bf8359ffce3cac16a72f48543d6ff5a03e8bf42aef6e1e499b3a2ce6054b00356a937214848b6b87c2315f +DIST opam-file-format-2.1.6.tar.gz 36809 BLAKE2B 0e6356d0515b1af6e11fbc3ba3c5c594f101c112b7bb9228a79ed1fc6042e2b363ba95605a387b571b6bd16bd57ac416aa7703f0298c8e21851ba278ff47f0bd SHA512 89148dceacc523bcd3b65ecc60cbef2270a9618f7d97c5655060adef5c99986fa37910c9622d328a6371a0409a371158cec919f5100cf6d85110cd7cfdf2bb85 diff --git a/dev-ml/opam-file-format/metadata.xml b/dev-ml/opam-file-format/metadata.xml index 6c62d17c464e..07bf3a7cbd83 100644 --- a/dev-ml/opam-file-format/metadata.xml +++ b/dev-ml/opam-file-format/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">ocaml/opam-file-format</remote-id> - </upstream> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">ocaml/opam-file-format</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-ml/opam-file-format/opam-file-format-2.0.0_beta3.ebuild b/dev-ml/opam-file-format/opam-file-format-2.1.3.ebuild index e932f300db77..9ab5be37d47c 100644 --- a/dev-ml/opam-file-format/opam-file-format-2.0.0_beta3.ebuild +++ b/dev-ml/opam-file-format/opam-file-format-2.1.3.ebuild @@ -1,11 +1,12 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit findlib +inherit dune MY_PV="${PV/_beta/-beta}" +MY_PV="${MY_PV/_rc/-rc}" S="${WORKDIR}/${PN}-${MY_PV}" DESCRIPTION="Parser and printer for the opam file syntax" @@ -13,17 +14,9 @@ HOMEPAGE="https://github.com/ocaml/opam-file-format" SRC_URI="https://github.com/ocaml/opam-file-format/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64" -IUSE="+ocamlopt" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" -DEPEND="dev-lang/ocaml:=[ocamlopt?]" -RDEPEND="${DEPEND}" - -src_compile() { - emake byte $(usex ocamlopt native "") -} - -src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="$(ocamlc -where)" install -} +DEPEND="test? ( dev-ml/alcotest )" diff --git a/dev-ml/opam-file-format/opam-file-format-2.1.5.ebuild b/dev-ml/opam-file-format/opam-file-format-2.1.5.ebuild new file mode 100644 index 000000000000..5895e88e651a --- /dev/null +++ b/dev-ml/opam-file-format/opam-file-format-2.1.5.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +MY_PV="${PV/_beta/-beta}" +MY_PV="${MY_PV/_rc/-rc}" +S="${WORKDIR}/${PN}-${MY_PV}" + +DESCRIPTION="Parser and printer for the opam file syntax" +HOMEPAGE="https://github.com/ocaml/opam-file-format" +SRC_URI="https://github.com/ocaml/opam-file-format/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0/${PV}" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +DEPEND="test? ( dev-ml/alcotest )" diff --git a/dev-ml/opam-file-format/opam-file-format-2.1.6.ebuild b/dev-ml/opam-file-format/opam-file-format-2.1.6.ebuild new file mode 100644 index 000000000000..d5bd655ecace --- /dev/null +++ b/dev-ml/opam-file-format/opam-file-format-2.1.6.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +MY_PV="${PV/_beta/-beta}" +MY_PV="${MY_PV/_rc/-rc}" +S="${WORKDIR}/${PN}-${MY_PV}" + +DESCRIPTION="Parser and printer for the opam file syntax" +HOMEPAGE="https://github.com/ocaml/opam-file-format" +SRC_URI="https://github.com/ocaml/opam-file-format/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +DEPEND="test? ( dev-ml/alcotest )" diff --git a/dev-ml/opam-format/Manifest b/dev-ml/opam-format/Manifest new file mode 100644 index 000000000000..13cb1b80d395 --- /dev/null +++ b/dev-ml/opam-format/Manifest @@ -0,0 +1,5 @@ +DIST opam-2.0.10.tar.gz 641739 BLAKE2B 7cd201fe6bed2ae81fc8d9d0a7063b284621e579713c2b8672a5ea37cd7516a030367664823c75594a789136ffe5b313818fa120fb64e499b8276706700df776 SHA512 49218a14c3b7e2f47052c1fb6907b54086f5af4adb43d120065c77f2c573d72136ac64f55f577a613eb43ebe29fbe14f9ac0e25756209ca7a572aa35a4410a5d +DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e513736a27904a4e471d1eaf432db72998251ac786cb8fbf1ad425fff42b772c5d26934e0929aae75c0946d4659 SHA512 0d8ee19ac0f3df9de4fd9cfa8daab1f7228f090f5e2e7e26bedf24d8c2ab377aade95048f2d7cd9ee9dbbe738729e26dc99f41f730fa2252df74953362464a22 +DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608 +DIST opam-2.1.2.tar.gz 818848 BLAKE2B ffb50f3cf1421aa9bff6877d636a3d1d1cc2c2e3961ecd60fcae8a35b069c8d22e7a36bf17cb8166533621a3c85a82195fd3fa646b2fd8dcea9e626b61d5b86c SHA512 bea6f75728a6ef25bcae4f8903dde7a297df7186208dccacb3f58bd6a0caec551c11b79e8544f0983feac038971dbe49481fc405a5962973a5f56ec811abe396 +DIST opam-2.1.3.tar.gz 832450 BLAKE2B c5e50c0a41b7197bc7645eaef0d8cba79c978b4432fc824aa6a4280df65ec7d59df52a22b76877da4949c8562a5fecb8da2a179ca67bd312bf9a514961bf4444 SHA512 040e4f58f93e962ff422617ce0d35ed45dd86921a9aac3505914c33dd942d0e5e5771e7e1774046504f9aa84f32bc4fbd6ac7720fbea862d48bf1ca29e02cefc 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 new file mode 100644 index 000000000000..a8af27416df1 --- /dev/null +++ b/dev-ml/opam-format/files/debian-Port-to-Dose3-6.0.1.patch @@ -0,0 +1,142 @@ +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/metadata.xml b/dev-ml/opam-format/metadata.xml new file mode 100644 index 000000000000..8ee8dbb51969 --- /dev/null +++ b/dev-ml/opam-format/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">ocaml/opam</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/opam-format/opam-format-2.0.10.ebuild b/dev-ml/opam-format/opam-format-2.0.10.ebuild new file mode 100644 index 000000000000..ef61d2b92d0b --- /dev/null +++ b/dev-ml/opam-format/opam-format-2.0.10.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# We are opam +OPAM_INSTALLER_DEP=" " +inherit dune + +DESCRIPTION="Core libraries for opam" +HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam" +SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz" +S="${WORKDIR}/opam-${PV}" +OPAM_INSTALLER="${S}/opam-installer" + +LICENSE="LGPL-2.1" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + ~dev-ml/opam-core-${PV}:= + dev-ml/re:= + dev-ml/opam-file-format:= + >=dev-ml/dose3-6.0:= +" +DEPEND="${RDEPEND} + dev-ml/cppo" +BDEPEND="test? ( + sys-apps/bubblewrap + dev-ml/mccs +)" + +# Cherry-picked from https://deb.debian.org/debian/pool/main/o/opam/opam_2.0.8-1.debian.tar.xz +PATCHES=( "${FILESDIR}/debian-Port-to-Dose3-6.0.1.patch" ) + +src_prepare() { + default + cat <<- EOF >> "${S}/dune" + (env + (dev + (flags (:standard -warn-error -3-9-33))) + (release + (flags (:standard -warn-error -3-9-33)))) + EOF +} diff --git a/dev-ml/opam-format/opam-format-2.0.9.ebuild b/dev-ml/opam-format/opam-format-2.0.9.ebuild new file mode 100644 index 000000000000..e9c7e673404f --- /dev/null +++ b/dev-ml/opam-format/opam-format-2.0.9.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# We are opam +OPAM_INSTALLER_DEP=" " +inherit dune + +DESCRIPTION="Core libraries for opam" +HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam" +SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz" +S="${WORKDIR}/opam-${PV}" +OPAM_INSTALLER="${S}/opam-installer" + +LICENSE="LGPL-2.1" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + ~dev-ml/opam-core-${PV}:= + dev-ml/re:= + dev-ml/opam-file-format:= + >=dev-ml/dose3-6.0:= +" +DEPEND="${RDEPEND} + dev-ml/cppo" +BDEPEND="test? ( + sys-apps/bubblewrap + dev-ml/mccs +)" + +# Cherry-picked from https://deb.debian.org/debian/pool/main/o/opam/opam_2.0.8-1.debian.tar.xz +PATCHES=( "${FILESDIR}/debian-Port-to-Dose3-6.0.1.patch" ) + +src_prepare() { + default + cat <<- EOF >> "${S}/dune" + (env + (dev + (flags (:standard -warn-error -3-9-33))) + (release + (flags (:standard -warn-error -3-9-33)))) + EOF +} diff --git a/dev-ml/opam-format/opam-format-2.1.2-r1.ebuild b/dev-ml/opam-format/opam-format-2.1.2-r1.ebuild new file mode 100644 index 000000000000..bbcedda93726 --- /dev/null +++ b/dev-ml/opam-format/opam-format-2.1.2-r1.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# We are opam +OPAM_INSTALLER_DEP=" " +inherit dune + +DESCRIPTION="Core libraries for opam" +HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam" +SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz" +S="${WORKDIR}/opam-${PV}" +OPAM_INSTALLER="${S}/opam-installer" + +LICENSE="LGPL-2.1" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + ~dev-ml/opam-core-${PV}:= + dev-ml/re:= + dev-ml/opam-file-format:= + >=dev-ml/dose3-6.0:= + dev-ml/mccs:= +" +DEPEND="${RDEPEND} + dev-ml/cppo" +BDEPEND="test? ( + sys-apps/bubblewrap +)" + +PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch ) + +src_prepare() { + default + cat <<- EOF >> "${S}/dune" + (env + (dev + (flags (:standard -warn-error -3-9-33))) + (release + (flags (:standard -warn-error -3-9-33)))) + EOF + sed -i \ + -e '/wrap-build-commands/d' \ + -e '/wrap-install-commands/d' \ + -e '/wrap-remove-commands/d' \ + tests/reftests/opamroot-versions.test \ + || die +} diff --git a/dev-ml/opam-format/opam-format-2.1.3.ebuild b/dev-ml/opam-format/opam-format-2.1.3.ebuild new file mode 100644 index 000000000000..52f318639125 --- /dev/null +++ b/dev-ml/opam-format/opam-format-2.1.3.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# We are opam +OPAM_INSTALLER_DEP=" " +inherit dune + +DESCRIPTION="Core libraries for opam" +HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam" +SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz" +S="${WORKDIR}/opam-${PV}" +OPAM_INSTALLER="${S}/opam-installer" + +LICENSE="LGPL-2.1" +SLOT="0/${PV}" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt test" +RESTRICT="test" #sandbox not working + +RDEPEND=" + ~dev-ml/opam-core-${PV}:= + dev-ml/re:= + dev-ml/opam-file-format:= + >=dev-ml/dose3-6.0:= + dev-ml/mccs:= +" +DEPEND="${RDEPEND} + dev-ml/cppo" +BDEPEND="test? ( + sys-apps/bubblewrap +)" + +PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch ) + +src_prepare() { + default + cat <<- EOF >> "${S}/dune" + (env + (dev + (flags (:standard -warn-error -3-9-33))) + (release + (flags (:standard -warn-error -3-9-33)))) + EOF + sed -i \ + -e '/wrap-build-commands/d' \ + -e '/wrap-install-commands/d' \ + -e '/wrap-remove-commands/d' \ + tests/reftests/opamroot-versions.test \ + || die +} diff --git a/dev-ml/opam-installer/Manifest b/dev-ml/opam-installer/Manifest new file mode 100644 index 000000000000..4f87075e8b29 --- /dev/null +++ b/dev-ml/opam-installer/Manifest @@ -0,0 +1,5 @@ +DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608 +DIST opam-full-2.0.10.tar.gz 8173617 BLAKE2B 6bf7a52835512b3de5bcf0de24f5ba3a322f718e6b590902add5ca162e449e40fa3c27cff7b042240441c031303b24cf6b1a100d7f7c3c0cc275d47e60c0bce1 SHA512 05c6bd7e08f131c910871867590a6eb95b488d943ebbb0f93212f2101f09f54dcffd5d6492c9e2edf0485e3ee681815c6353d43ef185bc934fc8afb84d02cf5f +DIST opam-full-2.0.9.tar.gz 8029605 BLAKE2B c2ae06bdbbdbe9db270ec0027ec8d13a228f0af2ae5089476fa3a698d27e1f47abf2e3a15ecc9ca610717ba6b979b4ca76cce56c52f6592ae789b88fb5e5b68d SHA512 9f44d878a2599a876f5e5b9b7457b6f446a5e59156ed3d449dcc29e40c44df8b69da619eabdf030e45526fba4bd9a00c65dec2c36552d2e03788596b0aceee85 +DIST opam-full-2.1.2.tar.gz 9442446 BLAKE2B fe5447fe8f9bcedb30bf455e93b54a37e950e2944f6f501545bdccf6d989de2da90106938efb6a12c1b9454ecefed5be9906d65a15a4d0244302ad7ccff170db SHA512 fe12aaa27168435a978c472926d40697af0a7619a529c4bfacd0b71469dfcd534f43164bc74f60f740a735d38a869ae5e87e2414119f4f3fc1826315e8a075cd +DIST opam-full-2.1.3.tar.gz 9618995 BLAKE2B 6f33e70c2e59be87b643840128b46441828d3d83888f5d321ac23d33b2fbc4d3163cb4303ac82a7f863abcc9300227bbc48bca3b8db5d6fbcebf0e6cf8869a5d SHA512 fe3a3c86335830944683a39a34a9eb385037476853ab3e2a82b8571a9e2021830cccf25cbd5bb891d239f6a47584c1b1d91aa445e6e2a814847346c5cc526ff1 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 new file mode 100644 index 000000000000..a8af27416df1 --- /dev/null +++ b/dev-ml/opam-installer/files/debian-Port-to-Dose3-6.0.1.patch @@ -0,0 +1,142 @@ +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/metadata.xml b/dev-ml/opam-installer/metadata.xml new file mode 100644 index 000000000000..8ee8dbb51969 --- /dev/null +++ b/dev-ml/opam-installer/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">ocaml/opam</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/opam-installer/opam-installer-2.0.10-r1.ebuild b/dev-ml/opam-installer/opam-installer-2.0.10-r1.ebuild new file mode 100644 index 000000000000..a33b53110bc8 --- /dev/null +++ b/dev-ml/opam-installer/opam-installer-2.0.10-r1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# We are opam +OPAM_INSTALLER_DEP=" " +OPAM_SKIP_VALIDATION=yes +inherit opam + +DESCRIPTION="Core installer for opam packages" +HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam" +SRC_URI="https://github.com/ocaml/opam/releases/download/${PV}/opam-full-${PV}.tar.gz" +S="${WORKDIR}/opam-full-${PV/_/-}" +OPAM_INSTALLER="${S}/opam-installer" + +LICENSE="LGPL-2.1" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" + +# Cherry-picked from https://deb.debian.org/debian/pool/main/o/opam/opam_2.0.8-1.debian.tar.xz +PATCHES=( "${FILESDIR}/debian-Port-to-Dose3-6.0.1.patch" ) + +RDEPEND=" + >=dev-lang/ocaml-4.02.3:= + dev-ml/cmdliner:= + ~dev-ml/opam-format-${PV}:= + >=dev-ml/dose3-6:= +" +DEPEND="${RDEPEND} + dev-ml/findlib" + +src_configure() { + econf \ + --prefix="${EPREFIX}/usr" \ + --with-mccs \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + --mandir="${EPREFIX}/usr/share/man" +} + +src_compile() { + sed -e 's/DUNE = .*$/DUNE = /' -i Makefile.config + #passing -jX to the dune build leads to errors + #see: https://github.com/ocaml/opam/issues/3585 + emake DUNE_PROMOTE_ARG="" -j1 +} diff --git a/dev-ml/opam-installer/opam-installer-2.0.9-r1.ebuild b/dev-ml/opam-installer/opam-installer-2.0.9-r1.ebuild new file mode 100644 index 000000000000..eab5b13a534a --- /dev/null +++ b/dev-ml/opam-installer/opam-installer-2.0.9-r1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# We are opam +OPAM_INSTALLER_DEP=" " +OPAM_SKIP_VALIDATION=yes +inherit opam + +DESCRIPTION="Core installer for opam packages" +HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam" +SRC_URI="https://github.com/ocaml/opam/releases/download/${PV}/opam-full-${PV}.tar.gz" +S="${WORKDIR}/opam-full-${PV/_/-}" +OPAM_INSTALLER="${S}/opam-installer" + +LICENSE="LGPL-2.1" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" + +# Cherry-picked from https://deb.debian.org/debian/pool/main/o/opam/opam_2.0.8-1.debian.tar.xz +PATCHES=( "${FILESDIR}/debian-Port-to-Dose3-6.0.1.patch" ) + +RDEPEND=" + >=dev-lang/ocaml-4.02.3:= + dev-ml/cmdliner:= + ~dev-ml/opam-format-${PV}:= + >=dev-ml/dose3-6:= +" +DEPEND="${RDEPEND} + dev-ml/findlib" + +src_configure() { + econf \ + --prefix="${EPREFIX}/usr" \ + --with-mccs \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + --mandir="${EPREFIX}/usr/share/man" +} + +src_compile() { + sed -e 's/DUNE = .*$/DUNE = /' -i Makefile.config + #passing -jX to the dune build leads to errors + #see: https://github.com/ocaml/opam/issues/3585 + emake DUNE_PROMOTE_ARG="" -j1 +} diff --git a/dev-ml/opam-installer/opam-installer-2.1.2-r1.ebuild b/dev-ml/opam-installer/opam-installer-2.1.2-r1.ebuild new file mode 100644 index 000000000000..5010cdd1712d --- /dev/null +++ b/dev-ml/opam-installer/opam-installer-2.1.2-r1.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# We are opam +OPAM_INSTALLER_DEP=" " +OPAM_SKIP_VALIDATION=yes +inherit dune + +DESCRIPTION="Core installer for opam packages" +HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam" +SRC_URI="https://github.com/ocaml/opam/releases/download/${PV}/opam-full-${PV}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz" +S="${WORKDIR}/opam-full-${PV/_/-}" +OPAM_INSTALLER="${S}/_build/install/default/bin/opam-installer" + +LICENSE="LGPL-2.1" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch ) + +RDEPEND=" + >=dev-lang/ocaml-4.02.3:= + dev-ml/cmdliner:= + ~dev-ml/opam-format-${PV}:= + >=dev-ml/dose3-6:= +" +DEPEND="${RDEPEND} + dev-ml/findlib" + +src_configure() { + econf \ + --prefix="${EPREFIX}/usr" \ + --with-mccs \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + --mandir="${EPREFIX}/usr/share/man" +} diff --git a/dev-ml/opam-installer/opam-installer-2.1.3.ebuild b/dev-ml/opam-installer/opam-installer-2.1.3.ebuild new file mode 100644 index 000000000000..e580796a2e99 --- /dev/null +++ b/dev-ml/opam-installer/opam-installer-2.1.3.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# We are opam +OPAM_INSTALLER_DEP=" " +OPAM_SKIP_VALIDATION=yes +inherit dune + +DESCRIPTION="Core installer for opam packages" +HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam" +SRC_URI="https://github.com/ocaml/opam/releases/download/${PV}/opam-full-${PV}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz" +S="${WORKDIR}/opam-full-${PV/_/-}" +OPAM_INSTALLER="${S}/_build/install/default/bin/opam-installer" + +LICENSE="LGPL-2.1" +SLOT="0/${PV}" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" +RESTRICT="test" # sandbox not working + +PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch ) + +RDEPEND=" + >=dev-lang/ocaml-4.02.3:= + dev-ml/cmdliner:= + ~dev-ml/opam-format-${PV}:= + >=dev-ml/dose3-6:= +" +DEPEND="${RDEPEND} + dev-ml/findlib" + +src_configure() { + econf \ + --prefix="${EPREFIX}/usr" \ + --with-mccs \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + --mandir="${EPREFIX}/usr/share/man" +} diff --git a/dev-ml/opam-repository/Manifest b/dev-ml/opam-repository/Manifest new file mode 100644 index 000000000000..13cb1b80d395 --- /dev/null +++ b/dev-ml/opam-repository/Manifest @@ -0,0 +1,5 @@ +DIST opam-2.0.10.tar.gz 641739 BLAKE2B 7cd201fe6bed2ae81fc8d9d0a7063b284621e579713c2b8672a5ea37cd7516a030367664823c75594a789136ffe5b313818fa120fb64e499b8276706700df776 SHA512 49218a14c3b7e2f47052c1fb6907b54086f5af4adb43d120065c77f2c573d72136ac64f55f577a613eb43ebe29fbe14f9ac0e25756209ca7a572aa35a4410a5d +DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e513736a27904a4e471d1eaf432db72998251ac786cb8fbf1ad425fff42b772c5d26934e0929aae75c0946d4659 SHA512 0d8ee19ac0f3df9de4fd9cfa8daab1f7228f090f5e2e7e26bedf24d8c2ab377aade95048f2d7cd9ee9dbbe738729e26dc99f41f730fa2252df74953362464a22 +DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608 +DIST opam-2.1.2.tar.gz 818848 BLAKE2B ffb50f3cf1421aa9bff6877d636a3d1d1cc2c2e3961ecd60fcae8a35b069c8d22e7a36bf17cb8166533621a3c85a82195fd3fa646b2fd8dcea9e626b61d5b86c SHA512 bea6f75728a6ef25bcae4f8903dde7a297df7186208dccacb3f58bd6a0caec551c11b79e8544f0983feac038971dbe49481fc405a5962973a5f56ec811abe396 +DIST opam-2.1.3.tar.gz 832450 BLAKE2B c5e50c0a41b7197bc7645eaef0d8cba79c978b4432fc824aa6a4280df65ec7d59df52a22b76877da4949c8562a5fecb8da2a179ca67bd312bf9a514961bf4444 SHA512 040e4f58f93e962ff422617ce0d35ed45dd86921a9aac3505914c33dd942d0e5e5771e7e1774046504f9aa84f32bc4fbd6ac7720fbea862d48bf1ca29e02cefc 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 new file mode 100644 index 000000000000..a8af27416df1 --- /dev/null +++ b/dev-ml/opam-repository/files/debian-Port-to-Dose3-6.0.1.patch @@ -0,0 +1,142 @@ +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-repository/metadata.xml b/dev-ml/opam-repository/metadata.xml new file mode 100644 index 000000000000..8ee8dbb51969 --- /dev/null +++ b/dev-ml/opam-repository/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">ocaml/opam</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/opam-repository/opam-repository-2.0.10.ebuild b/dev-ml/opam-repository/opam-repository-2.0.10.ebuild new file mode 100644 index 000000000000..5cf5aea1620d --- /dev/null +++ b/dev-ml/opam-repository/opam-repository-2.0.10.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="opam repository libraries" +HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam" +SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz" +S="${WORKDIR}/opam-${PV/_/-}" + +LICENSE="LGPL-2.1" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt" +RESTRICT="test" + +RDEPEND=" + ~dev-ml/opam-format-${PV}:= + dev-ml/re:= + >=dev-ml/dose3-6.0:= + dev-ml/opam-file-format:= +" +DEPEND="${RDEPEND}" + +# Cherry-picked from https://deb.debian.org/debian/pool/main/o/opam/opam_2.0.8-1.debian.tar.xz +PATCHES=( "${FILESDIR}/debian-Port-to-Dose3-6.0.1.patch" ) + +src_prepare() { + default + cat <<- EOF >> "${S}/dune" + (env + (dev + (flags (:standard -warn-error -3-9-33))) + (release + (flags (:standard -warn-error -3-9-33)))) + EOF +} diff --git a/dev-ml/opam-repository/opam-repository-2.0.9.ebuild b/dev-ml/opam-repository/opam-repository-2.0.9.ebuild new file mode 100644 index 000000000000..588a5744eb82 --- /dev/null +++ b/dev-ml/opam-repository/opam-repository-2.0.9.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="opam repository libraries" +HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam" +SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz" +S="${WORKDIR}/opam-${PV/_/-}" + +LICENSE="LGPL-2.1" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt" +RESTRICT="test" + +RDEPEND=" + ~dev-ml/opam-format-${PV}:= + dev-ml/re:= + >=dev-ml/dose3-6.0:= + dev-ml/opam-file-format:= +" +DEPEND="${RDEPEND}" + +# Cherry-picked from https://deb.debian.org/debian/pool/main/o/opam/opam_2.0.8-1.debian.tar.xz +PATCHES=( "${FILESDIR}/debian-Port-to-Dose3-6.0.1.patch" ) + +src_prepare() { + default + cat <<- EOF >> "${S}/dune" + (env + (dev + (flags (:standard -warn-error -3-9-33))) + (release + (flags (:standard -warn-error -3-9-33)))) + EOF +} diff --git a/dev-ml/opam-repository/opam-repository-2.1.2.ebuild b/dev-ml/opam-repository/opam-repository-2.1.2.ebuild new file mode 100644 index 000000000000..bf653aac8dc9 --- /dev/null +++ b/dev-ml/opam-repository/opam-repository-2.1.2.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="opam repository libraries" +HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam" +SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz" +S="${WORKDIR}/opam-${PV/_/-}" + +LICENSE="LGPL-2.1" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" +RESTRICT="test" + +RDEPEND=" + ~dev-ml/opam-format-${PV}:= + dev-ml/re:= + >=dev-ml/dose3-6.0:= + dev-ml/opam-file-format:= +" +DEPEND="${RDEPEND}" + +PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch ) + +src_prepare() { + default + cat <<- EOF >> "${S}/dune" + (env + (dev + (flags (:standard -warn-error -3-9-33))) + (release + (flags (:standard -warn-error -3-9-33)))) + EOF +} diff --git a/dev-ml/opam-repository/opam-repository-2.1.3.ebuild b/dev-ml/opam-repository/opam-repository-2.1.3.ebuild new file mode 100644 index 000000000000..6e222bc9732d --- /dev/null +++ b/dev-ml/opam-repository/opam-repository-2.1.3.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="opam repository libraries" +HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam" +SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz" +S="${WORKDIR}/opam-${PV/_/-}" + +LICENSE="LGPL-2.1" +SLOT="0/${PV}" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" +RESTRICT="test" + +RDEPEND=" + ~dev-ml/opam-format-${PV}:= + dev-ml/re:= + >=dev-ml/dose3-6.0:= + dev-ml/opam-file-format:= +" +DEPEND="${RDEPEND}" + +PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch ) + +src_prepare() { + default + cat <<- EOF >> "${S}/dune" + (env + (dev + (flags (:standard -warn-error -3-9-33))) + (release + (flags (:standard -warn-error -3-9-33)))) + EOF +} diff --git a/dev-ml/opam-solver/Manifest b/dev-ml/opam-solver/Manifest new file mode 100644 index 000000000000..13cb1b80d395 --- /dev/null +++ b/dev-ml/opam-solver/Manifest @@ -0,0 +1,5 @@ +DIST opam-2.0.10.tar.gz 641739 BLAKE2B 7cd201fe6bed2ae81fc8d9d0a7063b284621e579713c2b8672a5ea37cd7516a030367664823c75594a789136ffe5b313818fa120fb64e499b8276706700df776 SHA512 49218a14c3b7e2f47052c1fb6907b54086f5af4adb43d120065c77f2c573d72136ac64f55f577a613eb43ebe29fbe14f9ac0e25756209ca7a572aa35a4410a5d +DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e513736a27904a4e471d1eaf432db72998251ac786cb8fbf1ad425fff42b772c5d26934e0929aae75c0946d4659 SHA512 0d8ee19ac0f3df9de4fd9cfa8daab1f7228f090f5e2e7e26bedf24d8c2ab377aade95048f2d7cd9ee9dbbe738729e26dc99f41f730fa2252df74953362464a22 +DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608 +DIST opam-2.1.2.tar.gz 818848 BLAKE2B ffb50f3cf1421aa9bff6877d636a3d1d1cc2c2e3961ecd60fcae8a35b069c8d22e7a36bf17cb8166533621a3c85a82195fd3fa646b2fd8dcea9e626b61d5b86c SHA512 bea6f75728a6ef25bcae4f8903dde7a297df7186208dccacb3f58bd6a0caec551c11b79e8544f0983feac038971dbe49481fc405a5962973a5f56ec811abe396 +DIST opam-2.1.3.tar.gz 832450 BLAKE2B c5e50c0a41b7197bc7645eaef0d8cba79c978b4432fc824aa6a4280df65ec7d59df52a22b76877da4949c8562a5fecb8da2a179ca67bd312bf9a514961bf4444 SHA512 040e4f58f93e962ff422617ce0d35ed45dd86921a9aac3505914c33dd942d0e5e5771e7e1774046504f9aa84f32bc4fbd6ac7720fbea862d48bf1ca29e02cefc 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 new file mode 100644 index 000000000000..a8af27416df1 --- /dev/null +++ b/dev-ml/opam-solver/files/debian-Port-to-Dose3-6.0.1.patch @@ -0,0 +1,142 @@ +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/metadata.xml b/dev-ml/opam-solver/metadata.xml new file mode 100644 index 000000000000..8ee8dbb51969 --- /dev/null +++ b/dev-ml/opam-solver/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">ocaml/opam</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/opam-solver/opam-solver-2.0.10.ebuild b/dev-ml/opam-solver/opam-solver-2.0.10.ebuild new file mode 100644 index 000000000000..3e8c086a960a --- /dev/null +++ b/dev-ml/opam-solver/opam-solver-2.0.10.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="opam solver" +HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam" +SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz" +S="${WORKDIR}/opam-${PV/_/-}" + +LICENSE="LGPL-2.1" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + ~dev-ml/opam-format-${PV}:= + dev-ml/opam-file-format:= + dev-ml/re:= + >=dev-ml/mccs-1.1.4:= + >=dev-ml/dose3-6.0:= + dev-ml/cudf:= +" +DEPEND="${RDEPEND} + test? ( dev-ml/opam-client )" + +# Cherry-picked from https://deb.debian.org/debian/pool/main/o/opam/opam_2.0.8-1.debian.tar.xz +PATCHES=( "${FILESDIR}/debian-Port-to-Dose3-6.0.1.patch" ) + +src_prepare() { + default + cat <<- EOF >> "${S}/dune" + (env + (dev + (flags (:standard -warn-error -3-9-33))) + (release + (flags (:standard -warn-error -3-9-33)))) + EOF +} diff --git a/dev-ml/opam-solver/opam-solver-2.0.9.ebuild b/dev-ml/opam-solver/opam-solver-2.0.9.ebuild new file mode 100644 index 000000000000..5cd0e4230cb6 --- /dev/null +++ b/dev-ml/opam-solver/opam-solver-2.0.9.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="opam solver" +HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam" +SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz" +S="${WORKDIR}/opam-${PV/_/-}" + +LICENSE="LGPL-2.1" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + ~dev-ml/opam-format-${PV}:= + dev-ml/opam-file-format:= + dev-ml/re:= + >=dev-ml/mccs-1.1.4:= + >=dev-ml/dose3-6.0:= + dev-ml/cudf:= +" +DEPEND="${RDEPEND} + test? ( dev-ml/opam-client )" + +# Cherry-picked from https://deb.debian.org/debian/pool/main/o/opam/opam_2.0.8-1.debian.tar.xz +PATCHES=( "${FILESDIR}/debian-Port-to-Dose3-6.0.1.patch" ) + +src_prepare() { + default + cat <<- EOF >> "${S}/dune" + (env + (dev + (flags (:standard -warn-error -3-9-33))) + (release + (flags (:standard -warn-error -3-9-33)))) + EOF +} diff --git a/dev-ml/opam-solver/opam-solver-2.1.2.ebuild b/dev-ml/opam-solver/opam-solver-2.1.2.ebuild new file mode 100644 index 000000000000..c1e2675a92cc --- /dev/null +++ b/dev-ml/opam-solver/opam-solver-2.1.2.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="opam solver" +HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam" +SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz" +S="${WORKDIR}/opam-${PV/_/-}" + +LICENSE="LGPL-2.1" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + ~dev-ml/opam-format-${PV}:= + dev-ml/opam-file-format:= + dev-ml/re:= + >=dev-ml/mccs-1.1.4:= + >=dev-ml/dose3-6.0:= + dev-ml/cudf:= +" +DEPEND="${RDEPEND} + test? ( dev-ml/opam-client )" + +PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch ) + +src_prepare() { + default + cat <<- EOF >> "${S}/dune" + (env + (dev + (flags (:standard -warn-error -3-9-33))) + (release + (flags (:standard -warn-error -3-9-33)))) + EOF +} diff --git a/dev-ml/opam-solver/opam-solver-2.1.3.ebuild b/dev-ml/opam-solver/opam-solver-2.1.3.ebuild new file mode 100644 index 000000000000..a6a362cb5691 --- /dev/null +++ b/dev-ml/opam-solver/opam-solver-2.1.3.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="opam solver" +HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam" +SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz" +S="${WORKDIR}/opam-${PV/_/-}" + +LICENSE="LGPL-2.1" +SLOT="0/${PV}" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt test" +RESTRICT="test" # sandbox not working + +RDEPEND=" + ~dev-ml/opam-format-${PV}:= + dev-ml/opam-file-format:= + dev-ml/re:= + >=dev-ml/mccs-1.1.4:= + >=dev-ml/dose3-6.0:= + dev-ml/cudf:= +" +DEPEND="${RDEPEND} + test? ( dev-ml/opam-client )" + +PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch ) + +src_prepare() { + default + cat <<- EOF >> "${S}/dune" + (env + (dev + (flags (:standard -warn-error -3-9-33))) + (release + (flags (:standard -warn-error -3-9-33)))) + EOF +} diff --git a/dev-ml/opam-state/Manifest b/dev-ml/opam-state/Manifest new file mode 100644 index 000000000000..13cb1b80d395 --- /dev/null +++ b/dev-ml/opam-state/Manifest @@ -0,0 +1,5 @@ +DIST opam-2.0.10.tar.gz 641739 BLAKE2B 7cd201fe6bed2ae81fc8d9d0a7063b284621e579713c2b8672a5ea37cd7516a030367664823c75594a789136ffe5b313818fa120fb64e499b8276706700df776 SHA512 49218a14c3b7e2f47052c1fb6907b54086f5af4adb43d120065c77f2c573d72136ac64f55f577a613eb43ebe29fbe14f9ac0e25756209ca7a572aa35a4410a5d +DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e513736a27904a4e471d1eaf432db72998251ac786cb8fbf1ad425fff42b772c5d26934e0929aae75c0946d4659 SHA512 0d8ee19ac0f3df9de4fd9cfa8daab1f7228f090f5e2e7e26bedf24d8c2ab377aade95048f2d7cd9ee9dbbe738729e26dc99f41f730fa2252df74953362464a22 +DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608 +DIST opam-2.1.2.tar.gz 818848 BLAKE2B ffb50f3cf1421aa9bff6877d636a3d1d1cc2c2e3961ecd60fcae8a35b069c8d22e7a36bf17cb8166533621a3c85a82195fd3fa646b2fd8dcea9e626b61d5b86c SHA512 bea6f75728a6ef25bcae4f8903dde7a297df7186208dccacb3f58bd6a0caec551c11b79e8544f0983feac038971dbe49481fc405a5962973a5f56ec811abe396 +DIST opam-2.1.3.tar.gz 832450 BLAKE2B c5e50c0a41b7197bc7645eaef0d8cba79c978b4432fc824aa6a4280df65ec7d59df52a22b76877da4949c8562a5fecb8da2a179ca67bd312bf9a514961bf4444 SHA512 040e4f58f93e962ff422617ce0d35ed45dd86921a9aac3505914c33dd942d0e5e5771e7e1774046504f9aa84f32bc4fbd6ac7720fbea862d48bf1ca29e02cefc 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 new file mode 100644 index 000000000000..a8af27416df1 --- /dev/null +++ b/dev-ml/opam-state/files/debian-Port-to-Dose3-6.0.1.patch @@ -0,0 +1,142 @@ +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/metadata.xml b/dev-ml/opam-state/metadata.xml new file mode 100644 index 000000000000..8ee8dbb51969 --- /dev/null +++ b/dev-ml/opam-state/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">ocaml/opam</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/opam-state/opam-state-2.0.10.ebuild b/dev-ml/opam-state/opam-state-2.0.10.ebuild new file mode 100644 index 000000000000..0c7a4142bd32 --- /dev/null +++ b/dev-ml/opam-state/opam-state-2.0.10.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="opam state libraries" +HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam" +SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz" +S="${WORKDIR}/opam-${PV/_/-}" + +LICENSE="LGPL-2.1" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt" +RESTRICT="test" + +RDEPEND=" + dev-ml/re:= + dev-ml/opam-file-format:= + ~dev-ml/opam-repository-${PV}:= +" +DEPEND="${RDEPEND}" + +# Cherry-picked from https://deb.debian.org/debian/pool/main/o/opam/opam_2.0.8-1.debian.tar.xz +PATCHES=( "${FILESDIR}/debian-Port-to-Dose3-6.0.1.patch" ) + +src_prepare() { + default + cat <<- EOF >> "${S}/dune" + (env + (dev + (flags (:standard -warn-error -3-9-33))) + (release + (flags (:standard -warn-error -3-9-33)))) + EOF +} diff --git a/dev-ml/opam-state/opam-state-2.0.9.ebuild b/dev-ml/opam-state/opam-state-2.0.9.ebuild new file mode 100644 index 000000000000..7ae602accc10 --- /dev/null +++ b/dev-ml/opam-state/opam-state-2.0.9.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="opam state libraries" +HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam" +SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz" +S="${WORKDIR}/opam-${PV/_/-}" + +LICENSE="LGPL-2.1" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt" +RESTRICT="test" + +RDEPEND=" + dev-ml/re:= + dev-ml/opam-file-format:= + ~dev-ml/opam-repository-${PV}:= +" +DEPEND="${RDEPEND}" + +# Cherry-picked from https://deb.debian.org/debian/pool/main/o/opam/opam_2.0.8-1.debian.tar.xz +PATCHES=( "${FILESDIR}/debian-Port-to-Dose3-6.0.1.patch" ) + +src_prepare() { + default + cat <<- EOF >> "${S}/dune" + (env + (dev + (flags (:standard -warn-error -3-9-33))) + (release + (flags (:standard -warn-error -3-9-33)))) + EOF +} diff --git a/dev-ml/opam-state/opam-state-2.1.2.ebuild b/dev-ml/opam-state/opam-state-2.1.2.ebuild new file mode 100644 index 000000000000..474fe595cc07 --- /dev/null +++ b/dev-ml/opam-state/opam-state-2.1.2.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="opam state libraries" +HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam" +SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz" +S="${WORKDIR}/opam-${PV/_/-}" + +LICENSE="LGPL-2.1" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" +RESTRICT="test" + +RDEPEND=" + dev-ml/re:= + dev-ml/opam-file-format:= + ~dev-ml/opam-repository-${PV}:= +" +DEPEND="${RDEPEND}" + +PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch ) + +src_prepare() { + default + cat <<- EOF >> "${S}/dune" + (env + (dev + (flags (:standard -warn-error -3-9-33))) + (release + (flags (:standard -warn-error -3-9-33)))) + EOF +} diff --git a/dev-ml/opam-state/opam-state-2.1.3.ebuild b/dev-ml/opam-state/opam-state-2.1.3.ebuild new file mode 100644 index 000000000000..924b564ae78c --- /dev/null +++ b/dev-ml/opam-state/opam-state-2.1.3.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="opam state libraries" +HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam" +SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz" +S="${WORKDIR}/opam-${PV/_/-}" + +LICENSE="LGPL-2.1" +SLOT="0/${PV}" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" +RESTRICT="test" + +RDEPEND=" + dev-ml/re:= + dev-ml/opam-file-format:= + ~dev-ml/opam-repository-${PV}:= +" +DEPEND="${RDEPEND}" + +PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch ) + +src_prepare() { + default + cat <<- EOF >> "${S}/dune" + (env + (dev + (flags (:standard -warn-error -3-9-33))) + (release + (flags (:standard -warn-error -3-9-33)))) + EOF +} diff --git a/dev-ml/opam/Manifest b/dev-ml/opam/Manifest index 360c3df63cfc..13cb1b80d395 100644 --- a/dev-ml/opam/Manifest +++ b/dev-ml/opam/Manifest @@ -1 +1,5 @@ -DIST opam-1.3.1.tar.gz 669485 BLAKE2B e1aed54175d46f5dd9fd989e56c25657370356e26df6976c01dd089e381291fa04e25da295104f85d513010cd028276d80ebf7a4a77b38f3e089e52f4e64f43a SHA512 d075c9b2c9670d712f29bd2df34b8020da52041fa2bbef599cb54a81f63554507d78bebece45ecf668d3d1d4ed514e4ab88a1d86b64088d283bca7a8e75ae582 +DIST opam-2.0.10.tar.gz 641739 BLAKE2B 7cd201fe6bed2ae81fc8d9d0a7063b284621e579713c2b8672a5ea37cd7516a030367664823c75594a789136ffe5b313818fa120fb64e499b8276706700df776 SHA512 49218a14c3b7e2f47052c1fb6907b54086f5af4adb43d120065c77f2c573d72136ac64f55f577a613eb43ebe29fbe14f9ac0e25756209ca7a572aa35a4410a5d +DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e513736a27904a4e471d1eaf432db72998251ac786cb8fbf1ad425fff42b772c5d26934e0929aae75c0946d4659 SHA512 0d8ee19ac0f3df9de4fd9cfa8daab1f7228f090f5e2e7e26bedf24d8c2ab377aade95048f2d7cd9ee9dbbe738729e26dc99f41f730fa2252df74953362464a22 +DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608 +DIST opam-2.1.2.tar.gz 818848 BLAKE2B ffb50f3cf1421aa9bff6877d636a3d1d1cc2c2e3961ecd60fcae8a35b069c8d22e7a36bf17cb8166533621a3c85a82195fd3fa646b2fd8dcea9e626b61d5b86c SHA512 bea6f75728a6ef25bcae4f8903dde7a297df7186208dccacb3f58bd6a0caec551c11b79e8544f0983feac038971dbe49481fc405a5962973a5f56ec811abe396 +DIST opam-2.1.3.tar.gz 832450 BLAKE2B c5e50c0a41b7197bc7645eaef0d8cba79c978b4432fc824aa6a4280df65ec7d59df52a22b76877da4949c8562a5fecb8da2a179ca67bd312bf9a514961bf4444 SHA512 040e4f58f93e962ff422617ce0d35ed45dd86921a9aac3505914c33dd942d0e5e5771e7e1774046504f9aa84f32bc4fbd6ac7720fbea862d48bf1ca29e02cefc 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 new file mode 100644 index 000000000000..a8af27416df1 --- /dev/null +++ b/dev-ml/opam/files/debian-Port-to-Dose3-6.0.1.patch @@ -0,0 +1,142 @@ +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/stublibs.patch b/dev-ml/opam/files/stublibs.patch deleted file mode 100644 index 3cb61883233a..000000000000 --- a/dev-ml/opam/files/stublibs.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: opam-1.3.1/src/tools/opam_installer.ml -=================================================================== ---- opam-1.3.1.orig/src/tools/opam_installer.ml -+++ opam-1.3.1/src/tools/opam_installer.ml -@@ -312,7 +312,7 @@ let options = - let mandir = mk_dir mandir in - let libdir = mk_dir libdir in - let stubsdir = match mk_dir stubsdir, libdir with -- | None, Some d -> Some OpamFilename.Op.(d / "stubslibs") -+ | None, Some d -> Some OpamFilename.Op.(d / "stublibs") - | d, None | (Some _ as d), _ -> d - in - let topdir = match mk_dir topdir, libdir with diff --git a/dev-ml/opam/metadata.xml b/dev-ml/opam/metadata.xml index 417bf2d4b393..8ee8dbb51969 100644 --- a/dev-ml/opam/metadata.xml +++ b/dev-ml/opam/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">ocaml/opam</remote-id> - </upstream> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">ocaml/opam</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-ml/opam/opam-1.3.1-r1.ebuild b/dev-ml/opam/opam-1.3.1-r1.ebuild deleted file mode 100644 index 57dd504dc707..000000000000 --- a/dev-ml/opam/opam-1.3.1-r1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils - -DESCRIPTION="A source-based package manager for OCaml" -HOMEPAGE="http://opam.ocaml.org/" -LICENSE="LGPL-3-with-linking-exception" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" -IUSE="test" - -if [[ ${PV} != 9999 ]]; then - SRC_URI="https://github.com/ocaml/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -else - inherit git-r3 - EGIT_REPO_URI="https://github.com/ocaml/opam.git" -fi - -RDEPEND="dev-lang/ocaml:= - || ( net-misc/wget net-misc/curl ) - dev-ml/extlib:= - dev-ml/ocaml-re:= - dev-ml/ocamlgraph:= - dev-ml/cmdliner:= - dev-ml/cudf:= - >=dev-ml/dose3-5:= - dev-ml/uutf:= - dev-ml/jsonm:= -" -DEPEND="${RDEPEND} - dev-ml/findlib - test? ( dev-vcs/git ) -" - -src_prepare() { - epatch "${FILESDIR}/stublibs.patch" -} - -src_compile() { - emake -j1 - cd doc - emake man -} - -src_test() { - EMAIL=foo@bar.com emake -j1 tests -} - -src_install() { - default - emake DESTDIR="${D}" OPAMINSTALLER_FLAGS="--prefix=\"${ED}/usr\" --libdir=\"${D}/$(ocamlc -where)\"" libinstall -} diff --git a/dev-ml/opam/opam-2.0.10-r1.ebuild b/dev-ml/opam/opam-2.0.10-r1.ebuild new file mode 100644 index 000000000000..a4bf75322faa --- /dev/null +++ b/dev-ml/opam/opam-2.0.10-r1.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="A source-based package manager for OCaml" +HOMEPAGE="http://opam.ocaml.org/" +SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz" +S="${WORKDIR}/opam-${PV/_/-}" + +LICENSE="LGPL-2.1-with-linking-exception" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt" + +RDEPEND=" + dev-ml/cmdliner:= + dev-ml/cudf:= + >=dev-ml/dose3-6.0:= + dev-ml/extlib:= + ~dev-ml/opam-client-${PV}:= + dev-ml/opam-file-format:= + sys-apps/bubblewrap + dev-ml/re:=" +DEPEND="${RDEPEND}" + +# Cherry-picked from https://deb.debian.org/debian/pool/main/o/opam/opam_2.0.8-1.debian.tar.xz +PATCHES=( "${FILESDIR}/debian-Port-to-Dose3-6.0.1.patch" ) + +src_prepare() { + default + + cat <<- EOF >> "${S}/dune" + (env + (dev + (flags (:standard -warn-error -3-9-33))) + (release + (flags (:standard -warn-error -3-9-33)))) + EOF +} diff --git a/dev-ml/opam/opam-2.0.9.ebuild b/dev-ml/opam/opam-2.0.9.ebuild new file mode 100644 index 000000000000..8b483c415ef9 --- /dev/null +++ b/dev-ml/opam/opam-2.0.9.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="A source-based package manager for OCaml" +HOMEPAGE="http://opam.ocaml.org/" +SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz" +S="${WORKDIR}/opam-${PV/_/-}" + +LICENSE="LGPL-2.1-with-linking-exception" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt" + +RDEPEND=" + dev-ml/cmdliner:= + dev-ml/cudf:= + >=dev-ml/dose3-6.0:= + dev-ml/extlib:= + ~dev-ml/opam-client-${PV}:= + dev-ml/opam-file-format:= + sys-apps/bubblewrap + dev-ml/re:=" +DEPEND="${RDEPEND}" + +# Cherry-picked from https://deb.debian.org/debian/pool/main/o/opam/opam_2.0.8-1.debian.tar.xz +PATCHES=( "${FILESDIR}/debian-Port-to-Dose3-6.0.1.patch" ) + +src_prepare() { + default + + cat <<- EOF >> "${S}/dune" + (env + (dev + (flags (:standard -warn-error -3-9-33))) + (release + (flags (:standard -warn-error -3-9-33)))) + EOF +} diff --git a/dev-ml/opam/opam-2.1.2-r1.ebuild b/dev-ml/opam/opam-2.1.2-r1.ebuild new file mode 100644 index 000000000000..e06c25473f6b --- /dev/null +++ b/dev-ml/opam/opam-2.1.2-r1.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="A source-based package manager for OCaml" +HOMEPAGE="http://opam.ocaml.org/" +SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz" +S="${WORKDIR}/opam-${PV/_/-}" + +LICENSE="LGPL-2.1-with-linking-exception" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" +RESTRICT="test" #see bugs 838658 + +RDEPEND=" + dev-ml/cmdliner:= + dev-ml/cudf:= + >=dev-ml/dose3-6.0:= + dev-ml/extlib:= + ~dev-ml/opam-client-${PV}:= + dev-ml/opam-file-format:= + sys-apps/bubblewrap + dev-ml/re:=" +DEPEND="${RDEPEND}" + +PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch ) + +src_prepare() { + default + + cat <<- EOF >> "${S}/dune" + (env + (dev + (flags (:standard -warn-error -3-9-33))) + (release + (flags (:standard -warn-error -3-9-33)))) + EOF +} diff --git a/dev-ml/opam/opam-2.1.3.ebuild b/dev-ml/opam/opam-2.1.3.ebuild new file mode 100644 index 000000000000..a3e5be157c57 --- /dev/null +++ b/dev-ml/opam/opam-2.1.3.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="A source-based package manager for OCaml" +HOMEPAGE="http://opam.ocaml.org/" +SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz" +S="${WORKDIR}/opam-${PV/_/-}" + +LICENSE="LGPL-2.1-with-linking-exception" +SLOT="0/${PV}" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" +RESTRICT="test" #see bugs 838658 + +RDEPEND=" + dev-ml/cmdliner:= + dev-ml/cudf:= + >=dev-ml/dose3-6.0:= + dev-ml/extlib:= + ~dev-ml/opam-client-${PV}:= + dev-ml/opam-file-format:= + sys-apps/bubblewrap + dev-ml/re:=" +DEPEND="${RDEPEND}" + +PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch ) + +src_prepare() { + default + + cat <<- EOF >> "${S}/dune" + (env + (dev + (flags (:standard -warn-error -3-9-33))) + (release + (flags (:standard -warn-error -3-9-33)))) + EOF +} diff --git a/dev-ml/optcomp/Manifest b/dev-ml/optcomp/Manifest deleted file mode 100644 index b6c305e18737..000000000000 --- a/dev-ml/optcomp/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST optcomp-1.6.tar.gz 56370 BLAKE2B 15a349d7ce927d69b10424329abd59108803683cba85dcea66cea19d0465a18e43f990a8031e2b63dba5e8bfb97488b28c905dd09391de0a0ff919d62926381a SHA512 19fa04a42e5ed589979647469759017442598d170bf82d49c3b720d1b1b6bbe3066ae3ffee77a3f15dcbf51be5d7a8934300873391ebce423f3a0f3878250c18 diff --git a/dev-ml/optcomp/optcomp-1.6-r1.ebuild b/dev-ml/optcomp/optcomp-1.6-r1.ebuild deleted file mode 100644 index e64a3633ee6b..000000000000 --- a/dev-ml/optcomp/optcomp-1.6-r1.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -OASIS_BUILD_DOCS=1 - -inherit oasis - -DESCRIPTION="Optional compilation for OCaml with cpp-like directives" -HOMEPAGE="https://github.com/diml/optcomp" -SRC_URI="https://github.com/diml/optcomp/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -DEPEND="dev-ml/camlp4:=" -RDEPEND="${DEPEND}" - -DOCS=( CHANGES.md README.md ) diff --git a/dev-ml/ordering/Manifest b/dev-ml/ordering/Manifest new file mode 100644 index 000000000000..f68aa6173e46 --- /dev/null +++ b/dev-ml/ordering/Manifest @@ -0,0 +1,10 @@ +DIST dune-3.0.3.tar.gz 1725788 BLAKE2B 2de93c085f642c8381642a08b18bc21ad48097f32397b3eddab9725deb267b089849b649705e1b72bb1b5b37f7531fd9e0cfb134174f0cb3a8ee2595c7dcf8ce SHA512 839e942bcf8189763d0d9b01614333bb2f036bce68c82959e51d2e9145b57067cb862b66781912391c1a0f531b8dddf2ffeafcee71c626169a437fe40feba155 +DIST dune-3.10.0.tar.gz 2640800 BLAKE2B 5fc479a91ee6792f07a4fb61af530d55f46dea56b2fd5919975c0bfb231229395e7d0769bdae88419a89d378b8d7e2b229f7410ce7a34414629aa5117e606230 SHA512 2884a4eaaa44164ce911286ca6670b548a4a564e2b5040f05405d1d2729af84083fbfdde7c92db4f6f7a54d15a43fc9dddcec19d8d79d5a66221b2be861473de +DIST dune-3.2.0.tar.gz 1754664 BLAKE2B 97ba420a5bf9dd8e14ba74c0e91b6679924fd9ee7b8d9a9a2d4b282166d9172582a37adf408fd037972dab7525cd240c24729b6692f403c32029b2994044bd40 SHA512 a90ac689d97acab956fd96f16f7c6cfdc95d01785fc14f0d3c8ab39231ff78e8941d2db2fa8cbfaa39bbed8f865e11b628aacae1b22df49512a57d0263c0dca4 +DIST dune-3.6.1.tar.gz 1843804 BLAKE2B 1e7bf67b596f60a553f00cfd8287ce36ef4ff5b8d8f16465df3f3b7b6d332ceef5101057df9389aeb9ceb4dc7f23bc69320412aebba7587deeb933a0f8ddca46 SHA512 2db83116a3d0995c8d0dfd6a1581d214f657a7d90c30dea04d5370327e13c575fed6ce74106a79c2e2fe0c02aa2912ae7a9f4e49c36985fb613b6a41de0700c9 +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 +DIST dune-3.8.0.tar.gz 2564537 BLAKE2B 773a2643b187f37dd2e21df41f18818753e249e66c2d98a4cfee3d9997f528827b2cf3c60d2992ffdc51397c393ac1a0fcc5339bdec2d87f82252114394d2355 SHA512 bba32fb508265329a2a46c9bd2e8b7e5f3d6d84390e842382ff4790f0d3414c9ff1d005c1af88988daaca29749729f1ced7b388f2d96432f01f2f4ea4714be98 +DIST dune-3.9.0.tar.gz 2609923 BLAKE2B f9fe8fb3c2e002e1eec141f487709d592df969ab44d41012ebaa436f17b6ee679e2e763d479106ae722b8b61be03fceb701b314c40c001d5895db99e5fbbe4a6 SHA512 86cd66222553f8cd7c1d1fb9e4e55169f9cd6d92e0bde1c56846b5e0fb6ae8494ac15ebb68d9e8761240f46dcc9b480747e48b21b74cff86e52cc45d3d222070 +DIST dune-3.9.1.tar.gz 2610113 BLAKE2B 0b97f6a951bd013a156a1417f6b65df17324adf13d48ad3b8bf45a4133cc77195e2118ae95f0cb9da488c26378b58ce677db8eb4b3cb028a73c779be57b2d611 SHA512 c997ec2205fa5391acbca9e196387cec1af69d3aed4cebe21d82edbe66bd91fda0c742e7ff2e3ffb8df88e2e379bbff68028574664cf375d04f4d3f3f2102f3b diff --git a/dev-ml/ordering/metadata.xml b/dev-ml/ordering/metadata.xml new file mode 100644 index 000000000000..86dc156e664c --- /dev/null +++ b/dev-ml/ordering/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">ocaml/dune</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/ordering/ordering-3.0.3.ebuild b/dev-ml/ordering/ordering-3.0.3.ebuild new file mode 100644 index 000000000000..5b971ed0de41 --- /dev/null +++ b/dev-ml/ordering/ordering-3.0.3.ebuild @@ -0,0 +1,32 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune multiprocessing + +DESCRIPTION="Element ordering" +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" +DEPEND=">=dev-lang/ocaml-4.08" +RDEPEND="${DEPEND}" + +src_configure() { + ./configure \ + --libdir="$(ocamlc -where)" \ + --mandir="/usr/share/man" \ + || die +} + +src_compile() { + dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die +} diff --git a/dev-ml/ordering/ordering-3.10.0.ebuild b/dev-ml/ordering/ordering-3.10.0.ebuild new file mode 100644 index 000000000000..3302c44ddac1 --- /dev/null +++ b/dev-ml/ordering/ordering-3.10.0.ebuild @@ -0,0 +1,30 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune multiprocessing + +DESCRIPTION="Element ordering" +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-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/ordering/ordering-3.2.0.ebuild b/dev-ml/ordering/ordering-3.2.0.ebuild new file mode 100644 index 000000000000..f0f530285fd0 --- /dev/null +++ b/dev-ml/ordering/ordering-3.2.0.ebuild @@ -0,0 +1,30 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune multiprocessing + +DESCRIPTION="Element ordering" +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" +DEPEND=">=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/ordering/ordering-3.6.1.ebuild b/dev-ml/ordering/ordering-3.6.1.ebuild new file mode 100644 index 000000000000..0699bae016be --- /dev/null +++ b/dev-ml/ordering/ordering-3.6.1.ebuild @@ -0,0 +1,30 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune multiprocessing + +DESCRIPTION="Element ordering" +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-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/ordering/ordering-3.6.2.ebuild b/dev-ml/ordering/ordering-3.6.2.ebuild new file mode 100644 index 000000000000..bd18c18b90bb --- /dev/null +++ b/dev-ml/ordering/ordering-3.6.2.ebuild @@ -0,0 +1,30 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune multiprocessing + +DESCRIPTION="Element ordering" +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-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/ordering/ordering-3.7.0.ebuild b/dev-ml/ordering/ordering-3.7.0.ebuild new file mode 100644 index 000000000000..3302c44ddac1 --- /dev/null +++ b/dev-ml/ordering/ordering-3.7.0.ebuild @@ -0,0 +1,30 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune multiprocessing + +DESCRIPTION="Element ordering" +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-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/ordering/ordering-3.7.1.ebuild b/dev-ml/ordering/ordering-3.7.1.ebuild new file mode 100644 index 000000000000..669840ebf990 --- /dev/null +++ b/dev-ml/ordering/ordering-3.7.1.ebuild @@ -0,0 +1,30 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune multiprocessing + +DESCRIPTION="Element ordering" +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-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/ordering/ordering-3.8.0.ebuild b/dev-ml/ordering/ordering-3.8.0.ebuild new file mode 100644 index 000000000000..3302c44ddac1 --- /dev/null +++ b/dev-ml/ordering/ordering-3.8.0.ebuild @@ -0,0 +1,30 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune multiprocessing + +DESCRIPTION="Element ordering" +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-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/ordering/ordering-3.9.0.ebuild b/dev-ml/ordering/ordering-3.9.0.ebuild new file mode 100644 index 000000000000..3302c44ddac1 --- /dev/null +++ b/dev-ml/ordering/ordering-3.9.0.ebuild @@ -0,0 +1,30 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune multiprocessing + +DESCRIPTION="Element ordering" +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-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/ordering/ordering-3.9.1.ebuild b/dev-ml/ordering/ordering-3.9.1.ebuild new file mode 100644 index 000000000000..3302c44ddac1 --- /dev/null +++ b/dev-ml/ordering/ordering-3.9.1.ebuild @@ -0,0 +1,30 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune multiprocessing + +DESCRIPTION="Element ordering" +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-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/ounit/Manifest b/dev-ml/ounit/Manifest deleted file mode 100644 index e7322851af14..000000000000 --- a/dev-ml/ounit/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST ounit-2.0.0.tar.gz 103504 BLAKE2B e936d0a3df48eb46623eadfc39a4f64a6776972c713280c388ef5e9e1b6a20d9959a68b30ce21fae7e553e4e43a7ad1cd5652d49da7aa2699ca59fc03e1f1352 SHA512 e12c8fb534ef88de7a83a34e5a578060a90abfce601d8532408412a56e843f69b89cfd6ce69bd7c5519e9a04e306d46339e9b8f13975727a3458afe20cd776d0 -DIST ounit-2.0.5.tar.gz 114285 BLAKE2B d41faf95ec11f16accb70aaa1a9005f468727ebfe01082827669d7a7afbeb44d8cd740376ea9df26a811913b3a87b8d9fb85c0d4690e0d18e6b129949c2b145f SHA512 b2414b7581ec230a949de0d7a677786bb63ef3a3ee0c3dc666d176f83705b5bc8aeab4b6e2327c98714bb26c249d71766ed831ebf572aff2b8829a33cc0e4b75 -DIST ounit-2.0.6.tar.gz 114305 BLAKE2B 94ae4e2f7ace6fe5732253d724115cdc3e24af91db2066b36439501cb17df7f44fb9230242b8400ec59a72f9317c22361f068f7f2634d29ccfdcca63cb95c275 SHA512 466ec1f691a81e0abd93f698c7328e6db4fa2d617d8f5262d9f18b57ede3d389a3ee122ed7bccc8dff20600826fbbae1d17dd88d7c1329562798792fae54417d diff --git a/dev-ml/ounit/metadata.xml b/dev-ml/ounit/metadata.xml deleted file mode 100644 index ffac4d7ebc01..000000000000 --- a/dev-ml/ounit/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> -</maintainer> -</pkgmetadata> diff --git a/dev-ml/ounit/ounit-2.0.0.ebuild b/dev-ml/ounit/ounit-2.0.0.ebuild deleted file mode 100644 index 8779d2f64cf7..000000000000 --- a/dev-ml/ounit/ounit-2.0.0.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -OASIS_BUILD_DOCS=1 - -inherit oasis - -DESCRIPTION="Unit testing framework for OCaml" -HOMEPAGE="http://ounit.forge.ocamlcore.org/" -SRC_URI="http://forge.ocamlcore.org/frs/download.php/1258/${P}.tar.gz" -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="amd64 arm ~arm64 ~ppc x86" -DEPEND="" -RDEPEND="${DEPEND}" -IUSE="" - -DOCS=( "README.txt" "AUTHORS.txt" "changelog" ) diff --git a/dev-ml/ounit/ounit-2.0.5.ebuild b/dev-ml/ounit/ounit-2.0.5.ebuild deleted file mode 100644 index f597ba581192..000000000000 --- a/dev-ml/ounit/ounit-2.0.5.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -OASIS_BUILD_DOCS=1 - -inherit oasis - -DESCRIPTION="Unit testing framework for OCaml" -HOMEPAGE="http://ounit.forge.ocamlcore.org/" -SRC_URI="https://forge.ocamlcore.org/frs/download.php/1719/${P}.tar.gz" -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" -DEPEND="" -RDEPEND="${DEPEND}" -IUSE="" - -DOCS=( "README.txt" "AUTHORS.txt" "changelog" ) diff --git a/dev-ml/ounit/ounit-2.0.6.ebuild b/dev-ml/ounit/ounit-2.0.6.ebuild deleted file mode 100644 index 0ade5f19c1e2..000000000000 --- a/dev-ml/ounit/ounit-2.0.6.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -OASIS_BUILD_DOCS=1 - -inherit oasis - -DESCRIPTION="Unit testing framework for OCaml" -HOMEPAGE="http://ounit.forge.ocamlcore.org/" -SRC_URI="https://forge.ocamlcore.org/frs/download.php/1722/${P}.tar.gz" -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" -DEPEND="" -RDEPEND="${DEPEND}" -IUSE="" - -DOCS=( "README.txt" "AUTHORS.txt" "changelog" ) diff --git a/dev-ml/ounit2/Manifest b/dev-ml/ounit2/Manifest new file mode 100644 index 000000000000..04db66dd1f95 --- /dev/null +++ b/dev-ml/ounit2/Manifest @@ -0,0 +1,2 @@ +DIST ounit2-2.2.6.tar.gz 69910 BLAKE2B 7833738e94990c7e67d27665e994c9e3c1505dcb45e2faaba58ef7de9eccc8fc19437fa983da058b1fa2c464e74d90a4eec22380ebfa01ae5e5a9616faf6ada3 SHA512 4d808866dc4f9de6493a17910fafb2452398aef45cb29add54ed25e15a10ec7715bdd52d40190f618e77fe351d8bb67fbe12c1df6a6736c501792a57f6b3768a +DIST ounit2-2.2.7.tar.gz 69771 BLAKE2B 6fb43eccf33a02d3fbbbec1fd00b2901ae69bb55e9c94790ebcfed68f676bc0a9a573f4e03edc8c542e195b68c77deae0426c884ea81ceef1149548f6b760673 SHA512 b2cefed53127f724c099391eefe1bce3b43cad5d6b629b5f1e9446b58892639de758f5dbcbd5efb6c409ce77ed01d06693989a3ba909cf79c36c2554c1473396 diff --git a/dev-ml/ounit2/files/ounit2-2.2.6-dune.patch b/dev-ml/ounit2/files/ounit2-2.2.6-dune.patch new file mode 100644 index 000000000000..9ef29326f6d0 --- /dev/null +++ b/dev-ml/ounit2/files/ounit2-2.2.6-dune.patch @@ -0,0 +1,19 @@ +--- a/src/lib/ounit2/dune ++++ b/src/lib/ounit2/dune +@@ -2,7 +2,7 @@ + (name oUnit) + (public_name ounit2) + (wrapped false) +- (libraries unix seq ounit2.advanced)) ++ (libraries unix ounit2.advanced)) + + (documentation + (package ounit2) +--- a/src/lib/ounit2/advanced/dune ++++ b/src/lib/ounit2/advanced/dune +@@ -7,4 +7,4 @@ + (name oUnitAdvanced) + (public_name ounit2.advanced) + (wrapped false) +- (libraries unix bytes seq stdlib-shims)) ++ (libraries unix bytes stdlib-shims)) diff --git a/dev-ml/ounit2/files/ounit2-2.2.7-dune.patch b/dev-ml/ounit2/files/ounit2-2.2.7-dune.patch new file mode 100644 index 000000000000..845d7e9e4574 --- /dev/null +++ b/dev-ml/ounit2/files/ounit2-2.2.7-dune.patch @@ -0,0 +1,19 @@ +--- a/src/lib/ounit2/dune ++++ b/src/lib/ounit2/dune +@@ -2,7 +2,7 @@ + (name oUnit) + (public_name ounit2) + (wrapped false) +- (libraries unix seq ounit2.advanced)) ++ (libraries unix ounit2.advanced)) + + (documentation + (package ounit2) +--- a/src/lib/ounit2/advanced/dune ++++ b/src/lib/ounit2/advanced/dune +@@ -11,4 +11,4 @@ + (name oUnitAdvanced) + (public_name ounit2.advanced) + (wrapped false) +- (libraries unix seq stdlib-shims)) ++ (libraries unix stdlib-shims)) diff --git a/dev-ml/ounit2/metadata.xml b/dev-ml/ounit2/metadata.xml new file mode 100644 index 000000000000..1191ea4dd88a --- /dev/null +++ b/dev-ml/ounit2/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">gildor478/ounit</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/ounit2/ounit2-2.2.6.ebuild b/dev-ml/ounit2/ounit2-2.2.6.ebuild new file mode 100644 index 000000000000..e5cb1eba4a95 --- /dev/null +++ b/dev-ml/ounit2/ounit2-2.2.6.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Unit testing framework for OCaml" +HOMEPAGE="https://github.com/gildor478/ounit" +SRC_URI="https://github.com/gildor478/ounit/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/ounit-${PV}" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +DEPEND=" + dev-ml/lwt:= + dev-ml/stdlib-shims:= +" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}"/${P}-dune.patch ) + +src_install() { + dune-install ${PN} ${PN}-lwt +} diff --git a/dev-ml/ounit2/ounit2-2.2.7.ebuild b/dev-ml/ounit2/ounit2-2.2.7.ebuild new file mode 100644 index 000000000000..fe6cb6c0f95b --- /dev/null +++ b/dev-ml/ounit2/ounit2-2.2.7.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Unit testing framework for OCaml" +HOMEPAGE="https://github.com/gildor478/ounit" +SRC_URI="https://github.com/gildor478/ounit/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/ounit-${PV}" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +DEPEND=" + dev-ml/lwt:= + dev-ml/stdlib-shims:= +" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${PN}-2.2.7-dune.patch" ) + +src_install() { + dune-install ${PN} ${PN}-lwt +} diff --git a/dev-ml/pa_bench/Manifest b/dev-ml/pa_bench/Manifest deleted file mode 100644 index 2659f308d6ff..000000000000 --- a/dev-ml/pa_bench/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST pa_bench-112.06.00.tar.gz 54371 BLAKE2B e0cd20d378d185f6cd3a6e4a2991bb9bdce6c72b01860c1aedff4c0c3ff4949f7b0c1a2b3c0310cd375ecc01eb51022fd6c68281c0bbb74dc96879d3fcc7ed94 SHA512 1e75c5b765051357f17bfe1213af16174a07903da7c9ecff3ce937227385d815c25f6430f103be3b65b69ba0d7a3a22051ef7bf28d577cf26e87c3a628040fdc diff --git a/dev-ml/pa_bench/metadata.xml b/dev-ml/pa_bench/metadata.xml deleted file mode 100644 index ffac4d7ebc01..000000000000 --- a/dev-ml/pa_bench/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> -</maintainer> -</pkgmetadata> diff --git a/dev-ml/pa_bench/pa_bench-112.06.00.ebuild b/dev-ml/pa_bench/pa_bench-112.06.00.ebuild deleted file mode 100644 index e8fc793b2808..000000000000 --- a/dev-ml/pa_bench/pa_bench-112.06.00.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit oasis - -MY_P=${PN/-/_}-${PV} -DESCRIPTION="Syntax extension writing inline benchmarks" -HOMEPAGE="http://www.janestreet.com/ocaml" -SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV%.*}.00/individual/${MY_P}.tar.gz - https://dev.gentoo.org/~aballier/distfiles/${MY_P}.tar.gz" - -LICENSE="LGPL-2.1-with-linking-exception" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -DEPEND=">=dev-ml/type-conv-109:= - dev-ml/pa_ounit:= - dev-ml/camlp4:=" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" diff --git a/dev-ml/pa_ounit/Manifest b/dev-ml/pa_ounit/Manifest deleted file mode 100644 index fb9ad5f4992f..000000000000 --- a/dev-ml/pa_ounit/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST pa_ounit-113.00.00.tar.gz 58486 BLAKE2B fff42a3f741741cc29819f7a18aaa4bf8a939125a5c3abcf4b567431da6584ba63a777434c285971bc1ec182363691ea2a34311852fa25159b35414babd8973e SHA512 8b1891ae666606b28a6d46b86ac82cb5680099d3ca8181ae6a422748b6b0a99c763f680741c724ca91f8ade7757f6831bc88211d8d94560168bc208b23337b0e diff --git a/dev-ml/pa_ounit/metadata.xml b/dev-ml/pa_ounit/metadata.xml deleted file mode 100644 index 2fcbb4359b3b..000000000000 --- a/dev-ml/pa_ounit/metadata.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <longdescription lang="en"> -Pa_ounit is a syntax extension that helps writing in-line test in ocaml -code. It allows user to register tests with a new `TEST` top-level expressions -and automatically collects all the tests in a module (in a function -`ounit_tests` of type `unit -> OUnit.test`). - </longdescription> - <upstream> - <remote-id type="bitbucket">yminsky/ocaml-core</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/pa_ounit/pa_ounit-113.00.00.ebuild b/dev-ml/pa_ounit/pa_ounit-113.00.00.ebuild deleted file mode 100644 index e9545136eb4a..000000000000 --- a/dev-ml/pa_ounit/pa_ounit-113.00.00.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit oasis - -DESCRIPTION="Syntax extension that helps writing in-line test in ocaml" -HOMEPAGE="https://bitbucket.org/yminsky/ocaml-core/wiki/Home" -SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV%.*}/files/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -DEPEND=">=dev-ml/ounit-1.1.1:= - dev-ml/camlp4:=" -RDEPEND="${DEPEND}" - -DOCS=( "readme.md" ) diff --git a/dev-ml/pa_sexp_conv/Manifest b/dev-ml/pa_sexp_conv/Manifest deleted file mode 100644 index 46be640f1507..000000000000 --- a/dev-ml/pa_sexp_conv/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST pa_sexp_conv-113.00.01.tar.gz 73862 BLAKE2B 48bb7b0d39f5b6b7d380d6f4d30cc8b0a75ffd23b328da9813c3884b209f782a0592d69e5ef5a48bf89dfe78c5c131524d804eeb286f2ffb2767132c20be999e SHA512 91ad90290d48626a7e1fccb34a632e5ca02ea839f178b52da0ccbea8b27018c79ee8e83e808939e36ddbb78ad348892c53792dd41a2b007b6df947cde85873fd diff --git a/dev-ml/pa_sexp_conv/metadata.xml b/dev-ml/pa_sexp_conv/metadata.xml deleted file mode 100644 index 6c8d0ffb051e..000000000000 --- a/dev-ml/pa_sexp_conv/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">janestreet/pa_sexp_conv</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/pa_sexp_conv/pa_sexp_conv-113.00.01.ebuild b/dev-ml/pa_sexp_conv/pa_sexp_conv-113.00.01.ebuild deleted file mode 100644 index 40892485b01c..000000000000 --- a/dev-ml/pa_sexp_conv/pa_sexp_conv-113.00.01.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit oasis - -DESCRIPTION="Deprecated camlp4 syntax extension for sexplib." -HOMEPAGE="http://www.janestreet.com/ocaml" -SRC_URI="https://github.com/janestreet/pa_sexp_conv/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -DEPEND=" - dev-ml/type-conv:= - dev-ml/sexplib:= - dev-ml/camlp4:= -" -RDEPEND="${DEPEND}" -DOCS=( README.md ) diff --git a/dev-ml/pa_structural_sexp/Manifest b/dev-ml/pa_structural_sexp/Manifest deleted file mode 100644 index 103b66c28f92..000000000000 --- a/dev-ml/pa_structural_sexp/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST pa_structural_sexp-113.00.00.tar.gz 51825 BLAKE2B 6cb06ad1fed826b91f3eed176bb8873bc43ceeb3c3c0590123fb21d1eac671009d8418430c3eea2b1dd932801f5b26d0b47df6d5d8c72fdc0f1075b43d9d5c8a SHA512 7d1cbb1122b735e7aece71c7b50328a33dc72e63b336d5801433b5017bb94e2baa9a056cf076a2e8747afdf33e5a736154e4b74d5f7b079a6a144f9273e87f9c diff --git a/dev-ml/pa_structural_sexp/metadata.xml b/dev-ml/pa_structural_sexp/metadata.xml deleted file mode 100644 index 91d86fdbaf9e..000000000000 --- a/dev-ml/pa_structural_sexp/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="bitbucket">yminsky/ocaml-core</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/pa_structural_sexp/pa_structural_sexp-113.00.00.ebuild b/dev-ml/pa_structural_sexp/pa_structural_sexp-113.00.00.ebuild deleted file mode 100644 index 13a95c0e3804..000000000000 --- a/dev-ml/pa_structural_sexp/pa_structural_sexp-113.00.00.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit oasis - -DESCRIPTION="Quotation expanders to simplify building s-expressions from ocaml values" -HOMEPAGE="https://bitbucket.org/yminsky/ocaml-core/wiki/Home" -SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV%.*}/files/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -DEPEND="dev-ml/camlp4:= - dev-ml/type-conv:= - dev-ml/sexplib:=" -RDEPEND="${DEPEND}" - -DOCS=( "README.md" ) diff --git a/dev-ml/parmap/Manifest b/dev-ml/parmap/Manifest index 2962ca6370c0..3d8f22a669c2 100644 --- a/dev-ml/parmap/Manifest +++ b/dev-ml/parmap/Manifest @@ -1,2 +1,5 @@ -DIST parmap-1.0_rc7-ocaml-4.03.tar.gz 98262 BLAKE2B 829553c5a8a16776588b7fc74304e189945367ddc4988e529b08857fe307b8e05db58fb73819554e88afa2405d8818d2c95fc4dc96e0a47ff782bfd78b912e90 SHA512 c8b7678fede76d35b299ef0548ef3819f9ec056cde4d5498e11f2400b96149b17ce58c35d197d10dba5fd4a702b94fe78090e1f330791b0f470891f0bbf7a544 -DIST parmap-1.0_rc8.tar.gz 98699 BLAKE2B 755208d0b380c200c5fb2a38334bcd422ea3e3c86bd8a52db37e256dd45c22c05e8577a5f13ae14d4ad553d16c212ae2a1b299e0870ac71a52e0bf11ddf2ecc4 SHA512 96bbe49f06dc3611577e87d9e6f5ca32e10271d6a14a0970bd4548fcaf268f833b3143258e14328237a60578e2355687e4bff031a021903f3e2280ef1713cc65 +DIST parmap-1.2.1.tar.gz 47069 BLAKE2B 85d67aacff70c9d8b70c73e4673486804a0d0a4cc52391cd93bf12ed19206c11cb77066e64757f5a22352580789383e04b7d984aade5e60872be12728a173fb6 SHA512 b5ed86b464f68db625e6442606cb74c7e2b10fd066a20732e60042d32b937c20f83ff4ebf17f47b79ee6725e0de9ca42bbb050c06b47d90a27052b3b0fb07afb +DIST parmap-1.2.3.tar.gz 47481 BLAKE2B 3c65448d244e6079444912ffaaea35982d44123f6259c2d15b7f1618afd10c79972f00f7e2744da270b298f4bca090c34c96e6e36638f2aaabba4ed774af24b5 SHA512 f050492ae1c5fc7c9d0baddaed44ea9920da7d2a5ed6455e93fd427648037a5e00051b6eaaf982174d88ed4de9b0123a1c4eff203f1ba6bef3384b5c7e2952c4 +DIST parmap-1.2.4.tar.gz 47584 BLAKE2B a4b03f4e3aaafd2c8e75cda045741b21b9d72998a6a4ca406147cd6fc88eac1ffbcc996f862d4ea090551a6e7219e59f3df0515b48b4155305b49f8ea9b3b123 SHA512 7dfe3bb2ace3547c426bca4974bad0ccfaa1fddbe0ba6f574a0dd8c4c30e8dcd1b90d0938312fcef9468ea87358db096bf870f64467ba822b13465773054a8ed +DIST parmap-1.2.5.tar.gz 49144 BLAKE2B 6e6c5c7dcfd1e7af4b921bc8795b2a23f0fd5e01f6ce91665bbbc5e1f9e19f0b7eaee0361b3450d4a9823744c97c6f6ef28f8c8f1f65fad80f2a0a30dc07b740 SHA512 668e969a598cdb587597c7cabf7e299cfb4e3cc4cd229edf1888977f19bd5cdf169d39f5a6d923644bcd83f1ce1a3cfbd3a4e55ff59513736a9dc740a16b49d1 +DIST parmap-1.2.tar.gz 47083 BLAKE2B e790087273fcf749b000c7ad3a2f5b2cafea91c529e3a4687b1d882d203cb43e4069a42675319c27878d8bca3fa0e19af96ab1dfda8df3967dc48d28ec542b91 SHA512 69431e146e8aa01823ae1583c6a5e7753436cecee37c3da3064a836c20cf8c6b9033248412203406d03bd4efdd957b2e118ea5c5866e3bd1f668d8c4fd48777f diff --git a/dev-ml/parmap/metadata.xml b/dev-ml/parmap/metadata.xml index 8a36ff16ac07..6f88a7f16d78 100644 --- a/dev-ml/parmap/metadata.xml +++ b/dev-ml/parmap/metadata.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">rdicosmo/parmap</remote-id> diff --git a/dev-ml/parmap/parmap-1.0_rc7-r1.ebuild b/dev-ml/parmap/parmap-1.0_rc7-r1.ebuild deleted file mode 100644 index 9bc4423786eb..000000000000 --- a/dev-ml/parmap/parmap-1.0_rc7-r1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit multilib - -MY_PV="${PV/_/-}-fix-for4.03+3" -DESCRIPTION="Library to exploit multicore architectures for OCaml programs" -HOMEPAGE="http://www.dicosmo.org/code/parmap/" -SRC_URI="https://github.com/rdicosmo/parmap/archive/${MY_PV}.tar.gz -> ${P}-ocaml-4.03.tar.gz" - -LICENSE="LGPL-2-with-linking-exception" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="+ocamlopt" - -RDEPEND=">=dev-lang/ocaml-4.03:=[ocamlopt?]" -DEPEND="${RDEPEND} - dev-ml/findlib - dev-ml/ocamlbuild - dev-ml/ocaml-autoconf" -S="${WORKDIR}/${PN}-${MY_PV/+/-}" - -src_test() { - mkdir "${WORKDIR}/tmpinstall" || die - emake \ - OCAMLLIBDIR="ocaml" \ - DESTDIR="${WORKDIR}/tmpinstall" \ - install - export OCAMLPATH="${WORKDIR}/tmpinstall/ocaml" - emake tests - cd _build/tests || die - for i in $(find . -type f -executable) ; do - ${i} || die - done -} - -src_install() { - emake \ - OCAMLLIBDIR="$(get_libdir)/ocaml" \ - MANDIR="${ED}/usr/share/man/man3o" \ - DESTDIR="${ED}/usr" \ - install - dodoc AUTHORS Changelog README -} diff --git a/dev-ml/parmap/parmap-1.0_rc8.ebuild b/dev-ml/parmap/parmap-1.0_rc8.ebuild deleted file mode 100644 index c224550f0d6a..000000000000 --- a/dev-ml/parmap/parmap-1.0_rc8.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit multilib - -MY_PV="${PV/_/-}" -DESCRIPTION="Library to exploit multicore architectures for OCaml programs" -HOMEPAGE="http://www.dicosmo.org/code/parmap/" -SRC_URI="https://github.com/rdicosmo/parmap/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2-with-linking-exception" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" -IUSE="+ocamlopt" - -RDEPEND=">=dev-lang/ocaml-4.03:=[ocamlopt?]" -DEPEND="${RDEPEND} - dev-ml/findlib - dev-ml/ocamlbuild - dev-ml/ocaml-autoconf" -S="${WORKDIR}/${PN}-${MY_PV/+/-}" - -src_test() { - mkdir "${WORKDIR}/tmpinstall" || die - emake \ - OCAMLLIBDIR="ocaml" \ - DESTDIR="${WORKDIR}/tmpinstall" \ - install - export OCAMLPATH="${WORKDIR}/tmpinstall/ocaml" - emake tests - cd _build/tests || die - for i in $(find . -type f -executable) ; do - ${i} || die - done -} - -src_install() { - emake \ - OCAMLLIBDIR="$(get_libdir)/ocaml" \ - MANDIR="${ED}/usr/share/man/man3o" \ - DESTDIR="${ED}/usr" \ - install - dodoc AUTHORS Changelog README -} diff --git a/dev-ml/parmap/parmap-1.2.1.ebuild b/dev-ml/parmap/parmap-1.2.1.ebuild new file mode 100644 index 000000000000..44ada0a27777 --- /dev/null +++ b/dev-ml/parmap/parmap-1.2.1.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +MY_PV="${PV/_/-}" +DESCRIPTION="Library to exploit multicore architectures for OCaml programs" +HOMEPAGE="https://www.dicosmo.org/code/parmap/" +SRC_URI="https://github.com/rdicosmo/parmap/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${MY_PV/+/-}" + +LICENSE="LGPL-2-with-linking-exception" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="+ocamlopt" + +BDEPEND="dev-ml/dune-configurator" +RDEPEND=">=dev-lang/ocaml-4.03:=[ocamlopt?]" +DEPEND="${RDEPEND}" diff --git a/dev-ml/parmap/parmap-1.2.3.ebuild b/dev-ml/parmap/parmap-1.2.3.ebuild new file mode 100644 index 000000000000..6b910022ab92 --- /dev/null +++ b/dev-ml/parmap/parmap-1.2.3.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +MY_PV="${PV/_/-}" +DESCRIPTION="Library to exploit multicore architectures for OCaml programs" +HOMEPAGE="https://www.dicosmo.org/code/parmap/" +SRC_URI="https://github.com/rdicosmo/parmap/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${MY_PV/+/-}" + +LICENSE="LGPL-2-with-linking-exception" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt" + +BDEPEND="dev-ml/dune-configurator" +RDEPEND=">=dev-lang/ocaml-4.03:=[ocamlopt?]" +DEPEND="${RDEPEND}" diff --git a/dev-ml/parmap/parmap-1.2.4-r1.ebuild b/dev-ml/parmap/parmap-1.2.4-r1.ebuild new file mode 100644 index 000000000000..2cab0f41c790 --- /dev/null +++ b/dev-ml/parmap/parmap-1.2.4-r1.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +MY_PV="${PV/_/-}" +DESCRIPTION="Library to exploit multicore architectures for OCaml programs" +HOMEPAGE="https://www.dicosmo.org/code/parmap/" +SRC_URI="https://github.com/rdicosmo/parmap/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${MY_PV/+/-}" + +LICENSE="LGPL-2-with-linking-exception" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +BDEPEND="dev-ml/dune-configurator:=" +RDEPEND=">=dev-lang/ocaml-4.03:=[ocamlopt?]" +DEPEND="${RDEPEND}" diff --git a/dev-ml/parmap/parmap-1.2.5.ebuild b/dev-ml/parmap/parmap-1.2.5.ebuild new file mode 100644 index 000000000000..8bddaebdb9aa --- /dev/null +++ b/dev-ml/parmap/parmap-1.2.5.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +MY_PV="${PV/_/-}" +DESCRIPTION="Library to exploit multicore architectures for OCaml programs" +HOMEPAGE="https://www.dicosmo.org/code/parmap/" +SRC_URI="https://github.com/rdicosmo/parmap/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${MY_PV/+/-}" + +LICENSE="LGPL-2-with-linking-exception" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +BDEPEND="dev-ml/dune-configurator:=" +RDEPEND=">=dev-lang/ocaml-4.03:=[ocamlopt?]" +DEPEND="${RDEPEND}" diff --git a/dev-ml/parmap/parmap-1.2.ebuild b/dev-ml/parmap/parmap-1.2.ebuild new file mode 100644 index 000000000000..6b910022ab92 --- /dev/null +++ b/dev-ml/parmap/parmap-1.2.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +MY_PV="${PV/_/-}" +DESCRIPTION="Library to exploit multicore architectures for OCaml programs" +HOMEPAGE="https://www.dicosmo.org/code/parmap/" +SRC_URI="https://github.com/rdicosmo/parmap/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${MY_PV/+/-}" + +LICENSE="LGPL-2-with-linking-exception" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt" + +BDEPEND="dev-ml/dune-configurator" +RDEPEND=">=dev-lang/ocaml-4.03:=[ocamlopt?]" +DEPEND="${RDEPEND}" diff --git a/dev-ml/parsexp/Manifest b/dev-ml/parsexp/Manifest new file mode 100644 index 000000000000..880f12581e55 --- /dev/null +++ b/dev-ml/parsexp/Manifest @@ -0,0 +1,4 @@ +DIST parsexp-0.14.0.tar.gz 48617 BLAKE2B eba36c17f08b59ed7601c4f9906e80de45e377d0134fdee30b5536c3d91af0cb45a1cdab90333498da8bf3fcf5e5bea16a8f734e7f1a92c9b865cd3136a668c2 SHA512 d9e9ea936dcf23d700e6ddd4153a2a96df6819094eaebe15d949c4569fa5125ab308af2c10f4ba2161610d8673eeb3928dd19c10a21974c140e4c89537a86575 +DIST parsexp-0.14.1.tar.gz 48617 BLAKE2B d491b8c28eb0a269985df107152b6239513fb9d59dc723c9692dd436883331ce23fdd714bc467b4fcdaba81baa2adb2421110e92fb5bd3f526437856f4edaa02 SHA512 c9d6a00dbe49272fa32ba3684249d5085482fe2024795391aa3605b21962e9d426535a46d7139b487332b86e05f042226dd1a8166d2a3cb9dcee9b4b06b81ab8 +DIST parsexp-0.15.0.tar.gz 56471 BLAKE2B afbaae6f1b94419768ab55cc2e00f605fda456e68308c5ea0b4b6b8eb61e9373b7852cfaaf37de18c4bb1427f3b945d411619827e572079c44b12f6def6a45ac SHA512 aad464435747228f7168e2700fc8d5d3a9f212196a5e9afa24dd26d6f596dd96b68ecc77eddf862990df93d74d9a935038f602b1bbeecb545651d61b70f47d3f +DIST parsexp-0.16.0.tar.gz 56904 BLAKE2B 3ead4215242a6f5edd8babbb64ef68dc0a9e230a26b77209f7864eae048b62f4970ce1b50cb6ac1e21df0ada8d49917ae6df0e6c10fce5fe5313c2b4d661517e SHA512 54a59c12ef9cafe69f5dab79d51a7115205f0becef97db1d0051cb50c3ff004a56e43e9607a3869e4928f8653df5a2b9e3366e4ac0d8d7483752fa5287352791 diff --git a/dev-ml/parsexp/metadata.xml b/dev-ml/parsexp/metadata.xml new file mode 100644 index 000000000000..716e2c18e3bf --- /dev/null +++ b/dev-ml/parsexp/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">janestreet/parsexp</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/parsexp/parsexp-0.14.0.ebuild b/dev-ml/parsexp/parsexp-0.14.0.ebuild new file mode 100644 index 000000000000..48602d44aa29 --- /dev/null +++ b/dev-ml/parsexp/parsexp-0.14.0.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="S-expression parsing library" +HOMEPAGE="https://github.com/janestreet/parsexp" +SRC_URI="https://github.com/janestreet/parsexp/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt" + +RDEPEND=" + dev-ml/sexplib0:= + dev-ml/base:= +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/parsexp/parsexp-0.14.1.ebuild b/dev-ml/parsexp/parsexp-0.14.1.ebuild new file mode 100644 index 000000000000..4ced2a5e905f --- /dev/null +++ b/dev-ml/parsexp/parsexp-0.14.1.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="S-expression parsing library" +HOMEPAGE="https://github.com/janestreet/parsexp" +SRC_URI="https://github.com/janestreet/parsexp/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +RDEPEND=" + dev-ml/sexplib0:= + dev-ml/base:= +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/parsexp/parsexp-0.15.0.ebuild b/dev-ml/parsexp/parsexp-0.15.0.ebuild new file mode 100644 index 000000000000..13dfcb82180e --- /dev/null +++ b/dev-ml/parsexp/parsexp-0.15.0.ebuild @@ -0,0 +1,18 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="S-expression parsing library" +HOMEPAGE="https://github.com/janestreet/parsexp" +SRC_URI="https://github.com/janestreet/parsexp/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +RDEPEND="dev-ml/base:${SLOT}" +DEPEND="${RDEPEND}" diff --git a/dev-ml/parsexp/parsexp-0.16.0.ebuild b/dev-ml/parsexp/parsexp-0.16.0.ebuild new file mode 100644 index 000000000000..1ba5973d963b --- /dev/null +++ b/dev-ml/parsexp/parsexp-0.16.0.ebuild @@ -0,0 +1,18 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="S-expression parsing library" +HOMEPAGE="https://github.com/janestreet/parsexp" +SRC_URI="https://github.com/janestreet/parsexp/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +RDEPEND="dev-ml/base:${SLOT}" +DEPEND="${RDEPEND}" diff --git a/dev-ml/patience_diff/Manifest b/dev-ml/patience_diff/Manifest index 002d157a5147..746fe5ac6ac4 100644 --- a/dev-ml/patience_diff/Manifest +++ b/dev-ml/patience_diff/Manifest @@ -1 +1,2 @@ -DIST patience_diff-0.9.0.tar.gz 16520 BLAKE2B af7f93906c1f4ab70649bc41726aff21f9f099fe49b0d3a3e8bea01d85e9f01cac4bd103179e9877d79dbc997d37318382321dacd67be57a9e031fd95e0263e5 SHA512 62cc0950edd8d46d5a11cd612dbdb8dc531a9a2c71403f30e6022e20d9ee21cb2e7a531362fa8b350075003eec929f1f70481b8e160b253831966d80a8becd83 +DIST patience_diff-0.14.0.tar.gz 20060 BLAKE2B d47d9a93ef0a7eeada7f050aec0427f8352343609da1332de59d6b3ced41e9942556e1d61e12ab2075bc15cf29afc60191f48da43c1a4358d414352eb6efd044 SHA512 d253488402e515d56ed9d83ef45edfce378d6ad5148d80f8d81341cff28d19115350d72cc057ecd6c14b907888eca8e6bce1b8e71c7a978149979a16a5512fd2 +DIST patience_diff-0.15.0.tar.gz 20434 BLAKE2B 52e0f1d3437f97d384224cd06035802376fe2af97c085e183f99934f6f8238270723505cda7c617b7847fa4d5f51abbfaa58cd25aac5f0eeb56b42559e91421a SHA512 d3cbf2b2fb8618cd3342abcb7beea110a93b0e8f6984f3becdf9066c717f6f7832f86a8fb72ac56c587cbd6e5abecf07c0b98d9ec1cb7a40bfb9d4a5b1de12ba diff --git a/dev-ml/patience_diff/metadata.xml b/dev-ml/patience_diff/metadata.xml index 41ba0f8e6fe0..c87f5360ebd1 100644 --- a/dev-ml/patience_diff/metadata.xml +++ b/dev-ml/patience_diff/metadata.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">janestreet/patience_diff</remote-id> diff --git a/dev-ml/patience_diff/patience_diff-0.9.0.ebuild b/dev-ml/patience_diff/patience_diff-0.14.0.ebuild index cba06ddf9e13..e73d50987f38 100644 --- a/dev-ml/patience_diff/patience_diff-0.9.0.ebuild +++ b/dev-ml/patience_diff/patience_diff-0.14.0.ebuild @@ -1,23 +1,21 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit opam +inherit dune DESCRIPTION="Tool and library implementing patience diff" -HOMEPAGE="https://github.com/janestreet/${PN}" +HOMEPAGE="https://github.com/janestreet/patience_diff" SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~riscv" +IUSE="+ocamlopt" RDEPEND=" + dev-ml/base:= dev-ml/core_kernel:= - dev-ml/ppx_driver:= dev-ml/ppx_jane:= - dev-ml/ocaml-migrate-parsetree:= " -DEPEND="${RDEPEND} dev-ml/jbuilder" diff --git a/dev-ml/patience_diff/patience_diff-0.15.0.ebuild b/dev-ml/patience_diff/patience_diff-0.15.0.ebuild new file mode 100644 index 000000000000..2e2bd78185f5 --- /dev/null +++ b/dev-ml/patience_diff/patience_diff-0.15.0.ebuild @@ -0,0 +1,17 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Tool and library implementing patience diff" +HOMEPAGE="https://github.com/janestreet/patience_diff" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~riscv" +IUSE="+ocamlopt" + +RDEPEND="dev-ml/core:${SLOT}" diff --git a/dev-ml/pcre-ocaml/Manifest b/dev-ml/pcre-ocaml/Manifest index c951f3510c59..4a367867e66e 100644 --- a/dev-ml/pcre-ocaml/Manifest +++ b/dev-ml/pcre-ocaml/Manifest @@ -1,4 +1,2 @@ -DIST pcre-ocaml-7.2.3.tar.gz 88307 BLAKE2B 1024a0d7a490fb31927f67af4c9a5e90c8d3788b3998a8af1ecaba9d6d12d1a1be91dcb2bdc1c49e6e81f0909d1dd9b6bc200f908c68427650985491f35685c9 SHA512 3df4bdbbed5e1ecf4bdf15fc461f2ea65e1556af9c1683e194c8824e21da5274dd80c22c1f6676fca203305ec4244d47e09f0ef8c601bfa95f7237bb07c1ee65 -DIST pcre-ocaml-7.3.0.tbz 38126 BLAKE2B a129f263ab623827f491f573141a3c1da033ba853c115dbc853c942c64554028ac5e9c83a17123513522bebbd56cd5533fdb6ef17545761d1fde6063021def1b SHA512 bf2a5d188183a7f73d5a7eace98f225165e6b50828b061649e88922ca4d4705022551bce15b9b8319fc91734c77ee48182677cdb1abd754ae44c6f9412bd11e3 -DIST pcre-ocaml-7.3.2.tbz 38445 BLAKE2B 1858ce78abc760e99e34e88c590a23b79f20ed2f31abdb991f60a124b2beee140ec3e712990ced3529bf5efb5e38d231190cf9ac0f9ee2d39c1a33687b770266 SHA512 727b129172c8c119fcb0d4ae249a3842109e3b9ab412e674af156e7bcdf0fce0bcb9561cbfe52d99002a668f0e5f145fa54d052b67a5c2eb30a1881ad4217767 -DIST pcre-ocaml-7.3.3.tbz 38412 BLAKE2B 3c9538f5fc8bc6dea0c6ceda3a2b30a48302943d53a83a4876c31dbe600752ac68498a4db9546698424b34bbd55c6c3254d47148233a845376887c30dc6fd429 SHA512 569e323dea83f33212a2aa9482e55f7491c8f83382fad13dfaf9fe624307ca261baf255db7c5837e1c6b5c64445daf05b64b9929cbd6d311d06278826bb788e3 +DIST pcre-ocaml-7.4.6.tbz 41027 BLAKE2B 1faecd96cb6f7af248e8ace7409a49131f5c654320f8ac432fd4aff602d0c4187733419e9cc73ca52cf0a3e5b725afa9357fe9ec191bf1ca42d4dc47a36e45b7 SHA512 a356c78dc19d3b3741d1fa0277c4fb0cb545f12499165526fae80a0ff8a7b1f1e6e5e916b16f8336bcec3661de811686b814fe4afc677965fec7a63d4fc53b1f +DIST pcre-ocaml-7.5.0.tbz 41158 BLAKE2B 6bd16345bd915c236d727daeb5862c2aff677c394f10b4d040ce46003255f3fd5589801979cdd77c20d8ba4fceb443467cf8f38a379a86fc59ca513e69aa1b79 SHA512 be60f13ddb6bbfe20e30ca5d92434d85e1d1371479e1e2c725588af83fcc9366ed0435021b6a800c20336ac521f2134c767420136438684656a44ac1f9924be4 diff --git a/dev-ml/pcre-ocaml/metadata.xml b/dev-ml/pcre-ocaml/metadata.xml index 919c43785884..17ff7c86c5ae 100644 --- a/dev-ml/pcre-ocaml/metadata.xml +++ b/dev-ml/pcre-ocaml/metadata.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">mmottl/pcre-ocaml</remote-id> diff --git a/dev-ml/pcre-ocaml/pcre-ocaml-7.3.2.ebuild b/dev-ml/pcre-ocaml/pcre-ocaml-7.3.2.ebuild deleted file mode 100644 index 7f1a5f8b9512..000000000000 --- a/dev-ml/pcre-ocaml/pcre-ocaml-7.3.2.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit opam - -DESCRIPTION="Perl Compatibility Regular Expressions for O'Caml" -HOMEPAGE="http://mmottl.github.io/pcre-ocaml/ https://github.com/mmottl/pcre-ocaml" -SRC_URI="https://github.com/mmottl/pcre-ocaml/releases/download/${PV}/pcre-${PV}.tbz -> ${P}.tbz" -LICENSE="LGPL-2.1-with-linking-exception" -IUSE="examples" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd" - -RDEPEND=">=dev-libs/libpcre-4.5" -DEPEND="${RDEPEND} - dev-ml/jbuilder - dev-ml/base - dev-ml/stdio - dev-ml/configurator -" - -S="${WORKDIR}/pcre-${PV}" - -src_compile() { - jbuilder build @install || die -} - -src_test() { - jbuilder runtest || die -} - -src_install() { - opam_src_install pcre - - if use examples ; then - insinto /usr/share/doc/${PF} - doins -r examples - fi -} diff --git a/dev-ml/pcre-ocaml/pcre-ocaml-7.3.3.ebuild b/dev-ml/pcre-ocaml/pcre-ocaml-7.3.3.ebuild deleted file mode 100644 index 7f1a5f8b9512..000000000000 --- a/dev-ml/pcre-ocaml/pcre-ocaml-7.3.3.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit opam - -DESCRIPTION="Perl Compatibility Regular Expressions for O'Caml" -HOMEPAGE="http://mmottl.github.io/pcre-ocaml/ https://github.com/mmottl/pcre-ocaml" -SRC_URI="https://github.com/mmottl/pcre-ocaml/releases/download/${PV}/pcre-${PV}.tbz -> ${P}.tbz" -LICENSE="LGPL-2.1-with-linking-exception" -IUSE="examples" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd" - -RDEPEND=">=dev-libs/libpcre-4.5" -DEPEND="${RDEPEND} - dev-ml/jbuilder - dev-ml/base - dev-ml/stdio - dev-ml/configurator -" - -S="${WORKDIR}/pcre-${PV}" - -src_compile() { - jbuilder build @install || die -} - -src_test() { - jbuilder runtest || die -} - -src_install() { - opam_src_install pcre - - if use examples ; then - insinto /usr/share/doc/${PF} - doins -r examples - fi -} diff --git a/dev-ml/pcre-ocaml/pcre-ocaml-7.2.3.ebuild b/dev-ml/pcre-ocaml/pcre-ocaml-7.4.6-r2.ebuild index c28e3d2dda5f..eb6393216324 100644 --- a/dev-ml/pcre-ocaml/pcre-ocaml-7.2.3.ebuild +++ b/dev-ml/pcre-ocaml/pcre-ocaml-7.4.6-r2.ebuild @@ -1,30 +1,29 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -OASIS_BUILD_DOCS=1 - -inherit oasis +inherit dune DESCRIPTION="Perl Compatibility Regular Expressions for O'Caml" HOMEPAGE="http://mmottl.github.io/pcre-ocaml/ https://github.com/mmottl/pcre-ocaml" -SRC_URI="https://github.com/mmottl/pcre-ocaml/releases/download/v${PV}/${P}.tar.gz" +SRC_URI="https://github.com/mmottl/pcre-ocaml/releases/download/${PV}/pcre-${PV}.tbz -> ${P}.tbz" +S="${WORKDIR}/pcre-${PV}" + LICENSE="LGPL-2.1-with-linking-exception" -IUSE="examples" +IUSE="examples +ocamlopt" SLOT="0/${PV}" -KEYWORDS="amd64 ppc x86 ~x86-fbsd" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv x86" +BDEPEND="dev-ml/dune-configurator" RDEPEND=">=dev-libs/libpcre-4.5 - >=dev-lang/ocaml-4:=" + dev-ml/stdio:=" DEPEND="${RDEPEND}" -DOCS=( "AUTHORS.txt" "CHANGES.txt" "README.md" ) - src_install() { - oasis_src_install + dune_src_install pcre + if use examples ; then - insinto /usr/share/doc/${PF} - doins -r examples + dodoc -r examples fi } diff --git a/dev-ml/pcre-ocaml/pcre-ocaml-7.3.0.ebuild b/dev-ml/pcre-ocaml/pcre-ocaml-7.5.0.ebuild index 7f1a5f8b9512..87e08e3e7767 100644 --- a/dev-ml/pcre-ocaml/pcre-ocaml-7.3.0.ebuild +++ b/dev-ml/pcre-ocaml/pcre-ocaml-7.5.0.ebuild @@ -1,41 +1,30 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit opam +inherit dune DESCRIPTION="Perl Compatibility Regular Expressions for O'Caml" HOMEPAGE="http://mmottl.github.io/pcre-ocaml/ https://github.com/mmottl/pcre-ocaml" SRC_URI="https://github.com/mmottl/pcre-ocaml/releases/download/${PV}/pcre-${PV}.tbz -> ${P}.tbz" -LICENSE="LGPL-2.1-with-linking-exception" -IUSE="examples" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd" - -RDEPEND=">=dev-libs/libpcre-4.5" -DEPEND="${RDEPEND} - dev-ml/jbuilder - dev-ml/base - dev-ml/stdio - dev-ml/configurator -" - S="${WORKDIR}/pcre-${PV}" -src_compile() { - jbuilder build @install || die -} +LICENSE="LGPL-2.1-with-linking-exception" +IUSE="examples +ocamlopt" +SLOT="0/${PV}" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" -src_test() { - jbuilder runtest || die -} +BDEPEND="dev-ml/dune-configurator" +RDEPEND=">=dev-libs/libpcre-4.5 + dev-ml/stdio:= + >=dev-lang/ocaml-4.12" +DEPEND="${RDEPEND}" src_install() { - opam_src_install pcre + dune_src_install pcre if use examples ; then - insinto /usr/share/doc/${PF} - doins -r examples + dodoc -r examples fi } diff --git a/dev-ml/pgocaml/Manifest b/dev-ml/pgocaml/Manifest deleted file mode 100644 index a3f8d1eb7686..000000000000 --- a/dev-ml/pgocaml/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST pgocaml-2.3.tgz 90383 BLAKE2B 3e536b4a310846688a3fd55b7a807e1aeebd12ce5f551d66572f8f3014007058a6843da1bfaf6acf16d0c1ab8b8c61551b85c29b95a79d604e9314849c1b1e05 SHA512 f42ca8ccf31f9e03cfa9f81a9cd19c2a6010c33f5a578e76924683fd10ab4acf2727b09b71c5a8f200bc39765a5d876a289976fea367b49ae54335c007fd3ff7 diff --git a/dev-ml/pgocaml/metadata.xml b/dev-ml/pgocaml/metadata.xml deleted file mode 100644 index a00e7949c4bb..000000000000 --- a/dev-ml/pgocaml/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <use> - <flag name="camlp4">Enable PG'Ocaml syntax extension.</flag> - </use> -</pkgmetadata> diff --git a/dev-ml/pgocaml/pgocaml-2.3.ebuild b/dev-ml/pgocaml/pgocaml-2.3.ebuild deleted file mode 100644 index 121edf6351c3..000000000000 --- a/dev-ml/pgocaml/pgocaml-2.3.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -OASIS_BUILD_DOCS=1 - -inherit oasis - -DESCRIPTION="PG'OCaml is a set of OCaml bindings for the PostgreSQL database" -HOMEPAGE="http://pgocaml.forge.ocamlcore.org/" -SRC_URI="http://forge.ocamlcore.org/frs/download.php/1597/${P}.tgz" - -LICENSE="LGPL-2.1-with-linking-exception" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="+camlp4 doc" - -DEPEND="dev-ml/calendar:= - dev-ml/csv:= - dev-ml/ocaml-re:= - camlp4? ( dev-ml/camlp4:= )" -RDEPEND="${DEPEND}" - -DOCS=( "README.md" "CHANGELOG.txt" - "doc/BUGS.txt" "doc/CONTRIBUTORS.txt" - "doc/HOW_IT_WORKS.txt" "doc/PROFILING.txt" - ) - -src_configure() { - oasis_configure_opts="$(use_enable camlp4 p4)" oasis_src_configure -} diff --git a/dev-ml/pipebang/Manifest b/dev-ml/pipebang/Manifest deleted file mode 100644 index c153061353b9..000000000000 --- a/dev-ml/pipebang/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST pipebang-113.00.00.tar.gz 48786 BLAKE2B 4ec19aad4699dcf5b2b83dc8f7aa806cd5ae69a28f4ae4dc39c32ba9c853abd1ce18c546c6617bcde075b33151ae125c1c4590415b3a23f63a716a0c99f2e8ca SHA512 b0398086e76eed787e8c727440caf94b17e1b667e6ce6d2be8f1ef896b0987c9fde9e3a3fd82c3df4a215c1656210210284defc526fb296bedb2ad3d1526897e diff --git a/dev-ml/pipebang/metadata.xml b/dev-ml/pipebang/metadata.xml deleted file mode 100644 index 91d86fdbaf9e..000000000000 --- a/dev-ml/pipebang/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="bitbucket">yminsky/ocaml-core</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/pipebang/pipebang-113.00.00.ebuild b/dev-ml/pipebang/pipebang-113.00.00.ebuild deleted file mode 100644 index 7762bd649a0a..000000000000 --- a/dev-ml/pipebang/pipebang-113.00.00.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit oasis - -DESCRIPTION="Syntax extension to transform x |! f into f x" -HOMEPAGE="https://bitbucket.org/yminsky/ocaml-core/wiki/Home" -SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV%.*}/files/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -DEPEND=">=dev-ml/type-conv-109.60:= - dev-ml/camlp4:=" -RDEPEND="${DEPEND}" diff --git a/dev-ml/pomap/Manifest b/dev-ml/pomap/Manifest deleted file mode 100644 index 4998eda1a20d..000000000000 --- a/dev-ml/pomap/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST pomap-3.0.6.tar.gz 75345 BLAKE2B 09fcce87bddcca92ea7c51a1c491ad9d9a17f46b38ca50e6b8759c29b802e89a0a9dbd2a9c4ab5aac30386acbba006924275f8a0c09cb7f20a2aac36dc2584ae SHA512 c9b91b7eb3716f4ba735928bb7d33202fe4b05d3908afad36cffa01ffa5fa8f860b3a9d57a0b5bbf2577bb84f3a5b464ec85375e488a3fd5f8d99d7bbcf141a8 -DIST pomap-3.0.7.tar.gz 80880 BLAKE2B f0d110b229650c9eb17d15e2ca8a6e254fe710e39a57c428ac4712379a09d261a4f082d27859b344fb6b2caabe165db08df3588996a9164928df78e6331babd4 SHA512 f4f59708c1a638211332444310aae903eead9dfe9900034698a19ead275fe8d95a32f74bd8e062f7d5d671bbd92cdf18052f26a1e2fd07724c37f60b304f66ba -DIST pomap-4.0.0.tbz 29684 BLAKE2B 3ec69da852294bad1894a1178d7bd9623cc4596a38b987885f25740d954f62cb5b1b45c63a6bbf157708ed1654123fd8cb6b20f706009091d0c47a4171ab6683 SHA512 bf249664c8a70629ca088ce6940e1db47e26c8ecbbdb28428d1a79a6d1ef4f93c48835d22d7219b57a6e60f1a64a96c23826af55720033a0ce669234b3d29d06 diff --git a/dev-ml/pomap/metadata.xml b/dev-ml/pomap/metadata.xml deleted file mode 100644 index 036d8f8cc14f..000000000000 --- a/dev-ml/pomap/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">mmottl/pomap</remote-id> - <remote-id type="bitbucket">mmottl/pomap</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/pomap/pomap-3.0.6.ebuild b/dev-ml/pomap/pomap-3.0.6.ebuild deleted file mode 100644 index f1910f1b010f..000000000000 --- a/dev-ml/pomap/pomap-3.0.6.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -OASIS_BUILD_DOCS=1 - -inherit oasis - -DESCRIPTION="Partially Ordered Map ADT for O'Caml" -HOMEPAGE="http://mmottl.github.io/pomap/" -SRC_URI="https://github.com/mmottl/pomap/releases/download/v${PV}/${P}.tar.gz" -LICENSE="LGPL-2.1-with-linking-exception" - -DEPEND="dev-ml/camlp4:=" -RDEPEND="${DEPEND}" -SLOT="0/${PV}" -KEYWORDS="amd64 ppc x86" -IUSE="examples" - -DOCS=( "AUTHORS.txt" "CHANGES.txt" "README.md" ) - -src_install() { - oasis_src_install - if use examples ; then - insinto /usr/share/doc/${PF} - doins -r examples - docompress -x /usr/share/doc/${PF}/examples - fi -} diff --git a/dev-ml/pomap/pomap-3.0.7.ebuild b/dev-ml/pomap/pomap-3.0.7.ebuild deleted file mode 100644 index 843be10b3fb5..000000000000 --- a/dev-ml/pomap/pomap-3.0.7.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -OASIS_BUILD_DOCS=1 - -inherit oasis - -DESCRIPTION="Partially Ordered Map ADT for O'Caml" -HOMEPAGE="http://mmottl.github.io/pomap/" -SRC_URI="https://github.com/mmottl/pomap/releases/download/v${PV}/${P}.tar.gz" -LICENSE="LGPL-2.1-with-linking-exception" - -DEPEND="dev-ml/camlp4:=" -RDEPEND="${DEPEND}" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="examples" - -DOCS=( "AUTHORS.txt" "CHANGES.txt" "README.md" ) - -src_install() { - oasis_src_install - if use examples ; then - insinto /usr/share/doc/${PF} - doins -r examples - docompress -x /usr/share/doc/${PF}/examples - fi -} diff --git a/dev-ml/pomap/pomap-4.0.0.ebuild b/dev-ml/pomap/pomap-4.0.0.ebuild deleted file mode 100644 index 47b9be24bf99..000000000000 --- a/dev-ml/pomap/pomap-4.0.0.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit opam - -DESCRIPTION="Partially Ordered Map ADT for O'Caml" -HOMEPAGE="http://mmottl.github.io/pomap/" -SRC_URI="https://github.com/mmottl/pomap/releases/download/${PV}/${P}.tbz" -LICENSE="LGPL-2.1-with-linking-exception" - -SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" -RDEPEND="" -DEPEND="${RDEPEND} dev-ml/jbuilder" - -src_compile() { - jbuilder build @install || die -} diff --git a/dev-ml/postgresql-ocaml/Manifest b/dev-ml/postgresql-ocaml/Manifest deleted file mode 100644 index 7bd4b545704d..000000000000 --- a/dev-ml/postgresql-ocaml/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST postgresql-4.1.0.tbz 36689 BLAKE2B d27db79afce335394ec1225a8c64f278374caae6344da2901396b6086e409dc37d225c57e7da3de5b4342121b6f6b2268b06c16e4b4a07d13f2e75ca0dab0f08 SHA512 5749e426634f00fc8aab86e4c23f863ebdebc9bb77c121dea1c516c8bd5524096051975514daa47abe1556355bc4a1994d6634aae09736a508a9b6552b134d42 -DIST postgresql-4.2.0.tbz 37463 BLAKE2B f6f8f894458945f15eb7991813351f6cb9aaf78b88d241dd5736398d46deff825bf5084ada04fdcfc04deba6e0599df7df27640d27c45382ef2ad49b93cc88b1 SHA512 21a9d89c2fdaf5862b350aecffe1a675ecbeef42e138e09c03d14551b25622910014582c98877882746f9fc56ef5f1248c5b00a6a61d7bcd6d757c451a7844d8 -DIST postgresql-ocaml-4.0.1.tar.gz 85871 BLAKE2B 8c2e0ce4b8bcc17f0afff1fbcd867245213ddc8702b75359e7ee926d9db749fed732cf15a905c228ca114c09ea61755fff54a0c5895edd8104dbb20590be3a8d SHA512 baecd1b3b98f790131972dbd2eba563b43dec6e13e37ab904ee38b2b1168b03533272532887a42a2536806951c9e543306c6eccfb441de517ee860383ea5df36 diff --git a/dev-ml/postgresql-ocaml/metadata.xml b/dev-ml/postgresql-ocaml/metadata.xml deleted file mode 100644 index d5f8d2a4f814..000000000000 --- a/dev-ml/postgresql-ocaml/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">mmottl/postgresql-ocaml</remote-id> - <remote-id type="bitbucket">mmottl/postgresql-ocaml</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/postgresql-ocaml/postgresql-ocaml-4.0.1.ebuild b/dev-ml/postgresql-ocaml/postgresql-ocaml-4.0.1.ebuild deleted file mode 100644 index abe5b03fa5cc..000000000000 --- a/dev-ml/postgresql-ocaml/postgresql-ocaml-4.0.1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -OASIS_BUILD_DOCS=1 - -inherit oasis - -DESCRIPTION="A package for ocaml that provides access to PostgreSQL databases" -SRC_URI="https://github.com/mmottl/postgresql-ocaml/releases/download/v${PV}/${P}.tar.gz" -HOMEPAGE="http://mmottl.github.io/postgresql-ocaml/" -IUSE="examples" - -RDEPEND=" - dev-db/postgresql:=[server] -" -DEPEND="${RDEPEND} - >=dev-ml/findlib-1.5" - -SLOT="0/${PV}" -LICENSE="LGPL-2" -KEYWORDS="~amd64 ~ppc x86" - -DOCS=( "AUTHORS.txt" "CHANGES.txt" "README.md" ) - -src_install() { - oasis_src_install - if use examples ; then - insinto /usr/share/doc/${PF} - doins -r examples - fi -} diff --git a/dev-ml/postgresql-ocaml/postgresql-ocaml-4.1.0.ebuild b/dev-ml/postgresql-ocaml/postgresql-ocaml-4.1.0.ebuild deleted file mode 100644 index 0a85bb949138..000000000000 --- a/dev-ml/postgresql-ocaml/postgresql-ocaml-4.1.0.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit opam - -MY_P="postgresql-${PV}" - -DESCRIPTION="A package for ocaml that provides access to PostgreSQL databases" -SRC_URI="https://github.com/mmottl/postgresql-ocaml/releases/download/${PV}/${MY_P}.tbz" -HOMEPAGE="http://mmottl.github.io/postgresql-ocaml/" -IUSE="" - -RDEPEND=" - dev-db/postgresql:=[server] -" -DEPEND="${RDEPEND} - dev-ml/jbuilder - >=dev-ml/findlib-1.5" - -SLOT="0/${PV}" -LICENSE="LGPL-2" -KEYWORDS="~amd64 ~ppc ~x86" - -S="${WORKDIR}/${MY_P}" - -src_compile() { - jbuilder build @install || die -} - -src_install() { - opam_src_install "postgresql" -} diff --git a/dev-ml/postgresql-ocaml/postgresql-ocaml-4.2.0.ebuild b/dev-ml/postgresql-ocaml/postgresql-ocaml-4.2.0.ebuild deleted file mode 100644 index 0a85bb949138..000000000000 --- a/dev-ml/postgresql-ocaml/postgresql-ocaml-4.2.0.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit opam - -MY_P="postgresql-${PV}" - -DESCRIPTION="A package for ocaml that provides access to PostgreSQL databases" -SRC_URI="https://github.com/mmottl/postgresql-ocaml/releases/download/${PV}/${MY_P}.tbz" -HOMEPAGE="http://mmottl.github.io/postgresql-ocaml/" -IUSE="" - -RDEPEND=" - dev-db/postgresql:=[server] -" -DEPEND="${RDEPEND} - dev-ml/jbuilder - >=dev-ml/findlib-1.5" - -SLOT="0/${PV}" -LICENSE="LGPL-2" -KEYWORDS="~amd64 ~ppc ~x86" - -S="${WORKDIR}/${MY_P}" - -src_compile() { - jbuilder build @install || die -} - -src_install() { - opam_src_install "postgresql" -} diff --git a/dev-ml/pp/Manifest b/dev-ml/pp/Manifest new file mode 100644 index 000000000000..98899d7acc09 --- /dev/null +++ b/dev-ml/pp/Manifest @@ -0,0 +1 @@ +DIST pp-1.1.2.tbz 9586 BLAKE2B 36bf09c2623c28215f2d4d3260681dacf7041919e09eb5e53ee04f90706b037784c0f7d5cbdfee58ce2808f28df09638fa4d15b82d8542badc05c06c0d8cce96 SHA512 58f78b083483006b40814be9aac33c895349eb1c6427d2762b4d760192613401262478bd5deff909763517560b06af7bf013c6a6f87d549aafa77b26345303f2 diff --git a/dev-ml/pp/metadata.xml b/dev-ml/pp/metadata.xml new file mode 100644 index 000000000000..25a0b092cb96 --- /dev/null +++ b/dev-ml/pp/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">ocaml-dune/pp</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/pp/pp-1.1.2.ebuild b/dev-ml/pp/pp-1.1.2.ebuild new file mode 100644 index 000000000000..68967b9d9be9 --- /dev/null +++ b/dev-ml/pp/pp-1.1.2.ebuild @@ -0,0 +1,20 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Pretty-printing library" +HOMEPAGE="https://github.com/ocaml-dune/pp" +SRC_URI="https://github.com/ocaml-dune/pp/releases/download/${PV}/${P}.tbz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +DEPEND="dev-ml/ppx_expect:= + >=dev-lang/ocaml-4.08" +RDEPEND="${DEPEND}" +BDEPEND="" diff --git a/dev-ml/pprint/Manifest b/dev-ml/pprint/Manifest new file mode 100644 index 000000000000..0b85cf00968f --- /dev/null +++ b/dev-ml/pprint/Manifest @@ -0,0 +1,3 @@ +DIST pprint-20211129.tar.gz 42778 BLAKE2B b5becf959d750e07ecf12c58cf6f41ff10f841d8034e9f89544b28e81eefdf564e2144a102fa918256736bb092de454eba13dfa38363e1ed230742eb95817e9d SHA512 12133735f558075f1ecdcec16cc11f7237dd82883c542645c479f534acd8ed6935f05a3f9aad8e330c329520852bdff6d420d632636bd9004a4d0aade762cae6 +DIST pprint-20220103.tar.gz 47809 BLAKE2B c581370be13f45d2d97a9fe7a6f7e81fc033a33a2f1740dcc808ce388356554506c00393efb05937b5833ae19fbf01c1fc9d013024d11724ef323110925bce88 SHA512 1c4d85e529414dc2d52602fae7e44ca036d2d35e9ce1906fd88b0f8a8d0ba1527042b0e5117fdeb51237b2311020a711065a917cc158b63e2ac932c97fa28406 +DIST pprint-20230830.tar.gz 52012 BLAKE2B c5ece9c608c04c3556fa2b6c98392d086de0e94395d1791184858c723634df1a15983f03eced0789386e56b5ef4e9a8f790396a577397a9ceeff8f76a2657c44 SHA512 7c58275cf9951283cf5051c2cf4c98084e8d562a8172a6379d9831a8fc95c9a19fc06710350217da2ea90fd2b17994142b10d1a9f8dab17b2bbf3e47e76c9f5f diff --git a/dev-ml/pprint/metadata.xml b/dev-ml/pprint/metadata.xml new file mode 100644 index 000000000000..63026bfdf8bd --- /dev/null +++ b/dev-ml/pprint/metadata.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> + +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <longdescription> + This library offers a set of combinators for building so-called documents + as well as an efficient engine for converting documents to a textual, + fixed-width format. The engine takes care of indentation and line breaks, + while respecting the constraints imposed by the structure of the document + and by the text width. + </longdescription> + <upstream> + <remote-id type="github">fpottier/pprint</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/pprint/pprint-20211129.ebuild b/dev-ml/pprint/pprint-20211129.ebuild new file mode 100644 index 000000000000..97e3528ec93e --- /dev/null +++ b/dev-ml/pprint/pprint-20211129.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="A pretty-printing combinator library and rendering engine" +HOMEPAGE="https://github.com/fpottier/pprint/" +SRC_URI="https://github.com/fpottier/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2 LGPL-2-with-linking-exception" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="+ocamlopt" diff --git a/dev-ml/pprint/pprint-20220103.ebuild b/dev-ml/pprint/pprint-20220103.ebuild new file mode 100644 index 000000000000..1b02c9dd5c4e --- /dev/null +++ b/dev-ml/pprint/pprint-20220103.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="A pretty-printing combinator library and rendering engine" +HOMEPAGE="https://github.com/fpottier/pprint/" +SRC_URI="https://github.com/fpottier/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2 LGPL-2-with-linking-exception" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="+ocamlopt" diff --git a/dev-ml/pprint/pprint-20230830.ebuild b/dev-ml/pprint/pprint-20230830.ebuild new file mode 100644 index 000000000000..cf47b0f5dfd8 --- /dev/null +++ b/dev-ml/pprint/pprint-20230830.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="A pretty-printing combinator library and rendering engine" +HOMEPAGE="https://github.com/fpottier/pprint/" +SRC_URI="https://github.com/fpottier/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2 LGPL-2-with-linking-exception" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="+ocamlopt" diff --git a/dev-ml/ppx_assert/Manifest b/dev-ml/ppx_assert/Manifest index c5ef535aaafb..d88abf0113aa 100644 --- a/dev-ml/ppx_assert/Manifest +++ b/dev-ml/ppx_assert/Manifest @@ -1 +1,3 @@ -DIST ppx_assert-0.9.0.tar.gz 9419 BLAKE2B 7e6ea363182ce3f057e54ae54e2d7b3236d909a748c74ee79209d97de001bf1df1934bccc95bf93e674aedd5c5f5029748747242acb1246f1f08a02f8b9b6309 SHA512 4debf617f1b0244d306b65d72cbf04f4a820a8d9433180d462ff462d2bf6eb01643897cc35de75d435fedfa1bf8266263c0e73328f02b5c957a3423eb535925f +DIST ppx_assert-0.14.0.tar.gz 7239 BLAKE2B 730d1cceee88728291473e73120cc1ae19477927c8f5e20b1a455ab78e34c5917907a60e03ea7d2b898ccb99e42755f1ad918d7fa59ae64bac84fd8356af7647 SHA512 b8ae4a1f08e9110f0809f98d1e0126d50101db7c5b87aa166294aed29df420a079fd2c0797c2888718acd8cd4f2aaaa98f0c445e5fb1423325cc89801e7d52b1 +DIST ppx_assert-0.15.0.tar.gz 7387 BLAKE2B 60b4f32780ecf04eb478645f25150f9ad2b6671954e99b208917e0723767a1d122128c19b6964b63cd707ed78bf5b8117d4319f2f82e0b22deead05a140adcba SHA512 54d28c8fc9c1ecff9e7b616aa4013d09f6554f6b59b62ef9db0f18fb4a8e0b36f31241f522324140a9f680ad46ac57257a28baca00daa901c264f40d61fd510d +DIST ppx_assert-0.16.0.tar.gz 7419 BLAKE2B 21090724f4fec89cd6dc87a409dc181e0cc816c24beb82b330f9471e7d20aeb0cab61c105d61251706180af2be3d93cf46dbd78d0af2b2ce9cbb57bd8134774e SHA512 cceddea9172535ca72990fabe455b503a28a5b7519dc635ba1e6e3aff9d0c5f71a794f3ce05466165bab843b7385c23b0d879917d15589ad9b9592718dd46063 diff --git a/dev-ml/ppx_assert/files/ppx_assert-0.14.0-4.12.patch b/dev-ml/ppx_assert/files/ppx_assert-0.14.0-4.12.patch new file mode 100644 index 000000000000..80ff9fb1eb47 --- /dev/null +++ b/dev-ml/ppx_assert/files/ppx_assert-0.14.0-4.12.patch @@ -0,0 +1,30 @@ +--- a/runtime-lib/runtime.ml 2021-09-30 19:07:51.592766183 +0200 ++++ b/runtime-lib/runtime.ml 2021-09-30 19:11:18.035634157 +0200 +@@ -71,7 +71,7 @@ + end; + `Fail (expect, got) + +-let test_result_or_eq ~sexpifier ~comparator ?equal ~expect ~got = ++let test_result_or_eq ~sexpifier ~comparator ~equal ~expect ~got = + let pass = + match equal with + | None -> comparator got expect = 0 +@@ -89,7 +89,7 @@ + ] + + let test_eq ~pos ~sexpifier ~comparator ~here ?message ?equal t1 t2 = +- match test_result_or_eq ~sexpifier ~comparator ?equal ~expect:t1 ~got:t2 with ++ match test_result_or_eq ~sexpifier ~comparator ~equal ~expect:t1 ~got:t2 with + | `Pass -> () + | `Fail (t1, t2) -> test_eq_failed ~message ~pos ~here ~t1 ~t2 + +@@ -99,7 +99,7 @@ + Sexp.List [Sexp.Atom "got"; got]; + ] + +-let test_result ~pos ~sexpifier ~comparator ~here ?message ?equal ~expect ~got = +- match test_result_or_eq ~sexpifier ~comparator ?equal ~expect ~got with ++let[@warning "-16"] test_result ~pos ~sexpifier ~comparator ~here ?message ?equal ~expect ~got = ++ match test_result_or_eq ~sexpifier ~comparator ~equal ~expect ~got with + | `Pass -> () + | `Fail (expect, got) -> test_result_failed ~message ~pos ~here ~expect ~got diff --git a/dev-ml/ppx_assert/metadata.xml b/dev-ml/ppx_assert/metadata.xml index 0cab87a0ca44..a523d8682680 100644 --- a/dev-ml/ppx_assert/metadata.xml +++ b/dev-ml/ppx_assert/metadata.xml @@ -1,9 +1,9 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">janestreet/ppx_assert</remote-id> diff --git a/dev-ml/ppx_assert/ppx_assert-0.14.0.ebuild b/dev-ml/ppx_assert/ppx_assert-0.14.0.ebuild new file mode 100644 index 000000000000..dc67973148b1 --- /dev/null +++ b/dev-ml/ppx_assert/ppx_assert-0.14.0.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Assert-like extension nodes that raise useful errors on failure" +HOMEPAGE="https://github.com/janestreet/ppx_assert" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-ml/base-0.14.0:= + dev-ml/findlib:= + >=dev-ml/ppx_cold-0.14.0:= + >=dev-ml/ppx_compare-0.14.0:= + >=dev-ml/ppx_here-0.14.0:= + >=dev-ml/ppx_sexp_conv-0.14.1:= + >=dev-ml/ppxlib-0.18.0:= + >=dev-ml/ocaml-compiler-libs-0.11.0:= + >=dev-ml/ocaml-migrate-parsetree-2.0.0:= + dev-ml/cinaps:= +" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}"/${P}-4.12.patch ) diff --git a/dev-ml/ppx_assert/ppx_assert-0.15.0-r1.ebuild b/dev-ml/ppx_assert/ppx_assert-0.15.0-r1.ebuild new file mode 100644 index 000000000000..67db7470b298 --- /dev/null +++ b/dev-ml/ppx_assert/ppx_assert-0.15.0-r1.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Assert-like extension nodes that raise useful errors on failure" +HOMEPAGE="https://github.com/janestreet/ppx_assert" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +DEPEND=" + dev-ml/ppxlib:= + dev-ml/ppx_cold:${SLOT} + dev-ml/ppx_compare:${SLOT} + dev-ml/ppx_here:${SLOT} + dev-ml/ppx_sexp_conv:${SLOT} +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_assert/ppx_assert-0.16.0.ebuild b/dev-ml/ppx_assert/ppx_assert-0.16.0.ebuild new file mode 100644 index 000000000000..839209fc5e32 --- /dev/null +++ b/dev-ml/ppx_assert/ppx_assert-0.16.0.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Assert-like extension nodes that raise useful errors on failure" +HOMEPAGE="https://github.com/janestreet/ppx_assert" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-lang/ocaml-4.14 + >=dev-ml/ppxlib-0.28:= + dev-ml/ppx_cold:${SLOT} + dev-ml/ppx_compare:${SLOT} + dev-ml/ppx_here:${SLOT} + dev-ml/ppx_sexp_conv:${SLOT} +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_assert/ppx_assert-0.9.0.ebuild b/dev-ml/ppx_assert/ppx_assert-0.9.0.ebuild deleted file mode 100644 index 342b0cf8e989..000000000000 --- a/dev-ml/ppx_assert/ppx_assert-0.9.0.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit opam - -DESCRIPTION="Assert-like extension nodes that raise useful errors on failure" -HOMEPAGE="https://github.com/janestreet/ppx_assert" -SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -DEPEND=" - dev-ml/base:= - dev-ml/ppx_compare:= - dev-ml/ppx_core:= - dev-ml/ppx_driver:= - dev-ml/ppx_here:= - dev-ml/ppx_metaquot:= - dev-ml/ppx_sexp_conv:= - dev-ml/ppx_type_conv - dev-ml/sexplib:= - dev-ml/ocaml-migrate-parsetree:= -" - -RDEPEND="${DEPEND}" -DEPEND="${RDEPEND} dev-ml/jbuilder" diff --git a/dev-ml/ppx_ast/Manifest b/dev-ml/ppx_ast/Manifest deleted file mode 100644 index b94f512fbde7..000000000000 --- a/dev-ml/ppx_ast/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ppx_ast-0.9.1.tar.gz 86802 BLAKE2B 5974cbea0b2566e83d8fb4192aa7e7f802aa7b6fa02b8f638ea12ac5c617fdca1f4426e0ee3fc761c46fe0ddf2e26d4ed402eb8c21fd84ce513a60996047ca28 SHA512 4a5a9fb47282877763ecf9638e67bcd1b57110c1acfcf446703ed335b9fa5aaa1521c55a75fce6025f91e715f9c4522b695444dde4d3ffa7feed79560e399ad7 diff --git a/dev-ml/ppx_ast/metadata.xml b/dev-ml/ppx_ast/metadata.xml deleted file mode 100644 index b51bd5cf917a..000000000000 --- a/dev-ml/ppx_ast/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">janestreet/ppx_ast</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/ppx_ast/ppx_ast-0.9.1.ebuild b/dev-ml/ppx_ast/ppx_ast-0.9.1.ebuild deleted file mode 100644 index acc14d99d440..000000000000 --- a/dev-ml/ppx_ast/ppx_ast-0.9.1.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit opam - -DESCRIPTION="AST used in Jane Street ppx rewriters" -HOMEPAGE="https://github.com/janestreet/ppx_ast" -SRC_URI="https://github.com/janestreet/ppx_ast/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" - -DEPEND=" - dev-ml/ocaml-compiler-libs:= - dev-ml/ocaml-migrate-parsetree:= -" -RDEPEND="${DEPEND}" -DEPEND="${RDEPEND} - dev-ml/jbuilder" diff --git a/dev-ml/ppx_base/Manifest b/dev-ml/ppx_base/Manifest index 94668780256a..607aae3f80d1 100644 --- a/dev-ml/ppx_base/Manifest +++ b/dev-ml/ppx_base/Manifest @@ -1 +1,3 @@ -DIST ppx_base-0.9.0.tar.gz 5255 BLAKE2B ba5d1670ba0da8c13c30dab65885cb9d406d7259ca57841867f4b2c7720f8202fb34074b5bc8f03cb0858427c79e61d4a33098c846c61ebcc98d40799ced9274 SHA512 660f6b210eb6d7bd33c279ffa8bbf01c21b9db5d7827cf6fded8c52e8d4f2f5468a76c2eab86c2b868ac859bbc81db7189c71ccc1701bf57030f82d8eda4339e +DIST ppx_base-0.14.0.tar.gz 2953 BLAKE2B d62187d4b359dab01f88054ffb53a434402af022849a633749f3d60b625967a30b6c2ef58b838ef2ee6261d675da60f03d062ae1dc8391d5a4f0bb9cb3d719b0 SHA512 d41f36e3ddec7bdffaa93d8ec4110a197ef4d4af4f9173e060b0f1c5d9c95a33ee13379e41dc027f1103faea3b8ec4e314387b0844a7fcb78d0770ffa44c99e8 +DIST ppx_base-0.15.0.tar.gz 2942 BLAKE2B 7e08f445f6e643a5b278bcc661a359a155ee608df282a8547b7c1080a2b3a900bcf9b33647f6cd5fdd32205042bce4e4f90a6af77e0b8fd7fae9c17232fccf77 SHA512 6843c496bde4e9bccab1a7169da373bf315c5c6a551fd3e71b9e2b589e1d3b9a6361ccf2130ebde4bcb10a6c07d2c25acbf9951463e4b18e91bf289ce04daf72 +DIST ppx_base-0.16.0.tar.gz 2996 BLAKE2B 963c1966caa53fe4e626c111069a199846436e488d7c05a2323e8e726af09a5aaf5df5f2ef81a3736bc2215d8118351a413a3b3b1714361f44c1f0f3febb8af7 SHA512 110b03434f0ef7c82b8728c60ac03f56ec0bc2a292d9cc39bbca0102a976c34fb4a18311a7a1ff6755f7f61c2aa677d0413da36635f98336cc59eef962b8abb3 diff --git a/dev-ml/ppx_base/metadata.xml b/dev-ml/ppx_base/metadata.xml index 4b0a19890595..14018e331313 100644 --- a/dev-ml/ppx_base/metadata.xml +++ b/dev-ml/ppx_base/metadata.xml @@ -1,9 +1,9 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">janestreet/ppx_base</remote-id> diff --git a/dev-ml/ppx_base/ppx_base-0.14.0.ebuild b/dev-ml/ppx_base/ppx_base-0.14.0.ebuild new file mode 100644 index 000000000000..e69ff3768be7 --- /dev/null +++ b/dev-ml/ppx_base/ppx_base-0.14.0.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Base set of ppx rewriters" +HOMEPAGE="https://github.com/janestreet/ppx_base" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-ml/ppx_cold-0.14.0:= + >=dev-ml/ppx_compare-0.14.0:= + >=dev-ml/ppx_enumerate-0.14.0:= + >=dev-ml/ppx_hash-0.14.0:= + >=dev-ml/ppx_js_style-0.14.0:= + >=dev-ml/ppx_sexp_conv-0.14.0:= + >=dev-ml/ppxlib-0.18.0:= + >=dev-ml/ocaml-migrate-parsetree-2.0.0:= + dev-ml/cinaps:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_base/ppx_base-0.15.0.ebuild b/dev-ml/ppx_base/ppx_base-0.15.0.ebuild new file mode 100644 index 000000000000..d3e8152b291b --- /dev/null +++ b/dev-ml/ppx_base/ppx_base-0.15.0.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Base set of ppx rewriters" +HOMEPAGE="https://github.com/janestreet/ppx_base" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +DEPEND=" + dev-ml/ppx_cold:${SLOT} + dev-ml/ppx_enumerate:${SLOT} + dev-ml/ppx_hash:${SLOT} +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_base/ppx_base-0.16.0-r1.ebuild b/dev-ml/ppx_base/ppx_base-0.16.0-r1.ebuild new file mode 100644 index 000000000000..b694c4df4962 --- /dev/null +++ b/dev-ml/ppx_base/ppx_base-0.16.0-r1.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Base set of ppx rewriters" +HOMEPAGE="https://github.com/janestreet/ppx_base" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-lang/ocaml-4.14 + dev-ml/ppx_cold:${SLOT} + dev-ml/ppx_globalize:${SLOT} + dev-ml/ppx_enumerate:${SLOT} + dev-ml/ppx_hash:${SLOT} + dev-ml/ppx_sexp_conv:${SLOT} +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_base/ppx_base-0.9.0.ebuild b/dev-ml/ppx_base/ppx_base-0.9.0.ebuild deleted file mode 100644 index fba5ad20e4ae..000000000000 --- a/dev-ml/ppx_base/ppx_base-0.9.0.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit opam - -DESCRIPTION="Base set of ppx rewriters" -HOMEPAGE="https://github.com/janestreet/ppx_base" -SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" - -DEPEND=" - dev-ml/ppx_compare:= - dev-ml/ppx_driver:= - dev-ml/ppx_enumerate:= - dev-ml/ppx_hash:= - dev-ml/ppx_js_style:= - dev-ml/ppx_sexp_conv:= - dev-ml/ppx_type_conv:= - dev-ml/ocaml-migrate-parsetree:= - " -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} dev-ml/jbuilder" diff --git a/dev-ml/ppx_bench/Manifest b/dev-ml/ppx_bench/Manifest index c69dda276198..f7ea63f1f25d 100644 --- a/dev-ml/ppx_bench/Manifest +++ b/dev-ml/ppx_bench/Manifest @@ -1 +1,3 @@ -DIST ppx_bench-0.9.1.tar.gz 11097 BLAKE2B cdf7cd97a1ce702c75aa87a717b5d7905931571c0b000cef5a4af29e18f15c22adbf4882ef5453ddd97def6b5ea7885835dc69237e70e13138670a5ced4c966b SHA512 1963525719178e34f50ee8dbe3cabe8582ffc08835e542d1ae593d6a250d4f841be53c96fbc203d620e11f9ad2a9f591e545656c3b254bd60db614ec1e06947d +DIST ppx_bench-0.14.1.tar.gz 9132 BLAKE2B d8590c0b80bbde553ec28514017df6f5deaf93fc693f3c1f102a0ad1f7e616a9308b51d0fb2535f1f8279ddfb9760bdf6b546acaa06bf6181848b3f93771061d SHA512 f359ebf33b1efe91dad9c844a16a0629cd079423a10da39d093af1e1d3c94872328de9a9272a741bf8f4bca5945556d5bc70a0f8994886a934eb933959c5db63 +DIST ppx_bench-0.15.0.tar.gz 9530 BLAKE2B d001817a4e912f7a9345e94a1f5104d0f1b6c35420892cb5cbf7eb7d9e7130de3406a9c9803b6dce9bd17e300d34a3df3dc5fd87d240637c3e3a8667b3191c87 SHA512 f3ab84c7c820735c429ae2250462226efc61d7099071a91dd9471d2052b807dca57c07661336d7f908e2104c1bc0095512429865b2528749cbc407e314e845df +DIST ppx_bench-0.16.0.tar.gz 9555 BLAKE2B f215f21f4c1d4d23c86bbaaf4feb7ec3d21a1041d1072b9aec98a16f6cbec6cd2e6e067e8e44c90d5eb9aedc331092400f578aff40cc18a4eea22df1d7f432c2 SHA512 4644d7088647bffa24e380dcf52adfc4034fccddc0f3e75112c71542d6a4515904d465f15789705ac1861d267fab52af2791dc0a2ddedf83585c5f62c0f18aed diff --git a/dev-ml/ppx_bench/files/ppx_bench-0.15.0-ppxlib0.29.0.patch b/dev-ml/ppx_bench/files/ppx_bench-0.15.0-ppxlib0.29.0.patch new file mode 100644 index 000000000000..580af9eb4b76 --- /dev/null +++ b/dev-ml/ppx_bench/files/ppx_bench-0.15.0-ppxlib0.29.0.patch @@ -0,0 +1,23 @@ +From ce7bcca13aff40dd667e231fc0892c8753d0fc94 Mon Sep 17 00:00:00 2001 +From: Carl Eastlund <ceastlund@janestreet.com> +Date: Thu, 19 Jan 2023 12:20:01 -0500 +Subject: [PATCH] Stop using [Ppxlib.File_path]. + +Signed-off-by: Carl Eastlund <ceastlund@janestreet.com> +--- + src/ppx_bench.ml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/ppx_bench.ml b/src/ppx_bench.ml +index 0c027e8..b825997 100644 +--- a/src/ppx_bench.ml ++++ b/src/ppx_bench.ml +@@ -49,7 +49,7 @@ let maybe_drop loc code = + ;; + + let descr (loc : Location.t) ?(inner_loc = loc) () = +- let filename = File_path.get_default_path loc in ++ let filename = loc.loc_start.pos_fname in + let line = loc.loc_start.pos_lnum in + let start_pos = loc.loc_start.pos_cnum - loc.loc_start.pos_bol in + let end_pos = inner_loc.Location.loc_end.pos_cnum - loc.loc_start.pos_bol in diff --git a/dev-ml/ppx_bench/metadata.xml b/dev-ml/ppx_bench/metadata.xml index f0ad86c70e81..726059bed036 100644 --- a/dev-ml/ppx_bench/metadata.xml +++ b/dev-ml/ppx_bench/metadata.xml @@ -1,9 +1,9 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">janestreet/ppx_bench</remote-id> diff --git a/dev-ml/ppx_bench/ppx_bench-0.14.1.ebuild b/dev-ml/ppx_bench/ppx_bench-0.14.1.ebuild new file mode 100644 index 000000000000..29bdabd5db75 --- /dev/null +++ b/dev-ml/ppx_bench/ppx_bench-0.14.1.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Syntax extension for writing in-line benchmarks in ocaml code" +HOMEPAGE="https://github.com/janestreet/ppx_bench" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-ml/ppx_inline_test-0.14.1:= + >=dev-ml/ppxlib-0.18.0:= + >=dev-ml/stdio-0.14.0:= + >=dev-ml/ocaml-migrate-parsetree-2.0.0:= + dev-ml/cinaps:= + dev-ml/sexplib0:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_bench/ppx_bench-0.9.1.ebuild b/dev-ml/ppx_bench/ppx_bench-0.15.0-r1.ebuild index c17ddf31b27a..1f3f932cf570 100644 --- a/dev-ml/ppx_bench/ppx_bench-0.9.1.ebuild +++ b/dev-ml/ppx_bench/ppx_bench-0.15.0-r1.ebuild @@ -1,26 +1,23 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit opam +inherit dune DESCRIPTION="Syntax extension for writing in-line benchmarks in ocaml code" HOMEPAGE="https://github.com/janestreet/ppx_bench" SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" DEPEND=" - dev-ml/ppx_core:= - dev-ml/ppx_driver:= - dev-ml/ppx_inline_test:= - dev-ml/ppx_metaquot:= - dev-ml/ocaml-migrate-parsetree:= + dev-ml/ppx_inline_test:${SLOT} + >=dev-ml/ppxlib-0.23.0:= " - RDEPEND="${DEPEND}" -DEPEND="${DEPEND} dev-ml/jbuilder" + +PATCHES=( "${FILESDIR}"/${P}-ppxlib0.29.0.patch ) diff --git a/dev-ml/ppx_bench/ppx_bench-0.16.0.ebuild b/dev-ml/ppx_bench/ppx_bench-0.16.0.ebuild new file mode 100644 index 000000000000..4ed99f0f5ec2 --- /dev/null +++ b/dev-ml/ppx_bench/ppx_bench-0.16.0.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Syntax extension for writing in-line benchmarks in ocaml code" +HOMEPAGE="https://github.com/janestreet/ppx_bench" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-lang/ocaml-4.14 + dev-ml/ppx_inline_test:${SLOT} + >=dev-ml/ppxlib-0.28.0:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_bin_prot/Manifest b/dev-ml/ppx_bin_prot/Manifest index 607ba8a10fe6..f64024a7e876 100644 --- a/dev-ml/ppx_bin_prot/Manifest +++ b/dev-ml/ppx_bin_prot/Manifest @@ -1 +1,3 @@ -DIST ppx_bin_prot-0.9.0.tar.gz 35234 BLAKE2B 883e7d8b3919d640408fd1efa22df6656d1146d2771313ee29bda287f8ec412b4acdabebb8ea3548918370a6048543b93e17b22141ac672a4b8c628d0c678844 SHA512 f900741f4caeec86ec9d73a086ffeec21789bdd99ca7b09a808a3e281038d587c9c326cc1217957fcd828c4e1da5902f6dee3bf4ba7a22feca5424573215a00c +DIST ppx_bin_prot-0.14.0.tar.gz 36642 BLAKE2B 6a80f574fad5e3ba2bb1adad8e6af86a9bd463ab7ed8976901234694a56f9e17c04ccc74f0bd4a18c75f1a4ccd81848218078bb387f8ff2f5df337c5f2492226 SHA512 7d61624d18fd76daed5a5d60d16ac0a3fd658ef650ee6ae4b65346e96d1718a044deb3ca6fbb63c69176505f64d0d1b6becd8419061cfb69466d45e16964329b +DIST ppx_bin_prot-0.15.0.tar.gz 37045 BLAKE2B 6ec039c1b18c759a676c1da30f02d70799e93d77dcd530844b2a448e4f2a58fbdf9c88f0d4a802a34070959586e7b9c7b1be1b51de9d29d34ea57fba9c7938cf SHA512 3fdc7e9431458b752d553f093762e3ed3c96af3a789eceeb94895284de961a887e358d137c21da372cadf6c0e6329628f6c698499581f672e0e1913b3274cc14 +DIST ppx_bin_prot-0.16.0.tar.gz 37632 BLAKE2B 48597b32da8b41dc5c9027d8dccff099055b9efdd7510c5f89c4d74f51e2fe6150e800ed5fbcc44f818deed5843e5bd485403ef7ec1e09ddec8d2b328e1dc8ad SHA512 b6e4f1a1ea1dfcfb2c23f34b0842097ad85535a22a767b2f47aa3a5812a112a60768c7b94bfce2602721f165b8ffec1e5282e83a008b2c6684bb102093467f3c diff --git a/dev-ml/ppx_bin_prot/metadata.xml b/dev-ml/ppx_bin_prot/metadata.xml index 562cf866321f..485d3a8751ca 100644 --- a/dev-ml/ppx_bin_prot/metadata.xml +++ b/dev-ml/ppx_bin_prot/metadata.xml @@ -1,9 +1,9 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">janestreet/ppx_bin_prot</remote-id> diff --git a/dev-ml/ppx_bin_prot/ppx_bin_prot-0.14.0.ebuild b/dev-ml/ppx_bin_prot/ppx_bin_prot-0.14.0.ebuild new file mode 100644 index 000000000000..667f5d60f08c --- /dev/null +++ b/dev-ml/ppx_bin_prot/ppx_bin_prot-0.14.0.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Generation of bin_prot readers and writers from types" +HOMEPAGE="https://github.com/janestreet/ppx_bin_prot" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-ml/base-0.14.0:= + dev-ml/findlib:= + >=dev-ml/bin_prot-0.14.0:= + >=dev-ml/ppx_here-0.14.0:= + >=dev-ml/ppxlib-0.18.0:= + >=dev-ml/ocaml-migrate-parsetree-2.0.0:= + dev-ml/cinaps:= + dev-ml/sexplib0:= + " +DEPEND="${RDEPEND} + test? ( + dev-ml/ppx_jane + dev-ml/core + dev-ml/ounit2 + dev-ml/core_bench + )" + +src_prepare() { + sed -i \ + -e "s:oUnit:ounit2:" \ + test/dune \ + || die + default +} diff --git a/dev-ml/ppx_bin_prot/ppx_bin_prot-0.15.0-r1.ebuild b/dev-ml/ppx_bin_prot/ppx_bin_prot-0.15.0-r1.ebuild new file mode 100644 index 000000000000..105e3fde7628 --- /dev/null +++ b/dev-ml/ppx_bin_prot/ppx_bin_prot-0.15.0-r1.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Generation of bin_prot readers and writers from types" +HOMEPAGE="https://github.com/janestreet/ppx_bin_prot" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-ml/bin_prot:${SLOT} + dev-ml/ppx_here:${SLOT} + >=dev-ml/ppxlib-0.23.0:= +" +DEPEND="${RDEPEND} + test? ( + dev-ml/ppx_jane + )" diff --git a/dev-ml/ppx_bin_prot/ppx_bin_prot-0.16.0.ebuild b/dev-ml/ppx_bin_prot/ppx_bin_prot-0.16.0.ebuild new file mode 100644 index 000000000000..c8f350402be7 --- /dev/null +++ b/dev-ml/ppx_bin_prot/ppx_bin_prot-0.16.0.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Generation of bin_prot readers and writers from types" +HOMEPAGE="https://github.com/janestreet/ppx_bin_prot" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-lang/ocaml-4.14 + dev-ml/bin_prot:${SLOT} + dev-ml/ppx_here:${SLOT} + >=dev-ml/ppxlib-0.28.0:= +" +DEPEND="${RDEPEND} + test? ( + dev-ml/ppx_jane + )" diff --git a/dev-ml/ppx_bin_prot/ppx_bin_prot-0.9.0.ebuild b/dev-ml/ppx_bin_prot/ppx_bin_prot-0.9.0.ebuild deleted file mode 100644 index 00230450343a..000000000000 --- a/dev-ml/ppx_bin_prot/ppx_bin_prot-0.9.0.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit opam - -DESCRIPTION="Generation of bin_prot readers and writers from types" -HOMEPAGE="https://github.com/janestreet/ppx_bin_prot" -SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -DEPEND=" - dev-ml/bin-prot:= - dev-ml/ppx_core:= - dev-ml/ppx_driver:= - dev-ml/ppx_here:= - dev-ml/ppx_metaquot:= - dev-ml/ppx_type_conv:= - dev-ml/ocaml-migrate-parsetree:= - " - -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} dev-ml/jbuilder" diff --git a/dev-ml/ppx_blob/Manifest b/dev-ml/ppx_blob/Manifest new file mode 100644 index 000000000000..8e7b78a5745e --- /dev/null +++ b/dev-ml/ppx_blob/Manifest @@ -0,0 +1 @@ +DIST ppx_blob-0.7.2.tbz 3155 BLAKE2B 86262f4ef91dde30bbfc466dd0404c0f4825156097d0b019b180332e8f7d91630660f568193f8e8e184d3db07ec9dbc007e888f8dcb6874e2c04a077e8477a16 SHA512 d1701f640ce3dda2e2f0dce7d3f4a6b33ddfdaf793a9beab73e4f9ac93b2912adb7bb3b7fd1800bab258302aef0f0cdefb1e20ee62e6d882b25f0a64eae390a3 diff --git a/dev-ml/ppx_blob/metadata.xml b/dev-ml/ppx_blob/metadata.xml new file mode 100644 index 000000000000..55ef7e485ec1 --- /dev/null +++ b/dev-ml/ppx_blob/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">johnwhitington/ppx_blob</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/ppx_blob/ppx_blob-0.7.2.ebuild b/dev-ml/ppx_blob/ppx_blob-0.7.2.ebuild new file mode 100644 index 000000000000..ab64c574d3ab --- /dev/null +++ b/dev-ml/ppx_blob/ppx_blob-0.7.2.ebuild @@ -0,0 +1,20 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Include a file as a string at compile time" +HOMEPAGE="https://github.com/johnwhitington/ppx_blob" +SRC_URI="https://github.com/johnwhitington/${PN}/releases/download/${PV}/${P}.tbz" + +LICENSE="Unlicense" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +DEPEND="dev-ml/ppxlib:=" +RDEPEND="${DEPEND}" +BDEPEND="test? ( dev-ml/alcotest )" diff --git a/dev-ml/ppx_cold/Manifest b/dev-ml/ppx_cold/Manifest new file mode 100644 index 000000000000..91e4008b767d --- /dev/null +++ b/dev-ml/ppx_cold/Manifest @@ -0,0 +1,3 @@ +DIST ppx_cold-0.14.0.tar.gz 3778 BLAKE2B 5ae223047858ff11f90067fcb2a6541c964cd929e45fe9d43256b75a81599d6aa0aaf37fe7274e98c64b6448846ab8c64b1c092171392f74a395ea08ea0a60d8 SHA512 3655602defe6b5cd9740eb4cfcf480eded6912674df28955502adcd0d8d6901551e137b0660a389f8be2c88b3aebc830f57089d2ac1a82f7b9efdbaea358fe07 +DIST ppx_cold-0.15.0.tar.gz 3779 BLAKE2B 23987d38f61d3457c3c8a5c5105a2c7886fb88aa7df55e470b6a43ceae9f9e1ca0ec06111d045bc9a7dcf279b09fe738bb02e260f14b5bea42f32a05e8762584 SHA512 239b78e8c03d47973be4d72d4879a0290367f96033b9d3a5d723a1c35e02121af86d5e41fd08dcf4746a8c6d521c94cf41eff6b4a439a204e0a5a3a0c49d9bf1 +DIST ppx_cold-0.16.0.tar.gz 3814 BLAKE2B fc75c4a32e9d8c3175e6a05f1f03d9c475eed7949fca4ad71ac21a4da881840b1c74133417d3354ecb3cbd7fe6b5a57238ef6d2dc97816f2f6659ea7b08bc7f4 SHA512 816358747bf4e4d92b6d5fa7bc31691897f6fb88336000a5e40b86250911b2efa203f6465d77b24f0147312bfd779de49822c5ea7a2a87df49d754b8c6e30821 diff --git a/dev-ml/ppx_cold/metadata.xml b/dev-ml/ppx_cold/metadata.xml new file mode 100644 index 000000000000..6da21e1a9149 --- /dev/null +++ b/dev-ml/ppx_cold/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">janestreet/ppx_cold</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/ppx_cold/ppx_cold-0.14.0.ebuild b/dev-ml/ppx_cold/ppx_cold-0.14.0.ebuild new file mode 100644 index 000000000000..4f8729e7e40d --- /dev/null +++ b/dev-ml/ppx_cold/ppx_cold-0.14.0.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Expands [@cold] into [@inline never][@specialise never][@local never]" +HOMEPAGE="https://github.com/janestreet/ppx_cold" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-ml/base-0.14.0:= + dev-ml/findlib:= + >=dev-ml/ppxlib-0.18.0:= + >=dev-ml/ocaml-migrate-parsetree-2.0.0:= + dev-ml/cinaps:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_cold/ppx_cold-0.15.0.ebuild b/dev-ml/ppx_cold/ppx_cold-0.15.0.ebuild new file mode 100644 index 000000000000..51bcbe87a727 --- /dev/null +++ b/dev-ml/ppx_cold/ppx_cold-0.15.0.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Expands [@cold] into [@inline never][@specialise never][@local never]" +HOMEPAGE="https://github.com/janestreet/ppx_cold" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +DEPEND=" + dev-ml/base:${SLOT} + dev-ml/findlib:= + >=dev-ml/ppxlib-0.23.0:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_cold/ppx_cold-0.16.0.ebuild b/dev-ml/ppx_cold/ppx_cold-0.16.0.ebuild new file mode 100644 index 000000000000..ef672cd3037f --- /dev/null +++ b/dev-ml/ppx_cold/ppx_cold-0.16.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Expands [@cold] into [@inline never][@specialise never][@local never]" +HOMEPAGE="https://github.com/janestreet/ppx_cold" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-lang/ocaml-4.14 + dev-ml/base:${SLOT} + dev-ml/findlib:= + >=dev-ml/ppxlib-0.28.0:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_compare/Manifest b/dev-ml/ppx_compare/Manifest index 123942822bc3..dabee37b3139 100644 --- a/dev-ml/ppx_compare/Manifest +++ b/dev-ml/ppx_compare/Manifest @@ -1 +1,3 @@ -DIST ppx_compare-0.9.0.tar.gz 11760 BLAKE2B 8db18a56185371e56addddeac4ec94e1260f06edc7dbc835efcf2f6788f42c36746858fd96e7fc94aaaf52b118a95581388276b90d8d489a9f4707af2c157811 SHA512 4f154bb67c2241712986247f8b3ed04b4ba874424171989f0421193a15cea45dedbf1c546408421bf33839ea45b85a45ec1cb43c034373fd80198ddb5d9045fe +DIST ppx_compare-0.14.0.tar.gz 13614 BLAKE2B 081e91192f987095a773964b56838b05fb18ea23599eeeb28d297ac81ff7439067ffa0941cf4d64921abad68f9dca90560463b9f059f35ed3147333ba697a88c SHA512 be02c8114e0915439c04b3d796029ad124e9a2e637032d6a86a41c03b81985cb0f68f65bc43c1d12221b521f6fa10006a105b3ffe95e991ed9695692fd0763cb +DIST ppx_compare-0.15.0.tar.gz 13905 BLAKE2B 6c3f3b8fba090bc1e0b0aecaed116ac25cb54cb2146ba96dda4dd2819753be3ba0dacd2a2ec45bb22441be0760056f7a91ed546b50276e3ee8931cce178ad273 SHA512 2c2ae8bdaf08a478bcabdcdcd724abb53773c8633273d3d7a9f8a8eab01d04c281d11299f2890a2f9919adcf38a65bcfcfd79c613f27325e536e2d7cf0527781 +DIST ppx_compare-0.16.0.tar.gz 14041 BLAKE2B 7f6eaaafa75e49e09cef26b2e6579fd9cd18a67e4b73fe727cca0988bf062eda2f4c11424ee449ad6d82923d8f08ffbeda0f1e05e2a940f7360c64beeb03d98e SHA512 8acbb52a841012fc81efa0f8c1df4d8f0595bddbaf723aed4702d0f7917552ac4c08f6b971c1aaf765460a512f2fca46fe8bbe14fb1b021a3fe3be4181bdb030 diff --git a/dev-ml/ppx_compare/metadata.xml b/dev-ml/ppx_compare/metadata.xml index e063430cae74..c87598dceeee 100644 --- a/dev-ml/ppx_compare/metadata.xml +++ b/dev-ml/ppx_compare/metadata.xml @@ -1,9 +1,9 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">janestreet/ppx_compare</remote-id> diff --git a/dev-ml/ppx_compare/ppx_compare-0.14.0.ebuild b/dev-ml/ppx_compare/ppx_compare-0.14.0.ebuild new file mode 100644 index 000000000000..2753accd6d18 --- /dev/null +++ b/dev-ml/ppx_compare/ppx_compare-0.14.0.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Generation of comparison functions from types" +HOMEPAGE="https://github.com/janestreet/ppx_compare" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-ml/base-0.14.0:= + dev-ml/findlib:= + >=dev-ml/ppxlib-0.18.0:= + >=dev-ml/ocaml-migrate-parsetree-2.0.0:= + dev-ml/cinaps:= +" + +RDEPEND="${DEPEND}" + +# Error: No rule found for test/comparelib_test__Check_optims.o +RESTRICT=test diff --git a/dev-ml/ppx_compare/ppx_compare-0.9.0-r1.ebuild b/dev-ml/ppx_compare/ppx_compare-0.15.0.ebuild index 078afb1a0109..5e5bd5110142 100644 --- a/dev-ml/ppx_compare/ppx_compare-0.9.0-r1.ebuild +++ b/dev-ml/ppx_compare/ppx_compare-0.15.0.ebuild @@ -1,27 +1,26 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit opam +inherit dune DESCRIPTION="Generation of comparison functions from types" HOMEPAGE="https://github.com/janestreet/ppx_compare" SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" DEPEND=" - dev-ml/ppx_driver:= - dev-ml/ppx_type_conv:= - dev-ml/ppx_core:= - dev-ml/base:= - dev-ml/ocaml-migrate-parsetree:= - dev-ml/ppx_metaquot:= + dev-ml/base:${SLOT} + dev-ml/findlib:= + >=dev-ml/ppxlib-0.23.0:= " RDEPEND="${DEPEND}" -DEPEND="${DEPEND} dev-ml/jbuilder" + +# Error: No rule found for test/comparelib_test__Check_optims.o +RESTRICT=test diff --git a/dev-ml/ppx_compare/ppx_compare-0.16.0.ebuild b/dev-ml/ppx_compare/ppx_compare-0.16.0.ebuild new file mode 100644 index 000000000000..fcdd04ba6b95 --- /dev/null +++ b/dev-ml/ppx_compare/ppx_compare-0.16.0.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Generation of comparison functions from types" +HOMEPAGE="https://github.com/janestreet/ppx_compare" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-lang/ocaml-4.14 + dev-ml/base:${SLOT} + dev-ml/findlib:= + >=dev-ml/ppxlib-0.28.0:= +" + +RDEPEND="${DEPEND}" + +# Error: No rule found for test/comparelib_test__Check_optims.o +RESTRICT=test diff --git a/dev-ml/ppx_core/Manifest b/dev-ml/ppx_core/Manifest deleted file mode 100644 index 62a261436dec..000000000000 --- a/dev-ml/ppx_core/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ppx_core-0.9.0.tar.gz 44525 BLAKE2B a2d67d6ba07217446af11f0e7030197f8894fd271b9eebefefa03a01ccb8692b1d866accf192926ea9193d639e1c551b085875baf877eb396d5a75c847378ec6 SHA512 04b0e096aa545c27f040feeea8745078e0fb9dbe4816ade6d3f39b6690da669c6c786334381dbccd74dfd46514ae88c6475b14db8c3216167a6acfea79601e06 diff --git a/dev-ml/ppx_core/metadata.xml b/dev-ml/ppx_core/metadata.xml deleted file mode 100644 index 2c9ccd93283c..000000000000 --- a/dev-ml/ppx_core/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">janestreet/ppx_core</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/ppx_core/ppx_core-0.9.0-r1.ebuild b/dev-ml/ppx_core/ppx_core-0.9.0-r1.ebuild deleted file mode 100644 index b7479abd2f4f..000000000000 --- a/dev-ml/ppx_core/ppx_core-0.9.0-r1.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit opam - -DESCRIPTION="Standard library for ppx rewriters" -HOMEPAGE="https://github.com/janestreet/ppx_core" -SRC_URI="https://github.com/janestreet/ppx_core/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" - -DEPEND=" - dev-ml/base:= - dev-ml/ocaml-compiler-libs:= - dev-ml/ppx_ast:= - dev-ml/ppx_traverse_builtins:= - dev-ml/stdio:= - dev-ml/ocaml-migrate-parsetree:= -" -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} dev-ml/jbuilder" diff --git a/dev-ml/ppx_custom_printf/Manifest b/dev-ml/ppx_custom_printf/Manifest index d71f4fa73f8c..d468f35b66b5 100644 --- a/dev-ml/ppx_custom_printf/Manifest +++ b/dev-ml/ppx_custom_printf/Manifest @@ -1 +1,4 @@ -DIST ppx_custom_printf-0.9.0.tar.gz 11527 BLAKE2B ad1791f1bad3c8583e67ca6300e98e8a7a047f723bbaa7c80cf6224f7333e7893fce7289456c39f6959089f15cc0da20106b33689ab198b1f47f6dc0bd853c77 SHA512 7608e09aac26f4f51d124d30c25a510abb73bea606007524a5563f5bb2c0e71f1ff033edb32c48f0c69656e8c3924b57186639812b1a647ce31f7ae15dc466cb +DIST ppx_custom_printf-0.14.0.tar.gz 9600 BLAKE2B 7b921188e158d59a160502b410ac780709b40fd408cf2e06a0adb70952ef3e72144deaee1c40df512cc09997ce87621e0be2a32d28e8408914fb90f3416e0532 SHA512 2f607df87aa372ef602b4aeb44a2d697ff8696001161e544398c3675280ef7af402f4b34b8cfce900791129d2a9db13ccbf4e73518f58487adc47d5188c8652c +DIST ppx_custom_printf-0.14.1.tar.gz 9606 BLAKE2B 81999f3534fcf8daa965274f93812442b170c8bb7bd05d6b4ba2cb7f506e6bba44dadec355733adec790262be25ad62016356cdf7e0ddcebf2080a3238314543 SHA512 0acb5a2964c996a34d1759c1db73219d4db813ab6b96f80feffae34cbcd73fc8c8ab40ccad7ad378d730acb45eff26906533b29716398fc1c10a7bb4ff949443 +DIST ppx_custom_printf-0.15.0.tar.gz 9609 BLAKE2B f9a855559bea50d2aec44cc5ed78010afa66bfafe12906a0f115ba484709a759383b41e7bc4fb8557e9869c0c67a6035451a7f1184be0658371c4300e593de39 SHA512 f8776e9037f491b120b0d43ac9b76231c422b9e5f0d7c3f75efdadf9d4ec401266d61f441a2c7c831c99fac10ac98d84e4e62eda44e6fc86f2fa60ead5ecbc86 +DIST ppx_custom_printf-0.16.0.tar.gz 9729 BLAKE2B a527652e9f5ecc2f64f48e77c6d05c8b27e49a01d78132986943c86e6123de673cf34c019b25a9882c9acaeab88302c15d819e80adc09422b42f2d6a6f6975a5 SHA512 9fc09f5434ca41681f2c8c749aa0c3bae051ee3645e820e0e8a16ab0c1ab630b0c9b0af86ef282eade7020635a066729abb9b7d8d91c1667b9e9f1770131f8b7 diff --git a/dev-ml/ppx_custom_printf/files/ppx_custom_printf-0.14.0-ppxlib-0.18.0.patch b/dev-ml/ppx_custom_printf/files/ppx_custom_printf-0.14.0-ppxlib-0.18.0.patch new file mode 100644 index 000000000000..95cd58aee4cd --- /dev/null +++ b/dev-ml/ppx_custom_printf/files/ppx_custom_printf-0.14.0-ppxlib-0.18.0.patch @@ -0,0 +1,41 @@ +commit 50f8f706e868f8ebac4f2f1392365f994d674463 (HEAD, origin/upgrade-ppxlib-0.18.0) +Author: Nathan Rebours <nathan.p.rebours@gmail.com> +Date: Mon Oct 5 17:56:52 2020 +0200 + + Make ppx_custom_printf compatible with ppxlib.0.18.0 + + ppxlib.0.18.0 upgrades to the 4.11 AST which results in a change + in string constants representation. This PR makes ppx_custom_printf + compatible with the latest ppxlib. + + You might want for the actual release of ppxlib.0.18.0 before merging + this! + + Signed-off-by: Nathan Rebours <nathan.p.rebours@gmail.com> + +diff --git a/ppx_custom_printf.opam b/ppx_custom_printf.opam +index 80ea710..1cc3d11 100644 +--- a/ppx_custom_printf.opam ++++ b/ppx_custom_printf.opam +@@ -15,7 +15,7 @@ depends: [ + "base" {>= "v0.14" & < "v0.15"} + "ppx_sexp_conv" {>= "v0.14" & < "v0.15"} + "dune" {>= "2.0.0"} +- "ppxlib" {>= "0.11.0"} ++ "ppxlib" {>= "0.18.0"} + ] + synopsis: "Printf-style format-strings for user-defined string conversion" + description: " +diff --git a/src/ppx_custom_printf.ml b/src/ppx_custom_printf.ml +index 18ad7fd..e9ad8b3 100644 +--- a/src/ppx_custom_printf.ml ++++ b/src/ppx_custom_printf.ml +@@ -264,7 +264,7 @@ let expand_format_string ~loc fmt_string = + let expand e = + match e.pexp_desc with + | Pexp_apply ({ pexp_attributes = ident_attrs; _ }, +- [ (Nolabel, { pexp_desc = Pexp_constant (Pconst_string (str, _)) ++ [ (Nolabel, { pexp_desc = Pexp_constant (Pconst_string (str, _, _)) + ; pexp_loc = loc; pexp_loc_stack = _ + ; pexp_attributes = str_attrs }) ]) -> + assert_no_attributes ident_attrs; diff --git a/dev-ml/ppx_custom_printf/metadata.xml b/dev-ml/ppx_custom_printf/metadata.xml index 5fc614cb73f4..7b94be3a81d8 100644 --- a/dev-ml/ppx_custom_printf/metadata.xml +++ b/dev-ml/ppx_custom_printf/metadata.xml @@ -1,9 +1,9 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">janestreet/ppx_custom_printf</remote-id> diff --git a/dev-ml/ppx_custom_printf/ppx_custom_printf-0.14.0.ebuild b/dev-ml/ppx_custom_printf/ppx_custom_printf-0.14.0.ebuild new file mode 100644 index 000000000000..883a0bf0347a --- /dev/null +++ b/dev-ml/ppx_custom_printf/ppx_custom_printf-0.14.0.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Printf-style format-strings for user-defined string conversion" +HOMEPAGE="https://github.com/janestreet/ppx_custom_printf" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-ml/base-0.14.0:= + dev-ml/findlib:= + >=dev-ml/ppx_sexp_conv-0.14.1:= + >=dev-ml/ppxlib-0.18.0:= + >=dev-ml/ocaml-migrate-parsetree-2.0.0:= + dev-ml/cinaps:= +" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}"/${P}-ppxlib-0.18.0.patch ) diff --git a/dev-ml/ppx_custom_printf/ppx_custom_printf-0.9.0-r1.ebuild b/dev-ml/ppx_custom_printf/ppx_custom_printf-0.14.1.ebuild index 0ed35963b467..84440d1d1ceb 100644 --- a/dev-ml/ppx_custom_printf/ppx_custom_printf-0.9.0-r1.ebuild +++ b/dev-ml/ppx_custom_printf/ppx_custom_printf-0.14.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit opam +inherit dune DESCRIPTION="Printf-style format-strings for user-defined string conversion" HOMEPAGE="https://github.com/janestreet/ppx_custom_printf" @@ -11,17 +11,15 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g LICENSE="Apache-2.0" SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" DEPEND=" - dev-ml/ppx_core:= - dev-ml/ppx_driver:= - dev-ml/ppx_metaquot:= - dev-ml/ppx_sexp_conv:= - dev-ml/ppx_type_conv:= - dev-ml/ppx_traverse - dev-ml/ocaml-migrate-parsetree:= + >=dev-ml/base-0.14.0:= + dev-ml/findlib:= + >=dev-ml/ppx_sexp_conv-0.14.1:= + >=dev-ml/ppxlib-0.18.0:= + >=dev-ml/ocaml-migrate-parsetree-2.0.0:= + dev-ml/cinaps:= " RDEPEND="${DEPEND}" -DEPEND="${DEPEND} dev-ml/jbuilder" diff --git a/dev-ml/ppx_custom_printf/ppx_custom_printf-0.15.0-r1.ebuild b/dev-ml/ppx_custom_printf/ppx_custom_printf-0.15.0-r1.ebuild new file mode 100644 index 000000000000..30a8cf246907 --- /dev/null +++ b/dev-ml/ppx_custom_printf/ppx_custom_printf-0.15.0-r1.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Printf-style format-strings for user-defined string conversion" +HOMEPAGE="https://github.com/janestreet/ppx_custom_printf" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +DEPEND=" + dev-ml/ppx_sexp_conv:${SLOT} + >=dev-ml/ppxlib-0.23.0:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_custom_printf/ppx_custom_printf-0.16.0.ebuild b/dev-ml/ppx_custom_printf/ppx_custom_printf-0.16.0.ebuild new file mode 100644 index 000000000000..5b8ba919077e --- /dev/null +++ b/dev-ml/ppx_custom_printf/ppx_custom_printf-0.16.0.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Printf-style format-strings for user-defined string conversion" +HOMEPAGE="https://github.com/janestreet/ppx_custom_printf" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-lang/ocaml-4.14 + dev-ml/ppx_sexp_conv:${SLOT} + >=dev-ml/ppxlib-0.28.0:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_derivers/Manifest b/dev-ml/ppx_derivers/Manifest index 535fb7fce0c3..c32965ea09d7 100644 --- a/dev-ml/ppx_derivers/Manifest +++ b/dev-ml/ppx_derivers/Manifest @@ -1 +1 @@ -DIST ppx_derivers-1.0.tar.gz 1467 BLAKE2B 94946c5d04e314bfbe146534fb19e88a16670dc3f5d47c15496142dd9a256ebbe4387f24a9fe31b1aee804d064bea0a9136685372399a38ac82dedafe677934a SHA512 2e2437094362088f9a1601ca3c2f0b82ec079b9a34e502234aef36158ea7a3f2236f1d2526df1a75bcb851346ebaaf717eaf72253935f7ea4024d3dc20512e85 +DIST ppx_derivers-1.2.1.tar.gz 2530 BLAKE2B d0a8a214e93908cfff1d418fe1b729a7ca502fb6dc983d3a837f6846aec891627457df72a610736d929c83622202bd5a00451c1c24510a642b4c133ce60416b8 SHA512 ef0796fe2592e653d34ba01d206d4b507429882a2aaadcb89c7f807c33a417f2871b0c94ade5c92aefd9487daa582e19d88ad5a5eaa631e8162ae12f4a0756c6 diff --git a/dev-ml/ppx_derivers/metadata.xml b/dev-ml/ppx_derivers/metadata.xml index 4dc57e2bec09..fc801dca7d32 100644 --- a/dev-ml/ppx_derivers/metadata.xml +++ b/dev-ml/ppx_derivers/metadata.xml @@ -1,9 +1,9 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">diml/ppx_derivers</remote-id> diff --git a/dev-ml/ppx_derivers/ppx_derivers-1.0.ebuild b/dev-ml/ppx_derivers/ppx_derivers-1.2.1.ebuild index b991aaed688e..b584f81c57a5 100644 --- a/dev-ml/ppx_derivers/ppx_derivers-1.0.ebuild +++ b/dev-ml/ppx_derivers/ppx_derivers-1.2.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit opam +inherit dune DESCRIPTION="Shared [@@deriving] plugin registry" HOMEPAGE="https://github.com/diml/ppx_derivers" @@ -11,9 +11,5 @@ SRC_URI="https://github.com/diml/ppx_derivers/archive/${PV}.tar.gz -> ${P}.tar.g LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" - -RDEPEND="" -DEPEND="${RDEPEND} - dev-ml/jbuilder" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" diff --git a/dev-ml/ppx_deriving/Manifest b/dev-ml/ppx_deriving/Manifest index efe85125d052..4d69ea05b8b6 100644 --- a/dev-ml/ppx_deriving/Manifest +++ b/dev-ml/ppx_deriving/Manifest @@ -1 +1 @@ -DIST ppx_deriving-4.2.tar.gz 48327 BLAKE2B 8ce5ccbfb7992fbd5e9c777ad0b577f8846d92df21926a877fb8f7b6804acc4fa2fd78586fc209c3bd83b8496eb6f8e8ee37c39e0c7462fb55f39389356f3c8f SHA512 084526157d6f4b41f7ad73157c5edb54d5bb9130d706525031670d8495ede8af5545302f442c2d2c506772201b79ccc93bdc7fead9455d3a59977ddfa9c3284d +DIST ppx_deriving-5.2.1.tar.gz 46148 BLAKE2B 75c5f95841e4e54d5a58221c27d4a904347fb2b20ff0189bbe99bcc200eefd4abb94a476a120b6c6c7d0eba3b2233054875868a71064d032815cc8907919371d SHA512 01d2eb920f3375960a9228138ccb5f2af49bfba1111894795c24b3c37d5a021d6bc95e9de1d867c35d03645334300ccc89f1fca0cb75007ec62e5620f328e078 diff --git a/dev-ml/ppx_deriving/metadata.xml b/dev-ml/ppx_deriving/metadata.xml index fb70b500f326..0ee790c5220c 100644 --- a/dev-ml/ppx_deriving/metadata.xml +++ b/dev-ml/ppx_deriving/metadata.xml @@ -1,9 +1,9 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">ocaml-ppx/ppx_deriving</remote-id> diff --git a/dev-ml/ppx_deriving/ppx_deriving-4.2-r1.ebuild b/dev-ml/ppx_deriving/ppx_deriving-4.2-r1.ebuild deleted file mode 100644 index 0849fdefe983..000000000000 --- a/dev-ml/ppx_deriving/ppx_deriving-4.2-r1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit findlib eutils opam - -DESCRIPTION="Type-driven code generation for OCaml" -HOMEPAGE="https://github.com/ocaml-ppx/ppx_deriving" -SRC_URI="https://github.com/ocaml-ppx/ppx_deriving/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="doc +ocamlopt test" - -DEPEND=" - dev-ml/ppx_tools:= - dev-ml/ocaml-migrate-parsetree:= - dev-ml/ppx_derivers:= - dev-ml/result:= -" -RDEPEND="${DEPEND}" -DEPEND="${RDEPEND} - dev-ml/cppo - test? ( dev-ml/ounit )" - -src_compile() { - cp pkg/META.in pkg/META || die - ocaml pkg/build.ml \ - native=$(usex ocamlopt true false) \ - native-dynlink=$(usex ocamlopt true false) \ - || die - use doc && emake doc -} - -src_test() { - ocamlbuild -j 0 -use-ocamlfind -classic-display \ - src_test/test_ppx_deriving.byte -- || die - if use ocamlopt; then - ocamlbuild -j 0 -use-ocamlfind -classic-display \ - src_test/test_ppx_deriving.native -- || die - fi -} - -src_install() { - opam_src_install - mv "${ED}/usr/lib/ppx_deriving/ppx_deriving" "${D}/$(ocamlc -where)/ppx_deriving/" || die - - use doc && dohtml api.docdir/* -} diff --git a/dev-ml/ppx_deriving/ppx_deriving-5.2.1-r2.ebuild b/dev-ml/ppx_deriving/ppx_deriving-5.2.1-r2.ebuild new file mode 100644 index 000000000000..a3d5b41935f3 --- /dev/null +++ b/dev-ml/ppx_deriving/ppx_deriving-5.2.1-r2.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Type-driven code generation for OCaml" +HOMEPAGE="https://github.com/ocaml-ppx/ppx_deriving" +SRC_URI="https://github.com/ocaml-ppx/ppx_deriving/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-ml/ppx_tools:=[ocamlopt?] + dev-ml/ocaml-migrate-parsetree:=[ocamlopt?] + dev-ml/ppx_derivers:=[ocamlopt?] + >=dev-ml/ppxlib-0.20.0:=[ocamlopt?] + dev-ml/findlib:=[ocamlopt?] + dev-ml/result:=[ocamlopt?] + dev-ml/sexplib0:=[ocamlopt?] +" +DEPEND="${RDEPEND} + dev-ml/cppo[ocamlopt?] + test? ( dev-ml/ounit2 )" diff --git a/dev-ml/ppx_deriving_yojson/Manifest b/dev-ml/ppx_deriving_yojson/Manifest index 6889c4326cf0..4124abe6e102 100644 --- a/dev-ml/ppx_deriving_yojson/Manifest +++ b/dev-ml/ppx_deriving_yojson/Manifest @@ -1 +1,2 @@ -DIST ppx_deriving_yojson-3.0.tar.gz 18111 BLAKE2B eaf8d380b8ff606bebff4050af9fb22624b404f106518a0f68b23866e66459f74c0984970ae0bbbdb67d2f71264a832850a8e03740c8fb207bc70abe89a61219 SHA512 70c690d880ff652f9f92e95af047e87726bab48100e9325406eef7a9ed80f439df7292324de56cd17a93c6ad6bc9c1e7ce6edcd7c3b336352f0df4bfa7c7b81c +DIST ppx_deriving_yojson-3.6.1.tar.gz 19477 BLAKE2B f7b4e34e1c5ca77af6dbe6f4639c00a3b47076e2cf1f79b157a4c8f9aef34ec0e95e2c6c805fe9d0f9fa0ec72ea0672696b7e7a21d0a7d93764fad2e8d89a15a SHA512 b1bf04f77e1c1a887352b21cfd43a67d37de9f61a70f89d06828c7d9611027711a600b22e4bbc95ab128511a48fce3ae1a1c7a655f25c4bb2b6944444cea4989 +DIST ppx_deriving_yojson-3.7.0.tar.gz 20027 BLAKE2B f89bae5542ab551da13bbfdf4bb3da359e0bad65b1700bcdcfefd4dc42b70c5c17133bfbe8ef9cbcac7b5d2630b95b81de95510a9152260874911bb72fb659ec SHA512 6aa8b3a6e60afd1ce68995bad6776c975b3640303b2049233e661c46300abea1f48916d4e876412de49f35744f31b99c29736e2bb974e1b4a494b0932bbd6e80 diff --git a/dev-ml/ppx_deriving_yojson/files/ocaml405.patch b/dev-ml/ppx_deriving_yojson/files/ocaml405.patch deleted file mode 100644 index 33440fabdd19..000000000000 --- a/dev-ml/ppx_deriving_yojson/files/ocaml405.patch +++ /dev/null @@ -1,76 +0,0 @@ -Index: ppx_deriving_yojson-3.0/src/ppx_deriving_yojson.cppo.ml -=================================================================== ---- ppx_deriving_yojson-3.0.orig/src/ppx_deriving_yojson.cppo.ml -+++ ppx_deriving_yojson-3.0/src/ppx_deriving_yojson.cppo.ml -@@ -260,7 +260,7 @@ let ser_str_of_type ~options ~path ({ pt - let polymorphize_ser = Ppx_deriving.poly_arrow_of_type_decl - (fun var -> [%type: [%t var] -> Yojson.Safe.json]) type_decl - in -- let ty = Typ.poly poly_vars (polymorphize_ser [%type: [%t typ] -> Yojson.Safe.json]) in -+ let ty = Typ.poly (List.map Location.mknoloc poly_vars) (polymorphize_ser [%type: [%t typ] -> Yojson.Safe.json]) in - let default_fun = - let type_path = String.concat "." (path @ [type_decl.ptype_name.txt]) in - let e_type_path = Exp.constant (Pconst_string (type_path, None)) in -@@ -270,7 +270,7 @@ let ser_str_of_type ~options ~path ({ pt - in - let poly_fun = polymorphize default_fun in - let poly_fun = -- (Ppx_deriving.fold_left_type_decl (fun exp name -> Exp.newtype name exp) poly_fun type_decl) -+ (Ppx_deriving.fold_left_type_decl (fun exp name -> Exp.newtype (Location.mknoloc name) exp) poly_fun type_decl) - in - let mod_name = "M_"^to_yojson_name in - let typ = Type.mk ~kind:(Ptype_record [Type.field ~mut:Mutable (mknoloc "f") ty]) -@@ -337,7 +337,7 @@ let ser_str_of_type ~options ~path ({ pt - raise_errorf ~loc "%s cannot be derived for fully abstract types" deriver - in - let ty = ser_type_of_decl ~options ~path type_decl in -- let fv = Ppx_deriving.free_vars_in_core_type ty in -+ let fv = List.map Location.mknoloc (Ppx_deriving.free_vars_in_core_type ty) in - let poly_type = Typ.force_poly @@ Typ.poly fv @@ ty in - let var = pvar (Ppx_deriving.mangle_type_decl (`Suffix "to_yojson") type_decl) in - ([], -@@ -431,7 +431,7 @@ let desu_str_of_type ~options ~path ({ p - raise_errorf ~loc "%s: extensible type manifest should be a type name" deriver - | None -> - let poly_vars = List.rev -- (Ppx_deriving.fold_left_type_decl (fun acc name -> name :: acc) [] type_decl) -+ (List.map Location.mknoloc (Ppx_deriving.fold_left_type_decl (fun acc name -> name :: acc) [] type_decl)) - in - let polymorphize_desu = Ppx_deriving.poly_arrow_of_type_decl - (fun var -> [%type: Yojson.Safe.json -> [%t error_or var]]) type_decl in -@@ -441,7 +441,7 @@ let desu_str_of_type ~options ~path ({ p - let default_fun = Exp.function_ [Exp.case [%pat? _] top_error] in - let poly_fun = polymorphize default_fun in - let poly_fun = -- (Ppx_deriving.fold_left_type_decl (fun exp name -> Exp.newtype name exp) poly_fun type_decl) -+ (Ppx_deriving.fold_left_type_decl (fun exp name -> Exp.newtype (Location.mknoloc name) exp) poly_fun type_decl) - in - let mod_name = "M_"^of_yojson_name in - let typ = Type.mk ~kind:(Ptype_record [Type.field ~mut:Mutable (mknoloc "f") ty]) -@@ -514,7 +514,7 @@ let desu_str_of_type ~options ~path ({ p - raise_errorf ~loc "%s cannot be derived for fully abstract types" deriver - in - let ty = desu_type_of_decl ~options ~path type_decl in -- let fv = Ppx_deriving.free_vars_in_core_type ty in -+ let fv = List.map Location.mknoloc (Ppx_deriving.free_vars_in_core_type ty) in - let poly_type = Typ.force_poly @@ Typ.poly fv @@ ty in - let var = pvar (Ppx_deriving.mangle_type_decl (`Suffix "of_yojson") type_decl) in - ([], -@@ -579,7 +579,7 @@ let ser_sig_of_type ~options ~path type_ - (`PrefixSuffix ("M", "to_yojson")) type_decl - in - let poly_vars = List.rev -- (Ppx_deriving.fold_left_type_decl (fun acc name -> name :: acc) [] type_decl) -+ (List.map Location.mknoloc (Ppx_deriving.fold_left_type_decl (fun acc name -> name :: acc) [] type_decl)) - in - let typ = Ppx_deriving.core_type_of_type_decl type_decl in - let polymorphize_ser = Ppx_deriving.poly_arrow_of_type_decl -@@ -614,7 +614,7 @@ let desu_sig_of_type ~options ~path type - (`PrefixSuffix ("M", "of_yojson")) type_decl - in - let poly_vars = List.rev -- (Ppx_deriving.fold_left_type_decl (fun acc name -> name :: acc) [] type_decl) -+ (List.map Location.mknoloc (Ppx_deriving.fold_left_type_decl (fun acc name -> name :: acc) [] type_decl)) - in - let typ = Ppx_deriving.core_type_of_type_decl type_decl in - let polymorphize_desu = Ppx_deriving.poly_arrow_of_type_decl diff --git a/dev-ml/ppx_deriving_yojson/files/ppx_deriving_yojson-3.6.1-src_test_dune-ounit2.patch b/dev-ml/ppx_deriving_yojson/files/ppx_deriving_yojson-3.6.1-src_test_dune-ounit2.patch new file mode 100644 index 000000000000..fe5bcab48afc --- /dev/null +++ b/dev-ml/ppx_deriving_yojson/files/ppx_deriving_yojson-3.6.1-src_test_dune-ounit2.patch @@ -0,0 +1,10 @@ +--- a/src_test/dune ++++ b/src_test/dune +@@ -1,6 +1,6 @@ + (executable + (name test_ppx_yojson) +- (libraries oUnit result) ++ (libraries ounit2 result) + (preprocess (pps ppx_deriving.show ppx_deriving_yojson)) + (flags (:standard -w -9-39-27-34-37))) + diff --git a/dev-ml/ppx_deriving_yojson/metadata.xml b/dev-ml/ppx_deriving_yojson/metadata.xml index 0c78feb0828a..3db44a512450 100644 --- a/dev-ml/ppx_deriving_yojson/metadata.xml +++ b/dev-ml/ppx_deriving_yojson/metadata.xml @@ -1,11 +1,13 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> + <pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">whitequark/ppx_deriving_yojson</remote-id> - </upstream> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <bugs-to>https://github.com/ocaml-ppx/ppx_deriving_yojson/issues</bugs-to> + <remote-id type="github">ocaml-ppx/ppx_deriving_yojson</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-ml/ppx_deriving_yojson/ppx_deriving_yojson-3.0.ebuild b/dev-ml/ppx_deriving_yojson/ppx_deriving_yojson-3.0.ebuild deleted file mode 100644 index 07d29ef08c77..000000000000 --- a/dev-ml/ppx_deriving_yojson/ppx_deriving_yojson-3.0.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils opam - -DESCRIPTION="A Yojson codec generator for OCaml" -HOMEPAGE="https://github.com/whitequark/ppx_deriving_yojson/" -SRC_URI="https://github.com/whitequark/ppx_deriving_yojson/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="+ocamlopt test" - -DEPEND=" - dev-lang/ocaml:=[ocamlopt?] - dev-ml/yojson:= - dev-ml/result:= - >=dev-ml/ppx_deriving-4:= - dev-ml/cppo:= -" -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} - dev-ml/findlib - dev-ml/ocamlbuild - test? ( dev-ml/ounit dev-ml/ppx_import )" - -src_prepare() { - has_version '>=dev-lang/ocaml-4.05_rc' && epatch "${FILESDIR}/ocaml405.patch" -} - -src_compile() { - cp pkg/META.in pkg/META - ocaml pkg/build.ml \ - native=$(usex ocamlopt true false) \ - native-dynlink=$(usex ocamlopt true false) \ - || die -} - -src_test() { - ocamlbuild -j 0 -use-ocamlfind -classic-display src_test/test_ppx_yojson.byte -- || die -} diff --git a/dev-ml/ppx_deriving_yojson/ppx_deriving_yojson-3.6.1-r1.ebuild b/dev-ml/ppx_deriving_yojson/ppx_deriving_yojson-3.6.1-r1.ebuild new file mode 100644 index 000000000000..fa923652fbc2 --- /dev/null +++ b/dev-ml/ppx_deriving_yojson/ppx_deriving_yojson-3.6.1-r1.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="JSON codec generator for OCaml" +HOMEPAGE="https://github.com/ocaml-ppx/ppx_deriving_yojson/" +SRC_URI="https://github.com/ocaml-ppx/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-ml/ppxlib-0.20.0:= + dev-ml/ppx_deriving:= + dev-ml/result:= + dev-ml/yojson:= +" +DEPEND="${RDEPEND}" +BDEPEND="test? ( dev-ml/ounit2 )" + +PATCHES=( "${FILESDIR}"/${PN}-${PV}-src_test_dune-ounit2.patch ) diff --git a/dev-ml/ppx_deriving_yojson/ppx_deriving_yojson-3.7.0.ebuild b/dev-ml/ppx_deriving_yojson/ppx_deriving_yojson-3.7.0.ebuild new file mode 100644 index 000000000000..d8677fbe1e82 --- /dev/null +++ b/dev-ml/ppx_deriving_yojson/ppx_deriving_yojson-3.7.0.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="JSON codec generator for OCaml" +HOMEPAGE="https://github.com/ocaml-ppx/ppx_deriving_yojson/" +SRC_URI="https://github.com/ocaml-ppx/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-ml/ppxlib-0.26.0:= + dev-ml/ppx_deriving:= + dev-ml/result:= + dev-ml/yojson:= +" +DEPEND="${RDEPEND}" +BDEPEND="test? ( dev-ml/ounit2 )" diff --git a/dev-ml/ppx_disable_unused_warnings/Manifest b/dev-ml/ppx_disable_unused_warnings/Manifest new file mode 100644 index 000000000000..ec4c551e3b6f --- /dev/null +++ b/dev-ml/ppx_disable_unused_warnings/Manifest @@ -0,0 +1,2 @@ +DIST ppx_disable_unused_warnings-0.15.0.tar.gz 3966 BLAKE2B b087baa50ae3e0dd926221a69d0c3121ebeea431c08d0dbcc9cf5edee28e69c076e2f77c3b992757e56d03a6487ecd6257fec6a0373294cca6cdef7f71412216 SHA512 837bb96b5cc2623205ce778e6100d97a0a029e8c20a945509c06ee44784e67b8e9033b5387681c0f86c07f48ca4541e356ca62e19c1baa8d1b52c813400bb024 +DIST ppx_disable_unused_warnings-0.16.0.tar.gz 4004 BLAKE2B df63aaf68f0d9ee2e756b8f5c1df358d7f5ec9f00b7545a8f9911c2e73e7cadb4ce66d1b95705437e8c608e692edc67c9f17e4b10f659a47754365028f31f69b SHA512 43831260baf4d9602da6a26503ac6db50517965c1788941610c4ca5ca4f7fb6cf8381a8fe4669cc3355502a7ff9f42baf35e8ddb2e7ed71a018d9ef16a1d9d77 diff --git a/dev-ml/angstrom-async/metadata.xml b/dev-ml/ppx_disable_unused_warnings/metadata.xml index cd1f003b6403..f3fb81043b2d 100644 --- a/dev-ml/angstrom-async/metadata.xml +++ b/dev-ml/ppx_disable_unused_warnings/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> - <remote-id type="github">inhabitedtype/angstrom</remote-id> + <remote-id type="github">janestreet/ppx_disable_unused_warnings</remote-id> </upstream> </pkgmetadata> diff --git a/dev-ml/ppx_disable_unused_warnings/ppx_disable_unused_warnings-0.15.0-r1.ebuild b/dev-ml/ppx_disable_unused_warnings/ppx_disable_unused_warnings-0.15.0-r1.ebuild new file mode 100644 index 000000000000..e3f29d138bf6 --- /dev/null +++ b/dev-ml/ppx_disable_unused_warnings/ppx_disable_unused_warnings-0.15.0-r1.ebuild @@ -0,0 +1,21 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Expands [@disable_unused_warnings]" +HOMEPAGE="https://github.com/janestreet/ppx_disable_unused_warnings" +SRC_URI="https://github.com/janestreet/${PN}/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86" +IUSE="+ocamlopt" + +DEPEND=" + dev-ml/base:${SLOT} + >=dev-ml/ppxlib-0.23.0:=" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_disable_unused_warnings/ppx_disable_unused_warnings-0.16.0.ebuild b/dev-ml/ppx_disable_unused_warnings/ppx_disable_unused_warnings-0.16.0.ebuild new file mode 100644 index 000000000000..b39b7cdbc54f --- /dev/null +++ b/dev-ml/ppx_disable_unused_warnings/ppx_disable_unused_warnings-0.16.0.ebuild @@ -0,0 +1,21 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Expands [@disable_unused_warnings]" +HOMEPAGE="https://github.com/janestreet/ppx_disable_unused_warnings" +SRC_URI="https://github.com/janestreet/${PN}/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +DEPEND=" + dev-ml/base:${SLOT} + >=dev-ml/ppxlib-0.28.0:=" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_driver/Manifest b/dev-ml/ppx_driver/Manifest deleted file mode 100644 index 325593ac132b..000000000000 --- a/dev-ml/ppx_driver/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ppx_driver-0.9.1.tar.gz 28637 BLAKE2B d787ac91713bd750d2d2bde5830df3abb1a07be6672000d7a6de6c125a7627e7a5b94aa9f8f87e2c6c57a7a92073c44e18c7285575aad02f5db9c7b4419647d8 SHA512 1e3647e34fb9e6d44b783fae1fce21413e5591f8934c3d2ddac3d1b37019b0d95117c8d64abf14cbfe4f67147612371ec1eb76b477763b062206ffc9b46688d7 diff --git a/dev-ml/ppx_driver/metadata.xml b/dev-ml/ppx_driver/metadata.xml deleted file mode 100644 index 39e4d98cd1d4..000000000000 --- a/dev-ml/ppx_driver/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">janestreet/ppx_driver</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/ppx_driver/ppx_driver-0.9.1-r1.ebuild b/dev-ml/ppx_driver/ppx_driver-0.9.1-r1.ebuild deleted file mode 100644 index c950b017789c..000000000000 --- a/dev-ml/ppx_driver/ppx_driver-0.9.1-r1.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit opam - -DESCRIPTION="Feature-full driver for OCaml AST transformers" -HOMEPAGE="https://github.com/janestreet/ppx_driver" -SRC_URI="https://github.com/janestreet/ppx_driver/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" - -DEPEND=" - dev-ml/ppx_core:= - dev-ml/stdio:= - dev-ml/ppx_optcomp:= - dev-ml/ocaml-migrate-parsetree:= - dev-ml/ocamlbuild:=" -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} dev-ml/jbuilder" diff --git a/dev-ml/ppx_enumerate/Manifest b/dev-ml/ppx_enumerate/Manifest index 425aba98d5da..ee2075e9c5a0 100644 --- a/dev-ml/ppx_enumerate/Manifest +++ b/dev-ml/ppx_enumerate/Manifest @@ -1 +1,3 @@ -DIST ppx_enumerate-0.9.0.tar.gz 10967 BLAKE2B a5e742c5009c16d07cb23d7fba8cd4d41cd3f2ec543f47fce65c3731bb81b140a601ec492c0f5f8a5a62c2ac64f41a8093a7e5c96b251ad3b85944aab19c167c SHA512 46e979528af75313fcbfee4d1437156ded90d46f7608271a77ad41bb7e087e2ea4f61f534624b23679c4edf812d2fcfe26b9b634c3fcb691e2da2388ae04950c +DIST ppx_enumerate-0.14.0.tar.gz 9487 BLAKE2B 7f87a1c9c2ae0b365b5fdc44b906ef5330e28586aea741ca51dcddd8b0cf591e28f59e21d4050078c42072b96a96e5c6430d5ade4334d49aeec142db058ee3fc SHA512 d7f61ba792af81395c76e51bcb81b467ae4b67fdc3022d2e55ab0682bb4710e9a96852457721567a9f13606bd4290dbac8fd34421b0dffbabdd9debd1268ecc5 +DIST ppx_enumerate-0.15.0.tar.gz 9377 BLAKE2B 93718a2d22d4421c1a7105096802583b6e91e45023eda92efb85214238f15e70f5ea118b2d7b9d2ceeba2a6ba9e1d9c0d39f2c825f44326a641e4497e18b9c00 SHA512 3118942fd77a3b86eeaf79fdb09639d503d4c80c2215cb06b357f53ab631fbc23e05109107863fa785aeecbb62ebc80e95b45f472ee9cf6d3c826b6767a7b8cd +DIST ppx_enumerate-0.16.0.tar.gz 9414 BLAKE2B 87230f95eaf547a55c3ea3ca833dc532cfe1fd9245964de0e21e181317c964cd20c5fc20f9498e43ccaea4459ef074a1b52b3989590713ba4a7886c364bb4676 SHA512 8a5b79bd7bee7b746ade8a0f9ab1397f12e911a61582df344e78630ef64184f73415041b73699668e6b06b682c5f3f4f7b894bce0cd4aa7d122157f86d4c4af8 diff --git a/dev-ml/ppx_enumerate/metadata.xml b/dev-ml/ppx_enumerate/metadata.xml index 6b52e5d143e6..064fe40e79c6 100644 --- a/dev-ml/ppx_enumerate/metadata.xml +++ b/dev-ml/ppx_enumerate/metadata.xml @@ -1,9 +1,9 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">janestreet/ppx_enumerate</remote-id> diff --git a/dev-ml/ppx_enumerate/ppx_enumerate-0.9.0.ebuild b/dev-ml/ppx_enumerate/ppx_enumerate-0.14.0.ebuild index 45aac67b0624..09e7293d4f72 100644 --- a/dev-ml/ppx_enumerate/ppx_enumerate-0.9.0.ebuild +++ b/dev-ml/ppx_enumerate/ppx_enumerate-0.14.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit opam +inherit dune DESCRIPTION="Generate a list containing all values of a finite type" HOMEPAGE="https://github.com/janestreet/ppx_enumerate" @@ -11,15 +11,14 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g LICENSE="Apache-2.0" SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" DEPEND=" - dev-ml/ppx_core:= - dev-ml/ppx_driver:= - dev-ml/ppx_metaquot:= - dev-ml/ppx_type_conv:= - dev-ml/ocaml-migrate-parsetree:= + >=dev-ml/base-0.14.0:= + dev-ml/findlib:= + >=dev-ml/ppxlib-0.18.0:= + >=dev-ml/ocaml-migrate-parsetree-2.0.0:= + dev-ml/cinaps:= " RDEPEND="${DEPEND}" -DEPEND="${DEPEND} dev-ml/jbuilder" diff --git a/dev-ml/ppx_enumerate/ppx_enumerate-0.15.0.ebuild b/dev-ml/ppx_enumerate/ppx_enumerate-0.15.0.ebuild new file mode 100644 index 000000000000..ad33ce7c9195 --- /dev/null +++ b/dev-ml/ppx_enumerate/ppx_enumerate-0.15.0.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Generate a list containing all values of a finite type" +HOMEPAGE="https://github.com/janestreet/ppx_enumerate" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +DEPEND=" + dev-ml/base:${SLOT} + dev-ml/findlib:= + >=dev-ml/ppxlib-0.23.0:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_enumerate/ppx_enumerate-0.16.0.ebuild b/dev-ml/ppx_enumerate/ppx_enumerate-0.16.0.ebuild new file mode 100644 index 000000000000..1b79c5839e72 --- /dev/null +++ b/dev-ml/ppx_enumerate/ppx_enumerate-0.16.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Generate a list containing all values of a finite type" +HOMEPAGE="https://github.com/janestreet/ppx_enumerate" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-lang/ocaml-4.14 + dev-ml/base:${SLOT} + dev-ml/findlib:= + >=dev-ml/ppxlib-0.28.0:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_expect/Manifest b/dev-ml/ppx_expect/Manifest index 4d417a085e81..758e433e78df 100644 --- a/dev-ml/ppx_expect/Manifest +++ b/dev-ml/ppx_expect/Manifest @@ -1 +1,6 @@ -DIST ppx_expect-0.9.0.tar.gz 33700 BLAKE2B f03d1183b12efe84016a15b6a6b45b7bef93b23bc4d470c2796361aca2be229fc9447103c0a31d95a94f6c05bbabf1cbe9d138dc3518df9f505b6b009eefb104 SHA512 b8a6941f3ac0dea2167d7fe5c61e7adf605f5399e11049b5c9f22c613182983a014d05c2fb16e7a2dc94dbccf445e1801c39a89e6d995b5599cb40ee4322148e +DIST ppx_expect-0.14.0.tar.gz 45661 BLAKE2B 0cba3840743d45f0f11936f090319aab3237c7a14389eb6d035a3b7cdac91e0b169c3ed84407e1bb01a00738bf97b62dba313965e93a2177388666764fe5854b SHA512 7de5d84640d16101d38140b5f621301c9935e3161a7c7d978373940be92fa7f14cad429e79eec294a20d1f379e969cf3c25d15810f1a4d3ad1bb8ba0eb7d7109 +DIST ppx_expect-0.14.1.tar.gz 45699 BLAKE2B b52d579d92156344ff44d30c88603840eb7d6a0d346de49fcbc01ef16fe3c33e664486de4cb2d09f74e853e39b9a01778e7e0f489497fdd34fc9582d895a0d3b SHA512 fd98e79d5b3bb935b2a4077a07894c159b48e142268c2e30ebff2cbfecc92266b454be69f5080b315eefa9184372e5e5248bd8a3b2b9d6cad59e2d517c94bd02 +DIST ppx_expect-0.14.2.tar.gz 45703 BLAKE2B cd1371f6e7e0519c1b30c6d471a1f4be6cbeffa0bf65de1472c9809265c35c307cd36ebb12548f60ab2acb6e9786556f29ae4752ee5cfbfa19fdc2dc14f16aa6 SHA512 bb00e15057ea403241781d2d6a385200496adc79680a01d031416192f8c93efd75a6998602a90d0aba7fcb2110e876b058126bb6397d5ba7fe5dd48c03202169 +DIST ppx_expect-0.15.0.tar.gz 48825 BLAKE2B 9363497cc5a507d4f9c51be11a3fef254cbd2541c146a1248755763bed6f54a69738ed72ac590e270856b9c04a5949c9bbd59ba25bc8e7d1fc9d76574bcc70c3 SHA512 945ebd31a94debd4a65c3a8dd7e6481e7debe043c48a60bab4085f9d05cba5b8663bf0f5498cb4cd0e86a24182b21006506f20873e5242b31db5de5629113ade +DIST ppx_expect-0.15.1.tar.gz 48800 BLAKE2B de36b8eafb1393c6489f60d91a4eb0da15e0108db7b56536011cb4e0e7fd2168ab97d76256920d40bcf39283435b19b69afe17204a3ecca615ced9c3482e974a SHA512 483c320dcfa628a1140d727e63fe4c5e2b298d9c58ab9975f8b3b5fcfbb3348f04a901d8b4a8d8288b14959fddbf2578a8b48de7352e4ce90439e26a27026780 +DIST ppx_expect-0.16.0.tar.gz 48460 BLAKE2B c4e9eecd689c1d0f79183020e634636ca340b16638fb0b76e5a7e89e08626d4cc88bd981533184ed7b81b8d34a0d302ff68920414472c084d5a969e45b6e791e SHA512 fdc8cb76afc9c9b436cbf8627b0c6543ae64fc51e92bf25db99ace10646aef3be3d1a3659dedb3e888494ab4e380e387b92557a584fa3e1eca79e19751a0b950 diff --git a/dev-ml/ppx_expect/files/ppx_expect-0.14.0-ppxlib-0.18.0.patch b/dev-ml/ppx_expect/files/ppx_expect-0.14.0-ppxlib-0.18.0.patch new file mode 100644 index 000000000000..f30da03701ba --- /dev/null +++ b/dev-ml/ppx_expect/files/ppx_expect-0.14.0-ppxlib-0.18.0.patch @@ -0,0 +1,42 @@ +commit 7f46c2d22a87b99c70a220c1b13aaa34c6d217ff (HEAD, origin/upgrade-ppxlib-0.18.0) +Author: Nathan Rebours <nathan.p.rebours@gmail.com> +Date: Mon Oct 5 17:46:34 2020 +0200 + + Make ppx_expect compatible with ppxlib.0.18.0 + + ppxlib.0.18.0 upgrades to the 4.11 AST which results in a change + in string constants representation. This PR makes ppx_expect + compatible with the latest ppxlib. + + You might want for the actual release of ppxlib.0.18.0 before merging + this! + + Signed-off-by: Nathan Rebours <nathan.p.rebours@gmail.com> + +diff --git a/expect_payload/ppx_expect_payload.ml b/expect_payload/ppx_expect_payload.ml +index 23a12e1..fd2a5bb 100644 +--- a/expect_payload/ppx_expect_payload.ml ++++ b/expect_payload/ppx_expect_payload.ml +@@ -86,7 +86,7 @@ let make ~kind payload ~(extension_id_loc : Location.t) = + let pattern () = + Ast_pattern.( + map +- (single_expr_payload (pexp_loc __ (pexp_constant (pconst_string __ __)))) +- ~f:(fun f loc s tag -> f (Some (loc, s, tag))) ++ (single_expr_payload (pexp_loc __ (pexp_constant (pconst_string __ __ __)))) ++ ~f:(fun f loc s _loc tag -> f (Some (loc, s, tag))) + ||| map (pstr nil) ~f:(fun f -> f None)) + ;; +diff --git a/ppx_expect.opam b/ppx_expect.opam +index dcce541..59adadb 100644 +--- a/ppx_expect.opam ++++ b/ppx_expect.opam +@@ -17,7 +17,7 @@ depends: [ + "ppx_inline_test" {>= "v0.14" & < "v0.15"} + "stdio" {>= "v0.14" & < "v0.15"} + "dune" {>= "2.0.0"} +- "ppxlib" {>= "0.11.0"} ++ "ppxlib" {>= "0.18.0"} + "re" {>= "1.8.0"} + ] + synopsis: "Cram like framework for OCaml" diff --git a/dev-ml/ppx_expect/metadata.xml b/dev-ml/ppx_expect/metadata.xml index cc6dd4d744bd..4506dbb0b17c 100644 --- a/dev-ml/ppx_expect/metadata.xml +++ b/dev-ml/ppx_expect/metadata.xml @@ -1,9 +1,9 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">janestreet/ppx_expect</remote-id> diff --git a/dev-ml/ppx_expect/ppx_expect-0.14.0.ebuild b/dev-ml/ppx_expect/ppx_expect-0.14.0.ebuild new file mode 100644 index 000000000000..57b1d0640714 --- /dev/null +++ b/dev-ml/ppx_expect/ppx_expect-0.14.0.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Cram like framework for OCaml" +HOMEPAGE="https://github.com/janestreet/ppx_expect" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt" +# https://bugs.gentoo.org/749291#c2 +RESTRICT="test" + +RDEPEND=" + >=dev-ml/base-0.14.0:= + >=dev-ml/ppx_here-0.14.0:= + >=dev-ml/ppx_inline_test-0.14.1:= + >=dev-ml/stdio-0.14.0:= + >=dev-ml/ppxlib-0.18.0:= + >=dev-ml/ocaml-compiler-libs-0.11.0:= + >=dev-ml/ocaml-migrate-parsetree-2.0.0:= + dev-ml/cinaps:= + dev-ml/re:= + =dev-ml/ppx_sexp_conv-0.14*:= +" +DEPEND="${RDEPEND}" + +PATCHES=( "${FILESDIR}"/${P}-ppxlib-0.18.0.patch ) diff --git a/dev-ml/ppx_expect/ppx_expect-0.14.1.ebuild b/dev-ml/ppx_expect/ppx_expect-0.14.1.ebuild new file mode 100644 index 000000000000..aa31a4ff6b5f --- /dev/null +++ b/dev-ml/ppx_expect/ppx_expect-0.14.1.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Cram like framework for OCaml" +HOMEPAGE="https://github.com/janestreet/ppx_expect" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt" +# https://bugs.gentoo.org/749291#c2 +RESTRICT="test" + +RDEPEND=" + >=dev-ml/base-0.14.0:= + >=dev-ml/ppx_here-0.14.0:= + >=dev-ml/ppx_inline_test-0.14.1:= + >=dev-ml/stdio-0.14.0:= + >=dev-ml/ppxlib-0.18.0:= + >=dev-ml/ocaml-compiler-libs-0.11.0:= + >=dev-ml/ocaml-migrate-parsetree-2.0.0:= + dev-ml/cinaps:= + dev-ml/re:= + =dev-ml/ppx_sexp_conv-0.14*:= +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/ppx_expect/ppx_expect-0.14.2.ebuild b/dev-ml/ppx_expect/ppx_expect-0.14.2.ebuild new file mode 100644 index 000000000000..256d2bac0a82 --- /dev/null +++ b/dev-ml/ppx_expect/ppx_expect-0.14.2.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Cram like framework for OCaml" +HOMEPAGE="https://github.com/janestreet/ppx_expect" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" +# https://bugs.gentoo.org/749291#c2 +RESTRICT="test" + +RDEPEND=" + >=dev-ml/base-0.14.0:= + >=dev-ml/ppx_here-0.14.0:= + >=dev-ml/ppx_inline_test-0.14.1:= + >=dev-ml/stdio-0.14.0:= + >=dev-ml/ppxlib-0.18.0:= + >=dev-ml/ocaml-compiler-libs-0.11.0:= + >=dev-ml/ocaml-migrate-parsetree-2.0.0:= + dev-ml/cinaps:= + dev-ml/re:= + =dev-ml/ppx_sexp_conv-0.14*:= +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/ppx_expect/ppx_expect-0.15.0-r1.ebuild b/dev-ml/ppx_expect/ppx_expect-0.15.0-r1.ebuild new file mode 100644 index 000000000000..c3a60268154f --- /dev/null +++ b/dev-ml/ppx_expect/ppx_expect-0.15.0-r1.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Cram like framework for OCaml" +HOMEPAGE="https://github.com/janestreet/ppx_expect" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" +# https://bugs.gentoo.org/749291#c2 +RESTRICT="test" + +RDEPEND=" + dev-ml/ppx_inline_test:${SLOT} + dev-ml/re:= +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/ppx_expect/ppx_expect-0.15.1-r1.ebuild b/dev-ml/ppx_expect/ppx_expect-0.15.1-r1.ebuild new file mode 100644 index 000000000000..fa56ccd22d25 --- /dev/null +++ b/dev-ml/ppx_expect/ppx_expect-0.15.1-r1.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Cram like framework for OCaml" +HOMEPAGE="https://github.com/janestreet/ppx_expect" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" +# https://bugs.gentoo.org/749291#c2 +RESTRICT="test" + +RDEPEND=" + dev-ml/ppxlib:= + dev-ml/ppx_inline_test:${SLOT} + dev-ml/re:= +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/ppx_expect/ppx_expect-0.16.0.ebuild b/dev-ml/ppx_expect/ppx_expect-0.16.0.ebuild new file mode 100644 index 000000000000..61d547bb407f --- /dev/null +++ b/dev-ml/ppx_expect/ppx_expect-0.16.0.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Cram like framework for OCaml" +HOMEPAGE="https://github.com/janestreet/ppx_expect" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" +# https://bugs.gentoo.org/749291#c2 +RESTRICT="test" + +RDEPEND=" + >=dev-ml/ppxlib-0.28.0:= + >=dev-ml/re-1.8.0:= + dev-ml/base:${SLOT} + dev-ml/ppx_here:${SLOT} + dev-ml/ppx_inline_test:${SLOT} + dev-ml/stdio:${SLOT} +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/ppx_expect/ppx_expect-0.9.0.ebuild b/dev-ml/ppx_expect/ppx_expect-0.9.0.ebuild deleted file mode 100644 index 3ab20bb348ff..000000000000 --- a/dev-ml/ppx_expect/ppx_expect-0.9.0.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit opam - -DESCRIPTION="Cram like framework for OCaml" -HOMEPAGE="https://github.com/janestreet/ppx_expect" -SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -DEPEND=" - dev-ml/base:= - dev-ml/ppx_assert:= - dev-ml/ppx_compare:= - dev-ml/ppx_core:= - dev-ml/ppx_custom_printf:= - dev-ml/ppx_driver:= - dev-ml/ppx_fields_conv:= - dev-ml/ppx_here:= - dev-ml/ppx_inline_test:= - dev-ml/ppx_metaquot:= - dev-ml/ppx_sexp_conv:= - dev-ml/ppx_traverse:= - dev-ml/ppx_variants_conv:= - dev-ml/stdio:= - dev-ml/ocaml-migrate-parsetree:= - dev-ml/ocaml-re:= -" -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} dev-ml/jbuilder" diff --git a/dev-ml/ppx_fail/Manifest b/dev-ml/ppx_fail/Manifest index 33bc7dfacbfe..753d78207ae8 100644 --- a/dev-ml/ppx_fail/Manifest +++ b/dev-ml/ppx_fail/Manifest @@ -1 +1 @@ -DIST ppx_fail-0.9.0.tar.gz 5908 BLAKE2B 671d6c565ffef4582600346642d64884706c9f5bbff114868b0069f82abea3241c44bd92472e40b11365a560335efac59f2a93ab993d19cf98c2a3da09c5968d SHA512 43bd13d5e41f7a297da2c67b032b9d88b94ab2ef152f756738e2bab41aa22829ec3a17d2824243e5194c4d2ee9ea567f06a638172f8c77ca7c466a641da8017a +DIST ppx_fail-0.14.0.tar.gz 3773 BLAKE2B ef5c7a84808045a9b9ddb78556061ec0d9b04f5b08d5cb4096c353d0e38aa3bca360538efe53cf5faffad6628634d689504c063bbb563790c15a4f3d327f8c14 SHA512 a683430e5cdb50b52846b45d0e25a7b2498f14f34153319cb3ffd30e7b6e493f36790ffc5ea82ec3fbb0281a29e13bb2df10a1754ec32f0e5faad0890b6d211e diff --git a/dev-ml/ppx_fail/metadata.xml b/dev-ml/ppx_fail/metadata.xml index 3ed1070e00f0..bc213c9f0aa6 100644 --- a/dev-ml/ppx_fail/metadata.xml +++ b/dev-ml/ppx_fail/metadata.xml @@ -1,9 +1,9 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">janestreet/ppx_fail</remote-id> diff --git a/dev-ml/ppx_fail/ppx_fail-0.9.0.ebuild b/dev-ml/ppx_fail/ppx_fail-0.14.0.ebuild index f394a9dcb62c..e8d841df2ec5 100644 --- a/dev-ml/ppx_fail/ppx_fail-0.9.0.ebuild +++ b/dev-ml/ppx_fail/ppx_fail-0.14.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit opam +inherit dune DESCRIPTION="Add location to calls to failwiths" HOMEPAGE="https://github.com/janestreet/ppx_fail" @@ -11,15 +11,14 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g LICENSE="Apache-2.0" SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" DEPEND=" - dev-ml/ppx_core:= - dev-ml/ppx_driver:= - dev-ml/ppx_here:= - dev-ml/ppx_metaquot:= - dev-ml/ocaml-migrate-parsetree:= + >=dev-ml/base-0.14.0:= + >=dev-ml/ppx_here-0.14.0:= + >=dev-ml/ppxlib-0.18.0:= + >=dev-ml/ocaml-migrate-parsetree-2.0.0:= + dev-ml/cinaps:= " RDEPEND="${DEPEND}" -DEPEND="${DEPEND} dev-ml/jbuilder" diff --git a/dev-ml/ppx_fields_conv/Manifest b/dev-ml/ppx_fields_conv/Manifest index b9d9329abf20..be02ffe5df79 100644 --- a/dev-ml/ppx_fields_conv/Manifest +++ b/dev-ml/ppx_fields_conv/Manifest @@ -1 +1,4 @@ -DIST ppx_fields_conv-0.9.0.tar.gz 15171 BLAKE2B 5a0051a1b362dcf15ddd4ec4f3f6f4df6d709a8c2709222a2d2502eb12b8728fb28ce9213a1789270d30505c6084ab8203dc7b49d7043d9820aabb0cc74c51c2 SHA512 1edcd7076c1dbba84b86f05624b3792404b24ae4414ee0c3b32dcfc998da77a2a9d52d063fefc24be21d98472d6f58880c37ac29c610fb5b8a401224fc654ec1 +DIST ppx_fields_conv-0.14.1.tar.gz 14348 BLAKE2B 09bd2db4dab314ba50bcd5566c4ba4fd834fc34ba15be2132d5cbe3c27e5c76e37b4cccd3bc4cc4a5bd930f95215f6100557b89e44d54e906e382381be1fe257 SHA512 afd0f16b851e2984e46ac1d9347268a1cdb9a9054ea18435a5030dd512ba56f97b54639cc6cc6254498ca3fd2fa4d5c0053c7f2ceddd531ebbd9afef5b5f3e3d +DIST ppx_fields_conv-0.14.2.tar.gz 14314 BLAKE2B d6c28a157c0d5fc73ef6793c23539c9ae6b706445f24b8761a63a932c42e4d75237b4b092122e7049d3526c33bb3fbce52f44deaa8e52ab233b1ede51a02f09f SHA512 19cf14f79bd6425519e08089b6de19a79ed3f435cd453eeae6c7fe88d65ae4de4d5b47cf19d086bb2ba41066b344da7062d5153eaba7389da8dcf95c7284b522 +DIST ppx_fields_conv-0.15.0.tar.gz 16432 BLAKE2B 1db37d33228d3090c611b4545cedd8138ae970fde5878d17de740aa231c3c50defcae743bf633e1a42f9610f1815ca9166dd9749ff392fccdf55e16affc07b9e SHA512 5fd20c0bfd0ba9bfd4aad98b0beb2be7978668dea1e6ca4099eeb60f86533b0ea89168af1d5556fea295ea93829c62358c66780550d27177b9f7eb2bd08dd3c8 +DIST ppx_fields_conv-0.16.0.tar.gz 21481 BLAKE2B a3a19b935b457fba0aebbe308ee3452df7d698073c1d15fb0e7948f19a64c0d6d5f358d35979e16eaafd220413c1865c22d6dbe197ab6623d30050d72f55b3da SHA512 14bd27628f653aca239c82b528af1dea65446d56ecd2e30c4d9d2f8555854c45e7a0c5c4f6230de7abe3869fe2c8be569b26d6c217296c607c6e8b336a4af575 diff --git a/dev-ml/ppx_fields_conv/files/ppx_fields_conv-0.14.1-ppxlib-0.18.0.patch b/dev-ml/ppx_fields_conv/files/ppx_fields_conv-0.14.1-ppxlib-0.18.0.patch new file mode 100644 index 000000000000..23b5a8be82c2 --- /dev/null +++ b/dev-ml/ppx_fields_conv/files/ppx_fields_conv-0.14.1-ppxlib-0.18.0.patch @@ -0,0 +1,60 @@ +commit f3c6846ad9015de0adb44f519ff010ff0ed51180 (HEAD, origin/upgrade-ppxlib-0.18.0) +Author: Nathan Rebours <nathan.p.rebours@gmail.com> +Date: Mon Oct 5 18:20:23 2020 +0200 + + Make ppx_fields_conv compatible with ppxlib.0.18.0 + + ppxlib.0.18.0 upgrades to the 4.11 AST which results in a change + in string constants representation. This PR makes ppx_fields_conv + compatible with the latest ppxlib. + + You might want for the actual release of ppxlib.0.18.0 before merging + this! + + Signed-off-by: Nathan Rebours <nathan.p.rebours@gmail.com> + +diff --git a/ppx_fields_conv.opam b/ppx_fields_conv.opam +index 91a9692..3e2d24a 100644 +--- a/ppx_fields_conv.opam ++++ b/ppx_fields_conv.opam +@@ -15,7 +15,7 @@ depends: [ + "base" {>= "v0.14" & < "v0.15"} + "fieldslib" {>= "v0.14" & < "v0.15"} + "dune" {>= "2.0.0"} +- "ppxlib" {>= "0.14.0"} ++ "ppxlib" {>= "0.18.0"} + ] + synopsis: "Generation of accessor and iteration functions for ocaml records" + description: " +diff --git a/src/ppx_fields_conv.ml b/src/ppx_fields_conv.ml +index 130e82b..87752cb 100644 +--- a/src/ppx_fields_conv.ml ++++ b/src/ppx_fields_conv.ml +@@ -34,9 +34,6 @@ let check_no_collision = + + module A = struct (* Additional AST construction helpers *) + +- let exp_string : (loc:Location.t -> string -> expression) = fun ~loc s -> +- pexp_constant ~loc (Pconst_string (s,None)) +- + let pat_name : (loc:Location.t -> string -> pattern) = fun ~loc name -> + ppat_var ~loc (Loc.make name ~loc) + +@@ -440,7 +437,7 @@ module Gen_struct = struct + [%expr + Fieldslib.Field.Field { Fieldslib.Field.For_generated_code. + force_variance = (fun (_ : [%t perm]) -> ()); +- name = [%e A.exp_string ~loc name]; ++ name = [%e estring ~loc name]; + getter = [%e A.exp_name ~loc name]; + setter = [%e setter_field]; + fset = [%e fset];}] +@@ -725,7 +722,7 @@ module Gen_struct = struct + let getter_and_setters, fields = gen_fields ~private_ ~loc labdecs in + let create = creation_fun ~loc record_name labdecs in + let simple_create = simple_creation_fun ~loc record_name labdecs in +- let names = List.map (Inspect.field_names labdecs) ~f:(A.exp_string ~loc) in ++ let names = List.map (Inspect.field_names labdecs) ~f:(estring ~loc) in + let fields_module = + if String.equal record_name "t" then "Fields" else "Fields_of_" ^ record_name + in diff --git a/dev-ml/ppx_fields_conv/metadata.xml b/dev-ml/ppx_fields_conv/metadata.xml index 365fc5349ba2..2037ae0869c2 100644 --- a/dev-ml/ppx_fields_conv/metadata.xml +++ b/dev-ml/ppx_fields_conv/metadata.xml @@ -1,9 +1,9 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">janestreet/ppx_fields_conv</remote-id> diff --git a/dev-ml/ppx_fields_conv/ppx_fields_conv-0.14.1.ebuild b/dev-ml/ppx_fields_conv/ppx_fields_conv-0.14.1.ebuild new file mode 100644 index 000000000000..bee1d3012d75 --- /dev/null +++ b/dev-ml/ppx_fields_conv/ppx_fields_conv-0.14.1.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Generation of accessor and iteration functions for ocaml records" +HOMEPAGE="https://github.com/janestreet/ppx_fields_conv" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-ml/base-0.14.0:= + >=dev-ml/fieldslib-0.14.0:= + >=dev-ml/ppxlib-0.18.0:= + >=dev-ml/ocaml-migrate-parsetree-2.0.0:= + dev-ml/cinaps:= +" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}"/${P}-ppxlib-0.18.0.patch ) diff --git a/dev-ml/ppx_fields_conv/ppx_fields_conv-0.9.0-r1.ebuild b/dev-ml/ppx_fields_conv/ppx_fields_conv-0.14.2.ebuild index b0352e3866ec..d610d76cf65f 100644 --- a/dev-ml/ppx_fields_conv/ppx_fields_conv-0.9.0-r1.ebuild +++ b/dev-ml/ppx_fields_conv/ppx_fields_conv-0.14.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit opam +inherit dune DESCRIPTION="Generation of accessor and iteration functions for ocaml records" HOMEPAGE="https://github.com/janestreet/ppx_fields_conv" @@ -11,17 +11,14 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g LICENSE="Apache-2.0" SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" DEPEND=" - dev-ml/ppx_core:= - dev-ml/ppx_driver:= - dev-ml/ppx_metaquot:= - dev-ml/ppx_type_conv:= - dev-ml/fieldslib:= - dev-ml/ocaml-migrate-parsetree:= - dev-ml/ppx_traverse_builtins:= + >=dev-ml/base-0.14.0:= + >=dev-ml/fieldslib-0.14.0:= + >=dev-ml/ppxlib-0.18.0:= + >=dev-ml/ocaml-migrate-parsetree-2.0.0:= + dev-ml/cinaps:= " RDEPEND="${DEPEND}" -DEPEND="${DEPEND} dev-ml/jbuilder" diff --git a/dev-ml/ppx_fields_conv/ppx_fields_conv-0.15.0.ebuild b/dev-ml/ppx_fields_conv/ppx_fields_conv-0.15.0.ebuild new file mode 100644 index 000000000000..38054ac10994 --- /dev/null +++ b/dev-ml/ppx_fields_conv/ppx_fields_conv-0.15.0.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Generation of accessor and iteration functions for ocaml records" +HOMEPAGE="https://github.com/janestreet/ppx_fields_conv" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +DEPEND=" + dev-ml/base:${SLOT} + >=dev-ml/fieldslib-0.15.0:= + >=dev-ml/ppxlib-0.23.0:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_fields_conv/ppx_fields_conv-0.16.0.ebuild b/dev-ml/ppx_fields_conv/ppx_fields_conv-0.16.0.ebuild new file mode 100644 index 000000000000..cae47d35fba1 --- /dev/null +++ b/dev-ml/ppx_fields_conv/ppx_fields_conv-0.16.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Generation of accessor and iteration functions for ocaml records" +HOMEPAGE="https://github.com/janestreet/ppx_fields_conv" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-lang/ocaml-4.14 + dev-ml/base:${SLOT} + dev-ml/fieldslib:${SLOT} + >=dev-ml/ppxlib-0.28.0:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_fixed_literal/Manifest b/dev-ml/ppx_fixed_literal/Manifest new file mode 100644 index 000000000000..ac07d3435f48 --- /dev/null +++ b/dev-ml/ppx_fixed_literal/Manifest @@ -0,0 +1,3 @@ +DIST ppx_fixed_literal-0.14.0.tar.gz 3643 BLAKE2B 7b84dda448f179e778356c3fd5cfdd1dbcb479e03d4e6a9bbd6d2b47c748d0795c18605a86e13e5680bcf23f383d99513408a441fc1fba188d66dad0bd58e875 SHA512 5e30c5238c20a4b6f164ebe29b5f6d4bc074f03fb62aac30a1d129c4fb466124bb163c45e6cc95ad34385ee2e621cf3a1366d3bd9b224438fc575f862f6f73c2 +DIST ppx_fixed_literal-0.15.0.tar.gz 3655 BLAKE2B 3599a5eea1cc691dd16feda7bb95867ad32976df511d6618e6e655deda4ebb6a6a44f30856e9dca26f7ac878b1beaa8086a5dfc241ed6a354a8d064c7d9bd09a SHA512 3842162928f6a87b39abaea15cbed8c8f59349b20711d6f8af011cd0dec48a75f59e422db6907425203fc98f438dd758a3e8973900844b60cbf47f27bc9ac394 +DIST ppx_fixed_literal-0.16.0.tar.gz 3679 BLAKE2B de5a474feba17ae3942cce33a42b0634c4d144e9721c9ef0cf53afd0c286043b71c2d281f3ed440c6d089f68e4566a75c636625945faaeeb06fb0ba88509a14a SHA512 9d83d578fb34b3fb2c5351c3934d5f35e509f66a72ba75126a44362b7e4de07c4d43a33b4eb8630999a7010410a8300c7740cc79bf16609ce1144ad90fc38751 diff --git a/dev-ml/ppx_fixed_literal/metadata.xml b/dev-ml/ppx_fixed_literal/metadata.xml new file mode 100644 index 000000000000..f5246bd514db --- /dev/null +++ b/dev-ml/ppx_fixed_literal/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">janestreet/ppx_fixed_literal</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/ppx_fixed_literal/ppx_fixed_literal-0.14.0.ebuild b/dev-ml/ppx_fixed_literal/ppx_fixed_literal-0.14.0.ebuild new file mode 100644 index 000000000000..873fd1cc8927 --- /dev/null +++ b/dev-ml/ppx_fixed_literal/ppx_fixed_literal-0.14.0.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Simpler notation for fixed point literals" +HOMEPAGE="https://github.com/janestreet/ppx_fixed_literal" +SRC_URI="https://github.com/janestreet/ppx_fixed_literal/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-ml/base-0.14.0:= + dev-ml/findlib:= + >=dev-ml/ppxlib-0.18.0:= + >=dev-ml/ocaml-compiler-libs-0.11.0:= + >=dev-ml/ocaml-migrate-parsetree-2.0.0:= + dev-ml/cinaps:= + dev-ml/sexplib0:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_fixed_literal/ppx_fixed_literal-0.15.0.ebuild b/dev-ml/ppx_fixed_literal/ppx_fixed_literal-0.15.0.ebuild new file mode 100644 index 000000000000..e5e0ccaaf58d --- /dev/null +++ b/dev-ml/ppx_fixed_literal/ppx_fixed_literal-0.15.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Simpler notation for fixed point literals" +HOMEPAGE="https://github.com/janestreet/ppx_fixed_literal" +SRC_URI="https://github.com/janestreet/ppx_fixed_literal/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +DEPEND=" + dev-ml/base:${SLOT} + dev-ml/findlib:= + >=dev-ml/ppxlib-0.23.0:= + >=dev-ml/ocaml-compiler-libs-0.11.0:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_fixed_literal/ppx_fixed_literal-0.16.0.ebuild b/dev-ml/ppx_fixed_literal/ppx_fixed_literal-0.16.0.ebuild new file mode 100644 index 000000000000..e2919b0631cb --- /dev/null +++ b/dev-ml/ppx_fixed_literal/ppx_fixed_literal-0.16.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Simpler notation for fixed point literals" +HOMEPAGE="https://github.com/janestreet/ppx_fixed_literal" +SRC_URI="https://github.com/janestreet/ppx_fixed_literal/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +DEPEND=" + dev-ml/base:${SLOT} + dev-ml/findlib:= + >=dev-ml/ppxlib-0.28.0:= + >=dev-ml/ocaml-compiler-libs-0.11.0:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_globalize/Manifest b/dev-ml/ppx_globalize/Manifest new file mode 100644 index 000000000000..86f56b414324 --- /dev/null +++ b/dev-ml/ppx_globalize/Manifest @@ -0,0 +1 @@ +DIST ppx_globalize-0.16.0.tar.gz 8328 BLAKE2B e8ba1a500fc244d53d07dbe90df6b18f3088c9496d309002a177725e1990b8108c6972dd2b45caeecdbad62c466e73ee3ae944701dec489c2613a8b71ea88787 SHA512 76618dc1cc436c437e7911a2b793233f9bdd559dc37419df6f94143548bcfe09a0f29eafc3a36e97a5f8fb886aa94ca641f10f56078a8558f642a2cf564e4c75 diff --git a/dev-ml/ppx_globalize/metadata.xml b/dev-ml/ppx_globalize/metadata.xml new file mode 100644 index 000000000000..f8457ef461d5 --- /dev/null +++ b/dev-ml/ppx_globalize/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">janestreet/ppx_globalize</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/ppx_globalize/ppx_globalize-0.16.0.ebuild b/dev-ml/ppx_globalize/ppx_globalize-0.16.0.ebuild new file mode 100644 index 000000000000..c4d019a043e9 --- /dev/null +++ b/dev-ml/ppx_globalize/ppx_globalize-0.16.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Generates functions to copy local values to the global heap" +HOMEPAGE="https://github.com/janestreet/ppx_globalize" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-lang/ocaml-4.14 + dev-ml/base:${SLOT} + >=dev-ml/ppxlib-0.28:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_hash/Manifest b/dev-ml/ppx_hash/Manifest index cb31fc191d89..f15ca84befaf 100644 --- a/dev-ml/ppx_hash/Manifest +++ b/dev-ml/ppx_hash/Manifest @@ -1 +1,3 @@ -DIST ppx_hash-0.9.0.tar.gz 26942 BLAKE2B 589b9fe1ced89c0dbbc9d3472e21c278a9d1d29c1ceaa3a19ae853727cb4fc446e67deb8b63274ccfbd95fbfa49a5e8cba764bf2a3ae26bb994c9fb16f2b9f32 SHA512 401a87f5cc357ad50fc23f2450b84d6113cd79c1d2506f6e95476795fde0f3240ca252fc3bfe083f9ee1d0511ea3909481387ecf597edef6f90f9756a5a97096 +DIST ppx_hash-0.14.0.tar.gz 27859 BLAKE2B 0d89eeec154e62ae42ddaff6b0ccdf827ad768e0f19dcdfd4f8b940f594856c8fc036fa02a2462666f2ee4b675e1594837d196fb92cdbb9f8bdf4e171ce90374 SHA512 21d68c0655c21fcd0cecceb8c69e45706b57db160e49c3b112e67cc874a8084946dbae8709ed99f24e7282182c7238cf95ef00bec3ac5a271409e9d5f788467c +DIST ppx_hash-0.15.0.tar.gz 28632 BLAKE2B 07c2416bcd1504bc82970a569984fdf225bf74e98d3b8e401b32370eee657a2b1b53a1903a702fcb04c295d1df08de67b9f6971ec8f1dcbf31e87c36136b27b2 SHA512 333d2b232b1d5c15fe144bafb7ad4c843e5381e71b21b25a6fb9c03b1ee98ba81580de7036580ac2d04dcdfed0af20003875b9374412b8ef130b4647c30fee6a +DIST ppx_hash-0.16.0.tar.gz 28660 BLAKE2B 8cd12ae26beb6a6828ebb1ebd5d3168d37e9b0dc61feca742a9cee0e992e9be84b9a7b1f32e708e68d4644a3cd6dc29c6d302ae780efcd466731624821dd0238 SHA512 b06f67fa0550a40a96fd02e1b65240470a014fcf6f6d4f0f21f77d2d7f2eaba3b86faef462d329b416f9e6234f287ac3a3c72875cbac53b0532d8ab82c0199e7 diff --git a/dev-ml/ppx_hash/metadata.xml b/dev-ml/ppx_hash/metadata.xml index 903da84b8a79..6e03277240d2 100644 --- a/dev-ml/ppx_hash/metadata.xml +++ b/dev-ml/ppx_hash/metadata.xml @@ -1,9 +1,9 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">janestreet/ppx_hash</remote-id> diff --git a/dev-ml/ppx_hash/ppx_hash-0.9.0.ebuild b/dev-ml/ppx_hash/ppx_hash-0.14.0.ebuild index cf6dba57d056..7ec1254c0649 100644 --- a/dev-ml/ppx_hash/ppx_hash-0.9.0.ebuild +++ b/dev-ml/ppx_hash/ppx_hash-0.14.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit opam +inherit dune DESCRIPTION="PPX rewriter that generates hash functions from type expressions and definitions" HOMEPAGE="https://github.com/janestreet/ppx_hash" @@ -11,18 +11,16 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g LICENSE="Apache-2.0" SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" DEPEND=" - dev-ml/base:= - dev-ml/ppx_compare:= - dev-ml/ppx_core:= - dev-ml/ppx_driver:= - dev-ml/ppx_metaquot:= - dev-ml/ppx_sexp_conv:= - dev-ml/ppx_type_conv:= - dev-ml/ocaml-migrate-parsetree:= - " + >=dev-ml/base-0.14.0:= + >=dev-ml/ppx_compare-0.14.0:= + >=dev-ml/ppx_sexp_conv-0.14.0:= + >=dev-ml/ppxlib-0.18.0:= + >=dev-ml/ocaml-compiler-libs-0.11.0:= + >=dev-ml/ocaml-migrate-parsetree-2.0.0:= + dev-ml/cinaps:= +" RDEPEND="${DEPEND}" -DEPEND="${DEPEND} dev-ml/jbuilder" diff --git a/dev-ml/ppx_hash/ppx_hash-0.15.0-r1.ebuild b/dev-ml/ppx_hash/ppx_hash-0.15.0-r1.ebuild new file mode 100644 index 000000000000..ab741b37d7eb --- /dev/null +++ b/dev-ml/ppx_hash/ppx_hash-0.15.0-r1.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="PPX rewriter that generates hash functions from type expressions and definitions" +HOMEPAGE="https://github.com/janestreet/ppx_hash" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +DEPEND=" + dev-ml/ppx_sexp_conv:${SLOT} + dev-ml/ppx_compare:${SLOT} + >=dev-ml/ppxlib-0.23:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_hash/ppx_hash-0.16.0.ebuild b/dev-ml/ppx_hash/ppx_hash-0.16.0.ebuild new file mode 100644 index 000000000000..9c0369a11436 --- /dev/null +++ b/dev-ml/ppx_hash/ppx_hash-0.16.0.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="PPX rewriter that generates hash functions from type expressions and definitions" +HOMEPAGE="https://github.com/janestreet/ppx_hash" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +DEPEND=" + dev-ml/ppx_sexp_conv:${SLOT} + dev-ml/ppx_compare:${SLOT} + >=dev-ml/ppxlib-0.28:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_here/Manifest b/dev-ml/ppx_here/Manifest index 33678cef1df2..f964a81cd236 100644 --- a/dev-ml/ppx_here/Manifest +++ b/dev-ml/ppx_here/Manifest @@ -1 +1,3 @@ -DIST ppx_here-0.9.1.tar.gz 7225 BLAKE2B 7115c77477b2bab47febfafe55d422bef03c32502d9d0064c5633d6925faf1b3a8b580f2a0974edcf86613f9b2582b0067f3e08a4ca474333f7e15c2c7adb87d SHA512 ca21fb490a4d980616349850b781e4ee02c0eb8a27e8ef9d4092d15ee235ffc504dab1b2a3db44fc6a84fa6b2cdbd67c0c4adbc41fb094b7bb9d4f710193aaf2 +DIST ppx_here-0.14.0.tar.gz 5005 BLAKE2B 1711ec047c85af76d2343895e54889fec6e9aa29d4d188e83ff9d9ee12cecf42e4ca968a97f341a818f87efc0cc6ccb7e26f025e8af2195c341cb57325aec62b SHA512 3386e9c727f93be86de1daee2e94c9b7a22bcb4bd0ef20bd2c40ac227723ac36c9ac04fd3e16121731227a9b5256898594e0f33860864edf6f15797b98b114da +DIST ppx_here-0.15.0.tar.gz 5010 BLAKE2B c04e72c8f78cc87f8edcff830c7e07094f013d887df9e87f119f9d05307d61d3dc8127c9c4dd2419f86cf20ad2387d25ce24de1b5e085c7dc10d3647f2783799 SHA512 708bd2edf9390f251e1c76e63462692c01372c7d7c7b54e45347e87ee7da999392148b61a187f2106fbc37d626663260d331982a005bd2f98f9bd6bc8f326cf5 +DIST ppx_here-0.16.0.tar.gz 5034 BLAKE2B 6bd768d87b838677e471964b290e1779da0b041f2f45f20d6fc9b77e1032dc313b49ab5faf9e613e4491b402ec0351281693dde92af342d67f286d0667ad3503 SHA512 8729ad57caaf512de4735a3017272d052f322be0847f051ab17bc687ce54f24c398dde8e6ffa10126e035750ec5268e9ce1ee678da7588b718144239fcc90bc8 diff --git a/dev-ml/ppx_here/metadata.xml b/dev-ml/ppx_here/metadata.xml index 69775f938396..439703954af6 100644 --- a/dev-ml/ppx_here/metadata.xml +++ b/dev-ml/ppx_here/metadata.xml @@ -1,9 +1,9 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">janestreet/ppx_here</remote-id> diff --git a/dev-ml/ppx_here/ppx_here-0.14.0.ebuild b/dev-ml/ppx_here/ppx_here-0.14.0.ebuild new file mode 100644 index 000000000000..f321109a54fd --- /dev/null +++ b/dev-ml/ppx_here/ppx_here-0.14.0.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Expands [%here] into its location" +HOMEPAGE="https://github.com/janestreet/ppx_here" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-ml/base-0.14.0:= + dev-ml/findlib:= + >=dev-ml/ppxlib-0.18.0:= + >=dev-ml/ocaml-compiler-libs-0.11.0:= + >=dev-ml/ocaml-migrate-parsetree-2.0.0:= + dev-ml/cinaps:= +" +RDEPEND="${DEPEND}" + +# Error: No rule found for test/dummy.ml.pp +RESTRICT=test diff --git a/dev-ml/ppx_here/ppx_here-0.15.0.ebuild b/dev-ml/ppx_here/ppx_here-0.15.0.ebuild new file mode 100644 index 000000000000..fa59222664c2 --- /dev/null +++ b/dev-ml/ppx_here/ppx_here-0.15.0.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Expands [%here] into its location" +HOMEPAGE="https://github.com/janestreet/ppx_here" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +DEPEND=" + dev-ml/base:${SLOT} + dev-ml/findlib:= + >=dev-ml/ppxlib-0.23.0:= + >=dev-ml/ocaml-compiler-libs-0.11.0:= +" +RDEPEND="${DEPEND}" + +# Error: No rule found for test/dummy.ml.pp +RESTRICT=test diff --git a/dev-ml/ppx_here/ppx_here-0.16.0.ebuild b/dev-ml/ppx_here/ppx_here-0.16.0.ebuild new file mode 100644 index 000000000000..1b59d478fa66 --- /dev/null +++ b/dev-ml/ppx_here/ppx_here-0.16.0.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Expands [%here] into its location" +HOMEPAGE="https://github.com/janestreet/ppx_here" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-lang/ocaml-4.14 + dev-ml/base:${SLOT} + dev-ml/findlib:= + >=dev-ml/ppxlib-0.28.0:= + >=dev-ml/ocaml-compiler-libs-0.11.0:= +" +RDEPEND="${DEPEND}" + +# Error: No rule found for test/dummy.ml.pp +RESTRICT=test diff --git a/dev-ml/ppx_here/ppx_here-0.9.1.ebuild b/dev-ml/ppx_here/ppx_here-0.9.1.ebuild deleted file mode 100644 index 972fc65d0d4b..000000000000 --- a/dev-ml/ppx_here/ppx_here-0.9.1.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit opam - -DESCRIPTION="Expands [%here] into its location" -HOMEPAGE="https://github.com/janestreet/ppx_here" -SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -DEPEND=" - dev-ml/ppx_core:= - dev-ml/ppx_driver:= - dev-ml/ppx_optcomp:= - dev-ml/ocaml-migrate-parsetree:= -" -RDEPEND="${DEPEND}" -DEPEND="${RDEPEND} dev-ml/jbuilder" diff --git a/dev-ml/ppx_ignore_instrumentation/Manifest b/dev-ml/ppx_ignore_instrumentation/Manifest new file mode 100644 index 000000000000..cdab4c43bae3 --- /dev/null +++ b/dev-ml/ppx_ignore_instrumentation/Manifest @@ -0,0 +1,2 @@ +DIST ppx_ignore_instrumentation-0.15.0.tar.gz 3679 BLAKE2B 3537d4336a2299e277fcf1e58690233a9e1ecd94c80d144376bef90b45b3c2c94a8eaf5e5ba2b90b12d8f4e3afc257461c4732a2fadba8aa91c7f35ff036fb0f SHA512 ec411cb7a191fcb36f9a29f8ff3839db6f4031e30fa3444896a07235950ca04562a701b3bc7bc5df95e3ff82cfe8996be75bd5dce4bcce8a491898df1bffc50d +DIST ppx_ignore_instrumentation-0.16.0.tar.gz 3712 BLAKE2B f7d4bb193fd1296b2bc9e3ea12133bd71a63dbf85dff8049f9d779db338a5725df12e005fc021584b98d0e09b2d69bf0198537ef69356a1a46eeeaee5c4b0f2e SHA512 3ec3a706b2c0d8d170860d2a6fb24f6f95dc7d1b28e88d292f536302ef005158d76e4c586721f924e3c7c5098981e3d9569e28300dabaf0348585b56c62bb245 diff --git a/dev-ml/angstrom/metadata.xml b/dev-ml/ppx_ignore_instrumentation/metadata.xml index cd1f003b6403..eac78c11ed14 100644 --- a/dev-ml/angstrom/metadata.xml +++ b/dev-ml/ppx_ignore_instrumentation/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> - <remote-id type="github">inhabitedtype/angstrom</remote-id> + <remote-id type="github">janestreet/ppx_ignore_instrumentation</remote-id> </upstream> </pkgmetadata> diff --git a/dev-ml/ppx_ignore_instrumentation/ppx_ignore_instrumentation-0.15.0-r1.ebuild b/dev-ml/ppx_ignore_instrumentation/ppx_ignore_instrumentation-0.15.0-r1.ebuild new file mode 100644 index 000000000000..37888b721950 --- /dev/null +++ b/dev-ml/ppx_ignore_instrumentation/ppx_ignore_instrumentation-0.15.0-r1.ebuild @@ -0,0 +1,19 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit dune + +DESCRIPTION="Ignore Jane Street specific instrumentation extensions" +HOMEPAGE="https://github.com/janestreet/ppx_ignore_instrumentation" +SRC_URI="https://github.com/janestreet/${PN}/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86" +IUSE="+ocamlopt" + +DEPEND=">=dev-ml/ppxlib-0.23.0:=" +RDEPEND="${DEPEND}" +BDEPEND="" diff --git a/dev-ml/ppx_ignore_instrumentation/ppx_ignore_instrumentation-0.16.0.ebuild b/dev-ml/ppx_ignore_instrumentation/ppx_ignore_instrumentation-0.16.0.ebuild new file mode 100644 index 000000000000..1242ec81c0e0 --- /dev/null +++ b/dev-ml/ppx_ignore_instrumentation/ppx_ignore_instrumentation-0.16.0.ebuild @@ -0,0 +1,19 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit dune + +DESCRIPTION="Ignore Jane Street specific instrumentation extensions" +HOMEPAGE="https://github.com/janestreet/ppx_ignore_instrumentation" +SRC_URI="https://github.com/janestreet/${PN}/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +DEPEND=">=dev-ml/ppxlib-0.28.0:=" +RDEPEND="${DEPEND}" +BDEPEND="" diff --git a/dev-ml/ppx_import/Manifest b/dev-ml/ppx_import/Manifest index d5294d386e95..a494c3c3778e 100644 --- a/dev-ml/ppx_import/Manifest +++ b/dev-ml/ppx_import/Manifest @@ -1 +1,2 @@ -DIST ppx_import-1.2.tar.gz 13244 BLAKE2B 538fd11e151d740c601ca88ff682bf4ea84ddaea3fbbc5b54d43310e59baf00ae47ef397763861da8ff1b2af017bb318ec1cd48f8708b9dc2a2c68bf812e1aea SHA512 384a8f955573c66962383f0e3609e4764cb0056e7d5b7e5811fd9fd17e17ac58baea330131b8eb688cd4202d6e6bd5829fba024524f027201244ff10c86e0f01 +DIST ppx_import-1.10.0.tar.gz 13927 BLAKE2B d036b730dd9c7b5be9fcbf175103ec6f1e2a14111575135a9cfaf935b936165418b34a4b0a37e0d112b7fbc1315526ce21a9db5bebbd99e1898c4a3c245dcf94 SHA512 7d4aeab6512014b5a16fdcc4d26ac29cc22223e18c7ab26e26f9fdd5bcd625c22aa9ff2e6c2106f45408316eaaf755437979961d97139da5973026038c210935 +DIST ppx_import-1.9.1.tar.gz 13820 BLAKE2B 295796041ecad89c95bd6a6fe14a9d9bb969f7d984388cca5181c31b8358affeb92a4d200bb9e11449a0216995a8477b809acf251b049e8331eea9e6bb918cb7 SHA512 37bd54bc477b91a3aa4b2433a9817c6d939f1e4a1d950b83b05964d22540296582cec6513a0959fd036f738dbd6ef9df13430183b8bdaa9425c7640a5fddf4b3 diff --git a/dev-ml/ppx_import/files/ppx_import-dune-ounit2.patch b/dev-ml/ppx_import/files/ppx_import-dune-ounit2.patch new file mode 100644 index 000000000000..ac164dc0d11d --- /dev/null +++ b/dev-ml/ppx_import/files/ppx_import-dune-ounit2.patch @@ -0,0 +1,9 @@ +index 3ec5810..b2d8d6d 100644 +--- a/src_test/ppx_deriving/dune ++++ b/src_test/ppx_deriving/dune +@@ -2,4 +2,4 @@ + (name test_ppx_import) + (preprocess + (staged_pps ppx_import ppx_deriving.show)) +- (libraries compiler-libs.common oUnit)) ++ (libraries compiler-libs.common ounit2)) diff --git a/dev-ml/ppx_import/metadata.xml b/dev-ml/ppx_import/metadata.xml index d0bba00f86b8..511eaa4e5798 100644 --- a/dev-ml/ppx_import/metadata.xml +++ b/dev-ml/ppx_import/metadata.xml @@ -1,11 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> + <pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">whitequark/ppx_import</remote-id> - </upstream> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <changelog>https://github.com/ocaml-ppx/ppx_import/releases/</changelog> + <bugs-to>https://github.com/ocaml-ppx/ppx_import/issues/</bugs-to> + <remote-id type="github">ocaml-ppx/ppx_import</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-ml/ppx_import/ppx_import-1.10.0.ebuild b/dev-ml/ppx_import/ppx_import-1.10.0.ebuild new file mode 100644 index 000000000000..76c36a3692e4 --- /dev/null +++ b/dev-ml/ppx_import/ppx_import-1.10.0.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="A syntax extension for importing declarations from interface files" +HOMEPAGE="https://github.com/ocaml-ppx/ppx_import/" +SRC_URI="https://github.com/ocaml-ppx/${PN}/archive/${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="amd64 x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=">=dev-ml/ppxlib-0.26:=" +DEPEND="${RDEPEND}" +BDEPEND=" + test? ( + dev-ml/ounit2 + dev-ml/ppx_deriving + dev-ml/ppx_sexp_conv + ) +" + +PATCHES=( "${FILESDIR}"/${PN}-dune-ounit2.patch ) diff --git a/dev-ml/ppx_import/ppx_import-1.2.ebuild b/dev-ml/ppx_import/ppx_import-1.2.ebuild deleted file mode 100644 index efecbd3f7200..000000000000 --- a/dev-ml/ppx_import/ppx_import-1.2.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit opam - -DESCRIPTION="A syntax extension for importing declarations from interface files" -HOMEPAGE="https://github.com/whitequark/ppx_import" -SRC_URI="https://github.com/whitequark/ppx_import/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="+ocamlopt test" - -DEPEND=" - dev-lang/ocaml:=[ocamlopt?] - dev-ml/ppx_tools:= - dev-ml/cppo:= -" -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} - test? ( dev-ml/ounit dev-ml/ppx_deriving ) - dev-ml/ocamlbuild - dev-ml/findlib -" - -src_compile() { - cp pkg/META.in pkg/META - ocaml pkg/build.ml \ - native=$(usex ocamlopt true false) \ - native-dynlink=$(usex ocamlopt true false) \ - || die -} - -src_test() { - ocamlbuild -classic-display -use-ocamlfind src_test/test_ppx_import.byte -- || die -} diff --git a/dev-ml/ppx_import/ppx_import-1.9.1-r1.ebuild b/dev-ml/ppx_import/ppx_import-1.9.1-r1.ebuild new file mode 100644 index 000000000000..c548ecf42c83 --- /dev/null +++ b/dev-ml/ppx_import/ppx_import-1.9.1-r1.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="A syntax extension for importing declarations from interface files" +HOMEPAGE="https://github.com/ocaml-ppx/ppx_import/" +SRC_URI="https://github.com/ocaml-ppx/${PN}/archive/${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-ml/ppxlib-0.24:= + <dev-ml/ppxlib-0.26 +" +DEPEND="${RDEPEND}" +BDEPEND=" + test? ( + dev-ml/ounit2 + dev-ml/ppx_deriving + dev-ml/ppx_sexp_conv + ) +" + +PATCHES=( "${FILESDIR}"/${PN}-dune-ounit2.patch ) diff --git a/dev-ml/ppx_inline_test/Manifest b/dev-ml/ppx_inline_test/Manifest index fc73d0c13867..833948c351cc 100644 --- a/dev-ml/ppx_inline_test/Manifest +++ b/dev-ml/ppx_inline_test/Manifest @@ -1 +1,3 @@ -DIST ppx_inline_test-0.9.2.tar.gz 19280 BLAKE2B 3cd354f27c69bc4fdd29b6a8b0637a08f247774127512886341ec04b8957bd2a66ed6bbfad95d1a529e4c670c815bdbfbfb80ecb9c6e02949a8d34d938d515c3 SHA512 39261a51201b2b7fbd6f4f53c72b2921da9f5a47f726479f65f976ed3979630f0a8587328f4536e42d24315d341afbe2770084ffd951569564a3145cd154be5f +DIST ppx_inline_test-0.14.1.tar.gz 19683 BLAKE2B f40e462d8eca18734883fd0b8777a9c69c0cc2741df8e95ade64685ea0b8d51dc614db6a4e93016fec0e2b521ea803a52b85d4b6e030239f6736f4f89da5a721 SHA512 24bda655ae8e1110d9550730281ab908a1795b1412545717a06e01143a80f92ba0a9d42cb20c4c9283f0725003a5c41c187bd46732ef2dd724a4714d9d41814e +DIST ppx_inline_test-0.15.0.tar.gz 20733 BLAKE2B 673cad025a01980f85444deaae7260566778b8a6a788987095da52d8cbf19179df0ac6684e7ce47e40fb2fb56567466cfb7b8d453ce890cb16e420f864eb7dab SHA512 04ea3bc4fc86881d8df50340d5684b8167063293cf0eb0b2c041a6416897d878df22422ea0b8171533dfbe741d5df53a4a9d250370e36a6c7a0a27816b9d3abe +DIST ppx_inline_test-0.16.0.tar.gz 21926 BLAKE2B 634bfb8966b73c65a609b6581fb9e2ca725d5471bbd9aa011b913e7ed9acab9a87cc1fd5d0d63f7dc691756dd958115932fe40857866f0a4a92136e282224c25 SHA512 d3004a8a37f5fc3570fd14e6f6407158996942a9ec17ef1e5b88f8985f553e4a476c2bc91b1226e5da3937e796b034b66d32934197227a35bcb03875ffc4e73e diff --git a/dev-ml/ppx_inline_test/files/ppx_inline_test-0.15.0-pr39.patch b/dev-ml/ppx_inline_test/files/ppx_inline_test-0.15.0-pr39.patch new file mode 100644 index 000000000000..39c5a9c8ca0a --- /dev/null +++ b/dev-ml/ppx_inline_test/files/ppx_inline_test-0.15.0-pr39.patch @@ -0,0 +1,23 @@ +From 99e6e5819118c3ebf06bccc879a15175b9221148 Mon Sep 17 00:00:00 2001 +From: Carl Eastlund <ceastlund@janestreet.com> +Date: Thu, 19 Jan 2023 12:25:16 -0500 +Subject: [PATCH] Stop using [Ppxlib.File_path]. + +Signed-off-by: Carl Eastlund <ceastlund@janestreet.com> +--- + src/ppx_inline_test.ml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/ppx_inline_test.ml b/src/ppx_inline_test.ml +index 7f2e854..37c9791 100644 +--- a/src/ppx_inline_test.ml ++++ b/src/ppx_inline_test.ml +@@ -82,7 +82,7 @@ let rec short_desc_of_expr ~max_len e = + ;; + + let descr ~(loc:Location.t) ?(inner_loc=loc) e_opt id_opt = +- let filename = File_path.get_default_path loc in ++ let filename = loc.loc_start.pos_fname in + let line = loc.loc_start.pos_lnum in + let start_pos = loc.loc_start.pos_cnum - loc.loc_start.pos_bol in + let end_pos = inner_loc.Location.loc_end.pos_cnum - loc.loc_start.pos_bol in diff --git a/dev-ml/ppx_inline_test/metadata.xml b/dev-ml/ppx_inline_test/metadata.xml index 94f757c17e58..c4f44d9ce5a9 100644 --- a/dev-ml/ppx_inline_test/metadata.xml +++ b/dev-ml/ppx_inline_test/metadata.xml @@ -1,9 +1,9 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">janestreet/ppx_inline_test</remote-id> diff --git a/dev-ml/ppx_inline_test/ppx_inline_test-0.14.1.ebuild b/dev-ml/ppx_inline_test/ppx_inline_test-0.14.1.ebuild new file mode 100644 index 000000000000..2a1dfb60b190 --- /dev/null +++ b/dev-ml/ppx_inline_test/ppx_inline_test-0.14.1.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Syntax extension for writing in-line tests in ocaml code" +HOMEPAGE="https://github.com/janestreet/ppx_inline_test" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-ml/base-0.14.0:= + >=dev-ml/ppxlib-0.18.0:= + >=dev-ml/ocaml-compiler-libs-0.11.0:= + >=dev-ml/ocaml-migrate-parsetree-2.0.0:= + dev-ml/cinaps:= + >=dev-ml/time_now-0.14.0:= +" +RDEPEND="${DEPEND}" +# https://bugs.gentoo.org/749291#c2 +RESTRICT=test diff --git a/dev-ml/ppx_inline_test/ppx_inline_test-0.9.2.ebuild b/dev-ml/ppx_inline_test/ppx_inline_test-0.15.0-r2.ebuild index 16f96131b7a0..7cbf8c3be2ab 100644 --- a/dev-ml/ppx_inline_test/ppx_inline_test-0.9.2.ebuild +++ b/dev-ml/ppx_inline_test/ppx_inline_test-0.15.0-r2.ebuild @@ -1,27 +1,23 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit opam +inherit dune DESCRIPTION="Syntax extension for writing in-line tests in ocaml code" HOMEPAGE="https://github.com/janestreet/ppx_inline_test" SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" DEPEND=" dev-ml/base:= - dev-ml/ppx_core:= - dev-ml/ppx_driver:= - dev-ml/ppx_metaquot:= - dev-ml/ppx_traverse_builtins:= - dev-ml/ocaml-migrate-parsetree:= + dev-ml/time_now:${SLOT} " - RDEPEND="${DEPEND}" -DEPEND="${DEPEND} dev-ml/jbuilder" +# https://bugs.gentoo.org/749291#c2 +RESTRICT=test diff --git a/dev-ml/ppx_inline_test/ppx_inline_test-0.15.0-r3.ebuild b/dev-ml/ppx_inline_test/ppx_inline_test-0.15.0-r3.ebuild new file mode 100644 index 000000000000..6a8b2a5feef6 --- /dev/null +++ b/dev-ml/ppx_inline_test/ppx_inline_test-0.15.0-r3.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Syntax extension for writing in-line tests in ocaml code" +HOMEPAGE="https://github.com/janestreet/ppx_inline_test" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +# https://bugs.gentoo.org/749291#c2 +RESTRICT="test" + +RDEPEND=" + >=dev-ml/ppxlib-0.29.0:= + dev-ml/base:= + dev-ml/time_now:${SLOT} +" +DEPEND="${RDEPEND}" + +PATCHES=( "${FILESDIR}"/${P}-pr39.patch ) diff --git a/dev-ml/ppx_inline_test/ppx_inline_test-0.16.0.ebuild b/dev-ml/ppx_inline_test/ppx_inline_test-0.16.0.ebuild new file mode 100644 index 000000000000..2a5cdd1f4511 --- /dev/null +++ b/dev-ml/ppx_inline_test/ppx_inline_test-0.16.0.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Syntax extension for writing in-line tests in ocaml code" +HOMEPAGE="https://github.com/janestreet/ppx_inline_test" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +# https://bugs.gentoo.org/749291#c2 +RESTRICT="test" + +RDEPEND=" + >=dev-lang/ocaml-4.14 + dev-ml/base:${SLOT} + >=dev-ml/ppxlib-0.28.0:= + dev-ml/time_now:${SLOT} +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/ppx_jane/Manifest b/dev-ml/ppx_jane/Manifest index a91554b21179..0ac1b11b414c 100644 --- a/dev-ml/ppx_jane/Manifest +++ b/dev-ml/ppx_jane/Manifest @@ -1 +1,3 @@ -DIST ppx_jane-0.9.0.tar.gz 5831 BLAKE2B 0eda7b2a71c7e80d7febea6f204aaf7ccebff321f14a423bfe289fd3144251aeba0c3a15db360cd0732196900cdf3eeb5860db14fd001215bdc29e6471c94c52 SHA512 18b09c060519b94013c78ef4673ec7c26f465453391c6ad2ea3235b6f8e23208879c5d4e69dc01915cfb694b23171397af5e4b7208556a369d191c081c86fc2a +DIST ppx_jane-0.14.0.tar.gz 4593 BLAKE2B 787fc0701ba0361446cb210c23469881da8fbab28460262a7bdca8723af158ed8deeb4597a31c8d89a4d44e5263c74e0ebc504b83827e0a34870a503b2ea9053 SHA512 b51bef2330ebb8d361b3f856a0526a5290664b68fa56a02de7020b0e27aaf5a378f1b22fc9a24007bfc812af67eb79343b2bdc3ca550108393323b99e29c623d +DIST ppx_jane-0.15.0.tar.gz 4647 BLAKE2B c8916e7327301a2dc54b36cc29ad61f3ef016aac2f07dd8c1421a84b144b406e9b189e229680f700efaf2138c508f30e0d132dcf726165ac60ad3120f67549d7 SHA512 e594a0caea66e0f976615b2a1db50aad89389888678d9ec7c023b2adb3211817a841a5065de9a65956bde0cb6088ce1b0b3afed6b57b618b9b50e5c07684e3fa +DIST ppx_jane-0.16.0.tar.gz 4688 BLAKE2B 46d2b4c6c7924fc6ff2bf4cae2171dd022a1ef51d8354c5393884a121cbeda001157650843c4409a22491a16445d36e374fe159cb826839e2b2a6950c0606d2c SHA512 8bb5997eb33a2f8ef7ec88d5a31c03828cc6f7070641463ad5af318b865fe8638b1affa359db07e8880364598b43ad19621882cf4c3311e38cf0638a59271652 diff --git a/dev-ml/ppx_jane/metadata.xml b/dev-ml/ppx_jane/metadata.xml index 3444626a0ff7..d40b0af012b8 100644 --- a/dev-ml/ppx_jane/metadata.xml +++ b/dev-ml/ppx_jane/metadata.xml @@ -1,9 +1,9 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">janestreet/ppx_jane</remote-id> diff --git a/dev-ml/ppx_jane/ppx_jane-0.14.0.ebuild b/dev-ml/ppx_jane/ppx_jane-0.14.0.ebuild new file mode 100644 index 000000000000..bb4eaa6be97a --- /dev/null +++ b/dev-ml/ppx_jane/ppx_jane-0.14.0.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Standard Jane Street ppx rewriters" +HOMEPAGE="https://github.com/janestreet/ppx_jane" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-ml/base_quickcheck-0.14.0:= + >=dev-ml/ppx_assert-0.14.0:= + >=dev-ml/ppx_base-0.14.0:= + >=dev-ml/ppx_bench-0.14.1:= + >=dev-ml/ppx_bin_prot-0.14.0:= + >=dev-ml/ppx_custom_printf-0.14.0:= + >=dev-ml/ppx_expect-0.14.0:= + >=dev-ml/ppx_fail-0.14.0:= + >=dev-ml/ppx_fields_conv-0.14.1:= + >=dev-ml/ppx_fixed_literal-0.14.0:= + >=dev-ml/ppx_here-0.14.0:= + >=dev-ml/ppx_inline_test-0.14.1:= + >=dev-ml/ppx_let-0.14.0:= + >=dev-ml/ppx_module_timer-0.14.0:= + >=dev-ml/ppx_optcomp-0.14.0:= + >=dev-ml/ppx_optional-0.14.0:= + >=dev-ml/ppx_pipebang-0.14.0:= + >=dev-ml/ppx_sexp_message-0.14.0:= + >=dev-ml/ppx_sexp_value-0.14.0:= + >=dev-ml/ppx_stable-0.14.1:= + >=dev-ml/ppx_string-0.14.1:= + >=dev-ml/ppx_typerep_conv-0.14.1:= + >=dev-ml/ppx_variants_conv-0.14.1:= + >=dev-ml/ppxlib-0.18.0:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_jane/ppx_jane-0.15.0.ebuild b/dev-ml/ppx_jane/ppx_jane-0.15.0.ebuild new file mode 100644 index 000000000000..d5b0685ff32e --- /dev/null +++ b/dev-ml/ppx_jane/ppx_jane-0.15.0.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Standard Jane Street ppx rewriters" +HOMEPAGE="https://github.com/janestreet/ppx_jane" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86" +IUSE="+ocamlopt" + +DEPEND=" + dev-ml/base_quickcheck:${SLOT} + dev-ml/ppx_bin_prot:${SLOT} + dev-ml/ppx_disable_unused_warnings:${SLOT} + dev-ml/ppx_expect:${SLOT} + dev-ml/ppx_fixed_literal:${SLOT} + dev-ml/ppx_ignore_instrumentation:${SLOT} + dev-ml/ppx_log:${SLOT} + dev-ml/ppx_module_timer:${SLOT} + dev-ml/ppx_optional:${SLOT} + dev-ml/ppx_pipebang:${SLOT} + dev-ml/ppx_stable:${SLOT} + dev-ml/ppx_string:${SLOT} + dev-ml/ppx_typerep_conv:${SLOT} +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_jane/ppx_jane-0.16.0-r1.ebuild b/dev-ml/ppx_jane/ppx_jane-0.16.0-r1.ebuild new file mode 100644 index 000000000000..3e5799899e73 --- /dev/null +++ b/dev-ml/ppx_jane/ppx_jane-0.16.0-r1.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Standard Jane Street ppx rewriters" +HOMEPAGE="https://github.com/janestreet/ppx_jane" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +DEPEND=" + dev-ml/base_quickcheck:${SLOT} + dev-ml/ppx_assert:${SLOT} + dev-ml/ppx_base:${SLOT} + dev-ml/ppx_bench:${SLOT} + dev-ml/ppx_bin_prot:${SLOT} + dev-ml/ppx_compare:= + dev-ml/ppx_disable_unused_warnings:${SLOT} + dev-ml/ppx_expect:${SLOT} + dev-ml/ppx_fields_conv:${SLOT} + dev-ml/ppx_fixed_literal:${SLOT} + dev-ml/ppx_ignore_instrumentation:${SLOT} + dev-ml/ppx_inline_test:${SLOT} + dev-ml/ppx_log:${SLOT} + dev-ml/ppx_module_timer:${SLOT} + dev-ml/ppx_optional:${SLOT} + dev-ml/ppx_pipebang:${SLOT} + dev-ml/ppx_stable:${SLOT} + dev-ml/ppx_string:${SLOT} + dev-ml/ppx_tydi:${SLOT} + dev-ml/ppx_typerep_conv:${SLOT} + >=dev-ml/ppxlib-0.28.0:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_jane/ppx_jane-0.9.0.ebuild b/dev-ml/ppx_jane/ppx_jane-0.9.0.ebuild deleted file mode 100644 index 4daefb2677a4..000000000000 --- a/dev-ml/ppx_jane/ppx_jane-0.9.0.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit opam - -DESCRIPTION="Standard Jane Street ppx rewriters" -HOMEPAGE="https://github.com/janestreet/ppx_jane" -SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -DEPEND=" - dev-ml/ppx_assert:= - dev-ml/ppx_base:= - dev-ml/ppx_bench:= - dev-ml/ppx_bin_prot:= - dev-ml/ppx_custom_printf:= - dev-ml/ppx_driver:= - dev-ml/ppx_expect:= - dev-ml/ppx_fail:= - dev-ml/ppx_fields_conv:= - dev-ml/ppx_here:= - dev-ml/ppx_inline_test:= - dev-ml/ppx_let:= - dev-ml/ppx_optional:= - dev-ml/ppx_pipebang:= - dev-ml/ppx_sexp_message:= - dev-ml/ppx_sexp_value:= - dev-ml/ppx_typerep_conv:= - dev-ml/ppx_type_conv:= - dev-ml/ppx_variants_conv:= - dev-ml/ocaml-migrate-parsetree:= -" -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} dev-ml/jbuilder" diff --git a/dev-ml/ppx_js_style/Manifest b/dev-ml/ppx_js_style/Manifest index e5e008e6d5cf..d5c2c21c5b45 100644 --- a/dev-ml/ppx_js_style/Manifest +++ b/dev-ml/ppx_js_style/Manifest @@ -1 +1,4 @@ -DIST ppx_js_style-0.9.0.tar.gz 8182 BLAKE2B e2c4bffb07882d49f3839b2a402e2617b9e19147a0d4ff4c7aa4fb4a350d2208eccd76ec64828c4d56edce8f811c462396aa805ca3440b93ba22790d59c8dd23 SHA512 9790223a2d8f6db090cfa4d7ff3d3d1c8a22b07863dd3c5674216836b23cfdb3b014ebc092e173ddfe725ccf73fc7830a8a88effab1df9d80875f918b9558051 +DIST ppx_js_style-0.14.0.tar.gz 10587 BLAKE2B 8219a69526be53b9fce488f725c79ff30c451c556853aa54d8dbbd7040a76df37ac8942ae05cdcbbe6d839a64d5b471f53a2fce276e547a17e68490c1ec1ab19 SHA512 3561b7668bafc421fa82c3c80e019185924bfc8cafab6ef81299395061db78261005bdd34be5bed8a80bec84306b9294e6398a3a1ee0a269f7b8f3942953a6a4 +DIST ppx_js_style-0.14.1.tar.gz 10587 BLAKE2B a77868e692180a386622fc19f696a24a9cd33863289a673d142c63003e5345a9cbe8921a7c1cf163db97f21da45c4940978f4e5d6960abc1fbc44b4283f09b42 SHA512 7c96d0e21c68956f3c94d6b6f02d70451d7e041104975171c8fb1c0f5dbcdf5b2111c5d05b247a47523abc7cf30b9d20cac267e542db459154edfe77516d2c46 +DIST ppx_js_style-0.15.0.tar.gz 10647 BLAKE2B d7cf2efa261383084a8f4bfc2508d8c345415b50e6ea83128bd40cffbcbe7eabc8fbb3037176ba73c303de199ca3cc96925e077c123a7f3a68e0a5c7470d56eb SHA512 10e4e9d737551538cdd89466acf76df04e87669f00236bc89fcad318b862efcee94f59a687d07fe5a559c00a59954b07185dd39e034d4a15869c281eea2bec4e +DIST ppx_js_style-0.16.0.tar.gz 10782 BLAKE2B f8d2cf691792240bb88094e3f3e09a82d2f947ac0fc2dafbf99351943e069cb237fcf17c45d1d097f3d78bafe4ef286acc931578180695cd7c237f4f45ddf7e8 SHA512 5a77fb8d8f7f4713a30d202d8edc16f11509cc9a6b4fb54609c774bb78f0dc1bb22d7064b5a2ea0c080aea32b626acae7a20af8e16913607c01e285134bead2d diff --git a/dev-ml/ppx_js_style/metadata.xml b/dev-ml/ppx_js_style/metadata.xml index 36b1bbb4dbed..349598017162 100644 --- a/dev-ml/ppx_js_style/metadata.xml +++ b/dev-ml/ppx_js_style/metadata.xml @@ -1,9 +1,9 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">janestreet/ppx_js_style</remote-id> diff --git a/dev-ml/ppx_js_style/ppx_js_style-0.14.0.ebuild b/dev-ml/ppx_js_style/ppx_js_style-0.14.0.ebuild new file mode 100644 index 000000000000..047ad1309189 --- /dev/null +++ b/dev-ml/ppx_js_style/ppx_js_style-0.14.0.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Code style checker for Jane Street Packages" +HOMEPAGE="https://github.com/janestreet/ppx_js_style" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt" + +DEPEND=" + <=dev-lang/ocaml-4.13 + >=dev-ml/base-0.14.0:= + dev-ml/findlib:= + dev-ml/octavius:= + >=dev-ml/ppxlib-0.18.0:= + >=dev-ml/ocaml-compiler-libs-0.11.0:= + >=dev-ml/ocaml-migrate-parsetree-2.0.0:= + dev-ml/cinaps:= + " +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_js_style/ppx_js_style-0.14.1.ebuild b/dev-ml/ppx_js_style/ppx_js_style-0.14.1.ebuild new file mode 100644 index 000000000000..b9de5166131c --- /dev/null +++ b/dev-ml/ppx_js_style/ppx_js_style-0.14.1.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Code style checker for Jane Street Packages" +HOMEPAGE="https://github.com/janestreet/ppx_js_style" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-ml/base-0.14.0:= + dev-ml/findlib:= + dev-ml/octavius:= + >=dev-ml/ppxlib-0.18.0:= + >=dev-ml/ocaml-compiler-libs-0.11.0:= + >=dev-ml/ocaml-migrate-parsetree-2.0.0:= + dev-ml/cinaps:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_js_style/ppx_js_style-0.9.0.ebuild b/dev-ml/ppx_js_style/ppx_js_style-0.15.0.ebuild index 4e4459887d20..b8c4f20ca0cc 100644 --- a/dev-ml/ppx_js_style/ppx_js_style-0.9.0.ebuild +++ b/dev-ml/ppx_js_style/ppx_js_style-0.15.0.ebuild @@ -1,25 +1,24 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit opam +inherit dune DESCRIPTION="Code style checker for Jane Street Packages" HOMEPAGE="https://github.com/janestreet/ppx_js_style" SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" DEPEND=" - dev-ml/ppx_core:= - dev-ml/ppx_driver:= - dev-ml/ppx_metaquot:= - dev-ml/ocaml-migrate-parsetree:= + dev-ml/base:${SLOT} + dev-ml/findlib:= dev-ml/octavius:= - " + >=dev-ml/ppxlib-0.23.0:= + >=dev-ml/ocaml-compiler-libs-0.11.0:= +" RDEPEND="${DEPEND}" -DEPEND="${DEPEND} dev-ml/jbuilder" diff --git a/dev-ml/ppx_js_style/ppx_js_style-0.16.0.ebuild b/dev-ml/ppx_js_style/ppx_js_style-0.16.0.ebuild new file mode 100644 index 000000000000..cde70552f4a2 --- /dev/null +++ b/dev-ml/ppx_js_style/ppx_js_style-0.16.0.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Code style checker for Jane Street Packages" +HOMEPAGE="https://github.com/janestreet/ppx_js_style" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-lang/ocaml-4.14 + dev-ml/base:${SLOT} + dev-ml/findlib:= + dev-ml/octavius:= + >=dev-ml/ppxlib-0.28.0:= + >=dev-ml/ocaml-compiler-libs-0.11.0:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_let/Manifest b/dev-ml/ppx_let/Manifest index b18963fb4dc3..e1eceb368892 100644 --- a/dev-ml/ppx_let/Manifest +++ b/dev-ml/ppx_let/Manifest @@ -1 +1,3 @@ -DIST ppx_let-0.9.0.tar.gz 9245 BLAKE2B 827efa86db6981416c07205bf520d750dea6b6a2f1789faaeb59fcc7ddff78470e9670c471c5c3e5b6929181149404b86e3bbe6e67ffa2946895a7d464079316 SHA512 545cdf341dafaab958e1dfec476f3a714ae5899dea3775ace443e36fe4d55136489ae376f2394dbecdcbcb4dbc66e41a1de147b2774c9a0c7508b827acba4250 +DIST ppx_let-0.14.0.tar.gz 10822 BLAKE2B c1dc155afb0bc52bb22d65c2c19536d41d53e4cf10d39b70ebadf1cf8cfb37ff1c25d9fcfb48f9421a0c55887acc2c6ce72d531593a61654146d3196fa83499d SHA512 79f2dcf2c76308b5993d1b9dad5c961b816dcc4ae43d856c51c196a67eb21b2f51135762e52d512afa9b45aca30002abbca76036ebcc117464a4823d1c40ed0c +DIST ppx_let-0.15.0.tar.gz 17400 BLAKE2B 3276944addb1dd01c1f461512452ee2bf32fee0cfc3b3772aa7da2a427786a100b36678539fc7fb2beb98ad0bac3b82071b8ebe5d4e5374c5b8bc57a239488ca SHA512 5a22117407c93755df5fe55feded9d7061a8bf953aecc83d2e04de648aff973b1c380b44a26fa68888e90e7486b91a1c665c033c01e2af456a7de3b0b63775d3 +DIST ppx_let-0.16.0.tar.gz 15460 BLAKE2B 8cc4adb4fae276a11df36d91690ae9fa609ac923b971afe783102fc854f212dce58826d1e743e2e2a349c278ca103e80cbb203fa18dbea21adb7c6849b0c8132 SHA512 d81c98f4f87c2af2f8121ce42bd5de8910ff4d588eb1bc3a18a9594c070f261b7c7a173bb86a5fbcd67d09ad8ba436df9a210577ac05c6a98625a0bc553fb4ad diff --git a/dev-ml/ppx_let/metadata.xml b/dev-ml/ppx_let/metadata.xml index 8f6a83e43446..b6cf0be52d71 100644 --- a/dev-ml/ppx_let/metadata.xml +++ b/dev-ml/ppx_let/metadata.xml @@ -1,9 +1,9 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">janestreet/ppx_let</remote-id> diff --git a/dev-ml/ppx_let/ppx_let-0.14.0.ebuild b/dev-ml/ppx_let/ppx_let-0.14.0.ebuild new file mode 100644 index 000000000000..c3c9d816b27b --- /dev/null +++ b/dev-ml/ppx_let/ppx_let-0.14.0.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Monadic let-bindings" +HOMEPAGE="https://github.com/janestreet/ppx_let" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-ml/base-0.14.0:= + dev-ml/findlib:= + >=dev-ml/ppxlib-0.18.0:= + >=dev-ml/ocaml-compiler-libs-0.11.0:= + >=dev-ml/ocaml-migrate-parsetree-2.0.0:= + dev-ml/cinaps:= + dev-ml/sexplib0:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_let/ppx_let-0.9.0.ebuild b/dev-ml/ppx_let/ppx_let-0.15.0.ebuild index 9dc54d315fe3..fb6a121826bb 100644 --- a/dev-ml/ppx_let/ppx_let-0.9.0.ebuild +++ b/dev-ml/ppx_let/ppx_let-0.15.0.ebuild @@ -1,23 +1,24 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit opam +inherit dune DESCRIPTION="Monadic let-bindings" HOMEPAGE="https://github.com/janestreet/ppx_let" SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" DEPEND=" - dev-ml/ppx_core:= - dev-ml/ppx_driver:= - dev-ml/ocaml-migrate-parsetree:= + dev-ml/base:${SLOT} + dev-ml/findlib:= + >=dev-ml/ppxlib-0.23.0:= + >=dev-ml/ocaml-compiler-libs-0.11.0:= + dev-ml/ppx_here:= " RDEPEND="${DEPEND}" -DEPEND="${DEPEND} dev-ml/jbuilder" diff --git a/dev-ml/ppx_let/ppx_let-0.16.0.ebuild b/dev-ml/ppx_let/ppx_let-0.16.0.ebuild new file mode 100644 index 000000000000..d81a90d46db1 --- /dev/null +++ b/dev-ml/ppx_let/ppx_let-0.16.0.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Monadic let-bindings" +HOMEPAGE="https://github.com/janestreet/ppx_let" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +DEPEND=" + dev-ml/base:${SLOT} + dev-ml/findlib:= + >=dev-ml/ppxlib-0.28.0:= + >=dev-ml/ocaml-compiler-libs-0.11.0:= + dev-ml/ppx_here:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_log/Manifest b/dev-ml/ppx_log/Manifest new file mode 100644 index 000000000000..89a888ed1ea6 --- /dev/null +++ b/dev-ml/ppx_log/Manifest @@ -0,0 +1,2 @@ +DIST ppx_log-0.15.0.tar.gz 6672 BLAKE2B 3b45e705dfe6256d95e52b3fb1b1f98599d48fba6d4c565df95319566d5ab62965182d265db68a9b2f0b7e32103861639ff9ca46e1980e93e63abdeae83e79cd SHA512 1585f82615def2fc1c94853e9a1b9e3ebd2ef8193067f229f24580ea124c06736a2b361377801b9a44b7347e1938da051ed652764142e2270de3d3e8f375bf46 +DIST ppx_log-0.16.0.tar.gz 6706 BLAKE2B 7da65372fb1ad0f25023f1236634a1cb790f8ab3098a250ea1fac6056213973b02efac54c659c5dc950b2daf64673b761f6af91976bee3781f18f8e62c7c8d3f SHA512 6560720e4c329d8859850f06aa9c80f9446f361221ce57223ee2872944928079898bb644bf762d4907673368a18857390346a94d450ba4d2787abac77dea9e87 diff --git a/dev-ml/ppx_log/metadata.xml b/dev-ml/ppx_log/metadata.xml new file mode 100644 index 000000000000..0a492ea7ad77 --- /dev/null +++ b/dev-ml/ppx_log/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">janestreet/ppx_log</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/ppx_log/ppx_log-0.15.0-r1.ebuild b/dev-ml/ppx_log/ppx_log-0.15.0-r1.ebuild new file mode 100644 index 000000000000..99e95be3b66d --- /dev/null +++ b/dev-ml/ppx_log/ppx_log-0.15.0-r1.ebuild @@ -0,0 +1,23 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit dune + +DESCRIPTION="Lazily rendering log messages" +HOMEPAGE="https://github.com/janestreet/ppx_log" +SRC_URI="https://github.com/janestreet/${PN}/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86" +IUSE="+ocamlopt" + +DEPEND=" + dev-ml/ppx_sexp_message:${SLOT} + dev-ml/sexplib:${SLOT} + >=dev-ml/ppxlib-0.23.0:= +" +RDEPEND="${DEPEND}" +BDEPEND="" diff --git a/dev-ml/ppx_log/ppx_log-0.16.0.ebuild b/dev-ml/ppx_log/ppx_log-0.16.0.ebuild new file mode 100644 index 000000000000..68dfc4d4bf87 --- /dev/null +++ b/dev-ml/ppx_log/ppx_log-0.16.0.ebuild @@ -0,0 +1,25 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit dune + +DESCRIPTION="Lazily rendering log messages" +HOMEPAGE="https://github.com/janestreet/ppx_log" +SRC_URI="https://github.com/janestreet/${PN}/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-lang/ocaml-4.14 + dev-ml/base:${SLOT} + dev-ml/ppx_sexp_message:${SLOT} + dev-ml/sexplib:${SLOT} + >=dev-ml/ppxlib-0.28.0:= +" +RDEPEND="${DEPEND}" +BDEPEND="" diff --git a/dev-ml/ppx_metaquot/Manifest b/dev-ml/ppx_metaquot/Manifest deleted file mode 100644 index 7ec64ce0eca4..000000000000 --- a/dev-ml/ppx_metaquot/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ppx_metaquot-0.9.0.tar.gz 6801 BLAKE2B b5629da4c2460ed064e614e0051bd104fd731526498ffd085a75039672c186f314918c4c355a9dacfee7982c06b338950de0a670b27bd061e19b688a21693c08 SHA512 7645f02f964f2a33836f947a725384f95c7724dcd88c031aa3dd2d255127a21d473e19ff77cb917f845930ab44541a4698becf56721cc1a0a0eee5912947cd22 diff --git a/dev-ml/ppx_metaquot/metadata.xml b/dev-ml/ppx_metaquot/metadata.xml deleted file mode 100644 index a5d8e36c3aa4..000000000000 --- a/dev-ml/ppx_metaquot/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">janestreet/ppx_metaquot</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/ppx_metaquot/ppx_metaquot-0.9.0.ebuild b/dev-ml/ppx_metaquot/ppx_metaquot-0.9.0.ebuild deleted file mode 100644 index 2cf71db77f80..000000000000 --- a/dev-ml/ppx_metaquot/ppx_metaquot-0.9.0.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit opam - -DESCRIPTION="Write OCaml AST fragment using OCaml syntax" -HOMEPAGE="https://github.com/janestreet/ppx_metaquot" -SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" - -DEPEND=" - dev-ml/ppx_core:= - dev-ml/ppx_driver:= - dev-ml/ppx_traverse_builtins:= - dev-ml/ocaml-migrate-parsetree:= - <dev-ml/ppx_core-100 - " -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} dev-ml/jbuilder" diff --git a/dev-ml/ppx_module_timer/Manifest b/dev-ml/ppx_module_timer/Manifest new file mode 100644 index 000000000000..7c29815a6e51 --- /dev/null +++ b/dev-ml/ppx_module_timer/Manifest @@ -0,0 +1,3 @@ +DIST ppx_module_timer-0.14.0.tar.gz 7262 BLAKE2B 6fafc6b4b449071f4a95619d078814b0c3ace3574df46585b72549e5db349ab476124c217f46c6903c7c8a059f779dc62cc8a079eb1ef6b4854646fdabdf04bf SHA512 cd9b6bbd6461b7408a31a0f6ca010a3c755db1f4a22150645c530e7b4a0a4c76a308ad0f8aeddc54914a116f6d74bd738604cfd9d9d255197f9ea18904d715e7 +DIST ppx_module_timer-0.15.0.tar.gz 7242 BLAKE2B 66c2bfbfcfc594ab568dd30cf874fea213fe8d72f23dbd9b56957ba95a8a01bcb8cb8f98ea42b399bad3afdba1c14edb5087a95720c87e22c865538166af4cf6 SHA512 4cd55dce6872cbed1d34c34043500651e605c406747914173584cee1d8f3ff298a75efeb8a4beb7840df76b5d7c7db98d15399d3c4a3a5dca2a11d57339df6de +DIST ppx_module_timer-0.16.0.tar.gz 7281 BLAKE2B 3be0d87198cb15c7a95b8b72648a8e986c6ef83dd173538931f8fc9426bc6bf384c76f62dea7440d637caa40548e19832da07c32528c46c3eca10d354a0a98a7 SHA512 6125aec05e91bb11d1b41fc4fb9a1030561403c7f27ea9d9512a6050da4cfdc796cfe3acb1d96e5333f65b6beab6f5b16b044529ccc6e99e90c019923adf85d9 diff --git a/dev-ml/ppx_module_timer/metadata.xml b/dev-ml/ppx_module_timer/metadata.xml new file mode 100644 index 000000000000..f0418bcac10b --- /dev/null +++ b/dev-ml/ppx_module_timer/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">janestreet/ppx_module_timer</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/ppx_module_timer/ppx_module_timer-0.14.0.ebuild b/dev-ml/ppx_module_timer/ppx_module_timer-0.14.0.ebuild new file mode 100644 index 000000000000..d88e7dcaf0f2 --- /dev/null +++ b/dev-ml/ppx_module_timer/ppx_module_timer-0.14.0.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Ppx rewriter that records top-level module startup times" +HOMEPAGE="https://github.com/janestreet/ppx_module_timer" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-ml/base-0.14.0:= + >=dev-ml/ppx_base-0.14.0:= + >=dev-ml/stdio-0.14.0:= + >=dev-ml/time_now-0.14.0:= + >=dev-ml/ppxlib-0.18.0:= + >=dev-ml/ocaml-compiler-libs-0.11.0:= + >=dev-ml/ocaml-migrate-parsetree-2.0.0:= + dev-ml/cinaps:= + dev-ml/sexplib0:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_module_timer/ppx_module_timer-0.15.0-r1.ebuild b/dev-ml/ppx_module_timer/ppx_module_timer-0.15.0-r1.ebuild new file mode 100644 index 000000000000..583e93b626c6 --- /dev/null +++ b/dev-ml/ppx_module_timer/ppx_module_timer-0.15.0-r1.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Ppx rewriter that records top-level module startup times" +HOMEPAGE="https://github.com/janestreet/ppx_module_timer" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +DEPEND=" + dev-ml/time_now:${SLOT} + >=dev-ml/ppxlib-0.23.0:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_module_timer/ppx_module_timer-0.16.0.ebuild b/dev-ml/ppx_module_timer/ppx_module_timer-0.16.0.ebuild new file mode 100644 index 000000000000..689ef33b1ce5 --- /dev/null +++ b/dev-ml/ppx_module_timer/ppx_module_timer-0.16.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Ppx rewriter that records top-level module startup times" +HOMEPAGE="https://github.com/janestreet/ppx_module_timer" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-lang/ocaml-4.14 + dev-ml/time_now:${SLOT} + >=dev-ml/ppxlib-0.28.0:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_optcomp/Manifest b/dev-ml/ppx_optcomp/Manifest index 97571ab30d40..d5b4b8e71731 100644 --- a/dev-ml/ppx_optcomp/Manifest +++ b/dev-ml/ppx_optcomp/Manifest @@ -1 +1,4 @@ -DIST ppx_optcomp-0.9.0.tar.gz 14611 BLAKE2B 6fc431fd3ed173835a48814718a05b3ae619f182f4c008415dba77c88bfeab780e6fc49c4faed2ee4e362b6a151544b1a707651dcbfdbfcdce979a2a3d6d6c02 SHA512 ce4a5049045458533b783b99b7569e72e074bd425a81315d43fcab26dbc2a4b141cfda2b2365c69b3d0251f2bf0b8c8f0d14fc8883f1a0f4edae824776565a9c +DIST ppx_optcomp-0.14.0.tar.gz 16583 BLAKE2B 9b139708e02501245d5440a862324fe0191c9c96772e6599ed474a734263c4d2c0fa08fff666abd2efb218ec03a2b9b47c5ef6480d53a8d0f280550b741ac39a SHA512 e86b108d805500cbd7be628f41436ec8de0e8622d4218631d01bf73b0e70da0a057b8531465206baa9b8851ce9c22c5cd53921fccfae352ee46527d69964dc44 +DIST ppx_optcomp-0.14.3.tar.gz 16749 BLAKE2B 3c6dd2b5ac0a10e3d95c6a734ee09b0bef8af6d949c9f31150f1f8ac14ec72bb06455c3bf0c025bc99b939fa86b0d730abd8aefcdbd3998bfc16eef7a6a766bd SHA512 73b53dece639aebe20a8c9eaec50f6f491ac8163d96ceab66169d99f9bb50ed9c40c38731cd6e8543dae97c3a45650733d622e5bd4a2db812000c4694c823157 +DIST ppx_optcomp-0.15.0.tar.gz 16699 BLAKE2B b13f9aa50bd46a9ea552677b0c9bc611b6657e6ba7cff1e06d6489d2ffaa646bc3643eee08dbe07f52130ea27b3e607bbf620b0a94f8acdaf7bd045ab1a1c536 SHA512 302c2ab79c46a16b8a256167958ad9a87b34a2e7ddc70c7a5476cfb0feffc7de7bebc79c272526698e87804859555176facfb04bc72f3b4373c1cb138b1264c7 +DIST ppx_optcomp-0.16.0.tar.gz 16789 BLAKE2B 102c9daa01a9fbda926d0ce11546bb7a5a9520f00a57e504e88da383ed793498f23bd6de672f55116d2844a9e474d9a0c3471e7438e91c7019d6384acb40252d SHA512 8a10136a16423723a8cd1414ebad2c2029e8d28c563ce884eaceb85a363df7f019a08cee6194f7dbbc0290666909dbd9557d2900a8ce055ac57069364c785806 diff --git a/dev-ml/ppx_optcomp/files/ppx_optcomp-0.14.0-ppxlib-0.18.0.patch b/dev-ml/ppx_optcomp/files/ppx_optcomp-0.14.0-ppxlib-0.18.0.patch new file mode 100644 index 000000000000..063b9df74aba --- /dev/null +++ b/dev-ml/ppx_optcomp/files/ppx_optcomp-0.14.0-ppxlib-0.18.0.patch @@ -0,0 +1,63 @@ +commit a4422ecd7e0677569533b1dae07924f5d786e8f6 (HEAD, origin/upgrade-ppxlib-0.18.0) +Author: Nathan Rebours <nathan.p.rebours@gmail.com> +Date: Mon Oct 5 18:35:26 2020 +0200 + + Make ppx_optcomp compatible with ppxlib.0.18.0 + + ppxlib.0.18.0 upgrades to the 4.11 AST which results in a change + in string constants representation. This PR makes ppx_optcomp + compatible with the latest ppxlib. + + You might want for the actual release of ppxlib.0.18.0 before merging + this! + + Signed-off-by: Nathan Rebours <nathan.p.rebours@gmail.com> + +diff --git a/ppx_optcomp.opam b/ppx_optcomp.opam +index 20eb7c5..cbe8b5c 100644 +--- a/ppx_optcomp.opam ++++ b/ppx_optcomp.opam +@@ -15,7 +15,7 @@ depends: [ + "base" {>= "v0.14" & < "v0.15"} + "stdio" {>= "v0.14" & < "v0.15"} + "dune" {>= "2.0.0"} +- "ppxlib" {>= "0.11.0"} ++ "ppxlib" {>= "0.18.0"} + ] + synopsis: "Optional compilation for OCaml" + description: " +diff --git a/src/interpreter.ml b/src/interpreter.ml +index f1da14b..1c6d726 100644 +--- a/src/interpreter.ml ++++ b/src/interpreter.ml +@@ -241,7 +241,7 @@ let rec eval env e : Value.t = + match e.pexp_desc with + | Pexp_constant (Pconst_integer (x, None)) -> Int (parse_int loc x) + | Pexp_constant (Pconst_char x ) -> Char x +- | Pexp_constant (Pconst_string (x, _ )) -> String x ++ | Pexp_constant (Pconst_string (x, _, _ )) -> String x + + | Pexp_construct ({ txt = Lident "true" ; _ }, None) -> Bool true + | Pexp_construct ({ txt = Lident "false"; _ }, None) -> Bool false +@@ -361,7 +361,7 @@ and bind env patt value = + + | Ppat_constant (Pconst_integer (x, None)), Int y when parse_int loc x = y -> env + | Ppat_constant (Pconst_char x ), Char y when Char.equal x y -> env +- | Ppat_constant (Pconst_string (x, _ )), String y when String.equal x y -> env ++ | Ppat_constant (Pconst_string (x, _, _ )), String y when String.equal x y -> env + + | Ppat_construct ({ txt = Lident "true" ; _ }, None), Bool true -> env + | Ppat_construct ({ txt = Lident "false"; _ }, None), Bool false -> env +diff --git a/src/ppx_optcomp.ml b/src/ppx_optcomp.ml +index a2573de..d87ea24 100644 +--- a/src/ppx_optcomp.ml ++++ b/src/ppx_optcomp.ml +@@ -81,7 +81,7 @@ module Ast_utils = struct + let get_string ~loc payload = + let e = get_expr ~loc payload in + match e with +- | { pexp_desc = Pexp_constant (Pconst_string (x, _ )); _ } -> x ++ | { pexp_desc = Pexp_constant (Pconst_string (x, _, _ )); _ } -> x + | _ -> Location.raise_errorf ~loc "optcomp: invalid directive syntax, expected string" + + end diff --git a/dev-ml/ppx_optcomp/metadata.xml b/dev-ml/ppx_optcomp/metadata.xml index 0567d88d5830..75f14f6aa98c 100644 --- a/dev-ml/ppx_optcomp/metadata.xml +++ b/dev-ml/ppx_optcomp/metadata.xml @@ -1,9 +1,9 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">janestreet/ppx_optcomp</remote-id> diff --git a/dev-ml/ppx_optcomp/ppx_optcomp-0.14.0.ebuild b/dev-ml/ppx_optcomp/ppx_optcomp-0.14.0.ebuild new file mode 100644 index 000000000000..bf518b73969e --- /dev/null +++ b/dev-ml/ppx_optcomp/ppx_optcomp-0.14.0.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Optional compilation for OCaml" +HOMEPAGE="https://github.com/janestreet/ppx_optcomp" +SRC_URI="https://github.com/janestreet/ppx_optcomp/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-ml/base-0.14.0:= + dev-ml/findlib:= + >=dev-ml/stdio-0.14.0:= + >=dev-ml/ppxlib-0.18.0:= + >=dev-ml/ocaml-compiler-libs-0.11.0:= + >=dev-ml/ocaml-migrate-parsetree-2.0.0:= + dev-ml/cinaps:= +" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}"/${P}-ppxlib-0.18.0.patch ) diff --git a/dev-ml/ppx_optcomp/ppx_optcomp-0.14.3.ebuild b/dev-ml/ppx_optcomp/ppx_optcomp-0.14.3.ebuild new file mode 100644 index 000000000000..860bca9aecac --- /dev/null +++ b/dev-ml/ppx_optcomp/ppx_optcomp-0.14.3.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Optional compilation for OCaml" +HOMEPAGE="https://github.com/janestreet/ppx_optcomp" +SRC_URI="https://github.com/janestreet/ppx_optcomp/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-ml/base-0.14.0:= + dev-ml/findlib:= + >=dev-ml/stdio-0.14.0:= + >=dev-ml/ppxlib-0.18.0:= + >=dev-ml/ocaml-compiler-libs-0.11.0:= + >=dev-ml/ocaml-migrate-parsetree-2.0.0:= + dev-ml/cinaps:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_optcomp/ppx_optcomp-0.9.0-r3.ebuild b/dev-ml/ppx_optcomp/ppx_optcomp-0.15.0.ebuild index 698b92bbb14c..60048047c756 100644 --- a/dev-ml/ppx_optcomp/ppx_optcomp-0.9.0-r3.ebuild +++ b/dev-ml/ppx_optcomp/ppx_optcomp-0.15.0.ebuild @@ -1,23 +1,24 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit opam +inherit dune DESCRIPTION="Optional compilation for OCaml" HOMEPAGE="https://github.com/janestreet/ppx_optcomp" SRC_URI="https://github.com/janestreet/ppx_optcomp/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" DEPEND=" - dev-ml/ppx_core:= - dev-ml/stdio:= - dev-ml/ocaml-migrate-parsetree:= + dev-ml/base:${SLOT} + dev-ml/findlib:= + dev-ml/stdio:${SLOT} + >=dev-ml/ppxlib-0.23.0:= + >=dev-ml/ocaml-compiler-libs-0.11.0:= " RDEPEND="${DEPEND}" -DEPEND="${DEPEND} dev-ml/jbuilder" diff --git a/dev-ml/ppx_optcomp/ppx_optcomp-0.16.0.ebuild b/dev-ml/ppx_optcomp/ppx_optcomp-0.16.0.ebuild new file mode 100644 index 000000000000..dc80a49fa3c3 --- /dev/null +++ b/dev-ml/ppx_optcomp/ppx_optcomp-0.16.0.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Optional compilation for OCaml" +HOMEPAGE="https://github.com/janestreet/ppx_optcomp" +SRC_URI="https://github.com/janestreet/ppx_optcomp/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +DEPEND=" + dev-ml/base:${SLOT} + dev-ml/findlib:= + dev-ml/stdio:${SLOT} + >=dev-ml/ppxlib-0.28.0:= + >=dev-ml/ocaml-compiler-libs-0.11.0:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_optional/Manifest b/dev-ml/ppx_optional/Manifest index ce42d2ddd1cb..7ad5e9f1b091 100644 --- a/dev-ml/ppx_optional/Manifest +++ b/dev-ml/ppx_optional/Manifest @@ -1 +1,3 @@ -DIST ppx_optional-0.9.0.tar.gz 6940 BLAKE2B 28b9ab2b8cc20f295e927533ff9eed694289987914105758d3c014d06064bd21016d44bc7ad72b331a4c887848ed9c2dd75a0a48b6d5f330de898087596d1cc3 SHA512 c341bc8e64b7caf7af5c878747697330db84b14959f22930dd6919cc861dce847983771cbad2ed7800ab8c64704e88fa0d8db3ca7c8f2924bf785a4dccd17fa0 +DIST ppx_optional-0.14.0.tar.gz 6090 BLAKE2B 99c5ed7ab6b6c555477eaf468786cc175ff8c8ac4d0c6abb8110637da57396ed599d5c10bd35f3d5ff27a41b00314ca355596e4158c4d792fcb37d547455b90d SHA512 70ed28a974ea1bbcb3fe2e54911e355da54fafd6dff3e74c471126a824c28e9a180777e96e17c4a7a52be4be507fbbc0fa3e92310346dbaf5ab8711845e92e40 +DIST ppx_optional-0.15.0.tar.gz 6090 BLAKE2B 89752ec6175f0334b922689b2f1b47ee078be0eb5f0432b9de18ac966a6e75e4bb36e4f5f4ab4e7be669de5805f2db8e35cf723cbc22e724451d748bf5437553 SHA512 a2cd8390877c9ec256523c796995a5ade2f97f396afe86493ac46ca1bd1fe15264423986f5a27d5b88908b92673305405e508e744335205ff17f6c2b7d7d0809 +DIST ppx_optional-0.16.0.tar.gz 8333 BLAKE2B 1e977c8c06a9db1247d17a4795d7cd849ca6280b2a2367de3ffe7071f18a88d2e0afc1dbbed3e8b1a01b454623e730d2b7b8e4d378ed0e55df016ecc36c8a4cc SHA512 07e812d46aef13e835dfc31e4eab17c656ad98e85843337d8f9361038c78bbcfceedaa64774784ffd84cb11e58c142e6c9bfab6d6c31eddf86b0e860f9a315a5 diff --git a/dev-ml/ppx_optional/metadata.xml b/dev-ml/ppx_optional/metadata.xml index 548e15439c5d..b17c6ce70cea 100644 --- a/dev-ml/ppx_optional/metadata.xml +++ b/dev-ml/ppx_optional/metadata.xml @@ -1,9 +1,9 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">janestreet/ppx_optional</remote-id> diff --git a/dev-ml/ppx_optional/ppx_optional-0.9.0.ebuild b/dev-ml/ppx_optional/ppx_optional-0.14.0.ebuild index 55a77ef14936..fde2b028fbcc 100644 --- a/dev-ml/ppx_optional/ppx_optional-0.9.0.ebuild +++ b/dev-ml/ppx_optional/ppx_optional-0.14.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit opam +inherit dune DESCRIPTION="Pattern matching on flat options" HOMEPAGE="https://github.com/janestreet/ppx_optional" @@ -11,14 +11,14 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g LICENSE="Apache-2.0" SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" DEPEND=" - dev-ml/ppx_core:= - dev-ml/ppx_driver:= - dev-ml/ppx_metaquot:= + dev-ml/base:= + dev-ml/ppxlib:= dev-ml/ocaml-migrate-parsetree:= + dev-ml/result:= + dev-ml/sexplib0:= " RDEPEND="${DEPEND}" -DEPEND="${DEPEND} dev-ml/jbuilder" diff --git a/dev-ml/ppx_optional/ppx_optional-0.15.0.ebuild b/dev-ml/ppx_optional/ppx_optional-0.15.0.ebuild new file mode 100644 index 000000000000..45a5263c405e --- /dev/null +++ b/dev-ml/ppx_optional/ppx_optional-0.15.0.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Pattern matching on flat options" +HOMEPAGE="https://github.com/janestreet/ppx_optional" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +DEPEND=" + dev-ml/base:${SLOT} + >=dev-ml/ppxlib-0.23.0:= + dev-ml/result:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_optional/ppx_optional-0.16.0.ebuild b/dev-ml/ppx_optional/ppx_optional-0.16.0.ebuild new file mode 100644 index 000000000000..6ee953269bce --- /dev/null +++ b/dev-ml/ppx_optional/ppx_optional-0.16.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Pattern matching on flat options" +HOMEPAGE="https://github.com/janestreet/ppx_optional" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-lang/ocaml-4.14 + dev-ml/base:${SLOT} + >=dev-ml/ppxlib-0.28.0:= + dev-ml/result:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_pipebang/Manifest b/dev-ml/ppx_pipebang/Manifest index b1978f4cad5f..3da78098e74a 100644 --- a/dev-ml/ppx_pipebang/Manifest +++ b/dev-ml/ppx_pipebang/Manifest @@ -1 +1,3 @@ -DIST ppx_pipebang-0.9.0.tar.gz 5964 BLAKE2B ce001d207a59b1e99f7a023c2823d1b90233762147ad377aa54f7c771041e77081f7f9b05a0f36cb9a2f6379622a9686fa5bad8974d7707dc0b22b3c704edac6 SHA512 d0e82152d257f7214e577e37046877a9c4129c6a9fd79f83912c6335455add4302d927e70117a1e9386c448686d271a7596b3fd2ef0b5f2bda8010cbb9157751 +DIST ppx_pipebang-0.14.0.tar.gz 3766 BLAKE2B a2e99dd5e27ddbca5d77b1c215757d8d0d2d54b53511f0db93a09a16c25b5c5e429a08c8d42c7e4843eeb23c346649dea5700c445afe176f4b1625340901b6c1 SHA512 b07004aef0865c877f8f814068b514298568078785586933f400350d1a1dae3eb4aafe1ba4f12e17a3e2a3945297162c4a725ebfbc153e80b412c6086019959a +DIST ppx_pipebang-0.15.0.tar.gz 3759 BLAKE2B 6d2a45a4b803a777dcf055acccbea3e54a86458d01032efd01d204cf3426b496b9d91047216c11a424ef5e7ff92fc729d1ef8fb616f807c21f512be52013665a SHA512 778dae2cd6176f9ce18f20486e16f6f76e9137095759b29ddc10fee15d8a21f51fff94245c4a750ae68cd75edbd06b9cad6ff1b56aacb38ac9e6d7d71c0bf701 +DIST ppx_pipebang-0.16.0.tar.gz 3755 BLAKE2B 2aa33958dd9b6abdaed4d38c7d627fa3cd1b0328bc01fc3eb8761ef9d60f9ba26b8be17975712d91c177fcf8c20e17da69c49ff676b2946a783e3674e30597c1 SHA512 b333d189c2705b3c7175af5636bd63c38ed434b3828227c7db8d2cb0fe9bd4caa05975d5d28d8fb4d61656bd3d7a15e2db2b36a1672107c1557c5012c19cb445 diff --git a/dev-ml/ppx_pipebang/metadata.xml b/dev-ml/ppx_pipebang/metadata.xml index 79ec5fb425af..406d75e343ac 100644 --- a/dev-ml/ppx_pipebang/metadata.xml +++ b/dev-ml/ppx_pipebang/metadata.xml @@ -1,9 +1,9 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">janestreet/ppx_pipebang</remote-id> diff --git a/dev-ml/ppx_pipebang/ppx_pipebang-0.14.0.ebuild b/dev-ml/ppx_pipebang/ppx_pipebang-0.14.0.ebuild new file mode 100644 index 000000000000..aeeb5cfc1e7d --- /dev/null +++ b/dev-ml/ppx_pipebang/ppx_pipebang-0.14.0.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="A ppx rewriter that inlines reverse application operators |> and |!" +HOMEPAGE="https://github.com/janestreet/ppx_pipebang" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-ml/ppxlib-0.18.0:= + >=dev-ml/ocaml-compiler-libs-0.11.0:= + >=dev-ml/ocaml-migrate-parsetree-2.0.0:= + dev-ml/cinaps:= + dev-ml/sexplib0:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_pipebang/ppx_pipebang-0.9.0.ebuild b/dev-ml/ppx_pipebang/ppx_pipebang-0.15.0-r1.ebuild index bb9d37ac7a3a..89b249c04a20 100644 --- a/dev-ml/ppx_pipebang/ppx_pipebang-0.9.0.ebuild +++ b/dev-ml/ppx_pipebang/ppx_pipebang-0.15.0-r1.ebuild @@ -1,24 +1,22 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit opam +inherit dune DESCRIPTION="A ppx rewriter that inlines reverse application operators |> and |!" HOMEPAGE="https://github.com/janestreet/ppx_pipebang" SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" DEPEND=" - dev-ml/ppx_core:= - dev-ml/ppx_driver:= - dev-ml/ppx_metaquot:= - dev-ml/ocaml-migrate-parsetree:= + >=dev-lang/ocaml-4.08 + >=dev-ml/ppxlib-0.23.0:= + >=dev-ml/ocaml-compiler-libs-0.11.0:= " RDEPEND="${DEPEND}" -DEPEND="${DEPEND} dev-ml/jbuilder" diff --git a/dev-ml/ppx_pipebang/ppx_pipebang-0.16.0.ebuild b/dev-ml/ppx_pipebang/ppx_pipebang-0.16.0.ebuild new file mode 100644 index 000000000000..8f9642ec2657 --- /dev/null +++ b/dev-ml/ppx_pipebang/ppx_pipebang-0.16.0.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="A ppx rewriter that inlines reverse application operators |> and |!" +HOMEPAGE="https://github.com/janestreet/ppx_pipebang" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-lang/ocaml-4.14 + >=dev-ml/ppxlib-0.28.0:= + >=dev-ml/ocaml-compiler-libs-0.11.0:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_sexp_conv/Manifest b/dev-ml/ppx_sexp_conv/Manifest index c2d417ec8f51..5a2f9fa9a240 100644 --- a/dev-ml/ppx_sexp_conv/Manifest +++ b/dev-ml/ppx_sexp_conv/Manifest @@ -1 +1,5 @@ -DIST ppx_sexp_conv-0.9.0.tar.gz 28000 BLAKE2B 2536d3ddbd4ee83baf9eade208983ce9856318079e29da9858838c985b904a7e2e1c6e3ea06bd1360cc17e619f1e952634554e89b294dd00981934679b384c3f SHA512 af3d28a3cdb7c796549a2598c218f69a69d58da715ef2d16077c3adeb22823fa7bec6bc0d8cb6caaf2a0adb56dfcb39d667975959251fb310b69d6abe8302845 +DIST ppx_sexp_conv-0.14.1.tar.gz 49857 BLAKE2B ede55963d995917bd0c4a1464b58f8584ec6be4793df706fd3be96670fe685aba82459f9a1e4c6117c594953a3f23c502cc609f1069d482d24278baf7ed87ed5 SHA512 5018abe07300f67cb2c8b8cd8242403a91ac6b7fda13fe43060b3b09635082a7ad45858c7c6442a5fcae2b6d7d398a03eec16cfcbc5fd59f7f3f5c5fd1ad56f9 +DIST ppx_sexp_conv-0.14.2.tar.gz 49876 BLAKE2B 32109eb6300894156f91721a1c74e94803106cf8a9a9326bf815d3094e166ce34b19f3d28b770d381ca3ce32227a80b15baa61e6f9c2d0082c47b87678c0f239 SHA512 d0121770030da142fd559b5f8d52d4a029d032c5ac9c79bf235190e0aaff58e5cce0a5ca5f198ca8a112e0970ca27ab18d4f201376ca6b799b91d71deb915f25 +DIST ppx_sexp_conv-0.14.3.tar.gz 49886 BLAKE2B 9fda18267995cdd8efb9dafb069df6a51106a800b263f4c94129957a3f23d2bee72f39382623a320cb09ea13c255000ecf9670c19ccf49d55627c02bb0912224 SHA512 7de81d64e7eeb4d6097134606411830dd066f94222ed320a9c32752116961806ccf807f802e07c522c32aa6f7c20bb901804612a0ffc1b14807903c92acb2f44 +DIST ppx_sexp_conv-0.15.1.tar.gz 67448 BLAKE2B 4994b609edd19bc70755c418ff7ed0972199ad6b3dde834ad32400c613113a3b3622dca160a4e49ed5abd6fcb9ced3f7580ffc1bcb055ca1d71a945ae56ea203 SHA512 f2b669e7c7bbbc8dd4978b47b73662dd0195ae85cdd71596485211cb5ab4daedcae9be4b33796674320e0d324b7ee9f90d3b219212be98ed792e3a89ccf8c41b +DIST ppx_sexp_conv-0.16.0.tar.gz 66918 BLAKE2B 7f7f4bd9c3178d80b0b813204e8abbc2791a519951793ed99df62988b91fc90e3616565a2c1b629a80a05814b7cb06f491109e079b70aba9a1606552a2a8e19f SHA512 ceacd17683c8e739d2e5eaabb585c01615a11b18c1bef7df85b48820885d344cbae94c1351a6a2522e016a1bd41fc3997928d6b2b2169aeda72ea6626eb1f7a0 diff --git a/dev-ml/ppx_sexp_conv/files/ppx_sexp_conv-0.14.1-ppxlib-0.18.0.patch b/dev-ml/ppx_sexp_conv/files/ppx_sexp_conv-0.14.1-ppxlib-0.18.0.patch new file mode 100644 index 000000000000..48004a4f26e2 --- /dev/null +++ b/dev-ml/ppx_sexp_conv/files/ppx_sexp_conv-0.14.1-ppxlib-0.18.0.patch @@ -0,0 +1,41 @@ +commit 13e9b27f5f9550b825128f8cd1f31d20dc8fa91b (HEAD, origin/upgrade-ppxlib-0.18.0) +Author: Nathan Rebours <nathan.p.rebours@gmail.com> +Date: Mon Oct 5 17:33:56 2020 +0200 + + Make ppx_sexp_conv compatible with ppxlib.0.18.0 + + ppxlib.0.18.0 upgrades to the 4.11 AST which results in a change + in string constants representation. This PR makes ppx_sexp_conv + compatible with the latest ppxlib. + + You might want for the actual release of ppxlib.0.18.0 before merging + this! + + Signed-off-by: Nathan Rebours <nathan.p.rebours@gmail.com> + +diff --git a/expander/sexp_grammar_lifter.ml b/expander/sexp_grammar_lifter.ml +index 05005bf..17f1e73 100644 +--- a/expander/sexp_grammar_lifter.ml ++++ b/expander/sexp_grammar_lifter.ml +@@ -28,7 +28,7 @@ type atom = Atom.t + type var_name = Sexp.Private.Raw_grammar.var_name + type type_name = Sexp.Private.Raw_grammar.type_name + +-let lift_string ~loc s = pexp_constant ~loc (Pconst_string (s, None)) ++let lift_string ~loc s = pexp_constant ~loc (Pconst_string (s, loc, None)) + let lift_var_name = lift_string + let lift_type_name = lift_string + +diff --git a/ppx_sexp_conv.opam b/ppx_sexp_conv.opam +index 06fd03e..05c4182 100644 +--- a/ppx_sexp_conv.opam ++++ b/ppx_sexp_conv.opam +@@ -15,7 +15,7 @@ depends: [ + "base" {>= "v0.14" & < "v0.15"} + "sexplib0" {>= "v0.14" & < "v0.15"} + "dune" {>= "2.0.0"} +- "ppxlib" {>= "0.11.0"} ++ "ppxlib" {>= "0.18.0"} + ] + synopsis: "[@@deriving] plugin to generate S-expression conversion functions" + description: " diff --git a/dev-ml/ppx_sexp_conv/metadata.xml b/dev-ml/ppx_sexp_conv/metadata.xml index 6f04a3b61755..16d82596f968 100644 --- a/dev-ml/ppx_sexp_conv/metadata.xml +++ b/dev-ml/ppx_sexp_conv/metadata.xml @@ -1,9 +1,9 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">janestreet/ppx_sexp_conv</remote-id> diff --git a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.1-r1.ebuild b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.1-r1.ebuild new file mode 100644 index 000000000000..c00cadc46031 --- /dev/null +++ b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.1-r1.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Support Library for type-driven code generators" +HOMEPAGE="https://github.com/janestreet/ppx_sexp_conv" +SRC_URI="https://github.com/janestreet/ppx_sexp_conv/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt" + +DEPEND=" + =dev-ml/base-0.14*:=[ocamlopt?] + dev-ml/findlib:=[ocamlopt?] + <dev-ml/ppxlib-0.22:=[ocamlopt?] + dev-ml/ocaml-compiler-libs:=[ocamlopt?] + >=dev-ml/ocaml-migrate-parsetree-2.0.0:=[ocamlopt?] + dev-ml/cinaps:=[ocamlopt?] + dev-ml/sexplib0:=[ocamlopt?] +" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}"/${P}-ppxlib-0.18.0.patch ) diff --git a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.2-r2.ebuild b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.2-r2.ebuild new file mode 100644 index 000000000000..017dfbd5279f --- /dev/null +++ b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.2-r2.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Support Library for type-driven code generators" +HOMEPAGE="https://github.com/janestreet/ppx_sexp_conv" +SRC_URI="https://github.com/janestreet/ppx_sexp_conv/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt" + +# Upper bound on ppxlib for bug #769536 +DEPEND=" + =dev-ml/base-0.14*:=[ocamlopt?] + dev-ml/findlib:=[ocamlopt?] + <dev-ml/ppxlib-0.21.0:=[ocamlopt?] + dev-ml/ocaml-compiler-libs:=[ocamlopt?] + >=dev-ml/ocaml-migrate-parsetree-2.0.0:=[ocamlopt?] + dev-ml/cinaps:=[ocamlopt?] + dev-ml/sexplib0:=[ocamlopt?] +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.3-r1.ebuild b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.3-r1.ebuild new file mode 100644 index 000000000000..3db1a61dc337 --- /dev/null +++ b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.3-r1.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Support Library for type-driven code generators" +HOMEPAGE="https://github.com/janestreet/ppx_sexp_conv" +SRC_URI="https://github.com/janestreet/ppx_sexp_conv/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +# Upper bound on ppxlib for bug #769536 +DEPEND=" + =dev-ml/base-0.14*:=[ocamlopt?] + dev-ml/findlib:=[ocamlopt?] + >=dev-ml/ppxlib-0.22.0:=[ocamlopt?] + <dev-ml/ppxlib-0.26.0:=[ocamlopt?] + dev-ml/ocaml-compiler-libs:=[ocamlopt?] + >=dev-ml/ocaml-migrate-parsetree-2.0.0:=[ocamlopt?] + dev-ml/cinaps:=[ocamlopt?] + dev-ml/sexplib0:=[ocamlopt?] +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.15.1-r1.ebuild b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.15.1-r1.ebuild new file mode 100644 index 000000000000..731b14fca1bd --- /dev/null +++ b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.15.1-r1.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Support Library for type-driven code generators" +HOMEPAGE="https://github.com/janestreet/ppx_sexp_conv" +SRC_URI="https://github.com/janestreet/ppx_sexp_conv/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +# Upper bound on ppxlib for bug #769536 +DEPEND=" + dev-ml/base:${SLOT}[ocamlopt?] + dev-ml/findlib:=[ocamlopt?] + >=dev-ml/ppxlib-0.26:=[ocamlopt?] + dev-ml/ocaml-compiler-libs:=[ocamlopt?] +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.16.0-r1.ebuild b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.16.0-r1.ebuild new file mode 100644 index 000000000000..0ebc5e9d824a --- /dev/null +++ b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.16.0-r1.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Support Library for type-driven code generators" +HOMEPAGE="https://github.com/janestreet/ppx_sexp_conv" +SRC_URI="https://github.com/janestreet/ppx_sexp_conv/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +# Upper bound on ppxlib for bug #769536 +DEPEND=" + >=dev-lang/ocaml-4.14 + dev-ml/base:${SLOT}[ocamlopt?] + dev-ml/findlib:=[ocamlopt?] + >=dev-ml/ppxlib-0.28:=[ocamlopt?] + dev-ml/ocaml-compiler-libs:=[ocamlopt?] +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.9.0-r1.ebuild b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.9.0-r1.ebuild deleted file mode 100644 index 9dedc0888a68..000000000000 --- a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.9.0-r1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit opam - -DESCRIPTION="Support Library for type-driven code generators" -HOMEPAGE="https://github.com/janestreet/ppx_sexp_conv" -SRC_URI="https://github.com/janestreet/ppx_sexp_conv/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" - -DEPEND=" - dev-ml/ppx_core:= - dev-ml/ppx_driver:= - dev-ml/ppx_type_conv:= - dev-ml/ppx_metaquot:= - dev-ml/ppx_optcomp:= - dev-ml/sexplib:= - dev-ml/ocaml-migrate-parsetree:= - dev-ml/ppx_traverse_builtins:= - " -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} dev-ml/jbuilder" diff --git a/dev-ml/ppx_sexp_message/Manifest b/dev-ml/ppx_sexp_message/Manifest index d04f619ba6bc..fd54cfd4e357 100644 --- a/dev-ml/ppx_sexp_message/Manifest +++ b/dev-ml/ppx_sexp_message/Manifest @@ -1 +1,4 @@ -DIST ppx_sexp_message-0.9.0.tar.gz 8965 BLAKE2B df59ff7f598a7ff19a16829addbc5b49f2e7dfb2b30aab43f5d220f6d45f625750ca1d63eba3187b09d494a2c06af642c2a2e4d581c6a247440ba06d6f46dae0 SHA512 38a376b23372b8699fef76085ad2ead7b5fb34b823b0c7e3e52ac90654133a44429d7a3383197b78c8f01a7b64753ce424d5138b8aef596d236ce9c798ec1887 +DIST ppx_sexp_message-0.14.0.tar.gz 7738 BLAKE2B a00577faf55b0816991bfe6f11fdc21d9b56893c29e67036483adce56c095cb8a2ee9014f9f0768ab96bbd28fe2f46b262e8a6122cf66ccb2740af7be890db0d SHA512 627f8e52914ef228277ff31a0d2262de823767fa0b510b1a29cbfc754c7cbc84cabe7c94de3e3a72d888d19e23584ebcc46c16997ffd7cdae41378cb44b2bc23 +DIST ppx_sexp_message-0.14.1.tar.gz 7734 BLAKE2B 44eb3af754031c8fc85215d6837de80ddf9c79040e5309f07437f09a4c3985c9f4103d2b8004fc28a9254529adc54e206b17822d55caac84c5efc48751490114 SHA512 4d4644964fe2d99f2b2a433b7d942df1ba64f4229f07a297116a56de09d2567d5a907019ee124a8accb74c46d025a5204ddbbe1c72f12827cf33c10f6f059d1f +DIST ppx_sexp_message-0.15.0.tar.gz 7772 BLAKE2B 98b763f54cca6a1eb700cc11edfa5a908dd121c7f952628f65b7d9aba7cc081d88bca587c0664c1065f416c6fb9f1eaaed7df818920380e6109f75cd83be811e SHA512 2b671a1fa020c785ffb02b67998653dedcce892ab68fc23665ce8c88534ae9f5e1df2f148e1f9ea965444f4a48d896735e2bdc313db2787101a5aee2e5f9f025 +DIST ppx_sexp_message-0.16.0.tar.gz 8435 BLAKE2B 00d0b3a9c8090630968f864b968ea891988416f390f29ffc2037ac7673598283500e4dbd0471039f3d4d61f57c3f177b764eb7715ac393ea4a14c1e27c308b97 SHA512 2442d9d2e46bcfce17e7d017865dcf52daa5fd62500981f3d97a37373799a5b9abd6c52b4e8f720cc2df419b2d2450258e0bd78fe8e12090805e1c8e37d62285 diff --git a/dev-ml/ppx_sexp_message/files/ppx_sexp_message-0.14.0-ppxlib-0.18.0.patch b/dev-ml/ppx_sexp_message/files/ppx_sexp_message-0.14.0-ppxlib-0.18.0.patch new file mode 100644 index 000000000000..a472c5ab29a1 --- /dev/null +++ b/dev-ml/ppx_sexp_message/files/ppx_sexp_message-0.14.0-ppxlib-0.18.0.patch @@ -0,0 +1,41 @@ +commit fd604b269398aebdb0c5fa5511d9f3c38b6ecb45 (HEAD, origin/upgrade-ppxlib-0.18.0) +Author: Nathan Rebours <nathan.p.rebours@gmail.com> +Date: Mon Oct 5 18:04:41 2020 +0200 + + Make ppx_sexp_message compatible with ppxlib.0.18.0 + + ppxlib.0.18.0 upgrades to the 4.11 AST which results in a change + in string constants representation. This PR makes ppx_sexp_message + compatible with the latest ppxlib. + + You might want for the actual release of ppxlib.0.18.0 before merging + this! + + Signed-off-by: Nathan Rebours <nathan.p.rebours@gmail.com> + +diff --git a/expander/ppx_sexp_message_expander.ml b/expander/ppx_sexp_message_expander.ml +index e0c2477..c801cd7 100644 +--- a/expander/ppx_sexp_message_expander.ml ++++ b/expander/ppx_sexp_message_expander.ml +@@ -97,7 +97,7 @@ let sexp_of_expr ~omit_nil e = + let e = rewrite_here e in + let loc = { e.pexp_loc with loc_ghost = true } in + match e.pexp_desc with +- | Pexp_constant (Pconst_string ("", _)) -> Absent ++ | Pexp_constant (Pconst_string ("", _, _)) -> Absent + | Pexp_constant const -> + present_or_omit_nil ~loc ~omit_nil:false (sexp_of_constant ~loc const) + | Pexp_constraint (expr, ctyp) -> sexp_of_constraint ~omit_nil ~loc expr ctyp +diff --git a/ppx_sexp_message.opam b/ppx_sexp_message.opam +index d8a6d95..3d6ef41 100644 +--- a/ppx_sexp_message.opam ++++ b/ppx_sexp_message.opam +@@ -16,7 +16,7 @@ depends: [ + "ppx_here" {>= "v0.14" & < "v0.15"} + "ppx_sexp_conv" {>= "v0.14" & < "v0.15"} + "dune" {>= "2.0.0"} +- "ppxlib" {>= "0.11.0"} ++ "ppxlib" {>= "0.18.0"} + ] + synopsis: "A ppx rewriter for easy construction of s-expressions" + description: " diff --git a/dev-ml/ppx_sexp_message/metadata.xml b/dev-ml/ppx_sexp_message/metadata.xml index 182439ccf79e..3ff9f580146c 100644 --- a/dev-ml/ppx_sexp_message/metadata.xml +++ b/dev-ml/ppx_sexp_message/metadata.xml @@ -1,9 +1,9 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">janestreet/ppx_sexp_message</remote-id> diff --git a/dev-ml/ppx_sexp_message/ppx_sexp_message-0.14.0.ebuild b/dev-ml/ppx_sexp_message/ppx_sexp_message-0.14.0.ebuild new file mode 100644 index 000000000000..4a57b981ed48 --- /dev/null +++ b/dev-ml/ppx_sexp_message/ppx_sexp_message-0.14.0.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="A ppx rewriter for easy construction of s-expressions" +HOMEPAGE="https://github.com/janestreet/ppx_sexp_message" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-ml/base-0.14.0:= + dev-ml/findlib:= + >=dev-ml/ppx_here-0.14.0:= + >=dev-ml/ppx_sexp_conv-0.14.0:= + >=dev-ml/ppxlib-0.18.0:= + >=dev-ml/ocaml-compiler-libs-0.11.0:= + >=dev-ml/ocaml-migrate-parsetree-2.0.0:= + dev-ml/cinaps:= + dev-ml/sexplib0:= +" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}"/${P}-ppxlib-0.18.0.patch ) diff --git a/dev-ml/ppx_sexp_message/ppx_sexp_message-0.14.1-r1.ebuild b/dev-ml/ppx_sexp_message/ppx_sexp_message-0.14.1-r1.ebuild new file mode 100644 index 000000000000..6893ad882026 --- /dev/null +++ b/dev-ml/ppx_sexp_message/ppx_sexp_message-0.14.1-r1.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="A ppx rewriter for easy construction of s-expressions" +HOMEPAGE="https://github.com/janestreet/ppx_sexp_message" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-ml/base-0.14.0:= + dev-ml/findlib:= + >=dev-ml/ppx_here-0.14.0:= + >=dev-ml/ppx_sexp_conv-0.14.0:= + >=dev-ml/ppxlib-0.18.0:= + >=dev-ml/ocaml-compiler-libs-0.11.0:= + >=dev-ml/ocaml-migrate-parsetree-2.0.0:= + dev-ml/cinaps:= + dev-ml/sexplib0:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_sexp_message/ppx_sexp_message-0.9.0.ebuild b/dev-ml/ppx_sexp_message/ppx_sexp_message-0.15.0-r1.ebuild index d240e9c58a7c..4e87a4716cad 100644 --- a/dev-ml/ppx_sexp_message/ppx_sexp_message-0.9.0.ebuild +++ b/dev-ml/ppx_sexp_message/ppx_sexp_message-0.15.0-r1.ebuild @@ -1,27 +1,22 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit opam +inherit dune DESCRIPTION="A ppx rewriter for easy construction of s-expressions" HOMEPAGE="https://github.com/janestreet/ppx_sexp_message" SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" DEPEND=" - dev-ml/ppx_core:= - dev-ml/ppx_driver:= - dev-ml/ppx_here:= - dev-ml/ppx_metaquot:= - dev-ml/ppx_sexp_conv:= - dev-ml/sexplib:= - dev-ml/ocaml-migrate-parsetree:= + dev-ml/ppx_here:${SLOT} + dev-ml/ppx_sexp_conv:${SLOT} + >=dev-ml/ppxlib-0.23.0:= " RDEPEND="${DEPEND}" -DEPEND="${DEPEND} dev-ml/jbuilder" diff --git a/dev-ml/ppx_sexp_message/ppx_sexp_message-0.16.0.ebuild b/dev-ml/ppx_sexp_message/ppx_sexp_message-0.16.0.ebuild new file mode 100644 index 000000000000..1f40044ced08 --- /dev/null +++ b/dev-ml/ppx_sexp_message/ppx_sexp_message-0.16.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="A ppx rewriter for easy construction of s-expressions" +HOMEPAGE="https://github.com/janestreet/ppx_sexp_message" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-lang/ocaml-4.14 + dev-ml/ppx_here:${SLOT} + dev-ml/ppx_sexp_conv:${SLOT} + >=dev-ml/ppxlib-0.28.0:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_sexp_value/Manifest b/dev-ml/ppx_sexp_value/Manifest index eb65e1812075..6c064c5ffdc3 100644 --- a/dev-ml/ppx_sexp_value/Manifest +++ b/dev-ml/ppx_sexp_value/Manifest @@ -1 +1,3 @@ -DIST ppx_sexp_value-0.9.0.tar.gz 10666 BLAKE2B db3f3bc626b00dd6bf6c1ab1afedfd581ec48689307c1ad52767b0aa64d5c36a10556b37ac3e2e2fecf1eb5230ab1e049f458ff3c8c039cf789146f1458dbf2a SHA512 7dcb8f70a7938d26fc5a1afea2bf5e77c4996d8e82720206ab9e5a462a59182dcedfbfede49ed83ed50f2683776b75fb5bae00c53fc451b03f6a33e126566e84 +DIST ppx_sexp_value-0.14.0.tar.gz 7740 BLAKE2B f495d0b9032a73cd6a62292185e77cfe6206bb06564e663c04a20c9430dd4188da529bef6428a7a07309109ec7fc51d3909ac58d5760c1fab618f59eee8a6b63 SHA512 d33ed503025e07588a21ca6796004dd53ddfb9f67f3527d066c4767734fb8723d0a9d31082d285ba82996d8b69faecb624f116046ea8048637f05773ee3e89a8 +DIST ppx_sexp_value-0.15.0.tar.gz 7839 BLAKE2B 72ac20f7bae60979f2b90c2103773549af655fff9c291d8f0afbfb773495ea2e387ce8149e782fd87db484ea882b9a35347a80472f37d9d1ab6f26bbff845db3 SHA512 b6eb67114c8d63b7eeeb63c5ce1c043a4c8879bd6502733449b3b1d665d345c9685ffefc0f8b0a3203b31e169f238f7decc882e72b0436601d1461e86b0f5d03 +DIST ppx_sexp_value-0.16.0.tar.gz 8460 BLAKE2B b8d616e9c2d9a1f86a0727c4f05f630fee705b8fea5add83d71b94a5c63905c198c69dd5ac3676cbf8c6f8ebdbc2bfbae01ec1d0936eb13137b1107f3d1aed28 SHA512 f38c6045dc9d5136fcfaad00039fb7f0caf34ca1fb2031145fedb0b5d4c39b13c58c8d744ca77ebe291526b9f0b995d6f0d0f4cd18136b92e1125fb30e2ae2bd diff --git a/dev-ml/ppx_sexp_value/metadata.xml b/dev-ml/ppx_sexp_value/metadata.xml index 9291357d010b..d2d8b98e26f1 100644 --- a/dev-ml/ppx_sexp_value/metadata.xml +++ b/dev-ml/ppx_sexp_value/metadata.xml @@ -1,9 +1,9 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">janestreet/ppx_sexp_value</remote-id> diff --git a/dev-ml/ppx_sexp_value/ppx_sexp_value-0.14.0.ebuild b/dev-ml/ppx_sexp_value/ppx_sexp_value-0.14.0.ebuild new file mode 100644 index 000000000000..d69e19265924 --- /dev/null +++ b/dev-ml/ppx_sexp_value/ppx_sexp_value-0.14.0.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Standard library for ppx rewriters" +HOMEPAGE="https://github.com/janestreet/ppx_sexp_value" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-ml/base-0.14.0:= + >=dev-ml/ppx_here-0.14.0:= + >=dev-ml/ppx_sexp_conv-0.14.0:= + >=dev-ml/ppxlib-0.18.0:= + >=dev-ml/ocaml-compiler-libs-0.11.0:= + >=dev-ml/ocaml-migrate-parsetree-2.0.0:= + dev-ml/cinaps:= + dev-ml/sexplib0:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_sexp_value/ppx_sexp_value-0.9.0.ebuild b/dev-ml/ppx_sexp_value/ppx_sexp_value-0.15.0-r1.ebuild index 5418fe3f3637..970e0091cc7d 100644 --- a/dev-ml/ppx_sexp_value/ppx_sexp_value-0.9.0.ebuild +++ b/dev-ml/ppx_sexp_value/ppx_sexp_value-0.15.0-r1.ebuild @@ -1,27 +1,22 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit opam +inherit dune DESCRIPTION="Standard library for ppx rewriters" HOMEPAGE="https://github.com/janestreet/ppx_sexp_value" SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" DEPEND=" - dev-ml/ppx_core:= - dev-ml/ppx_driver:= - dev-ml/ppx_here:= - dev-ml/ppx_metaquot:= - dev-ml/ppx_sexp_conv:= - dev-ml/sexplib:= - dev-ml/ocaml-migrate-parsetree:= + dev-ml/ppx_here:${SLOT} + dev-ml/ppx_sexp_conv:${SLOT} + >=dev-ml/ppxlib-0.23.0:= " RDEPEND="${DEPEND}" -DEPEND="${DEPEND} dev-ml/jbuilder" diff --git a/dev-ml/ppx_sexp_value/ppx_sexp_value-0.16.0.ebuild b/dev-ml/ppx_sexp_value/ppx_sexp_value-0.16.0.ebuild new file mode 100644 index 000000000000..1d7d16261863 --- /dev/null +++ b/dev-ml/ppx_sexp_value/ppx_sexp_value-0.16.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Standard library for ppx rewriters" +HOMEPAGE="https://github.com/janestreet/ppx_sexp_value" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-lang/ocaml-4.14 + dev-ml/ppx_here:${SLOT} + dev-ml/ppx_sexp_conv:${SLOT} + >=dev-ml/ppxlib-0.28.0:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_stable/Manifest b/dev-ml/ppx_stable/Manifest new file mode 100644 index 000000000000..e5974b784c2e --- /dev/null +++ b/dev-ml/ppx_stable/Manifest @@ -0,0 +1,3 @@ +DIST ppx_stable-0.14.1.tar.gz 12031 BLAKE2B 837a53206d3a8d651d53f665daebbcfde3a1b5d55f1ed13d3ac8feecbd9ba0fb24ad7bb1cf24a0bfa00a41a46c3ef0f84385bc8792685f42ef18facf88ce348f SHA512 1c99a61537a2ce7d40208c64efbf71c54726b228d3746f2afaf9e813b3fed9c8016bb2eb859be24993c7c922a34f574e1028db8e7ee922d4772336dc0496df74 +DIST ppx_stable-0.15.0.tar.gz 18143 BLAKE2B cfd317f98c7683bd2faf29eb386939f07b30798f16e43abdfe9361f9f3d373d4b64ed13aa87f300e5f14052ad1bc636d402af84c9f15d9e26d7b2dc976c812af SHA512 1be50f061d55ea0fcb8bd846955da3ceb07b97986d74a06b41c0f6b5c0dfb3a55f9e39e47f64ae227ecce89dd31dc3b03082031748982419d4ce9a14b5cdb436 +DIST ppx_stable-0.16.0.tar.gz 18298 BLAKE2B 3308ecc99f3c5a6c9b5a270f04effc62dfdb52116b91255eb0383e3244a2710124a211a81d52954ee5ac94251f84847d12787dd79b7c3d96a68d1bd4abf52458 SHA512 bbc40494718d99228e194f766be75c67a657cb50fe6090d05ba30606be40406c93323b64ae3d2400ab6a1563c3e9fa04c2ba82da7db47b7c1cfec103f75d19cb diff --git a/dev-ml/ppx_stable/metadata.xml b/dev-ml/ppx_stable/metadata.xml new file mode 100644 index 000000000000..8fdeb7505892 --- /dev/null +++ b/dev-ml/ppx_stable/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">janestreet/ppx_stable</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/ppx_stable/ppx_stable-0.14.1.ebuild b/dev-ml/ppx_stable/ppx_stable-0.14.1.ebuild new file mode 100644 index 000000000000..db88c196e937 --- /dev/null +++ b/dev-ml/ppx_stable/ppx_stable-0.14.1.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Stable types conversions generator" +HOMEPAGE="https://github.com/janestreet/ppx_stable" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-ml/base-0.14.0:= + >=dev-ml/ppxlib-0.18.0:= + >=dev-ml/ocaml-compiler-libs-0.11.0:= + >=dev-ml/ocaml-migrate-parsetree-2.0.0:= + dev-ml/cinaps:= + dev-ml/sexplib0:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_stable/ppx_stable-0.15.0.ebuild b/dev-ml/ppx_stable/ppx_stable-0.15.0.ebuild new file mode 100644 index 000000000000..7e20fbeb6a20 --- /dev/null +++ b/dev-ml/ppx_stable/ppx_stable-0.15.0.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Stable types conversions generator" +HOMEPAGE="https://github.com/janestreet/ppx_stable" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +DEPEND=" + dev-ml/base:${SLOT} + >=dev-ml/ppxlib-0.23.0:= + >=dev-ml/ocaml-compiler-libs-0.11.0:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_stable/ppx_stable-0.16.0.ebuild b/dev-ml/ppx_stable/ppx_stable-0.16.0.ebuild new file mode 100644 index 000000000000..eaffd572aa50 --- /dev/null +++ b/dev-ml/ppx_stable/ppx_stable-0.16.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Stable types conversions generator" +HOMEPAGE="https://github.com/janestreet/ppx_stable" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-lang/ocaml-4.14 + dev-ml/base:${SLOT} + >=dev-ml/ppxlib-0.28.0:= + >=dev-ml/ocaml-compiler-libs-0.11.0:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_stable_witness/Manifest b/dev-ml/ppx_stable_witness/Manifest new file mode 100644 index 000000000000..c88f7895e0ab --- /dev/null +++ b/dev-ml/ppx_stable_witness/Manifest @@ -0,0 +1 @@ +DIST ppx_stable_witness-0.16.0.tar.gz 7641 BLAKE2B 45bbdb187c1dd9dcf1a3d51fe932bc7e93d7b23f40203e065fd5ba6f4bc4d418c241bd1c9550c09c78638865a3f17b22dead0e22bd8c04037d99691f8dbf6a1b SHA512 386688f6b9bed1fa481030f881b124681c18a49c8a1933233a7cd90dff5ddb4f1739cfb2d1c5262b2e7c2c2e593c9f141af6565a5596547c1770e19e2422ea36 diff --git a/dev-ml/ppx_stable_witness/metadata.xml b/dev-ml/ppx_stable_witness/metadata.xml new file mode 100644 index 000000000000..9bbd1d7add00 --- /dev/null +++ b/dev-ml/ppx_stable_witness/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">janestreet/ppx_stable_witness</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/ppx_stable_witness/ppx_stable_witness-0.16.0.ebuild b/dev-ml/ppx_stable_witness/ppx_stable_witness-0.16.0.ebuild new file mode 100644 index 000000000000..17af7b1d4285 --- /dev/null +++ b/dev-ml/ppx_stable_witness/ppx_stable_witness-0.16.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Ppx extension for deriving a witness that a type is intended to be stable" +HOMEPAGE="https://github.com/janestreet/ppx_stable_witness" +SRC_URI="https://github.com/janestreet/ppx_stable_witness/archive/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +RDEPEND=" + >=dev-lang/ocaml-4.14 + dev-ml/base:${SLOT} + >=dev-ml/ppxlib-0.28:= +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/ppx_string/Manifest b/dev-ml/ppx_string/Manifest new file mode 100644 index 000000000000..0c4a2235c518 --- /dev/null +++ b/dev-ml/ppx_string/Manifest @@ -0,0 +1,3 @@ +DIST ppx_string-0.14.1.tar.gz 4807 BLAKE2B 2ce5cf2d5dd913f05e66c24ea5be2ce4a56c59b7e5faecf003a573274bfaef3834935276e110fba1d0af3a3ef9d6ca730622dc780ab6063945a01aa3d6900a43 SHA512 2b570ca3d248f89ee1903e6ea40fbcd9c5c72809ff1f42dc67e9d41f6c297465ae47ffdbeda9f263dddf14c9c460bbbdee01243cef838d0ec49493c3b5644aee +DIST ppx_string-0.15.0.tar.gz 6071 BLAKE2B 06e4761732db5aa5ee0214c68ac8ff95a85a38e6d62abaa45cc630d19036b0ed38ec0198a45871068d8bcc4f40176ac072da67e8f339cef3be3d64ace7a22e69 SHA512 bb1819017a6c25d581854e8487a0e5535fe282ec421c91e662c310c0d0aa7704be65484b3f2e721b29409e0eb68f72528e60380e036af066b3b1f1f11ea6cd5e +DIST ppx_string-0.16.0.tar.gz 6105 BLAKE2B a23f81846562accd1bed9df7bc491a8b9c94751f8432fc0909106d0dc0160ed848ce5181e67e34273b05a627ef3ada6770c98eafac8d1c790272eaa8d77d9ac5 SHA512 b1310551e1548fee5b99e64635139189139791f2ea2da93a4751b04c78a5519c5f3833c515d93a25e9d7aa23945414cbe690e5cd3f34630cdca4819c3d8ec1bc diff --git a/dev-ml/ppx_string/metadata.xml b/dev-ml/ppx_string/metadata.xml new file mode 100644 index 000000000000..4c40cabdee67 --- /dev/null +++ b/dev-ml/ppx_string/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">janestreet/ppx_string</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/ppx_string/ppx_string-0.14.1.ebuild b/dev-ml/ppx_string/ppx_string-0.14.1.ebuild new file mode 100644 index 000000000000..2538526368d1 --- /dev/null +++ b/dev-ml/ppx_string/ppx_string-0.14.1.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Ppx extension for string interpolation" +HOMEPAGE="https://github.com/janestreet/ppx_string" +SRC_URI="https://github.com/janestreet/ppx_string/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-ml/base-0.14.0:= + >=dev-ml/ppx_base-0.14.0:= + >=dev-ml/ppxlib-0.18.0:= + >=dev-ml/ocaml-compiler-libs-0.11.0:= + >=dev-ml/ocaml-migrate-parsetree-2.0.0:= + dev-ml/cinaps:= + dev-ml/sexplib0:= + >=dev-ml/stdio-0.14.0:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_string/ppx_string-0.15.0-r1.ebuild b/dev-ml/ppx_string/ppx_string-0.15.0-r1.ebuild new file mode 100644 index 000000000000..a53270c1c7e6 --- /dev/null +++ b/dev-ml/ppx_string/ppx_string-0.15.0-r1.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Ppx extension for string interpolation" +HOMEPAGE="https://github.com/janestreet/ppx_string" +SRC_URI="https://github.com/janestreet/ppx_string/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +DEPEND=" + dev-ml/ppx_base:${SLOT} + dev-ml/stdio:${SLOT} + >=dev-ml/ppxlib-0.23.0:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_string/ppx_string-0.16.0.ebuild b/dev-ml/ppx_string/ppx_string-0.16.0.ebuild new file mode 100644 index 000000000000..88f540a39a54 --- /dev/null +++ b/dev-ml/ppx_string/ppx_string-0.16.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Ppx extension for string interpolation" +HOMEPAGE="https://github.com/janestreet/ppx_string" +SRC_URI="https://github.com/janestreet/ppx_string/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-lang/ocaml-4.14 + dev-ml/ppx_base:${SLOT} + dev-ml/stdio:${SLOT} + >=dev-ml/ppxlib-0.28.0:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_tools/Manifest b/dev-ml/ppx_tools/Manifest index 4c5a9570e8e4..6c483ebb381e 100644 --- a/dev-ml/ppx_tools/Manifest +++ b/dev-ml/ppx_tools/Manifest @@ -1,2 +1,5 @@ -DIST ppx_tools-5.0.4.03.0.tar.gz 17209 BLAKE2B bd51e5b2482a9eab09bf9a02ac0231fa7bbc721d54a932e6cfdc1d719c106eca0fe90563b636601110e796fab439f6c6d7fccd5d2920f5bcb3c115f622d90381 SHA512 d1867b084885704757f390b6f6ca8b5d7702f0476149d99ea227f98230ab35d57f5c4aa779881231a0a77cfd1861255118fa2551a49ab85553f63e9aab9baae4 -DIST ppx_tools-5.0.4.05.0.tar.gz 17893 BLAKE2B 0902f53ef19338396cf2a2319a4c2d4b7bbbfb66bbfd0fb2290c29ecebcda02ff90d2f0d0221b08d027c41c863c2bc0a02c50363d83474864c08e619641b7ad6 SHA512 33b4420500a2b5880e770f8fdf2b37ef08e52ff84f96f955c6321492de906568979feccb1b2b477b1117619ba28edd8d3e0f178c5684f0dc43c6ed56266c4d64 +DIST ppx_tools-6.2.tar.gz 46150 BLAKE2B f8af2a1eee81d5a1e73ac606ab79d285c8c226533bcf715ed22386aecfaf51260fb9a5075d270675f1b601cb174b68d8c85556f418031a7b6bda06c4376fe443 SHA512 fc3943c69901ef46843355c3482d5a1481d05ee94fb0a344ec04101059a02cbaa76fed5742cfae82730edf378f2e140d859a5cf590653f85359255d451f07dc8 +DIST ppx_tools-6.3.tar.gz 18811 BLAKE2B b1389dbe0c6fd855cafc8d64a9db550866317172909c2731f01acd412c6f8147f07e19a82d527187d0b211fca9eb2f2ad63bb53e8f375b0b8107c4e723710000 SHA512 6a88f6f877f49ea8736aeca60673a19c52d5104ad9e2a3e56db3f71cd557d39df9c709c4e678ccf10263ff1f3e0504f4676227bd05ceba1e0294453a988a736c +DIST ppx_tools-6.4.tar.gz 19051 BLAKE2B dcb3e5a4ca5dd6243cae013739b93c6fe100ca21ad56c46e284255977f4e6d4263ef8d937ed672939e5b31bbe0904dcb1d71105f49385ad5d43404b19a9fe2c6 SHA512 514aa283f6bee11bf257abec98a751c656db63203caa4caee5ce606bcdee75891441a794b0bac22e2ff2e5d2760cd39ffaa2fce6bb118155daf05175917e6e7c +DIST ppx_tools-6.5.tar.gz 19200 BLAKE2B 5cc847fcde8610ad37dbc7884e38869123a59d81549a2ae9e4e2b2a5525cff36fe3e1a31375090dff9b5179b0e12e46d25d54f3a4cefab8cb42de08bb4347691 SHA512 1dc3f62307690161fc7d9f54715918341429bbe13dd68744e9468b41ab7c15ec95cb865135d11c3e3edc6cfb02658b0c731ce1e7756267cf71143ea8e88318fe +DIST ppx_tools-6.6.tar.gz 19265 BLAKE2B f4f89eeb314ad76c0337ed9c782ff2bf1473172a30ced4616ee35f34f8b25dd16aa0331fab48afd891a54eaf58599ed4c6730d4dd3ea7e462d967d8279b487c8 SHA512 7bbb9a8d9aaa68c54048fde383f7ba2499ac53bbc2d7e3ba907de342ea48ffded69acc2e4ca4c38c2b2b1004b5e004230988a36ad34a4b5361c2a3ad1f858a53 diff --git a/dev-ml/ppx_tools/files/ocaml404.patch b/dev-ml/ppx_tools/files/ocaml404.patch deleted file mode 100644 index 8a2ccee071e4..000000000000 --- a/dev-ml/ppx_tools/files/ocaml404.patch +++ /dev/null @@ -1,47 +0,0 @@ -Index: ppx_tools-5.0-4.03.0/ast_mapper_class.ml -=================================================================== ---- ppx_tools-5.0-4.03.0.orig/ast_mapper_class.ml -+++ ppx_tools-5.0-4.03.0/ast_mapper_class.ml -@@ -335,6 +335,7 @@ module P = struct - | Ppat_unpack s -> unpack ~loc ~attrs (map_loc sub s) - | Ppat_exception p -> exception_ ~loc ~attrs (sub # pat p) - | Ppat_extension x -> extension ~loc ~attrs (sub # extension x) -+ | Ppat_open (l, p) -> open_ ~loc ~attrs (map_loc sub l) (sub # pat p) - end - - module CE = struct -Index: ppx_tools-5.0-4.03.0/genlifter.ml -=================================================================== ---- ppx_tools-5.0-4.03.0.orig/genlifter.ml -+++ ppx_tools-5.0-4.03.0/genlifter.ml -@@ -49,8 +49,8 @@ module Main : sig end = struct - let rec gen ty = - if Hashtbl.mem printed ty then () - else let tylid = Longident.parse ty in -- let (_, td) = -- try Env.lookup_type tylid env -+ let td = -+ try Env.find_type (Env.lookup_type tylid env) env - with Not_found -> - Format.eprintf "** Cannot resolve type %s@." ty; - exit 2 -Index: ppx_tools-5.0-4.03.0/rewriter.ml -=================================================================== ---- ppx_tools-5.0-4.03.0.orig/rewriter.ml -+++ ppx_tools-5.0-4.03.0/rewriter.ml -@@ -92,13 +92,13 @@ let () = - | `Struct -> - let pstr = Parse.implementation lexer in - let pstr = Pparse.apply_rewriters (* ~restore:true *) ~tool_name:!tool_name -- Config.ast_impl_magic_number pstr in -+ Pparse.Structure pstr in - Pprintast.structure fmt pstr; - Format.pp_print_newline fmt () - | `Sig -> - let psig = Parse.interface lexer in - let psig = Pparse.apply_rewriters (* ~restore:true *) ~tool_name:!tool_name -- Config.ast_intf_magic_number psig in -+ Pparse.Signature psig in - Pprintast.signature fmt psig; - Format.pp_print_newline fmt ()) - with exn -> diff --git a/dev-ml/ppx_tools/metadata.xml b/dev-ml/ppx_tools/metadata.xml index 56d1f00f232a..15425cbba180 100644 --- a/dev-ml/ppx_tools/metadata.xml +++ b/dev-ml/ppx_tools/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">alainfrisch/ppx_tools</remote-id> - </upstream> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">alainfrisch/ppx_tools</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-ml/ppx_tools/ppx_tools-5.0.4.03.0.ebuild b/dev-ml/ppx_tools/ppx_tools-5.0.4.03.0.ebuild deleted file mode 100644 index 3b440d54aeb0..000000000000 --- a/dev-ml/ppx_tools/ppx_tools-5.0.4.03.0.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib versionator eutils - -MY_PV=$(replace_version_separator 2 '+') -DESCRIPTION="Tools for authors of ppx rewriters" -HOMEPAGE="https://github.com/alainfrisch/ppx_tools" -SRC_URI="https://github.com/alainfrisch/ppx_tools/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" -IUSE="+ocamlopt" - -DEPEND=">=dev-lang/ocaml-4.03.0:=[ocamlopt?]" -RDEPEND="${DEPEND}" -S="${WORKDIR}/${PN}-$(replace_version_separator 2 '-')" - -src_prepare() { - has_version '>=dev-lang/ocaml-4.04_beta' && epatch "${FILESDIR}/ocaml404.patch" -} - -src_compile() { - emake -j1 $(usex ocamlopt "" "ARCH=none") -} - -src_install() { - findlib_src_install - dodoc README.md -} diff --git a/dev-ml/ppx_tools/ppx_tools-5.0.4.05.0.ebuild b/dev-ml/ppx_tools/ppx_tools-5.0.4.05.0.ebuild deleted file mode 100644 index 28e7b0d5bb50..000000000000 --- a/dev-ml/ppx_tools/ppx_tools-5.0.4.05.0.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib versionator eutils - -MY_PV=$(replace_version_separator 2 '+') -DESCRIPTION="Tools for authors of ppx rewriters" -HOMEPAGE="https://github.com/alainfrisch/ppx_tools" -SRC_URI="https://github.com/alainfrisch/ppx_tools/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" -IUSE="+ocamlopt" - -DEPEND=">=dev-lang/ocaml-4.05_beta:=[ocamlopt?]" -RDEPEND="${DEPEND}" -S="${WORKDIR}/${PN}-$(replace_version_separator 2 '-')" - -src_compile() { - emake -j1 $(usex ocamlopt "" "ARCH=none") -} - -src_install() { - findlib_src_install - dodoc README.md -} diff --git a/dev-ml/ppx_tools/ppx_tools-6.2.ebuild b/dev-ml/ppx_tools/ppx_tools-6.2.ebuild new file mode 100644 index 000000000000..79491ecf97b1 --- /dev/null +++ b/dev-ml/ppx_tools/ppx_tools-6.2.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +MY_PV=$(ver_rs 2 '+') +DESCRIPTION="Tools for authors of ppx rewriters" +HOMEPAGE="https://github.com/alainfrisch/ppx_tools" +SRC_URI="https://github.com/alainfrisch/ppx_tools/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-$(ver_rs 2 '-')" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="+ocamlopt" + +BDEPEND="<dev-lang/ocaml-4.12.0" diff --git a/dev-ml/ppx_tools/ppx_tools-6.3.ebuild b/dev-ml/ppx_tools/ppx_tools-6.3.ebuild new file mode 100644 index 000000000000..146dc4cea675 --- /dev/null +++ b/dev-ml/ppx_tools/ppx_tools-6.3.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +MY_PV=$(ver_rs 2 '+') +DESCRIPTION="Tools for authors of ppx rewriters" +HOMEPAGE="https://github.com/alainfrisch/ppx_tools" +SRC_URI="https://github.com/alainfrisch/ppx_tools/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-$(ver_rs 2 '-')" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" +IUSE="+ocamlopt" + +BDEPEND=" + dev-ml/cppo + <dev-lang/ocaml-4.13.0 +" diff --git a/dev-ml/ppx_tools/ppx_tools-6.4.ebuild b/dev-ml/ppx_tools/ppx_tools-6.4.ebuild new file mode 100644 index 000000000000..34cc6727c583 --- /dev/null +++ b/dev-ml/ppx_tools/ppx_tools-6.4.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +MY_PV=$(ver_rs 2 '+') +DESCRIPTION="Tools for authors of ppx rewriters" +HOMEPAGE="https://github.com/alainfrisch/ppx_tools" +SRC_URI="https://github.com/alainfrisch/ppx_tools/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-$(ver_rs 2 '-')" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="+ocamlopt" + +BDEPEND=" + dev-ml/cppo + <dev-lang/ocaml-4.14.0 +" diff --git a/dev-ml/ppx_tools/ppx_tools-6.5.ebuild b/dev-ml/ppx_tools/ppx_tools-6.5.ebuild new file mode 100644 index 000000000000..374fa202c924 --- /dev/null +++ b/dev-ml/ppx_tools/ppx_tools-6.5.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +MY_PV=$(ver_rs 2 '+') +DESCRIPTION="Tools for authors of ppx rewriters" +HOMEPAGE="https://github.com/alainfrisch/ppx_tools" +SRC_URI="https://github.com/alainfrisch/ppx_tools/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-$(ver_rs 2 '-')" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="+ocamlopt" + +BDEPEND=" + dev-ml/cppo +" diff --git a/dev-ml/ppx_tools/ppx_tools-6.6.ebuild b/dev-ml/ppx_tools/ppx_tools-6.6.ebuild new file mode 100644 index 000000000000..670e9af0b2e8 --- /dev/null +++ b/dev-ml/ppx_tools/ppx_tools-6.6.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +MY_PV=$(ver_rs 2 '+') +DESCRIPTION="Tools for authors of ppx rewriters" +HOMEPAGE="https://github.com/alainfrisch/ppx_tools" +SRC_URI="https://github.com/alainfrisch/ppx_tools/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-$(ver_rs 2 '-')" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" +IUSE="+ocamlopt" + +BDEPEND=" + dev-ml/cppo +" diff --git a/dev-ml/ppx_tools_versioned/Manifest b/dev-ml/ppx_tools_versioned/Manifest deleted file mode 100644 index 729534d88fa4..000000000000 --- a/dev-ml/ppx_tools_versioned/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ppx_tools_versioned-5.0.1.tar.gz 43741 BLAKE2B 0ff7dc5a03265a7e9fea6bebe372cee993f35d2d2ec451d5f77a1c7de51f91526bf15817882ff93033b3fcd51014efa12841a92cedf243870a22790f00807e9e SHA512 4d47f82c5a05f880dbb3d10caac6de705b9609c488d62be84eb1ebe22fa8c4e3716fad7c546035e955bd0e304d7940f23df090470f86c8d862b549b9db387acb diff --git a/dev-ml/ppx_tools_versioned/metadata.xml b/dev-ml/ppx_tools_versioned/metadata.xml deleted file mode 100644 index efb21d181ae1..000000000000 --- a/dev-ml/ppx_tools_versioned/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">let-def/ppx_tools_versioned</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/ppx_tools_versioned/ppx_tools_versioned-5.0.1.ebuild b/dev-ml/ppx_tools_versioned/ppx_tools_versioned-5.0.1.ebuild deleted file mode 100644 index ec7f405d4dfe..000000000000 --- a/dev-ml/ppx_tools_versioned/ppx_tools_versioned-5.0.1.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit findlib - -MY_PV=${PV/_/} -MY_P=${PN}-${MY_PV} - -DESCRIPTION="Tools for authors of ppx rewriters" -HOMEPAGE="https://github.com/let-def/ppx_tools_versioned" -SRC_URI="https://github.com/let-def/ppx_tools_versioned/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" -IUSE="" - -DEPEND=" - dev-lang/ocaml:= - dev-ml/ocaml-migrate-parsetree:= -" -RDEPEND="${DEPEND}" -S="${WORKDIR}/${MY_P}" - -src_install() { - findlib_src_install - dodoc README.md -} diff --git a/dev-ml/ppx_traverse/Manifest b/dev-ml/ppx_traverse/Manifest deleted file mode 100644 index 8491aaa82c43..000000000000 --- a/dev-ml/ppx_traverse/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ppx_traverse-0.9.0.tar.gz 10837 BLAKE2B b0d3e9a10c5af698105fae5dec13afe8b545bb3ee2b48ec72b3d7e76466d3e2ce7ece1ecdfeeabde63855bf8d24c89a05666f8e2fa8c286621ca1c9bd35274d8 SHA512 914f79405f09ccfecd444416499b63f68f700d4b7485031c45b7ab9500a82c4bc65dad8315a6cc7b7669b2c40f51e98a6fa453869b20501a22eff5b1ffb0e441 diff --git a/dev-ml/ppx_traverse/metadata.xml b/dev-ml/ppx_traverse/metadata.xml deleted file mode 100644 index fd020db20aae..000000000000 --- a/dev-ml/ppx_traverse/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">janestreet/ppx_traverse</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/ppx_traverse/ppx_traverse-0.9.0.ebuild b/dev-ml/ppx_traverse/ppx_traverse-0.9.0.ebuild deleted file mode 100644 index 1ea84ac585ee..000000000000 --- a/dev-ml/ppx_traverse/ppx_traverse-0.9.0.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit opam - -DESCRIPTION="Automatic generation of open recursion classes" -HOMEPAGE="https://github.com/janestreet/ppx_traverse" -SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -DEPEND=" - dev-ml/ppx_core:= - dev-ml/ppx_driver:= - dev-ml/ppx_metaquot:= - dev-ml/ppx_type_conv:= - dev-ml/ocaml-migrate-parsetree:= -" -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} dev-ml/jbuilder" diff --git a/dev-ml/ppx_traverse_builtins/Manifest b/dev-ml/ppx_traverse_builtins/Manifest deleted file mode 100644 index c5a325ceb0c7..000000000000 --- a/dev-ml/ppx_traverse_builtins/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ppx_traverse_builtins-0.9.0.tar.gz 6328 BLAKE2B 1e111d97876fb97826a04dfddbd1289e4b64ca93cb09e2f8692fcd5c1b87eb09259938b31662ed712d3e3926cd3b8edecf967d85ce9846805c74b28a4359e02a SHA512 c8d77138f8fcd4d440870eb9126f5aca2d9fa917fac6bd9aa7f6dd4fb3e75f5860efbdc312ffc23b375808c33e1527726318918bf7bee61f470ef3a2cb40f6ba diff --git a/dev-ml/ppx_traverse_builtins/metadata.xml b/dev-ml/ppx_traverse_builtins/metadata.xml deleted file mode 100644 index fb3dfe0dac1c..000000000000 --- a/dev-ml/ppx_traverse_builtins/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">janestreet/ppx_traverse_builtins</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/ppx_traverse_builtins/ppx_traverse_builtins-0.9.0.ebuild b/dev-ml/ppx_traverse_builtins/ppx_traverse_builtins-0.9.0.ebuild deleted file mode 100644 index 07f2a2aa57fd..000000000000 --- a/dev-ml/ppx_traverse_builtins/ppx_traverse_builtins-0.9.0.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit opam - -DESCRIPTION="Builtins for ppx_traverse" -HOMEPAGE="https://github.com/janestreet/ppx_traverse_builtins" -SRC_URI="https://github.com/janestreet/ppx_traverse_builtins/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND}" -DEPEND="${RDEPEND} - dev-ml/jbuilder" diff --git a/dev-ml/ppx_tydi/Manifest b/dev-ml/ppx_tydi/Manifest new file mode 100644 index 000000000000..924e89640804 --- /dev/null +++ b/dev-ml/ppx_tydi/Manifest @@ -0,0 +1 @@ +DIST ppx_tydi-0.16.0.tar.gz 4583 BLAKE2B b0390da844dacdbe0492dcf9141ae4356ed8b08af328b51a8f6bd7190b58dd4590606f2375338ce5f799ed140b4652e400c5e68ea2dee8a939a464fe9d681513 SHA512 83e72699901af6dfb786f1f0a381f4a2eec6c5d51c98ec2ab76f0f107d87da7c406278a9e71c09fc7a43b8cd19cd97f87f3ba7adea2efe55fb882cd65b81d60b diff --git a/dev-ml/ppx_tydi/metadata.xml b/dev-ml/ppx_tydi/metadata.xml new file mode 100644 index 000000000000..0b17f6b4c3ea --- /dev/null +++ b/dev-ml/ppx_tydi/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">janestreet/ppx_tydi</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/ppx_tydi/ppx_tydi-0.16.0.ebuild b/dev-ml/ppx_tydi/ppx_tydi-0.16.0.ebuild new file mode 100644 index 000000000000..0ff29936db4c --- /dev/null +++ b/dev-ml/ppx_tydi/ppx_tydi-0.16.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Let expressions, inferring pattern type from expression" +HOMEPAGE="https://github.com/janestreet/ppx_tydi" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-lang/ocaml-4.14 + dev-ml/base:${SLOT} + >=dev-ml/ppxlib-0.28:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_type_conv/Manifest b/dev-ml/ppx_type_conv/Manifest deleted file mode 100644 index e7bb605ae29e..000000000000 --- a/dev-ml/ppx_type_conv/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ppx_type_conv-0.9.0.tar.gz 14651 BLAKE2B 50b4ffb85062eb306bbadb3b641f9ca0318e95c614482302c4b3e001eeeb14137c4d0050abb8cf5c6e57a5fd8afe70b16a3455b4080e6f85981c88765c8ba945 SHA512 71af29d7e882652a5e101e1fc3610adb4faaba30068161b4b391e3ce7419af7feffd289070c1707cc961c593eda7b7f325609e8c98543c1168400cfafea31472 diff --git a/dev-ml/ppx_type_conv/metadata.xml b/dev-ml/ppx_type_conv/metadata.xml deleted file mode 100644 index 3d6e4f7701cc..000000000000 --- a/dev-ml/ppx_type_conv/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">janestreet/ppx_type_conv</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/ppx_type_conv/ppx_type_conv-0.9.0.ebuild b/dev-ml/ppx_type_conv/ppx_type_conv-0.9.0.ebuild deleted file mode 100644 index 879332244f97..000000000000 --- a/dev-ml/ppx_type_conv/ppx_type_conv-0.9.0.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit opam - -DESCRIPTION="Support Library for type-driven code generators" -HOMEPAGE="https://github.com/janestreet/ppx_type_conv" -SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" - -DEPEND=" - dev-ml/ppx_driver:= - dev-ml/ppx_metaquot:= - dev-ml/ppx_core:= - dev-ml/ocaml-migrate-parsetree:= - dev-ml/ppx_deriving:= -" - -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} dev-ml/jbuilder" diff --git a/dev-ml/ppx_typerep_conv/Manifest b/dev-ml/ppx_typerep_conv/Manifest index 464a1925c454..506935e8cf2d 100644 --- a/dev-ml/ppx_typerep_conv/Manifest +++ b/dev-ml/ppx_typerep_conv/Manifest @@ -1 +1,4 @@ -DIST ppx_typerep_conv-0.9.0.tar.gz 10844 BLAKE2B 4c21e9529c587507eef26fc53ae2c1153cbecd754d6b36b73ee6e639a13d872932a421207224c392394a52767f5fde66441cf19318499c8604c2e20b9583841a SHA512 155838bf6dce45a043624845ce882eee374df344f76a9433a1170d89cc27856a634f4ca31ad28e46b28c5103d00c3d8d7d79692872c5dfc35d0b4a7eebdb3d1d +DIST ppx_typerep_conv-0.14.1.tar.gz 9453 BLAKE2B 4acafdd51df0659746697283aa3240f1b1403e4e9f9b5fafa6c4b09f4c76f6ac645e2ccab53cba7371b5b004edba38d24198334d10b295d90c8ba5814a602a23 SHA512 6e32f6c2cf6c370fcb8d3b341dbd797c3b7c2557c8604253d744b266c9a3f4984e62ffe6ec5717044378f81e5b78e7f206a7f0f4b43c0dda97a4e7ece745d26d +DIST ppx_typerep_conv-0.14.2.tar.gz 9474 BLAKE2B 7a7ff6669d9af2ced905e5b104058d26ffe06e3784af366a1a4ce753337eeb87c9bfe02d1a6fddaac6c387105d2583194cbd06b915eb35d16e06b1d4ab977e2f SHA512 9372f13cb3f62b3732af4f8ddc00314dd71869bab5599ae0a112d32669de300346781b7fcd2bd649ccedfde54fcd86fb6186812eeb528858048bcd9d5ad443dd +DIST ppx_typerep_conv-0.15.0.tar.gz 9392 BLAKE2B 3f7d9ac373048434ea55deab18b25bd74da77116b20db841c412c3304f318a1b820708c3f9cb6eab1f92fda399d3e6168fc8b3cc0546501f4fc6b57da5f74414 SHA512 3f5bb2c70674e5f6219daa883fe948023a60558c9560c5d8e6b187e0420adf8767ce4f5cca06fe7edccd52e531b2e79d962f7fdc7502cb63280c364627621c73 +DIST ppx_typerep_conv-0.16.0.tar.gz 9421 BLAKE2B dbef20e205e550ab4ef16cf0e53bb47567b922297818a944a3fb6cd07eee90c6184d9cd33d7fc2e67b47fd371c95410f7022a8e140c9946c1c7502bb2a433d0c SHA512 842f3caeb22b7d1feb1de9f599ffe2474365704e7ce9c05366b9714bcbf165791eda8b16d420a3a64ccc8ea44a9b2178ffddaa8e3ad005c6536c3559f2da295a diff --git a/dev-ml/ppx_typerep_conv/metadata.xml b/dev-ml/ppx_typerep_conv/metadata.xml index f6ee225d2d25..329c98961a0d 100644 --- a/dev-ml/ppx_typerep_conv/metadata.xml +++ b/dev-ml/ppx_typerep_conv/metadata.xml @@ -1,9 +1,9 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">janestreet/ppx_typerep_conv</remote-id> diff --git a/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.1-r1.ebuild b/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.1-r1.ebuild new file mode 100644 index 000000000000..0df0cc4ce894 --- /dev/null +++ b/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.1-r1.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Generation of runtime types from type declarations" +HOMEPAGE="https://github.com/janestreet/ppx_typerep_conv" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-ml/base-0.14.0:= + >=dev-ml/typerep-0.14.0:= + >=dev-ml/ppxlib-0.18.0:= + <dev-ml/ppxlib-0.21.0:= + >=dev-ml/ocaml-compiler-libs-0.11.0:= + >=dev-ml/ocaml-migrate-parsetree-2.0.0:= + dev-ml/cinaps:= + dev-ml/sexplib0:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.2.ebuild b/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.2.ebuild new file mode 100644 index 000000000000..3162827ca211 --- /dev/null +++ b/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.2.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Generation of runtime types from type declarations" +HOMEPAGE="https://github.com/janestreet/ppx_typerep_conv" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-ml/base-0.14.0:= + >=dev-ml/typerep-0.14.0:= + >=dev-ml/ppxlib-0.22.0:= + >=dev-ml/ocaml-compiler-libs-0.11.0:= + >=dev-ml/ocaml-migrate-parsetree-2.0.0:= + dev-ml/cinaps:= + dev-ml/sexplib0:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.9.0.ebuild b/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.15.0.ebuild index 30147fc55d68..d35b1b58448a 100644 --- a/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.9.0.ebuild +++ b/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.15.0.ebuild @@ -1,26 +1,22 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit opam +inherit dune DESCRIPTION="Generation of runtime types from type declarations" HOMEPAGE="https://github.com/janestreet/ppx_typerep_conv" SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" DEPEND=" - dev-ml/ppx_core:= - dev-ml/ppx_driver:= - dev-ml/ppx_metaquot:= - dev-ml/ppx_type_conv:= - dev-ml/typerep:= - dev-ml/ocaml-migrate-parsetree:= - " + dev-ml/typerep:${SLOT} + >=dev-ml/ppxlib-0.23.0:= + >=dev-ml/ocaml-compiler-libs-0.11.0:= +" RDEPEND="${DEPEND}" -DEPEND="${DEPEND} dev-ml/jbuilder" diff --git a/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.16.0.ebuild b/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.16.0.ebuild new file mode 100644 index 000000000000..2810a82752c1 --- /dev/null +++ b/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.16.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Generation of runtime types from type declarations" +HOMEPAGE="https://github.com/janestreet/ppx_typerep_conv" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-lang/ocaml-4.14 + dev-ml/typerep:${SLOT} + >=dev-ml/ppxlib-0.28.0:= + >=dev-ml/ocaml-compiler-libs-0.11.0:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_variants_conv/Manifest b/dev-ml/ppx_variants_conv/Manifest index e3c482db930f..078aed006c13 100644 --- a/dev-ml/ppx_variants_conv/Manifest +++ b/dev-ml/ppx_variants_conv/Manifest @@ -1 +1,4 @@ -DIST ppx_variants_conv-0.9.0.tar.gz 10649 BLAKE2B 824405cce55213ab055fb576becba6b7c2111501ad9e2784fd4eb62c32edf1288eb66f1e8d4c0e78e6aeb8ecf4ad62819b767c4d0a7eedc5ddbd3803d60e028a SHA512 4bb7c087c835fe0c8debc25b66dab9da2da3a5ad4eef856845075a146a2fe3a2598a5b77851bd922b532b57cb821ee934336f8638d44cc0fd81faefcc56e1d89 +DIST ppx_variants_conv-0.14.1.tar.gz 9640 BLAKE2B a73241a8dfc1cf41d2ad184f7e321484525794e66a1e881c822616aca6f8d221e9e699464716410a71ae3cbd542eef6315e0d183447e5e0e49bdb02935876375 SHA512 2ee21751de1595e56b151d87413554af5c0aaf92053ddd2834cadea812f1f59fcd078f6f4a9e9894eca9ffbf211ed2de996df065534c84256dc9670ee8fcbed5 +DIST ppx_variants_conv-0.14.2.tar.gz 9626 BLAKE2B 1effb717e72237ec5522034d5885e6f2919eb80d16266b14cb4c2b9bf6b2d6e8792f3a8232130de7a1b6c51233add4984add36f8da74dd526d9e3cbbe0f14cd7 SHA512 1ae714bea76ba4856c5ab1a7266b28f0ca4462dea26afefe6953eae1ac683f98748cb6281155cc89380d25c81311f78afa6f44e39413fafa63bf043623538a48 +DIST ppx_variants_conv-0.15.0.tar.gz 10530 BLAKE2B 5947ce3056639ae54f7fb7aea16f1657997ef631f4544baae849023b3d9cc29c8711cc3913e3583b58db99afea793d4cfe13c189e3f0ca44e5ddb0e9515a0507 SHA512 549b8d7af75cb98bc6cfe3bc53d43a9bee5c767de149905faf76c0a97c5be86d14d784377805c3932423d4dc698375edbd52f1cf508a4d0f3ea8e79f7e284224 +DIST ppx_variants_conv-0.16.0.tar.gz 12331 BLAKE2B d8b454b1d489dede40ea0d43f6d9f8ee30784b975ac388f0c05c3d4778690a102ee8105d888edec0fe899906c8b7e3d083eb6ff0b79d5ee85b5af57ecada0495 SHA512 56a4e1da5cc855549e59adcbe25dfc175c7c2bd989f0b984182e2c7d35d5fa19829b38cbbd64104f22dfe06b4460f20ad66e922a553061cabde3d73473cdf33a diff --git a/dev-ml/ppx_variants_conv/files/ppx_variants_conv-0.14.1-ppxlib-0.23-compatibility.patch b/dev-ml/ppx_variants_conv/files/ppx_variants_conv-0.14.1-ppxlib-0.23-compatibility.patch new file mode 100644 index 000000000000..d8df60aeec71 --- /dev/null +++ b/dev-ml/ppx_variants_conv/files/ppx_variants_conv-0.14.1-ppxlib-0.23-compatibility.patch @@ -0,0 +1,31 @@ +From 6103f6fc56f978c847ba7c1f2d9f38ee93a5e337 Mon Sep 17 00:00:00 2001 +From: Sonja Heinze <sonjaleaheinze@gmail.com> +Date: Tue, 9 Mar 2021 12:57:47 +0100 +Subject: [PATCH] Adapt to Ppxlib's API change + +Ppxlib is removing Lexer.keyword_table from the API in exchange for +the more lightweight Keyword.is_keyword. + +Signed-off-by: Sonja Heinze <sonjaleaheinze@gmail.com> +--- a/ppx_variants_conv.opam ++++ b/ppx_variants_conv.opam +@@ -15,7 +15,7 @@ depends: [ + "base" {>= "v0.14" & < "v0.15"} + "variantslib" {>= "v0.14" & < "v0.15"} + "dune" {>= "2.0.0"} +- "ppxlib" {>= "0.14.0"} ++ "ppxlib" {>= "0.23.0"} + ] + synopsis: "Generation of accessor and iteration functions for ocaml variant types" + description: " +--- a/src/ppx_variants_conv.ml ++++ b/src/ppx_variants_conv.ml +@@ -66,7 +66,7 @@ end + + let variant_name_to_string v = + let s = String.lowercase v in +- if Caml.Hashtbl.mem Lexer.keyword_table s ++ if Keyword.is_keyword s + then s ^ "_" + else s + diff --git a/dev-ml/ppx_variants_conv/metadata.xml b/dev-ml/ppx_variants_conv/metadata.xml index d13fa2252af4..7ad0b342522e 100644 --- a/dev-ml/ppx_variants_conv/metadata.xml +++ b/dev-ml/ppx_variants_conv/metadata.xml @@ -1,9 +1,9 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">janestreet/ppx_variants_conv</remote-id> diff --git a/dev-ml/ppx_variants_conv/ppx_variants_conv-0.14.1-r2.ebuild b/dev-ml/ppx_variants_conv/ppx_variants_conv-0.14.1-r2.ebuild new file mode 100644 index 000000000000..71698f6d63b8 --- /dev/null +++ b/dev-ml/ppx_variants_conv/ppx_variants_conv-0.14.1-r2.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Generation of accessor and iteration functions for ocaml variant types" +HOMEPAGE="https://github.com/janestreet/ppx_variants_conv" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-ml/base-0.14.0:= + >=dev-ml/variantslib-0.14.0:= + >=dev-ml/ppxlib-0.23.0:= + >=dev-ml/ocaml-compiler-libs-0.11.0:= + >=dev-ml/ocaml-migrate-parsetree-2.0.0:= + dev-ml/cinaps:= + dev-ml/sexplib0:= +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-0.14.1-ppxlib-0.23-compatibility.patch +) diff --git a/dev-ml/ppx_variants_conv/ppx_variants_conv-0.14.1.ebuild b/dev-ml/ppx_variants_conv/ppx_variants_conv-0.14.1.ebuild new file mode 100644 index 000000000000..9649f93e5b0e --- /dev/null +++ b/dev-ml/ppx_variants_conv/ppx_variants_conv-0.14.1.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Generation of accessor and iteration functions for ocaml variant types" +HOMEPAGE="https://github.com/janestreet/ppx_variants_conv" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-ml/base-0.14.0:= + >=dev-ml/variantslib-0.14.0:= + >=dev-ml/ppxlib-0.18.0:= + <dev-ml/ppxlib-0.23.0:= + >=dev-ml/ocaml-compiler-libs-0.11.0:= + >=dev-ml/ocaml-migrate-parsetree-2.0.0:= + dev-ml/cinaps:= + dev-ml/sexplib0:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_variants_conv/ppx_variants_conv-0.14.2-r1.ebuild b/dev-ml/ppx_variants_conv/ppx_variants_conv-0.14.2-r1.ebuild new file mode 100644 index 000000000000..68cb649a48fe --- /dev/null +++ b/dev-ml/ppx_variants_conv/ppx_variants_conv-0.14.2-r1.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Generation of accessor and iteration functions for ocaml variant types" +HOMEPAGE="https://github.com/janestreet/ppx_variants_conv" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-ml/base-0.14.0:= + >=dev-ml/variantslib-0.14.0:= + >=dev-ml/ppxlib-0.23.0:= + >=dev-ml/ocaml-compiler-libs-0.11.0:= + >=dev-ml/ocaml-migrate-parsetree-2.0.0:= + dev-ml/cinaps:= + dev-ml/sexplib0:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppx_variants_conv/ppx_variants_conv-0.9.0.ebuild b/dev-ml/ppx_variants_conv/ppx_variants_conv-0.15.0.ebuild index bf5e566ce2b0..c1cc325c1f3b 100644 --- a/dev-ml/ppx_variants_conv/ppx_variants_conv-0.9.0.ebuild +++ b/dev-ml/ppx_variants_conv/ppx_variants_conv-0.15.0.ebuild @@ -1,26 +1,22 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit opam +inherit dune DESCRIPTION="Generation of accessor and iteration functions for ocaml variant types" HOMEPAGE="https://github.com/janestreet/ppx_variants_conv" SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" DEPEND=" - dev-ml/ppx_core:= - dev-ml/ppx_driver:= - dev-ml/ppx_metaquot:= - dev-ml/ppx_type_conv:= - dev-ml/variantslib:= - dev-ml/ocaml-migrate-parsetree:= + dev-ml/variantslib:${SLOT} + >=dev-ml/ppxlib-0.23.0:= + >=dev-ml/ocaml-compiler-libs-0.11.0:= " RDEPEND="${DEPEND}" -DEPEND="${DEPEND} dev-ml/jbuilder" diff --git a/dev-ml/ppx_variants_conv/ppx_variants_conv-0.16.0.ebuild b/dev-ml/ppx_variants_conv/ppx_variants_conv-0.16.0.ebuild new file mode 100644 index 000000000000..5966431ee5a2 --- /dev/null +++ b/dev-ml/ppx_variants_conv/ppx_variants_conv-0.16.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Generation of accessor and iteration functions for ocaml variant types" +HOMEPAGE="https://github.com/janestreet/ppx_variants_conv" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-lang/ocaml-4.14 + dev-ml/variantslib:${SLOT} + >=dev-ml/ppxlib-0.28.0:= + >=dev-ml/ocaml-compiler-libs-0.11.0:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/ppxlib/Manifest b/dev-ml/ppxlib/Manifest new file mode 100644 index 000000000000..fe3cd87931e0 --- /dev/null +++ b/dev-ml/ppxlib/Manifest @@ -0,0 +1,8 @@ +DIST ppxlib-0.20.0.tar.gz 193453 BLAKE2B baf5703737792f274654de489aee31c1d324011cbe7e4f5b73102ea352d10ca513ed1b04ec43324640a01c0e5d168945806f6fd4e3a60c9f70c28392a720ec61 SHA512 e19699cb09c441d0ecbda191df78e8227111f1880be4f2810228cbfbf93c9474ba6d04e0e3b4b14820ea7dbd1388fd4ac86f818a28819e7d8b0dd00200609a7d +DIST ppxlib-0.21.0.tar.gz 201905 BLAKE2B f7a7b69ab07b2a5dce542877989fb4ca820acdda375371895072b857a44e8e7f437695f43990472dfad88261179ff07bd33f6e39881c2b28ff2650d7e2a53bdf SHA512 5760ecc8a5e0c0f49ad4f0d3ba2546185d36411f4292c4ebfbf0c9520438546a60d8fe0b265cec70793b03cc684e399401ff761cb1c369966add70118f1ecda5 +DIST ppxlib-0.22.0.tar.gz 202241 BLAKE2B 6b18ceb23e248eb2b4faed66ba0ea1cbee36df61cee9458fc0fd7057eff433340cb602a429c3f100ee054da06d9de20eca44e5ecc4ba98c888cfec2c83097151 SHA512 11442120c24bf60d9de90c9a325de9e5d87d87ba08d8e4cd216a3434f422c62427aa4214909b80646db638423ea35dff4280d5a70cf51bdfadc0a97745c32d41 +DIST ppxlib-0.22.2.tar.gz 202895 BLAKE2B 41d2c2e698846e5dfeb4158966b65dd29b253645b0286d0eab5a9dfb0e684b8b43f17a32b23023198d2c4e50e836705d2c965ea74ef337c5b0cf6aecd6fa4167 SHA512 3a83693551f11965b219a9caa4eaffbf358ea1311e05a38bfd531b8ad225d6571d86db7282e1d5bdc09775f2ba47791c03351402720cf5c2adefc52926d498e4 +DIST ppxlib-0.24.0.tar.gz 390297 BLAKE2B 7d8972b766cc8104a4d43aebc79e927e51cba114ad678837bfa1b8f009e2437df948c6cd3461db58ef247145e629d3bb11dff58dc5feadefce8152c77b056dfa SHA512 2f6a94c90fd17cea00f3294fde5742637d4758b9f43a021d667f2b09be326954efe22bb188ccf6a7205338ffc75fe096cbe2a075b125e3ced9f829a06ad2f496 +DIST ppxlib-0.29.0.tar.gz 572842 BLAKE2B e772cfbbc5ff0390b1d256b7671e51aac0c86fe14e912e42fa6f428958d25af09920deae89ba080e37842f21361494237b697abe48dd563df9f69512a4a110ea SHA512 34babcea63b952ca610b5b9841a7d045e3973870014968d5abfff259de8d0f383e79f799fa3522830e0da5a7ff02fa52764b7cad64c8ac0da5a37f8897314c80 +DIST ppxlib-0.29.1.tar.gz 543819 BLAKE2B b0d3920b2aaef887b0120ae66dfa3a0f83d4a4edb237390bddd5206084f77bbd8483d99bc422ce6411a9a1aca7de4fcc5f1f85f9cf46532b7e06c476f2b76b72 SHA512 9bfd52709a63399ff35697b442de6818e2a61b9a2ccf33638f2da6295e3e034e2ae6108a2b8567402e80d928636cdee1572cc14d228a47fbda50625219e411f9 +DIST ppxlib-0.30.0.tar.gz 573753 BLAKE2B f16ba3b01288a535ebf7842d8b9379061cc86cb1bad7841540855508d7d9c10c27e63456d68a16a2408a6eee5cffe82c3c0202ad7894b9fabad8194136762e30 SHA512 a7310c5c0fe76c72984bc6a27648bf12ac83222c029b91a7abf8be13f1950f84de4b24e28f2bb50a6a65c16c9a6bb8c4d3d0596c4b5f7f5bedba87f8ca55a810 diff --git a/dev-ml/ppxlib/metadata.xml b/dev-ml/ppxlib/metadata.xml new file mode 100644 index 000000000000..5fd0f8191129 --- /dev/null +++ b/dev-ml/ppxlib/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">ocaml-ppx/ppxlib</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/ppxlib/ppxlib-0.20.0-r2.ebuild b/dev-ml/ppxlib/ppxlib-0.20.0-r2.ebuild new file mode 100644 index 000000000000..15a01ecf7ce7 --- /dev/null +++ b/dev-ml/ppxlib/ppxlib-0.20.0-r2.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +# Note that new "major" versions may change which OCaml version they support +# See: +# https://github.com/ocaml-ppx/ppxlib/issues/243 +# https://github.com/ocaml-ppx/ppxlib/issues/232 + +DESCRIPTION="Base library and tools for ppx rewriters" +HOMEPAGE="https://github.com/ocaml-ppx/ppxlib" +SRC_URI="https://github.com/ocaml-ppx/ppxlib/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-ml/base-0.11.0:=[ocamlopt?] + dev-ml/findlib:=[ocamlopt?] + >=dev-ml/ocaml-compiler-libs-0.11.0:=[ocamlopt?] + >=dev-ml/ocaml-migrate-parsetree-2.1.0:=[ocamlopt?] + dev-ml/sexplib0:=[ocamlopt?] + dev-ml/stdlib-shims:=[ocamlopt?] + >=dev-ml/ppx_derivers-1.2.1:=[ocamlopt?] + >=dev-ml/stdio-0.11.0:=[ocamlopt?] +" +DEPEND="${RDEPEND} + test? ( dev-ml/cinaps:= )" diff --git a/dev-ml/ppxlib/ppxlib-0.21.0-r4.ebuild b/dev-ml/ppxlib/ppxlib-0.21.0-r4.ebuild new file mode 100644 index 000000000000..8957b814656c --- /dev/null +++ b/dev-ml/ppxlib/ppxlib-0.21.0-r4.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +# Note that new "major" versions may change which OCaml version they support +# See: +# https://github.com/ocaml-ppx/ppxlib/issues/243 +# https://github.com/ocaml-ppx/ppxlib/issues/232 + +DESCRIPTION="Base library and tools for ppx rewriters" +HOMEPAGE="https://github.com/ocaml-ppx/ppxlib" +SRC_URI="https://github.com/ocaml-ppx/ppxlib/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-ml/base-0.11.0:=[ocamlopt?] + dev-ml/findlib:=[ocamlopt?] + >=dev-ml/ocaml-compiler-libs-0.11.0:=[ocamlopt?] + >=dev-ml/ocaml-migrate-parsetree-2.1.0:=[ocamlopt?] + dev-ml/sexplib0:=[ocamlopt?] + dev-ml/stdlib-shims:=[ocamlopt?] + >=dev-ml/ppx_derivers-1.2.1:=[ocamlopt?] + >=dev-ml/stdio-0.11.0:=[ocamlopt?] +" +DEPEND="${RDEPEND} + test? ( + dev-ml/cinaps:= + dev-ml/re:= + ) +" + +src_install() { + dune_src_install + + # Clashes with dev-libs/nss[utils], accidentally installed upstream + # https://github.com/ocaml-ppx/ppxlib/issues/224 + rm "${ED}"/usr/bin/pp || die +} diff --git a/dev-ml/ppxlib/ppxlib-0.22.0-r4.ebuild b/dev-ml/ppxlib/ppxlib-0.22.0-r4.ebuild new file mode 100644 index 000000000000..ac19e6280bab --- /dev/null +++ b/dev-ml/ppxlib/ppxlib-0.22.0-r4.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +# Note that new "major" versions may change which OCaml version they support +# See: +# https://github.com/ocaml-ppx/ppxlib/issues/243 +# https://github.com/ocaml-ppx/ppxlib/issues/232 + +DESCRIPTION="Base library and tools for ppx rewriters" +HOMEPAGE="https://github.com/ocaml-ppx/ppxlib" +SRC_URI="https://github.com/ocaml-ppx/ppxlib/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-ml/ocaml-compiler-libs-0.11.0:=[ocamlopt?] + >=dev-ml/ocaml-migrate-parsetree-2.1.0:=[ocamlopt?] + dev-ml/sexplib0:=[ocamlopt?] + dev-ml/stdlib-shims:=[ocamlopt?] + >=dev-ml/ppx_derivers-1.2.1:=[ocamlopt?] +" +DEPEND="${RDEPEND} + test? ( + dev-ml/findlib:=[ocamlopt?] + >=dev-ml/base-0.11.0:=[ocamlopt?] + dev-ml/cinaps:= + dev-ml/re:= + >=dev-ml/stdio-0.11.0:=[ocamlopt?] + ) +" +BDEPEND=">=dev-ml/dune-2.8" + +src_install() { + dune_src_install + + # Clashes with dev-libs/nss[utils], accidentally installed upstream + # https://github.com/ocaml-ppx/ppxlib/issues/224 + rm "${ED}"/usr/bin/pp || die +} diff --git a/dev-ml/ppxlib/ppxlib-0.22.2-r3.ebuild b/dev-ml/ppxlib/ppxlib-0.22.2-r3.ebuild new file mode 100644 index 000000000000..80bdccbf966e --- /dev/null +++ b/dev-ml/ppxlib/ppxlib-0.22.2-r3.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +# Note that new "major" versions may change which OCaml version they support +# See: +# https://github.com/ocaml-ppx/ppxlib/issues/243 +# https://github.com/ocaml-ppx/ppxlib/issues/232 + +DESCRIPTION="Base library and tools for ppx rewriters" +HOMEPAGE="https://github.com/ocaml-ppx/ppxlib" +SRC_URI="https://github.com/ocaml-ppx/ppxlib/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-ml/ocaml-compiler-libs-0.11.0:=[ocamlopt?] + >=dev-ml/ocaml-migrate-parsetree-2.2.0:=[ocamlopt?] + dev-ml/sexplib0:=[ocamlopt?] + dev-ml/stdlib-shims:=[ocamlopt?] + >=dev-ml/ppx_derivers-1.2.1:=[ocamlopt?] +" +DEPEND="${RDEPEND} + test? ( + dev-ml/findlib:=[ocamlopt?] + >=dev-ml/base-0.11.0:=[ocamlopt?] + dev-ml/cinaps:= + dev-ml/re:= + >=dev-ml/stdio-0.11.0:=[ocamlopt?] + ) +" +BDEPEND=">=dev-ml/dune-2.8" + +src_install() { + dune_src_install + + # Clashes with dev-libs/nss[utils], accidentally installed upstream + # https://github.com/ocaml-ppx/ppxlib/issues/224 + rm "${ED}"/usr/bin/pp || die +} diff --git a/dev-ml/ppxlib/ppxlib-0.24.0-r1.ebuild b/dev-ml/ppxlib/ppxlib-0.24.0-r1.ebuild new file mode 100644 index 000000000000..f15f96e90ae0 --- /dev/null +++ b/dev-ml/ppxlib/ppxlib-0.24.0-r1.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +# Note that new "major" versions may change which OCaml version they support +# See: +# https://github.com/ocaml-ppx/ppxlib/issues/243 +# https://github.com/ocaml-ppx/ppxlib/issues/232 + +DESCRIPTION="Base library and tools for ppx rewriters" +HOMEPAGE="https://github.com/ocaml-ppx/ppxlib" +SRC_URI="https://github.com/ocaml-ppx/ppxlib/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-ml/ocaml-compiler-libs-0.11.0:=[ocamlopt?] + >=dev-ml/ocaml-migrate-parsetree-2.2.0:=[ocamlopt?] + dev-ml/sexplib0:=[ocamlopt?] + dev-ml/stdlib-shims:=[ocamlopt?] + >=dev-ml/ppx_derivers-1.2.1:=[ocamlopt?] +" +DEPEND="${RDEPEND} + test? ( + dev-ml/findlib:=[ocamlopt?] + >=dev-ml/base-0.11.0:=[ocamlopt?] + dev-ml/cinaps:= + dev-ml/re:= + >=dev-ml/stdio-0.11.0:=[ocamlopt?] + ) +" +BDEPEND=">=dev-ml/dune-2.8" diff --git a/dev-ml/ppxlib/ppxlib-0.29.0-r1.ebuild b/dev-ml/ppxlib/ppxlib-0.29.0-r1.ebuild new file mode 100644 index 000000000000..7e0d07cf07ad --- /dev/null +++ b/dev-ml/ppxlib/ppxlib-0.29.0-r1.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +# Note that new "major" versions may change which OCaml version they support +# See: +# https://github.com/ocaml-ppx/ppxlib/issues/243 +# https://github.com/ocaml-ppx/ppxlib/issues/232 + +DESCRIPTION="Base library and tools for ppx rewriters" +HOMEPAGE="https://github.com/ocaml-ppx/ppxlib" +SRC_URI="https://github.com/ocaml-ppx/ppxlib/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-ml/ocaml-compiler-libs-0.11.0:=[ocamlopt?] + >=dev-ml/ocaml-migrate-parsetree-2.2.0:=[ocamlopt?] + dev-ml/sexplib0:=[ocamlopt?] + dev-ml/stdlib-shims:=[ocamlopt?] + >=dev-ml/ppx_derivers-1.2.1:=[ocamlopt?] +" +DEPEND="${RDEPEND} + test? ( + dev-ml/findlib:=[ocamlopt?] + >=dev-ml/base-0.11.0:=[ocamlopt?] + dev-ml/cinaps:= + dev-ml/re:= + >=dev-ml/stdio-0.11.0:=[ocamlopt?] + ) +" +BDEPEND=">=dev-ml/dune-2.8" diff --git a/dev-ml/ppxlib/ppxlib-0.29.1-r1.ebuild b/dev-ml/ppxlib/ppxlib-0.29.1-r1.ebuild new file mode 100644 index 000000000000..ba772d5ce6a8 --- /dev/null +++ b/dev-ml/ppxlib/ppxlib-0.29.1-r1.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +# Note that new "major" versions may change which OCaml version they support +# See: +# https://github.com/ocaml-ppx/ppxlib/issues/243 +# https://github.com/ocaml-ppx/ppxlib/issues/232 + +DESCRIPTION="Base library and tools for ppx rewriters" +HOMEPAGE="https://github.com/ocaml-ppx/ppxlib" +SRC_URI="https://github.com/ocaml-ppx/ppxlib/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-ml/ocaml-compiler-libs-0.11.0:=[ocamlopt?] + >=dev-ml/ocaml-migrate-parsetree-2.2.0:=[ocamlopt?] + dev-ml/sexplib0:=[ocamlopt?] + dev-ml/stdlib-shims:=[ocamlopt?] + >=dev-ml/ppx_derivers-1.2.1:=[ocamlopt?] +" +DEPEND="${RDEPEND} + test? ( + dev-ml/findlib:=[ocamlopt?] + >=dev-ml/base-0.11.0:=[ocamlopt?] + dev-ml/cinaps:= + dev-ml/re:= + >=dev-ml/stdio-0.11.0:=[ocamlopt?] + ) +" +BDEPEND=">=dev-ml/dune-2.8" diff --git a/dev-ml/ppxlib/ppxlib-0.30.0-r1.ebuild b/dev-ml/ppxlib/ppxlib-0.30.0-r1.ebuild new file mode 100644 index 000000000000..7e0d07cf07ad --- /dev/null +++ b/dev-ml/ppxlib/ppxlib-0.30.0-r1.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +# Note that new "major" versions may change which OCaml version they support +# See: +# https://github.com/ocaml-ppx/ppxlib/issues/243 +# https://github.com/ocaml-ppx/ppxlib/issues/232 + +DESCRIPTION="Base library and tools for ppx rewriters" +HOMEPAGE="https://github.com/ocaml-ppx/ppxlib" +SRC_URI="https://github.com/ocaml-ppx/ppxlib/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-ml/ocaml-compiler-libs-0.11.0:=[ocamlopt?] + >=dev-ml/ocaml-migrate-parsetree-2.2.0:=[ocamlopt?] + dev-ml/sexplib0:=[ocamlopt?] + dev-ml/stdlib-shims:=[ocamlopt?] + >=dev-ml/ppx_derivers-1.2.1:=[ocamlopt?] +" +DEPEND="${RDEPEND} + test? ( + dev-ml/findlib:=[ocamlopt?] + >=dev-ml/base-0.11.0:=[ocamlopt?] + dev-ml/cinaps:= + dev-ml/re:= + >=dev-ml/stdio-0.11.0:=[ocamlopt?] + ) +" +BDEPEND=">=dev-ml/dune-2.8" diff --git a/dev-ml/protocol_version_header/Manifest b/dev-ml/protocol_version_header/Manifest new file mode 100644 index 000000000000..d8c3f6bb7b51 --- /dev/null +++ b/dev-ml/protocol_version_header/Manifest @@ -0,0 +1,3 @@ +DIST protocol_version_header-0.14.0.tar.gz 6524 BLAKE2B 3463cfbfa2faf0573dec57e8d1eae5ed47f2210c7eb3872fcb5a9206bf65cc22f184944f4c624a17e44e267f3b0443f8e4fe33e8d40157e9f5afb68f0b7b5e4e SHA512 50f58d79a2c92a2f7b9f1cd54b548ae53649bd876f77a017b1483fda53cd1b398dbef7e992dcb283796d035fa361424c9529244b73d33d9ff2699dae70b6410a +DIST protocol_version_header-0.15.0.tar.gz 7704 BLAKE2B 208254706a2d8ae9f77a9c9c40bfd8af34585a7e1f201338d888b12f804139868987532db9b4f862c659e3101c5ed493bb782f64ed251030e235937beb419d65 SHA512 1c28fbe26155dc5d780ce111725b21b95773d0a0bc3219a37e94b7c920c18e55fa33b31156f3ab3c02ae403c7f667f009f3ef7a965cadf7177c857bd71bd4956 +DIST protocol_version_header-0.16.0.tar.gz 9189 BLAKE2B d61ebb49e15d47e76fc01911a6c9e5fcacb05bbee39cc5e40557c8882226edb8d2b78eed0c23a14e9241961511412f44f5522d146851ee0e3ace85b9f1b20838 SHA512 ac11dd81f4afb47ad670919e2b3ea49a7e05d193e45369f145711b2266fc54c8eea180cba285effecdc2a59e1cff65c59acd182fa3d88191e9813855dea370c7 diff --git a/dev-ml/ocaml-ipaddr/metadata.xml b/dev-ml/protocol_version_header/metadata.xml index 1d6e7b2fd2e2..2dc487fda89e 100644 --- a/dev-ml/ocaml-ipaddr/metadata.xml +++ b/dev-ml/protocol_version_header/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> - <remote-id type="github">mirage/ocaml-ipaddr</remote-id> + <remote-id type="github">janestreet/protocol_version_header</remote-id> </upstream> </pkgmetadata> diff --git a/dev-ml/protocol_version_header/protocol_version_header-0.14.0.ebuild b/dev-ml/protocol_version_header/protocol_version_header-0.14.0.ebuild new file mode 100644 index 000000000000..1aee6011304d --- /dev/null +++ b/dev-ml/protocol_version_header/protocol_version_header-0.14.0.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Protocol aware version negotiation for OCaml" +HOMEPAGE="https://github.com/janestreet/protocol_version_header" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64" +IUSE="+ocamlopt" + +RDEPEND=" + dev-ml/core_kernel:= + dev-ml/ppx_jane:= +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/protocol_version_header/protocol_version_header-0.15.0.ebuild b/dev-ml/protocol_version_header/protocol_version_header-0.15.0.ebuild new file mode 100644 index 000000000000..4ca5ce24acc1 --- /dev/null +++ b/dev-ml/protocol_version_header/protocol_version_header-0.15.0.ebuild @@ -0,0 +1,18 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Protocol aware version negotiation for OCaml" +HOMEPAGE="https://github.com/janestreet/protocol_version_header" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86" +IUSE="+ocamlopt" + +RDEPEND="dev-ml/core:${SLOT}" +DEPEND="${RDEPEND}" diff --git a/dev-ml/protocol_version_header/protocol_version_header-0.16.0.ebuild b/dev-ml/protocol_version_header/protocol_version_header-0.16.0.ebuild new file mode 100644 index 000000000000..abfa5a73185b --- /dev/null +++ b/dev-ml/protocol_version_header/protocol_version_header-0.16.0.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Protocol aware version negotiation for OCaml" +HOMEPAGE="https://github.com/janestreet/protocol_version_header" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +RDEPEND=" + >=dev-lang/ocaml-4.14 + dev-ml/core:${SLOT} + dev-ml/ppx_jane:${SLOT} +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/ptime/Manifest b/dev-ml/ptime/Manifest new file mode 100644 index 000000000000..3fcbaa0c7ed4 --- /dev/null +++ b/dev-ml/ptime/Manifest @@ -0,0 +1,2 @@ +DIST ptime-1.0.0.tbz 33749 BLAKE2B 6765924f624a92c69495883accd47c66294f49e2d2841fafc66444369b97b9dceaecac0c00a14cba2e8e710bf85c6d5759f419e83d4d0a7bee56c197d06bb000 SHA512 df2410d9cc25a33083fe968a584b8fb4d68ad5c077f3356da0a20427e6cd8756a5b946b921e5cf8ed4097f2c506e93345d9dca63b113be644d5a7cc0753d1534 +DIST ptime-1.1.0.tbz 34641 BLAKE2B b4e4991921d348ffcaf9b3a6c822b5e668f0dfad804a2be56e0f1ce2ef775a892312b545d0d098c9c74c1ab6725ddcd63aa2424571f61107fe4f945c03de35b2 SHA512 309b8383f61b58840e58a82802ec8fbc61b7cc95a4590d38ad427e484cbaaf66f03fa8e6484b5b6855468a87e745aed103bf6f1041ec05062230a9fa5fb86cc6 diff --git a/dev-ml/ptime/metadata.xml b/dev-ml/ptime/metadata.xml new file mode 100644 index 000000000000..f6706c1dfaf1 --- /dev/null +++ b/dev-ml/ptime/metadata.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <longdescription lang="en">Ptime has platform independent POSIX time support in pure OCaml. It +provides a type to represent a well-defined range of POSIX timestamps +with picosecond precision, conversion with date-time values, +conversion with [RFC 3339 timestamps][rfc3339] and pretty printing to +a human-readable, locale-independent representation. + +The additional Ptime_clock library provides access to a system POSIX +clock and to the system's current time zone offset. + +Ptime is not a calendar library. + +Ptime has no dependency. Ptime_clock depends on your system library or +JavaScript runtime system. Ptime and its libraries are distributed +under the ISC license. + +[rfc3339]: http://tools.ietf.org/html/rfc3339 + +Home page: http://erratique.ch/software/ptime</longdescription> + <upstream> + <doc>https://erratique.ch/software/ptime/doc/</doc> + <bugs-to>https://github.com/dbuenzli/ptime/issues</bugs-to> + <remote-id type="github">dbuenzli/ptime</remote-id> + <maintainer> + <name>Daniel Bünzli</name> + <email>daniel.buenzli@erratique.ch</email> + </maintainer> + </upstream> +</pkgmetadata> diff --git a/dev-ml/ptime/ptime-1.0.0.ebuild b/dev-ml/ptime/ptime-1.0.0.ebuild new file mode 100644 index 000000000000..49d8a2f7ff44 --- /dev/null +++ b/dev-ml/ptime/ptime-1.0.0.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit opam findlib + +DESCRIPTION="POSIX time for OCaml" +HOMEPAGE=" + https://erratique.ch/software/ptime + https://github.com/dbuenzli/ptime + https://opam.ocaml.org/packages/ptime/ +" +SRC_URI="https://erratique.ch/software/ptime/releases/${P}.tbz" + +LICENSE="ISC" +SLOT="0/${PV}" +KEYWORDS="~amd64" +IUSE="" + +RDEPEND="" +DEPEND=" + ${RDEPEND} + dev-ml/topkg +" +BDEPEND="dev-ml/ocamlbuild" + +OPAM_FILE=opam + +src_compile() { + ocaml pkg/pkg.ml build || die +} diff --git a/dev-ml/ptime/ptime-1.1.0.ebuild b/dev-ml/ptime/ptime-1.1.0.ebuild new file mode 100644 index 000000000000..491270a410c5 --- /dev/null +++ b/dev-ml/ptime/ptime-1.1.0.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit opam findlib + +DESCRIPTION="POSIX time for OCaml" +HOMEPAGE=" + https://erratique.ch/software/ptime + https://github.com/dbuenzli/ptime + https://opam.ocaml.org/packages/ptime/ +" +SRC_URI="https://erratique.ch/software/ptime/releases/${P}.tbz" + +LICENSE="ISC" +SLOT="0/${PV}" +KEYWORDS="~amd64" + +RDEPEND="" +DEPEND=" + ${RDEPEND} + dev-ml/topkg +" +BDEPEND="dev-ml/ocamlbuild" + +OPAM_FILE=opam + +src_compile() { + ocaml pkg/pkg.ml build || die +} diff --git a/dev-ml/ptmap/Manifest b/dev-ml/ptmap/Manifest new file mode 100644 index 000000000000..1aebb081fb26 --- /dev/null +++ b/dev-ml/ptmap/Manifest @@ -0,0 +1 @@ +DIST ptmap-2.0.5.tar.gz 15121 BLAKE2B a81d205df6d0d276b4919577eb0fcfe9c33ad9a188c462df74b72722f43153bda84fd23880945d16e0f332041f67869ab708f5a925a689cf1ddb22dc0b9a6d28 SHA512 6815ee977cb9a4c5088af8dfb7d8055c8d35870ceb4e95f658fbdc50405495bea75a8755442dc6f7345d2e9021c3b96d14883603759baf267feced9cd5ba5202 diff --git a/dev-ml/ptmap/files/ptmap-2.0.5-dune.patch b/dev-ml/ptmap/files/ptmap-2.0.5-dune.patch new file mode 100644 index 000000000000..b13122884adb --- /dev/null +++ b/dev-ml/ptmap/files/ptmap-2.0.5-dune.patch @@ -0,0 +1,11 @@ +--- a/dune ++++ b/dune +@@ -1,7 +1,6 @@ + (library + (public_name ptmap) +- (modules ptmap) +- (libraries seq)) ++ (modules ptmap)) + + (test + (name test) diff --git a/dev-ml/ptmap/metadata.xml b/dev-ml/ptmap/metadata.xml new file mode 100644 index 000000000000..c25d18a932f8 --- /dev/null +++ b/dev-ml/ptmap/metadata.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> + +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <bugs-to>https://github.com/backtracking/ptmap/issues/</bugs-to> + <remote-id type="github">backtracking/ptmap</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/ptmap/ptmap-2.0.5-r2.ebuild b/dev-ml/ptmap/ptmap-2.0.5-r2.ebuild new file mode 100644 index 000000000000..5f448db4390d --- /dev/null +++ b/dev-ml/ptmap/ptmap-2.0.5-r2.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Maps of integers implemented as Patricia trees" +HOMEPAGE="https://github.com/backtracking/ptmap/" +SRC_URI="https://github.com/backtracking/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="+ocamlopt" + +RDEPEND=" + >=dev-lang/ocaml-4.07:=[ocamlopt?] + dev-ml/stdlib-shims:= +" +DEPEND="${RDEPEND}" + +PATCHES=( "${FILESDIR}"/${P}-dune.patch ) diff --git a/dev-ml/pxp/Manifest b/dev-ml/pxp/Manifest deleted file mode 100644 index 15550f34276a..000000000000 --- a/dev-ml/pxp/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST pxp-1.2.8.tar.gz 619689 BLAKE2B ac63bdee598e368bbe96bbdab38e2fe96902346f80769d51ac2ea47d54a5066d8de35e96d13c0fc7af3ac822e2b121d8f7c033fe00b2f052fc734ccc0f8cca3f SHA512 3292bfbda494066e454331a9cfc56b03f55afe8548bdf24fea09d9bc0a03c333c027f7b527983bd9b4d659458c95acf7e3fc251c72d26ab3502f52067c9f2549 -DIST pxp-1.2.9.tar.gz 626001 BLAKE2B aa3ab609751745b51d8dfb2a0aa2543f46002de4d116cf7e184dfa6153dd4d0657f718af5c98eb2c2f9d5805da5fa7087918afc949e43d6e1dea8d4d812c6256 SHA512 d3a8ab9eab0f5219b889dc7a0b4936e4ae81f2dd3eb06c45b25ff70b8e2c6151c917bf43cf84a90061c6efe0ec344c2703566d2d513e45e1fceab5740bdf9808 diff --git a/dev-ml/pxp/files/oc43.patch b/dev-ml/pxp/files/oc43.patch deleted file mode 100644 index 0168c703d06d..000000000000 --- a/dev-ml/pxp/files/oc43.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: pxp-1.2.8/src/pxp-engine/pxp_document.ml -=================================================================== ---- pxp-1.2.8.orig/src/pxp-engine/pxp_document.ml -+++ pxp-1.2.8/src/pxp-engine/pxp_document.ml -@@ -3398,8 +3398,6 @@ let find_all_elements ?deeply eltype bas - ;; - - --exception Skip;; -- - let map_tree ~pre ?(post=(fun x -> x)) base = - let rec map_rec n = - let n' = pre n in diff --git a/dev-ml/pxp/metadata.xml b/dev-ml/pxp/metadata.xml deleted file mode 100644 index ffac4d7ebc01..000000000000 --- a/dev-ml/pxp/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> -</maintainer> -</pkgmetadata> diff --git a/dev-ml/pxp/pxp-1.2.8-r1.ebuild b/dev-ml/pxp/pxp-1.2.8-r1.ebuild deleted file mode 100644 index 46f405db67a1..000000000000 --- a/dev-ml/pxp/pxp-1.2.8-r1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit findlib eutils - -MY_P=${P/_beta/test} - -DESCRIPTION="validating XML parser library for O'Caml" -HOMEPAGE="http://projects.camlcity.org/projects/pxp.html" -SRC_URI="http://download.camlcity.org/download/${MY_P}.tar.gz" - -LICENSE="MIT" -KEYWORDS="amd64 ppc x86" - -SLOT="0/${PV}" -DEPEND=">=dev-ml/pcre-ocaml-4.31:= - >=dev-ml/ulex-0.5:= - >=dev-ml/ocamlnet-4:= - >=dev-lang/ocaml-3.10.2:=[ocamlopt?] - dev-ml/camlp4:=" -RDEPEND="${DEPEND}" - -IUSE="examples +ocamlopt" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - epatch "${FILESDIR}/oc43.patch" -} - -src_configure() { - #the included configure does not support many standard switches and is quite picky - ./configure || die "configure failed" -} - -src_compile() { - emake -j1 all - if use ocamlopt; then - emake -j1 opt - fi -} - -src_install() { - findlib_src_install - if use examples; then - dodoc -r examples - docompress -x /usr/share/doc/${PF}/examples - fi - - cd doc - dodoc ABOUT-FINDLIB README SPEC design.txt -} diff --git a/dev-ml/pxp/pxp-1.2.9.ebuild b/dev-ml/pxp/pxp-1.2.9.ebuild deleted file mode 100644 index 58fa81ed2194..000000000000 --- a/dev-ml/pxp/pxp-1.2.9.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit findlib eutils - -MY_P=${P/_beta/test} - -DESCRIPTION="validating XML parser library for O'Caml" -HOMEPAGE="http://projects.camlcity.org/projects/pxp.html" -SRC_URI="http://download.camlcity.org/download/${MY_P}.tar.gz" - -LICENSE="MIT" -KEYWORDS="~amd64 ~ppc ~x86" - -SLOT="0/${PV}" -DEPEND=">=dev-ml/pcre-ocaml-4.31:= - >=dev-ml/ulex-0.5:= - >=dev-ml/ocamlnet-4:= - >=dev-lang/ocaml-3.10.2:=[ocamlopt?] - dev-ml/camlp4:=" -RDEPEND="${DEPEND}" - -IUSE="examples +ocamlopt" - -S=${WORKDIR}/${MY_P} - -src_configure() { - #the included configure does not support many standard switches and is quite picky - ./configure || die "configure failed" -} - -src_compile() { - emake -j1 all - if use ocamlopt; then - emake -j1 opt - fi -} - -src_install() { - findlib_src_install - if use examples; then - dodoc -r examples - docompress -x /usr/share/doc/${PF}/examples - fi - - cd doc - dodoc ABOUT-FINDLIB README SPEC design.txt -} diff --git a/dev-ml/qcheck/Manifest b/dev-ml/qcheck/Manifest index a24d2c9f5b8d..89a415b11b10 100644 --- a/dev-ml/qcheck/Manifest +++ b/dev-ml/qcheck/Manifest @@ -1,2 +1,2 @@ -DIST qcheck-0.6.tar.gz 255625 BLAKE2B 9b0e2f6c134a6c4eca37763f1ca41dcacdd8755f5ffe1b7afba2a5384edac4c9881c6849d6f6da005afe2aaaa46f956e50a5a3d00f6fc57fa1866ca486121c12 SHA512 e4298f00c49febe36ae64f287e032081bb2d7713d9412db95441d6b84fb3030f45d07519369ba00be81615a737dc45a246d609772b318084a2b2a28e77e05e1c -DIST qcheck-0.7.tar.gz 257935 BLAKE2B a885635e555a7442f0ad7687320e3d9f45897b9167ba4ac12baf632bc60e1eca207ae5ccf4b57ff36897e418f5ef4e781f9f2bf674ec16cdab140049debcb6c6 SHA512 3082029a09d5efe3af0cb8fcd0bd08f11dd1066d5bffc6beaac16c7244b07286b3ae93931e699f22c977ad4d6ba050dff69b133ce3492455d6932a9e0cc304f7 +DIST qcheck-0.18.tar.gz 105588 BLAKE2B 1c785815ed2d016852ebea3cdbfd1002bcc1054dba95db9290185d1283c9af9a3461fa66f24d43437789b7f361050a227ceed5c45327c694ae3a2846688f195e SHA512 08da783ca991dcee26f88b8d6db2fcf2589d3e753ce355d5e3c8944b58ce43b444c6cde054971a557d7d345b4386e6e976111d4c537840a1269c7e361340fcfe +DIST qcheck-0.20.tar.gz 205616 BLAKE2B af693ccc2830a70e3ab783a05da828b54ff9ac357fa01cb2ddc3db29901c120a9c48b0c6090e5324aecaf4b8455001883c62e5e39963172aa5e0b124294169d9 SHA512 1fb178bee5353b870fe55e5c5379982345c2e1b7f417733be4168e8a58d448d26464d73f8a4470655ddea2701a2a44bc5b08b0de422c0f88f229d8a1ed9c3e87 diff --git a/dev-ml/qcheck/metadata.xml b/dev-ml/qcheck/metadata.xml index a0d97a8e7947..56903abffd0c 100644 --- a/dev-ml/qcheck/metadata.xml +++ b/dev-ml/qcheck/metadata.xml @@ -1,11 +1,13 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> + <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> + <bugs-to>https://github.com/c-cube/qcheck/issues/</bugs-to> <remote-id type="github">c-cube/qcheck</remote-id> </upstream> </pkgmetadata> diff --git a/dev-ml/qcheck/qcheck-0.18.ebuild b/dev-ml/qcheck/qcheck-0.18.ebuild new file mode 100644 index 000000000000..5732be261e72 --- /dev/null +++ b/dev-ml/qcheck/qcheck-0.18.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="QuickCheck inspired property-based testing for OCaml" +HOMEPAGE="https://github.com/c-cube/qcheck" +SRC_URI="https://github.com/c-cube/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD-2" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="+ocamlopt" +RESTRICT="test" # tests fail + +RDEPEND=" + dev-ml/alcotest:= + dev-ml/ounit2:= +" +DEPEND="${RDEPEND}" + +src_install() { + # "ppx_deriving_qcheck" does not install but only "ppx_pbt" depends on it + local i + for i in qcheck qcheck-alcotest qcheck-core qcheck-ounit ; do + dune_src_install ${i} + done + + einstalldocs +} + +src_test() { + emake test +} diff --git a/dev-ml/qcheck/qcheck-0.20.ebuild b/dev-ml/qcheck/qcheck-0.20.ebuild new file mode 100644 index 000000000000..9a40d01067cd --- /dev/null +++ b/dev-ml/qcheck/qcheck-0.20.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="QuickCheck inspired property-based testing for OCaml" +HOMEPAGE="https://github.com/c-cube/qcheck" +SRC_URI="https://github.com/c-cube/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD-2" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="+ocamlopt" +RESTRICT="test" # tests fail + +RDEPEND=" + dev-ml/alcotest:= + dev-ml/ounit2:= +" +DEPEND="${RDEPEND}" + +src_install() { + # "ppx_deriving_qcheck" does not install but only "ppx_pbt" depends on it + local i + for i in qcheck qcheck-alcotest qcheck-core qcheck-ounit ; do + dune_src_install ${i} + done + + einstalldocs +} + +src_test() { + emake test +} diff --git a/dev-ml/qcheck/qcheck-0.6.ebuild b/dev-ml/qcheck/qcheck-0.6.ebuild deleted file mode 100644 index e74600712cf7..000000000000 --- a/dev-ml/qcheck/qcheck-0.6.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -OASIS_BUILD_TESTS=1 -OASIS_BUILD_DOCS=1 - -inherit oasis - -DESCRIPTION="QuickCheck inspired property-based testing for OCaml" -HOMEPAGE="https://github.com/c-cube/qcheck/" -SRC_URI="https://github.com/c-cube/qcheck/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="dev-ml/ounit:= - !<dev-ml/iTeML-2.5" -DEPEND="${RDEPEND} - dev-ml/ocamlbuild" diff --git a/dev-ml/qcheck/qcheck-0.7.ebuild b/dev-ml/qcheck/qcheck-0.7.ebuild deleted file mode 100644 index 63578ec22400..000000000000 --- a/dev-ml/qcheck/qcheck-0.7.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -OASIS_BUILD_TESTS=1 -OASIS_BUILD_DOCS=1 - -inherit oasis - -DESCRIPTION="QuickCheck inspired property-based testing for OCaml" -HOMEPAGE="https://github.com/c-cube/qcheck/" -SRC_URI="https://github.com/c-cube/qcheck/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="dev-ml/ounit:= - !<dev-ml/iTeML-2.5" -DEPEND="${RDEPEND} - dev-ml/ocamlbuild" diff --git a/dev-ml/qtest/Manifest b/dev-ml/qtest/Manifest new file mode 100644 index 000000000000..b960b3cded24 --- /dev/null +++ b/dev-ml/qtest/Manifest @@ -0,0 +1 @@ +DIST qtest-2.11.2.tar.gz 46386 BLAKE2B e11008531e23313caf461a48573f734dcfa7670538f74ef4406e35b2f1f1d620fdd7cefcca1470e0b911cec5d00da43d8a97fe76bd47bf6fc05d5a207788a607 SHA512 3edb8471b29c9eb2f6ba11b157abf7ca43ef965d4b1500aaaf1acaeb261972a61c9b104887ada6ca63dc85e06b1d27e34f391885b2fbeb7ea5646323d3be08d0 diff --git a/dev-ml/qtest/metadata.xml b/dev-ml/qtest/metadata.xml new file mode 100644 index 000000000000..a1bf8dce2797 --- /dev/null +++ b/dev-ml/qtest/metadata.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> + +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <bugs-to>https://github.com/vincent-hugot/qtest/issues/</bugs-to> + <remote-id type="github">vincent-hugot/qtest</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/qtest/qtest-2.11.2.ebuild b/dev-ml/qtest/qtest-2.11.2.ebuild new file mode 100644 index 000000000000..dea2722d2d36 --- /dev/null +++ b/dev-ml/qtest/qtest-2.11.2.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Inline (Unit) Tests for OCaml" +HOMEPAGE="https://github.com/vincent-hugot/qtest" +SRC_URI="https://github.com/vincent-hugot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="+ocamlopt" + +RDEPEND=" + dev-ml/ounit2:= + dev-ml/qcheck:= +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/re/Manifest b/dev-ml/re/Manifest new file mode 100644 index 000000000000..3e9df29c5276 --- /dev/null +++ b/dev-ml/re/Manifest @@ -0,0 +1,2 @@ +DIST ocaml-re-1.10.4.tar.gz 90379 BLAKE2B 411786bd89c712db0a7fba071abd303895621f0353b52e33dffeba146994cf145ea7f5199435d5b4c4738eedafa5bb00b430c92fe072f13fe455bb30a0b29998 SHA512 1bef38154f856b48985a0dfa975dc8539f146d0308d7c2af01078f5e998683fd635c7ae4a888e95c1a4dc4df9539dcd5dc506a5ef8718386cf0073947507f91a +DIST ocaml-re-1.11.0.tar.gz 93319 BLAKE2B ccfba746e39d379c862576372694b9ce27f365996cad6c041b14e0a39514663cfb9bf32319ec67207cc5c8a65cd6278d0e111d2f15508bda54f7e0d89d528e8d SHA512 92096672833defba1b92b23bc4ce78cffb2501a21aca0dee264da1c8f35b5995154108d5f47318b9e37933537144359a742dce7825734c68dbd7d3d8ad4bc5b1 diff --git a/dev-ml/re/files/ounit2.patch b/dev-ml/re/files/ounit2.patch new file mode 100644 index 000000000000..1210491bc142 --- /dev/null +++ b/dev-ml/re/files/ounit2.patch @@ -0,0 +1,11 @@ +Index: ocaml-re-1.9.0/lib_test/fort_unit/dune +=================================================================== +--- ocaml-re-1.9.0.orig/lib_test/fort_unit/dune ++++ ocaml-re-1.9.0/lib_test/fort_unit/dune +@@ -3,4 +3,4 @@ + (library + (name fort_unit) + (wrapped false) +- (libraries re oUnit)) +\ No newline at end of file ++ (libraries re ounit2)) diff --git a/dev-ml/re/metadata.xml b/dev-ml/re/metadata.xml new file mode 100644 index 000000000000..f9df672987f4 --- /dev/null +++ b/dev-ml/re/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">ocaml/ocaml-re</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/re/re-1.10.4-r2.ebuild b/dev-ml/re/re-1.10.4-r2.ebuild new file mode 100644 index 000000000000..1d08e69eb270 --- /dev/null +++ b/dev-ml/re/re-1.10.4-r2.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Regular expression library for OCaml" +HOMEPAGE="https://github.com/ocaml/ocaml-re" +SRC_URI="https://github.com/ocaml/ocaml-re/archive/${PV}.tar.gz + -> ocaml-${P}.tar.gz" +S="${WORKDIR}"/ocaml-${P} + +LICENSE="LGPL-2-with-linking-exception" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + !dev-ml/ocaml-re + !<dev-ml/seq-0.3 + >=dev-lang/ocaml-4.09 +" +DEPEND="${RDEPEND}" +BDEPEND="test? ( dev-ml/ounit2 )" + +PATCHES=( "${FILESDIR}"/ounit2.patch ) + +src_prepare() { + default + sed -i \ + -e "/(libraries seq)/d" \ + lib/dune \ + || die +} diff --git a/dev-ml/re/re-1.11.0.ebuild b/dev-ml/re/re-1.11.0.ebuild new file mode 100644 index 000000000000..cd2bcf644fb9 --- /dev/null +++ b/dev-ml/re/re-1.11.0.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Regular expression library for OCaml" +HOMEPAGE="https://github.com/ocaml/ocaml-re" + +if [[ "${PV}" == *9999* ]] ; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/ocaml/ocaml-re.git" +else + SRC_URI="https://github.com/ocaml/ocaml-re/archive/${PV}.tar.gz + -> ocaml-${P}.tar.gz" + S="${WORKDIR}/ocaml-${P}" + + KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +fi + +LICENSE="LGPL-2-with-linking-exception" +SLOT="0/${PV}" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + !dev-ml/ocaml-re + !<dev-ml/seq-0.3 + >=dev-lang/ocaml-4.09 +" +DEPEND=" + ${RDEPEND} +" +BDEPEND=" + test? ( dev-ml/ounit2 ) +" + +PATCHES=( "${FILESDIR}/ounit2.patch" ) + +src_prepare() { + default + + sed -i lib/dune -e "/(libraries seq)/d" || die +} diff --git a/dev-ml/re2/Manifest b/dev-ml/re2/Manifest deleted file mode 100644 index 49eba6a6053c..000000000000 --- a/dev-ml/re2/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST re2-0.9.0.tar.gz 388868 BLAKE2B e4a16d9c417099c0aae331adbb09a5b1da597df576232f40d991aaafb751a936f92771df4dc17b869e1b90d86800d0f4313fd51924b0fbb04c1ac8c06961704d SHA512 d11cde52c151486025e05318930253f37312eb6498698ffd3b271f4ba0c83cae0ff8c0c1a11e01b6ab333770400108f3de33fd68f73ab6df1c832e7edffb5e77 -DIST re2-0.9.1.tar.gz 388911 BLAKE2B d6d0673142e2523c0d5fed2c19439bbf7c2ace401558f4c40f0302445492ae17bf67076c4faeb0e25eeb8cc01f463f4804317d4f6a5113586be77df18ec93874 SHA512 a92dc39a1d263dd2bbfad88f0ea0936fcadd1d03cd735d9db151412919713cfb4d8329f1e0fa454917d8faa49480e8dd60af9331b0863548ab267b647bd1e192 diff --git a/dev-ml/re2/metadata.xml b/dev-ml/re2/metadata.xml deleted file mode 100644 index aea17486273c..000000000000 --- a/dev-ml/re2/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">janestreet/re2</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/re2/re2-0.9.0.ebuild b/dev-ml/re2/re2-0.9.0.ebuild deleted file mode 100644 index e77c46fb6030..000000000000 --- a/dev-ml/re2/re2-0.9.0.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit opam - -DESCRIPTION="OCaml bindings for RE2" -HOMEPAGE="https://github.com/janestreet/re2" -SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -DEPEND=" - dev-ml/core_kernel:= - dev-ml/ppx_driver:= - dev-ml/ppx_jane:= - dev-ml/ocaml-migrate-parsetree:= -" -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} dev-ml/jbuilder" diff --git a/dev-ml/re2/re2-0.9.1.ebuild b/dev-ml/re2/re2-0.9.1.ebuild deleted file mode 100644 index e77c46fb6030..000000000000 --- a/dev-ml/re2/re2-0.9.1.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit opam - -DESCRIPTION="OCaml bindings for RE2" -HOMEPAGE="https://github.com/janestreet/re2" -SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -DEPEND=" - dev-ml/core_kernel:= - dev-ml/ppx_driver:= - dev-ml/ppx_jane:= - dev-ml/ocaml-migrate-parsetree:= -" -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} dev-ml/jbuilder" diff --git a/dev-ml/react/Manifest b/dev-ml/react/Manifest index 6c88ce594eba..0de27a72b76d 100644 --- a/dev-ml/react/Manifest +++ b/dev-ml/react/Manifest @@ -1 +1,2 @@ DIST react-1.2.1.tbz 39184 BLAKE2B 0ad5fd576c08292011e6543462295a11b77048f59aaaf34726c078c654fba4a9b7dd0bb6a6579fad04a6cd217b29f4efc15de9b7d9b208c593b481610534d9c8 SHA512 60f8788cc820e2be5303caedc80a377c8e5deab170d0eb9df71ff99d6fc57f31357824522f973c6e0d6b3979b58272e7f90b829474a494b94565279c53e8fbb1 +DIST react-1.2.2.tbz 40013 BLAKE2B 302f480cf2cc88fc8a97b262d41809ed4fe904d3ea4cdec8ba80a8bdc99b3ffc1c9f19cf853c3d40587a34ba7608734e60ede5b756479676af95f9470e1badac SHA512 18cdd544d484222ba02db6bd9351571516532e7a1c107b59bbe39193837298f5c745eab6754f8bc6ff125b387be7018c6d6e6ac99f91925a5e4f53af688522b1 diff --git a/dev-ml/react/metadata.xml b/dev-ml/react/metadata.xml index 230ed537ef5c..959d68873dec 100644 --- a/dev-ml/react/metadata.xml +++ b/dev-ml/react/metadata.xml @@ -1,23 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <longdescription lang="en"> - React is an OCaml module for functional reactive programming (FRP). It - provides support to program with time varying values : applicative - events and signals. React doesn't define any primitive event or - signal, this lets the client chooses the concrete timeline. - - React is made of a single, independent, module and distributed under - the new BSD license. +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> - Given an absolute notion of time Rtime helps you to manage a timeline - and provides time stamp events, delayed events and delayed signals. - </longdescription> - <upstream> - <remote-id type="github">dbuenzli/react</remote-id> - </upstream> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <longdescription lang="en"> + React is an OCaml module for functional reactive programming (FRP). It + provides support to program with time varying values : applicative events + and signals. React doesn't define any primitive event or signal, this lets + the client chooses the concrete timeline. React is made of a single, + independent, module and distributed under the new BSD license. Given an + absolute notion of time Rtime helps you to manage a timeline and provides + time stamp events, delayed events and delayed signals. + </longdescription> + <upstream> + <bugs-to>https://github.com/dbuenzli/react/issues/</bugs-to> + <remote-id type="github">dbuenzli/react</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-ml/react/react-1.2.1.ebuild b/dev-ml/react/react-1.2.1-r1.ebuild index de34f259d5a8..f6a9325b3b29 100644 --- a/dev-ml/react/react-1.2.1.ebuild +++ b/dev-ml/react/react-1.2.1-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=7 inherit opam @@ -11,8 +11,9 @@ SRC_URI="http://erratique.ch/software/react/releases/${P}.tbz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" IUSE="test" +RESTRICT="!test? ( test )" RDEPEND="" DEPEND="${RDEPEND} diff --git a/dev-ml/react/react-1.2.2-r1.ebuild b/dev-ml/react/react-1.2.2-r1.ebuild new file mode 100644 index 000000000000..d00b8889f92b --- /dev/null +++ b/dev-ml/react/react-1.2.2-r1.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit opam + +DESCRIPTION="OCaml module for functional reactive programming" +HOMEPAGE="http://erratique.ch/software/react https://github.com/dbuenzli/react" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/dbuenzli/react.git" +else + SRC_URI="http://erratique.ch/software/react/releases/${P}.tbz" + KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +fi + +LICENSE="BSD" +SLOT="0/${PV}" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND="" +DEPEND="${RDEPEND} + dev-ml/findlib + >=dev-ml/topkg-0.9 +" + +src_compile() { + ocaml pkg/pkg.ml build \ + --tests $(usex test 'true' 'false') \ + || die +} + +src_test() { + ocaml pkg/pkg.ml test || die +} diff --git a/dev-ml/reactiveData/metadata.xml b/dev-ml/reactiveData/metadata.xml index ab53110f16be..1c641ea72ce6 100644 --- a/dev-ml/reactiveData/metadata.xml +++ b/dev-ml/reactiveData/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">ocsigen/reactiveData</remote-id> </upstream> diff --git a/dev-ml/reactiveData/reactiveData-0.2.1.ebuild b/dev-ml/reactiveData/reactiveData-0.2.1.ebuild index a74fc715fcf0..f016dcff52af 100644 --- a/dev-ml/reactiveData/reactiveData-0.2.1.ebuild +++ b/dev-ml/reactiveData/reactiveData-0.2.1.ebuild @@ -1,18 +1,16 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=7 inherit opam DESCRIPTION="Functional reactive programming with incremental changes in data structures" HOMEPAGE="https://github.com/ocsigen/reactiveData" -if [ "${PV#9999}" != "${PV}" ] ; then +if [[ "${PV#9999}" != "${PV}" ]] ; then inherit git-r3 - SRC_URI="" EGIT_REPO_URI="https://github.com/ocsigen/reactiveData" - KEYWORDS="" else SRC_URI="https://github.com/ocsigen/reactiveData/archive/${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64" diff --git a/dev-ml/reactiveData/reactiveData-9999.ebuild b/dev-ml/reactiveData/reactiveData-9999.ebuild deleted file mode 100644 index a74fc715fcf0..000000000000 --- a/dev-ml/reactiveData/reactiveData-9999.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit opam - -DESCRIPTION="Functional reactive programming with incremental changes in data structures" -HOMEPAGE="https://github.com/ocsigen/reactiveData" - -if [ "${PV#9999}" != "${PV}" ] ; then - inherit git-r3 - SRC_URI="" - EGIT_REPO_URI="https://github.com/ocsigen/reactiveData" - KEYWORDS="" -else - SRC_URI="https://github.com/ocsigen/reactiveData/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" -fi - -LICENSE="LGPL-3-with-linking-exception" -SLOT="0/${PV}" -IUSE="+ocamlopt" - -RDEPEND="dev-ml/react:=" -DEPEND="${RDEPEND} - dev-ml/findlib - dev-ml/ocamlbuild -" - -src_compile() { - ocaml pkg/build.ml \ - native=$(usex ocamlopt true false) \ - native-dynlink=$(usex ocamlopt true false) \ - || die -} diff --git a/dev-ml/reason-parser/Manifest b/dev-ml/reason-parser/Manifest deleted file mode 100644 index e3ab7fc71ef5..000000000000 --- a/dev-ml/reason-parser/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST reason-parser-2.0.0.tar.gz 183562 BLAKE2B 4954b98f21946722dd97660bbc8bfed19d22cd7d30927aecbe1f12981517442bc4c4ee7c9e58538ccb3b09b4e4fed8e58f87f8e583f0f49ad36b97bede1093ab SHA512 43d05367978a273625d43fbee33c554777a24003b3a843b610da2a73187f2c5ad7dc110fd2b50ba4671ca05e7fcff6ed63fdf52f79769752b31d0aec48fab84c diff --git a/dev-ml/reason-parser/metadata.xml b/dev-ml/reason-parser/metadata.xml deleted file mode 100644 index ffe46435e1e5..000000000000 --- a/dev-ml/reason-parser/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">facebook/reason</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/reason-parser/reason-parser-2.0.0.ebuild b/dev-ml/reason-parser/reason-parser-2.0.0.ebuild deleted file mode 100644 index 2ec81a735441..000000000000 --- a/dev-ml/reason-parser/reason-parser-2.0.0.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit findlib eutils opam - -DESCRIPTION="Meta Language Toolchain" -HOMEPAGE="https://github.com/facebook/reason" -SRC_URI="https://github.com/facebook/reason/releases/download/${PV}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="+ocamlopt" - -DEPEND=" - >=dev-ml/menhir-20170418:= - dev-ml/merlin-extend:= - dev-ml/result:= - dev-ml/topkg:= - dev-ml/ocaml-migrate-parsetree:= - dev-ml/ppx_tools_versioned:= -" -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} - dev-ml/ocamlbuild -" - -S="${WORKDIR}/${PN}" - -src_compile() { - emake compile_error - ocamlbuild -package topkg pkg/build.native || die - ./build.native build \ - --native "$(usex ocamlopt true false)" \ - --native-dynlink "$(usex ocamlopt true false)" \ - || die -} diff --git a/dev-ml/reason/Manifest b/dev-ml/reason/Manifest index e3e640ef464c..93920496d1ab 100644 --- a/dev-ml/reason/Manifest +++ b/dev-ml/reason/Manifest @@ -1 +1,2 @@ -DIST reason-2.0.0.tar.gz 6639139 BLAKE2B c2f65c967e86ab9d57d25194aa5f113b7d11fce1d3c47d7b93b31ae0728b8e3528c736e694c462e4debcce228c227e612901cc576604c69afd966a40058ac429 SHA512 5e8fb81193de90fcf95ae39e66dab6b7638f1b6f37f7f438c3692e67de8f33667eca92e76df4968ad794e4bd02674583203e1058f1e990f3f6e87d8ce1fbbb43 +DIST reason-3.10.0.tar.gz 668962 BLAKE2B 11ab06cf12d2bd2381a6e12bd0dd7627ce454356db21ad189acaea7d24dac7e3647c10bb4478ded41f946d2d982b20988e448eb63ba4b68574bdbafa2984d0b7 SHA512 9be379b3953f57096139d766ef7c55d89bf70be4a8153177b9812bfa69c4260ee91dfeb87df2b71d63840f612e53e46cd2867085bdcfc7040e53817a8ff92225 +DIST reason-3.11.0.tar.gz 699692 BLAKE2B c377e7ccb222ade2f0a5a9b50147a045fb10a95d7e3a8a9ce91674f76a3174ef169f5575ecde7004db2a43350ac8e7cc73315eefcda57b98c9b3d6cc83ed13bd SHA512 71b70e06afbc193c1c4b379c570347e4f971ed001d60e73cf4a745a9bc110e78d329d5ce5334b59aacb7dbe8d2f12f50b7c6786c9a35fff445da0d26f6a87f7d diff --git a/dev-ml/reason/files/reason-3.10.0-fake-git-version.patch b/dev-ml/reason/files/reason-3.10.0-fake-git-version.patch new file mode 100644 index 000000000000..f4be44e80e2f --- /dev/null +++ b/dev-ml/reason/files/reason-3.10.0-fake-git-version.patch @@ -0,0 +1,10 @@ +--- a/src/refmt/dune ++++ b/src/refmt/dune +@@ -10,5 +10,5 @@ + (with-stdout-to + %{targets} + (progn +- (bash "echo let version = \\\"$(git rev-parse --verify HEAD)\\\"") +- (bash "echo let short_version = \\\"$(git rev-parse --short HEAD)\\\""))))) ++ (bash "echo let version = \\\"0000000000000000000000000000000000000000\\\"") ++ (bash "echo let short_version = \\\"0000000000000000000000000000000000000000\\\""))))) diff --git a/dev-ml/reason/metadata.xml b/dev-ml/reason/metadata.xml index ffe46435e1e5..a64ab38bbb7e 100644 --- a/dev-ml/reason/metadata.xml +++ b/dev-ml/reason/metadata.xml @@ -1,11 +1,17 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> + <pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">facebook/reason</remote-id> - </upstream> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <longdescription> + Reason provides a new ES6-inspired syntax for OCaml. It's also the umbrella + project for a set of tools for the OCaml and JavaScript ecosystems. + </longdescription> + <upstream> + <bugs-to>https://github.com/reasonml/reason/issues/</bugs-to> + <remote-id type="github">reasonml/reason</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-ml/reason/reason-2.0.0.ebuild b/dev-ml/reason/reason-2.0.0.ebuild deleted file mode 100644 index 0fc83b36497d..000000000000 --- a/dev-ml/reason/reason-2.0.0.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit opam - -DESCRIPTION="Meta Language Toolchain" -HOMEPAGE="https://github.com/facebook/reason" -SRC_URI="https://github.com/facebook/reason/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="+ocamlopt" - -DEPEND=" - dev-ml/reason-parser:= - dev-ml/merlin-extend:= - dev-ml/result:= - dev-ml/topkg:= - dev-ml/ocaml-migrate-parsetree:= - dev-ml/utop:= -" -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} - dev-ml/findlib - dev-ml/ocamlbuild -" - -src_compile() { - emake precompile - emake build -} diff --git a/dev-ml/reason/reason-3.10.0.ebuild b/dev-ml/reason/reason-3.10.0.ebuild new file mode 100644 index 000000000000..d9655ff84950 --- /dev/null +++ b/dev-ml/reason/reason-3.10.0.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Simple, fast & type safe language that leverages JavaScript and OCaml" +HOMEPAGE="https://reasonml.github.io/ + https://github.com/reasonml/reason/" + +if [[ ${PV} == *9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/reasonml/${PN}.git" +else + SRC_URI="https://github.com/reasonml/${PN}/archive/${PV}.tar.gz + -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="MIT" +SLOT="0/${PV}" +IUSE="+ocamlopt" + +RDEPEND=" + dev-ml/dune-build-info:= + dev-ml/fix:= + dev-ml/menhir:= + dev-ml/merlin-extend:= + dev-ml/ocaml-migrate-parsetree:= + dev-ml/ppx_derivers:= + dev-ml/ppxlib:= + dev-ml/utop:= +" +DEPEND="${RDEPEND}" + +PATCHES=( "${FILESDIR}/${PN}-3.10.0-fake-git-version.patch" ) + +src_install() { + dune-install reason rtop + + dodoc *.md docs/*.md +} diff --git a/dev-ml/reason/reason-3.11.0.ebuild b/dev-ml/reason/reason-3.11.0.ebuild new file mode 100644 index 000000000000..d9655ff84950 --- /dev/null +++ b/dev-ml/reason/reason-3.11.0.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Simple, fast & type safe language that leverages JavaScript and OCaml" +HOMEPAGE="https://reasonml.github.io/ + https://github.com/reasonml/reason/" + +if [[ ${PV} == *9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/reasonml/${PN}.git" +else + SRC_URI="https://github.com/reasonml/${PN}/archive/${PV}.tar.gz + -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="MIT" +SLOT="0/${PV}" +IUSE="+ocamlopt" + +RDEPEND=" + dev-ml/dune-build-info:= + dev-ml/fix:= + dev-ml/menhir:= + dev-ml/merlin-extend:= + dev-ml/ocaml-migrate-parsetree:= + dev-ml/ppx_derivers:= + dev-ml/ppxlib:= + dev-ml/utop:= +" +DEPEND="${RDEPEND}" + +PATCHES=( "${FILESDIR}/${PN}-3.10.0-fake-git-version.patch" ) + +src_install() { + dune-install reason rtop + + dodoc *.md docs/*.md +} diff --git a/dev-ml/res/Manifest b/dev-ml/res/Manifest deleted file mode 100644 index c26a235cda84..000000000000 --- a/dev-ml/res/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST res-4.0.7.tar.gz 74752 BLAKE2B 490e72f85618c03c4731051f043b1fc79f2e06684444e0f2a56f62fba74f790ce3339b2b1a9ad526b8e4df7e859b9a2342393d7a9970efffa2517d22f7393cad SHA512 4a1f00d76847eaaf0756fd20f7e1062e30ba7fd432621269f7d18b293abe0bc4a461ff077b5c4e0fe83710f113d6fe8846826b70faed8cb7fc6a5653814d297e -DIST res-5.0.0.tbz 26967 BLAKE2B fc91ef0ccee3ca1577e394b7e162c68699a9e73901d24a041dca2f82077ad018f6bbe06a3ca1c634388e8fc2ae3335922636e339b598819864008a7f33937ffa SHA512 e2e8e8d3090efdcb4d0e99b6f71ac3d43dadc663e2a5028434e36a97cef0d624dfdfe93b88b959e798d348ff6080c3abd7143ccdbac81d500d953ad1ed6dcf92 diff --git a/dev-ml/res/metadata.xml b/dev-ml/res/metadata.xml deleted file mode 100644 index 68042fc03bff..000000000000 --- a/dev-ml/res/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">mmottl/res</remote-id> - <remote-id type="bitbucket">mmottl/res</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/res/res-4.0.7.ebuild b/dev-ml/res/res-4.0.7.ebuild deleted file mode 100644 index 60ad01e84ab7..000000000000 --- a/dev-ml/res/res-4.0.7.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -OASIS_BUILD_DOCS=1 - -inherit oasis - -DESCRIPTION="Resizable Array and Buffer modules for O'Caml" -HOMEPAGE="http://mmottl.github.io/res/" -SRC_URI="https://github.com/mmottl/res/releases/download/v${PV}/${P}.tar.gz" -LICENSE="LGPL-2.1-with-linking-exception" - -RDEPEND="" -DEPEND="${RDEPEND} - >=dev-ml/findlib-1.5" -SLOT="0/${PV}" -KEYWORDS="amd64 ppc x86" -IUSE="examples" - -DOCS=( "AUTHORS.txt" "CHANGES.txt" "README.md" ) - -src_install() { - oasis_src_install - if use examples ; then - insinto /usr/share/doc/${PF} - doins -r examples - fi -} diff --git a/dev-ml/res/res-5.0.0.ebuild b/dev-ml/res/res-5.0.0.ebuild deleted file mode 100644 index b503e1c2eed3..000000000000 --- a/dev-ml/res/res-5.0.0.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit opam - -DESCRIPTION="Resizable Array and Buffer modules for O'Caml" -HOMEPAGE="http://mmottl.github.io/res/" -SRC_URI="https://github.com/mmottl/res/releases/download/${PV}/${P}.tbz" -LICENSE="LGPL-2.1-with-linking-exception" - -RDEPEND="" -DEPEND="${RDEPEND} - dev-ml/jbuilder - >=dev-ml/findlib-1.5" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" - -src_compile() { - jbuilder build @install || die -} diff --git a/dev-ml/result/Manifest b/dev-ml/result/Manifest index f2af9475afe7..c58245657aa8 100644 --- a/dev-ml/result/Manifest +++ b/dev-ml/result/Manifest @@ -1 +1 @@ -DIST result-1.2.tar.gz 2100 BLAKE2B 9c746c85200ad6af1014dbc4959347b19f48f24448fb36a33b0b50f8d3d8cf4536f7ea3e994953d29122c8dafe87289707eeab67f7a0dc44d0bc509715169e79 SHA512 b47fe24302182642c7dfb3329a9a475518fca01ed7080fb625379abbb7ada0bec4a27e666886c101ba4b0083eeb6312740d99ef764690d38ee6e6d8960fc9b87 +DIST result-1.5.tar.gz 2291 BLAKE2B 76010676aa806fac3766e9ba70b770b3bd01347b1365892beba4c33415d0942a9368f0437ee5a8339b355b939d1625b2fa9c8ad4cf774007637eb51f4b20f11b SHA512 5ca3aab3b46bff7f4fa4517b5d823de196d7a97a8b94a8e416a5e237061482f4d0030c6a339291d5aa8f68020ee11aed743b730970105a2303e6a93d26ca676a diff --git a/dev-ml/result/metadata.xml b/dev-ml/result/metadata.xml index 2246b0f460c5..f883bab19b76 100644 --- a/dev-ml/result/metadata.xml +++ b/dev-ml/result/metadata.xml @@ -1,9 +1,9 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">janestreet/result</remote-id> diff --git a/dev-ml/result/result-1.2.ebuild b/dev-ml/result/result-1.2.ebuild deleted file mode 100644 index 8c8cb8d1cd21..000000000000 --- a/dev-ml/result/result-1.2.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit findlib - -DESCRIPTION="Compat result type" -HOMEPAGE="https://github.com/janestreet/result" -SRC_URI="https://github.com/janestreet/result/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" -IUSE="+ocamlopt" - -RDEPEND="dev-lang/ocaml:=[ocamlopt?]" -DEPEND="${RDEPEND}" - -src_compile() { - emake byte - use ocamlopt && emake native -} - -src_install() { - findlib_src_install - dodoc README.md -} diff --git a/dev-ml/result/result-1.5.ebuild b/dev-ml/result/result-1.5.ebuild new file mode 100644 index 000000000000..2acf2ed0de59 --- /dev/null +++ b/dev-ml/result/result-1.5.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Compat result type" +HOMEPAGE="https://github.com/janestreet/result" +SRC_URI="https://github.com/janestreet/result/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" diff --git a/dev-ml/rresult/Manifest b/dev-ml/rresult/Manifest index 39071840a8c8..356483263687 100644 --- a/dev-ml/rresult/Manifest +++ b/dev-ml/rresult/Manifest @@ -1 +1,2 @@ -DIST rresult-0.5.0.tbz 9185 BLAKE2B efe8d248aa3d68b13b011dccb98cb04127dfec9d659dfe8619f658b254cfcdca833e125310553dee54ef4be239c308e762d2290386f4fd08a5f2c1835faa9ef1 SHA512 45787b61adb7daedf72e4ff632cf3d4917bccb3e83613dabf93437982887d9a0ed3b6cbefb2b17cb341a825346cb0609286df581c6ff379583dc83672ee25efc +DIST rresult-0.6.0.tbz 7731 BLAKE2B d93b4a3fe54541101d52e768555aa306f87d1c34b57c7eb7a92092051a047586c43dded3be9ef0c84675d935c4a91162a8ff612d540f951f2842cfdf9f709f24 SHA512 66cb7acb525c17dde4e7572fa5a0d925466f8e759b90a12d952ca076d25de49404c962e061557f2255112fbf1d731f8da696acd536cbb9433a4b1d9662095c3a +DIST rresult-0.7.0.tbz 8506 BLAKE2B 0ddb2c2d126e11094d8f92555c6d29fd103cff0393558a9522ad0b58f58159a7eed050976bfeb47969a6c7528c29b8352fa80114ed1684bd5415b2d6b0a30fb1 SHA512 f1bb631c986996388e9686d49d5ae4d8aaf14034f6865c62a88fb58c48ce19ad2eb785327d69ca27c032f835984e0bd2efd969b415438628a31f3e84ec4551d3 diff --git a/dev-ml/rresult/metadata.xml b/dev-ml/rresult/metadata.xml index 9f837b5c8652..94c9ab51a46f 100644 --- a/dev-ml/rresult/metadata.xml +++ b/dev-ml/rresult/metadata.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">dbuenzli/rresult</remote-id> diff --git a/dev-ml/rresult/rresult-0.5.0.ebuild b/dev-ml/rresult/rresult-0.5.0.ebuild deleted file mode 100644 index 85613f2d372e..000000000000 --- a/dev-ml/rresult/rresult-0.5.0.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit opam - -DESCRIPTION="Result value combinators for OCaml" -HOMEPAGE="http://erratique.ch/software/rresult https://github.com/dbuenzli/rresult" -SRC_URI="http://erratique.ch/software/rresult/releases/${P}.tbz" - -LICENSE="ISC" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND="dev-ml/result:=" -DEPEND="${RDEPEND} - dev-ml/topkg - dev-ml/ocamlbuild" - -src_compile() { - ocaml pkg/pkg.ml build || die -} diff --git a/dev-ml/rresult/rresult-0.6.0.ebuild b/dev-ml/rresult/rresult-0.6.0.ebuild new file mode 100644 index 000000000000..90493d9da475 --- /dev/null +++ b/dev-ml/rresult/rresult-0.6.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit opam + +DESCRIPTION="Result value combinators for OCaml" +HOMEPAGE="https://erratique.ch/software/rresult https://github.com/dbuenzli/rresult" +SRC_URI="https://erratique.ch/software/rresult/releases/${P}.tbz" + +LICENSE="ISC" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" + +RDEPEND="dev-ml/result:=" +DEPEND="${RDEPEND}" +BDEPEND="dev-ml/topkg + dev-ml/ocamlbuild" + +src_compile() { + ocaml pkg/pkg.ml build || die +} diff --git a/dev-ml/rresult/rresult-0.7.0.ebuild b/dev-ml/rresult/rresult-0.7.0.ebuild new file mode 100644 index 000000000000..80ad93979a37 --- /dev/null +++ b/dev-ml/rresult/rresult-0.7.0.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit opam + +DESCRIPTION="Result value combinators for OCaml" +HOMEPAGE="https://erratique.ch/software/rresult https://github.com/dbuenzli/rresult" +SRC_URI="https://erratique.ch/software/rresult/releases/${P}.tbz" + +LICENSE="ISC" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" + +RDEPEND="dev-ml/result:= + >=dev-lang/ocaml-4.08:=" +DEPEND="${RDEPEND}" +BDEPEND="dev-ml/topkg + dev-ml/ocamlbuild" + +src_compile() { + ocaml pkg/pkg.ml build || die +} diff --git a/dev-ml/sedlex/Manifest b/dev-ml/sedlex/Manifest index 44e56fd98c62..5499f4432595 100644 --- a/dev-ml/sedlex/Manifest +++ b/dev-ml/sedlex/Manifest @@ -1,2 +1,3 @@ -DIST sedlex-1.99.3.tar.gz 58236 BLAKE2B 48ebc0f7bc090fa5d80404cc9135f4f52ac7b5c651b6df1e8f02506b235dba78d4bab9736cdb1c3865acf940c9af8eb00eebc3f6d399d3d7c4a897fd9e2eeaa4 SHA512 d0359a4c3f4d9efe51fa79405ae79f20ab64949838acbac475a9bcb7f42e0b972e66429eca2063fda6ae6af04475dbf29a331cf005f3338e7fc130afab477392 -DIST sedlex-1.99.4.tar.gz 59359 BLAKE2B d1b76304289111fe020a50dddf6fcf29d958f69d7d4841d62633a291e0ffb08a2ddc1bc5754ccb0dbc4ac0852cd0fe2bb3a0b53b579755e0d210bf18c520f796 SHA512 83bddb03e25b015bc71fb59e3b0e0e097e899c681c8033663c17936f28fde8599a82eaab9c26eafd645c401c106e65fcf173d9fb889eb8999eb1b064ff8b6149 +DIST sedlex-2.5.tar.gz 134289 BLAKE2B 47aa67ed34ee0226b92d538e61bbf7252dcead236dd51d4a291c7b81f7d0747d1024e9eb0a274d7648b25cfa078108e3e62d54ea2702450171b9ff4ab60f7706 SHA512 5c511a89e43999b34e50cc820a4ac71ecd0315ef144da2af1653077d7497b2ce3658898b723a7c558693766e6bc57369349cdf78c4a4b962a23d4528161b78ef +DIST sedlex-3.0.tar.gz 133248 BLAKE2B f1adb73087b132d4e99b4785af3a99d3d82ee860d16691c48fbec6bd2776d8de23f736f5d6f21b734c846ef793caa8e7c925ce58dfc472d205268eab39973c6a SHA512 564780b7af8b3ddd32c9164caa42fd24b2ff59e0bf9977bcee4c3ddea2be3f0c870bd95949b639c5f1942e0fa2604902f5cd3eb9041d59b6ee2367895df556df +DIST sedlex-3.1.tar.gz 139786 BLAKE2B 6bacf781f25a5a21ea4cf710ffef04949fbeea90033eb429a5f9d7733e64108526de7f94b56c2da5c8a3af4fab6eff94421b705de9ffe8137a4e8282aa9900cd SHA512 27c7954c03a9d78f252167708afe7d91648ad3d3aa529e00c73da75bac49c2cf552cc9d27d29f1d9a04b1e2b47b7c6de9e9850c53124ad9f311d0a8f54bb9cae diff --git a/dev-ml/sedlex/metadata.xml b/dev-ml/sedlex/metadata.xml index ae029bd9c53f..7a5e2b697654 100644 --- a/dev-ml/sedlex/metadata.xml +++ b/dev-ml/sedlex/metadata.xml @@ -1,11 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> + <pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">alainfrisch/sedlex</remote-id> - </upstream> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <longdescription> + sedlex is a lexer generator for OCaml. It is similar to ocamllex, but + supports Unicode. Unlike ocamllex, sedlex allows lexer specifications + within regular OCaml source files. Lexing specific constructs are provided + via a ppx syntax extension. + </longdescription> + <upstream> + <bugs-to>https://github.com/ocaml-community/sedlex/issues/</bugs-to> + <remote-id type="github">ocaml-community/sedlex</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-ml/sedlex/sedlex-1.99.3.ebuild b/dev-ml/sedlex/sedlex-1.99.3.ebuild deleted file mode 100644 index 467b1c870d45..000000000000 --- a/dev-ml/sedlex/sedlex-1.99.3.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit findlib - -DESCRIPTION="An OCaml lexer generator for Unicode" -HOMEPAGE="https://github.com/alainfrisch/sedlex" -SRC_URI="https://github.com/alainfrisch/sedlex/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="+ocamlopt" - -DEPEND=" - dev-lang/ocaml:=[ocamlopt?] - dev-ml/gen:=[ocamlopt(+)?] - dev-ml/ppx_tools:=[ocamlopt(+)?] -" -RDEPEND="${DEPEND}" - -src_compile() { - emake all - use ocamlopt && emake opt -} - -src_install() { - findlib_src_preinst - if use ocamlopt; then - emake install - else - emake install_byteonly - fi - dodoc CHANGES README.md -} diff --git a/dev-ml/sedlex/sedlex-1.99.4.ebuild b/dev-ml/sedlex/sedlex-1.99.4.ebuild deleted file mode 100644 index b2a4d281ef05..000000000000 --- a/dev-ml/sedlex/sedlex-1.99.4.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit findlib - -DESCRIPTION="An OCaml lexer generator for Unicode" -HOMEPAGE="https://github.com/alainfrisch/sedlex" -SRC_URI="https://github.com/alainfrisch/sedlex/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="+ocamlopt" - -DEPEND=" - dev-lang/ocaml:=[ocamlopt?] - dev-ml/gen:=[ocamlopt(+)?] - dev-ml/ppx_tools_versioned:=[ocamlopt(+)?] - dev-ml/ocaml-migrate-parsetree:=[ocamlopt(+)?] -" -RDEPEND="${DEPEND}" - -src_compile() { - emake all - use ocamlopt && emake opt -} - -src_test() { - emake -j1 test -} - -src_install() { - findlib_src_preinst - if use ocamlopt; then - emake install - else - emake install_byteonly - fi - dodoc CHANGES README.md -} diff --git a/dev-ml/sedlex/sedlex-2.5-r1.ebuild b/dev-ml/sedlex/sedlex-2.5-r1.ebuild new file mode 100644 index 000000000000..87cc6542f10d --- /dev/null +++ b/dev-ml/sedlex/sedlex-2.5-r1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="An OCaml lexer generator for Unicode" +HOMEPAGE="https://github.com/ocaml-community/sedlex" +SRC_URI="https://github.com/ocaml-community/${PN}/archive/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="+ocamlopt" + +DEPEND=" + dev-ml/gen:= + <dev-ml/ppxlib-0.26:= + dev-ml/uchar:= +" +RDEPEND="${DEPEND}" + +src_compile() { + ebegin "Building" + dune build @install --display short --profile release \ + --ignore-promoted-rules + eend $? || die +} + +dune_src_test() { + ebegin "Testing" + dune runtest --display short --profile release \ + --ignore-promoted-rules + eend $? || die +} diff --git a/dev-ml/sedlex/sedlex-3.0.ebuild b/dev-ml/sedlex/sedlex-3.0.ebuild new file mode 100644 index 000000000000..7cf89cfc99cc --- /dev/null +++ b/dev-ml/sedlex/sedlex-3.0.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="An OCaml lexer generator for Unicode" +HOMEPAGE="https://github.com/ocaml-community/sedlex" +SRC_URI="https://github.com/ocaml-community/${PN}/archive/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="+ocamlopt" + +DEPEND=" + dev-ml/gen:= + >=dev-ml/ppxlib-0.26:= + dev-ml/uchar:= +" +RDEPEND="${DEPEND}" + +src_compile() { + ebegin "Building" + dune build @install --display short --profile release \ + --ignore-promoted-rules + eend $? || die +} + +dune_src_test() { + ebegin "Testing" + dune runtest --display short --profile release \ + --ignore-promoted-rules + eend $? || die +} diff --git a/dev-ml/sedlex/sedlex-3.1.ebuild b/dev-ml/sedlex/sedlex-3.1.ebuild new file mode 100644 index 000000000000..4c5d9b412edd --- /dev/null +++ b/dev-ml/sedlex/sedlex-3.1.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Using "--for-release-of-packages" skips the regeneration of "unicode.ml" file +# (using curl), see "src_compile" and "src_test" and "dune-release". +DUNE_PKG_NAME=${PN} + +inherit dune + +DESCRIPTION="An OCaml lexer generator for Unicode" +HOMEPAGE="https://github.com/ocaml-community/sedlex/" +SRC_URI="https://github.com/ocaml-community/${PN}/archive/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +DEPEND=" + dev-ml/gen:= + >=dev-ml/ppxlib-0.26:= +" +RDEPEND="${DEPEND}" +BDEPEND="test? ( dev-ml/ppx_expect )" + +src_compile() { + dune-compile ${DUNE_PKG_NAME} +} + +src_test() { + dune-test ${DUNE_PKG_NAME} +} diff --git a/dev-ml/seq/Manifest b/dev-ml/seq/Manifest index ba6223385466..439093b05627 100644 --- a/dev-ml/seq/Manifest +++ b/dev-ml/seq/Manifest @@ -1 +1,4 @@ -DIST seq-0.1.tar.gz 2452 BLAKE2B 4f673c3909611957fc882c548c8549cbcad1e93101e1968f001609108b89f4cee13b055a7a8e75e9c36d33074863532b7d84461f036d14c468d5baadde411295 SHA512 cf0df428408efd8f593765c419007c3b181c1234fa957bd09bd96bbbbc7950dcd329429a8a22573680fdfd46847e21befae29ade967509690428ba2b90fe83f2 +DIST seq-0.2.2.tar.gz 12240 BLAKE2B 0f7c64e26593b012b60cfdcba02dc2748558c46a72789c77eaff70bcb24ab601895c429aa16dc066151323a48c312a372af5e19cebe0886e9203d55436c09cb1 SHA512 cab0eb4cb6d9788b7cbd7acbefefc15689d706c97ff7f75dd97faf3c21e466af4d0ff110541a24729db587e7172b1a30a3c2967e17ec2e49cbd923360052c07c +DIST seq-0.2.tar.gz 12012 BLAKE2B 2321caabaefd98d4237d6ede034007ae5a4295765df4df21d4f0d475f097461992e4619f817ea7ebb20a3023e9d175237d636ed99bb8b1ca7b097c805daffbe8 SHA512 b2571225a18e624b79dad5e1aab91b22e2fda17702f2e23c438b75d2a71e24c55ee8672005f5cc4b17ae79e3b277b1918b71b5d0d674b8b12ea19b3fb2d747cb +DIST seq-0.3.1.tar.gz 12290 BLAKE2B 997550614086e54394710168af388cb0d393a85584bfbe2327a16abee58e59a6ca161152f6874657896bb30a77049397e72b1d93d721a1a0cdd99614140c640d SHA512 06ce767d3ec1532f8a2421d033f4d9dc5c08c9a27574754d456c31a71ecb9a3c33857591b7d24f85492dce679cd0da8c8985c9fb1a5b5a7f8588d90056b663b8 +DIST seq-0.3.tar.gz 12562 BLAKE2B 2ef68aac50cee1a6faa97cd408d231541f3b0a941896bfadd4503c7b26a554b95314bedfba6cf34c2253858f5e86660876a1635e87a861a7a54d8a805106f9be SHA512 3cbca9e771bc05350b5c6ffd41237fa12c6909a077f1090e28c4d0403711c137c96fccd670f074b1ea1a47bdcfd7a7618247bdad6ee71e52e9af75894e8cd974 diff --git a/dev-ml/seq/files/seq-0.1-gentoo.patch b/dev-ml/seq/files/seq-0.1-gentoo.patch deleted file mode 100644 index 1b3de2b9c12f..000000000000 --- a/dev-ml/seq/files/seq-0.1-gentoo.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/Makefile 2019-07-21 21:17:32.334645928 +0200 -+++ b/Makefile 2019-07-21 21:18:28.565894767 +0200 -@@ -9,6 +9,6 @@ - TOINSTALL=$(wildcard _build/src/*) - - install: -- ocamlfind install seq META $(TOINSTALL) -+ ocamlfind install -destdir $(DESTDIR)@LIBDIR@ seq META $(TOINSTALL) - - .PHONY: build clean install diff --git a/dev-ml/seq/metadata.xml b/dev-ml/seq/metadata.xml index 4b96cb1315b7..bb6e7fae4125 100644 --- a/dev-ml/seq/metadata.xml +++ b/dev-ml/seq/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>tupone@gentoo.org</email> - <name>Tupone Alfredo</name> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> </maintainer> - <longdescription lang="en"> - Compatibility package for OCaml's standard iterator type starting from 4.07. - </longdescription> + <upstream> + <remote-id type="github">c-cube/seq</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-ml/seq/seq-0.1.ebuild b/dev-ml/seq/seq-0.1.ebuild deleted file mode 100644 index 13d3d327be21..000000000000 --- a/dev-ml/seq/seq-0.1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Compatibility package for the standard OCaml iterator type" -HOMEPAGE="https://github.com/c-cube/seq" -SRC_URI="https://github.com/c-cube/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="dev-ml/findlib - dev-ml/ocamlbuild" -RDEPEND="${DEPEND}" -BDEPEND="" - -PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) - -src_prepare() { - default - sed -i \ - -e "s:@LIBDIR@:/usr/$(get_libdir)/ocaml:" \ - Makefile \ - || die -} - -src_install() { - dodir /usr/$(get_libdir)/ocaml - default -} diff --git a/dev-ml/seq/seq-0.2.2.ebuild b/dev-ml/seq/seq-0.2.2.ebuild new file mode 100644 index 000000000000..78c149e9992d --- /dev/null +++ b/dev-ml/seq/seq-0.2.2.ebuild @@ -0,0 +1,15 @@ +# Copyright 2020-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Compatibility package for the standard OCaml iterator type" +HOMEPAGE="https://github.com/c-cube/seq" +SRC_URI="https://github.com/c-cube/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" diff --git a/dev-ml/seq/seq-0.2.ebuild b/dev-ml/seq/seq-0.2.ebuild new file mode 100644 index 000000000000..5fb3541e7a91 --- /dev/null +++ b/dev-ml/seq/seq-0.2.ebuild @@ -0,0 +1,15 @@ +# Copyright 2020-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Compatibility package for the standard OCaml iterator type" +HOMEPAGE="https://github.com/c-cube/seq" +SRC_URI="https://github.com/c-cube/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt" diff --git a/dev-ml/seq/seq-0.3-r1.ebuild b/dev-ml/seq/seq-0.3-r1.ebuild new file mode 100644 index 000000000000..8df53d15f2e4 --- /dev/null +++ b/dev-ml/seq/seq-0.3-r1.ebuild @@ -0,0 +1,18 @@ +# Copyright 2020-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Compatibility package for the standard OCaml iterator type" +HOMEPAGE="https://github.com/c-cube/seq" +SRC_URI="https://github.com/c-cube/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="+ocamlopt" + +RDEPEND=">=dev-lang/ocaml-4.07" +BDEPEND="${RDEPEND}" diff --git a/dev-ml/seq/seq-0.3.1-r1.ebuild b/dev-ml/seq/seq-0.3.1-r1.ebuild new file mode 100644 index 000000000000..daec26a132fc --- /dev/null +++ b/dev-ml/seq/seq-0.3.1-r1.ebuild @@ -0,0 +1,18 @@ +# Copyright 2020-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Compatibility package for the standard OCaml iterator type" +HOMEPAGE="https://github.com/c-cube/seq" +SRC_URI="https://github.com/c-cube/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +RDEPEND=">=dev-lang/ocaml-4.07" +BDEPEND="${RDEPEND}" diff --git a/dev-ml/sequence/Manifest b/dev-ml/sequence/Manifest deleted file mode 100644 index 89e785a08a32..000000000000 --- a/dev-ml/sequence/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST sequence-0.10.tar.gz 88020 BLAKE2B 407b6df189c33c9dc8c47fc6c47edf1ff500935f371014756c88e6929cf038ce358abf7039636f42164286cd705047be530ff0f8899fb0ba63bed37ff503fb19 SHA512 52ca4a2f83d774e6cee7f35c4ef6942968d7ca3b902f645a3d36620a2a4ebe78532383ad4e7de4fac23f1a04e5005cd0b23c0cd0b7b4e329ad05d8341c5ddc3e diff --git a/dev-ml/sequence/metadata.xml b/dev-ml/sequence/metadata.xml deleted file mode 100644 index d1abc039fe95..000000000000 --- a/dev-ml/sequence/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">c-cube/sequence</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/sequence/sequence-0.10.ebuild b/dev-ml/sequence/sequence-0.10.ebuild deleted file mode 100644 index 1d89efbc87af..000000000000 --- a/dev-ml/sequence/sequence-0.10.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -OASIS_BUILD_DOCS=1 -OASIS_BUILD_TESTS=1 - -inherit oasis - -DESCRIPTION="Simple sequence (iterator) datatype and combinators" -HOMEPAGE="https://github.com/c-cube/sequence" -SRC_URI="https://github.com/c-cube/sequence/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD-2" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND=">=dev-lang/ocaml-4.03:=" -DEPEND="${RDEPEND} - test? ( dev-ml/iTeML )" -DOCS=( "README.adoc" "CHANGELOG.md" ) diff --git a/dev-ml/sexp_pretty/Manifest b/dev-ml/sexp_pretty/Manifest new file mode 100644 index 000000000000..ab0927b8d7e3 --- /dev/null +++ b/dev-ml/sexp_pretty/Manifest @@ -0,0 +1,3 @@ +DIST sexp_pretty-0.15.0.tar.gz 22407 BLAKE2B df8d246ebe1164f0d2d3ae78074c8249d2aa255a089e02eb9fcc0c21b808dc172da2da264d3b21b92dcc7bf9e51a2921ea8631eb45b45a46035447ead7abe02d SHA512 bc2a7aecfc3ae379a56e8940b9cc80ece686009c9f67233e7993e25ebbe251d62559601923db718a0f967cf42fc84024597c069659842760bb2ac5ce0eab8df2 +DIST sexp_pretty-0.15.1.tar.gz 22410 BLAKE2B e3819bce21afb8addcf391aff7a330db7f332c338d11f87cf0264d0e8d45ead7897b881a646a908e6165e2b60b9d49c6f2cb4da26ef7f3402ddbc864ff6b088b SHA512 900accca43727f8e7603f21adb0b2bc5a121b1444112b152ed1bfd6ace553b3cd4b2f80371a8f924b636ea33cfa26e913bdcd0ab42e5af5fd24f21ecbca8e736 +DIST sexp_pretty-0.16.0.tar.gz 22557 BLAKE2B e44dbaaf18ffe8899ae636271110cccfeeb61e0284b321ee0d9865e0a8805df4a50540b526988c7f8f0d42092a036421b1e53122c6d22fb38d7ad4295c1055c8 SHA512 531c71dc77abfe9d088eb6213ae9d6563d9a6e1db58a710974120ece6465e192aab4ede6e36e12b6a386bbcfcfa497d5f7a5ac250ea54bdf641cbd597ffc96b6 diff --git a/dev-ml/sexp_pretty/metadata.xml b/dev-ml/sexp_pretty/metadata.xml new file mode 100644 index 000000000000..7b8d25489544 --- /dev/null +++ b/dev-ml/sexp_pretty/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">janestreet/sexp_pretty</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/sexp_pretty/sexp_pretty-0.15.0-r1.ebuild b/dev-ml/sexp_pretty/sexp_pretty-0.15.0-r1.ebuild new file mode 100644 index 000000000000..df25c3ade56d --- /dev/null +++ b/dev-ml/sexp_pretty/sexp_pretty-0.15.0-r1.ebuild @@ -0,0 +1,26 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="S-expression pretty-printer" +HOMEPAGE="https://github.com/janestreet/sexp_pretty" +SRC_URI="https://github.com/janestreet/${PN}/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" +IUSE="+ocamlopt" + +DEPEND=" + dev-ml/ppx_base:${SLOT} + dev-ml/ppx_hash:= + dev-ml/ppxlib:= + dev-ml/sexplib:${SLOT} + dev-ml/re:= +" +RDEPEND="${DEPEND}" +BDEPEND="" diff --git a/dev-ml/sexp_pretty/sexp_pretty-0.15.1-r1.ebuild b/dev-ml/sexp_pretty/sexp_pretty-0.15.1-r1.ebuild new file mode 100644 index 000000000000..3cd190085932 --- /dev/null +++ b/dev-ml/sexp_pretty/sexp_pretty-0.15.1-r1.ebuild @@ -0,0 +1,27 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="S-expression pretty-printer" +HOMEPAGE="https://github.com/janestreet/sexp_pretty" +SRC_URI="https://github.com/janestreet/${PN}/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86" +IUSE="+ocamlopt" + +DEPEND=" + dev-ml/ppxlib:= + dev-ml/ppx_base:${SLOT} + dev-ml/ppx_enumerate:= + dev-ml/ppx_hash:= + dev-ml/re:= + dev-ml/sexplib:${SLOT} +" +RDEPEND="${DEPEND}" +BDEPEND="" diff --git a/dev-ml/sexp_pretty/sexp_pretty-0.16.0.ebuild b/dev-ml/sexp_pretty/sexp_pretty-0.16.0.ebuild new file mode 100644 index 000000000000..76bb6484838f --- /dev/null +++ b/dev-ml/sexp_pretty/sexp_pretty-0.16.0.ebuild @@ -0,0 +1,28 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="S-expression pretty-printer" +HOMEPAGE="https://github.com/janestreet/sexp_pretty" +SRC_URI="https://github.com/janestreet/${PN}/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-lang/ocaml-4.14 + dev-ml/ppxlib:= + dev-ml/ppx_base:${SLOT} + dev-ml/ppx_enumerate:= + dev-ml/ppx_hash:= + dev-ml/re:= + dev-ml/sexplib:${SLOT} +" +RDEPEND="${DEPEND}" +BDEPEND="" diff --git a/dev-ml/sexplib/Manifest b/dev-ml/sexplib/Manifest index efd0978a7744..42eecf096879 100644 --- a/dev-ml/sexplib/Manifest +++ b/dev-ml/sexplib/Manifest @@ -1,2 +1,3 @@ -DIST sexplib-0.9.2.tar.gz 75035 BLAKE2B c08e4285cc36fe259d5145d43c847bc466e0b4d9897c58708ce39e6b04d52c84cc5c7603f296edaf6c0752c846d9cb9b03c9610eb5d3fd9bc1b1ad67b4a046cd SHA512 d9e02ae9e7e8be4387c5d4e5c4a23222e2ebbd3355d52c26e0d6ac0ccc4f4e09653ac2852e6698d6128ff954888e65d97dd7a494b9404bad2e8349cd592bab1d -DIST sexplib-0.9.3.tar.gz 75074 BLAKE2B 60ddb336f8ff334f995399e63a12d9ab5403ed27bf62259d13159eed0a5c6b246673406ca9ed9f542cdc4e53460a5136f56fe75127ea199448e85dd55cf53ff3 SHA512 32c471b3ef2b2595fed7fa748b7bc7059491651442dec0bca5a60b93458d78b0950e4386a973c9c856ba25f3f839d6747ab9e2e88b1927f9907e8107b63b706d +DIST sexplib-0.14.0.tar.gz 54055 BLAKE2B d0ee1470fb9d28eb6d6ed3aaf0f6bd63d7c4860183ac287054f08bc54d57d0c52ebf9fe516aa991d8c66967ecc6ad95b6a6d19eb40a9f610a6f91f832d9d2e20 SHA512 e77a9ae8991e6b73de57ab6b7068d6482471dd34ff0af23b93b5ba57bd69493d15db3279d3b328280f716e531c08c2a6c39bfaa886f1934240dcc13724673684 +DIST sexplib-0.15.1.tar.gz 55000 BLAKE2B 8f93590ad1cf5fc8286a3a99711d977d36e875e531ec2149fcfebda5d95aa42f29bd0efb16073a71effd854265f15b303291c9d17f848a9fdd3dcc174baed912 SHA512 05a1cbca244286020af6c5ba1d92b32f5d7940dc409c61a8fc5ff114bec60167c8381ae997b53998ea3c0d5167ee77bf160873958512199b06efec1a2a191a7b +DIST sexplib-0.16.0.tar.gz 55015 BLAKE2B 3d4157cfc0e5906a351c0a04380582895544f95c9ad88e576764967c46614c0553b606064eab75a8561c59a9fcb353ae695f743e0eda1a61a4c66a57b24f51e3 SHA512 f924d92ddf11f12be51073a3dfca45486d90b05533f29804518ee86b93386b8ff8d7e692c71d77b11347b78e9f6f6dcf7d79b71540efe54b013fa09b3bab414a diff --git a/dev-ml/sexplib/metadata.xml b/dev-ml/sexplib/metadata.xml index c696f7c81c16..78ab04fa6159 100644 --- a/dev-ml/sexplib/metadata.xml +++ b/dev-ml/sexplib/metadata.xml @@ -1,12 +1,12 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="bitbucket">yminsky/ocaml-core</remote-id> - <remote-id type="github">janestreet/sexplib</remote-id> - </upstream> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="bitbucket">yminsky/ocaml-core</remote-id> + <remote-id type="github">janestreet/sexplib</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-ml/sexplib/sexplib-0.9.2.ebuild b/dev-ml/sexplib/sexplib-0.14.0-r1.ebuild index a5ed48014b30..4d2035d59c64 100644 --- a/dev-ml/sexplib/sexplib-0.9.2.ebuild +++ b/dev-ml/sexplib/sexplib-0.14.0-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit opam +inherit dune DESCRIPTION="Library for automated conversion of OCaml-values to and from S-expressions" HOMEPAGE="https://github.com/janestreet/sexplib" @@ -11,12 +11,13 @@ SRC_URI="https://github.com/janestreet/sexplib/archive/v${PV}.tar.gz -> ${P}.tar LICENSE="Apache-2.0" SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" -RDEPEND="" -DEPEND="${RDEPEND} dev-ml/jbuilder" - -src_test() { - jbuilder runtest || die -} +RDEPEND=" + =dev-ml/parsexp-0.14*:=[ocamlopt?] + dev-ml/base:=[ocamlopt?] + dev-ml/sexplib0:0/0.14.0[ocamlopt?] + dev-ml/num:=[ocamlopt?] +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/sexplib/sexplib-0.9.3.ebuild b/dev-ml/sexplib/sexplib-0.15.1-r2.ebuild index a5ed48014b30..bd09e3007d8e 100644 --- a/dev-ml/sexplib/sexplib-0.9.3.ebuild +++ b/dev-ml/sexplib/sexplib-0.15.1-r2.ebuild @@ -1,22 +1,23 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit opam +inherit dune DESCRIPTION="Library for automated conversion of OCaml-values to and from S-expressions" HOMEPAGE="https://github.com/janestreet/sexplib" SRC_URI="https://github.com/janestreet/sexplib/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" -RDEPEND="" -DEPEND="${RDEPEND} dev-ml/jbuilder" - -src_test() { - jbuilder runtest || die -} +RDEPEND=" + dev-ml/parsexp:0/0.15[ocamlopt?] + dev-ml/base:0/0.15[ocamlopt?] + =dev-ml/sexplib0-0.15*:=[ocamlopt?] + dev-ml/num:=[ocamlopt?] +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/sexplib/sexplib-0.16.0-r1.ebuild b/dev-ml/sexplib/sexplib-0.16.0-r1.ebuild new file mode 100644 index 000000000000..c8f4857f46ed --- /dev/null +++ b/dev-ml/sexplib/sexplib-0.16.0-r1.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Library for automated conversion of OCaml-values to and from S-expressions" +HOMEPAGE="https://github.com/janestreet/sexplib" +SRC_URI="https://github.com/janestreet/sexplib/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +RDEPEND=" + =dev-ml/sexplib0-0.16*:=[ocamlopt?] + dev-ml/base:${SLOT}[ocamlopt?] + dev-ml/num:=[ocamlopt?] + dev-ml/parsexp:${SLOT}[ocamlopt?] +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/sexplib0/Manifest b/dev-ml/sexplib0/Manifest new file mode 100644 index 000000000000..2b308a09d544 --- /dev/null +++ b/dev-ml/sexplib0/Manifest @@ -0,0 +1,4 @@ +DIST sexplib0-0.14.0.tar.gz 17677 BLAKE2B bf906491cd8c8021b6737fa6a9510ad7421a01c448bd1e136cd7244eaeb27674a4c3e739be601a66b1f23a2f6dd2f19771b66fde88a2f3e75e24111ae5ace3e5 SHA512 cfffb390809a1ed3b99d3326a7c5035e2fedf7af084d94f6c0cff98ba641056b5b2896d56d32b1b27bdde29b199bbd32d174cdee84c2e1541cb7f2e4bf00e4ed +DIST sexplib0-0.15.0.tar.gz 16706 BLAKE2B 154b8f3cb48dd6f13e7ed9679a8ecde6ae57a7a0d70f50c214f088f377d52b1c00b5d7545f9949fd4d17f21ffb9187981b0d009b063c48d252926fdd7a49307f SHA512 ae44c3724b8f7bf8a19bbb10464a21d74b662c77ba3937bab6ca9709843ee2ae7da44432d6dbf4f744cabc3e369b5d2fc89c16e372c3cb77e55077b5efda3041 +DIST sexplib0-0.15.1.tar.gz 16106 BLAKE2B ab994e151166860c85d646cd759031f668577f2ff97e86b9a949f510220fc84dc80d7c41c91c2ba5e5946c8c4d95d3bb469f2669d919068a05ac5c4fdc4a8f59 SHA512 3f15e011b180cccd96882b6b3d3922c13622151713080261a9646d8df896635a6a85e2df6a5d332784678d0d1cae7eccb190769ac4d9bd68b040bc3b41362056 +DIST sexplib0-0.16.0.tar.gz 22171 BLAKE2B a280ce73278acd4c16a5f063ef90a7406edec0d32f3b17c3821c1e5cb32c8c2c8b9843ae0068b9b453815de737323b1ab2a995fd600cbe19aae78bd7307b49c8 SHA512 ec95e2858df80f22be58493221d83ffff7d56c47910aeb5769101678b85da65bd29d785519fc2d5a4bb8ce30067a924fae6d8f733a6a26113423e955e2f516b8 diff --git a/dev-ml/sexplib0/metadata.xml b/dev-ml/sexplib0/metadata.xml new file mode 100644 index 000000000000..287cabfbeb5d --- /dev/null +++ b/dev-ml/sexplib0/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">janestreet/sexplib0</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/sexplib0/sexplib0-0.14.0.ebuild b/dev-ml/sexplib0/sexplib0-0.14.0.ebuild new file mode 100644 index 000000000000..3b225cdc1803 --- /dev/null +++ b/dev-ml/sexplib0/sexplib0-0.14.0.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Library for automated conversion of OCaml-values to and from S-expressions" +HOMEPAGE="https://github.com/janestreet/sexplib0" +SRC_URI="https://github.com/janestreet/sexplib0/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" diff --git a/dev-ml/sexplib0/sexplib0-0.15.0-r2.ebuild b/dev-ml/sexplib0/sexplib0-0.15.0-r2.ebuild new file mode 100644 index 000000000000..fbbc5f687795 --- /dev/null +++ b/dev-ml/sexplib0/sexplib0-0.15.0-r2.ebuild @@ -0,0 +1,16 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Library for automated conversion of OCaml-values to and from S-expressions" +HOMEPAGE="https://github.com/janestreet/sexplib0" +SRC_URI="https://github.com/janestreet/sexplib0/archive/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" diff --git a/dev-ml/sexplib0/sexplib0-0.15.1-r1.ebuild b/dev-ml/sexplib0/sexplib0-0.15.1-r1.ebuild new file mode 100644 index 000000000000..95ae8ae86b8e --- /dev/null +++ b/dev-ml/sexplib0/sexplib0-0.15.1-r1.ebuild @@ -0,0 +1,16 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Library for automated conversion of OCaml-values to and from S-expressions" +HOMEPAGE="https://github.com/janestreet/sexplib0" +SRC_URI="https://github.com/janestreet/sexplib0/archive/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" diff --git a/dev-ml/sexplib0/sexplib0-0.16.0.ebuild b/dev-ml/sexplib0/sexplib0-0.16.0.ebuild new file mode 100644 index 000000000000..ccee44d06d08 --- /dev/null +++ b/dev-ml/sexplib0/sexplib0-0.16.0.ebuild @@ -0,0 +1,16 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Library for automated conversion of OCaml-values to and from S-expressions" +HOMEPAGE="https://github.com/janestreet/sexplib0" +SRC_URI="https://github.com/janestreet/sexplib0/archive/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" diff --git a/dev-ml/spawn/Manifest b/dev-ml/spawn/Manifest index 1b2617d0cb7a..2561a39aa399 100644 --- a/dev-ml/spawn/Manifest +++ b/dev-ml/spawn/Manifest @@ -1 +1,3 @@ -DIST spawn-0.9.0.tar.gz 12689 BLAKE2B cc07c3be778b32465e78789638c5d46169d17882058a6c441b37b95c6a291cd5291af8ef1e9d48aa996cd35acddc343159d7da959136df5f84ffea4e1fb7d028 SHA512 29d8e3477d5f90bfa4d2ad874b870a9ea7e140507050e0d1d7e851af75fbd61e5ab64218a0ce00cae8a38ee8675e8ebca1faee009dfe57b8ca8f130a1b46e8c9 +DIST spawn-0.13.0.tar.gz 13048 BLAKE2B f64815c99b3ee7a0e4a18c33012df658e57d7973101ced83aa509c2dfa6455b59b110cc61477da0750305fb8b81ed4a1436a6a7418313185644ea531745a80da SHA512 897ffec4a4c15c819e4429f6b71427005d6b40df6039e6c7f0b1ca4b4e35b24304dc56e27ce88bd81f5b61f936444f5d6e80ea14483991067aa6ee072f4a90dc +DIST spawn-0.15.0.tar.gz 15808 BLAKE2B 72c29c012c3aa700b345e6c5b5a5b8bed4576c721cd9fa435c652e0605cc88bb545247e5a8284b7603e22ca5ab27d36042c6d8020742fc5e9e7b762167a9f864 SHA512 3a775b57a73efee6adbc30b32fa779f27d11c7008a46f90fdb9da6288533e2d83fc49dbcd770c087f2e4560c5586ff72a9a2985d8929955773cc10d83f126013 +DIST spawn-0.15.1.tar.gz 15861 BLAKE2B 95478f0f575688ba66dc69229463c6cf029c39e6edf8cead2d38dfa0fc01bacf85d63f09d6d084d96a2537c55b02184ce69166be12628a8046c7e007222f648c SHA512 efdb31d5ec5ea36d0bc80224d4ee04e46ce3428d1662870e6cebece92bc313d6eebee378802c0c059dd6e0cafea515308c31b7dfaf04a098eb4566583c1e9ed4 diff --git a/dev-ml/spawn/metadata.xml b/dev-ml/spawn/metadata.xml index d154edf55543..1de34d8d6d0c 100644 --- a/dev-ml/spawn/metadata.xml +++ b/dev-ml/spawn/metadata.xml @@ -1,9 +1,9 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">janestreet/spawn</remote-id> diff --git a/dev-ml/spawn/spawn-0.9.0.ebuild b/dev-ml/spawn/spawn-0.13.0.ebuild index 20fe4468b71d..441c200bb3e4 100644 --- a/dev-ml/spawn/spawn-0.9.0.ebuild +++ b/dev-ml/spawn/spawn-0.13.0.ebuild @@ -1,19 +1,18 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit opam +inherit dune DESCRIPTION="Spawning sub-processes" HOMEPAGE="https://github.com/janestreet/spawn" SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="Apache-2.0" +LICENSE="MIT" SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" -DEPEND="" -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} dev-ml/jbuilder" +BDEPEND="test? ( dev-ml/ppx_expect )" diff --git a/dev-ml/spawn/spawn-0.15.0-r1.ebuild b/dev-ml/spawn/spawn-0.15.0-r1.ebuild new file mode 100644 index 000000000000..14f286a60e35 --- /dev/null +++ b/dev-ml/spawn/spawn-0.15.0-r1.ebuild @@ -0,0 +1,18 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Spawning sub-processes" +HOMEPAGE="https://github.com/janestreet/spawn" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +BDEPEND="test? ( dev-ml/ppx_expect )" diff --git a/dev-ml/spawn/spawn-0.15.1.ebuild b/dev-ml/spawn/spawn-0.15.1.ebuild new file mode 100644 index 000000000000..1072baea7264 --- /dev/null +++ b/dev-ml/spawn/spawn-0.15.1.ebuild @@ -0,0 +1,18 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Spawning sub-processes" +HOMEPAGE="https://github.com/janestreet/spawn" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +BDEPEND="test? ( dev-ml/ppx_expect )" diff --git a/dev-ml/splittable_random/Manifest b/dev-ml/splittable_random/Manifest new file mode 100644 index 000000000000..16a30265ecdf --- /dev/null +++ b/dev-ml/splittable_random/Manifest @@ -0,0 +1,3 @@ +DIST splittable_random-0.14.0.tar.gz 9942 BLAKE2B 3147e290cbf7a6e2ce8994ce0f95f392a4f7f24f7c2b6fd1b5394ec537e8be7efbefebcb8f2794e026cdd30596e6defde86126646b19f6d299ee79dbaa4d4bb7 SHA512 c8c006bba0f74e53892d9fd364de4d822182ce5371deae4f5d881d59ad6b9a8a429ac6aca54ae95edf312565b87e89a2c2546a349b2e6de2a78ece0655a09b94 +DIST splittable_random-0.15.0.tar.gz 9945 BLAKE2B 66083ed6dba1acad98570431497074a551c107c2b0c0d812f1771ee94e4c52b34373fd152f4afef73383dcca378d2cb623718406c55038d879fa3b3ead329166 SHA512 10adeedcda260301f8866a8f128d2f6a59ebbb70898fd82bf2c9db9b40cb1bc24bdb9706d0d0983e8abd8c4a4a920b06d16a3196dc6ba522b13af5c4b9302811 +DIST splittable_random-0.16.0.tar.gz 9978 BLAKE2B 55c351cd36fc7f41a3abcdad1ca81bd8da67e8d0eadb8d28306e42de9990cfb00b8c7812e7a15c3ffb447c9180347395e403de38740344baf54e48760fbc9f91 SHA512 eeb58de6cf8ee6fda61997ad06e9a3d807eb4e296320b2fcb17bf2ce41dc9ca4dc75ff1caf257dcbb94bd6f205ea2f9b1e2d91a42cf4ee34964ba91f8a0bebd3 diff --git a/dev-ml/splittable_random/metadata.xml b/dev-ml/splittable_random/metadata.xml new file mode 100644 index 000000000000..2c4cd408c435 --- /dev/null +++ b/dev-ml/splittable_random/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">janestreet/splittable_random</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/splittable_random/splittable_random-0.14.0.ebuild b/dev-ml/splittable_random/splittable_random-0.14.0.ebuild new file mode 100644 index 000000000000..10e40ec481bb --- /dev/null +++ b/dev-ml/splittable_random/splittable_random-0.14.0.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="PRNG that can be split into independent streams" +HOMEPAGE="https://github.com/janestreet/splittable_random" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +RDEPEND=" + dev-ml/base:= + dev-ml/ppx_assert:= + dev-ml/ppx_bench:= + dev-ml/ppx_inline_test:= + dev-ml/ppx_sexp_message:= +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/splittable_random/splittable_random-0.15.0.ebuild b/dev-ml/splittable_random/splittable_random-0.15.0.ebuild new file mode 100644 index 000000000000..c632430f4806 --- /dev/null +++ b/dev-ml/splittable_random/splittable_random-0.15.0.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="PRNG that can be split into independent streams" +HOMEPAGE="https://github.com/janestreet/splittable_random" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +RDEPEND=" + dev-ml/ppx_bench:${SLOT} + dev-ml/ppx_sexp_message:${SLOT} +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/splittable_random/splittable_random-0.16.0.ebuild b/dev-ml/splittable_random/splittable_random-0.16.0.ebuild new file mode 100644 index 000000000000..4e4c7a4d1db0 --- /dev/null +++ b/dev-ml/splittable_random/splittable_random-0.16.0.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="PRNG that can be split into independent streams" +HOMEPAGE="https://github.com/janestreet/splittable_random" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +RDEPEND=" + >=dev-lang/ocaml-4.14 + dev-ml/ppx_assert:${SLOT} + dev-ml/ppx_bench:${SLOT} + dev-ml/ppx_compare:= + dev-ml/ppx_here:= + dev-ml/ppx_inline_test:${SLOT} + dev-ml/ppx_sexp_message:${SLOT} + dev-ml/ppx_sexp_conv:= + dev-ml/ppxlib:= +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/stdcompat/Manifest b/dev-ml/stdcompat/Manifest new file mode 100644 index 000000000000..bd3fa2e01ed9 --- /dev/null +++ b/dev-ml/stdcompat/Manifest @@ -0,0 +1 @@ +DIST stdcompat-19.tar.gz 530511 BLAKE2B 4af97c355b98f63366d647a4a375bde43ffbf959a2c02132ab57457db4213b8f98a972bf99667dd53603b28235b4f853470c2117270ce42c6aa579a21dd148fb SHA512 25582731170f2f80eed281c48af4904d1d00ef88a38d1b17853395c19a326d7b11e42c17b69f639402c467ff6f9b83a2e9d4dbab7255ac25d466b85a55674bd0 diff --git a/dev-ml/stdcompat/metadata.xml b/dev-ml/stdcompat/metadata.xml new file mode 100644 index 000000000000..ef295f228ea6 --- /dev/null +++ b/dev-ml/stdcompat/metadata.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <longdescription lang="en"> + Compatibility module for OCaml standard library allowing programs + to use some recent additions to the OCaml standard library while + preserving the ability to be compiled on former versions of OCaml. + </longdescription> + <upstream> + <remote-id type="github">thierry-martinez/stdcompat</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/stdcompat/stdcompat-19.ebuild b/dev-ml/stdcompat/stdcompat-19.ebuild new file mode 100644 index 000000000000..edb7ebbf80a0 --- /dev/null +++ b/dev-ml/stdcompat/stdcompat-19.ebuild @@ -0,0 +1,27 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Compatibility module for OCaml standard library" +HOMEPAGE="https://github.com/thierry-martinez/stdcompat" +SRC_URI="https://github.com/thierry-martinez/stdcompat/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="BSD-2" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" + +DEPEND="dev-lang/ocaml:=[ocamlopt] + dev-ml/result:=[ocamlopt] + dev-ml/uchar:=[ocamlopt]" +RDEPEND="${DEPEND}" +BDEPEND=" + dev-ml/dune + dev-ml/findlib[ocamlopt]" + +# Do not complain about CFLAGS etc since ml projects do not use them. +QA_FLAGS_IGNORED='.*' + +src_configure () { + econf --libdir="${EPREFIX}"/usr/$(get_libdir)/ocaml +} diff --git a/dev-ml/stdio/Manifest b/dev-ml/stdio/Manifest index 169768ab7a6b..ea53852e50f4 100644 --- a/dev-ml/stdio/Manifest +++ b/dev-ml/stdio/Manifest @@ -1,2 +1,3 @@ -DIST stdio-0.9.0.tar.gz 9264 BLAKE2B 1f3d7748ed07672eaad7c747c8925fb9e5204d59c05e8ee8674d689dcc44b9ae9d2da8420cfa05e8e0a58bded343cba979ff42f5f8fdae5392a1868591269f32 SHA512 a3809272c00653872d02b07b6c133215e06a70a7cbebed8c6c22ba5790ee8cbba17821da7875290c8869dfac22bf3cf248028e2aed2570195ca9b5f63b6ab75d -DIST stdio-0.9.1.tar.gz 9281 BLAKE2B fa3a5a3877aa2ab19155d865eea03458b742224de11857f9f2c1219eef3f0fbd6562cf0eafc90c59dab03053db0dcae27c19a73da4f3a73e3b6d6a9407868f3d SHA512 bfef782562af7fae790b8baf02bf5d5edae2ccff29531080a608fd9224710c7d0a1a346c3480b6eaf4d7be1a280e19d9380a4dd9072de6d68e48ac419d275716 +DIST stdio-0.14.0.tar.gz 7867 BLAKE2B e9aa9727489bf59350fe87323689a5c4f5bf710bb4932b0153c4ad742db5fe03a05728d86c281796cb77d1aef9ba2cc1b236630cb125d1d182c54c344a0ee335 SHA512 74cac04bd6b1be8c13f739445185286a910f66877cb61c8f22b4027dbc3f82021030d55eb7c8471bac850fc7c0f86462a8e26653c7a08c95fb7eea16512c5f61 +DIST stdio-0.15.0.tar.gz 7811 BLAKE2B 8343c6b4c42be64514efc31d59d17522d7b33dc8400b477431091ffe3504b1d00789c1bf74a85f50e1e9d3c753908a4e66cfdc667f9caad5193bc1d299d6303d SHA512 6ac6de32fda504482ccc48aa33e240240c22beb8c7203bd9addf2471b352220c95474ed0ef0b1119c28bf5e7b25a7b2d03c400c1b730e51dfa8f30431659f37d +DIST stdio-0.16.0.tar.gz 7836 BLAKE2B 05f1d26d9d67996d6221ef1f1c8053afb4c53efbc8b9c75c83b72a4ca18e255d0df540461ad85e6bb0cbe8458bd09bf0029b3983ae498f91c1ae7cf9c85535d2 SHA512 fab88e4a869a88566e0f7143bec45db9572f40dc0e9528b6993edc75fbbdace46593912386c417b317daaa1fd07d4212a4e40e5afae0e682b61f4093b423f3a8 diff --git a/dev-ml/stdio/metadata.xml b/dev-ml/stdio/metadata.xml index 0d2812b35089..3bfa25fb597d 100644 --- a/dev-ml/stdio/metadata.xml +++ b/dev-ml/stdio/metadata.xml @@ -1,9 +1,9 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">janestreet/stdio</remote-id> diff --git a/dev-ml/stdio/stdio-0.9.0-r1.ebuild b/dev-ml/stdio/stdio-0.14.0-r2.ebuild index ea3350ffe129..34cadbbbd257 100644 --- a/dev-ml/stdio/stdio-0.9.0-r1.ebuild +++ b/dev-ml/stdio/stdio-0.14.0-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit opam +inherit dune DESCRIPTION="Standard IO Library for OCaml" HOMEPAGE="https://github.com/janestreet/stdio" @@ -11,12 +11,10 @@ SRC_URI="https://github.com/janestreet/stdio/archive/v${PV}.tar.gz -> ${P}.tar.g LICENSE="Apache-2.0" SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" -RDEPEND="dev-ml/base:= dev-ml/sexplib:=" -DEPEND="${RDEPEND} dev-ml/jbuilder" - -src_test() { - jbuilder runtest || die -} +RDEPEND=" + <dev-ml/base-0.15.0:= +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/stdio/stdio-0.9.1.ebuild b/dev-ml/stdio/stdio-0.15.0-r1.ebuild index ea3350ffe129..9ff47650e71e 100644 --- a/dev-ml/stdio/stdio-0.9.1.ebuild +++ b/dev-ml/stdio/stdio-0.15.0-r1.ebuild @@ -1,22 +1,18 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit opam +inherit dune DESCRIPTION="Standard IO Library for OCaml" HOMEPAGE="https://github.com/janestreet/stdio" SRC_URI="https://github.com/janestreet/stdio/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" -RDEPEND="dev-ml/base:= dev-ml/sexplib:=" -DEPEND="${RDEPEND} dev-ml/jbuilder" - -src_test() { - jbuilder runtest || die -} +RDEPEND="dev-ml/base:${SLOT}" +DEPEND="${RDEPEND}" diff --git a/dev-ml/stdio/stdio-0.16.0.ebuild b/dev-ml/stdio/stdio-0.16.0.ebuild new file mode 100644 index 000000000000..171197bf5c82 --- /dev/null +++ b/dev-ml/stdio/stdio-0.16.0.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Standard IO Library for OCaml" +HOMEPAGE="https://github.com/janestreet/stdio" +SRC_URI="https://github.com/janestreet/stdio/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +RDEPEND=" + >=dev-lang/ocaml-4.14 + dev-ml/base:${SLOT} +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/stdlib-shims/Manifest b/dev-ml/stdlib-shims/Manifest new file mode 100644 index 000000000000..303277e49620 --- /dev/null +++ b/dev-ml/stdlib-shims/Manifest @@ -0,0 +1,2 @@ +DIST stdlib-shims-0.2.0.tbz 15980 BLAKE2B 4d83b8642a4bccc9f090c0a2f23a4d2f16bbf2ec686ab41e357f5f544d659e82f10cba85f9d578c939a2a874d0006b7fd17846bb8ffe1b6fc7cb760e4aa33db1 SHA512 19e8d8e004583e94ce060d3598c886dae1c24dd79dfd177aab4bd2865846f668a83071f087d9371393f226c14c90042eb2ec76619654c655995aeff9d4765621 +DIST stdlib-shims-0.3.0.tbz 10163 BLAKE2B 442f07a9b80fb915a0254ba814227798c838f9fa4c6e9a94c4b99c22ca25844f121de235cb758707179275da9200cd45cbb6e68392b0217af97c6e1bb04a13a3 SHA512 1151d7edc8923516e9a36995a3f8938d323aaade759ad349ed15d6d8501db61ffbe63277e97c4d86149cf371306ac23df0f581ec7e02611f58335126e1870980 diff --git a/dev-ml/stdlib-shims/metadata.xml b/dev-ml/stdlib-shims/metadata.xml new file mode 100644 index 000000000000..20ede2e739d5 --- /dev/null +++ b/dev-ml/stdlib-shims/metadata.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <longdescription> + Compatibility library for OCaml compilers before 4.08 to allow calling + Pervasives module functions on Stdlib, which is the API in newer compilers. + Does not add newer Stdlib functions. + </longdescription> + <maintainer type="person" proxied="yes"> + <email>rkitover@gmail.com</email> + <name>Rafael Kitover</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="github">ocaml/stdlib-shims</remote-id> + </upstream> + <use> + <flag name="ocamlopt"> + Whether the OCaml native code compiler is used. Must be set globally and + match <pkg>dev-lang/ocaml</pkg>. + </flag> + </use> +</pkgmetadata> diff --git a/dev-ml/stdlib-shims/stdlib-shims-0.2.0.ebuild b/dev-ml/stdlib-shims/stdlib-shims-0.2.0.ebuild new file mode 100644 index 000000000000..91bbbcc943c2 --- /dev/null +++ b/dev-ml/stdlib-shims/stdlib-shims-0.2.0.ebuild @@ -0,0 +1,17 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Pure OCaml library that allows replacing Pervasives with Stdlib before 4.08" +HOMEPAGE="https://github.com/ocaml/stdlib-shims" +SRC_URI="https://github.com/ocaml/${PN}/releases/download/${PV}/${P}.tbz" + +LICENSE="LGPL-2.1-with-linking-exception" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt" + +DOCS=( "README.md" "CHANGES.md" "LICENSE" ) diff --git a/dev-ml/stdlib-shims/stdlib-shims-0.3.0.ebuild b/dev-ml/stdlib-shims/stdlib-shims-0.3.0.ebuild new file mode 100644 index 000000000000..8ef89b963ab2 --- /dev/null +++ b/dev-ml/stdlib-shims/stdlib-shims-0.3.0.ebuild @@ -0,0 +1,17 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Pure OCaml library that allows replacing Pervasives with Stdlib before 4.08" +HOMEPAGE="https://github.com/ocaml/stdlib-shims" +SRC_URI="https://github.com/ocaml/${PN}/releases/download/${PV}/${P}.tbz" + +LICENSE="LGPL-2.1-with-linking-exception" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +DOCS=( "README.md" "CHANGES.md" "LICENSE" ) diff --git a/dev-ml/stdune/Manifest b/dev-ml/stdune/Manifest new file mode 100644 index 000000000000..f68aa6173e46 --- /dev/null +++ b/dev-ml/stdune/Manifest @@ -0,0 +1,10 @@ +DIST dune-3.0.3.tar.gz 1725788 BLAKE2B 2de93c085f642c8381642a08b18bc21ad48097f32397b3eddab9725deb267b089849b649705e1b72bb1b5b37f7531fd9e0cfb134174f0cb3a8ee2595c7dcf8ce SHA512 839e942bcf8189763d0d9b01614333bb2f036bce68c82959e51d2e9145b57067cb862b66781912391c1a0f531b8dddf2ffeafcee71c626169a437fe40feba155 +DIST dune-3.10.0.tar.gz 2640800 BLAKE2B 5fc479a91ee6792f07a4fb61af530d55f46dea56b2fd5919975c0bfb231229395e7d0769bdae88419a89d378b8d7e2b229f7410ce7a34414629aa5117e606230 SHA512 2884a4eaaa44164ce911286ca6670b548a4a564e2b5040f05405d1d2729af84083fbfdde7c92db4f6f7a54d15a43fc9dddcec19d8d79d5a66221b2be861473de +DIST dune-3.2.0.tar.gz 1754664 BLAKE2B 97ba420a5bf9dd8e14ba74c0e91b6679924fd9ee7b8d9a9a2d4b282166d9172582a37adf408fd037972dab7525cd240c24729b6692f403c32029b2994044bd40 SHA512 a90ac689d97acab956fd96f16f7c6cfdc95d01785fc14f0d3c8ab39231ff78e8941d2db2fa8cbfaa39bbed8f865e11b628aacae1b22df49512a57d0263c0dca4 +DIST dune-3.6.1.tar.gz 1843804 BLAKE2B 1e7bf67b596f60a553f00cfd8287ce36ef4ff5b8d8f16465df3f3b7b6d332ceef5101057df9389aeb9ceb4dc7f23bc69320412aebba7587deeb933a0f8ddca46 SHA512 2db83116a3d0995c8d0dfd6a1581d214f657a7d90c30dea04d5370327e13c575fed6ce74106a79c2e2fe0c02aa2912ae7a9f4e49c36985fb613b6a41de0700c9 +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 +DIST dune-3.8.0.tar.gz 2564537 BLAKE2B 773a2643b187f37dd2e21df41f18818753e249e66c2d98a4cfee3d9997f528827b2cf3c60d2992ffdc51397c393ac1a0fcc5339bdec2d87f82252114394d2355 SHA512 bba32fb508265329a2a46c9bd2e8b7e5f3d6d84390e842382ff4790f0d3414c9ff1d005c1af88988daaca29749729f1ced7b388f2d96432f01f2f4ea4714be98 +DIST dune-3.9.0.tar.gz 2609923 BLAKE2B f9fe8fb3c2e002e1eec141f487709d592df969ab44d41012ebaa436f17b6ee679e2e763d479106ae722b8b61be03fceb701b314c40c001d5895db99e5fbbe4a6 SHA512 86cd66222553f8cd7c1d1fb9e4e55169f9cd6d92e0bde1c56846b5e0fb6ae8494ac15ebb68d9e8761240f46dcc9b480747e48b21b74cff86e52cc45d3d222070 +DIST dune-3.9.1.tar.gz 2610113 BLAKE2B 0b97f6a951bd013a156a1417f6b65df17324adf13d48ad3b8bf45a4133cc77195e2118ae95f0cb9da488c26378b58ce677db8eb4b3cb028a73c779be57b2d611 SHA512 c997ec2205fa5391acbca9e196387cec1af69d3aed4cebe21d82edbe66bd91fda0c742e7ff2e3ffb8df88e2e379bbff68028574664cf375d04f4d3f3f2102f3b diff --git a/dev-ml/stdune/metadata.xml b/dev-ml/stdune/metadata.xml new file mode 100644 index 000000000000..86dc156e664c --- /dev/null +++ b/dev-ml/stdune/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">ocaml/dune</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/stdune/stdune-3.0.3-r2.ebuild b/dev-ml/stdune/stdune-3.0.3-r2.ebuild new file mode 100644 index 000000000000..6899e81ace5c --- /dev/null +++ b/dev-ml/stdune/stdune-3.0.3-r2.ebuild @@ -0,0 +1,38 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune multiprocessing + +DESCRIPTION="Dune's unstable standard library" +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" +DEPEND=" + dev-ml/pp:=[ocamlopt?] + ~dev-ml/dyn-${PV}:=[ocamlopt?] + ~dev-ml/ordering-${PV}:=[ocamlopt?] + >=dev-ml/csexp-1.5:=[ocamlopt?] + !<dev-ml/dune-private-libs-3 +" +RDEPEND="${DEPEND}" + +src_configure() { + ./configure \ + --libdir="$(ocamlc -where)" \ + --mandir="/usr/share/man" \ + || die +} + +src_compile() { + dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die +} diff --git a/dev-ml/stdune/stdune-3.10.0.ebuild b/dev-ml/stdune/stdune-3.10.0.ebuild new file mode 100644 index 000000000000..8d82be573c81 --- /dev/null +++ b/dev-ml/stdune/stdune-3.10.0.ebuild @@ -0,0 +1,36 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune multiprocessing + +DESCRIPTION="Dune's unstable standard library" +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/pp:=[ocamlopt?] + ~dev-ml/dyn-${PV}:=[ocamlopt?] + ~dev-ml/ordering-${PV}:=[ocamlopt?] + >=dev-ml/csexp-1.5:=[ocamlopt?] + !<dev-ml/dune-private-libs-3 +" +RDEPEND="${DEPEND}" + +src_configure() { + : +} + +src_compile() { + dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die +} diff --git a/dev-ml/stdune/stdune-3.2.0-r1.ebuild b/dev-ml/stdune/stdune-3.2.0-r1.ebuild new file mode 100644 index 000000000000..6eb7a8ea3f95 --- /dev/null +++ b/dev-ml/stdune/stdune-3.2.0-r1.ebuild @@ -0,0 +1,36 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune multiprocessing + +DESCRIPTION="Dune's unstable standard library" +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" +DEPEND=" + dev-ml/pp:=[ocamlopt?] + ~dev-ml/dyn-${PV}:=[ocamlopt?] + ~dev-ml/ordering-${PV}:=[ocamlopt?] + >=dev-ml/csexp-1.5:=[ocamlopt?] + !<dev-ml/dune-private-libs-3 +" +RDEPEND="${DEPEND}" + +src_configure() { + : +} + +src_compile() { + dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die +} diff --git a/dev-ml/stdune/stdune-3.6.1-r1.ebuild b/dev-ml/stdune/stdune-3.6.1-r1.ebuild new file mode 100644 index 000000000000..8d82be573c81 --- /dev/null +++ b/dev-ml/stdune/stdune-3.6.1-r1.ebuild @@ -0,0 +1,36 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune multiprocessing + +DESCRIPTION="Dune's unstable standard library" +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/pp:=[ocamlopt?] + ~dev-ml/dyn-${PV}:=[ocamlopt?] + ~dev-ml/ordering-${PV}:=[ocamlopt?] + >=dev-ml/csexp-1.5:=[ocamlopt?] + !<dev-ml/dune-private-libs-3 +" +RDEPEND="${DEPEND}" + +src_configure() { + : +} + +src_compile() { + dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die +} diff --git a/dev-ml/stdune/stdune-3.6.2-r1.ebuild b/dev-ml/stdune/stdune-3.6.2-r1.ebuild new file mode 100644 index 000000000000..58729dd1a5c9 --- /dev/null +++ b/dev-ml/stdune/stdune-3.6.2-r1.ebuild @@ -0,0 +1,36 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune multiprocessing + +DESCRIPTION="Dune's unstable standard library" +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/pp:=[ocamlopt?] + ~dev-ml/dyn-${PV}:=[ocamlopt?] + ~dev-ml/ordering-${PV}:=[ocamlopt?] + >=dev-ml/csexp-1.5:=[ocamlopt?] + !<dev-ml/dune-private-libs-3 +" +RDEPEND="${DEPEND}" + +src_configure() { + : +} + +src_compile() { + dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die +} diff --git a/dev-ml/stdune/stdune-3.7.0-r1.ebuild b/dev-ml/stdune/stdune-3.7.0-r1.ebuild new file mode 100644 index 000000000000..8d82be573c81 --- /dev/null +++ b/dev-ml/stdune/stdune-3.7.0-r1.ebuild @@ -0,0 +1,36 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune multiprocessing + +DESCRIPTION="Dune's unstable standard library" +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/pp:=[ocamlopt?] + ~dev-ml/dyn-${PV}:=[ocamlopt?] + ~dev-ml/ordering-${PV}:=[ocamlopt?] + >=dev-ml/csexp-1.5:=[ocamlopt?] + !<dev-ml/dune-private-libs-3 +" +RDEPEND="${DEPEND}" + +src_configure() { + : +} + +src_compile() { + dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die +} diff --git a/dev-ml/stdune/stdune-3.7.1.ebuild b/dev-ml/stdune/stdune-3.7.1.ebuild new file mode 100644 index 000000000000..c31152e785e8 --- /dev/null +++ b/dev-ml/stdune/stdune-3.7.1.ebuild @@ -0,0 +1,36 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune multiprocessing + +DESCRIPTION="Dune's unstable standard library" +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/pp:=[ocamlopt?] + ~dev-ml/dyn-${PV}:=[ocamlopt?] + ~dev-ml/ordering-${PV}:=[ocamlopt?] + >=dev-ml/csexp-1.5:=[ocamlopt?] + !<dev-ml/dune-private-libs-3 +" +RDEPEND="${DEPEND}" + +src_configure() { + : +} + +src_compile() { + dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die +} diff --git a/dev-ml/stdune/stdune-3.8.0.ebuild b/dev-ml/stdune/stdune-3.8.0.ebuild new file mode 100644 index 000000000000..8d82be573c81 --- /dev/null +++ b/dev-ml/stdune/stdune-3.8.0.ebuild @@ -0,0 +1,36 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune multiprocessing + +DESCRIPTION="Dune's unstable standard library" +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/pp:=[ocamlopt?] + ~dev-ml/dyn-${PV}:=[ocamlopt?] + ~dev-ml/ordering-${PV}:=[ocamlopt?] + >=dev-ml/csexp-1.5:=[ocamlopt?] + !<dev-ml/dune-private-libs-3 +" +RDEPEND="${DEPEND}" + +src_configure() { + : +} + +src_compile() { + dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die +} diff --git a/dev-ml/stdune/stdune-3.9.0.ebuild b/dev-ml/stdune/stdune-3.9.0.ebuild new file mode 100644 index 000000000000..8d82be573c81 --- /dev/null +++ b/dev-ml/stdune/stdune-3.9.0.ebuild @@ -0,0 +1,36 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune multiprocessing + +DESCRIPTION="Dune's unstable standard library" +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/pp:=[ocamlopt?] + ~dev-ml/dyn-${PV}:=[ocamlopt?] + ~dev-ml/ordering-${PV}:=[ocamlopt?] + >=dev-ml/csexp-1.5:=[ocamlopt?] + !<dev-ml/dune-private-libs-3 +" +RDEPEND="${DEPEND}" + +src_configure() { + : +} + +src_compile() { + dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die +} diff --git a/dev-ml/stdune/stdune-3.9.1.ebuild b/dev-ml/stdune/stdune-3.9.1.ebuild new file mode 100644 index 000000000000..8d82be573c81 --- /dev/null +++ b/dev-ml/stdune/stdune-3.9.1.ebuild @@ -0,0 +1,36 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune multiprocessing + +DESCRIPTION="Dune's unstable standard library" +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/pp:=[ocamlopt?] + ~dev-ml/dyn-${PV}:=[ocamlopt?] + ~dev-ml/ordering-${PV}:=[ocamlopt?] + >=dev-ml/csexp-1.5:=[ocamlopt?] + !<dev-ml/dune-private-libs-3 +" +RDEPEND="${DEPEND}" + +src_configure() { + : +} + +src_compile() { + dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die +} diff --git a/dev-ml/stringext/Manifest b/dev-ml/stringext/Manifest deleted file mode 100644 index a750484e02a6..000000000000 --- a/dev-ml/stringext/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST stringext-1.4.3.tar.gz 49255 BLAKE2B a1594144be431ead57e92339fef60a4823b8d1bf77e60bdfc7f89e5bc8700c4c55afcae90980b6486284d0de62b8cb3090a1cffe2f26a276f8063329e34c8068 SHA512 f6d6ad9e6cd89fb499f2ef449eede448fe9d67912644f44ffadf4e869326bc20fd839d7e725a133e4a81ca8ba98497fd02307efb9f9f62cbad4308e18123ffb5 -DIST stringext-1.5.0.tar.gz 8007 BLAKE2B 73854adb0b44f921f6364925dbd37e2f03d795561ec36044031318a584be53e13b3963a66aedfef3517b7760541c279e75b3645c99dd9b1d1a02fa22eba8a9fa SHA512 69c744ecf86f890fb8eeba245d3b5bbf1e2cadcf4274f3525faef6be242940dae77639639e202101b19e0772214af405edd67b7d33a3e9224798ec3e53167fc9 diff --git a/dev-ml/stringext/metadata.xml b/dev-ml/stringext/metadata.xml deleted file mode 100644 index a3f7ab664d86..000000000000 --- a/dev-ml/stringext/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">rgrinberg/stringext</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/stringext/stringext-1.4.3.ebuild b/dev-ml/stringext/stringext-1.4.3.ebuild deleted file mode 100644 index 2d743c11f5e3..000000000000 --- a/dev-ml/stringext/stringext-1.4.3.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -OASIS_BUILD_TESTS=1 - -inherit oasis - -DESCRIPTION="Extra string functions for OCaml" -HOMEPAGE="https://github.com/rgrinberg/stringext" -SRC_URI="https://github.com/rgrinberg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND=" - >=dev-lang/ocaml-4:= -" -DEPEND=" - ${RDEPEND} - test? ( dev-ml/iTeML ) -" - -DOCS=( README.md ) diff --git a/dev-ml/stringext/stringext-1.5.0.ebuild b/dev-ml/stringext/stringext-1.5.0.ebuild deleted file mode 100644 index 698b8f42876c..000000000000 --- a/dev-ml/stringext/stringext-1.5.0.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit opam - -DESCRIPTION="Extra string functions for OCaml" -HOMEPAGE="https://github.com/rgrinberg/stringext" -SRC_URI="https://github.com/rgrinberg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="test" - -RDEPEND="" -DEPEND=" - ${RDEPEND} - dev-ml/jbuilder - test? ( dev-ml/iTeML ) -" diff --git a/dev-ml/textutils/Manifest b/dev-ml/textutils/Manifest index 8eec1f84e79d..99c658a7275d 100644 --- a/dev-ml/textutils/Manifest +++ b/dev-ml/textutils/Manifest @@ -1 +1,3 @@ -DIST textutils-0.9.0.tar.gz 19603 BLAKE2B 20e515b62fad7b17a0bb05c3a3ad45af81dcf3bf5c98617803186df0badecf369a684cb481786fc0074b177807049848b27272b6a4872e26d7b47a036ca7c98f SHA512 2a60b0add940f3584752f1add546716ad1e9e002d8fae460d9e62acda39e4b486c06a3fa27ceab754d2339dc46422a5a9534345c743950d6ed08683060cab759 +DIST textutils-0.14.0.tar.gz 13261 BLAKE2B f4e1f364e72af47d70d1b674399c923672a780aefa1a2de731e786ef6a5fe03789d5605d326e883b9b37b0ac6fd98246b243980b16c25a4cc8baed29a2142cf9 SHA512 e8dca3f0f5c096846201a4fddf06e7bd3ad721a21df054189d0a7316a8d5be73df6633b045f7027d03b8023448f017aab14dbfc13985a11b5a2b58e5498b6de3 +DIST textutils-0.15.0.tar.gz 15477 BLAKE2B ceb8482f8c76323bdd08c9c065220868dcc5405e4461d2b787e78e458ac0f7872519955a3c8247217517b12ec4450dd4452d7ae4d5a851151aa4e47f655f009b SHA512 d45dd57a3490330ab800cd06903bba760e89fc46b1209d3ad91395a729f999fec1af62f3c74c08d0270fb7a89de115f1cc08bdaf77d74a043183e629fc367e1b +DIST textutils-0.16.0.tar.gz 15746 BLAKE2B fa77379886f1eed61d68be5ec33826cefa403e2f32aadde76934d7fbcba335f41257c7db339a7c671d1b6f784585eea580592419c736f10d4f8a643ac6688352 SHA512 860448856cf99388a7c297271c59450d3ebef38fcc0826986f0add442cd633528f4e2b6a4babee567c250716e3fa9535c024550e58d0a082f6677a6378d99760 diff --git a/dev-ml/textutils/metadata.xml b/dev-ml/textutils/metadata.xml index b6c90b996015..99fac2737bd9 100644 --- a/dev-ml/textutils/metadata.xml +++ b/dev-ml/textutils/metadata.xml @@ -1,9 +1,9 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">janestreet/textutils</remote-id> diff --git a/dev-ml/textutils/textutils-0.9.0.ebuild b/dev-ml/textutils/textutils-0.14.0.ebuild index 2ebb56bcc79c..ff21a6b6789a 100644 --- a/dev-ml/textutils/textutils-0.9.0.ebuild +++ b/dev-ml/textutils/textutils-0.14.0.ebuild @@ -1,23 +1,23 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit opam +inherit dune DESCRIPTION="Text output utilities" HOMEPAGE="https://github.com/janestreet/textutils" SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="Apache-2.0" +LICENSE="MIT" SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" RDEPEND=" dev-ml/core:= - dev-ml/ppx_driver:= + dev-ml/core_kernel:= dev-ml/ppx_jane:= - dev-ml/ocaml-migrate-parsetree:= + dev-ml/uutf:= " -DEPEND="${RDEPEND} dev-ml/jbuilder" +DEPEND="${RDEPEND}" diff --git a/dev-ml/textutils/textutils-0.15.0.ebuild b/dev-ml/textutils/textutils-0.15.0.ebuild new file mode 100644 index 000000000000..c10c076fe2d1 --- /dev/null +++ b/dev-ml/textutils/textutils-0.15.0.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Text output utilities" +HOMEPAGE="https://github.com/janestreet/textutils" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86" +IUSE="+ocamlopt" + +RDEPEND=" + dev-ml/core_unix:${SLOT} + dev-ml/textutils_kernel:${SLOT} +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/textutils/textutils-0.16.0.ebuild b/dev-ml/textutils/textutils-0.16.0.ebuild new file mode 100644 index 000000000000..38a352a5fee9 --- /dev/null +++ b/dev-ml/textutils/textutils-0.16.0.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Text output utilities" +HOMEPAGE="https://github.com/janestreet/textutils" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="+ocamlopt" + +RDEPEND=" + >=dev-lang/ocaml-4.14 + dev-ml/core:${SLOT} + dev-ml/core_kernel:${SLOT} + dev-ml/core_unix:${SLOT} + dev-ml/ppx_jane:${SLOT} + dev-ml/textutils_kernel:${SLOT} + >=dev-ml/uutf-1.0.2:= +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/textutils_kernel/Manifest b/dev-ml/textutils_kernel/Manifest new file mode 100644 index 000000000000..e4996d0a4dae --- /dev/null +++ b/dev-ml/textutils_kernel/Manifest @@ -0,0 +1,2 @@ +DIST textutils_kernel-0.15.0.tar.gz 17691 BLAKE2B 564a2bfd6d6a1248e9c004dd6740be1552219a11960872e67eae2c2485f01e662fbd108345992f4a924dc9b125516ac39c1c5b211a35aa296f64ca473a9bef3b SHA512 6295f0285e16829ba2282ca23225e783a422edfc2ea1a1e7b02df519430efd05b7e8e21a61078a1a523ddfb3668dba04f44836341efa260ffe3e9738603afdaf +DIST textutils_kernel-0.16.0.tar.gz 19413 BLAKE2B 3201a051215fdcd38d3f132d8de07712065397a2f534ada3de5e427c40a85deec29fda7a940dff7e5d3dc57dc0acd1f0c6bb9ec1c32f27f6e0b0904540b00a7d SHA512 ea3323c3070ab531484c9ad7ca579fd25a3f9c96ef2a7aebdd824f4de027759d29d52039018a98fdc250159ec566b9c38638d3da7c44df490540076a0c11352f diff --git a/dev-ml/optcomp/metadata.xml b/dev-ml/textutils_kernel/metadata.xml index df0fbc459f20..25f8e9b0d645 100644 --- a/dev-ml/optcomp/metadata.xml +++ b/dev-ml/textutils_kernel/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> - <remote-id type="github">diml/optcomp</remote-id> + <remote-id type="github">janestreet/textutils_kernel</remote-id> </upstream> </pkgmetadata> diff --git a/dev-ml/textutils_kernel/textutils_kernel-0.15.0.ebuild b/dev-ml/textutils_kernel/textutils_kernel-0.15.0.ebuild new file mode 100644 index 000000000000..da1dc5669f7c --- /dev/null +++ b/dev-ml/textutils_kernel/textutils_kernel-0.15.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Text output utilities" +HOMEPAGE="https://github.com/janestreet/textutils_kernel" +SRC_URI="https://github.com/janestreet/${PN}/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86" +IUSE="+ocamlopt" + +DEPEND=" + dev-ml/core:${SLOT} + >=dev-ml/uutf-1.0.2:= +" +RDEPEND="${DEPEND}" +BDEPEND="" diff --git a/dev-ml/textutils_kernel/textutils_kernel-0.16.0.ebuild b/dev-ml/textutils_kernel/textutils_kernel-0.16.0.ebuild new file mode 100644 index 000000000000..37289a18f25c --- /dev/null +++ b/dev-ml/textutils_kernel/textutils_kernel-0.16.0.ebuild @@ -0,0 +1,25 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Text output utilities" +HOMEPAGE="https://github.com/janestreet/textutils_kernel" +SRC_URI="https://github.com/janestreet/${PN}/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-lang/ocaml-4.14 + dev-ml/core:${SLOT} + dev-ml/ppx_jane:${SLOT} + >=dev-ml/uutf-1.0.2:= +" +RDEPEND="${DEPEND}" +BDEPEND="" diff --git a/dev-ml/time_now/Manifest b/dev-ml/time_now/Manifest new file mode 100644 index 000000000000..33a333793b0c --- /dev/null +++ b/dev-ml/time_now/Manifest @@ -0,0 +1,3 @@ +DIST time_now-0.14.0.tar.gz 3666 BLAKE2B 131d4b585ac981fe306ea93f17e332cfabe86a3f8f4564a76e4dc694f9c624e91fe0f0ce26a4ada9fdf0239033fcd29065d76a37e6fb4b79927d116531c04909 SHA512 1b6d1a754e46f1756aa2aad3590e5052999f567630297491d62228ad733b189fbbfc0589b7bafd74e9f77ca0c0421093054e9062d2d5a7d7ed05930be67e9a5f +DIST time_now-0.15.0.tar.gz 3697 BLAKE2B 142e848aa17f3cd14ef9d90a758f21b2ae3881e7e70c1b25fac0980a1d925d41953ded6632423b24e9f124887e71dc07ce1f7c838e45d18724a036bb5cb29473 SHA512 b24bf9fda05cc84c568cc8637771e8774661df738719b4ad30f86ae4a9a984e9f1d344dc58ab6014d37275e99e92bf3b2d34a8c4dfc474faf00c6096f679e371 +DIST time_now-0.16.0.tar.gz 3729 BLAKE2B df7569be37f608bd3f466dc8da96357d42c7bf48f299dd90543222213bdfad7e40f89f368e7dd5e0c2ee53f2b59d43650bd3006ade9bdfde1261cda26d4c306c SHA512 59c380bc89ac5185e344ef051180270bad62ccc7ad60aec4279aba5f71bae8dae6ac29136a6ca85ad7b24e204615fd84cd7db0901b6550de490e8992301c0ac2 diff --git a/dev-ml/time_now/metadata.xml b/dev-ml/time_now/metadata.xml new file mode 100644 index 000000000000..65feccd9ce16 --- /dev/null +++ b/dev-ml/time_now/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">janestreet/time_now</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/time_now/time_now-0.14.0.ebuild b/dev-ml/time_now/time_now-0.14.0.ebuild new file mode 100644 index 000000000000..99ee779a443c --- /dev/null +++ b/dev-ml/time_now/time_now-0.14.0.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Reports the current time" +HOMEPAGE="https://github.com/janestreet/time_now" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +DEPEND=" + dev-ml/base:= + dev-ml/jane-street-headers:= + dev-ml/jst-config:= + dev-ml/ppx_base:= + dev-ml/ppx_optcomp:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/time_now/time_now-0.15.0.ebuild b/dev-ml/time_now/time_now-0.15.0.ebuild new file mode 100644 index 000000000000..f71d16fcf28a --- /dev/null +++ b/dev-ml/time_now/time_now-0.15.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Reports the current time" +HOMEPAGE="https://github.com/janestreet/time_now" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +DEPEND=" + dev-ml/jane-street-headers:${SLOT} + dev-ml/jst-config:${SLOT} + dev-ml/ppx_base:${SLOT} + dev-ml/ppx_optcomp:${SLOT} +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/time_now/time_now-0.16.0.ebuild b/dev-ml/time_now/time_now-0.16.0.ebuild new file mode 100644 index 000000000000..18c454106009 --- /dev/null +++ b/dev-ml/time_now/time_now-0.16.0.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Reports the current time" +HOMEPAGE="https://github.com/janestreet/time_now" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +DEPEND=" + >=dev-lang/ocaml-4.14 + dev-ml/base:${SLOT} + dev-ml/jane-street-headers:${SLOT} + dev-ml/jst-config:${SLOT} + dev-ml/ppx_base:${SLOT} + dev-ml/ppx_enumerate:= + dev-ml/ppx_hash:= + dev-ml/ppx_optcomp:${SLOT} + dev-ml/stdio:= +" +RDEPEND="${DEPEND}" diff --git a/dev-ml/timezone/Manifest b/dev-ml/timezone/Manifest new file mode 100644 index 000000000000..d06e38d3f253 --- /dev/null +++ b/dev-ml/timezone/Manifest @@ -0,0 +1,3 @@ +DIST timezone-0.14.0.tar.gz 9480 BLAKE2B d9f65420671d8a0607d16f91c6b10b48def78a813a87ecbbc3e036367a2084d53a256c698521f10b407dac0606208e1f5f2cd56c475e0a173cfc0a3e5a5cdede SHA512 39abb7ebc9e08520a9c969da948bd3de0dc9dc01c75d5ca324afacf231671edca3eadd6992ef3037cc23218990af8061419e5580d9ab246a43d31c5788599cc5 +DIST timezone-0.15.0.tar.gz 9480 BLAKE2B a47fd0efcd659e2bd3adcb07776a4ca25ef65fc5ba4af87ef361cd4aa2c45e3641e9f240b033f50c0e6108868deca7bf57eba6e8a753947ef7b14f03c74b911c SHA512 d50cd1e8f116f9121383b2d20d5dcbf99b5388a2fed915302f0566c6f2d93bdf1480c2f998fac6b81a636be52b601b38981b3083adaaf405a1154b63c0b0d6da +DIST timezone-0.16.0.tar.gz 9881 BLAKE2B 839cc11605bf8e9215c6629918b5a9423f3f5d67cb896f3b277707dc22e3570c9dd7f264aa0baa43aaace94500cde47915cd20b2fddf04c87bda445714691438 SHA512 d01f9d0b0cca379a6741d0af35e39860d97e620cd2a064d5498b724319a88e8088bdad5df52b2972a234b59678d99821edce4400c889d98857023a8c54149889 diff --git a/dev-ml/timezone/metadata.xml b/dev-ml/timezone/metadata.xml new file mode 100644 index 000000000000..33a0c218ffc7 --- /dev/null +++ b/dev-ml/timezone/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">janestreet/timezone</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/timezone/timezone-0.14.0.ebuild b/dev-ml/timezone/timezone-0.14.0.ebuild new file mode 100644 index 000000000000..5446f2a1e0a4 --- /dev/null +++ b/dev-ml/timezone/timezone-0.14.0.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Time-zone handling for OCaml" +HOMEPAGE="https://github.com/janestreet/timezone" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +RDEPEND=" + dev-ml/core_kernel:= + dev-ml/ppx_jane:= + dev-ml/stdio:= +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/timezone/timezone-0.15.0.ebuild b/dev-ml/timezone/timezone-0.15.0.ebuild new file mode 100644 index 000000000000..94f063c9746c --- /dev/null +++ b/dev-ml/timezone/timezone-0.15.0.ebuild @@ -0,0 +1,18 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Time-zone handling for OCaml" +HOMEPAGE="https://github.com/janestreet/timezone" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86" +IUSE="+ocamlopt" + +RDEPEND="dev-ml/core:${SLOT}" +DEPEND="${RDEPEND}" diff --git a/dev-ml/timezone/timezone-0.16.0-r1.ebuild b/dev-ml/timezone/timezone-0.16.0-r1.ebuild new file mode 100644 index 000000000000..535ba4635b52 --- /dev/null +++ b/dev-ml/timezone/timezone-0.16.0-r1.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Time-zone handling for OCaml" +HOMEPAGE="https://github.com/janestreet/timezone" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +RDEPEND=" + >=dev-lang/ocaml-4.14 + dev-ml/core:${SLOT} + dev-ml/ppx_jane:${SLOT} +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/tiny_httpd/Manifest b/dev-ml/tiny_httpd/Manifest new file mode 100644 index 000000000000..528990da261e --- /dev/null +++ b/dev-ml/tiny_httpd/Manifest @@ -0,0 +1 @@ +DIST tiny_httpd-0.12.tar.gz 49124 BLAKE2B c3f407a605dabad1c710a696a3fca5dce04a75deb61e25e9ce572432e0d96cd3029628ea24d17d55a051d1d0f78aa1fd80797e7ff9c0bb7fc9d190e461784cd3 SHA512 99b4d01d4f4d138b122c689b8b3bc5043fc386d6686675311f625bf5fec72c6e1a7513712b00889fe17cd392b8c475440d4f89ee46392aff32ac6ccc39cefe09 diff --git a/dev-ml/tiny_httpd/files/tiny_httpd-0.12-noseq.patch b/dev-ml/tiny_httpd/files/tiny_httpd-0.12-noseq.patch new file mode 100644 index 000000000000..b35ba64f8d72 --- /dev/null +++ b/dev-ml/tiny_httpd/files/tiny_httpd-0.12-noseq.patch @@ -0,0 +1,11 @@ +--- a/src/dune 2023-01-30 20:28:23.578884847 +0100 ++++ b/src/dune 2023-01-30 20:28:33.523713488 +0100 +@@ -2,7 +2,7 @@ + (library + (name tiny_httpd) + (public_name tiny_httpd) +- (libraries threads seq) ++ (libraries threads) + (flags :standard -safe-string -warn-error -a+8) + (wrapped false)) + diff --git a/dev-ml/tiny_httpd/metadata.xml b/dev-ml/tiny_httpd/metadata.xml new file mode 100644 index 000000000000..3efaa9afd9b2 --- /dev/null +++ b/dev-ml/tiny_httpd/metadata.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <use> + <flag name="camlzip">Interface to camlzip for tiny_httpd</flag> + </use> + <upstream> + <doc>https://c-cube.github.io/tiny_httpd/</doc> + <bugs-to>https://github.com/c-cube/tiny_httpd/issues</bugs-to> + <remote-id type="github">c-cube/tiny_httpd</remote-id> + <maintainer> + <name>Simon Cruanes</name> + <email>simon.cruanes.2007@m4x.org</email> + </maintainer> + </upstream> +</pkgmetadata> diff --git a/dev-ml/tiny_httpd/tiny_httpd-0.12-r1.ebuild b/dev-ml/tiny_httpd/tiny_httpd-0.12-r1.ebuild new file mode 100644 index 000000000000..957cfe61d316 --- /dev/null +++ b/dev-ml/tiny_httpd/tiny_httpd-0.12-r1.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune multiprocessing + +DESCRIPTION="Minimal HTTP server with a small request router" +HOMEPAGE=" + https://github.com/c-cube/tiny_httpd + https://opam.ocaml.org/packages/tiny_httpd +" +SRC_URI="https://github.com/c-cube/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64" +IUSE="camlzip ocamlopt test" + +RDEPEND=" + >=dev-lang/ocaml-4.08 + dev-ml/result:= + camlzip? ( >=dev-ml/camlzip-1.06:= ) +" +DEPEND=" + ${RDEPEND} + test? ( + dev-ml/qtest + dev-ml/ounit2 + dev-ml/ptime + dev-ml/qcheck + net-misc/curl + ) +" + +RESTRICT="!test? ( test )" +REQUIRED_USE="test? ( camlzip )" + +PATCHES=( "${FILESDIR}"/${P}-noseq.patch ) + +src_compile() { + local pkgs="tiny_httpd" + use camlzip && pkgs="${pkgs},tiny_httpd_camlzip" + dune build -p "${pkgs}" -j $(makeopts_jobs) || die +} + +src_install() { + dune_src_install tiny_httpd + use camlzip && dune_src_install "tiny_httpd_camlzip" +} diff --git a/dev-ml/topkg/Manifest b/dev-ml/topkg/Manifest index aa688bfebc4c..b296e325038d 100644 --- a/dev-ml/topkg/Manifest +++ b/dev-ml/topkg/Manifest @@ -1,2 +1,4 @@ -DIST topkg-0.9.0.tar.gz 120352 BLAKE2B 1122fe8b60e3d104136810a2cec8460c24a26061eff55e80347d2ecf197afee949e8afaca94a6615da31a8c3acaf113b44b16dbf2430fda6724e440597775bb5 SHA512 823fe1abb344d7800e09411c952bd276ecea97b5d9c124d986e26b9128d03b3ad023a38560198e476ef8f949ecb456078e332bda94075e9b746e43d3059a8fdb -DIST topkg-0.9.1.tar.gz 120943 BLAKE2B 39ac0d1d247183cf9f007c65b09d413ad6a89982d84269e99585ed5f15df4d7683de61548dba6ca5a1299f96206bfd2dc1042486410caa202938dc15e936446b SHA512 19773eb764b53a6e5110c44d7942d2557d6c8502a3037b57f7737efc08f4cc374845b431fdb1465207693d15a4b072aea3db97f8e60e069e3d24ae150e8c5c8f +DIST topkg-1.0.3.tar.gz 122302 BLAKE2B c3c583fe6d9c6602c9eeae6ba76f0b8e1eda754cb2ffed8f6a9b51eeea53a2d16ad0af5bf3bf1f257233481efd1e7fecfca7185773dcb4258f6a0a8195aaf61f SHA512 b4f3393b142c5c2d71bb4a25f5af020831bd48ad5c354b68cf5a2df2044b534024f0568da93ad26ca383c97ba4277b4878dba7ce9267146f3805c67f52950cbf +DIST topkg-1.0.5.tar.gz 123508 BLAKE2B b6090143659607fb65257adfc78f6c12782cf4cca99e5d997a2e324196cc19689b95b1412296feba410ce894d559e92d1f2c417ce46b441ad499a94264ffff99 SHA512 ea220df58ba3727281392b335377f9cea1cf1539ee86f2947faf1ccbcf36714fa40fbc06516867852d5992ca5840778467a02a0fe67369725da95eb442e4269a +DIST topkg-1.0.6.tar.gz 123588 BLAKE2B 49637d7ea34e243e0263a1a1cde2b3fc642325ac43f8c46d05c15a82bef9a117522e8a663c02bb8406b0a3d23b973ffc80e276aae4b316aa49f188ef5af919ee SHA512 560eb074d51824b02fb76223c2a16eefbf3bc1107c0c228b4e8491d2433e0b22e1b750ea63944f5653ab4e3e566a72c939cef6a8207e156874d6dad2b9c8ca99 +DIST topkg-1.0.7.tar.gz 123763 BLAKE2B e049b745651261d4167f01523c21018c2fa9e2c8d64f5f6dd5b469f85a293a83a89f00686cefb35f3529056f8023caf28e06ea3284c36c9213c3f5f303849794 SHA512 0f64f6c303592eb04c809d2922549cf25311c90c5ac6c33b70767c47eb31a8dc8296ddedead70c091fc16c30fc7fdf972ba92c7d9e4867afa07dcc1eceaee49f diff --git a/dev-ml/topkg/metadata.xml b/dev-ml/topkg/metadata.xml index 583ef1b56425..0171556544d1 100644 --- a/dev-ml/topkg/metadata.xml +++ b/dev-ml/topkg/metadata.xml @@ -1,9 +1,9 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">dbuenzli/topkg</remote-id> diff --git a/dev-ml/topkg/topkg-0.9.1.ebuild b/dev-ml/topkg/topkg-1.0.3.ebuild index 2cfed454c256..a0c802ec10f5 100644 --- a/dev-ml/topkg/topkg-0.9.1.ebuild +++ b/dev-ml/topkg/topkg-1.0.3.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit findlib @@ -11,13 +11,13 @@ SRC_URI="https://github.com/dbuenzli/topkg/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="ISC" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" -IUSE="" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="+ocamlopt" RDEPEND="dev-ml/result:= dev-ml/ocamlbuild:= dev-ml/findlib:= - dev-lang/ocaml:=" + dev-lang/ocaml:=[ocamlopt?]" DEPEND="${RDEPEND}" src_compile() { @@ -27,7 +27,12 @@ src_compile() { src_install() { # Can't use opam-installer here as it is an opam dep... findlib_src_preinst - local nativelibs="$(echo _build/src/${PN}*.cm{x,xa,xs,ti} _build/src/${PN}.a)" + + local nativelibs + if use ocamlopt; then + nativelibs=$(echo _build/src/${PN}*.cm{x,xa,xs,ti} _build/src/${PN}.a) + fi + ocamlfind install ${PN} _build/pkg/META _build/src/${PN}.mli _build/src/${PN}.cm{a,i} ${nativelibs} || die dodoc CHANGES.md DEVEL.md README.md } diff --git a/dev-ml/topkg/topkg-1.0.5.ebuild b/dev-ml/topkg/topkg-1.0.5.ebuild new file mode 100644 index 000000000000..984936e880e2 --- /dev/null +++ b/dev-ml/topkg/topkg-1.0.5.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit findlib + +DESCRIPTION="The transitory OCaml software packager" +HOMEPAGE="http://erratique.ch/software/topkg https://github.com/dbuenzli/topkg" +SRC_URI="https://github.com/dbuenzli/topkg/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="ISC" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +RDEPEND="dev-ml/result:= + dev-ml/ocamlbuild:= + dev-ml/findlib:= + dev-lang/ocaml:=[ocamlopt?]" +DEPEND="${RDEPEND}" + +src_compile() { + ocaml pkg/pkg.ml build --pkg-name ${PN} || die +} + +src_install() { + # Can't use opam-installer here as it is an opam dep... + findlib_src_preinst + + local nativelibs + if use ocamlopt; then + nativelibs=$(echo _build/src/${PN}*.cm{x,xa,xs,ti} _build/src/${PN}.a) + fi + + ocamlfind install ${PN} _build/pkg/META _build/src/${PN}.mli _build/src/${PN}.cm{a,i} ${nativelibs} || die + dodoc CHANGES.md DEVEL.md README.md +} diff --git a/dev-ml/topkg/topkg-1.0.6.ebuild b/dev-ml/topkg/topkg-1.0.6.ebuild new file mode 100644 index 000000000000..e6250c896d63 --- /dev/null +++ b/dev-ml/topkg/topkg-1.0.6.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit findlib + +DESCRIPTION="The transitory OCaml software packager" +HOMEPAGE="http://erratique.ch/software/topkg https://github.com/dbuenzli/topkg" +SRC_URI="https://github.com/dbuenzli/topkg/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="ISC" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +RDEPEND="dev-ml/result:= + dev-ml/ocamlbuild:= + dev-ml/findlib:= + dev-lang/ocaml:=[ocamlopt?]" +DEPEND="${RDEPEND}" + +src_compile() { + ocaml pkg/pkg.ml build --pkg-name ${PN} || die +} + +src_install() { + # Can't use opam-installer here as it is an opam dep... + findlib_src_preinst + + local nativelibs + if use ocamlopt; then + nativelibs=$(echo _build/src/${PN}*.cm{x,xa,xs,ti} _build/src/${PN}.a) + fi + + ocamlfind install ${PN} _build/pkg/META _build/src/${PN}.mli _build/src/${PN}.cm{a,i} ${nativelibs} || die + dodoc CHANGES.md DEVEL.md README.md +} diff --git a/dev-ml/topkg/topkg-0.9.0.ebuild b/dev-ml/topkg/topkg-1.0.7.ebuild index 2cfed454c256..31d7521572fc 100644 --- a/dev-ml/topkg/topkg-0.9.0.ebuild +++ b/dev-ml/topkg/topkg-1.0.7.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit findlib @@ -11,13 +11,13 @@ SRC_URI="https://github.com/dbuenzli/topkg/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="ISC" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" -IUSE="" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" RDEPEND="dev-ml/result:= dev-ml/ocamlbuild:= dev-ml/findlib:= - dev-lang/ocaml:=" + dev-lang/ocaml:=[ocamlopt?]" DEPEND="${RDEPEND}" src_compile() { @@ -27,7 +27,12 @@ src_compile() { src_install() { # Can't use opam-installer here as it is an opam dep... findlib_src_preinst - local nativelibs="$(echo _build/src/${PN}*.cm{x,xa,xs,ti} _build/src/${PN}.a)" + + local nativelibs + if use ocamlopt; then + nativelibs=$(echo _build/src/${PN}*.cm{x,xa,xs,ti} _build/src/${PN}.a) + fi + ocamlfind install ${PN} _build/pkg/META _build/src/${PN}.mli _build/src/${PN}.cm{a,i} ${nativelibs} || die dodoc CHANGES.md DEVEL.md README.md } diff --git a/dev-ml/trie/Manifest b/dev-ml/trie/Manifest new file mode 100644 index 000000000000..fab19ddf825d --- /dev/null +++ b/dev-ml/trie/Manifest @@ -0,0 +1 @@ +DIST trie-1.0.0.tar.gz 2399 BLAKE2B 3f58dbe33686baca2290a413b7d069b8d97ec69546217cefbb6404877b1fec129824da66fbbd6774e069285960ad9dc12380ecd828135ea50d86caa951e0df8b SHA512 1921a42486a0a221e546507287cbf28ccae5462abe55817269517b7b92e19f35031f2d0fba2b1890b97236d6fff11be9d76ade317ae1dfa1089bd4740a46786f diff --git a/dev-ml/trie/metadata.xml b/dev-ml/trie/metadata.xml new file mode 100644 index 000000000000..d9b92f93ce63 --- /dev/null +++ b/dev-ml/trie/metadata.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> + +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <bugs-to>https://github.com/kandu/trie/issues/</bugs-to> + <remote-id type="github">kandu/trie</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/trie/trie-1.0.0.ebuild b/dev-ml/trie/trie-1.0.0.ebuild new file mode 100644 index 000000000000..d8539a79670d --- /dev/null +++ b/dev-ml/trie/trie-1.0.0.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Strict impure trie tree" +HOMEPAGE="https://github.com/kandu/trie" +SRC_URI="https://github.com/kandu/trie/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="+ocamlopt" diff --git a/dev-ml/type-conv/Manifest b/dev-ml/type-conv/Manifest deleted file mode 100644 index 6beef75fe6ce..000000000000 --- a/dev-ml/type-conv/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST type_conv-113.00.02.tar.gz 64174 BLAKE2B 23189d3b9f676657d59d0801ec0c7bde7b926e2e75c6a2316ae5fc8b5dedb3a2cda944b029e61a10d997b555ed0678dd0cb0593693c395a5bcd4df4de4a15de9 SHA512 6bc6db0e5a36fa4150941155290d137552d9e19aac7cf3aff107f0a7eaa47749c7044c4a4e475827d739784b99ef2103e9c9c03191c6aaa55c51585e71553559 diff --git a/dev-ml/type-conv/metadata.xml b/dev-ml/type-conv/metadata.xml deleted file mode 100644 index ffa6c6b4395b..000000000000 --- a/dev-ml/type-conv/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> -</pkgmetadata> diff --git a/dev-ml/type-conv/type-conv-113.00.02.ebuild b/dev-ml/type-conv/type-conv-113.00.02.ebuild deleted file mode 100644 index 088550945270..000000000000 --- a/dev-ml/type-conv/type-conv-113.00.02.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -OASIS_BUILD_DOCS=1 - -inherit oasis - -MY_P=${PN/-/_}-${PV} -DESCRIPTION="Mini library required for some other preprocessing libraries" -HOMEPAGE="http://janestreet.github.io/" -SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV%.*}/files/${MY_P}.tar.gz" - -LICENSE="LGPL-2.1-with-linking-exception" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" - -RDEPEND=">=dev-lang/ocaml-4.02[ocamlopt?] - dev-ml/camlp4:=" -DEPEND="${RDEPEND} - >=dev-ml/findlib-1.3.2" - -DOCS=( "README.md" "CHANGES.md" ) - -S="${WORKDIR}/${MY_P}" diff --git a/dev-ml/typerep/Manifest b/dev-ml/typerep/Manifest index fdb39cf95717..dee46e1a2121 100644 --- a/dev-ml/typerep/Manifest +++ b/dev-ml/typerep/Manifest @@ -1 +1,3 @@ -DIST typerep-0.9.0.tar.gz 24934 BLAKE2B 83e0cd9419c11a1b8dbce6730404dbe4b00597e441943d8315ad5a583ff50376c95413695e327996b07557b1b481df8ab15db5b37c3ac4c8396b7ed51aa822ea SHA512 f71fa3968ff5e93c384a97e2d39af0de33f4889643a7e43d70a777214dc4c7f35b3fac0864ffee99334cf03866a695f7afd1a907d5c7f3cec0d472b729adf9cc +DIST typerep-0.14.0.tar.gz 22936 BLAKE2B 353a42f0f14bf6cbfc88670ca3d42af5873db1fcf805c30d03e95990ccd6d5fe2f5604931dc213fa921683de639717d288b2eac620cc2a4981cb792a65736e8d SHA512 53b719ee06d06d7833cbe57811fe54d57a36055fa8e4255909273a267000e20628b8b8f6d27c22385753ea461d461f87a1eb1fc9711c52405a89d1493f54f37f +DIST typerep-0.15.0.tar.gz 22737 BLAKE2B f94587cd3b4bb9efb117c1ce228663fe91ad1156cc287654f5a1dc684fea35b7b3d25f69643e7c5418dff70cf56d4afbba75165833a11817d75abfdd398f9277 SHA512 d86821dbf4dd808a6310986cebed50029fa5388e0dba8fdc165e50f5346214a9e110c14070fcbbaf2ba3f4261595f9370b0acd723b6445729f562600500b795b +DIST typerep-0.16.0.tar.gz 23002 BLAKE2B d0ec7176b8354a2734b13317f2084eaac154a46567f2286ed33702908afcbe7ceeacbf15cc6fe6fb03ceae4f975d32ff4eeaafe05477abbf11849a0a70e61dd9 SHA512 1a93552b3ba83d0b1fee155a083cf929949089372dc21419a62a0f3ef0ea0171b6294833e3ff06cc718e2cfd761072f1c835f5026a17bb3fb17a0dfc7a23718e diff --git a/dev-ml/typerep/metadata.xml b/dev-ml/typerep/metadata.xml index 8127fe6a1314..6193eb50e3f5 100644 --- a/dev-ml/typerep/metadata.xml +++ b/dev-ml/typerep/metadata.xml @@ -1,9 +1,9 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> <remote-id type="github">janestreet/typerep</remote-id> diff --git a/dev-ml/typerep/typerep-0.9.0.ebuild b/dev-ml/typerep/typerep-0.14.0.ebuild index 2940a4604344..07af2c0a2dc2 100644 --- a/dev-ml/typerep/typerep-0.9.0.ebuild +++ b/dev-ml/typerep/typerep-0.14.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit opam +inherit dune DESCRIPTION="Library for creating runtime representation of OCaml types" HOMEPAGE="https://github.com/janestreet/typerep" @@ -11,9 +11,8 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g LICENSE="Apache-2.0" SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" DEPEND="dev-ml/base:=" RDEPEND="${DEPEND}" -DEPEND="${DEPEND} dev-ml/jbuilder" diff --git a/dev-ml/typerep/typerep-0.15.0.ebuild b/dev-ml/typerep/typerep-0.15.0.ebuild new file mode 100644 index 000000000000..0a92b498627c --- /dev/null +++ b/dev-ml/typerep/typerep-0.15.0.ebuild @@ -0,0 +1,18 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Library for creating runtime representation of OCaml types" +HOMEPAGE="https://github.com/janestreet/typerep" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +DEPEND="dev-ml/base:${SLOT}" +RDEPEND="${DEPEND}" diff --git a/dev-ml/typerep/typerep-0.16.0.ebuild b/dev-ml/typerep/typerep-0.16.0.ebuild new file mode 100644 index 000000000000..173c15d4dba0 --- /dev/null +++ b/dev-ml/typerep/typerep-0.16.0.ebuild @@ -0,0 +1,18 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Library for creating runtime representation of OCaml types" +HOMEPAGE="https://github.com/janestreet/typerep" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +DEPEND="dev-ml/base:${SLOT}" +RDEPEND="${DEPEND}" diff --git a/dev-ml/typerep_extended/Manifest b/dev-ml/typerep_extended/Manifest deleted file mode 100644 index 6f8382f14c0d..000000000000 --- a/dev-ml/typerep_extended/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST typerep_extended-0.9.0.tar.gz 73042 BLAKE2B 66328ab92c9d686f3b2c49f5bfac0373f5866301c20727db1ca1d469f653419539aad26c74d093ebc6817bc723c98d6185e04548d22b3672ead9c0a82844144c SHA512 e3df7799d4a503f24c5058904422c1567369b47a1511f406630b9143209f273d3ccf1eea22f4f6d5c050f50dbfa40307248f1f7d83663366bacd97c78a8481f0 diff --git a/dev-ml/typerep_extended/metadata.xml b/dev-ml/typerep_extended/metadata.xml deleted file mode 100644 index a8ae6225ab0a..000000000000 --- a/dev-ml/typerep_extended/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">janestreet/typerep_extended</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/typerep_extended/typerep_extended-0.9.0.ebuild b/dev-ml/typerep_extended/typerep_extended-0.9.0.ebuild deleted file mode 100644 index a41c045533c4..000000000000 --- a/dev-ml/typerep_extended/typerep_extended-0.9.0.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit opam - -DESCRIPTION="Runtime types for OCaml (Extended)" -HOMEPAGE="https://github.com/janestreet/typerep_extended" -SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -DEPEND=" - dev-ml/bin-prot:= - dev-ml/core_kernel:= - dev-ml/ppx_bin_prot:= - dev-ml/ppx_driver:= - dev-ml/ppx_sexp_conv:= - dev-ml/ppx_sexp_value:= - dev-ml/ppx_type_conv:= - dev-ml/ppx_typerep_conv:= - dev-ml/sexplib:= - dev-ml/typerep:= - dev-ml/ocaml-migrate-parsetree:= -" -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} dev-ml/jbuilder" diff --git a/dev-ml/tyxml/Manifest b/dev-ml/tyxml/Manifest index cb4234034574..ee2302dbc275 100644 --- a/dev-ml/tyxml/Manifest +++ b/dev-ml/tyxml/Manifest @@ -1 +1,2 @@ -DIST tyxml-4.1.0.tar.gz 179852 BLAKE2B d143c1291cedfb345f0773284891e17bbeb8d46eb5fa5c74df3e9ffd24adca35a8afddd60958ff3c7580bb3984c1ae2a4b077073346326c5d20a975dd42cba66 SHA512 add2b82939ea069ee74ee26ff3ee1f3ad2e361e593134da807e1acfbebff4ed546cbc23aca7ee2936a1eb8a736916d673aa2c96aeae8779706cd726bc2d07ead +DIST tyxml-4.5.0.tbz 102918 BLAKE2B 28c5f827e6969ce9557a86c976e6925716f30759607a11c027c9c6a63c6078437c84ec565d03a91775223fbb9bef97f7acc0c0bb5677205c7e0af7be601b6e26 SHA512 772535441b09c393d53c27152e65f404a0a541aa0cea1bda899a8d751ab64d1729237e583618c3ff33d75e3865d53503d1ea413c6bbc8c68c413347efd1709b3 +DIST tyxml-4.6.0.tbz 107055 BLAKE2B 51785927d3279ffcab940d42ff4de9a7d797ab7abf78bff80914db0355cb9f2f074310371d55abcb601595b461b718af8837c05fe6beca9b4988010526b6b5ff SHA512 69750eeaf467014282087bf9628f3278f3e5f00f4c7400358750d208664cfc3f79a5cba16767d2935e53477d1a6862fe08c5b801b69052ec12e09d1a93a5e9b4 diff --git a/dev-ml/tyxml/files/tyxml-4.5.0-gentoo.patch b/dev-ml/tyxml/files/tyxml-4.5.0-gentoo.patch new file mode 100644 index 000000000000..276b7dbc6f10 --- /dev/null +++ b/dev-ml/tyxml/files/tyxml-4.5.0-gentoo.patch @@ -0,0 +1,11 @@ +--- a/lib/dune 2022-12-20 22:46:07.612173538 +0100 ++++ b/lib/dune 2022-12-20 22:46:17.811016202 +0100 +@@ -5,7 +5,7 @@ + (modules_without_implementation + Xml_sigs Html_sigs Svg_sigs Html_types Svg_types) + (synopsis "Statically correct HTML and SVG documents (Functor version)") +- (libraries uutf re seq) ++ (libraries uutf re) + (flags (:standard + -safe-string)) + ) diff --git a/dev-ml/tyxml/metadata.xml b/dev-ml/tyxml/metadata.xml index d1a8e687d88b..aed95d1077cd 100644 --- a/dev-ml/tyxml/metadata.xml +++ b/dev-ml/tyxml/metadata.xml @@ -1,15 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> + <longdescription> + TyXML provides a set of convenient combinators that uses the OCaml + type system to ensure the validity of the generated documents. TyXML + can be used with any representation of HTML and SVG: the textual one, + provided directly by this package, or DOM trees (js_of_ocaml-tyxml) + virtual DOM (virtual-dom) and reactive or replicated trees (eliom). + You can also create your own representation and use it to instantiate + a new set of combinators. + </longdescription> <upstream> + <bugs-to>https://github.com/ocsigen/tyxml/issues/</bugs-to> <remote-id type="github">ocsigen/tyxml</remote-id> </upstream> - <use> - <flag name="camlp4">Enables the camlp4 syntax extension (deprecated)</flag> - <flag name="ppx">Enables the ppx syntax extension (preferred)</flag> - </use> </pkgmetadata> diff --git a/dev-ml/tyxml/tyxml-4.1.0.ebuild b/dev-ml/tyxml/tyxml-4.1.0.ebuild deleted file mode 100644 index 4ddf289c7b6e..000000000000 --- a/dev-ml/tyxml/tyxml-4.1.0.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -OASIS_BUILD_DOCS=1 -# Cannot find findlib package alcotest -# OASIS_BUILD_TESTS=1 - -inherit oasis - -DESCRIPTION="A libary to build xml trees typechecked by OCaml" -HOMEPAGE="http://ocsigen.org/tyxml/" -SRC_URI="https://github.com/ocsigen/tyxml/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1-with-linking-exception" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="+ppx +camlp4" - -DEPEND=" - >=dev-ml/uutf-1.0:= - dev-ml/uchar:= - dev-ml/ocaml-re:= - ppx? ( >=dev-ml/ppx_tools-5:= dev-ml/markup:= ) - camlp4? ( dev-ml/camlp4:= )" -RDEPEND="${DEPEND}" - -DOCS=( CHANGES README.md ) - -src_configure() { - oasis_configure_opts=" - $(use_enable camlp4 syntax) - $(use_enable ppx) - " oasis_src_configure -} diff --git a/dev-ml/tyxml/tyxml-4.5.0.ebuild b/dev-ml/tyxml/tyxml-4.5.0.ebuild new file mode 100644 index 000000000000..192acf0b7965 --- /dev/null +++ b/dev-ml/tyxml/tyxml-4.5.0.ebuild @@ -0,0 +1,29 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="A library for building correct HTML and SVG documents" +HOMEPAGE="https://github.com/ocsigen/tyxml" +SRC_URI="https://github.com/ocsigen/${PN}/releases/download/${PV}/${P}.tbz" + +LICENSE="LGPL-2.1-with-linking-exception" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-ml/markup:= + dev-ml/ppxlib:= + dev-ml/uutf:= + dev-ml/re:=" +DEPEND="${RDEPEND}" +BDEPEND="test? ( + dev-ml/alcotest + dev-ml/reason +)" + +PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) diff --git a/dev-ml/tyxml/tyxml-4.6.0.ebuild b/dev-ml/tyxml/tyxml-4.6.0.ebuild new file mode 100644 index 000000000000..0064acfb4d31 --- /dev/null +++ b/dev-ml/tyxml/tyxml-4.6.0.ebuild @@ -0,0 +1,34 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="A library for building correct HTML and SVG documents" +HOMEPAGE="https://github.com/ocsigen/tyxml/" +SRC_URI="https://github.com/ocsigen/${PN}/releases/download/${PV}/${P}.tbz" + +LICENSE="LGPL-2.1-with-linking-exception" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-ml/markup:= + dev-ml/ppxlib:= + dev-ml/uutf:= + dev-ml/re:= +" +DEPEND=" + ${RDEPEND} +" +BDEPEND=" + test? ( + dev-ml/alcotest + dev-ml/reason + ) +" + +PATCHES=( "${FILESDIR}"/${PN}-4.5.0-gentoo.patch ) diff --git a/dev-ml/uchar/metadata.xml b/dev-ml/uchar/metadata.xml index 0318635800e1..8537daf2f86b 100644 --- a/dev-ml/uchar/metadata.xml +++ b/dev-ml/uchar/metadata.xml @@ -1,10 +1,7 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">ocaml/uchar</remote-id> </upstream> diff --git a/dev-ml/uchar/uchar-0.0.2.ebuild b/dev-ml/uchar/uchar-0.0.2-r1.ebuild index 41c83cb4f77b..e01cf3ceb62b 100644 --- a/dev-ml/uchar/uchar-0.0.2.ebuild +++ b/dev-ml/uchar/uchar-0.0.2-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit findlib +inherit edo findlib DESCRIPTION="Uchar compatibility library" HOMEPAGE="https://github.com/ocaml/uchar" @@ -11,11 +11,12 @@ SRC_URI="https://github.com/ocaml/uchar/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="LGPL-2-with-linking-exception" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" IUSE="+ocamlopt" -RDEPEND=">=dev-lang/ocaml-4.03:=" -DEPEND="${RDEPEND} dev-ml/ocamlbuild" +RDEPEND=">=dev-lang/ocaml-4.03:=[ocamlopt?]" +DEPEND="${RDEPEND}" +BDEPEND="dev-ml/ocamlbuild" # This is mostly a compat wrapper for older ocaml versions we don't support. No # need to test it, plus it fails when installing for the first time: @@ -23,19 +24,21 @@ DEPEND="${RDEPEND} dev-ml/ocamlbuild" RESTRICT="test" src_compile() { - ocaml pkg/build.ml \ + edo ocaml pkg/build.ml \ "native=$(usex ocamlopt true false)" \ - "native-dynlink=$(usex ocamlopt true false)" || die + "native-dynlink=$(usex ocamlopt true false)" } src_test() { - ocamlbuild -X src -use-ocamlfind -pkg uchar test/testpkg.native || die + edo ocamlbuild -X src -use-ocamlfind -pkg uchar test/testpkg.native } src_install() { # Can't use opam-installer here as it is an opam dep... findlib_src_preinst + mv _build/pkg/META{.empty,} || die ocamlfind install ${PN} _build/pkg/META || die + dodoc README.md CHANGES.md } diff --git a/dev-ml/ulex/Manifest b/dev-ml/ulex/Manifest deleted file mode 100644 index c5b58a4071ec..000000000000 --- a/dev-ml/ulex/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ulex-1.1.tar.gz 20347 BLAKE2B c3c502f0375b964081b908a156c146d171d8c9ed0da491d2a421e9e132538bfb24908bc4d73211ad6a2cb502af5e51141f9ae59505f81fe8bfd4fa257427aeb0 SHA512 7840707705e8403cef6586b072d722043adf9a867a1f4209e1f3ad1a97797c2b292e5151b7714b37fa9aacb190eb0a0a35be1b7675bfaca46f1f68bda58cec70 diff --git a/dev-ml/ulex/metadata.xml b/dev-ml/ulex/metadata.xml deleted file mode 100644 index ffac4d7ebc01..000000000000 --- a/dev-ml/ulex/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> -</maintainer> -</pkgmetadata> diff --git a/dev-ml/ulex/ulex-1.1.ebuild b/dev-ml/ulex/ulex-1.1.ebuild deleted file mode 100644 index 6b98ec8bd787..000000000000 --- a/dev-ml/ulex/ulex-1.1.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils findlib - -DESCRIPTION="A lexer generator for unicode" -HOMEPAGE="http://www.cduce.org" -SRC_URI="http://www.cduce.org/download/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0/${PV}" -KEYWORDS="amd64 ppc x86" -IUSE="+ocamlopt" - -RDEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?] - dev-ml/camlp4:=" -DEPEND="${RDEPEND} - dev-ml/ocamlbuild" - -src_compile() { - emake all - if use ocamlopt; then - emake all.opt - fi -} - -src_install() { - findlib_src_install - dodoc README CHANGES -} diff --git a/dev-ml/unidecode/Manifest b/dev-ml/unidecode/Manifest new file mode 100644 index 000000000000..892a54afe5f9 --- /dev/null +++ b/dev-ml/unidecode/Manifest @@ -0,0 +1 @@ +DIST unidecode-0.4.0.tar.gz 20571 BLAKE2B 864888e1f3db1a784f847f49584fcb6da93ad30066b8ea5764395b25d3d86c47749a98d13771107dbd6c68dacb2ff4e6e2cb9370e8adb35d84e8149b93122ccd SHA512 a411685ddb1d52585251eff3e2cd56fc9b4e91dcfceff424d7cfd5f721be73561d7a8e9223ecaeeda6178b02e5f6df74d50a49d4ce61d72a7d3fa1e8aefe5cf3 diff --git a/dev-ml/unidecode/files/unidecode-0.4.0-test.patch b/dev-ml/unidecode/files/unidecode-0.4.0-test.patch new file mode 100644 index 000000000000..039de4e1b564 --- /dev/null +++ b/dev-ml/unidecode/files/unidecode-0.4.0-test.patch @@ -0,0 +1,8 @@ +--- a/test/test_data.ml 2021-01-10 22:20:26.800309802 +0100 ++++ b/test/test_data.ml 2021-01-10 22:20:36.290138477 +0100 +@@ -46,4 +46,4 @@ + Norvegi, Finland, Estoni, Latvi, Litva, Pol'cho, Belarous', OUkraina, \ + Gurji, Azerbaidjan, Kazakhstan, KHitad, Mongol, KHoito Solongos geһen \ + arban durben gurenuudte khile zourydag, mun ouһaar ANOU-ai Alyaska \ +- mojotoi bolon YApon oulastai khile negetei. " ++ mojotoi bolon YApon oulastai khile negetei." diff --git a/dev-ml/unidecode/metadata.xml b/dev-ml/unidecode/metadata.xml new file mode 100644 index 000000000000..853d794cb827 --- /dev/null +++ b/dev-ml/unidecode/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">geneweb/unidecode</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/unidecode/unidecode-0.4.0.ebuild b/dev-ml/unidecode/unidecode-0.4.0.ebuild new file mode 100644 index 000000000000..3c454ae57fd8 --- /dev/null +++ b/dev-ml/unidecode/unidecode-0.4.0.ebuild @@ -0,0 +1,28 @@ +# Copyright 2019-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="Convert unicode strings into its ASCII representation" +HOMEPAGE="https://github.com/geneweb/unidecode" +SRC_URI="https://github.com/geneweb/${PN}/archive/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0/${PV}" +KEYWORDS="amd64 x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND="" +DEPEND="test? ( dev-ml/ounit2 )" +BDEPEND="" + +PATCHES=( "${FILESDIR}"/${P}-test.patch ) + +src_install() { + dune_src_install + mv "${D}"/usr/bin/unidecode{,-gw} || die +} diff --git a/dev-ml/utop/Manifest b/dev-ml/utop/Manifest index 102342dea1a5..87f363967d57 100644 --- a/dev-ml/utop/Manifest +++ b/dev-ml/utop/Manifest @@ -1 +1 @@ -DIST utop-2.0.1.tar.gz 57523 BLAKE2B 67dad49fa00899a5b0eb1af0a1129a0bc8d8b872112f65b97ccfbd9915194f7b56fdd9d1cb2bfba7e5bf0d01ce73b6370c7ba1ed0f56dc6595f51e3eec904962 SHA512 66e7858a44ddd038f08073f9530c790f3ad44134899793c9f5e689d0e1786d2e2751bf38c6be33979292942b00dd6ff2db421025e12f49e05c4a694df36d23e3 +DIST utop-2.12.1.tar.gz 416596 BLAKE2B a8a31c91fd4f989e3d89bc736caa7b611ba0ccc2de905adcd1cf59fff87770d5a00c2d7a43462940269ae8be2f5980fa5b8d2ec7ba547b937cc1e6a579621f2f SHA512 cc52bdb2a58141e6f7b678c93f69b0aa5ca4c628cb6841e02e6a783191a917bd838c06682d55f4f455a01a7004e43b5193d8574968b8400050b0f7b5a102ca3a diff --git a/dev-ml/utop/files/50utop-gentoo.el b/dev-ml/utop/files/50utop-gentoo.el new file mode 100644 index 000000000000..958c8398e602 --- /dev/null +++ b/dev-ml/utop/files/50utop-gentoo.el @@ -0,0 +1,3 @@ +(add-to-list 'load-path "@SITELISP@") +(autoload 'utop "utop" + "A universal toplevel for OCaml." t) diff --git a/dev-ml/utop/metadata.xml b/dev-ml/utop/metadata.xml index 7c8000acfe72..1d7ccbcc20cc 100644 --- a/dev-ml/utop/metadata.xml +++ b/dev-ml/utop/metadata.xml @@ -1,11 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> + <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> + <longdescription> + utop is an improved toplevel (i.e., Read-Eval-Print Loop or REPL) for + OCaml. It can run in a terminal or in Emacs. It supports line edition, + history, real-time and context sensitive completion, colors, and more. + It integrates with the Tuareg mode in Emacs. + </longdescription> <upstream> - <remote-id type="github">diml/utop</remote-id> + <bugs-to>https://github.com/ocaml-community/utop/issues/</bugs-to> + <remote-id type="github">ocaml-community/utop</remote-id> </upstream> </pkgmetadata> diff --git a/dev-ml/utop/utop-2.0.1.ebuild b/dev-ml/utop/utop-2.0.1.ebuild deleted file mode 100644 index f2f8f4b5d056..000000000000 --- a/dev-ml/utop/utop-2.0.1.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib opam - -DESCRIPTION="A new toplevel for OCaml with completion and colorization" -HOMEPAGE="https://github.com/diml/utop" -SRC_URI="https://github.com/diml/utop/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -DEPEND=" - >=dev-ml/lwt-2.4.0:= - dev-ml/lwt_react:= - >=dev-ml/lambda-term-1.2:= - >=dev-ml/zed-1.2:= - >=dev-ml/cppo-1.0.1:= - >=dev-ml/findlib-1.7.2:= -" -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} - dev-ml/jbuilder" diff --git a/dev-ml/utop/utop-2.12.1.ebuild b/dev-ml/utop/utop-2.12.1.ebuild new file mode 100644 index 000000000000..0acedbdf1fad --- /dev/null +++ b/dev-ml/utop/utop-2.12.1.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune elisp-common + +DESCRIPTION="Universal toplevel for OCaml" +HOMEPAGE="https://github.com/ocaml-community/utop" +SRC_URI="https://github.com/ocaml-community/utop/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="emacs +ocamlopt" + +ELISP_DEPEND=" + emacs? ( + >=app-editors/emacs-24:* + >=app-emacs/tuareg-mode-2.2.0 + ) +" +DEPEND=" + dev-ml/lambda-term:= + dev-ml/logs:= + dev-ml/lwt:= + dev-ml/react:= + dev-ml/zed:= +" +RDEPEND=" + ${DEPEND} + ${ELISP_DEPEND} +" +BDEPEND=" + dev-ml/cppo + dev-ml/findlib + ${ELISP_DEPEND} +" + +SITEFILE="50${PN}-gentoo.el" + +src_compile() { + dune_src_compile + + use emacs && + BYTECOMPFLAGS="-L src/top" elisp-compile src/top/*.el +} + +src_install() { + dune_src_install + + if use emacs ; then + elisp-install ${PN} src/top/*.el{,c} + elisp-site-file-install "${FILESDIR}/${SITEFILE}" + fi +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/dev-ml/uucp/Manifest b/dev-ml/uucp/Manifest new file mode 100644 index 000000000000..e4ffebe703d8 --- /dev/null +++ b/dev-ml/uucp/Manifest @@ -0,0 +1,2 @@ +DIST uucp-15.0.0.tbz 481932 BLAKE2B f8f23b8233e65b77dbea5defb968d253a022556b11f0276094fcdebe010fe5de99c36f581fee6aa3e54afadff62345fa5a3d6951ba0baba394f4ddae4175ba1c SHA512 ee4acff5666961766321e85e287fb9d5b8d50533319f22bf6f4eceb943242df2d0e0f4e775c4a140f68ca142837938eaa5926e22362215a3365ffe7f8768923b +DIST uucp-15.1.0.tbz 499248 BLAKE2B 33dc1de451565b216445ead78c66c60e93a8853f27b3ab26a9fe9a71ee0b0f2b12c0ef964e0386eef1a2fb61ee6c03ce90feb970373990bc58ec1a111a734cd1 SHA512 998f94fadb72357b15a3042a3d11c31b3e16f281822673f2defdd515cd1394d55de1817628be8bd5c030175f9e62c53630d4139a1c0253800f9fb898b0f11364 diff --git a/dev-ml/uucp/metadata.xml b/dev-ml/uucp/metadata.xml new file mode 100644 index 000000000000..6324572bea0e --- /dev/null +++ b/dev-ml/uucp/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">dbuenzli/uucp</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/uucp/uucp-15.0.0.ebuild b/dev-ml/uucp/uucp-15.0.0.ebuild new file mode 100644 index 000000000000..9fb60f6e3ad5 --- /dev/null +++ b/dev-ml/uucp/uucp-15.0.0.ebuild @@ -0,0 +1,28 @@ +# Copyright 2019-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit opam + +DESCRIPTION="Unicode character properties for OCaml" +HOMEPAGE="https://erratique.ch/software/uucp https://github.com/dbuenzli/uucp" +SRC_URI="https://erratique.ch/software/uucp/releases/${P}.tbz" + +LICENSE="ISC" +SLOT="0/${PV}" +KEYWORDS="amd64 x86" + +DEPEND="dev-ml/topkg + dev-ml/findlib" +RDEPEND="${DEPEND}" +BDEPEND="dev-ml/ocamlbuild" +OPAM_FILE=opam + +src_compile() { + ocaml pkg/pkg.ml build \ + --with-uutf true \ + --with-uunf false \ + --with-cmdliner true \ + || die +} diff --git a/dev-ml/uucp/uucp-15.1.0.ebuild b/dev-ml/uucp/uucp-15.1.0.ebuild new file mode 100644 index 000000000000..784aed4a2ffc --- /dev/null +++ b/dev-ml/uucp/uucp-15.1.0.ebuild @@ -0,0 +1,34 @@ +# Copyright 2019-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit opam + +DESCRIPTION="Unicode character properties for OCaml" +HOMEPAGE="https://erratique.ch/software/uucp https://github.com/dbuenzli/uucp" +SRC_URI="https://erratique.ch/software/uucp/releases/${P}.tbz" + +LICENSE="ISC" +SLOT="0/${PV}" +KEYWORDS="amd64 x86" + +DEPEND=" + dev-ml/topkg + dev-ml/findlib +" +RDEPEND=" + ${DEPEND} +" +BDEPEND=" + dev-ml/ocamlbuild +" + +OPAM_FILE="opam" + +src_compile() { + ocaml pkg/pkg.ml build \ + --with-uunf false \ + --with-cmdliner true \ + || die "failed to run the pkg/pkg.ml ocaml compilation script" +} diff --git a/dev-ml/uuidm/Manifest b/dev-ml/uuidm/Manifest index 189d08263bc9..c59ce5b27bed 100644 --- a/dev-ml/uuidm/Manifest +++ b/dev-ml/uuidm/Manifest @@ -1 +1,2 @@ -DIST uuidm-0.9.6.tbz 9707 BLAKE2B b17a464dc7b72a75ac02be0a02b6048afc54161a4f676c9c5ad52d765eb8737d233d055fa1dbe1e1f94675ef3f8e5802cb890d5aba4ad49ec15cfa5f34b8ba80 SHA512 13b900e98c27f201636b6f074416dc85ed6725b5bcdf911532c4ff31ca980c0a8e31583db9e336d2533559e4f9c3c1badf2a4548dffd21c009671a8dfc80a7f7 +DIST uuidm-0.9.7.tar.gz 9258 BLAKE2B 37867ee562fcf5c44e0f40df53707a5066d74c185037049b4b4034326e1efa93543d518f6c9d5d27e9663f18d824f951d27952c844e1169d951abb7b91caeebb SHA512 7048e467bbd9eefd19ca057caadcc8f634d4eae7642665a84df88f726df3fb849085613d75a485272b0d0e19c9041c560a8c864e780dbed29ff68e3cfa8ba3d4 +DIST uuidm-0.9.8.tar.gz 10079 BLAKE2B d441380dc3a4e326f777b2f9ed313cf3c27213ca5e1a02197fff40e3422df12a3451badf732b3dfae00eb8feb9fc72c137c9d5b0c20f7df4c17494d903e1b65c SHA512 af3ca7faa7eba04c4078ddc43eee6cd8a1e210127e18d1d97fbdd00b98729caab0b52a6a05c090061e05656ef321c5e07bab13113e656c5c8b5285f193f070a8 diff --git a/dev-ml/uuidm/metadata.xml b/dev-ml/uuidm/metadata.xml index ffac4d7ebc01..b17050c8b495 100644 --- a/dev-ml/uuidm/metadata.xml +++ b/dev-ml/uuidm/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> -</maintainer> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">dbuenzli/uuidm</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-ml/uuidm/uuidm-0.9.6.ebuild b/dev-ml/uuidm/uuidm-0.9.6.ebuild deleted file mode 100644 index f3c7004e85f0..000000000000 --- a/dev-ml/uuidm/uuidm-0.9.6.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib opam - -DESCRIPTION="OCaml module implementing 128 bits universally unique identifiers" -HOMEPAGE="http://erratique.ch/software/uuidm" -SRC_URI="http://erratique.ch/software/uuidm/releases/${P}.tbz" - -LICENSE="ISC" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND="dev-ml/cmdliner:=" -DEPEND="${RDEPEND}" - -src_compile() { - ocaml pkg/pkg.ml build || die -} diff --git a/dev-ml/uuidm/uuidm-0.9.7.ebuild b/dev-ml/uuidm/uuidm-0.9.7.ebuild new file mode 100644 index 000000000000..0b5f822012b1 --- /dev/null +++ b/dev-ml/uuidm/uuidm-0.9.7.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit opam + +DESCRIPTION="Universally unique identifiers (UUIDs) for OCaml" +HOMEPAGE="https://github.com/dbuenzli/uuidm" +SRC_URI="https://github.com/dbuenzli/uuidm/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="ISC" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +BDEPEND=" + dev-ml/findlib[ocamlopt=] + dev-ml/ocamlbuild[ocamlopt=] + dev-ml/topkg +" + +src_compile() { + ocaml pkg/pkg.ml build || die +} diff --git a/dev-ml/uuidm/uuidm-0.9.8.ebuild b/dev-ml/uuidm/uuidm-0.9.8.ebuild new file mode 100644 index 000000000000..e4f14dcb3397 --- /dev/null +++ b/dev-ml/uuidm/uuidm-0.9.8.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit opam + +DESCRIPTION="Universally unique identifiers (UUIDs) for OCaml" +HOMEPAGE="https://github.com/dbuenzli/uuidm/" +SRC_URI="https://github.com/dbuenzli/uuidm/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="ISC" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +BDEPEND=" + dev-ml/findlib[ocamlopt=] + dev-ml/ocamlbuild[ocamlopt=] + dev-ml/topkg +" + +src_compile() { + ocaml pkg/pkg.ml build || die +} diff --git a/dev-ml/uunf/Manifest b/dev-ml/uunf/Manifest new file mode 100644 index 000000000000..ccf497d91079 --- /dev/null +++ b/dev-ml/uunf/Manifest @@ -0,0 +1,2 @@ +DIST uunf-15.0.0.tbz 42418 BLAKE2B add1dda2f6af07ccaec26d9715eddf31dc398f0cdae85eec0297bcbcd9f5e23f59846813d96e554d88b18096c9419490265c061bf5835a4b67daacf3938c2876 SHA512 204d923d4e8d910318180c15087fe53d98d8ec0a8d3c3f6c54219e5e09ee5c5bdf57585e5570d895f8d90647c4eeaa45d9e6e75d58edeb9febee053e0dd47fbc +DIST uunf-15.1.0.tbz 43837 BLAKE2B 1af584fd25f1a1c0f15ba999ab11f155c607fdb54b208094d5586a274b54a823dab94a655ae0d80f6f75b90e1ef42d36295dc03dfb82d4c91fd9b6230689cb11 SHA512 1df1edbcb37da80e6d96eedd5e01c43c81275eca727a53d91a777d01f30cf0b964968c7be1d943e574e40ad4acb75c86e42976b3048dacb2c798b38475d0a6d0 diff --git a/dev-ml/uunf/metadata.xml b/dev-ml/uunf/metadata.xml new file mode 100644 index 000000000000..4cd14005b4ca --- /dev/null +++ b/dev-ml/uunf/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">dbuenzli/uunf</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/uunf/uunf-15.0.0.ebuild b/dev-ml/uunf/uunf-15.0.0.ebuild new file mode 100644 index 000000000000..c779a04c4090 --- /dev/null +++ b/dev-ml/uunf/uunf-15.0.0.ebuild @@ -0,0 +1,31 @@ +# Copyright 2019-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit opam + +DESCRIPTION="Unicode text normalization" +HOMEPAGE="https://erratique.ch/software/uunf https://github.com/dbuenzli/uunf" +SRC_URI="https://erratique.ch/software/uunf/releases/${P}.tbz" + +LICENSE="ISC" +SLOT="0/${PV}" +KEYWORDS="amd64 x86" +IUSE="" + +DEPEND="dev-ml/topkg:= + dev-ml/uutf:= + dev-ml/cmdliner:=" +RDEPEND="${DEPEND}" +BDEPEND="dev-ml/findlib" +OPAM_FILE=opam + +src_compile() { + # Increase stack limit to 11GiB to avoid stack overflow error. + # bug #798270 + ulimit -s 11530000 + + ocaml pkg/pkg.ml build \ + || die +} diff --git a/dev-ml/uunf/uunf-15.1.0.ebuild b/dev-ml/uunf/uunf-15.1.0.ebuild new file mode 100644 index 000000000000..60ec54b1ba24 --- /dev/null +++ b/dev-ml/uunf/uunf-15.1.0.ebuild @@ -0,0 +1,38 @@ +# Copyright 2019-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit opam + +DESCRIPTION="Unicode text normalization" +HOMEPAGE="https://erratique.ch/software/uunf https://github.com/dbuenzli/uunf" +SRC_URI="https://erratique.ch/software/uunf/releases/${P}.tbz" + +LICENSE="ISC" +SLOT="0/${PV}" +KEYWORDS="amd64 x86" +IUSE="" + +DEPEND=" + dev-ml/topkg:= + dev-ml/uutf:= + dev-ml/cmdliner:= +" +RDEPEND=" + ${DEPEND} +" +BDEPEND=" + dev-ml/findlib +" + +OPAM_FILE="opam" + +src_compile() { + # Increase stack limit to 11GiB to avoid stack overflow error. + # bug #798270 + ulimit -s 11530000 + + ocaml pkg/pkg.ml build \ + || die "failed to run the pkg/pkg.ml ocaml compilation script" +} diff --git a/dev-ml/uuseg/Manifest b/dev-ml/uuseg/Manifest new file mode 100644 index 000000000000..93afecf9c511 --- /dev/null +++ b/dev-ml/uuseg/Manifest @@ -0,0 +1 @@ +DIST uuseg-15.0.0.tar.gz 25540 BLAKE2B 4ee1512bde79aab4777395d3ccfb8fe76c97ba7e93b722acd7c36acac432a44a9eade512ea45a0204a1d947a60e3d61773de05890d64d7afac4b1965d1493bb3 SHA512 c117868d52ca8f5de3104b0ea25ea011c19cefd53018c4d9bdf900185d04f74c097b7f129b75366a8da905a79dac3cbf8e6c66ff6c20fee1c2e42b9cdd6a9fa6 diff --git a/dev-ml/uuseg/metadata.xml b/dev-ml/uuseg/metadata.xml new file mode 100644 index 000000000000..83ae1c163f95 --- /dev/null +++ b/dev-ml/uuseg/metadata.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> + +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <longdescription> + Uuseg is an OCaml library for segmenting Unicode text. It implements the + locale independent Unicode text segmentation algorithms to detect grapheme + cluster, word and sentence boundaries and the Unicode line breaking + algorithm to detect line break opportunities. The library is independent + from any IO mechanism or Unicode text data structure and it can process + text without a complete in-memory representation. Uuseg depends on Uucp and + optionally on Uutf for support on OCaml UTF-X encoded strings. It is + distributed under the ISC license. + </longdescription> + <upstream> + <bugs-to>https://github.com/dbuenzli/uuseg/issues/</bugs-to> + <remote-id type="github">dbuenzli/uuseg</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/uuseg/uuseg-15.0.0.ebuild b/dev-ml/uuseg/uuseg-15.0.0.ebuild new file mode 100644 index 000000000000..d3dd9d062ae2 --- /dev/null +++ b/dev-ml/uuseg/uuseg-15.0.0.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit opam + +DESCRIPTION="Unicode text segmentation for OCaml" +HOMEPAGE="https://erratique.ch/software/uuseg/ + https://github.com/dbuenzli/uuseg/" +SRC_URI="https://github.com/dbuenzli/uuseg/archive/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="ISC" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-ml/cmdliner:= + dev-ml/uucp:= + dev-ml/uutf:= +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-ml/ocamlbuild + dev-ml/findlib + dev-ml/topkg +" + +src_compile() { + ocaml pkg/pkg.ml build --tests $(usex test true false) || die +} + +src_test() { + ocaml pkg/pkg.ml test || die +} diff --git a/dev-ml/uutf/Manifest b/dev-ml/uutf/Manifest index 29cbb152037b..bb673d510ccb 100644 --- a/dev-ml/uutf/Manifest +++ b/dev-ml/uutf/Manifest @@ -1 +1,3 @@ DIST uutf-1.0.1.tbz 22215 BLAKE2B 58cbb8db94024ddaa02c213df4e5321ad33513370c6d1d54ac09f57821df8ac3b330c2659f9aeb0e78dfd15d2f50be714a5a5d6e6d3dcc3f81539c1a6c8c3771 SHA512 35cbee8c82a566f2fe4fcd549936d4c4dc67f5b71bfd3ea97ff25d7cf21cfb77cb5ee313c95ad26a2a61bb84aa48c300bbb79a1a7128c6161e9abe9c390a7d18 +DIST uutf-1.0.2.tbz 22420 BLAKE2B 8391f6c3cde40db3fa86b9243d8ea8fb52409aa958d1020f302d602bf7c06c44b7d93f7a6a64a1b0964c7bb5856e15178957bba48102dbd36d8efe9581db3787 SHA512 5f2dbe78eaf73a292438d84c7185c839a7ac13cee9616a7b5006990314c6a0d42b212854cc2e89d815d3c45804f94bb40af75ecb60da7092887d8dc21e968bdd +DIST uutf-1.0.3.tbz 23363 BLAKE2B fe35596a3c3590df38f34219ac577d34c0899c006087cb015e971002fff0d193d7fdc281d0bc3abe2fd440e7da11cc27d10b0356f9eb73e1a2c647fd0b672bf6 SHA512 50cc4486021da46fb08156e9daec0d57b4ca469b07309c508d5a9a41e9dbcf1f32dec2ed7be027326544453dcaf9c2534919395fd826dc7768efc6cc4bfcc9f8 diff --git a/dev-ml/uutf/metadata.xml b/dev-ml/uutf/metadata.xml index 0d64748ace0c..1ca2f2a4810f 100644 --- a/dev-ml/uutf/metadata.xml +++ b/dev-ml/uutf/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> -<email>ml@gentoo.org</email> -<name>Gentoo ML Project</name> -</maintainer> -<use> -<flag name="utftrip">Builds and install the utftrip executable: Among other things, reads unicode on stdin and rewrites it on stdout.</flag> -</use> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <use> + <flag name="utftrip">Builds and install the utftrip executable: Among other things, reads unicode on stdin and rewrites it on stdout.</flag> + </use> </pkgmetadata> diff --git a/dev-ml/uutf/uutf-1.0.1.ebuild b/dev-ml/uutf/uutf-1.0.1.ebuild index 3e6636aa1def..4897c4d92bc2 100644 --- a/dev-ml/uutf/uutf-1.0.1.ebuild +++ b/dev-ml/uutf/uutf-1.0.1.ebuild @@ -1,18 +1,20 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=7 inherit findlib DESCRIPTION="Non-blocking streaming Unicode codec for OCaml" -HOMEPAGE="http://erratique.ch/software/uutf" -SRC_URI="http://erratique.ch/software/uutf/releases/${P}.tbz" +HOMEPAGE="https://erratique.ch/software/uutf" +SRC_URI="https://erratique.ch/software/uutf/releases/${P}.tbz" LICENSE="ISC" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" IUSE="doc utftrip +ocamlopt test" +RESTRICT="!test? ( test )" +REQUIRED_USE="utftrip? ( ocamlopt )" RDEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/uchar:= @@ -33,7 +35,7 @@ src_test() { ocamlbuild -use-ocamlfind tests.otarget || die pushd _build/test || die ./test.native || die - #Rebuild to avoid mismatches between installed files, bug #604674 + # Rebuild to avoid mismatches between installed files, bug #604674 popd || die ocaml pkg/pkg.ml build \ --with-cmdliner "$(usex utftrip true false)" \ @@ -47,9 +49,15 @@ src_install() { # Can't use opam-installer here as it is an opam dep... findlib_src_preinst local nativelibs="" + use ocamlopt && nativelibs="$(echo _build/src/uutf.cm{x,xa,xs} _build/src/uutf.a)" ocamlfind install uutf _build/pkg/META _build/src/uutf.mli _build/src/uutf.cm{a,i} ${nativelibs} || die - use utftrip && newbin utftrip.$(usex ocamlopt native byte) utftrip + + use utftrip && newbin _build/test/utftrip.$(usex ocamlopt native byte) utftrip dodoc CHANGES.md README.md - use doc && dohtml -r doc/* + + if use doc ; then + docinto html + dodoc -r doc/* + fi } diff --git a/dev-ml/uutf/uutf-1.0.2.ebuild b/dev-ml/uutf/uutf-1.0.2.ebuild new file mode 100644 index 000000000000..4897c4d92bc2 --- /dev/null +++ b/dev-ml/uutf/uutf-1.0.2.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit findlib + +DESCRIPTION="Non-blocking streaming Unicode codec for OCaml" +HOMEPAGE="https://erratique.ch/software/uutf" +SRC_URI="https://erratique.ch/software/uutf/releases/${P}.tbz" + +LICENSE="ISC" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" +IUSE="doc utftrip +ocamlopt test" +RESTRICT="!test? ( test )" +REQUIRED_USE="utftrip? ( ocamlopt )" + +RDEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?] + dev-ml/uchar:= + utftrip? ( dev-ml/cmdliner:= )" +DEPEND="${RDEPEND} + dev-ml/ocamlbuild + dev-ml/topkg + test? ( dev-ml/cmdliner )" + +src_compile() { + ocaml pkg/pkg.ml build \ + --with-cmdliner "$(usex utftrip true false)" \ + || die +} + +src_test() { + if use ocamlopt ; then + ocamlbuild -use-ocamlfind tests.otarget || die + pushd _build/test || die + ./test.native || die + # Rebuild to avoid mismatches between installed files, bug #604674 + popd || die + ocaml pkg/pkg.ml build \ + --with-cmdliner "$(usex utftrip true false)" \ + || die + else + ewarn "Sorry, ${PN} tests require native support (ocamlopt)" + fi +} + +src_install() { + # Can't use opam-installer here as it is an opam dep... + findlib_src_preinst + local nativelibs="" + + use ocamlopt && nativelibs="$(echo _build/src/uutf.cm{x,xa,xs} _build/src/uutf.a)" + ocamlfind install uutf _build/pkg/META _build/src/uutf.mli _build/src/uutf.cm{a,i} ${nativelibs} || die + + use utftrip && newbin _build/test/utftrip.$(usex ocamlopt native byte) utftrip + dodoc CHANGES.md README.md + + if use doc ; then + docinto html + dodoc -r doc/* + fi +} diff --git a/dev-ml/uutf/uutf-1.0.3.ebuild b/dev-ml/uutf/uutf-1.0.3.ebuild new file mode 100644 index 000000000000..22f71d02434f --- /dev/null +++ b/dev-ml/uutf/uutf-1.0.3.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit findlib + +DESCRIPTION="Non-blocking streaming Unicode codec for OCaml" +HOMEPAGE="https://erratique.ch/software/uutf" +SRC_URI="https://erratique.ch/software/uutf/releases/${P}.tbz" + +LICENSE="ISC" +SLOT="0/${PV}" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="doc utftrip +ocamlopt test" +RESTRICT="!test? ( test )" +REQUIRED_USE="utftrip? ( ocamlopt )" + +RDEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?] + dev-ml/uchar:= + utftrip? ( dev-ml/cmdliner:=[ocamlopt?] )" +DEPEND="${RDEPEND}" +BDEPEND="dev-ml/ocamlbuild + dev-ml/topkg + test? ( dev-ml/cmdliner[ocamlopt?] )" + +DOCS=( CHANGES.md README.md ) + +src_compile() { + ocaml pkg/pkg.ml build \ + --with-cmdliner "$(usex utftrip true false)" \ + --tests "$(usex test true false)" \ + || die +} + +src_test() { + if use ocamlopt ; then + pushd _build/test || die + ./test.native || die + # Rebuild to avoid mismatches between installed files, bug #604674 + popd || die + ocaml pkg/pkg.ml build \ + --with-cmdliner "$(usex utftrip true false)" \ + || die + else + ewarn "Sorry, ${PN} tests require native support (ocamlopt)" + fi +} + +src_install() { + # Can't use opam-installer here as it is an opam dep... + findlib_src_preinst + local nativelibs="" + + use ocamlopt && + nativelibs="$(echo _build/src/uutf.cm{x,xa,xs} _build/src/uutf.a)" + ocamlfind install uutf _build/pkg/META _build/src/uutf.mli _build/src/uutf.cm{a,i} ${nativelibs} || die + use utftrip && + newbin _build/test/utftrip.$(usex ocamlopt native byte) utftrip + + einstalldocs + if use doc ; then + docinto html + dodoc -r doc/* + fi +} diff --git a/dev-ml/variantslib/Manifest b/dev-ml/variantslib/Manifest index af9ea63e9790..8de5f8f878e3 100644 --- a/dev-ml/variantslib/Manifest +++ b/dev-ml/variantslib/Manifest @@ -1 +1,3 @@ -DIST variantslib-0.9.0.tar.gz 5590 BLAKE2B 8b6b4c1e1d21e7f6c9bdc1813ea811dc4680506a2a8b2f8c869d8ba2583f07e99d717c0f6a984f6ca3c2e809c9eb2e7c497dcde1f0085e054de383b032f3e94e SHA512 2fd28063d307396da866be70480ba7f953d90ec32a55d31dad649eadb6141572e428f055cad02787654477c4a308313ecb7be4b9b80828af9d9870ad325b9f4d +DIST variantslib-0.14.0.tar.gz 2951 BLAKE2B a3197f7e06d4340ae73d76d477fd1e0ce038b4829aa3a9d0e0ea3e5251f9ca7c43798005138993a16c860ebf4d08a7e54621359c2a030f3866b62a02de4c326f SHA512 0cb18475668eb8e6091f8a779587f0d643dd0325b0f8518e53469dd12769a3ed6fa4f9c2651a21f8b07992d7b29f6664c4d3bf49f46ed6d7002de07b5014e4f3 +DIST variantslib-0.15.0.tar.gz 2948 BLAKE2B a85fea8d994a8488b1aa6a64826bacc4b2d38987664f33d78e27e46a308376092d9af2b931782dba222d12a8f17edd99287faa903a1e0865acf5093613c175bf SHA512 cf52e19fb16f2021e06ce92799275717401f4959f89f0219c62df1386c036cbaaa1213eed1b80f9e4147681e613bffc5ca8d50987ca45aac791fe3c723e3d692 +DIST variantslib-0.16.0.tar.gz 2982 BLAKE2B 201c96a87391930292df170e7fc6d6e113e8cb652e20acc341dad4a3608849ec60827497905efdbfa8cd86d783681236ddbc3ef73e67d019a244c13802073af4 SHA512 c20cedbf6599b66028d77a5ce0d54a8fa1d2b8302344a434f9714ebd4714b159df143966bc480852e8ac54b44bd59f66646ba614419ea7cffa6710228e7a6fd6 diff --git a/dev-ml/variantslib/metadata.xml b/dev-ml/variantslib/metadata.xml index 8077a6de981c..af43d68269ad 100644 --- a/dev-ml/variantslib/metadata.xml +++ b/dev-ml/variantslib/metadata.xml @@ -1,12 +1,12 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="bitbucket">yminsky/ocaml-core</remote-id> - <remote-id type="github">janestreet/variantslib</remote-id> - </upstream> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="bitbucket">yminsky/ocaml-core</remote-id> + <remote-id type="github">janestreet/variantslib</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-ml/variantslib/variantslib-0.9.0.ebuild b/dev-ml/variantslib/variantslib-0.14.0.ebuild index a50b4f2ef0e0..1fe3f3460994 100644 --- a/dev-ml/variantslib/variantslib-0.9.0.ebuild +++ b/dev-ml/variantslib/variantslib-0.14.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit opam +inherit dune DESCRIPTION="OCaml variants as first class values" HOMEPAGE="https://github.com/janestreet/variantslib" @@ -11,12 +11,10 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g LICENSE="Apache-2.0" SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" RDEPEND=" dev-ml/base:= - dev-ml/ppx_driver:= - dev-ml/ocaml-migrate-parsetree:= " -DEPEND="${RDEPEND} dev-ml/jbuilder" +DEPEND="${RDEPEND}" diff --git a/dev-ml/variantslib/variantslib-0.15.0.ebuild b/dev-ml/variantslib/variantslib-0.15.0.ebuild new file mode 100644 index 000000000000..6d66492a5164 --- /dev/null +++ b/dev-ml/variantslib/variantslib-0.15.0.ebuild @@ -0,0 +1,18 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="OCaml variants as first class values" +HOMEPAGE="https://github.com/janestreet/variantslib" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" +IUSE="+ocamlopt" + +RDEPEND="dev-ml/base:${SLOT}" +DEPEND="${RDEPEND}" diff --git a/dev-ml/variantslib/variantslib-0.16.0.ebuild b/dev-ml/variantslib/variantslib-0.16.0.ebuild new file mode 100644 index 000000000000..febadbdff6ae --- /dev/null +++ b/dev-ml/variantslib/variantslib-0.16.0.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="OCaml variants as first class values" +HOMEPAGE="https://github.com/janestreet/variantslib" +SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+ocamlopt" + +RDEPEND=" + >=dev-lang/ocaml-4.14 + dev-ml/base:${SLOT} +" +DEPEND="${RDEPEND}" diff --git a/dev-ml/xml-light/files/01_installopt.dpatch b/dev-ml/xml-light/files/01_installopt.patch index 1dfb50c9e271..d3a3d8457431 100644 --- a/dev-ml/xml-light/files/01_installopt.dpatch +++ b/dev-ml/xml-light/files/01_installopt.patch @@ -1,13 +1,5 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01_installopt.dpatch by Sylvain Le Gall <gildor@debian.org> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad xml-light-2.2~/Makefile xml-light-2.2/Makefile ---- xml-light-2.2~/Makefile 2005-10-11 23:26:41.000000000 +0200 -+++ xml-light-2.2/Makefile 2005-10-11 23:28:00.000000000 +0200 +--- a/Makefile ++++ b/Makefile @@ -11,8 +11,11 @@ opt: xml-light.cmxa test_opt.exe
diff --git a/dev-ml/xml-light/files/02_cmi_depends.dpatch b/dev-ml/xml-light/files/02_cmi_depends.dpatch deleted file mode 100644 index 1fcf17048407..000000000000 --- a/dev-ml/xml-light/files/02_cmi_depends.dpatch +++ /dev/null @@ -1,18 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 02_cmi_depends.dpatch by Sylvain Le Gall <gildor@debian.org> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad xml-light-2.2~/Makefile xml-light-2.2/Makefile ---- xml-light-2.2~/Makefile 2006-01-03 17:34:23.000000000 +0100 -+++ xml-light-2.2/Makefile 2006-01-03 17:35:04.000000000 +0100 -@@ -82,6 +82,6 @@ - .mll.ml:
- ocamllex $<
-
--.mly.ml:
-+%.mli %.ml: %.mly
- ocamlyacc $<
-
diff --git a/dev-ml/xml-light/files/02_cmi_depends.patch b/dev-ml/xml-light/files/02_cmi_depends.patch new file mode 100644 index 000000000000..c1f4ce31d159 --- /dev/null +++ b/dev-ml/xml-light/files/02_cmi_depends.patch @@ -0,0 +1,10 @@ +--- a/Makefile ++++ b/Makefile +@@ -82,6 +82,6 @@ + .mll.ml:
+ ocamllex $<
+
+-.mly.ml:
++%.mli %.ml: %.mly
+ ocamlyacc $<
+
diff --git a/dev-ml/xml-light/files/03_cflags.dpatch b/dev-ml/xml-light/files/03_cflags.patch index 5dfbffe5da1f..3895b2ad6872 100644 --- a/dev-ml/xml-light/files/03_cflags.dpatch +++ b/dev-ml/xml-light/files/03_cflags.patch @@ -1,13 +1,5 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 03_cflags.dpatch by Sylvain Le Gall <gildor@debian.org> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad xml-light-2.2~/Makefile xml-light-2.2/Makefile ---- xml-light-2.2~/Makefile 2006-10-26 00:22:41.000000000 +0200 -+++ xml-light-2.2/Makefile 2006-10-26 00:24:45.000000000 +0200 +--- a/Makefile ++++ b/Makefile @@ -3,8 +3,8 @@ .SUFFIXES : .ml .mli .cmo .cmx .cmi .mll .mly
diff --git a/dev-ml/xml-light/files/04_dtd_trace.dpatch b/dev-ml/xml-light/files/04_dtd_trace.dpatch deleted file mode 100644 index 9dbea4bdf0c8..000000000000 --- a/dev-ml/xml-light/files/04_dtd_trace.dpatch +++ /dev/null @@ -1,26 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 04_dtd_trace.dpatch by Sylvain Le Gall <gildor@debian.org> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad xml-light-2.2~/dtd.ml xml-light-2.2/dtd.ml ---- xml-light-2.2~/dtd.ml 2005-02-18 10:01:54.000000000 +0100 -+++ xml-light-2.2/dtd.ml 2006-10-26 23:22:25.000000000 +0200 -@@ -267,7 +267,7 @@ - exception TmpResult of dtd_result
-
- let prove_child dtd tag =
-- trace dtd tag;
-+ (*trace dtd tag;*)
- match dtd.current with
- | DTDEmpty -> raise (Prove_error EmptyExpected)
- | DTDAny -> ()
-@@ -505,4 +505,4 @@ - sprintf "<!ELEMENT %s %s>" tag (etype_to_string etype)
-
- ;;
--to_string_ref := to_string -\ No newline at end of file -+to_string_ref := to_string
diff --git a/dev-ml/xml-light/files/04_dtd_trace.patch b/dev-ml/xml-light/files/04_dtd_trace.patch new file mode 100644 index 000000000000..ac0da3cb5b86 --- /dev/null +++ b/dev-ml/xml-light/files/04_dtd_trace.patch @@ -0,0 +1,18 @@ +--- a/dtd.ml ++++ b/dtd.ml +@@ -267,7 +267,7 @@ + exception TmpResult of dtd_result
+
+ let prove_child dtd tag =
+- trace dtd tag;
++ (*trace dtd tag;*)
+ match dtd.current with
+ | DTDEmpty -> raise (Prove_error EmptyExpected)
+ | DTDAny -> ()
+@@ -505,4 +505,4 @@ + sprintf "<!ELEMENT %s %s>" tag (etype_to_string etype)
+
+ ;;
+-to_string_ref := to_string +\ No newline at end of file ++to_string_ref := to_string
diff --git a/dev-ml/xml-light/metadata.xml b/dev-ml/xml-light/metadata.xml index c5adddd4b3e6..85e4ed814fa2 100644 --- a/dev-ml/xml-light/metadata.xml +++ b/dev-ml/xml-light/metadata.xml @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> - <email>maksbotan@gentoo.org</email> - <name>Maxim Koltsov</name> -</maintainer> +<!-- maintainer-needed --> </pkgmetadata> diff --git a/dev-ml/xml-light/xml-light-2.2-r3.ebuild b/dev-ml/xml-light/xml-light-2.2-r3.ebuild index f7244b272a18..13a88a9f841b 100644 --- a/dev-ml/xml-light/xml-light-2.2-r3.ebuild +++ b/dev-ml/xml-light/xml-light-2.2-r3.ebuild @@ -1,35 +1,36 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 - -inherit eutils multilib +EAPI=7 DESCRIPTION="Minimal Xml parser and printer for OCaml" HOMEPAGE="http://tech.motion-twin.com/xmllight.html" SRC_URI="http://tech.motion-twin.com/zip/${P}.zip" +S="${WORKDIR}/${PN}" LICENSE="LGPL-2.1" SLOT="0/${PV}" -KEYWORDS="amd64 ~arm ~arm64 ~ppc x86" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" IUSE="doc +ocamlopt" RDEPEND="dev-lang/ocaml:=[ocamlopt?]" -DEPEND="app-arch/unzip - ${RDEPEND}" - -S="${WORKDIR}/${PN}" +DEPEND="${RDEPEND}" +BDEPEND="app-arch/unzip" -src_prepare() { - EPATCH_FORCE=yes EPATCH_SUFFIX=dpatch EPATCH_SOURCE="${FILESDIR}" \ - epatch -} +PATCHES=( + "${FILESDIR}"/01_installopt.patch + "${FILESDIR}"/02_cmi_depends.patch + "${FILESDIR}"/03_cflags.patch + "${FILESDIR}"/04_dtd_trace.patch +) src_compile() { emake -j1 + if use ocamlopt; then emake -j1 opt fi + if use doc;then emake doc fi @@ -43,20 +44,26 @@ src_test() { src_install() { dodir /usr/$(get_libdir)/ocaml/${PN} emake INSTALLDIR="${D}"/usr/$(get_libdir)/ocaml/${PN} install - cat > "${D}"/usr/$(get_libdir)/ocaml/${PN}/META << EOF + + cat > "${ED}"/usr/$(get_libdir)/ocaml/${PN}/META || die << EOF name="${PN}" version="${PV}" description="${DESCRIPTION}" requires="" archive(byte)="xml-light.cma" EOF + if use ocamlopt; then emake INSTALLDIR="${D}"/usr/$(get_libdir)/ocaml/${PN} installopt - echo 'archive(native)="xml-light.cmxa"' >> "${D}"/usr/$(get_libdir)/ocaml/${PN}/META + echo 'archive(native)="xml-light.cmxa"' >> "${ED}"/usr/$(get_libdir)/ocaml/${PN}/META || die fi + dodoc README + if use doc; then emake doc - dohtml doc/* + + docinto html + dodoc doc/* fi } diff --git a/dev-ml/xmlm/Manifest b/dev-ml/xmlm/Manifest deleted file mode 100644 index e96019c4d802..000000000000 --- a/dev-ml/xmlm/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST xmlm-1.3.0.tbz 25176 BLAKE2B 546f433386101c2460b0a8cadf94e383269e81792d068fa4c85d78117a5e65a64bd5e2fac0a5857d6bdefc7c511ae98cc77410b276ecb0300baf73d70ccb2251 SHA512 fd3b9ba8cd12321fd8d56e9ce829a7c8b121bff11cbf7ede58fa0280302fe0ba64f510360ff5b5182591faef660792db66db36e45f6355e3d22bb521f8e308fe diff --git a/dev-ml/xmlm/metadata.xml b/dev-ml/xmlm/metadata.xml deleted file mode 100644 index a798d7062372..000000000000 --- a/dev-ml/xmlm/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> - </maintainer> - <upstream> - <remote-id type="github">dbuenzli/xmlm</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-ml/xmlm/xmlm-1.3.0.ebuild b/dev-ml/xmlm/xmlm-1.3.0.ebuild deleted file mode 100644 index f01035cc90c4..000000000000 --- a/dev-ml/xmlm/xmlm-1.3.0.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit opam - -DESCRIPTION="Ocaml XML manipulation module" -HOMEPAGE="http://erratique.ch/software/xmlm https://github.com/dbuenzli/xmlm" -SRC_URI="http://erratique.ch/software/${PN}/releases/${P}.tbz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="test" - -RDEPEND="" -DEPEND="${RDEPEND} - dev-ml/findlib - >=dev-ml/topkg-0.9 -" - -src_compile() { - ocaml pkg/pkg.ml build \ - --tests $(usex test 'true' 'false') \ - || die -} - -src_test() { - ocaml pkg/pkg.ml test || die -} diff --git a/dev-ml/xstr/Manifest b/dev-ml/xstr/Manifest deleted file mode 100644 index 0d5daa182419..000000000000 --- a/dev-ml/xstr/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST xstr-0.2.1.tar.gz 14703 BLAKE2B 5fc64bba6359d8ea9d1517c291d65aeb5493222829c6b6ac6f350918aae0b2b2a6b997dc9a5b65ab2ac57fbb9f84afdfb738cbc79b2cfc0153fef78544e817be SHA512 aeb518353191d48c446641937bbf78660911dd9cbb34689790777fdf47c8ab57640fd0ee04b077a74cbbe46a07bc0ef71062a1b4b7f8a627a9524ef04a03b28e diff --git a/dev-ml/xstr/metadata.xml b/dev-ml/xstr/metadata.xml deleted file mode 100644 index ffac4d7ebc01..000000000000 --- a/dev-ml/xstr/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> -</maintainer> -</pkgmetadata> diff --git a/dev-ml/xstr/xstr-0.2.1.ebuild b/dev-ml/xstr/xstr-0.2.1.ebuild deleted file mode 100644 index 3d53842f7509..000000000000 --- a/dev-ml/xstr/xstr-0.2.1.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib - -DESCRIPTION="Thread-safe implementation of string searching/matching/splitting" -HOMEPAGE="http://www.ocaml-programming.de/packages/" -SRC_URI="http://www.ocaml-programming.de/packages/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64 ppc x86" -IUSE="" - -DEPEND=">=dev-lang/ocaml-3.10:=[ocamlopt]" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${PN}" - -src_compile() -{ - make all || die - make opt || die -} - -src_install() -{ - findlib_src_install - dodoc README RELEASE -} diff --git a/dev-ml/yojson/Manifest b/dev-ml/yojson/Manifest index 1e6fd2ae0045..99da581f40e9 100644 --- a/dev-ml/yojson/Manifest +++ b/dev-ml/yojson/Manifest @@ -1 +1,2 @@ -DIST yojson-1.4.0.tar.gz 26197 BLAKE2B c7d1a9d47f448995b31cd7631f64dec29e65b1f141854092bfe186a58c28b96c5c7f246f7e4ab4563dfcd84776904d4af77bbcbdc4e149229fbde339bd92df9f SHA512 dc019ecf0387299282c3df9a548456d2529993241911a83acb14f2361ed14886e5ebebe415773b6bc718cb0b12a25529184f3b5b62c71b42960fbd62e1c63bf6 +DIST yojson-2.1.0.tar.gz 48316 BLAKE2B 49634800de95035624803883b7f44eda1dd4ba8c050efc52ba31246aba7c37b57d717ebc6d487a9c99ba55ab416a5b196974b0bac09bc6a74992356840e4ae52 SHA512 d52e4fcac41165f9fb74e922d35dd247e1622674f74d6e80978fbc1f42b45f45797965e41129e7acd049451ef5fcec48021ca7c866e36a4e8c4c51e78bab9d7f +DIST yojson-2.1.1.tar.gz 49090 BLAKE2B aa11a3d6b786f33fa2da6dbf34f2a496a1796eab64d87069420fc9953fef6442660a58f259c4abcca6373710375723e6965f0ab9c9dbcafea46eb6e03147fb54 SHA512 935014c43bca83201b0e9d3399e751ae5667ac12bc7fe3d8777b6a84a1216a7325b3cdafb8f9650a4c3979d0e2df6fdeae3cc894c92a175f7ee75ee6303b46c2 diff --git a/dev-ml/yojson/files/yojson-2.0.2-dune-seq.patch b/dev-ml/yojson/files/yojson-2.0.2-dune-seq.patch new file mode 100644 index 000000000000..c94933291f30 --- /dev/null +++ b/dev-ml/yojson/files/yojson-2.0.2-dune-seq.patch @@ -0,0 +1,8 @@ +--- a/lib/dune ++++ b/lib/dune +@@ -34,5 +34,4 @@ + (public_name yojson) + (modules yojson) + (synopsis "JSON parsing and printing") +- (libraries seq) + (flags (-safe-string))) diff --git a/dev-ml/yojson/files/yojson-2.1.1-dune-seq.patch b/dev-ml/yojson/files/yojson-2.1.1-dune-seq.patch new file mode 100644 index 000000000000..d2ad6e750eb1 --- /dev/null +++ b/dev-ml/yojson/files/yojson-2.1.1-dune-seq.patch @@ -0,0 +1,9 @@ +--- a/lib/dune ++++ b/lib/dune +@@ -113,6 +113,5 @@ + (public_name yojson) + (modules yojson t basic safe raw common codec lexer_utils) + (synopsis "JSON parsing and printing") +- (libraries seq) + (flags + (:standard -w -27-32))) diff --git a/dev-ml/yojson/metadata.xml b/dev-ml/yojson/metadata.xml index 81b2fc96c145..b835609e4c54 100644 --- a/dev-ml/yojson/metadata.xml +++ b/dev-ml/yojson/metadata.xml @@ -1,11 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> + <pkgmetadata> + <maintainer type="person" proxied="yes"> + <name>François-Xavier Carton</name> + <email>fx.carton91@gmail.com</email> + </maintainer> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> <upstream> + <bugs-to>https://github.com/mjambon/yojson/issues/</bugs-to> <remote-id type="github">mjambon/yojson</remote-id> </upstream> </pkgmetadata> diff --git a/dev-ml/yojson/yojson-1.4.0.ebuild b/dev-ml/yojson/yojson-1.4.0.ebuild deleted file mode 100644 index 6a3ad0c2f226..000000000000 --- a/dev-ml/yojson/yojson-1.4.0.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib opam - -DESCRIPTION="JSON parsing and pretty-printing library for OCaml" -HOMEPAGE="https://github.com/mjambon/yojson" -SRC_URI="https://github.com/mjambon/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -SLOT="0/${PV}" -LICENSE="BSD" -KEYWORDS="~amd64" -IUSE="examples" - -RDEPEND=">=dev-lang/ocaml-3.11:=[ocamlopt] - dev-ml/easy-format:=[ocamlopt] - >=dev-ml/biniou-1.2:=[ocamlopt] -" -DEPEND="${RDEPEND} - dev-ml/cppo - dev-ml/jbuilder -" - -src_install() { - opam_src_install - - if use examples ; then - dodoc -r examples - docompress -x /usr/share/doc/${PF}/examples - fi -} diff --git a/dev-ml/yojson/yojson-2.1.0.ebuild b/dev-ml/yojson/yojson-2.1.0.ebuild new file mode 100644 index 000000000000..541f3e406948 --- /dev/null +++ b/dev-ml/yojson/yojson-2.1.0.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="JSON parsing and pretty-printing library for OCaml" +HOMEPAGE="https://github.com/ocaml-community/yojson" +SRC_URI="https://github.com/ocaml-community/${PN}/archive/${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="amd64" +IUSE="examples +ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-lang/ocaml-4.07:=[ocamlopt?] + !!<dev-ml/seq-0.3 +" +DEPEND="${RDEPEND}" +BDEPEND=" + >=dev-ml/cppo-1.6.1 + test? ( dev-ml/alcotest ) +" + +PATCHES=( "${FILESDIR}"/${PN}-2.0.2-dune-seq.patch ) + +src_prepare() { + default + # let's not build this + rm bench/dune yojson-bench.opam || die +} + +src_install() { + dune_src_install + + if use examples; then + dodoc -r examples + docompress -x /usr/share/doc/${PF}/examples + fi +} diff --git a/dev-ml/yojson/yojson-2.1.1.ebuild b/dev-ml/yojson/yojson-2.1.1.ebuild new file mode 100644 index 000000000000..b19431481c32 --- /dev/null +++ b/dev-ml/yojson/yojson-2.1.1.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="JSON parsing and pretty-printing library for OCaml" +HOMEPAGE="https://github.com/ocaml-community/yojson" +SRC_URI="https://github.com/ocaml-community/${PN}/archive/${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="amd64" +IUSE="examples +ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-lang/ocaml-4.07:=[ocamlopt?] + !!<dev-ml/seq-0.3 +" +DEPEND="${RDEPEND}" +BDEPEND=" + >=dev-ml/cppo-1.6.1 + test? ( dev-ml/alcotest ) +" + +PATCHES=( "${FILESDIR}/${PN}-2.1.1-dune-seq.patch" ) + +src_prepare() { + default + # let's not build this + rm bench/dune yojson-bench.opam || die +} + +src_install() { + dune_src_install + + if use examples; then + dodoc -r examples + docompress -x /usr/share/doc/${PF}/examples + fi +} diff --git a/dev-ml/zarith/Manifest b/dev-ml/zarith/Manifest index 01222184fdaa..cfcf085547b5 100644 --- a/dev-ml/zarith/Manifest +++ b/dev-ml/zarith/Manifest @@ -1,4 +1 @@ -DIST zarith-1.4.1.tgz 88831 BLAKE2B f1a434f61dfa23cdb1e41d3e84c53444832978d119aa3f169d1b0302268ba13bc9e1f4cdec8c76b14d53ad49a695f04c1077beb1619a16a89a98ac6a1ebd8361 SHA512 ef6717e3b6c19ef94fb0e02eb33b1d9f2b2103a9fe0334cb89b01b344ee953fbeeaed8a75b17daa32760faaf93d582e6778ae50e59e9cf878663f2ecba1d5659 -DIST zarith-1.5.tar.gz 89211 BLAKE2B f84127baeaf7efb61957e3657e7f2e3771df974ff6f92e3e0a04c93550ee48d5fa9adf473e423d409a2f40dba568ced30ef903c790f32b6e8bccd1032a475b84 SHA512 4e616b8cc81cd83f51696926e598be3bcda0bb5999db3cf42dd627cf537320a0216c74eb14c57e57fc21c909df8ef3fb3fa602a7ad633c115d2ee61af5a9fdcd -DIST zarith-1.6.tar.gz 89353 BLAKE2B 4dc7dbe17426a57929632d38fae91bdfec4f54371ebb0ae55b6d88c7fffb47c229d0800125eaa2f5fca4e096bb50dceb4e0851ef88a16d3e89bc1db7b9cb32b9 SHA512 a12eacfaa809885f2b0f09ed0fc56d90ebaf9a3d8685db8a41dcaaaa2a9d2410ec96529d8bee653343ea8d51304861dbcf12daba06206a6cf07753ad3b09780d -DIST zarith-1.7.tar.gz 89617 BLAKE2B ee8a272a7421d9e723af8aa6207da8fe046585804e669058b6dec8fb47cab80e438d0520c1b61ed6c79bc279d162a7a1043fa40e74c50342b7e4d553ca8e8f5b SHA512 812b5f9b24ce7a24d3370b8728ff6eeb56e3280fa1573e694fe54e781668c29bf8ff95e94aeff59df948adc85b8acd6b4efe117fb50a124f19b4227bee78e753 +DIST zarith-1.13.tar.gz 85994 BLAKE2B a5860319e17f4e660f248f3e724076b578d27dc3a06e8b54d68bcd6ed021a0354ad714dfcb06329bb9c4a3eadc3d08fd84fd76ef5d1a8902a06a7506d77addde SHA512 a562fa8bf4f5ef44f2af6b9a8f028182fd184c89f8c41455acdc02851cc0fc3124d3776c0de930e8d09cd5d6d88cc689f80f4b597068a0611131f45d057b101f diff --git a/dev-ml/zarith/metadata.xml b/dev-ml/zarith/metadata.xml index c95afc027dca..cdc93725d68d 100644 --- a/dev-ml/zarith/metadata.xml +++ b/dev-ml/zarith/metadata.xml @@ -1,13 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> - <use> - <flag name="mpir">Use MPIR library instead of GMP.</flag> - </use> <upstream> <remote-id type="github">ocaml/Zarith</remote-id> </upstream> diff --git a/dev-ml/zarith/zarith-1.13.ebuild b/dev-ml/zarith/zarith-1.13.ebuild new file mode 100644 index 000000000000..4312ddbd84a7 --- /dev/null +++ b/dev-ml/zarith/zarith-1.13.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit findlib toolchain-funcs + +DESCRIPTION="Arithmetic and logic operations over arbitrary-precision integers" +HOMEPAGE="https://github.com/ocaml/Zarith" +SRC_URI="https://github.com/ocaml/Zarith/archive/release-${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1-with-linking-exception" +SLOT="0/${PV}" +KEYWORDS="amd64 ~arm ~arm64 ~ppc x86" +IUSE="doc +ocamlopt" +RESTRICT="!ocamlopt? ( test )" + +RDEPEND=" + >=dev-lang/ocaml-4.05:=[ocamlopt=] + dev-libs/gmp:0= +" +DEPEND="${RDEPEND} dev-lang/perl" + +DOCS=( README.md Changes ) + +S="${WORKDIR}/Zarith-release-${PV}" + +src_configure() { + tc-export CC AR + ./configure \ + -ocamllibdir /usr/$(get_libdir)/ocaml -gmp || die + sed -i \ + -e 's|$(INSTALLDIR)|$(DESTDIR)$(INSTALLDIR)|g' \ + project.mak || die +} + +src_compile() { + emake -j 1 HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) all + use doc && emake doc +} + +src_test() { + emake HASOCAMLOPT=yes HASDYNLINK=yes tests +} + +src_install() { + findlib_src_preinst + + emake \ + HASOCAMLOPT=$(usex ocamlopt yes no) \ + HASDYNLINK=$(usex ocamlopt yes no) \ + DESTDIR="${ED}" \ + install + + dosym zarith/libzarith.a /usr/$(get_libdir)/ocaml/libzarith.a + + use doc && HTML_DOCS=( html/* ) + einstalldocs +} diff --git a/dev-ml/zarith/zarith-1.4.1.ebuild b/dev-ml/zarith/zarith-1.4.1.ebuild deleted file mode 100644 index 8825fc311e45..000000000000 --- a/dev-ml/zarith/zarith-1.4.1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib eutils toolchain-funcs - -DESCRIPTION="Arithmetic and logic operations over arbitrary-precision integers" -HOMEPAGE="https://forge.ocamlcore.org/projects/zarith/" -SRC_URI="https://forge.ocamlcore.org/frs/download.php/1574/${P}.tgz" - -LICENSE="LGPL-2.1-with-linking-exception" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="doc mpir +ocamlopt" - -RDEPEND=" - >=dev-lang/ocaml-4:=[ocamlopt?] - !mpir? ( dev-libs/gmp:0= ) - mpir? ( sci-libs/mpir )" - -DEPEND="${RDEPEND} dev-lang/perl" - -src_configure() { - tc-export CC - ./configure -host "${CHOST}" \ - -ocamllibdir "/usr/$(get_libdir)" \ - -installdir "${ED}/usr/$(get_libdir)/ocaml" \ - $(usex mpir "-mpir" "-gmp") || die -} - -src_compile() { - emake HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) all - use doc && emake doc -} - -src_test() { - emake HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) tests -} - -src_install() { - findlib_src_preinst - emake HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) install - dodoc Changes README - use doc && dohtml html/* -} diff --git a/dev-ml/zarith/zarith-1.5.ebuild b/dev-ml/zarith/zarith-1.5.ebuild deleted file mode 100644 index 857c5026e9d6..000000000000 --- a/dev-ml/zarith/zarith-1.5.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib eutils toolchain-funcs - -DESCRIPTION="Arithmetic and logic operations over arbitrary-precision integers" -HOMEPAGE="https://github.com/ocaml/Zarith" -SRC_URI="https://github.com/ocaml/Zarith/archive/release-${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1-with-linking-exception" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="doc mpir +ocamlopt" - -RDEPEND=" - >=dev-lang/ocaml-4:=[ocamlopt?] - !mpir? ( dev-libs/gmp:0= ) - mpir? ( sci-libs/mpir )" - -DEPEND="${RDEPEND} dev-lang/perl" - -S="${WORKDIR}/Zarith-release-${PV}" - -src_configure() { - tc-export CC - ./configure -host "${CHOST}" \ - -ocamllibdir "/usr/$(get_libdir)" \ - -installdir "${ED}/usr/$(get_libdir)/ocaml" \ - $(usex mpir "-mpir" "-gmp") || die -} - -src_compile() { - emake HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) all - use doc && emake doc -} - -src_test() { - if use ocamlopt ; then - emake HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) tests - else - ewarn "Tests require USE=ocamlopt. Skipping them." - fi -} - -src_install() { - findlib_src_preinst - emake HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) install - dodoc Changes README.md - use doc && dohtml html/* -} diff --git a/dev-ml/zarith/zarith-1.6.ebuild b/dev-ml/zarith/zarith-1.6.ebuild deleted file mode 100644 index 857c5026e9d6..000000000000 --- a/dev-ml/zarith/zarith-1.6.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib eutils toolchain-funcs - -DESCRIPTION="Arithmetic and logic operations over arbitrary-precision integers" -HOMEPAGE="https://github.com/ocaml/Zarith" -SRC_URI="https://github.com/ocaml/Zarith/archive/release-${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1-with-linking-exception" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="doc mpir +ocamlopt" - -RDEPEND=" - >=dev-lang/ocaml-4:=[ocamlopt?] - !mpir? ( dev-libs/gmp:0= ) - mpir? ( sci-libs/mpir )" - -DEPEND="${RDEPEND} dev-lang/perl" - -S="${WORKDIR}/Zarith-release-${PV}" - -src_configure() { - tc-export CC - ./configure -host "${CHOST}" \ - -ocamllibdir "/usr/$(get_libdir)" \ - -installdir "${ED}/usr/$(get_libdir)/ocaml" \ - $(usex mpir "-mpir" "-gmp") || die -} - -src_compile() { - emake HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) all - use doc && emake doc -} - -src_test() { - if use ocamlopt ; then - emake HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) tests - else - ewarn "Tests require USE=ocamlopt. Skipping them." - fi -} - -src_install() { - findlib_src_preinst - emake HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) install - dodoc Changes README.md - use doc && dohtml html/* -} diff --git a/dev-ml/zarith/zarith-1.7.ebuild b/dev-ml/zarith/zarith-1.7.ebuild deleted file mode 100644 index 133092897581..000000000000 --- a/dev-ml/zarith/zarith-1.7.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib eutils toolchain-funcs - -DESCRIPTION="Arithmetic and logic operations over arbitrary-precision integers" -HOMEPAGE="https://github.com/ocaml/Zarith" -SRC_URI="https://github.com/ocaml/Zarith/archive/release-${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1-with-linking-exception" -SLOT="0/${PV}" -KEYWORDS="amd64 ~ppc ~x86" -IUSE="doc mpir +ocamlopt" - -RDEPEND=" - >=dev-lang/ocaml-4:=[ocamlopt?] - !mpir? ( dev-libs/gmp:0= ) - mpir? ( sci-libs/mpir )" - -DEPEND="${RDEPEND} dev-lang/perl" - -S="${WORKDIR}/Zarith-release-${PV}" - -src_configure() { - tc-export CC - ./configure -host "${CHOST}" \ - -ocamllibdir "/usr/$(get_libdir)" \ - -installdir "${ED}/usr/$(get_libdir)/ocaml" \ - $(usex mpir "-mpir" "-gmp") || die -} - -src_compile() { - emake HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) all - use doc && emake doc -} - -src_test() { - if use ocamlopt ; then - emake HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) tests - else - ewarn "Tests require USE=ocamlopt. Skipping them." - fi -} - -src_install() { - findlib_src_preinst - emake HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) install - dodoc Changes README.md - use doc && dohtml html/* -} diff --git a/dev-ml/zed/Manifest b/dev-ml/zed/Manifest index f76f88ef7750..610b3f9f49bf 100644 --- a/dev-ml/zed/Manifest +++ b/dev-ml/zed/Manifest @@ -1 +1,2 @@ -DIST zed-1.5.tar.gz 29999 BLAKE2B 0b06eeae718cbbe7f179f50baa8d203466265732a6964f3a899afb2ddabec08def9a9b1764d20d0777c21190b452a6e95b2dd3f8d96934624b0efe4b1a5b060b SHA512 7bd66ef77ffa64df59ddd6760e2304bb38daa168d98dc051482d162a2427c639646a489e6fbc2ad53c871b194ce59e20dd19aba29935959a9986128d46b8df34 +DIST zed-3.2.2.tar.gz 44565 BLAKE2B 28a9193e119f3462545e014ee7d02af16515abc3a09bbf05ce8f9588e5d01abd892731eed5d42d7967f91ccb4bd161084773661efa0dc0fea6872e36484b1732 SHA512 cb377ff972c8ef0501a8034c53f10d26a60c7735742945d930b26a8535de2fa36ecc9538518a26f2bed8d5e61a642408c1f0886c75945b50ad6a524ed8e1193b +DIST zed-3.2.3.tar.gz 44745 BLAKE2B d013d1d3341f04ec7aa141abaa175d3db9e57e3966c5a8adef7efb416e7ec3ae0800f554b0d943fa55cd8bbb6bfe069e6b5d7d23d2a38bf7f1e55f7cafe52943 SHA512 637f75129550f6459417549d44bed16bdc62721d2e9e0c6bb5bfab30c5bc6478de15faece8c091b56f238375cb79a7bc176375400e543120bb31d7ea626b7c5b diff --git a/dev-ml/zed/metadata.xml b/dev-ml/zed/metadata.xml index 0c36be87a2d5..e37d0a1e61b3 100644 --- a/dev-ml/zed/metadata.xml +++ b/dev-ml/zed/metadata.xml @@ -1,11 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> + <pkgmetadata> <maintainer type="project"> <email>ml@gentoo.org</email> - <name>Gentoo ML Project</name> + <name>ML</name> </maintainer> + <longdescription> + Zed is an abstract engine for text edition. It can be used to write text + editors, edition widgets, readlines, ... Zed uses Camomile to fully + support the Unicode specification, and implements an UTF-8 encoded string + type with validation, and a rope datastructure to achieve efficient + operations on large Unicode buffers. Zed also features a regular expression + search on ropes. To support efficient text edition capabilities, + Zed provides macro recording and cursor management facilities. + </longdescription> <upstream> - <remote-id type="github">diml/zed</remote-id> + <bugs-to>https://github.com/ocaml-community/zed/issues/</bugs-to> + <remote-id type="github">ocaml-community/zed</remote-id> </upstream> </pkgmetadata> diff --git a/dev-ml/zed/zed-1.5.ebuild b/dev-ml/zed/zed-1.5.ebuild deleted file mode 100644 index c8a407083927..000000000000 --- a/dev-ml/zed/zed-1.5.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit opam - -DESCRIPTION="Zed is an abstract engine for text edition" -HOMEPAGE="https://github.com/diml/zed" -SRC_URI="https://github.com/diml/zed/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -DEPEND=" - dev-lang/ocaml:= - dev-ml/camomile:= - dev-ml/react:=" -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} - dev-ml/jbuilder" - -src_compile() { - jbuilder build --only-packages zed @install || die -} diff --git a/dev-ml/zed/zed-3.2.2-r1.ebuild b/dev-ml/zed/zed-3.2.2-r1.ebuild new file mode 100644 index 000000000000..8e32cbb4d079 --- /dev/null +++ b/dev-ml/zed/zed-3.2.2-r1.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Abstract engine for text edition in OCaml" +HOMEPAGE="https://github.com/ocaml-community/zed" +SRC_URI="https://github.com/ocaml-community/zed/archive/${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-ml/dune-3 + dev-ml/react:= + dev-ml/result:= + dev-ml/uchar:= + dev-ml/uucp:= + dev-ml/uuseg:= + dev-ml/uutf:= +" +DEPEND="${RDEPEND}" +BDEPEND="test? ( + dev-ml/alcotest +)" diff --git a/dev-ml/zed/zed-3.2.3.ebuild b/dev-ml/zed/zed-3.2.3.ebuild new file mode 100644 index 000000000000..8e32cbb4d079 --- /dev/null +++ b/dev-ml/zed/zed-3.2.3.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Abstract engine for text edition in OCaml" +HOMEPAGE="https://github.com/ocaml-community/zed" +SRC_URI="https://github.com/ocaml-community/zed/archive/${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-ml/dune-3 + dev-ml/react:= + dev-ml/result:= + dev-ml/uchar:= + dev-ml/uucp:= + dev-ml/uuseg:= + dev-ml/uutf:= +" +DEPEND="${RDEPEND}" +BDEPEND="test? ( + dev-ml/alcotest +)" diff --git a/dev-ml/zmq-async/Manifest b/dev-ml/zmq-async/Manifest new file mode 100644 index 000000000000..cb55bc1e51bb --- /dev/null +++ b/dev-ml/zmq-async/Manifest @@ -0,0 +1 @@ +DIST ocaml-zmq-zmq-async.tar.gz 33027 BLAKE2B 935468c29394abaac36fdea922f82b525f0cdaf35365b893a0186cc54e9b0a4e3fa25a9d8362addad52e89a3b930d36974590c481647c19a55fca8fdfef68bf3 SHA512 85d1b16f8e9d6abc24e175b7dd3574585f4d854f5355bb67797f8651eea3f0835ade03a28d5d9e8dbd5cb5573f517e271854099ee91a79835c2d84076983dff4 diff --git a/dev-ml/zmq-async/metadata.xml b/dev-ml/zmq-async/metadata.xml new file mode 100644 index 000000000000..e367ac09da1c --- /dev/null +++ b/dev-ml/zmq-async/metadata.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> + +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <bugs-to>https://github.com/issuu/ocaml-zmq/</bugs-to> + <remote-id type="github">issuu/ocaml-zmq</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/zmq-async/zmq-async-5.2.1.ebuild b/dev-ml/zmq-async/zmq-async-5.2.1.ebuild new file mode 100644 index 000000000000..d04fd3e47721 --- /dev/null +++ b/dev-ml/zmq-async/zmq-async-5.2.1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Async-aware bindings to ZMQ for OCaml" +HOMEPAGE="https://github.com/issuu/ocaml-zmq/" + +if [[ ${PV} == *9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/issuu/ocaml-zmq.git" +else + SRC_URI="https://github.com/issuu/ocaml-zmq/archive/${PV}.tar.gz + -> ocaml-zmq-${PN}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi +S="${WORKDIR}"/ocaml-zmq-${PV} + +LICENSE="MIT" +SLOT="0/${PV}" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-ml/async_kernel:= + dev-ml/async_unix:= + dev-ml/base:= + dev-ml/zmq:= +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-ml/dune-configurator + test? ( dev-ml/ounit2 ) +" + +src_compile() { + dune-compile ${DUNE_PKG_NAME} +} + +src_test() { + dune-test ${DUNE_PKG_NAME} +} diff --git a/dev-ml/zmq-lwt/Manifest b/dev-ml/zmq-lwt/Manifest new file mode 100644 index 000000000000..df4e516c7a95 --- /dev/null +++ b/dev-ml/zmq-lwt/Manifest @@ -0,0 +1 @@ +DIST ocaml-zmq-5.2.1.tar.gz 33027 BLAKE2B 935468c29394abaac36fdea922f82b525f0cdaf35365b893a0186cc54e9b0a4e3fa25a9d8362addad52e89a3b930d36974590c481647c19a55fca8fdfef68bf3 SHA512 85d1b16f8e9d6abc24e175b7dd3574585f4d854f5355bb67797f8651eea3f0835ade03a28d5d9e8dbd5cb5573f517e271854099ee91a79835c2d84076983dff4 diff --git a/dev-ml/zmq-lwt/metadata.xml b/dev-ml/zmq-lwt/metadata.xml new file mode 100644 index 000000000000..e367ac09da1c --- /dev/null +++ b/dev-ml/zmq-lwt/metadata.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> + +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <bugs-to>https://github.com/issuu/ocaml-zmq/</bugs-to> + <remote-id type="github">issuu/ocaml-zmq</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/zmq-lwt/zmq-lwt-5.2.1.ebuild b/dev-ml/zmq-lwt/zmq-lwt-5.2.1.ebuild new file mode 100644 index 000000000000..602d917191a8 --- /dev/null +++ b/dev-ml/zmq-lwt/zmq-lwt-5.2.1.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Lwt-aware bindings to ZMQ for OCaml" +HOMEPAGE="https://github.com/issuu/ocaml-zmq/" + +if [[ ${PV} == *9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/issuu/ocaml-zmq.git" +else + SRC_URI="https://github.com/issuu/ocaml-zmq/archive/${PV}.tar.gz + -> ocaml-zmq-${PV}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi +S="${WORKDIR}"/ocaml-zmq-${PV} + +LICENSE="MIT" +SLOT="0/${PV}" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-ml/lwt:= + dev-ml/zmq:= +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-ml/dune-configurator + test? ( dev-ml/ounit2 ) +" + +src_compile() { + dune-compile ${DUNE_PKG_NAME} +} + +src_test() { + dune-test ${DUNE_PKG_NAME} +} diff --git a/dev-ml/zmq/Manifest b/dev-ml/zmq/Manifest new file mode 100644 index 000000000000..df4e516c7a95 --- /dev/null +++ b/dev-ml/zmq/Manifest @@ -0,0 +1 @@ +DIST ocaml-zmq-5.2.1.tar.gz 33027 BLAKE2B 935468c29394abaac36fdea922f82b525f0cdaf35365b893a0186cc54e9b0a4e3fa25a9d8362addad52e89a3b930d36974590c481647c19a55fca8fdfef68bf3 SHA512 85d1b16f8e9d6abc24e175b7dd3574585f4d854f5355bb67797f8651eea3f0835ade03a28d5d9e8dbd5cb5573f517e271854099ee91a79835c2d84076983dff4 diff --git a/dev-ml/zmq/metadata.xml b/dev-ml/zmq/metadata.xml new file mode 100644 index 000000000000..e367ac09da1c --- /dev/null +++ b/dev-ml/zmq/metadata.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> + +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <bugs-to>https://github.com/issuu/ocaml-zmq/</bugs-to> + <remote-id type="github">issuu/ocaml-zmq</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ml/zmq/zmq-5.2.1.ebuild b/dev-ml/zmq/zmq-5.2.1.ebuild new file mode 100644 index 000000000000..eadca769b9ce --- /dev/null +++ b/dev-ml/zmq/zmq-5.2.1.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="OCaml bindings for ZeroMQ 4.x" +HOMEPAGE="https://github.com/issuu/ocaml-zmq/" + +if [[ ${PV} == *9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/issuu/ocaml-zmq.git" +else + SRC_URI="https://github.com/issuu/ocaml-zmq/archive/${PV}.tar.gz + -> ocaml-zmq-${PV}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi +S="${WORKDIR}"/ocaml-zmq-${PV} + +LICENSE="MIT" +SLOT="0/${PV}" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + net-libs/zeromq:= +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-ml/dune-configurator + test? ( dev-ml/ounit2 ) +" + +src_compile() { + dune-compile ${DUNE_PKG_NAME} +} + +src_test() { + dune-test ${DUNE_PKG_NAME} +} |