Gentoo Archives: gentoo-commits

From: "Jim Ramsay (lack)" <lack@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: vim.eclass
Date: Mon, 28 Nov 2011 18:14:16
Message-Id: 20111128181342.29EBB2004B@flycatcher.gentoo.org
1 lack 11/11/28 18:13:42
2
3 Modified: vim.eclass
4 Log:
5 Migrating vim.eclass from bash-completion.eclass to bash-completion-r1.eclass
6
7 Also removing old blocker on 'app-vim/vimspell' which is no longer in the tree.
8
9 Revision Changes Path
10 1.201 eclass/vim.eclass
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.201&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.201&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?r1=1.200&r2=1.201
15
16 Index: vim.eclass
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v
19 retrieving revision 1.200
20 retrieving revision 1.201
21 diff -u -r1.200 -r1.201
22 --- vim.eclass 20 Aug 2011 15:46:21 -0000 1.200
23 +++ vim.eclass 28 Nov 2011 18:13:42 -0000 1.201
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2011 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.200 2011/08/20 15:46:21 lack Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.201 2011/11/28 18:13:42 lack Exp $
29
30 # Authors:
31 # Jim Ramsay <lack@g.o>
32 @@ -31,7 +31,7 @@
33 PYTHON_USE_WITH_OPT="python"
34 PYTHON_USE_WITH="threads"
35 fi
36 -inherit eutils vim-doc flag-o-matic versionator fdo-mime bash-completion prefix python
37 +inherit eutils vim-doc flag-o-matic versionator fdo-mime bash-completion-r1 prefix python
38
39 HOMEPAGE="http://www.vim.org/"
40 SLOT="0"
41 @@ -95,7 +95,6 @@
42 acl? ( kernel_linux? ( sys-apps/acl ) )
43 ruby? ( =dev-lang/ruby-1.8* )
44 !<app-vim/align-30-r1
45 - !app-vim/vimspell
46 !<app-vim/vimbuddy-0.9.1-r1
47 !<app-vim/autoalign-11
48 !<app-vim/supertab-0.41"
49 @@ -625,9 +624,9 @@
50
51 # bash completion script, bug #79018.
52 if [[ ${MY_PN} == "vim-core" ]] ; then
53 - dobashcompletion "${FILESDIR}"/xxd-completion xxd
54 + newbashcomp "${FILESDIR}"/xxd-completion xxd
55 else
56 - dobashcompletion "${FILESDIR}"/${MY_PN}-completion ${MY_PN}
57 + newbashcomp "${FILESDIR}"/${MY_PN}-completion ${MY_PN}
58 fi
59 # We shouldn't be installing the ex or view man page symlinks, as they
60 # are managed by eselect-vi
61 @@ -723,12 +722,6 @@
62
63 echo
64
65 - # Display bash-completion message
66 - if [[ ${MY_PN} == "vim-core" ]] ; then
67 - export BASHCOMPLETION_NAME="xxd"
68 - fi
69 - bash-completion_pkg_postinst
70 -
71 # Make convenience symlinks
72 if [[ ${MY_PN} != "vim-core" ]] ; then
73 # But only for vim/gvim, bug #252724