gentoo resync : 16.02.1018

4 files changed, 16 insertions, 225 deletions

diff --git a/net-misc/icaclient/Manifest b/net-misc/icaclient/Manifest
index cf765e541abe..c5a48509fdf8 100644
--- a/net-misc/icaclient/Manifest
+++ b/net-misc/icaclient/Manifest
@@ -4,11 +4,10 @@ AUX conncenter.desktop 194 BLAKE2B 96fdae8892ec9cef05a92e129bba42efb666874a2a218
 AUX new_store.desktop 235 BLAKE2B 43bbf97a6982485e8b21f30c15889d64063ef0ce294b0695b368c08600af8a5a7764ee09ae7fe5d7f9c105d1217cae37fc2211542535ce31cea5d2b9f36d996f SHA512 a2857ecadeceb1252039f02e779a3d366cb863758802fc2927b9edd44a6580ba175db8ce332e3cbdd4ab0354fc0144432934abf8fed9f68c3e1a639775613258
 AUX selfservice.desktop 183 BLAKE2B 45d0830601ceac5159e239ec149cf3cdeabd43beb2ad6964935129fad6cd2c2e7c36cfc473e89b5db3b3b6cce2df909dd6013c3463631a7d868b470a49494285 SHA512 c4a2bdd83a29171c331b8adc98b33b8150fef5616d1fde8a0c9ccf1972b8ecc222dc1c0bc4e7779d93b851f44e79f5166138af7b7d36de964932ff3b63a4801b
 AUX wfica.desktop 242 BLAKE2B 6e90bb02824a6319035814050919c55907b2104c65e2abcc7379a4c694a585945c2e10ada114c4dfb906ee3b1fa90a0251dcb1ec3aac1fb6015a2d2ecbef4452 SHA512 a233bbdfadaee080d8dda67ed81a60ef74902c1f2100cb08bc402186be23f1bbb82f84abb93da88d610d187a267f7db28e6bfebe689839c921ae5a94a4bdf1d7
-DIST linuxx64-13.10.0.20.tar.gz 20208082 BLAKE2B f350b303df768f17c49033111f79b85217829ed19ca3884d63266ed1fd436ff8eea44a6514e708d97e72313a6905425a30c0107191e98c68bfc9c7b0fc454008 SHA512 ac12c09fc459726ddff8564a4900e0184d3f04138cf51361076fb476296f96f0f98d55b6d079f2c3829cfbaf07c373e8722fcde56266f2f3c8c5989ad33fa06b
 DIST linuxx64-18.10.0.11.tar.gz 21976273 BLAKE2B 4d673f40a04e31bba94b2e0dda744f8e3bb1ac489bfbbf846da3ae700d8fbd2504d22aa8fe1b703ceee9536699ea7fee288ce21306771f5c8806930cf54e2ffd SHA512 c14cfb2d10738c888dd2f56f840b0446d8952fe2adb76e1fac0c75d135a4c785cbfd8ccefed6d66f917eb4ebe3d27d151da738706b137abe26dcc3963dd78a1d
-DIST linuxx86-13.10.0.20.tar.gz 22123747 BLAKE2B 490024fa780fc8e09afb3dd56194525b6b5aefe89377c59f4bfa12eeb3f60711530dd2659dd8fe975df6121db5af35e3760315a5b656e4f517e2fad9fb411ada SHA512 e4c5220ea680601a95019d30c2fb2a26e7f3cd60da19c42b96168aab74456c1242b4400cc4d7b10910a7e0e1993377d6492fb9e2cebb98b1b662d3d1ebf4cffc
+DIST linuxx64-19.1.0.9.tar.gz 22074792 BLAKE2B aeeb8df5a63d08c94718d069c2f3e259d22309cab8ba3f046e9b1d6ecadbb9ddc7a7049bd6837944e42cfc9f625146218208802a2bf0f3bdc32f1f7d162a8700 SHA512 21539546fd24f7781e6a114e345392ee85e0f27f0f4b8a641e8b94f9a96c4a0e14f3d81838a3735c6098c251b022b3e30ce0c530b686f7587029cd2983516cfc
 DIST linuxx86-18.10.0.11.tar.gz 24095176 BLAKE2B 5e7b9bba57661216b0194ccca292a9e663fdca65439c86ea68c1857352f1ed7c5247e41eeb976bc306148cd78c71b069da3e65042331a0e601637db1fee2d6c6 SHA512 8e073b436454472799df283266ccd68652b519336bf74b558b1d0345147331c5e8f4c8900b8d94a13bd6b08b94298c9dbcc5a3a06edbe53722304de5b117f239
-EBUILD icaclient-13.10.0.20-r1.ebuild 4809 BLAKE2B 08204d5dba7f9632d3047123a78f63539c78dbe9177234486b9afdd8dd2c13e72ce6d9e1eeadebdc9433b4a04ca37c40243c0fdc65b43ed414f2b7d3c19d1f56 SHA512 e16d3870b90449139a368d4e56777fdf97d015fec17878c2c57f92503da75e488cb47844ef84249e565eafff2c013f8f68125b7b8e8ae2c94daa681a14be1434
-EBUILD icaclient-18.10.0.11-r1.ebuild 5001 BLAKE2B 229bc1894b70fdb41fee4f46788e59e218e2c06c21696bd9a67fe6a10a7af3287e2f1ebad2632a083af478ef1de686fe28fb61d31c9899cbb43d0815165c7b7b SHA512 34109258156e8a9be1b1f7aedeb0e4ca8bb63087564cd053edb6ddb509ae98cce20271bb024a6177f494d2f25dd04d059ca4fc49464ab860f3781950935de1ad
-EBUILD icaclient-18.10.0.11.ebuild 4835 BLAKE2B 3cd1c02b2e0b29c36060c084718d8f0798aa7e07847f9d965565783b75030aac07fc45798bc3d7855ee775c13857ae6e8337647e1837806896e867078ad55302 SHA512 e067e03c848086b087d2f34855905c17d637b18d7b23addde72b5e9c1930963e644e5ac73b74280ce8649d2315d7ec8f3c8841ef7d67370f973ddefc8ee99b03
+DIST linuxx86-19.1.0.9.tar.gz 24175639 BLAKE2B d73d3d438ef272f9571587cd66e357bca4698d797ea813dafb47b6c61a86606b2021b5659908d160e3baec7b668265d4dccbf8f009c4c77c99e1258fec28c22f SHA512 110d1f160f6f4538bb589682bcbb8414b816d0669dc1fb4559243ee335a6e6129af8e50d47feadd7688808affef7bcaa300fc6c01fb05b84938fe449f7e9d05d
+EBUILD icaclient-18.10.0.11-r1.ebuild 4999 BLAKE2B 72cea895bcfa9e8713d1cd740422838e5900a7bcf3c8a171acd7ccc2c14e80e4076dc51193b97295b71dd3ceaa96f9914f4227fbe887aa4f22ffbd3f0eb4af7e SHA512 1262b73337b7bd68d187c0d5aae8c84450633a2a5b8844f7358dee753504ed132bd27e290b38471f74e67dfe1b0d45af4335393a14a73ab8b644b396456d7038
+EBUILD icaclient-19.1.0.9.ebuild 5001 BLAKE2B 29a15d96b01be75869fddb51f7905bd19cfc8bc9f92f90fd8e53c507ca5ce5229563c0573304d6256da351531d56a642daf1a1d852fafdc0d30030be5e017af2 SHA512 8caf0fb0bef83be86a90ccdf6d3395895ffffed69c7a22c018886eda55b5da363a80722f20a2d1746dee6a6b235ac20382f30c8ccd9cee4a60d559ba2e423837
 MISC metadata.xml 678 BLAKE2B 7ca853d90b1492bd1c15b9e0109430afbedae032ef56a035cf75de74796f694b2ab955dca5f3ef93a97a1c61686ead93b1bd1579802b35e0bd381d0d0c35d5ff SHA512 a838a68c22e2f1585960a7699399285c0c9b47b79734a22adc5d74599380c7c7792428dd7287f1e62d1194a4f97c79e902910f4c1569fc227f0f7e1c39afc8d0
diff --git a/net-misc/icaclient/icaclient-13.10.0.20-r1.ebuild b/net-misc/icaclient/icaclient-13.10.0.20-r1.ebuild
deleted file mode 100644
index 9ad6a7b62628..000000000000
--- a/net-misc/icaclient/icaclient-13.10.0.20-r1.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# eutils inherit required for make_wrapper call
-inherit desktop eutils multilib versionator xdg-utils
-
-DESCRIPTION="ICA Client for Citrix Presentation servers"
-HOMEPAGE="https://www.citrix.com/"
-SRC_URI="amd64? ( linuxx64-${PV}.tar.gz )
-	x86? ( linuxx86-${PV}.tar.gz )"
-
-LICENSE="icaclient"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="nsplugin l10n_de l10n_es l10n_fr l10n_ja l10n_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:1.0
-	media-libs/gstreamer:1.0
-	media-libs/libcanberra[gtk]
-	media-libs/libogg
-	media-libs/libvorbis
-	media-libs/speex
-	net-dns/libidn:1.33
-	net-libs/libsoup:2.4
-	net-misc/curl
-	sys-libs/e2fsprogs-libs
-	sys-libs/zlib
-	virtual/krb5
-	virtual/jpeg:0
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	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}."
-}
-
-pkg_setup() {
-	case ${ARCH} in
-		amd64)
-			ICAARCH=linuxx64
-		;;
-		x86)
-			ICAARCH=linuxx86
-		;;
-		*)
-			eerror "Given architecture is not supported by Citrix."
-		;;
-	esac
-
-	S="${WORKDIR}/${ICAARCH}/${ICAARCH}.cor"
-}
-
-src_prepare() {
-	default
-	rm lib/UIDialogLibWebKit.so || die
-}
-
-src_install() {
-	local tmpl dest
-
-	dodir "${ICAROOT}"
-
-	exeinto "${ICAROOT}"
-	doexe *.DLL 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/*
-
-	local lang LANGCODES=( en )
-	use l10n_de && LANGCODES+=( de )
-	use l10n_es && LANGCODES+=( es )
-	use l10n_fr && LANGCODES+=( fr )
-	use l10n_ja && LANGCODES+=( ja )
-	use l10n_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,gst_play1.0,gst_read1.0,hdxcheck.sh,icalicense.sh,libgstflatstm1.0.so}
-	doexe util/{lurdump,new_store,nslaunch,pnabrowse,storebrowse,sunraymac.sh,what,xcapture}
-
-	# https://bugs.gentoo.org/655922
-	dosym gst_play1.0 "${ICAROOT}"/util/gst_play
-	dosym gst_read1.0 "${ICAROOT}"/util/gst_read
-	dosym libgstflatstm1.0.so "${ICAROOT}"/util/libgstflatstm.so
-
-	doenvd "${FILESDIR}"/10ICAClient
-
-	make_wrapper wfica "${ICAROOT}"/wfica . "${ICAROOT}"
-
-	dodir /etc/revdep-rebuild/
-	echo "SEARCH_DIRS_MASK=\"${ICAROOT}\"" \
-		> "${ED%/}"/etc/revdep-rebuild/70icaclient
-
-	# 651926
-	domenu "${FILESDIR}"/wfica.desktop
-}
-
-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
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/net-misc/icaclient/icaclient-18.10.0.11-r1.ebuild b/net-misc/icaclient/icaclient-18.10.0.11-r1.ebuild
index 2694d7156b64..bf40a7fc05de 100644
--- a/net-misc/icaclient/icaclient-18.10.0.11-r1.ebuild
+++ b/net-misc/icaclient/icaclient-18.10.0.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="amd64? ( linuxx64-${PV}.tar.gz )
 
 LICENSE="icaclient"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="nsplugin l10n_de l10n_es l10n_fr l10n_ja l10n_zh_CN"
 RESTRICT="mirror strip userpriv fetch"
 
diff --git a/net-misc/icaclient/icaclient-18.10.0.11.ebuild b/net-misc/icaclient/icaclient-19.1.0.9.ebuild
index b8118d5f9b1e..a54c5cd45c39 100644
--- a/net-misc/icaclient/icaclient-18.10.0.11.ebuild
+++ b/net-misc/icaclient/icaclient-19.1.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -89,7 +89,7 @@ src_prepare() {
 }
 
 src_install() {
-	local tmpl dest
+	local bin tmpl dest
 
 	dodir "${ICAROOT}"
 
@@ -184,14 +184,20 @@ src_install() {
 
 	doenvd "${FILESDIR}"/10ICAClient
 
-	make_wrapper wfica "${ICAROOT}"/wfica . "${ICAROOT}"
+	for bin in configmgr conncenter new_store ; do
+		make_wrapper ${bin} "${ICAROOT}"/util/${bin} . "${ICAROOT}"/util
+	done
+
+	for bin in selfservice wfica ; do
+		make_wrapper ${bin} "${ICAROOT}"/${bin} . "${ICAROOT}"
+	done
 
 	dodir /etc/revdep-rebuild/
 	echo "SEARCH_DIRS_MASK=\"${ICAROOT}\"" \
 		> "${ED}"/etc/revdep-rebuild/70icaclient
 
 	# 651926
-	domenu "${FILESDIR}"/wfica.desktop
+	domenu "${FILESDIR}"/*.desktop
 }
 
 pkg_preinst() {