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 00F3B138335 for ; Mon, 28 Jan 2019 19:56:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F3180E1334; Mon, 28 Jan 2019 01:08:45 +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 CCE34E1334 for ; Mon, 28 Jan 2019 01:08:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 5E395335D95 for ; Mon, 28 Jan 2019 01:08:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6486D51C for ; Mon, 28 Jan 2019 01:08:42 +0000 (UTC) From: "Doug Goldstein" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Doug Goldstein" Message-ID: <1548637710.c9060c3c166cdabb33564aba054fa1206c5b0b4d.cardoe@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/qemu/qemu-3.1.0.ebuild app-emulation/qemu/qemu-9999.ebuild X-VCS-Directories: app-emulation/qemu/ X-VCS-Committer: cardoe X-VCS-Committer-Name: Doug Goldstein X-VCS-Revision: c9060c3c166cdabb33564aba054fa1206c5b0b4d X-VCS-Branch: master Date: Mon, 28 Jan 2019 01:08:42 +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: 62860ef0-ff40-4220-a49d-00ee139f6795 X-Archives-Hash: 290719a852f096eaba7ccf02eba0ecfa commit: c9060c3c166cdabb33564aba054fa1206c5b0b4d Author: Doug Goldstein gentoo org> AuthorDate: Mon Jan 28 01:07:50 2019 +0000 Commit: Doug Goldstein gentoo org> CommitDate: Mon Jan 28 01:08:30 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9060c3c app-emulation/qemu: fix build with SOFTMMU_TARGETS empty When SOFTMMU_TARGETS are empty the qemu-bridge-helper isn't installed anymore causing a failure to build due to the fcaps call. Closes: https://bugs.gentoo.org/675110 Signed-off-by: Doug Goldstein gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 app-emulation/qemu/qemu-3.1.0.ebuild | 3 ++- app-emulation/qemu/qemu-9999.ebuild | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app-emulation/qemu/qemu-3.1.0.ebuild b/app-emulation/qemu/qemu-3.1.0.ebuild index 328afccf346..316cf892505 100644 --- a/app-emulation/qemu/qemu-3.1.0.ebuild +++ b/app-emulation/qemu/qemu-3.1.0.ebuild @@ -768,7 +768,8 @@ pkg_postinst() { udev_reload fi - fcaps cap_net_admin /usr/libexec/qemu-bridge-helper + [[ -f ${D}/usr/libexec/qemu-bridge-helper ]] && \ + fcaps cap_net_admin /usr/libexec/qemu-bridge-helper DISABLE_AUTOFORMATTING=true readme.gentoo_print_elog diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index 1c99bc24161..7561f0f611c 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -760,7 +760,8 @@ pkg_postinst() { udev_reload fi - fcaps cap_net_admin /usr/libexec/qemu-bridge-helper + [[ -f ${D}/usr/libexec/qemu-bridge-helper ]] && \ + fcaps cap_net_admin /usr/libexec/qemu-bridge-helper DISABLE_AUTOFORMATTING=true readme.gentoo_print_elog