Introduce nsplugin USE flag as suggested (with patch) by Peter Gantner <gentoo AT...

Package-Manager: portage-2.1.7.17/cvs/Linux i686

diff --git a/net-misc/icaclient/ChangeLog b/net-misc/icaclient/ChangeLog
index 7354624437de5c34538e58ce430c5a1abe5d4351..018d236baaeecd973e63399db177d0b5d66142e6 100644 (file)
--- a/net-misc/icaclient/ChangeLog
+++ b/net-misc/icaclient/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/icaclient
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/icaclient/ChangeLog,v 1.72 2010/03/08 07:55:53 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/icaclient/ChangeLog,v 1.73 2010/04/08 08:18:58 fauli Exp $
+
+*icaclient-11.100-r1 (08 Apr 2010)
+
+  08 Apr 2010; Christian Faulhammer <fauli@gentoo.org>
+  +icaclient-11.100-r1.ebuild:
+  Introduce nsplugin USE flag as suggested (with patch) by Peter Gantner
+  <gentoo AT nephros DOT org> in bug 309141
 
 *icaclient-11.100 (08 Mar 2010)
 

diff --git a/net-misc/icaclient/Manifest b/net-misc/icaclient/Manifest
index e638ecbfe4bcccb2abc7da65cd8d757c49ba874c..349ec7d7c1ffca477ac61d36690d806dc3c16d68 100644 (file)
--- a/net-misc/icaclient/Manifest
+++ b/net-misc/icaclient/Manifest
@@ -5,13 +5,14 @@ AUX 10ICAClient 67 RMD160 ceb2d84eb9a6d86ad865ea470bb54c3eb946b02a SHA1 e38274ea
 DIST ICAClient-11.0-1.i386.rpm 2169904 RMD160 693b76432305697ddea16beb1028de664ecdb5cc SHA1 813687439f66d757bd234279a6ccc71f5dee424d SHA256 bc631441b2e6336a6163957e028c0c4e90be9737a006042a79629d8c12080781
 DIST ICAClient-11.100-1.i386.rpm 2767881 RMD160 9ca951957a0107ba4e2af9fb6b3b8b8ee856f023 SHA1 15e024761bb1bc19bbc82383269de315a8f81373 SHA256 468c9eccc05131b72e9c6885e25cc9f629928d2e0d6d2b6308c438b17ec00587
 EBUILD icaclient-11.0-r2.ebuild 3853 RMD160 082c56947d763e2024ec294ddf300fa515fdd9f2 SHA1 32348b81198c406cad4c0cc3ef818b4214507235 SHA256 96d1ee23f50ae443eeae7596700d13aa2f1430a721963a10e968bed8f053d22a
+EBUILD icaclient-11.100-r1.ebuild 3950 RMD160 b15eb226542ffccadc4ca3e8aa9a0b19a91284bd SHA1 bb720b7c77be5012e7d58e29725f336ac7012e03 SHA256 2fbc0bd91ef37b9371c641c10d495f260a3c54d698e22093711637e8a988c659
 EBUILD icaclient-11.100.ebuild 3856 RMD160 a8f6e046a0ef9384e812eeda09350a9756084afe SHA1 fc6b01b44cd39594a895c631ee855c718971976e SHA256 e8f85cd7a1bb8647e85faa383ceb74e1dd25f6e8cff9b46979623cf4006ef228
-MISC ChangeLog 12044 RMD160 e5fa2a91a4c593b7b1058a1605bd11b67d9d1e57 SHA1 42a6f4b1d80eb96a4f4b6079d3d6e15a4735fba6 SHA256 bf90db610921ff634e249402cdbcbcd719c6af81a922890e96777976fb997975
+MISC ChangeLog 12284 RMD160 b54260f555a614e50a91652d6c362c40a322a5ee SHA1 56b67cdc2879141ea83361e16d88b9fc86dacbb7 SHA256 9375a0ba390750f150e6852e82f134bf768ef4e97bd9dab8daf5f56d5567a3a2
 MISC metadata.xml 599 RMD160 9280420992e561512da37b4875749311b0121960 SHA1 0e432d5b3fce50343b33a048407a4650d9421c20 SHA256 f1f2e5e97e998194c229beab363c487672833a360d74631825d25a3785df1243
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkuUrY8ACgkQNQqtfCuFneMU4gCfWv5xO9RrhTG564tiEnR1LvCg
-WxUAn0YYZKgrfF1HrlqoVeo6MDTmp+ts
-=rqIf
+iEUEARECAAYFAku9kXgACgkQNQqtfCuFneMhAQCWIDq8txL51ElFSpTjJDe5lT0M
+NACePCe2a5lxLWHTERDXQMoeReyNzEE=
+=Aj33
 -----END PGP SIGNATURE-----

diff --git a/net-misc/icaclient/icaclient-11.100-r1.ebuild b/net-misc/icaclient/icaclient-11.100-r1.ebuild
new file mode 100644 (file)
index 0000000..645139e
--- /dev/null
+++ b/net-misc/icaclient/icaclient-11.100-r1.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/icaclient/icaclient-11.100-r1.ebuild,v 1.1 2010/04/08 08:18:58 fauli Exp $
+
+inherit eutils multilib rpm
+
+DESCRIPTION="ICA Client for Citrix Presentation servers"
+HOMEPAGE="http://www.citrix.com/"
+# There is no direct download link from upstream, see pkg_nofetch()
+SRC_URI="ICAClient-11.100-1.i386.rpm"
+
+LICENSE="icaclient"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="nsplugin linguas_de linguas_ja"
+RESTRICT="mirror strip userpriv fetch"
+
+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"
+QA_EXECSTACK="opt/ICAClient/wfica.bin
+       opt/ICAClient/libctxssl.so"
+
+RDEPEND="x11-terms/xterm
+       media-fonts/font-adobe-100dpi
+       media-fonts/font-misc-misc
+       media-fonts/font-cursor-misc
+       media-fonts/font-xfree86-type1
+       media-fonts/font-misc-ethiopic
+       x86? (
+               x11-libs/libXp
+               x11-libs/libXaw
+               x11-libs/libX11
+               x11-libs/libSM
+               x11-libs/libICE
+               >=x11-libs/openmotif-2.3.1
+       )
+       amd64? (
+               >=app-emulation/emul-linux-x86-xlibs-20080316
+               nsplugin? (
+                       www-plugins/nspluginwrapper
+               )
+       )"
+DEPEND=""
+S="${WORKDIR}/usr/lib/ICAClient"
+
+pkg_setup() {
+       # Binary x86 package
+       has_multilib_profile && ABI="x86"
+}
+
+pkg_nofetch() {
+       elog "Download the client RPM file ${SRC_URI} from http://www.citrix.com/English/SS/downloads/details.asp?downloadID=3323"
+       elog "and place it in ${DISTDIR:-/usr/portage/distfiles}."
+}
+
+src_install() {
+       dodir /opt/ICAClient
+
+       insinto /opt/ICAClient
+       if use nsplugin
+       then
+               doins npica.so
+       fi
+       doins *.DLL libctxssl.so libproxy.so nls/en/eula.txt
+
+       insinto /opt/ICAClient/config
+       doins config/* config/.* nls/en/*.ini
+
+       insinto /opt/ICAClient/config/usertemplate
+       doins config/usertemplate/*
+
+       insinto /opt/ICAClient/nls
+       dosym en /opt/ICAClient/nls/C
+
+       insinto /opt/ICAClient/nls/en
+       doins nls/en/*
+
+       insinto /opt/ICAClient/nls/en/UTF-8
+       doins nls/en/UTF-8/*
+
+       if use linguas_de; then
+               insinto /opt/ICAClient/nls/de
+               doins nls/de/*
+
+               insinto /opt/ICAClient/nls/de/UTF-8
+               doins nls/de/UTF-8/*
+       fi
+       if use linguas_ja; then
+               insinto /opt/ICAClient/nls/ja
+               doins nls/ja/*
+
+               insinto /opt/ICAClient/nls/ja/UTF-8
+               doins nls/ja/UTF-8/*
+       fi
+
+       insinto /opt/ICAClient/icons
+       doins icons/*
+
+       insinto /opt/ICAClient/keyboard
+       doins keyboard/*
+
+       insinto /opt/ICAClient/keystore/cacerts
+       doins keystore/cacerts/*
+
+       insinto /opt/ICAClient/util
+       doins util/{echo_cmd,gst_play,icalicense.sh,integrate.sh,libgstflatstm.so,nslaunch,pacexec,pac.js,sunraymac.sh,what,xcapture}
+       dosym /opt/ICAClient/util/integrate.sh /opt/ICAClient/util/disintegrate.sh
+
+       doenvd "${FILESDIR}"/10ICAClient
+
+       if use nsplugin
+       then
+               dosym /opt/ICAClient/npica.so /usr/$(get_libdir)/nsbrowser/plugins/npica.so
+       fi
+
+       # 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.
+       sed -e "/^ICAROOT.*$/d" -i wfica.sh || die
+       exeinto /opt/ICAClient
+       doexe wfcmgr.bin wfica_assoc.sh wfica.sh util/wfcmgr
+       newexe wfica wfica.bin
+       make_wrapper wfica 'env LC_ALL="" LANG="" LIBXCB_ALLOW_SLOPPY_LOCK=1 /opt/ICAClient/wfica.bin' . /opt/ICAClient /opt/ICAClient
+
+       # 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 icons/*
+       make_wrapper wfcmgr /opt/ICAClient/wfcmgr . /opt/ICAClient
+       sed -e  's:^\# Configuration items.*:. /opt/ICAClient/nls/en/wfcmgr.msg:g' -i "${D}"/opt/ICAClient/wfcmgr
+       make_desktop_entry wfcmgr 'Citrix ICA Client' manager
+
+       dodir /etc/revdep-rebuild/
+       echo "SEARCH_DIRS_MASK=/opt/ICAClient" > "${D}"/etc/revdep-rebuild/70icaclient
+}