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 A4A2D139085 for ; Sun, 15 Jan 2017 16:14:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D3EF521C06C; Sun, 15 Jan 2017 16:14:08 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id ADD7121C06C for ; Sun, 15 Jan 2017 16:14:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 48756341265 for ; Sun, 15 Jan 2017 16:14:07 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5748C27FC for ; Sun, 15 Jan 2017 16:14:05 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1484496839.ef041685437e59103d06f3e28a9a233d7a33728f.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/liboping/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/liboping/liboping-1.8.0-r1.ebuild net-libs/liboping/liboping-1.9.0.ebuild X-VCS-Directories: net-libs/liboping/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: ef041685437e59103d06f3e28a9a233d7a33728f X-VCS-Branch: master Date: Sun, 15 Jan 2017 16:14:05 +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-Archives-Salt: c940fecf-ce05-4199-b406-79c1f6f3c96c X-Archives-Hash: 877eb98c3fef04628b0c5699ecf719b8 commit: ef041685437e59103d06f3e28a9a233d7a33728f Author: Thomas Deutschmann gentoo org> AuthorDate: Sun Jan 15 16:13:41 2017 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Sun Jan 15 16:13:59 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef041685 net-libs/liboping: Call fcaps only on files we really have installed (bug #605768) Package-Manager: Portage-2.3.3, Repoman-2.3.1 net-libs/liboping/liboping-1.8.0-r1.ebuild | 19 ++++++++++++++----- net-libs/liboping/liboping-1.9.0.ebuild | 19 ++++++++++++++----- 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/net-libs/liboping/liboping-1.8.0-r1.ebuild b/net-libs/liboping/liboping-1.8.0-r1.ebuild index 1414754..268c953 100644 --- a/net-libs/liboping/liboping-1.8.0-r1.ebuild +++ b/net-libs/liboping/liboping-1.8.0-r1.ebuild @@ -52,13 +52,22 @@ src_install() { pkg_postinst() { if use filecaps; then local _caps_str="CAP_NET_RAW" - fcaps "${_caps_str}" \ - "${EROOT%/}/usr/bin/oping" \ - "${EROOT%/}/usr/bin/noping" + _files=( "${EROOT%/}/usr/bin/oping") + + if use ncurses; then + _files+=( "${EROOT%/}/usr/bin/noping") + fi + + fcaps "${_caps_str}" "${_files[@]}" + elog "Capabilities for" elog "" - elog " ${EROOT%/}/usr/bin/oping" - elog " ${EROOT%/}/usr/bin/oping" + + local _file= + for _file in "${_files[@]}"; do + elog " ${_file}" + done + elog "" elog "set to ${_caps_str}+EP due to set 'filecaps' USE flag." elog diff --git a/net-libs/liboping/liboping-1.9.0.ebuild b/net-libs/liboping/liboping-1.9.0.ebuild index 1414754..268c953 100644 --- a/net-libs/liboping/liboping-1.9.0.ebuild +++ b/net-libs/liboping/liboping-1.9.0.ebuild @@ -52,13 +52,22 @@ src_install() { pkg_postinst() { if use filecaps; then local _caps_str="CAP_NET_RAW" - fcaps "${_caps_str}" \ - "${EROOT%/}/usr/bin/oping" \ - "${EROOT%/}/usr/bin/noping" + _files=( "${EROOT%/}/usr/bin/oping") + + if use ncurses; then + _files+=( "${EROOT%/}/usr/bin/noping") + fi + + fcaps "${_caps_str}" "${_files[@]}" + elog "Capabilities for" elog "" - elog " ${EROOT%/}/usr/bin/oping" - elog " ${EROOT%/}/usr/bin/oping" + + local _file= + for _file in "${_files[@]}"; do + elog " ${_file}" + done + elog "" elog "set to ${_caps_str}+EP due to set 'filecaps' USE flag." elog