Bug # 39211

4 files changed, 101 insertions, 6 deletions

diff --git a/dev-lang/lua/ChangeLog b/dev-lang/lua/ChangeLog
index 421452f17bb3..2b75a8eee03d 100644
--- a/dev-lang/lua/ChangeLog
+++ b/dev-lang/lua/ChangeLog
@@ -1,11 +1,15 @@
 # ChangeLog for dev-lang/lua
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.14 2004/01/03 10:22:10 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.15 2004/01/26 14:02:46 twp Exp $
+
+  26 Jan 2004; Tom Payne <twp@gentoo.org> lua-5.0.1_beta20031003-r2.ebuild :
+  New tarball location. Bug # 39211.
 
   03 Jan 2004; Jon Portnoy <avenj@gentoo.org> lua-5.0.1_beta20031003-r1.ebuild :
   AMD64 keywords. Copyright date fixes to make repoman happy.
 
-*lua-5.0.1_beta20031003 (21 Nov 2003)
+  08 Jan 2003; Tom Payne <twp@gentoo.org> lua-5.0.1_beta20031003.ebuild-r2 :
+  Added compiler and interpreter variables to lua.pc.
 
   21 Dec 2003; Tom Payne <twp@gentoo.org> lua-5.0.1_beta20031003-r1.ebuild, metadata.xml :
   Install all READMEs. Use dl and readline. Install various bits from etc/.
@@ -15,6 +19,8 @@
   files/lua-5.0.1-pic.patch :
   Added a pic patch to use -fPIC flag correctly. This fix hppa compilation.
 
+*lua-5.0.1_beta20031003 (21 Nov 2003)
+
   21 Nov 2003; Tom Payne <twp@gentoo.org> lua-5.0.1_beta20031003.ebuild :
   Version bump using patches from http://lua-users.org/lists/lua-l/2003-10/msg00039.html.
   Marked ~x86.
diff --git a/dev-lang/lua/Manifest b/dev-lang/lua/Manifest
index 8f7cb9aa52a6..5694d493f380 100644
--- a/dev-lang/lua/Manifest
+++ b/dev-lang/lua/Manifest
@@ -1,16 +1,18 @@
-MD5 f229709591a631c74af170c597e467dd ChangeLog 2206
+MD5 47600fdf557bd5e8687ef174fceb1f54 ChangeLog 2451
 MD5 54ebae44e31c539176604478433306a4 lua-4.0.1.ebuild 742
 MD5 d0b1d45df2fd819d6bb0c8f386f4c8f9 lua-4.0.ebuild 729
-MD5 274c7c5345d0c6fb44088ba048d6c01a lua-5.0.1_beta20031003.ebuild 1349
 MD5 fd4fc16684c1edc4981a16004cd22226 lua-5.0.ebuild 1049
 MD5 31ac45bb4098e73fe55ffe333a27dccb lua-5.0_beta.ebuild 1005
-MD5 a90d64ac75a1ee637a45f3d73ce76df0 lua-5.0.1_beta20031003-r1.ebuild 2253
+MD5 274c7c5345d0c6fb44088ba048d6c01a lua-5.0.1_beta20031003.ebuild 1349
+MD5 a05d8eddd263fc123b71e7928911eca8 lua-5.0.1_beta20031003-r2.ebuild 2253
 MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244
+MD5 a90d64ac75a1ee637a45f3d73ce76df0 lua-5.0.1_beta20031003-r1.ebuild 2253
 MD5 7bb76903226a11484013e9657e217025 files/digest-lua-4.0 55
 MD5 652889fa621a25d6dc41ce0eb76bd5c2 files/digest-lua-4.0.1 61
 MD5 aa4434c9f3a86a28f227df41cb874093 files/digest-lua-5.0 185
-MD5 c2dcb2188a959fae7d1f0e86ba276837 files/digest-lua-5.0.1_beta20031003 124
 MD5 620a2e3bbbe7594ab1989164430fc081 files/digest-lua-5.0_beta 196
 MD5 6365486c1e78a5fc73e34a3bda3feef7 files/lua-4.0-config.patch 840
+MD5 c2dcb2188a959fae7d1f0e86ba276837 files/digest-lua-5.0.1_beta20031003 124
 MD5 c2dcb2188a959fae7d1f0e86ba276837 files/digest-lua-5.0.1_beta20031003-r1 124
 MD5 48a12e850720480ed45115452657c493 files/lua-5.0.1-pic.patch 1306
+MD5 f38ae8bf37049562a9b36c30d90eea78 files/digest-lua-5.0.1_beta20031003-r2 61
diff --git a/dev-lang/lua/files/digest-lua-5.0.1_beta20031003-r2 b/dev-lang/lua/files/digest-lua-5.0.1_beta20031003-r2
new file mode 100644
index 000000000000..5dd03225bf4d
--- /dev/null
+++ b/dev-lang/lua/files/digest-lua-5.0.1_beta20031003-r2
@@ -0,0 +1 @@
+MD5 e0a450d84971a3f4563b98172d1e382c lua-5.0.1.tar.gz 193978
diff --git a/dev-lang/lua/lua-5.0.1_beta20031003-r2.ebuild b/dev-lang/lua/lua-5.0.1_beta20031003-r2.ebuild
new file mode 100644
index 000000000000..cf37cfc6f973
--- /dev/null
+++ b/dev-lang/lua/lua-5.0.1_beta20031003-r2.ebuild
@@ -0,0 +1,86 @@
+# 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.1_beta20031003-r2.ebuild,v 1.1 2004/01/26 14:02:46 twp Exp $
+
+DESCRIPTION="A powerful light-weight programming language designed for extending applications"
+HOMEPAGE="http://www.lua.org/"
+SRC_URI="http://www.lua.org/ftp/lua-5.0.1.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~arm -hppa ~mips ~ppc ~sparc ~x86 ~amd64"
+IUSE="readline"
+DEPEND=">=sys-apps/sed-4
+	sys-apps/findutils"
+S=${WORKDIR}/lua-5.0.1
+
+src_unpack() {
+
+	unpack ${A}
+
+	#FIXME: hppa arch needs to update the patch -- I can't test (twp)
+	#epatch ${FILESDIR}/lua-5.0.1-pic.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}:" \
+		-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() {
+	export PICFLAGS=-fPIC
+	emake || die "emake failed"
+	emake so || die "emake so failed"
+}
+
+src_install() {
+
+	make DESTDIR=${D} install soinstall || die "make install soinstall failed"
+
+	dodoc COPYRIGHT 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
+
+}