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 ED1541382C5 for ; Wed, 20 May 2020 08:06:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 428E3E08FB; Wed, 20 May 2020 08:06:05 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 29888E08FB for ; Wed, 20 May 2020 08:06:05 +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 EC37E34F17F for ; Wed, 20 May 2020 08:06:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6E67321E for ; Wed, 20 May 2020 08:06:01 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1589961960.5a61d35c67d0c12cae64b104107ccab3d216eb5e.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/wireshark/wireshark-3.2.4.ebuild net-analyzer/wireshark/wireshark-99999999.ebuild X-VCS-Directories: net-analyzer/wireshark/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 5a61d35c67d0c12cae64b104107ccab3d216eb5e X-VCS-Branch: master Date: Wed, 20 May 2020 08:06:01 +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: e5192f45-6463-4cc0-94bf-d7ae961f6ecc X-Archives-Hash: e3cb9ecba8f10118be998474b603a1aa commit: 5a61d35c67d0c12cae64b104107ccab3d216eb5e Author: Jeroen Roovers gentoo org> AuthorDate: Wed May 20 08:05:31 2020 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Wed May 20 08:06:00 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a61d35c net-analyzer/wireshark: Remove /usr/share/appdata when present Package-Manager: Portage-2.3.99, Repoman-2.3.22 Fixes: b0222a2948853f723eb7b52e0b972702f1684b29 Signed-off-by: Jeroen Roovers gentoo.org> net-analyzer/wireshark/wireshark-3.2.4.ebuild | 4 +++- net-analyzer/wireshark/wireshark-99999999.ebuild | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/net-analyzer/wireshark/wireshark-3.2.4.ebuild b/net-analyzer/wireshark/wireshark-3.2.4.ebuild index e5c132a7e21..f6f0080e664 100644 --- a/net-analyzer/wireshark/wireshark-3.2.4.ebuild +++ b/net-analyzer/wireshark/wireshark-3.2.4.ebuild @@ -226,7 +226,9 @@ src_install() { done fi - rm -r "${D}"/usr/share/appdata || die + if [[ -d "${D}"/usr/share/appdata ]]; then + rm -r "${D}"/usr/share/appdata || die + fi } pkg_postinst() { diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild index 8014ce38110..a358f4abf6e 100644 --- a/net-analyzer/wireshark/wireshark-99999999.ebuild +++ b/net-analyzer/wireshark/wireshark-99999999.ebuild @@ -220,7 +220,9 @@ src_install() { done fi - rm -r "${D}"/usr/share/appdata || die + if [[ -d "${D}"/usr/share/appdata ]]; then + rm -r "${D}"/usr/share/appdata || die + fi } pkg_postinst() {