Version bump.

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

3 files changed, 392 insertions, 15 deletions

diff --git a/app-editors/vim/ChangeLog b/app-editors/vim/ChangeLog
index e592f9acbda7..3db0b2c9475c 100644
--- a/app-editors/vim/ChangeLog
+++ b/app-editors/vim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/vim
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.472 2014/10/12 09:02:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.473 2014/10/13 21:09:46 radhermit Exp $
+
+*vim-7.4.475 (13 Oct 2014)
+
+  13 Oct 2014; Tim Harder <radhermit@gentoo.org> +vim-7.4.475.ebuild:
+  Version bump.
 
   12 Oct 2014; Agostino Sarubbo <ago@gentoo.org> vim-7.4.273.ebuild:
   Stable for x86, wrt bug #511190
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index 5ccb8429c900..e25b29c7a190 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -18,6 +18,7 @@ DIST vim-patches-7.4.273.patch.bz2 506378 SHA256 065447179d22602315e2965d135cf9f
 DIST vim-patches-7.4.326.patch.bz2 547801 SHA256 ef055424ee6a38967a38420c136ad54cde2f0da02417b9cd5893a1eaeae589fb SHA512 f047a9cbe01ce1820eed33b9ca7de769851b22e39083e17c6d41f1f9d705a64f608e12ad9a383d2c3d45da20466f4e6db26118424452b76c3344043c163bee1a WHIRLPOOL 01dbc695dc6ca698fa64bfc02a12ef97cb8d12e52992acf529fcc5f0264b8db58d33ef909b65ded282e77a06a352a23f5d592bfaa9d2a4ddfc566813bc725afc
 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.52.patch.bz2 14 SHA256 d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 SHA512 6de201dfed1d45412509c65deb34690dc2d09c6aafccfe491fd2f440f92842b9c755b61dc7bcdd4cc0c9f18cf46c2b3a1241e99c4c2a33fff5555e7b2f0b6348 WHIRLPOOL 39fd27630df1bd07de69b6bae68be5028bbefbc8ffdac645d5e0527eb1ed9575d0aaf97b39d0d6c9b69401846fbf8aeb3383b14bafb4a7564a20e92182dbd4b0
 EBUILD vim-7.3.1214.ebuild 1125 SHA256 682ed73f4a04ba569fe9dcde80a8d4296e0cdc9a3a2e14dcfe06e8d77603f6e2 SHA512 24b9e32030ff1fbf246575d05fcbd0a34edf91a5af5a2b5c46c54e53e76f015b6b796ea81714dc2215ae61adfec95d80b0410ed918647017e1df69235f5978a8 WHIRLPOOL 2c2966e9756b8432c2a9a58db84fecdc7ccee9d5c17ec85573b3b326535c151f089f872b60ec2c5514252e613a459cb0df1ffb4dd0fb46282c67492ed5c3d925
 EBUILD vim-7.3.762.ebuild 1010 SHA256 63e9605c3a4726f130bc310c4d1d26006acf1db17b2351eb21fc15c916dabd38 SHA512 7a1809e3d4bb863c652f5baf76a258d86929a0b14eba5758722900b7b3c8687e0ad42a2674fe60207f50e0ae6a2d66baac056e371daad9804a36bdf489e2d7dc WHIRLPOOL 68a62475f39cb36a9c6935d352ff778617157b1f1d0259235fc01dc2bbd0ac8a45ec619726530fa447d0aa111b3a820684d61da88f501311d8d3555f3a68915a
@@ -28,24 +29,19 @@ EBUILD vim-7.4.273.ebuild 11583 SHA256 8e18baa085586ae62719adf825fba0caf6c511472
 EBUILD vim-7.4.326.ebuild 11597 SHA256 3bed65e619f768d0f80ef7f358c179f65f29c76226b8cdb191c40fe0e297c27a SHA512 f222d789a4b6d4beb4d554ebecf57c902fa8178fff40b8a92d6e11927c93805a93b78f57062db69d9dead7fe123f1ee47a960d469e324892d78b290c77fed9b8 WHIRLPOOL 660987d1825bb5530b3bda0cfa48972fb274276cea9e80b8c6f21f53730e0c6ee2d28d0d779052036aaf244280437fb7e1b08f3c210cb5647358a787a830a6f7
 EBUILD vim-7.4.417.ebuild 11597 SHA256 90aa26e18489324e4d4ceda7e876033c5550c0f4fc15d98775814801af9faa3c SHA512 77b331806b6f393634f4191247b3d22e3d86b4b5376a478b58013e608b49017e3534ce31cb73272e345ecbc0d0d1dca644c9c5bb46a17899afe7864eada79ad4 WHIRLPOOL 5f5eed689bc411da17287e7e366cedc766304d7913251522b4a43a0f6feb7d6ef003b932103fcf88cad0824710c1d7504046161cf66daac8f1e8a859fab20212
 EBUILD vim-7.4.430.ebuild 11942 SHA256 6ead57a07c4fb27de434d74f4874d12c6960c3a7bdb2ff6e2cc46d282776f541 SHA512 422cee85b8fa5fa79d782aa513334d11f51cf557fa3dc11a1082a66b3bc77fc1439161613ac2b0305030ba7f78b95cf1c8d03e00d61e3d9c11f1cc58bb291168 WHIRLPOOL 03fb88d2df1f848d0833982332bca1dbe2efa9c5f640b3d7fb98ed0ddac13c08782447beccc2eda46db2f78c56ab8cafed0a839bcaa754ec2bb6578dcfb57b14
+EBUILD vim-7.4.475.ebuild 11847 SHA256 fbffdcaf93a52777005e2fde759bda933e7325ad96129481a95bfd5f2a9b72d5 SHA512 6aa1d16dde375afb08ebdb15e718503c05e533cef649d92705cf343fe19e3911711a3a5b9746da3d3b010865c0309a0dd5e8cd5239276c41b1b32ceca4f38d10 WHIRLPOOL 68ba536ebc5b1e7a447d55f529873aa776841f772c57a2ab10c827868ae84d9987d26242b971331ff0a5e7e8e9d93c520d3d1642f070023ce6f7fdcbda16f813
 EBUILD vim-7.4.52.ebuild 11778 SHA256 6c966f4d425286610619b546ea787222b4fdcdb619eefc017cc041c7eac16db9 SHA512 a4f7af2a712f6ac7f254b62597a25ce3b4e269d575531eae85df9d34fdb5315ccba8c1b5946d4eff210d3acc82781040f7309a176b79f25eb6886bf94bf0fe77 WHIRLPOOL c1e4bfa5d5ae42f9df88a237903190d7658eaaaaf37b05c5b4addbc56c3064556ba630e923a1b3037f5f7800b35287ce6b2cc2bd800099e079094b820e749545
 EBUILD vim-9999.ebuild 11940 SHA256 a41913c4f593f870b85a5707fbfa4eb5bb4892d1289d9cc823a15fb14b2b88b9 SHA512 04ae72432c1a5e014b17db6b71312ba6df388bebbf1de4f8ffbae900b48a108cdfb1d719d471aa157a08a4495b710a9725ee16f3ff86283a576ed0b40aaca9e6 WHIRLPOOL f7ba510e92312248703156099dd4107ce9e6c36bd99f2cfa42e9475a6271ba23b9350b07ae716946ae23252151f4558f1cf58c89eef7c82217823f3cbb78954f
-MISC ChangeLog 63633 SHA256 23f5df0726e5fb53cc4a6f0753a892337680a3f54cabe0cd530a604c0affd60c SHA512 0002094c64017cf4a5d340930a784721fd482b1d11267d993a7b2cc6466c3a4154f265b6433bef604aa7c7b31de2a6a310ffb93428f6854146c37a0c26aac641 WHIRLPOOL 024b74fd4f050d4bed581df7e98ce9430e8273c5a1fbf41c359e900d8884135091e26c1f99a793a9d0ae8c8ab10cc3e1502db4554a859c60baedcd1dc9842663
+MISC ChangeLog 63754 SHA256 24f0c81d4be33db9e9e6d3b1824ad53b2a20044fd7605d706e9488950051f9e7 SHA512 b352252a9c37eb9d66dcff77da3689f47f0245b37faa9d2e92c4d5cf54ac51a9926943e17c04105248f44e551c279aa29398785dc999eb7eae76cd2a27712ae3 WHIRLPOOL f81129d9fdd0640c610684b847ccf4ae3202d3d3e2cd63d66091d590dc2a3b613255ac3aa0fb33ad3f9e943eefdcc2bc7c44c19c522f0557d3016696e281ceb0
 MISC metadata.xml 611 SHA256 ca72f78f706a782fd43a809be03a88ae31684a281697c8668e08210084af78c0 SHA512 2566bee4ccd952830492057b31e0dd02743554748a798ef3a7df3bb44014162e5137d62fd915e28b5b4efe2c70d135baa3e0397cf60ad624ea587c3e2207bd6d WHIRLPOOL cb89aba309663ba96731451d92377a60b00347b7e8f76caac0b373459911e4b9980a015db1588750f433b5d490a0bb7f3000689ca8ea3dab5d1823d1873adec1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUOkOKAAoJELp701BxlEWf3WgP/RS2s9c8E+y8xhLVEC9kjxBd
-WL/KtP6Daw4FfuMAfFsgolhLNCrrsTIpYluahA4oW64w2xwYJSQuDAweTzK5boKo
-0RV+h/Q9AK2hyvJ8H0XW0YKJxL5POre883y9rq4IUuuEPufGTLFfZqdmvhAf9Jbo
-t4iBYCNzl1a10cBjLmLL6icaZbXzj3uosuPLahYZfIw4L4hNeEvhWX3l7S2EwJfr
-y4oUt2UFA5toFYTO105nR0QPBzerfau6dUNlnZar2CORu3c/6e/rAzsbpU9mGxYo
-pMltB8ALUnWTYUJLetmP+2NigRv3oKD385gG3c+zIL8LePAXldGGauMgvvZCYbwL
-zmGh9cYBLvkjhrTFPL3unREtieIkW1xK2DlyAPkiFaXpNkVOV0vWP7ErRzokahJG
-DdfTuB0zem8p/JzqzJ7nYsg8+WMnrNsZIsJAuxSXLLUjPkaTMs6FrSUw6OAQHt1j
-AclYnqL01v/Nh/TjTy6U0eVJ1W/dCzx6dy/haApXm4Nin3tUMG5TLaS/G5V3cdtZ
-+PGtk01sbLDipLIyhVIB+CwykWE9Dqv+qZMHYNkdZqLlEbOd68jG6+aflfCSA+VC
-yUwNqDolNEs56byNGUzcD0g/d8RrIHaaSqVqBG9f8uL02ZyX40dceD70agDqeuQS
-kLw1zcGrKiYQOze0ca5V
-=m2MF
+iQEcBAEBCAAGBQJUPD+yAAoJEEqz6FtPBkyjHaEH/247Aeo/PCpl1GNGNCn3hnnT
+odILBp6J10Tg8jfeA1vtiopOhwEyGKd059590HP7bh/p9MjauBaDeQ9ytv9DKt/v
+3Vb8HkR9QLbkH9sQ09x/OmMkdXZ6YTIL0vNGK924lF8UDF+GA8RDA+mIm5r1fbJk
+nCoqCTe4vOL+Vkq1qm+ravIh8mWOsGHmK2tvVLq6BdLpFKFohD4iMeVU4vT7F/cs
+pwc/4RPINaAKDIXXHYRrFV+t3Rb8Zzp0j98snrFT3ZWs+o7fGDUKQLwF2qCTpG43
+lpm6vbfQNXniGEz83uHQ0BAzHXdeKZsO537PmIhX2rVs2bwaB6lOOUcdmiFuOH0=
+=EwNd
 -----END PGP SIGNATURE-----
diff --git a/app-editors/vim/vim-7.4.475.ebuild b/app-editors/vim/vim-7.4.475.ebuild
new file mode 100644
index 000000000000..265b5b7f841e
--- /dev/null
+++ b/app-editors/vim/vim-7.4.475.ebuild
@@ -0,0 +1,376 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-7.4.475.ebuild,v 1.1 2014/10/13 21:09:46 radhermit Exp $
+
+EAPI=5
+VIM_VERSION="7.4"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+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}
+		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, an improved vi-style text editor"
+HOMEPAGE="http://www.vim.org/"
+
+SLOT="0"
+LICENSE="vim"
+IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl vim-pager"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	luajit? ( lua )
+"
+
+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[deprecated] )
+	)
+	!minimal? (
+		~app-editors/vim-core-${PV}
+		dev-util/ctags
+	)
+	perl? ( dev-lang/perl )
+	python? ( ${PYTHON_DEPS} )
+	racket? ( dev-scheme/racket )
+	ruby? ( || ( dev-lang/ruby:2.1 dev-lang/ruby:2.0 dev-lang/ruby:1.9 ) )
+	selinux? ( sys-libs/libselinux )
+	tcl? ( dev-lang/tcl )
+	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
+
+		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
+
+	# 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 '/-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
+
+	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-mzschemeinterp \
+			--disable-rubyinterp \
+			--disable-selinux \
+			--disable-tclinterp \
+			--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 lua luainterp)"
+		myconf+=" $(use_with luajit)"
+		myconf+=" $(use_enable nls)"
+		myconf+=" $(use_enable perl perlinterp)"
+		myconf+=" $(use_enable racket mzschemeinterp)"
+		myconf+=" $(use_enable ruby rubyinterp)"
+		myconf+=" $(use_enable selinux)"
+		myconf+=" $(use_enable tcl tclinterp)"
+
+		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
+
+		# --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"
+		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} \
+		${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 's~test49.out~~g' Makefile
+
+	# We don't want to rebuild vim before running the tests
+	sed -i 's,: \$(VIMPROG),: ,' Makefile
+
+	# Don't try to do the additional GUI test
+	emake -j1 VIMPROG=../vim nongui
+}
+
+# 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
+}
+
+pkg_postinst() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		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."
+	fi
+
+	# Make convenience symlinks
+	update_vim_symlinks
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Make convenience symlinks
+	update_vim_symlinks
+}