Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 58838
Collapse All | Expand All

(-)vim.eclass.orig (-11 / +22 lines)
Lines 128-134 Link Here
128
		cd ${S} || die
128
		cd ${S} || die
129
		ebegin "Unpacking vim runtime snapshot"
129
		ebegin "Unpacking vim runtime snapshot"
130
		rm -rf runtime
130
		rm -rf runtime
131
		bzip2 -dc ${DISTDIR}/${VIM_RUNTIME_SNAP} | /bin/tar xf -
131
		bzip2 -dc ${DISTDIR}/${VIM_RUNTIME_SNAP} | tar xf -
132
		assert  # this will check both parts of the pipeline; eend would not
132
		assert  # this will check both parts of the pipeline; eend would not
133
		eend 0
133
		eend 0
134
	fi
134
	fi
Lines 139-149 Link Here
139
		epatch ${WORKDIR}/gentoo/patches-all/
139
		epatch ${WORKDIR}/gentoo/patches-all/
140
140
141
	# Fixup a script to use awk instead of nawk
141
	# Fixup a script to use awk instead of nawk
142
	sed -i '1s|.*|#!/usr/bin/awk -f|' ${S}/runtime/tools/mve.awk \
142
	cd "${S}"/runtime/tools \
143
		&& sed -e '1s|.*|#!/usr/bin/awk -f|' mve.awk > mve.awk.tmp \
144
		&& mv mve.awk.tmp mve.awk \
143
		|| die "mve.awk sed failed"
145
		|| die "mve.awk sed failed"
144
146
145
	# Patch to build with ruby-1.8.0_pre5 and following
147
	# Patch to build with ruby-1.8.0_pre5 and following
146
	sed -i 's/defout/stdout/g' ${S}/src/if_ruby.c
148
	cd "${S}/src" \
149
		&& sed -e 's/defout/stdout/g' if_ruby.c > if_ruby.c.tmp \
150
		&& mv if_ruby.c.tmp if_ruby.c \
151
		|| die "sed failed on if_ruby.c"
147
152
148
	# Read vimrc and gvimrc from /etc/vim
153
	# Read vimrc and gvimrc from /etc/vim
149
	echo '#define SYS_VIMRC_FILE "/etc/vim/vimrc"' >> ${S}/src/feature.h
154
	echo '#define SYS_VIMRC_FILE "/etc/vim/vimrc"' >> ${S}/src/feature.h
Lines 152-168 Link Here
152
	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
157
	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
153
	# Hopefully this pattern won't break for a while at least.
158
	# Hopefully this pattern won't break for a while at least.
154
	# This fixes bug 29398 (27 Sep 2003 agriffis)
159
	# This fixes bug 29398 (27 Sep 2003 agriffis)
155
	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
160
	local rtd="${S}/runtime/doc"
156
		${S}/runtime/doc/syntax.txt \
161
	for file in "${rtd}/syntax.txt" "${rtd}/tagsrch.txt" "${rtd}/usr_29.txt" \
157
		${S}/runtime/doc/tagsrch.txt \
162
			"${S}/runtime/menu.vim" "${S}/src/configure.in"
158
		${S}/runtime/doc/usr_29.txt \
163
	do
159
		${S}/runtime/menu.vim \
164
		sed -e 's/\<ctags\("\| [-*.]\)/exuberant-&/g' "${file}" > "${file}.tmp" 
160
		${S}/src/configure.in || die 'sed failed'
165
		mv "${file}.tmp" "${file}" 
166
	done
161
167
162
	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
168
	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
163
	# this is NeXT, but it's actually just a file in dev-libs/9libs
169
	# this is NeXT, but it's actually just a file in dev-libs/9libs
164
	# This fixes bug 43885 (20 Mar 2004 agriffis)
170
	# This fixes bug 43885 (20 Mar 2004 agriffis)
165
	sed -i 's/ libc\.h / /' ${S}/src/configure.in || die 'sed failed'
171
	cd "${S}/src" \
172
		&& sed -e 's/ libc\.h / /' configure.in > configure.in.tmp \
173
		&& mv configure.in.tmp configure.in \
174
		|| die 'sed failed'
166
}
175
}
167
176
168
src_compile() {
177
src_compile() {
Lines 177-183 Link Here
177
	# (2) Rebuild auto/configure
186
	# (2) Rebuild auto/configure
178
	# (3) Notice auto/configure is newer than auto/config.mk
187
	# (3) Notice auto/configure is newer than auto/config.mk
179
	# (4) Run ./configure (with wrong args) to remake auto/config.mk
188
	# (4) Run ./configure (with wrong args) to remake auto/config.mk
180
	sed -i 's/ auto.config.mk:/:/' src/Makefile || die "Makefile sed failed"
189
	sed -e 's/ auto.config.mk:/:/' src/Makefile > src/Makefile.tmp \
190
		&& mv src/Makefile.tmp src/Makefile \
191
		|| die "Makefile sed failed"
181
	rm -f src/auto/configure
192
	rm -f src/auto/configure
182
	# vim-6.2 changed the name of this rule from auto/configure to autoconf
193
	# vim-6.2 changed the name of this rule from auto/configure to autoconf
183
	confrule=auto/configure
194
	confrule=auto/configure

Return to bug 58838