From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0930D138350 for ; Fri, 3 Apr 2020 09:55:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 47540E0AB6; Fri, 3 Apr 2020 09:55:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2CBFCE0AB6 for ; Fri, 3 Apr 2020 09:55:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8613134EF4E for ; Fri, 3 Apr 2020 09:55:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E8F2519B for ; Fri, 3 Apr 2020 09:55:25 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1585907717.cf2a999fb1d4c1d4d1749aeda04ae4e1aa023924.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/firefox-bin/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/firefox-bin/firefox-bin-68.6.0-r2.ebuild www-client/firefox-bin/firefox-bin-74.0-r2.ebuild X-VCS-Directories: www-client/firefox-bin/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: cf2a999fb1d4c1d4d1749aeda04ae4e1aa023924 X-VCS-Branch: master Date: Fri, 3 Apr 2020 09:55:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8d9ced37-2539-4c72-ab01-236a9b992f73 X-Archives-Hash: 0d1d582477c82ba8b746f622032f1f27 commit: cf2a999fb1d4c1d4d1749aeda04ae4e1aa023924 Author: Thomas Deutschmann gentoo org> AuthorDate: Fri Apr 3 09:45:20 2020 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Fri Apr 3 09:55:17 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf2a999f 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 gentoo.org> www-client/firefox-bin/firefox-bin-68.6.0-r2.ebuild | 4 ++-- 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 77ed113988e..c02d55a75e8 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 85a96b9928c..bef5c486f6e 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"