From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1ED4613835B for ; Sat, 16 Jan 2021 11:53:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 20694E0829; Sat, 16 Jan 2021 11:53:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E7153E0829 for ; Sat, 16 Jan 2021 11:53:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 707B933BF08 for ; Sat, 16 Jan 2021 11:53:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F361B476 for ; Sat, 16 Jan 2021 11:53:19 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1610797994.a5c53ce46cd236a433a06ab3d46fc15535e99867.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/icaclient/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/icaclient/icaclient-20.12.0.12-r1.ebuild net-misc/icaclient/icaclient-20.12.0.12.ebuild X-VCS-Directories: net-misc/icaclient/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: a5c53ce46cd236a433a06ab3d46fc15535e99867 X-VCS-Branch: master Date: Sat, 16 Jan 2021 11:53:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8858d176-d15e-48d7-bc97-770ea449a927 X-Archives-Hash: af0ef4a75935c66db75ee8374d44a886 commit: a5c53ce46cd236a433a06ab3d46fc15535e99867 Author: Lars Wendler gentoo org> AuthorDate: Sat Jan 16 11:08:46 2021 +0000 Commit: Lars Wendler gentoo org> CommitDate: Sat Jan 16 11:53:14 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5c53ce4 net-misc/icaclient: Revbump fixing some dependencies Removed config/module.ini from package's content because it can get modified by plugin packages Bug: https://bugs.gentoo.org/755407 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Lars Wendler gentoo.org> ...0.12.0.12.ebuild => icaclient-20.12.0.12-r1.ebuild} | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/net-misc/icaclient/icaclient-20.12.0.12.ebuild b/net-misc/icaclient/icaclient-20.12.0.12-r1.ebuild similarity index 90% rename from net-misc/icaclient/icaclient-20.12.0.12.ebuild rename to net-misc/icaclient/icaclient-20.12.0.12-r1.ebuild index b9c015a420f..a54700cb862 100644 --- a/net-misc/icaclient/icaclient-20.12.0.12.ebuild +++ b/net-misc/icaclient/icaclient-20.12.0.12-r1.ebuild @@ -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() {