commit: f17173196454c9e684737e3896fc4dad87fe7031
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 30 15:34:36 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Mar 30 15:43:00 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1717319
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 <AT> gentoo.org>
www-client/firefox/firefox-68.6.0-r3.ebuild | 11 +++++++----
www-client/firefox/firefox-74.0-r2.ebuild | 11 +++++++----
2 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/www-client/firefox/firefox-68.6.0-r3.ebuild
b/www-client/firefox/firefox-68.6.0-r3.ebuild
index 24ceeba5ece..035e41b50ae 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 f6e5a2262fa..2698ac6f81f 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}"
