Version bump, now stores passwords in gnome-keyring. Drop old.

(Portage version: 2.2.0_alpha125/cvs/Linux x86_64)

5 files changed, 16 insertions, 126 deletions

diff --git a/net-misc/networkmanager-openconnect/ChangeLog b/net-misc/networkmanager-openconnect/ChangeLog
index f479e97d3133..7315dd32fb48 100644
--- a/net-misc/networkmanager-openconnect/ChangeLog
+++ b/net-misc/networkmanager-openconnect/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-misc/networkmanager-openconnect
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-openconnect/ChangeLog,v 1.7 2012/08/14 04:28:45 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-openconnect/ChangeLog,v 1.8 2012/09/13 09:54:53 tetromino Exp $
+
+*networkmanager-openconnect-0.9.6.2 (13 Sep 2012)
+
+  13 Sep 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -networkmanager-openconnect-0.9.0.ebuild,
+  -networkmanager-openconnect-0.9.2.0.ebuild,
+  -networkmanager-openconnect-0.9.2.0-r1.ebuild,
+  -files/networkmanager-openconnect-0.9.2.0-glib-2.31.patch,
+  +networkmanager-openconnect-0.9.6.2.ebuild:
+  Version bump, now stores passwords in gnome-keyring. Drop old.
 
   14 Aug 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   networkmanager-openconnect-0.8.4.ebuild,
diff --git a/net-misc/networkmanager-openconnect/files/networkmanager-openconnect-0.9.2.0-glib-2.31.patch b/net-misc/networkmanager-openconnect/files/networkmanager-openconnect-0.9.2.0-glib-2.31.patch
deleted file mode 100644
index ec6b1f2fe4e0..000000000000
--- a/net-misc/networkmanager-openconnect/files/networkmanager-openconnect-0.9.2.0-glib-2.31.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-commit ca8a39d1bb999ba98ead45e53041fc3ea28ecd5c
-Author: David Woodhouse <David.Woodhouse@intel.com>
-Date:   Thu Nov 10 23:19:32 2011 +0000
-
-    Fix build failure: include <glib.h>, not <glib/gtypes.h> directly.
-
-diff --git a/src/nm-openconnect-service.h b/src/nm-openconnect-service.h
-index e454f82..684a5b3 100644
---- a/src/nm-openconnect-service.h
-+++ b/src/nm-openconnect-service.h
-@@ -25,8 +25,7 @@
- #ifndef NM_OPENCONNECT_PLUGIN_H
- #define NM_OPENCONNECT_PLUGIN_H
- 
--#include <glib/gtypes.h>
--#include <glib-object.h>
-+#include <glib.h>
- #include <nm-vpn-plugin.h>
- 
- #define NM_TYPE_OPENCONNECT_PLUGIN            (nm_openconnect_plugin_get_type ())
diff --git a/net-misc/networkmanager-openconnect/networkmanager-openconnect-0.9.0.ebuild b/net-misc/networkmanager-openconnect/networkmanager-openconnect-0.9.0.ebuild
deleted file mode 100644
index 08d16825f946..000000000000
--- a/net-misc/networkmanager-openconnect/networkmanager-openconnect-0.9.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-openconnect/networkmanager-openconnect-0.9.0.ebuild,v 1.3 2012/08/14 04:28:45 tetromino Exp $
-
-EAPI="4"
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-
-inherit gnome.org
-
-DESCRIPTION="NetworkManager OpenConnect plugin"
-HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk"
-
-RDEPEND="
-	>=net-misc/networkmanager-${PV}
-	>=dev-libs/dbus-glib-0.74
-	dev-libs/libxml2:2
-	net-misc/openconnect
-	gtk? (
-		>=x11-libs/gtk+-2.91.4:3
-		gnome-base/gconf:2
-		gnome-base/gnome-keyring
-	)"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	dev-util/intltool
-	virtual/pkgconfig"
-
-src_configure() {
-	ECONF="--disable-more-warnings
-		--disable-static
-		--with-gtkver=3
-		$(use_with gtk gnome)
-		$(use_with gtk authdlg)"
-
-	econf ${ECONF}
-}
-
-src_install() {
-	default
-	# Remove useless .la files
-	find "${D}" -name '*.la' -exec rm -f {} +
-}
diff --git a/net-misc/networkmanager-openconnect/networkmanager-openconnect-0.9.2.0.ebuild b/net-misc/networkmanager-openconnect/networkmanager-openconnect-0.9.2.0.ebuild
deleted file mode 100644
index 36bf0d63dfda..000000000000
--- a/net-misc/networkmanager-openconnect/networkmanager-openconnect-0.9.2.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-openconnect/networkmanager-openconnect-0.9.2.0.ebuild,v 1.3 2012/08/14 04:28:45 tetromino Exp $
-
-EAPI="4"
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-
-inherit gnome.org
-
-DESCRIPTION="NetworkManager OpenConnect plugin"
-HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk"
-
-RDEPEND="
-	>=net-misc/networkmanager-${PV}
-	>=dev-libs/dbus-glib-0.74
-	dev-libs/libxml2:2
-	net-misc/openconnect
-	gtk? (
-		>=x11-libs/gtk+-2.91.4:3
-		gnome-base/gconf:2
-		gnome-base/gnome-keyring
-	)"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	dev-util/intltool
-	virtual/pkgconfig"
-
-src_configure() {
-	ECONF="--disable-more-warnings
-		--disable-static
-		--with-gtkver=3
-		$(use_with gtk gnome)
-		$(use_with gtk authdlg)"
-
-	econf ${ECONF}
-}
-
-src_install() {
-	default
-	# Remove useless .la files
-	find "${D}" -name '*.la' -exec rm -f {} +
-}
diff --git a/net-misc/networkmanager-openconnect/networkmanager-openconnect-0.9.2.0-r1.ebuild b/net-misc/networkmanager-openconnect/networkmanager-openconnect-0.9.6.2.ebuild
index f8c048864b81..3ff3ddfdc73b 100644
--- a/net-misc/networkmanager-openconnect/networkmanager-openconnect-0.9.2.0-r1.ebuild
+++ b/net-misc/networkmanager-openconnect/networkmanager-openconnect-0.9.6.2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-openconnect/networkmanager-openconnect-0.9.2.0-r1.ebuild,v 1.3 2012/08/14 04:28:45 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-openconnect/networkmanager-openconnect-0.9.6.2.ebuild,v 1.1 2012/09/13 09:54:53 tetromino Exp $
 
 EAPI="4"
 GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
 
-inherit eutils gnome.org user
+inherit gnome.org user
 
 DESCRIPTION="NetworkManager OpenConnect plugin"
 HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
@@ -16,10 +16,11 @@ KEYWORDS="~amd64 ~x86"
 IUSE="gtk"
 
 RDEPEND="
-	>=net-misc/networkmanager-${PV}
+	>=net-misc/networkmanager-0.9.6
 	>=dev-libs/dbus-glib-0.74
 	dev-libs/libxml2:2
-	net-misc/openconnect
+	gnome-base/libgnome-keyring
+	>=net-misc/openconnect-3.02
 	gtk? (
 		>=x11-libs/gtk+-2.91.4:3
 		gnome-base/gconf:2
@@ -31,11 +32,6 @@ DEPEND="${RDEPEND}
 	dev-util/intltool
 	virtual/pkgconfig"
 
-src_prepare() {
-	# Upstream patch for glib-2.31 compatibility
-	epatch "${FILESDIR}/${P}-glib-2.31.patch"
-}
-
 src_configure() {
 	ECONF="--disable-more-warnings
 		--disable-static