summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Torokhov <torokhov-s-a@yandex.ru>2021-05-13 15:38:20 +0200
committerDavid Seifert <soap@gentoo.org>2021-05-13 15:38:20 +0200
commit22006ad103f2ac936c3bae11d70f6f8a3205a8b7 (patch)
tree5191d5df769e919752c907b8d351dae2e377544a /x11-libs/wxGTK
parentnet-misc/croc: remove old (diff)
downloadgentoo-22006ad103f2ac936c3bae11d70f6f8a3205a8b7.tar.gz
gentoo-22006ad103f2ac936c3bae11d70f6f8a3205a8b7.tar.bz2
gentoo-22006ad103f2ac936c3bae11d70f6f8a3205a8b7.zip
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@gentoo.org> Signed-off-by: Sergey Torokhov <torokhov-s-a@yandex.ru> Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'x11-libs/wxGTK')
-rw-r--r--x11-libs/wxGTK/wxGTK-3.0.4-r303.ebuild3
-rw-r--r--x11-libs/wxGTK/wxGTK-3.0.5.1.ebuild3
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 65d027d2d111..2259503a09b8 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 e43f2597c1a0..752bedf56e7a 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