subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: dev\-lang\/luajit\/"

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

2024-09-09 Thread Matt Turner

commit: dc5781b54c4a4d0f98d76e65dae554b33bd6aff1
Author: Matt Turner  gentoo  org>
AuthorDate: Tue Sep 10 02:36:00 2024 +
Commit: Matt Turner  gentoo  org>
CommitDate: Tue Sep 10 02:36:00 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc5781b5

dev-lang/luajit: Drop old versions

Signed-off-by: Matt Turner  gentoo.org>

 dev-lang/luajit/Manifest   |  2 -
 .../luajit/luajit-2.1.0_beta3_p20220127-r2.ebuild  | 68 --
 .../luajit/luajit-2.1.0_beta3_p20220613.ebuild | 82 --
 3 files changed, 152 deletions(-)

diff --git a/dev-lang/luajit/Manifest b/dev-lang/luajit/Manifest
index c8ba66d29edc..33ca431b04d2 100644
--- a/dev-lang/luajit/Manifest
+++ b/dev-lang/luajit/Manifest
@@ -1,3 +1 @@
-DIST luajit-2.1.0_beta3_p20220127.tar.gz 1072282 BLAKE2B 
e1d4834683b9ec16f0567f5de486262d84af145e3e27724d343c130288e90abff089fd5c7ff1275f9dde3cb5ae4f818f710020bd708c599972a14f1671381c2a
 SHA512 
4c6ae7173bb91dc2d4d425da4afdab2520078e15ae4471c0cb99a255dd7544d6900b333efbbfc8f26ffbc4fcd8f1d2daf65671c59b5cafd6b0d53cb07b49d4ff
-DIST luajit-2.1.0_beta3_p20220613.tar.gz 1074088 BLAKE2B 
dbcfd4efcffb9b659a85af753017da5ca9b95e89a03dfe4e594513f2ad09b08e19a862527d41bd5adf8473afd022a471176ff5412975af47bdd785b9b9cfd43b
 SHA512 
e4fc6ebde9cd9efc5e9936416526a0f581186bf0661eca60a50bcf5048312e02f66dc905308d63abda03380c33aa2e64ceddd87527d59a4488ae7f4aeaf36dfe
 DIST luajit-2.1.1716656478.tar.gz 1081717 BLAKE2B 
42807910aa81e705ff39c382e98e479d46d31453fd6fc1857220c7d4cb66d0801e2ffd813ea3c55ab2bcde8e64275d0fec2044514d7b0ef5287714ec8061bf7a
 SHA512 
6b00d37a33f0bafbd953569ef035546a97237a53cfb718d8aecca7e9c7afe5e4706e4a53e40b9afb8720adc8eee044d8d75b8ea6cdc50d2c3f8461d79bb73b26

diff --git a/dev-lang/luajit/luajit-2.1.0_beta3_p20220127-r2.ebuild 
b/dev-lang/luajit/luajit-2.1.0_beta3_p20220127-r2.ebuild
deleted file mode 100644
index ceef227070dc..
--- a/dev-lang/luajit/luajit-2.1.0_beta3_p20220127-r2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GIT_COMMIT=1d7b5029c5ba36870d25c67524034d452b761d27
-
-# Upstream don'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.
-
-inherit pax-utils toolchain-funcs
-
-MY_PV="$(ver_cut 1-5)"
-MY_PV="${MY_PV/_beta/-beta}"
-MY_P="LuaJIT-${MY_PV}"
-
-DESCRIPTION="Just-In-Time Compiler for the Lua programming language"
-HOMEPAGE="https://luajit.org/";
-# SRC_URI="https://luajit.org/download/${MY_P}.tar.gz";
-SRC_URI="https://github.com/LuaJIT/LuaJIT/archive/${GIT_COMMIT}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="MIT"
-# this should probably be pkgmoved to 2.0 for sake of consistency.
-SLOT="2/${PV}"
-KEYWORDS="amd64 arm arm64 -hppa ppc -riscv -sparc x86 ~amd64-linux ~x86-linux"
-IUSE="lua52compat static-libs"
-
-S="${WORKDIR}/LuaJIT-${GIT_COMMIT}"
-
-_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-2.1.0-beta3 /usr/bin/luajit
-   pax-mark m "${ED}/usr/bin/luajit-${MY_PV}"
-
-   HTML_DOCS="doc/." einstalldocs
-}

diff --git a/dev-lang/luajit/luajit-2.1.0_beta3_p20220613.ebuild 
b/dev-lang/luajit/luajit-2.1.0_beta3_p20220613.ebuild
deleted file mode 100644
index 01c4aca8c65c..
--- a/dev-lang/luajit/luajit-2.1.0_beta3_p20220613.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GIT_COMMIT=0065cff7e0222c234b75a71e72b8883df5d000c2
-
-# Upstream don'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 s

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

2024-09-09 Thread Matt Turner

commit: 5618c2f4670c28aa4c3ce024900a25354a7c8ab5
Author: Matt Turner  gentoo  org>
AuthorDate: Tue Sep 10 02:36:40 2024 +
Commit: Matt Turner  gentoo  org>
CommitDate: Tue Sep 10 02:36:40 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5618c2f4

dev-lang/luajit: Add maintainer-needed comment

Signed-off-by: Matt Turner  gentoo.org>

 dev-lang/luajit/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-lang/luajit/metadata.xml b/dev-lang/luajit/metadata.xml
index edeaec8f16f2..9aaf0f2d3ecc 100644
--- a/dev-lang/luajit/metadata.xml
+++ b/dev-lang/luajit/metadata.xml
@@ -1,6 +1,7 @@
 
 https://www.gentoo.org/dtd/metadata.dtd";>
 
+  
   
 
   Enable some upwards-compatible features

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

2024-07-16 Thread Sam James

commit: 40d2ed0b126f79d3d0c9e96df38c7e9c88c6d098
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul 16 22:46:23 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul 16 22:46:23 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40d2ed0b

dev-lang/luajit: Stabilize 2.1.1716656478 ppc, #936162

Signed-off-by: Sam James  gentoo.org>

 dev-lang/luajit/luajit-2.1.1716656478.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/luajit/luajit-2.1.1716656478.ebuild 
b/dev-lang/luajit/luajit-2.1.1716656478.ebuild
index c6005e5ba970..b58200077f6e 100644
--- a/dev-lang/luajit/luajit-2.1.1716656478.ebuild
+++ b/dev-lang/luajit/luajit-2.1.1716656478.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/LuaJIT-${GIT_COMMIT}"
 LICENSE="MIT"
 # this should probably be pkgmoved to 2.0 for sake of consistency.
 SLOT="2/${PV}"
-KEYWORDS="amd64 arm ~arm64 -hppa ~mips ~ppc -riscv -sparc x86 ~amd64-linux 
~x86-linux"
+KEYWORDS="amd64 arm ~arm64 -hppa ~mips ppc -riscv -sparc x86 ~amd64-linux 
~x86-linux"
 IUSE="lua52compat static-libs"
 
 _emake() {

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

2024-07-16 Thread Sam James

commit: 6c5348e5f8cb472da1238af25023d1e4c26c730e
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul 16 22:46:24 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul 16 22:46:24 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c5348e5

dev-lang/luajit: Stabilize 2.1.1716656478 arm64, #936162

Signed-off-by: Sam James  gentoo.org>

 dev-lang/luajit/luajit-2.1.1716656478.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/luajit/luajit-2.1.1716656478.ebuild 
b/dev-lang/luajit/luajit-2.1.1716656478.ebuild
index b58200077f6e..e017c77d2323 100644
--- a/dev-lang/luajit/luajit-2.1.1716656478.ebuild
+++ b/dev-lang/luajit/luajit-2.1.1716656478.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/LuaJIT-${GIT_COMMIT}"
 LICENSE="MIT"
 # this should probably be pkgmoved to 2.0 for sake of consistency.
 SLOT="2/${PV}"
-KEYWORDS="amd64 arm ~arm64 -hppa ~mips ppc -riscv -sparc x86 ~amd64-linux 
~x86-linux"
+KEYWORDS="amd64 arm arm64 -hppa ~mips ppc -riscv -sparc x86 ~amd64-linux 
~x86-linux"
 IUSE="lua52compat static-libs"
 
 _emake() {

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

2024-07-16 Thread Sam James

commit: 62dff9a75566d212ca41ea0cd4ddee12c5d858b4
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul 16 22:46:22 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul 16 22:46:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62dff9a7

dev-lang/luajit: Stabilize 2.1.1716656478 arm, #936162

Signed-off-by: Sam James  gentoo.org>

 dev-lang/luajit/luajit-2.1.1716656478.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/luajit/luajit-2.1.1716656478.ebuild 
b/dev-lang/luajit/luajit-2.1.1716656478.ebuild
index a4275091a81f..c6005e5ba970 100644
--- a/dev-lang/luajit/luajit-2.1.1716656478.ebuild
+++ b/dev-lang/luajit/luajit-2.1.1716656478.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/LuaJIT-${GIT_COMMIT}"
 LICENSE="MIT"
 # this should probably be pkgmoved to 2.0 for sake of consistency.
 SLOT="2/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 -hppa ~mips ~ppc -riscv -sparc x86 ~amd64-linux 
~x86-linux"
+KEYWORDS="amd64 arm ~arm64 -hppa ~mips ~ppc -riscv -sparc x86 ~amd64-linux 
~x86-linux"
 IUSE="lua52compat static-libs"
 
 _emake() {

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

2024-07-16 Thread Arthur Zamarin

commit: 72f622af8bf66e62557856141b502df6ed1b1975
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Jul 16 19:18:29 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Jul 16 19:18:29 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72f622af

dev-lang/luajit: Stabilize 2.1.1716656478 amd64, #936162

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-lang/luajit/luajit-2.1.1716656478.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/luajit/luajit-2.1.1716656478.ebuild 
b/dev-lang/luajit/luajit-2.1.1716656478.ebuild
index 9d52ad0cb632..eeb6c1fe2d76 100644
--- a/dev-lang/luajit/luajit-2.1.1716656478.ebuild
+++ b/dev-lang/luajit/luajit-2.1.1716656478.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/LuaJIT-${GIT_COMMIT}"
 LICENSE="MIT"
 # this should probably be pkgmoved to 2.0 for sake of consistency.
 SLOT="2/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 -hppa ~mips ~ppc -riscv -sparc ~x86 ~amd64-linux 
~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 -hppa ~mips ~ppc -riscv -sparc ~x86 ~amd64-linux 
~x86-linux"
 IUSE="lua52compat static-libs"
 
 _emake() {

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

2024-07-16 Thread Arthur Zamarin

commit: 4bc4357e2b07f45c9fb32221bbe730119c915282
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Jul 16 19:18:30 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Jul 16 19:18:30 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bc4357e

dev-lang/luajit: Stabilize 2.1.1716656478 x86, #936162

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-lang/luajit/luajit-2.1.1716656478.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/luajit/luajit-2.1.1716656478.ebuild 
b/dev-lang/luajit/luajit-2.1.1716656478.ebuild
index eeb6c1fe2d76..a4275091a81f 100644
--- a/dev-lang/luajit/luajit-2.1.1716656478.ebuild
+++ b/dev-lang/luajit/luajit-2.1.1716656478.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/LuaJIT-${GIT_COMMIT}"
 LICENSE="MIT"
 # this should probably be pkgmoved to 2.0 for sake of consistency.
 SLOT="2/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 -hppa ~mips ~ppc -riscv -sparc ~x86 ~amd64-linux 
~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 -hppa ~mips ~ppc -riscv -sparc x86 ~amd64-linux 
~x86-linux"
 IUSE="lua52compat static-libs"
 
 _emake() {

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

2024-07-16 Thread William Hubbs

commit: 1cdaabe0d347c7b28423ae53ef940fcc4d0e6a05
Author: William Hubbs  gentoo  org>
AuthorDate: Tue Jul 16 17:45:25 2024 +
Commit: William Hubbs  gentoo  org>
CommitDate: Tue Jul 16 17:45:42 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cdaabe0

dev-lang/luajit: drop myself as a maintainer

Signed-off-by: William Hubbs  gentoo.org>

 dev-lang/luajit/metadata.xml | 4 
 1 file changed, 4 deletions(-)

diff --git a/dev-lang/luajit/metadata.xml b/dev-lang/luajit/metadata.xml
index 6a8f2a1c704f..edeaec8f16f2 100644
--- a/dev-lang/luajit/metadata.xml
+++ b/dev-lang/luajit/metadata.xml
@@ -1,10 +1,6 @@
 
 https://www.gentoo.org/dtd/metadata.dtd";>
 
-  
-willi...@gentoo.org
-William Hubbs
-  
   
 
   Enable some upwards-compatible features

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

2024-06-08 Thread Matt Turner

commit: a03052a8988b5264704b81f3d276a31c2d1aaabe
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Jun  9 03:04:30 2024 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Jun  9 03:32:10 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a03052a8

dev-lang/luajit: Version bump to 2.1.1716656478

Closes: https://bugs.gentoo.org/917019
Signed-off-by: Matt Turner  gentoo.org>

 dev-lang/luajit/Manifest |  1 +
 dev-lang/luajit/luajit-2.1.1716656478.ebuild | 62 
 2 files changed, 63 insertions(+)

diff --git a/dev-lang/luajit/Manifest b/dev-lang/luajit/Manifest
index 9b0d30a48afc..c8ba66d29edc 100644
--- a/dev-lang/luajit/Manifest
+++ b/dev-lang/luajit/Manifest
@@ -1,2 +1,3 @@
 DIST luajit-2.1.0_beta3_p20220127.tar.gz 1072282 BLAKE2B 
e1d4834683b9ec16f0567f5de486262d84af145e3e27724d343c130288e90abff089fd5c7ff1275f9dde3cb5ae4f818f710020bd708c599972a14f1671381c2a
 SHA512 
4c6ae7173bb91dc2d4d425da4afdab2520078e15ae4471c0cb99a255dd7544d6900b333efbbfc8f26ffbc4fcd8f1d2daf65671c59b5cafd6b0d53cb07b49d4ff
 DIST luajit-2.1.0_beta3_p20220613.tar.gz 1074088 BLAKE2B 
dbcfd4efcffb9b659a85af753017da5ca9b95e89a03dfe4e594513f2ad09b08e19a862527d41bd5adf8473afd022a471176ff5412975af47bdd785b9b9cfd43b
 SHA512 
e4fc6ebde9cd9efc5e9936416526a0f581186bf0661eca60a50bcf5048312e02f66dc905308d63abda03380c33aa2e64ceddd87527d59a4488ae7f4aeaf36dfe
+DIST luajit-2.1.1716656478.tar.gz 1081717 BLAKE2B 
42807910aa81e705ff39c382e98e479d46d31453fd6fc1857220c7d4cb66d0801e2ffd813ea3c55ab2bcde8e64275d0fec2044514d7b0ef5287714ec8061bf7a
 SHA512 
6b00d37a33f0bafbd953569ef035546a97237a53cfb718d8aecca7e9c7afe5e4706e4a53e40b9afb8720adc8eee044d8d75b8ea6cdc50d2c3f8461d79bb73b26

diff --git a/dev-lang/luajit/luajit-2.1.1716656478.ebuild 
b/dev-lang/luajit/luajit-2.1.1716656478.ebuild
new file mode 100644
index ..9d52ad0cb632
--- /dev/null
+++ b/dev-lang/luajit/luajit-2.1.1716656478.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GIT_COMMIT=93e87998b24021b94de8d1c8db24c46fb6e9
+
+# 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/";
+SRC_URI="https://github.com/LuaJIT/LuaJIT/archive/${GIT_COMMIT}.tar.gz -> 
${P}.tar.gz"
+S="${WORKDIR}/LuaJIT-${GIT_COMMIT}"
+
+LICENSE="MIT"
+# this should probably be pkgmoved to 2.0 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() {
+   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
+}

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

2023-11-13 Thread James Le Cuirot

commit: 6fab286b0d2af2756716e4ba8d8c9aa569f9c6b4
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Nov  4 16:17:15 2023 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Mon Nov 13 22:13:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fab286b

dev-lang/luajit: Fix cross-compiling from 64-bit to 32-bit

This will only work with a multilib build host toolchain, so probably
just amd64 and ppc64, but it's better than nothing.

Multilib profiles specify an explicit target rather than just -m32 in
LDFLAGS, but this should still do the right thing, and there's probably
no way to query the build profile.

Closes: https://bugs.gentoo.org/627332
Signed-off-by: James Le Cuirot  gentoo.org>

 dev-lang/luajit/luajit-2.1.0_beta3_p20220613.ebuild | 16 +++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/dev-lang/luajit/luajit-2.1.0_beta3_p20220613.ebuild 
b/dev-lang/luajit/luajit-2.1.0_beta3_p20220613.ebuild
index 24063aae5265..01c4aca8c65c 100644
--- a/dev-lang/luajit/luajit-2.1.0_beta3_p20220613.ebuild
+++ b/dev-lang/luajit/luajit-2.1.0_beta3_p20220613.ebuild
@@ -31,6 +31,21 @@ IUSE="lua52compat static-libs"
 
 S="${WORKDIR}/LuaJIT-${GIT_COMMIT}"
 
+src_configure() {
+   tc-export_build_env
+
+   # You need to use a 32-bit toolchain to build for a 32-bit architecture.
+   # Some 64-bit toolchains (like amd64 and ppc64) usually have multilib
+   # enabled, allowing you to build in 32-bit with -m32. This won't work 
in all
+   # cases, but it will otherwise just break, so it's worth trying anyway. 
If
+   # you're trying to build for 64-bit from 32-bit, then you're screwed, 
sorry.
+   # See https://github.com/LuaJIT/LuaJIT/issues/664 for the upstream 
issue.
+   if tc-is-cross-compiler && [[ $(tc-get-build-ptr-size) != 4 && 
$(tc-get-ptr-size) == 4 ]]; then
+   BUILD_CFLAGS+=" -m32"
+   BUILD_LDFLAGS+=" -m32"
+   fi
+}
+
 _emake() {
emake \
Q= \
@@ -55,7 +70,6 @@ _emake() {
 }
 
 src_compile() {
-   tc-export_build_env
_emake XCFLAGS="$(usex lua52compat "-DLUAJIT_ENABLE_LUA52COMPAT" "")"
 }

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

2023-09-10 Thread Sam James

commit: e0122b97e2aeeb939c5ae668caf46f3b054b14bf
Author: Sam James  gentoo  org>
AuthorDate: Sun Sep 10 12:24:45 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep 10 12:24:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0122b97

dev-lang/luajit: add note wrt snapshots

Signed-off-by: Sam James  gentoo.org>

 dev-lang/luajit/luajit-2.1.0_beta3_p20220127-r2.ebuild | 10 +-
 dev-lang/luajit/luajit-2.1.0_beta3_p20220613.ebuild|  8 
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/dev-lang/luajit/luajit-2.1.0_beta3_p20220127-r2.ebuild 
b/dev-lang/luajit/luajit-2.1.0_beta3_p20220127-r2.ebuild
index eb39eee7fe3a..295ee5f81527 100644
--- a/dev-lang/luajit/luajit-2.1.0_beta3_p20220127-r2.ebuild
+++ b/dev-lang/luajit/luajit-2.1.0_beta3_p20220127-r2.ebuild
@@ -1,9 +1,17 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 GIT_COMMIT=1d7b5029c5ba36870d25c67524034d452b761d27
 
+# Upstream don'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.
+
 inherit pax-utils toolchain-funcs
 
 MY_PV="$(ver_cut 1-5)"

diff --git a/dev-lang/luajit/luajit-2.1.0_beta3_p20220613.ebuild 
b/dev-lang/luajit/luajit-2.1.0_beta3_p20220613.ebuild
index 50473d2a29c6..96c32b35f626 100644
--- a/dev-lang/luajit/luajit-2.1.0_beta3_p20220613.ebuild
+++ b/dev-lang/luajit/luajit-2.1.0_beta3_p20220613.ebuild
@@ -4,6 +4,14 @@
 EAPI=7
 GIT_COMMIT=0065cff7e0222c234b75a71e72b8883df5d000c2
 
+# Upstream don'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.
+
 inherit pax-utils toolchain-funcs
 
 MY_PV="$(ver_cut 1-5)"

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

2023-03-19 Thread Arthur Zamarin

commit: a5767d6f38a43f9f21d41d320888ab2c3585b967
Author: Matoro Mahri  users  noreply  github  
com>
AuthorDate: Thu Mar 16 17:31:23 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Mar 19 17:35:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5767d6f

dev-lang/luajit: Keyword 2.1.0_beta3_p20220613 mips, #900437

Signed-off-by: Matoro Mahri  users.noreply.github.com>
Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-lang/luajit/luajit-2.1.0_beta3_p20220613.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-lang/luajit/luajit-2.1.0_beta3_p20220613.ebuild 
b/dev-lang/luajit/luajit-2.1.0_beta3_p20220613.ebuild
index b3acc0d0871b..50473d2a29c6 100644
--- a/dev-lang/luajit/luajit-2.1.0_beta3_p20220613.ebuild
+++ b/dev-lang/luajit/luajit-2.1.0_beta3_p20220613.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ 
SRC_URI="https://github.com/LuaJIT/LuaJIT/archive/${GIT_COMMIT}.tar.gz -> ${P}.t
 LICENSE="MIT"
 # this should probably be pkgmoved to 2.0 for sake of consistency.
 SLOT="2/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 -hppa ~ppc -riscv -sparc ~x86 ~amd64-linux 
~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 -hppa ~mips ~ppc -riscv -sparc ~x86 ~amd64-linux 
~x86-linux"
 IUSE="lua52compat static-libs"
 
 S="${WORKDIR}/LuaJIT-${GIT_COMMIT}"

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

2022-12-06 Thread Sam James

commit: ba5f0d5684118e277ceaaa8902a30d16fcccd4e9
Author: Petr Vaněk 
AuthorDate: Thu Nov  3 08:59:55 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec  6 09:25:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba5f0d56

dev-lang/luajit: fix indentation in install phase

Signed-off-by: Petr VanÄ›k  atlas.cz>
Signed-off-by: Sam James  gentoo.org>

 dev-lang/luajit/luajit-2.1.0_beta3_p20220127-r2.ebuild | 2 +-
 dev-lang/luajit/luajit-2.1.0_beta3_p20220613.ebuild| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-lang/luajit/luajit-2.1.0_beta3_p20220127-r2.ebuild 
b/dev-lang/luajit/luajit-2.1.0_beta3_p20220127-r2.ebuild
index 6735d5ae4d00..eb39eee7fe3a 100644
--- a/dev-lang/luajit/luajit-2.1.0_beta3_p20220127-r2.ebuild
+++ b/dev-lang/luajit/luajit-2.1.0_beta3_p20220127-r2.ebuild
@@ -53,7 +53,7 @@ src_compile() {
 
 src_install() {
_emake install
-dosym luajit-2.1.0-beta3 /usr/bin/luajit
+   dosym luajit-2.1.0-beta3 /usr/bin/luajit
pax-mark m "${ED}/usr/bin/luajit-${MY_PV}"
 
HTML_DOCS="doc/." einstalldocs

diff --git a/dev-lang/luajit/luajit-2.1.0_beta3_p20220613.ebuild 
b/dev-lang/luajit/luajit-2.1.0_beta3_p20220613.ebuild
index e5985feb3a90..b3acc0d0871b 100644
--- a/dev-lang/luajit/luajit-2.1.0_beta3_p20220613.ebuild
+++ b/dev-lang/luajit/luajit-2.1.0_beta3_p20220613.ebuild
@@ -53,7 +53,7 @@ src_compile() {
 
 src_install() {
_emake install
-dosym luajit-2.1.0-beta3 /usr/bin/luajit
+   dosym luajit-2.1.0-beta3 /usr/bin/luajit
pax-mark m "${ED}/usr/bin/luajit-${MY_PV}"
 
HTML_DOCS="doc/." einstalldocs

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

2022-06-20 Thread William Hubbs

commit: d9b0e9c35811f5d407f2625815ea1f325a01c54d
Author: William Hubbs  gentoo  org>
AuthorDate: Mon Jun 20 17:15:25 2022 +
Commit: William Hubbs  gentoo  org>
CommitDate: Mon Jun 20 17:15:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9b0e9c3

dev-lang/luajit: add 2.1.0_beta3_p20220613

Signed-off-by: William Hubbs  gentoo.org>

 dev-lang/luajit/Manifest   |  1 +
 .../luajit/luajit-2.1.0_beta3_p20220613.ebuild | 60 ++
 2 files changed, 61 insertions(+)

diff --git a/dev-lang/luajit/Manifest b/dev-lang/luajit/Manifest
index d3defc376d01..9b0d30a48afc 100644
--- a/dev-lang/luajit/Manifest
+++ b/dev-lang/luajit/Manifest
@@ -1 +1,2 @@
 DIST luajit-2.1.0_beta3_p20220127.tar.gz 1072282 BLAKE2B 
e1d4834683b9ec16f0567f5de486262d84af145e3e27724d343c130288e90abff089fd5c7ff1275f9dde3cb5ae4f818f710020bd708c599972a14f1671381c2a
 SHA512 
4c6ae7173bb91dc2d4d425da4afdab2520078e15ae4471c0cb99a255dd7544d6900b333efbbfc8f26ffbc4fcd8f1d2daf65671c59b5cafd6b0d53cb07b49d4ff
+DIST luajit-2.1.0_beta3_p20220613.tar.gz 1074088 BLAKE2B 
dbcfd4efcffb9b659a85af753017da5ca9b95e89a03dfe4e594513f2ad09b08e19a862527d41bd5adf8473afd022a471176ff5412975af47bdd785b9b9cfd43b
 SHA512 
e4fc6ebde9cd9efc5e9936416526a0f581186bf0661eca60a50bcf5048312e02f66dc905308d63abda03380c33aa2e64ceddd87527d59a4488ae7f4aeaf36dfe

diff --git a/dev-lang/luajit/luajit-2.1.0_beta3_p20220613.ebuild 
b/dev-lang/luajit/luajit-2.1.0_beta3_p20220613.ebuild
new file mode 100644
index ..e5985feb3a90
--- /dev/null
+++ b/dev-lang/luajit/luajit-2.1.0_beta3_p20220613.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GIT_COMMIT=0065cff7e0222c234b75a71e72b8883df5d000c2
+
+inherit pax-utils toolchain-funcs
+
+MY_PV="$(ver_cut 1-5)"
+MY_PV="${MY_PV/_beta/-beta}"
+MY_P="LuaJIT-${MY_PV}"
+
+DESCRIPTION="Just-In-Time Compiler for the Lua programming language"
+HOMEPAGE="https://luajit.org/";
+SRC_URI="https://luajit.org/download/${MY_P}.tar.gz";
+SRC_URI="https://github.com/LuaJIT/LuaJIT/archive/${GIT_COMMIT}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="MIT"
+# this should probably be pkgmoved to 2.0 for sake of consistency.
+SLOT="2/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 -hppa ~ppc -riscv -sparc ~x86 ~amd64-linux 
~x86-linux"
+IUSE="lua52compat static-libs"
+
+S="${WORKDIR}/LuaJIT-${GIT_COMMIT}"
+
+_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-2.1.0-beta3 /usr/bin/luajit
+   pax-mark m "${ED}/usr/bin/luajit-${MY_PV}"
+
+   HTML_DOCS="doc/." einstalldocs
+}

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

2022-06-20 Thread William Hubbs

commit: 8fdf6c00c04991c3939f4928bfc40019ea884b15
Author: William Hubbs  gentoo  org>
AuthorDate: Mon Jun 20 16:49:35 2022 +
Commit: William Hubbs  gentoo  org>
CommitDate: Mon Jun 20 16:54:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fdf6c00

dev-lang/luajit: add subslot

Bug: https://bugs.gentoo.org/852932
Signed-off-by: William Hubbs  gentoo.org>

 ...a3_p20220127-r1.ebuild => luajit-2.1.0_beta3_p20220127-r2.ebuild} | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/dev-lang/luajit/luajit-2.1.0_beta3_p20220127-r1.ebuild 
b/dev-lang/luajit/luajit-2.1.0_beta3_p20220127-r2.ebuild
similarity index 98%
rename from dev-lang/luajit/luajit-2.1.0_beta3_p20220127-r1.ebuild
rename to dev-lang/luajit/luajit-2.1.0_beta3_p20220127-r2.ebuild
index 5c328a71e403..6735d5ae4d00 100644
--- a/dev-lang/luajit/luajit-2.1.0_beta3_p20220127-r1.ebuild
+++ b/dev-lang/luajit/luajit-2.1.0_beta3_p20220127-r2.ebuild
@@ -17,13 +17,10 @@ 
SRC_URI="https://github.com/LuaJIT/LuaJIT/archive/${GIT_COMMIT}.tar.gz -> ${P}.t
 
 LICENSE="MIT"
 # this should probably be pkgmoved to 2.0 for sake of consistency.
-SLOT="2"
+SLOT="2/${PV}"
 KEYWORDS="amd64 arm arm64 -hppa ppc -riscv -sparc x86 ~amd64-linux ~x86-linux"
 IUSE="lua52compat static-libs"
 
-PATCHES=(
-)
-
 S="${WORKDIR}/LuaJIT-${GIT_COMMIT}"
 
 _emake() {

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

2022-06-20 Thread William Hubbs

commit: 1f080d6c4203ad72cfaa6b71abdc7c6f0b223321
Author: William Hubbs  gentoo  org>
AuthorDate: Mon Jun 20 16:21:24 2022 +
Commit: William Hubbs  gentoo  org>
CommitDate: Mon Jun 20 16:22:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f080d6c

dev-lang/luajit: drop old patches

Signed-off-by: William Hubbs  gentoo.org>

 dev-lang/luajit/files/CVE-2020-15890.patch| 22 ---
 dev-lang/luajit/files/luajit-2-ldconfig.patch | 31 ---
 2 files changed, 53 deletions(-)

diff --git a/dev-lang/luajit/files/CVE-2020-15890.patch 
b/dev-lang/luajit/files/CVE-2020-15890.patch
deleted file mode 100644
index 751726571a05..
--- a/dev-lang/luajit/files/CVE-2020-15890.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 53f82e6e2e858a0a62fd1a2ff47e9866693382e6 Mon Sep 17 00:00:00 2001
-From: Mike Pall 
-Date: Sun, 12 Jul 2020 14:30:34 +0200
-Subject: [PATCH] Fix frame traversal for __gc handler frames.
-
-Reported by Changochen.

- src/lj_err.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/lj_err.c b/src/lj_err.c
-index caa7487f2..e3e0c2eb7 100644
 a/src/lj_err.c
-+++ b/src/lj_err.c
-@@ -529,6 +529,7 @@ static ptrdiff_t finderrfunc(lua_State *L)
-   if (cframe_canyield(cf)) return 0;
-   if (cframe_errfunc(cf) >= 0)
-   return cframe_errfunc(cf);
-+  cf = cframe_prev(cf);
-   frame = frame_prevd(frame);
-   break;
- case FRAME_PCALL:

diff --git a/dev-lang/luajit/files/luajit-2-ldconfig.patch 
b/dev-lang/luajit/files/luajit-2-ldconfig.patch
deleted file mode 100644
index add449a60381..
--- a/dev-lang/luajit/files/luajit-2-ldconfig.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 18c9cf7d3788a8f7408df45df92fc4ae3bcc0d80 Mon Sep 17 00:00:00 2001
-From: Mike Pall 
-Date: Sat, 25 Jan 2020 17:37:12 +0100
-Subject: [PATCH] Fix POSIX install with missing or incompatible ldconfig.
-

- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 07bc70faf..bff53f286 100644
 a/Makefile
-+++ b/Makefile
-@@ -74,7 +74,7 @@ SYMLINK= ln -sf
- INSTALL_X= install -m 0755
- INSTALL_F= install -m 0644
- UNINSTALL= $(RM)
--LDCONFIG= ldconfig -n
-+LDCONFIG= ldconfig -n 2>/dev/null
- SED_PC= sed -e "s|^prefix=.*|prefix=$(PREFIX)|" \
- -e "s|^multilib=.*|multilib=$(MULTILIB)|"
- 
-@@ -118,7 +118,7 @@ install: $(INSTALL_DEP)
-   $(RM) $(INSTALL_TSYM) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2)
-   cd src && test -f $(FILE_SO) && \
- $(INSTALL_X) $(FILE_SO) $(INSTALL_DYN) && \
--$(LDCONFIG) $(INSTALL_LIB) && \
-+( $(LDCONFIG) $(INSTALL_LIB) || : ) && \
- $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT1) && \
- $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT2) || :
-   cd etc && $(INSTALL_F) $(FILE_MAN) $(INSTALL_MAN)

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

2022-06-20 Thread William Hubbs

commit: e106438f44a0c87b7b9e0defb08ea28bb504fc5a
Author: William Hubbs  gentoo  org>
AuthorDate: Mon Jun 20 16:15:45 2022 +
Commit: William Hubbs  gentoo  org>
CommitDate: Mon Jun 20 16:17:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e106438f

dev-lang/luajit: drop 2.0.5-r3, 2.1.0_beta3-r2

Signed-off-by: William Hubbs  gentoo.org>

 dev-lang/luajit/Manifest |  2 -
 dev-lang/luajit/luajit-2.0.5-r3.ebuild   | 74 
 dev-lang/luajit/luajit-2.1.0_beta3-r2.ebuild | 63 ---
 3 files changed, 139 deletions(-)

diff --git a/dev-lang/luajit/Manifest b/dev-lang/luajit/Manifest
index 08aac0e839e5..d3defc376d01 100644
--- a/dev-lang/luajit/Manifest
+++ b/dev-lang/luajit/Manifest
@@ -1,3 +1 @@
-DIST LuaJIT-2.0.5.tar.gz 849845 BLAKE2B 
961c8622e19b0e66a76a875cb46ad149cb2559b5af41f360dc41dd0d6bb924583e6477dd1329f67c2ac6ea4b8dc42c5e2f4d63ea49400aba4d9e7c7e85e4b085
 SHA512 
2636675602b4a060b0571c05220db2061dd2f38568e35b2be346a0f5e3128d87057d11d3d0d7567d8cc4e0817b5e4cf2c52a17a48065520962b157816465a9fe
-DIST LuaJIT-2.1.0-beta3.tar.gz 1025180 BLAKE2B 
ac3d12e25bd9946ba41aed6672c66884e7256e6be99d7ee8d1260d697453c966b24d60387f278f47233bad44cda61085c9059e6f62c0bc7cfdaaefde282346c5
 SHA512 
c44e967a0f671ed32b55aee810bc8b3b63737a2d7363b8984ae1949b24f98dbb3f9be7c1e10239fdeb96a3e3c836f606342cbd61838cf9bcadb077443eb5bc12
 DIST luajit-2.1.0_beta3_p20220127.tar.gz 1072282 BLAKE2B 
e1d4834683b9ec16f0567f5de486262d84af145e3e27724d343c130288e90abff089fd5c7ff1275f9dde3cb5ae4f818f710020bd708c599972a14f1671381c2a
 SHA512 
4c6ae7173bb91dc2d4d425da4afdab2520078e15ae4471c0cb99a255dd7544d6900b333efbbfc8f26ffbc4fcd8f1d2daf65671c59b5cafd6b0d53cb07b49d4ff

diff --git a/dev-lang/luajit/luajit-2.0.5-r3.ebuild 
b/dev-lang/luajit/luajit-2.0.5-r3.ebuild
deleted file mode 100644
index b7345d4525cd..
--- a/dev-lang/luajit/luajit-2.0.5-r3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pax-utils toolchain-funcs
-
-MY_PV="$(ver_cut 1-3)"
-MY_P="LuaJIT-${MY_PV}"
-if [[ -n $(ver_cut 4) ]]; then
-   HOTFIX="v${PV}"
-   HOTFIX="${HOTFIX/_p/_hotfix}.patch"
-fi
-
-DESCRIPTION="Just-In-Time Compiler for the Lua programming language"
-HOMEPAGE="https://luajit.org/";
-SRC_URI="https://luajit.org/download/${MY_P}.tar.gz
-   ${HOTFIX:+https://luajit.org/download/${HOTFIX}}";
-
-LICENSE="MIT"
-# this should probably be pkgmoved to 2.0 for sake of consistency.
-SLOT="2"
-KEYWORDS="amd64 arm -hppa ppc -riscv -sparc x86 ~amd64-linux ~x86-linux"
-IUSE="lua52compat static-libs"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-2-ldconfig.patch"
-   "${FILESDIR}/CVE-2020-15890.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-   if [[ -n ${HOTFIX} ]]; then
-   eapply "${DISTDIR}/${HOTFIX}"
-   fi
-   default
-}
-
-_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
-
-   pax-mark m "${ED}/usr/bin/luajit-${MY_PV}"
-
-   HTML_DOCS="doc/." einstalldocs
-}

diff --git a/dev-lang/luajit/luajit-2.1.0_beta3-r2.ebuild 
b/dev-lang/luajit/luajit-2.1.0_beta3-r2.ebuild
deleted file mode 100644
index 139c920dcc08..
--- a/dev-lang/luajit/luajit-2.1.0_beta3-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pax-utils toolchain-funcs
-
-MY_PV="$(ver_cut 1-5)"
-MY_PV="${MY_PV/_beta/-beta}"
-MY_P="LuaJIT-${MY_PV}"
-
-DESCRIPTION="Just-In-Time Compiler for the Lua programming language"
-HOMEPAGE="https://luajit.org/";
-SRC_URI="https://luajit.org/download/${MY_P}.tar.gz";
-
-LICENSE="MIT"
-# this should probably be pkgmoved to 2.0 for sake of consistency.
-SLOT="2"
-KEYWORDS="arm64 -hppa -riscv -sparc"
-IUSE="lua52compat static-libs"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-2-ldconfig.patch"
-   "${FILESDIR}/CVE-2020-15890.patch

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

2022-06-18 Thread Agostino Sarubbo

commit: 31bcb76297cacb1d5dd1073f42a5cb2f8a133e15
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Jun 18 16:55:00 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Jun 18 16:55:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31bcb762

dev-lang/luajit: arm64 stable wrt bug #851747

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="arm64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-lang/luajit/luajit-2.1.0_beta3_p20220127-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/luajit/luajit-2.1.0_beta3_p20220127-r1.ebuild 
b/dev-lang/luajit/luajit-2.1.0_beta3_p20220127-r1.ebuild
index f695aa721d2f..5c328a71e403 100644
--- a/dev-lang/luajit/luajit-2.1.0_beta3_p20220127-r1.ebuild
+++ b/dev-lang/luajit/luajit-2.1.0_beta3_p20220127-r1.ebuild
@@ -18,7 +18,7 @@ 
SRC_URI="https://github.com/LuaJIT/LuaJIT/archive/${GIT_COMMIT}.tar.gz -> ${P}.t
 LICENSE="MIT"
 # this should probably be pkgmoved to 2.0 for sake of consistency.
 SLOT="2"
-KEYWORDS="amd64 arm ~arm64 -hppa ppc -riscv -sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 -hppa ppc -riscv -sparc x86 ~amd64-linux ~x86-linux"
 IUSE="lua52compat static-libs"
 
 PATCHES=(

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

2022-06-17 Thread Agostino Sarubbo

commit: 4c524ee7fa984e839952f3f4d0c5abffabdbd115
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jun 17 11:37:46 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jun 17 11:37:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c524ee7

dev-lang/luajit: arm stable wrt bug #851747

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="arm"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-lang/luajit/luajit-2.1.0_beta3_p20220127-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/luajit/luajit-2.1.0_beta3_p20220127-r1.ebuild 
b/dev-lang/luajit/luajit-2.1.0_beta3_p20220127-r1.ebuild
index 5e96856bc0a6..f695aa721d2f 100644
--- a/dev-lang/luajit/luajit-2.1.0_beta3_p20220127-r1.ebuild
+++ b/dev-lang/luajit/luajit-2.1.0_beta3_p20220127-r1.ebuild
@@ -18,7 +18,7 @@ 
SRC_URI="https://github.com/LuaJIT/LuaJIT/archive/${GIT_COMMIT}.tar.gz -> ${P}.t
 LICENSE="MIT"
 # this should probably be pkgmoved to 2.0 for sake of consistency.
 SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 -hppa ppc -riscv -sparc x86 ~amd64-linux 
~x86-linux"
+KEYWORDS="amd64 arm ~arm64 -hppa ppc -riscv -sparc x86 ~amd64-linux ~x86-linux"
 IUSE="lua52compat static-libs"
 
 PATCHES=(

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

2022-06-17 Thread Jakov Smolić

commit: d9800d4176d2dda509ea01a36f114da254cd8d81
Author: Jakov Smolić  gentoo  org>
AuthorDate: Fri Jun 17 10:28:52 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Fri Jun 17 10:28:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9800d41

dev-lang/luajit: Stabilize 2.1.0_beta3_p20220127-r1 amd64, #851747

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-lang/luajit/luajit-2.1.0_beta3_p20220127-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/luajit/luajit-2.1.0_beta3_p20220127-r1.ebuild 
b/dev-lang/luajit/luajit-2.1.0_beta3_p20220127-r1.ebuild
index 69709f69771c..5e96856bc0a6 100644
--- a/dev-lang/luajit/luajit-2.1.0_beta3_p20220127-r1.ebuild
+++ b/dev-lang/luajit/luajit-2.1.0_beta3_p20220127-r1.ebuild
@@ -18,7 +18,7 @@ 
SRC_URI="https://github.com/LuaJIT/LuaJIT/archive/${GIT_COMMIT}.tar.gz -> ${P}.t
 LICENSE="MIT"
 # this should probably be pkgmoved to 2.0 for sake of consistency.
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 -hppa ppc -riscv -sparc x86 ~amd64-linux 
~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 -hppa ppc -riscv -sparc x86 ~amd64-linux 
~x86-linux"
 IUSE="lua52compat static-libs"
 
 PATCHES=(

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

2022-06-17 Thread Jakov Smolić

commit: 9fa7686636cebf8991c728d78eb277b54bbf3d35
Author: Jakov Smolić  gentoo  org>
AuthorDate: Fri Jun 17 10:28:31 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Fri Jun 17 10:28:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fa76866

dev-lang/luajit: Stabilize 2.1.0_beta3_p20220127-r1 x86, #851747

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-lang/luajit/luajit-2.1.0_beta3_p20220127-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/luajit/luajit-2.1.0_beta3_p20220127-r1.ebuild 
b/dev-lang/luajit/luajit-2.1.0_beta3_p20220127-r1.ebuild
index a072ad96eaa0..69709f69771c 100644
--- a/dev-lang/luajit/luajit-2.1.0_beta3_p20220127-r1.ebuild
+++ b/dev-lang/luajit/luajit-2.1.0_beta3_p20220127-r1.ebuild
@@ -18,7 +18,7 @@ 
SRC_URI="https://github.com/LuaJIT/LuaJIT/archive/${GIT_COMMIT}.tar.gz -> ${P}.t
 LICENSE="MIT"
 # this should probably be pkgmoved to 2.0 for sake of consistency.
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 -hppa ppc -riscv -sparc ~x86 ~amd64-linux 
~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 -hppa ppc -riscv -sparc x86 ~amd64-linux 
~x86-linux"
 IUSE="lua52compat static-libs"
 
 PATCHES=(

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

2022-06-16 Thread Agostino Sarubbo

commit: 3f865930774815c42d21d1d41637c78af2db1629
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jun 17 06:56:50 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jun 17 06:56:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f865930

dev-lang/luajit: ppc stable wrt bug #851747

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-lang/luajit/luajit-2.1.0_beta3_p20220127-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/luajit/luajit-2.1.0_beta3_p20220127-r1.ebuild 
b/dev-lang/luajit/luajit-2.1.0_beta3_p20220127-r1.ebuild
index 804ab4ffd9d0..a072ad96eaa0 100644
--- a/dev-lang/luajit/luajit-2.1.0_beta3_p20220127-r1.ebuild
+++ b/dev-lang/luajit/luajit-2.1.0_beta3_p20220127-r1.ebuild
@@ -18,7 +18,7 @@ 
SRC_URI="https://github.com/LuaJIT/LuaJIT/archive/${GIT_COMMIT}.tar.gz -> ${P}.t
 LICENSE="MIT"
 # this should probably be pkgmoved to 2.0 for sake of consistency.
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 -hppa ~ppc -riscv -sparc ~x86 ~amd64-linux 
~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 -hppa ppc -riscv -sparc ~x86 ~amd64-linux 
~x86-linux"
 IUSE="lua52compat static-libs"
 
 PATCHES=(

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

2022-04-19 Thread Sam James

commit: 85d5cfb862796dd6b4908e42a35d87331a0b77ee
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 19 23:32:58 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 19 23:58:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85d5cfb8

dev-lang/luajit: stabilize 2.1.0_beta3-r2 for arm64

Signed-off-by: Sam James  gentoo.org>

 dev-lang/luajit/luajit-2.1.0_beta3-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-lang/luajit/luajit-2.1.0_beta3-r2.ebuild 
b/dev-lang/luajit/luajit-2.1.0_beta3-r2.ebuild
index b3ec32e091bf..139c920dcc08 100644
--- a/dev-lang/luajit/luajit-2.1.0_beta3-r2.ebuild
+++ b/dev-lang/luajit/luajit-2.1.0_beta3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="https://luajit.org/download/${MY_P}.tar.gz";
 LICENSE="MIT"
 # this should probably be pkgmoved to 2.0 for sake of consistency.
 SLOT="2"
-KEYWORDS="~arm64 -hppa -riscv -sparc"
+KEYWORDS="arm64 -hppa -riscv -sparc"
 IUSE="lua52compat static-libs"
 
 PATCHES=(

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

2022-02-15 Thread William Hubbs

commit: df65f916e95c6dadb34b89714b1be24c90ac719e
Author: William Hubbs  gentoo  org>
AuthorDate: Tue Feb 15 23:29:01 2022 +
Commit: William Hubbs  gentoo  org>
CommitDate: Tue Feb 15 23:29:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df65f916

dev-lang/luajit: revbump to fix luajit symlink

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: William Hubbs  gentoo.org>

 0_beta3_p20220127.ebuild => luajit-2.1.0_beta3_p20220127-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/luajit/luajit-2.1.0_beta3_p20220127.ebuild 
b/dev-lang/luajit/luajit-2.1.0_beta3_p20220127-r1.ebuild
similarity index 97%
rename from dev-lang/luajit/luajit-2.1.0_beta3_p20220127.ebuild
rename to dev-lang/luajit/luajit-2.1.0_beta3_p20220127-r1.ebuild
index cc5578ed7afc..804ab4ffd9d0 100644
--- a/dev-lang/luajit/luajit-2.1.0_beta3_p20220127.ebuild
+++ b/dev-lang/luajit/luajit-2.1.0_beta3_p20220127-r1.ebuild
@@ -56,7 +56,7 @@ src_compile() {
 
 src_install() {
_emake install
-
+dosym luajit-2.1.0-beta3 /usr/bin/luajit
pax-mark m "${ED}/usr/bin/luajit-${MY_PV}"
 
HTML_DOCS="doc/." einstalldocs

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

2022-02-14 Thread William Hubbs

commit: cdd22ebf45bbfe48e59148a8d1d280f743a2dda6
Author: William Hubbs  gentoo  org>
AuthorDate: Tue Feb 15 04:15:49 2022 +
Commit: William Hubbs  gentoo  org>
CommitDate: Tue Feb 15 04:22:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdd22ebf

dev-lang/luajit: add a snapshot for 20220127

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: William Hubbs  gentoo.org>

 dev-lang/luajit/Manifest   |  1 +
 .../luajit/luajit-2.1.0_beta3_p20220127.ebuild | 63 ++
 2 files changed, 64 insertions(+)

diff --git a/dev-lang/luajit/Manifest b/dev-lang/luajit/Manifest
index 4941ba698e38..08aac0e839e5 100644
--- a/dev-lang/luajit/Manifest
+++ b/dev-lang/luajit/Manifest
@@ -1,2 +1,3 @@
 DIST LuaJIT-2.0.5.tar.gz 849845 BLAKE2B 
961c8622e19b0e66a76a875cb46ad149cb2559b5af41f360dc41dd0d6bb924583e6477dd1329f67c2ac6ea4b8dc42c5e2f4d63ea49400aba4d9e7c7e85e4b085
 SHA512 
2636675602b4a060b0571c05220db2061dd2f38568e35b2be346a0f5e3128d87057d11d3d0d7567d8cc4e0817b5e4cf2c52a17a48065520962b157816465a9fe
 DIST LuaJIT-2.1.0-beta3.tar.gz 1025180 BLAKE2B 
ac3d12e25bd9946ba41aed6672c66884e7256e6be99d7ee8d1260d697453c966b24d60387f278f47233bad44cda61085c9059e6f62c0bc7cfdaaefde282346c5
 SHA512 
c44e967a0f671ed32b55aee810bc8b3b63737a2d7363b8984ae1949b24f98dbb3f9be7c1e10239fdeb96a3e3c836f606342cbd61838cf9bcadb077443eb5bc12
+DIST luajit-2.1.0_beta3_p20220127.tar.gz 1072282 BLAKE2B 
e1d4834683b9ec16f0567f5de486262d84af145e3e27724d343c130288e90abff089fd5c7ff1275f9dde3cb5ae4f818f710020bd708c599972a14f1671381c2a
 SHA512 
4c6ae7173bb91dc2d4d425da4afdab2520078e15ae4471c0cb99a255dd7544d6900b333efbbfc8f26ffbc4fcd8f1d2daf65671c59b5cafd6b0d53cb07b49d4ff

diff --git a/dev-lang/luajit/luajit-2.1.0_beta3_p20220127.ebuild 
b/dev-lang/luajit/luajit-2.1.0_beta3_p20220127.ebuild
new file mode 100644
index ..cc5578ed7afc
--- /dev/null
+++ b/dev-lang/luajit/luajit-2.1.0_beta3_p20220127.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GIT_COMMIT=1d7b5029c5ba36870d25c67524034d452b761d27
+
+inherit pax-utils toolchain-funcs
+
+MY_PV="$(ver_cut 1-5)"
+MY_PV="${MY_PV/_beta/-beta}"
+MY_P="LuaJIT-${MY_PV}"
+
+DESCRIPTION="Just-In-Time Compiler for the Lua programming language"
+HOMEPAGE="https://luajit.org/";
+SRC_URI="https://luajit.org/download/${MY_P}.tar.gz";
+SRC_URI="https://github.com/LuaJIT/LuaJIT/archive/${GIT_COMMIT}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="MIT"
+# this should probably be pkgmoved to 2.0 for sake of consistency.
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 -hppa ~ppc -riscv -sparc ~x86 ~amd64-linux 
~x86-linux"
+IUSE="lua52compat static-libs"
+
+PATCHES=(
+)
+
+S="${WORKDIR}/LuaJIT-${GIT_COMMIT}"
+
+_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
+
+   pax-mark m "${ED}/usr/bin/luajit-${MY_PV}"
+
+   HTML_DOCS="doc/." einstalldocs
+}

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

2021-06-25 Thread Marek Szuba

commit: f5adc2fa78ac40fd4509a60f5ea2386c376ae1e0
Author: Marek Szuba  gentoo  org>
AuthorDate: Fri Jun 25 12:22:48 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Fri Jun 25 12:28:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5adc2fa

dev-lang/luajit: keyword -riscv

Unsupported architecture, not even in master.

Signed-off-by: Marek Szuba  gentoo.org>

 dev-lang/luajit/luajit-2.0.5-r3.ebuild   | 4 ++--
 dev-lang/luajit/luajit-2.1.0_beta3-r2.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-lang/luajit/luajit-2.0.5-r3.ebuild 
b/dev-lang/luajit/luajit-2.0.5-r3.ebuild
index 882045acb14..b7345d4525c 100644
--- a/dev-lang/luajit/luajit-2.0.5-r3.ebuild
+++ b/dev-lang/luajit/luajit-2.0.5-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,7 @@ SRC_URI="https://luajit.org/download/${MY_P}.tar.gz
 LICENSE="MIT"
 # this should probably be pkgmoved to 2.0 for sake of consistency.
 SLOT="2"
-KEYWORDS="amd64 arm -hppa ppc -sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm -hppa ppc -riscv -sparc x86 ~amd64-linux ~x86-linux"
 IUSE="lua52compat static-libs"
 
 PATCHES=(

diff --git a/dev-lang/luajit/luajit-2.1.0_beta3-r2.ebuild 
b/dev-lang/luajit/luajit-2.1.0_beta3-r2.ebuild
index ebbd6dc6813..b3ec32e091b 100644
--- a/dev-lang/luajit/luajit-2.1.0_beta3-r2.ebuild
+++ b/dev-lang/luajit/luajit-2.1.0_beta3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="https://luajit.org/download/${MY_P}.tar.gz";
 LICENSE="MIT"
 # this should probably be pkgmoved to 2.0 for sake of consistency.
 SLOT="2"
-KEYWORDS="~arm64 -hppa -sparc"
+KEYWORDS="~arm64 -hppa -riscv -sparc"
 IUSE="lua52compat static-libs"
 
 PATCHES=(

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

2021-03-07 Thread Sergei Trofimovich

commit: 75bc344f854bc724496294c3646195eabed2f705
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Sun Mar  7 18:43:31 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Mar  7 18:45:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75bc344f

dev-lang/luajit: mark current versions -hppa/-sparc

Compilation fails with:

#error "No support for this architecture (yet)"

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-lang/luajit/luajit-2.0.5-r3.ebuild   | 2 +-
 dev-lang/luajit/luajit-2.1.0_beta3-r2.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-lang/luajit/luajit-2.0.5-r3.ebuild 
b/dev-lang/luajit/luajit-2.0.5-r3.ebuild
index 5816d1feccf..882045acb14 100644
--- a/dev-lang/luajit/luajit-2.0.5-r3.ebuild
+++ b/dev-lang/luajit/luajit-2.0.5-r3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://luajit.org/download/${MY_P}.tar.gz
 LICENSE="MIT"
 # this should probably be pkgmoved to 2.0 for sake of consistency.
 SLOT="2"
-KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm -hppa ppc -sparc x86 ~amd64-linux ~x86-linux"
 IUSE="lua52compat static-libs"
 
 PATCHES=(

diff --git a/dev-lang/luajit/luajit-2.1.0_beta3-r2.ebuild 
b/dev-lang/luajit/luajit-2.1.0_beta3-r2.ebuild
index ebfafe94fab..ebbd6dc6813 100644
--- a/dev-lang/luajit/luajit-2.1.0_beta3-r2.ebuild
+++ b/dev-lang/luajit/luajit-2.1.0_beta3-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://luajit.org/download/${MY_P}.tar.gz";
 LICENSE="MIT"
 # this should probably be pkgmoved to 2.0 for sake of consistency.
 SLOT="2"
-KEYWORDS="~arm64"
+KEYWORDS="~arm64 -hppa -sparc"
 IUSE="lua52compat static-libs"
 
 PATCHES=(

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

2020-12-13 Thread William Hubbs

commit: fc852d7e741812a61691f5eba41e8a6f82648a6c
Author: William Hubbs  gentoo  org>
AuthorDate: Mon Dec 14 01:19:12 2020 +
Commit: William Hubbs  gentoo  org>
CommitDate: Mon Dec 14 01:20:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc852d7e

dev-lang/luajit: 2.1.0_beta3 Fix cross-compilation build

This is the same fix as 2.0.5.
Signed-off-by: William Hubbs  gentoo.org>

 dev-lang/luajit/luajit-2.1.0_beta3-r2.ebuild | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/dev-lang/luajit/luajit-2.1.0_beta3-r2.ebuild 
b/dev-lang/luajit/luajit-2.1.0_beta3-r2.ebuild
index cb942e454d0..ebfafe94fab 100644
--- a/dev-lang/luajit/luajit-2.1.0_beta3-r2.ebuild
+++ b/dev-lang/luajit/luajit-2.1.0_beta3-r2.ebuild
@@ -32,10 +32,16 @@ _emake() {
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" \
@@ -44,6 +50,7 @@ _emake() {
 }
 
 src_compile() {
+   tc-export_build_env
_emake XCFLAGS="$(usex lua52compat "-DLUAJIT_ENABLE_LUA52COMPAT" "")"
 }

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

2020-12-13 Thread William Hubbs

commit: 35539cb231ee30f419937e009b1f3d18ee1a9111
Author: Manoj Gupta  google  com>
AuthorDate: Mon Sep 24 23:16:03 2018 +
Commit: William Hubbs  gentoo  org>
CommitDate: Mon Dec 14 01:20:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35539cb2

dev-lang/luajit: Fix 2.0.5 cross-compilation build

luajit passes CFLAGS/LDFLAGS to both host and target builds.
This breaks when the host cpu does not support the target flags
e.g. using march=bdver4 in CFLAGS when cross-compiling for AMD
on an Intel host.

Instead, pass the flags in {HOST|TARGET}-{CFLAGS|LDFLAGS} which is
supported by luajit [1].

[1] https://github.com/LuaJIT/LuaJIT/blob/master/doc/install.html#L607

Closes: https://github.com/gentoo/gentoo/pull/9970
Signed-off-by: Manoj Gupta  google.com>
Signed-off-by: William Hubbs  gentoo.org>

 dev-lang/luajit/{luajit-2.0.5-r2.ebuild => luajit-2.0.5-r3.ebuild} | 7 +++
 .../{luajit-2.1.0_beta3-r1.ebuild => luajit-2.1.0_beta3-r2.ebuild} | 0
 2 files changed, 7 insertions(+)

diff --git a/dev-lang/luajit/luajit-2.0.5-r2.ebuild 
b/dev-lang/luajit/luajit-2.0.5-r3.ebuild
similarity index 87%
rename from dev-lang/luajit/luajit-2.0.5-r2.ebuild
rename to dev-lang/luajit/luajit-2.0.5-r3.ebuild
index 3dd7bad8037..5816d1feccf 100644
--- a/dev-lang/luajit/luajit-2.0.5-r2.ebuild
+++ b/dev-lang/luajit/luajit-2.0.5-r3.ebuild
@@ -43,10 +43,16 @@ _emake() {
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" \
@@ -55,6 +61,7 @@ _emake() {
 }
 
 src_compile() {
+   tc-export_build_env
_emake XCFLAGS="$(usex lua52compat "-DLUAJIT_ENABLE_LUA52COMPAT" "")"
 }
 

diff --git a/dev-lang/luajit/luajit-2.1.0_beta3-r1.ebuild 
b/dev-lang/luajit/luajit-2.1.0_beta3-r2.ebuild
similarity index 100%
rename from dev-lang/luajit/luajit-2.1.0_beta3-r1.ebuild
rename to dev-lang/luajit/luajit-2.1.0_beta3-r2.ebuild

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

2020-12-08 Thread Thomas Deutschmann

commit: 094ec113ec505cd508926738af395e9751fa0243
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Dec  8 12:41:28 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Dec  8 12:42:39 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=094ec113

dev-lang/luajit: fix Manifest

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann  gentoo.org>

 dev-lang/luajit/luajit-2.1.0_beta3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/luajit/luajit-2.1.0_beta3-r1.ebuild 
b/dev-lang/luajit/luajit-2.1.0_beta3-r1.ebuild
index 8bd5e9d64f3..cb942e454d0 100644
--- a/dev-lang/luajit/luajit-2.1.0_beta3-r1.ebuild
+++ b/dev-lang/luajit/luajit-2.1.0_beta3-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit pax-utils toolchain-funcs
 
-MY_PV="$(ver_cut 1-4)"
+MY_PV="$(ver_cut 1-5)"
 MY_PV="${MY_PV/_beta/-beta}"
 MY_P="LuaJIT-${MY_PV}"

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

2020-12-08 Thread Thomas Deutschmann

commit: e5ef3a31ca3c032eb00d779dce4ac3d0ceecd71e
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Dec  8 12:38:15 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Dec  8 12:42:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5ef3a31

dev-lang/luajit: fix slashes

Fixes: d565d3c8 ("dev-lang/luajit: move to EAPI 7")
Signed-off-by: Thomas Deutschmann  gentoo.org>

 dev-lang/luajit/luajit-2.0.5-r2.ebuild   | 4 ++--
 dev-lang/luajit/luajit-2.1.0_beta3-r1.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-lang/luajit/luajit-2.0.5-r2.ebuild 
b/dev-lang/luajit/luajit-2.0.5-r2.ebuild
index 74a6f65701d..558773b1efd 100644
--- a/dev-lang/luajit/luajit-2.0.5-r2.ebuild
+++ b/dev-lang/luajit/luajit-2.0.5-r2.ebuild
@@ -50,7 +50,7 @@ _emake() {
TARGET_AR="$(tc-getAR) rcus" \
BUILDMODE="$(usex static-libs mixed dynamic)" \
TARGET_STRIP="true" \
-   INSTALL_LIB="${ED%/}/usr/$(get_libdir)" \
+   INSTALL_LIB="${ED}/usr/$(get_libdir)" \
"$@"
 }
 
@@ -61,7 +61,7 @@ src_compile() {
 src_install() {
_emake install
 
-   pax-mark m "${ED}usr/bin/luajit-${MY_PV}"
+   pax-mark m "${ED}/usr/bin/luajit-${MY_PV}"
 
HTML_DOCS="doc/." einstalldocs
 }

diff --git a/dev-lang/luajit/luajit-2.1.0_beta3-r1.ebuild 
b/dev-lang/luajit/luajit-2.1.0_beta3-r1.ebuild
index ff9432e778c..732463df823 100644
--- a/dev-lang/luajit/luajit-2.1.0_beta3-r1.ebuild
+++ b/dev-lang/luajit/luajit-2.1.0_beta3-r1.ebuild
@@ -39,7 +39,7 @@ _emake() {
TARGET_AR="$(tc-getAR) rcus" \
BUILDMODE="$(usex static-libs mixed dynamic)" \
TARGET_STRIP="true" \
-   INSTALL_LIB="${ED%/}/usr/$(get_libdir)" \
+   INSTALL_LIB="${ED}/usr/$(get_libdir)" \
"$@"
 }
 
@@ -50,7 +50,7 @@ src_compile() {
 src_install() {
_emake install
 
-   pax-mark m "${ED}usr/bin/luajit-${MY_PV}"
+   pax-mark m "${ED}/usr/bin/luajit-${MY_PV}"
 
HTML_DOCS="doc/." einstalldocs
 }

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

2020-12-08 Thread Thomas Deutschmann

commit: f4bb8c4678afc65fce574932919b3035cfa95146
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Dec  8 12:39:04 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Dec  8 12:42:39 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4bb8c46

dev-lang/luajit: use HTTPS

Signed-off-by: Thomas Deutschmann  gentoo.org>

 dev-lang/luajit/luajit-2.0.5-r2.ebuild   | 6 +++---
 dev-lang/luajit/luajit-2.1.0_beta3-r1.ebuild | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev-lang/luajit/luajit-2.0.5-r2.ebuild 
b/dev-lang/luajit/luajit-2.0.5-r2.ebuild
index 558773b1efd..3dd7bad8037 100644
--- a/dev-lang/luajit/luajit-2.0.5-r2.ebuild
+++ b/dev-lang/luajit/luajit-2.0.5-r2.ebuild
@@ -13,9 +13,9 @@ if [[ -n $(ver_cut 4) ]]; then
 fi
 
 DESCRIPTION="Just-In-Time Compiler for the Lua programming language"
-HOMEPAGE="http://luajit.org/";
-SRC_URI="http://luajit.org/download/${MY_P}.tar.gz
-   ${HOTFIX:+http://luajit.org/download/${HOTFIX}}";
+HOMEPAGE="https://luajit.org/";
+SRC_URI="https://luajit.org/download/${MY_P}.tar.gz
+   ${HOTFIX:+https://luajit.org/download/${HOTFIX}}";
 
 LICENSE="MIT"
 # this should probably be pkgmoved to 2.0 for sake of consistency.

diff --git a/dev-lang/luajit/luajit-2.1.0_beta3-r1.ebuild 
b/dev-lang/luajit/luajit-2.1.0_beta3-r1.ebuild
index 732463df823..8bd5e9d64f3 100644
--- a/dev-lang/luajit/luajit-2.1.0_beta3-r1.ebuild
+++ b/dev-lang/luajit/luajit-2.1.0_beta3-r1.ebuild
@@ -10,8 +10,8 @@ MY_PV="${MY_PV/_beta/-beta}"
 MY_P="LuaJIT-${MY_PV}"
 
 DESCRIPTION="Just-In-Time Compiler for the Lua programming language"
-HOMEPAGE="http://luajit.org/";
-SRC_URI="http://luajit.org/download/${MY_P}.tar.gz";
+HOMEPAGE="https://luajit.org/";
+SRC_URI="https://luajit.org/download/${MY_P}.tar.gz";
 
 LICENSE="MIT"
 # this should probably be pkgmoved to 2.0 for sake of consistency.

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

2020-12-07 Thread William Hubbs

commit: 7f2abc1e8ff09d5768f155062b6bae9722636c8d
Author: William Hubbs  gentoo  org>
AuthorDate: Mon Dec  7 18:46:00 2020 +
Commit: William Hubbs  gentoo  org>
CommitDate: Mon Dec  7 18:46:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f2abc1e

dev-lang/luajit: remove rafaelmartins from maintainers due to retirement

Signed-off-by: William Hubbs  gentoo.org>

 dev-lang/luajit/metadata.xml | 4 
 1 file changed, 4 deletions(-)

diff --git a/dev-lang/luajit/metadata.xml b/dev-lang/luajit/metadata.xml
index a6b1cb1baed..ef8e19ce590 100644
--- a/dev-lang/luajit/metadata.xml
+++ b/dev-lang/luajit/metadata.xml
@@ -1,10 +1,6 @@
 
 http://www.gentoo.org/dtd/metadata.dtd";>
 
-  
-rafaelmart...@gentoo.org
-Rafael G. Martins
-  
   
 willi...@gentoo.org
 William Hubbs

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

2020-12-07 Thread William Hubbs

commit: 97f8da8fb260ae2638ff64a5296765c60b6bca0f
Author: William Hubbs  gentoo  org>
AuthorDate: Mon Dec  7 18:44:22 2020 +
Commit: William Hubbs  gentoo  org>
CommitDate: Mon Dec  7 18:46:12 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97f8da8f

dev-lang/lua: add myself to maintainers

Signed-off-by: William Hubbs  gentoo.org>

 dev-lang/luajit/metadata.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/dev-lang/luajit/metadata.xml b/dev-lang/luajit/metadata.xml
index 29897b94252..a6b1cb1baed 100644
--- a/dev-lang/luajit/metadata.xml
+++ b/dev-lang/luajit/metadata.xml
@@ -5,6 +5,10 @@
 rafaelmart...@gentoo.org
 Rafael G. Martins
   
+  
+willi...@gentoo.org
+William Hubbs
+  
   
 
   Enable some upwards-compatible features

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

2020-12-07 Thread William Hubbs

commit: d565d3c807ea093cc4faacd6877f4705f5df5fe9
Author: William Hubbs  gentoo  org>
AuthorDate: Mon Dec  7 18:26:09 2020 +
Commit: William Hubbs  gentoo  org>
CommitDate: Mon Dec  7 18:28:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d565d3c8

dev-lang/luajit: move to EAPI 7

Closes: https://bugs.gentoo.org/758854
Signed-off-by: William Hubbs  gentoo.org>

 dev-lang/luajit/luajit-2.0.5-r2.ebuild   | 8 
 dev-lang/luajit/luajit-2.1.0_beta3-r1.ebuild | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dev-lang/luajit/luajit-2.0.5-r2.ebuild 
b/dev-lang/luajit/luajit-2.0.5-r2.ebuild
index d9fa1d7fbc3..74a6f65701d 100644
--- a/dev-lang/luajit/luajit-2.0.5-r2.ebuild
+++ b/dev-lang/luajit/luajit-2.0.5-r2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit pax-utils toolchain-funcs versionator
+inherit pax-utils toolchain-funcs
 
-MY_PV="$(get_version_component_range 1-3)"
+MY_PV="$(ver_cut 1-3)"
 MY_P="LuaJIT-${MY_PV}"
-if [[ -n $(get_version_component_range 4) ]]; then
+if [[ -n $(ver_cut 4) ]]; then
HOTFIX="v${PV}"
HOTFIX="${HOTFIX/_p/_hotfix}.patch"
 fi

diff --git a/dev-lang/luajit/luajit-2.1.0_beta3-r1.ebuild 
b/dev-lang/luajit/luajit-2.1.0_beta3-r1.ebuild
index 104a81af7aa..ff9432e778c 100644
--- a/dev-lang/luajit/luajit-2.1.0_beta3-r1.ebuild
+++ b/dev-lang/luajit/luajit-2.1.0_beta3-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit pax-utils toolchain-funcs versionator
+inherit pax-utils toolchain-funcs
 
-MY_PV="$(get_version_component_range 1-4)"
+MY_PV="$(ver_cut 1-4)"
 MY_PV="${MY_PV/_beta/-beta}"
 MY_P="LuaJIT-${MY_PV}"

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

2020-10-24 Thread Rafael Martins

commit: acab4934262b53a964307071942098b7caab8528
Author: Rafael Martins  gentoo  org>
AuthorDate: Sat Oct 24 11:48:07 2020 +
Commit: Rafael Martins  gentoo  org>
CommitDate: Sat Oct 24 11:48:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acab4934

dev-lang/luajit: add ~arm64 keyword

2.1.0_beta3 is the first version including arm64 support.

Bug: https://bugs.gentoo.org/747904
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Rafael Martins  gentoo.org>

 dev-lang/luajit/luajit-2.1.0_beta3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/luajit/luajit-2.1.0_beta3-r1.ebuild 
b/dev-lang/luajit/luajit-2.1.0_beta3-r1.ebuild
index a959393a5d7..104a81af7aa 100644
--- a/dev-lang/luajit/luajit-2.1.0_beta3-r1.ebuild
+++ b/dev-lang/luajit/luajit-2.1.0_beta3-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://luajit.org/download/${MY_P}.tar.gz";
 LICENSE="MIT"
 # this should probably be pkgmoved to 2.0 for sake of consistency.
 SLOT="2"
-KEYWORDS=""
+KEYWORDS="~arm64"
 IUSE="lua52compat static-libs"
 
 PATCHES=(

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

2020-07-25 Thread Rafael Martins

commit: a1d37420e54b9cbe771e1ad21a11ea1dd06a6be3
Author: Rafael Martins  gentoo  org>
AuthorDate: Sat Jul 25 15:14:30 2020 +
Commit: Rafael Martins  gentoo  org>
CommitDate: Sat Jul 25 15:14:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1d37420

dev-lang/luajit: remove vulnerable ebuilds

Bug: https://bugs.gentoo.org/733466
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Rafael Martins  gentoo.org>

 dev-lang/luajit/luajit-2.0.5-r1.ebuild| 64 ---
 dev-lang/luajit/luajit-2.1.0_beta3.ebuild | 53 -
 2 files changed, 117 deletions(-)

diff --git a/dev-lang/luajit/luajit-2.0.5-r1.ebuild 
b/dev-lang/luajit/luajit-2.0.5-r1.ebuild
deleted file mode 100644
index 0e4dc83ff92..000
--- a/dev-lang/luajit/luajit-2.0.5-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit pax-utils toolchain-funcs versionator
-
-MY_PV="$(get_version_component_range 1-3)"
-MY_P="LuaJIT-${MY_PV}"
-if [[ -n $(get_version_component_range 4) ]]; then
-   HOTFIX="v${PV}"
-   HOTFIX="${HOTFIX/_p/_hotfix}.patch"
-fi
-
-DESCRIPTION="Just-In-Time Compiler for the Lua programming language"
-HOMEPAGE="http://luajit.org/";
-SRC_URI="http://luajit.org/download/${MY_P}.tar.gz
-   ${HOTFIX:+http://luajit.org/download/${HOTFIX}}";
-
-LICENSE="MIT"
-# this should probably be pkgmoved to 2.0 for sake of consistency.
-SLOT="2"
-KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux"
-IUSE="lua52compat static-libs"
-
-PATCHES=( "${FILESDIR}/${PN}-2-ldconfig.patch" )
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-   if [[ -n ${HOTFIX} ]]; then
-   eapply "${DISTDIR}/${HOTFIX}"
-   fi
-   default
-}
-
-_emake() {
-   emake \
-   Q= \
-   PREFIX="${EPREFIX}/usr" \
-   MULTILIB="$(get_libdir)" \
-   DESTDIR="${D}" \
-   HOST_CC="$(tc-getBUILD_CC)" \
-   STATIC_CC="$(tc-getCC)" \
-   DYNAMIC_CC="$(tc-getCC) -fPIC" \
-   TARGET_LD="$(tc-getCC)" \
-   TARGET_AR="$(tc-getAR) rcus" \
-   BUILDMODE="$(usex static-libs mixed dynamic)" \
-   TARGET_STRIP="true" \
-   INSTALL_LIB="${ED%/}/usr/$(get_libdir)" \
-   "$@"
-}
-
-src_compile() {
-   _emake XCFLAGS="$(usex lua52compat "-DLUAJIT_ENABLE_LUA52COMPAT" "")"
-}
-
-src_install() {
-   _emake install
-
-   pax-mark m "${ED}usr/bin/luajit-${MY_PV}"
-
-   HTML_DOCS="doc/." einstalldocs
-}

diff --git a/dev-lang/luajit/luajit-2.1.0_beta3.ebuild 
b/dev-lang/luajit/luajit-2.1.0_beta3.ebuild
deleted file mode 100644
index b38bb2b260d..000
--- a/dev-lang/luajit/luajit-2.1.0_beta3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit pax-utils toolchain-funcs versionator
-
-MY_PV="$(get_version_component_range 1-4)"
-MY_PV="${MY_PV/_beta/-beta}"
-MY_P="LuaJIT-${MY_PV}"
-
-DESCRIPTION="Just-In-Time Compiler for the Lua programming language"
-HOMEPAGE="http://luajit.org/";
-SRC_URI="http://luajit.org/download/${MY_P}.tar.gz";
-
-LICENSE="MIT"
-# this should probably be pkgmoved to 2.0 for sake of consistency.
-SLOT="2"
-KEYWORDS=""
-IUSE="lua52compat static-libs"
-
-PATCHES=( "${FILESDIR}/${PN}-2-ldconfig.patch" )
-
-S="${WORKDIR}/${MY_P}"
-
-_emake() {
-   emake \
-   Q= \
-   PREFIX="${EPREFIX}/usr" \
-   MULTILIB="$(get_libdir)" \
-   DESTDIR="${D}" \
-   HOST_CC="$(tc-getBUILD_CC)" \
-   STATIC_CC="$(tc-getCC)" \
-   DYNAMIC_CC="$(tc-getCC) -fPIC" \
-   TARGET_LD="$(tc-getCC)" \
-   TARGET_AR="$(tc-getAR) rcus" \
-   BUILDMODE="$(usex static-libs mixed dynamic)" \
-   TARGET_STRIP="true" \
-   INSTALL_LIB="${ED%/}/usr/$(get_libdir)" \
-   "$@"
-}
-
-src_compile() {
-   _emake XCFLAGS="$(usex lua52compat "-DLUAJIT_ENABLE_LUA52COMPAT" "")"
-}
-
-src_install() {
-   _emake install
-
-   pax-mark m "${ED}usr/bin/luajit-${MY_PV}"
-
-   HTML_DOCS="doc/." einstalldocs
-}

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

2020-07-25 Thread Sam James

commit: 408d42b260ec451595bde16369d391a73dba67ee
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul 25 10:43:16 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul 25 11:16:39 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=408d42b2

dev-lang/luajit: arm stable (bug #733466)

Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Sam James  gentoo.org>

 dev-lang/luajit/luajit-2.0.5-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/luajit/luajit-2.0.5-r2.ebuild 
b/dev-lang/luajit/luajit-2.0.5-r2.ebuild
index 3d996e466ea..d9fa1d7fbc3 100644
--- a/dev-lang/luajit/luajit-2.0.5-r2.ebuild
+++ b/dev-lang/luajit/luajit-2.0.5-r2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="http://luajit.org/download/${MY_P}.tar.gz
 LICENSE="MIT"
 # this should probably be pkgmoved to 2.0 for sake of consistency.
 SLOT="2"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux"
 IUSE="lua52compat static-libs"
 
 PATCHES=(

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

2020-07-23 Thread Sam James

commit: e3bb98408d647ecc0df6d9c47408871ea842ec52
Author: Sam James  gentoo  org>
AuthorDate: Thu Jul 23 23:45:03 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jul 23 23:45:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3bb9840

dev-lang/luajit: ppc stable (bug #733466)

Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Sam James  gentoo.org>

 dev-lang/luajit/luajit-2.0.5-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/luajit/luajit-2.0.5-r2.ebuild 
b/dev-lang/luajit/luajit-2.0.5-r2.ebuild
index 39e40f8ff48..3d996e466ea 100644
--- a/dev-lang/luajit/luajit-2.0.5-r2.ebuild
+++ b/dev-lang/luajit/luajit-2.0.5-r2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="http://luajit.org/download/${MY_P}.tar.gz
 LICENSE="MIT"
 # this should probably be pkgmoved to 2.0 for sake of consistency.
 SLOT="2"
-KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux"
 IUSE="lua52compat static-libs"
 
 PATCHES=(

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

2020-07-23 Thread Sam James

commit: bd83f6a06ef0ebb7ab11efc5c10f7d71aa95064b
Author: Sam James  gentoo  org>
AuthorDate: Thu Jul 23 21:51:05 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jul 23 21:52:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd83f6a0

dev-lang/luajit: x86 stable (bug #733466)

Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Sam James  gentoo.org>

 dev-lang/luajit/luajit-2.0.5-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/luajit/luajit-2.0.5-r2.ebuild 
b/dev-lang/luajit/luajit-2.0.5-r2.ebuild
index 03f8c86b817..39e40f8ff48 100644
--- a/dev-lang/luajit/luajit-2.0.5-r2.ebuild
+++ b/dev-lang/luajit/luajit-2.0.5-r2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="http://luajit.org/download/${MY_P}.tar.gz
 LICENSE="MIT"
 # this should probably be pkgmoved to 2.0 for sake of consistency.
 SLOT="2"
-KEYWORDS="amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="lua52compat static-libs"
 
 PATCHES=(

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

2020-07-23 Thread Sam James

commit: b7224251664957ad36f631e6fba42f702d3c098a
Author: Sam James  gentoo  org>
AuthorDate: Thu Jul 23 20:36:08 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jul 23 20:36:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7224251

dev-lang/luajit: amd64 stable (bug #733466)

Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Sam James  gentoo.org>

 dev-lang/luajit/luajit-2.0.5-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/luajit/luajit-2.0.5-r2.ebuild 
b/dev-lang/luajit/luajit-2.0.5-r2.ebuild
index b36b964f23c..03f8c86b817 100644
--- a/dev-lang/luajit/luajit-2.0.5-r2.ebuild
+++ b/dev-lang/luajit/luajit-2.0.5-r2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="http://luajit.org/download/${MY_P}.tar.gz
 LICENSE="MIT"
 # this should probably be pkgmoved to 2.0 for sake of consistency.
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="lua52compat static-libs"
 
 PATCHES=(

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

2020-07-22 Thread Rafael Martins

commit: a2a054ce465da2fd25ff354c875024011b9fd2c9
Author: Rafael Martins  gentoo  org>
AuthorDate: Wed Jul 22 19:38:50 2020 +
Commit: Rafael Martins  gentoo  org>
CommitDate: Wed Jul 22 19:40:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2a054ce

dev-lang/luajit: apply fix for CVE-2020-15890

Bug: https://bugs.gentoo.org/733466
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Rafael Martins  gentoo.org>

 dev-lang/luajit/files/CVE-2020-15890.patch   | 22 +
 dev-lang/luajit/luajit-2.0.5-r2.ebuild   | 67 
 dev-lang/luajit/luajit-2.1.0_beta3-r1.ebuild | 56 +++
 3 files changed, 145 insertions(+)

diff --git a/dev-lang/luajit/files/CVE-2020-15890.patch 
b/dev-lang/luajit/files/CVE-2020-15890.patch
new file mode 100644
index 000..751726571a0
--- /dev/null
+++ b/dev-lang/luajit/files/CVE-2020-15890.patch
@@ -0,0 +1,22 @@
+From 53f82e6e2e858a0a62fd1a2ff47e9866693382e6 Mon Sep 17 00:00:00 2001
+From: Mike Pall 
+Date: Sun, 12 Jul 2020 14:30:34 +0200
+Subject: [PATCH] Fix frame traversal for __gc handler frames.
+
+Reported by Changochen.
+---
+ src/lj_err.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/lj_err.c b/src/lj_err.c
+index caa7487f2..e3e0c2eb7 100644
+--- a/src/lj_err.c
 b/src/lj_err.c
+@@ -529,6 +529,7 @@ static ptrdiff_t finderrfunc(lua_State *L)
+   if (cframe_canyield(cf)) return 0;
+   if (cframe_errfunc(cf) >= 0)
+   return cframe_errfunc(cf);
++  cf = cframe_prev(cf);
+   frame = frame_prevd(frame);
+   break;
+ case FRAME_PCALL:

diff --git a/dev-lang/luajit/luajit-2.0.5-r2.ebuild 
b/dev-lang/luajit/luajit-2.0.5-r2.ebuild
new file mode 100644
index 000..b36b964f23c
--- /dev/null
+++ b/dev-lang/luajit/luajit-2.0.5-r2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit pax-utils toolchain-funcs versionator
+
+MY_PV="$(get_version_component_range 1-3)"
+MY_P="LuaJIT-${MY_PV}"
+if [[ -n $(get_version_component_range 4) ]]; then
+   HOTFIX="v${PV}"
+   HOTFIX="${HOTFIX/_p/_hotfix}.patch"
+fi
+
+DESCRIPTION="Just-In-Time Compiler for the Lua programming language"
+HOMEPAGE="http://luajit.org/";
+SRC_URI="http://luajit.org/download/${MY_P}.tar.gz
+   ${HOTFIX:+http://luajit.org/download/${HOTFIX}}";
+
+LICENSE="MIT"
+# this should probably be pkgmoved to 2.0 for sake of consistency.
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="lua52compat static-libs"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-2-ldconfig.patch"
+   "${FILESDIR}/CVE-2020-15890.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+   if [[ -n ${HOTFIX} ]]; then
+   eapply "${DISTDIR}/${HOTFIX}"
+   fi
+   default
+}
+
+_emake() {
+   emake \
+   Q= \
+   PREFIX="${EPREFIX}/usr" \
+   MULTILIB="$(get_libdir)" \
+   DESTDIR="${D}" \
+   HOST_CC="$(tc-getBUILD_CC)" \
+   STATIC_CC="$(tc-getCC)" \
+   DYNAMIC_CC="$(tc-getCC) -fPIC" \
+   TARGET_LD="$(tc-getCC)" \
+   TARGET_AR="$(tc-getAR) rcus" \
+   BUILDMODE="$(usex static-libs mixed dynamic)" \
+   TARGET_STRIP="true" \
+   INSTALL_LIB="${ED%/}/usr/$(get_libdir)" \
+   "$@"
+}
+
+src_compile() {
+   _emake XCFLAGS="$(usex lua52compat "-DLUAJIT_ENABLE_LUA52COMPAT" "")"
+}
+
+src_install() {
+   _emake install
+
+   pax-mark m "${ED}usr/bin/luajit-${MY_PV}"
+
+   HTML_DOCS="doc/." einstalldocs
+}

diff --git a/dev-lang/luajit/luajit-2.1.0_beta3-r1.ebuild 
b/dev-lang/luajit/luajit-2.1.0_beta3-r1.ebuild
new file mode 100644
index 000..a959393a5d7
--- /dev/null
+++ b/dev-lang/luajit/luajit-2.1.0_beta3-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit pax-utils toolchain-funcs versionator
+
+MY_PV="$(get_version_component_range 1-4)"
+MY_PV="${MY_PV/_beta/-beta}"
+MY_P="LuaJIT-${MY_PV}"
+
+DESCRIPTION="Just-In-Time Compiler for the Lua programming language"
+HOMEPAGE="http://luajit.org/";
+SRC_URI="http://luajit.org/download/${MY_P}.tar.gz";
+
+LICENSE="MIT"
+# this should probably be pkgmoved to 2.0 for sake of consistency.
+SLOT="2"
+KEYWORDS=""
+IUSE="lua52compat static-libs"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-2-ldconfig.patch"
+   "${FILESDIR}/CVE-2020-15890.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+_emake() {
+   emake \
+   Q= \
+   PREFIX="${EPREFIX}/usr" \
+   MULTILIB="$(get_libdir)" \
+   DESTDIR="${D}" \
+   HOST_CC="$(tc-getBUILD_CC)" \
+   STATIC_CC="$(tc-getCC)" \
+   DYNAMIC_CC="$(tc-getCC) -fPIC" \
+   TARGET_LD="$(tc-getCC)" \
+   TAR

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

2020-02-01 Thread Rafael Martins

commit: 5f5a0bb3c9c316e21701d998d39eeec2fe3ac683
Author: Rafael Martins  gentoo  org>
AuthorDate: Sat Feb  1 21:52:07 2020 +
Commit: Rafael Martins  gentoo  org>
CommitDate: Sat Feb  1 21:55:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f5a0bb3

dev-lang/luajit: fix build for musl systems. bug #707588

Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Rafael Martins  gentoo.org>

 dev-lang/luajit/files/luajit-2-ldconfig.patch | 31 +++
 dev-lang/luajit/luajit-2.0.5-r1.ebuild|  4 +++-
 dev-lang/luajit/luajit-2.1.0_beta3.ebuild |  4 +++-
 3 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/dev-lang/luajit/files/luajit-2-ldconfig.patch 
b/dev-lang/luajit/files/luajit-2-ldconfig.patch
new file mode 100644
index 000..add449a6038
--- /dev/null
+++ b/dev-lang/luajit/files/luajit-2-ldconfig.patch
@@ -0,0 +1,31 @@
+From 18c9cf7d3788a8f7408df45df92fc4ae3bcc0d80 Mon Sep 17 00:00:00 2001
+From: Mike Pall 
+Date: Sat, 25 Jan 2020 17:37:12 +0100
+Subject: [PATCH] Fix POSIX install with missing or incompatible ldconfig.
+
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 07bc70faf..bff53f286 100644
+--- a/Makefile
 b/Makefile
+@@ -74,7 +74,7 @@ SYMLINK= ln -sf
+ INSTALL_X= install -m 0755
+ INSTALL_F= install -m 0644
+ UNINSTALL= $(RM)
+-LDCONFIG= ldconfig -n
++LDCONFIG= ldconfig -n 2>/dev/null
+ SED_PC= sed -e "s|^prefix=.*|prefix=$(PREFIX)|" \
+ -e "s|^multilib=.*|multilib=$(MULTILIB)|"
+ 
+@@ -118,7 +118,7 @@ install: $(INSTALL_DEP)
+   $(RM) $(INSTALL_TSYM) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2)
+   cd src && test -f $(FILE_SO) && \
+ $(INSTALL_X) $(FILE_SO) $(INSTALL_DYN) && \
+-$(LDCONFIG) $(INSTALL_LIB) && \
++( $(LDCONFIG) $(INSTALL_LIB) || : ) && \
+ $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT1) && \
+ $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT2) || :
+   cd etc && $(INSTALL_F) $(FILE_MAN) $(INSTALL_MAN)

diff --git a/dev-lang/luajit/luajit-2.0.5-r1.ebuild 
b/dev-lang/luajit/luajit-2.0.5-r1.ebuild
index a90f9c43d19..6b07deee37a 100644
--- a/dev-lang/luajit/luajit-2.0.5-r1.ebuild
+++ b/dev-lang/luajit/luajit-2.0.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,6 +23,8 @@ SLOT="2"
 KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux"
 IUSE="lua52compat static-libs"
 
+PATCHES=( "${FILESDIR}/${PN}-2-ldconfig.patch" )
+
 S="${WORKDIR}/${MY_P}"
 
 src_prepare(){

diff --git a/dev-lang/luajit/luajit-2.1.0_beta3.ebuild 
b/dev-lang/luajit/luajit-2.1.0_beta3.ebuild
index 6497ae142c3..9406beb98c8 100644
--- a/dev-lang/luajit/luajit-2.1.0_beta3.ebuild
+++ b/dev-lang/luajit/luajit-2.1.0_beta3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,6 +19,8 @@ SLOT="2"
 KEYWORDS=""
 IUSE="lua52compat static-libs"
 
+PATCHES=( "${FILESDIR}/${PN}-2-ldconfig.patch" )
+
 S="${WORKDIR}/${MY_P}"
 
 _emake() {

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

2020-02-01 Thread Rafael Martins

commit: 8acf06d12419528eef541ff388eb501d998d0493
Author: Rafael Martins  gentoo  org>
AuthorDate: Sat Feb  1 21:45:23 2020 +
Commit: Rafael Martins  gentoo  org>
CommitDate: Sat Feb  1 21:46:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8acf06d1

dev-lang/luajit: drop old

Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Rafael Martins  gentoo.org>

 dev-lang/luajit/Manifest   |  3 --
 dev-lang/luajit/luajit-2.0.2.ebuild| 66 --
 dev-lang/luajit/luajit-2.0.3-r1.ebuild | 61 ---
 dev-lang/luajit/luajit-2.0.3.ebuild| 66 --
 dev-lang/luajit/luajit-2.0.4.ebuild| 61 ---
 dev-lang/luajit/luajit-2.0.5.ebuild| 61 ---
 6 files changed, 318 deletions(-)

diff --git a/dev-lang/luajit/Manifest b/dev-lang/luajit/Manifest
index 064a580503e..4941ba698e3 100644
--- a/dev-lang/luajit/Manifest
+++ b/dev-lang/luajit/Manifest
@@ -1,5 +1,2 @@
-DIST LuaJIT-2.0.2.tar.gz 843031 BLAKE2B 
7dbf36c1d41106bb55b4588920a79b4c68139e009cb157d0f4ca8f0c72d8f7def1edd4517237234c5833acdbda0ec3dc25edb18bc55298b139463dbb6e58476a
 SHA512 
c1afea13ec61a59f37d1f61fc50bcac47208d9d4f0a80689b74e901ad2b34294b6c89a0b4eef54b43f3d2db411660da61b191b0bbfba4ba2f97743a9ee4484e3
-DIST LuaJIT-2.0.3.tar.gz 844927 BLAKE2B 
a6ed54ef562b7af594367cbc0ed6e20295bb64781ceb6b46df81d10d7abd9fdaf902344ab7a6dfdffa6fc38b05e70648ae53c9cffdfb2a866989eba4b02fe9df
 SHA512 
7b3e3de22ac3602299b5918b60801e45a3278e547a15c16fdae7359538d4ada27ba664935d5f97c7409f330c2f8efeaae9ea03415f5e9d5a9d81e022cd5d36e0
-DIST LuaJIT-2.0.4.tar.gz 847615 BLAKE2B 
b410d06734056283655e70a53b4f1160553cc74a9d6a80d4a919f7f38589888fff339eda661ec623258a5f186f4eb2d2c9b5809b6f7e55f9e058058426e2fe74
 SHA512 
a72957bd85d8f457269e78bf08c19b28c5707df5d19920d61918f8a6913f55913ce13037fb9a6463c04cefde0c6644739f390e09d656e4bbc2c236927aa3f8f9
 DIST LuaJIT-2.0.5.tar.gz 849845 BLAKE2B 
961c8622e19b0e66a76a875cb46ad149cb2559b5af41f360dc41dd0d6bb924583e6477dd1329f67c2ac6ea4b8dc42c5e2f4d63ea49400aba4d9e7c7e85e4b085
 SHA512 
2636675602b4a060b0571c05220db2061dd2f38568e35b2be346a0f5e3128d87057d11d3d0d7567d8cc4e0817b5e4cf2c52a17a48065520962b157816465a9fe
 DIST LuaJIT-2.1.0-beta3.tar.gz 1025180 BLAKE2B 
ac3d12e25bd9946ba41aed6672c66884e7256e6be99d7ee8d1260d697453c966b24d60387f278f47233bad44cda61085c9059e6f62c0bc7cfdaaefde282346c5
 SHA512 
c44e967a0f671ed32b55aee810bc8b3b63737a2d7363b8984ae1949b24f98dbb3f9be7c1e10239fdeb96a3e3c836f606342cbd61838cf9bcadb077443eb5bc12

diff --git a/dev-lang/luajit/luajit-2.0.2.ebuild 
b/dev-lang/luajit/luajit-2.0.2.ebuild
deleted file mode 100644
index 1fbe283b77f..000
--- a/dev-lang/luajit/luajit-2.0.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib pax-utils versionator toolchain-funcs
-
-MY_PV="$(get_version_component_range 1-3)"
-MY_P="LuaJIT-${MY_PV}"
-if [[ $(get_version_component_range 4) != "" ]]; then
-   HOTFIX="v${PV}"
-   HOTFIX="${HOTFIX/_p/_hotfix}.patch"
-fi
-
-DESCRIPTION="Just-In-Time Compiler for the Lua programming language"
-HOMEPAGE="http://luajit.org/";
-SRC_URI="http://luajit.org/download/${MY_P}.tar.gz
-   ${HOTFIX:+http://luajit.org/download/${HOTFIX}}";
-
-LICENSE="MIT"
-# this should probably be pkgmoved to 2.0 for sake of consistency.
-SLOT="2"
-KEYWORDS="amd64 arm ~ppc x86 ~amd64-linux ~x86-linux"
-IUSE="lua52compat"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare(){
-   if [[ -n ${HOTFIX} ]]; then
-   epatch "${DISTDIR}/${HOTFIX}"
-   fi
-   sed -i "s,PREFIX= /usr/local,PREFIX= ${EPREFIX}/usr," Makefile || die 
'sed failed.'
-   sed -i "s,/lib,/$(get_libdir)," etc/${PN}.pc || die 'sed2 failed.'
-}
-
-src_compile() {
-   emake \
-   Q= \
-   PREFIX="${EPREFIX}/usr" \
-   DESTDIR="${D}" \
-   HOST_CC="$(tc-getBUILD_CC)" \
-   STATIC_CC="$(tc-getCC)" \
-   DYNAMIC_CC="$(tc-getCC) -fPIC" \
-   TARGET_LD="$(tc-getCC)" \
-   TARGET_AR="$(tc-getAR) rcus" \
-   TARGET_STRIP="true" \
-   INSTALL_LIB="${ED%/}/usr/$(get_libdir)" \
-   XCFLAGS="$(usex lua52compat "-DLUAJIT_ENABLE_LUA52COMPAT" "")"
-}
-
-src_install(){
-   emake install \
-   DESTDIR="${D}" \
-   HOST_CC="$(tc-getBUILD_CC)" \
-   STATIC_CC="$(tc-getCC)" \
-   DYNAMIC_CC="$(tc-getCC) -fPIC" \
-   TARGET_LD="$(tc-getCC)" \
-   TARGET_AR="$(tc-getAR) rcus" \
-   TARGET_STRIP="true" \
-   INSTALL_LIB="${ED%/}/usr/$(get_libdir)"
-
-   pax-mark m "${ED}usr/bin/luajit-${MY_PV}"
-
-   cd "${S}"/doc
-   dohtml -r *
-}

diff --git a/dev-lang/luajit/luajit-2.0.3-r1.ebuild 
b/

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

2019-03-22 Thread Rafael Martins

commit: 1c878da150ecb5a67aafa7ecda9bd69db2079939
Author: Rafael Martins  gentoo  org>
AuthorDate: Fri Mar 22 19:42:02 2019 +
Commit: Rafael Martins  gentoo  org>
CommitDate: Fri Mar 22 19:42:40 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c878da1

dev-lang/luajit: added 2.1.0 beta, without keywords (bug #678404)

Package-Manager: Portage-2.3.49, Repoman-2.3.11
Signed-off-by: Rafael Martins  gentoo.org>

 dev-lang/luajit/Manifest  |  1 +
 dev-lang/luajit/luajit-2.1.0_beta3.ebuild | 51 +++
 2 files changed, 52 insertions(+)

diff --git a/dev-lang/luajit/Manifest b/dev-lang/luajit/Manifest
index b7dd96473d0..064a580503e 100644
--- a/dev-lang/luajit/Manifest
+++ b/dev-lang/luajit/Manifest
@@ -2,3 +2,4 @@ DIST LuaJIT-2.0.2.tar.gz 843031 BLAKE2B 
7dbf36c1d41106bb55b4588920a79b4c68139e00
 DIST LuaJIT-2.0.3.tar.gz 844927 BLAKE2B 
a6ed54ef562b7af594367cbc0ed6e20295bb64781ceb6b46df81d10d7abd9fdaf902344ab7a6dfdffa6fc38b05e70648ae53c9cffdfb2a866989eba4b02fe9df
 SHA512 
7b3e3de22ac3602299b5918b60801e45a3278e547a15c16fdae7359538d4ada27ba664935d5f97c7409f330c2f8efeaae9ea03415f5e9d5a9d81e022cd5d36e0
 DIST LuaJIT-2.0.4.tar.gz 847615 BLAKE2B 
b410d06734056283655e70a53b4f1160553cc74a9d6a80d4a919f7f38589888fff339eda661ec623258a5f186f4eb2d2c9b5809b6f7e55f9e058058426e2fe74
 SHA512 
a72957bd85d8f457269e78bf08c19b28c5707df5d19920d61918f8a6913f55913ce13037fb9a6463c04cefde0c6644739f390e09d656e4bbc2c236927aa3f8f9
 DIST LuaJIT-2.0.5.tar.gz 849845 BLAKE2B 
961c8622e19b0e66a76a875cb46ad149cb2559b5af41f360dc41dd0d6bb924583e6477dd1329f67c2ac6ea4b8dc42c5e2f4d63ea49400aba4d9e7c7e85e4b085
 SHA512 
2636675602b4a060b0571c05220db2061dd2f38568e35b2be346a0f5e3128d87057d11d3d0d7567d8cc4e0817b5e4cf2c52a17a48065520962b157816465a9fe
+DIST LuaJIT-2.1.0-beta3.tar.gz 1025180 BLAKE2B 
ac3d12e25bd9946ba41aed6672c66884e7256e6be99d7ee8d1260d697453c966b24d60387f278f47233bad44cda61085c9059e6f62c0bc7cfdaaefde282346c5
 SHA512 
c44e967a0f671ed32b55aee810bc8b3b63737a2d7363b8984ae1949b24f98dbb3f9be7c1e10239fdeb96a3e3c836f606342cbd61838cf9bcadb077443eb5bc12

diff --git a/dev-lang/luajit/luajit-2.1.0_beta3.ebuild 
b/dev-lang/luajit/luajit-2.1.0_beta3.ebuild
new file mode 100644
index 000..6497ae142c3
--- /dev/null
+++ b/dev-lang/luajit/luajit-2.1.0_beta3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit pax-utils toolchain-funcs versionator
+
+MY_PV="$(get_version_component_range 1-4)"
+MY_PV="${MY_PV/_beta/-beta}"
+MY_P="LuaJIT-${MY_PV}"
+
+DESCRIPTION="Just-In-Time Compiler for the Lua programming language"
+HOMEPAGE="http://luajit.org/";
+SRC_URI="http://luajit.org/download/${MY_P}.tar.gz";
+
+LICENSE="MIT"
+# this should probably be pkgmoved to 2.0 for sake of consistency.
+SLOT="2"
+KEYWORDS=""
+IUSE="lua52compat static-libs"
+
+S="${WORKDIR}/${MY_P}"
+
+_emake() {
+   emake \
+   Q= \
+   PREFIX="${EPREFIX}/usr" \
+   MULTILIB="$(get_libdir)" \
+   DESTDIR="${D}" \
+   HOST_CC="$(tc-getBUILD_CC)" \
+   STATIC_CC="$(tc-getCC)" \
+   DYNAMIC_CC="$(tc-getCC) -fPIC" \
+   TARGET_LD="$(tc-getCC)" \
+   TARGET_AR="$(tc-getAR) rcus" \
+   BUILDMODE="$(usex static-libs mixed dynamic)" \
+   TARGET_STRIP="true" \
+   INSTALL_LIB="${ED%/}/usr/$(get_libdir)" \
+   "$@"
+}
+
+src_compile() {
+   _emake XCFLAGS="$(usex lua52compat "-DLUAJIT_ENABLE_LUA52COMPAT" "")"
+}
+
+src_install(){
+   _emake install
+
+   pax-mark m "${ED}usr/bin/luajit-${MY_PV}"
+
+   HTML_DOCS="doc/." einstalldocs
+}

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

2018-07-08 Thread Markus Meier

commit: 312459eb382e1b7652fcaec57017b41d40f756a5
Author: Markus Meier  gentoo  org>
AuthorDate: Sun Jul  8 10:46:48 2018 +
Commit: Markus Meier  gentoo  org>
CommitDate: Sun Jul  8 10:46:48 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=312459eb

dev-lang/luajit: arm stable, bug #654434

Package-Manager: Portage-2.3.40, Repoman-2.3.9
RepoMan-Options: --include-arches="arm"

 dev-lang/luajit/luajit-2.0.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/luajit/luajit-2.0.5-r1.ebuild 
b/dev-lang/luajit/luajit-2.0.5-r1.ebuild
index 0560634cb15..a90f9c43d19 100644
--- a/dev-lang/luajit/luajit-2.0.5-r1.ebuild
+++ b/dev-lang/luajit/luajit-2.0.5-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="http://luajit.org/download/${MY_P}.tar.gz
 LICENSE="MIT"
 # this should probably be pkgmoved to 2.0 for sake of consistency.
 SLOT="2"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux"
 IUSE="lua52compat static-libs"
 
 S="${WORKDIR}/${MY_P}"

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

2018-06-25 Thread Aaron Bauman

commit: 5459e7dc44a7763c00e14bc3c46f3599a792ed42
Author: Aaron Bauman  gentoo  org>
AuthorDate: Tue Jun 26 01:51:53 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Tue Jun 26 02:04:22 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5459e7dc

dev-lang/luajit: amd64 stable

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-lang/luajit/luajit-2.0.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/luajit/luajit-2.0.5-r1.ebuild 
b/dev-lang/luajit/luajit-2.0.5-r1.ebuild
index 2ed04eecdd9..0560634cb15 100644
--- a/dev-lang/luajit/luajit-2.0.5-r1.ebuild
+++ b/dev-lang/luajit/luajit-2.0.5-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="http://luajit.org/download/${MY_P}.tar.gz
 LICENSE="MIT"
 # this should probably be pkgmoved to 2.0 for sake of consistency.
 SLOT="2"
-KEYWORDS="~amd64 ~arm ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux"
 IUSE="lua52compat static-libs"
 
 S="${WORKDIR}/${MY_P}"

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

2018-05-26 Thread Aaron Bauman

commit: 1ec97ef326d674c6e45c8ea8a38dcd4e3832c852
Author: Aaron Bauman  gentoo  org>
AuthorDate: Sat May 26 19:27:00 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Sat May 26 20:31:27 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ec97ef3

dev-lang/luajit: drop EAPI=2

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-lang/luajit/Manifest|  1 -
 dev-lang/luajit/luajit-1.1.6.ebuild | 54 -
 2 files changed, 55 deletions(-)

diff --git a/dev-lang/luajit/Manifest b/dev-lang/luajit/Manifest
index f52d5b141d5..b7dd96473d0 100644
--- a/dev-lang/luajit/Manifest
+++ b/dev-lang/luajit/Manifest
@@ -1,4 +1,3 @@
-DIST LuaJIT-1.1.6.tar.gz 364447 BLAKE2B 
6c9f0c8269770268a123052d63fc72ad5e44f72ded209d5e0c360d693e9867db47c31e77bbdb2452dd44e1a69181047d54874334d1d931cf25670b28c0ad6125
 SHA512 
5b08d0409bed23b3efd05d50007819c0023323fb0f921256fd33902b434221ebaa5ff4568813863ba3220271f7fd54720479ab8161b09d26ef5873030431592a
 DIST LuaJIT-2.0.2.tar.gz 843031 BLAKE2B 
7dbf36c1d41106bb55b4588920a79b4c68139e009cb157d0f4ca8f0c72d8f7def1edd4517237234c5833acdbda0ec3dc25edb18bc55298b139463dbb6e58476a
 SHA512 
c1afea13ec61a59f37d1f61fc50bcac47208d9d4f0a80689b74e901ad2b34294b6c89a0b4eef54b43f3d2db411660da61b191b0bbfba4ba2f97743a9ee4484e3
 DIST LuaJIT-2.0.3.tar.gz 844927 BLAKE2B 
a6ed54ef562b7af594367cbc0ed6e20295bb64781ceb6b46df81d10d7abd9fdaf902344ab7a6dfdffa6fc38b05e70648ae53c9cffdfb2a866989eba4b02fe9df
 SHA512 
7b3e3de22ac3602299b5918b60801e45a3278e547a15c16fdae7359538d4ada27ba664935d5f97c7409f330c2f8efeaae9ea03415f5e9d5a9d81e022cd5d36e0
 DIST LuaJIT-2.0.4.tar.gz 847615 BLAKE2B 
b410d06734056283655e70a53b4f1160553cc74a9d6a80d4a919f7f38589888fff339eda661ec623258a5f186f4eb2d2c9b5809b6f7e55f9e058058426e2fe74
 SHA512 
a72957bd85d8f457269e78bf08c19b28c5707df5d19920d61918f8a6913f55913ce13037fb9a6463c04cefde0c6644739f390e09d656e4bbc2c236927aa3f8f9

diff --git a/dev-lang/luajit/luajit-1.1.6.ebuild 
b/dev-lang/luajit/luajit-1.1.6.ebuild
deleted file mode 100644
index 880ea236137..000
--- a/dev-lang/luajit/luajit-1.1.6.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit pax-utils
-
-MY_P="LuaJIT-${PV}"
-
-DESCRIPTION="A Just-In-Time Compiler for the Lua programming language"
-HOMEPAGE="http://luajit.org/";
-SRC_URI="http://luajit.org/download/${MY_P}.tar.gz";
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="~amd64 ~x86"
-IUSE="readline"
-
-DEPEND="readline? ( sys-libs/readline )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare(){
-   # fixing prefix
-   sed -i -e "s#/usr/local#${D}/usr#" Makefile \
-   || die "failed to fix prefix in Makefile"
-   sed -i -e 's#/usr/local/#/usr/#' src/luaconf.h \
-   || die "failed to fix prefix in luaconf.h"
-
-   # forcing the use of our CFLAGS
-   sed -i -e "s/\$(MYCFLAGS)/\$(MYCFLAGS) ${CFLAGS}/" src/Makefile \
-   || die "failed to force the use of the CFLAGS from the user"
-}
-
-src_compile(){
-   if use readline; then
-   emake linux_rl || die "emake failed."
-   else
-   emake linux || die "emake failed."
-   fi
-}
-
-src_install(){
-   einstall
-
-   # removing empty dir that was supposed to have the man pages.
-   # dev-lang/luajit:1 doesn't install man pages.
-   rm -rf "${D}usr/man"
-
-   mv "${D}usr/bin/luajit" "${D}usr/bin/luajit-${PV}" || die "mv failed!"
-   pax-mark m "${D}usr/bin/luajit-${PV}"
-   dosym "luajit-${PV}" "/usr/bin/luajit-${SLOT}"
-}

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

2018-03-25 Thread Michał Górny

commit: 3c223be5553eb663bb63278a1e38c7f26a59835b
Author: Marty E. Plummer  protonmail  com>
AuthorDate: Tue Jul 11 02:09:43 2017 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Mar 26 06:16:07 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c223be5

dev-lang/luajit: add static-libs to IUSE, update EAPI=6

Mostly to help debug an issue with dev-lua/mpack[luajit] on elibc_musl.

Closes: https://github.com/gentoo/gentoo/pull/5082
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Signed-off-by: Marty E. Plummer  protonmail.com>

 dev-lang/luajit/luajit-2.0.5-r1.ebuild | 62 ++
 1 file changed, 62 insertions(+)

diff --git a/dev-lang/luajit/luajit-2.0.5-r1.ebuild 
b/dev-lang/luajit/luajit-2.0.5-r1.ebuild
new file mode 100644
index 000..a60c5c12757
--- /dev/null
+++ b/dev-lang/luajit/luajit-2.0.5-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit pax-utils toolchain-funcs versionator
+
+MY_PV="$(get_version_component_range 1-3)"
+MY_P="LuaJIT-${MY_PV}"
+if [[ -n $(get_version_component_range 4) ]]; then
+   HOTFIX="v${PV}"
+   HOTFIX="${HOTFIX/_p/_hotfix}.patch"
+fi
+
+DESCRIPTION="Just-In-Time Compiler for the Lua programming language"
+HOMEPAGE="http://luajit.org/";
+SRC_URI="http://luajit.org/download/${MY_P}.tar.gz
+   ${HOTFIX:+http://luajit.org/download/${HOTFIX}}";
+
+LICENSE="MIT"
+# this should probably be pkgmoved to 2.0 for sake of consistency.
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="lua52compat static-libs"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare(){
+   if [[ -n ${HOTFIX} ]]; then
+   eapply "${DISTDIR}/${HOTFIX}"
+   fi
+   default
+}
+
+_emake() {
+   emake \
+   Q= \
+   PREFIX="${EPREFIX}/usr" \
+   MULTILIB="$(get_libdir)" \
+   DESTDIR="${D}" \
+   HOST_CC="$(tc-getBUILD_CC)" \
+   STATIC_CC="$(tc-getCC)" \
+   DYNAMIC_CC="$(tc-getCC) -fPIC" \
+   TARGET_LD="$(tc-getCC)" \
+   TARGET_AR="$(tc-getAR) rcus" \
+   BUILDMODE="$(usex static-libs mixed dynamic)" \
+   TARGET_STRIP="true" \
+   INSTALL_LIB="${ED%/}/usr/$(get_libdir)" \
+   "$@"
+}
+
+src_compile() {
+   _emake XCFLAGS="$(usex lua52compat "-DLUAJIT_ENABLE_LUA52COMPAT" "")"
+}
+
+src_install(){
+   _emake install
+
+   pax-mark m "${ED}usr/bin/luajit-${MY_PV}"
+
+   HTML_DOCS="doc/." einstalldocs
+}

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

2018-03-22 Thread Guilherme Amadio

commit: c581c9a1646722677a9d0998a2b83aa39dd0acd1
Author: Guilherme Amadio  gentoo  org>
AuthorDate: Mon Mar 19 22:00:15 2018 +
Commit: Guilherme Amadio  gentoo  org>
CommitDate: Thu Mar 22 14:23:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c581c9a1

dev-lang/luajit: move back to EAPI=5

Move to EAPI=6 broke prefix (files get installed into /usr/local).

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-lang/luajit/luajit-2.0.5.ebuild | 8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/dev-lang/luajit/luajit-2.0.5.ebuild 
b/dev-lang/luajit/luajit-2.0.5.ebuild
index 7f2cffc..5796c4dc31f 100644
--- a/dev-lang/luajit/luajit-2.0.5.ebuild
+++ b/dev-lang/luajit/luajit-2.0.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=5
 
 inherit eutils multilib pax-utils versionator toolchain-funcs
 
@@ -25,13 +25,10 @@ IUSE="lua52compat"
 
 S="${WORKDIR}/${MY_P}"
 
-HTML_DOCS=( doc/. )
-
 src_prepare(){
if [[ -n ${HOTFIX} ]]; then
epatch "${DISTDIR}/${HOTFIX}"
fi
-   default
 }
 
 _emake() {
@@ -59,5 +56,6 @@ src_install(){
 
pax-mark m "${ED}usr/bin/luajit-${MY_PV}"
 
-   default
+   cd "${S}"/doc
+   dohtml -r *
 }

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

2018-03-13 Thread Rafael Martins

commit: fbe3d6c02f87e083483e3f5a84ee99a5a315fec7
Author: Rafael G. Martins  gentoo  org>
AuthorDate: Wed Mar 14 02:07:23 2018 +
Commit: Rafael Martins  gentoo  org>
CommitDate: Wed Mar 14 02:07:38 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbe3d6c0

dev-lang/luajit: version bump. bug #645526

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 dev-lang/luajit/Manifest|  1 +
 dev-lang/luajit/luajit-2.0.5.ebuild | 63 +
 2 files changed, 64 insertions(+)

diff --git a/dev-lang/luajit/Manifest b/dev-lang/luajit/Manifest
index 13b68cbb82a..f52d5b141d5 100644
--- a/dev-lang/luajit/Manifest
+++ b/dev-lang/luajit/Manifest
@@ -2,3 +2,4 @@ DIST LuaJIT-1.1.6.tar.gz 364447 BLAKE2B 
6c9f0c8269770268a123052d63fc72ad5e44f72d
 DIST LuaJIT-2.0.2.tar.gz 843031 BLAKE2B 
7dbf36c1d41106bb55b4588920a79b4c68139e009cb157d0f4ca8f0c72d8f7def1edd4517237234c5833acdbda0ec3dc25edb18bc55298b139463dbb6e58476a
 SHA512 
c1afea13ec61a59f37d1f61fc50bcac47208d9d4f0a80689b74e901ad2b34294b6c89a0b4eef54b43f3d2db411660da61b191b0bbfba4ba2f97743a9ee4484e3
 DIST LuaJIT-2.0.3.tar.gz 844927 BLAKE2B 
a6ed54ef562b7af594367cbc0ed6e20295bb64781ceb6b46df81d10d7abd9fdaf902344ab7a6dfdffa6fc38b05e70648ae53c9cffdfb2a866989eba4b02fe9df
 SHA512 
7b3e3de22ac3602299b5918b60801e45a3278e547a15c16fdae7359538d4ada27ba664935d5f97c7409f330c2f8efeaae9ea03415f5e9d5a9d81e022cd5d36e0
 DIST LuaJIT-2.0.4.tar.gz 847615 BLAKE2B 
b410d06734056283655e70a53b4f1160553cc74a9d6a80d4a919f7f38589888fff339eda661ec623258a5f186f4eb2d2c9b5809b6f7e55f9e058058426e2fe74
 SHA512 
a72957bd85d8f457269e78bf08c19b28c5707df5d19920d61918f8a6913f55913ce13037fb9a6463c04cefde0c6644739f390e09d656e4bbc2c236927aa3f8f9
+DIST LuaJIT-2.0.5.tar.gz 849845 BLAKE2B 
961c8622e19b0e66a76a875cb46ad149cb2559b5af41f360dc41dd0d6bb924583e6477dd1329f67c2ac6ea4b8dc42c5e2f4d63ea49400aba4d9e7c7e85e4b085
 SHA512 
2636675602b4a060b0571c05220db2061dd2f38568e35b2be346a0f5e3128d87057d11d3d0d7567d8cc4e0817b5e4cf2c52a17a48065520962b157816465a9fe

diff --git a/dev-lang/luajit/luajit-2.0.5.ebuild 
b/dev-lang/luajit/luajit-2.0.5.ebuild
new file mode 100644
index 000..7f2cffc
--- /dev/null
+++ b/dev-lang/luajit/luajit-2.0.5.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils multilib pax-utils versionator toolchain-funcs
+
+MY_PV="$(get_version_component_range 1-3)"
+MY_P="LuaJIT-${MY_PV}"
+if [[ -n $(get_version_component_range 4) ]]; then
+   HOTFIX="v${PV}"
+   HOTFIX="${HOTFIX/_p/_hotfix}.patch"
+fi
+
+DESCRIPTION="Just-In-Time Compiler for the Lua programming language"
+HOMEPAGE="http://luajit.org/";
+SRC_URI="http://luajit.org/download/${MY_P}.tar.gz
+   ${HOTFIX:+http://luajit.org/download/${HOTFIX}}";
+
+LICENSE="MIT"
+# this should probably be pkgmoved to 2.0 for sake of consistency.
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="lua52compat"
+
+S="${WORKDIR}/${MY_P}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare(){
+   if [[ -n ${HOTFIX} ]]; then
+   epatch "${DISTDIR}/${HOTFIX}"
+   fi
+   default
+}
+
+_emake() {
+   emake \
+   Q= \
+   PREFIX="${EPREFIX}/usr" \
+   MULTILIB="$(get_libdir)" \
+   DESTDIR="${D}" \
+   HOST_CC="$(tc-getBUILD_CC)" \
+   STATIC_CC="$(tc-getCC)" \
+   DYNAMIC_CC="$(tc-getCC) -fPIC" \
+   TARGET_LD="$(tc-getCC)" \
+   TARGET_AR="$(tc-getAR) rcus" \
+   TARGET_STRIP="true" \
+   INSTALL_LIB="${ED%/}/usr/$(get_libdir)" \
+   "$@"
+}
+
+src_compile() {
+   _emake XCFLAGS="$(usex lua52compat "-DLUAJIT_ENABLE_LUA52COMPAT" "")"
+}
+
+src_install(){
+   _emake install
+
+   pax-mark m "${ED}usr/bin/luajit-${MY_PV}"
+
+   default
+}

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

2016-01-14 Thread Markus Meier

commit: 2973ad531f33e8fb622c71fd87802416f1371d60
Author: Markus Meier  gentoo  org>
AuthorDate: Thu Jan 14 21:57:24 2016 +
Commit: Markus Meier  gentoo  org>
CommitDate: Thu Jan 14 21:57:24 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2973ad53

dev-lang/luajit: arm stable, bug #570808

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="arm"

 dev-lang/luajit/luajit-2.0.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/luajit/luajit-2.0.4.ebuild 
b/dev-lang/luajit/luajit-2.0.4.ebuild
index 0c2d1d3..ed95424 100644
--- a/dev-lang/luajit/luajit-2.0.4.ebuild
+++ b/dev-lang/luajit/luajit-2.0.4.ebuild
@@ -21,7 +21,7 @@ SRC_URI="http://luajit.org/download/${MY_P}.tar.gz
 LICENSE="MIT"
 # this should probably be pkgmoved to 2.0 for sake of consistency.
 SLOT="2"
-KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="lua52compat"
 
 S="${WORKDIR}/${MY_P}"

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

2016-01-05 Thread Agostino Sarubbo

commit: 926feb5021a7f8e9a1ef20bdeab71783252a513f
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Jan  5 10:49:16 2016 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Jan  5 10:49:16 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=926feb50

dev-lang/luajit: amd64 stable wrt bug #570808

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-lang/luajit/luajit-2.0.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/luajit/luajit-2.0.4.ebuild 
b/dev-lang/luajit/luajit-2.0.4.ebuild
index 78856d0..811dac0 100644
--- a/dev-lang/luajit/luajit-2.0.4.ebuild
+++ b/dev-lang/luajit/luajit-2.0.4.ebuild
@@ -21,7 +21,7 @@ SRC_URI="http://luajit.org/download/${MY_P}.tar.gz
 LICENSE="MIT"
 # this should probably be pkgmoved to 2.0 for sake of consistency.
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="lua52compat"
 
 S="${WORKDIR}/${MY_P}"

53 matches

Mail list logo