Version bump, drop old.

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

6 files changed, 12 insertions, 189 deletions

diff --git a/net-misc/networkmanager-openvpn/ChangeLog b/net-misc/networkmanager-openvpn/ChangeLog
index f1591c3c5852..b3ffc01bd549 100644
--- a/net-misc/networkmanager-openvpn/ChangeLog
+++ b/net-misc/networkmanager-openvpn/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-misc/networkmanager-openvpn
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-openvpn/ChangeLog,v 1.32 2012/08/17 09:44:24 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-openvpn/ChangeLog,v 1.33 2012/09/13 09:55:14 tetromino Exp $
+
+*networkmanager-openvpn-0.9.6.0 (13 Sep 2012)
+
+  13 Sep 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -networkmanager-openvpn-0.8-r1.ebuild,
+  -networkmanager-openvpn-0.8.2-r1.ebuild,
+  -networkmanager-openvpn-0.9.0.ebuild, -networkmanager-openvpn-0.9.2.0.ebuild,
+  +networkmanager-openvpn-0.9.6.0.ebuild,
+  -files/networkmanager-openvpn-secrets-for-tls.patch:
+  Version bump, drop old.
 
   17 Aug 2012; Johannes Huber <johu@gentoo.org>
   networkmanager-openvpn-0.9.4.0.ebuild:
diff --git a/net-misc/networkmanager-openvpn/files/networkmanager-openvpn-secrets-for-tls.patch b/net-misc/networkmanager-openvpn/files/networkmanager-openvpn-secrets-for-tls.patch
deleted file mode 100644
index defcd01d89e8..000000000000
--- a/net-misc/networkmanager-openvpn/files/networkmanager-openvpn-secrets-for-tls.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=317085
-https://bugs.launchpad.net/ubuntu/+source/network-manager-vpnc/+bug/360818
---- network-manager-openvpn-0.8~a~git.20091008t123607.7c184a9/src/nm-openvpn-service.c-orig	2009-12-20 13:34:48.000000000 -0300
-+++ network-manager-openvpn-0.8~a~git.20091008t123607.7c184a9/src/nm-openvpn-service.c	2009-12-20 13:36:24.000000000 -0300
-@@ -1000,8 +1000,9 @@
- 	if (!nm_openvpn_properties_validate (s_vpn, error))
- 		return FALSE;
- 
--	/* Static Key doesn't need secrets; the rest do */
--	if (strcmp (connection_type, NM_OPENVPN_CONTYPE_STATIC_KEY)) {
-+	/* Only PASSWORD_* connection types need secrets */
-+	if (   !strcmp (connection_type, NM_OPENVPN_CONTYPE_PASSWORD)
-+		|| !strcmp (connection_type, NM_OPENVPN_CONTYPE_PASSWORD_TLS)) {
- 		if (!nm_openvpn_secrets_validate (s_vpn, error))
- 			return FALSE;
- 	}
diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.8-r1.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.8-r1.ebuild
deleted file mode 100644
index 5c2e4c71b7f7..000000000000
--- a/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.8-r1.ebuild
+++ /dev/null
@@ -1,57 +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-openvpn/networkmanager-openvpn-0.8-r1.ebuild,v 1.6 2012/08/14 04:20:06 tetromino Exp $
-
-EAPI="2"
-
-inherit eutils gnome.org
-
-# NetworkManager likes itself with capital letters
-MY_PN=${PN/networkmanager/NetworkManager}
-
-DESCRIPTION="NetworkManager OpenVPN plugin."
-HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
-SRC_URI="${SRC_URI//${PN}/${MY_PN}}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gtk"
-
-RDEPEND="
-	>=net-misc/networkmanager-${PV}
-	>=net-misc/openvpn-2.1_rc9
-	>=dev-libs/dbus-glib-0.74
-	gtk? (
-		>=x11-libs/gtk+-2.6:2
-		gnome-base/gconf:2
-		gnome-base/gnome-keyring
-		gnome-base/libglade:2.0
-	)"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	dev-util/intltool
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-# FAIL: (tls-import-data) unexpected 'ca' secret value
-RESTRICT="test"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-secrets-for-tls.patch"
-}
-
-src_configure() {
-	ECONF="--disable-more-warnings
-		$(use_with gtk gnome)"
-
-	econf ${ECONF}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
-}
diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.8.2-r1.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.8.2-r1.ebuild
deleted file mode 100644
index 7c17aa8540f6..000000000000
--- a/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.8.2-r1.ebuild
+++ /dev/null
@@ -1,64 +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-openvpn/networkmanager-openvpn-0.8.2-r1.ebuild,v 1.7 2012/08/14 04:20:06 tetromino Exp $
-
-EAPI="2"
-
-inherit eutils gnome.org
-
-# NetworkManager likes itself with capital letters
-MY_PN=${PN/networkmanager/NetworkManager}
-
-DESCRIPTION="NetworkManager OpenVPN plugin."
-HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
-SRC_URI="${SRC_URI//${PN}/${MY_PN}}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gtk"
-
-RDEPEND="
-	>=net-misc/networkmanager-${PV}
-	>=net-misc/openvpn-2.1_rc9
-	>=dev-libs/dbus-glib-0.74
-	gtk? (
-		>=x11-libs/gtk+-2.6:2
-		gnome-base/gconf:2
-		gnome-base/gnome-keyring
-		gnome-base/libglade:2.0
-	)"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	dev-util/intltool
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-# FAIL: (tls-import-data) unexpected 'ca' secret value
-RESTRICT="test"
-
-src_prepare() {
-	# Drop DEPRECATED flags, bug #385597
-	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
-		auth-dialog/Makefile.am auth-dialog/Makefile.in \
-		common/Makefile.am common/Makefile.in \
-		common-gnome/Makefile.am common-gnome/Makefile.in \
-		properties/Makefile.am properties/Makefile.in \
-		src/Makefile.am src/Makefile.in \
-		configure.ac configure || die
-}
-
-src_configure() {
-	ECONF="--disable-more-warnings
-		$(use_with gtk gnome)"
-
-	econf ${ECONF}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
-}
diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.9.0.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.9.0.ebuild
deleted file mode 100644
index 11ab34c63019..000000000000
--- a/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.9.0.ebuild
+++ /dev/null
@@ -1,50 +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-openvpn/networkmanager-openvpn-0.9.0.ebuild,v 1.3 2012/08/14 04:20:06 tetromino Exp $
-
-EAPI="4"
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-
-inherit gnome.org
-
-DESCRIPTION="NetworkManager OpenVPN plugin"
-HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk test"
-
-RDEPEND="
-	>=dev-libs/dbus-glib-0.74
-	>=net-misc/networkmanager-${PV}
-	>=net-misc/openvpn-2.1_rc9
-	gtk? (
-		>=x11-libs/gtk+-2.91.4:3
-		gnome-base/gnome-keyring
-	)"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig"
-
-# FAIL: (tls-import-data) unexpected 'ca' secret value
-#RESTRICT="test"
-
-src_configure() {
-	ECONF="--disable-more-warnings
-		--disable-static
-		--with-dist-version=Gentoo
-		--with-gtkver=3
-		$(use_with gtk gnome)
-		$(use_with test tests)"
-
-	econf ${ECONF}
-}
-
-src_install() {
-	default
-	# Remove useless .la files
-	find "${D}" -name '*.la' -exec rm -f {} +
-}
diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.9.2.0.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.9.6.0.ebuild
index 8c05ebb1f998..32a33f0d5121 100644
--- a/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.9.2.0.ebuild
+++ b/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.9.6.0.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/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.9.2.0.ebuild,v 1.4 2012/08/14 04:20:06 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.9.6.0.ebuild,v 1.1 2012/09/13 09:55:14 tetromino Exp $
 
 EAPI="4"
 GNOME_ORG_MODULE="NetworkManager-${PN##*-}"