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 EB4481382C5 for ; Thu, 13 May 2021 13:38:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3A032E0874; Thu, 13 May 2021 13:38:40 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 25E45E0874 for ; Thu, 13 May 2021 13:38:40 +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 2D2D3340DA7 for ; Thu, 13 May 2021 13:38:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BF7BFCC for ; Thu, 13 May 2021 13:38:37 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1620913100.22006ad103f2ac936c3bae11d70f6f8a3205a8b7.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/wxGTK/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-libs/wxGTK/wxGTK-3.0.4-r303.ebuild x11-libs/wxGTK/wxGTK-3.0.5.1.ebuild X-VCS-Directories: x11-libs/wxGTK/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 22006ad103f2ac936c3bae11d70f6f8a3205a8b7 X-VCS-Branch: master Date: Thu, 13 May 2021 13:38:37 +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: 77131089-84f6-4ad9-a4e4-719853679b3f X-Archives-Hash: 2b7c977cb2c7f8f9ccc1eb46e9386eec commit: 22006ad103f2ac936c3bae11d70f6f8a3205a8b7 Author: Sergey Torokhov yandex ru> AuthorDate: Thu May 13 13:38:20 2021 +0000 Commit: David Seifert gentoo org> CommitDate: Thu May 13 13:38:20 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22006ad1 x11-libs/wxGTK: fix USE="-X" removing of '/usr/bin/wxrc' Closes: https://github.com/gentoo/gentoo/pull/20627 Closes: https://bugs.gentoo.org/787305 Acked-by: Mart Raudsepp gentoo.org> Signed-off-by: Sergey Torokhov yandex.ru> Signed-off-by: David Seifert gentoo.org> x11-libs/wxGTK/wxGTK-3.0.4-r303.ebuild | 3 ++- x11-libs/wxGTK/wxGTK-3.0.5.1.ebuild | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/x11-libs/wxGTK/wxGTK-3.0.4-r303.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4-r303.ebuild index 65d027d2d11..2259503a09b 100644 --- a/x11-libs/wxGTK/wxGTK-3.0.4-r303.ebuild +++ b/x11-libs/wxGTK/wxGTK-3.0.4-r303.ebuild @@ -144,7 +144,8 @@ multilib_src_install_all() { rm -f "${ED}"/usr/share/locale/it/LC_MESSAGES/wxmsw30-gtk3.mo || die # Unversioned links - rm "${ED}"/usr/bin/wx{-config,rc} || die + rm "${ED}"/usr/bin/wx-config || die + use X && { rm "${ED}"/usr/bin/wxrc || die; } # version bakefile presets pushd "${ED}"/usr/share/bakefile/presets >/dev/null || die diff --git a/x11-libs/wxGTK/wxGTK-3.0.5.1.ebuild b/x11-libs/wxGTK/wxGTK-3.0.5.1.ebuild index e43f2597c1a..752bedf56e7 100644 --- a/x11-libs/wxGTK/wxGTK-3.0.5.1.ebuild +++ b/x11-libs/wxGTK/wxGTK-3.0.5.1.ebuild @@ -144,7 +144,8 @@ multilib_src_install_all() { rm -f "${ED}"/usr/share/locale/it/LC_MESSAGES/wxmsw30-gtk3.mo || die # Unversioned links - rm "${ED}"/usr/bin/wx{-config,rc} || die + rm "${ED}"/usr/bin/wx-config || die + use X && { rm "${ED}"/usr/bin/wxrc || die; } # version bakefile presets pushd "${ED}"/usr/share/bakefile/presets >/dev/null || die