Fix bug #106446, change name of liblua back to liblualib

(Portage version: 2.1.1-r2)

4 files changed, 17 insertions, 11 deletions

diff --git a/dev-lang/lua/ChangeLog b/dev-lang/lua/ChangeLog
index 4066c2bdb3d3..a8cd18c2fb0e 100644
--- a/dev-lang/lua/ChangeLog
+++ b/dev-lang/lua/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/lua
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.55 2006/11/27 23:02:36 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.56 2006/12/01 17:21:29 mabi Exp $
+
+  01 Dec 2006; Matti Bickel <mabi@gentoo.org> files/lua-5.1.1-make.patch,
+  lua-5.0.2.ebuild, lua-5.1.1.ebuild:
+  Made lua -5.0.2 and -5.1.1 use dlopen_lib for BSD, changed the name of
+  liblua back to the old liblualib, seems we're slowly getting into a usable
+  state :)
 
   27 Nov 2006; Matti Bickel <mabi@gentoo.org> files/lua-5.1.1-make.patch,
   files/lua-5.1.1-make_static.patch, lua-5.1.1.ebuild:
diff --git a/dev-lang/lua/files/lua-5.1.1-make.patch b/dev-lang/lua/files/lua-5.1.1-make.patch
index b05c841e9731..ca79d3086c2e 100644
--- a/dev-lang/lua/files/lua-5.1.1-make.patch
+++ b/dev-lang/lua/files/lua-5.1.1-make.patch
@@ -30,14 +30,14 @@
 +	cd src; $(MAKE) $@
 +
 +gentoo_test: gentoo_linux
-+	src/lua-$(V) test/hello.lua
++	test/lua.static test/hello.lua
 +
 +gentoo_install:
 +	mkdir -p $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN)
 +	cd src; $(LIBTOOL) --mode=install $(INSTALL_EXEC) lua luac $(INSTALL_BIN)
 +	cd src; $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
-+	cd src; $(LIBTOOL) --mode=install $(INSTALL_DATA) liblua.la $(INSTALL_LIB)
-+	cd src; $(LIBTOOL) --mode=install $(INSTALL_DATA) liblua.a $(INSTALL_LIB)
++	cd src; $(LIBTOOL) --mode=install $(INSTALL_DATA) liblualib.la $(INSTALL_LIB)
++	cd src; $(LIBTOOL) --mode=install $(INSTALL_DATA) liblualib.a $(INSTALL_LIB)
 --- /home/mabi/gentoo/lua-5.1.1.orig/src/Makefile	2006-03-22 01:41:49.000000000 +0100
 +++ ./src/Makefile	2006-11-16 02:10:27.000000000 +0100
 @@ -176,3 +176,36 @@
@@ -51,7 +51,7 @@
 +# The following rules use libtool for compiling and linking in order to
 +# provide shared library support.
 +
-+LIB_NAME = liblua.la
++LIB_NAME = liblualib.la
 +LIB_OBJS = $(CORE_O:.o=.lo) $(LIB_O:.o=.lo)
 +
 +%.lo %.o: %.c
@@ -65,7 +65,7 @@
 +	$(LIBTOOL) --mode=link $(CC) -static -o $(LIB_NAME:.la=.a) $(LIB_OBJS)
 +
 +lua: $(LUA_O) $(LIB_NAME)
-+	$(LIBTOOL) --mode=link $(CC) -Wl,-E -o $@ $(LUA_O) $(LUA_LIBS) -llua
++	$(LIBTOOL) --mode=link $(CC) -Wl,-E -o $@ $(LUA_O) $(LUA_LIBS) -llualib
 +
 +lua_test: $(LUA_O) $(LIB_NAME)
 +	$(LIBTOOL) --mode=link $(CC) -static -Wl,-E -o $@ $(LUA_O) $(LIB_NAME) $(LUA_LIBS)
diff --git a/dev-lang/lua/lua-5.0.2.ebuild b/dev-lang/lua/lua-5.0.2.ebuild
index 74de0440d107..704addc82814 100644
--- a/dev-lang/lua/lua-5.0.2.ebuild
+++ b/dev-lang/lua/lua-5.0.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.0.2.ebuild,v 1.22 2006/11/12 03:44:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.0.2.ebuild,v 1.23 2006/12/01 17:21:29 mabi Exp $
 
-inherit eutils
+inherit eutils portability
 
 DESCRIPTION="A powerful light-weight programming language designed for extending applications"
 HOMEPAGE="http://www.lua.org/"
@@ -28,7 +28,7 @@ src_unpack() {
 	if ! use ppc-macos; then
 		sed -i config \
 			-e 's:^#\(LOADLIB= -DUSE_DLOPEN=1\):\1:' \
-			-e 's:^#\(DLLIB= -ldl\):\1:' \
+			-e "s:^#\(DLLIB=\) -ldl:\1 $(dlopen_lib):" \
 			-e 's:^#\(MYLDFLAGS= -Wl,-E\):\1:' \
 			-e "s:^#\(LDFLAGS=\).*:\1 ${LDFLAGS}:" \
 			-e 's:^#\(POPEN= -DUSE_POPEN=1\)$:\1:' \
diff --git a/dev-lang/lua/lua-5.1.1.ebuild b/dev-lang/lua/lua-5.1.1.ebuild
index e81b59b210fc..4b2a24847829 100644
--- a/dev-lang/lua/lua-5.1.1.ebuild
+++ b/dev-lang/lua/lua-5.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.1.1.ebuild,v 1.5 2006/11/27 23:02:36 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.1.1.ebuild,v 1.6 2006/12/01 17:21:29 mabi Exp $
 
 inherit eutils portability
 
@@ -46,7 +46,7 @@ src_compile() {
 		mycflags="${mycflags} -DLUA_USE_MACOSX"
 	else # building for standard linux (and bsd too)
 		mycflags="${mycflags} -DLUA_USE_LINUX"
-		liblibs="${liblibs} -ldl"
+		liblibs="${liblibs} $(dlopen_lib)"
 	fi
 
 	# what to link to the executables