New version for GNOME 2.24. Make use of libcanberra for system sounds, migrate to GIO, new xrandr-1.2 aware capplet.

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64

4 files changed, 123 insertions, 3 deletions

diff --git a/gnome-base/gnome-control-center/ChangeLog b/gnome-base/gnome-control-center/ChangeLog
index bf9bfe0a8889..d173d05a96ea 100644
--- a/gnome-base/gnome-control-center/ChangeLog
+++ b/gnome-base/gnome-control-center/ChangeLog
@@ -1,6 +1,13 @@
 # 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.11 2008/09/25 15:18:41 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.12 2008/11/04 00:00:16 eva Exp $
+
+*gnome-control-center-2.24.0.1 (04 Nov 2008)
+
+  04 Nov 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +gnome-control-center-2.24.0.1.ebuild, metadata.xml:
+  New version for GNOME 2.24. Make use of libcanberra for system sounds,
+  migrate to GIO, new xrandr-1.2 aware capplet.
 
   25 Sep 2008; Jeroen Roovers <jer@gentoo.org>
   gnome-control-center-2.22.2.1.ebuild:
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index 6b81f48b8c1c..ef65b1fd348f 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -1,10 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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
 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
+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 2534 RMD160 5c6fa462eb7769ea98b373a2f06d70819e376972 SHA1 17174f170b7f537cffd5c50bc29a13de415716a9 SHA256 708c482df7cafaa98de7f5c4f8eeaf1a7bed55b8b66bd4b9fc8ae5c3abbda9d7
 EBUILD gnome-control-center-2.22.2.1.ebuild 2516 RMD160 115384919db2619460de5244f891828160d6cdac SHA1 c9f51d3295dd1a0d0b672c8101ef3bba2539031d SHA256 32837b46681f9e32a47745e7f1d6d6d68ef61820af00a17f52038320a73043a4
-MISC ChangeLog 38849 RMD160 01278f003b9ce4973aa29091bc5c6cda3388a492 SHA1 6e92114164f81f5214b0e24f9d8712e932708d3b SHA256 609fdc2f8403a13be8534f7b29f81e989d4fd2a00a2848e3e244503ad9f070d7
-MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+EBUILD gnome-control-center-2.24.0.1.ebuild 2529 RMD160 91c9116114b7aa144e45fda83a25ca59a7701245 SHA1 510c808202815fe29d7c961dbcc2fe817c7733e1 SHA256 5eaecfde9e05120702d08a1f2276467e74da7ffd51574804e13338b9ef7916e1
+MISC ChangeLog 39126 RMD160 192d614a949396b065436ae95e38c7b40d1cc3c5 SHA1 3e0c60254fb1dc317d17a4e50dd9d1f210babcdf SHA256 4f30e535d9a026a32c78523cb887b6602fae9bde4a88e9ee83bc83d95788c1b2
+MISC metadata.xml 264 RMD160 e891c8cddd44dc4a25f7b9a1172e8ad7332177c0 SHA1 379b57843ca1c94fe14c334b39d6aa2d1822623c SHA256 3df2f5e7333311872f1351c41df47ecfbfa3a85534f210911603d72968cb2d22
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkkPnqYACgkQ1fmVwcYIWAZoLQCfQDgk3Aae+hwffYP5xe5q8UO6
+w8EAn1Ks2Z7YXh7bzMk29jC4R9i+OeCM
+=q1A7
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-control-center/gnome-control-center-2.24.0.1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-2.24.0.1.ebuild
new file mode 100644
index 000000000000..7aa8b661699c
--- /dev/null
+++ b/gnome-base/gnome-control-center/gnome-control-center-2.24.0.1.ebuild
@@ -0,0 +1,98 @@
+# 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.24.0.1.ebuild,v 1.1 2008/11/04 00:00:16 eva 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 ~ia64 ~sparc ~x86"
+IUSE="eds hal sound"
+
+# FIXME: eel is still needed for now?! ChangeLog and configure.in say different
+# things
+RDEPEND=">=virtual/xft-2.1.2
+		 >=x11-libs/gtk+-2.11.6
+		 >=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.23.90
+		 >=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 )
+		hal? ( >=sys-apps/hal-0.5.6 )
+		sound? (
+			>=media-libs/libcanberra-0.4
+			x11-themes/sound-theme-freedesktop )
+
+		>=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"
+# Needed for autoreconf
+#		gnome-base/gnome-common
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+pkg_setup() {
+	if use sound && ! built_with_use media-libs/libcanberra gtk; then
+		eerror "You need to rebuild media-libs/libcanberra with gtk support."
+		die "Rebuild media-libs/libcanberra with USE='gtk'"
+	fi
+
+	G2CONF="${G2CONF}
+		--disable-update-mimedb
+		--enable-gstreamer=0.10
+		$(use_enable eds aboutme)
+		$(use_enable hal)
+		$(use_with sound libcanberra)"
+}
diff --git a/gnome-base/gnome-control-center/metadata.xml b/gnome-base/gnome-control-center/metadata.xml
index da6fd63d0085..aae6ba5b3992 100644
--- a/gnome-base/gnome-control-center/metadata.xml
+++ b/gnome-base/gnome-control-center/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gnome</herd>
+<use>
+	<flag name='sound'>Enable sound event support with <pkg>media-libs/libcanberra</pkg></flag>
+</use>
 </pkgmetadata>