Version bump by Robert Piasek (bug #266182). Add hard dependency on

  NetworkManager major (bug #266731), add x11-misc/trayer as possible panel
  dependency (bug #254128), remove libgnomeui dependency (bug #254128).
Package-Manager: portage-2.1.6.11/cvs/Linux x86_64

7 files changed, 108 insertions, 76 deletions

diff --git a/gnome-extra/nm-applet/ChangeLog b/gnome-extra/nm-applet/ChangeLog
index 8388a538c514..19e6528191d3 100644
--- a/gnome-extra/nm-applet/ChangeLog
+++ b/gnome-extra/nm-applet/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnome-extra/nm-applet
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/ChangeLog,v 1.23 2009/04/22 14:22:08 rbu Exp $
+
+*nm-applet-0.7.1 (22 Apr 2009)
+
+  22 Apr 2009; Robert Buchholz <rbu@gentoo.org>
+  +files/nm-applet-0.7.1-confchanges.patch, -nm-applet-0.6.5.ebuild,
+  nm-applet-0.6.6.ebuild, nm-applet-0.7.0.ebuild, +nm-applet-0.7.1.ebuild:
+  Version bump by Robert Piasek (bug #266182). Add hard dependency on
+  NetworkManager major (bug #266731), add x11-misc/trayer as possible panel
+  dependency (bug #254128), remove libgnomeui dependency (bug #254128).
 
   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:
diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
index 1266d2525c61..09af301fd7bb 100644
--- a/gnome-extra/nm-applet/Manifest
+++ b/gnome-extra/nm-applet/Manifest
@@ -1,10 +1,11 @@
 AUX nm-applet-0.6.5-confchanges.patch 978 RMD160 4e506d4653affb6d01902c40100ebb2cffd122b8 SHA1 e9088c5767d5e9598b99dae84ad88023f1746262 SHA256 716d2c6abbc010d0fe42916a279b18262d97cc37e955f04c47b7ca27c8786fec
 AUX nm-applet-0.7.0-confchanges.patch 488 RMD160 14e971a69a04f246f718960e10d2565a06b80b19 SHA1 0dc8bf207536603c9852838abf87bb53eb609c31 SHA256 f38ea0296927388ee66f671b4cac06d1c17f70b0822b3374008fca33c3d9cdfa
-DIST network-manager-applet-0.6.5.tar.gz 715346 RMD160 e4a578d4707476258a539a8b083be539cd28ee50 SHA1 0ce53953b121ea14cc0fe3e371af2144d01b1a91 SHA256 8f0c83cb608845e7afcbc3640fdf74b0bbaa76babcc5b9a8aaac2177e13552bc
+AUX nm-applet-0.7.1-confchanges.patch 1154 RMD160 54423c6096a1e6ab16be9c1e0629ea727fdb1064 SHA1 3c94c66562f770e897fe316b2cd2a9ac8b6d7c72 SHA256 264fcda58f2800f778738e84c2d6d64d3efdb0943ec3a5298b7f4a030b689f51
 DIST network-manager-applet-0.7.0.tar.bz2 767130 RMD160 33ab901a8377369e3cf8ffcecc9cbe70d800b3c5 SHA1 bef045db0032f6cfcb28d738c5a652f3619bf2a3 SHA256 7c9fcb0b18c72071ad42316ff5e0369a418f92d05ef419874a67826fd9d8406a
+DIST network-manager-applet-0.7.1.tar.bz2 834191 RMD160 4430d1c5eaae97ab5a78d8c326a56fa8f42afbca SHA1 b54a068b79272adf11c2cfcbcff19ffb4819d65a SHA256 b22a90e6252d798b3889843910a016d185f9e87dd23e203003b1072013f670a6
 DIST nm-applet-0.6.6.tar.gz 781511 RMD160 4a6e1a2051cd2e77b4077b6218570760e04cd383 SHA1 da572c48ae9ecb5c9ba61c0ed8fd06567dcbc4e3 SHA256 8eb264d5838d1f9e2e507a570cb23dc54e11505023b71b6868cee31da2dff38d
-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
+EBUILD nm-applet-0.6.6.ebuild 1914 RMD160 30ba35112d44ee683c9f9220f685024f453795ed SHA1 7589d0e347ef4e027e38a9644c629142fd17f1e6 SHA256 9428975b11f294d0ac4ac9fdfdcc7b345f16e1563533cfe34f24754ee78c65c3
+EBUILD nm-applet-0.7.0.ebuild 1780 RMD160 bbcd098ec91adc1d472dc3e6bc0fd3ec92ae4965 SHA1 3a5fe7a957ca9786aa0c027077fc2ffb787a8426 SHA256 5ad0a59a4669c0d80864cb470d81de3a80ed7032adab88b4c2103599e16409bb
+EBUILD nm-applet-0.7.1.ebuild 1754 RMD160 1bff08a8f1c86d578f2d86789c08bdf609c59322 SHA1 1d55c6eabf5fa31af2976a4c788d6e46c47692f4 SHA256 e5ecc67de2737d435f995ba3ddcd145c730f26166b632148e44b9b226841783f
+MISC ChangeLog 4742 RMD160 6a9035b164adf2891b58be077260997088a194c4 SHA1 1ade3827a3047c80d7173d5a959497dc7a1115bd SHA256 e8196e13e8087cdfd892932c2a6d3824db58074742f6e106eebbafcf5d517aba
 MISC metadata.xml 540 RMD160 54e168815d43da9fb872f7a41e74303c38ff2cc6 SHA1 720055a34d446c126fc1828fec89bc7bcd656567 SHA256 160041d8bbfc8a0d56d100fe1668ebabe4e3d9c4efc37d1b4488e1578db83859
diff --git a/gnome-extra/nm-applet/files/nm-applet-0.7.1-confchanges.patch b/gnome-extra/nm-applet/files/nm-applet-0.7.1-confchanges.patch
new file mode 100644
index 000000000000..05ed6a4fca09
--- /dev/null
+++ b/gnome-extra/nm-applet/files/nm-applet-0.7.1-confchanges.patch
@@ -0,0 +1,22 @@
+--- nm-applet-dbus-126.conf~	2009-03-31 17:10:19.000000000 +0100
++++ nm-applet-dbus-126.conf	2009-04-21 16:27:51.000000000 +0100
+@@ -23,7 +23,7 @@
+                 <allow send_destination="org.freedesktop.NetworkManagerUserSettings"
+                        send_interface="org.freedesktop.NetworkManagerSettings.Connection.Secrets"/>
+         </policy>
+-        <policy at_console="true">
++        <policy group="plugdev">
+                 <allow own="org.freedesktop.NetworkManagerUserSettings"/>
+ 
+                 <allow send_destination="org.freedesktop.NetworkManagerUserSettings"
+--- nm-applet-pre-dbus-126.conf~	2009-03-31 17:10:20.000000000 +0100
++++ nm-applet-pre-dbus-126.conf	2009-04-21 16:28:20.000000000 +0100
+@@ -11,7 +11,7 @@
+ 		<allow send_destination="org.freedesktop.NetworkManagerUserSettings"
+ 		       send_interface="org.freedesktop.NetworkManagerSettings.Connection.Secrets"/>
+         </policy>
+-        <policy at_console="true">
++        <policy group="plugdev">
+                 <allow own="org.freedesktop.NetworkManagerUserSettings"/>
+ 
+                 <allow send_destination="org.freedesktop.NetworkManagerUserSettings"/>
diff --git a/gnome-extra/nm-applet/nm-applet-0.6.5.ebuild b/gnome-extra/nm-applet/nm-applet-0.6.5.ebuild
deleted file mode 100644
index 7690aa2ea19b..000000000000
--- a/gnome-extra/nm-applet/nm-applet-0.6.5.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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.10 2009/01/22 16:25:44 pva Exp $
-
-inherit gnome2 eutils
-
-MY_PV=${PV/_*/}
-
-DESCRIPTION="Gnome applet for NetworkManager."
-HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
-SRC_URI="http://ftp.gnome.org/pub/gnome/sources/network-manager-applet/0.6/network-manager-applet-0.6.5.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="debug doc libnotify"
-
-RDEPEND=">=sys-apps/dbus-0.60
-	>=sys-apps/hal-0.5
-	sys-apps/iproute2
-	>=net-misc/dhcdbd-1.4
-	net-misc/networkmanager
-	>=net-wireless/wireless-tools-28_pre9
-	>=net-wireless/wpa_supplicant-0.4.8
-	>=dev-libs/glib-2.10
-	libnotify? ( >=x11-libs/libnotify-0.4.3 )
-	>=x11-libs/gtk+-2.10
-	>=gnome-base/libglade-2
-	>=gnome-base/gnome-keyring-0.4
-	|| ( >=gnome-base/gnome-panel-2 xfce-base/xfce4-panel )
-	>=gnome-base/gconf-2
-	>=gnome-base/libgnomeui-2"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.35"
-
-DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README"
-USE_DESTDIR="1"
-
-G2CONF="${G2CONF} \
-	--disable-more-warnings \
-	--localstatedir=/var \
-	--with-dbus-sys=/etc/dbus-1/system.d \
-	$(use_with libnotify notify)"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-0.6.5-confchanges.patch"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	elog "Your user needs to be in the plugdev group in order to use this"
-	elog "package.  If it doesn't start in Gnome for you automatically after"
-	elog 'you log back in, simply run "nm-applet --sm-disable"'
-	elog "You also need the notification area applet on your panel for"
-	elog "this to show up."
-}
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 f3d8f057ba72..0d5e2585d7de 100644
--- a/gnome-extra/nm-applet/nm-applet-0.6.6.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-0.6.6.ebuild
@@ -1,10 +1,11 @@
 # 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.5 2009/01/22 16:25:44 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.6.6.ebuild,v 1.6 2009/04/22 14:22:08 rbu Exp $
 
-inherit gnome2 eutils
+inherit gnome2 eutils versionator
 
 #MY_PV=${PV/_*/}
+MYPV_MINOR=$(get_version_component_range 1-2)
 
 DESCRIPTION="Gnome applet for NetworkManager."
 HOMEPAGE="http://people.redhat.com/dcbw/NetworkManager/"
@@ -19,7 +20,7 @@ RDEPEND=">=sys-apps/dbus-0.60
 	>=sys-apps/hal-0.5
 	sys-apps/iproute2
 	>=net-misc/dhcdbd-1.4
-	>=net-misc/networkmanager-0.6.5_p20080130
+	=net-misc/networkmanager-${MYPV_MINOR}*
 	>=net-wireless/wireless-tools-28_pre9
 	>=net-wireless/wpa_supplicant-0.4.8
 	>=dev-libs/glib-2.10
@@ -27,7 +28,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 xfce-base/xfce4-panel )
+	|| ( >=gnome-base/gnome-panel-2 xfce-base/xfce4-panel x11-misc/trayer )
 	>=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 29b79ca6ecdb..c4eb6276c551 100644
--- a/gnome-extra/nm-applet/nm-applet-0.7.0.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-0.7.0.ebuild
@@ -1,10 +1,11 @@
 # 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.2 2009/01/22 16:25:44 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.7.0.ebuild,v 1.3 2009/04/22 14:22:08 rbu Exp $
 
-inherit gnome2 eutils
+inherit gnome2 eutils versionator
 
 MY_P="${P/nm-applet/network-manager-applet}"
+MYPV_MINOR=$(get_version_component_range 1-2)
 
 DESCRIPTION="Gnome applet for NetworkManager."
 HOMEPAGE="http://projects.gnome.org/NetworkManager/"
@@ -17,7 +18,7 @@ IUSE=""
 RDEPEND=">=sys-apps/dbus-1.2
 	>=sys-apps/hal-0.5.9
 	>=dev-libs/libnl-1.1
-	>=net-misc/networkmanager-0.7.0
+	=net-misc/networkmanager-${MYPV_MINOR}*
 	>=net-wireless/wireless-tools-28_pre9
 	>=net-wireless/wpa_supplicant-0.5.7
 	>=dev-libs/glib-2.16
@@ -25,9 +26,8 @@ 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 xfce-base/xfce4-panel )
+	|| ( >=gnome-base/gnome-panel-2 xfce-base/xfce4-panel x11-misc/trayer )
 	>=gnome-base/gconf-2.20
-	>=gnome-base/libgnomeui-2.20
 	>=gnome-extra/policykit-gnome-0.8"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
diff --git a/gnome-extra/nm-applet/nm-applet-0.7.1.ebuild b/gnome-extra/nm-applet/nm-applet-0.7.1.ebuild
new file mode 100644
index 000000000000..9806f0c19880
--- /dev/null
+++ b/gnome-extra/nm-applet/nm-applet-0.7.1.ebuild
@@ -0,0 +1,60 @@
+# 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.1.ebuild,v 1.1 2009/04/22 14:22:08 rbu Exp $
+
+EAPI=2
+inherit gnome2 eutils versionator
+
+MY_P="${P/nm-applet/network-manager-applet}"
+MYPV_MINOR=$(get_version_component_range 1-2)
+
+DESCRIPTION="Gnome applet for NetworkManager."
+HOMEPAGE="http://projects.gnome.org/NetworkManager/"
+SRC_URI="mirror://gnome/sources/network-manager-applet/0.7/${MY_P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~arm ~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=">=sys-apps/dbus-1.2
+	>=sys-apps/hal-0.5.9
+	>=dev-libs/libnl-1.1
+	=net-misc/networkmanager-${MYPV_MINOR}*
+	>=net-wireless/wireless-tools-28_pre9
+	>=net-wireless/wpa_supplicant-0.5.7
+	>=dev-libs/glib-2.16
+	>=x11-libs/libnotify-0.4.3
+	>=x11-libs/gtk+-2.10
+	>=gnome-base/libglade-2
+	>=gnome-base/gnome-keyring-2.20
+	|| ( >=gnome-base/gnome-panel-2 xfce-base/xfce4-panel x11-misc/trayer )
+	>=gnome-base/gconf-2.20
+	>=gnome-extra/policykit-gnome-0.8"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.35"
+
+DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README"
+# USE_DESTDIR="1"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup () {
+	G2CONF="${G2CONF} \
+		--disable-more-warnings \
+		--localstatedir=/var \
+		--with-dbus-sys=/etc/dbus-1/system.d"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-confchanges.patch"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	elog "Your user needs to be in the plugdev group in order to use this"
+	elog "package.  If it doesn't start in Gnome for you automatically after"
+	elog 'you log back in, simply run "nm-applet --sm-disable"'
+	elog "You also need the notification area applet on your panel for"
+	elog "this to show up."
+}