diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2020-04-03 11:45:20 +0200 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2020-04-03 11:55:17 +0200 |
| commit | cf2a999fb1d4c1d4d1749aeda04ae4e1aa023924 (patch) | |
| tree | 159de026d8425390565e3b63ee6f17f3ee9835e0 | |
| parent | dev-python/cmd2: Add missing dep on pytest-mock (diff) | |
| download | gentoo-cf2a999fb1d4c1d4d1749aeda04ae4e1aa023924.tar.gz gentoo-cf2a999fb1d4c1d4d1749aeda04ae4e1aa023924.tar.bz2 gentoo-cf2a999fb1d4c1d4d1749aeda04ae4e1aa023924.zip | |
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>
| -rw-r--r-- | www-client/firefox-bin/firefox-bin-68.6.0-r2.ebuild | 4 | ||||
| -rw-r--r-- | www-client/firefox-bin/firefox-bin-74.0-r2.ebuild | 4 |
2 files changed, 4 insertions, 4 deletions
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" |