Clean up ppc-macos patch. Disable as-needed patch, it is broken.

(Portage version: 2.1.2_pre3-r1)

3 files changed, 7 insertions, 121 deletions

diff --git a/dev-lang/lua/ChangeLog b/dev-lang/lua/ChangeLog
index c5b5a25eb849..b6b09faafd51 100644
--- a/dev-lang/lua/ChangeLog
+++ b/dev-lang/lua/ChangeLog
@@ -1,6 +1,10 @@
 # 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.48 2006/10/15 15:54:10 exg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.49 2006/10/15 16:07:25 exg Exp $
+
+  15 Oct 2006; Emanuele Giaquinta <exg@gentoo.org>
+  files/lua-ppc-macos-Makefile.patch, lua-5.0.2.ebuild:
+  Clean up ppc-macos patch. Disable as-needed patch, it is broken.
 
   15 Oct 2006; Emanuele Giaquinta <exg@gentoo.org>
   files/lua-5.0.3-asneeded.patch, files/lua-5.0.3-ldflags.patch,
diff --git a/dev-lang/lua/files/lua-ppc-macos-Makefile.patch b/dev-lang/lua/files/lua-ppc-macos-Makefile.patch
index 4434862ccdbe..c97a2a7aa5af 100644
--- a/dev-lang/lua/files/lua-ppc-macos-Makefile.patch
+++ b/dev-lang/lua/files/lua-ppc-macos-Makefile.patch
@@ -1,18 +1,6 @@
 diff -Naur lua-5.0.2/Makefile lua-5.0.2-new/Makefile
 --- lua-5.0.2/Makefile	Sat Feb  5 14:33:58 2005
 +++ lua-5.0.2-new/Makefile	Sat Feb  5 14:36:07 2005
-@@ -22,7 +22,10 @@
- 
- # simple test to see Lua working
- test:	all
--	bin/lua test/hello.lua
-+	@for ltest in `ls test/*.lua | grep -v life.lua`; do \
-+		echo "Running $$ltest ..."; \
-+		bin/lua $$ltest; \
-+	done
- 
- # remove debug information from binaries
- strip:
 @@ -30,11 +33,11 @@
  
  # official installation
@@ -77,109 +65,3 @@ diff -Naur lua-5.0.2/Makefile lua-5.0.2-new/Makefile
  	@echo "INSTALL_ROOT = $(INSTALL_ROOT)"
  	@echo "INSTALL_BIN = $(INSTALL_BIN)"
  	@echo "INSTALL_INC = $(INSTALL_INC)"
-diff -Naur lua-5.0.2/Makefile.orig lua-5.0.2-new/Makefile.orig
---- lua-5.0.2/Makefile.orig	Wed Dec 31 19:00:00 1969
-+++ lua-5.0.2-new/Makefile.orig	Sat Feb  5 14:35:42 2005
-@@ -0,0 +1,102 @@
-+# makefile for Lua hierarchy
-+# see INSTALL for installation instructions
-+# see config for customization instructions
-+
-+LUA= .
-+
-+include $(LUA)/config
-+
-+# primary targets ("co" and "klean" are used for making the distribution)
-+all clean co klean:	dirs
-+	cd include; $(MAKE) $@
-+	cd src; $(MAKE) $@
-+	cd src/lib; $(MAKE) $@
-+	cd src/luac; $(MAKE) $@
-+	cd src/lua; $(MAKE) $@
-+
-+# in case they were not created during unpacking
-+dirs:	bin lib
-+
-+bin lib:
-+	mkdir -p $@
-+
-+# simple test to see Lua working
-+test:	all
-+	bin/lua test/hello.lua
-+
-+# remove debug information from binaries
-+strip:
-+	$(STRIP) bin/*
-+
-+# official installation
-+install: all strip
-+	mkdir -p $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN)
-+	$(INSTALL_EXEC) bin/* $(INSTALL_BIN)
-+	$(INSTALL_DATA) include/*.h $(INSTALL_INC)
-+	$(INSTALL_DATA) lib/*.a $(INSTALL_LIB)
-+	$(INSTALL_DATA) doc/*.1 $(INSTALL_MAN)
-+
-+# shared libraries (for Linux)
-+so:
-+	gcc -o lib/liblua.so.$V -shared src/*.o
-+	gcc -o lib/liblualib.so.$V -shared src/lib/*.o
-+	cd lib; ln -fs liblua.so.$V liblua.so; ln -fs liblualib.so.$V liblualib.so
-+
-+# binaries using shared libraries
-+sobin:
-+	rm -f bin/*
-+	cd src/lua; $(MAKE)
-+	cd src/luac; $(MAKE)
-+
-+# install shared libraries
-+soinstall:
-+	$(INSTALL_EXEC) lib/*.so.* $(INSTALL_LIB)
-+	cd $(INSTALL_LIB); ln -fs liblua.so.$V liblua.so; ln -fs liblualib.so.$V liblualib.so
-+
-+# clean shared libraries
-+soclean:
-+	rm -f lib/*.so* bin/*
-+
-+# echo config parameters
-+echo:
-+	@echo ""
-+	@echo "These are the parameters currently set in $(LUA)/config to build Lua $V:"
-+	@echo ""
-+	@echo "LOADLIB = $(LOADLIB)"
-+	@echo "DLLIB = $(DLLIB)"
-+	@echo "NUMBER = $(NUMBER)"
-+	@echo "POPEN = $(POPEN)"
-+	@echo "TMPNAM = $(TMPNAM)"
-+	@echo "DEGREES = $(DEGREES)"
-+	@echo "USERCONF = $(USERCONF)"
-+	@echo "CC = $(CC)"
-+	@echo "WARN = $(WARN)"
-+	@echo "MYCFLAGS = $(MYCFLAGS)"
-+	@echo "MYLDFLAGS = $(MYLDFLAGS)"
-+	@echo "EXTRA_LIBS = $(EXTRA_LIBS)"
-+	@echo "AR = $(AR)"
-+	@echo "RANLIB = $(RANLIB)"
-+	@echo "STRIP = $(STRIP)"
-+	@echo "INSTALL_ROOT = $(INSTALL_ROOT)"
-+	@echo "INSTALL_BIN = $(INSTALL_BIN)"
-+	@echo "INSTALL_INC = $(INSTALL_INC)"
-+	@echo "INSTALL_LIB = $(INSTALL_LIB)"
-+	@echo "INSTALL_MAN = $(INSTALL_MAN)"
-+	@echo "INSTALL_EXEC = $(INSTALL_EXEC)"
-+	@echo "INSTALL_DATA = $(INSTALL_DATA)"
-+	@echo ""
-+	@echo "Edit $(LUA)/config if needed to suit your platform and then run make."
-+	@echo ""
-+
-+# turn config into Lua code
-+# uncomment the last sed expression if you want nil instead of empty strings
-+lecho:
-+	@echo "-- $(LUA)/config for Lua $V"
-+	@echo "VERSION = '$(V)'"
-+	@make echo | grep = | sed -e 's/= /= "/' -e 's/$$/"/' #-e 's/""/nil/'
-+	@echo "-- EOF"
-+
-+newer:
-+	@find . -newer MANIFEST -type f
-+
-+# (end of Makefile)
diff --git a/dev-lang/lua/lua-5.0.2.ebuild b/dev-lang/lua/lua-5.0.2.ebuild
index 701cf58fc91d..7c6bfd23111d 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-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.20 2006/06/25 16:55:35 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.0.2.ebuild,v 1.21 2006/10/15 16:07:25 exg Exp $
 
 inherit eutils
 
@@ -20,7 +20,7 @@ src_unpack() {
 	unpack ${A}
 
 	epatch ${FILESDIR}/lua-${PV}-pic.patch
-	epatch ${FILESDIR}/lua-${PV}-LDFLAGS_and_as-needed.patch
+	#epatch ${FILESDIR}/lua-${PV}-LDFLAGS_and_as-needed.patch
 	use ppc-macos && epatch ${FILESDIR}/lua-ppc-macos-Makefile.patch
 
 	cd ${S}