Fix .desktop files, bug 147735

Package-Manager: portage-2.1.2-r9

7 files changed, 41 insertions, 33 deletions

diff --git a/mail-client/mozilla-thunderbird/ChangeLog b/mail-client/mozilla-thunderbird/ChangeLog
index 5d5c87cdf0e8..70e0cbe14b9e 100644
--- a/mail-client/mozilla-thunderbird/ChangeLog
+++ b/mail-client/mozilla-thunderbird/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-client/mozilla-thunderbird
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.167 2007/02/08 11:46:00 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.168 2007/02/14 19:13:03 armin76 Exp $
+
+  14 Feb 2007; Raúl Porcel <armin76@gentoo.org>
+  +files/icon/mozilla-thunderbird.desktop,
+  -files/icon/mozillathunderbird.desktop,
+  mozilla-thunderbird-1.5.0.8.ebuild, mozilla-thunderbird-1.5.0.9.ebuild,
+  mozilla-thunderbird-2.0_beta1.ebuild,
+  mozilla-thunderbird-2.0_beta2.ebuild:
+  Fix .desktop files, bug 147735
 
 *mozilla-thunderbird-2.0_beta2 (08 Feb 2007)
 
diff --git a/mail-client/mozilla-thunderbird/Manifest b/mail-client/mozilla-thunderbird/Manifest
index fb4d3e117e65..eb3ca3875e3f 100644
--- a/mail-client/mozilla-thunderbird/Manifest
+++ b/mail-client/mozilla-thunderbird/Manifest
@@ -1,7 +1,7 @@
-AUX icon/mozillathunderbird.desktop 184 RMD160 77953b3d9f191b94611a9953464ffd04d3e4148b SHA1 a19de7fcabb5be6339731d12e2f469d13e2a3ea2 SHA256 46dce3eb853408a169f5755faf63d973d69c21b47c641442a0e7c666e213aab3
-MD5 1c810870d0c92c730341e491c310e2d4 files/icon/mozillathunderbird.desktop 184
-RMD160 77953b3d9f191b94611a9953464ffd04d3e4148b files/icon/mozillathunderbird.desktop 184
-SHA256 46dce3eb853408a169f5755faf63d973d69c21b47c641442a0e7c666e213aab3 files/icon/mozillathunderbird.desktop 184
+AUX icon/mozilla-thunderbird.desktop 184 RMD160 77953b3d9f191b94611a9953464ffd04d3e4148b SHA1 a19de7fcabb5be6339731d12e2f469d13e2a3ea2 SHA256 46dce3eb853408a169f5755faf63d973d69c21b47c641442a0e7c666e213aab3
+MD5 1c810870d0c92c730341e491c310e2d4 files/icon/mozilla-thunderbird.desktop 184
+RMD160 77953b3d9f191b94611a9953464ffd04d3e4148b files/icon/mozilla-thunderbird.desktop 184
+SHA256 46dce3eb853408a169f5755faf63d973d69c21b47c641442a0e7c666e213aab3 files/icon/mozilla-thunderbird.desktop 184
 AUX icon/thunderbird-icon.png 6499 RMD160 1aeece7719c1c1629b98fc11870641769681a048 SHA1 651d244e96fa0edf13f68f5ef9047432eb6ed3bf SHA256 ff9749e42b82b80425bb52883d63baa53298af7be98870ee6b73f0a6cf0ab22d
 MD5 04115f0e204444eac76a092a63c89027 files/icon/thunderbird-icon.png 6499
 RMD160 1aeece7719c1c1629b98fc11870641769681a048 files/icon/thunderbird-icon.png 6499
@@ -77,26 +77,26 @@ DIST thunderbird-sl-1.5.0.8.xpi 187717 RMD160 5442985f1e74c2b5271d6b365d21572e44
 DIST thunderbird-sv-SE-1.5.0.8.xpi 191055 RMD160 444ffb0d1e62a4fabe2ba7c187eae7489582ae3f SHA1 e203b712d8a316605237187cc993ce49c7de2c42 SHA256 d41ed9130c2c2ee721ff4549c9a5ce0982ec7e8ce99ced3cc43facebd6d918f2
 DIST thunderbird-tr-1.5.0.8.xpi 155698 RMD160 7cc0a1e595892724ebd5c4de3a56e7ff085c7fcb SHA1 28811ceb726c7cc63e312017a854d3eb921ec23e SHA256 c581c43bef21fe1a2092fd53a226d331038e8daa3effb134afda6127dd3c3e40
 DIST thunderbird-zh-CN-1.5.0.8.xpi 155475 RMD160 f94b7a509d2c1f18dbd3ff12ab1d980b5f6b7384 SHA1 f052cb37e36dd76130b499cc262afd2af9ef24f1 SHA256 425b447c7c3a8c99de33444f3e3bde38724c902a391cb27b72ed15b375bd4a4f
-EBUILD mozilla-thunderbird-1.5.0.8.ebuild 7700 RMD160 0cfaea97661b680276805da95b8d0d9596c3be12 SHA1 e7a230cb8fee04dccbebe59a15d6f4f1d7c62547 SHA256 057feecb02a67212f42c35f9f0d83e01d0f123d6ee8358093fdf1727cd4c8cb3
-MD5 af3f824f972c1fbe74bf39d7d96096d9 mozilla-thunderbird-1.5.0.8.ebuild 7700
-RMD160 0cfaea97661b680276805da95b8d0d9596c3be12 mozilla-thunderbird-1.5.0.8.ebuild 7700
-SHA256 057feecb02a67212f42c35f9f0d83e01d0f123d6ee8358093fdf1727cd4c8cb3 mozilla-thunderbird-1.5.0.8.ebuild 7700
-EBUILD mozilla-thunderbird-1.5.0.9.ebuild 8054 RMD160 9348f129c20ce20e3d122ff55ae38324ed650617 SHA1 46e25435a01a6d624d64be9623cca42dda592c84 SHA256 42cdd94e8b3c1a034692493a8019836865a247139ad701d9aaa7f8930ef4f130
-MD5 28a2105e6016aa3965cf45e3c89960d1 mozilla-thunderbird-1.5.0.9.ebuild 8054
-RMD160 9348f129c20ce20e3d122ff55ae38324ed650617 mozilla-thunderbird-1.5.0.9.ebuild 8054
-SHA256 42cdd94e8b3c1a034692493a8019836865a247139ad701d9aaa7f8930ef4f130 mozilla-thunderbird-1.5.0.9.ebuild 8054
-EBUILD mozilla-thunderbird-2.0_beta1.ebuild 7901 RMD160 f4002999e757ed87e3aac29cd94e1c43ac6a21ac SHA1 023935e8a6a874f1ec51255587cb8f1833cee9de SHA256 94bac8aa7cd99c710008252417dc78a750a7d96b13eedf01c7df1ae12e1675e2
-MD5 fe0c17905f5e603761449945dbae1546 mozilla-thunderbird-2.0_beta1.ebuild 7901
-RMD160 f4002999e757ed87e3aac29cd94e1c43ac6a21ac mozilla-thunderbird-2.0_beta1.ebuild 7901
-SHA256 94bac8aa7cd99c710008252417dc78a750a7d96b13eedf01c7df1ae12e1675e2 mozilla-thunderbird-2.0_beta1.ebuild 7901
-EBUILD mozilla-thunderbird-2.0_beta2.ebuild 7735 RMD160 358452fac593e1259e67a91be45aa120ca1337e3 SHA1 24ad6f1e10d2a15651d10b7cb97db56d3de0a474 SHA256 9afc0d802c3c0729d87a42f6f9ab2767b15fa84cf9c18f2aecd1172f5fbaba61
-MD5 2035c8b0553ed1c3cd6ed5289a19ca7e mozilla-thunderbird-2.0_beta2.ebuild 7735
-RMD160 358452fac593e1259e67a91be45aa120ca1337e3 mozilla-thunderbird-2.0_beta2.ebuild 7735
-SHA256 9afc0d802c3c0729d87a42f6f9ab2767b15fa84cf9c18f2aecd1172f5fbaba61 mozilla-thunderbird-2.0_beta2.ebuild 7735
-MISC ChangeLog 26287 RMD160 6131c322e55dd5fd73497d4191813593b0d444d4 SHA1 61a8b2d8c377b24ee482f2b8d38fea2016c6d767 SHA256 9e360002db5e6b21ef5ffb32fc52f5210c53a5a9bb311de793802a9838880c1e
-MD5 b76c309afd114c124dd6a65b3a82933f ChangeLog 26287
-RMD160 6131c322e55dd5fd73497d4191813593b0d444d4 ChangeLog 26287
-SHA256 9e360002db5e6b21ef5ffb32fc52f5210c53a5a9bb311de793802a9838880c1e ChangeLog 26287
+EBUILD mozilla-thunderbird-1.5.0.8.ebuild 7687 RMD160 6a5666504c0d0b3b8dad2f2aee595bb52e34b4ae SHA1 4909313878d4fc1aa738f52d6cc3e03c4974a682 SHA256 1a113b7e0dbd381c650c4da2a2b472bb52a04259c52b84dfaaca9a546081e435
+MD5 351116ccbbbe2d9c0849ec04a1705caa mozilla-thunderbird-1.5.0.8.ebuild 7687
+RMD160 6a5666504c0d0b3b8dad2f2aee595bb52e34b4ae mozilla-thunderbird-1.5.0.8.ebuild 7687
+SHA256 1a113b7e0dbd381c650c4da2a2b472bb52a04259c52b84dfaaca9a546081e435 mozilla-thunderbird-1.5.0.8.ebuild 7687
+EBUILD mozilla-thunderbird-1.5.0.9.ebuild 8041 RMD160 d8a429a2c54cd0b8f26ad86c29aa6e5622745887 SHA1 1901d0b90429d7173cec10bd2d3f1f3ea837440d SHA256 7e661c820c98fa1823437ccc401a855a6d0256f82b860ff51835ef78f721566e
+MD5 c845cdb599e05754924e7f993de5436d mozilla-thunderbird-1.5.0.9.ebuild 8041
+RMD160 d8a429a2c54cd0b8f26ad86c29aa6e5622745887 mozilla-thunderbird-1.5.0.9.ebuild 8041
+SHA256 7e661c820c98fa1823437ccc401a855a6d0256f82b860ff51835ef78f721566e mozilla-thunderbird-1.5.0.9.ebuild 8041
+EBUILD mozilla-thunderbird-2.0_beta1.ebuild 7888 RMD160 e68f953426d860278456caf577e5c871c01c77f9 SHA1 e770b4ab4666c43b83b78c4a5f8ba4c84d4e96df SHA256 23b6285866f448b1cb3b7ece7fab090e490071568a132110a11ec7627f47569d
+MD5 a944669adba57c3cd060892f7605ae34 mozilla-thunderbird-2.0_beta1.ebuild 7888
+RMD160 e68f953426d860278456caf577e5c871c01c77f9 mozilla-thunderbird-2.0_beta1.ebuild 7888
+SHA256 23b6285866f448b1cb3b7ece7fab090e490071568a132110a11ec7627f47569d mozilla-thunderbird-2.0_beta1.ebuild 7888
+EBUILD mozilla-thunderbird-2.0_beta2.ebuild 7722 RMD160 28659471e1fe34b028b8aba32029cb93021575eb SHA1 125afc9f8aed7e5f21dc5fcd7736209b6666fdd7 SHA256 e92404067e62c2804680bc6f07fd28da1d2ad2fdc2b5b3a3a9d66d7ef3fb8ce6
+MD5 bf47050c9e71b4e10b733daf5a3fd7c2 mozilla-thunderbird-2.0_beta2.ebuild 7722
+RMD160 28659471e1fe34b028b8aba32029cb93021575eb mozilla-thunderbird-2.0_beta2.ebuild 7722
+SHA256 e92404067e62c2804680bc6f07fd28da1d2ad2fdc2b5b3a3a9d66d7ef3fb8ce6 mozilla-thunderbird-2.0_beta2.ebuild 7722
+MISC ChangeLog 26609 RMD160 cf9b02b0f81b45dfc2e2b70501ffe43a738bd055 SHA1 30c3b0988d2d399e16b545e44de70e86e7ce7c3b SHA256 d9fa8941bd991ee38ceb8858333bb188a2021ba49da13122b7828c7740e95917
+MD5 df1aaa5fe706c7766baa3ea4caa9c832 ChangeLog 26609
+RMD160 cf9b02b0f81b45dfc2e2b70501ffe43a738bd055 ChangeLog 26609
+SHA256 d9fa8941bd991ee38ceb8858333bb188a2021ba49da13122b7828c7740e95917 ChangeLog 26609
 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 metadata.xml 160
diff --git a/mail-client/mozilla-thunderbird/files/icon/mozillathunderbird.desktop b/mail-client/mozilla-thunderbird/files/icon/mozilla-thunderbird.desktop
index 8e91b69de6f2..8e91b69de6f2 100644
--- a/mail-client/mozilla-thunderbird/files/icon/mozillathunderbird.desktop
+++ b/mail-client/mozilla-thunderbird/files/icon/mozilla-thunderbird.desktop
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5.0.8.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5.0.8.ebuild
index 772ddd908428..c0b68eb1614c 100644
--- a/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5.0.8.ebuild
+++ b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5.0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5.0.8.ebuild,v 1.10 2007/01/11 15:44:14 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5.0.8.ebuild,v 1.11 2007/02/14 19:13:03 armin76 Exp $
 
 unset ALLOWED_FLAGS	 # stupid extra-functions.sh ... bug 49179
 inherit flag-o-matic toolchain-funcs eutils mozconfig-2 mozilla-launcher makeedit multilib autotools mozextension
@@ -210,7 +210,7 @@ src_install() {
 	# Fix bug 54179: Install .desktop file into /usr/share/applications
 	# instead of /usr/share/gnome/apps/Internet (18 Jun 2004 agriffis)
 	insinto /usr/share/applications
-	doins ${FILESDIR}/icon/mozillathunderbird.desktop
+	doins ${FILESDIR}/icon/${PN}.desktop
 
 	####################################
 	#
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5.0.9.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5.0.9.ebuild
index 0de0bad9002f..ea9e7e813449 100644
--- a/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5.0.9.ebuild
+++ b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5.0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5.0.9.ebuild,v 1.10 2007/01/11 15:44:14 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5.0.9.ebuild,v 1.11 2007/02/14 19:13:03 armin76 Exp $
 
 WANT_AUTOCONF="2.1"
 
@@ -225,7 +225,7 @@ src_install() {
 	# Fix bug 54179: Install .desktop file into /usr/share/applications
 	# instead of /usr/share/gnome/apps/Internet (18 Jun 2004 agriffis)
 	insinto /usr/share/applications
-	doins ${FILESDIR}/icon/mozillathunderbird.desktop
+	doins ${FILESDIR}/icon/${PN}.desktop
 
 	####################################
 	#
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0_beta1.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0_beta1.ebuild
index d8fce4d29034..d62f262fcd4f 100644
--- a/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0_beta1.ebuild
+++ b/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0_beta1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0_beta1.ebuild,v 1.5 2007/01/30 22:40:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0_beta1.ebuild,v 1.6 2007/02/14 19:13:03 armin76 Exp $
 
 #
 # There are no linguas supported in alpha builds
@@ -216,7 +216,7 @@ src_install() {
 	# Fix bug 54179: Install .desktop file into /usr/share/applications
 	# instead of /usr/share/gnome/apps/Internet (18 Jun 2004 agriffis)
 	insinto /usr/share/applications
-	doins ${FILESDIR}/icon/mozillathunderbird.desktop
+	doins ${FILESDIR}/icon/${PN}.desktop
 
 	####################################
 	#
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0_beta2.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0_beta2.ebuild
index e07f92ea98d1..80bc7b06e7eb 100644
--- a/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0_beta2.ebuild
+++ b/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0_beta2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0_beta2.ebuild,v 1.1 2007/02/08 11:46:00 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0_beta2.ebuild,v 1.2 2007/02/14 19:13:03 armin76 Exp $
 
 #
 # There are no linguas supported in alpha builds
@@ -215,7 +215,7 @@ src_install() {
 	# Fix bug 54179: Install .desktop file into /usr/share/applications
 	# instead of /usr/share/gnome/apps/Internet (18 Jun 2004 agriffis)
 	insinto /usr/share/applications
-	doins ${FILESDIR}/icon/mozillathunderbird.desktop
+	doins ${FILESDIR}/icon/${PN}.desktop
 
 	####################################
 	#