[gentoo-commits] repo/gentoo:master commit in: x11-libs/wxGTK/

["David Seifert" <soap@gentoo.org>]

commit:     22006ad103f2ac936c3bae11d70f6f8a3205a8b7
Author:     Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Thu May 13 13:38:20 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> 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 <leio <AT> gentoo.org>
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
Signed-off-by: David Seifert <soap <AT> 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