diff options
| author |   Herbie Hopkins <herbs@gentoo.org> | 2005-04-22 10:06:43 +0000 |
|---|---|---|
| committer | Herbie Hopkins <herbs@gentoo.org> | 2005-04-22 10:06:43 +0000 |
| commit | f20e4b20d5f5ba593d00375de405177eaf66abc3 (patch) | |
| tree | 8a183b79ec6c41dcc8b0f0f8511bd8f01170b121 /dev-lang | |
| parent | stable amd64 (diff) | |
| download | gentoo-2-f20e4b20d5f5ba593d00375de405177eaf66abc3.tar.gz gentoo-2-f20e4b20d5f5ba593d00375de405177eaf66abc3.tar.bz2 gentoo-2-f20e4b20d5f5ba593d00375de405177eaf66abc3.zip | |
Fix multilib-strict issue.
(Portage version: 2.0.51.19)
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/lua/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/lua/lua-5.0.2-r1.ebuild | 7 | ||||
| -rw-r--r-- | dev-lang/lua/lua-5.0.2.ebuild | 7 |
3 files changed, 13 insertions, 7 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/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 } |