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

Package-Manager: portage-2.2_rc23/cvs/Linux i686

5 files changed, 20 insertions, 15 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/Manifest b/gnome-extra/nm-applet/Manifest
index 27f8cc955ad2..1266d2525c61 100644
--- a/gnome-extra/nm-applet/Manifest
+++ b/gnome-extra/nm-applet/Manifest
@@ -3,8 +3,8 @@ AUX nm-applet-0.7.0-confchanges.patch 488 RMD160 14e971a69a04f246f718960e10d2565
 DIST network-manager-applet-0.6.5.tar.gz 715346 RMD160 e4a578d4707476258a539a8b083be539cd28ee50 SHA1 0ce53953b121ea14cc0fe3e371af2144d01b1a91 SHA256 8f0c83cb608845e7afcbc3640fdf74b0bbaa76babcc5b9a8aaac2177e13552bc
 DIST network-manager-applet-0.7.0.tar.bz2 767130 RMD160 33ab901a8377369e3cf8ffcecc9cbe70d800b3c5 SHA1 bef045db0032f6cfcb28d738c5a652f3619bf2a3 SHA256 7c9fcb0b18c72071ad42316ff5e0369a418f92d05ef419874a67826fd9d8406a
 DIST nm-applet-0.6.6.tar.gz 781511 RMD160 4a6e1a2051cd2e77b4077b6218570760e04cd383 SHA1 da572c48ae9ecb5c9ba61c0ed8fd06567dcbc4e3 SHA256 8eb264d5838d1f9e2e507a570cb23dc54e11505023b71b6868cee31da2dff38d
-EBUILD nm-applet-0.6.5.ebuild 1721 RMD160 a832b26c08b73f5ea70c50ab30aeea00834b7c95 SHA1 2ba893dcea0e14a19ad9df8abd5f5518fbeb377c SHA256 4db35530293c54087e6af68b7c42297ad2ad2243c99b93613484cce39136e72b
-EBUILD nm-applet-0.6.6.ebuild 1816 RMD160 92cb56149c6c9e4cca160e1cca5219edb8fbdb57 SHA1 90d2cb0d9f220c4efd55275a913a5bb4d7f5242c SHA256 1f51dcdaa96ef0aa8b9a4bd037e1c745ec0047eb014201ea8d5e16f96ac33c96
-EBUILD nm-applet-0.7.0.ebuild 1702 RMD160 0eeb721be2a8bc5071506d3c698159d48653cd24 SHA1 f400f97528586628aedcff5dae2db259dd35837e SHA256 8a201a260abe7fc4a81c405e337b064ae9f37cbbf7d2696ea6e61c779b90c5c3
-MISC ChangeLog 4060 RMD160 b205b047d54f8700383181c2dbe65b8e89befcaf SHA1 f8a7d40abd6ca4e660efeb7949fd2c51073d39c0 SHA256 16ac300a53ff412a78ddbe9004114a7cd0cc45a25748783b01b3af825578d4a0
+EBUILD nm-applet-0.6.5.ebuild 1749 RMD160 f15e0901f351604a87f4f5d14195cc3303db9165 SHA1 d83bd3559fed37fcfc9d47cbb59c1cbe57755bf8 SHA256 292e498bc8a79c22b45f6eeb5b175978fa086ff10c29a25a49f522b1dca3042c
+EBUILD nm-applet-0.6.6.ebuild 1842 RMD160 524cc64e82048082db5977e4799473fdeaf8b436 SHA1 1b9c7cf507bdc87163f3f57f5b96be8809eda437 SHA256 1f905d17ee42238e771c284a72a2aadff5be11af807b7546732ed0daa610b1a5
+EBUILD nm-applet-0.7.0.ebuild 1728 RMD160 0e6fcffb96b6cb50c28ddb5ed53ea097787be8ca SHA1 6201700c933adc939bdd6457ae22ffb4471c3051 SHA256 69df218b3f65ed646657b9aa03f051c71dfa819e365c16b5950d9b59d6535fe5
+MISC ChangeLog 4299 RMD160 3ea870379ceb3aa05b2886251d8662817efb0e86 SHA1 4426431f24f9e6fc73ea265f7c129f330200c823 SHA256 77d41f9305eb596cbddd8d2ee24c4eba9dc1c53491469f8ca09c86cb234b4c0b
 MISC metadata.xml 540 RMD160 54e168815d43da9fb872f7a41e74303c38ff2cc6 SHA1 720055a34d446c126fc1828fec89bc7bcd656567 SHA256 160041d8bbfc8a0d56d100fe1668ebabe4e3d9c4efc37d1b4488e1578db83859
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"