From ad207c941c2cebd1b5051ac7ad00e511ecdd7ef0 Mon Sep 17 00:00:00 2001 From: Thomas Deutschmann Date: Mon, 30 Mar 2020 17:42:31 +0200 Subject: [PATCH] www-client/firefox-bin: don't install -x11 shortcut/.desktop file when not needed Package-Manager: Portage-2.3.96, Repoman-2.3.22 Signed-off-by: Thomas Deutschmann --- www-client/firefox-bin/firefox-bin-68.6.0-r1.ebuild | 11 +++++++---- www-client/firefox-bin/firefox-bin-74.0-r1.ebuild | 11 +++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/www-client/firefox-bin/firefox-bin-68.6.0-r1.ebuild b/www-client/firefox-bin/firefox-bin-68.6.0-r1.ebuild index eb30ac30836f..77ed113988e8 100644 --- a/www-client/firefox-bin/firefox-bin-68.6.0-r1.ebuild +++ b/www-client/firefox-bin/firefox-bin-68.6.0-r1.ebuild @@ -161,11 +161,14 @@ src_install() { newbin "${FILESDIR}"/firefox-bin-wayland.sh ${PN}-wayland ;; X11) - exec_command="${PN}-x11 --name ${PN}-x11" - if use wayland ; then - # Only needed when there's actually a choice - newbin "${FILESDIR}"/firefox-bin-x11.sh ${PN}-x11 + if ! use wayland ; then + # Exit loop here because there's no choice so + # we don't need wrapper/.desktop file for X11. + continue fi + + exec_command="${PN}-x11 --name ${PN}-x11" + newbin "${FILESDIR}"/firefox-bin-x11.sh ${PN}-x11 ;; *) app_name="${name}" diff --git a/www-client/firefox-bin/firefox-bin-74.0-r1.ebuild b/www-client/firefox-bin/firefox-bin-74.0-r1.ebuild index f8f296dafd15..85a96b9928c8 100644 --- a/www-client/firefox-bin/firefox-bin-74.0-r1.ebuild +++ b/www-client/firefox-bin/firefox-bin-74.0-r1.ebuild @@ -161,11 +161,14 @@ src_install() { newbin "${FILESDIR}"/firefox-bin-wayland.sh ${PN}-wayland ;; X11) - exec_command="${PN}-x11 --name ${PN}-x11" - if use wayland ; then - # Only needed when there's actually a choice - newbin "${FILESDIR}"/firefox-bin-x11.sh ${PN}-x11 + if ! use wayland ; then + # Exit loop here because there's no choice so + # we don't need wrapper/.desktop file for X11. + continue fi + + exec_command="${PN}-x11 --name ${PN}-x11" + newbin "${FILESDIR}"/firefox-bin-x11.sh ${PN}-x11 ;; *) app_name="${name}" -- 2.26.2