From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E6EAE15838C for ; Mon, 22 Jan 2024 12:57:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1ABFAE29CB; Mon, 22 Jan 2024 12:57:01 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E9048E29CB for ; Mon, 22 Jan 2024 12:57:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E0221343237 for ; Mon, 22 Jan 2024 12:56:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5ACCF105D for ; Mon, 22 Jan 2024 12:56:58 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1705928211.776c7c3b0ec869dd9e7c191489c3c46e5536f7ae.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/lua/files/, dev-lang/lua/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/lua/Manifest dev-lang/lua/files/lua-5.4.4-lparser-overread.patch dev-lang/lua/lua-5.4.4-r103.ebuild X-VCS-Directories: dev-lang/lua/files/ dev-lang/lua/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 776c7c3b0ec869dd9e7c191489c3c46e5536f7ae X-VCS-Branch: master Date: Mon, 22 Jan 2024 12:56:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c3d3ec4a-092a-4852-9a72-5471645e3bb4 X-Archives-Hash: 2c83f0b693d0ebc354d1fe18bce29ff7 commit: 776c7c3b0ec869dd9e7c191489c3c46e5536f7ae Author: David Seifert gentoo org> AuthorDate: Mon Jan 22 12:56:51 2024 +0000 Commit: David Seifert gentoo org> CommitDate: Mon Jan 22 12:56:51 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=776c7c3b dev-lang/lua: drop 5.4.4-r103 Signed-off-by: David Seifert gentoo.org> dev-lang/lua/Manifest | 1 - .../lua/files/lua-5.4.4-lparser-overread.patch | 34 -------------- dev-lang/lua/lua-5.4.4-r103.ebuild | 54 ---------------------- 3 files changed, 89 deletions(-) diff --git a/dev-lang/lua/Manifest b/dev-lang/lua/Manifest index ec26d04f4fb5..8e8837da084c 100644 --- a/dev-lang/lua/Manifest +++ b/dev-lang/lua/Manifest @@ -1,4 +1,3 @@ DIST lua-5.1.5.tar.xz 397416 BLAKE2B ef3880d78be1def383a9db6753b7aec4160f6fa8719529c2ea6266015771a23a1be81424520de10bb087a86081f1ec48c58c36eb8b24bff53adb6bd8d791e31b SHA512 bd827cb2e63cd71d15d846eb29c8745bf869e7b70e12c565ce173623d1fcd29dabf4d33a99c48f294151bb580d830c112cf178e2d80a5a5c36acc7b3bfcd7d24 DIST lua-5.3.6.tar.xz 541220 BLAKE2B c356cec06b14cdcbb29e382c951491432a3189618f9fd8c8832bdc8c831640fbcb9e212db05b61a577633c5fe9831e75a158cb97720c1e51cab27544526c9e24 SHA512 9a632a90806fa71398d70be7d38769065c1258fd94709cef72236753b42131b8d30da2a5dd28c74211ef8d04b0c30f52d0c593d49c2e8686568c8896b69577d7 -DIST lua-5.4.4.tar.xz 606456 BLAKE2B ba6cad647c0171e5e737151b189b5b404948c08182e9f17d7974a6c6c3b7d99b03cf930add863188db22674b8613fc600d771f62f9dfc99232aab9caea9b073c SHA512 8f3950ed5972a29d7c79e72af617526f6b9f6be7ab268e66206d7e453acc2564541c9d01e2de08a7e9046ab24c66b02167e48a0d5764753befd95dc922b61219 DIST lua-5.4.6.tar.xz 608376 BLAKE2B bec47685a24be429fa930ac02e6930300ad77105c56d970d3f1a9a6241c23da5ea77b863e9eca36b6c20e1ef1dc90f3635afe9b09dc4221f1e5dd72ce951df38 SHA512 8e7f6bd9d7fdf9327134f7eb01a78df87141989ea0d95f331eb0e71acdbf7c7b7d908da95e16cd91b3f9bad1b496e3b4db2380a851557f29cdc53f4f5255cda5 diff --git a/dev-lang/lua/files/lua-5.4.4-lparser-overread.patch b/dev-lang/lua/files/lua-5.4.4-lparser-overread.patch deleted file mode 100644 index 3e625aa4ffc0..000000000000 --- a/dev-lang/lua/files/lua-5.4.4-lparser-overread.patch +++ /dev/null @@ -1,34 +0,0 @@ -From https://github.com/lua/lua/commit/1f3c6f4534c6411313361697d98d1145a1f030fa Mon Sep 17 00:00:00 2001 -From: Roberto Ierusalimschy -Date: Tue, 15 Feb 2022 12:28:46 -0300 -Subject: [PATCH] Bug: Lua can generate wrong code when _ENV is - ---- a/src/lparser.c -+++ b/src/lparser.c -@@ -468,6 +468,7 @@ static void singlevar (LexState *ls, expdesc *var) { - expdesc key; - singlevaraux(fs, ls->envn, var, 1); /* get environment variable */ - lua_assert(var->k != VVOID); /* this one must exist */ -+ luaK_exp2anyregup(fs, var); /* but could be a constant */ - codestring(&key, varname); /* key is variable name */ - luaK_indexed(fs, var, &key); /* env[varname] */ - } ---- a/tests/attrib.lua -+++ b/tests/attrib.lua -@@ -434,6 +434,16 @@ a.aVeryLongName012345678901234567890123456789012345678901234567890123456789 == - 10) - - -+do -+ -- _ENV constant -+ local function foo () -+ local _ENV = 11 -+ X = "hi" -+ end -+ local st, msg = pcall(foo) -+ assert(not st and string.find(msg, "number")) -+end -+ - - -- test of large float/integer indices - diff --git a/dev-lang/lua/lua-5.4.4-r103.ebuild b/dev-lang/lua/lua-5.4.4-r103.ebuild deleted file mode 100644 index ebfa8021edc3..000000000000 --- a/dev-lang/lua/lua-5.4.4-r103.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic optfeature - -DESCRIPTION="A powerful light-weight programming language designed for extending applications" -HOMEPAGE="https://www.lua.org/" -# tarballs produced from ${PV} branches in https://gitweb.gentoo.org/proj/lua-patches.git -SRC_URI="https://dev.gentoo.org/~soap/distfiles/${P}.tar.xz" - -LICENSE="MIT" -SLOT="5.4" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="+deprecated readline" - -DEPEND=" - >=app-eselect/eselect-lua-3 - readline? ( sys-libs/readline:= ) - !dev-lang/lua:0" -RDEPEND="${DEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}/${P}-lparser-overread.patch" -) - -src_prepare() { - default - - if use elibc_musl; then - # locales on musl are non-functional (#834153) - # https://wiki.musl-libc.org/open-issues.html#Locale-limitations - sed -e 's|os.setlocale("pt_BR") or os.setlocale("ptb")|false|g' \ - -i tests/literals.lua || die - fi -} - -src_configure() { - use deprecated && append-cppflags -DLUA_COMPAT_5_3 - econf $(use_with readline) -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die -} - -pkg_postinst() { - eselect lua set --if-unset "${PN}${SLOT}" - - optfeature "Lua support for Emacs" app-emacs/lua-mode -}