commit: a5c53ce46cd236a433a06ab3d46fc15535e99867 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Sat Jan 16 11:08:46 2021 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> 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 <polynomial-c <AT> 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() {
