Fix patch for as-needed, see comment #7 in bug #122128. Remove useless -l

directives when using readline.

Package-Manager: portage-2.1.2_pre3

4 files changed, 21 insertions, 26 deletions

diff --git a/dev-lang/lua/ChangeLog b/dev-lang/lua/ChangeLog
index 125aa8c53fce..062c26d69614 100644
--- a/dev-lang/lua/ChangeLog
+++ b/dev-lang/lua/ChangeLog
@@ -1,6 +1,11 @@
 # 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.46 2006/10/07 15:42:18 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.47 2006/10/14 10:44:03 exg Exp $
+
+  14 Oct 2006; Emanuele Giaquinta <exg@gentoo.org>
+  files/lua-5.0.3-asneeded.patch, lua-5.0.3.ebuild:
+  Fix patch for as-needed, see comment #7 in bug #122128. Remove useless -l
+  directives when using readline.
 
   07 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> lua-5.0.3.ebuild:
   Add ~x86-fbsd keyword.
diff --git a/dev-lang/lua/Manifest b/dev-lang/lua/Manifest
index f06884dda1b7..b9b8e4590199 100644
--- a/dev-lang/lua/Manifest
+++ b/dev-lang/lua/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX lua-4.0-config.patch 840 RMD160 084f61c266550c0a068fb1349990502a33141cad SHA1 d1b31c7eedc6114a39fbfd31084cef899fa7a814 SHA256 b38627a9720bdd8a3ba79ec5418699472f0e16173e7e29ffd844dfd895aad559
 MD5 6365486c1e78a5fc73e34a3bda3feef7 files/lua-4.0-config.patch 840
 RMD160 084f61c266550c0a068fb1349990502a33141cad files/lua-4.0-config.patch 840
@@ -17,10 +14,10 @@ AUX lua-5.0.2-pic.patch 1243 RMD160 f1629c59e406eab1552dbd0de40cc31da0e0ee11 SHA
 MD5 74b0268bdadf862659a5a088cf5f424f files/lua-5.0.2-pic.patch 1243
 RMD160 f1629c59e406eab1552dbd0de40cc31da0e0ee11 files/lua-5.0.2-pic.patch 1243
 SHA256 fd4a528d3fd03a22b7c4108bb3fc7fa916810cad381c2e30e67e14348fe6ee55 files/lua-5.0.2-pic.patch 1243
-AUX lua-5.0.3-asneeded.patch 589 RMD160 eefccb5a175605aa958fb53433c88a407b2b1e05 SHA1 7bed4905c9e712683a74466bdc55601aa5de78d0 SHA256 d0ee15d0f3df39f732dfe513b31e39ae997e39808a9dd33a3ec0a97caa701a40
-MD5 9b0053bb7a5d2826e59c90a0b9e6ce6c files/lua-5.0.3-asneeded.patch 589
-RMD160 eefccb5a175605aa958fb53433c88a407b2b1e05 files/lua-5.0.3-asneeded.patch 589
-SHA256 d0ee15d0f3df39f732dfe513b31e39ae997e39808a9dd33a3ec0a97caa701a40 files/lua-5.0.3-asneeded.patch 589
+AUX lua-5.0.3-asneeded.patch 591 RMD160 eeee0c5d6a683b25b453cf8628366f954442b3d6 SHA1 c1d32b7bd23284a31facc37061051a185198558c SHA256 b14958d271d644b59e1d0c48bd5f4fd287e1d62791e02051bd973a0d6fa7cd1a
+MD5 3098758945878c95bc5f60ef693bda71 files/lua-5.0.3-asneeded.patch 591
+RMD160 eeee0c5d6a683b25b453cf8628366f954442b3d6 files/lua-5.0.3-asneeded.patch 591
+SHA256 b14958d271d644b59e1d0c48bd5f4fd287e1d62791e02051bd973a0d6fa7cd1a files/lua-5.0.3-asneeded.patch 591
 AUX lua-5.0.3-ldflags.patch 1519 RMD160 cc97938c0dc70faa438c963faf84bd41a9c339d9 SHA1 55ef2bf1bf7d81b6a696ab6f78e66eb0e988302f SHA256 124ffaded94c90da678e9037687a07ddb7612e0a459882437337ed391ca5c485
 MD5 2a223d5c8498347163859f3d9eea79dc files/lua-5.0.3-ldflags.patch 1519
 RMD160 cc97938c0dc70faa438c963faf84bd41a9c339d9 files/lua-5.0.3-ldflags.patch 1519
@@ -48,14 +45,14 @@ EBUILD lua-5.0.2.ebuild 2993 RMD160 65acea8cf087c1f6cfba929a6da05c87d8ea56a0 SHA
 MD5 907b2e626bba4aa43d4526e542e0054f lua-5.0.2.ebuild 2993
 RMD160 65acea8cf087c1f6cfba929a6da05c87d8ea56a0 lua-5.0.2.ebuild 2993
 SHA256 d314742590276e203dbd8b69636f5401e80825ce7944b56b9db188af10bef74d lua-5.0.2.ebuild 2993
-EBUILD lua-5.0.3.ebuild 3065 RMD160 a7a8429b9d7599d33accbd02a46796676de0465e SHA1 1233ffae0dafe6d8c9b38e231c12caabe8f83df4 SHA256 ab6bb8a18b537d02a2d59d5187636236c981249903354523fa8989db972eccd3
-MD5 71dd254b991e9a3f0098fdb23aefa419 lua-5.0.3.ebuild 3065
-RMD160 a7a8429b9d7599d33accbd02a46796676de0465e lua-5.0.3.ebuild 3065
-SHA256 ab6bb8a18b537d02a2d59d5187636236c981249903354523fa8989db972eccd3 lua-5.0.3.ebuild 3065
-MISC ChangeLog 6145 RMD160 7daaf7ad0c8ea1483cf5897fe30098029e698ba1 SHA1 291b7605bf80199826f5c32687391869aad82543 SHA256 feb7cce1de4186b06ee3f04ece9733cddeafe7969936b2e0a2b748a9426a415b
-MD5 4c632a71a60f734130381a7da0fa7ab9 ChangeLog 6145
-RMD160 7daaf7ad0c8ea1483cf5897fe30098029e698ba1 ChangeLog 6145
-SHA256 feb7cce1de4186b06ee3f04ece9733cddeafe7969936b2e0a2b748a9426a415b ChangeLog 6145
+EBUILD lua-5.0.3.ebuild 3016 RMD160 36b943b4d63a76db7469017d9266f3a9837ac29b SHA1 178612b42c7e2d59f42c5bee84dbedeed3251602 SHA256 8ca386e6277927c7575028705398293a3e1194013767a95ae9ad946f6e167121
+MD5 6f207ac9b54983cdb3ca0bf57051fa23 lua-5.0.3.ebuild 3016
+RMD160 36b943b4d63a76db7469017d9266f3a9837ac29b lua-5.0.3.ebuild 3016
+SHA256 8ca386e6277927c7575028705398293a3e1194013767a95ae9ad946f6e167121 lua-5.0.3.ebuild 3016
+MISC ChangeLog 6353 RMD160 c9233ea2605ab66825fb833c418c756d38579aa2 SHA1 3281f409219914f37efc4f187f47099626bbb308 SHA256 ee1aa59a58f3a19c5e77cb1af6fe93ff426f645a9314b212c5dd81be35531d61
+MD5 5d8b31820ae32c810c431a1504529fc7 ChangeLog 6353
+RMD160 c9233ea2605ab66825fb833c418c756d38579aa2 ChangeLog 6353
+SHA256 ee1aa59a58f3a19c5e77cb1af6fe93ff426f645a9314b212c5dd81be35531d61 ChangeLog 6353
 MISC metadata.xml 253 RMD160 614ccb0096d3d247b02426b231d8cd462f52d2bd SHA1 007052a587e4927dbfef637752ac4f37b8c28636 SHA256 b7ad8bfe01c6a18679669971b43a69021bdcf704a05ee48f71a658cc2959a0d4
 MD5 80b94ea3b8e4881c84cc712aec6650e4 metadata.xml 253
 RMD160 614ccb0096d3d247b02426b231d8cd462f52d2bd metadata.xml 253
@@ -72,10 +69,3 @@ SHA256 dd85bd3af3bdca85924820c75cd663147dcd19c6b89c64161e406ee39e0fdf96 files/di
 MD5 23154e6d41fb3e070a7c9390e991e13c files/digest-lua-5.0.3 229
 RMD160 13f30c4580ef37b67160942adc5497820c09d556 files/digest-lua-5.0.3 229
 SHA256 4a4b5a506f9226dc2e8bb8d52129a6c4b66f27b7d9d0a91c81b0379605c34d0f files/digest-lua-5.0.3 229
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFJ8rhAiZjviIA2XgRAhhvAJ0d7bOd8hEtbzG7VgssKGCp7XvIPACeL9WN
-wpZUq16llapYqRxNJztAe70=
-=t9P6
------END PGP SIGNATURE-----
diff --git a/dev-lang/lua/files/lua-5.0.3-asneeded.patch b/dev-lang/lua/files/lua-5.0.3-asneeded.patch
index 71e1a10090a0..b47f2dfffeaa 100644
--- a/dev-lang/lua/files/lua-5.0.3-asneeded.patch
+++ b/dev-lang/lua/files/lua-5.0.3-asneeded.patch
@@ -5,7 +5,7 @@
  so:
  	$(CC) $(LDFLAGS) -o lib/liblua.so.$V -shared -Wl,-soname,liblua.so.$V src/*.o
 -	$(CC) $(LDFLAGS) -o lib/liblualib.so.$V -shared -Wl,-soname,liblualib.so.$V src/lib/*.o
-+	$(CC) $(LDFLAGS) -o lib/liblualib.so.$V -shared -Wl,-soname,liblualib.so.$V src/lib/*.o -L$(LIB) -llua $(EXTRA_LIBS) $(DLLIB)
++	$(CC) $(LDFLAGS) -o lib/liblualib.so.$V -shared -Wl,-soname,liblualib.so.$V src/lib/*.o lib/liblua.so.$V $(EXTRA_LIBS) $(DLLIB)
  	cd lib; ln -fs liblua.so.$V liblua.so; ln -fs liblualib.so.$V liblualib.so
  
  # binaries using shared libraries
diff --git a/dev-lang/lua/lua-5.0.3.ebuild b/dev-lang/lua/lua-5.0.3.ebuild
index b9882cf7ad23..5a988b096356 100644
--- a/dev-lang/lua/lua-5.0.3.ebuild
+++ b/dev-lang/lua/lua-5.0.3.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.0.3.ebuild,v 1.2 2006/10/07 15:42:18 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.0.3.ebuild,v 1.3 2006/10/14 10:44:03 exg Exp $
 
 inherit eutils portability
 
@@ -43,7 +43,7 @@ src_unpack() {
 	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:'
+			-e 's:^\(EXTRA_LIBS= -lm\)$:\1 -lreadline:'
 	fi
 
 	cat >etc/lua.pc <<EOF