Fix .desktop files, bug 147735, and drop monolithic X deps and virtual/libc

Package-Manager: portage-2.1.2-r9

5 files changed, 32 insertions, 27 deletions

diff --git a/mail-client/mozilla-thunderbird-bin/ChangeLog b/mail-client/mozilla-thunderbird-bin/ChangeLog
index 07fc8af29a8a..fe48338d3764 100644
--- a/mail-client/mozilla-thunderbird-bin/ChangeLog
+++ b/mail-client/mozilla-thunderbird-bin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-client/mozilla-thunderbird-bin
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird-bin/ChangeLog,v 1.61 2007/01/11 15:50:33 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird-bin/ChangeLog,v 1.62 2007/02/14 18:51:47 armin76 Exp $
+
+  14 Feb 2007; Raúl Porcel <armin76@gentoo.org>
+  +files/icon/mozilla-thunderbird-bin.desktop,
+  +files/icon/mozilla-thunderbird-bin-icon.png,
+  -files/icon/mozillathunderbird-bin.desktop,
+  -files/icon/mozillathunderbird-bin-icon.png,
+  mozilla-thunderbird-bin-1.5.0.9.ebuild:
+  Fix .desktop files, bug 147735, and drop monolithic X deps and virtual/libc
 
   11 Jan 2007; Raúl Porcel <armin76@gentoo.org>
   mozilla-thunderbird-bin-1.5.0.9.ebuild:
diff --git a/mail-client/mozilla-thunderbird-bin/Manifest b/mail-client/mozilla-thunderbird-bin/Manifest
index 74f77b7830d3..3fa62a3a2e12 100644
--- a/mail-client/mozilla-thunderbird-bin/Manifest
+++ b/mail-client/mozilla-thunderbird-bin/Manifest
@@ -6,14 +6,14 @@ AUX 71thunderbird-bin 26 RMD160 d0356e1c96ba095cba239d34b36dd3af3a366ca9 SHA1 84
 MD5 f6c7b13eef849c6bd9d9ba5d57e5469d files/71thunderbird-bin 26
 RMD160 d0356e1c96ba095cba239d34b36dd3af3a366ca9 files/71thunderbird-bin 26
 SHA256 7e655551b67757cfed6cabd6036390a5ce47c20d05d2c0839fb66a3506eb6f05 files/71thunderbird-bin 26
-AUX icon/mozillathunderbird-bin-icon.png 6499 RMD160 1aeece7719c1c1629b98fc11870641769681a048 SHA1 651d244e96fa0edf13f68f5ef9047432eb6ed3bf SHA256 ff9749e42b82b80425bb52883d63baa53298af7be98870ee6b73f0a6cf0ab22d
-MD5 04115f0e204444eac76a092a63c89027 files/icon/mozillathunderbird-bin-icon.png 6499
-RMD160 1aeece7719c1c1629b98fc11870641769681a048 files/icon/mozillathunderbird-bin-icon.png 6499
-SHA256 ff9749e42b82b80425bb52883d63baa53298af7be98870ee6b73f0a6cf0ab22d files/icon/mozillathunderbird-bin-icon.png 6499
-AUX icon/mozillathunderbird-bin.desktop 205 RMD160 f6d7c773c1d25054298e2824b566c9703c85477a SHA1 aedc939bb530e800fc20f8d8f16b6c89650ee01c SHA256 3544995b7e94c652bcf315d85357509165f271ce6b7a5891d96becefde57299c
-MD5 a622df770b03edce7d158cfe97e8e315 files/icon/mozillathunderbird-bin.desktop 205
-RMD160 f6d7c773c1d25054298e2824b566c9703c85477a files/icon/mozillathunderbird-bin.desktop 205
-SHA256 3544995b7e94c652bcf315d85357509165f271ce6b7a5891d96becefde57299c files/icon/mozillathunderbird-bin.desktop 205
+AUX icon/mozilla-thunderbird-bin-icon.png 6499 RMD160 1aeece7719c1c1629b98fc11870641769681a048 SHA1 651d244e96fa0edf13f68f5ef9047432eb6ed3bf SHA256 ff9749e42b82b80425bb52883d63baa53298af7be98870ee6b73f0a6cf0ab22d
+MD5 04115f0e204444eac76a092a63c89027 files/icon/mozilla-thunderbird-bin-icon.png 6499
+RMD160 1aeece7719c1c1629b98fc11870641769681a048 files/icon/mozilla-thunderbird-bin-icon.png 6499
+SHA256 ff9749e42b82b80425bb52883d63baa53298af7be98870ee6b73f0a6cf0ab22d files/icon/mozilla-thunderbird-bin-icon.png 6499
+AUX icon/mozilla-thunderbird-bin.desktop 205 RMD160 f6d7c773c1d25054298e2824b566c9703c85477a SHA1 aedc939bb530e800fc20f8d8f16b6c89650ee01c SHA256 3544995b7e94c652bcf315d85357509165f271ce6b7a5891d96becefde57299c
+MD5 a622df770b03edce7d158cfe97e8e315 files/icon/mozilla-thunderbird-bin.desktop 205
+RMD160 f6d7c773c1d25054298e2824b566c9703c85477a files/icon/mozilla-thunderbird-bin.desktop 205
+SHA256 3544995b7e94c652bcf315d85357509165f271ce6b7a5891d96becefde57299c files/icon/mozilla-thunderbird-bin.desktop 205
 DIST mozilla-thunderbird-1.5.0.9-bg.xpi 220781 RMD160 ebb51f3c0b187b18c804aa93a5d477c4e55a4bfb SHA1 3699d9b2da7e622af523c2a7e0dc36ad91aeb1ef SHA256 23488d9e32bc17f41b7e0fda5fc389d88a17c15decd31e5b7312762f60a8653a
 DIST mozilla-thunderbird-1.5.0.9-ca.xpi 183258 RMD160 b74766969302f66db5e115fd0a852d0976079feb SHA1 34d144599c187556e82f8f2350696629555071d3 SHA256 4eba3b161d7acf292173a13ebe9abfdba77dc165dedb3181dfcf9fa2f3e62a56
 DIST mozilla-thunderbird-1.5.0.9-cs.xpi 191480 RMD160 08c8cba31e09c26a73b20bb63a4c35a05c6e1805 SHA1 455d7aa433e48f981130094eab4b72bfad20a85a SHA256 efb352a61eaa478638d5efe2e8fc8f937b32733eb9a4b58ae5fd7f0ab2b8ebed
@@ -47,14 +47,14 @@ DIST mozilla-thunderbird-1.5.0.9-sv-SE.xpi 191056 RMD160 6dc72c31b91654d49147b3e
 DIST mozilla-thunderbird-1.5.0.9-tr.xpi 155699 RMD160 bafcede36083016ae2162bfa4d1b11a2965db585 SHA1 f77e486dd77af171613f2d37c775944834df5904 SHA256 8b926cb8daf516697025cf81d5a9f0e2b89dcb8f74c4771e84300e8d11c91618
 DIST mozilla-thunderbird-1.5.0.9-zh-CN.xpi 155476 RMD160 244b1652982d6bb27a83fcf948b747de2bc068c7 SHA1 4724214130fabc67735e5fc4226116c0ba11cbd7 SHA256 b977acf12e07b39751ea10dae7668bbf3b476f5efe73ed4c5cb9d337f4e71d98
 DIST thunderbird-1.5.0.9.tar.gz 10629213 RMD160 41b088fbe1e11ed74e98f777560b1fd1eb8e0e2f SHA1 ce45d204f59799f155eec435875cc0a3edd30716 SHA256 8d1084b3973798c15246d17fffe127c26c4443cad52de9d636593214b36349a1
-EBUILD mozilla-thunderbird-bin-1.5.0.9.ebuild 4066 RMD160 228b1c9a5fb3f50eafedab7400075e7467335ee8 SHA1 b144d53d7f21a342264ae6f0a5a26bd835befd20 SHA256 5af934866603dd3efb0089aae2ec9a78d2ba1737b7db09792980c288792e9d28
-MD5 2f161ef2281907ebd1d88e7587582a9d mozilla-thunderbird-bin-1.5.0.9.ebuild 4066
-RMD160 228b1c9a5fb3f50eafedab7400075e7467335ee8 mozilla-thunderbird-bin-1.5.0.9.ebuild 4066
-SHA256 5af934866603dd3efb0089aae2ec9a78d2ba1737b7db09792980c288792e9d28 mozilla-thunderbird-bin-1.5.0.9.ebuild 4066
-MISC ChangeLog 12898 RMD160 12a229cc6ed58cdda4a29d230183562f3b36c98e SHA1 38cde9b68786d06f32b8667230a329bf2c099072 SHA256 ea350f24e952c8d90ed152759d6803eeeb29b1715c6b5217c1187af04655780a
-MD5 f58b339713edb5c7c101c6ce07d32a14 ChangeLog 12898
-RMD160 12a229cc6ed58cdda4a29d230183562f3b36c98e ChangeLog 12898
-SHA256 ea350f24e952c8d90ed152759d6803eeeb29b1715c6b5217c1187af04655780a ChangeLog 12898
+EBUILD mozilla-thunderbird-bin-1.5.0.9.ebuild 4026 RMD160 4f25bb9eeaa7e1f938f0d897182fa82035c8e1d3 SHA1 808b0e640d355c53222157354065f73f0e2f5743 SHA256 6f2e70e3c4354c8e7cef9e0167ef58cb0f160b15f9fad01abb2b85159bafea63
+MD5 b836280dc2e4f776259a25e5f2542737 mozilla-thunderbird-bin-1.5.0.9.ebuild 4026
+RMD160 4f25bb9eeaa7e1f938f0d897182fa82035c8e1d3 mozilla-thunderbird-bin-1.5.0.9.ebuild 4026
+SHA256 6f2e70e3c4354c8e7cef9e0167ef58cb0f160b15f9fad01abb2b85159bafea63 mozilla-thunderbird-bin-1.5.0.9.ebuild 4026
+MISC ChangeLog 13256 RMD160 7cf920836c54762e0845467ebfff451b1d3c95f4 SHA1 c6e459ad243fa791a42e1bfa7a8ab4a80b859576 SHA256 9afffac81bce9c9ddb14a72ccbfb245700ce9d222f18fcfb6904634d556c4261
+MD5 2fc1b5fd023aed8c625f2b1c051fd0a6 ChangeLog 13256
+RMD160 7cf920836c54762e0845467ebfff451b1d3c95f4 ChangeLog 13256
+SHA256 9afffac81bce9c9ddb14a72ccbfb245700ce9d222f18fcfb6904634d556c4261 ChangeLog 13256
 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-bin/files/icon/mozillathunderbird-bin-icon.png b/mail-client/mozilla-thunderbird-bin/files/icon/mozilla-thunderbird-bin-icon.png
index 90ff395ff5bc..90ff395ff5bc 100644
--- a/mail-client/mozilla-thunderbird-bin/files/icon/mozillathunderbird-bin-icon.png
+++ b/mail-client/mozilla-thunderbird-bin/files/icon/mozilla-thunderbird-bin-icon.png
diff --git a/mail-client/mozilla-thunderbird-bin/files/icon/mozillathunderbird-bin.desktop b/mail-client/mozilla-thunderbird-bin/files/icon/mozilla-thunderbird-bin.desktop
index b0f03a52bc89..b0f03a52bc89 100644
--- a/mail-client/mozilla-thunderbird-bin/files/icon/mozillathunderbird-bin.desktop
+++ b/mail-client/mozilla-thunderbird-bin/files/icon/mozilla-thunderbird-bin.desktop
diff --git a/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-1.5.0.9.ebuild b/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-1.5.0.9.ebuild
index 4ff10516625d..ed14e2445f6a 100644
--- a/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-1.5.0.9.ebuild
+++ b/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-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-bin/mozilla-thunderbird-bin-1.5.0.9.ebuild,v 1.7 2007/01/11 15:50:33 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-1.5.0.9.ebuild,v 1.8 2007/02/14 18:51:47 armin76 Exp $
 
 inherit eutils mozilla-launcher multilib mozextension
 
@@ -27,13 +27,10 @@ for X in ${SHORTLANGS} ; do
 	IUSE="${IUSE} linguas_${X%%-*}"
 done
 
-DEPEND="virtual/libc"
-RDEPEND="|| ( (	x11-libs/libXrender
-		x11-libs/libXt
-		x11-libs/libXmu
-		)
-		virtual/x11
-	)
+DEPEND=""
+RDEPEND="x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/libXmu
 	x86? (
 		>=x11-libs/gtk+-2.2
 	)
@@ -114,9 +111,9 @@ src_install() {
 
 	# Install icon and .desktop for menu entry
 	insinto /usr/share/pixmaps
-	doins ${FILESDIR}/icon/mozillathunderbird-bin-icon.png
+	doins ${FILESDIR}/icon/mozilla-thunderbird-bin-icon.png
 	insinto /usr/share/applications
-	doins ${FILESDIR}/icon/mozillathunderbird-bin.desktop
+	doins ${FILESDIR}/icon/mozilla-thunderbird-bin.desktop
 
 	# revdep-rebuild entry
 	insinto /etc/revdep-rebuild