Add more programs for preferred applications capplet, bug #215313. Remove alsa from RDEPEND because it's not needed anymore.

(Portage version: 2.2_rc1/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64)

3 files changed, 185 insertions, 6 deletions

diff --git a/gnome-base/gnome-control-center/ChangeLog b/gnome-base/gnome-control-center/ChangeLog
index b506b081938c..c4801c24d1b1 100644
--- a/gnome-base/gnome-control-center/ChangeLog
+++ b/gnome-base/gnome-control-center/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gnome-control-center
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.2 2008/06/07 14:28:37 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.3 2008/06/29 22:04:28 eva Exp $
+
+  29 Jun 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/gnome-control-center-2.22.2.1-extra-programs.patch,
+  gnome-control-center-2.22.2.1.ebuild:
+  Add more programs for preferred applications capplet, bug #215313. Remove
+  alsa from RDEPEND because it's not needed anymore.
 
 *gnome-control-center-2.22.2.1 (05 Jun 2008)
 *gnome-control-center-2.22.1 (05 Jun 2008)
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-2.22.2.1-extra-programs.patch b/gnome-base/gnome-control-center/files/gnome-control-center-2.22.2.1-extra-programs.patch
new file mode 100644
index 000000000000..602f2393f412
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-2.22.2.1-extra-programs.patch
@@ -0,0 +1,168 @@
+--- capplets/default-applications/gnome-default-applications.xml.in~	2008-03-29 21:53:04.000000000 +0100
++++ capplets/default-applications/gnome-default-applications.xml.in	2008-03-29 21:53:04.000000000 +0100
+@@ -62,24 +62,45 @@
+       <win-command>mozilla-firebird -remote "openurl(%s,new-window)"</win-command>
+     </web-browser>
+     <web-browser>
+-      <_name>Firefox</_name>
++      <_name>Mozilla Firefox</_name>
+       <executable>firefox</executable>
+       <command>firefox %s</command>
+-      <icon-name>firefox</icon-name>
++      <icon-name>firefox-icon</icon-name>
+       <run-in-terminal>false</run-in-terminal>
+       <netscape-remote>true</netscape-remote>
+       <tab-command>firefox -new-tab "%s"</tab-command>
+       <win-command>firefox -new-window "%s"</win-command>
+     </web-browser>
++<!-- Commenting because gentoo uses "firefox" executable for all of them causing them to be always shown
+     <web-browser>
+       <_name>Iceweasel</_name>
+-      <executable>iceweasel</executable>
+-      <command>iceweasel %s</command>
+-      <icon-name>iceweasel</icon-name>
++      <executable>firefox</executable>
++      <command>firefox %s</command>
++      <icon-name>iceweasel-icon</icon-name>
+       <run-in-terminal>false</run-in-terminal>
+       <netscape-remote>true</netscape-remote>
+-      <tab-command>iceweasel -new-tab "%s"</tab-command>
+-      <win-command>iceweasel -new-window "%s"</win-command>
++      <tab-command>firefox -new-tab "%s"</tab-command>
++      <win-command>firefox -new-window "%s"</win-command>
++    </web-browser>
++    <web-browser>
++      <_name>Bon Echo</_name>
++      <executable>firefox</executable>
++      <command>firefox %s</command>   
++      <icon-name>firefox-icon-unbranded</icon-name>
++      <run-in-terminal>false</run-in-terminal>
++      <netscape-remote>true</netscape-remote> 
++      <tab-command>firefox -new-tab "%s"</tab-command>
++      <win-command>firefox -new-window "%s"</win-command>
++    </web-browser> -->
++    <web-browser> 
++      <_name>Mozilla Firefox (bin)</_name>
++      <executable>firefox-bin</executable>
++      <command>firefox-bin %s</command>   
++      <icon-name>mozilla-firefox-bin-icon</icon-name>
++      <run-in-terminal>false</run-in-terminal>
++      <netscape-remote>true</netscape-remote> 
++      <tab-command>firefox-bin -new-tab "%s"</tab-command>
++      <win-command>firefox-bin -new-window "%s"</win-command>
+     </web-browser>
+     <web-browser>
+       <_name>Mozilla 1.6</_name>
+@@ -112,6 +133,16 @@
+       <win-command>seamonkey -remote "openurl(%s,new-window)"</win-command>
+     </web-browser>
+     <web-browser>
++      <_name>SeaMonkey (bin)</_name>
++      <executable>seamonkey-bin</executable>
++      <command>seamonkey-bin %s</command>
++      <icon-name>seamonkey-bin</icon-name>
++      <run-in-terminal>false</run-in-terminal>
++      <netscape-remote>true</netscape-remote>
++      <tab-command>seamonkey-bin -remote "openurl(%s,new-tab)"</tab-command>
++      <win-command>seamonkey-bin -remote "openurl(%s,new-window)"</win-command>
++    </web-browser>
++    <web-browser>
+       <_name>Iceape</_name>
+       <executable>iceape</executable>
+       <command>iceape %s</command>
+@@ -179,17 +210,24 @@
+       <run-in-terminal>false</run-in-terminal>
+     </mail-reader>
+     <mail-reader>
+-      <_name>Thunderbird</_name>
++      <_name>Mozilla Thunderbird</_name>
+       <executable>thunderbird</executable>
+       <command>thunderbird %s</command>
+-      <icon-name>thunderbird</icon-name>
++      <icon-name>thunderbird-icon</icon-name>
+       <run-in-terminal>false</run-in-terminal>
+     </mail-reader>
+     <mail-reader>
+-      <_name>Mozilla Thunderbird</_name>
+-      <executable>mozilla-thunderbird</executable>
+-      <command>mozilla-thunderbird %s</command>
+-      <icon-name>thunderbird</icon-name>
++      <_name>Mozilla Thunderbird (bin)</_name>
++      <executable>thunderbird-bin</executable>
++      <command>thunderbird-bin %s</command>
++      <icon-name>mozilla-thunderbird-bin-icon</icon-name>
++      <run-in-terminal>false</run-in-terminal>
++    </mail-reader>
++    <mail-reader>
++      <_name>SeaMonkey Mail (bin)</_name>
++      <executable>seamonkey-bin</executable>
++      <command>seamonkey-bin -mail %s</command>  
++      <icon-name>seamonkey-bin</icon-name>
+       <run-in-terminal>false</run-in-terminal>
+     </mail-reader>
+     <mail-reader>
+@@ -301,7 +339,7 @@
+       <exec-flag>-e</exec-flag>
+     </terminal>
+     <terminal>
+-       <_name>Konsole</_name>
++       <_name>KDE Konsole</_name>
+        <executable>konsole</executable>
+        <command>konsole</command>
+        <icon-name>konsole</icon-name>
+@@ -338,6 +376,55 @@
+       <icon-name>totem</icon-name>
+       <run-in-terminal>false</run-in-terminal>
+     </media-player>
++    <media-player>
++      <_name>Banshee Music Player 1 (prerelease)</_name>
++      <executable>banshee-1</executable>
++      <command>banshee</command>
++      <icon-name>media-player-banshee</icon-name>
++      <run-in-terminal>false</run-in-terminal>
++    </media-player>
++    <media-player> 
++      <_name>Audacious Music Player</_name>
++      <executable>audacious</executable>   
++      <command>audacious</command>
++      <icon-name>audacious</icon-name>
++      <run-in-terminal>false</run-in-terminal>
++    </media-player>
++    <media-player> 
++      <_name>Gxine Movie Player</_name>
++      <executable>gxine</executable>
++      <command>gxine</command>
++      <icon-name>gxine</icon-name> 
++      <run-in-terminal>false</run-in-terminal>
++    </media-player>
++    <media-player> 
++      <_name>Kaffeine Movie Player</_name>    
++      <executable>kaffeine</executable>       
++      <command>kaffeine</command>    
++      <icon-name>kaffeine</icon-name>    
++      <run-in-terminal>false</run-in-terminal>
++    </media-player>
++    <media-player> 
++      <_name>Mplayer Movie Player</_name>
++      <executable>gmplayer</executable>    
++      <command>gmplayer</command>   
++      <icon-name>mplayer</icon-name> 
++      <run-in-terminal>false</run-in-terminal>
++    </media-player>
++    <media-player> 
++      <_name>RealPlayer Movie Player</_name>          
++      <executable>realplay</executable>    
++      <command>realplay</command>      
++      <icon-name>realplay</icon-name>  
++      <run-in-terminal>false</run-in-terminal>
++    </media-player>
++    <media-player> 
++      <_name>Xine Movie Player</_name>
++      <executable>xine</executable>    
++      <command>xine</command>      
++      <icon-name>xine</icon-name> 
++      <run-in-terminal>false</run-in-terminal>
++    </media-player>
+   </media-players>
+ 
+   <a11y-visual>
diff --git a/gnome-base/gnome-control-center/gnome-control-center-2.22.2.1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-2.22.2.1.ebuild
index e8e2aa04a634..c23f9396559c 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-2.22.2.1.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-2.22.2.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-2.22.2.1.ebuild,v 1.1 2008/06/05 11:21:09 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-2.22.2.1.ebuild,v 1.2 2008/06/29 22:04:28 eva Exp $
 
 EAPI="1"
 
-inherit gnome2
+inherit eutils gnome2
 
 DESCRIPTION="The gnome2 Desktop configuration tool"
 HOMEPAGE="http://www.gnome.org/"
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gnome.org/"
 LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="alsa eds esd hal"
+IUSE="eds esd hal"
 
 RDEPEND=">=virtual/xft-2.1.2
 		 >=x11-libs/gtk+-2.11.6
@@ -42,7 +42,6 @@ RDEPEND=">=virtual/xft-2.1.2
 		dev-libs/libxml2
 		media-libs/freetype
 
-		!arm? ( alsa? ( >=media-libs/alsa-lib-0.9.0 ) )
 		eds? ( >=gnome-extra/evolution-data-server-1.7.90 )
 		esd? ( >=media-sound/esound-0.2.28 )
 		hal? ( >=sys-apps/hal-0.5.6 )
@@ -86,8 +85,14 @@ pkg_setup() {
 		--disable-update-mimedb
 		--enable-vfs-methods
 		--enable-gstreamer=0.10
-		$(use_enable alsa)
 		$(use_enable eds aboutme)
 		$(use_enable esd)
 		$(use_enable hal)"
 }
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Show more apps for favorite app selection, bug #215313
+	epatch "${FILESDIR}/${P}-extra-programs.patch"
+}