[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-format/
commit: 12af05fffe69170a30ddbe51c8b9bfc326d4299f Author: Alfredo Tupone gentoo org> AuthorDate: Fri Jul 19 17:24:49 2024 + Commit: Alfredo Tupone gentoo org> CommitDate: Fri Jul 19 17:24:49 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12af05ff dev-ml/opam-format: drop 2.0.9, 2.0.10 Signed-off-by: Alfredo Tupone gentoo.org> dev-ml/opam-format/Manifest | 2 -- dev-ml/opam-format/opam-format-2.0.10.ebuild | 47 dev-ml/opam-format/opam-format-2.0.9.ebuild | 47 3 files changed, 96 deletions(-) diff --git a/dev-ml/opam-format/Manifest b/dev-ml/opam-format/Manifest index 13cb1b80d395..a98b60e89254 100644 --- a/dev-ml/opam-format/Manifest +++ b/dev-ml/opam-format/Manifest @@ -1,5 +1,3 @@ -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 c5e50c0a41b7197bc7645eaef0d8cba79c978b4432fc824aa6a4280df65ec7d59df52a22b76877da4949c8562a5fecb8da2a179ca67bd312bf9a514961bf SHA512 040e4f58f93e962ff422617ce0d35ed45dd86921a9aac3505914c33dd942d0e5e5771e7e1774046504f9aa84f32bc4fbd6ac7720fbea862d48bf1ca29e02cefc diff --git a/dev-ml/opam-format/opam-format-2.0.10.ebuild b/dev-ml/opam-format/opam-format-2.0.10.ebuild deleted file mode 100644 index ef61d2b92d0b.. --- a/dev-ml/opam-format/opam-format-2.0.10.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# 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 deleted file mode 100644 index e9c7e673404f.. --- a/dev-ml/opam-format/opam-format-2.0.9.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# 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
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-format/
commit: 86339b3e125d5bf2cf26e65618da8307b84fc63c Author: Alfredo Tupone gentoo org> AuthorDate: Mon Jul 15 09:58:38 2024 + Commit: Alfredo Tupone gentoo org> CommitDate: Mon Jul 15 09:58:38 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86339b3e dev-ml/opam-format: add 2.1.5 Signed-off-by: Alfredo Tupone gentoo.org> dev-ml/opam-format/Manifest | 1 + dev-ml/opam-format/opam-format-2.1.5.ebuild | 54 + 2 files changed, 55 insertions(+) diff --git a/dev-ml/opam-format/Manifest b/dev-ml/opam-format/Manifest index 13cb1b80d395..d1d1ef4c062e 100644 --- a/dev-ml/opam-format/Manifest +++ b/dev-ml/opam-format/Manifest @@ -3,3 +3,4 @@ DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e5137 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 c5e50c0a41b7197bc7645eaef0d8cba79c978b4432fc824aa6a4280df65ec7d59df52a22b76877da4949c8562a5fecb8da2a179ca67bd312bf9a514961bf SHA512 040e4f58f93e962ff422617ce0d35ed45dd86921a9aac3505914c33dd942d0e5e5771e7e1774046504f9aa84f32bc4fbd6ac7720fbea862d48bf1ca29e02cefc +DIST opam-2.1.5.tar.gz 837005 BLAKE2B f2e58784959f0e47fbe5ae65112a030d8350b061d7b0d2676f40e22ec5bf62c136bc37fd3078403dab807705ce8a1c8b6bb0ecf00b68fdfbb5f3d5a9acb88c77 SHA512 4395defe7df1d03ca889718b8eafd8161ff009710475f62673f19f012e0bde8ad2a919bd9d02d7f96b4c5a9bbf38e0ba9a256531c24de15cafabd4ef11f7c8e8 diff --git a/dev-ml/opam-format/opam-format-2.1.5.ebuild b/dev-ml/opam-format/opam-format-2.1.5.ebuild new file mode 100644 index ..b64a2e35da75 --- /dev/null +++ b/dev-ml/opam-format/opam-format-2.1.5.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2024 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" +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:=[ocamlopt?] + dev-ml/opam-file-format:=[ocamlopt?] + dev-ml/dose3:=[ocamlopt?] + dev-ml/mccs:=[ocamlopt?] +" +DEPEND="${RDEPEND} + dev-ml/cppo" +BDEPEND="test? ( + sys-apps/bubblewrap +)" + +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 +} + +src_compile() { + dune-compile ${PN} +}
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-format/
commit: bd15006ced1a301f4c571acba8b6346d6729ded5 Author: Matoro Mahri matoro tk> AuthorDate: Fri Jan 19 18:42:21 2024 + Commit: Ionen Wolkens gentoo org> CommitDate: Fri Jan 19 23:08:22 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd15006c dev-ml/opam-format: Stabilize 2.0.10 arm, #896100 Signed-off-by: Matoro Mahri matoro.tk> Signed-off-by: Ionen Wolkens gentoo.org> dev-ml/opam-format/opam-format-2.0.10.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ml/opam-format/opam-format-2.0.10.ebuild b/dev-ml/opam-format/opam-format-2.0.10.ebuild index 68741fd05179..ef61d2b92d0b 100644 --- a/dev-ml/opam-format/opam-format-2.0.10.ebuild +++ b/dev-ml/opam-format/opam-format-2.0.10.ebuild @@ -15,7 +15,7 @@ OPAM_INSTALLER="${S}/opam-installer" LICENSE="LGPL-2.1" SLOT="0/${PV}" -KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" IUSE="+ocamlopt test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-format/
commit: f267d006f79a529248658a9507379df10632 Author: Sam James gentoo org> AuthorDate: Fri Dec 22 05:02:31 2023 + Commit: Sam James gentoo org> CommitDate: Fri Dec 22 05:04:47 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f267d006 dev-ml/opam-format: Stabilize 2.0.10 ppc64, #896100 Signed-off-by: Sam James gentoo.org> dev-ml/opam-format/opam-format-2.0.10.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ml/opam-format/opam-format-2.0.10.ebuild b/dev-ml/opam-format/opam-format-2.0.10.ebuild index f4dd7112082f..65c614306d58 100644 --- a/dev-ml/opam-format/opam-format-2.0.10.ebuild +++ b/dev-ml/opam-format/opam-format-2.0.10.ebuild @@ -15,7 +15,7 @@ OPAM_INSTALLER="${S}/opam-installer" LICENSE="LGPL-2.1" SLOT="0/${PV}" -KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~x86" IUSE="+ocamlopt test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-format/
commit: 29b24092520bf81f77fc9a1ecec7447486cfb352 Author: Alfredo Tupone gentoo org> AuthorDate: Sat May 13 19:18:20 2023 + Commit: Alfredo Tupone gentoo org> CommitDate: Sat May 13 19:42:36 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29b24092 dev-ml/opam-format: stabilize 2.1.3 for amd64 Signed-off-by: Alfredo Tupone gentoo.org> dev-ml/opam-format/opam-format-2.1.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ml/opam-format/opam-format-2.1.3.ebuild b/dev-ml/opam-format/opam-format-2.1.3.ebuild index 2c8236e84329..52f318639125 100644 --- a/dev-ml/opam-format/opam-format-2.1.3.ebuild +++ b/dev-ml/opam-format/opam-format-2.1.3.ebuild @@ -16,7 +16,7 @@ OPAM_INSTALLER="${S}/opam-installer" LICENSE="LGPL-2.1" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" IUSE="+ocamlopt test" RESTRICT="test" #sandbox not working
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-format/
commit: 0ef680e87c67db39b4ab31811153a9f8461daae6 Author: Alfredo Tupone gentoo org> AuthorDate: Fri Mar 3 20:36:43 2023 + Commit: Alfredo Tupone gentoo org> CommitDate: Fri Mar 3 20:46:48 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ef680e8 dev-ml/opam-format: add 2.1.3 Signed-off-by: Alfredo Tupone gentoo.org> dev-ml/opam-format/Manifest | 1 + dev-ml/opam-format/opam-format-2.1.3.ebuild | 53 + 2 files changed, 54 insertions(+) diff --git a/dev-ml/opam-format/Manifest b/dev-ml/opam-format/Manifest index 9c8e7ed9b794..13cb1b80d395 100644 --- a/dev-ml/opam-format/Manifest +++ b/dev-ml/opam-format/Manifest @@ -2,3 +2,4 @@ DIST opam-2.0.10.tar.gz 641739 BLAKE2B 7cd201fe6bed2ae81fc8d9d0a7063b284621e5797 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 c5e50c0a41b7197bc7645eaef0d8cba79c978b4432fc824aa6a4280df65ec7d59df52a22b76877da4949c8562a5fecb8da2a179ca67bd312bf9a514961bf SHA512 040e4f58f93e962ff422617ce0d35ed45dd86921a9aac3505914c33dd942d0e5e5771e7e1774046504f9aa84f32bc4fbd6ac7720fbea862d48bf1ca29e02cefc 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 ..2c8236e84329 --- /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 +}
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-format/
commit: 07801f4932409504f38bb48499fd714f2baa2c02 Author: Sam James gentoo org> AuthorDate: Thu Feb 23 23:37:39 2023 + Commit: Sam James gentoo org> CommitDate: Thu Feb 23 23:37:39 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07801f49 dev-ml/opam-format: Stabilize 2.0.10 amd64, #896100 Signed-off-by: Sam James gentoo.org> dev-ml/opam-format/opam-format-2.0.10.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-ml/opam-format/opam-format-2.0.10.ebuild b/dev-ml/opam-format/opam-format-2.0.10.ebuild index 613461beb70d..b2692ce487ac 100644 --- a/dev-ml/opam-format/opam-format-2.0.10.ebuild +++ b/dev-ml/opam-format/opam-format-2.0.10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ OPAM_INSTALLER="${S}/opam-installer" LICENSE="LGPL-2.1" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" IUSE="+ocamlopt test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-format/
commit: ca445e56c260fb6a98c01a78e31bebdb75a0a3df Author: Arthur Zamarin gentoo org> AuthorDate: Sat Nov 19 10:33:42 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat Nov 19 10:33:42 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca445e56 dev-ml/opam-format: Stabilize 2.1.2-r1 ppc64, #859508 Signed-off-by: Arthur Zamarin gentoo.org> dev-ml/opam-format/opam-format-2.1.2-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 395b1ff36aa7..bbcedda93726 100644 --- a/dev-ml/opam-format/opam-format-2.1.2-r1.ebuild +++ b/dev-ml/opam-format/opam-format-2.1.2-r1.ebuild @@ -16,7 +16,7 @@ OPAM_INSTALLER="${S}/opam-installer" LICENSE="LGPL-2.1" SLOT="0/${PV}" -KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" IUSE="+ocamlopt test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-format/
commit: 0d86cce79d508a0fdba04b410ef446c0a133dc4b Author: Arthur Zamarin gentoo org> AuthorDate: Sat Nov 19 10:33:36 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat Nov 19 10:33:36 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d86cce7 dev-ml/opam-format: Stabilize 2.1.2-r1 arm64, #859508 Signed-off-by: Arthur Zamarin gentoo.org> dev-ml/opam-format/opam-format-2.1.2-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 1923ec48647a..395b1ff36aa7 100644 --- a/dev-ml/opam-format/opam-format-2.1.2-r1.ebuild +++ b/dev-ml/opam-format/opam-format-2.1.2-r1.ebuild @@ -16,7 +16,7 @@ OPAM_INSTALLER="${S}/opam-installer" LICENSE="LGPL-2.1" SLOT="0/${PV}" -KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv x86" +KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86" IUSE="+ocamlopt test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-format/
commit: d321eedf1294d6f25d6657cf2b290d4886282ec5 Author: Arthur Zamarin gentoo org> AuthorDate: Sat Nov 19 10:33:31 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat Nov 19 10:33:31 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d321eedf dev-ml/opam-format: Stabilize 2.1.2-r1 arm, #859508 Signed-off-by: Arthur Zamarin gentoo.org> dev-ml/opam-format/opam-format-2.1.2-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 54ee6c913fc1..1923ec48647a 100644 --- a/dev-ml/opam-format/opam-format-2.1.2-r1.ebuild +++ b/dev-ml/opam-format/opam-format-2.1.2-r1.ebuild @@ -16,7 +16,7 @@ OPAM_INSTALLER="${S}/opam-installer" LICENSE="LGPL-2.1" SLOT="0/${PV}" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86" +KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv x86" IUSE="+ocamlopt test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-format/
commit: bee2a5b505f8d20a1fbd0db989ced7fa7ceb0b91 Author: Sam James gentoo org> AuthorDate: Sun Sep 18 00:36:58 2022 + Commit: Sam James gentoo org> CommitDate: Sun Sep 18 00:36:58 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bee2a5b5 dev-ml/opam-format: Stabilize 2.1.2-r1 x86, #859508 Signed-off-by: Sam James gentoo.org> dev-ml/opam-format/opam-format-2.1.2-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 568be296e2c0..54ee6c913fc1 100644 --- a/dev-ml/opam-format/opam-format-2.1.2-r1.ebuild +++ b/dev-ml/opam-format/opam-format-2.1.2-r1.ebuild @@ -16,7 +16,7 @@ OPAM_INSTALLER="${S}/opam-installer" LICENSE="LGPL-2.1" SLOT="0/${PV}" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86" IUSE="+ocamlopt test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-format/
commit: 4fe881b36f9324a7e30ffcdafde8efaa1130b1e0 Author: Sam James gentoo org> AuthorDate: Sun Sep 18 00:36:42 2022 + Commit: Sam James gentoo org> CommitDate: Sun Sep 18 00:36:42 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fe881b3 dev-ml/opam-format: Stabilize 2.1.2-r1 amd64, #859508 Signed-off-by: Sam James gentoo.org> dev-ml/opam-format/opam-format-2.1.2-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index b1a5c43ceb11..568be296e2c0 100644 --- a/dev-ml/opam-format/opam-format-2.1.2-r1.ebuild +++ b/dev-ml/opam-format/opam-format-2.1.2-r1.ebuild @@ -16,7 +16,7 @@ OPAM_INSTALLER="${S}/opam-installer" LICENSE="LGPL-2.1" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" IUSE="+ocamlopt test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-format/
commit: 264919a0d0632b2a0e9d0667022441601f290dd1 Author: Sam James gentoo org> AuthorDate: Sat Jul 23 23:30:08 2022 + Commit: Sam James gentoo org> CommitDate: Sat Jul 23 23:51:55 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=264919a0 dev-ml/opam-format: drop 2.0.8-r2, 2.0.8-r3, 2.1.0, 2.1.1, 2.1.2 Signed-off-by: Sam James gentoo.org> dev-ml/opam-format/Manifest| 3 -- dev-ml/opam-format/opam-format-2.0.8-r2.ebuild | 45 -- dev-ml/opam-format/opam-format-2.0.8-r3.ebuild | 47 --- dev-ml/opam-format/opam-format-2.1.0.ebuild| 53 -- dev-ml/opam-format/opam-format-2.1.1.ebuild| 53 -- dev-ml/opam-format/opam-format-2.1.2.ebuild| 53 -- 6 files changed, 254 deletions(-) diff --git a/dev-ml/opam-format/Manifest b/dev-ml/opam-format/Manifest index 879ecc216aa3..9c8e7ed9b794 100644 --- a/dev-ml/opam-format/Manifest +++ b/dev-ml/opam-format/Manifest @@ -1,7 +1,4 @@ DIST opam-2.0.10.tar.gz 641739 BLAKE2B 7cd201fe6bed2ae81fc8d9d0a7063b284621e579713c2b8672a5ea37cd7516a030367664823c75594a789136ffe5b313818fa120fb64e499b8276706700df776 SHA512 49218a14c3b7e2f47052c1fb6907b54086f5af4adb43d120065c77f2c573d72136ac64f55f577a613eb43ebe29fbe14f9ac0e25756209ca7a572aa35a4410a5d -DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9 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.0.tar.gz 825966 BLAKE2B 42ab8ad2825e4e167618ece7bd2ce77ff055d584039fe2f644fa1c3e99d175cc7047f32bda53599af4fb177d844970883125cebca823024d1bc43a34857f20c5 SHA512 c0060e609c49a12dc8f64accef990aa593db818b72df3984fb9b4b22d8678b46c515916c84134a62dab614c716b61788eadc954d295f32c1f27d38aec22b3edf -DIST opam-2.1.1.tar.gz 818555 BLAKE2B 0f3e94c723774c38a5ad553f58fa796836eb8ef80add977a0e677df026225b5cd737409717026cfbc95388094a0434eb9ff865043c1781eba228f1499c9ab996 SHA512 fb46bc8f12e49c2da95c5f8669f55fb93710ee826827538852c3091ec2c714c082137373fa9e1ad3f53f107b1fae6c2abd0b6e5f84f7756bd3b38e57978f080e DIST opam-2.1.2.tar.gz 818848 BLAKE2B ffb50f3cf1421aa9bff6877d636a3d1d1cc2c2e3961ecd60fcae8a35b069c8d22e7a36bf17cb8166533621a3c85a82195fd3fa646b2fd8dcea9e626b61d5b86c SHA512 bea6f75728a6ef25bcae4f8903dde7a297df7186208dccacb3f58bd6a0caec551c11b79e8544f0983feac038971dbe49481fc405a5962973a5f56ec811abe396 diff --git a/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild b/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild deleted file mode 100644 index 6906d1f9e78b.. --- a/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# 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=" - > "${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.8-r3.ebuild b/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild deleted file mode 100644 index e9c7e673404f.. --- a/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# 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"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-format/
commit: 2c0448a2eaaf845e8a35ee2a3e2782525a8bcc0e Author: Alfredo Tupone gentoo org> AuthorDate: Sun Feb 20 20:53:02 2022 + Commit: Alfredo Tupone gentoo org> CommitDate: Sun Feb 20 20:53:02 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c0448a2 dev-ml/opam-format: add dev-ml/mccs to rdep Closes: https://bugs.gentoo.org/833615 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Alfredo Tupone gentoo.org> dev-ml/opam-format/opam-format-2.1.2-r1.ebuild | 53 ++ 1 file changed, 53 insertions(+) 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 ..caed3309bce2 --- /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 ~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 +}
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-format/
commit: d18179efbe9e9f8768ced90734e9abd4a5f85bf0 Author: Alfredo Tupone gentoo org> AuthorDate: Mon Jan 31 20:19:55 2022 + Commit: Alfredo Tupone gentoo org> CommitDate: Mon Jan 31 20:45:18 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d18179ef dev-ml/opam-format: 2.1.2 bump Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Alfredo Tupone gentoo.org> dev-ml/opam-format/Manifest | 1 + dev-ml/opam-format/opam-format-2.1.2.ebuild | 53 + 2 files changed, 54 insertions(+) diff --git a/dev-ml/opam-format/Manifest b/dev-ml/opam-format/Manifest index f220f1c24723..879ecc216aa3 100644 --- a/dev-ml/opam-format/Manifest +++ b/dev-ml/opam-format/Manifest @@ -4,3 +4,4 @@ DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e5137 DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608 DIST opam-2.1.0.tar.gz 825966 BLAKE2B 42ab8ad2825e4e167618ece7bd2ce77ff055d584039fe2f644fa1c3e99d175cc7047f32bda53599af4fb177d844970883125cebca823024d1bc43a34857f20c5 SHA512 c0060e609c49a12dc8f64accef990aa593db818b72df3984fb9b4b22d8678b46c515916c84134a62dab614c716b61788eadc954d295f32c1f27d38aec22b3edf DIST opam-2.1.1.tar.gz 818555 BLAKE2B 0f3e94c723774c38a5ad553f58fa796836eb8ef80add977a0e677df026225b5cd737409717026cfbc95388094a0434eb9ff865043c1781eba228f1499c9ab996 SHA512 fb46bc8f12e49c2da95c5f8669f55fb93710ee826827538852c3091ec2c714c082137373fa9e1ad3f53f107b1fae6c2abd0b6e5f84f7756bd3b38e57978f080e +DIST opam-2.1.2.tar.gz 818848 BLAKE2B ffb50f3cf1421aa9bff6877d636a3d1d1cc2c2e3961ecd60fcae8a35b069c8d22e7a36bf17cb8166533621a3c85a82195fd3fa646b2fd8dcea9e626b61d5b86c SHA512 bea6f75728a6ef25bcae4f8903dde7a297df7186208dccacb3f58bd6a0caec551c11b79e8544f0983feac038971dbe49481fc405a5962973a5f56ec811abe396 diff --git a/dev-ml/opam-format/opam-format-2.1.2.ebuild b/dev-ml/opam-format/opam-format-2.1.2.ebuild new file mode 100644 index ..4c2a08d6886d --- /dev/null +++ b/dev-ml/opam-format/opam-format-2.1.2.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 ~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 +)" + +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 +}
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-format/
commit: a52e3cabebda9a61d9d020387c79c7445d148e30 Author: Sam James gentoo org> AuthorDate: Tue Jan 18 12:23:40 2022 + Commit: Sam James gentoo org> CommitDate: Tue Jan 18 12:23:40 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a52e3cab dev-ml/opam-format: Stabilize 2.0.9 x86, #817749 Signed-off-by: Sam James gentoo.org> dev-ml/opam-format/opam-format-2.0.9.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ml/opam-format/opam-format-2.0.9.ebuild b/dev-ml/opam-format/opam-format-2.0.9.ebuild index db8f781018d3..6de06692f9c1 100644 --- a/dev-ml/opam-format/opam-format-2.0.9.ebuild +++ b/dev-ml/opam-format/opam-format-2.0.9.ebuild @@ -15,7 +15,7 @@ OPAM_INSTALLER="${S}/opam-installer" LICENSE="LGPL-2.1" SLOT="0/${PV}" -KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86" +KEYWORDS="amd64 arm arm64 ppc ppc64 x86" IUSE="+ocamlopt test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-format/
commit: 3e7e1c884b21f81461235974f76a004501b9db4b Author: Alfredo Tupone gentoo org> AuthorDate: Sun Jan 16 19:05:34 2022 + Commit: Alfredo Tupone gentoo org> CommitDate: Sun Jan 16 19:05:34 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e7e1c88 dev-ml/opam-format: fix test DEPs Closes: https://bugs.gentoo.org/794664 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Alfredo Tupone gentoo.org> dev-ml/opam-format/opam-format-2.0.10.ebuild | 9 +++-- dev-ml/opam-format/opam-format-2.0.8-r2.ebuild | 9 +++-- dev-ml/opam-format/opam-format-2.0.8-r3.ebuild | 9 +++-- dev-ml/opam-format/opam-format-2.0.9.ebuild| 7 ++- dev-ml/opam-format/opam-format-2.1.0.ebuild| 15 +-- dev-ml/opam-format/opam-format-2.1.1.ebuild| 15 +-- 6 files changed, 53 insertions(+), 11 deletions(-) diff --git a/dev-ml/opam-format/opam-format-2.0.10.ebuild b/dev-ml/opam-format/opam-format-2.0.10.ebuild index ace83b9a6ae8..613461beb70d 100644 --- a/dev-ml/opam-format/opam-format-2.0.10.ebuild +++ b/dev-ml/opam-format/opam-format-2.0.10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -16,7 +16,8 @@ OPAM_INSTALLER="${S}/opam-installer" LICENSE="LGPL-2.1" SLOT="0/${PV}" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" -IUSE="+ocamlopt" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" RDEPEND=" ~dev-ml/opam-core-${PV}:= @@ -26,6 +27,10 @@ RDEPEND=" " 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" ) diff --git a/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild b/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild index eb552240221e..d873c3e60ab6 100644 --- a/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild +++ b/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -16,7 +16,8 @@ OPAM_INSTALLER="${S}/opam-installer" LICENSE="LGPL-2.1" SLOT="0/${PV}" KEYWORDS="amd64 arm arm64 ppc ppc64 x86" -IUSE="+ocamlopt" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" RDEPEND=" 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" ) diff --git a/dev-ml/opam-format/opam-format-2.0.9.ebuild b/dev-ml/opam-format/opam-format-2.0.9.ebuild index 0f7882b1d5e3..db8f781018d3 100644 --- a/dev-ml/opam-format/opam-format-2.0.9.ebuild +++ b/dev-ml/opam-format/opam-format-2.0.9.ebuild @@ -16,7 +16,8 @@ OPAM_INSTALLER="${S}/opam-installer" LICENSE="LGPL-2.1" SLOT="0/${PV}" KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86" -IUSE="+ocamlopt" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" RDEPEND=" ~dev-ml/opam-core-${PV}:= @@ -26,6 +27,10 @@ RDEPEND=" " 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" ) diff --git a/dev-ml/opam-format/opam-format-2.1.0.ebuild b/dev-ml/opam-format/opam-format-2.1.0.ebuild index 027845d265fc..4c2a08d6886d 100644 --- a/dev-ml/opam-format/opam-format-2.1.0.ebuild +++ b/dev-ml/opam-format/opam-format-2.1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -17,7 +17,8 @@ OPAM_INSTALLER="${S}/opam-installer" LICENSE="LGPL-2.1" SLOT="0/${PV}" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" -IUSE="+ocamlopt" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" RDEPEND=" ~dev-ml/opam-core-${PV}:= @@ -27,6 +28,10 @@ RDEPEND=" " DEPEND="${RDEPEND} dev-ml/cppo" +BDEPEND="test? ( + sys-apps/bubblewrap + dev-ml/mccs +)" PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch ) @@ -39,4 +44,10 @@ src_prepare() { (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.1.ebuild b/dev-ml/opam-format/opam-format-2.1.1.ebuild index 027845d265fc..4c2a08d6886d 100644 --- a/dev-ml/opam-format/opam-format-2.1.1.ebuild +++ b/dev-ml/opam-format/opam-format-2.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-format/
commit: 032b91f65b3ef54797fe3c909c9c17a15519f3dc Author: Arthur Zamarin gentoo org> AuthorDate: Thu Jan 13 20:24:51 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Thu Jan 13 20:24:58 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=032b91f6 dev-ml/opam-format: Stabilize 2.0.9 ppc64, #817749 Signed-off-by: Arthur Zamarin gentoo.org> dev-ml/opam-format/opam-format-2.0.9.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ml/opam-format/opam-format-2.0.9.ebuild b/dev-ml/opam-format/opam-format-2.0.9.ebuild index 757e70bbc0cb..0f7882b1d5e3 100644 --- a/dev-ml/opam-format/opam-format-2.0.9.ebuild +++ b/dev-ml/opam-format/opam-format-2.0.9.ebuild @@ -15,7 +15,7 @@ OPAM_INSTALLER="${S}/opam-installer" LICENSE="LGPL-2.1" SLOT="0/${PV}" -KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~x86" +KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86" IUSE="+ocamlopt" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-format/
commit: 38a8e3a6602138feef31ff2fa6e68072c7cf6563 Author: Sam James gentoo org> AuthorDate: Thu Jan 13 06:33:21 2022 + Commit: Sam James gentoo org> CommitDate: Thu Jan 13 06:34:23 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38a8e3a6 dev-ml/opam-format: Stabilize 2.0.9 arm64, #817749 Signed-off-by: Sam James gentoo.org> dev-ml/opam-format/opam-format-2.0.9.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ml/opam-format/opam-format-2.0.9.ebuild b/dev-ml/opam-format/opam-format-2.0.9.ebuild index 55a297265d4e..757e70bbc0cb 100644 --- a/dev-ml/opam-format/opam-format-2.0.9.ebuild +++ b/dev-ml/opam-format/opam-format-2.0.9.ebuild @@ -15,7 +15,7 @@ OPAM_INSTALLER="${S}/opam-installer" LICENSE="LGPL-2.1" SLOT="0/${PV}" -KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 ~x86" +KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~x86" IUSE="+ocamlopt" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-format/
commit: 582b24bb2733e080b01c458c99484b7fad6a1fd6 Author: Sam James gentoo org> AuthorDate: Tue Jan 11 00:44:40 2022 + Commit: Sam James gentoo org> CommitDate: Tue Jan 11 00:44:40 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=582b24bb dev-ml/opam-format: Stabilize 2.0.9 amd64, #817749 Signed-off-by: Sam James gentoo.org> dev-ml/opam-format/opam-format-2.0.9.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ml/opam-format/opam-format-2.0.9.ebuild b/dev-ml/opam-format/opam-format-2.0.9.ebuild index 2a086290b998..55a297265d4e 100644 --- a/dev-ml/opam-format/opam-format-2.0.9.ebuild +++ b/dev-ml/opam-format/opam-format-2.0.9.ebuild @@ -15,7 +15,7 @@ OPAM_INSTALLER="${S}/opam-installer" LICENSE="LGPL-2.1" SLOT="0/${PV}" -KEYWORDS="~amd64 arm ~arm64 ppc ~ppc64 ~x86" +KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 ~x86" IUSE="+ocamlopt" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-format/
commit: 63dcd2faa638f1bc8a3d02a26e0d1084a1703e8a Author: Arthur Zamarin gentoo org> AuthorDate: Mon Jan 10 20:07:44 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Mon Jan 10 20:07:44 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63dcd2fa dev-ml/opam-format: Stabilize 2.0.9 ppc, #817749 Signed-off-by: Arthur Zamarin gentoo.org> dev-ml/opam-format/opam-format-2.0.9.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ml/opam-format/opam-format-2.0.9.ebuild b/dev-ml/opam-format/opam-format-2.0.9.ebuild index 827ed6c61393..2a086290b998 100644 --- a/dev-ml/opam-format/opam-format-2.0.9.ebuild +++ b/dev-ml/opam-format/opam-format-2.0.9.ebuild @@ -15,7 +15,7 @@ OPAM_INSTALLER="${S}/opam-installer" LICENSE="LGPL-2.1" SLOT="0/${PV}" -KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 ~x86" +KEYWORDS="~amd64 arm ~arm64 ppc ~ppc64 ~x86" IUSE="+ocamlopt" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-format/
commit: 288631346fc8a234f04c295dc256e4b78f41e642 Author: Arthur Zamarin gentoo org> AuthorDate: Mon Jan 10 19:56:33 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Mon Jan 10 19:56:33 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28863134 dev-ml/opam-format: Stabilize 2.0.9 arm, #817749 Signed-off-by: Arthur Zamarin gentoo.org> dev-ml/opam-format/opam-format-2.0.9.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-ml/opam-format/opam-format-2.0.9.ebuild b/dev-ml/opam-format/opam-format-2.0.9.ebuild index ace83b9a6ae8..827ed6c61393 100644 --- a/dev-ml/opam-format/opam-format-2.0.9.ebuild +++ b/dev-ml/opam-format/opam-format-2.0.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ OPAM_INSTALLER="${S}/opam-installer" LICENSE="LGPL-2.1" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 ~x86" IUSE="+ocamlopt" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-format/
commit: 1d3359ca6c39cb501dd3e91cd7cb98a4b196096f Author: Sam James gentoo org> AuthorDate: Sun Dec 19 11:02:39 2021 + Commit: Sam James gentoo org> CommitDate: Sun Dec 19 11:02:39 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d3359ca dev-ml/opam-format: Stabilize 2.0.8-r3 x86, #804780 Signed-off-by: Sam James gentoo.org> dev-ml/opam-format/opam-format-2.0.8-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild b/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild index a58e8467aae8..32abb96a8b97 100644 --- a/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild +++ b/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild @@ -15,7 +15,7 @@ OPAM_INSTALLER="${S}/opam-installer" LICENSE="LGPL-2.1" SLOT="0/${PV}" -KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86" +KEYWORDS="amd64 arm arm64 ppc ppc64 x86" IUSE="+ocamlopt" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-format/
commit: b6c0dad4c5c045bb6012b4aed1db09fd333413ba Author: Sam James gentoo org> AuthorDate: Sat Nov 6 03:39:09 2021 + Commit: Sam James gentoo org> CommitDate: Sat Nov 6 03:39:09 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6c0dad4 dev-ml/opam-format: fix 2.0.10 Signed-off-by: Sam James gentoo.org> dev-ml/opam-format/opam-format-2.0.10.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-ml/opam-format/opam-format-2.0.10.ebuild b/dev-ml/opam-format/opam-format-2.0.10.ebuild index 027845d265f..ace83b9a6ae 100644 --- a/dev-ml/opam-format/opam-format-2.0.10.ebuild +++ b/dev-ml/opam-format/opam-format-2.0.10.ebuild @@ -10,7 +10,6 @@ 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" @@ -28,7 +27,8 @@ RDEPEND=" DEPEND="${RDEPEND} dev-ml/cppo" -PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch ) +# 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
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-format/
commit: 39bfd96694d31fd78dff9e396fb78dbd21996752 Author: Sam James gentoo org> AuthorDate: Sat Nov 6 03:35:38 2021 + Commit: Sam James gentoo org> CommitDate: Sat Nov 6 03:35:38 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39bfd966 dev-ml/opam-format: add 2.1.1 Signed-off-by: Sam James gentoo.org> dev-ml/opam-format/Manifest | 1 + dev-ml/opam-format/opam-format-2.1.1.ebuild | 42 + 2 files changed, 43 insertions(+) diff --git a/dev-ml/opam-format/Manifest b/dev-ml/opam-format/Manifest index ed498336536..f220f1c2472 100644 --- a/dev-ml/opam-format/Manifest +++ b/dev-ml/opam-format/Manifest @@ -3,3 +3,4 @@ DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716 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.0.tar.gz 825966 BLAKE2B 42ab8ad2825e4e167618ece7bd2ce77ff055d584039fe2f644fa1c3e99d175cc7047f32bda53599af4fb177d844970883125cebca823024d1bc43a34857f20c5 SHA512 c0060e609c49a12dc8f64accef990aa593db818b72df3984fb9b4b22d8678b46c515916c84134a62dab614c716b61788eadc954d295f32c1f27d38aec22b3edf +DIST opam-2.1.1.tar.gz 818555 BLAKE2B 0f3e94c723774c38a5ad553f58fa796836eb8ef80add977a0e677df026225b5cd737409717026cfbc95388094a0434eb9ff865043c1781eba228f1499c9ab996 SHA512 fb46bc8f12e49c2da95c5f8669f55fb93710ee826827538852c3091ec2c714c082137373fa9e1ad3f53f107b1fae6c2abd0b6e5f84f7756bd3b38e57978f080e diff --git a/dev-ml/opam-format/opam-format-2.1.1.ebuild b/dev-ml/opam-format/opam-format-2.1.1.ebuild new file mode 100644 index 000..027845d265f --- /dev/null +++ b/dev-ml/opam-format/opam-format-2.1.1.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2021 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 ~x86" +IUSE="+ocamlopt" + +RDEPEND=" + ~dev-ml/opam-core-${PV}:= + dev-ml/re:= + dev-ml/opam-file-format:= + >=dev-ml/dose3-6.0:= +" +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-33))) +(release + (flags (:standard -warn-error -3-9-33 + EOF +}
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-format/
commit: fd75f7751020272798de7049d63a15b424b61a22 Author: Sam James gentoo org> AuthorDate: Sat Nov 6 03:24:04 2021 + Commit: Sam James gentoo org> CommitDate: Sat Nov 6 03:24:04 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd75f775 dev-ml/opam-format: add 2.0.10 Signed-off-by: Sam James gentoo.org> dev-ml/opam-format/Manifest | 1 + dev-ml/opam-format/opam-format-2.0.10.ebuild | 42 2 files changed, 43 insertions(+) diff --git a/dev-ml/opam-format/Manifest b/dev-ml/opam-format/Manifest index 0b145947da0..ed498336536 100644 --- a/dev-ml/opam-format/Manifest +++ b/dev-ml/opam-format/Manifest @@ -1,3 +1,4 @@ +DIST opam-2.0.10.tar.gz 641739 BLAKE2B 7cd201fe6bed2ae81fc8d9d0a7063b284621e579713c2b8672a5ea37cd7516a030367664823c75594a789136ffe5b313818fa120fb64e499b8276706700df776 SHA512 49218a14c3b7e2f47052c1fb6907b54086f5af4adb43d120065c77f2c573d72136ac64f55f577a613eb43ebe29fbe14f9ac0e25756209ca7a572aa35a4410a5d DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9 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 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 000..027845d265f --- /dev/null +++ b/dev-ml/opam-format/opam-format-2.0.10.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2021 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 ~x86" +IUSE="+ocamlopt" + +RDEPEND=" + ~dev-ml/opam-core-${PV}:= + dev-ml/re:= + dev-ml/opam-file-format:= + >=dev-ml/dose3-6.0:= +" +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-33))) +(release + (flags (:standard -warn-error -3-9-33 + EOF +}
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-format/
commit: a7e4e46e8649e48b8171414227020b94fda9918b Author: Alfredo Tupone gentoo org> AuthorDate: Sun Oct 3 09:54:58 2021 + Commit: Alfredo Tupone gentoo org> CommitDate: Sun Oct 3 09:57:36 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7e4e46e dev-ml/opam-format: src_compile is in dune.eclass Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Alfredo Tupone gentoo.org> dev-ml/opam-format/opam-format-2.0.8-r3.ebuild | 4 dev-ml/opam-format/opam-format-2.0.9.ebuild| 4 dev-ml/opam-format/opam-format-2.1.0.ebuild| 4 3 files changed, 12 deletions(-) diff --git a/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild b/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild index 62d049b4914..a58e8467aae 100644 --- a/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild +++ b/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild @@ -40,7 +40,3 @@ src_prepare() { (flags (:standard -warn-error -3-9-33 EOF } - -src_compile() { - dune build @install --profile release || die -} diff --git a/dev-ml/opam-format/opam-format-2.0.9.ebuild b/dev-ml/opam-format/opam-format-2.0.9.ebuild index ac4e8512b38..ace83b9a6ae 100644 --- a/dev-ml/opam-format/opam-format-2.0.9.ebuild +++ b/dev-ml/opam-format/opam-format-2.0.9.ebuild @@ -40,7 +40,3 @@ src_prepare() { (flags (:standard -warn-error -3-9-33 EOF } - -src_compile() { - dune build @install --profile release || die -} diff --git a/dev-ml/opam-format/opam-format-2.1.0.ebuild b/dev-ml/opam-format/opam-format-2.1.0.ebuild index df17b7bb424..027845d265f 100644 --- a/dev-ml/opam-format/opam-format-2.1.0.ebuild +++ b/dev-ml/opam-format/opam-format-2.1.0.ebuild @@ -40,7 +40,3 @@ src_prepare() { (flags (:standard -warn-error -3-9-33 EOF } - -src_compile() { - dune build @install --profile release || die -}
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-format/files/
commit: 6786a686264306ef0ac86d001a42ab5258c4e3c2 Author: Sam James gentoo org> AuthorDate: Sat Oct 2 21:12:08 2021 + Commit: Sam James gentoo org> CommitDate: Sat Oct 2 21:12:16 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6786a686 dev-ml/opam-format: drop useless patch Signed-off-by: Sam James gentoo.org> .../files/opam-solver-2.1.0-dose3-6.patch | 526 - 1 file changed, 526 deletions(-) diff --git a/dev-ml/opam-format/files/opam-solver-2.1.0-dose3-6.patch b/dev-ml/opam-format/files/opam-solver-2.1.0-dose3-6.patch deleted file mode 100644 index fd613125eed..000 --- a/dev-ml/opam-format/files/opam-solver-2.1.0-dose3-6.patch +++ /dev/null @@ -1,526 +0,0 @@ -https://github.com/ocaml/opam/commit/9082b989f1c039a006fd58672de41f620a330e80 -https://github.com/ocaml/opam/commit/2e03a20abedb40cccb5295361649c64a8df46505 - -From: Kate -Date: Fri, 29 Jan 2021 02:56:21 + -Subject: [PATCH] Make opam-solver compatible with dose3 6.0 - -Dose_algo.Depsolver.check_request_using actually never used its ~criteria argument(!!) :exploding_head: a/src/solver/opamBuiltin0install.ml.real -+++ b/src/solver/opamBuiltin0install.ml.real -@@ -115,4 +115,4 @@ let call ~criteria ?timeout:_ (preamble, universe, request) = - | Error problem -> - log "No solution. Solve took %.2f s" (timer ()); - log ~level:3 "%a" (OpamConsole.slog Opam_0install_cudf.diagnostics) problem; --raise Common.CudfSolver.Unsat -+raise Dose_common.CudfSolver.Unsat a/src/solver/opamBuiltinMccs.ml.real -+++ b/src/solver/opamBuiltinMccs.ml.real -@@ -42,7 +42,7 @@ let call solver_backend ext ~criteria ?timeout cudf = - ~verbose:OpamCoreConfig.(abs !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 None) - a/src/solver/opamBuiltinZ3.ml.real -+++ b/src/solver/opamBuiltinZ3.ml.real -@@ -416,7 +416,7 @@ let call ~criteria ?timeout (preamble, universe, _ as cudf) = - match Z3.Optimize.check opt with - | UNSATISFIABLE -> - log "UNSAT"; --raise Common.CudfSolver.Unsat -+raise Dose_common.CudfSolver.Unsat - | UNKNOWN -> - log "UNKNOWN"; - (try -@@ -433,7 +433,7 @@ let call ~criteria ?timeout (preamble, universe, _ as cudf) = - in - Some preamble, universe - (* with -- * | (Timeout | Common.CudfSolver.Unsat | Failure _) as e -> raise e -+ * | (Timeout | Dose_common.CudfSolver.Unsat | Failure _) as e -> raise e -* | e -> -* OpamConsole.error "Z3 error: %s" (Printexc.to_string e); -* OpamConsole.errmsg "%s" (Printexc.get_backtrace ()); a/src/solver/opamCudf.ml -+++ b/src/solver/opamCudf.ml -@@ -24,7 +24,7 @@ let s_pinned = "pinned" - let s_version_lag = "version-lag" - - let opam_invariant_package_name = -- Common.CudfAdd.encode "=opam-invariant" -+ Dose_common.CudfAdd.encode "=opam-invariant" - - let opam_invariant_package_version = 1 - -@@ -55,7 +55,7 @@ let cudfnv2opam ?version_map ?cudf_universe (name,v) = - match nv with - | Some nv -> nv - | None -> --let name = OpamPackage.Name.of_string (Common.CudfAdd.decode name) in -+let name = OpamPackage.Name.of_string (Dose_common.CudfAdd.decode name) in - match version_map with - | Some vmap -> - let nvset = -@@ -394,7 +394,7 @@ let of_json = Json.package_of_json - (* Graph of cudf packages *) - module Package = struct - type t = Cudf.package -- include Common.CudfAdd -+ include Dose_common.CudfAdd - let to_string = string_of_package - let name_to_string t = t.Cudf.package - let version_to_string t = string_of_int t.Cudf.version -@@ -414,7 +414,7 @@ exception Solver_failure of string - exception Cyclic_actions of Action.t list list - - type conflict_case = -- | Conflict_dep of (unit -> Algo.Diagnostic.reason list) -+ | Conflict_dep of (unit -> Dose_algo.Diagnostic.reason list) - | Conflict_cycle of string list list - type conflict = - Cudf.universe * int package_map * conflict_case -@@ -463,7 +463,7 @@ let strong_and_weak_deps u deps = - (* From a CUDF dependency CNF, extract the set of packages that can possibly be -part of a solution. - -- This is much finer than [Common.CudfAdd.resolve_deps] which doesn't handle -+ This is much finer than [Dose_common.CudfAdd.resolve_deps] which doesn't handle -conjunctions of versions (see [Graph.of_universe] below) *) - let dependency_set u deps = - let strong_deps, weak_deps = strong_and_weak_deps u deps in -@@ -517,18 +517,18 @@ let _rec_strong_dependency_set u deps = - module Graph = struct - - module PG = struct --include Algo.Defaultgraphs.PackageGraph.G -+include Dose_algo.Defaultgraphs.PackageGraph.G - let succ g v = - try succ g v - with e -> OpamStd.Exn.fatal e; [] - end - -- module PO
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-format/files/, dev-ml/opam-format/
commit: 6c1621138cd39610f97da1fedea0e10684691bb1 Author: Sam James gentoo org> AuthorDate: Sat Oct 2 05:51:09 2021 + Commit: Sam James gentoo org> CommitDate: Sat Oct 2 21:10:32 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c162113 dev-ml/opam-format: add 2.1.0 Signed-off-by: Sam James gentoo.org> dev-ml/opam-format/Manifest| 2 + .../files/opam-solver-2.1.0-dose3-6.patch | 526 + dev-ml/opam-format/opam-format-2.1.0.ebuild| 46 ++ 3 files changed, 574 insertions(+) diff --git a/dev-ml/opam-format/Manifest b/dev-ml/opam-format/Manifest index a8c97c7a26f..0b145947da0 100644 --- a/dev-ml/opam-format/Manifest +++ b/dev-ml/opam-format/Manifest @@ -1,2 +1,4 @@ DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9 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.0.tar.gz 825966 BLAKE2B 42ab8ad2825e4e167618ece7bd2ce77ff055d584039fe2f644fa1c3e99d175cc7047f32bda53599af4fb177d844970883125cebca823024d1bc43a34857f20c5 SHA512 c0060e609c49a12dc8f64accef990aa593db818b72df3984fb9b4b22d8678b46c515916c84134a62dab614c716b61788eadc954d295f32c1f27d38aec22b3edf diff --git a/dev-ml/opam-format/files/opam-solver-2.1.0-dose3-6.patch b/dev-ml/opam-format/files/opam-solver-2.1.0-dose3-6.patch new file mode 100644 index 000..fd613125eed --- /dev/null +++ b/dev-ml/opam-format/files/opam-solver-2.1.0-dose3-6.patch @@ -0,0 +1,526 @@ +https://github.com/ocaml/opam/commit/9082b989f1c039a006fd58672de41f620a330e80 +https://github.com/ocaml/opam/commit/2e03a20abedb40cccb5295361649c64a8df46505 + +From: Kate +Date: Fri, 29 Jan 2021 02:56:21 + +Subject: [PATCH] Make opam-solver compatible with dose3 6.0 + +Dose_algo.Depsolver.check_request_using actually never used its ~criteria argument(!!) :exploding_head: +--- a/src/solver/opamBuiltin0install.ml.real b/src/solver/opamBuiltin0install.ml.real +@@ -115,4 +115,4 @@ let call ~criteria ?timeout:_ (preamble, universe, request) = + | Error problem -> + log "No solution. Solve took %.2f s" (timer ()); + log ~level:3 "%a" (OpamConsole.slog Opam_0install_cudf.diagnostics) problem; +-raise Common.CudfSolver.Unsat ++raise Dose_common.CudfSolver.Unsat +--- a/src/solver/opamBuiltinMccs.ml.real b/src/solver/opamBuiltinMccs.ml.real +@@ -42,7 +42,7 @@ let call solver_backend ext ~criteria ?timeout cudf = + ~verbose:OpamCoreConfig.(abs !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 None) + +--- a/src/solver/opamBuiltinZ3.ml.real b/src/solver/opamBuiltinZ3.ml.real +@@ -416,7 +416,7 @@ let call ~criteria ?timeout (preamble, universe, _ as cudf) = + match Z3.Optimize.check opt with + | UNSATISFIABLE -> + log "UNSAT"; +-raise Common.CudfSolver.Unsat ++raise Dose_common.CudfSolver.Unsat + | UNKNOWN -> + log "UNKNOWN"; + (try +@@ -433,7 +433,7 @@ let call ~criteria ?timeout (preamble, universe, _ as cudf) = + in + Some preamble, universe + (* with +- * | (Timeout | Common.CudfSolver.Unsat | Failure _) as e -> raise e ++ * | (Timeout | Dose_common.CudfSolver.Unsat | Failure _) as e -> raise e +* | e -> +* OpamConsole.error "Z3 error: %s" (Printexc.to_string e); +* OpamConsole.errmsg "%s" (Printexc.get_backtrace ()); +--- a/src/solver/opamCudf.ml b/src/solver/opamCudf.ml +@@ -24,7 +24,7 @@ let s_pinned = "pinned" + let s_version_lag = "version-lag" + + let opam_invariant_package_name = +- Common.CudfAdd.encode "=opam-invariant" ++ Dose_common.CudfAdd.encode "=opam-invariant" + + let opam_invariant_package_version = 1 + +@@ -55,7 +55,7 @@ let cudfnv2opam ?version_map ?cudf_universe (name,v) = + match nv with + | Some nv -> nv + | None -> +-let name = OpamPackage.Name.of_string (Common.CudfAdd.decode name) in ++let name = OpamPackage.Name.of_string (Dose_common.CudfAdd.decode name) in + match version_map with + | Some vmap
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-format/
commit: 956aee423bbf22ef1d9d7a8651ecc90f4c38c4d4 Author: Sam James gentoo org> AuthorDate: Sat Oct 2 19:15:49 2021 + Commit: Sam James gentoo org> CommitDate: Sat Oct 2 19:15:49 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=956aee42 dev-ml/opam-format: Stabilize 2.0.8-r3 ppc, #804780 Signed-off-by: Sam James gentoo.org> dev-ml/opam-format/opam-format-2.0.8-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild b/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild index 899302d4ad6..62d049b4914 100644 --- a/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild +++ b/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild @@ -15,7 +15,7 @@ OPAM_INSTALLER="${S}/opam-installer" LICENSE="LGPL-2.1" SLOT="0/${PV}" -KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~x86" +KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86" IUSE="+ocamlopt" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-format/
commit: 16464d48a2022d02ecd140d4d85c04366471c079 Author: Sam James gentoo org> AuthorDate: Sat Oct 2 19:15:37 2021 + Commit: Sam James gentoo org> CommitDate: Sat Oct 2 19:15:37 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16464d48 dev-ml/opam-format: Stabilize 2.0.8-r3 ppc64, #804780 Signed-off-by: Sam James gentoo.org> dev-ml/opam-format/opam-format-2.0.8-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild b/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild index ba754c830bf..899302d4ad6 100644 --- a/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild +++ b/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild @@ -15,7 +15,7 @@ OPAM_INSTALLER="${S}/opam-installer" LICENSE="LGPL-2.1" SLOT="0/${PV}" -KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~x86" IUSE="+ocamlopt" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-format/
commit: 2148768f182ecfd69d45b405d4a7c43666b80f8d Author: Sam James gentoo org> AuthorDate: Sat Oct 2 19:15:25 2021 + Commit: Sam James gentoo org> CommitDate: Sat Oct 2 19:15:25 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2148768f dev-ml/opam-format: Stabilize 2.0.8-r3 arm, #804780 Signed-off-by: Sam James gentoo.org> dev-ml/opam-format/opam-format-2.0.8-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild b/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild index 4914104430c..ba754c830bf 100644 --- a/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild +++ b/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild @@ -15,7 +15,7 @@ OPAM_INSTALLER="${S}/opam-installer" LICENSE="LGPL-2.1" SLOT="0/${PV}" -KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~x86" IUSE="+ocamlopt" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-format/
commit: a18ecb8b03acd2c557c2c11303af3a6d291ce398 Author: Alfredo Tupone gentoo org> AuthorDate: Fri Oct 1 18:08:36 2021 + Commit: Alfredo Tupone gentoo org> CommitDate: Fri Oct 1 18:08:36 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a18ecb8b dev-ml/opam-format: build with ocaml-4.12 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Alfredo Tupone gentoo.org> dev-ml/opam-format/opam-format-2.0.8-r2.ebuild | 1 + dev-ml/opam-format/opam-format-2.0.8-r3.ebuild | 4 dev-ml/opam-format/opam-format-2.0.9.ebuild| 4 3 files changed, 9 insertions(+) diff --git a/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild b/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild index 54b3b0ce46d..eb552240221 100644 --- a/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild +++ b/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild @@ -19,6 +19,7 @@ KEYWORDS="amd64 arm arm64 ppc ppc64 x86" IUSE="+ocamlopt" RDEPEND=" +
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-format/
commit: 02b0ed12df1837b4e6cd4387e0c62a6ab5351a7a Author: Sam James gentoo org> AuthorDate: Wed Jul 28 02:21:01 2021 + Commit: Sam James gentoo org> CommitDate: Wed Jul 28 02:21:01 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02b0ed12 dev-ml/opam-format: add 2.0.9 Signed-off-by: Sam James gentoo.org> dev-ml/opam-format/Manifest | 1 + dev-ml/opam-format/opam-format-2.0.9.ebuild | 42 + 2 files changed, 43 insertions(+) diff --git a/dev-ml/opam-format/Manifest b/dev-ml/opam-format/Manifest index 6022b2986d9..a8c97c7a26f 100644 --- a/dev-ml/opam-format/Manifest +++ b/dev-ml/opam-format/Manifest @@ -1 +1,2 @@ DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9 +DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e513736a27904a4e471d1eaf432db72998251ac786cb8fbf1ad425fff42b772c5d26934e0929aae75c0946d4659 SHA512 0d8ee19ac0f3df9de4fd9cfa8daab1f7228f090f5e2e7e26bedf24d8c2ab377aade95048f2d7cd9ee9dbbe738729e26dc99f41f730fa2252df74953362464a22 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 000..ace83b9a6ae --- /dev/null +++ b/dev-ml/opam-format/opam-format-2.0.9.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2021 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" + +RDEPEND=" + ~dev-ml/opam-core-${PV}:= + dev-ml/re:= + dev-ml/opam-file-format:= + >=dev-ml/dose3-6.0:= +" +DEPEND="${RDEPEND} + dev-ml/cppo" + +# 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 +}
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-format/
commit: 53df4e2413122fd8976b100ab5b94ada63dfb7dd Author: Sam James gentoo org> AuthorDate: Wed Jul 28 01:47:43 2021 + Commit: Sam James gentoo org> CommitDate: Wed Jul 28 01:47:43 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53df4e24 dev-ml/opam-format: Keyword 2.0.8-r3 x86, #788406 Signed-off-by: Sam James gentoo.org> dev-ml/opam-format/opam-format-2.0.8-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild b/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild index e6950762f67..ace83b9a6ae 100644 --- a/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild +++ b/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild @@ -15,7 +15,7 @@ OPAM_INSTALLER="${S}/opam-installer" LICENSE="LGPL-2.1" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" IUSE="+ocamlopt" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-format/
commit: d1fd5a49793271f4bd3f3c0e0458d50a39686238 Author: Sam James gentoo org> AuthorDate: Tue Jun 8 04:12:13 2021 + Commit: Sam James gentoo org> CommitDate: Tue Jun 8 04:12:13 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1fd5a49 dev-ml/opam-format: restore keywords for arm/arm64/ppc/ppc64 Bug: https://bugs.gentoo.org/794844 Signed-off-by: Sam James gentoo.org> dev-ml/opam-format/opam-format-2.0.8-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild b/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild index 14bac276fd5..e6950762f67 100644 --- a/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild +++ b/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild @@ -15,7 +15,7 @@ OPAM_INSTALLER="${S}/opam-installer" LICENSE="LGPL-2.1" SLOT="0/${PV}" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64" IUSE="+ocamlopt" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-format/, dev-ml/opam-format/files/
commit: 8ecc12752fc010ffab88cba03a3923674a3da448 Author: Hank Leininger korelogic com> AuthorDate: Wed May 5 05:03:02 2021 + Commit: Sam James gentoo org> CommitDate: Sun Jun 6 23:55:14 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ecc1275 dev-ml/opam-format: patch for dose3-6.x compat Lifted from Debian, see https://bugs.debian.org/982733 Signed-off-by: Hank Leininger korelogic.com> Closes: https://bugs.gentoo.org/788265 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Sam James gentoo.org> .../files/debian-Port-to-Dose3-6.0.1.patch | 142 + dev-ml/opam-format/opam-format-2.0.8-r3.ebuild | 42 ++ 2 files changed, 184 insertions(+) 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 000..a8af27416df --- /dev/null +++ b/dev-ml/opam-format/files/debian-Port-to-Dose3-6.0.1.patch @@ -0,0 +1,142 @@ +From: Mehdi Dogguy +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) = +
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-format/
commit: 0ac66fe0e518bbe8b89ca9cf5596e0ae561979b4 Author: Sam James gentoo org> AuthorDate: Sun Mar 14 00:44:49 2021 + Commit: Sam James gentoo org> CommitDate: Sun Mar 14 00:47:55 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ac66fe0 dev-ml/opam-format: Stabilize 2.0.8-r2 arm64, #772833 Signed-off-by: Sam James gentoo.org> dev-ml/opam-format/opam-format-2.0.8-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild b/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild index 8dc859904d6..54b3b0ce46d 100644 --- a/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild +++ b/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild @@ -15,7 +15,7 @@ OPAM_INSTALLER="${S}/opam-installer" LICENSE="LGPL-2.1" SLOT="0/${PV}" -KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86" +KEYWORDS="amd64 arm arm64 ppc ppc64 x86" IUSE="+ocamlopt" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-format/
commit: 2d756e00a4032a71092bacd3287f07f8c31cae15 Author: Sam James gentoo org> AuthorDate: Sat Mar 13 14:05:14 2021 + Commit: Sam James gentoo org> CommitDate: Sat Mar 13 14:05:14 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d756e00 dev-ml/opam-format: Stabilize 2.0.8-r2 ppc64, #772833 Signed-off-by: Sam James gentoo.org> dev-ml/opam-format/opam-format-2.0.8-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild b/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild index a7654582b1e..e1906db0196 100644 --- a/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild +++ b/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild @@ -15,7 +15,7 @@ OPAM_INSTALLER="${S}/opam-installer" LICENSE="LGPL-2.1" SLOT="0/${PV}" -KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86" +KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86" IUSE="+ocamlopt" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-format/
commit: 4f6fd966418cc72a246633b596068b2610986592 Author: Agostino Sarubbo gentoo org> AuthorDate: Thu Mar 4 14:27:56 2021 + Commit: Agostino Sarubbo gentoo org> CommitDate: Thu Mar 4 14:27:56 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f6fd966 dev-ml/opam-format: amd64 stable wrt bug #772833 Package-Manager: Portage-3.0.13, Repoman-3.0.2 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> dev-ml/opam-format/opam-format-2.0.8-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild b/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild index 6be6a83ee02..a7654582b1e 100644 --- a/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild +++ b/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild @@ -15,7 +15,7 @@ OPAM_INSTALLER="${S}/opam-installer" LICENSE="LGPL-2.1" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 x86" +KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86" IUSE="+ocamlopt" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-format/
commit: 257a3e280bcf076515c23731411a8a501ef7a564 Author: Sam James gentoo org> AuthorDate: Thu Feb 25 17:54:10 2021 + Commit: Sam James gentoo org> CommitDate: Thu Feb 25 17:54:10 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=257a3e28 dev-ml/opam-format: Stabilize 2.0.8-r2 x86, #772833 Signed-off-by: Sam James gentoo.org> dev-ml/opam-format/opam-format-2.0.8-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild b/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild index b9af718bfa6..6be6a83ee02 100644 --- a/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild +++ b/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild @@ -15,7 +15,7 @@ OPAM_INSTALLER="${S}/opam-installer" LICENSE="LGPL-2.1" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 x86" IUSE="+ocamlopt" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-format/
commit: 2e3189258f7ad5a2991d34c99fbbf270be50d9c4 Author: Sam James gentoo org> AuthorDate: Thu Feb 25 13:09:05 2021 + Commit: Sam James gentoo org> CommitDate: Thu Feb 25 13:09:05 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e318925 dev-ml/opam-format: Stabilize 2.0.8-r2 ppc, #772833 Signed-off-by: Sam James gentoo.org> dev-ml/opam-format/opam-format-2.0.8-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild b/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild index e92ea2cca83..b9af718bfa6 100644 --- a/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild +++ b/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild @@ -15,7 +15,7 @@ OPAM_INSTALLER="${S}/opam-installer" LICENSE="LGPL-2.1" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 ~x86" IUSE="+ocamlopt" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-format/
commit: d63673f78d81714142aea062e1bdd8ac2c9b4132 Author: Sam James gentoo org> AuthorDate: Thu Feb 11 06:31:24 2021 + Commit: Sam James gentoo org> CommitDate: Thu Feb 11 06:31:24 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d63673f7 dev-ml/opam-format: Stabilize 2.0.7-r2 ppc, #769317 Signed-off-by: Sam James gentoo.org> dev-ml/opam-format/opam-format-2.0.7-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ml/opam-format/opam-format-2.0.7-r2.ebuild b/dev-ml/opam-format/opam-format-2.0.7-r2.ebuild index 9247bf0d126..0b5aefeaae8 100644 --- a/dev-ml/opam-format/opam-format-2.0.7-r2.ebuild +++ b/dev-ml/opam-format/opam-format-2.0.7-r2.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.ta LICENSE="LGPL-2.1" SLOT="0/${PV}" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86" +KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86" RDEPEND=" ~dev-ml/opam-core-${PV}:=
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-format/
commit: 98dc946e0ad6a644e1357403f4e9edcfe3ff0a05 Author: Sam James gentoo org> AuthorDate: Thu Feb 11 06:25:38 2021 + Commit: Sam James gentoo org> CommitDate: Thu Feb 11 06:25:38 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98dc946e dev-ml/opam-format: Stabilize 2.0.7-r2 x86, #769317 Signed-off-by: Sam James gentoo.org> dev-ml/opam-format/opam-format-2.0.7-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ml/opam-format/opam-format-2.0.7-r2.ebuild b/dev-ml/opam-format/opam-format-2.0.7-r2.ebuild index 1e21324f736..9247bf0d126 100644 --- a/dev-ml/opam-format/opam-format-2.0.7-r2.ebuild +++ b/dev-ml/opam-format/opam-format-2.0.7-r2.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.ta LICENSE="LGPL-2.1" SLOT="0/${PV}" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86" RDEPEND=" ~dev-ml/opam-core-${PV}:=
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-format/
commit: 8fca6d57a742ab8664fcdc641b5d86c5044ec808 Author: Sam James gentoo org> AuthorDate: Wed Feb 10 18:53:08 2021 + Commit: Sam James gentoo org> CommitDate: Wed Feb 10 18:53:08 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fca6d57 dev-ml/opam-format: Stabilize 2.0.7-r2 amd64, #769317 Signed-off-by: Sam James gentoo.org> dev-ml/opam-format/opam-format-2.0.7-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ml/opam-format/opam-format-2.0.7-r2.ebuild b/dev-ml/opam-format/opam-format-2.0.7-r2.ebuild index c8663d80812..1e21324f736 100644 --- a/dev-ml/opam-format/opam-format-2.0.7-r2.ebuild +++ b/dev-ml/opam-format/opam-format-2.0.7-r2.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.ta LICENSE="LGPL-2.1" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ppc64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~x86" RDEPEND=" ~dev-ml/opam-core-${PV}:=
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-format/
commit: f4add1f47b3a54849ca63f9d17f711ae8a3f Author: Sam James gentoo org> AuthorDate: Wed Feb 10 16:32:53 2021 + Commit: Sam James gentoo org> CommitDate: Wed Feb 10 16:32:53 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4ad dev-ml/opam-format: Stabilize 2.0.7-r2 ppc64, #769317 Signed-off-by: Sam James gentoo.org> dev-ml/opam-format/opam-format-2.0.7-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ml/opam-format/opam-format-2.0.7-r2.ebuild b/dev-ml/opam-format/opam-format-2.0.7-r2.ebuild index e0026d8f570..c8663d80812 100644 --- a/dev-ml/opam-format/opam-format-2.0.7-r2.ebuild +++ b/dev-ml/opam-format/opam-format-2.0.7-r2.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.ta LICENSE="LGPL-2.1" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ppc64 ~x86" RDEPEND=" ~dev-ml/opam-core-${PV}:=
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-format/
commit: 5975705be1e7e25ac5be1757abc07642abead01d Author: Sam James gentoo org> AuthorDate: Tue Feb 9 22:47:35 2021 + Commit: Sam James gentoo org> CommitDate: Tue Feb 9 22:47:44 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5975705b dev-ml/opam-format: add dev-ml/dose3 dep Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Sam James gentoo.org> .../{opam-format-2.0.7-r1.ebuild => opam-format-2.0.7-r2.ebuild} | 1 + .../{opam-format-2.0.8-r1.ebuild => opam-format-2.0.8-r2.ebuild} | 1 + 2 files changed, 2 insertions(+) diff --git a/dev-ml/opam-format/opam-format-2.0.7-r1.ebuild b/dev-ml/opam-format/opam-format-2.0.7-r2.ebuild similarity index 98% rename from dev-ml/opam-format/opam-format-2.0.7-r1.ebuild rename to dev-ml/opam-format/opam-format-2.0.7-r2.ebuild index d0390991ada..e0026d8f570 100644 --- a/dev-ml/opam-format/opam-format-2.0.7-r1.ebuild +++ b/dev-ml/opam-format/opam-format-2.0.7-r2.ebuild @@ -20,6 +20,7 @@ RDEPEND=" ~dev-ml/opam-core-${PV}:= dev-ml/re:= dev-ml/opam-file-format:= + dev-ml/dose3:= " DEPEND="${RDEPEND} dev-ml/cppo" diff --git a/dev-ml/opam-format/opam-format-2.0.8-r1.ebuild b/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild similarity index 98% rename from dev-ml/opam-format/opam-format-2.0.8-r1.ebuild rename to dev-ml/opam-format/opam-format-2.0.8-r2.ebuild index 7f5cab5ac53..e92ea2cca83 100644 --- a/dev-ml/opam-format/opam-format-2.0.8-r1.ebuild +++ b/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild @@ -22,6 +22,7 @@ RDEPEND=" ~dev-ml/opam-core-${PV}:= dev-ml/re:= dev-ml/opam-file-format:= + dev-ml/dose3:= " DEPEND="${RDEPEND} dev-ml/cppo"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-format/
commit: 7d78b39fad925d82b97779d844cc81494ec4d607 Author: Sam James gentoo org> AuthorDate: Tue Feb 9 19:48:41 2021 + Commit: Sam James gentoo org> CommitDate: Tue Feb 9 19:53:22 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d78b39f dev-ml/opam-format: fix opam-installer usage Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Sam James gentoo.org> .../{opam-format-2.0.8.ebuild => opam-format-2.0.8-r1.ebuild} | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dev-ml/opam-format/opam-format-2.0.8.ebuild b/dev-ml/opam-format/opam-format-2.0.8-r1.ebuild similarity index 92% rename from dev-ml/opam-format/opam-format-2.0.8.ebuild rename to dev-ml/opam-format/opam-format-2.0.8-r1.ebuild index 760515d954c..7f5cab5ac53 100644 --- a/dev-ml/opam-format/opam-format-2.0.8.ebuild +++ b/dev-ml/opam-format/opam-format-2.0.8-r1.ebuild @@ -10,7 +10,8 @@ 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/_/-}" +S="${WORKDIR}/opam-${PV}" +OPAM_INSTALLER="${S}/opam-installer" LICENSE="LGPL-2.1" SLOT="0/${PV}"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-format/
commit: 5c5b9bba4d7733a0d058a909d119a28976e50da7 Author: Sam James gentoo org> AuthorDate: Mon Feb 8 17:15:33 2021 + Commit: Sam James gentoo org> CommitDate: Mon Feb 8 17:20:56 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c5b9bba dev-ml/opam-format: fix deps Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Sam James gentoo.org> .../{opam-format-2.0.7.ebuild => opam-format-2.0.7-r1.ebuild}| 5 ++--- dev-ml/opam-format/opam-format-2.0.8.ebuild | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dev-ml/opam-format/opam-format-2.0.7.ebuild b/dev-ml/opam-format/opam-format-2.0.7-r1.ebuild similarity index 95% rename from dev-ml/opam-format/opam-format-2.0.7.ebuild rename to dev-ml/opam-format/opam-format-2.0.7-r1.ebuild index 03f9db26f55..d0390991ada 100644 --- a/dev-ml/opam-format/opam-format-2.0.7.ebuild +++ b/dev-ml/opam-format/opam-format-2.0.7-r1.ebuild @@ -15,11 +15,10 @@ SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.ta LICENSE="LGPL-2.1" SLOT="0/${PV}" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" -IUSE="" RDEPEND=" - dev-ml/opam-core:= - dev-ml/re:= + ~dev-ml/opam-core-${PV}:= + dev-ml/re:= dev-ml/opam-file-format:= " DEPEND="${RDEPEND} diff --git a/dev-ml/opam-format/opam-format-2.0.8.ebuild b/dev-ml/opam-format/opam-format-2.0.8.ebuild index 39b0eba048b..760515d954c 100644 --- a/dev-ml/opam-format/opam-format-2.0.8.ebuild +++ b/dev-ml/opam-format/opam-format-2.0.8.ebuild @@ -5,7 +5,6 @@ EAPI=7 # We are opam OPAM_INSTALLER_DEP=" " -#OPAM_INSTALLER="${S}/opam-installer" inherit dune DESCRIPTION="Core libraries for opam"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-format/
commit: ffd7defa6b33da13c35a17684b811ded15339a0b Author: Sam James gentoo org> AuthorDate: Mon Feb 8 16:53:59 2021 + Commit: Sam James gentoo org> CommitDate: Mon Feb 8 17:20:52 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffd7defa dev-ml/opam-format: bump to 2.0.8 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Sam James gentoo.org> dev-ml/opam-format/Manifest | 1 + dev-ml/opam-format/opam-format-2.0.8.ebuild | 38 + 2 files changed, 39 insertions(+) diff --git a/dev-ml/opam-format/Manifest b/dev-ml/opam-format/Manifest index db4db56c08e..39fe274747d 100644 --- a/dev-ml/opam-format/Manifest +++ b/dev-ml/opam-format/Manifest @@ -1 +1,2 @@ DIST opam-2.0.7.tar.gz 636708 BLAKE2B 2824a5c53f4103c267f99ae10f55df740b3afcc033321e888133817c0e53c4a8fc31738338df3d6d9ff8755987e85ade4a4726be98f77b06b81ffc1476d02c3d SHA512 2ade3998a94333a5a838b55e229ab0c707e678481cae892980b986fb86f39163070a9b7d3e0e87879cd57b91a33bf6a3e15f3786c3510a635e59383782218f1d +DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9 diff --git a/dev-ml/opam-format/opam-format-2.0.8.ebuild b/dev-ml/opam-format/opam-format-2.0.8.ebuild new file mode 100644 index 000..39b0eba048b --- /dev/null +++ b/dev-ml/opam-format/opam-format-2.0.8.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# We are opam +OPAM_INSTALLER_DEP=" " +#OPAM_INSTALLER="${S}/opam-installer" +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/_/-}" + +LICENSE="LGPL-2.1" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="+ocamlopt" + +RDEPEND=" + ~dev-ml/opam-core-${PV}:= + dev-ml/re:= + dev-ml/opam-file-format:= +" +DEPEND="${RDEPEND} + dev-ml/cppo" + +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 +}
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-format/
commit: 6ba885a94fd9b3eef9532c7788c7f92772116f93 Author: Alfredo Tupone gentoo org> AuthorDate: Wed Jan 27 19:21:30 2021 + Commit: Alfredo Tupone gentoo org> CommitDate: Wed Jan 27 19:21:56 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ba885a9 dev-ml/opam-format: fix dep Closes: https://bugs.gentoo.org/750986 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Alfredo Tupone gentoo.org> dev-ml/opam-format/metadata.xml | 4 dev-ml/opam-format/opam-format-2.0.7.ebuild | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dev-ml/opam-format/metadata.xml b/dev-ml/opam-format/metadata.xml index 970e090f0df..856df00497e 100644 --- a/dev-ml/opam-format/metadata.xml +++ b/dev-ml/opam-format/metadata.xml @@ -1,6 +1,10 @@ http://www.gentoo.org/dtd/metadata.dtd;> + + m...@gentoo.org + ML + gie...@gentoo.org Mark Wright diff --git a/dev-ml/opam-format/opam-format-2.0.7.ebuild b/dev-ml/opam-format/opam-format-2.0.7.ebuild index e163f465ffa..03f9db26f55 100644 --- a/dev-ml/opam-format/opam-format-2.0.7.ebuild +++ b/dev-ml/opam-format/opam-format-2.0.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -22,7 +22,8 @@ RDEPEND=" dev-ml/re:= dev-ml/opam-file-format:= " -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + dev-ml/cppo" S="${WORKDIR}/opam-${PV/_/-}" OPAM_INSTALLER="${S}/opam-installer"