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

(Portage version: 2.1.2-r9)

4 files changed, 16 insertions, 11 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/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