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

(Portage version: 2.1.2-r9)

4 files changed, 20 insertions, 15 deletions

diff --git a/app-office/mozilla-sunbird-bin/ChangeLog b/app-office/mozilla-sunbird-bin/ChangeLog
index 0c667f7198d7..df1782e5d8a3 100644
--- a/app-office/mozilla-sunbird-bin/ChangeLog
+++ b/app-office/mozilla-sunbird-bin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-office/mozilla-sunbird-bin
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/mozilla-sunbird-bin/ChangeLog,v 1.15 2007/01/11 16:37:27 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/mozilla-sunbird-bin/ChangeLog,v 1.16 2007/02/14 19:18:51 armin76 Exp $
+
+  14 Feb 2007; Raúl Porcel <armin76@gentoo.org>
+  +files/icon/mozilla-sunbird-bin.desktop,
+  +files/icon/mozilla-sunbird-bin-icon.png,
+  -files/icon/mozillasunbird-bin.desktop,
+  -files/icon/mozillasunbird-bin-icon.png, mozilla-sunbird-bin-0.3.ebuild:
+  Fix .desktop files, bug 147735, and drop monolithic X deps and virtual/libc
+  and stable x86
 
 *mozilla-sunbird-bin-0.3 (11 Jan 2007)
 
diff --git a/app-office/mozilla-sunbird-bin/files/icon/mozillasunbird-bin-icon.png b/app-office/mozilla-sunbird-bin/files/icon/mozilla-sunbird-bin-icon.png
index abca1f0964d7..abca1f0964d7 100644
--- a/app-office/mozilla-sunbird-bin/files/icon/mozillasunbird-bin-icon.png
+++ b/app-office/mozilla-sunbird-bin/files/icon/mozilla-sunbird-bin-icon.png
diff --git a/app-office/mozilla-sunbird-bin/files/icon/mozillasunbird-bin.desktop b/app-office/mozilla-sunbird-bin/files/icon/mozilla-sunbird-bin.desktop
index ca69dceb17ab..4aeb2cd7232a 100644
--- a/app-office/mozilla-sunbird-bin/files/icon/mozillasunbird-bin.desktop
+++ b/app-office/mozilla-sunbird-bin/files/icon/mozilla-sunbird-bin.desktop
@@ -2,7 +2,7 @@
 Name=Mozilla Sunbird (bin)
 Comment=Mozilla Sunbird Calendar
 Exec=/usr/bin/sunbird-bin
-Icon=mozillasunbird-bin-icon.png
+Icon=mozilla-sunbird-bin-icon.png
 Terminal=false
 Type=Application
 Categories=Application;Network;
diff --git a/app-office/mozilla-sunbird-bin/mozilla-sunbird-bin-0.3.ebuild b/app-office/mozilla-sunbird-bin/mozilla-sunbird-bin-0.3.ebuild
index 6ed63549b9c8..a625cfe16dfe 100644
--- a/app-office/mozilla-sunbird-bin/mozilla-sunbird-bin-0.3.ebuild
+++ b/app-office/mozilla-sunbird-bin/mozilla-sunbird-bin-0.3.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/app-office/mozilla-sunbird-bin/mozilla-sunbird-bin-0.3.ebuild,v 1.1 2007/01/11 16:37:27 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/mozilla-sunbird-bin/mozilla-sunbird-bin-0.3.ebuild,v 1.2 2007/02/14 19:18:51 armin76 Exp $
 
 inherit eutils mozilla-launcher multilib
 
@@ -9,20 +9,17 @@ SRC_URI="http://releases.mozilla.org/pub/mozilla.org/calendar/sunbird/releases/$
 HOMEPAGE="http://www.mozilla.org/projects/calendar/sunbird.html"
 RESTRICT="nostrip"
 
-KEYWORDS="-* ~x86 ~amd64"
+KEYWORDS="-* ~amd64 x86"
 SLOT="0"
 LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
 IUSE=""
 
-DEPEND="virtual/libc"
-RDEPEND="|| ( ( x11-libs/libXcursor
-			x11-libs/libXrandr
-			x11-libs/libXi
-			x11-libs/libXinerama
-			x11-libs/libXt
-		)
-		virtual/x11
-	)
+DEPEND=""
+RDEPEND="x11-libs/libXcursor
+	x11-libs/libXrandr
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libXt
 	virtual/xft
 	x86? (
 		>=x11-libs/gtk+-2.2
@@ -56,8 +53,8 @@ src_install() {
 	install_mozilla_launcher_stub sunbird-bin ${MOZILLA_FIVE_HOME}
 
 	# Install icon and .desktop for menu entry
-	doicon ${FILESDIR}/icon/mozillasunbird-bin-icon.png
-	domenu ${FILESDIR}/icon/mozillasunbird-bin.desktop
+	doicon ${FILESDIR}/icon/mozilla-sunbird-bin-icon.png
+	domenu ${FILESDIR}/icon/mozilla-sunbird-bin.desktop
 }
 
 pkg_preinst() {