commit: 94dbb827593747a05def4ea999d8d153e166795e Author: Marek Szuba <marecki <AT> gentoo <DOT> org> AuthorDate: Wed Aug 4 10:21:01 2021 +0000 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> CommitDate: Wed Aug 4 10:21:55 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94dbb827
dev-lang/lua: drop 5.1.5-r4 Closes: https://bugs.gentoo.org/798693 Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> .../5.1.4/01_all_boolean_expression.upstream.patch | 48 -------- .../lua/files/5.1.4/02_all_table.upstream.patch | 22 ---- .../5.1.4/03_all_debug_getfenv.upstream.patch | 10 -- .../5.1.4/04_all_gc_performance.upstream.patch | 14 --- .../5.1.4/05_all_string_format.upstream.patch | 21 ---- .../lua/files/5.1.4/06_all_io_read.upstream.patch | 15 --- .../5.1.4/07_all_boolean_expression.upstream.patch | 30 ----- .../files/5.1.4/08_all_metatable.upstream.patch | 10 -- .../09_all_prototype_collection.upstream.patch | 13 -- dev-lang/lua/files/lua-5.1-make-r1.patch | 66 ---------- dev-lang/lua/files/lua-5.1-make_static-r1.patch | 12 -- .../lua/files/lua-5.1.5-fix_vararg_calls.patch | 12 -- dev-lang/lua/lua-5.1.5-r4.ebuild | 134 --------------------- 13 files changed, 407 deletions(-) diff --git a/dev-lang/lua/files/5.1.4/01_all_boolean_expression.upstream.patch b/dev-lang/lua/files/5.1.4/01_all_boolean_expression.upstream.patch deleted file mode 100644 index f04eb85075a..00000000000 --- a/dev-lang/lua/files/5.1.4/01_all_boolean_expression.upstream.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- lua-5.1.4.orig/src/lcode.c 2007/12/28 15:32:23 2.25.1.3 -+++ lua-5.1.4/src/lcode.c 2009/06/15 14:07:34 -@@ -544,15 +544,18 @@ - pc = NO_JUMP; /* always true; do nothing */ - break; - } -- case VFALSE: { -- pc = luaK_jump(fs); /* always jump */ -- break; -- } - case VJMP: { - invertjump(fs, e); - pc = e->u.s.info; - break; - } -+ case VFALSE: { -+ if (!hasjumps(e)) { -+ pc = luaK_jump(fs); /* always jump */ -+ break; -+ } -+ /* else go through */ -+ } - default: { - pc = jumponcond(fs, e, 0); - break; -@@ -572,14 +575,17 @@ - pc = NO_JUMP; /* always false; do nothing */ - break; - } -- case VTRUE: { -- pc = luaK_jump(fs); /* always jump */ -- break; -- } - case VJMP: { - pc = e->u.s.info; - break; - } -+ case VTRUE: { -+ if (!hasjumps(e)) { -+ pc = luaK_jump(fs); /* always jump */ -+ break; -+ } -+ /* else go through */ -+ } - default: { - pc = jumponcond(fs, e, 1); - break; - diff --git a/dev-lang/lua/files/5.1.4/02_all_table.upstream.patch b/dev-lang/lua/files/5.1.4/02_all_table.upstream.patch deleted file mode 100644 index 9ffc1bb2884..00000000000 --- a/dev-lang/lua/files/5.1.4/02_all_table.upstream.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- lua-5.1.4.orig/src/lvm.c 2007/12/28 15:32:23 2.63.1.3 -+++ lua-5.1.4/src/lvm.c 2009/07/01 20:36:59 -@@ -133,6 +133,7 @@ - - void luaV_settable (lua_State *L, const TValue *t, TValue *key, StkId val) { - int loop; -+ TValue temp; - for (loop = 0; loop < MAXTAGLOOP; loop++) { - const TValue *tm; - if (ttistable(t)) { /* `t' is a table? */ -@@ -152,7 +153,9 @@ - callTM(L, tm, t, key, val); - return; - } -- t = tm; /* else repeat with `tm' */ -+ /* else repeat with `tm' */ -+ setobj(L, &temp, tm); /* avoid pointing inside table (may rehash) */ -+ t = &temp; - } - luaG_runerror(L, "loop in settable"); - } - diff --git a/dev-lang/lua/files/5.1.4/03_all_debug_getfenv.upstream.patch b/dev-lang/lua/files/5.1.4/03_all_debug_getfenv.upstream.patch deleted file mode 100644 index fce4d47db8f..00000000000 --- a/dev-lang/lua/files/5.1.4/03_all_debug_getfenv.upstream.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- lua-5.1.4.orig/src/ldblib.c 2007/12/28 15:32:23 2.63.1.3 -+++ lua-5.1.4/src/ldblib.c 2010/02/23 12:36:59 -@@ -45,6 +45,7 @@ - - - static int db_getfenv (lua_State *L) { -+ luaL_checkany(L, 1); - lua_getfenv(L, 1); - return 1; - } diff --git a/dev-lang/lua/files/5.1.4/04_all_gc_performance.upstream.patch b/dev-lang/lua/files/5.1.4/04_all_gc_performance.upstream.patch deleted file mode 100644 index 3c78525b0b2..00000000000 --- a/dev-lang/lua/files/5.1.4/04_all_gc_performance.upstream.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- lua-5.1.4.orig/src/llex.c 2007/12/28 15:32:23 2.63.1.3 -+++ lua-5.1.4/src/llex.c 2010/02/23 12:36:59 -@@ -118,8 +118,10 @@ - lua_State *L = ls->L; - TString *ts = luaS_newlstr(L, str, l); - TValue *o = luaH_setstr(L, ls->fs->h, ts); /* entry for `str' */ -- if (ttisnil(o)) -+ if (ttisnil(o)) { - setbvalue(o, 1); /* make sure `str' will not be collected */ -+ luaC_checkGC(L); -+ } - return ts; - } - diff --git a/dev-lang/lua/files/5.1.4/05_all_string_format.upstream.patch b/dev-lang/lua/files/5.1.4/05_all_string_format.upstream.patch deleted file mode 100644 index 5127507df9f..00000000000 --- a/dev-lang/lua/files/5.1.4/05_all_string_format.upstream.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- lua-5.1.4.orig/src/lstrlib.c 2008/07/11 17:27:21 1.132.1.4 -+++ lua-5.1.4/src/lstrlib.c 2010/05/14 15:12:53 -@@ -754,6 +754,7 @@ - - - static int str_format (lua_State *L) { -+ int top = lua_gettop(L); - int arg = 1; - size_t sfl; - const char *strfrmt = luaL_checklstring(L, arg, &sfl); -@@ -768,7 +769,8 @@ - else { /* format item */ - char form[MAX_FORMAT]; /* to store the format (`%...') */ - char buff[MAX_ITEM]; /* to store the formatted item */ -- arg++; -+ if (++arg > top) -+ luaL_argerror(L, arg, "no value"); - strfrmt = scanformat(L, strfrmt, form); - switch (*strfrmt++) { - case 'c': { - diff --git a/dev-lang/lua/files/5.1.4/06_all_io_read.upstream.patch b/dev-lang/lua/files/5.1.4/06_all_io_read.upstream.patch deleted file mode 100644 index 94634c59140..00000000000 --- a/dev-lang/lua/files/5.1.4/06_all_io_read.upstream.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- lua-5.1.4.orig/src/liolib.c 2008/01/18 17:47:43 2.73.1.3 -+++ lua-5.1.4/src/liolib.c 2010/05/14 15:29:29 -@@ -276,7 +276,10 @@ - lua_pushnumber(L, d); - return 1; - } -- else return 0; /* read fails */ -+ else { -+ lua_pushnil(L); /* "result" to be removed */ -+ return 0; /* read fails */ -+ } - } - - - diff --git a/dev-lang/lua/files/5.1.4/07_all_boolean_expression.upstream.patch b/dev-lang/lua/files/5.1.4/07_all_boolean_expression.upstream.patch deleted file mode 100644 index 956e966817d..00000000000 --- a/dev-lang/lua/files/5.1.4/07_all_boolean_expression.upstream.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- lua-5.1.4.orig/src/lcode.c 2007/12/28 15:32:23 2.25.1.3 -+++ lua-5.1.4/src/lcode.c 2009/06/15 14:07:34 -@@ -549,13 +549,6 @@ - pc = e->u.s.info; - break; - } -- case VFALSE: { -- if (!hasjumps(e)) { -- pc = luaK_jump(fs); /* always jump */ -- break; -- } -- /* else go through */ -- } - default: { - pc = jumponcond(fs, e, 0); - break; -@@ -579,13 +572,6 @@ - pc = e->u.s.info; - break; - } -- case VTRUE: { -- if (!hasjumps(e)) { -- pc = luaK_jump(fs); /* always jump */ -- break; -- } -- /* else go through */ -- } - default: { - pc = jumponcond(fs, e, 1); - break; diff --git a/dev-lang/lua/files/5.1.4/08_all_metatable.upstream.patch b/dev-lang/lua/files/5.1.4/08_all_metatable.upstream.patch deleted file mode 100644 index b74bafbebe4..00000000000 --- a/dev-lang/lua/files/5.1.4/08_all_metatable.upstream.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- lua-5.1.4.orig/src/lvm.c 2009/07/01 21:10:33 2.63.1.4 -+++ lua-5.1.4/src/lvm.c 2011/08/17 20:36:28 -@@ -142,6 +142,7 @@ - if (!ttisnil(oldval) || /* result is no nil? */ - (tm = fasttm(L, h->metatable, TM_NEWINDEX)) == NULL) { /* or no TM? */ - setobj2t(L, oldval, val); -+ h->flags = 0; - luaC_barriert(L, h, val); - return; - } diff --git a/dev-lang/lua/files/5.1.4/09_all_prototype_collection.upstream.patch b/dev-lang/lua/files/5.1.4/09_all_prototype_collection.upstream.patch deleted file mode 100644 index 000f78ccc7d..00000000000 --- a/dev-lang/lua/files/5.1.4/09_all_prototype_collection.upstream.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- lua-5.1.4.orig/src/lparser.c 2007/12/28 15:32:23 2.42.1.3 -+++ lua-5.1.4/src/lparser.c 2011/10/17 13:10:43 -@@ -374,9 +374,9 @@ - lua_assert(luaG_checkcode(f)); - lua_assert(fs->bl == NULL); - ls->fs = fs->prev; -- L->top -= 2; /* remove table and prototype from the stack */ - /* last token read was anchored in defunct function; must reanchor it */ - if (fs) anchor_token(ls); -+ L->top -= 2; /* remove table and prototype from the stack */ - } - - diff --git a/dev-lang/lua/files/lua-5.1-make-r1.patch b/dev-lang/lua/files/lua-5.1-make-r1.patch deleted file mode 100644 index 8eecbdd4026..00000000000 --- a/dev-lang/lua/files/lua-5.1-make-r1.patch +++ /dev/null @@ -1,66 +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 -@@ -127,3 +127,21 @@ - .PHONY: all $(PLATS) clean test 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_test: gentoo_linux -+ test/lua.static test/hello.lua -+ -+gentoo_install: -+ mkdir -p $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) -+ cd src; $(LIBTOOL) --mode=install $(INSTALL_EXEC) lua luac $(INSTALL_BIN) -+ cd src; $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC) -+ cd src; $(LIBTOOL) --mode=install $(INSTALL_DATA) liblua.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 -@@ -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) -@@ -176,3 +176,33 @@ - ltm.h lzio.h lmem.h lopcodes.h lundump.h - - # (end of Makefile) -+ -+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.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) -export-dynamic $(LDFLAGS) -o $@ $(LUA_O:.o=.lo) $(LIB_NAME) $(LUA_LIBS) -+ -+lua_test: $(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 luac -+ -+gentoo_all: $(LIB_NAME) $(LUA_T) lua_test $(LUAC_T) diff --git a/dev-lang/lua/files/lua-5.1-make_static-r1.patch b/dev-lang/lua/files/lua-5.1-make_static-r1.patch deleted file mode 100644 index e5fdc3a6bfa..00000000000 --- a/dev-lang/lua/files/lua-5.1-make_static-r1.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru lua-5.1.1.orig/src/Makefile lua-5.1.1/src/Makefile ---- lua-5.1.1.orig/src/Makefile 2006-11-21 07:19:31 +0000 -+++ lua-5.1.1/src/Makefile 2006-11-21 07:19:52 +0000 -@@ -196,7 +196,7 @@ - -rpath $(RPATH) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS) - - $(LUA_T): $(LUA_O:.o=.lo) $(LIB_NAME) -- $(LIBTOOL) --mode=link $(CC) -export-dynamic $(LDFLAGS) -o $@ $(LUA_O:.o=.lo) $(LIB_NAME) $(LUA_LIBS) -+ $(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 -o $@ $(LUAC_O:.o=.lo) $(LIB_NAME) diff --git a/dev-lang/lua/files/lua-5.1.5-fix_vararg_calls.patch b/dev-lang/lua/files/lua-5.1.5-fix_vararg_calls.patch deleted file mode 100644 index cec81820336..00000000000 --- a/dev-lang/lua/files/lua-5.1.5-fix_vararg_calls.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr lua-5.1.5.orig/src/ldo.c lua-5.1.5/src/ldo.c ---- lua-5.1.5.orig/src/ldo.c 2016-11-28 20:04:13.177047928 +0100 -+++ lua-5.1.5/src/ldo.c 2016-11-28 20:07:15.170432525 +0100 -@@ -274,7 +274,7 @@ - CallInfo *ci; - StkId st, base; - Proto *p = cl->p; -- luaD_checkstack(L, p->maxstacksize); -+ luaD_checkstack(L, p->maxstacksize + p->numparams); - func = restorestack(L, funcr); - if (!p->is_vararg) { /* no varargs? */ - base = func + 1; diff --git a/dev-lang/lua/lua-5.1.5-r4.ebuild b/dev-lang/lua/lua-5.1.5-r4.ebuild deleted file mode 100644 index 3282707e4ad..00000000000 --- a/dev-lang/lua/lua-5.1.5-r4.ebuild +++ /dev/null @@ -1,134 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit epatch multilib multilib-minimal portability toolchain-funcs versionator - -DESCRIPTION="A powerful light-weight programming language designed for extending applications" -HOMEPAGE="http://www.lua.org/"; -SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"; - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="+deprecated emacs readline static" - -RDEPEND="readline? ( >=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - sys-devel/libtool" -PDEPEND="emacs? ( app-emacs/lua-mode )" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/luaconf.h -) - -src_prepare() { - local PATCH_PV=$(get_version_component_range 1-2) - - epatch "${FILESDIR}/${P}-fix_vararg_calls.patch" - - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r1.patch - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-module_paths.patch - - # use glibtool on Darwin (versus Apple libtool) - if [[ ${CHOST} == *-darwin* ]] ; then - sed -i -e '/LIBTOOL = /s:libtool:glibtool:' \ - Makefile src/Makefile || die - fi - - #EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch - - # correct lua versioning - sed -i -e 's/\(LIB_VERSION = \)6:1:1/\16:5:1/' src/Makefile || die - - sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html || die - - if ! use deprecated ; then - # patches from 5.1.4 still apply - epatch "${FILESDIR}"/${PN}-5.1.4-deprecated.patch - epatch "${FILESDIR}"/${PN}-5.1.4-test.patch - fi - - if ! use readline ; then - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-readline.patch - 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 (both shared and static - # are installed) - if use static ; then - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make_static-r1.patch - fi - - # 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=${PV} \ - gentoo_all - - mv lua_test ../test/lua.static -} - -multilib_src_install() { - emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \ - V=${PV} gentoo_install - - insinto /usr/$(get_libdir)/pkgconfig - doins etc/lua.pc -} - -multilib_src_install_all() { - dodoc HISTORY README - dohtml doc/*.html doc/*.png doc/*.css doc/*.gif - - doicon etc/lua.ico - - doman doc/lua.1 doc/luac.1 -} - -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 -}
