From: Thomas Deutschmann <whissi@gentoo.org>
Date: Mon, 30 Mar 2020 15:34:36 +0000 (+0200)
Subject: www-client/firefox: don't install -x11 shortcut/.desktop file when not needed
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f17173196454c9e684737e3896fc4dad87fe7031;p=gentoo.git

www-client/firefox: 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/firefox-68.6.0-r3.ebuild b/www-client/firefox/firefox-68.6.0-r3.ebuild
index 24ceeba5ece5..035e41b50ae7 100644
--- a/www-client/firefox/firefox-68.6.0-r3.ebuild
+++ b/www-client/firefox/firefox-68.6.0-r3.ebuild
@@ -762,11 +762,14 @@ PROFILE_EOF
 				newbin "${FILESDIR}"/firefox-wayland.sh firefox-wayland
 				;;
 			X11)
-				exec_command='firefox-x11 --name firefox-x11'
-				if use wayland ; then
-					# Only needed when there's actually a choice
-					newbin "${FILESDIR}"/firefox-x11.sh firefox-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='firefox-x11 --name firefox-x11'
+				newbin "${FILESDIR}"/firefox-x11.sh firefox-x11
 				;;
 			*)
 				app_name="${name}"
diff --git a/www-client/firefox/firefox-74.0-r2.ebuild b/www-client/firefox/firefox-74.0-r2.ebuild
index f6e5a2262fa6..2698ac6f81fa 100644
--- a/www-client/firefox/firefox-74.0-r2.ebuild
+++ b/www-client/firefox/firefox-74.0-r2.ebuild
@@ -781,11 +781,14 @@ PROFILE_EOF
 				newbin "${FILESDIR}"/firefox-wayland.sh firefox-wayland
 				;;
 			X11)
-				exec_command='firefox-x11 --name firefox-x11'
-				if use wayland ; then
-					# Only needed when there's actually a choice
-					newbin "${FILESDIR}"/firefox-x11.sh firefox-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='firefox-x11 --name firefox-x11'
+				newbin "${FILESDIR}"/firefox-x11.sh firefox-x11
 				;;
 			*)
 				app_name="${name}"