Gentoo Archives: gentoo-commits

From: William Hubbs <williamh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/lua/
Date: Mon, 12 Oct 2020 14:47:39
Message-Id: 1602514048.8b901313ed34319a3fa37604302a7c6883e4fdcb.williamh@gentoo
1 commit: 8b901313ed34319a3fa37604302a7c6883e4fdcb
2 Author: William Hubbs <williamh <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 12 14:46:40 2020 +0000
4 Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 12 14:47:28 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b901313
7
8 dev-lang/lua: remove all except the latest slotted versions
9
10 Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
11
12 dev-lang/lua/Manifest | 2 -
13 dev-lang/lua/lua-5.1.5-r100.ebuild | 137 --------------------------
14 dev-lang/lua/lua-5.1.5-r101.ebuild | 144 ---------------------------
15 dev-lang/lua/lua-5.1.5-r102.ebuild | 144 ---------------------------
16 dev-lang/lua/lua-5.2.3-r1.ebuild | 136 --------------------------
17 dev-lang/lua/lua-5.2.3-r2.ebuild | 143 ---------------------------
18 dev-lang/lua/lua-5.2.3-r3.ebuild | 143 ---------------------------
19 dev-lang/lua/lua-5.2.3.ebuild | 116 ----------------------
20 dev-lang/lua/lua-5.2.4-r1.ebuild | 193 -------------------------------------
21 dev-lang/lua/lua-5.2.4.ebuild | 179 ----------------------------------
22 dev-lang/lua/lua-5.3.3-r1.ebuild | 143 ---------------------------
23 dev-lang/lua/lua-5.3.3-r2.ebuild | 143 ---------------------------
24 dev-lang/lua/lua-5.3.3.ebuild | 136 --------------------------
25 dev-lang/lua/lua-5.3.5-r1.ebuild | 193 -------------------------------------
26 dev-lang/lua/lua-5.3.5.ebuild | 179 ----------------------------------
27 15 files changed, 2131 deletions(-)
28
29 diff --git a/dev-lang/lua/Manifest b/dev-lang/lua/Manifest
30 index 1106de1d1a2..2505b266f4d 100644
31 --- a/dev-lang/lua/Manifest
32 +++ b/dev-lang/lua/Manifest
33 @@ -1,7 +1,5 @@
34 DIST lua-5.1.5.tar.gz 221213 BLAKE2B 915eb8e8c9d7e460eacf1d7a59309c60dfc0f5d9d3d76fbc9764e7cae85920b95096db1c27b69ac53378a145c29efde403e88166a1332a67150d9d3a897aba02 SHA512 0142fefcbd13afcd9b201403592aa60620011cc8e8559d4d2db2f92739d18186860989f48caa45830ff4f99bfc7483287fd3ff3a16d4dec928e2767ce4d542a9
35 DIST lua-5.2.2-tests.tar.gz 76629 BLAKE2B 323eaae02ee61cfde2535d606ed704d964461c32627cb3ad4097afdc95a16a0921b9b05677c5b9b26cbff0d7d8270045e7df32a2cea0fd99a82e6aa613a0bdae SHA512 699d5703dd1d03312f1e947ca4c68d8808bb226ae01337202c2bfb3d854a9b7d9ef9746630afd1f67e9ffe2868907ce3d600a6f5324a2c798540c5373a24aac8
36 -DIST lua-5.2.3.tar.gz 251195 BLAKE2B f3d11e180fe070cb5be98f0694081d26067e21eddeb09cd74b1bae6ecf01c53dc46746b871e38555525da155bf1b83f0e60bae5387c2b96b1d19b15f94b716dc SHA512 264bb7c8db2f190ef0ca38584ec81999ab588f54e03119c5214c40bb8925b0eb407fac483a03e40cc8a220f6748ddff7d3a7392da3803418276b0d263b866449
37 DIST lua-5.2.4.tar.gz 252651 BLAKE2B 6f20308d8413438f8446040e8de16274837cb55e626b98a0ae8cfe279dc8610fa2e032a2ce53ef3acda4b96a7198123cbc18eff16775f952e6dc0355fdf331b0 SHA512 cd77148aba4b707b6c159758b5e8444e04f968092eb98f6b4c405b2fb647e709370d5a8dcf604176101d3407e196a7433b5dcdce4fe9605c76191d3649d61a8c
38 -DIST lua-5.3.3.tar.gz 294290 BLAKE2B 8052d3fa5f34636df314886a62d63e46fc76ada765679da9352e751f484a458404ac55e5b32ad63ced9d2b16d629d62a52240b1b1a509bcdf5d5df85e405646d SHA512 7b8122ed48ea2a9faa47d1b69b4a5b1523bb7be67e78f252bb4339bf75e957a88c5405156e22b4b63ccf607a5407bf017a4cee1ce12b1aa5262047655960a3cc
39 DIST lua-5.3.4-tests.tar.gz 103438 BLAKE2B ac82708022e7729039111c3df4fe24302c8d0efb224afb4828871ac085a3d64c41d674a6f9369035de01ed1f7f75a3d2ce16917f37e774e923216aac0be03e09 SHA512 79575d100a2efabc8243f55b55d912443e09ef7e8b0219cb93541d85c2ba802fb9538015e1228703f09ca57bdb28a640a8f1fa0735716ba1e4bca2179c712dfb
40 DIST lua-5.3.5.tar.gz 303543 BLAKE2B 8890fa70fcfb869296bc74c754dc30621a3786d4b38dd35ef9e57ca46ee4b3df12dac1b86109be0823847499ff6b0d95de11f446c4c22de440ae3bb704e5068b SHA512 4f9516acc4659dfd0a9e911bfa00c0788f0ad9348e5724fe8fb17aac59e9c0060a64378f82be86f8534e49c6c013e7488ad17321bafcc787831d3d67406bd0f4
41
42 diff --git a/dev-lang/lua/lua-5.1.5-r100.ebuild b/dev-lang/lua/lua-5.1.5-r100.ebuild
43 deleted file mode 100644
44 index 6cc21a60ce8..00000000000
45 --- a/dev-lang/lua/lua-5.1.5-r100.ebuild
46 +++ /dev/null
47 @@ -1,137 +0,0 @@
48 -# Copyright 1999-2020 Gentoo Authors
49 -# Distributed under the terms of the GNU General Public License v2
50 -
51 -EAPI=5
52 -
53 -inherit eutils multilib multilib-minimal portability toolchain-funcs versionator
54 -
55 -DESCRIPTION="A powerful light-weight programming language designed for extending applications"
56 -HOMEPAGE="http://www.lua.org/"
57 -SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
58 -
59 -LICENSE="MIT"
60 -SLOT="5.1"
61 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
62 -IUSE="+deprecated emacs readline static"
63 -
64 -RDEPEND="readline? ( >=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}] )
65 - app-eselect/eselect-lua
66 - !dev-lang/lua:0"
67 -DEPEND="${RDEPEND}
68 - sys-devel/libtool"
69 -PDEPEND="emacs? ( app-emacs/lua-mode )"
70 -
71 -SAN_SLOT="${SLOT//.}"
72 -
73 -MULTILIB_WRAPPED_HEADERS=(
74 - /usr/include/lua${SLOT}/luaconf.h
75 -)
76 -
77 -src_prepare() {
78 - local PATCH_PV=$(get_version_component_range 1-2)
79 -
80 - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r2.patch
81 - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-module_paths.patch
82 -
83 - # use glibtool on Darwin (versus Apple libtool)
84 - if [[ ${CHOST} == *-darwin* ]] ; then
85 - sed -i -e '/LIBTOOL = /s:libtool:glibtool:' \
86 - Makefile src/Makefile || die
87 - fi
88 -
89 - #EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch
90 -
91 - # correct lua versioning
92 - sed -i -e 's/\(LIB_VERSION = \)6:1:1/\16:5:1/' src/Makefile
93 -
94 - sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html
95 -
96 - if ! use deprecated ; then
97 - # patches from 5.1.4 still apply
98 - epatch "${FILESDIR}"/${PN}-5.1.4-deprecated.patch
99 - epatch "${FILESDIR}"/${PN}-5.1.4-test.patch
100 - fi
101 -
102 - if ! use readline ; then
103 - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-readline.patch
104 - fi
105 -
106 - # Using dynamic linked lua is not recommended for performance
107 - # reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
108 - # Mainly, this is of concern if your arch is poor with GPRs, like x86
109 - # Note that this only affects the interpreter binary (named lua), not the lua
110 - # compiler (built statically) nor the lua libraries (both shared and static
111 - # are installed)
112 - if use static ; then
113 - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make_static-r1.patch
114 - fi
115 -
116 - # custom Makefiles
117 - multilib_copy_sources
118 -}
119 -
120 -multilib_src_configure() {
121 - # We want packages to find our things...
122 - sed -i \
123 - -e 's:/usr/local:'${EPREFIX}'/usr:' \
124 - -e "s:\([/\"]\)\<lib\>:\1$(get_libdir):g" \
125 - etc/lua.pc src/luaconf.h || die
126 -}
127 -
128 -multilib_src_compile() {
129 - tc-export CC
130 - myflags=
131 - # what to link to liblua
132 - liblibs="-lm"
133 - liblibs="${liblibs} $(dlopen_lib)"
134 -
135 - # what to link to the executables
136 - mylibs=
137 - if use readline; then
138 - mylibs="-lreadline"
139 - fi
140 -
141 - cd src
142 - emake CC="${CC}" CFLAGS="-DLUA_USE_LINUX ${CFLAGS}" \
143 - RPATH="${EPREFIX}/usr/$(get_libdir)/" \
144 - LUA_LIBS="${mylibs}" \
145 - LIB_LIBS="${liblibs}" \
146 - V=$(get_version_component_range 1-2) \
147 - gentoo_all
148 -
149 - mv lua_test ../test/lua.static
150 -}
151 -
152 -multilib_src_install() {
153 - emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
154 - V=${SLOT} gentoo_install
155 -
156 - insinto /usr/$(get_libdir)/pkgconfig
157 - newins etc/lua.pc lua${SLOT}.pc
158 -}
159 -
160 -multilib_src_install_all() {
161 - dodoc HISTORY README
162 - dohtml doc/*.html doc/*.png doc/*.css doc/*.gif
163 -
164 - doicon etc/lua.ico
165 -
166 - newman doc/lua.1 lua${SLOT}.1
167 - newman doc/luac.1 luac${SLOT}.1
168 -}
169 -
170 -multilib_src_test() {
171 - local positive="bisect cf echo env factorial fib fibfor hello printf sieve
172 - sort trace-calls trace-globals"
173 - local negative="readonly"
174 - local test
175 -
176 - cd "${BUILD_DIR}" || die
177 - for test in ${positive}; do
178 - test/lua.static test/${test}.lua || die "test $test failed"
179 - done
180 -
181 - for test in ${negative}; do
182 - test/lua.static test/${test}.lua && die "test $test failed"
183 - done
184 -}
185
186 diff --git a/dev-lang/lua/lua-5.1.5-r101.ebuild b/dev-lang/lua/lua-5.1.5-r101.ebuild
187 deleted file mode 100644
188 index 26b64301f83..00000000000
189 --- a/dev-lang/lua/lua-5.1.5-r101.ebuild
190 +++ /dev/null
191 @@ -1,144 +0,0 @@
192 -# Copyright 1999-2020 Gentoo Authors
193 -# Distributed under the terms of the GNU General Public License v2
194 -
195 -EAPI=5
196 -
197 -inherit eutils multilib multilib-minimal portability toolchain-funcs versionator
198 -
199 -DESCRIPTION="A powerful light-weight programming language designed for extending applications"
200 -HOMEPAGE="http://www.lua.org/"
201 -SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
202 -
203 -LICENSE="MIT"
204 -SLOT="5.1"
205 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
206 -IUSE="+deprecated emacs readline static"
207 -
208 -RDEPEND="readline? ( >=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}] )
209 - app-eselect/eselect-lua
210 - !dev-lang/lua:0"
211 -DEPEND="${RDEPEND}
212 - sys-devel/libtool"
213 -PDEPEND="emacs? ( app-emacs/lua-mode )"
214 -
215 -SAN_SLOT="${SLOT//.}"
216 -
217 -MULTILIB_WRAPPED_HEADERS=(
218 - /usr/include/lua${SLOT}/luaconf.h
219 -)
220 -
221 -src_prepare() {
222 - local PATCH_PV=$(get_version_component_range 1-2)
223 -
224 - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r2.patch
225 - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-module_paths.patch
226 -
227 - # use glibtool on Darwin (versus Apple libtool)
228 - if [[ ${CHOST} == *-darwin* ]] ; then
229 - sed -i -e '/LIBTOOL = /s:libtool:glibtool:' \
230 - Makefile src/Makefile || die
231 - fi
232 -
233 - #EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch
234 -
235 - # correct lua versioning
236 - sed -i -e 's/\(LIB_VERSION = \)6:1:1/\16:5:1/' src/Makefile
237 -
238 - sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html
239 -
240 - if ! use deprecated ; then
241 - # patches from 5.1.4 still apply
242 - epatch "${FILESDIR}"/${PN}-5.1.4-deprecated.patch
243 - epatch "${FILESDIR}"/${PN}-5.1.4-test.patch
244 - fi
245 -
246 - if ! use readline ; then
247 - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-readline.patch
248 - fi
249 -
250 - # Using dynamic linked lua is not recommended for performance
251 - # reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
252 - # Mainly, this is of concern if your arch is poor with GPRs, like x86
253 - # Note that this only affects the interpreter binary (named lua), not the lua
254 - # compiler (built statically) nor the lua libraries (both shared and static
255 - # are installed)
256 - if use static ; then
257 - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make_static-r1.patch
258 - fi
259 -
260 - # custom Makefiles
261 - multilib_copy_sources
262 -
263 - # A slotted Lua uses different directories for headers & names for
264 - # libraries, and pkgconfig should reflect that.
265 - sed -r -i \
266 - -e "/^Libs:/s,((-llua)($| )),\2${SLOT}\3," \
267 - -e "/^Cflags:/s,((-I..includedir.)($| )),\2/lua${SLOT}\3," \
268 - "${S}"/etc/lua.pc
269 -}
270 -
271 -multilib_src_configure() {
272 - # We want packages to find our things...
273 - sed -i \
274 - -e 's:/usr/local:'${EPREFIX}'/usr:' \
275 - -e "s:\([/\"]\)\<lib\>:\1$(get_libdir):g" \
276 - etc/lua.pc src/luaconf.h || die
277 -}
278 -
279 -multilib_src_compile() {
280 - tc-export CC
281 - myflags=
282 - # what to link to liblua
283 - liblibs="-lm"
284 - liblibs="${liblibs} $(dlopen_lib)"
285 -
286 - # what to link to the executables
287 - mylibs=
288 - if use readline; then
289 - mylibs="-lreadline"
290 - fi
291 -
292 - cd src
293 - emake CC="${CC}" CFLAGS="-DLUA_USE_LINUX ${CFLAGS}" \
294 - RPATH="${EPREFIX}/usr/$(get_libdir)/" \
295 - LUA_LIBS="${mylibs}" \
296 - LIB_LIBS="${liblibs}" \
297 - V=$(get_version_component_range 1-2) \
298 - gentoo_all
299 -
300 - mv lua_test ../test/lua.static
301 -}
302 -
303 -multilib_src_install() {
304 - emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
305 - V=${SLOT} gentoo_install
306 -
307 - insinto /usr/$(get_libdir)/pkgconfig
308 - newins etc/lua.pc lua${SLOT}.pc
309 -}
310 -
311 -multilib_src_install_all() {
312 - dodoc HISTORY README
313 - dohtml doc/*.html doc/*.png doc/*.css doc/*.gif
314 -
315 - doicon etc/lua.ico
316 -
317 - newman doc/lua.1 lua${SLOT}.1
318 - newman doc/luac.1 luac${SLOT}.1
319 -}
320 -
321 -multilib_src_test() {
322 - local positive="bisect cf echo env factorial fib fibfor hello printf sieve
323 - sort trace-calls trace-globals"
324 - local negative="readonly"
325 - local test
326 -
327 - cd "${BUILD_DIR}" || die
328 - for test in ${positive}; do
329 - test/lua.static test/${test}.lua || die "test $test failed"
330 - done
331 -
332 - for test in ${negative}; do
333 - test/lua.static test/${test}.lua && die "test $test failed"
334 - done
335 -}
336
337 diff --git a/dev-lang/lua/lua-5.1.5-r102.ebuild b/dev-lang/lua/lua-5.1.5-r102.ebuild
338 deleted file mode 100644
339 index 3324637d037..00000000000
340 --- a/dev-lang/lua/lua-5.1.5-r102.ebuild
341 +++ /dev/null
342 @@ -1,144 +0,0 @@
343 -# Copyright 1999-2020 Gentoo Authors
344 -# Distributed under the terms of the GNU General Public License v2
345 -
346 -EAPI=5
347 -
348 -inherit eutils multilib multilib-minimal portability toolchain-funcs versionator
349 -
350 -DESCRIPTION="A powerful light-weight programming language designed for extending applications"
351 -HOMEPAGE="http://www.lua.org/"
352 -SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
353 -
354 -LICENSE="MIT"
355 -SLOT="5.1"
356 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
357 -IUSE="+deprecated emacs readline static"
358 -
359 -RDEPEND="readline? ( >=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}] )
360 - app-eselect/eselect-lua
361 - !dev-lang/lua:0"
362 -DEPEND="${RDEPEND}
363 - sys-devel/libtool"
364 -PDEPEND="emacs? ( app-emacs/lua-mode )"
365 -
366 -SAN_SLOT="${SLOT//.}"
367 -
368 -MULTILIB_WRAPPED_HEADERS=(
369 - /usr/include/lua${SLOT}/luaconf.h
370 -)
371 -
372 -src_prepare() {
373 - local PATCH_PV=$(get_version_component_range 1-2)
374 -
375 - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r2.patch
376 - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-module_paths.patch
377 -
378 - # use glibtool on Darwin (versus Apple libtool)
379 - if [[ ${CHOST} == *-darwin* ]] ; then
380 - sed -i -e '/LIBTOOL = /s:libtool:glibtool:' \
381 - Makefile src/Makefile || die
382 - fi
383 -
384 - #EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch
385 -
386 - # correct lua versioning
387 - sed -i -e 's/\(LIB_VERSION = \)6:1:1/\16:5:1/' src/Makefile
388 -
389 - sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html
390 -
391 - if ! use deprecated ; then
392 - # patches from 5.1.4 still apply
393 - epatch "${FILESDIR}"/${PN}-5.1.4-deprecated.patch
394 - epatch "${FILESDIR}"/${PN}-5.1.4-test.patch
395 - fi
396 -
397 - if ! use readline ; then
398 - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-readline.patch
399 - fi
400 -
401 - # Using dynamic linked lua is not recommended for performance
402 - # reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
403 - # Mainly, this is of concern if your arch is poor with GPRs, like x86
404 - # Note that this only affects the interpreter binary (named lua), not the lua
405 - # compiler (built statically) nor the lua libraries (both shared and static
406 - # are installed)
407 - if use static ; then
408 - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make_static-r1.patch
409 - fi
410 -
411 - # A slotted Lua uses different directories for headers & names for
412 - # libraries, and pkgconfig should reflect that.
413 - sed -r -i \
414 - -e "/^Libs:/s,((-llua)($| )),\2${SLOT}\3," \
415 - -e "/^Cflags:/s,((-I..includedir.)($| )),\2/lua${SLOT}\3," \
416 - "${S}"/etc/lua.pc
417 -
418 - # custom Makefiles
419 - multilib_copy_sources
420 -}
421 -
422 -multilib_src_configure() {
423 - # We want packages to find our things...
424 - sed -i \
425 - -e 's:/usr/local:'${EPREFIX}'/usr:' \
426 - -e "s:\([/\"]\)\<lib\>:\1$(get_libdir):g" \
427 - etc/lua.pc src/luaconf.h || die
428 -}
429 -
430 -multilib_src_compile() {
431 - tc-export CC
432 - myflags=
433 - # what to link to liblua
434 - liblibs="-lm"
435 - liblibs="${liblibs} $(dlopen_lib)"
436 -
437 - # what to link to the executables
438 - mylibs=
439 - if use readline; then
440 - mylibs="-lreadline"
441 - fi
442 -
443 - cd src
444 - emake CC="${CC}" CFLAGS="-DLUA_USE_LINUX ${CFLAGS}" \
445 - RPATH="${EPREFIX}/usr/$(get_libdir)/" \
446 - LUA_LIBS="${mylibs}" \
447 - LIB_LIBS="${liblibs}" \
448 - V=$(get_version_component_range 1-2) \
449 - gentoo_all
450 -
451 - mv lua_test ../test/lua.static
452 -}
453 -
454 -multilib_src_install() {
455 - emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
456 - V=${SLOT} gentoo_install
457 -
458 - insinto /usr/$(get_libdir)/pkgconfig
459 - newins etc/lua.pc lua${SLOT}.pc
460 -}
461 -
462 -multilib_src_install_all() {
463 - dodoc HISTORY README
464 - dohtml doc/*.html doc/*.png doc/*.css doc/*.gif
465 -
466 - doicon etc/lua.ico
467 -
468 - newman doc/lua.1 lua${SLOT}.1
469 - newman doc/luac.1 luac${SLOT}.1
470 -}
471 -
472 -multilib_src_test() {
473 - local positive="bisect cf echo env factorial fib fibfor hello printf sieve
474 - sort trace-calls trace-globals"
475 - local negative="readonly"
476 - local test
477 -
478 - cd "${BUILD_DIR}" || die
479 - for test in ${positive}; do
480 - test/lua.static test/${test}.lua || die "test $test failed"
481 - done
482 -
483 - for test in ${negative}; do
484 - test/lua.static test/${test}.lua && die "test $test failed"
485 - done
486 -}
487
488 diff --git a/dev-lang/lua/lua-5.2.3-r1.ebuild b/dev-lang/lua/lua-5.2.3-r1.ebuild
489 deleted file mode 100644
490 index 7e93c849bb2..00000000000
491 --- a/dev-lang/lua/lua-5.2.3-r1.ebuild
492 +++ /dev/null
493 @@ -1,136 +0,0 @@
494 -# Copyright 1999-2020 Gentoo Authors
495 -# Distributed under the terms of the GNU General Public License v2
496 -
497 -EAPI=5
498 -
499 -inherit eutils autotools multilib multilib-minimal portability toolchain-funcs versionator
500 -
501 -DESCRIPTION="A powerful light-weight programming language designed for extending applications"
502 -HOMEPAGE="http://www.lua.org/"
503 -SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
504 -
505 -LICENSE="MIT"
506 -SLOT="5.2"
507 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
508 -IUSE="+deprecated emacs readline static"
509 -
510 -RDEPEND="readline? ( sys-libs/readline:0= )
511 - app-eselect/eselect-lua
512 - !dev-lang/lua:0"
513 -DEPEND="${RDEPEND}
514 - sys-devel/libtool"
515 -PDEPEND="emacs? ( app-emacs/lua-mode )"
516 -
517 -MULTILIB_WRAPPED_HEADERS=(
518 - /usr/include/lua${SLOT}/luaconf.h
519 -)
520 -
521 -src_prepare() {
522 - local PATCH_PV=$(get_version_component_range 1-2)
523 -
524 - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r1.patch
525 -
526 - # use glibtool on Darwin (versus Apple libtool)
527 - if [[ ${CHOST} == *-darwin* ]] ; then
528 - sed -i -e '/LIBTOOL = /s:/libtool:/glibtool:' \
529 - Makefile src/Makefile || die
530 - fi
531 -
532 - [ -d "${FILESDIR}/${PV}" ] && \
533 - EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch
534 -
535 - # correct lua versioning
536 - sed -i -e 's/\(LIB_VERSION = \)6:1:1/\10:0:0/' src/Makefile || die
537 -
538 - sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html || die
539 -
540 - if ! use readline ; then
541 - sed -i -e '/#define LUA_USE_READLINE/d' src/luaconf.h || die
542 - fi
543 -
544 - # Using dynamic linked lua is not recommended for performance
545 - # reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
546 - # Mainly, this is of concern if your arch is poor with GPRs, like x86
547 - # Note that this only affects the interpreter binary (named lua), not the lua
548 - # compiler (built statically) nor the lua libraries (both shared and static
549 - # are installed)
550 - if use static ; then
551 - sed -i -e 's:\(-export-dynamic\):-static \1:' src/Makefile || die
552 - fi
553 -
554 - # upstream does not use libtool, but we do (see bug #336167)
555 - cp "${FILESDIR}/configure.in" "${S}"/ || die
556 - eautoreconf
557 -
558 - # custom Makefiles
559 - multilib_copy_sources
560 -}
561 -
562 -multilib_src_configure() {
563 - sed -i \
564 - -e 's:\(define LUA_ROOT\s*\).*:\1"'${EPREFIX}'/usr/":' \
565 - -e "s:\(define LUA_CDIR\s*LUA_ROOT \"\)lib:\1$(get_libdir):" \
566 - src/luaconf.h \
567 - || die "failed patching luaconf.h"
568 -
569 - econf
570 -}
571 -
572 -multilib_src_compile() {
573 - tc-export CC
574 -
575 - # what to link to liblua
576 - liblibs="-lm"
577 - liblibs="${liblibs} $(dlopen_lib)"
578 -
579 - # what to link to the executables
580 - mylibs=
581 - use readline && mylibs="-lreadline"
582 -
583 - cd src
584 -
585 - local myCFLAGS=""
586 - use deprecated && myCFLAGS="-DLUA_COMPAT_ALL"
587 -
588 - case "${CHOST}" in
589 - *-mingw*) : ;;
590 - *) myCFLAGS+=" -DLUA_USE_LINUX" ;;
591 - esac
592 -
593 - emake CC="${CC}" CFLAGS="${myCFLAGS} ${CFLAGS}" \
594 - SYSLDFLAGS="${LDFLAGS}" \
595 - RPATH="${EPREFIX}/usr/$(get_libdir)/" \
596 - LUA_LIBS="${mylibs}" \
597 - LIB_LIBS="${liblibs}" \
598 - V=$(get_version_component_range 1-2) \
599 - gentoo_all
600 -}
601 -
602 -multilib_src_install() {
603 - emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
604 - V=${SLOT} gentoo_install
605 -
606 - # We want packages to find our things...
607 - cp "${FILESDIR}/lua.pc" "${WORKDIR}"
608 - sed -i \
609 - -e "s:^prefix= :prefix= ${EPREFIX}:" \
610 - -e "s:^V=.*:V= ${PATCH_PV}:" \
611 - -e "s:^R=.*:R= ${PV}:" \
612 - -e "s:/,lib,:/$(get_libdir):g" \
613 - "${WORKDIR}/lua.pc"
614 -
615 - insinto "/usr/$(get_libdir)/pkgconfig"
616 - newins "${WORKDIR}/lua.pc" "lua${SLOT}.pc"
617 -}
618 -
619 -multilib_src_install_all() {
620 - dodoc README
621 - dohtml doc/*.html doc/*.png doc/*.css doc/*.gif
622 -
623 - newman doc/lua.1 lua${SLOT}.1
624 - newman doc/luac.1 luac${SLOT}.1
625 -}
626 -
627 -# Makefile contains a dummy target that doesn't do tests
628 -# but causes issues with slotted lua (bug #510360)
629 -src_test() { :; }
630
631 diff --git a/dev-lang/lua/lua-5.2.3-r2.ebuild b/dev-lang/lua/lua-5.2.3-r2.ebuild
632 deleted file mode 100644
633 index 5665ddef904..00000000000
634 --- a/dev-lang/lua/lua-5.2.3-r2.ebuild
635 +++ /dev/null
636 @@ -1,143 +0,0 @@
637 -# Copyright 1999-2020 Gentoo Authors
638 -# Distributed under the terms of the GNU General Public License v2
639 -
640 -EAPI=5
641 -
642 -inherit eutils autotools multilib multilib-minimal portability toolchain-funcs versionator
643 -
644 -DESCRIPTION="A powerful light-weight programming language designed for extending applications"
645 -HOMEPAGE="http://www.lua.org/"
646 -SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
647 -
648 -LICENSE="MIT"
649 -SLOT="5.2"
650 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
651 -IUSE="+deprecated emacs readline static"
652 -
653 -RDEPEND="readline? ( sys-libs/readline:0= )
654 - app-eselect/eselect-lua
655 - !dev-lang/lua:0"
656 -DEPEND="${RDEPEND}
657 - sys-devel/libtool"
658 -PDEPEND="emacs? ( app-emacs/lua-mode )"
659 -
660 -MULTILIB_WRAPPED_HEADERS=(
661 - /usr/include/lua${SLOT}/luaconf.h
662 -)
663 -
664 -src_prepare() {
665 - local PATCH_PV=$(get_version_component_range 1-2)
666 -
667 - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r1.patch
668 -
669 - # use glibtool on Darwin (versus Apple libtool)
670 - if [[ ${CHOST} == *-darwin* ]] ; then
671 - sed -i -e '/LIBTOOL = /s:/libtool:/glibtool:' \
672 - Makefile src/Makefile || die
673 - fi
674 -
675 - [ -d "${FILESDIR}/${PV}" ] && \
676 - EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch
677 -
678 - # correct lua versioning
679 - sed -i -e 's/\(LIB_VERSION = \)6:1:1/\10:0:0/' src/Makefile || die
680 -
681 - sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html || die
682 -
683 - if ! use readline ; then
684 - sed -i -e '/#define LUA_USE_READLINE/d' src/luaconf.h || die
685 - fi
686 -
687 - # Using dynamic linked lua is not recommended for performance
688 - # reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
689 - # Mainly, this is of concern if your arch is poor with GPRs, like x86
690 - # Note that this only affects the interpreter binary (named lua), not the lua
691 - # compiler (built statically) nor the lua libraries (both shared and static
692 - # are installed)
693 - if use static ; then
694 - sed -i -e 's:\(-export-dynamic\):-static \1:' src/Makefile || die
695 - fi
696 -
697 - # upstream does not use libtool, but we do (see bug #336167)
698 - cp "${FILESDIR}/configure.in" "${S}"/ || die
699 - eautoreconf
700 -
701 - # custom Makefiles
702 - multilib_copy_sources
703 -
704 - # A slotted Lua uses different directories for headers & names for
705 - # libraries, and pkgconfig should reflect that.
706 - sed -r -i \
707 - -e "/^Libs:/s,((-llua)($| )),\2${SLOT}\3," \
708 - -e "/^Cflags:/s,((-I..includedir.)($| )),\2/lua${SLOT}\3," \
709 - "${S}"/etc/lua.pc
710 -}
711 -
712 -multilib_src_configure() {
713 - sed -i \
714 - -e 's:\(define LUA_ROOT\s*\).*:\1"'${EPREFIX}'/usr/":' \
715 - -e "s:\(define LUA_CDIR\s*LUA_ROOT \"\)lib:\1$(get_libdir):" \
716 - src/luaconf.h \
717 - || die "failed patching luaconf.h"
718 -
719 - econf
720 -}
721 -
722 -multilib_src_compile() {
723 - tc-export CC
724 -
725 - # what to link to liblua
726 - liblibs="-lm"
727 - liblibs="${liblibs} $(dlopen_lib)"
728 -
729 - # what to link to the executables
730 - mylibs=
731 - use readline && mylibs="-lreadline"
732 -
733 - cd src
734 -
735 - local myCFLAGS=""
736 - use deprecated && myCFLAGS="-DLUA_COMPAT_ALL"
737 -
738 - case "${CHOST}" in
739 - *-mingw*) : ;;
740 - *) myCFLAGS+=" -DLUA_USE_LINUX" ;;
741 - esac
742 -
743 - emake CC="${CC}" CFLAGS="${myCFLAGS} ${CFLAGS}" \
744 - SYSLDFLAGS="${LDFLAGS}" \
745 - RPATH="${EPREFIX}/usr/$(get_libdir)/" \
746 - LUA_LIBS="${mylibs}" \
747 - LIB_LIBS="${liblibs}" \
748 - V=$(get_version_component_range 1-2) \
749 - gentoo_all
750 -}
751 -
752 -multilib_src_install() {
753 - emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
754 - V=${SLOT} gentoo_install
755 -
756 - # We want packages to find our things...
757 - cp "${FILESDIR}/lua.pc" "${WORKDIR}"
758 - sed -i \
759 - -e "s:^prefix= :prefix= ${EPREFIX}:" \
760 - -e "s:^V=.*:V= ${PATCH_PV}:" \
761 - -e "s:^R=.*:R= ${PV}:" \
762 - -e "s:/,lib,:/$(get_libdir):g" \
763 - "${WORKDIR}/lua.pc"
764 -
765 - insinto "/usr/$(get_libdir)/pkgconfig"
766 - newins "${WORKDIR}/lua.pc" "lua${SLOT}.pc"
767 -}
768 -
769 -multilib_src_install_all() {
770 - dodoc README
771 - dohtml doc/*.html doc/*.png doc/*.css doc/*.gif
772 -
773 - newman doc/lua.1 lua${SLOT}.1
774 - newman doc/luac.1 luac${SLOT}.1
775 -}
776 -
777 -# Makefile contains a dummy target that doesn't do tests
778 -# but causes issues with slotted lua (bug #510360)
779 -src_test() { :; }
780
781 diff --git a/dev-lang/lua/lua-5.2.3-r3.ebuild b/dev-lang/lua/lua-5.2.3-r3.ebuild
782 deleted file mode 100644
783 index 889a162b0e6..00000000000
784 --- a/dev-lang/lua/lua-5.2.3-r3.ebuild
785 +++ /dev/null
786 @@ -1,143 +0,0 @@
787 -# Copyright 1999-2020 Gentoo Authors
788 -# Distributed under the terms of the GNU General Public License v2
789 -
790 -EAPI=5
791 -
792 -inherit eutils autotools multilib multilib-minimal portability toolchain-funcs versionator
793 -
794 -DESCRIPTION="A powerful light-weight programming language designed for extending applications"
795 -HOMEPAGE="http://www.lua.org/"
796 -SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
797 -
798 -LICENSE="MIT"
799 -SLOT="5.2"
800 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
801 -IUSE="+deprecated emacs readline static"
802 -
803 -RDEPEND="readline? ( sys-libs/readline:0= )
804 - app-eselect/eselect-lua
805 - !dev-lang/lua:0"
806 -DEPEND="${RDEPEND}
807 - sys-devel/libtool"
808 -PDEPEND="emacs? ( app-emacs/lua-mode )"
809 -
810 -MULTILIB_WRAPPED_HEADERS=(
811 - /usr/include/lua${SLOT}/luaconf.h
812 -)
813 -
814 -src_prepare() {
815 - local PATCH_PV=$(get_version_component_range 1-2)
816 -
817 - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r1.patch
818 -
819 - # use glibtool on Darwin (versus Apple libtool)
820 - if [[ ${CHOST} == *-darwin* ]] ; then
821 - sed -i -e '/LIBTOOL = /s:/libtool:/glibtool:' \
822 - Makefile src/Makefile || die
823 - fi
824 -
825 - [ -d "${FILESDIR}/${PV}" ] && \
826 - EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch
827 -
828 - # correct lua versioning
829 - sed -i -e 's/\(LIB_VERSION = \)6:1:1/\10:0:0/' src/Makefile || die
830 -
831 - sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html || die
832 -
833 - if ! use readline ; then
834 - sed -i -e '/#define LUA_USE_READLINE/d' src/luaconf.h || die
835 - fi
836 -
837 - # Using dynamic linked lua is not recommended for performance
838 - # reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
839 - # Mainly, this is of concern if your arch is poor with GPRs, like x86
840 - # Note that this only affects the interpreter binary (named lua), not the lua
841 - # compiler (built statically) nor the lua libraries (both shared and static
842 - # are installed)
843 - if use static ; then
844 - sed -i -e 's:\(-export-dynamic\):-static \1:' src/Makefile || die
845 - fi
846 -
847 - # upstream does not use libtool, but we do (see bug #336167)
848 - cp "${FILESDIR}/configure.in" "${S}"/ || die
849 - eautoreconf
850 -
851 - # A slotted Lua uses different directories for headers & names for
852 - # libraries, and pkgconfig should reflect that.
853 - sed -r -i \
854 - -e "/^Libs:/s,((-llua)($| )),\2${SLOT}\3," \
855 - -e "/^Cflags:/s,((-I..includedir.)($| )),\2/lua${SLOT}\3," \
856 - "${S}"/etc/lua.pc
857 -
858 - # custom Makefiles
859 - multilib_copy_sources
860 -}
861 -
862 -multilib_src_configure() {
863 - sed -i \
864 - -e 's:\(define LUA_ROOT\s*\).*:\1"'${EPREFIX}'/usr/":' \
865 - -e "s:\(define LUA_CDIR\s*LUA_ROOT \"\)lib:\1$(get_libdir):" \
866 - src/luaconf.h \
867 - || die "failed patching luaconf.h"
868 -
869 - econf
870 -}
871 -
872 -multilib_src_compile() {
873 - tc-export CC
874 -
875 - # what to link to liblua
876 - liblibs="-lm"
877 - liblibs="${liblibs} $(dlopen_lib)"
878 -
879 - # what to link to the executables
880 - mylibs=
881 - use readline && mylibs="-lreadline"
882 -
883 - cd src
884 -
885 - local myCFLAGS=""
886 - use deprecated && myCFLAGS="-DLUA_COMPAT_ALL"
887 -
888 - case "${CHOST}" in
889 - *-mingw*) : ;;
890 - *) myCFLAGS+=" -DLUA_USE_LINUX" ;;
891 - esac
892 -
893 - emake CC="${CC}" CFLAGS="${myCFLAGS} ${CFLAGS}" \
894 - SYSLDFLAGS="${LDFLAGS}" \
895 - RPATH="${EPREFIX}/usr/$(get_libdir)/" \
896 - LUA_LIBS="${mylibs}" \
897 - LIB_LIBS="${liblibs}" \
898 - V=$(get_version_component_range 1-2) \
899 - gentoo_all
900 -}
901 -
902 -multilib_src_install() {
903 - emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
904 - V=${SLOT} gentoo_install
905 -
906 - # We want packages to find our things...
907 - cp "${FILESDIR}/lua.pc" "${WORKDIR}"
908 - sed -i \
909 - -e "s:^prefix= :prefix= ${EPREFIX}:" \
910 - -e "s:^V=.*:V= ${PATCH_PV}:" \
911 - -e "s:^R=.*:R= ${PV}:" \
912 - -e "s:/,lib,:/$(get_libdir):g" \
913 - "${WORKDIR}/lua.pc"
914 -
915 - insinto "/usr/$(get_libdir)/pkgconfig"
916 - newins "${WORKDIR}/lua.pc" "lua${SLOT}.pc"
917 -}
918 -
919 -multilib_src_install_all() {
920 - dodoc README
921 - dohtml doc/*.html doc/*.png doc/*.css doc/*.gif
922 -
923 - newman doc/lua.1 lua${SLOT}.1
924 - newman doc/luac.1 luac${SLOT}.1
925 -}
926 -
927 -# Makefile contains a dummy target that doesn't do tests
928 -# but causes issues with slotted lua (bug #510360)
929 -src_test() { :; }
930
931 diff --git a/dev-lang/lua/lua-5.2.3.ebuild b/dev-lang/lua/lua-5.2.3.ebuild
932 deleted file mode 100644
933 index 4a3d0421233..00000000000
934 --- a/dev-lang/lua/lua-5.2.3.ebuild
935 +++ /dev/null
936 @@ -1,116 +0,0 @@
937 -# Copyright 1999-2020 Gentoo Authors
938 -# Distributed under the terms of the GNU General Public License v2
939 -
940 -EAPI=5
941 -
942 -inherit eutils autotools multilib portability toolchain-funcs versionator
943 -
944 -DESCRIPTION="A powerful light-weight programming language designed for extending applications"
945 -HOMEPAGE="http://www.lua.org/"
946 -SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
947 -
948 -LICENSE="MIT"
949 -SLOT="5.2"
950 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux"
951 -IUSE="+deprecated emacs readline static"
952 -
953 -RDEPEND="readline? ( sys-libs/readline:0= )
954 - app-eselect/eselect-lua
955 - !dev-lang/lua:0"
956 -DEPEND="${RDEPEND}
957 - sys-devel/libtool"
958 -PDEPEND="emacs? ( app-emacs/lua-mode )"
959 -
960 -src_prepare() {
961 - local PATCH_PV=$(get_version_component_range 1-2)
962 -
963 - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r1.patch
964 -
965 - [ -d "${FILESDIR}/${PV}" ] && \
966 - EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch
967 -
968 - sed -i \
969 - -e 's:\(define LUA_ROOT\s*\).*:\1"'${EPREFIX}'/usr/":' \
970 - -e "s:\(define LUA_CDIR\s*LUA_ROOT \"\)lib:\1$(get_libdir):" \
971 - src/luaconf.h \
972 - || die "failed patching luaconf.h"
973 -
974 - # correct lua versioning
975 - sed -i -e 's/\(LIB_VERSION = \)6:1:1/\10:0:0/' src/Makefile
976 -
977 - sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html
978 -
979 - if ! use readline ; then
980 - sed -i -e '/#define LUA_USE_READLINE/d' src/luaconf.h
981 - fi
982 -
983 - # Using dynamic linked lua is not recommended for performance
984 - # reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
985 - # Mainly, this is of concern if your arch is poor with GPRs, like x86
986 - # Note that this only affects the interpreter binary (named lua), not the lua
987 - # compiler (built statically) nor the lua libraries (both shared and static
988 - # are installed)
989 - if use static ; then
990 - sed -i -e 's:\(-export-dynamic\):-static \1:' src/Makefile
991 - fi
992 -
993 - # upstream does not use libtool, but we do (see bug #336167)
994 - cp "${FILESDIR}/configure.in" "${S}"
995 - eautoreconf
996 -}
997 -
998 -src_compile() {
999 - tc-export CC
1000 -
1001 - # what to link to liblua
1002 - liblibs="-lm"
1003 - liblibs="${liblibs} $(dlopen_lib)"
1004 -
1005 - # what to link to the executables
1006 - mylibs=
1007 - use readline && mylibs="-lreadline"
1008 -
1009 - cd src
1010 -
1011 - local myCFLAGS=""
1012 - use deprecated && myCFLAGS="-DLUA_COMPAT_ALL"
1013 -
1014 - case "${CHOST}" in
1015 - *-mingw*) : ;;
1016 - *) myCFLAGS+=" -DLUA_USE_LINUX" ;;
1017 - esac
1018 -
1019 - emake CC="${CC}" CFLAGS="${myCFLAGS} ${CFLAGS}" \
1020 - SYSLDFLAGS="${LDFLAGS}" \
1021 - RPATH="${EPREFIX}/usr/$(get_libdir)/" \
1022 - LUA_LIBS="${mylibs}" \
1023 - LIB_LIBS="${liblibs}" \
1024 - V=$(get_version_component_range 1-2) \
1025 - gentoo_all
1026 -}
1027 -
1028 -src_install() {
1029 - emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
1030 - V=${SLOT} gentoo_install
1031 -
1032 - dodoc README
1033 - dohtml doc/*.html doc/*.png doc/*.css doc/*.gif
1034 -
1035 - newman doc/lua.1 lua${SLOT}.1
1036 - newman doc/luac.1 luac${SLOT}.1
1037 -
1038 - # We want packages to find our things...
1039 - cp "${FILESDIR}/lua.pc" "${WORKDIR}"
1040 - sed -i \
1041 - -e "s:^V=.*:V= ${PATCH_PV}:" \
1042 - -e "s:^R=.*:R= ${PV}:" \
1043 - -e "s:/,lib,:/$(get_libdir):g" \
1044 - "${WORKDIR}/lua.pc"
1045 -
1046 - insinto "/usr/$(get_libdir)/pkgconfig"
1047 - newins "${WORKDIR}/lua.pc" "lua${SLOT}.pc"
1048 -}
1049 -
1050 -# Makefile contains a dummy target that doesn't do tests
1051 -# but causes issues with slotted lua (bug #510360)
1052 -src_test() { :; }
1053
1054 diff --git a/dev-lang/lua/lua-5.2.4-r1.ebuild b/dev-lang/lua/lua-5.2.4-r1.ebuild
1055 deleted file mode 100644
1056 index 726c0c00ecb..00000000000
1057 --- a/dev-lang/lua/lua-5.2.4-r1.ebuild
1058 +++ /dev/null
1059 @@ -1,193 +0,0 @@
1060 -# Copyright 1999-2020 Gentoo Authors
1061 -# Distributed under the terms of the GNU General Public License v2
1062 -
1063 -EAPI=5
1064 -
1065 -inherit eutils autotools multilib multilib-minimal portability toolchain-funcs versionator
1066 -
1067 -DESCRIPTION="A powerful light-weight programming language designed for extending applications"
1068 -HOMEPAGE="http://www.lua.org/"
1069 -TEST_PV="5.2.2" # no 5.2.3-specific release yet
1070 -TEST_A="${PN}-${TEST_PV}-tests.tar.gz"
1071 -PKG_A="${P}.tar.gz"
1072 -SRC_URI="
1073 - http://www.lua.org/ftp/${PKG_A}
1074 - test? ( https://www.lua.org/tests/${TEST_A} )"
1075 -
1076 -LICENSE="MIT"
1077 -SLOT="5.2"
1078 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
1079 -IUSE="+deprecated emacs readline static test test-complete"
1080 -RESTRICT="!test? ( test )"
1081 -
1082 -RDEPEND="readline? ( sys-libs/readline:0= )
1083 - app-eselect/eselect-lua
1084 - !dev-lang/lua:0"
1085 -DEPEND="${RDEPEND}
1086 - sys-devel/libtool"
1087 -PDEPEND="emacs? ( app-emacs/lua-mode )"
1088 -
1089 -MULTILIB_WRAPPED_HEADERS=(
1090 - /usr/include/lua${SLOT}/luaconf.h
1091 -)
1092 -
1093 -src_prepare() {
1094 - local PATCH_PV=$(get_version_component_range 1-2)
1095 -
1096 - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r1.patch
1097 -
1098 - # use glibtool on Darwin (versus Apple libtool)
1099 - if [[ ${CHOST} == *-darwin* ]] ; then
1100 - sed -i -e '/LIBTOOL = /s:/libtool:/glibtool:' \
1101 - Makefile src/Makefile || die
1102 - fi
1103 -
1104 - [ -d "${FILESDIR}/${PV}" ] && \
1105 - EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch
1106 -
1107 - # correct lua versioning
1108 - sed -i -e 's/\(LIB_VERSION = \)6:1:1/\10:0:0/' src/Makefile || die
1109 -
1110 - sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html || die
1111 -
1112 - if ! use readline ; then
1113 - sed -i -e '/#define LUA_USE_READLINE/d' src/luaconf.h || die
1114 - fi
1115 -
1116 - # Using dynamic linked lua is not recommended for performance
1117 - # reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
1118 - # Mainly, this is of concern if your arch is poor with GPRs, like x86
1119 - # Note that this only affects the interpreter binary (named lua), not the lua
1120 - # compiler (built statically) nor the lua libraries (both shared and static
1121 - # are installed)
1122 - if use static ; then
1123 - sed -i -e 's:\(-export-dynamic\):-static \1:' src/Makefile || die
1124 - fi
1125 -
1126 - # upstream does not use libtool, but we do (see bug #336167)
1127 - cp "${FILESDIR}/configure.in" "${S}/configure.ac" || die
1128 - eautoreconf
1129 -
1130 - # custom Makefiles
1131 - multilib_copy_sources
1132 -}
1133 -
1134 -multilib_src_configure() {
1135 - sed -i \
1136 - -e 's:\(define LUA_ROOT\s*\).*:\1"'${EPREFIX}'/usr/":' \
1137 - -e "s:\(define LUA_CDIR\s*LUA_ROOT \"\)lib:\1$(get_libdir):" \
1138 - src/luaconf.h \
1139 - || die "failed patching luaconf.h"
1140 -
1141 - econf
1142 -}
1143 -
1144 -multilib_src_compile() {
1145 - tc-export CC
1146 -
1147 - # what to link to liblua
1148 - liblibs="-lm"
1149 - liblibs="${liblibs} $(dlopen_lib)"
1150 -
1151 - # what to link to the executables
1152 - mylibs=
1153 - use readline && mylibs="-lreadline"
1154 -
1155 - cd src
1156 -
1157 - local myCFLAGS=""
1158 - use deprecated && myCFLAGS="-DLUA_COMPAT_ALL"
1159 -
1160 - case "${CHOST}" in
1161 - *-mingw*) : ;;
1162 - *) myCFLAGS+=" -DLUA_USE_LINUX" ;;
1163 - esac
1164 -
1165 - emake CC="${CC}" CFLAGS="${myCFLAGS} ${CFLAGS}" \
1166 - SYSLDFLAGS="${LDFLAGS}" \
1167 - RPATH="${EPREFIX}/usr/$(get_libdir)/" \
1168 - LUA_LIBS="${mylibs}" \
1169 - LIB_LIBS="${liblibs}" \
1170 - V=$(get_version_component_range 1-2) \
1171 - gentoo_all
1172 -}
1173 -
1174 -multilib_src_install() {
1175 - emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
1176 - V=${SLOT} gentoo_install
1177 -
1178 - case $SLOT in
1179 - 0)
1180 - LIBNAME="lua"
1181 - INCLUDEDIR_SUFFIX=''
1182 - ;;
1183 - *) LIBNAME="lua${SLOT}"
1184 - INCLUDEDIR_SUFFIX="/lua${SLOT}"
1185 - ;;
1186 - esac
1187 -
1188 - # We want packages to find our things...
1189 - # A slotted Lua uses different directories for headers & names for
1190 - # libraries, and pkgconfig should reflect that.
1191 - local PATCH_PV=$(get_version_component_range 1-2)
1192 - cp "${FILESDIR}/lua.pc" "${WORKDIR}" || die
1193 - sed -r -i \
1194 - -e "s:^prefix= :prefix= ${EPREFIX}:" \
1195 - -e "s:^V=.*:V= ${PATCH_PV}:" \
1196 - -e "s:^R=.*:R= ${PV}:" \
1197 - -e "s:/,lib,:/$(get_libdir):g" \
1198 - -e "/^Libs:/s:( )(-llua)($| ):\1-l${LIBNAME}\3:" \
1199 - -e "/^includedir=/s:include$:include${INCLUDEDIR_SUFFIX}:" \
1200 - "${WORKDIR}/lua.pc" || die
1201 -
1202 - insinto "/usr/$(get_libdir)/pkgconfig"
1203 - newins "${WORKDIR}/lua.pc" "lua${SLOT}.pc"
1204 - # Copy Debian's symlink support:
1205 - # https://salsa.debian.org/lua-team/lua5.3/blob/master/debian/rules#L19
1206 - # FreeBSD calls the pkgconfig 'lua-5.3.pc'
1207 - # Older systems called it 'lua53.pc'
1208 - dosym "lua${SLOT}.pc" "/usr/$(get_libdir)/pkgconfig/lua-${SLOT}.pc"
1209 - dosym "lua${SLOT}.pc" "/usr/$(get_libdir)/pkgconfig/lua${SLOT/.}.pc"
1210 -}
1211 -
1212 -multilib_src_install_all() {
1213 - dodoc README
1214 - dohtml doc/*.html doc/*.png doc/*.css doc/*.gif
1215 -
1216 - newman doc/lua.1 lua${SLOT}.1
1217 - newman doc/luac.1 luac${SLOT}.1
1218 -}
1219 -
1220 -# Makefile contains a dummy target that doesn't do tests
1221 -# but causes issues with slotted lua (bug #510360)
1222 -src_test() {
1223 - debug-print-function ${FUNCNAME} "$@"
1224 - cd "${WORKDIR}/lua-${TEST_PV}-tests" || die
1225 - # https://www.lua.org/tests/
1226 - # There are two sets:
1227 - # basic
1228 - # complete.
1229 - #
1230 - # The basic subset is selected by passing -e'_U=true'
1231 - # The complete set is noted to contain tests that may consume too much memory or have non-portable tests.
1232 - # attrib.lua for example needs some multilib customization (have to compile the stuff in libs/ for each ABI)
1233 - use test-complete || TEST_OPTS="-e_U=true"
1234 - TEST_MARKER="${T}/test.failed"
1235 - rm -f "${TEST_MARKER}"
1236 -
1237 - # If we are failing, set the marker file, and only check it after done all ABIs
1238 - abi_src_test() {
1239 - debug-print-function ${FUNCNAME} "$@"
1240 - TEST_LOG="${T}/test.${MULTIBUILD_ID}.log"
1241 - eval "${BUILD_DIR}"/src/lua${SLOT} ${TEST_OPTS} all.lua 2>&1 | tee "${TEST_LOG}" || die
1242 - grep -sq -e "final OK" "${TEST_LOG}" || echo "FAIL ${MULTIBUILD_ID}" >>"${TEST_MARKER}"
1243 - return 0
1244 - }
1245 -
1246 - multilib_foreach_abi abi_src_test
1247 -
1248 - if [ -e "${TEST_MARKER}" ]; then
1249 - cat "${TEST_MARKER}"
1250 - die "Tests failed"
1251 - fi
1252 -}
1253
1254 diff --git a/dev-lang/lua/lua-5.2.4.ebuild b/dev-lang/lua/lua-5.2.4.ebuild
1255 deleted file mode 100644
1256 index 13c512925ff..00000000000
1257 --- a/dev-lang/lua/lua-5.2.4.ebuild
1258 +++ /dev/null
1259 @@ -1,179 +0,0 @@
1260 -# Copyright 1999-2020 Gentoo Authors
1261 -# Distributed under the terms of the GNU General Public License v2
1262 -
1263 -EAPI=5
1264 -
1265 -inherit eutils autotools multilib multilib-minimal portability toolchain-funcs versionator
1266 -
1267 -DESCRIPTION="A powerful light-weight programming language designed for extending applications"
1268 -HOMEPAGE="http://www.lua.org/"
1269 -TEST_PV="5.2.2" # no 5.2.3-specific release yet
1270 -TEST_A="${PN}-${TEST_PV}-tests.tar.gz"
1271 -PKG_A="${P}.tar.gz"
1272 -SRC_URI="
1273 - http://www.lua.org/ftp/${PKG_A}
1274 - test? ( https://www.lua.org/tests/${TEST_A} )"
1275 -
1276 -LICENSE="MIT"
1277 -SLOT="5.2"
1278 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
1279 -IUSE="+deprecated emacs readline static test test-complete"
1280 -RESTRICT="!test? ( test )"
1281 -
1282 -RDEPEND="readline? ( sys-libs/readline:0= )
1283 - app-eselect/eselect-lua
1284 - !dev-lang/lua:0"
1285 -DEPEND="${RDEPEND}
1286 - sys-devel/libtool"
1287 -PDEPEND="emacs? ( app-emacs/lua-mode )"
1288 -
1289 -MULTILIB_WRAPPED_HEADERS=(
1290 - /usr/include/lua${SLOT}/luaconf.h
1291 -)
1292 -
1293 -src_prepare() {
1294 - local PATCH_PV=$(get_version_component_range 1-2)
1295 -
1296 - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r1.patch
1297 -
1298 - # use glibtool on Darwin (versus Apple libtool)
1299 - if [[ ${CHOST} == *-darwin* ]] ; then
1300 - sed -i -e '/LIBTOOL = /s:/libtool:/glibtool:' \
1301 - Makefile src/Makefile || die
1302 - fi
1303 -
1304 - [ -d "${FILESDIR}/${PV}" ] && \
1305 - EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch
1306 -
1307 - # correct lua versioning
1308 - sed -i -e 's/\(LIB_VERSION = \)6:1:1/\10:0:0/' src/Makefile || die
1309 -
1310 - sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html || die
1311 -
1312 - if ! use readline ; then
1313 - sed -i -e '/#define LUA_USE_READLINE/d' src/luaconf.h || die
1314 - fi
1315 -
1316 - # Using dynamic linked lua is not recommended for performance
1317 - # reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
1318 - # Mainly, this is of concern if your arch is poor with GPRs, like x86
1319 - # Note that this only affects the interpreter binary (named lua), not the lua
1320 - # compiler (built statically) nor the lua libraries (both shared and static
1321 - # are installed)
1322 - if use static ; then
1323 - sed -i -e 's:\(-export-dynamic\):-static \1:' src/Makefile || die
1324 - fi
1325 -
1326 - # upstream does not use libtool, but we do (see bug #336167)
1327 - cp "${FILESDIR}/configure.in" "${S}"/ || die
1328 - eautoreconf
1329 -
1330 - # A slotted Lua uses different directories for headers & names for
1331 - # libraries, and pkgconfig should reflect that.
1332 - sed -r -i \
1333 - -e "/^Libs:/s,((-llua)($| )),\2${SLOT}\3," \
1334 - -e "/^Cflags:/s,((-I..includedir.)($| )),\2/lua${SLOT}\3," \
1335 - "${S}"/etc/lua.pc
1336 -
1337 - # custom Makefiles
1338 - multilib_copy_sources
1339 -}
1340 -
1341 -multilib_src_configure() {
1342 - sed -i \
1343 - -e 's:\(define LUA_ROOT\s*\).*:\1"'${EPREFIX}'/usr/":' \
1344 - -e "s:\(define LUA_CDIR\s*LUA_ROOT \"\)lib:\1$(get_libdir):" \
1345 - src/luaconf.h \
1346 - || die "failed patching luaconf.h"
1347 -
1348 - econf
1349 -}
1350 -
1351 -multilib_src_compile() {
1352 - tc-export CC
1353 -
1354 - # what to link to liblua
1355 - liblibs="-lm"
1356 - liblibs="${liblibs} $(dlopen_lib)"
1357 -
1358 - # what to link to the executables
1359 - mylibs=
1360 - use readline && mylibs="-lreadline"
1361 -
1362 - cd src
1363 -
1364 - local myCFLAGS=""
1365 - use deprecated && myCFLAGS="-DLUA_COMPAT_ALL"
1366 -
1367 - case "${CHOST}" in
1368 - *-mingw*) : ;;
1369 - *) myCFLAGS+=" -DLUA_USE_LINUX" ;;
1370 - esac
1371 -
1372 - emake CC="${CC}" CFLAGS="${myCFLAGS} ${CFLAGS}" \
1373 - SYSLDFLAGS="${LDFLAGS}" \
1374 - RPATH="${EPREFIX}/usr/$(get_libdir)/" \
1375 - LUA_LIBS="${mylibs}" \
1376 - LIB_LIBS="${liblibs}" \
1377 - V=$(get_version_component_range 1-2) \
1378 - gentoo_all
1379 -}
1380 -
1381 -multilib_src_install() {
1382 - emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
1383 - V=${SLOT} gentoo_install
1384 -
1385 - # We want packages to find our things...
1386 - cp "${FILESDIR}/lua.pc" "${WORKDIR}"
1387 - sed -i \
1388 - -e "s:^prefix= :prefix= ${EPREFIX}:" \
1389 - -e "s:^V=.*:V= ${PATCH_PV}:" \
1390 - -e "s:^R=.*:R= ${PV}:" \
1391 - -e "s:/,lib,:/$(get_libdir):g" \
1392 - "${WORKDIR}/lua.pc"
1393 -
1394 - insinto "/usr/$(get_libdir)/pkgconfig"
1395 - newins "${WORKDIR}/lua.pc" "lua${SLOT}.pc"
1396 -}
1397 -
1398 -multilib_src_install_all() {
1399 - dodoc README
1400 - dohtml doc/*.html doc/*.png doc/*.css doc/*.gif
1401 -
1402 - newman doc/lua.1 lua${SLOT}.1
1403 - newman doc/luac.1 luac${SLOT}.1
1404 -}
1405 -
1406 -# Makefile contains a dummy target that doesn't do tests
1407 -# but causes issues with slotted lua (bug #510360)
1408 -src_test() {
1409 - debug-print-function ${FUNCNAME} "$@"
1410 - cd "${WORKDIR}/lua-${TEST_PV}-tests" || die
1411 - # https://www.lua.org/tests/
1412 - # There are two sets:
1413 - # basic
1414 - # complete.
1415 - #
1416 - # The basic subset is selected by passing -e'_U=true'
1417 - # The complete set is noted to contain tests that may consume too much memory or have non-portable tests.
1418 - # attrib.lua for example needs some multilib customization (have to compile the stuff in libs/ for each ABI)
1419 - use test-complete || TEST_OPTS="-e_U=true"
1420 - TEST_MARKER="${T}/test.failed"
1421 - rm -f "${TEST_MARKER}"
1422 -
1423 - # If we are failing, set the marker file, and only check it after done all ABIs
1424 - abi_src_test() {
1425 - debug-print-function ${FUNCNAME} "$@"
1426 - TEST_LOG="${T}/test.${MULTIBUILD_ID}.log"
1427 - eval "${BUILD_DIR}"/src/lua${SLOT} ${TEST_OPTS} all.lua 2>&1 | tee "${TEST_LOG}" || die
1428 - grep -sq -e "final OK" "${TEST_LOG}" || echo "FAIL ${MULTIBUILD_ID}" >>"${TEST_MARKER}"
1429 - return 0
1430 - }
1431 -
1432 - multilib_foreach_abi abi_src_test
1433 -
1434 - if [ -e "${TEST_MARKER}" ]; then
1435 - cat "${TEST_MARKER}"
1436 - die "Tests failed"
1437 - fi
1438 -}
1439
1440 diff --git a/dev-lang/lua/lua-5.3.3-r1.ebuild b/dev-lang/lua/lua-5.3.3-r1.ebuild
1441 deleted file mode 100644
1442 index fdd72a0c0c8..00000000000
1443 --- a/dev-lang/lua/lua-5.3.3-r1.ebuild
1444 +++ /dev/null
1445 @@ -1,143 +0,0 @@
1446 -# Copyright 1999-2020 Gentoo Authors
1447 -# Distributed under the terms of the GNU General Public License v2
1448 -
1449 -EAPI=5
1450 -
1451 -inherit eutils autotools multilib multilib-minimal portability toolchain-funcs versionator
1452 -
1453 -DESCRIPTION="A powerful light-weight programming language designed for extending applications"
1454 -HOMEPAGE="http://www.lua.org/"
1455 -SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
1456 -
1457 -LICENSE="MIT"
1458 -SLOT="5.3"
1459 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
1460 -IUSE="+deprecated emacs readline static"
1461 -
1462 -RDEPEND="readline? ( sys-libs/readline:0= )
1463 - app-eselect/eselect-lua
1464 - !dev-lang/lua:0"
1465 -DEPEND="${RDEPEND}
1466 - sys-devel/libtool"
1467 -PDEPEND="emacs? ( app-emacs/lua-mode )"
1468 -
1469 -MULTILIB_WRAPPED_HEADERS=(
1470 - /usr/include/lua${SLOT}/luaconf.h
1471 -)
1472 -
1473 -src_prepare() {
1474 - local PATCH_PV=$(get_version_component_range 1-2)
1475 -
1476 - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r1.patch
1477 -
1478 - # use glibtool on Darwin (versus Apple libtool)
1479 - if [[ ${CHOST} == *-darwin* ]] ; then
1480 - sed -i -e '/LIBTOOL = /s:/libtool:/glibtool:' \
1481 - Makefile src/Makefile || die
1482 - fi
1483 -
1484 - [ -d "${FILESDIR}/${PV}" ] && \
1485 - EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch
1486 -
1487 - # correct lua versioning
1488 - sed -i -e 's/\(LIB_VERSION = \)6:1:1/\10:0:0/' src/Makefile || die
1489 -
1490 - sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html || die
1491 -
1492 - if ! use readline ; then
1493 - sed -i -e '/#define LUA_USE_READLINE/d' src/luaconf.h || die
1494 - fi
1495 -
1496 - # Using dynamic linked lua is not recommended for performance
1497 - # reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
1498 - # Mainly, this is of concern if your arch is poor with GPRs, like x86
1499 - # Note that this only affects the interpreter binary (named lua), not the lua
1500 - # compiler (built statically) nor the lua libraries (both shared and static
1501 - # are installed)
1502 - if use static ; then
1503 - sed -i -e 's:\(-export-dynamic\):-static \1:' src/Makefile || die
1504 - fi
1505 -
1506 - # upstream does not use libtool, but we do (see bug #336167)
1507 - cp "${FILESDIR}/configure.in" "${S}/configure.ac" || die
1508 - eautoreconf
1509 -
1510 - # custom Makefiles
1511 - multilib_copy_sources
1512 -
1513 - # A slotted Lua uses different directories for headers & names for
1514 - # libraries, and pkgconfig should reflect that.
1515 - sed -r -i \
1516 - -e "/^Libs:/s,((-llua)($| )),\2${SLOT}\3," \
1517 - -e "/^Cflags:/s,((-I..includedir.)($| )),\2/lua${SLOT}\3," \
1518 - "${S}"/etc/lua.pc
1519 -}
1520 -
1521 -multilib_src_configure() {
1522 - sed -i \
1523 - -e 's:\(define LUA_ROOT\s*\).*:\1"'${EPREFIX}'/usr/":' \
1524 - -e "s:\(define LUA_CDIR\s*LUA_ROOT \"\)lib:\1$(get_libdir):" \
1525 - src/luaconf.h \
1526 - || die "failed patching luaconf.h"
1527 -
1528 - econf
1529 -}
1530 -
1531 -multilib_src_compile() {
1532 - tc-export CC
1533 -
1534 - # what to link to liblua
1535 - liblibs="-lm"
1536 - liblibs="${liblibs} $(dlopen_lib)"
1537 -
1538 - # what to link to the executables
1539 - mylibs=
1540 - use readline && mylibs="-lreadline"
1541 -
1542 - cd src
1543 -
1544 - local myCFLAGS=""
1545 - use deprecated && myCFLAGS="-DLUA_COMPAT_ALL"
1546 -
1547 - case "${CHOST}" in
1548 - *-mingw*) : ;;
1549 - *) myCFLAGS+=" -DLUA_USE_LINUX" ;;
1550 - esac
1551 -
1552 - emake CC="${CC}" CFLAGS="${myCFLAGS} ${CFLAGS}" \
1553 - SYSLDFLAGS="${LDFLAGS}" \
1554 - RPATH="${EPREFIX}/usr/$(get_libdir)/" \
1555 - LUA_LIBS="${mylibs}" \
1556 - LIB_LIBS="${liblibs}" \
1557 - V=$(get_version_component_range 1-2) \
1558 - gentoo_all
1559 -}
1560 -
1561 -multilib_src_install() {
1562 - emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
1563 - V=${SLOT} gentoo_install
1564 -
1565 - # We want packages to find our things...
1566 - cp "${FILESDIR}/lua.pc" "${WORKDIR}"
1567 - sed -i \
1568 - -e "s:^prefix= :prefix= ${EPREFIX}:" \
1569 - -e "s:^V=.*:V= ${PATCH_PV}:" \
1570 - -e "s:^R=.*:R= ${PV}:" \
1571 - -e "s:/,lib,:/$(get_libdir):g" \
1572 - "${WORKDIR}/lua.pc"
1573 -
1574 - insinto "/usr/$(get_libdir)/pkgconfig"
1575 - newins "${WORKDIR}/lua.pc" "lua${SLOT}.pc"
1576 -}
1577 -
1578 -multilib_src_install_all() {
1579 - dodoc README
1580 - dohtml doc/*.html doc/*.png doc/*.css doc/*.gif
1581 -
1582 - newman doc/lua.1 lua${SLOT}.1
1583 - newman doc/luac.1 luac${SLOT}.1
1584 -}
1585 -
1586 -# Makefile contains a dummy target that doesn't do tests
1587 -# but causes issues with slotted lua (bug #510360)
1588 -src_test() { :; }
1589
1590 diff --git a/dev-lang/lua/lua-5.3.3-r2.ebuild b/dev-lang/lua/lua-5.3.3-r2.ebuild
1591 deleted file mode 100644
1592 index 629104cf608..00000000000
1593 --- a/dev-lang/lua/lua-5.3.3-r2.ebuild
1594 +++ /dev/null
1595 @@ -1,143 +0,0 @@
1596 -# Copyright 1999-2020 Gentoo Authors
1597 -# Distributed under the terms of the GNU General Public License v2
1598 -
1599 -EAPI=5
1600 -
1601 -inherit eutils autotools multilib multilib-minimal portability toolchain-funcs versionator
1602 -
1603 -DESCRIPTION="A powerful light-weight programming language designed for extending applications"
1604 -HOMEPAGE="http://www.lua.org/"
1605 -SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
1606 -
1607 -LICENSE="MIT"
1608 -SLOT="5.3"
1609 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
1610 -IUSE="+deprecated emacs readline static"
1611 -
1612 -RDEPEND="readline? ( sys-libs/readline:0= )
1613 - app-eselect/eselect-lua
1614 - !dev-lang/lua:0"
1615 -DEPEND="${RDEPEND}
1616 - sys-devel/libtool"
1617 -PDEPEND="emacs? ( app-emacs/lua-mode )"
1618 -
1619 -MULTILIB_WRAPPED_HEADERS=(
1620 - /usr/include/lua${SLOT}/luaconf.h
1621 -)
1622 -
1623 -src_prepare() {
1624 - local PATCH_PV=$(get_version_component_range 1-2)
1625 -
1626 - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r1.patch
1627 -
1628 - # use glibtool on Darwin (versus Apple libtool)
1629 - if [[ ${CHOST} == *-darwin* ]] ; then
1630 - sed -i -e '/LIBTOOL = /s:/libtool:/glibtool:' \
1631 - Makefile src/Makefile || die
1632 - fi
1633 -
1634 - [ -d "${FILESDIR}/${PV}" ] && \
1635 - EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch
1636 -
1637 - # correct lua versioning
1638 - sed -i -e 's/\(LIB_VERSION = \)6:1:1/\10:0:0/' src/Makefile || die
1639 -
1640 - sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html || die
1641 -
1642 - if ! use readline ; then
1643 - sed -i -e '/#define LUA_USE_READLINE/d' src/luaconf.h || die
1644 - fi
1645 -
1646 - # Using dynamic linked lua is not recommended for performance
1647 - # reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
1648 - # Mainly, this is of concern if your arch is poor with GPRs, like x86
1649 - # Note that this only affects the interpreter binary (named lua), not the lua
1650 - # compiler (built statically) nor the lua libraries (both shared and static
1651 - # are installed)
1652 - if use static ; then
1653 - sed -i -e 's:\(-export-dynamic\):-static \1:' src/Makefile || die
1654 - fi
1655 -
1656 - # upstream does not use libtool, but we do (see bug #336167)
1657 - cp "${FILESDIR}/configure.in" "${S}/configure.ac" || die
1658 - eautoreconf
1659 -
1660 - # A slotted Lua uses different directories for headers & names for
1661 - # libraries, and pkgconfig should reflect that.
1662 - sed -r -i \
1663 - -e "/^Libs:/s,((-llua)($| )),\2${SLOT}\3," \
1664 - -e "/^Cflags:/s,((-I..includedir.)($| )),\2/lua${SLOT}\3," \
1665 - "${S}"/etc/lua.pc
1666 -
1667 - # custom Makefiles
1668 - multilib_copy_sources
1669 -}
1670 -
1671 -multilib_src_configure() {
1672 - sed -i \
1673 - -e 's:\(define LUA_ROOT\s*\).*:\1"'${EPREFIX}'/usr/":' \
1674 - -e "s:\(define LUA_CDIR\s*LUA_ROOT \"\)lib:\1$(get_libdir):" \
1675 - src/luaconf.h \
1676 - || die "failed patching luaconf.h"
1677 -
1678 - econf
1679 -}
1680 -
1681 -multilib_src_compile() {
1682 - tc-export CC
1683 -
1684 - # what to link to liblua
1685 - liblibs="-lm"
1686 - liblibs="${liblibs} $(dlopen_lib)"
1687 -
1688 - # what to link to the executables
1689 - mylibs=
1690 - use readline && mylibs="-lreadline"
1691 -
1692 - cd src
1693 -
1694 - local myCFLAGS=""
1695 - use deprecated && myCFLAGS="-DLUA_COMPAT_ALL"
1696 -
1697 - case "${CHOST}" in
1698 - *-mingw*) : ;;
1699 - *) myCFLAGS+=" -DLUA_USE_LINUX" ;;
1700 - esac
1701 -
1702 - emake CC="${CC}" CFLAGS="${myCFLAGS} ${CFLAGS}" \
1703 - SYSLDFLAGS="${LDFLAGS}" \
1704 - RPATH="${EPREFIX}/usr/$(get_libdir)/" \
1705 - LUA_LIBS="${mylibs}" \
1706 - LIB_LIBS="${liblibs}" \
1707 - V=$(get_version_component_range 1-2) \
1708 - gentoo_all
1709 -}
1710 -
1711 -multilib_src_install() {
1712 - emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
1713 - V=${SLOT} gentoo_install
1714 -
1715 - # We want packages to find our things...
1716 - cp "${FILESDIR}/lua.pc" "${WORKDIR}"
1717 - sed -i \
1718 - -e "s:^prefix= :prefix= ${EPREFIX}:" \
1719 - -e "s:^V=.*:V= ${PATCH_PV}:" \
1720 - -e "s:^R=.*:R= ${PV}:" \
1721 - -e "s:/,lib,:/$(get_libdir):g" \
1722 - "${WORKDIR}/lua.pc"
1723 -
1724 - insinto "/usr/$(get_libdir)/pkgconfig"
1725 - newins "${WORKDIR}/lua.pc" "lua${SLOT}.pc"
1726 -}
1727 -
1728 -multilib_src_install_all() {
1729 - dodoc README
1730 - dohtml doc/*.html doc/*.png doc/*.css doc/*.gif
1731 -
1732 - newman doc/lua.1 lua${SLOT}.1
1733 - newman doc/luac.1 luac${SLOT}.1
1734 -}
1735 -
1736 -# Makefile contains a dummy target that doesn't do tests
1737 -# but causes issues with slotted lua (bug #510360)
1738 -src_test() { :; }
1739
1740 diff --git a/dev-lang/lua/lua-5.3.3.ebuild b/dev-lang/lua/lua-5.3.3.ebuild
1741 deleted file mode 100644
1742 index 04a18b45f76..00000000000
1743 --- a/dev-lang/lua/lua-5.3.3.ebuild
1744 +++ /dev/null
1745 @@ -1,136 +0,0 @@
1746 -# Copyright 1999-2020 Gentoo Authors
1747 -# Distributed under the terms of the GNU General Public License v2
1748 -
1749 -EAPI=5
1750 -
1751 -inherit eutils autotools multilib multilib-minimal portability toolchain-funcs versionator
1752 -
1753 -DESCRIPTION="A powerful light-weight programming language designed for extending applications"
1754 -HOMEPAGE="http://www.lua.org/"
1755 -SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
1756 -
1757 -LICENSE="MIT"
1758 -SLOT="5.3"
1759 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
1760 -IUSE="+deprecated emacs readline static"
1761 -
1762 -RDEPEND="readline? ( sys-libs/readline:0= )
1763 - app-eselect/eselect-lua
1764 - !dev-lang/lua:0"
1765 -DEPEND="${RDEPEND}
1766 - sys-devel/libtool"
1767 -PDEPEND="emacs? ( app-emacs/lua-mode )"
1768 -
1769 -MULTILIB_WRAPPED_HEADERS=(
1770 - /usr/include/lua${SLOT}/luaconf.h
1771 -)
1772 -
1773 -src_prepare() {
1774 - local PATCH_PV=$(get_version_component_range 1-2)
1775 -
1776 - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r1.patch
1777 -
1778 - # use glibtool on Darwin (versus Apple libtool)
1779 - if [[ ${CHOST} == *-darwin* ]] ; then
1780 - sed -i -e '/LIBTOOL = /s:/libtool:/glibtool:' \
1781 - Makefile src/Makefile || die
1782 - fi
1783 -
1784 - [ -d "${FILESDIR}/${PV}" ] && \
1785 - EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch
1786 -
1787 - # correct lua versioning
1788 - sed -i -e 's/\(LIB_VERSION = \)6:1:1/\10:0:0/' src/Makefile || die
1789 -
1790 - sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html || die
1791 -
1792 - if ! use readline ; then
1793 - sed -i -e '/#define LUA_USE_READLINE/d' src/luaconf.h || die
1794 - fi
1795 -
1796 - # Using dynamic linked lua is not recommended for performance
1797 - # reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
1798 - # Mainly, this is of concern if your arch is poor with GPRs, like x86
1799 - # Note that this only affects the interpreter binary (named lua), not the lua
1800 - # compiler (built statically) nor the lua libraries (both shared and static
1801 - # are installed)
1802 - if use static ; then
1803 - sed -i -e 's:\(-export-dynamic\):-static \1:' src/Makefile || die
1804 - fi
1805 -
1806 - # upstream does not use libtool, but we do (see bug #336167)
1807 - cp "${FILESDIR}/configure.in" "${S}/configure.ac" || die
1808 - eautoreconf
1809 -
1810 - # custom Makefiles
1811 - multilib_copy_sources
1812 -}
1813 -
1814 -multilib_src_configure() {
1815 - sed -i \
1816 - -e 's:\(define LUA_ROOT\s*\).*:\1"'${EPREFIX}'/usr/":' \
1817 - -e "s:\(define LUA_CDIR\s*LUA_ROOT \"\)lib:\1$(get_libdir):" \
1818 - src/luaconf.h \
1819 - || die "failed patching luaconf.h"
1820 -
1821 - econf
1822 -}
1823 -
1824 -multilib_src_compile() {
1825 - tc-export CC
1826 -
1827 - # what to link to liblua
1828 - liblibs="-lm"
1829 - liblibs="${liblibs} $(dlopen_lib)"
1830 -
1831 - # what to link to the executables
1832 - mylibs=
1833 - use readline && mylibs="-lreadline"
1834 -
1835 - cd src
1836 -
1837 - local myCFLAGS=""
1838 - use deprecated && myCFLAGS="-DLUA_COMPAT_ALL"
1839 -
1840 - case "${CHOST}" in
1841 - *-mingw*) : ;;
1842 - *) myCFLAGS+=" -DLUA_USE_LINUX" ;;
1843 - esac
1844 -
1845 - emake CC="${CC}" CFLAGS="${myCFLAGS} ${CFLAGS}" \
1846 - SYSLDFLAGS="${LDFLAGS}" \
1847 - RPATH="${EPREFIX}/usr/$(get_libdir)/" \
1848 - LUA_LIBS="${mylibs}" \
1849 - LIB_LIBS="${liblibs}" \
1850 - V=$(get_version_component_range 1-2) \
1851 - gentoo_all
1852 -}
1853 -
1854 -multilib_src_install() {
1855 - emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
1856 - V=${SLOT} gentoo_install
1857 -
1858 - # We want packages to find our things...
1859 - cp "${FILESDIR}/lua.pc" "${WORKDIR}"
1860 - sed -i \
1861 - -e "s:^prefix= :prefix= ${EPREFIX}:" \
1862 - -e "s:^V=.*:V= ${PATCH_PV}:" \
1863 - -e "s:^R=.*:R= ${PV}:" \
1864 - -e "s:/,lib,:/$(get_libdir):g" \
1865 - "${WORKDIR}/lua.pc"
1866 -
1867 - insinto "/usr/$(get_libdir)/pkgconfig"
1868 - newins "${WORKDIR}/lua.pc" "lua${SLOT}.pc"
1869 -}
1870 -
1871 -multilib_src_install_all() {
1872 - dodoc README
1873 - dohtml doc/*.html doc/*.png doc/*.css doc/*.gif
1874 -
1875 - newman doc/lua.1 lua${SLOT}.1
1876 - newman doc/luac.1 luac${SLOT}.1
1877 -}
1878 -
1879 -# Makefile contains a dummy target that doesn't do tests
1880 -# but causes issues with slotted lua (bug #510360)
1881 -src_test() { :; }
1882
1883 diff --git a/dev-lang/lua/lua-5.3.5-r1.ebuild b/dev-lang/lua/lua-5.3.5-r1.ebuild
1884 deleted file mode 100644
1885 index 42cfd8a332a..00000000000
1886 --- a/dev-lang/lua/lua-5.3.5-r1.ebuild
1887 +++ /dev/null
1888 @@ -1,193 +0,0 @@
1889 -# Copyright 1999-2020 Gentoo Authors
1890 -# Distributed under the terms of the GNU General Public License v2
1891 -
1892 -EAPI=5
1893 -
1894 -inherit eutils autotools multilib multilib-minimal portability toolchain-funcs versionator
1895 -
1896 -DESCRIPTION="A powerful light-weight programming language designed for extending applications"
1897 -HOMEPAGE="http://www.lua.org/"
1898 -TEST_PV="5.3.4" # no 5.3.5-specific release yet
1899 -TEST_A="${PN}-${TEST_PV}-tests.tar.gz"
1900 -PKG_A="${P}.tar.gz"
1901 -SRC_URI="
1902 - http://www.lua.org/ftp/${PKG_A}
1903 - test? ( https://www.lua.org/tests/${TEST_A} )"
1904 -
1905 -LICENSE="MIT"
1906 -SLOT="5.3"
1907 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
1908 -IUSE="+deprecated emacs readline static test test-complete"
1909 -RESTRICT="!test? ( test )"
1910 -
1911 -RDEPEND="readline? ( sys-libs/readline:0= )
1912 - app-eselect/eselect-lua
1913 - !dev-lang/lua:0"
1914 -DEPEND="${RDEPEND}
1915 - sys-devel/libtool"
1916 -PDEPEND="emacs? ( app-emacs/lua-mode )"
1917 -
1918 -MULTILIB_WRAPPED_HEADERS=(
1919 - /usr/include/lua${SLOT}/luaconf.h
1920 -)
1921 -
1922 -src_prepare() {
1923 - local PATCH_PV=$(get_version_component_range 1-2)
1924 -
1925 - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r1.patch
1926 -
1927 - # use glibtool on Darwin (versus Apple libtool)
1928 - if [[ ${CHOST} == *-darwin* ]] ; then
1929 - sed -i -e '/LIBTOOL = /s:/libtool:/glibtool:' \
1930 - Makefile src/Makefile || die
1931 - fi
1932 -
1933 - [ -d "${FILESDIR}/${PV}" ] && \
1934 - EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch
1935 -
1936 - # correct lua versioning
1937 - sed -i -e 's/\(LIB_VERSION = \)6:1:1/\10:0:0/' src/Makefile || die
1938 -
1939 - sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html || die
1940 -
1941 - if ! use readline ; then
1942 - sed -i -e '/#define LUA_USE_READLINE/d' src/luaconf.h || die
1943 - fi
1944 -
1945 - # Using dynamic linked lua is not recommended for performance
1946 - # reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
1947 - # Mainly, this is of concern if your arch is poor with GPRs, like x86
1948 - # Note that this only affects the interpreter binary (named lua), not the lua
1949 - # compiler (built statically) nor the lua libraries (both shared and static
1950 - # are installed)
1951 - if use static ; then
1952 - sed -i -e 's:\(-export-dynamic\):-static \1:' src/Makefile || die
1953 - fi
1954 -
1955 - # upstream does not use libtool, but we do (see bug #336167)
1956 - cp "${FILESDIR}/configure.in" "${S}/configure.ac" || die
1957 - eautoreconf
1958 -
1959 - # custom Makefiles
1960 - multilib_copy_sources
1961 -}
1962 -
1963 -multilib_src_configure() {
1964 - sed -i \
1965 - -e 's:\(define LUA_ROOT\s*\).*:\1"'${EPREFIX}'/usr/":' \
1966 - -e "s:\(define LUA_CDIR\s*LUA_ROOT \"\)lib:\1$(get_libdir):" \
1967 - src/luaconf.h \
1968 - || die "failed patching luaconf.h"
1969 -
1970 - econf
1971 -}
1972 -
1973 -multilib_src_compile() {
1974 - tc-export CC
1975 -
1976 - # what to link to liblua
1977 - liblibs="-lm"
1978 - liblibs="${liblibs} $(dlopen_lib)"
1979 -
1980 - # what to link to the executables
1981 - mylibs=
1982 - use readline && mylibs="-lreadline"
1983 -
1984 - cd src
1985 -
1986 - local myCFLAGS=""
1987 - use deprecated && myCFLAGS="-DLUA_COMPAT_ALL"
1988 -
1989 - case "${CHOST}" in
1990 - *-mingw*) : ;;
1991 - *) myCFLAGS+=" -DLUA_USE_LINUX" ;;
1992 - esac
1993 -
1994 - emake CC="${CC}" CFLAGS="${myCFLAGS} ${CFLAGS}" \
1995 - SYSLDFLAGS="${LDFLAGS}" \
1996 - RPATH="${EPREFIX}/usr/$(get_libdir)/" \
1997 - LUA_LIBS="${mylibs}" \
1998 - LIB_LIBS="${liblibs}" \
1999 - V=$(get_version_component_range 1-2) \
2000 - gentoo_all
2001 -}
2002 -
2003 -multilib_src_install() {
2004 - emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
2005 - V=${SLOT} gentoo_install
2006 -
2007 - case $SLOT in
2008 - 0)
2009 - LIBNAME="lua"
2010 - INCLUDEDIR_SUFFIX=''
2011 - ;;
2012 - *) LIBNAME="lua${SLOT}"
2013 - INCLUDEDIR_SUFFIX="/lua${SLOT}"
2014 - ;;
2015 - esac
2016 -
2017 - # We want packages to find our things...
2018 - # A slotted Lua uses different directories for headers & names for
2019 - # libraries, and pkgconfig should reflect that.
2020 - local PATCH_PV=$(get_version_component_range 1-2)
2021 - cp "${FILESDIR}/lua.pc" "${WORKDIR}" || die
2022 - sed -r -i \
2023 - -e "s:^prefix= :prefix= ${EPREFIX}:" \
2024 - -e "s:^V=.*:V= ${PATCH_PV}:" \
2025 - -e "s:^R=.*:R= ${PV}:" \
2026 - -e "s:/,lib,:/$(get_libdir):g" \
2027 - -e "/^Libs:/s:( )(-llua)($| ):\1-l${LIBNAME}\3:" \
2028 - -e "/^includedir=/s:include$:include${INCLUDEDIR_SUFFIX}:" \
2029 - "${WORKDIR}/lua.pc" || die
2030 -
2031 - insinto "/usr/$(get_libdir)/pkgconfig"
2032 - newins "${WORKDIR}/lua.pc" "lua${SLOT}.pc"
2033 - # Copy Debian's symlink support:
2034 - # https://salsa.debian.org/lua-team/lua5.3/blob/master/debian/rules#L19
2035 - # FreeBSD calls the pkgconfig 'lua-5.3.pc'
2036 - # Older systems called it 'lua53.pc'
2037 - dosym "lua${SLOT}.pc" "/usr/$(get_libdir)/pkgconfig/lua-${SLOT}.pc"
2038 - dosym "lua${SLOT}.pc" "/usr/$(get_libdir)/pkgconfig/lua${SLOT/.}.pc"
2039 -}
2040 -
2041 -multilib_src_install_all() {
2042 - dodoc README
2043 - dohtml doc/*.html doc/*.png doc/*.css doc/*.gif
2044 -
2045 - newman doc/lua.1 lua${SLOT}.1
2046 - newman doc/luac.1 luac${SLOT}.1
2047 -}
2048 -
2049 -# Makefile contains a dummy target that doesn't do tests
2050 -# but causes issues with slotted lua (bug #510360)
2051 -src_test() {
2052 - debug-print-function ${FUNCNAME} "$@"
2053 - cd "${WORKDIR}/lua-${TEST_PV}-tests" || die
2054 - # https://www.lua.org/tests/
2055 - # There are two sets:
2056 - # basic
2057 - # complete.
2058 - #
2059 - # The basic subset is selected by passing -e'_U=true'
2060 - # The complete set is noted to contain tests that may consume too much memory or have non-portable tests.
2061 - # attrib.lua for example needs some multilib customization (have to compile the stuff in libs/ for each ABI)
2062 - use test-complete || TEST_OPTS="-e_U=true"
2063 - TEST_MARKER="${T}/test.failed"
2064 - rm -f "${TEST_MARKER}"
2065 -
2066 - # If we are failing, set the marker file, and only check it after done all ABIs
2067 - abi_src_test() {
2068 - debug-print-function ${FUNCNAME} "$@"
2069 - TEST_LOG="${T}/test.${MULTIBUILD_ID}.log"
2070 - eval "${BUILD_DIR}"/src/lua${SLOT} ${TEST_OPTS} all.lua 2>&1 | tee "${TEST_LOG}" || die
2071 - grep -sq -e "final OK" "${TEST_LOG}" || echo "FAIL ${MULTIBUILD_ID}" >>"${TEST_MARKER}"
2072 - return 0
2073 - }
2074 -
2075 - multilib_foreach_abi abi_src_test
2076 -
2077 - if [ -e "${TEST_MARKER}" ]; then
2078 - cat "${TEST_MARKER}"
2079 - die "Tests failed"
2080 - fi
2081 -}
2082
2083 diff --git a/dev-lang/lua/lua-5.3.5.ebuild b/dev-lang/lua/lua-5.3.5.ebuild
2084 deleted file mode 100644
2085 index 963fb72c4f3..00000000000
2086 --- a/dev-lang/lua/lua-5.3.5.ebuild
2087 +++ /dev/null
2088 @@ -1,179 +0,0 @@
2089 -# Copyright 1999-2020 Gentoo Authors
2090 -# Distributed under the terms of the GNU General Public License v2
2091 -
2092 -EAPI=5
2093 -
2094 -inherit eutils autotools multilib multilib-minimal portability toolchain-funcs versionator
2095 -
2096 -DESCRIPTION="A powerful light-weight programming language designed for extending applications"
2097 -HOMEPAGE="http://www.lua.org/"
2098 -TEST_PV="5.3.4" # no 5.3.5-specific release yet
2099 -TEST_A="${PN}-${TEST_PV}-tests.tar.gz"
2100 -PKG_A="${P}.tar.gz"
2101 -SRC_URI="
2102 - http://www.lua.org/ftp/${PKG_A}
2103 - test? ( https://www.lua.org/tests/${TEST_A} )"
2104 -
2105 -LICENSE="MIT"
2106 -SLOT="5.3"
2107 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
2108 -IUSE="+deprecated emacs readline static test test-complete"
2109 -RESTRICT="!test? ( test )"
2110 -
2111 -RDEPEND="readline? ( sys-libs/readline:0= )
2112 - app-eselect/eselect-lua
2113 - !dev-lang/lua:0"
2114 -DEPEND="${RDEPEND}
2115 - sys-devel/libtool"
2116 -PDEPEND="emacs? ( app-emacs/lua-mode )"
2117 -
2118 -MULTILIB_WRAPPED_HEADERS=(
2119 - /usr/include/lua${SLOT}/luaconf.h
2120 -)
2121 -
2122 -src_prepare() {
2123 - local PATCH_PV=$(get_version_component_range 1-2)
2124 -
2125 - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r1.patch
2126 -
2127 - # use glibtool on Darwin (versus Apple libtool)
2128 - if [[ ${CHOST} == *-darwin* ]] ; then
2129 - sed -i -e '/LIBTOOL = /s:/libtool:/glibtool:' \
2130 - Makefile src/Makefile || die
2131 - fi
2132 -
2133 - [ -d "${FILESDIR}/${PV}" ] && \
2134 - EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch
2135 -
2136 - # correct lua versioning
2137 - sed -i -e 's/\(LIB_VERSION = \)6:1:1/\10:0:0/' src/Makefile || die
2138 -
2139 - sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html || die
2140 -
2141 - if ! use readline ; then
2142 - sed -i -e '/#define LUA_USE_READLINE/d' src/luaconf.h || die
2143 - fi
2144 -
2145 - # Using dynamic linked lua is not recommended for performance
2146 - # reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
2147 - # Mainly, this is of concern if your arch is poor with GPRs, like x86
2148 - # Note that this only affects the interpreter binary (named lua), not the lua
2149 - # compiler (built statically) nor the lua libraries (both shared and static
2150 - # are installed)
2151 - if use static ; then
2152 - sed -i -e 's:\(-export-dynamic\):-static \1:' src/Makefile || die
2153 - fi
2154 -
2155 - # upstream does not use libtool, but we do (see bug #336167)
2156 - cp "${FILESDIR}/configure.in" "${S}/configure.ac" || die
2157 - eautoreconf
2158 -
2159 - # A slotted Lua uses different directories for headers & names for
2160 - # libraries, and pkgconfig should reflect that.
2161 - sed -r -i \
2162 - -e "/^Libs:/s,((-llua)($| )),\2${SLOT}\3," \
2163 - -e "/^Cflags:/s,((-I..includedir.)($| )),\2/lua${SLOT}\3," \
2164 - "${S}"/etc/lua.pc
2165 -
2166 - # custom Makefiles
2167 - multilib_copy_sources
2168 -}
2169 -
2170 -multilib_src_configure() {
2171 - sed -i \
2172 - -e 's:\(define LUA_ROOT\s*\).*:\1"'${EPREFIX}'/usr/":' \
2173 - -e "s:\(define LUA_CDIR\s*LUA_ROOT \"\)lib:\1$(get_libdir):" \
2174 - src/luaconf.h \
2175 - || die "failed patching luaconf.h"
2176 -
2177 - econf
2178 -}
2179 -
2180 -multilib_src_compile() {
2181 - tc-export CC
2182 -
2183 - # what to link to liblua
2184 - liblibs="-lm"
2185 - liblibs="${liblibs} $(dlopen_lib)"
2186 -
2187 - # what to link to the executables
2188 - mylibs=
2189 - use readline && mylibs="-lreadline"
2190 -
2191 - cd src
2192 -
2193 - local myCFLAGS=""
2194 - use deprecated && myCFLAGS="-DLUA_COMPAT_ALL"
2195 -
2196 - case "${CHOST}" in
2197 - *-mingw*) : ;;
2198 - *) myCFLAGS+=" -DLUA_USE_LINUX" ;;
2199 - esac
2200 -
2201 - emake CC="${CC}" CFLAGS="${myCFLAGS} ${CFLAGS}" \
2202 - SYSLDFLAGS="${LDFLAGS}" \
2203 - RPATH="${EPREFIX}/usr/$(get_libdir)/" \
2204 - LUA_LIBS="${mylibs}" \
2205 - LIB_LIBS="${liblibs}" \
2206 - V=$(get_version_component_range 1-2) \
2207 - gentoo_all
2208 -}
2209 -
2210 -multilib_src_install() {
2211 - emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
2212 - V=${SLOT} gentoo_install
2213 -
2214 - # We want packages to find our things...
2215 - cp "${FILESDIR}/lua.pc" "${WORKDIR}"
2216 - sed -i \
2217 - -e "s:^prefix= :prefix= ${EPREFIX}:" \
2218 - -e "s:^V=.*:V= ${PATCH_PV}:" \
2219 - -e "s:^R=.*:R= ${PV}:" \
2220 - -e "s:/,lib,:/$(get_libdir):g" \
2221 - "${WORKDIR}/lua.pc"
2222 -
2223 - insinto "/usr/$(get_libdir)/pkgconfig"
2224 - newins "${WORKDIR}/lua.pc" "lua${SLOT}.pc"
2225 -}
2226 -
2227 -multilib_src_install_all() {
2228 - dodoc README
2229 - dohtml doc/*.html doc/*.png doc/*.css doc/*.gif
2230 -
2231 - newman doc/lua.1 lua${SLOT}.1
2232 - newman doc/luac.1 luac${SLOT}.1
2233 -}
2234 -
2235 -# Makefile contains a dummy target that doesn't do tests
2236 -# but causes issues with slotted lua (bug #510360)
2237 -src_test() {
2238 - debug-print-function ${FUNCNAME} "$@"
2239 - cd "${WORKDIR}/lua-${TEST_PV}-tests" || die
2240 - # https://www.lua.org/tests/
2241 - # There are two sets:
2242 - # basic
2243 - # complete.
2244 - #
2245 - # The basic subset is selected by passing -e'_U=true'
2246 - # The complete set is noted to contain tests that may consume too much memory or have non-portable tests.
2247 - # attrib.lua for example needs some multilib customization (have to compile the stuff in libs/ for each ABI)
2248 - use test-complete || TEST_OPTS="-e_U=true"
2249 - TEST_MARKER="${T}/test.failed"
2250 - rm -f "${TEST_MARKER}"
2251 -
2252 - # If we are failing, set the marker file, and only check it after done all ABIs
2253 - abi_src_test() {
2254 - debug-print-function ${FUNCNAME} "$@"
2255 - TEST_LOG="${T}/test.${MULTIBUILD_ID}.log"
2256 - eval "${BUILD_DIR}"/src/lua${SLOT} ${TEST_OPTS} all.lua 2>&1 | tee "${TEST_LOG}" || die
2257 - grep -sq -e "final OK" "${TEST_LOG}" || echo "FAIL ${MULTIBUILD_ID}" >>"${TEST_MARKER}"
2258 - return 0
2259 - }
2260 -
2261 - multilib_foreach_abi abi_src_test
2262 -
2263 - if [ -e "${TEST_MARKER}" ]; then
2264 - cat "${TEST_MARKER}"
2265 - die "Tests failed"
2266 - fi
2267 -}