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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4FBDE158011 for ; Fri, 15 Jul 2022 01:47:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4F6D6E1005; Fri, 15 Jul 2022 01:47:25 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 26FEEE1005 for ; Fri, 15 Jul 2022 01:47:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9DE1B34129B for ; Fri, 15 Jul 2022 01:47:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8361C540 for ; Fri, 15 Jul 2022 01:47:20 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1657849386.99a59b9c8b3fe4875a4a66d0c088e080c95ec579.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/icaclient/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/icaclient/icaclient-22.5.0.16.ebuild X-VCS-Directories: net-misc/icaclient/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 99a59b9c8b3fe4875a4a66d0c088e080c95ec579 X-VCS-Branch: master Date: Fri, 15 Jul 2022 01:47:20 +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: aac2d5f3-bf18-424d-bfa3-ad01864d77f6 X-Archives-Hash: 43342383ea0e4d5f6beac997c9177e69 commit: 99a59b9c8b3fe4875a4a66d0c088e080c95ec579 Author: Henning Schild hennsch de> AuthorDate: Sat Jul 2 12:21:55 2022 +0000 Commit: Sam James gentoo org> CommitDate: Fri Jul 15 01:43:06 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99a59b9c net-misc/icaclient: fix variable scope issues Closes: https://bugs.gentoo.org/836089 Signed-off-by: Henning Schild hennsch.de> Signed-off-by: Sam James gentoo.org> net-misc/icaclient/icaclient-22.5.0.16.ebuild | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/net-misc/icaclient/icaclient-22.5.0.16.ebuild b/net-misc/icaclient/icaclient-22.5.0.16.ebuild index ed272b4e5416..4ede9e8d1db4 100644 --- a/net-misc/icaclient/icaclient-22.5.0.16.ebuild +++ b/net-misc/icaclient/icaclient-22.5.0.16.ebuild @@ -83,8 +83,11 @@ pkg_setup() { eerror "Given architecture is not supported by Citrix." ;; esac +} - S="${WORKDIR}/${ICAARCH}/${ICAARCH}.cor" +src_unpack() { + default + mv "${WORKDIR}/${ICAARCH}/${ICAARCH}.cor" "${S}" } src_prepare() { @@ -250,7 +253,7 @@ src_install() { pkg_postinst() { xdg_desktop_database_update - local inidest="${BROOT}${ICAROOT}/config" + local inidest="${ROOT}${ICAROOT}/config" if [[ ! -e "${inidest}"/module.ini ]] ; then mv "${T}"/module.ini "${inidest}/" \ || ewarn 'Failed to install plugin.ini file'