Updated nm-applet-0.7.1-r2 dependencies (bug #274151)

Restored nm-applet-0.7.1-r1 (version without backported patches)
Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 72 insertions, 6 deletions

diff --git a/gnome-extra/nm-applet/ChangeLog b/gnome-extra/nm-applet/ChangeLog
index 04703cadfca1..8ba27ecda80c 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/ChangeLog,v 1.27 2009/06/11 12:00:32 dagger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/ChangeLog,v 1.28 2009/06/14 19:32:38 dagger Exp $
+
+  14 Jun 2009; Robert Piasek <dagger@gentoo.org> +nm-applet-0.7.1-r1.ebuild,
+  nm-applet-0.7.1-r2.ebuild:
+  Updated nm-applet-0.7.1-r2 dependencies (bug #274151)
+  Restored nm-applet-0.7.1-r1
 
 *nm-applet-0.7.1-r2 (11 Jun 2009)
 
diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
index 39466c4ed060..70e505b4eb1b 100644
--- a/gnome-extra/nm-applet/Manifest
+++ b/gnome-extra/nm-applet/Manifest
@@ -9,6 +9,7 @@ DIST nm-applet-0.7.1-gentoo-patches-1.tar.bz2 11911 RMD160 0a37bf10cca7d13c844af
 EBUILD nm-applet-0.6.5.ebuild 1739 RMD160 40dfd4edbdb8f8df4d1b5e6f03c03bb8488301fc SHA1 61b568f792813bf49035327fa2b5c33eb8886c18 SHA256 5bcf3038228a334f7f70d44ca75f92c0d3f6425f1a448463078a65f95c3b8272
 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-r2.ebuild 1597 RMD160 6c279944b1adf79168e4a1ffb8e312387baf823c SHA1 0b51312ced704eb0009df2c32d0ac047a0750da9 SHA256 0ca2ecc28f0b3a176b8763ee8c208c4c29498e28471db5c8b801397fca135123
-MISC ChangeLog 5307 RMD160 d4212d370de240b5acd1c278f4960c59fcce4ae5 SHA1 0dca32e3ca675f67e88ad255d81af8df01dab273 SHA256 0bdbc57ba6c6406d18105cb72b27d0169ca3b1b4d07b207f0a275a5b805f54ef
+EBUILD nm-applet-0.7.1-r1.ebuild 1760 RMD160 b07952d9282706ac70ef2494bc8dbb26cde3afb4 SHA1 14255dbe9e8ecd33281a83989d1360f32d10af68 SHA256 63da0470f592849191020f5644881cb71816d27133a5f0579650de03ffa5a51f
+EBUILD nm-applet-0.7.1-r2.ebuild 1596 RMD160 f67b6a22c90312eddafbae8f3aa3d2118b420f4a SHA1 dac63ab0ae6d73e6e78cf72fd79f3cf5d2ffe85e SHA256 3d787231b22cec57a5bead251834762510f1694062fc4f7b144bd257f435ef6f
+MISC ChangeLog 5500 RMD160 35e984caa63d29be8fd73546b6c3af024492c6e0 SHA1 377928015363f82cc76c87f58f48762128bcdf9e SHA256 b73fb3d55fc04de1aee8ab3878ed75e67c2bad620bc41a5f590165dcead7da4a
 MISC metadata.xml 529 RMD160 266593f206879e34b4c27a02cf5ebb58fee80103 SHA1 67c096431bfa0e2b6d9eed0b232098667a7de501 SHA256 0c03b9c8c2e6ce4827fb8724f35da992110b03b1a971f6efbdf120cbeb7a7884
diff --git a/gnome-extra/nm-applet/nm-applet-0.7.1-r1.ebuild b/gnome-extra/nm-applet/nm-applet-0.7.1-r1.ebuild
new file mode 100644
index 000000000000..6fbde29ffd98
--- /dev/null
+++ b/gnome-extra/nm-applet/nm-applet-0.7.1-r1.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-r1.ebuild,v 1.3 2009/06/14 19:32:38 dagger 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="~amd64 ~arm ~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."
+}
diff --git a/gnome-extra/nm-applet/nm-applet-0.7.1-r2.ebuild b/gnome-extra/nm-applet/nm-applet-0.7.1-r2.ebuild
index 0e5213e3de68..952ef88a47aa 100644
--- a/gnome-extra/nm-applet/nm-applet-0.7.1-r2.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-0.7.1-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-r2.ebuild,v 1.1 2009/06/11 12:00:32 dagger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.7.1-r2.ebuild,v 1.2 2009/06/14 19:32:38 dagger Exp $
 
 EAPI=2
 inherit gnome2 eutils versionator autotools
@@ -8,7 +8,7 @@ inherit gnome2 eutils versionator autotools
 PATCH_VERSION="1"
 
 MY_P="${P/nm-applet/network-manager-applet}"
-MYPV_MINOR=$(get_version_component_range 1-2)
+MYPV_MINOR=$(get_version_component_range)
 PATCHNAME="${P}-gentoo-patches-${PATCH_VERSION}"
 
 DESCRIPTION="Gnome applet for NetworkManager."
@@ -24,7 +24,7 @@ IUSE=""
 RDEPEND=">=sys-apps/dbus-1.2
 	>=sys-apps/hal-0.5.9
 	>=dev-libs/libnl-1.1
-	=net-misc/networkmanager-${MYPV_MINOR}*
+	>=net-misc/networkmanager-${MYPV_MINOR}-r4
 	>=net-wireless/wireless-tools-28_pre9
 	>=net-wireless/wpa_supplicant-0.5.7
 	>=dev-libs/glib-2.16