Small multilib fix, closes bug 104669. Stable on amd64.

Package-Manager: portage-2.0.51.22-r2

diff --git a/app-shells/zsh/ChangeLog b/app-shells/zsh/ChangeLog
index 826a9b8c6d139a0143c6caa9c5b8be49f004a8a5..23741914d5a6489fd650d8011a613246bf6668a7 100644 (file)
--- a/app-shells/zsh/ChangeLog
+++ b/app-shells/zsh/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-shells/zsh
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.88 2005/06/18 16:42:02 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.89 2005/09/04 12:23:41 cryos Exp $
+
+  04 Sep 2005; Marcus D. Hanwell <cryos@gentoo.org> zsh-4.2.5.ebuild:
+  Small multilib fix, closes bug 104669. Stable on amd64.
 
   18 Jun 2005; Mamoru KOMACHI <usata@gentoo.org> zsh-4.2.5.ebuild:
   Don't use poll() on Mac OS X 10.4; bug #95515. Thanks to Kito

diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index 20fa4fb2ffda38e1f1b4dc99658fe140d229c6c7..46bffb7b6c62babdc20a956dae255bffd935a9fd 100644 (file)
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -1,14 +1,24 @@
-MD5 f9443c3138f4835f987c5359222e219d zsh-4.2.5.ebuild 4512
-MD5 3cc65379e1e66ab0f0ec802341eef4d8 ChangeLog 14134
-MD5 28ed8ea6cdccb353e2e8ad783eb51f5b metadata.xml 506
-MD5 94f8381cc21da147fc0975a5d208f637 zsh-4.2.4.ebuild 4307
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c2b2ed1462888163d7f8ec514e975d93 zsh-4.2.5.ebuild 4541
 MD5 28ae3771eb1a6ebb64171197c8d390e7 zsh-4.0.9-r4.ebuild 2893
-MD5 1710d7b038f0aac2aca3520bb546659c files/digest-zsh-4.2.5 199
-MD5 5f0bb4d1bbe63c42a104eb0cab8a28d3 files/zprofile 403
-MD5 e6a9690e5c9b23757e887e14da621c9c files/zsh-4.2.1-gentoo.diff 735
-MD5 de0db046f0f40cb1cc3cd3f6e6b2645a files/zshenv 318
+MD5 94f8381cc21da147fc0975a5d208f637 zsh-4.2.4.ebuild 4307
+MD5 bdd7e415b0d4d49952098f8fb4608dd1 ChangeLog 14263
+MD5 28ed8ea6cdccb353e2e8ad783eb51f5b metadata.xml 506
 MD5 81e325aacd554d2c5f6d14efe45d1ffd files/zsh-strncmp.diff 354
-MD5 9001ff5324448d902a296276500ac3fb files/digest-zsh-4.2.4 199
-MD5 de58f149f41740c394800ba8d2cdf361 files/digest-zsh-4.0.9-r4 199
 MD5 ab8716ecc62780da37e48f910bd34ed0 files/prompt_gentoo_setup 1222
+MD5 de58f149f41740c394800ba8d2cdf361 files/digest-zsh-4.0.9-r4 199
+MD5 e6a9690e5c9b23757e887e14da621c9c files/zsh-4.2.1-gentoo.diff 735
 MD5 eaa2f7dff9e7ca62087f9786cea84897 files/zsh-init.d-gentoo.diff 1389
+MD5 5f0bb4d1bbe63c42a104eb0cab8a28d3 files/zprofile 403
+MD5 de0db046f0f40cb1cc3cd3f6e6b2645a files/zshenv 318
+MD5 9001ff5324448d902a296276500ac3fb files/digest-zsh-4.2.4 199
+MD5 1710d7b038f0aac2aca3520bb546659c files/digest-zsh-4.2.5 199
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDGudrntT9W3vfTuoRAv3KAJ4z3I1YOlgAkBY1lOVLO8H04+0vIwCgp+um
+wV9mVXTZhOj8GVJpDJ8a4gM=
+=BikH
+-----END PGP SIGNATURE-----

diff --git a/app-shells/zsh/zsh-4.2.5.ebuild b/app-shells/zsh/zsh-4.2.5.ebuild
index debbd85d0b14a6c81d3917bf8f936dd5429b6a5d..e714506705899c46439e495d03d585cc0dce2d20 100644 (file)
--- a/app-shells/zsh/zsh-4.2.5.ebuild
+++ b/app-shells/zsh/zsh-4.2.5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.2.5.ebuild,v 1.9 2005/06/18 16:42:02 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.2.5.ebuild,v 1.10 2005/09/04 12:23:41 cryos Exp $
 
-inherit eutils
+inherit eutils multilib
 
 DESCRIPTION="UNIX Shell similar to the Korn shell"
 HOMEPAGE="http://www.zsh.org/"
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.zsh.org/pub/${P}.tar.bz2
 
 LICENSE="ZSH"
 SLOT="0"
-KEYWORDS="alpha ~amd64 arm hppa ia64 ppc ~ppc-macos sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc-macos sparc x86"
 IUSE="maildir ncurses static doc pcre cap"
 
 RDEPEND="pcre? ( >=dev-libs/libpcre-3.9 )
@@ -49,7 +49,7 @@ src_compile() {
 
        econf \
                --bindir=/bin \
-               --libdir=/usr/lib \
+               --libdir=/usr/$(get_libdir) \
                --enable-etcdir=/etc/zsh \
                --enable-zshenv=/etc/zsh/zshenv \
                --enable-zlogin=/etc/zsh/zlogin \
@@ -99,7 +99,7 @@ src_test() {
 src_install() {
        einstall \
                bindir=${D}/bin \
-               libdir=${D}/usr/lib \
+               libdir=${D}/usr/$(get_libdir) \
                fndir=${D}/usr/share/zsh/${PV%_*}/functions \
                sitefndir=${D}/usr/share/zsh/site-functions \
                install.bin install.man install.modules \