[gentoo-commits] repo/gentoo:master commit in: dev-lang/luajit/, dev-lang/luajit/files/

[gentoo-commits] repo/gentoo:master commit in: dev-lang/luajit/, dev-lang/luajit/files/

[Sam James]

commit:     8aa33240a994a419722e01d1e71e11d4c29a3d2b
Author:     Artemis Everfree <artemis <AT> artemis <DOT> sh>
AuthorDate: Mon Nov 18 18:37:54 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Nov 21 09:24:13 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8aa33240

dev-lang/luajit: version bump to 2.1.1731601260

Previously, we patched around a Makefile bug that resulted
in luajit searching for files in a path relative to the
build directory instead of the system prefix. luajit has
pushed a commit [1] that fixes this bug, so we can remove
our patch.

1: https://github.com/LuaJIT/LuaJIT/commit/9ce8f1ff8e5298c4d921d9f0b4a3fc1f965b3f22
Bug: https://bugs.gentoo.org/943395
Signed-off-by: Artemis Everfree <artemis <AT> artemis.sh>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-lang/luajit/Manifest                           |  2 +-
 .../luajit-2.1.1727870382-fix-ljlibd-prefix.patch  | 25 ----------------------
 ...0382-r1.ebuild => luajit-2.1.1731601260.ebuild} |  3 +--
 dev-lang/luajit/luajit-2.1.9999999999.ebuild       |  1 -
 4 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/dev-lang/luajit/Manifest b/dev-lang/luajit/Manifest
index 4319b99836bc..7f33f6cae11e 100644
--- a/dev-lang/luajit/Manifest
+++ b/dev-lang/luajit/Manifest
@@ -1,2 +1,2 @@
 DIST luajit-2.1.1716656478.tar.gz 1081717 BLAKE2B 42807910aa81e705ff39c382e98e479d46d31453fd6fc1857220c7d4cb66d0801e2ffd813ea3c55ab2bcde8e64275d0fec2044514d7b0ef5287714ec8061bf7a SHA512 6b00d37a33f0bafbd953569ef035546a97237a53cfb718d8aecca7e9c7afe5e4706e4a53e40b9afb8720adc8eee044d8d75b8ea6cdc50d2c3f8461d79bb73b26
-DIST luajit-2.1.1727870382.tar.gz 1082759 BLAKE2B ca2cca53238b1fcbb5a829b125f6b3efda3a863765027c8c224a01b95756255583e126ec04c115e7acc54314fb387ce1b09b9384acf0a852d51f887409bd702a SHA512 ac26594526f10e878874c02b2bbdfc6a0d1366c60456fbd09a75da5f565a2f81a1c73e385a7e7f0096a3923df5f4ac7f727100faced355bd05a9da0e95fbe1ef
+DIST luajit-2.1.1731601260.tar.gz 1082678 BLAKE2B 07b8a9f1457db314785f9ab6ad87907b48a2dcee2a8a85e231779661ffe9b92e8b32cf790955537e86b519d61a8316848260fb83e7ba6746a816e2e0e59976e0 SHA512 4219017edd359bd5c92a37f1e3837c6ef8d9d8be89e53d80e110801e0eb7c8c2a74460376d1e3edef328e9d94f2eef9785e253027c67e1c91716e303e303a766

diff --git a/dev-lang/luajit/files/luajit-2.1.1727870382-fix-ljlibd-prefix.patch b/dev-lang/luajit/files/luajit-2.1.1727870382-fix-ljlibd-prefix.patch
deleted file mode 100644
index 98ae276fcc9f..000000000000
--- a/dev-lang/luajit/files/luajit-2.1.1727870382-fix-ljlibd-prefix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-# LJLIBD is traversed at runtime, should be relative to
-# PREFIX instead of DESTDIR/PREFIX
-#
-# https://github.com/LuaJIT/LuaJIT/issues/1303
-# https://bugs.gentoo.org/943395
-
---- a/Makefile
-+++ b/Makefile
-@@ -37,12 +37,13 @@
- DPREFIX= $(DESTDIR)$(PREFIX)
- INSTALL_BIN=   $(DPREFIX)/bin
- INSTALL_LIB=   $(DPREFIX)/$(MULTILIB)
--INSTALL_SHARE= $(DPREFIX)/share
-+INSTALL_SHARE_LOCAL= $(PREFIX)/share
-+INSTALL_SHARE= $(DESTDIR)$(INSTALL_SHARE_LOCAL)
- INSTALL_DEFINC= $(DPREFIX)/include/luajit-$(MMVERSION)
- INSTALL_INC=   $(INSTALL_DEFINC)
- 
--export INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(MMVERSION)
--INSTALL_JITLIB= $(INSTALL_LJLIBD)/jit
-+export INSTALL_LJLIBD= $(INSTALL_SHARE_LOCAL)/luajit-$(MMVERSION)
-+INSTALL_JITLIB= $(DESTDIR)$(INSTALL_LJLIBD)/jit
- INSTALL_LMODD= $(INSTALL_SHARE)/lua
- INSTALL_LMOD= $(INSTALL_LMODD)/$(ABIVER)
- INSTALL_CMODD= $(INSTALL_LIB)/lua

diff --git a/dev-lang/luajit/luajit-2.1.1727870382-r1.ebuild b/dev-lang/luajit/luajit-2.1.1731601260.ebuild
similarity index 96%
rename from dev-lang/luajit/luajit-2.1.1727870382-r1.ebuild
rename to dev-lang/luajit/luajit-2.1.1731601260.ebuild
index c3beab8c9c1a..2a5818cde6be 100644
--- a/dev-lang/luajit/luajit-2.1.1727870382-r1.ebuild
+++ b/dev-lang/luajit/luajit-2.1.1731601260.ebuild
@@ -32,7 +32,7 @@ if [[ ${VER_RELVER} == 9999999999 ]]; then
 	inherit git-r3
 else
 	# Update this commit hash to bump a pinned-commit ebuild.
-	GIT_COMMIT=97813fb924edf822455f91a5fbbdfdb349e5984f
+	GIT_COMMIT=fe71d0fb54ceadfb5b5f3b6baf29e486d97f6059
 	SRC_URI="https://github.com/LuaJIT/LuaJIT/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/LuaJIT-${GIT_COMMIT}"
 
@@ -43,7 +43,6 @@ LICENSE="MIT"
 # this should probably be pkgmoved to 2.1 for sake of consistency.
 SLOT="2/${PV}"
 IUSE="lua52compat static-libs"
-PATCHES=( "${FILESDIR}/${PN}-2.1.1727870382-fix-ljlibd-prefix.patch" )
 
 _emake() {
 	emake \

diff --git a/dev-lang/luajit/luajit-2.1.9999999999.ebuild b/dev-lang/luajit/luajit-2.1.9999999999.ebuild
index a27f77162d26..f8f7cfba19d2 100644
--- a/dev-lang/luajit/luajit-2.1.9999999999.ebuild
+++ b/dev-lang/luajit/luajit-2.1.9999999999.ebuild
@@ -43,7 +43,6 @@ LICENSE="MIT"
 # this should probably be pkgmoved to 2.1 for sake of consistency.
 SLOT="2/${PV}"
 IUSE="lua52compat static-libs"
-PATCHES=( "${FILESDIR}/${PN}-2.1.1727870382-fix-ljlibd-prefix.patch" )
 
 _emake() {
 	emake \