add two upstream patches

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

8 files changed, 51 insertions, 351 deletions

diff --git a/dev-lang/lua/ChangeLog b/dev-lang/lua/ChangeLog
index dd54930e01c4..2a8c26c411c0 100644
--- a/dev-lang/lua/ChangeLog
+++ b/dev-lang/lua/ChangeLog
@@ -1,11 +1,19 @@
 # ChangeLog for dev-lang/lua
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.147 2010/04/10 17:00:10 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.148 2010/06/19 17:04:05 mabi Exp $
+
+*lua-5.1.4-r6 (19 Jun 2010)
+
+  19 Jun 2010; Matti Bickel <mabi@gentoo.org>
+  +files/5.1.4/05_all_string_format.upstream.patch, -lua-5.1.4-r1.ebuild,
+  -lua-5.1.4-r3.ebuild, +files/5.1.4/06_all_io_read.upstream.patch,
+  -lua-5.1.4-r2.ebuild, -lua-5.1.4-r5.ebuild, +lua-5.1.4-r6.ebuild:
+  add two upstream patches, remove old ebuilds
 
   10 Apr 2010; Raúl Porcel <armin76@gentoo.org> lua-5.1.4-r4.ebuild:
   ia64/s390/sh stable
 
-  05 Mar 2010; <mabi@gentoo.org> lua-5.1.4-r5.ebuild:
+  05 Mar 2010; Matti Bickel <mabi@gentoo.org> lua-5.1.4-r5.ebuild:
   fix bug #306869
 
 *lua-5.1.4-r5 (23 Feb 2010)
diff --git a/dev-lang/lua/Manifest b/dev-lang/lua/Manifest
index 5ea597191a90..7965c2a357b7 100644
--- a/dev-lang/lua/Manifest
+++ b/dev-lang/lua/Manifest
@@ -14,6 +14,8 @@ AUX 5.1.4/01_all_boolean_expression.upstream.patch 1064 RMD160 7c10f8cf7aa842cdf
 AUX 5.1.4/02_all_table.upstream.patch 643 RMD160 340ccc72f65cf6a82e76b3f641e0dcf5d97d3db0 SHA1 7a91ffb6258e59c1e2a1f150e73a639bc46e3d59 SHA256 e55930ccbfadf384b2b981da3454b0dfd8544ffcb29e10ad07c7404142447b09
 AUX 5.1.4/03_all_debug_getfenv.upstream.patch 232 RMD160 1c3a0bdeff3ab07bcaa185079d19bf90e83de0c5 SHA1 c9d685ab40f5964082927cb245373ca717b2823f SHA256 a6aa45a96ba44f04fd516851fc4188d89ad0c6d2b927d3be9faf84808c4a138d
 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 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
@@ -23,11 +25,8 @@ AUX lua-5.1-readline.patch 360 RMD160 29e6f8193592ec6e551e46f953563113a72d2de2 S
 AUX lua-5.1.4-deprecated.patch 1417 RMD160 c2f51932850ca7deb6a0df41e4fe67764e48608c SHA1 f003694a532f6cb4bb629918d8c2db8c52696723 SHA256 8d4d3c35d9cfb65f6caa360c09d1fa0c5dc1ee0de3389c1e73602fef86cd0e9f
 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-r1.ebuild 3012 RMD160 e1c82ed3d00d328d252d69e3f8cd2cf87be4deba SHA1 e7a456257f6d8da43cc9df3add3b7cf43558d9db SHA256 e8459fb17fa2dace1e7e06ee730638615e25f952bb7f106ac9605502df5596d5
-EBUILD lua-5.1.4-r2.ebuild 3075 RMD160 189a712c32fd3b0f69317dc0228ceaa570f48282 SHA1 a2627e7ae9e801940180d462afd4692ae7740c89 SHA256 df3b33b7b787399fcc038e07d5c007720e1c66744f97c3b7a45eec164575f89c
-EBUILD lua-5.1.4-r3.ebuild 3130 RMD160 c666caa144581f6998eb1db440352c655617635a SHA1 8213f0675c61a2feb84e5d27f372cd490c7f945f SHA256 5bc42367d96709851459856f34a4498110bae768ee7572104f98b07f43254152
 EBUILD lua-5.1.4-r4.ebuild 3122 RMD160 ec20fbc0cc988e90f057c84072405264e94ec545 SHA1 1ac93624e7b4d8c4c8f8347fb3f3b0e9c7b40afa SHA256 5c605fa8f19de0ab1f4a7b45651ac8aee18a1a52d4d03439a28a8b491562cbb9
-EBUILD lua-5.1.4-r5.ebuild 3150 RMD160 ea95d879d133522e230cfeb3d86012932cd67631 SHA1 95fbf16612da3d923b3d2c4b6aae9d2f5ed8a93a SHA256 9959c32671ec754787f54c7365dbdb5364d954e222bafa447624035a7c7798dd
+EBUILD lua-5.1.4-r6.ebuild 3150 RMD160 5443a186574b618a018a3a272d2e739251d465ac SHA1 ef942ea910d8c4cedbebb4cfd7a3532eafd7e38b SHA256 11b0d74484af61f8d5f6b616374262e45da52f40189421a82174ab61eaa42a87
 EBUILD lua-5.1.4.ebuild 2994 RMD160 637f425e9ec4034ede44dee36061693f006bee48 SHA1 f1406a740a642647a106f77f22ffa5a4aec45b93 SHA256 d44847b8f322ef735ce8786cba2af466110e30154583a5479bd6029cc9b119bd
-MISC ChangeLog 21661 RMD160 8ab158dacc9fd8b3372fc4616a75d20040b7b077 SHA1 11245105bd3208af7d182b638c4d29e80c278ab5 SHA256 0b436dfc169450cf702bad581a0bd659191f455a33b967576e981b0389c9db51
+MISC ChangeLog 22004 RMD160 fb1e1c7cacdd407f546ec524d95c5fac50d33b62 SHA1 68b90d00f0d78851c4223438b4d947c4e128f698 SHA256 b85145c28018e982dc775240f738fc46b50fa197f9ed3e71a0ac652ea88da8d3
 MISC metadata.xml 339 RMD160 0d536a77658ffb6d8bccff7183a5bf4722d0a82d SHA1 f5bd1085f69b6e9d81e42cd711a7846ccb267e31 SHA256 6b3bedf093395def984b71f7c74ce59742c5df6592ad50f1b96c8a2499f27c8b
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
new file mode 100644
index 000000000000..5127507df9f6
--- /dev/null
+++ b/dev-lang/lua/files/5.1.4/05_all_string_format.upstream.patch
@@ -0,0 +1,21 @@
+--- 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
new file mode 100644
index 000000000000..94634c591404
--- /dev/null
+++ b/dev-lang/lua/files/5.1.4/06_all_io_read.upstream.patch
@@ -0,0 +1,15 @@
+--- 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/lua-5.1.4-r1.ebuild b/dev-lang/lua/lua-5.1.4-r1.ebuild
deleted file mode 100644
index d47677a7042d..000000000000
--- a/dev-lang/lua/lua-5.1.4-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2009 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-r1.ebuild,v 1.4 2009/03/23 20:45:42 mabi Exp $
-
-EAPI="1"
-
-inherit eutils portability versionator toolchain-funcs
-
-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 readline static"
-
-DEPEND="readline? ( sys-libs/readline )"
-
-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:' 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/*.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-r2.ebuild b/dev-lang/lua/lua-5.1.4-r2.ebuild
deleted file mode 100644
index e1ce3e941df4..000000000000
--- a/dev-lang/lua/lua-5.1.4-r2.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2009 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-r2.ebuild,v 1.2 2009/09/29 08:04:20 ulm Exp $
-
-EAPI="1"
-
-inherit eutils portability versionator toolchain-funcs
-
-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"
-
-DEPEND="readline? ( sys-libs/readline )"
-RDEPEND="${DEPEND}"
-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:' 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/*.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-r3.ebuild b/dev-lang/lua/lua-5.1.4-r3.ebuild
deleted file mode 100644
index 5f72f0d1aa86..000000000000
--- a/dev-lang/lua/lua-5.1.4-r3.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2009 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-r3.ebuild,v 1.1 2009/11/24 17:31:36 jer 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"
-
-DEPEND="readline? ( sys-libs/readline )"
-RDEPEND="${DEPEND}"
-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/lua:$(get_libdir)/lua:" \
-		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/*.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-r5.ebuild b/dev-lang/lua/lua-5.1.4-r6.ebuild
index 4e4020e98e1d..db76e4fb3bb1 100644
--- a/dev-lang/lua/lua-5.1.4-r5.ebuild
+++ b/dev-lang/lua/lua-5.1.4-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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-r5.ebuild,v 1.2 2010/03/05 19:58:21 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.1.4-r6.ebuild,v 1.1 2010/06/19 17:04:05 mabi Exp $
 
 EAPI="1"