[gentoo-commits] repo/gentoo:master commit in: app-editors/gvim/

[Patrice Clement]

commit:     fc0118f26a822c8a7511e148812ef4fbee0cfdcc
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 25 20:44:36 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Oct 25 20:51:03 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc0118f2

app-editors/gvim: update 9999 ebuild.

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 app-editors/gvim/gvim-9999.ebuild | 94 ++++++++++++++++++++++-----------------
 1 file changed, 52 insertions(+), 42 deletions(-)

diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild
index a43f58ae6ed..779093320ac 100644
--- a/app-editors/gvim/gvim-9999.ebuild
+++ b/app-editors/gvim/gvim-9999.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 PYTHON_REQ_USE=threads
 inherit vim-doc flag-o-matic xdg-utils gnome2-utils versionator bash-completion-r1 prefix python-single-r1
 
-if [[ ${PV} == 9999* ]] ; then
+if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/vim/vim.git"
 	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
@@ -86,30 +86,34 @@ pkg_setup() {
 	export LC_COLLATE="C"
 
 	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home
+	mkdir -p "${T}"/home || die
 	export HOME="${T}"/home
 
 	use python && python-single-r1_pkg_setup
 }
 
 src_prepare() {
-	if [[ ${PV} != 9999* ]] ; then
+	if [[ ${PV} != 9999* ]]; then
 		# Gentoo patches to fix runtime issues, cross-compile errors, etc
 		eapply "${WORKDIR}"/patches/
 	fi
 
 	# Fixup a script to use awk instead of nawk
-	sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
-		|| die "mve.awk sed failed"
+	sed -i -e \
+		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
+		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
 
 	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
+	    >> "${S}"/src/feature.h || die "echo failed"
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
+	    >> "${S}"/src/feature.h || die "echo failed"
 
 	# 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' \
+	sed -i -e \
+		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
 		"${S}"/runtime/doc/syntax.txt \
 		"${S}"/runtime/doc/tagsrch.txt \
 		"${S}"/runtime/doc/usr_29.txt \
@@ -119,29 +123,30 @@ src_prepare() {
 	# 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.ac || die 'sed failed'
+	sed -i -e \
+		's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
 
 	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
 	# correctly. To avoid some really entertaining error messages about stuff
 	# which isn't even in the source file being invalid, we'll do some trickery
 	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done
+	find "${S}" -name '*.c' | while read c; do
+	    echo >> "$c" || die "echo failed"
+	done
 
 	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]] ; then
-		sed -i '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile
+	if [[ -d "${S}"/src/po ]]; then
+		sed -i -e \
+			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile || die
 	fi
 
-	if version_is_at_least 7.3.122 ; then
-		cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk
-	fi
+	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
 
 	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
-	if version_is_at_least 7.3 ; then
-		sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:"	\
-			"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-	fi
+	sed -i -e \
+		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
+		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
 
 	eapply_user
 }
@@ -163,14 +168,18 @@ src_configure() {
 	# (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"
-	rm -f src/auto/configure
+	sed -i -e \
+		's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+	rm -v src/auto/configure || die "rm failed"
 	emake -j1 -C src autoconf
 
 	# This should fix a sandbox violation (see bug 24447). The hvc
 	# things are for ppc64, see bug 86433.
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do
-		[[ -e ${file} ]] && addwrite $file
+	local file
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
+		if [[ -e ${file} ]]; then
+			addwrite $file
+		fi
 	done
 
 	use debug && append-flags "-DDEBUG"
@@ -197,9 +206,9 @@ src_configure() {
 
 	# --with-features=huge forces on cscope even if we --disable it. We need
 	# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
-	if ! use cscope ; then
-		sed -i '/# define FEAT_CSCOPE/d' src/feature.h || \
-			die "couldn't disable cscope"
+	if ! use cscope; then
+		sed -i -e \
+			'/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope"
 	fi
 
 	# gvim's GUI preference order is as follows:
@@ -211,29 +220,29 @@ src_configure() {
 	# -aqua -gtk -gtk3 -motif neXt  NEXTAW
 	# -aqua -gtk -gtk3 -motif -neXt ATHENA
 	echo ; echo
-	if use aqua ; then
+	if use aqua; then
 		einfo "Building gvim with the Carbon GUI"
 		myconf+=(
 			--enable-darwin
 			--enable-gui=carbon
 		)
-	elif use gtk3 ; then
+	elif use gtk3; then
 		myconf+=( --enable-gtk3-check )
 		einfo "Building gvim with the gtk+-3 GUI"
 		myconf+=( --enable-gui=gtk3 )
-	elif use gtk ; then
+	elif use gtk; then
 		myconf+=( --enable-gtk2-check )
-		if use gnome ; then
+		if use gnome; then
 			einfo "Building gvim with the Gnome 2 GUI"
 			myconf+=( --enable-gui=gnome2 )
 		else
 			einfo "Building gvim with the gtk+-2 GUI"
 			myconf+=( --enable-gui=gtk2 )
 		fi
-	elif use motif ; then
+	elif use motif; then
 		einfo "Building gvim with the MOTIF GUI"
 		myconf+=( --enable-gui=motif )
-	elif use neXt ; then
+	elif use neXt; then
 		einfo "Building gvim with the neXtaw GUI"
 		myconf+=( --enable-gui=nextaw )
 	else
@@ -287,7 +296,7 @@ src_test() {
 	ln -s "${S}"/src/gvim "${S}"/src/testvim || die
 
 	# Make sure our VIMPROG is used.
-	sed -i 's:\.\./vim:../testvim:' src/testdir/test49.vim || die
+	sed -i -e 's:\.\./vim:../testvim:' src/testdir/test49.vim || die
 
 	# Don't do additional GUI tests.
 	emake -j1 VIMPROG=../testvim -C src/testdir nongui
@@ -305,20 +314,20 @@ update_vim_symlinks() {
 
 	# Make or remove convenience symlink, vim -> gvim
 	if [[ -f "${EROOT}"/usr/bin/gvim ]]; then
-		ln -s gvim "${EROOT}"/usr/bin/vim 2>/dev/null
+		ln -s gvim "${EROOT}"/usr/bin/vim 2>/dev/null || die
 	elif [[ -L "${EROOT}"/usr/bin/vim && ! -f "${EROOT}"/usr/bin/vim ]]; then
-		rm "${EROOT}"/usr/bin/vim
+		rm "${EROOT}"/usr/bin/vim || die
 	fi
 
 	# Make or remove convenience symlinks to vim
 	if [[ -f "${EROOT}"/usr/bin/vim ]]; then
 		for f in ${syms}; do
-			ln -s vim "${EROOT}"/usr/bin/${f} 2>/dev/null
+			ln -s vim "${EROOT}"/usr/bin/${f} 2>/dev/null || die
 		done
 	else
 		for f in ${syms}; do
 			if [[ -L "${EROOT}"/usr/bin/${f} && ! -f "${EROOT}"/usr/bin/${f} ]]; then
-				rm -f "${EROOT}"/usr/bin/${f}
+				rm -v "${EROOT}"/usr/bin/${f} || die
 			fi
 		done
 	fi
@@ -342,9 +351,10 @@ src_install() {
 	emake -C src DESTDIR="${D}" DATADIR="${EPREFIX}"/usr/share install-icons
 
 	dodir /usr/share/man/man1
-	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1
-	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1
-	echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1
+	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1 || die "echo failed"
+	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1 || die "echo failed"
+	echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1 || \
+		die "echo failed"
 
 	insinto /etc/vim
 	newins "${FILESDIR}"/gvimrc-r1 gvimrc
@@ -356,7 +366,7 @@ src_install() {
 	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
 
 	# don't install vim desktop file
-	rm "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop"
+	rm -v "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop"
 }
 
 pkg_postinst() {