new revision fixing bug #191333

Package-Manager: portage-2.1.3.9

4 files changed, 129 insertions, 9 deletions

diff --git a/dev-lang/lua/ChangeLog b/dev-lang/lua/ChangeLog
index d10d6bf94fbb..e55dc3a8f41f 100644
--- a/dev-lang/lua/ChangeLog
+++ b/dev-lang/lua/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/lua
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.84 2007/04/24 11:20:19 eroyf Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.85 2007/09/18 08:14:28 mabi Exp $
+
+*lua-5.1.2-r2 (18 Sep 2007)
+
+  18 Sep 2007; Matti Bickel <mabi@gentoo.org> +lua-5.1.2-r2.ebuild:
+  new revision fixing bug #191333
 
   24 Apr 2007; Alexander Færøy <eroyf@gentoo.org> lua-5.1.1-r2.ebuild:
   Marked ~mips.
diff --git a/dev-lang/lua/Manifest b/dev-lang/lua/Manifest
index de3c237ed7f3..84000d2af843 100644
--- a/dev-lang/lua/Manifest
+++ b/dev-lang/lua/Manifest
@@ -69,14 +69,18 @@ EBUILD lua-5.1.2-r1.ebuild 2782 RMD160 b8cb4fa8f668d4b9fdd275df5944f499cb4e7b60
 MD5 4282c192cc44bbe48460915c248615c1 lua-5.1.2-r1.ebuild 2782
 RMD160 b8cb4fa8f668d4b9fdd275df5944f499cb4e7b60 lua-5.1.2-r1.ebuild 2782
 SHA256 c3745e5651f18926686109e952ba7a9fba411394c7ed5718f8a2fc3d2d135bb4 lua-5.1.2-r1.ebuild 2782
+EBUILD lua-5.1.2-r2.ebuild 2809 RMD160 dca289b38042c909930ffddcb2def9f8f402ca60 SHA1 29d98dc5b65e333cd456670f5c78ac06e9dfd8de SHA256 109eb0f108bf251cfe1a83fa58f34ad907695f6226bf0df9eb47c8ec139d6fd0
+MD5 8ecd8dde824782ca7f56e5ff22475c74 lua-5.1.2-r2.ebuild 2809
+RMD160 dca289b38042c909930ffddcb2def9f8f402ca60 lua-5.1.2-r2.ebuild 2809
+SHA256 109eb0f108bf251cfe1a83fa58f34ad907695f6226bf0df9eb47c8ec139d6fd0 lua-5.1.2-r2.ebuild 2809
 EBUILD lua-5.1.2.ebuild 2677 RMD160 8c85b58da10c11c7cbdb4f96043909fc718ce2fb SHA1 56b81f152a4fb24bb6f229a7538d9b0c50a630dd SHA256 1d03134e5917033806b6bd6f5a53f22d5a5e7919fde3b109651b2ff7d9e523d9
 MD5 2f4c06d1941a5be24c5dcbff502f3d95 lua-5.1.2.ebuild 2677
 RMD160 8c85b58da10c11c7cbdb4f96043909fc718ce2fb lua-5.1.2.ebuild 2677
 SHA256 1d03134e5917033806b6bd6f5a53f22d5a5e7919fde3b109651b2ff7d9e523d9 lua-5.1.2.ebuild 2677
-MISC ChangeLog 11700 RMD160 58ff0f441a575d8521269cd213b4eba58624197f SHA1 99335ae6e97e4346ca9bb3a30be25fb533ad69e7 SHA256 a12bc29dde4a9e248e539f837c896a238939e9aa6365e69da7b74f81df40ec92
-MD5 e245436b7d7f0f9c6b066e02557eb2e4 ChangeLog 11700
-RMD160 58ff0f441a575d8521269cd213b4eba58624197f ChangeLog 11700
-SHA256 a12bc29dde4a9e248e539f837c896a238939e9aa6365e69da7b74f81df40ec92 ChangeLog 11700
+MISC ChangeLog 11831 RMD160 6ae5daea912685f54ff466c93c483bf758263c23 SHA1 405d4b62d5a5c01bdd01d59509fc4c7fff11f2cb SHA256 63b0adf4ec5aeef5b3b34df5c12eb644dd1d4cdd2867fd5c6b5fcde6ee4e9a68
+MD5 f5ec4d5dbac2151253c708d437a79e22 ChangeLog 11831
+RMD160 6ae5daea912685f54ff466c93c483bf758263c23 ChangeLog 11831
+SHA256 63b0adf4ec5aeef5b3b34df5c12eb644dd1d4cdd2867fd5c6b5fcde6ee4e9a68 ChangeLog 11831
 MISC metadata.xml 246 RMD160 d8be15833db0ddabf74171f9e87a2a930ad6bcd2 SHA1 76fdc0af8e2d1dbb1214b95c49f8cd2da3d3832a SHA256 6a089a75a70b3b69d4cae78762fdc69afa25678c5b8692c61245f50bc49ab531
 MD5 ae5edc540c3c3ae7307d2ac4c0e16773 metadata.xml 246
 RMD160 d8be15833db0ddabf74171f9e87a2a930ad6bcd2 metadata.xml 246
@@ -96,10 +100,13 @@ SHA256 9c320952dfd8e2f85aad70564711e3dba88b05d32b6f983b5bc14ae05d026ad0 files/di
 MD5 411ef3a8eed2840f03241c25edbc471f files/digest-lua-5.1.2-r1 229
 RMD160 c622458ea1263dc0c6158b7701668fa6bd71ebcf files/digest-lua-5.1.2-r1 229
 SHA256 9c320952dfd8e2f85aad70564711e3dba88b05d32b6f983b5bc14ae05d026ad0 files/digest-lua-5.1.2-r1 229
+MD5 411ef3a8eed2840f03241c25edbc471f files/digest-lua-5.1.2-r2 229
+RMD160 c622458ea1263dc0c6158b7701668fa6bd71ebcf files/digest-lua-5.1.2-r2 229
+SHA256 9c320952dfd8e2f85aad70564711e3dba88b05d32b6f983b5bc14ae05d026ad0 files/digest-lua-5.1.2-r2 229
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGfwR7p/wUKkr7RBoRAjKVAJoCityAIhRr0exOrJSRvKhnjeMKigCgiLXL
-hlqdMa+jp1SJsAudYlY9a2c=
-=PwLS
+iD8DBQFG74jqfNMcoUhJ7GwRAoyRAJ9koXlGL9xhH8yGeb5PDzljoYLnGQCfUfjD
+EwteqNW2ZQjd8yb61lAnS5Y=
+=QMLH
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/lua/files/digest-lua-5.1.2-r2 b/dev-lang/lua/files/digest-lua-5.1.2-r2
new file mode 100644
index 000000000000..0847c24c6a15
--- /dev/null
+++ b/dev-lang/lua/files/digest-lua-5.1.2-r2
@@ -0,0 +1,3 @@
+MD5 687ce4c2a1ddff18f1008490fdc4e5e0 lua-5.1.2.tar.gz 214134
+RMD160 01350549b3a05838925dae1a666700bb9f1bc01a lua-5.1.2.tar.gz 214134
+SHA256 5cf098c6fe68d3d2d9221904f1017ff0286e4a9cc166a1452a456df9b88b3d9e lua-5.1.2.tar.gz 214134
diff --git a/dev-lang/lua/lua-5.1.2-r2.ebuild b/dev-lang/lua/lua-5.1.2-r2.ebuild
new file mode 100644
index 000000000000..95d7bccfab7e
--- /dev/null
+++ b/dev-lang/lua/lua-5.1.2-r2.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.1.2-r2.ebuild,v 1.1 2007/09/18 08:14:28 mabi Exp $
+
+inherit eutils portability 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 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="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.patch
+	epatch "${FILESDIR}"/${PN}-${PATCH_PV}-module_paths.patch
+
+	# correct lua versioning (bug #173611)
+	sed -i -e 's/\(LIB_VERSION = \)6:1:1/\16:2:1/' src/Makefile
+
+	sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html
+
+	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
+	# Note that the lua compiler is build statically anyway
+	if use static ; then
+		epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make_static.patch
+	fi
+
+	# We want packages to find our things...
+	sed -i -e 's:/usr/local:/usr:' etc/lua.pc
+}
+
+src_compile() {
+	myflags=
+	# what to link to liblua
+	liblibs="-lm"
+	if use ppc-macos; then
+		mycflags="${mycflags} -DLUA_USE_MACOSX"
+	else # building for standard linux (and bsd too)
+		mycflags="${mycflags} -DLUA_USE_LINUX"
+		liblibs="${liblibs} $(dlopen_lib)"
+	fi
+
+	# what to link to the executables
+	mylibs=
+	if use readline; then
+		mylibs="-lreadline"
+	fi
+
+	cd src
+	emake CFLAGS="${mycflags} ${CFLAGS}" \
+			RPATH="/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 &> /dev/null || die "test $test failed"
+	done
+
+	for test in ${negative}; do
+		test/lua.static test/${test}.lua &> /dev/null && die "test $test failed"
+	done
+}