Version bump. Update license.

(Portage version: 2.2.0_alpha141/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

5 files changed, 65 insertions, 7 deletions

diff --git a/gnome-extra/nm-applet/ChangeLog b/gnome-extra/nm-applet/ChangeLog
index 7890061beb1f..44a434cc9c0d 100644
--- a/gnome-extra/nm-applet/ChangeLog
+++ b/gnome-extra/nm-applet/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/nm-applet
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/ChangeLog,v 1.84 2012/10/11 15:13:04 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/ChangeLog,v 1.85 2012/10/26 22:58:18 tetromino Exp $
+
+*nm-applet-0.9.6.4 (26 Oct 2012)
+
+  26 Oct 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  nm-applet-0.8.4.ebuild, nm-applet-0.9.4.1.ebuild, nm-applet-0.9.6.2.ebuild,
+  +nm-applet-0.9.6.4.ebuild:
+  Version bump. Update license.
 
   11 Oct 2012; Anthony G. Basile <blueness@gentoo.org> nm-applet-0.9.4.1.ebuild:
   stable ppc, bug #430370
diff --git a/gnome-extra/nm-applet/nm-applet-0.8.4.ebuild b/gnome-extra/nm-applet/nm-applet-0.8.4.ebuild
index bb815ee1a8a5..0b91dd1ab45e 100644
--- a/gnome-extra/nm-applet/nm-applet-0.8.4.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-0.8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.8.4.ebuild,v 1.10 2012/08/09 00:52:29 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.8.4.ebuild,v 1.11 2012/10/26 22:58:18 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -12,7 +12,7 @@ inherit autotools eutils gnome2
 DESCRIPTION="Gnome applet for NetworkManager."
 HOMEPAGE="http://projects.gnome.org/NetworkManager/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="bluetooth"
diff --git a/gnome-extra/nm-applet/nm-applet-0.9.4.1.ebuild b/gnome-extra/nm-applet/nm-applet-0.9.4.1.ebuild
index ed6c35f96f32..7f968bb6fd2e 100644
--- a/gnome-extra/nm-applet/nm-applet-0.9.4.1.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-0.9.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.9.4.1.ebuild,v 1.5 2012/10/11 15:13:04 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.9.4.1.ebuild,v 1.6 2012/10/26 22:58:18 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -12,7 +12,7 @@ inherit eutils gnome2
 DESCRIPTION="GNOME applet for NetworkManager"
 HOMEPAGE="http://projects.gnome.org/NetworkManager/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE="bluetooth"
 KEYWORDS="amd64 ppc x86"
diff --git a/gnome-extra/nm-applet/nm-applet-0.9.6.2.ebuild b/gnome-extra/nm-applet/nm-applet-0.9.6.2.ebuild
index e35fb60ec054..88dbef1747be 100644
--- a/gnome-extra/nm-applet/nm-applet-0.9.6.2.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-0.9.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.9.6.2.ebuild,v 1.1 2012/09/13 09:54:36 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.9.6.2.ebuild,v 1.2 2012/10/26 22:58:18 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -12,7 +12,7 @@ inherit eutils gnome2
 DESCRIPTION="GNOME applet for NetworkManager"
 HOMEPAGE="http://projects.gnome.org/NetworkManager/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE="bluetooth gconf"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/gnome-extra/nm-applet/nm-applet-0.9.6.4.ebuild b/gnome-extra/nm-applet/nm-applet-0.9.6.4.ebuild
new file mode 100644
index 000000000000..364c4197d05b
--- /dev/null
+++ b/gnome-extra/nm-applet/nm-applet-0.9.6.4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2012 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.9.6.4.ebuild,v 1.1 2012/10/26 22:58:18 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+GNOME_ORG_MODULE="network-manager-applet"
+
+inherit eutils gnome2
+
+DESCRIPTION="GNOME applet for NetworkManager"
+HOMEPAGE="http://projects.gnome.org/NetworkManager/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="bluetooth gconf"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND=">=dev-libs/glib-2.26:2
+	>=dev-libs/dbus-glib-0.88
+	>=gnome-base/gnome-keyring-2.20
+	>=sys-apps/dbus-1.4.1
+	>=sys-auth/polkit-0.96-r1
+	>=x11-libs/gtk+-3:3
+	>=x11-libs/libnotify-0.7.0
+
+	app-text/iso-codes
+	>=net-misc/networkmanager-0.9.6
+	net-misc/mobile-broadband-provider-info
+
+	bluetooth? ( >=net-wireless/gnome-bluetooth-2.27.6 )
+	gconf? ( >=gnome-base/gconf-2.20:2 )
+	virtual/freedesktop-icon-theme"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=dev-util/intltool-0.40"
+
+src_prepare() {
+	DOCS="AUTHORS ChangeLog NEWS README"
+	G2CONF="${G2CONF}
+		--with-gtkver=3
+		--disable-more-warnings
+		--disable-static
+		--localstatedir=/var
+		$(use_with bluetooth)
+		$(use_enable gconf migration)"
+
+	gnome2_src_prepare
+}