commit: a03278a74fee2e3e1c1bd5083d9d627abc51018e
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 4 20:32:37 2016 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jan 4 20:32:37 2016 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a03278a7
dev-lang/lua: migrated to gx86
dev-lang/lua/Manifest | 3 -
.../5.1.3/01_all_LUAI_MAXCSTACK.upstream.patch | 17 ---
.../5.1.3/02_all_coroutine.resume.upstream.patch | 12 --
.../5.1.3/03_all_lua_checkstack.upstream.patch | 22 ----
.../lua/files/5.1.3/04_all_unpack.upstream.patch | 20 ---
.../files/5.1.3/05_all_validator.upstream.patch | 44 -------
.../lua/files/5.1.3/06_all_c_stack.upstream.patch | 21 ----
.../files/5.1.3/07_all_validator2.upstream.patch | 25 ----
.../5.1.3/08_all_code_injection.upstream.patch | 12 --
.../5.1.3/09_all_string_byte_fix_upstream.patch | 12 --
.../files/5.1.3/10_all_gc_loop_fix.upstream.patch | 19 ---
.../lua/files/5.1.3/11_all_module.upstream.patch | 16 ---
.../lua/files/5.1.3/12_all_svalue.upstream.patch | 11 --
.../5.1.4/01_all_boolean_expression.upstream.patch | 48 -------
.../lua/files/5.1.4/02_all_table.upstream.patch | 22 ----
.../5.1.4/03_all_debug_getfenv.upstream.patch | 10 --
.../5.1.4/04_all_gc_performance.upstream.patch | 14 ---
.../5.1.4/05_all_string_format.upstream.patch | 21 ----
.../lua/files/5.1.4/06_all_io_read.upstream.patch | 15 ---
.../5.2.0/01_all_memory_hoarding.upstream.patch | 49 --------
.../02_all_hex_number_handling.upstream.patch | 26 ----
dev-lang/lua/files/configure.in | 5 -
dev-lang/lua/files/lua-5.1-make-no-libtool.patch | 68 ----------
dev-lang/lua/files/lua-5.1-make-r1.patch | 66 ----------
dev-lang/lua/files/lua-5.1-make-r2.patch | 97 ---------------
dev-lang/lua/files/lua-5.1-make.patch | 64 ----------
dev-lang/lua/files/lua-5.1-make_static-r1.patch | 12 --
dev-lang/lua/files/lua-5.1-make_static.patch | 12 --
dev-lang/lua/files/lua-5.1-module_paths.patch | 30 -----
dev-lang/lua/files/lua-5.1-readline.patch | 10 --
dev-lang/lua/files/lua-5.1.3-deprecated.patch | 46 -------
dev-lang/lua/files/lua-5.1.3-test.patch | 11 --
dev-lang/lua/files/lua-5.1.4-deprecated.patch | 46 -------
dev-lang/lua/files/lua-5.1.4-test.patch | 11 --
dev-lang/lua/files/lua-5.2-make-r1.patch | 75 -----------
dev-lang/lua/files/lua-5.2-make.patch | 60 ---------
dev-lang/lua/files/lua.pc | 31 -----
dev-lang/lua/lua-5.1.4-r8.ebuild | 124 ------------------
dev-lang/lua/lua-5.1.5-r100.ebuild | 138 ---------------------
dev-lang/lua/lua-5.1.5-r3.ebuild | 133 --------------------
dev-lang/lua/lua-5.2.3-r1.ebuild | 136 --------------------
dev-lang/lua/metadata.xml | 13 --
42 files changed, 1627 deletions(-)
diff --git a/dev-lang/lua/Manifest b/dev-lang/lua/Manifest
deleted file mode 100644
index 3404943..0000000
--- a/dev-lang/lua/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST lua-5.1.4.tar.gz 216679 SHA256
b038e225eaf2a5b57c9bcc35cd13aa8c6c8288ef493d52970c9545074098af3a SHA512
bc542fe8535826ac1e49b03a8f238cf049724b02c14718f8162cfeaf735a5e6c58412ff18dbe7a38e4cc4433f3d1e702554e9b24b5f021634b4280880980f40f
WHIRLPOOL
2d8fdf77e31314eed68d8ace368a62a608a58114bea5c8797a2e2d327ca870dd4450ede494733d49c97bb447c97adf08610027df3206999a35fb49cde77448fd
-DIST lua-5.1.5.tar.gz 221213 SHA256
2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333 SHA512
0142fefcbd13afcd9b201403592aa60620011cc8e8559d4d2db2f92739d18186860989f48caa45830ff4f99bfc7483287fd3ff3a16d4dec928e2767ce4d542a9
WHIRLPOOL
9dac93b73b9ad1ef6c69e0aa11fb53d5efe89274b65c55a1ac30bab23e8a255851b0e44306db54212b1d481e658cecd38e5ff22a25e1fa974858b7b03fb45b75
-DIST lua-5.2.3.tar.gz 251195 SHA256
13c2fb97961381f7d06d5b5cea55b743c163800896fd5c5e2356201d3619002d SHA512
264bb7c8db2f190ef0ca38584ec81999ab588f54e03119c5214c40bb8925b0eb407fac483a03e40cc8a220f6748ddff7d3a7392da3803418276b0d263b866449
WHIRLPOOL
d278a1e38416bcf7f82eb3e7fd5fb423e60ccb69e9d57a937070516ff8be2d19a98bbfdaf37ec6fd6fb3ef2d625900977ca0cb47e46cb0ede5ebd5d37a9454ef
diff --git a/dev-lang/lua/files/5.1.3/01_all_LUAI_MAXCSTACK.upstream.patch
b/dev-lang/lua/files/5.1.3/01_all_LUAI_MAXCSTACK.upstream.patch
deleted file mode 100644
index a51e467..0000000
--- a/dev-lang/lua/files/5.1.3/01_all_LUAI_MAXCSTACK.upstream.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -rdu lua-5.1.3.orig/src/luaconf.h lua-5.1.3/src/luaconf.h
---- lua-5.1.3.orig/src/luaconf.h 2008-02-12 16:17:59.000000000 +0000
-+++ lua-5.1.3/src/luaconf.h 2008-02-12 16:26:32.000000000 +0000
-@@ -447,10 +447,10 @@
- @* can use.
- ** CHANGE it if you need lots of (Lua) stack space for your C
- ** functions. This limit is arbitrary; its only purpose is to stop C
--** functions to consume unlimited stack space.
-+** functions to consume unlimited stack space. (must be smaller than
-+** -LUA_REGISTRYINDEX)
- */
--#define LUAI_MCS_AUX ((int)(INT_MAX / (4*sizeof(LUA_NUMBER))))
--#define LUAI_MAXCSTACK (LUAI_MCS_AUX > SHRT_MAX ? SHRT_MAX :
LUAI_MCS_AUX)
-+#define LUAI_MAXCSTACK 8000
-
-
-
diff --git a/dev-lang/lua/files/5.1.3/02_all_coroutine.resume.upstream.patch
b/dev-lang/lua/files/5.1.3/02_all_coroutine.resume.upstream.patch
deleted file mode 100644
index 8d2b0d7..0000000
--- a/dev-lang/lua/files/5.1.3/02_all_coroutine.resume.upstream.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -rdu lua-5.1.3.orig/src/lbaselib.c lua-5.1.3/src/lbaselib.c
---- lua-5.1.3.orig/src/lbaselib.c 2008-02-12 16:43:49.000000000 +0000
-+++ lua-5.1.3/src/lbaselib.c 2008-02-12 16:47:32.000000000 +0000
-@@ -526,7 +526,7 @@
- status = lua_resume(co, narg);
- if (status == 0 || status == LUA_YIELD) {
- int nres = lua_gettop(co);
-- if (!lua_checkstack(L, nres))
-+ if (!lua_checkstack(L, nres + 1))
- luaL_error(L, "too many results to resume");
- lua_xmove(co, L, nres); /* move yielded values */
- return nres;
diff --git a/dev-lang/lua/files/5.1.3/03_all_lua_checkstack.upstream.patch
b/dev-lang/lua/files/5.1.3/03_all_lua_checkstack.upstream.patch
deleted file mode 100644
index 89e5d32..0000000
--- a/dev-lang/lua/files/5.1.3/03_all_lua_checkstack.upstream.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -rdu lua-5.1.3.orig/src/lapi.c lua-5.1.3/src/lapi.c
---- lua-5.1.3.orig/src/lapi.c 2008-02-12 16:17:59.000000000 +0000
-+++ lua-5.1.3/src/lapi.c 2008-02-12 16:26:32.000000000 +0000
-@@ -93,15 +93,14 @@
-
-
- LUA_API int lua_checkstack (lua_State *L, int size) {
-- int res;
-+ int res = 1;
- lua_lock(L);
-- if ((L->top - L->base + size) > LUAI_MAXCSTACK)
-+ if (size > LUAI_MAXCSTACK || (L->top - L->base + size) > LUAI_MAXCSTACK)
- res = 0; /* stack overflow */
-- else {
-+ else if (size > 0) {
- luaD_checkstack(L, size);
- if (L->ci->top < L->top + size)
- L->ci->top = L->top + size;
-- res = 1;
- }
- lua_unlock(L);
- return res;
diff --git a/dev-lang/lua/files/5.1.3/04_all_unpack.upstream.patch
b/dev-lang/lua/files/5.1.3/04_all_unpack.upstream.patch
deleted file mode 100644
index 47390e4..0000000
--- a/dev-lang/lua/files/5.1.3/04_all_unpack.upstream.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -rdu lua-5.1.3.orig/src/lbaselib.c lua-5.1.3/src/lbaselib.c
---- lua-5.1.3.orig/src/lbaselib.c 2008-02-12 16:17:59.000000000 +0000
-+++ lua-5.1.3/src/lbaselib.c 2008-02-12 16:26:32.000000000 +0000
-@@ -344,10 +344,12 @@
- luaL_checktype(L, 1, LUA_TTABLE);
- i = luaL_optint(L, 2, 1);
- e = luaL_opt(L, luaL_checkint, 3, luaL_getn(L, 1));
-+ if (i > e) return 0; /* empty range */
- n = e - i + 1; /* number of elements */
-- if (n <= 0) return 0; /* empty range */
-- luaL_checkstack(L, n, "table too big to unpack");
-- for (; i<=e; i++) /* push arg[i...e] */
-+ if (n <= 0 || !lua_checkstack(L, n)) /* n <= 0 means arith. overflow */
-+ return luaL_error(L, "too many results to unpack");
-+ lua_rawgeti(L, 1, i); /* push arg[i] (avoiding overflow problems) */
-+ while (i++ < e) /* push arg[i + 1...e] */
- lua_rawgeti(L, 1, i);
- return n;
- }
-
diff --git a/dev-lang/lua/files/5.1.3/05_all_validator.upstream.patch
b/dev-lang/lua/files/5.1.3/05_all_validator.upstream.patch
deleted file mode 100644
index 3a32d06..0000000
--- a/dev-lang/lua/files/5.1.3/05_all_validator.upstream.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -rdu lua-5.1.3.orig/src/ldebug.c lua-5.1.3/src/ldebug.c
---- lua-5.1.3.orig/src/ldebug.c 2008-02-12 16:17:59.000000000 +0000
-+++ lua-5.1.3/src/ldebug.c 2008-02-12 16:26:32.000000000 +0000
-@@ -275,12 +275,12 @@
-
- static int precheck (const Proto *pt) {
- check(pt->maxstacksize <= MAXSTACK);
-- lua_assert(pt->numparams+(pt->is_vararg & VARARG_HASARG) <=
pt->maxstacksize);
-- lua_assert(!(pt->is_vararg & VARARG_NEEDSARG) ||
-+ check(pt->numparams+(pt->is_vararg & VARARG_HASARG) <= pt->maxstacksize);
-+ check(!(pt->is_vararg & VARARG_NEEDSARG) ||
- (pt->is_vararg & VARARG_HASARG));
- check(pt->sizeupvalues <= pt->nups);
- check(pt->sizelineinfo == pt->sizecode || pt->sizelineinfo == 0);
-- check(GET_OPCODE(pt->code[pt->sizecode-1]) == OP_RETURN);
-+ check(pt->sizecode > 0 && GET_OPCODE(pt->code[pt->sizecode-1]) ==
OP_RETURN);
- return 1;
- }
-
-@@ -363,7 +363,11 @@
- }
- switch (op) {
- case OP_LOADBOOL: {
-- check(c == 0 || pc+2 < pt->sizecode); /* check its jump */
-+ if (c == 1) { /* does it jump? */
-+ check(pc+2 < pt->sizecode); /* check its jump */
-+ check(GET_OPCODE(pt->code[pc+1]) != OP_SETLIST ||
-+ GETARG_C(pt->code[pc+1]) != 0);
-+ }
- break;
- }
- case OP_LOADNIL: {
-@@ -428,7 +432,10 @@
- }
- case OP_SETLIST: {
- if (b > 0) checkreg(pt, a + b);
-- if (c == 0) pc++;
-+ if (c == 0) {
-+ pc++;
-+ check(pc < pt->sizecode - 1);
-+ }
- break;
- }
- case OP_CLOSURE: {
diff --git a/dev-lang/lua/files/5.1.3/06_all_c_stack.upstream.patch
b/dev-lang/lua/files/5.1.3/06_all_c_stack.upstream.patch
deleted file mode 100644
index 746acbf..0000000
--- a/dev-lang/lua/files/5.1.3/06_all_c_stack.upstream.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -rdu lua-5.1.3.orig/src/lundump.c lua-5.1.3/src/lundump.c
---- lua-5.1.3.orig/src/lundump.c 2008-02-12 16:17:59.000000000 +0000
-+++ lua-5.1.3/src/lundump.c 2008-02-12 16:26:32.000000000 +0000
-@@ -161,7 +160,9 @@
-
- static Proto* LoadFunction(LoadState* S, TString* p)
- {
-- Proto* f=luaF_newproto(S->L);
-+ Proto* f;
-+ if (++S->L->nCcalls > LUAI_MAXCCALLS) error(S,"code too deep");
-+ f=luaF_newproto(S->L);
- setptvalue2s(S->L,S->L->top,f); incr_top(S->L);
- f->source=LoadString(S); if (f->source==NULL) f->source=p;
- f->linedefined=LoadInt(S);
-@@ -175,6 +176,7 @@
- LoadDebug(S,f);
- IF (!luaG_checkcode(f), "bad code");
- S->L->top--;
-+ S->L->nCcalls--;
- return f;
- }
diff --git a/dev-lang/lua/files/5.1.3/07_all_validator2.upstream.patch
b/dev-lang/lua/files/5.1.3/07_all_validator2.upstream.patch
deleted file mode 100644
index 209d9ab..0000000
--- a/dev-lang/lua/files/5.1.3/07_all_validator2.upstream.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -rdu lua-5.1.3.orig/src/ldebug.c lua-5.1.3/src/ldebug.c
---- lua-5.1.3.orig/src/ldebug.c 2008-02-12 16:17:59.000000000 +0000
-+++ lua-5.1.3/src/ldebug.c 2008-02-12 16:26:32.000000000 +0000
-@@ -346,9 +346,18 @@
- int dest = pc+1+b;
- check(0 <= dest && dest < pt->sizecode);
- if (dest > 0) {
-- /* cannot jump to a setlist count */
-- Instruction d = pt->code[dest-1];
-- check(!(GET_OPCODE(d) == OP_SETLIST && GETARG_C(d) == 0));
-+ int j;
-+ /* check that it does not jump to a setlist count; this
-+ is tricky, because the count from a previous setlist may
-+ have the same value of an invalid setlist; so, we must
-+ go all the way back to the first of them (if any) */
-+ for (j = 0; j < dest; j++) {
-+ Instruction d = pt->code[dest-1-j];
-+ if (!(GET_OPCODE(d) == OP_SETLIST && GETARG_C(d) == 0)) break;
-+ }
-+ /* if 'j' is even, previous value is not a setlist (even if
-+ it looks like one) */
-+ check((j&1) == 0);
- }
- }
- break;
diff --git a/dev-lang/lua/files/5.1.3/08_all_code_injection.upstream.patch
b/dev-lang/lua/files/5.1.3/08_all_code_injection.upstream.patch
deleted file mode 100644
index 4d605cd..0000000
--- a/dev-lang/lua/files/5.1.3/08_all_code_injection.upstream.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur lua-5.1.3.orig/src/lundump.c lua-5.1.3/src/lundump.c
---- lua-5.1.3.orig/src/lundump.c 2008-05-15 09:24:32.000000000 +0200
-+++ lua-5.1.3/src/lundump.c 2008-05-15 09:25:18.000000000 +0200
-@@ -115,7 +115,7 @@
- setnilvalue(o);
- break;
- case LUA_TBOOLEAN:
-- setbvalue(o,LoadChar(S));
-+ setbvalue(o,LoadChar(S)!=0);
- break;
- case LUA_TNUMBER:
- setnvalue(o,LoadNumber(S));
diff --git a/dev-lang/lua/files/5.1.3/09_all_string_byte_fix_upstream.patch
b/dev-lang/lua/files/5.1.3/09_all_string_byte_fix_upstream.patch
deleted file mode 100644
index 392fa6b..0000000
--- a/dev-lang/lua/files/5.1.3/09_all_string_byte_fix_upstream.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- lua-5.1.3.orig/src/lstrlib.c 2008-05-15 09:24:32.000000000 +0200
-+++ lua-5.1.3/src/lstrlib.c 2008-08-10 14:21:00.000000000 +0200
-@@ -35,7 +35,8 @@
-
- static ptrdiff_t posrelat (ptrdiff_t pos, size_t len) {
- /* relative string position: negative means back from end */
-- return (pos>=0) ? pos : (ptrdiff_t)len+pos+1;
-+ if (pos < 0) pos += (ptrdiff_t)len + 1;
-+ return (pos >= 0) ? pos : 0;
- }
-
-
diff --git a/dev-lang/lua/files/5.1.3/10_all_gc_loop_fix.upstream.patch
b/dev-lang/lua/files/5.1.3/10_all_gc_loop_fix.upstream.patch
deleted file mode 100644
index 83b706d..0000000
--- a/dev-lang/lua/files/5.1.3/10_all_gc_loop_fix.upstream.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- lua-5.1.3.orig/src/lapi.c 2008-05-15 09:24:32.000000000 +0200
-+++ lua-5.1.3/src/lapi.c 2008-08-10 14:26:42.000000000 +0200
-@@ -930,10 +930,13 @@
- g->GCthreshold = g->totalbytes - a;
- else
- g->GCthreshold = 0;
-- while (g->GCthreshold <= g->totalbytes)
-+ while (g->GCthreshold <= g->totalbytes) {
- luaC_step(L);
-- if (g->gcstate == GCSpause) /* end of cycle? */
-- res = 1; /* signal it */
-+ if (g->gcstate == GCSpause) { /* end of cycle? */
-+ res = 1; /* signal it */
-+ break;
-+ }
-+ }
- break;
- }
- case LUA_GCSETPAUSE: {
diff --git a/dev-lang/lua/files/5.1.3/11_all_module.upstream.patch
b/dev-lang/lua/files/5.1.3/11_all_module.upstream.patch
deleted file mode 100644
index f6231f5..0000000
--- a/dev-lang/lua/files/5.1.3/11_all_module.upstream.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- lua-5.1.3.orig/src/loadlib.c 2008-05-15 09:24:32.000000000 +0200
-+++ lua-5.1.3/src/loadlib.c 2008-08-10 14:29:32.000000000 +0200
-@@ -506,8 +506,11 @@
-
- static void setfenv (lua_State *L) {
- lua_Debug ar;
-- lua_getstack(L, 1, &ar);
-- lua_getinfo(L, "f", &ar);
-+ if (lua_getstack(L, 1, &ar) == 0 ||
-+ lua_getinfo(L, "f", &ar) == 0 || /* get calling function */
-+ lua_iscfunction(L, -1))
-+ luaL_error(L, "function " LUA_QL("module")
-+ " not called from a Lua function");
- lua_pushvalue(L, -2);
- lua_setfenv(L, -2);
- lua_pop(L, 1);
diff --git a/dev-lang/lua/files/5.1.3/12_all_svalue.upstream.patch
b/dev-lang/lua/files/5.1.3/12_all_svalue.upstream.patch
deleted file mode 100644
index cec667b..0000000
--- a/dev-lang/lua/files/5.1.3/12_all_svalue.upstream.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lua-5.1.3.orig/src/lobject.h 2008-05-15 09:24:32.000000000 +0200
-+++ lua-5.1.3/src/lobject.h 2008-08-10 14:32:26.000000000 +0200
-@@ -208,7 +208,7 @@
-
-
- #define getstr(ts) cast(const char *, (ts) + 1)
--#define svalue(o) getstr(tsvalue(o))
-+#define svalue(o) getstr(rawtsvalue(o))
-
-
-
diff --git a/dev-lang/lua/files/5.1.4/01_all_boolean_expression.upstream.patch
b/dev-lang/lua/files/5.1.4/01_all_boolean_expression.upstream.patch
deleted file mode 100644
index f04eb85..0000000
--- a/dev-lang/lua/files/5.1.4/01_all_boolean_expression.upstream.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- lua-5.1.4.orig/src/lcode.c 2007/12/28 15:32:23 2.25.1.3
-+++ lua-5.1.4/src/lcode.c 2009/06/15 14:07:34
-@@ -544,15 +544,18 @@
- pc = NO_JUMP; /* always true; do nothing */
- break;
- }
-- case VFALSE: {
-- pc = luaK_jump(fs); /* always jump */
-- break;
-- }
- case VJMP: {
- invertjump(fs, e);
- pc = e->u.s.info;
- break;
- }
-+ case VFALSE: {
-+ if (!hasjumps(e)) {
-+ pc = luaK_jump(fs); /* always jump */
-+ break;
-+ }
-+ /* else go through */
-+ }
- default: {
- pc = jumponcond(fs, e, 0);
- break;
-@@ -572,14 +575,17 @@
- pc = NO_JUMP; /* always false; do nothing */
- break;
- }
-- case VTRUE: {
-- pc = luaK_jump(fs); /* always jump */
-- break;
-- }
- case VJMP: {
- pc = e->u.s.info;
- break;
- }
-+ case VTRUE: {
-+ if (!hasjumps(e)) {
-+ pc = luaK_jump(fs); /* always jump */
-+ break;
-+ }
-+ /* else go through */
-+ }
- default: {
- pc = jumponcond(fs, e, 1);
- break;
-
diff --git a/dev-lang/lua/files/5.1.4/02_all_table.upstream.patch
b/dev-lang/lua/files/5.1.4/02_all_table.upstream.patch
deleted file mode 100644
index 9ffc1bb..0000000
--- a/dev-lang/lua/files/5.1.4/02_all_table.upstream.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- lua-5.1.4.orig/src/lvm.c 2007/12/28 15:32:23 2.63.1.3
-+++ lua-5.1.4/src/lvm.c 2009/07/01 20:36:59
-@@ -133,6 +133,7 @@
-
- void luaV_settable (lua_State *L, const TValue *t, TValue *key, StkId val) {
- int loop;
-+ TValue temp;
- for (loop = 0; loop < MAXTAGLOOP; loop++) {
- const TValue *tm;
- if (ttistable(t)) { /* `t' is a table? */
-@@ -152,7 +153,9 @@
- callTM(L, tm, t, key, val);
- return;
- }
-- t = tm; /* else repeat with `tm' */
-+ /* else repeat with `tm' */
-+ setobj(L, &temp, tm); /* avoid pointing inside table (may rehash) */
-+ t = &temp;
- }
- luaG_runerror(L, "loop in settable");
- }
-
diff --git a/dev-lang/lua/files/5.1.4/03_all_debug_getfenv.upstream.patch
b/dev-lang/lua/files/5.1.4/03_all_debug_getfenv.upstream.patch
deleted file mode 100644
index fce4d47..0000000
--- a/dev-lang/lua/files/5.1.4/03_all_debug_getfenv.upstream.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- lua-5.1.4.orig/src/ldblib.c 2007/12/28 15:32:23 2.63.1.3
-+++ lua-5.1.4/src/ldblib.c 2010/02/23 12:36:59
-@@ -45,6 +45,7 @@
-
-
- static int db_getfenv (lua_State *L) {
-+ luaL_checkany(L, 1);
- lua_getfenv(L, 1);
- return 1;
- }
diff --git a/dev-lang/lua/files/5.1.4/04_all_gc_performance.upstream.patch
b/dev-lang/lua/files/5.1.4/04_all_gc_performance.upstream.patch
deleted file mode 100644
index 3c78525..0000000
--- a/dev-lang/lua/files/5.1.4/04_all_gc_performance.upstream.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- lua-5.1.4.orig/src/llex.c 2007/12/28 15:32:23 2.63.1.3
-+++ lua-5.1.4/src/llex.c 2010/02/23 12:36:59
-@@ -118,8 +118,10 @@
- lua_State *L = ls->L;
- TString *ts = luaS_newlstr(L, str, l);
- TValue *o = luaH_setstr(L, ls->fs->h, ts); /* entry for `str' */
-- if (ttisnil(o))
-+ if (ttisnil(o)) {
- setbvalue(o, 1); /* make sure `str' will not be collected */
-+ luaC_checkGC(L);
-+ }
- return ts;
- }
-
diff --git a/dev-lang/lua/files/5.1.4/05_all_string_format.upstream.patch
b/dev-lang/lua/files/5.1.4/05_all_string_format.upstream.patch
deleted file mode 100644
index 5127507..0000000
--- a/dev-lang/lua/files/5.1.4/05_all_string_format.upstream.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- lua-5.1.4.orig/src/lstrlib.c 2008/07/11 17:27:21 1.132.1.4
-+++ lua-5.1.4/src/lstrlib.c 2010/05/14 15:12:53
-@@ -754,6 +754,7 @@
-
-
- static int str_format (lua_State *L) {
-+ int top = lua_gettop(L);
- int arg = 1;
- size_t sfl;
- const char *strfrmt = luaL_checklstring(L, arg, &sfl);
-@@ -768,7 +769,8 @@
- else { /* format item */
- char form[MAX_FORMAT]; /* to store the format (`%...') */
- char buff[MAX_ITEM]; /* to store the formatted item */
-- arg++;
-+ if (++arg > top)
-+ luaL_argerror(L, arg, "no value");
- strfrmt = scanformat(L, strfrmt, form);
- switch (*strfrmt++) {
- case 'c': {
-
diff --git a/dev-lang/lua/files/5.1.4/06_all_io_read.upstream.patch
b/dev-lang/lua/files/5.1.4/06_all_io_read.upstream.patch
deleted file mode 100644
index 94634c5..0000000
--- a/dev-lang/lua/files/5.1.4/06_all_io_read.upstream.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- lua-5.1.4.orig/src/liolib.c 2008/01/18 17:47:43 2.73.1.3
-+++ lua-5.1.4/src/liolib.c 2010/05/14 15:29:29
-@@ -276,7 +276,10 @@
- lua_pushnumber(L, d);
- return 1;
- }
-- else return 0; /* read fails */
-+ else {
-+ lua_pushnil(L); /* "result" to be removed */
-+ return 0; /* read fails */
-+ }
- }
-
-
-
diff --git a/dev-lang/lua/files/5.2.0/01_all_memory_hoarding.upstream.patch
b/dev-lang/lua/files/5.2.0/01_all_memory_hoarding.upstream.patch
deleted file mode 100644
index 9fda24a..0000000
--- a/dev-lang/lua/files/5.2.0/01_all_memory_hoarding.upstream.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- lua-5.2.0.orig/src/ldblib.c 2007/12/28 15:32:23 2.25.1.3
-+++ lua-5.2.0/src/ldblib.c 2009/06/15 14:07:34
-@@ -253,14 +253,15 @@
- }
-
-
--#define gethooktable(L) luaL_getsubtable(L, LUA_REGISTRYINDEX, HOOKKEY);
-+#define gethooktable(L) luaL_getsubtable(L, LUA_REGISTRYINDEX, HOOKKEY)
-
-
- static void hookf (lua_State *L, lua_Debug *ar) {
- static const char *const hooknames[] =
- {"call", "return", "line", "count", "tail call"};
- gethooktable(L);
-- lua_rawgetp(L, -1, L);
-+ lua_pushthread(L);
-+ lua_rawget(L, -2);
- if (lua_isfunction(L, -1)) {
- lua_pushstring(L, hooknames[(int)ar->event]);
- if (ar->currentline >= 0)
-@@ -306,10 +307,15 @@
- count = luaL_optint(L, arg+3, 0);
- func = hookf; mask = makemask(smask, count);
- }
-- gethooktable(L);
-+ if (gethooktable(L) == 0) { /* creating hook table? */
-+ lua_pushstring(L, "k");
-+ lua_setfield(L, -2, "__mode"); /** hooktable.__mode = "k" */
-+ lua_pushvalue(L, -1);
-+ lua_setmetatable(L, -2); /* setmetatable(hooktable) = hooktable */
-+ }
-+ lua_pushthread(L1); lua_xmove(L1, L, 1);
- lua_pushvalue(L, arg+1);
-- lua_rawsetp(L, -2, L1); /* set new hook */
-- lua_pop(L, 1); /* remove hook table */
-+ lua_rawset(L, -3); /* set new hook */
- lua_sethook(L1, func, mask, count); /* set hooks */
- return 0;
- }
-@@ -325,7 +331,8 @@
- lua_pushliteral(L, "external hook");
- else {
- gethooktable(L);
-- lua_rawgetp(L, -1, L1); /* get hook */
-+ lua_pushthread(L1); lua_xmove(L1, L, 1);
-+ lua_rawget(L, -2); /* get hook */
- lua_remove(L, -2); /* remove hook table */
- }
- lua_pushstring(L, unmakemask(mask, buff));
diff --git a/dev-lang/lua/files/5.2.0/02_all_hex_number_handling.upstream.patch
b/dev-lang/lua/files/5.2.0/02_all_hex_number_handling.upstream.patch
deleted file mode 100644
index 26519e3..0000000
--- a/dev-lang/lua/files/5.2.0/02_all_hex_number_handling.upstream.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- lua-5.2.0.orig/src/llex.c 2007/12/28 15:32:23 2.25.1.3
-+++ lua-5.2.0/src/llex.c 2009/06/15 14:07:34
-@@ -223,12 +223,19 @@
-
- /* LUA_NUMBER */
- static void read_numeral (LexState *ls, SemInfo *seminfo) {
-+ const char *expo = "Ee";
-+ int first = ls->current;
- lua_assert(lisdigit(ls->current));
-- do {
-- save_and_next(ls);
-- if (check_next(ls, "EePp")) /* exponent part? */
-+ save_and_next(ls);
-+ if (first == '0' && check_next(ls, "Xx")) /* hexadecimal? */
-+ expo = "Pp";
-+ for (;;) {
-+ if (check_next(ls, expo)) /* exponent part? */
- check_next(ls, "+-"); /* optional exponent sign */
-- } while (lislalnum(ls->current) || ls->current == '.');
-+ if (lisxdigit(ls->current) || ls->current == '.')
-+ save_and_next(ls);
-+ else break;
-+ }
- save(ls, '\0');
- buffreplace(ls, '.', ls->decpoint); /* follow locale for decimal point */
- if (!buff2d(ls->buff, &seminfo->r)) /* format error? */
diff --git a/dev-lang/lua/files/configure.in b/dev-lang/lua/files/configure.in
deleted file mode 100644
index e4ba816..0000000
--- a/dev-lang/lua/files/configure.in
+++ /dev/null
@@ -1,5 +0,0 @@
-top_buildir=.
-
-AC_INIT(src/luaconf.h)
-AC_PROG_LIBTOOL
-AC_OUTPUT()
diff --git a/dev-lang/lua/files/lua-5.1-make-no-libtool.patch
b/dev-lang/lua/files/lua-5.1-make-no-libtool.patch
deleted file mode 100644
index 78a43a0..0000000
--- a/dev-lang/lua/files/lua-5.1-make-no-libtool.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff -ru lua-5.1.4.orig/Makefile lua-5.1.4/Makefile
---- lua-5.1.4.orig/Makefile 2008-11-17 14:55:00 +0100
-+++ lua-5.1.4/Makefile 2008-11-17 14:53:40 +0100
-@@ -44,6 +44,8 @@
- TO_BIN= lua luac
- TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp
- TO_LIB= liblua.a
-+TO_SO= liblua.so.$(V)
-+TO_DLL= liblua.so.$(V).dll
- TO_MAN= lua.1 luac.1
-
- # Lua version and release.
-@@ -63,8 +65,13 @@
- cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN)
- cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
- cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB)
-+ cd src && $(INSTALL_EXEC) $(TO_SO) $(INSTALL_LIB)
-+ cd src && $(INSTALL_EXEC) $(TO_DLL) $(INSTALL_LIB)
-+ cd $(INSTALL_LIB) && ln -fs $(TO_SO) liblua.so
- cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)
-
-+gentoo_install: install
-+
- ranlib:
- cd src && cd $(INSTALL_LIB) && $(RANLIB) $(TO_LIB)
-
-diff -ru lua-5.1.4.orig/src/Makefile lua-5.1.4/src/Makefile
---- lua-5.1.4.orig/src/Makefile 2008-11-17 14:55:00 +0100
-+++ lua-5.1.4/src/Makefile 2008-11-17 14:55:18 +0100
-@@ -23,6 +23,7 @@
- PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
-
- LUA_A= liblua.a
-+LUA_SO= liblua.so.$(V)
- CORE_O= lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o
lmem.o \
- lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o \
- lundump.o lvm.o lzio.o
-@@ -36,21 +37,29 @@
- LUAC_O= luac.o print.o
-
- ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O)
--ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
-+ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO)
- ALL_A= $(LUA_A)
-+ALL_SO= $(LUA_SO)
-
- default: $(PLAT)
-
- all: $(ALL_T)
-
-+gentoo_all: all
-+
- o: $(ALL_O)
-
- a: $(ALL_A)
-
-+so: $(ALL_SO)
-+
- $(LUA_A): $(CORE_O) $(LIB_O)
- $(AR) $@ $?
- $(RANLIB) $@
-
-+$(LUA_SO): $(CORE_O) $(LIB_O)
-+ $(CC) -shared -o $@ $? $(LIBS)
-+
- $(LUA_T): $(LUA_O) $(LUA_A)
- $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
-
diff --git a/dev-lang/lua/files/lua-5.1-make-r1.patch
b/dev-lang/lua/files/lua-5.1-make-r1.patch
deleted file mode 100644
index 8eecbdd..0000000
--- a/dev-lang/lua/files/lua-5.1-make-r1.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- lua-5.1.1.orig/Makefile 2006-06-02 12:53:38.000000000 +0200
-+++ lua-5.1.1/Makefile 2006-11-16 02:16:53.000000000 +0100
-@@ -127,3 +127,21 @@
- .PHONY: all $(PLATS) clean test install local none dummy echo pecho lecho
newer
-
- # (end of Makefile)
-+
-+# Use libtool for binary installs, etc.
-+
-+export V
-+export LIBTOOL = libtool --quiet --tag=CC
-+# See libtool manual about how to set this
-+
-+gentoo_clean:
-+ cd src; $(MAKE) $@
-+
-+gentoo_test: gentoo_linux
-+ test/lua.static test/hello.lua
-+
-+gentoo_install:
-+ mkdir -p $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB)
-+ cd src; $(LIBTOOL) --mode=install $(INSTALL_EXEC) lua luac
$(INSTALL_BIN)
-+ cd src; $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
-+ cd src; $(LIBTOOL) --mode=install $(INSTALL_DATA) liblua.la
$(INSTALL_LIB)
---- lua-5.1.1.orig/src/Makefile 2006-03-22 01:41:49.000000000 +0100
-+++ lua-5.1.1/src/Makefile 2006-11-16 02:10:27.000000000 +0100
-@@ -54,1 +54,1 @@
--$(LUA_T): $(LUA_O) $(LUA_A)
-+origin$(LUA_T): $(LUA_O) $(LUA_A)
-@@ -57,1 +57,1 @@
--$(LUAC_T): $(LUAC_O) $(LUA_A)
-+origin$(LUAC_T): $(LUAC_O) $(LUA_A)
-@@ -176,3 +176,33 @@
- ltm.h lzio.h lmem.h lopcodes.h lundump.h
-
- # (end of Makefile)
-+
-+export LIBTOOL = libtool --quiet --tag=CC
-+export LIB_VERSION = 6:1:1
-+
-+# The following rules use libtool for compiling and linking in order to
-+# provide shared library support.
-+
-+LIB_NAME = liblua.la
-+LIB_OBJS = $(CORE_O:.o=.lo) $(LIB_O:.o=.lo)
-+
-+%.lo %.o: %.c
-+ $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
-+
-+$(LIB_NAME): $(LIB_OBJS)
-+ $(LIBTOOL) --mode=link $(CC) -version-info $(LIB_VERSION) \
-+ -rpath $(RPATH) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS)
-+
-+$(LUA_T): $(LUA_O:.o=.lo) $(LIB_NAME)
-+ $(LIBTOOL) --mode=link $(CC) -export-dynamic $(LDFLAGS) -o $@
$(LUA_O:.o=.lo) $(LIB_NAME) $(LUA_LIBS)
-+
-+lua_test: $(LUA_O:.o=.lo) $(LIB_NAME)
-+ $(LIBTOOL) --mode=link $(CC) -static -export-dynamic $(LDFLAGS) -o $@
$(LUA_O:.o=.lo) $(LIB_NAME) $(LUA_LIBS)
-+
-+$(LUAC_T): $(LUAC_O:.o=.lo) $(LIB_NAME)
-+ $(LIBTOOL) --mode=link $(CC) -static $(LDFLAGS) -o $@ $(LUAC_O:.o=.lo)
$(LIB_NAME)
-+
-+gentoo_clean:
-+ $(LIBTOOL) --mode=clean $(RM) $(ALL_O:.o=.lo) $(LIB_NAME) lua luac
-+
-+gentoo_all: $(LIB_NAME) $(LUA_T) lua_test $(LUAC_T)
diff --git a/dev-lang/lua/files/lua-5.1-make-r2.patch
b/dev-lang/lua/files/lua-5.1-make-r2.patch
deleted file mode 100644
index 2905a62..0000000
--- a/dev-lang/lua/files/lua-5.1-make-r2.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-diff -ru lua-5.1.5.orig/Makefile lua-5.1.5/Makefile
---- lua-5.1.5.orig/Makefile 2014-04-15 17:43:34.845435031 +0200
-+++ lua-5.1.5/Makefile 2014-04-15 19:05:08.669304987 +0200
-@@ -11,7 +11,7 @@
- # so take care if INSTALL_TOP is not an absolute path.
- INSTALL_TOP= /usr/local
- INSTALL_BIN= $(INSTALL_TOP)/bin
--INSTALL_INC= $(INSTALL_TOP)/include
-+INSTALL_INC= $(INSTALL_TOP)/include/lua$V
- INSTALL_LIB= $(INSTALL_TOP)/lib
- INSTALL_MAN= $(INSTALL_TOP)/man/man1
- #
-@@ -126,3 +126,21 @@
- .PHONY: all $(PLATS) clean test install local none dummy echo pecho lecho
-
- # (end of Makefile)
-+
-+# Use libtool for binary installs, etc.
-+
-+export V
-+export LIBTOOL = libtool --quiet --tag=CC
-+# See libtool manual about how to set this
-+
-+gentoo_clean:
-+ cd src; $(MAKE) $@
-+
-+gentoo_test: gentoo_linux
-+ test/lua.static test/hello.lua
-+
-+gentoo_install:
-+ mkdir -p $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB)
-+ cd src; $(LIBTOOL) --mode=install $(INSTALL_EXEC) lua$V luac$V
$(INSTALL_BIN)
-+ cd src; $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
-+ cd src; $(LIBTOOL) --mode=install $(INSTALL_DATA) liblua$V.la
$(INSTALL_LIB)
-diff -ru lua-5.1.5.orig/src/Makefile lua-5.1.5/src/Makefile
---- lua-5.1.5.orig/src/Makefile 2014-04-15 17:43:34.844435031 +0200
-+++ lua-5.1.5/src/Makefile 2014-04-15 18:07:21.427397122 +0200
-@@ -29,10 +29,10 @@
- LIB_O= lauxlib.o lbaselib.o ldblib.o liolib.o lmathlib.o loslib.o
ltablib.o \
- lstrlib.o loadlib.o linit.o
-
--LUA_T= lua
-+LUA_T= lua$V
- LUA_O= lua.o
-
--LUAC_T= luac
-+LUAC_T= luac$V
- LUAC_O= luac.o print.o
-
- ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O)
-@@ -51,10 +51,10 @@
- $(AR) $@ $(CORE_O) $(LIB_O) # DLL needs all object files
- $(RANLIB) $@
-
--$(LUA_T): $(LUA_O) $(LUA_A)
-+origin$(LUA_T): $(LUA_O) $(LUA_A)
- $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
-
--$(LUAC_T): $(LUAC_O) $(LUA_A)
-+origin$(LUAC_T): $(LUAC_O) $(LUA_A)
- $(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
-
- clean:
-@@ -180,3 +180,33 @@
- ltm.h lzio.h lmem.h lopcodes.h lundump.h
-
- # (end of Makefile)
-+
-+export LIBTOOL = libtool --tag=CC
-+export LIB_VERSION = 5:1:5
-+
-+# The following rules use libtool for compiling and linking in order to
-+# provide shared library support.
-+
-+LIB_NAME = liblua$V.la
-+LIB_OBJS = $(CORE_O:.o=.lo) $(LIB_O:.o=.lo)
-+
-+%.lo %.o: %.c
-+ $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
-+
-+$(LIB_NAME): $(LIB_OBJS)
-+ $(LIBTOOL) --mode=link $(CC) -version-info 0:0:0 \
-+ -rpath $(RPATH) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS)
-+
-+$(LUA_T): $(LUA_O:.o=.lo) $(LIB_NAME)
-+ $(LIBTOOL) --mode=link $(CC) -export-dynamic $(LDFLAGS) -o $@
$(LUA_O:.o=.lo) $(LIB_NAME) $(LUA_LIBS)
-+
-+lua_test: $(LUA_O:.o=.lo) $(LIB_NAME)
-+ $(LIBTOOL) --mode=link $(CC) -static -export-dynamic $(LDFLAGS) -o $@
$(LUA_O:.o=.lo) $(LIB_NAME) $(LUA_LIBS)
-+
-+$(LUAC_T): $(LUAC_O:.o=.lo) $(LIB_NAME)
-+ $(LIBTOOL) --mode=link $(CC) -static $(LDFLAGS) -o $@ $(LUAC_O:.o=.lo)
$(LIB_NAME)
-+
-+gentoo_clean:
-+ $(LIBTOOL) --mode=clean $(RM) $(ALL_O:.o=.lo) $(LIB_NAME) lua$V luac$V
-+
-+gentoo_all: $(LIB_NAME) $(LUA_T) lua_test $(LUAC_T)
diff --git a/dev-lang/lua/files/lua-5.1-make.patch
b/dev-lang/lua/files/lua-5.1-make.patch
deleted file mode 100644
index 0c88bff..0000000
--- a/dev-lang/lua/files/lua-5.1-make.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- lua-5.1.1.orig/Makefile 2006-06-02 12:53:38.000000000 +0200
-+++ lua-5.1.1/Makefile 2006-11-16 02:16:53.000000000 +0100
-@@ -127,3 +127,22 @@
- .PHONY: all $(PLATS) clean test install local none dummy echo pecho lecho
newer
-
- # (end of Makefile)
-+
-+# Use libtool for binary installs, etc.
-+
-+export V
-+export LIBTOOL = libtool --quiet --tag=CC
-+# See libtool manual about how to set this
-+
-+gentoo_clean:
-+ cd src; $(MAKE) $@
-+
-+gentoo_test: gentoo_linux
-+ test/lua.static test/hello.lua
-+
-+gentoo_install:
-+ mkdir -p $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB)
-+ cd src; $(LIBTOOL) --mode=install $(INSTALL_EXEC) lua luac
$(INSTALL_BIN)
-+ cd src; $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
-+ cd src; $(LIBTOOL) --mode=install $(INSTALL_DATA) liblua.la
$(INSTALL_LIB)
-+ cd src; $(LIBTOOL) --mode=install $(INSTALL_DATA) liblua.a
$(INSTALL_LIB)
---- lua-5.1.1.orig/src/Makefile 2006-03-22 01:41:49.000000000 +0100
-+++ lua-5.1.1/src/Makefile 2006-11-16 02:10:27.000000000 +0100
-@@ -176,3 +176,36 @@
- ltm.h lzio.h lmem.h lopcodes.h lundump.h
-
- # (end of Makefile)
-+
-+export LIBTOOL = libtool --quiet --tag=CC
-+export LIB_VERSION = 6:1:1
-+
-+# The following rules use libtool for compiling and linking in order to
-+# provide shared library support.
-+
-+LIB_NAME = liblua.la
-+LIB_OBJS = $(CORE_O:.o=.lo) $(LIB_O:.o=.lo)
-+
-+%.lo %.o: %.c
-+ $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
-+
-+$(LIB_NAME): $(LIB_OBJS)
-+ $(LIBTOOL) --mode=link $(CC) -version-info $(LIB_VERSION) \
-+ -rpath $(RPATH) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS)
-+
-+$(LIB_NAME:.la=.a): $(LIB_OBJS)
-+ $(LIBTOOL) --mode=link $(CC) -static $(LDFLAGS) -o $(LIB_NAME:.la=.a)
$(LIB_OBJS)
-+
-+$(LUA_T): $(LUA_O) $(LIB_NAME)
-+ $(LIBTOOL) --mode=link $(CC) -Wl,-E $(LDFLAGS) -o $@ $(LUA_O)
$(LUA_LIBS) -llua
-+
-+lua_test: $(LUA_O) $(LIB_NAME)
-+ $(LIBTOOL) --mode=link $(CC) -static -Wl,-E $(LDFLAGS) -o $@ $(LUA_O)
$(LIB_NAME) $(LUA_LIBS)
-+
-+$(LUAC_T): $(LUAC_O) $(LIB_NAME)
-+ $(LIBTOOL) --mode=link $(CC) -static $(LDFLAGS) -o $@ $(LUAC_O)
$(LIB_NAME)
-+
-+gentoo_clean:
-+ $(LIBTOOL) --mode=clean $(RM) $(ALL_O:.o=.lo) $(LIB_NAME) lua luac
-+
-+gentoo_all: $(LIB_NAME) $(LIB_NAME:.la=.a) $(LUA_T) lua_test $(LUAC_T)
diff --git a/dev-lang/lua/files/lua-5.1-make_static-r1.patch
b/dev-lang/lua/files/lua-5.1-make_static-r1.patch
deleted file mode 100644
index e5fdc3a..0000000
--- a/dev-lang/lua/files/lua-5.1-make_static-r1.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru lua-5.1.1.orig/src/Makefile lua-5.1.1/src/Makefile
---- lua-5.1.1.orig/src/Makefile 2006-11-21 07:19:31 +0000
-+++ lua-5.1.1/src/Makefile 2006-11-21 07:19:52 +0000
-@@ -196,7 +196,7 @@
- -rpath $(RPATH) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS)
-
- $(LUA_T): $(LUA_O:.o=.lo) $(LIB_NAME)
-- $(LIBTOOL) --mode=link $(CC) -export-dynamic $(LDFLAGS) -o $@
$(LUA_O:.o=.lo) $(LIB_NAME) $(LUA_LIBS)
-+ $(LIBTOOL) --mode=link $(CC) -static -export-dynamic $(LDFLAGS) -o $@
$(LUA_O:.o=.lo) $(LIB_NAME) $(LUA_LIBS)
-
- $(LUAC_T): $(LUAC_O:.o=.lo) $(LIB_NAME)
- $(LIBTOOL) --mode=link $(CC) -static -o $@ $(LUAC_O:.o=.lo) $(LIB_NAME)
diff --git a/dev-lang/lua/files/lua-5.1-make_static.patch
b/dev-lang/lua/files/lua-5.1-make_static.patch
deleted file mode 100644
index f012568..0000000
--- a/dev-lang/lua/files/lua-5.1-make_static.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru lua-5.1.1.orig/src/Makefile lua-5.1.1/src/Makefile
---- lua-5.1.1.orig/src/Makefile 2006-11-21 07:19:31 +0000
-+++ lua-5.1.1/src/Makefile 2006-11-21 07:19:52 +0000
-@@ -196,7 +196,7 @@
- -rpath $(RPATH) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS)
-
- $(LUA_T): $(LUA_O) $(LIB_NAME)
-- $(LIBTOOL) --mode=link $(CC) -Wl,-E $(LDFLAGS) -o $@ $(LUA_O)
$(LUA_LIBS) -llua
-+ $(LIBTOOL) --mode=link $(CC) -static -Wl,-E $(LDFLAGS) -o $@ $(LUA_O)
$(LIB_NAME) $(LUA_LIBS)
-
- $(LUAC_T): $(LUAC_O) $(LIB_NAME)
- $(LIBTOOL) --mode=link $(CC) -static -o $@ $(LUAC_O) $(LIB_NAME)
diff --git a/dev-lang/lua/files/lua-5.1-module_paths.patch
b/dev-lang/lua/files/lua-5.1-module_paths.patch
deleted file mode 100644
index 29ac4c3..0000000
--- a/dev-lang/lua/files/lua-5.1-module_paths.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## src_luaconf.h.dpatch by John V. Belmonte <jbelmo...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Set Lua's default PATH and CPATH.
-
-@DPATCH@
-diff -urNad trunk~/src/luaconf.h trunk/src/luaconf.h
---- trunk~/src/luaconf.h 2006-02-10 12:44:06.000000000 -0500
-+++ trunk/src/luaconf.h 2006-02-17 21:32:55.000000000 -0500
-@@ -83,13 +83,17 @@
-
- #else
- #define LUA_ROOT "/usr/local/"
-+#define LUA_ROOT2 "/usr/"
- #define LUA_LDIR LUA_ROOT "share/lua/5.1/"
-+#define LUA_LDIR2 LUA_ROOT2 "share/lua/5.1/"
- #define LUA_CDIR LUA_ROOT "lib/lua/5.1/"
-+#define LUA_CDIR2 LUA_ROOT2 "lib/lua/5.1/"
- #define LUA_PATH_DEFAULT \
- "./?.lua;" LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua;" \
-- LUA_CDIR"?.lua;" LUA_CDIR"?/init.lua"
-+ LUA_CDIR"?.lua;" LUA_CDIR"?/init.lua;" \
-+ LUA_LDIR2"?.lua;" LUA_LDIR2"?/init.lua"
- #define LUA_CPATH_DEFAULT \
-- "./?.so;" LUA_CDIR"?.so;" LUA_CDIR"loadall.so"
-+ "./?.so;" LUA_CDIR"?.so;" LUA_CDIR2"?.so;" LUA_CDIR"loadall.so"
- #endif
-
-
diff --git a/dev-lang/lua/files/lua-5.1-readline.patch
b/dev-lang/lua/files/lua-5.1-readline.patch
deleted file mode 100644
index f144861..0000000
--- a/dev-lang/lua/files/lua-5.1-readline.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- lua-5.1.1.orig/src/luaconf.h 2006-04-10 20:27:23.000000000 +0200
-+++ lua-5.1.1/src/luaconf.h 2006-11-15 14:53:07.000000000 +0100
-@@ -36,7 +36,6 @@
- #if defined(LUA_USE_LINUX)
- #define LUA_USE_POSIX
- #define LUA_USE_DLOPEN /* needs an extra library: -ldl */
--#define LUA_USE_READLINE /* needs some extra libraries */
- #endif
-
- #if defined(LUA_USE_MACOSX)
diff --git a/dev-lang/lua/files/lua-5.1.3-deprecated.patch
b/dev-lang/lua/files/lua-5.1.3-deprecated.patch
deleted file mode 100644
index a88a991..0000000
--- a/dev-lang/lua/files/lua-5.1.3-deprecated.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -rdu lua-5.1.3.orig/src/luaconf.h lua-5.1.3/src/luaconf.h
---- lua-5.1.3.orig/src/luaconf.h 2008-02-12 17:00:03.000000000 +0000
-+++ lua-5.1.3/src/luaconf.h 2008-02-12 17:07:55.000000000 +0000
-@@ -340,14 +340,14 @@
- ** CHANGE it to undefined as soon as your programs use only '...' to
- ** access vararg parameters (instead of the old 'arg' table).
- */
--#define LUA_COMPAT_VARARG
-+#undef LUA_COMPAT_VARARG
-
- /*
- @@ LUA_COMPAT_MOD controls compatibility with old math.mod function.
- ** CHANGE it to undefined as soon as your programs use 'math.fmod' or
- ** the new '%' operator instead of 'math.mod'.
- */
--#define LUA_COMPAT_MOD
-+#undef LUA_COMPAT_MOD
-
- /*
- @@ LUA_COMPAT_LSTR controls compatibility with old long string nesting
-@@ -355,14 +355,14 @@
- ** CHANGE it to 2 if you want the old behaviour, or undefine it to turn
- ** off the advisory error when nesting [[...]].
- */
--#define LUA_COMPAT_LSTR 1
-+#undef LUA_COMPAT_LSTR
-
- /*
- @@ LUA_COMPAT_GFIND controls compatibility with old 'string.gfind' name.
- ** CHANGE it to undefined as soon as you rename 'string.gfind' to
- ** 'string.gmatch'.
- */
--#define LUA_COMPAT_GFIND
-+#undef LUA_COMPAT_GFIND
-
- /*
- @@ LUA_COMPAT_OPENLIB controls compatibility with old 'luaL_openlib'
-@@ -370,7 +370,7 @@
- ** CHANGE it to undefined as soon as you replace to 'luaL_register'
- ** your uses of 'luaL_openlib'
- */
--#define LUA_COMPAT_OPENLIB
-+#undef LUA_COMPAT_OPENLIB
-
-
-
diff --git a/dev-lang/lua/files/lua-5.1.3-test.patch
b/dev-lang/lua/files/lua-5.1.3-test.patch
deleted file mode 100644
index 99b4ad6..0000000
--- a/dev-lang/lua/files/lua-5.1.3-test.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- test/sieve.lua~ 2002-10-31 03:52:58.000000000 +0100
-+++ test/sieve.lua 2008-02-20 17:44:22.468281121 +0100
-@@ -14,7 +14,7 @@
- while 1 do
- local n = g()
- if n == nil then return end
-- if math.mod(n, p) ~= 0 then coroutine.yield(n) end
-+ if math.fmod(n, p) ~= 0 then coroutine.yield(n) end
- end
- end)
- end
diff --git a/dev-lang/lua/files/lua-5.1.4-deprecated.patch
b/dev-lang/lua/files/lua-5.1.4-deprecated.patch
deleted file mode 100644
index a88a991..0000000
--- a/dev-lang/lua/files/lua-5.1.4-deprecated.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -rdu lua-5.1.3.orig/src/luaconf.h lua-5.1.3/src/luaconf.h
---- lua-5.1.3.orig/src/luaconf.h 2008-02-12 17:00:03.000000000 +0000
-+++ lua-5.1.3/src/luaconf.h 2008-02-12 17:07:55.000000000 +0000
-@@ -340,14 +340,14 @@
- ** CHANGE it to undefined as soon as your programs use only '...' to
- ** access vararg parameters (instead of the old 'arg' table).
- */
--#define LUA_COMPAT_VARARG
-+#undef LUA_COMPAT_VARARG
-
- /*
- @@ LUA_COMPAT_MOD controls compatibility with old math.mod function.
- ** CHANGE it to undefined as soon as your programs use 'math.fmod' or
- ** the new '%' operator instead of 'math.mod'.
- */
--#define LUA_COMPAT_MOD
-+#undef LUA_COMPAT_MOD
-
- /*
- @@ LUA_COMPAT_LSTR controls compatibility with old long string nesting
-@@ -355,14 +355,14 @@
- ** CHANGE it to 2 if you want the old behaviour, or undefine it to turn
- ** off the advisory error when nesting [[...]].
- */
--#define LUA_COMPAT_LSTR 1
-+#undef LUA_COMPAT_LSTR
-
- /*
- @@ LUA_COMPAT_GFIND controls compatibility with old 'string.gfind' name.
- ** CHANGE it to undefined as soon as you rename 'string.gfind' to
- ** 'string.gmatch'.
- */
--#define LUA_COMPAT_GFIND
-+#undef LUA_COMPAT_GFIND
-
- /*
- @@ LUA_COMPAT_OPENLIB controls compatibility with old 'luaL_openlib'
-@@ -370,7 +370,7 @@
- ** CHANGE it to undefined as soon as you replace to 'luaL_register'
- ** your uses of 'luaL_openlib'
- */
--#define LUA_COMPAT_OPENLIB
-+#undef LUA_COMPAT_OPENLIB
-
-
-
diff --git a/dev-lang/lua/files/lua-5.1.4-test.patch
b/dev-lang/lua/files/lua-5.1.4-test.patch
deleted file mode 100644
index 99b4ad6..0000000
--- a/dev-lang/lua/files/lua-5.1.4-test.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- test/sieve.lua~ 2002-10-31 03:52:58.000000000 +0100
-+++ test/sieve.lua 2008-02-20 17:44:22.468281121 +0100
-@@ -14,7 +14,7 @@
- while 1 do
- local n = g()
- if n == nil then return end
-- if math.mod(n, p) ~= 0 then coroutine.yield(n) end
-+ if math.fmod(n, p) ~= 0 then coroutine.yield(n) end
- end
- end)
- end
diff --git a/dev-lang/lua/files/lua-5.2-make-r1.patch
b/dev-lang/lua/files/lua-5.2-make-r1.patch
deleted file mode 100644
index a0624af..0000000
--- a/dev-lang/lua/files/lua-5.2-make-r1.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- lua-5.1.1.orig/Makefile 2006-06-02 12:53:38.000000000 +0200
-+++ lua-5.1.1/Makefile 2006-11-16 02:16:53.000000000 +0100
-@@ -11,7 +11,7 @@
- # so take care if INSTALL_TOP is not an absolute path.
- INSTALL_TOP= /usr/local
- INSTALL_BIN= $(INSTALL_TOP)/bin
--INSTALL_INC= $(INSTALL_TOP)/include
-+INSTALL_INC= $(INSTALL_TOP)/include/lua$V
- INSTALL_LIB= $(INSTALL_TOP)/lib
- INSTALL_MAN= $(INSTALL_TOP)/man/man1
- #
-@@ -127,3 +127,18 @@
- .PHONY: all $(PLATS) clean install local none dummy echo pecho lecho newer
-
- # (end of Makefile)
-+
-+# Use libtool for binary installs, etc.
-+
-+export V
-+export LIBTOOL = $(EROOT)usr/bin/libtool --quiet --tag=CC
-+# See libtool manual about how to set this
-+
-+gentoo_clean:
-+ cd src; $(MAKE) $@
-+
-+gentoo_install:
-+ mkdir -p $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB)
-+ cd src; $(LIBTOOL) --mode=install $(INSTALL_EXEC) lua$V luac$V
$(INSTALL_BIN)
-+ cd src; $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
-+ cd src; $(LIBTOOL) --mode=install $(INSTALL_DATA) liblua$V.la
$(INSTALL_LIB)
---- lua-5.1.1.orig/src/Makefile 2006-03-22 01:41:49.000000000 +0100
-+++ lua-5.1.1/src/Makefile 2006-11-16 02:10:27.000000000 +0100
-@@ -39,1 +39,1 @@
--LUA_T= lua
-+LUA_T= lua$V
-@@ -42,1 +42,1 @@
--LUAC_T= luac
-+LUAC_T= luac$V
-@@ -54,1 +54,1 @@
--$(LUA_T): $(LUA_O) $(LUA_A)
-+origin$(LUA_T): $(LUA_O) $(LUA_A)
-@@ -57,1 +57,1 @@
--$(LUAC_T): $(LUAC_O) $(LUA_A)
-+origin$(LUAC_T): $(LUAC_O) $(LUA_A)
-@@ -185,3 +185,30 @@
- lzio.o: lzio.c lua.h luaconf.h llimits.h lmem.h lstate.h lobject.h ltm.h \
- lzio.h
-
-+
-+export LIBTOOL = $(EROOT)usr/bin/libtool --quiet --tag=CC
-+export LIB_VERSION = 6:1:1
-+
-+# The following rules use libtool for compiling and linking in order to
-+# provide shared library support.
-+
-+LIB_NAME = liblua$V.la
-+LIB_OBJS = $(CORE_O:.o=.lo) $(LIB_O:.o=.lo)
-+
-+%.lo %.o: %.c
-+ $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
-+
-+$(LIB_NAME): $(LIB_OBJS)
-+ $(LIBTOOL) --mode=link $(CC) -version-info $(LIB_VERSION) \
-+ -rpath $(RPATH) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS)
-+
-+$(LUA_T): $(LUA_O:.o=.lo) $(LIB_NAME)
-+ $(LIBTOOL) --mode=link $(CC) -export-dynamic $(LDFLAGS) -o $@
$(LUA_O:.o=.lo) $(LIB_NAME) $(LUA_LIBS)
-+
-+$(LUAC_T): $(LUAC_O:.o=.lo) $(LIB_NAME)
-+ $(LIBTOOL) --mode=link $(CC) -static $(LDFLAGS) -o $@ $(LUAC_O:.o=.lo)
$(LIB_NAME)
-+
-+gentoo_clean:
-+ $(LIBTOOL) --mode=clean $(RM) $(ALL_O:.o=.lo) $(LIB_NAME) lua$V luac$V
-+
-+gentoo_all: $(LIB_NAME) $(LUA_T) $(LUAC_T)
diff --git a/dev-lang/lua/files/lua-5.2-make.patch
b/dev-lang/lua/files/lua-5.2-make.patch
deleted file mode 100644
index 431bbde..0000000
--- a/dev-lang/lua/files/lua-5.2-make.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- lua-5.1.1.orig/Makefile 2006-06-02 12:53:38.000000000 +0200
-+++ lua-5.1.1/Makefile 2006-11-16 02:16:53.000000000 +0100
-@@ -127,3 +127,18 @@
- .PHONY: all $(PLATS) clean install local none dummy echo pecho lecho newer
-
- # (end of Makefile)
-+
-+# Use libtool for binary installs, etc.
-+
-+export V
-+export LIBTOOL = ../libtool --quiet --tag=CC
-+# See libtool manual about how to set this
-+
-+gentoo_clean:
-+ cd src; $(MAKE) $@
-+
-+gentoo_install:
-+ mkdir -p $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB)
-+ cd src; $(LIBTOOL) --mode=install $(INSTALL_EXEC) lua luac
$(INSTALL_BIN)
-+ cd src; $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
-+ cd src; $(LIBTOOL) --mode=install $(INSTALL_DATA) liblua.la
$(INSTALL_LIB)
---- lua-5.1.1.orig/src/Makefile 2006-03-22 01:41:49.000000000 +0100
-+++ lua-5.1.1/src/Makefile 2006-11-16 02:10:27.000000000 +0100
-@@ -54,1 +54,1 @@
--$(LUA_T): $(LUA_O) $(LUA_A)
-+origin$(LUA_T): $(LUA_O) $(LUA_A)
-@@ -57,1 +57,1 @@
--$(LUAC_T): $(LUAC_O) $(LUA_A)
-+origin$(LUAC_T): $(LUAC_O) $(LUA_A)
-@@ -185,3 +185,30 @@
- lzio.o: lzio.c lua.h luaconf.h llimits.h lmem.h lstate.h lobject.h ltm.h \
- lzio.h
-
-+
-+export LIBTOOL = ../libtool --quiet --tag=CC
-+export LIB_VERSION = 6:1:1
-+
-+# The following rules use libtool for compiling and linking in order to
-+# provide shared library support.
-+
-+LIB_NAME = liblua.la
-+LIB_OBJS = $(CORE_O:.o=.lo) $(LIB_O:.o=.lo)
-+
-+%.lo %.o: %.c
-+ $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
-+
-+$(LIB_NAME): $(LIB_OBJS)
-+ $(LIBTOOL) --mode=link $(CC) -version-info $(LIB_VERSION) \
-+ -rpath $(RPATH) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS)
-+
-+$(LUA_T): $(LUA_O:.o=.lo) $(LIB_NAME)
-+ $(LIBTOOL) --mode=link $(CC) -export-dynamic $(LDFLAGS) -o $@
$(LUA_O:.o=.lo) $(LIB_NAME) $(LUA_LIBS)
-+
-+$(LUAC_T): $(LUAC_O:.o=.lo) $(LIB_NAME)
-+ $(LIBTOOL) --mode=link $(CC) -static $(LDFLAGS) -o $@ $(LUAC_O:.o=.lo)
$(LIB_NAME)
-+
-+gentoo_clean:
-+ $(LIBTOOL) --mode=clean $(RM) $(ALL_O:.o=.lo) $(LIB_NAME) lua luac
-+
-+gentoo_all: $(LIB_NAME) $(LUA_T) $(LUAC_T)
diff --git a/dev-lang/lua/files/lua.pc b/dev-lang/lua/files/lua.pc
deleted file mode 100644
index e539718..0000000
--- a/dev-lang/lua/files/lua.pc
+++ /dev/null
@@ -1,31 +0,0 @@
-# lua.pc -- pkg-config data for Lua
-
-# vars from install Makefile
-
-# grep '^V=' ../Makefile
-V= 5.1
-# grep '^R=' ../Makefile
-R= 5.1.4
-
-# grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/'
-prefix= /usr
-INSTALL_BIN= ${prefix}/bin
-INSTALL_INC= ${prefix}/include
-INSTALL_LIB= ${prefix}/,lib,
-INSTALL_MAN= ${prefix}/man/man1
-INSTALL_LMOD= ${prefix}/share/lua/${V}
-INSTALL_CMOD= ${prefix}/,lib,/lua/${V}
-
-# canonical vars
-exec_prefix=${prefix}
-libdir=${exec_prefix}/,lib,
-includedir=${prefix}/include
-
-Name: Lua
-Description: An Extensible Extension Language
-Version: ${R}
-Requires:
-Libs: -L${libdir} -llua -lm
-Cflags: -I${includedir}
-
-# (end of lua.pc)
diff --git a/dev-lang/lua/lua-5.1.4-r8.ebuild b/dev-lang/lua/lua-5.1.4-r8.ebuild
deleted file mode 100644
index 20e21f1..0000000
--- a/dev-lang/lua/lua-5.1.4-r8.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.1.4-r8.ebuild,v 1.9
2012/09/09 14:58:48 armin76 Exp $
-
-EAPI=4
-
-inherit eutils multilib portability toolchain-funcs versionator
-
-DESCRIPTION="A powerful light-weight programming language designed for
extending applications"
-HOMEPAGE="http://www.lua.org/";
-SRC_URI="http://www.lua.org/ftp/${P}.tar.gz";
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~ppc-aix ~x64-freebsd ~ia64-hpux ~x86-interix ~amd64-linux
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="+deprecated emacs readline static"
-
-RDEPEND="readline? ( sys-libs/readline )"
-DEPEND="${RDEPEND}
- sys-devel/libtool"
-PDEPEND="emacs? ( app-emacs/lua-mode )"
-
-src_prepare() {
- local PATCH_PV=$(get_version_component_range 1-2)
-
- epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r1.patch
- epatch "${FILESDIR}"/${PN}-${PATCH_PV}-module_paths.patch
-
- # use glibtool on Darwin (versus Apple libtool)
- if [[ ${CHOST} == *-darwin* ]] ; then
- sed -i -e '/LIBTOOL = /s:libtool:glibtool:' \
- Makefile src/Makefile || die
- fi
-
- EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch
-
- # correct lua versioning
- sed -i -e 's/\(LIB_VERSION = \)6:1:1/\16:4:1/' src/Makefile
-
- sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html
-
- if ! use deprecated ; then
- epatch "${FILESDIR}"/${P}-deprecated.patch
- epatch "${FILESDIR}"/${P}-test.patch
- fi
-
- if ! use readline ; then
- epatch "${FILESDIR}"/${PN}-${PATCH_PV}-readline.patch
- fi
-
- # Using dynamic linked lua is not recommended for performance
- # reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
- # Mainly, this is of concern if your arch is poor with GPRs, like x86
- # Note that this only affects the interpreter binary (named lua), not
the lua
- # compiler (built statically) nor the lua libraries (both shared and
static
- # are installed)
- if use static ; then
- epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make_static-r1.patch
- fi
-
- # We want packages to find our things...
- sed -i \
- -e "s:/usr/local:${EPREFIX}/usr:" \
- -e "s:/\<lib\>:/$(get_libdir):g" \
- etc/lua.pc src/luaconf.h || die
-}
-
-# no need for a configure phase
-src_configure() { true; }
-
-src_compile() {
- tc-export CC
- myflags=
- # what to link to liblua
- liblibs="-lm"
- liblibs="${liblibs} $(dlopen_lib)"
-
- # what to link to the executables
- mylibs=
- if use readline; then
- mylibs="-lreadline"
- fi
-
- cd src
- emake CC="${CC}" CFLAGS="-DLUA_USE_LINUX ${CFLAGS}" \
- RPATH="${EPREFIX}/usr/$(get_libdir)/" \
- LUA_LIBS="${mylibs}" \
- LIB_LIBS="${liblibs}" \
- V=${PV} \
- gentoo_all || die "emake failed"
-
- mv lua_test ../test/lua.static
-}
-
-src_install() {
- emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
- V=${PV} gentoo_install \
- || die "emake install gentoo_install failed"
-
- dodoc HISTORY README
- dohtml doc/*.html doc/*.png doc/*.css doc/*.gif
-
- doicon etc/lua.ico
- insinto /usr/$(get_libdir)/pkgconfig
- doins etc/lua.pc
-
- doman doc/lua.1 doc/luac.1
-}
-
-src_test() {
- local positive="bisect cf echo env factorial fib fibfor hello printf
sieve
- sort trace-calls trace-globals"
- local negative="readonly"
- local test
-
- cd "${S}"
- for test in ${positive}; do
- test/lua.static test/${test}.lua || die "test $test failed"
- done
-
- for test in ${negative}; do
- test/lua.static test/${test}.lua && die "test $test failed"
- done
-}
diff --git a/dev-lang/lua/lua-5.1.5-r100.ebuild
b/dev-lang/lua/lua-5.1.5-r100.ebuild
deleted file mode 100644
index 5d38d4b..0000000
--- a/dev-lang/lua/lua-5.1.5-r100.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils multilib multilib-minimal portability toolchain-funcs
versionator
-
-DESCRIPTION="A powerful light-weight programming language designed for
extending applications"
-HOMEPAGE="http://www.lua.org/";
-SRC_URI="http://www.lua.org/ftp/${P}.tar.gz";
-
-LICENSE="MIT"
-SLOT="5.1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE="+deprecated emacs readline static"
-
-RDEPEND="readline? ( >=sys-libs/readline-6.2_p5-r1[${MULTILIB_USEDEP}] )
- app-eselect/eselect-lua
- !dev-lang/lua:0"
-DEPEND="${RDEPEND}
- sys-devel/libtool"
-PDEPEND="emacs? ( app-emacs/lua-mode )"
-
-SAN_SLOT="${SLOT//.}"
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/lua${SLOT}/luaconf.h
-)
-
-src_prepare() {
- local PATCH_PV=$(get_version_component_range 1-2)
-
- epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r2.patch
- epatch "${FILESDIR}"/${PN}-${PATCH_PV}-module_paths.patch
-
- # use glibtool on Darwin (versus Apple libtool)
- if [[ ${CHOST} == *-darwin* ]] ; then
- sed -i -e '/LIBTOOL = /s:libtool:glibtool:' \
- Makefile src/Makefile || die
- fi
-
- #EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch
-
- # correct lua versioning
- sed -i -e 's/\(LIB_VERSION = \)6:1:1/\16:5:1/' src/Makefile
-
- sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html
-
- if ! use deprecated ; then
- # patches from 5.1.4 still apply
- epatch "${FILESDIR}"/${PN}-5.1.4-deprecated.patch
- epatch "${FILESDIR}"/${PN}-5.1.4-test.patch
- fi
-
- if ! use readline ; then
- epatch "${FILESDIR}"/${PN}-${PATCH_PV}-readline.patch
- fi
-
- # Using dynamic linked lua is not recommended for performance
- # reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
- # Mainly, this is of concern if your arch is poor with GPRs, like x86
- # Note that this only affects the interpreter binary (named lua), not
the lua
- # compiler (built statically) nor the lua libraries (both shared and
static
- # are installed)
- if use static ; then
- epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make_static-r1.patch
- fi
-
- # custom Makefiles
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- # We want packages to find our things...
- sed -i \
- -e 's:/usr/local:'${EPREFIX}'/usr:' \
- -e "s:\([/\"]\)\<lib\>:\1$(get_libdir):g" \
- etc/lua.pc src/luaconf.h || die
-}
-
-multilib_src_compile() {
- tc-export CC
- myflags=
- # what to link to liblua
- liblibs="-lm"
- liblibs="${liblibs} $(dlopen_lib)"
-
- # what to link to the executables
- mylibs=
- if use readline; then
- mylibs="-lreadline"
- fi
-
- cd src
- emake CC="${CC}" CFLAGS="-DLUA_USE_LINUX ${CFLAGS}" \
- RPATH="${EPREFIX}/usr/$(get_libdir)/" \
- LUA_LIBS="${mylibs}" \
- LIB_LIBS="${liblibs}" \
- V=$(get_version_component_range 1-2) \
- gentoo_all
-
- mv lua_test ../test/lua.static
-}
-
-multilib_src_install() {
- emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
- V=${SLOT} gentoo_install
-
- insinto /usr/$(get_libdir)/pkgconfig
- newins etc/lua.pc lua${SLOT}.pc
-}
-
-multilib_src_install_all() {
- dodoc HISTORY README
- dohtml doc/*.html doc/*.png doc/*.css doc/*.gif
-
- doicon etc/lua.ico
-
- newman doc/lua.1 lua${SLOT}.1
- newman doc/luac.1 luac${SLOT}.1
-}
-
-multilib_src_test() {
- local positive="bisect cf echo env factorial fib fibfor hello printf
sieve
- sort trace-calls trace-globals"
- local negative="readonly"
- local test
-
- cd "${BUILD_DIR}" || die
- for test in ${positive}; do
- test/lua.static test/${test}.lua || die "test $test failed"
- done
-
- for test in ${negative}; do
- test/lua.static test/${test}.lua && die "test $test failed"
- done
-}
diff --git a/dev-lang/lua/lua-5.1.5-r3.ebuild b/dev-lang/lua/lua-5.1.5-r3.ebuild
deleted file mode 100644
index ba4ce44..0000000
--- a/dev-lang/lua/lua-5.1.5-r3.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils multilib multilib-minimal portability toolchain-funcs
versionator
-
-DESCRIPTION="A powerful light-weight programming language designed for
extending applications"
-HOMEPAGE="http://www.lua.org/";
-SRC_URI="http://www.lua.org/ftp/${P}.tar.gz";
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~ppc-aix ~x64-freebsd ~ia64-hpux ~x86-interix ~amd64-linux
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="+deprecated emacs readline static"
-
-RDEPEND="readline? ( >=sys-libs/readline-6.2_p5-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- sys-devel/libtool"
-PDEPEND="emacs? ( app-emacs/lua-mode )"
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/luaconf.h
-)
-
-src_prepare() {
- local PATCH_PV=$(get_version_component_range 1-2)
-
- epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r1.patch
- epatch "${FILESDIR}"/${PN}-${PATCH_PV}-module_paths.patch
-
- # use glibtool on Darwin (versus Apple libtool)
- if [[ ${CHOST} == *-darwin* ]] ; then
- sed -i -e '/LIBTOOL = /s:libtool:glibtool:' \
- Makefile src/Makefile || die
- fi
-
- #EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch
-
- # correct lua versioning
- sed -i -e 's/\(LIB_VERSION = \)6:1:1/\16:5:1/' src/Makefile || die
-
- sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html || die
-
- if ! use deprecated ; then
- # patches from 5.1.4 still apply
- epatch "${FILESDIR}"/${PN}-5.1.4-deprecated.patch
- epatch "${FILESDIR}"/${PN}-5.1.4-test.patch
- fi
-
- if ! use readline ; then
- epatch "${FILESDIR}"/${PN}-${PATCH_PV}-readline.patch
- fi
-
- # Using dynamic linked lua is not recommended for performance
- # reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
- # Mainly, this is of concern if your arch is poor with GPRs, like x86
- # Note that this only affects the interpreter binary (named lua), not
the lua
- # compiler (built statically) nor the lua libraries (both shared and
static
- # are installed)
- if use static ; then
- epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make_static-r1.patch
- fi
-
- # custom Makefiles
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- # We want packages to find our things...
- sed -i \
- -e 's:/usr/local:'${EPREFIX}'/usr:' \
- -e "s:\([/\"]\)\<lib\>:\1$(get_libdir):g" \
- etc/lua.pc src/luaconf.h || die
-}
-
-multilib_src_compile() {
- tc-export CC
- myflags=
- # what to link to liblua
- liblibs="-lm"
- liblibs="${liblibs} $(dlopen_lib)"
-
- # what to link to the executables
- mylibs=
- if use readline; then
- mylibs="-lreadline"
- fi
-
- cd src
- emake CC="${CC}" CFLAGS="-DLUA_USE_LINUX ${CFLAGS}" \
- RPATH="${EPREFIX}/usr/$(get_libdir)/" \
- LUA_LIBS="${mylibs}" \
- LIB_LIBS="${liblibs}" \
- V=${PV} \
- gentoo_all
-
- mv lua_test ../test/lua.static
-}
-
-multilib_src_install() {
- emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
- V=${PV} gentoo_install
-
- insinto /usr/$(get_libdir)/pkgconfig
- doins etc/lua.pc
-}
-
-multilib_src_install_all() {
- dodoc HISTORY README
- dohtml doc/*.html doc/*.png doc/*.css doc/*.gif
-
- doicon etc/lua.ico
-
- doman doc/lua.1 doc/luac.1
-}
-
-multilib_src_test() {
- local positive="bisect cf echo env factorial fib fibfor hello printf
sieve
- sort trace-calls trace-globals"
- local negative="readonly"
- local test
-
- cd "${BUILD_DIR}" || die
- for test in ${positive}; do
- test/lua.static test/${test}.lua || die "test $test failed"
- done
-
- for test in ${negative}; do
- test/lua.static test/${test}.lua && die "test $test failed"
- done
-}
diff --git a/dev-lang/lua/lua-5.2.3-r1.ebuild b/dev-lang/lua/lua-5.2.3-r1.ebuild
deleted file mode 100644
index d01807c..0000000
--- a/dev-lang/lua/lua-5.2.3-r1.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils autotools multilib multilib-minimal portability toolchain-funcs
versionator
-
-DESCRIPTION="A powerful light-weight programming language designed for
extending applications"
-HOMEPAGE="http://www.lua.org/";
-SRC_URI="http://www.lua.org/ftp/${P}.tar.gz";
-
-LICENSE="MIT"
-SLOT="5.2"
-KEYWORDS="~ppc-aix ~x64-freebsd ~ia64-hpux ~x86-interix ~amd64-linux
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="+deprecated emacs readline static"
-
-RDEPEND="readline? ( sys-libs/readline )
- app-eselect/eselect-lua
- !dev-lang/lua:0"
-DEPEND="${RDEPEND}
- sys-devel/libtool"
-PDEPEND="emacs? ( app-emacs/lua-mode )"
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/lua${SLOT}/luaconf.h
-)
-
-src_prepare() {
- local PATCH_PV=$(get_version_component_range 1-2)
-
- epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r1.patch
-
- # use glibtool on Darwin (versus Apple libtool)
- if [[ ${CHOST} == *-darwin* ]] ; then
- sed -i -e '/LIBTOOL = /s:/libtool:/glibtool:' \
- Makefile src/Makefile || die
- fi
-
- [ -d "${FILESDIR}/${PV}" ] && \
- EPATCH_SOURCE="${FILESDIR}/${PV}"
EPATCH_SUFFIX="upstream.patch" epatch
-
- # correct lua versioning
- sed -i -e 's/\(LIB_VERSION = \)6:1:1/\10:0:0/' src/Makefile || die
-
- sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html || die
-
- if ! use readline ; then
- sed -i -e '/#define LUA_USE_READLINE/d' src/luaconf.h || die
- fi
-
- # Using dynamic linked lua is not recommended for performance
- # reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
- # Mainly, this is of concern if your arch is poor with GPRs, like x86
- # Note that this only affects the interpreter binary (named lua), not
the lua
- # compiler (built statically) nor the lua libraries (both shared and
static
- # are installed)
- if use static ; then
- sed -i -e 's:\(-export-dynamic\):-static \1:' src/Makefile ||
die
- fi
-
- # upstream does not use libtool, but we do (see bug #336167)
- cp "${FILESDIR}/configure.in" "${S}"/ || die
- eautoreconf
-
- # custom Makefiles
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- sed -i \
- -e 's:\(define LUA_ROOT\s*\).*:\1"'${EPREFIX}'/usr/":' \
- -e "s:\(define LUA_CDIR\s*LUA_ROOT \"\)lib:\1$(get_libdir):" \
- src/luaconf.h \
- || die "failed patching luaconf.h"
-
- econf
-}
-
-multilib_src_compile() {
- tc-export CC
-
- # what to link to liblua
- liblibs="-lm"
- liblibs="${liblibs} $(dlopen_lib)"
-
- # what to link to the executables
- mylibs=
- use readline && mylibs="-lreadline"
-
- cd src
-
- local myCFLAGS=""
- use deprecated && myCFLAGS="-DLUA_COMPAT_ALL"
-
- case "${CHOST}" in
- *-mingw*) : ;;
- *) myCFLAGS+=" -DLUA_USE_LINUX" ;;
- esac
-
- emake CC="${CC}" CFLAGS="${myCFLAGS} ${CFLAGS}" \
- SYSLDFLAGS="${LDFLAGS}" \
- RPATH="${EPREFIX}/usr/$(get_libdir)/" \
- LUA_LIBS="${mylibs}" \
- LIB_LIBS="${liblibs}" \
- V=$(get_version_component_range 1-2) \
- gentoo_all
-}
-
-multilib_src_install() {
- emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
- V=${SLOT} gentoo_install
-
- # We want packages to find our things...
- cp "${FILESDIR}/lua.pc" "${WORKDIR}"
- sed -i \
- -e "s:^V=.*:V= ${PATCH_PV}:" \
- -e "s:^R=.*:R= ${PV}:" \
- -e "s:/,lib,:/$(get_libdir):g" \
- "${WORKDIR}/lua.pc"
-
- insinto "/usr/$(get_libdir)/pkgconfig"
- newins "${WORKDIR}/lua.pc" "lua${SLOT}.pc"
-}
-
-multilib_src_install_all() {
- dodoc README
- dohtml doc/*.html doc/*.png doc/*.css doc/*.gif
-
- newman doc/lua.1 lua${SLOT}.1
- newman doc/luac.1 luac${SLOT}.1
-}
-
-# Makefile contains a dummy target that doesn't do tests
-# but causes issues with slotted lua (bug #510360)
-src_test() { :; }
diff --git a/dev-lang/lua/metadata.xml b/dev-lang/lua/metadata.xml
deleted file mode 100644
index cfb994f..0000000
--- a/dev-lang/lua/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-<maintainer>
- <email>m...@gentoo.org</email>
- <name>Matti Bickel</name>
-</maintainer>
-<maintainer>
- <email>rafaelmart...@gentoo.org</email>
- <name>Rafael G. Martins</name>
-</maintainer>
-<use><flag name='deprecated'>make deprecated data structures/routines
available</flag></use>
-</pkgmetadata>
