diff options
author | Jeff Horelick <jdhore@gentoo.org> | 2013-05-15 13:17:38 +0000 |
---|---|---|
committer | Jeff Horelick <jdhore@gentoo.org> | 2013-05-15 13:17:38 +0000 |
commit | f95337dd66535de5edc1cdd0af47dc0ba4f1052b (patch) | |
tree | 9437f499e75a75647f1c3282751582fed8f9c7e6 /www-client | |
parent | Add desktop file and iocon (thanks johnny99, bug 296942). Respect AR (bug 468... (diff) | |
download | gentoo-2-f95337dd66535de5edc1cdd0af47dc0ba4f1052b.tar.gz gentoo-2-f95337dd66535de5edc1cdd0af47dc0ba4f1052b.tar.bz2 gentoo-2-f95337dd66535de5edc1cdd0af47dc0ba4f1052b.zip |
Fix bugs introduced by non-maintainer commits
(Portage version: 2.2.0_alpha174/cvs/Linux i686, signed Manifest commit with key 23E9E900)
Diffstat (limited to 'www-client')
-rw-r--r-- | www-client/firefox-bin/ChangeLog | 5 | ||||
-rw-r--r-- | www-client/firefox-bin/firefox-bin-21.0.ebuild | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/www-client/firefox-bin/ChangeLog b/www-client/firefox-bin/ChangeLog index a0f4ba3656f9..989166c58535 100644 --- a/www-client/firefox-bin/ChangeLog +++ b/www-client/firefox-bin/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for www-client/firefox-bin # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/ChangeLog,v 1.155 2013/05/15 05:14:45 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/ChangeLog,v 1.156 2013/05/15 13:17:38 jdhore Exp $ + + 15 May 2013; Jeff Horelick <jdhore@gentoo.org> firefox-bin-21.0.ebuild: + Fix bugs introduced by non-maintainer commits 15 May 2013; Jeff Horelick <jdhore@gentoo.org> firefox-bin-21.0.ebuild: Really fix icon path diff --git a/www-client/firefox-bin/firefox-bin-21.0.ebuild b/www-client/firefox-bin/firefox-bin-21.0.ebuild index 4d87a30ac9a7..3dc6ff9d96bb 100644 --- a/www-client/firefox-bin/firefox-bin-21.0.ebuild +++ b/www-client/firefox-bin/firefox-bin-21.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-21.0.ebuild,v 1.3 2013/05/15 05:14:45 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-21.0.ebuild,v 1.4 2013/05/15 13:17:38 jdhore Exp $ EAPI="5" @@ -87,7 +87,7 @@ src_install() { insinto "/usr/share/icons/hicolor/128x128/apps" newins "${icon_path}/../../../icons/mozicon128.png" "${icon}.png" || die # Install a 48x48 icon into /usr/share/pixmaps for legacy DEs - newicon "${S}"/chrome/icons/default/default48.png ${PN}-icon.png + newicon "${S}"/browser/chrome/icons/default/default48.png ${PN}-icon.png domenu "${FILESDIR}"/${PN}.desktop sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \ "${ED}/usr/share/applications/${PN}.desktop" || die |