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

Package-Manager: portage-2.1.2-r9

5 files changed, 36 insertions, 31 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/Manifest b/app-office/mozilla-sunbird-bin/Manifest
index 982522dac78a..50c27159a893 100644
--- a/app-office/mozilla-sunbird-bin/Manifest
+++ b/app-office/mozilla-sunbird-bin/Manifest
@@ -1,20 +1,20 @@
-AUX icon/mozillasunbird-bin-icon.png 6418 RMD160 92df6105a3ba07f961d5a54000e772791f1d89ac SHA1 e4e23c74234d688040f6cdaff4ace7f71d69dce4 SHA256 792fa9c96e825a0ba5d9f837910386dcb819e215fcc18c00936718823dee076e
-MD5 fa424078d248f495300ecc507858beb2 files/icon/mozillasunbird-bin-icon.png 6418
-RMD160 92df6105a3ba07f961d5a54000e772791f1d89ac files/icon/mozillasunbird-bin-icon.png 6418
-SHA256 792fa9c96e825a0ba5d9f837910386dcb819e215fcc18c00936718823dee076e files/icon/mozillasunbird-bin-icon.png 6418
-AUX icon/mozillasunbird-bin.desktop 199 RMD160 72d3eacc8f2af9b4e9db6b33e4eff16d75be8812 SHA1 b2da1b256f21484a0917e70f4642f9e31d6ec2d7 SHA256 5f50cce74d89e8e85a71dc87f09f807eb0f43fb50450288748c0eb46b65bb880
-MD5 4496a3c35ce5936332ac41702c3e32f7 files/icon/mozillasunbird-bin.desktop 199
-RMD160 72d3eacc8f2af9b4e9db6b33e4eff16d75be8812 files/icon/mozillasunbird-bin.desktop 199
-SHA256 5f50cce74d89e8e85a71dc87f09f807eb0f43fb50450288748c0eb46b65bb880 files/icon/mozillasunbird-bin.desktop 199
+AUX icon/mozilla-sunbird-bin-icon.png 6418 RMD160 92df6105a3ba07f961d5a54000e772791f1d89ac SHA1 e4e23c74234d688040f6cdaff4ace7f71d69dce4 SHA256 792fa9c96e825a0ba5d9f837910386dcb819e215fcc18c00936718823dee076e
+MD5 fa424078d248f495300ecc507858beb2 files/icon/mozilla-sunbird-bin-icon.png 6418
+RMD160 92df6105a3ba07f961d5a54000e772791f1d89ac files/icon/mozilla-sunbird-bin-icon.png 6418
+SHA256 792fa9c96e825a0ba5d9f837910386dcb819e215fcc18c00936718823dee076e files/icon/mozilla-sunbird-bin-icon.png 6418
+AUX icon/mozilla-sunbird-bin.desktop 200 RMD160 3ce4489f7d76554546308e6e90d55b73229c921b SHA1 58884bae49c415ea72d0c7e54388aa4f7a2322b3 SHA256 135baf7eceb579f686c1d2d52792bc67cf27ad1d89c4c3a956b9f5ffdee2996d
+MD5 739d5604ee1b7e921ad9f21c5c92b854 files/icon/mozilla-sunbird-bin.desktop 200
+RMD160 3ce4489f7d76554546308e6e90d55b73229c921b files/icon/mozilla-sunbird-bin.desktop 200
+SHA256 135baf7eceb579f686c1d2d52792bc67cf27ad1d89c4c3a956b9f5ffdee2996d files/icon/mozilla-sunbird-bin.desktop 200
 DIST sunbird-0.3.en-US.linux-i686.tar.bz2 7858638 RMD160 fa9a15521a51f8ba79b8f135333d0c1d06e24de4 SHA1 0c3c976b4ba6232172d8a30e67a6899da3a77362 SHA256 1ccacca657eabf8fa371f84780c40f8490e7f802f81f63c3fa2cec4d5e732d44
-EBUILD mozilla-sunbird-bin-0.3.ebuild 1978 RMD160 1c272a55425d203881905e38329a33e380dc41e3 SHA1 efc5f53053e70180f3ad042cbbf5953780a14b7a SHA256 890667f65b169adc5c291104b9dfacf56cd580b29babc56e5dbe9e74db446ba7
-MD5 5cf7ab011835975555fa5c50f3abd97b mozilla-sunbird-bin-0.3.ebuild 1978
-RMD160 1c272a55425d203881905e38329a33e380dc41e3 mozilla-sunbird-bin-0.3.ebuild 1978
-SHA256 890667f65b169adc5c291104b9dfacf56cd580b29babc56e5dbe9e74db446ba7 mozilla-sunbird-bin-0.3.ebuild 1978
-MISC ChangeLog 3337 RMD160 f8cf7675f740d478d45fd9887bb22a74152df84b SHA1 6ea3253653d93f2ed0faa207c6a4fc01f9b99f71 SHA256 75b0eda0984e72a6738da6f8b438d03dfae7f21fb596fc40b9a14eecedd0c4e5
-MD5 b9ea4a92b336100c3028e11704fd43a4 ChangeLog 3337
-RMD160 f8cf7675f740d478d45fd9887bb22a74152df84b ChangeLog 3337
-SHA256 75b0eda0984e72a6738da6f8b438d03dfae7f21fb596fc40b9a14eecedd0c4e5 ChangeLog 3337
+EBUILD mozilla-sunbird-bin-0.3.ebuild 1931 RMD160 b27cd16f3686a9bccaa14154dc43ce508f436e49 SHA1 a623c65e5932a1ecb4b5725c5e23120c8626e78e SHA256 1ed5643c3116372390cbd168dde9faba37e2d22770aed10ab68ef8069e8ce5c7
+MD5 d3a02379e0b375558d1b9f66887b5738 mozilla-sunbird-bin-0.3.ebuild 1931
+RMD160 b27cd16f3686a9bccaa14154dc43ce508f436e49 mozilla-sunbird-bin-0.3.ebuild 1931
+SHA256 1ed5643c3116372390cbd168dde9faba37e2d22770aed10ab68ef8069e8ce5c7 mozilla-sunbird-bin-0.3.ebuild 1931
+MISC ChangeLog 3686 RMD160 76c77895fa703bcfe708d5f12a12b1a23a279a2d SHA1 4511eb8a253ea7c400bc15971f85fb78bc170f05 SHA256 ec2d5623d1e58099b29171a5d47297623f6f3ea0eaf9fc407658bbe57b13ce1c
+MD5 d12c179f21e37764c2ed49c99e667a8f ChangeLog 3686
+RMD160 76c77895fa703bcfe708d5f12a12b1a23a279a2d ChangeLog 3686
+SHA256 ec2d5623d1e58099b29171a5d47297623f6f3ea0eaf9fc407658bbe57b13ce1c ChangeLog 3686
 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 metadata.xml 160
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() {