gentoo resync : 22.01.2021

4 files changed, 274 insertions, 12 deletions

diff --git a/net-misc/icaclient/Manifest b/net-misc/icaclient/Manifest
index d2046541207a..52407bdeb167 100644
--- a/net-misc/icaclient/Manifest
+++ b/net-misc/icaclient/Manifest
@@ -6,9 +6,10 @@ AUX new_store.desktop 235 BLAKE2B 43bbf97a6982485e8b21f30c15889d64063ef0ce294b06
 AUX selfservice.desktop 183 BLAKE2B 45d0830601ceac5159e239ec149cf3cdeabd43beb2ad6964935129fad6cd2c2e7c36cfc473e89b5db3b3b6cce2df909dd6013c3463631a7d868b470a49494285 SHA512 c4a2bdd83a29171c331b8adc98b33b8150fef5616d1fde8a0c9ccf1972b8ecc222dc1c0bc4e7779d93b851f44e79f5166138af7b7d36de964932ff3b63a4801b
 AUX wfica.desktop 242 BLAKE2B 6e90bb02824a6319035814050919c55907b2104c65e2abcc7379a4c694a585945c2e10ada114c4dfb906ee3b1fa90a0251dcb1ec3aac1fb6015a2d2ecbef4452 SHA512 a233bbdfadaee080d8dda67ed81a60ef74902c1f2100cb08bc402186be23f1bbb82f84abb93da88d610d187a267f7db28e6bfebe689839c921ae5a94a4bdf1d7
 DIST linuxx64-20.10.0.6.tar.gz 119730020 BLAKE2B 62154534ee83f18ebd71c4f2d247863c028ad34dfea1fc1b182e3dd5ef3296f65a45860a1b613de286e9d1a5ac52f4ea00da92ba221619194608ccd453306112 SHA512 ec16064483c94c3b56caef622c2091e845613bd0926174fd40474f7f74d62a56f3d5dce2398e42b12a7c774b62dfe605ef7c9f7556d14814d902047a35154c68
-DIST linuxx64-20.9.0.15.tar.gz 117636697 BLAKE2B 4279fa23edd6be2c0cd73f4f1881815b377779d695b1fb110fd5a28aae6ef45649e9b9796ad6d637954bd4dd62e35aadbb352311297e10fa0923fb03ea42711b SHA512 6a5e2cc3f40ffd894548247df4ce2dd988293fa17e72ba101bd32250ac13ea077a80ab1129e7d85987333ad6afaf3c3e2fe75a642e66d21c87d07cf6c57adfb2
+DIST linuxx64-20.12.0.12.tar.gz 120763336 BLAKE2B 4db068617ce7f47351bf8d0b964f00719705090d7a805eccaca3823648852fa12b894aa2f55d5abc0c6936ee01204bc2967488368797d081f6fd97f1a1cb25b8 SHA512 9bc6fd49dea450269ac9f70c20fa5b6a3fb7812e83005063ce5a32032d02a2283d13fa25e64a426c1b7e7cce717a3c4dd0ce2903a51a12758f7f7c3efb558ae6
 DIST linuxx86-20.10.0.6.tar.gz 109881795 BLAKE2B 0deda5cd800a891a1c15f8e1b6f553b86ee1d90177ddb75460bc6f5a2afe40e9c56cc1427c25ed64ba66741ba0749efc736ea653ea633aefd086a3fb2e34d1d2 SHA512 027658ecc25775d3436a4a02f36a6fc7da766b909d2b21284e3d7f2c658397b4e3e496556eae84f241dca41b155ee2f7088780e5d89e295d641aadae3908cef8
-DIST linuxx86-20.9.0.15.tar.gz 108055955 BLAKE2B f94ff3e44152165d0122cc28c302df2bbc7401aaa7b61ee8e7479ffd44d6fcc25daac94211ba3dabed56d51b531d9a72a41e63dd2019880d956f2a4faa0269c1 SHA512 cddbef60ddf4baa1e9f45e80df78c2153907a4eb010649946ee10d0875c9066268a47d37ddd3f3cb026cf130a3f4e566d745f1b3781c13810b50476344cfafb4
-EBUILD icaclient-20.10.0.6.ebuild 4855 BLAKE2B e8c9f6e9041cff306a5dc9c5255dc536119f71b4bd8f6e9af15f796070fe3b2ee8bcef150489b7c4cc77f61a5fa606f07a6d9276c02e4a78e6619722c956c773 SHA512 b586a4a1706468cf6a8cc294b3f41913b04698809bafcebea9ebf6b9bc809684f29849e15eef4da7212c6354b46ea8952a2d8d5878fa487f152f9697e6dfe1df
-EBUILD icaclient-20.9.0.15-r1.ebuild 4853 BLAKE2B a0110efc3e3fc44cf83cc288b16923771f9722c62122e377fd420afb9366892ca221618790fdba390eca5538be64e0511d2f426c7437f0d52e902b9b58c6ace4 SHA512 0f71d26f20635ade089d35e56435342332d6dc8b3862bd68ae5a1cc8b71e51018aa28e22a2ca9c33aca9411136db8e751f475e730abc2ee21929240457928130
+DIST linuxx86-20.12.0.12.tar.gz 110107767 BLAKE2B 1958eb57622be69edb95ac2c0389f5dd98141bc92899d876b3c4911629c63a3d5b21bb2c7296975a41afbcc321b733fd05a6874ff4b03d79ff3c4aa6a1a44ec9 SHA512 e976ba3c00bbb16aa1039ac510fdb6118c1353e9ba4a67b4ac553896b6b51346d16ae8a569ddfbbc3ab89f89b1759789e2bb88e397611140e5caf11709917d98
+EBUILD icaclient-20.10.0.6.ebuild 4853 BLAKE2B 9bd96d270e9ccba3cd55b9397dd7a35033150cd318e174af9cf89878fed2940930ce7423a7ef12490b6d2cc07015376d3bcdc844f57487c1bedb144ab44e475c SHA512 a06fb2a3732e541bf052d94fbd3684e9fbbc6dfdb74a778c6f3ee90e837b5cd4c2a176156bab322a9b3a8527f5543feb245ea321fe136260bd9a06c42531c204
+EBUILD icaclient-20.12.0.12-r1.ebuild 5257 BLAKE2B c9290b8d671b3f1724f3c9469a6b1cac335c21bc1f7ef61f86f5e598fd7035915772199d9fb11e860f1e3be2a1202470bd8412b1a40d5fb79218c6829eacb226 SHA512 c354868982eabf494d18e184ff0045e9caba639d1bc561098549281d923c62386d7010c280ef411e61880658339c12aea52091c7db25da186ef0033e89556c82
+EBUILD icaclient-20.12.0.12-r2.ebuild 5336 BLAKE2B ba5372eab77e9f407818b50a2c068f53446de00422324de160be3a178d1c624558a0e25333966bcfe47c1d61e93bc6e38025bf3fa776e13506539b1c2ab898b6 SHA512 b8c86453827e697617955954d1a2756a074b641921cfd0cba2bd61edffdda96d1c665e7bb5499d1738abd0137e222bf85ec1018fe64fd20c39184f196b0a846b
 MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e
diff --git a/net-misc/icaclient/icaclient-20.10.0.6.ebuild b/net-misc/icaclient/icaclient-20.10.0.6.ebuild
index 7c0393e74900..57eda077ca0f 100644
--- a/net-misc/icaclient/icaclient-20.10.0.6.ebuild
+++ b/net-misc/icaclient/icaclient-20.10.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 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="l10n_de l10n_es l10n_fr l10n_ja l10n_zh-CN"
 RESTRICT="mirror strip userpriv fetch"
 
diff --git a/net-misc/icaclient/icaclient-20.9.0.15-r1.ebuild b/net-misc/icaclient/icaclient-20.12.0.12-r1.ebuild
index c6398836aa03..a54700cb8626 100644
--- a/net-misc/icaclient/icaclient-20.9.0.15-r1.ebuild
+++ b/net-misc/icaclient/icaclient-20.12.0.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 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="l10n_de l10n_es l10n_fr l10n_ja l10n_zh-CN"
 RESTRICT="mirror strip userpriv fetch"
 
@@ -22,10 +22,10 @@ ICAROOT="/opt/Citrix/ICAClient"
 QA_PREBUILT="${ICAROOT#/}/*"
 
 RDEPEND="
+	app-crypt/libsecret
 	dev-libs/atk
 	dev-libs/glib:2
 	dev-libs/libxml2
-	dev-libs/openssl-compat:1.0.0
 	media-fonts/font-adobe-100dpi
 	media-fonts/font-misc-misc
 	media-fonts/font-cursor-misc
@@ -41,8 +41,6 @@ RDEPEND="
 	media-libs/speex
 	net-libs/libsoup:2.4
 	net-libs/webkit-gtk:4
-	net-misc/curl
-	net-misc/nx
 	sys-apps/util-linux
 	sys-libs/libcxx
 	sys-libs/libcxxabi
@@ -93,6 +91,11 @@ pkg_setup() {
 src_prepare() {
 	default
 	rm lib/UIDialogLibWebKit.so || die
+
+	# We need to avoid module.ini file getting added to the package's
+	# content because media-plugins/hdx-realtime-media-engine modifies
+	# this file on installation. See pkg_postinst()
+	mv nls/en/module.ini "${T}" || die
 }
 
 src_install() {
@@ -118,7 +121,8 @@ src_install() {
 	doins -r usb
 
 	insinto "${ICAROOT}"/config
-	doins config/* config/.* nls/en/*.ini
+	# nls/en/*.ini is being handled by pkg_postinst()
+	doins config/* config/.*
 	for tmpl in {appsrv,wfclient}.template ; do
 		newins nls/en/${tmpl} ${tmpl/template/ini}
 	done
@@ -231,6 +235,12 @@ src_install() {
 
 pkg_postinst() {
 	xdg_desktop_database_update
+
+	local inidest="${BROOT}${ICAROOT}/config"
+	if [[ ! -e "${inidest}"/module.ini ]] ; then
+		mv "${T}"/module.ini "${inidest}/" \
+			|| ewarn 'Failed to install plugin.ini file'
+	fi
 }
 
 pkg_postrm() {
diff --git a/net-misc/icaclient/icaclient-20.12.0.12-r2.ebuild b/net-misc/icaclient/icaclient-20.12.0.12-r2.ebuild
new file mode 100644
index 000000000000..a92334c81619
--- /dev/null
+++ b/net-misc/icaclient/icaclient-20.12.0.12-r2.ebuild
@@ -0,0 +1,251 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# eutils inherit required for make_wrapper call
+inherit desktop eutils multilib 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="l10n_de l10n_es l10n_fr l10n_ja l10n_zh-CN"
+RESTRICT="mirror strip userpriv fetch"
+
+ICAROOT="/opt/Citrix/ICAClient"
+
+QA_PREBUILT="${ICAROOT#/}/*"
+
+RDEPEND="
+	app-crypt/libsecret
+	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/libogg
+	media-libs/libvorbis
+	media-libs/speex
+	net-libs/libsoup:2.4
+	net-libs/webkit-gtk:4
+	sys-apps/util-linux
+	sys-libs/libcxx
+	sys-libs/libcxxabi
+	sys-libs/zlib
+	virtual/krb5
+	virtual/jpeg:0
+	virtual/libudev
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	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/workspace-app/"
+	elog "and place it into your DISTDIR directory."
+}
+
+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
+
+	# We need to avoid module.ini file getting added to the package's
+	# content because media-plugins/hdx-realtime-media-engine modifies
+	# this file on installation. See pkg_postinst()
+	mv nls/en/module.ini "${T}" || die
+}
+
+src_install() {
+	local bin tmpl dest
+
+	dodir "${ICAROOT}"
+
+	exeinto "${ICAROOT}"
+	doexe *.DLL libproxy.so wfica AuthManagerDaemon PrimaryAuthManager selfservice ServiceRecord
+
+	exeinto "${ICAROOT}"/lib
+	if use amd64 ; then
+		rm lib/ctxjpeg_fb_8.so || die
+	fi
+	doexe lib/*.so
+
+	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
+	# nls/en/*.ini is being handled by pkg_postinst()
+	doins config/* config/.*
+	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
+
+	local util_files=(
+		configmgr
+		conncenter
+		ctx_app_bind
+		ctx_rehash
+		ctxlogd
+		ctxwebhelper
+		gst_play1.0
+		gst_read1.0
+		hdxcheck.sh
+		icalicense.sh
+		libgstflatstm1.0.so
+		lurdump
+		new_store
+		nslaunch
+		pnabrowse
+		setlog
+		storebrowse
+		sunraymac.sh
+		webcontainer
+		what
+		xcapture
+	)
+
+	exeinto "${ICAROOT}"/util
+	for bin in ${util_files[@]} ; do
+		doexe util/${bin}
+	done
+
+	# 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
+
+	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
+
+	insinto "${ICAROOT}"/pkginf
+	newins "${WORKDIR}"/PkgId Ver.core."${ICAARCH}"
+
+	# 651926
+	domenu "${FILESDIR}"/*.desktop
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+
+	local inidest="${BROOT}${ICAROOT}/config"
+	if [[ ! -e "${inidest}"/module.ini ]] ; then
+		mv "${T}"/module.ini "${inidest}/" \
+			|| ewarn 'Failed to install plugin.ini file'
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}