Fix multilib-strict issue.

Package-Manager: portage-2.0.51.19

4 files changed, 26 insertions, 10 deletions

diff --git a/dev-lang/lua/ChangeLog b/dev-lang/lua/ChangeLog
index 08d7f181e58d..287fe88131db 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.37 2005/04/21 22:37:43 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.38 2005/04/22 10:06:43 herbs Exp $
+
+  22 Apr 2005; Herbie Hopkins <herbs@gentoo.org> lua-5.0.2.ebuild,
+  lua-5.0.2-r1.ebuild:
+  Fixed multilib strict issue, bug #88120
 
   21 Apr 2005; Aron Griffis <agriffis@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 8e07e124f2ad..1d8894a10970 100644
--- a/dev-lang/lua/Manifest
+++ b/dev-lang/lua/Manifest
@@ -1,11 +1,14 @@
-MD5 5676dc0590c5cbe824cb2614968c009b lua-5.0.2.ebuild 2837
+-----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 9495bd1aa03bc8a99e5d0dba5d7285e7 lua-4.0.1.ebuild 776
 MD5 c14409a08c938747f51f94bed9ffc6ac lua-5.0.ebuild 1027
-MD5 a306e6f41b26156b6f8070fc8bb09193 ChangeLog 4764
+MD5 1089b1e163aaf7230c8fa15210fabb83 ChangeLog 4894
 MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244
-MD5 3449ce6e26611e2ef7c803e25369a70a lua-5.0.2-r1.ebuild 2039
+MD5 64f960d1afc61f88380e4f9df3f63e93 lua-5.0.2-r1.ebuild 2123
 MD5 6365486c1e78a5fc73e34a3bda3feef7 files/lua-4.0-config.patch 840
 MD5 652889fa621a25d6dc41ce0eb76bd5c2 files/digest-lua-4.0.1 61
 MD5 7ada6b04da7ea1d6e5128accf7a3c355 files/digest-lua-5.0.2 61
@@ -17,3 +20,10 @@ MD5 7bb76903226a11484013e9657e217025 files/digest-lua-4.0 55
 MD5 766235af7b9cb542daa81331dd026bab files/digest-lua-5.0 59
 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-----
diff --git a/dev-lang/lua/lua-5.0.2-r1.ebuild b/dev-lang/lua/lua-5.0.2-r1.ebuild
index 010550d7e2ca..6480bb186bc0 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.4 2005/04/21 22:37:43 agriffis Exp $
+# $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 $
 
 inherit eutils
 
@@ -30,6 +30,7 @@ src_unpack() {
 		-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:'
 
 	sed -i doc/readme.html \
@@ -45,7 +46,7 @@ src_unpack() {
 prefix=/usr
 exec_prefix=\${prefix}
 includedir=\${prefix}/include
-libdir=\${exec_prefix}/lib
+libdir=\${exec_prefix}/$(get_libdir)
 interpreter=\${exec_prefix}/bin/lua
 compiler=\${exec_prefix}/bin/luac
 
@@ -77,6 +78,6 @@ src_install() {
 	newins etc/lua.magic magic
 	insinto /usr/share/pixmaps
 	doins etc/lua.xpm
-	insinto /usr/lib/pkgconfig
+	insinto /usr/$(get_libdir)/pkgconfig
 	doins etc/lua.pc
 }
diff --git a/dev-lang/lua/lua-5.0.2.ebuild b/dev-lang/lua/lua-5.0.2.ebuild
index 59f433419258..2f0606116371 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
 # 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.15 2005/04/21 22:37:43 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.0.2.ebuild,v 1.16 2005/04/22 10:06:43 herbs Exp $
 
 inherit eutils
 
@@ -32,6 +32,7 @@ src_unpack() {
 			-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_LIB= \$(INSTALL_ROOT)/\)lib:\1$(get_libdir):" \
 			-e 's:^\(INSTALL_MAN= $(INSTALL_ROOT)\)/man/man1:\1/share/man/man1:'
 	else
 		sed -i config \
@@ -56,7 +57,7 @@ src_unpack() {
 prefix=/usr
 exec_prefix=\${prefix}
 includedir=\${prefix}/include
-libdir=\${exec_prefix}/lib
+libdir=\${exec_prefix}/$(get_libdir)
 interpreter=\${exec_prefix}/bin/lua
 compiler=\${exec_prefix}/bin/luac
 
@@ -101,6 +102,6 @@ src_install() {
 	newins etc/lua.magic magic
 	insinto /usr/share/pixmaps
 	doins etc/lua.xpm
-	insinto /usr/lib/pkgconfig
+	insinto /usr/$(get_libdir)/pkgconfig
 	doins etc/lua.pc
 }