Version bump, drop old

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 16 insertions, 75 deletions

diff --git a/net-misc/networkmanager-openconnect/ChangeLog b/net-misc/networkmanager-openconnect/ChangeLog
index e42336b851f1..f6bfa6848ab3 100644
--- a/net-misc/networkmanager-openconnect/ChangeLog
+++ b/net-misc/networkmanager-openconnect/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/networkmanager-openconnect
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-openconnect/ChangeLog,v 1.23 2014/03/12 15:23:49 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-openconnect/ChangeLog,v 1.24 2014/03/16 15:00:07 pacho Exp $
+
+*networkmanager-openconnect-0.9.8.6 (16 Mar 2014)
+
+  16 Mar 2014; Pacho Ramos <pacho@gentoo.org>
+  +networkmanager-openconnect-0.9.8.6.ebuild,
+  -networkmanager-openconnect-0.9.6.2.ebuild,
+  -networkmanager-openconnect-0.9.8.2.ebuild:
+  Version bump, drop old
 
 *networkmanager-openconnect-0.9.8.4-r1 (12 Mar 2014)
 
diff --git a/net-misc/networkmanager-openconnect/networkmanager-openconnect-0.9.6.2.ebuild b/net-misc/networkmanager-openconnect/networkmanager-openconnect-0.9.6.2.ebuild
deleted file mode 100644
index 06ce002035b5..000000000000
--- a/net-misc/networkmanager-openconnect/networkmanager-openconnect-0.9.6.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2013 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.6.2.ebuild,v 1.4 2013/01/31 05:43:42 tetromino Exp $
-
-EAPI="5"
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-
-inherit eutils gnome.org gnome2-utils user
-
-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-0.9.6:=
-	>=dev-libs/dbus-glib-0.74
-	dev-libs/libxml2:2
-	gnome-base/libgnome-keyring
-	>=net-misc/openconnect-3.02:=
-	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_prepare() {
-	gnome2_disable_deprecation_warning
-	default
-}
-
-src_configure() {
-	ECONF="--disable-more-warnings
-		--disable-static
-		--with-gtkver=3
-		$(use_with gtk gnome)
-		$(use_with gtk authdlg)"
-
-	econf ${ECONF}
-}
-
-src_install() {
-	default
-	prune_libtool_files --modules
-}
-
-pkg_postinst() {
-	enewgroup nm-openconnect
-	enewuser nm-openconnect -1 -1 -1 nm-openconnect
-}
diff --git a/net-misc/networkmanager-openconnect/networkmanager-openconnect-0.9.8.2.ebuild b/net-misc/networkmanager-openconnect/networkmanager-openconnect-0.9.8.6.ebuild
index 1241d260e703..d24afb3f2838 100644
--- a/net-misc/networkmanager-openconnect/networkmanager-openconnect-0.9.8.2.ebuild
+++ b/net-misc/networkmanager-openconnect/networkmanager-openconnect-0.9.8.6.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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.8.2.ebuild,v 1.1 2013/06/10 09:34:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-openconnect/networkmanager-openconnect-0.9.8.6.ebuild,v 1.1 2014/03/16 15:00:07 pacho Exp $
 
 EAPI="5"
+GCONF_DEBUG="no"
 GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
 
-inherit eutils gnome.org gnome2-utils user
+inherit gnome2 user
 
 DESCRIPTION="NetworkManager OpenConnect plugin"
-HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -23,7 +24,6 @@ RDEPEND="
 	>=net-misc/openconnect-3.02:=
 	gtk? (
 		>=x11-libs/gtk+-2.91.4:3
-		gnome-base/gconf:2
 		gnome-base/gnome-keyring
 	)"
 
@@ -33,13 +33,8 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
-src_prepare() {
-	gnome2_disable_deprecation_warning
-	default
-}
-
 src_configure() {
-	econf \
+	gnome2_src_configure \
 		--disable-more-warnings \
 		--disable-static \
 		--with-gtkver=3 \
@@ -47,12 +42,8 @@ src_configure() {
 		$(use_with gtk authdlg)
 }
 
-src_install() {
-	default
-	prune_libtool_files --modules
-}
-
 pkg_postinst() {
+	gnome2_pkg_postinst
 	enewgroup nm-openconnect
 	enewuser nm-openconnect -1 -1 -1 nm-openconnect
 }