Version bump with UI fixes. Drop old.

Package-Manager: portage-2.2.0_alpha125/cvs/Linux x86_64

4 files changed, 9 insertions, 111 deletions

diff --git a/net-misc/networkmanager-pptp/ChangeLog b/net-misc/networkmanager-pptp/ChangeLog
index 5ca00acf5385..295acabc01a0 100644
--- a/net-misc/networkmanager-pptp/ChangeLog
+++ b/net-misc/networkmanager-pptp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/networkmanager-pptp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-pptp/ChangeLog,v 1.25 2012/08/17 09:40:22 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-pptp/ChangeLog,v 1.26 2012/09/13 09:55:21 tetromino Exp $
+
+*networkmanager-pptp-0.9.6.0 (13 Sep 2012)
+
+  13 Sep 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -networkmanager-pptp-0.8.2.ebuild, -networkmanager-pptp-0.9.0.ebuild,
+  -networkmanager-pptp-0.9.2.0.ebuild, +networkmanager-pptp-0.9.6.0.ebuild:
+  Version bump with UI fixes. Drop old.
 
   17 Aug 2012; Johannes Huber <johu@gentoo.org>
   networkmanager-pptp-0.9.4.0.ebuild:
diff --git a/net-misc/networkmanager-pptp/networkmanager-pptp-0.8.2.ebuild b/net-misc/networkmanager-pptp/networkmanager-pptp-0.8.2.ebuild
deleted file mode 100644
index a51e5ba2905c..000000000000
--- a/net-misc/networkmanager-pptp/networkmanager-pptp-0.8.2.ebuild
+++ /dev/null
@@ -1,61 +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-pptp/networkmanager-pptp-0.8.2.ebuild,v 1.5 2012/08/14 04:28:49 tetromino Exp $
-
-EAPI="2"
-
-inherit eutils gnome.org
-
-# NetworkManager likes itself with capital letters
-MY_PN="${PN/networkmanager/NetworkManager}"
-
-DESCRIPTION="NetworkManager PPTP 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 test"
-
-RDEPEND="
-	>=net-misc/networkmanager-${PV}
-	>=dev-libs/dbus-glib-0.74
-	net-dialup/ppp
-	net-dialup/pptpclient
-	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}"
-
-src_prepare() {
-	# Drop DEPRECATED flags, bug #385503
-	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
-		auth-dialog/Makefile.am auth-dialog/Makefile.in \
-		common-gnome/Makefile.am common-gnome/Makefile.in \
-		properties/Makefile.am properties/Makefile.in \
-		src/Makefile.am src/Makefile.in || die
-}
-
-src_configure() {
-	ECONF="--disable-more-warnings
-		$(use_with test tests)
-		$(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-pptp/networkmanager-pptp-0.9.0.ebuild b/net-misc/networkmanager-pptp/networkmanager-pptp-0.9.0.ebuild
deleted file mode 100644
index 0163e7d18ebd..000000000000
--- a/net-misc/networkmanager-pptp/networkmanager-pptp-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-pptp/networkmanager-pptp-0.9.0.ebuild,v 1.3 2012/08/14 04:28:49 tetromino Exp $
-
-EAPI="4"
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-
-inherit gnome.org
-
-DESCRIPTION="NetworkManager PPTP plugin"
-HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk test"
-
-RDEPEND="
-	>=net-misc/networkmanager-${PV}
-	>=dev-libs/dbus-glib-0.74
-	net-dialup/ppp
-	net-dialup/pptpclient
-	gtk? (
-		>=x11-libs/gtk+-2.91.4:3
-		gnome-base/gnome-keyring
-	)"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	dev-util/intltool
-	virtual/pkgconfig"
-
-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-pptp/networkmanager-pptp-0.9.2.0.ebuild b/net-misc/networkmanager-pptp/networkmanager-pptp-0.9.6.0.ebuild
index b910e4a65dca..8d12e897cc5a 100644
--- a/net-misc/networkmanager-pptp/networkmanager-pptp-0.9.2.0.ebuild
+++ b/net-misc/networkmanager-pptp/networkmanager-pptp-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-pptp/networkmanager-pptp-0.9.2.0.ebuild,v 1.4 2012/08/14 04:28:49 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-pptp/networkmanager-pptp-0.9.6.0.ebuild,v 1.1 2012/09/13 09:55:21 tetromino Exp $
 
 EAPI="4"
 GNOME_ORG_MODULE="NetworkManager-${PN##*-}"