patch fixing test by oliver huber (bug #210904)

(Portage version: 2.1.5_rc10)

8 files changed, 33 insertions, 7 deletions

diff --git a/dev-lang/lua/ChangeLog b/dev-lang/lua/ChangeLog
index 6f2bf6ac87b7..010f2404483d 100644
--- a/dev-lang/lua/ChangeLog
+++ b/dev-lang/lua/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for dev-lang/lua
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.99 2008/05/15 11:35:16 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.100 2008/05/16 16:28:31 mabi Exp $
+
+  16 May 2008; Matti Bickel <mabi@gentoo.org>
+  -files/5.1.3/05_validator.upstream.patch,
+  -files/5.1.3/06_c_stack.upstream.patch,
+  +files/5.1.3/06_all_c_stack.upstream.patch,
+  +files/5.1.3/07_all_validator2.upstream.patch,
+  +files/lua-5.1.3-test.patch, +files/5.1.3/05_all_validator.upstream.patch,
+  -files/5.1.3/07_validator2.upstream.patch,
+  +files/5.1.3/08_all_code_injection.upstream.patch,
+  -files/5.1.3/08_code_injection.upstream.patch, lua-5.1.3-r1.ebuild,
+  lua-5.1.3-r2.ebuild:
+  patch fixing test by oliver huber (bug #210904), fix patch naming, so the
+  new patches finally apply
 
 *lua-5.1.3-r2 (15 May 2008)
 
diff --git a/dev-lang/lua/files/5.1.3/05_validator.upstream.patch b/dev-lang/lua/files/5.1.3/05_all_validator.upstream.patch
index 3a32d06eac23..3a32d06eac23 100644
--- a/dev-lang/lua/files/5.1.3/05_validator.upstream.patch
+++ b/dev-lang/lua/files/5.1.3/05_all_validator.upstream.patch
diff --git a/dev-lang/lua/files/5.1.3/06_c_stack.upstream.patch b/dev-lang/lua/files/5.1.3/06_all_c_stack.upstream.patch
index 746acbf58972..746acbf58972 100644
--- a/dev-lang/lua/files/5.1.3/06_c_stack.upstream.patch
+++ b/dev-lang/lua/files/5.1.3/06_all_c_stack.upstream.patch
diff --git a/dev-lang/lua/files/5.1.3/07_validator2.upstream.patch b/dev-lang/lua/files/5.1.3/07_all_validator2.upstream.patch
index 209d9ab30784..209d9ab30784 100644
--- a/dev-lang/lua/files/5.1.3/07_validator2.upstream.patch
+++ b/dev-lang/lua/files/5.1.3/07_all_validator2.upstream.patch
diff --git a/dev-lang/lua/files/5.1.3/08_code_injection.upstream.patch b/dev-lang/lua/files/5.1.3/08_all_code_injection.upstream.patch
index 4d605cdb0c16..4d605cdb0c16 100644
--- a/dev-lang/lua/files/5.1.3/08_code_injection.upstream.patch
+++ b/dev-lang/lua/files/5.1.3/08_all_code_injection.upstream.patch
diff --git a/dev-lang/lua/files/lua-5.1.3-test.patch b/dev-lang/lua/files/lua-5.1.3-test.patch
new file mode 100644
index 000000000000..99b4ad648cc7
--- /dev/null
+++ b/dev-lang/lua/files/lua-5.1.3-test.patch
@@ -0,0 +1,11 @@
+--- 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/lua-5.1.3-r1.ebuild b/dev-lang/lua/lua-5.1.3-r1.ebuild
index 4e6e4226d39e..bb40ae70f902 100644
--- a/dev-lang/lua/lua-5.1.3-r1.ebuild
+++ b/dev-lang/lua/lua-5.1.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.1.3-r1.ebuild,v 1.3 2008/02/18 20:10:31 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.1.3-r1.ebuild,v 1.4 2008/05/16 16:28:31 mabi Exp $
 
 inherit eutils portability versionator
 
@@ -32,6 +32,7 @@ src_unpack() {
 
 	if ! use deprecated ; then
 		epatch "${FILESDIR}"/${P}-deprecated.patch
+		epatch "${FILESDIR}"/${P}-test.patch
 	fi
 
 	if ! use readline ; then
@@ -100,10 +101,10 @@ src_test() {
 
 	cd "${S}"
 	for test in ${positive}; do
-		test/lua.static test/${test}.lua &> /dev/null || die "test $test failed"
+		test/lua.static test/${test}.lua || die "test $test failed"
 	done
 
 	for test in ${negative}; do
-		test/lua.static test/${test}.lua &> /dev/null && die "test $test failed"
+		test/lua.static test/${test}.lua && die "test $test failed"
 	done
 }
diff --git a/dev-lang/lua/lua-5.1.3-r2.ebuild b/dev-lang/lua/lua-5.1.3-r2.ebuild
index 96b96e6aa226..2b388e2735b5 100644
--- a/dev-lang/lua/lua-5.1.3-r2.ebuild
+++ b/dev-lang/lua/lua-5.1.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.1.3-r2.ebuild,v 1.1 2008/05/15 11:35:16 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.1.3-r2.ebuild,v 1.2 2008/05/16 16:28:31 mabi Exp $
 
 inherit eutils portability versionator
 
@@ -32,6 +32,7 @@ src_unpack() {
 
 	if ! use deprecated ; then
 		epatch "${FILESDIR}"/${P}-deprecated.patch
+		epatch "${FILESDIR}"/${P}-test.patch
 	fi
 
 	if ! use readline ; then
@@ -100,10 +101,10 @@ src_test() {
 
 	cd "${S}"
 	for test in ${positive}; do
-		test/lua.static test/${test}.lua &> /dev/null || die "test $test failed"
+		test/lua.static test/${test}.lua || die "test $test failed"
 	done
 
 	for test in ${negative}; do
-		test/lua.static test/${test}.lua &> /dev/null && die "test $test failed"
+		test/lua.static test/${test}.lua && die "test $test failed"
 	done
 }