[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/

["Nirbheek Chauhan" <nirbheek@gentoo.org>]

commit:     c8bc2551cc7f2787f5c5494d6e0ab9efd19afefd
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  8 18:04:23 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Mar  9 11:21:35 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=c8bc2551

gnome-base/gnome-control-center: 2.91.90 → 2.91.91

---
 ....ebuild => gnome-control-center-2.91.91.ebuild} |   26 ++++++++++---------
 .../gnome-control-center-9999.ebuild               |    4 +-
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/gnome-base/gnome-control-center/gnome-control-center-2.91.90.ebuild b/gnome-base/gnome-control-center/gnome-control-center-2.91.91.ebuild
similarity index 78%
rename from gnome-base/gnome-control-center/gnome-control-center-2.91.90.ebuild
rename to gnome-base/gnome-control-center/gnome-control-center-2.91.91.ebuild
index 9cb2b1b..a62346e 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-2.91.90.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-2.91.91.ebuild
@@ -13,7 +13,8 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2"
 SLOT="2"
-IUSE="doc +networkmanager +socialweb"
+# Make it +cheese once cheese is ported to gtk+3, and added to overlay
+IUSE="doc cheese +cups +networkmanager +socialweb"
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 	KEYWORDS=""
@@ -22,33 +23,31 @@ else
 fi
 
 # WTF: pulseaudio is compulsary now for gnome-volume-control
-# FIXME: Cheese is optional, but automagic => force-enabled for now
-# FIXME: Cups is optional, but automagic => force-enabled for now
 # XXX: gnome-desktop-2.91.5 is needed for upstream commit c67f7efb
+# XXX: NetworkManager-0.9 support is automagic, make hard-dep once it's released
 #
 # gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
+# g-s-d-2.91.90.1 is needed for magnifier schema updates
+# Latest gsettings-desktop-schemas is needed for commit f6b0ae89
 COMMON_DEPEND="
 	>=dev-libs/glib-2.25.11
 	>=x11-libs/gdk-pixbuf-2.23.0
 	>=x11-libs/gtk+-2.91.6:3
-	>=gnome-base/gsettings-desktop-schemas-0.1.7
+	>=gnome-base/gsettings-desktop-schemas-0.1.7.1
 	>=gnome-base/gconf-2.0
 	>=dev-libs/dbus-glib-0.73
 	>=gnome-base/gnome-desktop-2.91.5:3
-	>=gnome-base/gnome-settings-daemon-2.91.9
-	>=gnome-base/libgnomekbd-2.91.2
+	>=gnome-base/gnome-settings-daemon-2.91.90.1
+	>=gnome-base/libgnomekbd-2.91.91
 
 	app-text/iso-codes
 	dev-libs/libxml2:2
 	gnome-base/gnome-menus
 	gnome-base/libgtop:2
 	media-libs/fontconfig
-	media-libs/gstreamer:0.10
 
 	>=media-libs/libcanberra-0.13[gtk3]
 	>=media-sound/pulseaudio-0.9.16
-	>=media-video/cheese-2.29.90
-	>=net-print/cups-1.4
 	>=sys-auth/polkit-0.97
 	>=sys-power/upower-0.9.1
 
@@ -58,6 +57,10 @@ COMMON_DEPEND="
 	>=x11-libs/libxklavier-5.1
 	>=x11-libs/libXi-1.2
 
+	cheese? (
+		media-libs/gstreamer:0.10
+		>=media-video/cheese-2.91.5 )
+	cups? ( >=net-print/cups-1.4[dbus] )
 	networkmanager? ( >=net-misc/networkmanager-0.8.992 )
 	socialweb? ( net-libs/libsocialweb )
 
@@ -87,11 +90,10 @@ src_prepare() {
 		--disable-update-mimedb
 		--disable-static
 		--disable-schemas-install
+		$(use_with cheese)
+		$(use_enable cups)
 		$(use_with socialweb libsocialweb)"
 	DOCS="AUTHORS ChangeLog NEWS README TODO"
 
-	# bug 356729
-	epatch "${FILESDIR}/${PN}-fix-networkmanager-api.patch"
-
 	gnome2_src_prepare
 }

diff --git a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
index bdfe8d7..a62346e 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
@@ -38,7 +38,7 @@ COMMON_DEPEND="
 	>=dev-libs/dbus-glib-0.73
 	>=gnome-base/gnome-desktop-2.91.5:3
 	>=gnome-base/gnome-settings-daemon-2.91.90.1
-	>=gnome-base/libgnomekbd-2.91.90
+	>=gnome-base/libgnomekbd-2.91.91
 
 	app-text/iso-codes
 	dev-libs/libxml2:2
@@ -60,7 +60,7 @@ COMMON_DEPEND="
 	cheese? (
 		media-libs/gstreamer:0.10
 		>=media-video/cheese-2.91.5 )
-	cups? ( >=net-print/cups-1.4 )
+	cups? ( >=net-print/cups-1.4[dbus] )
 	networkmanager? ( >=net-misc/networkmanager-0.8.992 )
 	socialweb? ( net-libs/libsocialweb )