summaryrefslogtreecommitdiff
path: root/dev-lang/lua
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-08-24 20:48:34 +0100
committerV3n3RiX <venerix@koprulu.sector>2022-08-24 20:48:34 +0100
commit9d0673651c57438d51e18c6b8ca894d0491b2df3 (patch)
treec5b6cd187b8998d2c56d3b279ac425973d4c3a33 /dev-lang/lua
parentbe21a4c281fc76681a84dd2f103e850866ce4946 (diff)
gentoo auto-resync : 24:08:2022 - 20:48:33
Diffstat (limited to 'dev-lang/lua')
-rw-r--r--dev-lang/lua/Manifest12
-rw-r--r--dev-lang/lua/lua-5.1.5-r106.ebuild151
-rw-r--r--dev-lang/lua/lua-5.1.5-r107.ebuild3
-rw-r--r--dev-lang/lua/lua-5.3.6-r2.ebuild200
-rw-r--r--dev-lang/lua/lua-5.3.6-r3.ebuild3
-rw-r--r--dev-lang/lua/lua-5.4.2-r1.ebuild197
-rw-r--r--dev-lang/lua/lua-5.4.2-r2.ebuild203
-rw-r--r--dev-lang/lua/lua-5.4.4.ebuild3
8 files changed, 9 insertions, 763 deletions
diff --git a/dev-lang/lua/Manifest b/dev-lang/lua/Manifest
index 6046512a4275..6c24804a946d 100644
--- a/dev-lang/lua/Manifest
+++ b/dev-lang/lua/Manifest
@@ -11,15 +11,9 @@ AUX lua.pc 658 BLAKE2B 580504c8162c9cbde35b4a817c688b955cad1a35b1c21ed527488eda6
DIST lua-5.1.5.tar.gz 221213 BLAKE2B 915eb8e8c9d7e460eacf1d7a59309c60dfc0f5d9d3d76fbc9764e7cae85920b95096db1c27b69ac53378a145c29efde403e88166a1332a67150d9d3a897aba02 SHA512 0142fefcbd13afcd9b201403592aa60620011cc8e8559d4d2db2f92739d18186860989f48caa45830ff4f99bfc7483287fd3ff3a16d4dec928e2767ce4d542a9
DIST lua-5.3.4-tests.tar.gz 103438 BLAKE2B ac82708022e7729039111c3df4fe24302c8d0efb224afb4828871ac085a3d64c41d674a6f9369035de01ed1f7f75a3d2ce16917f37e774e923216aac0be03e09 SHA512 79575d100a2efabc8243f55b55d912443e09ef7e8b0219cb93541d85c2ba802fb9538015e1228703f09ca57bdb28a640a8f1fa0735716ba1e4bca2179c712dfb
DIST lua-5.3.6.tar.gz 303770 BLAKE2B 07c37c56f43095a4f6ca8eb8b3adf19afd53107c02b62b2bcb3619565cb2100d5f823493eef93092d5e312b30fc28885a6d9e8f0ba5a23b5bed86dc4515a5d61 SHA512 ccc380d5e114d54504de0bfb0321ca25ec325d6ff1bfee44b11870b660762d1a9bf120490c027a0088128b58bb6b5271bbc648400cab84d2dc22b512c4841681
-DIST lua-5.4.2-tests.tar.gz 128901 BLAKE2B 10e4f0e8760f9cbd4761fa26665008ae7412539f79a6a7687029808f08f0ae4a24721e787e2e87e5080c16e9dcce8577a7a39ddc6d3e483a3cfe11756139594e SHA512 1516c59deca211c38444bbf97b18e988e939209b03915d3691d756eeed31b52e8d3a1f05b71ac0b561965274c7b6f3afc4244cd2e9069995696e737e2d9dd40b
-DIST lua-5.4.2.tar.gz 353472 BLAKE2B 7e0e642684df635ed1c48db45989e86a2638024e30a170addf700b0c7d32276f1eaef80898539c671039c20cb0bed4861b12c58f4b8211653a17e89bad278d87 SHA512 9454a6ffd973598f2f4a2399834c31c4d5090bd12e716776e3189aa57760319d114ee64a8338bbc2ef5e08150bf0adc2ad94a1b2677f38538a43359969d4d920
DIST lua-5.4.4-tests.tar.gz 134094 BLAKE2B 63f5888a506f504f849fb2000cf551960df8eca3107601dcc8243e8ea5a1b13a70bff7dea4aebe3ab35b7e9df58c2ca44a7a27aa4de82240877eb8d7a017642e SHA512 08b3d764b3f362a2cddf5a23e71b16eea96a234a970fa0048bab358ebbd77f99d9bd132af12254383c5bb5426516e1ce2107e529e88d3963869255f5a41198ef
DIST lua-5.4.4.tar.gz 360876 BLAKE2B 8747ef5c83bd4c54b73eeaad6991ab5fccc54ee000973afd9cf3367b8945f03c54e843ec88c48043003cd9d3b42281c593cb485b7165add2744cfea06d8b7668 SHA512 af0c35d5ba00fecbb2dd617bd7b825edf7418a16a73076e04f2a0df58cdbf098dc3ff4402e974afd789eb5d86d2e12ec6df9c84b99b23656ea694a85f83bcd21
-EBUILD lua-5.1.5-r106.ebuild 4034 BLAKE2B 854878c2829b16de02a0cf011b1b35b22f130095c2e671e755a1a23153a27a612a8c9ec5443b97c550e98396d9845e49245832e8ce655334692a6ec77495dc88 SHA512 294a4daad1aaafbdbaf841a9f9e6ba1d0bbb0892138ce065188e2b4e7cfb7a85ca4a88b069862d0f339617ff0b7ce97d119db06736ea4609ea2801cb57f2967e
-EBUILD lua-5.1.5-r107.ebuild 4237 BLAKE2B bb46179ee88b6a45134a4c780be31c41b6faf981b80500ddb8a0e9c56f21d7c6e05115b6ee3213e77292a6b8b8e7cb7226be41cb33edd3576f636266fb1e84d6 SHA512 6be82f201a99c331d750b9fcb7c50529bdcb6af25b58668699498a5c3e52e9b095b439d32a7d5bbffd2b4475749a1f4f6e84f49a9df47d02fcdf4ea449fdaf07
-EBUILD lua-5.3.6-r2.ebuild 5752 BLAKE2B 88d746cbe0643295ebacca48b1343acf3c1ddce29b9249df65e498cac970221adb15841b978d7ed16b78a503f107d307f3a6e6b1dec5f2ab7f0a086a65d8054e SHA512 eb9a993fd34799b95ae6fe7d9ee6cc2b05f8298ed0c91546561cd4683a4c57c9c74786ce0950f4b82cd96c4e7d663400bacda9b8734bd440abbc3d312891c428
-EBUILD lua-5.3.6-r3.ebuild 5955 BLAKE2B e06a1edc5866a35ea3c73f64517448b77ea56d2469e920cb7e825f9d46ce0955e9b00e0136d8313a40a586a54ba9bfab1fa11f2cd4b7b9c02f2aabd1fe454657 SHA512 da17cee0836f28f08c3dc0d241d87fe5aa343ddb6f8b90964247da7d69d232aca52d8d31aaf13ed39a46441680ab63eea049c632b7548b9d9f7fcf0fea633f62
-EBUILD lua-5.4.2-r1.ebuild 5698 BLAKE2B 389a70fdbbea2c66d3c4c45471e67775c106bffbbf622cbddeb6803fef6b88da5debecc3c2107b23e4b33c417eec4649388b6c7f575f7b8926b5947edc284479 SHA512 eeafbd5447750b6ee1f32f11edaff20365dcfba88ab21d19c14e3049b896cb9f44c826e4e59a969e244b53cc3f8a3dfff7aea8adcfdb7124c2b4168bd57b2336
-EBUILD lua-5.4.2-r2.ebuild 5905 BLAKE2B 427d512b784ab7d9e7e2c4711f2493e36390c5921d95d387403ab9cc7896da56588ab5b7f0aa9cf32b8be514bc7822bc55567dbcd48a11821adf9f46247b8eac SHA512 963a014a6e1906f7ef94fefee1f1a9414b997a653d20611604a175b61ebb0f30ff06cade839f43e0059425c07af185738bd43ae3b8b29de64942ee69cbdd7195
-EBUILD lua-5.4.4.ebuild 5904 BLAKE2B f7ac0aa7e2351b96172853b7d7eb2fd64f16732df9a6ccea1c48771d217435933da15fcebb6bd44c5165e81b5b1a6bfe664ba942395265afa2823e86ea09847a SHA512 f0fc11115af1fd606baa7612938d7cbc264ca08b065f8b6821cfb0ccda773341da314bdad93b87ca0ac8a8646c390a754c406f5354748c06493fd3f97700e279
+EBUILD lua-5.1.5-r107.ebuild 4229 BLAKE2B de634ec37a5c960cc9a179f6dd74dff771d41e59f417da9576b4a643ae3987de2b67e5a318c10fedc0e59ae1d1420060c9f79472cbd04916445d71bca7490cdb SHA512 936d8ee0b7ca8d90ede57a8d8425e2c8fea635817a936865cc504e50d6c616a3d569c15a32dba3884dc9b9de48a2dcd722eadd117cebb09e211744d2ac0885f0
+EBUILD lua-5.3.6-r3.ebuild 5947 BLAKE2B 6a8fbe4b1bc089b182980cd93a649ada7409508dcf938d4849125b141295ed5b4a25d74c0159dede2c4f98f001a31a9c78adada30440b0f60f6a83b3aaba7a2f SHA512 efca3e1c8e79e1c2ca1c9b544bb34e1d3bb96acd7db61ca1a2e390e220129db9b77bfb1cb5bde09a90f1c5690a41a47faa6305168b1e8b8addfb4c64aa299b00
+EBUILD lua-5.4.4.ebuild 5896 BLAKE2B cb16d7a7c476e828f19e394ff07ae072a11a829171e743f597c62df501ca070d2c3b2f47c0f18b6221e5982b0f11a07d9f24a017858130812672aa4418cd2ce5 SHA512 5e4b151a76a08413f106c7602052d4675df523f40b311e86394e08570f155b5a8734c6b5c8aff1bffeb81a5678d19a5188e94b2531d9363616698d38c237f563
MISC metadata.xml 525 BLAKE2B cd450b981b7ae039f32a0c6484548c59eff8d9c032975c84ef9b5530219413f7ff7a95d66593da6252c08808189cc61f02fbef88efe36f71dc64d9aec3c0e90e SHA512 4f127caf48df93a75b562f516e3a522ae3edcc601f434b2d034d76b106cbfd96848e6898bdc850acf757101843696e44da9ab1f42292e96bd294c30b631ccaa8
diff --git a/dev-lang/lua/lua-5.1.5-r106.ebuild b/dev-lang/lua/lua-5.1.5-r106.ebuild
deleted file mode 100644
index 27d6f60db390..000000000000
--- a/dev-lang/lua/lua-5.1.5-r106.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit multilib multilib-minimal portability toolchain-funcs
-
-DESCRIPTION="A powerful light-weight programming language designed for extending applications"
-HOMEPAGE="https://www.lua.org/"
-SRC_URI="https://www.lua.org/ftp/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="5.1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+deprecated readline"
-
-COMMON_DEPEND="
- >=app-eselect/eselect-lua-3
- readline? ( >=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}] )
- !dev-lang/lua:0"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND="sys-devel/libtool"
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/lua${SLOT}/luaconf.h
-)
-
-src_prepare() {
- PATCHES=(
- "${FILESDIR}/lua-5.1.5-make.patch"
- "${FILESDIR}/${PN}-$(ver_cut 1-2)-module_paths.patch"
- )
- if ! use deprecated ; then
- # patches from 5.1.4 still apply
- PATCHES+=(
- "${FILESDIR}"/${PN}-5.1.4-deprecated.patch
- "${FILESDIR}"/${PN}-5.1.4-test.patch
- )
- fi
- if ! use readline ; then
- PATCHES+=(
- "${FILESDIR}"/${PN}-$(ver_cut 1-2)-readline.patch
- )
- fi
-
- default
-
- # use glibtool on Darwin (versus Apple libtool)
- if [[ ${CHOST} == *-darwin* ]] ; then
- sed -i -e '/LIBTOOL = /s:libtool:glibtool:' \
- Makefile src/Makefile || die
- fi
-
- # correct lua versioning
- sed -i -e 's/\(LIB_VERSION = \)6:1:1/\16:5:1/' src/Makefile
-
- sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html
-
- # Using dynamic linked lua is not recommended for performance
- # reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
- # Mainly, this is of concern if your arch is poor with GPRs, like x86
- # Note that this only affects the interpreter binary (named lua), not the lua
- # compiler (built statically) nor the lua libraries.
-
- # A slotted Lua uses different directories for headers & names for
- # libraries, and pkgconfig should reflect that.
- sed -r -i \
- -e "/^INSTALL_INC=/s,(/include)$,\1/lua${SLOT}," \
- -e "/^includedir=/s,(/include)$,\1/lua${SLOT}," \
- -e "/^Libs:/s,((-llua)($| )),\2${SLOT}\3," \
- "${S}"/etc/lua.pc
-
- # custom Makefiles
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- # We want packages to find our things...
- sed -i \
- -e 's:/usr/local:'${EPREFIX}'/usr:' \
- -e "s:\([/\"]\)\<lib\>:\1$(get_libdir):g" \
- etc/lua.pc src/luaconf.h || die
-}
-
-multilib_src_compile() {
- tc-export CC
- myflags=
- # what to link to liblua
- liblibs="-lm"
- liblibs="${liblibs} $(dlopen_lib)"
-
- # what to link to the executables
- mylibs=
- if use readline; then
- mylibs="-lreadline"
- fi
-
- cd src
- emake CC="${CC}" CFLAGS="-DLUA_USE_LINUX ${CFLAGS}" \
- RPATH="${EPREFIX}/usr/$(get_libdir)/" \
- LUA_LIBS="${mylibs}" \
- LIB_LIBS="${liblibs}" \
- V=$(ver_cut 1-2) \
- gentoo_all
-
- mv lua_test ../test/lua.static
-}
-
-multilib_src_install() {
- emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
- V=${SLOT} gentoo_install
-
- insinto /usr/$(get_libdir)/pkgconfig
- newins etc/lua.pc lua${SLOT}.pc
-}
-
-multilib_src_install_all() {
- DOCS="HISTORY README"
- HTML_DOCS="doc/*.html doc/*.png doc/*.css doc/*.gif"
- einstalldocs
- newman doc/lua.1 lua${SLOT}.1
- newman doc/luac.1 luac${SLOT}.1
- find "${ED}" -name '*.la' -delete || die
- find "${ED}" -name 'liblua*.a' -delete || die
-}
-
-multilib_src_test() {
- local positive="bisect cf echo env factorial fib fibfor hello printf sieve
- sort trace-calls trace-globals"
- local negative="readonly"
- local test
-
- cd "${BUILD_DIR}" || die
- for test in ${positive}; do
- test/lua.static test/${test}.lua || die "test $test failed"
- done
-
- for test in ${negative}; do
- test/lua.static test/${test}.lua && die "test $test failed"
- done
-}
-
-pkg_postinst() {
- eselect lua set --if-unset "${PN}${SLOT}"
-
- if has_version "app-editor/emacs"; then
- if ! has_version "app-emacs/lua-mode"; then
- einfo "Install app-emacs/lua-mode for lua support for emacs"
- fi
- fi
-}
diff --git a/dev-lang/lua/lua-5.1.5-r107.ebuild b/dev-lang/lua/lua-5.1.5-r107.ebuild
index 8e5e042f02a4..ac331a705a8d 100644
--- a/dev-lang/lua/lua-5.1.5-r107.ebuild
+++ b/dev-lang/lua/lua-5.1.5-r107.ebuild
@@ -2,7 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit multilib multilib-minimal portability toolchain-funcs
+
+inherit multilib-minimal portability toolchain-funcs
DESCRIPTION="A powerful light-weight programming language designed for extending applications"
HOMEPAGE="https://www.lua.org/"
diff --git a/dev-lang/lua/lua-5.3.6-r2.ebuild b/dev-lang/lua/lua-5.3.6-r2.ebuild
deleted file mode 100644
index 3e04892b3645..000000000000
--- a/dev-lang/lua/lua-5.3.6-r2.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools multilib multilib-minimal portability toolchain-funcs
-
-DESCRIPTION="A powerful light-weight programming language designed for extending applications"
-HOMEPAGE="https://www.lua.org/"
-TEST_PV="5.3.4"
-TEST_P="${PN}-${TEST_PV}-tests"
-SRC_URI="
- https://www.lua.org/ftp/${P}.tar.gz
- test? ( https://www.lua.org/tests/${TEST_P}.tar.gz )"
-
-LICENSE="MIT"
-SLOT="5.3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+deprecated readline test test-complete"
-
-COMMON_DEPEND="
- >=app-eselect/eselect-lua-3
- readline? ( sys-libs/readline:0= )
- !dev-lang/lua:0"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND="sys-devel/libtool"
-
-RESTRICT="!test? ( test )"
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/lua${SLOT}/luaconf.h
-)
-
-PATCHES=(
- "${FILESDIR}/lua-5.3.6-make.patch"
-)
-
-src_prepare() {
- default
- # use glibtool on Darwin (versus Apple libtool)
- if [[ ${CHOST} == *-darwin* ]] ; then
- sed -i -e '/LIBTOOL = /s:/libtool:/glibtool:' \
- Makefile src/Makefile || die
- fi
-
- # correct lua versioning
- sed -i -e 's/\(LIB_VERSION = \)6:1:1/\10:0:0/' src/Makefile || die
-
- sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html || die
-
- if ! use readline ; then
- sed -i -e '/#define LUA_USE_READLINE/d' src/luaconf.h || die
- fi
-
- # Using dynamic linked lua is not recommended for performance
- # reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
- # Mainly, this is of concern if your arch is poor with GPRs, like x86
- # Note that this only affects the interpreter binary (named lua), not the lua
- # compiler (built statically) nor the lua libraries.
-
- # upstream does not use libtool, but we do (see bug #336167)
- cp "${FILESDIR}/configure.in" "${S}/configure.ac" || die
- eautoreconf
-
- # custom Makefiles
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- sed -i \
- -e 's:\(define LUA_ROOT\s*\).*:\1"'${EPREFIX}'/usr/":' \
- -e "s:\(define LUA_CDIR\s*LUA_ROOT \"\)lib:\1$(get_libdir):" \
- src/luaconf.h \
- || die "failed patching luaconf.h"
-
- econf
-}
-
-multilib_src_compile() {
- tc-export CC
-
- # what to link to liblua
- liblibs="-lm"
- liblibs="${liblibs} $(dlopen_lib)"
-
- # what to link to the executables
- mylibs=
- use readline && mylibs="-lreadline"
-
- cd src
-
- local myCFLAGS=""
- use deprecated && myCFLAGS="-DLUA_COMPAT_5_1 -DLUA_COMPAT_5_2"
-
- case "${CHOST}" in
- *-mingw*) : ;;
- *) myCFLAGS+=" -DLUA_USE_LINUX" ;;
- esac
-
- emake CC="${CC}" CFLAGS="${myCFLAGS} ${CFLAGS}" \
- SYSLDFLAGS="${LDFLAGS}" \
- RPATH="${EPREFIX}/usr/$(get_libdir)/" \
- LUA_LIBS="${mylibs}" \
- LIB_LIBS="${liblibs}" \
- V=$(ver_cut 1-2) \
- gentoo_all
-}
-
-multilib_src_install() {
- emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
- V=${SLOT} gentoo_install
-
- case $SLOT in
- 0)
- LIBNAME="lua"
- INCLUDEDIR_SUFFIX=''
- ;;
- *) LIBNAME="lua${SLOT}"
- INCLUDEDIR_SUFFIX="/lua${SLOT}"
- ;;
- esac
-
- # We want packages to find our things...
- # A slotted Lua uses different directories for headers & names for
- # libraries, and pkgconfig should reflect that.
- local PATCH_PV=$(ver_cut 1-2)
- cp "${FILESDIR}/lua.pc" "${WORKDIR}" || die
- sed -r -i \
- -e "/^INSTALL_INC=/s,(/include)$,\1/lua${SLOT}," \
- -e "s:^prefix= :prefix= ${EPREFIX}:" \
- -e "s:^V=.*:V= ${PATCH_PV}:" \
- -e "s:^R=.*:R= ${PV}:" \
- -e "s:/,lib,:/$(get_libdir):g" \
- -e "/^Libs:/s:( )(-llua)($| ):\1-l${LIBNAME}\3:" \
- -e "/^includedir=/s:include$:include${INCLUDEDIR_SUFFIX}:" \
- "${WORKDIR}/lua.pc" || die
-
- insinto "/usr/$(get_libdir)/pkgconfig"
- newins "${WORKDIR}/lua.pc" "lua${SLOT}.pc"
- # Copy Debian's symlink support:
- # https://salsa.debian.org/lua-team/lua5.3/blob/master/debian/rules#L19
- # FreeBSD calls the pkgconfig 'lua-5.3.pc'
- # Older systems called it 'lua53.pc'
- dosym "lua${SLOT}.pc" "/usr/$(get_libdir)/pkgconfig/lua-${SLOT}.pc"
- dosym "lua${SLOT}.pc" "/usr/$(get_libdir)/pkgconfig/lua${SLOT/.}.pc"
-}
-
-multilib_src_install_all() {
- DOCS="README"
- HTML_DOCS="doc/*.html doc/*.png doc/*.css doc/*.gif"
- einstalldocs
- newman doc/lua.1 lua${SLOT}.1
- newman doc/luac.1 luac${SLOT}.1
- find "${ED}" -name '*.la' -delete || die
- find "${ED}" -name 'liblua*.a' -delete || die
-}
-
-# Makefile contains a dummy target that doesn't do tests
-# but causes issues with slotted lua (bug #510360)
-src_test() {
- debug-print-function ${FUNCNAME} "$@"
- cd "${WORKDIR}/lua-${TEST_PV}-tests" || die
- # https://www.lua.org/tests/
- # There are two sets:
- # basic
- # complete.
- #
- # The basic subset is selected by passing -e'_U=true'
- # The complete set is noted to contain tests that may consume too much memory or have non-portable tests.
- # attrib.lua for example needs some multilib customization (have to compile the stuff in libs/ for each ABI)
- TEST_OPTS="$(usex test-complete '' '-e_U=true')"
- TEST_MARKER="${T}/test.failed"
- rm -f "${TEST_MARKER}"
-
- # If we are failing, set the marker file, and only check it after done all ABIs
- abi_src_test() {
- debug-print-function ${FUNCNAME} "$@"
- TEST_LOG="${T}/test.${MULTIBUILD_ID}.log"
- eval "${BUILD_DIR}"/src/lua${SLOT} ${TEST_OPTS} all.lua 2>&1 | tee "${TEST_LOG}" || die
- grep -sq -e "final OK" "${TEST_LOG}" || echo "FAIL ${MULTIBUILD_ID}" >>"${TEST_MARKER}"
- return 0
- }
-
- multilib_foreach_abi abi_src_test
-
- if [ -e "${TEST_MARKER}" ]; then
- cat "${TEST_MARKER}"
- die "Tests failed"
- fi
-}
-
-pkg_postinst() {
- eselect lua set --if-unset "${PN}${SLOT}"
-
- if has_version "app-editor/emacs"; then
- if ! has_version "app-emacs/lua-mode"; then
- einfo "Install app-emacs/lua-mode for lua support for emacs"
- fi
- fi
-}
diff --git a/dev-lang/lua/lua-5.3.6-r3.ebuild b/dev-lang/lua/lua-5.3.6-r3.ebuild
index fdb6c07c07df..75ad75f26338 100644
--- a/dev-lang/lua/lua-5.3.6-r3.ebuild
+++ b/dev-lang/lua/lua-5.3.6-r3.ebuild
@@ -2,7 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit autotools multilib multilib-minimal portability toolchain-funcs
+
+inherit autotools multilib-minimal portability toolchain-funcs
DESCRIPTION="A powerful light-weight programming language designed for extending applications"
HOMEPAGE="https://www.lua.org/"
diff --git a/dev-lang/lua/lua-5.4.2-r1.ebuild b/dev-lang/lua/lua-5.4.2-r1.ebuild
deleted file mode 100644
index ab6a4fcb4fee..000000000000
--- a/dev-lang/lua/lua-5.4.2-r1.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools multilib multilib-minimal portability toolchain-funcs
-
-DESCRIPTION="A powerful light-weight programming language designed for extending applications"
-HOMEPAGE="https://www.lua.org/"
-TEST_PV="5.4.2"
-TEST_P="${PN}-${TEST_PV}-tests"
-SRC_URI="
- https://www.lua.org/ftp/${P}.tar.gz
- test? ( https://www.lua.org/tests/${TEST_P}.tar.gz )"
-
-LICENSE="MIT"
-SLOT="5.4"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+deprecated readline test test-complete"
-
-COMMON_DEPEND="
- >=app-eselect/eselect-lua-3
- readline? ( sys-libs/readline:0= )
- !dev-lang/lua:0"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND="sys-devel/libtool"
-
-RESTRICT="!test? ( test )"
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/lua${SLOT}/luaconf.h
-)
-
-PATCHES=(
- "${FILESDIR}"/lua-5.4.2-make.patch
-)
-
-src_prepare() {
- default
- # use glibtool on Darwin (versus Apple libtool)
- if [[ ${CHOST} == *-darwin* ]] ; then
- sed -i -e '/LIBTOOL = /s:/libtool:/glibtool:' \
- Makefile src/Makefile || die
- fi
-
- # correct lua versioning
- sed -i -e 's/\(LIB_VERSION = \)6:1:1/\10:0:0/' src/Makefile || die
-
- sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html || die
-
- # Using dynamic linked lua is not recommended for performance
- # reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
- # Mainly, this is of concern if your arch is poor with GPRs, like x86
- # Note that this only affects the interpreter binary (named lua), not the lua
- # compiler (built statically) nor the lua libraries.
-
- # upstream does not use libtool, but we do (see bug #336167)
- cp "${FILESDIR}/configure.in" "${S}/configure.ac" || die
- eautoreconf
-
- # custom Makefiles
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- sed -i \
- -e 's:\(define LUA_ROOT\s*\).*:\1"'${EPREFIX}'/usr/":' \
- -e "s:\(define LUA_CDIR\s*LUA_ROOT \"\)lib:\1$(get_libdir):" \
- src/luaconf.h \
- || die "failed patching luaconf.h"
-
- econf
-}
-
-multilib_src_compile() {
- tc-export CC
-
- # what to link to liblua
- liblibs="-lm"
- liblibs="${liblibs} $(dlopen_lib)"
-
- # what to link to the executables
- mylibs=
- use readline && mylibs="-lreadline"
-
- cd src
-
- local myCFLAGS=""
- use deprecated && myCFLAGS+="-DLUA_COMPAT_5_3 "
- use readline && myCFLAGS+="-DLUA_USE_READLINE "
-
- case "${CHOST}" in
- *-mingw*) : ;;
- *) myCFLAGS+="-DLUA_USE_LINUX " ;;
- esac
-
- emake CC="${CC}" CFLAGS="${myCFLAGS} ${CFLAGS}" \
- SYSLDFLAGS="${LDFLAGS}" \
- RPATH="${EPREFIX}/usr/$(get_libdir)/" \
- LUA_LIBS="${mylibs}" \
- LIB_LIBS="${liblibs}" \
- V=$(ver_cut 1-2) \
- gentoo_all
-}
-
-multilib_src_install() {
- emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
- V=${SLOT} gentoo_install
-
- case $SLOT in
- 0)
- LIBNAME="lua"
- INCLUDEDIR_SUFFIX=''
- ;;
- *) LIBNAME="lua${SLOT}"
- INCLUDEDIR_SUFFIX="/lua${SLOT}"
- ;;
- esac
-
- # We want packages to find our things...
- # A slotted Lua uses different directories for headers & names for
- # libraries, and pkgconfig should reflect that.
- local PATCH_PV=$(ver_cut 1-2)
- cp "${FILESDIR}/lua.pc" "${WORKDIR}" || die
- sed -r -i \
- -e "/^INSTALL_INC=/s,(/include)$,\1/lua${SLOT}," \
- -e "s:^prefix= :prefix= ${EPREFIX}:" \
- -e "s:^V=.*:V= ${PATCH_PV}:" \
- -e "s:^R=.*:R= ${PV}:" \
- -e "s:/,lib,:/$(get_libdir):g" \
- -e "/^Libs:/s:( )(-llua)($| ):\1-l${LIBNAME}\3:" \
- -e "/^includedir=/s:include$:include${INCLUDEDIR_SUFFIX}:" \
- "${WORKDIR}/lua.pc" || die
-
- insinto "/usr/$(get_libdir)/pkgconfig"
- newins "${WORKDIR}/lua.pc" "lua${SLOT}.pc"
- # Copy Debian's symlink support:
- # https://salsa.debian.org/lua-team/lua5.3/blob/master/debian/rules#L19
- # FreeBSD calls the pkgconfig 'lua-5.3.pc'
- # Older systems called it 'lua53.pc'
- dosym "lua${SLOT}.pc" "/usr/$(get_libdir)/pkgconfig/lua-${SLOT}.pc"
- dosym "lua${SLOT}.pc" "/usr/$(get_libdir)/pkgconfig/lua${SLOT/.}.pc"
-}
-
-multilib_src_install_all() {
- DOCS="README"
- HTML_DOCS="doc/*.html doc/*.png doc/*.css doc/*.gif"
- einstalldocs
- newman doc/lua.1 lua${SLOT}.1
- newman doc/luac.1 luac${SLOT}.1
- find "${ED}" -name '*.la' -delete || die
- find "${ED}" -name 'liblua*.a' -delete || die
-}
-
-# Makefile contains a dummy target that doesn't do tests
-# but causes issues with slotted lua (bug #510360)
-src_test() {
- debug-print-function ${FUNCNAME} "$@"
- cd "${WORKDIR}/lua-${TEST_PV}-tests" || die
- # https://www.lua.org/tests/
- # There are two sets:
- # basic
- # complete.
- #
- # The basic subset is selected by passing -e'_U=true'
- # The complete set is noted to contain tests that may consume too much memory or have non-portable tests.
- # attrib.lua for example needs some multilib customization (have to compile the stuff in libs/ for each ABI)
- TEST_OPTS="$(usex test-complete '' '-e_U=true')"
- TEST_MARKER="${T}/test.failed"
- rm -f "${TEST_MARKER}"
-
- # If we are failing, set the marker file, and only check it after done all ABIs
- abi_src_test() {
- debug-print-function ${FUNCNAME} "$@"
- TEST_LOG="${T}/test.${MULTIBUILD_ID}.log"
- eval "${BUILD_DIR}"/src/lua${SLOT} ${TEST_OPTS} all.lua 2>&1 | tee "${TEST_LOG}" || die
- grep -sq -e "final OK" "${TEST_LOG}" || echo "FAIL ${MULTIBUILD_ID}" >>"${TEST_MARKER}"
- return 0
- }
-
- multilib_foreach_abi abi_src_test
-
- if [ -e "${TEST_MARKER}" ]; then
- cat "${TEST_MARKER}"
- die "Tests failed"
- fi
-}
-
-pkg_postinst() {
- eselect lua set --if-unset "${PN}${SLOT}"
-
- if has_version "app-editor/emacs"; then
- if ! has_version "app-emacs/lua-mode"; then
- einfo "Install app-emacs/lua-mode for lua support for emacs"
- fi
- fi
-}
diff --git a/dev-lang/lua/lua-5.4.2-r2.ebuild b/dev-lang/lua/lua-5.4.2-r2.ebuild
deleted file mode 100644
index d3ea0294a6c4..000000000000
--- a/dev-lang/lua/lua-5.4.2-r2.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools multilib multilib-minimal portability toolchain-funcs
-
-DESCRIPTION="A powerful light-weight programming language designed for extending applications"
-HOMEPAGE="https://www.lua.org/"
-TEST_PV="5.4.2"
-TEST_P="${PN}-${TEST_PV}-tests"
-SRC_URI="
- https://www.lua.org/ftp/${P}.tar.gz
- test? ( https://www.lua.org/tests/${TEST_P}.tar.gz )"
-
-LICENSE="MIT"
-SLOT="5.4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+deprecated readline test test-complete"
-
-COMMON_DEPEND="
- >=app-eselect/eselect-lua-3
- readline? ( sys-libs/readline:0= )
- !dev-lang/lua:0"
-# Cross-compiling note:
-# Must use libtool from the target system (DEPEND) because
-# libtool from the build system (BDEPEND) is for building
-# native binaries.
-DEPEND="
- ${COMMON_DEPEND}
- sys-devel/libtool"
-RDEPEND="${COMMON_DEPEND}"
-
-RESTRICT="!test? ( test )"
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/lua${SLOT}/luaconf.h
-)
-
-PATCHES=(
- "${FILESDIR}"/lua-5.4.2-r2-make.patch
-)
-
-src_prepare() {
- default
- # use glibtool on Darwin (versus Apple libtool)
- if [[ ${CHOST} == *-darwin* ]] ; then
- sed -i -e '/LIBTOOL = /s:/libtool:/glibtool:' \
- Makefile src/Makefile || die
- fi
-
- # correct lua versioning
- sed -i -e 's/\(LIB_VERSION = \)6:1:1/\10:0:0/' src/Makefile || die
-
- sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html || die
-
- # Using dynamic linked lua is not recommended for performance
- # reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
- # Mainly, this is of concern if your arch is poor with GPRs, like x86
- # Note that this only affects the interpreter binary (named lua), not the lua
- # compiler (built statically) nor the lua libraries.
-
- # upstream does not use libtool, but we do (see bug #336167)
- cp "${FILESDIR}/configure.in" "${S}/configure.ac" || die
- eautoreconf
-
- # custom Makefiles
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- sed -i \
- -e 's:\(define LUA_ROOT\s*\).*:\1"'${EPREFIX}'/usr/":' \
- -e "s:\(define LUA_CDIR\s*LUA_ROOT \"\)lib:\1$(get_libdir):" \
- src/luaconf.h \
- || die "failed patching luaconf.h"
-
- econf
-}
-
-multilib_src_compile() {
- tc-export CC
-
- # what to link to liblua
- liblibs="-lm"
- liblibs="${liblibs} $(dlopen_lib)"
-
- # what to link to the executables
- mylibs=
- use readline && mylibs="-lreadline"
-
- cd src
-
- local myCFLAGS=""
- use deprecated && myCFLAGS+="-DLUA_COMPAT_5_3 "
- use readline && myCFLAGS+="-DLUA_USE_READLINE "
-
- case "${CHOST}" in
- *-mingw*) : ;;
- *) myCFLAGS+="-DLUA_USE_LINUX " ;;
- esac
-
- emake CC="${CC}" CFLAGS="${myCFLAGS} ${CFLAGS}" \
- SYSLDFLAGS="${LDFLAGS}" \
- RPATH="${EPREFIX}/usr/$(get_libdir)/" \
- LUA_LIBS="${mylibs}" \
- LIB_LIBS="${liblibs}" \
- V=$(ver_cut 1-2) \
- LIBTOOL="${ESYSROOT}/usr/bin/libtool" \
- gentoo_all
-}
-
-multilib_src_install() {
- emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
- V=${SLOT} gentoo_install
-
- case $SLOT in
- 0)
- LIBNAME="lua"
- INCLUDEDIR_SUFFIX=''
- ;;
- *) LIBNAME="lua${SLOT}"
- INCLUDEDIR_SUFFIX="/lua${SLOT}"
- ;;
- esac
-
- # We want packages to find our things...
- # A slotted Lua uses different directories for headers & names for
- # libraries, and pkgconfig should reflect that.
- local PATCH_PV=$(ver_cut 1-2)
- cp "${FILESDIR}/lua.pc" "${WORKDIR}" || die
- sed -r -i \
- -e "/^INSTALL_INC=/s,(/include)$,\1/lua${SLOT}," \
- -e "s:^prefix= :prefix= ${EPREFIX}:" \
- -e "s:^V=.*:V= ${PATCH_PV}:" \
- -e "s:^R=.*:R= ${PV}:" \
- -e "s:/,lib,:/$(get_libdir):g" \
- -e "/^Libs:/s:( )(-llua)($| ):\1-l${LIBNAME}\3:" \
- -e "/^includedir=/s:include$:include${INCLUDEDIR_SUFFIX}:" \
- "${WORKDIR}/lua.pc" || die
-
- insinto "/usr/$(get_libdir)/pkgconfig"
- newins "${WORKDIR}/lua.pc" "lua${SLOT}.pc"
- # Copy Debian's symlink support:
- # https://salsa.debian.org/lua-team/lua5.3/blob/master/debian/rules#L19
- # FreeBSD calls the pkgconfig 'lua-5.3.pc'
- # Older systems called it 'lua53.pc'
- dosym "lua${SLOT}.pc" "/usr/$(get_libdir)/pkgconfig/lua-${SLOT}.pc"
- dosym "lua${SLOT}.pc" "/usr/$(get_libdir)/pkgconfig/lua${SLOT/.}.pc"
-}
-
-multilib_src_install_all() {
- DOCS="README"
- HTML_DOCS="doc/*.html doc/*.png doc/*.css doc/*.gif"
- einstalldocs
- newman doc/lua.1 lua${SLOT}.1
- newman doc/luac.1 luac${SLOT}.1
- find "${ED}" -name '*.la' -delete || die
- find "${ED}" -name 'liblua*.a' -delete || die
-}
-
-# Makefile contains a dummy target that doesn't do tests
-# but causes issues with slotted lua (bug #510360)
-src_test() {
- debug-print-function ${FUNCNAME} "$@"
- cd "${WORKDIR}/lua-${TEST_PV}-tests" || die
- # https://www.lua.org/tests/
- # There are two sets:
- # basic
- # complete.
- #
- # The basic subset is selected by passing -e'_U=true'
- # The complete set is noted to contain tests that may consume too much memory or have non-portable tests.
- # attrib.lua for example needs some multilib customization (have to compile the stuff in libs/ for each ABI)
- TEST_OPTS="$(usex test-complete '' '-e_U=true')"
- TEST_MARKER="${T}/test.failed"
- rm -f "${TEST_MARKER}"
-
- # If we are failing, set the marker file, and only check it after done all ABIs
- abi_src_test() {
- debug-print-function ${FUNCNAME} "$@"
- TEST_LOG="${T}/test.${MULTIBUILD_ID}.log"
- eval "${BUILD_DIR}"/src/lua${SLOT} ${TEST_OPTS} all.lua 2>&1 | tee "${TEST_LOG}" || die
- grep -sq -e "final OK" "${TEST_LOG}" || echo "FAIL ${MULTIBUILD_ID}" >>"${TEST_MARKER}"
- return 0
- }
-
- multilib_foreach_abi abi_src_test
-
- if [ -e "${TEST_MARKER}" ]; then
- cat "${TEST_MARKER}"
- die "Tests failed"
- fi
-}
-
-pkg_postinst() {
- eselect lua set --if-unset "${PN}${SLOT}"
-
- if has_version "app-editor/emacs"; then
- if ! has_version "app-emacs/lua-mode"; then
- einfo "Install app-emacs/lua-mode for lua support for emacs"
- fi
- fi
-}
diff --git a/dev-lang/lua/lua-5.4.4.ebuild b/dev-lang/lua/lua-5.4.4.ebuild
index 66158bbd94be..4d4cae364438 100644
--- a/dev-lang/lua/lua-5.4.4.ebuild
+++ b/dev-lang/lua/lua-5.4.4.ebuild
@@ -2,7 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit autotools multilib multilib-minimal portability toolchain-funcs
+
+inherit autotools multilib-minimal portability toolchain-funcs
DESCRIPTION="A powerful light-weight programming language designed for extending applications"
HOMEPAGE="https://www.lua.org/"