Ported patch from 5.0.2 version to this version. Only affects ppc-macos environment.

Package-Manager: portage-2.0.51.19

3 files changed, 28 insertions, 26 deletions

diff --git a/dev-lang/lua/ChangeLog b/dev-lang/lua/ChangeLog
index 287fe88131db..1bd32e2621b7 100644
--- a/dev-lang/lua/ChangeLog
+++ b/dev-lang/lua/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/lua
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.38 2005/04/22 10:06:43 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.39 2005/07/28 05:09:29 j4rg0n Exp $
+
+  28 Jul 2005; Lina Pezzella <j4rg0n@gentoo.org> lua-5.0.2-r1.ebuild:
+  Ported patch from 5.0.2 version to this version. Only affects ppc-macos
+  environment.
 
   22 Apr 2005; Herbie Hopkins <herbs@gentoo.org> lua-5.0.2.ebuild,
   lua-5.0.2-r1.ebuild:
diff --git a/dev-lang/lua/Manifest b/dev-lang/lua/Manifest
index 1d8894a10970..1d3d03090d79 100644
--- a/dev-lang/lua/Manifest
+++ b/dev-lang/lua/Manifest
@@ -1,29 +1,19 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 18cc294f1468af46eb78c4f59617d9ba lua-5.0.2.ebuild 2922
-MD5 144421c8845c2f2cc4a54fe312d2751c lua-5.0.1_beta20031003-r2.ebuild 2291
-MD5 46f8ba718cf6c2f210a03e8999c9178f lua-4.0.ebuild 763
+MD5 0e083d45d1814b221964444bac9f8cf4 ChangeLog 5055
 MD5 9495bd1aa03bc8a99e5d0dba5d7285e7 lua-4.0.1.ebuild 776
+MD5 46f8ba718cf6c2f210a03e8999c9178f lua-4.0.ebuild 763
+MD5 144421c8845c2f2cc4a54fe312d2751c lua-5.0.1_beta20031003-r2.ebuild 2291
+MD5 b5e9031bff9f3b68461b830f4ddd9009 lua-5.0.2-r1.ebuild 2395
+MD5 18cc294f1468af46eb78c4f59617d9ba lua-5.0.2.ebuild 2922
 MD5 c14409a08c938747f51f94bed9ffc6ac lua-5.0.ebuild 1027
-MD5 1089b1e163aaf7230c8fa15210fabb83 ChangeLog 4894
 MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244
-MD5 64f960d1afc61f88380e4f9df3f63e93 lua-5.0.2-r1.ebuild 2123
-MD5 6365486c1e78a5fc73e34a3bda3feef7 files/lua-4.0-config.patch 840
+MD5 7bb76903226a11484013e9657e217025 files/digest-lua-4.0 55
 MD5 652889fa621a25d6dc41ce0eb76bd5c2 files/digest-lua-4.0.1 61
+MD5 766235af7b9cb542daa81331dd026bab files/digest-lua-5.0 59
+MD5 f38ae8bf37049562a9b36c30d90eea78 files/digest-lua-5.0.1_beta20031003-r2 61
 MD5 7ada6b04da7ea1d6e5128accf7a3c355 files/digest-lua-5.0.2 61
-MD5 157b7a36290e2e020146ed958b570f51 files/lua-ppc-macos-Makefile.patch 5873
 MD5 7ada6b04da7ea1d6e5128accf7a3c355 files/digest-lua-5.0.2-r1 61
-MD5 74b0268bdadf862659a5a088cf5f424f files/lua-5.0.2-pic.patch 1243
-MD5 f38ae8bf37049562a9b36c30d90eea78 files/digest-lua-5.0.1_beta20031003-r2 61
-MD5 7bb76903226a11484013e9657e217025 files/digest-lua-4.0 55
-MD5 766235af7b9cb542daa81331dd026bab files/digest-lua-5.0 59
+MD5 6365486c1e78a5fc73e34a3bda3feef7 files/lua-4.0-config.patch 840
 MD5 48a12e850720480ed45115452657c493 files/lua-5.0.1-pic.patch 1306
 MD5 f3cf4211cea7a402f31def33b218561e files/lua-5.0.2-gentoo.patch 524
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCaMzI2G5bA0cA/ScRAhHqAJ9PIwn1mwMQIqlugbdEpACNHgX0mACgtAsY
-HxC+IQpj7wz0RPVpgUpeUSE=
-=dz+v
------END PGP SIGNATURE-----
+MD5 74b0268bdadf862659a5a088cf5f424f files/lua-5.0.2-pic.patch 1243
+MD5 157b7a36290e2e020146ed958b570f51 files/lua-ppc-macos-Makefile.patch 5873
diff --git a/dev-lang/lua/lua-5.0.2-r1.ebuild b/dev-lang/lua/lua-5.0.2-r1.ebuild
index 6480bb186bc0..639f416226ed 100644
--- a/dev-lang/lua/lua-5.0.2-r1.ebuild
+++ b/dev-lang/lua/lua-5.0.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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-r1.ebuild,v 1.5 2005/04/22 10:06:43 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.0.2-r1.ebuild,v 1.6 2005/07/28 05:09:29 j4rg0n Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 -hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 -hppa ~ia64 ~mips ~ppc ~ppc-macos ~sparc ~x86"
 IUSE="readline"
 
 DEPEND=">=sys-apps/sed-4
@@ -20,19 +20,22 @@ src_unpack() {
 	unpack ${A}
 
 	epatch ${FILESDIR}/lua-${PV}-gentoo.patch
+	use ppc-macos && epatch ${FILESDIR}/lua-ppc-macos-Makefile.patch
 
 	cd ${S}
 
 	sed -i config \
 		-e 's:^#\(LOADLIB= -DUSE_DLOPEN=1\):\1:' \
 		-e 's:^#\(DLLIB= -ldl\):\1:' \
-		-e 's:^#\(MYLDFLAGS= -Wl,-E\):\1:' \
 		-e 's:^#\(POPEN= -DUSE_POPEN=1\)$:\1:' \
 		-e "s:^\(MYCFLAGS= \)-O2:\1${CFLAGS} -fPIC -DPIC:" \
 		-e 's:^\(INSTALL_ROOT= \)/usr/local:\1$(DESTDIR)/usr:' \
 		-e "s:^\(INSTALL_LIB= \$(INSTALL_ROOT)/\)lib:\1$(get_libdir):" \
 		-e 's:^\(INSTALL_MAN= $(INSTALL_ROOT)\)/man/man1:\1/share/man/man1:'
 
+	# The Darwin linker does not have the -E option.
+	use ppc-macos || sed -i -e 's:^#\(MYLDFLAGS= -Wl,-E\):\1:' config
+
 	sed -i doc/readme.html \
 		-e 's:\(/README\)\("\):\1.gz\2:g'
 
@@ -63,7 +66,12 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install soinstall || die
+	if use ppc-macos; then
+		# OSX does not have so files.
+		make DESTDIR=${D} install dylibinstall || die
+	else
+		make DESTDIR=${D} install soinstall || die
+	fi
 
 	dodoc HISTORY UPDATE
 	dohtml doc/*.html doc/*.gif