4 files changed, 10 insertions, 117 deletions
diff --git a/net-misc/networkmanager-vpnc/ChangeLog b/net-misc/networkmanager-vpnc/ChangeLog
index 7f4f3e3d10cb..d7660eaea58c 100644
--- a/net-misc/networkmanager-vpnc/ChangeLog
+++ b/net-misc/networkmanager-vpnc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/networkmanager-vpnc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-vpnc/ChangeLog,v 1.14 2011/08/16 10:06:55 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-vpnc/ChangeLog,v 1.15 2011/08/23 23:18:43 nirbheek Exp $
+
+*networkmanager-vpnc-0.9.0 (23 Aug 2011)
+
+  23 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  -networkmanager-vpnc-0.8.ebuild, -networkmanager-vpnc-0.8.1.ebuild,
+  -networkmanager-vpnc-0.9_rc2.ebuild, +networkmanager-vpnc-0.9.0.ebuild:
+  Bump to 0.9, remove old
 
   16 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
   networkmanager-vpnc-0.9_rc2.ebuild:
diff --git a/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.8.1.ebuild b/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.8.1.ebuild
deleted file mode 100644
index 8e1308219b26..000000000000
--- a/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.8.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.8.1.ebuild,v 1.2 2011/03/29 12:52:53 angelos Exp $
-
-EAPI="2"
-
-inherit eutils gnome.org
-
-# NetworkManager likes itself with capital letters
-MY_PN="${PN/networkmanager/NetworkManager}"
-
-DESCRIPTION="NetworkManager VPNC plugin"
-HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
-SRC_URI="${SRC_URI//${PN}/${MY_PN}}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnome"
-
-RDEPEND="
-	>=net-misc/networkmanager-${PV}
-	>=dev-libs/dbus-glib-0.74
-	>=net-misc/vpnc-0.5
-	gnome? (
-		>=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
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-# XXX: https://bugzilla.gnome.org/show_bug.cgi?id=608348
-RESTRICT="test"
-
-src_configure() {
-	ECONF="--disable-more-warnings
-		$(use_with 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-vpnc/networkmanager-vpnc-0.8.ebuild b/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.8.ebuild
deleted file mode 100644
index 82ff8225282d..000000000000
--- a/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.8.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.8.ebuild,v 1.2 2011/03/29 12:52:53 angelos Exp $
-
-EAPI="2"
-
-inherit eutils gnome.org
-
-# NetworkManager likes itself with capital letters
-MY_PN="${PN/networkmanager/NetworkManager}"
-
-DESCRIPTION="NetworkManager VPNC plugin"
-HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
-SRC_URI="${SRC_URI//${PN}/${MY_PN}}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnome"
-
-RDEPEND="
-	>=net-misc/networkmanager-${PV}
-	>=dev-libs/dbus-glib-0.74
-	>=net-misc/vpnc-0.5
-	gnome? (
-		>=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
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-# XXX: https://bugzilla.gnome.org/show_bug.cgi?id=608348
-RESTRICT="test"
-
-src_configure() {
-	ECONF="--disable-more-warnings
-		$(use_with 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-vpnc/networkmanager-vpnc-0.9_rc2.ebuild b/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.9.0.ebuild
index 3355a07f455d..0cd814448b1e 100644
--- a/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.9_rc2.ebuild
+++ b/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.9.0.ebuild
@@ -1,19 +1,14 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.9_rc2.ebuild,v 1.2 2011/08/16 10:06:55 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.9.0.ebuild,v 1.1 2011/08/23 23:18:43 nirbheek Exp $
 
 EAPI="4"
-GNOME_TARBALL_SUFFIX="bz2"
 GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-GNOME_ORG_PVP="0.8"
-REAL_PV="0.8.999"
 
 inherit gnome.org
 
 DESCRIPTION="NetworkManager VPNC plugin"
 HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
-# Replace our fake _rc version with the actual version
-SRC_URI="${SRC_URI//${PV}/${REAL_PV}}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -34,9 +29,6 @@ DEPEND="${RDEPEND}
 	dev-util/intltool
 	dev-util/pkgconfig"
 
-# Replace our fake _rc version with the actual version
-S="${WORKDIR}/${GNOME_ORG_MODULE}-${REAL_PV}"
-
 # XXX: https://bugzilla.gnome.org/show_bug.cgi?id=608348
 RESTRICT="test"
 
@@ -44,7 +36,7 @@ src_configure() {
 	ECONF="--disable-more-warnings
 		--disable-static
 		--with-dist-version=Gentoo
-		--with-gtkver=3.0
+		--with-gtkver=3
 		$(use_with gnome)
 		$(use_with test tests)"