commit: 660e8b9da0de345fde4d04c17e13b82d05f42dcf Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed Jun 9 21:41:32 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Jun 9 21:41:32 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=660e8b9d
dev-ml/camlp4: add subslot dep on OCaml major version Needs to be exactly aligned with OCaml major version. Closes: https://bugs.gentoo.org/794898 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-ml/camlp4/{camlp4-4.05_p1.ebuild => camlp4-4.05_p1-r1.ebuild} | 4 ++-- dev-ml/camlp4/{camlp4-4.08_p1.ebuild => camlp4-4.08_p1-r1.ebuild} | 2 +- dev-ml/camlp4/{camlp4-4.10_p1.ebuild => camlp4-4.10_p1-r1.ebuild} | 4 ++-- dev-ml/camlp4/{camlp4-4.11_p1.ebuild => camlp4-4.11_p1-r1.ebuild} | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dev-ml/camlp4/camlp4-4.05_p1.ebuild b/dev-ml/camlp4/camlp4-4.05_p1-r1.ebuild similarity index 92% rename from dev-ml/camlp4/camlp4-4.05_p1.ebuild rename to dev-ml/camlp4/camlp4-4.05_p1-r1.ebuild index e3f1c78d6c1..c7f37c50a7d 100644 --- a/dev-ml/camlp4/camlp4-4.05_p1.ebuild +++ b/dev-ml/camlp4/camlp4-4.05_p1-r1.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 @@ -15,7 +15,7 @@ SLOT="0/${PV}" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" IUSE="+ocamlopt" -DEPEND="=dev-lang/ocaml-4.05*:=[ocamlopt?]" +DEPEND="dev-lang/ocaml:0/4.05[ocamlopt?]" RDEPEND="${DEPEND}" DEPEND="${DEPEND} dev-ml/ocamlbuild" diff --git a/dev-ml/camlp4/camlp4-4.08_p1.ebuild b/dev-ml/camlp4/camlp4-4.08_p1-r1.ebuild similarity index 95% rename from dev-ml/camlp4/camlp4-4.08_p1.ebuild rename to dev-ml/camlp4/camlp4-4.08_p1-r1.ebuild index 06769da466c..ab9c9e3c267 100644 --- a/dev-ml/camlp4/camlp4-4.08_p1.ebuild +++ b/dev-ml/camlp4/camlp4-4.08_p1-r1.ebuild @@ -16,7 +16,7 @@ SLOT="0/${PV}" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux" IUSE="+ocamlopt" -DEPEND="~dev-lang/ocaml-4.09.0:=[ocamlopt?]" +DEPEND="dev-lang/ocaml:0/4.08[ocamlopt?]" RDEPEND="${DEPEND}" DEPEND="${DEPEND} dev-ml/ocamlbuild" diff --git a/dev-ml/camlp4/camlp4-4.10_p1.ebuild b/dev-ml/camlp4/camlp4-4.10_p1-r1.ebuild similarity index 92% rename from dev-ml/camlp4/camlp4-4.10_p1.ebuild rename to dev-ml/camlp4/camlp4-4.10_p1-r1.ebuild index b80025c98ba..53a6a66d6b4 100644 --- a/dev-ml/camlp4/camlp4-4.10_p1.ebuild +++ b/dev-ml/camlp4/camlp4-4.10_p1-r1.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 @@ -15,7 +15,7 @@ SLOT="0/${PV}" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" IUSE="+ocamlopt" -DEPEND=">=dev-lang/ocaml-4.10.0:=[ocamlopt?]" +DEPEND="dev-lang/ocaml:0/4.10[ocamlopt?]" RDEPEND="${DEPEND}" DEPEND="${DEPEND} dev-ml/ocamlbuild" diff --git a/dev-ml/camlp4/camlp4-4.11_p1.ebuild b/dev-ml/camlp4/camlp4-4.11_p1-r1.ebuild similarity index 95% rename from dev-ml/camlp4/camlp4-4.11_p1.ebuild rename to dev-ml/camlp4/camlp4-4.11_p1-r1.ebuild index f50ced55ac7..7def8b41a1d 100644 --- a/dev-ml/camlp4/camlp4-4.11_p1.ebuild +++ b/dev-ml/camlp4/camlp4-4.11_p1-r1.ebuild @@ -15,7 +15,7 @@ SLOT="0/${PV}" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" IUSE="+ocamlopt" -DEPEND=">=dev-lang/ocaml-4.11.0:=[ocamlopt?]" +DEPEND="dev-lang/ocaml:0/4.11[ocamlopt?]" RDEPEND="${DEPEND}" DEPEND="${DEPEND} dev-ml/ocamlbuild"
