[gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-utils/, gnome-extra/nm-applet/, gnome-base/gnome-session/

[gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-utils/, gnome-extra/nm-applet/, gnome-base/gnome-session/

[Nirbheek Chauhan]

commit:     f2b8e9916cce3469acf109278bccdb64dbde22f8
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  8 05:06:44 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Fri Apr  8 05:06:44 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=f2b8e991

Remove unnecessary gnome-panel deps

---
 .../gnome-session/gnome-session-3.0.0.ebuild       |    7 ++-----
 gnome-base/gnome-session/gnome-session-9999.ebuild |    7 ++-----
 gnome-extra/gnome-utils/gnome-utils-3.0.0.ebuild   |    1 -
 gnome-extra/gnome-utils/gnome-utils-9999.ebuild    |    1 -
 gnome-extra/nm-applet/nm-applet-0.8.998.ebuild     |    8 +++++++-
 5 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/gnome-base/gnome-session/gnome-session-3.0.0.ebuild b/gnome-base/gnome-session/gnome-session-3.0.0.ebuild
index 177516d..7c1537e 100644
--- a/gnome-base/gnome-session/gnome-session-3.0.0.ebuild
+++ b/gnome-base/gnome-session/gnome-session-3.0.0.ebuild
@@ -41,15 +41,12 @@ COMMON_DEPEND=">=dev-libs/glib-2.28.0:2
 	x11-misc/xdg-user-dirs
 	x11-misc/xdg-user-dirs-gtk
 	x11-apps/xdpyinfo"
-# Pure-runtime deps from the session files
+# Pure-runtime deps from the session files should *NOT* be added here
+# Otherwise, things like gdm pull in gnome-shell
 # gnome-themes-standard is needed for the failwhale dialog themeing
 RDEPEND="${COMMON_DEPEND}
 	gnome-base/gnome-settings-daemon
 	>=x11-themes/gnome-themes-standard-2.91.92"
-# PDEPEND to avoid circular dependency
-# gnome-panel is used by classic-gnome
-PDEPEND="gnome-base/gnome-shell
-	gnome-base/gnome-panel"
 DEPEND="${COMMON_DEPEND}
 	>=dev-lang/perl-5
 	>=sys-devel/gettext-0.10.40

diff --git a/gnome-base/gnome-session/gnome-session-9999.ebuild b/gnome-base/gnome-session/gnome-session-9999.ebuild
index 177516d..7c1537e 100644
--- a/gnome-base/gnome-session/gnome-session-9999.ebuild
+++ b/gnome-base/gnome-session/gnome-session-9999.ebuild
@@ -41,15 +41,12 @@ COMMON_DEPEND=">=dev-libs/glib-2.28.0:2
 	x11-misc/xdg-user-dirs
 	x11-misc/xdg-user-dirs-gtk
 	x11-apps/xdpyinfo"
-# Pure-runtime deps from the session files
+# Pure-runtime deps from the session files should *NOT* be added here
+# Otherwise, things like gdm pull in gnome-shell
 # gnome-themes-standard is needed for the failwhale dialog themeing
 RDEPEND="${COMMON_DEPEND}
 	gnome-base/gnome-settings-daemon
 	>=x11-themes/gnome-themes-standard-2.91.92"
-# PDEPEND to avoid circular dependency
-# gnome-panel is used by classic-gnome
-PDEPEND="gnome-base/gnome-shell
-	gnome-base/gnome-panel"
 DEPEND="${COMMON_DEPEND}
 	>=dev-lang/perl-5
 	>=sys-devel/gettext-0.10.40

diff --git a/gnome-extra/gnome-utils/gnome-utils-3.0.0.ebuild b/gnome-extra/gnome-utils/gnome-utils-3.0.0.ebuild
index 7dabe85..d02c466 100644
--- a/gnome-extra/gnome-utils/gnome-utils-3.0.0.ebuild
+++ b/gnome-extra/gnome-utils/gnome-utils-3.0.0.ebuild
@@ -25,7 +25,6 @@ fi
 COMMON_DEPEND=">=dev-libs/glib-2.28.0:2
 	>=x11-libs/gtk+-3.0.3:3
 	>=gnome-base/gconf-2:2
-	>=gnome-base/gnome-panel-2.13.4
 	>=gnome-base/gsettings-desktop-schemas-0.1.0
 	>=gnome-base/libgtop-2.12:2
 	>=media-libs/libcanberra-0.26-r2[gtk3]

diff --git a/gnome-extra/gnome-utils/gnome-utils-9999.ebuild b/gnome-extra/gnome-utils/gnome-utils-9999.ebuild
index 7dabe85..d02c466 100644
--- a/gnome-extra/gnome-utils/gnome-utils-9999.ebuild
+++ b/gnome-extra/gnome-utils/gnome-utils-9999.ebuild
@@ -25,7 +25,6 @@ fi
 COMMON_DEPEND=">=dev-libs/glib-2.28.0:2
 	>=x11-libs/gtk+-3.0.3:3
 	>=gnome-base/gconf-2:2
-	>=gnome-base/gnome-panel-2.13.4
 	>=gnome-base/gsettings-desktop-schemas-0.1.0
 	>=gnome-base/libgtop-2.12:2
 	>=media-libs/libcanberra-0.26-r2[gtk3]

diff --git a/gnome-extra/nm-applet/nm-applet-0.8.998.ebuild b/gnome-extra/nm-applet/nm-applet-0.8.998.ebuild
index 8232c7f..5dbc897 100644
--- a/gnome-extra/nm-applet/nm-applet-0.8.998.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-0.8.998.ebuild
@@ -38,8 +38,14 @@ RDEPEND=">=dev-libs/glib-2.16
 	>=net-misc/networkmanager-${PV}
 	>=net-wireless/wireless-tools-28_pre9
 	>=net-wireless/wpa_supplicant-0.5.7
-	|| ( >=gnome-base/gnome-panel-2 xfce-base/xfce4-panel x11-misc/trayer )
+
+	|| ( gnome-base/gnome-shell
+		 gnome-base/gnome-panel
+		 xfce-base/xfce4-panel
+		 x11-misc/trayer )
+
 	net-misc/mobile-broadband-provider-info
+
 	bluetooth? ( >=net-wireless/gnome-bluetooth-2.27.6 )"
 
 DEPEND="${RDEPEND}