From 5ef8fde84644bd69371d490d274ca3d0385bf863 Mon Sep 17 00:00:00 2001
From: Lars Wendler <polynomial-c@gentoo.org>
Date: Fri, 17 Feb 2017 18:17:17 +0100
Subject: net-misc/icaclient: Fixed eula.txt issue (bug #607862).

Package-Manager: Portage-2.3.3, Repoman-2.3.1
---
 .../icaclient/icaclient-13.4.0.10109380-r1.ebuild  | 190 --------------------
 .../icaclient/icaclient-13.4.0.10109380-r2.ebuild  | 191 +++++++++++++++++++++
 2 files changed, 191 insertions(+), 190 deletions(-)
 delete mode 100644 net-misc/icaclient/icaclient-13.4.0.10109380-r1.ebuild
 create mode 100644 net-misc/icaclient/icaclient-13.4.0.10109380-r2.ebuild

(limited to 'net-misc/icaclient')

diff --git a/net-misc/icaclient/icaclient-13.4.0.10109380-r1.ebuild b/net-misc/icaclient/icaclient-13.4.0.10109380-r1.ebuild
deleted file mode 100644
index 538e0d21164b..000000000000
--- a/net-misc/icaclient/icaclient-13.4.0.10109380-r1.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit multilib eutils versionator
-
-DESCRIPTION="ICA Client for Citrix Presentation servers"
-HOMEPAGE="http://www.citrix.com/"
-SRC_URI="amd64? ( linuxx64-${PV}.tar.gz )
-	x86? ( linuxx86-${PV}.tar.gz )"
-
-LICENSE="icaclient"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="nsplugin linguas_de linguas_es linguas_fr linguas_ja linguas_zh_CN"
-RESTRICT="mirror strip userpriv fetch"
-
-ICAROOT="/opt/Citrix/ICAClient"
-
-QA_PREBUILT="${ICAROOT#/}/*"
-
-RDEPEND="dev-libs/atk
-	dev-libs/glib:2
-	dev-libs/libxml2
-	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
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/gst-plugins-base:0.10
-	media-libs/gstreamer:0.10
-	media-libs/libcanberra[gtk]
-	media-libs/libogg
-	media-libs/libvorbis
-	media-libs/speex
-	net-dns/libidn
-	net-libs/libsoup:2.4
-	net-libs/webkit-gtk:2
-	sys-libs/e2fsprogs-libs
-	sys-libs/zlib
-	virtual/krb5
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXaw
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXinerama
-	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/pango"
-DEPEND=""
-
-pkg_nofetch() {
-	elog "Download the client file ${A} from
-	https://www.citrix.com/downloads/citrix-receiver.html"
-	elog "and place it in ${DISTDIR:-/usr/portage/distfiles}."
-}
-
-src_unpack() {
-	default
-
-	case ${ARCH} in
-		amd64)
-			ICAARCH=linuxx64
-		;;
-		x86)
-			ICAARCH=linuxx86
-		;;
-		*)
-			eerror "Given architecture is not supported by Citrix."
-		;;
-	esac
-
-	S="${WORKDIR}/${ICAARCH}/${ICAARCH}.cor"
-}
-
-src_install() {
-	local tmpl
-
-	dodir "${ICAROOT}"
-
-	exeinto "${ICAROOT}"
-	doexe *.DLL libctxssl.so libproxy.so wfica AuthManagerDaemon PrimaryAuthManager selfservice ServiceRecord
-
-	exeinto "${ICAROOT}"/lib
-	doexe lib/*.so
-
-	if use nsplugin ; then
-		exeinto "${ICAROOT}"
-		doexe npica.so
-		dosym "${ICAROOT}"/npica.so /usr/$(get_libdir)/nsbrowser/plugins/npica.so
-	fi
-
-	insinto "${ICAROOT}"
-	doins nls/en.UTF-8/eula.txt
-	doins -r usb
-
-	insinto "${ICAROOT}"/nls/en
-	doins nls/en.UTF-8/eula.txt
-
-	insinto "${ICAROOT}"/config
-	doins config/* config/.* nls/en/*.ini
-	for tmpl in {appsrv,wfclient}.template ; do
-		newins nls/en/${tmpl} ${tmpl/template/ini}
-	done
-	touch "${ED}/${ICAROOT}"/config/.server || die
-
-	insinto "${ICAROOT}"/gtk
-	doins gtk/*
-
-	insinto "${ICAROOT}"/gtk/glade
-	doins gtk/glade/*
-
-	insinto "${ICAROOT}"/site
-	doins -r site/*
-
-	dodir "${ICAROOT}"/help
-
-	insinto "${ICAROOT}"/config/usertemplate
-	doins config/usertemplate/*
-
-	LANGCODES="en"
-	use linguas_de && LANGCODES+=" de"
-	use linguas_es && LANGCODES+=" es"
-	use linguas_fr && LANGCODES+=" fr"
-	use linguas_ja && LANGCODES+=" ja"
-	use linguas_zh_CN && LANGCODES+=" zh_CN"
-
-	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
-
-		for tmpl in {appsrv,wfclient}.template ; do
-			cp "${ED}/${ICAROOT}"/nls/${lang}/${tmpl} \
-				"${ED}/${ICAROOT}"/nls/${lang}/${tmpl/template/ini} \
-				|| die
-		done
-	done
-
-	insinto "${ICAROOT}"/nls
-	dosym en /opt/Citrix/ICAClient/nls/C
-
-	insinto "${ICAROOT}"/icons
-	doins icons/*
-
-	insinto "${ICAROOT}"/keyboard
-	doins keyboard/*
-
-	rm -r "${S}"/keystore/cacerts || die
-	dosym /etc/ssl/certs "${ICAROOT}"/keystore/cacerts
-
-	exeinto "${ICAROOT}"/util
-	doexe util/{configmgr,conncenter,echo_cmd,gst_aud_play,gst_aud_read,gst_play,gst_read,hdxcheck.sh,icalicense.sh,libgstflatstm.so}
-	doexe util/{lurdump,new_store,nslaunch,pnabrowse,storebrowse,sunraymac.sh,what,xcapture}
-
-	doenvd "${FILESDIR}"/10ICAClient
-
-	make_wrapper wfica "${ICAROOT}"/wfica . "${ICAROOT}"
-
-	dodir /etc/revdep-rebuild/
-	echo "SEARCH_DIRS_MASK=\"${ICAROOT}\"" > "${D}"/etc/revdep-rebuild/70icaclient
-}
-
-pkg_preinst() {
-	local old_plugin="/usr/lib64/nsbrowser/plugins/npwrapper.npica.so"
-	if use amd64 && [[ -f ${old_plugin} ]] ; then
-		local wrapper="/usr/bin/nspluginwrapper"
-		if [[ -x ${wrapper} ]] ; then
-			einfo "Removing npica.so from wrapper."
-			${wrapper} -r ${old_plugin}
-		fi
-	fi
-}
diff --git a/net-misc/icaclient/icaclient-13.4.0.10109380-r2.ebuild b/net-misc/icaclient/icaclient-13.4.0.10109380-r2.ebuild
new file mode 100644
index 000000000000..bd4aacaf2238
--- /dev/null
+++ b/net-misc/icaclient/icaclient-13.4.0.10109380-r2.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit multilib eutils versionator
+
+DESCRIPTION="ICA Client for Citrix Presentation servers"
+HOMEPAGE="http://www.citrix.com/"
+SRC_URI="amd64? ( linuxx64-${PV}.tar.gz )
+	x86? ( linuxx86-${PV}.tar.gz )"
+
+LICENSE="icaclient"
+SLOT="0"
+KEYWORDS="-* amd64 x86"
+IUSE="nsplugin linguas_de linguas_es linguas_fr linguas_ja linguas_zh_CN"
+RESTRICT="mirror strip userpriv fetch"
+
+ICAROOT="/opt/Citrix/ICAClient"
+
+QA_PREBUILT="${ICAROOT#/}/*"
+
+RDEPEND="dev-libs/atk
+	dev-libs/glib:2
+	dev-libs/libxml2
+	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
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/gst-plugins-base:0.10
+	media-libs/gstreamer:0.10
+	media-libs/libcanberra[gtk]
+	media-libs/libogg
+	media-libs/libvorbis
+	media-libs/speex
+	net-dns/libidn
+	net-libs/libsoup:2.4
+	net-libs/webkit-gtk:2
+	sys-libs/e2fsprogs-libs
+	sys-libs/zlib
+	virtual/krb5
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXinerama
+	x11-libs/libXmu
+	x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/pango"
+DEPEND=""
+
+pkg_nofetch() {
+	elog "Download the client file ${A} from
+	https://www.citrix.com/downloads/citrix-receiver.html"
+	elog "and place it in ${DISTDIR:-/usr/portage/distfiles}."
+}
+
+src_unpack() {
+	default
+
+	case ${ARCH} in
+		amd64)
+			ICAARCH=linuxx64
+		;;
+		x86)
+			ICAARCH=linuxx86
+		;;
+		*)
+			eerror "Given architecture is not supported by Citrix."
+		;;
+	esac
+
+	S="${WORKDIR}/${ICAARCH}/${ICAARCH}.cor"
+}
+
+src_install() {
+	local tmpl dest
+
+	dodir "${ICAROOT}"
+
+	exeinto "${ICAROOT}"
+	doexe *.DLL libctxssl.so libproxy.so wfica AuthManagerDaemon PrimaryAuthManager selfservice ServiceRecord
+
+	exeinto "${ICAROOT}"/lib
+	doexe lib/*.so
+
+	if use nsplugin ; then
+		exeinto "${ICAROOT}"
+		doexe npica.so
+		dosym "${ICAROOT}"/npica.so /usr/$(get_libdir)/nsbrowser/plugins/npica.so
+	fi
+
+	for dest in "${ICAROOT}"{,/nls/en{,.UTF-8}} ; do
+		insinto "${dest}"
+		doins nls/en.UTF-8/eula.txt
+	done
+
+	insinto "${ICAROOT}"
+	doins -r usb
+
+	insinto "${ICAROOT}"/config
+	doins config/* config/.* nls/en/*.ini
+	for tmpl in {appsrv,wfclient}.template ; do
+		newins nls/en/${tmpl} ${tmpl/template/ini}
+	done
+	touch "${ED}/${ICAROOT}"/config/.server || die
+
+	insinto "${ICAROOT}"/gtk
+	doins gtk/*
+
+	insinto "${ICAROOT}"/gtk/glade
+	doins gtk/glade/*
+
+	insinto "${ICAROOT}"/site
+	doins -r site/*
+
+	dodir "${ICAROOT}"/help
+
+	insinto "${ICAROOT}"/config/usertemplate
+	doins config/usertemplate/*
+
+	LANGCODES="en"
+	use linguas_de && LANGCODES+=" de"
+	use linguas_es && LANGCODES+=" es"
+	use linguas_fr && LANGCODES+=" fr"
+	use linguas_ja && LANGCODES+=" ja"
+	use linguas_zh_CN && LANGCODES+=" zh_CN"
+
+	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
+
+		for tmpl in {appsrv,wfclient}.template ; do
+			cp "${ED}/${ICAROOT}"/nls/${lang}/${tmpl} \
+				"${ED}/${ICAROOT}"/nls/${lang}/${tmpl/template/ini} \
+				|| die
+		done
+	done
+
+	insinto "${ICAROOT}"/nls
+	dosym en /opt/Citrix/ICAClient/nls/C
+
+	insinto "${ICAROOT}"/icons
+	doins icons/*
+
+	insinto "${ICAROOT}"/keyboard
+	doins keyboard/*
+
+	rm -r "${S}"/keystore/cacerts || die
+	dosym /etc/ssl/certs "${ICAROOT}"/keystore/cacerts
+
+	exeinto "${ICAROOT}"/util
+	doexe util/{configmgr,conncenter,echo_cmd,gst_aud_play,gst_aud_read,gst_play,gst_read,hdxcheck.sh,icalicense.sh,libgstflatstm.so}
+	doexe util/{lurdump,new_store,nslaunch,pnabrowse,storebrowse,sunraymac.sh,what,xcapture}
+
+	doenvd "${FILESDIR}"/10ICAClient
+
+	make_wrapper wfica "${ICAROOT}"/wfica . "${ICAROOT}"
+
+	dodir /etc/revdep-rebuild/
+	echo "SEARCH_DIRS_MASK=\"${ICAROOT}\"" > "${D}"/etc/revdep-rebuild/70icaclient
+}
+
+pkg_preinst() {
+	local old_plugin="/usr/lib64/nsbrowser/plugins/npwrapper.npica.so"
+	if use amd64 && [[ -f ${old_plugin} ]] ; then
+		local wrapper="/usr/bin/nspluginwrapper"
+		if [[ -x ${wrapper} ]] ; then
+			einfo "Removing npica.so from wrapper."
+			${wrapper} -r ${old_plugin}
+		fi
+	fi
+}
-- 
cgit v1.2.3-65-gdbad