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).
(Portage version: 2.1.6.11/cvs/Linux x86_64)

6 files changed, 102 insertions, 71 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/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."
+}