From: Thomas Deutschmann <whissi@gentoo.org>
Date: Fri, 3 Apr 2020 09:45:20 +0000 (+0200)
Subject: www-client/firefox-bin: install files from $D
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cf2a999fb1d4c1d4d1749aeda04ae4e1aa023924;p=gentoo.git

www-client/firefox-bin: install files from $D

Commit f49167d933ef33c4f02f0aa335bb91f251ba1e7f re-ordered install order.

Because we now move $S/firefox to $D at the beginning of src_install,
we must point to $D when installing these files.

Closes: https://bugs.gentoo.org/715998
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-r2.ebuild b/www-client/firefox-bin/firefox-bin-68.6.0-r2.ebuild
index 77ed113988e8..c02d55a75e8e 100644
--- a/www-client/firefox-bin/firefox-bin-68.6.0-r2.ebuild
+++ b/www-client/firefox-bin/firefox-bin-68.6.0-r2.ebuild
@@ -133,10 +133,10 @@ src_install() {
 	# Install icons and .desktop for menu entry
 	for size in ${sizes} ; do
 		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
-		newins "${icon_path}/default${size}.png" "${icon}.png"
+		newins "${ED%/}${icon_path}/default${size}.png" "${icon}.png"
 	done
 	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
-	newicon ${MOZILLA_FIVE_HOME}/browser/chrome/icons/default/default48.png ${PN}.png
+	newicon "${ED%/}${MOZILLA_FIVE_HOME}/browser/chrome/icons/default/default48.png" ${PN}.png
 
 	# Add StartupNotify=true bug 237317
 	local startup_notify="false"
diff --git a/www-client/firefox-bin/firefox-bin-74.0-r2.ebuild b/www-client/firefox-bin/firefox-bin-74.0-r2.ebuild
index 85a96b9928c8..bef5c486f6e8 100644
--- a/www-client/firefox-bin/firefox-bin-74.0-r2.ebuild
+++ b/www-client/firefox-bin/firefox-bin-74.0-r2.ebuild
@@ -133,10 +133,10 @@ src_install() {
 	# Install icons and .desktop for menu entry
 	for size in ${sizes} ; do
 		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
-		newins "${icon_path}/default${size}.png" "${icon}.png"
+		newins "${ED%/}${icon_path}/default${size}.png" "${icon}.png"
 	done
 	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
-	newicon ${MOZILLA_FIVE_HOME}/browser/chrome/icons/default/default48.png ${PN}.png
+	newicon "${ED%/}${MOZILLA_FIVE_HOME}/browser/chrome/icons/default/default48.png" ${PN}.png
 
 	# Add StartupNotify=true bug 237317
 	local startup_notify="false"