Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

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: Thu, 07 Oct 2021 01:45:33
Message-Id: 1633571025.8cfd40d7cf6b67d78c9496ce0c0320562567e634.sam@gentoo
1 commit: 8cfd40d7cf6b67d78c9496ce0c0320562567e634
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Thu Oct 7 01:43:05 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Thu Oct 7 01:43:45 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cfd40d7
7
8 dev-ml/camlp4: fix collision with newer findlib
9
10 Closes: https://bugs.gentoo.org/803275
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 dev-ml/camlp4/camlp4-4.05_p1-r1.ebuild | 8 +++++++-
14 dev-ml/camlp4/{camlp4-4.09_p1.ebuild => camlp4-4.09_p1-r1.ebuild} | 8 +++++++-
15 .../camlp4/{camlp4-4.10_p1-r1.ebuild => camlp4-4.10_p1-r2.ebuild} | 8 +++++++-
16 dev-ml/camlp4/{camlp4-4.13.ebuild => camlp4-4.11_p1-r2.ebuild} | 8 +++++++-
17 dev-ml/camlp4/{camlp4-4.12.ebuild => camlp4-4.12-r1.ebuild} | 8 +++++++-
18 dev-ml/camlp4/{camlp4-4.11_p1-r1.ebuild => camlp4-4.13-r1.ebuild} | 8 +++++++-
19 6 files changed, 42 insertions(+), 6 deletions(-)
20
21 diff --git a/dev-ml/camlp4/camlp4-4.05_p1-r1.ebuild b/dev-ml/camlp4/camlp4-4.05_p1-r1.ebuild
22 index 8133a505cfb..f750a91aeb9 100644
23 --- a/dev-ml/camlp4/camlp4-4.05_p1-r1.ebuild
24 +++ b/dev-ml/camlp4/camlp4-4.05_p1-r1.ebuild
25 @@ -18,7 +18,8 @@ IUSE="+ocamlopt"
26 DEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
27 RDEPEND="${DEPEND}"
28 DEPEND="${DEPEND}
29 - dev-ml/ocamlbuild"
30 + dev-ml/ocamlbuild
31 + dev-ml/findlib:="
32
33 src_configure() {
34 ./configure \
35 @@ -38,4 +39,9 @@ src_compile() {
36 src_install() {
37 emake DESTDIR="${D}" install install-META
38 dodoc CHANGES.md README.md
39 +
40 + if has_version ">=dev-ml/findlib-1.9" ; then
41 + # See bug #803275
42 + rm "${ED}/usr/$(get_libdir)/ocaml/camlp4/META" || die
43 + fi
44 }
45
46 diff --git a/dev-ml/camlp4/camlp4-4.09_p1.ebuild b/dev-ml/camlp4/camlp4-4.09_p1-r1.ebuild
47 similarity index 83%
48 rename from dev-ml/camlp4/camlp4-4.09_p1.ebuild
49 rename to dev-ml/camlp4/camlp4-4.09_p1-r1.ebuild
50 index 80481b707c6..767b8bdf4e5 100644
51 --- a/dev-ml/camlp4/camlp4-4.09_p1.ebuild
52 +++ b/dev-ml/camlp4/camlp4-4.09_p1-r1.ebuild
53 @@ -18,7 +18,8 @@ IUSE="+ocamlopt"
54 DEPEND="dev-lang/ocaml:0/4.09[ocamlopt?]"
55 RDEPEND="${DEPEND}"
56 DEPEND="${DEPEND}
57 - dev-ml/ocamlbuild"
58 + dev-ml/ocamlbuild
59 + dev-ml/findlib:="
60
61 S=${WORKDIR}/${P/_p/-}
62 PATCHES=( "${FILESDIR}/reload.patch" )
63 @@ -41,4 +42,9 @@ src_compile() {
64 src_install() {
65 emake DESTDIR="${D}" install install-META
66 dodoc CHANGES.md README.md
67 +
68 + if has_version ">=dev-ml/findlib-1.9" ; then
69 + # See bug #803275
70 + rm "${ED}/usr/$(get_libdir)/ocaml/camlp4/META" || die
71 + fi
72 }
73
74 diff --git a/dev-ml/camlp4/camlp4-4.10_p1-r1.ebuild b/dev-ml/camlp4/camlp4-4.10_p1-r2.ebuild
75 similarity index 83%
76 rename from dev-ml/camlp4/camlp4-4.10_p1-r1.ebuild
77 rename to dev-ml/camlp4/camlp4-4.10_p1-r2.ebuild
78 index d7ad1f1cfbb..7e7539c01f6 100644
79 --- a/dev-ml/camlp4/camlp4-4.10_p1-r1.ebuild
80 +++ b/dev-ml/camlp4/camlp4-4.10_p1-r2.ebuild
81 @@ -18,7 +18,8 @@ IUSE="+ocamlopt"
82 DEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
83 RDEPEND="${DEPEND}"
84 DEPEND="${DEPEND}
85 - dev-ml/ocamlbuild"
86 + dev-ml/ocamlbuild
87 + dev-ml/findlib:="
88
89 S=${WORKDIR}/${P/_p/-}
90 PATCHES=( "${FILESDIR}/reload.patch" )
91 @@ -41,4 +42,9 @@ src_compile() {
92 src_install() {
93 emake DESTDIR="${D}" install install-META
94 dodoc CHANGES.md README.md
95 +
96 + if has_version ">=dev-ml/findlib-1.9" ; then
97 + # See bug #803275
98 + rm "${ED}/usr/$(get_libdir)/ocaml/camlp4/META" || die
99 + fi
100 }
101
102 diff --git a/dev-ml/camlp4/camlp4-4.13.ebuild b/dev-ml/camlp4/camlp4-4.11_p1-r2.ebuild
103 similarity index 84%
104 rename from dev-ml/camlp4/camlp4-4.13.ebuild
105 rename to dev-ml/camlp4/camlp4-4.11_p1-r2.ebuild
106 index 8162ce77f93..ea9f15d7475 100644
107 --- a/dev-ml/camlp4/camlp4-4.13.ebuild
108 +++ b/dev-ml/camlp4/camlp4-4.11_p1-r2.ebuild
109 @@ -18,7 +18,8 @@ IUSE="+ocamlopt"
110 DEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
111 RDEPEND="${DEPEND}"
112 DEPEND="${DEPEND}
113 - dev-ml/ocamlbuild"
114 + dev-ml/ocamlbuild
115 + dev-ml/findlib:="
116
117 QA_FLAGS_IGNORED='.*'
118
119 @@ -43,4 +44,9 @@ src_compile() {
120 src_install() {
121 emake DESTDIR="${D}" install install-META
122 dodoc CHANGES.md README.md
123 +
124 + if has_version ">=dev-ml/findlib-1.9" ; then
125 + # See bug #803275
126 + rm "${ED}/usr/$(get_libdir)/ocaml/camlp4/META" || die
127 + fi
128 }
129
130 diff --git a/dev-ml/camlp4/camlp4-4.12.ebuild b/dev-ml/camlp4/camlp4-4.12-r1.ebuild
131 similarity index 83%
132 rename from dev-ml/camlp4/camlp4-4.12.ebuild
133 rename to dev-ml/camlp4/camlp4-4.12-r1.ebuild
134 index 8162ce77f93..983c54d23b7 100644
135 --- a/dev-ml/camlp4/camlp4-4.12.ebuild
136 +++ b/dev-ml/camlp4/camlp4-4.12-r1.ebuild
137 @@ -18,7 +18,8 @@ IUSE="+ocamlopt"
138 DEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
139 RDEPEND="${DEPEND}"
140 DEPEND="${DEPEND}
141 - dev-ml/ocamlbuild"
142 + dev-ml/ocamlbuild
143 + dev-ml/findlib:="
144
145 QA_FLAGS_IGNORED='.*'
146
147 @@ -43,4 +44,9 @@ src_compile() {
148 src_install() {
149 emake DESTDIR="${D}" install install-META
150 dodoc CHANGES.md README.md
151 +
152 + if has_version ">=dev-ml/findlib-1.9" ; then
153 + # See bug #803275
154 + rm "${ED}/usr/$(get_libdir)/ocaml/camlp4/META" || die
155 + fi
156 }
157
158 diff --git a/dev-ml/camlp4/camlp4-4.11_p1-r1.ebuild b/dev-ml/camlp4/camlp4-4.13-r1.ebuild
159 similarity index 83%
160 rename from dev-ml/camlp4/camlp4-4.11_p1-r1.ebuild
161 rename to dev-ml/camlp4/camlp4-4.13-r1.ebuild
162 index 8162ce77f93..983c54d23b7 100644
163 --- a/dev-ml/camlp4/camlp4-4.11_p1-r1.ebuild
164 +++ b/dev-ml/camlp4/camlp4-4.13-r1.ebuild
165 @@ -18,7 +18,8 @@ IUSE="+ocamlopt"
166 DEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
167 RDEPEND="${DEPEND}"
168 DEPEND="${DEPEND}
169 - dev-ml/ocamlbuild"
170 + dev-ml/ocamlbuild
171 + dev-ml/findlib:="
172
173 QA_FLAGS_IGNORED='.*'
174
175 @@ -43,4 +44,9 @@ src_compile() {
176 src_install() {
177 emake DESTDIR="${D}" install install-META
178 dodoc CHANGES.md README.md
179 +
180 + if has_version ">=dev-ml/findlib-1.9" ; then
181 + # See bug #803275
182 + rm "${ED}/usr/$(get_libdir)/ocaml/camlp4/META" || die
183 + fi
184 }
Report Message
Find on MARC Find on Google Groups