Added patch from bug #108328 and marking stable on amd64 and x86.

Package-Manager: portage-2.1.1_pre2-r6

4 files changed, 32 insertions, 25 deletions

diff --git a/net-misc/icaclient/ChangeLog b/net-misc/icaclient/ChangeLog
index 9211a9f40688..6b56856f9612 100644
--- a/net-misc/icaclient/ChangeLog
+++ b/net-misc/icaclient/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/icaclient
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/icaclient/ChangeLog,v 1.27 2006/06/12 21:07:16 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/icaclient/ChangeLog,v 1.28 2006/07/25 20:48:29 wolf31o2 Exp $
+
+  25 Jul 2006; Chris Gianelloni <wolf31o2@gentoo.org> icaclient-9.0.ebuild:
+  Added patch from bug #108328 and marking stable on amd64 and x86.
 
   12 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   icaclient-6.30-r1.ebuild, icaclient-7.0.ebuild, -icaclient-8.0-r2.ebuild,
diff --git a/net-misc/icaclient/Manifest b/net-misc/icaclient/Manifest
index 54d2d67de944..28edcc56e35e 100644
--- a/net-misc/icaclient/Manifest
+++ b/net-misc/icaclient/Manifest
@@ -8,7 +8,7 @@ SHA256 4468c32491f56b192964ddd82c854c8c73da06879cb767d89ab24ee45d186484 files/10
 DIST ICAClient-6.30-1.i386.rpm 1453051
 DIST ICAClient-7.00-1.i386.rpm 1864192
 DIST ICAClient-8.0-1.i386.rpm 1508550
-DIST ICAClient-9.0-1.i386.rpm 1315649
+DIST ICAClient-9.0-1.i386.rpm 1315649 RMD160 a43df9c5e29a48053eb4021119f249305f9602bc SHA1 04fefc7376a9ee9ca87efa6dbd7abe24a30ed7a4 SHA256 896f3c45a8ccdb9e4952fc3090e42fd382f93e3e6cad19373525bcee241da6fa
 EBUILD icaclient-6.30-r1.ebuild 1990 RMD160 88f485ca635425c5b622e9fba7d7f05e9c829560 SHA1 b54b07c1e1f0efd20c25bfccaeb1a22d4e4d5a70 SHA256 727f5f64b029dfb81c465cc595c280141b0a70b293335542156a64ff5f921bc6
 MD5 393ff339536fcc780974073ceac849f2 icaclient-6.30-r1.ebuild 1990
 RMD160 88f485ca635425c5b622e9fba7d7f05e9c829560 icaclient-6.30-r1.ebuild 1990
@@ -21,14 +21,14 @@ EBUILD icaclient-8.0-r3.ebuild 2559 RMD160 203e6911c3c9d555a7bdcb31d77847d6c6ede
 MD5 4411d9bc17ee501e8a7d8126d8e83ca7 icaclient-8.0-r3.ebuild 2559
 RMD160 203e6911c3c9d555a7bdcb31d77847d6c6ede512 icaclient-8.0-r3.ebuild 2559
 SHA256 e0e4dd841b687eb83ddebab0b0aac7fbcd9e43fe33ef1445eeedad31fa18ce58 icaclient-8.0-r3.ebuild 2559
-EBUILD icaclient-9.0.ebuild 2662 RMD160 3b885068801d5f319e39cb022e8c00e8d0bd652d SHA1 a6ade9dbe655116ea2962aba2b709c4589974719 SHA256 4782917e8584a08c4ed91b8732086dfa36fbdd6af1db3e1a65057fbcecc521ef
-MD5 a564326e7d06cda6b4871275dfc65d69 icaclient-9.0.ebuild 2662
-RMD160 3b885068801d5f319e39cb022e8c00e8d0bd652d icaclient-9.0.ebuild 2662
-SHA256 4782917e8584a08c4ed91b8732086dfa36fbdd6af1db3e1a65057fbcecc521ef icaclient-9.0.ebuild 2662
-MISC ChangeLog 3855 RMD160 1f8aa811abe040cbc5a242f05704b6cbf46946a7 SHA1 a7eea54e492213010dba80f8e2051ca806db3a92 SHA256 fbf5173ad9cc27bf931b562e37a2b69c198a7740cb81629998708c04e14e7a6b
-MD5 e985631fa510d23f7e4864afee2f5354 ChangeLog 3855
-RMD160 1f8aa811abe040cbc5a242f05704b6cbf46946a7 ChangeLog 3855
-SHA256 fbf5173ad9cc27bf931b562e37a2b69c198a7740cb81629998708c04e14e7a6b ChangeLog 3855
+EBUILD icaclient-9.0.ebuild 2929 RMD160 f1ddebce2e0b0816eb3bcce381eac785c5f8b78e SHA1 2668fa68cc2a03850ca257a120dfc8a47c87a2a3 SHA256 968cdb2cfae388c0c3783e391cefd97b8c69318f97d22cefe2198a84dc306848
+MD5 17dbbd37d334795d65f7a904df72d503 icaclient-9.0.ebuild 2929
+RMD160 f1ddebce2e0b0816eb3bcce381eac785c5f8b78e icaclient-9.0.ebuild 2929
+SHA256 968cdb2cfae388c0c3783e391cefd97b8c69318f97d22cefe2198a84dc306848 icaclient-9.0.ebuild 2929
+MISC ChangeLog 4000 RMD160 40c7a866fc985577f6ed622079de1db5a03c41e1 SHA1 48f30a325ff4f3b31689ef4d926dac52d3e278f6 SHA256 50edb4d2c7487ffb972483f00140d19478e8a3e589d842f1f78dbf7181d90437
+MD5 fe52e158da3f2e5234e359ca9ff5b009 ChangeLog 4000
+RMD160 40c7a866fc985577f6ed622079de1db5a03c41e1 ChangeLog 4000
+SHA256 50edb4d2c7487ffb972483f00140d19478e8a3e589d842f1f78dbf7181d90437 ChangeLog 4000
 MISC metadata.xml 352 RMD160 e6dc28cdd5710e228b22a253c6c41c25a7d63231 SHA1 6ac254c58b7d90d3634e271ffcb971466b0f6e0e SHA256 37724dcb0b9a12bac2da5836f3837ad8b9ea2c9897ea1eb1520ff8ff70f19f1b
 MD5 875f57efbbce964b88401fd8d2fb4245 metadata.xml 352
 RMD160 e6dc28cdd5710e228b22a253c6c41c25a7d63231 metadata.xml 352
@@ -42,13 +42,13 @@ SHA256 5e4e25cf90642a0cbb6df5df33a44272836cd508b473dc3055ce406ba77dba57 files/di
 MD5 dc673ffc614ac414129b92d79d6893ea files/digest-icaclient-8.0-r3 70
 RMD160 9e29b8847b7ecc3bc82a39b8a3436bfdac202111 files/digest-icaclient-8.0-r3 70
 SHA256 09b8d7467e015553f2d8ff3cada2807f9c14a50d853d2fca9ae84fec8785bf9d files/digest-icaclient-8.0-r3 70
-MD5 acdf869e56609fbdc8963ae79e838bb8 files/digest-icaclient-9.0 70
-RMD160 ea1eee0c80ec7f4d4f04cfe9d6f9e27efbd999a8 files/digest-icaclient-9.0 70
-SHA256 6326a929e03cebfc9bc97189d8cc908a87df25f3b299bafcb08f04df20d2fa0c files/digest-icaclient-9.0 70
+MD5 650352f9cde0cd6a8b87dae5891c4076 files/digest-icaclient-9.0 256
+RMD160 8199f102c7b458871cd7570e42c6793325f01ceb files/digest-icaclient-9.0 256
+SHA256 e1967d032852a6871663680d5331e82477cf0817c143c3e49be359ccfc02f8bb files/digest-icaclient-9.0 256
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEjdeMkT4lNIS36YERAkVMAJ0Rk3Gqksv64WmbP8RIt1Zkuen10QCfaxOh
-ae+hMPEb85VWHqKZp9ZXsAQ=
-=0nnW
+iD8DBQFExoMrkT4lNIS36YERAuBGAJ9ABVTwuUJ5dAL7p7rdU9xc2AAZAgCfRfrC
+Jp4uaRyI0qHt18tbWSIM0Vc=
+=LdQw
 -----END PGP SIGNATURE-----
diff --git a/net-misc/icaclient/files/digest-icaclient-9.0 b/net-misc/icaclient/files/digest-icaclient-9.0
index 3db6df5daef2..dccd902e57bd 100644
--- a/net-misc/icaclient/files/digest-icaclient-9.0
+++ b/net-misc/icaclient/files/digest-icaclient-9.0
@@ -1 +1,3 @@
 MD5 f04f94705b600e59d2af8457241f4767 ICAClient-9.0-1.i386.rpm 1315649
+RMD160 a43df9c5e29a48053eb4021119f249305f9602bc ICAClient-9.0-1.i386.rpm 1315649
+SHA256 896f3c45a8ccdb9e4952fc3090e42fd382f93e3e6cad19373525bcee241da6fa ICAClient-9.0-1.i386.rpm 1315649
diff --git a/net-misc/icaclient/icaclient-9.0.ebuild b/net-misc/icaclient/icaclient-9.0.ebuild
index 57ff8e2f005a..4dfead58fec1 100644
--- a/net-misc/icaclient/icaclient-9.0.ebuild
+++ b/net-misc/icaclient/icaclient-9.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/icaclient/icaclient-9.0.ebuild,v 1.6 2006/06/12 21:07:16 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/icaclient/icaclient-9.0.ebuild,v 1.7 2006/07/25 20:48:29 wolf31o2 Exp $
 
-inherit multilib
+inherit eutils multilib
 
 DESCRIPTION="ICA Client"
 HOMEPAGE="http://www.citrix.com/"
@@ -10,8 +10,8 @@ SRC_URI="ICAClient-9.0-1.i386.rpm"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="-* ~x86 ~amd64"
-IUSE="gnome"
+KEYWORDS="-* amd64 x86"
+IUSE=""
 RESTRICT="fetch"
 
 RDEPEND="virtual/libc
@@ -88,8 +88,10 @@ src_install() {
 	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
-		doins lib/ICAClient/desktop/*.desktop
-	fi
+	# The .desktop file included in the rpm links to /usr/lib, so we make a new one
+	# The program gives errors and has slowdowns if the locale is not English, so
+	# strip it since it has no translations anyway
+	doicon lib/ICAClient/icons/*
+	make_wrapper wfcmgr 'env LC_ALL="" LANG="" /opt/ICAClient/wfcmgr'
+	make_desktop_entry wfcmgr 'Citrix ICA Client' citrix48.xpm
 }