fix runtime errors with XCB, patches provided by Ed Catmur <ed AT catmur DOT co DOT uk> on bug 220225

Package-Manager: portage-2.1.4.4

3 files changed, 131 insertions, 6 deletions

diff --git a/net-misc/icaclient/ChangeLog b/net-misc/icaclient/ChangeLog
index ede9bc8db4e4..d2bc9640e9aa 100644
--- a/net-misc/icaclient/ChangeLog
+++ b/net-misc/icaclient/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/icaclient
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/icaclient/ChangeLog,v 1.53 2008/04/12 06:38:41 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/icaclient/ChangeLog,v 1.54 2008/05/11 19:06:43 opfer Exp $
+
+*icaclient-10.6-r4 (11 May 2008)
+
+  11 May 2008; Christian Faulhammer <opfer@gentoo.org>
+  +icaclient-10.6-r4.ebuild:
+  fix runtime errors with XCB, patches provided by Ed Catmur <ed AT catmur DOT
+  co DOT uk> on bug 220225
 
   12 Apr 2008; Ulrich Mueller <ulm@gentoo.org> -icaclient-10.6.ebuild:
   Remove old.
diff --git a/net-misc/icaclient/Manifest b/net-misc/icaclient/Manifest
index bff4d1175e16..cf4a69f0af70 100644
--- a/net-misc/icaclient/Manifest
+++ b/net-misc/icaclient/Manifest
@@ -4,12 +4,13 @@ Hash: SHA1
 AUX 10ICAClient 67 RMD160 ceb2d84eb9a6d86ad865ea470bb54c3eb946b02a SHA1 e38274eaf685c8e4987aebf69000ad91d9d76dde SHA256 4468c32491f56b192964ddd82c854c8c73da06879cb767d89ab24ee45d186484
 DIST ICAClient-10.6-1.i386.rpm 1759345 RMD160 2d4fe5191c638c4fd1759d11fd838641dd36e8d3 SHA1 150741259847b4d5587723e8ba86294ab08592f0 SHA256 d3d77f54064f6b2df7ff3bf6a01e1f0b9d0e2088f31d69ba6b8e07bd587cb4f8
 EBUILD icaclient-10.6-r3.ebuild 3313 RMD160 b787995f5e075ac8f5c221a93570b4f2b7af6735 SHA1 5255736e39b1631a5d855b3b47888fa9ad563916 SHA256 e3126151ff595cb6c29c8fc24fcf2bf362e5fbb981e0886df1dd20137ce0cd1f
-MISC ChangeLog 8318 RMD160 dbb6efaf875115d71aab4c8e174575be82c701a4 SHA1 28f6c17456f984797d3e42cb8010ea6cfdd74364 SHA256 109cb3847aef20faab2a503a782bab89d9043fc4ae5109cac36e09f1be1582f6
+EBUILD icaclient-10.6-r4.ebuild 3609 RMD160 3c5c38f444194f8792f2a986024f80d03df0939e SHA1 209a5422306cc8fc6bf8a641035403c3008ef83d SHA256 36afdaeed3a86b8fa97ce0807686f457e5b87835822226579594269c006d72bb
+MISC ChangeLog 8545 RMD160 52ddac00597ec1c9b9e2e313757e43d33db90c02 SHA1 975c6a6c70f683508b64d210d99aa7de9c25b4e6 SHA256 961ee8afea81f8f5e343ef37b9fd90ce09baad2a8b7382d9a5fc97eb3199c91a
 MISC metadata.xml 483 RMD160 da5ce0dac2299138e1a0882c86ea0a6df85bb534 SHA1 a28f761262e2ee29f318508b0fecf0d95f1aacd5 SHA256 8ee1da5e7bdfefd9af6fdb616fbdd37ad849bdde97f65c27e3ed77dec2bdd7be
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgAWMQACgkQOeoy/oIi7uwVnACfXfr//fz6Zsf+TVCpxAZbKFs7
-jhYAmgMUEpn2pwUqrMfDzi0KVMy+VTIX
-=ZYYm
+iEYEARECAAYFAkgnQ8sACgkQNQqtfCuFneOwawCgnZmCxmA6Vj45OZjiUUKqqtOU
++1UAnA+iTYg9SRgh4OTMxsTQiL5StbED
+=Yn03
 -----END PGP SIGNATURE-----
diff --git a/net-misc/icaclient/icaclient-10.6-r4.ebuild b/net-misc/icaclient/icaclient-10.6-r4.ebuild
new file mode 100644
index 000000000000..34db13967142
--- /dev/null
+++ b/net-misc/icaclient/icaclient-10.6-r4.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/icaclient/icaclient-10.6-r4.ebuild,v 1.1 2008/05/11 19:06:43 opfer Exp $
+
+inherit eutils multilib rpm
+
+DESCRIPTION="ICA Client for Citrix Presentation servers"
+HOMEPAGE="http://www.citrix.com/"
+SRC_URI="http://download2.citrix.com/FILES/en/products/Linux10/ICAClient-${PV}-1.i386.rpm"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror strip userpriv"
+
+QA_TEXTRELS="opt/ICAClient/VDSCARD.DLL
+	opt/ICAClient/TW1.DLL
+	opt/ICAClient/NDS.DLL
+	opt/ICAClient/CHARICONV.DLL
+	opt/ICAClient/PDCRYPT1.DLL
+	opt/ICAClient/VDCM.DLL
+	opt/ICAClient/libctxssl.so
+	opt/ICAClient/PDCRYPT2.DLL
+	opt/ICAClient/npica.so
+	opt/ICAClient/VDSPMIKE.DLL"
+
+RDEPEND="x11-terms/xterm
+	x86? (
+		x11-libs/libXp
+		x11-libs/libXaw
+		x11-libs/libX11
+		x11-libs/libSM
+		x11-libs/libICE
+		>=x11-libs/openmotif-2.3.0 )
+	amd64? ( >=app-emulation/emul-linux-x86-xlibs-20080316 )"
+DEPEND=""
+
+S="${WORKDIR}/usr"
+
+pkg_setup() {
+	# Binary x86 package
+	has_multilib_profile && ABI="x86"
+}
+
+pkg_nofetch() {
+	einfo "Please download ${A} yourself from www.citrix.com"
+	einfo "http://www.citrix.co.uk/English/SS/downloads/details.asp?dID=2755&downloadID=3323&pID=186"
+	einfo "and place it in ${DISTDIR}"
+}
+
+src_unpack() {
+	# You must download ICAClient-10.0-2.i386.rpm
+	# from www.citrix.com and put it in ${DISTDIR}
+	einfo "Unpacking"
+	rpm_src_unpack
+}
+
+src_install() {
+	dodir /opt/ICAClient
+
+	insinto /opt/ICAClient
+	doins lib/ICAClient/Npica* lib/ICAClient/*.DLL lib/ICAClient/eula.txt \
+		lib/ICAClient/npica.so lib/ICAClient/readme.txt lib/ICAClient/libctxssl.so
+
+	insinto /opt/ICAClient/config
+	doins lib/ICAClient/config/* lib/ICAClient/config/.*
+
+	insinto /opt/ICAClient/config/usertemplate
+	doins lib/ICAClient/config/usertemplate/*
+
+	insinto /opt/ICAClient/help
+	doins lib/ICAClient/help/*
+
+	insinto /opt/ICAClient/nls
+	dosym en /opt/ICAClient/nls/C
+
+	insinto /opt/ICAClient/nls/en
+	doins lib/ICAClient/nls/en/*
+
+	insinto /opt/ICAClient/nls/en/UTF-8
+	doins lib/ICAClient/nls/en/UTF-8/*
+
+	insinto /opt/ICAClient/icons
+	doins lib/ICAClient/icons/*
+
+	insinto /opt/ICAClient/keyboard
+	doins lib/ICAClient/keyboard/*
+
+	insinto /opt/ICAClient/keystore/cacerts
+	doins lib/ICAClient/keystore/cacerts/*
+
+	insinto /opt/ICAClient/util
+	doins lib/ICAClient/util/{XCapture,XCapture.ad,echo_cmd,icalicense.sh,integrate.sh,nslaunch,pac.js,pacexec,xcapture}
+	dosym /opt/ICAClient/util/integrate.sh /opt/ICAClient/util/disintegrate.sh
+
+	# wfica has libxcb locking bugs, so provide a wrapper.  It needs to be in
+	# /opt/ICAClient to ensure it gets called, so rename wfica to wfica.bin.
+	exeinto /opt/ICAClient
+	doexe lib/ICAClient/wfcmgr lib/ICAClient/wfcmgr.bin \
+		lib/ICAClient/wfica_assoc.sh lib/ICAClient/wfica.sh
+	newexe lib/ICAClient/wfica wfica.bin
+	make_wrapper wfica 'env LC_ALL="" LANG="" LIBXCB_ALLOW_SLOPPY_LOCK=1 /opt/ICAClient/wfica.bin' . /opt/ICAClient /opt/ICAClient
+
+	doenvd "${FILESDIR}"/10ICAClient
+
+	insinto /usr/$(get_libdir)/nsbrowser/plugins
+	dosym /opt/ICAClient/npica.so /usr/$(get_libdir)/nsbrowser/plugins/npica.so
+	dosym /usr/$(get_libdir)/libXm.so.4 /opt/ICAClient/libXm.so.3
+
+	# 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' . /opt/ICAClient
+	make_desktop_entry wfcmgr 'Citrix ICA Client' manager
+}