diff options
author | Marek Szuba <marecki@gentoo.org> | 2021-08-13 10:39:29 +0100 |
---|---|---|
committer | Marek Szuba <marecki@gentoo.org> | 2021-08-13 11:02:09 +0100 |
commit | 48d6f23a26366212dc02042485b0f2481747d905 (patch) | |
tree | 3cdb2881e5b151ec280d0105f5375d77e498f41f /dev-lang/lua | |
parent | lua-single.eclass: do not mention lua5-2 in eclassdocs (diff) | |
download | gentoo-48d6f23a26366212dc02042485b0f2481747d905.tar.gz gentoo-48d6f23a26366212dc02042485b0f2481747d905.tar.bz2 gentoo-48d6f23a26366212dc02042485b0f2481747d905.zip |
dev-lang/lua: remove last-rited slot 5.2
Signed-off-by: Marek Szuba <marecki@gentoo.org>
Diffstat (limited to 'dev-lang/lua')
-rw-r--r-- | dev-lang/lua/Manifest | 2 | ||||
-rw-r--r-- | dev-lang/lua/files/5.2.0/01_all_memory_hoarding.upstream.patch | 49 | ||||
-rw-r--r-- | dev-lang/lua/files/5.2.0/02_all_hex_number_handling.upstream.patch | 26 | ||||
-rw-r--r-- | dev-lang/lua/files/lua-5.2.4-make.patch | 75 | ||||
-rw-r--r-- | dev-lang/lua/lua-5.2.4-r3.ebuild | 200 |
5 files changed, 0 insertions, 352 deletions
diff --git a/dev-lang/lua/Manifest b/dev-lang/lua/Manifest index bbafef164e16..142b030f57d5 100644 --- a/dev-lang/lua/Manifest +++ b/dev-lang/lua/Manifest @@ -1,6 +1,4 @@ DIST lua-5.1.5.tar.gz 221213 BLAKE2B 915eb8e8c9d7e460eacf1d7a59309c60dfc0f5d9d3d76fbc9764e7cae85920b95096db1c27b69ac53378a145c29efde403e88166a1332a67150d9d3a897aba02 SHA512 0142fefcbd13afcd9b201403592aa60620011cc8e8559d4d2db2f92739d18186860989f48caa45830ff4f99bfc7483287fd3ff3a16d4dec928e2767ce4d542a9 -DIST lua-5.2.2-tests.tar.gz 76629 BLAKE2B 323eaae02ee61cfde2535d606ed704d964461c32627cb3ad4097afdc95a16a0921b9b05677c5b9b26cbff0d7d8270045e7df32a2cea0fd99a82e6aa613a0bdae SHA512 699d5703dd1d03312f1e947ca4c68d8808bb226ae01337202c2bfb3d854a9b7d9ef9746630afd1f67e9ffe2868907ce3d600a6f5324a2c798540c5373a24aac8 -DIST lua-5.2.4.tar.gz 252651 BLAKE2B 6f20308d8413438f8446040e8de16274837cb55e626b98a0ae8cfe279dc8610fa2e032a2ce53ef3acda4b96a7198123cbc18eff16775f952e6dc0355fdf331b0 SHA512 cd77148aba4b707b6c159758b5e8444e04f968092eb98f6b4c405b2fb647e709370d5a8dcf604176101d3407e196a7433b5dcdce4fe9605c76191d3649d61a8c 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 diff --git a/dev-lang/lua/files/5.2.0/01_all_memory_hoarding.upstream.patch b/dev-lang/lua/files/5.2.0/01_all_memory_hoarding.upstream.patch deleted file mode 100644 index 9fda24ad6609..000000000000 --- a/dev-lang/lua/files/5.2.0/01_all_memory_hoarding.upstream.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- lua-5.2.0.orig/src/ldblib.c 2007/12/28 15:32:23 2.25.1.3 -+++ lua-5.2.0/src/ldblib.c 2009/06/15 14:07:34 -@@ -253,14 +253,15 @@ - } - - --#define gethooktable(L) luaL_getsubtable(L, LUA_REGISTRYINDEX, HOOKKEY); -+#define gethooktable(L) luaL_getsubtable(L, LUA_REGISTRYINDEX, HOOKKEY) - - - static void hookf (lua_State *L, lua_Debug *ar) { - static const char *const hooknames[] = - {"call", "return", "line", "count", "tail call"}; - gethooktable(L); -- lua_rawgetp(L, -1, L); -+ lua_pushthread(L); -+ lua_rawget(L, -2); - if (lua_isfunction(L, -1)) { - lua_pushstring(L, hooknames[(int)ar->event]); - if (ar->currentline >= 0) -@@ -306,10 +307,15 @@ - count = luaL_optint(L, arg+3, 0); - func = hookf; mask = makemask(smask, count); - } -- gethooktable(L); -+ if (gethooktable(L) == 0) { /* creating hook table? */ -+ lua_pushstring(L, "k"); -+ lua_setfield(L, -2, "__mode"); /** hooktable.__mode = "k" */ -+ lua_pushvalue(L, -1); -+ lua_setmetatable(L, -2); /* setmetatable(hooktable) = hooktable */ -+ } -+ lua_pushthread(L1); lua_xmove(L1, L, 1); - lua_pushvalue(L, arg+1); -- lua_rawsetp(L, -2, L1); /* set new hook */ -- lua_pop(L, 1); /* remove hook table */ -+ lua_rawset(L, -3); /* set new hook */ - lua_sethook(L1, func, mask, count); /* set hooks */ - return 0; - } -@@ -325,7 +331,8 @@ - lua_pushliteral(L, "external hook"); - else { - gethooktable(L); -- lua_rawgetp(L, -1, L1); /* get hook */ -+ lua_pushthread(L1); lua_xmove(L1, L, 1); -+ lua_rawget(L, -2); /* get hook */ - lua_remove(L, -2); /* remove hook table */ - } - lua_pushstring(L, unmakemask(mask, buff)); diff --git a/dev-lang/lua/files/5.2.0/02_all_hex_number_handling.upstream.patch b/dev-lang/lua/files/5.2.0/02_all_hex_number_handling.upstream.patch deleted file mode 100644 index 26519e378e68..000000000000 --- a/dev-lang/lua/files/5.2.0/02_all_hex_number_handling.upstream.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- lua-5.2.0.orig/src/llex.c 2007/12/28 15:32:23 2.25.1.3 -+++ lua-5.2.0/src/llex.c 2009/06/15 14:07:34 -@@ -223,12 +223,19 @@ - - /* LUA_NUMBER */ - static void read_numeral (LexState *ls, SemInfo *seminfo) { -+ const char *expo = "Ee"; -+ int first = ls->current; - lua_assert(lisdigit(ls->current)); -- do { -- save_and_next(ls); -- if (check_next(ls, "EePp")) /* exponent part? */ -+ save_and_next(ls); -+ if (first == '0' && check_next(ls, "Xx")) /* hexadecimal? */ -+ expo = "Pp"; -+ for (;;) { -+ if (check_next(ls, expo)) /* exponent part? */ - check_next(ls, "+-"); /* optional exponent sign */ -- } while (lislalnum(ls->current) || ls->current == '.'); -+ if (lisxdigit(ls->current) || ls->current == '.') -+ save_and_next(ls); -+ else break; -+ } - save(ls, '\0'); - buffreplace(ls, '.', ls->decpoint); /* follow locale for decimal point */ - if (!buff2d(ls->buff, &seminfo->r)) /* format error? */ diff --git a/dev-lang/lua/files/lua-5.2.4-make.patch b/dev-lang/lua/files/lua-5.2.4-make.patch deleted file mode 100644 index 40e1f5aa7d0c..000000000000 --- a/dev-lang/lua/files/lua-5.2.4-make.patch +++ /dev/null @@ -1,75 +0,0 @@ ---- lua-5.1.1.orig/Makefile 2006-06-02 12:53:38.000000000 +0200 -+++ lua-5.1.1/Makefile 2006-11-16 02:16:53.000000000 +0100 -@@ -11,7 +11,7 @@ - # so take care if INSTALL_TOP is not an absolute path. - INSTALL_TOP= /usr/local - INSTALL_BIN= $(INSTALL_TOP)/bin --INSTALL_INC= $(INSTALL_TOP)/include -+INSTALL_INC= $(INSTALL_TOP)/include/lua$V - INSTALL_LIB= $(INSTALL_TOP)/lib - INSTALL_MAN= $(INSTALL_TOP)/man/man1 - # -@@ -127,3 +127,18 @@ - .PHONY: all $(PLATS) clean install local none dummy echo pecho lecho newer - - # (end of Makefile) -+ -+# Use libtool for binary installs, etc. -+ -+export V -+export LIBTOOL = libtool --quiet --tag=CC -+# See libtool manual about how to set this -+ -+gentoo_clean: -+ cd src; $(MAKE) $@ -+ -+gentoo_install: -+ mkdir -p $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) -+ cd src; $(LIBTOOL) --mode=install $(INSTALL_EXEC) lua$V luac$V $(INSTALL_BIN) -+ cd src; $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC) -+ cd src; $(LIBTOOL) --mode=install $(INSTALL_DATA) liblua$V.la $(INSTALL_LIB) ---- lua-5.1.1.orig/src/Makefile 2006-03-22 01:41:49.000000000 +0100 -+++ lua-5.1.1/src/Makefile 2006-11-16 02:10:27.000000000 +0100 -@@ -39,1 +39,1 @@ --LUA_T= lua -+LUA_T= lua$V -@@ -42,1 +42,1 @@ --LUAC_T= luac -+LUAC_T= luac$V -@@ -54,1 +54,1 @@ --$(LUA_T): $(LUA_O) $(LUA_A) -+origin$(LUA_T): $(LUA_O) $(LUA_A) -@@ -57,1 +57,1 @@ --$(LUAC_T): $(LUAC_O) $(LUA_A) -+origin$(LUAC_T): $(LUAC_O) $(LUA_A) -@@ -185,3 +185,30 @@ - lzio.o: lzio.c lua.h luaconf.h llimits.h lmem.h lstate.h lobject.h ltm.h \ - lzio.h - -+ -+export LIBTOOL = libtool --quiet --tag=CC -+export LIB_VERSION = 6:1:1 -+ -+# The following rules use libtool for compiling and linking in order to -+# provide shared library support. -+ -+LIB_NAME = liblua$V.la -+LIB_OBJS = $(CORE_O:.o=.lo) $(LIB_O:.o=.lo) -+ -+%.lo %.o: %.c -+ $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $< -+ -+$(LIB_NAME): $(LIB_OBJS) -+ $(LIBTOOL) --mode=link $(CC) -version-info $(LIB_VERSION) \ -+ -rpath $(RPATH) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS) -+ -+$(LUA_T): $(LUA_O:.o=.lo) $(LIB_NAME) -+ $(LIBTOOL) --mode=link $(CC) -static -export-dynamic $(LDFLAGS) -o $@ $(LUA_O:.o=.lo) $(LIB_NAME) $(LUA_LIBS) -+ -+$(LUAC_T): $(LUAC_O:.o=.lo) $(LIB_NAME) -+ $(LIBTOOL) --mode=link $(CC) -static $(LDFLAGS) -o $@ $(LUAC_O:.o=.lo) $(LIB_NAME) -+ -+gentoo_clean: -+ $(LIBTOOL) --mode=clean $(RM) $(ALL_O:.o=.lo) $(LIB_NAME) lua$V luac$V -+ -+gentoo_all: $(LIB_NAME) $(LUA_T) $(LUAC_T) diff --git a/dev-lang/lua/lua-5.2.4-r3.ebuild b/dev-lang/lua/lua-5.2.4-r3.ebuild deleted file mode 100644 index 8f3d3d948b4e..000000000000 --- a/dev-lang/lua/lua-5.2.4-r3.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.2.2" # no 5.2.3-specific release yet -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.2" -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.2.4-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_ALL" - - 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 -} |