Hopefully fixed linking problems. Bugs 49309 & 59487.

4 files changed, 102 insertions, 10 deletions

diff --git a/dev-lang/lua/ChangeLog b/dev-lang/lua/ChangeLog
index 8b4c3beee318..7ef027ebddee 100644
--- a/dev-lang/lua/ChangeLog
+++ b/dev-lang/lua/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/lua
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.29 2004/07/17 17:12:38 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.30 2004/08/05 20:50:20 twp Exp $
+
+*lua-5.0.2-r1 (05 Aug 2004)
+
+  05 Aug 2004; <twp@gentoo.org> +files/lua-5.0.2-gentoo.patch,
+  +lua-5.0.2-r1.ebuild:
+  Hopefully fixed linking problems. Bugs 49309 & 59487.
 
   17 Jul 2004; Tom Gall <tgall@gentoo.org> lua-5.0.2.ebuild:
   stable on ppc64, bug #55680
diff --git a/dev-lang/lua/Manifest b/dev-lang/lua/Manifest
index a03783a55df0..a231d266925a 100644
--- a/dev-lang/lua/Manifest
+++ b/dev-lang/lua/Manifest
@@ -1,15 +1,18 @@
-MD5 fb8aecf14f47ba23e76bf22fec3b3e5e ChangeLog 3822
-MD5 1387cf4f289b30ae7afe80b98399f326 lua-4.0.1.ebuild 780
-MD5 9d6a3be997fc97525f3da38e15e5140f lua-4.0.ebuild 767
-MD5 236c5955f68d6c5caea58799919c332f lua-5.0.1_beta20031003-r2.ebuild 2293
 MD5 1f73d3490bc467fae16dbe98dc3ba333 lua-5.0.2.ebuild 2125
+MD5 236c5955f68d6c5caea58799919c332f lua-5.0.1_beta20031003-r2.ebuild 2293
+MD5 9d6a3be997fc97525f3da38e15e5140f lua-4.0.ebuild 767
+MD5 1387cf4f289b30ae7afe80b98399f326 lua-4.0.1.ebuild 780
 MD5 cb209aa00eb7088f2f64e70e2e17acd6 lua-5.0.ebuild 1029
+MD5 fb8aecf14f47ba23e76bf22fec3b3e5e ChangeLog 3822
 MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244
-MD5 7bb76903226a11484013e9657e217025 files/digest-lua-4.0 55
+MD5 331acce00d04a2d3cbd1ef7f3cfa6b7a lua-5.0.2-r1.ebuild 2139
+MD5 6365486c1e78a5fc73e34a3bda3feef7 files/lua-4.0-config.patch 840
 MD5 652889fa621a25d6dc41ce0eb76bd5c2 files/digest-lua-4.0.1 61
-MD5 aa4434c9f3a86a28f227df41cb874093 files/digest-lua-5.0 185
-MD5 f38ae8bf37049562a9b36c30d90eea78 files/digest-lua-5.0.1_beta20031003-r2 61
 MD5 7ada6b04da7ea1d6e5128accf7a3c355 files/digest-lua-5.0.2 61
-MD5 6365486c1e78a5fc73e34a3bda3feef7 files/lua-4.0-config.patch 840
-MD5 48a12e850720480ed45115452657c493 files/lua-5.0.1-pic.patch 1306
+MD5 7ada6b04da7ea1d6e5128accf7a3c355 files/digest-lua-5.0.2-r1 61
 MD5 74b0268bdadf862659a5a088cf5f424f files/lua-5.0.2-pic.patch 1243
+MD5 f38ae8bf37049562a9b36c30d90eea78 files/digest-lua-5.0.1_beta20031003-r2 61
+MD5 7bb76903226a11484013e9657e217025 files/digest-lua-4.0 55
+MD5 aa4434c9f3a86a28f227df41cb874093 files/digest-lua-5.0 185
+MD5 48a12e850720480ed45115452657c493 files/lua-5.0.1-pic.patch 1306
+MD5 445ceae2f729b1ac3445162f39e6b591 files/lua-5.0.2-gentoo.patch 2917
diff --git a/dev-lang/lua/files/digest-lua-5.0.2-r1 b/dev-lang/lua/files/digest-lua-5.0.2-r1
new file mode 100644
index 000000000000..519f9921e608
--- /dev/null
+++ b/dev-lang/lua/files/digest-lua-5.0.2-r1
@@ -0,0 +1 @@
+MD5 dea74646b7e5c621fef7174df83c34b1 lua-5.0.2.tar.gz 190442
diff --git a/dev-lang/lua/lua-5.0.2-r1.ebuild b/dev-lang/lua/lua-5.0.2-r1.ebuild
new file mode 100644
index 000000000000..043362a15807
--- /dev/null
+++ b/dev-lang/lua/lua-5.0.2-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.0.2-r1.ebuild,v 1.1 2004/08/05 20:50:20 twp Exp $
+
+inherit eutils
+
+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 -hppa ~mips ~ppc ~sparc ~x86 ~amd64"
+IUSE="readline"
+
+DEPEND=">=sys-apps/sed-4
+	sys-apps/findutils"
+
+src_unpack() {
+	unpack ${A}
+
+	epatch ${FILESDIR}/lua-${PV}-gentoo.patch
+
+	cd ${S}
+
+	sed -i config \
+		-e 's:^#\(LOADLIB= -DUSE_DLOPEN=1\):\1:' \
+		-e 's:^#\(DLLIB= -ldl\):\1:' \
+		-e 's:^#\(MYLDFLAGS= -Wl,-E\):\1:' \
+		-e 's:^#\(POPEN= -DUSE_POPEN=1\)$:\1:' \
+		-e "s:^\(MYCFLAGS= \)-O2:\1${CFLAGS} -fPIC -DPIC:" \
+		-e 's:^\(INSTALL_ROOT= \)/usr/local:\1$(DESTDIR)/usr:' \
+		-e 's:^\(INSTALL_MAN= $(INSTALL_ROOT)\)/man/man1:\1/share/man/man1:'
+
+	sed -i doc/readme.html \
+		-e 's:\(/README\)\("\):\1.gz\2:g'
+
+	if use readline ; then
+		sed -i config \
+			-e "s:^#\(USERCONF=-DLUA_USERCONFIG='\"\$(LUA)/etc/saconfig.c\"' -DUSE_READLINE\):\1:" \
+			-e 's:^#\(EXTRA_LIBS= -lm -ldl -lreadline\) # \(-lhistory -lcurses -lncurses\):\1 \2:'
+	fi
+
+	cat >etc/lua.pc <<EOF
+prefix=/usr
+exec_prefix=\${prefix}
+includedir=\${prefix}/include
+libdir=\${exec_prefix}/lib
+interpreter=\${exec_prefix}/bin/lua
+compiler=\${exec_prefix}/bin/luac
+
+Name: Lua
+Description: An extension programming language
+Version: ${PV}
+Cflags: -I\${includedir}
+Libs: -L\${libdir} -llua -llualib -ldl -lm
+EOF
+}
+
+src_compile() {
+	emake
+}
+
+src_install() {
+	make DESTDIR=${D} install soinstall || die
+
+	dodoc HISTORY UPDATE
+	dohtml doc/*.html doc/*.gif
+	for i in `find . -name README -printf "%h\n"`; do
+		docinto ${i#.}
+		dodoc ${i}/README
+	done
+
+	insinto /usr/share/lua
+	doins etc/compat.lua
+	insinto /etc
+	newins etc/lua.magic magic
+	insinto /usr/share/pixmaps
+	doins etc/lua.xpm
+	insinto /usr/lib/pkgconfig
+	doins etc/lua.pc
+}