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 EE8C31382C5 for ; Sun, 18 Feb 2018 12:10:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 48A15E0C56; Sun, 18 Feb 2018 12:10:15 +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 26185E0C56 for ; Sun, 18 Feb 2018 12:10:15 +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 BAE56335C4D for ; Sun, 18 Feb 2018 12:10:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 36354215 for ; Sun, 18 Feb 2018 12:10:08 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1518955726.29264a5d156fc35c99c3cfa863ac6992d083f1e2.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/gdb/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/gdb/gdb-8.1.ebuild sys-devel/gdb/gdb-9999.ebuild X-VCS-Directories: sys-devel/gdb/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: 29264a5d156fc35c99c3cfa863ac6992d083f1e2 X-VCS-Branch: master Date: Sun, 18 Feb 2018 12:10:08 +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: ac4101f5-94de-4fc6-9c1d-3307f9da96da X-Archives-Hash: a09ab086510dec521a5b8b06a0c882a7 commit: 29264a5d156fc35c99c3cfa863ac6992d083f1e2 Author: Stephan Hartmann googlemail com> AuthorDate: Sat Feb 17 18:38:52 2018 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Sun Feb 18 12:08:46 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29264a5d sys-devel/gdb: fix gcore collision on freebsd Closes: https://bugs.gentoo.org/507456 Package-Manager: Portage-2.3.19, Repoman-2.3.6 Closes: https://github.com/gentoo/gentoo/pull/7216 sys-devel/gdb/gdb-8.1.ebuild | 5 +++++ sys-devel/gdb/gdb-9999.ebuild | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/sys-devel/gdb/gdb-8.1.ebuild b/sys-devel/gdb/gdb-8.1.ebuild index d464d985828..8ba27771a09 100644 --- a/sys-devel/gdb/gdb-8.1.ebuild +++ b/sys-devel/gdb/gdb-8.1.ebuild @@ -234,6 +234,11 @@ src_install() { # Remove shared info pages rm -f "${ED}"/usr/share/info/{annotate,bfd,configure,standards}.info* + + # gcore is part of ubin on freebsd + if [[ ${CHOST} == *-freebsd* ]]; then + rm "${ED}"/usr/bin/gcore || die + fi } pkg_postinst() { diff --git a/sys-devel/gdb/gdb-9999.ebuild b/sys-devel/gdb/gdb-9999.ebuild index 8ae03593af2..553005830a8 100644 --- a/sys-devel/gdb/gdb-9999.ebuild +++ b/sys-devel/gdb/gdb-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -218,6 +218,11 @@ src_install() { # Remove shared info pages rm -f "${ED}"/usr/share/info/{annotate,bfd,configure,standards}.info* + + # gcore is part of ubin on freebsd + if [[ ${CHOST} == *-freebsd* ]]; then + rm "${ED}"/usr/bin/gcore || die + fi } pkg_postinst() {