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

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

commit:     24bb3651ef66bac3a8d032728a688745017bc063
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 21 07:16:19 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon Feb 21 07:16:19 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=24bb3651

gnome-base/gnome-shell: make experimental applet optional, fix its deps

---
 gnome-base/gnome-shell/gnome-shell-9999.ebuild |   26 +++++++++++++----------
 1 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/gnome-base/gnome-shell/gnome-shell-9999.ebuild b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
index 7f31f64..5e46849 100644
--- a/gnome-base/gnome-shell/gnome-shell-9999.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://live.gnome.org/GnomeShell"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
+IUSE="nm-applet"
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 	KEYWORDS=""
@@ -47,7 +47,6 @@ COMMON_DEPEND=">=dev-libs/glib-2.25.9
 	>=media-libs/gst-plugins-base-0.10.16
 	media-libs/libcanberra
 	media-sound/pulseaudio
-	>=net-misc/networkmanager-9999
 	>=net-wireless/gnome-bluetooth-2.90.0[introspection]
 
 	x11-libs/startup-notification
@@ -56,7 +55,9 @@ COMMON_DEPEND=">=dev-libs/glib-2.25.9
 	x11-apps/mesa-progs
 
 	dev-python/dbus-python
-	dev-python/gconf-python"
+	dev-python/gconf-python
+
+	nm-applet? ( >=net-misc/networkmanager-9999[introspection] )"
 # Runtime-only deps are probably incomplete and approximate.
 # nm-applet is only needed temporarily for the secrets and wireless dialogs.
 RDEPEND="${COMMON_DEPEND}
@@ -65,7 +66,8 @@ RDEPEND="${COMMON_DEPEND}
 	>=gnome-base/gnome-settings-daemon-2.91
 	>=gnome-base/gnome-control-center-2.91
 	>=gnome-base/libgnomekbd-2.91.4[introspection]
-	>=gnome-extra/nm-applet-9999"
+
+	nm-applet? ( >=gnome-extra/nm-applet-9999 )"
 DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
 	>=dev-util/pkgconfig-0.22
@@ -77,13 +79,15 @@ G2CONF="--enable-compile-warnings=maximum
 --disable-schemas-compile"
 
 src_prepare() {
-	# See https://bugzilla.gnome.org/show_bug.cgi?id=621707"
-	ewarn "Adding support for the experimental NetworkManager applet."
-	ewarn "This needs the latest NetworkManager & nm-applet trunk."
-	ewarn "Report bugs about this to 'nirbheek' on #gentoo-desktop @ FreeNode."
-	epatch "${FILESDIR}/${PN}-nm-1.patch"
-	epatch "${FILESDIR}/${PN}-nm-2.patch"
-	epatch "${FILESDIR}/${PN}-nm-3.patch"
+	if use nm-applet; then
+		# See https://bugzilla.gnome.org/show_bug.cgi?id=621707"
+		ewarn "Adding support for the experimental NetworkManager applet."
+		ewarn "This needs the latest NetworkManager & nm-applet trunk."
+		ewarn "Report bugs about this to 'nirbheek' on #gentoo-desktop @ FreeNode."
+		epatch "${FILESDIR}/${PN}-nm-1.patch"
+		epatch "${FILESDIR}/${PN}-nm-2.patch"
+		epatch "${FILESDIR}/${PN}-nm-3.patch"
+	fi
 
 	gnome2_src_prepare
 }