Multilib fixes, add ~amd64 keyword.

(Portage version: 2.0.51.19)

3 files changed, 23 insertions, 14 deletions

diff --git a/net-misc/icaclient/ChangeLog b/net-misc/icaclient/ChangeLog
index 42e352d58bf1..ff676712f2d9 100644
--- a/net-misc/icaclient/ChangeLog
+++ b/net-misc/icaclient/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/icaclient
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/icaclient/ChangeLog,v 1.18 2004/12/12 16:36:27 weeve Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/icaclient/ChangeLog,v 1.19 2005/04/20 20:46:01 herbs Exp $
+
+  20 Apr 2005; Herbie Hopkins <herbs@gentoo.org> icaclient-8.0-r3.ebuild:
+  Multilib fixes, add ~amd64 keyword - Bug #89057
 
 *icaclient-8.0-r3 (12 Dec 2004)
 
diff --git a/net-misc/icaclient/Manifest b/net-misc/icaclient/Manifest
index 2d99a4be159f..6f925deb3409 100644
--- a/net-misc/icaclient/Manifest
+++ b/net-misc/icaclient/Manifest
@@ -1,11 +1,11 @@
-MD5 2db9f3037ac5828eb407c652b21d153c ChangeLog 2449
 MD5 53bd814649d90e7fabf654aabe9a6261 icaclient-6.30-r1.ebuild 1799
+MD5 6ac9af87c588be5c2b27c8814e421600 icaclient-8.0-r2.ebuild 2043
 MD5 8f493eb1f4a1e8c1c6e7c3d63f32a440 icaclient-7.0.ebuild 1792
+MD5 16ca7ac0ac72a0c2d5320aa51a106207 ChangeLog 2574
 MD5 d81ef8a7082707d12d1cf8977e79acbb metadata.xml 344
-MD5 f1f3025e60e04f8e3c9a6e49ca6d0105 icaclient-8.0-r3.ebuild 2189
-MD5 6ac9af87c588be5c2b27c8814e421600 icaclient-8.0-r2.ebuild 2043
-MD5 38e451023d1aed7c8c1351167d4c53b7 files/10ICAClient 67
-MD5 dc673ffc614ac414129b92d79d6893ea files/digest-icaclient-8.0-r3 70
+MD5 c9dae15c43663a8975853b4c3eb67234 icaclient-8.0-r3.ebuild 2343
 MD5 8c3ecc1c3852bbc576833ea8c4cc90c0 files/digest-icaclient-6.30-r1 71
-MD5 6d6282b0502b9927e5d77a1ed6751722 files/digest-icaclient-7.0 71
 MD5 dc673ffc614ac414129b92d79d6893ea files/digest-icaclient-8.0-r2 70
+MD5 dc673ffc614ac414129b92d79d6893ea files/digest-icaclient-8.0-r3 70
+MD5 6d6282b0502b9927e5d77a1ed6751722 files/digest-icaclient-7.0 71
+MD5 38e451023d1aed7c8c1351167d4c53b7 files/10ICAClient 67
diff --git a/net-misc/icaclient/icaclient-8.0-r3.ebuild b/net-misc/icaclient/icaclient-8.0-r3.ebuild
index 9c856cc43fcf..44989b01b7c5 100644
--- a/net-misc/icaclient/icaclient-8.0-r3.ebuild
+++ b/net-misc/icaclient/icaclient-8.0-r3.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/icaclient/icaclient-8.0-r3.ebuild,v 1.2 2004/12/14 08:39:05 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/icaclient/icaclient-8.0-r3.ebuild,v 1.3 2005/04/20 20:46:01 herbs Exp $
+
+inherit multilib
 
 DESCRIPTION="ICA Client"
 HOMEPAGE="http://www.citrix.com/download/unix-downloads.asp"
@@ -8,17 +10,21 @@ SRC_URI="ICAClient-8.0-1.i386.rpm"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="-* ~x86"
+KEYWORDS="-* ~x86 ~amd64"
 IUSE="gnome"
 RESTRICT="fetch"
 
 RDEPEND="virtual/libc
-	virtual/x11"
+	virtual/x11
+	amd64? ( >=app-emulation/emul-linux-x86-xlibs-1.0 )"
 DEPEND="${RDEPEND}
 	>=app-arch/rpm-3.0.6"
 
 S="${WORKDIR}/usr"
 
+# Binary x86 package
+has_multilib_profile && ABI="x86"
+
 pkg_nofetch() {
 	einfo "Please download ${A} yourself from www.citrix.com"
 	einfo "and place it in ${DISTDIR}"
@@ -70,8 +76,8 @@ src_install() {
 	doexe lib/ICAClient/wfica
 	insinto /etc/env.d
 	doins ${FILESDIR}/10ICAClient
-	insinto /usr/lib/nsbrowser/plugins
-	dosym /opt/ICAClient/npica.so /usr/lib/nsbrowser/plugins/npica.so
+	insinto /usr/$(get_libdir)/nsbrowser/plugins
+	dosym /opt/ICAClient/npica.so /usr/$(get_libdir)/nsbrowser/plugins/npica.so
 
 	if [ use gnome ]; then
 		insinto /usr/share/applications