version bump for bug 389605, lots of thanks to Maciej Grela for providing the ebuild and Alexander Weber for testing

(Portage version: 2.1.10.41/cvs/Linux i686)

4 files changed, 188 insertions, 153 deletions

diff --git a/net-misc/icaclient/ChangeLog b/net-misc/icaclient/ChangeLog
index c1cf099f0bad..ebb2945dba6b 100644
--- a/net-misc/icaclient/ChangeLog
+++ b/net-misc/icaclient/ChangeLog
@@ -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.
diff --git a/net-misc/icaclient/files/10ICAClient b/net-misc/icaclient/files/10ICAClient
index ef963c3f0efb..31be24e3380a 100644
--- a/net-misc/icaclient/files/10ICAClient
+++ b/net-misc/icaclient/files/10ICAClient
@@ -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
index 1cae401edf5c..000000000000
--- a/net-misc/icaclient/icaclient-11.100-r1.ebuild
+++ /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
index 000000000000..715785acfd45
--- /dev/null
+++ b/net-misc/icaclient/icaclient-12.0.0.ebuild
@@ -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
+}