fix bug 465494 and ship all icons properly

Package-Manager: portage-2.1.11.55/cvs/Linux x86_64
Manifest-Sign-Key: 0xDD11F94A

3 files changed, 35 insertions, 21 deletions

diff --git a/mail-client/thunderbird-bin/ChangeLog b/mail-client/thunderbird-bin/ChangeLog
index 6bc2df898655..437a81312acd 100644
--- a/mail-client/thunderbird-bin/ChangeLog
+++ b/mail-client/thunderbird-bin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for mail-client/thunderbird-bin
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/ChangeLog,v 1.112 2013/04/11 03:02:20 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/ChangeLog,v 1.113 2013/04/11 13:31:46 zerochaos Exp $
+
+  11 Apr 2013; Rick Farina <zerochaos@gentoo.org> thunderbird-bin-17.0.5.ebuild:
+  fix bug 465494 and ship all icons properly
 
   11 Apr 2013; Rick Farina <zerochaos@gentoo.org> thunderbird-bin-17.0.5.ebuild:
   add missing rdepends per bug #457036
diff --git a/mail-client/thunderbird-bin/Manifest b/mail-client/thunderbird-bin/Manifest
index 5d63a68bb146..4bf1117c0ba3 100644
--- a/mail-client/thunderbird-bin/Manifest
+++ b/mail-client/thunderbird-bin/Manifest
@@ -58,23 +58,23 @@ DIST thunderbird-17.0.5esr-zh-CN.xpi 436082 SHA256 0c775bc64658bfd657a1125e776b5
 DIST thunderbird-17.0.5esr-zh-TW.xpi 437591 SHA256 194b9a773cdf8a078b11928e56807b58a111d849af272116c8323d5c147ceb69 SHA512 acba4f4e5fe86c17c10c333b5a70fce7220d6161141f307d9ecc410185c8de8fc23db2445955e615d6eecfd2af75ca5b43ea0bc8d737bf2a8d8f33938823cb5a WHIRLPOOL e43115377eb2345d6b27789e382f368e76fa733352e4a5d1c8ffc12b460d13775da2a97af8df79f754a9f2ad57631ec85d8775a1e366210dab96f599b6c53b9e
 DIST thunderbird-bin_i686-17.0.5.tar.bz2 21480241 SHA256 e1a0282baff12d00c5fe58e7e7f4058eecacd99911d79c5d473b2814042d8f3e SHA512 6b2e51f52745456b60f5517dfb26f5404e0248f414531147a9822feb45a0aa6df791fe1d63f2949ead4268ba3f37945bc2bd3a1fc7c51e8bb9e517bbe95d9da5 WHIRLPOOL 9649cb0bd5c17947fc7ad11a956ff63eb32045f006aa56880c18349e6a49b05244647a55ad5aa59728ab5990f9ca1465c6abc2685ad7dba4b8f5b660f5eec5ea
 DIST thunderbird-bin_x86_64-17.0.5.tar.bz2 25986322 SHA256 a715ed8d694c5df39cec0387dd8a64e07de484f995c5213882bb9e336b3a917b SHA512 fefb1bfd2689811cf3abae70217171ca74a370e0681c10bb67035dfade60e73ee993fafe4cab98c9b6b5a7ab05c6ea80486299e96d8426c206bd02d4691b1cf0 WHIRLPOOL 4d365c9de3aa52bff976d4ad135d9d4e4528eb3a49d63da8810b9523af8a9f491dc02b89cdc13e70c24192892ca69f78627546a831f2921692a74b461b22966d
-EBUILD thunderbird-bin-17.0.5.ebuild 3111 SHA256 708755d30f41cb88df1e990f9e55e10351465e50df937d4c453d7c3a8c9a61de SHA512 ffd4cdd255160f7ff95b3ad0cd09c4e509d6e653517bfe018c833746e48cbc10e81ffc60aab8841c138a9d3a6f61cb0387f8cd1df7a97cc7232882183448c525 WHIRLPOOL 79c8b37a1629ff34484e8c2a95cd5c33ff41553e9bb62beec5c6a775c695c6e399303491e61a4abacbec3e78c3649de1eac92de38576441f1a661b8798d3accb
-MISC ChangeLog 43262 SHA256 c741edda94cca190cc48378271a308db52940aa6d78e36a755a2972752a00d07 SHA512 e4a7af4830c09755cc08885598de001b97757406d49b4df4c7fbef6b20aa044893fc9aed6ec39ff7fece77d2ccdf1e6f1abc86f0cdfee583d80df5177c8e0990 WHIRLPOOL dfec0553d76c72c56bed1fa0bff7388cbfef7b2515d8e9e00cd7ddc04e4ed673ca8dd5451331cab8db5b9e6afd4e5a03c5085cf8610ed5bf6d4b0963bcc60ecf
+EBUILD thunderbird-bin-17.0.5.ebuild 3574 SHA256 f9a6394026e614a724783e7fe73c048a90d155e34b401ed47e3868a31914af4b SHA512 63894e7085fe5c5180dd7fff07c76de4755da01decedc84439b2d6b9807426d652d7debfd2a08aa9213bdd55345ee8f25d84a0bf7e51f2b3a18c19cff1969722 WHIRLPOOL 963fa9607ff3263d4a826ed79d56fa8693104cb5895216c369002fe2d4ef08b289193a9b875d0af5217a2ebd216ed3f34a3f3ab553a3d4c066286c86ca5236ab
+MISC ChangeLog 43389 SHA256 fc4ef2395796f0983b2b9df1bb8fc749c8c9c6026bfdae3eff59cff366e18e57 SHA512 1535268ea80c7e32d3568ccc54111de48827be9c1a4a1d444f3ab9aeb12e9d9fb2af7a515caf75d996e938621632c6cb18d7b510f3b66a1c667cdfdcf7ad1c98 WHIRLPOOL 5579723f597919c6d5293b82ca10f914d65ef121b992e640efd7a8712516d88c06bbb248d971c51dfdfaa2249843289cae7a44dfe344ab624f6bf8fa33174f14
 MISC metadata.xml 239 SHA256 7dc1b4cbb0d49bbe877f0978fc8cd278614f95982a4375336dfb5b72e866efd0 SHA512 488c9dceab7a11cda355fbaafc63ead0e3496638d57a85d4207fc71f0389b8243a05132c21228b348fd90ff2c43a34bcde86b32b585860d0d80713e77c5242d2 WHIRLPOOL 059a17d7dc6e94d489369ceb520911a6cb751a0fd10a2793a1e548210c5c85d9a5817f0634e46c5799b789233a259a0a77ff9d38537869aabadc82499afba0c4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRZihEAAoJEKXdFCfdEflKEukP/0c0bzOzjQTJFWonmQuIlNzq
-MCNhfCh7PpyVa8t2rcH90dFwPLDUcNqjJlr2ss3e4Uhxa2VzCqHTQtm1PFobqN3C
-+1y290YvVZvHci4Xt/922Lc+ty2Sk4n+JbEW7b5BL+CyBH/YQzUVlhCDm1mx9Pa2
-5vypeeD1G4D45UC1WFHM5dztj3mznvF+GkR06IhLq4URDe21/IS2eoJ0VeWh2HvK
-+D9FSDkqv3pcxCF65tMEhP+Y32Y8loBjyeIpSvN3dquF3StTO2fdMAvgW+0Uh+ap
-M+R6dJ1+mUPJIWKRO3pWf5ldXcZFjXHpZZz5qViBnorhig0xdRn80x5mzekqc9xD
-1UPaelJFdV3bVyTzFYVHSHuZaOKhWTN2+SWguA51gxedlE0ODFAkNzomkUz8cTNz
-5NCGSXbpC1b3ZLsa3GTDNf/GmuN4t2djBa/KXWb7qAQepp3kT07QFrpcLcxv5r/1
-vionBlueDk7IJ/ZrZUSkrhrlafSWY7QPkSXfdt1it03K2uuYaq3OeXiY8ED1XUyk
-3QagOgMKOOMWOf4uu7D0PhPoYYPKGbug6MS4V694GHICPEU6C1iQahYfirFOa8XQ
-2pQiukF7ykYx3zgliHpZBYAiJ0A9neT4qTTb5dRLPK+ldvJTn4EzyUMDDM2RFc77
-Gw6q0iH2KCnlb3ZWE7X5
-=NVhN
+iQIcBAEBCgAGBQJRZrvRAAoJEKXdFCfdEflK4Y4P/RJS6Ms9iZs4fJVt+Q3FunNP
+YYD209O+/pCHmMF1Bc1U9UVtSXt9Bjk6iNaRgeg/y9zH2EZYcLQIN4Nm9lu9yH1x
+NonlI51WDk6ptttfj0Jpe1J8CmjNLgZrjGCnLo3M07DEtiA/V9X634WLpC4OFWzz
+iCHX6TLRBIUtEkKCQ/nrT8Elv4ny4cAcClYZtgosn+/CdHXIYhwIfwvEwlyUBnRA
+IAPqmI83DC4EaR3j6nGrWypHpUhpqxkbTsUGdOGGg+ldhbmWYtAFWsiiHJ3YN2K4
+I2+Vka/LN7Hvon0XD9AsOVI8ceYfZtspX5Asyh6uMYCLGdQ7V/5g6Wxrthhr3pud
+sfCuXRIMiTdInzeK17rdrQ5ovoSPLhO2NWgQtyLECtjNbaYFfvdDB03cNaYhLR3D
+4x7jocA5GsiwWPxPmlHFZWfwagCqpi+MOWueYxNyYncaUe14CZ5LlXvIyPoKQutc
+7KPXHnfd4v/rQJkrTQ/9EWhaq3bEopKhwy4KJ6qtlKl7UyNVfUbFjgeolw4sYZp+
+tzSbLDTY51N5GYdD/Ft7X1/1h0UvTO0moGv+p3LtXzg/5AnrEaxin97S3L4wkujn
+o8BuWvHsUPEVzzgJ0/W48i+pwtsTbQ045tqGV9OCc9g7xk4QQHJa0J4K33au0K9n
+X+Ui5PL/XgigEdqluJaW
+=4SNE
 -----END PGP SIGNATURE-----
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-17.0.5.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-17.0.5.ebuild
index 034989d2ef7b..514095a2c792 100644
--- a/mail-client/thunderbird-bin/thunderbird-bin-17.0.5.ebuild
+++ b/mail-client/thunderbird-bin/thunderbird-bin-17.0.5.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/mail-client/thunderbird-bin/thunderbird-bin-17.0.5.ebuild,v 1.5 2013/04/11 03:02:20 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/thunderbird-bin-17.0.5.ebuild,v 1.6 2013/04/11 13:31:46 zerochaos Exp $
 
 EAPI="4"
 MOZ_ESR="1"
@@ -66,6 +66,21 @@ src_unpack() {
 src_install() {
 	declare MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
 
+        local size sizes icon_path icon name
+        sizes="16 22 24 32 48 256"
+        icon_path="${S}/chrome/icons/default"
+        icon="${PN}"
+        name="Thunderbird"
+
+        # 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
+        # Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+        newicon "${S}"/chrome/icons/default/default48.png ${PN}-icon.png
+        domenu "${FILESDIR}"/icon/${PN}.desktop
+
 	# Install thunderbird in /opt
 	dodir ${MOZILLA_FIVE_HOME%/*}
 	mv "${S}" "${D}"${MOZILLA_FIVE_HOME}
@@ -83,10 +98,6 @@ exec ${MOZILLA_FIVE_HOME}/thunderbird "\$@"
 EOF
 	fperms 0755 /usr/bin/${PN}
 
-	# Install icon and .desktop for menu entry
-	newicon "${S}"/chrome/icons/default/default48.png ${PN}-icon.png
-	domenu "${FILESDIR}"/icon/${PN}.desktop
-
 	# revdep-rebuild entry
 	insinto /etc/revdep-rebuild
 	doins "${FILESDIR}"/10${PN}