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

4 files changed, 16 insertions, 11 deletions

diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog
index 2f2af5d3d599..128bb27aebf3 100644
--- a/net-misc/networkmanager/ChangeLog
+++ b/net-misc/networkmanager/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/networkmanager
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.36 2008/12/18 18:38:03 rbu Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.37 2009/01/22 16:29:17 pva Exp $
+
+  22 Jan 2009; Peter Volkov <pva@gentoo.org>
+  networkmanager-0.6.5_p20070823.ebuild, networkmanager-0.6.6.ebuild:
+  Added xfce-base/xfce4-panel as alternative for gnome-panel, but I really
+  vote to remove this dep, see bug #246023.
 
   18 Dec 2008; Robert Buchholz <rbu@gentoo.org> networkmanager-0.7.0.ebuild:
   Correct postinst output, bug #250858.
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index a2064381c2b8..e69b09ba9636 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -9,8 +9,8 @@ DIST NetworkManager-0.6.5_p20070823.tar.gz 956975 RMD160 9d8556e3b5fc3155632bafd
 DIST NetworkManager-0.6.6.tar.gz 984114 RMD160 f0672ee31001f83b06f6b93c30a01f37ee12ed6e SHA1 c5d0bcf7d262e1b600df6dad9f6f4baada293634 SHA256 36d48a11957e1c4f53a685b0fcc7d060e8972b435501c92b10737bb844dd95e2
 DIST NetworkManager-0.7.0.tar.bz2 1139665 RMD160 d727cf71fec20797fce7d75e75f9fbc7292e990e SHA1 c661e95867c0cb231d3ef3e911b285ebb1e02310 SHA256 281234116b99b4c4b45fde038a435a0d26b7ee55beac0c351186b3f12c301659
 DIST networkmanager-0.6.5_p20070823-updatedbackend.patch.bz2 5006 RMD160 f35c35a3db8dbd3178c8325a4eb8a641653a85f0 SHA1 5f9a3b1d85e4a08fa242ab1ff73c6d08ec2791d8 SHA256 0ee0ee38a3e5ac1f501d83dd424dd95e69871dd9e7d67cf2e09e9a378ae10fa8
-EBUILD networkmanager-0.6.5_p20070823.ebuild 2683 RMD160 16e33285137d3fa50691a39c609fe8e34432fc12 SHA1 9ceb15732edc3dfa7cdc9c0f9e4c8cca6cb36ad1 SHA256 6ed35dafe8b1a7896d1cf4ef08d4d152724181701c61f34bc4980351ecee3615
-EBUILD networkmanager-0.6.6.ebuild 2653 RMD160 6ea683f5ca1c2922601cb2f1c556a257c750fae7 SHA1 25f88a8dbbf4d4ed18cda59bfae8f675605540bc SHA256 d1a86d2806aff3b233256d17a4b1059cfc94bf6d30134c1ce092e23bca8bc026
+EBUILD networkmanager-0.6.5_p20070823.ebuild 2713 RMD160 2f1dd1eb3f5a632817e0339bb772e38972a43f84 SHA1 babcb364cb934777ccb78ab3b75dabd268aa39f5 SHA256 f5be4621e61c13ae8b5298fc8c26f1d93cb00765a7375ff8d4492c54875b8686
+EBUILD networkmanager-0.6.6.ebuild 2679 RMD160 167e2abcca0a83aeff7de301053738dbcaf01301 SHA1 77aa325b94f3629bd263eee3952463e3f6cdf07d SHA256 9936eff5f3589a8d0bf079fed344841381edb56a19fcb6f3d5e706239344bd35
 EBUILD networkmanager-0.7.0.ebuild 3734 RMD160 e87583ed8b433e2e461f81f2dea2674f798f6649 SHA1 8526dc985654928005849a10232dc8764155788a SHA256 54099d9019c79d27eda11e5a3845e127bdc77d99bd7b0e8e1b89d4bbb5f4c667
-MISC ChangeLog 8147 RMD160 b3e1bd06df9cdbc7f5a1d403ccd2e16f0a6e000b SHA1 4aff7a22011d71e9e6aaf0a8a41796a3ec2519b8 SHA256 060f5676e8d3e29dd2e6638e3bef79250cee4b06c8c24f22fba12ed7d5871c7f
+MISC ChangeLog 8382 RMD160 b062d6b3416c39b208f6c1594c35dfe2f063ab2e SHA1 6ad105e313fcb3028a71d4845e4f9eaee7e033b1 SHA256 1cf015c696211b1d3875202faa13a642503d6a9434a93b056a4188bcee76e037
 MISC metadata.xml 848 RMD160 170f8df1ab065ba2bb99fc25285542a6c01b2ab6 SHA1 8b3ebfdaa0864e3b3317e83aea048c0c1f8621bc SHA256 4f9d94121cd05463d66cd25c00026cd9de74f914b04ba293998bb2eba3a12cbd
diff --git a/net-misc/networkmanager/networkmanager-0.6.5_p20070823.ebuild b/net-misc/networkmanager/networkmanager-0.6.5_p20070823.ebuild
index f6b7f4e41f97..7ab6d437fa90 100644
--- a/net-misc/networkmanager/networkmanager-0.6.5_p20070823.ebuild
+++ b/net-misc/networkmanager/networkmanager-0.6.5_p20070823.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/net-misc/networkmanager/networkmanager-0.6.5_p20070823.ebuild,v 1.9 2008/06/26 14:10:20 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.6.5_p20070823.ebuild,v 1.10 2009/01/22 16:29:17 pva Exp $
 
 inherit gnome2 eutils
 
@@ -30,7 +30,7 @@ RDEPEND=">=sys-apps/dbus-0.60
 	gnome? ( >=x11-libs/gtk+-2.8
 		>=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 )
 	crypt? ( dev-libs/libgcrypt )"
diff --git a/net-misc/networkmanager/networkmanager-0.6.6.ebuild b/net-misc/networkmanager/networkmanager-0.6.6.ebuild
index 30b5a0d1e1d5..5ebf52c6a743 100644
--- a/net-misc/networkmanager/networkmanager-0.6.6.ebuild
+++ b/net-misc/networkmanager/networkmanager-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/net-misc/networkmanager/networkmanager-0.6.6.ebuild,v 1.4 2008/08/17 16:16:38 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.6.6.ebuild,v 1.5 2009/01/22 16:29:17 pva Exp $
 
 inherit gnome2 eutils
 
@@ -30,7 +30,7 @@ RDEPEND=">=sys-apps/dbus-0.60
 	gnome? ( >=x11-libs/gtk+-2.8
 		>=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 )
 	crypt? ( dev-libs/libgcrypt )"