[patch] Diff on vim.eclass to make it work

vim.eclass.diff (text/plain), 2.66 KB, created by Vincent Strubel on 2004-07-29 15:56:54 UTC

--- vim.eclass.orig	Fri Jul 30 02:24:28 2004
+++ vim.eclass	Fri Jul 30 02:36:07 2004
@@ -128,7 +128,7 @@
 		cd ${S} || die
 		ebegin "Unpacking vim runtime snapshot"
 		rm -rf runtime
-		bzip2 -dc ${DISTDIR}/${VIM_RUNTIME_SNAP} | /bin/tar xf -
+		bzip2 -dc ${DISTDIR}/${VIM_RUNTIME_SNAP} | tar xf -
 		assert  # this will check both parts of the pipeline; eend would not
 		eend 0
 	fi
@@ -139,11 +139,16 @@
 		epatch ${WORKDIR}/gentoo/patches-all/
 
 	# Fixup a script to use awk instead of nawk
-	sed -i '1s|.*|#!/usr/bin/awk -f|' ${S}/runtime/tools/mve.awk \
+	cd "${S}"/runtime/tools \
+		&& sed -e '1s|.*|#!/usr/bin/awk -f|' mve.awk > mve.awk.tmp \
+		&& mv mve.awk.tmp mve.awk \
 		|| die "mve.awk sed failed"
 
 	# Patch to build with ruby-1.8.0_pre5 and following
-	sed -i 's/defout/stdout/g' ${S}/src/if_ruby.c
+	cd "${S}/src" \
+		&& sed -e 's/defout/stdout/g' if_ruby.c > if_ruby.c.tmp \
+		&& mv if_ruby.c.tmp if_ruby.c \
+		|| die "sed failed on if_ruby.c"
 
 	# Read vimrc and gvimrc from /etc/vim
 	echo '#define SYS_VIMRC_FILE "/etc/vim/vimrc"' >> ${S}/src/feature.h
@@ -152,17 +157,21 @@
 	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
 	# Hopefully this pattern won't break for a while at least.
 	# This fixes bug 29398 (27 Sep 2003 agriffis)
-	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-		${S}/runtime/doc/syntax.txt \
-		${S}/runtime/doc/tagsrch.txt \
-		${S}/runtime/doc/usr_29.txt \
-		${S}/runtime/menu.vim \
-		${S}/src/configure.in || die 'sed failed'
+	local rtd="${S}/runtime/doc"
+	for file in "${rtd}/syntax.txt" "${rtd}/tagsrch.txt" "${rtd}/usr_29.txt" \
+			"${S}/runtime/menu.vim" "${S}/src/configure.in"
+	do
+		sed -e 's/\<ctags\("\| [-*.]\)/exuberant-&/g' "${file}" > "${file}.tmp" 
+		mv "${file}.tmp" "${file}" 
+	done
 
 	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
 	# this is NeXT, but it's actually just a file in dev-libs/9libs
 	# This fixes bug 43885 (20 Mar 2004 agriffis)
-	sed -i 's/ libc\.h / /' ${S}/src/configure.in || die 'sed failed'
+	cd "${S}/src" \
+		&& sed -e 's/ libc\.h / /' configure.in > configure.in.tmp \
+		&& mv configure.in.tmp configure.in \
+		|| die 'sed failed'
 }
 
 src_compile() {
@@ -177,7 +186,9 @@
 	# (2) Rebuild auto/configure
 	# (3) Notice auto/configure is newer than auto/config.mk
 	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i 's/ auto.config.mk:/:/' src/Makefile || die "Makefile sed failed"
+	sed -e 's/ auto.config.mk:/:/' src/Makefile > src/Makefile.tmp \
+		&& mv src/Makefile.tmp src/Makefile \
+		|| die "Makefile sed failed"
 	rm -f src/auto/configure
 	# vim-6.2 changed the name of this rule from auto/configure to autoconf
 	confrule=auto/configure