Fixed vimoutliner plugin loading, and cleaned up the install to stop using 'cp' everywhere

(Portage version: 2.2_rc16/cvs/Linux 2.6.26-gentoo-r1 x86_64)

3 files changed, 54 insertions, 41 deletions

diff --git a/app-vim/vimoutliner/ChangeLog b/app-vim/vimoutliner/ChangeLog
index c0b5fd56a084..c702109e1311 100644
--- a/app-vim/vimoutliner/ChangeLog
+++ b/app-vim/vimoutliner/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-vim/vimoutliner
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/vimoutliner/ChangeLog,v 1.15 2008/12/02 22:53:15 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/vimoutliner/ChangeLog,v 1.16 2008/12/03 20:42:39 lack Exp $
+
+*vimoutliner-0.3.4-r2 (03 Dec 2008)
+
+  03 Dec 2008; Jim Ramsay <lack@gentoo.org> -vimoutliner-0.3.4-r1.ebuild,
+  +vimoutliner-0.3.4-r2.ebuild:
+  Fixed vimoutliner plugin loading, and cleaned up the install to stop using
+  'cp' everywhere
 
 *vimoutliner-0.3.4-r1 (02 Dec 2008)
 
diff --git a/app-vim/vimoutliner/vimoutliner-0.3.4-r1.ebuild b/app-vim/vimoutliner/vimoutliner-0.3.4-r1.ebuild
deleted file mode 100644
index acd30fe151ba..000000000000
--- a/app-vim/vimoutliner/vimoutliner-0.3.4-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/vimoutliner/vimoutliner-0.3.4-r1.ebuild,v 1.1 2008/12/02 22:53:15 lack Exp $
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: easy and fast outlining"
-HOMEPAGE="http://www.vimoutliner.org/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
-IUSE=""
-
-VIM_PLUGIN_HELPFILES="vimoutliner"
-VIM_PLUGIN_MESSAGES="filetype"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e '/^if exists/,/endif/d' ftdetect/vo_base.vim
-	find "${S}" -type f | xargs chmod a+r
-}
-
-src_install() {
-	p=/usr/share/vim/vimfiles
-	for d in doc ftdetect ftplugin syntax ; do
-		dodir ${p}/${d}
-		cp -R ${d} "${D}"/${p}/
-	done
-
-	dodir ${p}/vimoutliner/plugins
-	cp -R add-ons/plugins "${D}"/${p}/vimoutliner/
-	cp vimoutlinerrc "${D}"/${p}/
-
-	for d in scripts/* add-ons/scripts/* ; do
-		dobin ${d}
-	done
-
-	dodoc vimoutlinerrc
-}
diff --git a/app-vim/vimoutliner/vimoutliner-0.3.4-r2.ebuild b/app-vim/vimoutliner/vimoutliner-0.3.4-r2.ebuild
new file mode 100644
index 000000000000..d75b6dcd3764
--- /dev/null
+++ b/app-vim/vimoutliner/vimoutliner-0.3.4-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-vim/vimoutliner/vimoutliner-0.3.4-r2.ebuild,v 1.1 2008/12/03 20:42:39 lack Exp $
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: easy and fast outlining"
+HOMEPAGE="http://www.vimoutliner.org/"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
+IUSE=""
+
+VIM_PLUGIN_HELPFILES="vimoutliner"
+VIM_PLUGIN_MESSAGES="filetype"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i -e '/^if exists/,/endif/d' ftdetect/vo_base.vim
+	sed -i -e 's/g:vo_modules2load/g:vo_modules_load/' vimoutlinerrc
+	find "${S}" -type f | xargs chmod a+r
+}
+
+src_install() {
+	p=/usr/share/vim/vimfiles
+	insinto ${p}
+	doins -r doc ftdetect ftplugin syntax colors || die "doins failed"
+
+	# Custom vimoutlinerrc so we actually find the plugins
+	cp vimoutlinerrc vimoutlinerrc.global
+	cat >>vimoutlinerrc.global <<-EOF
+
+	"Gentoo-specific Configuration **************************************
+	"Search path for vimoutliner plugins
+	setlocal runtimepath+=\$VIM/vimfiles/vimoutliner
+	EOF
+	newins vimoutlinerrc.global vimoutlinerrc
+
+	insinto ${p}/vimoutliner/plugins
+	doins add-ons/plugins/*.vim
+
+	dobin scripts/* add-ons/scripts/*
+
+	dodoc vimoutlinerrc add-ons/plugins/*.otl doc/*
+}