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

Package-Manager: portage-2.1.2_pre3-r1

4 files changed, 19 insertions, 133 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/Manifest b/dev-lang/lua/Manifest
index 10bbc90ad91b..fd84654b83fd 100644
--- a/dev-lang/lua/Manifest
+++ b/dev-lang/lua/Manifest
@@ -26,10 +26,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-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
+AUX lua-ppc-macos-Makefile.patch 2681 RMD160 96be558e865831b2298eddadd3b251f46846a37b SHA1 8fd652137350c6112dbfa553768e56080eeadb15 SHA256 ee61106a273935047fe1557c5af86f7b743427e38c4f552fab3841a199f48f8b
+MD5 710b33a666e65c67841362970d8afb83 files/lua-ppc-macos-Makefile.patch 2681
+RMD160 96be558e865831b2298eddadd3b251f46846a37b files/lua-ppc-macos-Makefile.patch 2681
+SHA256 ee61106a273935047fe1557c5af86f7b743427e38c4f552fab3841a199f48f8b files/lua-ppc-macos-Makefile.patch 2681
 DIST lua-4.0.1.tar.gz 158426
 DIST lua-5.0.2.tar.gz 190442 RMD160 5f1a1cf5802e38b3c4dcfc9f3cd0dc33bfdc0a30 SHA1 a200cfd20a9a4c7da1206ae45dddf26186a9e0e7 SHA256 a6c85d85f912e1c321723084389d63dee7660b81b8292452b190ea7190dd73bc
 DIST lua-5.0.3.tar.gz 191384 RMD160 cb3ed4320b438d73c8ff6c93a02275c9fb461883 SHA1 e7e91f78b8a8deb09b13436829bed557a46af8ae SHA256 1193a61b0e08acaa6eee0eecf29709179ee49c71baebc59b682a25c3b5a45671
@@ -41,18 +41,18 @@ EBUILD lua-5.0.2-r1.ebuild 2363 RMD160 a60a5a572a9df2e5b8ee473c21da3a89757e1153
 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
-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
+EBUILD lua-5.0.2.ebuild 2990 RMD160 211dd4e2ecc6bb534df448b5b33518e3cb19f6ee SHA1 7e4a98deef5fc330481d061c0495269aeb1cf5d2 SHA256 8703ad73113edfe3399c0873f7e97543c41ec4ddfdec035669974e495ea93248
+MD5 a3a02de8ac9f5d7175dc7b06f09c4e74 lua-5.0.2.ebuild 2990
+RMD160 211dd4e2ecc6bb534df448b5b33518e3cb19f6ee lua-5.0.2.ebuild 2990
+SHA256 8703ad73113edfe3399c0873f7e97543c41ec4ddfdec035669974e495ea93248 lua-5.0.2.ebuild 2990
 EBUILD lua-5.0.3.ebuild 3003 RMD160 eea479aaacaa85b4b0c6ef2be15d2c73499bc2e7 SHA1 101b4b3f2781d63c9e566a27c2eac27a60e776d5 SHA256 d577fbce4006ca6e46761503c3a3e25ecfa47629f404a1053aefff635e36627e
 MD5 6e07dcdef7a733b872ca14a736347346 lua-5.0.3.ebuild 3003
 RMD160 eea479aaacaa85b4b0c6ef2be15d2c73499bc2e7 lua-5.0.3.ebuild 3003
 SHA256 d577fbce4006ca6e46761503c3a3e25ecfa47629f404a1053aefff635e36627e lua-5.0.3.ebuild 3003
-MISC ChangeLog 6581 RMD160 40f0b9e102add0fd92db045951db1e1d794467ff SHA1 d4aad2f6b6b11ca5a8042b188d9febc91ef6b4ad SHA256 ebdfcf0daeb91e31de1f772304cbfd8dc1e1a5d4c6128e5f02e5a71cdbc0e63a
-MD5 046a75d18f5c60da3f3f407aa39176a3 ChangeLog 6581
-RMD160 40f0b9e102add0fd92db045951db1e1d794467ff ChangeLog 6581
-SHA256 ebdfcf0daeb91e31de1f772304cbfd8dc1e1a5d4c6128e5f02e5a71cdbc0e63a ChangeLog 6581
+MISC ChangeLog 6756 RMD160 2227af6497daeb886c5d1072f8ff90c0c0f6cc7d SHA1 1076d61e032b8da429797127c3957e062a014350 SHA256 ee8eee2e171d9dcaad3d2ca6c3c5f04a64d2cdce25e5fd4516c18269cf40bf64
+MD5 659ff93d842125f01c6c5116887125d2 ChangeLog 6756
+RMD160 2227af6497daeb886c5d1072f8ff90c0c0f6cc7d ChangeLog 6756
+SHA256 ee8eee2e171d9dcaad3d2ca6c3c5f04a64d2cdce25e5fd4516c18269cf40bf64 ChangeLog 6756
 MISC metadata.xml 253 RMD160 614ccb0096d3d247b02426b231d8cd462f52d2bd SHA1 007052a587e4927dbfef637752ac4f37b8c28636 SHA256 b7ad8bfe01c6a18679669971b43a69021bdcf704a05ee48f71a658cc2959a0d4
 MD5 80b94ea3b8e4881c84cc712aec6650e4 metadata.xml 253
 RMD160 614ccb0096d3d247b02426b231d8cd462f52d2bd metadata.xml 253
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}