Added xfce-base/xfce4-panel as alternative for gnome-panel, but I really vote to remove this dep, see bug #246023.

(Portage version: 2.2_rc23/cvs/Linux i686)

4 files changed, 16 insertions, 11 deletions

diff --git a/gnome-extra/nm-applet/ChangeLog b/gnome-extra/nm-applet/ChangeLog
index ed066dba9afa..8388a538c514 100644
--- a/gnome-extra/nm-applet/ChangeLog
+++ b/gnome-extra/nm-applet/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/nm-applet
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/ChangeLog,v 1.21 2008/12/05 13:27:03 rbu Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/ChangeLog,v 1.22 2009/01/22 16:25:44 pva Exp $
+
+  22 Jan 2009; Peter Volkov <pva@gentoo.org> nm-applet-0.6.5.ebuild,
+  nm-applet-0.6.6.ebuild, nm-applet-0.7.0.ebuild:
+  Added xfce-base/xfce4-panel as alternative for gnome-panel, but I really
+  vote to remove this dep, see bug #246023.
 
 *nm-applet-0.7.0 (05 Dec 2008)
 
diff --git a/gnome-extra/nm-applet/nm-applet-0.6.5.ebuild b/gnome-extra/nm-applet/nm-applet-0.6.5.ebuild
index efe40b9cc03d..7690aa2ea19b 100644
--- a/gnome-extra/nm-applet/nm-applet-0.6.5.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-0.6.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.6.5.ebuild,v 1.9 2008/02/07 04:47:33 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.6.5.ebuild,v 1.10 2009/01/22 16:25:44 pva Exp $
 
 inherit gnome2 eutils
 
@@ -27,7 +27,7 @@ RDEPEND=">=sys-apps/dbus-0.60
 	>=x11-libs/gtk+-2.10
 	>=gnome-base/libglade-2
 	>=gnome-base/gnome-keyring-0.4
-	>=gnome-base/gnome-panel-2
+	|| ( >=gnome-base/gnome-panel-2 xfce-base/xfce4-panel )
 	>=gnome-base/gconf-2
 	>=gnome-base/libgnomeui-2"
 DEPEND="${RDEPEND}
diff --git a/gnome-extra/nm-applet/nm-applet-0.6.6.ebuild b/gnome-extra/nm-applet/nm-applet-0.6.6.ebuild
index 8ec22b1d7e59..f3d8f057ba72 100644
--- a/gnome-extra/nm-applet/nm-applet-0.6.6.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-0.6.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.6.6.ebuild,v 1.4 2008/08/17 16:15:22 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.6.6.ebuild,v 1.5 2009/01/22 16:25:44 pva Exp $
 
 inherit gnome2 eutils
 
@@ -27,7 +27,7 @@ RDEPEND=">=sys-apps/dbus-0.60
 	>=x11-libs/gtk+-2.10
 	>=gnome-base/libglade-2
 	>=gnome-base/gnome-keyring-0.4
-	>=gnome-base/gnome-panel-2
+	|| ( >=gnome-base/gnome-panel-2 xfce-base/xfce4-panel )
 	>=gnome-base/gconf-2
 	>=gnome-base/libgnomeui-2"
 DEPEND="${RDEPEND}
diff --git a/gnome-extra/nm-applet/nm-applet-0.7.0.ebuild b/gnome-extra/nm-applet/nm-applet-0.7.0.ebuild
index 7e15bffd3363..29b79ca6ecdb 100644
--- a/gnome-extra/nm-applet/nm-applet-0.7.0.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-0.7.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.7.0.ebuild,v 1.1 2008/12/05 13:27:03 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.7.0.ebuild,v 1.2 2009/01/22 16:25:44 pva Exp $
 
 inherit gnome2 eutils
 
@@ -25,7 +25,7 @@ RDEPEND=">=sys-apps/dbus-1.2
 	>=x11-libs/gtk+-2.10
 	>=gnome-base/libglade-2
 	>=gnome-base/gnome-keyring-2.20
-	>=gnome-base/gnome-panel-2.20
+	|| ( >=gnome-base/gnome-panel-2 xfce-base/xfce4-panel )
 	>=gnome-base/gconf-2.20
 	>=gnome-base/libgnomeui-2.20
 	>=gnome-extra/policykit-gnome-0.8"