as-needed patch thanks to TGL <degrenier@easyconnect.fr> in bug 122128 from Benjamin Schindler <config@gentoo.org>

Package-Manager: portage-2.1.1_pre1-r2

6 files changed, 92 insertions, 18 deletions

diff --git a/dev-lang/lua/ChangeLog b/dev-lang/lua/ChangeLog
index 812008ba09da..6e778d2888e5 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.42 2006/03/01 19:24:55 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.43 2006/06/25 16:55:35 genstef Exp $
+
+  25 Jun 2006; Stefan Schweizer <genstef@gentoo.org>
+  +files/lua-5.0.2-LDFLAGS_and_as-needed.patch, lua-5.0.2.ebuild:
+  as-needed patch thanks to TGL <degrenier@easyconnect.fr> in bug 122128 from
+  Benjamin Schindler <config@gentoo.org>
 
   01 Mar 2006; Tom Payne <twp@gentoo.org> -lua-4.0.ebuild, -lua-5.0.ebuild,
   -lua-5.0.1_beta20031003-r2.ebuild:
diff --git a/dev-lang/lua/Manifest b/dev-lang/lua/Manifest
index c067dc889431..135c97ab423f 100644
--- a/dev-lang/lua/Manifest
+++ b/dev-lang/lua/Manifest
@@ -1,39 +1,55 @@
-MD5 973c17a6a9a12e37d0776d7edf8c17cc ChangeLog 5444
-RMD160 775bb63dc25318a41f8ae98c5767150981ef0054 ChangeLog 5444
-SHA256 a24b62c5b77a988c5c98c6ebd0adacc8f5ed4aa51c50cb5bad8978e8caf4e1d6 ChangeLog 5444
-MD5 652889fa621a25d6dc41ce0eb76bd5c2 files/digest-lua-4.0.1 61
-RMD160 95c9e07b7a847cf234f1a13ec8a6da59a27e4f3b files/digest-lua-4.0.1 61
-SHA256 cfbbf4e92d9cf7a3e1ce3236101d50a69572798ee59308783791a60bf1cb3b75 files/digest-lua-4.0.1 61
-MD5 7ada6b04da7ea1d6e5128accf7a3c355 files/digest-lua-5.0.2 61
-RMD160 43c7118390b853359f17bfb8b86859df441fd27f files/digest-lua-5.0.2 61
-SHA256 4f47a16cfaab6149c3e14aee6f18ef8f9998b79f902d780f3d1601f7a9bb0055 files/digest-lua-5.0.2 61
-MD5 7ada6b04da7ea1d6e5128accf7a3c355 files/digest-lua-5.0.2-r1 61
-RMD160 43c7118390b853359f17bfb8b86859df441fd27f files/digest-lua-5.0.2-r1 61
-SHA256 4f47a16cfaab6149c3e14aee6f18ef8f9998b79f902d780f3d1601f7a9bb0055 files/digest-lua-5.0.2-r1 61
+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
 SHA256 b38627a9720bdd8a3ba79ec5418699472f0e16173e7e29ffd844dfd895aad559 files/lua-4.0-config.patch 840
+AUX lua-5.0.1-pic.patch 1306 RMD160 4012eb5cb3e24f289029bb23484a3f3afbd300d4 SHA1 ead9001e4aa302b75248b8d47a49cd977ba44bc0 SHA256 07bb5ab8e6600e896a048d2e0ad2202877a740287b80add94df75f8cafed0192
 MD5 48a12e850720480ed45115452657c493 files/lua-5.0.1-pic.patch 1306
 RMD160 4012eb5cb3e24f289029bb23484a3f3afbd300d4 files/lua-5.0.1-pic.patch 1306
 SHA256 07bb5ab8e6600e896a048d2e0ad2202877a740287b80add94df75f8cafed0192 files/lua-5.0.1-pic.patch 1306
+AUX lua-5.0.2-LDFLAGS_and_as-needed.patch 1837 RMD160 2dd54660c8646e9eaf206c96bad9adee326fb567 SHA1 f9f50ab6df8cd946daa8c108a3a48168b2c75f65 SHA256 3bf1a4ef14e02ca8203b3d4eaeab44e2455ec8f186f58f1e5674ab5d9a28689c
+MD5 d2ccba11aed9263920a7fd316d528f00 files/lua-5.0.2-LDFLAGS_and_as-needed.patch 1837
+RMD160 2dd54660c8646e9eaf206c96bad9adee326fb567 files/lua-5.0.2-LDFLAGS_and_as-needed.patch 1837
+SHA256 3bf1a4ef14e02ca8203b3d4eaeab44e2455ec8f186f58f1e5674ab5d9a28689c files/lua-5.0.2-LDFLAGS_and_as-needed.patch 1837
+AUX lua-5.0.2-gentoo.patch 524 RMD160 95fc6047ea5b5d8dd75139f8bef624a839708345 SHA1 3ac2cc0f462551eb4a069143d0dd60710310f881 SHA256 bf1f0391bd2f6039fb40b21020fe21f443c0c330c5aa496e410e85c0450cc8c4
 MD5 f3cf4211cea7a402f31def33b218561e files/lua-5.0.2-gentoo.patch 524
 RMD160 95fc6047ea5b5d8dd75139f8bef624a839708345 files/lua-5.0.2-gentoo.patch 524
 SHA256 bf1f0391bd2f6039fb40b21020fe21f443c0c330c5aa496e410e85c0450cc8c4 files/lua-5.0.2-gentoo.patch 524
+AUX lua-5.0.2-pic.patch 1243 RMD160 f1629c59e406eab1552dbd0de40cc31da0e0ee11 SHA1 a06f73ef06b214eee46326dd7144040d3401c682 SHA256 fd4a528d3fd03a22b7c4108bb3fc7fa916810cad381c2e30e67e14348fe6ee55
 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-ppc-macos-Makefile.patch 5873 RMD160 a9736ced946f8de2e773d9d84e715f5868ba168f SHA1 af197424d6d1e1adc0800cc69c3261926f34edc9 SHA256 3cc913d440ca31c824841aa4aec955c48ea877209f5eb9c138b42050460a0174
 MD5 157b7a36290e2e020146ed958b570f51 files/lua-ppc-macos-Makefile.patch 5873
 RMD160 a9736ced946f8de2e773d9d84e715f5868ba168f files/lua-ppc-macos-Makefile.patch 5873
 SHA256 3cc913d440ca31c824841aa4aec955c48ea877209f5eb9c138b42050460a0174 files/lua-ppc-macos-Makefile.patch 5873
+DIST lua-4.0.1.tar.gz 158426
+DIST lua-5.0.2.tar.gz 190442 RMD160 5f1a1cf5802e38b3c4dcfc9f3cd0dc33bfdc0a30 SHA1 a200cfd20a9a4c7da1206ae45dddf26186a9e0e7 SHA256 a6c85d85f912e1c321723084389d63dee7660b81b8292452b190ea7190dd73bc
+EBUILD lua-4.0.1.ebuild 776 RMD160 f8a3db25b29411ce0c34d40e7636af8296582563 SHA1 07e470774a3d855341407dfac886d7551b51ff56 SHA256 88d86760ab8f63fd824d9d68cb9fe0abc3f84a472ae63f6b17c58ad684059469
 MD5 9495bd1aa03bc8a99e5d0dba5d7285e7 lua-4.0.1.ebuild 776
 RMD160 f8a3db25b29411ce0c34d40e7636af8296582563 lua-4.0.1.ebuild 776
 SHA256 88d86760ab8f63fd824d9d68cb9fe0abc3f84a472ae63f6b17c58ad684059469 lua-4.0.1.ebuild 776
+EBUILD lua-5.0.2-r1.ebuild 2363 RMD160 a60a5a572a9df2e5b8ee473c21da3a89757e1153 SHA1 e814832a619e4d11e46194ec438b162883ce180e SHA256 e78afebc97fcee8a2495be720f3e5120224b93371246db2d7562e7f07ce2f3ca
 MD5 dfb2f383b1f898f272c475ebb5e1764d lua-5.0.2-r1.ebuild 2363
 RMD160 a60a5a572a9df2e5b8ee473c21da3a89757e1153 lua-5.0.2-r1.ebuild 2363
 SHA256 e78afebc97fcee8a2495be720f3e5120224b93371246db2d7562e7f07ce2f3ca lua-5.0.2-r1.ebuild 2363
-MD5 9f2e65ab3be990383fc8bbf1ad0f2a8a lua-5.0.2.ebuild 2890
-RMD160 1775fb9db51bd0471ce5ed43600eadd064f5d364 lua-5.0.2.ebuild 2890
-SHA256 26fb9bf38a9842dd441ee6e94eef9902811e6defc0702e8f632c0ae30769eb15 lua-5.0.2.ebuild 2890
+EBUILD lua-5.0.2.ebuild 2993 RMD160 65acea8cf087c1f6cfba929a6da05c87d8ea56a0 SHA1 ae246010e84280d19160a06f77a5a8e3d5478a22 SHA256 d314742590276e203dbd8b69636f5401e80825ce7944b56b9db188af10bef74d
+MD5 907b2e626bba4aa43d4526e542e0054f lua-5.0.2.ebuild 2993
+RMD160 65acea8cf087c1f6cfba929a6da05c87d8ea56a0 lua-5.0.2.ebuild 2993
+SHA256 d314742590276e203dbd8b69636f5401e80825ce7944b56b9db188af10bef74d lua-5.0.2.ebuild 2993
+MISC ChangeLog 5687 RMD160 3fd08c16b468850054b082d0e00fa3ad272ce2d4 SHA1 e8466288c2db6b374cdcb926476c9308b4762dca SHA256 265c56472ff21ee0960d15c17259d7afb17635d9a797619d9acb788579ac5ccb
+MD5 4791df156ede8c31fc3b745f77d88dbf ChangeLog 5687
+RMD160 3fd08c16b468850054b082d0e00fa3ad272ce2d4 ChangeLog 5687
+SHA256 265c56472ff21ee0960d15c17259d7afb17635d9a797619d9acb788579ac5ccb ChangeLog 5687
+MISC metadata.xml 244 RMD160 10fcb6c60f0d88174ff99fd391d0da3a75bdf89d SHA1 bee870f83b6bd74feedef2b9ff8da8f4820cc19f SHA256 c7b6d3457d4746a2b281c4ac598bcf78b8e1553d8d63f2523b4cd0f4eaa422b1
 MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244
 RMD160 10fcb6c60f0d88174ff99fd391d0da3a75bdf89d metadata.xml 244
 SHA256 c7b6d3457d4746a2b281c4ac598bcf78b8e1553d8d63f2523b4cd0f4eaa422b1 metadata.xml 244
+MD5 652889fa621a25d6dc41ce0eb76bd5c2 files/digest-lua-4.0.1 61
+RMD160 95c9e07b7a847cf234f1a13ec8a6da59a27e4f3b files/digest-lua-4.0.1 61
+SHA256 cfbbf4e92d9cf7a3e1ce3236101d50a69572798ee59308783791a60bf1cb3b75 files/digest-lua-4.0.1 61
+MD5 31bd0b339facb0756552698ec748ca7d files/digest-lua-5.0.2 229
+RMD160 12bb443ab71db9abf7194aac686994b08070c486 files/digest-lua-5.0.2 229
+SHA256 dd85bd3af3bdca85924820c75cd663147dcd19c6b89c64161e406ee39e0fdf96 files/digest-lua-5.0.2 229
+MD5 31bd0b339facb0756552698ec748ca7d files/digest-lua-5.0.2-r1 229
+RMD160 12bb443ab71db9abf7194aac686994b08070c486 files/digest-lua-5.0.2-r1 229
+SHA256 dd85bd3af3bdca85924820c75cd663147dcd19c6b89c64161e406ee39e0fdf96 files/digest-lua-5.0.2-r1 229
diff --git a/dev-lang/lua/files/digest-lua-5.0.2 b/dev-lang/lua/files/digest-lua-5.0.2
index 519f9921e608..a362628bd431 100644
--- a/dev-lang/lua/files/digest-lua-5.0.2
+++ b/dev-lang/lua/files/digest-lua-5.0.2
@@ -1 +1,3 @@
 MD5 dea74646b7e5c621fef7174df83c34b1 lua-5.0.2.tar.gz 190442
+RMD160 5f1a1cf5802e38b3c4dcfc9f3cd0dc33bfdc0a30 lua-5.0.2.tar.gz 190442
+SHA256 a6c85d85f912e1c321723084389d63dee7660b81b8292452b190ea7190dd73bc lua-5.0.2.tar.gz 190442
diff --git a/dev-lang/lua/files/digest-lua-5.0.2-r1 b/dev-lang/lua/files/digest-lua-5.0.2-r1
index 519f9921e608..a362628bd431 100644
--- a/dev-lang/lua/files/digest-lua-5.0.2-r1
+++ b/dev-lang/lua/files/digest-lua-5.0.2-r1
@@ -1 +1,3 @@
 MD5 dea74646b7e5c621fef7174df83c34b1 lua-5.0.2.tar.gz 190442
+RMD160 5f1a1cf5802e38b3c4dcfc9f3cd0dc33bfdc0a30 lua-5.0.2.tar.gz 190442
+SHA256 a6c85d85f912e1c321723084389d63dee7660b81b8292452b190ea7190dd73bc lua-5.0.2.tar.gz 190442
diff --git a/dev-lang/lua/files/lua-5.0.2-LDFLAGS_and_as-needed.patch b/dev-lang/lua/files/lua-5.0.2-LDFLAGS_and_as-needed.patch
new file mode 100644
index 000000000000..c0bd1378bcdc
--- /dev/null
+++ b/dev-lang/lua/files/lua-5.0.2-LDFLAGS_and_as-needed.patch
@@ -0,0 +1,47 @@
+--- lua-5.0.2/config.orig	2006-05-07 17:22:47.000000000 +0200
++++ lua-5.0.2/config	2006-05-07 17:25:35.000000000 +0200
+@@ -35,6 +35,9 @@
+ #
+ #MYLDFLAGS= -Wl,-E
+ #
++# Gentoo addition: this ones will be used for both the binaries and the libs.
++#LDFLAGS=
++#
+ # On Windows systems. support for dynamic loading is enabled by default.
+ # To disable this support, uncomment the next line.
+ #
+--- lua-5.0.2/src/lua/Makefile.orig	2006-05-07 17:30:09.000000000 +0200
++++ lua-5.0.2/src/lua/Makefile	2006-05-07 17:30:32.000000000 +0200
+@@ -13,7 +13,7 @@
+ all:	$T
+ 
+ $T:	$(OBJS) $(LIB)/liblua.a $(LIB)/liblualib.a
+-	$(CC) -o $@ $(MYLDFLAGS) $(OBJS) -L$(LIB) -llua -llualib $(EXTRA_LIBS) $(DLLIB)
++	$(CC) -o $@ $(MYLDFLAGS) $(LDFLAGS) $(OBJS) -L$(LIB) -llua -llualib $(EXTRA_LIBS) $(DLLIB)
+ 
+ $(LIB)/liblua.a:
+ 	cd ..; $(MAKE)
+--- lua-5.0.2/src/luac/Makefile.orig	2006-05-07 17:37:19.000000000 +0200
++++ lua-5.0.2/src/luac/Makefile	2006-05-07 17:37:41.000000000 +0200
+@@ -13,7 +13,7 @@
+ all:	$T
+ 
+ $T:	$(OBJS) $(LIB)/liblua.a $(LIB)/liblualib.a
+-	$(CC) -o $@ $(MYLDFLAGS) $(OBJS) -L$(LIB) -llua -llualib $(EXTRA_LIBS) $(DLLIB)
++	$(CC) -o $@ $(MYLDFLAGS) $(LDFLAGS) $(OBJS) -L$(LIB) -llua -llualib $(EXTRA_LIBS) $(DLLIB)
+ 
+ # print.c needs opcode names from lopcodes.c
+ lopcodes.o:	../lopcodes.c ../lopcodes.h
+--- lua-5.0.2/Makefile.orig	2006-05-07 16:50:37.000000000 +0200
++++ lua-5.0.2/Makefile	2006-05-07 17:29:45.000000000 +0200
+@@ -38,8 +38,8 @@
+ 
+ # shared libraries (for Linux)
+ so:
+-	gcc -o lib/liblua.so.$V -shared src/*.o
+-	gcc -o lib/liblualib.so.$V -shared src/lib/*.o
++	$(CC) -shared $(LDFLAGS) src/*.o -o lib/liblua.so.$V 
++	$(CC) -shared $(LDFLAGS) src/lib/*.o -L$(LIB) -llua $(DLLIB) $(EXTRA_LIBS) -o lib/liblualib.so.$V
+ 	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.2.ebuild b/dev-lang/lua/lua-5.0.2.ebuild
index 05d8d4aaf020..701cf58fc91d 100644
--- a/dev-lang/lua/lua-5.0.2.ebuild
+++ b/dev-lang/lua/lua-5.0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.19 2005/10/17 23:57:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.0.2.ebuild,v 1.20 2006/06/25 16:55:35 genstef Exp $
 
 inherit eutils
 
@@ -20,6 +20,7 @@ src_unpack() {
 	unpack ${A}
 
 	epatch ${FILESDIR}/lua-${PV}-pic.patch
+	epatch ${FILESDIR}/lua-${PV}-LDFLAGS_and_as-needed.patch
 	use ppc-macos && epatch ${FILESDIR}/lua-ppc-macos-Makefile.patch
 
 	cd ${S}
@@ -29,6 +30,7 @@ src_unpack() {
 			-e 's:^#\(LOADLIB= -DUSE_DLOPEN=1\):\1:' \
 			-e 's:^#\(DLLIB= -ldl\):\1:' \
 			-e 's:^#\(MYLDFLAGS= -Wl,-E\):\1:' \
+			-e "s:^#\(LDFLAGS=\).*:\1 ${LDFLAGS}:" \
 			-e 's:^#\(POPEN= -DUSE_POPEN=1\)$:\1:' \
 			-e "s:^\(MYCFLAGS= \)-O2:\1${CFLAGS}:" \
 			-e 's:^\(INSTALL_ROOT= \)/usr/local:\1$(DESTDIR)/usr:' \