summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2014-10-13 21:13:29 +0000
committerTim Harder <radhermit@gentoo.org>2014-10-13 21:13:29 +0000
commit3a639b895fec5e56f523eb672fc86c6827e39024 (patch)
tree18f31831381ededb171b38aaf06c16b0cedce44e /app-editors
parentRemove the emul-linux-x86 dependency since the package lists no extra native ... (diff)
downloadgentoo-2-3a639b895fec5e56f523eb672fc86c6827e39024.tar.gz
gentoo-2-3a639b895fec5e56f523eb672fc86c6827e39024.tar.bz2
gentoo-2-3a639b895fec5e56f523eb672fc86c6827e39024.zip
Sync live/release changes.
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
Diffstat (limited to 'app-editors')
-rw-r--r--app-editors/vim/ChangeLog6
-rw-r--r--app-editors/vim/vim-7.4.475.ebuild4
-rw-r--r--app-editors/vim/vim-9999.ebuild4
3 files changed, 10 insertions, 4 deletions
diff --git a/app-editors/vim/ChangeLog b/app-editors/vim/ChangeLog
index 3db0b2c9475c..83b23fdf0a31 100644
--- a/app-editors/vim/ChangeLog
+++ b/app-editors/vim/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-editors/vim
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.473 2014/10/13 21:09:46 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.474 2014/10/13 21:13:29 radhermit Exp $
+
+ 13 Oct 2014; Tim Harder <radhermit@gentoo.org> vim-7.4.475.ebuild,
+ vim-9999.ebuild:
+ Sync live/release changes.
*vim-7.4.475 (13 Oct 2014)
diff --git a/app-editors/vim/vim-7.4.475.ebuild b/app-editors/vim/vim-7.4.475.ebuild
index 265b5b7f841e..52b75dbaa59d 100644
--- a/app-editors/vim/vim-7.4.475.ebuild
+++ b/app-editors/vim/vim-7.4.475.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-7.4.475.ebuild,v 1.1 2014/10/13 21:09:46 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-7.4.475.ebuild,v 1.2 2014/10/13 21:13:29 radhermit Exp $
EAPI=5
VIM_VERSION="7.4"
@@ -333,6 +333,8 @@ src_install() {
fi
newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
+ # keep in sync with 'complete ... -F' list
+ bashcomp_alias vim ex vi view rvim rview vimdiff
# We shouldn't be installing the ex or view man page symlinks, as they
# are managed by eselect-vi
diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild
index 0abf8f242f73..8e1293fc1c43 100644
--- a/app-editors/vim/vim-9999.ebuild
+++ b/app-editors/vim/vim-9999.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-9999.ebuild,v 1.15 2014/10/11 18:34:46 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-9999.ebuild,v 1.16 2014/10/13 21:13:29 radhermit Exp $
EAPI=5
VIM_VERSION="7.4"
-PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
PYTHON_REQ_USE=threads
inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 python-single-r1