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 <whissi@gentoo.org>

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 eb30ac30836f9033d1eb187f47a2680c2c5eb253..77ed113988e864c9452ca85f784b48d03223b763 100644 (file)
--- 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 f8f296dafd156e934253017f580bbfdff4ecb91c..85a96b9928c81af47f9faa836e0996ae04045abe 100644 (file)
--- 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}"