[gentoo-commits] repo/gentoo:master commit in: www-client/firefox-bin/

[Thomas Deutschmann]

commit:     ad207c941c2cebd1b5051ac7ad00e511ecdd7ef0
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 30 15:42:31 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Mar 30 15:43:01 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad207c94

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 <AT> gentoo.org>

 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 eb30ac30836..77ed113988e 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 f8f296dafd1..85a96b9928c 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}"