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

Package-Manager: portage-2.1.1-r2

diff --git a/dev-lang/lua/ChangeLog b/dev-lang/lua/ChangeLog
index 4066c2bdb3d32f4c6632a6b2b4e590fcae763ed3..a8cd18c2fb0ee7eae79481fd68e228f38bca248b 100644 (file)
--- 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/Manifest b/dev-lang/lua/Manifest
index 1f706ed1a31574a99ff850101d9838b3bd25af1e..7509aaaa2447f512b9c2fcec6e58f96a74f8fea3 100644 (file)
--- a/dev-lang/lua/Manifest
+++ b/dev-lang/lua/Manifest
@@ -33,10 +33,10 @@ AUX lua-5.0.3-shared.patch 1360 RMD160 2f98bb90e4100bd7673d0f52a3720c9181bde987
 MD5 17d4d55107af46b9d72581c953f5a06e files/lua-5.0.3-shared.patch 1360
 RMD160 2f98bb90e4100bd7673d0f52a3720c9181bde987 files/lua-5.0.3-shared.patch 1360
 SHA256 c9ba1d3258ded3da1ca48210faf67b699ee80b115fec5fb4e9319cf7755dfc55 files/lua-5.0.3-shared.patch 1360
-AUX lua-5.1.1-make.patch 2593 RMD160 64fd9ad816b9e80a4422e0b8a19e05fde43c4d4e SHA1 0f80ceb3e8eaf47d0b31ddec9395a37d625700f1 SHA256 292122b34c1d888674fe53f8bf49d517865955d9d5b4218fb3d45d254a564808
-MD5 029dbebde260f1b4bc4ade3f9af00d92 files/lua-5.1.1-make.patch 2593
-RMD160 64fd9ad816b9e80a4422e0b8a19e05fde43c4d4e files/lua-5.1.1-make.patch 2593
-SHA256 292122b34c1d888674fe53f8bf49d517865955d9d5b4218fb3d45d254a564808 files/lua-5.1.1-make.patch 2593
+AUX lua-5.1.1-make.patch 2608 RMD160 b7254e82845eeb318daf98bf72a23d46446fe1bb SHA1 b406d5198c4784f99e8d7029a766d1533fbbffc3 SHA256 3a6561872e0d998d21728614f28d63c2dbd88f2f736fe8b57dd4f2ec9451239d
+MD5 63b0040917d8f53f1808f13cff229810 files/lua-5.1.1-make.patch 2608
+RMD160 b7254e82845eeb318daf98bf72a23d46446fe1bb files/lua-5.1.1-make.patch 2608
+SHA256 3a6561872e0d998d21728614f28d63c2dbd88f2f736fe8b57dd4f2ec9451239d files/lua-5.1.1-make.patch 2608
 AUX lua-5.1.1-make_static.patch 542 RMD160 d42a93919d01dc15a4281901f74558db65214f2a SHA1 b7c82c65201654068644ee99e345d163b215fc21 SHA256 ea9098664e1e43b37465ecc4028bd0fbe08c0f73772914b6fe38bd13637090ba
 MD5 ba8ddaa07ecbccd1a1f8ff9411319e7a files/lua-5.1.1-make_static.patch 542
 RMD160 d42a93919d01dc15a4281901f74558db65214f2a files/lua-5.1.1-make_static.patch 542
@@ -61,22 +61,22 @@ EBUILD lua-4.0.1.ebuild 780 RMD160 15ee8800a341b1b57cb800c7fd60e5b843b13758 SHA1
 MD5 eba6f162259ed67c8d07ac9169b9e4b8 lua-4.0.1.ebuild 780
 RMD160 15ee8800a341b1b57cb800c7fd60e5b843b13758 lua-4.0.1.ebuild 780
 SHA256 5cdbdb1bfa9959585a438f643a93c68479f92d40ac75a9d0cc9889a7ec29a880 lua-4.0.1.ebuild 780
-EBUILD lua-5.0.2.ebuild 2996 RMD160 012beefb1214ba510f45a8ad3dcc1d01e40b641a SHA1 1c876eff9a6649f3e20ee16a3871ae251f5c6297 SHA256 00c665361ac9606a3b8cab4995e91e63fa65ac3dd77a837d4b8a808c0527777a
-MD5 256d83d457deabf65ab9bb2667af5b23 lua-5.0.2.ebuild 2996
-RMD160 012beefb1214ba510f45a8ad3dcc1d01e40b641a lua-5.0.2.ebuild 2996
-SHA256 00c665361ac9606a3b8cab4995e91e63fa65ac3dd77a837d4b8a808c0527777a lua-5.0.2.ebuild 2996
+EBUILD lua-5.0.2.ebuild 3020 RMD160 c3c27d5d46c498d233666ea863c23177f9b964e3 SHA1 c9c6ee524d85ad74a97412641bee2735488234c4 SHA256 dd03b6ecb81266c6cb774a668fe907187e5f13a6cfad4e8ebb2c3f2ef59b0fcb
+MD5 9504e29aec4999e2fa6994d0a27fc73b lua-5.0.2.ebuild 3020
+RMD160 c3c27d5d46c498d233666ea863c23177f9b964e3 lua-5.0.2.ebuild 3020
+SHA256 dd03b6ecb81266c6cb774a668fe907187e5f13a6cfad4e8ebb2c3f2ef59b0fcb lua-5.0.2.ebuild 3020
 EBUILD lua-5.0.3.ebuild 3091 RMD160 0c4095092f6f2ea6fb9349011a905e387cc744ef SHA1 a26ff9fb4871e80b9fb6b96790843fa09ea7f52c SHA256 5e5232053c6de487ba7a6103f51111f0339a6aa79838988090256548f6b7f069
 MD5 5c82889af9fbb1331fb9966216562c02 lua-5.0.3.ebuild 3091
 RMD160 0c4095092f6f2ea6fb9349011a905e387cc744ef lua-5.0.3.ebuild 3091
 SHA256 5e5232053c6de487ba7a6103f51111f0339a6aa79838988090256548f6b7f069 lua-5.0.3.ebuild 3091
-EBUILD lua-5.1.1.ebuild 2395 RMD160 a905b11253a6c370140c48f452589f758d47ed52 SHA1 314847e5ed75e37ea821d2f757f40966ad4e8b5e SHA256 9751a2da0ddc764fb48f2c07daadb23eed52b630b6c195601147a59adb28d589
-MD5 6bd292fc97610f56ded3aeb92783d96a lua-5.1.1.ebuild 2395
-RMD160 a905b11253a6c370140c48f452589f758d47ed52 lua-5.1.1.ebuild 2395
-SHA256 9751a2da0ddc764fb48f2c07daadb23eed52b630b6c195601147a59adb28d589 lua-5.1.1.ebuild 2395
-MISC ChangeLog 7830 RMD160 8c9ec62443e4942e321c206069b0a8b9bdb096dd SHA1 3646968782a5d99027907f38accc0519e82d1094 SHA256 51c911845a0fa3b1d09e37a110c43816fbd2b689fad9c790a1b34130f71efcbc
-MD5 d436e9a5a5db45e595512ace5884937b ChangeLog 7830
-RMD160 8c9ec62443e4942e321c206069b0a8b9bdb096dd ChangeLog 7830
-SHA256 51c911845a0fa3b1d09e37a110c43816fbd2b689fad9c790a1b34130f71efcbc ChangeLog 7830
+EBUILD lua-5.1.1.ebuild 2404 RMD160 33b0acad3fc5e9e91d613e15c2e3acff4b233ea4 SHA1 2947b37b05df5ab96f3f60e7637fc04652af967c SHA256 731bd68cb781b3948f75aa61d8fe2e9649759847fdf1c31ad715f4a33e625a0c
+MD5 9a6896d222ddf7a0d99972ccbc2b5c53 lua-5.1.1.ebuild 2404
+RMD160 33b0acad3fc5e9e91d613e15c2e3acff4b233ea4 lua-5.1.1.ebuild 2404
+SHA256 731bd68cb781b3948f75aa61d8fe2e9649759847fdf1c31ad715f4a33e625a0c lua-5.1.1.ebuild 2404
+MISC ChangeLog 8104 RMD160 27a4efc77d2d0904348620a1534642d2335231e0 SHA1 405a1020ff9734f93d48567a13f2d0ef4cad749c SHA256 ed7d0c2738182c306c97187c89fb228f2a113e49db706e514e51e04bb4837f93
+MD5 ab9cf1b82b2f0f9a481ec1c416d245fe ChangeLog 8104
+RMD160 27a4efc77d2d0904348620a1534642d2335231e0 ChangeLog 8104
+SHA256 ed7d0c2738182c306c97187c89fb228f2a113e49db706e514e51e04bb4837f93 ChangeLog 8104
 MISC metadata.xml 248 RMD160 7e7a4fe276728c6c4d6d0face7f0708dae9776d7 SHA1 b16dc683091d4a7cee7f9b8a6d6034a257df80b0 SHA256 3f6027d293a7bd953fd444ba8a1345ca6b9c00c28b35e8328386b9635d8eb71f
 MD5 c4aada614ade13541606f0901dffd61f metadata.xml 248
 RMD160 7e7a4fe276728c6c4d6d0face7f0708dae9776d7 metadata.xml 248
@@ -96,7 +96,7 @@ SHA256 5a9bfa07cd7871412eacd8a0285b69aaac0d01b635406b2d2c24569cb0c7042c files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFa26WfNMcoUhJ7GwRAheQAJ0SiL1WoSEMwtuqY3tIyob4ZGRVAgCghge9
-/CbLhRIg7lw0j9Iw4yZUPK0=
-=3hHH
+iD8DBQFFcGSufNMcoUhJ7GwRAn/PAJ47v2ecWJAUe/Hu2e07Qd6UkcK1CgCeOzrm
+m1YODDcOV+ARta/AmqLZFVE=
+=dpx4
 -----END PGP SIGNATURE-----

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 b05c841e9731c8a59e319919554c490c83ebe58c..ca79d3086c2ed6516b7d0c7c552163bdb003eb9a 100644 (file)
--- 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 74de0440d1078e10f16711348c49bf539a0644f6..704addc82814f9c058d58d1817dd41aeca15edd5 100644 (file)
--- 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 e81b59b210fc6d28f37258314a46d2c2e435cb5f..4b2a24847829be5ab033fb199224404d58c0ceb7 100644 (file)
--- 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