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

Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.26-gentoo-r1 x86_64

4 files changed, 56 insertions, 43 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/Manifest b/app-vim/vimoutliner/Manifest
index 8a8858c9aa71..2f6e3adcc7e3 100644
--- a/app-vim/vimoutliner/Manifest
+++ b/app-vim/vimoutliner/Manifest
@@ -1,6 +1,6 @@
 DIST vimoutliner-0.3.3a.tar.gz 43938 RMD160 5bb2227ef3c8f684a094de16da0373d34d6f408e SHA1 00abb7b92d0f4897713073509e06551e3a3bbbd0 SHA256 c8963bd84235c4ba04fd1e025a4791c9edc728374bbeb8367e5a2cff0e15ddc6
 DIST vimoutliner-0.3.4.tar.gz 52753 RMD160 5530f46099512747907049e4cdf8fced432ec550 SHA1 c5363fe9b517c5801060be8400c433d30ac0fd0c SHA256 9e6e85e67dad1a220eee0031821a93fe27dcd2c3881446049ab8644fc7e100f5
 EBUILD vimoutliner-0.3.3a-r1.ebuild 1123 RMD160 bb48fb8e066fe22f491507ea4102559190314c9f SHA1 43ead8e8e96d9f60ce461885164f872fe75db6d7 SHA256 aab0f8100847ab12c56be1f61a51d4a3b704c574edb17950f0e585e023365f3c
-EBUILD vimoutliner-0.3.4-r1.ebuild 994 RMD160 fcffbb7f57c9de35e38f89128786ce9faac8001c SHA1 cce354d45ff48bc312fb6c04a3ee4669d5fcf132 SHA256 430c0ef1aba923c54ed34ea7278bac769990e4d24f18996e044b2fca1b214f40
-MISC ChangeLog 2153 RMD160 53d75d3347c2b578a644f0dc01efac34f37a8188 SHA1 76df893a1b60de35a973ed93e11b1ebc616f8cde SHA256 c7b1cc2619265bfc8001d2bf6f962eb0acb031e83381a73827a39c14468e69b3
+EBUILD vimoutliner-0.3.4-r2.ebuild 1340 RMD160 51e885333fc4546a28c487d2667b649d1fa05c91 SHA1 d66abdfeb8ba13d8aa76f1b5c432c89b3aec602f SHA256 456638997afdc2cee50016a632ab415319e8f679b27e4f26f352b237f3f4c6a9
+MISC ChangeLog 2392 RMD160 e0319d7fb098934cc5463c05ee3088c70f43c254 SHA1 a81ad68a6fc6717daad548efa882b619c8905eec SHA256 f73131bf4775942b6d8e69f494bf704bd520fec81fd9603be125a9d5453e15e3
 MISC metadata.xml 157 RMD160 adcd6494e1e562ab5e0bd090e114622782ac753a SHA1 22983b8e9ba3045d8ccbc2b14393423f7f05d2ee SHA256 106c8618581360c66c2b535fcb7a6cb9ff318f1bd8e6c8f40f2f2f2d54e6787a
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/*
+}