Version bump and remove old.

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

4 files changed, 13 insertions, 50 deletions

diff --git a/app-vim/conque/ChangeLog b/app-vim/conque/ChangeLog
index cbff0b2f0b77..f6f797c66d24 100644
--- a/app-vim/conque/ChangeLog
+++ b/app-vim/conque/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-vim/conque
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/conque/ChangeLog,v 1.4 2010/11/22 21:29:03 radhermit Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-vim/conque/ChangeLog,v 1.5 2011/04/14 18:57:21 radhermit Exp $
+
+*conque-2.1 (14 Apr 2011)
+
+  14 Apr 2011; Tim Harder <radhermit@gentoo.org> -conque-1.0.ebuild,
+  -conque-1.1.ebuild, -conque-1.2.ebuild, +conque-2.1.ebuild:
+  Version bump and remove old.
 
 *conque-2.0 (22 Nov 2010)
 
diff --git a/app-vim/conque/conque-1.1.ebuild b/app-vim/conque/conque-1.1.ebuild
deleted file mode 100644
index 8af6049dc9f4..000000000000
--- a/app-vim/conque/conque-1.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/conque/conque-1.1.ebuild,v 1.1 2010/06/02 23:38:30 spatz Exp $
-
-EAPI=3
-
-VIM_PLUGIN_VIM_VERSION="7.1"
-inherit vim-plugin
-
-MY_P="${PN}_${PV}"
-
-DESCRIPTION="vim plugin: Run interactive commands inside a Vim buffer"
-HOMEPAGE="http://code.google.com/p/conque/"
-SRC_URI="http://${PN}.googlecode.com/files/${MY_P}.tar.gz"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-VIM_PLUGIN_HELPFILES="ConqueTerm"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/app-vim/conque/conque-1.2.ebuild b/app-vim/conque/conque-1.2.ebuild
deleted file mode 100644
index b6beb70fd418..000000000000
--- a/app-vim/conque/conque-1.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/conque/conque-1.2.ebuild,v 1.1 2010/11/11 21:04:36 radhermit Exp $
-
-EAPI=3
-
-VIM_PLUGIN_VIM_VERSION="7.1"
-inherit vim-plugin
-
-MY_P="${PN}_${PV}"
-
-DESCRIPTION="vim plugin: Run interactive commands inside a Vim buffer"
-HOMEPAGE="http://code.google.com/p/conque/"
-SRC_URI="http://${PN}.googlecode.com/files/${MY_P}.tar.gz"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-VIM_PLUGIN_HELPFILES="ConqueTerm"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/app-vim/conque/conque-1.0.ebuild b/app-vim/conque/conque-2.1.ebuild
index 14fd7e2d0011..13e5fb4e4ee5 100644
--- a/app-vim/conque/conque-1.0.ebuild
+++ b/app-vim/conque/conque-2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/conque/conque-1.0.ebuild,v 1.1 2010/05/07 19:06:36 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/conque/conque-2.1.ebuild,v 1.1 2011/04/14 18:57:21 radhermit Exp $
 
 EAPI=3
 
@@ -16,10 +16,9 @@ LICENSE="MIT"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
+RDEPEND="|| ( app-editors/vim[python] app-editors/gvim[python] )
+	>=dev-lang/python-2.3"
+
 VIM_PLUGIN_HELPFILES="ConqueTerm"
 
 S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	rm "${S}/conque_term.vba"
-}