Add patch for ppc-macos. Cleanup.

Package-Manager: portage-2.1.2_pre3-r1

4 files changed, 68 insertions, 4 deletions

diff --git a/dev-lang/lua/ChangeLog b/dev-lang/lua/ChangeLog
index b6b09faafd51..bdfe29c4332f 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.49 2006/10/15 16:07:25 exg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.50 2006/10/16 11:26:53 exg Exp $
+
+  16 Oct 2006; Emanuele Giaquinta <exg@gentoo.org>
+  -files/lua-5.0.2-gentoo.patch, +files/lua-5.0.3-destdir.patch,
+  +files/lua-5.0.3-dylib.patch, -lua-5.0.2-r1.ebuild, lua-5.0.3.ebuild:
+  Add patch for ppc-macos. Cleanup.
 
   15 Oct 2006; Emanuele Giaquinta <exg@gentoo.org>
   files/lua-ppc-macos-Makefile.patch, lua-5.0.2.ebuild:
diff --git a/dev-lang/lua/files/lua-5.0.3-destdir.patch b/dev-lang/lua/files/lua-5.0.3-destdir.patch
new file mode 100644
index 000000000000..c95cf4e3e3eb
--- /dev/null
+++ b/dev-lang/lua/files/lua-5.0.3-destdir.patch
@@ -0,0 +1,30 @@
+--- Makefile.old	2006-10-15 19:11:53.684244053 +0200
++++ Makefile	2006-10-15 19:13:19.637126651 +0200
+@@ -30,11 +30,11 @@
+ 
+ # 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)
++	mkdir -p $(DESTDIR)$(INSTALL_BIN) $(DESTDIR)$(INSTALL_INC) $(DESTDIR)$(INSTALL_LIB) $(DESTDIR)$(INSTALL_MAN)
++	$(INSTALL_EXEC) bin/* $(DESTDIR)$(INSTALL_BIN)
++	$(INSTALL_DATA) include/*.h $(DESTDIR)$(INSTALL_INC)
++	$(INSTALL_DATA) lib/*.a $(DESTDIR)$(INSTALL_LIB)
++	$(INSTALL_DATA) doc/*.1 $(DESTDIR)$(INSTALL_MAN)
+ 
+ # shared libraries (for Linux)
+ so:
+@@ -50,8 +50,8 @@
+ 
+ # 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
++	$(INSTALL_EXEC) lib/*.so.* $(DESTDIR)$(INSTALL_LIB)
++	cd $(DESTDIR)$(INSTALL_LIB); ln -fs liblua.so.$V liblua.so; ln -fs liblualib.so.$V liblualib.so
+ 
+ # clean shared libraries
+ soclean:
diff --git a/dev-lang/lua/files/lua-5.0.3-dylib.patch b/dev-lang/lua/files/lua-5.0.3-dylib.patch
new file mode 100644
index 000000000000..447edb6b26f9
--- /dev/null
+++ b/dev-lang/lua/files/lua-5.0.3-dylib.patch
@@ -0,0 +1,27 @@
+--- Makefile.old	2006-10-07 15:40:26.052127208 +0200
++++ Makefile	2006-10-07 19:06:55.504062239 +0200
+@@ -42,6 +42,12 @@
+ 	$(CC) $(LDFLAGS) -o lib/liblualib.so.$V -shared -Wl,-soname,liblualib.so.$V src/lib/*.o -L$(LIB) -llua $(EXTRA_LIBS) $(DLLIB)
+ 	cd lib; ln -fs liblua.so.$V liblua.so; ln -fs liblualib.so.$V liblualib.so
+ 
++dylib:
++	$(CC) -dynamiclib -flat_namespace -undefined suppress -o lib/liblua.$V.dylib src/*.lo -install_name $(INSTALL_LIB)/liblua.$V.dylib -compatibility_version $V -current_version $V
++	$(CC) -dynamiclib -flat_namespace -undefined suppress -o lib/liblualib.$V.dylib src/lib/*.lo -install_name $(INSTALL_LIB)/liblualib.$V.dylib -compatibility_version $V -current_version $V
++	cd lib; ln -fs liblua.$V.dylib liblua.dylib; ln -fs liblualib.$V.dylib liblualib.dylib
++	cd lib; ln -fs liblua.$V.dylib liblua.$(V:%.0=%).dylib; ln -fs liblualib.$V.dylib liblualib.$(V:%.0=%).dylib
++
+ # binaries using shared libraries
+ sobin:
+ 	rm -f bin/*
+@@ -53,6 +59,11 @@
+ 	$(INSTALL_EXEC) lib/*.so.* $(INSTALL_LIB)
+ 	cd $(INSTALL_LIB); ln -fs liblua.so.$V liblua.so; ln -fs liblualib.so.$V liblualib.so
+ 
++dylibinstall:
++	$(INSTALL_EXEC) lib/*.dylib $(DESTDIR)$(INSTALL_LIB)
++	cd $(DESTDIR)$(INSTALL_LIB); ln -fs liblua.$V.dylib liblua.dylib; ln -fs liblualib.$V.dylib liblualib.dylib
++	cd $(DESTDIR)$(INSTALL_LIB); ln -fs liblua.$V.dylib liblua.$(V:%.0=%).dylib; ln -fs liblualib.$V.dylib liblualib.$(V:%.0=%).dylib
++
+ # clean shared libraries
+ soclean:
+ 	rm -f lib/*.so* bin/*
diff --git a/dev-lang/lua/lua-5.0.3.ebuild b/dev-lang/lua/lua-5.0.3.ebuild
index e52d31d8e448..cca40aa2cc95 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.4 2006/10/15 15:54:10 exg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.0.3.ebuild,v 1.5 2006/10/16 11:26:53 exg Exp $
 
 inherit eutils portability
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
 IUSE="readline"
 
 RDEPEND="readline? ( sys-libs/readline )"
@@ -20,6 +20,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	epatch "${FILESDIR}"/${P}-destdir.patch
+	epatch "${FILESDIR}"/${P}-dylib.patch
 	epatch "${FILESDIR}"/${P}-shared.patch
 	epatch "${FILESDIR}"/${P}-ldflags.patch
 	epatch "${FILESDIR}"/${P}-asneeded.patch
@@ -28,7 +30,7 @@ src_unpack() {
 		-e 's:^#\(LOADLIB= -DUSE_DLOPEN=1\):\1:' \
 		-e 's:^#\(POPEN= -DUSE_POPEN=1\)$:\1:' \
 		-e "s:^\(MYCFLAGS= \)-O2:\1${CFLAGS}:" \
-		-e 's:^\(INSTALL_ROOT= \)/usr/local:\1$(DESTDIR)/usr:' \
+		-e 's:^\(INSTALL_ROOT= \)/usr/local:\1/usr:' \
 		-e "s:^\(INSTALL_LIB= \$(INSTALL_ROOT)/\)lib:\1$(get_libdir):" \
 		-e 's:^\(INSTALL_MAN= $(INSTALL_ROOT)\)/man/man1:\1/share/man/man1:'