Gentoo Archives: gentoo-commits

From: Rafael Martins <rafaelmartins@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/lua/
Date: Mon, 23 Jan 2017 03:55:01
Message-Id: 1485142760.fe7d52f325f78a08e74d66883bf29624e9181c8e.rafaelmartins@gentoo
1 commit: fe7d52f325f78a08e74d66883bf29624e9181c8e
2 Author: Rafael Martins <rafaelmartins <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 23 03:38:52 2017 +0000
4 Commit: Rafael Martins <rafaelmartins <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 23 03:39:20 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe7d52f3
7
8 dev-lang/lua: cleanup wrt bug #520480
9
10 Package-Manager: portage-2.2.28
11
12 dev-lang/lua/Manifest | 1 -
13 dev-lang/lua/lua-5.1.4-r8.ebuild | 124 ------------------------------------
14 dev-lang/lua/lua-5.1.5-r1.ebuild | 119 -----------------------------------
15 dev-lang/lua/lua-5.1.5-r2.ebuild | 124 ------------------------------------
16 dev-lang/lua/lua-5.1.5-r3.ebuild | 133 ---------------------------------------
17 dev-lang/lua/lua-5.1.5.ebuild | 119 -----------------------------------
18 6 files changed, 620 deletions(-)
19
20 diff --git a/dev-lang/lua/Manifest b/dev-lang/lua/Manifest
21 index 52b6621..e73f574 100644
22 --- a/dev-lang/lua/Manifest
23 +++ b/dev-lang/lua/Manifest
24 @@ -1,4 +1,3 @@
25 -DIST lua-5.1.4.tar.gz 216679 SHA256 b038e225eaf2a5b57c9bcc35cd13aa8c6c8288ef493d52970c9545074098af3a SHA512 bc542fe8535826ac1e49b03a8f238cf049724b02c14718f8162cfeaf735a5e6c58412ff18dbe7a38e4cc4433f3d1e702554e9b24b5f021634b4280880980f40f WHIRLPOOL 2d8fdf77e31314eed68d8ace368a62a608a58114bea5c8797a2e2d327ca870dd4450ede494733d49c97bb447c97adf08610027df3206999a35fb49cde77448fd
26 DIST lua-5.1.5.tar.gz 221213 SHA256 2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333 SHA512 0142fefcbd13afcd9b201403592aa60620011cc8e8559d4d2db2f92739d18186860989f48caa45830ff4f99bfc7483287fd3ff3a16d4dec928e2767ce4d542a9 WHIRLPOOL 9dac93b73b9ad1ef6c69e0aa11fb53d5efe89274b65c55a1ac30bab23e8a255851b0e44306db54212b1d481e658cecd38e5ff22a25e1fa974858b7b03fb45b75
27 DIST lua-5.2.3.tar.gz 251195 SHA256 13c2fb97961381f7d06d5b5cea55b743c163800896fd5c5e2356201d3619002d SHA512 264bb7c8db2f190ef0ca38584ec81999ab588f54e03119c5214c40bb8925b0eb407fac483a03e40cc8a220f6748ddff7d3a7392da3803418276b0d263b866449 WHIRLPOOL d278a1e38416bcf7f82eb3e7fd5fb423e60ccb69e9d57a937070516ff8be2d19a98bbfdaf37ec6fd6fb3ef2d625900977ca0cb47e46cb0ede5ebd5d37a9454ef
28 DIST lua-5.3.3.tar.gz 294290 SHA256 5113c06884f7de453ce57702abaac1d618307f33f6789fa870e87a59d772aca2 SHA512 7b8122ed48ea2a9faa47d1b69b4a5b1523bb7be67e78f252bb4339bf75e957a88c5405156e22b4b63ccf607a5407bf017a4cee1ce12b1aa5262047655960a3cc WHIRLPOOL e9d58093327e3c67e167dad9952796f1f2f0dbfa4f165c0ec5a8808a6a73d3b25e564797a2804d408bdaeb7229e7684f907491137d4521119ba918ce87c781bc
29
30 diff --git a/dev-lang/lua/lua-5.1.4-r8.ebuild b/dev-lang/lua/lua-5.1.4-r8.ebuild
31 deleted file mode 100644
32 index 3a4bbf1..00000000
33 --- a/dev-lang/lua/lua-5.1.4-r8.ebuild
34 +++ /dev/null
35 @@ -1,124 +0,0 @@
36 -# Copyright 1999-2012 Gentoo Foundation
37 -# Distributed under the terms of the GNU General Public License v2
38 -# $Id$
39 -
40 -EAPI=4
41 -
42 -inherit eutils multilib portability toolchain-funcs versionator
43 -
44 -DESCRIPTION="A powerful light-weight programming language designed for extending applications"
45 -HOMEPAGE="http://www.lua.org/"
46 -SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
47 -
48 -LICENSE="MIT"
49 -SLOT="0"
50 -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~ppc-aix ~x64-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
51 -IUSE="+deprecated emacs readline static"
52 -
53 -RDEPEND="readline? ( sys-libs/readline )"
54 -DEPEND="${RDEPEND}
55 - sys-devel/libtool"
56 -PDEPEND="emacs? ( app-emacs/lua-mode )"
57 -
58 -src_prepare() {
59 - local PATCH_PV=$(get_version_component_range 1-2)
60 -
61 - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r1.patch
62 - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-module_paths.patch
63 -
64 - # use glibtool on Darwin (versus Apple libtool)
65 - if [[ ${CHOST} == *-darwin* ]] ; then
66 - sed -i -e '/LIBTOOL = /s:libtool:glibtool:' \
67 - Makefile src/Makefile || die
68 - fi
69 -
70 - EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch
71 -
72 - # correct lua versioning
73 - sed -i -e 's/\(LIB_VERSION = \)6:1:1/\16:4:1/' src/Makefile
74 -
75 - sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html
76 -
77 - if ! use deprecated ; then
78 - epatch "${FILESDIR}"/${P}-deprecated.patch
79 - epatch "${FILESDIR}"/${P}-test.patch
80 - fi
81 -
82 - if ! use readline ; then
83 - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-readline.patch
84 - fi
85 -
86 - # Using dynamic linked lua is not recommended for performance
87 - # reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
88 - # Mainly, this is of concern if your arch is poor with GPRs, like x86
89 - # Note that this only affects the interpreter binary (named lua), not the lua
90 - # compiler (built statically) nor the lua libraries (both shared and static
91 - # are installed)
92 - if use static ; then
93 - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make_static-r1.patch
94 - fi
95 -
96 - # We want packages to find our things...
97 - sed -i \
98 - -e "s:/usr/local:${EPREFIX}/usr:" \
99 - -e "s:/\<lib\>:/$(get_libdir):g" \
100 - etc/lua.pc src/luaconf.h
101 -}
102 -
103 -# no need for a configure phase
104 -src_configure() { true; }
105 -
106 -src_compile() {
107 - tc-export CC
108 - myflags=
109 - # what to link to liblua
110 - liblibs="-lm"
111 - liblibs="${liblibs} $(dlopen_lib)"
112 -
113 - # what to link to the executables
114 - mylibs=
115 - if use readline; then
116 - mylibs="-lreadline"
117 - fi
118 -
119 - cd src
120 - emake CC="${CC}" CFLAGS="-DLUA_USE_LINUX ${CFLAGS}" \
121 - RPATH="${EPREFIX}/usr/$(get_libdir)/" \
122 - LUA_LIBS="${mylibs}" \
123 - LIB_LIBS="${liblibs}" \
124 - V=${PV} \
125 - gentoo_all || die "emake failed"
126 -
127 - mv lua_test ../test/lua.static
128 -}
129 -
130 -src_install() {
131 - emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
132 - V=${PV} gentoo_install \
133 - || die "emake install gentoo_install failed"
134 -
135 - dodoc HISTORY README
136 - dohtml doc/*.html doc/*.png doc/*.css doc/*.gif
137 -
138 - doicon etc/lua.ico
139 - insinto /usr/$(get_libdir)/pkgconfig
140 - doins etc/lua.pc
141 -
142 - doman doc/lua.1 doc/luac.1
143 -}
144 -
145 -src_test() {
146 - local positive="bisect cf echo env factorial fib fibfor hello printf sieve
147 - sort trace-calls trace-globals"
148 - local negative="readonly"
149 - local test
150 -
151 - cd "${S}"
152 - for test in ${positive}; do
153 - test/lua.static test/${test}.lua || die "test $test failed"
154 - done
155 -
156 - for test in ${negative}; do
157 - test/lua.static test/${test}.lua && die "test $test failed"
158 - done
159 -}
160
161 diff --git a/dev-lang/lua/lua-5.1.5-r1.ebuild b/dev-lang/lua/lua-5.1.5-r1.ebuild
162 deleted file mode 100644
163 index 2a42659..00000000
164 --- a/dev-lang/lua/lua-5.1.5-r1.ebuild
165 +++ /dev/null
166 @@ -1,119 +0,0 @@
167 -# Copyright 1999-2014 Gentoo Foundation
168 -# Distributed under the terms of the GNU General Public License v2
169 -# $Id$
170 -
171 -EAPI=4
172 -
173 -inherit eutils multilib portability toolchain-funcs versionator
174 -
175 -DESCRIPTION="A powerful light-weight programming language designed for extending applications"
176 -HOMEPAGE="http://www.lua.org/"
177 -SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
178 -
179 -LICENSE="MIT"
180 -SLOT="0"
181 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
182 -IUSE="+deprecated emacs readline static"
183 -
184 -RDEPEND="readline? ( sys-libs/readline )"
185 -DEPEND="${RDEPEND}
186 - sys-devel/libtool"
187 -PDEPEND="emacs? ( app-emacs/lua-mode )"
188 -
189 -src_prepare() {
190 - local PATCH_PV=$(get_version_component_range 1-2)
191 -
192 - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r1.patch
193 - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-module_paths.patch
194 -
195 - #EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch
196 -
197 - # correct lua versioning
198 - sed -i -e 's/\(LIB_VERSION = \)6:1:1/\16:5:1/' src/Makefile
199 -
200 - sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html
201 -
202 - if ! use deprecated ; then
203 - # patches from 5.1.4 still apply
204 - epatch "${FILESDIR}"/${PN}-5.1.4-deprecated.patch
205 - epatch "${FILESDIR}"/${PN}-5.1.4-test.patch
206 - fi
207 -
208 - if ! use readline ; then
209 - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-readline.patch
210 - fi
211 -
212 - # Using dynamic linked lua is not recommended for performance
213 - # reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
214 - # Mainly, this is of concern if your arch is poor with GPRs, like x86
215 - # Note that this only affects the interpreter binary (named lua), not the lua
216 - # compiler (built statically) nor the lua libraries (both shared and static
217 - # are installed)
218 - if use static ; then
219 - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make_static-r1.patch
220 - fi
221 -
222 - # We want packages to find our things...
223 - sed -i \
224 - -e 's:/usr/local:'${EPREFIX}'/usr:' \
225 - -e "s:\([/\"]\)\<lib\>:\1$(get_libdir):g" \
226 - etc/lua.pc src/luaconf.h || die
227 -}
228 -
229 -# no need for a configure phase
230 -src_configure() { true; }
231 -
232 -src_compile() {
233 - tc-export CC
234 - myflags=
235 - # what to link to liblua
236 - liblibs="-lm"
237 - liblibs="${liblibs} $(dlopen_lib)"
238 -
239 - # what to link to the executables
240 - mylibs=
241 - if use readline; then
242 - mylibs="-lreadline"
243 - fi
244 -
245 - cd src
246 - emake CC="${CC}" CFLAGS="-DLUA_USE_LINUX ${CFLAGS}" \
247 - RPATH="${EPREFIX}/usr/$(get_libdir)/" \
248 - LUA_LIBS="${mylibs}" \
249 - LIB_LIBS="${liblibs}" \
250 - V=${PV} \
251 - gentoo_all || die "emake failed"
252 -
253 - mv lua_test ../test/lua.static
254 -}
255 -
256 -src_install() {
257 - emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
258 - V=${PV} gentoo_install \
259 - || die "emake install gentoo_install failed"
260 -
261 - dodoc HISTORY README
262 - dohtml doc/*.html doc/*.png doc/*.css doc/*.gif
263 -
264 - doicon etc/lua.ico
265 - insinto /usr/$(get_libdir)/pkgconfig
266 - doins etc/lua.pc
267 -
268 - doman doc/lua.1 doc/luac.1
269 -}
270 -
271 -src_test() {
272 - local positive="bisect cf echo env factorial fib fibfor hello printf sieve
273 - sort trace-calls trace-globals"
274 - local negative="readonly"
275 - local test
276 -
277 - cd "${S}"
278 - for test in ${positive}; do
279 - test/lua.static test/${test}.lua || die "test $test failed"
280 - done
281 -
282 - for test in ${negative}; do
283 - test/lua.static test/${test}.lua && die "test $test failed"
284 - done
285 -}
286
287 diff --git a/dev-lang/lua/lua-5.1.5-r2.ebuild b/dev-lang/lua/lua-5.1.5-r2.ebuild
288 deleted file mode 100644
289 index 2d62135..00000000
290 --- a/dev-lang/lua/lua-5.1.5-r2.ebuild
291 +++ /dev/null
292 @@ -1,124 +0,0 @@
293 -# Copyright 1999-2016 Gentoo Foundation
294 -# Distributed under the terms of the GNU General Public License v2
295 -# $Id$
296 -
297 -EAPI=5
298 -
299 -inherit eutils multilib portability toolchain-funcs versionator
300 -
301 -DESCRIPTION="A powerful light-weight programming language designed for extending applications"
302 -HOMEPAGE="http://www.lua.org/"
303 -SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
304 -
305 -LICENSE="MIT"
306 -SLOT="5.1"
307 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
308 -IUSE="+deprecated emacs readline static"
309 -
310 -RDEPEND="readline? ( sys-libs/readline:0= )
311 - app-eselect/eselect-lua
312 - !dev-lang/lua:0"
313 -DEPEND="${RDEPEND}
314 - sys-devel/libtool"
315 -PDEPEND="emacs? ( app-emacs/lua-mode )"
316 -
317 -SAN_SLOT="${SLOT//.}"
318 -
319 -src_prepare() {
320 - local PATCH_PV=$(get_version_component_range 1-2)
321 -
322 - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r2.patch
323 - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-module_paths.patch
324 -
325 - #EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch
326 -
327 - # correct lua versioning
328 - sed -i -e 's/\(LIB_VERSION = \)6:1:1/\16:5:1/' src/Makefile
329 -
330 - sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html
331 -
332 - if ! use deprecated ; then
333 - # patches from 5.1.4 still apply
334 - epatch "${FILESDIR}"/${PN}-5.1.4-deprecated.patch
335 - epatch "${FILESDIR}"/${PN}-5.1.4-test.patch
336 - fi
337 -
338 - if ! use readline ; then
339 - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-readline.patch
340 - fi
341 -
342 - # Using dynamic linked lua is not recommended for performance
343 - # reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
344 - # Mainly, this is of concern if your arch is poor with GPRs, like x86
345 - # Note that this only affects the interpreter binary (named lua), not the lua
346 - # compiler (built statically) nor the lua libraries (both shared and static
347 - # are installed)
348 - if use static ; then
349 - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make_static-r1.patch
350 - fi
351 -
352 - # We want packages to find our things...
353 - sed -i \
354 - -e 's:/usr/local:'${EPREFIX}'/usr:' \
355 - -e "s:\([/\"]\)\<lib\>:\1$(get_libdir):g" \
356 - etc/lua.pc src/luaconf.h || die
357 -}
358 -
359 -# no need for a configure phase
360 -src_configure() { true; }
361 -
362 -src_compile() {
363 - tc-export CC
364 - myflags=
365 - # what to link to liblua
366 - liblibs="-lm"
367 - liblibs="${liblibs} $(dlopen_lib)"
368 -
369 - # what to link to the executables
370 - mylibs=
371 - if use readline; then
372 - mylibs="-lreadline"
373 - fi
374 -
375 - cd src
376 - emake CC="${CC}" CFLAGS="-DLUA_USE_LINUX ${CFLAGS}" \
377 - RPATH="${EPREFIX}/usr/$(get_libdir)/" \
378 - LUA_LIBS="${mylibs}" \
379 - LIB_LIBS="${liblibs}" \
380 - V=$(get_version_component_range 1-2) \
381 - gentoo_all || die "emake failed"
382 -
383 - mv lua_test ../test/lua.static
384 -}
385 -
386 -src_install() {
387 - emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
388 - V=${SLOT} gentoo_install \
389 - || die "emake install gentoo_install failed"
390 -
391 - dodoc HISTORY README
392 - dohtml doc/*.html doc/*.png doc/*.css doc/*.gif
393 -
394 - doicon etc/lua.ico
395 - insinto /usr/$(get_libdir)/pkgconfig
396 - newins etc/lua.pc lua${SLOT}.pc
397 -
398 - newman doc/lua.1 lua${SLOT}.1
399 - newman doc/luac.1 luac${SLOT}.1
400 -}
401 -
402 -src_test() {
403 - local positive="bisect cf echo env factorial fib fibfor hello printf sieve
404 - sort trace-calls trace-globals"
405 - local negative="readonly"
406 - local test
407 -
408 - cd "${S}"
409 - for test in ${positive}; do
410 - test/lua.static test/${test}.lua || die "test $test failed"
411 - done
412 -
413 - for test in ${negative}; do
414 - test/lua.static test/${test}.lua && die "test $test failed"
415 - done
416 -}
417
418 diff --git a/dev-lang/lua/lua-5.1.5-r3.ebuild b/dev-lang/lua/lua-5.1.5-r3.ebuild
419 deleted file mode 100644
420 index 6f21869..00000000
421 --- a/dev-lang/lua/lua-5.1.5-r3.ebuild
422 +++ /dev/null
423 @@ -1,133 +0,0 @@
424 -# Copyright 1999-2016 Gentoo Foundation
425 -# Distributed under the terms of the GNU General Public License v2
426 -# $Id$
427 -
428 -EAPI=5
429 -
430 -inherit eutils multilib multilib-minimal portability toolchain-funcs versionator
431 -
432 -DESCRIPTION="A powerful light-weight programming language designed for extending applications"
433 -HOMEPAGE="http://www.lua.org/"
434 -SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
435 -
436 -LICENSE="MIT"
437 -SLOT="0"
438 -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux ~ppc-aix ~x64-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
439 -IUSE="+deprecated emacs readline static"
440 -
441 -RDEPEND="readline? ( >=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}] )"
442 -DEPEND="${RDEPEND}
443 - sys-devel/libtool"
444 -PDEPEND="emacs? ( app-emacs/lua-mode )"
445 -
446 -MULTILIB_WRAPPED_HEADERS=(
447 - /usr/include/luaconf.h
448 -)
449 -
450 -src_prepare() {
451 - local PATCH_PV=$(get_version_component_range 1-2)
452 -
453 - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r1.patch
454 - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-module_paths.patch
455 -
456 - # use glibtool on Darwin (versus Apple libtool)
457 - if [[ ${CHOST} == *-darwin* ]] ; then
458 - sed -i -e '/LIBTOOL = /s:libtool:glibtool:' \
459 - Makefile src/Makefile || die
460 - fi
461 -
462 - #EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch
463 -
464 - # correct lua versioning
465 - sed -i -e 's/\(LIB_VERSION = \)6:1:1/\16:5:1/' src/Makefile || die
466 -
467 - sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html || die
468 -
469 - if ! use deprecated ; then
470 - # patches from 5.1.4 still apply
471 - epatch "${FILESDIR}"/${PN}-5.1.4-deprecated.patch
472 - epatch "${FILESDIR}"/${PN}-5.1.4-test.patch
473 - fi
474 -
475 - if ! use readline ; then
476 - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-readline.patch
477 - fi
478 -
479 - # Using dynamic linked lua is not recommended for performance
480 - # reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
481 - # Mainly, this is of concern if your arch is poor with GPRs, like x86
482 - # Note that this only affects the interpreter binary (named lua), not the lua
483 - # compiler (built statically) nor the lua libraries (both shared and static
484 - # are installed)
485 - if use static ; then
486 - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make_static-r1.patch
487 - fi
488 -
489 - # custom Makefiles
490 - multilib_copy_sources
491 -}
492 -
493 -multilib_src_configure() {
494 - # We want packages to find our things...
495 - sed -i \
496 - -e 's:/usr/local:'${EPREFIX}'/usr:' \
497 - -e "s:\([/\"]\)\<lib\>:\1$(get_libdir):g" \
498 - etc/lua.pc src/luaconf.h || die
499 -}
500 -
501 -multilib_src_compile() {
502 - tc-export CC
503 - myflags=
504 - # what to link to liblua
505 - liblibs="-lm"
506 - liblibs="${liblibs} $(dlopen_lib)"
507 -
508 - # what to link to the executables
509 - mylibs=
510 - if use readline; then
511 - mylibs="-lreadline"
512 - fi
513 -
514 - cd src
515 - emake CC="${CC}" CFLAGS="-DLUA_USE_LINUX ${CFLAGS}" \
516 - RPATH="${EPREFIX}/usr/$(get_libdir)/" \
517 - LUA_LIBS="${mylibs}" \
518 - LIB_LIBS="${liblibs}" \
519 - V=${PV} \
520 - gentoo_all
521 -
522 - mv lua_test ../test/lua.static
523 -}
524 -
525 -multilib_src_install() {
526 - emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
527 - V=${PV} gentoo_install
528 -
529 - insinto /usr/$(get_libdir)/pkgconfig
530 - doins etc/lua.pc
531 -}
532 -
533 -multilib_src_install_all() {
534 - dodoc HISTORY README
535 - dohtml doc/*.html doc/*.png doc/*.css doc/*.gif
536 -
537 - doicon etc/lua.ico
538 -
539 - doman doc/lua.1 doc/luac.1
540 -}
541 -
542 -multilib_src_test() {
543 - local positive="bisect cf echo env factorial fib fibfor hello printf sieve
544 - sort trace-calls trace-globals"
545 - local negative="readonly"
546 - local test
547 -
548 - cd "${BUILD_DIR}" || die
549 - for test in ${positive}; do
550 - test/lua.static test/${test}.lua || die "test $test failed"
551 - done
552 -
553 - for test in ${negative}; do
554 - test/lua.static test/${test}.lua && die "test $test failed"
555 - done
556 -}
557
558 diff --git a/dev-lang/lua/lua-5.1.5.ebuild b/dev-lang/lua/lua-5.1.5.ebuild
559 deleted file mode 100644
560 index 79a05ac..00000000
561 --- a/dev-lang/lua/lua-5.1.5.ebuild
562 +++ /dev/null
563 @@ -1,119 +0,0 @@
564 -# Copyright 1999-2013 Gentoo Foundation
565 -# Distributed under the terms of the GNU General Public License v2
566 -# $Id$
567 -
568 -EAPI=4
569 -
570 -inherit eutils multilib portability toolchain-funcs versionator
571 -
572 -DESCRIPTION="A powerful light-weight programming language designed for extending applications"
573 -HOMEPAGE="http://www.lua.org/"
574 -SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
575 -
576 -LICENSE="MIT"
577 -SLOT="0"
578 -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
579 -IUSE="+deprecated emacs readline static"
580 -
581 -RDEPEND="readline? ( sys-libs/readline )"
582 -DEPEND="${RDEPEND}
583 - sys-devel/libtool"
584 -PDEPEND="emacs? ( app-emacs/lua-mode )"
585 -
586 -src_prepare() {
587 - local PATCH_PV=$(get_version_component_range 1-2)
588 -
589 - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r1.patch
590 - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-module_paths.patch
591 -
592 - #EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch
593 -
594 - # correct lua versioning
595 - sed -i -e 's/\(LIB_VERSION = \)6:1:1/\16:5:1/' src/Makefile
596 -
597 - sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html
598 -
599 - if ! use deprecated ; then
600 - # patches from 5.1.4 still apply
601 - epatch "${FILESDIR}"/${PN}-5.1.4-deprecated.patch
602 - epatch "${FILESDIR}"/${PN}-5.1.4-test.patch
603 - fi
604 -
605 - if ! use readline ; then
606 - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-readline.patch
607 - fi
608 -
609 - # Using dynamic linked lua is not recommended for performance
610 - # reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
611 - # Mainly, this is of concern if your arch is poor with GPRs, like x86
612 - # Note that this only affects the interpreter binary (named lua), not the lua
613 - # compiler (built statically) nor the lua libraries (both shared and static
614 - # are installed)
615 - if use static ; then
616 - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make_static-r1.patch
617 - fi
618 -
619 - # We want packages to find our things...
620 - sed -i \
621 - -e 's:/usr/local:'${EPREFIX}'/usr:' \
622 - -e "s:/\<lib\>:/$(get_libdir):g" \
623 - etc/lua.pc src/luaconf.h || die
624 -}
625 -
626 -# no need for a configure phase
627 -src_configure() { true; }
628 -
629 -src_compile() {
630 - tc-export CC
631 - myflags=
632 - # what to link to liblua
633 - liblibs="-lm"
634 - liblibs="${liblibs} $(dlopen_lib)"
635 -
636 - # what to link to the executables
637 - mylibs=
638 - if use readline; then
639 - mylibs="-lreadline"
640 - fi
641 -
642 - cd src
643 - emake CC="${CC}" CFLAGS="-DLUA_USE_LINUX ${CFLAGS}" \
644 - RPATH="${EPREFIX}/usr/$(get_libdir)/" \
645 - LUA_LIBS="${mylibs}" \
646 - LIB_LIBS="${liblibs}" \
647 - V=${PV} \
648 - gentoo_all || die "emake failed"
649 -
650 - mv lua_test ../test/lua.static
651 -}
652 -
653 -src_install() {
654 - emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
655 - V=${PV} gentoo_install \
656 - || die "emake install gentoo_install failed"
657 -
658 - dodoc HISTORY README
659 - dohtml doc/*.html doc/*.png doc/*.css doc/*.gif
660 -
661 - doicon etc/lua.ico
662 - insinto /usr/$(get_libdir)/pkgconfig
663 - doins etc/lua.pc
664 -
665 - doman doc/lua.1 doc/luac.1
666 -}
667 -
668 -src_test() {
669 - local positive="bisect cf echo env factorial fib fibfor hello printf sieve
670 - sort trace-calls trace-globals"
671 - local negative="readonly"
672 - local test
673 -
674 - cd "${S}"
675 - for test in ${positive}; do
676 - test/lua.static test/${test}.lua || die "test $test failed"
677 - done
678 -
679 - for test in ${negative}; do
680 - test/lua.static test/${test}.lua && die "test $test failed"
681 - done
682 -}