Initial version for the branch 2.0. (bug #313005). Thanks to Paulo Matias.

Package-Manager: portage-2.2_rc89/cvs/Linux i686

4 files changed, 110 insertions, 9 deletions

diff --git a/dev-lang/luajit/ChangeLog b/dev-lang/luajit/ChangeLog
index 96a98ff77dfc..0d1c46e725e4 100644
--- a/dev-lang/luajit/ChangeLog
+++ b/dev-lang/luajit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/luajit
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/luajit/ChangeLog,v 1.1 2010/10/13 00:07:11 rafaelmartins Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/luajit/ChangeLog,v 1.2 2010/10/13 01:37:39 rafaelmartins Exp $
+
+*luajit-2.0.0_beta5 (13 Oct 2010)
+
+  13 Oct 2010; Rafael G. Martins <rafaelmartins@gentoo.org>
+  +files/2.0.0_beta5_hotfix1.patch, +luajit-2.0.0_beta5.ebuild:
+  Initial version for the branch 2.0. (bug #313005). Thanks to Paulo Matias.
 
 *luajit-1.1.6 (13 Oct 2010)
 
diff --git a/dev-lang/luajit/Manifest b/dev-lang/luajit/Manifest
index 60f8a5c1c55d..b48fe3f7691e 100644
--- a/dev-lang/luajit/Manifest
+++ b/dev-lang/luajit/Manifest
@@ -1,18 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 2.0.0_beta5_hotfix1.patch 1422 RMD160 08834676399ecd3cf3494ed6bd195a0fd0407108 SHA1 50c6cde2c04aa943f6f3a117b12731a415a9f560 SHA256 505ef3054165e7aa020f5c3ce31278d3f98b8af20d3a833c0f4ee9b81849fa9d
 DIST LuaJIT-1.1.6.tar.gz 364447 RMD160 9ad03d5a88bb15548edd2f7263f79cc99be4a7c6 SHA1 cfe7e3f84b3641bba237164d2ad1c3d37f41cada SHA256 c3dee987635540f64ebe834aa6c8ef17e0c0b8248324ee20953f50c98be2dd8a
+DIST LuaJIT-2.0.0-beta5.tar.gz 440370 RMD160 0032fdda291561a7847fabef0393501fbfcc3108 SHA1 f1d868371e59f6621b7851ed25d2395d4ba453a8 SHA256 f55099cf79f4b769e7f98e2645c13abdc9a43d5997a5770a67f1471ca0699361
 EBUILD luajit-1.1.6.ebuild 1413 RMD160 30641905d6b1e5443a3abdc1db42208ba4683b48 SHA1 68ff0d192a1433997792326bc964fc29a2435228 SHA256 1d2d8804cb9e45f68b66cabc791796285b5b5e85239a8c919e2e8428045a73f9
-MISC ChangeLog 384 RMD160 494984a2231f6dbeea12af1f4a2b1705e9f3827e SHA1 9c35ba70c67e7d0ba8694706c56ce0de6cb9f01f SHA256 9d81923d438bf45441f0848175bb8a2315e9b3717b78124f98a659c6d4f8b466
+EBUILD luajit-2.0.0_beta5.ebuild 1117 RMD160 b20162c8ee422a9dccd0515bce7062c7b29cbb9f SHA1 fd8e0614dc97c3eade127382bfa50887d21ca982 SHA256 68bdd067d6c8844be37be52dbc097e2ff235b539015548fb909a6ce0f614a384
+MISC ChangeLog 621 RMD160 bb2752d95104bca0d7b61670cc7421df98bfcc33 SHA1 1a753efd33a758e64b0ce5e5d8483152f097d1a6 SHA256 68863884e23220b0e893ef7e6c3685e9ed7cfe37b9534fb63b3a40f8fdeeb453
 MISC metadata.xml 396 RMD160 63665f36bdd3c892de7fa6044a7eba2e435ada48 SHA1 b846a5d9d2990c92412bba02e5e50b3a7bba0afe SHA256 36921199cee1734045df51f07addc344fd47cdc4f8fd269955bdd8ec566941e4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQEcBAEBAgAGBQJMtPfpAAoJEMmH5mwCk1NvqxcIAKUIwNCPKU+OC2vyIO9TLYQV
-64w8cwVDzoOqAX92Io7EcHbezx0mxJYgUoa851SxaJJCWIN8CyEscUMayvlvXWCX
-ZefYzo+TRL9ruyll305IoppYCTjvERD7wc04Rl//vNJHsxxTRZ8MSQsdAiXWJlkf
-F1NM842frjTIrki1c7lrMNxZzM/AaIbO+gfThaErCEjrmnulsP2UOk7JteyptSXh
-BoluAYWz0Pnop8EcU3oZzh0yLLuCQsdiJHV/RZ2P370+pHuQaeWsDxDq3WaoRMNI
-o6PMAmyO5lkxI8fuOE3hAd+UCfUVSMYqjDonh0f+3p9cC/xgtapyuyj9XvuFH/c=
-=eNtb
+iQEcBAEBAgAGBQJMtQ0dAAoJEMmH5mwCk1Nv4fUH/RZpfoaEJdKn00WcN2cXSMNR
+Shosv7Gk88nH7FfincrdgesE30EzqVDAuPvIb7R27GuoQuJkMCvJsdVg/FXeXcFU
+THAD2kA1t5SrojBnslGuQlgmFmSY+m2B8M4BMuSGIAhRonXfE1Rr0NUyXH73k6yO
+jMMnfsQYUvrxFaNNIBxTXiou/AJuEbeV8FdRlFJ8MK86uILeygYeZtkM5y1zFcQp
+1zwH8wfvVEh5McIfVc1S9WHzXFxOQQiC+6nWhPE23mLsIqAKn1RrlOiLnbNdrtQH
+4ZU5+feCIudsks2UDoNIITSOzCQBoqpPCuRTVeaqp6mpn/j4W/I3qxqq4Q+/Zkk=
+=FaDX
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/luajit/files/2.0.0_beta5_hotfix1.patch b/dev-lang/luajit/files/2.0.0_beta5_hotfix1.patch
new file mode 100644
index 000000000000..a7bf38a697c8
--- /dev/null
+++ b/dev-lang/luajit/files/2.0.0_beta5_hotfix1.patch
@@ -0,0 +1,50 @@
+--- a/src/lib_string.c
++++ b/src/lib_string.c
+@@ -746,6 +746,7 @@
+ 	    nbuf[len-2] = nbuf[len-2] - 0x20;
+ 	    nbuf[len-1] = nbuf[len-1] - 0x20;
+ 	  }
++	  nbuf[len] = '\0';
+ 	  for (p = form; *p < 'e' && *p != '.'; p++) ;
+ 	  *p++ = 's'; *p = '\0';
+ 	  sprintf(buff, form, nbuf);
+--- a/src/lj_state.c
++++ b/src/lj_state.c
+@@ -153,26 +153,21 @@
+ static void close_state(lua_State *L)
+ {
+   global_State *g = G(L);
++  lj_func_closeuv(L, L->stack);
++  lj_gc_freeall(g);
++  lua_assert(gcref(g->gc.root) == obj2gco(L));
++  lua_assert(g->strnum == 0);
++  lj_trace_freestate(g);
++  lj_mem_freevec(g, g->strhash, g->strmask+1, GCRef);
++  lj_str_freebuf(g, &g->tmpbuf);
++  lj_mem_freevec(g, L->stack, L->stacksize, TValue);
++  lua_assert(g->gc.total == sizeof(GG_State));
+ #ifndef LUAJIT_USE_SYSMALLOC
+-  if (g->allocf == lj_alloc_f) {
+-#if LJ_HASJIT
+-    lj_mcode_free(G2J(g));
+-#endif
++  if (g->allocf == lj_alloc_f)
+     lj_alloc_destroy(g->allocd);
+-  } else
++  else
+ #endif
+-  {
+-    lj_func_closeuv(L, L->stack);
+-    lj_gc_freeall(g);
+-    lua_assert(gcref(g->gc.root) == obj2gco(L));
+-    lua_assert(g->strnum == 0);
+-    lj_trace_freestate(g);
+-    lj_mem_freevec(g, g->strhash, g->strmask+1, GCRef);
+-    lj_str_freebuf(g, &g->tmpbuf);
+-    lj_mem_freevec(g, L->stack, L->stacksize, TValue);
+-    lua_assert(g->gc.total == sizeof(GG_State));
+     g->allocf(g->allocd, G2GG(g), sizeof(GG_State), 0);
+-  }
+ }
+ 
+ #if LJ_64
diff --git a/dev-lang/luajit/luajit-2.0.0_beta5.ebuild b/dev-lang/luajit/luajit-2.0.0_beta5.ebuild
new file mode 100644
index 000000000000..fec060598425
--- /dev/null
+++ b/dev-lang/luajit/luajit-2.0.0_beta5.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/luajit/luajit-2.0.0_beta5.ebuild,v 1.1 2010/10/13 01:37:39 rafaelmartins Exp $
+
+EAPI="2"
+
+inherit pax-utils
+
+MY_P="LuaJIT-${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"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare(){
+	# fixing prefix and version
+	sed -i -e "s#/usr/local#${D}/usr#" \
+		-e "s/VERSION=.*/VERSION= ${PV}/" 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"
+
+	# removing strip
+	sed -i -e '/$(Q)$(TARGET_STRIP)/d' src/Makefile \
+		|| die "failed to remove forced strip"
+
+	# hotfix from upstream, just for this version (2.0.0_beta5)
+	epatch "${FILESDIR}/${PV}_hotfix1.patch"
+}
+
+src_install(){
+	einstall
+	pax-mark m "${D}usr/bin/luajit-${PV}"
+	dosym "luajit-${PV}" "/usr/bin/luajit-${SLOT}"
+}