version bump for bug 389605, lots of thanks to Maciej Grela for providing the ebuild...
authorChristian Faulhammer <fauli@gentoo.org>
Thu, 29 Dec 2011 11:49:33 +0000 (11:49 +0000)
committerChristian Faulhammer <fauli@gentoo.org>
Thu, 29 Dec 2011 11:49:33 +0000 (11:49 +0000)
Package-Manager: portage-2.1.10.41/cvs/Linux i686

net-misc/icaclient/ChangeLog
net-misc/icaclient/Manifest
net-misc/icaclient/files/10ICAClient
net-misc/icaclient/icaclient-11.100-r1.ebuild [deleted file]
net-misc/icaclient/icaclient-12.0.0.ebuild [new file with mode: 0644]

index c1cf099f0badf32f5022c779ca6353f13bc96575..ebb2945dba6b7e05aa310f3520215971db4bbb7c 100644 (file)
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/icaclient
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/icaclient/ChangeLog,v 1.79 2011/02/05 20:08:33 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/icaclient/ChangeLog,v 1.80 2011/12/29 11:49:33 fauli Exp $
+
+*icaclient-12.0.0 (29 Dec 2011)
+
+  29 Dec 2011; Christian Faulhammer <fauli@gentoo.org> files/10ICAClient,
+  -icaclient-11.100-r1.ebuild, +icaclient-12.0.0.ebuild:
+  version bump for bug 389605, lots of thanks to Maciej Grela for providing the
+  ebuild and Alexander Weber for testing
 
   05 Feb 2011; Ulrich Mueller <ulm@gentoo.org> icaclient-11.100-r1.ebuild:
   Fix a typo in RDEPEND.
index 7c3eb7746558dfec79ec294b5c5831d64ab3339c..74a00295d17d61342f688341e5748f0f6118d903 100644 (file)
@@ -1,17 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX 10ICAClient 67 RMD160 ceb2d84eb9a6d86ad865ea470bb54c3eb946b02a SHA1 e38274eaf685c8e4987aebf69000ad91d9d76dde SHA256 4468c32491f56b192964ddd82c854c8c73da06879cb767d89ab24ee45d186484
-DIST ICAClient-11.100-1.i386.rpm 2767881 RMD160 9ca951957a0107ba4e2af9fb6b3b8b8ee856f023 SHA1 15e024761bb1bc19bbc82383269de315a8f81373 SHA256 468c9eccc05131b72e9c6885e25cc9f629928d2e0d6d2b6308c438b17ec00587
-EBUILD icaclient-11.100-r1.ebuild 4091 RMD160 2e04b9079c8a0f54b6c478081a41a4ccc125761a SHA1 3517c7e7d4fe675979c9e402d5bfc4097a983471 SHA256 4f9e3902791b703b36a181f48279d4cc741883f9cdfd34fb7597174c01e50161
-MISC ChangeLog 13264 RMD160 0c84f703a3fda44508ce4a2eea81129b00d04f27 SHA1 e5b46a1edb4d2222ae0d8c9303abc0ea7901e948 SHA256 6db56eddddc942456ef262d328e66aa294c8b3a2a0f81a046b387b40c408012d
+AUX 10ICAClient 88 RMD160 8a6656bbfa48d4c33a29dc3880c5c0562db674d9 SHA1 fa745d47a91b56c8483a0a8d2bbaed4665d8d73b SHA256 9178cf9a99a0ad43fae17bab5f5a13a9b50827a30223d64416bc4853da0fc7ee
+DIST ICAClient-12.0.0-0.i386.rpm 3638518 RMD160 d5c28b0239ebbd4f64e326d016a93f13d4a7bd0c SHA1 2e6204f3624144b9e90dc93423ba80aa9bf3338d SHA256 b574190d06d488d9278d53a8e9dc5b3d1e4d9a4a8909d019bd3763dc215f1702
+EBUILD icaclient-12.0.0.ebuild 4826 RMD160 1677c58dbba1d1df3c750e1080f08943cb968c9f SHA1 022d81913d97359080cebbc589cdcd73b4a763ad SHA256 0ab00b920b542e34da2e12b606073eacc5849938d7d92105c066a9e0151db017
+MISC ChangeLog 13552 RMD160 e9523b0240f306cf709072d7273261b65ec320d6 SHA1 07f8ddf5f88eee4a452cf5cf988770f3bc4c2bdb SHA256 1c4d7a407c6cd6691f3c373bd67bfb4db71ae652f273e3b4fd35af47d111c91f
 MISC metadata.xml 578 RMD160 143c9ae38d74c2e63e731550ba52cff9cd71f136 SHA1 a25a9d0021d6a3c33e991d7e2ba07f166c7a3ba8 SHA256 5556c8b47ca4950d71da7c9d9efc094c6bf81afe606600dbd46edc90a01de38f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iJwEAQEIAAYFAk59rQ4ACgkQfXuS5UK5QB3McgP/RAHPmPiEYN0sj8ZyCaWfN7cr
-Jjnxjg1+ykVLHh3k6dVVBJ6HjDgw8UhvmRM0Zzf0kfJmp5PwH9jUhV7G5oBdAzjX
-h0VqF8PMT1QjhZbF7kO9mGMKg3pQWvm+PapRZw6okjKJb+rGuomBkAvcTtgv/RdJ
-GFwBzDH8lUjXeWn/vpo=
-=gBRt
------END PGP SIGNATURE-----
index ef963c3f0efbef0a8a77a3e301e48540fbfe2243..31be24e3380aee54eddb49000adee478060e3700 100644 (file)
@@ -1,3 +1,3 @@
-PATH=/opt/ICAClient
-ROOTPATH=/opt/ICAClient
-ICAROOT=/opt/ICAClient
+PATH=/opt/Citrix/ICAClient
+ROOTPATH=/opt/Citrix/ICAClient
+ICAROOT=/opt/Citrix/ICAClient
diff --git a/net-misc/icaclient/icaclient-11.100-r1.ebuild b/net-misc/icaclient/icaclient-11.100-r1.ebuild
deleted file mode 100644 (file)
index 1cae401..0000000
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2011 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.5 2011/02/05 20:08:33 ulm Exp $
-
-EAPI=1
-
-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/libXinerama
-               >=x11-libs/openmotif-2.3.1:0
-       )
-       amd64? (
-               || (
-                       ( >=app-emulation/emul-linux-x86-xlibs-20110129 >=app-emulation/emul-linux-x86-motif-20110129 )
-                       <app-emulation/emul-linux-x86-xlibs-20110129
-               )
-               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
-}
diff --git a/net-misc/icaclient/icaclient-12.0.0.ebuild b/net-misc/icaclient/icaclient-12.0.0.ebuild
new file mode 100644 (file)
index 0000000..715785a
--- /dev/null
@@ -0,0 +1,177 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/icaclient/icaclient-12.0.0.ebuild,v 1.1 2011/12/29 11:49:33 fauli Exp $
+
+EAPI=1
+
+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-12.0.0-0.i386.rpm"
+
+LICENSE="icaclient"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="nsplugin linguas_de linguas_ja"
+RESTRICT="mirror strip userpriv fetch"
+
+ICAROOT="/opt/Citrix/ICAClient"
+
+QA_TEXTRELS="opt/Citrix/ICAClient/VDSCARD.DLL
+       opt/Citrix/ICAClient/TW1.DLL
+       opt/Citrix/ICAClient/NDS.DLL
+       opt/Citrix/ICAClient/CHARICONV.DLL
+       opt/Citrix/ICAClient/PDCRYPT1.DLL
+       opt/Citrix/ICAClient/VDCM.DLL
+       opt/Citrix/ICAClient/libctxssl.so
+       opt/Citrix/ICAClient/PDCRYPT2.DLL
+       opt/Citrix/ICAClient/npica.so
+       opt/Citrix/ICAClient/VDSPMIKE.DLL
+       opt/Citrix/ICAClient/VDFLASH2.DLL
+       opt/Citrix/ICAClient/lib/libavutil.so
+       opt/Citrix/ICAClient/lib/libavcodec.so
+       opt/Citrix/ICAClient/lib/libavformat.so
+       opt/Citrix/ICAClient/lib/libswscale.so"
+
+QA_EXECSTACK="opt/Citrix/ICAClient/wfica
+       opt/Citrix/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/libXinerama
+               >=x11-libs/openmotif-2.3.1:0
+       )
+       amd64? (
+               || (
+                       ( >=app-emulation/emul-linux-x86-xlibs-20110129
+                       >=app-emulation/emul-linux-x86-motif-20110129 )
+                       <app-emulation/emul-linux-x86-xlibs-20110129
+
+               )
+               >=app-emulation/emul-linux-x86-soundlibs-20110928
+               >=app-emulation/emul-linux-x86-gtklibs-20110928
+
+               nsplugin? (
+                       www-plugins/nspluginwrapper
+               )
+       )"
+DEPEND=""
+S="${WORKDIR}/opt/Citrix/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=2316611&productId=1689163&c1=ost1349860"
+       elog "and place it in ${DISTDIR:-/usr/portage/distfiles}."
+}
+
+src_install() {
+       dodir "${ICAROOT}"
+
+       exeinto "${ICAROOT}"
+       doexe *.DLL libctxssl.so libproxy.so FlashContainer.bin wfica wfcmgr.bin util/wfcmgr
+
+       exeinto "${ICAROOT}"/lib
+       doexe lib/*.so
+
+       insinto "${ICAROOT}"
+       if use nsplugin
+       then
+               doins npica.so
+               dosym "${ICAROOT}"/npica.so /usr/$(get_libdir)/nsbrowser/plugins/npica.so
+       fi
+
+       doins nls/en/eula.txt
+
+       insinto "${ICAROOT}"/config
+       doins config/* config/.* nls/en/*.ini
+
+       insinto "${ICAROOT}"/gtk
+       doins gtk/*
+
+       insinto "${ICAROOT}"/gtk/glade
+       doins gtk/glade/*
+
+       dodir "${ICAROOT}"/help
+
+       insinto "${ICAROOT}"/config/usertemplate
+       doins config/usertemplate/*
+
+       LANGCODES="en"
+       use linguas_de && LANGCODES="${LANGCODES} de"
+       use linguas_ja && LANGCODES="${LANGCODES} ja"
+
+       for lang in ${LANGCODES}; do
+               insinto "${ICAROOT}"/nls/${lang}
+               doins nls/${lang}/*
+
+               insinto "${ICAROOT}"/nls/$lang/UTF-8
+               doins nls/${lang}/UTF-8/*
+
+               insinto "${ICAROOT}"/nls/${lang}/LC_MESSAGES
+               doins nls/${lang}/LC_MESSAGES/*
+
+               insinto "${ICAROOT}"/nls/${lang}
+               dosym UTF-8 "${ICAROOT}"/nls/${lang}/utf8
+
+               # We don't have 'more' anymore on the system - use 'less' instead
+               sed -e 's:MORE_CMD=more:MORE_CMD=less:g' -i "${D}"/"${ICAROOT}"/nls/${lang}/wfcmgr.msg
+       done
+
+       insinto "${ICAROOT}"/nls
+       dosym en /opt/Citrix/ICAClient/nls/C
+
+       insinto "${ICAROOT}"/icons
+       doins icons/*
+
+       insinto "${ICAROOT}"/keyboard
+       doins keyboard/*
+
+       insinto "${ICAROOT}"/keystore/cacerts
+       doins keystore/cacerts/*
+
+       insinto "${ICAROOT}"/util
+       doins util/pac.js
+
+       exeinto "${ICAROOT}"/util
+       doexe util/{DeleteCompleteFlashCache.sh,echo_cmd,hdxcheck.sh,icalicense.sh,integrate.sh}
+       doexe util/{nslaunch,pacexec,pnabrowse,sunraymac.sh,what,xcapture}
+
+       # Citrix receiver 12 has util/gst_{play,read}.{32,64} versions, install both
+       doexe util/gst_{play,read}.{32,64}
+       # Ditto for libgstflatstm.so
+       doexe util/libgstflatstm.{32,64}.so
+
+       dosym "${ICAROOT}"/util/integrate.sh "${ICAROOT}"/util/disintegrate.sh
+
+       doenvd "${FILESDIR}"/10ICAClient
+
+       make_wrapper wfica "${ICAROOT}"/wfica . "${ICAROOT}"
+
+       # 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 "${ICAROOT}"/wfcmgr . "${ICAROOT}"
+       sed -e  's:^\# Configuration items.*:. "${ICAROOT}"/nls/en/wfcmgr.msg:g' -i "${D}"/"${ICAROOT}"/wfcmgr
+       make_desktop_entry wfcmgr 'Citrix ICA Client' manager
+
+       dodir /etc/revdep-rebuild/
+       echo "SEARCH_DIRS_MASK="${ICAROOT}"" > "${D}"/etc/revdep-rebuild/70icaclient
+}