4 files changed, 27 insertions, 61 deletions
diff --git a/dev-lang/luajit/ChangeLog b/dev-lang/luajit/ChangeLog
index fb8b27065290..3e28db3f3bf4 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.4 2010/11/07 02:51:01 rafaelmartins Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/luajit/ChangeLog,v 1.5 2011/03/09 15:42:10 rafaelmartins Exp $
+
+*luajit-2.0.0_beta6 (09 Mar 2011)
+
+  09 Mar 2011; Rafael G. Martins <rafaelmartins@gentoo.org>
+  -luajit-2.0.0_beta5-r1.ebuild, +luajit-2.0.0_beta6.ebuild:
+  Version bump.
 
 *luajit-2.0.0_beta5-r1 (07 Nov 2010)
 
diff --git a/dev-lang/luajit/Manifest b/dev-lang/luajit/Manifest
index cee871d395ba..8b44bcdd862f 100644
--- a/dev-lang/luajit/Manifest
+++ b/dev-lang/luajit/Manifest
@@ -1,7 +1,20 @@
-AUX 2.0.0_beta5_hotfix1.patch 1422 RMD160 08834676399ecd3cf3494ed6bd195a0fd0407108 SHA1 50c6cde2c04aa943f6f3a117b12731a415a9f560 SHA256 505ef3054165e7aa020f5c3ce31278d3f98b8af20d3a833c0f4ee9b81849fa9d
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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
+DIST LuaJIT-2.0.0-beta6.tar.gz 603020 RMD160 0c8d7724831ecb3a9b728e2d1344cc5d9ba9007e SHA1 0412da515eb21fa5b537ce6b74f1743cb68c99f1 SHA256 bcf443236959619b5021ef5ae9b0e2dc34e6c4e90614f7db0d53080cb2e1c78a
 EBUILD luajit-1.1.6.ebuild 1413 RMD160 30641905d6b1e5443a3abdc1db42208ba4683b48 SHA1 68ff0d192a1433997792326bc964fc29a2435228 SHA256 1d2d8804cb9e45f68b66cabc791796285b5b5e85239a8c919e2e8428045a73f9
-EBUILD luajit-2.0.0_beta5-r1.ebuild 1208 RMD160 93368042031886903852c71ea16112fd4d63a99c SHA1 1c2f21d6f43a68891a68851655c4db80677bd6d3 SHA256 39d65982076024a80aa26f8cfb7b48ccf8c4618f34a92deab9480c1e14242e07
-MISC ChangeLog 937 RMD160 092c3953e2f0a8cbdf6bf1436474d120032becf1 SHA1 e478cb87ad54fa657f12933b981f53cde63d82d1 SHA256 d4e5cb504988f8488e5e98eadc66848c918f7fcc3eb558f76c674213b0c1fb8a
+EBUILD luajit-2.0.0_beta6.ebuild 1101 RMD160 efc6632a8240883af68940625f261dfce9f5ee01 SHA1 ba2092868fb24170399f44844ff4ea79e8570d96 SHA256 c614435e6d36c24627132167cad719ddaad66ba8c843cfd6047c84006bda856f
+MISC ChangeLog 1110 RMD160 e0368fdebe7c2d70b1b49fd4300745bc12fe2883 SHA1 575822cfc39bb47202799a72c6e3c2a912eff788 SHA256 538bbe51eef48b169ec935aaa32bcd2d49bc7e69c9caa672f79a4fa23d8f5017
 MISC metadata.xml 396 RMD160 63665f36bdd3c892de7fa6044a7eba2e435ada48 SHA1 b846a5d9d2990c92412bba02e5e50b3a7bba0afe SHA256 36921199cee1734045df51f07addc344fd47cdc4f8fd269955bdd8ec566941e4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQEcBAEBAgAGBQJNd6A+AAoJEMmH5mwCk1Nv2VwH/2koV897WysZrrHSqDcb42M4
+PgIN0W9oSN4BfPjG5NWUybEelGvCIlD4gXWzopkij2m6WxhfFqWGABvJ9lffWzyN
+SBYGtw8BjQhS4n1A30eUiu2EjFlZ6OLSo/jjPmrVN2/dJwK619lD6jwNjHQfzl5L
+igyxlLzF5xa7bh9Rmbg+yCVZzppgqdgmbWn9D/9icMfpkpLaFdj8xcdhKs9L48OP
+xE1kTrfh94NYmZsvSaCU/gQpLn9tvbtwXnhR3ZoKKHEYQAUDOjXsC3O6XA+Pwflp
++Do272u2gUvnL/ln3cQRBskH4x0jyB8TBf38E/VL81XGlc9DSwABXJRgMGPP2GQ=
+=wFUz
+-----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
deleted file mode 100644
index a7bf38a697c8..000000000000
--- a/dev-lang/luajit/files/2.0.0_beta5_hotfix1.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- 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-r1.ebuild b/dev-lang/luajit/luajit-2.0.0_beta6.ebuild
index 2b2fbf156076..ae1512bfb653 100644
--- a/dev-lang/luajit/luajit-2.0.0_beta5-r1.ebuild
+++ b/dev-lang/luajit/luajit-2.0.0_beta6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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-r1.ebuild,v 1.1 2010/11/07 02:51:01 rafaelmartins Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/luajit/luajit-2.0.0_beta6.ebuild,v 1.1 2011/03/09 15:42:10 rafaelmartins Exp $
 
 EAPI="2"
 
@@ -32,9 +32,6 @@ src_prepare(){
 	# 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(){