add three patches (see http://www.lua.org/bugs.html), bump to EAPI4, fix bug #387771

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

7 files changed, 73 insertions, 140 deletions

diff --git a/dev-lang/lua/ChangeLog b/dev-lang/lua/ChangeLog
index fa56e3026fa7..0fe0f6613b91 100644
--- a/dev-lang/lua/ChangeLog
+++ b/dev-lang/lua/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-lang/lua
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.152 2011/09/17 12:09:45 flameeyes Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.153 2012/01/24 21:44:53 mabi Exp $
+
+*lua-5.1.4-r8 (24 Jan 2012)
+
+  24 Jan 2012; Matti Bickel <mabi@gentoo.org>
+  +files/5.1.4/07_all_boolean_expression.upstream.patch,
+  +files/5.1.4/08_all_metatable.upstream.patch,
+  +files/5.1.4/09_all_prototype_collection.upstream.patch, +lua-5.1.4-r8.ebuild,
+  -lua-5.1.4-r6.ebuild, -lua-5.1.4-r7.ebuild:
+  add three patches (see http://www.lua.org/bugs.html), bump to EAPI4, fix bug
+  #387771
 
   17 Sep 2011; Diego E. Pettenò <flameeyes@gentoo.org> lua-5.1.4.ebuild,
   lua-5.1.4-r4.ebuild, lua-5.1.4-r6.ebuild, lua-5.1.4-r7.ebuild:
diff --git a/dev-lang/lua/Manifest b/dev-lang/lua/Manifest
index 277df3ae9080..fccc04260632 100644
--- a/dev-lang/lua/Manifest
+++ b/dev-lang/lua/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 5.1.3/01_all_LUAI_MAXCSTACK.upstream.patch 685 RMD160 5e82432ff598210a1c3bbda5d60c46622fe4254c SHA1 7c40bb5f0aa73f93d4e58ec061fd9b41df63b6f9 SHA256 e99f4e7c481d4ab3b6773f7255e55da3fb6e37f0da51f00db93dd0cd8d10e47a
 AUX 5.1.3/02_all_coroutine.resume.upstream.patch 531 RMD160 1acef8e4257bf1cb96844fc210d3cd9ffab03fd6 SHA1 f70429a1b517c3f9b132b428abacf51a2a02d9e4 SHA256 ede1d6684c29b5710881def9c4edb429434321085c0478db7a1e5faaf4054c5c
 AUX 5.1.3/03_all_lua_checkstack.upstream.patch 668 RMD160 b22b556f656cdd20743821d59f73b0e0f2f42167 SHA1 a13e42918f25f3c595a41a1eac6716e943fad00c SHA256 89c8aa6e4e65f1c7dfd2be7992ce9d6df27ead7dc661bddf94d3049b8bf714df
@@ -19,6 +16,9 @@ AUX 5.1.4/03_all_debug_getfenv.upstream.patch 232 RMD160 1c3a0bdeff3ab07bcaa1850
 AUX 5.1.4/04_all_gc_performance.upstream.patch 414 RMD160 1dacd5f58d96a053cbea3041d1f2f87b134a2232 SHA1 8e735c8a03ad630ea1bde735f6cab2821b0ef690 SHA256 cba9899e1f940b21c1a25f65279004ee64d78a4c48db3501677c106266bc23dd
 AUX 5.1.4/05_all_string_format.upstream.patch 651 RMD160 7175bf68314b73326803b870616fa905d7182575 SHA1 80a62b8912f28e12f1e2d8cd40dfd086ab585beb SHA256 4365eb9f4b5c4831f81e1a98f2252e3cf5522a18794e936057ae521edf9512e9
 AUX 5.1.4/06_all_io_read.upstream.patch 319 RMD160 1ccff488eb6455d82b5f201c11e00376bb039600 SHA1 4007bb1e2a9eeea7de080fee60151c6cedc116a7 SHA256 b363334e16edda78f1fc183f63751d8aef876e327e716468ab3f54c641f72f7c
+AUX 5.1.4/07_all_boolean_expression.upstream.patch 679 RMD160 5fa9592a3bfe34213d7b2447dc6b838d13f5bacf SHA1 827b7a38be81c3bde81761951f37a14e99d7b5ef SHA256 40567e96231919a350ba460abc911d5105edacd630bcacb40ce987c3c9cb666b
+AUX 5.1.4/08_all_metatable.upstream.patch 379 RMD160 f3cc6dcfea36823190acf12b6cd8faa1ed78b7ef SHA1 29ba2e7c30afa831947d4d314cad011635b9f170 SHA256 6ead3599283478a7dec288620beaf58357253154a580a80f93f1b14607a44c7f
+AUX 5.1.4/09_all_prototype_collection.upstream.patch 459 RMD160 eab4367eec92a13e241801120999a18e54446e10 SHA1 87461d7c3df40feb41a786f87437ce81803d74f3 SHA256 643a4a61f8812c274e3a24f5b73a4257cf4185900913deab34a06243b72f9350
 AUX lua-5.1-make-r1.patch 2229 RMD160 9dfd3494f93a673e724e642f10543b80466dd547 SHA1 0896a440ad823c55f0a7a3354a09f4e29bceccf7 SHA256 bf691afd2480a496bfa9b2c46fcbb396e7034ea58e94399788e05ab7872ae46f
 AUX lua-5.1-make.patch 2209 RMD160 03d6ff5c31aa2ea8cb4dec871ae4ba4d711d2240 SHA1 103efb333cef67ab3f521e49bda56f647c633f7a SHA256 3ffa297c79ad7ba378eba3de2b730670e60c7ea28181fcca4e0d0e25612997c4
 AUX lua-5.1-make_static-r1.patch 644 RMD160 fc1d837228066f987c09a7bf7c536de31f25685a SHA1 814a3429fabc12836b4520918df6b04bb68cfcf8 SHA256 077f5da55b9b354b8b901d8a769c92aad104d79ba0a6acee0096c9a5d94b259a
@@ -29,17 +29,7 @@ AUX lua-5.1.4-deprecated.patch 1417 RMD160 c2f51932850ca7deb6a0df41e4fe67764e486
 AUX lua-5.1.4-test.patch 340 RMD160 5ab1fdfaf1c18d26c66096ade8944223c21ce9ca SHA1 9e1fc7b770f2586dd386bea60717962f650a1923 SHA256 cdbb06f6fc5e75512c912360e1efc12e1e62ac7079972ff1c9c9273898bf9e31
 DIST lua-5.1.4.tar.gz 216679 RMD160 c867c8364295d3e4fb4e4d8ebb27fa2b2312cdef SHA1 2b11c8e60306efb7f0734b747588f57995493db7 SHA256 b038e225eaf2a5b57c9bcc35cd13aa8c6c8288ef493d52970c9545074098af3a
 EBUILD lua-5.1.4-r4.ebuild 3145 RMD160 bf486b578561b16a7c148430fa7a8c9c9ef15fef SHA1 947ce75e6f870b40f53b9df630f5b1df1e62e28f SHA256 e7bd80f13d14ab0ce5fd15fd2a8f665d04da2d26ec40b3a11af9f3e7355ff38a
-EBUILD lua-5.1.4-r6.ebuild 3175 RMD160 ba85729258a0a43f8a0933d03202b99a55054f11 SHA1 e56a278a9e4eb6469a7f8032410c774fc09ff867 SHA256 ee725ae0221a80bf7d991e3041adb988b9a544fa90664933d17a57d3c14923fd
-EBUILD lua-5.1.4-r7.ebuild 3228 RMD160 c6af68f69bbe3cfe2486f2bc69bd905b04a89554 SHA1 b1ee8ac5229f7d72a5989dea56ab7abf6fcde388 SHA256 3ac5d6916333cb327489104136eb23fc5aecb2370e6bb5abeac5e3229bd3d5fd
+EBUILD lua-5.1.4-r8.ebuild 3199 RMD160 5f45782eab260d044a43aba2212d0ac7c90d1387 SHA1 60fca10e077f2f549ccafa657875faaa0b55b2e0 SHA256 30f1cf4aa50bc2b2a45783f6b96e9710dc60c89f2c9bc97b6175a79d2ec16fec
 EBUILD lua-5.1.4.ebuild 3038 RMD160 c04ff8ff3cdd501bebfff733913ae7670406ba4c SHA1 94191221181437be684c5b68bccc93455ee9c11c SHA256 11b4b7491872656645e66b343e3f2c2da87b2e5a9bcc90d00228d86267bc9e5f
-MISC ChangeLog 22659 RMD160 6a52b61dcbb2ab51e13b2f50fbe749262e6e7860 SHA1 1583ceb4fc971a960356486fc7cd0164744cc68e SHA256 829dcb7de7282ebe2237234dc1f73fd375dafd3ab6af647d60c70075daa244fa
+MISC ChangeLog 23051 RMD160 7e34a1e673d1f724decf722b58a9070c6ba78859 SHA1 40b648734227b10099a2ce5ca8f3497d45ad37b6 SHA256 79e124a393bacb755805572ba940c71a1cdd045b0c14c362eb63e5f2d1b2e8e8
 MISC metadata.xml 418 RMD160 ff4ea0d01af18280fc00136f8e502fd90f7d8b89 SHA1 25d2a98fa8edbd5bc471dacd60cbe1f3821b3383 SHA256 ecdbace4d7d07830cc308755b909384644dc449cf7a3f32faefeecf6d3752b55
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iJwEAQEIAAYFAk59jUgACgkQfXuS5UK5QB2HHQP+Pmcn3tloxiBgH3YYakxecAjA
-3KBfAM5KevtlYDIjsICI5+z4OhgB+Aqz9U+kjUQ/qJEYDgxeSsirr0CDk4cDJLee
-oDICj7cjKMnSQoOV+vbOjPcCIN1l3R+P9Zvw6dLfx0iMZjB1uCmj9RJ/2s2DY+RT
-ja0WJJIlyoQhgiNnu6U=
-=P0/d
------END PGP SIGNATURE-----
diff --git a/dev-lang/lua/files/5.1.4/07_all_boolean_expression.upstream.patch b/dev-lang/lua/files/5.1.4/07_all_boolean_expression.upstream.patch
new file mode 100644
index 000000000000..956e966817d4
--- /dev/null
+++ b/dev-lang/lua/files/5.1.4/07_all_boolean_expression.upstream.patch
@@ -0,0 +1,30 @@
+--- 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
+@@ -549,13 +549,6 @@
+       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;
+@@ -579,13 +572,6 @@
+       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/08_all_metatable.upstream.patch b/dev-lang/lua/files/5.1.4/08_all_metatable.upstream.patch
new file mode 100644
index 000000000000..b74bafbebe41
--- /dev/null
+++ b/dev-lang/lua/files/5.1.4/08_all_metatable.upstream.patch
@@ -0,0 +1,10 @@
+--- lua-5.1.4.orig/src/lvm.c	2009/07/01 21:10:33	2.63.1.4
++++ lua-5.1.4/src/lvm.c	2011/08/17 20:36:28
+@@ -142,6 +142,7 @@
+       if (!ttisnil(oldval) ||  /* result is no nil? */
+           (tm = fasttm(L, h->metatable, TM_NEWINDEX)) == NULL) { /* or no TM? */
+         setobj2t(L, oldval, val);
++        h->flags = 0;
+         luaC_barriert(L, h, val);
+         return;
+       }
diff --git a/dev-lang/lua/files/5.1.4/09_all_prototype_collection.upstream.patch b/dev-lang/lua/files/5.1.4/09_all_prototype_collection.upstream.patch
new file mode 100644
index 000000000000..000f78ccc7da
--- /dev/null
+++ b/dev-lang/lua/files/5.1.4/09_all_prototype_collection.upstream.patch
@@ -0,0 +1,13 @@
+--- lua-5.1.4.orig/src/lparser.c	2007/12/28 15:32:23	2.42.1.3
++++ lua-5.1.4/src/lparser.c	2011/10/17 13:10:43
+@@ -374,9 +374,9 @@
+   lua_assert(luaG_checkcode(f));
+   lua_assert(fs->bl == NULL);
+   ls->fs = fs->prev;
+-  L->top -= 2;  /* remove table and prototype from the stack */
+   /* last token read was anchored in defunct function; must reanchor it */
+   if (fs) anchor_token(ls);
++  L->top -= 2;  /* remove table and prototype from the stack */
+ }
+ 
+ 
diff --git a/dev-lang/lua/lua-5.1.4-r6.ebuild b/dev-lang/lua/lua-5.1.4-r6.ebuild
deleted file mode 100644
index 50316ff3a423..000000000000
--- a/dev-lang/lua/lua-5.1.4-r6.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2011 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-r6.ebuild,v 1.3 2011/09/17 12:09:45 flameeyes Exp $
-
-EAPI="1"
-
-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="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="+deprecated emacs readline static"
-
-RDEPEND="readline? ( sys-libs/readline )"
-DEPEND="${RDEPEND}
-	sys-devel/libtool"
-PDEPEND="emacs? ( app-emacs/lua-mode )"
-
-src_unpack() {
-	local PATCH_PV=$(get_version_component_range 1-2)
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r1.patch
-	epatch "${FILESDIR}"/${PN}-${PATCH_PV}-module_paths.patch
-
-	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 upstream 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
-	# Not 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:/usr:' \
-		-e "s:/\<lib\>:/$(get_libdir):g" \
-		etc/lua.pc
-}
-
-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="${ROOT}/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="${D}/usr/" INSTALL_LIB="${D}/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
-
-	insinto /usr/share/pixmaps
-	doins 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.4-r7.ebuild b/dev-lang/lua/lua-5.1.4-r8.ebuild
index 516a67b683d6..27b93be0e2ec 100644
--- a/dev-lang/lua/lua-5.1.4-r7.ebuild
+++ b/dev-lang/lua/lua-5.1.4-r8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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-r7.ebuild,v 1.3 2011/09/17 12:09:45 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.1.4-r8.ebuild,v 1.1 2012/01/24 21:44:53 mabi Exp $
 
-EAPI=3
+EAPI=4
 
 inherit eutils multilib portability toolchain-funcs versionator
 
@@ -22,8 +22,6 @@ PDEPEND="emacs? ( app-emacs/lua-mode )"
 
 src_prepare() {
 	local PATCH_PV=$(get_version_component_range 1-2)
-	unpack ${A}
-	cd "${S}"
 
 	epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r1.patch
 	epatch "${FILESDIR}"/${PN}-${PATCH_PV}-module_paths.patch