Version bump.

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

3 files changed, 384 insertions, 17 deletions

diff --git a/app-editors/vim/ChangeLog b/app-editors/vim/ChangeLog
index fcd238b5657b..fcafc12f6d33 100644
--- a/app-editors/vim/ChangeLog
+++ b/app-editors/vim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/vim
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.441 2013/09/05 18:18:04 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.442 2013/09/06 06:23:29 radhermit Exp $
+
+*vim-7.4.22 (06 Sep 2013)
+
+  06 Sep 2013; Tim Harder <radhermit@gentoo.org> +vim-7.4.22.ebuild:
+  Version bump.
 
   05 Sep 2013; Michał Górny <mgorny@gentoo.org> vim-7.3.1214.ebuild:
   Clean up PYTHON_COMPAT from old implementations.
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index bb78b565dc0c..134171b54282 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -10,30 +10,24 @@ DIST vim-7.3.tar.bz2 9080692 SHA256 5c5d5d6e07f1bbc49b6fe3906ff8a7e39b049928b681
 DIST vim-7.4.tar.bz2 9843297 SHA256 d0f5a6d2c439f02d97fa21bd9121f4c5abb1f6cd8b5a79d3ca82867495734ade SHA512 65d55da556ee283a364b376d251b70e430b7a157bb5a8ee89565060ff9937907966d416cffd33f701b3314d0fdf16efe00065f66bc8459469f5ae2f713418e0e WHIRLPOOL 914fc2c4fd485196410d853990bb5cc4c0071bc36dc0794655ec05cc0b5f7d2971dea780cc7293fcfbd4495a30a7437a3b1e33a2b6795c10a9f05a2eac3ca6f4
 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.22.patch.bz2 11308 SHA256 573b9a1c039cff7522920ea5a0c8821033d92b20a6ff68b182480351a20e2d88 SHA512 533e4c4fb0b5e7f5d2b9585b08004748be617b73d8782f4442094342fabae1ac60ae55a4612724f4778057e0f4e10732276018e72c1c11cc91f241700bdf1bb7 WHIRLPOOL 288947dcaf303ea286fdf1f5c40996d611ea03a38dfd606892bd7b733f144971d27db02ffe5d2a5ed4d0809c2c33915498c29e5390e21dc55a6a9f47e3049ead
 DIST vim-patches-7.4.5.patch.bz2 4352 SHA256 796b8d4e1b758d83a939118d3ab2d8c7ccc64671e41ffd16c723f6285ca447f1 SHA512 6e4b33de2b61d2a451f71d40d8ffce1eb5ab8dc379db96f93a36efb2789300524ddb9e9f8e300dfdf8881ba095aa94e701d9530e9a650e994d6e2d0d35531600 WHIRLPOOL 6a2a15845d7522a32b313161c3d2edddfdc41c5cc9ae8b20e9eb3e3e958173a8a34ffd0775f0bd5675d5bced8b4d680b3023e13c32f3fc2d73976a8b8a2ce839
 EBUILD vim-7.3.1214.ebuild 1118 SHA256 5f2562a86a39ba99c79baf0b44173aba00e20013e249af74777ea9ba4bfaf751 SHA512 514233dab534cc49a4f318681e568ed059128352e94d748e1b38632340ed4576f6b0218367bc28024ec689e613c9fe180872054cde6e83a164227eace5568dba WHIRLPOOL 421d998ef49148b7efc77830126c8c2aa2eb7c2b0674752a24e60de289c2588f5b426847f8bed35951410c906d21c6b0d5fc9f814d81b5b8c1ce12277f3444b5
 EBUILD vim-7.3.762.ebuild 1001 SHA256 17cb878cf1c5922ac95d2d6c04215ae1bd695bff7a4ac742f92fbd0a8d688829 SHA512 2c7dbc515e74af5614e9a3290f61adb270c6f4dd0be4795f55a35d9d723c2bc7f3af4b890b571c21962be6585551b685dde68d6c1838368af7a1721ec87c1219 WHIRLPOOL 2a17ab2e9a9e903f1d2792d29d39086a8d3eb42c55683a409c6a6025ab2a5bbe1ca3750b5ac815164b293a6ecd59d187c37558e084baf66b4b6818d290800325
+EBUILD vim-7.4.22.ebuild 11681 SHA256 197a09921a93ffe5ecdbaf11440f915a0777398ba81c06fbae11cab797513cbc SHA512 87a78c691fe84d0bf4ec8907fb99d2047e6d8fb7cc1606335e885c0b8334c1880ff638cefc4ba70592b89056cbf194bc5d147a4bf76b8e7809db2f18c11b0358 WHIRLPOOL a89751fc9f1adf334dc98bd385cae58eca94ced58e1acb9502a9aa82c010c343e0db48ef802cf3bcb9bc28f138e015b2483c69db72668ae3abefee1bae6a752a
 EBUILD vim-7.4.5.ebuild 11680 SHA256 5c40570261390f680dae23a9e55e2989bdce6c57c0493592eedd3da5364be910 SHA512 3c3d963aedd52f3bc56e12c9256f5ee71f82b919ec097d14d8438b8bf6fa4d7ab76982d69e14e84db82328c59a9980a1874a10fb7bcbc79b9ea8620f28ed3fb3 WHIRLPOOL 626f1169fbdc34dbe6ec17e8044a576a14fd8f4ce0dd25b84de539a265d26d2de616597275125e3b24e43a838f17be99f4482331aa1d632100e870407b35cac7
 EBUILD vim-7.4.ebuild 11687 SHA256 0fbdc21d39565096dbe1a51551d9931db85afe5516efb93895123c695ab13eb3 SHA512 928a1c71960ec862689eeff74af6b82cce353113dfb32e218006103557fbbbaec0478c596ecffc9a37b2853222cf6ca854e0d828bb74f7c6fbc833ec26a84633 WHIRLPOOL 57256e29daef2d28874b4bc93575db7b55f268cfc0de025ac39c7b2356662a4c265e9682144480f22b5da8eabf6c2aece531207beeed3a763911d83d6785856d
 EBUILD vim-9999.ebuild 11679 SHA256 d6c2cb23c987663273aa3e0f8f1982e8cbeef9756756f6ef83923549edf3648a SHA512 de0cc28ea3c2f74b4a4a2e9c57113d1e5e42901f806e9ac2adaf3f62612eb53bf4e0ab05d0a6c2bb9408d362811a63a5ef5f3311641890e09628ef59fbbf8a2e WHIRLPOOL d5085fa0dde6cd3928c0cf369d8df326594c31558d6a575b5cbeb83f2de025377f502fbbca59772b8b2e08c9644a3edc0cf276a4e7cd76e830853878b7c18d83
-MISC ChangeLog 59398 SHA256 477d8a4b92186cbaa39115d216a2147021684ae93b05c9656384a7380940f9f4 SHA512 47c993b8099282ea5491e38a58f1f9d9dd7b2fdf4b2ac37710f2105012341cf80c78a28ba52e6010f3724aa0d5e059801f151bde5cd71f7a2b1c87834bc14cb5 WHIRLPOOL 5d9a3bf4d0b4d09141e917e3b5a2fd0eb9695cddf2dd664f4352e9a0899bf317b8f5297577bc7da3e1c841ecb1a41a527418f5f1b50a0f0abe098fe7dadc1bde
+MISC ChangeLog 59514 SHA256 b93fc02439dad575ceecc0bc995c72c260e1059feb93fe86ad8e9c69e4a26e54 SHA512 95ec58ad2e04b4eb54f80f37c2285795c121703a7f6c2ab80007874b6b064ffdcb55a1203bbb2e65e2ec028f666e803fda01dedf5fe86af95e3b643a61531bbb WHIRLPOOL 2a937f8093e844eae941c8cb288c04b89b42f1aa25111e3886192a1cfb3e135305275a26bac444b87d7b01984792aa9e0b96ea6d8da46389737fd00e26be0489
 MISC metadata.xml 523 SHA256 b75a53f2927616d5ceb6fdef13bc77f5852e80d4dd0305c52c80c3b6999ba83b SHA512 a649323d51eac150924004665e99a2c99b2900524773a3a6a15e3fef7b856f6c6c2d0efd8e2213e202eb66a28432a171dd62346be045faa884e72a1a78ce8338 WHIRLPOOL b99bc6b2bd37665a8629f647b528473734bddd7f639e66e8213da75452822e3177273b23ef5be2b76a28e46216ce42b398d3d4529dc724e95049477f920dcd70
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSKMr6XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOu+wP/iRlNTQ9XKW/Ii9633PGW7wZ
-HdVze7P+ufbVX54AT1GpMPjIn83dlizB7ORKT/sdDCdA1bfM8yRL5K+H6LTYefit
-NdHA2qvjcqNTqvuTUvP8R21WJOoTQkHUBFGjEZqyfkq7SyywWACGMDSmTxP3aIpe
-kzxxp4HfMnfBR3YHQBDW7U9pZswrW4xy0aFgDLOMlHndMvVwJz4mMZedNNv/bvMs
-E/zFe1wIApZ7WmYKT9ig/CF0Pgfnz/GSbGHwYc6c0/4h3+Atz+6duet49RwEbe24
-S9Vb9HKxoZ4f6Qokgf36uH7FTLHvRgC8JhqkZ5nrJsslomQEKKaUodJ53WPNp1UU
-IDi3WHiGO07WTvzx2tK1gx4l00288FeLe4tR+Q4FpJlIKSMpNwO2AVKc2U5HaP0W
-OBq/EySH1/aHqB7A0CNj6gc7Lqo3PSDy5YrrL/B9gEv+FzAPbmFzWFMvHcYdqjgc
-yvUlHg5cOBk/EiXrL4+a+chNVpS5bmO6s1qSwIPlofSLqaq3kweM7otrRBBZ0moz
-n+kgVsnYykhHH7rMsCbq+u784PkM/kYWEJ3PZAkt7rUZ2drojKyT5jPu7REu2yAY
-Uk4lszhWNSuLLGze+gIZNjuZzdnUHr/RVizp1fbqgWO8NRUF1gRa905O6X64kUaD
-nlvAGCITOwdnHfCnFU0/
-=quQT
+iQEcBAEBCAAGBQJSKXTjAAoJEEqz6FtPBkyjtBUH/15dobtNOQJmaLk+eKwb4jXJ
+JUdlcjZVoZ4wSGtUHSj/Bi5RDmO72Bw/AO8ChM51g6XH/H/JDSezjIoHbLm15b5v
+xd2NmnE3zNyxg14oCojXSBRT4MlqUQKtQeCnxEpQ3yBjfnX4LU46p3CvKXxy9jpK
+XDlFf9hq2Gpd2AJNxmyjUk9YBVf7raeTuPebEaeGjrJ5R01SIxrldsGOaSRK5dbD
+7COcQTwcnaVa2rzMrorJEb8vnJmIyz+n6A8uZRbK0P9xvV4sUeNImv82u7u+noeg
+/Ty15g0nW931bEHtvo9XrcQ6AD7RABZZULiUfwCDt3Ex6vCedKRanU5PktjGykI=
+=t9nu
 -----END PGP SIGNATURE-----
diff --git a/app-editors/vim/vim-7.4.22.ebuild b/app-editors/vim/vim-7.4.22.ebuild
new file mode 100644
index 000000000000..a29126d22c5c
--- /dev/null
+++ b/app-editors/vim/vim-7.4.22.ebuild
@@ -0,0 +1,368 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-7.4.22.ebuild,v 1.1 2013/09/06 06:23:29 radhermit Exp $
+
+EAPI=5
+VIM_VERSION="7.4"
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+PYTHON_REQ_USE=threads
+inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 python-single-r1
+
+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}"
+	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="X acl cscope debug gpm lua luajit minimal nls perl python ruby vim-pager"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND=">=app-admin/eselect-vi-1.1
+	>=sys-libs/ncurses-5.2-r2
+	nls? ( virtual/libintl )
+	acl? ( kernel_linux? ( sys-apps/acl ) )
+	cscope? ( dev-util/cscope )
+	gpm? ( >=sys-libs/gpm-1.19.3 )
+	lua? (
+		luajit? ( dev-lang/luajit )
+		!luajit? ( dev-lang/lua )
+	)
+	!minimal? (
+		~app-editors/vim-core-${PV}
+		dev-util/ctags
+	)
+	perl? ( dev-lang/perl )
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( || ( dev-lang/ruby:2.0 dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) )
+	X? ( x11-libs/libXt )"
+DEPEND="${RDEPEND}
+	>=app-admin/eselect-vi-1.1
+	sys-devel/autoconf
+	>=sys-libs/ncurses-5.2-r2
+	nls? ( sys-devel/gettext )"
+
+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
+
+	use python && python-single-r1_pkg_setup
+}
+
+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"
+
+	# Patch to build with ruby-1.8.0_pre5 and following
+	sed -i 's/defout/stdout/g' "${S}"/src/if_ruby.c
+
+	# 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
+
+	# conditionally make the manpager.sh script
+	if use vim-pager ; then
+		cat <<-END > "${S}"/runtime/macros/manpager.sh
+			#!/bin/sh
+			sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
+					vim \\
+						-c 'let no_plugin_maps = 1' \\
+						-c 'set nolist nomod ft=man' \\
+						-c 'let g:showmarks_enable=0' \\
+						-c 'runtime! macros/less.vim' -
+			END
+	fi
+
+	# 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
+
+	if use minimal ; then
+		myconf="--with-features=tiny \
+			--disable-nls \
+			--disable-multibyte \
+			--disable-acl \
+			--enable-gui=no \
+			--without-x \
+			--disable-darwin \
+			--disable-luainterp \
+			--disable-perlinterp \
+			--disable-pythoninterp \
+			--disable-rubyinterp \
+			--disable-gpm"
+	else
+		use debug && append-flags "-DDEBUG"
+
+		myconf="--with-features=huge --enable-multibyte"
+		myconf+=" $(use_enable acl)"
+		myconf+=" $(use_enable cscope)"
+		myconf+=" $(use_enable gpm)"
+		myconf+=" $(use_enable nls)"
+		myconf+=" $(use_enable perl perlinterp)"
+
+		if use python ; then
+			if [[ ${EPYTHON} == python3* ]] ; then
+				myconf+=" --enable-python3interp"
+				export vi_cv_path_python3="${PYTHON}"
+			else
+				myconf+=" --enable-pythoninterp"
+				export vi_cv_path_python="${PYTHON}"
+			fi
+		else
+			myconf+=" --disable-pythoninterp --disable-python3interp"
+		fi
+
+		myconf+=" $(use_enable lua luainterp)"
+		myconf+=" $(use_with luajit)"
+		myconf+=" $(use_enable ruby rubyinterp)"
+
+		# tclinterp is broken; when you --enable-tclinterp flag, then
+		# the following command never returns:
+		#   VIMINIT='let OS=system("uname -s")' vim
+		# mzscheme support is currently broken. bug #91970
+		#myconf+=" $(use_enable mzscheme mzschemeinterp)"
+
+		# --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 -e '/# define FEAT_CSCOPE/d' src/feature.h || \
+				die "couldn't disable cscope"
+		fi
+
+		# don't test USE=X here ... see bug #19115
+		# but need to provide a way to link against X ... see bug #20093
+		myconf+=" --enable-gui=no --disable-darwin $(use_with X x)"
+	fi
+
+	# 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} \
+		--disable-selinux \
+		${myconf}
+}
+
+src_compile() {
+	# The following allows emake to be used
+	emake -j1 -C src auto/osdef.h objects
+
+	emake
+}
+
+src_test() {
+	echo
+	einfo "Starting vim tests. Several error messages will be shown"
+	einfo "while the tests run. This is normal behaviour and does not"
+	einfo "indicate a fault."
+	echo
+	ewarn "If the tests fail, your terminal may be left in a strange"
+	ewarn "state. Usually, running 'reset' will fix this."
+	echo
+
+	# Don't let vim talk to X
+	unset DISPLAY
+
+	# We've got to call make test from within testdir, since the Makefiles
+	# don't pass through our VIMPROG argument
+	cd "${S}"/src/testdir
+
+	# Test 49 won't work inside a portage environment
+	einfo "Test 49 isn't sandbox-friendly, so it will be skipped."
+	sed -i -e 's~test49.out~~g' Makefile
+
+	# We don't want to rebuild vim before running the tests
+	sed -i -e 's,: \$(VIMPROG),: ,' Makefile
+
+	# Don't try to do the additional GUI test
+	emake -j1 VIMPROG=../vim nongui \
+		|| die "At least one test failed"
+}
+
+# Make convenience symlinks, hopefully without stepping on toes.  Some
+# of these links are "owned" by the vim ebuild when it is installed,
+# but they might be good for gvim as well (see bug 45828)
+update_vim_symlinks() {
+	has "${EAPI:-0}" 0 1 2 && use !prefix && EROOT="${ROOT}"
+	local f syms
+	syms="vimdiff rvim rview"
+	einfo "Calling eselect vi update..."
+	# Call this with --if-unset to respect user's choice (bug 187449)
+	eselect vi update --if-unset
+
+	# Make or remove convenience symlink, vim -> gvim
+	if [[ -f "${EROOT}"/usr/bin/gvim ]]; then
+		ln -s gvim "${EROOT}"/usr/bin/vim 2>/dev/null
+	elif [[ -L "${EROOT}"/usr/bin/vim && ! -f "${EROOT}"/usr/bin/vim ]]; then
+		rm "${EROOT}"/usr/bin/vim
+	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
+		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}
+			fi
+		done
+	fi
+
+	# This will still break if you merge then remove the vi package,
+	# but there's only so much you can do, eh?  Unfortunately we don't
+	# have triggers like are done in rpm-land.
+}
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	# Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
+	#       managed by eselect-vi
+	dobin src/vim
+	dosym vim /usr/bin/vimdiff
+	dosym vim /usr/bin/rvim
+	dosym vim /usr/bin/rview
+	if use vim-pager ; then
+		dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
+		dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
+		insinto ${vimfiles}/macros
+		doins runtime/macros/manpager.sh
+		fperms a+x ${vimfiles}/macros/manpager.sh
+	fi
+
+	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
+
+	# 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
+}
+
+vim_pkg_postinst() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	if use X ; then
+		echo
+		elog "The 'X' USE flag enables vim <-> X communication, like"
+		elog "updating the xterm titlebar. It does not install a GUI."
+	fi
+	echo
+	elog "To install a GUI version of vim, use the app-editors/gvim"
+	elog "package."
+	echo
+	elog "Vim 7 includes an integrated spell checker. You need to install"
+	elog "word list files before you can use it. There are ebuilds for"
+	elog "some of these named app-vim/vim-spell-*. If your language of"
+	elog "choice is not included, please consult vim-spell.eclass for"
+	elog "instructions on how to make a package."
+	echo
+	ewarn "Note that the English word lists are no longer installed by"
+	ewarn "default."
+	echo
+
+	echo
+	elog "To see what's new in this release, use :help version${VIM_VERSION/.*/}.txt"
+
+	# Make convenience symlinks
+	update_vim_symlinks
+}
+
+vim_pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Make convenience symlinks
+	update_vim_symlinks
+}