gentoo auto-resync : 14:11:2024 - 03:02:32

3 files changed, 103 insertions, 6 deletions

diff --git a/dev-lang/luajit/Manifest b/dev-lang/luajit/Manifest
index f8d5883761af..e9a896c67a05 100644
--- a/dev-lang/luajit/Manifest
+++ b/dev-lang/luajit/Manifest
@@ -1,5 +1,6 @@
 DIST luajit-2.1.1716656478.tar.gz 1081717 BLAKE2B 42807910aa81e705ff39c382e98e479d46d31453fd6fc1857220c7d4cb66d0801e2ffd813ea3c55ab2bcde8e64275d0fec2044514d7b0ef5287714ec8061bf7a SHA512 6b00d37a33f0bafbd953569ef035546a97237a53cfb718d8aecca7e9c7afe5e4706e4a53e40b9afb8720adc8eee044d8d75b8ea6cdc50d2c3f8461d79bb73b26
 DIST luajit-2.1.1727870382.tar.gz 1082759 BLAKE2B ca2cca53238b1fcbb5a829b125f6b3efda3a863765027c8c224a01b95756255583e126ec04c115e7acc54314fb387ce1b09b9384acf0a852d51f887409bd702a SHA512 ac26594526f10e878874c02b2bbdfc6a0d1366c60456fbd09a75da5f565a2f81a1c73e385a7e7f0096a3923df5f4ac7f727100faced355bd05a9da0e95fbe1ef
 EBUILD luajit-2.1.1716656478.ebuild 1765 BLAKE2B 1e2960f12069fce84b46b1f06cc1129bd35c13e25ca3d9de5e1ccaed92ee0e827574c8f96faee5c32da1a2e3cd7335b94417ddcf0f299b4f1223b25bc98d3465 SHA512 3ed141f3339ba892fb2598b3c8d3f86760dfb5ea1c6efbf996cad9cb202faa9f5613426c5bf4dcfe741cf3b13f63bbf76bf651333eab414f4852a0622f629f64
-EBUILD luajit-2.1.1727870382.ebuild 1770 BLAKE2B 843279e5cdcd3fd43efc0e95bb5fc11c091ee9ea826052219cb125107ffec62df5c16404ccf0fe893e9bae47075122dc853b8873234d63ec3a890d5e37671e1b SHA512 71102fd63cf724b44ab00d8d8818d94f33602084a0447b77bbad8a178c472edc2ac25024bf85fe11d9e5fcc7e6f7726a67673273153a4e97a42a4db1561c5878
+EBUILD luajit-2.1.1727870382.ebuild 2357 BLAKE2B fc22a5e4d9f0d7a9458fc171f3f438d7a8d04a3182cc1ce5210ae7e8f05c4fa83f700ebb31298f075a978277991eac76abd67ab95a8a3f8d20025e2834d35033 SHA512 1ea5dec28a91f0549c72800513e1db36293aa89fa65513aa2de23c2421ebc3ac3cf4e1aa1608160e87a342168b62b89cfd6a7b6d461810c2e6fd58d65519cc6a
+EBUILD luajit-2.1.9999999999.ebuild 2319 BLAKE2B c215f9324d2528f6e5da26d87d119e1447cd28a0f1e9499f4262b85bd5a987f40fa221d63bab9ad8afdc261f0e15d753ca832408219d02e845b18baea1d2b65b SHA512 e1ac4499a26eb8a2d3bb666879ab2d10cb598a3c0d7e2fa541c8fd00446598d2783908b91409c8337a21c9d8ae57627d78110da4bacfeec2a207a20a132a7cc8
 MISC metadata.xml 417 BLAKE2B dca79cd3a003ad462f7da8372af0e4012c826bc5b3001417f5b5c969f9ae9dc0cf5f6a5ac35c1badfa95769c46f701a9fa1220e2c4ecd1320cd3e904a657a4ce SHA512 812208e908c4775c7a6009764416007ab3bea124da44dca696425340848a8ff4eeae7128977162c0e679c485a9c27f03639c87854b0d513eec8bceb19d316e0d
diff --git a/dev-lang/luajit/luajit-2.1.1727870382.ebuild b/dev-lang/luajit/luajit-2.1.1727870382.ebuild
index 82931bad8f2f..1a9014c337c4 100644
--- a/dev-lang/luajit/luajit-2.1.1727870382.ebuild
+++ b/dev-lang/luajit/luajit-2.1.1727870382.ebuild
@@ -2,7 +2,6 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-GIT_COMMIT=97813fb924edf822455f91a5fbbdfdb349e5984f
 
 # Upstream doesn't make releases anymore and instead have a (broken) "rolling
 # git tag" model.
@@ -17,13 +16,31 @@ inherit toolchain-funcs
 
 DESCRIPTION="Just-In-Time Compiler for the Lua programming language"
 HOMEPAGE="https://luajit.org/"
-SRC_URI="https://github.com/LuaJIT/LuaJIT/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/LuaJIT-${GIT_COMMIT}"
+
+if [[ ${PV} == 2.1.9999999999 ]]; then
+	# This is the 2.1 rolling release live build. When a 2.2 or 3.x branch comes
+	# out, create a new ebuild for it.
+	#
+	# Upstream recommends pulling rolling releases from the v2.1 branch.
+	# > The old git master branch is phased out and stays pinned to the v2.0
+	# > branch. Please follow the versioned branches instead.
+	#
+	# See http://luajit.org/status.html for additional information.
+	EGIT_BRANCH="v2.1"
+	EGIT_REPO_URI="https://luajit.org/git/luajit.git"
+	inherit git-r3
+else
+	# Update this commit hash to bump a pinned-commit ebuild.
+	GIT_COMMIT=97813fb924edf822455f91a5fbbdfdb349e5984f
+	SRC_URI="https://github.com/LuaJIT/LuaJIT/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/LuaJIT-${GIT_COMMIT}"
+
+	KEYWORDS="~amd64 ~arm ~arm64 -hppa ~mips ~ppc -riscv -sparc ~x86 ~amd64-linux ~x86-linux"
+fi
 
 LICENSE="MIT"
-# this should probably be pkgmoved to 2.0 for sake of consistency.
+# this should probably be pkgmoved to 2.1 for sake of consistency.
 SLOT="2/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 -hppa ~mips ~ppc -riscv -sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="lua52compat static-libs"
 
 _emake() {
diff --git a/dev-lang/luajit/luajit-2.1.9999999999.ebuild b/dev-lang/luajit/luajit-2.1.9999999999.ebuild
new file mode 100644
index 000000000000..f4cd0a39d8e1
--- /dev/null
+++ b/dev-lang/luajit/luajit-2.1.9999999999.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Upstream doesn't make releases anymore and instead have a (broken) "rolling
+# git tag" model.
+#
+# https://github.com/LuaJIT/LuaJIT/issues/665#issuecomment-784452583
+# https://www.freelists.org/post/luajit/LuaJIT-uses-rolling-releases
+#
+# Regular snapshots should be made from the v2.1 branch. Get the version with
+# `git show -s --format=%ct`
+
+inherit toolchain-funcs
+
+DESCRIPTION="Just-In-Time Compiler for the Lua programming language"
+HOMEPAGE="https://luajit.org/"
+
+if [[ ${PV} == 2.1.9999999999 ]]; then
+	# This is the 2.1 rolling release live build. When a 2.2 or 3.x branch comes
+	# out, create a new ebuild for it.
+	#
+	# Upstream recommends pulling rolling releases from the v2.1 branch.
+	# > The old git master branch is phased out and stays pinned to the v2.0
+	# > branch. Please follow the versioned branches instead.
+	#
+	# See http://luajit.org/status.html for additional information.
+	EGIT_BRANCH="v2.1"
+	EGIT_REPO_URI="https://luajit.org/git/luajit.git"
+	inherit git-r3
+else
+	# Update this commit hash to bump a pinned-commit ebuild.
+	GIT_COMMIT=""
+	SRC_URI="https://github.com/LuaJIT/LuaJIT/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/LuaJIT-${GIT_COMMIT}"
+
+	KEYWORDS="~amd64 ~arm ~arm64 -hppa ~mips ~ppc -riscv -sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="MIT"
+# this should probably be pkgmoved to 2.1 for sake of consistency.
+SLOT="2/${PV}"
+IUSE="lua52compat static-libs"
+
+_emake() {
+	emake \
+		Q= \
+		PREFIX="${EPREFIX}/usr" \
+		MULTILIB="$(get_libdir)" \
+		DESTDIR="${D}" \
+		CFLAGS="" \
+		LDFLAGS="" \
+		HOST_CC="$(tc-getBUILD_CC)" \
+		HOST_CFLAGS="${BUILD_CPPFLAGS} ${BUILD_CFLAGS}" \
+		HOST_LDFLAGS="${BUILD_LDFLAGS}" \
+		STATIC_CC="$(tc-getCC)" \
+		DYNAMIC_CC="$(tc-getCC) -fPIC" \
+		TARGET_LD="$(tc-getCC)" \
+		TARGET_CFLAGS="${CPPFLAGS} ${CFLAGS}" \
+		TARGET_LDFLAGS="${LDFLAGS}" \
+		TARGET_AR="$(tc-getAR) rcus" \
+		BUILDMODE="$(usex static-libs mixed dynamic)" \
+		TARGET_STRIP="true" \
+		INSTALL_LIB="${ED}/usr/$(get_libdir)" \
+		"$@"
+}
+
+src_compile() {
+	tc-export_build_env
+	_emake XCFLAGS="$(usex lua52compat "-DLUAJIT_ENABLE_LUA52COMPAT" "")"
+}
+
+src_install() {
+	_emake install
+	dosym luajit-"${PV}" /usr/bin/luajit
+
+	HTML_DOCS="doc/." einstalldocs
+}