From: Patrice Clement <monsieurp@gentoo.org>
Date: Mon, 23 Oct 2017 08:11:12 +0000 (+0200)
Subject: app-editors/vim-core: remove bogus script in the src_prepare phase.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=df1aef52f0ddf1798a611d1a4e0225ea393dfbcf;p=gentoo.git

app-editors/vim-core: remove bogus script in the src_prepare phase.

Package-Manager: Portage-2.3.8, Repoman-2.3.3
Closes: https://bugs.gentoo.org/635136
---

diff --git a/app-editors/vim-core/vim-core-8.0.1188.ebuild b/app-editors/vim-core/vim-core-8.0.1188.ebuild
index 083a0871ebed..358da58e0591 100644
--- a/app-editors/vim-core/vim-core-8.0.1188.ebuild
+++ b/app-editors/vim-core/vim-core-8.0.1188.ebuild
@@ -48,6 +48,9 @@ src_prepare() {
 		-e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
 		"${S}"/runtime/tools/mve.awk || die "sed failed"
 
+	# See #77841. We remove this file after the tarball extraction.
+	rm -v "${S}"/runtime/tools/vimspell.sh || die "rm 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
@@ -201,11 +204,6 @@ src_install() {
 		eshopts_pop
 	fi
 
-	# These files might have slight security issues, so we won't
-	# install them. See bug #77841. We don't mind if these don't
-	# exist.
-	rm -v "${ED}${vimfiles}"/tools/vimspell.sh || die "rm failed"
-
 	newbashcomp "${FILESDIR}"/xxd-completion xxd
 }