Version bump, make sed regex stricter (fixes bug #526682).

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

4 files changed, 251 insertions, 12 deletions

diff --git a/app-editors/vim-core/ChangeLog b/app-editors/vim-core/ChangeLog
index c415ddf629b5..8cfc06e2ae69 100644
--- a/app-editors/vim-core/ChangeLog
+++ b/app-editors/vim-core/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/vim-core
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.451 2014/10/13 21:06:35 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.452 2014/10/26 17:47:20 radhermit Exp $
+
+*vim-core-7.4.488 (26 Oct 2014)
+
+  26 Oct 2014; Tim Harder <radhermit@gentoo.org> +vim-core-7.4.488.ebuild,
+  vim-core-9999.ebuild:
+  Version bump, make sed regex stricter (fixes bug #526682).
 
 *vim-core-7.4.475 (13 Oct 2014)
 
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index 7909afc260ca..2c5274baeb83 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -19,6 +19,7 @@ DIST vim-patches-7.4.326.patch.bz2 547801 SHA256 ef055424ee6a38967a38420c136ad54
 DIST vim-patches-7.4.417.patch.bz2 672822 SHA256 244a556bf45a11d9b9a8669239062a400e1e73ea940e54b7bbaca954da7fc6be SHA512 abda7e717a486f677e0f6720beecc903879deadac9a61faf628a7c590030b81269c48c20de6e1fe99011072e9e7a675552917e7d367f9c2d3596688543e371e9 WHIRLPOOL 4398c9de866a2a84257fe2cd6743a75c494ecbd47ef2d5dd4393834e84801bf1786905dbf368f65b98eafb1541aaa5eda05b81f042afea564469f294add3f548
 DIST vim-patches-7.4.430.patch.bz2 680438 SHA256 173ebaaf7e39e9cc9face31e6f8269ec7e5880998a8b846a80f88bc65fa40be3 SHA512 dd58e693286bf73d49a3f0625d597fc88c6a72eb386eae9f8e656854ac42f92a3e0bc0b43efd23e55d65040ec4f767ab48366753736b1b843b85c2a738829a54 WHIRLPOOL 7ce6e2de659103edf2dc5ff09c66fbe3d24d5f1fcaf34e49daef65a1d5f498c9326c5384615cb011848d60fb5ec538a531b28f63d2c2f9a51db979bf3141086e
 DIST vim-patches-7.4.475.patch.bz2 704060 SHA256 35e1f82629e888865d03ddf8647554a607d94fc5ba33502822fa171d4914aba3 SHA512 80e26c872793604b6ff76bbb9b63d10ed9633b448008158d2f2538e9a18c62f7070b5f014b221643d2e97d0d6f7812ffc8a038f7acb2e1558ac5a083d6db8ee0 WHIRLPOOL 983c51f3d1220ab0512491f04e72cbf90a2891d44c578dcde043737a700c329cc3a090f3d2bf581ad4a23b6765bb72517f76520da1299ea8a65c6ac5957578da
+DIST vim-patches-7.4.488.patch.bz2 755739 SHA256 831bd6338a5169d90b82c313ea73256a70325ad8b721e2b7052d9d5ec5ff2fde SHA512 53a1041e2baa6477b179fd7879ca76867a8fff9cc21a7e843519fb96c3f880f6053760a7465d68c84ee4d7f6cb42cc2017152789a4b57db7953d20bbfa7dd4aa WHIRLPOOL 0bfc8d839e1d886ac8339edf01bb84e46f8c1d3754791d565d3b4050ebf678b548792c8d94b1c8f09824ebbee52fb1df9c65670b63fa860032278b318b89db66
 DIST vim-patches-7.4.52.patch.bz2 14 SHA256 d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 SHA512 6de201dfed1d45412509c65deb34690dc2d09c6aafccfe491fd2f440f92842b9c755b61dc7bcdd4cc0c9f18cf46c2b3a1241e99c4c2a33fff5555e7b2f0b6348 WHIRLPOOL 39fd27630df1bd07de69b6bae68be5028bbefbc8ffdac645d5e0527eb1ed9575d0aaf97b39d0d6c9b69401846fbf8aeb3383b14bafb4a7564a20e92182dbd4b0
 EBUILD vim-core-7.3.1214.ebuild 1003 SHA256 0eb20cab51102107ef9c8df2e39d38f0d3f2e15e87fe88f271299f95e84b3e9b SHA512 eb4fc44617eedf81ffed762f28a4c8c0bf3b0b2fad493ef3310aa2782e5c45017bb2fe7f37b737649c17d1a4be6dc6c612b64301c80f9424d57abfc3eefac142 WHIRLPOOL 715d73a38bf97b2d3e520d8e6ec5e82d22392ec00701a743a0fbaf1de313bf1fac62d777268ae6da676cfa5730548d3337c46fe0cd36e6a6f85e1ad1986c234c
 EBUILD vim-core-7.3.762.ebuild 990 SHA256 4da64156648f1030702b5c699cce68b092631518fcf14b21cc787fe2cd86d6fd SHA512 fd5016260cab99b236147f090aab3b5e65cbfe5cb6f182d8e5e3638700a00969a0cfa2d20e3159241b21dd4e03035fcdd7e129017556ec128413531fe88e111e WHIRLPOOL 61485a3b00b0a1bd883ba7a8b3481844a7f4bfcb906e859da649d7487d595a17eaddc4a6617918e9750fcf0e9bcf91f91aed1a2dd3c18c7eb0915d672af0cd36
@@ -30,18 +31,19 @@ EBUILD vim-core-7.4.326.ebuild 7321 SHA256 566ba711f5e345a0c16c321139183a485650f
 EBUILD vim-core-7.4.417.ebuild 7321 SHA256 5d4229901e8e26773efba042155f256070a1ab286354fe52e94fd4fea575011c SHA512 b5e3713581d44a61b359efcfa7ad5a4811cd81c6331470a9e2e1d9ea289e5891f8ea037ce5ba281fe83d8e7b7561a9fb4549aa3fe280c9545b6d6176bcc5b40c WHIRLPOOL ef5ccc3843cf95ddbc0599df558d64d8247770e4804dddf364de0f377516252df49b365abc64122f10b2be0058b4688ff931d2bb178e80fa5dca4620f09b3b1e
 EBUILD vim-core-7.4.430.ebuild 7328 SHA256 eb8904c14df9c7f281136e9bb9cea5c9cc9246369b9e38e8482285001cda1754 SHA512 ae50b12ed6e0af6ff52e465461b558c27f0b4a50f69219f82419185feb580a503e8960f1e8552ca06c1ed3ce4334151ffa78a1cf28e360138ad04398c3e64324 WHIRLPOOL e379a10ea8dd2eb53dc17f828ed7e4570a1c2ffd031017fc9109d39325a30bad4e4b48f30460062e488a9d9bc39c199f3bb4d9bcea7804ed44f3ebe2dfed4701
 EBUILD vim-core-7.4.475.ebuild 7328 SHA256 c315a6e0b3dcc88eadfd80b51e5bba5bb8df19c141858606da4467261f4f11be SHA512 acf8f8188a1ce95417bfe8842d8e35e9c9b504d0dc3769e1e21a87f71740096d82165324d30c7400525efe5abb254ef7094bd81ad91b4f03e724b3f4518788c2 WHIRLPOOL 126766f23f34048a250cbbd0af3e1f81264e0f0aeba469a0ba8d5f296e3a6b51b7d5030b9d708605f782281c980dcc527403644bb6a7c895444d5c7ecb1483b5
+EBUILD vim-core-7.4.488.ebuild 7329 SHA256 bac64687000fd5195b60023a7de517101e78fd0879f7ef24a3b58f979e0fd756 SHA512 074d4653a1e2fdb6a0bc7eb4de4632ec83a2c6961d0922dfcc6d7d173c2dee566fed646aa343f1be1ea7c469dd8e29d28c4a7374d89ef761d9ed5b5d673c2f0f WHIRLPOOL 0c7cd4950173f36a0a6e9c11415b220eefe4e003310e5835a1624d769dfa8b8335ea6768c4b6ea70106bc3e07fb1870264877119a9231fb3707bcd12771e5a67
 EBUILD vim-core-7.4.52.ebuild 7409 SHA256 31d591fcce20577af303ef2d7aef6f359a51e28e83880f22a5046245def77d60 SHA512 22b26ec530b9581b1c0617996630dc5f97485b6936ff749cf7459714a6bd077469e68cf334f5dcb412e4a33b2845e8fe260b209631ebc566c5a4c38529b1028a WHIRLPOOL 3fe3c8d1a7e14ff292866961900086f430b4b9eea77c0d69cb2ea03b32fb6c37bb1742a1cc1a10b06a097c613481b8766b587d781d710df2a85e01b04ef9fbc1
-EBUILD vim-core-9999.ebuild 7326 SHA256 2104e2a2a46f42a2fae4556b1b86493193afc8f2831b411aae29fbae2968948b SHA512 22ff808a3c72be46e16e8bd835a621d0b74ddd892fa78b89127dc4c24273bb7f44f823f93db471688ba47da7ee68eb29d34f308e4c46fb16c382f53952423468 WHIRLPOOL 2d59dee07a8cd3af4ba036f58377fe46310f1330c28646686dba8783c45079d511152e7846df19b19eb786bb63a4c0fd6e5082bb35f183fc0a3c5b559436b6b1
-MISC ChangeLog 61204 SHA256 4a194ec087b12882acb8a8b151e8eacfd774cb1661f94a5827f8d6a4b610e542 SHA512 f2ff9f3a8c775e1ef9552e10fc30ad5f20c0f5ac0f36da34177f76307dd3da05f4346999ad3cd6c0efbfcbb0c8266480826f0d77a6d35ce80f5be0b36387769d WHIRLPOOL 836134222de1bd66493a3aacb1d732e96d251176e5d7b12006700d4e4858658eed369732c1dcffc84f595733bd8639a42cd16c1aa0390f663f3236dfd01cb662
+EBUILD vim-core-9999.ebuild 7327 SHA256 fda3b9a81efa75e2d110e2bbf0112dade10e8a8f19f5fe8fcaf96803101dece8 SHA512 ad5391ee93e8f18706a0c1ab5864f756596886dc2ebce21437fbc9223339c4eb3831b50643a926c7e7dba1c21999c5dd3e5ddeb380a3878ddde0c33fba1a4bf3 WHIRLPOOL 6b6fff4e5f11329a3f5a58f2169b3d4c5c12a51d6de2c207642d95e7884473c4046a684a3ba661e838bc0f8c532b2d566ee14199c4baad3f6562931fcb8e6484
+MISC ChangeLog 61398 SHA256 581b4dc60181cf60539601a5763f5ccb3e9bafbea73fac955956e0d5d95d0140 SHA512 a3f54540d16df30ea63d6f6f6566410cfaea0b2cb428196b67ae931e4f39b6d05d6652dd5c6f48f3d136ec93889809b8f1b60a6f360ede3cc9b6bcbea26d6ade WHIRLPOOL 2bae77c260785bd2511c4a6c45318509f8350e775c350c1cc8f524268f7334a49f46a47d8f28381ab5ef6d4d2435c70db25225ca0268d82ab329a2101f5678c3
 MISC metadata.xml 156 SHA256 64d20c782589b423a6e75ba6fff7edead1ec8fbae742d27dd57f5299e8328500 SHA512 7dc1d902106e794e1a12bde5dcacb8b7143584cba9c61e72ac5728dd952663144c1b0efc949fbbc9fcec03b396b5e060e8263eaad7d70cd82d6d5b350c62f0c1 WHIRLPOOL 4381a5d144e783e5979d394720b32f7d95818a8571f748e72c5ece965c4e0375b1aec0c34f6f506a9f9fc255f1b69a220fdb74d1dbb8aabc92ec48afa44ab883
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUPD71AAoJEEqz6FtPBkyj5/gH/0R5gcnIhGVhW8JKoVyNHRo2
-R23t0zsoY6MEftNv8mg9w+rUP3yV9SZiwVcS7wGjvRqkHF9FWR09npaB03PnPCmT
-LeKXFz23L7h7/iYi38ghSx6jZtpgOI+X0F+GqflGHkRnUb1eCWvXlQHq6MN/M7ij
-H1g4Y5fayfPPmMtwqCUjCDT6HO0JTfRuwSuXuMFgaqf3eotR/ztccY5C1stspdT8
-dCvi8RDGMQzvb037qVtFsAi4qJ/cpyBqKYjJIc+ertPi3SVDIfrdMeUAcLN/ff5I
-P0FLKIweH+K6uRFcA3/KmyNpb8uihCbxBKeGUm6KvcCyc9SG2pt+hjsRTzzu9dw=
-=mz5H
+iQEcBAEBCAAGBQJUTTOvAAoJEEqz6FtPBkyjgsEIAJ6puoHvw+nu7mZZudBSOV+y
+ZYzvf6TFFwLgAazgtdDDTAknvPyDSvr+Q3/Qfh40jhmnhfnis+Dblimsq5PCsW0J
+ImP4XiY65WVA60ToRYfIXKwBh1VdyknTR11s7A2Upz5K5Pm48MOV3euaB9BOT5aK
+nX10TQa3h9GRB/Brgjpjn9T1ugvNhfzkKvM8QahN//t6Ss2qLsxRsZGM51su8zi0
+ayb5vEUdhDgB4WxubchrFOrb6zYtMghIfQFXuqhRhFXECchE1wG5h3B3ubGnrzRO
+P6/rgWVIp5QYJz4FLgHk6LOe85LMCtHCKn+A806MKmncsi5Zi/D/43GaBdJ+Em8=
+=Fr11
 -----END PGP SIGNATURE-----
diff --git a/app-editors/vim-core/vim-core-7.4.488.ebuild b/app-editors/vim-core/vim-core-7.4.488.ebuild
new file mode 100644
index 000000000000..02c0b8a9b00e
--- /dev/null
+++ b/app-editors/vim-core/vim-core-7.4.488.ebuild
@@ -0,0 +1,231 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-7.4.488.ebuild,v 1.1 2014/10/26 17:47:20 radhermit Exp $
+
+EAPI=5
+VIM_VERSION="7.4"
+inherit eutils vim-doc flag-o-matic versionator bash-completion-r1 prefix
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit mercurial
+	EHG_REPO_URI="https://vim.googlecode.com/hg/"
+	EHG_PROJECT="vim"
+else
+	VIM_ORG_PATCHES="vim-patches-${PV}.patch.bz2"
+	SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
+		http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCHES}
+		http://dev.gentoo.org/~radhermit/vim/vim-${VIM_VERSION}-gentoo-patches.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="vim and gvim shared files"
+HOMEPAGE="http://www.vim.org/"
+
+SLOT="0"
+LICENSE="vim"
+IUSE="nls acl minimal"
+
+DEPEND="sys-devel/autoconf"
+PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
+
+S=${WORKDIR}/vim${VIM_VERSION/.}
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug 82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+
+	# Gnome sandbox silliness. bug #114475.
+	mkdir -p "${T}"/home
+	export HOME="${T}"/home
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]] ; then
+		if [[ -f "${WORKDIR}"/${VIM_ORG_PATCHES%.bz2} ]] ; then
+			# Apply any patches available from vim.org for this version
+			epatch "${WORKDIR}"/${VIM_ORG_PATCHES%.bz2}
+		fi
+
+		if [[ -d "${WORKDIR}"/patches/ ]]; then
+			# Gentoo patches to fix runtime issues, cross-compile errors, etc
+			EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches/
+		fi
+	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"
+
+	# 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
+
+	# 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'
+
+	# 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'
+
+	# 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
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]] ; then
+		sed -i -e \
+			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile
+	fi
+
+	if version_is_at_least 7.3.122 ; then
+		cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk
+	fi
+
+	# 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
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf
+
+	# Fix bug 37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.in is newer than auto/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
+	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
+	done
+
+	# Let Portage do the stripping. Some people like that.
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	# Keep Gentoo Prefix env contained within the EPREFIX
+	use prefix && myconf+=" --without-local-dir"
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		--with-features=tiny \
+		--enable-gui=no \
+		--without-x \
+		--disable-darwin \
+		--disable-perlinterp \
+		--disable-pythoninterp \
+		--disable-rubyinterp \
+		--disable-gpm \
+		--disable-selinux \
+		$(use_enable nls) \
+		$(use_enable acl) \
+		${myconf}
+}
+
+src_compile() {
+	# The following allows emake to be used
+	emake -j1 -C src auto/osdef.h objects
+
+	emake tools
+}
+
+src_test() { :; }
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	dodir /usr/{bin,share/{man/man1,vim}}
+	cd src || die "cd src failed"
+	emake \
+		installruntime \
+		installmanlinks \
+		installmacros \
+		installtutor \
+		installtutorbin \
+		installtools \
+		install-languages \
+		install-icons \
+		DESTDIR="${D}" \
+		BINDIR="${EPREFIX}"/usr/bin \
+		MANDIR="${EPREFIX}"/usr/share/man \
+		DATADIR="${EPREFIX}"/usr/share
+
+	keepdir ${vimfiles}/keymap
+
+	# default vimrc is installed by vim-core since it applies to
+	# both vim and gvim
+	insinto /etc/vim/
+	newins "${FILESDIR}"/vimrc-r4 vimrc
+	eprefixify "${ED}"/etc/vim/vimrc
+
+	if use minimal ; then
+		# To save space, install only a subset of the files.
+		# Helps minimalize the livecd, bug 65144.
+		eshopts_push -s extglob
+
+		rm -fr "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent}
+		rm -fr "${ED}${vimfiles}"/{macros,print,tools,tutor}
+		rm "${ED}"/usr/bin/vimtutor
+
+		local keep_colors="default"
+		ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
+
+		local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
+		# tinkering with the next line might make bad things happen ...
+		keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
+		ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
+
+		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 "${ED}${vimfiles}"/tools/{vimspell.sh,tcltags} 2>/dev/null
+
+	newbashcomp "${FILESDIR}"/xxd-completion xxd
+
+	# We shouldn't be installing the ex or view man page symlinks, as they
+	# are managed by eselect-vi
+	rm -f "${ED}"/usr/share/man/man1/{ex,view}.1
+}
+
+pkg_postinst() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+}
diff --git a/app-editors/vim-core/vim-core-9999.ebuild b/app-editors/vim-core/vim-core-9999.ebuild
index 6e5dec311948..d51316c9a5f4 100644
--- a/app-editors/vim-core/vim-core-9999.ebuild
+++ b/app-editors/vim-core/vim-core-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-9999.ebuild,v 1.10 2014/09/06 17:50:42 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-9999.ebuild,v 1.11 2014/10/26 17:47:20 radhermit Exp $
 
 EAPI=5
 VIM_VERSION="7.4"
@@ -120,7 +120,7 @@ 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"
+	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
 	rm -f src/auto/configure
 	emake -j1 -C src autoconf