Install multiple hicolor icons, use one .desktop file for both branded and unbranded, change codename to latest, add new .desktop mimetypes from overlay, add gconf dep since it's needed

Package-Manager: portage-2.1.9.44/cvs/Linux x86_64

4 files changed, 60 insertions, 16 deletions

diff --git a/www-client/firefox/ChangeLog b/www-client/firefox/ChangeLog
index a2e56f811fbd..50892e896679 100644
--- a/www-client/firefox/ChangeLog
+++ b/www-client/firefox/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-client/firefox
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.49 2011/03/22 01:58:18 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.50 2011/03/23 00:45:30 nirbheek Exp $
+
+*firefox-4.0-r1 (23 Mar 2011)
+
+  23 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org> -firefox-4.0.ebuild,
+  +firefox-4.0-r1.ebuild, +files/icon/firefox.desktop:
+  Install multiple hicolor icons, use one .desktop file for both branded and
+  unbranded, change codename to latest, add new .desktop mimetypes from
+  overlay
 
 *firefox-4.0 (22 Mar 2011)
 
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 8ca2bab4b41a..19aa0b883b25 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -7,6 +7,7 @@ AUX fix_blocklist_support.patch 3194 RMD160 87254cfdbd7fae1ed5704ecfff4ad5c691b4
 AUX gentoo-default-prefs.js 598 RMD160 9ee952b88ebee3b47f6466e2d19674805d8529d2 SHA1 980bc21282021b8be5c420155d2126c86b174068 SHA256 ad533b62fcc7e0ebbafe039e74db68734c86077178b03d37a01868cf790c42f9
 AUX icon/firefox-1.5-unbranded.desktop 258 RMD160 32ebb016d6a4d3d2728c031f3b3762796e02f5d3 SHA1 69820d445d06b90d7ac35ffd39dad5926caa0862 SHA256 f2bf5c237a5c56b443c20fd16d3da429bf3b99e9fe27b661a1a462aa46ed25d3
 AUX icon/firefox-1.5.desktop 255 RMD160 4ef1cf548f11057274620b82f0728958a3424bea SHA1 6a440f817072fb60516c1a1d999dffb6d3fa1583 SHA256 9bf6e1264d986c68d64831d166ed6b506bff6df8b56d21bfc166aee09cbc753f
+AUX icon/firefox.desktop 276 RMD160 92a5671cd09e399b3330c4be31b7ac7583747031 SHA1 b757763670a00982f3cb38b8d41d7faa6eee3818 SHA256 06565ade11b6e4b448cf10339696c43f31e73cb6824491094bb6e0ab902c7cf5
 AUX xulrunner-1.9.2-arm-fixes.patch 587 RMD160 495e8037785a1867fad0c088a4c834df6f02291c SHA1 5f08ef1f65771c2891a067c7baac8a4ef8466deb SHA256 a1b0aef546deecafe64c9ce70b08e7252a3eaf8d84a381a62b5edfaf1f735817
 AUX xulrunner-1.9.2-gtk+-2.21.patch 663 RMD160 20e2465da0e6c884527fd7cfebd3bdb2f8f015a9 SHA1 f2b9c26ed255bde672ccc8cb7ae4ae014f52d6f5 SHA256 79c11dc4304d748f3c2d6e451aa6d44dd1bb450d1db671e7fa4a83420c6f2c05
 DIST firefox-3.6-patches-0.2.tar.bz2 6335 RMD160 1f8297ad4279af70348a848349e75aa1a94c7372 SHA1 4c47c76fbdab937850558751ac73fe71e3269ece SHA256 1dc4278c143fa67c373a090f5698c4174d00aaa91ea63a444c2eca1cc328a523
@@ -313,6 +314,6 @@ DIST firefox-4.0.source.tar.bz2 66024327 RMD160 2d1a3cf0f37ddbf4a5be9b83949f8f82
 EBUILD firefox-3.6.12.ebuild 9526 RMD160 09c1fbad806f8cc977bdfcf35e5661731dd8e63c SHA1 cf1b4648f7f1708c0fb33fa8ae4e2566ac73fdea SHA256 b9dbe985567f8f3e7051f73e4978e35f03e439b688eaf73c71a8a8cece7ad163
 EBUILD firefox-3.6.13.ebuild 9472 RMD160 ef8ac24358331ef75b584604727fff7e654831a3 SHA1 576b112feb128196066d5a604fad6fbac6d8f505 SHA256 3acd34ece1f8ea955bf0ee3b94df18b95cf8b3dd954f43fd9d991cf663702d44
 EBUILD firefox-3.6.15.ebuild 9471 RMD160 28ae7119357771cd66d645fb833fdd5c5bba1e88 SHA1 3322fe983218f239627d1601686d6620afa70b3b SHA256 e35251d0f927bd21d63bdd9147e767d4bfc0795d499f243f74ac1d1ba5c8dc0d
-EBUILD firefox-4.0.ebuild 7221 RMD160 f899970f3897a8d919d1893596594cf8fc754aaf SHA1 000e5bead47837cdaf65447fd1c94c9834aa5c52 SHA256 411d25992dae709a76c62ccf8c6d659ce7b7dde3437d078bf42be563c66468e9
-MISC ChangeLog 124427 RMD160 865a397412403a1ccc2cc6ec985dd37a1264e144 SHA1 e96d47e7a4531dbf3ede8a91d189d6a9a772d629 SHA256 61c790999e7e6b9ad66b5e8f3742dd2641aa0bfe316bf95bdf067c6ed5e9201d
+EBUILD firefox-4.0-r1.ebuild 7886 RMD160 840e9281ab94140f6bafaabf3e2189755511fe7e SHA1 575b9bb6df6e02b855888b8ecd47079d8f0b4058 SHA256 aec4e4763ca88dea42781888441b3c393da2ac6421ba1bf5ea0de28c7e334770
+MISC ChangeLog 124749 RMD160 def5313af04588ce3e84ed2882a8eecf21210031 SHA1 0f4b4ad426612f44ed1e4c07a50e1d3bbe5dfabb SHA256 1e535230e07abd17f1560d079955072ca1ebf9410573124469857ffb8bac902a
 MISC metadata.xml 591 RMD160 4e13e501ffacdd9001cbc15bc92e3e901463454b SHA1 9ddb97472d099fb3f65193bc7cbfcbb26e6281dc SHA256 e91f4670e55c264903dbbd321565e1d817e510dfabadaa81c9e15c7317864b23
diff --git a/www-client/firefox/files/icon/firefox.desktop b/www-client/firefox/files/icon/firefox.desktop
new file mode 100644
index 000000000000..35999a8754e6
--- /dev/null
+++ b/www-client/firefox/files/icon/firefox.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=@NAME@
+Comment=Web Browser
+Exec=firefox %U
+Icon=@ICON@
+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;
+Categories=Network;WebBrowser;
diff --git a/www-client/firefox/firefox-4.0.ebuild b/www-client/firefox/firefox-4.0-r1.ebuild
index 3523b41ed93f..7ace0af9df6b 100644
--- a/www-client/firefox/firefox-4.0.ebuild
+++ b/www-client/firefox/firefox-4.0-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-4.0.ebuild,v 1.1 2011/03/22 01:58:18 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-4.0-r1.ebuild,v 1.1 2011/03/23 00:45:30 nirbheek Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
 
-inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib pax-utils fdo-mime autotools mozextension versionator python
+inherit flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-3 makeedit multilib pax-utils fdo-mime autotools mozextension versionator python
 
 MAJ_XUL_PV="2.0"
 MAJ_FF_PV="$(get_version_component_range 1-2)" # 3.5, 3.6, 4.0, etc.
@@ -28,11 +28,14 @@ REL_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases"
 # More URIs appended below...
 SRC_URI="http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2"
 
+# XXX: GConf is used for setting the default browser
+#      revisit to make it optional with GNOME 3
 RDEPEND="
 	>=sys-devel/binutils-2.16.1
 	>=dev-libs/nss-3.12.9
 	>=dev-libs/nspr-4.8.7
 	>=dev-libs/glib-2.26
+	>=gnome-base/gconf-1.2.1:2
 	x11-libs/pango[X]
 	system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete,unlock-notify,debug=] )
 	~net-libs/xulrunner-${XUL_PV}[wifi=,libnotify=,system-sqlite=,webm=]
@@ -206,22 +209,36 @@ src_install() {
 		[[ ${X} != "en" ]] && xpi_install "${WORKDIR}/${P}-${X}"
 	done
 
-	# Install icon and .desktop for menu entry
-	if ! use bindist ; then
-		newicon "${S}"/other-licenses/branding/firefox/content/icon48.png ${PN}-icon.png
-		newmenu "${FILESDIR}"/icon/${PN}-1.5.desktop \
-			${PN}-${MAJ_FF_PV}.desktop
+	local size sizes icon_path icon name
+	if use bindist; then
+		sizes="16 32 48"
+		icon_path="${S}/browser/branding/unofficial"
+		icon="tumucumaque"
+		name="Tumucumaque"
 	else
-		newicon "${S}"/browser/base/branding/icon48.png ${PN}-icon-unbranded.png
-		newmenu "${FILESDIR}"/icon/${PN}-1.5-unbranded.desktop \
-			${PN}-${MAJ_FF_PV}.desktop
-		sed -i -e "s:Bon Echo:Shiretoko:" \
-			"${ED}"/usr/share/applications/${PN}-${MAJ_FF_PV}.desktop || die "sed failed!"
+		sizes="16 22 24 32 256"
+		icon_path="${S}/other-licenses/branding/firefox"
+		icon="${PN}"
+		name="Mozilla Firefox"
 	fi
 
+	# 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" || die
+	done
+	# The 128x128 icon has a different name
+	insinto "/usr/share/icons/hicolor/128x128/apps"
+	newins "${icon_path}/mozicon128.png" "${icon}.png" || die
+	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+	newicon "${icon_path}/content/icon48.png" "${icon}.png" || die
+	newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop" || die
+	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
+		"${ED}/usr/share/applications/${PN}.desktop" || die
+
 	# Add StartupNotify=true bug 237317
 	if use startup-notification ; then
-		echo "StartupNotify=true" >> "${ED}"/usr/share/applications/${PN}-${MAJ_FF_PV}.desktop
+		echo "StartupNotify=true" >> "${ED}/usr/share/applications/${PN}.desktop"
 	fi
 
 	pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/firefox
@@ -236,7 +253,16 @@ src_install() {
 					 die "sparc sed failed"; }
 }
 
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
 pkg_postinst() {
 	# Update mimedb for the new .desktop file
 	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
 }