Allow bigger icon to be used (#465130)

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

7 files changed, 17 insertions, 12 deletions

diff --git a/www-client/firefox-bin/ChangeLog b/www-client/firefox-bin/ChangeLog
index f2111919d9b8..e565455e86e4 100644
--- a/www-client/firefox-bin/ChangeLog
+++ b/www-client/firefox-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/firefox-bin
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/ChangeLog,v 1.196 2014/06/15 08:33:56 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/ChangeLog,v 1.197 2014/06/16 08:53:45 pacho Exp $
+
+  16 Jun 2014; Pacho Ramos <pacho@gentoo.org> files/firefox-bin.desktop,
+  firefox-bin-17.0.10.ebuild, firefox-bin-17.0.9.ebuild,
+  firefox-bin-24.5.0.ebuild, firefox-bin-24.6.0.ebuild, firefox-bin-30.0.ebuild:
+  Allow bigger icon to be used (#465130)
 
   15 Jun 2014; Agostino Sarubbo <ago@gentoo.org> firefox-bin-24.6.0.ebuild:
   Stable for x86, wrt bug #512896
diff --git a/www-client/firefox-bin/files/firefox-bin.desktop b/www-client/firefox-bin/files/firefox-bin.desktop
index e9c0dced951c..b3f93cfc0248 100644
--- a/www-client/firefox-bin/files/firefox-bin.desktop
+++ b/www-client/firefox-bin/files/firefox-bin.desktop
@@ -2,7 +2,7 @@
 Name=Mozilla Firefox (bin)
 Comment=Mozilla Firefox Web Browser
 Exec=/usr/bin/firefox-bin %U
-Icon=firefox-bin-icon
+Icon=firefox-bin
 Terminal=false
 Type=Application
 MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
diff --git a/www-client/firefox-bin/firefox-bin-17.0.10.ebuild b/www-client/firefox-bin/firefox-bin-17.0.10.ebuild
index a9f86f43e230..35caa6e4eb34 100644
--- a/www-client/firefox-bin/firefox-bin-17.0.10.ebuild
+++ b/www-client/firefox-bin/firefox-bin-17.0.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-17.0.10.ebuild,v 1.2 2014/05/17 14:42:21 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-17.0.10.ebuild,v 1.3 2014/06/16 08:53:45 pacho Exp $
 
 EAPI="4"
 MOZ_ESR="1"
@@ -72,7 +72,7 @@ src_install() {
 	declare MOZILLA_FIVE_HOME=/opt/${MOZ_PN}
 
 	# Install icon and .desktop for menu entry
-	newicon "${S}"/chrome/icons/default/default48.png ${PN}-icon.png
+	newicon "${S}"/chrome/icons/default/default48.png ${PN}.png
 	domenu "${FILESDIR}"/${PN}.desktop
 
 	# Add StartupNotify=true bug 237317
diff --git a/www-client/firefox-bin/firefox-bin-17.0.9.ebuild b/www-client/firefox-bin/firefox-bin-17.0.9.ebuild
index 212076bdb4d2..decb74e71889 100644
--- a/www-client/firefox-bin/firefox-bin-17.0.9.ebuild
+++ b/www-client/firefox-bin/firefox-bin-17.0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-17.0.9.ebuild,v 1.4 2014/05/17 14:42:21 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-17.0.9.ebuild,v 1.5 2014/06/16 08:53:45 pacho Exp $
 
 EAPI="4"
 MOZ_ESR="1"
@@ -72,7 +72,7 @@ src_install() {
 	declare MOZILLA_FIVE_HOME=/opt/${MOZ_PN}
 
 	# Install icon and .desktop for menu entry
-	newicon "${S}"/chrome/icons/default/default48.png ${PN}-icon.png
+	newicon "${S}"/chrome/icons/default/default48.png ${PN}.png
 	domenu "${FILESDIR}"/${PN}.desktop
 
 	# Add StartupNotify=true bug 237317
diff --git a/www-client/firefox-bin/firefox-bin-24.5.0.ebuild b/www-client/firefox-bin/firefox-bin-24.5.0.ebuild
index f62bb7c7f18c..b7fe7a644d2a 100644
--- a/www-client/firefox-bin/firefox-bin-24.5.0.ebuild
+++ b/www-client/firefox-bin/firefox-bin-24.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-24.5.0.ebuild,v 1.4 2014/05/17 14:42:21 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-24.5.0.ebuild,v 1.5 2014/06/16 08:53:45 pacho Exp $
 
 EAPI="5"
 MOZ_ESR="1"
@@ -96,7 +96,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}"/browser/chrome/icons/default/default48.png ${PN}-icon.png
+	newicon "${S}"/browser/chrome/icons/default/default48.png ${PN}.png
 	domenu "${FILESDIR}"/${PN}.desktop
 	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
 		"${ED}/usr/share/applications/${PN}.desktop" || die
diff --git a/www-client/firefox-bin/firefox-bin-24.6.0.ebuild b/www-client/firefox-bin/firefox-bin-24.6.0.ebuild
index a7523611966f..18b0f7dbbb47 100644
--- a/www-client/firefox-bin/firefox-bin-24.6.0.ebuild
+++ b/www-client/firefox-bin/firefox-bin-24.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-24.6.0.ebuild,v 1.4 2014/06/15 08:33:56 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-24.6.0.ebuild,v 1.5 2014/06/16 08:53:45 pacho Exp $
 
 EAPI="5"
 MOZ_ESR="1"
@@ -94,7 +94,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}"/browser/chrome/icons/default/default48.png ${PN}-icon.png
+	newicon "${S}"/browser/chrome/icons/default/default48.png ${PN}.png
 	domenu "${FILESDIR}"/${PN}.desktop
 	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
 		"${ED}/usr/share/applications/${PN}.desktop" || die
diff --git a/www-client/firefox-bin/firefox-bin-30.0.ebuild b/www-client/firefox-bin/firefox-bin-30.0.ebuild
index e66782c46e71..17785de775a8 100644
--- a/www-client/firefox-bin/firefox-bin-30.0.ebuild
+++ b/www-client/firefox-bin/firefox-bin-30.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-30.0.ebuild,v 1.2 2014/06/11 19:06:08 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-30.0.ebuild,v 1.3 2014/06/16 08:53:45 pacho 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}"/browser/chrome/icons/default/default48.png ${PN}-icon.png
+	newicon "${S}"/browser/chrome/icons/default/default48.png ${PN}.png
 	domenu "${FILESDIR}"/${PN}.desktop
 	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
 		"${ED}/usr/share/applications/${PN}.desktop" || die