Add python-3.4 compatibility (bug #530348). Up eselect-vi dependency to the one that actually includes vim-qt as option (bug #526938). Remove old.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x0F9C590B7FF324F6!

5 files changed, 27 insertions, 199 deletions

diff --git a/app-editors/vim-qt/ChangeLog b/app-editors/vim-qt/ChangeLog
index 607f641f2974..5fa74014020c 100644
--- a/app-editors/vim-qt/ChangeLog
+++ b/app-editors/vim-qt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-editors/vim-qt
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-qt/ChangeLog,v 1.9 2014/11/16 01:15:11 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-qt/ChangeLog,v 1.10 2014/11/24 12:51:50 yngwin Exp $
+
+*vim-qt-20140827-r2 (24 Nov 2014)
+
+  24 Nov 2014; Ben de Groot <yngwin@gentoo.org> +vim-qt-20140827-r2.ebuild,
+  -vim-qt-20131004.ebuild, -vim-qt-20140827-r1.ebuild, -vim-qt-20140827.ebuild:
+  Add python-3.4 compatibility (bug #530348). Up eselect-vi dependency to the
+  one that actually includes vim-qt as option (bug #526938). Remove old.
 
   16 Nov 2014; Ben de Groot <yngwin@gentoo.org> vim-qt-20140827-r1.ebuild:
   Add system vimrc, drop gpm use (bug #526938)
diff --git a/app-editors/vim-qt/Manifest b/app-editors/vim-qt/Manifest
index 01b480af4f59..7a05afb5f053 100644
--- a/app-editors/vim-qt/Manifest
+++ b/app-editors/vim-qt/Manifest
@@ -2,29 +2,26 @@
 Hash: SHA256
 
 AUX vim-qt.desktop 189 SHA256 4a5d674a9015c114ee53db25b5a523c3393c909e3efcbc82953fd99737f95a6b SHA512 306540cffeda30908feb478aef0de16c378ccfff93c2be91319750342513c8b1f263ea65fa7e0468fc0d5ce5138b0256640d148eb235edb4948b0bd555c99ea0 WHIRLPOOL a626bc1ccd349316b50ac79ada2ae3eda75937b06662c4c9a940d52b806cd29fe5d5aa5ed071f6dd56ad68b2883f28cf505e8f064d7cae012ad278a0646f0a52
-DIST vim-qt-20131004.tar.gz 12095789 SHA256 791275d708f5de55a210ae13a4962586918f71c004c96ba6090fec98602de926 SHA512 65696d60c478c88b0dfd2e46e75747bc48a3ad535462babf88542a3e78755789594b8b7b39d33eed4eacfc1158293c41eea02bc38aeb02f69674c9e0b061b041 WHIRLPOOL 7fe3bbbf9e27d4dd9247452a5f83ff56166182ae4b7c833ac7052964afcf44d8bd9aba3a866987fcce65a9e81c06df473baacd7b236bea55dbfc81add8504133
 DIST vim-qt-20140827.tar.gz 12251966 SHA256 61eba646bf25fd3caa40943ecd91e5e7a813e11ca71d899e9e844e3f69e97a60 SHA512 0ab352a64f138e68059311908b2e4b0cbbec55c2fa889ff64f863670c3d1ee0022d26877175090d5c256eb1cdfaf7d23d385044a68e2eb8b50b1cdab2a20827f WHIRLPOOL ea397f465902796761c44e6521ab6b2660498d1e3ce4821d3265517ba1c72984b93e580549be921e156771f2ccbb86fce1c830035ad00513eb9e42c1f1ff6abd
-EBUILD vim-qt-20131004.ebuild 2421 SHA256 78c2c1cddee7d880e8b6be2dd8a67bb2c393904a41f949d1d52c7dff270e6ecc SHA512 b10121bce083748a69a9794fedc3a52ade4bfc3510367147b780883596f89d1feb15cff0d64bc99103bb082cae30cd2fc1b85b1a6b52def091e0d9cef7554e01 WHIRLPOOL e638f18ae1d83918f4c3c3961fa3f8970f8054656630b8437b8761ad4a09c3dc7836184c5c06cfc8ec62bdce98ba3a1bb1d7d4177b05ceb5f3d52c06f5212f88
-EBUILD vim-qt-20140827-r1.ebuild 3315 SHA256 23105f31e0af13c2ff54915b167d8b5727aa044d6ec82fae765d292e68177336 SHA512 b2020aed243a6ceb8b23b24d8f6774f7b74c1a833d6aac3589d803401a315bd3e91b4c526cc57917e2bdc9b6909d9fdb276e11962195945f7da0caeb04f5e90b WHIRLPOOL 5286f51f575c3b4f549d10ebf643db083bfc74deb11416adbaa294abbc4006f7a553bfc200597293c25f025ba63aabc0d4baaf21750f953bd1aad4d342ffc420
-EBUILD vim-qt-20140827.ebuild 2422 SHA256 702385dc92eece97ebe914009cc33a08cef6940f90b7f06e1c5223c803e28f7d SHA512 490f3126dd7361148ab5d4fbac01ca9faa64eda037f939dc0aa56d32b357fff48648f57c35c94de8299154fffb4951fbf83f6782ae038f4bacbf50c370a4d448 WHIRLPOOL 33052f8dc5ad0846551293a556f8597b9ac1fc0fe1bc01d788ef870470129315b8e87af2cab7b6310365d7a85d72cc84b1d312289c08d9ee0f59dc1442a2f95f
-MISC ChangeLog 1773 SHA256 db87efc0c1fdc322f295127d985170e06b15bc69b8b74afbae759de434d1aee1 SHA512 778f9f9c96bcb6ab328c791d6bfef69cc85d992f8244e0672715adcd9f52689a0cc6dcec0dcccfa2eda1e2ba9bcfddc9a3ab283727601e22c136ff9e675d4bac WHIRLPOOL 5548a56326cf1c7cb611943250f9a3b29874a7ee7b3ddfdf0b4a4c69362efbd279af10455853fd4b77c4277bb70fb1345f29188baad6e9e93889f1029771a267
+EBUILD vim-qt-20140827-r2.ebuild 3327 SHA256 e2bd25e7156eecc54b116ede52196e3b05b83490e386960e8bb0f5a6fef93a1d SHA512 9aca27ebca150fd064ec1f192b3d5c16bb5e2254e7feac03aafdde488fa819c3d06f01574d62c64b665a3af0abb4cd0b1142d48fbc92f22f0eeaf847539c3ef8 WHIRLPOOL ad80cebda714adda6c2e721756ee0921b450b2a5cc7480401da706f08045372b4bd6e282a5f3c63b805f61cc43d6d6f42586f6c182444fe2a0f2e59c6bfc161d
+MISC ChangeLog 2117 SHA256 b74b632c7d6bc223b4557f34888db3ea54ea50bb9eb614661a38aaea5fbd7447 SHA512 b933a9d6687c1c1485488cddd40944f9169d718fbf910a80b1b02f425bed985e0830410d5866d6a51baf9e26f646d21788b1cb6955daedd9fc5d3239c8d2aece WHIRLPOOL 7ee299443fa814e852adeec71952f36d946b98520f53345e304bb9620d8b6ac396281226002a800825d642912fddac41b03572eeafc67501e3c20d1d57e53381
 MISC metadata.xml 361 SHA256 661ac577cc21c0085fdb689a4559a75e24103f63fd06e71a48677dd1db88ae21 SHA512 070c09cef6fdb2187c645d038847fc524d7bea1ccca32f4411b225b1abb05c60b1acfdb9d6fd8e74d2897aea21a485aac1b070fb8ee47f4bc79aad32c0d30867 WHIRLPOOL a5028fd53e73ac4b2012b62159a595704336b299fde0393e8d7794d66744b19dc161c7b3e0888360b6c25c676c757ecc8158ca537d5f44475685f8fa15d29278
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUZ/qlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUcynsXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyOTZFRkUxOEEyRDM1Qzc2QTY0M0Y2QjQw
-RjlDNTkwQjdGRjMyNEY2AAoJEA+cWQt/8yT2nkIP/RmJZckoO6/OAb4KYLM2xizf
-cisXUIeVxK7sft9r1l1PgOvbWVAlMiefHiHB3hZqmHwQY9AelsYu4YWeXghCFnc2
-fvtqsOj+FqLP4mMZZt1YyQJ0gmaucS8NMyEItwJoFMP34k5nD9k2ZhFcnC3Rrp//
-bTxa5wx34dETWvZVUe9kFLZ0D/i72H3CmKSEMDhPrARBl/cfzQToXoVT3O9U+SmC
-lkpMUt6VUqmZlF4mB22RGbSXSaG/2rPJQjCtc3wUWBxVRye6yMyi6pVbmmApyv8v
-1q1N1M+xLdD6bxwBUKXC8AUK+qO4i38R4fymFWXzStvEDY2YKGJmjQ1bg0vAT+U0
-PpZpxxb+drC+Ms4P6ow4iw70MwKwye/zqorxTObgm1bf1xDpPf26hjZcxjJp57bj
-a0z4xdsiqPfQXy0Qvu5WH63Y3zm6uT0S6QtaopWkK9nVvvhESrI5n5uoo5wI35D6
-0EngdqV7G4Nj0Fj84VWpv0IiMaa6MxkYtbzSMqOeBzorgv62PiuNr9woc90fp64o
-fNNV6JMBJO1WBZoDO1ictIc6n8NgGTgKOJXYX59J1Pd0zBGWWlWHDjnfsS9v0Zm3
-DubPn0+4q+KBp5sYFIAVkZEAfSMOEe5MntvQuhcvDABuf1cL82lu/x8ZGweQyL3I
-dTOR+iYFnLPdm9VUZRTd
-=ZpEt
+RjlDNTkwQjdGRjMyNEY2AAoJEA+cWQt/8yT2i8IQALGQS0ELI5MsxhxBkjZ0zo88
+vFab12x81SW+i0CmYpO5MmC1gdoUdYtkgQRO6K7WI475uQu2iR4CLZoUnQBj7Bv1
+EReV3eC7zhyZ5bFsEaRdg8TO7L/zpr/XpWAO1acDRQDvyHnLCTJMD7OTkJWIAsGO
+TVtuIrBm+6442Ye6hrsjF3Bm2gSqwIMUM+A7mBzcGZmXfXJvlRuu2kyZHVYvou2a
+W6qO9qe2m1G3hVU7XT1uuQPE1CTfeC4SVLYYOaTJ/PcXe1r4Krf8ycnuVeMuvP54
+08V2Wg4UUCtniAOTyE8PUFPfKs2+8B+CT64ymGXYLn7i3VHn70G87x0jHL69G1QO
+FHOTGkYsrTMqP45ZzGtnoUcjvK/nbjqBJu+m4iQoAW8j7pSxpRBrMyxp6UyMoxyy
+E1zfhse8o5jlMwtd+I1hYqLOW5gPcVhzBc3btzaoSxkohiH0/O0Gu0rQtfNkWneo
+yJPu8VjRX6hezvmcw7gf52M2/CJ4XQTI9ImGZXFLtJgXyytqyOtWLtR8hlWHZ8qC
+1pUq93dAB9Vr/BJTGotciCT96WBe7GST324idxKiAQMBywA+kgqXfpO4JFIMlgFG
+Ahy6nBX5OD7F/tAqgvNnMSDmPvjIFVWiZtPWzdP1dJIRGnw0zhSY540IVb4RY8DX
+u9X2Em9BK2yAaBf+yIsE
+=SDyp
 -----END PGP SIGNATURE-----
diff --git a/app-editors/vim-qt/vim-qt-20131004.ebuild b/app-editors/vim-qt/vim-qt-20131004.ebuild
deleted file mode 100644
index 085fdea9b0b3..000000000000
--- a/app-editors/vim-qt/vim-qt-20131004.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-qt/vim-qt-20131004.ebuild,v 1.1 2013/10/25 16:34:26 yngwin Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_REQ_USE="threads"
-inherit eutils fdo-mime flag-o-matic python-single-r1
-
-DESCRIPTION="Qt GUI version of the Vim text editor"
-HOMEPAGE="https://bitbucket.org/equalsraf/vim-qt/wiki/Home"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-2
-	EGIT_REPO_URI="https://bitbucket.org/equalsraf/${PN}.git
-		git://github.com/equalsraf/${PN}.git
-		git://gitorious.org/${PN}/${PN}.git"
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/equalsraf/${PN}/archive/package-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PN}-package-${PV}"
-fi
-
-LICENSE="vim"
-SLOT="0"
-IUSE="acl cscope debug gpm lua luajit nls perl python ruby"
-
-RDEPEND="app-admin/eselect-vi
-	>=app-editors/vim-core-7.4.22[acl?]
-	sys-libs/ncurses
-	>=dev-qt/qtcore-4.7.0:4
-	>=dev-qt/qtgui-4.7.0:4
-	acl? ( kernel_linux? ( sys-apps/acl ) )
-	cscope? ( dev-util/cscope )
-	gpm? ( sys-libs/gpm )
-	lua? ( luajit? ( dev-lang/luajit )
-		!luajit? ( dev-lang/lua ) )
-	nls? ( virtual/libintl )
-	perl? ( dev-lang/perl )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( || ( dev-lang/ruby:2.0 dev-lang/ruby:1.9 ) )"
-DEPEND="${RDEPEND}
-	dev-util/ctags
-	sys-devel/autoconf
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	export LC_COLLATE="C" # prevent locale brokenness bug #82186
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	use debug && append-flags "-DDEBUG"
-
-	local myconf="--with-features=huge --enable-multibyte"
-	myconf+=" $(use_enable acl)"
-	myconf+=" $(use_enable gpm)"
-	myconf+=" $(use_enable nls)"
-	myconf+=" $(use_enable lua luainterp)"
-	myconf+=" $(use_with luajit)"
-	myconf+=" $(use_enable perl perlinterp)"
-	myconf+=" $(use_enable python pythoninterp)"
-	myconf+=" $(use_enable ruby rubyinterp)"
-	myconf+=" --enable-gui=qt --with-vim-name=qvim --with-x"
-
-	if ! use cscope ; then
-		sed -i -e '/# define FEAT_CSCOPE/d' src/feature.h || die 'sed failed'
-	fi
-	econf ${myconf}
-}
-
-src_install() {
-	dobin src/qvim
-	doicon -s 64 src/qt/icons/vim-qt.png
-	make_desktop_entry qvim Vim-qt vim-qt "Qt;TextEditor;Development;"
-}
-
-pkg_postinst() {
-	fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_mime_database_update
-}
diff --git a/app-editors/vim-qt/vim-qt-20140827-r1.ebuild b/app-editors/vim-qt/vim-qt-20140827-r2.ebuild
index 8329354a12dd..bfca3eb34f01 100644
--- a/app-editors/vim-qt/vim-qt-20140827-r1.ebuild
+++ b/app-editors/vim-qt/vim-qt-20140827-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-qt/vim-qt-20140827-r1.ebuild,v 1.2 2014/11/16 01:15:11 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-qt/vim-qt-20140827-r2.ebuild,v 1.1 2014/11/24 12:51:50 yngwin Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 PYTHON_REQ_USE="threads"
 inherit eutils fdo-mime flag-o-matic prefix python-single-r1
 
@@ -31,7 +31,7 @@ IUSE="acl cscope debug lua luajit nls perl python racket ruby"
 REQUIRED_USE="luajit? ( lua )
 	python? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND="app-admin/eselect-vi
+RDEPEND=">=app-admin/eselect-vi-1.1.8
 	>=app-editors/vim-core-7.4.417[acl?]
 	sys-libs/ncurses
 	>=dev-qt/qtcore-4.7.0:4
diff --git a/app-editors/vim-qt/vim-qt-20140827.ebuild b/app-editors/vim-qt/vim-qt-20140827.ebuild
deleted file mode 100644
index 1d58612b2998..000000000000
--- a/app-editors/vim-qt/vim-qt-20140827.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-qt/vim-qt-20140827.ebuild,v 1.1 2014/10/25 02:10:14 yngwin Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_REQ_USE="threads"
-inherit eutils fdo-mime flag-o-matic python-single-r1
-
-DESCRIPTION="Qt GUI version of the Vim text editor"
-HOMEPAGE="https://bitbucket.org/equalsraf/vim-qt/wiki/Home"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-2
-	EGIT_REPO_URI="https://bitbucket.org/equalsraf/${PN}.git
-		git://github.com/equalsraf/${PN}.git
-		git://gitorious.org/${PN}/${PN}.git"
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/equalsraf/${PN}/archive/package-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PN}-package-${PV}"
-fi
-
-LICENSE="vim"
-SLOT="0"
-IUSE="acl cscope debug gpm lua luajit nls perl python ruby"
-
-RDEPEND="app-admin/eselect-vi
-	>=app-editors/vim-core-7.4.417[acl?]
-	sys-libs/ncurses
-	>=dev-qt/qtcore-4.7.0:4
-	>=dev-qt/qtgui-4.7.0:4
-	acl? ( kernel_linux? ( sys-apps/acl ) )
-	cscope? ( dev-util/cscope )
-	gpm? ( sys-libs/gpm )
-	lua? ( luajit? ( dev-lang/luajit )
-		!luajit? ( dev-lang/lua ) )
-	nls? ( virtual/libintl )
-	perl? ( dev-lang/perl )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( || ( dev-lang/ruby:2.0 dev-lang/ruby:1.9 ) )"
-DEPEND="${RDEPEND}
-	dev-util/ctags
-	sys-devel/autoconf
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	export LC_COLLATE="C" # prevent locale brokenness bug #82186
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	use debug && append-flags "-DDEBUG"
-
-	local myconf="--with-features=huge --enable-multibyte"
-	myconf+=" $(use_enable acl)"
-	myconf+=" $(use_enable gpm)"
-	myconf+=" $(use_enable nls)"
-	myconf+=" $(use_enable lua luainterp)"
-	myconf+=" $(use_with luajit)"
-	myconf+=" $(use_enable perl perlinterp)"
-	myconf+=" $(use_enable python pythoninterp)"
-	myconf+=" $(use_enable ruby rubyinterp)"
-	myconf+=" --enable-gui=qt --with-vim-name=qvim --with-x"
-
-	if ! use cscope ; then
-		sed -i -e '/# define FEAT_CSCOPE/d' src/feature.h || die 'sed failed'
-	fi
-	econf ${myconf}
-}
-
-src_install() {
-	dobin src/qvim
-	doicon -s 64 src/qt/icons/vim-qt.png
-	make_desktop_entry qvim Vim-qt vim-qt "Qt;TextEditor;Development;"
-}
-
-pkg_postinst() {
-	fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_mime_database_update
-}