Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ml/camlp4/
Date: Wed, 09 Jun 2021 21:45:31
Message-Id: 1623274892.660e8b9da0de345fde4d04c17e13b82d05f42dcf.sam@gentoo
1 commit: 660e8b9da0de345fde4d04c17e13b82d05f42dcf
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jun 9 21:41:32 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 9 21:41:32 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=660e8b9d
7
8 dev-ml/camlp4: add subslot dep on OCaml major version
9
10 Needs to be exactly aligned with OCaml major version.
11
12 Closes: https://bugs.gentoo.org/794898
13 Signed-off-by: Sam James <sam <AT> gentoo.org>
14
15 dev-ml/camlp4/{camlp4-4.05_p1.ebuild => camlp4-4.05_p1-r1.ebuild} | 4 ++--
16 dev-ml/camlp4/{camlp4-4.08_p1.ebuild => camlp4-4.08_p1-r1.ebuild} | 2 +-
17 dev-ml/camlp4/{camlp4-4.10_p1.ebuild => camlp4-4.10_p1-r1.ebuild} | 4 ++--
18 dev-ml/camlp4/{camlp4-4.11_p1.ebuild => camlp4-4.11_p1-r1.ebuild} | 2 +-
19 4 files changed, 6 insertions(+), 6 deletions(-)
20
21 diff --git a/dev-ml/camlp4/camlp4-4.05_p1.ebuild b/dev-ml/camlp4/camlp4-4.05_p1-r1.ebuild
22 similarity index 92%
23 rename from dev-ml/camlp4/camlp4-4.05_p1.ebuild
24 rename to dev-ml/camlp4/camlp4-4.05_p1-r1.ebuild
25 index e3f1c78d6c1..c7f37c50a7d 100644
26 --- a/dev-ml/camlp4/camlp4-4.05_p1.ebuild
27 +++ b/dev-ml/camlp4/camlp4-4.05_p1-r1.ebuild
28 @@ -1,4 +1,4 @@
29 -# Copyright 1999-2020 Gentoo Authors
30 +# Copyright 1999-2021 Gentoo Authors
31 # Distributed under the terms of the GNU General Public License v2
32
33 EAPI=7
34 @@ -15,7 +15,7 @@ SLOT="0/${PV}"
35 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
36 IUSE="+ocamlopt"
37
38 -DEPEND="=dev-lang/ocaml-4.05*:=[ocamlopt?]"
39 +DEPEND="dev-lang/ocaml:0/4.05[ocamlopt?]"
40 RDEPEND="${DEPEND}"
41 DEPEND="${DEPEND}
42 dev-ml/ocamlbuild"
43
44 diff --git a/dev-ml/camlp4/camlp4-4.08_p1.ebuild b/dev-ml/camlp4/camlp4-4.08_p1-r1.ebuild
45 similarity index 95%
46 rename from dev-ml/camlp4/camlp4-4.08_p1.ebuild
47 rename to dev-ml/camlp4/camlp4-4.08_p1-r1.ebuild
48 index 06769da466c..ab9c9e3c267 100644
49 --- a/dev-ml/camlp4/camlp4-4.08_p1.ebuild
50 +++ b/dev-ml/camlp4/camlp4-4.08_p1-r1.ebuild
51 @@ -16,7 +16,7 @@ SLOT="0/${PV}"
52 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
53 IUSE="+ocamlopt"
54
55 -DEPEND="~dev-lang/ocaml-4.09.0:=[ocamlopt?]"
56 +DEPEND="dev-lang/ocaml:0/4.08[ocamlopt?]"
57 RDEPEND="${DEPEND}"
58 DEPEND="${DEPEND}
59 dev-ml/ocamlbuild"
60
61 diff --git a/dev-ml/camlp4/camlp4-4.10_p1.ebuild b/dev-ml/camlp4/camlp4-4.10_p1-r1.ebuild
62 similarity index 92%
63 rename from dev-ml/camlp4/camlp4-4.10_p1.ebuild
64 rename to dev-ml/camlp4/camlp4-4.10_p1-r1.ebuild
65 index b80025c98ba..53a6a66d6b4 100644
66 --- a/dev-ml/camlp4/camlp4-4.10_p1.ebuild
67 +++ b/dev-ml/camlp4/camlp4-4.10_p1-r1.ebuild
68 @@ -1,4 +1,4 @@
69 -# Copyright 1999-2020 Gentoo Authors
70 +# Copyright 1999-2021 Gentoo Authors
71 # Distributed under the terms of the GNU General Public License v2
72
73 EAPI=7
74 @@ -15,7 +15,7 @@ SLOT="0/${PV}"
75 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
76 IUSE="+ocamlopt"
77
78 -DEPEND=">=dev-lang/ocaml-4.10.0:=[ocamlopt?]"
79 +DEPEND="dev-lang/ocaml:0/4.10[ocamlopt?]"
80 RDEPEND="${DEPEND}"
81 DEPEND="${DEPEND}
82 dev-ml/ocamlbuild"
83
84 diff --git a/dev-ml/camlp4/camlp4-4.11_p1.ebuild b/dev-ml/camlp4/camlp4-4.11_p1-r1.ebuild
85 similarity index 95%
86 rename from dev-ml/camlp4/camlp4-4.11_p1.ebuild
87 rename to dev-ml/camlp4/camlp4-4.11_p1-r1.ebuild
88 index f50ced55ac7..7def8b41a1d 100644
89 --- a/dev-ml/camlp4/camlp4-4.11_p1.ebuild
90 +++ b/dev-ml/camlp4/camlp4-4.11_p1-r1.ebuild
91 @@ -15,7 +15,7 @@ SLOT="0/${PV}"
92 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
93 IUSE="+ocamlopt"
94
95 -DEPEND=">=dev-lang/ocaml-4.11.0:=[ocamlopt?]"
96 +DEPEND="dev-lang/ocaml:0/4.11[ocamlopt?]"
97 RDEPEND="${DEPEND}"
98 DEPEND="${DEPEND}
99 dev-ml/ocamlbuild"