Version bump.

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

3 files changed, 240 insertions, 9 deletions

diff --git a/app-editors/vim-core/ChangeLog b/app-editors/vim-core/ChangeLog
index 0ebb65227c8c..1e3909d1519a 100644
--- a/app-editors/vim-core/ChangeLog
+++ b/app-editors/vim-core/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/vim-core
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.430 2013/11/19 10:19:19 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.431 2013/12/16 09:18:52 radhermit Exp $
+
+*vim-core-7.4.131 (16 Dec 2013)
+
+  16 Dec 2013; Tim Harder <radhermit@gentoo.org> +vim-core-7.4.131.ebuild:
+  Version bump.
 
 *vim-core-7.4.94 (19 Nov 2013)
 
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index 735330018a2b..f9270118ba39 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -9,27 +9,29 @@ DIST vim-core-7.3-gentoo-patches-r2.tar.bz2 3063 SHA256 cba8a43aea20457b9177be97
 DIST vim-core-7.3-gentoo-patches-r3.tar.bz2 3379 SHA256 2e0b38221b69d13c43cafb8c71f5be322785b12168278541a6006378c722e650 SHA512 7bebe548d1f65309f022bd459eb10364300cef9363298bf492c960730865b30b789392b123803fd3c3a5a3fb8543b9a83535c593b587a3e1f00290e9d2295714 WHIRLPOOL e75285549df9f4a9fa49cac19f0592ff4e5c87a07075dedd59f4806a104147bd9259de3e714b81b6d91bbbec9613c5f8dc3308649c8a38914cf29db22d539ac1
 DIST vim-patches-7.3.1214.patch.bz2 1678514 SHA256 ad8e7742b14337f77bc8d35a77b18455bc601d895dfa18faa8c62ef5ffcaf10b SHA512 1b336d6d55b1c123503590b8ccc8c6cfa516e29fdb9e273dcb79700ef0a4a0c1bf2c7a386d38de7ece1a69634016cd1e6f78f8cc5cb96a30f4c59483f5214c69 WHIRLPOOL 85f07bfc1a4fa28312185bb8a54225e0d69c09cdfc4d0aa492abc74639b77e2d908f08b561d1446292fbbe09ef0a8aeca67fb0a2720a70f93e9e05605c6d4b2a
 DIST vim-patches-7.3.762.patch.bz2 1102824 SHA256 91dd83f66b1f362be987cff40c00c05b8dc699000b8b4932437829ed34936dab SHA512 b7288438f98b56e082a957c5178818f549dd8e2aca31301f432d3c6d94c0702e482e4c14b17c122f6a83a11bb21dcc165725b3996a503f6cb45400492ae783bd WHIRLPOOL cc1140556487fde2c2ee9a9351f4a062a080d270cfa8e728295beb233288efc7acdb750181dc25a2a1b74d4b547e1219e3f043c89b6a27348f7aa916d64f9fd3
+DIST vim-patches-7.4.131.patch.bz2 164514 SHA256 09069afb27ee9996730df5163d016bc286788f7f2b3652e9e4b43a82d697ee0d SHA512 a3db66c2ce9209e986fed70b7775717f96339ff5d4456f546f7c4f8b896010ea01b09095015ed62124e6322218b641a672e33d7c3290d4e4e6b7869554b94fd3 WHIRLPOOL 3918ad4117b087a5aa1c3f076b707cda4d60fbd0398830203b0e92e435d281cab8606d563787a586387882b147bf9948066836423acd1ba0b0a90b86923bb76d
 DIST vim-patches-7.4.22.patch.bz2 11308 SHA256 573b9a1c039cff7522920ea5a0c8821033d92b20a6ff68b182480351a20e2d88 SHA512 533e4c4fb0b5e7f5d2b9585b08004748be617b73d8782f4442094342fabae1ac60ae55a4612724f4778057e0f4e10732276018e72c1c11cc91f241700bdf1bb7 WHIRLPOOL 288947dcaf303ea286fdf1f5c40996d611ea03a38dfd606892bd7b733f144971d27db02ffe5d2a5ed4d0809c2c33915498c29e5390e21dc55a6a9f47e3049ead
 DIST vim-patches-7.4.41.patch.bz2 72664 SHA256 00eeef3f3f7ce8f2c8ffa163a85fecced465e0a66de3c3cc8963322c8b894b72 SHA512 79ca4b7662c01120471c86d6649904e3d9c68c28958ca96a0548fd3411cb8c678b977acdd4d42977ba6c823efd3e16e765a31a8575c081a32b651b63dfedd710 WHIRLPOOL 5ea5c8a7e08f57603f1c0df43e4e187f60b0a17c5c549999e8d79d8de15365168fd38c5f28fac32af5d57f5869cf132a49171f4af6d4cc769f878207c8fcfa94
 DIST vim-patches-7.4.52.patch.bz2 14 SHA256 d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 SHA512 6de201dfed1d45412509c65deb34690dc2d09c6aafccfe491fd2f440f92842b9c755b61dc7bcdd4cc0c9f18cf46c2b3a1241e99c4c2a33fff5555e7b2f0b6348 WHIRLPOOL 39fd27630df1bd07de69b6bae68be5028bbefbc8ffdac645d5e0527eb1ed9575d0aaf97b39d0d6c9b69401846fbf8aeb3383b14bafb4a7564a20e92182dbd4b0
 DIST vim-patches-7.4.94.patch.bz2 143772 SHA256 d9d18940bb3ffb8a16dc443d9cc27709e7fad7cf5d6457d5ae8b0b734ffec8ca SHA512 d4aa6a6fb446810e34bdab572d515c271b6953c0d957ae97485e58d0617e586996a46f733087b93e470d4558ff5206c8e82c83df5686a644a27b4e59bdcd9bc5 WHIRLPOOL f7f7bfac3cf619db04bf9122b09c45f59a1146351fc5d950858cdda1a8abe5d57549a3959b45fcd67ce5622ea936997ac2fe716047adf71ed1c95f070cc985f9
 EBUILD vim-core-7.3.1214.ebuild 999 SHA256 59b89f0f425d5d2b874c9b2e53323b0e15fda44fdda04f9b6ddf675f0075a731 SHA512 396b2afdd5a86fde201c00cf93b9a9669b2bbb5ae5f3814909d829e86afc7237955434f2e99bd9b2aca73feb462719d0bc91947e0ef33c7770b92e7fffbd931f WHIRLPOOL b97d3e1af7cd481bd69352d447938d88bc7e717fa79f877accab36082f22b5ba7279d50195bab67c0cc1c5c8311646caeda6e14c33f5e1ce9241fbc9278634d8
 EBUILD vim-core-7.3.762.ebuild 981 SHA256 90dc7fe6f060aa0832fb14635707c51bef58dea713fef0e1b475299ece29d3fa SHA512 b413a8c456ac6f1f0974701c05729ecde3ab3919e60b993ed4aa064f20abfbdaf1d556b588e6575708438fd5c94bba0576a5725e9c8346783684166db83f554d WHIRLPOOL 63b8bc9acc28d07a8eb180c5a88510cd59b570d318b24f437a16c32f2430cb3eaf5b3f298734c1e249b82f937c36bd8fa8095154c31f5184b59f2c2fd9bc5261
+EBUILD vim-core-7.4.131.ebuild 7113 SHA256 dcca422501ccdc57f995a7bffcd02a83d7a6ee5a1c82f3ce911603888c413751 SHA512 e379c6a27f3b69db2fca77037f02525e92a1cf2c3d62043a82af29e79cb2dcd3085f22fd578af857d953236245a4d6eb7c2e7799eeda38dec9332694b352d172 WHIRLPOOL a0fdc08d9be7b94bba3d3fb40d48344ed5299a5c501b65fc3ae046c4b6777e866784db5392cccfae8a77c874060539f687d253d98e945cb66cf1228a4f368af0
 EBUILD vim-core-7.4.22.ebuild 7409 SHA256 a8aa0b82f74302eb98451b97889de668dbe8184dda2b0c00d9a0f3687f0d096f SHA512 90c4af236c3ae849ae5ed320a99d4bbaf81d27b41acc60545e3649d029cb835c747a558be69081fe0768bbc5536d24258aa65ca6a19b033fe0b4b8ccd4d924cc WHIRLPOOL 31b0f6f11b6eaa534758fad1aada144c09707b1270bc1f23c7878df1ea7b571b501b8710829c2d73290cb1212ddaf5ab7985b881645755d957ef518af70d226b
 EBUILD vim-core-7.4.41.ebuild 7409 SHA256 9b1b52c4c123c646dc26c95fc154e607df9c53a4f2ec6deb4f34d53949b25e90 SHA512 9094f498a78cbaa34f9968c381f7e746b66f6dbd39e5f76bc52753f815c4bb153665bfc35c08bb1619639f29724e49f9ff2ac90abf24ae330b786b4d2beef163 WHIRLPOOL 5b9c068617eb74874898e22b195eb9303cd59d9cfce9cf572565dbeb05a1b1c1ef710dee9de2844d82b10425d9bda5af1ecba55c2f57b35fad8738f368c72897
 EBUILD vim-core-7.4.52.ebuild 7409 SHA256 31d591fcce20577af303ef2d7aef6f359a51e28e83880f22a5046245def77d60 SHA512 22b26ec530b9581b1c0617996630dc5f97485b6936ff749cf7459714a6bd077469e68cf334f5dcb412e4a33b2845e8fe260b209631ebc566c5a4c38529b1028a WHIRLPOOL 3fe3c8d1a7e14ff292866961900086f430b4b9eea77c0d69cb2ea03b32fb6c37bb1742a1cc1a10b06a097c613481b8766b587d781d710df2a85e01b04ef9fbc1
 EBUILD vim-core-7.4.94.ebuild 7112 SHA256 7d2cb59201a9ab330c1a5b81e11402ead896e3a966ac1415b930dd74e68fbad5 SHA512 fecbedac0a3e436a611f04ef0fa0ac03357055755b2bfef03ecf4f1e2046641ef650bae5c0587060341122518218f814b734f367b4bb344bba8b186b055a0f2b WHIRLPOOL 25d8be30e2dee6124f0d5c88e2a8f1cb4a25e58687cbc8f48f4f013d86557c83a096ed9e35f84aead747922cd2e60a1a6eb5f1838f68ec0cfebb012b6642bbab
 EBUILD vim-core-9999.ebuild 7110 SHA256 beab4507717fd25230d059376fe84837db2e837daa05d81f9bda8a805a1276e9 SHA512 4f1b361db6a4fd71c1d321eea33b2576e4ffce2dac33bd9a3c8eb38c9f4931a500984b7657af8f0f52ca8fc2ceb21763bb79fd7afcf05ce55a0508d8f39f29cc WHIRLPOOL 296c0b9d20ba27e659023f7ec8d6955c7007b1f17b42e2f745577250c2986ab9a6aa80544e593550f1de68bdf5f15f0cc71a0087628e738e298fe39eb67e9a47
-MISC ChangeLog 58409 SHA256 58598f071d7f13ae6cc2a32c2a3dffc48a43b06b07b0123cb40a987b30c4e964 SHA512 82d50fc686a15d7ca7064b8027ed4e4613e5fbde94ecf66fb24641e6df94f00a53b698f7e15830e5e2d2f82d5687df17026e9e017d043cd24ee4b883a8f9a2ee WHIRLPOOL 8baba694cb8ef960586e7aaa3b85cccd4b73e63a3261a64bf88c702ab5df543db761aefca2cdcc1f648f6020f7b2ae7b09070ddcd2869574aa39f64fedf3d600
+MISC ChangeLog 58534 SHA256 fba981bf5100875ce25cea50f56545e2c490d811dfbdf2253784f1cd0439dcee SHA512 5ec1477848b283de4b0598775ea8c205496bd2fc9c4e82b84236004fda4b6c4789e98a17a34611722d84d33f923ffa01f350bc0ad5f6ed1c2c0ac399ffb2d266 WHIRLPOOL 2a9bdd7e957a994bcc67852f70ed4a386b3f7070256f20af3b4dcde44fc7b015ad5b4d858a664e2b9647c589e6a8cd7316f7fd0fa533b7bd50fbca1da8fd0e30
 MISC metadata.xml 156 SHA256 64d20c782589b423a6e75ba6fff7edead1ec8fbae742d27dd57f5299e8328500 SHA512 7dc1d902106e794e1a12bde5dcacb8b7143584cba9c61e72ac5728dd952663144c1b0efc949fbbc9fcec03b396b5e060e8263eaad7d70cd82d6d5b350c62f0c1 WHIRLPOOL 4381a5d144e783e5979d394720b32f7d95818a8571f748e72c5ece965c4e0375b1aec0c34f6f506a9f9fc255f1b69a220fdb74d1dbb8aabc92ec48afa44ab883
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSizsrAAoJEEqz6FtPBkyjZEsH/289OQG3HhQe0maVGakNmykb
-okcOkrgS/GmM5FnCkGjvxtwqjl79SDkqFLrFTtmw2TeedgZfXDr4sSO3L16kkLv0
-UzayNAG4OxOFR/OoR8ZQx7jqt3tx3UVeIvM1t3FCIqYaq871dGRYFr6cSHD2GejS
-+cy4hHCiYH91XPOB47QS8q55vi5kvRkAcoVDdwNXRufesd4d+iL+d5uWm+X+HS5Z
-5E8y8nXIngNDYw3rTp6F/cp7Fa8PEYCDtF5y54YuZ3gp63w+fHzVJVYm96W/xfXG
-qyEux6rcc4rxxbI2p2D7HS645NTGtKSqaDWHpWNoulYPtzf32bUAc5C9SRteTVk=
-=f/4b
+iQEcBAEBCAAGBQJSrsV/AAoJEEqz6FtPBkyjRroH/3Awf2t09kLnRDyHG/LjSKDn
+s404V4iq6LLbDudJ7qzI/sRmoHiOUoVjMA/cTRzZMXuAM+pDRdDPLOrJtaE9/Xfs
+BKAAOowHROLZmS1Hz5kjVXvCzri7m6Y/NlPoY7RyjM27DMB2dvXBXh/Ss2Znq3Gg
+duhyPdZnqsV872w0vOPTfoFMTO3vsBFUW8kXPcHvksWGp/42KZewnqRqpbI3uZgb
+HY4sWcN/T9gj53DGpcWXUkVjlyVUkt9pYZkwSkMSmqlQ7liSYs0eiZ6CvuOdVfiF
+6riR9tkP+w6+uFz12DKN9LUFysqWFgLBVtJKN7TP8J/7BDd5Qqdt9PSAuXrw24c=
+=WfPh
 -----END PGP SIGNATURE-----
diff --git a/app-editors/vim-core/vim-core-7.4.131.ebuild b/app-editors/vim-core/vim-core-7.4.131.ebuild
new file mode 100644
index 000000000000..2eb6af6f3a3a
--- /dev/null
+++ b/app-editors/vim-core/vim-core-7.4.131.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2013 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.131.ebuild,v 1.1 2013/12/16 09:18:52 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/${PN}-7.3-gentoo-patches-r3.tar.bz2
+		http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCHES}"
+	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
+	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
+}
+
+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
+}