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

Gentoo Archives: gentoo-commits

From: Brian Evans <grknight@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/xsb/
Date: Fri, 08 Feb 2019 19:45:55
Message-Id: 1549655133.4002726612dc74a26a1f9d3ce35fbae7e37df854.grknight@gentoo
1 commit: 4002726612dc74a26a1f9d3ce35fbae7e37df854
2 Author: Brian Evans <grknight <AT> gentoo <DOT> org>
3 AuthorDate: Fri Feb 8 19:45:33 2019 +0000
4 Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
5 CommitDate: Fri Feb 8 19:45:33 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40027266
7
8 dev-lang/xsb: Revbumps for EAPI and dependencies
9
10 Non-maintainer commit
11
12 Bug: https://bugs.gentoo.org/665870
13 Package-Manager: Portage-2.3.59, Repoman-2.3.12
14 Signed-off-by: Brian Evans <grknight <AT> gentoo.org>
15
16 .../xsb/{xsb-3.7.0.ebuild => xsb-3.6.0-r1.ebuild} | 97 +++++++++++-----------
17 .../xsb/{xsb-3.7.0.ebuild => xsb-3.7.0-r1.ebuild} | 93 ++++++++++-----------
18 2 files changed, 92 insertions(+), 98 deletions(-)
19
20 diff --git a/dev-lang/xsb/xsb-3.7.0.ebuild b/dev-lang/xsb/xsb-3.6.0-r1.ebuild
21 similarity index 63%
22 copy from dev-lang/xsb/xsb-3.7.0.ebuild
23 copy to dev-lang/xsb/xsb-3.6.0-r1.ebuild
24 index 8bd4db509d0..b33ce06c15c 100644
25 --- a/dev-lang/xsb/xsb-3.7.0.ebuild
26 +++ b/dev-lang/xsb/xsb-3.6.0-r1.ebuild
27 @@ -1,13 +1,13 @@
28 -# Copyright 1999-2017 Gentoo Foundation
29 +# Copyright 1999-2019 Gentoo Authors
30 # Distributed under the terms of the GNU General Public License v2
31
32 -EAPI=5
33 +EAPI=6
34
35 MY_P="XSB${PV//./}"
36
37 -PATCHSET_VER="3"
38 +PATCHSET_VER="4"
39
40 -inherit eutils autotools java-pkg-opt-2
41 +inherit autotools java-pkg-opt-2
42
43 DESCRIPTION="XSB is a logic programming and deductive database system"
44 HOMEPAGE="http://xsb.sourceforge.net"
45 @@ -22,7 +22,7 @@ IUSE="curl debug iodbc java mysql odbc pcre threads xml"
46 RDEPEND="curl? ( net-misc/curl )
47 iodbc? ( dev-db/libiodbc )
48 java? ( >=virtual/jdk-1.4:= )
49 - mysql? ( virtual/mysql )
50 + mysql? ( dev-db/mysql-connector-c:0= )
51 odbc? ( dev-db/unixODBC )
52 pcre? ( dev-libs/libpcre )
53 xml? ( dev-libs/libxml2 )"
54 @@ -31,13 +31,10 @@ DEPEND="${RDEPEND}"
55
56 S="${WORKDIR}"/XSB
57
58 -src_prepare() {
59 - EPATCH_FORCE=yes
60 - EPATCH_SUFFIX=patch
61 - if [[ -d "${WORKDIR}"/${PV} ]] ; then
62 - epatch "${WORKDIR}"/${PV}
63 - fi
64 +PATCHES=( "${WORKDIR}/${PV}" )
65
66 +src_prepare() {
67 + default
68 cd "${S}"/build
69 eautoconf
70 }
71 @@ -61,7 +58,7 @@ src_configure() {
72
73 if use mysql ; then
74 cd "${S}"/packages/dbdrivers/mysql
75 - econf
76 + econf --with-mysql-libdir=$(mysql_config --variable=pkglibdir)
77 fi
78
79 if use odbc ; then
80 @@ -83,120 +80,120 @@ src_configure() {
81 src_compile() {
82 cd "${S}"/build
83
84 - emake || die "emake failed"
85 + default
86
87 # All XSB Packages are compiled using a single Prolog engine.
88 # Consequently they must all be compiled using a single make job.
89
90 cd "${S}"/packages
91 rm -f *.xwam
92 - emake -j1 || die "emake packages failed"
93 + emake -j1
94
95 if use curl ; then
96 - emake -j1 curl || die "emake curl package failed"
97 - emake -j1 sgml || die "emake sgml package failed"
98 + emake -j1 curl
99 + emake -j1 sgml
100 if use xml ; then
101 - emake -j1 xpath || die "emake xpath package failed"
102 + emake -j1 xpath
103 fi
104 fi
105
106 if use mysql ; then
107 - emake -j1 mysql || die "emake mysql package failed"
108 + emake -j1 mysql
109 fi
110
111 if use odbc ; then
112 - emake -j1 odbc || die "emake odbc package failed"
113 + emake -j1 odbc
114 fi
115
116 if use pcre ; then
117 - emake -j1 pcre || die "emake pcre package failed"
118 + emake -j1 pcre
119 fi
120 }
121
122 src_install() {
123 cd "${S}"/build
124 - emake DESTDIR="${D}" install || die "make install failed"
125 + default
126
127 local XSB_INSTALL_DIR=/usr/$(get_libdir)/xsb-${PV}
128 - dosym ${XSB_INSTALL_DIR}/bin/xsb /usr/bin/xsb || die
129 + dosym ${XSB_INSTALL_DIR}/bin/xsb /usr/bin/xsb
130
131 cd "${S}"/packages
132 local PACKAGES=${XSB_INSTALL_DIR}/packages
133 insinto ${PACKAGES}
134 - doins *.xwam || die
135 + doins *.xwam
136
137 insinto ${PACKAGES}/chr
138 - doins chr/*.xwam || die
139 + doins chr/*.xwam
140
141 insinto ${PACKAGES}/clpqr
142 - doins clpqr/*.xwam || die
143 + doins clpqr/*.xwam
144
145 insinto ${PACKAGES}/gap
146 - doins gap/*.xwam || die
147 + doins gap/*.xwam
148
149 insinto ${PACKAGES}/justify
150 - doins justify/*.xwam || die
151 - doins justify/*.H || die
152 + doins justify/*.xwam
153 + doins justify/*.H
154
155 insinto ${PACKAGES}/regmatch
156 - doins regmatch/*.xwam || die
157 + doins regmatch/*.xwam
158 insinto ${PACKAGES}/regmatch/cc
159 - doins regmatch/cc/*.H || die
160 + doins regmatch/cc/*.H
161
162 insinto ${PACKAGES}/slx
163 - doins slx/*.xwam || die
164 + doins slx/*.xwam
165
166 insinto ${PACKAGES}/wildmatch
167 - doins wildmatch/*.xwam || die
168 + doins wildmatch/*.xwam
169 insinto ${PACKAGES}/wildmatch/cc
170 - doins wildmatch/cc/*.H || die
171 + doins wildmatch/cc/*.H
172
173 if use curl ; then
174 insinto ${PACKAGES}/curl
175 - doins curl/*.xwam || die
176 + doins curl/*.xwam
177 insinto ${PACKAGES}/curl/cc
178 - doins curl/cc/*.H || die
179 + doins curl/cc/*.H
180 insinto ${PACKAGES}/sgml
181 - doins sgml/*.xwam || die
182 + doins sgml/*.xwam
183 insinto ${PACKAGES}/sgml/cc
184 - doins sgml/cc/*.H || die
185 + doins sgml/cc/*.H
186 insinto ${PACKAGES}/sgml/cc/dtd
187 - doins sgml/cc/dtd/* || die
188 + doins sgml/cc/dtd/*
189 if use xml ; then
190 insinto ${PACKAGES}/xpath
191 - doins xpath/*xwam || die
192 + doins xpath/*xwam
193 insinto ${PACKAGES}/xpath/cc
194 - doins xpath/cc/*.H || die
195 + doins xpath/cc/*.H
196 fi
197 fi
198
199 if use mysql || use odbc ; then
200 insinto ${PACKAGES}/dbdrivers
201 - doins dbdrivers/*.xwam || die
202 - doins dbdrivers/*.H || die
203 + doins dbdrivers/*.xwam
204 + doins dbdrivers/*.H
205 insinto ${PACKAGES}/dbdrivers/cc
206 - doins dbdrivers/cc/*.H || die
207 + doins dbdrivers/cc/*.H
208 if use mysql ; then
209 insinto ${PACKAGES}/dbdrivers/mysql
210 - doins dbdrivers/mysql/*.xwam || die
211 + doins dbdrivers/mysql/*.xwam
212 insinto ${PACKAGES}/dbdrivers/mysql/cc
213 - doins dbdrivers/mysql/cc/*.H || die
214 + doins dbdrivers/mysql/cc/*.H
215 fi
216 if use odbc ; then
217 insinto ${PACKAGES}/dbdrivers/odbc
218 - doins dbdrivers/odbc/*.xwam || die
219 + doins dbdrivers/odbc/*.xwam
220 insinto ${PACKAGES}/dbdrivers/odbc/cc
221 - doins dbdrivers/odbc/cc/*.H || die
222 + doins dbdrivers/odbc/cc/*.H
223 fi
224 fi
225
226 if use pcre ; then
227 insinto ${PACKAGES}/pcre
228 - doins pcre/*.xwam || die
229 + doins pcre/*.xwam
230 insinto ${PACKAGES}/pcre/cc
231 - doins pcre/cc/*.H || die
232 + doins pcre/cc/*.H
233 fi
234
235 cd "${S}"
236 - dodoc FAQ README || die
237 + dodoc FAQ README
238 }
239
240 diff --git a/dev-lang/xsb/xsb-3.7.0.ebuild b/dev-lang/xsb/xsb-3.7.0-r1.ebuild
241 similarity index 63%
242 rename from dev-lang/xsb/xsb-3.7.0.ebuild
243 rename to dev-lang/xsb/xsb-3.7.0-r1.ebuild
244 index 8bd4db509d0..983c93a7be4 100644
245 --- a/dev-lang/xsb/xsb-3.7.0.ebuild
246 +++ b/dev-lang/xsb/xsb-3.7.0-r1.ebuild
247 @@ -1,13 +1,13 @@
248 -# Copyright 1999-2017 Gentoo Foundation
249 +# Copyright 1999-2019 Gentoo Authors
250 # Distributed under the terms of the GNU General Public License v2
251
252 -EAPI=5
253 +EAPI=6
254
255 MY_P="XSB${PV//./}"
256
257 PATCHSET_VER="3"
258
259 -inherit eutils autotools java-pkg-opt-2
260 +inherit autotools java-pkg-opt-2
261
262 DESCRIPTION="XSB is a logic programming and deductive database system"
263 HOMEPAGE="http://xsb.sourceforge.net"
264 @@ -22,7 +22,7 @@ IUSE="curl debug iodbc java mysql odbc pcre threads xml"
265 RDEPEND="curl? ( net-misc/curl )
266 iodbc? ( dev-db/libiodbc )
267 java? ( >=virtual/jdk-1.4:= )
268 - mysql? ( virtual/mysql )
269 + mysql? ( dev-db/mysql-connector-c:0= )
270 odbc? ( dev-db/unixODBC )
271 pcre? ( dev-libs/libpcre )
272 xml? ( dev-libs/libxml2 )"
273 @@ -31,13 +31,10 @@ DEPEND="${RDEPEND}"
274
275 S="${WORKDIR}"/XSB
276
277 -src_prepare() {
278 - EPATCH_FORCE=yes
279 - EPATCH_SUFFIX=patch
280 - if [[ -d "${WORKDIR}"/${PV} ]] ; then
281 - epatch "${WORKDIR}"/${PV}
282 - fi
283 +PATCHES=( "${WORKDIR}/${PV}" )
284
285 +src_prepare() {
286 + default
287 cd "${S}"/build
288 eautoconf
289 }
290 @@ -83,120 +80,120 @@ src_configure() {
291 src_compile() {
292 cd "${S}"/build
293
294 - emake || die "emake failed"
295 + default
296
297 # All XSB Packages are compiled using a single Prolog engine.
298 # Consequently they must all be compiled using a single make job.
299
300 cd "${S}"/packages
301 rm -f *.xwam
302 - emake -j1 || die "emake packages failed"
303 + emake -j1
304
305 if use curl ; then
306 - emake -j1 curl || die "emake curl package failed"
307 - emake -j1 sgml || die "emake sgml package failed"
308 + emake -j1 curl
309 + emake -j1 sgml
310 if use xml ; then
311 - emake -j1 xpath || die "emake xpath package failed"
312 + emake -j1 xpath
313 fi
314 fi
315
316 if use mysql ; then
317 - emake -j1 mysql || die "emake mysql package failed"
318 + emake -j1 mysql
319 fi
320
321 if use odbc ; then
322 - emake -j1 odbc || die "emake odbc package failed"
323 + emake -j1 odbc
324 fi
325
326 if use pcre ; then
327 - emake -j1 pcre || die "emake pcre package failed"
328 + emake -j1 pcre
329 fi
330 }
331
332 src_install() {
333 cd "${S}"/build
334 - emake DESTDIR="${D}" install || die "make install failed"
335 + default
336
337 local XSB_INSTALL_DIR=/usr/$(get_libdir)/xsb-${PV}
338 - dosym ${XSB_INSTALL_DIR}/bin/xsb /usr/bin/xsb || die
339 + dosym ${XSB_INSTALL_DIR}/bin/xsb /usr/bin/xsb
340
341 cd "${S}"/packages
342 local PACKAGES=${XSB_INSTALL_DIR}/packages
343 insinto ${PACKAGES}
344 - doins *.xwam || die
345 + doins *.xwam
346
347 insinto ${PACKAGES}/chr
348 - doins chr/*.xwam || die
349 + doins chr/*.xwam
350
351 insinto ${PACKAGES}/clpqr
352 - doins clpqr/*.xwam || die
353 + doins clpqr/*.xwam
354
355 insinto ${PACKAGES}/gap
356 - doins gap/*.xwam || die
357 + doins gap/*.xwam
358
359 insinto ${PACKAGES}/justify
360 - doins justify/*.xwam || die
361 - doins justify/*.H || die
362 + doins justify/*.xwam
363 + doins justify/*.H
364
365 insinto ${PACKAGES}/regmatch
366 - doins regmatch/*.xwam || die
367 + doins regmatch/*.xwam
368 insinto ${PACKAGES}/regmatch/cc
369 - doins regmatch/cc/*.H || die
370 + doins regmatch/cc/*.H
371
372 insinto ${PACKAGES}/slx
373 - doins slx/*.xwam || die
374 + doins slx/*.xwam
375
376 insinto ${PACKAGES}/wildmatch
377 - doins wildmatch/*.xwam || die
378 + doins wildmatch/*.xwam
379 insinto ${PACKAGES}/wildmatch/cc
380 - doins wildmatch/cc/*.H || die
381 + doins wildmatch/cc/*.H
382
383 if use curl ; then
384 insinto ${PACKAGES}/curl
385 - doins curl/*.xwam || die
386 + doins curl/*.xwam
387 insinto ${PACKAGES}/curl/cc
388 - doins curl/cc/*.H || die
389 + doins curl/cc/*.H
390 insinto ${PACKAGES}/sgml
391 - doins sgml/*.xwam || die
392 + doins sgml/*.xwam
393 insinto ${PACKAGES}/sgml/cc
394 - doins sgml/cc/*.H || die
395 + doins sgml/cc/*.H
396 insinto ${PACKAGES}/sgml/cc/dtd
397 - doins sgml/cc/dtd/* || die
398 + doins sgml/cc/dtd/*
399 if use xml ; then
400 insinto ${PACKAGES}/xpath
401 - doins xpath/*xwam || die
402 + doins xpath/*xwam
403 insinto ${PACKAGES}/xpath/cc
404 - doins xpath/cc/*.H || die
405 + doins xpath/cc/*.H
406 fi
407 fi
408
409 if use mysql || use odbc ; then
410 insinto ${PACKAGES}/dbdrivers
411 - doins dbdrivers/*.xwam || die
412 - doins dbdrivers/*.H || die
413 + doins dbdrivers/*.xwam
414 + doins dbdrivers/*.H
415 insinto ${PACKAGES}/dbdrivers/cc
416 - doins dbdrivers/cc/*.H || die
417 + doins dbdrivers/cc/*.H
418 if use mysql ; then
419 insinto ${PACKAGES}/dbdrivers/mysql
420 - doins dbdrivers/mysql/*.xwam || die
421 + doins dbdrivers/mysql/*.xwam
422 insinto ${PACKAGES}/dbdrivers/mysql/cc
423 - doins dbdrivers/mysql/cc/*.H || die
424 + doins dbdrivers/mysql/cc/*.H
425 fi
426 if use odbc ; then
427 insinto ${PACKAGES}/dbdrivers/odbc
428 - doins dbdrivers/odbc/*.xwam || die
429 + doins dbdrivers/odbc/*.xwam
430 insinto ${PACKAGES}/dbdrivers/odbc/cc
431 - doins dbdrivers/odbc/cc/*.H || die
432 + doins dbdrivers/odbc/cc/*.H
433 fi
434 fi
435
436 if use pcre ; then
437 insinto ${PACKAGES}/pcre
438 - doins pcre/*.xwam || die
439 + doins pcre/*.xwam
440 insinto ${PACKAGES}/pcre/cc
441 - doins pcre/cc/*.H || die
442 + doins pcre/cc/*.H
443 fi
444
445 cd "${S}"
446 - dodoc FAQ README || die
447 + dodoc FAQ README
448 }
Report Message
Find on MARC Find on Google Groups