From: Jim Ramsay <lack@gentoo.org>
Date: Mon, 28 Nov 2011 18:13:42 +0000 (+0000)
Subject: Migrating vim.eclass from bash-completion.eclass to bash-completion-r1.eclass
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=6338c6804d2dc8817a3bad2cf91c402ae6132141;p=gentoo.git

Migrating vim.eclass from bash-completion.eclass to bash-completion-r1.eclass

Also removing old blocker on 'app-vim/vimspell' which is no longer in the tree.
---

diff --git a/eclass/vim.eclass b/eclass/vim.eclass
index f4256a2f86f0..f6b86d42b54d 100644
--- a/eclass/vim.eclass
+++ b/eclass/vim.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.200 2011/08/20 15:46:21 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.201 2011/11/28 18:13:42 lack Exp $
 
 # Authors:
 # 	Jim Ramsay <lack@gentoo.org>
@@ -31,7 +31,7 @@ if [[ ${MY_PN} != "vim-core" ]] ; then
 	PYTHON_USE_WITH_OPT="python"
 	PYTHON_USE_WITH="threads"
 fi
-inherit eutils vim-doc flag-o-matic versionator fdo-mime bash-completion prefix python
+inherit eutils vim-doc flag-o-matic versionator fdo-mime bash-completion-r1 prefix python
 
 HOMEPAGE="http://www.vim.org/"
 SLOT="0"
@@ -95,7 +95,6 @@ else
 		acl?     ( kernel_linux? ( sys-apps/acl ) )
 		ruby?    ( =dev-lang/ruby-1.8* )
 		!<app-vim/align-30-r1
-		!app-vim/vimspell
 		!<app-vim/vimbuddy-0.9.1-r1
 		!<app-vim/autoalign-11
 		!<app-vim/supertab-0.41"
@@ -625,9 +624,9 @@ vim_src_install() {
 
 	# bash completion script, bug #79018.
 	if [[ ${MY_PN} == "vim-core" ]] ; then
-		dobashcompletion "${FILESDIR}"/xxd-completion xxd
+		newbashcomp "${FILESDIR}"/xxd-completion xxd
 	else
-		dobashcompletion "${FILESDIR}"/${MY_PN}-completion ${MY_PN}
+		newbashcomp "${FILESDIR}"/${MY_PN}-completion ${MY_PN}
 	fi
 	# We shouldn't be installing the ex or view man page symlinks, as they
 	# are managed by eselect-vi
@@ -723,12 +722,6 @@ vim_pkg_postinst() {
 
 	echo
 
-	# Display bash-completion message
-	if [[ ${MY_PN} == "vim-core" ]] ; then
-		export BASHCOMPLETION_NAME="xxd"
-	fi
-	bash-completion_pkg_postinst
-
 	# Make convenience symlinks
 	if [[ ${MY_PN} != "vim-core" ]] ; then
 		# But only for vim/gvim, bug #252724