Version bump and remove old.

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

5 files changed, 24 insertions, 65 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/Manifest b/app-vim/conque/Manifest
index 9715d23a80c5..d140090a9b4e 100644
--- a/app-vim/conque/Manifest
+++ b/app-vim/conque/Manifest
@@ -1,24 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST conque_1.0.tar.gz 29844 RMD160 7670c5d55a470f11cfbdc8098475bfd3cab49623 SHA1 9dc8dcd546893024e8bc31421a5278d98c0c7c4b SHA256 58231b4ccf7391172da6d6c6b20088fe3b615cefdfd036139500a0a75e5c7c30
-DIST conque_1.1.tar.gz 16907 RMD160 7d23d5663ea7ff5009d6f13df7c232254da1a91f SHA1 1ceaf6eccf44d2b44a91d461f2cf41e6c98e4311 SHA256 e6a577988d5db787ce8f76aa6c79ad3e1adb9d2e1676c8f6654beb5004cc46ca
-DIST conque_1.2.tar.gz 21482 RMD160 e4f830501da2a0e9f27e88d0e9df7ae36c53fe84 SHA1 989a07739f3c8a6edab0e7ed9ca5f437ef69337b SHA256 f66c5e905441f589e5638f44ba9c81453331772eb761eeea77fe5981e3f00f51
 DIST conque_2.0.tar.gz 42652 RMD160 2161f0915a68fdd4007b095f247d71f4f9266564 SHA1 aa9644a275104ebfb2bf0636d41d59b513baa5e7 SHA256 7025181d666914102961356d71fbfc58ce5e2b07f09592c7474671f3cb7a36fc
-EBUILD conque-1.0.ebuild 615 RMD160 b9b3bc9d445203096b695ab1de41fa38a1b3f607 SHA1 49902584349e484ac130020edbd9f733ae5d3c4c SHA256 0aae882f25bec54308d74deb3b14b8548f5b87b08d8f781e31696991f5c6148e
-EBUILD conque-1.1.ebuild 569 RMD160 5fd9033b2db4e4d0266d6f8bdedd2ff507dc70c8 SHA1 518b94d40bbb5f4a26707bd4f73a1da49bbe40f1 SHA256 21423d115cca03b417041a34adb6748723f198925db36ec1abbb02de64ab8dad
-EBUILD conque-1.2.ebuild 573 RMD160 073a4ab102a7b70f8b5ccbc08e9527b1ed4eba30 SHA1 bef740ff8cf05918e31c55835397f641a0193d82 SHA256 3cb049c81aae96bc8c9807720aae89adff566de220e7f86ce9962745b0a6b46c
+DIST conque_2.1.tar.gz 53378 RMD160 6c574514c6055b65578616d736440ebad10e4dfb SHA1 139901d5ea5438505233240e29756c4f6baa6d2d SHA256 03293ab4db244bb4f901bc14d4f678c9c8c6557d350165b0170d7e57152b7347
 EBUILD conque-2.0.ebuild 663 RMD160 3ddc1de8a270d8993e22b9f55f3c2cad3a71aacc SHA1 9d1437843f53096531c7e6e00b5d1e6245198b6f SHA256 839de2ec98212a0d29a5bafd8c05aeb163d0a7dfaab77d0e81d5e59f65d283f7
-MISC ChangeLog 761 RMD160 151b4eca7b2ffeed5d80517ea862a296ca77eca7 SHA1 66da645adfa5545b22c8a2660a9764b7c4a61a1e SHA256 9b490650eddcc398275a8b29359167ed6636b16e5c266306c17f5a82bba22920
+EBUILD conque-2.1.ebuild 663 RMD160 cad5a1eea56156c5a5e2fdcefed33575b5e4e382 SHA1 3c7e3dc72e5fa75c54203c98c77528991aff9d1a SHA256 b1b39dca738367cde695cf091dab7318c8a0283afb5f3ab4970fc9560040df50
+MISC ChangeLog 951 RMD160 8ea9167437020b41ba16b9f4bb2acfd5604b05aa SHA1 766a9994602b64e0c3d7b4b76ecf5ac526e7b970 SHA256 363ee396a6c552e45043c4cf22ce57c5859a2de49f86911f08a8b26e2524b600
 MISC metadata.xml 246 RMD160 9bc6a2839df59678db2e5574d2935b32222ed6fa SHA1 d57d6dbf4fe4251fe9992bd3d669802fb2575bdc SHA256 5041cc4efbb237268c8436fb9a88a4e42a5b50b0219c47644198aeb4db168fd1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJM6uCpAAoJEEqz6FtPBkyj9xkIAIE4KN2362AN1wyLiCGonSHX
-URj+w8zFSd456hDXw2voLB1ZyaJsEfHAdvJX6V9eS2dbV1BIbfg40++J6bWI7aDe
-1XBwA55lHfX61lJUF9tpEFvAV3jzoQ8HfNjWXV/v4kVxbFpqYluEfbAiWCM3ydwt
-hLVgJpukUJji6RQzJoDWscf6lDPMHmPr6LsO1L6uIxlYuAPm11Sd0XzKBkLAAbTL
-qrrgySeO00+LsRdO0fAJM3VOSBl0yH+/TVlAFNxy7T5ezZ6x/0gY60cfgKM8I3dT
-Nu9xBs5172UbRSzMOl8+erdI1KNbxxUAwzvSHmw0lWo3puP5VNHgkiFaLtv/wDQ=
-=m4/8
+iQEcBAEBAgAGBQJNp0OaAAoJEEqz6FtPBkyj1mQIALKkjS1cDSI4wXMdhHgf2exj
+Cuqr0Vghm6EsqA3+A85eN+HMvwdT1UkAnmaK9us70jp8F1a6+mz9nbDt5YhjOqqB
+NJPvtfYQCgUHBQTEXLSxFjyDX/oJJ9zXezz3gLzH6F29Y9L3QS6dbd0g0hhGjGoT
+oxe87GaMyhkztaGpsQ5VaD0t7bXg7i9E1+GeYXAkAFwqpwxAedt08aQS9YwUU/7b
+rKB0+Z79xYxo4DNyltB+2tPcrRh8CbZzJKlCqAMDLFWOWD0kRSTN6Cvb6t30+waj
+npnMXfiYtNSzUMv+EiW+KDxR+9rUX7OgItmgsbTX+xycgj2xJ6yGbLK8WA1yb64=
+=jwUs
 -----END PGP SIGNATURE-----
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"
-}