New version for GNOME 2.26. Remove gnome-vfs dependency, remove sound capplet, moved to gnome-media, better support for fingerprint readers.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

12 files changed, 409 insertions, 424 deletions

diff --git a/gnome-base/gnome-control-center/ChangeLog b/gnome-base/gnome-control-center/ChangeLog
index 5f4899b4e8b3..c6337671c4ae 100644
--- a/gnome-base/gnome-control-center/ChangeLog
+++ b/gnome-base/gnome-control-center/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for gnome-base/gnome-control-center
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.28 2009/04/28 11:18:35 armin76 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.29 2009/05/10 21:09:18 eva Exp $
+
+*gnome-control-center-2.26.0 (10 May 2009)
+
+  10 May 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/gnome-control-center-2.18.1-gnome-doc-utils-fix.patch,
+  -files/gnome-control-center-2.19.90-no-esd.patch,
+  -gnome-control-center-2.20.3.ebuild,
+  -gnome-control-center-2.22.2.1.ebuild,
+  -files/gnome-control-center-2.22.2.1-caps-esc-bindable.patch,
+  -files/gnome-control-center-2.22.2.1-extra-programs.patch,
+  +gnome-control-center-2.26.0.ebuild,
+  +files/gnome-control-center-2.26.0-automagics-canberra+polkit.patch,
+  +files/gnome-control-center-2.26.0-default-background.patch,
+  +files/org.gnome.control-center.defaultbackground.policy:
+  New version for GNOME 2.26. Remove gnome-vfs dependency, remove sound
+  capplet, moved to gnome-media, better support for fingerprint readers.
 
   28 Apr 2009; Raúl Porcel <armin76@gentoo.org>
   gnome-control-center-2.24.0.1.ebuild:
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index 562746eddb88..385f10944920 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -1,16 +1,23 @@
-AUX gnome-control-center-2.18.1-gnome-doc-utils-fix.patch 370 RMD160 1cee6610e683dbf6f162bd9c7d174f3555f3a435 SHA1 8e26e680fac18bdbec02aaba410c6b029b8071dc SHA256 197eafa5b4d445977b3a878d5642f6c5de621a410dc31524221816e4bf5a1675
-AUX gnome-control-center-2.19.90-no-esd.patch 1169 RMD160 ca43e6a2abbf145c7da529dfe39ddfaba659ee45 SHA1 3a6103b3d07ede2c6f5fd2f6600c36abbe816439 SHA256 c32780e50c751234e6e4412fe3a6deaf5635a030553fbe1a61fb19cd47defc98
-AUX gnome-control-center-2.22.2.1-caps-esc-bindable.patch 730 RMD160 76eb6b81f65b5d0a97c59ba839bada985ed3652c SHA1 0aa38ce259023fbbee36044d986b741333c095f7 SHA256 613c943a3161e8ad1ba0e0c6ba4708291cd5681a692bf1d0dbef66dee1c18d77
-AUX gnome-control-center-2.22.2.1-extra-programs.patch 6608 RMD160 154a740235903d0300ef38a59d03fa25067d20f6 SHA1 11141d89a9bd09e1cba03450087e036fea0a6568 SHA256 8aa04506d37118aef82ae5db99827c7b369960e0f80bec689b271753858b101d
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnome-control-center-2.24.0.1-capplet-help.patch 2345 RMD160 c92a563b9881b41015918f9fdba546d50e471b60 SHA1 e91afbf8f8802a51411ad5e5c22cf417800b3452 SHA256 c6f3cc0a9b5eeb569e2b62c75bf55f211fd7ba08de7b6db3923c7b40a71e7a95
 AUX gnome-control-center-2.24.0.1-fbsd.patch 394 RMD160 e5558b7be781663e05c8964355443a2ec993b6a4 SHA1 e6a23b54558824b279a74fdda6afbecb7621b9cf SHA256 d7216a88d518110e3d6a9b64e72e8a02fea1c1b48da43783d0ca0c06f610e11f
 AUX gnome-control-center-2.24.0.1-hv-max.patch 2105 RMD160 5424127ae1c41c72853812515d5975c6377ce285 SHA1 f9d8fbdf0cea5d8e9ff51553c4073b98c76e89d2 SHA256 32d8c14ec34c0bf293a4a9490fa950c6883025a5751da860a04c5687fe248b36
-DIST gnome-control-center-2.20.3.tar.bz2 2259976 RMD160 96f56251c6a06315861dcd89a1c5f68ed47bd48f SHA1 57395df926f9fc79caa7dc94d55d22d55cfa15c0 SHA256 e3abed47de5f41511af95663d1adb3d35a575dc662b8611e959f2f5d205ab07f
-DIST gnome-control-center-2.22.2.1.tar.bz2 2110331 RMD160 59e27bd24f15cbf4a4cef65aad740945eee40ca0 SHA1 686151d59b99fb311481ba365b0dd3fd3680cac6 SHA256 a13eda3ffc0ec353d1b0414238f70e08155179f24cda2f4afba6d905a601e56a
+AUX gnome-control-center-2.26.0-automagics-canberra+polkit.patch 2432 RMD160 8dc01ee688986a20339e6d14d39a43d40a03a770 SHA1 cde5a169e98a7d92875bb7fc535502f375774e5b SHA256 1a2a294de055d561985ec95cd612b81cc8ad68820e890011a62afbb1e340b597
+AUX gnome-control-center-2.26.0-default-background.patch 6341 RMD160 287b29d28ea56a7a25cb189412b41b0ba4dec9af SHA1 58297198e1e1d3c0f8de0b63316ddfd9e7488d5d SHA256 c6cf58d7e284df4a25b8ad226b5d3dc8c56f697e23962a4944e140c65c109edd
+AUX org.gnome.control-center.defaultbackground.policy 836 RMD160 0e830941e4e03bd0c84ec6a352ed5df598f2ccb5 SHA1 c70e2db5e125e1236b0e796c3d9e293ecb3b58a7 SHA256 4fb135d55626e03a2b02b6c325e0fa3ee773984af2258acb3e2f1b22373dce52
 DIST gnome-control-center-2.24.0.1.tar.bz2 2113356 RMD160 5f211b12f7260a8af8c602066133d72cb61cc3f6 SHA1 daf737c762d53ef984a55fc5008e6a4e85b88294 SHA256 fa5d1ba5cb2f88d3c689c8a2bceb57508777a23cff020dcf2de67ad81b0fe57d
-EBUILD gnome-control-center-2.20.3.ebuild 2529 RMD160 491267b76e6db39cc78a754e653e5031056c4302 SHA1 b15c09ee75fc2b507121a1ba4029e1f6e001478d SHA256 74eba253e83ef535314ea32a6c7dd85283c1254422c926cd6f3554c7ef0ca848
-EBUILD gnome-control-center-2.22.2.1.ebuild 2512 RMD160 ca91f5bd4ac21936a497311b1cb5a91e58323ef6 SHA1 7c5614844f9a5c8b3eefbddfd792d8f181733436 SHA256 554a45b8d8233c7ea184a6969937fa7d3faaff9619e38f2c87929b0a7e6f9540
+DIST gnome-control-center-2.26.0.tar.bz2 2262324 RMD160 d22c75b21d63bad9321ad1221e442f381da8dd35 SHA1 4730780aaab599869a2dfe2d72d68dd54bb77058 SHA256 62fb84ea1053971a53c5259b92eb3a282c2f317f72f761ed4dff434ed0e99c05
 EBUILD gnome-control-center-2.24.0.1-r1.ebuild 2772 RMD160 ec7d6c0dad3c33832d87c6bcd4218a19eb21006c SHA1 944ba6d31953d4464e83e10321bcbe8dfb34c067 SHA256 e461ed31c5ac850314aec0797b3dc321b793ee9802b5095f76140ced85e474f7
 EBUILD gnome-control-center-2.24.0.1.ebuild 2556 RMD160 76370a1d6750c343fe9c5791d0335991133a4dfa SHA1 2baecb6a12008f05d9b3f011413e6fe9bdf79bb4 SHA256 413162a78846d58d95e46e051e2a6d6d24ecd235e4acb1a2a5fa636670b6e698
-MISC ChangeLog 41495 RMD160 17e5b2f636db9ddb98501c3b8d415765f813d6ef SHA1 806d69aae4d13a91e5d540c010893f5566581403 SHA256 56cf51f7a975867027319fc7ac150470ba9bbb4e774d82eb7820ab84a8f44507
+EBUILD gnome-control-center-2.26.0.ebuild 2725 RMD160 83e668365dda906280db8a4ba313ef95ca67ada2 SHA1 a6d1e9473a3e45969fddf7b08e569f71ba4f288e SHA256 30d07adf0d7d4c5fd54524d1aaf08f048639ba9a24a27e4c9245d63c48f39e0e
+MISC ChangeLog 42289 RMD160 2068d7638157c58203d283e6ad13c97c290bc5c9 SHA1 66337fc4418bf5f45076548d0d24965ca41f606b SHA256 00e6e2e819724362b942311ff2703cebcdaf0aebe9a5fd025660023268c09162
 MISC metadata.xml 264 RMD160 e891c8cddd44dc4a25f7b9a1172e8ad7332177c0 SHA1 379b57843ca1c94fe14c334b39d6aa2d1822623c SHA256 3df2f5e7333311872f1351c41df47ecfbfa3a85534f210911603d72968cb2d22
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkoHQoUACgkQ1fmVwcYIWAaEwQCeM1lgXn7GNrlSs+Q77rjdX8nq
+vgQAniSEgdklMsdO0GQ6W/YT/eBp+9Ew
+=qF+k
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-2.18.1-gnome-doc-utils-fix.patch b/gnome-base/gnome-control-center/files/gnome-control-center-2.18.1-gnome-doc-utils-fix.patch
deleted file mode 100644
index a89dc4f3c921..000000000000
--- a/gnome-base/gnome-control-center/files/gnome-control-center-2.18.1-gnome-doc-utils-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnome-doc-utils.make.orig	2007-04-14 16:50:19.000000000 -0500
-+++ gnome-doc-utils.make	2007-04-14 16:52:06.000000000 -0500
-@@ -116,7 +116,7 @@
- 	$(filter $(LINGUAS),$(DOC_LINGUAS)),					\
- 	$(DOC_LINGUAS))
- 
--_DOC_ABS_SRCDIR = @abs_srcdir@
-+_DOC_ABS_SRCDIR = "`pwd`/@abs_srcdir@"
- 
- 
- ################################################################################
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-2.19.90-no-esd.patch b/gnome-base/gnome-control-center/files/gnome-control-center-2.19.90-no-esd.patch
deleted file mode 100644
index 5c00d733315b..000000000000
--- a/gnome-base/gnome-control-center/files/gnome-control-center-2.19.90-no-esd.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gnome-control-center-2.19.90.orig/configure.in gnome-control-center-2.19.90/configure.in
---- gnome-control-center-2.19.90.orig/configure.in	2007-08-13 18:01:24.000000000 -0400
-+++ gnome-control-center-2.19.90/configure.in	2007-08-27 20:48:02.000000000 -0400
-@@ -100,7 +100,7 @@ PKG_CHECK_MODULES(LIBSLAB, $COMMON_MODUL
- PKG_CHECK_MODULES(CAPPLET, $COMMON_MODULES)
- PKG_CHECK_MODULES(GNOMECC, $COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0)
- PKG_CHECK_MODULES(GNOME_SETTINGS_DAEMON,
--  [gtk+-2.0 gconf-2.0 libgnomeui-2.0 esound gnome-desktop-2.0 libglade-2.0])
-+  [gtk+-2.0 gconf-2.0 libgnomeui-2.0 gnome-desktop-2.0 libglade-2.0])
- PKG_CHECK_MODULES(OLD_CAPPLET, libgnomeui-2.0 libglade-2.0)
- PKG_CHECK_MODULES(GNOME, libgnomeui-2.0)
- PKG_CHECK_MODULES(GTK, gtk+-2.0)
-@@ -432,7 +432,6 @@ AC_SUBST(GST_LIBS)
- AC_SUBST(GST_CFLAGS)
- 
- if test "x$have_gstreamer" = "xyes"; then
--  PKG_CHECK_MODULES(SOUND_CAPPLET, esound)
-   SOUND_CAPPLET_LIBS="$SOUND_CAPPLET_LIBS $GST_LIBS -lgstaudio-0.10 -lgstinterfaces-0.10"
-   SOUND_CAPPLET_CFLAGS="$SOUND_CAPPLET_CFLAGS $GST_CFLAGS"
-   AC_SUBST(SOUND_CAPPLET_LIBS)
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-2.22.2.1-caps-esc-bindable.patch b/gnome-base/gnome-control-center/files/gnome-control-center-2.22.2.1-caps-esc-bindable.patch
deleted file mode 100644
index 1a0f15f212c3..000000000000
--- a/gnome-base/gnome-control-center/files/gnome-control-center-2.22.2.1-caps-esc-bindable.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: capplets/keybindings/eggcellrendererkeys.c
-===================================================================
---- capplets/keybindings/eggcellrendererkeys.c	(revision 8602)
-+++ capplets/keybindings/eggcellrendererkeys.c	(working copy)
-@@ -421,7 +421,8 @@
- 
-   egg_keymap_resolve_virtual_modifiers (gdk_keymap_get_default (),
-                                         EGG_VIRTUAL_NUM_LOCK_MASK |
--                                        EGG_VIRTUAL_SCROLL_LOCK_MASK,
-+                                        EGG_VIRTUAL_SCROLL_LOCK_MASK |
-+                                        EGG_VIRTUAL_LOCK_MASK,
-                                         &ignored_modifiers);
-   
-   /* http://bugzilla.gnome.org/show_bug.cgi?id=139605
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
deleted file mode 100644
index 602f2393f412..000000000000
--- a/gnome-base/gnome-control-center/files/gnome-control-center-2.22.2.1-extra-programs.patch
+++ /dev/null
@@ -1,168 +0,0 @@
---- 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/files/gnome-control-center-2.26.0-automagics-canberra+polkit.patch b/gnome-base/gnome-control-center/files/gnome-control-center-2.26.0-automagics-canberra+polkit.patch
new file mode 100644
index 000000000000..15286e2452bc
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-2.26.0-automagics-canberra+polkit.patch
@@ -0,0 +1,69 @@
+ configure.in |   35 +++++++++++++++++++++++++----------
+ 1 files changed, 25 insertions(+), 10 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 515f053..03eda8c 100644
+--- a/configure.in
++++ b/configure.in
+@@ -60,13 +60,6 @@ AC_CHECK_FUNC(XScreenSaverQueryInfo, [
+ AC_SUBST(TYPING_BREAK)
+ AC_SUBST(SCREENSAVER_LIBS)
+ 
+-PKG_CHECK_MODULES(LIBCANBERRA_GTK, libcanberra-gtk, [
+-  CANBERRA_GTK=1
+-  AC_SUBST(LIBCANBERRA_GTK_CFLAGS)
+-  AC_SUBST(LIBCANBERRA_GTK_LIBS)
+-  ], [:])
+-AM_CONDITIONAL(HAVE_LIBCANBERRA_GTK, test "x$CANBERRA_GTK" = "x1")
+-
+ AM_CONDITIONAL(HAVE_TYPING_BREAK, test "x$TYPING_BREAK" = xtyping-break)
+ 
+ dnl keyboard-properties-capplet
+@@ -96,6 +89,22 @@ COMMON_MODULES="gtk+-2.0 >= 2.13.1 dnl
+  gconf-2.0 dnl
+  libglade-2.0 >= 2.0.0 dnl
+  gnome-desktop-2.0 >= 2.25.1"
++
++AC_ARG_ENABLE([canberra],
++	AC_HELP_STRING([--enable-canberra],
++	[Enable canberra support @<:@default=yes@:>@]),
++	enable_canberra=$enableval, enable_canberra=yes)
++
++CANBERRA_GTK=0
++if test x$enable_canberra = xyes; then
++   PKG_CHECK_MODULES(LIBCANBERRA_GTK, libcanberra-gtk, 
++   [CANBERRA_GTK=1
++   AC_SUBST(LIBCANBERRA_GTK_CFLAGS)
++   AC_SUBST(LIBCANBERRA_GTK_LIBS)], [])
++fi
++
++AM_CONDITIONAL(HAVE_LIBCANBERRA_GTK, test "x$CANBERRA_GTK" = "x1")
++
+ PKG_CHECK_MODULES(LIBSLAB, $COMMON_MODULES libgnomeui-2.0 gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango libgnomeui-2.0)
+ PKG_CHECK_MODULES(CAPPLET, $COMMON_MODULES)
+ PKG_CHECK_MODULES(GNOMECC, $COMMON_MODULES libgnome-menu >= 2.10.1)
+@@ -199,15 +208,21 @@ AC_ARG_ENABLE([aboutme],
+    [enable_aboutme=no])
+ AC_MSG_RESULT([$enable_aboutme])
+ 
++AC_ARG_ENABLE([policykit-gnome],
++	AC_HELP_STRING([--enable-policykit-gnome],
++	[Enable PolicyKit-gnome support @<:@default=yes@:>@]),
++	enable_polkit=$enableval, enable_polkit=yes)
++
+ if test "x$enable_aboutme" = "xyes"; then
+   PKG_CHECK_MODULES(LIBEBOOK, [libebook-1.2 >= 1.7.90],
+                     [AC_DEFINE([HAVE_LIBEBOOK], 1,
+                     [Define if evolution-data-server libebook-1.2 is available])])
+-  dnl PolicyKit-gnome is optional
++  if test "x$enable_polkit" = "xyes"; then
+   PKG_CHECK_MODULES(POLKIT_GNOME, [polkit-gnome],
+   		    [AC_DEFINE([HAVE_POLKIT], 1,
+-  		    [Define if PolicyKit-gnome is available])],
+-  		    has_polkit=false)
++  		    [Define if PolicyKit-gnome is available])], 		    
++		    has_polkit=false)
++  fi
+ fi
+ 
+ AM_CONDITIONAL(BUILD_ABOUTME, test "x$enable_aboutme" = "xyes")
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-2.26.0-default-background.patch b/gnome-base/gnome-control-center/files/gnome-control-center-2.26.0-default-background.patch
new file mode 100644
index 000000000000..7844cc83b65f
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-2.26.0-default-background.patch
@@ -0,0 +1,174 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gnome-control-center-2.26.0.orig/capplets/appearance/appearance-desktop.c gnome-control-center-2.26.0/capplets/appearance/appearance-desktop.c
+--- gnome-control-center-2.26.0.orig/capplets/appearance/appearance-desktop.c	2008-11-04 11:09:46.000000000 -0500
++++ gnome-control-center-2.26.0/capplets/appearance/appearance-desktop.c	2009-04-24 16:01:30.000000000 -0400
+@@ -32,6 +32,11 @@
+ #include <libgnomeui/gnome-desktop-thumbnail.h>
+ #include <libgnomeui/gnome-bg.h>
+ 
++#ifdef HAVE_POLKIT
++#include <dbus/dbus-glib.h>
++#include <polkit-gnome/polkit-gnome.h>
++#endif /* HAVE_POLKIT */
++
+ enum {
+   TARGET_URI_LIST,
+   TARGET_BGIMAGE
+@@ -988,12 +993,65 @@ wp_select_after_realize (GtkWidget *widg
+   select_item (data, item, TRUE);
+ }
+ 
++#ifdef HAVE_POLKIT
++static void
++set_background (GtkAction *action, gpointer data)
++{
++  AppearanceData *adata = (AppearanceData *)data;
++  DBusGProxy *proxy;
++  DBusGConnection *connection;
++  GError *error;
++  char *keys[7] = {
++    "/desktop/gnome/background/picture_filename",
++    "/desktop/gnome/background/picture_opacity",
++    "/desktop/gnome/background/picture_options",
++    "/desktop/gnome/background/color_shading_type",
++    "/desktop/gnome/background/primary_color",
++    "/desktop/gnome/background/secondary_color",
++    NULL
++  };
++
++  gconf_client_suggest_sync (adata->client, NULL);
++
++  error = NULL;
++  connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
++  if (error != NULL) {
++    g_warning ("failed to get system bus connection: %s", error->message);
++    g_error_free (error);
++    return;
++  }
++
++  proxy = dbus_g_proxy_new_for_name (connection,
++                                     "org.gnome.GConf.Defaults",
++                                     "/",
++                                     "org.gnome.GConf.Defaults");
++  if (proxy == NULL) {
++    g_warning ("Cannot connect to defaults mechanism");
++    return;
++  }
++
++  dbus_g_proxy_call (proxy, "SetSystem",
++                     &error,
++                     G_TYPE_STRV, keys,
++                     G_TYPE_STRV, NULL,
++                     G_TYPE_INVALID,
++                     G_TYPE_INVALID);
++
++  g_object_unref (proxy);
++}
++#endif /* HAVE_POLKIT */
++
+ void
+ desktop_init (AppearanceData *data,
+ 	      const gchar **uris)
+ {
+   GtkWidget *add_button;
+   GtkCellRenderer *cr;
++#ifdef HAVE_POLKIT
++  PolKitAction *pk_action;
++  PolKitGnomeAction *action;
++  GtkWidget *widget, *box, *button;
++#endif /* HAVE_POLKIT */
+ 
+   g_object_set (gtk_settings_get_default (), "gtk-tooltip-timeout", 500, NULL);
+ 
+@@ -1114,6 +1172,26 @@ desktop_init (AppearanceData *data,
+   /* create the file selector later to save time on startup */
+   data->wp_filesel = NULL;
+ 
++#ifdef HAVE_POLKIT
++  widget = glade_xml_get_widget (data->xml, "background_vbox");
++  box = gtk_hbox_new (FALSE, 0);
++  gtk_box_pack_end (GTK_BOX (widget), box, FALSE, FALSE, 0);
++ 
++  pk_action = polkit_action_new ();
++  polkit_action_set_action_id (pk_action, "org.gnome.gconf.defaults.set-default-background");
++ 
++  action = polkit_gnome_action_new_default ("set-system", 
++                                            pk_action,
++                                            _("Make Default"),
++                                            _("Set the current background as the system-wide default"));
++  g_object_set (action, "no-visible", FALSE, NULL);
++          
++  polkit_action_unref (pk_action);
++  button = polkit_gnome_action_create_button (action);
++  gtk_box_pack_end (GTK_BOX (box), button, FALSE, FALSE, 0);
++
++  g_signal_connect (action, "activate", G_CALLBACK (set_background), data);
++#endif /* HAVE_POLKIT */
+ }
+ 
+ void
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gnome-control-center-2.26.0.orig/capplets/appearance/Makefile.am gnome-control-center-2.26.0/capplets/appearance/Makefile.am
+--- gnome-control-center-2.26.0.orig/capplets/appearance/Makefile.am	2009-01-27 07:48:42.000000000 -0500
++++ gnome-control-center-2.26.0/capplets/appearance/Makefile.am	2009-04-24 15:53:58.000000000 -0400
+@@ -44,7 +44,8 @@ gnome_appearance_properties_LDADD = \
+ 	$(top_builddir)/capplets/common/libcommon.la \
+ 	$(GNOMECC_CAPPLETS_LIBS) \
+ 	$(FONT_CAPPLET_LIBS) \
+-	$(METACITY_LIBS)
++	$(METACITY_LIBS) \
++	$(POLKIT_GNOME_LIBS) 
+ gnome_appearance_properties_LDFLAGS = -export-dynamic
+ 
+ gladedir = $(pkgdatadir)/glade
+@@ -55,6 +56,7 @@ INCLUDES = \
+ 	$(METACITY_CFLAGS) \
+ 	$(GNOMECC_CAPPLETS_CFLAGS) \
+ 	$(FONT_CAPPLET_CFLAGS) \
++	$(POLKIT_GNOME_CFLAGS) \
+ 	-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
+ 	-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
+ 	-DGNOMECC_GLADE_DIR="\"$(gladedir)\"" \
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gnome-control-center-2.26.0.orig/configure.in gnome-control-center-2.26.0/configure.in
+--- gnome-control-center-2.26.0.orig/configure.in	2009-04-24 15:57:18.000000000 -0400
++++ gnome-control-center-2.26.0/configure.in	2009-04-24 15:59:04.000000000 -0400
+@@ -186,6 +186,19 @@ fi
+ 
+ CAPPLET_LIBS="$CAPPLET_LIBS $XCURSOR_LIBS"
+ 
++dnl For about-me and appearance
++AC_ARG_ENABLE([policykit-gnome],
++	AC_HELP_STRING([--enable-policykit-gnome],
++	[Enable PolicyKit-gnome support @<:@default=yes@:>@]),
++	enable_polkit=$enableval, enable_polkit=yes)
++
++if test "x$enable_polkit" = "xyes"; then
++PKG_CHECK_MODULES(POLKIT_GNOME, [polkit-gnome],
++	    [AC_DEFINE([HAVE_POLKIT], 1,
++  	    [Define if PolicyKit-gnome is available])], 		    
++	    has_polkit=false)
++fi
++
+ dnl ==============
+ dnl gswitchit
+ dnl ==============
+@@ -208,21 +221,10 @@ AC_ARG_ENABLE([aboutme],
+    [enable_aboutme=no])
+ AC_MSG_RESULT([$enable_aboutme])
+ 
+-AC_ARG_ENABLE([policykit-gnome],
+-	AC_HELP_STRING([--enable-policykit-gnome],
+-	[Enable PolicyKit-gnome support @<:@default=yes@:>@]),
+-	enable_polkit=$enableval, enable_polkit=yes)
+-
+ if test "x$enable_aboutme" = "xyes"; then
+   PKG_CHECK_MODULES(LIBEBOOK, [libebook-1.2 >= 1.7.90],
+                     [AC_DEFINE([HAVE_LIBEBOOK], 1,
+                     [Define if evolution-data-server libebook-1.2 is available])])
+-  if test "x$enable_polkit" = "xyes"; then
+-  PKG_CHECK_MODULES(POLKIT_GNOME, [polkit-gnome],
+-  		    [AC_DEFINE([HAVE_POLKIT], 1,
+-  		    [Define if PolicyKit-gnome is available])], 		    
+-		    has_polkit=false)
+-  fi
+ fi
+ 
+ AM_CONDITIONAL(BUILD_ABOUTME, test "x$enable_aboutme" = "xyes")
diff --git a/gnome-base/gnome-control-center/files/org.gnome.control-center.defaultbackground.policy b/gnome-base/gnome-control-center/files/org.gnome.control-center.defaultbackground.policy
new file mode 100644
index 000000000000..fb623987d891
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/org.gnome.control-center.defaultbackground.policy
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC
+ "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
+<policyconfig>
+  <vendor>The GNOME Project</vendor>
+  <vendor_url>http://www.gnome.org/projects/gconf/</vendor_url>
+  <icon_name>preferences-desktop-appearance</icon_name>
+
+  <action id="org.gnome.gconf.defaults.set-default-background">
+    <description>Set the default background image</description>
+    <message>Privileges are required to set the default background image</message>
+    <defaults>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>auth_admin</allow_active>
+    </defaults>
+    <annotate key="org.gnome.gconf.defaults.set-system.prefix">/desktop/gnome/background</annotate>
+  </action>
+
+</policyconfig>
+
diff --git a/gnome-base/gnome-control-center/gnome-control-center-2.20.3.ebuild b/gnome-base/gnome-control-center/gnome-control-center-2.20.3.ebuild
deleted file mode 100644
index 6ac229fdcad1..000000000000
--- a/gnome-base/gnome-control-center/gnome-control-center-2.20.3.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2009 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.20.3.ebuild,v 1.2 2009/01/04 23:11:33 ulm Exp $
-EAPI="1"
-
-inherit eutils gnome2 autotools
-
-DESCRIPTION="The gnome2 Desktop configuration tool"
-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"
-
-RDEPEND=">=gnome-base/gnome-vfs-2.2
-	>=media-libs/fontconfig-1
-	x11-libs/libXft
-	x11-apps/xmodmap
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXdmcp
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXxf86misc
-	x11-libs/libXau
-	x11-libs/libXcursor
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/pango
-	>=dev-libs/glib-2.13.0
-	>=x11-libs/gtk+-2.11.6
-	>=gnome-base/libbonobo-2
-	>=gnome-base/libgnomeui-2.2
-	>=gnome-base/nautilus-2.6
-	>=gnome-base/gconf-2
-	>=gnome-base/libglade-2
-	>=gnome-base/libbonoboui-2.2
-	>=gnome-base/gnome-desktop-2.2
-	>=gnome-base/librsvg-2
-	>=gnome-base/gnome-menus-2.11.1
-	>=gnome-base/gnome-panel-2
-	>=gnome-base/libgnomekbd-0.1
-	esd? ( >=media-sound/esound-0.2.38 )
-	hal? ( >=sys-apps/hal-0.5.6 )
-	dev-libs/libxml2
-	>=x11-wm/metacity-2.8.6-r1
-	>=x11-libs/libxklavier-3.2
-	>=gnome-base/libgnome-2.2
-	media-libs/freetype
-	>=gnome-base/orbit-2.12.4
-	>=dev-libs/dbus-glib-0.71
-	eds? ( >=gnome-extra/evolution-data-server-1.7.90 )
-	!arm? ( alsa? ( >=media-libs/alsa-lib-0.9 ) )
-	>=media-libs/gst-plugins-base-0.10.2
-	media-plugins/gst-plugins-gconf
-	>=media-libs/gstreamer-0.10.2
-	media-plugins/gst-plugins-meta:0.10"
-DEPEND="${RDEPEND}
-	x11-proto/kbproto
-	x11-proto/xextproto
-	x11-libs/libxkbfile
-	x11-proto/xf86miscproto
-	x11-proto/scrnsaverproto
-	sys-devel/gettext
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
-	>=app-text/gnome-doc-utils-0.10.1
-	app-text/scrollkeeper
-	gnome-base/gnome-common
-	dev-util/desktop-file-utils"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-schemas-install
-		--disable-update-mimedb
-		--disable-scrollkeeper
-		--enable-vfs-methods
-		--enable-gstreamer=0.10
-		$(use_enable esd)
-		$(use_enable alsa)
-		$(use_enable hal)
-		$(use_enable eds aboutme)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Allow building with scrollkeeper
-	epatch "${FILESDIR}/${PN}-2.18.1-gnome-doc-utils-fix.patch"
-
-	# This patch is conditional (bug #201730)
-	use esd || epatch "${FILESDIR}/${PN}-2.19.90-no-esd.patch"
-
-	intltoolize --force || die
-	eautoreconf
-}
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
deleted file mode 100644
index aac298dff26b..000000000000
--- a/gnome-base/gnome-control-center/gnome-control-center-2.22.2.1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2009 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.10 2009/01/04 23:11:33 ulm Exp $
-
-EAPI="1"
-
-inherit eutils gnome2
-
-DESCRIPTION="The gnome2 Desktop configuration tool"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-IUSE="eds esd hal"
-
-RDEPEND="x11-libs/libXft
-		 >=x11-libs/gtk+-2.11.6
-		 >=dev-libs/glib-2.15.5
-		 >=gnome-base/gconf-2.0
-		 >=gnome-base/libglade-2
-		 >=gnome-base/librsvg-2.0
-		 >=gnome-base/nautilus-2.6
-		 >=media-libs/fontconfig-1
-		 >=dev-libs/dbus-glib-0.73
-		 >=gnome-base/gnome-vfs-2.2
-		 >=x11-libs/libxklavier-3.3
-		 >=x11-wm/metacity-2.21.21
-		 >=gnome-base/gnome-panel-2.0
-		 >=gnome-base/libgnomekbd-2.21.4.1
-		 >=gnome-base/gnome-desktop-2.21.4
-		 >=gnome-base/gnome-menus-2.11.1
-		 gnome-base/eel
-		 gnome-base/gnome-settings-daemon
-
-		>=media-libs/gstreamer-0.10.1.2
-		>=media-libs/gst-plugins-base-0.10.1.2
-		>=media-plugins/gst-plugins-gconf-0.10
-		media-plugins/gst-plugins-meta:0.10
-
-		x11-libs/pango
-		dev-libs/libxml2
-		media-libs/freetype
-
-		eds? ( >=gnome-extra/evolution-data-server-1.7.90 )
-		esd? ( >=media-sound/esound-0.2.28 )
-		hal? ( >=sys-apps/hal-0.5.6 )
-
-		>=gnome-base/libbonobo-2
-		>=gnome-base/libgnome-2.2
-		>=gnome-base/libbonoboui-2
-		>=gnome-base/libgnomeui-2.2
-
-		x11-apps/xmodmap
-		x11-libs/libXScrnSaver
-		x11-libs/libXext
-		x11-libs/libX11
-		x11-libs/libXxf86misc
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		x11-libs/libXcursor"
-DEPEND="${RDEPEND}
-		x11-proto/scrnsaverproto
-		x11-proto/xextproto
-		x11-proto/xproto
-		x11-proto/xf86miscproto
-		x11-proto/kbproto
-		x11-proto/randrproto
-		x11-proto/renderproto
-
-		sys-devel/gettext
-		>=dev-util/intltool-0.35
-		>=dev-util/pkgconfig-0.19
-		dev-util/desktop-file-utils
-
-		app-text/scrollkeeper
-		>=app-text/gnome-doc-utils-0.10.1"
-# Needed for autoreconf
-#		gnome-base/gnome-common
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-update-mimedb
-		--enable-vfs-methods
-		--enable-gstreamer=0.10
-		$(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"
-
-	# Make esc not bindable with caps lock, bug #230153
-	epatch "${FILESDIR}/${P}-caps-esc-bindable.patch"
-}
diff --git a/gnome-base/gnome-control-center/gnome-control-center-2.26.0.ebuild b/gnome-base/gnome-control-center/gnome-control-center-2.26.0.ebuild
new file mode 100644
index 000000000000..feceae51abb4
--- /dev/null
+++ b/gnome-base/gnome-control-center/gnome-control-center-2.26.0.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2009 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.26.0.ebuild,v 1.1 2009/05/10 21:09:18 eva Exp $
+
+EAPI="2"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="The gnome2 Desktop configuration tool"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="eds hal policykit"
+
+RDEPEND="x11-libs/libXft
+	>=x11-libs/gtk+-2.13.1
+	>=dev-libs/glib-2.17.4
+	>=gnome-base/gconf-2.0
+	>=gnome-base/libglade-2
+	>=gnome-base/librsvg-2.0
+	>=gnome-base/nautilus-2.6
+	>=media-libs/fontconfig-1
+	>=dev-libs/dbus-glib-0.73
+	>=x11-libs/libxklavier-3.6
+	>=x11-wm/metacity-2.23.1
+	>=gnome-base/gnome-panel-2.0
+	>=gnome-base/libgnomekbd-2.21.4.1
+	>=gnome-base/gnome-desktop-2.25.1
+	>=gnome-base/gnome-menus-2.11.1
+	gnome-base/gnome-settings-daemon
+
+	x11-libs/pango
+	dev-libs/libxml2
+	media-libs/freetype
+	>=media-libs/libcanberra-0.4[gtk]
+
+	eds? ( >=gnome-extra/evolution-data-server-1.7.90 )
+	hal? ( >=sys-apps/hal-0.5.6 )
+	policykit? ( gnome-extra/policykit-gnome )
+
+	>=gnome-base/libbonobo-2
+	>=gnome-base/libgnome-2.2
+	>=gnome-base/libbonoboui-2
+	>=gnome-base/libgnomeui-2.2
+
+	x11-apps/xmodmap
+	x11-libs/libXScrnSaver
+	x11-libs/libXext
+	x11-libs/libX11
+	x11-libs/libXxf86misc
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXcursor"
+DEPEND="${RDEPEND}
+	x11-proto/scrnsaverproto
+	x11-proto/xextproto
+	x11-proto/xproto
+	x11-proto/xf86miscproto
+	x11-proto/kbproto
+	x11-proto/randrproto
+	x11-proto/renderproto
+
+	sys-devel/gettext
+	>=dev-util/intltool-0.40
+	>=dev-util/pkgconfig-0.19
+	dev-util/desktop-file-utils
+
+	app-text/scrollkeeper
+	>=app-text/gnome-doc-utils-0.10.1
+	gnome-base/gnome-common"
+# Needed for autoreconf
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-update-mimedb
+		--enable-canberra
+		$(use_enable eds aboutme)
+		$(use_enable hal)
+		$(use_enable policykit)"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix compilation on fbsd, bug #256958
+	epatch "${FILESDIR}/${PN}-2.24.0.1-fbsd.patch"
+
+	# Fix libcanberra and policykit-gnome for about-me capplet
+	# automagics support, bug #266110
+	epatch "${FILESDIR}/${P}-automagics-canberra+polkit.patch"
+
+	# Policykit-based solution to setting the default background.  Must be
+	# applied *after* teh automagics patch
+	epatch "${FILESDIR}"/${P}-default-background.patch
+
+	eautoreconf
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use policykit ; then
+		# Install the policy for default backgrounds
+		insinto /usr/share/PolicyKit/policy/
+		doins "${FILESDIR}"/org.gnome.control-center.defaultbackground.policy
+	fi
+}